diff --git a/generator/ServiceClientGeneratorLib/Generators/SourceFiles/CoreAssemblyInfo.cs b/generator/ServiceClientGeneratorLib/Generators/SourceFiles/CoreAssemblyInfo.cs index 9a7bf110fa31..24441b35195f 100644 --- a/generator/ServiceClientGeneratorLib/Generators/SourceFiles/CoreAssemblyInfo.cs +++ b/generator/ServiceClientGeneratorLib/Generators/SourceFiles/CoreAssemblyInfo.cs @@ -15,13 +15,7 @@ namespace ServiceClientGenerator.Generators.SourceFiles /// Class to produce the template output /// -<<<<<<< HEAD - #line 1 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\CoreAssemblyInfo.tt" -||||||| Commit version number update changes - #line 1 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\CoreAssemblyInfo.tt" -======= - #line 1 "C:\Dev\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\CoreAssemblyInfo.tt" ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b + #line 1 "C:\Projects\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\CoreAssemblyInfo.tt" [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "17.0.0.0")] public partial class CoreAssemblyInfo : BaseGenerator { @@ -53,132 +47,50 @@ public override string TransformText() "f0b52aedbe7252745db7274d5271fd79c1f08f668ecfa8eaab5626fa76adc811d3c8fc55859b0d09" + "d3bc0a84eecd0ba891f2b8a2fc55141cdcc37c2053d53491e650a479967c3622762977900eddbf12" + "52ed08a2413f00a28f3a0752a81203f03ccb7f684db373518b4\")]\r\n[assembly: InternalsVisi" + -<<<<<<< HEAD "bleTo(\"AWSSDK.UnitTests.Custom.NetStandard, PublicKey=00240000048000009400000006" + "02000000240000525341310004000001000100db5f59f098d27276c7833875a6263a3cc74ab17ba9" + "a9df0b52aedbe7252745db7274d5271fd79c1f08f668ecfa8eaab5626fa76adc811d3c8fc55859b0" + "d09d3bc0a84eecd0ba891f2b8a2fc55141cdcc37c2053d53491e650a479967c3622762977900eddb" + - "f1252ed08a2413f00a28f3a0752a81203f03ccb7f684db373518b4\")]\r\n// Allows moq to acce" + - "ss internals for testing\r\n[assembly: InternalsVisibleTo(\"DynamicProxyGenAssembly" + - "2, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c54" + - "7cac37abd99c8db225ef2f6c8a3602f3b3606cc9891605d02baa56104f4cfc0734aa39b93bf7852f" + - "7d9266654753cc297e7d2edfe0bac1cdcf9f717241550e0a7b191195b7667bb4f64bcb8e2121380f" + - "d1d9d46ad2d92d2d15605093924cceaf74c4861eff62abf69b9291ed0a340e113be11e6a7d3113e9" + - "2484cf7045cc7\")]\r\n[assembly: AssemblyConfiguration(\"\")]\r\n[assembly: AssemblyProd" + - "uct(\"Amazon Web Services SDK for .NET\")]\r\n[assembly: AssemblyCompany(\"Amazon.com" + - ", Inc\")]\r\n[assembly: AssemblyCopyright(\"Copyright Amazon.com, Inc. or its affili" + - "ates. All Rights Reserved.\")]\r\n[assembly: AssemblyTrademark(\"\")]\r\n[assembly: Ass" + - "emblyCulture(\"\")]\r\n\r\n// Setting ComVisible to false makes the types in this asse" + - "mbly not visible \r\n// to COM components. If you need to access a type in this a" + - "ssembly from \r\n// COM, set the ComVisible attribute to true on that type.\r\n[asse" + - "mbly: ComVisible(false)]\r\n\r\n// Version information for an assembly consists of t" + - "he following four values:\r\n//\r\n// Major Version\r\n// Minor Version \r\n//" + - " Build Number\r\n// Revision\r\n//\r\n// You can specify all the values or y" + - "ou can default the Build and Revision Numbers \r\n// by using the \'*\' as shown bel" + - "ow:\r\n// [assembly: AssemblyVersion(\"1.0.*\")]\r\n#if BCL\r\n[assembly: AssemblyVersio" + - "n(\""); -||||||| Commit version number update changes - "bleTo(\"AWSSDK.UnitTests.Net35, PublicKey=002400000480000094000000060200000024000" + - "0525341310004000001000100db5f59f098d27276c7833875a6263a3cc74ab17ba9a9df0b52aedbe" + - "7252745db7274d5271fd79c1f08f668ecfa8eaab5626fa76adc811d3c8fc55859b0d09d3bc0a84ee" + - "cd0ba891f2b8a2fc55141cdcc37c2053d53491e650a479967c3622762977900eddbf1252ed08a241" + - "3f00a28f3a0752a81203f03ccb7f684db373518b4\")]\r\n// Assembly name of UnitTests.NetS" + - "tandard\r\n[assembly: InternalsVisibleTo(\"UnitTests, PublicKey=0024000004800000940" + - "000000602000000240000525341310004000001000100db5f59f098d27276c7833875a6263a3cc74" + - "ab17ba9a9df0b52aedbe7252745db7274d5271fd79c1f08f668ecfa8eaab5626fa76adc811d3c8fc" + - "55859b0d09d3bc0a84eecd0ba891f2b8a2fc55141cdcc37c2053d53491e650a479967c3622762977" + - "900eddbf1252ed08a2413f00a28f3a0752a81203f03ccb7f684db373518b4\")]\r\n[assembly: Int" + - "ernalsVisibleTo(\"AWSSDK.UnitTests.Custom.NetStandard, PublicKey=0024000004800000" + - "940000000602000000240000525341310004000001000100db5f59f098d27276c7833875a6263a3c" + - "c74ab17ba9a9df0b52aedbe7252745db7274d5271fd79c1f08f668ecfa8eaab5626fa76adc811d3c" + - "8fc55859b0d09d3bc0a84eecd0ba891f2b8a2fc55141cdcc37c2053d53491e650a479967c3622762" + - "977900eddbf1252ed08a2413f00a28f3a0752a81203f03ccb7f684db373518b4\")]\r\n// Allows m" + - "oq to access internals for testing\r\n[assembly: InternalsVisibleTo(\"DynamicProxyG" + - "enAssembly2, PublicKey=002400000480000094000000060200000024000052534131000400000" + - "1000100c547cac37abd99c8db225ef2f6c8a3602f3b3606cc9891605d02baa56104f4cfc0734aa39" + - "b93bf7852f7d9266654753cc297e7d2edfe0bac1cdcf9f717241550e0a7b191195b7667bb4f64bcb" + - "8e2121380fd1d9d46ad2d92d2d15605093924cceaf74c4861eff62abf69b9291ed0a340e113be11e" + - "6a7d3113e92484cf7045cc7\")]\r\n[assembly: AssemblyConfiguration(\"\")]\r\n[assembly: As" + - "semblyProduct(\"Amazon Web Services SDK for .NET\")]\r\n[assembly: AssemblyCompany(\"" + - "Amazon.com, Inc\")]\r\n[assembly: AssemblyCopyright(\"Copyright Amazon.com, Inc. or " + - "its affiliates. All Rights Reserved.\")]\r\n[assembly: AssemblyTrademark(\"\")]\r\n[ass" + - "embly: AssemblyCulture(\"\")]\r\n\r\n// Setting ComVisible to false makes the types in" + - " this assembly not visible \r\n// to COM components. If you need to access a type" + - " in this assembly from \r\n// COM, set the ComVisible attribute to true on that ty" + - "pe.\r\n[assembly: ComVisible(false)]\r\n\r\n// Version information for an assembly con" + - "sists of the following four values:\r\n//\r\n// Major Version\r\n// Minor Ve" + - "rsion \r\n// Build Number\r\n// Revision\r\n//\r\n// You can specify all the v" + - "alues or you can default the Build and Revision Numbers \r\n// by using the \'*\' as" + - " shown below:\r\n// [assembly: AssemblyVersion(\"1.0.*\")]\r\n[assembly: AssemblyVersi" + - "on(\""); -======= - "bleTo(\"AWSSDK.UnitTests.Net35, PublicKey=002400000480000094000000060200000024000" + - "0525341310004000001000100db5f59f098d27276c7833875a6263a3cc74ab17ba9a9df0b52aedbe" + - "7252745db7274d5271fd79c1f08f668ecfa8eaab5626fa76adc811d3c8fc55859b0d09d3bc0a84ee" + - "cd0ba891f2b8a2fc55141cdcc37c2053d53491e650a479967c3622762977900eddbf1252ed08a241" + - "3f00a28f3a0752a81203f03ccb7f684db373518b4\")]\r\n// Assembly name of UnitTests.NetS" + - "tandard\r\n[assembly: InternalsVisibleTo(\"UnitTests, PublicKey=0024000004800000940" + - "000000602000000240000525341310004000001000100db5f59f098d27276c7833875a6263a3cc74" + - "ab17ba9a9df0b52aedbe7252745db7274d5271fd79c1f08f668ecfa8eaab5626fa76adc811d3c8fc" + - "55859b0d09d3bc0a84eecd0ba891f2b8a2fc55141cdcc37c2053d53491e650a479967c3622762977" + - "900eddbf1252ed08a2413f00a28f3a0752a81203f03ccb7f684db373518b4\")]\r\n[assembly: Int" + - "ernalsVisibleTo(\"AWSSDK.UnitTests.Custom.NetStandard, PublicKey=0024000004800000" + - "940000000602000000240000525341310004000001000100db5f59f098d27276c7833875a6263a3c" + - "c74ab17ba9a9df0b52aedbe7252745db7274d5271fd79c1f08f668ecfa8eaab5626fa76adc811d3c" + - "8fc55859b0d09d3bc0a84eecd0ba891f2b8a2fc55141cdcc37c2053d53491e650a479967c3622762" + - "977900eddbf1252ed08a2413f00a28f3a0752a81203f03ccb7f684db373518b4\")]\r\n[assembly: " + - "InternalsVisibleTo(\"UnitTests.NetStandard.CoreOnly, PublicKey=002400000480000094" + - "0000000602000000240000525341310004000001000100db5f59f098d27276c7833875a6263a3cc7" + - "4ab17ba9a9df0b52aedbe7252745db7274d5271fd79c1f08f668ecfa8eaab5626fa76adc811d3c8f" + - "c55859b0d09d3bc0a84eecd0ba891f2b8a2fc55141cdcc37c2053d53491e650a479967c362276297" + - "7900eddbf1252ed08a2413f00a28f3a0752a81203f03ccb7f684db373518b4\")]\r\n// Allows moq" + - " to access internals for testing\r\n[assembly: InternalsVisibleTo(\"DynamicProxyGen" + - "Assembly2, PublicKey=00240000048000009400000006020000002400005253413100040000010" + - "00100c547cac37abd99c8db225ef2f6c8a3602f3b3606cc9891605d02baa56104f4cfc0734aa39b9" + - "3bf7852f7d9266654753cc297e7d2edfe0bac1cdcf9f717241550e0a7b191195b7667bb4f64bcb8e" + - "2121380fd1d9d46ad2d92d2d15605093924cceaf74c4861eff62abf69b9291ed0a340e113be11e6a" + - "7d3113e92484cf7045cc7\")]\r\n[assembly: AssemblyConfiguration(\"\")]\r\n[assembly: Asse" + - "mblyProduct(\"Amazon Web Services SDK for .NET\")]\r\n[assembly: AssemblyCompany(\"Am" + - "azon.com, Inc\")]\r\n[assembly: AssemblyCopyright(\"Copyright Amazon.com, Inc. or it" + - "s affiliates. All Rights Reserved.\")]\r\n[assembly: AssemblyTrademark(\"\")]\r\n[assem" + - "bly: AssemblyCulture(\"\")]\r\n\r\n// Setting ComVisible to false makes the types in t" + - "his assembly not visible \r\n// to COM components. If you need to access a type i" + - "n this assembly from \r\n// COM, set the ComVisible attribute to true on that type" + - ".\r\n[assembly: ComVisible(false)]\r\n\r\n// Version information for an assembly consi" + - "sts of the following four values:\r\n//\r\n// Major Version\r\n// Minor Vers" + - "ion \r\n// Build Number\r\n// Revision\r\n//\r\n// You can specify all the val" + - "ues or you can default the Build and Revision Numbers \r\n// by using the \'*\' as s" + - "hown below:\r\n// [assembly: AssemblyVersion(\"1.0.*\")]\r\n[assembly: AssemblyVersion" + - "(\""); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b + "f1252ed08a2413f00a28f3a0752a81203f03ccb7f684db373518b4\")]\r\n[assembly: InternalsV" + + "isibleTo(\"UnitTests.NetStandard.CoreOnly, PublicKey=0024000004800000940000000602" + + "000000240000525341310004000001000100db5f59f098d27276c7833875a6263a3cc74ab17ba9a9" + + "df0b52aedbe7252745db7274d5271fd79c1f08f668ecfa8eaab5626fa76adc811d3c8fc55859b0d0" + + "9d3bc0a84eecd0ba891f2b8a2fc55141cdcc37c2053d53491e650a479967c3622762977900eddbf1" + + "252ed08a2413f00a28f3a0752a81203f03ccb7f684db373518b4\")]\r\n// Allows moq to access" + + " internals for testing\r\n[assembly: InternalsVisibleTo(\"DynamicProxyGenAssembly2," + + " PublicKey=0024000004800000940000000602000000240000525341310004000001000100c547c" + + "ac37abd99c8db225ef2f6c8a3602f3b3606cc9891605d02baa56104f4cfc0734aa39b93bf7852f7d" + + "9266654753cc297e7d2edfe0bac1cdcf9f717241550e0a7b191195b7667bb4f64bcb8e2121380fd1" + + "d9d46ad2d92d2d15605093924cceaf74c4861eff62abf69b9291ed0a340e113be11e6a7d3113e924" + + "84cf7045cc7\")]\r\n[assembly: AssemblyConfiguration(\"\")]\r\n[assembly: AssemblyProduc" + + "t(\"Amazon Web Services SDK for .NET\")]\r\n[assembly: AssemblyCompany(\"Amazon.com, " + + "Inc\")]\r\n[assembly: AssemblyCopyright(\"Copyright Amazon.com, Inc. or its affiliat" + + "es. All Rights Reserved.\")]\r\n[assembly: AssemblyTrademark(\"\")]\r\n[assembly: Assem" + + "blyCulture(\"\")]\r\n\r\n// Setting ComVisible to false makes the types in this assemb" + + "ly not visible \r\n// to COM components. If you need to access a type in this ass" + + "embly from \r\n// COM, set the ComVisible attribute to true on that type.\r\n[assemb" + + "ly: ComVisible(false)]\r\n\r\n// Version information for an assembly consists of the" + + " following four values:\r\n//\r\n// Major Version\r\n// Minor Version \r\n// " + + " Build Number\r\n// Revision\r\n//\r\n// You can specify all the values or you" + + " can default the Build and Revision Numbers \r\n// by using the \'*\' as shown below" + + ":\r\n// [assembly: AssemblyVersion(\"1.0.*\")]\r\n#if BCL\r\n[assembly: AssemblyVersion(" + + "\""); -<<<<<<< HEAD - #line 53 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\CoreAssemblyInfo.tt" -||||||| Commit version number update changes - #line 55 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\CoreAssemblyInfo.tt" -======= - #line 56 "C:\Dev\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\CoreAssemblyInfo.tt" ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b + #line 54 "C:\Projects\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\CoreAssemblyInfo.tt" this.Write(this.ToStringHelper.ToStringWithCulture(this.Session["Version"])); #line default #line hidden this.Write("\")]\r\n#else\r\n[assembly: AssemblyVersion(\""); -<<<<<<< HEAD - #line 55 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\CoreAssemblyInfo.tt" + #line 56 "C:\Projects\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\CoreAssemblyInfo.tt" this.Write(this.ToStringHelper.ToStringWithCulture(this.Session["FileVersion"])); #line default #line hidden this.Write("\")]\r\n#endif\r\n[assembly: AssemblyFileVersion(\""); - #line 57 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\CoreAssemblyInfo.tt" -||||||| Commit version number update changes - #line 56 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\CoreAssemblyInfo.tt" -======= - #line 57 "C:\Dev\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\CoreAssemblyInfo.tt" ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b + #line 58 "C:\Projects\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\CoreAssemblyInfo.tt" this.Write(this.ToStringHelper.ToStringWithCulture(this.Session["FileVersion"])); #line default diff --git a/generator/ServiceClientGeneratorLib/Generators/SourceFiles/DefaultConfiguration.cs b/generator/ServiceClientGeneratorLib/Generators/SourceFiles/DefaultConfiguration.cs index eb061143f1f4..5b195582c78a 100644 --- a/generator/ServiceClientGeneratorLib/Generators/SourceFiles/DefaultConfiguration.cs +++ b/generator/ServiceClientGeneratorLib/Generators/SourceFiles/DefaultConfiguration.cs @@ -20,7 +20,7 @@ namespace ServiceClientGenerator.Generators.SourceFiles /// Class to produce the template output /// - #line 1 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\DefaultConfiguration.tt" + #line 1 "C:\Projects\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\DefaultConfiguration.tt" [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "17.0.0.0")] public partial class DefaultConfiguration : BaseGenerator { @@ -34,7 +34,7 @@ public override string TransformText() this.Write("\r\n"); this.Write("\r\n"); - #line 11 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\DefaultConfiguration.tt" + #line 11 "C:\Projects\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\DefaultConfiguration.tt" AddLicenseHeader(); @@ -44,21 +44,21 @@ public override string TransformText() this.Write("\r\n\r\nusing System;\r\nusing System.Collections.Generic;\r\nusing System.Collections.Ob" + "jectModel;\r\n\r\nusing Amazon.Runtime;\r\n\r\nnamespace "); - #line 22 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\DefaultConfiguration.tt" + #line 22 "C:\Projects\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\DefaultConfiguration.tt" this.Write(this.ToStringHelper.ToStringWithCulture(base.Config.Namespace)); #line default #line hidden this.Write("\r\n{\r\n /// \r\n /// Configuration for accessing Amazon "); - #line 25 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\DefaultConfiguration.tt" + #line 25 "C:\Projects\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\DefaultConfiguration.tt" this.Write(this.ToStringHelper.ToStringWithCulture(base.Config.ClassName)); #line default #line hidden this.Write(" service\r\n /// \r\n public static class Amazon"); - #line 27 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\DefaultConfiguration.tt" + #line 27 "C:\Projects\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\DefaultConfiguration.tt" this.Write(this.ToStringHelper.ToStringWithCulture(base.Config.ClassName)); #line default @@ -66,7 +66,7 @@ public override string TransformText() this.Write("DefaultConfiguration\r\n {\r\n /// \r\n /// Collection of all" + " s supported by\r\n /// "); - #line 31 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\DefaultConfiguration.tt" + #line 31 "C:\Projects\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\DefaultConfiguration.tt" this.Write(this.ToStringHelper.ToStringWithCulture(base.Config.ClassName)); #line default @@ -76,14 +76,14 @@ public override string TransformText() "ction(new List\r\n {\r\n " + " "); - #line 37 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\DefaultConfiguration.tt" + #line 37 "C:\Projects\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\DefaultConfiguration.tt" this.Write(this.ToStringHelper.ToStringWithCulture(string.Join(",\r\n ", base.DefaultConfigurationModel.Modes.Select(x => x.Name).ToArray()))); #line default #line hidden this.Write("\r\n });\r\n }\r\n\r\n"); - #line 41 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\DefaultConfiguration.tt" + #line 41 "C:\Projects\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\DefaultConfiguration.tt" foreach (var mode in base.DefaultConfigurationModel.Modes) { @@ -93,14 +93,14 @@ public override string TransformText() #line hidden this.Write(" /// \r\n /// "); - #line 46 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\DefaultConfiguration.tt" + #line 46 "C:\Projects\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\DefaultConfiguration.tt" this.Write(this.ToStringHelper.ToStringWithCulture(mode.Documentation)); #line default #line hidden this.Write("\r\n /// \r\n public static IDefaultConfiguration "); - #line 48 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\DefaultConfiguration.tt" + #line 48 "C:\Projects\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\DefaultConfiguration.tt" this.Write(this.ToStringHelper.ToStringWithCulture(mode.Name)); #line default @@ -108,56 +108,42 @@ public override string TransformText() this.Write(" {get;} = new DefaultConfiguration\r\n {\r\n Name = DefaultConfigur" + "ationMode."); - #line 50 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\DefaultConfiguration.tt" + #line 50 "C:\Projects\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\DefaultConfiguration.tt" this.Write(this.ToStringHelper.ToStringWithCulture(mode.Name)); #line default #line hidden this.Write(",\r\n RetryMode = "); - #line 51 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\DefaultConfiguration.tt" + #line 51 "C:\Projects\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\DefaultConfiguration.tt" this.Write(this.ToStringHelper.ToStringWithCulture(nameof(RequestRetryMode))); #line default #line hidden this.Write("."); - #line 51 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\DefaultConfiguration.tt" + #line 51 "C:\Projects\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\DefaultConfiguration.tt" this.Write(this.ToStringHelper.ToStringWithCulture(mode.RetryMode)); #line default #line hidden this.Write(",\r\n S3UsEast1RegionalEndpoint = "); - #line 52 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\DefaultConfiguration.tt" - this.Write(this.ToStringHelper.ToStringWithCulture(nameof(StsRegionalEndpointsValue))); - - #line default - #line hidden - this.Write("."); - - #line 52 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\DefaultConfiguration.tt" - this.Write(this.ToStringHelper.ToStringWithCulture(mode.StsRegionalEndpoints)); - - #line default - #line hidden - this.Write(",\r\n S3UsEast1RegionalEndpoint = "); - - #line 53 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\DefaultConfiguration.tt" + #line 52 "C:\Projects\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\DefaultConfiguration.tt" this.Write(this.ToStringHelper.ToStringWithCulture(nameof(S3UsEast1RegionalEndpointValue))); #line default #line hidden this.Write("."); - #line 53 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\DefaultConfiguration.tt" + #line 52 "C:\Projects\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\DefaultConfiguration.tt" this.Write(this.ToStringHelper.ToStringWithCulture(mode.S3UsEast1RegionalEndpoint)); #line default #line hidden this.Write(",\r\n"); - #line 54 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\DefaultConfiguration.tt" + #line 53 "C:\Projects\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\DefaultConfiguration.tt" if (mode.ConnectTimeout.HasValue) { @@ -167,21 +153,21 @@ public override string TransformText() #line hidden this.Write(" // "); - #line 58 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\DefaultConfiguration.tt" + #line 57 "C:\Projects\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\DefaultConfiguration.tt" this.Write(this.ToStringHelper.ToStringWithCulture(mode.ConnectTimeout.Value.ToString("g", CultureInfo.InvariantCulture))); #line default #line hidden this.Write("\r\n ConnectTimeout = TimeSpan.FromMilliseconds("); - #line 59 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\DefaultConfiguration.tt" + #line 58 "C:\Projects\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\DefaultConfiguration.tt" this.Write(this.ToStringHelper.ToStringWithCulture(mode.ConnectTimeout.Value.TotalMilliseconds)); #line default #line hidden this.Write("L),\r\n"); - #line 60 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\DefaultConfiguration.tt" + #line 59 "C:\Projects\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\DefaultConfiguration.tt" } else @@ -192,7 +178,7 @@ public override string TransformText() #line hidden this.Write(" ConnectTimeout = null,\r\n"); - #line 66 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\DefaultConfiguration.tt" + #line 65 "C:\Projects\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\DefaultConfiguration.tt" } @@ -204,21 +190,21 @@ public override string TransformText() #line hidden this.Write(" // "); - #line 72 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\DefaultConfiguration.tt" + #line 71 "C:\Projects\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\DefaultConfiguration.tt" this.Write(this.ToStringHelper.ToStringWithCulture(mode.TlsNegotiationTimeout.Value.ToString("g", CultureInfo.InvariantCulture))); #line default #line hidden this.Write("\r\n TlsNegotiationTimeout = TimeSpan.FromMilliseconds("); - #line 73 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\DefaultConfiguration.tt" + #line 72 "C:\Projects\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\DefaultConfiguration.tt" this.Write(this.ToStringHelper.ToStringWithCulture(mode.TlsNegotiationTimeout.Value.TotalMilliseconds)); #line default #line hidden this.Write("L),\r\n"); - #line 74 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\DefaultConfiguration.tt" + #line 73 "C:\Projects\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\DefaultConfiguration.tt" } else @@ -229,7 +215,7 @@ public override string TransformText() #line hidden this.Write(" TlsNegotiationTimeout = null,\r\n"); - #line 80 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\DefaultConfiguration.tt" + #line 79 "C:\Projects\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\DefaultConfiguration.tt" } @@ -241,21 +227,21 @@ public override string TransformText() #line hidden this.Write(" // "); - #line 86 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\DefaultConfiguration.tt" + #line 85 "C:\Projects\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\DefaultConfiguration.tt" this.Write(this.ToStringHelper.ToStringWithCulture(mode.TimeToFirstByteTimeout.Value.ToString("g", CultureInfo.InvariantCulture))); #line default #line hidden this.Write("\r\n TimeToFirstByteTimeout = TimeSpan.FromMilliseconds("); - #line 87 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\DefaultConfiguration.tt" + #line 86 "C:\Projects\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\DefaultConfiguration.tt" this.Write(this.ToStringHelper.ToStringWithCulture(mode.TimeToFirstByteTimeout.Value.TotalMilliseconds)); #line default #line hidden this.Write("L),\r\n"); - #line 88 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\DefaultConfiguration.tt" + #line 87 "C:\Projects\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\DefaultConfiguration.tt" } else @@ -266,7 +252,7 @@ public override string TransformText() #line hidden this.Write(" TimeToFirstByteTimeout = null,\r\n"); - #line 94 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\DefaultConfiguration.tt" + #line 93 "C:\Projects\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\DefaultConfiguration.tt" } @@ -278,21 +264,21 @@ public override string TransformText() #line hidden this.Write(" // "); - #line 100 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\DefaultConfiguration.tt" + #line 99 "C:\Projects\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\DefaultConfiguration.tt" this.Write(this.ToStringHelper.ToStringWithCulture(mode.HttpRequestTimeout.Value.ToString("g", CultureInfo.InvariantCulture))); #line default #line hidden this.Write("\r\n HttpRequestTimeout = TimeSpan.FromMilliseconds("); - #line 101 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\DefaultConfiguration.tt" + #line 100 "C:\Projects\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\DefaultConfiguration.tt" this.Write(this.ToStringHelper.ToStringWithCulture(mode.HttpRequestTimeout.Value.TotalMilliseconds)); #line default #line hidden this.Write("L)\r\n"); - #line 102 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\DefaultConfiguration.tt" + #line 101 "C:\Projects\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\DefaultConfiguration.tt" } else @@ -303,7 +289,7 @@ public override string TransformText() #line hidden this.Write(" HttpRequestTimeout = null\r\n"); - #line 108 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\DefaultConfiguration.tt" + #line 107 "C:\Projects\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\DefaultConfiguration.tt" } @@ -312,7 +298,7 @@ public override string TransformText() #line hidden this.Write(" };\r\n"); - #line 112 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\DefaultConfiguration.tt" + #line 111 "C:\Projects\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\DefaultConfiguration.tt" } diff --git a/generator/ServiceModels/_sdk-versions.json b/generator/ServiceModels/_sdk-versions.json index ee2a1202953a..bf9de7f093d2 100644 --- a/generator/ServiceModels/_sdk-versions.json +++ b/generator/ServiceModels/_sdk-versions.json @@ -2059,14 +2059,6 @@ }, "InPreview" : false }, - "NimbleStudio" : { - "Version" : "4.0.0.0", - "AssemblyVersionOverride" : "4.0", - "Dependencies" : { - "Core" : "4.0.0.0" - }, - "InPreview" : false - }, "FinSpaceData" : { "Version" : "4.0.0.0", "AssemblyVersionOverride" : "4.0", diff --git a/sdk/AWSSDK.NetFramework.sln b/sdk/AWSSDK.NetFramework.sln index ff95962a8df0..5d63887bf80c 100644 --- a/sdk/AWSSDK.NetFramework.sln +++ b/sdk/AWSSDK.NetFramework.sln @@ -188,6 +188,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "BedrockRuntime", "BedrockRu EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.BedrockRuntime.NetFramework", "src/Services/BedrockRuntime/AWSSDK.BedrockRuntime.NetFramework.csproj", "{6581B0EE-15CE-41DF-82FF-257DBB42A9CB}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Billing", "Billing", "{5E5A12CA-5AEF-465C-B8C4-3D4E898C480A}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.Billing.NetFramework", "src/Services/Billing/AWSSDK.Billing.NetFramework.csproj", "{1541F13F-809C-4035-B37F-190291E48DBA}" +EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "BillingConductor", "BillingConductor", "{FB83376D-8A40-44AA-860B-84E4A5843E0B}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.BillingConductor.NetFramework", "src/Services/BillingConductor/AWSSDK.BillingConductor.NetFramework.csproj", "{89FE6300-2003-4183-9E72-8970E88CEC82}" @@ -392,6 +396,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ConnectCampaignService", "C EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.ConnectCampaignService.NetFramework", "src/Services/ConnectCampaignService/AWSSDK.ConnectCampaignService.NetFramework.csproj", "{E78FB6FF-F92F-449F-9BF7-7A5202077D37}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ConnectCampaignsV2", "ConnectCampaignsV2", "{AB66AD17-B7CB-43E1-A407-FEFF82463007}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.ConnectCampaignsV2.NetFramework", "src/Services/ConnectCampaignsV2/AWSSDK.ConnectCampaignsV2.NetFramework.csproj", "{A00B5051-F429-41B0-919D-C0C8B187ACE3}" +EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ConnectCases", "ConnectCases", "{110F509A-A016-4992-A587-C6F814AA670A}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.ConnectCases.NetFramework", "src/Services/ConnectCases/AWSSDK.ConnectCases.NetFramework.csproj", "{B39FECCF-32A9-4B1D-81C5-9E00B4B85876}" @@ -632,6 +640,18 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "GameLift", "GameLift", "{11 EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.GameLift.NetFramework", "src/Services/GameLift/AWSSDK.GameLift.NetFramework.csproj", "{259F1D99-AB70-4160-868C-BF0511CB8135}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "GeoMaps", "GeoMaps", "{4DE64705-1B8E-4E51-B417-29460FE63741}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.GeoMaps.NetFramework", "src/Services/GeoMaps/AWSSDK.GeoMaps.NetFramework.csproj", "{B56B1E9F-250A-4A3A-8443-832057A66AF9}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "GeoPlaces", "GeoPlaces", "{A269202B-7BFA-4D9F-B869-4B00ED97DB70}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.GeoPlaces.NetFramework", "src/Services/GeoPlaces/AWSSDK.GeoPlaces.NetFramework.csproj", "{45EED976-5220-4E50-B0BF-4F93E303A57A}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "GeoRoutes", "GeoRoutes", "{135584C5-F162-4D6C-8500-5D04F76D6F77}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.GeoRoutes.NetFramework", "src/Services/GeoRoutes/AWSSDK.GeoRoutes.NetFramework.csproj", "{FB75DEE7-270A-4376-AB1A-CD374AA7A3DF}" +EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Glacier", "Glacier", "{B8099726-2153-4A70-AE95-97C99FFF3AE2}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.Glacier.NetFramework", "src/Services/Glacier/AWSSDK.Glacier.NetFramework.csproj", "{8C8C55FE-5F99-4D65-BD71-E25DA360BF87}" @@ -944,6 +964,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "MarketplaceEntitlementServi EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.MarketplaceEntitlementService.NetFramework", "src/Services/MarketplaceEntitlementService/AWSSDK.MarketplaceEntitlementService.NetFramework.csproj", "{4EA1789B-56E6-49D4-8BB4-F98E8B86D162}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "MarketplaceReporting", "MarketplaceReporting", "{F2A56B80-ED69-4660-9635-6AC56FEFDEBE}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.MarketplaceReporting.NetFramework", "src/Services/MarketplaceReporting/AWSSDK.MarketplaceReporting.NetFramework.csproj", "{0A3DE701-44CF-4E23-B29F-916823EDAE5C}" +EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "MediaConnect", "MediaConnect", "{1953CEE8-CC3E-4A33-95F1-101808E7F4B7}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.MediaConnect.NetFramework", "src/Services/MediaConnect/AWSSDK.MediaConnect.NetFramework.csproj", "{0E8CA2E2-7034-472C-AAE5-7C1AD55F13AA}" @@ -1052,10 +1076,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "NetworkMonitor", "NetworkMo EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.NetworkMonitor.NetFramework", "src/Services/NetworkMonitor/AWSSDK.NetworkMonitor.NetFramework.csproj", "{CFCFC448-566B-4BFC-9307-24BAC28BFA0C}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "NimbleStudio", "NimbleStudio", "{172358FA-4D63-48DD-A24F-86C6C84D2F41}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.NimbleStudio.NetFramework", "src/Services/NimbleStudio/AWSSDK.NimbleStudio.NetFramework.csproj", "{7CACCBA6-FC4D-412A-94BA-A5709F680706}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "OAM", "OAM", "{83B9F0C7-4FA7-4A51-8556-885B2AD8C8C4}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.OAM.NetFramework", "src/Services/OAM/AWSSDK.OAM.NetFramework.csproj", "{C7726A51-E6E9-4A4D-8209-E42C604F2740}" @@ -1096,6 +1116,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Panorama", "Panorama", "{F4 EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.Panorama.NetFramework", "src/Services/Panorama/AWSSDK.Panorama.NetFramework.csproj", "{666537EE-D8D5-4CD2-B60E-D19A3751280D}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "PartnerCentralSelling", "PartnerCentralSelling", "{8E1F9081-193F-401A-979F-AA115251EE72}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.PartnerCentralSelling.NetFramework", "src/Services/PartnerCentralSelling/AWSSDK.PartnerCentralSelling.NetFramework.csproj", "{E1D3051A-9498-41A2-965D-E9A920CD05DA}" +EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "PaymentCryptography", "PaymentCryptography", "{1752C890-57FF-418C-9512-749EA96FB37E}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.PaymentCryptography.NetFramework", "src/Services/PaymentCryptography/AWSSDK.PaymentCryptography.NetFramework.csproj", "{31495FD1-AFB5-4707-B459-41B774CF7B2A}" @@ -1408,6 +1432,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SnowDeviceManagement", "Sno EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.SnowDeviceManagement.NetFramework", "src/Services/SnowDeviceManagement/AWSSDK.SnowDeviceManagement.NetFramework.csproj", "{5C6007F5-0088-436B-B345-31566DEAC6BB}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SocialMessaging", "SocialMessaging", "{E9C6495F-19CA-45A3-9FF7-B2A8963A437A}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.SocialMessaging.NetFramework", "src/Services/SocialMessaging/AWSSDK.SocialMessaging.NetFramework.csproj", "{F1FE2E11-09EB-47E6-885D-440C56EB8614}" +EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SQS", "SQS", "{E8A7227F-26DD-4FCB-9C67-18672AE8E69D}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.SQS.NetFramework", "src/Services/SQS/AWSSDK.SQS.NetFramework.csproj", "{ADFFB9CB-9308-4F92-A96D-25ACEFB04B10}" @@ -1844,6 +1872,10 @@ Global {6581B0EE-15CE-41DF-82FF-257DBB42A9CB}.Debug|Any CPU.Build.0 = Debug|Any CPU {6581B0EE-15CE-41DF-82FF-257DBB42A9CB}.Release|Any CPU.ActiveCfg = Release|Any CPU {6581B0EE-15CE-41DF-82FF-257DBB42A9CB}.Release|Any CPU.Build.0 = Release|Any CPU + {1541F13F-809C-4035-B37F-190291E48DBA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {1541F13F-809C-4035-B37F-190291E48DBA}.Debug|Any CPU.Build.0 = Debug|Any CPU + {1541F13F-809C-4035-B37F-190291E48DBA}.Release|Any CPU.ActiveCfg = Release|Any CPU + {1541F13F-809C-4035-B37F-190291E48DBA}.Release|Any CPU.Build.0 = Release|Any CPU {89FE6300-2003-4183-9E72-8970E88CEC82}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {89FE6300-2003-4183-9E72-8970E88CEC82}.Debug|Any CPU.Build.0 = Debug|Any CPU {89FE6300-2003-4183-9E72-8970E88CEC82}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -2048,6 +2080,10 @@ Global {E78FB6FF-F92F-449F-9BF7-7A5202077D37}.Debug|Any CPU.Build.0 = Debug|Any CPU {E78FB6FF-F92F-449F-9BF7-7A5202077D37}.Release|Any CPU.ActiveCfg = Release|Any CPU {E78FB6FF-F92F-449F-9BF7-7A5202077D37}.Release|Any CPU.Build.0 = Release|Any CPU + {A00B5051-F429-41B0-919D-C0C8B187ACE3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {A00B5051-F429-41B0-919D-C0C8B187ACE3}.Debug|Any CPU.Build.0 = Debug|Any CPU + {A00B5051-F429-41B0-919D-C0C8B187ACE3}.Release|Any CPU.ActiveCfg = Release|Any CPU + {A00B5051-F429-41B0-919D-C0C8B187ACE3}.Release|Any CPU.Build.0 = Release|Any CPU {B39FECCF-32A9-4B1D-81C5-9E00B4B85876}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {B39FECCF-32A9-4B1D-81C5-9E00B4B85876}.Debug|Any CPU.Build.0 = Debug|Any CPU {B39FECCF-32A9-4B1D-81C5-9E00B4B85876}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -2288,6 +2324,18 @@ Global {259F1D99-AB70-4160-868C-BF0511CB8135}.Debug|Any CPU.Build.0 = Debug|Any CPU {259F1D99-AB70-4160-868C-BF0511CB8135}.Release|Any CPU.ActiveCfg = Release|Any CPU {259F1D99-AB70-4160-868C-BF0511CB8135}.Release|Any CPU.Build.0 = Release|Any CPU + {B56B1E9F-250A-4A3A-8443-832057A66AF9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B56B1E9F-250A-4A3A-8443-832057A66AF9}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B56B1E9F-250A-4A3A-8443-832057A66AF9}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B56B1E9F-250A-4A3A-8443-832057A66AF9}.Release|Any CPU.Build.0 = Release|Any CPU + {45EED976-5220-4E50-B0BF-4F93E303A57A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {45EED976-5220-4E50-B0BF-4F93E303A57A}.Debug|Any CPU.Build.0 = Debug|Any CPU + {45EED976-5220-4E50-B0BF-4F93E303A57A}.Release|Any CPU.ActiveCfg = Release|Any CPU + {45EED976-5220-4E50-B0BF-4F93E303A57A}.Release|Any CPU.Build.0 = Release|Any CPU + {FB75DEE7-270A-4376-AB1A-CD374AA7A3DF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {FB75DEE7-270A-4376-AB1A-CD374AA7A3DF}.Debug|Any CPU.Build.0 = Debug|Any CPU + {FB75DEE7-270A-4376-AB1A-CD374AA7A3DF}.Release|Any CPU.ActiveCfg = Release|Any CPU + {FB75DEE7-270A-4376-AB1A-CD374AA7A3DF}.Release|Any CPU.Build.0 = Release|Any CPU {8C8C55FE-5F99-4D65-BD71-E25DA360BF87}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {8C8C55FE-5F99-4D65-BD71-E25DA360BF87}.Debug|Any CPU.Build.0 = Debug|Any CPU {8C8C55FE-5F99-4D65-BD71-E25DA360BF87}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -2600,6 +2648,10 @@ Global {4EA1789B-56E6-49D4-8BB4-F98E8B86D162}.Debug|Any CPU.Build.0 = Debug|Any CPU {4EA1789B-56E6-49D4-8BB4-F98E8B86D162}.Release|Any CPU.ActiveCfg = Release|Any CPU {4EA1789B-56E6-49D4-8BB4-F98E8B86D162}.Release|Any CPU.Build.0 = Release|Any CPU + {0A3DE701-44CF-4E23-B29F-916823EDAE5C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {0A3DE701-44CF-4E23-B29F-916823EDAE5C}.Debug|Any CPU.Build.0 = Debug|Any CPU + {0A3DE701-44CF-4E23-B29F-916823EDAE5C}.Release|Any CPU.ActiveCfg = Release|Any CPU + {0A3DE701-44CF-4E23-B29F-916823EDAE5C}.Release|Any CPU.Build.0 = Release|Any CPU {0E8CA2E2-7034-472C-AAE5-7C1AD55F13AA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {0E8CA2E2-7034-472C-AAE5-7C1AD55F13AA}.Debug|Any CPU.Build.0 = Debug|Any CPU {0E8CA2E2-7034-472C-AAE5-7C1AD55F13AA}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -2708,10 +2760,6 @@ Global {CFCFC448-566B-4BFC-9307-24BAC28BFA0C}.Debug|Any CPU.Build.0 = Debug|Any CPU {CFCFC448-566B-4BFC-9307-24BAC28BFA0C}.Release|Any CPU.ActiveCfg = Release|Any CPU {CFCFC448-566B-4BFC-9307-24BAC28BFA0C}.Release|Any CPU.Build.0 = Release|Any CPU - {7CACCBA6-FC4D-412A-94BA-A5709F680706}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7CACCBA6-FC4D-412A-94BA-A5709F680706}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7CACCBA6-FC4D-412A-94BA-A5709F680706}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7CACCBA6-FC4D-412A-94BA-A5709F680706}.Release|Any CPU.Build.0 = Release|Any CPU {C7726A51-E6E9-4A4D-8209-E42C604F2740}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {C7726A51-E6E9-4A4D-8209-E42C604F2740}.Debug|Any CPU.Build.0 = Debug|Any CPU {C7726A51-E6E9-4A4D-8209-E42C604F2740}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -2752,6 +2800,10 @@ Global {666537EE-D8D5-4CD2-B60E-D19A3751280D}.Debug|Any CPU.Build.0 = Debug|Any CPU {666537EE-D8D5-4CD2-B60E-D19A3751280D}.Release|Any CPU.ActiveCfg = Release|Any CPU {666537EE-D8D5-4CD2-B60E-D19A3751280D}.Release|Any CPU.Build.0 = Release|Any CPU + {E1D3051A-9498-41A2-965D-E9A920CD05DA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {E1D3051A-9498-41A2-965D-E9A920CD05DA}.Debug|Any CPU.Build.0 = Debug|Any CPU + {E1D3051A-9498-41A2-965D-E9A920CD05DA}.Release|Any CPU.ActiveCfg = Release|Any CPU + {E1D3051A-9498-41A2-965D-E9A920CD05DA}.Release|Any CPU.Build.0 = Release|Any CPU {31495FD1-AFB5-4707-B459-41B774CF7B2A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {31495FD1-AFB5-4707-B459-41B774CF7B2A}.Debug|Any CPU.Build.0 = Debug|Any CPU {31495FD1-AFB5-4707-B459-41B774CF7B2A}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -3064,6 +3116,10 @@ Global {5C6007F5-0088-436B-B345-31566DEAC6BB}.Debug|Any CPU.Build.0 = Debug|Any CPU {5C6007F5-0088-436B-B345-31566DEAC6BB}.Release|Any CPU.ActiveCfg = Release|Any CPU {5C6007F5-0088-436B-B345-31566DEAC6BB}.Release|Any CPU.Build.0 = Release|Any CPU + {F1FE2E11-09EB-47E6-885D-440C56EB8614}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {F1FE2E11-09EB-47E6-885D-440C56EB8614}.Debug|Any CPU.Build.0 = Debug|Any CPU + {F1FE2E11-09EB-47E6-885D-440C56EB8614}.Release|Any CPU.ActiveCfg = Release|Any CPU + {F1FE2E11-09EB-47E6-885D-440C56EB8614}.Release|Any CPU.Build.0 = Release|Any CPU {ADFFB9CB-9308-4F92-A96D-25ACEFB04B10}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {ADFFB9CB-9308-4F92-A96D-25ACEFB04B10}.Debug|Any CPU.Build.0 = Debug|Any CPU {ADFFB9CB-9308-4F92-A96D-25ACEFB04B10}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -3420,6 +3476,8 @@ Global {495E95C0-A9D0-48A1-AB67-B6B29B76E366} = {C2C778CD-B55F-4240-941B-CCBA00FB1C67} {69680110-B64F-4231-9C25-8364D18FA74B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AB} {6581B0EE-15CE-41DF-82FF-257DBB42A9CB} = {69680110-B64F-4231-9C25-8364D18FA74B} + {5E5A12CA-5AEF-465C-B8C4-3D4E898C480A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AB} + {1541F13F-809C-4035-B37F-190291E48DBA} = {5E5A12CA-5AEF-465C-B8C4-3D4E898C480A} {FB83376D-8A40-44AA-860B-84E4A5843E0B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AB} {89FE6300-2003-4183-9E72-8970E88CEC82} = {FB83376D-8A40-44AA-860B-84E4A5843E0B} {245ACFA4-ECA1-4ADC-9EA9-824407F16A29} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AB} @@ -3522,6 +3580,8 @@ Global {06F350A8-0AB3-43E7-A073-2715BF0E5769} = {5E205D7B-6577-404F-BBD2-705CCE11F02D} {C4183DB0-A919-40F2-B968-8E2D889E8A7A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AB} {E78FB6FF-F92F-449F-9BF7-7A5202077D37} = {C4183DB0-A919-40F2-B968-8E2D889E8A7A} + {AB66AD17-B7CB-43E1-A407-FEFF82463007} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AB} + {A00B5051-F429-41B0-919D-C0C8B187ACE3} = {AB66AD17-B7CB-43E1-A407-FEFF82463007} {110F509A-A016-4992-A587-C6F814AA670A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AB} {B39FECCF-32A9-4B1D-81C5-9E00B4B85876} = {110F509A-A016-4992-A587-C6F814AA670A} {45B43801-509C-4E99-A7F2-FB3B5BE8DA3A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AB} @@ -3642,6 +3702,12 @@ Global {0FCBCC40-4B47-442C-BC1D-7DADF4022DD1} = {BB9231D2-0A51-4D57-95DE-8D73F0217F43} {116334E7-A74A-4358-9208-3BEFE6EE133E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AB} {259F1D99-AB70-4160-868C-BF0511CB8135} = {116334E7-A74A-4358-9208-3BEFE6EE133E} + {4DE64705-1B8E-4E51-B417-29460FE63741} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AB} + {B56B1E9F-250A-4A3A-8443-832057A66AF9} = {4DE64705-1B8E-4E51-B417-29460FE63741} + {A269202B-7BFA-4D9F-B869-4B00ED97DB70} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AB} + {45EED976-5220-4E50-B0BF-4F93E303A57A} = {A269202B-7BFA-4D9F-B869-4B00ED97DB70} + {135584C5-F162-4D6C-8500-5D04F76D6F77} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AB} + {FB75DEE7-270A-4376-AB1A-CD374AA7A3DF} = {135584C5-F162-4D6C-8500-5D04F76D6F77} {B8099726-2153-4A70-AE95-97C99FFF3AE2} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AB} {8C8C55FE-5F99-4D65-BD71-E25DA360BF87} = {B8099726-2153-4A70-AE95-97C99FFF3AE2} {794A1D48-0FEF-4C1D-9BD9-47C4A73C8AB9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AB} @@ -3798,6 +3864,8 @@ Global {A64F25C1-84C6-4D16-A6CB-E1A8D0477F9A} = {C7DEC5F4-E7FC-4BE8-BE70-D3D845254EA8} {57CA8056-0D63-4EA8-BFAF-8F79ACBEAA88} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AB} {4EA1789B-56E6-49D4-8BB4-F98E8B86D162} = {57CA8056-0D63-4EA8-BFAF-8F79ACBEAA88} + {F2A56B80-ED69-4660-9635-6AC56FEFDEBE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AB} + {0A3DE701-44CF-4E23-B29F-916823EDAE5C} = {F2A56B80-ED69-4660-9635-6AC56FEFDEBE} {1953CEE8-CC3E-4A33-95F1-101808E7F4B7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AB} {0E8CA2E2-7034-472C-AAE5-7C1AD55F13AA} = {1953CEE8-CC3E-4A33-95F1-101808E7F4B7} {840FF035-DE71-4498-940B-CB9AC0D43A33} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AB} @@ -3852,8 +3920,6 @@ Global {2BF6EFD1-3C83-428C-95C5-506443E8899F} = {81F4EBD3-3D34-4044-856B-83972EF40A21} {2DCDD8B7-C0C3-4632-81C1-189CF55ED9E4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AB} {CFCFC448-566B-4BFC-9307-24BAC28BFA0C} = {2DCDD8B7-C0C3-4632-81C1-189CF55ED9E4} - {172358FA-4D63-48DD-A24F-86C6C84D2F41} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AB} - {7CACCBA6-FC4D-412A-94BA-A5709F680706} = {172358FA-4D63-48DD-A24F-86C6C84D2F41} {83B9F0C7-4FA7-4A51-8556-885B2AD8C8C4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AB} {C7726A51-E6E9-4A4D-8209-E42C604F2740} = {83B9F0C7-4FA7-4A51-8556-885B2AD8C8C4} {9527012D-47B7-40A7-9B7B-5B872C960CA6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AB} @@ -3874,6 +3940,8 @@ Global {1FC0D5A5-20A1-47CD-9E71-99AD06F5130C} = {5AA516B3-D5DD-4FB7-8CB6-5900E796CDE2} {F43ACC51-EBF1-4093-AEA3-7C8845C79206} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AB} {666537EE-D8D5-4CD2-B60E-D19A3751280D} = {F43ACC51-EBF1-4093-AEA3-7C8845C79206} + {8E1F9081-193F-401A-979F-AA115251EE72} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AB} + {E1D3051A-9498-41A2-965D-E9A920CD05DA} = {8E1F9081-193F-401A-979F-AA115251EE72} {1752C890-57FF-418C-9512-749EA96FB37E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AB} {31495FD1-AFB5-4707-B459-41B774CF7B2A} = {1752C890-57FF-418C-9512-749EA96FB37E} {65883079-2D32-4E77-AAB0-4C7AD24185DE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AB} @@ -4030,6 +4098,8 @@ Global {6E95F64C-6BBD-47D3-B544-AC358F1549CB} = {4869FC05-CF04-4CD5-9488-C4A49F531A06} {699E9D2E-65B8-4F65-984B-6027916F37B5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AB} {5C6007F5-0088-436B-B345-31566DEAC6BB} = {699E9D2E-65B8-4F65-984B-6027916F37B5} + {E9C6495F-19CA-45A3-9FF7-B2A8963A437A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AB} + {F1FE2E11-09EB-47E6-885D-440C56EB8614} = {E9C6495F-19CA-45A3-9FF7-B2A8963A437A} {E8A7227F-26DD-4FCB-9C67-18672AE8E69D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AB} {ADFFB9CB-9308-4F92-A96D-25ACEFB04B10} = {E8A7227F-26DD-4FCB-9C67-18672AE8E69D} {68C4E87E-2F14-4F49-A745-045F4DEF0D16} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AB} diff --git a/sdk/code-analysis/ServiceAnalysis/ACMPCA/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/ACMPCA/Properties/AssemblyInfo.cs index c93503e6dd10..b98d262b16c8 100644 --- a/sdk/code-analysis/ServiceAnalysis/ACMPCA/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/ACMPCA/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.54")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/APIGateway/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/APIGateway/Properties/AssemblyInfo.cs index 5695edfa1b08..973c39243e1a 100644 --- a/sdk/code-analysis/ServiceAnalysis/APIGateway/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/APIGateway/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.27")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.54")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/ARCZonalShift/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/ARCZonalShift/Properties/AssemblyInfo.cs index a32dca1ffce8..f90ccdaaf0df 100644 --- a/sdk/code-analysis/ServiceAnalysis/ARCZonalShift/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/ARCZonalShift/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/AWSHealth/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/AWSHealth/Properties/AssemblyInfo.cs index 9da0e7668bfd..3b22f00d1fb7 100644 --- a/sdk/code-analysis/ServiceAnalysis/AWSHealth/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/AWSHealth/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/AWSMarketplaceCommerceAnalytics/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/AWSMarketplaceCommerceAnalytics/Properties/AssemblyInfo.cs index 6756e189ee24..945303cc3c7e 100644 --- a/sdk/code-analysis/ServiceAnalysis/AWSMarketplaceCommerceAnalytics/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/AWSMarketplaceCommerceAnalytics/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/AWSMarketplaceMetering/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/AWSMarketplaceMetering/Properties/AssemblyInfo.cs index dc373dcbf47f..92231c624c0b 100644 --- a/sdk/code-analysis/ServiceAnalysis/AWSMarketplaceMetering/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/AWSMarketplaceMetering/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/AWSSupport/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/AWSSupport/Properties/AssemblyInfo.cs index 13ba34a110ac..60fd38a620c7 100644 --- a/sdk/code-analysis/ServiceAnalysis/AWSSupport/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/AWSSupport/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.27")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.54")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/AccessAnalyzer/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/AccessAnalyzer/Properties/AssemblyInfo.cs index dd0171f93d7d..d87d5fbff43d 100644 --- a/sdk/code-analysis/ServiceAnalysis/AccessAnalyzer/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/AccessAnalyzer/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.402.2")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/Account/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/Account/Properties/AssemblyInfo.cs index 58061ff7796f..90af93d910ef 100644 --- a/sdk/code-analysis/ServiceAnalysis/Account/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/Account/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/Amplify/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/Amplify/Properties/AssemblyInfo.cs index 529a8dffdb37..3d5a3c68536c 100644 --- a/sdk/code-analysis/ServiceAnalysis/Amplify/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/Amplify/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.21")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.402.18")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/AmplifyBackend/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/AmplifyBackend/Properties/AssemblyInfo.cs index 9520de7901a0..b216726af112 100644 --- a/sdk/code-analysis/ServiceAnalysis/AmplifyBackend/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/AmplifyBackend/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/AmplifyUIBuilder/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/AmplifyUIBuilder/Properties/AssemblyInfo.cs index 050c47ffb50d..65ecd1d0b893 100644 --- a/sdk/code-analysis/ServiceAnalysis/AmplifyUIBuilder/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/AmplifyUIBuilder/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/ApiGatewayManagementApi/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/ApiGatewayManagementApi/Properties/AssemblyInfo.cs index 318ab2429ace..03761dd8f3c3 100644 --- a/sdk/code-analysis/ServiceAnalysis/ApiGatewayManagementApi/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/ApiGatewayManagementApi/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/ApiGatewayV2/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/ApiGatewayV2/Properties/AssemblyInfo.cs index cd8c5ef78a26..2780b064383d 100644 --- a/sdk/code-analysis/ServiceAnalysis/ApiGatewayV2/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/ApiGatewayV2/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/AppConfig/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/AppConfig/Properties/AssemblyInfo.cs index 67899748761e..3ec0f0452d7e 100644 --- a/sdk/code-analysis/ServiceAnalysis/AppConfig/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/AppConfig/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.14")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.402.14")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/AppConfigData/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/AppConfigData/Properties/AssemblyInfo.cs index e75ec0ff416f..730f92fc1b1f 100644 --- a/sdk/code-analysis/ServiceAnalysis/AppConfigData/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/AppConfigData/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/AppFabric/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/AppFabric/Properties/AssemblyInfo.cs index 6cb289150b46..cd035f948d56 100644 --- a/sdk/code-analysis/ServiceAnalysis/AppFabric/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/AppFabric/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/AppIntegrationsService/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/AppIntegrationsService/Properties/AssemblyInfo.cs index 9c726e77740f..74f5c7798971 100644 --- a/sdk/code-analysis/ServiceAnalysis/AppIntegrationsService/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/AppIntegrationsService/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.23")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.50")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/AppMesh/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/AppMesh/Properties/AssemblyInfo.cs index 4f560499b7a5..f1856d564d12 100644 --- a/sdk/code-analysis/ServiceAnalysis/AppMesh/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/AppMesh/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/AppRegistry/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/AppRegistry/Properties/AssemblyInfo.cs index ae4577414689..bccdb2a48ccb 100644 --- a/sdk/code-analysis/ServiceAnalysis/AppRegistry/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/AppRegistry/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/AppRunner/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/AppRunner/Properties/AssemblyInfo.cs index 8047adc6f77e..2418512d43b6 100644 --- a/sdk/code-analysis/ServiceAnalysis/AppRunner/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/AppRunner/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/AppStream/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/AppStream/Properties/AssemblyInfo.cs index ba01f6c892c7..4e6d89784392 100644 --- a/sdk/code-analysis/ServiceAnalysis/AppStream/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/AppStream/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.402.21")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.403.25")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/AppSync/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/AppSync/Properties/AssemblyInfo.cs index f744f600c885..7e4c6c9a3ff3 100644 --- a/sdk/code-analysis/ServiceAnalysis/AppSync/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/AppSync/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.12")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.402.10")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/AppTest/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/AppTest/Properties/AssemblyInfo.cs index d18451318417..5d2f421522a0 100644 --- a/sdk/code-analysis/ServiceAnalysis/AppTest/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/AppTest/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/Appflow/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/Appflow/Properties/AssemblyInfo.cs index b143c1e0ec68..75e14215e57b 100644 --- a/sdk/code-analysis/ServiceAnalysis/Appflow/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/Appflow/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.54")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/ApplicationAutoScaling/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/ApplicationAutoScaling/Properties/AssemblyInfo.cs index aab6c4577df0..1682f102d213 100644 --- a/sdk/code-analysis/ServiceAnalysis/ApplicationAutoScaling/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/ApplicationAutoScaling/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/ApplicationCostProfiler/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/ApplicationCostProfiler/Properties/AssemblyInfo.cs index 6c8847111213..8606c7e3a383 100644 --- a/sdk/code-analysis/ServiceAnalysis/ApplicationCostProfiler/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/ApplicationCostProfiler/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/ApplicationDiscoveryService/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/ApplicationDiscoveryService/Properties/AssemblyInfo.cs index cb796c17c862..cb10d4219c38 100644 --- a/sdk/code-analysis/ServiceAnalysis/ApplicationDiscoveryService/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/ApplicationDiscoveryService/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/ApplicationInsights/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/ApplicationInsights/Properties/AssemblyInfo.cs index d57b405d8f74..011741629b8e 100644 --- a/sdk/code-analysis/ServiceAnalysis/ApplicationInsights/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/ApplicationInsights/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.17")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/ApplicationSignals/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/ApplicationSignals/Properties/AssemblyInfo.cs index 6c25586fa612..3ff62079088c 100644 --- a/sdk/code-analysis/ServiceAnalysis/ApplicationSignals/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/ApplicationSignals/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.402.11")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.403.3")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/Artifact/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/Artifact/Properties/AssemblyInfo.cs index 6575ec35e958..b42803463f35 100644 --- a/sdk/code-analysis/ServiceAnalysis/Artifact/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/Artifact/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/Athena/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/Athena/Properties/AssemblyInfo.cs index 22954ed8b0ee..a1cdf7aab844 100644 --- a/sdk/code-analysis/ServiceAnalysis/Athena/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/Athena/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.4")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.402.17")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/AuditManager/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/AuditManager/Properties/AssemblyInfo.cs index 6067f3d032fb..6e0d78482bb4 100644 --- a/sdk/code-analysis/ServiceAnalysis/AuditManager/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/AuditManager/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/AugmentedAIRuntime/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/AugmentedAIRuntime/Properties/AssemblyInfo.cs index e5d895ad3b4c..554c4f1fc0eb 100644 --- a/sdk/code-analysis/ServiceAnalysis/AugmentedAIRuntime/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/AugmentedAIRuntime/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/AutoScaling/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/AutoScaling/Properties/AssemblyInfo.cs index 287049adeaea..2a4e89b00be1 100644 --- a/sdk/code-analysis/ServiceAnalysis/AutoScaling/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/AutoScaling/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.24")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.404.7")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/AutoScalingPlans/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/AutoScalingPlans/Properties/AssemblyInfo.cs index d65a3e33122d..ba353347fd86 100644 --- a/sdk/code-analysis/ServiceAnalysis/AutoScalingPlans/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/AutoScalingPlans/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/B2bi/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/B2bi/Properties/AssemblyInfo.cs index cb4c051c6b8a..6ed5ad0403be 100644 --- a/sdk/code-analysis/ServiceAnalysis/B2bi/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/B2bi/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.402.3")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/BCMDataExports/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/BCMDataExports/Properties/AssemblyInfo.cs index 72978fdf712d..dbfe3250edb6 100644 --- a/sdk/code-analysis/ServiceAnalysis/BCMDataExports/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/BCMDataExports/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/Backup/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/Backup/Properties/AssemblyInfo.cs index f7bb03a170bb..81914e48dc1f 100644 --- a/sdk/code-analysis/ServiceAnalysis/Backup/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/Backup/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.13")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.40")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/BackupGateway/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/BackupGateway/Properties/AssemblyInfo.cs index ba3ca3c99e8f..2f63c92530a5 100644 --- a/sdk/code-analysis/ServiceAnalysis/BackupGateway/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/BackupGateway/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/Batch/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/Batch/Properties/AssemblyInfo.cs index 53ca3cd74ca4..9f9ca1e182b7 100644 --- a/sdk/code-analysis/ServiceAnalysis/Batch/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/Batch/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.19")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.403.6")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/Bedrock/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/Bedrock/Properties/AssemblyInfo.cs index b3890cbccca3..bd8b5ddac241 100644 --- a/sdk/code-analysis/ServiceAnalysis/Bedrock/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/Bedrock/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.406.3")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.409.11")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/BedrockAgent/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/BedrockAgent/Properties/AssemblyInfo.cs index e629cf8c9213..f4520bec939e 100644 --- a/sdk/code-analysis/ServiceAnalysis/BedrockAgent/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/BedrockAgent/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.404.4")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.409.7")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/BedrockAgentRuntime/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/BedrockAgentRuntime/Properties/AssemblyInfo.cs index c176a8d286ff..d631157122b9 100644 --- a/sdk/code-analysis/ServiceAnalysis/BedrockAgentRuntime/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/BedrockAgentRuntime/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.404.7")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.407.6")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/BedrockRuntime/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/BedrockRuntime/Properties/AssemblyInfo.cs index 6a2e2e21740e..e846100327ed 100644 --- a/sdk/code-analysis/ServiceAnalysis/BedrockRuntime/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/BedrockRuntime/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.403.14")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.408.7")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/Billing/AWSSDK.Billing.CodeAnalysis.csproj b/sdk/code-analysis/ServiceAnalysis/Billing/AWSSDK.Billing.CodeAnalysis.csproj index 132b3260453c..e5060de8fe84 100644 --- a/sdk/code-analysis/ServiceAnalysis/Billing/AWSSDK.Billing.CodeAnalysis.csproj +++ b/sdk/code-analysis/ServiceAnalysis/Billing/AWSSDK.Billing.CodeAnalysis.csproj @@ -18,7 +18,8 @@ - + + diff --git a/sdk/code-analysis/ServiceAnalysis/NimbleStudio/Generated/NullCollectionInitializerAnalyzer.cs b/sdk/code-analysis/ServiceAnalysis/Billing/Generated/NullCollectionInitializerAnalyzer.cs similarity index 78% rename from sdk/code-analysis/ServiceAnalysis/NimbleStudio/Generated/NullCollectionInitializerAnalyzer.cs rename to sdk/code-analysis/ServiceAnalysis/Billing/Generated/NullCollectionInitializerAnalyzer.cs index 956821ab88db..9a6558d9f91f 100644 --- a/sdk/code-analysis/ServiceAnalysis/NimbleStudio/Generated/NullCollectionInitializerAnalyzer.cs +++ b/sdk/code-analysis/ServiceAnalysis/Billing/Generated/NullCollectionInitializerAnalyzer.cs @@ -3,14 +3,14 @@ using Amazon.CodeAnalysis.Shared; -namespace Amazon.NimbleStudio.CodeAnalysis +namespace Amazon.Billing.CodeAnalysis { [DiagnosticAnalyzer(LanguageNames.CSharp)] public class NullCollectionInitializerAnalyzer : AbstractNullCollectionInitializerAnalyzer { protected override string GetModelNamespace() { - return "Amazon.NimbleStudio.Model"; + return "Amazon.Billing.Model"; } } } \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/Billing/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/Billing/Properties/AssemblyInfo.cs index 37d2bbe27c89..33aca81718fe 100644 --- a/sdk/code-analysis/ServiceAnalysis/Billing/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/Billing/Properties/AssemblyInfo.cs @@ -5,7 +5,7 @@ // set of attributes. Change these attribute values to modify the information // associated with an assembly. [assembly: AssemblyTitle("AWSSDK.Billing")] -[assembly: AssemblyDescription("The Amazon Web Services SDK for .NET (3.5) - AWS Billing. Today, AWS announces the general availability of ListBillingViews API in the AWS SDKs, to enable AWS Billing Conductor (ABC) users to create proforma Cost and Usage Reports (CUR) programmatically.")] +[assembly: AssemblyDescription("The Amazon Web Services SDK for .NET - AWS Billing. Today, AWS announces the general availability of ListBillingViews API in the AWS SDKs, to enable AWS Billing Conductor (ABC) users to create proforma Cost and Usage Reports (CUR) programmatically.")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyProduct("Amazon Web Services SDK for .NET")] [assembly: AssemblyCompany("Amazon.com, Inc")] @@ -28,5 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.3")] \ No newline at end of file +[assembly: AssemblyVersion("4.0")] +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/BillingConductor/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/BillingConductor/Properties/AssemblyInfo.cs index 149f9d09f749..7ff7d0930508 100644 --- a/sdk/code-analysis/ServiceAnalysis/BillingConductor/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/BillingConductor/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/Braket/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/Braket/Properties/AssemblyInfo.cs index 4af8051c3292..20b8c525ec90 100644 --- a/sdk/code-analysis/ServiceAnalysis/Braket/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/Braket/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/Budgets/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/Budgets/Properties/AssemblyInfo.cs index 0bb952fa4345..9a20f8c60f2b 100644 --- a/sdk/code-analysis/ServiceAnalysis/Budgets/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/Budgets/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.3")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.30")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/CertificateManager/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/CertificateManager/Properties/AssemblyInfo.cs index 0a35d98db055..0af74cd935f6 100644 --- a/sdk/code-analysis/ServiceAnalysis/CertificateManager/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/CertificateManager/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/Chatbot/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/Chatbot/Properties/AssemblyInfo.cs index 5bafa1fbc977..9d24bbfa923f 100644 --- a/sdk/code-analysis/ServiceAnalysis/Chatbot/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/Chatbot/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.402.1")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.402.28")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/Chime/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/Chime/Properties/AssemblyInfo.cs index 9cb5d134f5c3..d1dfa9f12102 100644 --- a/sdk/code-analysis/ServiceAnalysis/Chime/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/Chime/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/ChimeSDKIdentity/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/ChimeSDKIdentity/Properties/AssemblyInfo.cs index 1136deb3f673..faa621b3fabc 100644 --- a/sdk/code-analysis/ServiceAnalysis/ChimeSDKIdentity/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/ChimeSDKIdentity/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/ChimeSDKMediaPipelines/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/ChimeSDKMediaPipelines/Properties/AssemblyInfo.cs index 1d9356e39fae..4c5c4b0851ad 100644 --- a/sdk/code-analysis/ServiceAnalysis/ChimeSDKMediaPipelines/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/ChimeSDKMediaPipelines/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.6")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/ChimeSDKMeetings/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/ChimeSDKMeetings/Properties/AssemblyInfo.cs index 955a50cc4139..5d066c4ca2fc 100644 --- a/sdk/code-analysis/ServiceAnalysis/ChimeSDKMeetings/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/ChimeSDKMeetings/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/ChimeSDKMessaging/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/ChimeSDKMessaging/Properties/AssemblyInfo.cs index 2a70f2ceb964..70b37e272b4c 100644 --- a/sdk/code-analysis/ServiceAnalysis/ChimeSDKMessaging/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/ChimeSDKMessaging/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/ChimeSDKVoice/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/ChimeSDKVoice/Properties/AssemblyInfo.cs index 77458f061ddc..00614720c822 100644 --- a/sdk/code-analysis/ServiceAnalysis/ChimeSDKVoice/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/ChimeSDKVoice/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/CleanRooms/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/CleanRooms/Properties/AssemblyInfo.cs index 67c96310c200..c90492011097 100644 --- a/sdk/code-analysis/ServiceAnalysis/CleanRooms/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/CleanRooms/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.402.7")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/CleanRoomsML/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/CleanRoomsML/Properties/AssemblyInfo.cs index 8f41eec2cd56..08263a71e8ce 100644 --- a/sdk/code-analysis/ServiceAnalysis/CleanRoomsML/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/CleanRoomsML/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.7")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/Cloud9/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/Cloud9/Properties/AssemblyInfo.cs index d3cfdec2b11d..1059f420da32 100644 --- a/sdk/code-analysis/ServiceAnalysis/Cloud9/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/Cloud9/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/CloudControlApi/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/CloudControlApi/Properties/AssemblyInfo.cs index 1eaaafe452ed..f3db74618874 100644 --- a/sdk/code-analysis/ServiceAnalysis/CloudControlApi/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/CloudControlApi/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.2")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/CloudDirectory/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/CloudDirectory/Properties/AssemblyInfo.cs index 6070a0d42d4b..27dab7668a92 100644 --- a/sdk/code-analysis/ServiceAnalysis/CloudDirectory/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/CloudDirectory/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.54")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/CloudFormation/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/CloudFormation/Properties/AssemblyInfo.cs index 0e9a342006bd..e05c5667e41e 100644 --- a/sdk/code-analysis/ServiceAnalysis/CloudFormation/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/CloudFormation/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/CloudFront/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/CloudFront/Properties/AssemblyInfo.cs index 827d9c27e4c3..e7d7e9affbd4 100644 --- a/sdk/code-analysis/ServiceAnalysis/CloudFront/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/CloudFront/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3.4.0")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3.4.0")] -[assembly: AssemblyFileVersion("3.7.401.5")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/CloudFrontKeyValueStore/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/CloudFrontKeyValueStore/Properties/AssemblyInfo.cs index 8b85dfd256a4..6620fe754ddb 100644 --- a/sdk/code-analysis/ServiceAnalysis/CloudFrontKeyValueStore/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/CloudFrontKeyValueStore/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/CloudHSM/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/CloudHSM/Properties/AssemblyInfo.cs index a77fce30e183..dc643e425db7 100644 --- a/sdk/code-analysis/ServiceAnalysis/CloudHSM/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/CloudHSM/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/CloudHSMV2/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/CloudHSMV2/Properties/AssemblyInfo.cs index 66e39da8a8d4..e9675813a0e5 100644 --- a/sdk/code-analysis/ServiceAnalysis/CloudHSMV2/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/CloudHSMV2/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/CloudSearch/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/CloudSearch/Properties/AssemblyInfo.cs index 6692afdd6af8..daa3ce766599 100644 --- a/sdk/code-analysis/ServiceAnalysis/CloudSearch/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/CloudSearch/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.27")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.54")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/CloudSearchDomain/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/CloudSearchDomain/Properties/AssemblyInfo.cs index bada7178b959..f7a500d7d012 100644 --- a/sdk/code-analysis/ServiceAnalysis/CloudSearchDomain/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/CloudSearchDomain/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/CloudTrail/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/CloudTrail/Properties/AssemblyInfo.cs index 3c6c81541b51..99bc8d961ed7 100644 --- a/sdk/code-analysis/ServiceAnalysis/CloudTrail/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/CloudTrail/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.3")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/CloudTrailData/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/CloudTrailData/Properties/AssemblyInfo.cs index fc8c2db8acf4..e74a18fd01dd 100644 --- a/sdk/code-analysis/ServiceAnalysis/CloudTrailData/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/CloudTrailData/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/CloudWatch/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/CloudWatch/Properties/AssemblyInfo.cs index 0613d04a33c8..187f0a6e3e21 100644 --- a/sdk/code-analysis/ServiceAnalysis/CloudWatch/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/CloudWatch/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.24")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.402.0")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/CloudWatchEvents/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/CloudWatchEvents/Properties/AssemblyInfo.cs index 6ba6042bb1fc..af4b2e8e9f26 100644 --- a/sdk/code-analysis/ServiceAnalysis/CloudWatchEvents/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/CloudWatchEvents/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/CloudWatchEvidently/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/CloudWatchEvidently/Properties/AssemblyInfo.cs index beb10958172a..baf979742dcb 100644 --- a/sdk/code-analysis/ServiceAnalysis/CloudWatchEvidently/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/CloudWatchEvidently/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/CloudWatchLogs/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/CloudWatchLogs/Properties/AssemblyInfo.cs index 9fd48241f640..a4ed622a09aa 100644 --- a/sdk/code-analysis/ServiceAnalysis/CloudWatchLogs/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/CloudWatchLogs/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.403.12")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.406.8")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/CloudWatchRUM/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/CloudWatchRUM/Properties/AssemblyInfo.cs index f2bdb85d80b3..611d0ab419b3 100644 --- a/sdk/code-analysis/ServiceAnalysis/CloudWatchRUM/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/CloudWatchRUM/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/CodeArtifact/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/CodeArtifact/Properties/AssemblyInfo.cs index 2c40cde5b303..ec6d7acb89a5 100644 --- a/sdk/code-analysis/ServiceAnalysis/CodeArtifact/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/CodeArtifact/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.26")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/CodeBuild/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/CodeBuild/Properties/AssemblyInfo.cs index afc38fdd79d5..8663106caad3 100644 --- a/sdk/code-analysis/ServiceAnalysis/CodeBuild/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/CodeBuild/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.403.5")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.407.4")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/CodeCatalyst/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/CodeCatalyst/Properties/AssemblyInfo.cs index b21e2ac2fd8e..dd378a9feca8 100644 --- a/sdk/code-analysis/ServiceAnalysis/CodeCatalyst/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/CodeCatalyst/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/CodeCommit/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/CodeCommit/Properties/AssemblyInfo.cs index cdeb9e9342ad..f5d895a8a74d 100644 --- a/sdk/code-analysis/ServiceAnalysis/CodeCommit/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/CodeCommit/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/CodeConnections/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/CodeConnections/Properties/AssemblyInfo.cs index ae5d9034b466..1ad414305ef2 100644 --- a/sdk/code-analysis/ServiceAnalysis/CodeConnections/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/CodeConnections/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.5")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.32")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/CodeDeploy/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/CodeDeploy/Properties/AssemblyInfo.cs index 55b6d3eb4165..ddc18e30cb36 100644 --- a/sdk/code-analysis/ServiceAnalysis/CodeDeploy/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/CodeDeploy/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/CodeGuruProfiler/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/CodeGuruProfiler/Properties/AssemblyInfo.cs index b639e03ef94c..380b5ba94e96 100644 --- a/sdk/code-analysis/ServiceAnalysis/CodeGuruProfiler/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/CodeGuruProfiler/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/CodeGuruReviewer/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/CodeGuruReviewer/Properties/AssemblyInfo.cs index efdb694e243b..6cb9bebf264a 100644 --- a/sdk/code-analysis/ServiceAnalysis/CodeGuruReviewer/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/CodeGuruReviewer/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/CodeGuruSecurity/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/CodeGuruSecurity/Properties/AssemblyInfo.cs index 65830bf4f007..4dba40e25ad9 100644 --- a/sdk/code-analysis/ServiceAnalysis/CodeGuruSecurity/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/CodeGuruSecurity/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/CodePipeline/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/CodePipeline/Properties/AssemblyInfo.cs index f10ded108a90..88482159082a 100644 --- a/sdk/code-analysis/ServiceAnalysis/CodePipeline/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/CodePipeline/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.24")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.404.19")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/CodeStarNotifications/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/CodeStarNotifications/Properties/AssemblyInfo.cs index 7a2431e5f788..4b1d7544fa09 100644 --- a/sdk/code-analysis/ServiceAnalysis/CodeStarNotifications/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/CodeStarNotifications/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/CodeStarconnections/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/CodeStarconnections/Properties/AssemblyInfo.cs index 8672fb9c48be..3217a926b1b5 100644 --- a/sdk/code-analysis/ServiceAnalysis/CodeStarconnections/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/CodeStarconnections/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/CognitoIdentity/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/CognitoIdentity/Properties/AssemblyInfo.cs index 62f20cd57418..8af4857579c1 100644 --- a/sdk/code-analysis/ServiceAnalysis/CognitoIdentity/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/CognitoIdentity/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.8")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.35")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/CognitoIdentityProvider/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/CognitoIdentityProvider/Properties/AssemblyInfo.cs index 8079326c2d1d..4898c875870a 100644 --- a/sdk/code-analysis/ServiceAnalysis/CognitoIdentityProvider/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/CognitoIdentityProvider/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.403.7")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.403.34")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/CognitoSync/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/CognitoSync/Properties/AssemblyInfo.cs index 967986af3fc6..7a610c41d0d2 100644 --- a/sdk/code-analysis/ServiceAnalysis/CognitoSync/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/CognitoSync/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/Comprehend/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/Comprehend/Properties/AssemblyInfo.cs index 31e3437f3456..b28e37e1d9f4 100644 --- a/sdk/code-analysis/ServiceAnalysis/Comprehend/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/Comprehend/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/ComprehendMedical/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/ComprehendMedical/Properties/AssemblyInfo.cs index 8b06ebe7e266..34f93acfb307 100644 --- a/sdk/code-analysis/ServiceAnalysis/ComprehendMedical/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/ComprehendMedical/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/ComputeOptimizer/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/ComputeOptimizer/Properties/AssemblyInfo.cs index 4f395ffc6d00..cd40f6fd4bea 100644 --- a/sdk/code-analysis/ServiceAnalysis/ComputeOptimizer/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/ComputeOptimizer/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.27")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.54")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/ConfigService/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/ConfigService/Properties/AssemblyInfo.cs index 3075db7aabdd..904940581cc1 100644 --- a/sdk/code-analysis/ServiceAnalysis/ConfigService/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/ConfigService/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.22")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.49")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/Connect/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/Connect/Properties/AssemblyInfo.cs index 0e9df13fcfd9..ae252e82c4c1 100644 --- a/sdk/code-analysis/ServiceAnalysis/Connect/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/Connect/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.404.11")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.408.10")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/ConnectCampaignService/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/ConnectCampaignService/Properties/AssemblyInfo.cs index 9628d34f5e61..2c4ac13ba79b 100644 --- a/sdk/code-analysis/ServiceAnalysis/ConnectCampaignService/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/ConnectCampaignService/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/ConnectCampaignsV2/AWSSDK.ConnectCampaignsV2.CodeAnalysis.csproj b/sdk/code-analysis/ServiceAnalysis/ConnectCampaignsV2/AWSSDK.ConnectCampaignsV2.CodeAnalysis.csproj index ebfc36b0b0b0..c20fe21cf6c0 100644 --- a/sdk/code-analysis/ServiceAnalysis/ConnectCampaignsV2/AWSSDK.ConnectCampaignsV2.CodeAnalysis.csproj +++ b/sdk/code-analysis/ServiceAnalysis/ConnectCampaignsV2/AWSSDK.ConnectCampaignsV2.CodeAnalysis.csproj @@ -18,7 +18,8 @@ - + + diff --git a/sdk/code-analysis/ServiceAnalysis/ConnectCampaignsV2/Generated/NullCollectionInitializerAnalyzer.cs b/sdk/code-analysis/ServiceAnalysis/ConnectCampaignsV2/Generated/NullCollectionInitializerAnalyzer.cs new file mode 100644 index 000000000000..1acc73fdeb45 --- /dev/null +++ b/sdk/code-analysis/ServiceAnalysis/ConnectCampaignsV2/Generated/NullCollectionInitializerAnalyzer.cs @@ -0,0 +1,16 @@ +using Microsoft.CodeAnalysis; +using Microsoft.CodeAnalysis.Diagnostics; + +using Amazon.CodeAnalysis.Shared; + +namespace Amazon.ConnectCampaignsV2.CodeAnalysis +{ + [DiagnosticAnalyzer(LanguageNames.CSharp)] + public class NullCollectionInitializerAnalyzer : AbstractNullCollectionInitializerAnalyzer + { + protected override string GetModelNamespace() + { + return "Amazon.ConnectCampaignsV2.Model"; + } + } +} \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/ConnectCampaignsV2/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/ConnectCampaignsV2/Properties/AssemblyInfo.cs index 64d99ec5d94f..e5791ea71b19 100644 --- a/sdk/code-analysis/ServiceAnalysis/ConnectCampaignsV2/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/ConnectCampaignsV2/Properties/AssemblyInfo.cs @@ -5,7 +5,7 @@ // set of attributes. Change these attribute values to modify the information // associated with an assembly. [assembly: AssemblyTitle("AWSSDK.ConnectCampaignsV2")] -[assembly: AssemblyDescription("The Amazon Web Services SDK for .NET (3.5) - AmazonConnectCampaignServiceV2. Added Amazon Connect Outbound Campaigns V2 SDK.")] +[assembly: AssemblyDescription("The Amazon Web Services SDK for .NET - AmazonConnectCampaignServiceV2. Added Amazon Connect Outbound Campaigns V2 SDK.")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyProduct("Amazon Web Services SDK for .NET")] [assembly: AssemblyCompany("Amazon.com, Inc")] @@ -28,5 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.0")] \ No newline at end of file +[assembly: AssemblyVersion("4.0")] +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/ConnectCases/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/ConnectCases/Properties/AssemblyInfo.cs index 137ed2270a7a..c559883a4cb1 100644 --- a/sdk/code-analysis/ServiceAnalysis/ConnectCases/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/ConnectCases/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/ConnectContactLens/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/ConnectContactLens/Properties/AssemblyInfo.cs index 8934b4be1db6..d2eec9199398 100644 --- a/sdk/code-analysis/ServiceAnalysis/ConnectContactLens/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/ConnectContactLens/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/ConnectParticipant/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/ConnectParticipant/Properties/AssemblyInfo.cs index 4641d6c43f3c..31fb1cb3875c 100644 --- a/sdk/code-analysis/ServiceAnalysis/ConnectParticipant/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/ConnectParticipant/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/ConnectWisdomService/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/ConnectWisdomService/Properties/AssemblyInfo.cs index b3d4a8c075a9..014448237723 100644 --- a/sdk/code-analysis/ServiceAnalysis/ConnectWisdomService/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/ConnectWisdomService/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/ControlCatalog/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/ControlCatalog/Properties/AssemblyInfo.cs index 42e20afdd16e..a024e83815be 100644 --- a/sdk/code-analysis/ServiceAnalysis/ControlCatalog/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/ControlCatalog/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.24")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.402.6")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/ControlTower/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/ControlTower/Properties/AssemblyInfo.cs index fe24becb2663..c05960f9edd3 100644 --- a/sdk/code-analysis/ServiceAnalysis/ControlTower/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/ControlTower/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.27")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.4")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/CostAndUsageReport/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/CostAndUsageReport/Properties/AssemblyInfo.cs index 0ebb0e8a0552..b3ada4a0d3fc 100644 --- a/sdk/code-analysis/ServiceAnalysis/CostAndUsageReport/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/CostAndUsageReport/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/CostExplorer/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/CostExplorer/Properties/AssemblyInfo.cs index 5784bdf1a1de..2cce4c1240dc 100644 --- a/sdk/code-analysis/ServiceAnalysis/CostExplorer/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/CostExplorer/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.5")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.32")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/CostOptimizationHub/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/CostOptimizationHub/Properties/AssemblyInfo.cs index cf85b21fc394..c92f843bc8f3 100644 --- a/sdk/code-analysis/ServiceAnalysis/CostOptimizationHub/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/CostOptimizationHub/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.23")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.50")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/CustomerProfiles/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/CustomerProfiles/Properties/AssemblyInfo.cs index 4f1c8ae27795..3ed4972e2a37 100644 --- a/sdk/code-analysis/ServiceAnalysis/CustomerProfiles/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/CustomerProfiles/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.0")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.27")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/DAX/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/DAX/Properties/AssemblyInfo.cs index 4dd11133f62d..ce63c864fec2 100644 --- a/sdk/code-analysis/ServiceAnalysis/DAX/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/DAX/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/DLM/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/DLM/Properties/AssemblyInfo.cs index 9f036901f710..87ed134c4d34 100644 --- a/sdk/code-analysis/ServiceAnalysis/DLM/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/DLM/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/DataExchange/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/DataExchange/Properties/AssemblyInfo.cs index 88746a728757..82a405ce1959 100644 --- a/sdk/code-analysis/ServiceAnalysis/DataExchange/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/DataExchange/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.17")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/DataPipeline/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/DataPipeline/Properties/AssemblyInfo.cs index 5d7a60237568..e2280ff29cf3 100644 --- a/sdk/code-analysis/ServiceAnalysis/DataPipeline/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/DataPipeline/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/DataSync/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/DataSync/Properties/AssemblyInfo.cs index e09ebc44ffc5..7251d7d4a97f 100644 --- a/sdk/code-analysis/ServiceAnalysis/DataSync/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/DataSync/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.10")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/DataZone/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/DataZone/Properties/AssemblyInfo.cs index c4ba093af419..84c00c8d992f 100644 --- a/sdk/code-analysis/ServiceAnalysis/DataZone/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/DataZone/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.405.13")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.406.17")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/DatabaseMigrationService/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/DatabaseMigrationService/Properties/AssemblyInfo.cs index 445fb3155caf..982de72548ae 100644 --- a/sdk/code-analysis/ServiceAnalysis/DatabaseMigrationService/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/DatabaseMigrationService/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.402.17")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/Deadline/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/Deadline/Properties/AssemblyInfo.cs index 4ebd401fb928..75ccca96068e 100644 --- a/sdk/code-analysis/ServiceAnalysis/Deadline/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/Deadline/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.18")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.403.2")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/Detective/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/Detective/Properties/AssemblyInfo.cs index e0ad84367423..7ed39c30140e 100644 --- a/sdk/code-analysis/ServiceAnalysis/Detective/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/Detective/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/DevOpsGuru/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/DevOpsGuru/Properties/AssemblyInfo.cs index d537c8ee0218..e0632b4f12d5 100644 --- a/sdk/code-analysis/ServiceAnalysis/DevOpsGuru/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/DevOpsGuru/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/DeviceFarm/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/DeviceFarm/Properties/AssemblyInfo.cs index 45cdd7fbbf76..3ce818501564 100644 --- a/sdk/code-analysis/ServiceAnalysis/DeviceFarm/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/DeviceFarm/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.14")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.41")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/DirectConnect/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/DirectConnect/Properties/AssemblyInfo.cs index 79d7918a5345..a9c63e4ca229 100644 --- a/sdk/code-analysis/ServiceAnalysis/DirectConnect/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/DirectConnect/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/DirectoryService/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/DirectoryService/Properties/AssemblyInfo.cs index 238f874b2596..6a78fa193bd0 100644 --- a/sdk/code-analysis/ServiceAnalysis/DirectoryService/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/DirectoryService/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.5")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.32")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/DirectoryServiceData/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/DirectoryServiceData/Properties/AssemblyInfo.cs index dced3396c8f9..b2483aa3d812 100644 --- a/sdk/code-analysis/ServiceAnalysis/DirectoryServiceData/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/DirectoryServiceData/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.5")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.32")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/DocDB/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/DocDB/Properties/AssemblyInfo.cs index 1466353e57af..617686847405 100644 --- a/sdk/code-analysis/ServiceAnalysis/DocDB/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/DocDB/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.20")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.47")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/DocDBElastic/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/DocDBElastic/Properties/AssemblyInfo.cs index a0361a887384..eefbbc11b599 100644 --- a/sdk/code-analysis/ServiceAnalysis/DocDBElastic/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/DocDBElastic/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.8")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/Drs/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/Drs/Properties/AssemblyInfo.cs index 6cebd796b167..ac02b0ef68f3 100644 --- a/sdk/code-analysis/ServiceAnalysis/Drs/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/Drs/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/DynamoDBv2/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/DynamoDBv2/Properties/AssemblyInfo.cs index 47c526ba7a53..02501bad8995 100644 --- a/sdk/code-analysis/ServiceAnalysis/DynamoDBv2/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/DynamoDBv2/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.4")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.403.3")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/EBS/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/EBS/Properties/AssemblyInfo.cs index a0678e0dd9bc..5406d8fa04e4 100644 --- a/sdk/code-analysis/ServiceAnalysis/EBS/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/EBS/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/EC2/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/EC2/Properties/AssemblyInfo.cs index e420e80fa1ca..90b26d309cb1 100644 --- a/sdk/code-analysis/ServiceAnalysis/EC2/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/EC2/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.406.4")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.416.0")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/EC2InstanceConnect/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/EC2InstanceConnect/Properties/AssemblyInfo.cs index 61a00614f779..5e93196abc9a 100644 --- a/sdk/code-analysis/ServiceAnalysis/EC2InstanceConnect/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/EC2InstanceConnect/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/ECR/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/ECR/Properties/AssemblyInfo.cs index 67dec5d8a87d..4db103d66a33 100644 --- a/sdk/code-analysis/ServiceAnalysis/ECR/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/ECR/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.404.5")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.404.32")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/ECRPublic/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/ECRPublic/Properties/AssemblyInfo.cs index 1d3206295c5a..478f6050de9f 100644 --- a/sdk/code-analysis/ServiceAnalysis/ECRPublic/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/ECRPublic/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/ECS/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/ECS/Properties/AssemblyInfo.cs index 954308ed8559..042e9318feea 100644 --- a/sdk/code-analysis/ServiceAnalysis/ECS/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/ECS/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.402.21")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.404.10")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/EKS/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/EKS/Properties/AssemblyInfo.cs index 35ea50393500..4bbc3c64a5ad 100644 --- a/sdk/code-analysis/ServiceAnalysis/EKS/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/EKS/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.402.22")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.404.6")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/EKSAuth/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/EKSAuth/Properties/AssemblyInfo.cs index e28a98023083..44f4b5deb9d9 100644 --- a/sdk/code-analysis/ServiceAnalysis/EKSAuth/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/EKSAuth/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/EMRContainers/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/EMRContainers/Properties/AssemblyInfo.cs index 9e95f4b9a738..d4846d5b879c 100644 --- a/sdk/code-analysis/ServiceAnalysis/EMRContainers/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/EMRContainers/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.15")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.42")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/EMRServerless/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/EMRServerless/Properties/AssemblyInfo.cs index 278f1f0dd2ac..1f715f0a8886 100644 --- a/sdk/code-analysis/ServiceAnalysis/EMRServerless/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/EMRServerless/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.4")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.31")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/ElastiCache/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/ElastiCache/Properties/AssemblyInfo.cs index c6964f906e72..60344d92a258 100644 --- a/sdk/code-analysis/ServiceAnalysis/ElastiCache/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/ElastiCache/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.21")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/ElasticBeanstalk/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/ElasticBeanstalk/Properties/AssemblyInfo.cs index 203dc93246f7..63093278dff3 100644 --- a/sdk/code-analysis/ServiceAnalysis/ElasticBeanstalk/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/ElasticBeanstalk/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/ElasticFileSystem/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/ElasticFileSystem/Properties/AssemblyInfo.cs index a7cd0d1183cb..06b4ce5e4a7c 100644 --- a/sdk/code-analysis/ServiceAnalysis/ElasticFileSystem/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/ElasticFileSystem/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/ElasticInference/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/ElasticInference/Properties/AssemblyInfo.cs index 8f9242e69146..99d56b7477cf 100644 --- a/sdk/code-analysis/ServiceAnalysis/ElasticInference/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/ElasticInference/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.54")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/ElasticLoadBalancing/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/ElasticLoadBalancing/Properties/AssemblyInfo.cs index e508949d9736..d4272c36ebbd 100644 --- a/sdk/code-analysis/ServiceAnalysis/ElasticLoadBalancing/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/ElasticLoadBalancing/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.24")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.51")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/ElasticLoadBalancingV2/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/ElasticLoadBalancingV2/Properties/AssemblyInfo.cs index 18768ae49c4f..a89a16064b45 100644 --- a/sdk/code-analysis/ServiceAnalysis/ElasticLoadBalancingV2/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/ElasticLoadBalancingV2/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.404.7")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.406.9")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/ElasticMapReduce/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/ElasticMapReduce/Properties/AssemblyInfo.cs index 2bf0d9fb1b92..1096c6496a27 100644 --- a/sdk/code-analysis/ServiceAnalysis/ElasticMapReduce/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/ElasticMapReduce/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.7")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.402.20")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/ElasticTranscoder/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/ElasticTranscoder/Properties/AssemblyInfo.cs index 63f6b70876ae..fc94884736d2 100644 --- a/sdk/code-analysis/ServiceAnalysis/ElasticTranscoder/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/ElasticTranscoder/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/Elasticsearch/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/Elasticsearch/Properties/AssemblyInfo.cs index eb753a927c3d..167ced998df4 100644 --- a/sdk/code-analysis/ServiceAnalysis/Elasticsearch/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/Elasticsearch/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/EntityResolution/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/EntityResolution/Properties/AssemblyInfo.cs index 93a765b496b2..2dd0473dd987 100644 --- a/sdk/code-analysis/ServiceAnalysis/EntityResolution/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/EntityResolution/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.16")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.43")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/EventBridge/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/EventBridge/Properties/AssemblyInfo.cs index c50684f1defe..59f0627a891f 100644 --- a/sdk/code-analysis/ServiceAnalysis/EventBridge/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/EventBridge/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.24")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.51")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/FIS/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/FIS/Properties/AssemblyInfo.cs index 25f446c21110..af67f496f077 100644 --- a/sdk/code-analysis/ServiceAnalysis/FIS/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/FIS/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.402.12")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.403.4")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/FMS/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/FMS/Properties/AssemblyInfo.cs index 781e611d8893..aa7ed9753f7d 100644 --- a/sdk/code-analysis/ServiceAnalysis/FMS/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/FMS/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.17")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/FSx/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/FSx/Properties/AssemblyInfo.cs index 4577e715f15d..4aee68d7eb57 100644 --- a/sdk/code-analysis/ServiceAnalysis/FSx/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/FSx/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/FinSpaceData/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/FinSpaceData/Properties/AssemblyInfo.cs index 572c0e100ca6..04d9c1805aec 100644 --- a/sdk/code-analysis/ServiceAnalysis/FinSpaceData/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/FinSpaceData/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/Finspace/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/Finspace/Properties/AssemblyInfo.cs index dc333a9b0397..d5e5a8b88531 100644 --- a/sdk/code-analysis/ServiceAnalysis/Finspace/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/Finspace/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/ForecastQueryService/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/ForecastQueryService/Properties/AssemblyInfo.cs index 1efabb00e5dc..d496e3d2c545 100644 --- a/sdk/code-analysis/ServiceAnalysis/ForecastQueryService/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/ForecastQueryService/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/ForecastService/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/ForecastService/Properties/AssemblyInfo.cs index 43edf91a4d34..46fc5170999d 100644 --- a/sdk/code-analysis/ServiceAnalysis/ForecastService/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/ForecastService/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/FraudDetector/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/FraudDetector/Properties/AssemblyInfo.cs index 6bf777beba66..471d3fbcebc7 100644 --- a/sdk/code-analysis/ServiceAnalysis/FraudDetector/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/FraudDetector/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/FreeTier/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/FreeTier/Properties/AssemblyInfo.cs index 78b5492b2fa1..bc8e656e4996 100644 --- a/sdk/code-analysis/ServiceAnalysis/FreeTier/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/FreeTier/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/GameLift/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/GameLift/Properties/AssemblyInfo.cs index 1b4a6077d4bd..97748f0ff0fd 100644 --- a/sdk/code-analysis/ServiceAnalysis/GameLift/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/GameLift/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.11")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.402.4")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/GeoMaps/AWSSDK.GeoMaps.CodeAnalysis.csproj b/sdk/code-analysis/ServiceAnalysis/GeoMaps/AWSSDK.GeoMaps.CodeAnalysis.csproj index 6c00afd6855f..9bbbaebc9962 100644 --- a/sdk/code-analysis/ServiceAnalysis/GeoMaps/AWSSDK.GeoMaps.CodeAnalysis.csproj +++ b/sdk/code-analysis/ServiceAnalysis/GeoMaps/AWSSDK.GeoMaps.CodeAnalysis.csproj @@ -18,7 +18,8 @@ - + + diff --git a/sdk/code-analysis/ServiceAnalysis/GeoMaps/Generated/NullCollectionInitializerAnalyzer.cs b/sdk/code-analysis/ServiceAnalysis/GeoMaps/Generated/NullCollectionInitializerAnalyzer.cs new file mode 100644 index 000000000000..c817e38c5fce --- /dev/null +++ b/sdk/code-analysis/ServiceAnalysis/GeoMaps/Generated/NullCollectionInitializerAnalyzer.cs @@ -0,0 +1,16 @@ +using Microsoft.CodeAnalysis; +using Microsoft.CodeAnalysis.Diagnostics; + +using Amazon.CodeAnalysis.Shared; + +namespace Amazon.GeoMaps.CodeAnalysis +{ + [DiagnosticAnalyzer(LanguageNames.CSharp)] + public class NullCollectionInitializerAnalyzer : AbstractNullCollectionInitializerAnalyzer + { + protected override string GetModelNamespace() + { + return "Amazon.GeoMaps.Model"; + } + } +} \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/GeoMaps/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/GeoMaps/Properties/AssemblyInfo.cs index e4e446ca8f51..b4521270daa2 100644 --- a/sdk/code-analysis/ServiceAnalysis/GeoMaps/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/GeoMaps/Properties/AssemblyInfo.cs @@ -5,7 +5,7 @@ // set of attributes. Change these attribute values to modify the information // associated with an assembly. [assembly: AssemblyTitle("AWSSDK.GeoMaps")] -[assembly: AssemblyDescription("The Amazon Web Services SDK for .NET (3.5) - Amazon Location Service Maps V2. Release of Amazon Location Maps API. Maps enables you to build digital maps that showcase your locations, visualize your data, and unlock insights to drive your business")] +[assembly: AssemblyDescription("The Amazon Web Services SDK for .NET - Amazon Location Service Maps V2. Release of Amazon Location Maps API. Maps enables you to build digital maps that showcase your locations, visualize your data, and unlock insights to drive your business")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyProduct("Amazon Web Services SDK for .NET")] [assembly: AssemblyCompany("Amazon.com, Inc")] @@ -28,5 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.10")] \ No newline at end of file +[assembly: AssemblyVersion("4.0")] +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/GeoPlaces/AWSSDK.GeoPlaces.CodeAnalysis.csproj b/sdk/code-analysis/ServiceAnalysis/GeoPlaces/AWSSDK.GeoPlaces.CodeAnalysis.csproj index ad2fb21b31e8..eb19a6d0f480 100644 --- a/sdk/code-analysis/ServiceAnalysis/GeoPlaces/AWSSDK.GeoPlaces.CodeAnalysis.csproj +++ b/sdk/code-analysis/ServiceAnalysis/GeoPlaces/AWSSDK.GeoPlaces.CodeAnalysis.csproj @@ -18,7 +18,8 @@ - + + diff --git a/sdk/code-analysis/ServiceAnalysis/GeoPlaces/Generated/NullCollectionInitializerAnalyzer.cs b/sdk/code-analysis/ServiceAnalysis/GeoPlaces/Generated/NullCollectionInitializerAnalyzer.cs new file mode 100644 index 000000000000..4f1ebbb60766 --- /dev/null +++ b/sdk/code-analysis/ServiceAnalysis/GeoPlaces/Generated/NullCollectionInitializerAnalyzer.cs @@ -0,0 +1,16 @@ +using Microsoft.CodeAnalysis; +using Microsoft.CodeAnalysis.Diagnostics; + +using Amazon.CodeAnalysis.Shared; + +namespace Amazon.GeoPlaces.CodeAnalysis +{ + [DiagnosticAnalyzer(LanguageNames.CSharp)] + public class NullCollectionInitializerAnalyzer : AbstractNullCollectionInitializerAnalyzer + { + protected override string GetModelNamespace() + { + return "Amazon.GeoPlaces.Model"; + } + } +} \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/GeoPlaces/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/GeoPlaces/Properties/AssemblyInfo.cs index 623997666982..541de5a2309b 100644 --- a/sdk/code-analysis/ServiceAnalysis/GeoPlaces/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/GeoPlaces/Properties/AssemblyInfo.cs @@ -5,7 +5,7 @@ // set of attributes. Change these attribute values to modify the information // associated with an assembly. [assembly: AssemblyTitle("AWSSDK.GeoPlaces")] -[assembly: AssemblyDescription("The Amazon Web Services SDK for .NET (3.5) - Amazon Location Service Places V2. Release of Amazon Location Places API. Places enables you to quickly search, display, and filter places, businesses, and locations based on proximity, category, and name")] +[assembly: AssemblyDescription("The Amazon Web Services SDK for .NET - Amazon Location Service Places V2. Release of Amazon Location Places API. Places enables you to quickly search, display, and filter places, businesses, and locations based on proximity, category, and name")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyProduct("Amazon Web Services SDK for .NET")] [assembly: AssemblyCompany("Amazon.com, Inc")] @@ -28,5 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.10")] \ No newline at end of file +[assembly: AssemblyVersion("4.0")] +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/GeoRoutes/AWSSDK.GeoRoutes.CodeAnalysis.csproj b/sdk/code-analysis/ServiceAnalysis/GeoRoutes/AWSSDK.GeoRoutes.CodeAnalysis.csproj index 745af5d75a7d..bdc83886402a 100644 --- a/sdk/code-analysis/ServiceAnalysis/GeoRoutes/AWSSDK.GeoRoutes.CodeAnalysis.csproj +++ b/sdk/code-analysis/ServiceAnalysis/GeoRoutes/AWSSDK.GeoRoutes.CodeAnalysis.csproj @@ -18,7 +18,8 @@ - + + diff --git a/sdk/code-analysis/ServiceAnalysis/GeoRoutes/Generated/NullCollectionInitializerAnalyzer.cs b/sdk/code-analysis/ServiceAnalysis/GeoRoutes/Generated/NullCollectionInitializerAnalyzer.cs new file mode 100644 index 000000000000..9d37093d089c --- /dev/null +++ b/sdk/code-analysis/ServiceAnalysis/GeoRoutes/Generated/NullCollectionInitializerAnalyzer.cs @@ -0,0 +1,16 @@ +using Microsoft.CodeAnalysis; +using Microsoft.CodeAnalysis.Diagnostics; + +using Amazon.CodeAnalysis.Shared; + +namespace Amazon.GeoRoutes.CodeAnalysis +{ + [DiagnosticAnalyzer(LanguageNames.CSharp)] + public class NullCollectionInitializerAnalyzer : AbstractNullCollectionInitializerAnalyzer + { + protected override string GetModelNamespace() + { + return "Amazon.GeoRoutes.Model"; + } + } +} \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/GeoRoutes/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/GeoRoutes/Properties/AssemblyInfo.cs index d6c5e0d1c349..73289eabdc4d 100644 --- a/sdk/code-analysis/ServiceAnalysis/GeoRoutes/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/GeoRoutes/Properties/AssemblyInfo.cs @@ -5,7 +5,7 @@ // set of attributes. Change these attribute values to modify the information // associated with an assembly. [assembly: AssemblyTitle("AWSSDK.GeoRoutes")] -[assembly: AssemblyDescription("The Amazon Web Services SDK for .NET (3.5) - Amazon Location Service Routes V2. Release of Amazon Location Routes API. Routes enables you to plan efficient routes and streamline deliveries by leveraging real-time traffic, vehicle restrictions, and turn-by-turn directions.")] +[assembly: AssemblyDescription("The Amazon Web Services SDK for .NET - Amazon Location Service Routes V2. Release of Amazon Location Routes API. Routes enables you to plan efficient routes and streamline deliveries by leveraging real-time traffic, vehicle restrictions, and turn-by-turn directions.")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyProduct("Amazon Web Services SDK for .NET")] [assembly: AssemblyCompany("Amazon.com, Inc")] @@ -28,5 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.10")] \ No newline at end of file +[assembly: AssemblyVersion("4.0")] +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/Glacier/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/Glacier/Properties/AssemblyInfo.cs index c008c5d3e536..bf68933b5fdf 100644 --- a/sdk/code-analysis/ServiceAnalysis/Glacier/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/Glacier/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/GlobalAccelerator/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/GlobalAccelerator/Properties/AssemblyInfo.cs index 51899020a068..88dbab50ac89 100644 --- a/sdk/code-analysis/ServiceAnalysis/GlobalAccelerator/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/GlobalAccelerator/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/Glue/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/Glue/Properties/AssemblyInfo.cs index d6a8ecd73139..f058ef2462d1 100644 --- a/sdk/code-analysis/ServiceAnalysis/Glue/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/Glue/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.408.4")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.409.9")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/GlueDataBrew/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/GlueDataBrew/Properties/AssemblyInfo.cs index 959a53851b94..6e94866ac0c8 100644 --- a/sdk/code-analysis/ServiceAnalysis/GlueDataBrew/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/GlueDataBrew/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/Greengrass/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/Greengrass/Properties/AssemblyInfo.cs index a5a8971483e9..fbc14283e1c1 100644 --- a/sdk/code-analysis/ServiceAnalysis/Greengrass/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/Greengrass/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/GreengrassV2/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/GreengrassV2/Properties/AssemblyInfo.cs index 775644695a15..b9469a1aa195 100644 --- a/sdk/code-analysis/ServiceAnalysis/GreengrassV2/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/GreengrassV2/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/GroundStation/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/GroundStation/Properties/AssemblyInfo.cs index 5cd1bcc70ee9..4c9fb1fd7db4 100644 --- a/sdk/code-analysis/ServiceAnalysis/GroundStation/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/GroundStation/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.27")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.54")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/GuardDuty/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/GuardDuty/Properties/AssemblyInfo.cs index 91e17f148201..3b959039fdfe 100644 --- a/sdk/code-analysis/ServiceAnalysis/GuardDuty/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/GuardDuty/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.402.5")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.404.8")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/HealthLake/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/HealthLake/Properties/AssemblyInfo.cs index 80619d6704e1..cc9b806d9cda 100644 --- a/sdk/code-analysis/ServiceAnalysis/HealthLake/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/HealthLake/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/IAMRolesAnywhere/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/IAMRolesAnywhere/Properties/AssemblyInfo.cs index c1290774be9d..d240a01cd3c8 100644 --- a/sdk/code-analysis/ServiceAnalysis/IAMRolesAnywhere/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/IAMRolesAnywhere/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.24")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.51")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/IVS/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/IVS/Properties/AssemblyInfo.cs index 476d36be46d4..ffe7adbb055f 100644 --- a/sdk/code-analysis/ServiceAnalysis/IVS/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/IVS/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.402.2")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/IVSRealTime/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/IVSRealTime/Properties/AssemblyInfo.cs index a9ccef7d448c..39d6ac8ea7c2 100644 --- a/sdk/code-analysis/ServiceAnalysis/IVSRealTime/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/IVSRealTime/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.9")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.402.25")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/IdentityManagement/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/IdentityManagement/Properties/AssemblyInfo.cs index cb345ed74c25..2c8acf661e57 100644 --- a/sdk/code-analysis/ServiceAnalysis/IdentityManagement/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/IdentityManagement/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.402.20")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.403.2")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/IdentityStore/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/IdentityStore/Properties/AssemblyInfo.cs index 2406597786fc..16612dd09973 100644 --- a/sdk/code-analysis/ServiceAnalysis/IdentityStore/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/IdentityStore/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/Imagebuilder/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/Imagebuilder/Properties/AssemblyInfo.cs index bc4470b61556..39e28097d4f3 100644 --- a/sdk/code-analysis/ServiceAnalysis/Imagebuilder/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/Imagebuilder/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.16")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/ImportExport/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/ImportExport/Properties/AssemblyInfo.cs index 7c6be5eab8ad..f7e19064f774 100644 --- a/sdk/code-analysis/ServiceAnalysis/ImportExport/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/ImportExport/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/Inspector/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/Inspector/Properties/AssemblyInfo.cs index 0f4534786ea8..95fcc12b7225 100644 --- a/sdk/code-analysis/ServiceAnalysis/Inspector/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/Inspector/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/Inspector2/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/Inspector2/Properties/AssemblyInfo.cs index eda5c1e6144b..9f018a11fd3a 100644 --- a/sdk/code-analysis/ServiceAnalysis/Inspector2/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/Inspector2/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.402.15")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.403.5")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/InspectorScan/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/InspectorScan/Properties/AssemblyInfo.cs index c223ba2d3fde..9feeb90fa1dd 100644 --- a/sdk/code-analysis/ServiceAnalysis/InspectorScan/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/InspectorScan/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/InternetMonitor/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/InternetMonitor/Properties/AssemblyInfo.cs index 81fb7b30990e..45e28bceca91 100644 --- a/sdk/code-analysis/ServiceAnalysis/InternetMonitor/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/InternetMonitor/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.14")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.402.3")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/IoT/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/IoT/Properties/AssemblyInfo.cs index 75dce3168634..a17a18868d37 100644 --- a/sdk/code-analysis/ServiceAnalysis/IoT/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/IoT/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.5")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.403.0")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/IoT1ClickDevicesService/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/IoT1ClickDevicesService/Properties/AssemblyInfo.cs index 4d3239c0ee96..9b10b88ba651 100644 --- a/sdk/code-analysis/ServiceAnalysis/IoT1ClickDevicesService/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/IoT1ClickDevicesService/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/IoT1ClickProjects/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/IoT1ClickProjects/Properties/AssemblyInfo.cs index d38b6cbf8cb0..ce55af1b2cfc 100644 --- a/sdk/code-analysis/ServiceAnalysis/IoT1ClickProjects/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/IoT1ClickProjects/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/IoTAnalytics/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/IoTAnalytics/Properties/AssemblyInfo.cs index 0b6dd67e0bf4..84cded5e4cd8 100644 --- a/sdk/code-analysis/ServiceAnalysis/IoTAnalytics/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/IoTAnalytics/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/IoTDeviceAdvisor/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/IoTDeviceAdvisor/Properties/AssemblyInfo.cs index 13659266ac80..8c82aeea3777 100644 --- a/sdk/code-analysis/ServiceAnalysis/IoTDeviceAdvisor/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/IoTDeviceAdvisor/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.25")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/IoTEvents/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/IoTEvents/Properties/AssemblyInfo.cs index 3642cd16e183..f0768fad769a 100644 --- a/sdk/code-analysis/ServiceAnalysis/IoTEvents/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/IoTEvents/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/IoTEventsData/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/IoTEventsData/Properties/AssemblyInfo.cs index 1122609e28d0..ac39093f05ce 100644 --- a/sdk/code-analysis/ServiceAnalysis/IoTEventsData/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/IoTEventsData/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/IoTFleetHub/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/IoTFleetHub/Properties/AssemblyInfo.cs index 431454396c3d..3236bdfa6c6a 100644 --- a/sdk/code-analysis/ServiceAnalysis/IoTFleetHub/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/IoTFleetHub/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/IoTFleetWise/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/IoTFleetWise/Properties/AssemblyInfo.cs index 869cca4a1c77..9369f8c0662a 100644 --- a/sdk/code-analysis/ServiceAnalysis/IoTFleetWise/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/IoTFleetWise/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.402.11")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/IoTJobsDataPlane/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/IoTJobsDataPlane/Properties/AssemblyInfo.cs index fd9973e5da39..33aa5419dae0 100644 --- a/sdk/code-analysis/ServiceAnalysis/IoTJobsDataPlane/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/IoTJobsDataPlane/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/IoTSecureTunneling/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/IoTSecureTunneling/Properties/AssemblyInfo.cs index d14a8718fd05..3fb7ecf1e1f8 100644 --- a/sdk/code-analysis/ServiceAnalysis/IoTSecureTunneling/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/IoTSecureTunneling/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/IoTSiteWise/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/IoTSiteWise/Properties/AssemblyInfo.cs index 5070b481f730..c61fb7e92d1e 100644 --- a/sdk/code-analysis/ServiceAnalysis/IoTSiteWise/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/IoTSiteWise/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.15")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.42")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/IoTThingsGraph/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/IoTThingsGraph/Properties/AssemblyInfo.cs index c36b3ef851ba..54a90d1b7dc6 100644 --- a/sdk/code-analysis/ServiceAnalysis/IoTThingsGraph/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/IoTThingsGraph/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/IoTTwinMaker/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/IoTTwinMaker/Properties/AssemblyInfo.cs index b83a1999b213..ffcd84e2f179 100644 --- a/sdk/code-analysis/ServiceAnalysis/IoTTwinMaker/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/IoTTwinMaker/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/IoTWireless/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/IoTWireless/Properties/AssemblyInfo.cs index d74091f7569f..feed8314b9fd 100644 --- a/sdk/code-analysis/ServiceAnalysis/IoTWireless/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/IoTWireless/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.2")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/IotData/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/IotData/Properties/AssemblyInfo.cs index 43476ae2b7de..862832adbb37 100644 --- a/sdk/code-analysis/ServiceAnalysis/IotData/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/IotData/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.23")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/Ivschat/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/Ivschat/Properties/AssemblyInfo.cs index d310dc0d4971..ea6d76d4b39f 100644 --- a/sdk/code-analysis/ServiceAnalysis/Ivschat/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/Ivschat/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/Kafka/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/Kafka/Properties/AssemblyInfo.cs index fccad9bdc32f..705a4c4d15c4 100644 --- a/sdk/code-analysis/ServiceAnalysis/Kafka/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/Kafka/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.9")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.36")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/KafkaConnect/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/KafkaConnect/Properties/AssemblyInfo.cs index 2901c153f243..e244c53d9435 100644 --- a/sdk/code-analysis/ServiceAnalysis/KafkaConnect/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/KafkaConnect/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/Kendra/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/Kendra/Properties/AssemblyInfo.cs index a6896382838c..a7d5d9e0148a 100644 --- a/sdk/code-analysis/ServiceAnalysis/Kendra/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/Kendra/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/KendraRanking/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/KendraRanking/Properties/AssemblyInfo.cs index 8735e132b031..1a8549235dc8 100644 --- a/sdk/code-analysis/ServiceAnalysis/KendraRanking/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/KendraRanking/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/KeyManagementService/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/KeyManagementService/Properties/AssemblyInfo.cs index 133bd14d4c11..d1ffe05cea20 100644 --- a/sdk/code-analysis/ServiceAnalysis/KeyManagementService/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/KeyManagementService/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/Keyspaces/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/Keyspaces/Properties/AssemblyInfo.cs index 71cccdd442b6..0da042edb6ea 100644 --- a/sdk/code-analysis/ServiceAnalysis/Keyspaces/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/Keyspaces/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.10")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/Kinesis/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/Kinesis/Properties/AssemblyInfo.cs index 60352b6918d5..0edee61f4114 100644 --- a/sdk/code-analysis/ServiceAnalysis/Kinesis/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/Kinesis/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.402.3")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.402.30")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/KinesisAnalytics/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/KinesisAnalytics/Properties/AssemblyInfo.cs index 20c302f504f9..bd715727c571 100644 --- a/sdk/code-analysis/ServiceAnalysis/KinesisAnalytics/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/KinesisAnalytics/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/KinesisAnalyticsV2/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/KinesisAnalyticsV2/Properties/AssemblyInfo.cs index cfbf95268bae..a923c789ec7f 100644 --- a/sdk/code-analysis/ServiceAnalysis/KinesisAnalyticsV2/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/KinesisAnalyticsV2/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.11")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.38")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/KinesisFirehose/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/KinesisFirehose/Properties/AssemblyInfo.cs index cc020a43d0ba..3f47037f7bc8 100644 --- a/sdk/code-analysis/ServiceAnalysis/KinesisFirehose/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/KinesisFirehose/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.6")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/KinesisVideo/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/KinesisVideo/Properties/AssemblyInfo.cs index 9ccb39150b2d..33e1c1b8cc50 100644 --- a/sdk/code-analysis/ServiceAnalysis/KinesisVideo/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/KinesisVideo/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/KinesisVideoArchivedMedia/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/KinesisVideoArchivedMedia/Properties/AssemblyInfo.cs index 2f9e5617fb16..bf283f0a24be 100644 --- a/sdk/code-analysis/ServiceAnalysis/KinesisVideoArchivedMedia/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/KinesisVideoArchivedMedia/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/KinesisVideoMedia/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/KinesisVideoMedia/Properties/AssemblyInfo.cs index ea3b2ae57745..ae9d0cbd0d2c 100644 --- a/sdk/code-analysis/ServiceAnalysis/KinesisVideoMedia/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/KinesisVideoMedia/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/KinesisVideoSignalingChannels/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/KinesisVideoSignalingChannels/Properties/AssemblyInfo.cs index 58d9ca6a792d..ae3621dd194b 100644 --- a/sdk/code-analysis/ServiceAnalysis/KinesisVideoSignalingChannels/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/KinesisVideoSignalingChannels/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/KinesisVideoWebRTCStorage/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/KinesisVideoWebRTCStorage/Properties/AssemblyInfo.cs index 8fc44051a562..0e0fb2679af7 100644 --- a/sdk/code-analysis/ServiceAnalysis/KinesisVideoWebRTCStorage/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/KinesisVideoWebRTCStorage/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.23")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.50")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/LakeFormation/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/LakeFormation/Properties/AssemblyInfo.cs index 9a4e4e41d71f..719770217687 100644 --- a/sdk/code-analysis/ServiceAnalysis/LakeFormation/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/LakeFormation/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.8")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/Lambda/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/Lambda/Properties/AssemblyInfo.cs index b433c9b1fcdf..03b21a352b18 100644 --- a/sdk/code-analysis/ServiceAnalysis/Lambda/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/Lambda/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.405.1")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.408.5")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/LaunchWizard/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/LaunchWizard/Properties/AssemblyInfo.cs index c7695086c4b5..7bfdbd172949 100644 --- a/sdk/code-analysis/ServiceAnalysis/LaunchWizard/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/LaunchWizard/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/Lex/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/Lex/Properties/AssemblyInfo.cs index 4ac50625dc57..80a7f6508ba2 100644 --- a/sdk/code-analysis/ServiceAnalysis/Lex/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/Lex/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/LexModelBuildingService/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/LexModelBuildingService/Properties/AssemblyInfo.cs index 65ac1243549b..d7a085e4c364 100644 --- a/sdk/code-analysis/ServiceAnalysis/LexModelBuildingService/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/LexModelBuildingService/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/LexModelsV2/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/LexModelsV2/Properties/AssemblyInfo.cs index 976701845c7b..e669cfab4f66 100644 --- a/sdk/code-analysis/ServiceAnalysis/LexModelsV2/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/LexModelsV2/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.402.7")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.402.34")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/LexRuntimeV2/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/LexRuntimeV2/Properties/AssemblyInfo.cs index 6a00033a66a2..5b8c0990bd47 100644 --- a/sdk/code-analysis/ServiceAnalysis/LexRuntimeV2/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/LexRuntimeV2/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/LicenseManager/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/LicenseManager/Properties/AssemblyInfo.cs index e64a10d3f5fb..94af63c15517 100644 --- a/sdk/code-analysis/ServiceAnalysis/LicenseManager/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/LicenseManager/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/LicenseManagerLinuxSubscriptions/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/LicenseManagerLinuxSubscriptions/Properties/AssemblyInfo.cs index 42a8f3e25a3d..a9b92eb4b990 100644 --- a/sdk/code-analysis/ServiceAnalysis/LicenseManagerLinuxSubscriptions/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/LicenseManagerLinuxSubscriptions/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/LicenseManagerUserSubscriptions/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/LicenseManagerUserSubscriptions/Properties/AssemblyInfo.cs index 124908d0b320..4a97df09e026 100644 --- a/sdk/code-analysis/ServiceAnalysis/LicenseManagerUserSubscriptions/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/LicenseManagerUserSubscriptions/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.2")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/Lightsail/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/Lightsail/Properties/AssemblyInfo.cs index 33153fbb7dd6..80fc3cdbfa50 100644 --- a/sdk/code-analysis/ServiceAnalysis/Lightsail/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/Lightsail/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/LocationService/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/LocationService/Properties/AssemblyInfo.cs index 00d4303b356d..5f5548ee5a36 100644 --- a/sdk/code-analysis/ServiceAnalysis/LocationService/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/LocationService/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/LookoutEquipment/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/LookoutEquipment/Properties/AssemblyInfo.cs index 0f162c485c7b..e0bfaae3f570 100644 --- a/sdk/code-analysis/ServiceAnalysis/LookoutEquipment/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/LookoutEquipment/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/LookoutMetrics/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/LookoutMetrics/Properties/AssemblyInfo.cs index e0d475f77e1a..df8cfdc62d5d 100644 --- a/sdk/code-analysis/ServiceAnalysis/LookoutMetrics/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/LookoutMetrics/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/LookoutforVision/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/LookoutforVision/Properties/AssemblyInfo.cs index d3e72faa0976..27503636f741 100644 --- a/sdk/code-analysis/ServiceAnalysis/LookoutforVision/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/LookoutforVision/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/MQ/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/MQ/Properties/AssemblyInfo.cs index ec47e4195531..0320b7875c21 100644 --- a/sdk/code-analysis/ServiceAnalysis/MQ/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/MQ/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/MTurk/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/MTurk/Properties/AssemblyInfo.cs index ad36aeda95ac..b890956b40f7 100644 --- a/sdk/code-analysis/ServiceAnalysis/MTurk/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/MTurk/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/MWAA/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/MWAA/Properties/AssemblyInfo.cs index 2dc2e598065f..e48f124734a7 100644 --- a/sdk/code-analysis/ServiceAnalysis/MWAA/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/MWAA/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.15")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/MachineLearning/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/MachineLearning/Properties/AssemblyInfo.cs index dfecee288d6a..088caef3a430 100644 --- a/sdk/code-analysis/ServiceAnalysis/MachineLearning/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/MachineLearning/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/Macie2/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/Macie2/Properties/AssemblyInfo.cs index 035c0076901e..3e393a1a91af 100644 --- a/sdk/code-analysis/ServiceAnalysis/Macie2/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/Macie2/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/MailManager/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/MailManager/Properties/AssemblyInfo.cs index 968d85dfb4bb..b14fa8b19b4c 100644 --- a/sdk/code-analysis/ServiceAnalysis/MailManager/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/MailManager/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.5")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.402.19")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/MainframeModernization/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/MainframeModernization/Properties/AssemblyInfo.cs index 7ab335c20b8a..1347379e2636 100644 --- a/sdk/code-analysis/ServiceAnalysis/MainframeModernization/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/MainframeModernization/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.16")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/ManagedBlockchain/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/ManagedBlockchain/Properties/AssemblyInfo.cs index 7a3a32db7e92..f7bda4c4c35b 100644 --- a/sdk/code-analysis/ServiceAnalysis/ManagedBlockchain/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/ManagedBlockchain/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/ManagedBlockchainQuery/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/ManagedBlockchainQuery/Properties/AssemblyInfo.cs index 439c28e8c90a..47d8cdc45e56 100644 --- a/sdk/code-analysis/ServiceAnalysis/ManagedBlockchainQuery/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/ManagedBlockchainQuery/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/ManagedGrafana/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/ManagedGrafana/Properties/AssemblyInfo.cs index f4fb54311c6a..013ee4d5c91b 100644 --- a/sdk/code-analysis/ServiceAnalysis/ManagedGrafana/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/ManagedGrafana/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/MarketplaceAgreement/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/MarketplaceAgreement/Properties/AssemblyInfo.cs index 0627fb480d1b..3037372e6d9b 100644 --- a/sdk/code-analysis/ServiceAnalysis/MarketplaceAgreement/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/MarketplaceAgreement/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/MarketplaceCatalog/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/MarketplaceCatalog/Properties/AssemblyInfo.cs index 9d2e91860156..9d5d690fee8b 100644 --- a/sdk/code-analysis/ServiceAnalysis/MarketplaceCatalog/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/MarketplaceCatalog/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/MarketplaceDeployment/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/MarketplaceDeployment/Properties/AssemblyInfo.cs index 9757f3021c20..44cdf5d51126 100644 --- a/sdk/code-analysis/ServiceAnalysis/MarketplaceDeployment/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/MarketplaceDeployment/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/MarketplaceEntitlementService/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/MarketplaceEntitlementService/Properties/AssemblyInfo.cs index ebc795b60b1a..5acc654a4353 100644 --- a/sdk/code-analysis/ServiceAnalysis/MarketplaceEntitlementService/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/MarketplaceEntitlementService/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/MarketplaceReporting/AWSSDK.MarketplaceReporting.CodeAnalysis.csproj b/sdk/code-analysis/ServiceAnalysis/MarketplaceReporting/AWSSDK.MarketplaceReporting.CodeAnalysis.csproj index 591f7a55caab..33ff6847984f 100644 --- a/sdk/code-analysis/ServiceAnalysis/MarketplaceReporting/AWSSDK.MarketplaceReporting.CodeAnalysis.csproj +++ b/sdk/code-analysis/ServiceAnalysis/MarketplaceReporting/AWSSDK.MarketplaceReporting.CodeAnalysis.csproj @@ -18,7 +18,8 @@ - + + diff --git a/sdk/code-analysis/ServiceAnalysis/MarketplaceReporting/Generated/NullCollectionInitializerAnalyzer.cs b/sdk/code-analysis/ServiceAnalysis/MarketplaceReporting/Generated/NullCollectionInitializerAnalyzer.cs new file mode 100644 index 000000000000..81aa48f2ced8 --- /dev/null +++ b/sdk/code-analysis/ServiceAnalysis/MarketplaceReporting/Generated/NullCollectionInitializerAnalyzer.cs @@ -0,0 +1,16 @@ +using Microsoft.CodeAnalysis; +using Microsoft.CodeAnalysis.Diagnostics; + +using Amazon.CodeAnalysis.Shared; + +namespace Amazon.MarketplaceReporting.CodeAnalysis +{ + [DiagnosticAnalyzer(LanguageNames.CSharp)] + public class NullCollectionInitializerAnalyzer : AbstractNullCollectionInitializerAnalyzer + { + protected override string GetModelNamespace() + { + return "Amazon.MarketplaceReporting.Model"; + } + } +} \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/MarketplaceReporting/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/MarketplaceReporting/Properties/AssemblyInfo.cs index 35db1542cf9e..5bb0df0da253 100644 --- a/sdk/code-analysis/ServiceAnalysis/MarketplaceReporting/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/MarketplaceReporting/Properties/AssemblyInfo.cs @@ -5,7 +5,7 @@ // set of attributes. Change these attribute values to modify the information // associated with an assembly. [assembly: AssemblyTitle("AWSSDK.MarketplaceReporting")] -[assembly: AssemblyDescription("The Amazon Web Services SDK for .NET (3.5) - AWS Marketplace Reporting Service. The AWS Marketplace Reporting service introduces the GetBuyerDashboard API. This API returns a dashboard that provides visibility into your organization's AWS Marketplace agreements and associated spend across the AWS accounts in your organization.")] +[assembly: AssemblyDescription("The Amazon Web Services SDK for .NET - AWS Marketplace Reporting Service. The AWS Marketplace Reporting service introduces the GetBuyerDashboard API. This API returns a dashboard that provides visibility into your organization's AWS Marketplace agreements and associated spend across the AWS accounts in your organization.")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyProduct("Amazon Web Services SDK for .NET")] [assembly: AssemblyCompany("Amazon.com, Inc")] @@ -28,5 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.24")] \ No newline at end of file +[assembly: AssemblyVersion("4.0")] +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/MediaConnect/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/MediaConnect/Properties/AssemblyInfo.cs index 03fcd29683d2..9c54914f7faa 100644 --- a/sdk/code-analysis/ServiceAnalysis/MediaConnect/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/MediaConnect/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.13")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.40")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/MediaConvert/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/MediaConvert/Properties/AssemblyInfo.cs index 510bca8ec710..52e5e26a1176 100644 --- a/sdk/code-analysis/ServiceAnalysis/MediaConvert/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/MediaConvert/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.402.5")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.403.3")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/MediaLive/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/MediaLive/Properties/AssemblyInfo.cs index a88d3f751dfb..9902e8c91fc3 100644 --- a/sdk/code-analysis/ServiceAnalysis/MediaLive/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/MediaLive/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.405.5")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.405.32")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/MediaPackage/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/MediaPackage/Properties/AssemblyInfo.cs index 07fa6c45156b..f759889bd5ee 100644 --- a/sdk/code-analysis/ServiceAnalysis/MediaPackage/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/MediaPackage/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/MediaPackageV2/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/MediaPackageV2/Properties/AssemblyInfo.cs index 57c35ae21a7b..7f5a27fe33c8 100644 --- a/sdk/code-analysis/ServiceAnalysis/MediaPackageV2/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/MediaPackageV2/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.402.12")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/MediaPackageVod/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/MediaPackageVod/Properties/AssemblyInfo.cs index 3e77b26c13aa..80ae5692163f 100644 --- a/sdk/code-analysis/ServiceAnalysis/MediaPackageVod/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/MediaPackageVod/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/MediaStore/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/MediaStore/Properties/AssemblyInfo.cs index e2478559e770..8b4a5b5babfa 100644 --- a/sdk/code-analysis/ServiceAnalysis/MediaStore/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/MediaStore/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/MediaStoreData/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/MediaStoreData/Properties/AssemblyInfo.cs index 991782264ca4..7194dc4ce43f 100644 --- a/sdk/code-analysis/ServiceAnalysis/MediaStoreData/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/MediaStoreData/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/MediaTailor/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/MediaTailor/Properties/AssemblyInfo.cs index c540c585796e..0320b879b850 100644 --- a/sdk/code-analysis/ServiceAnalysis/MediaTailor/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/MediaTailor/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/MedicalImaging/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/MedicalImaging/Properties/AssemblyInfo.cs index 4a85c8b52a74..1e86f5b59492 100644 --- a/sdk/code-analysis/ServiceAnalysis/MedicalImaging/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/MedicalImaging/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/MemoryDB/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/MemoryDB/Properties/AssemblyInfo.cs index f5396e996276..3266b985c883 100644 --- a/sdk/code-analysis/ServiceAnalysis/MemoryDB/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/MemoryDB/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.27")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.21")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/Mgn/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/Mgn/Properties/AssemblyInfo.cs index b121b517e19e..13c625395ac5 100644 --- a/sdk/code-analysis/ServiceAnalysis/Mgn/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/Mgn/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/MigrationHub/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/MigrationHub/Properties/AssemblyInfo.cs index f479f584bae9..3be807b084b1 100644 --- a/sdk/code-analysis/ServiceAnalysis/MigrationHub/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/MigrationHub/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/MigrationHubConfig/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/MigrationHubConfig/Properties/AssemblyInfo.cs index cd2267519542..22c3b90b7883 100644 --- a/sdk/code-analysis/ServiceAnalysis/MigrationHubConfig/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/MigrationHubConfig/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/MigrationHubOrchestrator/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/MigrationHubOrchestrator/Properties/AssemblyInfo.cs index b816c8811e92..18c2d2834849 100644 --- a/sdk/code-analysis/ServiceAnalysis/MigrationHubOrchestrator/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/MigrationHubOrchestrator/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/MigrationHubRefactorSpaces/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/MigrationHubRefactorSpaces/Properties/AssemblyInfo.cs index 1cb5d0e7d1f6..4d811a500156 100644 --- a/sdk/code-analysis/ServiceAnalysis/MigrationHubRefactorSpaces/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/MigrationHubRefactorSpaces/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/MigrationHubStrategyRecommendations/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/MigrationHubStrategyRecommendations/Properties/AssemblyInfo.cs index a5e470fe111e..adcd49d874bc 100644 --- a/sdk/code-analysis/ServiceAnalysis/MigrationHubStrategyRecommendations/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/MigrationHubStrategyRecommendations/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/MobileAnalytics/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/MobileAnalytics/Properties/AssemblyInfo.cs index 9b32eacca31a..0db474ed17e6 100644 --- a/sdk/code-analysis/ServiceAnalysis/MobileAnalytics/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/MobileAnalytics/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/Neptune/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/Neptune/Properties/AssemblyInfo.cs index da7f6bfc7a52..825c7b21c16b 100644 --- a/sdk/code-analysis/ServiceAnalysis/Neptune/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/Neptune/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.4")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.31")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/NeptuneGraph/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/NeptuneGraph/Properties/AssemblyInfo.cs index 61a1399e8033..1dc90ab54667 100644 --- a/sdk/code-analysis/ServiceAnalysis/NeptuneGraph/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/NeptuneGraph/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.21")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.402.20")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/Neptunedata/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/Neptunedata/Properties/AssemblyInfo.cs index 8628c928e86a..4e917a52937a 100644 --- a/sdk/code-analysis/ServiceAnalysis/Neptunedata/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/Neptunedata/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/NetworkFirewall/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/NetworkFirewall/Properties/AssemblyInfo.cs index 2c26fe88bb19..fab4e0a86202 100644 --- a/sdk/code-analysis/ServiceAnalysis/NetworkFirewall/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/NetworkFirewall/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.402.10")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/NetworkManager/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/NetworkManager/Properties/AssemblyInfo.cs index 42aa65439c8a..ba501b10633f 100644 --- a/sdk/code-analysis/ServiceAnalysis/NetworkManager/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/NetworkManager/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/NetworkMonitor/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/NetworkMonitor/Properties/AssemblyInfo.cs index d706444f0b5f..e18ef04c6dad 100644 --- a/sdk/code-analysis/ServiceAnalysis/NetworkMonitor/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/NetworkMonitor/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/NimbleStudio/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/NimbleStudio/Properties/AssemblyInfo.cs deleted file mode 100644 index 788237e0373f..000000000000 --- a/sdk/code-analysis/ServiceAnalysis/NimbleStudio/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,32 +0,0 @@ -using System.Reflection; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("AWSSDK.NimbleStudio")] -[assembly: AssemblyDescription("The Amazon Web Services SDK for .NET - AmazonNimbleStudio. Amazon Nimble Studio is a virtual studio service that empowers visual effects, animation, and interactive content teams to create content securely within a scalable, private cloud service.")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyProduct("Amazon Web Services SDK for .NET")] -[assembly: AssemblyCompany("Amazon.com, Inc")] -[assembly: AssemblyCopyright("Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/OAM/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/OAM/Properties/AssemblyInfo.cs index abb02d75f51e..2ba81fac4c84 100644 --- a/sdk/code-analysis/ServiceAnalysis/OAM/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/OAM/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/OSIS/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/OSIS/Properties/AssemblyInfo.cs index 661e2985c171..87e40c9b574e 100644 --- a/sdk/code-analysis/ServiceAnalysis/OSIS/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/OSIS/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/Omics/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/Omics/Properties/AssemblyInfo.cs index bbe648b785ed..6b6edf75ed14 100644 --- a/sdk/code-analysis/ServiceAnalysis/Omics/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/Omics/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.15")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.42")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/OpenSearchServerless/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/OpenSearchServerless/Properties/AssemblyInfo.cs index 5f49761c5a8d..e8433fbead7b 100644 --- a/sdk/code-analysis/ServiceAnalysis/OpenSearchServerless/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/OpenSearchServerless/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.17")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.402.10")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/OpenSearchService/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/OpenSearchService/Properties/AssemblyInfo.cs index 0c1dfd7a7132..4f08bddaa243 100644 --- a/sdk/code-analysis/ServiceAnalysis/OpenSearchService/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/OpenSearchService/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.403.5")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/OpsWorks/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/OpsWorks/Properties/AssemblyInfo.cs index 15c7545a6e18..e30eefe7763c 100644 --- a/sdk/code-analysis/ServiceAnalysis/OpsWorks/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/OpsWorks/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/OpsWorksCM/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/OpsWorksCM/Properties/AssemblyInfo.cs index b1018131c7cd..1351574cbe6b 100644 --- a/sdk/code-analysis/ServiceAnalysis/OpsWorksCM/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/OpsWorksCM/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/Organizations/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/Organizations/Properties/AssemblyInfo.cs index 9648721209ab..2a266c77cf41 100644 --- a/sdk/code-analysis/ServiceAnalysis/Organizations/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/Organizations/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.402.1")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.403.3")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/Outposts/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/Outposts/Properties/AssemblyInfo.cs index 3d720f450b16..2898f6254c36 100644 --- a/sdk/code-analysis/ServiceAnalysis/Outposts/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/Outposts/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.404.0")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/PCS/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/PCS/Properties/AssemblyInfo.cs index c581ab571b17..5786c514f6ff 100644 --- a/sdk/code-analysis/ServiceAnalysis/PCS/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/PCS/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.14")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.41")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/PI/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/PI/Properties/AssemblyInfo.cs index 49ee60bdc190..e88f48a067a4 100644 --- a/sdk/code-analysis/ServiceAnalysis/PI/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/PI/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/Panorama/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/Panorama/Properties/AssemblyInfo.cs index 365d473ffd72..80dc40a6e6e3 100644 --- a/sdk/code-analysis/ServiceAnalysis/Panorama/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/Panorama/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/PartnerCentralSelling/AWSSDK.PartnerCentralSelling.CodeAnalysis.csproj b/sdk/code-analysis/ServiceAnalysis/PartnerCentralSelling/AWSSDK.PartnerCentralSelling.CodeAnalysis.csproj index 19a6b4581b8e..a776fb727893 100644 --- a/sdk/code-analysis/ServiceAnalysis/PartnerCentralSelling/AWSSDK.PartnerCentralSelling.CodeAnalysis.csproj +++ b/sdk/code-analysis/ServiceAnalysis/PartnerCentralSelling/AWSSDK.PartnerCentralSelling.CodeAnalysis.csproj @@ -18,7 +18,8 @@ - + + diff --git a/sdk/code-analysis/ServiceAnalysis/PartnerCentralSelling/Generated/NullCollectionInitializerAnalyzer.cs b/sdk/code-analysis/ServiceAnalysis/PartnerCentralSelling/Generated/NullCollectionInitializerAnalyzer.cs new file mode 100644 index 000000000000..9a093011df9a --- /dev/null +++ b/sdk/code-analysis/ServiceAnalysis/PartnerCentralSelling/Generated/NullCollectionInitializerAnalyzer.cs @@ -0,0 +1,16 @@ +using Microsoft.CodeAnalysis; +using Microsoft.CodeAnalysis.Diagnostics; + +using Amazon.CodeAnalysis.Shared; + +namespace Amazon.PartnerCentralSelling.CodeAnalysis +{ + [DiagnosticAnalyzer(LanguageNames.CSharp)] + public class NullCollectionInitializerAnalyzer : AbstractNullCollectionInitializerAnalyzer + { + protected override string GetModelNamespace() + { + return "Amazon.PartnerCentralSelling.Model"; + } + } +} \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/PartnerCentralSelling/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/PartnerCentralSelling/Properties/AssemblyInfo.cs index 05cb1b801f94..d65ead3448d2 100644 --- a/sdk/code-analysis/ServiceAnalysis/PartnerCentralSelling/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/PartnerCentralSelling/Properties/AssemblyInfo.cs @@ -5,7 +5,7 @@ // set of attributes. Change these attribute values to modify the information // associated with an assembly. [assembly: AssemblyTitle("AWSSDK.PartnerCentralSelling")] -[assembly: AssemblyDescription("The Amazon Web Services SDK for .NET (3.5) - Partner Central Selling API. Announcing AWS Partner Central API for Selling: This service launch Introduces new APIs for co-selling opportunity management and related functions. Key features include notifications, a dynamic sandbox for testing, and streamlined validations.")] +[assembly: AssemblyDescription("The Amazon Web Services SDK for .NET - Partner Central Selling API. Announcing AWS Partner Central API for Selling: This service launch Introduces new APIs for co-selling opportunity management and related functions. Key features include notifications, a dynamic sandbox for testing, and streamlined validations.")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyProduct("Amazon Web Services SDK for .NET")] [assembly: AssemblyCompany("Amazon.com, Inc")] @@ -28,5 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.1")] \ No newline at end of file +[assembly: AssemblyVersion("4.0")] +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/PaymentCryptography/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/PaymentCryptography/Properties/AssemblyInfo.cs index 314b3e8fad52..5e7960414579 100644 --- a/sdk/code-analysis/ServiceAnalysis/PaymentCryptography/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/PaymentCryptography/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.402.4")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/PaymentCryptographyData/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/PaymentCryptographyData/Properties/AssemblyInfo.cs index 6fd6dd096e36..25433c6ec5bd 100644 --- a/sdk/code-analysis/ServiceAnalysis/PaymentCryptographyData/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/PaymentCryptographyData/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.402.15")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/PcaConnectorAd/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/PcaConnectorAd/Properties/AssemblyInfo.cs index 30f09508531d..818cd5e95313 100644 --- a/sdk/code-analysis/ServiceAnalysis/PcaConnectorAd/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/PcaConnectorAd/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/PcaConnectorScep/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/PcaConnectorScep/Properties/AssemblyInfo.cs index 33ed04870e38..d49b84f4fe51 100644 --- a/sdk/code-analysis/ServiceAnalysis/PcaConnectorScep/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/PcaConnectorScep/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/Personalize/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/Personalize/Properties/AssemblyInfo.cs index c1c94e801d75..7d9b5c9f79b1 100644 --- a/sdk/code-analysis/ServiceAnalysis/Personalize/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/Personalize/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.14")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.41")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/PersonalizeEvents/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/PersonalizeEvents/Properties/AssemblyInfo.cs index eb9add59af9a..4ecda45967c3 100644 --- a/sdk/code-analysis/ServiceAnalysis/PersonalizeEvents/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/PersonalizeEvents/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/PersonalizeRuntime/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/PersonalizeRuntime/Properties/AssemblyInfo.cs index 604026bc4722..d9ce425b09c9 100644 --- a/sdk/code-analysis/ServiceAnalysis/PersonalizeRuntime/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/PersonalizeRuntime/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/Pinpoint/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/Pinpoint/Properties/AssemblyInfo.cs index 4f6723fa53a5..f7aa3fed3ccc 100644 --- a/sdk/code-analysis/ServiceAnalysis/Pinpoint/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/Pinpoint/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/PinpointEmail/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/PinpointEmail/Properties/AssemblyInfo.cs index bd13114416f9..555df24ffafc 100644 --- a/sdk/code-analysis/ServiceAnalysis/PinpointEmail/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/PinpointEmail/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/PinpointSMSVoice/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/PinpointSMSVoice/Properties/AssemblyInfo.cs index 03f6685b35e5..91a7a0acd832 100644 --- a/sdk/code-analysis/ServiceAnalysis/PinpointSMSVoice/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/PinpointSMSVoice/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/PinpointSMSVoiceV2/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/PinpointSMSVoiceV2/Properties/AssemblyInfo.cs index b423ea85cbf2..a141a27d51de 100644 --- a/sdk/code-analysis/ServiceAnalysis/PinpointSMSVoiceV2/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/PinpointSMSVoiceV2/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.3")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.404.0")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/Pipes/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/Pipes/Properties/AssemblyInfo.cs index b68dec004abf..a12b4f34ebb0 100644 --- a/sdk/code-analysis/ServiceAnalysis/Pipes/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/Pipes/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.8")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.402.17")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/Polly/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/Polly/Properties/AssemblyInfo.cs index 6f552773144f..9a7b954fa331 100644 --- a/sdk/code-analysis/ServiceAnalysis/Polly/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/Polly/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.15")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.42")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/Pricing/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/Pricing/Properties/AssemblyInfo.cs index 856d484a5eae..c2d19efbd016 100644 --- a/sdk/code-analysis/ServiceAnalysis/Pricing/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/Pricing/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.54")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/Private5G/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/Private5G/Properties/AssemblyInfo.cs index 450ffca19505..991f349ec35a 100644 --- a/sdk/code-analysis/ServiceAnalysis/Private5G/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/Private5G/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/PrometheusService/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/PrometheusService/Properties/AssemblyInfo.cs index 5354fef7208e..88b9df966e89 100644 --- a/sdk/code-analysis/ServiceAnalysis/PrometheusService/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/PrometheusService/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.9")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/Proton/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/Proton/Properties/AssemblyInfo.cs index 244a8746357a..ffb704141cc7 100644 --- a/sdk/code-analysis/ServiceAnalysis/Proton/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/Proton/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/QApps/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/QApps/Properties/AssemblyInfo.cs index 25cff22f73ba..8f1a40829071 100644 --- a/sdk/code-analysis/ServiceAnalysis/QApps/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/QApps/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.10")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.402.8")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/QBusiness/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/QBusiness/Properties/AssemblyInfo.cs index 12b18251162d..ab638958b167 100644 --- a/sdk/code-analysis/ServiceAnalysis/QBusiness/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/QBusiness/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.15")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.404.6")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/QConnect/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/QConnect/Properties/AssemblyInfo.cs index d41ea27c82c1..b1a6298f8759 100644 --- a/sdk/code-analysis/ServiceAnalysis/QConnect/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/QConnect/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.22")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/QLDB/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/QLDB/Properties/AssemblyInfo.cs index 5be31af4c0cb..283b4f9ec5e0 100644 --- a/sdk/code-analysis/ServiceAnalysis/QLDB/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/QLDB/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/QLDBSession/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/QLDBSession/Properties/AssemblyInfo.cs index 207f8bef504f..1df38cd0b200 100644 --- a/sdk/code-analysis/ServiceAnalysis/QLDBSession/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/QLDBSession/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/QuickSight/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/QuickSight/Properties/AssemblyInfo.cs index 85087cc4e133..199f8d141a2b 100644 --- a/sdk/code-analysis/ServiceAnalysis/QuickSight/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/QuickSight/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.405.0")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.409.2")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/RAM/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/RAM/Properties/AssemblyInfo.cs index a5c562a1834e..36969860c783 100644 --- a/sdk/code-analysis/ServiceAnalysis/RAM/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/RAM/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/RDS/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/RDS/Properties/AssemblyInfo.cs index af71ccbeb181..1b918c152b5f 100644 --- a/sdk/code-analysis/ServiceAnalysis/RDS/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/RDS/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.403.4")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.406.12")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/RDSDataService/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/RDSDataService/Properties/AssemblyInfo.cs index 499da4790ccf..3cd208dac43e 100644 --- a/sdk/code-analysis/ServiceAnalysis/RDSDataService/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/RDSDataService/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/RecycleBin/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/RecycleBin/Properties/AssemblyInfo.cs index b568348a1570..2fd0e3c9251d 100644 --- a/sdk/code-analysis/ServiceAnalysis/RecycleBin/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/RecycleBin/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/Redshift/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/Redshift/Properties/AssemblyInfo.cs index 234d18252a87..a844f54ea37a 100644 --- a/sdk/code-analysis/ServiceAnalysis/Redshift/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/Redshift/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.404.2")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/RedshiftDataAPIService/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/RedshiftDataAPIService/Properties/AssemblyInfo.cs index 2238a5d0daf0..2a6e975879b2 100644 --- a/sdk/code-analysis/ServiceAnalysis/RedshiftDataAPIService/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/RedshiftDataAPIService/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.13")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.402.11")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/RedshiftServerless/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/RedshiftServerless/Properties/AssemblyInfo.cs index 458c841d4e6a..bd5e5cbe58af 100644 --- a/sdk/code-analysis/ServiceAnalysis/RedshiftServerless/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/RedshiftServerless/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.10")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/Rekognition/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/Rekognition/Properties/AssemblyInfo.cs index e669084b206d..925c83dbf942 100644 --- a/sdk/code-analysis/ServiceAnalysis/Rekognition/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/Rekognition/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/Repostspace/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/Repostspace/Properties/AssemblyInfo.cs index 64c6299eb19a..1d2a083b87fd 100644 --- a/sdk/code-analysis/ServiceAnalysis/Repostspace/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/Repostspace/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.16")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/ResilienceHub/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/ResilienceHub/Properties/AssemblyInfo.cs index c58bbb1db4f5..46643c904ff3 100644 --- a/sdk/code-analysis/ServiceAnalysis/ResilienceHub/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/ResilienceHub/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.24")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.402.18")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/ResourceExplorer2/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/ResourceExplorer2/Properties/AssemblyInfo.cs index 35e859801858..e0263c619b0f 100644 --- a/sdk/code-analysis/ServiceAnalysis/ResourceExplorer2/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/ResourceExplorer2/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.4")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.402.7")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/ResourceGroups/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/ResourceGroups/Properties/AssemblyInfo.cs index 00758f127989..a3985502e881 100644 --- a/sdk/code-analysis/ServiceAnalysis/ResourceGroups/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/ResourceGroups/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.27")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/ResourceGroupsTaggingAPI/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/ResourceGroupsTaggingAPI/Properties/AssemblyInfo.cs index ada680b6054e..fff8247ce766 100644 --- a/sdk/code-analysis/ServiceAnalysis/ResourceGroupsTaggingAPI/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/ResourceGroupsTaggingAPI/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/RoboMaker/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/RoboMaker/Properties/AssemblyInfo.cs index 4e23b08338c2..0359b922fc24 100644 --- a/sdk/code-analysis/ServiceAnalysis/RoboMaker/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/RoboMaker/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.54")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/Route53/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/Route53/Properties/AssemblyInfo.cs index dc8cd35ade18..4af394148ec5 100644 --- a/sdk/code-analysis/ServiceAnalysis/Route53/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/Route53/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.402.15")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.403.10")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/Route53Domains/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/Route53Domains/Properties/AssemblyInfo.cs index 27d654264540..82752387dc98 100644 --- a/sdk/code-analysis/ServiceAnalysis/Route53Domains/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/Route53Domains/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/Route53Profiles/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/Route53Profiles/Properties/AssemblyInfo.cs index 9827de7822b5..cf2508b5a02d 100644 --- a/sdk/code-analysis/ServiceAnalysis/Route53Profiles/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/Route53Profiles/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/Route53RecoveryCluster/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/Route53RecoveryCluster/Properties/AssemblyInfo.cs index a438dfed9c76..6c32abf197b3 100644 --- a/sdk/code-analysis/ServiceAnalysis/Route53RecoveryCluster/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/Route53RecoveryCluster/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/Route53RecoveryControlConfig/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/Route53RecoveryControlConfig/Properties/AssemblyInfo.cs index 9e63d59c2c94..1695919eb56b 100644 --- a/sdk/code-analysis/ServiceAnalysis/Route53RecoveryControlConfig/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/Route53RecoveryControlConfig/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/Route53RecoveryReadiness/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/Route53RecoveryReadiness/Properties/AssemblyInfo.cs index 0eef2976a458..0a704a70cad7 100644 --- a/sdk/code-analysis/ServiceAnalysis/Route53RecoveryReadiness/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/Route53RecoveryReadiness/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/Route53Resolver/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/Route53Resolver/Properties/AssemblyInfo.cs index 9eca2afde390..7d33a27a9460 100644 --- a/sdk/code-analysis/ServiceAnalysis/Route53Resolver/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/Route53Resolver/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.402.0")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/S3/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/S3/Properties/AssemblyInfo.cs index b66404c61073..b4339fdd93d9 100644 --- a/sdk/code-analysis/ServiceAnalysis/S3/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/S3/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.403.5")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.406.2")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/S3Control/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/S3Control/Properties/AssemblyInfo.cs index d6f7539ca7a6..8871ec0c11a9 100644 --- a/sdk/code-analysis/ServiceAnalysis/S3Control/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/S3Control/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.12")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.402.8")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/S3Outposts/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/S3Outposts/Properties/AssemblyInfo.cs index 4d6ab1e3db17..1a1024b9d793 100644 --- a/sdk/code-analysis/ServiceAnalysis/S3Outposts/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/S3Outposts/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/SQS/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/SQS/Properties/AssemblyInfo.cs index 56681eac2036..d303b3eb643f 100644 --- a/sdk/code-analysis/ServiceAnalysis/SQS/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/SQS/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/SSMContacts/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/SSMContacts/Properties/AssemblyInfo.cs index 6f47caf9c519..a9279c0c0857 100644 --- a/sdk/code-analysis/ServiceAnalysis/SSMContacts/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/SSMContacts/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/SSMIncidents/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/SSMIncidents/Properties/AssemblyInfo.cs index f7dceff27c20..af7a02a1b803 100644 --- a/sdk/code-analysis/ServiceAnalysis/SSMIncidents/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/SSMIncidents/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/SSMQuickSetup/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/SSMQuickSetup/Properties/AssemblyInfo.cs index e93e10a8854c..ddc2dd2ba9af 100644 --- a/sdk/code-analysis/ServiceAnalysis/SSMQuickSetup/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/SSMQuickSetup/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.24")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.51")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/SSO/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/SSO/Properties/AssemblyInfo.cs index caf01a8c94c6..872ded8c3903 100644 --- a/sdk/code-analysis/ServiceAnalysis/SSO/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/SSO/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/SSOAdmin/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/SSOAdmin/Properties/AssemblyInfo.cs index 97e9db33b956..609bce75fa58 100644 --- a/sdk/code-analysis/ServiceAnalysis/SSOAdmin/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/SSOAdmin/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/SSOOIDC/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/SSOOIDC/Properties/AssemblyInfo.cs index 75886639baa1..797840ee6390 100644 --- a/sdk/code-analysis/ServiceAnalysis/SSOOIDC/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/SSOOIDC/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/SageMaker/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/SageMaker/Properties/AssemblyInfo.cs index 68aebef4504d..b25733c69f21 100644 --- a/sdk/code-analysis/ServiceAnalysis/SageMaker/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/SageMaker/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.410.1")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.415.2")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/SageMakerFeatureStoreRuntime/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/SageMakerFeatureStoreRuntime/Properties/AssemblyInfo.cs index ba266afd4cd6..238ed03a8939 100644 --- a/sdk/code-analysis/ServiceAnalysis/SageMakerFeatureStoreRuntime/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/SageMakerFeatureStoreRuntime/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/SageMakerGeospatial/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/SageMakerGeospatial/Properties/AssemblyInfo.cs index b1dfcf201352..d80373faaa1a 100644 --- a/sdk/code-analysis/ServiceAnalysis/SageMakerGeospatial/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/SageMakerGeospatial/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/SageMakerMetrics/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/SageMakerMetrics/Properties/AssemblyInfo.cs index ed4cf4b20f96..ffb1d0d6430b 100644 --- a/sdk/code-analysis/ServiceAnalysis/SageMakerMetrics/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/SageMakerMetrics/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.4")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.31")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/SageMakerRuntime/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/SageMakerRuntime/Properties/AssemblyInfo.cs index af59ac4774e4..dc258f0f2a81 100644 --- a/sdk/code-analysis/ServiceAnalysis/SageMakerRuntime/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/SageMakerRuntime/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.9")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.36")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/SagemakerEdgeManager/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/SagemakerEdgeManager/Properties/AssemblyInfo.cs index fc2a07cc2589..ff042325b86d 100644 --- a/sdk/code-analysis/ServiceAnalysis/SagemakerEdgeManager/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/SagemakerEdgeManager/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/SavingsPlans/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/SavingsPlans/Properties/AssemblyInfo.cs index e84304c285d8..4ab17d27183f 100644 --- a/sdk/code-analysis/ServiceAnalysis/SavingsPlans/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/SavingsPlans/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/Scheduler/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/Scheduler/Properties/AssemblyInfo.cs index 2d8ce0ff62ec..9a57ec5776ad 100644 --- a/sdk/code-analysis/ServiceAnalysis/Scheduler/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/Scheduler/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/Schemas/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/Schemas/Properties/AssemblyInfo.cs index 21a62070c96c..4d9888038212 100644 --- a/sdk/code-analysis/ServiceAnalysis/Schemas/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/Schemas/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/SecretsManager/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/SecretsManager/Properties/AssemblyInfo.cs index b08d901362ce..8aae7cda3fde 100644 --- a/sdk/code-analysis/ServiceAnalysis/SecretsManager/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/SecretsManager/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/SecurityHub/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/SecurityHub/Properties/AssemblyInfo.cs index 458beb1fe787..90d73f8d0269 100644 --- a/sdk/code-analysis/ServiceAnalysis/SecurityHub/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/SecurityHub/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.16")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.43")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/SecurityLake/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/SecurityLake/Properties/AssemblyInfo.cs index cd4ec708b832..da159b859ab1 100644 --- a/sdk/code-analysis/ServiceAnalysis/SecurityLake/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/SecurityLake/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.19")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/SecurityToken/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/SecurityToken/Properties/AssemblyInfo.cs index ffd280478fbf..ad0795de42dd 100644 --- a/sdk/code-analysis/ServiceAnalysis/SecurityToken/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/SecurityToken/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.2")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/ServerMigrationService/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/ServerMigrationService/Properties/AssemblyInfo.cs index 166675feb21e..adb9e93195d0 100644 --- a/sdk/code-analysis/ServiceAnalysis/ServerMigrationService/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/ServerMigrationService/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/ServerlessApplicationRepository/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/ServerlessApplicationRepository/Properties/AssemblyInfo.cs index 82aa648c71bf..02dd857c2c78 100644 --- a/sdk/code-analysis/ServiceAnalysis/ServerlessApplicationRepository/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/ServerlessApplicationRepository/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/ServiceCatalog/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/ServiceCatalog/Properties/AssemblyInfo.cs index e53c13ea1bbd..02b3ce3c21d9 100644 --- a/sdk/code-analysis/ServiceAnalysis/ServiceCatalog/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/ServiceCatalog/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/ServiceDiscovery/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/ServiceDiscovery/Properties/AssemblyInfo.cs index 409e58822940..7db7ba7bcf9d 100644 --- a/sdk/code-analysis/ServiceAnalysis/ServiceDiscovery/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/ServiceDiscovery/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/ServiceQuotas/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/ServiceQuotas/Properties/AssemblyInfo.cs index 83a0ed3d23b1..90c195133e99 100644 --- a/sdk/code-analysis/ServiceAnalysis/ServiceQuotas/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/ServiceQuotas/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/Shield/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/Shield/Properties/AssemblyInfo.cs index 8ad21ba6e1d7..7fdeb8d43f23 100644 --- a/sdk/code-analysis/ServiceAnalysis/Shield/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/Shield/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/Signer/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/Signer/Properties/AssemblyInfo.cs index 8404a22c7b55..42cead64ff01 100644 --- a/sdk/code-analysis/ServiceAnalysis/Signer/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/Signer/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/SimSpaceWeaver/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/SimSpaceWeaver/Properties/AssemblyInfo.cs index 2d4d630817a6..b259ef21978a 100644 --- a/sdk/code-analysis/ServiceAnalysis/SimSpaceWeaver/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/SimSpaceWeaver/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/SimpleDB/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/SimpleDB/Properties/AssemblyInfo.cs index 5d7f416c8953..5ca7743191f0 100644 --- a/sdk/code-analysis/ServiceAnalysis/SimpleDB/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/SimpleDB/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/SimpleEmail/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/SimpleEmail/Properties/AssemblyInfo.cs index 421f98a5eda8..41713c9d0185 100644 --- a/sdk/code-analysis/ServiceAnalysis/SimpleEmail/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/SimpleEmail/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.16")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.43")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/SimpleEmailV2/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/SimpleEmailV2/Properties/AssemblyInfo.cs index 5307f14a02de..284a50797dfe 100644 --- a/sdk/code-analysis/ServiceAnalysis/SimpleEmailV2/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/SimpleEmailV2/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.402.0")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.404.9")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/SimpleNotificationService/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/SimpleNotificationService/Properties/AssemblyInfo.cs index f60b2088becd..893a271e9651 100644 --- a/sdk/code-analysis/ServiceAnalysis/SimpleNotificationService/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/SimpleNotificationService/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/SimpleSystemsManagement/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/SimpleSystemsManagement/Properties/AssemblyInfo.cs index 1d18af7907bb..0265b31f9768 100644 --- a/sdk/code-analysis/ServiceAnalysis/SimpleSystemsManagement/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/SimpleSystemsManagement/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.402.5")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.402.32")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/SimpleWorkflow/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/SimpleWorkflow/Properties/AssemblyInfo.cs index c3f45d9b8802..72cf2033df5c 100644 --- a/sdk/code-analysis/ServiceAnalysis/SimpleWorkflow/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/SimpleWorkflow/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/SnowDeviceManagement/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/SnowDeviceManagement/Properties/AssemblyInfo.cs index 32319286c706..8fae354370b7 100644 --- a/sdk/code-analysis/ServiceAnalysis/SnowDeviceManagement/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/SnowDeviceManagement/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/Snowball/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/Snowball/Properties/AssemblyInfo.cs index e5c22c140554..53897638dc1d 100644 --- a/sdk/code-analysis/ServiceAnalysis/Snowball/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/Snowball/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/SocialMessaging/AWSSDK.SocialMessaging.CodeAnalysis.csproj b/sdk/code-analysis/ServiceAnalysis/SocialMessaging/AWSSDK.SocialMessaging.CodeAnalysis.csproj index 2798a051ff11..83800d62ab39 100644 --- a/sdk/code-analysis/ServiceAnalysis/SocialMessaging/AWSSDK.SocialMessaging.CodeAnalysis.csproj +++ b/sdk/code-analysis/ServiceAnalysis/SocialMessaging/AWSSDK.SocialMessaging.CodeAnalysis.csproj @@ -18,7 +18,8 @@ - + + diff --git a/sdk/code-analysis/ServiceAnalysis/SocialMessaging/Generated/NullCollectionInitializerAnalyzer.cs b/sdk/code-analysis/ServiceAnalysis/SocialMessaging/Generated/NullCollectionInitializerAnalyzer.cs new file mode 100644 index 000000000000..14a0604c19bb --- /dev/null +++ b/sdk/code-analysis/ServiceAnalysis/SocialMessaging/Generated/NullCollectionInitializerAnalyzer.cs @@ -0,0 +1,16 @@ +using Microsoft.CodeAnalysis; +using Microsoft.CodeAnalysis.Diagnostics; + +using Amazon.CodeAnalysis.Shared; + +namespace Amazon.SocialMessaging.CodeAnalysis +{ + [DiagnosticAnalyzer(LanguageNames.CSharp)] + public class NullCollectionInitializerAnalyzer : AbstractNullCollectionInitializerAnalyzer + { + protected override string GetModelNamespace() + { + return "Amazon.SocialMessaging.Model"; + } + } +} \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/SocialMessaging/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/SocialMessaging/Properties/AssemblyInfo.cs index 63f07871a514..57d9df67fb15 100644 --- a/sdk/code-analysis/ServiceAnalysis/SocialMessaging/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/SocialMessaging/Properties/AssemblyInfo.cs @@ -5,7 +5,7 @@ // set of attributes. Change these attribute values to modify the information // associated with an assembly. [assembly: AssemblyTitle("AWSSDK.SocialMessaging")] -[assembly: AssemblyDescription("The Amazon Web Services SDK for .NET (3.5) - AWS End User Messaging Social. This release for AWS End User Messaging includes a public SDK, providing a suite of APIs that enable sending WhatsApp messages to end users.")] +[assembly: AssemblyDescription("The Amazon Web Services SDK for .NET - AWS End User Messaging Social. This release for AWS End User Messaging includes a public SDK, providing a suite of APIs that enable sending WhatsApp messages to end users.")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyProduct("Amazon Web Services SDK for .NET")] [assembly: AssemblyCompany("Amazon.com, Inc")] @@ -28,5 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.20")] \ No newline at end of file +[assembly: AssemblyVersion("4.0")] +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/SsmSap/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/SsmSap/Properties/AssemblyInfo.cs index cabd5769ce90..f990c9d58d79 100644 --- a/sdk/code-analysis/ServiceAnalysis/SsmSap/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/SsmSap/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.18")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.45")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/StepFunctions/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/StepFunctions/Properties/AssemblyInfo.cs index 0b068276648c..2699d3349de2 100644 --- a/sdk/code-analysis/ServiceAnalysis/StepFunctions/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/StepFunctions/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.402.14")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.402.41")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/StorageGateway/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/StorageGateway/Properties/AssemblyInfo.cs index 73920199db91..21b5c856b8fd 100644 --- a/sdk/code-analysis/ServiceAnalysis/StorageGateway/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/StorageGateway/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.7")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.34")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/SupplyChain/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/SupplyChain/Properties/AssemblyInfo.cs index 72b9743eefd0..e89cb5ef81e7 100644 --- a/sdk/code-analysis/ServiceAnalysis/SupplyChain/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/SupplyChain/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.27")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.403.13")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/SupportApp/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/SupportApp/Properties/AssemblyInfo.cs index 982b2522e7b5..5e2c12d83278 100644 --- a/sdk/code-analysis/ServiceAnalysis/SupportApp/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/SupportApp/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/Synthetics/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/Synthetics/Properties/AssemblyInfo.cs index a74d8221972a..f73bdbb3a449 100644 --- a/sdk/code-analysis/ServiceAnalysis/Synthetics/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/Synthetics/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.7")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.402.7")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/TaxSettings/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/TaxSettings/Properties/AssemblyInfo.cs index cde6fee80a72..3691af8d8a97 100644 --- a/sdk/code-analysis/ServiceAnalysis/TaxSettings/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/TaxSettings/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.8")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/Textract/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/Textract/Properties/AssemblyInfo.cs index 8a04acbc6883..729aa2539ce9 100644 --- a/sdk/code-analysis/ServiceAnalysis/Textract/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/Textract/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/TimestreamInfluxDB/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/TimestreamInfluxDB/Properties/AssemblyInfo.cs index 57a7842e50c9..ed1af856f166 100644 --- a/sdk/code-analysis/ServiceAnalysis/TimestreamInfluxDB/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/TimestreamInfluxDB/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.13")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.403.20")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/TimestreamQuery/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/TimestreamQuery/Properties/AssemblyInfo.cs index 02ac1f875bce..3fc32ddaf1ce 100644 --- a/sdk/code-analysis/ServiceAnalysis/TimestreamQuery/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/TimestreamQuery/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.16")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/TimestreamWrite/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/TimestreamWrite/Properties/AssemblyInfo.cs index 81a15c55fdee..22cd7f4cbf69 100644 --- a/sdk/code-analysis/ServiceAnalysis/TimestreamWrite/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/TimestreamWrite/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/Tnb/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/Tnb/Properties/AssemblyInfo.cs index 4c6f8eb3ed2f..80e91425345e 100644 --- a/sdk/code-analysis/ServiceAnalysis/Tnb/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/Tnb/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.24")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.51")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/TranscribeService/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/TranscribeService/Properties/AssemblyInfo.cs index 3a4c18ee77fe..9caf591e2e56 100644 --- a/sdk/code-analysis/ServiceAnalysis/TranscribeService/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/TranscribeService/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/Transfer/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/Transfer/Properties/AssemblyInfo.cs index 9d6312ccc2b2..57b54445d702 100644 --- a/sdk/code-analysis/ServiceAnalysis/Transfer/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/Transfer/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.19")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/Translate/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/Translate/Properties/AssemblyInfo.cs index 8abd2eaf2f12..e64d4dc3c1b1 100644 --- a/sdk/code-analysis/ServiceAnalysis/Translate/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/Translate/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/TrustedAdvisor/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/TrustedAdvisor/Properties/AssemblyInfo.cs index ee69c0656225..a05569a62cc7 100644 --- a/sdk/code-analysis/ServiceAnalysis/TrustedAdvisor/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/TrustedAdvisor/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/VPCLattice/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/VPCLattice/Properties/AssemblyInfo.cs index b55a0072c14a..c66bb57f2008 100644 --- a/sdk/code-analysis/ServiceAnalysis/VPCLattice/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/VPCLattice/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/VerifiedPermissions/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/VerifiedPermissions/Properties/AssemblyInfo.cs index d2563cfc1c3a..3038e57faf96 100644 --- a/sdk/code-analysis/ServiceAnalysis/VerifiedPermissions/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/VerifiedPermissions/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.8")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/VoiceID/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/VoiceID/Properties/AssemblyInfo.cs index 6b1e8ed07978..3e8e9442dfe8 100644 --- a/sdk/code-analysis/ServiceAnalysis/VoiceID/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/VoiceID/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/WAF/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/WAF/Properties/AssemblyInfo.cs index 4d85fdc548cb..4a8b9ec9d2ea 100644 --- a/sdk/code-analysis/ServiceAnalysis/WAF/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/WAF/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/WAFRegional/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/WAFRegional/Properties/AssemblyInfo.cs index 17f3f31b580b..b394525d77c5 100644 --- a/sdk/code-analysis/ServiceAnalysis/WAFRegional/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/WAFRegional/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.24")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.51")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/WAFV2/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/WAFV2/Properties/AssemblyInfo.cs index f73c2ae6d0f5..7d822d165756 100644 --- a/sdk/code-analysis/ServiceAnalysis/WAFV2/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/WAFV2/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.14")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.402.17")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/WellArchitected/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/WellArchitected/Properties/AssemblyInfo.cs index d967004cf16f..b7cfac9911c6 100644 --- a/sdk/code-analysis/ServiceAnalysis/WellArchitected/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/WellArchitected/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/WorkDocs/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/WorkDocs/Properties/AssemblyInfo.cs index 448159d61f06..6c07217f9462 100644 --- a/sdk/code-analysis/ServiceAnalysis/WorkDocs/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/WorkDocs/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/WorkMail/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/WorkMail/Properties/AssemblyInfo.cs index 5f10ed3f8079..8ee187a23b26 100644 --- a/sdk/code-analysis/ServiceAnalysis/WorkMail/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/WorkMail/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.10")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/WorkMailMessageFlow/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/WorkMailMessageFlow/Properties/AssemblyInfo.cs index e6a7f0225651..b3eef0091991 100644 --- a/sdk/code-analysis/ServiceAnalysis/WorkMailMessageFlow/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/WorkMailMessageFlow/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/WorkSpaces/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/WorkSpaces/Properties/AssemblyInfo.cs index 563360ab326d..090dd9693eef 100644 --- a/sdk/code-analysis/ServiceAnalysis/WorkSpaces/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/WorkSpaces/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.403.4")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.404.17")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/WorkSpacesThinClient/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/WorkSpacesThinClient/Properties/AssemblyInfo.cs index 19b81b7945cd..7ee10100c7c3 100644 --- a/sdk/code-analysis/ServiceAnalysis/WorkSpacesThinClient/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/WorkSpacesThinClient/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/WorkSpacesWeb/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/WorkSpacesWeb/Properties/AssemblyInfo.cs index 077313a8a660..8123a0e3d362 100644 --- a/sdk/code-analysis/ServiceAnalysis/WorkSpacesWeb/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/WorkSpacesWeb/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.5")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.32")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/code-analysis/ServiceAnalysis/XRay/Properties/AssemblyInfo.cs b/sdk/code-analysis/ServiceAnalysis/XRay/Properties/AssemblyInfo.cs index 308fb752b176..4eee121defd3 100644 --- a/sdk/code-analysis/ServiceAnalysis/XRay/Properties/AssemblyInfo.cs +++ b/sdk/code-analysis/ServiceAnalysis/XRay/Properties/AssemblyInfo.cs @@ -28,13 +28,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD [assembly: AssemblyVersion("4.0")] -[assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/src/Core/Amazon.Util/Internal/InternalSDKUtils.generated.cs b/sdk/src/Core/Amazon.Util/Internal/InternalSDKUtils.generated.cs index 3c3de677879d..1ef5e7776d17 100644 --- a/sdk/src/Core/Amazon.Util/Internal/InternalSDKUtils.generated.cs +++ b/sdk/src/Core/Amazon.Util/Internal/InternalSDKUtils.generated.cs @@ -29,12 +29,6 @@ namespace Amazon.Util.Internal { public static partial class InternalSDKUtils { -<<<<<<< HEAD internal const string CoreVersionNumber = "4.0.0.0"; -||||||| Commit version number update changes - internal const string CoreVersionNumber = "3.7.400.26"; -======= - internal const string CoreVersionNumber = "3.7.400.53"; ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b } } \ No newline at end of file diff --git a/sdk/src/Core/Properties/AssemblyInfo.cs b/sdk/src/Core/Properties/AssemblyInfo.cs index ab4996b9137f..b7ae523e9130 100644 --- a/sdk/src/Core/Properties/AssemblyInfo.cs +++ b/sdk/src/Core/Properties/AssemblyInfo.cs @@ -47,20 +47,12 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD #if BCL [assembly: AssemblyVersion("4.0")] #else [assembly: AssemblyVersion("4.0.0.0")] #endif [assembly: AssemblyFileVersion("4.0.0.0")] -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: System.Security.AllowPartiallyTrustedCallers] diff --git a/sdk/src/Services/ACMPCA/ACMPCA.sln b/sdk/src/Services/ACMPCA/ACMPCA.sln index 1d47069eeb50..c97bd664cd32 100644 --- a/sdk/src/Services/ACMPCA/ACMPCA.sln +++ b/sdk/src/Services/ACMPCA/ACMPCA.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {B4B44A2C-46AC-47AF-81ED-1675C9ED2607}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {B4B44A2C-46AC-47AF-81ED-1675C9ED2607}.Debug|Any CPU.Build.0 = Debug|Any CPU {B4B44A2C-46AC-47AF-81ED-1675C9ED2607}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {CBF30662-823B-4ED8-A4E2-5F63243E742E}.Debug|Any CPU.Build.0 = Debug|Any CPU {CBF30662-823B-4ED8-A4E2-5F63243E742E}.Release|Any CPU.ActiveCfg = Release|Any CPU {CBF30662-823B-4ED8-A4E2-5F63243E742E}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {E5096212-AFAF-4401-9089-AF9E7751B466}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E5096212-AFAF-4401-9089-AF9E7751B466}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E5096212-AFAF-4401-9089-AF9E7751B466}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E5096212-AFAF-4401-9089-AF9E7751B466}.Release|Any CPU.Build.0 = Release|Any CPU - {6892B10A-29A8-417E-BE2B-5D852EE41EF0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6892B10A-29A8-417E-BE2B-5D852EE41EF0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6892B10A-29A8-417E-BE2B-5D852EE41EF0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6892B10A-29A8-417E-BE2B-5D852EE41EF0}.Release|Any CPU.Build.0 = Release|Any CPU - {7762F390-BAB6-4531-87E1-2B7C0CCF4C3F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7762F390-BAB6-4531-87E1-2B7C0CCF4C3F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7762F390-BAB6-4531-87E1-2B7C0CCF4C3F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7762F390-BAB6-4531-87E1-2B7C0CCF4C3F}.Release|Any CPU.Build.0 = Release|Any CPU - {B581E99C-2620-4B20-BD05-B61A35B01CED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B581E99C-2620-4B20-BD05-B61A35B01CED}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B581E99C-2620-4B20-BD05-B61A35B01CED}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B581E99C-2620-4B20-BD05-B61A35B01CED}.Release|Any CPU.Build.0 = Release|Any CPU - {73BA0A81-C0EA-472A-A200-2AA00D31CF8F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {73BA0A81-C0EA-472A-A200-2AA00D31CF8F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {73BA0A81-C0EA-472A-A200-2AA00D31CF8F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {73BA0A81-C0EA-472A-A200-2AA00D31CF8F}.Release|Any CPU.Build.0 = Release|Any CPU - {51F86BEF-5634-4B4B-828C-16CB6FA03232}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {51F86BEF-5634-4B4B-828C-16CB6FA03232}.Debug|Any CPU.Build.0 = Debug|Any CPU - {51F86BEF-5634-4B4B-828C-16CB6FA03232}.Release|Any CPU.ActiveCfg = Release|Any CPU - {51F86BEF-5634-4B4B-828C-16CB6FA03232}.Release|Any CPU.Build.0 = Release|Any CPU - {9645AF69-C1FB-4AFF-9B27-1FB05DBF7C98}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9645AF69-C1FB-4AFF-9B27-1FB05DBF7C98}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9645AF69-C1FB-4AFF-9B27-1FB05DBF7C98}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9645AF69-C1FB-4AFF-9B27-1FB05DBF7C98}.Release|Any CPU.Build.0 = Release|Any CPU - {AA5860B3-D255-4474-8BF7-C11DCC790A33}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AA5860B3-D255-4474-8BF7-C11DCC790A33}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AA5860B3-D255-4474-8BF7-C11DCC790A33}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AA5860B3-D255-4474-8BF7-C11DCC790A33}.Release|Any CPU.Build.0 = Release|Any CPU - {CAF4ADC2-08E2-48E6-BB1F-4EBEBBED341E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CAF4ADC2-08E2-48E6-BB1F-4EBEBBED341E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CAF4ADC2-08E2-48E6-BB1F-4EBEBBED341E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CAF4ADC2-08E2-48E6-BB1F-4EBEBBED341E}.Release|Any CPU.Build.0 = Release|Any CPU - {6B60FA86-8DA6-4AA1-B65E-CA234B89B46E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6B60FA86-8DA6-4AA1-B65E-CA234B89B46E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6B60FA86-8DA6-4AA1-B65E-CA234B89B46E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6B60FA86-8DA6-4AA1-B65E-CA234B89B46E}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {E5096212-AFAF-4401-9089-AF9E7751B466}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E5096212-AFAF-4401-9089-AF9E7751B466}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E5096212-AFAF-4401-9089-AF9E7751B466}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E5096212-AFAF-4401-9089-AF9E7751B466}.Release|Any CPU.Build.0 = Release|Any CPU - {6892B10A-29A8-417E-BE2B-5D852EE41EF0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6892B10A-29A8-417E-BE2B-5D852EE41EF0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6892B10A-29A8-417E-BE2B-5D852EE41EF0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6892B10A-29A8-417E-BE2B-5D852EE41EF0}.Release|Any CPU.Build.0 = Release|Any CPU - {7762F390-BAB6-4531-87E1-2B7C0CCF4C3F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7762F390-BAB6-4531-87E1-2B7C0CCF4C3F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7762F390-BAB6-4531-87E1-2B7C0CCF4C3F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7762F390-BAB6-4531-87E1-2B7C0CCF4C3F}.Release|Any CPU.Build.0 = Release|Any CPU - {B581E99C-2620-4B20-BD05-B61A35B01CED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B581E99C-2620-4B20-BD05-B61A35B01CED}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B581E99C-2620-4B20-BD05-B61A35B01CED}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B581E99C-2620-4B20-BD05-B61A35B01CED}.Release|Any CPU.Build.0 = Release|Any CPU - {73BA0A81-C0EA-472A-A200-2AA00D31CF8F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {73BA0A81-C0EA-472A-A200-2AA00D31CF8F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {73BA0A81-C0EA-472A-A200-2AA00D31CF8F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {73BA0A81-C0EA-472A-A200-2AA00D31CF8F}.Release|Any CPU.Build.0 = Release|Any CPU - {51F86BEF-5634-4B4B-828C-16CB6FA03232}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {51F86BEF-5634-4B4B-828C-16CB6FA03232}.Debug|Any CPU.Build.0 = Debug|Any CPU - {51F86BEF-5634-4B4B-828C-16CB6FA03232}.Release|Any CPU.ActiveCfg = Release|Any CPU - {51F86BEF-5634-4B4B-828C-16CB6FA03232}.Release|Any CPU.Build.0 = Release|Any CPU - {9645AF69-C1FB-4AFF-9B27-1FB05DBF7C98}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9645AF69-C1FB-4AFF-9B27-1FB05DBF7C98}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9645AF69-C1FB-4AFF-9B27-1FB05DBF7C98}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9645AF69-C1FB-4AFF-9B27-1FB05DBF7C98}.Release|Any CPU.Build.0 = Release|Any CPU - {AA5860B3-D255-4474-8BF7-C11DCC790A33}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AA5860B3-D255-4474-8BF7-C11DCC790A33}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AA5860B3-D255-4474-8BF7-C11DCC790A33}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AA5860B3-D255-4474-8BF7-C11DCC790A33}.Release|Any CPU.Build.0 = Release|Any CPU - {CAF4ADC2-08E2-48E6-BB1F-4EBEBBED341E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CAF4ADC2-08E2-48E6-BB1F-4EBEBBED341E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CAF4ADC2-08E2-48E6-BB1F-4EBEBBED341E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CAF4ADC2-08E2-48E6-BB1F-4EBEBBED341E}.Release|Any CPU.Build.0 = Release|Any CPU - {6B60FA86-8DA6-4AA1-B65E-CA234B89B46E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6B60FA86-8DA6-4AA1-B65E-CA234B89B46E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6B60FA86-8DA6-4AA1-B65E-CA234B89B46E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6B60FA86-8DA6-4AA1-B65E-CA234B89B46E}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {B4B44A2C-46AC-47AF-81ED-1675C9ED2607} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {10084608-753B-439A-9C1E-C90CE8EB8253} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {7CEB9A66-9DD3-48EB-B632-4E630B3DA44A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {C2DDA6A9-C5AF-4258-8A72-C14DAAD73714} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {CBF30662-823B-4ED8-A4E2-5F63243E742E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {E5096212-AFAF-4401-9089-AF9E7751B466} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6892B10A-29A8-417E-BE2B-5D852EE41EF0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {7762F390-BAB6-4531-87E1-2B7C0CCF4C3F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B581E99C-2620-4B20-BD05-B61A35B01CED} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {73BA0A81-C0EA-472A-A200-2AA00D31CF8F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {51F86BEF-5634-4B4B-828C-16CB6FA03232} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {9645AF69-C1FB-4AFF-9B27-1FB05DBF7C98} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {AA5860B3-D255-4474-8BF7-C11DCC790A33} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {CAF4ADC2-08E2-48E6-BB1F-4EBEBBED341E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6B60FA86-8DA6-4AA1-B65E-CA234B89B46E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {E5096212-AFAF-4401-9089-AF9E7751B466} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6892B10A-29A8-417E-BE2B-5D852EE41EF0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {7762F390-BAB6-4531-87E1-2B7C0CCF4C3F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B581E99C-2620-4B20-BD05-B61A35B01CED} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {73BA0A81-C0EA-472A-A200-2AA00D31CF8F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {51F86BEF-5634-4B4B-828C-16CB6FA03232} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {9645AF69-C1FB-4AFF-9B27-1FB05DBF7C98} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {AA5860B3-D255-4474-8BF7-C11DCC790A33} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {CAF4ADC2-08E2-48E6-BB1F-4EBEBBED341E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6B60FA86-8DA6-4AA1-B65E-CA234B89B46E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {E91A9E69-2572-41E7-99B0-957B881E3152} diff --git a/sdk/src/Services/ACMPCA/Generated/AmazonACMPCAConfig.cs b/sdk/src/Services/ACMPCA/Generated/AmazonACMPCAConfig.cs index 07d80652ab9c..de63b593c4f0 100644 --- a/sdk/src/Services/ACMPCA/Generated/AmazonACMPCAConfig.cs +++ b/sdk/src/Services/ACMPCA/Generated/AmazonACMPCAConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.ACMPCA public partial class AmazonACMPCAConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("ACM PCA", "4.0.0.0"); private static readonly AmazonACMPCAEndpointResolver EndpointResolver = new AmazonACMPCAEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("ACM PCA", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("ACM PCA", "3.7.400.54"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/ACMPCA/Generated/_bcl/AmazonACMPCAClient.cs b/sdk/src/Services/ACMPCA/Generated/_bcl/AmazonACMPCAClient.cs index 63ad054fd704..b8df9e4c1458 100644 --- a/sdk/src/Services/ACMPCA/Generated/_bcl/AmazonACMPCAClient.cs +++ b/sdk/src/Services/ACMPCA/Generated/_bcl/AmazonACMPCAClient.cs @@ -420,20 +420,19 @@ public virtual CreateCertificateAuthorityResponse CreateCertificateAuthority(Cre /// - /// Creates an audit report that lists every time that your CA private key is used. The - /// report is saved in the Amazon S3 bucket that you specify on input. The IssueCertificate + /// Creates an audit report that lists every time that your CA private key is used to + /// issue a certificate. The IssueCertificate /// and RevokeCertificate - /// actions use the private key. + /// actions use the private key. /// - /// + /// /// - /// Both Amazon Web Services Private CA and the IAM principal must have permission to - /// write to the S3 bucket that you specify. If the IAM principal making the call does - /// not have permission to write to the bucket, then an exception is thrown. For more - /// information, see Access - /// policies for CRLs in Amazon S3. + /// To save the audit report to your designated Amazon S3 bucket, you must create a bucket + /// policy that grants Amazon Web Services Private CA permission to access and write to + /// it. For an example policy, see Prepare + /// an Amazon S3 bucket for audit reports. /// - /// + /// /// /// Amazon Web Services Private CA assets that are stored in Amazon S3 can be protected /// with encryption. For more information, see Encrypting @@ -479,20 +478,19 @@ public virtual CreateCertificateAuthorityAuditReportResponse CreateCertificateAu /// - /// Creates an audit report that lists every time that your CA private key is used. The - /// report is saved in the Amazon S3 bucket that you specify on input. The IssueCertificate + /// Creates an audit report that lists every time that your CA private key is used to + /// issue a certificate. The IssueCertificate /// and RevokeCertificate - /// actions use the private key. + /// actions use the private key. /// - /// + /// /// - /// Both Amazon Web Services Private CA and the IAM principal must have permission to - /// write to the S3 bucket that you specify. If the IAM principal making the call does - /// not have permission to write to the bucket, then an exception is thrown. For more - /// information, see Access - /// policies for CRLs in Amazon S3. + /// To save the audit report to your designated Amazon S3 bucket, you must create a bucket + /// policy that grants Amazon Web Services Private CA permission to access and write to + /// it. For an example policy, see Prepare + /// an Amazon S3 bucket for audit reports. /// - /// + /// /// /// Amazon Web Services Private CA assets that are stored in Amazon S3 can be protected /// with encryption. For more information, see Encrypting @@ -1823,15 +1821,15 @@ public virtual GetPolicyResponse GetPolicy(GetPolicyRequest request) /// ///
  • /// - /// Basic constraints (must be marked critical) + /// Authority key identifier /// ///
  • /// - /// Subject alternative names + /// Basic constraints (must be marked critical) /// ///
  • /// - /// Key usage + /// Certificate policies /// ///
  • /// @@ -1839,35 +1837,39 @@ public virtual GetPolicyResponse GetPolicy(GetPolicyRequest request) /// ///
  • /// - /// Authority key identifier + /// Inhibit anyPolicy /// ///
  • /// - /// Subject key identifier + /// Issuer alternative name /// ///
  • /// - /// Issuer alternative name + /// Key usage /// ///
  • /// - /// Subject directory attributes + /// Name constraints /// ///
  • /// - /// Subject information access + /// Policy mappings /// ///
  • /// - /// Certificate policies + /// Subject alternative name /// ///
  • /// - /// Policy mappings + /// Subject directory attributes /// ///
  • /// - /// Inhibit anyPolicy + /// Subject key identifier + /// + ///
  • + /// + /// Subject information access /// ///
/// @@ -1876,11 +1878,7 @@ public virtual GetPolicyResponse GetPolicy(GetPolicyRequest request) /// ///
  • /// - /// Name constraints - /// - ///
  • - /// - /// Policy constraints + /// Authority information access /// ///
  • /// @@ -1888,17 +1886,17 @@ public virtual GetPolicyResponse GetPolicy(GetPolicyRequest request) /// ///
  • /// - /// Authority information access + /// Freshest CRL /// ///
  • /// - /// Freshest CRL + /// Policy constraints /// - ///
  • + ///
/// - /// Any other extension + /// Amazon Web Services Private Certificate Authority will also reject any other extension + /// marked as critical not contained on the preceding list of allowed extensions. /// - /// /// /// Container for the necessary parameters to execute the ImportCertificateAuthorityCertificate service method. /// @@ -2032,15 +2030,15 @@ public virtual ImportCertificateAuthorityCertificateResponse ImportCertificateAu /// ///
  • /// - /// Basic constraints (must be marked critical) + /// Authority key identifier /// ///
  • /// - /// Subject alternative names + /// Basic constraints (must be marked critical) /// ///
  • /// - /// Key usage + /// Certificate policies /// ///
  • /// @@ -2048,35 +2046,39 @@ public virtual ImportCertificateAuthorityCertificateResponse ImportCertificateAu /// ///
  • /// - /// Authority key identifier + /// Inhibit anyPolicy /// ///
  • /// - /// Subject key identifier + /// Issuer alternative name /// ///
  • /// - /// Issuer alternative name + /// Key usage /// ///
  • /// - /// Subject directory attributes + /// Name constraints /// ///
  • /// - /// Subject information access + /// Policy mappings /// ///
  • /// - /// Certificate policies + /// Subject alternative name /// ///
  • /// - /// Policy mappings + /// Subject directory attributes /// ///
  • /// - /// Inhibit anyPolicy + /// Subject key identifier + /// + ///
  • + /// + /// Subject information access /// ///
/// @@ -2085,11 +2087,7 @@ public virtual ImportCertificateAuthorityCertificateResponse ImportCertificateAu /// ///
  • /// - /// Name constraints - /// - ///
  • - /// - /// Policy constraints + /// Authority information access /// ///
  • /// @@ -2097,17 +2095,17 @@ public virtual ImportCertificateAuthorityCertificateResponse ImportCertificateAu /// ///
  • /// - /// Authority information access + /// Freshest CRL /// ///
  • /// - /// Freshest CRL + /// Policy constraints /// - ///
  • + ///
/// - /// Any other extension + /// Amazon Web Services Private Certificate Authority will also reject any other extension + /// marked as critical not contained on the preceding list of allowed extensions. /// - /// /// /// Container for the necessary parameters to execute the ImportCertificateAuthorityCertificate service method. /// diff --git a/sdk/src/Services/ACMPCA/Properties/AssemblyInfo.cs b/sdk/src/Services/ACMPCA/Properties/AssemblyInfo.cs index 8a46fef682db..9631382482be 100644 --- a/sdk/src/Services/ACMPCA/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/ACMPCA/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.54")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/APIGateway/APIGateway.sln b/sdk/src/Services/APIGateway/APIGateway.sln index e61b4ebaa4f4..f8c5b46847a8 100644 --- a/sdk/src/Services/APIGateway/APIGateway.sln +++ b/sdk/src/Services/APIGateway/APIGateway.sln @@ -94,7 +94,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {0ABA2A4F-F88B-4FDD-8F6C-CC8F91E6BEF3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {0ABA2A4F-F88B-4FDD-8F6C-CC8F91E6BEF3}.Debug|Any CPU.Build.0 = Debug|Any CPU {0ABA2A4F-F88B-4FDD-8F6C-CC8F91E6BEF3}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -119,113 +126,6 @@ Global {7341D654-9178-4A98-84E6-D4F44A30B52C}.Debug|Any CPU.Build.0 = Debug|Any CPU {7341D654-9178-4A98-84E6-D4F44A30B52C}.Release|Any CPU.ActiveCfg = Release|Any CPU {7341D654-9178-4A98-84E6-D4F44A30B52C}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {8DD8072D-9AD9-4DD8-9263-A5BF32B87148}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8DD8072D-9AD9-4DD8-9263-A5BF32B87148}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8DD8072D-9AD9-4DD8-9263-A5BF32B87148}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8DD8072D-9AD9-4DD8-9263-A5BF32B87148}.Release|Any CPU.Build.0 = Release|Any CPU - {A70CB198-E317-481F-BC5D-30C16C5B8714}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A70CB198-E317-481F-BC5D-30C16C5B8714}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A70CB198-E317-481F-BC5D-30C16C5B8714}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A70CB198-E317-481F-BC5D-30C16C5B8714}.Release|Any CPU.Build.0 = Release|Any CPU - {27A86BA4-2C30-4FB6-AB9C-DE6862A9ACCA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {27A86BA4-2C30-4FB6-AB9C-DE6862A9ACCA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {27A86BA4-2C30-4FB6-AB9C-DE6862A9ACCA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {27A86BA4-2C30-4FB6-AB9C-DE6862A9ACCA}.Release|Any CPU.Build.0 = Release|Any CPU - {BAFD5207-67B1-4A08-8212-43426020162A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BAFD5207-67B1-4A08-8212-43426020162A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BAFD5207-67B1-4A08-8212-43426020162A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BAFD5207-67B1-4A08-8212-43426020162A}.Release|Any CPU.Build.0 = Release|Any CPU - {DEAEBF40-CCF7-4531-B12D-3CBD13568AF0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DEAEBF40-CCF7-4531-B12D-3CBD13568AF0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DEAEBF40-CCF7-4531-B12D-3CBD13568AF0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DEAEBF40-CCF7-4531-B12D-3CBD13568AF0}.Release|Any CPU.Build.0 = Release|Any CPU - {41522D40-D7A6-4EC2-88F7-1BEDAECFEE4E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {41522D40-D7A6-4EC2-88F7-1BEDAECFEE4E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {41522D40-D7A6-4EC2-88F7-1BEDAECFEE4E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {41522D40-D7A6-4EC2-88F7-1BEDAECFEE4E}.Release|Any CPU.Build.0 = Release|Any CPU - {E1B060B4-DA0A-4611-BD38-EF79737E219D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E1B060B4-DA0A-4611-BD38-EF79737E219D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E1B060B4-DA0A-4611-BD38-EF79737E219D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E1B060B4-DA0A-4611-BD38-EF79737E219D}.Release|Any CPU.Build.0 = Release|Any CPU - {3AA69A97-236D-401D-A4DD-7811C268953D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3AA69A97-236D-401D-A4DD-7811C268953D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3AA69A97-236D-401D-A4DD-7811C268953D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3AA69A97-236D-401D-A4DD-7811C268953D}.Release|Any CPU.Build.0 = Release|Any CPU - {85AA082A-EDC4-40BB-8224-3CE74CB9F8F8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {85AA082A-EDC4-40BB-8224-3CE74CB9F8F8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {85AA082A-EDC4-40BB-8224-3CE74CB9F8F8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {85AA082A-EDC4-40BB-8224-3CE74CB9F8F8}.Release|Any CPU.Build.0 = Release|Any CPU - {9AB878B3-9A08-4610-9255-71855B08A7D7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9AB878B3-9A08-4610-9255-71855B08A7D7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9AB878B3-9A08-4610-9255-71855B08A7D7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9AB878B3-9A08-4610-9255-71855B08A7D7}.Release|Any CPU.Build.0 = Release|Any CPU - {4B4BBFBB-74EF-4116-AA53-230EF2D63B69}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4B4BBFBB-74EF-4116-AA53-230EF2D63B69}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4B4BBFBB-74EF-4116-AA53-230EF2D63B69}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4B4BBFBB-74EF-4116-AA53-230EF2D63B69}.Release|Any CPU.Build.0 = Release|Any CPU - {C760791D-79C7-42E6-A508-BEEEC87B8D1D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C760791D-79C7-42E6-A508-BEEEC87B8D1D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C760791D-79C7-42E6-A508-BEEEC87B8D1D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C760791D-79C7-42E6-A508-BEEEC87B8D1D}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {8DD8072D-9AD9-4DD8-9263-A5BF32B87148}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8DD8072D-9AD9-4DD8-9263-A5BF32B87148}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8DD8072D-9AD9-4DD8-9263-A5BF32B87148}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8DD8072D-9AD9-4DD8-9263-A5BF32B87148}.Release|Any CPU.Build.0 = Release|Any CPU - {A70CB198-E317-481F-BC5D-30C16C5B8714}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A70CB198-E317-481F-BC5D-30C16C5B8714}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A70CB198-E317-481F-BC5D-30C16C5B8714}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A70CB198-E317-481F-BC5D-30C16C5B8714}.Release|Any CPU.Build.0 = Release|Any CPU - {27A86BA4-2C30-4FB6-AB9C-DE6862A9ACCA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {27A86BA4-2C30-4FB6-AB9C-DE6862A9ACCA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {27A86BA4-2C30-4FB6-AB9C-DE6862A9ACCA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {27A86BA4-2C30-4FB6-AB9C-DE6862A9ACCA}.Release|Any CPU.Build.0 = Release|Any CPU - {BAFD5207-67B1-4A08-8212-43426020162A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BAFD5207-67B1-4A08-8212-43426020162A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BAFD5207-67B1-4A08-8212-43426020162A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BAFD5207-67B1-4A08-8212-43426020162A}.Release|Any CPU.Build.0 = Release|Any CPU - {DEAEBF40-CCF7-4531-B12D-3CBD13568AF0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DEAEBF40-CCF7-4531-B12D-3CBD13568AF0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DEAEBF40-CCF7-4531-B12D-3CBD13568AF0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DEAEBF40-CCF7-4531-B12D-3CBD13568AF0}.Release|Any CPU.Build.0 = Release|Any CPU - {41522D40-D7A6-4EC2-88F7-1BEDAECFEE4E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {41522D40-D7A6-4EC2-88F7-1BEDAECFEE4E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {41522D40-D7A6-4EC2-88F7-1BEDAECFEE4E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {41522D40-D7A6-4EC2-88F7-1BEDAECFEE4E}.Release|Any CPU.Build.0 = Release|Any CPU - {E1B060B4-DA0A-4611-BD38-EF79737E219D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E1B060B4-DA0A-4611-BD38-EF79737E219D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E1B060B4-DA0A-4611-BD38-EF79737E219D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E1B060B4-DA0A-4611-BD38-EF79737E219D}.Release|Any CPU.Build.0 = Release|Any CPU - {3AA69A97-236D-401D-A4DD-7811C268953D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3AA69A97-236D-401D-A4DD-7811C268953D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3AA69A97-236D-401D-A4DD-7811C268953D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3AA69A97-236D-401D-A4DD-7811C268953D}.Release|Any CPU.Build.0 = Release|Any CPU - {85AA082A-EDC4-40BB-8224-3CE74CB9F8F8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {85AA082A-EDC4-40BB-8224-3CE74CB9F8F8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {85AA082A-EDC4-40BB-8224-3CE74CB9F8F8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {85AA082A-EDC4-40BB-8224-3CE74CB9F8F8}.Release|Any CPU.Build.0 = Release|Any CPU - {9AB878B3-9A08-4610-9255-71855B08A7D7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9AB878B3-9A08-4610-9255-71855B08A7D7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9AB878B3-9A08-4610-9255-71855B08A7D7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9AB878B3-9A08-4610-9255-71855B08A7D7}.Release|Any CPU.Build.0 = Release|Any CPU - {4B4BBFBB-74EF-4116-AA53-230EF2D63B69}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4B4BBFBB-74EF-4116-AA53-230EF2D63B69}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4B4BBFBB-74EF-4116-AA53-230EF2D63B69}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4B4BBFBB-74EF-4116-AA53-230EF2D63B69}.Release|Any CPU.Build.0 = Release|Any CPU - {C760791D-79C7-42E6-A508-BEEEC87B8D1D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C760791D-79C7-42E6-A508-BEEEC87B8D1D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C760791D-79C7-42E6-A508-BEEEC87B8D1D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C760791D-79C7-42E6-A508-BEEEC87B8D1D}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -242,42 +142,14 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {0ABA2A4F-F88B-4FDD-8F6C-CC8F91E6BEF3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {4D7A2BFC-0229-449D-B8D0-8F6E87AFE42C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {69926BE2-037C-456E-AB84-362A7655EF10} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {96942FF5-2831-4098-9D2A-CC8E3321E2B7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {AE493180-24DD-4F5E-BFE9-722C32DB6D84} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {7341D654-9178-4A98-84E6-D4F44A30B52C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {8DD8072D-9AD9-4DD8-9263-A5BF32B87148} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A70CB198-E317-481F-BC5D-30C16C5B8714} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {27A86BA4-2C30-4FB6-AB9C-DE6862A9ACCA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {BAFD5207-67B1-4A08-8212-43426020162A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {DEAEBF40-CCF7-4531-B12D-3CBD13568AF0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {41522D40-D7A6-4EC2-88F7-1BEDAECFEE4E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E1B060B4-DA0A-4611-BD38-EF79737E219D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {3AA69A97-236D-401D-A4DD-7811C268953D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {85AA082A-EDC4-40BB-8224-3CE74CB9F8F8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {9AB878B3-9A08-4610-9255-71855B08A7D7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4B4BBFBB-74EF-4116-AA53-230EF2D63B69} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C760791D-79C7-42E6-A508-BEEEC87B8D1D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {8DD8072D-9AD9-4DD8-9263-A5BF32B87148} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A70CB198-E317-481F-BC5D-30C16C5B8714} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {27A86BA4-2C30-4FB6-AB9C-DE6862A9ACCA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {BAFD5207-67B1-4A08-8212-43426020162A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {DEAEBF40-CCF7-4531-B12D-3CBD13568AF0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {41522D40-D7A6-4EC2-88F7-1BEDAECFEE4E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E1B060B4-DA0A-4611-BD38-EF79737E219D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {3AA69A97-236D-401D-A4DD-7811C268953D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {85AA082A-EDC4-40BB-8224-3CE74CB9F8F8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {9AB878B3-9A08-4610-9255-71855B08A7D7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4B4BBFBB-74EF-4116-AA53-230EF2D63B69} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C760791D-79C7-42E6-A508-BEEEC87B8D1D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {CA732376-23C5-42BB-A7A1-1C2E38D05D05} diff --git a/sdk/src/Services/APIGateway/Generated/AmazonAPIGatewayConfig.cs b/sdk/src/Services/APIGateway/Generated/AmazonAPIGatewayConfig.cs index 387692de80e0..7507d49e1e18 100644 --- a/sdk/src/Services/APIGateway/Generated/AmazonAPIGatewayConfig.cs +++ b/sdk/src/Services/APIGateway/Generated/AmazonAPIGatewayConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.APIGateway public partial class AmazonAPIGatewayConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("API Gateway", "4.0.0.0"); private static readonly AmazonAPIGatewayEndpointResolver EndpointResolver = new AmazonAPIGatewayEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("API Gateway", "3.7.400.27"); -======= - InternalSDKUtils.BuildUserAgentString("API Gateway", "3.7.400.54"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/APIGateway/Properties/AssemblyInfo.cs b/sdk/src/Services/APIGateway/Properties/AssemblyInfo.cs index 0e3744bf7a1f..50b81826faae 100644 --- a/sdk/src/Services/APIGateway/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/APIGateway/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.27")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.54")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/ARCZonalShift/ARCZonalShift.sln b/sdk/src/Services/ARCZonalShift/ARCZonalShift.sln index 2861adb1214e..de92664f9f06 100644 --- a/sdk/src/Services/ARCZonalShift/ARCZonalShift.sln +++ b/sdk/src/Services/ARCZonalShift/ARCZonalShift.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {F072A7C2-56D1-439D-BA40-F2C1410F1E3A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {F072A7C2-56D1-439D-BA40-F2C1410F1E3A}.Debug|Any CPU.Build.0 = Debug|Any CPU {F072A7C2-56D1-439D-BA40-F2C1410F1E3A}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {3E4B6401-3FF3-4CF5-92C4-5D8136230033}.Debug|Any CPU.Build.0 = Debug|Any CPU {3E4B6401-3FF3-4CF5-92C4-5D8136230033}.Release|Any CPU.ActiveCfg = Release|Any CPU {3E4B6401-3FF3-4CF5-92C4-5D8136230033}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {21935343-F2AD-490D-AE49-264AEAE2F7C7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {21935343-F2AD-490D-AE49-264AEAE2F7C7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {21935343-F2AD-490D-AE49-264AEAE2F7C7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {21935343-F2AD-490D-AE49-264AEAE2F7C7}.Release|Any CPU.Build.0 = Release|Any CPU - {8997C55B-B5E3-4A23-9BDE-444D7D6F0FD4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8997C55B-B5E3-4A23-9BDE-444D7D6F0FD4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8997C55B-B5E3-4A23-9BDE-444D7D6F0FD4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8997C55B-B5E3-4A23-9BDE-444D7D6F0FD4}.Release|Any CPU.Build.0 = Release|Any CPU - {2ACE5C83-EBA3-4D31-AEFA-3B497DFDB2F6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2ACE5C83-EBA3-4D31-AEFA-3B497DFDB2F6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2ACE5C83-EBA3-4D31-AEFA-3B497DFDB2F6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2ACE5C83-EBA3-4D31-AEFA-3B497DFDB2F6}.Release|Any CPU.Build.0 = Release|Any CPU - {511F382D-0119-4865-8E7D-B7B672A206C5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {511F382D-0119-4865-8E7D-B7B672A206C5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {511F382D-0119-4865-8E7D-B7B672A206C5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {511F382D-0119-4865-8E7D-B7B672A206C5}.Release|Any CPU.Build.0 = Release|Any CPU - {EBB39299-7047-437C-BEB5-AE9D45BEEDB7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EBB39299-7047-437C-BEB5-AE9D45BEEDB7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EBB39299-7047-437C-BEB5-AE9D45BEEDB7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EBB39299-7047-437C-BEB5-AE9D45BEEDB7}.Release|Any CPU.Build.0 = Release|Any CPU - {B1CA0D0B-5255-485A-8834-2C3DC2D4257E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B1CA0D0B-5255-485A-8834-2C3DC2D4257E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B1CA0D0B-5255-485A-8834-2C3DC2D4257E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B1CA0D0B-5255-485A-8834-2C3DC2D4257E}.Release|Any CPU.Build.0 = Release|Any CPU - {1A0AF49A-F21A-41DC-82DC-8B3C94DBAE7F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1A0AF49A-F21A-41DC-82DC-8B3C94DBAE7F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1A0AF49A-F21A-41DC-82DC-8B3C94DBAE7F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1A0AF49A-F21A-41DC-82DC-8B3C94DBAE7F}.Release|Any CPU.Build.0 = Release|Any CPU - {2F3D3232-6278-4AB9-B0D5-E552B22397BD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2F3D3232-6278-4AB9-B0D5-E552B22397BD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2F3D3232-6278-4AB9-B0D5-E552B22397BD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2F3D3232-6278-4AB9-B0D5-E552B22397BD}.Release|Any CPU.Build.0 = Release|Any CPU - {83497C7C-1D60-40A2-A15A-CB316B54BACD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {83497C7C-1D60-40A2-A15A-CB316B54BACD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {83497C7C-1D60-40A2-A15A-CB316B54BACD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {83497C7C-1D60-40A2-A15A-CB316B54BACD}.Release|Any CPU.Build.0 = Release|Any CPU - {25B9D544-3F41-4BF9-AC71-3E9D3AF46DB7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {25B9D544-3F41-4BF9-AC71-3E9D3AF46DB7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {25B9D544-3F41-4BF9-AC71-3E9D3AF46DB7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {25B9D544-3F41-4BF9-AC71-3E9D3AF46DB7}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {21935343-F2AD-490D-AE49-264AEAE2F7C7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {21935343-F2AD-490D-AE49-264AEAE2F7C7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {21935343-F2AD-490D-AE49-264AEAE2F7C7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {21935343-F2AD-490D-AE49-264AEAE2F7C7}.Release|Any CPU.Build.0 = Release|Any CPU - {8997C55B-B5E3-4A23-9BDE-444D7D6F0FD4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8997C55B-B5E3-4A23-9BDE-444D7D6F0FD4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8997C55B-B5E3-4A23-9BDE-444D7D6F0FD4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8997C55B-B5E3-4A23-9BDE-444D7D6F0FD4}.Release|Any CPU.Build.0 = Release|Any CPU - {2ACE5C83-EBA3-4D31-AEFA-3B497DFDB2F6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2ACE5C83-EBA3-4D31-AEFA-3B497DFDB2F6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2ACE5C83-EBA3-4D31-AEFA-3B497DFDB2F6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2ACE5C83-EBA3-4D31-AEFA-3B497DFDB2F6}.Release|Any CPU.Build.0 = Release|Any CPU - {511F382D-0119-4865-8E7D-B7B672A206C5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {511F382D-0119-4865-8E7D-B7B672A206C5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {511F382D-0119-4865-8E7D-B7B672A206C5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {511F382D-0119-4865-8E7D-B7B672A206C5}.Release|Any CPU.Build.0 = Release|Any CPU - {EBB39299-7047-437C-BEB5-AE9D45BEEDB7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EBB39299-7047-437C-BEB5-AE9D45BEEDB7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EBB39299-7047-437C-BEB5-AE9D45BEEDB7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EBB39299-7047-437C-BEB5-AE9D45BEEDB7}.Release|Any CPU.Build.0 = Release|Any CPU - {B1CA0D0B-5255-485A-8834-2C3DC2D4257E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B1CA0D0B-5255-485A-8834-2C3DC2D4257E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B1CA0D0B-5255-485A-8834-2C3DC2D4257E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B1CA0D0B-5255-485A-8834-2C3DC2D4257E}.Release|Any CPU.Build.0 = Release|Any CPU - {1A0AF49A-F21A-41DC-82DC-8B3C94DBAE7F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1A0AF49A-F21A-41DC-82DC-8B3C94DBAE7F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1A0AF49A-F21A-41DC-82DC-8B3C94DBAE7F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1A0AF49A-F21A-41DC-82DC-8B3C94DBAE7F}.Release|Any CPU.Build.0 = Release|Any CPU - {2F3D3232-6278-4AB9-B0D5-E552B22397BD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2F3D3232-6278-4AB9-B0D5-E552B22397BD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2F3D3232-6278-4AB9-B0D5-E552B22397BD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2F3D3232-6278-4AB9-B0D5-E552B22397BD}.Release|Any CPU.Build.0 = Release|Any CPU - {83497C7C-1D60-40A2-A15A-CB316B54BACD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {83497C7C-1D60-40A2-A15A-CB316B54BACD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {83497C7C-1D60-40A2-A15A-CB316B54BACD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {83497C7C-1D60-40A2-A15A-CB316B54BACD}.Release|Any CPU.Build.0 = Release|Any CPU - {25B9D544-3F41-4BF9-AC71-3E9D3AF46DB7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {25B9D544-3F41-4BF9-AC71-3E9D3AF46DB7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {25B9D544-3F41-4BF9-AC71-3E9D3AF46DB7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {25B9D544-3F41-4BF9-AC71-3E9D3AF46DB7}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {F072A7C2-56D1-439D-BA40-F2C1410F1E3A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {AF4C3953-911D-4ECF-B574-D18785236950} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {B8648D0A-48C9-4E1D-85E6-5A84EEA5B5D6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {75E87287-101B-41AF-87EE-5C586B78EB1C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {3E4B6401-3FF3-4CF5-92C4-5D8136230033} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {21935343-F2AD-490D-AE49-264AEAE2F7C7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8997C55B-B5E3-4A23-9BDE-444D7D6F0FD4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {2ACE5C83-EBA3-4D31-AEFA-3B497DFDB2F6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {511F382D-0119-4865-8E7D-B7B672A206C5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {EBB39299-7047-437C-BEB5-AE9D45BEEDB7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B1CA0D0B-5255-485A-8834-2C3DC2D4257E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {1A0AF49A-F21A-41DC-82DC-8B3C94DBAE7F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {2F3D3232-6278-4AB9-B0D5-E552B22397BD} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {83497C7C-1D60-40A2-A15A-CB316B54BACD} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {25B9D544-3F41-4BF9-AC71-3E9D3AF46DB7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {21935343-F2AD-490D-AE49-264AEAE2F7C7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8997C55B-B5E3-4A23-9BDE-444D7D6F0FD4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {2ACE5C83-EBA3-4D31-AEFA-3B497DFDB2F6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {511F382D-0119-4865-8E7D-B7B672A206C5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {EBB39299-7047-437C-BEB5-AE9D45BEEDB7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B1CA0D0B-5255-485A-8834-2C3DC2D4257E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {1A0AF49A-F21A-41DC-82DC-8B3C94DBAE7F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {2F3D3232-6278-4AB9-B0D5-E552B22397BD} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {83497C7C-1D60-40A2-A15A-CB316B54BACD} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {25B9D544-3F41-4BF9-AC71-3E9D3AF46DB7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {6C032077-8D1B-4444-A98F-8483949C0E59} diff --git a/sdk/src/Services/ARCZonalShift/Generated/AmazonARCZonalShiftConfig.cs b/sdk/src/Services/ARCZonalShift/Generated/AmazonARCZonalShiftConfig.cs index 4772718e8525..02700002afc4 100644 --- a/sdk/src/Services/ARCZonalShift/Generated/AmazonARCZonalShiftConfig.cs +++ b/sdk/src/Services/ARCZonalShift/Generated/AmazonARCZonalShiftConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.ARCZonalShift public partial class AmazonARCZonalShiftConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("ARC Zonal Shift", "4.0.0.0"); private static readonly AmazonARCZonalShiftEndpointResolver EndpointResolver = new AmazonARCZonalShiftEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("ARC Zonal Shift", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("ARC Zonal Shift", "3.7.400.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/ARCZonalShift/Properties/AssemblyInfo.cs b/sdk/src/Services/ARCZonalShift/Properties/AssemblyInfo.cs index c3bb26e72082..102bd9b772b2 100644 --- a/sdk/src/Services/ARCZonalShift/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/ARCZonalShift/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/AWSHealth/AWSHealth.sln b/sdk/src/Services/AWSHealth/AWSHealth.sln index 359d1c1ce5bd..f5d9f5cd81b8 100644 --- a/sdk/src/Services/AWSHealth/AWSHealth.sln +++ b/sdk/src/Services/AWSHealth/AWSHealth.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {4EF32274-AA54-4BB6-B1E7-832FDA8B6C6A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {4EF32274-AA54-4BB6-B1E7-832FDA8B6C6A}.Debug|Any CPU.Build.0 = Debug|Any CPU {4EF32274-AA54-4BB6-B1E7-832FDA8B6C6A}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {27ABA293-8369-4E5A-AAAE-6D11AC9DD223}.Debug|Any CPU.Build.0 = Debug|Any CPU {27ABA293-8369-4E5A-AAAE-6D11AC9DD223}.Release|Any CPU.ActiveCfg = Release|Any CPU {27ABA293-8369-4E5A-AAAE-6D11AC9DD223}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {B1072DAE-793B-433A-A4CE-3CFC05E5FEC8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B1072DAE-793B-433A-A4CE-3CFC05E5FEC8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B1072DAE-793B-433A-A4CE-3CFC05E5FEC8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B1072DAE-793B-433A-A4CE-3CFC05E5FEC8}.Release|Any CPU.Build.0 = Release|Any CPU - {EC59B7B4-07E6-41E4-BB16-84FA61688A9F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EC59B7B4-07E6-41E4-BB16-84FA61688A9F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EC59B7B4-07E6-41E4-BB16-84FA61688A9F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EC59B7B4-07E6-41E4-BB16-84FA61688A9F}.Release|Any CPU.Build.0 = Release|Any CPU - {E6BB5433-AC90-40C2-96F0-152F1566FEED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E6BB5433-AC90-40C2-96F0-152F1566FEED}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E6BB5433-AC90-40C2-96F0-152F1566FEED}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E6BB5433-AC90-40C2-96F0-152F1566FEED}.Release|Any CPU.Build.0 = Release|Any CPU - {D0AEDA4D-01C4-4A54-98F6-BEAAAF8F99EE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D0AEDA4D-01C4-4A54-98F6-BEAAAF8F99EE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D0AEDA4D-01C4-4A54-98F6-BEAAAF8F99EE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D0AEDA4D-01C4-4A54-98F6-BEAAAF8F99EE}.Release|Any CPU.Build.0 = Release|Any CPU - {69868B38-5CD0-4FD7-BA30-14BFE77186F6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {69868B38-5CD0-4FD7-BA30-14BFE77186F6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {69868B38-5CD0-4FD7-BA30-14BFE77186F6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {69868B38-5CD0-4FD7-BA30-14BFE77186F6}.Release|Any CPU.Build.0 = Release|Any CPU - {947262D4-357E-4C19-A099-CC86A644CC95}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {947262D4-357E-4C19-A099-CC86A644CC95}.Debug|Any CPU.Build.0 = Debug|Any CPU - {947262D4-357E-4C19-A099-CC86A644CC95}.Release|Any CPU.ActiveCfg = Release|Any CPU - {947262D4-357E-4C19-A099-CC86A644CC95}.Release|Any CPU.Build.0 = Release|Any CPU - {F9E28322-B98C-4B8E-9DF0-4D071E745D6B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F9E28322-B98C-4B8E-9DF0-4D071E745D6B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F9E28322-B98C-4B8E-9DF0-4D071E745D6B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F9E28322-B98C-4B8E-9DF0-4D071E745D6B}.Release|Any CPU.Build.0 = Release|Any CPU - {FB365B00-BCF0-4688-A20C-4592C0B190C4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FB365B00-BCF0-4688-A20C-4592C0B190C4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FB365B00-BCF0-4688-A20C-4592C0B190C4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FB365B00-BCF0-4688-A20C-4592C0B190C4}.Release|Any CPU.Build.0 = Release|Any CPU - {3F742EF0-EF7E-46E2-BF40-33E7C938396D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3F742EF0-EF7E-46E2-BF40-33E7C938396D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3F742EF0-EF7E-46E2-BF40-33E7C938396D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3F742EF0-EF7E-46E2-BF40-33E7C938396D}.Release|Any CPU.Build.0 = Release|Any CPU - {30A7A38C-5466-4D88-9076-99F4B35C80C4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {30A7A38C-5466-4D88-9076-99F4B35C80C4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {30A7A38C-5466-4D88-9076-99F4B35C80C4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {30A7A38C-5466-4D88-9076-99F4B35C80C4}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {B1072DAE-793B-433A-A4CE-3CFC05E5FEC8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B1072DAE-793B-433A-A4CE-3CFC05E5FEC8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B1072DAE-793B-433A-A4CE-3CFC05E5FEC8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B1072DAE-793B-433A-A4CE-3CFC05E5FEC8}.Release|Any CPU.Build.0 = Release|Any CPU - {EC59B7B4-07E6-41E4-BB16-84FA61688A9F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EC59B7B4-07E6-41E4-BB16-84FA61688A9F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EC59B7B4-07E6-41E4-BB16-84FA61688A9F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EC59B7B4-07E6-41E4-BB16-84FA61688A9F}.Release|Any CPU.Build.0 = Release|Any CPU - {E6BB5433-AC90-40C2-96F0-152F1566FEED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E6BB5433-AC90-40C2-96F0-152F1566FEED}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E6BB5433-AC90-40C2-96F0-152F1566FEED}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E6BB5433-AC90-40C2-96F0-152F1566FEED}.Release|Any CPU.Build.0 = Release|Any CPU - {D0AEDA4D-01C4-4A54-98F6-BEAAAF8F99EE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D0AEDA4D-01C4-4A54-98F6-BEAAAF8F99EE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D0AEDA4D-01C4-4A54-98F6-BEAAAF8F99EE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D0AEDA4D-01C4-4A54-98F6-BEAAAF8F99EE}.Release|Any CPU.Build.0 = Release|Any CPU - {69868B38-5CD0-4FD7-BA30-14BFE77186F6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {69868B38-5CD0-4FD7-BA30-14BFE77186F6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {69868B38-5CD0-4FD7-BA30-14BFE77186F6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {69868B38-5CD0-4FD7-BA30-14BFE77186F6}.Release|Any CPU.Build.0 = Release|Any CPU - {947262D4-357E-4C19-A099-CC86A644CC95}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {947262D4-357E-4C19-A099-CC86A644CC95}.Debug|Any CPU.Build.0 = Debug|Any CPU - {947262D4-357E-4C19-A099-CC86A644CC95}.Release|Any CPU.ActiveCfg = Release|Any CPU - {947262D4-357E-4C19-A099-CC86A644CC95}.Release|Any CPU.Build.0 = Release|Any CPU - {F9E28322-B98C-4B8E-9DF0-4D071E745D6B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F9E28322-B98C-4B8E-9DF0-4D071E745D6B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F9E28322-B98C-4B8E-9DF0-4D071E745D6B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F9E28322-B98C-4B8E-9DF0-4D071E745D6B}.Release|Any CPU.Build.0 = Release|Any CPU - {FB365B00-BCF0-4688-A20C-4592C0B190C4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FB365B00-BCF0-4688-A20C-4592C0B190C4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FB365B00-BCF0-4688-A20C-4592C0B190C4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FB365B00-BCF0-4688-A20C-4592C0B190C4}.Release|Any CPU.Build.0 = Release|Any CPU - {3F742EF0-EF7E-46E2-BF40-33E7C938396D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3F742EF0-EF7E-46E2-BF40-33E7C938396D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3F742EF0-EF7E-46E2-BF40-33E7C938396D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3F742EF0-EF7E-46E2-BF40-33E7C938396D}.Release|Any CPU.Build.0 = Release|Any CPU - {30A7A38C-5466-4D88-9076-99F4B35C80C4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {30A7A38C-5466-4D88-9076-99F4B35C80C4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {30A7A38C-5466-4D88-9076-99F4B35C80C4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {30A7A38C-5466-4D88-9076-99F4B35C80C4}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {4EF32274-AA54-4BB6-B1E7-832FDA8B6C6A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {33D4E4AE-EB48-4637-B0D7-0DB2128CC8FA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {45716421-15AD-4BA7-8340-1C7F9E1077C8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {9C0C1B5E-E4DB-4B0F-9B5F-96F6F672961C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {27ABA293-8369-4E5A-AAAE-6D11AC9DD223} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {B1072DAE-793B-433A-A4CE-3CFC05E5FEC8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {EC59B7B4-07E6-41E4-BB16-84FA61688A9F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E6BB5433-AC90-40C2-96F0-152F1566FEED} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D0AEDA4D-01C4-4A54-98F6-BEAAAF8F99EE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {69868B38-5CD0-4FD7-BA30-14BFE77186F6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {947262D4-357E-4C19-A099-CC86A644CC95} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F9E28322-B98C-4B8E-9DF0-4D071E745D6B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {FB365B00-BCF0-4688-A20C-4592C0B190C4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {3F742EF0-EF7E-46E2-BF40-33E7C938396D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {30A7A38C-5466-4D88-9076-99F4B35C80C4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B1072DAE-793B-433A-A4CE-3CFC05E5FEC8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {EC59B7B4-07E6-41E4-BB16-84FA61688A9F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E6BB5433-AC90-40C2-96F0-152F1566FEED} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D0AEDA4D-01C4-4A54-98F6-BEAAAF8F99EE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {69868B38-5CD0-4FD7-BA30-14BFE77186F6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {947262D4-357E-4C19-A099-CC86A644CC95} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F9E28322-B98C-4B8E-9DF0-4D071E745D6B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {FB365B00-BCF0-4688-A20C-4592C0B190C4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {3F742EF0-EF7E-46E2-BF40-33E7C938396D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {30A7A38C-5466-4D88-9076-99F4B35C80C4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {2B6E056D-7461-4B8F-9FBA-389217AF8B06} diff --git a/sdk/src/Services/AWSHealth/Generated/AmazonAWSHealthConfig.cs b/sdk/src/Services/AWSHealth/Generated/AmazonAWSHealthConfig.cs index 90f4613e34dc..48dc24a985df 100644 --- a/sdk/src/Services/AWSHealth/Generated/AmazonAWSHealthConfig.cs +++ b/sdk/src/Services/AWSHealth/Generated/AmazonAWSHealthConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.AWSHealth public partial class AmazonAWSHealthConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("Health", "4.0.0.0"); private static readonly AmazonAWSHealthEndpointResolver EndpointResolver = new AmazonAWSHealthEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("Health", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("Health", "3.7.400.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/AWSHealth/Properties/AssemblyInfo.cs b/sdk/src/Services/AWSHealth/Properties/AssemblyInfo.cs index 11ea80a7182a..6525413ea274 100644 --- a/sdk/src/Services/AWSHealth/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/AWSHealth/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/AWSMarketplaceCommerceAnalytics/AWSMarketplaceCommerceAnalytics.sln b/sdk/src/Services/AWSMarketplaceCommerceAnalytics/AWSMarketplaceCommerceAnalytics.sln index e3186aa5774c..f896b876864e 100644 --- a/sdk/src/Services/AWSMarketplaceCommerceAnalytics/AWSMarketplaceCommerceAnalytics.sln +++ b/sdk/src/Services/AWSMarketplaceCommerceAnalytics/AWSMarketplaceCommerceAnalytics.sln @@ -92,7 +92,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {4A499CEE-200E-4F27-A96B-91453E30A4A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {4A499CEE-200E-4F27-A96B-91453E30A4A2}.Debug|Any CPU.Build.0 = Debug|Any CPU {4A499CEE-200E-4F27-A96B-91453E30A4A2}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -113,97 +120,6 @@ Global {3EC43B8E-BBE8-4EA5-B46D-9A1865DAE43A}.Debug|Any CPU.Build.0 = Debug|Any CPU {3EC43B8E-BBE8-4EA5-B46D-9A1865DAE43A}.Release|Any CPU.ActiveCfg = Release|Any CPU {3EC43B8E-BBE8-4EA5-B46D-9A1865DAE43A}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {067752B7-8300-475E-A637-84D3CCB91781}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {067752B7-8300-475E-A637-84D3CCB91781}.Debug|Any CPU.Build.0 = Debug|Any CPU - {067752B7-8300-475E-A637-84D3CCB91781}.Release|Any CPU.ActiveCfg = Release|Any CPU - {067752B7-8300-475E-A637-84D3CCB91781}.Release|Any CPU.Build.0 = Release|Any CPU - {AC5C2A0F-C893-4011-B63D-B60946AB8E09}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AC5C2A0F-C893-4011-B63D-B60946AB8E09}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AC5C2A0F-C893-4011-B63D-B60946AB8E09}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AC5C2A0F-C893-4011-B63D-B60946AB8E09}.Release|Any CPU.Build.0 = Release|Any CPU - {8DA40642-17F6-439D-BF3D-A7BD2779E690}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8DA40642-17F6-439D-BF3D-A7BD2779E690}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8DA40642-17F6-439D-BF3D-A7BD2779E690}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8DA40642-17F6-439D-BF3D-A7BD2779E690}.Release|Any CPU.Build.0 = Release|Any CPU - {AAD6A792-02D7-4CD2-A830-A9177923D372}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AAD6A792-02D7-4CD2-A830-A9177923D372}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AAD6A792-02D7-4CD2-A830-A9177923D372}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AAD6A792-02D7-4CD2-A830-A9177923D372}.Release|Any CPU.Build.0 = Release|Any CPU - {C4549EBB-C134-4D1C-85E7-110684554FF7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C4549EBB-C134-4D1C-85E7-110684554FF7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C4549EBB-C134-4D1C-85E7-110684554FF7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C4549EBB-C134-4D1C-85E7-110684554FF7}.Release|Any CPU.Build.0 = Release|Any CPU - {069270BE-4DAF-4706-B17C-2DF556C09B6B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {069270BE-4DAF-4706-B17C-2DF556C09B6B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {069270BE-4DAF-4706-B17C-2DF556C09B6B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {069270BE-4DAF-4706-B17C-2DF556C09B6B}.Release|Any CPU.Build.0 = Release|Any CPU - {458A9F46-2DB4-4A4E-9585-A4B31C8F4B57}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {458A9F46-2DB4-4A4E-9585-A4B31C8F4B57}.Debug|Any CPU.Build.0 = Debug|Any CPU - {458A9F46-2DB4-4A4E-9585-A4B31C8F4B57}.Release|Any CPU.ActiveCfg = Release|Any CPU - {458A9F46-2DB4-4A4E-9585-A4B31C8F4B57}.Release|Any CPU.Build.0 = Release|Any CPU - {46C5D9F7-7071-48B6-99D6-E080A769B8AE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {46C5D9F7-7071-48B6-99D6-E080A769B8AE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {46C5D9F7-7071-48B6-99D6-E080A769B8AE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {46C5D9F7-7071-48B6-99D6-E080A769B8AE}.Release|Any CPU.Build.0 = Release|Any CPU - {A9CB80FF-F18D-4C0A-9E44-550EBA179151}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A9CB80FF-F18D-4C0A-9E44-550EBA179151}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A9CB80FF-F18D-4C0A-9E44-550EBA179151}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A9CB80FF-F18D-4C0A-9E44-550EBA179151}.Release|Any CPU.Build.0 = Release|Any CPU - {F5A537B5-C1B9-4343-A356-86D10C31CE11}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F5A537B5-C1B9-4343-A356-86D10C31CE11}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F5A537B5-C1B9-4343-A356-86D10C31CE11}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F5A537B5-C1B9-4343-A356-86D10C31CE11}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {067752B7-8300-475E-A637-84D3CCB91781}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {067752B7-8300-475E-A637-84D3CCB91781}.Debug|Any CPU.Build.0 = Debug|Any CPU - {067752B7-8300-475E-A637-84D3CCB91781}.Release|Any CPU.ActiveCfg = Release|Any CPU - {067752B7-8300-475E-A637-84D3CCB91781}.Release|Any CPU.Build.0 = Release|Any CPU - {AC5C2A0F-C893-4011-B63D-B60946AB8E09}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AC5C2A0F-C893-4011-B63D-B60946AB8E09}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AC5C2A0F-C893-4011-B63D-B60946AB8E09}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AC5C2A0F-C893-4011-B63D-B60946AB8E09}.Release|Any CPU.Build.0 = Release|Any CPU - {8DA40642-17F6-439D-BF3D-A7BD2779E690}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8DA40642-17F6-439D-BF3D-A7BD2779E690}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8DA40642-17F6-439D-BF3D-A7BD2779E690}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8DA40642-17F6-439D-BF3D-A7BD2779E690}.Release|Any CPU.Build.0 = Release|Any CPU - {AAD6A792-02D7-4CD2-A830-A9177923D372}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AAD6A792-02D7-4CD2-A830-A9177923D372}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AAD6A792-02D7-4CD2-A830-A9177923D372}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AAD6A792-02D7-4CD2-A830-A9177923D372}.Release|Any CPU.Build.0 = Release|Any CPU - {C4549EBB-C134-4D1C-85E7-110684554FF7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C4549EBB-C134-4D1C-85E7-110684554FF7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C4549EBB-C134-4D1C-85E7-110684554FF7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C4549EBB-C134-4D1C-85E7-110684554FF7}.Release|Any CPU.Build.0 = Release|Any CPU - {069270BE-4DAF-4706-B17C-2DF556C09B6B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {069270BE-4DAF-4706-B17C-2DF556C09B6B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {069270BE-4DAF-4706-B17C-2DF556C09B6B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {069270BE-4DAF-4706-B17C-2DF556C09B6B}.Release|Any CPU.Build.0 = Release|Any CPU - {458A9F46-2DB4-4A4E-9585-A4B31C8F4B57}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {458A9F46-2DB4-4A4E-9585-A4B31C8F4B57}.Debug|Any CPU.Build.0 = Debug|Any CPU - {458A9F46-2DB4-4A4E-9585-A4B31C8F4B57}.Release|Any CPU.ActiveCfg = Release|Any CPU - {458A9F46-2DB4-4A4E-9585-A4B31C8F4B57}.Release|Any CPU.Build.0 = Release|Any CPU - {46C5D9F7-7071-48B6-99D6-E080A769B8AE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {46C5D9F7-7071-48B6-99D6-E080A769B8AE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {46C5D9F7-7071-48B6-99D6-E080A769B8AE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {46C5D9F7-7071-48B6-99D6-E080A769B8AE}.Release|Any CPU.Build.0 = Release|Any CPU - {A9CB80FF-F18D-4C0A-9E44-550EBA179151}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A9CB80FF-F18D-4C0A-9E44-550EBA179151}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A9CB80FF-F18D-4C0A-9E44-550EBA179151}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A9CB80FF-F18D-4C0A-9E44-550EBA179151}.Release|Any CPU.Build.0 = Release|Any CPU - {F5A537B5-C1B9-4343-A356-86D10C31CE11}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F5A537B5-C1B9-4343-A356-86D10C31CE11}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F5A537B5-C1B9-4343-A356-86D10C31CE11}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F5A537B5-C1B9-4343-A356-86D10C31CE11}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -220,37 +136,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {4A499CEE-200E-4F27-A96B-91453E30A4A2} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {C806E2E8-BB8F-4521-93F6-9C91EAC83AEC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {6BD4A9CA-32BD-4587-AC71-32303C18FDD5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {A07C0B15-CF5F-4109-9EB1-6F1466AF8FEA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {3EC43B8E-BBE8-4EA5-B46D-9A1865DAE43A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {067752B7-8300-475E-A637-84D3CCB91781} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {AC5C2A0F-C893-4011-B63D-B60946AB8E09} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8DA40642-17F6-439D-BF3D-A7BD2779E690} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {AAD6A792-02D7-4CD2-A830-A9177923D372} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C4549EBB-C134-4D1C-85E7-110684554FF7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {069270BE-4DAF-4706-B17C-2DF556C09B6B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {458A9F46-2DB4-4A4E-9585-A4B31C8F4B57} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {46C5D9F7-7071-48B6-99D6-E080A769B8AE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A9CB80FF-F18D-4C0A-9E44-550EBA179151} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F5A537B5-C1B9-4343-A356-86D10C31CE11} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {067752B7-8300-475E-A637-84D3CCB91781} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {AC5C2A0F-C893-4011-B63D-B60946AB8E09} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8DA40642-17F6-439D-BF3D-A7BD2779E690} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {AAD6A792-02D7-4CD2-A830-A9177923D372} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C4549EBB-C134-4D1C-85E7-110684554FF7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {069270BE-4DAF-4706-B17C-2DF556C09B6B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {458A9F46-2DB4-4A4E-9585-A4B31C8F4B57} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {46C5D9F7-7071-48B6-99D6-E080A769B8AE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A9CB80FF-F18D-4C0A-9E44-550EBA179151} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F5A537B5-C1B9-4343-A356-86D10C31CE11} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {CC1DAC57-1071-45E7-8F02-B79E9545FC60} diff --git a/sdk/src/Services/AWSMarketplaceCommerceAnalytics/Generated/AmazonAWSMarketplaceCommerceAnalyticsConfig.cs b/sdk/src/Services/AWSMarketplaceCommerceAnalytics/Generated/AmazonAWSMarketplaceCommerceAnalyticsConfig.cs index 00b44e02c3ca..a6b88558e95d 100644 --- a/sdk/src/Services/AWSMarketplaceCommerceAnalytics/Generated/AmazonAWSMarketplaceCommerceAnalyticsConfig.cs +++ b/sdk/src/Services/AWSMarketplaceCommerceAnalytics/Generated/AmazonAWSMarketplaceCommerceAnalyticsConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.AWSMarketplaceCommerceAnalytics public partial class AmazonAWSMarketplaceCommerceAnalyticsConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("Marketplace Commerce Analytics", "4.0.0.0"); private static readonly AmazonAWSMarketplaceCommerceAnalyticsEndpointResolver EndpointResolver = new AmazonAWSMarketplaceCommerceAnalyticsEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("Marketplace Commerce Analytics", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("Marketplace Commerce Analytics", "3.7.400.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/AWSMarketplaceCommerceAnalytics/Properties/AssemblyInfo.cs b/sdk/src/Services/AWSMarketplaceCommerceAnalytics/Properties/AssemblyInfo.cs index c227d7817121..f743630bb524 100644 --- a/sdk/src/Services/AWSMarketplaceCommerceAnalytics/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/AWSMarketplaceCommerceAnalytics/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/AWSMarketplaceMetering/AWSMarketplaceMetering.sln b/sdk/src/Services/AWSMarketplaceMetering/AWSMarketplaceMetering.sln index f4287b9e8e49..b1030719d529 100644 --- a/sdk/src/Services/AWSMarketplaceMetering/AWSMarketplaceMetering.sln +++ b/sdk/src/Services/AWSMarketplaceMetering/AWSMarketplaceMetering.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {542F21B7-5BBA-46DF-A992-2CE97618844E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {542F21B7-5BBA-46DF-A992-2CE97618844E}.Debug|Any CPU.Build.0 = Debug|Any CPU {542F21B7-5BBA-46DF-A992-2CE97618844E}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {9FB94819-E86A-4F33-BD67-F2F6328591C3}.Debug|Any CPU.Build.0 = Debug|Any CPU {9FB94819-E86A-4F33-BD67-F2F6328591C3}.Release|Any CPU.ActiveCfg = Release|Any CPU {9FB94819-E86A-4F33-BD67-F2F6328591C3}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {67FA7EDC-D27F-4461-8EF0-C9ACA771B05B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {67FA7EDC-D27F-4461-8EF0-C9ACA771B05B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {67FA7EDC-D27F-4461-8EF0-C9ACA771B05B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {67FA7EDC-D27F-4461-8EF0-C9ACA771B05B}.Release|Any CPU.Build.0 = Release|Any CPU - {BD1AD038-FD90-46EF-804A-C66ECCD51C5D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BD1AD038-FD90-46EF-804A-C66ECCD51C5D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BD1AD038-FD90-46EF-804A-C66ECCD51C5D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BD1AD038-FD90-46EF-804A-C66ECCD51C5D}.Release|Any CPU.Build.0 = Release|Any CPU - {17D07DC8-8421-45C0-8A1F-9A11AD4D6202}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {17D07DC8-8421-45C0-8A1F-9A11AD4D6202}.Debug|Any CPU.Build.0 = Debug|Any CPU - {17D07DC8-8421-45C0-8A1F-9A11AD4D6202}.Release|Any CPU.ActiveCfg = Release|Any CPU - {17D07DC8-8421-45C0-8A1F-9A11AD4D6202}.Release|Any CPU.Build.0 = Release|Any CPU - {F585E5D2-4676-4149-9B8D-965920725DCE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F585E5D2-4676-4149-9B8D-965920725DCE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F585E5D2-4676-4149-9B8D-965920725DCE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F585E5D2-4676-4149-9B8D-965920725DCE}.Release|Any CPU.Build.0 = Release|Any CPU - {007F8481-47AB-4341-9159-E47B475810A6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {007F8481-47AB-4341-9159-E47B475810A6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {007F8481-47AB-4341-9159-E47B475810A6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {007F8481-47AB-4341-9159-E47B475810A6}.Release|Any CPU.Build.0 = Release|Any CPU - {A4D9703F-414F-44DA-BC36-9CC3B89659CF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A4D9703F-414F-44DA-BC36-9CC3B89659CF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A4D9703F-414F-44DA-BC36-9CC3B89659CF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A4D9703F-414F-44DA-BC36-9CC3B89659CF}.Release|Any CPU.Build.0 = Release|Any CPU - {EB446B09-CBEC-49A3-9444-97CBB9A49A4D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EB446B09-CBEC-49A3-9444-97CBB9A49A4D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EB446B09-CBEC-49A3-9444-97CBB9A49A4D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EB446B09-CBEC-49A3-9444-97CBB9A49A4D}.Release|Any CPU.Build.0 = Release|Any CPU - {709E776D-AEC1-485F-B201-8696B86457BD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {709E776D-AEC1-485F-B201-8696B86457BD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {709E776D-AEC1-485F-B201-8696B86457BD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {709E776D-AEC1-485F-B201-8696B86457BD}.Release|Any CPU.Build.0 = Release|Any CPU - {065F3B0F-3D74-4E57-8AC7-0BED7F0273B4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {065F3B0F-3D74-4E57-8AC7-0BED7F0273B4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {065F3B0F-3D74-4E57-8AC7-0BED7F0273B4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {065F3B0F-3D74-4E57-8AC7-0BED7F0273B4}.Release|Any CPU.Build.0 = Release|Any CPU - {FD0D7D45-7F4C-40A3-BD86-7E608DD81A7D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FD0D7D45-7F4C-40A3-BD86-7E608DD81A7D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FD0D7D45-7F4C-40A3-BD86-7E608DD81A7D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FD0D7D45-7F4C-40A3-BD86-7E608DD81A7D}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {67FA7EDC-D27F-4461-8EF0-C9ACA771B05B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {67FA7EDC-D27F-4461-8EF0-C9ACA771B05B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {67FA7EDC-D27F-4461-8EF0-C9ACA771B05B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {67FA7EDC-D27F-4461-8EF0-C9ACA771B05B}.Release|Any CPU.Build.0 = Release|Any CPU - {BD1AD038-FD90-46EF-804A-C66ECCD51C5D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BD1AD038-FD90-46EF-804A-C66ECCD51C5D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BD1AD038-FD90-46EF-804A-C66ECCD51C5D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BD1AD038-FD90-46EF-804A-C66ECCD51C5D}.Release|Any CPU.Build.0 = Release|Any CPU - {17D07DC8-8421-45C0-8A1F-9A11AD4D6202}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {17D07DC8-8421-45C0-8A1F-9A11AD4D6202}.Debug|Any CPU.Build.0 = Debug|Any CPU - {17D07DC8-8421-45C0-8A1F-9A11AD4D6202}.Release|Any CPU.ActiveCfg = Release|Any CPU - {17D07DC8-8421-45C0-8A1F-9A11AD4D6202}.Release|Any CPU.Build.0 = Release|Any CPU - {F585E5D2-4676-4149-9B8D-965920725DCE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F585E5D2-4676-4149-9B8D-965920725DCE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F585E5D2-4676-4149-9B8D-965920725DCE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F585E5D2-4676-4149-9B8D-965920725DCE}.Release|Any CPU.Build.0 = Release|Any CPU - {007F8481-47AB-4341-9159-E47B475810A6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {007F8481-47AB-4341-9159-E47B475810A6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {007F8481-47AB-4341-9159-E47B475810A6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {007F8481-47AB-4341-9159-E47B475810A6}.Release|Any CPU.Build.0 = Release|Any CPU - {A4D9703F-414F-44DA-BC36-9CC3B89659CF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A4D9703F-414F-44DA-BC36-9CC3B89659CF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A4D9703F-414F-44DA-BC36-9CC3B89659CF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A4D9703F-414F-44DA-BC36-9CC3B89659CF}.Release|Any CPU.Build.0 = Release|Any CPU - {EB446B09-CBEC-49A3-9444-97CBB9A49A4D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EB446B09-CBEC-49A3-9444-97CBB9A49A4D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EB446B09-CBEC-49A3-9444-97CBB9A49A4D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EB446B09-CBEC-49A3-9444-97CBB9A49A4D}.Release|Any CPU.Build.0 = Release|Any CPU - {709E776D-AEC1-485F-B201-8696B86457BD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {709E776D-AEC1-485F-B201-8696B86457BD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {709E776D-AEC1-485F-B201-8696B86457BD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {709E776D-AEC1-485F-B201-8696B86457BD}.Release|Any CPU.Build.0 = Release|Any CPU - {065F3B0F-3D74-4E57-8AC7-0BED7F0273B4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {065F3B0F-3D74-4E57-8AC7-0BED7F0273B4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {065F3B0F-3D74-4E57-8AC7-0BED7F0273B4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {065F3B0F-3D74-4E57-8AC7-0BED7F0273B4}.Release|Any CPU.Build.0 = Release|Any CPU - {FD0D7D45-7F4C-40A3-BD86-7E608DD81A7D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FD0D7D45-7F4C-40A3-BD86-7E608DD81A7D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FD0D7D45-7F4C-40A3-BD86-7E608DD81A7D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FD0D7D45-7F4C-40A3-BD86-7E608DD81A7D}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {542F21B7-5BBA-46DF-A992-2CE97618844E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {5024BFA5-79D5-4EFB-91E0-520EEB5E8C90} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {D50D24B2-99BA-44D4-81FD-DF7C7694634A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {3061F0A8-B9E5-41FD-807A-885F0B254D1C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {9FB94819-E86A-4F33-BD67-F2F6328591C3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {67FA7EDC-D27F-4461-8EF0-C9ACA771B05B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {BD1AD038-FD90-46EF-804A-C66ECCD51C5D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {17D07DC8-8421-45C0-8A1F-9A11AD4D6202} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F585E5D2-4676-4149-9B8D-965920725DCE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {007F8481-47AB-4341-9159-E47B475810A6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A4D9703F-414F-44DA-BC36-9CC3B89659CF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {EB446B09-CBEC-49A3-9444-97CBB9A49A4D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {709E776D-AEC1-485F-B201-8696B86457BD} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {065F3B0F-3D74-4E57-8AC7-0BED7F0273B4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {FD0D7D45-7F4C-40A3-BD86-7E608DD81A7D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {67FA7EDC-D27F-4461-8EF0-C9ACA771B05B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {BD1AD038-FD90-46EF-804A-C66ECCD51C5D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {17D07DC8-8421-45C0-8A1F-9A11AD4D6202} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F585E5D2-4676-4149-9B8D-965920725DCE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {007F8481-47AB-4341-9159-E47B475810A6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A4D9703F-414F-44DA-BC36-9CC3B89659CF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {EB446B09-CBEC-49A3-9444-97CBB9A49A4D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {709E776D-AEC1-485F-B201-8696B86457BD} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {065F3B0F-3D74-4E57-8AC7-0BED7F0273B4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {FD0D7D45-7F4C-40A3-BD86-7E608DD81A7D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {744CAC74-055C-438A-B052-FA16055A29BA} diff --git a/sdk/src/Services/AWSMarketplaceMetering/Generated/AmazonAWSMarketplaceMeteringConfig.cs b/sdk/src/Services/AWSMarketplaceMetering/Generated/AmazonAWSMarketplaceMeteringConfig.cs index 92db78a25127..a962550a4044 100644 --- a/sdk/src/Services/AWSMarketplaceMetering/Generated/AmazonAWSMarketplaceMeteringConfig.cs +++ b/sdk/src/Services/AWSMarketplaceMetering/Generated/AmazonAWSMarketplaceMeteringConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.AWSMarketplaceMetering public partial class AmazonAWSMarketplaceMeteringConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("Marketplace Metering", "4.0.0.0"); private static readonly AmazonAWSMarketplaceMeteringEndpointResolver EndpointResolver = new AmazonAWSMarketplaceMeteringEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("Marketplace Metering", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("Marketplace Metering", "3.7.400.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/AWSMarketplaceMetering/Properties/AssemblyInfo.cs b/sdk/src/Services/AWSMarketplaceMetering/Properties/AssemblyInfo.cs index 8e84fcc9d8e9..b8467b53054e 100644 --- a/sdk/src/Services/AWSMarketplaceMetering/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/AWSMarketplaceMetering/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/AWSSupport/AWSSupport.sln b/sdk/src/Services/AWSSupport/AWSSupport.sln index b4be1f6e5dc1..15a29b4fe3a2 100644 --- a/sdk/src/Services/AWSSupport/AWSSupport.sln +++ b/sdk/src/Services/AWSSupport/AWSSupport.sln @@ -92,7 +92,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {4A69D643-1F71-43B4-B9C5-776A680E5350}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {4A69D643-1F71-43B4-B9C5-776A680E5350}.Debug|Any CPU.Build.0 = Debug|Any CPU {4A69D643-1F71-43B4-B9C5-776A680E5350}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -113,97 +120,6 @@ Global {D09FFB7D-6372-46F0-91AC-1B5AC18902DE}.Debug|Any CPU.Build.0 = Debug|Any CPU {D09FFB7D-6372-46F0-91AC-1B5AC18902DE}.Release|Any CPU.ActiveCfg = Release|Any CPU {D09FFB7D-6372-46F0-91AC-1B5AC18902DE}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {DC3F5438-19D4-4541-B4FE-A483F7656A6B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DC3F5438-19D4-4541-B4FE-A483F7656A6B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DC3F5438-19D4-4541-B4FE-A483F7656A6B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DC3F5438-19D4-4541-B4FE-A483F7656A6B}.Release|Any CPU.Build.0 = Release|Any CPU - {A3CBFB8E-62FA-4103-B4BA-37518A5E86B1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A3CBFB8E-62FA-4103-B4BA-37518A5E86B1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A3CBFB8E-62FA-4103-B4BA-37518A5E86B1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A3CBFB8E-62FA-4103-B4BA-37518A5E86B1}.Release|Any CPU.Build.0 = Release|Any CPU - {A21E091E-9FE4-4903-A375-2DE7EF0DBB56}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A21E091E-9FE4-4903-A375-2DE7EF0DBB56}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A21E091E-9FE4-4903-A375-2DE7EF0DBB56}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A21E091E-9FE4-4903-A375-2DE7EF0DBB56}.Release|Any CPU.Build.0 = Release|Any CPU - {B0472FDE-9F58-44C9-8DCA-6691770D730A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B0472FDE-9F58-44C9-8DCA-6691770D730A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B0472FDE-9F58-44C9-8DCA-6691770D730A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B0472FDE-9F58-44C9-8DCA-6691770D730A}.Release|Any CPU.Build.0 = Release|Any CPU - {20739145-2C3E-4BFF-9F80-C78C86A0D69E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {20739145-2C3E-4BFF-9F80-C78C86A0D69E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {20739145-2C3E-4BFF-9F80-C78C86A0D69E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {20739145-2C3E-4BFF-9F80-C78C86A0D69E}.Release|Any CPU.Build.0 = Release|Any CPU - {318B0788-497A-47EB-90A4-EC5A665F289E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {318B0788-497A-47EB-90A4-EC5A665F289E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {318B0788-497A-47EB-90A4-EC5A665F289E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {318B0788-497A-47EB-90A4-EC5A665F289E}.Release|Any CPU.Build.0 = Release|Any CPU - {070DEB68-5990-4E12-8088-C0245EFA89B0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {070DEB68-5990-4E12-8088-C0245EFA89B0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {070DEB68-5990-4E12-8088-C0245EFA89B0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {070DEB68-5990-4E12-8088-C0245EFA89B0}.Release|Any CPU.Build.0 = Release|Any CPU - {77EE86A7-6574-448D-A2B6-71E6CB1EE994}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {77EE86A7-6574-448D-A2B6-71E6CB1EE994}.Debug|Any CPU.Build.0 = Debug|Any CPU - {77EE86A7-6574-448D-A2B6-71E6CB1EE994}.Release|Any CPU.ActiveCfg = Release|Any CPU - {77EE86A7-6574-448D-A2B6-71E6CB1EE994}.Release|Any CPU.Build.0 = Release|Any CPU - {102D76AA-56C8-4A8B-BDD1-F8405D9CBA73}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {102D76AA-56C8-4A8B-BDD1-F8405D9CBA73}.Debug|Any CPU.Build.0 = Debug|Any CPU - {102D76AA-56C8-4A8B-BDD1-F8405D9CBA73}.Release|Any CPU.ActiveCfg = Release|Any CPU - {102D76AA-56C8-4A8B-BDD1-F8405D9CBA73}.Release|Any CPU.Build.0 = Release|Any CPU - {AAF6986B-C465-45CE-82D9-56AD414A611D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AAF6986B-C465-45CE-82D9-56AD414A611D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AAF6986B-C465-45CE-82D9-56AD414A611D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AAF6986B-C465-45CE-82D9-56AD414A611D}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {DC3F5438-19D4-4541-B4FE-A483F7656A6B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DC3F5438-19D4-4541-B4FE-A483F7656A6B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DC3F5438-19D4-4541-B4FE-A483F7656A6B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DC3F5438-19D4-4541-B4FE-A483F7656A6B}.Release|Any CPU.Build.0 = Release|Any CPU - {A3CBFB8E-62FA-4103-B4BA-37518A5E86B1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A3CBFB8E-62FA-4103-B4BA-37518A5E86B1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A3CBFB8E-62FA-4103-B4BA-37518A5E86B1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A3CBFB8E-62FA-4103-B4BA-37518A5E86B1}.Release|Any CPU.Build.0 = Release|Any CPU - {A21E091E-9FE4-4903-A375-2DE7EF0DBB56}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A21E091E-9FE4-4903-A375-2DE7EF0DBB56}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A21E091E-9FE4-4903-A375-2DE7EF0DBB56}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A21E091E-9FE4-4903-A375-2DE7EF0DBB56}.Release|Any CPU.Build.0 = Release|Any CPU - {B0472FDE-9F58-44C9-8DCA-6691770D730A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B0472FDE-9F58-44C9-8DCA-6691770D730A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B0472FDE-9F58-44C9-8DCA-6691770D730A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B0472FDE-9F58-44C9-8DCA-6691770D730A}.Release|Any CPU.Build.0 = Release|Any CPU - {20739145-2C3E-4BFF-9F80-C78C86A0D69E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {20739145-2C3E-4BFF-9F80-C78C86A0D69E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {20739145-2C3E-4BFF-9F80-C78C86A0D69E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {20739145-2C3E-4BFF-9F80-C78C86A0D69E}.Release|Any CPU.Build.0 = Release|Any CPU - {318B0788-497A-47EB-90A4-EC5A665F289E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {318B0788-497A-47EB-90A4-EC5A665F289E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {318B0788-497A-47EB-90A4-EC5A665F289E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {318B0788-497A-47EB-90A4-EC5A665F289E}.Release|Any CPU.Build.0 = Release|Any CPU - {070DEB68-5990-4E12-8088-C0245EFA89B0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {070DEB68-5990-4E12-8088-C0245EFA89B0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {070DEB68-5990-4E12-8088-C0245EFA89B0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {070DEB68-5990-4E12-8088-C0245EFA89B0}.Release|Any CPU.Build.0 = Release|Any CPU - {77EE86A7-6574-448D-A2B6-71E6CB1EE994}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {77EE86A7-6574-448D-A2B6-71E6CB1EE994}.Debug|Any CPU.Build.0 = Debug|Any CPU - {77EE86A7-6574-448D-A2B6-71E6CB1EE994}.Release|Any CPU.ActiveCfg = Release|Any CPU - {77EE86A7-6574-448D-A2B6-71E6CB1EE994}.Release|Any CPU.Build.0 = Release|Any CPU - {102D76AA-56C8-4A8B-BDD1-F8405D9CBA73}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {102D76AA-56C8-4A8B-BDD1-F8405D9CBA73}.Debug|Any CPU.Build.0 = Debug|Any CPU - {102D76AA-56C8-4A8B-BDD1-F8405D9CBA73}.Release|Any CPU.ActiveCfg = Release|Any CPU - {102D76AA-56C8-4A8B-BDD1-F8405D9CBA73}.Release|Any CPU.Build.0 = Release|Any CPU - {AAF6986B-C465-45CE-82D9-56AD414A611D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AAF6986B-C465-45CE-82D9-56AD414A611D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AAF6986B-C465-45CE-82D9-56AD414A611D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AAF6986B-C465-45CE-82D9-56AD414A611D}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -220,37 +136,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {4A69D643-1F71-43B4-B9C5-776A680E5350} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {B9F8697D-C130-47C8-8196-3E518F578103} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {F9F0D5FA-14D7-41DE-9BAE-A0813ED941F5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {BBBCBD54-AA35-414F-9EA7-490AB93475C5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {D09FFB7D-6372-46F0-91AC-1B5AC18902DE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {DC3F5438-19D4-4541-B4FE-A483F7656A6B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A3CBFB8E-62FA-4103-B4BA-37518A5E86B1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A21E091E-9FE4-4903-A375-2DE7EF0DBB56} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B0472FDE-9F58-44C9-8DCA-6691770D730A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {20739145-2C3E-4BFF-9F80-C78C86A0D69E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {318B0788-497A-47EB-90A4-EC5A665F289E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {070DEB68-5990-4E12-8088-C0245EFA89B0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {77EE86A7-6574-448D-A2B6-71E6CB1EE994} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {102D76AA-56C8-4A8B-BDD1-F8405D9CBA73} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {AAF6986B-C465-45CE-82D9-56AD414A611D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {DC3F5438-19D4-4541-B4FE-A483F7656A6B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A3CBFB8E-62FA-4103-B4BA-37518A5E86B1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A21E091E-9FE4-4903-A375-2DE7EF0DBB56} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B0472FDE-9F58-44C9-8DCA-6691770D730A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {20739145-2C3E-4BFF-9F80-C78C86A0D69E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {318B0788-497A-47EB-90A4-EC5A665F289E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {070DEB68-5990-4E12-8088-C0245EFA89B0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {77EE86A7-6574-448D-A2B6-71E6CB1EE994} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {102D76AA-56C8-4A8B-BDD1-F8405D9CBA73} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {AAF6986B-C465-45CE-82D9-56AD414A611D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {38928E44-ABD0-4850-91DE-42B24E3EA6F7} diff --git a/sdk/src/Services/AWSSupport/Generated/AmazonAWSSupportConfig.cs b/sdk/src/Services/AWSSupport/Generated/AmazonAWSSupportConfig.cs index aee15a41d76d..8957dd709aec 100644 --- a/sdk/src/Services/AWSSupport/Generated/AmazonAWSSupportConfig.cs +++ b/sdk/src/Services/AWSSupport/Generated/AmazonAWSSupportConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.AWSSupport public partial class AmazonAWSSupportConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("Support", "4.0.0.0"); private static readonly AmazonAWSSupportEndpointResolver EndpointResolver = new AmazonAWSSupportEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("Support", "3.7.400.27"); -======= - InternalSDKUtils.BuildUserAgentString("Support", "3.7.400.54"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/AWSSupport/Properties/AssemblyInfo.cs b/sdk/src/Services/AWSSupport/Properties/AssemblyInfo.cs index cfc247ef9056..94565217956e 100644 --- a/sdk/src/Services/AWSSupport/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/AWSSupport/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.27")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.54")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/AccessAnalyzer/AccessAnalyzer.sln b/sdk/src/Services/AccessAnalyzer/AccessAnalyzer.sln index dc24cfe43c98..465f61c8db9a 100644 --- a/sdk/src/Services/AccessAnalyzer/AccessAnalyzer.sln +++ b/sdk/src/Services/AccessAnalyzer/AccessAnalyzer.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {2E70A75C-E152-4424-B728-52769DF0D1AC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {2E70A75C-E152-4424-B728-52769DF0D1AC}.Debug|Any CPU.Build.0 = Debug|Any CPU {2E70A75C-E152-4424-B728-52769DF0D1AC}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {58A4C664-C00E-443E-9672-4D4F184CD274}.Debug|Any CPU.Build.0 = Debug|Any CPU {58A4C664-C00E-443E-9672-4D4F184CD274}.Release|Any CPU.ActiveCfg = Release|Any CPU {58A4C664-C00E-443E-9672-4D4F184CD274}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {3F1E993B-8176-41DE-8421-59A445EE02CA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3F1E993B-8176-41DE-8421-59A445EE02CA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3F1E993B-8176-41DE-8421-59A445EE02CA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3F1E993B-8176-41DE-8421-59A445EE02CA}.Release|Any CPU.Build.0 = Release|Any CPU - {5298AC0F-5EC2-4240-AABF-829FE1DF3D35}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5298AC0F-5EC2-4240-AABF-829FE1DF3D35}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5298AC0F-5EC2-4240-AABF-829FE1DF3D35}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5298AC0F-5EC2-4240-AABF-829FE1DF3D35}.Release|Any CPU.Build.0 = Release|Any CPU - {C44B872E-018E-4E5C-AB81-64D33D2AF8C1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C44B872E-018E-4E5C-AB81-64D33D2AF8C1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C44B872E-018E-4E5C-AB81-64D33D2AF8C1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C44B872E-018E-4E5C-AB81-64D33D2AF8C1}.Release|Any CPU.Build.0 = Release|Any CPU - {2B687EBA-33FC-4CD5-A0EC-086DC359A8BE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2B687EBA-33FC-4CD5-A0EC-086DC359A8BE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2B687EBA-33FC-4CD5-A0EC-086DC359A8BE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2B687EBA-33FC-4CD5-A0EC-086DC359A8BE}.Release|Any CPU.Build.0 = Release|Any CPU - {C4242ED2-71BE-434A-85FD-758A3A38895F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C4242ED2-71BE-434A-85FD-758A3A38895F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C4242ED2-71BE-434A-85FD-758A3A38895F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C4242ED2-71BE-434A-85FD-758A3A38895F}.Release|Any CPU.Build.0 = Release|Any CPU - {3B0487FD-0FEA-4BAB-8094-BB2D7E1B16DE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3B0487FD-0FEA-4BAB-8094-BB2D7E1B16DE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3B0487FD-0FEA-4BAB-8094-BB2D7E1B16DE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3B0487FD-0FEA-4BAB-8094-BB2D7E1B16DE}.Release|Any CPU.Build.0 = Release|Any CPU - {EC22F364-D514-46F3-9446-4FD5B3B047E6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EC22F364-D514-46F3-9446-4FD5B3B047E6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EC22F364-D514-46F3-9446-4FD5B3B047E6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EC22F364-D514-46F3-9446-4FD5B3B047E6}.Release|Any CPU.Build.0 = Release|Any CPU - {16A8B1D0-BFC7-42EC-9AEB-D44566AA1F3F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {16A8B1D0-BFC7-42EC-9AEB-D44566AA1F3F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {16A8B1D0-BFC7-42EC-9AEB-D44566AA1F3F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {16A8B1D0-BFC7-42EC-9AEB-D44566AA1F3F}.Release|Any CPU.Build.0 = Release|Any CPU - {3B6DF465-10AF-41C1-89DB-39BAF533CD02}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3B6DF465-10AF-41C1-89DB-39BAF533CD02}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3B6DF465-10AF-41C1-89DB-39BAF533CD02}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3B6DF465-10AF-41C1-89DB-39BAF533CD02}.Release|Any CPU.Build.0 = Release|Any CPU - {6FA085E3-963A-4C4B-A8C3-0A5F4B4E7B36}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6FA085E3-963A-4C4B-A8C3-0A5F4B4E7B36}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6FA085E3-963A-4C4B-A8C3-0A5F4B4E7B36}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6FA085E3-963A-4C4B-A8C3-0A5F4B4E7B36}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {3F1E993B-8176-41DE-8421-59A445EE02CA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3F1E993B-8176-41DE-8421-59A445EE02CA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3F1E993B-8176-41DE-8421-59A445EE02CA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3F1E993B-8176-41DE-8421-59A445EE02CA}.Release|Any CPU.Build.0 = Release|Any CPU - {5298AC0F-5EC2-4240-AABF-829FE1DF3D35}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5298AC0F-5EC2-4240-AABF-829FE1DF3D35}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5298AC0F-5EC2-4240-AABF-829FE1DF3D35}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5298AC0F-5EC2-4240-AABF-829FE1DF3D35}.Release|Any CPU.Build.0 = Release|Any CPU - {C44B872E-018E-4E5C-AB81-64D33D2AF8C1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C44B872E-018E-4E5C-AB81-64D33D2AF8C1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C44B872E-018E-4E5C-AB81-64D33D2AF8C1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C44B872E-018E-4E5C-AB81-64D33D2AF8C1}.Release|Any CPU.Build.0 = Release|Any CPU - {2B687EBA-33FC-4CD5-A0EC-086DC359A8BE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2B687EBA-33FC-4CD5-A0EC-086DC359A8BE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2B687EBA-33FC-4CD5-A0EC-086DC359A8BE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2B687EBA-33FC-4CD5-A0EC-086DC359A8BE}.Release|Any CPU.Build.0 = Release|Any CPU - {C4242ED2-71BE-434A-85FD-758A3A38895F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C4242ED2-71BE-434A-85FD-758A3A38895F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C4242ED2-71BE-434A-85FD-758A3A38895F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C4242ED2-71BE-434A-85FD-758A3A38895F}.Release|Any CPU.Build.0 = Release|Any CPU - {3B0487FD-0FEA-4BAB-8094-BB2D7E1B16DE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3B0487FD-0FEA-4BAB-8094-BB2D7E1B16DE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3B0487FD-0FEA-4BAB-8094-BB2D7E1B16DE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3B0487FD-0FEA-4BAB-8094-BB2D7E1B16DE}.Release|Any CPU.Build.0 = Release|Any CPU - {EC22F364-D514-46F3-9446-4FD5B3B047E6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EC22F364-D514-46F3-9446-4FD5B3B047E6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EC22F364-D514-46F3-9446-4FD5B3B047E6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EC22F364-D514-46F3-9446-4FD5B3B047E6}.Release|Any CPU.Build.0 = Release|Any CPU - {16A8B1D0-BFC7-42EC-9AEB-D44566AA1F3F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {16A8B1D0-BFC7-42EC-9AEB-D44566AA1F3F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {16A8B1D0-BFC7-42EC-9AEB-D44566AA1F3F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {16A8B1D0-BFC7-42EC-9AEB-D44566AA1F3F}.Release|Any CPU.Build.0 = Release|Any CPU - {3B6DF465-10AF-41C1-89DB-39BAF533CD02}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3B6DF465-10AF-41C1-89DB-39BAF533CD02}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3B6DF465-10AF-41C1-89DB-39BAF533CD02}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3B6DF465-10AF-41C1-89DB-39BAF533CD02}.Release|Any CPU.Build.0 = Release|Any CPU - {6FA085E3-963A-4C4B-A8C3-0A5F4B4E7B36}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6FA085E3-963A-4C4B-A8C3-0A5F4B4E7B36}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6FA085E3-963A-4C4B-A8C3-0A5F4B4E7B36}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6FA085E3-963A-4C4B-A8C3-0A5F4B4E7B36}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {2E70A75C-E152-4424-B728-52769DF0D1AC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {887020D7-84B1-434D-8018-531D0E197510} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {3040EC8F-1AAE-420D-BA9A-F3E0AC69B915} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {AC479CE6-FD8C-4330-96E1-81885C608C22} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {58A4C664-C00E-443E-9672-4D4F184CD274} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {3F1E993B-8176-41DE-8421-59A445EE02CA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {5298AC0F-5EC2-4240-AABF-829FE1DF3D35} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C44B872E-018E-4E5C-AB81-64D33D2AF8C1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {2B687EBA-33FC-4CD5-A0EC-086DC359A8BE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C4242ED2-71BE-434A-85FD-758A3A38895F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {3B0487FD-0FEA-4BAB-8094-BB2D7E1B16DE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {EC22F364-D514-46F3-9446-4FD5B3B047E6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {16A8B1D0-BFC7-42EC-9AEB-D44566AA1F3F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {3B6DF465-10AF-41C1-89DB-39BAF533CD02} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6FA085E3-963A-4C4B-A8C3-0A5F4B4E7B36} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {3F1E993B-8176-41DE-8421-59A445EE02CA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {5298AC0F-5EC2-4240-AABF-829FE1DF3D35} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C44B872E-018E-4E5C-AB81-64D33D2AF8C1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {2B687EBA-33FC-4CD5-A0EC-086DC359A8BE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C4242ED2-71BE-434A-85FD-758A3A38895F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {3B0487FD-0FEA-4BAB-8094-BB2D7E1B16DE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {EC22F364-D514-46F3-9446-4FD5B3B047E6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {16A8B1D0-BFC7-42EC-9AEB-D44566AA1F3F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {3B6DF465-10AF-41C1-89DB-39BAF533CD02} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6FA085E3-963A-4C4B-A8C3-0A5F4B4E7B36} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {BEC52791-E93B-4B4B-8358-8EBE7545266F} diff --git a/sdk/src/Services/AccessAnalyzer/Generated/AmazonAccessAnalyzerConfig.cs b/sdk/src/Services/AccessAnalyzer/Generated/AmazonAccessAnalyzerConfig.cs index b073d622d6e6..314ec0e15d6d 100644 --- a/sdk/src/Services/AccessAnalyzer/Generated/AmazonAccessAnalyzerConfig.cs +++ b/sdk/src/Services/AccessAnalyzer/Generated/AmazonAccessAnalyzerConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.AccessAnalyzer public partial class AmazonAccessAnalyzerConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("AccessAnalyzer", "4.0.0.0"); private static readonly AmazonAccessAnalyzerEndpointResolver EndpointResolver = new AmazonAccessAnalyzerEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("AccessAnalyzer", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("AccessAnalyzer", "3.7.402.2"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/AccessAnalyzer/Generated/Model/Internal/MarshallTransformations/UpdateAnalyzerRequestMarshaller.cs b/sdk/src/Services/AccessAnalyzer/Generated/Model/Internal/MarshallTransformations/UpdateAnalyzerRequestMarshaller.cs index 9f88af8bd8c1..3c23cc136e02 100644 --- a/sdk/src/Services/AccessAnalyzer/Generated/Model/Internal/MarshallTransformations/UpdateAnalyzerRequestMarshaller.cs +++ b/sdk/src/Services/AccessAnalyzer/Generated/Model/Internal/MarshallTransformations/UpdateAnalyzerRequestMarshaller.cs @@ -64,26 +64,29 @@ public IRequest Marshall(UpdateAnalyzerRequest publicRequest) throw new AmazonAccessAnalyzerException("Request object does not have required field AnalyzerName set"); request.AddPathResource("{analyzerName}", StringUtils.FromString(publicRequest.AnalyzerName)); request.ResourcePath = "/analyzer/{analyzerName}"; - using (StringWriter stringWriter = new StringWriter(CultureInfo.InvariantCulture)) + using (MemoryStream memoryStream = new MemoryStream()) { - JsonWriter writer = new JsonWriter(stringWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetConfiguration()) + using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) { - context.Writer.WritePropertyName("configuration"); - context.Writer.WriteObjectStart(); + JsonWriter writer = new JsonWriter(streamWriter); + writer.Validate = false; + writer.WriteObjectStart(); + var context = new JsonMarshallerContext(request, writer); + if(publicRequest.IsSetConfiguration()) + { + context.Writer.WritePropertyName("configuration"); + context.Writer.WriteObjectStart(); - var marshaller = AnalyzerConfigurationMarshaller.Instance; - marshaller.Marshall(publicRequest.Configuration, context); + var marshaller = AnalyzerConfigurationMarshaller.Instance; + marshaller.Marshall(publicRequest.Configuration, context); - context.Writer.WriteObjectEnd(); + context.Writer.WriteObjectEnd(); + } + + writer.WriteObjectEnd(); } - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); + request.Content = memoryStream.ToArray(); } diff --git a/sdk/src/Services/AccessAnalyzer/Generated/_bcl/AmazonAccessAnalyzerClient.cs b/sdk/src/Services/AccessAnalyzer/Generated/_bcl/AmazonAccessAnalyzerClient.cs index 50d7ac824de0..d06df11cfa2b 100644 --- a/sdk/src/Services/AccessAnalyzer/Generated/_bcl/AmazonAccessAnalyzerClient.cs +++ b/sdk/src/Services/AccessAnalyzer/Generated/_bcl/AmazonAccessAnalyzerClient.cs @@ -1900,8 +1900,7 @@ public virtual ListAccessPreviewsResponse ListAccessPreviews(ListAccessPreviewsR /// /// Retrieves a list of resources of the specified type that have been analyzed by the - /// specified external access analyzer. This action is not supported for unused access - /// analyzers. + /// specified analyzer. /// /// Container for the necessary parameters to execute the ListAnalyzedResources service method. /// @@ -1934,8 +1933,7 @@ public virtual ListAnalyzedResourcesResponse ListAnalyzedResources(ListAnalyzedR /// /// Retrieves a list of resources of the specified type that have been analyzed by the - /// specified external access analyzer. This action is not supported for unused access - /// analyzers. + /// specified analyzer. /// /// Container for the necessary parameters to execute the ListAnalyzedResources service method. /// @@ -2708,6 +2706,83 @@ public virtual UntagResourceResponse UntagResource(UntagResourceRequest request) #endregion + #region UpdateAnalyzer + + + /// + /// Modifies the configuration of an existing analyzer. + /// + /// Container for the necessary parameters to execute the UpdateAnalyzer service method. + /// + /// The response from the UpdateAnalyzer service method, as returned by AccessAnalyzer. + /// + /// You do not have sufficient access to perform this action. + /// + /// + /// A conflict exception error. + /// + /// + /// Internal server error. + /// + /// + /// The specified resource could not be found. + /// + /// + /// Throttling limit exceeded error. + /// + /// + /// Validation exception error. + /// + /// REST API Reference for UpdateAnalyzer Operation + public virtual UpdateAnalyzerResponse UpdateAnalyzer(UpdateAnalyzerRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = UpdateAnalyzerRequestMarshaller.Instance; + options.ResponseUnmarshaller = UpdateAnalyzerResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// Modifies the configuration of an existing analyzer. + /// + /// Container for the necessary parameters to execute the UpdateAnalyzer service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the UpdateAnalyzer service method, as returned by AccessAnalyzer. + /// + /// You do not have sufficient access to perform this action. + /// + /// + /// A conflict exception error. + /// + /// + /// Internal server error. + /// + /// + /// The specified resource could not be found. + /// + /// + /// Throttling limit exceeded error. + /// + /// + /// Validation exception error. + /// + /// REST API Reference for UpdateAnalyzer Operation + public virtual Task UpdateAnalyzerAsync(UpdateAnalyzerRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = UpdateAnalyzerRequestMarshaller.Instance; + options.ResponseUnmarshaller = UpdateAnalyzerResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + #region UpdateArchiveRule diff --git a/sdk/src/Services/AccessAnalyzer/Properties/AssemblyInfo.cs b/sdk/src/Services/AccessAnalyzer/Properties/AssemblyInfo.cs index 759d265b44fa..e9f4f1b4fb8a 100644 --- a/sdk/src/Services/AccessAnalyzer/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/AccessAnalyzer/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.402.2")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/Account/Account.sln b/sdk/src/Services/Account/Account.sln index 1d1f9c4beed1..781a7059524a 100644 --- a/sdk/src/Services/Account/Account.sln +++ b/sdk/src/Services/Account/Account.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {B1EB5B64-9306-411C-96D4-8193121FA281}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {B1EB5B64-9306-411C-96D4-8193121FA281}.Debug|Any CPU.Build.0 = Debug|Any CPU {B1EB5B64-9306-411C-96D4-8193121FA281}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {C99722EF-11FE-483E-A3CA-D6DA1B56F4FC}.Debug|Any CPU.Build.0 = Debug|Any CPU {C99722EF-11FE-483E-A3CA-D6DA1B56F4FC}.Release|Any CPU.ActiveCfg = Release|Any CPU {C99722EF-11FE-483E-A3CA-D6DA1B56F4FC}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {6090DF2C-B002-4B8B-9041-2898AA002238}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6090DF2C-B002-4B8B-9041-2898AA002238}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6090DF2C-B002-4B8B-9041-2898AA002238}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6090DF2C-B002-4B8B-9041-2898AA002238}.Release|Any CPU.Build.0 = Release|Any CPU - {9B5FF114-00DA-4C3A-AC2A-37A830EDEC29}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9B5FF114-00DA-4C3A-AC2A-37A830EDEC29}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9B5FF114-00DA-4C3A-AC2A-37A830EDEC29}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9B5FF114-00DA-4C3A-AC2A-37A830EDEC29}.Release|Any CPU.Build.0 = Release|Any CPU - {C19B34FD-750C-46F2-83A1-BF84E7547EF7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C19B34FD-750C-46F2-83A1-BF84E7547EF7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C19B34FD-750C-46F2-83A1-BF84E7547EF7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C19B34FD-750C-46F2-83A1-BF84E7547EF7}.Release|Any CPU.Build.0 = Release|Any CPU - {36361AE8-5150-47D5-902C-840A407E1500}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {36361AE8-5150-47D5-902C-840A407E1500}.Debug|Any CPU.Build.0 = Debug|Any CPU - {36361AE8-5150-47D5-902C-840A407E1500}.Release|Any CPU.ActiveCfg = Release|Any CPU - {36361AE8-5150-47D5-902C-840A407E1500}.Release|Any CPU.Build.0 = Release|Any CPU - {A564823C-863C-42BD-A53F-C4FBE957D2EF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A564823C-863C-42BD-A53F-C4FBE957D2EF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A564823C-863C-42BD-A53F-C4FBE957D2EF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A564823C-863C-42BD-A53F-C4FBE957D2EF}.Release|Any CPU.Build.0 = Release|Any CPU - {7AE57D35-3B12-4DC3-8BEB-DA672196E4D7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7AE57D35-3B12-4DC3-8BEB-DA672196E4D7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7AE57D35-3B12-4DC3-8BEB-DA672196E4D7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7AE57D35-3B12-4DC3-8BEB-DA672196E4D7}.Release|Any CPU.Build.0 = Release|Any CPU - {C0C1836D-35A8-44A9-8D43-5E35365F6F7F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C0C1836D-35A8-44A9-8D43-5E35365F6F7F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C0C1836D-35A8-44A9-8D43-5E35365F6F7F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C0C1836D-35A8-44A9-8D43-5E35365F6F7F}.Release|Any CPU.Build.0 = Release|Any CPU - {DA783FC0-E29F-4CE1-9C21-85D46DF3651E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DA783FC0-E29F-4CE1-9C21-85D46DF3651E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DA783FC0-E29F-4CE1-9C21-85D46DF3651E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DA783FC0-E29F-4CE1-9C21-85D46DF3651E}.Release|Any CPU.Build.0 = Release|Any CPU - {7F3D0B29-EF87-4C76-AD80-D07804281449}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7F3D0B29-EF87-4C76-AD80-D07804281449}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7F3D0B29-EF87-4C76-AD80-D07804281449}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7F3D0B29-EF87-4C76-AD80-D07804281449}.Release|Any CPU.Build.0 = Release|Any CPU - {C8CF5A09-A49E-4596-86DF-CE740E7A6AD5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C8CF5A09-A49E-4596-86DF-CE740E7A6AD5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C8CF5A09-A49E-4596-86DF-CE740E7A6AD5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C8CF5A09-A49E-4596-86DF-CE740E7A6AD5}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {6090DF2C-B002-4B8B-9041-2898AA002238}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6090DF2C-B002-4B8B-9041-2898AA002238}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6090DF2C-B002-4B8B-9041-2898AA002238}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6090DF2C-B002-4B8B-9041-2898AA002238}.Release|Any CPU.Build.0 = Release|Any CPU - {9B5FF114-00DA-4C3A-AC2A-37A830EDEC29}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9B5FF114-00DA-4C3A-AC2A-37A830EDEC29}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9B5FF114-00DA-4C3A-AC2A-37A830EDEC29}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9B5FF114-00DA-4C3A-AC2A-37A830EDEC29}.Release|Any CPU.Build.0 = Release|Any CPU - {C19B34FD-750C-46F2-83A1-BF84E7547EF7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C19B34FD-750C-46F2-83A1-BF84E7547EF7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C19B34FD-750C-46F2-83A1-BF84E7547EF7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C19B34FD-750C-46F2-83A1-BF84E7547EF7}.Release|Any CPU.Build.0 = Release|Any CPU - {36361AE8-5150-47D5-902C-840A407E1500}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {36361AE8-5150-47D5-902C-840A407E1500}.Debug|Any CPU.Build.0 = Debug|Any CPU - {36361AE8-5150-47D5-902C-840A407E1500}.Release|Any CPU.ActiveCfg = Release|Any CPU - {36361AE8-5150-47D5-902C-840A407E1500}.Release|Any CPU.Build.0 = Release|Any CPU - {A564823C-863C-42BD-A53F-C4FBE957D2EF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A564823C-863C-42BD-A53F-C4FBE957D2EF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A564823C-863C-42BD-A53F-C4FBE957D2EF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A564823C-863C-42BD-A53F-C4FBE957D2EF}.Release|Any CPU.Build.0 = Release|Any CPU - {7AE57D35-3B12-4DC3-8BEB-DA672196E4D7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7AE57D35-3B12-4DC3-8BEB-DA672196E4D7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7AE57D35-3B12-4DC3-8BEB-DA672196E4D7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7AE57D35-3B12-4DC3-8BEB-DA672196E4D7}.Release|Any CPU.Build.0 = Release|Any CPU - {C0C1836D-35A8-44A9-8D43-5E35365F6F7F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C0C1836D-35A8-44A9-8D43-5E35365F6F7F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C0C1836D-35A8-44A9-8D43-5E35365F6F7F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C0C1836D-35A8-44A9-8D43-5E35365F6F7F}.Release|Any CPU.Build.0 = Release|Any CPU - {DA783FC0-E29F-4CE1-9C21-85D46DF3651E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DA783FC0-E29F-4CE1-9C21-85D46DF3651E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DA783FC0-E29F-4CE1-9C21-85D46DF3651E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DA783FC0-E29F-4CE1-9C21-85D46DF3651E}.Release|Any CPU.Build.0 = Release|Any CPU - {7F3D0B29-EF87-4C76-AD80-D07804281449}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7F3D0B29-EF87-4C76-AD80-D07804281449}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7F3D0B29-EF87-4C76-AD80-D07804281449}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7F3D0B29-EF87-4C76-AD80-D07804281449}.Release|Any CPU.Build.0 = Release|Any CPU - {C8CF5A09-A49E-4596-86DF-CE740E7A6AD5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C8CF5A09-A49E-4596-86DF-CE740E7A6AD5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C8CF5A09-A49E-4596-86DF-CE740E7A6AD5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C8CF5A09-A49E-4596-86DF-CE740E7A6AD5}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {B1EB5B64-9306-411C-96D4-8193121FA281} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {0B4990B8-4E2B-45BA-81C7-7FA7B9F969A7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {0B5A2819-BFB1-45B9-86D6-AFBCB95C47B6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {16FF4213-1350-4C73-A991-F86CA1050E5A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {C99722EF-11FE-483E-A3CA-D6DA1B56F4FC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {6090DF2C-B002-4B8B-9041-2898AA002238} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {9B5FF114-00DA-4C3A-AC2A-37A830EDEC29} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C19B34FD-750C-46F2-83A1-BF84E7547EF7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {36361AE8-5150-47D5-902C-840A407E1500} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A564823C-863C-42BD-A53F-C4FBE957D2EF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {7AE57D35-3B12-4DC3-8BEB-DA672196E4D7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C0C1836D-35A8-44A9-8D43-5E35365F6F7F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {DA783FC0-E29F-4CE1-9C21-85D46DF3651E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {7F3D0B29-EF87-4C76-AD80-D07804281449} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C8CF5A09-A49E-4596-86DF-CE740E7A6AD5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {6090DF2C-B002-4B8B-9041-2898AA002238} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {9B5FF114-00DA-4C3A-AC2A-37A830EDEC29} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C19B34FD-750C-46F2-83A1-BF84E7547EF7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {36361AE8-5150-47D5-902C-840A407E1500} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A564823C-863C-42BD-A53F-C4FBE957D2EF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {7AE57D35-3B12-4DC3-8BEB-DA672196E4D7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C0C1836D-35A8-44A9-8D43-5E35365F6F7F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {DA783FC0-E29F-4CE1-9C21-85D46DF3651E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {7F3D0B29-EF87-4C76-AD80-D07804281449} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C8CF5A09-A49E-4596-86DF-CE740E7A6AD5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {55A91B21-3E09-44DB-B2C0-13F051E9C223} diff --git a/sdk/src/Services/Account/Generated/AmazonAccountConfig.cs b/sdk/src/Services/Account/Generated/AmazonAccountConfig.cs index 7689a40bcb6e..25d964f42f9b 100644 --- a/sdk/src/Services/Account/Generated/AmazonAccountConfig.cs +++ b/sdk/src/Services/Account/Generated/AmazonAccountConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.Account public partial class AmazonAccountConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("Account", "4.0.0.0"); private static readonly AmazonAccountEndpointResolver EndpointResolver = new AmazonAccountEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("Account", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("Account", "3.7.400.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/Account/Properties/AssemblyInfo.cs b/sdk/src/Services/Account/Properties/AssemblyInfo.cs index 217c2b9b0d75..0de869b08cb4 100644 --- a/sdk/src/Services/Account/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/Account/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/Amplify/Amplify.sln b/sdk/src/Services/Amplify/Amplify.sln index 7823bc873e92..6921dec94b1c 100644 --- a/sdk/src/Services/Amplify/Amplify.sln +++ b/sdk/src/Services/Amplify/Amplify.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {213D36AA-6703-4405-9678-449B94F85D18}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {213D36AA-6703-4405-9678-449B94F85D18}.Debug|Any CPU.Build.0 = Debug|Any CPU {213D36AA-6703-4405-9678-449B94F85D18}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {2AA43535-2B3D-469E-ADB0-A355695F035D}.Debug|Any CPU.Build.0 = Debug|Any CPU {2AA43535-2B3D-469E-ADB0-A355695F035D}.Release|Any CPU.ActiveCfg = Release|Any CPU {2AA43535-2B3D-469E-ADB0-A355695F035D}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {58072BD4-86DC-4C70-85E4-7A60A943EDBF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {58072BD4-86DC-4C70-85E4-7A60A943EDBF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {58072BD4-86DC-4C70-85E4-7A60A943EDBF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {58072BD4-86DC-4C70-85E4-7A60A943EDBF}.Release|Any CPU.Build.0 = Release|Any CPU - {2DCB8BB3-F60F-4ED4-A0DC-C181182D3C2F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2DCB8BB3-F60F-4ED4-A0DC-C181182D3C2F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2DCB8BB3-F60F-4ED4-A0DC-C181182D3C2F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2DCB8BB3-F60F-4ED4-A0DC-C181182D3C2F}.Release|Any CPU.Build.0 = Release|Any CPU - {568EF2C1-05F5-4442-AFFA-B7212E94FB28}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {568EF2C1-05F5-4442-AFFA-B7212E94FB28}.Debug|Any CPU.Build.0 = Debug|Any CPU - {568EF2C1-05F5-4442-AFFA-B7212E94FB28}.Release|Any CPU.ActiveCfg = Release|Any CPU - {568EF2C1-05F5-4442-AFFA-B7212E94FB28}.Release|Any CPU.Build.0 = Release|Any CPU - {8B546CEE-6631-4588-BC2D-A6C3DEF292AD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8B546CEE-6631-4588-BC2D-A6C3DEF292AD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8B546CEE-6631-4588-BC2D-A6C3DEF292AD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8B546CEE-6631-4588-BC2D-A6C3DEF292AD}.Release|Any CPU.Build.0 = Release|Any CPU - {66FEF300-747C-4C4E-9EC3-CE624A8BA350}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {66FEF300-747C-4C4E-9EC3-CE624A8BA350}.Debug|Any CPU.Build.0 = Debug|Any CPU - {66FEF300-747C-4C4E-9EC3-CE624A8BA350}.Release|Any CPU.ActiveCfg = Release|Any CPU - {66FEF300-747C-4C4E-9EC3-CE624A8BA350}.Release|Any CPU.Build.0 = Release|Any CPU - {1AEDDF6F-7599-44CC-9C0F-7021964847C5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1AEDDF6F-7599-44CC-9C0F-7021964847C5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1AEDDF6F-7599-44CC-9C0F-7021964847C5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1AEDDF6F-7599-44CC-9C0F-7021964847C5}.Release|Any CPU.Build.0 = Release|Any CPU - {0A9550BF-596A-4605-9FE7-CF7CA4DA832A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0A9550BF-596A-4605-9FE7-CF7CA4DA832A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0A9550BF-596A-4605-9FE7-CF7CA4DA832A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0A9550BF-596A-4605-9FE7-CF7CA4DA832A}.Release|Any CPU.Build.0 = Release|Any CPU - {8803881D-59C3-41A0-8982-E7779B66CF88}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8803881D-59C3-41A0-8982-E7779B66CF88}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8803881D-59C3-41A0-8982-E7779B66CF88}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8803881D-59C3-41A0-8982-E7779B66CF88}.Release|Any CPU.Build.0 = Release|Any CPU - {9010FA95-6A4B-465E-946C-86BD191B26ED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9010FA95-6A4B-465E-946C-86BD191B26ED}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9010FA95-6A4B-465E-946C-86BD191B26ED}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9010FA95-6A4B-465E-946C-86BD191B26ED}.Release|Any CPU.Build.0 = Release|Any CPU - {3EA23494-0321-43BD-BF71-4BCB9CCA4D93}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3EA23494-0321-43BD-BF71-4BCB9CCA4D93}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3EA23494-0321-43BD-BF71-4BCB9CCA4D93}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3EA23494-0321-43BD-BF71-4BCB9CCA4D93}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {58072BD4-86DC-4C70-85E4-7A60A943EDBF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {58072BD4-86DC-4C70-85E4-7A60A943EDBF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {58072BD4-86DC-4C70-85E4-7A60A943EDBF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {58072BD4-86DC-4C70-85E4-7A60A943EDBF}.Release|Any CPU.Build.0 = Release|Any CPU - {2DCB8BB3-F60F-4ED4-A0DC-C181182D3C2F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2DCB8BB3-F60F-4ED4-A0DC-C181182D3C2F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2DCB8BB3-F60F-4ED4-A0DC-C181182D3C2F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2DCB8BB3-F60F-4ED4-A0DC-C181182D3C2F}.Release|Any CPU.Build.0 = Release|Any CPU - {568EF2C1-05F5-4442-AFFA-B7212E94FB28}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {568EF2C1-05F5-4442-AFFA-B7212E94FB28}.Debug|Any CPU.Build.0 = Debug|Any CPU - {568EF2C1-05F5-4442-AFFA-B7212E94FB28}.Release|Any CPU.ActiveCfg = Release|Any CPU - {568EF2C1-05F5-4442-AFFA-B7212E94FB28}.Release|Any CPU.Build.0 = Release|Any CPU - {8B546CEE-6631-4588-BC2D-A6C3DEF292AD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8B546CEE-6631-4588-BC2D-A6C3DEF292AD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8B546CEE-6631-4588-BC2D-A6C3DEF292AD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8B546CEE-6631-4588-BC2D-A6C3DEF292AD}.Release|Any CPU.Build.0 = Release|Any CPU - {66FEF300-747C-4C4E-9EC3-CE624A8BA350}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {66FEF300-747C-4C4E-9EC3-CE624A8BA350}.Debug|Any CPU.Build.0 = Debug|Any CPU - {66FEF300-747C-4C4E-9EC3-CE624A8BA350}.Release|Any CPU.ActiveCfg = Release|Any CPU - {66FEF300-747C-4C4E-9EC3-CE624A8BA350}.Release|Any CPU.Build.0 = Release|Any CPU - {1AEDDF6F-7599-44CC-9C0F-7021964847C5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1AEDDF6F-7599-44CC-9C0F-7021964847C5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1AEDDF6F-7599-44CC-9C0F-7021964847C5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1AEDDF6F-7599-44CC-9C0F-7021964847C5}.Release|Any CPU.Build.0 = Release|Any CPU - {0A9550BF-596A-4605-9FE7-CF7CA4DA832A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0A9550BF-596A-4605-9FE7-CF7CA4DA832A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0A9550BF-596A-4605-9FE7-CF7CA4DA832A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0A9550BF-596A-4605-9FE7-CF7CA4DA832A}.Release|Any CPU.Build.0 = Release|Any CPU - {8803881D-59C3-41A0-8982-E7779B66CF88}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8803881D-59C3-41A0-8982-E7779B66CF88}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8803881D-59C3-41A0-8982-E7779B66CF88}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8803881D-59C3-41A0-8982-E7779B66CF88}.Release|Any CPU.Build.0 = Release|Any CPU - {9010FA95-6A4B-465E-946C-86BD191B26ED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9010FA95-6A4B-465E-946C-86BD191B26ED}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9010FA95-6A4B-465E-946C-86BD191B26ED}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9010FA95-6A4B-465E-946C-86BD191B26ED}.Release|Any CPU.Build.0 = Release|Any CPU - {3EA23494-0321-43BD-BF71-4BCB9CCA4D93}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3EA23494-0321-43BD-BF71-4BCB9CCA4D93}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3EA23494-0321-43BD-BF71-4BCB9CCA4D93}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3EA23494-0321-43BD-BF71-4BCB9CCA4D93}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {213D36AA-6703-4405-9678-449B94F85D18} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {A4F782B3-6AD5-49D7-B81D-98729F73196C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {E59C6271-416B-40FE-94C0-608E780DC53C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {0E748CDA-BEAC-42EB-923E-843DB5D3D664} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {2AA43535-2B3D-469E-ADB0-A355695F035D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {58072BD4-86DC-4C70-85E4-7A60A943EDBF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {2DCB8BB3-F60F-4ED4-A0DC-C181182D3C2F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {568EF2C1-05F5-4442-AFFA-B7212E94FB28} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8B546CEE-6631-4588-BC2D-A6C3DEF292AD} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {66FEF300-747C-4C4E-9EC3-CE624A8BA350} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {1AEDDF6F-7599-44CC-9C0F-7021964847C5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0A9550BF-596A-4605-9FE7-CF7CA4DA832A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8803881D-59C3-41A0-8982-E7779B66CF88} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {9010FA95-6A4B-465E-946C-86BD191B26ED} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {3EA23494-0321-43BD-BF71-4BCB9CCA4D93} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {58072BD4-86DC-4C70-85E4-7A60A943EDBF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {2DCB8BB3-F60F-4ED4-A0DC-C181182D3C2F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {568EF2C1-05F5-4442-AFFA-B7212E94FB28} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8B546CEE-6631-4588-BC2D-A6C3DEF292AD} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {66FEF300-747C-4C4E-9EC3-CE624A8BA350} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {1AEDDF6F-7599-44CC-9C0F-7021964847C5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0A9550BF-596A-4605-9FE7-CF7CA4DA832A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8803881D-59C3-41A0-8982-E7779B66CF88} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {9010FA95-6A4B-465E-946C-86BD191B26ED} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {3EA23494-0321-43BD-BF71-4BCB9CCA4D93} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {1B738F27-21D4-44DB-9231-094152EA8D44} diff --git a/sdk/src/Services/Amplify/Generated/AmazonAmplifyConfig.cs b/sdk/src/Services/Amplify/Generated/AmazonAmplifyConfig.cs index 88b419f7227b..e21f7c731199 100644 --- a/sdk/src/Services/Amplify/Generated/AmazonAmplifyConfig.cs +++ b/sdk/src/Services/Amplify/Generated/AmazonAmplifyConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.Amplify public partial class AmazonAmplifyConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("Amplify", "4.0.0.0"); private static readonly AmazonAmplifyEndpointResolver EndpointResolver = new AmazonAmplifyEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("Amplify", "3.7.401.21"); -======= - InternalSDKUtils.BuildUserAgentString("Amplify", "3.7.402.18"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/Amplify/Generated/Model/Internal/MarshallTransformations/StartDeploymentRequestMarshaller.cs b/sdk/src/Services/Amplify/Generated/Model/Internal/MarshallTransformations/StartDeploymentRequestMarshaller.cs index 0bfdafbbd5fc..266bcbac4b86 100644 --- a/sdk/src/Services/Amplify/Generated/Model/Internal/MarshallTransformations/StartDeploymentRequestMarshaller.cs +++ b/sdk/src/Services/Amplify/Generated/Model/Internal/MarshallTransformations/StartDeploymentRequestMarshaller.cs @@ -87,26 +87,16 @@ public IRequest Marshall(StartDeploymentRequest publicRequest) context.Writer.Write(publicRequest.SourceUrl); } + if(publicRequest.IsSetSourceUrlType()) + { + context.Writer.WritePropertyName("sourceUrlType"); + context.Writer.Write(publicRequest.SourceUrlType); + } + writer.WriteObjectEnd(); } -<<<<<<< HEAD request.Content = memoryStream.ToArray(); -||||||| Commit version number update changes - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); -======= - if(publicRequest.IsSetSourceUrlType()) - { - context.Writer.WritePropertyName("sourceUrlType"); - context.Writer.Write(publicRequest.SourceUrlType); - } - - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b } diff --git a/sdk/src/Services/Amplify/Generated/_bcl/AmazonAmplifyClient.cs b/sdk/src/Services/Amplify/Generated/_bcl/AmazonAmplifyClient.cs index 1340e847b9ee..a73ccbe81378 100644 --- a/sdk/src/Services/Amplify/Generated/_bcl/AmazonAmplifyClient.cs +++ b/sdk/src/Services/Amplify/Generated/_bcl/AmazonAmplifyClient.cs @@ -510,7 +510,7 @@ public virtual CreateBranchResponse CreateBranch(CreateBranchRequest request) /// /// Creates a deployment for a manually deployed Amplify app. Manually deployed apps are - /// not connected to a repository. + /// not connected to a Git repository. /// /// /// @@ -547,7 +547,7 @@ public virtual CreateDeploymentResponse CreateDeployment(CreateDeploymentRequest /// /// Creates a deployment for a manually deployed Amplify app. Manually deployed apps are - /// not connected to a repository. + /// not connected to a Git repository. /// /// /// @@ -2249,7 +2249,7 @@ public virtual ListWebhooksResponse ListWebhooks(ListWebhooksRequest request) /// /// Starts a deployment for a manually deployed app. Manually deployed apps are not connected - /// to a repository. + /// to a Git repository. /// /// /// @@ -2289,7 +2289,7 @@ public virtual StartDeploymentResponse StartDeployment(StartDeploymentRequest re /// /// Starts a deployment for a manually deployed app. Manually deployed apps are not connected - /// to a repository. + /// to a Git repository. /// /// /// diff --git a/sdk/src/Services/Amplify/Properties/AssemblyInfo.cs b/sdk/src/Services/Amplify/Properties/AssemblyInfo.cs index 04acc9e1ce91..e22f0d672e26 100644 --- a/sdk/src/Services/Amplify/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/Amplify/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.21")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.402.18")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/AmplifyBackend/AmplifyBackend.sln b/sdk/src/Services/AmplifyBackend/AmplifyBackend.sln index 7b6d39e195e4..4037b2652891 100644 --- a/sdk/src/Services/AmplifyBackend/AmplifyBackend.sln +++ b/sdk/src/Services/AmplifyBackend/AmplifyBackend.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {55520545-53F5-4FEC-AC9B-8D4BA28813A7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {55520545-53F5-4FEC-AC9B-8D4BA28813A7}.Debug|Any CPU.Build.0 = Debug|Any CPU {55520545-53F5-4FEC-AC9B-8D4BA28813A7}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {059E2821-67F5-49C2-A1C5-FB461962ACD6}.Debug|Any CPU.Build.0 = Debug|Any CPU {059E2821-67F5-49C2-A1C5-FB461962ACD6}.Release|Any CPU.ActiveCfg = Release|Any CPU {059E2821-67F5-49C2-A1C5-FB461962ACD6}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {19DBFB80-5BDC-4141-87AD-79FDC8F66EA4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {19DBFB80-5BDC-4141-87AD-79FDC8F66EA4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {19DBFB80-5BDC-4141-87AD-79FDC8F66EA4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {19DBFB80-5BDC-4141-87AD-79FDC8F66EA4}.Release|Any CPU.Build.0 = Release|Any CPU - {92ACD0A7-3D79-4C79-9BB9-8F5270688666}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {92ACD0A7-3D79-4C79-9BB9-8F5270688666}.Debug|Any CPU.Build.0 = Debug|Any CPU - {92ACD0A7-3D79-4C79-9BB9-8F5270688666}.Release|Any CPU.ActiveCfg = Release|Any CPU - {92ACD0A7-3D79-4C79-9BB9-8F5270688666}.Release|Any CPU.Build.0 = Release|Any CPU - {8EA757D6-145A-4B64-A213-3B5560C33A7B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8EA757D6-145A-4B64-A213-3B5560C33A7B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8EA757D6-145A-4B64-A213-3B5560C33A7B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8EA757D6-145A-4B64-A213-3B5560C33A7B}.Release|Any CPU.Build.0 = Release|Any CPU - {CE965AFD-B7C2-4A75-AC35-25F4B39522AA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CE965AFD-B7C2-4A75-AC35-25F4B39522AA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CE965AFD-B7C2-4A75-AC35-25F4B39522AA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CE965AFD-B7C2-4A75-AC35-25F4B39522AA}.Release|Any CPU.Build.0 = Release|Any CPU - {461C2C63-7207-4048-9907-92888406D9C7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {461C2C63-7207-4048-9907-92888406D9C7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {461C2C63-7207-4048-9907-92888406D9C7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {461C2C63-7207-4048-9907-92888406D9C7}.Release|Any CPU.Build.0 = Release|Any CPU - {A63DA138-1787-4909-A476-4F7792D58B48}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A63DA138-1787-4909-A476-4F7792D58B48}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A63DA138-1787-4909-A476-4F7792D58B48}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A63DA138-1787-4909-A476-4F7792D58B48}.Release|Any CPU.Build.0 = Release|Any CPU - {FA4758A1-BB71-490E-8478-D8EEC2AF2762}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FA4758A1-BB71-490E-8478-D8EEC2AF2762}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FA4758A1-BB71-490E-8478-D8EEC2AF2762}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FA4758A1-BB71-490E-8478-D8EEC2AF2762}.Release|Any CPU.Build.0 = Release|Any CPU - {60DACE4D-8F85-46AB-AD2E-690D12FACEF5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {60DACE4D-8F85-46AB-AD2E-690D12FACEF5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {60DACE4D-8F85-46AB-AD2E-690D12FACEF5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {60DACE4D-8F85-46AB-AD2E-690D12FACEF5}.Release|Any CPU.Build.0 = Release|Any CPU - {DC0E871D-A77C-4B90-B1BF-4998148CE147}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DC0E871D-A77C-4B90-B1BF-4998148CE147}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DC0E871D-A77C-4B90-B1BF-4998148CE147}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DC0E871D-A77C-4B90-B1BF-4998148CE147}.Release|Any CPU.Build.0 = Release|Any CPU - {4DB01995-A5F8-4882-AFA0-2DB6402ECCF6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4DB01995-A5F8-4882-AFA0-2DB6402ECCF6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4DB01995-A5F8-4882-AFA0-2DB6402ECCF6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4DB01995-A5F8-4882-AFA0-2DB6402ECCF6}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {19DBFB80-5BDC-4141-87AD-79FDC8F66EA4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {19DBFB80-5BDC-4141-87AD-79FDC8F66EA4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {19DBFB80-5BDC-4141-87AD-79FDC8F66EA4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {19DBFB80-5BDC-4141-87AD-79FDC8F66EA4}.Release|Any CPU.Build.0 = Release|Any CPU - {92ACD0A7-3D79-4C79-9BB9-8F5270688666}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {92ACD0A7-3D79-4C79-9BB9-8F5270688666}.Debug|Any CPU.Build.0 = Debug|Any CPU - {92ACD0A7-3D79-4C79-9BB9-8F5270688666}.Release|Any CPU.ActiveCfg = Release|Any CPU - {92ACD0A7-3D79-4C79-9BB9-8F5270688666}.Release|Any CPU.Build.0 = Release|Any CPU - {8EA757D6-145A-4B64-A213-3B5560C33A7B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8EA757D6-145A-4B64-A213-3B5560C33A7B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8EA757D6-145A-4B64-A213-3B5560C33A7B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8EA757D6-145A-4B64-A213-3B5560C33A7B}.Release|Any CPU.Build.0 = Release|Any CPU - {CE965AFD-B7C2-4A75-AC35-25F4B39522AA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CE965AFD-B7C2-4A75-AC35-25F4B39522AA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CE965AFD-B7C2-4A75-AC35-25F4B39522AA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CE965AFD-B7C2-4A75-AC35-25F4B39522AA}.Release|Any CPU.Build.0 = Release|Any CPU - {461C2C63-7207-4048-9907-92888406D9C7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {461C2C63-7207-4048-9907-92888406D9C7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {461C2C63-7207-4048-9907-92888406D9C7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {461C2C63-7207-4048-9907-92888406D9C7}.Release|Any CPU.Build.0 = Release|Any CPU - {A63DA138-1787-4909-A476-4F7792D58B48}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A63DA138-1787-4909-A476-4F7792D58B48}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A63DA138-1787-4909-A476-4F7792D58B48}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A63DA138-1787-4909-A476-4F7792D58B48}.Release|Any CPU.Build.0 = Release|Any CPU - {FA4758A1-BB71-490E-8478-D8EEC2AF2762}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FA4758A1-BB71-490E-8478-D8EEC2AF2762}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FA4758A1-BB71-490E-8478-D8EEC2AF2762}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FA4758A1-BB71-490E-8478-D8EEC2AF2762}.Release|Any CPU.Build.0 = Release|Any CPU - {60DACE4D-8F85-46AB-AD2E-690D12FACEF5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {60DACE4D-8F85-46AB-AD2E-690D12FACEF5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {60DACE4D-8F85-46AB-AD2E-690D12FACEF5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {60DACE4D-8F85-46AB-AD2E-690D12FACEF5}.Release|Any CPU.Build.0 = Release|Any CPU - {DC0E871D-A77C-4B90-B1BF-4998148CE147}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DC0E871D-A77C-4B90-B1BF-4998148CE147}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DC0E871D-A77C-4B90-B1BF-4998148CE147}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DC0E871D-A77C-4B90-B1BF-4998148CE147}.Release|Any CPU.Build.0 = Release|Any CPU - {4DB01995-A5F8-4882-AFA0-2DB6402ECCF6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4DB01995-A5F8-4882-AFA0-2DB6402ECCF6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4DB01995-A5F8-4882-AFA0-2DB6402ECCF6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4DB01995-A5F8-4882-AFA0-2DB6402ECCF6}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {55520545-53F5-4FEC-AC9B-8D4BA28813A7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {40C1E8AA-B428-447F-8A30-239B8DC82C0B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {9DF2729C-247B-4C8E-AA67-881B7D71E935} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {3754CE35-1C54-4368-BD19-026FE78820CB} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {059E2821-67F5-49C2-A1C5-FB461962ACD6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {19DBFB80-5BDC-4141-87AD-79FDC8F66EA4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {92ACD0A7-3D79-4C79-9BB9-8F5270688666} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8EA757D6-145A-4B64-A213-3B5560C33A7B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {CE965AFD-B7C2-4A75-AC35-25F4B39522AA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {461C2C63-7207-4048-9907-92888406D9C7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A63DA138-1787-4909-A476-4F7792D58B48} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {FA4758A1-BB71-490E-8478-D8EEC2AF2762} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {60DACE4D-8F85-46AB-AD2E-690D12FACEF5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {DC0E871D-A77C-4B90-B1BF-4998148CE147} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4DB01995-A5F8-4882-AFA0-2DB6402ECCF6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {19DBFB80-5BDC-4141-87AD-79FDC8F66EA4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {92ACD0A7-3D79-4C79-9BB9-8F5270688666} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8EA757D6-145A-4B64-A213-3B5560C33A7B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {CE965AFD-B7C2-4A75-AC35-25F4B39522AA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {461C2C63-7207-4048-9907-92888406D9C7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A63DA138-1787-4909-A476-4F7792D58B48} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {FA4758A1-BB71-490E-8478-D8EEC2AF2762} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {60DACE4D-8F85-46AB-AD2E-690D12FACEF5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {DC0E871D-A77C-4B90-B1BF-4998148CE147} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4DB01995-A5F8-4882-AFA0-2DB6402ECCF6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {114A103E-BFCB-4C9D-A766-A50ADD3007E8} diff --git a/sdk/src/Services/AmplifyBackend/Generated/AmazonAmplifyBackendConfig.cs b/sdk/src/Services/AmplifyBackend/Generated/AmazonAmplifyBackendConfig.cs index cf6f15a2fb32..a693e61a8c39 100644 --- a/sdk/src/Services/AmplifyBackend/Generated/AmazonAmplifyBackendConfig.cs +++ b/sdk/src/Services/AmplifyBackend/Generated/AmazonAmplifyBackendConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.AmplifyBackend public partial class AmazonAmplifyBackendConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("AmplifyBackend", "4.0.0.0"); private static readonly AmazonAmplifyBackendEndpointResolver EndpointResolver = new AmazonAmplifyBackendEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("AmplifyBackend", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("AmplifyBackend", "3.7.400.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/AmplifyBackend/Properties/AssemblyInfo.cs b/sdk/src/Services/AmplifyBackend/Properties/AssemblyInfo.cs index 4d9138099cd5..9e4aaa828295 100644 --- a/sdk/src/Services/AmplifyBackend/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/AmplifyBackend/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/AmplifyUIBuilder/AmplifyUIBuilder.sln b/sdk/src/Services/AmplifyUIBuilder/AmplifyUIBuilder.sln index 54dce71e0432..9ac12ca68099 100644 --- a/sdk/src/Services/AmplifyUIBuilder/AmplifyUIBuilder.sln +++ b/sdk/src/Services/AmplifyUIBuilder/AmplifyUIBuilder.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {CF6230E6-4EAF-41FE-9AFB-8B04C94D9B77}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {CF6230E6-4EAF-41FE-9AFB-8B04C94D9B77}.Debug|Any CPU.Build.0 = Debug|Any CPU {CF6230E6-4EAF-41FE-9AFB-8B04C94D9B77}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {00641974-57ED-44B8-BE8E-EDC442CDDD96}.Debug|Any CPU.Build.0 = Debug|Any CPU {00641974-57ED-44B8-BE8E-EDC442CDDD96}.Release|Any CPU.ActiveCfg = Release|Any CPU {00641974-57ED-44B8-BE8E-EDC442CDDD96}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {537FDA1D-0639-4D05-B5FB-1D8A4E4BB19D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {537FDA1D-0639-4D05-B5FB-1D8A4E4BB19D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {537FDA1D-0639-4D05-B5FB-1D8A4E4BB19D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {537FDA1D-0639-4D05-B5FB-1D8A4E4BB19D}.Release|Any CPU.Build.0 = Release|Any CPU - {5C79CD5C-40B0-4E27-9823-1780AC5F94F2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5C79CD5C-40B0-4E27-9823-1780AC5F94F2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5C79CD5C-40B0-4E27-9823-1780AC5F94F2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5C79CD5C-40B0-4E27-9823-1780AC5F94F2}.Release|Any CPU.Build.0 = Release|Any CPU - {0824C1A7-3C7B-493D-AE58-D24C1263CEB9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0824C1A7-3C7B-493D-AE58-D24C1263CEB9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0824C1A7-3C7B-493D-AE58-D24C1263CEB9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0824C1A7-3C7B-493D-AE58-D24C1263CEB9}.Release|Any CPU.Build.0 = Release|Any CPU - {DB07A7F5-B06B-4A7A-9473-9EF819A0BB57}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DB07A7F5-B06B-4A7A-9473-9EF819A0BB57}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DB07A7F5-B06B-4A7A-9473-9EF819A0BB57}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DB07A7F5-B06B-4A7A-9473-9EF819A0BB57}.Release|Any CPU.Build.0 = Release|Any CPU - {62FD25AB-A38A-4C21-9181-77A5C0E9C447}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {62FD25AB-A38A-4C21-9181-77A5C0E9C447}.Debug|Any CPU.Build.0 = Debug|Any CPU - {62FD25AB-A38A-4C21-9181-77A5C0E9C447}.Release|Any CPU.ActiveCfg = Release|Any CPU - {62FD25AB-A38A-4C21-9181-77A5C0E9C447}.Release|Any CPU.Build.0 = Release|Any CPU - {11F42327-0FAC-4CD3-B775-1C33B4935E8A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {11F42327-0FAC-4CD3-B775-1C33B4935E8A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {11F42327-0FAC-4CD3-B775-1C33B4935E8A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {11F42327-0FAC-4CD3-B775-1C33B4935E8A}.Release|Any CPU.Build.0 = Release|Any CPU - {8E7B48E8-9FD9-4D5C-B393-56CD9519B4BA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8E7B48E8-9FD9-4D5C-B393-56CD9519B4BA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8E7B48E8-9FD9-4D5C-B393-56CD9519B4BA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8E7B48E8-9FD9-4D5C-B393-56CD9519B4BA}.Release|Any CPU.Build.0 = Release|Any CPU - {01DE18EA-033F-4B86-95BC-AF80CE384798}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {01DE18EA-033F-4B86-95BC-AF80CE384798}.Debug|Any CPU.Build.0 = Debug|Any CPU - {01DE18EA-033F-4B86-95BC-AF80CE384798}.Release|Any CPU.ActiveCfg = Release|Any CPU - {01DE18EA-033F-4B86-95BC-AF80CE384798}.Release|Any CPU.Build.0 = Release|Any CPU - {ABE710E4-655B-4772-91CC-F004C7CE6974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {ABE710E4-655B-4772-91CC-F004C7CE6974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {ABE710E4-655B-4772-91CC-F004C7CE6974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {ABE710E4-655B-4772-91CC-F004C7CE6974}.Release|Any CPU.Build.0 = Release|Any CPU - {35AE006D-558E-412A-A060-ADA0F1F714F8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {35AE006D-558E-412A-A060-ADA0F1F714F8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {35AE006D-558E-412A-A060-ADA0F1F714F8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {35AE006D-558E-412A-A060-ADA0F1F714F8}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {537FDA1D-0639-4D05-B5FB-1D8A4E4BB19D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {537FDA1D-0639-4D05-B5FB-1D8A4E4BB19D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {537FDA1D-0639-4D05-B5FB-1D8A4E4BB19D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {537FDA1D-0639-4D05-B5FB-1D8A4E4BB19D}.Release|Any CPU.Build.0 = Release|Any CPU - {5C79CD5C-40B0-4E27-9823-1780AC5F94F2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5C79CD5C-40B0-4E27-9823-1780AC5F94F2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5C79CD5C-40B0-4E27-9823-1780AC5F94F2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5C79CD5C-40B0-4E27-9823-1780AC5F94F2}.Release|Any CPU.Build.0 = Release|Any CPU - {0824C1A7-3C7B-493D-AE58-D24C1263CEB9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0824C1A7-3C7B-493D-AE58-D24C1263CEB9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0824C1A7-3C7B-493D-AE58-D24C1263CEB9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0824C1A7-3C7B-493D-AE58-D24C1263CEB9}.Release|Any CPU.Build.0 = Release|Any CPU - {DB07A7F5-B06B-4A7A-9473-9EF819A0BB57}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DB07A7F5-B06B-4A7A-9473-9EF819A0BB57}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DB07A7F5-B06B-4A7A-9473-9EF819A0BB57}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DB07A7F5-B06B-4A7A-9473-9EF819A0BB57}.Release|Any CPU.Build.0 = Release|Any CPU - {62FD25AB-A38A-4C21-9181-77A5C0E9C447}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {62FD25AB-A38A-4C21-9181-77A5C0E9C447}.Debug|Any CPU.Build.0 = Debug|Any CPU - {62FD25AB-A38A-4C21-9181-77A5C0E9C447}.Release|Any CPU.ActiveCfg = Release|Any CPU - {62FD25AB-A38A-4C21-9181-77A5C0E9C447}.Release|Any CPU.Build.0 = Release|Any CPU - {11F42327-0FAC-4CD3-B775-1C33B4935E8A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {11F42327-0FAC-4CD3-B775-1C33B4935E8A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {11F42327-0FAC-4CD3-B775-1C33B4935E8A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {11F42327-0FAC-4CD3-B775-1C33B4935E8A}.Release|Any CPU.Build.0 = Release|Any CPU - {8E7B48E8-9FD9-4D5C-B393-56CD9519B4BA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8E7B48E8-9FD9-4D5C-B393-56CD9519B4BA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8E7B48E8-9FD9-4D5C-B393-56CD9519B4BA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8E7B48E8-9FD9-4D5C-B393-56CD9519B4BA}.Release|Any CPU.Build.0 = Release|Any CPU - {01DE18EA-033F-4B86-95BC-AF80CE384798}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {01DE18EA-033F-4B86-95BC-AF80CE384798}.Debug|Any CPU.Build.0 = Debug|Any CPU - {01DE18EA-033F-4B86-95BC-AF80CE384798}.Release|Any CPU.ActiveCfg = Release|Any CPU - {01DE18EA-033F-4B86-95BC-AF80CE384798}.Release|Any CPU.Build.0 = Release|Any CPU - {ABE710E4-655B-4772-91CC-F004C7CE6974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {ABE710E4-655B-4772-91CC-F004C7CE6974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {ABE710E4-655B-4772-91CC-F004C7CE6974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {ABE710E4-655B-4772-91CC-F004C7CE6974}.Release|Any CPU.Build.0 = Release|Any CPU - {35AE006D-558E-412A-A060-ADA0F1F714F8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {35AE006D-558E-412A-A060-ADA0F1F714F8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {35AE006D-558E-412A-A060-ADA0F1F714F8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {35AE006D-558E-412A-A060-ADA0F1F714F8}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {CF6230E6-4EAF-41FE-9AFB-8B04C94D9B77} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {D9772275-E614-46D7-B15D-60FB7A2CE13B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {BDBB057D-D562-4229-BF38-D315E30B727C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {74D0DCD1-17F5-4631-8178-A1C891F4E5A6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {00641974-57ED-44B8-BE8E-EDC442CDDD96} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {537FDA1D-0639-4D05-B5FB-1D8A4E4BB19D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {5C79CD5C-40B0-4E27-9823-1780AC5F94F2} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0824C1A7-3C7B-493D-AE58-D24C1263CEB9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {DB07A7F5-B06B-4A7A-9473-9EF819A0BB57} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {62FD25AB-A38A-4C21-9181-77A5C0E9C447} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {11F42327-0FAC-4CD3-B775-1C33B4935E8A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8E7B48E8-9FD9-4D5C-B393-56CD9519B4BA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {01DE18EA-033F-4B86-95BC-AF80CE384798} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {ABE710E4-655B-4772-91CC-F004C7CE6974} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {35AE006D-558E-412A-A060-ADA0F1F714F8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {537FDA1D-0639-4D05-B5FB-1D8A4E4BB19D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {5C79CD5C-40B0-4E27-9823-1780AC5F94F2} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0824C1A7-3C7B-493D-AE58-D24C1263CEB9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {DB07A7F5-B06B-4A7A-9473-9EF819A0BB57} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {62FD25AB-A38A-4C21-9181-77A5C0E9C447} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {11F42327-0FAC-4CD3-B775-1C33B4935E8A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8E7B48E8-9FD9-4D5C-B393-56CD9519B4BA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {01DE18EA-033F-4B86-95BC-AF80CE384798} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {ABE710E4-655B-4772-91CC-F004C7CE6974} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {35AE006D-558E-412A-A060-ADA0F1F714F8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {DD7FC0B0-005D-4528-9A36-5024EB1E3415} diff --git a/sdk/src/Services/AmplifyUIBuilder/Generated/AmazonAmplifyUIBuilderConfig.cs b/sdk/src/Services/AmplifyUIBuilder/Generated/AmazonAmplifyUIBuilderConfig.cs index d5ce18eb2b01..4a1ba3aad472 100644 --- a/sdk/src/Services/AmplifyUIBuilder/Generated/AmazonAmplifyUIBuilderConfig.cs +++ b/sdk/src/Services/AmplifyUIBuilder/Generated/AmazonAmplifyUIBuilderConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.AmplifyUIBuilder public partial class AmazonAmplifyUIBuilderConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("AmplifyUIBuilder", "4.0.0.0"); private static readonly AmazonAmplifyUIBuilderEndpointResolver EndpointResolver = new AmazonAmplifyUIBuilderEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("AmplifyUIBuilder", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("AmplifyUIBuilder", "3.7.400.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/AmplifyUIBuilder/Properties/AssemblyInfo.cs b/sdk/src/Services/AmplifyUIBuilder/Properties/AssemblyInfo.cs index 672f5d7e16a9..db98c8901b7f 100644 --- a/sdk/src/Services/AmplifyUIBuilder/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/AmplifyUIBuilder/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/ApiGatewayManagementApi/ApiGatewayManagementApi.sln b/sdk/src/Services/ApiGatewayManagementApi/ApiGatewayManagementApi.sln index ff4c31240b5a..043b7f0e39e8 100644 --- a/sdk/src/Services/ApiGatewayManagementApi/ApiGatewayManagementApi.sln +++ b/sdk/src/Services/ApiGatewayManagementApi/ApiGatewayManagementApi.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {CA6AD55D-F518-42CB-B1B5-2488C4E5419F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {CA6AD55D-F518-42CB-B1B5-2488C4E5419F}.Debug|Any CPU.Build.0 = Debug|Any CPU {CA6AD55D-F518-42CB-B1B5-2488C4E5419F}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {F1CFEBCD-B9F1-4C54-B68D-FAE11BB9A9BD}.Debug|Any CPU.Build.0 = Debug|Any CPU {F1CFEBCD-B9F1-4C54-B68D-FAE11BB9A9BD}.Release|Any CPU.ActiveCfg = Release|Any CPU {F1CFEBCD-B9F1-4C54-B68D-FAE11BB9A9BD}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {068A8903-9C3F-4BE0-81B9-335B94AA19D6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {068A8903-9C3F-4BE0-81B9-335B94AA19D6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {068A8903-9C3F-4BE0-81B9-335B94AA19D6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {068A8903-9C3F-4BE0-81B9-335B94AA19D6}.Release|Any CPU.Build.0 = Release|Any CPU - {E7779020-5F01-400F-BFCB-EA6550FF832B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E7779020-5F01-400F-BFCB-EA6550FF832B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E7779020-5F01-400F-BFCB-EA6550FF832B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E7779020-5F01-400F-BFCB-EA6550FF832B}.Release|Any CPU.Build.0 = Release|Any CPU - {2B015777-A0A2-4F13-AB75-BF788A5FCB3B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2B015777-A0A2-4F13-AB75-BF788A5FCB3B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2B015777-A0A2-4F13-AB75-BF788A5FCB3B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2B015777-A0A2-4F13-AB75-BF788A5FCB3B}.Release|Any CPU.Build.0 = Release|Any CPU - {94F7EE2D-F4EA-4459-9DDA-5D94A2BBD321}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {94F7EE2D-F4EA-4459-9DDA-5D94A2BBD321}.Debug|Any CPU.Build.0 = Debug|Any CPU - {94F7EE2D-F4EA-4459-9DDA-5D94A2BBD321}.Release|Any CPU.ActiveCfg = Release|Any CPU - {94F7EE2D-F4EA-4459-9DDA-5D94A2BBD321}.Release|Any CPU.Build.0 = Release|Any CPU - {A909662A-2089-4F56-8770-B31DE6332BF6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A909662A-2089-4F56-8770-B31DE6332BF6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A909662A-2089-4F56-8770-B31DE6332BF6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A909662A-2089-4F56-8770-B31DE6332BF6}.Release|Any CPU.Build.0 = Release|Any CPU - {3614BBA1-0371-4BF3-BBFE-A2BDD20010F6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3614BBA1-0371-4BF3-BBFE-A2BDD20010F6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3614BBA1-0371-4BF3-BBFE-A2BDD20010F6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3614BBA1-0371-4BF3-BBFE-A2BDD20010F6}.Release|Any CPU.Build.0 = Release|Any CPU - {1D1464C7-EE6F-4D0D-95E4-156871116F6F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1D1464C7-EE6F-4D0D-95E4-156871116F6F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1D1464C7-EE6F-4D0D-95E4-156871116F6F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1D1464C7-EE6F-4D0D-95E4-156871116F6F}.Release|Any CPU.Build.0 = Release|Any CPU - {2E5C7560-AA6B-4EA9-AC08-C1A832068E8A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2E5C7560-AA6B-4EA9-AC08-C1A832068E8A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2E5C7560-AA6B-4EA9-AC08-C1A832068E8A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2E5C7560-AA6B-4EA9-AC08-C1A832068E8A}.Release|Any CPU.Build.0 = Release|Any CPU - {3C390240-669F-48E6-B20C-A47165E104F9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3C390240-669F-48E6-B20C-A47165E104F9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3C390240-669F-48E6-B20C-A47165E104F9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3C390240-669F-48E6-B20C-A47165E104F9}.Release|Any CPU.Build.0 = Release|Any CPU - {C47F0F17-78FE-4EE2-82A8-C5F1FB8BB251}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C47F0F17-78FE-4EE2-82A8-C5F1FB8BB251}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C47F0F17-78FE-4EE2-82A8-C5F1FB8BB251}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C47F0F17-78FE-4EE2-82A8-C5F1FB8BB251}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {068A8903-9C3F-4BE0-81B9-335B94AA19D6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {068A8903-9C3F-4BE0-81B9-335B94AA19D6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {068A8903-9C3F-4BE0-81B9-335B94AA19D6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {068A8903-9C3F-4BE0-81B9-335B94AA19D6}.Release|Any CPU.Build.0 = Release|Any CPU - {E7779020-5F01-400F-BFCB-EA6550FF832B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E7779020-5F01-400F-BFCB-EA6550FF832B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E7779020-5F01-400F-BFCB-EA6550FF832B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E7779020-5F01-400F-BFCB-EA6550FF832B}.Release|Any CPU.Build.0 = Release|Any CPU - {2B015777-A0A2-4F13-AB75-BF788A5FCB3B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2B015777-A0A2-4F13-AB75-BF788A5FCB3B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2B015777-A0A2-4F13-AB75-BF788A5FCB3B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2B015777-A0A2-4F13-AB75-BF788A5FCB3B}.Release|Any CPU.Build.0 = Release|Any CPU - {94F7EE2D-F4EA-4459-9DDA-5D94A2BBD321}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {94F7EE2D-F4EA-4459-9DDA-5D94A2BBD321}.Debug|Any CPU.Build.0 = Debug|Any CPU - {94F7EE2D-F4EA-4459-9DDA-5D94A2BBD321}.Release|Any CPU.ActiveCfg = Release|Any CPU - {94F7EE2D-F4EA-4459-9DDA-5D94A2BBD321}.Release|Any CPU.Build.0 = Release|Any CPU - {A909662A-2089-4F56-8770-B31DE6332BF6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A909662A-2089-4F56-8770-B31DE6332BF6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A909662A-2089-4F56-8770-B31DE6332BF6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A909662A-2089-4F56-8770-B31DE6332BF6}.Release|Any CPU.Build.0 = Release|Any CPU - {3614BBA1-0371-4BF3-BBFE-A2BDD20010F6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3614BBA1-0371-4BF3-BBFE-A2BDD20010F6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3614BBA1-0371-4BF3-BBFE-A2BDD20010F6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3614BBA1-0371-4BF3-BBFE-A2BDD20010F6}.Release|Any CPU.Build.0 = Release|Any CPU - {1D1464C7-EE6F-4D0D-95E4-156871116F6F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1D1464C7-EE6F-4D0D-95E4-156871116F6F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1D1464C7-EE6F-4D0D-95E4-156871116F6F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1D1464C7-EE6F-4D0D-95E4-156871116F6F}.Release|Any CPU.Build.0 = Release|Any CPU - {2E5C7560-AA6B-4EA9-AC08-C1A832068E8A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2E5C7560-AA6B-4EA9-AC08-C1A832068E8A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2E5C7560-AA6B-4EA9-AC08-C1A832068E8A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2E5C7560-AA6B-4EA9-AC08-C1A832068E8A}.Release|Any CPU.Build.0 = Release|Any CPU - {3C390240-669F-48E6-B20C-A47165E104F9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3C390240-669F-48E6-B20C-A47165E104F9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3C390240-669F-48E6-B20C-A47165E104F9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3C390240-669F-48E6-B20C-A47165E104F9}.Release|Any CPU.Build.0 = Release|Any CPU - {C47F0F17-78FE-4EE2-82A8-C5F1FB8BB251}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C47F0F17-78FE-4EE2-82A8-C5F1FB8BB251}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C47F0F17-78FE-4EE2-82A8-C5F1FB8BB251}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C47F0F17-78FE-4EE2-82A8-C5F1FB8BB251}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {CA6AD55D-F518-42CB-B1B5-2488C4E5419F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {9C89F481-022F-4719-BD2F-82910C06675A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {F6A194D9-F92A-4265-896C-93B535B47C56} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {110C9B65-FD2A-4044-8EE2-F1FF2D70AB41} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {F1CFEBCD-B9F1-4C54-B68D-FAE11BB9A9BD} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {068A8903-9C3F-4BE0-81B9-335B94AA19D6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E7779020-5F01-400F-BFCB-EA6550FF832B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {2B015777-A0A2-4F13-AB75-BF788A5FCB3B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {94F7EE2D-F4EA-4459-9DDA-5D94A2BBD321} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A909662A-2089-4F56-8770-B31DE6332BF6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {3614BBA1-0371-4BF3-BBFE-A2BDD20010F6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {1D1464C7-EE6F-4D0D-95E4-156871116F6F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {2E5C7560-AA6B-4EA9-AC08-C1A832068E8A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {3C390240-669F-48E6-B20C-A47165E104F9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C47F0F17-78FE-4EE2-82A8-C5F1FB8BB251} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {068A8903-9C3F-4BE0-81B9-335B94AA19D6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E7779020-5F01-400F-BFCB-EA6550FF832B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {2B015777-A0A2-4F13-AB75-BF788A5FCB3B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {94F7EE2D-F4EA-4459-9DDA-5D94A2BBD321} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A909662A-2089-4F56-8770-B31DE6332BF6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {3614BBA1-0371-4BF3-BBFE-A2BDD20010F6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {1D1464C7-EE6F-4D0D-95E4-156871116F6F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {2E5C7560-AA6B-4EA9-AC08-C1A832068E8A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {3C390240-669F-48E6-B20C-A47165E104F9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C47F0F17-78FE-4EE2-82A8-C5F1FB8BB251} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {DBED25A4-B301-4437-96EE-1D853D8B06E4} diff --git a/sdk/src/Services/ApiGatewayManagementApi/Generated/AmazonApiGatewayManagementApiConfig.cs b/sdk/src/Services/ApiGatewayManagementApi/Generated/AmazonApiGatewayManagementApiConfig.cs index 0f5ceb58de5d..1383fa93294d 100644 --- a/sdk/src/Services/ApiGatewayManagementApi/Generated/AmazonApiGatewayManagementApiConfig.cs +++ b/sdk/src/Services/ApiGatewayManagementApi/Generated/AmazonApiGatewayManagementApiConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.ApiGatewayManagementApi public partial class AmazonApiGatewayManagementApiConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("ApiGatewayManagementApi", "4.0.0.0"); private static readonly AmazonApiGatewayManagementApiEndpointResolver EndpointResolver = new AmazonApiGatewayManagementApiEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("ApiGatewayManagementApi", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("ApiGatewayManagementApi", "3.7.400.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/ApiGatewayManagementApi/Properties/AssemblyInfo.cs b/sdk/src/Services/ApiGatewayManagementApi/Properties/AssemblyInfo.cs index d53212b6143b..c60d909682aa 100644 --- a/sdk/src/Services/ApiGatewayManagementApi/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/ApiGatewayManagementApi/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/ApiGatewayV2/ApiGatewayV2.sln b/sdk/src/Services/ApiGatewayV2/ApiGatewayV2.sln index 0508e55dfc83..5eceab6ffe54 100644 --- a/sdk/src/Services/ApiGatewayV2/ApiGatewayV2.sln +++ b/sdk/src/Services/ApiGatewayV2/ApiGatewayV2.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {AFA935C4-2241-4779-AA05-01B4B323C345}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {AFA935C4-2241-4779-AA05-01B4B323C345}.Debug|Any CPU.Build.0 = Debug|Any CPU {AFA935C4-2241-4779-AA05-01B4B323C345}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {19C7CC55-E291-41E3-9BCD-F66C420F567F}.Debug|Any CPU.Build.0 = Debug|Any CPU {19C7CC55-E291-41E3-9BCD-F66C420F567F}.Release|Any CPU.ActiveCfg = Release|Any CPU {19C7CC55-E291-41E3-9BCD-F66C420F567F}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {CE9AF07A-4E03-4CB4-9BC8-B94B61B55FD6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CE9AF07A-4E03-4CB4-9BC8-B94B61B55FD6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CE9AF07A-4E03-4CB4-9BC8-B94B61B55FD6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CE9AF07A-4E03-4CB4-9BC8-B94B61B55FD6}.Release|Any CPU.Build.0 = Release|Any CPU - {00D195D5-8464-4318-B6A3-12DE44D12068}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {00D195D5-8464-4318-B6A3-12DE44D12068}.Debug|Any CPU.Build.0 = Debug|Any CPU - {00D195D5-8464-4318-B6A3-12DE44D12068}.Release|Any CPU.ActiveCfg = Release|Any CPU - {00D195D5-8464-4318-B6A3-12DE44D12068}.Release|Any CPU.Build.0 = Release|Any CPU - {6AB426A5-B886-465E-8AC2-1F92E88CB0D9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6AB426A5-B886-465E-8AC2-1F92E88CB0D9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6AB426A5-B886-465E-8AC2-1F92E88CB0D9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6AB426A5-B886-465E-8AC2-1F92E88CB0D9}.Release|Any CPU.Build.0 = Release|Any CPU - {3BC676F4-01A3-4033-BAA2-7AF666127403}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3BC676F4-01A3-4033-BAA2-7AF666127403}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3BC676F4-01A3-4033-BAA2-7AF666127403}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3BC676F4-01A3-4033-BAA2-7AF666127403}.Release|Any CPU.Build.0 = Release|Any CPU - {2E4B59B1-B695-4F62-B952-5FE5D243C5B0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2E4B59B1-B695-4F62-B952-5FE5D243C5B0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2E4B59B1-B695-4F62-B952-5FE5D243C5B0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2E4B59B1-B695-4F62-B952-5FE5D243C5B0}.Release|Any CPU.Build.0 = Release|Any CPU - {D7C611DB-9565-43A3-90E7-713E2688CD91}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D7C611DB-9565-43A3-90E7-713E2688CD91}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D7C611DB-9565-43A3-90E7-713E2688CD91}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D7C611DB-9565-43A3-90E7-713E2688CD91}.Release|Any CPU.Build.0 = Release|Any CPU - {BBBD70A9-D1AD-4C95-9E01-263F3F343991}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BBBD70A9-D1AD-4C95-9E01-263F3F343991}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BBBD70A9-D1AD-4C95-9E01-263F3F343991}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BBBD70A9-D1AD-4C95-9E01-263F3F343991}.Release|Any CPU.Build.0 = Release|Any CPU - {FBA17098-A07C-4E6E-9584-93AD98A8BB4A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FBA17098-A07C-4E6E-9584-93AD98A8BB4A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FBA17098-A07C-4E6E-9584-93AD98A8BB4A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FBA17098-A07C-4E6E-9584-93AD98A8BB4A}.Release|Any CPU.Build.0 = Release|Any CPU - {F27976A9-F747-4437-8875-0377040B6936}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F27976A9-F747-4437-8875-0377040B6936}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F27976A9-F747-4437-8875-0377040B6936}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F27976A9-F747-4437-8875-0377040B6936}.Release|Any CPU.Build.0 = Release|Any CPU - {FA7E1C97-D4E1-4AB2-8D28-58F00B4BD79D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FA7E1C97-D4E1-4AB2-8D28-58F00B4BD79D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FA7E1C97-D4E1-4AB2-8D28-58F00B4BD79D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FA7E1C97-D4E1-4AB2-8D28-58F00B4BD79D}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {CE9AF07A-4E03-4CB4-9BC8-B94B61B55FD6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CE9AF07A-4E03-4CB4-9BC8-B94B61B55FD6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CE9AF07A-4E03-4CB4-9BC8-B94B61B55FD6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CE9AF07A-4E03-4CB4-9BC8-B94B61B55FD6}.Release|Any CPU.Build.0 = Release|Any CPU - {00D195D5-8464-4318-B6A3-12DE44D12068}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {00D195D5-8464-4318-B6A3-12DE44D12068}.Debug|Any CPU.Build.0 = Debug|Any CPU - {00D195D5-8464-4318-B6A3-12DE44D12068}.Release|Any CPU.ActiveCfg = Release|Any CPU - {00D195D5-8464-4318-B6A3-12DE44D12068}.Release|Any CPU.Build.0 = Release|Any CPU - {6AB426A5-B886-465E-8AC2-1F92E88CB0D9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6AB426A5-B886-465E-8AC2-1F92E88CB0D9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6AB426A5-B886-465E-8AC2-1F92E88CB0D9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6AB426A5-B886-465E-8AC2-1F92E88CB0D9}.Release|Any CPU.Build.0 = Release|Any CPU - {3BC676F4-01A3-4033-BAA2-7AF666127403}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3BC676F4-01A3-4033-BAA2-7AF666127403}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3BC676F4-01A3-4033-BAA2-7AF666127403}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3BC676F4-01A3-4033-BAA2-7AF666127403}.Release|Any CPU.Build.0 = Release|Any CPU - {2E4B59B1-B695-4F62-B952-5FE5D243C5B0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2E4B59B1-B695-4F62-B952-5FE5D243C5B0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2E4B59B1-B695-4F62-B952-5FE5D243C5B0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2E4B59B1-B695-4F62-B952-5FE5D243C5B0}.Release|Any CPU.Build.0 = Release|Any CPU - {D7C611DB-9565-43A3-90E7-713E2688CD91}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D7C611DB-9565-43A3-90E7-713E2688CD91}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D7C611DB-9565-43A3-90E7-713E2688CD91}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D7C611DB-9565-43A3-90E7-713E2688CD91}.Release|Any CPU.Build.0 = Release|Any CPU - {BBBD70A9-D1AD-4C95-9E01-263F3F343991}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BBBD70A9-D1AD-4C95-9E01-263F3F343991}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BBBD70A9-D1AD-4C95-9E01-263F3F343991}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BBBD70A9-D1AD-4C95-9E01-263F3F343991}.Release|Any CPU.Build.0 = Release|Any CPU - {FBA17098-A07C-4E6E-9584-93AD98A8BB4A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FBA17098-A07C-4E6E-9584-93AD98A8BB4A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FBA17098-A07C-4E6E-9584-93AD98A8BB4A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FBA17098-A07C-4E6E-9584-93AD98A8BB4A}.Release|Any CPU.Build.0 = Release|Any CPU - {F27976A9-F747-4437-8875-0377040B6936}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F27976A9-F747-4437-8875-0377040B6936}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F27976A9-F747-4437-8875-0377040B6936}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F27976A9-F747-4437-8875-0377040B6936}.Release|Any CPU.Build.0 = Release|Any CPU - {FA7E1C97-D4E1-4AB2-8D28-58F00B4BD79D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FA7E1C97-D4E1-4AB2-8D28-58F00B4BD79D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FA7E1C97-D4E1-4AB2-8D28-58F00B4BD79D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FA7E1C97-D4E1-4AB2-8D28-58F00B4BD79D}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {AFA935C4-2241-4779-AA05-01B4B323C345} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {AE83DF8E-3C49-466C-887E-BB4F99E0603B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {D2BE6D2B-2E10-4E78-B26B-0F707C972BBC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {519A567E-3236-4847-8A4E-9F02A3B92CD8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {19C7CC55-E291-41E3-9BCD-F66C420F567F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {CE9AF07A-4E03-4CB4-9BC8-B94B61B55FD6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {00D195D5-8464-4318-B6A3-12DE44D12068} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6AB426A5-B886-465E-8AC2-1F92E88CB0D9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {3BC676F4-01A3-4033-BAA2-7AF666127403} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {2E4B59B1-B695-4F62-B952-5FE5D243C5B0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D7C611DB-9565-43A3-90E7-713E2688CD91} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {BBBD70A9-D1AD-4C95-9E01-263F3F343991} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {FBA17098-A07C-4E6E-9584-93AD98A8BB4A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F27976A9-F747-4437-8875-0377040B6936} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {FA7E1C97-D4E1-4AB2-8D28-58F00B4BD79D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {CE9AF07A-4E03-4CB4-9BC8-B94B61B55FD6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {00D195D5-8464-4318-B6A3-12DE44D12068} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6AB426A5-B886-465E-8AC2-1F92E88CB0D9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {3BC676F4-01A3-4033-BAA2-7AF666127403} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {2E4B59B1-B695-4F62-B952-5FE5D243C5B0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D7C611DB-9565-43A3-90E7-713E2688CD91} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {BBBD70A9-D1AD-4C95-9E01-263F3F343991} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {FBA17098-A07C-4E6E-9584-93AD98A8BB4A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F27976A9-F747-4437-8875-0377040B6936} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {FA7E1C97-D4E1-4AB2-8D28-58F00B4BD79D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {43474CEF-5790-48CD-A8CE-23CC2DFF93AC} diff --git a/sdk/src/Services/ApiGatewayV2/Generated/AmazonApiGatewayV2Config.cs b/sdk/src/Services/ApiGatewayV2/Generated/AmazonApiGatewayV2Config.cs index e829c5d365c1..9b5f11085119 100644 --- a/sdk/src/Services/ApiGatewayV2/Generated/AmazonApiGatewayV2Config.cs +++ b/sdk/src/Services/ApiGatewayV2/Generated/AmazonApiGatewayV2Config.cs @@ -34,16 +34,10 @@ namespace Amazon.ApiGatewayV2 public partial class AmazonApiGatewayV2Config : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("ApiGatewayV2", "4.0.0.0"); private static readonly AmazonApiGatewayV2EndpointResolver EndpointResolver = new AmazonApiGatewayV2EndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("ApiGatewayV2", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("ApiGatewayV2", "3.7.400.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/ApiGatewayV2/Properties/AssemblyInfo.cs b/sdk/src/Services/ApiGatewayV2/Properties/AssemblyInfo.cs index d631ef0bb5ce..a41ed50b8442 100644 --- a/sdk/src/Services/ApiGatewayV2/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/ApiGatewayV2/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/AppConfig/AppConfig.sln b/sdk/src/Services/AppConfig/AppConfig.sln index f1758cba1371..b98bac246353 100644 --- a/sdk/src/Services/AppConfig/AppConfig.sln +++ b/sdk/src/Services/AppConfig/AppConfig.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {2E5867EB-66EF-49D6-A5AF-8AE2DC8BBF27}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {2E5867EB-66EF-49D6-A5AF-8AE2DC8BBF27}.Debug|Any CPU.Build.0 = Debug|Any CPU {2E5867EB-66EF-49D6-A5AF-8AE2DC8BBF27}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {0CEB6533-DB9E-4698-B0E2-A05F87061BE1}.Debug|Any CPU.Build.0 = Debug|Any CPU {0CEB6533-DB9E-4698-B0E2-A05F87061BE1}.Release|Any CPU.ActiveCfg = Release|Any CPU {0CEB6533-DB9E-4698-B0E2-A05F87061BE1}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {FB46F3E7-1D35-477C-8F74-4A01DC942A6B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FB46F3E7-1D35-477C-8F74-4A01DC942A6B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FB46F3E7-1D35-477C-8F74-4A01DC942A6B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FB46F3E7-1D35-477C-8F74-4A01DC942A6B}.Release|Any CPU.Build.0 = Release|Any CPU - {F07653D6-435B-4345-9634-7D5950545683}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F07653D6-435B-4345-9634-7D5950545683}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F07653D6-435B-4345-9634-7D5950545683}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F07653D6-435B-4345-9634-7D5950545683}.Release|Any CPU.Build.0 = Release|Any CPU - {3B05E9F0-CCAB-4D51-B051-5481C121611C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3B05E9F0-CCAB-4D51-B051-5481C121611C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3B05E9F0-CCAB-4D51-B051-5481C121611C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3B05E9F0-CCAB-4D51-B051-5481C121611C}.Release|Any CPU.Build.0 = Release|Any CPU - {85613B09-01BC-4696-AB2E-536DCBBF87AC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {85613B09-01BC-4696-AB2E-536DCBBF87AC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {85613B09-01BC-4696-AB2E-536DCBBF87AC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {85613B09-01BC-4696-AB2E-536DCBBF87AC}.Release|Any CPU.Build.0 = Release|Any CPU - {D4209E9C-AFA2-4AEC-8084-ECF82CB729F5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D4209E9C-AFA2-4AEC-8084-ECF82CB729F5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D4209E9C-AFA2-4AEC-8084-ECF82CB729F5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D4209E9C-AFA2-4AEC-8084-ECF82CB729F5}.Release|Any CPU.Build.0 = Release|Any CPU - {218DCA45-12F5-4273-978D-CAEBD40BA9B1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {218DCA45-12F5-4273-978D-CAEBD40BA9B1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {218DCA45-12F5-4273-978D-CAEBD40BA9B1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {218DCA45-12F5-4273-978D-CAEBD40BA9B1}.Release|Any CPU.Build.0 = Release|Any CPU - {E2DE48B1-E1A7-45C7-9632-C70F7116A77C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E2DE48B1-E1A7-45C7-9632-C70F7116A77C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E2DE48B1-E1A7-45C7-9632-C70F7116A77C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E2DE48B1-E1A7-45C7-9632-C70F7116A77C}.Release|Any CPU.Build.0 = Release|Any CPU - {AC77DB3C-A775-4239-9D2E-63EB756BA8B8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AC77DB3C-A775-4239-9D2E-63EB756BA8B8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AC77DB3C-A775-4239-9D2E-63EB756BA8B8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AC77DB3C-A775-4239-9D2E-63EB756BA8B8}.Release|Any CPU.Build.0 = Release|Any CPU - {B1196DA8-C337-4507-9ECC-CD90E2B8C385}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B1196DA8-C337-4507-9ECC-CD90E2B8C385}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B1196DA8-C337-4507-9ECC-CD90E2B8C385}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B1196DA8-C337-4507-9ECC-CD90E2B8C385}.Release|Any CPU.Build.0 = Release|Any CPU - {DBDAC4EB-0E36-4905-9C41-08DDDE999C7D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DBDAC4EB-0E36-4905-9C41-08DDDE999C7D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DBDAC4EB-0E36-4905-9C41-08DDDE999C7D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DBDAC4EB-0E36-4905-9C41-08DDDE999C7D}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {FB46F3E7-1D35-477C-8F74-4A01DC942A6B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FB46F3E7-1D35-477C-8F74-4A01DC942A6B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FB46F3E7-1D35-477C-8F74-4A01DC942A6B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FB46F3E7-1D35-477C-8F74-4A01DC942A6B}.Release|Any CPU.Build.0 = Release|Any CPU - {F07653D6-435B-4345-9634-7D5950545683}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F07653D6-435B-4345-9634-7D5950545683}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F07653D6-435B-4345-9634-7D5950545683}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F07653D6-435B-4345-9634-7D5950545683}.Release|Any CPU.Build.0 = Release|Any CPU - {3B05E9F0-CCAB-4D51-B051-5481C121611C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3B05E9F0-CCAB-4D51-B051-5481C121611C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3B05E9F0-CCAB-4D51-B051-5481C121611C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3B05E9F0-CCAB-4D51-B051-5481C121611C}.Release|Any CPU.Build.0 = Release|Any CPU - {85613B09-01BC-4696-AB2E-536DCBBF87AC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {85613B09-01BC-4696-AB2E-536DCBBF87AC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {85613B09-01BC-4696-AB2E-536DCBBF87AC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {85613B09-01BC-4696-AB2E-536DCBBF87AC}.Release|Any CPU.Build.0 = Release|Any CPU - {D4209E9C-AFA2-4AEC-8084-ECF82CB729F5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D4209E9C-AFA2-4AEC-8084-ECF82CB729F5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D4209E9C-AFA2-4AEC-8084-ECF82CB729F5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D4209E9C-AFA2-4AEC-8084-ECF82CB729F5}.Release|Any CPU.Build.0 = Release|Any CPU - {218DCA45-12F5-4273-978D-CAEBD40BA9B1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {218DCA45-12F5-4273-978D-CAEBD40BA9B1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {218DCA45-12F5-4273-978D-CAEBD40BA9B1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {218DCA45-12F5-4273-978D-CAEBD40BA9B1}.Release|Any CPU.Build.0 = Release|Any CPU - {E2DE48B1-E1A7-45C7-9632-C70F7116A77C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E2DE48B1-E1A7-45C7-9632-C70F7116A77C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E2DE48B1-E1A7-45C7-9632-C70F7116A77C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E2DE48B1-E1A7-45C7-9632-C70F7116A77C}.Release|Any CPU.Build.0 = Release|Any CPU - {AC77DB3C-A775-4239-9D2E-63EB756BA8B8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AC77DB3C-A775-4239-9D2E-63EB756BA8B8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AC77DB3C-A775-4239-9D2E-63EB756BA8B8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AC77DB3C-A775-4239-9D2E-63EB756BA8B8}.Release|Any CPU.Build.0 = Release|Any CPU - {B1196DA8-C337-4507-9ECC-CD90E2B8C385}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B1196DA8-C337-4507-9ECC-CD90E2B8C385}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B1196DA8-C337-4507-9ECC-CD90E2B8C385}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B1196DA8-C337-4507-9ECC-CD90E2B8C385}.Release|Any CPU.Build.0 = Release|Any CPU - {DBDAC4EB-0E36-4905-9C41-08DDDE999C7D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DBDAC4EB-0E36-4905-9C41-08DDDE999C7D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DBDAC4EB-0E36-4905-9C41-08DDDE999C7D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DBDAC4EB-0E36-4905-9C41-08DDDE999C7D}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {2E5867EB-66EF-49D6-A5AF-8AE2DC8BBF27} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {FEBA02A9-03ED-41AC-B00D-67384D4C7E7C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {042AE1F0-1179-4858-B2AE-393D6A475F32} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {17E2EC6A-A039-4A9D-A532-BC7DE75970D0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {0CEB6533-DB9E-4698-B0E2-A05F87061BE1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {FB46F3E7-1D35-477C-8F74-4A01DC942A6B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F07653D6-435B-4345-9634-7D5950545683} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {3B05E9F0-CCAB-4D51-B051-5481C121611C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {85613B09-01BC-4696-AB2E-536DCBBF87AC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D4209E9C-AFA2-4AEC-8084-ECF82CB729F5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {218DCA45-12F5-4273-978D-CAEBD40BA9B1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E2DE48B1-E1A7-45C7-9632-C70F7116A77C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {AC77DB3C-A775-4239-9D2E-63EB756BA8B8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B1196DA8-C337-4507-9ECC-CD90E2B8C385} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {DBDAC4EB-0E36-4905-9C41-08DDDE999C7D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {FB46F3E7-1D35-477C-8F74-4A01DC942A6B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F07653D6-435B-4345-9634-7D5950545683} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {3B05E9F0-CCAB-4D51-B051-5481C121611C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {85613B09-01BC-4696-AB2E-536DCBBF87AC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D4209E9C-AFA2-4AEC-8084-ECF82CB729F5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {218DCA45-12F5-4273-978D-CAEBD40BA9B1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E2DE48B1-E1A7-45C7-9632-C70F7116A77C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {AC77DB3C-A775-4239-9D2E-63EB756BA8B8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B1196DA8-C337-4507-9ECC-CD90E2B8C385} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {DBDAC4EB-0E36-4905-9C41-08DDDE999C7D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {CB8F13A4-3626-4C32-97B4-254C3BDD6AF3} diff --git a/sdk/src/Services/AppConfig/Generated/AmazonAppConfigConfig.cs b/sdk/src/Services/AppConfig/Generated/AmazonAppConfigConfig.cs index 838b78fb3991..23cdf4c2e475 100644 --- a/sdk/src/Services/AppConfig/Generated/AmazonAppConfigConfig.cs +++ b/sdk/src/Services/AppConfig/Generated/AmazonAppConfigConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.AppConfig public partial class AmazonAppConfigConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("AppConfig", "4.0.0.0"); private static readonly AmazonAppConfigEndpointResolver EndpointResolver = new AmazonAppConfigEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("AppConfig", "3.7.401.14"); -======= - InternalSDKUtils.BuildUserAgentString("AppConfig", "3.7.402.14"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/AppConfig/Generated/Model/StopDeploymentRequest.cs b/sdk/src/Services/AppConfig/Generated/Model/StopDeploymentRequest.cs index 6ec8cb4281b1..f43c0a980fcb 100644 --- a/sdk/src/Services/AppConfig/Generated/Model/StopDeploymentRequest.cs +++ b/sdk/src/Services/AppConfig/Generated/Model/StopDeploymentRequest.cs @@ -51,9 +51,9 @@ public partial class StopDeploymentRequest : AmazonAppConfigRequest /// previous configuration version. This action moves the deployment to a status of REVERTED. /// /// - public bool AllowRevert + public bool? AllowRevert { - get { return this._allowRevert.GetValueOrDefault(); } + get { return this._allowRevert; } set { this._allowRevert = value; } } diff --git a/sdk/src/Services/AppConfig/Generated/_bcl/AmazonAppConfigClient.cs b/sdk/src/Services/AppConfig/Generated/_bcl/AmazonAppConfigClient.cs index 7e9c274ff461..39f007fcb0c9 100644 --- a/sdk/src/Services/AppConfig/Generated/_bcl/AmazonAppConfigClient.cs +++ b/sdk/src/Services/AppConfig/Generated/_bcl/AmazonAppConfigClient.cs @@ -3146,7 +3146,10 @@ public virtual StartDeploymentResponse StartDeployment(StartDeploymentRequest re /// /// Stops a deployment. This API action works only on deployments that have a status of - /// DEPLOYING. This action moves the deployment to a status of ROLLED_BACK. + /// DEPLOYING, unless an AllowRevert parameter is supplied. If the AllowRevert + /// parameter is supplied, the status of an in-progress deployment will be ROLLED_BACK. + /// The status of a completed deployment will be REVERTED. AppConfig only allows + /// a revert within 72 hours of deployment completion. /// /// Container for the necessary parameters to execute the StopDeployment service method. /// @@ -3173,7 +3176,10 @@ public virtual StopDeploymentResponse StopDeployment(StopDeploymentRequest reque /// /// Stops a deployment. This API action works only on deployments that have a status of - /// DEPLOYING. This action moves the deployment to a status of ROLLED_BACK. + /// DEPLOYING, unless an AllowRevert parameter is supplied. If the AllowRevert + /// parameter is supplied, the status of an in-progress deployment will be ROLLED_BACK. + /// The status of a completed deployment will be REVERTED. AppConfig only allows + /// a revert within 72 hours of deployment completion. /// /// Container for the necessary parameters to execute the StopDeployment service method. /// diff --git a/sdk/src/Services/AppConfig/Properties/AssemblyInfo.cs b/sdk/src/Services/AppConfig/Properties/AssemblyInfo.cs index 3d5d036fbb50..31502bf8574e 100644 --- a/sdk/src/Services/AppConfig/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/AppConfig/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.14")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.402.14")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/AppConfigData/AppConfigData.sln b/sdk/src/Services/AppConfigData/AppConfigData.sln index ea4a70f97ba2..904064e1a187 100644 --- a/sdk/src/Services/AppConfigData/AppConfigData.sln +++ b/sdk/src/Services/AppConfigData/AppConfigData.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {224DC047-B19A-4499-9C57-2BB00205EEF0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {224DC047-B19A-4499-9C57-2BB00205EEF0}.Debug|Any CPU.Build.0 = Debug|Any CPU {224DC047-B19A-4499-9C57-2BB00205EEF0}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {466BAFA4-7393-410A-97DA-65113A2E27FF}.Debug|Any CPU.Build.0 = Debug|Any CPU {466BAFA4-7393-410A-97DA-65113A2E27FF}.Release|Any CPU.ActiveCfg = Release|Any CPU {466BAFA4-7393-410A-97DA-65113A2E27FF}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {7FFEB449-414B-4772-B471-2FFE7416F0CA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7FFEB449-414B-4772-B471-2FFE7416F0CA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7FFEB449-414B-4772-B471-2FFE7416F0CA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7FFEB449-414B-4772-B471-2FFE7416F0CA}.Release|Any CPU.Build.0 = Release|Any CPU - {0A376EF1-9F72-42DC-8C44-D846CE8DE90D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0A376EF1-9F72-42DC-8C44-D846CE8DE90D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0A376EF1-9F72-42DC-8C44-D846CE8DE90D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0A376EF1-9F72-42DC-8C44-D846CE8DE90D}.Release|Any CPU.Build.0 = Release|Any CPU - {08FD1160-C714-404F-BFD3-FC6D1DF26558}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {08FD1160-C714-404F-BFD3-FC6D1DF26558}.Debug|Any CPU.Build.0 = Debug|Any CPU - {08FD1160-C714-404F-BFD3-FC6D1DF26558}.Release|Any CPU.ActiveCfg = Release|Any CPU - {08FD1160-C714-404F-BFD3-FC6D1DF26558}.Release|Any CPU.Build.0 = Release|Any CPU - {36EC22E2-1D1B-4F3A-9982-CCD1CF19AB6E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {36EC22E2-1D1B-4F3A-9982-CCD1CF19AB6E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {36EC22E2-1D1B-4F3A-9982-CCD1CF19AB6E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {36EC22E2-1D1B-4F3A-9982-CCD1CF19AB6E}.Release|Any CPU.Build.0 = Release|Any CPU - {525A376F-5729-41EE-B602-40534E932258}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {525A376F-5729-41EE-B602-40534E932258}.Debug|Any CPU.Build.0 = Debug|Any CPU - {525A376F-5729-41EE-B602-40534E932258}.Release|Any CPU.ActiveCfg = Release|Any CPU - {525A376F-5729-41EE-B602-40534E932258}.Release|Any CPU.Build.0 = Release|Any CPU - {717C54D8-F321-432B-96C2-558816E131F7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {717C54D8-F321-432B-96C2-558816E131F7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {717C54D8-F321-432B-96C2-558816E131F7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {717C54D8-F321-432B-96C2-558816E131F7}.Release|Any CPU.Build.0 = Release|Any CPU - {DBE63320-80D8-47AC-856F-26E1E97256C0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DBE63320-80D8-47AC-856F-26E1E97256C0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DBE63320-80D8-47AC-856F-26E1E97256C0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DBE63320-80D8-47AC-856F-26E1E97256C0}.Release|Any CPU.Build.0 = Release|Any CPU - {B5AEC786-2597-47E2-A271-2C38DF79C7CB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B5AEC786-2597-47E2-A271-2C38DF79C7CB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B5AEC786-2597-47E2-A271-2C38DF79C7CB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B5AEC786-2597-47E2-A271-2C38DF79C7CB}.Release|Any CPU.Build.0 = Release|Any CPU - {C2C65714-0AFD-4424-932D-6B70AE5EC213}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C2C65714-0AFD-4424-932D-6B70AE5EC213}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C2C65714-0AFD-4424-932D-6B70AE5EC213}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C2C65714-0AFD-4424-932D-6B70AE5EC213}.Release|Any CPU.Build.0 = Release|Any CPU - {BEEEDD5F-1A74-4D35-B332-31423D8926FE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BEEEDD5F-1A74-4D35-B332-31423D8926FE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BEEEDD5F-1A74-4D35-B332-31423D8926FE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BEEEDD5F-1A74-4D35-B332-31423D8926FE}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {7FFEB449-414B-4772-B471-2FFE7416F0CA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7FFEB449-414B-4772-B471-2FFE7416F0CA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7FFEB449-414B-4772-B471-2FFE7416F0CA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7FFEB449-414B-4772-B471-2FFE7416F0CA}.Release|Any CPU.Build.0 = Release|Any CPU - {0A376EF1-9F72-42DC-8C44-D846CE8DE90D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0A376EF1-9F72-42DC-8C44-D846CE8DE90D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0A376EF1-9F72-42DC-8C44-D846CE8DE90D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0A376EF1-9F72-42DC-8C44-D846CE8DE90D}.Release|Any CPU.Build.0 = Release|Any CPU - {08FD1160-C714-404F-BFD3-FC6D1DF26558}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {08FD1160-C714-404F-BFD3-FC6D1DF26558}.Debug|Any CPU.Build.0 = Debug|Any CPU - {08FD1160-C714-404F-BFD3-FC6D1DF26558}.Release|Any CPU.ActiveCfg = Release|Any CPU - {08FD1160-C714-404F-BFD3-FC6D1DF26558}.Release|Any CPU.Build.0 = Release|Any CPU - {36EC22E2-1D1B-4F3A-9982-CCD1CF19AB6E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {36EC22E2-1D1B-4F3A-9982-CCD1CF19AB6E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {36EC22E2-1D1B-4F3A-9982-CCD1CF19AB6E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {36EC22E2-1D1B-4F3A-9982-CCD1CF19AB6E}.Release|Any CPU.Build.0 = Release|Any CPU - {525A376F-5729-41EE-B602-40534E932258}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {525A376F-5729-41EE-B602-40534E932258}.Debug|Any CPU.Build.0 = Debug|Any CPU - {525A376F-5729-41EE-B602-40534E932258}.Release|Any CPU.ActiveCfg = Release|Any CPU - {525A376F-5729-41EE-B602-40534E932258}.Release|Any CPU.Build.0 = Release|Any CPU - {717C54D8-F321-432B-96C2-558816E131F7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {717C54D8-F321-432B-96C2-558816E131F7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {717C54D8-F321-432B-96C2-558816E131F7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {717C54D8-F321-432B-96C2-558816E131F7}.Release|Any CPU.Build.0 = Release|Any CPU - {DBE63320-80D8-47AC-856F-26E1E97256C0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DBE63320-80D8-47AC-856F-26E1E97256C0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DBE63320-80D8-47AC-856F-26E1E97256C0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DBE63320-80D8-47AC-856F-26E1E97256C0}.Release|Any CPU.Build.0 = Release|Any CPU - {B5AEC786-2597-47E2-A271-2C38DF79C7CB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B5AEC786-2597-47E2-A271-2C38DF79C7CB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B5AEC786-2597-47E2-A271-2C38DF79C7CB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B5AEC786-2597-47E2-A271-2C38DF79C7CB}.Release|Any CPU.Build.0 = Release|Any CPU - {C2C65714-0AFD-4424-932D-6B70AE5EC213}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C2C65714-0AFD-4424-932D-6B70AE5EC213}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C2C65714-0AFD-4424-932D-6B70AE5EC213}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C2C65714-0AFD-4424-932D-6B70AE5EC213}.Release|Any CPU.Build.0 = Release|Any CPU - {BEEEDD5F-1A74-4D35-B332-31423D8926FE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BEEEDD5F-1A74-4D35-B332-31423D8926FE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BEEEDD5F-1A74-4D35-B332-31423D8926FE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BEEEDD5F-1A74-4D35-B332-31423D8926FE}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {224DC047-B19A-4499-9C57-2BB00205EEF0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {4C41A986-5DEF-4AE7-9572-952431AC2094} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {9DAD329D-8B67-4CEA-B39C-D90941EFD551} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {77CB95D3-0B1E-4B91-9A97-63206BF61B7F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {466BAFA4-7393-410A-97DA-65113A2E27FF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {7FFEB449-414B-4772-B471-2FFE7416F0CA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0A376EF1-9F72-42DC-8C44-D846CE8DE90D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {08FD1160-C714-404F-BFD3-FC6D1DF26558} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {36EC22E2-1D1B-4F3A-9982-CCD1CF19AB6E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {525A376F-5729-41EE-B602-40534E932258} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {717C54D8-F321-432B-96C2-558816E131F7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {DBE63320-80D8-47AC-856F-26E1E97256C0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B5AEC786-2597-47E2-A271-2C38DF79C7CB} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C2C65714-0AFD-4424-932D-6B70AE5EC213} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {BEEEDD5F-1A74-4D35-B332-31423D8926FE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {7FFEB449-414B-4772-B471-2FFE7416F0CA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0A376EF1-9F72-42DC-8C44-D846CE8DE90D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {08FD1160-C714-404F-BFD3-FC6D1DF26558} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {36EC22E2-1D1B-4F3A-9982-CCD1CF19AB6E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {525A376F-5729-41EE-B602-40534E932258} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {717C54D8-F321-432B-96C2-558816E131F7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {DBE63320-80D8-47AC-856F-26E1E97256C0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B5AEC786-2597-47E2-A271-2C38DF79C7CB} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C2C65714-0AFD-4424-932D-6B70AE5EC213} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {BEEEDD5F-1A74-4D35-B332-31423D8926FE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {6967B28B-E7F0-47FE-AFD2-81CB18723F81} diff --git a/sdk/src/Services/AppConfigData/Generated/AmazonAppConfigDataConfig.cs b/sdk/src/Services/AppConfigData/Generated/AmazonAppConfigDataConfig.cs index 73a6b0728b5e..7fefd85afed5 100644 --- a/sdk/src/Services/AppConfigData/Generated/AmazonAppConfigDataConfig.cs +++ b/sdk/src/Services/AppConfigData/Generated/AmazonAppConfigDataConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.AppConfigData public partial class AmazonAppConfigDataConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("AppConfigData", "4.0.0.0"); private static readonly AmazonAppConfigDataEndpointResolver EndpointResolver = new AmazonAppConfigDataEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("AppConfigData", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("AppConfigData", "3.7.400.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/AppConfigData/Properties/AssemblyInfo.cs b/sdk/src/Services/AppConfigData/Properties/AssemblyInfo.cs index e6fc128713ab..a7e4be17983c 100644 --- a/sdk/src/Services/AppConfigData/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/AppConfigData/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/AppFabric/AppFabric.sln b/sdk/src/Services/AppFabric/AppFabric.sln index 60d6a9bf3c53..262f2b7e70ef 100644 --- a/sdk/src/Services/AppFabric/AppFabric.sln +++ b/sdk/src/Services/AppFabric/AppFabric.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {69569B02-2943-407D-98F3-5151E479ADA6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {69569B02-2943-407D-98F3-5151E479ADA6}.Debug|Any CPU.Build.0 = Debug|Any CPU {69569B02-2943-407D-98F3-5151E479ADA6}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {B05990A4-E912-41E7-B71B-54E415137E7D}.Debug|Any CPU.Build.0 = Debug|Any CPU {B05990A4-E912-41E7-B71B-54E415137E7D}.Release|Any CPU.ActiveCfg = Release|Any CPU {B05990A4-E912-41E7-B71B-54E415137E7D}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {60B45D47-DE72-437B-83B8-88E3FC83E4DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {60B45D47-DE72-437B-83B8-88E3FC83E4DC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {60B45D47-DE72-437B-83B8-88E3FC83E4DC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {60B45D47-DE72-437B-83B8-88E3FC83E4DC}.Release|Any CPU.Build.0 = Release|Any CPU - {19315FC3-BE3C-4671-A705-06961E9FC30B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {19315FC3-BE3C-4671-A705-06961E9FC30B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {19315FC3-BE3C-4671-A705-06961E9FC30B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {19315FC3-BE3C-4671-A705-06961E9FC30B}.Release|Any CPU.Build.0 = Release|Any CPU - {19663346-D951-4ADE-9BF9-72A147F0D785}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {19663346-D951-4ADE-9BF9-72A147F0D785}.Debug|Any CPU.Build.0 = Debug|Any CPU - {19663346-D951-4ADE-9BF9-72A147F0D785}.Release|Any CPU.ActiveCfg = Release|Any CPU - {19663346-D951-4ADE-9BF9-72A147F0D785}.Release|Any CPU.Build.0 = Release|Any CPU - {4B086EEC-4329-45E7-80BA-FD4DE372010C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4B086EEC-4329-45E7-80BA-FD4DE372010C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4B086EEC-4329-45E7-80BA-FD4DE372010C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4B086EEC-4329-45E7-80BA-FD4DE372010C}.Release|Any CPU.Build.0 = Release|Any CPU - {6A46873F-E5EA-480E-9249-9E8BA64F5FED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6A46873F-E5EA-480E-9249-9E8BA64F5FED}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6A46873F-E5EA-480E-9249-9E8BA64F5FED}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6A46873F-E5EA-480E-9249-9E8BA64F5FED}.Release|Any CPU.Build.0 = Release|Any CPU - {D3DABBC5-2F00-4D29-91AD-79CA313FF1D6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D3DABBC5-2F00-4D29-91AD-79CA313FF1D6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D3DABBC5-2F00-4D29-91AD-79CA313FF1D6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D3DABBC5-2F00-4D29-91AD-79CA313FF1D6}.Release|Any CPU.Build.0 = Release|Any CPU - {A6745DE8-037E-4A9C-8EE3-DA8E7BE29307}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A6745DE8-037E-4A9C-8EE3-DA8E7BE29307}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A6745DE8-037E-4A9C-8EE3-DA8E7BE29307}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A6745DE8-037E-4A9C-8EE3-DA8E7BE29307}.Release|Any CPU.Build.0 = Release|Any CPU - {0A2BADB3-42B4-4A86-ADBE-F0CE2C93595E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0A2BADB3-42B4-4A86-ADBE-F0CE2C93595E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0A2BADB3-42B4-4A86-ADBE-F0CE2C93595E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0A2BADB3-42B4-4A86-ADBE-F0CE2C93595E}.Release|Any CPU.Build.0 = Release|Any CPU - {B38F1EA1-F981-45D3-AFB6-7CDCB61576A8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B38F1EA1-F981-45D3-AFB6-7CDCB61576A8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B38F1EA1-F981-45D3-AFB6-7CDCB61576A8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B38F1EA1-F981-45D3-AFB6-7CDCB61576A8}.Release|Any CPU.Build.0 = Release|Any CPU - {DFD76CFB-4B66-4718-93D2-24B9591FD71B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DFD76CFB-4B66-4718-93D2-24B9591FD71B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DFD76CFB-4B66-4718-93D2-24B9591FD71B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DFD76CFB-4B66-4718-93D2-24B9591FD71B}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {60B45D47-DE72-437B-83B8-88E3FC83E4DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {60B45D47-DE72-437B-83B8-88E3FC83E4DC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {60B45D47-DE72-437B-83B8-88E3FC83E4DC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {60B45D47-DE72-437B-83B8-88E3FC83E4DC}.Release|Any CPU.Build.0 = Release|Any CPU - {19315FC3-BE3C-4671-A705-06961E9FC30B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {19315FC3-BE3C-4671-A705-06961E9FC30B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {19315FC3-BE3C-4671-A705-06961E9FC30B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {19315FC3-BE3C-4671-A705-06961E9FC30B}.Release|Any CPU.Build.0 = Release|Any CPU - {19663346-D951-4ADE-9BF9-72A147F0D785}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {19663346-D951-4ADE-9BF9-72A147F0D785}.Debug|Any CPU.Build.0 = Debug|Any CPU - {19663346-D951-4ADE-9BF9-72A147F0D785}.Release|Any CPU.ActiveCfg = Release|Any CPU - {19663346-D951-4ADE-9BF9-72A147F0D785}.Release|Any CPU.Build.0 = Release|Any CPU - {4B086EEC-4329-45E7-80BA-FD4DE372010C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4B086EEC-4329-45E7-80BA-FD4DE372010C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4B086EEC-4329-45E7-80BA-FD4DE372010C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4B086EEC-4329-45E7-80BA-FD4DE372010C}.Release|Any CPU.Build.0 = Release|Any CPU - {6A46873F-E5EA-480E-9249-9E8BA64F5FED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6A46873F-E5EA-480E-9249-9E8BA64F5FED}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6A46873F-E5EA-480E-9249-9E8BA64F5FED}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6A46873F-E5EA-480E-9249-9E8BA64F5FED}.Release|Any CPU.Build.0 = Release|Any CPU - {D3DABBC5-2F00-4D29-91AD-79CA313FF1D6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D3DABBC5-2F00-4D29-91AD-79CA313FF1D6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D3DABBC5-2F00-4D29-91AD-79CA313FF1D6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D3DABBC5-2F00-4D29-91AD-79CA313FF1D6}.Release|Any CPU.Build.0 = Release|Any CPU - {A6745DE8-037E-4A9C-8EE3-DA8E7BE29307}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A6745DE8-037E-4A9C-8EE3-DA8E7BE29307}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A6745DE8-037E-4A9C-8EE3-DA8E7BE29307}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A6745DE8-037E-4A9C-8EE3-DA8E7BE29307}.Release|Any CPU.Build.0 = Release|Any CPU - {0A2BADB3-42B4-4A86-ADBE-F0CE2C93595E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0A2BADB3-42B4-4A86-ADBE-F0CE2C93595E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0A2BADB3-42B4-4A86-ADBE-F0CE2C93595E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0A2BADB3-42B4-4A86-ADBE-F0CE2C93595E}.Release|Any CPU.Build.0 = Release|Any CPU - {B38F1EA1-F981-45D3-AFB6-7CDCB61576A8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B38F1EA1-F981-45D3-AFB6-7CDCB61576A8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B38F1EA1-F981-45D3-AFB6-7CDCB61576A8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B38F1EA1-F981-45D3-AFB6-7CDCB61576A8}.Release|Any CPU.Build.0 = Release|Any CPU - {DFD76CFB-4B66-4718-93D2-24B9591FD71B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DFD76CFB-4B66-4718-93D2-24B9591FD71B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DFD76CFB-4B66-4718-93D2-24B9591FD71B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DFD76CFB-4B66-4718-93D2-24B9591FD71B}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {69569B02-2943-407D-98F3-5151E479ADA6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {46B6498C-37A0-428D-B7C7-8F2EA6F02AB6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {48A200D0-8270-40D3-80DF-C5991C4E2593} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {9576D00F-0F45-498B-87B7-D4D148154E43} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {B05990A4-E912-41E7-B71B-54E415137E7D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {60B45D47-DE72-437B-83B8-88E3FC83E4DC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {19315FC3-BE3C-4671-A705-06961E9FC30B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {19663346-D951-4ADE-9BF9-72A147F0D785} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4B086EEC-4329-45E7-80BA-FD4DE372010C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6A46873F-E5EA-480E-9249-9E8BA64F5FED} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D3DABBC5-2F00-4D29-91AD-79CA313FF1D6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A6745DE8-037E-4A9C-8EE3-DA8E7BE29307} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0A2BADB3-42B4-4A86-ADBE-F0CE2C93595E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B38F1EA1-F981-45D3-AFB6-7CDCB61576A8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {DFD76CFB-4B66-4718-93D2-24B9591FD71B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {60B45D47-DE72-437B-83B8-88E3FC83E4DC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {19315FC3-BE3C-4671-A705-06961E9FC30B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {19663346-D951-4ADE-9BF9-72A147F0D785} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4B086EEC-4329-45E7-80BA-FD4DE372010C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6A46873F-E5EA-480E-9249-9E8BA64F5FED} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D3DABBC5-2F00-4D29-91AD-79CA313FF1D6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A6745DE8-037E-4A9C-8EE3-DA8E7BE29307} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0A2BADB3-42B4-4A86-ADBE-F0CE2C93595E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B38F1EA1-F981-45D3-AFB6-7CDCB61576A8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {DFD76CFB-4B66-4718-93D2-24B9591FD71B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {8C830897-DCB5-41A3-99CF-BE9C0C15AD77} diff --git a/sdk/src/Services/AppFabric/Generated/AmazonAppFabricConfig.cs b/sdk/src/Services/AppFabric/Generated/AmazonAppFabricConfig.cs index af6c637669b2..5e9c53ce51c5 100644 --- a/sdk/src/Services/AppFabric/Generated/AmazonAppFabricConfig.cs +++ b/sdk/src/Services/AppFabric/Generated/AmazonAppFabricConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.AppFabric public partial class AmazonAppFabricConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("AppFabric", "4.0.0.0"); private static readonly AmazonAppFabricEndpointResolver EndpointResolver = new AmazonAppFabricEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("AppFabric", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("AppFabric", "3.7.400.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/AppFabric/Properties/AssemblyInfo.cs b/sdk/src/Services/AppFabric/Properties/AssemblyInfo.cs index f4e47608eb82..405d18b5ef69 100644 --- a/sdk/src/Services/AppFabric/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/AppFabric/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/AppIntegrationsService/AppIntegrationsService.sln b/sdk/src/Services/AppIntegrationsService/AppIntegrationsService.sln index 5e4fabd729a3..05c61d362ba4 100644 --- a/sdk/src/Services/AppIntegrationsService/AppIntegrationsService.sln +++ b/sdk/src/Services/AppIntegrationsService/AppIntegrationsService.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {CDB5BAE9-8224-43C9-948B-9A5887C8F24C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {CDB5BAE9-8224-43C9-948B-9A5887C8F24C}.Debug|Any CPU.Build.0 = Debug|Any CPU {CDB5BAE9-8224-43C9-948B-9A5887C8F24C}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {48E14002-C7AE-4597-826F-23A78B3FA515}.Debug|Any CPU.Build.0 = Debug|Any CPU {48E14002-C7AE-4597-826F-23A78B3FA515}.Release|Any CPU.ActiveCfg = Release|Any CPU {48E14002-C7AE-4597-826F-23A78B3FA515}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {D883B950-99C2-4A34-A508-0E499F81190C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D883B950-99C2-4A34-A508-0E499F81190C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D883B950-99C2-4A34-A508-0E499F81190C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D883B950-99C2-4A34-A508-0E499F81190C}.Release|Any CPU.Build.0 = Release|Any CPU - {98D01CEC-7149-416B-868C-FEFD278B2656}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {98D01CEC-7149-416B-868C-FEFD278B2656}.Debug|Any CPU.Build.0 = Debug|Any CPU - {98D01CEC-7149-416B-868C-FEFD278B2656}.Release|Any CPU.ActiveCfg = Release|Any CPU - {98D01CEC-7149-416B-868C-FEFD278B2656}.Release|Any CPU.Build.0 = Release|Any CPU - {9E481721-7EB6-4259-A45B-4C5E6978580A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9E481721-7EB6-4259-A45B-4C5E6978580A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9E481721-7EB6-4259-A45B-4C5E6978580A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9E481721-7EB6-4259-A45B-4C5E6978580A}.Release|Any CPU.Build.0 = Release|Any CPU - {5DA6AAC0-E25A-4063-922C-4D800E4A1868}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5DA6AAC0-E25A-4063-922C-4D800E4A1868}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5DA6AAC0-E25A-4063-922C-4D800E4A1868}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5DA6AAC0-E25A-4063-922C-4D800E4A1868}.Release|Any CPU.Build.0 = Release|Any CPU - {BB1F6630-041B-4E3F-92E1-E45A1ABFE43C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BB1F6630-041B-4E3F-92E1-E45A1ABFE43C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BB1F6630-041B-4E3F-92E1-E45A1ABFE43C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BB1F6630-041B-4E3F-92E1-E45A1ABFE43C}.Release|Any CPU.Build.0 = Release|Any CPU - {C7EF6F53-036A-496F-85BD-85645D989B67}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C7EF6F53-036A-496F-85BD-85645D989B67}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C7EF6F53-036A-496F-85BD-85645D989B67}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C7EF6F53-036A-496F-85BD-85645D989B67}.Release|Any CPU.Build.0 = Release|Any CPU - {445F8DFC-F9FC-4804-80E5-FC7BA1A426EF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {445F8DFC-F9FC-4804-80E5-FC7BA1A426EF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {445F8DFC-F9FC-4804-80E5-FC7BA1A426EF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {445F8DFC-F9FC-4804-80E5-FC7BA1A426EF}.Release|Any CPU.Build.0 = Release|Any CPU - {59EEFDDB-76E8-451F-BE2C-7BACEB6AFB6D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {59EEFDDB-76E8-451F-BE2C-7BACEB6AFB6D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {59EEFDDB-76E8-451F-BE2C-7BACEB6AFB6D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {59EEFDDB-76E8-451F-BE2C-7BACEB6AFB6D}.Release|Any CPU.Build.0 = Release|Any CPU - {3C510F5A-0D9E-4059-A744-3765FC874484}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3C510F5A-0D9E-4059-A744-3765FC874484}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3C510F5A-0D9E-4059-A744-3765FC874484}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3C510F5A-0D9E-4059-A744-3765FC874484}.Release|Any CPU.Build.0 = Release|Any CPU - {A495EA1B-A11D-41F3-8C9B-F4F7D1C1F379}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A495EA1B-A11D-41F3-8C9B-F4F7D1C1F379}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A495EA1B-A11D-41F3-8C9B-F4F7D1C1F379}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A495EA1B-A11D-41F3-8C9B-F4F7D1C1F379}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {D883B950-99C2-4A34-A508-0E499F81190C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D883B950-99C2-4A34-A508-0E499F81190C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D883B950-99C2-4A34-A508-0E499F81190C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D883B950-99C2-4A34-A508-0E499F81190C}.Release|Any CPU.Build.0 = Release|Any CPU - {98D01CEC-7149-416B-868C-FEFD278B2656}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {98D01CEC-7149-416B-868C-FEFD278B2656}.Debug|Any CPU.Build.0 = Debug|Any CPU - {98D01CEC-7149-416B-868C-FEFD278B2656}.Release|Any CPU.ActiveCfg = Release|Any CPU - {98D01CEC-7149-416B-868C-FEFD278B2656}.Release|Any CPU.Build.0 = Release|Any CPU - {9E481721-7EB6-4259-A45B-4C5E6978580A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9E481721-7EB6-4259-A45B-4C5E6978580A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9E481721-7EB6-4259-A45B-4C5E6978580A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9E481721-7EB6-4259-A45B-4C5E6978580A}.Release|Any CPU.Build.0 = Release|Any CPU - {5DA6AAC0-E25A-4063-922C-4D800E4A1868}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5DA6AAC0-E25A-4063-922C-4D800E4A1868}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5DA6AAC0-E25A-4063-922C-4D800E4A1868}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5DA6AAC0-E25A-4063-922C-4D800E4A1868}.Release|Any CPU.Build.0 = Release|Any CPU - {BB1F6630-041B-4E3F-92E1-E45A1ABFE43C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BB1F6630-041B-4E3F-92E1-E45A1ABFE43C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BB1F6630-041B-4E3F-92E1-E45A1ABFE43C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BB1F6630-041B-4E3F-92E1-E45A1ABFE43C}.Release|Any CPU.Build.0 = Release|Any CPU - {C7EF6F53-036A-496F-85BD-85645D989B67}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C7EF6F53-036A-496F-85BD-85645D989B67}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C7EF6F53-036A-496F-85BD-85645D989B67}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C7EF6F53-036A-496F-85BD-85645D989B67}.Release|Any CPU.Build.0 = Release|Any CPU - {445F8DFC-F9FC-4804-80E5-FC7BA1A426EF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {445F8DFC-F9FC-4804-80E5-FC7BA1A426EF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {445F8DFC-F9FC-4804-80E5-FC7BA1A426EF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {445F8DFC-F9FC-4804-80E5-FC7BA1A426EF}.Release|Any CPU.Build.0 = Release|Any CPU - {59EEFDDB-76E8-451F-BE2C-7BACEB6AFB6D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {59EEFDDB-76E8-451F-BE2C-7BACEB6AFB6D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {59EEFDDB-76E8-451F-BE2C-7BACEB6AFB6D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {59EEFDDB-76E8-451F-BE2C-7BACEB6AFB6D}.Release|Any CPU.Build.0 = Release|Any CPU - {3C510F5A-0D9E-4059-A744-3765FC874484}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3C510F5A-0D9E-4059-A744-3765FC874484}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3C510F5A-0D9E-4059-A744-3765FC874484}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3C510F5A-0D9E-4059-A744-3765FC874484}.Release|Any CPU.Build.0 = Release|Any CPU - {A495EA1B-A11D-41F3-8C9B-F4F7D1C1F379}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A495EA1B-A11D-41F3-8C9B-F4F7D1C1F379}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A495EA1B-A11D-41F3-8C9B-F4F7D1C1F379}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A495EA1B-A11D-41F3-8C9B-F4F7D1C1F379}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {CDB5BAE9-8224-43C9-948B-9A5887C8F24C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {957F7AAC-7092-4CF6-8B9B-30B217E1AA38} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {CFD5FF71-E4A7-4D5F-9BE6-FBF66A41817F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {99DBE9C3-A6BC-4BE5-B1CB-882CAD6AC7B3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {48E14002-C7AE-4597-826F-23A78B3FA515} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {D883B950-99C2-4A34-A508-0E499F81190C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {98D01CEC-7149-416B-868C-FEFD278B2656} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {9E481721-7EB6-4259-A45B-4C5E6978580A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {5DA6AAC0-E25A-4063-922C-4D800E4A1868} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {BB1F6630-041B-4E3F-92E1-E45A1ABFE43C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C7EF6F53-036A-496F-85BD-85645D989B67} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {445F8DFC-F9FC-4804-80E5-FC7BA1A426EF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {59EEFDDB-76E8-451F-BE2C-7BACEB6AFB6D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {3C510F5A-0D9E-4059-A744-3765FC874484} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A495EA1B-A11D-41F3-8C9B-F4F7D1C1F379} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {D883B950-99C2-4A34-A508-0E499F81190C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {98D01CEC-7149-416B-868C-FEFD278B2656} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {9E481721-7EB6-4259-A45B-4C5E6978580A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {5DA6AAC0-E25A-4063-922C-4D800E4A1868} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {BB1F6630-041B-4E3F-92E1-E45A1ABFE43C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C7EF6F53-036A-496F-85BD-85645D989B67} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {445F8DFC-F9FC-4804-80E5-FC7BA1A426EF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {59EEFDDB-76E8-451F-BE2C-7BACEB6AFB6D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {3C510F5A-0D9E-4059-A744-3765FC874484} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A495EA1B-A11D-41F3-8C9B-F4F7D1C1F379} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {D575229D-49FC-4B12-A6AE-84B371E1D4AF} diff --git a/sdk/src/Services/AppIntegrationsService/Generated/AmazonAppIntegrationsServiceConfig.cs b/sdk/src/Services/AppIntegrationsService/Generated/AmazonAppIntegrationsServiceConfig.cs index 7387c51384b8..3edc46044975 100644 --- a/sdk/src/Services/AppIntegrationsService/Generated/AmazonAppIntegrationsServiceConfig.cs +++ b/sdk/src/Services/AppIntegrationsService/Generated/AmazonAppIntegrationsServiceConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.AppIntegrationsService public partial class AmazonAppIntegrationsServiceConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("AppIntegrations", "4.0.0.0"); private static readonly AmazonAppIntegrationsServiceEndpointResolver EndpointResolver = new AmazonAppIntegrationsServiceEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("AppIntegrations", "3.7.401.23"); -======= - InternalSDKUtils.BuildUserAgentString("AppIntegrations", "3.7.401.50"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/AppIntegrationsService/Properties/AssemblyInfo.cs b/sdk/src/Services/AppIntegrationsService/Properties/AssemblyInfo.cs index c49709c15194..601486d70c29 100644 --- a/sdk/src/Services/AppIntegrationsService/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/AppIntegrationsService/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.23")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.50")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/AppMesh/AppMesh.sln b/sdk/src/Services/AppMesh/AppMesh.sln index eb714ad6a4d5..f2f1dfac17ac 100644 --- a/sdk/src/Services/AppMesh/AppMesh.sln +++ b/sdk/src/Services/AppMesh/AppMesh.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {E7829678-8945-49C7-8AF7-F1B592709946}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {E7829678-8945-49C7-8AF7-F1B592709946}.Debug|Any CPU.Build.0 = Debug|Any CPU {E7829678-8945-49C7-8AF7-F1B592709946}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {79AC0B56-426A-4C61-B9BD-ACC5C47DBD97}.Debug|Any CPU.Build.0 = Debug|Any CPU {79AC0B56-426A-4C61-B9BD-ACC5C47DBD97}.Release|Any CPU.ActiveCfg = Release|Any CPU {79AC0B56-426A-4C61-B9BD-ACC5C47DBD97}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {91B44D92-A3F4-4B79-A80A-CE502E36E14A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {91B44D92-A3F4-4B79-A80A-CE502E36E14A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {91B44D92-A3F4-4B79-A80A-CE502E36E14A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {91B44D92-A3F4-4B79-A80A-CE502E36E14A}.Release|Any CPU.Build.0 = Release|Any CPU - {60957CD4-C632-4B7B-A93F-967EDB77063B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {60957CD4-C632-4B7B-A93F-967EDB77063B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {60957CD4-C632-4B7B-A93F-967EDB77063B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {60957CD4-C632-4B7B-A93F-967EDB77063B}.Release|Any CPU.Build.0 = Release|Any CPU - {AE43D7F5-F13C-4D5F-9F78-A9F508F87ADE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AE43D7F5-F13C-4D5F-9F78-A9F508F87ADE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AE43D7F5-F13C-4D5F-9F78-A9F508F87ADE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AE43D7F5-F13C-4D5F-9F78-A9F508F87ADE}.Release|Any CPU.Build.0 = Release|Any CPU - {9AF365A3-B05E-4733-A741-686359AE0E80}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9AF365A3-B05E-4733-A741-686359AE0E80}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9AF365A3-B05E-4733-A741-686359AE0E80}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9AF365A3-B05E-4733-A741-686359AE0E80}.Release|Any CPU.Build.0 = Release|Any CPU - {48670EFC-8DD5-46EF-98B4-9DCC4CEDBE0E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {48670EFC-8DD5-46EF-98B4-9DCC4CEDBE0E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {48670EFC-8DD5-46EF-98B4-9DCC4CEDBE0E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {48670EFC-8DD5-46EF-98B4-9DCC4CEDBE0E}.Release|Any CPU.Build.0 = Release|Any CPU - {9FDBF497-D1D4-49EC-B20A-D05DA7FCFB36}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9FDBF497-D1D4-49EC-B20A-D05DA7FCFB36}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9FDBF497-D1D4-49EC-B20A-D05DA7FCFB36}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9FDBF497-D1D4-49EC-B20A-D05DA7FCFB36}.Release|Any CPU.Build.0 = Release|Any CPU - {A7D33CEC-457C-4D70-8D54-630E8390A318}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A7D33CEC-457C-4D70-8D54-630E8390A318}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A7D33CEC-457C-4D70-8D54-630E8390A318}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A7D33CEC-457C-4D70-8D54-630E8390A318}.Release|Any CPU.Build.0 = Release|Any CPU - {E02979F2-9ACB-42E3-8C9F-77C1280AF32E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E02979F2-9ACB-42E3-8C9F-77C1280AF32E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E02979F2-9ACB-42E3-8C9F-77C1280AF32E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E02979F2-9ACB-42E3-8C9F-77C1280AF32E}.Release|Any CPU.Build.0 = Release|Any CPU - {2432DCA9-26C4-4BA8-B933-91D7346CE393}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2432DCA9-26C4-4BA8-B933-91D7346CE393}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2432DCA9-26C4-4BA8-B933-91D7346CE393}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2432DCA9-26C4-4BA8-B933-91D7346CE393}.Release|Any CPU.Build.0 = Release|Any CPU - {17486949-02F2-4C90-B18C-E42A29D5C1B1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {17486949-02F2-4C90-B18C-E42A29D5C1B1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {17486949-02F2-4C90-B18C-E42A29D5C1B1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {17486949-02F2-4C90-B18C-E42A29D5C1B1}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {91B44D92-A3F4-4B79-A80A-CE502E36E14A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {91B44D92-A3F4-4B79-A80A-CE502E36E14A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {91B44D92-A3F4-4B79-A80A-CE502E36E14A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {91B44D92-A3F4-4B79-A80A-CE502E36E14A}.Release|Any CPU.Build.0 = Release|Any CPU - {60957CD4-C632-4B7B-A93F-967EDB77063B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {60957CD4-C632-4B7B-A93F-967EDB77063B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {60957CD4-C632-4B7B-A93F-967EDB77063B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {60957CD4-C632-4B7B-A93F-967EDB77063B}.Release|Any CPU.Build.0 = Release|Any CPU - {AE43D7F5-F13C-4D5F-9F78-A9F508F87ADE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AE43D7F5-F13C-4D5F-9F78-A9F508F87ADE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AE43D7F5-F13C-4D5F-9F78-A9F508F87ADE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AE43D7F5-F13C-4D5F-9F78-A9F508F87ADE}.Release|Any CPU.Build.0 = Release|Any CPU - {9AF365A3-B05E-4733-A741-686359AE0E80}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9AF365A3-B05E-4733-A741-686359AE0E80}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9AF365A3-B05E-4733-A741-686359AE0E80}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9AF365A3-B05E-4733-A741-686359AE0E80}.Release|Any CPU.Build.0 = Release|Any CPU - {48670EFC-8DD5-46EF-98B4-9DCC4CEDBE0E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {48670EFC-8DD5-46EF-98B4-9DCC4CEDBE0E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {48670EFC-8DD5-46EF-98B4-9DCC4CEDBE0E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {48670EFC-8DD5-46EF-98B4-9DCC4CEDBE0E}.Release|Any CPU.Build.0 = Release|Any CPU - {9FDBF497-D1D4-49EC-B20A-D05DA7FCFB36}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9FDBF497-D1D4-49EC-B20A-D05DA7FCFB36}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9FDBF497-D1D4-49EC-B20A-D05DA7FCFB36}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9FDBF497-D1D4-49EC-B20A-D05DA7FCFB36}.Release|Any CPU.Build.0 = Release|Any CPU - {A7D33CEC-457C-4D70-8D54-630E8390A318}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A7D33CEC-457C-4D70-8D54-630E8390A318}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A7D33CEC-457C-4D70-8D54-630E8390A318}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A7D33CEC-457C-4D70-8D54-630E8390A318}.Release|Any CPU.Build.0 = Release|Any CPU - {E02979F2-9ACB-42E3-8C9F-77C1280AF32E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E02979F2-9ACB-42E3-8C9F-77C1280AF32E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E02979F2-9ACB-42E3-8C9F-77C1280AF32E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E02979F2-9ACB-42E3-8C9F-77C1280AF32E}.Release|Any CPU.Build.0 = Release|Any CPU - {2432DCA9-26C4-4BA8-B933-91D7346CE393}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2432DCA9-26C4-4BA8-B933-91D7346CE393}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2432DCA9-26C4-4BA8-B933-91D7346CE393}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2432DCA9-26C4-4BA8-B933-91D7346CE393}.Release|Any CPU.Build.0 = Release|Any CPU - {17486949-02F2-4C90-B18C-E42A29D5C1B1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {17486949-02F2-4C90-B18C-E42A29D5C1B1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {17486949-02F2-4C90-B18C-E42A29D5C1B1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {17486949-02F2-4C90-B18C-E42A29D5C1B1}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {E7829678-8945-49C7-8AF7-F1B592709946} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {452656EB-323B-4436-BC60-EFE567A745BC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {59FB44D1-3C1F-4C1E-906F-CDA0E33FAA6F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {FFC8EA3B-E2D6-4B45-B164-D0A4E4068A54} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {79AC0B56-426A-4C61-B9BD-ACC5C47DBD97} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {91B44D92-A3F4-4B79-A80A-CE502E36E14A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {60957CD4-C632-4B7B-A93F-967EDB77063B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {AE43D7F5-F13C-4D5F-9F78-A9F508F87ADE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {9AF365A3-B05E-4733-A741-686359AE0E80} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {48670EFC-8DD5-46EF-98B4-9DCC4CEDBE0E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {9FDBF497-D1D4-49EC-B20A-D05DA7FCFB36} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A7D33CEC-457C-4D70-8D54-630E8390A318} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E02979F2-9ACB-42E3-8C9F-77C1280AF32E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {2432DCA9-26C4-4BA8-B933-91D7346CE393} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {17486949-02F2-4C90-B18C-E42A29D5C1B1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {91B44D92-A3F4-4B79-A80A-CE502E36E14A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {60957CD4-C632-4B7B-A93F-967EDB77063B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {AE43D7F5-F13C-4D5F-9F78-A9F508F87ADE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {9AF365A3-B05E-4733-A741-686359AE0E80} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {48670EFC-8DD5-46EF-98B4-9DCC4CEDBE0E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {9FDBF497-D1D4-49EC-B20A-D05DA7FCFB36} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A7D33CEC-457C-4D70-8D54-630E8390A318} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E02979F2-9ACB-42E3-8C9F-77C1280AF32E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {2432DCA9-26C4-4BA8-B933-91D7346CE393} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {17486949-02F2-4C90-B18C-E42A29D5C1B1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {C1C70585-9C1B-41B1-949E-6157000E9C9D} diff --git a/sdk/src/Services/AppMesh/Generated/AmazonAppMeshConfig.cs b/sdk/src/Services/AppMesh/Generated/AmazonAppMeshConfig.cs index 445629fd8101..f6fbb965e6a9 100644 --- a/sdk/src/Services/AppMesh/Generated/AmazonAppMeshConfig.cs +++ b/sdk/src/Services/AppMesh/Generated/AmazonAppMeshConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.AppMesh public partial class AmazonAppMeshConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("App Mesh", "4.0.0.0"); private static readonly AmazonAppMeshEndpointResolver EndpointResolver = new AmazonAppMeshEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("App Mesh", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("App Mesh", "3.7.400.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/AppMesh/Properties/AssemblyInfo.cs b/sdk/src/Services/AppMesh/Properties/AssemblyInfo.cs index 14bf981cc05e..faae726ca894 100644 --- a/sdk/src/Services/AppMesh/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/AppMesh/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/AppRegistry/AppRegistry.sln b/sdk/src/Services/AppRegistry/AppRegistry.sln index ca6bd96905ab..f62cef8d763b 100644 --- a/sdk/src/Services/AppRegistry/AppRegistry.sln +++ b/sdk/src/Services/AppRegistry/AppRegistry.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {671F00DD-AF25-45B6-A1F7-B1AAE74EA208}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {671F00DD-AF25-45B6-A1F7-B1AAE74EA208}.Debug|Any CPU.Build.0 = Debug|Any CPU {671F00DD-AF25-45B6-A1F7-B1AAE74EA208}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {E6EC8343-C654-470E-8435-53A2E8F611A5}.Debug|Any CPU.Build.0 = Debug|Any CPU {E6EC8343-C654-470E-8435-53A2E8F611A5}.Release|Any CPU.ActiveCfg = Release|Any CPU {E6EC8343-C654-470E-8435-53A2E8F611A5}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {8B815ECB-40FD-44EE-A260-13D0E88F1AAC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8B815ECB-40FD-44EE-A260-13D0E88F1AAC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8B815ECB-40FD-44EE-A260-13D0E88F1AAC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8B815ECB-40FD-44EE-A260-13D0E88F1AAC}.Release|Any CPU.Build.0 = Release|Any CPU - {2FFFAAE2-3F3B-4DE6-9844-A35527DE1DC8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2FFFAAE2-3F3B-4DE6-9844-A35527DE1DC8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2FFFAAE2-3F3B-4DE6-9844-A35527DE1DC8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2FFFAAE2-3F3B-4DE6-9844-A35527DE1DC8}.Release|Any CPU.Build.0 = Release|Any CPU - {57F44BFA-7970-4879-9954-DAC1785C5E92}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {57F44BFA-7970-4879-9954-DAC1785C5E92}.Debug|Any CPU.Build.0 = Debug|Any CPU - {57F44BFA-7970-4879-9954-DAC1785C5E92}.Release|Any CPU.ActiveCfg = Release|Any CPU - {57F44BFA-7970-4879-9954-DAC1785C5E92}.Release|Any CPU.Build.0 = Release|Any CPU - {8ADE8115-46DE-4FCD-BF5D-BF782BAE7EE8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8ADE8115-46DE-4FCD-BF5D-BF782BAE7EE8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8ADE8115-46DE-4FCD-BF5D-BF782BAE7EE8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8ADE8115-46DE-4FCD-BF5D-BF782BAE7EE8}.Release|Any CPU.Build.0 = Release|Any CPU - {D24D2B65-0F4C-4A99-BEAB-7BF136EBBB30}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D24D2B65-0F4C-4A99-BEAB-7BF136EBBB30}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D24D2B65-0F4C-4A99-BEAB-7BF136EBBB30}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D24D2B65-0F4C-4A99-BEAB-7BF136EBBB30}.Release|Any CPU.Build.0 = Release|Any CPU - {ED3B6133-1463-4188-8291-770CC44EDD79}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {ED3B6133-1463-4188-8291-770CC44EDD79}.Debug|Any CPU.Build.0 = Debug|Any CPU - {ED3B6133-1463-4188-8291-770CC44EDD79}.Release|Any CPU.ActiveCfg = Release|Any CPU - {ED3B6133-1463-4188-8291-770CC44EDD79}.Release|Any CPU.Build.0 = Release|Any CPU - {8EE7CD44-DC7A-4AF2-AE79-94BB4D968EFB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8EE7CD44-DC7A-4AF2-AE79-94BB4D968EFB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8EE7CD44-DC7A-4AF2-AE79-94BB4D968EFB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8EE7CD44-DC7A-4AF2-AE79-94BB4D968EFB}.Release|Any CPU.Build.0 = Release|Any CPU - {B1CCF636-B3A1-425E-892E-7FB7BBF367D9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B1CCF636-B3A1-425E-892E-7FB7BBF367D9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B1CCF636-B3A1-425E-892E-7FB7BBF367D9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B1CCF636-B3A1-425E-892E-7FB7BBF367D9}.Release|Any CPU.Build.0 = Release|Any CPU - {B899ADDA-2A73-46F6-9865-16B91CE219E5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B899ADDA-2A73-46F6-9865-16B91CE219E5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B899ADDA-2A73-46F6-9865-16B91CE219E5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B899ADDA-2A73-46F6-9865-16B91CE219E5}.Release|Any CPU.Build.0 = Release|Any CPU - {44652FA4-BF53-457F-A313-6DAF96594E9D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {44652FA4-BF53-457F-A313-6DAF96594E9D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {44652FA4-BF53-457F-A313-6DAF96594E9D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {44652FA4-BF53-457F-A313-6DAF96594E9D}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {8B815ECB-40FD-44EE-A260-13D0E88F1AAC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8B815ECB-40FD-44EE-A260-13D0E88F1AAC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8B815ECB-40FD-44EE-A260-13D0E88F1AAC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8B815ECB-40FD-44EE-A260-13D0E88F1AAC}.Release|Any CPU.Build.0 = Release|Any CPU - {2FFFAAE2-3F3B-4DE6-9844-A35527DE1DC8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2FFFAAE2-3F3B-4DE6-9844-A35527DE1DC8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2FFFAAE2-3F3B-4DE6-9844-A35527DE1DC8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2FFFAAE2-3F3B-4DE6-9844-A35527DE1DC8}.Release|Any CPU.Build.0 = Release|Any CPU - {57F44BFA-7970-4879-9954-DAC1785C5E92}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {57F44BFA-7970-4879-9954-DAC1785C5E92}.Debug|Any CPU.Build.0 = Debug|Any CPU - {57F44BFA-7970-4879-9954-DAC1785C5E92}.Release|Any CPU.ActiveCfg = Release|Any CPU - {57F44BFA-7970-4879-9954-DAC1785C5E92}.Release|Any CPU.Build.0 = Release|Any CPU - {8ADE8115-46DE-4FCD-BF5D-BF782BAE7EE8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8ADE8115-46DE-4FCD-BF5D-BF782BAE7EE8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8ADE8115-46DE-4FCD-BF5D-BF782BAE7EE8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8ADE8115-46DE-4FCD-BF5D-BF782BAE7EE8}.Release|Any CPU.Build.0 = Release|Any CPU - {D24D2B65-0F4C-4A99-BEAB-7BF136EBBB30}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D24D2B65-0F4C-4A99-BEAB-7BF136EBBB30}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D24D2B65-0F4C-4A99-BEAB-7BF136EBBB30}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D24D2B65-0F4C-4A99-BEAB-7BF136EBBB30}.Release|Any CPU.Build.0 = Release|Any CPU - {ED3B6133-1463-4188-8291-770CC44EDD79}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {ED3B6133-1463-4188-8291-770CC44EDD79}.Debug|Any CPU.Build.0 = Debug|Any CPU - {ED3B6133-1463-4188-8291-770CC44EDD79}.Release|Any CPU.ActiveCfg = Release|Any CPU - {ED3B6133-1463-4188-8291-770CC44EDD79}.Release|Any CPU.Build.0 = Release|Any CPU - {8EE7CD44-DC7A-4AF2-AE79-94BB4D968EFB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8EE7CD44-DC7A-4AF2-AE79-94BB4D968EFB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8EE7CD44-DC7A-4AF2-AE79-94BB4D968EFB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8EE7CD44-DC7A-4AF2-AE79-94BB4D968EFB}.Release|Any CPU.Build.0 = Release|Any CPU - {B1CCF636-B3A1-425E-892E-7FB7BBF367D9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B1CCF636-B3A1-425E-892E-7FB7BBF367D9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B1CCF636-B3A1-425E-892E-7FB7BBF367D9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B1CCF636-B3A1-425E-892E-7FB7BBF367D9}.Release|Any CPU.Build.0 = Release|Any CPU - {B899ADDA-2A73-46F6-9865-16B91CE219E5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B899ADDA-2A73-46F6-9865-16B91CE219E5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B899ADDA-2A73-46F6-9865-16B91CE219E5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B899ADDA-2A73-46F6-9865-16B91CE219E5}.Release|Any CPU.Build.0 = Release|Any CPU - {44652FA4-BF53-457F-A313-6DAF96594E9D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {44652FA4-BF53-457F-A313-6DAF96594E9D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {44652FA4-BF53-457F-A313-6DAF96594E9D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {44652FA4-BF53-457F-A313-6DAF96594E9D}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {671F00DD-AF25-45B6-A1F7-B1AAE74EA208} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {22A73C54-3D5A-475C-8C79-0BE87733DF65} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {50AFC01F-30FD-458F-AFF8-A0C2C7E76317} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {7C13B707-4A26-4472-8608-A23CFBEE73D7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {E6EC8343-C654-470E-8435-53A2E8F611A5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {8B815ECB-40FD-44EE-A260-13D0E88F1AAC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {2FFFAAE2-3F3B-4DE6-9844-A35527DE1DC8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {57F44BFA-7970-4879-9954-DAC1785C5E92} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8ADE8115-46DE-4FCD-BF5D-BF782BAE7EE8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D24D2B65-0F4C-4A99-BEAB-7BF136EBBB30} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {ED3B6133-1463-4188-8291-770CC44EDD79} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8EE7CD44-DC7A-4AF2-AE79-94BB4D968EFB} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B1CCF636-B3A1-425E-892E-7FB7BBF367D9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B899ADDA-2A73-46F6-9865-16B91CE219E5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {44652FA4-BF53-457F-A313-6DAF96594E9D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {8B815ECB-40FD-44EE-A260-13D0E88F1AAC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {2FFFAAE2-3F3B-4DE6-9844-A35527DE1DC8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {57F44BFA-7970-4879-9954-DAC1785C5E92} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8ADE8115-46DE-4FCD-BF5D-BF782BAE7EE8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D24D2B65-0F4C-4A99-BEAB-7BF136EBBB30} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {ED3B6133-1463-4188-8291-770CC44EDD79} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8EE7CD44-DC7A-4AF2-AE79-94BB4D968EFB} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B1CCF636-B3A1-425E-892E-7FB7BBF367D9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B899ADDA-2A73-46F6-9865-16B91CE219E5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {44652FA4-BF53-457F-A313-6DAF96594E9D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {D00C6C70-AFED-4EA8-923D-3243F89A0157} diff --git a/sdk/src/Services/AppRegistry/Generated/AmazonAppRegistryConfig.cs b/sdk/src/Services/AppRegistry/Generated/AmazonAppRegistryConfig.cs index 49a6335c5c5e..2cc29b453af8 100644 --- a/sdk/src/Services/AppRegistry/Generated/AmazonAppRegistryConfig.cs +++ b/sdk/src/Services/AppRegistry/Generated/AmazonAppRegistryConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.AppRegistry public partial class AmazonAppRegistryConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("Service Catalog AppRegistry", "4.0.0.0"); private static readonly AmazonAppRegistryEndpointResolver EndpointResolver = new AmazonAppRegistryEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("Service Catalog AppRegistry", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("Service Catalog AppRegistry", "3.7.400.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/AppRegistry/Properties/AssemblyInfo.cs b/sdk/src/Services/AppRegistry/Properties/AssemblyInfo.cs index 323b415e3fad..43e70df0a2d6 100644 --- a/sdk/src/Services/AppRegistry/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/AppRegistry/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/AppRunner/AppRunner.sln b/sdk/src/Services/AppRunner/AppRunner.sln index 87bb80b25f44..525203d00c62 100644 --- a/sdk/src/Services/AppRunner/AppRunner.sln +++ b/sdk/src/Services/AppRunner/AppRunner.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {FAB99E8F-3E61-4F09-BC96-B38A6EDC4847}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {FAB99E8F-3E61-4F09-BC96-B38A6EDC4847}.Debug|Any CPU.Build.0 = Debug|Any CPU {FAB99E8F-3E61-4F09-BC96-B38A6EDC4847}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {25235D78-F5F6-4DA6-BFEF-9E9B7517AF0D}.Debug|Any CPU.Build.0 = Debug|Any CPU {25235D78-F5F6-4DA6-BFEF-9E9B7517AF0D}.Release|Any CPU.ActiveCfg = Release|Any CPU {25235D78-F5F6-4DA6-BFEF-9E9B7517AF0D}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {E69DD01E-3D4A-4BBB-9D0D-FCB565133159}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E69DD01E-3D4A-4BBB-9D0D-FCB565133159}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E69DD01E-3D4A-4BBB-9D0D-FCB565133159}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E69DD01E-3D4A-4BBB-9D0D-FCB565133159}.Release|Any CPU.Build.0 = Release|Any CPU - {3DB299B7-83C6-44FC-92CF-7B55FCF59746}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3DB299B7-83C6-44FC-92CF-7B55FCF59746}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3DB299B7-83C6-44FC-92CF-7B55FCF59746}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3DB299B7-83C6-44FC-92CF-7B55FCF59746}.Release|Any CPU.Build.0 = Release|Any CPU - {DFD08F34-72E9-402C-B4FC-C5E578CED4CC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DFD08F34-72E9-402C-B4FC-C5E578CED4CC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DFD08F34-72E9-402C-B4FC-C5E578CED4CC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DFD08F34-72E9-402C-B4FC-C5E578CED4CC}.Release|Any CPU.Build.0 = Release|Any CPU - {C5D4B9EC-A0F8-4C5F-8552-F17B3AE83261}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C5D4B9EC-A0F8-4C5F-8552-F17B3AE83261}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C5D4B9EC-A0F8-4C5F-8552-F17B3AE83261}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C5D4B9EC-A0F8-4C5F-8552-F17B3AE83261}.Release|Any CPU.Build.0 = Release|Any CPU - {E4080574-726B-4112-AB3C-73C303D920A4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E4080574-726B-4112-AB3C-73C303D920A4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E4080574-726B-4112-AB3C-73C303D920A4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E4080574-726B-4112-AB3C-73C303D920A4}.Release|Any CPU.Build.0 = Release|Any CPU - {AB4209F2-B132-4E2D-B370-3954121C1497}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AB4209F2-B132-4E2D-B370-3954121C1497}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AB4209F2-B132-4E2D-B370-3954121C1497}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AB4209F2-B132-4E2D-B370-3954121C1497}.Release|Any CPU.Build.0 = Release|Any CPU - {A659CDE3-BA12-4465-A47B-9F24ACBBC497}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A659CDE3-BA12-4465-A47B-9F24ACBBC497}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A659CDE3-BA12-4465-A47B-9F24ACBBC497}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A659CDE3-BA12-4465-A47B-9F24ACBBC497}.Release|Any CPU.Build.0 = Release|Any CPU - {0AD13BF5-F0E4-4AEE-9BC6-3751462F166C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0AD13BF5-F0E4-4AEE-9BC6-3751462F166C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0AD13BF5-F0E4-4AEE-9BC6-3751462F166C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0AD13BF5-F0E4-4AEE-9BC6-3751462F166C}.Release|Any CPU.Build.0 = Release|Any CPU - {805EEA48-E0D7-4F11-BFD2-9EEF76B3FD5B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {805EEA48-E0D7-4F11-BFD2-9EEF76B3FD5B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {805EEA48-E0D7-4F11-BFD2-9EEF76B3FD5B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {805EEA48-E0D7-4F11-BFD2-9EEF76B3FD5B}.Release|Any CPU.Build.0 = Release|Any CPU - {B902A2D3-DBEA-4AB3-A812-B5275B5877B0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B902A2D3-DBEA-4AB3-A812-B5275B5877B0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B902A2D3-DBEA-4AB3-A812-B5275B5877B0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B902A2D3-DBEA-4AB3-A812-B5275B5877B0}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {E69DD01E-3D4A-4BBB-9D0D-FCB565133159}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E69DD01E-3D4A-4BBB-9D0D-FCB565133159}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E69DD01E-3D4A-4BBB-9D0D-FCB565133159}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E69DD01E-3D4A-4BBB-9D0D-FCB565133159}.Release|Any CPU.Build.0 = Release|Any CPU - {3DB299B7-83C6-44FC-92CF-7B55FCF59746}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3DB299B7-83C6-44FC-92CF-7B55FCF59746}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3DB299B7-83C6-44FC-92CF-7B55FCF59746}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3DB299B7-83C6-44FC-92CF-7B55FCF59746}.Release|Any CPU.Build.0 = Release|Any CPU - {DFD08F34-72E9-402C-B4FC-C5E578CED4CC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DFD08F34-72E9-402C-B4FC-C5E578CED4CC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DFD08F34-72E9-402C-B4FC-C5E578CED4CC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DFD08F34-72E9-402C-B4FC-C5E578CED4CC}.Release|Any CPU.Build.0 = Release|Any CPU - {C5D4B9EC-A0F8-4C5F-8552-F17B3AE83261}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C5D4B9EC-A0F8-4C5F-8552-F17B3AE83261}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C5D4B9EC-A0F8-4C5F-8552-F17B3AE83261}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C5D4B9EC-A0F8-4C5F-8552-F17B3AE83261}.Release|Any CPU.Build.0 = Release|Any CPU - {E4080574-726B-4112-AB3C-73C303D920A4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E4080574-726B-4112-AB3C-73C303D920A4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E4080574-726B-4112-AB3C-73C303D920A4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E4080574-726B-4112-AB3C-73C303D920A4}.Release|Any CPU.Build.0 = Release|Any CPU - {AB4209F2-B132-4E2D-B370-3954121C1497}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AB4209F2-B132-4E2D-B370-3954121C1497}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AB4209F2-B132-4E2D-B370-3954121C1497}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AB4209F2-B132-4E2D-B370-3954121C1497}.Release|Any CPU.Build.0 = Release|Any CPU - {A659CDE3-BA12-4465-A47B-9F24ACBBC497}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A659CDE3-BA12-4465-A47B-9F24ACBBC497}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A659CDE3-BA12-4465-A47B-9F24ACBBC497}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A659CDE3-BA12-4465-A47B-9F24ACBBC497}.Release|Any CPU.Build.0 = Release|Any CPU - {0AD13BF5-F0E4-4AEE-9BC6-3751462F166C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0AD13BF5-F0E4-4AEE-9BC6-3751462F166C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0AD13BF5-F0E4-4AEE-9BC6-3751462F166C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0AD13BF5-F0E4-4AEE-9BC6-3751462F166C}.Release|Any CPU.Build.0 = Release|Any CPU - {805EEA48-E0D7-4F11-BFD2-9EEF76B3FD5B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {805EEA48-E0D7-4F11-BFD2-9EEF76B3FD5B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {805EEA48-E0D7-4F11-BFD2-9EEF76B3FD5B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {805EEA48-E0D7-4F11-BFD2-9EEF76B3FD5B}.Release|Any CPU.Build.0 = Release|Any CPU - {B902A2D3-DBEA-4AB3-A812-B5275B5877B0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B902A2D3-DBEA-4AB3-A812-B5275B5877B0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B902A2D3-DBEA-4AB3-A812-B5275B5877B0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B902A2D3-DBEA-4AB3-A812-B5275B5877B0}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {FAB99E8F-3E61-4F09-BC96-B38A6EDC4847} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {C7886FA8-7202-4540-894E-43BCB237294D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {7A7ADA18-131A-4048-8A11-15275EF0500B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {B4FB2E6A-8BE7-4610-873A-66B6AD320F0B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {25235D78-F5F6-4DA6-BFEF-9E9B7517AF0D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {E69DD01E-3D4A-4BBB-9D0D-FCB565133159} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {3DB299B7-83C6-44FC-92CF-7B55FCF59746} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {DFD08F34-72E9-402C-B4FC-C5E578CED4CC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C5D4B9EC-A0F8-4C5F-8552-F17B3AE83261} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E4080574-726B-4112-AB3C-73C303D920A4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {AB4209F2-B132-4E2D-B370-3954121C1497} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A659CDE3-BA12-4465-A47B-9F24ACBBC497} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0AD13BF5-F0E4-4AEE-9BC6-3751462F166C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {805EEA48-E0D7-4F11-BFD2-9EEF76B3FD5B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B902A2D3-DBEA-4AB3-A812-B5275B5877B0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {E69DD01E-3D4A-4BBB-9D0D-FCB565133159} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {3DB299B7-83C6-44FC-92CF-7B55FCF59746} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {DFD08F34-72E9-402C-B4FC-C5E578CED4CC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C5D4B9EC-A0F8-4C5F-8552-F17B3AE83261} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E4080574-726B-4112-AB3C-73C303D920A4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {AB4209F2-B132-4E2D-B370-3954121C1497} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A659CDE3-BA12-4465-A47B-9F24ACBBC497} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0AD13BF5-F0E4-4AEE-9BC6-3751462F166C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {805EEA48-E0D7-4F11-BFD2-9EEF76B3FD5B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B902A2D3-DBEA-4AB3-A812-B5275B5877B0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {2F2D6668-5809-4BE4-8C60-1A38E723AB13} diff --git a/sdk/src/Services/AppRunner/Generated/AmazonAppRunnerConfig.cs b/sdk/src/Services/AppRunner/Generated/AmazonAppRunnerConfig.cs index 3b9cb306be2f..d632054a8d1c 100644 --- a/sdk/src/Services/AppRunner/Generated/AmazonAppRunnerConfig.cs +++ b/sdk/src/Services/AppRunner/Generated/AmazonAppRunnerConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.AppRunner public partial class AmazonAppRunnerConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("AppRunner", "4.0.0.0"); private static readonly AmazonAppRunnerEndpointResolver EndpointResolver = new AmazonAppRunnerEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("AppRunner", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("AppRunner", "3.7.400.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/AppRunner/Properties/AssemblyInfo.cs b/sdk/src/Services/AppRunner/Properties/AssemblyInfo.cs index b3e7be05a619..6c5cdc14e534 100644 --- a/sdk/src/Services/AppRunner/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/AppRunner/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/AppStream/AppStream.sln b/sdk/src/Services/AppStream/AppStream.sln index d401b3dea508..feb0f0d1f54f 100644 --- a/sdk/src/Services/AppStream/AppStream.sln +++ b/sdk/src/Services/AppStream/AppStream.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {2BE4C637-6BBA-4584-AA15-B0739368EC23}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {2BE4C637-6BBA-4584-AA15-B0739368EC23}.Debug|Any CPU.Build.0 = Debug|Any CPU {2BE4C637-6BBA-4584-AA15-B0739368EC23}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {B7420E27-4B00-4031-887C-DDE98653AC54}.Debug|Any CPU.Build.0 = Debug|Any CPU {B7420E27-4B00-4031-887C-DDE98653AC54}.Release|Any CPU.ActiveCfg = Release|Any CPU {B7420E27-4B00-4031-887C-DDE98653AC54}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {806BFC76-EF1C-4048-A804-8313D748C1C9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {806BFC76-EF1C-4048-A804-8313D748C1C9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {806BFC76-EF1C-4048-A804-8313D748C1C9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {806BFC76-EF1C-4048-A804-8313D748C1C9}.Release|Any CPU.Build.0 = Release|Any CPU - {3C9AE4B2-0801-45CF-8E48-DEF9DCF22589}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3C9AE4B2-0801-45CF-8E48-DEF9DCF22589}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3C9AE4B2-0801-45CF-8E48-DEF9DCF22589}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3C9AE4B2-0801-45CF-8E48-DEF9DCF22589}.Release|Any CPU.Build.0 = Release|Any CPU - {499BF895-549B-41C0-BB7B-ABE590F4F25B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {499BF895-549B-41C0-BB7B-ABE590F4F25B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {499BF895-549B-41C0-BB7B-ABE590F4F25B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {499BF895-549B-41C0-BB7B-ABE590F4F25B}.Release|Any CPU.Build.0 = Release|Any CPU - {C520CD3B-C0A8-4A74-A229-95B6BC0A11FA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C520CD3B-C0A8-4A74-A229-95B6BC0A11FA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C520CD3B-C0A8-4A74-A229-95B6BC0A11FA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C520CD3B-C0A8-4A74-A229-95B6BC0A11FA}.Release|Any CPU.Build.0 = Release|Any CPU - {0EA00406-C1D9-48D8-AF25-86BAC14079B9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0EA00406-C1D9-48D8-AF25-86BAC14079B9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0EA00406-C1D9-48D8-AF25-86BAC14079B9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0EA00406-C1D9-48D8-AF25-86BAC14079B9}.Release|Any CPU.Build.0 = Release|Any CPU - {07719FD1-9CF3-486A-ABDD-18A0E28D952A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {07719FD1-9CF3-486A-ABDD-18A0E28D952A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {07719FD1-9CF3-486A-ABDD-18A0E28D952A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {07719FD1-9CF3-486A-ABDD-18A0E28D952A}.Release|Any CPU.Build.0 = Release|Any CPU - {D8FEB856-179E-4D4B-A8A9-9F729E36E6BB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D8FEB856-179E-4D4B-A8A9-9F729E36E6BB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D8FEB856-179E-4D4B-A8A9-9F729E36E6BB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D8FEB856-179E-4D4B-A8A9-9F729E36E6BB}.Release|Any CPU.Build.0 = Release|Any CPU - {DF49BCD1-FF31-41CF-BFBE-EA1E43865C7E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DF49BCD1-FF31-41CF-BFBE-EA1E43865C7E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DF49BCD1-FF31-41CF-BFBE-EA1E43865C7E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DF49BCD1-FF31-41CF-BFBE-EA1E43865C7E}.Release|Any CPU.Build.0 = Release|Any CPU - {7C2B8DDF-6C16-42DF-9135-122F98CF7B5C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7C2B8DDF-6C16-42DF-9135-122F98CF7B5C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7C2B8DDF-6C16-42DF-9135-122F98CF7B5C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7C2B8DDF-6C16-42DF-9135-122F98CF7B5C}.Release|Any CPU.Build.0 = Release|Any CPU - {6ED52059-E42E-41EA-85D9-24D56B6237F5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6ED52059-E42E-41EA-85D9-24D56B6237F5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6ED52059-E42E-41EA-85D9-24D56B6237F5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6ED52059-E42E-41EA-85D9-24D56B6237F5}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {806BFC76-EF1C-4048-A804-8313D748C1C9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {806BFC76-EF1C-4048-A804-8313D748C1C9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {806BFC76-EF1C-4048-A804-8313D748C1C9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {806BFC76-EF1C-4048-A804-8313D748C1C9}.Release|Any CPU.Build.0 = Release|Any CPU - {3C9AE4B2-0801-45CF-8E48-DEF9DCF22589}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3C9AE4B2-0801-45CF-8E48-DEF9DCF22589}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3C9AE4B2-0801-45CF-8E48-DEF9DCF22589}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3C9AE4B2-0801-45CF-8E48-DEF9DCF22589}.Release|Any CPU.Build.0 = Release|Any CPU - {499BF895-549B-41C0-BB7B-ABE590F4F25B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {499BF895-549B-41C0-BB7B-ABE590F4F25B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {499BF895-549B-41C0-BB7B-ABE590F4F25B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {499BF895-549B-41C0-BB7B-ABE590F4F25B}.Release|Any CPU.Build.0 = Release|Any CPU - {C520CD3B-C0A8-4A74-A229-95B6BC0A11FA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C520CD3B-C0A8-4A74-A229-95B6BC0A11FA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C520CD3B-C0A8-4A74-A229-95B6BC0A11FA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C520CD3B-C0A8-4A74-A229-95B6BC0A11FA}.Release|Any CPU.Build.0 = Release|Any CPU - {0EA00406-C1D9-48D8-AF25-86BAC14079B9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0EA00406-C1D9-48D8-AF25-86BAC14079B9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0EA00406-C1D9-48D8-AF25-86BAC14079B9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0EA00406-C1D9-48D8-AF25-86BAC14079B9}.Release|Any CPU.Build.0 = Release|Any CPU - {07719FD1-9CF3-486A-ABDD-18A0E28D952A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {07719FD1-9CF3-486A-ABDD-18A0E28D952A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {07719FD1-9CF3-486A-ABDD-18A0E28D952A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {07719FD1-9CF3-486A-ABDD-18A0E28D952A}.Release|Any CPU.Build.0 = Release|Any CPU - {D8FEB856-179E-4D4B-A8A9-9F729E36E6BB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D8FEB856-179E-4D4B-A8A9-9F729E36E6BB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D8FEB856-179E-4D4B-A8A9-9F729E36E6BB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D8FEB856-179E-4D4B-A8A9-9F729E36E6BB}.Release|Any CPU.Build.0 = Release|Any CPU - {DF49BCD1-FF31-41CF-BFBE-EA1E43865C7E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DF49BCD1-FF31-41CF-BFBE-EA1E43865C7E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DF49BCD1-FF31-41CF-BFBE-EA1E43865C7E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DF49BCD1-FF31-41CF-BFBE-EA1E43865C7E}.Release|Any CPU.Build.0 = Release|Any CPU - {7C2B8DDF-6C16-42DF-9135-122F98CF7B5C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7C2B8DDF-6C16-42DF-9135-122F98CF7B5C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7C2B8DDF-6C16-42DF-9135-122F98CF7B5C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7C2B8DDF-6C16-42DF-9135-122F98CF7B5C}.Release|Any CPU.Build.0 = Release|Any CPU - {6ED52059-E42E-41EA-85D9-24D56B6237F5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6ED52059-E42E-41EA-85D9-24D56B6237F5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6ED52059-E42E-41EA-85D9-24D56B6237F5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6ED52059-E42E-41EA-85D9-24D56B6237F5}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {2BE4C637-6BBA-4584-AA15-B0739368EC23} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {0E7102E2-622C-4F94-89E1-3AA4EF53DBFC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {41EA34D5-87B5-446E-8580-FBEAD0F4E93F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {94506264-6ABA-4670-B406-A0286DBE515F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {B7420E27-4B00-4031-887C-DDE98653AC54} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {806BFC76-EF1C-4048-A804-8313D748C1C9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {3C9AE4B2-0801-45CF-8E48-DEF9DCF22589} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {499BF895-549B-41C0-BB7B-ABE590F4F25B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C520CD3B-C0A8-4A74-A229-95B6BC0A11FA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0EA00406-C1D9-48D8-AF25-86BAC14079B9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {07719FD1-9CF3-486A-ABDD-18A0E28D952A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D8FEB856-179E-4D4B-A8A9-9F729E36E6BB} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {DF49BCD1-FF31-41CF-BFBE-EA1E43865C7E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {7C2B8DDF-6C16-42DF-9135-122F98CF7B5C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6ED52059-E42E-41EA-85D9-24D56B6237F5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {806BFC76-EF1C-4048-A804-8313D748C1C9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {3C9AE4B2-0801-45CF-8E48-DEF9DCF22589} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {499BF895-549B-41C0-BB7B-ABE590F4F25B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C520CD3B-C0A8-4A74-A229-95B6BC0A11FA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0EA00406-C1D9-48D8-AF25-86BAC14079B9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {07719FD1-9CF3-486A-ABDD-18A0E28D952A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D8FEB856-179E-4D4B-A8A9-9F729E36E6BB} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {DF49BCD1-FF31-41CF-BFBE-EA1E43865C7E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {7C2B8DDF-6C16-42DF-9135-122F98CF7B5C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6ED52059-E42E-41EA-85D9-24D56B6237F5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {598F3751-34EE-432D-82F8-92FE5E537153} diff --git a/sdk/src/Services/AppStream/Generated/AmazonAppStreamConfig.cs b/sdk/src/Services/AppStream/Generated/AmazonAppStreamConfig.cs index 7ff1b67cd011..c46f6a32e818 100644 --- a/sdk/src/Services/AppStream/Generated/AmazonAppStreamConfig.cs +++ b/sdk/src/Services/AppStream/Generated/AmazonAppStreamConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.AppStream public partial class AmazonAppStreamConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("AppStream", "4.0.0.0"); private static readonly AmazonAppStreamEndpointResolver EndpointResolver = new AmazonAppStreamEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("AppStream", "3.7.402.21"); -======= - InternalSDKUtils.BuildUserAgentString("AppStream", "3.7.403.25"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/AppStream/Properties/AssemblyInfo.cs b/sdk/src/Services/AppStream/Properties/AssemblyInfo.cs index c3ce01e00bed..f5a0356722d3 100644 --- a/sdk/src/Services/AppStream/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/AppStream/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.402.21")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.403.25")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/AppSync/AppSync.sln b/sdk/src/Services/AppSync/AppSync.sln index 2ca5cce31c59..39755e613131 100644 --- a/sdk/src/Services/AppSync/AppSync.sln +++ b/sdk/src/Services/AppSync/AppSync.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {B269FF13-51F5-4BFA-98F9-0DF1D5F22841}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {B269FF13-51F5-4BFA-98F9-0DF1D5F22841}.Debug|Any CPU.Build.0 = Debug|Any CPU {B269FF13-51F5-4BFA-98F9-0DF1D5F22841}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {FB34EDDD-E38A-43A6-937B-5B46ACC4C7D8}.Debug|Any CPU.Build.0 = Debug|Any CPU {FB34EDDD-E38A-43A6-937B-5B46ACC4C7D8}.Release|Any CPU.ActiveCfg = Release|Any CPU {FB34EDDD-E38A-43A6-937B-5B46ACC4C7D8}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {A02E67F7-142F-4D8A-A512-BAA87FC1CA79}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A02E67F7-142F-4D8A-A512-BAA87FC1CA79}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A02E67F7-142F-4D8A-A512-BAA87FC1CA79}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A02E67F7-142F-4D8A-A512-BAA87FC1CA79}.Release|Any CPU.Build.0 = Release|Any CPU - {9736EA6A-6284-4119-AA00-2E108C3FCD35}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9736EA6A-6284-4119-AA00-2E108C3FCD35}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9736EA6A-6284-4119-AA00-2E108C3FCD35}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9736EA6A-6284-4119-AA00-2E108C3FCD35}.Release|Any CPU.Build.0 = Release|Any CPU - {2B125FF2-CF5A-47BC-BF57-C580222A330F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2B125FF2-CF5A-47BC-BF57-C580222A330F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2B125FF2-CF5A-47BC-BF57-C580222A330F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2B125FF2-CF5A-47BC-BF57-C580222A330F}.Release|Any CPU.Build.0 = Release|Any CPU - {FD454E8C-935C-47EC-BD92-FC8509A8997E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FD454E8C-935C-47EC-BD92-FC8509A8997E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FD454E8C-935C-47EC-BD92-FC8509A8997E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FD454E8C-935C-47EC-BD92-FC8509A8997E}.Release|Any CPU.Build.0 = Release|Any CPU - {34125F31-A3A2-4BD4-B8ED-5B97D13D8E1B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {34125F31-A3A2-4BD4-B8ED-5B97D13D8E1B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {34125F31-A3A2-4BD4-B8ED-5B97D13D8E1B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {34125F31-A3A2-4BD4-B8ED-5B97D13D8E1B}.Release|Any CPU.Build.0 = Release|Any CPU - {D8674F85-8BA6-4011-9FF8-4A2FD6A03F99}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D8674F85-8BA6-4011-9FF8-4A2FD6A03F99}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D8674F85-8BA6-4011-9FF8-4A2FD6A03F99}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D8674F85-8BA6-4011-9FF8-4A2FD6A03F99}.Release|Any CPU.Build.0 = Release|Any CPU - {54814585-519F-48B2-96DD-F65D83445B3A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {54814585-519F-48B2-96DD-F65D83445B3A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {54814585-519F-48B2-96DD-F65D83445B3A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {54814585-519F-48B2-96DD-F65D83445B3A}.Release|Any CPU.Build.0 = Release|Any CPU - {85FD9518-84EE-4403-849A-5DA821348906}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {85FD9518-84EE-4403-849A-5DA821348906}.Debug|Any CPU.Build.0 = Debug|Any CPU - {85FD9518-84EE-4403-849A-5DA821348906}.Release|Any CPU.ActiveCfg = Release|Any CPU - {85FD9518-84EE-4403-849A-5DA821348906}.Release|Any CPU.Build.0 = Release|Any CPU - {49E34BAC-DD4D-4DC6-8A55-492D885891BC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {49E34BAC-DD4D-4DC6-8A55-492D885891BC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {49E34BAC-DD4D-4DC6-8A55-492D885891BC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {49E34BAC-DD4D-4DC6-8A55-492D885891BC}.Release|Any CPU.Build.0 = Release|Any CPU - {3CCD2439-A251-4C5A-B98D-111EC6941F71}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3CCD2439-A251-4C5A-B98D-111EC6941F71}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3CCD2439-A251-4C5A-B98D-111EC6941F71}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3CCD2439-A251-4C5A-B98D-111EC6941F71}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {A02E67F7-142F-4D8A-A512-BAA87FC1CA79}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A02E67F7-142F-4D8A-A512-BAA87FC1CA79}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A02E67F7-142F-4D8A-A512-BAA87FC1CA79}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A02E67F7-142F-4D8A-A512-BAA87FC1CA79}.Release|Any CPU.Build.0 = Release|Any CPU - {9736EA6A-6284-4119-AA00-2E108C3FCD35}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9736EA6A-6284-4119-AA00-2E108C3FCD35}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9736EA6A-6284-4119-AA00-2E108C3FCD35}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9736EA6A-6284-4119-AA00-2E108C3FCD35}.Release|Any CPU.Build.0 = Release|Any CPU - {2B125FF2-CF5A-47BC-BF57-C580222A330F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2B125FF2-CF5A-47BC-BF57-C580222A330F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2B125FF2-CF5A-47BC-BF57-C580222A330F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2B125FF2-CF5A-47BC-BF57-C580222A330F}.Release|Any CPU.Build.0 = Release|Any CPU - {FD454E8C-935C-47EC-BD92-FC8509A8997E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FD454E8C-935C-47EC-BD92-FC8509A8997E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FD454E8C-935C-47EC-BD92-FC8509A8997E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FD454E8C-935C-47EC-BD92-FC8509A8997E}.Release|Any CPU.Build.0 = Release|Any CPU - {34125F31-A3A2-4BD4-B8ED-5B97D13D8E1B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {34125F31-A3A2-4BD4-B8ED-5B97D13D8E1B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {34125F31-A3A2-4BD4-B8ED-5B97D13D8E1B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {34125F31-A3A2-4BD4-B8ED-5B97D13D8E1B}.Release|Any CPU.Build.0 = Release|Any CPU - {D8674F85-8BA6-4011-9FF8-4A2FD6A03F99}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D8674F85-8BA6-4011-9FF8-4A2FD6A03F99}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D8674F85-8BA6-4011-9FF8-4A2FD6A03F99}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D8674F85-8BA6-4011-9FF8-4A2FD6A03F99}.Release|Any CPU.Build.0 = Release|Any CPU - {54814585-519F-48B2-96DD-F65D83445B3A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {54814585-519F-48B2-96DD-F65D83445B3A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {54814585-519F-48B2-96DD-F65D83445B3A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {54814585-519F-48B2-96DD-F65D83445B3A}.Release|Any CPU.Build.0 = Release|Any CPU - {85FD9518-84EE-4403-849A-5DA821348906}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {85FD9518-84EE-4403-849A-5DA821348906}.Debug|Any CPU.Build.0 = Debug|Any CPU - {85FD9518-84EE-4403-849A-5DA821348906}.Release|Any CPU.ActiveCfg = Release|Any CPU - {85FD9518-84EE-4403-849A-5DA821348906}.Release|Any CPU.Build.0 = Release|Any CPU - {49E34BAC-DD4D-4DC6-8A55-492D885891BC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {49E34BAC-DD4D-4DC6-8A55-492D885891BC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {49E34BAC-DD4D-4DC6-8A55-492D885891BC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {49E34BAC-DD4D-4DC6-8A55-492D885891BC}.Release|Any CPU.Build.0 = Release|Any CPU - {3CCD2439-A251-4C5A-B98D-111EC6941F71}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3CCD2439-A251-4C5A-B98D-111EC6941F71}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3CCD2439-A251-4C5A-B98D-111EC6941F71}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3CCD2439-A251-4C5A-B98D-111EC6941F71}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {B269FF13-51F5-4BFA-98F9-0DF1D5F22841} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {24370ED7-7B1C-493F-856B-F302E39D2895} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {2472FFDD-4D5D-4FE1-AF9D-410952B5CE42} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {820DA9F9-39D1-4662-9E2C-558D932E62F1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {FB34EDDD-E38A-43A6-937B-5B46ACC4C7D8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {A02E67F7-142F-4D8A-A512-BAA87FC1CA79} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {9736EA6A-6284-4119-AA00-2E108C3FCD35} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {2B125FF2-CF5A-47BC-BF57-C580222A330F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {FD454E8C-935C-47EC-BD92-FC8509A8997E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {34125F31-A3A2-4BD4-B8ED-5B97D13D8E1B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D8674F85-8BA6-4011-9FF8-4A2FD6A03F99} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {54814585-519F-48B2-96DD-F65D83445B3A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {85FD9518-84EE-4403-849A-5DA821348906} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {49E34BAC-DD4D-4DC6-8A55-492D885891BC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {3CCD2439-A251-4C5A-B98D-111EC6941F71} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {A02E67F7-142F-4D8A-A512-BAA87FC1CA79} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {9736EA6A-6284-4119-AA00-2E108C3FCD35} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {2B125FF2-CF5A-47BC-BF57-C580222A330F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {FD454E8C-935C-47EC-BD92-FC8509A8997E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {34125F31-A3A2-4BD4-B8ED-5B97D13D8E1B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D8674F85-8BA6-4011-9FF8-4A2FD6A03F99} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {54814585-519F-48B2-96DD-F65D83445B3A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {85FD9518-84EE-4403-849A-5DA821348906} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {49E34BAC-DD4D-4DC6-8A55-492D885891BC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {3CCD2439-A251-4C5A-B98D-111EC6941F71} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {7BC067E4-1B99-4E21-9208-6449DC15DA34} diff --git a/sdk/src/Services/AppSync/Generated/AmazonAppSyncConfig.cs b/sdk/src/Services/AppSync/Generated/AmazonAppSyncConfig.cs index d1e00b70feff..2e09d3570c64 100644 --- a/sdk/src/Services/AppSync/Generated/AmazonAppSyncConfig.cs +++ b/sdk/src/Services/AppSync/Generated/AmazonAppSyncConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.AppSync public partial class AmazonAppSyncConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("AppSync", "4.0.0.0"); private static readonly AmazonAppSyncEndpointResolver EndpointResolver = new AmazonAppSyncEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("AppSync", "3.7.401.12"); -======= - InternalSDKUtils.BuildUserAgentString("AppSync", "3.7.402.10"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/AppSync/Generated/Model/Api.cs b/sdk/src/Services/AppSync/Generated/Model/Api.cs index d05f6ee5b0f3..95af3ab5faf4 100644 --- a/sdk/src/Services/AppSync/Generated/Model/Api.cs +++ b/sdk/src/Services/AppSync/Generated/Model/Api.cs @@ -89,9 +89,9 @@ internal bool IsSetApiId() /// The date and time that the Api was created. /// /// - public DateTime Created + public DateTime? Created { - get { return this._created.GetValueOrDefault(); } + get { return this._created; } set { this._created = value; } } @@ -217,9 +217,9 @@ internal bool IsSetWafWebAclArn() /// A flag indicating whether to use X-Ray tracing for this Api. /// /// - public bool XrayEnabled + public bool? XrayEnabled { - get { return this._xrayEnabled.GetValueOrDefault(); } + get { return this._xrayEnabled; } set { this._xrayEnabled = value; } } diff --git a/sdk/src/Services/AppSync/Generated/Model/ChannelNamespace.cs b/sdk/src/Services/AppSync/Generated/Model/ChannelNamespace.cs index f1a088612462..03065c08c34d 100644 --- a/sdk/src/Services/AppSync/Generated/Model/ChannelNamespace.cs +++ b/sdk/src/Services/AppSync/Generated/Model/ChannelNamespace.cs @@ -107,9 +107,9 @@ internal bool IsSetCodeHandlers() /// The date and time that the ChannelNamespace was created. /// /// - public DateTime Created + public DateTime? Created { - get { return this._created.GetValueOrDefault(); } + get { return this._created; } set { this._created = value; } } @@ -125,9 +125,9 @@ internal bool IsSetCreated() /// The date and time that the ChannelNamespace was last changed. /// /// - public DateTime LastModified + public DateTime? LastModified { - get { return this._lastModified.GetValueOrDefault(); } + get { return this._lastModified; } set { this._lastModified = value; } } diff --git a/sdk/src/Services/AppSync/Generated/Model/ConflictException.cs b/sdk/src/Services/AppSync/Generated/Model/ConflictException.cs index 615b3e069cfe..b0f45a03d88c 100644 --- a/sdk/src/Services/AppSync/Generated/Model/ConflictException.cs +++ b/sdk/src/Services/AppSync/Generated/Model/ConflictException.cs @@ -108,11 +108,6 @@ protected ConflictException(System.Runtime.Serialization.SerializationInfo info, /// The that holds the serialized object data about the exception being thrown. /// The that contains contextual information about the source or destination. /// The parameter is a null reference (Nothing in Visual Basic). -#if BCL35 - [System.Security.Permissions.SecurityPermission( - System.Security.Permissions.SecurityAction.LinkDemand, - Flags = System.Security.Permissions.SecurityPermissionFlag.SerializationFormatter)] -#endif [System.Security.SecurityCritical] // These FxCop rules are giving false-positives for this method [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Security", "CA2123:OverrideLinkDemandsShouldBeIdenticalToBase")] diff --git a/sdk/src/Services/AppSync/Generated/Model/Internal/MarshallTransformations/ApiUnmarshaller.cs b/sdk/src/Services/AppSync/Generated/Model/Internal/MarshallTransformations/ApiUnmarshaller.cs index d024608dcb6b..71754711d4f3 100644 --- a/sdk/src/Services/AppSync/Generated/Model/Internal/MarshallTransformations/ApiUnmarshaller.cs +++ b/sdk/src/Services/AppSync/Generated/Model/Internal/MarshallTransformations/ApiUnmarshaller.cs @@ -80,7 +80,7 @@ public Api Unmarshall(JsonUnmarshallerContext context) } if (context.TestExpression("created", targetDepth)) { - var unmarshaller = DateTimeUnmarshaller.Instance; + var unmarshaller = NullableDateTimeUnmarshaller.Instance; unmarshalledObject.Created = unmarshaller.Unmarshall(context); continue; } @@ -122,7 +122,7 @@ public Api Unmarshall(JsonUnmarshallerContext context) } if (context.TestExpression("xrayEnabled", targetDepth)) { - var unmarshaller = BoolUnmarshaller.Instance; + var unmarshaller = NullableBoolUnmarshaller.Instance; unmarshalledObject.XrayEnabled = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/AppSync/Generated/Model/Internal/MarshallTransformations/ChannelNamespaceUnmarshaller.cs b/sdk/src/Services/AppSync/Generated/Model/Internal/MarshallTransformations/ChannelNamespaceUnmarshaller.cs index 7c62c9d16d0c..b9f7e2ac8f4d 100644 --- a/sdk/src/Services/AppSync/Generated/Model/Internal/MarshallTransformations/ChannelNamespaceUnmarshaller.cs +++ b/sdk/src/Services/AppSync/Generated/Model/Internal/MarshallTransformations/ChannelNamespaceUnmarshaller.cs @@ -86,13 +86,13 @@ public ChannelNamespace Unmarshall(JsonUnmarshallerContext context) } if (context.TestExpression("created", targetDepth)) { - var unmarshaller = DateTimeUnmarshaller.Instance; + var unmarshaller = NullableDateTimeUnmarshaller.Instance; unmarshalledObject.Created = unmarshaller.Unmarshall(context); continue; } if (context.TestExpression("lastModified", targetDepth)) { - var unmarshaller = DateTimeUnmarshaller.Instance; + var unmarshaller = NullableDateTimeUnmarshaller.Instance; unmarshalledObject.LastModified = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/AppSync/Generated/Model/Internal/MarshallTransformations/CreateApiRequestMarshaller.cs b/sdk/src/Services/AppSync/Generated/Model/Internal/MarshallTransformations/CreateApiRequestMarshaller.cs index ed3233a9eb9f..046b9af299fc 100644 --- a/sdk/src/Services/AppSync/Generated/Model/Internal/MarshallTransformations/CreateApiRequestMarshaller.cs +++ b/sdk/src/Services/AppSync/Generated/Model/Internal/MarshallTransformations/CreateApiRequestMarshaller.cs @@ -61,52 +61,55 @@ public IRequest Marshall(CreateApiRequest publicRequest) request.HttpMethod = "POST"; request.ResourcePath = "/v2/apis"; - using (StringWriter stringWriter = new StringWriter(CultureInfo.InvariantCulture)) + using (MemoryStream memoryStream = new MemoryStream()) { - JsonWriter writer = new JsonWriter(stringWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetEventConfig()) + using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) { - context.Writer.WritePropertyName("eventConfig"); - context.Writer.WriteObjectStart(); - - var marshaller = EventConfigMarshaller.Instance; - marshaller.Marshall(publicRequest.EventConfig, context); + JsonWriter writer = new JsonWriter(streamWriter); + writer.Validate = false; + writer.WriteObjectStart(); + var context = new JsonMarshallerContext(request, writer); + if(publicRequest.IsSetEventConfig()) + { + context.Writer.WritePropertyName("eventConfig"); + context.Writer.WriteObjectStart(); - context.Writer.WriteObjectEnd(); - } + var marshaller = EventConfigMarshaller.Instance; + marshaller.Marshall(publicRequest.EventConfig, context); - if(publicRequest.IsSetName()) - { - context.Writer.WritePropertyName("name"); - context.Writer.Write(publicRequest.Name); - } + context.Writer.WriteObjectEnd(); + } - if(publicRequest.IsSetOwnerContact()) - { - context.Writer.WritePropertyName("ownerContact"); - context.Writer.Write(publicRequest.OwnerContact); - } + if(publicRequest.IsSetName()) + { + context.Writer.WritePropertyName("name"); + context.Writer.Write(publicRequest.Name); + } - if(publicRequest.IsSetTags()) - { - context.Writer.WritePropertyName("tags"); - context.Writer.WriteObjectStart(); - foreach (var publicRequestTagsKvp in publicRequest.Tags) + if(publicRequest.IsSetOwnerContact()) { - context.Writer.WritePropertyName(publicRequestTagsKvp.Key); - var publicRequestTagsValue = publicRequestTagsKvp.Value; + context.Writer.WritePropertyName("ownerContact"); + context.Writer.Write(publicRequest.OwnerContact); + } - context.Writer.Write(publicRequestTagsValue); + if(publicRequest.IsSetTags()) + { + context.Writer.WritePropertyName("tags"); + context.Writer.WriteObjectStart(); + foreach (var publicRequestTagsKvp in publicRequest.Tags) + { + context.Writer.WritePropertyName(publicRequestTagsKvp.Key); + var publicRequestTagsValue = publicRequestTagsKvp.Value; + + context.Writer.Write(publicRequestTagsValue); + } + context.Writer.WriteObjectEnd(); } - context.Writer.WriteObjectEnd(); + + writer.WriteObjectEnd(); } - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); + request.Content = memoryStream.ToArray(); } diff --git a/sdk/src/Services/AppSync/Generated/Model/Internal/MarshallTransformations/CreateChannelNamespaceRequestMarshaller.cs b/sdk/src/Services/AppSync/Generated/Model/Internal/MarshallTransformations/CreateChannelNamespaceRequestMarshaller.cs index 4e5811a6f325..c91bff39859a 100644 --- a/sdk/src/Services/AppSync/Generated/Model/Internal/MarshallTransformations/CreateChannelNamespaceRequestMarshaller.cs +++ b/sdk/src/Services/AppSync/Generated/Model/Internal/MarshallTransformations/CreateChannelNamespaceRequestMarshaller.cs @@ -64,73 +64,76 @@ public IRequest Marshall(CreateChannelNamespaceRequest publicRequest) throw new AmazonAppSyncException("Request object does not have required field ApiId set"); request.AddPathResource("{apiId}", StringUtils.FromString(publicRequest.ApiId)); request.ResourcePath = "/v2/apis/{apiId}/channelNamespaces"; - using (StringWriter stringWriter = new StringWriter(CultureInfo.InvariantCulture)) + using (MemoryStream memoryStream = new MemoryStream()) { - JsonWriter writer = new JsonWriter(stringWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetCodeHandlers()) + using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) { - context.Writer.WritePropertyName("codeHandlers"); - context.Writer.Write(publicRequest.CodeHandlers); - } - - if(publicRequest.IsSetName()) - { - context.Writer.WritePropertyName("name"); - context.Writer.Write(publicRequest.Name); - } + JsonWriter writer = new JsonWriter(streamWriter); + writer.Validate = false; + writer.WriteObjectStart(); + var context = new JsonMarshallerContext(request, writer); + if(publicRequest.IsSetCodeHandlers()) + { + context.Writer.WritePropertyName("codeHandlers"); + context.Writer.Write(publicRequest.CodeHandlers); + } - if(publicRequest.IsSetPublishAuthModes()) - { - context.Writer.WritePropertyName("publishAuthModes"); - context.Writer.WriteArrayStart(); - foreach(var publicRequestPublishAuthModesListValue in publicRequest.PublishAuthModes) + if(publicRequest.IsSetName()) { - context.Writer.WriteObjectStart(); + context.Writer.WritePropertyName("name"); + context.Writer.Write(publicRequest.Name); + } - var marshaller = AuthModeMarshaller.Instance; - marshaller.Marshall(publicRequestPublishAuthModesListValue, context); + if(publicRequest.IsSetPublishAuthModes()) + { + context.Writer.WritePropertyName("publishAuthModes"); + context.Writer.WriteArrayStart(); + foreach(var publicRequestPublishAuthModesListValue in publicRequest.PublishAuthModes) + { + context.Writer.WriteObjectStart(); + + var marshaller = AuthModeMarshaller.Instance; + marshaller.Marshall(publicRequestPublishAuthModesListValue, context); + + context.Writer.WriteObjectEnd(); + } + context.Writer.WriteArrayEnd(); + } - context.Writer.WriteObjectEnd(); + if(publicRequest.IsSetSubscribeAuthModes()) + { + context.Writer.WritePropertyName("subscribeAuthModes"); + context.Writer.WriteArrayStart(); + foreach(var publicRequestSubscribeAuthModesListValue in publicRequest.SubscribeAuthModes) + { + context.Writer.WriteObjectStart(); + + var marshaller = AuthModeMarshaller.Instance; + marshaller.Marshall(publicRequestSubscribeAuthModesListValue, context); + + context.Writer.WriteObjectEnd(); + } + context.Writer.WriteArrayEnd(); } - context.Writer.WriteArrayEnd(); - } - if(publicRequest.IsSetSubscribeAuthModes()) - { - context.Writer.WritePropertyName("subscribeAuthModes"); - context.Writer.WriteArrayStart(); - foreach(var publicRequestSubscribeAuthModesListValue in publicRequest.SubscribeAuthModes) + if(publicRequest.IsSetTags()) { + context.Writer.WritePropertyName("tags"); context.Writer.WriteObjectStart(); + foreach (var publicRequestTagsKvp in publicRequest.Tags) + { + context.Writer.WritePropertyName(publicRequestTagsKvp.Key); + var publicRequestTagsValue = publicRequestTagsKvp.Value; - var marshaller = AuthModeMarshaller.Instance; - marshaller.Marshall(publicRequestSubscribeAuthModesListValue, context); - + context.Writer.Write(publicRequestTagsValue); + } context.Writer.WriteObjectEnd(); } - context.Writer.WriteArrayEnd(); - } - if(publicRequest.IsSetTags()) - { - context.Writer.WritePropertyName("tags"); - context.Writer.WriteObjectStart(); - foreach (var publicRequestTagsKvp in publicRequest.Tags) - { - context.Writer.WritePropertyName(publicRequestTagsKvp.Key); - var publicRequestTagsValue = publicRequestTagsKvp.Value; - - context.Writer.Write(publicRequestTagsValue); - } - context.Writer.WriteObjectEnd(); + writer.WriteObjectEnd(); } - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); + request.Content = memoryStream.ToArray(); } diff --git a/sdk/src/Services/AppSync/Generated/Model/Internal/MarshallTransformations/UpdateApiRequestMarshaller.cs b/sdk/src/Services/AppSync/Generated/Model/Internal/MarshallTransformations/UpdateApiRequestMarshaller.cs index 0626599bde60..07fa708ecbe7 100644 --- a/sdk/src/Services/AppSync/Generated/Model/Internal/MarshallTransformations/UpdateApiRequestMarshaller.cs +++ b/sdk/src/Services/AppSync/Generated/Model/Internal/MarshallTransformations/UpdateApiRequestMarshaller.cs @@ -64,38 +64,41 @@ public IRequest Marshall(UpdateApiRequest publicRequest) throw new AmazonAppSyncException("Request object does not have required field ApiId set"); request.AddPathResource("{apiId}", StringUtils.FromString(publicRequest.ApiId)); request.ResourcePath = "/v2/apis/{apiId}"; - using (StringWriter stringWriter = new StringWriter(CultureInfo.InvariantCulture)) + using (MemoryStream memoryStream = new MemoryStream()) { - JsonWriter writer = new JsonWriter(stringWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetEventConfig()) + using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) { - context.Writer.WritePropertyName("eventConfig"); - context.Writer.WriteObjectStart(); + JsonWriter writer = new JsonWriter(streamWriter); + writer.Validate = false; + writer.WriteObjectStart(); + var context = new JsonMarshallerContext(request, writer); + if(publicRequest.IsSetEventConfig()) + { + context.Writer.WritePropertyName("eventConfig"); + context.Writer.WriteObjectStart(); - var marshaller = EventConfigMarshaller.Instance; - marshaller.Marshall(publicRequest.EventConfig, context); + var marshaller = EventConfigMarshaller.Instance; + marshaller.Marshall(publicRequest.EventConfig, context); - context.Writer.WriteObjectEnd(); - } + context.Writer.WriteObjectEnd(); + } - if(publicRequest.IsSetName()) - { - context.Writer.WritePropertyName("name"); - context.Writer.Write(publicRequest.Name); - } + if(publicRequest.IsSetName()) + { + context.Writer.WritePropertyName("name"); + context.Writer.Write(publicRequest.Name); + } - if(publicRequest.IsSetOwnerContact()) - { - context.Writer.WritePropertyName("ownerContact"); - context.Writer.Write(publicRequest.OwnerContact); + if(publicRequest.IsSetOwnerContact()) + { + context.Writer.WritePropertyName("ownerContact"); + context.Writer.Write(publicRequest.OwnerContact); + } + + writer.WriteObjectEnd(); } - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); + request.Content = memoryStream.ToArray(); } diff --git a/sdk/src/Services/AppSync/Generated/Model/Internal/MarshallTransformations/UpdateChannelNamespaceRequestMarshaller.cs b/sdk/src/Services/AppSync/Generated/Model/Internal/MarshallTransformations/UpdateChannelNamespaceRequestMarshaller.cs index de3b4b1f2874..dd1eb85dcab0 100644 --- a/sdk/src/Services/AppSync/Generated/Model/Internal/MarshallTransformations/UpdateChannelNamespaceRequestMarshaller.cs +++ b/sdk/src/Services/AppSync/Generated/Model/Internal/MarshallTransformations/UpdateChannelNamespaceRequestMarshaller.cs @@ -67,53 +67,56 @@ public IRequest Marshall(UpdateChannelNamespaceRequest publicRequest) throw new AmazonAppSyncException("Request object does not have required field Name set"); request.AddPathResource("{name}", StringUtils.FromString(publicRequest.Name)); request.ResourcePath = "/v2/apis/{apiId}/channelNamespaces/{name}"; - using (StringWriter stringWriter = new StringWriter(CultureInfo.InvariantCulture)) + using (MemoryStream memoryStream = new MemoryStream()) { - JsonWriter writer = new JsonWriter(stringWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetCodeHandlers()) + using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) { - context.Writer.WritePropertyName("codeHandlers"); - context.Writer.Write(publicRequest.CodeHandlers); - } - - if(publicRequest.IsSetPublishAuthModes()) - { - context.Writer.WritePropertyName("publishAuthModes"); - context.Writer.WriteArrayStart(); - foreach(var publicRequestPublishAuthModesListValue in publicRequest.PublishAuthModes) + JsonWriter writer = new JsonWriter(streamWriter); + writer.Validate = false; + writer.WriteObjectStart(); + var context = new JsonMarshallerContext(request, writer); + if(publicRequest.IsSetCodeHandlers()) { - context.Writer.WriteObjectStart(); - - var marshaller = AuthModeMarshaller.Instance; - marshaller.Marshall(publicRequestPublishAuthModesListValue, context); - - context.Writer.WriteObjectEnd(); + context.Writer.WritePropertyName("codeHandlers"); + context.Writer.Write(publicRequest.CodeHandlers); } - context.Writer.WriteArrayEnd(); - } - if(publicRequest.IsSetSubscribeAuthModes()) - { - context.Writer.WritePropertyName("subscribeAuthModes"); - context.Writer.WriteArrayStart(); - foreach(var publicRequestSubscribeAuthModesListValue in publicRequest.SubscribeAuthModes) + if(publicRequest.IsSetPublishAuthModes()) { - context.Writer.WriteObjectStart(); - - var marshaller = AuthModeMarshaller.Instance; - marshaller.Marshall(publicRequestSubscribeAuthModesListValue, context); + context.Writer.WritePropertyName("publishAuthModes"); + context.Writer.WriteArrayStart(); + foreach(var publicRequestPublishAuthModesListValue in publicRequest.PublishAuthModes) + { + context.Writer.WriteObjectStart(); + + var marshaller = AuthModeMarshaller.Instance; + marshaller.Marshall(publicRequestPublishAuthModesListValue, context); + + context.Writer.WriteObjectEnd(); + } + context.Writer.WriteArrayEnd(); + } - context.Writer.WriteObjectEnd(); + if(publicRequest.IsSetSubscribeAuthModes()) + { + context.Writer.WritePropertyName("subscribeAuthModes"); + context.Writer.WriteArrayStart(); + foreach(var publicRequestSubscribeAuthModesListValue in publicRequest.SubscribeAuthModes) + { + context.Writer.WriteObjectStart(); + + var marshaller = AuthModeMarshaller.Instance; + marshaller.Marshall(publicRequestSubscribeAuthModesListValue, context); + + context.Writer.WriteObjectEnd(); + } + context.Writer.WriteArrayEnd(); } - context.Writer.WriteArrayEnd(); + + writer.WriteObjectEnd(); } - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); + request.Content = memoryStream.ToArray(); } diff --git a/sdk/src/Services/AppSync/Generated/Model/ListApisRequest.cs b/sdk/src/Services/AppSync/Generated/Model/ListApisRequest.cs index 54cf951fb92c..a56ad2d7b3f8 100644 --- a/sdk/src/Services/AppSync/Generated/Model/ListApisRequest.cs +++ b/sdk/src/Services/AppSync/Generated/Model/ListApisRequest.cs @@ -51,9 +51,9 @@ public partial class ListApisRequest : AmazonAppSyncRequest /// /// [AWSProperty(Min=0, Max=25)] - public int MaxResults + public int? MaxResults { - get { return this._maxResults.GetValueOrDefault(); } + get { return this._maxResults; } set { this._maxResults = value; } } diff --git a/sdk/src/Services/AppSync/Generated/Model/ListChannelNamespacesRequest.cs b/sdk/src/Services/AppSync/Generated/Model/ListChannelNamespacesRequest.cs index 80b60d7250dc..d234a9d80cc2 100644 --- a/sdk/src/Services/AppSync/Generated/Model/ListChannelNamespacesRequest.cs +++ b/sdk/src/Services/AppSync/Generated/Model/ListChannelNamespacesRequest.cs @@ -71,9 +71,9 @@ internal bool IsSetApiId() /// /// [AWSProperty(Min=0, Max=25)] - public int MaxResults + public int? MaxResults { - get { return this._maxResults.GetValueOrDefault(); } + get { return this._maxResults; } set { this._maxResults = value; } } diff --git a/sdk/src/Services/AppSync/Generated/Model/ServiceQuotaExceededException.cs b/sdk/src/Services/AppSync/Generated/Model/ServiceQuotaExceededException.cs index eb9ed4db4841..b72db67a195e 100644 --- a/sdk/src/Services/AppSync/Generated/Model/ServiceQuotaExceededException.cs +++ b/sdk/src/Services/AppSync/Generated/Model/ServiceQuotaExceededException.cs @@ -106,11 +106,6 @@ protected ServiceQuotaExceededException(System.Runtime.Serialization.Serializati /// The that holds the serialized object data about the exception being thrown. /// The that contains contextual information about the source or destination. /// The parameter is a null reference (Nothing in Visual Basic). -#if BCL35 - [System.Security.Permissions.SecurityPermission( - System.Security.Permissions.SecurityAction.LinkDemand, - Flags = System.Security.Permissions.SecurityPermissionFlag.SerializationFormatter)] -#endif [System.Security.SecurityCritical] // These FxCop rules are giving false-positives for this method [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Security", "CA2123:OverrideLinkDemandsShouldBeIdenticalToBase")] diff --git a/sdk/src/Services/AppSync/Generated/Model/_bcl45+netstandard/IListApisPaginator.cs b/sdk/src/Services/AppSync/Generated/Model/_bcl+netstandard/IListApisPaginator.cs similarity index 100% rename from sdk/src/Services/AppSync/Generated/Model/_bcl45+netstandard/IListApisPaginator.cs rename to sdk/src/Services/AppSync/Generated/Model/_bcl+netstandard/IListApisPaginator.cs diff --git a/sdk/src/Services/AppSync/Generated/Model/_bcl45+netstandard/IListChannelNamespacesPaginator.cs b/sdk/src/Services/AppSync/Generated/Model/_bcl+netstandard/IListChannelNamespacesPaginator.cs similarity index 100% rename from sdk/src/Services/AppSync/Generated/Model/_bcl45+netstandard/IListChannelNamespacesPaginator.cs rename to sdk/src/Services/AppSync/Generated/Model/_bcl+netstandard/IListChannelNamespacesPaginator.cs diff --git a/sdk/src/Services/AppSync/Generated/Model/_bcl45+netstandard/ListApisPaginator.cs b/sdk/src/Services/AppSync/Generated/Model/_bcl+netstandard/ListApisPaginator.cs similarity index 100% rename from sdk/src/Services/AppSync/Generated/Model/_bcl45+netstandard/ListApisPaginator.cs rename to sdk/src/Services/AppSync/Generated/Model/_bcl+netstandard/ListApisPaginator.cs diff --git a/sdk/src/Services/AppSync/Generated/Model/_bcl45+netstandard/ListChannelNamespacesPaginator.cs b/sdk/src/Services/AppSync/Generated/Model/_bcl+netstandard/ListChannelNamespacesPaginator.cs similarity index 100% rename from sdk/src/Services/AppSync/Generated/Model/_bcl45+netstandard/ListChannelNamespacesPaginator.cs rename to sdk/src/Services/AppSync/Generated/Model/_bcl+netstandard/ListChannelNamespacesPaginator.cs diff --git a/sdk/src/Services/AppSync/Generated/_bcl/AmazonAppSyncClient.cs b/sdk/src/Services/AppSync/Generated/_bcl/AmazonAppSyncClient.cs index ef48ee0ac30c..28175e49ad07 100644 --- a/sdk/src/Services/AppSync/Generated/_bcl/AmazonAppSyncClient.cs +++ b/sdk/src/Services/AppSync/Generated/_bcl/AmazonAppSyncClient.cs @@ -505,6 +505,85 @@ public virtual AssociateSourceGraphqlApiResponse AssociateSourceGraphqlApi(Assoc #endregion + #region CreateApi + + + /// + /// Creates an Api object. Use this operation to create an AppSync API with your + /// preferred configuration, such as an Event API that provides real-time message publishing + /// and message subscriptions over WebSockets. + /// + /// Container for the necessary parameters to execute the CreateApi service method. + /// + /// The response from the CreateApi service method, as returned by AppSync. + /// + /// The request is not well formed. For example, a value is invalid or a required field + /// is missing. Check the field values, and then try again. + /// + /// + /// Another modification is in progress at this time and it must complete before you can + /// make your change. + /// + /// + /// An internal AppSync error occurred. Try your request again. + /// + /// + /// The operation exceeded the service quota for this resource. + /// + /// + /// You aren't authorized to perform this operation. + /// + /// REST API Reference for CreateApi Operation + public virtual CreateApiResponse CreateApi(CreateApiRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = CreateApiRequestMarshaller.Instance; + options.ResponseUnmarshaller = CreateApiResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// Creates an Api object. Use this operation to create an AppSync API with your + /// preferred configuration, such as an Event API that provides real-time message publishing + /// and message subscriptions over WebSockets. + /// + /// Container for the necessary parameters to execute the CreateApi service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the CreateApi service method, as returned by AppSync. + /// + /// The request is not well formed. For example, a value is invalid or a required field + /// is missing. Check the field values, and then try again. + /// + /// + /// Another modification is in progress at this time and it must complete before you can + /// make your change. + /// + /// + /// An internal AppSync error occurred. Try your request again. + /// + /// + /// The operation exceeded the service quota for this resource. + /// + /// + /// You aren't authorized to perform this operation. + /// + /// REST API Reference for CreateApi Operation + public virtual Task CreateApiAsync(CreateApiRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = CreateApiRequestMarshaller.Instance; + options.ResponseUnmarshaller = CreateApiResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + #region CreateApiCache @@ -671,6 +750,99 @@ public virtual CreateApiKeyResponse CreateApiKey(CreateApiKeyRequest request) #endregion + #region CreateChannelNamespace + + + /// + /// Creates a ChannelNamespace for an Api. + /// + /// Container for the necessary parameters to execute the CreateChannelNamespace service method. + /// + /// The response from the CreateChannelNamespace service method, as returned by AppSync. + /// + /// The request is not well formed. For example, a value is invalid or a required field + /// is missing. Check the field values, and then try again. + /// + /// + /// Another modification is in progress at this time and it must complete before you can + /// make your change. + /// + /// + /// A conflict with a previous successful update is detected. This typically occurs when + /// the previous update did not have time to propagate before the next update was made. + /// A retry (with appropriate backoff logic) is the recommended response to this exception. + /// + /// + /// An internal AppSync error occurred. Try your request again. + /// + /// + /// The resource specified in the request was not found. Check the resource, and then + /// try again. + /// + /// + /// The operation exceeded the service quota for this resource. + /// + /// + /// You aren't authorized to perform this operation. + /// + /// REST API Reference for CreateChannelNamespace Operation + public virtual CreateChannelNamespaceResponse CreateChannelNamespace(CreateChannelNamespaceRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = CreateChannelNamespaceRequestMarshaller.Instance; + options.ResponseUnmarshaller = CreateChannelNamespaceResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// Creates a ChannelNamespace for an Api. + /// + /// Container for the necessary parameters to execute the CreateChannelNamespace service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the CreateChannelNamespace service method, as returned by AppSync. + /// + /// The request is not well formed. For example, a value is invalid or a required field + /// is missing. Check the field values, and then try again. + /// + /// + /// Another modification is in progress at this time and it must complete before you can + /// make your change. + /// + /// + /// A conflict with a previous successful update is detected. This typically occurs when + /// the previous update did not have time to propagate before the next update was made. + /// A retry (with appropriate backoff logic) is the recommended response to this exception. + /// + /// + /// An internal AppSync error occurred. Try your request again. + /// + /// + /// The resource specified in the request was not found. Check the resource, and then + /// try again. + /// + /// + /// The operation exceeded the service quota for this resource. + /// + /// + /// You aren't authorized to perform this operation. + /// + /// REST API Reference for CreateChannelNamespace Operation + public virtual Task CreateChannelNamespaceAsync(CreateChannelNamespaceRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = CreateChannelNamespaceRequestMarshaller.Instance; + options.ResponseUnmarshaller = CreateChannelNamespaceResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + #region CreateDataSource @@ -1145,6 +1317,89 @@ public virtual CreateTypeResponse CreateType(CreateTypeRequest request) #endregion + #region DeleteApi + + + /// + /// Deletes an Api object + /// + /// Container for the necessary parameters to execute the DeleteApi service method. + /// + /// The response from the DeleteApi service method, as returned by AppSync. + /// + /// You don't have access to perform this operation on this resource. + /// + /// + /// The request is not well formed. For example, a value is invalid or a required field + /// is missing. Check the field values, and then try again. + /// + /// + /// Another modification is in progress at this time and it must complete before you can + /// make your change. + /// + /// + /// An internal AppSync error occurred. Try your request again. + /// + /// + /// The resource specified in the request was not found. Check the resource, and then + /// try again. + /// + /// + /// You aren't authorized to perform this operation. + /// + /// REST API Reference for DeleteApi Operation + public virtual DeleteApiResponse DeleteApi(DeleteApiRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = DeleteApiRequestMarshaller.Instance; + options.ResponseUnmarshaller = DeleteApiResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// Deletes an Api object + /// + /// Container for the necessary parameters to execute the DeleteApi service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the DeleteApi service method, as returned by AppSync. + /// + /// You don't have access to perform this operation on this resource. + /// + /// + /// The request is not well formed. For example, a value is invalid or a required field + /// is missing. Check the field values, and then try again. + /// + /// + /// Another modification is in progress at this time and it must complete before you can + /// make your change. + /// + /// + /// An internal AppSync error occurred. Try your request again. + /// + /// + /// The resource specified in the request was not found. Check the resource, and then + /// try again. + /// + /// + /// You aren't authorized to perform this operation. + /// + /// REST API Reference for DeleteApi Operation + public virtual Task DeleteApiAsync(DeleteApiRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = DeleteApiRequestMarshaller.Instance; + options.ResponseUnmarshaller = DeleteApiResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + #region DeleteApiCache @@ -1291,6 +1546,89 @@ public virtual DeleteApiKeyResponse DeleteApiKey(DeleteApiKeyRequest request) #endregion + #region DeleteChannelNamespace + + + /// + /// Deletes a ChannelNamespace. + /// + /// Container for the necessary parameters to execute the DeleteChannelNamespace service method. + /// + /// The response from the DeleteChannelNamespace service method, as returned by AppSync. + /// + /// You don't have access to perform this operation on this resource. + /// + /// + /// The request is not well formed. For example, a value is invalid or a required field + /// is missing. Check the field values, and then try again. + /// + /// + /// Another modification is in progress at this time and it must complete before you can + /// make your change. + /// + /// + /// An internal AppSync error occurred. Try your request again. + /// + /// + /// The resource specified in the request was not found. Check the resource, and then + /// try again. + /// + /// + /// You aren't authorized to perform this operation. + /// + /// REST API Reference for DeleteChannelNamespace Operation + public virtual DeleteChannelNamespaceResponse DeleteChannelNamespace(DeleteChannelNamespaceRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = DeleteChannelNamespaceRequestMarshaller.Instance; + options.ResponseUnmarshaller = DeleteChannelNamespaceResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// Deletes a ChannelNamespace. + /// + /// Container for the necessary parameters to execute the DeleteChannelNamespace service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the DeleteChannelNamespace service method, as returned by AppSync. + /// + /// You don't have access to perform this operation on this resource. + /// + /// + /// The request is not well formed. For example, a value is invalid or a required field + /// is missing. Check the field values, and then try again. + /// + /// + /// Another modification is in progress at this time and it must complete before you can + /// make your change. + /// + /// + /// An internal AppSync error occurred. Try your request again. + /// + /// + /// The resource specified in the request was not found. Check the resource, and then + /// try again. + /// + /// + /// You aren't authorized to perform this operation. + /// + /// REST API Reference for DeleteChannelNamespace Operation + public virtual Task DeleteChannelNamespaceAsync(DeleteChannelNamespaceRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = DeleteChannelNamespaceRequestMarshaller.Instance; + options.ResponseUnmarshaller = DeleteChannelNamespaceResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + #region DeleteDataSource @@ -2229,6 +2567,81 @@ public virtual FlushApiCacheResponse FlushApiCache(FlushApiCacheRequest request) #endregion + #region GetApi + + + /// + /// Retrieves an Api object. + /// + /// Container for the necessary parameters to execute the GetApi service method. + /// + /// The response from the GetApi service method, as returned by AppSync. + /// + /// You don't have access to perform this operation on this resource. + /// + /// + /// The request is not well formed. For example, a value is invalid or a required field + /// is missing. Check the field values, and then try again. + /// + /// + /// An internal AppSync error occurred. Try your request again. + /// + /// + /// The resource specified in the request was not found. Check the resource, and then + /// try again. + /// + /// + /// You aren't authorized to perform this operation. + /// + /// REST API Reference for GetApi Operation + public virtual GetApiResponse GetApi(GetApiRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = GetApiRequestMarshaller.Instance; + options.ResponseUnmarshaller = GetApiResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// Retrieves an Api object. + /// + /// Container for the necessary parameters to execute the GetApi service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the GetApi service method, as returned by AppSync. + /// + /// You don't have access to perform this operation on this resource. + /// + /// + /// The request is not well formed. For example, a value is invalid or a required field + /// is missing. Check the field values, and then try again. + /// + /// + /// An internal AppSync error occurred. Try your request again. + /// + /// + /// The resource specified in the request was not found. Check the resource, and then + /// try again. + /// + /// + /// You aren't authorized to perform this operation. + /// + /// REST API Reference for GetApi Operation + public virtual Task GetApiAsync(GetApiRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = GetApiRequestMarshaller.Instance; + options.ResponseUnmarshaller = GetApiResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + #region GetApiAssociation @@ -2349,10 +2762,85 @@ public virtual GetApiCacheResponse GetApiCache(GetApiCacheRequest request) /// The request is not well formed. For example, a value is invalid or a required field /// is missing. Check the field values, and then try again. /// - /// - /// Another modification is in progress at this time and it must complete before you can - /// make your change. - /// + /// + /// Another modification is in progress at this time and it must complete before you can + /// make your change. + /// + /// + /// An internal AppSync error occurred. Try your request again. + /// + /// + /// The resource specified in the request was not found. Check the resource, and then + /// try again. + /// + /// + /// You aren't authorized to perform this operation. + /// + /// REST API Reference for GetApiCache Operation + public virtual Task GetApiCacheAsync(GetApiCacheRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = GetApiCacheRequestMarshaller.Instance; + options.ResponseUnmarshaller = GetApiCacheResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + + #region GetChannelNamespace + + + /// + /// Retrieves the channel namespace for a specified Api. + /// + /// Container for the necessary parameters to execute the GetChannelNamespace service method. + /// + /// The response from the GetChannelNamespace service method, as returned by AppSync. + /// + /// You don't have access to perform this operation on this resource. + /// + /// + /// The request is not well formed. For example, a value is invalid or a required field + /// is missing. Check the field values, and then try again. + /// + /// + /// An internal AppSync error occurred. Try your request again. + /// + /// + /// The resource specified in the request was not found. Check the resource, and then + /// try again. + /// + /// + /// You aren't authorized to perform this operation. + /// + /// REST API Reference for GetChannelNamespace Operation + public virtual GetChannelNamespaceResponse GetChannelNamespace(GetChannelNamespaceRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = GetChannelNamespaceRequestMarshaller.Instance; + options.ResponseUnmarshaller = GetChannelNamespaceResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// Retrieves the channel namespace for a specified Api. + /// + /// Container for the necessary parameters to execute the GetChannelNamespace service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the GetChannelNamespace service method, as returned by AppSync. + /// + /// You don't have access to perform this operation on this resource. + /// + /// + /// The request is not well formed. For example, a value is invalid or a required field + /// is missing. Check the field values, and then try again. + /// /// /// An internal AppSync error occurred. Try your request again. /// @@ -2363,14 +2851,14 @@ public virtual GetApiCacheResponse GetApiCache(GetApiCacheRequest request) /// /// You aren't authorized to perform this operation. /// - /// REST API Reference for GetApiCache Operation - public virtual Task GetApiCacheAsync(GetApiCacheRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + /// REST API Reference for GetChannelNamespace Operation + public virtual Task GetChannelNamespaceAsync(GetChannelNamespaceRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { var options = new InvokeOptions(); - options.RequestMarshaller = GetApiCacheRequestMarshaller.Instance; - options.ResponseUnmarshaller = GetApiCacheResponseUnmarshaller.Instance; + options.RequestMarshaller = GetChannelNamespaceRequestMarshaller.Instance; + options.ResponseUnmarshaller = GetChannelNamespaceResponseUnmarshaller.Instance; - return InvokeAsync(request, options, cancellationToken); + return InvokeAsync(request, options, cancellationToken); } #endregion @@ -3233,6 +3721,160 @@ public virtual ListApiKeysResponse ListApiKeys(ListApiKeysRequest request) #endregion + #region ListApis + + + /// + /// Lists the APIs in your AppSync account. + /// + /// + /// + /// ListApis returns only the high level API details. For more detailed information + /// about an API, use GetApi. + /// + /// + /// Container for the necessary parameters to execute the ListApis service method. + /// + /// The response from the ListApis service method, as returned by AppSync. + /// + /// The request is not well formed. For example, a value is invalid or a required field + /// is missing. Check the field values, and then try again. + /// + /// + /// An internal AppSync error occurred. Try your request again. + /// + /// + /// You aren't authorized to perform this operation. + /// + /// REST API Reference for ListApis Operation + public virtual ListApisResponse ListApis(ListApisRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = ListApisRequestMarshaller.Instance; + options.ResponseUnmarshaller = ListApisResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// Lists the APIs in your AppSync account. + /// + /// + /// + /// ListApis returns only the high level API details. For more detailed information + /// about an API, use GetApi. + /// + /// + /// Container for the necessary parameters to execute the ListApis service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the ListApis service method, as returned by AppSync. + /// + /// The request is not well formed. For example, a value is invalid or a required field + /// is missing. Check the field values, and then try again. + /// + /// + /// An internal AppSync error occurred. Try your request again. + /// + /// + /// You aren't authorized to perform this operation. + /// + /// REST API Reference for ListApis Operation + public virtual Task ListApisAsync(ListApisRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = ListApisRequestMarshaller.Instance; + options.ResponseUnmarshaller = ListApisResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + + #region ListChannelNamespaces + + + /// + /// Lists the channel namespaces for a specified Api. + /// + /// + /// + /// ListChannelNamespaces returns only high level details for the channel namespace. + /// To retrieve code handlers, use GetChannelNamespace. + /// + /// + /// Container for the necessary parameters to execute the ListChannelNamespaces service method. + /// + /// The response from the ListChannelNamespaces service method, as returned by AppSync. + /// + /// The request is not well formed. For example, a value is invalid or a required field + /// is missing. Check the field values, and then try again. + /// + /// + /// An internal AppSync error occurred. Try your request again. + /// + /// + /// The resource specified in the request was not found. Check the resource, and then + /// try again. + /// + /// + /// You aren't authorized to perform this operation. + /// + /// REST API Reference for ListChannelNamespaces Operation + public virtual ListChannelNamespacesResponse ListChannelNamespaces(ListChannelNamespacesRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = ListChannelNamespacesRequestMarshaller.Instance; + options.ResponseUnmarshaller = ListChannelNamespacesResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// Lists the channel namespaces for a specified Api. + /// + /// + /// + /// ListChannelNamespaces returns only high level details for the channel namespace. + /// To retrieve code handlers, use GetChannelNamespace. + /// + /// + /// Container for the necessary parameters to execute the ListChannelNamespaces service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the ListChannelNamespaces service method, as returned by AppSync. + /// + /// The request is not well formed. For example, a value is invalid or a required field + /// is missing. Check the field values, and then try again. + /// + /// + /// An internal AppSync error occurred. Try your request again. + /// + /// + /// The resource specified in the request was not found. Check the resource, and then + /// try again. + /// + /// + /// You aren't authorized to perform this operation. + /// + /// REST API Reference for ListChannelNamespaces Operation + public virtual Task ListChannelNamespacesAsync(ListChannelNamespacesRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = ListChannelNamespacesRequestMarshaller.Instance; + options.ResponseUnmarshaller = ListChannelNamespacesResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + #region ListDataSources @@ -4535,6 +5177,89 @@ public virtual UntagResourceResponse UntagResource(UntagResourceRequest request) #endregion + #region UpdateApi + + + /// + /// Updates an Api. + /// + /// Container for the necessary parameters to execute the UpdateApi service method. + /// + /// The response from the UpdateApi service method, as returned by AppSync. + /// + /// You don't have access to perform this operation on this resource. + /// + /// + /// The request is not well formed. For example, a value is invalid or a required field + /// is missing. Check the field values, and then try again. + /// + /// + /// Another modification is in progress at this time and it must complete before you can + /// make your change. + /// + /// + /// An internal AppSync error occurred. Try your request again. + /// + /// + /// The resource specified in the request was not found. Check the resource, and then + /// try again. + /// + /// + /// You aren't authorized to perform this operation. + /// + /// REST API Reference for UpdateApi Operation + public virtual UpdateApiResponse UpdateApi(UpdateApiRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = UpdateApiRequestMarshaller.Instance; + options.ResponseUnmarshaller = UpdateApiResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// Updates an Api. + /// + /// Container for the necessary parameters to execute the UpdateApi service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the UpdateApi service method, as returned by AppSync. + /// + /// You don't have access to perform this operation on this resource. + /// + /// + /// The request is not well formed. For example, a value is invalid or a required field + /// is missing. Check the field values, and then try again. + /// + /// + /// Another modification is in progress at this time and it must complete before you can + /// make your change. + /// + /// + /// An internal AppSync error occurred. Try your request again. + /// + /// + /// The resource specified in the request was not found. Check the resource, and then + /// try again. + /// + /// + /// You aren't authorized to perform this operation. + /// + /// REST API Reference for UpdateApi Operation + public virtual Task UpdateApiAsync(UpdateApiRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = UpdateApiRequestMarshaller.Instance; + options.ResponseUnmarshaller = UpdateApiResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + #region UpdateApiCache @@ -4695,6 +5420,89 @@ public virtual UpdateApiKeyResponse UpdateApiKey(UpdateApiKeyRequest request) #endregion + #region UpdateChannelNamespace + + + /// + /// Updates a ChannelNamespace associated with an Api. + /// + /// Container for the necessary parameters to execute the UpdateChannelNamespace service method. + /// + /// The response from the UpdateChannelNamespace service method, as returned by AppSync. + /// + /// You don't have access to perform this operation on this resource. + /// + /// + /// The request is not well formed. For example, a value is invalid or a required field + /// is missing. Check the field values, and then try again. + /// + /// + /// Another modification is in progress at this time and it must complete before you can + /// make your change. + /// + /// + /// An internal AppSync error occurred. Try your request again. + /// + /// + /// The resource specified in the request was not found. Check the resource, and then + /// try again. + /// + /// + /// You aren't authorized to perform this operation. + /// + /// REST API Reference for UpdateChannelNamespace Operation + public virtual UpdateChannelNamespaceResponse UpdateChannelNamespace(UpdateChannelNamespaceRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = UpdateChannelNamespaceRequestMarshaller.Instance; + options.ResponseUnmarshaller = UpdateChannelNamespaceResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// Updates a ChannelNamespace associated with an Api. + /// + /// Container for the necessary parameters to execute the UpdateChannelNamespace service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the UpdateChannelNamespace service method, as returned by AppSync. + /// + /// You don't have access to perform this operation on this resource. + /// + /// + /// The request is not well formed. For example, a value is invalid or a required field + /// is missing. Check the field values, and then try again. + /// + /// + /// Another modification is in progress at this time and it must complete before you can + /// make your change. + /// + /// + /// An internal AppSync error occurred. Try your request again. + /// + /// + /// The resource specified in the request was not found. Check the resource, and then + /// try again. + /// + /// + /// You aren't authorized to perform this operation. + /// + /// REST API Reference for UpdateChannelNamespace Operation + public virtual Task UpdateChannelNamespaceAsync(UpdateChannelNamespaceRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = UpdateChannelNamespaceRequestMarshaller.Instance; + options.ResponseUnmarshaller = UpdateChannelNamespaceResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + #region UpdateDataSource diff --git a/sdk/src/Services/AppSync/Properties/AssemblyInfo.cs b/sdk/src/Services/AppSync/Properties/AssemblyInfo.cs index 7e099911f086..cc69a05a1332 100644 --- a/sdk/src/Services/AppSync/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/AppSync/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.12")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.402.10")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/AppTest/AppTest.sln b/sdk/src/Services/AppTest/AppTest.sln index ee181c11ab61..a53ad764cfd3 100644 --- a/sdk/src/Services/AppTest/AppTest.sln +++ b/sdk/src/Services/AppTest/AppTest.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {E3C06567-FE15-40C0-A05B-EE460D14E5F3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {E3C06567-FE15-40C0-A05B-EE460D14E5F3}.Debug|Any CPU.Build.0 = Debug|Any CPU {E3C06567-FE15-40C0-A05B-EE460D14E5F3}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {22EF7DBD-6BEB-4D46-842B-6ACE4F4C97E3}.Debug|Any CPU.Build.0 = Debug|Any CPU {22EF7DBD-6BEB-4D46-842B-6ACE4F4C97E3}.Release|Any CPU.ActiveCfg = Release|Any CPU {22EF7DBD-6BEB-4D46-842B-6ACE4F4C97E3}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {D29E407A-3092-45F2-9F15-98645842D0C7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D29E407A-3092-45F2-9F15-98645842D0C7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D29E407A-3092-45F2-9F15-98645842D0C7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D29E407A-3092-45F2-9F15-98645842D0C7}.Release|Any CPU.Build.0 = Release|Any CPU - {616FFDFD-077C-45EA-950A-FDF1A4F08A4C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {616FFDFD-077C-45EA-950A-FDF1A4F08A4C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {616FFDFD-077C-45EA-950A-FDF1A4F08A4C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {616FFDFD-077C-45EA-950A-FDF1A4F08A4C}.Release|Any CPU.Build.0 = Release|Any CPU - {F672E247-9327-43FC-A5DF-FEEF16176E45}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F672E247-9327-43FC-A5DF-FEEF16176E45}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F672E247-9327-43FC-A5DF-FEEF16176E45}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F672E247-9327-43FC-A5DF-FEEF16176E45}.Release|Any CPU.Build.0 = Release|Any CPU - {2D140053-269D-4B0C-9A9D-64C54DF755AA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2D140053-269D-4B0C-9A9D-64C54DF755AA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2D140053-269D-4B0C-9A9D-64C54DF755AA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2D140053-269D-4B0C-9A9D-64C54DF755AA}.Release|Any CPU.Build.0 = Release|Any CPU - {2BDF2F3B-4B39-4550-A2B8-DAF4775D579C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2BDF2F3B-4B39-4550-A2B8-DAF4775D579C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2BDF2F3B-4B39-4550-A2B8-DAF4775D579C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2BDF2F3B-4B39-4550-A2B8-DAF4775D579C}.Release|Any CPU.Build.0 = Release|Any CPU - {B95488FD-6324-4D30-BF33-E45FAF3CA4AD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B95488FD-6324-4D30-BF33-E45FAF3CA4AD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B95488FD-6324-4D30-BF33-E45FAF3CA4AD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B95488FD-6324-4D30-BF33-E45FAF3CA4AD}.Release|Any CPU.Build.0 = Release|Any CPU - {52CF031B-CAFC-4CEF-B956-F4CD0A97ACD9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {52CF031B-CAFC-4CEF-B956-F4CD0A97ACD9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {52CF031B-CAFC-4CEF-B956-F4CD0A97ACD9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {52CF031B-CAFC-4CEF-B956-F4CD0A97ACD9}.Release|Any CPU.Build.0 = Release|Any CPU - {E69D622B-691B-4F50-9761-BB014AC28CC3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E69D622B-691B-4F50-9761-BB014AC28CC3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E69D622B-691B-4F50-9761-BB014AC28CC3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E69D622B-691B-4F50-9761-BB014AC28CC3}.Release|Any CPU.Build.0 = Release|Any CPU - {B6B2A8F2-0B64-4263-A940-0E0FB73CD9EC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B6B2A8F2-0B64-4263-A940-0E0FB73CD9EC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B6B2A8F2-0B64-4263-A940-0E0FB73CD9EC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B6B2A8F2-0B64-4263-A940-0E0FB73CD9EC}.Release|Any CPU.Build.0 = Release|Any CPU - {79E4671F-082F-4FCD-8794-1D4DA00C5939}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {79E4671F-082F-4FCD-8794-1D4DA00C5939}.Debug|Any CPU.Build.0 = Debug|Any CPU - {79E4671F-082F-4FCD-8794-1D4DA00C5939}.Release|Any CPU.ActiveCfg = Release|Any CPU - {79E4671F-082F-4FCD-8794-1D4DA00C5939}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {D29E407A-3092-45F2-9F15-98645842D0C7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D29E407A-3092-45F2-9F15-98645842D0C7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D29E407A-3092-45F2-9F15-98645842D0C7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D29E407A-3092-45F2-9F15-98645842D0C7}.Release|Any CPU.Build.0 = Release|Any CPU - {616FFDFD-077C-45EA-950A-FDF1A4F08A4C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {616FFDFD-077C-45EA-950A-FDF1A4F08A4C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {616FFDFD-077C-45EA-950A-FDF1A4F08A4C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {616FFDFD-077C-45EA-950A-FDF1A4F08A4C}.Release|Any CPU.Build.0 = Release|Any CPU - {F672E247-9327-43FC-A5DF-FEEF16176E45}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F672E247-9327-43FC-A5DF-FEEF16176E45}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F672E247-9327-43FC-A5DF-FEEF16176E45}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F672E247-9327-43FC-A5DF-FEEF16176E45}.Release|Any CPU.Build.0 = Release|Any CPU - {2D140053-269D-4B0C-9A9D-64C54DF755AA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2D140053-269D-4B0C-9A9D-64C54DF755AA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2D140053-269D-4B0C-9A9D-64C54DF755AA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2D140053-269D-4B0C-9A9D-64C54DF755AA}.Release|Any CPU.Build.0 = Release|Any CPU - {2BDF2F3B-4B39-4550-A2B8-DAF4775D579C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2BDF2F3B-4B39-4550-A2B8-DAF4775D579C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2BDF2F3B-4B39-4550-A2B8-DAF4775D579C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2BDF2F3B-4B39-4550-A2B8-DAF4775D579C}.Release|Any CPU.Build.0 = Release|Any CPU - {B95488FD-6324-4D30-BF33-E45FAF3CA4AD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B95488FD-6324-4D30-BF33-E45FAF3CA4AD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B95488FD-6324-4D30-BF33-E45FAF3CA4AD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B95488FD-6324-4D30-BF33-E45FAF3CA4AD}.Release|Any CPU.Build.0 = Release|Any CPU - {52CF031B-CAFC-4CEF-B956-F4CD0A97ACD9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {52CF031B-CAFC-4CEF-B956-F4CD0A97ACD9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {52CF031B-CAFC-4CEF-B956-F4CD0A97ACD9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {52CF031B-CAFC-4CEF-B956-F4CD0A97ACD9}.Release|Any CPU.Build.0 = Release|Any CPU - {E69D622B-691B-4F50-9761-BB014AC28CC3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E69D622B-691B-4F50-9761-BB014AC28CC3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E69D622B-691B-4F50-9761-BB014AC28CC3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E69D622B-691B-4F50-9761-BB014AC28CC3}.Release|Any CPU.Build.0 = Release|Any CPU - {B6B2A8F2-0B64-4263-A940-0E0FB73CD9EC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B6B2A8F2-0B64-4263-A940-0E0FB73CD9EC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B6B2A8F2-0B64-4263-A940-0E0FB73CD9EC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B6B2A8F2-0B64-4263-A940-0E0FB73CD9EC}.Release|Any CPU.Build.0 = Release|Any CPU - {79E4671F-082F-4FCD-8794-1D4DA00C5939}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {79E4671F-082F-4FCD-8794-1D4DA00C5939}.Debug|Any CPU.Build.0 = Debug|Any CPU - {79E4671F-082F-4FCD-8794-1D4DA00C5939}.Release|Any CPU.ActiveCfg = Release|Any CPU - {79E4671F-082F-4FCD-8794-1D4DA00C5939}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {E3C06567-FE15-40C0-A05B-EE460D14E5F3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {F234B9E3-B307-4BE2-887D-6337204C0BFE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {C6B98DD6-60BB-429A-AFFF-F3B38EF1FDC3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {D513DDA2-DC0C-47DE-8A6E-46A7CDFDC45B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {22EF7DBD-6BEB-4D46-842B-6ACE4F4C97E3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {D29E407A-3092-45F2-9F15-98645842D0C7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {616FFDFD-077C-45EA-950A-FDF1A4F08A4C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F672E247-9327-43FC-A5DF-FEEF16176E45} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {2D140053-269D-4B0C-9A9D-64C54DF755AA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {2BDF2F3B-4B39-4550-A2B8-DAF4775D579C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B95488FD-6324-4D30-BF33-E45FAF3CA4AD} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {52CF031B-CAFC-4CEF-B956-F4CD0A97ACD9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E69D622B-691B-4F50-9761-BB014AC28CC3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B6B2A8F2-0B64-4263-A940-0E0FB73CD9EC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {79E4671F-082F-4FCD-8794-1D4DA00C5939} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {D29E407A-3092-45F2-9F15-98645842D0C7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {616FFDFD-077C-45EA-950A-FDF1A4F08A4C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F672E247-9327-43FC-A5DF-FEEF16176E45} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {2D140053-269D-4B0C-9A9D-64C54DF755AA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {2BDF2F3B-4B39-4550-A2B8-DAF4775D579C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B95488FD-6324-4D30-BF33-E45FAF3CA4AD} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {52CF031B-CAFC-4CEF-B956-F4CD0A97ACD9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E69D622B-691B-4F50-9761-BB014AC28CC3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B6B2A8F2-0B64-4263-A940-0E0FB73CD9EC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {79E4671F-082F-4FCD-8794-1D4DA00C5939} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {5C8B6DAD-A69E-4AB3-80C3-9EE028D9AEF3} diff --git a/sdk/src/Services/AppTest/Generated/AmazonAppTestConfig.cs b/sdk/src/Services/AppTest/Generated/AmazonAppTestConfig.cs index 72a83cd56f3d..f0cf14ca7eaf 100644 --- a/sdk/src/Services/AppTest/Generated/AmazonAppTestConfig.cs +++ b/sdk/src/Services/AppTest/Generated/AmazonAppTestConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.AppTest public partial class AmazonAppTestConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("AppTest", "4.0.0.0"); private static readonly AmazonAppTestEndpointResolver EndpointResolver = new AmazonAppTestEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("AppTest", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("AppTest", "3.7.400.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/AppTest/Properties/AssemblyInfo.cs b/sdk/src/Services/AppTest/Properties/AssemblyInfo.cs index 3d31a8913567..411590b93274 100644 --- a/sdk/src/Services/AppTest/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/AppTest/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/Appflow/Appflow.sln b/sdk/src/Services/Appflow/Appflow.sln index c1444fa1354e..be73e19cc4a9 100644 --- a/sdk/src/Services/Appflow/Appflow.sln +++ b/sdk/src/Services/Appflow/Appflow.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {6AFD4F0E-3EF7-434F-9FBF-6302C837B00D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {6AFD4F0E-3EF7-434F-9FBF-6302C837B00D}.Debug|Any CPU.Build.0 = Debug|Any CPU {6AFD4F0E-3EF7-434F-9FBF-6302C837B00D}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {9CE5E624-C73A-435F-A112-1D1077F8DD46}.Debug|Any CPU.Build.0 = Debug|Any CPU {9CE5E624-C73A-435F-A112-1D1077F8DD46}.Release|Any CPU.ActiveCfg = Release|Any CPU {9CE5E624-C73A-435F-A112-1D1077F8DD46}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {310C7D34-1592-4CCB-B73A-1474E4F5B799}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {310C7D34-1592-4CCB-B73A-1474E4F5B799}.Debug|Any CPU.Build.0 = Debug|Any CPU - {310C7D34-1592-4CCB-B73A-1474E4F5B799}.Release|Any CPU.ActiveCfg = Release|Any CPU - {310C7D34-1592-4CCB-B73A-1474E4F5B799}.Release|Any CPU.Build.0 = Release|Any CPU - {71E2CE2B-2DED-4923-AF41-CE8881A67E7F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {71E2CE2B-2DED-4923-AF41-CE8881A67E7F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {71E2CE2B-2DED-4923-AF41-CE8881A67E7F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {71E2CE2B-2DED-4923-AF41-CE8881A67E7F}.Release|Any CPU.Build.0 = Release|Any CPU - {3FA4A247-E914-4D33-9954-4120C1781B3E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3FA4A247-E914-4D33-9954-4120C1781B3E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3FA4A247-E914-4D33-9954-4120C1781B3E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3FA4A247-E914-4D33-9954-4120C1781B3E}.Release|Any CPU.Build.0 = Release|Any CPU - {409637E1-FDB6-4C50-8AAD-94A2A0AC572D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {409637E1-FDB6-4C50-8AAD-94A2A0AC572D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {409637E1-FDB6-4C50-8AAD-94A2A0AC572D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {409637E1-FDB6-4C50-8AAD-94A2A0AC572D}.Release|Any CPU.Build.0 = Release|Any CPU - {03A449E7-F171-4EAF-8217-8F9FA124BE82}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {03A449E7-F171-4EAF-8217-8F9FA124BE82}.Debug|Any CPU.Build.0 = Debug|Any CPU - {03A449E7-F171-4EAF-8217-8F9FA124BE82}.Release|Any CPU.ActiveCfg = Release|Any CPU - {03A449E7-F171-4EAF-8217-8F9FA124BE82}.Release|Any CPU.Build.0 = Release|Any CPU - {C2D138EC-3829-4E6A-AFB4-F2E693D086E9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C2D138EC-3829-4E6A-AFB4-F2E693D086E9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C2D138EC-3829-4E6A-AFB4-F2E693D086E9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C2D138EC-3829-4E6A-AFB4-F2E693D086E9}.Release|Any CPU.Build.0 = Release|Any CPU - {89EB2A17-C051-4B14-9B6C-8CBE53241A1B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {89EB2A17-C051-4B14-9B6C-8CBE53241A1B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {89EB2A17-C051-4B14-9B6C-8CBE53241A1B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {89EB2A17-C051-4B14-9B6C-8CBE53241A1B}.Release|Any CPU.Build.0 = Release|Any CPU - {F223A485-CA0C-4E6F-8576-0E1B370297ED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F223A485-CA0C-4E6F-8576-0E1B370297ED}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F223A485-CA0C-4E6F-8576-0E1B370297ED}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F223A485-CA0C-4E6F-8576-0E1B370297ED}.Release|Any CPU.Build.0 = Release|Any CPU - {8E8BCD5E-A8C8-48F9-B2EA-D8557D7DF8C9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8E8BCD5E-A8C8-48F9-B2EA-D8557D7DF8C9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8E8BCD5E-A8C8-48F9-B2EA-D8557D7DF8C9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8E8BCD5E-A8C8-48F9-B2EA-D8557D7DF8C9}.Release|Any CPU.Build.0 = Release|Any CPU - {64CFA58D-D56B-433D-9C16-72467820DB3F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {64CFA58D-D56B-433D-9C16-72467820DB3F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {64CFA58D-D56B-433D-9C16-72467820DB3F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {64CFA58D-D56B-433D-9C16-72467820DB3F}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {310C7D34-1592-4CCB-B73A-1474E4F5B799}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {310C7D34-1592-4CCB-B73A-1474E4F5B799}.Debug|Any CPU.Build.0 = Debug|Any CPU - {310C7D34-1592-4CCB-B73A-1474E4F5B799}.Release|Any CPU.ActiveCfg = Release|Any CPU - {310C7D34-1592-4CCB-B73A-1474E4F5B799}.Release|Any CPU.Build.0 = Release|Any CPU - {71E2CE2B-2DED-4923-AF41-CE8881A67E7F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {71E2CE2B-2DED-4923-AF41-CE8881A67E7F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {71E2CE2B-2DED-4923-AF41-CE8881A67E7F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {71E2CE2B-2DED-4923-AF41-CE8881A67E7F}.Release|Any CPU.Build.0 = Release|Any CPU - {3FA4A247-E914-4D33-9954-4120C1781B3E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3FA4A247-E914-4D33-9954-4120C1781B3E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3FA4A247-E914-4D33-9954-4120C1781B3E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3FA4A247-E914-4D33-9954-4120C1781B3E}.Release|Any CPU.Build.0 = Release|Any CPU - {409637E1-FDB6-4C50-8AAD-94A2A0AC572D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {409637E1-FDB6-4C50-8AAD-94A2A0AC572D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {409637E1-FDB6-4C50-8AAD-94A2A0AC572D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {409637E1-FDB6-4C50-8AAD-94A2A0AC572D}.Release|Any CPU.Build.0 = Release|Any CPU - {03A449E7-F171-4EAF-8217-8F9FA124BE82}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {03A449E7-F171-4EAF-8217-8F9FA124BE82}.Debug|Any CPU.Build.0 = Debug|Any CPU - {03A449E7-F171-4EAF-8217-8F9FA124BE82}.Release|Any CPU.ActiveCfg = Release|Any CPU - {03A449E7-F171-4EAF-8217-8F9FA124BE82}.Release|Any CPU.Build.0 = Release|Any CPU - {C2D138EC-3829-4E6A-AFB4-F2E693D086E9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C2D138EC-3829-4E6A-AFB4-F2E693D086E9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C2D138EC-3829-4E6A-AFB4-F2E693D086E9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C2D138EC-3829-4E6A-AFB4-F2E693D086E9}.Release|Any CPU.Build.0 = Release|Any CPU - {89EB2A17-C051-4B14-9B6C-8CBE53241A1B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {89EB2A17-C051-4B14-9B6C-8CBE53241A1B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {89EB2A17-C051-4B14-9B6C-8CBE53241A1B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {89EB2A17-C051-4B14-9B6C-8CBE53241A1B}.Release|Any CPU.Build.0 = Release|Any CPU - {F223A485-CA0C-4E6F-8576-0E1B370297ED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F223A485-CA0C-4E6F-8576-0E1B370297ED}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F223A485-CA0C-4E6F-8576-0E1B370297ED}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F223A485-CA0C-4E6F-8576-0E1B370297ED}.Release|Any CPU.Build.0 = Release|Any CPU - {8E8BCD5E-A8C8-48F9-B2EA-D8557D7DF8C9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8E8BCD5E-A8C8-48F9-B2EA-D8557D7DF8C9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8E8BCD5E-A8C8-48F9-B2EA-D8557D7DF8C9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8E8BCD5E-A8C8-48F9-B2EA-D8557D7DF8C9}.Release|Any CPU.Build.0 = Release|Any CPU - {64CFA58D-D56B-433D-9C16-72467820DB3F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {64CFA58D-D56B-433D-9C16-72467820DB3F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {64CFA58D-D56B-433D-9C16-72467820DB3F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {64CFA58D-D56B-433D-9C16-72467820DB3F}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {6AFD4F0E-3EF7-434F-9FBF-6302C837B00D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {7A90138F-E5A4-4DF4-A6AC-BA0A24A7E801} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {79EE5650-E0CB-4101-A06C-0FF71F8BBFBD} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {3F048E5C-45BA-455B-AA3B-AA683507D253} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {9CE5E624-C73A-435F-A112-1D1077F8DD46} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {310C7D34-1592-4CCB-B73A-1474E4F5B799} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {71E2CE2B-2DED-4923-AF41-CE8881A67E7F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {3FA4A247-E914-4D33-9954-4120C1781B3E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {409637E1-FDB6-4C50-8AAD-94A2A0AC572D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {03A449E7-F171-4EAF-8217-8F9FA124BE82} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C2D138EC-3829-4E6A-AFB4-F2E693D086E9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {89EB2A17-C051-4B14-9B6C-8CBE53241A1B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F223A485-CA0C-4E6F-8576-0E1B370297ED} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8E8BCD5E-A8C8-48F9-B2EA-D8557D7DF8C9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {64CFA58D-D56B-433D-9C16-72467820DB3F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {310C7D34-1592-4CCB-B73A-1474E4F5B799} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {71E2CE2B-2DED-4923-AF41-CE8881A67E7F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {3FA4A247-E914-4D33-9954-4120C1781B3E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {409637E1-FDB6-4C50-8AAD-94A2A0AC572D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {03A449E7-F171-4EAF-8217-8F9FA124BE82} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C2D138EC-3829-4E6A-AFB4-F2E693D086E9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {89EB2A17-C051-4B14-9B6C-8CBE53241A1B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F223A485-CA0C-4E6F-8576-0E1B370297ED} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8E8BCD5E-A8C8-48F9-B2EA-D8557D7DF8C9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {64CFA58D-D56B-433D-9C16-72467820DB3F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {D2B4005C-F21D-48CF-9A56-2353E0067F22} diff --git a/sdk/src/Services/Appflow/Generated/AmazonAppflowConfig.cs b/sdk/src/Services/Appflow/Generated/AmazonAppflowConfig.cs index 3ee7377812eb..c59f35ef2407 100644 --- a/sdk/src/Services/Appflow/Generated/AmazonAppflowConfig.cs +++ b/sdk/src/Services/Appflow/Generated/AmazonAppflowConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.Appflow public partial class AmazonAppflowConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("Appflow", "4.0.0.0"); private static readonly AmazonAppflowEndpointResolver EndpointResolver = new AmazonAppflowEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("Appflow", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("Appflow", "3.7.400.54"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/Appflow/Properties/AssemblyInfo.cs b/sdk/src/Services/Appflow/Properties/AssemblyInfo.cs index 431565aa634d..79ff185fe62c 100644 --- a/sdk/src/Services/Appflow/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/Appflow/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.54")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/ApplicationAutoScaling/ApplicationAutoScaling.sln b/sdk/src/Services/ApplicationAutoScaling/ApplicationAutoScaling.sln index 2fce8f9417e3..e3834a50cea0 100644 --- a/sdk/src/Services/ApplicationAutoScaling/ApplicationAutoScaling.sln +++ b/sdk/src/Services/ApplicationAutoScaling/ApplicationAutoScaling.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {6C1E9D96-D2C9-43CC-B71C-F01A026A0AD8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {6C1E9D96-D2C9-43CC-B71C-F01A026A0AD8}.Debug|Any CPU.Build.0 = Debug|Any CPU {6C1E9D96-D2C9-43CC-B71C-F01A026A0AD8}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {7F01ECF7-F43A-49C8-B200-BAC7ACA0AF41}.Debug|Any CPU.Build.0 = Debug|Any CPU {7F01ECF7-F43A-49C8-B200-BAC7ACA0AF41}.Release|Any CPU.ActiveCfg = Release|Any CPU {7F01ECF7-F43A-49C8-B200-BAC7ACA0AF41}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {5246BD9C-E234-4108-9092-EE326244FB9C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5246BD9C-E234-4108-9092-EE326244FB9C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5246BD9C-E234-4108-9092-EE326244FB9C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5246BD9C-E234-4108-9092-EE326244FB9C}.Release|Any CPU.Build.0 = Release|Any CPU - {8EBEBA5A-807B-4C1B-8E1D-FFE17273E00C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8EBEBA5A-807B-4C1B-8E1D-FFE17273E00C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8EBEBA5A-807B-4C1B-8E1D-FFE17273E00C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8EBEBA5A-807B-4C1B-8E1D-FFE17273E00C}.Release|Any CPU.Build.0 = Release|Any CPU - {CF91FD22-B4EC-4AD8-A785-5C0843BD0649}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CF91FD22-B4EC-4AD8-A785-5C0843BD0649}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CF91FD22-B4EC-4AD8-A785-5C0843BD0649}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CF91FD22-B4EC-4AD8-A785-5C0843BD0649}.Release|Any CPU.Build.0 = Release|Any CPU - {E0B8EB5B-A570-4DB1-B6B4-9CC2988D9BD8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E0B8EB5B-A570-4DB1-B6B4-9CC2988D9BD8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E0B8EB5B-A570-4DB1-B6B4-9CC2988D9BD8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E0B8EB5B-A570-4DB1-B6B4-9CC2988D9BD8}.Release|Any CPU.Build.0 = Release|Any CPU - {42BF0EDA-AEB6-40C9-A719-A9AF115125DB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {42BF0EDA-AEB6-40C9-A719-A9AF115125DB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {42BF0EDA-AEB6-40C9-A719-A9AF115125DB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {42BF0EDA-AEB6-40C9-A719-A9AF115125DB}.Release|Any CPU.Build.0 = Release|Any CPU - {7457764B-6BEC-4D8D-AD64-F631F365B01F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7457764B-6BEC-4D8D-AD64-F631F365B01F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7457764B-6BEC-4D8D-AD64-F631F365B01F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7457764B-6BEC-4D8D-AD64-F631F365B01F}.Release|Any CPU.Build.0 = Release|Any CPU - {4762AB91-8449-42CD-9AD1-8660EAD44746}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4762AB91-8449-42CD-9AD1-8660EAD44746}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4762AB91-8449-42CD-9AD1-8660EAD44746}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4762AB91-8449-42CD-9AD1-8660EAD44746}.Release|Any CPU.Build.0 = Release|Any CPU - {F9E6AB37-7952-4591-8611-655654B20125}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F9E6AB37-7952-4591-8611-655654B20125}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F9E6AB37-7952-4591-8611-655654B20125}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F9E6AB37-7952-4591-8611-655654B20125}.Release|Any CPU.Build.0 = Release|Any CPU - {9CDD5123-EFA4-4364-BC97-1D58C09198B4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9CDD5123-EFA4-4364-BC97-1D58C09198B4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9CDD5123-EFA4-4364-BC97-1D58C09198B4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9CDD5123-EFA4-4364-BC97-1D58C09198B4}.Release|Any CPU.Build.0 = Release|Any CPU - {D04AD150-B137-499D-9EFD-7907183C61FC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D04AD150-B137-499D-9EFD-7907183C61FC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D04AD150-B137-499D-9EFD-7907183C61FC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D04AD150-B137-499D-9EFD-7907183C61FC}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {5246BD9C-E234-4108-9092-EE326244FB9C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5246BD9C-E234-4108-9092-EE326244FB9C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5246BD9C-E234-4108-9092-EE326244FB9C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5246BD9C-E234-4108-9092-EE326244FB9C}.Release|Any CPU.Build.0 = Release|Any CPU - {8EBEBA5A-807B-4C1B-8E1D-FFE17273E00C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8EBEBA5A-807B-4C1B-8E1D-FFE17273E00C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8EBEBA5A-807B-4C1B-8E1D-FFE17273E00C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8EBEBA5A-807B-4C1B-8E1D-FFE17273E00C}.Release|Any CPU.Build.0 = Release|Any CPU - {CF91FD22-B4EC-4AD8-A785-5C0843BD0649}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CF91FD22-B4EC-4AD8-A785-5C0843BD0649}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CF91FD22-B4EC-4AD8-A785-5C0843BD0649}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CF91FD22-B4EC-4AD8-A785-5C0843BD0649}.Release|Any CPU.Build.0 = Release|Any CPU - {E0B8EB5B-A570-4DB1-B6B4-9CC2988D9BD8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E0B8EB5B-A570-4DB1-B6B4-9CC2988D9BD8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E0B8EB5B-A570-4DB1-B6B4-9CC2988D9BD8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E0B8EB5B-A570-4DB1-B6B4-9CC2988D9BD8}.Release|Any CPU.Build.0 = Release|Any CPU - {42BF0EDA-AEB6-40C9-A719-A9AF115125DB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {42BF0EDA-AEB6-40C9-A719-A9AF115125DB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {42BF0EDA-AEB6-40C9-A719-A9AF115125DB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {42BF0EDA-AEB6-40C9-A719-A9AF115125DB}.Release|Any CPU.Build.0 = Release|Any CPU - {7457764B-6BEC-4D8D-AD64-F631F365B01F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7457764B-6BEC-4D8D-AD64-F631F365B01F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7457764B-6BEC-4D8D-AD64-F631F365B01F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7457764B-6BEC-4D8D-AD64-F631F365B01F}.Release|Any CPU.Build.0 = Release|Any CPU - {4762AB91-8449-42CD-9AD1-8660EAD44746}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4762AB91-8449-42CD-9AD1-8660EAD44746}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4762AB91-8449-42CD-9AD1-8660EAD44746}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4762AB91-8449-42CD-9AD1-8660EAD44746}.Release|Any CPU.Build.0 = Release|Any CPU - {F9E6AB37-7952-4591-8611-655654B20125}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F9E6AB37-7952-4591-8611-655654B20125}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F9E6AB37-7952-4591-8611-655654B20125}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F9E6AB37-7952-4591-8611-655654B20125}.Release|Any CPU.Build.0 = Release|Any CPU - {9CDD5123-EFA4-4364-BC97-1D58C09198B4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9CDD5123-EFA4-4364-BC97-1D58C09198B4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9CDD5123-EFA4-4364-BC97-1D58C09198B4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9CDD5123-EFA4-4364-BC97-1D58C09198B4}.Release|Any CPU.Build.0 = Release|Any CPU - {D04AD150-B137-499D-9EFD-7907183C61FC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D04AD150-B137-499D-9EFD-7907183C61FC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D04AD150-B137-499D-9EFD-7907183C61FC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D04AD150-B137-499D-9EFD-7907183C61FC}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {6C1E9D96-D2C9-43CC-B71C-F01A026A0AD8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {DC6FD8A8-3AD4-4DBA-8320-F01F998B4F09} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {ED07C4E0-DE54-40B9-B5B0-8A8D5C3F1471} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {168C7E07-F1B2-4CEB-A13A-EBE07C02B4E3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {7F01ECF7-F43A-49C8-B200-BAC7ACA0AF41} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {5246BD9C-E234-4108-9092-EE326244FB9C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8EBEBA5A-807B-4C1B-8E1D-FFE17273E00C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {CF91FD22-B4EC-4AD8-A785-5C0843BD0649} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E0B8EB5B-A570-4DB1-B6B4-9CC2988D9BD8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {42BF0EDA-AEB6-40C9-A719-A9AF115125DB} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {7457764B-6BEC-4D8D-AD64-F631F365B01F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4762AB91-8449-42CD-9AD1-8660EAD44746} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F9E6AB37-7952-4591-8611-655654B20125} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {9CDD5123-EFA4-4364-BC97-1D58C09198B4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D04AD150-B137-499D-9EFD-7907183C61FC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {5246BD9C-E234-4108-9092-EE326244FB9C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8EBEBA5A-807B-4C1B-8E1D-FFE17273E00C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {CF91FD22-B4EC-4AD8-A785-5C0843BD0649} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E0B8EB5B-A570-4DB1-B6B4-9CC2988D9BD8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {42BF0EDA-AEB6-40C9-A719-A9AF115125DB} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {7457764B-6BEC-4D8D-AD64-F631F365B01F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4762AB91-8449-42CD-9AD1-8660EAD44746} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F9E6AB37-7952-4591-8611-655654B20125} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {9CDD5123-EFA4-4364-BC97-1D58C09198B4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D04AD150-B137-499D-9EFD-7907183C61FC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {EC92BEBF-EE28-4686-B22A-4A57330B049D} diff --git a/sdk/src/Services/ApplicationAutoScaling/Generated/AmazonApplicationAutoScalingConfig.cs b/sdk/src/Services/ApplicationAutoScaling/Generated/AmazonApplicationAutoScalingConfig.cs index 329a1d7c3fa7..09f03cdba902 100644 --- a/sdk/src/Services/ApplicationAutoScaling/Generated/AmazonApplicationAutoScalingConfig.cs +++ b/sdk/src/Services/ApplicationAutoScaling/Generated/AmazonApplicationAutoScalingConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.ApplicationAutoScaling public partial class AmazonApplicationAutoScalingConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("Application Auto Scaling", "4.0.0.0"); private static readonly AmazonApplicationAutoScalingEndpointResolver EndpointResolver = new AmazonApplicationAutoScalingEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("Application Auto Scaling", "3.7.401.26"); -======= - InternalSDKUtils.BuildUserAgentString("Application Auto Scaling", "3.7.401.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/ApplicationAutoScaling/Properties/AssemblyInfo.cs b/sdk/src/Services/ApplicationAutoScaling/Properties/AssemblyInfo.cs index d8555eb538f1..970490564493 100644 --- a/sdk/src/Services/ApplicationAutoScaling/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/ApplicationAutoScaling/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/ApplicationCostProfiler/ApplicationCostProfiler.sln b/sdk/src/Services/ApplicationCostProfiler/ApplicationCostProfiler.sln index 9a2a3f0fb581..81dab2440815 100644 --- a/sdk/src/Services/ApplicationCostProfiler/ApplicationCostProfiler.sln +++ b/sdk/src/Services/ApplicationCostProfiler/ApplicationCostProfiler.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {090C8B9D-FC68-45EA-A3DE-038E591C89BE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {090C8B9D-FC68-45EA-A3DE-038E591C89BE}.Debug|Any CPU.Build.0 = Debug|Any CPU {090C8B9D-FC68-45EA-A3DE-038E591C89BE}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {6A3252CA-11C1-45B5-AA8A-AF19358ACD17}.Debug|Any CPU.Build.0 = Debug|Any CPU {6A3252CA-11C1-45B5-AA8A-AF19358ACD17}.Release|Any CPU.ActiveCfg = Release|Any CPU {6A3252CA-11C1-45B5-AA8A-AF19358ACD17}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {C6732995-81F1-434A-A47A-42B48D158760}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C6732995-81F1-434A-A47A-42B48D158760}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C6732995-81F1-434A-A47A-42B48D158760}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C6732995-81F1-434A-A47A-42B48D158760}.Release|Any CPU.Build.0 = Release|Any CPU - {831C9F80-500F-4548-845E-91D4212186A5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {831C9F80-500F-4548-845E-91D4212186A5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {831C9F80-500F-4548-845E-91D4212186A5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {831C9F80-500F-4548-845E-91D4212186A5}.Release|Any CPU.Build.0 = Release|Any CPU - {A83D7593-F655-4C66-815D-9F0194A81DF7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A83D7593-F655-4C66-815D-9F0194A81DF7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A83D7593-F655-4C66-815D-9F0194A81DF7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A83D7593-F655-4C66-815D-9F0194A81DF7}.Release|Any CPU.Build.0 = Release|Any CPU - {985145DF-70C7-43EC-9692-47E80A4B3AFA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {985145DF-70C7-43EC-9692-47E80A4B3AFA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {985145DF-70C7-43EC-9692-47E80A4B3AFA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {985145DF-70C7-43EC-9692-47E80A4B3AFA}.Release|Any CPU.Build.0 = Release|Any CPU - {BC789A84-1532-49E4-9C1C-C8BFCC92203E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BC789A84-1532-49E4-9C1C-C8BFCC92203E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BC789A84-1532-49E4-9C1C-C8BFCC92203E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BC789A84-1532-49E4-9C1C-C8BFCC92203E}.Release|Any CPU.Build.0 = Release|Any CPU - {C6301B9B-C097-45B1-A389-4A70CA4825A5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C6301B9B-C097-45B1-A389-4A70CA4825A5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C6301B9B-C097-45B1-A389-4A70CA4825A5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C6301B9B-C097-45B1-A389-4A70CA4825A5}.Release|Any CPU.Build.0 = Release|Any CPU - {019B0E23-5585-4120-8CD0-210C30490C5E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {019B0E23-5585-4120-8CD0-210C30490C5E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {019B0E23-5585-4120-8CD0-210C30490C5E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {019B0E23-5585-4120-8CD0-210C30490C5E}.Release|Any CPU.Build.0 = Release|Any CPU - {10E6FD8B-4BC7-4BAA-ADA2-CBECDF480DEE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {10E6FD8B-4BC7-4BAA-ADA2-CBECDF480DEE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {10E6FD8B-4BC7-4BAA-ADA2-CBECDF480DEE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {10E6FD8B-4BC7-4BAA-ADA2-CBECDF480DEE}.Release|Any CPU.Build.0 = Release|Any CPU - {EBB33535-2ED3-41A7-A18E-D80F1DEFE17F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EBB33535-2ED3-41A7-A18E-D80F1DEFE17F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EBB33535-2ED3-41A7-A18E-D80F1DEFE17F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EBB33535-2ED3-41A7-A18E-D80F1DEFE17F}.Release|Any CPU.Build.0 = Release|Any CPU - {8EBEC11D-4204-426E-8FEE-8E981ABE878F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8EBEC11D-4204-426E-8FEE-8E981ABE878F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8EBEC11D-4204-426E-8FEE-8E981ABE878F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8EBEC11D-4204-426E-8FEE-8E981ABE878F}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {C6732995-81F1-434A-A47A-42B48D158760}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C6732995-81F1-434A-A47A-42B48D158760}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C6732995-81F1-434A-A47A-42B48D158760}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C6732995-81F1-434A-A47A-42B48D158760}.Release|Any CPU.Build.0 = Release|Any CPU - {831C9F80-500F-4548-845E-91D4212186A5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {831C9F80-500F-4548-845E-91D4212186A5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {831C9F80-500F-4548-845E-91D4212186A5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {831C9F80-500F-4548-845E-91D4212186A5}.Release|Any CPU.Build.0 = Release|Any CPU - {A83D7593-F655-4C66-815D-9F0194A81DF7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A83D7593-F655-4C66-815D-9F0194A81DF7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A83D7593-F655-4C66-815D-9F0194A81DF7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A83D7593-F655-4C66-815D-9F0194A81DF7}.Release|Any CPU.Build.0 = Release|Any CPU - {985145DF-70C7-43EC-9692-47E80A4B3AFA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {985145DF-70C7-43EC-9692-47E80A4B3AFA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {985145DF-70C7-43EC-9692-47E80A4B3AFA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {985145DF-70C7-43EC-9692-47E80A4B3AFA}.Release|Any CPU.Build.0 = Release|Any CPU - {BC789A84-1532-49E4-9C1C-C8BFCC92203E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BC789A84-1532-49E4-9C1C-C8BFCC92203E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BC789A84-1532-49E4-9C1C-C8BFCC92203E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BC789A84-1532-49E4-9C1C-C8BFCC92203E}.Release|Any CPU.Build.0 = Release|Any CPU - {C6301B9B-C097-45B1-A389-4A70CA4825A5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C6301B9B-C097-45B1-A389-4A70CA4825A5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C6301B9B-C097-45B1-A389-4A70CA4825A5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C6301B9B-C097-45B1-A389-4A70CA4825A5}.Release|Any CPU.Build.0 = Release|Any CPU - {019B0E23-5585-4120-8CD0-210C30490C5E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {019B0E23-5585-4120-8CD0-210C30490C5E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {019B0E23-5585-4120-8CD0-210C30490C5E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {019B0E23-5585-4120-8CD0-210C30490C5E}.Release|Any CPU.Build.0 = Release|Any CPU - {10E6FD8B-4BC7-4BAA-ADA2-CBECDF480DEE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {10E6FD8B-4BC7-4BAA-ADA2-CBECDF480DEE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {10E6FD8B-4BC7-4BAA-ADA2-CBECDF480DEE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {10E6FD8B-4BC7-4BAA-ADA2-CBECDF480DEE}.Release|Any CPU.Build.0 = Release|Any CPU - {EBB33535-2ED3-41A7-A18E-D80F1DEFE17F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EBB33535-2ED3-41A7-A18E-D80F1DEFE17F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EBB33535-2ED3-41A7-A18E-D80F1DEFE17F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EBB33535-2ED3-41A7-A18E-D80F1DEFE17F}.Release|Any CPU.Build.0 = Release|Any CPU - {8EBEC11D-4204-426E-8FEE-8E981ABE878F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8EBEC11D-4204-426E-8FEE-8E981ABE878F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8EBEC11D-4204-426E-8FEE-8E981ABE878F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8EBEC11D-4204-426E-8FEE-8E981ABE878F}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {090C8B9D-FC68-45EA-A3DE-038E591C89BE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {13F45E4B-51DF-4E3D-A649-24A189486C2B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {876D13D1-D0E4-425E-84A0-8A7D4E838393} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {AC563A43-26F8-43D6-996D-2C39DBAB04E7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {6A3252CA-11C1-45B5-AA8A-AF19358ACD17} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {C6732995-81F1-434A-A47A-42B48D158760} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {831C9F80-500F-4548-845E-91D4212186A5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A83D7593-F655-4C66-815D-9F0194A81DF7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {985145DF-70C7-43EC-9692-47E80A4B3AFA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {BC789A84-1532-49E4-9C1C-C8BFCC92203E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C6301B9B-C097-45B1-A389-4A70CA4825A5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {019B0E23-5585-4120-8CD0-210C30490C5E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {10E6FD8B-4BC7-4BAA-ADA2-CBECDF480DEE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {EBB33535-2ED3-41A7-A18E-D80F1DEFE17F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8EBEC11D-4204-426E-8FEE-8E981ABE878F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {C6732995-81F1-434A-A47A-42B48D158760} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {831C9F80-500F-4548-845E-91D4212186A5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A83D7593-F655-4C66-815D-9F0194A81DF7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {985145DF-70C7-43EC-9692-47E80A4B3AFA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {BC789A84-1532-49E4-9C1C-C8BFCC92203E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C6301B9B-C097-45B1-A389-4A70CA4825A5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {019B0E23-5585-4120-8CD0-210C30490C5E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {10E6FD8B-4BC7-4BAA-ADA2-CBECDF480DEE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {EBB33535-2ED3-41A7-A18E-D80F1DEFE17F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8EBEC11D-4204-426E-8FEE-8E981ABE878F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {CD8E8B11-58EC-4268-8E77-42BA11224D82} diff --git a/sdk/src/Services/ApplicationCostProfiler/Generated/AmazonApplicationCostProfilerConfig.cs b/sdk/src/Services/ApplicationCostProfiler/Generated/AmazonApplicationCostProfilerConfig.cs index 45ca66600dc1..d681bb1ca1fd 100644 --- a/sdk/src/Services/ApplicationCostProfiler/Generated/AmazonApplicationCostProfilerConfig.cs +++ b/sdk/src/Services/ApplicationCostProfiler/Generated/AmazonApplicationCostProfilerConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.ApplicationCostProfiler public partial class AmazonApplicationCostProfilerConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("ApplicationCostProfiler", "4.0.0.0"); private static readonly AmazonApplicationCostProfilerEndpointResolver EndpointResolver = new AmazonApplicationCostProfilerEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("ApplicationCostProfiler", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("ApplicationCostProfiler", "3.7.400.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/ApplicationCostProfiler/Properties/AssemblyInfo.cs b/sdk/src/Services/ApplicationCostProfiler/Properties/AssemblyInfo.cs index 22923a23652e..f0d12cb51f65 100644 --- a/sdk/src/Services/ApplicationCostProfiler/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/ApplicationCostProfiler/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/ApplicationDiscoveryService/ApplicationDiscoveryService.sln b/sdk/src/Services/ApplicationDiscoveryService/ApplicationDiscoveryService.sln index 6a88931fdc35..5c2b56b8ce16 100644 --- a/sdk/src/Services/ApplicationDiscoveryService/ApplicationDiscoveryService.sln +++ b/sdk/src/Services/ApplicationDiscoveryService/ApplicationDiscoveryService.sln @@ -94,7 +94,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {C243DF07-495F-4E31-B302-91C45114B40A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {C243DF07-495F-4E31-B302-91C45114B40A}.Debug|Any CPU.Build.0 = Debug|Any CPU {C243DF07-495F-4E31-B302-91C45114B40A}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -119,113 +126,6 @@ Global {C2B902FF-279A-4B89-AEA6-B1B2C4C1216C}.Debug|Any CPU.Build.0 = Debug|Any CPU {C2B902FF-279A-4B89-AEA6-B1B2C4C1216C}.Release|Any CPU.ActiveCfg = Release|Any CPU {C2B902FF-279A-4B89-AEA6-B1B2C4C1216C}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {D0BD43B5-00C2-4523-AF41-2F2912F1BBA0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D0BD43B5-00C2-4523-AF41-2F2912F1BBA0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D0BD43B5-00C2-4523-AF41-2F2912F1BBA0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D0BD43B5-00C2-4523-AF41-2F2912F1BBA0}.Release|Any CPU.Build.0 = Release|Any CPU - {108DC223-6D3D-4DDC-BCC4-D7789BEE3AE1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {108DC223-6D3D-4DDC-BCC4-D7789BEE3AE1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {108DC223-6D3D-4DDC-BCC4-D7789BEE3AE1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {108DC223-6D3D-4DDC-BCC4-D7789BEE3AE1}.Release|Any CPU.Build.0 = Release|Any CPU - {C1BCD84B-0C4B-4C49-94A3-0DD279914AF2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C1BCD84B-0C4B-4C49-94A3-0DD279914AF2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C1BCD84B-0C4B-4C49-94A3-0DD279914AF2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C1BCD84B-0C4B-4C49-94A3-0DD279914AF2}.Release|Any CPU.Build.0 = Release|Any CPU - {CC51D03E-E3C0-414A-9BD0-B534D449BEFC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CC51D03E-E3C0-414A-9BD0-B534D449BEFC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CC51D03E-E3C0-414A-9BD0-B534D449BEFC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CC51D03E-E3C0-414A-9BD0-B534D449BEFC}.Release|Any CPU.Build.0 = Release|Any CPU - {A682B2E9-220A-4FFA-999B-5A548665A08F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A682B2E9-220A-4FFA-999B-5A548665A08F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A682B2E9-220A-4FFA-999B-5A548665A08F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A682B2E9-220A-4FFA-999B-5A548665A08F}.Release|Any CPU.Build.0 = Release|Any CPU - {A2DF53DB-D371-40CD-97BC-6F343452695B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A2DF53DB-D371-40CD-97BC-6F343452695B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A2DF53DB-D371-40CD-97BC-6F343452695B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A2DF53DB-D371-40CD-97BC-6F343452695B}.Release|Any CPU.Build.0 = Release|Any CPU - {E2AA61E6-8F5E-492A-B20C-2338AB998631}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E2AA61E6-8F5E-492A-B20C-2338AB998631}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E2AA61E6-8F5E-492A-B20C-2338AB998631}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E2AA61E6-8F5E-492A-B20C-2338AB998631}.Release|Any CPU.Build.0 = Release|Any CPU - {E8CC5DDB-79B3-47DE-9F94-C4F91D352751}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E8CC5DDB-79B3-47DE-9F94-C4F91D352751}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E8CC5DDB-79B3-47DE-9F94-C4F91D352751}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E8CC5DDB-79B3-47DE-9F94-C4F91D352751}.Release|Any CPU.Build.0 = Release|Any CPU - {80A7C90D-6261-426D-888C-A01EDE351D8A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {80A7C90D-6261-426D-888C-A01EDE351D8A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {80A7C90D-6261-426D-888C-A01EDE351D8A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {80A7C90D-6261-426D-888C-A01EDE351D8A}.Release|Any CPU.Build.0 = Release|Any CPU - {AB0377FA-9A59-42B4-B119-ACB3939B3DD8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AB0377FA-9A59-42B4-B119-ACB3939B3DD8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AB0377FA-9A59-42B4-B119-ACB3939B3DD8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AB0377FA-9A59-42B4-B119-ACB3939B3DD8}.Release|Any CPU.Build.0 = Release|Any CPU - {74EFD455-28C5-483D-ABCF-4894F7DB1324}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {74EFD455-28C5-483D-ABCF-4894F7DB1324}.Debug|Any CPU.Build.0 = Debug|Any CPU - {74EFD455-28C5-483D-ABCF-4894F7DB1324}.Release|Any CPU.ActiveCfg = Release|Any CPU - {74EFD455-28C5-483D-ABCF-4894F7DB1324}.Release|Any CPU.Build.0 = Release|Any CPU - {14CC82EB-F4A1-4F21-91A0-73A6969C100D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {14CC82EB-F4A1-4F21-91A0-73A6969C100D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {14CC82EB-F4A1-4F21-91A0-73A6969C100D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {14CC82EB-F4A1-4F21-91A0-73A6969C100D}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {D0BD43B5-00C2-4523-AF41-2F2912F1BBA0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D0BD43B5-00C2-4523-AF41-2F2912F1BBA0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D0BD43B5-00C2-4523-AF41-2F2912F1BBA0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D0BD43B5-00C2-4523-AF41-2F2912F1BBA0}.Release|Any CPU.Build.0 = Release|Any CPU - {108DC223-6D3D-4DDC-BCC4-D7789BEE3AE1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {108DC223-6D3D-4DDC-BCC4-D7789BEE3AE1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {108DC223-6D3D-4DDC-BCC4-D7789BEE3AE1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {108DC223-6D3D-4DDC-BCC4-D7789BEE3AE1}.Release|Any CPU.Build.0 = Release|Any CPU - {C1BCD84B-0C4B-4C49-94A3-0DD279914AF2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C1BCD84B-0C4B-4C49-94A3-0DD279914AF2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C1BCD84B-0C4B-4C49-94A3-0DD279914AF2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C1BCD84B-0C4B-4C49-94A3-0DD279914AF2}.Release|Any CPU.Build.0 = Release|Any CPU - {CC51D03E-E3C0-414A-9BD0-B534D449BEFC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CC51D03E-E3C0-414A-9BD0-B534D449BEFC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CC51D03E-E3C0-414A-9BD0-B534D449BEFC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CC51D03E-E3C0-414A-9BD0-B534D449BEFC}.Release|Any CPU.Build.0 = Release|Any CPU - {A682B2E9-220A-4FFA-999B-5A548665A08F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A682B2E9-220A-4FFA-999B-5A548665A08F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A682B2E9-220A-4FFA-999B-5A548665A08F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A682B2E9-220A-4FFA-999B-5A548665A08F}.Release|Any CPU.Build.0 = Release|Any CPU - {A2DF53DB-D371-40CD-97BC-6F343452695B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A2DF53DB-D371-40CD-97BC-6F343452695B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A2DF53DB-D371-40CD-97BC-6F343452695B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A2DF53DB-D371-40CD-97BC-6F343452695B}.Release|Any CPU.Build.0 = Release|Any CPU - {E2AA61E6-8F5E-492A-B20C-2338AB998631}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E2AA61E6-8F5E-492A-B20C-2338AB998631}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E2AA61E6-8F5E-492A-B20C-2338AB998631}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E2AA61E6-8F5E-492A-B20C-2338AB998631}.Release|Any CPU.Build.0 = Release|Any CPU - {E8CC5DDB-79B3-47DE-9F94-C4F91D352751}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E8CC5DDB-79B3-47DE-9F94-C4F91D352751}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E8CC5DDB-79B3-47DE-9F94-C4F91D352751}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E8CC5DDB-79B3-47DE-9F94-C4F91D352751}.Release|Any CPU.Build.0 = Release|Any CPU - {80A7C90D-6261-426D-888C-A01EDE351D8A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {80A7C90D-6261-426D-888C-A01EDE351D8A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {80A7C90D-6261-426D-888C-A01EDE351D8A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {80A7C90D-6261-426D-888C-A01EDE351D8A}.Release|Any CPU.Build.0 = Release|Any CPU - {AB0377FA-9A59-42B4-B119-ACB3939B3DD8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AB0377FA-9A59-42B4-B119-ACB3939B3DD8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AB0377FA-9A59-42B4-B119-ACB3939B3DD8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AB0377FA-9A59-42B4-B119-ACB3939B3DD8}.Release|Any CPU.Build.0 = Release|Any CPU - {74EFD455-28C5-483D-ABCF-4894F7DB1324}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {74EFD455-28C5-483D-ABCF-4894F7DB1324}.Debug|Any CPU.Build.0 = Debug|Any CPU - {74EFD455-28C5-483D-ABCF-4894F7DB1324}.Release|Any CPU.ActiveCfg = Release|Any CPU - {74EFD455-28C5-483D-ABCF-4894F7DB1324}.Release|Any CPU.Build.0 = Release|Any CPU - {14CC82EB-F4A1-4F21-91A0-73A6969C100D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {14CC82EB-F4A1-4F21-91A0-73A6969C100D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {14CC82EB-F4A1-4F21-91A0-73A6969C100D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {14CC82EB-F4A1-4F21-91A0-73A6969C100D}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -242,42 +142,14 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {C243DF07-495F-4E31-B302-91C45114B40A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {D251E53B-4005-4AEF-80FF-E351C677F0E6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {FA66C7C0-A2E5-4F07-BF0D-361876FB831D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {3E177AC5-EB10-49FD-8908-7214BCCF9BE6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {80CCD63E-C18B-4BED-89E4-24F6FDD905FD} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {C2B902FF-279A-4B89-AEA6-B1B2C4C1216C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {D0BD43B5-00C2-4523-AF41-2F2912F1BBA0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {108DC223-6D3D-4DDC-BCC4-D7789BEE3AE1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C1BCD84B-0C4B-4C49-94A3-0DD279914AF2} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {CC51D03E-E3C0-414A-9BD0-B534D449BEFC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A682B2E9-220A-4FFA-999B-5A548665A08F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A2DF53DB-D371-40CD-97BC-6F343452695B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E2AA61E6-8F5E-492A-B20C-2338AB998631} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E8CC5DDB-79B3-47DE-9F94-C4F91D352751} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {80A7C90D-6261-426D-888C-A01EDE351D8A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {AB0377FA-9A59-42B4-B119-ACB3939B3DD8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {74EFD455-28C5-483D-ABCF-4894F7DB1324} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {14CC82EB-F4A1-4F21-91A0-73A6969C100D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {D0BD43B5-00C2-4523-AF41-2F2912F1BBA0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {108DC223-6D3D-4DDC-BCC4-D7789BEE3AE1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C1BCD84B-0C4B-4C49-94A3-0DD279914AF2} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {CC51D03E-E3C0-414A-9BD0-B534D449BEFC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A682B2E9-220A-4FFA-999B-5A548665A08F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A2DF53DB-D371-40CD-97BC-6F343452695B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E2AA61E6-8F5E-492A-B20C-2338AB998631} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E8CC5DDB-79B3-47DE-9F94-C4F91D352751} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {80A7C90D-6261-426D-888C-A01EDE351D8A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {AB0377FA-9A59-42B4-B119-ACB3939B3DD8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {74EFD455-28C5-483D-ABCF-4894F7DB1324} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {14CC82EB-F4A1-4F21-91A0-73A6969C100D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {87DE9546-7164-4A01-826E-B69E19AC11A0} diff --git a/sdk/src/Services/ApplicationDiscoveryService/Generated/AmazonApplicationDiscoveryServiceConfig.cs b/sdk/src/Services/ApplicationDiscoveryService/Generated/AmazonApplicationDiscoveryServiceConfig.cs index 6d09b9121b8d..6a781fd655f2 100644 --- a/sdk/src/Services/ApplicationDiscoveryService/Generated/AmazonApplicationDiscoveryServiceConfig.cs +++ b/sdk/src/Services/ApplicationDiscoveryService/Generated/AmazonApplicationDiscoveryServiceConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.ApplicationDiscoveryService public partial class AmazonApplicationDiscoveryServiceConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("Application Discovery Service", "4.0.0.0"); private static readonly AmazonApplicationDiscoveryServiceEndpointResolver EndpointResolver = new AmazonApplicationDiscoveryServiceEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("Application Discovery Service", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("Application Discovery Service", "3.7.400.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/ApplicationDiscoveryService/Properties/AssemblyInfo.cs b/sdk/src/Services/ApplicationDiscoveryService/Properties/AssemblyInfo.cs index 2c00f90a7693..895e49f968bf 100644 --- a/sdk/src/Services/ApplicationDiscoveryService/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/ApplicationDiscoveryService/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/ApplicationInsights/ApplicationInsights.sln b/sdk/src/Services/ApplicationInsights/ApplicationInsights.sln index 273007106c31..b12c9cf38d22 100644 --- a/sdk/src/Services/ApplicationInsights/ApplicationInsights.sln +++ b/sdk/src/Services/ApplicationInsights/ApplicationInsights.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {D1E9829B-779F-4189-982F-08956139D58B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {D1E9829B-779F-4189-982F-08956139D58B}.Debug|Any CPU.Build.0 = Debug|Any CPU {D1E9829B-779F-4189-982F-08956139D58B}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {F8A5C897-4289-4E33-A53A-97B27EFCA7F0}.Debug|Any CPU.Build.0 = Debug|Any CPU {F8A5C897-4289-4E33-A53A-97B27EFCA7F0}.Release|Any CPU.ActiveCfg = Release|Any CPU {F8A5C897-4289-4E33-A53A-97B27EFCA7F0}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {253D3304-163F-4DDE-905E-07B7B9354AB6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {253D3304-163F-4DDE-905E-07B7B9354AB6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {253D3304-163F-4DDE-905E-07B7B9354AB6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {253D3304-163F-4DDE-905E-07B7B9354AB6}.Release|Any CPU.Build.0 = Release|Any CPU - {C60222F2-DBEF-49B8-B4CC-D3029CA2EE37}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C60222F2-DBEF-49B8-B4CC-D3029CA2EE37}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C60222F2-DBEF-49B8-B4CC-D3029CA2EE37}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C60222F2-DBEF-49B8-B4CC-D3029CA2EE37}.Release|Any CPU.Build.0 = Release|Any CPU - {E6D1284F-60E0-4ABD-934A-65EFF3AE3A3D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E6D1284F-60E0-4ABD-934A-65EFF3AE3A3D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E6D1284F-60E0-4ABD-934A-65EFF3AE3A3D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E6D1284F-60E0-4ABD-934A-65EFF3AE3A3D}.Release|Any CPU.Build.0 = Release|Any CPU - {5D1634AF-D5CD-4336-B0AB-15261A3C4ADC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5D1634AF-D5CD-4336-B0AB-15261A3C4ADC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5D1634AF-D5CD-4336-B0AB-15261A3C4ADC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5D1634AF-D5CD-4336-B0AB-15261A3C4ADC}.Release|Any CPU.Build.0 = Release|Any CPU - {5854D5C4-7132-4F53-9025-5A9C7D49BC64}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5854D5C4-7132-4F53-9025-5A9C7D49BC64}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5854D5C4-7132-4F53-9025-5A9C7D49BC64}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5854D5C4-7132-4F53-9025-5A9C7D49BC64}.Release|Any CPU.Build.0 = Release|Any CPU - {BEDCF3C6-03D9-4841-8667-5A2E091B9E13}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BEDCF3C6-03D9-4841-8667-5A2E091B9E13}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BEDCF3C6-03D9-4841-8667-5A2E091B9E13}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BEDCF3C6-03D9-4841-8667-5A2E091B9E13}.Release|Any CPU.Build.0 = Release|Any CPU - {ABA9174D-E446-4404-9728-BD1DD806CAFE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {ABA9174D-E446-4404-9728-BD1DD806CAFE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {ABA9174D-E446-4404-9728-BD1DD806CAFE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {ABA9174D-E446-4404-9728-BD1DD806CAFE}.Release|Any CPU.Build.0 = Release|Any CPU - {943B78F5-DDEA-4CA2-86BC-7AE60C14C54B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {943B78F5-DDEA-4CA2-86BC-7AE60C14C54B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {943B78F5-DDEA-4CA2-86BC-7AE60C14C54B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {943B78F5-DDEA-4CA2-86BC-7AE60C14C54B}.Release|Any CPU.Build.0 = Release|Any CPU - {9171365A-432D-4341-A419-132997D1E1F9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9171365A-432D-4341-A419-132997D1E1F9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9171365A-432D-4341-A419-132997D1E1F9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9171365A-432D-4341-A419-132997D1E1F9}.Release|Any CPU.Build.0 = Release|Any CPU - {C0CFF448-BB18-409F-A85D-BE491A079BDC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C0CFF448-BB18-409F-A85D-BE491A079BDC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C0CFF448-BB18-409F-A85D-BE491A079BDC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C0CFF448-BB18-409F-A85D-BE491A079BDC}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {253D3304-163F-4DDE-905E-07B7B9354AB6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {253D3304-163F-4DDE-905E-07B7B9354AB6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {253D3304-163F-4DDE-905E-07B7B9354AB6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {253D3304-163F-4DDE-905E-07B7B9354AB6}.Release|Any CPU.Build.0 = Release|Any CPU - {C60222F2-DBEF-49B8-B4CC-D3029CA2EE37}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C60222F2-DBEF-49B8-B4CC-D3029CA2EE37}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C60222F2-DBEF-49B8-B4CC-D3029CA2EE37}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C60222F2-DBEF-49B8-B4CC-D3029CA2EE37}.Release|Any CPU.Build.0 = Release|Any CPU - {E6D1284F-60E0-4ABD-934A-65EFF3AE3A3D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E6D1284F-60E0-4ABD-934A-65EFF3AE3A3D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E6D1284F-60E0-4ABD-934A-65EFF3AE3A3D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E6D1284F-60E0-4ABD-934A-65EFF3AE3A3D}.Release|Any CPU.Build.0 = Release|Any CPU - {5D1634AF-D5CD-4336-B0AB-15261A3C4ADC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5D1634AF-D5CD-4336-B0AB-15261A3C4ADC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5D1634AF-D5CD-4336-B0AB-15261A3C4ADC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5D1634AF-D5CD-4336-B0AB-15261A3C4ADC}.Release|Any CPU.Build.0 = Release|Any CPU - {5854D5C4-7132-4F53-9025-5A9C7D49BC64}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5854D5C4-7132-4F53-9025-5A9C7D49BC64}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5854D5C4-7132-4F53-9025-5A9C7D49BC64}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5854D5C4-7132-4F53-9025-5A9C7D49BC64}.Release|Any CPU.Build.0 = Release|Any CPU - {BEDCF3C6-03D9-4841-8667-5A2E091B9E13}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BEDCF3C6-03D9-4841-8667-5A2E091B9E13}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BEDCF3C6-03D9-4841-8667-5A2E091B9E13}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BEDCF3C6-03D9-4841-8667-5A2E091B9E13}.Release|Any CPU.Build.0 = Release|Any CPU - {ABA9174D-E446-4404-9728-BD1DD806CAFE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {ABA9174D-E446-4404-9728-BD1DD806CAFE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {ABA9174D-E446-4404-9728-BD1DD806CAFE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {ABA9174D-E446-4404-9728-BD1DD806CAFE}.Release|Any CPU.Build.0 = Release|Any CPU - {943B78F5-DDEA-4CA2-86BC-7AE60C14C54B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {943B78F5-DDEA-4CA2-86BC-7AE60C14C54B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {943B78F5-DDEA-4CA2-86BC-7AE60C14C54B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {943B78F5-DDEA-4CA2-86BC-7AE60C14C54B}.Release|Any CPU.Build.0 = Release|Any CPU - {9171365A-432D-4341-A419-132997D1E1F9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9171365A-432D-4341-A419-132997D1E1F9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9171365A-432D-4341-A419-132997D1E1F9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9171365A-432D-4341-A419-132997D1E1F9}.Release|Any CPU.Build.0 = Release|Any CPU - {C0CFF448-BB18-409F-A85D-BE491A079BDC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C0CFF448-BB18-409F-A85D-BE491A079BDC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C0CFF448-BB18-409F-A85D-BE491A079BDC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C0CFF448-BB18-409F-A85D-BE491A079BDC}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {D1E9829B-779F-4189-982F-08956139D58B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {A4915E16-B0CB-4ACC-905C-B94AF7246AA4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {4E292A81-CA9C-467F-B3AC-1C30911EE6E2} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {5AAF0CCF-8346-4555-8F34-C8BC2B2DEA02} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {F8A5C897-4289-4E33-A53A-97B27EFCA7F0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {253D3304-163F-4DDE-905E-07B7B9354AB6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C60222F2-DBEF-49B8-B4CC-D3029CA2EE37} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E6D1284F-60E0-4ABD-934A-65EFF3AE3A3D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {5D1634AF-D5CD-4336-B0AB-15261A3C4ADC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {5854D5C4-7132-4F53-9025-5A9C7D49BC64} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {BEDCF3C6-03D9-4841-8667-5A2E091B9E13} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {ABA9174D-E446-4404-9728-BD1DD806CAFE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {943B78F5-DDEA-4CA2-86BC-7AE60C14C54B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {9171365A-432D-4341-A419-132997D1E1F9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C0CFF448-BB18-409F-A85D-BE491A079BDC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {253D3304-163F-4DDE-905E-07B7B9354AB6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C60222F2-DBEF-49B8-B4CC-D3029CA2EE37} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E6D1284F-60E0-4ABD-934A-65EFF3AE3A3D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {5D1634AF-D5CD-4336-B0AB-15261A3C4ADC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {5854D5C4-7132-4F53-9025-5A9C7D49BC64} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {BEDCF3C6-03D9-4841-8667-5A2E091B9E13} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {ABA9174D-E446-4404-9728-BD1DD806CAFE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {943B78F5-DDEA-4CA2-86BC-7AE60C14C54B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {9171365A-432D-4341-A419-132997D1E1F9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C0CFF448-BB18-409F-A85D-BE491A079BDC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {DB0418B2-9DE0-4DD3-A861-DC7A2F31BBCF} diff --git a/sdk/src/Services/ApplicationInsights/Generated/AmazonApplicationInsightsConfig.cs b/sdk/src/Services/ApplicationInsights/Generated/AmazonApplicationInsightsConfig.cs index f3f35deaa335..734bb7ef3227 100644 --- a/sdk/src/Services/ApplicationInsights/Generated/AmazonApplicationInsightsConfig.cs +++ b/sdk/src/Services/ApplicationInsights/Generated/AmazonApplicationInsightsConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.ApplicationInsights public partial class AmazonApplicationInsightsConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("Application Insights", "4.0.0.0"); private static readonly AmazonApplicationInsightsEndpointResolver EndpointResolver = new AmazonApplicationInsightsEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("Application Insights", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("Application Insights", "3.7.401.17"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/ApplicationInsights/Generated/Model/Internal/MarshallTransformations/CreateApplicationRequestMarshaller.cs b/sdk/src/Services/ApplicationInsights/Generated/Model/Internal/MarshallTransformations/CreateApplicationRequestMarshaller.cs index cd852e6b0e38..be60bc65435a 100644 --- a/sdk/src/Services/ApplicationInsights/Generated/Model/Internal/MarshallTransformations/CreateApplicationRequestMarshaller.cs +++ b/sdk/src/Services/ApplicationInsights/Generated/Model/Internal/MarshallTransformations/CreateApplicationRequestMarshaller.cs @@ -107,27 +107,7 @@ public IRequest Marshall(CreateApplicationRequest publicRequest) context.Writer.Write(publicRequest.OpsCenterEnabled.Value); } -<<<<<<< HEAD if(publicRequest.IsSetOpsItemSNSTopicArn()) -||||||| Commit version number update changes - if(publicRequest.IsSetTags()) - { - context.Writer.WritePropertyName("Tags"); - context.Writer.WriteArrayStart(); - foreach(var publicRequestTagsListValue in publicRequest.Tags) -======= - if(publicRequest.IsSetSNSNotificationArn()) - { - context.Writer.WritePropertyName("SNSNotificationArn"); - context.Writer.Write(publicRequest.SNSNotificationArn); - } - - if(publicRequest.IsSetTags()) - { - context.Writer.WritePropertyName("Tags"); - context.Writer.WriteArrayStart(); - foreach(var publicRequestTagsListValue in publicRequest.Tags) ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b { context.Writer.WritePropertyName("OpsItemSNSTopicArn"); context.Writer.Write(publicRequest.OpsItemSNSTopicArn); @@ -139,6 +119,12 @@ public IRequest Marshall(CreateApplicationRequest publicRequest) context.Writer.Write(publicRequest.ResourceGroupName); } + if(publicRequest.IsSetSNSNotificationArn()) + { + context.Writer.WritePropertyName("SNSNotificationArn"); + context.Writer.Write(publicRequest.SNSNotificationArn); + } + if(publicRequest.IsSetTags()) { context.Writer.WritePropertyName("Tags"); diff --git a/sdk/src/Services/ApplicationInsights/Generated/Model/Internal/MarshallTransformations/UpdateApplicationRequestMarshaller.cs b/sdk/src/Services/ApplicationInsights/Generated/Model/Internal/MarshallTransformations/UpdateApplicationRequestMarshaller.cs index c7e7d4b293af..f0bcc478b992 100644 --- a/sdk/src/Services/ApplicationInsights/Generated/Model/Internal/MarshallTransformations/UpdateApplicationRequestMarshaller.cs +++ b/sdk/src/Services/ApplicationInsights/Generated/Model/Internal/MarshallTransformations/UpdateApplicationRequestMarshaller.cs @@ -113,98 +113,16 @@ public IRequest Marshall(UpdateApplicationRequest publicRequest) context.Writer.Write(publicRequest.ResourceGroupName); } + if(publicRequest.IsSetSNSNotificationArn()) + { + context.Writer.WritePropertyName("SNSNotificationArn"); + context.Writer.Write(publicRequest.SNSNotificationArn); + } + writer.WriteObjectEnd(); } -<<<<<<< HEAD request.Content = memoryStream.ToArray(); -||||||| Commit version number update changes - if(publicRequest.IsSetAutoConfigEnabled()) - { - context.Writer.WritePropertyName("AutoConfigEnabled"); - context.Writer.Write(publicRequest.AutoConfigEnabled); - } - - if(publicRequest.IsSetCWEMonitorEnabled()) - { - context.Writer.WritePropertyName("CWEMonitorEnabled"); - context.Writer.Write(publicRequest.CWEMonitorEnabled); - } - - if(publicRequest.IsSetOpsCenterEnabled()) - { - context.Writer.WritePropertyName("OpsCenterEnabled"); - context.Writer.Write(publicRequest.OpsCenterEnabled); - } - - if(publicRequest.IsSetOpsItemSNSTopicArn()) - { - context.Writer.WritePropertyName("OpsItemSNSTopicArn"); - context.Writer.Write(publicRequest.OpsItemSNSTopicArn); - } - - if(publicRequest.IsSetRemoveSNSTopic()) - { - context.Writer.WritePropertyName("RemoveSNSTopic"); - context.Writer.Write(publicRequest.RemoveSNSTopic); - } - - if(publicRequest.IsSetResourceGroupName()) - { - context.Writer.WritePropertyName("ResourceGroupName"); - context.Writer.Write(publicRequest.ResourceGroupName); - } - - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); -======= - if(publicRequest.IsSetAutoConfigEnabled()) - { - context.Writer.WritePropertyName("AutoConfigEnabled"); - context.Writer.Write(publicRequest.AutoConfigEnabled); - } - - if(publicRequest.IsSetCWEMonitorEnabled()) - { - context.Writer.WritePropertyName("CWEMonitorEnabled"); - context.Writer.Write(publicRequest.CWEMonitorEnabled); - } - - if(publicRequest.IsSetOpsCenterEnabled()) - { - context.Writer.WritePropertyName("OpsCenterEnabled"); - context.Writer.Write(publicRequest.OpsCenterEnabled); - } - - if(publicRequest.IsSetOpsItemSNSTopicArn()) - { - context.Writer.WritePropertyName("OpsItemSNSTopicArn"); - context.Writer.Write(publicRequest.OpsItemSNSTopicArn); - } - - if(publicRequest.IsSetRemoveSNSTopic()) - { - context.Writer.WritePropertyName("RemoveSNSTopic"); - context.Writer.Write(publicRequest.RemoveSNSTopic); - } - - if(publicRequest.IsSetResourceGroupName()) - { - context.Writer.WritePropertyName("ResourceGroupName"); - context.Writer.Write(publicRequest.ResourceGroupName); - } - - if(publicRequest.IsSetSNSNotificationArn()) - { - context.Writer.WritePropertyName("SNSNotificationArn"); - context.Writer.Write(publicRequest.SNSNotificationArn); - } - - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b } diff --git a/sdk/src/Services/ApplicationInsights/Generated/Model/Internal/MarshallTransformations/WorkloadUnmarshaller.cs b/sdk/src/Services/ApplicationInsights/Generated/Model/Internal/MarshallTransformations/WorkloadUnmarshaller.cs index 23450699b56d..4ab29943c0ce 100644 --- a/sdk/src/Services/ApplicationInsights/Generated/Model/Internal/MarshallTransformations/WorkloadUnmarshaller.cs +++ b/sdk/src/Services/ApplicationInsights/Generated/Model/Internal/MarshallTransformations/WorkloadUnmarshaller.cs @@ -74,7 +74,7 @@ public Workload Unmarshall(JsonUnmarshallerContext context) } if (context.TestExpression("MissingWorkloadConfig", targetDepth)) { - var unmarshaller = BoolUnmarshaller.Instance; + var unmarshaller = NullableBoolUnmarshaller.Instance; unmarshalledObject.MissingWorkloadConfig = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/ApplicationInsights/Generated/Model/Workload.cs b/sdk/src/Services/ApplicationInsights/Generated/Model/Workload.cs index 9e3cccb89c4e..f6deecfb7b2e 100644 --- a/sdk/src/Services/ApplicationInsights/Generated/Model/Workload.cs +++ b/sdk/src/Services/ApplicationInsights/Generated/Model/Workload.cs @@ -67,9 +67,9 @@ internal bool IsSetComponentName() /// were provided. /// /// - public bool MissingWorkloadConfig + public bool? MissingWorkloadConfig { - get { return this._missingWorkloadConfig.GetValueOrDefault(); } + get { return this._missingWorkloadConfig; } set { this._missingWorkloadConfig = value; } } diff --git a/sdk/src/Services/ApplicationInsights/Properties/AssemblyInfo.cs b/sdk/src/Services/ApplicationInsights/Properties/AssemblyInfo.cs index 037c32525bad..a206e9d881d9 100644 --- a/sdk/src/Services/ApplicationInsights/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/ApplicationInsights/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.17")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/ApplicationSignals/ApplicationSignals.sln b/sdk/src/Services/ApplicationSignals/ApplicationSignals.sln index 997e72214e03..b9d0ad8fd812 100644 --- a/sdk/src/Services/ApplicationSignals/ApplicationSignals.sln +++ b/sdk/src/Services/ApplicationSignals/ApplicationSignals.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {96564FA3-5370-431E-80B9-526EF541AE16}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {96564FA3-5370-431E-80B9-526EF541AE16}.Debug|Any CPU.Build.0 = Debug|Any CPU {96564FA3-5370-431E-80B9-526EF541AE16}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {3CAA3FE8-C9EF-459F-821D-8F55728F1038}.Debug|Any CPU.Build.0 = Debug|Any CPU {3CAA3FE8-C9EF-459F-821D-8F55728F1038}.Release|Any CPU.ActiveCfg = Release|Any CPU {3CAA3FE8-C9EF-459F-821D-8F55728F1038}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {2D92C07E-25EF-4F71-9E41-2E64A6275C8C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2D92C07E-25EF-4F71-9E41-2E64A6275C8C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2D92C07E-25EF-4F71-9E41-2E64A6275C8C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2D92C07E-25EF-4F71-9E41-2E64A6275C8C}.Release|Any CPU.Build.0 = Release|Any CPU - {82529F56-0745-4D4B-B63E-B42FA9134F84}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {82529F56-0745-4D4B-B63E-B42FA9134F84}.Debug|Any CPU.Build.0 = Debug|Any CPU - {82529F56-0745-4D4B-B63E-B42FA9134F84}.Release|Any CPU.ActiveCfg = Release|Any CPU - {82529F56-0745-4D4B-B63E-B42FA9134F84}.Release|Any CPU.Build.0 = Release|Any CPU - {0BD7AB91-8749-4CD5-BB8A-2C0EC3F04804}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0BD7AB91-8749-4CD5-BB8A-2C0EC3F04804}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0BD7AB91-8749-4CD5-BB8A-2C0EC3F04804}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0BD7AB91-8749-4CD5-BB8A-2C0EC3F04804}.Release|Any CPU.Build.0 = Release|Any CPU - {81C0429C-09C9-4A7A-B341-CA375CB13BC1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {81C0429C-09C9-4A7A-B341-CA375CB13BC1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {81C0429C-09C9-4A7A-B341-CA375CB13BC1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {81C0429C-09C9-4A7A-B341-CA375CB13BC1}.Release|Any CPU.Build.0 = Release|Any CPU - {6CF4204F-B30A-495D-87E3-1C7452755772}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6CF4204F-B30A-495D-87E3-1C7452755772}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6CF4204F-B30A-495D-87E3-1C7452755772}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6CF4204F-B30A-495D-87E3-1C7452755772}.Release|Any CPU.Build.0 = Release|Any CPU - {53819B6F-4297-4200-AC5C-4E321645CAC2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {53819B6F-4297-4200-AC5C-4E321645CAC2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {53819B6F-4297-4200-AC5C-4E321645CAC2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {53819B6F-4297-4200-AC5C-4E321645CAC2}.Release|Any CPU.Build.0 = Release|Any CPU - {DFA9DA38-39AE-4974-A371-14E21337C902}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DFA9DA38-39AE-4974-A371-14E21337C902}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DFA9DA38-39AE-4974-A371-14E21337C902}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DFA9DA38-39AE-4974-A371-14E21337C902}.Release|Any CPU.Build.0 = Release|Any CPU - {2E4B4166-13E8-4B5F-AB93-CE836AE70F55}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2E4B4166-13E8-4B5F-AB93-CE836AE70F55}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2E4B4166-13E8-4B5F-AB93-CE836AE70F55}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2E4B4166-13E8-4B5F-AB93-CE836AE70F55}.Release|Any CPU.Build.0 = Release|Any CPU - {28E8779B-C8A5-4179-A939-37E84715BA25}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {28E8779B-C8A5-4179-A939-37E84715BA25}.Debug|Any CPU.Build.0 = Debug|Any CPU - {28E8779B-C8A5-4179-A939-37E84715BA25}.Release|Any CPU.ActiveCfg = Release|Any CPU - {28E8779B-C8A5-4179-A939-37E84715BA25}.Release|Any CPU.Build.0 = Release|Any CPU - {DFA44F32-BEFD-4F28-9AAC-D28344459F99}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DFA44F32-BEFD-4F28-9AAC-D28344459F99}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DFA44F32-BEFD-4F28-9AAC-D28344459F99}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DFA44F32-BEFD-4F28-9AAC-D28344459F99}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {2D92C07E-25EF-4F71-9E41-2E64A6275C8C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2D92C07E-25EF-4F71-9E41-2E64A6275C8C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2D92C07E-25EF-4F71-9E41-2E64A6275C8C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2D92C07E-25EF-4F71-9E41-2E64A6275C8C}.Release|Any CPU.Build.0 = Release|Any CPU - {82529F56-0745-4D4B-B63E-B42FA9134F84}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {82529F56-0745-4D4B-B63E-B42FA9134F84}.Debug|Any CPU.Build.0 = Debug|Any CPU - {82529F56-0745-4D4B-B63E-B42FA9134F84}.Release|Any CPU.ActiveCfg = Release|Any CPU - {82529F56-0745-4D4B-B63E-B42FA9134F84}.Release|Any CPU.Build.0 = Release|Any CPU - {0BD7AB91-8749-4CD5-BB8A-2C0EC3F04804}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0BD7AB91-8749-4CD5-BB8A-2C0EC3F04804}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0BD7AB91-8749-4CD5-BB8A-2C0EC3F04804}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0BD7AB91-8749-4CD5-BB8A-2C0EC3F04804}.Release|Any CPU.Build.0 = Release|Any CPU - {81C0429C-09C9-4A7A-B341-CA375CB13BC1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {81C0429C-09C9-4A7A-B341-CA375CB13BC1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {81C0429C-09C9-4A7A-B341-CA375CB13BC1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {81C0429C-09C9-4A7A-B341-CA375CB13BC1}.Release|Any CPU.Build.0 = Release|Any CPU - {6CF4204F-B30A-495D-87E3-1C7452755772}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6CF4204F-B30A-495D-87E3-1C7452755772}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6CF4204F-B30A-495D-87E3-1C7452755772}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6CF4204F-B30A-495D-87E3-1C7452755772}.Release|Any CPU.Build.0 = Release|Any CPU - {53819B6F-4297-4200-AC5C-4E321645CAC2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {53819B6F-4297-4200-AC5C-4E321645CAC2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {53819B6F-4297-4200-AC5C-4E321645CAC2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {53819B6F-4297-4200-AC5C-4E321645CAC2}.Release|Any CPU.Build.0 = Release|Any CPU - {DFA9DA38-39AE-4974-A371-14E21337C902}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DFA9DA38-39AE-4974-A371-14E21337C902}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DFA9DA38-39AE-4974-A371-14E21337C902}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DFA9DA38-39AE-4974-A371-14E21337C902}.Release|Any CPU.Build.0 = Release|Any CPU - {2E4B4166-13E8-4B5F-AB93-CE836AE70F55}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2E4B4166-13E8-4B5F-AB93-CE836AE70F55}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2E4B4166-13E8-4B5F-AB93-CE836AE70F55}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2E4B4166-13E8-4B5F-AB93-CE836AE70F55}.Release|Any CPU.Build.0 = Release|Any CPU - {28E8779B-C8A5-4179-A939-37E84715BA25}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {28E8779B-C8A5-4179-A939-37E84715BA25}.Debug|Any CPU.Build.0 = Debug|Any CPU - {28E8779B-C8A5-4179-A939-37E84715BA25}.Release|Any CPU.ActiveCfg = Release|Any CPU - {28E8779B-C8A5-4179-A939-37E84715BA25}.Release|Any CPU.Build.0 = Release|Any CPU - {DFA44F32-BEFD-4F28-9AAC-D28344459F99}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DFA44F32-BEFD-4F28-9AAC-D28344459F99}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DFA44F32-BEFD-4F28-9AAC-D28344459F99}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DFA44F32-BEFD-4F28-9AAC-D28344459F99}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {96564FA3-5370-431E-80B9-526EF541AE16} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {E0FB4726-A5DB-4155-8118-E7D217EF60C9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {292ECAC0-9FB6-4150-83D1-97BA86F73ECB} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {FFC9D67A-5D27-43E6-ACF1-0A5965EFD3C3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {3CAA3FE8-C9EF-459F-821D-8F55728F1038} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {2D92C07E-25EF-4F71-9E41-2E64A6275C8C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {82529F56-0745-4D4B-B63E-B42FA9134F84} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0BD7AB91-8749-4CD5-BB8A-2C0EC3F04804} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {81C0429C-09C9-4A7A-B341-CA375CB13BC1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6CF4204F-B30A-495D-87E3-1C7452755772} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {53819B6F-4297-4200-AC5C-4E321645CAC2} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {DFA9DA38-39AE-4974-A371-14E21337C902} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {2E4B4166-13E8-4B5F-AB93-CE836AE70F55} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {28E8779B-C8A5-4179-A939-37E84715BA25} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {DFA44F32-BEFD-4F28-9AAC-D28344459F99} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {2D92C07E-25EF-4F71-9E41-2E64A6275C8C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {82529F56-0745-4D4B-B63E-B42FA9134F84} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0BD7AB91-8749-4CD5-BB8A-2C0EC3F04804} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {81C0429C-09C9-4A7A-B341-CA375CB13BC1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6CF4204F-B30A-495D-87E3-1C7452755772} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {53819B6F-4297-4200-AC5C-4E321645CAC2} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {DFA9DA38-39AE-4974-A371-14E21337C902} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {2E4B4166-13E8-4B5F-AB93-CE836AE70F55} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {28E8779B-C8A5-4179-A939-37E84715BA25} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {DFA44F32-BEFD-4F28-9AAC-D28344459F99} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {D48BF2CF-44F7-450D-BF74-5FFED342DCC8} diff --git a/sdk/src/Services/ApplicationSignals/Generated/AmazonApplicationSignalsConfig.cs b/sdk/src/Services/ApplicationSignals/Generated/AmazonApplicationSignalsConfig.cs index 68cdd237fb3b..cd87b65c7e84 100644 --- a/sdk/src/Services/ApplicationSignals/Generated/AmazonApplicationSignalsConfig.cs +++ b/sdk/src/Services/ApplicationSignals/Generated/AmazonApplicationSignalsConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.ApplicationSignals public partial class AmazonApplicationSignalsConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("Application Signals", "4.0.0.0"); private static readonly AmazonApplicationSignalsEndpointResolver EndpointResolver = new AmazonApplicationSignalsEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("Application Signals", "3.7.402.11"); -======= - InternalSDKUtils.BuildUserAgentString("Application Signals", "3.7.403.3"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/ApplicationSignals/Generated/Model/BurnRateConfiguration.cs b/sdk/src/Services/ApplicationSignals/Generated/Model/BurnRateConfiguration.cs index 0cd929eb1525..bb236bdc7ddd 100644 --- a/sdk/src/Services/ApplicationSignals/Generated/Model/BurnRateConfiguration.cs +++ b/sdk/src/Services/ApplicationSignals/Generated/Model/BurnRateConfiguration.cs @@ -62,9 +62,9 @@ public partial class BurnRateConfiguration /// /// [AWSProperty(Required=true, Min=1, Max=10080)] - public int LookBackWindowMinutes + public int? LookBackWindowMinutes { - get { return this._lookBackWindowMinutes.GetValueOrDefault(); } + get { return this._lookBackWindowMinutes; } set { this._lookBackWindowMinutes = value; } } diff --git a/sdk/src/Services/ApplicationSignals/Generated/Model/Internal/MarshallTransformations/BurnRateConfigurationMarshaller.cs b/sdk/src/Services/ApplicationSignals/Generated/Model/Internal/MarshallTransformations/BurnRateConfigurationMarshaller.cs index 215deafcf175..b8db74d91360 100644 --- a/sdk/src/Services/ApplicationSignals/Generated/Model/Internal/MarshallTransformations/BurnRateConfigurationMarshaller.cs +++ b/sdk/src/Services/ApplicationSignals/Generated/Model/Internal/MarshallTransformations/BurnRateConfigurationMarshaller.cs @@ -51,7 +51,7 @@ public void Marshall(BurnRateConfiguration requestObject, JsonMarshallerContext if(requestObject.IsSetLookBackWindowMinutes()) { context.Writer.WritePropertyName("LookBackWindowMinutes"); - context.Writer.Write(requestObject.LookBackWindowMinutes); + context.Writer.Write(requestObject.LookBackWindowMinutes.Value); } } diff --git a/sdk/src/Services/ApplicationSignals/Generated/Model/Internal/MarshallTransformations/BurnRateConfigurationUnmarshaller.cs b/sdk/src/Services/ApplicationSignals/Generated/Model/Internal/MarshallTransformations/BurnRateConfigurationUnmarshaller.cs index d022cbd01397..d8d77424cc0e 100644 --- a/sdk/src/Services/ApplicationSignals/Generated/Model/Internal/MarshallTransformations/BurnRateConfigurationUnmarshaller.cs +++ b/sdk/src/Services/ApplicationSignals/Generated/Model/Internal/MarshallTransformations/BurnRateConfigurationUnmarshaller.cs @@ -68,7 +68,7 @@ public BurnRateConfiguration Unmarshall(JsonUnmarshallerContext context) { if (context.TestExpression("LookBackWindowMinutes", targetDepth)) { - var unmarshaller = IntUnmarshaller.Instance; + var unmarshaller = NullableIntUnmarshaller.Instance; unmarshalledObject.LookBackWindowMinutes = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/ApplicationSignals/Generated/Model/Internal/MarshallTransformations/CreateServiceLevelObjectiveRequestMarshaller.cs b/sdk/src/Services/ApplicationSignals/Generated/Model/Internal/MarshallTransformations/CreateServiceLevelObjectiveRequestMarshaller.cs index 44252a485d25..0849917daf41 100644 --- a/sdk/src/Services/ApplicationSignals/Generated/Model/Internal/MarshallTransformations/CreateServiceLevelObjectiveRequestMarshaller.cs +++ b/sdk/src/Services/ApplicationSignals/Generated/Model/Internal/MarshallTransformations/CreateServiceLevelObjectiveRequestMarshaller.cs @@ -63,42 +63,28 @@ public IRequest Marshall(CreateServiceLevelObjectiveRequest publicRequest) request.ResourcePath = "/slo"; using (MemoryStream memoryStream = new MemoryStream()) { -<<<<<<< HEAD using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) -||||||| Commit version number update changes - JsonWriter writer = new JsonWriter(stringWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetDescription()) -======= - JsonWriter writer = new JsonWriter(stringWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetBurnRateConfigurations()) { - context.Writer.WritePropertyName("BurnRateConfigurations"); - context.Writer.WriteArrayStart(); - foreach(var publicRequestBurnRateConfigurationsListValue in publicRequest.BurnRateConfigurations) + JsonWriter writer = new JsonWriter(streamWriter); + writer.Validate = false; + writer.WriteObjectStart(); + var context = new JsonMarshallerContext(request, writer); + if(publicRequest.IsSetBurnRateConfigurations()) { - context.Writer.WriteObjectStart(); + context.Writer.WritePropertyName("BurnRateConfigurations"); + context.Writer.WriteArrayStart(); + foreach(var publicRequestBurnRateConfigurationsListValue in publicRequest.BurnRateConfigurations) + { + context.Writer.WriteObjectStart(); - var marshaller = BurnRateConfigurationMarshaller.Instance; - marshaller.Marshall(publicRequestBurnRateConfigurationsListValue, context); + var marshaller = BurnRateConfigurationMarshaller.Instance; + marshaller.Marshall(publicRequestBurnRateConfigurationsListValue, context); - context.Writer.WriteObjectEnd(); + context.Writer.WriteObjectEnd(); + } + context.Writer.WriteArrayEnd(); } - context.Writer.WriteArrayEnd(); - } - if(publicRequest.IsSetDescription()) ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b - { - JsonWriter writer = new JsonWriter(streamWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); if(publicRequest.IsSetDescription()) { context.Writer.WritePropertyName("Description"); diff --git a/sdk/src/Services/ApplicationSignals/Generated/Model/Internal/MarshallTransformations/UpdateServiceLevelObjectiveRequestMarshaller.cs b/sdk/src/Services/ApplicationSignals/Generated/Model/Internal/MarshallTransformations/UpdateServiceLevelObjectiveRequestMarshaller.cs index 936ae3a6ce25..16b052a9fa25 100644 --- a/sdk/src/Services/ApplicationSignals/Generated/Model/Internal/MarshallTransformations/UpdateServiceLevelObjectiveRequestMarshaller.cs +++ b/sdk/src/Services/ApplicationSignals/Generated/Model/Internal/MarshallTransformations/UpdateServiceLevelObjectiveRequestMarshaller.cs @@ -66,42 +66,28 @@ public IRequest Marshall(UpdateServiceLevelObjectiveRequest publicRequest) request.ResourcePath = "/slo/{Id}"; using (MemoryStream memoryStream = new MemoryStream()) { -<<<<<<< HEAD using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) -||||||| Commit version number update changes - JsonWriter writer = new JsonWriter(stringWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetDescription()) -======= - JsonWriter writer = new JsonWriter(stringWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetBurnRateConfigurations()) - { - context.Writer.WritePropertyName("BurnRateConfigurations"); - context.Writer.WriteArrayStart(); - foreach(var publicRequestBurnRateConfigurationsListValue in publicRequest.BurnRateConfigurations) - { - context.Writer.WriteObjectStart(); - - var marshaller = BurnRateConfigurationMarshaller.Instance; - marshaller.Marshall(publicRequestBurnRateConfigurationsListValue, context); - - context.Writer.WriteObjectEnd(); - } - context.Writer.WriteArrayEnd(); - } - - if(publicRequest.IsSetDescription()) ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b { JsonWriter writer = new JsonWriter(streamWriter); writer.Validate = false; writer.WriteObjectStart(); var context = new JsonMarshallerContext(request, writer); + if(publicRequest.IsSetBurnRateConfigurations()) + { + context.Writer.WritePropertyName("BurnRateConfigurations"); + context.Writer.WriteArrayStart(); + foreach(var publicRequestBurnRateConfigurationsListValue in publicRequest.BurnRateConfigurations) + { + context.Writer.WriteObjectStart(); + + var marshaller = BurnRateConfigurationMarshaller.Instance; + marshaller.Marshall(publicRequestBurnRateConfigurationsListValue, context); + + context.Writer.WriteObjectEnd(); + } + context.Writer.WriteArrayEnd(); + } + if(publicRequest.IsSetDescription()) { context.Writer.WritePropertyName("Description"); diff --git a/sdk/src/Services/ApplicationSignals/Properties/AssemblyInfo.cs b/sdk/src/Services/ApplicationSignals/Properties/AssemblyInfo.cs index faf917ac0501..cacb1018782b 100644 --- a/sdk/src/Services/ApplicationSignals/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/ApplicationSignals/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.402.11")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.403.3")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/Artifact/Artifact.sln b/sdk/src/Services/Artifact/Artifact.sln index b54df72c4838..81035f55c5a4 100644 --- a/sdk/src/Services/Artifact/Artifact.sln +++ b/sdk/src/Services/Artifact/Artifact.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {5C615ACA-EB7E-4B1C-8F62-080F046F4A70}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {5C615ACA-EB7E-4B1C-8F62-080F046F4A70}.Debug|Any CPU.Build.0 = Debug|Any CPU {5C615ACA-EB7E-4B1C-8F62-080F046F4A70}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {29A9C843-F0E5-41C4-BF12-DD5C7D158FAD}.Debug|Any CPU.Build.0 = Debug|Any CPU {29A9C843-F0E5-41C4-BF12-DD5C7D158FAD}.Release|Any CPU.ActiveCfg = Release|Any CPU {29A9C843-F0E5-41C4-BF12-DD5C7D158FAD}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {759341F9-B04C-4B0B-BFCC-B2B90F834332}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {759341F9-B04C-4B0B-BFCC-B2B90F834332}.Debug|Any CPU.Build.0 = Debug|Any CPU - {759341F9-B04C-4B0B-BFCC-B2B90F834332}.Release|Any CPU.ActiveCfg = Release|Any CPU - {759341F9-B04C-4B0B-BFCC-B2B90F834332}.Release|Any CPU.Build.0 = Release|Any CPU - {842A03AA-2660-44F8-A593-43B39C8CCB17}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {842A03AA-2660-44F8-A593-43B39C8CCB17}.Debug|Any CPU.Build.0 = Debug|Any CPU - {842A03AA-2660-44F8-A593-43B39C8CCB17}.Release|Any CPU.ActiveCfg = Release|Any CPU - {842A03AA-2660-44F8-A593-43B39C8CCB17}.Release|Any CPU.Build.0 = Release|Any CPU - {7E2B1801-0938-42BB-B2AC-0203F41BBDC4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7E2B1801-0938-42BB-B2AC-0203F41BBDC4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7E2B1801-0938-42BB-B2AC-0203F41BBDC4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7E2B1801-0938-42BB-B2AC-0203F41BBDC4}.Release|Any CPU.Build.0 = Release|Any CPU - {76EE9B08-8A9C-4F36-AE74-2BFBE57718EB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {76EE9B08-8A9C-4F36-AE74-2BFBE57718EB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {76EE9B08-8A9C-4F36-AE74-2BFBE57718EB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {76EE9B08-8A9C-4F36-AE74-2BFBE57718EB}.Release|Any CPU.Build.0 = Release|Any CPU - {4687FE78-3A2D-44F3-AA07-38C2D1A0FD60}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4687FE78-3A2D-44F3-AA07-38C2D1A0FD60}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4687FE78-3A2D-44F3-AA07-38C2D1A0FD60}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4687FE78-3A2D-44F3-AA07-38C2D1A0FD60}.Release|Any CPU.Build.0 = Release|Any CPU - {B2F758B6-D2FB-478A-8C73-3FD3F7678EB6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B2F758B6-D2FB-478A-8C73-3FD3F7678EB6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B2F758B6-D2FB-478A-8C73-3FD3F7678EB6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B2F758B6-D2FB-478A-8C73-3FD3F7678EB6}.Release|Any CPU.Build.0 = Release|Any CPU - {8B9D8876-DAD0-4261-8E63-1B04E95BAC7F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8B9D8876-DAD0-4261-8E63-1B04E95BAC7F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8B9D8876-DAD0-4261-8E63-1B04E95BAC7F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8B9D8876-DAD0-4261-8E63-1B04E95BAC7F}.Release|Any CPU.Build.0 = Release|Any CPU - {3B2D7B73-4D45-4B55-82B4-F9821F6EB268}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3B2D7B73-4D45-4B55-82B4-F9821F6EB268}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3B2D7B73-4D45-4B55-82B4-F9821F6EB268}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3B2D7B73-4D45-4B55-82B4-F9821F6EB268}.Release|Any CPU.Build.0 = Release|Any CPU - {4326624A-FC40-41C0-8815-1C5E0EAAE366}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4326624A-FC40-41C0-8815-1C5E0EAAE366}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4326624A-FC40-41C0-8815-1C5E0EAAE366}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4326624A-FC40-41C0-8815-1C5E0EAAE366}.Release|Any CPU.Build.0 = Release|Any CPU - {46D7D521-6B15-4F52-8F80-8CA083AF2F2C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {46D7D521-6B15-4F52-8F80-8CA083AF2F2C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {46D7D521-6B15-4F52-8F80-8CA083AF2F2C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {46D7D521-6B15-4F52-8F80-8CA083AF2F2C}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {759341F9-B04C-4B0B-BFCC-B2B90F834332}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {759341F9-B04C-4B0B-BFCC-B2B90F834332}.Debug|Any CPU.Build.0 = Debug|Any CPU - {759341F9-B04C-4B0B-BFCC-B2B90F834332}.Release|Any CPU.ActiveCfg = Release|Any CPU - {759341F9-B04C-4B0B-BFCC-B2B90F834332}.Release|Any CPU.Build.0 = Release|Any CPU - {842A03AA-2660-44F8-A593-43B39C8CCB17}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {842A03AA-2660-44F8-A593-43B39C8CCB17}.Debug|Any CPU.Build.0 = Debug|Any CPU - {842A03AA-2660-44F8-A593-43B39C8CCB17}.Release|Any CPU.ActiveCfg = Release|Any CPU - {842A03AA-2660-44F8-A593-43B39C8CCB17}.Release|Any CPU.Build.0 = Release|Any CPU - {7E2B1801-0938-42BB-B2AC-0203F41BBDC4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7E2B1801-0938-42BB-B2AC-0203F41BBDC4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7E2B1801-0938-42BB-B2AC-0203F41BBDC4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7E2B1801-0938-42BB-B2AC-0203F41BBDC4}.Release|Any CPU.Build.0 = Release|Any CPU - {76EE9B08-8A9C-4F36-AE74-2BFBE57718EB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {76EE9B08-8A9C-4F36-AE74-2BFBE57718EB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {76EE9B08-8A9C-4F36-AE74-2BFBE57718EB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {76EE9B08-8A9C-4F36-AE74-2BFBE57718EB}.Release|Any CPU.Build.0 = Release|Any CPU - {4687FE78-3A2D-44F3-AA07-38C2D1A0FD60}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4687FE78-3A2D-44F3-AA07-38C2D1A0FD60}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4687FE78-3A2D-44F3-AA07-38C2D1A0FD60}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4687FE78-3A2D-44F3-AA07-38C2D1A0FD60}.Release|Any CPU.Build.0 = Release|Any CPU - {B2F758B6-D2FB-478A-8C73-3FD3F7678EB6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B2F758B6-D2FB-478A-8C73-3FD3F7678EB6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B2F758B6-D2FB-478A-8C73-3FD3F7678EB6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B2F758B6-D2FB-478A-8C73-3FD3F7678EB6}.Release|Any CPU.Build.0 = Release|Any CPU - {8B9D8876-DAD0-4261-8E63-1B04E95BAC7F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8B9D8876-DAD0-4261-8E63-1B04E95BAC7F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8B9D8876-DAD0-4261-8E63-1B04E95BAC7F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8B9D8876-DAD0-4261-8E63-1B04E95BAC7F}.Release|Any CPU.Build.0 = Release|Any CPU - {3B2D7B73-4D45-4B55-82B4-F9821F6EB268}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3B2D7B73-4D45-4B55-82B4-F9821F6EB268}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3B2D7B73-4D45-4B55-82B4-F9821F6EB268}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3B2D7B73-4D45-4B55-82B4-F9821F6EB268}.Release|Any CPU.Build.0 = Release|Any CPU - {4326624A-FC40-41C0-8815-1C5E0EAAE366}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4326624A-FC40-41C0-8815-1C5E0EAAE366}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4326624A-FC40-41C0-8815-1C5E0EAAE366}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4326624A-FC40-41C0-8815-1C5E0EAAE366}.Release|Any CPU.Build.0 = Release|Any CPU - {46D7D521-6B15-4F52-8F80-8CA083AF2F2C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {46D7D521-6B15-4F52-8F80-8CA083AF2F2C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {46D7D521-6B15-4F52-8F80-8CA083AF2F2C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {46D7D521-6B15-4F52-8F80-8CA083AF2F2C}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {5C615ACA-EB7E-4B1C-8F62-080F046F4A70} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {00FF6A0B-FB9F-4B01-B848-BCE95F07E7FA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {893CB4D2-12E9-4BA6-9889-9D842728E8AB} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {427D3590-1167-4124-A681-66CA602EFFD9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {29A9C843-F0E5-41C4-BF12-DD5C7D158FAD} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {759341F9-B04C-4B0B-BFCC-B2B90F834332} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {842A03AA-2660-44F8-A593-43B39C8CCB17} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {7E2B1801-0938-42BB-B2AC-0203F41BBDC4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {76EE9B08-8A9C-4F36-AE74-2BFBE57718EB} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4687FE78-3A2D-44F3-AA07-38C2D1A0FD60} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B2F758B6-D2FB-478A-8C73-3FD3F7678EB6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8B9D8876-DAD0-4261-8E63-1B04E95BAC7F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {3B2D7B73-4D45-4B55-82B4-F9821F6EB268} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4326624A-FC40-41C0-8815-1C5E0EAAE366} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {46D7D521-6B15-4F52-8F80-8CA083AF2F2C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {759341F9-B04C-4B0B-BFCC-B2B90F834332} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {842A03AA-2660-44F8-A593-43B39C8CCB17} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {7E2B1801-0938-42BB-B2AC-0203F41BBDC4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {76EE9B08-8A9C-4F36-AE74-2BFBE57718EB} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4687FE78-3A2D-44F3-AA07-38C2D1A0FD60} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B2F758B6-D2FB-478A-8C73-3FD3F7678EB6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8B9D8876-DAD0-4261-8E63-1B04E95BAC7F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {3B2D7B73-4D45-4B55-82B4-F9821F6EB268} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4326624A-FC40-41C0-8815-1C5E0EAAE366} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {46D7D521-6B15-4F52-8F80-8CA083AF2F2C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {441F405F-565C-4E3B-A044-E160286F9B39} diff --git a/sdk/src/Services/Artifact/Generated/AmazonArtifactConfig.cs b/sdk/src/Services/Artifact/Generated/AmazonArtifactConfig.cs index ba021a062f54..b90e263f327a 100644 --- a/sdk/src/Services/Artifact/Generated/AmazonArtifactConfig.cs +++ b/sdk/src/Services/Artifact/Generated/AmazonArtifactConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.Artifact public partial class AmazonArtifactConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("Artifact", "4.0.0.0"); private static readonly AmazonArtifactEndpointResolver EndpointResolver = new AmazonArtifactEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("Artifact", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("Artifact", "3.7.400.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/Artifact/Properties/AssemblyInfo.cs b/sdk/src/Services/Artifact/Properties/AssemblyInfo.cs index 9b9dafb4729d..22e8aa80815d 100644 --- a/sdk/src/Services/Artifact/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/Artifact/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/Athena/Athena.sln b/sdk/src/Services/Athena/Athena.sln index 80d8121b2cc4..c5faeb839650 100644 --- a/sdk/src/Services/Athena/Athena.sln +++ b/sdk/src/Services/Athena/Athena.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {A3C09318-E483-4FFD-8D5A-4D9A078EA82B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {A3C09318-E483-4FFD-8D5A-4D9A078EA82B}.Debug|Any CPU.Build.0 = Debug|Any CPU {A3C09318-E483-4FFD-8D5A-4D9A078EA82B}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {450B3707-769A-48ED-854B-75E2D62E846F}.Debug|Any CPU.Build.0 = Debug|Any CPU {450B3707-769A-48ED-854B-75E2D62E846F}.Release|Any CPU.ActiveCfg = Release|Any CPU {450B3707-769A-48ED-854B-75E2D62E846F}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {E369B848-247D-400E-867B-E0CAB6292662}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E369B848-247D-400E-867B-E0CAB6292662}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E369B848-247D-400E-867B-E0CAB6292662}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E369B848-247D-400E-867B-E0CAB6292662}.Release|Any CPU.Build.0 = Release|Any CPU - {48653077-2569-4926-ACAB-5F06321FF75A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {48653077-2569-4926-ACAB-5F06321FF75A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {48653077-2569-4926-ACAB-5F06321FF75A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {48653077-2569-4926-ACAB-5F06321FF75A}.Release|Any CPU.Build.0 = Release|Any CPU - {22D3C5B1-EA9C-4E86-BC3B-2287ACE13681}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {22D3C5B1-EA9C-4E86-BC3B-2287ACE13681}.Debug|Any CPU.Build.0 = Debug|Any CPU - {22D3C5B1-EA9C-4E86-BC3B-2287ACE13681}.Release|Any CPU.ActiveCfg = Release|Any CPU - {22D3C5B1-EA9C-4E86-BC3B-2287ACE13681}.Release|Any CPU.Build.0 = Release|Any CPU - {6609595C-8624-4438-8A2D-FBC91886198F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6609595C-8624-4438-8A2D-FBC91886198F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6609595C-8624-4438-8A2D-FBC91886198F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6609595C-8624-4438-8A2D-FBC91886198F}.Release|Any CPU.Build.0 = Release|Any CPU - {4D1E7A2D-ACAC-42A9-853B-92FEF308E929}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4D1E7A2D-ACAC-42A9-853B-92FEF308E929}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4D1E7A2D-ACAC-42A9-853B-92FEF308E929}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4D1E7A2D-ACAC-42A9-853B-92FEF308E929}.Release|Any CPU.Build.0 = Release|Any CPU - {A3CDC2B7-87B2-48F1-8BA9-A08CE1A2D644}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A3CDC2B7-87B2-48F1-8BA9-A08CE1A2D644}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A3CDC2B7-87B2-48F1-8BA9-A08CE1A2D644}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A3CDC2B7-87B2-48F1-8BA9-A08CE1A2D644}.Release|Any CPU.Build.0 = Release|Any CPU - {E34641B0-7C7F-4ECC-AA5C-676B347E0F1C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E34641B0-7C7F-4ECC-AA5C-676B347E0F1C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E34641B0-7C7F-4ECC-AA5C-676B347E0F1C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E34641B0-7C7F-4ECC-AA5C-676B347E0F1C}.Release|Any CPU.Build.0 = Release|Any CPU - {884AB9F1-8D20-47B2-9B53-03055D5D229F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {884AB9F1-8D20-47B2-9B53-03055D5D229F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {884AB9F1-8D20-47B2-9B53-03055D5D229F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {884AB9F1-8D20-47B2-9B53-03055D5D229F}.Release|Any CPU.Build.0 = Release|Any CPU - {388D8457-F8AD-4411-A7B8-7463A92D512A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {388D8457-F8AD-4411-A7B8-7463A92D512A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {388D8457-F8AD-4411-A7B8-7463A92D512A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {388D8457-F8AD-4411-A7B8-7463A92D512A}.Release|Any CPU.Build.0 = Release|Any CPU - {7D5BC598-585E-4809-8892-A4F5E37B28DB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7D5BC598-585E-4809-8892-A4F5E37B28DB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7D5BC598-585E-4809-8892-A4F5E37B28DB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7D5BC598-585E-4809-8892-A4F5E37B28DB}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {E369B848-247D-400E-867B-E0CAB6292662}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E369B848-247D-400E-867B-E0CAB6292662}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E369B848-247D-400E-867B-E0CAB6292662}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E369B848-247D-400E-867B-E0CAB6292662}.Release|Any CPU.Build.0 = Release|Any CPU - {48653077-2569-4926-ACAB-5F06321FF75A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {48653077-2569-4926-ACAB-5F06321FF75A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {48653077-2569-4926-ACAB-5F06321FF75A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {48653077-2569-4926-ACAB-5F06321FF75A}.Release|Any CPU.Build.0 = Release|Any CPU - {22D3C5B1-EA9C-4E86-BC3B-2287ACE13681}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {22D3C5B1-EA9C-4E86-BC3B-2287ACE13681}.Debug|Any CPU.Build.0 = Debug|Any CPU - {22D3C5B1-EA9C-4E86-BC3B-2287ACE13681}.Release|Any CPU.ActiveCfg = Release|Any CPU - {22D3C5B1-EA9C-4E86-BC3B-2287ACE13681}.Release|Any CPU.Build.0 = Release|Any CPU - {6609595C-8624-4438-8A2D-FBC91886198F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6609595C-8624-4438-8A2D-FBC91886198F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6609595C-8624-4438-8A2D-FBC91886198F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6609595C-8624-4438-8A2D-FBC91886198F}.Release|Any CPU.Build.0 = Release|Any CPU - {4D1E7A2D-ACAC-42A9-853B-92FEF308E929}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4D1E7A2D-ACAC-42A9-853B-92FEF308E929}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4D1E7A2D-ACAC-42A9-853B-92FEF308E929}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4D1E7A2D-ACAC-42A9-853B-92FEF308E929}.Release|Any CPU.Build.0 = Release|Any CPU - {A3CDC2B7-87B2-48F1-8BA9-A08CE1A2D644}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A3CDC2B7-87B2-48F1-8BA9-A08CE1A2D644}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A3CDC2B7-87B2-48F1-8BA9-A08CE1A2D644}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A3CDC2B7-87B2-48F1-8BA9-A08CE1A2D644}.Release|Any CPU.Build.0 = Release|Any CPU - {E34641B0-7C7F-4ECC-AA5C-676B347E0F1C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E34641B0-7C7F-4ECC-AA5C-676B347E0F1C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E34641B0-7C7F-4ECC-AA5C-676B347E0F1C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E34641B0-7C7F-4ECC-AA5C-676B347E0F1C}.Release|Any CPU.Build.0 = Release|Any CPU - {884AB9F1-8D20-47B2-9B53-03055D5D229F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {884AB9F1-8D20-47B2-9B53-03055D5D229F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {884AB9F1-8D20-47B2-9B53-03055D5D229F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {884AB9F1-8D20-47B2-9B53-03055D5D229F}.Release|Any CPU.Build.0 = Release|Any CPU - {388D8457-F8AD-4411-A7B8-7463A92D512A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {388D8457-F8AD-4411-A7B8-7463A92D512A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {388D8457-F8AD-4411-A7B8-7463A92D512A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {388D8457-F8AD-4411-A7B8-7463A92D512A}.Release|Any CPU.Build.0 = Release|Any CPU - {7D5BC598-585E-4809-8892-A4F5E37B28DB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7D5BC598-585E-4809-8892-A4F5E37B28DB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7D5BC598-585E-4809-8892-A4F5E37B28DB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7D5BC598-585E-4809-8892-A4F5E37B28DB}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {A3C09318-E483-4FFD-8D5A-4D9A078EA82B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {BA88211D-BBC6-4EFF-9B8D-765D34E6A6A7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {989D0191-DF21-47F7-BBB1-BED22F727548} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {694BCE22-D1AF-43C4-96CC-BCAEA4E9F652} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {450B3707-769A-48ED-854B-75E2D62E846F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {E369B848-247D-400E-867B-E0CAB6292662} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {48653077-2569-4926-ACAB-5F06321FF75A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {22D3C5B1-EA9C-4E86-BC3B-2287ACE13681} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6609595C-8624-4438-8A2D-FBC91886198F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4D1E7A2D-ACAC-42A9-853B-92FEF308E929} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A3CDC2B7-87B2-48F1-8BA9-A08CE1A2D644} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E34641B0-7C7F-4ECC-AA5C-676B347E0F1C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {884AB9F1-8D20-47B2-9B53-03055D5D229F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {388D8457-F8AD-4411-A7B8-7463A92D512A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {7D5BC598-585E-4809-8892-A4F5E37B28DB} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {E369B848-247D-400E-867B-E0CAB6292662} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {48653077-2569-4926-ACAB-5F06321FF75A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {22D3C5B1-EA9C-4E86-BC3B-2287ACE13681} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6609595C-8624-4438-8A2D-FBC91886198F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4D1E7A2D-ACAC-42A9-853B-92FEF308E929} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A3CDC2B7-87B2-48F1-8BA9-A08CE1A2D644} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E34641B0-7C7F-4ECC-AA5C-676B347E0F1C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {884AB9F1-8D20-47B2-9B53-03055D5D229F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {388D8457-F8AD-4411-A7B8-7463A92D512A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {7D5BC598-585E-4809-8892-A4F5E37B28DB} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {97AEF11C-C7E6-45A7-9578-DD376AA10354} diff --git a/sdk/src/Services/Athena/Generated/AmazonAthenaConfig.cs b/sdk/src/Services/Athena/Generated/AmazonAthenaConfig.cs index ced04e6f2904..134b124183a6 100644 --- a/sdk/src/Services/Athena/Generated/AmazonAthenaConfig.cs +++ b/sdk/src/Services/Athena/Generated/AmazonAthenaConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.Athena public partial class AmazonAthenaConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("Athena", "4.0.0.0"); private static readonly AmazonAthenaEndpointResolver EndpointResolver = new AmazonAthenaEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("Athena", "3.7.401.4"); -======= - InternalSDKUtils.BuildUserAgentString("Athena", "3.7.402.17"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/Athena/Properties/AssemblyInfo.cs b/sdk/src/Services/Athena/Properties/AssemblyInfo.cs index 71745306cf6e..269369f76f5d 100644 --- a/sdk/src/Services/Athena/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/Athena/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.4")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.402.17")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/AuditManager/AuditManager.sln b/sdk/src/Services/AuditManager/AuditManager.sln index 025f535794cd..7af985a8bf16 100644 --- a/sdk/src/Services/AuditManager/AuditManager.sln +++ b/sdk/src/Services/AuditManager/AuditManager.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {DCA6E031-B3BC-498E-A7D7-1CD9BF853569}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {DCA6E031-B3BC-498E-A7D7-1CD9BF853569}.Debug|Any CPU.Build.0 = Debug|Any CPU {DCA6E031-B3BC-498E-A7D7-1CD9BF853569}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {0C081028-F980-4749-B004-A68D6BF17A8E}.Debug|Any CPU.Build.0 = Debug|Any CPU {0C081028-F980-4749-B004-A68D6BF17A8E}.Release|Any CPU.ActiveCfg = Release|Any CPU {0C081028-F980-4749-B004-A68D6BF17A8E}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {58A12793-CA0A-4CDE-8A5F-17F7DED2814D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {58A12793-CA0A-4CDE-8A5F-17F7DED2814D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {58A12793-CA0A-4CDE-8A5F-17F7DED2814D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {58A12793-CA0A-4CDE-8A5F-17F7DED2814D}.Release|Any CPU.Build.0 = Release|Any CPU - {D5D26BEE-6DBF-4577-870E-1DD9E930196F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D5D26BEE-6DBF-4577-870E-1DD9E930196F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D5D26BEE-6DBF-4577-870E-1DD9E930196F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D5D26BEE-6DBF-4577-870E-1DD9E930196F}.Release|Any CPU.Build.0 = Release|Any CPU - {25C67E76-CDBD-465E-B042-3FE3C84D9B77}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {25C67E76-CDBD-465E-B042-3FE3C84D9B77}.Debug|Any CPU.Build.0 = Debug|Any CPU - {25C67E76-CDBD-465E-B042-3FE3C84D9B77}.Release|Any CPU.ActiveCfg = Release|Any CPU - {25C67E76-CDBD-465E-B042-3FE3C84D9B77}.Release|Any CPU.Build.0 = Release|Any CPU - {FE56F2B9-0527-4910-8BEE-E3DBE3CEE26C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FE56F2B9-0527-4910-8BEE-E3DBE3CEE26C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FE56F2B9-0527-4910-8BEE-E3DBE3CEE26C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FE56F2B9-0527-4910-8BEE-E3DBE3CEE26C}.Release|Any CPU.Build.0 = Release|Any CPU - {329DAEC8-A840-41DC-ADFD-8F0FEBDAC97B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {329DAEC8-A840-41DC-ADFD-8F0FEBDAC97B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {329DAEC8-A840-41DC-ADFD-8F0FEBDAC97B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {329DAEC8-A840-41DC-ADFD-8F0FEBDAC97B}.Release|Any CPU.Build.0 = Release|Any CPU - {5D93750C-E6B1-41E3-8990-27A803FC0431}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5D93750C-E6B1-41E3-8990-27A803FC0431}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5D93750C-E6B1-41E3-8990-27A803FC0431}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5D93750C-E6B1-41E3-8990-27A803FC0431}.Release|Any CPU.Build.0 = Release|Any CPU - {206CE197-8287-4ACC-9AA0-D29F20501A81}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {206CE197-8287-4ACC-9AA0-D29F20501A81}.Debug|Any CPU.Build.0 = Debug|Any CPU - {206CE197-8287-4ACC-9AA0-D29F20501A81}.Release|Any CPU.ActiveCfg = Release|Any CPU - {206CE197-8287-4ACC-9AA0-D29F20501A81}.Release|Any CPU.Build.0 = Release|Any CPU - {E1E30DEF-50F2-42BA-8479-C641CD715378}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E1E30DEF-50F2-42BA-8479-C641CD715378}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E1E30DEF-50F2-42BA-8479-C641CD715378}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E1E30DEF-50F2-42BA-8479-C641CD715378}.Release|Any CPU.Build.0 = Release|Any CPU - {29CF671A-1397-40AC-95AE-332C12A75A95}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {29CF671A-1397-40AC-95AE-332C12A75A95}.Debug|Any CPU.Build.0 = Debug|Any CPU - {29CF671A-1397-40AC-95AE-332C12A75A95}.Release|Any CPU.ActiveCfg = Release|Any CPU - {29CF671A-1397-40AC-95AE-332C12A75A95}.Release|Any CPU.Build.0 = Release|Any CPU - {D58E2C95-E6FF-420A-91AF-6D3FE41F0105}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D58E2C95-E6FF-420A-91AF-6D3FE41F0105}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D58E2C95-E6FF-420A-91AF-6D3FE41F0105}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D58E2C95-E6FF-420A-91AF-6D3FE41F0105}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {58A12793-CA0A-4CDE-8A5F-17F7DED2814D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {58A12793-CA0A-4CDE-8A5F-17F7DED2814D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {58A12793-CA0A-4CDE-8A5F-17F7DED2814D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {58A12793-CA0A-4CDE-8A5F-17F7DED2814D}.Release|Any CPU.Build.0 = Release|Any CPU - {D5D26BEE-6DBF-4577-870E-1DD9E930196F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D5D26BEE-6DBF-4577-870E-1DD9E930196F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D5D26BEE-6DBF-4577-870E-1DD9E930196F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D5D26BEE-6DBF-4577-870E-1DD9E930196F}.Release|Any CPU.Build.0 = Release|Any CPU - {25C67E76-CDBD-465E-B042-3FE3C84D9B77}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {25C67E76-CDBD-465E-B042-3FE3C84D9B77}.Debug|Any CPU.Build.0 = Debug|Any CPU - {25C67E76-CDBD-465E-B042-3FE3C84D9B77}.Release|Any CPU.ActiveCfg = Release|Any CPU - {25C67E76-CDBD-465E-B042-3FE3C84D9B77}.Release|Any CPU.Build.0 = Release|Any CPU - {FE56F2B9-0527-4910-8BEE-E3DBE3CEE26C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FE56F2B9-0527-4910-8BEE-E3DBE3CEE26C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FE56F2B9-0527-4910-8BEE-E3DBE3CEE26C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FE56F2B9-0527-4910-8BEE-E3DBE3CEE26C}.Release|Any CPU.Build.0 = Release|Any CPU - {329DAEC8-A840-41DC-ADFD-8F0FEBDAC97B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {329DAEC8-A840-41DC-ADFD-8F0FEBDAC97B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {329DAEC8-A840-41DC-ADFD-8F0FEBDAC97B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {329DAEC8-A840-41DC-ADFD-8F0FEBDAC97B}.Release|Any CPU.Build.0 = Release|Any CPU - {5D93750C-E6B1-41E3-8990-27A803FC0431}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5D93750C-E6B1-41E3-8990-27A803FC0431}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5D93750C-E6B1-41E3-8990-27A803FC0431}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5D93750C-E6B1-41E3-8990-27A803FC0431}.Release|Any CPU.Build.0 = Release|Any CPU - {206CE197-8287-4ACC-9AA0-D29F20501A81}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {206CE197-8287-4ACC-9AA0-D29F20501A81}.Debug|Any CPU.Build.0 = Debug|Any CPU - {206CE197-8287-4ACC-9AA0-D29F20501A81}.Release|Any CPU.ActiveCfg = Release|Any CPU - {206CE197-8287-4ACC-9AA0-D29F20501A81}.Release|Any CPU.Build.0 = Release|Any CPU - {E1E30DEF-50F2-42BA-8479-C641CD715378}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E1E30DEF-50F2-42BA-8479-C641CD715378}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E1E30DEF-50F2-42BA-8479-C641CD715378}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E1E30DEF-50F2-42BA-8479-C641CD715378}.Release|Any CPU.Build.0 = Release|Any CPU - {29CF671A-1397-40AC-95AE-332C12A75A95}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {29CF671A-1397-40AC-95AE-332C12A75A95}.Debug|Any CPU.Build.0 = Debug|Any CPU - {29CF671A-1397-40AC-95AE-332C12A75A95}.Release|Any CPU.ActiveCfg = Release|Any CPU - {29CF671A-1397-40AC-95AE-332C12A75A95}.Release|Any CPU.Build.0 = Release|Any CPU - {D58E2C95-E6FF-420A-91AF-6D3FE41F0105}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D58E2C95-E6FF-420A-91AF-6D3FE41F0105}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D58E2C95-E6FF-420A-91AF-6D3FE41F0105}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D58E2C95-E6FF-420A-91AF-6D3FE41F0105}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {DCA6E031-B3BC-498E-A7D7-1CD9BF853569} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {2BCCC712-BC82-4D6A-B600-35464F10F808} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {69CE0C42-DAC0-491B-B1B0-7223F4749AA0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {83151E0F-17C5-407C-B4AB-0D307FC80B73} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {0C081028-F980-4749-B004-A68D6BF17A8E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {58A12793-CA0A-4CDE-8A5F-17F7DED2814D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D5D26BEE-6DBF-4577-870E-1DD9E930196F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {25C67E76-CDBD-465E-B042-3FE3C84D9B77} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {FE56F2B9-0527-4910-8BEE-E3DBE3CEE26C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {329DAEC8-A840-41DC-ADFD-8F0FEBDAC97B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {5D93750C-E6B1-41E3-8990-27A803FC0431} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {206CE197-8287-4ACC-9AA0-D29F20501A81} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E1E30DEF-50F2-42BA-8479-C641CD715378} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {29CF671A-1397-40AC-95AE-332C12A75A95} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D58E2C95-E6FF-420A-91AF-6D3FE41F0105} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {58A12793-CA0A-4CDE-8A5F-17F7DED2814D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D5D26BEE-6DBF-4577-870E-1DD9E930196F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {25C67E76-CDBD-465E-B042-3FE3C84D9B77} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {FE56F2B9-0527-4910-8BEE-E3DBE3CEE26C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {329DAEC8-A840-41DC-ADFD-8F0FEBDAC97B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {5D93750C-E6B1-41E3-8990-27A803FC0431} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {206CE197-8287-4ACC-9AA0-D29F20501A81} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E1E30DEF-50F2-42BA-8479-C641CD715378} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {29CF671A-1397-40AC-95AE-332C12A75A95} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D58E2C95-E6FF-420A-91AF-6D3FE41F0105} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {C135709D-B48F-490B-B08E-530DF84563BD} diff --git a/sdk/src/Services/AuditManager/Generated/AmazonAuditManagerConfig.cs b/sdk/src/Services/AuditManager/Generated/AmazonAuditManagerConfig.cs index e740fe2b54dc..fbc54967238c 100644 --- a/sdk/src/Services/AuditManager/Generated/AmazonAuditManagerConfig.cs +++ b/sdk/src/Services/AuditManager/Generated/AmazonAuditManagerConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.AuditManager public partial class AmazonAuditManagerConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("AuditManager", "4.0.0.0"); private static readonly AmazonAuditManagerEndpointResolver EndpointResolver = new AmazonAuditManagerEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("AuditManager", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("AuditManager", "3.7.400.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/AuditManager/Properties/AssemblyInfo.cs b/sdk/src/Services/AuditManager/Properties/AssemblyInfo.cs index e69b66910321..aafb8e145001 100644 --- a/sdk/src/Services/AuditManager/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/AuditManager/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/AugmentedAIRuntime/AugmentedAIRuntime.sln b/sdk/src/Services/AugmentedAIRuntime/AugmentedAIRuntime.sln index 1812f6711113..e90618f1dadb 100644 --- a/sdk/src/Services/AugmentedAIRuntime/AugmentedAIRuntime.sln +++ b/sdk/src/Services/AugmentedAIRuntime/AugmentedAIRuntime.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {A69CDC6E-C8AE-4BDB-98CF-4CEF9E63A0D5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {A69CDC6E-C8AE-4BDB-98CF-4CEF9E63A0D5}.Debug|Any CPU.Build.0 = Debug|Any CPU {A69CDC6E-C8AE-4BDB-98CF-4CEF9E63A0D5}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {C2559FEF-1297-4F35-846C-7EEF51B1A293}.Debug|Any CPU.Build.0 = Debug|Any CPU {C2559FEF-1297-4F35-846C-7EEF51B1A293}.Release|Any CPU.ActiveCfg = Release|Any CPU {C2559FEF-1297-4F35-846C-7EEF51B1A293}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {8C746D3B-2AB2-44B9-8A0A-AE581550C818}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8C746D3B-2AB2-44B9-8A0A-AE581550C818}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8C746D3B-2AB2-44B9-8A0A-AE581550C818}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8C746D3B-2AB2-44B9-8A0A-AE581550C818}.Release|Any CPU.Build.0 = Release|Any CPU - {4334568D-57B5-4F36-88AA-2C7DDABFAF2F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4334568D-57B5-4F36-88AA-2C7DDABFAF2F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4334568D-57B5-4F36-88AA-2C7DDABFAF2F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4334568D-57B5-4F36-88AA-2C7DDABFAF2F}.Release|Any CPU.Build.0 = Release|Any CPU - {7BF88207-ABE4-467E-BF2F-0618F4C2099D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7BF88207-ABE4-467E-BF2F-0618F4C2099D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7BF88207-ABE4-467E-BF2F-0618F4C2099D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7BF88207-ABE4-467E-BF2F-0618F4C2099D}.Release|Any CPU.Build.0 = Release|Any CPU - {9361D302-5863-43BE-B85B-B8B3B046B8BE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9361D302-5863-43BE-B85B-B8B3B046B8BE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9361D302-5863-43BE-B85B-B8B3B046B8BE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9361D302-5863-43BE-B85B-B8B3B046B8BE}.Release|Any CPU.Build.0 = Release|Any CPU - {6DA6C315-2CE6-4E85-A94A-128F916977E0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6DA6C315-2CE6-4E85-A94A-128F916977E0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6DA6C315-2CE6-4E85-A94A-128F916977E0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6DA6C315-2CE6-4E85-A94A-128F916977E0}.Release|Any CPU.Build.0 = Release|Any CPU - {15F829EE-1DA9-4DC1-9DDD-A0760CA35181}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {15F829EE-1DA9-4DC1-9DDD-A0760CA35181}.Debug|Any CPU.Build.0 = Debug|Any CPU - {15F829EE-1DA9-4DC1-9DDD-A0760CA35181}.Release|Any CPU.ActiveCfg = Release|Any CPU - {15F829EE-1DA9-4DC1-9DDD-A0760CA35181}.Release|Any CPU.Build.0 = Release|Any CPU - {461C14AE-A6C5-4CD5-AD0B-4D1DA7163BE3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {461C14AE-A6C5-4CD5-AD0B-4D1DA7163BE3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {461C14AE-A6C5-4CD5-AD0B-4D1DA7163BE3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {461C14AE-A6C5-4CD5-AD0B-4D1DA7163BE3}.Release|Any CPU.Build.0 = Release|Any CPU - {93A23902-8E89-4980-92C7-40DB72551D24}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {93A23902-8E89-4980-92C7-40DB72551D24}.Debug|Any CPU.Build.0 = Debug|Any CPU - {93A23902-8E89-4980-92C7-40DB72551D24}.Release|Any CPU.ActiveCfg = Release|Any CPU - {93A23902-8E89-4980-92C7-40DB72551D24}.Release|Any CPU.Build.0 = Release|Any CPU - {B40D0457-0820-4B7D-866A-3566FB70B55E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B40D0457-0820-4B7D-866A-3566FB70B55E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B40D0457-0820-4B7D-866A-3566FB70B55E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B40D0457-0820-4B7D-866A-3566FB70B55E}.Release|Any CPU.Build.0 = Release|Any CPU - {50B86145-3F9E-4BBC-B72F-AE9EF873883A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {50B86145-3F9E-4BBC-B72F-AE9EF873883A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {50B86145-3F9E-4BBC-B72F-AE9EF873883A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {50B86145-3F9E-4BBC-B72F-AE9EF873883A}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {8C746D3B-2AB2-44B9-8A0A-AE581550C818}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8C746D3B-2AB2-44B9-8A0A-AE581550C818}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8C746D3B-2AB2-44B9-8A0A-AE581550C818}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8C746D3B-2AB2-44B9-8A0A-AE581550C818}.Release|Any CPU.Build.0 = Release|Any CPU - {4334568D-57B5-4F36-88AA-2C7DDABFAF2F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4334568D-57B5-4F36-88AA-2C7DDABFAF2F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4334568D-57B5-4F36-88AA-2C7DDABFAF2F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4334568D-57B5-4F36-88AA-2C7DDABFAF2F}.Release|Any CPU.Build.0 = Release|Any CPU - {7BF88207-ABE4-467E-BF2F-0618F4C2099D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7BF88207-ABE4-467E-BF2F-0618F4C2099D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7BF88207-ABE4-467E-BF2F-0618F4C2099D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7BF88207-ABE4-467E-BF2F-0618F4C2099D}.Release|Any CPU.Build.0 = Release|Any CPU - {9361D302-5863-43BE-B85B-B8B3B046B8BE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9361D302-5863-43BE-B85B-B8B3B046B8BE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9361D302-5863-43BE-B85B-B8B3B046B8BE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9361D302-5863-43BE-B85B-B8B3B046B8BE}.Release|Any CPU.Build.0 = Release|Any CPU - {6DA6C315-2CE6-4E85-A94A-128F916977E0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6DA6C315-2CE6-4E85-A94A-128F916977E0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6DA6C315-2CE6-4E85-A94A-128F916977E0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6DA6C315-2CE6-4E85-A94A-128F916977E0}.Release|Any CPU.Build.0 = Release|Any CPU - {15F829EE-1DA9-4DC1-9DDD-A0760CA35181}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {15F829EE-1DA9-4DC1-9DDD-A0760CA35181}.Debug|Any CPU.Build.0 = Debug|Any CPU - {15F829EE-1DA9-4DC1-9DDD-A0760CA35181}.Release|Any CPU.ActiveCfg = Release|Any CPU - {15F829EE-1DA9-4DC1-9DDD-A0760CA35181}.Release|Any CPU.Build.0 = Release|Any CPU - {461C14AE-A6C5-4CD5-AD0B-4D1DA7163BE3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {461C14AE-A6C5-4CD5-AD0B-4D1DA7163BE3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {461C14AE-A6C5-4CD5-AD0B-4D1DA7163BE3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {461C14AE-A6C5-4CD5-AD0B-4D1DA7163BE3}.Release|Any CPU.Build.0 = Release|Any CPU - {93A23902-8E89-4980-92C7-40DB72551D24}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {93A23902-8E89-4980-92C7-40DB72551D24}.Debug|Any CPU.Build.0 = Debug|Any CPU - {93A23902-8E89-4980-92C7-40DB72551D24}.Release|Any CPU.ActiveCfg = Release|Any CPU - {93A23902-8E89-4980-92C7-40DB72551D24}.Release|Any CPU.Build.0 = Release|Any CPU - {B40D0457-0820-4B7D-866A-3566FB70B55E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B40D0457-0820-4B7D-866A-3566FB70B55E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B40D0457-0820-4B7D-866A-3566FB70B55E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B40D0457-0820-4B7D-866A-3566FB70B55E}.Release|Any CPU.Build.0 = Release|Any CPU - {50B86145-3F9E-4BBC-B72F-AE9EF873883A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {50B86145-3F9E-4BBC-B72F-AE9EF873883A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {50B86145-3F9E-4BBC-B72F-AE9EF873883A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {50B86145-3F9E-4BBC-B72F-AE9EF873883A}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {A69CDC6E-C8AE-4BDB-98CF-4CEF9E63A0D5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {CA58771A-AC8C-4800-8E0E-865F1FC43376} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {3B2283E1-AD58-44A7-B0AF-5C20992A3BC7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {31C148E1-3D1F-41D1-8191-B78CAEDD469C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {C2559FEF-1297-4F35-846C-7EEF51B1A293} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {8C746D3B-2AB2-44B9-8A0A-AE581550C818} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4334568D-57B5-4F36-88AA-2C7DDABFAF2F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {7BF88207-ABE4-467E-BF2F-0618F4C2099D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {9361D302-5863-43BE-B85B-B8B3B046B8BE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6DA6C315-2CE6-4E85-A94A-128F916977E0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {15F829EE-1DA9-4DC1-9DDD-A0760CA35181} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {461C14AE-A6C5-4CD5-AD0B-4D1DA7163BE3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {93A23902-8E89-4980-92C7-40DB72551D24} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B40D0457-0820-4B7D-866A-3566FB70B55E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {50B86145-3F9E-4BBC-B72F-AE9EF873883A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {8C746D3B-2AB2-44B9-8A0A-AE581550C818} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4334568D-57B5-4F36-88AA-2C7DDABFAF2F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {7BF88207-ABE4-467E-BF2F-0618F4C2099D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {9361D302-5863-43BE-B85B-B8B3B046B8BE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6DA6C315-2CE6-4E85-A94A-128F916977E0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {15F829EE-1DA9-4DC1-9DDD-A0760CA35181} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {461C14AE-A6C5-4CD5-AD0B-4D1DA7163BE3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {93A23902-8E89-4980-92C7-40DB72551D24} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B40D0457-0820-4B7D-866A-3566FB70B55E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {50B86145-3F9E-4BBC-B72F-AE9EF873883A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {396D7857-DA82-4A84-A942-4153792052D7} diff --git a/sdk/src/Services/AugmentedAIRuntime/Generated/AmazonAugmentedAIRuntimeConfig.cs b/sdk/src/Services/AugmentedAIRuntime/Generated/AmazonAugmentedAIRuntimeConfig.cs index 3ccb30358d42..b02bb6a458c8 100644 --- a/sdk/src/Services/AugmentedAIRuntime/Generated/AmazonAugmentedAIRuntimeConfig.cs +++ b/sdk/src/Services/AugmentedAIRuntime/Generated/AmazonAugmentedAIRuntimeConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.AugmentedAIRuntime public partial class AmazonAugmentedAIRuntimeConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("SageMaker A2I Runtime", "4.0.0.0"); private static readonly AmazonAugmentedAIRuntimeEndpointResolver EndpointResolver = new AmazonAugmentedAIRuntimeEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("SageMaker A2I Runtime", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("SageMaker A2I Runtime", "3.7.400.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/AugmentedAIRuntime/Properties/AssemblyInfo.cs b/sdk/src/Services/AugmentedAIRuntime/Properties/AssemblyInfo.cs index 6440bf2085a3..4c88b50d19a5 100644 --- a/sdk/src/Services/AugmentedAIRuntime/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/AugmentedAIRuntime/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/AutoScaling/AutoScaling.sln b/sdk/src/Services/AutoScaling/AutoScaling.sln index 1cb555fe0d8b..3abb5ee8c188 100644 --- a/sdk/src/Services/AutoScaling/AutoScaling.sln +++ b/sdk/src/Services/AutoScaling/AutoScaling.sln @@ -94,7 +94,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {C01395BF-21CE-4930-84EA-498F16572E1E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {C01395BF-21CE-4930-84EA-498F16572E1E}.Debug|Any CPU.Build.0 = Debug|Any CPU {C01395BF-21CE-4930-84EA-498F16572E1E}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -119,113 +126,6 @@ Global {A584273B-D015-47E2-A443-0B1F32A3AD63}.Debug|Any CPU.Build.0 = Debug|Any CPU {A584273B-D015-47E2-A443-0B1F32A3AD63}.Release|Any CPU.ActiveCfg = Release|Any CPU {A584273B-D015-47E2-A443-0B1F32A3AD63}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {8A1155CC-78E2-4E90-9414-48287CD94E1A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8A1155CC-78E2-4E90-9414-48287CD94E1A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8A1155CC-78E2-4E90-9414-48287CD94E1A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8A1155CC-78E2-4E90-9414-48287CD94E1A}.Release|Any CPU.Build.0 = Release|Any CPU - {09883904-69AF-4861-89C0-15E1BAAAB18E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {09883904-69AF-4861-89C0-15E1BAAAB18E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {09883904-69AF-4861-89C0-15E1BAAAB18E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {09883904-69AF-4861-89C0-15E1BAAAB18E}.Release|Any CPU.Build.0 = Release|Any CPU - {6980220D-B825-46A9-AC90-13D991FBF3CD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6980220D-B825-46A9-AC90-13D991FBF3CD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6980220D-B825-46A9-AC90-13D991FBF3CD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6980220D-B825-46A9-AC90-13D991FBF3CD}.Release|Any CPU.Build.0 = Release|Any CPU - {7F1F058A-9832-475A-9A34-DBBB04048C71}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7F1F058A-9832-475A-9A34-DBBB04048C71}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7F1F058A-9832-475A-9A34-DBBB04048C71}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7F1F058A-9832-475A-9A34-DBBB04048C71}.Release|Any CPU.Build.0 = Release|Any CPU - {DC35F008-7F44-46BB-A5D1-64DC6DE32859}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DC35F008-7F44-46BB-A5D1-64DC6DE32859}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DC35F008-7F44-46BB-A5D1-64DC6DE32859}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DC35F008-7F44-46BB-A5D1-64DC6DE32859}.Release|Any CPU.Build.0 = Release|Any CPU - {0B7B49D1-EE0E-400A-9305-443DF1CFFE09}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0B7B49D1-EE0E-400A-9305-443DF1CFFE09}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0B7B49D1-EE0E-400A-9305-443DF1CFFE09}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0B7B49D1-EE0E-400A-9305-443DF1CFFE09}.Release|Any CPU.Build.0 = Release|Any CPU - {C4EF76F9-4C71-4559-AF58-11CF03784251}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C4EF76F9-4C71-4559-AF58-11CF03784251}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C4EF76F9-4C71-4559-AF58-11CF03784251}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C4EF76F9-4C71-4559-AF58-11CF03784251}.Release|Any CPU.Build.0 = Release|Any CPU - {99B6099B-F515-4CEC-8BC2-E474FE98B26D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {99B6099B-F515-4CEC-8BC2-E474FE98B26D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {99B6099B-F515-4CEC-8BC2-E474FE98B26D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {99B6099B-F515-4CEC-8BC2-E474FE98B26D}.Release|Any CPU.Build.0 = Release|Any CPU - {34C9CE72-AC94-400B-B737-E3B851495EA5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {34C9CE72-AC94-400B-B737-E3B851495EA5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {34C9CE72-AC94-400B-B737-E3B851495EA5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {34C9CE72-AC94-400B-B737-E3B851495EA5}.Release|Any CPU.Build.0 = Release|Any CPU - {4701DC7D-297B-4B0F-8CA6-8F6BB73E946F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4701DC7D-297B-4B0F-8CA6-8F6BB73E946F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4701DC7D-297B-4B0F-8CA6-8F6BB73E946F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4701DC7D-297B-4B0F-8CA6-8F6BB73E946F}.Release|Any CPU.Build.0 = Release|Any CPU - {F24BDD72-72E0-4C3D-9429-0EE322158C9D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F24BDD72-72E0-4C3D-9429-0EE322158C9D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F24BDD72-72E0-4C3D-9429-0EE322158C9D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F24BDD72-72E0-4C3D-9429-0EE322158C9D}.Release|Any CPU.Build.0 = Release|Any CPU - {FB6F79E0-5AA8-42B4-96D0-725C15E23B41}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FB6F79E0-5AA8-42B4-96D0-725C15E23B41}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FB6F79E0-5AA8-42B4-96D0-725C15E23B41}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FB6F79E0-5AA8-42B4-96D0-725C15E23B41}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {8A1155CC-78E2-4E90-9414-48287CD94E1A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8A1155CC-78E2-4E90-9414-48287CD94E1A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8A1155CC-78E2-4E90-9414-48287CD94E1A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8A1155CC-78E2-4E90-9414-48287CD94E1A}.Release|Any CPU.Build.0 = Release|Any CPU - {09883904-69AF-4861-89C0-15E1BAAAB18E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {09883904-69AF-4861-89C0-15E1BAAAB18E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {09883904-69AF-4861-89C0-15E1BAAAB18E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {09883904-69AF-4861-89C0-15E1BAAAB18E}.Release|Any CPU.Build.0 = Release|Any CPU - {6980220D-B825-46A9-AC90-13D991FBF3CD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6980220D-B825-46A9-AC90-13D991FBF3CD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6980220D-B825-46A9-AC90-13D991FBF3CD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6980220D-B825-46A9-AC90-13D991FBF3CD}.Release|Any CPU.Build.0 = Release|Any CPU - {7F1F058A-9832-475A-9A34-DBBB04048C71}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7F1F058A-9832-475A-9A34-DBBB04048C71}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7F1F058A-9832-475A-9A34-DBBB04048C71}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7F1F058A-9832-475A-9A34-DBBB04048C71}.Release|Any CPU.Build.0 = Release|Any CPU - {DC35F008-7F44-46BB-A5D1-64DC6DE32859}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DC35F008-7F44-46BB-A5D1-64DC6DE32859}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DC35F008-7F44-46BB-A5D1-64DC6DE32859}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DC35F008-7F44-46BB-A5D1-64DC6DE32859}.Release|Any CPU.Build.0 = Release|Any CPU - {0B7B49D1-EE0E-400A-9305-443DF1CFFE09}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0B7B49D1-EE0E-400A-9305-443DF1CFFE09}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0B7B49D1-EE0E-400A-9305-443DF1CFFE09}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0B7B49D1-EE0E-400A-9305-443DF1CFFE09}.Release|Any CPU.Build.0 = Release|Any CPU - {C4EF76F9-4C71-4559-AF58-11CF03784251}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C4EF76F9-4C71-4559-AF58-11CF03784251}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C4EF76F9-4C71-4559-AF58-11CF03784251}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C4EF76F9-4C71-4559-AF58-11CF03784251}.Release|Any CPU.Build.0 = Release|Any CPU - {99B6099B-F515-4CEC-8BC2-E474FE98B26D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {99B6099B-F515-4CEC-8BC2-E474FE98B26D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {99B6099B-F515-4CEC-8BC2-E474FE98B26D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {99B6099B-F515-4CEC-8BC2-E474FE98B26D}.Release|Any CPU.Build.0 = Release|Any CPU - {34C9CE72-AC94-400B-B737-E3B851495EA5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {34C9CE72-AC94-400B-B737-E3B851495EA5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {34C9CE72-AC94-400B-B737-E3B851495EA5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {34C9CE72-AC94-400B-B737-E3B851495EA5}.Release|Any CPU.Build.0 = Release|Any CPU - {4701DC7D-297B-4B0F-8CA6-8F6BB73E946F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4701DC7D-297B-4B0F-8CA6-8F6BB73E946F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4701DC7D-297B-4B0F-8CA6-8F6BB73E946F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4701DC7D-297B-4B0F-8CA6-8F6BB73E946F}.Release|Any CPU.Build.0 = Release|Any CPU - {F24BDD72-72E0-4C3D-9429-0EE322158C9D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F24BDD72-72E0-4C3D-9429-0EE322158C9D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F24BDD72-72E0-4C3D-9429-0EE322158C9D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F24BDD72-72E0-4C3D-9429-0EE322158C9D}.Release|Any CPU.Build.0 = Release|Any CPU - {FB6F79E0-5AA8-42B4-96D0-725C15E23B41}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FB6F79E0-5AA8-42B4-96D0-725C15E23B41}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FB6F79E0-5AA8-42B4-96D0-725C15E23B41}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FB6F79E0-5AA8-42B4-96D0-725C15E23B41}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -242,42 +142,14 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {C01395BF-21CE-4930-84EA-498F16572E1E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {6D0C8E5E-D168-42BF-80C2-D3FC9198FC0F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {65BACB5C-8F5B-49E1-8808-EFCD2C782906} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {5D42C73D-CC77-403B-9EDC-3F3935FB5A64} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {9A5BE5D7-85D1-4AEC-BD49-DC1082DB007B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {A584273B-D015-47E2-A443-0B1F32A3AD63} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {8A1155CC-78E2-4E90-9414-48287CD94E1A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {09883904-69AF-4861-89C0-15E1BAAAB18E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6980220D-B825-46A9-AC90-13D991FBF3CD} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {7F1F058A-9832-475A-9A34-DBBB04048C71} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {DC35F008-7F44-46BB-A5D1-64DC6DE32859} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0B7B49D1-EE0E-400A-9305-443DF1CFFE09} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C4EF76F9-4C71-4559-AF58-11CF03784251} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {99B6099B-F515-4CEC-8BC2-E474FE98B26D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {34C9CE72-AC94-400B-B737-E3B851495EA5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4701DC7D-297B-4B0F-8CA6-8F6BB73E946F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F24BDD72-72E0-4C3D-9429-0EE322158C9D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {FB6F79E0-5AA8-42B4-96D0-725C15E23B41} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {8A1155CC-78E2-4E90-9414-48287CD94E1A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {09883904-69AF-4861-89C0-15E1BAAAB18E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6980220D-B825-46A9-AC90-13D991FBF3CD} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {7F1F058A-9832-475A-9A34-DBBB04048C71} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {DC35F008-7F44-46BB-A5D1-64DC6DE32859} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0B7B49D1-EE0E-400A-9305-443DF1CFFE09} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C4EF76F9-4C71-4559-AF58-11CF03784251} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {99B6099B-F515-4CEC-8BC2-E474FE98B26D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {34C9CE72-AC94-400B-B737-E3B851495EA5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4701DC7D-297B-4B0F-8CA6-8F6BB73E946F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F24BDD72-72E0-4C3D-9429-0EE322158C9D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {FB6F79E0-5AA8-42B4-96D0-725C15E23B41} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {D65B91FB-FDAA-412B-A48B-76DFC32C9BC1} diff --git a/sdk/src/Services/AutoScaling/Generated/AmazonAutoScalingConfig.cs b/sdk/src/Services/AutoScaling/Generated/AmazonAutoScalingConfig.cs index 5468e5d2c57c..072ac3d988b6 100644 --- a/sdk/src/Services/AutoScaling/Generated/AmazonAutoScalingConfig.cs +++ b/sdk/src/Services/AutoScaling/Generated/AmazonAutoScalingConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.AutoScaling public partial class AmazonAutoScalingConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("Auto Scaling", "4.0.0.0"); private static readonly AmazonAutoScalingEndpointResolver EndpointResolver = new AmazonAutoScalingEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("Auto Scaling", "3.7.401.24"); -======= - InternalSDKUtils.BuildUserAgentString("Auto Scaling", "3.7.404.7"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/AutoScaling/Generated/Model/Internal/MarshallTransformations/RefreshPreferencesUnmarshaller.cs b/sdk/src/Services/AutoScaling/Generated/Model/Internal/MarshallTransformations/RefreshPreferencesUnmarshaller.cs index 9a1c995fd22b..c925c3678fdf 100644 --- a/sdk/src/Services/AutoScaling/Generated/Model/Internal/MarshallTransformations/RefreshPreferencesUnmarshaller.cs +++ b/sdk/src/Services/AutoScaling/Generated/Model/Internal/MarshallTransformations/RefreshPreferencesUnmarshaller.cs @@ -69,7 +69,7 @@ public RefreshPreferences Unmarshall(XmlUnmarshallerContext context) } if (context.TestExpression("BakeTime", targetDepth)) { - var unmarshaller = IntUnmarshaller.Instance; + var unmarshaller = NullableIntUnmarshaller.Instance; unmarshalledObject.BakeTime = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/AutoScaling/Generated/Model/RefreshPreferences.cs b/sdk/src/Services/AutoScaling/Generated/Model/RefreshPreferences.cs index 3fc522c981b1..742026ab5629 100644 --- a/sdk/src/Services/AutoScaling/Generated/Model/RefreshPreferences.cs +++ b/sdk/src/Services/AutoScaling/Generated/Model/RefreshPreferences.cs @@ -116,9 +116,9 @@ internal bool IsSetAutoRollback() /// /// [AWSProperty(Min=0, Max=172800)] - public int BakeTime + public int? BakeTime { - get { return this._bakeTime.GetValueOrDefault(); } + get { return this._bakeTime; } set { this._bakeTime = value; } } diff --git a/sdk/src/Services/AutoScaling/Generated/_bcl/AmazonAutoScalingClient.cs b/sdk/src/Services/AutoScaling/Generated/_bcl/AmazonAutoScalingClient.cs index 7527a6205816..cb124dcb3c7b 100644 --- a/sdk/src/Services/AutoScaling/Generated/_bcl/AmazonAutoScalingClient.cs +++ b/sdk/src/Services/AutoScaling/Generated/_bcl/AmazonAutoScalingClient.cs @@ -374,9 +374,9 @@ public virtual AttachInstancesResponse AttachInstances(AttachInstancesRequest re /// /// /// - /// This API operation is superseded by AttachTrafficSources, which can attach - /// multiple traffic sources types. We recommend using AttachTrafficSources to - /// simplify how you manage traffic sources. However, we continue to support AttachLoadBalancers. + /// This API operation is superseded by https://docs.aws.amazon.com/autoscaling/ec2/APIReference/API_AttachTrafficSources.html, + /// which can attach multiple traffic sources types. We recommend using AttachTrafficSources + /// to simplify how you manage traffic sources. However, we continue to support AttachLoadBalancers. /// You can use both the original AttachLoadBalancers API operation and AttachTrafficSources /// on the same Auto Scaling group. /// @@ -387,8 +387,8 @@ public virtual AttachInstancesResponse AttachInstances(AttachInstancesRequest re /// /// /// - /// To describe the load balancers for an Auto Scaling group, call the DescribeLoadBalancers - /// API. To detach a load balancer from the Auto Scaling group, call the DetachLoadBalancers + /// To describe the load balancers for an Auto Scaling group, call the DescribeLoadBalancers + /// API. To detach a load balancer from the Auto Scaling group, call the DetachLoadBalancers /// API. /// /// @@ -427,9 +427,9 @@ public virtual AttachLoadBalancersResponse AttachLoadBalancers(AttachLoadBalance /// /// /// - /// This API operation is superseded by AttachTrafficSources, which can attach - /// multiple traffic sources types. We recommend using AttachTrafficSources to - /// simplify how you manage traffic sources. However, we continue to support AttachLoadBalancers. + /// This API operation is superseded by https://docs.aws.amazon.com/autoscaling/ec2/APIReference/API_AttachTrafficSources.html, + /// which can attach multiple traffic sources types. We recommend using AttachTrafficSources + /// to simplify how you manage traffic sources. However, we continue to support AttachLoadBalancers. /// You can use both the original AttachLoadBalancers API operation and AttachTrafficSources /// on the same Auto Scaling group. /// @@ -440,8 +440,8 @@ public virtual AttachLoadBalancersResponse AttachLoadBalancers(AttachLoadBalance /// /// /// - /// To describe the load balancers for an Auto Scaling group, call the DescribeLoadBalancers - /// API. To detach a load balancer from the Auto Scaling group, call the DetachLoadBalancers + /// To describe the load balancers for an Auto Scaling group, call the DescribeLoadBalancers + /// API. To detach a load balancer from the Auto Scaling group, call the DetachLoadBalancers /// API. /// /// @@ -487,9 +487,9 @@ public virtual AttachLoadBalancersResponse AttachLoadBalancers(AttachLoadBalance /// /// /// - /// This API operation is superseded by AttachTrafficSources, which can attach - /// multiple traffic sources types. We recommend using AttachTrafficSources to - /// simplify how you manage traffic sources. However, we continue to support AttachLoadBalancerTargetGroups. + /// This API operation is superseded by AttachTrafficSources, + /// which can attach multiple traffic sources types. We recommend using AttachTrafficSources + /// to simplify how you manage traffic sources. However, we continue to support AttachLoadBalancerTargetGroups. /// You can use both the original AttachLoadBalancerTargetGroups API operation /// and AttachTrafficSources on the same Auto Scaling group. /// @@ -517,8 +517,8 @@ public virtual AttachLoadBalancersResponse AttachLoadBalancers(AttachLoadBalance /// /// /// - /// To describe the target groups for an Auto Scaling group, call the DescribeLoadBalancerTargetGroups - /// API. To detach the target group from the Auto Scaling group, call the DetachLoadBalancerTargetGroups + /// To describe the target groups for an Auto Scaling group, call the DescribeLoadBalancerTargetGroups + /// API. To detach the target group from the Auto Scaling group, call the DetachLoadBalancerTargetGroups /// API. /// /// @@ -557,9 +557,9 @@ public virtual AttachLoadBalancerTargetGroupsResponse AttachLoadBalancerTargetGr /// /// /// - /// This API operation is superseded by AttachTrafficSources, which can attach - /// multiple traffic sources types. We recommend using AttachTrafficSources to - /// simplify how you manage traffic sources. However, we continue to support AttachLoadBalancerTargetGroups. + /// This API operation is superseded by AttachTrafficSources, + /// which can attach multiple traffic sources types. We recommend using AttachTrafficSources + /// to simplify how you manage traffic sources. However, we continue to support AttachLoadBalancerTargetGroups. /// You can use both the original AttachLoadBalancerTargetGroups API operation /// and AttachTrafficSources on the same Auto Scaling group. /// @@ -587,8 +587,8 @@ public virtual AttachLoadBalancerTargetGroupsResponse AttachLoadBalancerTargetGr /// /// /// - /// To describe the target groups for an Auto Scaling group, call the DescribeLoadBalancerTargetGroups - /// API. To detach the target group from the Auto Scaling group, call the DetachLoadBalancerTargetGroups + /// To describe the target groups for an Auto Scaling group, call the DescribeLoadBalancerTargetGroups + /// API. To detach the target group from the Auto Scaling group, call the DetachLoadBalancerTargetGroups /// API. /// /// @@ -665,9 +665,10 @@ public virtual AttachLoadBalancerTargetGroupsResponse AttachLoadBalancerTargetGr /// /// /// - /// After the operation completes, use the DescribeTrafficSources API to return - /// details about the state of the attachments between traffic sources and your Auto Scaling - /// group. To detach a traffic source from the Auto Scaling group, call the DetachTrafficSources + /// After the operation completes, use the DescribeTrafficSources + /// API to return details about the state of the attachments between traffic sources and + /// your Auto Scaling group. To detach a traffic source from the Auto Scaling group, call + /// the DetachTrafficSources /// API. /// /// @@ -726,9 +727,10 @@ public virtual AttachTrafficSourcesResponse AttachTrafficSources(AttachTrafficSo /// /// /// - /// After the operation completes, use the DescribeTrafficSources API to return - /// details about the state of the attachments between traffic sources and your Auto Scaling - /// group. To detach a traffic source from the Auto Scaling group, call the DetachTrafficSources + /// After the operation completes, use the DescribeTrafficSources + /// API to return details about the state of the attachments between traffic sources and + /// your Auto Scaling group. To detach a traffic source from the Auto Scaling group, call + /// the DetachTrafficSources /// API. /// /// @@ -889,7 +891,8 @@ public virtual BatchPutScheduledUpdateGroupActionResponse BatchPutScheduledUpdat /// /// /// When you cancel an instance refresh, this does not roll back any changes that it made. - /// Use the RollbackInstanceRefresh API to roll back instead. + /// Use the RollbackInstanceRefresh + /// API to roll back instead. /// /// /// Container for the necessary parameters to execute the CancelInstanceRefresh service method. @@ -933,7 +936,8 @@ public virtual CancelInstanceRefreshResponse CancelInstanceRefresh(CancelInstanc /// /// /// When you cancel an instance refresh, this does not roll back any changes that it made. - /// Use the RollbackInstanceRefresh API to roll back instead. + /// Use the RollbackInstanceRefresh + /// API to roll back instead. /// /// /// Container for the necessary parameters to execute the CancelInstanceRefresh service method. @@ -1009,7 +1013,8 @@ public virtual CancelInstanceRefreshResponse CancelInstanceRefresh(CancelInstanc /// ///
  • /// - /// If you finish before the timeout period ends, send a callback by using the CompleteLifecycleAction + /// If you finish before the timeout period ends, send a callback by using the CompleteLifecycleAction /// API call. /// ///
    • @@ -1074,7 +1079,8 @@ public virtual CompleteLifecycleActionResponse CompleteLifecycleAction(CompleteL /// ///
  • /// - /// If you finish before the timeout period ends, send a callback by using the CompleteLifecycleAction + /// If you finish before the timeout period ends, send a callback by using the CompleteLifecycleAction /// API call. /// ///
    • @@ -1119,8 +1125,8 @@ public virtual CompleteLifecycleActionResponse CompleteLifecycleAction(CompleteL /// /// /// If you exceed your maximum limit of Auto Scaling groups, the call fails. To query - /// this limit, call the DescribeAccountLimits API. For information about updating - /// this limit, see Quotas + /// this limit, call the DescribeAccountLimits + /// API. For information about updating this limit, see Quotas /// for Amazon EC2 Auto Scaling in the Amazon EC2 Auto Scaling User Guide. /// /// @@ -1178,8 +1184,8 @@ public virtual CreateAutoScalingGroupResponse CreateAutoScalingGroup(CreateAutoS /// /// /// If you exceed your maximum limit of Auto Scaling groups, the call fails. To query - /// this limit, call the DescribeAccountLimits API. For information about updating - /// this limit, see Quotas + /// this limit, call the DescribeAccountLimits + /// API. For information about updating this limit, see Quotas /// for Amazon EC2 Auto Scaling in the Amazon EC2 Auto Scaling User Guide. /// /// @@ -1239,8 +1245,8 @@ public virtual CreateAutoScalingGroupResponse CreateAutoScalingGroup(CreateAutoS /// /// /// If you exceed your maximum limit of launch configurations, the call fails. To query - /// this limit, call the DescribeAccountLimits API. For information about updating - /// this limit, see Quotas + /// this limit, call the DescribeAccountLimits + /// API. For information about updating this limit, see Quotas /// for Amazon EC2 Auto Scaling in the Amazon EC2 Auto Scaling User Guide. /// /// @@ -1292,8 +1298,8 @@ public virtual CreateLaunchConfigurationResponse CreateLaunchConfiguration(Creat /// /// /// If you exceed your maximum limit of launch configurations, the call fails. To query - /// this limit, call the DescribeAccountLimits API. For information about updating - /// this limit, see Quotas + /// this limit, call the DescribeAccountLimits + /// API. For information about updating this limit, see Quotas /// for Amazon EC2 Auto Scaling in the Amazon EC2 Auto Scaling User Guide. /// /// @@ -1453,13 +1459,13 @@ public virtual CreateOrUpdateTagsResponse CreateOrUpdateTags(CreateOrUpdateTagsR /// /// /// - /// To remove instances from the Auto Scaling group before deleting it, call the DetachInstances + /// To remove instances from the Auto Scaling group before deleting it, call the DetachInstances /// API with the list of instances and the option to decrement the desired capacity. This /// ensures that Amazon EC2 Auto Scaling does not launch replacement instances. /// /// /// - /// To terminate all instances before deleting the Auto Scaling group, call the UpdateAutoScalingGroup + /// To terminate all instances before deleting the Auto Scaling group, call the UpdateAutoScalingGroup /// API and set the minimum size and desired capacity of the Auto Scaling group to zero. /// /// @@ -1509,13 +1515,13 @@ public virtual DeleteAutoScalingGroupResponse DeleteAutoScalingGroup(DeleteAutoS /// /// /// - /// To remove instances from the Auto Scaling group before deleting it, call the DetachInstances + /// To remove instances from the Auto Scaling group before deleting it, call the DetachInstances /// API with the list of instances and the option to decrement the desired capacity. This /// ensures that Amazon EC2 Auto Scaling does not launch replacement instances. /// /// /// - /// To terminate all instances before deleting the Auto Scaling group, call the UpdateAutoScalingGroup + /// To terminate all instances before deleting the Auto Scaling group, call the UpdateAutoScalingGroup /// API and set the minimum size and desired capacity of the Auto Scaling group to zero. /// /// @@ -2289,7 +2295,7 @@ public virtual DescribeAdjustmentTypesResponse DescribeAdjustmentTypes(DescribeA /// /// /// This operation also returns information about instances in Auto Scaling groups. To - /// retrieve information about the instances in a warm pool, you must call the DescribeWarmPool + /// retrieve information about the instances in a warm pool, you must call the DescribeWarmPool /// API. /// ///     @@ -2323,7 +2329,7 @@ public virtual DescribeAutoScalingGroupsResponse DescribeAutoScalingGroups() /// /// /// This operation also returns information about instances in Auto Scaling groups. To - /// retrieve information about the instances in a warm pool, you must call the DescribeWarmPool + /// retrieve information about the instances in a warm pool, you must call the DescribeWarmPool /// API. /// ///     @@ -2362,7 +2368,7 @@ public virtual DescribeAutoScalingGroupsResponse DescribeAutoScalingGroups(Descr /// /// /// This operation also returns information about instances in Auto Scaling groups. To - /// retrieve information about the instances in a warm pool, you must call the DescribeWarmPool + /// retrieve information about the instances in a warm pool, you must call the DescribeWarmPool /// API. /// ///     @@ -2398,7 +2404,7 @@ public virtual DescribeAutoScalingGroupsResponse DescribeAutoScalingGroups(Descr /// /// /// This operation also returns information about instances in Auto Scaling groups. To - /// retrieve information about the instances in a warm pool, you must call the DescribeWarmPool + /// retrieve information about the instances in a warm pool, you must call the DescribeWarmPool /// API. /// ///     @@ -2921,9 +2927,9 @@ public virtual DescribeLifecycleHookTypesResponse DescribeLifecycleHookTypes(Des /// /// /// - /// This API operation is superseded by DescribeTrafficSources, which can describe - /// multiple traffic sources types. We recommend using DescribeTrafficSources to - /// simplify how you manage traffic sources. However, we continue to support DescribeLoadBalancers. + /// This API operation is superseded by DescribeTrafficSources, + /// which can describe multiple traffic sources types. We recommend using DescribeTrafficSources + /// to simplify how you manage traffic sources. However, we continue to support DescribeLoadBalancers. /// You can use both the original DescribeLoadBalancers API operation and DescribeTrafficSources /// on the same Auto Scaling group. /// @@ -2934,7 +2940,7 @@ public virtual DescribeLifecycleHookTypesResponse DescribeLifecycleHookTypes(Des /// /// /// This operation describes only Classic Load Balancers. If you have Application Load - /// Balancers, Network Load Balancers, or Gateway Load Balancers, use the DescribeLoadBalancerTargetGroups + /// Balancers, Network Load Balancers, or Gateway Load Balancers, use the DescribeLoadBalancerTargetGroups /// API instead. /// /// @@ -2951,10 +2957,10 @@ public virtual DescribeLifecycleHookTypesResponse DescribeLifecycleHookTypes(Des /// /// /// - /// Load balancers also have an InService state if you attach them in the CreateAutoScalingGroup + /// Load balancers also have an InService state if you attach them in the CreateAutoScalingGroup /// API call. If your load balancer state is InService, but it is not working properly, - /// check the scaling activities by calling DescribeScalingActivities and take - /// any corrective actions necessary. + /// check the scaling activities by calling DescribeScalingActivities + /// and take any corrective actions necessary. /// /// /// @@ -2989,9 +2995,9 @@ public virtual DescribeLoadBalancersResponse DescribeLoadBalancers(DescribeLoadB /// /// /// - /// This API operation is superseded by DescribeTrafficSources, which can describe - /// multiple traffic sources types. We recommend using DescribeTrafficSources to - /// simplify how you manage traffic sources. However, we continue to support DescribeLoadBalancers. + /// This API operation is superseded by DescribeTrafficSources, + /// which can describe multiple traffic sources types. We recommend using DescribeTrafficSources + /// to simplify how you manage traffic sources. However, we continue to support DescribeLoadBalancers. /// You can use both the original DescribeLoadBalancers API operation and DescribeTrafficSources /// on the same Auto Scaling group. /// @@ -3002,7 +3008,7 @@ public virtual DescribeLoadBalancersResponse DescribeLoadBalancers(DescribeLoadB /// /// /// This operation describes only Classic Load Balancers. If you have Application Load - /// Balancers, Network Load Balancers, or Gateway Load Balancers, use the DescribeLoadBalancerTargetGroups + /// Balancers, Network Load Balancers, or Gateway Load Balancers, use the DescribeLoadBalancerTargetGroups /// API instead. /// /// @@ -3019,10 +3025,10 @@ public virtual DescribeLoadBalancersResponse DescribeLoadBalancers(DescribeLoadB /// /// /// - /// Load balancers also have an InService state if you attach them in the CreateAutoScalingGroup + /// Load balancers also have an InService state if you attach them in the CreateAutoScalingGroup /// API call. If your load balancer state is InService, but it is not working properly, - /// check the scaling activities by calling DescribeScalingActivities and take - /// any corrective actions necessary. + /// check the scaling activities by calling DescribeScalingActivities + /// and take any corrective actions necessary. /// /// /// @@ -3064,9 +3070,9 @@ public virtual DescribeLoadBalancersResponse DescribeLoadBalancers(DescribeLoadB /// /// /// - /// This API operation is superseded by DescribeTrafficSources, which can describe - /// multiple traffic sources types. We recommend using DetachTrafficSources to - /// simplify how you manage traffic sources. However, we continue to support DescribeLoadBalancerTargetGroups. + /// This API operation is superseded by DescribeTrafficSources, + /// which can describe multiple traffic sources types. We recommend using DetachTrafficSources + /// to simplify how you manage traffic sources. However, we continue to support DescribeLoadBalancerTargetGroups. /// You can use both the original DescribeLoadBalancerTargetGroups API operation /// and DescribeTrafficSources on the same Auto Scaling group. /// @@ -3089,10 +3095,10 @@ public virtual DescribeLoadBalancersResponse DescribeLoadBalancers(DescribeLoadB /// /// /// - /// Target groups also have an InService state if you attach them in the CreateAutoScalingGroup + /// Target groups also have an InService state if you attach them in the CreateAutoScalingGroup /// API call. If your target group state is InService, but it is not working properly, - /// check the scaling activities by calling DescribeScalingActivities and take - /// any corrective actions necessary. + /// check the scaling activities by calling DescribeScalingActivities + /// and take any corrective actions necessary. /// /// /// @@ -3104,8 +3110,9 @@ public virtual DescribeLoadBalancersResponse DescribeLoadBalancers(DescribeLoadB /// /// /// - /// You can use this operation to describe target groups that were attached by using AttachLoadBalancerTargetGroups, - /// but not for target groups that were attached by using AttachTrafficSources. + /// You can use this operation to describe target groups that were attached by using AttachLoadBalancerTargetGroups, + /// but not for target groups that were attached by using AttachTrafficSources. /// /// /// @@ -3133,9 +3140,9 @@ public virtual DescribeLoadBalancerTargetGroupsResponse DescribeLoadBalancerTarg /// /// /// - /// This API operation is superseded by DescribeTrafficSources, which can describe - /// multiple traffic sources types. We recommend using DetachTrafficSources to - /// simplify how you manage traffic sources. However, we continue to support DescribeLoadBalancerTargetGroups. + /// This API operation is superseded by DescribeTrafficSources, + /// which can describe multiple traffic sources types. We recommend using DetachTrafficSources + /// to simplify how you manage traffic sources. However, we continue to support DescribeLoadBalancerTargetGroups. /// You can use both the original DescribeLoadBalancerTargetGroups API operation /// and DescribeTrafficSources on the same Auto Scaling group. /// @@ -3158,10 +3165,10 @@ public virtual DescribeLoadBalancerTargetGroupsResponse DescribeLoadBalancerTarg /// /// /// - /// Target groups also have an InService state if you attach them in the CreateAutoScalingGroup + /// Target groups also have an InService state if you attach them in the CreateAutoScalingGroup /// API call. If your target group state is InService, but it is not working properly, - /// check the scaling activities by calling DescribeScalingActivities and take - /// any corrective actions necessary. + /// check the scaling activities by calling DescribeScalingActivities + /// and take any corrective actions necessary. /// /// /// @@ -3173,8 +3180,9 @@ public virtual DescribeLoadBalancerTargetGroupsResponse DescribeLoadBalancerTarg /// /// /// - /// You can use this operation to describe target groups that were attached by using AttachLoadBalancerTargetGroups, - /// but not for target groups that were attached by using AttachTrafficSources. + /// You can use this operation to describe target groups that were attached by using AttachLoadBalancerTargetGroups, + /// but not for target groups that were attached by using AttachTrafficSources. /// /// /// @@ -3659,7 +3667,8 @@ public virtual DescribeScalingActivitiesResponse DescribeScalingActivities(Descr /// - /// Describes the scaling process types for use with the ResumeProcesses and SuspendProcesses + /// Describes the scaling process types for use with the ResumeProcesses + /// and SuspendProcesses /// APIs. /// /// @@ -3676,7 +3685,8 @@ public virtual DescribeScalingProcessTypesResponse DescribeScalingProcessTypes() /// - /// Describes the scaling process types for use with the ResumeProcesses and SuspendProcesses + /// Describes the scaling process types for use with the ResumeProcesses + /// and SuspendProcesses /// APIs. /// /// Container for the necessary parameters to execute the DescribeScalingProcessTypes service method. @@ -3698,7 +3708,8 @@ public virtual DescribeScalingProcessTypesResponse DescribeScalingProcessTypes(D /// - /// Describes the scaling process types for use with the ResumeProcesses and SuspendProcesses + /// Describes the scaling process types for use with the ResumeProcesses + /// and SuspendProcesses /// APIs. /// /// @@ -3717,7 +3728,8 @@ public virtual DescribeScalingProcessTypesResponse DescribeScalingProcessTypes(D } /// - /// Describes the scaling process types for use with the ResumeProcesses and SuspendProcesses + /// Describes the scaling process types for use with the ResumeProcesses + /// and SuspendProcesses /// APIs. /// /// Container for the necessary parameters to execute the DescribeScalingProcessTypes service method. @@ -3752,7 +3764,8 @@ public virtual DescribeScalingProcessTypesResponse DescribeScalingProcessTypes(D /// /// /// To describe the scaling activities for scheduled actions that have already run, call - /// the DescribeScalingActivities API. + /// the DescribeScalingActivities + /// API. /// /// /// @@ -3778,7 +3791,8 @@ public virtual DescribeScheduledActionsResponse DescribeScheduledActions() /// /// /// To describe the scaling activities for scheduled actions that have already run, call - /// the DescribeScalingActivities API. + /// the DescribeScalingActivities + /// API. /// /// /// Container for the necessary parameters to execute the DescribeScheduledActions service method. @@ -3809,7 +3823,8 @@ public virtual DescribeScheduledActionsResponse DescribeScheduledActions(Describ /// /// /// To describe the scaling activities for scheduled actions that have already run, call - /// the DescribeScalingActivities API. + /// the DescribeScalingActivities + /// API. /// ///     /// @@ -3837,7 +3852,8 @@ public virtual DescribeScheduledActionsResponse DescribeScheduledActions(Describ /// /// /// To describe the scaling activities for scheduled actions that have already run, call - /// the DescribeScalingActivities API. + /// the DescribeScalingActivities + /// API. /// ///     /// Container for the necessary parameters to execute the DescribeScheduledActions service method. @@ -4398,9 +4414,9 @@ public virtual DetachInstancesResponse DetachInstances(DetachInstancesRequest re /// /// /// - /// This API operation is superseded by DetachTrafficSources, which can detach - /// multiple traffic sources types. We recommend using DetachTrafficSources to - /// simplify how you manage traffic sources. However, we continue to support DetachLoadBalancers. + /// This API operation is superseded by DetachTrafficSources, + /// which can detach multiple traffic sources types. We recommend using DetachTrafficSources + /// to simplify how you manage traffic sources. However, we continue to support DetachLoadBalancers. /// You can use both the original DetachLoadBalancers API operation and DetachTrafficSources /// on the same Auto Scaling group. /// @@ -4411,15 +4427,15 @@ public virtual DetachInstancesResponse DetachInstances(DetachInstancesRequest re /// /// /// This operation detaches only Classic Load Balancers. If you have Application Load - /// Balancers, Network Load Balancers, or Gateway Load Balancers, use the DetachLoadBalancerTargetGroups + /// Balancers, Network Load Balancers, or Gateway Load Balancers, use the DetachLoadBalancerTargetGroups /// API instead. /// /// /// /// When you detach a load balancer, it enters the Removing state while deregistering /// the instances in the group. When all instances are deregistered, then you can no longer - /// describe the load balancer using the DescribeLoadBalancers API call. The instances - /// remain running. + /// describe the load balancer using the DescribeLoadBalancers + /// API call. The instances remain running. /// /// /// Container for the necessary parameters to execute the DetachLoadBalancers service method. @@ -4443,9 +4459,9 @@ public virtual DetachLoadBalancersResponse DetachLoadBalancers(DetachLoadBalance /// /// /// - /// This API operation is superseded by DetachTrafficSources, which can detach - /// multiple traffic sources types. We recommend using DetachTrafficSources to - /// simplify how you manage traffic sources. However, we continue to support DetachLoadBalancers. + /// This API operation is superseded by DetachTrafficSources, + /// which can detach multiple traffic sources types. We recommend using DetachTrafficSources + /// to simplify how you manage traffic sources. However, we continue to support DetachLoadBalancers. /// You can use both the original DetachLoadBalancers API operation and DetachTrafficSources /// on the same Auto Scaling group. /// @@ -4456,15 +4472,15 @@ public virtual DetachLoadBalancersResponse DetachLoadBalancers(DetachLoadBalance /// /// /// This operation detaches only Classic Load Balancers. If you have Application Load - /// Balancers, Network Load Balancers, or Gateway Load Balancers, use the DetachLoadBalancerTargetGroups + /// Balancers, Network Load Balancers, or Gateway Load Balancers, use the DetachLoadBalancerTargetGroups /// API instead. /// /// /// /// When you detach a load balancer, it enters the Removing state while deregistering /// the instances in the group. When all instances are deregistered, then you can no longer - /// describe the load balancer using the DescribeLoadBalancers API call. The instances - /// remain running. + /// describe the load balancer using the DescribeLoadBalancers + /// API call. The instances remain running. /// /// /// Container for the necessary parameters to execute the DetachLoadBalancers service method. @@ -4495,9 +4511,9 @@ public virtual DetachLoadBalancersResponse DetachLoadBalancers(DetachLoadBalance /// /// /// - /// This API operation is superseded by DetachTrafficSources, which can detach - /// multiple traffic sources types. We recommend using DetachTrafficSources to - /// simplify how you manage traffic sources. However, we continue to support DetachLoadBalancerTargetGroups. + /// This API operation is superseded by DetachTrafficSources, + /// which can detach multiple traffic sources types. We recommend using DetachTrafficSources + /// to simplify how you manage traffic sources. However, we continue to support DetachLoadBalancerTargetGroups. /// You can use both the original DetachLoadBalancerTargetGroups API operation /// and DetachTrafficSources on the same Auto Scaling group. /// @@ -4509,13 +4525,14 @@ public virtual DetachLoadBalancersResponse DetachLoadBalancers(DetachLoadBalance /// /// When you detach a target group, it enters the Removing state while deregistering /// the instances in the group. When all instances are deregistered, then you can no longer - /// describe the target group using the DescribeLoadBalancerTargetGroups API call. - /// The instances remain running. + /// describe the target group using the DescribeLoadBalancerTargetGroups + /// API call. The instances remain running. /// /// /// - /// You can use this operation to detach target groups that were attached by using AttachLoadBalancerTargetGroups, - /// but not for target groups that were attached by using AttachTrafficSources. + /// You can use this operation to detach target groups that were attached by using AttachLoadBalancerTargetGroups, + /// but not for target groups that were attached by using AttachTrafficSources. /// /// /// @@ -4540,9 +4557,9 @@ public virtual DetachLoadBalancerTargetGroupsResponse DetachLoadBalancerTargetGr /// /// /// - /// This API operation is superseded by DetachTrafficSources, which can detach - /// multiple traffic sources types. We recommend using DetachTrafficSources to - /// simplify how you manage traffic sources. However, we continue to support DetachLoadBalancerTargetGroups. + /// This API operation is superseded by DetachTrafficSources, + /// which can detach multiple traffic sources types. We recommend using DetachTrafficSources + /// to simplify how you manage traffic sources. However, we continue to support DetachLoadBalancerTargetGroups. /// You can use both the original DetachLoadBalancerTargetGroups API operation /// and DetachTrafficSources on the same Auto Scaling group. /// @@ -4554,13 +4571,14 @@ public virtual DetachLoadBalancerTargetGroupsResponse DetachLoadBalancerTargetGr /// /// When you detach a target group, it enters the Removing state while deregistering /// the instances in the group. When all instances are deregistered, then you can no longer - /// describe the target group using the DescribeLoadBalancerTargetGroups API call. - /// The instances remain running. + /// describe the target group using the DescribeLoadBalancerTargetGroups + /// API call. The instances remain running. /// /// /// - /// You can use this operation to detach target groups that were attached by using AttachLoadBalancerTargetGroups, - /// but not for target groups that were attached by using AttachTrafficSources. + /// You can use this operation to detach target groups that were attached by using AttachLoadBalancerTargetGroups, + /// but not for target groups that were attached by using AttachTrafficSources. /// /// /// @@ -4596,8 +4614,8 @@ public virtual DetachLoadBalancerTargetGroupsResponse DetachLoadBalancerTargetGr /// /// When you detach a traffic source, it enters the Removing state while deregistering /// the instances in the group. When all instances are deregistered, then you can no longer - /// describe the traffic source using the DescribeTrafficSources API call. The - /// instances continue to run. + /// describe the traffic source using the DescribeTrafficSources + /// API call. The instances continue to run. /// ///     /// Container for the necessary parameters to execute the DetachTrafficSources service method. @@ -4625,8 +4643,8 @@ public virtual DetachTrafficSourcesResponse DetachTrafficSources(DetachTrafficSo /// /// When you detach a traffic source, it enters the Removing state while deregistering /// the instances in the group. When all instances are deregistered, then you can no longer - /// describe the traffic source using the DescribeTrafficSources API call. The - /// instances continue to run. + /// describe the traffic source using the DescribeTrafficSources + /// API call. The instances continue to run. /// ///     /// Container for the necessary parameters to execute the DetachTrafficSources service method. @@ -5109,11 +5127,12 @@ public virtual GetPredictiveScalingForecastResponse GetPredictiveScalingForecast ///
  • /// /// If you need more time, record the lifecycle action heartbeat to keep the instance - /// in a wait state using the RecordLifecycleActionHeartbeat API call. + /// in a wait state using the RecordLifecycleActionHeartbeat + /// API call. /// ///
  • /// - /// If you finish before the timeout period ends, send a callback by using the CompleteLifecycleAction + /// If you finish before the timeout period ends, send a callback by using the CompleteLifecycleAction /// API call. /// ///
    • @@ -5128,9 +5147,10 @@ public virtual GetPredictiveScalingForecastResponse GetPredictiveScalingForecast /// /// /// - /// You can view the lifecycle hooks for an Auto Scaling group using the DescribeLifecycleHooks + /// You can view the lifecycle hooks for an Auto Scaling group using the DescribeLifecycleHooks /// API call. If you are no longer using a lifecycle hook, you can delete it by calling - /// the DeleteLifecycleHook API. + /// the DeleteLifecycleHook + /// API. /// ///     /// Container for the necessary parameters to execute the PutLifecycleHook service method. @@ -5196,11 +5216,12 @@ public virtual PutLifecycleHookResponse PutLifecycleHook(PutLifecycleHookRequest ///
  • /// /// If you need more time, record the lifecycle action heartbeat to keep the instance - /// in a wait state using the RecordLifecycleActionHeartbeat API call. + /// in a wait state using the RecordLifecycleActionHeartbeat + /// API call. /// ///
  • /// - /// If you finish before the timeout period ends, send a callback by using the CompleteLifecycleAction + /// If you finish before the timeout period ends, send a callback by using the CompleteLifecycleAction /// API call. /// ///
    • @@ -5215,9 +5236,10 @@ public virtual PutLifecycleHookResponse PutLifecycleHook(PutLifecycleHookRequest /// /// /// - /// You can view the lifecycle hooks for an Auto Scaling group using the DescribeLifecycleHooks + /// You can view the lifecycle hooks for an Auto Scaling group using the DescribeLifecycleHooks /// API call. If you are no longer using a lifecycle hook, you can delete it by calling - /// the DeleteLifecycleHook API. + /// the DeleteLifecycleHook + /// API. /// ///     /// Container for the necessary parameters to execute the PutLifecycleHook service method. @@ -5372,9 +5394,10 @@ public virtual PutNotificationConfigurationResponse PutNotificationConfiguration /// /// /// - /// You can view the scaling policies for an Auto Scaling group using the DescribePolicies + /// You can view the scaling policies for an Auto Scaling group using the DescribePolicies /// API call. If you are no longer using a scaling policy, you can delete it by calling - /// the DeletePolicy API. + /// the DeletePolicy + /// API. /// ///     /// Container for the necessary parameters to execute the PutScalingPolicy service method. @@ -5422,9 +5445,10 @@ public virtual PutScalingPolicyResponse PutScalingPolicy(PutScalingPolicyRequest /// /// /// - /// You can view the scaling policies for an Auto Scaling group using the DescribePolicies + /// You can view the scaling policies for an Auto Scaling group using the DescribePolicies /// API call. If you are no longer using a scaling policy, you can delete it by calling - /// the DeletePolicy API. + /// the DeletePolicy + /// API. /// ///     /// Container for the necessary parameters to execute the PutScalingPolicy service method. @@ -5471,9 +5495,10 @@ public virtual PutScalingPolicyResponse PutScalingPolicy(PutScalingPolicyRequest /// /// /// - /// You can view the scheduled actions for an Auto Scaling group using the DescribeScheduledActions + /// You can view the scheduled actions for an Auto Scaling group using the DescribeScheduledActions /// API call. If you are no longer using a scheduled action, you can delete it by calling - /// the DeleteScheduledAction API. + /// the DeleteScheduledAction + /// API. /// /// /// @@ -5518,9 +5543,10 @@ public virtual PutScheduledUpdateGroupActionResponse PutScheduledUpdateGroupActi /// /// /// - /// You can view the scheduled actions for an Auto Scaling group using the DescribeScheduledActions + /// You can view the scheduled actions for an Auto Scaling group using the DescribeScheduledActions /// API call. If you are no longer using a scheduled action, you can delete it by calling - /// the DeleteScheduledAction API. + /// the DeleteScheduledAction + /// API. /// /// /// @@ -5575,8 +5601,9 @@ public virtual PutScheduledUpdateGroupActionResponse PutScheduledUpdateGroupActi /// /// /// - /// You can view the instances in the warm pool using the DescribeWarmPool API - /// call. If you are no longer using a warm pool, you can delete it by calling the DeleteWarmPool + /// You can view the instances in the warm pool using the DescribeWarmPool + /// API call. If you are no longer using a warm pool, you can delete it by calling the + /// DeleteWarmPool /// API. /// /// @@ -5622,8 +5649,9 @@ public virtual PutWarmPoolResponse PutWarmPool(PutWarmPoolRequest request) /// /// /// - /// You can view the instances in the warm pool using the DescribeWarmPool API - /// call. If you are no longer using a warm pool, you can delete it by calling the DeleteWarmPool + /// You can view the instances in the warm pool using the DescribeWarmPool + /// API call. If you are no longer using a warm pool, you can delete it by calling the + /// DeleteWarmPool /// API. /// /// @@ -5665,7 +5693,7 @@ public virtual PutWarmPoolResponse PutWarmPool(PutWarmPoolRequest request) /// /// Records a heartbeat for the lifecycle action associated with the specified token or - /// instance. This extends the timeout by the length of time defined using the PutLifecycleHook + /// instance. This extends the timeout by the length of time defined using the PutLifecycleHook /// API call. /// /// @@ -5702,7 +5730,7 @@ public virtual PutWarmPoolResponse PutWarmPool(PutWarmPoolRequest request) /// ///
  • /// - /// If you finish before the timeout period ends, send a callback by using the CompleteLifecycleAction + /// If you finish before the timeout period ends, send a callback by using the CompleteLifecycleAction /// API call. /// ///
    • @@ -5731,7 +5759,7 @@ public virtual RecordLifecycleActionHeartbeatResponse RecordLifecycleActionHeart /// /// Records a heartbeat for the lifecycle action associated with the specified token or - /// instance. This extends the timeout by the length of time defined using the PutLifecycleHook + /// instance. This extends the timeout by the length of time defined using the PutLifecycleHook /// API call. /// /// @@ -5768,7 +5796,7 @@ public virtual RecordLifecycleActionHeartbeatResponse RecordLifecycleActionHeart /// ///
  • /// - /// If you finish before the timeout period ends, send a callback by using the CompleteLifecycleAction + /// If you finish before the timeout period ends, send a callback by using the CompleteLifecycleAction /// API call. /// ///
    • @@ -5907,7 +5935,8 @@ public virtual ResumeProcessesResponse ResumeProcesses(ResumeProcessesRequest re /// /// When you receive a successful response from this operation, Amazon EC2 Auto Scaling /// immediately begins replacing instances. You can check the status of this operation - /// through the DescribeInstanceRefreshes API operation. + /// through the DescribeInstanceRefreshes + /// API operation. /// ///     /// Container for the necessary parameters to execute the RollbackInstanceRefresh service method. @@ -5978,7 +6007,8 @@ public virtual RollbackInstanceRefreshResponse RollbackInstanceRefresh(RollbackI /// /// When you receive a successful response from this operation, Amazon EC2 Auto Scaling /// immediately begins replacing instances. You can check the status of this operation - /// through the DescribeInstanceRefreshes API operation. + /// through the DescribeInstanceRefreshes + /// API operation. /// ///     /// Container for the necessary parameters to execute the RollbackInstanceRefresh service method. @@ -6264,9 +6294,9 @@ public virtual SetInstanceProtectionResponse SetInstanceProtection(SetInstancePr /// /// /// If successful, the request's response contains a unique ID that you can use to track - /// the progress of the instance refresh. To query its status, call the DescribeInstanceRefreshes - /// API. To describe the instance refreshes that have already run, call the DescribeInstanceRefreshes - /// API. To cancel an instance refresh that is in progress, use the CancelInstanceRefresh + /// the progress of the instance refresh. To query its status, call the DescribeInstanceRefreshes + /// API. To describe the instance refreshes that have already run, call the DescribeInstanceRefreshes + /// API. To cancel an instance refresh that is in progress, use the CancelInstanceRefresh /// API. /// /// @@ -6274,7 +6304,7 @@ public virtual SetInstanceProtectionResponse SetInstanceProtection(SetInstancePr /// An instance refresh might fail for several reasons, such as EC2 launch failures, misconfigured /// health checks, or not ignoring or allowing the termination of instances that are in /// Standby state or protected from scale in. You can monitor for failed EC2 launches - /// using the scaling activities. To find the scaling activities, call the DescribeScalingActivities + /// using the scaling activities. To find the scaling activities, call the DescribeScalingActivities /// API. /// /// @@ -6282,7 +6312,7 @@ public virtual SetInstanceProtectionResponse SetInstanceProtection(SetInstancePr /// If you enable auto rollback, your Auto Scaling group will be rolled back automatically /// when the instance refresh fails. You can enable this feature before starting an instance /// refresh by specifying the AutoRollback property in the instance refresh preferences. - /// Otherwise, to roll back an instance refresh before it finishes, use the RollbackInstanceRefresh + /// Otherwise, to roll back an instance refresh before it finishes, use the RollbackInstanceRefresh /// API. /// ///     @@ -6329,9 +6359,9 @@ public virtual StartInstanceRefreshResponse StartInstanceRefresh(StartInstanceRe /// /// /// If successful, the request's response contains a unique ID that you can use to track - /// the progress of the instance refresh. To query its status, call the DescribeInstanceRefreshes - /// API. To describe the instance refreshes that have already run, call the DescribeInstanceRefreshes - /// API. To cancel an instance refresh that is in progress, use the CancelInstanceRefresh + /// the progress of the instance refresh. To query its status, call the DescribeInstanceRefreshes + /// API. To describe the instance refreshes that have already run, call the DescribeInstanceRefreshes + /// API. To cancel an instance refresh that is in progress, use the CancelInstanceRefresh /// API. /// /// @@ -6339,7 +6369,7 @@ public virtual StartInstanceRefreshResponse StartInstanceRefresh(StartInstanceRe /// An instance refresh might fail for several reasons, such as EC2 launch failures, misconfigured /// health checks, or not ignoring or allowing the termination of instances that are in /// Standby state or protected from scale in. You can monitor for failed EC2 launches - /// using the scaling activities. To find the scaling activities, call the DescribeScalingActivities + /// using the scaling activities. To find the scaling activities, call the DescribeScalingActivities /// API. /// /// @@ -6347,7 +6377,7 @@ public virtual StartInstanceRefreshResponse StartInstanceRefresh(StartInstanceRe /// If you enable auto rollback, your Auto Scaling group will be rolled back automatically /// when the instance refresh fails. You can enable this feature before starting an instance /// refresh by specifying the AutoRollback property in the instance refresh preferences. - /// Otherwise, to roll back an instance refresh before it finishes, use the RollbackInstanceRefresh + /// Otherwise, to roll back an instance refresh before it finishes, use the RollbackInstanceRefresh /// API. /// ///     @@ -6400,7 +6430,8 @@ public virtual StartInstanceRefreshResponse StartInstanceRefresh(StartInstanceRe /// /// /// - /// To resume processes that have been suspended, call the ResumeProcesses API. + /// To resume processes that have been suspended, call the ResumeProcesses + /// API. /// ///     /// Container for the necessary parameters to execute the SuspendProcesses service method. @@ -6438,7 +6469,8 @@ public virtual SuspendProcessesResponse SuspendProcesses(SuspendProcessesRequest /// /// /// - /// To resume processes that have been suspended, call the ResumeProcesses API. + /// To resume processes that have been suspended, call the ResumeProcesses + /// API. /// ///     /// Container for the necessary parameters to execute the SuspendProcesses service method. @@ -6621,9 +6653,9 @@ public virtual TerminateInstanceInAutoScalingGroupResponse TerminateInstanceInAu /// /// /// - /// To see which properties have been set, call the DescribeAutoScalingGroups API. - /// To view the scaling policies for an Auto Scaling group, call the DescribePolicies - /// API. If the group has scaling policies, you can update them by calling the PutScalingPolicy + /// To see which properties have been set, call the DescribeAutoScalingGroups + /// API. To view the scaling policies for an Auto Scaling group, call the DescribePolicies + /// API. If the group has scaling policies, you can update them by calling the PutScalingPolicy /// API. /// ///     @@ -6704,9 +6736,9 @@ public virtual UpdateAutoScalingGroupResponse UpdateAutoScalingGroup(UpdateAutoS /// /// /// - /// To see which properties have been set, call the DescribeAutoScalingGroups API. - /// To view the scaling policies for an Auto Scaling group, call the DescribePolicies - /// API. If the group has scaling policies, you can update them by calling the PutScalingPolicy + /// To see which properties have been set, call the DescribeAutoScalingGroups + /// API. To view the scaling policies for an Auto Scaling group, call the DescribePolicies + /// API. If the group has scaling policies, you can update them by calling the PutScalingPolicy /// API. /// ///     diff --git a/sdk/src/Services/AutoScaling/Properties/AssemblyInfo.cs b/sdk/src/Services/AutoScaling/Properties/AssemblyInfo.cs index 4005c0fb8c3a..1082c0dde662 100644 --- a/sdk/src/Services/AutoScaling/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/AutoScaling/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.24")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.404.7")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/AutoScalingPlans/AutoScalingPlans.sln b/sdk/src/Services/AutoScalingPlans/AutoScalingPlans.sln index 3f0f024f3f9c..c96f10a36545 100644 --- a/sdk/src/Services/AutoScalingPlans/AutoScalingPlans.sln +++ b/sdk/src/Services/AutoScalingPlans/AutoScalingPlans.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {022B046D-7951-4C2A-A112-F0F53DA7CFB1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {022B046D-7951-4C2A-A112-F0F53DA7CFB1}.Debug|Any CPU.Build.0 = Debug|Any CPU {022B046D-7951-4C2A-A112-F0F53DA7CFB1}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {ED76DFBF-0A8C-40C7-B149-32BE8E7C8966}.Debug|Any CPU.Build.0 = Debug|Any CPU {ED76DFBF-0A8C-40C7-B149-32BE8E7C8966}.Release|Any CPU.ActiveCfg = Release|Any CPU {ED76DFBF-0A8C-40C7-B149-32BE8E7C8966}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {E9665C5B-9585-46C6-8FB0-3B6B665C28AE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E9665C5B-9585-46C6-8FB0-3B6B665C28AE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E9665C5B-9585-46C6-8FB0-3B6B665C28AE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E9665C5B-9585-46C6-8FB0-3B6B665C28AE}.Release|Any CPU.Build.0 = Release|Any CPU - {95F0E38B-7646-4ABB-BC15-629C4FFD6B0F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {95F0E38B-7646-4ABB-BC15-629C4FFD6B0F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {95F0E38B-7646-4ABB-BC15-629C4FFD6B0F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {95F0E38B-7646-4ABB-BC15-629C4FFD6B0F}.Release|Any CPU.Build.0 = Release|Any CPU - {87A0EC24-45D9-4F26-BDCE-1268DA5E8AD2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87A0EC24-45D9-4F26-BDCE-1268DA5E8AD2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87A0EC24-45D9-4F26-BDCE-1268DA5E8AD2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87A0EC24-45D9-4F26-BDCE-1268DA5E8AD2}.Release|Any CPU.Build.0 = Release|Any CPU - {D88CBFF6-2ACF-4E42-B80D-C650EB9B62A7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D88CBFF6-2ACF-4E42-B80D-C650EB9B62A7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D88CBFF6-2ACF-4E42-B80D-C650EB9B62A7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D88CBFF6-2ACF-4E42-B80D-C650EB9B62A7}.Release|Any CPU.Build.0 = Release|Any CPU - {F9B94F0F-8AFC-4A99-ADD9-4EEB0E50E1FC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F9B94F0F-8AFC-4A99-ADD9-4EEB0E50E1FC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F9B94F0F-8AFC-4A99-ADD9-4EEB0E50E1FC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F9B94F0F-8AFC-4A99-ADD9-4EEB0E50E1FC}.Release|Any CPU.Build.0 = Release|Any CPU - {888F7F9E-1115-4A4C-A8F7-012FD3E9120A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {888F7F9E-1115-4A4C-A8F7-012FD3E9120A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {888F7F9E-1115-4A4C-A8F7-012FD3E9120A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {888F7F9E-1115-4A4C-A8F7-012FD3E9120A}.Release|Any CPU.Build.0 = Release|Any CPU - {3FC65121-2263-4EE8-AB62-299B23BE1000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3FC65121-2263-4EE8-AB62-299B23BE1000}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3FC65121-2263-4EE8-AB62-299B23BE1000}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3FC65121-2263-4EE8-AB62-299B23BE1000}.Release|Any CPU.Build.0 = Release|Any CPU - {8A123DA7-2A79-4BBF-BF61-7BA9B1ADFAC6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8A123DA7-2A79-4BBF-BF61-7BA9B1ADFAC6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8A123DA7-2A79-4BBF-BF61-7BA9B1ADFAC6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8A123DA7-2A79-4BBF-BF61-7BA9B1ADFAC6}.Release|Any CPU.Build.0 = Release|Any CPU - {C0C07EE1-C7CB-4AE9-B284-7FDD74D828F4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C0C07EE1-C7CB-4AE9-B284-7FDD74D828F4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C0C07EE1-C7CB-4AE9-B284-7FDD74D828F4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C0C07EE1-C7CB-4AE9-B284-7FDD74D828F4}.Release|Any CPU.Build.0 = Release|Any CPU - {5D9BA14B-A347-4891-8AEA-CFA6E06F0F89}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5D9BA14B-A347-4891-8AEA-CFA6E06F0F89}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5D9BA14B-A347-4891-8AEA-CFA6E06F0F89}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5D9BA14B-A347-4891-8AEA-CFA6E06F0F89}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {E9665C5B-9585-46C6-8FB0-3B6B665C28AE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E9665C5B-9585-46C6-8FB0-3B6B665C28AE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E9665C5B-9585-46C6-8FB0-3B6B665C28AE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E9665C5B-9585-46C6-8FB0-3B6B665C28AE}.Release|Any CPU.Build.0 = Release|Any CPU - {95F0E38B-7646-4ABB-BC15-629C4FFD6B0F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {95F0E38B-7646-4ABB-BC15-629C4FFD6B0F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {95F0E38B-7646-4ABB-BC15-629C4FFD6B0F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {95F0E38B-7646-4ABB-BC15-629C4FFD6B0F}.Release|Any CPU.Build.0 = Release|Any CPU - {87A0EC24-45D9-4F26-BDCE-1268DA5E8AD2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87A0EC24-45D9-4F26-BDCE-1268DA5E8AD2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87A0EC24-45D9-4F26-BDCE-1268DA5E8AD2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87A0EC24-45D9-4F26-BDCE-1268DA5E8AD2}.Release|Any CPU.Build.0 = Release|Any CPU - {D88CBFF6-2ACF-4E42-B80D-C650EB9B62A7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D88CBFF6-2ACF-4E42-B80D-C650EB9B62A7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D88CBFF6-2ACF-4E42-B80D-C650EB9B62A7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D88CBFF6-2ACF-4E42-B80D-C650EB9B62A7}.Release|Any CPU.Build.0 = Release|Any CPU - {F9B94F0F-8AFC-4A99-ADD9-4EEB0E50E1FC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F9B94F0F-8AFC-4A99-ADD9-4EEB0E50E1FC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F9B94F0F-8AFC-4A99-ADD9-4EEB0E50E1FC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F9B94F0F-8AFC-4A99-ADD9-4EEB0E50E1FC}.Release|Any CPU.Build.0 = Release|Any CPU - {888F7F9E-1115-4A4C-A8F7-012FD3E9120A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {888F7F9E-1115-4A4C-A8F7-012FD3E9120A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {888F7F9E-1115-4A4C-A8F7-012FD3E9120A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {888F7F9E-1115-4A4C-A8F7-012FD3E9120A}.Release|Any CPU.Build.0 = Release|Any CPU - {3FC65121-2263-4EE8-AB62-299B23BE1000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3FC65121-2263-4EE8-AB62-299B23BE1000}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3FC65121-2263-4EE8-AB62-299B23BE1000}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3FC65121-2263-4EE8-AB62-299B23BE1000}.Release|Any CPU.Build.0 = Release|Any CPU - {8A123DA7-2A79-4BBF-BF61-7BA9B1ADFAC6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8A123DA7-2A79-4BBF-BF61-7BA9B1ADFAC6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8A123DA7-2A79-4BBF-BF61-7BA9B1ADFAC6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8A123DA7-2A79-4BBF-BF61-7BA9B1ADFAC6}.Release|Any CPU.Build.0 = Release|Any CPU - {C0C07EE1-C7CB-4AE9-B284-7FDD74D828F4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C0C07EE1-C7CB-4AE9-B284-7FDD74D828F4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C0C07EE1-C7CB-4AE9-B284-7FDD74D828F4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C0C07EE1-C7CB-4AE9-B284-7FDD74D828F4}.Release|Any CPU.Build.0 = Release|Any CPU - {5D9BA14B-A347-4891-8AEA-CFA6E06F0F89}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5D9BA14B-A347-4891-8AEA-CFA6E06F0F89}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5D9BA14B-A347-4891-8AEA-CFA6E06F0F89}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5D9BA14B-A347-4891-8AEA-CFA6E06F0F89}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {022B046D-7951-4C2A-A112-F0F53DA7CFB1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {D6FDF831-E94A-413D-88D5-1CFA3A95701C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {C0439259-8136-4E7A-9902-9D3240AFACED} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {DF4323B3-E404-44E9-AE47-10E120BDD1C3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {ED76DFBF-0A8C-40C7-B149-32BE8E7C8966} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {E9665C5B-9585-46C6-8FB0-3B6B665C28AE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {95F0E38B-7646-4ABB-BC15-629C4FFD6B0F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {87A0EC24-45D9-4F26-BDCE-1268DA5E8AD2} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D88CBFF6-2ACF-4E42-B80D-C650EB9B62A7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F9B94F0F-8AFC-4A99-ADD9-4EEB0E50E1FC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {888F7F9E-1115-4A4C-A8F7-012FD3E9120A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {3FC65121-2263-4EE8-AB62-299B23BE1000} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8A123DA7-2A79-4BBF-BF61-7BA9B1ADFAC6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C0C07EE1-C7CB-4AE9-B284-7FDD74D828F4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {5D9BA14B-A347-4891-8AEA-CFA6E06F0F89} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {E9665C5B-9585-46C6-8FB0-3B6B665C28AE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {95F0E38B-7646-4ABB-BC15-629C4FFD6B0F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {87A0EC24-45D9-4F26-BDCE-1268DA5E8AD2} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D88CBFF6-2ACF-4E42-B80D-C650EB9B62A7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F9B94F0F-8AFC-4A99-ADD9-4EEB0E50E1FC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {888F7F9E-1115-4A4C-A8F7-012FD3E9120A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {3FC65121-2263-4EE8-AB62-299B23BE1000} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8A123DA7-2A79-4BBF-BF61-7BA9B1ADFAC6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C0C07EE1-C7CB-4AE9-B284-7FDD74D828F4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {5D9BA14B-A347-4891-8AEA-CFA6E06F0F89} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {EDBBE042-36B5-4229-9787-32C648F47FB7} diff --git a/sdk/src/Services/AutoScalingPlans/Generated/AmazonAutoScalingPlansConfig.cs b/sdk/src/Services/AutoScalingPlans/Generated/AmazonAutoScalingPlansConfig.cs index b989a1a65397..4ae787cf0a2d 100644 --- a/sdk/src/Services/AutoScalingPlans/Generated/AmazonAutoScalingPlansConfig.cs +++ b/sdk/src/Services/AutoScalingPlans/Generated/AmazonAutoScalingPlansConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.AutoScalingPlans public partial class AmazonAutoScalingPlansConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("Auto Scaling Plans", "4.0.0.0"); private static readonly AmazonAutoScalingPlansEndpointResolver EndpointResolver = new AmazonAutoScalingPlansEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("Auto Scaling Plans", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("Auto Scaling Plans", "3.7.400.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/AutoScalingPlans/Properties/AssemblyInfo.cs b/sdk/src/Services/AutoScalingPlans/Properties/AssemblyInfo.cs index 83532bae6163..25f0d88dcf8b 100644 --- a/sdk/src/Services/AutoScalingPlans/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/AutoScalingPlans/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/B2bi/B2bi.sln b/sdk/src/Services/B2bi/B2bi.sln index 7b9c11e5ad55..455fa1d747f1 100644 --- a/sdk/src/Services/B2bi/B2bi.sln +++ b/sdk/src/Services/B2bi/B2bi.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {A7FA079C-07C2-411C-AED5-E7AB440498ED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {A7FA079C-07C2-411C-AED5-E7AB440498ED}.Debug|Any CPU.Build.0 = Debug|Any CPU {A7FA079C-07C2-411C-AED5-E7AB440498ED}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {C10D2D8D-69B4-4361-907D-5E6CB61462D7}.Debug|Any CPU.Build.0 = Debug|Any CPU {C10D2D8D-69B4-4361-907D-5E6CB61462D7}.Release|Any CPU.ActiveCfg = Release|Any CPU {C10D2D8D-69B4-4361-907D-5E6CB61462D7}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {B250C8E5-D4DB-4BA1-9CAC-4042D67CDE54}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B250C8E5-D4DB-4BA1-9CAC-4042D67CDE54}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B250C8E5-D4DB-4BA1-9CAC-4042D67CDE54}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B250C8E5-D4DB-4BA1-9CAC-4042D67CDE54}.Release|Any CPU.Build.0 = Release|Any CPU - {48842604-2BAE-46D0-A0D7-EEA8F85FD524}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {48842604-2BAE-46D0-A0D7-EEA8F85FD524}.Debug|Any CPU.Build.0 = Debug|Any CPU - {48842604-2BAE-46D0-A0D7-EEA8F85FD524}.Release|Any CPU.ActiveCfg = Release|Any CPU - {48842604-2BAE-46D0-A0D7-EEA8F85FD524}.Release|Any CPU.Build.0 = Release|Any CPU - {CE8AB80F-25E5-4EC6-8B2A-391942B4DF4F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CE8AB80F-25E5-4EC6-8B2A-391942B4DF4F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CE8AB80F-25E5-4EC6-8B2A-391942B4DF4F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CE8AB80F-25E5-4EC6-8B2A-391942B4DF4F}.Release|Any CPU.Build.0 = Release|Any CPU - {D40F409E-FABA-46F9-B8A6-FC840AC1A519}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D40F409E-FABA-46F9-B8A6-FC840AC1A519}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D40F409E-FABA-46F9-B8A6-FC840AC1A519}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D40F409E-FABA-46F9-B8A6-FC840AC1A519}.Release|Any CPU.Build.0 = Release|Any CPU - {8C6727BC-4439-4C9F-AB85-7FA7B0CA7A91}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8C6727BC-4439-4C9F-AB85-7FA7B0CA7A91}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8C6727BC-4439-4C9F-AB85-7FA7B0CA7A91}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8C6727BC-4439-4C9F-AB85-7FA7B0CA7A91}.Release|Any CPU.Build.0 = Release|Any CPU - {43553352-19AE-4BFD-AA18-EC780CB41D91}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {43553352-19AE-4BFD-AA18-EC780CB41D91}.Debug|Any CPU.Build.0 = Debug|Any CPU - {43553352-19AE-4BFD-AA18-EC780CB41D91}.Release|Any CPU.ActiveCfg = Release|Any CPU - {43553352-19AE-4BFD-AA18-EC780CB41D91}.Release|Any CPU.Build.0 = Release|Any CPU - {4275BFAF-C344-4E19-897A-92C41A72B5BE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4275BFAF-C344-4E19-897A-92C41A72B5BE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4275BFAF-C344-4E19-897A-92C41A72B5BE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4275BFAF-C344-4E19-897A-92C41A72B5BE}.Release|Any CPU.Build.0 = Release|Any CPU - {670C60D5-6224-45DE-805F-B6A0E5DF9A8A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {670C60D5-6224-45DE-805F-B6A0E5DF9A8A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {670C60D5-6224-45DE-805F-B6A0E5DF9A8A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {670C60D5-6224-45DE-805F-B6A0E5DF9A8A}.Release|Any CPU.Build.0 = Release|Any CPU - {0CEDF56C-3477-4803-A3E9-E06A58073BCA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0CEDF56C-3477-4803-A3E9-E06A58073BCA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0CEDF56C-3477-4803-A3E9-E06A58073BCA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0CEDF56C-3477-4803-A3E9-E06A58073BCA}.Release|Any CPU.Build.0 = Release|Any CPU - {7F88C0B7-DEA3-4A07-A0BA-4B28E80270FD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7F88C0B7-DEA3-4A07-A0BA-4B28E80270FD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7F88C0B7-DEA3-4A07-A0BA-4B28E80270FD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7F88C0B7-DEA3-4A07-A0BA-4B28E80270FD}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {B250C8E5-D4DB-4BA1-9CAC-4042D67CDE54}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B250C8E5-D4DB-4BA1-9CAC-4042D67CDE54}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B250C8E5-D4DB-4BA1-9CAC-4042D67CDE54}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B250C8E5-D4DB-4BA1-9CAC-4042D67CDE54}.Release|Any CPU.Build.0 = Release|Any CPU - {48842604-2BAE-46D0-A0D7-EEA8F85FD524}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {48842604-2BAE-46D0-A0D7-EEA8F85FD524}.Debug|Any CPU.Build.0 = Debug|Any CPU - {48842604-2BAE-46D0-A0D7-EEA8F85FD524}.Release|Any CPU.ActiveCfg = Release|Any CPU - {48842604-2BAE-46D0-A0D7-EEA8F85FD524}.Release|Any CPU.Build.0 = Release|Any CPU - {CE8AB80F-25E5-4EC6-8B2A-391942B4DF4F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CE8AB80F-25E5-4EC6-8B2A-391942B4DF4F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CE8AB80F-25E5-4EC6-8B2A-391942B4DF4F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CE8AB80F-25E5-4EC6-8B2A-391942B4DF4F}.Release|Any CPU.Build.0 = Release|Any CPU - {D40F409E-FABA-46F9-B8A6-FC840AC1A519}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D40F409E-FABA-46F9-B8A6-FC840AC1A519}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D40F409E-FABA-46F9-B8A6-FC840AC1A519}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D40F409E-FABA-46F9-B8A6-FC840AC1A519}.Release|Any CPU.Build.0 = Release|Any CPU - {8C6727BC-4439-4C9F-AB85-7FA7B0CA7A91}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8C6727BC-4439-4C9F-AB85-7FA7B0CA7A91}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8C6727BC-4439-4C9F-AB85-7FA7B0CA7A91}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8C6727BC-4439-4C9F-AB85-7FA7B0CA7A91}.Release|Any CPU.Build.0 = Release|Any CPU - {43553352-19AE-4BFD-AA18-EC780CB41D91}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {43553352-19AE-4BFD-AA18-EC780CB41D91}.Debug|Any CPU.Build.0 = Debug|Any CPU - {43553352-19AE-4BFD-AA18-EC780CB41D91}.Release|Any CPU.ActiveCfg = Release|Any CPU - {43553352-19AE-4BFD-AA18-EC780CB41D91}.Release|Any CPU.Build.0 = Release|Any CPU - {4275BFAF-C344-4E19-897A-92C41A72B5BE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4275BFAF-C344-4E19-897A-92C41A72B5BE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4275BFAF-C344-4E19-897A-92C41A72B5BE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4275BFAF-C344-4E19-897A-92C41A72B5BE}.Release|Any CPU.Build.0 = Release|Any CPU - {670C60D5-6224-45DE-805F-B6A0E5DF9A8A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {670C60D5-6224-45DE-805F-B6A0E5DF9A8A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {670C60D5-6224-45DE-805F-B6A0E5DF9A8A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {670C60D5-6224-45DE-805F-B6A0E5DF9A8A}.Release|Any CPU.Build.0 = Release|Any CPU - {0CEDF56C-3477-4803-A3E9-E06A58073BCA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0CEDF56C-3477-4803-A3E9-E06A58073BCA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0CEDF56C-3477-4803-A3E9-E06A58073BCA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0CEDF56C-3477-4803-A3E9-E06A58073BCA}.Release|Any CPU.Build.0 = Release|Any CPU - {7F88C0B7-DEA3-4A07-A0BA-4B28E80270FD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7F88C0B7-DEA3-4A07-A0BA-4B28E80270FD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7F88C0B7-DEA3-4A07-A0BA-4B28E80270FD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7F88C0B7-DEA3-4A07-A0BA-4B28E80270FD}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {A7FA079C-07C2-411C-AED5-E7AB440498ED} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {7DF6577C-976B-43D7-9B87-3F27A3B00CE9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {195D666E-1D74-4F28-B323-806414492812} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {191FB9AC-6C78-45B6-9A1D-232749D628D8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {C10D2D8D-69B4-4361-907D-5E6CB61462D7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {B250C8E5-D4DB-4BA1-9CAC-4042D67CDE54} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {48842604-2BAE-46D0-A0D7-EEA8F85FD524} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {CE8AB80F-25E5-4EC6-8B2A-391942B4DF4F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D40F409E-FABA-46F9-B8A6-FC840AC1A519} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8C6727BC-4439-4C9F-AB85-7FA7B0CA7A91} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {43553352-19AE-4BFD-AA18-EC780CB41D91} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4275BFAF-C344-4E19-897A-92C41A72B5BE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {670C60D5-6224-45DE-805F-B6A0E5DF9A8A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0CEDF56C-3477-4803-A3E9-E06A58073BCA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {7F88C0B7-DEA3-4A07-A0BA-4B28E80270FD} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B250C8E5-D4DB-4BA1-9CAC-4042D67CDE54} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {48842604-2BAE-46D0-A0D7-EEA8F85FD524} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {CE8AB80F-25E5-4EC6-8B2A-391942B4DF4F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D40F409E-FABA-46F9-B8A6-FC840AC1A519} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8C6727BC-4439-4C9F-AB85-7FA7B0CA7A91} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {43553352-19AE-4BFD-AA18-EC780CB41D91} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4275BFAF-C344-4E19-897A-92C41A72B5BE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {670C60D5-6224-45DE-805F-B6A0E5DF9A8A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0CEDF56C-3477-4803-A3E9-E06A58073BCA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {7F88C0B7-DEA3-4A07-A0BA-4B28E80270FD} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {3B2F9613-1AC4-41D3-B3A0-756EFB789097} diff --git a/sdk/src/Services/B2bi/Generated/AmazonB2biConfig.cs b/sdk/src/Services/B2bi/Generated/AmazonB2biConfig.cs index 8cab8b0ef2da..562c0d8b4ee8 100644 --- a/sdk/src/Services/B2bi/Generated/AmazonB2biConfig.cs +++ b/sdk/src/Services/B2bi/Generated/AmazonB2biConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.B2bi public partial class AmazonB2biConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("b2bi", "4.0.0.0"); private static readonly AmazonB2biEndpointResolver EndpointResolver = new AmazonB2biEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("b2bi", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("b2bi", "3.7.402.3"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/B2bi/Generated/Model/GenerateMappingResponse.cs b/sdk/src/Services/B2bi/Generated/Model/GenerateMappingResponse.cs index 8a1357282edc..0d56f04a4fb1 100644 --- a/sdk/src/Services/B2bi/Generated/Model/GenerateMappingResponse.cs +++ b/sdk/src/Services/B2bi/Generated/Model/GenerateMappingResponse.cs @@ -44,9 +44,9 @@ public partial class GenerateMappingResponse : AmazonWebServiceResponse /// /// [AWSProperty(Min=0, Max=1)] - public float MappingAccuracy + public float? MappingAccuracy { - get { return this._mappingAccuracy.GetValueOrDefault(); } + get { return this._mappingAccuracy; } set { this._mappingAccuracy = value; } } diff --git a/sdk/src/Services/B2bi/Generated/Model/Internal/MarshallTransformations/CreatePartnershipRequestMarshaller.cs b/sdk/src/Services/B2bi/Generated/Model/Internal/MarshallTransformations/CreatePartnershipRequestMarshaller.cs index b74cf725031b..60c02b2f61fe 100644 --- a/sdk/src/Services/B2bi/Generated/Model/Internal/MarshallTransformations/CreatePartnershipRequestMarshaller.cs +++ b/sdk/src/Services/B2bi/Generated/Model/Internal/MarshallTransformations/CreatePartnershipRequestMarshaller.cs @@ -81,37 +81,17 @@ public IRequest Marshall(CreatePartnershipRequest publicRequest) } context.Writer.WriteArrayEnd(); } -<<<<<<< HEAD -||||||| Commit version number update changes - context.Writer.WriteArrayEnd(); - } - - if(publicRequest.IsSetClientToken()) - { - context.Writer.WritePropertyName("clientToken"); - context.Writer.Write(publicRequest.ClientToken); - } -======= - context.Writer.WriteArrayEnd(); - } - - if(publicRequest.IsSetCapabilityOptions()) - { - context.Writer.WritePropertyName("capabilityOptions"); - context.Writer.WriteObjectStart(); - var marshaller = CapabilityOptionsMarshaller.Instance; - marshaller.Marshall(publicRequest.CapabilityOptions, context); + if(publicRequest.IsSetCapabilityOptions()) + { + context.Writer.WritePropertyName("capabilityOptions"); + context.Writer.WriteObjectStart(); - context.Writer.WriteObjectEnd(); - } + var marshaller = CapabilityOptionsMarshaller.Instance; + marshaller.Marshall(publicRequest.CapabilityOptions, context); - if(publicRequest.IsSetClientToken()) - { - context.Writer.WritePropertyName("clientToken"); - context.Writer.Write(publicRequest.ClientToken); - } ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b + context.Writer.WriteObjectEnd(); + } if(publicRequest.IsSetClientToken()) { diff --git a/sdk/src/Services/B2bi/Generated/Model/Internal/MarshallTransformations/CreateStarterMappingTemplateRequestMarshaller.cs b/sdk/src/Services/B2bi/Generated/Model/Internal/MarshallTransformations/CreateStarterMappingTemplateRequestMarshaller.cs index 0174b7c9f7bf..fc99ff7fce64 100644 --- a/sdk/src/Services/B2bi/Generated/Model/Internal/MarshallTransformations/CreateStarterMappingTemplateRequestMarshaller.cs +++ b/sdk/src/Services/B2bi/Generated/Model/Internal/MarshallTransformations/CreateStarterMappingTemplateRequestMarshaller.cs @@ -63,43 +63,46 @@ public IRequest Marshall(CreateStarterMappingTemplateRequest publicRequest) request.HttpMethod = "POST"; request.ResourcePath = "/"; - using (StringWriter stringWriter = new StringWriter(CultureInfo.InvariantCulture)) + using (MemoryStream memoryStream = new MemoryStream()) { - JsonWriter writer = new JsonWriter(stringWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetMappingType()) + using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) { - context.Writer.WritePropertyName("mappingType"); - context.Writer.Write(publicRequest.MappingType); + JsonWriter writer = new JsonWriter(streamWriter); + writer.Validate = false; + writer.WriteObjectStart(); + var context = new JsonMarshallerContext(request, writer); + if(publicRequest.IsSetMappingType()) + { + context.Writer.WritePropertyName("mappingType"); + context.Writer.Write(publicRequest.MappingType); + } + + if(publicRequest.IsSetOutputSampleLocation()) + { + context.Writer.WritePropertyName("outputSampleLocation"); + context.Writer.WriteObjectStart(); + + var marshaller = S3LocationMarshaller.Instance; + marshaller.Marshall(publicRequest.OutputSampleLocation, context); + + context.Writer.WriteObjectEnd(); + } + + if(publicRequest.IsSetTemplateDetails()) + { + context.Writer.WritePropertyName("templateDetails"); + context.Writer.WriteObjectStart(); + + var marshaller = TemplateDetailsMarshaller.Instance; + marshaller.Marshall(publicRequest.TemplateDetails, context); + + context.Writer.WriteObjectEnd(); + } + + writer.WriteObjectEnd(); } - if(publicRequest.IsSetOutputSampleLocation()) - { - context.Writer.WritePropertyName("outputSampleLocation"); - context.Writer.WriteObjectStart(); - - var marshaller = S3LocationMarshaller.Instance; - marshaller.Marshall(publicRequest.OutputSampleLocation, context); - - context.Writer.WriteObjectEnd(); - } - - if(publicRequest.IsSetTemplateDetails()) - { - context.Writer.WritePropertyName("templateDetails"); - context.Writer.WriteObjectStart(); - - var marshaller = TemplateDetailsMarshaller.Instance; - marshaller.Marshall(publicRequest.TemplateDetails, context); - - context.Writer.WriteObjectEnd(); - } - - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); + request.Content = memoryStream.ToArray(); } diff --git a/sdk/src/Services/B2bi/Generated/Model/Internal/MarshallTransformations/CreateTransformerRequestMarshaller.cs b/sdk/src/Services/B2bi/Generated/Model/Internal/MarshallTransformations/CreateTransformerRequestMarshaller.cs index 5f2bad07b85e..854cbc27303a 100644 --- a/sdk/src/Services/B2bi/Generated/Model/Internal/MarshallTransformations/CreateTransformerRequestMarshaller.cs +++ b/sdk/src/Services/B2bi/Generated/Model/Internal/MarshallTransformations/CreateTransformerRequestMarshaller.cs @@ -90,119 +90,77 @@ public IRequest Marshall(CreateTransformerRequest publicRequest) var marshaller = EdiTypeMarshaller.Instance; marshaller.Marshall(publicRequest.EdiType, context); -<<<<<<< HEAD context.Writer.WriteObjectEnd(); } -||||||| Commit version number update changes - if(publicRequest.IsSetMappingTemplate()) - { - context.Writer.WritePropertyName("mappingTemplate"); - context.Writer.Write(publicRequest.MappingTemplate); - } -======= - if(publicRequest.IsSetInputConversion()) - { - context.Writer.WritePropertyName("inputConversion"); - context.Writer.WriteObjectStart(); - var marshaller = InputConversionMarshaller.Instance; - marshaller.Marshall(publicRequest.InputConversion, context); + if(publicRequest.IsSetFileFormat()) + { + context.Writer.WritePropertyName("fileFormat"); + context.Writer.Write(publicRequest.FileFormat); + } - context.Writer.WriteObjectEnd(); - } + if(publicRequest.IsSetInputConversion()) + { + context.Writer.WritePropertyName("inputConversion"); + context.Writer.WriteObjectStart(); - if(publicRequest.IsSetMapping()) - { - context.Writer.WritePropertyName("mapping"); - context.Writer.WriteObjectStart(); + var marshaller = InputConversionMarshaller.Instance; + marshaller.Marshall(publicRequest.InputConversion, context); - var marshaller = MappingMarshaller.Instance; - marshaller.Marshall(publicRequest.Mapping, context); + context.Writer.WriteObjectEnd(); + } - context.Writer.WriteObjectEnd(); - } + if(publicRequest.IsSetMapping()) + { + context.Writer.WritePropertyName("mapping"); + context.Writer.WriteObjectStart(); - if(publicRequest.IsSetMappingTemplate()) - { - context.Writer.WritePropertyName("mappingTemplate"); - context.Writer.Write(publicRequest.MappingTemplate); - } ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b + var marshaller = MappingMarshaller.Instance; + marshaller.Marshall(publicRequest.Mapping, context); - if(publicRequest.IsSetFileFormat()) - { - context.Writer.WritePropertyName("fileFormat"); - context.Writer.Write(publicRequest.FileFormat); + context.Writer.WriteObjectEnd(); } -<<<<<<< HEAD if(publicRequest.IsSetMappingTemplate()) { context.Writer.WritePropertyName("mappingTemplate"); context.Writer.Write(publicRequest.MappingTemplate); } -||||||| Commit version number update changes - if(publicRequest.IsSetSampleDocument()) - { - context.Writer.WritePropertyName("sampleDocument"); - context.Writer.Write(publicRequest.SampleDocument); - } -======= - if(publicRequest.IsSetOutputConversion()) - { - context.Writer.WritePropertyName("outputConversion"); - context.Writer.WriteObjectStart(); - var marshaller = OutputConversionMarshaller.Instance; - marshaller.Marshall(publicRequest.OutputConversion, context); - - context.Writer.WriteObjectEnd(); - } - - if(publicRequest.IsSetSampleDocument()) - { - context.Writer.WritePropertyName("sampleDocument"); - context.Writer.Write(publicRequest.SampleDocument); - } ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b - -<<<<<<< HEAD if(publicRequest.IsSetName()) -||||||| Commit version number update changes - if(publicRequest.IsSetTags()) - { - context.Writer.WritePropertyName("tags"); - context.Writer.WriteArrayStart(); - foreach(var publicRequestTagsListValue in publicRequest.Tags) -======= - if(publicRequest.IsSetSampleDocuments()) - { - context.Writer.WritePropertyName("sampleDocuments"); - context.Writer.WriteObjectStart(); - - var marshaller = SampleDocumentsMarshaller.Instance; - marshaller.Marshall(publicRequest.SampleDocuments, context); - - context.Writer.WriteObjectEnd(); - } - - if(publicRequest.IsSetTags()) - { - context.Writer.WritePropertyName("tags"); - context.Writer.WriteArrayStart(); - foreach(var publicRequestTagsListValue in publicRequest.Tags) ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b { context.Writer.WritePropertyName("name"); context.Writer.Write(publicRequest.Name); } + if(publicRequest.IsSetOutputConversion()) + { + context.Writer.WritePropertyName("outputConversion"); + context.Writer.WriteObjectStart(); + + var marshaller = OutputConversionMarshaller.Instance; + marshaller.Marshall(publicRequest.OutputConversion, context); + + context.Writer.WriteObjectEnd(); + } + if(publicRequest.IsSetSampleDocument()) { context.Writer.WritePropertyName("sampleDocument"); context.Writer.Write(publicRequest.SampleDocument); } + if(publicRequest.IsSetSampleDocuments()) + { + context.Writer.WritePropertyName("sampleDocuments"); + context.Writer.WriteObjectStart(); + + var marshaller = SampleDocumentsMarshaller.Instance; + marshaller.Marshall(publicRequest.SampleDocuments, context); + + context.Writer.WriteObjectEnd(); + } + if(publicRequest.IsSetTags()) { context.Writer.WritePropertyName("tags"); diff --git a/sdk/src/Services/B2bi/Generated/Model/Internal/MarshallTransformations/GenerateMappingRequestMarshaller.cs b/sdk/src/Services/B2bi/Generated/Model/Internal/MarshallTransformations/GenerateMappingRequestMarshaller.cs index ebf876fa2efc..fe9ba3d6956c 100644 --- a/sdk/src/Services/B2bi/Generated/Model/Internal/MarshallTransformations/GenerateMappingRequestMarshaller.cs +++ b/sdk/src/Services/B2bi/Generated/Model/Internal/MarshallTransformations/GenerateMappingRequestMarshaller.cs @@ -63,33 +63,36 @@ public IRequest Marshall(GenerateMappingRequest publicRequest) request.HttpMethod = "POST"; request.ResourcePath = "/"; - using (StringWriter stringWriter = new StringWriter(CultureInfo.InvariantCulture)) + using (MemoryStream memoryStream = new MemoryStream()) { - JsonWriter writer = new JsonWriter(stringWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetInputFileContent()) + using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) { - context.Writer.WritePropertyName("inputFileContent"); - context.Writer.Write(publicRequest.InputFileContent); - } + JsonWriter writer = new JsonWriter(streamWriter); + writer.Validate = false; + writer.WriteObjectStart(); + var context = new JsonMarshallerContext(request, writer); + if(publicRequest.IsSetInputFileContent()) + { + context.Writer.WritePropertyName("inputFileContent"); + context.Writer.Write(publicRequest.InputFileContent); + } - if(publicRequest.IsSetMappingType()) - { - context.Writer.WritePropertyName("mappingType"); - context.Writer.Write(publicRequest.MappingType); - } + if(publicRequest.IsSetMappingType()) + { + context.Writer.WritePropertyName("mappingType"); + context.Writer.Write(publicRequest.MappingType); + } - if(publicRequest.IsSetOutputFileContent()) - { - context.Writer.WritePropertyName("outputFileContent"); - context.Writer.Write(publicRequest.OutputFileContent); + if(publicRequest.IsSetOutputFileContent()) + { + context.Writer.WritePropertyName("outputFileContent"); + context.Writer.Write(publicRequest.OutputFileContent); + } + + writer.WriteObjectEnd(); } - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); + request.Content = memoryStream.ToArray(); } diff --git a/sdk/src/Services/B2bi/Generated/Model/Internal/MarshallTransformations/GenerateMappingResponseUnmarshaller.cs b/sdk/src/Services/B2bi/Generated/Model/Internal/MarshallTransformations/GenerateMappingResponseUnmarshaller.cs index 11297ee90673..1076006a5340 100644 --- a/sdk/src/Services/B2bi/Generated/Model/Internal/MarshallTransformations/GenerateMappingResponseUnmarshaller.cs +++ b/sdk/src/Services/B2bi/Generated/Model/Internal/MarshallTransformations/GenerateMappingResponseUnmarshaller.cs @@ -54,7 +54,7 @@ public override AmazonWebServiceResponse Unmarshall(JsonUnmarshallerContext cont { if (context.TestExpression("mappingAccuracy", targetDepth)) { - var unmarshaller = FloatUnmarshaller.Instance; + var unmarshaller = NullableFloatUnmarshaller.Instance; response.MappingAccuracy = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/B2bi/Generated/Model/Internal/MarshallTransformations/TestConversionRequestMarshaller.cs b/sdk/src/Services/B2bi/Generated/Model/Internal/MarshallTransformations/TestConversionRequestMarshaller.cs index a1740b6ec18b..cba870ac770c 100644 --- a/sdk/src/Services/B2bi/Generated/Model/Internal/MarshallTransformations/TestConversionRequestMarshaller.cs +++ b/sdk/src/Services/B2bi/Generated/Model/Internal/MarshallTransformations/TestConversionRequestMarshaller.cs @@ -63,37 +63,40 @@ public IRequest Marshall(TestConversionRequest publicRequest) request.HttpMethod = "POST"; request.ResourcePath = "/"; - using (StringWriter stringWriter = new StringWriter(CultureInfo.InvariantCulture)) + using (MemoryStream memoryStream = new MemoryStream()) { - JsonWriter writer = new JsonWriter(stringWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetSource()) + using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) { - context.Writer.WritePropertyName("source"); - context.Writer.WriteObjectStart(); + JsonWriter writer = new JsonWriter(streamWriter); + writer.Validate = false; + writer.WriteObjectStart(); + var context = new JsonMarshallerContext(request, writer); + if(publicRequest.IsSetSource()) + { + context.Writer.WritePropertyName("source"); + context.Writer.WriteObjectStart(); - var marshaller = ConversionSourceMarshaller.Instance; - marshaller.Marshall(publicRequest.Source, context); + var marshaller = ConversionSourceMarshaller.Instance; + marshaller.Marshall(publicRequest.Source, context); - context.Writer.WriteObjectEnd(); - } + context.Writer.WriteObjectEnd(); + } - if(publicRequest.IsSetTarget()) - { - context.Writer.WritePropertyName("target"); - context.Writer.WriteObjectStart(); + if(publicRequest.IsSetTarget()) + { + context.Writer.WritePropertyName("target"); + context.Writer.WriteObjectStart(); + + var marshaller = ConversionTargetMarshaller.Instance; + marshaller.Marshall(publicRequest.Target, context); - var marshaller = ConversionTargetMarshaller.Instance; - marshaller.Marshall(publicRequest.Target, context); + context.Writer.WriteObjectEnd(); + } - context.Writer.WriteObjectEnd(); + writer.WriteObjectEnd(); } - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); + request.Content = memoryStream.ToArray(); } diff --git a/sdk/src/Services/B2bi/Generated/Model/Internal/MarshallTransformations/UpdatePartnershipRequestMarshaller.cs b/sdk/src/Services/B2bi/Generated/Model/Internal/MarshallTransformations/UpdatePartnershipRequestMarshaller.cs index 2f821c33ee2b..3d2a1cea3f4f 100644 --- a/sdk/src/Services/B2bi/Generated/Model/Internal/MarshallTransformations/UpdatePartnershipRequestMarshaller.cs +++ b/sdk/src/Services/B2bi/Generated/Model/Internal/MarshallTransformations/UpdatePartnershipRequestMarshaller.cs @@ -82,36 +82,22 @@ public IRequest Marshall(UpdatePartnershipRequest publicRequest) context.Writer.WriteArrayEnd(); } -<<<<<<< HEAD + if(publicRequest.IsSetCapabilityOptions()) + { + context.Writer.WritePropertyName("capabilityOptions"); + context.Writer.WriteObjectStart(); + + var marshaller = CapabilityOptionsMarshaller.Instance; + marshaller.Marshall(publicRequest.CapabilityOptions, context); + + context.Writer.WriteObjectEnd(); + } + if(publicRequest.IsSetName()) { context.Writer.WritePropertyName("name"); context.Writer.Write(publicRequest.Name); } -||||||| Commit version number update changes - if(publicRequest.IsSetName()) - { - context.Writer.WritePropertyName("name"); - context.Writer.Write(publicRequest.Name); - } -======= - if(publicRequest.IsSetCapabilityOptions()) - { - context.Writer.WritePropertyName("capabilityOptions"); - context.Writer.WriteObjectStart(); - - var marshaller = CapabilityOptionsMarshaller.Instance; - marshaller.Marshall(publicRequest.CapabilityOptions, context); - - context.Writer.WriteObjectEnd(); - } - - if(publicRequest.IsSetName()) - { - context.Writer.WritePropertyName("name"); - context.Writer.Write(publicRequest.Name); - } ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b if(publicRequest.IsSetPartnershipId()) { diff --git a/sdk/src/Services/B2bi/Generated/Model/Internal/MarshallTransformations/UpdateTransformerRequestMarshaller.cs b/sdk/src/Services/B2bi/Generated/Model/Internal/MarshallTransformations/UpdateTransformerRequestMarshaller.cs index 1869d3d0e4a6..b80800368c02 100644 --- a/sdk/src/Services/B2bi/Generated/Model/Internal/MarshallTransformations/UpdateTransformerRequestMarshaller.cs +++ b/sdk/src/Services/B2bi/Generated/Model/Internal/MarshallTransformations/UpdateTransformerRequestMarshaller.cs @@ -67,7 +67,6 @@ public IRequest Marshall(UpdateTransformerRequest publicRequest) { using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) { -<<<<<<< HEAD JsonWriter writer = new JsonWriter(streamWriter); writer.Validate = false; writer.WriteObjectStart(); @@ -89,6 +88,28 @@ public IRequest Marshall(UpdateTransformerRequest publicRequest) context.Writer.Write(publicRequest.FileFormat); } + if(publicRequest.IsSetInputConversion()) + { + context.Writer.WritePropertyName("inputConversion"); + context.Writer.WriteObjectStart(); + + var marshaller = InputConversionMarshaller.Instance; + marshaller.Marshall(publicRequest.InputConversion, context); + + context.Writer.WriteObjectEnd(); + } + + if(publicRequest.IsSetMapping()) + { + context.Writer.WritePropertyName("mapping"); + context.Writer.WriteObjectStart(); + + var marshaller = MappingMarshaller.Instance; + marshaller.Marshall(publicRequest.Mapping, context); + + context.Writer.WriteObjectEnd(); + } + if(publicRequest.IsSetMappingTemplate()) { context.Writer.WritePropertyName("mappingTemplate"); @@ -101,12 +122,34 @@ public IRequest Marshall(UpdateTransformerRequest publicRequest) context.Writer.Write(publicRequest.Name); } + if(publicRequest.IsSetOutputConversion()) + { + context.Writer.WritePropertyName("outputConversion"); + context.Writer.WriteObjectStart(); + + var marshaller = OutputConversionMarshaller.Instance; + marshaller.Marshall(publicRequest.OutputConversion, context); + + context.Writer.WriteObjectEnd(); + } + if(publicRequest.IsSetSampleDocument()) { context.Writer.WritePropertyName("sampleDocument"); context.Writer.Write(publicRequest.SampleDocument); } + if(publicRequest.IsSetSampleDocuments()) + { + context.Writer.WritePropertyName("sampleDocuments"); + context.Writer.WriteObjectStart(); + + var marshaller = SampleDocumentsMarshaller.Instance; + marshaller.Marshall(publicRequest.SampleDocuments, context); + + context.Writer.WriteObjectEnd(); + } + if(publicRequest.IsSetStatus()) { context.Writer.WritePropertyName("status"); @@ -120,139 +163,6 @@ public IRequest Marshall(UpdateTransformerRequest publicRequest) } writer.WriteObjectEnd(); -||||||| Commit version number update changes - context.Writer.WritePropertyName("ediType"); - context.Writer.WriteObjectStart(); - - var marshaller = EdiTypeMarshaller.Instance; - marshaller.Marshall(publicRequest.EdiType, context); - - context.Writer.WriteObjectEnd(); - } - - if(publicRequest.IsSetFileFormat()) - { - context.Writer.WritePropertyName("fileFormat"); - context.Writer.Write(publicRequest.FileFormat); - } - - if(publicRequest.IsSetMappingTemplate()) - { - context.Writer.WritePropertyName("mappingTemplate"); - context.Writer.Write(publicRequest.MappingTemplate); - } - - if(publicRequest.IsSetName()) - { - context.Writer.WritePropertyName("name"); - context.Writer.Write(publicRequest.Name); - } - - if(publicRequest.IsSetSampleDocument()) - { - context.Writer.WritePropertyName("sampleDocument"); - context.Writer.Write(publicRequest.SampleDocument); - } - - if(publicRequest.IsSetStatus()) - { - context.Writer.WritePropertyName("status"); - context.Writer.Write(publicRequest.Status); - } - - if(publicRequest.IsSetTransformerId()) - { - context.Writer.WritePropertyName("transformerId"); - context.Writer.Write(publicRequest.TransformerId); -======= - context.Writer.WritePropertyName("ediType"); - context.Writer.WriteObjectStart(); - - var marshaller = EdiTypeMarshaller.Instance; - marshaller.Marshall(publicRequest.EdiType, context); - - context.Writer.WriteObjectEnd(); - } - - if(publicRequest.IsSetFileFormat()) - { - context.Writer.WritePropertyName("fileFormat"); - context.Writer.Write(publicRequest.FileFormat); - } - - if(publicRequest.IsSetInputConversion()) - { - context.Writer.WritePropertyName("inputConversion"); - context.Writer.WriteObjectStart(); - - var marshaller = InputConversionMarshaller.Instance; - marshaller.Marshall(publicRequest.InputConversion, context); - - context.Writer.WriteObjectEnd(); - } - - if(publicRequest.IsSetMapping()) - { - context.Writer.WritePropertyName("mapping"); - context.Writer.WriteObjectStart(); - - var marshaller = MappingMarshaller.Instance; - marshaller.Marshall(publicRequest.Mapping, context); - - context.Writer.WriteObjectEnd(); - } - - if(publicRequest.IsSetMappingTemplate()) - { - context.Writer.WritePropertyName("mappingTemplate"); - context.Writer.Write(publicRequest.MappingTemplate); - } - - if(publicRequest.IsSetName()) - { - context.Writer.WritePropertyName("name"); - context.Writer.Write(publicRequest.Name); - } - - if(publicRequest.IsSetOutputConversion()) - { - context.Writer.WritePropertyName("outputConversion"); - context.Writer.WriteObjectStart(); - - var marshaller = OutputConversionMarshaller.Instance; - marshaller.Marshall(publicRequest.OutputConversion, context); - - context.Writer.WriteObjectEnd(); - } - - if(publicRequest.IsSetSampleDocument()) - { - context.Writer.WritePropertyName("sampleDocument"); - context.Writer.Write(publicRequest.SampleDocument); - } - - if(publicRequest.IsSetSampleDocuments()) - { - context.Writer.WritePropertyName("sampleDocuments"); - context.Writer.WriteObjectStart(); - - var marshaller = SampleDocumentsMarshaller.Instance; - marshaller.Marshall(publicRequest.SampleDocuments, context); - - context.Writer.WriteObjectEnd(); - } - - if(publicRequest.IsSetStatus()) - { - context.Writer.WritePropertyName("status"); - context.Writer.Write(publicRequest.Status); - } - - if(publicRequest.IsSetTransformerId()) - { - context.Writer.WritePropertyName("transformerId"); - context.Writer.Write(publicRequest.TransformerId); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b } request.Content = memoryStream.ToArray(); diff --git a/sdk/src/Services/B2bi/Generated/Model/Internal/MarshallTransformations/X12OutboundEdiHeadersMarshaller.cs b/sdk/src/Services/B2bi/Generated/Model/Internal/MarshallTransformations/X12OutboundEdiHeadersMarshaller.cs index 9e0f174c40d1..d9c3909112e4 100644 --- a/sdk/src/Services/B2bi/Generated/Model/Internal/MarshallTransformations/X12OutboundEdiHeadersMarshaller.cs +++ b/sdk/src/Services/B2bi/Generated/Model/Internal/MarshallTransformations/X12OutboundEdiHeadersMarshaller.cs @@ -84,7 +84,7 @@ public void Marshall(X12OutboundEdiHeaders requestObject, JsonMarshallerContext if(requestObject.IsSetValidateEdi()) { context.Writer.WritePropertyName("validateEdi"); - context.Writer.Write(requestObject.ValidateEdi); + context.Writer.Write(requestObject.ValidateEdi.Value); } } diff --git a/sdk/src/Services/B2bi/Generated/Model/Internal/MarshallTransformations/X12OutboundEdiHeadersUnmarshaller.cs b/sdk/src/Services/B2bi/Generated/Model/Internal/MarshallTransformations/X12OutboundEdiHeadersUnmarshaller.cs index 26fbf39b891e..1ab138147dc9 100644 --- a/sdk/src/Services/B2bi/Generated/Model/Internal/MarshallTransformations/X12OutboundEdiHeadersUnmarshaller.cs +++ b/sdk/src/Services/B2bi/Generated/Model/Internal/MarshallTransformations/X12OutboundEdiHeadersUnmarshaller.cs @@ -86,7 +86,7 @@ public X12OutboundEdiHeaders Unmarshall(JsonUnmarshallerContext context) } if (context.TestExpression("validateEdi", targetDepth)) { - var unmarshaller = BoolUnmarshaller.Instance; + var unmarshaller = NullableBoolUnmarshaller.Instance; unmarshalledObject.ValidateEdi = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/B2bi/Generated/Model/X12OutboundEdiHeaders.cs b/sdk/src/Services/B2bi/Generated/Model/X12OutboundEdiHeaders.cs index 2714faa2f63d..6bd6198c87ea 100644 --- a/sdk/src/Services/B2bi/Generated/Model/X12OutboundEdiHeaders.cs +++ b/sdk/src/Services/B2bi/Generated/Model/X12OutboundEdiHeaders.cs @@ -101,9 +101,9 @@ internal bool IsSetInterchangeControlHeaders() /// Specifies whether or not to validate the EDI for this X12 object: TRUE or FALSE. /// /// - public bool ValidateEdi + public bool? ValidateEdi { - get { return this._validateEdi.GetValueOrDefault(); } + get { return this._validateEdi; } set { this._validateEdi = value; } } diff --git a/sdk/src/Services/B2bi/Generated/_bcl/AmazonB2biClient.cs b/sdk/src/Services/B2bi/Generated/_bcl/AmazonB2biClient.cs index ee6804fc0b4c..9997537157e6 100644 --- a/sdk/src/Services/B2bi/Generated/_bcl/AmazonB2biClient.cs +++ b/sdk/src/Services/B2bi/Generated/_bcl/AmazonB2biClient.cs @@ -581,12 +581,159 @@ public virtual CreateProfileResponse CreateProfile(CreateProfileRequest request) #endregion + #region CreateStarterMappingTemplate + + + /// + /// Amazon Web Services B2B Data Interchange uses a mapping template in JSONata or XSLT + /// format to transform a customer input file into a JSON or XML file that can be converted + /// to EDI. + /// + /// + /// + /// If you provide a sample EDI file with the same structure as the EDI files that you + /// wish to generate, then the service can generate a mapping template. The starter template + /// contains placeholder values which you can replace with JSONata or XSLT expressions + /// to take data from your input file and insert it into the JSON or XML file that is + /// used to generate the EDI. + /// + /// + /// + /// If you do not provide a sample EDI file, then the service can generate a mapping template + /// based on the EDI settings in the templateDetails parameter. + /// + /// + /// + /// Currently, we only support generating a template that can generate the input to produce + /// an Outbound X12 EDI file. + /// + /// + /// Container for the necessary parameters to execute the CreateStarterMappingTemplate service method. + /// + /// The response from the CreateStarterMappingTemplate service method, as returned by B2bi. + /// + /// You do not have sufficient access to perform this action. + /// + /// + /// This exception is thrown when an error occurs in the Amazon Web Services B2B Data + /// Interchange service. + /// + /// + /// Occurs when the requested resource does not exist, or cannot be found. In some cases, + /// the resource exists in a region other than the region specified in the API call. + /// + /// + /// Occurs when a B2BI object cannot be validated against a request from another object. + /// + /// REST API Reference for CreateStarterMappingTemplate Operation + public virtual CreateStarterMappingTemplateResponse CreateStarterMappingTemplate(CreateStarterMappingTemplateRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = CreateStarterMappingTemplateRequestMarshaller.Instance; + options.ResponseUnmarshaller = CreateStarterMappingTemplateResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// Amazon Web Services B2B Data Interchange uses a mapping template in JSONata or XSLT + /// format to transform a customer input file into a JSON or XML file that can be converted + /// to EDI. + /// + /// + /// + /// If you provide a sample EDI file with the same structure as the EDI files that you + /// wish to generate, then the service can generate a mapping template. The starter template + /// contains placeholder values which you can replace with JSONata or XSLT expressions + /// to take data from your input file and insert it into the JSON or XML file that is + /// used to generate the EDI. + /// + /// + /// + /// If you do not provide a sample EDI file, then the service can generate a mapping template + /// based on the EDI settings in the templateDetails parameter. + /// + /// + /// + /// Currently, we only support generating a template that can generate the input to produce + /// an Outbound X12 EDI file. + /// + /// + /// Container for the necessary parameters to execute the CreateStarterMappingTemplate service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the CreateStarterMappingTemplate service method, as returned by B2bi. + /// + /// You do not have sufficient access to perform this action. + /// + /// + /// This exception is thrown when an error occurs in the Amazon Web Services B2B Data + /// Interchange service. + /// + /// + /// Occurs when the requested resource does not exist, or cannot be found. In some cases, + /// the resource exists in a region other than the region specified in the API call. + /// + /// + /// Occurs when a B2BI object cannot be validated against a request from another object. + /// + /// REST API Reference for CreateStarterMappingTemplate Operation + public virtual Task CreateStarterMappingTemplateAsync(CreateStarterMappingTemplateRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = CreateStarterMappingTemplateRequestMarshaller.Instance; + options.ResponseUnmarshaller = CreateStarterMappingTemplateResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + #region CreateTransformer /// - /// Creates a transformer. A transformer describes how to process the incoming EDI documents - /// and extract the necessary information to the output file. + /// Creates a transformer. Amazon Web Services B2B Data Interchange currently supports + /// two scenarios: + /// + ///
    • + /// + /// Inbound EDI: the Amazon Web Services customer receives an EDI file from their + /// trading partner. Amazon Web Services B2B Data Interchange converts this EDI file into + /// a JSON or XML file with a service-defined structure. A mapping template provided by + /// the customer, in JSONata or XSLT format, is optionally applied to this file to produce + /// a JSON or XML file with the structure the customer requires. + /// + ///
    • + /// + /// Outbound EDI: the Amazon Web Services customer has a JSON or XML file containing + /// data that they wish to use in an EDI file. A mapping template, provided by the customer + /// (in either JSONata or XSLT format) is applied to this file to generate a JSON or XML + /// file in the service-defined structure. This file is then converted to an EDI file. + /// + ///
    + /// + /// The following fields are provided for backwards compatibility only: fileFormat, + /// mappingTemplate, ediType, and sampleDocument. + /// + ///
    • + /// + /// Use the mapping data type in place of mappingTemplate and fileFormat + /// + /// + ///
    • + /// + /// Use the sampleDocuments data type in place of sampleDocument + /// + ///
    • + /// + /// Use either the inputConversion or outputConversion in place of ediType + /// + /// + ///
    ///     /// Container for the necessary parameters to execute the CreateTransformer service method. /// @@ -630,8 +777,44 @@ public virtual CreateTransformerResponse CreateTransformer(CreateTransformerRequ /// - /// Creates a transformer. A transformer describes how to process the incoming EDI documents - /// and extract the necessary information to the output file. + /// Creates a transformer. Amazon Web Services B2B Data Interchange currently supports + /// two scenarios: + /// + ///
    • + /// + /// Inbound EDI: the Amazon Web Services customer receives an EDI file from their + /// trading partner. Amazon Web Services B2B Data Interchange converts this EDI file into + /// a JSON or XML file with a service-defined structure. A mapping template provided by + /// the customer, in JSONata or XSLT format, is optionally applied to this file to produce + /// a JSON or XML file with the structure the customer requires. + /// + ///
    • + /// + /// Outbound EDI: the Amazon Web Services customer has a JSON or XML file containing + /// data that they wish to use in an EDI file. A mapping template, provided by the customer + /// (in either JSONata or XSLT format) is applied to this file to generate a JSON or XML + /// file in the service-defined structure. This file is then converted to an EDI file. + /// + ///
    + /// + /// The following fields are provided for backwards compatibility only: fileFormat, + /// mappingTemplate, ediType, and sampleDocument. + /// + ///
    • + /// + /// Use the mapping data type in place of mappingTemplate and fileFormat + /// + /// + ///
    • + /// + /// Use the sampleDocuments data type in place of sampleDocument + /// + ///
    • + /// + /// Use either the inputConversion or outputConversion in place of ediType + /// + /// + ///
    ///     /// Container for the necessary parameters to execute the CreateTransformer service method. /// @@ -943,8 +1126,9 @@ public virtual DeleteProfileResponse DeleteProfile(DeleteProfileRequest request) /// - /// Deletes the specified transformer. A transformer describes how to process the incoming - /// EDI documents and extract the necessary information to the output file. + /// Deletes the specified transformer. A transformer can take an EDI file as input and + /// transform it into a JSON-or XML-formatted document. Alternatively, a transformer can + /// take a JSON-or XML-formatted document as input and transform it into an EDI file. /// /// Container for the necessary parameters to execute the DeleteTransformer service method. /// @@ -983,8 +1167,9 @@ public virtual DeleteTransformerResponse DeleteTransformer(DeleteTransformerRequ /// - /// Deletes the specified transformer. A transformer describes how to process the incoming - /// EDI documents and extract the necessary information to the output file. + /// Deletes the specified transformer. A transformer can take an EDI file as input and + /// transform it into a JSON-or XML-formatted document. Alternatively, a transformer can + /// take a JSON-or XML-formatted document as input and transform it into an EDI file. /// /// Container for the necessary parameters to execute the DeleteTransformer service method. /// @@ -1026,6 +1211,97 @@ public virtual DeleteTransformerResponse DeleteTransformer(DeleteTransformerRequ #endregion + #region GenerateMapping + + + /// + /// Takes sample input and output documents and uses Amazon Bedrock to generate a mapping + /// automatically. Depending on the accuracy and other factors, you can then edit the + /// mapping for your needs. + /// + /// + /// + /// Before you can use the AI-assisted feature for Amazon Web Services B2B Data Interchange + /// you must enable models in Amazon Bedrock. For details, see AI-assisted + /// template mapping prerequisites in the Amazon Web Services B2B Data Interchange + /// User guide. + /// + /// + /// + /// Container for the necessary parameters to execute the GenerateMapping service method. + /// + /// The response from the GenerateMapping service method, as returned by B2bi. + /// + /// You do not have sufficient access to perform this action. + /// + /// + /// This exception is thrown when an error occurs in the Amazon Web Services B2B Data + /// Interchange service. + /// + /// + /// The request was denied due to throttling: the data speed and rendering may be limited + /// depending on various parameters and conditions. + /// + /// + /// Occurs when a B2BI object cannot be validated against a request from another object. + /// + /// REST API Reference for GenerateMapping Operation + public virtual GenerateMappingResponse GenerateMapping(GenerateMappingRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = GenerateMappingRequestMarshaller.Instance; + options.ResponseUnmarshaller = GenerateMappingResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// Takes sample input and output documents and uses Amazon Bedrock to generate a mapping + /// automatically. Depending on the accuracy and other factors, you can then edit the + /// mapping for your needs. + /// + /// + /// + /// Before you can use the AI-assisted feature for Amazon Web Services B2B Data Interchange + /// you must enable models in Amazon Bedrock. For details, see AI-assisted + /// template mapping prerequisites in the Amazon Web Services B2B Data Interchange + /// User guide. + /// + /// + /// + /// Container for the necessary parameters to execute the GenerateMapping service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the GenerateMapping service method, as returned by B2bi. + /// + /// You do not have sufficient access to perform this action. + /// + /// + /// This exception is thrown when an error occurs in the Amazon Web Services B2B Data + /// Interchange service. + /// + /// + /// The request was denied due to throttling: the data speed and rendering may be limited + /// depending on various parameters and conditions. + /// + /// + /// Occurs when a B2BI object cannot be validated against a request from another object. + /// + /// REST API Reference for GenerateMapping Operation + public virtual Task GenerateMappingAsync(GenerateMappingRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = GenerateMappingRequestMarshaller.Instance; + options.ResponseUnmarshaller = GenerateMappingResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + #region GetCapability @@ -1270,8 +1546,9 @@ public virtual GetProfileResponse GetProfile(GetProfileRequest request) /// /// Retrieves the details for the transformer specified by the transformer ID. A transformer - /// describes how to process the incoming EDI documents and extract the necessary information - /// to the output file. + /// can take an EDI file as input and transform it into a JSON-or XML-formatted document. + /// Alternatively, a transformer can take a JSON-or XML-formatted document as input and + /// transform it into an EDI file. /// /// Container for the necessary parameters to execute the GetTransformer service method. /// @@ -1307,8 +1584,9 @@ public virtual GetTransformerResponse GetTransformer(GetTransformerRequest reque /// /// Retrieves the details for the transformer specified by the transformer ID. A transformer - /// describes how to process the incoming EDI documents and extract the necessary information - /// to the output file. + /// can take an EDI file as input and transform it into a JSON-or XML-formatted document. + /// Alternatively, a transformer can take a JSON-or XML-formatted document as input and + /// transform it into an EDI file. /// /// Container for the necessary parameters to execute the GetTransformer service method. /// @@ -1719,8 +1997,9 @@ public virtual ListTagsForResourceResponse ListTagsForResource(ListTagsForResour /// - /// Lists the available transformers. A transformer describes how to process the incoming - /// EDI documents and extract the necessary information to the output file. + /// Lists the available transformers. A transformer can take an EDI file as input and + /// transform it into a JSON-or XML-formatted document. Alternatively, a transformer can + /// take a JSON-or XML-formatted document as input and transform it into an EDI file. /// /// Container for the necessary parameters to execute the ListTransformers service method. /// @@ -1751,8 +2030,9 @@ public virtual ListTransformersResponse ListTransformers(ListTransformersRequest /// - /// Lists the available transformers. A transformer describes how to process the incoming - /// EDI documents and extract the necessary information to the output file. + /// Lists the available transformers. A transformer can take an EDI file as input and + /// transform it into a JSON-or XML-formatted document. Alternatively, a transformer can + /// take a JSON-or XML-formatted document as input and transform it into an EDI file. /// /// Container for the necessary parameters to execute the ListTransformers service method. /// @@ -1791,7 +2071,7 @@ public virtual ListTransformersResponse ListTransformers(ListTransformersRequest /// /// Runs a job, using a transformer, to parse input EDI (electronic data interchange) - /// file into the output structures used by Amazon Web Services B2BI Data Interchange. + /// file into the output structures used by Amazon Web Services B2B Data Interchange. /// /// /// @@ -1838,7 +2118,7 @@ public virtual StartTransformerJobResponse StartTransformerJob(StartTransformerJ /// /// Runs a job, using a transformer, to parse input EDI (electronic data interchange) - /// file into the output structures used by Amazon Web Services B2BI Data Interchange. + /// file into the output structures used by Amazon Web Services B2B Data Interchange. /// /// /// @@ -1970,6 +2250,87 @@ public virtual TagResourceResponse TagResource(TagResourceRequest request) #endregion + #region TestConversion + + + /// + /// This operation mimics the latter half of a typical Outbound EDI request. It takes + /// an input JSON/XML in the B2Bi shape as input, converts it to an X12 EDI string, and + /// return that string. + /// + /// Container for the necessary parameters to execute the TestConversion service method. + /// + /// The response from the TestConversion service method, as returned by B2bi. + /// + /// You do not have sufficient access to perform this action. + /// + /// + /// This exception is thrown when an error occurs in the Amazon Web Services B2B Data + /// Interchange service. + /// + /// + /// Occurs when the requested resource does not exist, or cannot be found. In some cases, + /// the resource exists in a region other than the region specified in the API call. + /// + /// + /// The request was denied due to throttling: the data speed and rendering may be limited + /// depending on various parameters and conditions. + /// + /// + /// Occurs when a B2BI object cannot be validated against a request from another object. + /// + /// REST API Reference for TestConversion Operation + public virtual TestConversionResponse TestConversion(TestConversionRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = TestConversionRequestMarshaller.Instance; + options.ResponseUnmarshaller = TestConversionResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// This operation mimics the latter half of a typical Outbound EDI request. It takes + /// an input JSON/XML in the B2Bi shape as input, converts it to an X12 EDI string, and + /// return that string. + /// + /// Container for the necessary parameters to execute the TestConversion service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the TestConversion service method, as returned by B2bi. + /// + /// You do not have sufficient access to perform this action. + /// + /// + /// This exception is thrown when an error occurs in the Amazon Web Services B2B Data + /// Interchange service. + /// + /// + /// Occurs when the requested resource does not exist, or cannot be found. In some cases, + /// the resource exists in a region other than the region specified in the API call. + /// + /// + /// The request was denied due to throttling: the data speed and rendering may be limited + /// depending on various parameters and conditions. + /// + /// + /// Occurs when a B2BI object cannot be validated against a request from another object. + /// + /// REST API Reference for TestConversion Operation + public virtual Task TestConversionAsync(TestConversionRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = TestConversionRequestMarshaller.Instance; + options.ResponseUnmarshaller = TestConversionResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + #region TestMapping @@ -2496,9 +2857,10 @@ public virtual UpdateProfileResponse UpdateProfile(UpdateProfileRequest request) /// - /// Updates the specified parameters for a transformer. A transformer describes how to - /// process the incoming EDI documents and extract the necessary information to the output - /// file. + /// Updates the specified parameters for a transformer. A transformer can take an EDI + /// file as input and transform it into a JSON-or XML-formatted document. Alternatively, + /// a transformer can take a JSON-or XML-formatted document as input and transform it + /// into an EDI file. /// /// Container for the necessary parameters to execute the UpdateTransformer service method. /// @@ -2542,9 +2904,10 @@ public virtual UpdateTransformerResponse UpdateTransformer(UpdateTransformerRequ /// - /// Updates the specified parameters for a transformer. A transformer describes how to - /// process the incoming EDI documents and extract the necessary information to the output - /// file. + /// Updates the specified parameters for a transformer. A transformer can take an EDI + /// file as input and transform it into a JSON-or XML-formatted document. Alternatively, + /// a transformer can take a JSON-or XML-formatted document as input and transform it + /// into an EDI file. /// /// Container for the necessary parameters to execute the UpdateTransformer service method. /// diff --git a/sdk/src/Services/B2bi/Properties/AssemblyInfo.cs b/sdk/src/Services/B2bi/Properties/AssemblyInfo.cs index 3537b4b6ed9b..d5bb766f49e8 100644 --- a/sdk/src/Services/B2bi/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/B2bi/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.402.3")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/BCMDataExports/BCMDataExports.sln b/sdk/src/Services/BCMDataExports/BCMDataExports.sln index 350e93869306..4dab083c4f36 100644 --- a/sdk/src/Services/BCMDataExports/BCMDataExports.sln +++ b/sdk/src/Services/BCMDataExports/BCMDataExports.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {98AF8589-D7E9-4063-9D11-0FFE435C1027}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {98AF8589-D7E9-4063-9D11-0FFE435C1027}.Debug|Any CPU.Build.0 = Debug|Any CPU {98AF8589-D7E9-4063-9D11-0FFE435C1027}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {AC94DCFB-F408-4A0D-B47C-B8E67CC7D5F5}.Debug|Any CPU.Build.0 = Debug|Any CPU {AC94DCFB-F408-4A0D-B47C-B8E67CC7D5F5}.Release|Any CPU.ActiveCfg = Release|Any CPU {AC94DCFB-F408-4A0D-B47C-B8E67CC7D5F5}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {96A667E8-64FB-4C42-9B1A-23A58A394875}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {96A667E8-64FB-4C42-9B1A-23A58A394875}.Debug|Any CPU.Build.0 = Debug|Any CPU - {96A667E8-64FB-4C42-9B1A-23A58A394875}.Release|Any CPU.ActiveCfg = Release|Any CPU - {96A667E8-64FB-4C42-9B1A-23A58A394875}.Release|Any CPU.Build.0 = Release|Any CPU - {AF45EB4F-95AD-46BB-85DD-493699937F13}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AF45EB4F-95AD-46BB-85DD-493699937F13}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AF45EB4F-95AD-46BB-85DD-493699937F13}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AF45EB4F-95AD-46BB-85DD-493699937F13}.Release|Any CPU.Build.0 = Release|Any CPU - {114FBAE2-21B8-43A9-9ADE-9780509C78E9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {114FBAE2-21B8-43A9-9ADE-9780509C78E9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {114FBAE2-21B8-43A9-9ADE-9780509C78E9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {114FBAE2-21B8-43A9-9ADE-9780509C78E9}.Release|Any CPU.Build.0 = Release|Any CPU - {2DBD9234-3235-4873-B923-02B6311BA178}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2DBD9234-3235-4873-B923-02B6311BA178}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2DBD9234-3235-4873-B923-02B6311BA178}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2DBD9234-3235-4873-B923-02B6311BA178}.Release|Any CPU.Build.0 = Release|Any CPU - {C1827960-CE1F-429E-AE31-82F9D93624A5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C1827960-CE1F-429E-AE31-82F9D93624A5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C1827960-CE1F-429E-AE31-82F9D93624A5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C1827960-CE1F-429E-AE31-82F9D93624A5}.Release|Any CPU.Build.0 = Release|Any CPU - {DD39D52A-6BC7-4221-B3B7-98E3ECBE3696}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DD39D52A-6BC7-4221-B3B7-98E3ECBE3696}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DD39D52A-6BC7-4221-B3B7-98E3ECBE3696}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DD39D52A-6BC7-4221-B3B7-98E3ECBE3696}.Release|Any CPU.Build.0 = Release|Any CPU - {36EB256E-B39E-4177-BC5D-A5B82B2C9769}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {36EB256E-B39E-4177-BC5D-A5B82B2C9769}.Debug|Any CPU.Build.0 = Debug|Any CPU - {36EB256E-B39E-4177-BC5D-A5B82B2C9769}.Release|Any CPU.ActiveCfg = Release|Any CPU - {36EB256E-B39E-4177-BC5D-A5B82B2C9769}.Release|Any CPU.Build.0 = Release|Any CPU - {14EA1C16-A815-445F-9D7E-CD7692BEDEE9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {14EA1C16-A815-445F-9D7E-CD7692BEDEE9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {14EA1C16-A815-445F-9D7E-CD7692BEDEE9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {14EA1C16-A815-445F-9D7E-CD7692BEDEE9}.Release|Any CPU.Build.0 = Release|Any CPU - {1A1F43DC-49DF-4F5A-AB94-14B59662D9EF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1A1F43DC-49DF-4F5A-AB94-14B59662D9EF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1A1F43DC-49DF-4F5A-AB94-14B59662D9EF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1A1F43DC-49DF-4F5A-AB94-14B59662D9EF}.Release|Any CPU.Build.0 = Release|Any CPU - {CABEEEA4-F745-4A06-AA15-E5F0BE740134}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CABEEEA4-F745-4A06-AA15-E5F0BE740134}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CABEEEA4-F745-4A06-AA15-E5F0BE740134}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CABEEEA4-F745-4A06-AA15-E5F0BE740134}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {96A667E8-64FB-4C42-9B1A-23A58A394875}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {96A667E8-64FB-4C42-9B1A-23A58A394875}.Debug|Any CPU.Build.0 = Debug|Any CPU - {96A667E8-64FB-4C42-9B1A-23A58A394875}.Release|Any CPU.ActiveCfg = Release|Any CPU - {96A667E8-64FB-4C42-9B1A-23A58A394875}.Release|Any CPU.Build.0 = Release|Any CPU - {AF45EB4F-95AD-46BB-85DD-493699937F13}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AF45EB4F-95AD-46BB-85DD-493699937F13}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AF45EB4F-95AD-46BB-85DD-493699937F13}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AF45EB4F-95AD-46BB-85DD-493699937F13}.Release|Any CPU.Build.0 = Release|Any CPU - {114FBAE2-21B8-43A9-9ADE-9780509C78E9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {114FBAE2-21B8-43A9-9ADE-9780509C78E9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {114FBAE2-21B8-43A9-9ADE-9780509C78E9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {114FBAE2-21B8-43A9-9ADE-9780509C78E9}.Release|Any CPU.Build.0 = Release|Any CPU - {2DBD9234-3235-4873-B923-02B6311BA178}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2DBD9234-3235-4873-B923-02B6311BA178}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2DBD9234-3235-4873-B923-02B6311BA178}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2DBD9234-3235-4873-B923-02B6311BA178}.Release|Any CPU.Build.0 = Release|Any CPU - {C1827960-CE1F-429E-AE31-82F9D93624A5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C1827960-CE1F-429E-AE31-82F9D93624A5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C1827960-CE1F-429E-AE31-82F9D93624A5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C1827960-CE1F-429E-AE31-82F9D93624A5}.Release|Any CPU.Build.0 = Release|Any CPU - {DD39D52A-6BC7-4221-B3B7-98E3ECBE3696}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DD39D52A-6BC7-4221-B3B7-98E3ECBE3696}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DD39D52A-6BC7-4221-B3B7-98E3ECBE3696}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DD39D52A-6BC7-4221-B3B7-98E3ECBE3696}.Release|Any CPU.Build.0 = Release|Any CPU - {36EB256E-B39E-4177-BC5D-A5B82B2C9769}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {36EB256E-B39E-4177-BC5D-A5B82B2C9769}.Debug|Any CPU.Build.0 = Debug|Any CPU - {36EB256E-B39E-4177-BC5D-A5B82B2C9769}.Release|Any CPU.ActiveCfg = Release|Any CPU - {36EB256E-B39E-4177-BC5D-A5B82B2C9769}.Release|Any CPU.Build.0 = Release|Any CPU - {14EA1C16-A815-445F-9D7E-CD7692BEDEE9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {14EA1C16-A815-445F-9D7E-CD7692BEDEE9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {14EA1C16-A815-445F-9D7E-CD7692BEDEE9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {14EA1C16-A815-445F-9D7E-CD7692BEDEE9}.Release|Any CPU.Build.0 = Release|Any CPU - {1A1F43DC-49DF-4F5A-AB94-14B59662D9EF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1A1F43DC-49DF-4F5A-AB94-14B59662D9EF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1A1F43DC-49DF-4F5A-AB94-14B59662D9EF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1A1F43DC-49DF-4F5A-AB94-14B59662D9EF}.Release|Any CPU.Build.0 = Release|Any CPU - {CABEEEA4-F745-4A06-AA15-E5F0BE740134}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CABEEEA4-F745-4A06-AA15-E5F0BE740134}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CABEEEA4-F745-4A06-AA15-E5F0BE740134}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CABEEEA4-F745-4A06-AA15-E5F0BE740134}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {98AF8589-D7E9-4063-9D11-0FFE435C1027} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {347EB02B-17F8-4F09-B6A8-EC3629ADC9BE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {BE31838E-A30F-45E5-A792-842915B89A83} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {BED28B2B-4130-41ED-BE6F-EF49E2AD2592} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {AC94DCFB-F408-4A0D-B47C-B8E67CC7D5F5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {96A667E8-64FB-4C42-9B1A-23A58A394875} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {AF45EB4F-95AD-46BB-85DD-493699937F13} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {114FBAE2-21B8-43A9-9ADE-9780509C78E9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {2DBD9234-3235-4873-B923-02B6311BA178} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C1827960-CE1F-429E-AE31-82F9D93624A5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {DD39D52A-6BC7-4221-B3B7-98E3ECBE3696} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {36EB256E-B39E-4177-BC5D-A5B82B2C9769} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {14EA1C16-A815-445F-9D7E-CD7692BEDEE9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {1A1F43DC-49DF-4F5A-AB94-14B59662D9EF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {CABEEEA4-F745-4A06-AA15-E5F0BE740134} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {96A667E8-64FB-4C42-9B1A-23A58A394875} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {AF45EB4F-95AD-46BB-85DD-493699937F13} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {114FBAE2-21B8-43A9-9ADE-9780509C78E9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {2DBD9234-3235-4873-B923-02B6311BA178} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C1827960-CE1F-429E-AE31-82F9D93624A5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {DD39D52A-6BC7-4221-B3B7-98E3ECBE3696} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {36EB256E-B39E-4177-BC5D-A5B82B2C9769} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {14EA1C16-A815-445F-9D7E-CD7692BEDEE9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {1A1F43DC-49DF-4F5A-AB94-14B59662D9EF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {CABEEEA4-F745-4A06-AA15-E5F0BE740134} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {6D1AC8CF-A7DF-4855-A684-3AFB128C6990} diff --git a/sdk/src/Services/BCMDataExports/Generated/AmazonBCMDataExportsConfig.cs b/sdk/src/Services/BCMDataExports/Generated/AmazonBCMDataExportsConfig.cs index 7b614f6dcba7..b45fa267571b 100644 --- a/sdk/src/Services/BCMDataExports/Generated/AmazonBCMDataExportsConfig.cs +++ b/sdk/src/Services/BCMDataExports/Generated/AmazonBCMDataExportsConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.BCMDataExports public partial class AmazonBCMDataExportsConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("BCM Data Exports", "4.0.0.0"); private static readonly AmazonBCMDataExportsEndpointResolver EndpointResolver = new AmazonBCMDataExportsEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("BCM Data Exports", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("BCM Data Exports", "3.7.400.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/BCMDataExports/Properties/AssemblyInfo.cs b/sdk/src/Services/BCMDataExports/Properties/AssemblyInfo.cs index b866c737c142..00a7c09a8d10 100644 --- a/sdk/src/Services/BCMDataExports/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/BCMDataExports/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/Backup/Backup.sln b/sdk/src/Services/Backup/Backup.sln index c60d1815ff02..99cbb4f16f24 100644 --- a/sdk/src/Services/Backup/Backup.sln +++ b/sdk/src/Services/Backup/Backup.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {9B5F8BC7-C5D3-4B11-B36E-676B1BE136B1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {9B5F8BC7-C5D3-4B11-B36E-676B1BE136B1}.Debug|Any CPU.Build.0 = Debug|Any CPU {9B5F8BC7-C5D3-4B11-B36E-676B1BE136B1}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {39A4D541-E96B-43FC-86B1-787B943A0274}.Debug|Any CPU.Build.0 = Debug|Any CPU {39A4D541-E96B-43FC-86B1-787B943A0274}.Release|Any CPU.ActiveCfg = Release|Any CPU {39A4D541-E96B-43FC-86B1-787B943A0274}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {6B1FE182-9EC2-44F7-9134-F141445AAE77}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6B1FE182-9EC2-44F7-9134-F141445AAE77}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6B1FE182-9EC2-44F7-9134-F141445AAE77}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6B1FE182-9EC2-44F7-9134-F141445AAE77}.Release|Any CPU.Build.0 = Release|Any CPU - {32C727BC-7F93-4AD6-97C2-312A25CE01FB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {32C727BC-7F93-4AD6-97C2-312A25CE01FB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {32C727BC-7F93-4AD6-97C2-312A25CE01FB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {32C727BC-7F93-4AD6-97C2-312A25CE01FB}.Release|Any CPU.Build.0 = Release|Any CPU - {18412FA6-A1E4-4EE2-B098-1256789A8B84}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {18412FA6-A1E4-4EE2-B098-1256789A8B84}.Debug|Any CPU.Build.0 = Debug|Any CPU - {18412FA6-A1E4-4EE2-B098-1256789A8B84}.Release|Any CPU.ActiveCfg = Release|Any CPU - {18412FA6-A1E4-4EE2-B098-1256789A8B84}.Release|Any CPU.Build.0 = Release|Any CPU - {2232BEF5-9AEC-44B5-993F-A62288CE21E1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2232BEF5-9AEC-44B5-993F-A62288CE21E1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2232BEF5-9AEC-44B5-993F-A62288CE21E1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2232BEF5-9AEC-44B5-993F-A62288CE21E1}.Release|Any CPU.Build.0 = Release|Any CPU - {11F55DED-74B8-4A0A-B35A-921861D91EB5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {11F55DED-74B8-4A0A-B35A-921861D91EB5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {11F55DED-74B8-4A0A-B35A-921861D91EB5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {11F55DED-74B8-4A0A-B35A-921861D91EB5}.Release|Any CPU.Build.0 = Release|Any CPU - {80E6EBFE-C9E2-45BF-BF5D-7EF270057105}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {80E6EBFE-C9E2-45BF-BF5D-7EF270057105}.Debug|Any CPU.Build.0 = Debug|Any CPU - {80E6EBFE-C9E2-45BF-BF5D-7EF270057105}.Release|Any CPU.ActiveCfg = Release|Any CPU - {80E6EBFE-C9E2-45BF-BF5D-7EF270057105}.Release|Any CPU.Build.0 = Release|Any CPU - {D07279E9-9EF9-40F6-BF74-6DE985D23C0A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D07279E9-9EF9-40F6-BF74-6DE985D23C0A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D07279E9-9EF9-40F6-BF74-6DE985D23C0A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D07279E9-9EF9-40F6-BF74-6DE985D23C0A}.Release|Any CPU.Build.0 = Release|Any CPU - {D835B3FD-7A93-4D21-97B9-08F1E2B2E31C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D835B3FD-7A93-4D21-97B9-08F1E2B2E31C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D835B3FD-7A93-4D21-97B9-08F1E2B2E31C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D835B3FD-7A93-4D21-97B9-08F1E2B2E31C}.Release|Any CPU.Build.0 = Release|Any CPU - {CD9DBDDA-BD6C-4647-B9F1-D0497779BA00}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CD9DBDDA-BD6C-4647-B9F1-D0497779BA00}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CD9DBDDA-BD6C-4647-B9F1-D0497779BA00}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CD9DBDDA-BD6C-4647-B9F1-D0497779BA00}.Release|Any CPU.Build.0 = Release|Any CPU - {D8E44F32-5DA5-4B13-9DDC-B21E787F31E9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D8E44F32-5DA5-4B13-9DDC-B21E787F31E9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D8E44F32-5DA5-4B13-9DDC-B21E787F31E9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D8E44F32-5DA5-4B13-9DDC-B21E787F31E9}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {6B1FE182-9EC2-44F7-9134-F141445AAE77}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6B1FE182-9EC2-44F7-9134-F141445AAE77}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6B1FE182-9EC2-44F7-9134-F141445AAE77}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6B1FE182-9EC2-44F7-9134-F141445AAE77}.Release|Any CPU.Build.0 = Release|Any CPU - {32C727BC-7F93-4AD6-97C2-312A25CE01FB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {32C727BC-7F93-4AD6-97C2-312A25CE01FB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {32C727BC-7F93-4AD6-97C2-312A25CE01FB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {32C727BC-7F93-4AD6-97C2-312A25CE01FB}.Release|Any CPU.Build.0 = Release|Any CPU - {18412FA6-A1E4-4EE2-B098-1256789A8B84}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {18412FA6-A1E4-4EE2-B098-1256789A8B84}.Debug|Any CPU.Build.0 = Debug|Any CPU - {18412FA6-A1E4-4EE2-B098-1256789A8B84}.Release|Any CPU.ActiveCfg = Release|Any CPU - {18412FA6-A1E4-4EE2-B098-1256789A8B84}.Release|Any CPU.Build.0 = Release|Any CPU - {2232BEF5-9AEC-44B5-993F-A62288CE21E1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2232BEF5-9AEC-44B5-993F-A62288CE21E1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2232BEF5-9AEC-44B5-993F-A62288CE21E1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2232BEF5-9AEC-44B5-993F-A62288CE21E1}.Release|Any CPU.Build.0 = Release|Any CPU - {11F55DED-74B8-4A0A-B35A-921861D91EB5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {11F55DED-74B8-4A0A-B35A-921861D91EB5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {11F55DED-74B8-4A0A-B35A-921861D91EB5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {11F55DED-74B8-4A0A-B35A-921861D91EB5}.Release|Any CPU.Build.0 = Release|Any CPU - {80E6EBFE-C9E2-45BF-BF5D-7EF270057105}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {80E6EBFE-C9E2-45BF-BF5D-7EF270057105}.Debug|Any CPU.Build.0 = Debug|Any CPU - {80E6EBFE-C9E2-45BF-BF5D-7EF270057105}.Release|Any CPU.ActiveCfg = Release|Any CPU - {80E6EBFE-C9E2-45BF-BF5D-7EF270057105}.Release|Any CPU.Build.0 = Release|Any CPU - {D07279E9-9EF9-40F6-BF74-6DE985D23C0A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D07279E9-9EF9-40F6-BF74-6DE985D23C0A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D07279E9-9EF9-40F6-BF74-6DE985D23C0A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D07279E9-9EF9-40F6-BF74-6DE985D23C0A}.Release|Any CPU.Build.0 = Release|Any CPU - {D835B3FD-7A93-4D21-97B9-08F1E2B2E31C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D835B3FD-7A93-4D21-97B9-08F1E2B2E31C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D835B3FD-7A93-4D21-97B9-08F1E2B2E31C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D835B3FD-7A93-4D21-97B9-08F1E2B2E31C}.Release|Any CPU.Build.0 = Release|Any CPU - {CD9DBDDA-BD6C-4647-B9F1-D0497779BA00}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CD9DBDDA-BD6C-4647-B9F1-D0497779BA00}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CD9DBDDA-BD6C-4647-B9F1-D0497779BA00}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CD9DBDDA-BD6C-4647-B9F1-D0497779BA00}.Release|Any CPU.Build.0 = Release|Any CPU - {D8E44F32-5DA5-4B13-9DDC-B21E787F31E9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D8E44F32-5DA5-4B13-9DDC-B21E787F31E9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D8E44F32-5DA5-4B13-9DDC-B21E787F31E9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D8E44F32-5DA5-4B13-9DDC-B21E787F31E9}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {9B5F8BC7-C5D3-4B11-B36E-676B1BE136B1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {79DE4DEC-4AF1-4301-8CE8-3C23378C092F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {9AF29177-BB42-4022-B49E-DA60289E4BB6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {20B9B554-2136-49D3-937F-1B7784AA7001} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {39A4D541-E96B-43FC-86B1-787B943A0274} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {6B1FE182-9EC2-44F7-9134-F141445AAE77} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {32C727BC-7F93-4AD6-97C2-312A25CE01FB} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {18412FA6-A1E4-4EE2-B098-1256789A8B84} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {2232BEF5-9AEC-44B5-993F-A62288CE21E1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {11F55DED-74B8-4A0A-B35A-921861D91EB5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {80E6EBFE-C9E2-45BF-BF5D-7EF270057105} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D07279E9-9EF9-40F6-BF74-6DE985D23C0A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D835B3FD-7A93-4D21-97B9-08F1E2B2E31C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {CD9DBDDA-BD6C-4647-B9F1-D0497779BA00} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D8E44F32-5DA5-4B13-9DDC-B21E787F31E9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {6B1FE182-9EC2-44F7-9134-F141445AAE77} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {32C727BC-7F93-4AD6-97C2-312A25CE01FB} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {18412FA6-A1E4-4EE2-B098-1256789A8B84} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {2232BEF5-9AEC-44B5-993F-A62288CE21E1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {11F55DED-74B8-4A0A-B35A-921861D91EB5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {80E6EBFE-C9E2-45BF-BF5D-7EF270057105} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D07279E9-9EF9-40F6-BF74-6DE985D23C0A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D835B3FD-7A93-4D21-97B9-08F1E2B2E31C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {CD9DBDDA-BD6C-4647-B9F1-D0497779BA00} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D8E44F32-5DA5-4B13-9DDC-B21E787F31E9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {3F972B2E-6CEF-4BFB-8C9F-73C849CFE675} diff --git a/sdk/src/Services/Backup/Generated/AmazonBackupConfig.cs b/sdk/src/Services/Backup/Generated/AmazonBackupConfig.cs index a64cac35ed02..7f7546a77736 100644 --- a/sdk/src/Services/Backup/Generated/AmazonBackupConfig.cs +++ b/sdk/src/Services/Backup/Generated/AmazonBackupConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.Backup public partial class AmazonBackupConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("Backup", "4.0.0.0"); private static readonly AmazonBackupEndpointResolver EndpointResolver = new AmazonBackupEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("Backup", "3.7.401.13"); -======= - InternalSDKUtils.BuildUserAgentString("Backup", "3.7.401.40"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/Backup/Properties/AssemblyInfo.cs b/sdk/src/Services/Backup/Properties/AssemblyInfo.cs index 8227ebe7a701..34eb9df2d400 100644 --- a/sdk/src/Services/Backup/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/Backup/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.13")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.40")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/BackupGateway/BackupGateway.sln b/sdk/src/Services/BackupGateway/BackupGateway.sln index 93b429536a7d..a9ee388f63ee 100644 --- a/sdk/src/Services/BackupGateway/BackupGateway.sln +++ b/sdk/src/Services/BackupGateway/BackupGateway.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {1978767D-3AFE-4C40-A755-2CA4658FE069}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {1978767D-3AFE-4C40-A755-2CA4658FE069}.Debug|Any CPU.Build.0 = Debug|Any CPU {1978767D-3AFE-4C40-A755-2CA4658FE069}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {91602B87-57D7-4112-A00B-940C896AC9E3}.Debug|Any CPU.Build.0 = Debug|Any CPU {91602B87-57D7-4112-A00B-940C896AC9E3}.Release|Any CPU.ActiveCfg = Release|Any CPU {91602B87-57D7-4112-A00B-940C896AC9E3}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {67979D31-AA40-473B-99CF-64C86476B95F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {67979D31-AA40-473B-99CF-64C86476B95F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {67979D31-AA40-473B-99CF-64C86476B95F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {67979D31-AA40-473B-99CF-64C86476B95F}.Release|Any CPU.Build.0 = Release|Any CPU - {2F7C5CB7-1F36-4B67-9E18-F17C8D4B2B72}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2F7C5CB7-1F36-4B67-9E18-F17C8D4B2B72}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2F7C5CB7-1F36-4B67-9E18-F17C8D4B2B72}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2F7C5CB7-1F36-4B67-9E18-F17C8D4B2B72}.Release|Any CPU.Build.0 = Release|Any CPU - {88246FB2-6D62-4521-8714-2FF324E0649B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {88246FB2-6D62-4521-8714-2FF324E0649B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {88246FB2-6D62-4521-8714-2FF324E0649B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {88246FB2-6D62-4521-8714-2FF324E0649B}.Release|Any CPU.Build.0 = Release|Any CPU - {AAACC217-90F8-4BE4-8E9A-19A3593EAD53}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AAACC217-90F8-4BE4-8E9A-19A3593EAD53}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AAACC217-90F8-4BE4-8E9A-19A3593EAD53}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AAACC217-90F8-4BE4-8E9A-19A3593EAD53}.Release|Any CPU.Build.0 = Release|Any CPU - {30CBF903-7631-4E45-877C-4DAE94322636}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {30CBF903-7631-4E45-877C-4DAE94322636}.Debug|Any CPU.Build.0 = Debug|Any CPU - {30CBF903-7631-4E45-877C-4DAE94322636}.Release|Any CPU.ActiveCfg = Release|Any CPU - {30CBF903-7631-4E45-877C-4DAE94322636}.Release|Any CPU.Build.0 = Release|Any CPU - {A2B3525F-AE85-43BC-B226-EB66224BE4C9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A2B3525F-AE85-43BC-B226-EB66224BE4C9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A2B3525F-AE85-43BC-B226-EB66224BE4C9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A2B3525F-AE85-43BC-B226-EB66224BE4C9}.Release|Any CPU.Build.0 = Release|Any CPU - {2EDBEED0-F983-41DD-8A93-F9EA328BB14A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2EDBEED0-F983-41DD-8A93-F9EA328BB14A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2EDBEED0-F983-41DD-8A93-F9EA328BB14A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2EDBEED0-F983-41DD-8A93-F9EA328BB14A}.Release|Any CPU.Build.0 = Release|Any CPU - {89CD3F83-03EB-44FD-82C6-F61584E8BB4B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {89CD3F83-03EB-44FD-82C6-F61584E8BB4B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {89CD3F83-03EB-44FD-82C6-F61584E8BB4B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {89CD3F83-03EB-44FD-82C6-F61584E8BB4B}.Release|Any CPU.Build.0 = Release|Any CPU - {E48346BD-0480-434B-B7EB-48FF26C4F2A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E48346BD-0480-434B-B7EB-48FF26C4F2A2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E48346BD-0480-434B-B7EB-48FF26C4F2A2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E48346BD-0480-434B-B7EB-48FF26C4F2A2}.Release|Any CPU.Build.0 = Release|Any CPU - {8D53DAA0-FE77-4169-BD22-1F1202512471}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8D53DAA0-FE77-4169-BD22-1F1202512471}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8D53DAA0-FE77-4169-BD22-1F1202512471}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8D53DAA0-FE77-4169-BD22-1F1202512471}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {67979D31-AA40-473B-99CF-64C86476B95F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {67979D31-AA40-473B-99CF-64C86476B95F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {67979D31-AA40-473B-99CF-64C86476B95F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {67979D31-AA40-473B-99CF-64C86476B95F}.Release|Any CPU.Build.0 = Release|Any CPU - {2F7C5CB7-1F36-4B67-9E18-F17C8D4B2B72}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2F7C5CB7-1F36-4B67-9E18-F17C8D4B2B72}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2F7C5CB7-1F36-4B67-9E18-F17C8D4B2B72}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2F7C5CB7-1F36-4B67-9E18-F17C8D4B2B72}.Release|Any CPU.Build.0 = Release|Any CPU - {88246FB2-6D62-4521-8714-2FF324E0649B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {88246FB2-6D62-4521-8714-2FF324E0649B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {88246FB2-6D62-4521-8714-2FF324E0649B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {88246FB2-6D62-4521-8714-2FF324E0649B}.Release|Any CPU.Build.0 = Release|Any CPU - {AAACC217-90F8-4BE4-8E9A-19A3593EAD53}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AAACC217-90F8-4BE4-8E9A-19A3593EAD53}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AAACC217-90F8-4BE4-8E9A-19A3593EAD53}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AAACC217-90F8-4BE4-8E9A-19A3593EAD53}.Release|Any CPU.Build.0 = Release|Any CPU - {30CBF903-7631-4E45-877C-4DAE94322636}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {30CBF903-7631-4E45-877C-4DAE94322636}.Debug|Any CPU.Build.0 = Debug|Any CPU - {30CBF903-7631-4E45-877C-4DAE94322636}.Release|Any CPU.ActiveCfg = Release|Any CPU - {30CBF903-7631-4E45-877C-4DAE94322636}.Release|Any CPU.Build.0 = Release|Any CPU - {A2B3525F-AE85-43BC-B226-EB66224BE4C9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A2B3525F-AE85-43BC-B226-EB66224BE4C9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A2B3525F-AE85-43BC-B226-EB66224BE4C9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A2B3525F-AE85-43BC-B226-EB66224BE4C9}.Release|Any CPU.Build.0 = Release|Any CPU - {2EDBEED0-F983-41DD-8A93-F9EA328BB14A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2EDBEED0-F983-41DD-8A93-F9EA328BB14A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2EDBEED0-F983-41DD-8A93-F9EA328BB14A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2EDBEED0-F983-41DD-8A93-F9EA328BB14A}.Release|Any CPU.Build.0 = Release|Any CPU - {89CD3F83-03EB-44FD-82C6-F61584E8BB4B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {89CD3F83-03EB-44FD-82C6-F61584E8BB4B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {89CD3F83-03EB-44FD-82C6-F61584E8BB4B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {89CD3F83-03EB-44FD-82C6-F61584E8BB4B}.Release|Any CPU.Build.0 = Release|Any CPU - {E48346BD-0480-434B-B7EB-48FF26C4F2A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E48346BD-0480-434B-B7EB-48FF26C4F2A2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E48346BD-0480-434B-B7EB-48FF26C4F2A2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E48346BD-0480-434B-B7EB-48FF26C4F2A2}.Release|Any CPU.Build.0 = Release|Any CPU - {8D53DAA0-FE77-4169-BD22-1F1202512471}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8D53DAA0-FE77-4169-BD22-1F1202512471}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8D53DAA0-FE77-4169-BD22-1F1202512471}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8D53DAA0-FE77-4169-BD22-1F1202512471}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {1978767D-3AFE-4C40-A755-2CA4658FE069} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {77C47834-160F-4C0E-B49F-682B045B5569} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {62FFF1DB-0CD7-4F34-9B8B-14969ACF5D39} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {BFEE501E-2124-414D-AFE7-FC979DC94F41} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {91602B87-57D7-4112-A00B-940C896AC9E3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {67979D31-AA40-473B-99CF-64C86476B95F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {2F7C5CB7-1F36-4B67-9E18-F17C8D4B2B72} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {88246FB2-6D62-4521-8714-2FF324E0649B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {AAACC217-90F8-4BE4-8E9A-19A3593EAD53} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {30CBF903-7631-4E45-877C-4DAE94322636} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A2B3525F-AE85-43BC-B226-EB66224BE4C9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {2EDBEED0-F983-41DD-8A93-F9EA328BB14A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {89CD3F83-03EB-44FD-82C6-F61584E8BB4B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E48346BD-0480-434B-B7EB-48FF26C4F2A2} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8D53DAA0-FE77-4169-BD22-1F1202512471} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {67979D31-AA40-473B-99CF-64C86476B95F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {2F7C5CB7-1F36-4B67-9E18-F17C8D4B2B72} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {88246FB2-6D62-4521-8714-2FF324E0649B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {AAACC217-90F8-4BE4-8E9A-19A3593EAD53} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {30CBF903-7631-4E45-877C-4DAE94322636} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A2B3525F-AE85-43BC-B226-EB66224BE4C9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {2EDBEED0-F983-41DD-8A93-F9EA328BB14A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {89CD3F83-03EB-44FD-82C6-F61584E8BB4B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E48346BD-0480-434B-B7EB-48FF26C4F2A2} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8D53DAA0-FE77-4169-BD22-1F1202512471} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {F987679D-E7DB-4FFC-BFD5-AEFB419319B5} diff --git a/sdk/src/Services/BackupGateway/Generated/AmazonBackupGatewayConfig.cs b/sdk/src/Services/BackupGateway/Generated/AmazonBackupGatewayConfig.cs index 6038b92e1cc8..af320bb57794 100644 --- a/sdk/src/Services/BackupGateway/Generated/AmazonBackupGatewayConfig.cs +++ b/sdk/src/Services/BackupGateway/Generated/AmazonBackupGatewayConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.BackupGateway public partial class AmazonBackupGatewayConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("Backup Gateway", "4.0.0.0"); private static readonly AmazonBackupGatewayEndpointResolver EndpointResolver = new AmazonBackupGatewayEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("Backup Gateway", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("Backup Gateway", "3.7.400.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/BackupGateway/Properties/AssemblyInfo.cs b/sdk/src/Services/BackupGateway/Properties/AssemblyInfo.cs index d525c8186262..aba8e088bc86 100644 --- a/sdk/src/Services/BackupGateway/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/BackupGateway/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/Batch/Batch.sln b/sdk/src/Services/Batch/Batch.sln index a9ae403c2245..b672f448bbef 100644 --- a/sdk/src/Services/Batch/Batch.sln +++ b/sdk/src/Services/Batch/Batch.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {80BBA2F4-3629-4032-8AD7-868F31709F55}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {80BBA2F4-3629-4032-8AD7-868F31709F55}.Debug|Any CPU.Build.0 = Debug|Any CPU {80BBA2F4-3629-4032-8AD7-868F31709F55}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {4D92A4CE-8AD4-4756-A489-93417910DA81}.Debug|Any CPU.Build.0 = Debug|Any CPU {4D92A4CE-8AD4-4756-A489-93417910DA81}.Release|Any CPU.ActiveCfg = Release|Any CPU {4D92A4CE-8AD4-4756-A489-93417910DA81}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {38C89CB2-1D6E-49C7-925D-94986E4D7ECE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {38C89CB2-1D6E-49C7-925D-94986E4D7ECE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {38C89CB2-1D6E-49C7-925D-94986E4D7ECE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {38C89CB2-1D6E-49C7-925D-94986E4D7ECE}.Release|Any CPU.Build.0 = Release|Any CPU - {EB223278-18C8-464D-A94B-DDE1E560ECD3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EB223278-18C8-464D-A94B-DDE1E560ECD3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EB223278-18C8-464D-A94B-DDE1E560ECD3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EB223278-18C8-464D-A94B-DDE1E560ECD3}.Release|Any CPU.Build.0 = Release|Any CPU - {B6DE1A97-68E8-4D35-B493-6B578A9D6A89}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B6DE1A97-68E8-4D35-B493-6B578A9D6A89}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B6DE1A97-68E8-4D35-B493-6B578A9D6A89}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B6DE1A97-68E8-4D35-B493-6B578A9D6A89}.Release|Any CPU.Build.0 = Release|Any CPU - {39FB50B5-23D6-4552-B4AD-C2D66C008471}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {39FB50B5-23D6-4552-B4AD-C2D66C008471}.Debug|Any CPU.Build.0 = Debug|Any CPU - {39FB50B5-23D6-4552-B4AD-C2D66C008471}.Release|Any CPU.ActiveCfg = Release|Any CPU - {39FB50B5-23D6-4552-B4AD-C2D66C008471}.Release|Any CPU.Build.0 = Release|Any CPU - {FEA133DE-A686-491D-A602-924EFB6CEFC7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FEA133DE-A686-491D-A602-924EFB6CEFC7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FEA133DE-A686-491D-A602-924EFB6CEFC7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FEA133DE-A686-491D-A602-924EFB6CEFC7}.Release|Any CPU.Build.0 = Release|Any CPU - {9AF312DD-4455-4857-9750-1EA4DA4643F3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9AF312DD-4455-4857-9750-1EA4DA4643F3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9AF312DD-4455-4857-9750-1EA4DA4643F3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9AF312DD-4455-4857-9750-1EA4DA4643F3}.Release|Any CPU.Build.0 = Release|Any CPU - {9FBFD124-0C37-45B0-BF9E-E16AD72D166C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9FBFD124-0C37-45B0-BF9E-E16AD72D166C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9FBFD124-0C37-45B0-BF9E-E16AD72D166C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9FBFD124-0C37-45B0-BF9E-E16AD72D166C}.Release|Any CPU.Build.0 = Release|Any CPU - {E654B9BE-3E04-4AC5-AB09-D92777614223}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E654B9BE-3E04-4AC5-AB09-D92777614223}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E654B9BE-3E04-4AC5-AB09-D92777614223}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E654B9BE-3E04-4AC5-AB09-D92777614223}.Release|Any CPU.Build.0 = Release|Any CPU - {8BBEB9AA-2AEE-4228-8B2C-AFB8B0D38CB9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8BBEB9AA-2AEE-4228-8B2C-AFB8B0D38CB9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8BBEB9AA-2AEE-4228-8B2C-AFB8B0D38CB9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8BBEB9AA-2AEE-4228-8B2C-AFB8B0D38CB9}.Release|Any CPU.Build.0 = Release|Any CPU - {46A586D8-B5B8-4DF7-8219-899889A2C071}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {46A586D8-B5B8-4DF7-8219-899889A2C071}.Debug|Any CPU.Build.0 = Debug|Any CPU - {46A586D8-B5B8-4DF7-8219-899889A2C071}.Release|Any CPU.ActiveCfg = Release|Any CPU - {46A586D8-B5B8-4DF7-8219-899889A2C071}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {38C89CB2-1D6E-49C7-925D-94986E4D7ECE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {38C89CB2-1D6E-49C7-925D-94986E4D7ECE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {38C89CB2-1D6E-49C7-925D-94986E4D7ECE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {38C89CB2-1D6E-49C7-925D-94986E4D7ECE}.Release|Any CPU.Build.0 = Release|Any CPU - {EB223278-18C8-464D-A94B-DDE1E560ECD3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EB223278-18C8-464D-A94B-DDE1E560ECD3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EB223278-18C8-464D-A94B-DDE1E560ECD3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EB223278-18C8-464D-A94B-DDE1E560ECD3}.Release|Any CPU.Build.0 = Release|Any CPU - {B6DE1A97-68E8-4D35-B493-6B578A9D6A89}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B6DE1A97-68E8-4D35-B493-6B578A9D6A89}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B6DE1A97-68E8-4D35-B493-6B578A9D6A89}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B6DE1A97-68E8-4D35-B493-6B578A9D6A89}.Release|Any CPU.Build.0 = Release|Any CPU - {39FB50B5-23D6-4552-B4AD-C2D66C008471}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {39FB50B5-23D6-4552-B4AD-C2D66C008471}.Debug|Any CPU.Build.0 = Debug|Any CPU - {39FB50B5-23D6-4552-B4AD-C2D66C008471}.Release|Any CPU.ActiveCfg = Release|Any CPU - {39FB50B5-23D6-4552-B4AD-C2D66C008471}.Release|Any CPU.Build.0 = Release|Any CPU - {FEA133DE-A686-491D-A602-924EFB6CEFC7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FEA133DE-A686-491D-A602-924EFB6CEFC7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FEA133DE-A686-491D-A602-924EFB6CEFC7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FEA133DE-A686-491D-A602-924EFB6CEFC7}.Release|Any CPU.Build.0 = Release|Any CPU - {9AF312DD-4455-4857-9750-1EA4DA4643F3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9AF312DD-4455-4857-9750-1EA4DA4643F3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9AF312DD-4455-4857-9750-1EA4DA4643F3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9AF312DD-4455-4857-9750-1EA4DA4643F3}.Release|Any CPU.Build.0 = Release|Any CPU - {9FBFD124-0C37-45B0-BF9E-E16AD72D166C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9FBFD124-0C37-45B0-BF9E-E16AD72D166C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9FBFD124-0C37-45B0-BF9E-E16AD72D166C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9FBFD124-0C37-45B0-BF9E-E16AD72D166C}.Release|Any CPU.Build.0 = Release|Any CPU - {E654B9BE-3E04-4AC5-AB09-D92777614223}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E654B9BE-3E04-4AC5-AB09-D92777614223}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E654B9BE-3E04-4AC5-AB09-D92777614223}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E654B9BE-3E04-4AC5-AB09-D92777614223}.Release|Any CPU.Build.0 = Release|Any CPU - {8BBEB9AA-2AEE-4228-8B2C-AFB8B0D38CB9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8BBEB9AA-2AEE-4228-8B2C-AFB8B0D38CB9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8BBEB9AA-2AEE-4228-8B2C-AFB8B0D38CB9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8BBEB9AA-2AEE-4228-8B2C-AFB8B0D38CB9}.Release|Any CPU.Build.0 = Release|Any CPU - {46A586D8-B5B8-4DF7-8219-899889A2C071}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {46A586D8-B5B8-4DF7-8219-899889A2C071}.Debug|Any CPU.Build.0 = Debug|Any CPU - {46A586D8-B5B8-4DF7-8219-899889A2C071}.Release|Any CPU.ActiveCfg = Release|Any CPU - {46A586D8-B5B8-4DF7-8219-899889A2C071}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {80BBA2F4-3629-4032-8AD7-868F31709F55} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {D835C6D6-4036-474F-8958-0474349771DE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {162BC16D-47B1-4044-AB79-629A0BE46A33} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {70950D9A-F2B9-4B24-901B-A810C0BF106C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {4D92A4CE-8AD4-4756-A489-93417910DA81} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {38C89CB2-1D6E-49C7-925D-94986E4D7ECE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {EB223278-18C8-464D-A94B-DDE1E560ECD3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B6DE1A97-68E8-4D35-B493-6B578A9D6A89} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {39FB50B5-23D6-4552-B4AD-C2D66C008471} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {FEA133DE-A686-491D-A602-924EFB6CEFC7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {9AF312DD-4455-4857-9750-1EA4DA4643F3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {9FBFD124-0C37-45B0-BF9E-E16AD72D166C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E654B9BE-3E04-4AC5-AB09-D92777614223} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8BBEB9AA-2AEE-4228-8B2C-AFB8B0D38CB9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {46A586D8-B5B8-4DF7-8219-899889A2C071} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {38C89CB2-1D6E-49C7-925D-94986E4D7ECE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {EB223278-18C8-464D-A94B-DDE1E560ECD3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B6DE1A97-68E8-4D35-B493-6B578A9D6A89} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {39FB50B5-23D6-4552-B4AD-C2D66C008471} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {FEA133DE-A686-491D-A602-924EFB6CEFC7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {9AF312DD-4455-4857-9750-1EA4DA4643F3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {9FBFD124-0C37-45B0-BF9E-E16AD72D166C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E654B9BE-3E04-4AC5-AB09-D92777614223} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8BBEB9AA-2AEE-4228-8B2C-AFB8B0D38CB9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {46A586D8-B5B8-4DF7-8219-899889A2C071} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {914272B8-5548-4FCC-B8DB-0175507583B7} diff --git a/sdk/src/Services/Batch/Generated/AmazonBatchConfig.cs b/sdk/src/Services/Batch/Generated/AmazonBatchConfig.cs index fbb934bd1ad0..eae47cdf600a 100644 --- a/sdk/src/Services/Batch/Generated/AmazonBatchConfig.cs +++ b/sdk/src/Services/Batch/Generated/AmazonBatchConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.Batch public partial class AmazonBatchConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("Batch", "4.0.0.0"); private static readonly AmazonBatchEndpointResolver EndpointResolver = new AmazonBatchEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("Batch", "3.7.401.19"); -======= - InternalSDKUtils.BuildUserAgentString("Batch", "3.7.403.6"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/Batch/Properties/AssemblyInfo.cs b/sdk/src/Services/Batch/Properties/AssemblyInfo.cs index f58910b1e763..04d6d3b00b5a 100644 --- a/sdk/src/Services/Batch/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/Batch/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.19")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.403.6")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/Bedrock/Bedrock.sln b/sdk/src/Services/Bedrock/Bedrock.sln index a6d01600d871..3129cc2f9c60 100644 --- a/sdk/src/Services/Bedrock/Bedrock.sln +++ b/sdk/src/Services/Bedrock/Bedrock.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {76A9A322-A1C2-4853-B369-3BCA027319D2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {76A9A322-A1C2-4853-B369-3BCA027319D2}.Debug|Any CPU.Build.0 = Debug|Any CPU {76A9A322-A1C2-4853-B369-3BCA027319D2}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {B00CA348-8520-415D-A76A-03688EAA50DF}.Debug|Any CPU.Build.0 = Debug|Any CPU {B00CA348-8520-415D-A76A-03688EAA50DF}.Release|Any CPU.ActiveCfg = Release|Any CPU {B00CA348-8520-415D-A76A-03688EAA50DF}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {F56799BC-04D6-47B8-B66B-7D9711A9C5DB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F56799BC-04D6-47B8-B66B-7D9711A9C5DB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F56799BC-04D6-47B8-B66B-7D9711A9C5DB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F56799BC-04D6-47B8-B66B-7D9711A9C5DB}.Release|Any CPU.Build.0 = Release|Any CPU - {0E4A4C0C-75FB-41FD-ABC9-4B3A6AFE3AA1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0E4A4C0C-75FB-41FD-ABC9-4B3A6AFE3AA1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0E4A4C0C-75FB-41FD-ABC9-4B3A6AFE3AA1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0E4A4C0C-75FB-41FD-ABC9-4B3A6AFE3AA1}.Release|Any CPU.Build.0 = Release|Any CPU - {C9383C8C-C676-42FA-9644-E9BD75547127}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C9383C8C-C676-42FA-9644-E9BD75547127}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C9383C8C-C676-42FA-9644-E9BD75547127}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C9383C8C-C676-42FA-9644-E9BD75547127}.Release|Any CPU.Build.0 = Release|Any CPU - {A769AA5E-7273-47D7-8CF5-4467B2D9B978}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A769AA5E-7273-47D7-8CF5-4467B2D9B978}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A769AA5E-7273-47D7-8CF5-4467B2D9B978}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A769AA5E-7273-47D7-8CF5-4467B2D9B978}.Release|Any CPU.Build.0 = Release|Any CPU - {D19CEBFA-0532-4510-A6E9-E88C1CC06A8C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D19CEBFA-0532-4510-A6E9-E88C1CC06A8C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D19CEBFA-0532-4510-A6E9-E88C1CC06A8C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D19CEBFA-0532-4510-A6E9-E88C1CC06A8C}.Release|Any CPU.Build.0 = Release|Any CPU - {7F8D50F9-9B62-4A43-9B2D-F6890833594D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7F8D50F9-9B62-4A43-9B2D-F6890833594D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7F8D50F9-9B62-4A43-9B2D-F6890833594D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7F8D50F9-9B62-4A43-9B2D-F6890833594D}.Release|Any CPU.Build.0 = Release|Any CPU - {3E841D29-B9CC-4C42-8F43-950DCCCC509C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3E841D29-B9CC-4C42-8F43-950DCCCC509C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3E841D29-B9CC-4C42-8F43-950DCCCC509C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3E841D29-B9CC-4C42-8F43-950DCCCC509C}.Release|Any CPU.Build.0 = Release|Any CPU - {BFED6CC1-EB1E-44F1-98CF-51DCBA6B3EA5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BFED6CC1-EB1E-44F1-98CF-51DCBA6B3EA5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BFED6CC1-EB1E-44F1-98CF-51DCBA6B3EA5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BFED6CC1-EB1E-44F1-98CF-51DCBA6B3EA5}.Release|Any CPU.Build.0 = Release|Any CPU - {0AD0F629-13D6-4479-8BC4-42CDB4233B4B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0AD0F629-13D6-4479-8BC4-42CDB4233B4B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0AD0F629-13D6-4479-8BC4-42CDB4233B4B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0AD0F629-13D6-4479-8BC4-42CDB4233B4B}.Release|Any CPU.Build.0 = Release|Any CPU - {840D973E-EF37-4E45-A507-55157EDB9961}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {840D973E-EF37-4E45-A507-55157EDB9961}.Debug|Any CPU.Build.0 = Debug|Any CPU - {840D973E-EF37-4E45-A507-55157EDB9961}.Release|Any CPU.ActiveCfg = Release|Any CPU - {840D973E-EF37-4E45-A507-55157EDB9961}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {F56799BC-04D6-47B8-B66B-7D9711A9C5DB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F56799BC-04D6-47B8-B66B-7D9711A9C5DB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F56799BC-04D6-47B8-B66B-7D9711A9C5DB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F56799BC-04D6-47B8-B66B-7D9711A9C5DB}.Release|Any CPU.Build.0 = Release|Any CPU - {0E4A4C0C-75FB-41FD-ABC9-4B3A6AFE3AA1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0E4A4C0C-75FB-41FD-ABC9-4B3A6AFE3AA1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0E4A4C0C-75FB-41FD-ABC9-4B3A6AFE3AA1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0E4A4C0C-75FB-41FD-ABC9-4B3A6AFE3AA1}.Release|Any CPU.Build.0 = Release|Any CPU - {C9383C8C-C676-42FA-9644-E9BD75547127}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C9383C8C-C676-42FA-9644-E9BD75547127}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C9383C8C-C676-42FA-9644-E9BD75547127}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C9383C8C-C676-42FA-9644-E9BD75547127}.Release|Any CPU.Build.0 = Release|Any CPU - {A769AA5E-7273-47D7-8CF5-4467B2D9B978}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A769AA5E-7273-47D7-8CF5-4467B2D9B978}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A769AA5E-7273-47D7-8CF5-4467B2D9B978}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A769AA5E-7273-47D7-8CF5-4467B2D9B978}.Release|Any CPU.Build.0 = Release|Any CPU - {D19CEBFA-0532-4510-A6E9-E88C1CC06A8C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D19CEBFA-0532-4510-A6E9-E88C1CC06A8C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D19CEBFA-0532-4510-A6E9-E88C1CC06A8C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D19CEBFA-0532-4510-A6E9-E88C1CC06A8C}.Release|Any CPU.Build.0 = Release|Any CPU - {7F8D50F9-9B62-4A43-9B2D-F6890833594D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7F8D50F9-9B62-4A43-9B2D-F6890833594D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7F8D50F9-9B62-4A43-9B2D-F6890833594D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7F8D50F9-9B62-4A43-9B2D-F6890833594D}.Release|Any CPU.Build.0 = Release|Any CPU - {3E841D29-B9CC-4C42-8F43-950DCCCC509C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3E841D29-B9CC-4C42-8F43-950DCCCC509C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3E841D29-B9CC-4C42-8F43-950DCCCC509C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3E841D29-B9CC-4C42-8F43-950DCCCC509C}.Release|Any CPU.Build.0 = Release|Any CPU - {BFED6CC1-EB1E-44F1-98CF-51DCBA6B3EA5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BFED6CC1-EB1E-44F1-98CF-51DCBA6B3EA5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BFED6CC1-EB1E-44F1-98CF-51DCBA6B3EA5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BFED6CC1-EB1E-44F1-98CF-51DCBA6B3EA5}.Release|Any CPU.Build.0 = Release|Any CPU - {0AD0F629-13D6-4479-8BC4-42CDB4233B4B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0AD0F629-13D6-4479-8BC4-42CDB4233B4B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0AD0F629-13D6-4479-8BC4-42CDB4233B4B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0AD0F629-13D6-4479-8BC4-42CDB4233B4B}.Release|Any CPU.Build.0 = Release|Any CPU - {840D973E-EF37-4E45-A507-55157EDB9961}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {840D973E-EF37-4E45-A507-55157EDB9961}.Debug|Any CPU.Build.0 = Debug|Any CPU - {840D973E-EF37-4E45-A507-55157EDB9961}.Release|Any CPU.ActiveCfg = Release|Any CPU - {840D973E-EF37-4E45-A507-55157EDB9961}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {76A9A322-A1C2-4853-B369-3BCA027319D2} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {B2F658E4-3D0F-4840-B666-0B6E96DEC603} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {80AE7FEF-51FA-4343-A78F-FF397FCA2C4E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {C4B316CF-D7C3-4A1C-81F1-C9C00ED40BE0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {B00CA348-8520-415D-A76A-03688EAA50DF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {F56799BC-04D6-47B8-B66B-7D9711A9C5DB} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0E4A4C0C-75FB-41FD-ABC9-4B3A6AFE3AA1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C9383C8C-C676-42FA-9644-E9BD75547127} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A769AA5E-7273-47D7-8CF5-4467B2D9B978} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D19CEBFA-0532-4510-A6E9-E88C1CC06A8C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {7F8D50F9-9B62-4A43-9B2D-F6890833594D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {3E841D29-B9CC-4C42-8F43-950DCCCC509C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {BFED6CC1-EB1E-44F1-98CF-51DCBA6B3EA5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0AD0F629-13D6-4479-8BC4-42CDB4233B4B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {840D973E-EF37-4E45-A507-55157EDB9961} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {F56799BC-04D6-47B8-B66B-7D9711A9C5DB} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0E4A4C0C-75FB-41FD-ABC9-4B3A6AFE3AA1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C9383C8C-C676-42FA-9644-E9BD75547127} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A769AA5E-7273-47D7-8CF5-4467B2D9B978} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D19CEBFA-0532-4510-A6E9-E88C1CC06A8C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {7F8D50F9-9B62-4A43-9B2D-F6890833594D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {3E841D29-B9CC-4C42-8F43-950DCCCC509C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {BFED6CC1-EB1E-44F1-98CF-51DCBA6B3EA5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0AD0F629-13D6-4479-8BC4-42CDB4233B4B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {840D973E-EF37-4E45-A507-55157EDB9961} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {0654CFBF-A3A3-43B4-A517-99FF1B8547CD} diff --git a/sdk/src/Services/Bedrock/Generated/AmazonBedrockConfig.cs b/sdk/src/Services/Bedrock/Generated/AmazonBedrockConfig.cs index 8342fb9f86d6..9aedcc908d9c 100644 --- a/sdk/src/Services/Bedrock/Generated/AmazonBedrockConfig.cs +++ b/sdk/src/Services/Bedrock/Generated/AmazonBedrockConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.Bedrock public partial class AmazonBedrockConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("Bedrock", "4.0.0.0"); private static readonly AmazonBedrockEndpointResolver EndpointResolver = new AmazonBedrockEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("Bedrock", "3.7.406.3"); -======= - InternalSDKUtils.BuildUserAgentString("Bedrock", "3.7.409.11"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/Bedrock/Generated/Model/GetImportedModelResponse.cs b/sdk/src/Services/Bedrock/Generated/Model/GetImportedModelResponse.cs index 6ce9355e5e51..a918a5094926 100644 --- a/sdk/src/Services/Bedrock/Generated/Model/GetImportedModelResponse.cs +++ b/sdk/src/Services/Bedrock/Generated/Model/GetImportedModelResponse.cs @@ -68,9 +68,9 @@ internal bool IsSetCreationTime() /// Specifies if the imported model supports converse. /// /// - public bool InstructSupported + public bool? InstructSupported { - get { return this._instructSupported.GetValueOrDefault(); } + get { return this._instructSupported; } set { this._instructSupported = value; } } diff --git a/sdk/src/Services/Bedrock/Generated/Model/ImportedModelSummary.cs b/sdk/src/Services/Bedrock/Generated/Model/ImportedModelSummary.cs index 1de577c9f89d..91e5c05ce32a 100644 --- a/sdk/src/Services/Bedrock/Generated/Model/ImportedModelSummary.cs +++ b/sdk/src/Services/Bedrock/Generated/Model/ImportedModelSummary.cs @@ -65,9 +65,9 @@ internal bool IsSetCreationTime() /// Specifies if the imported model supports converse. /// /// - public bool InstructSupported + public bool? InstructSupported { - get { return this._instructSupported.GetValueOrDefault(); } + get { return this._instructSupported; } set { this._instructSupported = value; } } diff --git a/sdk/src/Services/Bedrock/Generated/Model/Internal/MarshallTransformations/CreateInferenceProfileRequestMarshaller.cs b/sdk/src/Services/Bedrock/Generated/Model/Internal/MarshallTransformations/CreateInferenceProfileRequestMarshaller.cs index 3c0788fef447..dcc48ec1b6df 100644 --- a/sdk/src/Services/Bedrock/Generated/Model/Internal/MarshallTransformations/CreateInferenceProfileRequestMarshaller.cs +++ b/sdk/src/Services/Bedrock/Generated/Model/Internal/MarshallTransformations/CreateInferenceProfileRequestMarshaller.cs @@ -61,65 +61,68 @@ public IRequest Marshall(CreateInferenceProfileRequest publicRequest) request.HttpMethod = "POST"; request.ResourcePath = "/inference-profiles"; - using (StringWriter stringWriter = new StringWriter(CultureInfo.InvariantCulture)) + using (MemoryStream memoryStream = new MemoryStream()) { - JsonWriter writer = new JsonWriter(stringWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetClientRequestToken()) + using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) { - context.Writer.WritePropertyName("clientRequestToken"); - context.Writer.Write(publicRequest.ClientRequestToken); - } - - else if(!(publicRequest.IsSetClientRequestToken())) - { - context.Writer.WritePropertyName("clientRequestToken"); - context.Writer.Write(Guid.NewGuid().ToString()); - } - if(publicRequest.IsSetDescription()) - { - context.Writer.WritePropertyName("description"); - context.Writer.Write(publicRequest.Description); - } - - if(publicRequest.IsSetInferenceProfileName()) - { - context.Writer.WritePropertyName("inferenceProfileName"); - context.Writer.Write(publicRequest.InferenceProfileName); - } - - if(publicRequest.IsSetModelSource()) - { - context.Writer.WritePropertyName("modelSource"); - context.Writer.WriteObjectStart(); + JsonWriter writer = new JsonWriter(streamWriter); + writer.Validate = false; + writer.WriteObjectStart(); + var context = new JsonMarshallerContext(request, writer); + if(publicRequest.IsSetClientRequestToken()) + { + context.Writer.WritePropertyName("clientRequestToken"); + context.Writer.Write(publicRequest.ClientRequestToken); + } - var marshaller = InferenceProfileModelSourceMarshaller.Instance; - marshaller.Marshall(publicRequest.ModelSource, context); + else if(!(publicRequest.IsSetClientRequestToken())) + { + context.Writer.WritePropertyName("clientRequestToken"); + context.Writer.Write(Guid.NewGuid().ToString()); + } + if(publicRequest.IsSetDescription()) + { + context.Writer.WritePropertyName("description"); + context.Writer.Write(publicRequest.Description); + } - context.Writer.WriteObjectEnd(); - } + if(publicRequest.IsSetInferenceProfileName()) + { + context.Writer.WritePropertyName("inferenceProfileName"); + context.Writer.Write(publicRequest.InferenceProfileName); + } - if(publicRequest.IsSetTags()) - { - context.Writer.WritePropertyName("tags"); - context.Writer.WriteArrayStart(); - foreach(var publicRequestTagsListValue in publicRequest.Tags) + if(publicRequest.IsSetModelSource()) { + context.Writer.WritePropertyName("modelSource"); context.Writer.WriteObjectStart(); - var marshaller = TagMarshaller.Instance; - marshaller.Marshall(publicRequestTagsListValue, context); + var marshaller = InferenceProfileModelSourceMarshaller.Instance; + marshaller.Marshall(publicRequest.ModelSource, context); context.Writer.WriteObjectEnd(); } - context.Writer.WriteArrayEnd(); + + if(publicRequest.IsSetTags()) + { + context.Writer.WritePropertyName("tags"); + context.Writer.WriteArrayStart(); + foreach(var publicRequestTagsListValue in publicRequest.Tags) + { + context.Writer.WriteObjectStart(); + + var marshaller = TagMarshaller.Instance; + marshaller.Marshall(publicRequestTagsListValue, context); + + context.Writer.WriteObjectEnd(); + } + context.Writer.WriteArrayEnd(); + } + + writer.WriteObjectEnd(); } - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); + request.Content = memoryStream.ToArray(); } diff --git a/sdk/src/Services/Bedrock/Generated/Model/Internal/MarshallTransformations/GetImportedModelResponseUnmarshaller.cs b/sdk/src/Services/Bedrock/Generated/Model/Internal/MarshallTransformations/GetImportedModelResponseUnmarshaller.cs index 72ae88b11938..fb3a440acdaf 100644 --- a/sdk/src/Services/Bedrock/Generated/Model/Internal/MarshallTransformations/GetImportedModelResponseUnmarshaller.cs +++ b/sdk/src/Services/Bedrock/Generated/Model/Internal/MarshallTransformations/GetImportedModelResponseUnmarshaller.cs @@ -60,7 +60,7 @@ public override AmazonWebServiceResponse Unmarshall(JsonUnmarshallerContext cont } if (context.TestExpression("instructSupported", targetDepth)) { - var unmarshaller = BoolUnmarshaller.Instance; + var unmarshaller = NullableBoolUnmarshaller.Instance; response.InstructSupported = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/Bedrock/Generated/Model/Internal/MarshallTransformations/ImportedModelSummaryUnmarshaller.cs b/sdk/src/Services/Bedrock/Generated/Model/Internal/MarshallTransformations/ImportedModelSummaryUnmarshaller.cs index 25a72ffcd120..b4e4296ff9df 100644 --- a/sdk/src/Services/Bedrock/Generated/Model/Internal/MarshallTransformations/ImportedModelSummaryUnmarshaller.cs +++ b/sdk/src/Services/Bedrock/Generated/Model/Internal/MarshallTransformations/ImportedModelSummaryUnmarshaller.cs @@ -74,7 +74,7 @@ public ImportedModelSummary Unmarshall(JsonUnmarshallerContext context) } if (context.TestExpression("instructSupported", targetDepth)) { - var unmarshaller = BoolUnmarshaller.Instance; + var unmarshaller = NullableBoolUnmarshaller.Instance; unmarshalledObject.InstructSupported = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/Bedrock/Generated/_bcl/AmazonBedrockClient.cs b/sdk/src/Services/Bedrock/Generated/_bcl/AmazonBedrockClient.cs index 7d0447694e4f..d0225e801922 100644 --- a/sdk/src/Services/Bedrock/Generated/_bcl/AmazonBedrockClient.cs +++ b/sdk/src/Services/Bedrock/Generated/_bcl/AmazonBedrockClient.cs @@ -706,6 +706,115 @@ public virtual CreateGuardrailVersionResponse CreateGuardrailVersion(CreateGuard #endregion + #region CreateInferenceProfile + + + /// + /// Creates an application inference profile to track metrics and costs when invoking + /// a model. To create an application inference profile for a foundation model in one + /// region, specify the ARN of the model in that region. To create an application inference + /// profile for a foundation model across multiple regions, specify the ARN of the system-defined + /// inference profile that contains the regions that you want to route requests to. For + /// more information, see Increase + /// throughput and resilience with cross-region inference in Amazon Bedrock. in the + /// Amazon Bedrock User Guide. + /// + /// Container for the necessary parameters to execute the CreateInferenceProfile service method. + /// + /// The response from the CreateInferenceProfile service method, as returned by Bedrock. + /// + /// The request is denied because of missing access permissions. + /// + /// + /// Error occurred because of a conflict while performing an operation. + /// + /// + /// An internal server error occurred. Retry your request. + /// + /// + /// The specified resource Amazon Resource Name (ARN) was not found. Check the Amazon + /// Resource Name (ARN) and try your request again. + /// + /// + /// The number of requests exceeds the service quota. Resubmit your request later. + /// + /// + /// The number of requests exceeds the limit. Resubmit your request later. + /// + /// + /// The request contains more tags than can be associated with a resource (50 tags per + /// resource). The maximum number of tags includes both existing tags and those included + /// in your current request. + /// + /// + /// Input validation failed. Check your request parameters and retry the request. + /// + /// REST API Reference for CreateInferenceProfile Operation + public virtual CreateInferenceProfileResponse CreateInferenceProfile(CreateInferenceProfileRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = CreateInferenceProfileRequestMarshaller.Instance; + options.ResponseUnmarshaller = CreateInferenceProfileResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// Creates an application inference profile to track metrics and costs when invoking + /// a model. To create an application inference profile for a foundation model in one + /// region, specify the ARN of the model in that region. To create an application inference + /// profile for a foundation model across multiple regions, specify the ARN of the system-defined + /// inference profile that contains the regions that you want to route requests to. For + /// more information, see Increase + /// throughput and resilience with cross-region inference in Amazon Bedrock. in the + /// Amazon Bedrock User Guide. + /// + /// Container for the necessary parameters to execute the CreateInferenceProfile service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the CreateInferenceProfile service method, as returned by Bedrock. + /// + /// The request is denied because of missing access permissions. + /// + /// + /// Error occurred because of a conflict while performing an operation. + /// + /// + /// An internal server error occurred. Retry your request. + /// + /// + /// The specified resource Amazon Resource Name (ARN) was not found. Check the Amazon + /// Resource Name (ARN) and try your request again. + /// + /// + /// The number of requests exceeds the service quota. Resubmit your request later. + /// + /// + /// The number of requests exceeds the limit. Resubmit your request later. + /// + /// + /// The request contains more tags than can be associated with a resource (50 tags per + /// resource). The maximum number of tags includes both existing tags and those included + /// in your current request. + /// + /// + /// Input validation failed. Check your request parameters and retry the request. + /// + /// REST API Reference for CreateInferenceProfile Operation + public virtual Task CreateInferenceProfileAsync(CreateInferenceProfileRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = CreateInferenceProfileRequestMarshaller.Instance; + options.ResponseUnmarshaller = CreateInferenceProfileResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + #region CreateModelCopyJob @@ -1498,6 +1607,89 @@ public virtual DeleteImportedModelResponse DeleteImportedModel(DeleteImportedMod #endregion + #region DeleteInferenceProfile + + + /// + /// Deletes an application inference profile. For more information, see Increase + /// throughput and resilience with cross-region inference in Amazon Bedrock. in the + /// Amazon Bedrock User Guide. + /// + /// Container for the necessary parameters to execute the DeleteInferenceProfile service method. + /// + /// The response from the DeleteInferenceProfile service method, as returned by Bedrock. + /// + /// The request is denied because of missing access permissions. + /// + /// + /// Error occurred because of a conflict while performing an operation. + /// + /// + /// An internal server error occurred. Retry your request. + /// + /// + /// The specified resource Amazon Resource Name (ARN) was not found. Check the Amazon + /// Resource Name (ARN) and try your request again. + /// + /// + /// The number of requests exceeds the limit. Resubmit your request later. + /// + /// + /// Input validation failed. Check your request parameters and retry the request. + /// + /// REST API Reference for DeleteInferenceProfile Operation + public virtual DeleteInferenceProfileResponse DeleteInferenceProfile(DeleteInferenceProfileRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = DeleteInferenceProfileRequestMarshaller.Instance; + options.ResponseUnmarshaller = DeleteInferenceProfileResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// Deletes an application inference profile. For more information, see Increase + /// throughput and resilience with cross-region inference in Amazon Bedrock. in the + /// Amazon Bedrock User Guide. + /// + /// Container for the necessary parameters to execute the DeleteInferenceProfile service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the DeleteInferenceProfile service method, as returned by Bedrock. + /// + /// The request is denied because of missing access permissions. + /// + /// + /// Error occurred because of a conflict while performing an operation. + /// + /// + /// An internal server error occurred. Retry your request. + /// + /// + /// The specified resource Amazon Resource Name (ARN) was not found. Check the Amazon + /// Resource Name (ARN) and try your request again. + /// + /// + /// The number of requests exceeds the limit. Resubmit your request later. + /// + /// + /// Input validation failed. Check your request parameters and retry the request. + /// + /// REST API Reference for DeleteInferenceProfile Operation + public virtual Task DeleteInferenceProfileAsync(DeleteInferenceProfileRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = DeleteInferenceProfileRequestMarshaller.Instance; + options.ResponseUnmarshaller = DeleteInferenceProfileResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + #region DeleteModelInvocationLoggingConfiguration @@ -2023,8 +2215,9 @@ public virtual GetImportedModelResponse GetImportedModel(GetImportedModelRequest /// - /// Gets information about an inference profile. For more information, see the Amazon - /// Bedrock User Guide. + /// Gets information about an inference profile. For more information, see Increase + /// throughput and resilience with cross-region inference in Amazon Bedrock. in the + /// Amazon Bedrock User Guide. /// /// Container for the necessary parameters to execute the GetInferenceProfile service method. /// @@ -2057,8 +2250,9 @@ public virtual GetInferenceProfileResponse GetInferenceProfile(GetInferenceProfi /// - /// Gets information about an inference profile. For more information, see the Amazon - /// Bedrock User Guide. + /// Gets information about an inference profile. For more information, see Increase + /// throughput and resilience with cross-region inference in Amazon Bedrock. in the + /// Amazon Bedrock User Guide. /// /// Container for the necessary parameters to execute the GetInferenceProfile service method. /// @@ -2927,7 +3121,10 @@ public virtual ListImportedModelsResponse ListImportedModels(ListImportedModelsR /// - /// Returns a list of inference profiles that you can use. + /// Returns a list of inference profiles that you can use. For more information, see Increase + /// throughput and resilience with cross-region inference in Amazon Bedrock. in the + /// Amazon Bedrock User Guide. /// /// Container for the necessary parameters to execute the ListInferenceProfiles service method. /// @@ -2956,7 +3153,10 @@ public virtual ListInferenceProfilesResponse ListInferenceProfiles(ListInference /// - /// Returns a list of inference profiles that you can use. + /// Returns a list of inference profiles that you can use. For more information, see Increase + /// throughput and resilience with cross-region inference in Amazon Bedrock. in the + /// Amazon Bedrock User Guide. /// /// Container for the necessary parameters to execute the ListInferenceProfiles service method. /// @@ -3363,7 +3563,7 @@ public virtual ListProvisionedModelThroughputsResponse ListProvisionedModelThrou /// /// /// - /// For more information, see Tagging + /// For more information, see Tagging /// resources in the Amazon /// Bedrock User Guide. /// @@ -3403,7 +3603,7 @@ public virtual ListTagsForResourceResponse ListTagsForResource(ListTagsForResour /// /// /// - /// For more information, see Tagging + /// For more information, see Tagging /// resources in the Amazon /// Bedrock User Guide. /// @@ -3756,7 +3956,7 @@ public virtual StopModelInvocationJobResponse StopModelInvocationJob(StopModelIn /// - /// Associate tags with a resource. For more information, see Tagging + /// Associate tags with a resource. For more information, see Tagging /// resources in the Amazon /// Bedrock User Guide. /// @@ -3796,7 +3996,7 @@ public virtual TagResourceResponse TagResource(TagResourceRequest request) /// - /// Associate tags with a resource. For more information, see Tagging + /// Associate tags with a resource. For more information, see Tagging /// resources in the Amazon /// Bedrock User Guide. /// @@ -3843,7 +4043,7 @@ public virtual TagResourceResponse TagResource(TagResourceRequest request) /// - /// Remove one or more tags from a resource. For more information, see Tagging + /// Remove one or more tags from a resource. For more information, see Tagging /// resources in the Amazon /// Bedrock User Guide. /// @@ -3878,7 +4078,7 @@ public virtual UntagResourceResponse UntagResource(UntagResourceRequest request) /// - /// Remove one or more tags from a resource. For more information, see Tagging + /// Remove one or more tags from a resource. For more information, see Tagging /// resources in the Amazon /// Bedrock User Guide. /// diff --git a/sdk/src/Services/Bedrock/Properties/AssemblyInfo.cs b/sdk/src/Services/Bedrock/Properties/AssemblyInfo.cs index be6890a3c2ce..d8f55a653072 100644 --- a/sdk/src/Services/Bedrock/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/Bedrock/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.406.3")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.409.11")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/BedrockAgent/BedrockAgent.sln b/sdk/src/Services/BedrockAgent/BedrockAgent.sln index be9c97e961a1..11440d079cde 100644 --- a/sdk/src/Services/BedrockAgent/BedrockAgent.sln +++ b/sdk/src/Services/BedrockAgent/BedrockAgent.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {D8D64A1D-CD24-4E49-B490-B41262061956}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {D8D64A1D-CD24-4E49-B490-B41262061956}.Debug|Any CPU.Build.0 = Debug|Any CPU {D8D64A1D-CD24-4E49-B490-B41262061956}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {9583FF68-ACD8-4B5F-AD2A-FD3C067FC911}.Debug|Any CPU.Build.0 = Debug|Any CPU {9583FF68-ACD8-4B5F-AD2A-FD3C067FC911}.Release|Any CPU.ActiveCfg = Release|Any CPU {9583FF68-ACD8-4B5F-AD2A-FD3C067FC911}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {6B254542-97E8-4FAE-B691-5C4B4C4242A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6B254542-97E8-4FAE-B691-5C4B4C4242A2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6B254542-97E8-4FAE-B691-5C4B4C4242A2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6B254542-97E8-4FAE-B691-5C4B4C4242A2}.Release|Any CPU.Build.0 = Release|Any CPU - {307D023A-0A00-48E4-831C-DBD21ADFC8BB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {307D023A-0A00-48E4-831C-DBD21ADFC8BB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {307D023A-0A00-48E4-831C-DBD21ADFC8BB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {307D023A-0A00-48E4-831C-DBD21ADFC8BB}.Release|Any CPU.Build.0 = Release|Any CPU - {9FD98727-FA8F-4947-A213-5DFB3AA8544A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9FD98727-FA8F-4947-A213-5DFB3AA8544A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9FD98727-FA8F-4947-A213-5DFB3AA8544A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9FD98727-FA8F-4947-A213-5DFB3AA8544A}.Release|Any CPU.Build.0 = Release|Any CPU - {7009FFB3-E681-42FB-AA64-EB7000D0E370}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7009FFB3-E681-42FB-AA64-EB7000D0E370}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7009FFB3-E681-42FB-AA64-EB7000D0E370}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7009FFB3-E681-42FB-AA64-EB7000D0E370}.Release|Any CPU.Build.0 = Release|Any CPU - {18E0EF53-9901-4A2E-89FB-91E556FF8440}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {18E0EF53-9901-4A2E-89FB-91E556FF8440}.Debug|Any CPU.Build.0 = Debug|Any CPU - {18E0EF53-9901-4A2E-89FB-91E556FF8440}.Release|Any CPU.ActiveCfg = Release|Any CPU - {18E0EF53-9901-4A2E-89FB-91E556FF8440}.Release|Any CPU.Build.0 = Release|Any CPU - {8BE76156-4A5D-48D8-8628-5E9EEB33C8ED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8BE76156-4A5D-48D8-8628-5E9EEB33C8ED}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8BE76156-4A5D-48D8-8628-5E9EEB33C8ED}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8BE76156-4A5D-48D8-8628-5E9EEB33C8ED}.Release|Any CPU.Build.0 = Release|Any CPU - {4DEAF91B-118C-4927-8FE5-B9EEC92342EA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4DEAF91B-118C-4927-8FE5-B9EEC92342EA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4DEAF91B-118C-4927-8FE5-B9EEC92342EA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4DEAF91B-118C-4927-8FE5-B9EEC92342EA}.Release|Any CPU.Build.0 = Release|Any CPU - {824B7E06-E146-4C86-903D-D46FA4937F24}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {824B7E06-E146-4C86-903D-D46FA4937F24}.Debug|Any CPU.Build.0 = Debug|Any CPU - {824B7E06-E146-4C86-903D-D46FA4937F24}.Release|Any CPU.ActiveCfg = Release|Any CPU - {824B7E06-E146-4C86-903D-D46FA4937F24}.Release|Any CPU.Build.0 = Release|Any CPU - {06C39026-2A4C-46BB-ACB4-D551F4EF4002}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {06C39026-2A4C-46BB-ACB4-D551F4EF4002}.Debug|Any CPU.Build.0 = Debug|Any CPU - {06C39026-2A4C-46BB-ACB4-D551F4EF4002}.Release|Any CPU.ActiveCfg = Release|Any CPU - {06C39026-2A4C-46BB-ACB4-D551F4EF4002}.Release|Any CPU.Build.0 = Release|Any CPU - {B46CBC37-809D-45C3-A831-1CFD96B0497B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B46CBC37-809D-45C3-A831-1CFD96B0497B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B46CBC37-809D-45C3-A831-1CFD96B0497B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B46CBC37-809D-45C3-A831-1CFD96B0497B}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {6B254542-97E8-4FAE-B691-5C4B4C4242A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6B254542-97E8-4FAE-B691-5C4B4C4242A2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6B254542-97E8-4FAE-B691-5C4B4C4242A2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6B254542-97E8-4FAE-B691-5C4B4C4242A2}.Release|Any CPU.Build.0 = Release|Any CPU - {307D023A-0A00-48E4-831C-DBD21ADFC8BB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {307D023A-0A00-48E4-831C-DBD21ADFC8BB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {307D023A-0A00-48E4-831C-DBD21ADFC8BB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {307D023A-0A00-48E4-831C-DBD21ADFC8BB}.Release|Any CPU.Build.0 = Release|Any CPU - {9FD98727-FA8F-4947-A213-5DFB3AA8544A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9FD98727-FA8F-4947-A213-5DFB3AA8544A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9FD98727-FA8F-4947-A213-5DFB3AA8544A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9FD98727-FA8F-4947-A213-5DFB3AA8544A}.Release|Any CPU.Build.0 = Release|Any CPU - {7009FFB3-E681-42FB-AA64-EB7000D0E370}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7009FFB3-E681-42FB-AA64-EB7000D0E370}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7009FFB3-E681-42FB-AA64-EB7000D0E370}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7009FFB3-E681-42FB-AA64-EB7000D0E370}.Release|Any CPU.Build.0 = Release|Any CPU - {18E0EF53-9901-4A2E-89FB-91E556FF8440}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {18E0EF53-9901-4A2E-89FB-91E556FF8440}.Debug|Any CPU.Build.0 = Debug|Any CPU - {18E0EF53-9901-4A2E-89FB-91E556FF8440}.Release|Any CPU.ActiveCfg = Release|Any CPU - {18E0EF53-9901-4A2E-89FB-91E556FF8440}.Release|Any CPU.Build.0 = Release|Any CPU - {8BE76156-4A5D-48D8-8628-5E9EEB33C8ED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8BE76156-4A5D-48D8-8628-5E9EEB33C8ED}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8BE76156-4A5D-48D8-8628-5E9EEB33C8ED}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8BE76156-4A5D-48D8-8628-5E9EEB33C8ED}.Release|Any CPU.Build.0 = Release|Any CPU - {4DEAF91B-118C-4927-8FE5-B9EEC92342EA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4DEAF91B-118C-4927-8FE5-B9EEC92342EA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4DEAF91B-118C-4927-8FE5-B9EEC92342EA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4DEAF91B-118C-4927-8FE5-B9EEC92342EA}.Release|Any CPU.Build.0 = Release|Any CPU - {824B7E06-E146-4C86-903D-D46FA4937F24}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {824B7E06-E146-4C86-903D-D46FA4937F24}.Debug|Any CPU.Build.0 = Debug|Any CPU - {824B7E06-E146-4C86-903D-D46FA4937F24}.Release|Any CPU.ActiveCfg = Release|Any CPU - {824B7E06-E146-4C86-903D-D46FA4937F24}.Release|Any CPU.Build.0 = Release|Any CPU - {06C39026-2A4C-46BB-ACB4-D551F4EF4002}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {06C39026-2A4C-46BB-ACB4-D551F4EF4002}.Debug|Any CPU.Build.0 = Debug|Any CPU - {06C39026-2A4C-46BB-ACB4-D551F4EF4002}.Release|Any CPU.ActiveCfg = Release|Any CPU - {06C39026-2A4C-46BB-ACB4-D551F4EF4002}.Release|Any CPU.Build.0 = Release|Any CPU - {B46CBC37-809D-45C3-A831-1CFD96B0497B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B46CBC37-809D-45C3-A831-1CFD96B0497B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B46CBC37-809D-45C3-A831-1CFD96B0497B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B46CBC37-809D-45C3-A831-1CFD96B0497B}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {D8D64A1D-CD24-4E49-B490-B41262061956} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {0DF85CA7-A708-47CE-9A03-1F76244DA3FA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {E279A9D6-F889-4CA8-B0BB-4F74DDE9AA11} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {EC093131-0055-4857-A0B0-23786BA361C3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {9583FF68-ACD8-4B5F-AD2A-FD3C067FC911} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {6B254542-97E8-4FAE-B691-5C4B4C4242A2} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {307D023A-0A00-48E4-831C-DBD21ADFC8BB} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {9FD98727-FA8F-4947-A213-5DFB3AA8544A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {7009FFB3-E681-42FB-AA64-EB7000D0E370} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {18E0EF53-9901-4A2E-89FB-91E556FF8440} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8BE76156-4A5D-48D8-8628-5E9EEB33C8ED} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4DEAF91B-118C-4927-8FE5-B9EEC92342EA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {824B7E06-E146-4C86-903D-D46FA4937F24} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {06C39026-2A4C-46BB-ACB4-D551F4EF4002} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B46CBC37-809D-45C3-A831-1CFD96B0497B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {6B254542-97E8-4FAE-B691-5C4B4C4242A2} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {307D023A-0A00-48E4-831C-DBD21ADFC8BB} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {9FD98727-FA8F-4947-A213-5DFB3AA8544A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {7009FFB3-E681-42FB-AA64-EB7000D0E370} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {18E0EF53-9901-4A2E-89FB-91E556FF8440} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8BE76156-4A5D-48D8-8628-5E9EEB33C8ED} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4DEAF91B-118C-4927-8FE5-B9EEC92342EA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {824B7E06-E146-4C86-903D-D46FA4937F24} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {06C39026-2A4C-46BB-ACB4-D551F4EF4002} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B46CBC37-809D-45C3-A831-1CFD96B0497B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {8F5DAAA7-FCB3-41B2-9AD7-712B614F314F} diff --git a/sdk/src/Services/BedrockAgent/Generated/AmazonBedrockAgentConfig.cs b/sdk/src/Services/BedrockAgent/Generated/AmazonBedrockAgentConfig.cs index 9b9e26b4e797..42d9f3149ae9 100644 --- a/sdk/src/Services/BedrockAgent/Generated/AmazonBedrockAgentConfig.cs +++ b/sdk/src/Services/BedrockAgent/Generated/AmazonBedrockAgentConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.BedrockAgent public partial class AmazonBedrockAgentConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("Bedrock Agent", "4.0.0.0"); private static readonly AmazonBedrockAgentEndpointResolver EndpointResolver = new AmazonBedrockAgentEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("Bedrock Agent", "3.7.404.4"); -======= - InternalSDKUtils.BuildUserAgentString("Bedrock Agent", "3.7.409.7"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/BedrockAgent/Generated/Model/Internal/MarshallTransformations/PromptModelInferenceConfigurationMarshaller.cs b/sdk/src/Services/BedrockAgent/Generated/Model/Internal/MarshallTransformations/PromptModelInferenceConfigurationMarshaller.cs index e2a27d2e2639..91479fa608e2 100644 --- a/sdk/src/Services/BedrockAgent/Generated/Model/Internal/MarshallTransformations/PromptModelInferenceConfigurationMarshaller.cs +++ b/sdk/src/Services/BedrockAgent/Generated/Model/Internal/MarshallTransformations/PromptModelInferenceConfigurationMarshaller.cs @@ -78,22 +78,6 @@ public void Marshall(PromptModelInferenceConfiguration requestObject, JsonMarsha } } -<<<<<<< HEAD - if(requestObject.IsSetTopK()) - { - context.Writer.WritePropertyName("topK"); - context.Writer.Write(requestObject.TopK.Value); - } - -||||||| Commit version number update changes - if(requestObject.IsSetTopK()) - { - context.Writer.WritePropertyName("topK"); - context.Writer.Write(requestObject.TopK); - } - -======= ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b if(requestObject.IsSetTopP()) { context.Writer.WritePropertyName("topP"); diff --git a/sdk/src/Services/BedrockAgent/Generated/Model/Internal/MarshallTransformations/PromptModelInferenceConfigurationUnmarshaller.cs b/sdk/src/Services/BedrockAgent/Generated/Model/Internal/MarshallTransformations/PromptModelInferenceConfigurationUnmarshaller.cs index 7617195bdfba..5ab5a53546bd 100644 --- a/sdk/src/Services/BedrockAgent/Generated/Model/Internal/MarshallTransformations/PromptModelInferenceConfigurationUnmarshaller.cs +++ b/sdk/src/Services/BedrockAgent/Generated/Model/Internal/MarshallTransformations/PromptModelInferenceConfigurationUnmarshaller.cs @@ -84,22 +84,6 @@ public PromptModelInferenceConfiguration Unmarshall(JsonUnmarshallerContext cont unmarshalledObject.Temperature = unmarshaller.Unmarshall(context); continue; } -<<<<<<< HEAD - if (context.TestExpression("topK", targetDepth)) - { - var unmarshaller = NullableIntUnmarshaller.Instance; - unmarshalledObject.TopK = unmarshaller.Unmarshall(context); - continue; - } -||||||| Commit version number update changes - if (context.TestExpression("topK", targetDepth)) - { - var unmarshaller = IntUnmarshaller.Instance; - unmarshalledObject.TopK = unmarshaller.Unmarshall(context); - continue; - } -======= ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b if (context.TestExpression("topP", targetDepth)) { var unmarshaller = NullableFloatUnmarshaller.Instance; diff --git a/sdk/src/Services/BedrockAgent/Generated/Model/Internal/MarshallTransformations/ValidateFlowDefinitionRequestMarshaller.cs b/sdk/src/Services/BedrockAgent/Generated/Model/Internal/MarshallTransformations/ValidateFlowDefinitionRequestMarshaller.cs index 25d0f977e62b..e11d42deccef 100644 --- a/sdk/src/Services/BedrockAgent/Generated/Model/Internal/MarshallTransformations/ValidateFlowDefinitionRequestMarshaller.cs +++ b/sdk/src/Services/BedrockAgent/Generated/Model/Internal/MarshallTransformations/ValidateFlowDefinitionRequestMarshaller.cs @@ -61,26 +61,29 @@ public IRequest Marshall(ValidateFlowDefinitionRequest publicRequest) request.HttpMethod = "POST"; request.ResourcePath = "/flows/validate-definition"; - using (StringWriter stringWriter = new StringWriter(CultureInfo.InvariantCulture)) + using (MemoryStream memoryStream = new MemoryStream()) { - JsonWriter writer = new JsonWriter(stringWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetDefinition()) + using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) { - context.Writer.WritePropertyName("definition"); - context.Writer.WriteObjectStart(); + JsonWriter writer = new JsonWriter(streamWriter); + writer.Validate = false; + writer.WriteObjectStart(); + var context = new JsonMarshallerContext(request, writer); + if(publicRequest.IsSetDefinition()) + { + context.Writer.WritePropertyName("definition"); + context.Writer.WriteObjectStart(); - var marshaller = FlowDefinitionMarshaller.Instance; - marshaller.Marshall(publicRequest.Definition, context); + var marshaller = FlowDefinitionMarshaller.Instance; + marshaller.Marshall(publicRequest.Definition, context); - context.Writer.WriteObjectEnd(); + context.Writer.WriteObjectEnd(); + } + + writer.WriteObjectEnd(); } - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); + request.Content = memoryStream.ToArray(); } diff --git a/sdk/src/Services/BedrockAgent/Generated/Model/PromptModelInferenceConfiguration.cs b/sdk/src/Services/BedrockAgent/Generated/Model/PromptModelInferenceConfiguration.cs index 88d22274b9a7..f2b48af3f459 100644 --- a/sdk/src/Services/BedrockAgent/Generated/Model/PromptModelInferenceConfiguration.cs +++ b/sdk/src/Services/BedrockAgent/Generated/Model/PromptModelInferenceConfiguration.cs @@ -100,50 +100,6 @@ internal bool IsSetTemperature() } /// -<<<<<<< HEAD - /// Gets and sets the property TopK. - /// - /// The number of most-likely candidates that the model considers for the next token during - /// generation. - /// - /// - [AWSProperty(Min=0, Max=500)] - public int? TopK - { - get { return this._topk; } - set { this._topk = value; } - } - - // Check to see if TopK property is set - internal bool IsSetTopK() - { - return this._topk.HasValue; - } - - /// -||||||| Commit version number update changes - /// Gets and sets the property TopK. - /// - /// The number of most-likely candidates that the model considers for the next token during - /// generation. - /// - /// - [AWSProperty(Min=0, Max=500)] - public int TopK - { - get { return this._topk.GetValueOrDefault(); } - set { this._topk = value; } - } - - // Check to see if TopK property is set - internal bool IsSetTopK() - { - return this._topk.HasValue; - } - - /// -======= ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b /// Gets and sets the property TopP. /// /// The percentage of most-likely candidates that the model considers for the next token. diff --git a/sdk/src/Services/BedrockAgent/Generated/_bcl/AmazonBedrockAgentClient.cs b/sdk/src/Services/BedrockAgent/Generated/_bcl/AmazonBedrockAgentClient.cs index 9e9914ca2df1..f3c5ce950e92 100644 --- a/sdk/src/Services/BedrockAgent/Generated/_bcl/AmazonBedrockAgentClient.cs +++ b/sdk/src/Services/BedrockAgent/Generated/_bcl/AmazonBedrockAgentClient.cs @@ -1105,10 +1105,11 @@ public virtual CreateFlowVersionResponse CreateFlowVersion(CreateFlowVersionRequ /// - /// Creates a knowledge base that contains data sources from which information can be - /// queried and used by LLMs. To create a knowledge base, you must first set up your data - /// sources and configure a supported vector store. For more information, see Set - /// up your data for ingestion. + /// Creates a knowledge base. A knowledge base contains your data sources so that Large + /// Language Models (LLMs) can use your data. To create a knowledge base, you must first + /// set up your data sources and configure a supported vector store. For more information, + /// see Set + /// up a knowledge base. /// /// /// @@ -1194,10 +1195,11 @@ public virtual CreateKnowledgeBaseResponse CreateKnowledgeBase(CreateKnowledgeBa /// - /// Creates a knowledge base that contains data sources from which information can be - /// queried and used by LLMs. To create a knowledge base, you must first set up your data - /// sources and configure a supported vector store. For more information, see Set - /// up your data for ingestion. + /// Creates a knowledge base. A knowledge base contains your data sources so that Large + /// Language Models (LLMs) can use your data. To create a knowledge base, you must first + /// set up your data sources and configure a supported vector store. For more information, + /// see Set + /// up a knowledge base. /// /// /// @@ -3004,8 +3006,8 @@ public virtual GetFlowVersionResponse GetFlowVersion(GetFlowVersionRequest reque /// - /// Gets information about a ingestion job, in which a data source is added to a knowledge - /// base. + /// Gets information about a data ingestion job. Data sources are ingested into your knowledge + /// base so that Large Language Models (LLMs) can use your data. /// /// Container for the necessary parameters to execute the GetIngestionJob service method. /// @@ -3038,8 +3040,8 @@ public virtual GetIngestionJobResponse GetIngestionJob(GetIngestionJobRequest re /// - /// Gets information about a ingestion job, in which a data source is added to a knowledge - /// base. + /// Gets information about a data ingestion job. Data sources are ingested into your knowledge + /// base so that Large Language Models (LLMs) can use your data. /// /// Container for the necessary parameters to execute the GetIngestionJob service method. /// @@ -3880,7 +3882,8 @@ public virtual ListFlowVersionsResponse ListFlowVersions(ListFlowVersionsRequest /// - /// Lists the ingestion jobs for a data source and information about each of them. + /// Lists the data ingestion jobs for a data source. The list also includes information + /// about each job. /// /// Container for the necessary parameters to execute the ListIngestionJobs service method. /// @@ -3913,7 +3916,8 @@ public virtual ListIngestionJobsResponse ListIngestionJobs(ListIngestionJobsRequ /// - /// Lists the ingestion jobs for a data source and information about each of them. + /// Lists the data ingestion jobs for a data source. The list also includes information + /// about each job. /// /// Container for the necessary parameters to execute the ListIngestionJobs service method. /// @@ -3953,7 +3957,8 @@ public virtual ListIngestionJobsResponse ListIngestionJobs(ListIngestionJobsRequ /// - /// Lists the knowledge bases in an account and information about each of them. + /// Lists the knowledge bases in an account. The list also includesinformation about each + /// knowledge base. /// /// Container for the necessary parameters to execute the ListKnowledgeBases service method. /// @@ -3982,7 +3987,8 @@ public virtual ListKnowledgeBasesResponse ListKnowledgeBases(ListKnowledgeBasesR /// - /// Lists the knowledge bases in an account and information about each of them. + /// Lists the knowledge bases in an account. The list also includesinformation about each + /// knowledge base. /// /// Container for the necessary parameters to execute the ListKnowledgeBases service method. /// @@ -4346,7 +4352,8 @@ public virtual PrepareFlowResponse PrepareFlow(PrepareFlowRequest request) /// - /// Begins an ingestion job, in which a data source is added to a knowledge base. + /// Begins a data ingestion job. Data sources are ingested into your knowledge base so + /// that Large Language Models (LLMs) can use your data. /// /// Container for the necessary parameters to execute the StartIngestionJob service method. /// @@ -4385,7 +4392,8 @@ public virtual StartIngestionJobResponse StartIngestionJob(StartIngestionJobRequ /// - /// Begins an ingestion job, in which a data source is added to a knowledge base. + /// Begins a data ingestion job. Data sources are ingested into your knowledge base so + /// that Large Language Models (LLMs) can use your data. /// /// Container for the necessary parameters to execute the StartIngestionJob service method. /// @@ -4427,6 +4435,87 @@ public virtual StartIngestionJobResponse StartIngestionJob(StartIngestionJobRequ #endregion + #region StopIngestionJob + + + /// + /// Stops a currently running data ingestion job. You can send a StartIngestionJob + /// request again to ingest the rest of your data when you are ready. + /// + /// Container for the necessary parameters to execute the StopIngestionJob service method. + /// + /// The response from the StopIngestionJob service method, as returned by BedrockAgent. + /// + /// The request is denied because of missing access permissions. + /// + /// + /// There was a conflict performing an operation. + /// + /// + /// An internal server error occurred. Retry your request. + /// + /// + /// The specified resource Amazon Resource Name (ARN) was not found. Check the Amazon + /// Resource Name (ARN) and try your request again. + /// + /// + /// The number of requests exceeds the limit. Resubmit your request later. + /// + /// + /// Input validation failed. Check your request parameters and retry the request. + /// + /// REST API Reference for StopIngestionJob Operation + public virtual StopIngestionJobResponse StopIngestionJob(StopIngestionJobRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = StopIngestionJobRequestMarshaller.Instance; + options.ResponseUnmarshaller = StopIngestionJobResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// Stops a currently running data ingestion job. You can send a StartIngestionJob + /// request again to ingest the rest of your data when you are ready. + /// + /// Container for the necessary parameters to execute the StopIngestionJob service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the StopIngestionJob service method, as returned by BedrockAgent. + /// + /// The request is denied because of missing access permissions. + /// + /// + /// There was a conflict performing an operation. + /// + /// + /// An internal server error occurred. Retry your request. + /// + /// + /// The specified resource Amazon Resource Name (ARN) was not found. Check the Amazon + /// Resource Name (ARN) and try your request again. + /// + /// + /// The number of requests exceeds the limit. Resubmit your request later. + /// + /// + /// Input validation failed. Check your request parameters and retry the request. + /// + /// REST API Reference for StopIngestionJob Operation + public virtual Task StopIngestionJobAsync(StopIngestionJobRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = StopIngestionJobRequestMarshaller.Instance; + options.ResponseUnmarshaller = StopIngestionJobResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + #region TagResource @@ -5410,6 +5499,71 @@ public virtual UpdatePromptResponse UpdatePrompt(UpdatePromptRequest request) #endregion + #region ValidateFlowDefinition + + + /// + /// Validates the definition of a flow. + /// + /// Container for the necessary parameters to execute the ValidateFlowDefinition service method. + /// + /// The response from the ValidateFlowDefinition service method, as returned by BedrockAgent. + /// + /// The request is denied because of missing access permissions. + /// + /// + /// An internal server error occurred. Retry your request. + /// + /// + /// The number of requests exceeds the limit. Resubmit your request later. + /// + /// + /// Input validation failed. Check your request parameters and retry the request. + /// + /// REST API Reference for ValidateFlowDefinition Operation + public virtual ValidateFlowDefinitionResponse ValidateFlowDefinition(ValidateFlowDefinitionRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = ValidateFlowDefinitionRequestMarshaller.Instance; + options.ResponseUnmarshaller = ValidateFlowDefinitionResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// Validates the definition of a flow. + /// + /// Container for the necessary parameters to execute the ValidateFlowDefinition service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the ValidateFlowDefinition service method, as returned by BedrockAgent. + /// + /// The request is denied because of missing access permissions. + /// + /// + /// An internal server error occurred. Retry your request. + /// + /// + /// The number of requests exceeds the limit. Resubmit your request later. + /// + /// + /// Input validation failed. Check your request parameters and retry the request. + /// + /// REST API Reference for ValidateFlowDefinition Operation + public virtual Task ValidateFlowDefinitionAsync(ValidateFlowDefinitionRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = ValidateFlowDefinitionRequestMarshaller.Instance; + options.ResponseUnmarshaller = ValidateFlowDefinitionResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + #region DetermineServiceOperationEndpoint /// diff --git a/sdk/src/Services/BedrockAgent/Properties/AssemblyInfo.cs b/sdk/src/Services/BedrockAgent/Properties/AssemblyInfo.cs index b15a49a1f95d..e3dc81cb5588 100644 --- a/sdk/src/Services/BedrockAgent/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/BedrockAgent/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.404.4")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.409.7")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/BedrockAgentRuntime/BedrockAgentRuntime.sln b/sdk/src/Services/BedrockAgentRuntime/BedrockAgentRuntime.sln index 19bc962034b3..e04529ce0b16 100644 --- a/sdk/src/Services/BedrockAgentRuntime/BedrockAgentRuntime.sln +++ b/sdk/src/Services/BedrockAgentRuntime/BedrockAgentRuntime.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {1CD248ED-01D5-4E38-A0B8-E135DC1D52FE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {1CD248ED-01D5-4E38-A0B8-E135DC1D52FE}.Debug|Any CPU.Build.0 = Debug|Any CPU {1CD248ED-01D5-4E38-A0B8-E135DC1D52FE}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {128204E5-C199-4A62-8C21-016D69F7282B}.Debug|Any CPU.Build.0 = Debug|Any CPU {128204E5-C199-4A62-8C21-016D69F7282B}.Release|Any CPU.ActiveCfg = Release|Any CPU {128204E5-C199-4A62-8C21-016D69F7282B}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {19096EFA-0C04-4189-810A-1298D79CC737}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {19096EFA-0C04-4189-810A-1298D79CC737}.Debug|Any CPU.Build.0 = Debug|Any CPU - {19096EFA-0C04-4189-810A-1298D79CC737}.Release|Any CPU.ActiveCfg = Release|Any CPU - {19096EFA-0C04-4189-810A-1298D79CC737}.Release|Any CPU.Build.0 = Release|Any CPU - {1BFBAB26-D958-42E1-9D9C-63495E31A017}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1BFBAB26-D958-42E1-9D9C-63495E31A017}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1BFBAB26-D958-42E1-9D9C-63495E31A017}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1BFBAB26-D958-42E1-9D9C-63495E31A017}.Release|Any CPU.Build.0 = Release|Any CPU - {C7103658-7C54-4EE7-8E69-5603C4C48B62}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C7103658-7C54-4EE7-8E69-5603C4C48B62}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C7103658-7C54-4EE7-8E69-5603C4C48B62}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C7103658-7C54-4EE7-8E69-5603C4C48B62}.Release|Any CPU.Build.0 = Release|Any CPU - {AA8D0503-EC21-4737-A312-E8F96D5E9448}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AA8D0503-EC21-4737-A312-E8F96D5E9448}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AA8D0503-EC21-4737-A312-E8F96D5E9448}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AA8D0503-EC21-4737-A312-E8F96D5E9448}.Release|Any CPU.Build.0 = Release|Any CPU - {608E4B2A-CD19-4757-9146-EA780BC409EE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {608E4B2A-CD19-4757-9146-EA780BC409EE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {608E4B2A-CD19-4757-9146-EA780BC409EE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {608E4B2A-CD19-4757-9146-EA780BC409EE}.Release|Any CPU.Build.0 = Release|Any CPU - {F37AD497-8C4E-4CD3-A0A5-CFB2C00E0959}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F37AD497-8C4E-4CD3-A0A5-CFB2C00E0959}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F37AD497-8C4E-4CD3-A0A5-CFB2C00E0959}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F37AD497-8C4E-4CD3-A0A5-CFB2C00E0959}.Release|Any CPU.Build.0 = Release|Any CPU - {4B168289-961C-49D0-85D3-B105DEE3B9FF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4B168289-961C-49D0-85D3-B105DEE3B9FF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4B168289-961C-49D0-85D3-B105DEE3B9FF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4B168289-961C-49D0-85D3-B105DEE3B9FF}.Release|Any CPU.Build.0 = Release|Any CPU - {0CC380F3-3A3E-49B8-869B-C083F91E7277}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0CC380F3-3A3E-49B8-869B-C083F91E7277}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0CC380F3-3A3E-49B8-869B-C083F91E7277}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0CC380F3-3A3E-49B8-869B-C083F91E7277}.Release|Any CPU.Build.0 = Release|Any CPU - {13E7CB07-2736-4011-A966-BADD79EE70CE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {13E7CB07-2736-4011-A966-BADD79EE70CE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {13E7CB07-2736-4011-A966-BADD79EE70CE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {13E7CB07-2736-4011-A966-BADD79EE70CE}.Release|Any CPU.Build.0 = Release|Any CPU - {B5446AFF-2706-4C0C-B746-6E64C286E047}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B5446AFF-2706-4C0C-B746-6E64C286E047}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B5446AFF-2706-4C0C-B746-6E64C286E047}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B5446AFF-2706-4C0C-B746-6E64C286E047}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {19096EFA-0C04-4189-810A-1298D79CC737}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {19096EFA-0C04-4189-810A-1298D79CC737}.Debug|Any CPU.Build.0 = Debug|Any CPU - {19096EFA-0C04-4189-810A-1298D79CC737}.Release|Any CPU.ActiveCfg = Release|Any CPU - {19096EFA-0C04-4189-810A-1298D79CC737}.Release|Any CPU.Build.0 = Release|Any CPU - {1BFBAB26-D958-42E1-9D9C-63495E31A017}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1BFBAB26-D958-42E1-9D9C-63495E31A017}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1BFBAB26-D958-42E1-9D9C-63495E31A017}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1BFBAB26-D958-42E1-9D9C-63495E31A017}.Release|Any CPU.Build.0 = Release|Any CPU - {C7103658-7C54-4EE7-8E69-5603C4C48B62}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C7103658-7C54-4EE7-8E69-5603C4C48B62}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C7103658-7C54-4EE7-8E69-5603C4C48B62}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C7103658-7C54-4EE7-8E69-5603C4C48B62}.Release|Any CPU.Build.0 = Release|Any CPU - {AA8D0503-EC21-4737-A312-E8F96D5E9448}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AA8D0503-EC21-4737-A312-E8F96D5E9448}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AA8D0503-EC21-4737-A312-E8F96D5E9448}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AA8D0503-EC21-4737-A312-E8F96D5E9448}.Release|Any CPU.Build.0 = Release|Any CPU - {608E4B2A-CD19-4757-9146-EA780BC409EE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {608E4B2A-CD19-4757-9146-EA780BC409EE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {608E4B2A-CD19-4757-9146-EA780BC409EE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {608E4B2A-CD19-4757-9146-EA780BC409EE}.Release|Any CPU.Build.0 = Release|Any CPU - {F37AD497-8C4E-4CD3-A0A5-CFB2C00E0959}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F37AD497-8C4E-4CD3-A0A5-CFB2C00E0959}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F37AD497-8C4E-4CD3-A0A5-CFB2C00E0959}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F37AD497-8C4E-4CD3-A0A5-CFB2C00E0959}.Release|Any CPU.Build.0 = Release|Any CPU - {4B168289-961C-49D0-85D3-B105DEE3B9FF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4B168289-961C-49D0-85D3-B105DEE3B9FF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4B168289-961C-49D0-85D3-B105DEE3B9FF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4B168289-961C-49D0-85D3-B105DEE3B9FF}.Release|Any CPU.Build.0 = Release|Any CPU - {0CC380F3-3A3E-49B8-869B-C083F91E7277}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0CC380F3-3A3E-49B8-869B-C083F91E7277}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0CC380F3-3A3E-49B8-869B-C083F91E7277}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0CC380F3-3A3E-49B8-869B-C083F91E7277}.Release|Any CPU.Build.0 = Release|Any CPU - {13E7CB07-2736-4011-A966-BADD79EE70CE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {13E7CB07-2736-4011-A966-BADD79EE70CE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {13E7CB07-2736-4011-A966-BADD79EE70CE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {13E7CB07-2736-4011-A966-BADD79EE70CE}.Release|Any CPU.Build.0 = Release|Any CPU - {B5446AFF-2706-4C0C-B746-6E64C286E047}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B5446AFF-2706-4C0C-B746-6E64C286E047}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B5446AFF-2706-4C0C-B746-6E64C286E047}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B5446AFF-2706-4C0C-B746-6E64C286E047}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {1CD248ED-01D5-4E38-A0B8-E135DC1D52FE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {B72FB5D3-DA85-45F2-BF4F-006EAF8FF8B0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {515E37A3-A65E-4273-BF75-08BD3017823F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {AAD689B6-92DE-428A-929C-8435D389300D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {128204E5-C199-4A62-8C21-016D69F7282B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {19096EFA-0C04-4189-810A-1298D79CC737} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {1BFBAB26-D958-42E1-9D9C-63495E31A017} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C7103658-7C54-4EE7-8E69-5603C4C48B62} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {AA8D0503-EC21-4737-A312-E8F96D5E9448} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {608E4B2A-CD19-4757-9146-EA780BC409EE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F37AD497-8C4E-4CD3-A0A5-CFB2C00E0959} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4B168289-961C-49D0-85D3-B105DEE3B9FF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0CC380F3-3A3E-49B8-869B-C083F91E7277} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {13E7CB07-2736-4011-A966-BADD79EE70CE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B5446AFF-2706-4C0C-B746-6E64C286E047} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {19096EFA-0C04-4189-810A-1298D79CC737} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {1BFBAB26-D958-42E1-9D9C-63495E31A017} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C7103658-7C54-4EE7-8E69-5603C4C48B62} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {AA8D0503-EC21-4737-A312-E8F96D5E9448} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {608E4B2A-CD19-4757-9146-EA780BC409EE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F37AD497-8C4E-4CD3-A0A5-CFB2C00E0959} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4B168289-961C-49D0-85D3-B105DEE3B9FF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0CC380F3-3A3E-49B8-869B-C083F91E7277} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {13E7CB07-2736-4011-A966-BADD79EE70CE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B5446AFF-2706-4C0C-B746-6E64C286E047} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {E1D99735-2936-4B31-906A-2CE495AEA679} diff --git a/sdk/src/Services/BedrockAgentRuntime/Generated/AmazonBedrockAgentRuntimeConfig.cs b/sdk/src/Services/BedrockAgentRuntime/Generated/AmazonBedrockAgentRuntimeConfig.cs index 0a1e21120225..752bb757e03c 100644 --- a/sdk/src/Services/BedrockAgentRuntime/Generated/AmazonBedrockAgentRuntimeConfig.cs +++ b/sdk/src/Services/BedrockAgentRuntime/Generated/AmazonBedrockAgentRuntimeConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.BedrockAgentRuntime public partial class AmazonBedrockAgentRuntimeConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("Bedrock Agent Runtime", "4.0.0.0"); private static readonly AmazonBedrockAgentRuntimeEndpointResolver EndpointResolver = new AmazonBedrockAgentRuntimeEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("Bedrock Agent Runtime", "3.7.404.7"); -======= - InternalSDKUtils.BuildUserAgentString("Bedrock Agent Runtime", "3.7.407.6"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/BedrockAgentRuntime/Generated/Model/FlowTraceConditionNodeResultEvent.cs b/sdk/src/Services/BedrockAgentRuntime/Generated/Model/FlowTraceConditionNodeResultEvent.cs index 3ef219614059..7e8aeaa837ee 100644 --- a/sdk/src/Services/BedrockAgentRuntime/Generated/Model/FlowTraceConditionNodeResultEvent.cs +++ b/sdk/src/Services/BedrockAgentRuntime/Generated/Model/FlowTraceConditionNodeResultEvent.cs @@ -85,9 +85,9 @@ internal bool IsSetSatisfiedConditions() /// /// [AWSProperty(Required=true)] - public DateTime Timestamp + public DateTime? Timestamp { - get { return this._timestamp.GetValueOrDefault(); } + get { return this._timestamp; } set { this._timestamp = value; } } diff --git a/sdk/src/Services/BedrockAgentRuntime/Generated/Model/FlowTraceNodeInputEvent.cs b/sdk/src/Services/BedrockAgentRuntime/Generated/Model/FlowTraceNodeInputEvent.cs index 803a09d7f9a5..ddb1f7c986e1 100644 --- a/sdk/src/Services/BedrockAgentRuntime/Generated/Model/FlowTraceNodeInputEvent.cs +++ b/sdk/src/Services/BedrockAgentRuntime/Generated/Model/FlowTraceNodeInputEvent.cs @@ -84,9 +84,9 @@ internal bool IsSetNodeName() /// /// [AWSProperty(Required=true)] - public DateTime Timestamp + public DateTime? Timestamp { - get { return this._timestamp.GetValueOrDefault(); } + get { return this._timestamp; } set { this._timestamp = value; } } diff --git a/sdk/src/Services/BedrockAgentRuntime/Generated/Model/FlowTraceNodeOutputEvent.cs b/sdk/src/Services/BedrockAgentRuntime/Generated/Model/FlowTraceNodeOutputEvent.cs index 09a30d9bb606..aa3efe40eb3b 100644 --- a/sdk/src/Services/BedrockAgentRuntime/Generated/Model/FlowTraceNodeOutputEvent.cs +++ b/sdk/src/Services/BedrockAgentRuntime/Generated/Model/FlowTraceNodeOutputEvent.cs @@ -84,9 +84,9 @@ internal bool IsSetNodeName() /// /// [AWSProperty(Required=true)] - public DateTime Timestamp + public DateTime? Timestamp { - get { return this._timestamp.GetValueOrDefault(); } + get { return this._timestamp; } set { this._timestamp = value; } } diff --git a/sdk/src/Services/BedrockAgentRuntime/Generated/Model/Internal/MarshallTransformations/FlowTraceConditionNodeResultEventUnmarshaller.cs b/sdk/src/Services/BedrockAgentRuntime/Generated/Model/Internal/MarshallTransformations/FlowTraceConditionNodeResultEventUnmarshaller.cs index 94f400cad05f..67c42966d44e 100644 --- a/sdk/src/Services/BedrockAgentRuntime/Generated/Model/Internal/MarshallTransformations/FlowTraceConditionNodeResultEventUnmarshaller.cs +++ b/sdk/src/Services/BedrockAgentRuntime/Generated/Model/Internal/MarshallTransformations/FlowTraceConditionNodeResultEventUnmarshaller.cs @@ -80,7 +80,7 @@ public FlowTraceConditionNodeResultEvent Unmarshall(JsonUnmarshallerContext cont } if (context.TestExpression("timestamp", targetDepth)) { - var unmarshaller = DateTimeUnmarshaller.Instance; + var unmarshaller = NullableDateTimeUnmarshaller.Instance; unmarshalledObject.Timestamp = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/BedrockAgentRuntime/Generated/Model/Internal/MarshallTransformations/FlowTraceNodeInputEventUnmarshaller.cs b/sdk/src/Services/BedrockAgentRuntime/Generated/Model/Internal/MarshallTransformations/FlowTraceNodeInputEventUnmarshaller.cs index 4692d4b75ad5..b6f17ef060d0 100644 --- a/sdk/src/Services/BedrockAgentRuntime/Generated/Model/Internal/MarshallTransformations/FlowTraceNodeInputEventUnmarshaller.cs +++ b/sdk/src/Services/BedrockAgentRuntime/Generated/Model/Internal/MarshallTransformations/FlowTraceNodeInputEventUnmarshaller.cs @@ -80,7 +80,7 @@ public FlowTraceNodeInputEvent Unmarshall(JsonUnmarshallerContext context) } if (context.TestExpression("timestamp", targetDepth)) { - var unmarshaller = DateTimeUnmarshaller.Instance; + var unmarshaller = NullableDateTimeUnmarshaller.Instance; unmarshalledObject.Timestamp = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/BedrockAgentRuntime/Generated/Model/Internal/MarshallTransformations/FlowTraceNodeOutputEventUnmarshaller.cs b/sdk/src/Services/BedrockAgentRuntime/Generated/Model/Internal/MarshallTransformations/FlowTraceNodeOutputEventUnmarshaller.cs index e40dd570d7d7..c4f04592269f 100644 --- a/sdk/src/Services/BedrockAgentRuntime/Generated/Model/Internal/MarshallTransformations/FlowTraceNodeOutputEventUnmarshaller.cs +++ b/sdk/src/Services/BedrockAgentRuntime/Generated/Model/Internal/MarshallTransformations/FlowTraceNodeOutputEventUnmarshaller.cs @@ -80,7 +80,7 @@ public FlowTraceNodeOutputEvent Unmarshall(JsonUnmarshallerContext context) } if (context.TestExpression("timestamp", targetDepth)) { - var unmarshaller = DateTimeUnmarshaller.Instance; + var unmarshaller = NullableDateTimeUnmarshaller.Instance; unmarshalledObject.Timestamp = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/BedrockAgentRuntime/Generated/Model/Internal/MarshallTransformations/InvokeFlowRequestMarshaller.cs b/sdk/src/Services/BedrockAgentRuntime/Generated/Model/Internal/MarshallTransformations/InvokeFlowRequestMarshaller.cs index 3d0591949f5d..a6bc0fb52598 100644 --- a/sdk/src/Services/BedrockAgentRuntime/Generated/Model/Internal/MarshallTransformations/InvokeFlowRequestMarshaller.cs +++ b/sdk/src/Services/BedrockAgentRuntime/Generated/Model/Internal/MarshallTransformations/InvokeFlowRequestMarshaller.cs @@ -69,32 +69,18 @@ public IRequest Marshall(InvokeFlowRequest publicRequest) request.ResourcePath = "/flows/{flowIdentifier}/aliases/{flowAliasIdentifier}"; using (MemoryStream memoryStream = new MemoryStream()) { -<<<<<<< HEAD using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) -||||||| Commit version number update changes - JsonWriter writer = new JsonWriter(stringWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetInputs()) -======= - JsonWriter writer = new JsonWriter(stringWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetEnableTrace()) - { - context.Writer.WritePropertyName("enableTrace"); - context.Writer.Write(publicRequest.EnableTrace); - } - - if(publicRequest.IsSetInputs()) ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b { JsonWriter writer = new JsonWriter(streamWriter); writer.Validate = false; writer.WriteObjectStart(); var context = new JsonMarshallerContext(request, writer); + if(publicRequest.IsSetEnableTrace()) + { + context.Writer.WritePropertyName("enableTrace"); + context.Writer.Write(publicRequest.EnableTrace.Value); + } + if(publicRequest.IsSetInputs()) { context.Writer.WritePropertyName("inputs"); diff --git a/sdk/src/Services/BedrockAgentRuntime/Generated/Model/InvokeFlowRequest.cs b/sdk/src/Services/BedrockAgentRuntime/Generated/Model/InvokeFlowRequest.cs index 55f8a1791ee9..ae0eab41b69c 100644 --- a/sdk/src/Services/BedrockAgentRuntime/Generated/Model/InvokeFlowRequest.cs +++ b/sdk/src/Services/BedrockAgentRuntime/Generated/Model/InvokeFlowRequest.cs @@ -57,9 +57,9 @@ public partial class InvokeFlowRequest : AmazonBedrockAgentRuntimeRequest /// each step in your prompt flow by viewing its trace in Amazon Bedrock. /// /// - public bool EnableTrace + public bool? EnableTrace { - get { return this._enableTrace.GetValueOrDefault(); } + get { return this._enableTrace; } set { this._enableTrace = value; } } diff --git a/sdk/src/Services/BedrockAgentRuntime/Properties/AssemblyInfo.cs b/sdk/src/Services/BedrockAgentRuntime/Properties/AssemblyInfo.cs index 27dde4161813..9b550def233b 100644 --- a/sdk/src/Services/BedrockAgentRuntime/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/BedrockAgentRuntime/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.404.7")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.407.6")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/BedrockRuntime/BedrockRuntime.sln b/sdk/src/Services/BedrockRuntime/BedrockRuntime.sln index ea2b9f225c12..c1e6a3491ca0 100644 --- a/sdk/src/Services/BedrockRuntime/BedrockRuntime.sln +++ b/sdk/src/Services/BedrockRuntime/BedrockRuntime.sln @@ -92,7 +92,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {2FA7D8A5-03B9-451F-9F7C-E28D87F02924}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {2FA7D8A5-03B9-451F-9F7C-E28D87F02924}.Debug|Any CPU.Build.0 = Debug|Any CPU {2FA7D8A5-03B9-451F-9F7C-E28D87F02924}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -113,97 +120,6 @@ Global {41287313-83A5-425A-91C7-6175B9983C43}.Debug|Any CPU.Build.0 = Debug|Any CPU {41287313-83A5-425A-91C7-6175B9983C43}.Release|Any CPU.ActiveCfg = Release|Any CPU {41287313-83A5-425A-91C7-6175B9983C43}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {C783227B-DF4C-4B6F-82DA-DDF9985DEF50}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C783227B-DF4C-4B6F-82DA-DDF9985DEF50}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C783227B-DF4C-4B6F-82DA-DDF9985DEF50}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C783227B-DF4C-4B6F-82DA-DDF9985DEF50}.Release|Any CPU.Build.0 = Release|Any CPU - {42E39AB3-A736-45C5-826E-AC4BF6426F54}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {42E39AB3-A736-45C5-826E-AC4BF6426F54}.Debug|Any CPU.Build.0 = Debug|Any CPU - {42E39AB3-A736-45C5-826E-AC4BF6426F54}.Release|Any CPU.ActiveCfg = Release|Any CPU - {42E39AB3-A736-45C5-826E-AC4BF6426F54}.Release|Any CPU.Build.0 = Release|Any CPU - {8FF24B8C-C53D-4A4C-B39A-11A758FD5132}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8FF24B8C-C53D-4A4C-B39A-11A758FD5132}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8FF24B8C-C53D-4A4C-B39A-11A758FD5132}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8FF24B8C-C53D-4A4C-B39A-11A758FD5132}.Release|Any CPU.Build.0 = Release|Any CPU - {04192D32-B2D7-40A4-AF17-548ABDE6154A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {04192D32-B2D7-40A4-AF17-548ABDE6154A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {04192D32-B2D7-40A4-AF17-548ABDE6154A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {04192D32-B2D7-40A4-AF17-548ABDE6154A}.Release|Any CPU.Build.0 = Release|Any CPU - {BBE26CAD-6FCB-4520-B4DB-E4B7D4B92FDA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BBE26CAD-6FCB-4520-B4DB-E4B7D4B92FDA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BBE26CAD-6FCB-4520-B4DB-E4B7D4B92FDA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BBE26CAD-6FCB-4520-B4DB-E4B7D4B92FDA}.Release|Any CPU.Build.0 = Release|Any CPU - {2ACB88B6-F2A8-49D8-BDDB-3F20C4224062}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2ACB88B6-F2A8-49D8-BDDB-3F20C4224062}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2ACB88B6-F2A8-49D8-BDDB-3F20C4224062}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2ACB88B6-F2A8-49D8-BDDB-3F20C4224062}.Release|Any CPU.Build.0 = Release|Any CPU - {6A80C631-0D2F-4FDE-B932-2C977889CCD3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6A80C631-0D2F-4FDE-B932-2C977889CCD3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6A80C631-0D2F-4FDE-B932-2C977889CCD3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6A80C631-0D2F-4FDE-B932-2C977889CCD3}.Release|Any CPU.Build.0 = Release|Any CPU - {7BD5B7F3-2ED9-4747-9FCE-8F5622BFCC36}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7BD5B7F3-2ED9-4747-9FCE-8F5622BFCC36}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7BD5B7F3-2ED9-4747-9FCE-8F5622BFCC36}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7BD5B7F3-2ED9-4747-9FCE-8F5622BFCC36}.Release|Any CPU.Build.0 = Release|Any CPU - {EE034587-0A31-4841-A4BB-055DB990990F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EE034587-0A31-4841-A4BB-055DB990990F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EE034587-0A31-4841-A4BB-055DB990990F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EE034587-0A31-4841-A4BB-055DB990990F}.Release|Any CPU.Build.0 = Release|Any CPU - {A657D500-DDA4-45FF-9459-8351CDD96B78}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A657D500-DDA4-45FF-9459-8351CDD96B78}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A657D500-DDA4-45FF-9459-8351CDD96B78}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A657D500-DDA4-45FF-9459-8351CDD96B78}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {C783227B-DF4C-4B6F-82DA-DDF9985DEF50}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C783227B-DF4C-4B6F-82DA-DDF9985DEF50}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C783227B-DF4C-4B6F-82DA-DDF9985DEF50}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C783227B-DF4C-4B6F-82DA-DDF9985DEF50}.Release|Any CPU.Build.0 = Release|Any CPU - {42E39AB3-A736-45C5-826E-AC4BF6426F54}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {42E39AB3-A736-45C5-826E-AC4BF6426F54}.Debug|Any CPU.Build.0 = Debug|Any CPU - {42E39AB3-A736-45C5-826E-AC4BF6426F54}.Release|Any CPU.ActiveCfg = Release|Any CPU - {42E39AB3-A736-45C5-826E-AC4BF6426F54}.Release|Any CPU.Build.0 = Release|Any CPU - {8FF24B8C-C53D-4A4C-B39A-11A758FD5132}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8FF24B8C-C53D-4A4C-B39A-11A758FD5132}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8FF24B8C-C53D-4A4C-B39A-11A758FD5132}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8FF24B8C-C53D-4A4C-B39A-11A758FD5132}.Release|Any CPU.Build.0 = Release|Any CPU - {04192D32-B2D7-40A4-AF17-548ABDE6154A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {04192D32-B2D7-40A4-AF17-548ABDE6154A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {04192D32-B2D7-40A4-AF17-548ABDE6154A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {04192D32-B2D7-40A4-AF17-548ABDE6154A}.Release|Any CPU.Build.0 = Release|Any CPU - {BBE26CAD-6FCB-4520-B4DB-E4B7D4B92FDA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BBE26CAD-6FCB-4520-B4DB-E4B7D4B92FDA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BBE26CAD-6FCB-4520-B4DB-E4B7D4B92FDA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BBE26CAD-6FCB-4520-B4DB-E4B7D4B92FDA}.Release|Any CPU.Build.0 = Release|Any CPU - {2ACB88B6-F2A8-49D8-BDDB-3F20C4224062}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2ACB88B6-F2A8-49D8-BDDB-3F20C4224062}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2ACB88B6-F2A8-49D8-BDDB-3F20C4224062}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2ACB88B6-F2A8-49D8-BDDB-3F20C4224062}.Release|Any CPU.Build.0 = Release|Any CPU - {6A80C631-0D2F-4FDE-B932-2C977889CCD3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6A80C631-0D2F-4FDE-B932-2C977889CCD3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6A80C631-0D2F-4FDE-B932-2C977889CCD3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6A80C631-0D2F-4FDE-B932-2C977889CCD3}.Release|Any CPU.Build.0 = Release|Any CPU - {7BD5B7F3-2ED9-4747-9FCE-8F5622BFCC36}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7BD5B7F3-2ED9-4747-9FCE-8F5622BFCC36}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7BD5B7F3-2ED9-4747-9FCE-8F5622BFCC36}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7BD5B7F3-2ED9-4747-9FCE-8F5622BFCC36}.Release|Any CPU.Build.0 = Release|Any CPU - {EE034587-0A31-4841-A4BB-055DB990990F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EE034587-0A31-4841-A4BB-055DB990990F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EE034587-0A31-4841-A4BB-055DB990990F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EE034587-0A31-4841-A4BB-055DB990990F}.Release|Any CPU.Build.0 = Release|Any CPU - {A657D500-DDA4-45FF-9459-8351CDD96B78}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A657D500-DDA4-45FF-9459-8351CDD96B78}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A657D500-DDA4-45FF-9459-8351CDD96B78}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A657D500-DDA4-45FF-9459-8351CDD96B78}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -220,37 +136,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {2FA7D8A5-03B9-451F-9F7C-E28D87F02924} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {7D5F1E0A-B910-482D-B968-CB7563FBAC46} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {7DB4266E-A959-4236-AD53-788277EB7D41} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {9027A8B0-B033-41F1-9366-A9FDD17DBA19} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {41287313-83A5-425A-91C7-6175B9983C43} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {C783227B-DF4C-4B6F-82DA-DDF9985DEF50} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {42E39AB3-A736-45C5-826E-AC4BF6426F54} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8FF24B8C-C53D-4A4C-B39A-11A758FD5132} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {04192D32-B2D7-40A4-AF17-548ABDE6154A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {BBE26CAD-6FCB-4520-B4DB-E4B7D4B92FDA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {2ACB88B6-F2A8-49D8-BDDB-3F20C4224062} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6A80C631-0D2F-4FDE-B932-2C977889CCD3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {7BD5B7F3-2ED9-4747-9FCE-8F5622BFCC36} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {EE034587-0A31-4841-A4BB-055DB990990F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A657D500-DDA4-45FF-9459-8351CDD96B78} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {C783227B-DF4C-4B6F-82DA-DDF9985DEF50} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {42E39AB3-A736-45C5-826E-AC4BF6426F54} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8FF24B8C-C53D-4A4C-B39A-11A758FD5132} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {04192D32-B2D7-40A4-AF17-548ABDE6154A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {BBE26CAD-6FCB-4520-B4DB-E4B7D4B92FDA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {2ACB88B6-F2A8-49D8-BDDB-3F20C4224062} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6A80C631-0D2F-4FDE-B932-2C977889CCD3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {7BD5B7F3-2ED9-4747-9FCE-8F5622BFCC36} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {EE034587-0A31-4841-A4BB-055DB990990F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A657D500-DDA4-45FF-9459-8351CDD96B78} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {CE2F2305-8E72-44B6-9FAD-AA2E347C2B6A} diff --git a/sdk/src/Services/BedrockRuntime/Generated/AmazonBedrockRuntimeConfig.cs b/sdk/src/Services/BedrockRuntime/Generated/AmazonBedrockRuntimeConfig.cs index f715a7961081..283e94700810 100644 --- a/sdk/src/Services/BedrockRuntime/Generated/AmazonBedrockRuntimeConfig.cs +++ b/sdk/src/Services/BedrockRuntime/Generated/AmazonBedrockRuntimeConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.BedrockRuntime public partial class AmazonBedrockRuntimeConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("Bedrock Runtime", "4.0.0.0"); private static readonly AmazonBedrockRuntimeEndpointResolver EndpointResolver = new AmazonBedrockRuntimeEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("Bedrock Runtime", "3.7.403.14"); -======= - InternalSDKUtils.BuildUserAgentString("Bedrock Runtime", "3.7.408.7"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/BedrockRuntime/Generated/Model/GuardrailInvocationMetrics.cs b/sdk/src/Services/BedrockRuntime/Generated/Model/GuardrailInvocationMetrics.cs index 9e6fc71427b2..35fcb2aae6cb 100644 --- a/sdk/src/Services/BedrockRuntime/Generated/Model/GuardrailInvocationMetrics.cs +++ b/sdk/src/Services/BedrockRuntime/Generated/Model/GuardrailInvocationMetrics.cs @@ -62,9 +62,9 @@ internal bool IsSetGuardrailCoverage() /// The processing latency details for the guardrail invocation metrics. /// /// - public long GuardrailProcessingLatency + public long? GuardrailProcessingLatency { - get { return this._guardrailProcessingLatency.GetValueOrDefault(); } + get { return this._guardrailProcessingLatency; } set { this._guardrailProcessingLatency = value; } } diff --git a/sdk/src/Services/BedrockRuntime/Generated/Model/GuardrailTextCharactersCoverage.cs b/sdk/src/Services/BedrockRuntime/Generated/Model/GuardrailTextCharactersCoverage.cs index 33e3a8b5dd6c..18c9af01f433 100644 --- a/sdk/src/Services/BedrockRuntime/Generated/Model/GuardrailTextCharactersCoverage.cs +++ b/sdk/src/Services/BedrockRuntime/Generated/Model/GuardrailTextCharactersCoverage.cs @@ -43,9 +43,9 @@ public partial class GuardrailTextCharactersCoverage /// The text characters that were guarded by the guardrail coverage. /// /// - public int Guarded + public int? Guarded { - get { return this._guarded.GetValueOrDefault(); } + get { return this._guarded; } set { this._guarded = value; } } @@ -61,9 +61,9 @@ internal bool IsSetGuarded() /// The total text characters by the guardrail coverage. /// /// - public int Total + public int? Total { - get { return this._total.GetValueOrDefault(); } + get { return this._total; } set { this._total = value; } } diff --git a/sdk/src/Services/BedrockRuntime/Generated/Model/Internal/MarshallTransformations/ConverseRequestMarshaller.cs b/sdk/src/Services/BedrockRuntime/Generated/Model/Internal/MarshallTransformations/ConverseRequestMarshaller.cs index 66506a5251ba..2945c7552e8a 100644 --- a/sdk/src/Services/BedrockRuntime/Generated/Model/Internal/MarshallTransformations/ConverseRequestMarshaller.cs +++ b/sdk/src/Services/BedrockRuntime/Generated/Model/Internal/MarshallTransformations/ConverseRequestMarshaller.cs @@ -111,7 +111,6 @@ public IRequest Marshall(ConverseRequest publicRequest) context.Writer.WriteObjectEnd(); } -<<<<<<< HEAD if(publicRequest.IsSetMessages()) { context.Writer.WritePropertyName("messages"); @@ -128,39 +127,26 @@ public IRequest Marshall(ConverseRequest publicRequest) context.Writer.WriteArrayEnd(); } - if(publicRequest.IsSetSystem()) -||||||| Commit version number update changes - if(publicRequest.IsSetSystem()) - { - context.Writer.WritePropertyName("system"); - context.Writer.WriteArrayStart(); - foreach(var publicRequestSystemListValue in publicRequest.System) -======= - if(publicRequest.IsSetPromptVariables()) - { - context.Writer.WritePropertyName("promptVariables"); - context.Writer.WriteObjectStart(); - foreach (var publicRequestPromptVariablesKvp in publicRequest.PromptVariables) + if(publicRequest.IsSetPromptVariables()) { - context.Writer.WritePropertyName(publicRequestPromptVariablesKvp.Key); - var publicRequestPromptVariablesValue = publicRequestPromptVariablesKvp.Value; - + context.Writer.WritePropertyName("promptVariables"); context.Writer.WriteObjectStart(); + foreach (var publicRequestPromptVariablesKvp in publicRequest.PromptVariables) + { + context.Writer.WritePropertyName(publicRequestPromptVariablesKvp.Key); + var publicRequestPromptVariablesValue = publicRequestPromptVariablesKvp.Value; + + context.Writer.WriteObjectStart(); - var marshaller = PromptVariableValuesMarshaller.Instance; - marshaller.Marshall(publicRequestPromptVariablesValue, context); + var marshaller = PromptVariableValuesMarshaller.Instance; + marshaller.Marshall(publicRequestPromptVariablesValue, context); + context.Writer.WriteObjectEnd(); + } context.Writer.WriteObjectEnd(); } - context.Writer.WriteObjectEnd(); - } - if(publicRequest.IsSetSystem()) - { - context.Writer.WritePropertyName("system"); - context.Writer.WriteArrayStart(); - foreach(var publicRequestSystemListValue in publicRequest.System) ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b + if(publicRequest.IsSetSystem()) { context.Writer.WritePropertyName("system"); context.Writer.WriteArrayStart(); diff --git a/sdk/src/Services/BedrockRuntime/Generated/Model/Internal/MarshallTransformations/ConverseStreamRequestMarshaller.cs b/sdk/src/Services/BedrockRuntime/Generated/Model/Internal/MarshallTransformations/ConverseStreamRequestMarshaller.cs index 6d2ac0123124..ef15d05c564d 100644 --- a/sdk/src/Services/BedrockRuntime/Generated/Model/Internal/MarshallTransformations/ConverseStreamRequestMarshaller.cs +++ b/sdk/src/Services/BedrockRuntime/Generated/Model/Internal/MarshallTransformations/ConverseStreamRequestMarshaller.cs @@ -111,7 +111,6 @@ public IRequest Marshall(ConverseStreamRequest publicRequest) context.Writer.WriteObjectEnd(); } -<<<<<<< HEAD if(publicRequest.IsSetMessages()) { context.Writer.WritePropertyName("messages"); @@ -128,39 +127,26 @@ public IRequest Marshall(ConverseStreamRequest publicRequest) context.Writer.WriteArrayEnd(); } - if(publicRequest.IsSetSystem()) -||||||| Commit version number update changes - if(publicRequest.IsSetSystem()) - { - context.Writer.WritePropertyName("system"); - context.Writer.WriteArrayStart(); - foreach(var publicRequestSystemListValue in publicRequest.System) -======= - if(publicRequest.IsSetPromptVariables()) - { - context.Writer.WritePropertyName("promptVariables"); - context.Writer.WriteObjectStart(); - foreach (var publicRequestPromptVariablesKvp in publicRequest.PromptVariables) + if(publicRequest.IsSetPromptVariables()) { - context.Writer.WritePropertyName(publicRequestPromptVariablesKvp.Key); - var publicRequestPromptVariablesValue = publicRequestPromptVariablesKvp.Value; - + context.Writer.WritePropertyName("promptVariables"); context.Writer.WriteObjectStart(); + foreach (var publicRequestPromptVariablesKvp in publicRequest.PromptVariables) + { + context.Writer.WritePropertyName(publicRequestPromptVariablesKvp.Key); + var publicRequestPromptVariablesValue = publicRequestPromptVariablesKvp.Value; + + context.Writer.WriteObjectStart(); - var marshaller = PromptVariableValuesMarshaller.Instance; - marshaller.Marshall(publicRequestPromptVariablesValue, context); + var marshaller = PromptVariableValuesMarshaller.Instance; + marshaller.Marshall(publicRequestPromptVariablesValue, context); + context.Writer.WriteObjectEnd(); + } context.Writer.WriteObjectEnd(); } - context.Writer.WriteObjectEnd(); - } - if(publicRequest.IsSetSystem()) - { - context.Writer.WritePropertyName("system"); - context.Writer.WriteArrayStart(); - foreach(var publicRequestSystemListValue in publicRequest.System) ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b + if(publicRequest.IsSetSystem()) { context.Writer.WritePropertyName("system"); context.Writer.WriteArrayStart(); diff --git a/sdk/src/Services/BedrockRuntime/Generated/Model/Internal/MarshallTransformations/GuardrailInvocationMetricsUnmarshaller.cs b/sdk/src/Services/BedrockRuntime/Generated/Model/Internal/MarshallTransformations/GuardrailInvocationMetricsUnmarshaller.cs index 7b4ceda2507b..33fc1cb35902 100644 --- a/sdk/src/Services/BedrockRuntime/Generated/Model/Internal/MarshallTransformations/GuardrailInvocationMetricsUnmarshaller.cs +++ b/sdk/src/Services/BedrockRuntime/Generated/Model/Internal/MarshallTransformations/GuardrailInvocationMetricsUnmarshaller.cs @@ -74,7 +74,7 @@ public GuardrailInvocationMetrics Unmarshall(JsonUnmarshallerContext context) } if (context.TestExpression("guardrailProcessingLatency", targetDepth)) { - var unmarshaller = LongUnmarshaller.Instance; + var unmarshaller = NullableLongUnmarshaller.Instance; unmarshalledObject.GuardrailProcessingLatency = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/BedrockRuntime/Generated/Model/Internal/MarshallTransformations/GuardrailTextCharactersCoverageUnmarshaller.cs b/sdk/src/Services/BedrockRuntime/Generated/Model/Internal/MarshallTransformations/GuardrailTextCharactersCoverageUnmarshaller.cs index 78d713778e72..955423441e29 100644 --- a/sdk/src/Services/BedrockRuntime/Generated/Model/Internal/MarshallTransformations/GuardrailTextCharactersCoverageUnmarshaller.cs +++ b/sdk/src/Services/BedrockRuntime/Generated/Model/Internal/MarshallTransformations/GuardrailTextCharactersCoverageUnmarshaller.cs @@ -68,13 +68,13 @@ public GuardrailTextCharactersCoverage Unmarshall(JsonUnmarshallerContext contex { if (context.TestExpression("guarded", targetDepth)) { - var unmarshaller = IntUnmarshaller.Instance; + var unmarshaller = NullableIntUnmarshaller.Instance; unmarshalledObject.Guarded = unmarshaller.Unmarshall(context); continue; } if (context.TestExpression("total", targetDepth)) { - var unmarshaller = IntUnmarshaller.Instance; + var unmarshaller = NullableIntUnmarshaller.Instance; unmarshalledObject.Total = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/BedrockRuntime/Generated/_bcl/AmazonBedrockRuntimeClient.cs b/sdk/src/Services/BedrockRuntime/Generated/_bcl/AmazonBedrockRuntimeClient.cs index 99a7f191b976..ecd6bbbdfb18 100644 --- a/sdk/src/Services/BedrockRuntime/Generated/_bcl/AmazonBedrockRuntimeClient.cs +++ b/sdk/src/Services/BedrockRuntime/Generated/_bcl/AmazonBedrockRuntimeClient.cs @@ -350,6 +350,23 @@ public virtual ApplyGuardrailResponse ApplyGuardrail(ApplyGuardrailRequest reque /// /// /// + /// You can submit a prompt by including it in the messages field, specifying the + /// modelId of a foundation model or inference profile to run inference on it, + /// and including any other fields that are relevant to your use case. + /// + /// + /// + /// You can also submit a prompt from Prompt management by specifying the ARN of the prompt + /// version and including a map of variables to values in the promptVariables field. + /// You can append more messages to the prompt by using the messages field. If + /// you use a prompt from Prompt management, you can't include the following fields in + /// the request: additionalModelRequestFields, inferenceConfig, system, + /// or toolConfig. Instead, these fields must be defined through Prompt management. + /// For more information, see Use + /// a prompt from Prompt management. + /// + /// + /// /// For information about the Converse API, see Use the Converse API in the Amazon /// Bedrock User Guide. To use a guardrail, see Use a guardrail with the Converse /// API in the Amazon Bedrock User Guide. To use a tool with a model, see Tool @@ -424,6 +441,23 @@ public virtual ConverseResponse Converse(ConverseRequest request) /// /// /// + /// You can submit a prompt by including it in the messages field, specifying the + /// modelId of a foundation model or inference profile to run inference on it, + /// and including any other fields that are relevant to your use case. + /// + /// + /// + /// You can also submit a prompt from Prompt management by specifying the ARN of the prompt + /// version and including a map of variables to values in the promptVariables field. + /// You can append more messages to the prompt by using the messages field. If + /// you use a prompt from Prompt management, you can't include the following fields in + /// the request: additionalModelRequestFields, inferenceConfig, system, + /// or toolConfig. Instead, these fields must be defined through Prompt management. + /// For more information, see Use + /// a prompt from Prompt management. + /// + /// + /// /// For information about the Converse API, see Use the Converse API in the Amazon /// Bedrock User Guide. To use a guardrail, see Use a guardrail with the Converse /// API in the Amazon Bedrock User Guide. To use a tool with a model, see Tool @@ -515,6 +549,23 @@ public virtual ConverseResponse Converse(ConverseRequest request) /// /// /// + /// You can submit a prompt by including it in the messages field, specifying the + /// modelId of a foundation model or inference profile to run inference on it, + /// and including any other fields that are relevant to your use case. + /// + /// + /// + /// You can also submit a prompt from Prompt management by specifying the ARN of the prompt + /// version and including a map of variables to values in the promptVariables field. + /// You can append more messages to the prompt by using the messages field. If + /// you use a prompt from Prompt management, you can't include the following fields in + /// the request: additionalModelRequestFields, inferenceConfig, system, + /// or toolConfig. Instead, these fields must be defined through Prompt management. + /// For more information, see Use + /// a prompt from Prompt management. + /// + /// + /// /// For information about the Converse API, see Use the Converse API in the Amazon /// Bedrock User Guide. To use a guardrail, see Use a guardrail with the Converse /// API in the Amazon Bedrock User Guide. To use a tool with a model, see Tool @@ -600,6 +651,23 @@ public virtual ConverseStreamResponse ConverseStream(ConverseStreamRequest reque /// /// /// + /// You can submit a prompt by including it in the messages field, specifying the + /// modelId of a foundation model or inference profile to run inference on it, + /// and including any other fields that are relevant to your use case. + /// + /// + /// + /// You can also submit a prompt from Prompt management by specifying the ARN of the prompt + /// version and including a map of variables to values in the promptVariables field. + /// You can append more messages to the prompt by using the messages field. If + /// you use a prompt from Prompt management, you can't include the following fields in + /// the request: additionalModelRequestFields, inferenceConfig, system, + /// or toolConfig. Instead, these fields must be defined through Prompt management. + /// For more information, see Use + /// a prompt from Prompt management. + /// + /// + /// /// For information about the Converse API, see Use the Converse API in the Amazon /// Bedrock User Guide. To use a guardrail, see Use a guardrail with the Converse /// API in the Amazon Bedrock User Guide. To use a tool with a model, see Tool diff --git a/sdk/src/Services/BedrockRuntime/Properties/AssemblyInfo.cs b/sdk/src/Services/BedrockRuntime/Properties/AssemblyInfo.cs index 5c9dc4e72237..f355694f1f80 100644 --- a/sdk/src/Services/BedrockRuntime/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/BedrockRuntime/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.403.14")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.408.7")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/Billing/AWSSDK.Billing.Net35.csproj b/sdk/src/Services/Billing/AWSSDK.Billing.Net35.csproj deleted file mode 100644 index afe30e01e621..000000000000 --- a/sdk/src/Services/Billing/AWSSDK.Billing.Net35.csproj +++ /dev/null @@ -1,83 +0,0 @@ - - - true - net35 - $(DefineConstants);BCL;BCL35;AWS_APM_API;CODE_ANALYSIS - portable - true - AWSSDK.Billing - AWSSDK.Billing - - false - false - false - false - false - false - false - false - true - true - - - C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v3.5\Profile\Client - - false - CA1822 - - - ../../../AWSDotNetSDK.ruleset - - - ../../../AWSDotNetSDKForBuild.ruleset - - - - - - ../../../awssdk.dll.snk - - - - - $(AWSKeyFile) - - - - - - - - - - - - - - - - - - - - - - - all - - - all - - - - - - - - - C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\v3.5\System.Data.Entity.dll - - - - - \ No newline at end of file diff --git a/sdk/src/Services/Billing/AWSSDK.Billing.Net45.csproj b/sdk/src/Services/Billing/AWSSDK.Billing.Net45.csproj deleted file mode 100644 index 94e960cb58d5..000000000000 --- a/sdk/src/Services/Billing/AWSSDK.Billing.Net45.csproj +++ /dev/null @@ -1,74 +0,0 @@ - - - true - net45 - $(DefineConstants);BCL;BCL45;AWS_ASYNC_API;CODE_ANALYSIS - portable - true - AWSSDK.Billing - AWSSDK.Billing - - false - false - false - false - false - false - false - false - true - true - - CA1822 - - - ../../../AWSDotNetSDK.ruleset - - - ../../../AWSDotNetSDKForBuild.ruleset - - - - - - ../../../awssdk.dll.snk - - - - - $(AWSKeyFile) - - - - - - - - - - - - - - - - - - - - - all - - - all - - - - - - - - - - - \ No newline at end of file diff --git a/sdk/src/Services/NimbleStudio/AWSSDK.NimbleStudio.NetFramework.csproj b/sdk/src/Services/Billing/AWSSDK.Billing.NetFramework.csproj similarity index 97% rename from sdk/src/Services/NimbleStudio/AWSSDK.NimbleStudio.NetFramework.csproj rename to sdk/src/Services/Billing/AWSSDK.Billing.NetFramework.csproj index 5318b1d90750..3ddb7dd5129d 100644 --- a/sdk/src/Services/NimbleStudio/AWSSDK.NimbleStudio.NetFramework.csproj +++ b/sdk/src/Services/Billing/AWSSDK.Billing.NetFramework.csproj @@ -5,8 +5,8 @@ $(DefineConstants);BCL;AWS_ASYNC_API;CODE_ANALYSIS portable true - AWSSDK.NimbleStudio - AWSSDK.NimbleStudio + AWSSDK.Billing + AWSSDK.Billing false false diff --git a/sdk/src/Services/Billing/AWSSDK.Billing.NetStandard.csproj b/sdk/src/Services/Billing/AWSSDK.Billing.NetStandard.csproj index 1602c903f09f..e7597e5ec45f 100644 --- a/sdk/src/Services/Billing/AWSSDK.Billing.NetStandard.csproj +++ b/sdk/src/Services/Billing/AWSSDK.Billing.NetStandard.csproj @@ -31,6 +31,16 @@ true + + + 11.0 + + + 9.0 + ../../../AWSDotNetSDK.ruleset @@ -55,8 +65,6 @@ - - diff --git a/sdk/src/Services/Billing/Billing.sln b/sdk/src/Services/Billing/Billing.sln index 640b56fb77ea..dfe9b0ead6e4 100644 --- a/sdk/src/Services/Billing/Billing.sln +++ b/sdk/src/Services/Billing/Billing.sln @@ -4,9 +4,7 @@ VisualStudioVersion = 15.0.26730.12 MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Core", "Core", "{9863FCB3-BFA4-4B9C-B8F6-302BA5F660B8}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.Core.Net35", "../../Core/AWSSDK.Core.Net35.csproj", "{1FACE5D0-97BF-4069-B4F7-0FE28BB160F8}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.Core.Net45", "../../Core/AWSSDK.Core.Net45.csproj", "{7DE3AFA0-1B2D-41B1-82BD-120B8B210B43}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.Core.NetFramework", "../../Core/AWSSDK.Core.NetFramework.csproj", "{7DE3AFA0-1B2D-41B1-82BD-120B8B210B43}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.Core.NetStandard", "../../Core/AWSSDK.Core.NetStandard.csproj", "{A855B58E-ED32-40AE-AE8F-054F448B9F2C}" EndProject @@ -14,27 +12,19 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Services", "Services", "{93 EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Billing", "Billing", "{D6CE05DE-6A83-4417-9239-6454B446B3E7}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.Billing.Net35", "AWSSDK.Billing.Net35.csproj", "{99EA5DD0-7EE4-4226-9A93-A3CA456F72A8}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.Billing.Net45", "AWSSDK.Billing.Net45.csproj", "{79B263C5-80AB-4B7A-98E3-BD60136C872E}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.Billing.NetFramework", "AWSSDK.Billing.NetFramework.csproj", "{6F80F7FD-9257-4928-BC9E-7F745895E92D}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.Billing.NetStandard", "AWSSDK.Billing.NetStandard.csproj", "{6850972F-BED7-4C1C-A05C-45E6905FB580}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Test", "Test", "{12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.UnitTests.Billing.Net35", "../../../test/Services/Billing/UnitTests/AWSSDK.UnitTests.Billing.Net35.csproj", "{924FDABE-F761-4917-B321-1AA343089BDD}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.UnitTests.Billing.Net45", "../../../test/Services/Billing/UnitTests/AWSSDK.UnitTests.Billing.Net45.csproj", "{3724C40A-3C7A-4AA0-B315-6BABCA4F5CFA}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.UnitTests.Billing.NetFramework", "../../../test/Services/Billing/UnitTests/AWSSDK.UnitTests.Billing.NetFramework.csproj", "{68ACFA61-1B76-4823-B0E5-20019E46D0ED}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ServiceClientGeneratorLib", "../../../../generator/ServiceClientGeneratorLib/ServiceClientGeneratorLib.csproj", "{7BEE7C44-BE12-43CC-AFB9-B5852A1F43C8}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.UnitTestUtilities.Net35", "../../../test/UnitTests/Custom/AWSSDK.UnitTestUtilities.Net35.csproj", "{A23CE153-A4A3-4D3A-A6DC-0DD1B207118E}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.UnitTestUtilities.Net45", "../../../test/UnitTests/Custom/AWSSDK.UnitTestUtilities.Net45.csproj", "{002B183F-E568-49CD-9D06-CBCFF2C2921F}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.IntegrationTestUtilities.Net35", "../../../test/IntegrationTests/AWSSDK.IntegrationTestUtilities.Net35.csproj", "{924D2906-70D6-4D77-8603-816648B2CCA6}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.UnitTestUtilities.NetFramework", "../../../test/UnitTests/Custom/AWSSDK.UnitTestUtilities.NetFramework.csproj", "{002B183F-E568-49CD-9D06-CBCFF2C2921F}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.IntegrationTestUtilities.Net45", "../../../test/IntegrationTests/AWSSDK.IntegrationTestUtilities.Net45.csproj", "{7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.IntegrationTestUtilities.NetFramework", "../../../test/IntegrationTests/AWSSDK.IntegrationTestUtilities.NetFramework.csproj", "{7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.CommonTest", "../../../test/Common/AWSSDK.CommonTest.csproj", "{66F78F86-68D7-4538-8EA5-A669A08E1C19}" EndProject @@ -44,25 +34,15 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UnitTests.NetStandard.CoreO EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "IntegrationTestDependencies", "IntegrationTestDependencies", "{939EC5C2-8345-43E2-8F97-72EEEBEEA0AC}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.Extensions.CrtIntegration.Net35", "../../../../extensions/src/AWSSDK.Extensions.CrtIntegration/AWSSDK.Extensions.CrtIntegration.Net35.csproj", "{18B59CD0-B182-4F59-8C16-57167B4B9507}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.Extensions.CrtIntegration.Net45", "../../../../extensions/src/AWSSDK.Extensions.CrtIntegration/AWSSDK.Extensions.CrtIntegration.Net45.csproj", "{C2A1C7E9-2DE2-4EB0-A43C-6BA00A0FC35E}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.IdentityManagement.Net35", "../IdentityManagement/AWSSDK.IdentityManagement.Net35.csproj", "{BC0E8149-1426-413E-9476-8A000780965F}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.SecurityToken.Net35", "../SecurityToken/AWSSDK.SecurityToken.Net35.csproj", "{C2A853A1-44F5-4C02-97A2-5A1055E87A6B}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.SimpleNotificationService.Net35", "../SimpleNotificationService/AWSSDK.SimpleNotificationService.Net35.csproj", "{BFFCF45C-B833-473D-9E06-D9DBD5791502}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.S3.Net35", "../S3/AWSSDK.S3.Net35.csproj", "{BF508D5C-4236-48CB-8EFD-A518222FA60F}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.Extensions.CrtIntegration.NetFramework", "../../../../extensions/src/AWSSDK.Extensions.CrtIntegration/AWSSDK.Extensions.CrtIntegration.NetFramework.csproj", "{E118F19A-0BF3-4A5E-85B7-4500561185C0}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.IdentityManagement.Net45", "../IdentityManagement/AWSSDK.IdentityManagement.Net45.csproj", "{5F562718-1A3D-4C1B-A497-3D3BA797F6D9}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.IdentityManagement.NetFramework", "../IdentityManagement/AWSSDK.IdentityManagement.NetFramework.csproj", "{9AB3EF77-D259-4CD3-8CE2-8E47008EC549}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.S3.Net45", "../S3/AWSSDK.S3.Net45.csproj", "{AB1BD9C7-21B4-4D52-B147-8960FA9C2FD2}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.S3.NetFramework", "../S3/AWSSDK.S3.NetFramework.csproj", "{BB72198A-A81E-42CE-B3FE-CEDA153D4E17}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.SecurityToken.Net45", "../SecurityToken/AWSSDK.SecurityToken.Net45.csproj", "{321B9324-2A15-481D-8734-1B4626E3D7DC}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.SecurityToken.NetFramework", "../SecurityToken/AWSSDK.SecurityToken.NetFramework.csproj", "{8E0A208C-86FB-4D3E-8246-5798D82D9C15}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.SimpleNotificationService.Net45", "../SimpleNotificationService/AWSSDK.SimpleNotificationService.Net45.csproj", "{4BB314B9-2B31-4375-88C2-7D2FECE5C7A9}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.SimpleNotificationService.NetFramework", "../SimpleNotificationService/AWSSDK.SimpleNotificationService.NetFramework.csproj", "{EFEAD6E3-230B-41DC-AF2E-38F362D46A18}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -70,10 +50,6 @@ Global Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {1FACE5D0-97BF-4069-B4F7-0FE28BB160F8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1FACE5D0-97BF-4069-B4F7-0FE28BB160F8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1FACE5D0-97BF-4069-B4F7-0FE28BB160F8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1FACE5D0-97BF-4069-B4F7-0FE28BB160F8}.Release|Any CPU.Build.0 = Release|Any CPU {7DE3AFA0-1B2D-41B1-82BD-120B8B210B43}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {7DE3AFA0-1B2D-41B1-82BD-120B8B210B43}.Debug|Any CPU.Build.0 = Debug|Any CPU {7DE3AFA0-1B2D-41B1-82BD-120B8B210B43}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -82,42 +58,26 @@ Global {A855B58E-ED32-40AE-AE8F-054F448B9F2C}.Debug|Any CPU.Build.0 = Debug|Any CPU {A855B58E-ED32-40AE-AE8F-054F448B9F2C}.Release|Any CPU.ActiveCfg = Release|Any CPU {A855B58E-ED32-40AE-AE8F-054F448B9F2C}.Release|Any CPU.Build.0 = Release|Any CPU - {99EA5DD0-7EE4-4226-9A93-A3CA456F72A8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {99EA5DD0-7EE4-4226-9A93-A3CA456F72A8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {99EA5DD0-7EE4-4226-9A93-A3CA456F72A8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {99EA5DD0-7EE4-4226-9A93-A3CA456F72A8}.Release|Any CPU.Build.0 = Release|Any CPU - {79B263C5-80AB-4B7A-98E3-BD60136C872E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {79B263C5-80AB-4B7A-98E3-BD60136C872E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {79B263C5-80AB-4B7A-98E3-BD60136C872E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {79B263C5-80AB-4B7A-98E3-BD60136C872E}.Release|Any CPU.Build.0 = Release|Any CPU + {6F80F7FD-9257-4928-BC9E-7F745895E92D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {6F80F7FD-9257-4928-BC9E-7F745895E92D}.Debug|Any CPU.Build.0 = Debug|Any CPU + {6F80F7FD-9257-4928-BC9E-7F745895E92D}.Release|Any CPU.ActiveCfg = Release|Any CPU + {6F80F7FD-9257-4928-BC9E-7F745895E92D}.Release|Any CPU.Build.0 = Release|Any CPU {6850972F-BED7-4C1C-A05C-45E6905FB580}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {6850972F-BED7-4C1C-A05C-45E6905FB580}.Debug|Any CPU.Build.0 = Debug|Any CPU {6850972F-BED7-4C1C-A05C-45E6905FB580}.Release|Any CPU.ActiveCfg = Release|Any CPU {6850972F-BED7-4C1C-A05C-45E6905FB580}.Release|Any CPU.Build.0 = Release|Any CPU - {924FDABE-F761-4917-B321-1AA343089BDD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {924FDABE-F761-4917-B321-1AA343089BDD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {924FDABE-F761-4917-B321-1AA343089BDD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {924FDABE-F761-4917-B321-1AA343089BDD}.Release|Any CPU.Build.0 = Release|Any CPU - {3724C40A-3C7A-4AA0-B315-6BABCA4F5CFA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3724C40A-3C7A-4AA0-B315-6BABCA4F5CFA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3724C40A-3C7A-4AA0-B315-6BABCA4F5CFA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3724C40A-3C7A-4AA0-B315-6BABCA4F5CFA}.Release|Any CPU.Build.0 = Release|Any CPU + {68ACFA61-1B76-4823-B0E5-20019E46D0ED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {68ACFA61-1B76-4823-B0E5-20019E46D0ED}.Debug|Any CPU.Build.0 = Debug|Any CPU + {68ACFA61-1B76-4823-B0E5-20019E46D0ED}.Release|Any CPU.ActiveCfg = Release|Any CPU + {68ACFA61-1B76-4823-B0E5-20019E46D0ED}.Release|Any CPU.Build.0 = Release|Any CPU {7BEE7C44-BE12-43CC-AFB9-B5852A1F43C8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {7BEE7C44-BE12-43CC-AFB9-B5852A1F43C8}.Debug|Any CPU.Build.0 = Debug|Any CPU {7BEE7C44-BE12-43CC-AFB9-B5852A1F43C8}.Release|Any CPU.ActiveCfg = Release|Any CPU {7BEE7C44-BE12-43CC-AFB9-B5852A1F43C8}.Release|Any CPU.Build.0 = Release|Any CPU - {A23CE153-A4A3-4D3A-A6DC-0DD1B207118E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A23CE153-A4A3-4D3A-A6DC-0DD1B207118E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A23CE153-A4A3-4D3A-A6DC-0DD1B207118E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A23CE153-A4A3-4D3A-A6DC-0DD1B207118E}.Release|Any CPU.Build.0 = Release|Any CPU {002B183F-E568-49CD-9D06-CBCFF2C2921F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {002B183F-E568-49CD-9D06-CBCFF2C2921F}.Debug|Any CPU.Build.0 = Debug|Any CPU {002B183F-E568-49CD-9D06-CBCFF2C2921F}.Release|Any CPU.ActiveCfg = Release|Any CPU {002B183F-E568-49CD-9D06-CBCFF2C2921F}.Release|Any CPU.Build.0 = Release|Any CPU - {924D2906-70D6-4D77-8603-816648B2CCA6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {924D2906-70D6-4D77-8603-816648B2CCA6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {924D2906-70D6-4D77-8603-816648B2CCA6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {924D2906-70D6-4D77-8603-816648B2CCA6}.Release|Any CPU.Build.0 = Release|Any CPU {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7}.Debug|Any CPU.Build.0 = Debug|Any CPU {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -134,78 +94,48 @@ Global {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {18B59CD0-B182-4F59-8C16-57167B4B9507}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {18B59CD0-B182-4F59-8C16-57167B4B9507}.Debug|Any CPU.Build.0 = Debug|Any CPU - {18B59CD0-B182-4F59-8C16-57167B4B9507}.Release|Any CPU.ActiveCfg = Release|Any CPU - {18B59CD0-B182-4F59-8C16-57167B4B9507}.Release|Any CPU.Build.0 = Release|Any CPU - {C2A1C7E9-2DE2-4EB0-A43C-6BA00A0FC35E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C2A1C7E9-2DE2-4EB0-A43C-6BA00A0FC35E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C2A1C7E9-2DE2-4EB0-A43C-6BA00A0FC35E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C2A1C7E9-2DE2-4EB0-A43C-6BA00A0FC35E}.Release|Any CPU.Build.0 = Release|Any CPU - {BC0E8149-1426-413E-9476-8A000780965F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BC0E8149-1426-413E-9476-8A000780965F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BC0E8149-1426-413E-9476-8A000780965F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BC0E8149-1426-413E-9476-8A000780965F}.Release|Any CPU.Build.0 = Release|Any CPU - {C2A853A1-44F5-4C02-97A2-5A1055E87A6B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C2A853A1-44F5-4C02-97A2-5A1055E87A6B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C2A853A1-44F5-4C02-97A2-5A1055E87A6B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C2A853A1-44F5-4C02-97A2-5A1055E87A6B}.Release|Any CPU.Build.0 = Release|Any CPU - {BFFCF45C-B833-473D-9E06-D9DBD5791502}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BFFCF45C-B833-473D-9E06-D9DBD5791502}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BFFCF45C-B833-473D-9E06-D9DBD5791502}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BFFCF45C-B833-473D-9E06-D9DBD5791502}.Release|Any CPU.Build.0 = Release|Any CPU - {BF508D5C-4236-48CB-8EFD-A518222FA60F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BF508D5C-4236-48CB-8EFD-A518222FA60F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BF508D5C-4236-48CB-8EFD-A518222FA60F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BF508D5C-4236-48CB-8EFD-A518222FA60F}.Release|Any CPU.Build.0 = Release|Any CPU - {5F562718-1A3D-4C1B-A497-3D3BA797F6D9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5F562718-1A3D-4C1B-A497-3D3BA797F6D9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5F562718-1A3D-4C1B-A497-3D3BA797F6D9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5F562718-1A3D-4C1B-A497-3D3BA797F6D9}.Release|Any CPU.Build.0 = Release|Any CPU - {AB1BD9C7-21B4-4D52-B147-8960FA9C2FD2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AB1BD9C7-21B4-4D52-B147-8960FA9C2FD2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AB1BD9C7-21B4-4D52-B147-8960FA9C2FD2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AB1BD9C7-21B4-4D52-B147-8960FA9C2FD2}.Release|Any CPU.Build.0 = Release|Any CPU - {321B9324-2A15-481D-8734-1B4626E3D7DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {321B9324-2A15-481D-8734-1B4626E3D7DC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {321B9324-2A15-481D-8734-1B4626E3D7DC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {321B9324-2A15-481D-8734-1B4626E3D7DC}.Release|Any CPU.Build.0 = Release|Any CPU - {4BB314B9-2B31-4375-88C2-7D2FECE5C7A9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4BB314B9-2B31-4375-88C2-7D2FECE5C7A9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4BB314B9-2B31-4375-88C2-7D2FECE5C7A9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4BB314B9-2B31-4375-88C2-7D2FECE5C7A9}.Release|Any CPU.Build.0 = Release|Any CPU + {E118F19A-0BF3-4A5E-85B7-4500561185C0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {E118F19A-0BF3-4A5E-85B7-4500561185C0}.Debug|Any CPU.Build.0 = Debug|Any CPU + {E118F19A-0BF3-4A5E-85B7-4500561185C0}.Release|Any CPU.ActiveCfg = Release|Any CPU + {E118F19A-0BF3-4A5E-85B7-4500561185C0}.Release|Any CPU.Build.0 = Release|Any CPU + {9AB3EF77-D259-4CD3-8CE2-8E47008EC549}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {9AB3EF77-D259-4CD3-8CE2-8E47008EC549}.Debug|Any CPU.Build.0 = Debug|Any CPU + {9AB3EF77-D259-4CD3-8CE2-8E47008EC549}.Release|Any CPU.ActiveCfg = Release|Any CPU + {9AB3EF77-D259-4CD3-8CE2-8E47008EC549}.Release|Any CPU.Build.0 = Release|Any CPU + {BB72198A-A81E-42CE-B3FE-CEDA153D4E17}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {BB72198A-A81E-42CE-B3FE-CEDA153D4E17}.Debug|Any CPU.Build.0 = Debug|Any CPU + {BB72198A-A81E-42CE-B3FE-CEDA153D4E17}.Release|Any CPU.ActiveCfg = Release|Any CPU + {BB72198A-A81E-42CE-B3FE-CEDA153D4E17}.Release|Any CPU.Build.0 = Release|Any CPU + {8E0A208C-86FB-4D3E-8246-5798D82D9C15}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {8E0A208C-86FB-4D3E-8246-5798D82D9C15}.Debug|Any CPU.Build.0 = Debug|Any CPU + {8E0A208C-86FB-4D3E-8246-5798D82D9C15}.Release|Any CPU.ActiveCfg = Release|Any CPU + {8E0A208C-86FB-4D3E-8246-5798D82D9C15}.Release|Any CPU.Build.0 = Release|Any CPU + {EFEAD6E3-230B-41DC-AF2E-38F362D46A18}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {EFEAD6E3-230B-41DC-AF2E-38F362D46A18}.Debug|Any CPU.Build.0 = Debug|Any CPU + {EFEAD6E3-230B-41DC-AF2E-38F362D46A18}.Release|Any CPU.ActiveCfg = Release|Any CPU + {EFEAD6E3-230B-41DC-AF2E-38F362D46A18}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution - {1FACE5D0-97BF-4069-B4F7-0FE28BB160F8} = {9863FCB3-BFA4-4B9C-B8F6-302BA5F660B8} {7DE3AFA0-1B2D-41B1-82BD-120B8B210B43} = {9863FCB3-BFA4-4B9C-B8F6-302BA5F660B8} {A855B58E-ED32-40AE-AE8F-054F448B9F2C} = {9863FCB3-BFA4-4B9C-B8F6-302BA5F660B8} {D6CE05DE-6A83-4417-9239-6454B446B3E7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AB} - {99EA5DD0-7EE4-4226-9A93-A3CA456F72A8} = {D6CE05DE-6A83-4417-9239-6454B446B3E7} - {79B263C5-80AB-4B7A-98E3-BD60136C872E} = {D6CE05DE-6A83-4417-9239-6454B446B3E7} + {6F80F7FD-9257-4928-BC9E-7F745895E92D} = {D6CE05DE-6A83-4417-9239-6454B446B3E7} {6850972F-BED7-4C1C-A05C-45E6905FB580} = {D6CE05DE-6A83-4417-9239-6454B446B3E7} - {924FDABE-F761-4917-B321-1AA343089BDD} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {3724C40A-3C7A-4AA0-B315-6BABCA4F5CFA} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {68ACFA61-1B76-4823-B0E5-20019E46D0ED} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7BEE7C44-BE12-43CC-AFB9-B5852A1F43C8} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {A23CE153-A4A3-4D3A-A6DC-0DD1B207118E} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {924D2906-70D6-4D77-8603-816648B2CCA6} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {18B59CD0-B182-4F59-8C16-57167B4B9507} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C2A1C7E9-2DE2-4EB0-A43C-6BA00A0FC35E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {BC0E8149-1426-413E-9476-8A000780965F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C2A853A1-44F5-4C02-97A2-5A1055E87A6B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {BFFCF45C-B833-473D-9E06-D9DBD5791502} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {BF508D5C-4236-48CB-8EFD-A518222FA60F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {5F562718-1A3D-4C1B-A497-3D3BA797F6D9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {AB1BD9C7-21B4-4D52-B147-8960FA9C2FD2} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {321B9324-2A15-481D-8734-1B4626E3D7DC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4BB314B9-2B31-4375-88C2-7D2FECE5C7A9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} + {E118F19A-0BF3-4A5E-85B7-4500561185C0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} + {9AB3EF77-D259-4CD3-8CE2-8E47008EC549} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} + {BB72198A-A81E-42CE-B3FE-CEDA153D4E17} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} + {8E0A208C-86FB-4D3E-8246-5798D82D9C15} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} + {EFEAD6E3-230B-41DC-AF2E-38F362D46A18} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {750AB26E-8670-4014-B6F8-A462A1859F67} diff --git a/sdk/src/Services/Billing/Generated/AmazonBillingConfig.cs b/sdk/src/Services/Billing/Generated/AmazonBillingConfig.cs index 905d440a6514..2ccf1978a684 100644 --- a/sdk/src/Services/Billing/Generated/AmazonBillingConfig.cs +++ b/sdk/src/Services/Billing/Generated/AmazonBillingConfig.cs @@ -21,6 +21,8 @@ using Amazon.Runtime; using Amazon.Runtime.Internal; using Amazon.Util.Internal; +using Amazon.Runtime.Internal.Auth; +using Amazon.Runtime.Endpoints; using Amazon.Billing.Internal; namespace Amazon.Billing @@ -32,7 +34,10 @@ namespace Amazon.Billing public partial class AmazonBillingConfig : ClientConfig { private static readonly string UserAgentString = - InternalSDKUtils.BuildUserAgentString("Billing", "3.7.400.3"); + InternalSDKUtils.BuildUserAgentString("Billing", "4.0.0.0"); + + private static readonly AmazonBillingEndpointResolver EndpointResolver = + new AmazonBillingEndpointResolver(); private string _userAgent = UserAgentString; /// @@ -89,5 +94,24 @@ public override string UserAgent } } + /// + /// Returns the endpoint that will be used for a particular request. + /// + /// A Container class for parameters used for endpoint resolution. + /// The resolved endpoint for the given request. + public override Amazon.Runtime.Endpoints.Endpoint DetermineServiceOperationEndpoint(ServiceOperationEndpointParameters parameters) + { + var requestContext = new RequestContext(false, new AWS4Signer()) + { + ClientConfig = this, + OriginalRequest = parameters.Request, + Request = new DefaultRequest(parameters.Request, ServiceId) + }; + + var executionContext = new Amazon.Runtime.Internal.ExecutionContext(requestContext, null); + return EndpointResolver.GetEndpoint(executionContext); + } + + } } \ No newline at end of file diff --git a/sdk/src/Services/Billing/Generated/AmazonBillingDefaultConfiguration.cs b/sdk/src/Services/Billing/Generated/AmazonBillingDefaultConfiguration.cs index a4a0a76ab93e..abaf4a4356c2 100644 --- a/sdk/src/Services/Billing/Generated/AmazonBillingDefaultConfiguration.cs +++ b/sdk/src/Services/Billing/Generated/AmazonBillingDefaultConfiguration.cs @@ -43,8 +43,7 @@ public static ReadOnlyCollection GetAllConfigurations() InRegion, CrossRegion, Mobile, - Auto, - Legacy + Auto }); } @@ -55,7 +54,6 @@ public static ReadOnlyCollection GetAllConfigurations() { Name = DefaultConfigurationMode.Standard, RetryMode = RequestRetryMode.Standard, - StsRegionalEndpoints = StsRegionalEndpointsValue.Regional, S3UsEast1RegionalEndpoint = S3UsEast1RegionalEndpointValue.Regional, // 0:00:03.1 ConnectTimeout = TimeSpan.FromMilliseconds(3100L), @@ -71,7 +69,6 @@ public static ReadOnlyCollection GetAllConfigurations() { Name = DefaultConfigurationMode.InRegion, RetryMode = RequestRetryMode.Standard, - StsRegionalEndpoints = StsRegionalEndpointsValue.Regional, S3UsEast1RegionalEndpoint = S3UsEast1RegionalEndpointValue.Regional, // 0:00:01.1 ConnectTimeout = TimeSpan.FromMilliseconds(1100L), @@ -87,7 +84,6 @@ public static ReadOnlyCollection GetAllConfigurations() { Name = DefaultConfigurationMode.CrossRegion, RetryMode = RequestRetryMode.Standard, - StsRegionalEndpoints = StsRegionalEndpointsValue.Regional, S3UsEast1RegionalEndpoint = S3UsEast1RegionalEndpointValue.Regional, // 0:00:03.1 ConnectTimeout = TimeSpan.FromMilliseconds(3100L), @@ -103,7 +99,6 @@ public static ReadOnlyCollection GetAllConfigurations() { Name = DefaultConfigurationMode.Mobile, RetryMode = RequestRetryMode.Standard, - StsRegionalEndpoints = StsRegionalEndpointsValue.Regional, S3UsEast1RegionalEndpoint = S3UsEast1RegionalEndpointValue.Regional, // 0:00:30 ConnectTimeout = TimeSpan.FromMilliseconds(30000L), @@ -119,7 +114,6 @@ public static ReadOnlyCollection GetAllConfigurations() { Name = DefaultConfigurationMode.Auto, RetryMode = RequestRetryMode.Standard, - StsRegionalEndpoints = StsRegionalEndpointsValue.Regional, S3UsEast1RegionalEndpoint = S3UsEast1RegionalEndpointValue.Regional, // 0:00:01.1 ConnectTimeout = TimeSpan.FromMilliseconds(1100L), @@ -128,19 +122,5 @@ public static ReadOnlyCollection GetAllConfigurations() TimeToFirstByteTimeout = null, HttpRequestTimeout = null }; - /// - ///

    The LEGACY mode provides default settings that vary per SDK and were used prior to establishment of defaults_mode

    - ///     - public static IDefaultConfiguration Legacy {get;} = new DefaultConfiguration - { - Name = DefaultConfigurationMode.Legacy, - RetryMode = RequestRetryMode.Legacy, - StsRegionalEndpoints = StsRegionalEndpointsValue.Legacy, - S3UsEast1RegionalEndpoint = S3UsEast1RegionalEndpointValue.Legacy, - ConnectTimeout = null, - TlsNegotiationTimeout = null, - TimeToFirstByteTimeout = null, - HttpRequestTimeout = null - }; } } \ No newline at end of file diff --git a/sdk/src/Services/Billing/Generated/Model/AccessDeniedException.cs b/sdk/src/Services/Billing/Generated/Model/AccessDeniedException.cs index 103575669767..8d4ac3b127a2 100644 --- a/sdk/src/Services/Billing/Generated/Model/AccessDeniedException.cs +++ b/sdk/src/Services/Billing/Generated/Model/AccessDeniedException.cs @@ -106,11 +106,6 @@ protected AccessDeniedException(System.Runtime.Serialization.SerializationInfo i /// The that holds the serialized object data about the exception being thrown. /// The that contains contextual information about the source or destination. /// The parameter is a null reference (Nothing in Visual Basic). -#if BCL35 - [System.Security.Permissions.SecurityPermission( - System.Security.Permissions.SecurityAction.LinkDemand, - Flags = System.Security.Permissions.SecurityPermissionFlag.SerializationFormatter)] -#endif [System.Security.SecurityCritical] // These FxCop rules are giving false-positives for this method [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Security", "CA2123:OverrideLinkDemandsShouldBeIdenticalToBase")] diff --git a/sdk/src/Services/Billing/Generated/Model/ActiveTimeRange.cs b/sdk/src/Services/Billing/Generated/Model/ActiveTimeRange.cs index f4acb5bfd78b..d9ea08f95d3b 100644 --- a/sdk/src/Services/Billing/Generated/Model/ActiveTimeRange.cs +++ b/sdk/src/Services/Billing/Generated/Model/ActiveTimeRange.cs @@ -44,9 +44,9 @@ public partial class ActiveTimeRange /// ///     [AWSProperty(Required=true)] - public DateTime ActiveAfterInclusive + public DateTime? ActiveAfterInclusive { - get { return this._activeAfterInclusive.GetValueOrDefault(); } + get { return this._activeAfterInclusive; } set { this._activeAfterInclusive = value; } } @@ -63,9 +63,9 @@ internal bool IsSetActiveAfterInclusive() ///     ///     [AWSProperty(Required=true)] - public DateTime ActiveBeforeInclusive + public DateTime? ActiveBeforeInclusive { - get { return this._activeBeforeInclusive.GetValueOrDefault(); } + get { return this._activeBeforeInclusive; } set { this._activeBeforeInclusive = value; } } diff --git a/sdk/src/Services/Billing/Generated/Model/Internal/MarshallTransformations/ActiveTimeRangeMarshaller.cs b/sdk/src/Services/Billing/Generated/Model/Internal/MarshallTransformations/ActiveTimeRangeMarshaller.cs index 153bb3c27778..a86f5573cced 100644 --- a/sdk/src/Services/Billing/Generated/Model/Internal/MarshallTransformations/ActiveTimeRangeMarshaller.cs +++ b/sdk/src/Services/Billing/Generated/Model/Internal/MarshallTransformations/ActiveTimeRangeMarshaller.cs @@ -51,13 +51,13 @@ public void Marshall(ActiveTimeRange requestObject, JsonMarshallerContext contex if(requestObject.IsSetActiveAfterInclusive()) { context.Writer.WritePropertyName("activeAfterInclusive"); - context.Writer.Write(requestObject.ActiveAfterInclusive); + context.Writer.Write(requestObject.ActiveAfterInclusive.Value); } if(requestObject.IsSetActiveBeforeInclusive()) { context.Writer.WritePropertyName("activeBeforeInclusive"); - context.Writer.Write(requestObject.ActiveBeforeInclusive); + context.Writer.Write(requestObject.ActiveBeforeInclusive.Value); } } diff --git a/sdk/src/Services/Billing/Generated/Model/Internal/MarshallTransformations/ListBillingViewsRequestMarshaller.cs b/sdk/src/Services/Billing/Generated/Model/Internal/MarshallTransformations/ListBillingViewsRequestMarshaller.cs index eee459472a4f..6d1cd7804f66 100644 --- a/sdk/src/Services/Billing/Generated/Model/Internal/MarshallTransformations/ListBillingViewsRequestMarshaller.cs +++ b/sdk/src/Services/Billing/Generated/Model/Internal/MarshallTransformations/ListBillingViewsRequestMarshaller.cs @@ -63,38 +63,41 @@ public IRequest Marshall(ListBillingViewsRequest publicRequest) request.HttpMethod = "POST"; request.ResourcePath = "/"; - using (StringWriter stringWriter = new StringWriter(CultureInfo.InvariantCulture)) + using (MemoryStream memoryStream = new MemoryStream()) { - JsonWriter writer = new JsonWriter(stringWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetActiveTimeRange()) + using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) { - context.Writer.WritePropertyName("activeTimeRange"); - context.Writer.WriteObjectStart(); + JsonWriter writer = new JsonWriter(streamWriter); + writer.Validate = false; + writer.WriteObjectStart(); + var context = new JsonMarshallerContext(request, writer); + if(publicRequest.IsSetActiveTimeRange()) + { + context.Writer.WritePropertyName("activeTimeRange"); + context.Writer.WriteObjectStart(); - var marshaller = ActiveTimeRangeMarshaller.Instance; - marshaller.Marshall(publicRequest.ActiveTimeRange, context); + var marshaller = ActiveTimeRangeMarshaller.Instance; + marshaller.Marshall(publicRequest.ActiveTimeRange, context); - context.Writer.WriteObjectEnd(); - } + context.Writer.WriteObjectEnd(); + } - if(publicRequest.IsSetMaxResults()) - { - context.Writer.WritePropertyName("maxResults"); - context.Writer.Write(publicRequest.MaxResults); - } + if(publicRequest.IsSetMaxResults()) + { + context.Writer.WritePropertyName("maxResults"); + context.Writer.Write(publicRequest.MaxResults.Value); + } - if(publicRequest.IsSetNextToken()) - { - context.Writer.WritePropertyName("nextToken"); - context.Writer.Write(publicRequest.NextToken); + if(publicRequest.IsSetNextToken()) + { + context.Writer.WritePropertyName("nextToken"); + context.Writer.Write(publicRequest.NextToken); + } + + writer.WriteObjectEnd(); } - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); + request.Content = memoryStream.ToArray(); } diff --git a/sdk/src/Services/Billing/Generated/Model/InternalServerException.cs b/sdk/src/Services/Billing/Generated/Model/InternalServerException.cs index a1baa0f89274..1a09fb6bc0f1 100644 --- a/sdk/src/Services/Billing/Generated/Model/InternalServerException.cs +++ b/sdk/src/Services/Billing/Generated/Model/InternalServerException.cs @@ -106,11 +106,6 @@ protected InternalServerException(System.Runtime.Serialization.SerializationInfo /// The that holds the serialized object data about the exception being thrown. /// The that contains contextual information about the source or destination. /// The parameter is a null reference (Nothing in Visual Basic). -#if BCL35 - [System.Security.Permissions.SecurityPermission( - System.Security.Permissions.SecurityAction.LinkDemand, - Flags = System.Security.Permissions.SecurityPermissionFlag.SerializationFormatter)] -#endif [System.Security.SecurityCritical] // These FxCop rules are giving false-positives for this method [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Security", "CA2123:OverrideLinkDemandsShouldBeIdenticalToBase")] diff --git a/sdk/src/Services/Billing/Generated/Model/ListBillingViewsRequest.cs b/sdk/src/Services/Billing/Generated/Model/ListBillingViewsRequest.cs index 00357801ed88..8570fe5309a0 100644 --- a/sdk/src/Services/Billing/Generated/Model/ListBillingViewsRequest.cs +++ b/sdk/src/Services/Billing/Generated/Model/ListBillingViewsRequest.cs @@ -76,9 +76,9 @@ internal bool IsSetActiveTimeRange() /// ///     [AWSProperty(Min=1, Max=100)] - public int MaxResults + public int? MaxResults { - get { return this._maxResults.GetValueOrDefault(); } + get { return this._maxResults; } set { this._maxResults = value; } } diff --git a/sdk/src/Services/Billing/Generated/Model/ThrottlingException.cs b/sdk/src/Services/Billing/Generated/Model/ThrottlingException.cs index 02da8d143775..dc853cea4847 100644 --- a/sdk/src/Services/Billing/Generated/Model/ThrottlingException.cs +++ b/sdk/src/Services/Billing/Generated/Model/ThrottlingException.cs @@ -106,11 +106,6 @@ protected ThrottlingException(System.Runtime.Serialization.SerializationInfo inf /// The that holds the serialized object data about the exception being thrown. /// The that contains contextual information about the source or destination. /// The parameter is a null reference (Nothing in Visual Basic). -#if BCL35 - [System.Security.Permissions.SecurityPermission( - System.Security.Permissions.SecurityAction.LinkDemand, - Flags = System.Security.Permissions.SecurityPermissionFlag.SerializationFormatter)] -#endif [System.Security.SecurityCritical] // These FxCop rules are giving false-positives for this method [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Security", "CA2123:OverrideLinkDemandsShouldBeIdenticalToBase")] diff --git a/sdk/src/Services/Billing/Generated/Model/ValidationException.cs b/sdk/src/Services/Billing/Generated/Model/ValidationException.cs index c4403c479e91..8ccc66d500e7 100644 --- a/sdk/src/Services/Billing/Generated/Model/ValidationException.cs +++ b/sdk/src/Services/Billing/Generated/Model/ValidationException.cs @@ -110,11 +110,6 @@ protected ValidationException(System.Runtime.Serialization.SerializationInfo inf /// The that holds the serialized object data about the exception being thrown. /// The that contains contextual information about the source or destination. /// The parameter is a null reference (Nothing in Visual Basic). -#if BCL35 - [System.Security.Permissions.SecurityPermission( - System.Security.Permissions.SecurityAction.LinkDemand, - Flags = System.Security.Permissions.SecurityPermissionFlag.SerializationFormatter)] -#endif [System.Security.SecurityCritical] // These FxCop rules are giving false-positives for this method [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Security", "CA2123:OverrideLinkDemandsShouldBeIdenticalToBase")] diff --git a/sdk/src/Services/Billing/Generated/Model/_bcl45+netstandard/BillingPaginatorFactory.cs b/sdk/src/Services/Billing/Generated/Model/_bcl+netstandard/BillingPaginatorFactory.cs similarity index 100% rename from sdk/src/Services/Billing/Generated/Model/_bcl45+netstandard/BillingPaginatorFactory.cs rename to sdk/src/Services/Billing/Generated/Model/_bcl+netstandard/BillingPaginatorFactory.cs diff --git a/sdk/src/Services/Billing/Generated/Model/_bcl45+netstandard/IBillingPaginatorFactory.cs b/sdk/src/Services/Billing/Generated/Model/_bcl+netstandard/IBillingPaginatorFactory.cs similarity index 100% rename from sdk/src/Services/Billing/Generated/Model/_bcl45+netstandard/IBillingPaginatorFactory.cs rename to sdk/src/Services/Billing/Generated/Model/_bcl+netstandard/IBillingPaginatorFactory.cs diff --git a/sdk/src/Services/Billing/Generated/Model/_bcl45+netstandard/IListBillingViewsPaginator.cs b/sdk/src/Services/Billing/Generated/Model/_bcl+netstandard/IListBillingViewsPaginator.cs similarity index 100% rename from sdk/src/Services/Billing/Generated/Model/_bcl45+netstandard/IListBillingViewsPaginator.cs rename to sdk/src/Services/Billing/Generated/Model/_bcl+netstandard/IListBillingViewsPaginator.cs diff --git a/sdk/src/Services/Billing/Generated/Model/_bcl45+netstandard/ListBillingViewsPaginator.cs b/sdk/src/Services/Billing/Generated/Model/_bcl+netstandard/ListBillingViewsPaginator.cs similarity index 100% rename from sdk/src/Services/Billing/Generated/Model/_bcl45+netstandard/ListBillingViewsPaginator.cs rename to sdk/src/Services/Billing/Generated/Model/_bcl+netstandard/ListBillingViewsPaginator.cs diff --git a/sdk/src/Services/Billing/Generated/_bcl45/AmazonBillingClient.cs b/sdk/src/Services/Billing/Generated/_bcl/AmazonBillingClient.cs similarity index 96% rename from sdk/src/Services/Billing/Generated/_bcl45/AmazonBillingClient.cs rename to sdk/src/Services/Billing/Generated/_bcl/AmazonBillingClient.cs index 89ca6962b2da..2ccfd7ad0606 100644 --- a/sdk/src/Services/Billing/Generated/_bcl45/AmazonBillingClient.cs +++ b/sdk/src/Services/Billing/Generated/_bcl/AmazonBillingClient.cs @@ -32,6 +32,7 @@ using Amazon.Runtime.Internal; using Amazon.Runtime.Internal.Auth; using Amazon.Runtime.Internal.Transform; +using Amazon.Runtime.Endpoints; #pragma warning disable CS1570 namespace Amazon.Billing @@ -364,16 +365,8 @@ public virtual ListBillingViewsResponse ListBillingViews(ListBillingViewsRequest /// The resolved endpoint for the given request. public Amazon.Runtime.Endpoints.Endpoint DetermineServiceOperationEndpoint(AmazonWebServiceRequest request) { - var requestContext = new Amazon.Runtime.Internal.RequestContext(false, CreateSigner()) - { - ClientConfig = Config, - OriginalRequest = request, - Request = new Amazon.Runtime.Internal.DefaultRequest(request, ServiceMetadata.ServiceId) - }; - - var executionContext = new Amazon.Runtime.Internal.ExecutionContext(requestContext, null); - var resolver = new AmazonBillingEndpointResolver(); - return resolver.GetEndpoint(executionContext); + var parameters = new ServiceOperationEndpointParameters(request); + return Config.DetermineServiceOperationEndpoint(parameters); } #endregion diff --git a/sdk/src/Services/Billing/Generated/_bcl45/IAmazonBilling.cs b/sdk/src/Services/Billing/Generated/_bcl/IAmazonBilling.cs similarity index 100% rename from sdk/src/Services/Billing/Generated/_bcl45/IAmazonBilling.cs rename to sdk/src/Services/Billing/Generated/_bcl/IAmazonBilling.cs diff --git a/sdk/src/Services/Billing/Generated/_bcl35/AmazonBillingClient.cs b/sdk/src/Services/Billing/Generated/_bcl35/AmazonBillingClient.cs deleted file mode 100644 index f92307abd828..000000000000 --- a/sdk/src/Services/Billing/Generated/_bcl35/AmazonBillingClient.cs +++ /dev/null @@ -1,375 +0,0 @@ -/* - * 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. - */ - -/* - * Do not modify this file. This file is generated from the billing-2023-09-07.normal.json service model. - */ - - -using System; -using System.Collections.Generic; -using System.Net; - -using Amazon.Billing.Model; -using Amazon.Billing.Model.Internal.MarshallTransformations; -using Amazon.Billing.Internal; -using Amazon.Runtime; -using Amazon.Runtime.Internal; -using Amazon.Runtime.Internal.Auth; -using Amazon.Runtime.Internal.Transform; - -#pragma warning disable CS1570 -namespace Amazon.Billing -{ - /// - /// Implementation for accessing Billing - /// - /// You can use the Billing API to programatically list the billing views available to - /// you for a given time period. A billing view represents a set of billing data. - /// - /// - /// - /// The Billing API provides the following endpoint: - /// - /// - /// - /// https://billing.us-east-1.api.aws - /// - /// - public partial class AmazonBillingClient : AmazonServiceClient, IAmazonBilling - { - private static IServiceMetadata serviceMetadata = new AmazonBillingMetadata(); - -#if BCL45 || AWS_ASYNC_ENUMERABLES_API - private IBillingPaginatorFactory _paginators; - - /// - /// Paginators for the service - /// - public IBillingPaginatorFactory Paginators - { - get - { - if (this._paginators == null) - { - this._paginators = new BillingPaginatorFactory(this); - } - return this._paginators; - } - } -#endif - #region Constructors - - /// - /// Constructs AmazonBillingClient with the credentials loaded from the application's - /// default configuration, and if unsuccessful from the Instance Profile service on an EC2 instance. - /// - /// Example App.config with credentials set. - /// - /// <?xml version="1.0" encoding="utf-8" ?> - /// <configuration> - /// <appSettings> - /// <add key="AWSProfileName" value="AWS Default"/> - /// </appSettings> - /// </configuration> - /// - /// - /// - public AmazonBillingClient() - : base(FallbackCredentialsFactory.GetCredentials(), new AmazonBillingConfig()) { } - - /// - /// Constructs AmazonBillingClient with the credentials loaded from the application's - /// default configuration, and if unsuccessful from the Instance Profile service on an EC2 instance. - /// - /// Example App.config with credentials set. - /// - /// <?xml version="1.0" encoding="utf-8" ?> - /// <configuration> - /// <appSettings> - /// <add key="AWSProfileName" value="AWS Default"/> - /// </appSettings> - /// </configuration> - /// - /// - /// - /// The region to connect. - public AmazonBillingClient(RegionEndpoint region) - : base(FallbackCredentialsFactory.GetCredentials(), new AmazonBillingConfig{RegionEndpoint = region}) { } - - /// - /// Constructs AmazonBillingClient with the credentials loaded from the application's - /// default configuration, and if unsuccessful from the Instance Profile service on an EC2 instance. - /// - /// Example App.config with credentials set. - /// - /// <?xml version="1.0" encoding="utf-8" ?> - /// <configuration> - /// <appSettings> - /// <add key="AWSProfileName" value="AWS Default"/> - /// </appSettings> - /// </configuration> - /// - /// - /// - /// The AmazonBillingClient Configuration Object - public AmazonBillingClient(AmazonBillingConfig config) - : base(FallbackCredentialsFactory.GetCredentials(config), config){} - /// - /// Constructs AmazonBillingClient with AWS Credentials - /// - /// AWS Credentials - public AmazonBillingClient(AWSCredentials credentials) - : this(credentials, new AmazonBillingConfig()) - { - } - - /// - /// Constructs AmazonBillingClient with AWS Credentials - /// - /// AWS Credentials - /// The region to connect. - public AmazonBillingClient(AWSCredentials credentials, RegionEndpoint region) - : this(credentials, new AmazonBillingConfig{RegionEndpoint = region}) - { - } - - /// - /// Constructs AmazonBillingClient with AWS Credentials and an - /// AmazonBillingClient Configuration object. - /// - /// AWS Credentials - /// The AmazonBillingClient Configuration Object - public AmazonBillingClient(AWSCredentials credentials, AmazonBillingConfig clientConfig) - : base(credentials, clientConfig) - { - } - - /// - /// Constructs AmazonBillingClient with AWS Access Key ID and AWS Secret Key - /// - /// AWS Access Key ID - /// AWS Secret Access Key - public AmazonBillingClient(string awsAccessKeyId, string awsSecretAccessKey) - : this(awsAccessKeyId, awsSecretAccessKey, new AmazonBillingConfig()) - { - } - - /// - /// Constructs AmazonBillingClient with AWS Access Key ID and AWS Secret Key - /// - /// AWS Access Key ID - /// AWS Secret Access Key - /// The region to connect. - public AmazonBillingClient(string awsAccessKeyId, string awsSecretAccessKey, RegionEndpoint region) - : this(awsAccessKeyId, awsSecretAccessKey, new AmazonBillingConfig() {RegionEndpoint=region}) - { - } - - /// - /// Constructs AmazonBillingClient with AWS Access Key ID, AWS Secret Key and an - /// AmazonBillingClient Configuration object. - /// - /// AWS Access Key ID - /// AWS Secret Access Key - /// The AmazonBillingClient Configuration Object - public AmazonBillingClient(string awsAccessKeyId, string awsSecretAccessKey, AmazonBillingConfig clientConfig) - : base(awsAccessKeyId, awsSecretAccessKey, clientConfig) - { - } - - /// - /// Constructs AmazonBillingClient with AWS Access Key ID and AWS Secret Key - /// - /// AWS Access Key ID - /// AWS Secret Access Key - /// AWS Session Token - public AmazonBillingClient(string awsAccessKeyId, string awsSecretAccessKey, string awsSessionToken) - : this(awsAccessKeyId, awsSecretAccessKey, awsSessionToken, new AmazonBillingConfig()) - { - } - - /// - /// Constructs AmazonBillingClient with AWS Access Key ID and AWS Secret Key - /// - /// AWS Access Key ID - /// AWS Secret Access Key - /// AWS Session Token - /// The region to connect. - public AmazonBillingClient(string awsAccessKeyId, string awsSecretAccessKey, string awsSessionToken, RegionEndpoint region) - : this(awsAccessKeyId, awsSecretAccessKey, awsSessionToken, new AmazonBillingConfig{RegionEndpoint = region}) - { - } - - /// - /// Constructs AmazonBillingClient with AWS Access Key ID, AWS Secret Key and an - /// AmazonBillingClient Configuration object. - /// - /// AWS Access Key ID - /// AWS Secret Access Key - /// AWS Session Token - /// The AmazonBillingClient Configuration Object - public AmazonBillingClient(string awsAccessKeyId, string awsSecretAccessKey, string awsSessionToken, AmazonBillingConfig clientConfig) - : base(awsAccessKeyId, awsSecretAccessKey, awsSessionToken, clientConfig) - { - } - - #endregion - - #region Overrides - - - /// - /// Creates the signer for the service. - /// - protected override AbstractAWSSigner CreateSigner() - { - return new AWS4Signer(); - } - - /// - /// Customize the pipeline - /// - /// - protected override void CustomizeRuntimePipeline(RuntimePipeline pipeline) - { - pipeline.RemoveHandler(); - pipeline.AddHandlerAfter(new AmazonBillingEndpointResolver()); - } - /// - /// Capture metadata for the service. - /// - protected override IServiceMetadata ServiceMetadata - { - get - { - return serviceMetadata; - } - } - - #endregion - - #region Dispose - - /// - /// Disposes the service client. - /// - protected override void Dispose(bool disposing) - { - base.Dispose(disposing); - } - - #endregion - - - #region ListBillingViews - - /// - /// Lists the billing views available for a given time period. - /// - /// - /// - /// Every Amazon Web Services account has a unique PRIMARY billing view that represents - /// the billing data available by default. Accounts that use Billing Conductor also have - /// BILLING_GROUP billing views representing pro forma costs associated with each - /// created billing group. - /// - /// - /// Container for the necessary parameters to execute the ListBillingViews service method. - /// - /// The response from the ListBillingViews service method, as returned by Billing. - /// - /// You don't have sufficient access to perform this action. - /// - /// - /// The request processing failed because of an unknown error, exception, or failure. - /// - /// - /// The request was denied due to request throttling. - /// - /// - /// The input fails to satisfy the constraints specified by an Amazon Web Services service. - /// - /// REST API Reference for ListBillingViews Operation - public virtual ListBillingViewsResponse ListBillingViews(ListBillingViewsRequest request) - { - var options = new InvokeOptions(); - options.RequestMarshaller = ListBillingViewsRequestMarshaller.Instance; - options.ResponseUnmarshaller = ListBillingViewsResponseUnmarshaller.Instance; - - return Invoke(request, options); - } - - /// - /// Initiates the asynchronous execution of the ListBillingViews operation. - /// - /// - /// Container for the necessary parameters to execute the ListBillingViews operation on AmazonBillingClient. - /// An AsyncCallback delegate that is invoked when the operation completes. - /// A user-defined state object that is passed to the callback procedure. Retrieve this object from within the callback - /// procedure using the AsyncState property. - /// - /// An IAsyncResult that can be used to poll or wait for results, or both; this value is also needed when invoking EndListBillingViews - /// operation. - /// REST API Reference for ListBillingViews Operation - public virtual IAsyncResult BeginListBillingViews(ListBillingViewsRequest request, AsyncCallback callback, object state) - { - var options = new InvokeOptions(); - options.RequestMarshaller = ListBillingViewsRequestMarshaller.Instance; - options.ResponseUnmarshaller = ListBillingViewsResponseUnmarshaller.Instance; - - return BeginInvoke(request, options, callback, state); - } - - /// - /// Finishes the asynchronous execution of the ListBillingViews operation. - /// - /// - /// The IAsyncResult returned by the call to BeginListBillingViews. - /// - /// Returns a ListBillingViewsResult from Billing. - /// REST API Reference for ListBillingViews Operation - public virtual ListBillingViewsResponse EndListBillingViews(IAsyncResult asyncResult) - { - return EndInvoke(asyncResult); - } - - #endregion - - #region DetermineServiceOperationEndpoint - - /// - /// Returns the endpoint that will be used for a particular request. - /// - /// Request for the desired service operation. - /// The resolved endpoint for the given request. - public Amazon.Runtime.Endpoints.Endpoint DetermineServiceOperationEndpoint(AmazonWebServiceRequest request) - { - var requestContext = new Amazon.Runtime.Internal.RequestContext(false, CreateSigner()) - { - ClientConfig = Config, - OriginalRequest = request, - Request = new Amazon.Runtime.Internal.DefaultRequest(request, ServiceMetadata.ServiceId) - }; - - var executionContext = new Amazon.Runtime.Internal.ExecutionContext(requestContext, null); - var resolver = new AmazonBillingEndpointResolver(); - return resolver.GetEndpoint(executionContext); - } - - #endregion - - } -} \ No newline at end of file diff --git a/sdk/src/Services/Billing/Generated/_bcl35/IAmazonBilling.cs b/sdk/src/Services/Billing/Generated/_bcl35/IAmazonBilling.cs deleted file mode 100644 index bd0ab968d1fa..000000000000 --- a/sdk/src/Services/Billing/Generated/_bcl35/IAmazonBilling.cs +++ /dev/null @@ -1,130 +0,0 @@ -/* - * 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. - */ - -/* - * Do not modify this file. This file is generated from the billing-2023-09-07.normal.json service model. - */ - - -using System; -using System.Collections.Generic; - -using Amazon.Runtime; -using Amazon.Billing.Model; - -#pragma warning disable CS1570 -namespace Amazon.Billing -{ - /// - /// Interface for accessing Billing - /// - /// You can use the Billing API to programatically list the billing views available to - /// you for a given time period. A billing view represents a set of billing data. - /// - /// - /// - /// The Billing API provides the following endpoint: - /// - /// - /// - /// https://billing.us-east-1.api.aws - /// - /// - public partial interface IAmazonBilling : IAmazonService, IDisposable - { - - -#if BCL45 || AWS_ASYNC_ENUMERABLES_API - /// - /// Paginators for the service - /// - IBillingPaginatorFactory Paginators { get; } -#endif - - - - #region ListBillingViews - - - /// - /// Lists the billing views available for a given time period. - /// - /// - /// - /// Every Amazon Web Services account has a unique PRIMARY billing view that represents - /// the billing data available by default. Accounts that use Billing Conductor also have - /// BILLING_GROUP billing views representing pro forma costs associated with each - /// created billing group. - /// - /// - /// Container for the necessary parameters to execute the ListBillingViews service method. - /// - /// The response from the ListBillingViews service method, as returned by Billing. - /// - /// You don't have sufficient access to perform this action. - /// - /// - /// The request processing failed because of an unknown error, exception, or failure. - /// - /// - /// The request was denied due to request throttling. - /// - /// - /// The input fails to satisfy the constraints specified by an Amazon Web Services service. - /// - /// REST API Reference for ListBillingViews Operation - ListBillingViewsResponse ListBillingViews(ListBillingViewsRequest request); - - /// - /// Initiates the asynchronous execution of the ListBillingViews operation. - /// - /// - /// Container for the necessary parameters to execute the ListBillingViews operation on AmazonBillingClient. - /// An AsyncCallback delegate that is invoked when the operation completes. - /// A user-defined state object that is passed to the callback procedure. Retrieve this object from within the callback - /// procedure using the AsyncState property. - /// - /// An IAsyncResult that can be used to poll or wait for results, or both; this value is also needed when invoking EndListBillingViews - /// operation. - /// REST API Reference for ListBillingViews Operation - IAsyncResult BeginListBillingViews(ListBillingViewsRequest request, AsyncCallback callback, object state); - - - - /// - /// Finishes the asynchronous execution of the ListBillingViews operation. - /// - /// - /// The IAsyncResult returned by the call to BeginListBillingViews. - /// - /// Returns a ListBillingViewsResult from Billing. - /// REST API Reference for ListBillingViews Operation - ListBillingViewsResponse EndListBillingViews(IAsyncResult asyncResult); - - #endregion - - #region DetermineServiceOperationEndpoint - - /// - /// Returns the endpoint that will be used for a particular request. - /// - /// Request for the desired service operation. - /// The resolved endpoint for the given request. - Amazon.Runtime.Endpoints.Endpoint DetermineServiceOperationEndpoint(AmazonWebServiceRequest request); - - #endregion - - } -} \ No newline at end of file diff --git a/sdk/src/Services/Billing/Generated/_netstandard/AmazonBillingClient.cs b/sdk/src/Services/Billing/Generated/_netstandard/AmazonBillingClient.cs index 400b6a8ab9d2..2ef099296901 100644 --- a/sdk/src/Services/Billing/Generated/_netstandard/AmazonBillingClient.cs +++ b/sdk/src/Services/Billing/Generated/_netstandard/AmazonBillingClient.cs @@ -32,6 +32,7 @@ using Amazon.Runtime.Internal; using Amazon.Runtime.Internal.Auth; using Amazon.Runtime.Internal.Transform; +using Amazon.Runtime.Endpoints; #pragma warning disable CS1570 namespace Amazon.Billing @@ -341,16 +342,8 @@ internal virtual ListBillingViewsResponse ListBillingViews(ListBillingViewsReque /// The resolved endpoint for the given request. public Amazon.Runtime.Endpoints.Endpoint DetermineServiceOperationEndpoint(AmazonWebServiceRequest request) { - var requestContext = new Amazon.Runtime.Internal.RequestContext(false, CreateSigner()) - { - ClientConfig = Config, - OriginalRequest = request, - Request = new Amazon.Runtime.Internal.DefaultRequest(request, ServiceMetadata.ServiceId) - }; - - var executionContext = new Amazon.Runtime.Internal.ExecutionContext(requestContext, null); - var resolver = new AmazonBillingEndpointResolver(); - return resolver.GetEndpoint(executionContext); + var parameters = new ServiceOperationEndpointParameters(request); + return Config.DetermineServiceOperationEndpoint(parameters); } #endregion diff --git a/sdk/src/Services/Billing/Generated/_netstandard/IAmazonBilling.cs b/sdk/src/Services/Billing/Generated/_netstandard/IAmazonBilling.cs index 844bdcb1b399..8171c1204d5b 100644 --- a/sdk/src/Services/Billing/Generated/_netstandard/IAmazonBilling.cs +++ b/sdk/src/Services/Billing/Generated/_netstandard/IAmazonBilling.cs @@ -102,5 +102,33 @@ public partial interface IAmazonBilling : IAmazonService, IDisposable #endregion + #region Static factory interface methods +#if NET8_0_OR_GREATER +// Warning CA1033 is issued when the child types can not call the method defined in parent types. +// In this use case the intended caller is only meant to be the interface as a factory +// method to create the child types. Given the SDK use case the warning can be ignored. +#pragma warning disable CA1033 + /// + [System.Diagnostics.CodeAnalysis.DynamicDependency(System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicProperties, typeof(AmazonBillingConfig))] + static ClientConfig IAmazonService.CreateDefaultClientConfig() => new AmazonBillingConfig(); + + /// + [System.Diagnostics.CodeAnalysis.UnconditionalSuppressMessage("AssemblyLoadTrimming", "IL2026:RequiresUnreferencedCode", + Justification = "This suppression is here to ignore the warnings caused by CognitoSync. See justification in IAmazonService.")] + static IAmazonService IAmazonService.CreateDefaultServiceClient(AWSCredentials awsCredentials, ClientConfig clientConfig) + { + var serviceClientConfig = clientConfig as AmazonBillingConfig; + if (serviceClientConfig == null) + { + throw new AmazonClientException("ClientConfig is not of type AmazonBillingConfig to create AmazonBillingClient"); + } + + return awsCredentials == null ? + new AmazonBillingClient(serviceClientConfig) : + new AmazonBillingClient(awsCredentials, serviceClientConfig); + } +#pragma warning restore CA1033 +#endif + #endregion } } \ No newline at end of file diff --git a/sdk/src/Services/Billing/Properties/AssemblyInfo.cs b/sdk/src/Services/Billing/Properties/AssemblyInfo.cs index 668094ec78ed..16f9c78aa306 100644 --- a/sdk/src/Services/Billing/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/Billing/Properties/AssemblyInfo.cs @@ -7,10 +7,8 @@ // set of attributes. Change these attribute values to modify the information // associated with an assembly. [assembly: AssemblyTitle("AWSSDK.Billing")] -#if BCL35 -[assembly: AssemblyDescription("The Amazon Web Services SDK for .NET (3.5) - AWS Billing. Today, AWS announces the general availability of ListBillingViews API in the AWS SDKs, to enable AWS Billing Conductor (ABC) users to create proforma Cost and Usage Reports (CUR) programmatically.")] -#elif BCL45 -[assembly: AssemblyDescription("The Amazon Web Services SDK for .NET (4.5) - AWS Billing. Today, AWS announces the general availability of ListBillingViews API in the AWS SDKs, to enable AWS Billing Conductor (ABC) users to create proforma Cost and Usage Reports (CUR) programmatically.")] +#if BCL +[assembly: AssemblyDescription("The Amazon Web Services SDK for .NET (4.7.2) - AWS Billing. Today, AWS announces the general availability of ListBillingViews API in the AWS SDKs, to enable AWS Billing Conductor (ABC) users to create proforma Cost and Usage Reports (CUR) programmatically.")] #elif NETSTANDARD20 [assembly: AssemblyDescription("The Amazon Web Services SDK for .NET (NetStandard 2.0) - AWS Billing. Today, AWS announces the general availability of ListBillingViews API in the AWS SDKs, to enable AWS Billing Conductor (ABC) users to create proforma Cost and Usage Reports (CUR) programmatically.")] #elif NETCOREAPP3_1 @@ -43,9 +41,9 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.3")] - #if BCL -[assembly: System.Security.AllowPartiallyTrustedCallers] -#endif \ No newline at end of file +[assembly: AssemblyVersion("4.0")] +#else +[assembly: AssemblyVersion("4.0.0.0")] +#endif +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/src/Services/BillingConductor/BillingConductor.sln b/sdk/src/Services/BillingConductor/BillingConductor.sln index 1880cac67d19..a4fb05c32b11 100644 --- a/sdk/src/Services/BillingConductor/BillingConductor.sln +++ b/sdk/src/Services/BillingConductor/BillingConductor.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {DEC129BD-2376-4CF1-AD28-800865733960}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {DEC129BD-2376-4CF1-AD28-800865733960}.Debug|Any CPU.Build.0 = Debug|Any CPU {DEC129BD-2376-4CF1-AD28-800865733960}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {71339AEA-3E76-431A-923F-5E3BCA110E90}.Debug|Any CPU.Build.0 = Debug|Any CPU {71339AEA-3E76-431A-923F-5E3BCA110E90}.Release|Any CPU.ActiveCfg = Release|Any CPU {71339AEA-3E76-431A-923F-5E3BCA110E90}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {DA9BFD3B-9C98-475F-B401-1D99AA05158F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DA9BFD3B-9C98-475F-B401-1D99AA05158F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DA9BFD3B-9C98-475F-B401-1D99AA05158F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DA9BFD3B-9C98-475F-B401-1D99AA05158F}.Release|Any CPU.Build.0 = Release|Any CPU - {AB6DBD88-624B-4014-BBF4-39AB0ED401F3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AB6DBD88-624B-4014-BBF4-39AB0ED401F3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AB6DBD88-624B-4014-BBF4-39AB0ED401F3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AB6DBD88-624B-4014-BBF4-39AB0ED401F3}.Release|Any CPU.Build.0 = Release|Any CPU - {40A29307-20DC-4B56-B22A-0B4A81590A03}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {40A29307-20DC-4B56-B22A-0B4A81590A03}.Debug|Any CPU.Build.0 = Debug|Any CPU - {40A29307-20DC-4B56-B22A-0B4A81590A03}.Release|Any CPU.ActiveCfg = Release|Any CPU - {40A29307-20DC-4B56-B22A-0B4A81590A03}.Release|Any CPU.Build.0 = Release|Any CPU - {B8A5B152-7D2E-4395-8CD7-0D1616C2AC69}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B8A5B152-7D2E-4395-8CD7-0D1616C2AC69}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B8A5B152-7D2E-4395-8CD7-0D1616C2AC69}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B8A5B152-7D2E-4395-8CD7-0D1616C2AC69}.Release|Any CPU.Build.0 = Release|Any CPU - {7B0A7DFD-6AB4-4BCC-8DAE-266FA4B1D211}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7B0A7DFD-6AB4-4BCC-8DAE-266FA4B1D211}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7B0A7DFD-6AB4-4BCC-8DAE-266FA4B1D211}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7B0A7DFD-6AB4-4BCC-8DAE-266FA4B1D211}.Release|Any CPU.Build.0 = Release|Any CPU - {420A844C-1AE3-4719-BE94-72F143E734E9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {420A844C-1AE3-4719-BE94-72F143E734E9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {420A844C-1AE3-4719-BE94-72F143E734E9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {420A844C-1AE3-4719-BE94-72F143E734E9}.Release|Any CPU.Build.0 = Release|Any CPU - {0A4719A7-286F-4B69-99CE-413521B3DCAA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0A4719A7-286F-4B69-99CE-413521B3DCAA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0A4719A7-286F-4B69-99CE-413521B3DCAA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0A4719A7-286F-4B69-99CE-413521B3DCAA}.Release|Any CPU.Build.0 = Release|Any CPU - {D2B65539-D6B5-455A-9AD0-CC92E92048A5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D2B65539-D6B5-455A-9AD0-CC92E92048A5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D2B65539-D6B5-455A-9AD0-CC92E92048A5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D2B65539-D6B5-455A-9AD0-CC92E92048A5}.Release|Any CPU.Build.0 = Release|Any CPU - {25F805B3-DD46-48BF-A384-87C760BD1CF6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {25F805B3-DD46-48BF-A384-87C760BD1CF6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {25F805B3-DD46-48BF-A384-87C760BD1CF6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {25F805B3-DD46-48BF-A384-87C760BD1CF6}.Release|Any CPU.Build.0 = Release|Any CPU - {82420771-6893-4B77-9EFF-690D19B9985C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {82420771-6893-4B77-9EFF-690D19B9985C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {82420771-6893-4B77-9EFF-690D19B9985C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {82420771-6893-4B77-9EFF-690D19B9985C}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {DA9BFD3B-9C98-475F-B401-1D99AA05158F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DA9BFD3B-9C98-475F-B401-1D99AA05158F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DA9BFD3B-9C98-475F-B401-1D99AA05158F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DA9BFD3B-9C98-475F-B401-1D99AA05158F}.Release|Any CPU.Build.0 = Release|Any CPU - {AB6DBD88-624B-4014-BBF4-39AB0ED401F3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AB6DBD88-624B-4014-BBF4-39AB0ED401F3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AB6DBD88-624B-4014-BBF4-39AB0ED401F3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AB6DBD88-624B-4014-BBF4-39AB0ED401F3}.Release|Any CPU.Build.0 = Release|Any CPU - {40A29307-20DC-4B56-B22A-0B4A81590A03}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {40A29307-20DC-4B56-B22A-0B4A81590A03}.Debug|Any CPU.Build.0 = Debug|Any CPU - {40A29307-20DC-4B56-B22A-0B4A81590A03}.Release|Any CPU.ActiveCfg = Release|Any CPU - {40A29307-20DC-4B56-B22A-0B4A81590A03}.Release|Any CPU.Build.0 = Release|Any CPU - {B8A5B152-7D2E-4395-8CD7-0D1616C2AC69}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B8A5B152-7D2E-4395-8CD7-0D1616C2AC69}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B8A5B152-7D2E-4395-8CD7-0D1616C2AC69}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B8A5B152-7D2E-4395-8CD7-0D1616C2AC69}.Release|Any CPU.Build.0 = Release|Any CPU - {7B0A7DFD-6AB4-4BCC-8DAE-266FA4B1D211}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7B0A7DFD-6AB4-4BCC-8DAE-266FA4B1D211}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7B0A7DFD-6AB4-4BCC-8DAE-266FA4B1D211}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7B0A7DFD-6AB4-4BCC-8DAE-266FA4B1D211}.Release|Any CPU.Build.0 = Release|Any CPU - {420A844C-1AE3-4719-BE94-72F143E734E9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {420A844C-1AE3-4719-BE94-72F143E734E9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {420A844C-1AE3-4719-BE94-72F143E734E9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {420A844C-1AE3-4719-BE94-72F143E734E9}.Release|Any CPU.Build.0 = Release|Any CPU - {0A4719A7-286F-4B69-99CE-413521B3DCAA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0A4719A7-286F-4B69-99CE-413521B3DCAA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0A4719A7-286F-4B69-99CE-413521B3DCAA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0A4719A7-286F-4B69-99CE-413521B3DCAA}.Release|Any CPU.Build.0 = Release|Any CPU - {D2B65539-D6B5-455A-9AD0-CC92E92048A5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D2B65539-D6B5-455A-9AD0-CC92E92048A5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D2B65539-D6B5-455A-9AD0-CC92E92048A5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D2B65539-D6B5-455A-9AD0-CC92E92048A5}.Release|Any CPU.Build.0 = Release|Any CPU - {25F805B3-DD46-48BF-A384-87C760BD1CF6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {25F805B3-DD46-48BF-A384-87C760BD1CF6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {25F805B3-DD46-48BF-A384-87C760BD1CF6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {25F805B3-DD46-48BF-A384-87C760BD1CF6}.Release|Any CPU.Build.0 = Release|Any CPU - {82420771-6893-4B77-9EFF-690D19B9985C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {82420771-6893-4B77-9EFF-690D19B9985C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {82420771-6893-4B77-9EFF-690D19B9985C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {82420771-6893-4B77-9EFF-690D19B9985C}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {DEC129BD-2376-4CF1-AD28-800865733960} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {F886AD55-C46A-484D-9D8A-44948640D52A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {1A0FEEED-CEE7-4E21-B32A-1CD650AF6903} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {623E6852-FB06-4DCB-9274-AFD93BD7B685} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {71339AEA-3E76-431A-923F-5E3BCA110E90} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {DA9BFD3B-9C98-475F-B401-1D99AA05158F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {AB6DBD88-624B-4014-BBF4-39AB0ED401F3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {40A29307-20DC-4B56-B22A-0B4A81590A03} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B8A5B152-7D2E-4395-8CD7-0D1616C2AC69} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {7B0A7DFD-6AB4-4BCC-8DAE-266FA4B1D211} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {420A844C-1AE3-4719-BE94-72F143E734E9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0A4719A7-286F-4B69-99CE-413521B3DCAA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D2B65539-D6B5-455A-9AD0-CC92E92048A5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {25F805B3-DD46-48BF-A384-87C760BD1CF6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {82420771-6893-4B77-9EFF-690D19B9985C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {DA9BFD3B-9C98-475F-B401-1D99AA05158F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {AB6DBD88-624B-4014-BBF4-39AB0ED401F3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {40A29307-20DC-4B56-B22A-0B4A81590A03} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B8A5B152-7D2E-4395-8CD7-0D1616C2AC69} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {7B0A7DFD-6AB4-4BCC-8DAE-266FA4B1D211} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {420A844C-1AE3-4719-BE94-72F143E734E9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0A4719A7-286F-4B69-99CE-413521B3DCAA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D2B65539-D6B5-455A-9AD0-CC92E92048A5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {25F805B3-DD46-48BF-A384-87C760BD1CF6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {82420771-6893-4B77-9EFF-690D19B9985C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {61A6FC00-4677-4AA5-8503-317819F4AE0D} diff --git a/sdk/src/Services/BillingConductor/Generated/AmazonBillingConductorConfig.cs b/sdk/src/Services/BillingConductor/Generated/AmazonBillingConductorConfig.cs index 88c2b15c3456..b2f91a153375 100644 --- a/sdk/src/Services/BillingConductor/Generated/AmazonBillingConductorConfig.cs +++ b/sdk/src/Services/BillingConductor/Generated/AmazonBillingConductorConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.BillingConductor public partial class AmazonBillingConductorConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("billingconductor", "4.0.0.0"); private static readonly AmazonBillingConductorEndpointResolver EndpointResolver = new AmazonBillingConductorEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("billingconductor", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("billingconductor", "3.7.400.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/BillingConductor/Properties/AssemblyInfo.cs b/sdk/src/Services/BillingConductor/Properties/AssemblyInfo.cs index 5da0ec28566c..f107d76476f8 100644 --- a/sdk/src/Services/BillingConductor/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/BillingConductor/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/Braket/Braket.sln b/sdk/src/Services/Braket/Braket.sln index dd8b0774595f..61c88a23d531 100644 --- a/sdk/src/Services/Braket/Braket.sln +++ b/sdk/src/Services/Braket/Braket.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {632AFDE7-F1BA-4579-B832-773906AAC6EF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {632AFDE7-F1BA-4579-B832-773906AAC6EF}.Debug|Any CPU.Build.0 = Debug|Any CPU {632AFDE7-F1BA-4579-B832-773906AAC6EF}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {131FFF28-A5D8-4947-AF32-72DB9E35F158}.Debug|Any CPU.Build.0 = Debug|Any CPU {131FFF28-A5D8-4947-AF32-72DB9E35F158}.Release|Any CPU.ActiveCfg = Release|Any CPU {131FFF28-A5D8-4947-AF32-72DB9E35F158}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {6AE02D6B-3CC4-4083-A052-F3C659C56D35}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6AE02D6B-3CC4-4083-A052-F3C659C56D35}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6AE02D6B-3CC4-4083-A052-F3C659C56D35}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6AE02D6B-3CC4-4083-A052-F3C659C56D35}.Release|Any CPU.Build.0 = Release|Any CPU - {F136BF96-0B77-4FDF-8798-278CF2E1E851}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F136BF96-0B77-4FDF-8798-278CF2E1E851}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F136BF96-0B77-4FDF-8798-278CF2E1E851}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F136BF96-0B77-4FDF-8798-278CF2E1E851}.Release|Any CPU.Build.0 = Release|Any CPU - {06A80C6A-3347-4F0E-AFFD-563F33B7A9EE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {06A80C6A-3347-4F0E-AFFD-563F33B7A9EE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {06A80C6A-3347-4F0E-AFFD-563F33B7A9EE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {06A80C6A-3347-4F0E-AFFD-563F33B7A9EE}.Release|Any CPU.Build.0 = Release|Any CPU - {52E7D63F-FF3C-49D9-8A60-6C1D13816F14}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {52E7D63F-FF3C-49D9-8A60-6C1D13816F14}.Debug|Any CPU.Build.0 = Debug|Any CPU - {52E7D63F-FF3C-49D9-8A60-6C1D13816F14}.Release|Any CPU.ActiveCfg = Release|Any CPU - {52E7D63F-FF3C-49D9-8A60-6C1D13816F14}.Release|Any CPU.Build.0 = Release|Any CPU - {31267B9A-CCC3-4AED-ACC5-E1BD74216828}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {31267B9A-CCC3-4AED-ACC5-E1BD74216828}.Debug|Any CPU.Build.0 = Debug|Any CPU - {31267B9A-CCC3-4AED-ACC5-E1BD74216828}.Release|Any CPU.ActiveCfg = Release|Any CPU - {31267B9A-CCC3-4AED-ACC5-E1BD74216828}.Release|Any CPU.Build.0 = Release|Any CPU - {0E42AFBD-BC6D-422E-94EF-922109FB05ED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0E42AFBD-BC6D-422E-94EF-922109FB05ED}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0E42AFBD-BC6D-422E-94EF-922109FB05ED}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0E42AFBD-BC6D-422E-94EF-922109FB05ED}.Release|Any CPU.Build.0 = Release|Any CPU - {EB576EFA-F238-4341-ABF7-214B8A65A40E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EB576EFA-F238-4341-ABF7-214B8A65A40E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EB576EFA-F238-4341-ABF7-214B8A65A40E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EB576EFA-F238-4341-ABF7-214B8A65A40E}.Release|Any CPU.Build.0 = Release|Any CPU - {6E84B742-B09D-48DD-B676-A3B66CA2DB26}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6E84B742-B09D-48DD-B676-A3B66CA2DB26}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6E84B742-B09D-48DD-B676-A3B66CA2DB26}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6E84B742-B09D-48DD-B676-A3B66CA2DB26}.Release|Any CPU.Build.0 = Release|Any CPU - {8F09F422-6D6D-4AB8-9108-9A49287FA2A3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8F09F422-6D6D-4AB8-9108-9A49287FA2A3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8F09F422-6D6D-4AB8-9108-9A49287FA2A3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8F09F422-6D6D-4AB8-9108-9A49287FA2A3}.Release|Any CPU.Build.0 = Release|Any CPU - {602433D1-A340-42DC-A723-8F25BE6E9433}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {602433D1-A340-42DC-A723-8F25BE6E9433}.Debug|Any CPU.Build.0 = Debug|Any CPU - {602433D1-A340-42DC-A723-8F25BE6E9433}.Release|Any CPU.ActiveCfg = Release|Any CPU - {602433D1-A340-42DC-A723-8F25BE6E9433}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {6AE02D6B-3CC4-4083-A052-F3C659C56D35}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6AE02D6B-3CC4-4083-A052-F3C659C56D35}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6AE02D6B-3CC4-4083-A052-F3C659C56D35}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6AE02D6B-3CC4-4083-A052-F3C659C56D35}.Release|Any CPU.Build.0 = Release|Any CPU - {F136BF96-0B77-4FDF-8798-278CF2E1E851}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F136BF96-0B77-4FDF-8798-278CF2E1E851}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F136BF96-0B77-4FDF-8798-278CF2E1E851}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F136BF96-0B77-4FDF-8798-278CF2E1E851}.Release|Any CPU.Build.0 = Release|Any CPU - {06A80C6A-3347-4F0E-AFFD-563F33B7A9EE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {06A80C6A-3347-4F0E-AFFD-563F33B7A9EE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {06A80C6A-3347-4F0E-AFFD-563F33B7A9EE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {06A80C6A-3347-4F0E-AFFD-563F33B7A9EE}.Release|Any CPU.Build.0 = Release|Any CPU - {52E7D63F-FF3C-49D9-8A60-6C1D13816F14}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {52E7D63F-FF3C-49D9-8A60-6C1D13816F14}.Debug|Any CPU.Build.0 = Debug|Any CPU - {52E7D63F-FF3C-49D9-8A60-6C1D13816F14}.Release|Any CPU.ActiveCfg = Release|Any CPU - {52E7D63F-FF3C-49D9-8A60-6C1D13816F14}.Release|Any CPU.Build.0 = Release|Any CPU - {31267B9A-CCC3-4AED-ACC5-E1BD74216828}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {31267B9A-CCC3-4AED-ACC5-E1BD74216828}.Debug|Any CPU.Build.0 = Debug|Any CPU - {31267B9A-CCC3-4AED-ACC5-E1BD74216828}.Release|Any CPU.ActiveCfg = Release|Any CPU - {31267B9A-CCC3-4AED-ACC5-E1BD74216828}.Release|Any CPU.Build.0 = Release|Any CPU - {0E42AFBD-BC6D-422E-94EF-922109FB05ED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0E42AFBD-BC6D-422E-94EF-922109FB05ED}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0E42AFBD-BC6D-422E-94EF-922109FB05ED}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0E42AFBD-BC6D-422E-94EF-922109FB05ED}.Release|Any CPU.Build.0 = Release|Any CPU - {EB576EFA-F238-4341-ABF7-214B8A65A40E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EB576EFA-F238-4341-ABF7-214B8A65A40E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EB576EFA-F238-4341-ABF7-214B8A65A40E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EB576EFA-F238-4341-ABF7-214B8A65A40E}.Release|Any CPU.Build.0 = Release|Any CPU - {6E84B742-B09D-48DD-B676-A3B66CA2DB26}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6E84B742-B09D-48DD-B676-A3B66CA2DB26}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6E84B742-B09D-48DD-B676-A3B66CA2DB26}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6E84B742-B09D-48DD-B676-A3B66CA2DB26}.Release|Any CPU.Build.0 = Release|Any CPU - {8F09F422-6D6D-4AB8-9108-9A49287FA2A3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8F09F422-6D6D-4AB8-9108-9A49287FA2A3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8F09F422-6D6D-4AB8-9108-9A49287FA2A3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8F09F422-6D6D-4AB8-9108-9A49287FA2A3}.Release|Any CPU.Build.0 = Release|Any CPU - {602433D1-A340-42DC-A723-8F25BE6E9433}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {602433D1-A340-42DC-A723-8F25BE6E9433}.Debug|Any CPU.Build.0 = Debug|Any CPU - {602433D1-A340-42DC-A723-8F25BE6E9433}.Release|Any CPU.ActiveCfg = Release|Any CPU - {602433D1-A340-42DC-A723-8F25BE6E9433}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {632AFDE7-F1BA-4579-B832-773906AAC6EF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {32CD5E0D-BE9A-48C5-B7DA-6638DCC755CA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {7E71CD69-2272-4D42-9C89-886A8FF24D39} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {68F9A397-BA2B-4C66-B683-BEBD0ABEC9D1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {131FFF28-A5D8-4947-AF32-72DB9E35F158} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {6AE02D6B-3CC4-4083-A052-F3C659C56D35} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F136BF96-0B77-4FDF-8798-278CF2E1E851} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {06A80C6A-3347-4F0E-AFFD-563F33B7A9EE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {52E7D63F-FF3C-49D9-8A60-6C1D13816F14} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {31267B9A-CCC3-4AED-ACC5-E1BD74216828} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0E42AFBD-BC6D-422E-94EF-922109FB05ED} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {EB576EFA-F238-4341-ABF7-214B8A65A40E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6E84B742-B09D-48DD-B676-A3B66CA2DB26} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8F09F422-6D6D-4AB8-9108-9A49287FA2A3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {602433D1-A340-42DC-A723-8F25BE6E9433} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {6AE02D6B-3CC4-4083-A052-F3C659C56D35} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F136BF96-0B77-4FDF-8798-278CF2E1E851} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {06A80C6A-3347-4F0E-AFFD-563F33B7A9EE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {52E7D63F-FF3C-49D9-8A60-6C1D13816F14} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {31267B9A-CCC3-4AED-ACC5-E1BD74216828} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0E42AFBD-BC6D-422E-94EF-922109FB05ED} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {EB576EFA-F238-4341-ABF7-214B8A65A40E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6E84B742-B09D-48DD-B676-A3B66CA2DB26} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8F09F422-6D6D-4AB8-9108-9A49287FA2A3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {602433D1-A340-42DC-A723-8F25BE6E9433} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {1834E3CA-579C-4BA6-91E7-CEAA8D4CF180} diff --git a/sdk/src/Services/Braket/Generated/AmazonBraketConfig.cs b/sdk/src/Services/Braket/Generated/AmazonBraketConfig.cs index 4ba297fce3c0..d56a0e042ebc 100644 --- a/sdk/src/Services/Braket/Generated/AmazonBraketConfig.cs +++ b/sdk/src/Services/Braket/Generated/AmazonBraketConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.Braket public partial class AmazonBraketConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("Braket", "4.0.0.0"); private static readonly AmazonBraketEndpointResolver EndpointResolver = new AmazonBraketEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("Braket", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("Braket", "3.7.400.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/Braket/Properties/AssemblyInfo.cs b/sdk/src/Services/Braket/Properties/AssemblyInfo.cs index 6031c6fdde19..68aff6a67959 100644 --- a/sdk/src/Services/Braket/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/Braket/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/Budgets/Budgets.sln b/sdk/src/Services/Budgets/Budgets.sln index 2a7b3ae41a84..4f68d76e66a6 100644 --- a/sdk/src/Services/Budgets/Budgets.sln +++ b/sdk/src/Services/Budgets/Budgets.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {4A43063E-7BA4-447E-A4F8-9AEC59476860}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {4A43063E-7BA4-447E-A4F8-9AEC59476860}.Debug|Any CPU.Build.0 = Debug|Any CPU {4A43063E-7BA4-447E-A4F8-9AEC59476860}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {5989040E-6665-440C-B23E-2A50221DB0D2}.Debug|Any CPU.Build.0 = Debug|Any CPU {5989040E-6665-440C-B23E-2A50221DB0D2}.Release|Any CPU.ActiveCfg = Release|Any CPU {5989040E-6665-440C-B23E-2A50221DB0D2}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {83E018D0-3BCD-453A-BC37-549FD77A5A7A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {83E018D0-3BCD-453A-BC37-549FD77A5A7A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {83E018D0-3BCD-453A-BC37-549FD77A5A7A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {83E018D0-3BCD-453A-BC37-549FD77A5A7A}.Release|Any CPU.Build.0 = Release|Any CPU - {3E065F0A-82D4-473C-9FC4-EDC8D2C1ABCD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3E065F0A-82D4-473C-9FC4-EDC8D2C1ABCD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3E065F0A-82D4-473C-9FC4-EDC8D2C1ABCD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3E065F0A-82D4-473C-9FC4-EDC8D2C1ABCD}.Release|Any CPU.Build.0 = Release|Any CPU - {EFF632F0-E049-46DB-A41B-4A65F9054AD8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EFF632F0-E049-46DB-A41B-4A65F9054AD8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EFF632F0-E049-46DB-A41B-4A65F9054AD8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EFF632F0-E049-46DB-A41B-4A65F9054AD8}.Release|Any CPU.Build.0 = Release|Any CPU - {AE080FD7-9BAB-4C03-AED7-6790F2680418}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AE080FD7-9BAB-4C03-AED7-6790F2680418}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AE080FD7-9BAB-4C03-AED7-6790F2680418}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AE080FD7-9BAB-4C03-AED7-6790F2680418}.Release|Any CPU.Build.0 = Release|Any CPU - {EC670141-E65B-46E5-8BD5-94757BA61543}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EC670141-E65B-46E5-8BD5-94757BA61543}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EC670141-E65B-46E5-8BD5-94757BA61543}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EC670141-E65B-46E5-8BD5-94757BA61543}.Release|Any CPU.Build.0 = Release|Any CPU - {F2C1FAEE-3AB9-48A8-9084-59133CF6995D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F2C1FAEE-3AB9-48A8-9084-59133CF6995D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F2C1FAEE-3AB9-48A8-9084-59133CF6995D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F2C1FAEE-3AB9-48A8-9084-59133CF6995D}.Release|Any CPU.Build.0 = Release|Any CPU - {4A1B3FE5-8371-44BB-A1A0-ECD5D8AEF960}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4A1B3FE5-8371-44BB-A1A0-ECD5D8AEF960}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4A1B3FE5-8371-44BB-A1A0-ECD5D8AEF960}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4A1B3FE5-8371-44BB-A1A0-ECD5D8AEF960}.Release|Any CPU.Build.0 = Release|Any CPU - {94A78C50-C6A9-4B2A-BC72-C0A87AB4B2B6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {94A78C50-C6A9-4B2A-BC72-C0A87AB4B2B6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {94A78C50-C6A9-4B2A-BC72-C0A87AB4B2B6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {94A78C50-C6A9-4B2A-BC72-C0A87AB4B2B6}.Release|Any CPU.Build.0 = Release|Any CPU - {ACF65AA4-4D31-48B0-8184-9E1ECC63B00E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {ACF65AA4-4D31-48B0-8184-9E1ECC63B00E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {ACF65AA4-4D31-48B0-8184-9E1ECC63B00E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {ACF65AA4-4D31-48B0-8184-9E1ECC63B00E}.Release|Any CPU.Build.0 = Release|Any CPU - {3B5EEF4A-AB58-415F-B4A3-B326E0D5628C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3B5EEF4A-AB58-415F-B4A3-B326E0D5628C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3B5EEF4A-AB58-415F-B4A3-B326E0D5628C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3B5EEF4A-AB58-415F-B4A3-B326E0D5628C}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {83E018D0-3BCD-453A-BC37-549FD77A5A7A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {83E018D0-3BCD-453A-BC37-549FD77A5A7A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {83E018D0-3BCD-453A-BC37-549FD77A5A7A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {83E018D0-3BCD-453A-BC37-549FD77A5A7A}.Release|Any CPU.Build.0 = Release|Any CPU - {3E065F0A-82D4-473C-9FC4-EDC8D2C1ABCD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3E065F0A-82D4-473C-9FC4-EDC8D2C1ABCD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3E065F0A-82D4-473C-9FC4-EDC8D2C1ABCD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3E065F0A-82D4-473C-9FC4-EDC8D2C1ABCD}.Release|Any CPU.Build.0 = Release|Any CPU - {EFF632F0-E049-46DB-A41B-4A65F9054AD8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EFF632F0-E049-46DB-A41B-4A65F9054AD8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EFF632F0-E049-46DB-A41B-4A65F9054AD8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EFF632F0-E049-46DB-A41B-4A65F9054AD8}.Release|Any CPU.Build.0 = Release|Any CPU - {AE080FD7-9BAB-4C03-AED7-6790F2680418}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AE080FD7-9BAB-4C03-AED7-6790F2680418}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AE080FD7-9BAB-4C03-AED7-6790F2680418}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AE080FD7-9BAB-4C03-AED7-6790F2680418}.Release|Any CPU.Build.0 = Release|Any CPU - {EC670141-E65B-46E5-8BD5-94757BA61543}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EC670141-E65B-46E5-8BD5-94757BA61543}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EC670141-E65B-46E5-8BD5-94757BA61543}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EC670141-E65B-46E5-8BD5-94757BA61543}.Release|Any CPU.Build.0 = Release|Any CPU - {F2C1FAEE-3AB9-48A8-9084-59133CF6995D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F2C1FAEE-3AB9-48A8-9084-59133CF6995D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F2C1FAEE-3AB9-48A8-9084-59133CF6995D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F2C1FAEE-3AB9-48A8-9084-59133CF6995D}.Release|Any CPU.Build.0 = Release|Any CPU - {4A1B3FE5-8371-44BB-A1A0-ECD5D8AEF960}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4A1B3FE5-8371-44BB-A1A0-ECD5D8AEF960}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4A1B3FE5-8371-44BB-A1A0-ECD5D8AEF960}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4A1B3FE5-8371-44BB-A1A0-ECD5D8AEF960}.Release|Any CPU.Build.0 = Release|Any CPU - {94A78C50-C6A9-4B2A-BC72-C0A87AB4B2B6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {94A78C50-C6A9-4B2A-BC72-C0A87AB4B2B6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {94A78C50-C6A9-4B2A-BC72-C0A87AB4B2B6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {94A78C50-C6A9-4B2A-BC72-C0A87AB4B2B6}.Release|Any CPU.Build.0 = Release|Any CPU - {ACF65AA4-4D31-48B0-8184-9E1ECC63B00E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {ACF65AA4-4D31-48B0-8184-9E1ECC63B00E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {ACF65AA4-4D31-48B0-8184-9E1ECC63B00E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {ACF65AA4-4D31-48B0-8184-9E1ECC63B00E}.Release|Any CPU.Build.0 = Release|Any CPU - {3B5EEF4A-AB58-415F-B4A3-B326E0D5628C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3B5EEF4A-AB58-415F-B4A3-B326E0D5628C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3B5EEF4A-AB58-415F-B4A3-B326E0D5628C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3B5EEF4A-AB58-415F-B4A3-B326E0D5628C}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {4A43063E-7BA4-447E-A4F8-9AEC59476860} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {EB899727-F026-4709-9B84-46F36DF9B8FF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {CB3B7447-0056-41B6-93BF-9048DDECC50E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {79696F26-F789-43B0-AEEA-D11BEF01C262} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {5989040E-6665-440C-B23E-2A50221DB0D2} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {83E018D0-3BCD-453A-BC37-549FD77A5A7A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {3E065F0A-82D4-473C-9FC4-EDC8D2C1ABCD} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {EFF632F0-E049-46DB-A41B-4A65F9054AD8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {AE080FD7-9BAB-4C03-AED7-6790F2680418} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {EC670141-E65B-46E5-8BD5-94757BA61543} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F2C1FAEE-3AB9-48A8-9084-59133CF6995D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4A1B3FE5-8371-44BB-A1A0-ECD5D8AEF960} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {94A78C50-C6A9-4B2A-BC72-C0A87AB4B2B6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {ACF65AA4-4D31-48B0-8184-9E1ECC63B00E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {3B5EEF4A-AB58-415F-B4A3-B326E0D5628C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {83E018D0-3BCD-453A-BC37-549FD77A5A7A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {3E065F0A-82D4-473C-9FC4-EDC8D2C1ABCD} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {EFF632F0-E049-46DB-A41B-4A65F9054AD8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {AE080FD7-9BAB-4C03-AED7-6790F2680418} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {EC670141-E65B-46E5-8BD5-94757BA61543} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F2C1FAEE-3AB9-48A8-9084-59133CF6995D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4A1B3FE5-8371-44BB-A1A0-ECD5D8AEF960} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {94A78C50-C6A9-4B2A-BC72-C0A87AB4B2B6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {ACF65AA4-4D31-48B0-8184-9E1ECC63B00E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {3B5EEF4A-AB58-415F-B4A3-B326E0D5628C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {C5A2382E-1E23-48AE-96CA-9DB341155CE3} diff --git a/sdk/src/Services/Budgets/Generated/AmazonBudgetsConfig.cs b/sdk/src/Services/Budgets/Generated/AmazonBudgetsConfig.cs index 95c51639da4b..05fc507d7137 100644 --- a/sdk/src/Services/Budgets/Generated/AmazonBudgetsConfig.cs +++ b/sdk/src/Services/Budgets/Generated/AmazonBudgetsConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.Budgets public partial class AmazonBudgetsConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("Budgets", "4.0.0.0"); private static readonly AmazonBudgetsEndpointResolver EndpointResolver = new AmazonBudgetsEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("Budgets", "3.7.401.3"); -======= - InternalSDKUtils.BuildUserAgentString("Budgets", "3.7.401.30"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/Budgets/Properties/AssemblyInfo.cs b/sdk/src/Services/Budgets/Properties/AssemblyInfo.cs index abc029e5f250..5ec0c2d9c899 100644 --- a/sdk/src/Services/Budgets/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/Budgets/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.3")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.30")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/CertificateManager/CertificateManager.sln b/sdk/src/Services/CertificateManager/CertificateManager.sln index ecdc9b2d444e..c55acedd65e8 100644 --- a/sdk/src/Services/CertificateManager/CertificateManager.sln +++ b/sdk/src/Services/CertificateManager/CertificateManager.sln @@ -92,7 +92,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {1CAEE917-D135-4DAF-BCF1-A4E0E0706500}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {1CAEE917-D135-4DAF-BCF1-A4E0E0706500}.Debug|Any CPU.Build.0 = Debug|Any CPU {1CAEE917-D135-4DAF-BCF1-A4E0E0706500}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -113,97 +120,6 @@ Global {DD6172B5-5E21-45AA-AEBE-43509824C0B6}.Debug|Any CPU.Build.0 = Debug|Any CPU {DD6172B5-5E21-45AA-AEBE-43509824C0B6}.Release|Any CPU.ActiveCfg = Release|Any CPU {DD6172B5-5E21-45AA-AEBE-43509824C0B6}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {573695AB-47CB-4332-BF3E-6FE1EFA27B22}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {573695AB-47CB-4332-BF3E-6FE1EFA27B22}.Debug|Any CPU.Build.0 = Debug|Any CPU - {573695AB-47CB-4332-BF3E-6FE1EFA27B22}.Release|Any CPU.ActiveCfg = Release|Any CPU - {573695AB-47CB-4332-BF3E-6FE1EFA27B22}.Release|Any CPU.Build.0 = Release|Any CPU - {5782A734-6B13-4954-BF84-C44EF54B50B3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5782A734-6B13-4954-BF84-C44EF54B50B3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5782A734-6B13-4954-BF84-C44EF54B50B3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5782A734-6B13-4954-BF84-C44EF54B50B3}.Release|Any CPU.Build.0 = Release|Any CPU - {ADC0446F-7EB8-4808-94DE-152FC7D158D1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {ADC0446F-7EB8-4808-94DE-152FC7D158D1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {ADC0446F-7EB8-4808-94DE-152FC7D158D1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {ADC0446F-7EB8-4808-94DE-152FC7D158D1}.Release|Any CPU.Build.0 = Release|Any CPU - {D6FCADE8-E588-4442-9EE1-28503BED0FA6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D6FCADE8-E588-4442-9EE1-28503BED0FA6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D6FCADE8-E588-4442-9EE1-28503BED0FA6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D6FCADE8-E588-4442-9EE1-28503BED0FA6}.Release|Any CPU.Build.0 = Release|Any CPU - {FB28A031-2A22-403F-8B24-C222202B3193}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FB28A031-2A22-403F-8B24-C222202B3193}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FB28A031-2A22-403F-8B24-C222202B3193}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FB28A031-2A22-403F-8B24-C222202B3193}.Release|Any CPU.Build.0 = Release|Any CPU - {189DEC44-DBF1-46AF-9A8D-365B8B8E73E5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {189DEC44-DBF1-46AF-9A8D-365B8B8E73E5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {189DEC44-DBF1-46AF-9A8D-365B8B8E73E5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {189DEC44-DBF1-46AF-9A8D-365B8B8E73E5}.Release|Any CPU.Build.0 = Release|Any CPU - {0111C5A4-6CEF-4645-ACCB-252B75557509}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0111C5A4-6CEF-4645-ACCB-252B75557509}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0111C5A4-6CEF-4645-ACCB-252B75557509}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0111C5A4-6CEF-4645-ACCB-252B75557509}.Release|Any CPU.Build.0 = Release|Any CPU - {73C8F17A-7868-4F40-8E9F-EC3FB7F2D50B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {73C8F17A-7868-4F40-8E9F-EC3FB7F2D50B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {73C8F17A-7868-4F40-8E9F-EC3FB7F2D50B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {73C8F17A-7868-4F40-8E9F-EC3FB7F2D50B}.Release|Any CPU.Build.0 = Release|Any CPU - {8C68A0E4-DABD-4432-A0B7-5242177A5481}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8C68A0E4-DABD-4432-A0B7-5242177A5481}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8C68A0E4-DABD-4432-A0B7-5242177A5481}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8C68A0E4-DABD-4432-A0B7-5242177A5481}.Release|Any CPU.Build.0 = Release|Any CPU - {4513D819-6F52-4E87-AC67-D0AF01D98CC0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4513D819-6F52-4E87-AC67-D0AF01D98CC0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4513D819-6F52-4E87-AC67-D0AF01D98CC0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4513D819-6F52-4E87-AC67-D0AF01D98CC0}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {573695AB-47CB-4332-BF3E-6FE1EFA27B22}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {573695AB-47CB-4332-BF3E-6FE1EFA27B22}.Debug|Any CPU.Build.0 = Debug|Any CPU - {573695AB-47CB-4332-BF3E-6FE1EFA27B22}.Release|Any CPU.ActiveCfg = Release|Any CPU - {573695AB-47CB-4332-BF3E-6FE1EFA27B22}.Release|Any CPU.Build.0 = Release|Any CPU - {5782A734-6B13-4954-BF84-C44EF54B50B3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5782A734-6B13-4954-BF84-C44EF54B50B3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5782A734-6B13-4954-BF84-C44EF54B50B3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5782A734-6B13-4954-BF84-C44EF54B50B3}.Release|Any CPU.Build.0 = Release|Any CPU - {ADC0446F-7EB8-4808-94DE-152FC7D158D1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {ADC0446F-7EB8-4808-94DE-152FC7D158D1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {ADC0446F-7EB8-4808-94DE-152FC7D158D1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {ADC0446F-7EB8-4808-94DE-152FC7D158D1}.Release|Any CPU.Build.0 = Release|Any CPU - {D6FCADE8-E588-4442-9EE1-28503BED0FA6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D6FCADE8-E588-4442-9EE1-28503BED0FA6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D6FCADE8-E588-4442-9EE1-28503BED0FA6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D6FCADE8-E588-4442-9EE1-28503BED0FA6}.Release|Any CPU.Build.0 = Release|Any CPU - {FB28A031-2A22-403F-8B24-C222202B3193}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FB28A031-2A22-403F-8B24-C222202B3193}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FB28A031-2A22-403F-8B24-C222202B3193}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FB28A031-2A22-403F-8B24-C222202B3193}.Release|Any CPU.Build.0 = Release|Any CPU - {189DEC44-DBF1-46AF-9A8D-365B8B8E73E5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {189DEC44-DBF1-46AF-9A8D-365B8B8E73E5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {189DEC44-DBF1-46AF-9A8D-365B8B8E73E5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {189DEC44-DBF1-46AF-9A8D-365B8B8E73E5}.Release|Any CPU.Build.0 = Release|Any CPU - {0111C5A4-6CEF-4645-ACCB-252B75557509}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0111C5A4-6CEF-4645-ACCB-252B75557509}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0111C5A4-6CEF-4645-ACCB-252B75557509}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0111C5A4-6CEF-4645-ACCB-252B75557509}.Release|Any CPU.Build.0 = Release|Any CPU - {73C8F17A-7868-4F40-8E9F-EC3FB7F2D50B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {73C8F17A-7868-4F40-8E9F-EC3FB7F2D50B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {73C8F17A-7868-4F40-8E9F-EC3FB7F2D50B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {73C8F17A-7868-4F40-8E9F-EC3FB7F2D50B}.Release|Any CPU.Build.0 = Release|Any CPU - {8C68A0E4-DABD-4432-A0B7-5242177A5481}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8C68A0E4-DABD-4432-A0B7-5242177A5481}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8C68A0E4-DABD-4432-A0B7-5242177A5481}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8C68A0E4-DABD-4432-A0B7-5242177A5481}.Release|Any CPU.Build.0 = Release|Any CPU - {4513D819-6F52-4E87-AC67-D0AF01D98CC0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4513D819-6F52-4E87-AC67-D0AF01D98CC0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4513D819-6F52-4E87-AC67-D0AF01D98CC0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4513D819-6F52-4E87-AC67-D0AF01D98CC0}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -220,37 +136,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {1CAEE917-D135-4DAF-BCF1-A4E0E0706500} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {D28C5F73-0805-4FF6-BE99-9951503765BC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {59406E35-53A0-4623-B0A1-6EC82A30D621} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {0C2B7B2A-819E-4818-8F74-DCAF0F0B7B9F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {DD6172B5-5E21-45AA-AEBE-43509824C0B6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {573695AB-47CB-4332-BF3E-6FE1EFA27B22} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {5782A734-6B13-4954-BF84-C44EF54B50B3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {ADC0446F-7EB8-4808-94DE-152FC7D158D1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D6FCADE8-E588-4442-9EE1-28503BED0FA6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {FB28A031-2A22-403F-8B24-C222202B3193} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {189DEC44-DBF1-46AF-9A8D-365B8B8E73E5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0111C5A4-6CEF-4645-ACCB-252B75557509} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {73C8F17A-7868-4F40-8E9F-EC3FB7F2D50B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8C68A0E4-DABD-4432-A0B7-5242177A5481} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4513D819-6F52-4E87-AC67-D0AF01D98CC0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {573695AB-47CB-4332-BF3E-6FE1EFA27B22} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {5782A734-6B13-4954-BF84-C44EF54B50B3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {ADC0446F-7EB8-4808-94DE-152FC7D158D1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D6FCADE8-E588-4442-9EE1-28503BED0FA6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {FB28A031-2A22-403F-8B24-C222202B3193} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {189DEC44-DBF1-46AF-9A8D-365B8B8E73E5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0111C5A4-6CEF-4645-ACCB-252B75557509} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {73C8F17A-7868-4F40-8E9F-EC3FB7F2D50B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8C68A0E4-DABD-4432-A0B7-5242177A5481} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4513D819-6F52-4E87-AC67-D0AF01D98CC0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {6C66459C-99F8-43CD-853D-D9E79D3A9B2D} diff --git a/sdk/src/Services/CertificateManager/Generated/AmazonCertificateManagerConfig.cs b/sdk/src/Services/CertificateManager/Generated/AmazonCertificateManagerConfig.cs index b16d0d8b4bc8..e2e340a3a805 100644 --- a/sdk/src/Services/CertificateManager/Generated/AmazonCertificateManagerConfig.cs +++ b/sdk/src/Services/CertificateManager/Generated/AmazonCertificateManagerConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.CertificateManager public partial class AmazonCertificateManagerConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("ACM", "4.0.0.0"); private static readonly AmazonCertificateManagerEndpointResolver EndpointResolver = new AmazonCertificateManagerEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("ACM", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("ACM", "3.7.400.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/CertificateManager/Properties/AssemblyInfo.cs b/sdk/src/Services/CertificateManager/Properties/AssemblyInfo.cs index 701694cf64d5..86004a08a067 100644 --- a/sdk/src/Services/CertificateManager/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/CertificateManager/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/Chatbot/Chatbot.sln b/sdk/src/Services/Chatbot/Chatbot.sln index fc5f12fc6895..388fa1862037 100644 --- a/sdk/src/Services/Chatbot/Chatbot.sln +++ b/sdk/src/Services/Chatbot/Chatbot.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {B6CF84CD-C065-4C6E-81BE-711F407DC2D2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {B6CF84CD-C065-4C6E-81BE-711F407DC2D2}.Debug|Any CPU.Build.0 = Debug|Any CPU {B6CF84CD-C065-4C6E-81BE-711F407DC2D2}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {0C5183E7-A121-4A76-917F-681E62ED0A5A}.Debug|Any CPU.Build.0 = Debug|Any CPU {0C5183E7-A121-4A76-917F-681E62ED0A5A}.Release|Any CPU.ActiveCfg = Release|Any CPU {0C5183E7-A121-4A76-917F-681E62ED0A5A}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {5D205667-F9B3-4249-A7D8-4FC457D2279A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5D205667-F9B3-4249-A7D8-4FC457D2279A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5D205667-F9B3-4249-A7D8-4FC457D2279A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5D205667-F9B3-4249-A7D8-4FC457D2279A}.Release|Any CPU.Build.0 = Release|Any CPU - {91116318-1D05-412A-B361-34FEA7CD3FD6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {91116318-1D05-412A-B361-34FEA7CD3FD6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {91116318-1D05-412A-B361-34FEA7CD3FD6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {91116318-1D05-412A-B361-34FEA7CD3FD6}.Release|Any CPU.Build.0 = Release|Any CPU - {2FE3D4C0-80FA-41CD-9947-2375AD8A8677}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2FE3D4C0-80FA-41CD-9947-2375AD8A8677}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2FE3D4C0-80FA-41CD-9947-2375AD8A8677}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2FE3D4C0-80FA-41CD-9947-2375AD8A8677}.Release|Any CPU.Build.0 = Release|Any CPU - {02AC4FD6-B72F-43E3-AF8A-F12D5D62A8A3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {02AC4FD6-B72F-43E3-AF8A-F12D5D62A8A3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {02AC4FD6-B72F-43E3-AF8A-F12D5D62A8A3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {02AC4FD6-B72F-43E3-AF8A-F12D5D62A8A3}.Release|Any CPU.Build.0 = Release|Any CPU - {3E690B1F-957E-42D5-94D4-A03B7EF84663}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3E690B1F-957E-42D5-94D4-A03B7EF84663}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3E690B1F-957E-42D5-94D4-A03B7EF84663}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3E690B1F-957E-42D5-94D4-A03B7EF84663}.Release|Any CPU.Build.0 = Release|Any CPU - {B669C947-CD63-4294-97C7-BBA4E512A807}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B669C947-CD63-4294-97C7-BBA4E512A807}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B669C947-CD63-4294-97C7-BBA4E512A807}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B669C947-CD63-4294-97C7-BBA4E512A807}.Release|Any CPU.Build.0 = Release|Any CPU - {F2BB3B34-D735-495C-BF4E-775F569F5FC9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F2BB3B34-D735-495C-BF4E-775F569F5FC9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F2BB3B34-D735-495C-BF4E-775F569F5FC9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F2BB3B34-D735-495C-BF4E-775F569F5FC9}.Release|Any CPU.Build.0 = Release|Any CPU - {634754FE-B2DB-4A6C-AA37-64495D5DD30D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {634754FE-B2DB-4A6C-AA37-64495D5DD30D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {634754FE-B2DB-4A6C-AA37-64495D5DD30D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {634754FE-B2DB-4A6C-AA37-64495D5DD30D}.Release|Any CPU.Build.0 = Release|Any CPU - {89C790C1-2A07-490F-920D-567504D81206}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {89C790C1-2A07-490F-920D-567504D81206}.Debug|Any CPU.Build.0 = Debug|Any CPU - {89C790C1-2A07-490F-920D-567504D81206}.Release|Any CPU.ActiveCfg = Release|Any CPU - {89C790C1-2A07-490F-920D-567504D81206}.Release|Any CPU.Build.0 = Release|Any CPU - {FCBB7023-BC4C-4860-B789-379926A30D40}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FCBB7023-BC4C-4860-B789-379926A30D40}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FCBB7023-BC4C-4860-B789-379926A30D40}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FCBB7023-BC4C-4860-B789-379926A30D40}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {5D205667-F9B3-4249-A7D8-4FC457D2279A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5D205667-F9B3-4249-A7D8-4FC457D2279A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5D205667-F9B3-4249-A7D8-4FC457D2279A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5D205667-F9B3-4249-A7D8-4FC457D2279A}.Release|Any CPU.Build.0 = Release|Any CPU - {91116318-1D05-412A-B361-34FEA7CD3FD6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {91116318-1D05-412A-B361-34FEA7CD3FD6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {91116318-1D05-412A-B361-34FEA7CD3FD6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {91116318-1D05-412A-B361-34FEA7CD3FD6}.Release|Any CPU.Build.0 = Release|Any CPU - {2FE3D4C0-80FA-41CD-9947-2375AD8A8677}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2FE3D4C0-80FA-41CD-9947-2375AD8A8677}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2FE3D4C0-80FA-41CD-9947-2375AD8A8677}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2FE3D4C0-80FA-41CD-9947-2375AD8A8677}.Release|Any CPU.Build.0 = Release|Any CPU - {02AC4FD6-B72F-43E3-AF8A-F12D5D62A8A3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {02AC4FD6-B72F-43E3-AF8A-F12D5D62A8A3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {02AC4FD6-B72F-43E3-AF8A-F12D5D62A8A3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {02AC4FD6-B72F-43E3-AF8A-F12D5D62A8A3}.Release|Any CPU.Build.0 = Release|Any CPU - {3E690B1F-957E-42D5-94D4-A03B7EF84663}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3E690B1F-957E-42D5-94D4-A03B7EF84663}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3E690B1F-957E-42D5-94D4-A03B7EF84663}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3E690B1F-957E-42D5-94D4-A03B7EF84663}.Release|Any CPU.Build.0 = Release|Any CPU - {B669C947-CD63-4294-97C7-BBA4E512A807}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B669C947-CD63-4294-97C7-BBA4E512A807}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B669C947-CD63-4294-97C7-BBA4E512A807}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B669C947-CD63-4294-97C7-BBA4E512A807}.Release|Any CPU.Build.0 = Release|Any CPU - {F2BB3B34-D735-495C-BF4E-775F569F5FC9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F2BB3B34-D735-495C-BF4E-775F569F5FC9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F2BB3B34-D735-495C-BF4E-775F569F5FC9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F2BB3B34-D735-495C-BF4E-775F569F5FC9}.Release|Any CPU.Build.0 = Release|Any CPU - {634754FE-B2DB-4A6C-AA37-64495D5DD30D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {634754FE-B2DB-4A6C-AA37-64495D5DD30D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {634754FE-B2DB-4A6C-AA37-64495D5DD30D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {634754FE-B2DB-4A6C-AA37-64495D5DD30D}.Release|Any CPU.Build.0 = Release|Any CPU - {89C790C1-2A07-490F-920D-567504D81206}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {89C790C1-2A07-490F-920D-567504D81206}.Debug|Any CPU.Build.0 = Debug|Any CPU - {89C790C1-2A07-490F-920D-567504D81206}.Release|Any CPU.ActiveCfg = Release|Any CPU - {89C790C1-2A07-490F-920D-567504D81206}.Release|Any CPU.Build.0 = Release|Any CPU - {FCBB7023-BC4C-4860-B789-379926A30D40}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FCBB7023-BC4C-4860-B789-379926A30D40}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FCBB7023-BC4C-4860-B789-379926A30D40}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FCBB7023-BC4C-4860-B789-379926A30D40}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {B6CF84CD-C065-4C6E-81BE-711F407DC2D2} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {D2A6E8AA-7551-485E-A548-F4B13A82BDAE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {9B83FA56-2CC1-4309-B8B6-01117A03D47B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {BC1AD49E-B7DA-400A-8BAD-718BCE8FE179} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {0C5183E7-A121-4A76-917F-681E62ED0A5A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {5D205667-F9B3-4249-A7D8-4FC457D2279A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {91116318-1D05-412A-B361-34FEA7CD3FD6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {2FE3D4C0-80FA-41CD-9947-2375AD8A8677} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {02AC4FD6-B72F-43E3-AF8A-F12D5D62A8A3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {3E690B1F-957E-42D5-94D4-A03B7EF84663} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B669C947-CD63-4294-97C7-BBA4E512A807} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F2BB3B34-D735-495C-BF4E-775F569F5FC9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {634754FE-B2DB-4A6C-AA37-64495D5DD30D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {89C790C1-2A07-490F-920D-567504D81206} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {FCBB7023-BC4C-4860-B789-379926A30D40} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {5D205667-F9B3-4249-A7D8-4FC457D2279A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {91116318-1D05-412A-B361-34FEA7CD3FD6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {2FE3D4C0-80FA-41CD-9947-2375AD8A8677} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {02AC4FD6-B72F-43E3-AF8A-F12D5D62A8A3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {3E690B1F-957E-42D5-94D4-A03B7EF84663} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B669C947-CD63-4294-97C7-BBA4E512A807} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F2BB3B34-D735-495C-BF4E-775F569F5FC9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {634754FE-B2DB-4A6C-AA37-64495D5DD30D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {89C790C1-2A07-490F-920D-567504D81206} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {FCBB7023-BC4C-4860-B789-379926A30D40} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {6234040A-C64A-48E8-B9FD-2436CF35E8C5} diff --git a/sdk/src/Services/Chatbot/Generated/AmazonChatbotConfig.cs b/sdk/src/Services/Chatbot/Generated/AmazonChatbotConfig.cs index db734f88c108..a23cdc812bd7 100644 --- a/sdk/src/Services/Chatbot/Generated/AmazonChatbotConfig.cs +++ b/sdk/src/Services/Chatbot/Generated/AmazonChatbotConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.Chatbot public partial class AmazonChatbotConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("chatbot", "4.0.0.0"); private static readonly AmazonChatbotEndpointResolver EndpointResolver = new AmazonChatbotEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("chatbot", "3.7.402.1"); -======= - InternalSDKUtils.BuildUserAgentString("chatbot", "3.7.402.28"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/Chatbot/Properties/AssemblyInfo.cs b/sdk/src/Services/Chatbot/Properties/AssemblyInfo.cs index e939b1d03b1e..c7499d00d998 100644 --- a/sdk/src/Services/Chatbot/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/Chatbot/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.402.1")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.402.28")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/Chime/Chime.sln b/sdk/src/Services/Chime/Chime.sln index 2a5095863670..beed59567ccd 100644 --- a/sdk/src/Services/Chime/Chime.sln +++ b/sdk/src/Services/Chime/Chime.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {39704F80-5A71-4A74-B2B6-DEE3A4B7FA7C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {39704F80-5A71-4A74-B2B6-DEE3A4B7FA7C}.Debug|Any CPU.Build.0 = Debug|Any CPU {39704F80-5A71-4A74-B2B6-DEE3A4B7FA7C}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {CE90A81B-BFD7-4148-AABC-96D9182A02B3}.Debug|Any CPU.Build.0 = Debug|Any CPU {CE90A81B-BFD7-4148-AABC-96D9182A02B3}.Release|Any CPU.ActiveCfg = Release|Any CPU {CE90A81B-BFD7-4148-AABC-96D9182A02B3}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {BCE52B39-F843-4977-B169-02FED2965298}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BCE52B39-F843-4977-B169-02FED2965298}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BCE52B39-F843-4977-B169-02FED2965298}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BCE52B39-F843-4977-B169-02FED2965298}.Release|Any CPU.Build.0 = Release|Any CPU - {28ABBB60-945E-45A8-AE03-0BE3A294F545}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {28ABBB60-945E-45A8-AE03-0BE3A294F545}.Debug|Any CPU.Build.0 = Debug|Any CPU - {28ABBB60-945E-45A8-AE03-0BE3A294F545}.Release|Any CPU.ActiveCfg = Release|Any CPU - {28ABBB60-945E-45A8-AE03-0BE3A294F545}.Release|Any CPU.Build.0 = Release|Any CPU - {587F3D68-E289-4526-A9D1-18BBE558EEAB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {587F3D68-E289-4526-A9D1-18BBE558EEAB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {587F3D68-E289-4526-A9D1-18BBE558EEAB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {587F3D68-E289-4526-A9D1-18BBE558EEAB}.Release|Any CPU.Build.0 = Release|Any CPU - {C7C39C00-F31D-43F2-820D-5BDD81223720}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C7C39C00-F31D-43F2-820D-5BDD81223720}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C7C39C00-F31D-43F2-820D-5BDD81223720}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C7C39C00-F31D-43F2-820D-5BDD81223720}.Release|Any CPU.Build.0 = Release|Any CPU - {EFF798C4-6BF3-4C39-806F-6ED9E9A54998}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EFF798C4-6BF3-4C39-806F-6ED9E9A54998}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EFF798C4-6BF3-4C39-806F-6ED9E9A54998}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EFF798C4-6BF3-4C39-806F-6ED9E9A54998}.Release|Any CPU.Build.0 = Release|Any CPU - {79CDAE9D-43A0-4FB0-96C2-793A29F10890}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {79CDAE9D-43A0-4FB0-96C2-793A29F10890}.Debug|Any CPU.Build.0 = Debug|Any CPU - {79CDAE9D-43A0-4FB0-96C2-793A29F10890}.Release|Any CPU.ActiveCfg = Release|Any CPU - {79CDAE9D-43A0-4FB0-96C2-793A29F10890}.Release|Any CPU.Build.0 = Release|Any CPU - {ECD3C01D-95B0-45B3-B45A-72218AAC79BF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {ECD3C01D-95B0-45B3-B45A-72218AAC79BF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {ECD3C01D-95B0-45B3-B45A-72218AAC79BF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {ECD3C01D-95B0-45B3-B45A-72218AAC79BF}.Release|Any CPU.Build.0 = Release|Any CPU - {CCE14345-6BBC-41DE-B590-BA795435CE13}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CCE14345-6BBC-41DE-B590-BA795435CE13}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CCE14345-6BBC-41DE-B590-BA795435CE13}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CCE14345-6BBC-41DE-B590-BA795435CE13}.Release|Any CPU.Build.0 = Release|Any CPU - {79D96923-5E7F-4BC4-8F37-6187519E8985}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {79D96923-5E7F-4BC4-8F37-6187519E8985}.Debug|Any CPU.Build.0 = Debug|Any CPU - {79D96923-5E7F-4BC4-8F37-6187519E8985}.Release|Any CPU.ActiveCfg = Release|Any CPU - {79D96923-5E7F-4BC4-8F37-6187519E8985}.Release|Any CPU.Build.0 = Release|Any CPU - {57236A36-BF4F-48E4-A0EE-5017E7DAED83}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {57236A36-BF4F-48E4-A0EE-5017E7DAED83}.Debug|Any CPU.Build.0 = Debug|Any CPU - {57236A36-BF4F-48E4-A0EE-5017E7DAED83}.Release|Any CPU.ActiveCfg = Release|Any CPU - {57236A36-BF4F-48E4-A0EE-5017E7DAED83}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {BCE52B39-F843-4977-B169-02FED2965298}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BCE52B39-F843-4977-B169-02FED2965298}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BCE52B39-F843-4977-B169-02FED2965298}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BCE52B39-F843-4977-B169-02FED2965298}.Release|Any CPU.Build.0 = Release|Any CPU - {28ABBB60-945E-45A8-AE03-0BE3A294F545}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {28ABBB60-945E-45A8-AE03-0BE3A294F545}.Debug|Any CPU.Build.0 = Debug|Any CPU - {28ABBB60-945E-45A8-AE03-0BE3A294F545}.Release|Any CPU.ActiveCfg = Release|Any CPU - {28ABBB60-945E-45A8-AE03-0BE3A294F545}.Release|Any CPU.Build.0 = Release|Any CPU - {587F3D68-E289-4526-A9D1-18BBE558EEAB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {587F3D68-E289-4526-A9D1-18BBE558EEAB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {587F3D68-E289-4526-A9D1-18BBE558EEAB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {587F3D68-E289-4526-A9D1-18BBE558EEAB}.Release|Any CPU.Build.0 = Release|Any CPU - {C7C39C00-F31D-43F2-820D-5BDD81223720}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C7C39C00-F31D-43F2-820D-5BDD81223720}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C7C39C00-F31D-43F2-820D-5BDD81223720}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C7C39C00-F31D-43F2-820D-5BDD81223720}.Release|Any CPU.Build.0 = Release|Any CPU - {EFF798C4-6BF3-4C39-806F-6ED9E9A54998}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EFF798C4-6BF3-4C39-806F-6ED9E9A54998}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EFF798C4-6BF3-4C39-806F-6ED9E9A54998}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EFF798C4-6BF3-4C39-806F-6ED9E9A54998}.Release|Any CPU.Build.0 = Release|Any CPU - {79CDAE9D-43A0-4FB0-96C2-793A29F10890}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {79CDAE9D-43A0-4FB0-96C2-793A29F10890}.Debug|Any CPU.Build.0 = Debug|Any CPU - {79CDAE9D-43A0-4FB0-96C2-793A29F10890}.Release|Any CPU.ActiveCfg = Release|Any CPU - {79CDAE9D-43A0-4FB0-96C2-793A29F10890}.Release|Any CPU.Build.0 = Release|Any CPU - {ECD3C01D-95B0-45B3-B45A-72218AAC79BF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {ECD3C01D-95B0-45B3-B45A-72218AAC79BF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {ECD3C01D-95B0-45B3-B45A-72218AAC79BF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {ECD3C01D-95B0-45B3-B45A-72218AAC79BF}.Release|Any CPU.Build.0 = Release|Any CPU - {CCE14345-6BBC-41DE-B590-BA795435CE13}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CCE14345-6BBC-41DE-B590-BA795435CE13}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CCE14345-6BBC-41DE-B590-BA795435CE13}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CCE14345-6BBC-41DE-B590-BA795435CE13}.Release|Any CPU.Build.0 = Release|Any CPU - {79D96923-5E7F-4BC4-8F37-6187519E8985}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {79D96923-5E7F-4BC4-8F37-6187519E8985}.Debug|Any CPU.Build.0 = Debug|Any CPU - {79D96923-5E7F-4BC4-8F37-6187519E8985}.Release|Any CPU.ActiveCfg = Release|Any CPU - {79D96923-5E7F-4BC4-8F37-6187519E8985}.Release|Any CPU.Build.0 = Release|Any CPU - {57236A36-BF4F-48E4-A0EE-5017E7DAED83}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {57236A36-BF4F-48E4-A0EE-5017E7DAED83}.Debug|Any CPU.Build.0 = Debug|Any CPU - {57236A36-BF4F-48E4-A0EE-5017E7DAED83}.Release|Any CPU.ActiveCfg = Release|Any CPU - {57236A36-BF4F-48E4-A0EE-5017E7DAED83}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {39704F80-5A71-4A74-B2B6-DEE3A4B7FA7C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {BEC602D7-C820-41B4-98C8-6FB2E486F959} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {6BA1C5E1-6EE5-4462-8A8A-86A30159EAB2} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {397C3E5A-A48E-434D-98F6-1D7E84322AFC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {CE90A81B-BFD7-4148-AABC-96D9182A02B3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {BCE52B39-F843-4977-B169-02FED2965298} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {28ABBB60-945E-45A8-AE03-0BE3A294F545} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {587F3D68-E289-4526-A9D1-18BBE558EEAB} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C7C39C00-F31D-43F2-820D-5BDD81223720} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {EFF798C4-6BF3-4C39-806F-6ED9E9A54998} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {79CDAE9D-43A0-4FB0-96C2-793A29F10890} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {ECD3C01D-95B0-45B3-B45A-72218AAC79BF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {CCE14345-6BBC-41DE-B590-BA795435CE13} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {79D96923-5E7F-4BC4-8F37-6187519E8985} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {57236A36-BF4F-48E4-A0EE-5017E7DAED83} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {BCE52B39-F843-4977-B169-02FED2965298} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {28ABBB60-945E-45A8-AE03-0BE3A294F545} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {587F3D68-E289-4526-A9D1-18BBE558EEAB} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C7C39C00-F31D-43F2-820D-5BDD81223720} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {EFF798C4-6BF3-4C39-806F-6ED9E9A54998} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {79CDAE9D-43A0-4FB0-96C2-793A29F10890} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {ECD3C01D-95B0-45B3-B45A-72218AAC79BF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {CCE14345-6BBC-41DE-B590-BA795435CE13} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {79D96923-5E7F-4BC4-8F37-6187519E8985} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {57236A36-BF4F-48E4-A0EE-5017E7DAED83} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {BF34B285-8AF4-468E-9E36-8FD8A670969D} diff --git a/sdk/src/Services/Chime/Generated/AmazonChimeConfig.cs b/sdk/src/Services/Chime/Generated/AmazonChimeConfig.cs index 62a01146a104..4361930d8c21 100644 --- a/sdk/src/Services/Chime/Generated/AmazonChimeConfig.cs +++ b/sdk/src/Services/Chime/Generated/AmazonChimeConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.Chime public partial class AmazonChimeConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("Chime", "4.0.0.0"); private static readonly AmazonChimeEndpointResolver EndpointResolver = new AmazonChimeEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("Chime", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("Chime", "3.7.400.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/Chime/Properties/AssemblyInfo.cs b/sdk/src/Services/Chime/Properties/AssemblyInfo.cs index bb255d9102ca..b740e0c9e18f 100644 --- a/sdk/src/Services/Chime/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/Chime/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/ChimeSDKIdentity/ChimeSDKIdentity.sln b/sdk/src/Services/ChimeSDKIdentity/ChimeSDKIdentity.sln index 37411255d170..5ee88d50cfbf 100644 --- a/sdk/src/Services/ChimeSDKIdentity/ChimeSDKIdentity.sln +++ b/sdk/src/Services/ChimeSDKIdentity/ChimeSDKIdentity.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {F8F69884-287A-4B77-8783-D8F3B4644EEC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {F8F69884-287A-4B77-8783-D8F3B4644EEC}.Debug|Any CPU.Build.0 = Debug|Any CPU {F8F69884-287A-4B77-8783-D8F3B4644EEC}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {4883248B-57F5-4A4C-AC2D-469F675FAD69}.Debug|Any CPU.Build.0 = Debug|Any CPU {4883248B-57F5-4A4C-AC2D-469F675FAD69}.Release|Any CPU.ActiveCfg = Release|Any CPU {4883248B-57F5-4A4C-AC2D-469F675FAD69}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {213ED55E-C496-4145-AF4E-3530AABE31AA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {213ED55E-C496-4145-AF4E-3530AABE31AA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {213ED55E-C496-4145-AF4E-3530AABE31AA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {213ED55E-C496-4145-AF4E-3530AABE31AA}.Release|Any CPU.Build.0 = Release|Any CPU - {05EDFAC0-A3EC-4CF5-8819-FEBABE58C419}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {05EDFAC0-A3EC-4CF5-8819-FEBABE58C419}.Debug|Any CPU.Build.0 = Debug|Any CPU - {05EDFAC0-A3EC-4CF5-8819-FEBABE58C419}.Release|Any CPU.ActiveCfg = Release|Any CPU - {05EDFAC0-A3EC-4CF5-8819-FEBABE58C419}.Release|Any CPU.Build.0 = Release|Any CPU - {F5B44999-A8F4-41B1-B717-5112DFC2E871}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F5B44999-A8F4-41B1-B717-5112DFC2E871}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F5B44999-A8F4-41B1-B717-5112DFC2E871}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F5B44999-A8F4-41B1-B717-5112DFC2E871}.Release|Any CPU.Build.0 = Release|Any CPU - {622F70C8-8F37-4E84-9E45-6B6A916A66F7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {622F70C8-8F37-4E84-9E45-6B6A916A66F7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {622F70C8-8F37-4E84-9E45-6B6A916A66F7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {622F70C8-8F37-4E84-9E45-6B6A916A66F7}.Release|Any CPU.Build.0 = Release|Any CPU - {ACAE4DB5-2C9E-4860-955C-72C6F4611712}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {ACAE4DB5-2C9E-4860-955C-72C6F4611712}.Debug|Any CPU.Build.0 = Debug|Any CPU - {ACAE4DB5-2C9E-4860-955C-72C6F4611712}.Release|Any CPU.ActiveCfg = Release|Any CPU - {ACAE4DB5-2C9E-4860-955C-72C6F4611712}.Release|Any CPU.Build.0 = Release|Any CPU - {01CF29AC-DB6F-4D4D-AF22-EBF44CFD8D1B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {01CF29AC-DB6F-4D4D-AF22-EBF44CFD8D1B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {01CF29AC-DB6F-4D4D-AF22-EBF44CFD8D1B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {01CF29AC-DB6F-4D4D-AF22-EBF44CFD8D1B}.Release|Any CPU.Build.0 = Release|Any CPU - {E390B251-5735-45AA-AB07-3755E1D35F90}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E390B251-5735-45AA-AB07-3755E1D35F90}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E390B251-5735-45AA-AB07-3755E1D35F90}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E390B251-5735-45AA-AB07-3755E1D35F90}.Release|Any CPU.Build.0 = Release|Any CPU - {E745A6EB-F41F-4543-82D3-1AC083C217D3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E745A6EB-F41F-4543-82D3-1AC083C217D3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E745A6EB-F41F-4543-82D3-1AC083C217D3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E745A6EB-F41F-4543-82D3-1AC083C217D3}.Release|Any CPU.Build.0 = Release|Any CPU - {86808740-90FC-424C-912B-1696B2E049A4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {86808740-90FC-424C-912B-1696B2E049A4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {86808740-90FC-424C-912B-1696B2E049A4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {86808740-90FC-424C-912B-1696B2E049A4}.Release|Any CPU.Build.0 = Release|Any CPU - {51EFCEFA-A640-45F6-A965-3C6AB954B4A5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {51EFCEFA-A640-45F6-A965-3C6AB954B4A5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {51EFCEFA-A640-45F6-A965-3C6AB954B4A5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {51EFCEFA-A640-45F6-A965-3C6AB954B4A5}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {213ED55E-C496-4145-AF4E-3530AABE31AA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {213ED55E-C496-4145-AF4E-3530AABE31AA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {213ED55E-C496-4145-AF4E-3530AABE31AA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {213ED55E-C496-4145-AF4E-3530AABE31AA}.Release|Any CPU.Build.0 = Release|Any CPU - {05EDFAC0-A3EC-4CF5-8819-FEBABE58C419}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {05EDFAC0-A3EC-4CF5-8819-FEBABE58C419}.Debug|Any CPU.Build.0 = Debug|Any CPU - {05EDFAC0-A3EC-4CF5-8819-FEBABE58C419}.Release|Any CPU.ActiveCfg = Release|Any CPU - {05EDFAC0-A3EC-4CF5-8819-FEBABE58C419}.Release|Any CPU.Build.0 = Release|Any CPU - {F5B44999-A8F4-41B1-B717-5112DFC2E871}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F5B44999-A8F4-41B1-B717-5112DFC2E871}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F5B44999-A8F4-41B1-B717-5112DFC2E871}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F5B44999-A8F4-41B1-B717-5112DFC2E871}.Release|Any CPU.Build.0 = Release|Any CPU - {622F70C8-8F37-4E84-9E45-6B6A916A66F7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {622F70C8-8F37-4E84-9E45-6B6A916A66F7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {622F70C8-8F37-4E84-9E45-6B6A916A66F7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {622F70C8-8F37-4E84-9E45-6B6A916A66F7}.Release|Any CPU.Build.0 = Release|Any CPU - {ACAE4DB5-2C9E-4860-955C-72C6F4611712}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {ACAE4DB5-2C9E-4860-955C-72C6F4611712}.Debug|Any CPU.Build.0 = Debug|Any CPU - {ACAE4DB5-2C9E-4860-955C-72C6F4611712}.Release|Any CPU.ActiveCfg = Release|Any CPU - {ACAE4DB5-2C9E-4860-955C-72C6F4611712}.Release|Any CPU.Build.0 = Release|Any CPU - {01CF29AC-DB6F-4D4D-AF22-EBF44CFD8D1B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {01CF29AC-DB6F-4D4D-AF22-EBF44CFD8D1B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {01CF29AC-DB6F-4D4D-AF22-EBF44CFD8D1B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {01CF29AC-DB6F-4D4D-AF22-EBF44CFD8D1B}.Release|Any CPU.Build.0 = Release|Any CPU - {E390B251-5735-45AA-AB07-3755E1D35F90}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E390B251-5735-45AA-AB07-3755E1D35F90}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E390B251-5735-45AA-AB07-3755E1D35F90}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E390B251-5735-45AA-AB07-3755E1D35F90}.Release|Any CPU.Build.0 = Release|Any CPU - {E745A6EB-F41F-4543-82D3-1AC083C217D3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E745A6EB-F41F-4543-82D3-1AC083C217D3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E745A6EB-F41F-4543-82D3-1AC083C217D3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E745A6EB-F41F-4543-82D3-1AC083C217D3}.Release|Any CPU.Build.0 = Release|Any CPU - {86808740-90FC-424C-912B-1696B2E049A4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {86808740-90FC-424C-912B-1696B2E049A4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {86808740-90FC-424C-912B-1696B2E049A4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {86808740-90FC-424C-912B-1696B2E049A4}.Release|Any CPU.Build.0 = Release|Any CPU - {51EFCEFA-A640-45F6-A965-3C6AB954B4A5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {51EFCEFA-A640-45F6-A965-3C6AB954B4A5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {51EFCEFA-A640-45F6-A965-3C6AB954B4A5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {51EFCEFA-A640-45F6-A965-3C6AB954B4A5}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {F8F69884-287A-4B77-8783-D8F3B4644EEC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {0298A58B-97DB-4C48-BA75-39D56DAFA867} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {226F4829-E8C8-4721-9ED2-BF660C269FA9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {CB660615-7A66-4A50-8D96-CBB5BCEF4421} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {4883248B-57F5-4A4C-AC2D-469F675FAD69} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {213ED55E-C496-4145-AF4E-3530AABE31AA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {05EDFAC0-A3EC-4CF5-8819-FEBABE58C419} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F5B44999-A8F4-41B1-B717-5112DFC2E871} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {622F70C8-8F37-4E84-9E45-6B6A916A66F7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {ACAE4DB5-2C9E-4860-955C-72C6F4611712} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {01CF29AC-DB6F-4D4D-AF22-EBF44CFD8D1B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E390B251-5735-45AA-AB07-3755E1D35F90} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E745A6EB-F41F-4543-82D3-1AC083C217D3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {86808740-90FC-424C-912B-1696B2E049A4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {51EFCEFA-A640-45F6-A965-3C6AB954B4A5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {213ED55E-C496-4145-AF4E-3530AABE31AA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {05EDFAC0-A3EC-4CF5-8819-FEBABE58C419} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F5B44999-A8F4-41B1-B717-5112DFC2E871} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {622F70C8-8F37-4E84-9E45-6B6A916A66F7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {ACAE4DB5-2C9E-4860-955C-72C6F4611712} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {01CF29AC-DB6F-4D4D-AF22-EBF44CFD8D1B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E390B251-5735-45AA-AB07-3755E1D35F90} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E745A6EB-F41F-4543-82D3-1AC083C217D3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {86808740-90FC-424C-912B-1696B2E049A4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {51EFCEFA-A640-45F6-A965-3C6AB954B4A5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {743570F3-3097-41B4-8160-CCF96A5CD135} diff --git a/sdk/src/Services/ChimeSDKIdentity/Generated/AmazonChimeSDKIdentityConfig.cs b/sdk/src/Services/ChimeSDKIdentity/Generated/AmazonChimeSDKIdentityConfig.cs index b23c748671a4..b412635b7390 100644 --- a/sdk/src/Services/ChimeSDKIdentity/Generated/AmazonChimeSDKIdentityConfig.cs +++ b/sdk/src/Services/ChimeSDKIdentity/Generated/AmazonChimeSDKIdentityConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.ChimeSDKIdentity public partial class AmazonChimeSDKIdentityConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("Chime SDK Identity", "4.0.0.0"); private static readonly AmazonChimeSDKIdentityEndpointResolver EndpointResolver = new AmazonChimeSDKIdentityEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("Chime SDK Identity", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("Chime SDK Identity", "3.7.400.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/ChimeSDKIdentity/Properties/AssemblyInfo.cs b/sdk/src/Services/ChimeSDKIdentity/Properties/AssemblyInfo.cs index 122397899e0f..5a3d7ce5555a 100644 --- a/sdk/src/Services/ChimeSDKIdentity/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/ChimeSDKIdentity/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/ChimeSDKMediaPipelines/ChimeSDKMediaPipelines.sln b/sdk/src/Services/ChimeSDKMediaPipelines/ChimeSDKMediaPipelines.sln index 6de3b150ffe3..ad31cc3d9f6d 100644 --- a/sdk/src/Services/ChimeSDKMediaPipelines/ChimeSDKMediaPipelines.sln +++ b/sdk/src/Services/ChimeSDKMediaPipelines/ChimeSDKMediaPipelines.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {27A61ABD-6A72-473A-95E3-80EF7EB41213}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {27A61ABD-6A72-473A-95E3-80EF7EB41213}.Debug|Any CPU.Build.0 = Debug|Any CPU {27A61ABD-6A72-473A-95E3-80EF7EB41213}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {7C19ECE4-E120-435F-8434-7E1B60740172}.Debug|Any CPU.Build.0 = Debug|Any CPU {7C19ECE4-E120-435F-8434-7E1B60740172}.Release|Any CPU.ActiveCfg = Release|Any CPU {7C19ECE4-E120-435F-8434-7E1B60740172}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {AD5B90B4-BFD9-4C30-8DD1-B2202872B3B2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AD5B90B4-BFD9-4C30-8DD1-B2202872B3B2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AD5B90B4-BFD9-4C30-8DD1-B2202872B3B2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AD5B90B4-BFD9-4C30-8DD1-B2202872B3B2}.Release|Any CPU.Build.0 = Release|Any CPU - {342B811D-79AD-4530-82CA-2E8AD9CD553D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {342B811D-79AD-4530-82CA-2E8AD9CD553D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {342B811D-79AD-4530-82CA-2E8AD9CD553D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {342B811D-79AD-4530-82CA-2E8AD9CD553D}.Release|Any CPU.Build.0 = Release|Any CPU - {F5F6825D-2568-47E0-8D7E-38DA4D76752F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F5F6825D-2568-47E0-8D7E-38DA4D76752F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F5F6825D-2568-47E0-8D7E-38DA4D76752F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F5F6825D-2568-47E0-8D7E-38DA4D76752F}.Release|Any CPU.Build.0 = Release|Any CPU - {36D9139A-B52C-424C-9C80-E8C120697655}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {36D9139A-B52C-424C-9C80-E8C120697655}.Debug|Any CPU.Build.0 = Debug|Any CPU - {36D9139A-B52C-424C-9C80-E8C120697655}.Release|Any CPU.ActiveCfg = Release|Any CPU - {36D9139A-B52C-424C-9C80-E8C120697655}.Release|Any CPU.Build.0 = Release|Any CPU - {58668662-C130-484F-AD86-FF6FE680B7B9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {58668662-C130-484F-AD86-FF6FE680B7B9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {58668662-C130-484F-AD86-FF6FE680B7B9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {58668662-C130-484F-AD86-FF6FE680B7B9}.Release|Any CPU.Build.0 = Release|Any CPU - {87F30DE9-C49D-4C48-8E87-E1A7A0EFDDA3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87F30DE9-C49D-4C48-8E87-E1A7A0EFDDA3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87F30DE9-C49D-4C48-8E87-E1A7A0EFDDA3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87F30DE9-C49D-4C48-8E87-E1A7A0EFDDA3}.Release|Any CPU.Build.0 = Release|Any CPU - {A9909A8E-310C-4F1C-8C3D-AF8C9ED1DEE4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A9909A8E-310C-4F1C-8C3D-AF8C9ED1DEE4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A9909A8E-310C-4F1C-8C3D-AF8C9ED1DEE4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A9909A8E-310C-4F1C-8C3D-AF8C9ED1DEE4}.Release|Any CPU.Build.0 = Release|Any CPU - {4BFC5FFB-D45E-4B89-8591-81B1D4B8879A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4BFC5FFB-D45E-4B89-8591-81B1D4B8879A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4BFC5FFB-D45E-4B89-8591-81B1D4B8879A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4BFC5FFB-D45E-4B89-8591-81B1D4B8879A}.Release|Any CPU.Build.0 = Release|Any CPU - {A13036E0-3CEA-4E05-97EA-0DEC613BD009}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A13036E0-3CEA-4E05-97EA-0DEC613BD009}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A13036E0-3CEA-4E05-97EA-0DEC613BD009}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A13036E0-3CEA-4E05-97EA-0DEC613BD009}.Release|Any CPU.Build.0 = Release|Any CPU - {DFE97BCB-A95D-4838-8232-AC6A8FE8A3F1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DFE97BCB-A95D-4838-8232-AC6A8FE8A3F1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DFE97BCB-A95D-4838-8232-AC6A8FE8A3F1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DFE97BCB-A95D-4838-8232-AC6A8FE8A3F1}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {AD5B90B4-BFD9-4C30-8DD1-B2202872B3B2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AD5B90B4-BFD9-4C30-8DD1-B2202872B3B2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AD5B90B4-BFD9-4C30-8DD1-B2202872B3B2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AD5B90B4-BFD9-4C30-8DD1-B2202872B3B2}.Release|Any CPU.Build.0 = Release|Any CPU - {342B811D-79AD-4530-82CA-2E8AD9CD553D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {342B811D-79AD-4530-82CA-2E8AD9CD553D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {342B811D-79AD-4530-82CA-2E8AD9CD553D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {342B811D-79AD-4530-82CA-2E8AD9CD553D}.Release|Any CPU.Build.0 = Release|Any CPU - {F5F6825D-2568-47E0-8D7E-38DA4D76752F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F5F6825D-2568-47E0-8D7E-38DA4D76752F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F5F6825D-2568-47E0-8D7E-38DA4D76752F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F5F6825D-2568-47E0-8D7E-38DA4D76752F}.Release|Any CPU.Build.0 = Release|Any CPU - {36D9139A-B52C-424C-9C80-E8C120697655}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {36D9139A-B52C-424C-9C80-E8C120697655}.Debug|Any CPU.Build.0 = Debug|Any CPU - {36D9139A-B52C-424C-9C80-E8C120697655}.Release|Any CPU.ActiveCfg = Release|Any CPU - {36D9139A-B52C-424C-9C80-E8C120697655}.Release|Any CPU.Build.0 = Release|Any CPU - {58668662-C130-484F-AD86-FF6FE680B7B9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {58668662-C130-484F-AD86-FF6FE680B7B9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {58668662-C130-484F-AD86-FF6FE680B7B9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {58668662-C130-484F-AD86-FF6FE680B7B9}.Release|Any CPU.Build.0 = Release|Any CPU - {87F30DE9-C49D-4C48-8E87-E1A7A0EFDDA3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87F30DE9-C49D-4C48-8E87-E1A7A0EFDDA3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87F30DE9-C49D-4C48-8E87-E1A7A0EFDDA3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87F30DE9-C49D-4C48-8E87-E1A7A0EFDDA3}.Release|Any CPU.Build.0 = Release|Any CPU - {A9909A8E-310C-4F1C-8C3D-AF8C9ED1DEE4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A9909A8E-310C-4F1C-8C3D-AF8C9ED1DEE4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A9909A8E-310C-4F1C-8C3D-AF8C9ED1DEE4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A9909A8E-310C-4F1C-8C3D-AF8C9ED1DEE4}.Release|Any CPU.Build.0 = Release|Any CPU - {4BFC5FFB-D45E-4B89-8591-81B1D4B8879A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4BFC5FFB-D45E-4B89-8591-81B1D4B8879A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4BFC5FFB-D45E-4B89-8591-81B1D4B8879A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4BFC5FFB-D45E-4B89-8591-81B1D4B8879A}.Release|Any CPU.Build.0 = Release|Any CPU - {A13036E0-3CEA-4E05-97EA-0DEC613BD009}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A13036E0-3CEA-4E05-97EA-0DEC613BD009}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A13036E0-3CEA-4E05-97EA-0DEC613BD009}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A13036E0-3CEA-4E05-97EA-0DEC613BD009}.Release|Any CPU.Build.0 = Release|Any CPU - {DFE97BCB-A95D-4838-8232-AC6A8FE8A3F1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DFE97BCB-A95D-4838-8232-AC6A8FE8A3F1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DFE97BCB-A95D-4838-8232-AC6A8FE8A3F1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DFE97BCB-A95D-4838-8232-AC6A8FE8A3F1}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {27A61ABD-6A72-473A-95E3-80EF7EB41213} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {4CD6BCA0-48C1-453C-B308-8B723EA1601A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {5CBB7EA0-0E9C-4430-9C73-4014C48996A0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {D17469A4-5C52-415F-A754-AB9EFB4AA375} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {7C19ECE4-E120-435F-8434-7E1B60740172} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {AD5B90B4-BFD9-4C30-8DD1-B2202872B3B2} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {342B811D-79AD-4530-82CA-2E8AD9CD553D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F5F6825D-2568-47E0-8D7E-38DA4D76752F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {36D9139A-B52C-424C-9C80-E8C120697655} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {58668662-C130-484F-AD86-FF6FE680B7B9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {87F30DE9-C49D-4C48-8E87-E1A7A0EFDDA3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A9909A8E-310C-4F1C-8C3D-AF8C9ED1DEE4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4BFC5FFB-D45E-4B89-8591-81B1D4B8879A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A13036E0-3CEA-4E05-97EA-0DEC613BD009} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {DFE97BCB-A95D-4838-8232-AC6A8FE8A3F1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {AD5B90B4-BFD9-4C30-8DD1-B2202872B3B2} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {342B811D-79AD-4530-82CA-2E8AD9CD553D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F5F6825D-2568-47E0-8D7E-38DA4D76752F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {36D9139A-B52C-424C-9C80-E8C120697655} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {58668662-C130-484F-AD86-FF6FE680B7B9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {87F30DE9-C49D-4C48-8E87-E1A7A0EFDDA3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A9909A8E-310C-4F1C-8C3D-AF8C9ED1DEE4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4BFC5FFB-D45E-4B89-8591-81B1D4B8879A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A13036E0-3CEA-4E05-97EA-0DEC613BD009} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {DFE97BCB-A95D-4838-8232-AC6A8FE8A3F1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {ED618ED9-BC8E-442E-9FF3-2D2E4DA61929} diff --git a/sdk/src/Services/ChimeSDKMediaPipelines/Generated/AmazonChimeSDKMediaPipelinesConfig.cs b/sdk/src/Services/ChimeSDKMediaPipelines/Generated/AmazonChimeSDKMediaPipelinesConfig.cs index 08a13e064d85..8d48d36e411e 100644 --- a/sdk/src/Services/ChimeSDKMediaPipelines/Generated/AmazonChimeSDKMediaPipelinesConfig.cs +++ b/sdk/src/Services/ChimeSDKMediaPipelines/Generated/AmazonChimeSDKMediaPipelinesConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.ChimeSDKMediaPipelines public partial class AmazonChimeSDKMediaPipelinesConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("Chime SDK Media Pipelines", "4.0.0.0"); private static readonly AmazonChimeSDKMediaPipelinesEndpointResolver EndpointResolver = new AmazonChimeSDKMediaPipelinesEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("Chime SDK Media Pipelines", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("Chime SDK Media Pipelines", "3.7.401.6"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/ChimeSDKMediaPipelines/Generated/Model/Internal/MarshallTransformations/CreateMediaCapturePipelineRequestMarshaller.cs b/sdk/src/Services/ChimeSDKMediaPipelines/Generated/Model/Internal/MarshallTransformations/CreateMediaCapturePipelineRequestMarshaller.cs index 7ed8354c18f9..a811d8374881 100644 --- a/sdk/src/Services/ChimeSDKMediaPipelines/Generated/Model/Internal/MarshallTransformations/CreateMediaCapturePipelineRequestMarshaller.cs +++ b/sdk/src/Services/ChimeSDKMediaPipelines/Generated/Model/Internal/MarshallTransformations/CreateMediaCapturePipelineRequestMarshaller.cs @@ -80,31 +80,11 @@ public IRequest Marshall(CreateMediaCapturePipelineRequest publicRequest) context.Writer.WriteObjectEnd(); } -<<<<<<< HEAD if(publicRequest.IsSetClientRequestToken()) { context.Writer.WritePropertyName("ClientRequestToken"); context.Writer.Write(publicRequest.ClientRequestToken); } -||||||| Commit version number update changes - if(publicRequest.IsSetSinkType()) - { - context.Writer.WritePropertyName("SinkType"); - context.Writer.Write(publicRequest.SinkType); - } -======= - if(publicRequest.IsSetSinkIamRoleArn()) - { - context.Writer.WritePropertyName("SinkIamRoleArn"); - context.Writer.Write(publicRequest.SinkIamRoleArn); - } - - if(publicRequest.IsSetSinkType()) - { - context.Writer.WritePropertyName("SinkType"); - context.Writer.Write(publicRequest.SinkType); - } ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b else if(!(publicRequest.IsSetClientRequestToken())) { @@ -117,38 +97,19 @@ public IRequest Marshall(CreateMediaCapturePipelineRequest publicRequest) context.Writer.Write(publicRequest.SinkArn); } + if(publicRequest.IsSetSinkIamRoleArn()) + { + context.Writer.WritePropertyName("SinkIamRoleArn"); + context.Writer.Write(publicRequest.SinkIamRoleArn); + } + if(publicRequest.IsSetSinkType()) { context.Writer.WritePropertyName("SinkType"); context.Writer.Write(publicRequest.SinkType); } -<<<<<<< HEAD if(publicRequest.IsSetSourceArn()) -||||||| Commit version number update changes - if(publicRequest.IsSetTags()) - { - context.Writer.WritePropertyName("Tags"); - context.Writer.WriteArrayStart(); - foreach(var publicRequestTagsListValue in publicRequest.Tags) -======= - if(publicRequest.IsSetSseAwsKeyManagementParams()) - { - context.Writer.WritePropertyName("SseAwsKeyManagementParams"); - context.Writer.WriteObjectStart(); - - var marshaller = SseAwsKeyManagementParamsMarshaller.Instance; - marshaller.Marshall(publicRequest.SseAwsKeyManagementParams, context); - - context.Writer.WriteObjectEnd(); - } - - if(publicRequest.IsSetTags()) - { - context.Writer.WritePropertyName("Tags"); - context.Writer.WriteArrayStart(); - foreach(var publicRequestTagsListValue in publicRequest.Tags) ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b { context.Writer.WritePropertyName("SourceArn"); context.Writer.Write(publicRequest.SourceArn); @@ -160,6 +121,17 @@ public IRequest Marshall(CreateMediaCapturePipelineRequest publicRequest) context.Writer.Write(publicRequest.SourceType); } + if(publicRequest.IsSetSseAwsKeyManagementParams()) + { + context.Writer.WritePropertyName("SseAwsKeyManagementParams"); + context.Writer.WriteObjectStart(); + + var marshaller = SseAwsKeyManagementParamsMarshaller.Instance; + marshaller.Marshall(publicRequest.SseAwsKeyManagementParams, context); + + context.Writer.WriteObjectEnd(); + } + if(publicRequest.IsSetTags()) { context.Writer.WritePropertyName("Tags"); diff --git a/sdk/src/Services/ChimeSDKMediaPipelines/Properties/AssemblyInfo.cs b/sdk/src/Services/ChimeSDKMediaPipelines/Properties/AssemblyInfo.cs index 417e43cbd164..63eb7336c910 100644 --- a/sdk/src/Services/ChimeSDKMediaPipelines/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/ChimeSDKMediaPipelines/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.6")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/ChimeSDKMeetings/ChimeSDKMeetings.sln b/sdk/src/Services/ChimeSDKMeetings/ChimeSDKMeetings.sln index d3e36c3472ef..943c68c7a868 100644 --- a/sdk/src/Services/ChimeSDKMeetings/ChimeSDKMeetings.sln +++ b/sdk/src/Services/ChimeSDKMeetings/ChimeSDKMeetings.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {67966D85-E636-44E9-ABEA-F0D9E5720409}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {67966D85-E636-44E9-ABEA-F0D9E5720409}.Debug|Any CPU.Build.0 = Debug|Any CPU {67966D85-E636-44E9-ABEA-F0D9E5720409}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {F9944F1A-860D-465E-B612-D04761AB7548}.Debug|Any CPU.Build.0 = Debug|Any CPU {F9944F1A-860D-465E-B612-D04761AB7548}.Release|Any CPU.ActiveCfg = Release|Any CPU {F9944F1A-860D-465E-B612-D04761AB7548}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {332580AE-DFB1-4FB1-B5A4-1EC5E2AD60B5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {332580AE-DFB1-4FB1-B5A4-1EC5E2AD60B5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {332580AE-DFB1-4FB1-B5A4-1EC5E2AD60B5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {332580AE-DFB1-4FB1-B5A4-1EC5E2AD60B5}.Release|Any CPU.Build.0 = Release|Any CPU - {A4387C0B-60A5-46DB-A01F-59D98518124D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A4387C0B-60A5-46DB-A01F-59D98518124D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A4387C0B-60A5-46DB-A01F-59D98518124D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A4387C0B-60A5-46DB-A01F-59D98518124D}.Release|Any CPU.Build.0 = Release|Any CPU - {67522441-4FD4-4AD4-87D7-DED9E103D089}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {67522441-4FD4-4AD4-87D7-DED9E103D089}.Debug|Any CPU.Build.0 = Debug|Any CPU - {67522441-4FD4-4AD4-87D7-DED9E103D089}.Release|Any CPU.ActiveCfg = Release|Any CPU - {67522441-4FD4-4AD4-87D7-DED9E103D089}.Release|Any CPU.Build.0 = Release|Any CPU - {64DB2147-788B-40A9-8AB1-C3C8A49241E6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {64DB2147-788B-40A9-8AB1-C3C8A49241E6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {64DB2147-788B-40A9-8AB1-C3C8A49241E6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {64DB2147-788B-40A9-8AB1-C3C8A49241E6}.Release|Any CPU.Build.0 = Release|Any CPU - {085C0983-DD68-4927-BFA5-DCBB92DB7C04}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {085C0983-DD68-4927-BFA5-DCBB92DB7C04}.Debug|Any CPU.Build.0 = Debug|Any CPU - {085C0983-DD68-4927-BFA5-DCBB92DB7C04}.Release|Any CPU.ActiveCfg = Release|Any CPU - {085C0983-DD68-4927-BFA5-DCBB92DB7C04}.Release|Any CPU.Build.0 = Release|Any CPU - {0793EA9D-9ECC-43F2-A63F-B9814A73D6D3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0793EA9D-9ECC-43F2-A63F-B9814A73D6D3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0793EA9D-9ECC-43F2-A63F-B9814A73D6D3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0793EA9D-9ECC-43F2-A63F-B9814A73D6D3}.Release|Any CPU.Build.0 = Release|Any CPU - {6CD560D4-2CA7-435A-A4B9-1FBF4B76E33A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6CD560D4-2CA7-435A-A4B9-1FBF4B76E33A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6CD560D4-2CA7-435A-A4B9-1FBF4B76E33A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6CD560D4-2CA7-435A-A4B9-1FBF4B76E33A}.Release|Any CPU.Build.0 = Release|Any CPU - {9D7EB27D-829E-40A8-AD9F-FDDC1947E498}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9D7EB27D-829E-40A8-AD9F-FDDC1947E498}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9D7EB27D-829E-40A8-AD9F-FDDC1947E498}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9D7EB27D-829E-40A8-AD9F-FDDC1947E498}.Release|Any CPU.Build.0 = Release|Any CPU - {9BBF692C-EBD8-4C34-B92D-4E5BBA6966E2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9BBF692C-EBD8-4C34-B92D-4E5BBA6966E2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9BBF692C-EBD8-4C34-B92D-4E5BBA6966E2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9BBF692C-EBD8-4C34-B92D-4E5BBA6966E2}.Release|Any CPU.Build.0 = Release|Any CPU - {BA01C91D-F607-4273-B70B-50EBA043F417}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BA01C91D-F607-4273-B70B-50EBA043F417}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BA01C91D-F607-4273-B70B-50EBA043F417}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BA01C91D-F607-4273-B70B-50EBA043F417}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {332580AE-DFB1-4FB1-B5A4-1EC5E2AD60B5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {332580AE-DFB1-4FB1-B5A4-1EC5E2AD60B5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {332580AE-DFB1-4FB1-B5A4-1EC5E2AD60B5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {332580AE-DFB1-4FB1-B5A4-1EC5E2AD60B5}.Release|Any CPU.Build.0 = Release|Any CPU - {A4387C0B-60A5-46DB-A01F-59D98518124D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A4387C0B-60A5-46DB-A01F-59D98518124D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A4387C0B-60A5-46DB-A01F-59D98518124D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A4387C0B-60A5-46DB-A01F-59D98518124D}.Release|Any CPU.Build.0 = Release|Any CPU - {67522441-4FD4-4AD4-87D7-DED9E103D089}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {67522441-4FD4-4AD4-87D7-DED9E103D089}.Debug|Any CPU.Build.0 = Debug|Any CPU - {67522441-4FD4-4AD4-87D7-DED9E103D089}.Release|Any CPU.ActiveCfg = Release|Any CPU - {67522441-4FD4-4AD4-87D7-DED9E103D089}.Release|Any CPU.Build.0 = Release|Any CPU - {64DB2147-788B-40A9-8AB1-C3C8A49241E6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {64DB2147-788B-40A9-8AB1-C3C8A49241E6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {64DB2147-788B-40A9-8AB1-C3C8A49241E6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {64DB2147-788B-40A9-8AB1-C3C8A49241E6}.Release|Any CPU.Build.0 = Release|Any CPU - {085C0983-DD68-4927-BFA5-DCBB92DB7C04}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {085C0983-DD68-4927-BFA5-DCBB92DB7C04}.Debug|Any CPU.Build.0 = Debug|Any CPU - {085C0983-DD68-4927-BFA5-DCBB92DB7C04}.Release|Any CPU.ActiveCfg = Release|Any CPU - {085C0983-DD68-4927-BFA5-DCBB92DB7C04}.Release|Any CPU.Build.0 = Release|Any CPU - {0793EA9D-9ECC-43F2-A63F-B9814A73D6D3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0793EA9D-9ECC-43F2-A63F-B9814A73D6D3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0793EA9D-9ECC-43F2-A63F-B9814A73D6D3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0793EA9D-9ECC-43F2-A63F-B9814A73D6D3}.Release|Any CPU.Build.0 = Release|Any CPU - {6CD560D4-2CA7-435A-A4B9-1FBF4B76E33A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6CD560D4-2CA7-435A-A4B9-1FBF4B76E33A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6CD560D4-2CA7-435A-A4B9-1FBF4B76E33A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6CD560D4-2CA7-435A-A4B9-1FBF4B76E33A}.Release|Any CPU.Build.0 = Release|Any CPU - {9D7EB27D-829E-40A8-AD9F-FDDC1947E498}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9D7EB27D-829E-40A8-AD9F-FDDC1947E498}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9D7EB27D-829E-40A8-AD9F-FDDC1947E498}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9D7EB27D-829E-40A8-AD9F-FDDC1947E498}.Release|Any CPU.Build.0 = Release|Any CPU - {9BBF692C-EBD8-4C34-B92D-4E5BBA6966E2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9BBF692C-EBD8-4C34-B92D-4E5BBA6966E2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9BBF692C-EBD8-4C34-B92D-4E5BBA6966E2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9BBF692C-EBD8-4C34-B92D-4E5BBA6966E2}.Release|Any CPU.Build.0 = Release|Any CPU - {BA01C91D-F607-4273-B70B-50EBA043F417}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BA01C91D-F607-4273-B70B-50EBA043F417}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BA01C91D-F607-4273-B70B-50EBA043F417}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BA01C91D-F607-4273-B70B-50EBA043F417}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {67966D85-E636-44E9-ABEA-F0D9E5720409} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {A1DE3C09-CAB5-441A-AADF-8C36D480A0A4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {452F596C-6A63-4323-97EF-8B67A6A30860} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {265FC842-29E5-4480-AD49-F32FEDD4E655} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {F9944F1A-860D-465E-B612-D04761AB7548} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {332580AE-DFB1-4FB1-B5A4-1EC5E2AD60B5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A4387C0B-60A5-46DB-A01F-59D98518124D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {67522441-4FD4-4AD4-87D7-DED9E103D089} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {64DB2147-788B-40A9-8AB1-C3C8A49241E6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {085C0983-DD68-4927-BFA5-DCBB92DB7C04} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0793EA9D-9ECC-43F2-A63F-B9814A73D6D3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6CD560D4-2CA7-435A-A4B9-1FBF4B76E33A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {9D7EB27D-829E-40A8-AD9F-FDDC1947E498} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {9BBF692C-EBD8-4C34-B92D-4E5BBA6966E2} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {BA01C91D-F607-4273-B70B-50EBA043F417} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {332580AE-DFB1-4FB1-B5A4-1EC5E2AD60B5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A4387C0B-60A5-46DB-A01F-59D98518124D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {67522441-4FD4-4AD4-87D7-DED9E103D089} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {64DB2147-788B-40A9-8AB1-C3C8A49241E6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {085C0983-DD68-4927-BFA5-DCBB92DB7C04} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0793EA9D-9ECC-43F2-A63F-B9814A73D6D3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6CD560D4-2CA7-435A-A4B9-1FBF4B76E33A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {9D7EB27D-829E-40A8-AD9F-FDDC1947E498} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {9BBF692C-EBD8-4C34-B92D-4E5BBA6966E2} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {BA01C91D-F607-4273-B70B-50EBA043F417} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {4C3C04C5-EDAB-4812-AD89-EC0247382926} diff --git a/sdk/src/Services/ChimeSDKMeetings/Generated/AmazonChimeSDKMeetingsConfig.cs b/sdk/src/Services/ChimeSDKMeetings/Generated/AmazonChimeSDKMeetingsConfig.cs index 7e8a016c0e04..e37af625533d 100644 --- a/sdk/src/Services/ChimeSDKMeetings/Generated/AmazonChimeSDKMeetingsConfig.cs +++ b/sdk/src/Services/ChimeSDKMeetings/Generated/AmazonChimeSDKMeetingsConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.ChimeSDKMeetings public partial class AmazonChimeSDKMeetingsConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("Chime SDK Meetings", "4.0.0.0"); private static readonly AmazonChimeSDKMeetingsEndpointResolver EndpointResolver = new AmazonChimeSDKMeetingsEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("Chime SDK Meetings", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("Chime SDK Meetings", "3.7.400.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/ChimeSDKMeetings/Properties/AssemblyInfo.cs b/sdk/src/Services/ChimeSDKMeetings/Properties/AssemblyInfo.cs index 61a449168ff0..8c2cc09f2b18 100644 --- a/sdk/src/Services/ChimeSDKMeetings/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/ChimeSDKMeetings/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/ChimeSDKMessaging/ChimeSDKMessaging.sln b/sdk/src/Services/ChimeSDKMessaging/ChimeSDKMessaging.sln index 29a984fbbd7e..bd5eb2929dac 100644 --- a/sdk/src/Services/ChimeSDKMessaging/ChimeSDKMessaging.sln +++ b/sdk/src/Services/ChimeSDKMessaging/ChimeSDKMessaging.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {6B0C36B7-23A4-4E84-B0A1-00A771D554D6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {6B0C36B7-23A4-4E84-B0A1-00A771D554D6}.Debug|Any CPU.Build.0 = Debug|Any CPU {6B0C36B7-23A4-4E84-B0A1-00A771D554D6}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {3659F63B-D3B9-4B15-9E4D-307994128320}.Debug|Any CPU.Build.0 = Debug|Any CPU {3659F63B-D3B9-4B15-9E4D-307994128320}.Release|Any CPU.ActiveCfg = Release|Any CPU {3659F63B-D3B9-4B15-9E4D-307994128320}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {AB5CD209-92A1-41E0-9E65-79A2ABF27E4C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AB5CD209-92A1-41E0-9E65-79A2ABF27E4C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AB5CD209-92A1-41E0-9E65-79A2ABF27E4C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AB5CD209-92A1-41E0-9E65-79A2ABF27E4C}.Release|Any CPU.Build.0 = Release|Any CPU - {1C815E7C-C3B4-4672-A78F-9AD51D86003D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1C815E7C-C3B4-4672-A78F-9AD51D86003D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1C815E7C-C3B4-4672-A78F-9AD51D86003D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1C815E7C-C3B4-4672-A78F-9AD51D86003D}.Release|Any CPU.Build.0 = Release|Any CPU - {63011098-C608-4D40-ADAB-1FACD28B67AA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {63011098-C608-4D40-ADAB-1FACD28B67AA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {63011098-C608-4D40-ADAB-1FACD28B67AA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {63011098-C608-4D40-ADAB-1FACD28B67AA}.Release|Any CPU.Build.0 = Release|Any CPU - {FC4AC9C5-AAB7-451E-8B24-3DBE6D6B2D90}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FC4AC9C5-AAB7-451E-8B24-3DBE6D6B2D90}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FC4AC9C5-AAB7-451E-8B24-3DBE6D6B2D90}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FC4AC9C5-AAB7-451E-8B24-3DBE6D6B2D90}.Release|Any CPU.Build.0 = Release|Any CPU - {153CE6DA-14D3-4F27-B2A9-8603B6BE4A42}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {153CE6DA-14D3-4F27-B2A9-8603B6BE4A42}.Debug|Any CPU.Build.0 = Debug|Any CPU - {153CE6DA-14D3-4F27-B2A9-8603B6BE4A42}.Release|Any CPU.ActiveCfg = Release|Any CPU - {153CE6DA-14D3-4F27-B2A9-8603B6BE4A42}.Release|Any CPU.Build.0 = Release|Any CPU - {F44371FA-3869-4ECB-BAF6-9721385036A4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F44371FA-3869-4ECB-BAF6-9721385036A4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F44371FA-3869-4ECB-BAF6-9721385036A4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F44371FA-3869-4ECB-BAF6-9721385036A4}.Release|Any CPU.Build.0 = Release|Any CPU - {FAB68A24-499B-438B-95FC-D91C8B1E0FB7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FAB68A24-499B-438B-95FC-D91C8B1E0FB7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FAB68A24-499B-438B-95FC-D91C8B1E0FB7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FAB68A24-499B-438B-95FC-D91C8B1E0FB7}.Release|Any CPU.Build.0 = Release|Any CPU - {6EE617D1-1238-4FFC-99DB-D6DDA94D4391}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6EE617D1-1238-4FFC-99DB-D6DDA94D4391}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6EE617D1-1238-4FFC-99DB-D6DDA94D4391}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6EE617D1-1238-4FFC-99DB-D6DDA94D4391}.Release|Any CPU.Build.0 = Release|Any CPU - {1C217E2C-43CE-4542-A868-A6753469E82C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1C217E2C-43CE-4542-A868-A6753469E82C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1C217E2C-43CE-4542-A868-A6753469E82C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1C217E2C-43CE-4542-A868-A6753469E82C}.Release|Any CPU.Build.0 = Release|Any CPU - {411C4AB1-F742-4889-A795-CB08DB68F74A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {411C4AB1-F742-4889-A795-CB08DB68F74A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {411C4AB1-F742-4889-A795-CB08DB68F74A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {411C4AB1-F742-4889-A795-CB08DB68F74A}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {AB5CD209-92A1-41E0-9E65-79A2ABF27E4C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AB5CD209-92A1-41E0-9E65-79A2ABF27E4C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AB5CD209-92A1-41E0-9E65-79A2ABF27E4C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AB5CD209-92A1-41E0-9E65-79A2ABF27E4C}.Release|Any CPU.Build.0 = Release|Any CPU - {1C815E7C-C3B4-4672-A78F-9AD51D86003D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1C815E7C-C3B4-4672-A78F-9AD51D86003D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1C815E7C-C3B4-4672-A78F-9AD51D86003D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1C815E7C-C3B4-4672-A78F-9AD51D86003D}.Release|Any CPU.Build.0 = Release|Any CPU - {63011098-C608-4D40-ADAB-1FACD28B67AA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {63011098-C608-4D40-ADAB-1FACD28B67AA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {63011098-C608-4D40-ADAB-1FACD28B67AA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {63011098-C608-4D40-ADAB-1FACD28B67AA}.Release|Any CPU.Build.0 = Release|Any CPU - {FC4AC9C5-AAB7-451E-8B24-3DBE6D6B2D90}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FC4AC9C5-AAB7-451E-8B24-3DBE6D6B2D90}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FC4AC9C5-AAB7-451E-8B24-3DBE6D6B2D90}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FC4AC9C5-AAB7-451E-8B24-3DBE6D6B2D90}.Release|Any CPU.Build.0 = Release|Any CPU - {153CE6DA-14D3-4F27-B2A9-8603B6BE4A42}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {153CE6DA-14D3-4F27-B2A9-8603B6BE4A42}.Debug|Any CPU.Build.0 = Debug|Any CPU - {153CE6DA-14D3-4F27-B2A9-8603B6BE4A42}.Release|Any CPU.ActiveCfg = Release|Any CPU - {153CE6DA-14D3-4F27-B2A9-8603B6BE4A42}.Release|Any CPU.Build.0 = Release|Any CPU - {F44371FA-3869-4ECB-BAF6-9721385036A4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F44371FA-3869-4ECB-BAF6-9721385036A4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F44371FA-3869-4ECB-BAF6-9721385036A4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F44371FA-3869-4ECB-BAF6-9721385036A4}.Release|Any CPU.Build.0 = Release|Any CPU - {FAB68A24-499B-438B-95FC-D91C8B1E0FB7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FAB68A24-499B-438B-95FC-D91C8B1E0FB7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FAB68A24-499B-438B-95FC-D91C8B1E0FB7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FAB68A24-499B-438B-95FC-D91C8B1E0FB7}.Release|Any CPU.Build.0 = Release|Any CPU - {6EE617D1-1238-4FFC-99DB-D6DDA94D4391}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6EE617D1-1238-4FFC-99DB-D6DDA94D4391}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6EE617D1-1238-4FFC-99DB-D6DDA94D4391}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6EE617D1-1238-4FFC-99DB-D6DDA94D4391}.Release|Any CPU.Build.0 = Release|Any CPU - {1C217E2C-43CE-4542-A868-A6753469E82C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1C217E2C-43CE-4542-A868-A6753469E82C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1C217E2C-43CE-4542-A868-A6753469E82C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1C217E2C-43CE-4542-A868-A6753469E82C}.Release|Any CPU.Build.0 = Release|Any CPU - {411C4AB1-F742-4889-A795-CB08DB68F74A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {411C4AB1-F742-4889-A795-CB08DB68F74A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {411C4AB1-F742-4889-A795-CB08DB68F74A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {411C4AB1-F742-4889-A795-CB08DB68F74A}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {6B0C36B7-23A4-4E84-B0A1-00A771D554D6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {B891C017-6D0D-4A3F-8D6A-18D53E53D342} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {564F825B-23A7-4BC5-A25D-D6C849352F2C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {703BF522-1EAE-459B-AC7D-57FB517F072E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {3659F63B-D3B9-4B15-9E4D-307994128320} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {AB5CD209-92A1-41E0-9E65-79A2ABF27E4C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {1C815E7C-C3B4-4672-A78F-9AD51D86003D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {63011098-C608-4D40-ADAB-1FACD28B67AA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {FC4AC9C5-AAB7-451E-8B24-3DBE6D6B2D90} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {153CE6DA-14D3-4F27-B2A9-8603B6BE4A42} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F44371FA-3869-4ECB-BAF6-9721385036A4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {FAB68A24-499B-438B-95FC-D91C8B1E0FB7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6EE617D1-1238-4FFC-99DB-D6DDA94D4391} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {1C217E2C-43CE-4542-A868-A6753469E82C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {411C4AB1-F742-4889-A795-CB08DB68F74A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {AB5CD209-92A1-41E0-9E65-79A2ABF27E4C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {1C815E7C-C3B4-4672-A78F-9AD51D86003D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {63011098-C608-4D40-ADAB-1FACD28B67AA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {FC4AC9C5-AAB7-451E-8B24-3DBE6D6B2D90} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {153CE6DA-14D3-4F27-B2A9-8603B6BE4A42} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F44371FA-3869-4ECB-BAF6-9721385036A4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {FAB68A24-499B-438B-95FC-D91C8B1E0FB7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6EE617D1-1238-4FFC-99DB-D6DDA94D4391} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {1C217E2C-43CE-4542-A868-A6753469E82C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {411C4AB1-F742-4889-A795-CB08DB68F74A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {3A304FD7-2E64-4A73-83FD-F9B68645A830} diff --git a/sdk/src/Services/ChimeSDKMessaging/Generated/AmazonChimeSDKMessagingConfig.cs b/sdk/src/Services/ChimeSDKMessaging/Generated/AmazonChimeSDKMessagingConfig.cs index 652ca4465039..a61600d51a0f 100644 --- a/sdk/src/Services/ChimeSDKMessaging/Generated/AmazonChimeSDKMessagingConfig.cs +++ b/sdk/src/Services/ChimeSDKMessaging/Generated/AmazonChimeSDKMessagingConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.ChimeSDKMessaging public partial class AmazonChimeSDKMessagingConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("Chime SDK Messaging", "4.0.0.0"); private static readonly AmazonChimeSDKMessagingEndpointResolver EndpointResolver = new AmazonChimeSDKMessagingEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("Chime SDK Messaging", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("Chime SDK Messaging", "3.7.400.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/ChimeSDKMessaging/Properties/AssemblyInfo.cs b/sdk/src/Services/ChimeSDKMessaging/Properties/AssemblyInfo.cs index 113d6bae3e4b..7a4aff2e9004 100644 --- a/sdk/src/Services/ChimeSDKMessaging/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/ChimeSDKMessaging/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/ChimeSDKVoice/ChimeSDKVoice.sln b/sdk/src/Services/ChimeSDKVoice/ChimeSDKVoice.sln index a5a47dbc4569..cb238cebe69a 100644 --- a/sdk/src/Services/ChimeSDKVoice/ChimeSDKVoice.sln +++ b/sdk/src/Services/ChimeSDKVoice/ChimeSDKVoice.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {3B547107-2073-4FBA-BEF4-048AFBFA779B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {3B547107-2073-4FBA-BEF4-048AFBFA779B}.Debug|Any CPU.Build.0 = Debug|Any CPU {3B547107-2073-4FBA-BEF4-048AFBFA779B}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {EE4AD5A0-0B56-484A-8872-738FF2E20D58}.Debug|Any CPU.Build.0 = Debug|Any CPU {EE4AD5A0-0B56-484A-8872-738FF2E20D58}.Release|Any CPU.ActiveCfg = Release|Any CPU {EE4AD5A0-0B56-484A-8872-738FF2E20D58}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {FB4CAD23-EE37-4549-AA03-55FFF91554DD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FB4CAD23-EE37-4549-AA03-55FFF91554DD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FB4CAD23-EE37-4549-AA03-55FFF91554DD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FB4CAD23-EE37-4549-AA03-55FFF91554DD}.Release|Any CPU.Build.0 = Release|Any CPU - {74BF5CE2-6FE0-4637-BBD2-BF1F56664D46}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {74BF5CE2-6FE0-4637-BBD2-BF1F56664D46}.Debug|Any CPU.Build.0 = Debug|Any CPU - {74BF5CE2-6FE0-4637-BBD2-BF1F56664D46}.Release|Any CPU.ActiveCfg = Release|Any CPU - {74BF5CE2-6FE0-4637-BBD2-BF1F56664D46}.Release|Any CPU.Build.0 = Release|Any CPU - {D8858F41-2AA0-4F06-A758-1585D7DB60D3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D8858F41-2AA0-4F06-A758-1585D7DB60D3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D8858F41-2AA0-4F06-A758-1585D7DB60D3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D8858F41-2AA0-4F06-A758-1585D7DB60D3}.Release|Any CPU.Build.0 = Release|Any CPU - {1634A217-C9E9-401F-9E47-534042801DBE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1634A217-C9E9-401F-9E47-534042801DBE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1634A217-C9E9-401F-9E47-534042801DBE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1634A217-C9E9-401F-9E47-534042801DBE}.Release|Any CPU.Build.0 = Release|Any CPU - {B6A7CAD6-8FAB-4EE9-A6BB-282134BC4925}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B6A7CAD6-8FAB-4EE9-A6BB-282134BC4925}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B6A7CAD6-8FAB-4EE9-A6BB-282134BC4925}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B6A7CAD6-8FAB-4EE9-A6BB-282134BC4925}.Release|Any CPU.Build.0 = Release|Any CPU - {9C2D23EE-5364-4AE9-9D7B-40F4BF5AEE95}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9C2D23EE-5364-4AE9-9D7B-40F4BF5AEE95}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9C2D23EE-5364-4AE9-9D7B-40F4BF5AEE95}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9C2D23EE-5364-4AE9-9D7B-40F4BF5AEE95}.Release|Any CPU.Build.0 = Release|Any CPU - {8EEB7C5A-76E2-402E-A874-751ECC556BDE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8EEB7C5A-76E2-402E-A874-751ECC556BDE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8EEB7C5A-76E2-402E-A874-751ECC556BDE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8EEB7C5A-76E2-402E-A874-751ECC556BDE}.Release|Any CPU.Build.0 = Release|Any CPU - {17372DFE-412A-4566-8488-CFD148BC3EE1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {17372DFE-412A-4566-8488-CFD148BC3EE1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {17372DFE-412A-4566-8488-CFD148BC3EE1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {17372DFE-412A-4566-8488-CFD148BC3EE1}.Release|Any CPU.Build.0 = Release|Any CPU - {A1D075FF-BDD6-495A-9094-88D80AB0A581}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A1D075FF-BDD6-495A-9094-88D80AB0A581}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A1D075FF-BDD6-495A-9094-88D80AB0A581}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A1D075FF-BDD6-495A-9094-88D80AB0A581}.Release|Any CPU.Build.0 = Release|Any CPU - {9B625D00-77D3-4DB6-9676-A73A07EFFDE5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9B625D00-77D3-4DB6-9676-A73A07EFFDE5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9B625D00-77D3-4DB6-9676-A73A07EFFDE5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9B625D00-77D3-4DB6-9676-A73A07EFFDE5}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {FB4CAD23-EE37-4549-AA03-55FFF91554DD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FB4CAD23-EE37-4549-AA03-55FFF91554DD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FB4CAD23-EE37-4549-AA03-55FFF91554DD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FB4CAD23-EE37-4549-AA03-55FFF91554DD}.Release|Any CPU.Build.0 = Release|Any CPU - {74BF5CE2-6FE0-4637-BBD2-BF1F56664D46}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {74BF5CE2-6FE0-4637-BBD2-BF1F56664D46}.Debug|Any CPU.Build.0 = Debug|Any CPU - {74BF5CE2-6FE0-4637-BBD2-BF1F56664D46}.Release|Any CPU.ActiveCfg = Release|Any CPU - {74BF5CE2-6FE0-4637-BBD2-BF1F56664D46}.Release|Any CPU.Build.0 = Release|Any CPU - {D8858F41-2AA0-4F06-A758-1585D7DB60D3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D8858F41-2AA0-4F06-A758-1585D7DB60D3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D8858F41-2AA0-4F06-A758-1585D7DB60D3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D8858F41-2AA0-4F06-A758-1585D7DB60D3}.Release|Any CPU.Build.0 = Release|Any CPU - {1634A217-C9E9-401F-9E47-534042801DBE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1634A217-C9E9-401F-9E47-534042801DBE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1634A217-C9E9-401F-9E47-534042801DBE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1634A217-C9E9-401F-9E47-534042801DBE}.Release|Any CPU.Build.0 = Release|Any CPU - {B6A7CAD6-8FAB-4EE9-A6BB-282134BC4925}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B6A7CAD6-8FAB-4EE9-A6BB-282134BC4925}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B6A7CAD6-8FAB-4EE9-A6BB-282134BC4925}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B6A7CAD6-8FAB-4EE9-A6BB-282134BC4925}.Release|Any CPU.Build.0 = Release|Any CPU - {9C2D23EE-5364-4AE9-9D7B-40F4BF5AEE95}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9C2D23EE-5364-4AE9-9D7B-40F4BF5AEE95}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9C2D23EE-5364-4AE9-9D7B-40F4BF5AEE95}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9C2D23EE-5364-4AE9-9D7B-40F4BF5AEE95}.Release|Any CPU.Build.0 = Release|Any CPU - {8EEB7C5A-76E2-402E-A874-751ECC556BDE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8EEB7C5A-76E2-402E-A874-751ECC556BDE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8EEB7C5A-76E2-402E-A874-751ECC556BDE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8EEB7C5A-76E2-402E-A874-751ECC556BDE}.Release|Any CPU.Build.0 = Release|Any CPU - {17372DFE-412A-4566-8488-CFD148BC3EE1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {17372DFE-412A-4566-8488-CFD148BC3EE1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {17372DFE-412A-4566-8488-CFD148BC3EE1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {17372DFE-412A-4566-8488-CFD148BC3EE1}.Release|Any CPU.Build.0 = Release|Any CPU - {A1D075FF-BDD6-495A-9094-88D80AB0A581}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A1D075FF-BDD6-495A-9094-88D80AB0A581}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A1D075FF-BDD6-495A-9094-88D80AB0A581}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A1D075FF-BDD6-495A-9094-88D80AB0A581}.Release|Any CPU.Build.0 = Release|Any CPU - {9B625D00-77D3-4DB6-9676-A73A07EFFDE5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9B625D00-77D3-4DB6-9676-A73A07EFFDE5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9B625D00-77D3-4DB6-9676-A73A07EFFDE5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9B625D00-77D3-4DB6-9676-A73A07EFFDE5}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {3B547107-2073-4FBA-BEF4-048AFBFA779B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {06F2C8BE-BFD4-4452-8A87-0019601356CF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {15E43D17-7D3B-4760-96E5-4F8AD4885052} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {12381210-A1AC-4C3B-B010-B6A3A376E005} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {EE4AD5A0-0B56-484A-8872-738FF2E20D58} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {FB4CAD23-EE37-4549-AA03-55FFF91554DD} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {74BF5CE2-6FE0-4637-BBD2-BF1F56664D46} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D8858F41-2AA0-4F06-A758-1585D7DB60D3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {1634A217-C9E9-401F-9E47-534042801DBE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B6A7CAD6-8FAB-4EE9-A6BB-282134BC4925} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {9C2D23EE-5364-4AE9-9D7B-40F4BF5AEE95} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8EEB7C5A-76E2-402E-A874-751ECC556BDE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {17372DFE-412A-4566-8488-CFD148BC3EE1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A1D075FF-BDD6-495A-9094-88D80AB0A581} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {9B625D00-77D3-4DB6-9676-A73A07EFFDE5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {FB4CAD23-EE37-4549-AA03-55FFF91554DD} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {74BF5CE2-6FE0-4637-BBD2-BF1F56664D46} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D8858F41-2AA0-4F06-A758-1585D7DB60D3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {1634A217-C9E9-401F-9E47-534042801DBE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B6A7CAD6-8FAB-4EE9-A6BB-282134BC4925} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {9C2D23EE-5364-4AE9-9D7B-40F4BF5AEE95} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8EEB7C5A-76E2-402E-A874-751ECC556BDE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {17372DFE-412A-4566-8488-CFD148BC3EE1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A1D075FF-BDD6-495A-9094-88D80AB0A581} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {9B625D00-77D3-4DB6-9676-A73A07EFFDE5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {7223059A-BE36-440F-A2FE-E9155876C4C3} diff --git a/sdk/src/Services/ChimeSDKVoice/Generated/AmazonChimeSDKVoiceConfig.cs b/sdk/src/Services/ChimeSDKVoice/Generated/AmazonChimeSDKVoiceConfig.cs index 540c42e9ed2c..a901c1c2946f 100644 --- a/sdk/src/Services/ChimeSDKVoice/Generated/AmazonChimeSDKVoiceConfig.cs +++ b/sdk/src/Services/ChimeSDKVoice/Generated/AmazonChimeSDKVoiceConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.ChimeSDKVoice public partial class AmazonChimeSDKVoiceConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("Chime SDK Voice", "4.0.0.0"); private static readonly AmazonChimeSDKVoiceEndpointResolver EndpointResolver = new AmazonChimeSDKVoiceEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("Chime SDK Voice", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("Chime SDK Voice", "3.7.400.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/ChimeSDKVoice/Properties/AssemblyInfo.cs b/sdk/src/Services/ChimeSDKVoice/Properties/AssemblyInfo.cs index 410a305b4c0f..6779745a35bf 100644 --- a/sdk/src/Services/ChimeSDKVoice/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/ChimeSDKVoice/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/CleanRooms/CleanRooms.sln b/sdk/src/Services/CleanRooms/CleanRooms.sln index 38c9697a32a3..394908b82bb3 100644 --- a/sdk/src/Services/CleanRooms/CleanRooms.sln +++ b/sdk/src/Services/CleanRooms/CleanRooms.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {C7D4C237-DB78-44E5-B7CE-97A69F924FEC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {C7D4C237-DB78-44E5-B7CE-97A69F924FEC}.Debug|Any CPU.Build.0 = Debug|Any CPU {C7D4C237-DB78-44E5-B7CE-97A69F924FEC}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {BE243F4E-6992-42D5-9355-CF1C765777BF}.Debug|Any CPU.Build.0 = Debug|Any CPU {BE243F4E-6992-42D5-9355-CF1C765777BF}.Release|Any CPU.ActiveCfg = Release|Any CPU {BE243F4E-6992-42D5-9355-CF1C765777BF}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {07D03D41-420D-4C04-8FE6-32F04167F4A4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {07D03D41-420D-4C04-8FE6-32F04167F4A4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {07D03D41-420D-4C04-8FE6-32F04167F4A4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {07D03D41-420D-4C04-8FE6-32F04167F4A4}.Release|Any CPU.Build.0 = Release|Any CPU - {054F1AC3-C54F-4A8D-BB96-C909D2078059}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {054F1AC3-C54F-4A8D-BB96-C909D2078059}.Debug|Any CPU.Build.0 = Debug|Any CPU - {054F1AC3-C54F-4A8D-BB96-C909D2078059}.Release|Any CPU.ActiveCfg = Release|Any CPU - {054F1AC3-C54F-4A8D-BB96-C909D2078059}.Release|Any CPU.Build.0 = Release|Any CPU - {DDD327F7-152F-46DA-A96C-6E68B2B31551}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DDD327F7-152F-46DA-A96C-6E68B2B31551}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DDD327F7-152F-46DA-A96C-6E68B2B31551}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DDD327F7-152F-46DA-A96C-6E68B2B31551}.Release|Any CPU.Build.0 = Release|Any CPU - {CE24F3CC-8214-4463-8821-B8438B1F3E97}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CE24F3CC-8214-4463-8821-B8438B1F3E97}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CE24F3CC-8214-4463-8821-B8438B1F3E97}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CE24F3CC-8214-4463-8821-B8438B1F3E97}.Release|Any CPU.Build.0 = Release|Any CPU - {FF504E6D-3A33-4E81-913B-6498156BC425}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FF504E6D-3A33-4E81-913B-6498156BC425}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FF504E6D-3A33-4E81-913B-6498156BC425}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FF504E6D-3A33-4E81-913B-6498156BC425}.Release|Any CPU.Build.0 = Release|Any CPU - {6456F865-61AA-4166-BA3F-33FFC981360E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6456F865-61AA-4166-BA3F-33FFC981360E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6456F865-61AA-4166-BA3F-33FFC981360E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6456F865-61AA-4166-BA3F-33FFC981360E}.Release|Any CPU.Build.0 = Release|Any CPU - {82BE9CF9-579C-4822-B3DE-9B25B17C4309}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {82BE9CF9-579C-4822-B3DE-9B25B17C4309}.Debug|Any CPU.Build.0 = Debug|Any CPU - {82BE9CF9-579C-4822-B3DE-9B25B17C4309}.Release|Any CPU.ActiveCfg = Release|Any CPU - {82BE9CF9-579C-4822-B3DE-9B25B17C4309}.Release|Any CPU.Build.0 = Release|Any CPU - {7D3E80F0-3BFF-4D3B-9A95-5B35340F45FA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7D3E80F0-3BFF-4D3B-9A95-5B35340F45FA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7D3E80F0-3BFF-4D3B-9A95-5B35340F45FA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7D3E80F0-3BFF-4D3B-9A95-5B35340F45FA}.Release|Any CPU.Build.0 = Release|Any CPU - {4A908593-FC76-42AB-8B64-5CD7527F220D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4A908593-FC76-42AB-8B64-5CD7527F220D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4A908593-FC76-42AB-8B64-5CD7527F220D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4A908593-FC76-42AB-8B64-5CD7527F220D}.Release|Any CPU.Build.0 = Release|Any CPU - {9B732994-CD2C-460D-BFCB-835BD0994A41}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9B732994-CD2C-460D-BFCB-835BD0994A41}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9B732994-CD2C-460D-BFCB-835BD0994A41}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9B732994-CD2C-460D-BFCB-835BD0994A41}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {07D03D41-420D-4C04-8FE6-32F04167F4A4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {07D03D41-420D-4C04-8FE6-32F04167F4A4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {07D03D41-420D-4C04-8FE6-32F04167F4A4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {07D03D41-420D-4C04-8FE6-32F04167F4A4}.Release|Any CPU.Build.0 = Release|Any CPU - {054F1AC3-C54F-4A8D-BB96-C909D2078059}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {054F1AC3-C54F-4A8D-BB96-C909D2078059}.Debug|Any CPU.Build.0 = Debug|Any CPU - {054F1AC3-C54F-4A8D-BB96-C909D2078059}.Release|Any CPU.ActiveCfg = Release|Any CPU - {054F1AC3-C54F-4A8D-BB96-C909D2078059}.Release|Any CPU.Build.0 = Release|Any CPU - {DDD327F7-152F-46DA-A96C-6E68B2B31551}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DDD327F7-152F-46DA-A96C-6E68B2B31551}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DDD327F7-152F-46DA-A96C-6E68B2B31551}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DDD327F7-152F-46DA-A96C-6E68B2B31551}.Release|Any CPU.Build.0 = Release|Any CPU - {CE24F3CC-8214-4463-8821-B8438B1F3E97}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CE24F3CC-8214-4463-8821-B8438B1F3E97}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CE24F3CC-8214-4463-8821-B8438B1F3E97}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CE24F3CC-8214-4463-8821-B8438B1F3E97}.Release|Any CPU.Build.0 = Release|Any CPU - {FF504E6D-3A33-4E81-913B-6498156BC425}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FF504E6D-3A33-4E81-913B-6498156BC425}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FF504E6D-3A33-4E81-913B-6498156BC425}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FF504E6D-3A33-4E81-913B-6498156BC425}.Release|Any CPU.Build.0 = Release|Any CPU - {6456F865-61AA-4166-BA3F-33FFC981360E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6456F865-61AA-4166-BA3F-33FFC981360E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6456F865-61AA-4166-BA3F-33FFC981360E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6456F865-61AA-4166-BA3F-33FFC981360E}.Release|Any CPU.Build.0 = Release|Any CPU - {82BE9CF9-579C-4822-B3DE-9B25B17C4309}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {82BE9CF9-579C-4822-B3DE-9B25B17C4309}.Debug|Any CPU.Build.0 = Debug|Any CPU - {82BE9CF9-579C-4822-B3DE-9B25B17C4309}.Release|Any CPU.ActiveCfg = Release|Any CPU - {82BE9CF9-579C-4822-B3DE-9B25B17C4309}.Release|Any CPU.Build.0 = Release|Any CPU - {7D3E80F0-3BFF-4D3B-9A95-5B35340F45FA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7D3E80F0-3BFF-4D3B-9A95-5B35340F45FA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7D3E80F0-3BFF-4D3B-9A95-5B35340F45FA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7D3E80F0-3BFF-4D3B-9A95-5B35340F45FA}.Release|Any CPU.Build.0 = Release|Any CPU - {4A908593-FC76-42AB-8B64-5CD7527F220D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4A908593-FC76-42AB-8B64-5CD7527F220D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4A908593-FC76-42AB-8B64-5CD7527F220D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4A908593-FC76-42AB-8B64-5CD7527F220D}.Release|Any CPU.Build.0 = Release|Any CPU - {9B732994-CD2C-460D-BFCB-835BD0994A41}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9B732994-CD2C-460D-BFCB-835BD0994A41}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9B732994-CD2C-460D-BFCB-835BD0994A41}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9B732994-CD2C-460D-BFCB-835BD0994A41}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {C7D4C237-DB78-44E5-B7CE-97A69F924FEC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {C073C120-AECF-4594-AC0C-E76853B94883} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {9723C2D4-F9AD-4F91-8E6E-10258BC07A0C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {0A31705C-1765-479E-AE5E-AFE7B4BAF9BC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {BE243F4E-6992-42D5-9355-CF1C765777BF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {07D03D41-420D-4C04-8FE6-32F04167F4A4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {054F1AC3-C54F-4A8D-BB96-C909D2078059} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {DDD327F7-152F-46DA-A96C-6E68B2B31551} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {CE24F3CC-8214-4463-8821-B8438B1F3E97} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {FF504E6D-3A33-4E81-913B-6498156BC425} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6456F865-61AA-4166-BA3F-33FFC981360E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {82BE9CF9-579C-4822-B3DE-9B25B17C4309} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {7D3E80F0-3BFF-4D3B-9A95-5B35340F45FA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4A908593-FC76-42AB-8B64-5CD7527F220D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {9B732994-CD2C-460D-BFCB-835BD0994A41} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {07D03D41-420D-4C04-8FE6-32F04167F4A4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {054F1AC3-C54F-4A8D-BB96-C909D2078059} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {DDD327F7-152F-46DA-A96C-6E68B2B31551} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {CE24F3CC-8214-4463-8821-B8438B1F3E97} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {FF504E6D-3A33-4E81-913B-6498156BC425} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6456F865-61AA-4166-BA3F-33FFC981360E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {82BE9CF9-579C-4822-B3DE-9B25B17C4309} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {7D3E80F0-3BFF-4D3B-9A95-5B35340F45FA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4A908593-FC76-42AB-8B64-5CD7527F220D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {9B732994-CD2C-460D-BFCB-835BD0994A41} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {69A8598E-0720-4032-8C6A-C69B12E3C536} diff --git a/sdk/src/Services/CleanRooms/Generated/AmazonCleanRoomsConfig.cs b/sdk/src/Services/CleanRooms/Generated/AmazonCleanRoomsConfig.cs index c3847d7b01f7..70fc0bf88bec 100644 --- a/sdk/src/Services/CleanRooms/Generated/AmazonCleanRoomsConfig.cs +++ b/sdk/src/Services/CleanRooms/Generated/AmazonCleanRoomsConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.CleanRooms public partial class AmazonCleanRoomsConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("CleanRooms", "4.0.0.0"); private static readonly AmazonCleanRoomsEndpointResolver EndpointResolver = new AmazonCleanRoomsEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("CleanRooms", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("CleanRooms", "3.7.402.7"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/CleanRooms/Generated/Model/BilledResourceUtilization.cs b/sdk/src/Services/CleanRooms/Generated/Model/BilledResourceUtilization.cs index 7681ec228ca4..ee8d0bc31dc4 100644 --- a/sdk/src/Services/CleanRooms/Generated/Model/BilledResourceUtilization.cs +++ b/sdk/src/Services/CleanRooms/Generated/Model/BilledResourceUtilization.cs @@ -44,9 +44,9 @@ public partial class BilledResourceUtilization /// /// [AWSProperty(Required=true)] - public double Units + public double? Units { - get { return this._units.GetValueOrDefault(); } + get { return this._units; } set { this._units = value; } } diff --git a/sdk/src/Services/CleanRooms/Generated/Model/Internal/MarshallTransformations/BilledResourceUtilizationUnmarshaller.cs b/sdk/src/Services/CleanRooms/Generated/Model/Internal/MarshallTransformations/BilledResourceUtilizationUnmarshaller.cs index 1cb371f65d1d..69df87f4c8a0 100644 --- a/sdk/src/Services/CleanRooms/Generated/Model/Internal/MarshallTransformations/BilledResourceUtilizationUnmarshaller.cs +++ b/sdk/src/Services/CleanRooms/Generated/Model/Internal/MarshallTransformations/BilledResourceUtilizationUnmarshaller.cs @@ -68,7 +68,7 @@ public BilledResourceUtilization Unmarshall(JsonUnmarshallerContext context) { if (context.TestExpression("units", targetDepth)) { - var unmarshaller = DoubleUnmarshaller.Instance; + var unmarshaller = NullableDoubleUnmarshaller.Instance; unmarshalledObject.Units = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/CleanRooms/Generated/Model/Internal/MarshallTransformations/CreateCollaborationRequestMarshaller.cs b/sdk/src/Services/CleanRooms/Generated/Model/Internal/MarshallTransformations/CreateCollaborationRequestMarshaller.cs index 8f1651aec4bb..a0fb86a1777c 100644 --- a/sdk/src/Services/CleanRooms/Generated/Model/Internal/MarshallTransformations/CreateCollaborationRequestMarshaller.cs +++ b/sdk/src/Services/CleanRooms/Generated/Model/Internal/MarshallTransformations/CreateCollaborationRequestMarshaller.cs @@ -63,72 +63,23 @@ public IRequest Marshall(CreateCollaborationRequest publicRequest) request.ResourcePath = "/collaborations"; using (MemoryStream memoryStream = new MemoryStream()) { -<<<<<<< HEAD using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) -||||||| Commit version number update changes - JsonWriter writer = new JsonWriter(stringWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetCreatorDisplayName()) -======= - JsonWriter writer = new JsonWriter(stringWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetAnalyticsEngine()) - { - context.Writer.WritePropertyName("analyticsEngine"); - context.Writer.Write(publicRequest.AnalyticsEngine); - } - - if(publicRequest.IsSetCreatorDisplayName()) ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b { JsonWriter writer = new JsonWriter(streamWriter); writer.Validate = false; writer.WriteObjectStart(); var context = new JsonMarshallerContext(request, writer); + if(publicRequest.IsSetAnalyticsEngine()) + { + context.Writer.WritePropertyName("analyticsEngine"); + context.Writer.Write(publicRequest.AnalyticsEngine); + } + if(publicRequest.IsSetCreatorDisplayName()) { context.Writer.WritePropertyName("creatorDisplayName"); context.Writer.Write(publicRequest.CreatorDisplayName); } -<<<<<<< HEAD -||||||| Commit version number update changes - context.Writer.WriteArrayEnd(); - } - - if(publicRequest.IsSetCreatorPaymentConfiguration()) - { - context.Writer.WritePropertyName("creatorPaymentConfiguration"); - context.Writer.WriteObjectStart(); - - var marshaller = PaymentConfigurationMarshaller.Instance; - marshaller.Marshall(publicRequest.CreatorPaymentConfiguration, context); -======= - context.Writer.WriteArrayEnd(); - } - - if(publicRequest.IsSetCreatorMLMemberAbilities()) - { - context.Writer.WritePropertyName("creatorMLMemberAbilities"); - context.Writer.WriteObjectStart(); - - var marshaller = MLMemberAbilitiesMarshaller.Instance; - marshaller.Marshall(publicRequest.CreatorMLMemberAbilities, context); - - context.Writer.WriteObjectEnd(); - } - - if(publicRequest.IsSetCreatorPaymentConfiguration()) - { - context.Writer.WritePropertyName("creatorPaymentConfiguration"); - context.Writer.WriteObjectStart(); - - var marshaller = PaymentConfigurationMarshaller.Instance; - marshaller.Marshall(publicRequest.CreatorPaymentConfiguration, context); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b if(publicRequest.IsSetCreatorMemberAbilities()) { @@ -141,6 +92,17 @@ public IRequest Marshall(CreateCollaborationRequest publicRequest) context.Writer.WriteArrayEnd(); } + if(publicRequest.IsSetCreatorMLMemberAbilities()) + { + context.Writer.WritePropertyName("creatorMLMemberAbilities"); + context.Writer.WriteObjectStart(); + + var marshaller = MLMemberAbilitiesMarshaller.Instance; + marshaller.Marshall(publicRequest.CreatorMLMemberAbilities, context); + + context.Writer.WriteObjectEnd(); + } + if(publicRequest.IsSetCreatorPaymentConfiguration()) { context.Writer.WritePropertyName("creatorPaymentConfiguration"); diff --git a/sdk/src/Services/CleanRooms/Generated/Model/Internal/MarshallTransformations/MembershipModelInferencePaymentConfigMarshaller.cs b/sdk/src/Services/CleanRooms/Generated/Model/Internal/MarshallTransformations/MembershipModelInferencePaymentConfigMarshaller.cs index 59fbb30761d7..be025f881081 100644 --- a/sdk/src/Services/CleanRooms/Generated/Model/Internal/MarshallTransformations/MembershipModelInferencePaymentConfigMarshaller.cs +++ b/sdk/src/Services/CleanRooms/Generated/Model/Internal/MarshallTransformations/MembershipModelInferencePaymentConfigMarshaller.cs @@ -51,7 +51,7 @@ public void Marshall(MembershipModelInferencePaymentConfig requestObject, JsonMa if(requestObject.IsSetIsResponsible()) { context.Writer.WritePropertyName("isResponsible"); - context.Writer.Write(requestObject.IsResponsible); + context.Writer.Write(requestObject.IsResponsible.Value); } } diff --git a/sdk/src/Services/CleanRooms/Generated/Model/Internal/MarshallTransformations/MembershipModelInferencePaymentConfigUnmarshaller.cs b/sdk/src/Services/CleanRooms/Generated/Model/Internal/MarshallTransformations/MembershipModelInferencePaymentConfigUnmarshaller.cs index 593e0f64a54c..7effe6cf6417 100644 --- a/sdk/src/Services/CleanRooms/Generated/Model/Internal/MarshallTransformations/MembershipModelInferencePaymentConfigUnmarshaller.cs +++ b/sdk/src/Services/CleanRooms/Generated/Model/Internal/MarshallTransformations/MembershipModelInferencePaymentConfigUnmarshaller.cs @@ -68,7 +68,7 @@ public MembershipModelInferencePaymentConfig Unmarshall(JsonUnmarshallerContext { if (context.TestExpression("isResponsible", targetDepth)) { - var unmarshaller = BoolUnmarshaller.Instance; + var unmarshaller = NullableBoolUnmarshaller.Instance; unmarshalledObject.IsResponsible = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/CleanRooms/Generated/Model/Internal/MarshallTransformations/MembershipModelTrainingPaymentConfigMarshaller.cs b/sdk/src/Services/CleanRooms/Generated/Model/Internal/MarshallTransformations/MembershipModelTrainingPaymentConfigMarshaller.cs index 901c17db367a..55d5e0a93191 100644 --- a/sdk/src/Services/CleanRooms/Generated/Model/Internal/MarshallTransformations/MembershipModelTrainingPaymentConfigMarshaller.cs +++ b/sdk/src/Services/CleanRooms/Generated/Model/Internal/MarshallTransformations/MembershipModelTrainingPaymentConfigMarshaller.cs @@ -51,7 +51,7 @@ public void Marshall(MembershipModelTrainingPaymentConfig requestObject, JsonMar if(requestObject.IsSetIsResponsible()) { context.Writer.WritePropertyName("isResponsible"); - context.Writer.Write(requestObject.IsResponsible); + context.Writer.Write(requestObject.IsResponsible.Value); } } diff --git a/sdk/src/Services/CleanRooms/Generated/Model/Internal/MarshallTransformations/MembershipModelTrainingPaymentConfigUnmarshaller.cs b/sdk/src/Services/CleanRooms/Generated/Model/Internal/MarshallTransformations/MembershipModelTrainingPaymentConfigUnmarshaller.cs index d7073942aa32..fea6fac9535b 100644 --- a/sdk/src/Services/CleanRooms/Generated/Model/Internal/MarshallTransformations/MembershipModelTrainingPaymentConfigUnmarshaller.cs +++ b/sdk/src/Services/CleanRooms/Generated/Model/Internal/MarshallTransformations/MembershipModelTrainingPaymentConfigUnmarshaller.cs @@ -68,7 +68,7 @@ public MembershipModelTrainingPaymentConfig Unmarshall(JsonUnmarshallerContext c { if (context.TestExpression("isResponsible", targetDepth)) { - var unmarshaller = BoolUnmarshaller.Instance; + var unmarshaller = NullableBoolUnmarshaller.Instance; unmarshalledObject.IsResponsible = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/CleanRooms/Generated/Model/Internal/MarshallTransformations/ModelInferencePaymentConfigMarshaller.cs b/sdk/src/Services/CleanRooms/Generated/Model/Internal/MarshallTransformations/ModelInferencePaymentConfigMarshaller.cs index 14749bc26e98..9cf8467d2c2d 100644 --- a/sdk/src/Services/CleanRooms/Generated/Model/Internal/MarshallTransformations/ModelInferencePaymentConfigMarshaller.cs +++ b/sdk/src/Services/CleanRooms/Generated/Model/Internal/MarshallTransformations/ModelInferencePaymentConfigMarshaller.cs @@ -51,7 +51,7 @@ public void Marshall(ModelInferencePaymentConfig requestObject, JsonMarshallerCo if(requestObject.IsSetIsResponsible()) { context.Writer.WritePropertyName("isResponsible"); - context.Writer.Write(requestObject.IsResponsible); + context.Writer.Write(requestObject.IsResponsible.Value); } } diff --git a/sdk/src/Services/CleanRooms/Generated/Model/Internal/MarshallTransformations/ModelInferencePaymentConfigUnmarshaller.cs b/sdk/src/Services/CleanRooms/Generated/Model/Internal/MarshallTransformations/ModelInferencePaymentConfigUnmarshaller.cs index 01611bba8dfa..84ad6c1a3402 100644 --- a/sdk/src/Services/CleanRooms/Generated/Model/Internal/MarshallTransformations/ModelInferencePaymentConfigUnmarshaller.cs +++ b/sdk/src/Services/CleanRooms/Generated/Model/Internal/MarshallTransformations/ModelInferencePaymentConfigUnmarshaller.cs @@ -68,7 +68,7 @@ public ModelInferencePaymentConfig Unmarshall(JsonUnmarshallerContext context) { if (context.TestExpression("isResponsible", targetDepth)) { - var unmarshaller = BoolUnmarshaller.Instance; + var unmarshaller = NullableBoolUnmarshaller.Instance; unmarshalledObject.IsResponsible = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/CleanRooms/Generated/Model/Internal/MarshallTransformations/ModelTrainingPaymentConfigMarshaller.cs b/sdk/src/Services/CleanRooms/Generated/Model/Internal/MarshallTransformations/ModelTrainingPaymentConfigMarshaller.cs index 6e5032e971bd..f35776277e4f 100644 --- a/sdk/src/Services/CleanRooms/Generated/Model/Internal/MarshallTransformations/ModelTrainingPaymentConfigMarshaller.cs +++ b/sdk/src/Services/CleanRooms/Generated/Model/Internal/MarshallTransformations/ModelTrainingPaymentConfigMarshaller.cs @@ -51,7 +51,7 @@ public void Marshall(ModelTrainingPaymentConfig requestObject, JsonMarshallerCon if(requestObject.IsSetIsResponsible()) { context.Writer.WritePropertyName("isResponsible"); - context.Writer.Write(requestObject.IsResponsible); + context.Writer.Write(requestObject.IsResponsible.Value); } } diff --git a/sdk/src/Services/CleanRooms/Generated/Model/Internal/MarshallTransformations/ModelTrainingPaymentConfigUnmarshaller.cs b/sdk/src/Services/CleanRooms/Generated/Model/Internal/MarshallTransformations/ModelTrainingPaymentConfigUnmarshaller.cs index f94376835954..28b812fd35b2 100644 --- a/sdk/src/Services/CleanRooms/Generated/Model/Internal/MarshallTransformations/ModelTrainingPaymentConfigUnmarshaller.cs +++ b/sdk/src/Services/CleanRooms/Generated/Model/Internal/MarshallTransformations/ModelTrainingPaymentConfigUnmarshaller.cs @@ -68,7 +68,7 @@ public ModelTrainingPaymentConfig Unmarshall(JsonUnmarshallerContext context) { if (context.TestExpression("isResponsible", targetDepth)) { - var unmarshaller = BoolUnmarshaller.Instance; + var unmarshaller = NullableBoolUnmarshaller.Instance; unmarshalledObject.IsResponsible = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/CleanRooms/Generated/Model/Internal/MarshallTransformations/ProtectedQueryS3OutputConfigurationMarshaller.cs b/sdk/src/Services/CleanRooms/Generated/Model/Internal/MarshallTransformations/ProtectedQueryS3OutputConfigurationMarshaller.cs index 33ab02470718..34d3be38b9ee 100644 --- a/sdk/src/Services/CleanRooms/Generated/Model/Internal/MarshallTransformations/ProtectedQueryS3OutputConfigurationMarshaller.cs +++ b/sdk/src/Services/CleanRooms/Generated/Model/Internal/MarshallTransformations/ProtectedQueryS3OutputConfigurationMarshaller.cs @@ -69,7 +69,7 @@ public void Marshall(ProtectedQueryS3OutputConfiguration requestObject, JsonMars if(requestObject.IsSetSingleFileOutput()) { context.Writer.WritePropertyName("singleFileOutput"); - context.Writer.Write(requestObject.SingleFileOutput); + context.Writer.Write(requestObject.SingleFileOutput.Value); } } diff --git a/sdk/src/Services/CleanRooms/Generated/Model/Internal/MarshallTransformations/ProtectedQueryS3OutputConfigurationUnmarshaller.cs b/sdk/src/Services/CleanRooms/Generated/Model/Internal/MarshallTransformations/ProtectedQueryS3OutputConfigurationUnmarshaller.cs index 5bc6cc2789a6..30650951c399 100644 --- a/sdk/src/Services/CleanRooms/Generated/Model/Internal/MarshallTransformations/ProtectedQueryS3OutputConfigurationUnmarshaller.cs +++ b/sdk/src/Services/CleanRooms/Generated/Model/Internal/MarshallTransformations/ProtectedQueryS3OutputConfigurationUnmarshaller.cs @@ -86,7 +86,7 @@ public ProtectedQueryS3OutputConfiguration Unmarshall(JsonUnmarshallerContext co } if (context.TestExpression("singleFileOutput", targetDepth)) { - var unmarshaller = BoolUnmarshaller.Instance; + var unmarshaller = NullableBoolUnmarshaller.Instance; unmarshalledObject.SingleFileOutput = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/CleanRooms/Generated/Model/Internal/MarshallTransformations/StartProtectedQueryRequestMarshaller.cs b/sdk/src/Services/CleanRooms/Generated/Model/Internal/MarshallTransformations/StartProtectedQueryRequestMarshaller.cs index dd7be36abc7a..7d8a9ec9ed88 100644 --- a/sdk/src/Services/CleanRooms/Generated/Model/Internal/MarshallTransformations/StartProtectedQueryRequestMarshaller.cs +++ b/sdk/src/Services/CleanRooms/Generated/Model/Internal/MarshallTransformations/StartProtectedQueryRequestMarshaller.cs @@ -66,37 +66,23 @@ public IRequest Marshall(StartProtectedQueryRequest publicRequest) request.ResourcePath = "/memberships/{membershipIdentifier}/protectedQueries"; using (MemoryStream memoryStream = new MemoryStream()) { -<<<<<<< HEAD using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) -||||||| Commit version number update changes - JsonWriter writer = new JsonWriter(stringWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetResultConfiguration()) -======= - JsonWriter writer = new JsonWriter(stringWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetComputeConfiguration()) - { - context.Writer.WritePropertyName("computeConfiguration"); - context.Writer.WriteObjectStart(); - - var marshaller = ComputeConfigurationMarshaller.Instance; - marshaller.Marshall(publicRequest.ComputeConfiguration, context); - - context.Writer.WriteObjectEnd(); - } - - if(publicRequest.IsSetResultConfiguration()) ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b { JsonWriter writer = new JsonWriter(streamWriter); writer.Validate = false; writer.WriteObjectStart(); var context = new JsonMarshallerContext(request, writer); + if(publicRequest.IsSetComputeConfiguration()) + { + context.Writer.WritePropertyName("computeConfiguration"); + context.Writer.WriteObjectStart(); + + var marshaller = ComputeConfigurationMarshaller.Instance; + marshaller.Marshall(publicRequest.ComputeConfiguration, context); + + context.Writer.WriteObjectEnd(); + } + if(publicRequest.IsSetResultConfiguration()) { context.Writer.WritePropertyName("resultConfiguration"); diff --git a/sdk/src/Services/CleanRooms/Generated/Model/Internal/MarshallTransformations/WorkerComputeConfigurationMarshaller.cs b/sdk/src/Services/CleanRooms/Generated/Model/Internal/MarshallTransformations/WorkerComputeConfigurationMarshaller.cs index ef12ef8fc925..8eacfdd0ef2c 100644 --- a/sdk/src/Services/CleanRooms/Generated/Model/Internal/MarshallTransformations/WorkerComputeConfigurationMarshaller.cs +++ b/sdk/src/Services/CleanRooms/Generated/Model/Internal/MarshallTransformations/WorkerComputeConfigurationMarshaller.cs @@ -51,7 +51,7 @@ public void Marshall(WorkerComputeConfiguration requestObject, JsonMarshallerCon if(requestObject.IsSetNumber()) { context.Writer.WritePropertyName("number"); - context.Writer.Write(requestObject.Number); + context.Writer.Write(requestObject.Number.Value); } if(requestObject.IsSetType()) diff --git a/sdk/src/Services/CleanRooms/Generated/Model/Internal/MarshallTransformations/WorkerComputeConfigurationUnmarshaller.cs b/sdk/src/Services/CleanRooms/Generated/Model/Internal/MarshallTransformations/WorkerComputeConfigurationUnmarshaller.cs index cde95c364bab..17fa789f3d0c 100644 --- a/sdk/src/Services/CleanRooms/Generated/Model/Internal/MarshallTransformations/WorkerComputeConfigurationUnmarshaller.cs +++ b/sdk/src/Services/CleanRooms/Generated/Model/Internal/MarshallTransformations/WorkerComputeConfigurationUnmarshaller.cs @@ -68,7 +68,7 @@ public WorkerComputeConfiguration Unmarshall(JsonUnmarshallerContext context) { if (context.TestExpression("number", targetDepth)) { - var unmarshaller = IntUnmarshaller.Instance; + var unmarshaller = NullableIntUnmarshaller.Instance; unmarshalledObject.Number = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/CleanRooms/Generated/Model/MembershipModelInferencePaymentConfig.cs b/sdk/src/Services/CleanRooms/Generated/Model/MembershipModelInferencePaymentConfig.cs index 1a4bece07e86..a8ca6cf3db7a 100644 --- a/sdk/src/Services/CleanRooms/Generated/Model/MembershipModelInferencePaymentConfig.cs +++ b/sdk/src/Services/CleanRooms/Generated/Model/MembershipModelInferencePaymentConfig.cs @@ -65,9 +65,9 @@ public partial class MembershipModelInferencePaymentConfig /// /// [AWSProperty(Required=true)] - public bool IsResponsible + public bool? IsResponsible { - get { return this._isResponsible.GetValueOrDefault(); } + get { return this._isResponsible; } set { this._isResponsible = value; } } diff --git a/sdk/src/Services/CleanRooms/Generated/Model/MembershipModelTrainingPaymentConfig.cs b/sdk/src/Services/CleanRooms/Generated/Model/MembershipModelTrainingPaymentConfig.cs index a811e9376877..4c8050e5ba19 100644 --- a/sdk/src/Services/CleanRooms/Generated/Model/MembershipModelTrainingPaymentConfig.cs +++ b/sdk/src/Services/CleanRooms/Generated/Model/MembershipModelTrainingPaymentConfig.cs @@ -65,9 +65,9 @@ public partial class MembershipModelTrainingPaymentConfig /// /// [AWSProperty(Required=true)] - public bool IsResponsible + public bool? IsResponsible { - get { return this._isResponsible.GetValueOrDefault(); } + get { return this._isResponsible; } set { this._isResponsible = value; } } diff --git a/sdk/src/Services/CleanRooms/Generated/Model/ModelInferencePaymentConfig.cs b/sdk/src/Services/CleanRooms/Generated/Model/ModelInferencePaymentConfig.cs index b0ca53ba7b38..27115a65b622 100644 --- a/sdk/src/Services/CleanRooms/Generated/Model/ModelInferencePaymentConfig.cs +++ b/sdk/src/Services/CleanRooms/Generated/Model/ModelInferencePaymentConfig.cs @@ -58,9 +58,9 @@ public partial class ModelInferencePaymentConfig /// /// [AWSProperty(Required=true)] - public bool IsResponsible + public bool? IsResponsible { - get { return this._isResponsible.GetValueOrDefault(); } + get { return this._isResponsible; } set { this._isResponsible = value; } } diff --git a/sdk/src/Services/CleanRooms/Generated/Model/ModelTrainingPaymentConfig.cs b/sdk/src/Services/CleanRooms/Generated/Model/ModelTrainingPaymentConfig.cs index 03970cb39290..c4ba500ab533 100644 --- a/sdk/src/Services/CleanRooms/Generated/Model/ModelTrainingPaymentConfig.cs +++ b/sdk/src/Services/CleanRooms/Generated/Model/ModelTrainingPaymentConfig.cs @@ -58,9 +58,9 @@ public partial class ModelTrainingPaymentConfig /// /// [AWSProperty(Required=true)] - public bool IsResponsible + public bool? IsResponsible { - get { return this._isResponsible.GetValueOrDefault(); } + get { return this._isResponsible; } set { this._isResponsible = value; } } diff --git a/sdk/src/Services/CleanRooms/Generated/Model/ProtectedQueryS3OutputConfiguration.cs b/sdk/src/Services/CleanRooms/Generated/Model/ProtectedQueryS3OutputConfiguration.cs index 595637dcacb4..1538bee914b6 100644 --- a/sdk/src/Services/CleanRooms/Generated/Model/ProtectedQueryS3OutputConfiguration.cs +++ b/sdk/src/Services/CleanRooms/Generated/Model/ProtectedQueryS3OutputConfiguration.cs @@ -104,9 +104,9 @@ internal bool IsSetResultFormat() /// the Spark analytics engine. /// /// - public bool SingleFileOutput + public bool? SingleFileOutput { - get { return this._singleFileOutput.GetValueOrDefault(); } + get { return this._singleFileOutput; } set { this._singleFileOutput = value; } } diff --git a/sdk/src/Services/CleanRooms/Generated/Model/WorkerComputeConfiguration.cs b/sdk/src/Services/CleanRooms/Generated/Model/WorkerComputeConfiguration.cs index d31c19924008..559e3fadb9ba 100644 --- a/sdk/src/Services/CleanRooms/Generated/Model/WorkerComputeConfiguration.cs +++ b/sdk/src/Services/CleanRooms/Generated/Model/WorkerComputeConfiguration.cs @@ -45,9 +45,9 @@ public partial class WorkerComputeConfiguration /// /// [AWSProperty(Min=2, Max=400)] - public int Number + public int? Number { - get { return this._number.GetValueOrDefault(); } + get { return this._number; } set { this._number = value; } } diff --git a/sdk/src/Services/CleanRooms/Generated/_bcl/AmazonCleanRoomsClient.cs b/sdk/src/Services/CleanRooms/Generated/_bcl/AmazonCleanRoomsClient.cs index 5d51ca8d0d3f..403abb7f8260 100644 --- a/sdk/src/Services/CleanRooms/Generated/_bcl/AmazonCleanRoomsClient.cs +++ b/sdk/src/Services/CleanRooms/Generated/_bcl/AmazonCleanRoomsClient.cs @@ -4889,6 +4889,9 @@ public virtual ListTagsForResourceResponse ListTagsForResource(ListTagsForResour /// /// Request references a resource which does not exist. /// + /// + /// Request denied because service quota has been exceeded. + /// /// /// Request was denied due to request throttling. /// @@ -4927,6 +4930,9 @@ public virtual PopulateIdMappingTableResponse PopulateIdMappingTable(PopulateIdM /// /// Request references a resource which does not exist. /// + /// + /// Request denied because service quota has been exceeded. + /// /// /// Request was denied due to request throttling. /// diff --git a/sdk/src/Services/CleanRooms/Properties/AssemblyInfo.cs b/sdk/src/Services/CleanRooms/Properties/AssemblyInfo.cs index 050bb841f579..6c9182f03812 100644 --- a/sdk/src/Services/CleanRooms/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/CleanRooms/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.402.7")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/CleanRoomsML/CleanRoomsML.sln b/sdk/src/Services/CleanRoomsML/CleanRoomsML.sln index 2ba57fd8ecfc..cdfe1c8a7aae 100644 --- a/sdk/src/Services/CleanRoomsML/CleanRoomsML.sln +++ b/sdk/src/Services/CleanRoomsML/CleanRoomsML.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {C6677AAF-E4F2-4811-A13A-67C741FE037B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {C6677AAF-E4F2-4811-A13A-67C741FE037B}.Debug|Any CPU.Build.0 = Debug|Any CPU {C6677AAF-E4F2-4811-A13A-67C741FE037B}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {0300A90F-C10E-436F-82A2-8A933D202857}.Debug|Any CPU.Build.0 = Debug|Any CPU {0300A90F-C10E-436F-82A2-8A933D202857}.Release|Any CPU.ActiveCfg = Release|Any CPU {0300A90F-C10E-436F-82A2-8A933D202857}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {E41B1E47-14B3-40F2-B99B-0F14A1F45341}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E41B1E47-14B3-40F2-B99B-0F14A1F45341}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E41B1E47-14B3-40F2-B99B-0F14A1F45341}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E41B1E47-14B3-40F2-B99B-0F14A1F45341}.Release|Any CPU.Build.0 = Release|Any CPU - {4A936A41-3816-4B0F-B9E0-D80854CEF7CE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4A936A41-3816-4B0F-B9E0-D80854CEF7CE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4A936A41-3816-4B0F-B9E0-D80854CEF7CE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4A936A41-3816-4B0F-B9E0-D80854CEF7CE}.Release|Any CPU.Build.0 = Release|Any CPU - {243D4392-836D-4F36-902B-017223DB4EF9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {243D4392-836D-4F36-902B-017223DB4EF9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {243D4392-836D-4F36-902B-017223DB4EF9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {243D4392-836D-4F36-902B-017223DB4EF9}.Release|Any CPU.Build.0 = Release|Any CPU - {84BD4666-CAE8-415A-92AF-F12C808C78E9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {84BD4666-CAE8-415A-92AF-F12C808C78E9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {84BD4666-CAE8-415A-92AF-F12C808C78E9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {84BD4666-CAE8-415A-92AF-F12C808C78E9}.Release|Any CPU.Build.0 = Release|Any CPU - {03AD9F79-0534-414D-B52C-963AA72254DA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {03AD9F79-0534-414D-B52C-963AA72254DA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {03AD9F79-0534-414D-B52C-963AA72254DA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {03AD9F79-0534-414D-B52C-963AA72254DA}.Release|Any CPU.Build.0 = Release|Any CPU - {6F029577-81EF-485A-A2DC-DE394D64E74F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6F029577-81EF-485A-A2DC-DE394D64E74F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6F029577-81EF-485A-A2DC-DE394D64E74F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6F029577-81EF-485A-A2DC-DE394D64E74F}.Release|Any CPU.Build.0 = Release|Any CPU - {55C98915-8D24-4BC5-B3CC-6B795C0AF422}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {55C98915-8D24-4BC5-B3CC-6B795C0AF422}.Debug|Any CPU.Build.0 = Debug|Any CPU - {55C98915-8D24-4BC5-B3CC-6B795C0AF422}.Release|Any CPU.ActiveCfg = Release|Any CPU - {55C98915-8D24-4BC5-B3CC-6B795C0AF422}.Release|Any CPU.Build.0 = Release|Any CPU - {102860C5-99B5-4A56-80F5-00DC1D4CA2C1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {102860C5-99B5-4A56-80F5-00DC1D4CA2C1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {102860C5-99B5-4A56-80F5-00DC1D4CA2C1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {102860C5-99B5-4A56-80F5-00DC1D4CA2C1}.Release|Any CPU.Build.0 = Release|Any CPU - {ACFD5578-0B2B-4928-A6BA-07FC5A69E679}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {ACFD5578-0B2B-4928-A6BA-07FC5A69E679}.Debug|Any CPU.Build.0 = Debug|Any CPU - {ACFD5578-0B2B-4928-A6BA-07FC5A69E679}.Release|Any CPU.ActiveCfg = Release|Any CPU - {ACFD5578-0B2B-4928-A6BA-07FC5A69E679}.Release|Any CPU.Build.0 = Release|Any CPU - {677FF84D-F1B7-4344-B7B1-7B8A9F3C7AB0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {677FF84D-F1B7-4344-B7B1-7B8A9F3C7AB0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {677FF84D-F1B7-4344-B7B1-7B8A9F3C7AB0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {677FF84D-F1B7-4344-B7B1-7B8A9F3C7AB0}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {E41B1E47-14B3-40F2-B99B-0F14A1F45341}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E41B1E47-14B3-40F2-B99B-0F14A1F45341}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E41B1E47-14B3-40F2-B99B-0F14A1F45341}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E41B1E47-14B3-40F2-B99B-0F14A1F45341}.Release|Any CPU.Build.0 = Release|Any CPU - {4A936A41-3816-4B0F-B9E0-D80854CEF7CE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4A936A41-3816-4B0F-B9E0-D80854CEF7CE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4A936A41-3816-4B0F-B9E0-D80854CEF7CE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4A936A41-3816-4B0F-B9E0-D80854CEF7CE}.Release|Any CPU.Build.0 = Release|Any CPU - {243D4392-836D-4F36-902B-017223DB4EF9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {243D4392-836D-4F36-902B-017223DB4EF9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {243D4392-836D-4F36-902B-017223DB4EF9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {243D4392-836D-4F36-902B-017223DB4EF9}.Release|Any CPU.Build.0 = Release|Any CPU - {84BD4666-CAE8-415A-92AF-F12C808C78E9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {84BD4666-CAE8-415A-92AF-F12C808C78E9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {84BD4666-CAE8-415A-92AF-F12C808C78E9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {84BD4666-CAE8-415A-92AF-F12C808C78E9}.Release|Any CPU.Build.0 = Release|Any CPU - {03AD9F79-0534-414D-B52C-963AA72254DA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {03AD9F79-0534-414D-B52C-963AA72254DA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {03AD9F79-0534-414D-B52C-963AA72254DA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {03AD9F79-0534-414D-B52C-963AA72254DA}.Release|Any CPU.Build.0 = Release|Any CPU - {6F029577-81EF-485A-A2DC-DE394D64E74F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6F029577-81EF-485A-A2DC-DE394D64E74F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6F029577-81EF-485A-A2DC-DE394D64E74F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6F029577-81EF-485A-A2DC-DE394D64E74F}.Release|Any CPU.Build.0 = Release|Any CPU - {55C98915-8D24-4BC5-B3CC-6B795C0AF422}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {55C98915-8D24-4BC5-B3CC-6B795C0AF422}.Debug|Any CPU.Build.0 = Debug|Any CPU - {55C98915-8D24-4BC5-B3CC-6B795C0AF422}.Release|Any CPU.ActiveCfg = Release|Any CPU - {55C98915-8D24-4BC5-B3CC-6B795C0AF422}.Release|Any CPU.Build.0 = Release|Any CPU - {102860C5-99B5-4A56-80F5-00DC1D4CA2C1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {102860C5-99B5-4A56-80F5-00DC1D4CA2C1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {102860C5-99B5-4A56-80F5-00DC1D4CA2C1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {102860C5-99B5-4A56-80F5-00DC1D4CA2C1}.Release|Any CPU.Build.0 = Release|Any CPU - {ACFD5578-0B2B-4928-A6BA-07FC5A69E679}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {ACFD5578-0B2B-4928-A6BA-07FC5A69E679}.Debug|Any CPU.Build.0 = Debug|Any CPU - {ACFD5578-0B2B-4928-A6BA-07FC5A69E679}.Release|Any CPU.ActiveCfg = Release|Any CPU - {ACFD5578-0B2B-4928-A6BA-07FC5A69E679}.Release|Any CPU.Build.0 = Release|Any CPU - {677FF84D-F1B7-4344-B7B1-7B8A9F3C7AB0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {677FF84D-F1B7-4344-B7B1-7B8A9F3C7AB0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {677FF84D-F1B7-4344-B7B1-7B8A9F3C7AB0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {677FF84D-F1B7-4344-B7B1-7B8A9F3C7AB0}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {C6677AAF-E4F2-4811-A13A-67C741FE037B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {C6B317F9-CEBA-4A81-831F-44689A78679A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {E03A5AE6-E1A5-48D0-A4B1-904350EAAC5C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {1B61AB46-DDFD-4302-BD58-92B2DE5DDB51} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {0300A90F-C10E-436F-82A2-8A933D202857} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {E41B1E47-14B3-40F2-B99B-0F14A1F45341} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4A936A41-3816-4B0F-B9E0-D80854CEF7CE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {243D4392-836D-4F36-902B-017223DB4EF9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {84BD4666-CAE8-415A-92AF-F12C808C78E9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {03AD9F79-0534-414D-B52C-963AA72254DA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6F029577-81EF-485A-A2DC-DE394D64E74F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {55C98915-8D24-4BC5-B3CC-6B795C0AF422} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {102860C5-99B5-4A56-80F5-00DC1D4CA2C1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {ACFD5578-0B2B-4928-A6BA-07FC5A69E679} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {677FF84D-F1B7-4344-B7B1-7B8A9F3C7AB0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {E41B1E47-14B3-40F2-B99B-0F14A1F45341} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4A936A41-3816-4B0F-B9E0-D80854CEF7CE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {243D4392-836D-4F36-902B-017223DB4EF9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {84BD4666-CAE8-415A-92AF-F12C808C78E9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {03AD9F79-0534-414D-B52C-963AA72254DA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6F029577-81EF-485A-A2DC-DE394D64E74F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {55C98915-8D24-4BC5-B3CC-6B795C0AF422} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {102860C5-99B5-4A56-80F5-00DC1D4CA2C1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {ACFD5578-0B2B-4928-A6BA-07FC5A69E679} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {677FF84D-F1B7-4344-B7B1-7B8A9F3C7AB0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {EE586E48-6CB7-4CF1-9804-C68DAF749C7A} diff --git a/sdk/src/Services/CleanRoomsML/Generated/AmazonCleanRoomsMLConfig.cs b/sdk/src/Services/CleanRoomsML/Generated/AmazonCleanRoomsMLConfig.cs index 7f6b6b5fcd67..6e591180ba2e 100644 --- a/sdk/src/Services/CleanRoomsML/Generated/AmazonCleanRoomsMLConfig.cs +++ b/sdk/src/Services/CleanRoomsML/Generated/AmazonCleanRoomsMLConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.CleanRoomsML public partial class AmazonCleanRoomsMLConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("CleanRoomsML", "4.0.0.0"); private static readonly AmazonCleanRoomsMLEndpointResolver EndpointResolver = new AmazonCleanRoomsMLEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("CleanRoomsML", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("CleanRoomsML", "3.7.401.7"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/CleanRoomsML/Generated/Model/AudienceQualityMetrics.cs b/sdk/src/Services/CleanRoomsML/Generated/Model/AudienceQualityMetrics.cs index 26988e633081..4413d6dc945f 100644 --- a/sdk/src/Services/CleanRoomsML/Generated/Model/AudienceQualityMetrics.cs +++ b/sdk/src/Services/CleanRoomsML/Generated/Model/AudienceQualityMetrics.cs @@ -48,14 +48,8 @@ public partial class AudienceQualityMetrics /// /// /// -<<<<<<< HEAD - public double? RecallMetric -||||||| Commit version number update changes - public double RecallMetric -======= [AWSProperty(Min=0, Max=1)] - public double RecallMetric ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b + public double? RecallMetric { get { return this._recallMetric; } set { this._recallMetric = value; } diff --git a/sdk/src/Services/CleanRoomsML/Generated/Model/CollaborationConfiguredModelAlgorithmAssociationSummary.cs b/sdk/src/Services/CleanRoomsML/Generated/Model/CollaborationConfiguredModelAlgorithmAssociationSummary.cs index 43d6badddf5b..2881de757f3c 100644 --- a/sdk/src/Services/CleanRoomsML/Generated/Model/CollaborationConfiguredModelAlgorithmAssociationSummary.cs +++ b/sdk/src/Services/CleanRoomsML/Generated/Model/CollaborationConfiguredModelAlgorithmAssociationSummary.cs @@ -110,9 +110,9 @@ internal bool IsSetConfiguredModelAlgorithmAssociationArn() /// /// [AWSProperty(Required=true)] - public DateTime CreateTime + public DateTime? CreateTime { - get { return this._createTime.GetValueOrDefault(); } + get { return this._createTime; } set { this._createTime = value; } } @@ -205,9 +205,9 @@ internal bool IsSetName() /// /// [AWSProperty(Required=true)] - public DateTime UpdateTime + public DateTime? UpdateTime { - get { return this._updateTime.GetValueOrDefault(); } + get { return this._updateTime; } set { this._updateTime = value; } } diff --git a/sdk/src/Services/CleanRoomsML/Generated/Model/CollaborationMLInputChannelSummary.cs b/sdk/src/Services/CleanRoomsML/Generated/Model/CollaborationMLInputChannelSummary.cs index d86d075cb1ef..68f665be3741 100644 --- a/sdk/src/Services/CleanRoomsML/Generated/Model/CollaborationMLInputChannelSummary.cs +++ b/sdk/src/Services/CleanRoomsML/Generated/Model/CollaborationMLInputChannelSummary.cs @@ -90,9 +90,9 @@ internal bool IsSetConfiguredModelAlgorithmAssociations() /// /// [AWSProperty(Required=true)] - public DateTime CreateTime + public DateTime? CreateTime { - get { return this._createTime.GetValueOrDefault(); } + get { return this._createTime; } set { this._createTime = value; } } @@ -223,9 +223,9 @@ internal bool IsSetStatus() /// /// [AWSProperty(Required=true)] - public DateTime UpdateTime + public DateTime? UpdateTime { - get { return this._updateTime.GetValueOrDefault(); } + get { return this._updateTime; } set { this._updateTime = value; } } diff --git a/sdk/src/Services/CleanRoomsML/Generated/Model/CollaborationTrainedModelExportJobSummary.cs b/sdk/src/Services/CleanRoomsML/Generated/Model/CollaborationTrainedModelExportJobSummary.cs index 64e70c9c3b97..366feef40172 100644 --- a/sdk/src/Services/CleanRoomsML/Generated/Model/CollaborationTrainedModelExportJobSummary.cs +++ b/sdk/src/Services/CleanRoomsML/Generated/Model/CollaborationTrainedModelExportJobSummary.cs @@ -72,9 +72,9 @@ internal bool IsSetCollaborationIdentifier() /// /// [AWSProperty(Required=true)] - public DateTime CreateTime + public DateTime? CreateTime { - get { return this._createTime.GetValueOrDefault(); } + get { return this._createTime; } set { this._createTime = value; } } @@ -236,9 +236,9 @@ internal bool IsSetTrainedModelArn() /// ///     [AWSProperty(Required=true)] - public DateTime UpdateTime + public DateTime? UpdateTime { - get { return this._updateTime.GetValueOrDefault(); } + get { return this._updateTime; } set { this._updateTime = value; } } diff --git a/sdk/src/Services/CleanRoomsML/Generated/Model/CollaborationTrainedModelInferenceJobSummary.cs b/sdk/src/Services/CleanRoomsML/Generated/Model/CollaborationTrainedModelInferenceJobSummary.cs index d413664ec774..cfbc6a43d808 100644 --- a/sdk/src/Services/CleanRoomsML/Generated/Model/CollaborationTrainedModelInferenceJobSummary.cs +++ b/sdk/src/Services/CleanRoomsML/Generated/Model/CollaborationTrainedModelInferenceJobSummary.cs @@ -98,9 +98,9 @@ internal bool IsSetConfiguredModelAlgorithmAssociationArn() ///     ///     [AWSProperty(Required=true)] - public DateTime CreateTime + public DateTime? CreateTime { - get { return this._createTime.GetValueOrDefault(); } + get { return this._createTime; } set { this._createTime = value; } } @@ -342,9 +342,9 @@ internal bool IsSetTrainedModelInferenceJobArn() ///     ///     [AWSProperty(Required=true)] - public DateTime UpdateTime + public DateTime? UpdateTime { - get { return this._updateTime.GetValueOrDefault(); } + get { return this._updateTime; } set { this._updateTime = value; } } diff --git a/sdk/src/Services/CleanRoomsML/Generated/Model/CollaborationTrainedModelSummary.cs b/sdk/src/Services/CleanRoomsML/Generated/Model/CollaborationTrainedModelSummary.cs index ea09899b1644..fe62531c24c9 100644 --- a/sdk/src/Services/CleanRoomsML/Generated/Model/CollaborationTrainedModelSummary.cs +++ b/sdk/src/Services/CleanRoomsML/Generated/Model/CollaborationTrainedModelSummary.cs @@ -91,9 +91,9 @@ internal bool IsSetConfiguredModelAlgorithmAssociationArn() /// ///     [AWSProperty(Required=true)] - public DateTime CreateTime + public DateTime? CreateTime { - get { return this._createTime.GetValueOrDefault(); } + get { return this._createTime; } set { this._createTime = value; } } @@ -224,9 +224,9 @@ internal bool IsSetTrainedModelArn() /// ///     [AWSProperty(Required=true)] - public DateTime UpdateTime + public DateTime? UpdateTime { - get { return this._updateTime.GetValueOrDefault(); } + get { return this._updateTime; } set { this._updateTime = value; } } diff --git a/sdk/src/Services/CleanRoomsML/Generated/Model/ConfiguredModelAlgorithmAssociationSummary.cs b/sdk/src/Services/CleanRoomsML/Generated/Model/ConfiguredModelAlgorithmAssociationSummary.cs index 44a08efa55f8..787843c517c4 100644 --- a/sdk/src/Services/CleanRoomsML/Generated/Model/ConfiguredModelAlgorithmAssociationSummary.cs +++ b/sdk/src/Services/CleanRoomsML/Generated/Model/ConfiguredModelAlgorithmAssociationSummary.cs @@ -108,9 +108,9 @@ internal bool IsSetConfiguredModelAlgorithmAssociationArn() /// ///     [AWSProperty(Required=true)] - public DateTime CreateTime + public DateTime? CreateTime { - get { return this._createTime.GetValueOrDefault(); } + get { return this._createTime; } set { this._createTime = value; } } @@ -184,9 +184,9 @@ internal bool IsSetName() /// ///     [AWSProperty(Required=true)] - public DateTime UpdateTime + public DateTime? UpdateTime { - get { return this._updateTime.GetValueOrDefault(); } + get { return this._updateTime; } set { this._updateTime = value; } } diff --git a/sdk/src/Services/CleanRoomsML/Generated/Model/ConfiguredModelAlgorithmSummary.cs b/sdk/src/Services/CleanRoomsML/Generated/Model/ConfiguredModelAlgorithmSummary.cs index 8617ff06d74e..6dc7f047154a 100644 --- a/sdk/src/Services/CleanRoomsML/Generated/Model/ConfiguredModelAlgorithmSummary.cs +++ b/sdk/src/Services/CleanRoomsML/Generated/Model/ConfiguredModelAlgorithmSummary.cs @@ -66,9 +66,9 @@ internal bool IsSetConfiguredModelAlgorithmArn() /// ///     [AWSProperty(Required=true)] - public DateTime CreateTime + public DateTime? CreateTime { - get { return this._createTime.GetValueOrDefault(); } + get { return this._createTime; } set { this._createTime = value; } } @@ -123,9 +123,9 @@ internal bool IsSetName() /// ///     [AWSProperty(Required=true)] - public DateTime UpdateTime + public DateTime? UpdateTime { - get { return this._updateTime.GetValueOrDefault(); } + get { return this._updateTime; } set { this._updateTime = value; } } diff --git a/sdk/src/Services/CleanRoomsML/Generated/Model/CreateMLInputChannelRequest.cs b/sdk/src/Services/CleanRoomsML/Generated/Model/CreateMLInputChannelRequest.cs index 1bf4c7078a5a..7a3b5ad3c141 100644 --- a/sdk/src/Services/CleanRoomsML/Generated/Model/CreateMLInputChannelRequest.cs +++ b/sdk/src/Services/CleanRoomsML/Generated/Model/CreateMLInputChannelRequest.cs @@ -167,9 +167,9 @@ internal bool IsSetName() /// ///     [AWSProperty(Required=true, Min=1, Max=30)] - public int RetentionInDays + public int? RetentionInDays { - get { return this._retentionInDays.GetValueOrDefault(); } + get { return this._retentionInDays; } set { this._retentionInDays = value; } } diff --git a/sdk/src/Services/CleanRoomsML/Generated/Model/GetCollaborationConfiguredModelAlgorithmAssociationResponse.cs b/sdk/src/Services/CleanRoomsML/Generated/Model/GetCollaborationConfiguredModelAlgorithmAssociationResponse.cs index 1e6a231dee34..bccfaedac138 100644 --- a/sdk/src/Services/CleanRoomsML/Generated/Model/GetCollaborationConfiguredModelAlgorithmAssociationResponse.cs +++ b/sdk/src/Services/CleanRoomsML/Generated/Model/GetCollaborationConfiguredModelAlgorithmAssociationResponse.cs @@ -110,9 +110,9 @@ internal bool IsSetConfiguredModelAlgorithmAssociationArn() /// ///     [AWSProperty(Required=true)] - public DateTime CreateTime + public DateTime? CreateTime { - get { return this._createTime.GetValueOrDefault(); } + get { return this._createTime; } set { this._createTime = value; } } @@ -220,9 +220,9 @@ internal bool IsSetPrivacyConfiguration() /// ///     [AWSProperty(Required=true)] - public DateTime UpdateTime + public DateTime? UpdateTime { - get { return this._updateTime.GetValueOrDefault(); } + get { return this._updateTime; } set { this._updateTime = value; } } diff --git a/sdk/src/Services/CleanRoomsML/Generated/Model/GetCollaborationMLInputChannelResponse.cs b/sdk/src/Services/CleanRoomsML/Generated/Model/GetCollaborationMLInputChannelResponse.cs index a5ce959bbe42..b738f30450a2 100644 --- a/sdk/src/Services/CleanRoomsML/Generated/Model/GetCollaborationMLInputChannelResponse.cs +++ b/sdk/src/Services/CleanRoomsML/Generated/Model/GetCollaborationMLInputChannelResponse.cs @@ -94,9 +94,9 @@ internal bool IsSetConfiguredModelAlgorithmAssociations() /// ///     [AWSProperty(Required=true)] - public DateTime CreateTime + public DateTime? CreateTime { - get { return this._createTime.GetValueOrDefault(); } + get { return this._createTime; } set { this._createTime = value; } } @@ -208,9 +208,9 @@ internal bool IsSetName() /// ///     [AWSProperty(Min=0, Max=100000000000)] - public long NumberOfRecords + public long? NumberOfRecords { - get { return this._numberOfRecords.GetValueOrDefault(); } + get { return this._numberOfRecords; } set { this._numberOfRecords = value; } } @@ -227,9 +227,9 @@ internal bool IsSetNumberOfRecords() /// ///     [AWSProperty(Required=true, Min=1, Max=30)] - public int RetentionInDays + public int? RetentionInDays { - get { return this._retentionInDays.GetValueOrDefault(); } + get { return this._retentionInDays; } set { this._retentionInDays = value; } } @@ -280,9 +280,9 @@ internal bool IsSetStatusDetails() /// /// [AWSProperty(Required=true)] - public DateTime UpdateTime + public DateTime? UpdateTime { - get { return this._updateTime.GetValueOrDefault(); } + get { return this._updateTime; } set { this._updateTime = value; } } diff --git a/sdk/src/Services/CleanRoomsML/Generated/Model/GetCollaborationTrainedModelResponse.cs b/sdk/src/Services/CleanRoomsML/Generated/Model/GetCollaborationTrainedModelResponse.cs index bffec1340290..06e294cc63a6 100644 --- a/sdk/src/Services/CleanRoomsML/Generated/Model/GetCollaborationTrainedModelResponse.cs +++ b/sdk/src/Services/CleanRoomsML/Generated/Model/GetCollaborationTrainedModelResponse.cs @@ -99,9 +99,9 @@ internal bool IsSetConfiguredModelAlgorithmAssociationArn() /// /// [AWSProperty(Required=true)] - public DateTime CreateTime + public DateTime? CreateTime { - get { return this._createTime.GetValueOrDefault(); } + get { return this._createTime; } set { this._createTime = value; } } @@ -373,9 +373,9 @@ internal bool IsSetTrainingContainerImageDigest() /// /// [AWSProperty(Required=true)] - public DateTime UpdateTime + public DateTime? UpdateTime { - get { return this._updateTime.GetValueOrDefault(); } + get { return this._updateTime; } set { this._updateTime = value; } } diff --git a/sdk/src/Services/CleanRoomsML/Generated/Model/GetConfiguredModelAlgorithmAssociationResponse.cs b/sdk/src/Services/CleanRoomsML/Generated/Model/GetConfiguredModelAlgorithmAssociationResponse.cs index f0a7d2e38e6f..7f9bd7b19e47 100644 --- a/sdk/src/Services/CleanRoomsML/Generated/Model/GetConfiguredModelAlgorithmAssociationResponse.cs +++ b/sdk/src/Services/CleanRoomsML/Generated/Model/GetConfiguredModelAlgorithmAssociationResponse.cs @@ -111,9 +111,9 @@ internal bool IsSetConfiguredModelAlgorithmAssociationArn() /// /// [AWSProperty(Required=true)] - public DateTime CreateTime + public DateTime? CreateTime { - get { return this._createTime.GetValueOrDefault(); } + get { return this._createTime; } set { this._createTime = value; } } @@ -268,9 +268,9 @@ internal bool IsSetTags() /// /// [AWSProperty(Required=true)] - public DateTime UpdateTime + public DateTime? UpdateTime { - get { return this._updateTime.GetValueOrDefault(); } + get { return this._updateTime; } set { this._updateTime = value; } } diff --git a/sdk/src/Services/CleanRoomsML/Generated/Model/GetConfiguredModelAlgorithmResponse.cs b/sdk/src/Services/CleanRoomsML/Generated/Model/GetConfiguredModelAlgorithmResponse.cs index 898c321f6382..08aafe4bd66c 100644 --- a/sdk/src/Services/CleanRoomsML/Generated/Model/GetConfiguredModelAlgorithmResponse.cs +++ b/sdk/src/Services/CleanRoomsML/Generated/Model/GetConfiguredModelAlgorithmResponse.cs @@ -71,9 +71,9 @@ internal bool IsSetConfiguredModelAlgorithmArn() /// /// [AWSProperty(Required=true)] - public DateTime CreateTime + public DateTime? CreateTime { - get { return this._createTime.GetValueOrDefault(); } + get { return this._createTime; } set { this._createTime = value; } } @@ -267,9 +267,9 @@ internal bool IsSetTrainingContainerConfig() /// /// [AWSProperty(Required=true)] - public DateTime UpdateTime + public DateTime? UpdateTime { - get { return this._updateTime.GetValueOrDefault(); } + get { return this._updateTime; } set { this._updateTime = value; } } diff --git a/sdk/src/Services/CleanRoomsML/Generated/Model/GetMLConfigurationResponse.cs b/sdk/src/Services/CleanRoomsML/Generated/Model/GetMLConfigurationResponse.cs index eaeb865b9ea7..3a1248f34e8d 100644 --- a/sdk/src/Services/CleanRoomsML/Generated/Model/GetMLConfigurationResponse.cs +++ b/sdk/src/Services/CleanRoomsML/Generated/Model/GetMLConfigurationResponse.cs @@ -46,9 +46,9 @@ public partial class GetMLConfigurationResponse : AmazonWebServiceResponse /// /// [AWSProperty(Required=true)] - public DateTime CreateTime + public DateTime? CreateTime { - get { return this._createTime.GetValueOrDefault(); } + get { return this._createTime; } set { this._createTime = value; } } @@ -103,9 +103,9 @@ internal bool IsSetMembershipIdentifier() /// /// [AWSProperty(Required=true)] - public DateTime UpdateTime + public DateTime? UpdateTime { - get { return this._updateTime.GetValueOrDefault(); } + get { return this._updateTime; } set { this._updateTime = value; } } diff --git a/sdk/src/Services/CleanRoomsML/Generated/Model/GetMLInputChannelResponse.cs b/sdk/src/Services/CleanRoomsML/Generated/Model/GetMLInputChannelResponse.cs index 7e0f1ed4e62a..d7804888d8b7 100644 --- a/sdk/src/Services/CleanRoomsML/Generated/Model/GetMLInputChannelResponse.cs +++ b/sdk/src/Services/CleanRoomsML/Generated/Model/GetMLInputChannelResponse.cs @@ -99,9 +99,9 @@ internal bool IsSetConfiguredModelAlgorithmAssociations() /// /// [AWSProperty(Required=true)] - public DateTime CreateTime + public DateTime? CreateTime { - get { return this._createTime.GetValueOrDefault(); } + get { return this._createTime; } set { this._createTime = value; } } @@ -233,9 +233,9 @@ internal bool IsSetName() /// /// [AWSProperty(Min=0, Max=1000000)] - public double NumberOfFiles + public double? NumberOfFiles { - get { return this._numberOfFiles.GetValueOrDefault(); } + get { return this._numberOfFiles; } set { this._numberOfFiles = value; } } @@ -252,9 +252,9 @@ internal bool IsSetNumberOfFiles() /// /// [AWSProperty(Min=0, Max=100000000000)] - public long NumberOfRecords + public long? NumberOfRecords { - get { return this._numberOfRecords.GetValueOrDefault(); } + get { return this._numberOfRecords; } set { this._numberOfRecords = value; } } @@ -290,9 +290,9 @@ internal bool IsSetProtectedQueryIdentifier() /// /// [AWSProperty(Required=true, Min=1, Max=30)] - public int RetentionInDays + public int? RetentionInDays { - get { return this._retentionInDays.GetValueOrDefault(); } + get { return this._retentionInDays; } set { this._retentionInDays = value; } } @@ -309,9 +309,9 @@ internal bool IsSetRetentionInDays() /// /// [AWSProperty(Min=0, Max=1000000)] - public double SizeInGb + public double? SizeInGb { - get { return this._sizeInGb.GetValueOrDefault(); } + get { return this._sizeInGb; } set { this._sizeInGb = value; } } @@ -425,9 +425,9 @@ internal bool IsSetTags() /// /// [AWSProperty(Required=true)] - public DateTime UpdateTime + public DateTime? UpdateTime { - get { return this._updateTime.GetValueOrDefault(); } + get { return this._updateTime; } set { this._updateTime = value; } } diff --git a/sdk/src/Services/CleanRoomsML/Generated/Model/GetTrainedModelInferenceJobResponse.cs b/sdk/src/Services/CleanRoomsML/Generated/Model/GetTrainedModelInferenceJobResponse.cs index 8a4d549c9cef..f8bd248dc7e7 100644 --- a/sdk/src/Services/CleanRoomsML/Generated/Model/GetTrainedModelInferenceJobResponse.cs +++ b/sdk/src/Services/CleanRoomsML/Generated/Model/GetTrainedModelInferenceJobResponse.cs @@ -102,9 +102,9 @@ internal bool IsSetContainerExecutionParameters() /// /// [AWSProperty(Required=true)] - public DateTime CreateTime + public DateTime? CreateTime { - get { return this._createTime.GetValueOrDefault(); } + get { return this._createTime; } set { this._createTime = value; } } @@ -500,9 +500,9 @@ internal bool IsSetTrainedModelInferenceJobArn() /// /// [AWSProperty(Required=true)] - public DateTime UpdateTime + public DateTime? UpdateTime { - get { return this._updateTime.GetValueOrDefault(); } + get { return this._updateTime; } set { this._updateTime = value; } } diff --git a/sdk/src/Services/CleanRoomsML/Generated/Model/GetTrainedModelResponse.cs b/sdk/src/Services/CleanRoomsML/Generated/Model/GetTrainedModelResponse.cs index e7df5b3f807a..ee02be846376 100644 --- a/sdk/src/Services/CleanRoomsML/Generated/Model/GetTrainedModelResponse.cs +++ b/sdk/src/Services/CleanRoomsML/Generated/Model/GetTrainedModelResponse.cs @@ -103,9 +103,9 @@ internal bool IsSetConfiguredModelAlgorithmAssociationArn() /// /// [AWSProperty(Required=true)] - public DateTime CreateTime + public DateTime? CreateTime { - get { return this._createTime.GetValueOrDefault(); } + get { return this._createTime; } set { this._createTime = value; } } @@ -498,9 +498,9 @@ internal bool IsSetTrainingContainerImageDigest() /// /// [AWSProperty(Required=true)] - public DateTime UpdateTime + public DateTime? UpdateTime { - get { return this._updateTime.GetValueOrDefault(); } + get { return this._updateTime; } set { this._updateTime = value; } } diff --git a/sdk/src/Services/CleanRoomsML/Generated/Model/InferenceContainerExecutionParameters.cs b/sdk/src/Services/CleanRoomsML/Generated/Model/InferenceContainerExecutionParameters.cs index 95ebd5fcf268..26f430d540c9 100644 --- a/sdk/src/Services/CleanRoomsML/Generated/Model/InferenceContainerExecutionParameters.cs +++ b/sdk/src/Services/CleanRoomsML/Generated/Model/InferenceContainerExecutionParameters.cs @@ -43,9 +43,9 @@ public partial class InferenceContainerExecutionParameters /// /// [AWSProperty(Min=1, Max=100)] - public int MaxPayloadInMB + public int? MaxPayloadInMB { - get { return this._maxPayloadInMB.GetValueOrDefault(); } + get { return this._maxPayloadInMB; } set { this._maxPayloadInMB = value; } } diff --git a/sdk/src/Services/CleanRoomsML/Generated/Model/InferenceResourceConfig.cs b/sdk/src/Services/CleanRoomsML/Generated/Model/InferenceResourceConfig.cs index 92309c655251..d8b55ecc351c 100644 --- a/sdk/src/Services/CleanRoomsML/Generated/Model/InferenceResourceConfig.cs +++ b/sdk/src/Services/CleanRoomsML/Generated/Model/InferenceResourceConfig.cs @@ -44,9 +44,9 @@ public partial class InferenceResourceConfig /// /// [AWSProperty(Min=1, Max=10)] - public int InstanceCount + public int? InstanceCount { - get { return this._instanceCount.GetValueOrDefault(); } + get { return this._instanceCount; } set { this._instanceCount = value; } } diff --git a/sdk/src/Services/CleanRoomsML/Generated/Model/Internal/MarshallTransformations/CollaborationConfiguredModelAlgorithmAssociationSummaryUnmarshaller.cs b/sdk/src/Services/CleanRoomsML/Generated/Model/Internal/MarshallTransformations/CollaborationConfiguredModelAlgorithmAssociationSummaryUnmarshaller.cs index 53b14bd85f7f..c72f7a98e3ac 100644 --- a/sdk/src/Services/CleanRoomsML/Generated/Model/Internal/MarshallTransformations/CollaborationConfiguredModelAlgorithmAssociationSummaryUnmarshaller.cs +++ b/sdk/src/Services/CleanRoomsML/Generated/Model/Internal/MarshallTransformations/CollaborationConfiguredModelAlgorithmAssociationSummaryUnmarshaller.cs @@ -86,7 +86,7 @@ public CollaborationConfiguredModelAlgorithmAssociationSummary Unmarshall(JsonUn } if (context.TestExpression("createTime", targetDepth)) { - var unmarshaller = DateTimeUnmarshaller.Instance; + var unmarshaller = NullableDateTimeUnmarshaller.Instance; unmarshalledObject.CreateTime = unmarshaller.Unmarshall(context); continue; } @@ -116,7 +116,7 @@ public CollaborationConfiguredModelAlgorithmAssociationSummary Unmarshall(JsonUn } if (context.TestExpression("updateTime", targetDepth)) { - var unmarshaller = DateTimeUnmarshaller.Instance; + var unmarshaller = NullableDateTimeUnmarshaller.Instance; unmarshalledObject.UpdateTime = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/CleanRoomsML/Generated/Model/Internal/MarshallTransformations/CollaborationMLInputChannelSummaryUnmarshaller.cs b/sdk/src/Services/CleanRoomsML/Generated/Model/Internal/MarshallTransformations/CollaborationMLInputChannelSummaryUnmarshaller.cs index 96aef5fc33e3..51ebed10aa49 100644 --- a/sdk/src/Services/CleanRoomsML/Generated/Model/Internal/MarshallTransformations/CollaborationMLInputChannelSummaryUnmarshaller.cs +++ b/sdk/src/Services/CleanRoomsML/Generated/Model/Internal/MarshallTransformations/CollaborationMLInputChannelSummaryUnmarshaller.cs @@ -80,7 +80,7 @@ public CollaborationMLInputChannelSummary Unmarshall(JsonUnmarshallerContext con } if (context.TestExpression("createTime", targetDepth)) { - var unmarshaller = DateTimeUnmarshaller.Instance; + var unmarshaller = NullableDateTimeUnmarshaller.Instance; unmarshalledObject.CreateTime = unmarshaller.Unmarshall(context); continue; } @@ -122,7 +122,7 @@ public CollaborationMLInputChannelSummary Unmarshall(JsonUnmarshallerContext con } if (context.TestExpression("updateTime", targetDepth)) { - var unmarshaller = DateTimeUnmarshaller.Instance; + var unmarshaller = NullableDateTimeUnmarshaller.Instance; unmarshalledObject.UpdateTime = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/CleanRoomsML/Generated/Model/Internal/MarshallTransformations/CollaborationTrainedModelExportJobSummaryUnmarshaller.cs b/sdk/src/Services/CleanRoomsML/Generated/Model/Internal/MarshallTransformations/CollaborationTrainedModelExportJobSummaryUnmarshaller.cs index 2b6054dbfb62..b0f3479185d6 100644 --- a/sdk/src/Services/CleanRoomsML/Generated/Model/Internal/MarshallTransformations/CollaborationTrainedModelExportJobSummaryUnmarshaller.cs +++ b/sdk/src/Services/CleanRoomsML/Generated/Model/Internal/MarshallTransformations/CollaborationTrainedModelExportJobSummaryUnmarshaller.cs @@ -74,7 +74,7 @@ public CollaborationTrainedModelExportJobSummary Unmarshall(JsonUnmarshallerCont } if (context.TestExpression("createTime", targetDepth)) { - var unmarshaller = DateTimeUnmarshaller.Instance; + var unmarshaller = NullableDateTimeUnmarshaller.Instance; unmarshalledObject.CreateTime = unmarshaller.Unmarshall(context); continue; } @@ -128,7 +128,7 @@ public CollaborationTrainedModelExportJobSummary Unmarshall(JsonUnmarshallerCont } if (context.TestExpression("updateTime", targetDepth)) { - var unmarshaller = DateTimeUnmarshaller.Instance; + var unmarshaller = NullableDateTimeUnmarshaller.Instance; unmarshalledObject.UpdateTime = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/CleanRoomsML/Generated/Model/Internal/MarshallTransformations/CollaborationTrainedModelInferenceJobSummaryUnmarshaller.cs b/sdk/src/Services/CleanRoomsML/Generated/Model/Internal/MarshallTransformations/CollaborationTrainedModelInferenceJobSummaryUnmarshaller.cs index 9a8e834824ad..37e00c95436f 100644 --- a/sdk/src/Services/CleanRoomsML/Generated/Model/Internal/MarshallTransformations/CollaborationTrainedModelInferenceJobSummaryUnmarshaller.cs +++ b/sdk/src/Services/CleanRoomsML/Generated/Model/Internal/MarshallTransformations/CollaborationTrainedModelInferenceJobSummaryUnmarshaller.cs @@ -80,7 +80,7 @@ public CollaborationTrainedModelInferenceJobSummary Unmarshall(JsonUnmarshallerC } if (context.TestExpression("createTime", targetDepth)) { - var unmarshaller = DateTimeUnmarshaller.Instance; + var unmarshaller = NullableDateTimeUnmarshaller.Instance; unmarshalledObject.CreateTime = unmarshaller.Unmarshall(context); continue; } @@ -158,7 +158,7 @@ public CollaborationTrainedModelInferenceJobSummary Unmarshall(JsonUnmarshallerC } if (context.TestExpression("updateTime", targetDepth)) { - var unmarshaller = DateTimeUnmarshaller.Instance; + var unmarshaller = NullableDateTimeUnmarshaller.Instance; unmarshalledObject.UpdateTime = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/CleanRoomsML/Generated/Model/Internal/MarshallTransformations/CollaborationTrainedModelSummaryUnmarshaller.cs b/sdk/src/Services/CleanRoomsML/Generated/Model/Internal/MarshallTransformations/CollaborationTrainedModelSummaryUnmarshaller.cs index 3dc97b1f1274..3fd4c91f0ab2 100644 --- a/sdk/src/Services/CleanRoomsML/Generated/Model/Internal/MarshallTransformations/CollaborationTrainedModelSummaryUnmarshaller.cs +++ b/sdk/src/Services/CleanRoomsML/Generated/Model/Internal/MarshallTransformations/CollaborationTrainedModelSummaryUnmarshaller.cs @@ -80,7 +80,7 @@ public CollaborationTrainedModelSummary Unmarshall(JsonUnmarshallerContext conte } if (context.TestExpression("createTime", targetDepth)) { - var unmarshaller = DateTimeUnmarshaller.Instance; + var unmarshaller = NullableDateTimeUnmarshaller.Instance; unmarshalledObject.CreateTime = unmarshaller.Unmarshall(context); continue; } @@ -122,7 +122,7 @@ public CollaborationTrainedModelSummary Unmarshall(JsonUnmarshallerContext conte } if (context.TestExpression("updateTime", targetDepth)) { - var unmarshaller = DateTimeUnmarshaller.Instance; + var unmarshaller = NullableDateTimeUnmarshaller.Instance; unmarshalledObject.UpdateTime = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/CleanRoomsML/Generated/Model/Internal/MarshallTransformations/ConfiguredModelAlgorithmAssociationSummaryUnmarshaller.cs b/sdk/src/Services/CleanRoomsML/Generated/Model/Internal/MarshallTransformations/ConfiguredModelAlgorithmAssociationSummaryUnmarshaller.cs index 3e2808159444..fc1fb8ee08c8 100644 --- a/sdk/src/Services/CleanRoomsML/Generated/Model/Internal/MarshallTransformations/ConfiguredModelAlgorithmAssociationSummaryUnmarshaller.cs +++ b/sdk/src/Services/CleanRoomsML/Generated/Model/Internal/MarshallTransformations/ConfiguredModelAlgorithmAssociationSummaryUnmarshaller.cs @@ -86,7 +86,7 @@ public ConfiguredModelAlgorithmAssociationSummary Unmarshall(JsonUnmarshallerCon } if (context.TestExpression("createTime", targetDepth)) { - var unmarshaller = DateTimeUnmarshaller.Instance; + var unmarshaller = NullableDateTimeUnmarshaller.Instance; unmarshalledObject.CreateTime = unmarshaller.Unmarshall(context); continue; } @@ -110,7 +110,7 @@ public ConfiguredModelAlgorithmAssociationSummary Unmarshall(JsonUnmarshallerCon } if (context.TestExpression("updateTime", targetDepth)) { - var unmarshaller = DateTimeUnmarshaller.Instance; + var unmarshaller = NullableDateTimeUnmarshaller.Instance; unmarshalledObject.UpdateTime = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/CleanRoomsML/Generated/Model/Internal/MarshallTransformations/ConfiguredModelAlgorithmSummaryUnmarshaller.cs b/sdk/src/Services/CleanRoomsML/Generated/Model/Internal/MarshallTransformations/ConfiguredModelAlgorithmSummaryUnmarshaller.cs index 512139aa4d20..522805dd5219 100644 --- a/sdk/src/Services/CleanRoomsML/Generated/Model/Internal/MarshallTransformations/ConfiguredModelAlgorithmSummaryUnmarshaller.cs +++ b/sdk/src/Services/CleanRoomsML/Generated/Model/Internal/MarshallTransformations/ConfiguredModelAlgorithmSummaryUnmarshaller.cs @@ -74,7 +74,7 @@ public ConfiguredModelAlgorithmSummary Unmarshall(JsonUnmarshallerContext contex } if (context.TestExpression("createTime", targetDepth)) { - var unmarshaller = DateTimeUnmarshaller.Instance; + var unmarshaller = NullableDateTimeUnmarshaller.Instance; unmarshalledObject.CreateTime = unmarshaller.Unmarshall(context); continue; } @@ -92,7 +92,7 @@ public ConfiguredModelAlgorithmSummary Unmarshall(JsonUnmarshallerContext contex } if (context.TestExpression("updateTime", targetDepth)) { - var unmarshaller = DateTimeUnmarshaller.Instance; + var unmarshaller = NullableDateTimeUnmarshaller.Instance; unmarshalledObject.UpdateTime = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/CleanRoomsML/Generated/Model/Internal/MarshallTransformations/CreateConfiguredModelAlgorithmAssociationRequestMarshaller.cs b/sdk/src/Services/CleanRoomsML/Generated/Model/Internal/MarshallTransformations/CreateConfiguredModelAlgorithmAssociationRequestMarshaller.cs index cefe17f96569..3a37c61b6da1 100644 --- a/sdk/src/Services/CleanRoomsML/Generated/Model/Internal/MarshallTransformations/CreateConfiguredModelAlgorithmAssociationRequestMarshaller.cs +++ b/sdk/src/Services/CleanRoomsML/Generated/Model/Internal/MarshallTransformations/CreateConfiguredModelAlgorithmAssociationRequestMarshaller.cs @@ -64,58 +64,61 @@ public IRequest Marshall(CreateConfiguredModelAlgorithmAssociationRequest public throw new AmazonCleanRoomsMLException("Request object does not have required field MembershipIdentifier set"); request.AddPathResource("{membershipIdentifier}", StringUtils.FromString(publicRequest.MembershipIdentifier)); request.ResourcePath = "/memberships/{membershipIdentifier}/configured-model-algorithm-associations"; - using (StringWriter stringWriter = new StringWriter(CultureInfo.InvariantCulture)) + using (MemoryStream memoryStream = new MemoryStream()) { - JsonWriter writer = new JsonWriter(stringWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetConfiguredModelAlgorithmArn()) + using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) { - context.Writer.WritePropertyName("configuredModelAlgorithmArn"); - context.Writer.Write(publicRequest.ConfiguredModelAlgorithmArn); - } + JsonWriter writer = new JsonWriter(streamWriter); + writer.Validate = false; + writer.WriteObjectStart(); + var context = new JsonMarshallerContext(request, writer); + if(publicRequest.IsSetConfiguredModelAlgorithmArn()) + { + context.Writer.WritePropertyName("configuredModelAlgorithmArn"); + context.Writer.Write(publicRequest.ConfiguredModelAlgorithmArn); + } - if(publicRequest.IsSetDescription()) - { - context.Writer.WritePropertyName("description"); - context.Writer.Write(publicRequest.Description); - } + if(publicRequest.IsSetDescription()) + { + context.Writer.WritePropertyName("description"); + context.Writer.Write(publicRequest.Description); + } - if(publicRequest.IsSetName()) - { - context.Writer.WritePropertyName("name"); - context.Writer.Write(publicRequest.Name); - } + if(publicRequest.IsSetName()) + { + context.Writer.WritePropertyName("name"); + context.Writer.Write(publicRequest.Name); + } - if(publicRequest.IsSetPrivacyConfiguration()) - { - context.Writer.WritePropertyName("privacyConfiguration"); - context.Writer.WriteObjectStart(); + if(publicRequest.IsSetPrivacyConfiguration()) + { + context.Writer.WritePropertyName("privacyConfiguration"); + context.Writer.WriteObjectStart(); - var marshaller = PrivacyConfigurationMarshaller.Instance; - marshaller.Marshall(publicRequest.PrivacyConfiguration, context); + var marshaller = PrivacyConfigurationMarshaller.Instance; + marshaller.Marshall(publicRequest.PrivacyConfiguration, context); - context.Writer.WriteObjectEnd(); - } + context.Writer.WriteObjectEnd(); + } - if(publicRequest.IsSetTags()) - { - context.Writer.WritePropertyName("tags"); - context.Writer.WriteObjectStart(); - foreach (var publicRequestTagsKvp in publicRequest.Tags) + if(publicRequest.IsSetTags()) { - context.Writer.WritePropertyName(publicRequestTagsKvp.Key); - var publicRequestTagsValue = publicRequestTagsKvp.Value; - - context.Writer.Write(publicRequestTagsValue); + context.Writer.WritePropertyName("tags"); + context.Writer.WriteObjectStart(); + foreach (var publicRequestTagsKvp in publicRequest.Tags) + { + context.Writer.WritePropertyName(publicRequestTagsKvp.Key); + var publicRequestTagsValue = publicRequestTagsKvp.Value; + + context.Writer.Write(publicRequestTagsValue); + } + context.Writer.WriteObjectEnd(); } - context.Writer.WriteObjectEnd(); + + writer.WriteObjectEnd(); } - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); + request.Content = memoryStream.ToArray(); } diff --git a/sdk/src/Services/CleanRoomsML/Generated/Model/Internal/MarshallTransformations/CreateConfiguredModelAlgorithmRequestMarshaller.cs b/sdk/src/Services/CleanRoomsML/Generated/Model/Internal/MarshallTransformations/CreateConfiguredModelAlgorithmRequestMarshaller.cs index c17951859af0..d9766e3e06b9 100644 --- a/sdk/src/Services/CleanRoomsML/Generated/Model/Internal/MarshallTransformations/CreateConfiguredModelAlgorithmRequestMarshaller.cs +++ b/sdk/src/Services/CleanRoomsML/Generated/Model/Internal/MarshallTransformations/CreateConfiguredModelAlgorithmRequestMarshaller.cs @@ -61,75 +61,78 @@ public IRequest Marshall(CreateConfiguredModelAlgorithmRequest publicRequest) request.HttpMethod = "POST"; request.ResourcePath = "/configured-model-algorithms"; - using (StringWriter stringWriter = new StringWriter(CultureInfo.InvariantCulture)) + using (MemoryStream memoryStream = new MemoryStream()) { - JsonWriter writer = new JsonWriter(stringWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetDescription()) + using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) { - context.Writer.WritePropertyName("description"); - context.Writer.Write(publicRequest.Description); - } - - if(publicRequest.IsSetInferenceContainerConfig()) - { - context.Writer.WritePropertyName("inferenceContainerConfig"); - context.Writer.WriteObjectStart(); + JsonWriter writer = new JsonWriter(streamWriter); + writer.Validate = false; + writer.WriteObjectStart(); + var context = new JsonMarshallerContext(request, writer); + if(publicRequest.IsSetDescription()) + { + context.Writer.WritePropertyName("description"); + context.Writer.Write(publicRequest.Description); + } - var marshaller = InferenceContainerConfigMarshaller.Instance; - marshaller.Marshall(publicRequest.InferenceContainerConfig, context); + if(publicRequest.IsSetInferenceContainerConfig()) + { + context.Writer.WritePropertyName("inferenceContainerConfig"); + context.Writer.WriteObjectStart(); - context.Writer.WriteObjectEnd(); - } + var marshaller = InferenceContainerConfigMarshaller.Instance; + marshaller.Marshall(publicRequest.InferenceContainerConfig, context); - if(publicRequest.IsSetKmsKeyArn()) - { - context.Writer.WritePropertyName("kmsKeyArn"); - context.Writer.Write(publicRequest.KmsKeyArn); - } + context.Writer.WriteObjectEnd(); + } - if(publicRequest.IsSetName()) - { - context.Writer.WritePropertyName("name"); - context.Writer.Write(publicRequest.Name); - } + if(publicRequest.IsSetKmsKeyArn()) + { + context.Writer.WritePropertyName("kmsKeyArn"); + context.Writer.Write(publicRequest.KmsKeyArn); + } - if(publicRequest.IsSetRoleArn()) - { - context.Writer.WritePropertyName("roleArn"); - context.Writer.Write(publicRequest.RoleArn); - } + if(publicRequest.IsSetName()) + { + context.Writer.WritePropertyName("name"); + context.Writer.Write(publicRequest.Name); + } - if(publicRequest.IsSetTags()) - { - context.Writer.WritePropertyName("tags"); - context.Writer.WriteObjectStart(); - foreach (var publicRequestTagsKvp in publicRequest.Tags) + if(publicRequest.IsSetRoleArn()) { - context.Writer.WritePropertyName(publicRequestTagsKvp.Key); - var publicRequestTagsValue = publicRequestTagsKvp.Value; + context.Writer.WritePropertyName("roleArn"); + context.Writer.Write(publicRequest.RoleArn); + } - context.Writer.Write(publicRequestTagsValue); + if(publicRequest.IsSetTags()) + { + context.Writer.WritePropertyName("tags"); + context.Writer.WriteObjectStart(); + foreach (var publicRequestTagsKvp in publicRequest.Tags) + { + context.Writer.WritePropertyName(publicRequestTagsKvp.Key); + var publicRequestTagsValue = publicRequestTagsKvp.Value; + + context.Writer.Write(publicRequestTagsValue); + } + context.Writer.WriteObjectEnd(); } - context.Writer.WriteObjectEnd(); - } - if(publicRequest.IsSetTrainingContainerConfig()) - { - context.Writer.WritePropertyName("trainingContainerConfig"); - context.Writer.WriteObjectStart(); + if(publicRequest.IsSetTrainingContainerConfig()) + { + context.Writer.WritePropertyName("trainingContainerConfig"); + context.Writer.WriteObjectStart(); + + var marshaller = ContainerConfigMarshaller.Instance; + marshaller.Marshall(publicRequest.TrainingContainerConfig, context); - var marshaller = ContainerConfigMarshaller.Instance; - marshaller.Marshall(publicRequest.TrainingContainerConfig, context); + context.Writer.WriteObjectEnd(); + } - context.Writer.WriteObjectEnd(); + writer.WriteObjectEnd(); } - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); + request.Content = memoryStream.ToArray(); } diff --git a/sdk/src/Services/CleanRoomsML/Generated/Model/Internal/MarshallTransformations/CreateMLInputChannelRequestMarshaller.cs b/sdk/src/Services/CleanRoomsML/Generated/Model/Internal/MarshallTransformations/CreateMLInputChannelRequestMarshaller.cs index 33385df7ba22..779f641daa43 100644 --- a/sdk/src/Services/CleanRoomsML/Generated/Model/Internal/MarshallTransformations/CreateMLInputChannelRequestMarshaller.cs +++ b/sdk/src/Services/CleanRoomsML/Generated/Model/Internal/MarshallTransformations/CreateMLInputChannelRequestMarshaller.cs @@ -64,75 +64,78 @@ public IRequest Marshall(CreateMLInputChannelRequest publicRequest) throw new AmazonCleanRoomsMLException("Request object does not have required field MembershipIdentifier set"); request.AddPathResource("{membershipIdentifier}", StringUtils.FromString(publicRequest.MembershipIdentifier)); request.ResourcePath = "/memberships/{membershipIdentifier}/ml-input-channels"; - using (StringWriter stringWriter = new StringWriter(CultureInfo.InvariantCulture)) + using (MemoryStream memoryStream = new MemoryStream()) { - JsonWriter writer = new JsonWriter(stringWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetConfiguredModelAlgorithmAssociations()) + using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) { - context.Writer.WritePropertyName("configuredModelAlgorithmAssociations"); - context.Writer.WriteArrayStart(); - foreach(var publicRequestConfiguredModelAlgorithmAssociationsListValue in publicRequest.ConfiguredModelAlgorithmAssociations) + JsonWriter writer = new JsonWriter(streamWriter); + writer.Validate = false; + writer.WriteObjectStart(); + var context = new JsonMarshallerContext(request, writer); + if(publicRequest.IsSetConfiguredModelAlgorithmAssociations()) { - context.Writer.Write(publicRequestConfiguredModelAlgorithmAssociationsListValue); + context.Writer.WritePropertyName("configuredModelAlgorithmAssociations"); + context.Writer.WriteArrayStart(); + foreach(var publicRequestConfiguredModelAlgorithmAssociationsListValue in publicRequest.ConfiguredModelAlgorithmAssociations) + { + context.Writer.Write(publicRequestConfiguredModelAlgorithmAssociationsListValue); + } + context.Writer.WriteArrayEnd(); } - context.Writer.WriteArrayEnd(); - } - - if(publicRequest.IsSetDescription()) - { - context.Writer.WritePropertyName("description"); - context.Writer.Write(publicRequest.Description); - } - if(publicRequest.IsSetInputChannel()) - { - context.Writer.WritePropertyName("inputChannel"); - context.Writer.WriteObjectStart(); + if(publicRequest.IsSetDescription()) + { + context.Writer.WritePropertyName("description"); + context.Writer.Write(publicRequest.Description); + } - var marshaller = InputChannelMarshaller.Instance; - marshaller.Marshall(publicRequest.InputChannel, context); + if(publicRequest.IsSetInputChannel()) + { + context.Writer.WritePropertyName("inputChannel"); + context.Writer.WriteObjectStart(); - context.Writer.WriteObjectEnd(); - } + var marshaller = InputChannelMarshaller.Instance; + marshaller.Marshall(publicRequest.InputChannel, context); - if(publicRequest.IsSetKmsKeyArn()) - { - context.Writer.WritePropertyName("kmsKeyArn"); - context.Writer.Write(publicRequest.KmsKeyArn); - } + context.Writer.WriteObjectEnd(); + } - if(publicRequest.IsSetName()) - { - context.Writer.WritePropertyName("name"); - context.Writer.Write(publicRequest.Name); - } + if(publicRequest.IsSetKmsKeyArn()) + { + context.Writer.WritePropertyName("kmsKeyArn"); + context.Writer.Write(publicRequest.KmsKeyArn); + } - if(publicRequest.IsSetRetentionInDays()) - { - context.Writer.WritePropertyName("retentionInDays"); - context.Writer.Write(publicRequest.RetentionInDays); - } + if(publicRequest.IsSetName()) + { + context.Writer.WritePropertyName("name"); + context.Writer.Write(publicRequest.Name); + } - if(publicRequest.IsSetTags()) - { - context.Writer.WritePropertyName("tags"); - context.Writer.WriteObjectStart(); - foreach (var publicRequestTagsKvp in publicRequest.Tags) + if(publicRequest.IsSetRetentionInDays()) { - context.Writer.WritePropertyName(publicRequestTagsKvp.Key); - var publicRequestTagsValue = publicRequestTagsKvp.Value; + context.Writer.WritePropertyName("retentionInDays"); + context.Writer.Write(publicRequest.RetentionInDays.Value); + } - context.Writer.Write(publicRequestTagsValue); + if(publicRequest.IsSetTags()) + { + context.Writer.WritePropertyName("tags"); + context.Writer.WriteObjectStart(); + foreach (var publicRequestTagsKvp in publicRequest.Tags) + { + context.Writer.WritePropertyName(publicRequestTagsKvp.Key); + var publicRequestTagsValue = publicRequestTagsKvp.Value; + + context.Writer.Write(publicRequestTagsValue); + } + context.Writer.WriteObjectEnd(); } - context.Writer.WriteObjectEnd(); + + writer.WriteObjectEnd(); } - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); + request.Content = memoryStream.ToArray(); } diff --git a/sdk/src/Services/CleanRoomsML/Generated/Model/Internal/MarshallTransformations/CreateTrainedModelRequestMarshaller.cs b/sdk/src/Services/CleanRoomsML/Generated/Model/Internal/MarshallTransformations/CreateTrainedModelRequestMarshaller.cs index 039e761fbfef..138f5e701144 100644 --- a/sdk/src/Services/CleanRoomsML/Generated/Model/Internal/MarshallTransformations/CreateTrainedModelRequestMarshaller.cs +++ b/sdk/src/Services/CleanRoomsML/Generated/Model/Internal/MarshallTransformations/CreateTrainedModelRequestMarshaller.cs @@ -64,119 +64,122 @@ public IRequest Marshall(CreateTrainedModelRequest publicRequest) throw new AmazonCleanRoomsMLException("Request object does not have required field MembershipIdentifier set"); request.AddPathResource("{membershipIdentifier}", StringUtils.FromString(publicRequest.MembershipIdentifier)); request.ResourcePath = "/memberships/{membershipIdentifier}/trained-models"; - using (StringWriter stringWriter = new StringWriter(CultureInfo.InvariantCulture)) + using (MemoryStream memoryStream = new MemoryStream()) { - JsonWriter writer = new JsonWriter(stringWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetConfiguredModelAlgorithmAssociationArn()) + using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) { - context.Writer.WritePropertyName("configuredModelAlgorithmAssociationArn"); - context.Writer.Write(publicRequest.ConfiguredModelAlgorithmAssociationArn); - } - - if(publicRequest.IsSetDataChannels()) - { - context.Writer.WritePropertyName("dataChannels"); - context.Writer.WriteArrayStart(); - foreach(var publicRequestDataChannelsListValue in publicRequest.DataChannels) + JsonWriter writer = new JsonWriter(streamWriter); + writer.Validate = false; + writer.WriteObjectStart(); + var context = new JsonMarshallerContext(request, writer); + if(publicRequest.IsSetConfiguredModelAlgorithmAssociationArn()) { - context.Writer.WriteObjectStart(); - - var marshaller = ModelTrainingDataChannelMarshaller.Instance; - marshaller.Marshall(publicRequestDataChannelsListValue, context); + context.Writer.WritePropertyName("configuredModelAlgorithmAssociationArn"); + context.Writer.Write(publicRequest.ConfiguredModelAlgorithmAssociationArn); + } - context.Writer.WriteObjectEnd(); + if(publicRequest.IsSetDataChannels()) + { + context.Writer.WritePropertyName("dataChannels"); + context.Writer.WriteArrayStart(); + foreach(var publicRequestDataChannelsListValue in publicRequest.DataChannels) + { + context.Writer.WriteObjectStart(); + + var marshaller = ModelTrainingDataChannelMarshaller.Instance; + marshaller.Marshall(publicRequestDataChannelsListValue, context); + + context.Writer.WriteObjectEnd(); + } + context.Writer.WriteArrayEnd(); } - context.Writer.WriteArrayEnd(); - } - if(publicRequest.IsSetDescription()) - { - context.Writer.WritePropertyName("description"); - context.Writer.Write(publicRequest.Description); - } + if(publicRequest.IsSetDescription()) + { + context.Writer.WritePropertyName("description"); + context.Writer.Write(publicRequest.Description); + } - if(publicRequest.IsSetEnvironment()) - { - context.Writer.WritePropertyName("environment"); - context.Writer.WriteObjectStart(); - foreach (var publicRequestEnvironmentKvp in publicRequest.Environment) + if(publicRequest.IsSetEnvironment()) { - context.Writer.WritePropertyName(publicRequestEnvironmentKvp.Key); - var publicRequestEnvironmentValue = publicRequestEnvironmentKvp.Value; + context.Writer.WritePropertyName("environment"); + context.Writer.WriteObjectStart(); + foreach (var publicRequestEnvironmentKvp in publicRequest.Environment) + { + context.Writer.WritePropertyName(publicRequestEnvironmentKvp.Key); + var publicRequestEnvironmentValue = publicRequestEnvironmentKvp.Value; - context.Writer.Write(publicRequestEnvironmentValue); + context.Writer.Write(publicRequestEnvironmentValue); + } + context.Writer.WriteObjectEnd(); } - context.Writer.WriteObjectEnd(); - } - if(publicRequest.IsSetHyperparameters()) - { - context.Writer.WritePropertyName("hyperparameters"); - context.Writer.WriteObjectStart(); - foreach (var publicRequestHyperparametersKvp in publicRequest.Hyperparameters) + if(publicRequest.IsSetHyperparameters()) { - context.Writer.WritePropertyName(publicRequestHyperparametersKvp.Key); - var publicRequestHyperparametersValue = publicRequestHyperparametersKvp.Value; + context.Writer.WritePropertyName("hyperparameters"); + context.Writer.WriteObjectStart(); + foreach (var publicRequestHyperparametersKvp in publicRequest.Hyperparameters) + { + context.Writer.WritePropertyName(publicRequestHyperparametersKvp.Key); + var publicRequestHyperparametersValue = publicRequestHyperparametersKvp.Value; - context.Writer.Write(publicRequestHyperparametersValue); + context.Writer.Write(publicRequestHyperparametersValue); + } + context.Writer.WriteObjectEnd(); } - context.Writer.WriteObjectEnd(); - } - if(publicRequest.IsSetKmsKeyArn()) - { - context.Writer.WritePropertyName("kmsKeyArn"); - context.Writer.Write(publicRequest.KmsKeyArn); - } + if(publicRequest.IsSetKmsKeyArn()) + { + context.Writer.WritePropertyName("kmsKeyArn"); + context.Writer.Write(publicRequest.KmsKeyArn); + } - if(publicRequest.IsSetName()) - { - context.Writer.WritePropertyName("name"); - context.Writer.Write(publicRequest.Name); - } + if(publicRequest.IsSetName()) + { + context.Writer.WritePropertyName("name"); + context.Writer.Write(publicRequest.Name); + } - if(publicRequest.IsSetResourceConfig()) - { - context.Writer.WritePropertyName("resourceConfig"); - context.Writer.WriteObjectStart(); + if(publicRequest.IsSetResourceConfig()) + { + context.Writer.WritePropertyName("resourceConfig"); + context.Writer.WriteObjectStart(); - var marshaller = ResourceConfigMarshaller.Instance; - marshaller.Marshall(publicRequest.ResourceConfig, context); + var marshaller = ResourceConfigMarshaller.Instance; + marshaller.Marshall(publicRequest.ResourceConfig, context); - context.Writer.WriteObjectEnd(); - } + context.Writer.WriteObjectEnd(); + } - if(publicRequest.IsSetStoppingCondition()) - { - context.Writer.WritePropertyName("stoppingCondition"); - context.Writer.WriteObjectStart(); + if(publicRequest.IsSetStoppingCondition()) + { + context.Writer.WritePropertyName("stoppingCondition"); + context.Writer.WriteObjectStart(); - var marshaller = StoppingConditionMarshaller.Instance; - marshaller.Marshall(publicRequest.StoppingCondition, context); + var marshaller = StoppingConditionMarshaller.Instance; + marshaller.Marshall(publicRequest.StoppingCondition, context); - context.Writer.WriteObjectEnd(); - } + context.Writer.WriteObjectEnd(); + } - if(publicRequest.IsSetTags()) - { - context.Writer.WritePropertyName("tags"); - context.Writer.WriteObjectStart(); - foreach (var publicRequestTagsKvp in publicRequest.Tags) + if(publicRequest.IsSetTags()) { - context.Writer.WritePropertyName(publicRequestTagsKvp.Key); - var publicRequestTagsValue = publicRequestTagsKvp.Value; + context.Writer.WritePropertyName("tags"); + context.Writer.WriteObjectStart(); + foreach (var publicRequestTagsKvp in publicRequest.Tags) + { + context.Writer.WritePropertyName(publicRequestTagsKvp.Key); + var publicRequestTagsValue = publicRequestTagsKvp.Value; - context.Writer.Write(publicRequestTagsValue); + context.Writer.Write(publicRequestTagsValue); + } + context.Writer.WriteObjectEnd(); } - context.Writer.WriteObjectEnd(); + + writer.WriteObjectEnd(); } - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); + request.Content = memoryStream.ToArray(); } diff --git a/sdk/src/Services/CleanRoomsML/Generated/Model/Internal/MarshallTransformations/GetCollaborationConfiguredModelAlgorithmAssociationResponseUnmarshaller.cs b/sdk/src/Services/CleanRoomsML/Generated/Model/Internal/MarshallTransformations/GetCollaborationConfiguredModelAlgorithmAssociationResponseUnmarshaller.cs index a5620a2caa82..1a908c2ca70a 100644 --- a/sdk/src/Services/CleanRoomsML/Generated/Model/Internal/MarshallTransformations/GetCollaborationConfiguredModelAlgorithmAssociationResponseUnmarshaller.cs +++ b/sdk/src/Services/CleanRoomsML/Generated/Model/Internal/MarshallTransformations/GetCollaborationConfiguredModelAlgorithmAssociationResponseUnmarshaller.cs @@ -72,7 +72,7 @@ public override AmazonWebServiceResponse Unmarshall(JsonUnmarshallerContext cont } if (context.TestExpression("createTime", targetDepth)) { - var unmarshaller = DateTimeUnmarshaller.Instance; + var unmarshaller = NullableDateTimeUnmarshaller.Instance; response.CreateTime = unmarshaller.Unmarshall(context); continue; } @@ -108,7 +108,7 @@ public override AmazonWebServiceResponse Unmarshall(JsonUnmarshallerContext cont } if (context.TestExpression("updateTime", targetDepth)) { - var unmarshaller = DateTimeUnmarshaller.Instance; + var unmarshaller = NullableDateTimeUnmarshaller.Instance; response.UpdateTime = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/CleanRoomsML/Generated/Model/Internal/MarshallTransformations/GetCollaborationMLInputChannelResponseUnmarshaller.cs b/sdk/src/Services/CleanRoomsML/Generated/Model/Internal/MarshallTransformations/GetCollaborationMLInputChannelResponseUnmarshaller.cs index 60e07cdd0a6c..f596c0fd3cd8 100644 --- a/sdk/src/Services/CleanRoomsML/Generated/Model/Internal/MarshallTransformations/GetCollaborationMLInputChannelResponseUnmarshaller.cs +++ b/sdk/src/Services/CleanRoomsML/Generated/Model/Internal/MarshallTransformations/GetCollaborationMLInputChannelResponseUnmarshaller.cs @@ -66,7 +66,7 @@ public override AmazonWebServiceResponse Unmarshall(JsonUnmarshallerContext cont } if (context.TestExpression("createTime", targetDepth)) { - var unmarshaller = DateTimeUnmarshaller.Instance; + var unmarshaller = NullableDateTimeUnmarshaller.Instance; response.CreateTime = unmarshaller.Unmarshall(context); continue; } @@ -102,13 +102,13 @@ public override AmazonWebServiceResponse Unmarshall(JsonUnmarshallerContext cont } if (context.TestExpression("numberOfRecords", targetDepth)) { - var unmarshaller = LongUnmarshaller.Instance; + var unmarshaller = NullableLongUnmarshaller.Instance; response.NumberOfRecords = unmarshaller.Unmarshall(context); continue; } if (context.TestExpression("retentionInDays", targetDepth)) { - var unmarshaller = IntUnmarshaller.Instance; + var unmarshaller = NullableIntUnmarshaller.Instance; response.RetentionInDays = unmarshaller.Unmarshall(context); continue; } @@ -126,7 +126,7 @@ public override AmazonWebServiceResponse Unmarshall(JsonUnmarshallerContext cont } if (context.TestExpression("updateTime", targetDepth)) { - var unmarshaller = DateTimeUnmarshaller.Instance; + var unmarshaller = NullableDateTimeUnmarshaller.Instance; response.UpdateTime = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/CleanRoomsML/Generated/Model/Internal/MarshallTransformations/GetCollaborationTrainedModelResponseUnmarshaller.cs b/sdk/src/Services/CleanRoomsML/Generated/Model/Internal/MarshallTransformations/GetCollaborationTrainedModelResponseUnmarshaller.cs index 27261639dc10..9c6798f17ff9 100644 --- a/sdk/src/Services/CleanRoomsML/Generated/Model/Internal/MarshallTransformations/GetCollaborationTrainedModelResponseUnmarshaller.cs +++ b/sdk/src/Services/CleanRoomsML/Generated/Model/Internal/MarshallTransformations/GetCollaborationTrainedModelResponseUnmarshaller.cs @@ -66,7 +66,7 @@ public override AmazonWebServiceResponse Unmarshall(JsonUnmarshallerContext cont } if (context.TestExpression("createTime", targetDepth)) { - var unmarshaller = DateTimeUnmarshaller.Instance; + var unmarshaller = NullableDateTimeUnmarshaller.Instance; response.CreateTime = unmarshaller.Unmarshall(context); continue; } @@ -156,7 +156,7 @@ public override AmazonWebServiceResponse Unmarshall(JsonUnmarshallerContext cont } if (context.TestExpression("updateTime", targetDepth)) { - var unmarshaller = DateTimeUnmarshaller.Instance; + var unmarshaller = NullableDateTimeUnmarshaller.Instance; response.UpdateTime = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/CleanRoomsML/Generated/Model/Internal/MarshallTransformations/GetConfiguredModelAlgorithmAssociationResponseUnmarshaller.cs b/sdk/src/Services/CleanRoomsML/Generated/Model/Internal/MarshallTransformations/GetConfiguredModelAlgorithmAssociationResponseUnmarshaller.cs index 4e7eae1ba9fd..699fc615563c 100644 --- a/sdk/src/Services/CleanRoomsML/Generated/Model/Internal/MarshallTransformations/GetConfiguredModelAlgorithmAssociationResponseUnmarshaller.cs +++ b/sdk/src/Services/CleanRoomsML/Generated/Model/Internal/MarshallTransformations/GetConfiguredModelAlgorithmAssociationResponseUnmarshaller.cs @@ -72,7 +72,7 @@ public override AmazonWebServiceResponse Unmarshall(JsonUnmarshallerContext cont } if (context.TestExpression("createTime", targetDepth)) { - var unmarshaller = DateTimeUnmarshaller.Instance; + var unmarshaller = NullableDateTimeUnmarshaller.Instance; response.CreateTime = unmarshaller.Unmarshall(context); continue; } @@ -108,7 +108,7 @@ public override AmazonWebServiceResponse Unmarshall(JsonUnmarshallerContext cont } if (context.TestExpression("updateTime", targetDepth)) { - var unmarshaller = DateTimeUnmarshaller.Instance; + var unmarshaller = NullableDateTimeUnmarshaller.Instance; response.UpdateTime = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/CleanRoomsML/Generated/Model/Internal/MarshallTransformations/GetConfiguredModelAlgorithmResponseUnmarshaller.cs b/sdk/src/Services/CleanRoomsML/Generated/Model/Internal/MarshallTransformations/GetConfiguredModelAlgorithmResponseUnmarshaller.cs index e16838a1d2a0..1d3dfe403cbb 100644 --- a/sdk/src/Services/CleanRoomsML/Generated/Model/Internal/MarshallTransformations/GetConfiguredModelAlgorithmResponseUnmarshaller.cs +++ b/sdk/src/Services/CleanRoomsML/Generated/Model/Internal/MarshallTransformations/GetConfiguredModelAlgorithmResponseUnmarshaller.cs @@ -60,7 +60,7 @@ public override AmazonWebServiceResponse Unmarshall(JsonUnmarshallerContext cont } if (context.TestExpression("createTime", targetDepth)) { - var unmarshaller = DateTimeUnmarshaller.Instance; + var unmarshaller = NullableDateTimeUnmarshaller.Instance; response.CreateTime = unmarshaller.Unmarshall(context); continue; } @@ -108,7 +108,7 @@ public override AmazonWebServiceResponse Unmarshall(JsonUnmarshallerContext cont } if (context.TestExpression("updateTime", targetDepth)) { - var unmarshaller = DateTimeUnmarshaller.Instance; + var unmarshaller = NullableDateTimeUnmarshaller.Instance; response.UpdateTime = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/CleanRoomsML/Generated/Model/Internal/MarshallTransformations/GetMLConfigurationResponseUnmarshaller.cs b/sdk/src/Services/CleanRoomsML/Generated/Model/Internal/MarshallTransformations/GetMLConfigurationResponseUnmarshaller.cs index 208a1b86c5de..ba45498a3c29 100644 --- a/sdk/src/Services/CleanRoomsML/Generated/Model/Internal/MarshallTransformations/GetMLConfigurationResponseUnmarshaller.cs +++ b/sdk/src/Services/CleanRoomsML/Generated/Model/Internal/MarshallTransformations/GetMLConfigurationResponseUnmarshaller.cs @@ -54,7 +54,7 @@ public override AmazonWebServiceResponse Unmarshall(JsonUnmarshallerContext cont { if (context.TestExpression("createTime", targetDepth)) { - var unmarshaller = DateTimeUnmarshaller.Instance; + var unmarshaller = NullableDateTimeUnmarshaller.Instance; response.CreateTime = unmarshaller.Unmarshall(context); continue; } @@ -72,7 +72,7 @@ public override AmazonWebServiceResponse Unmarshall(JsonUnmarshallerContext cont } if (context.TestExpression("updateTime", targetDepth)) { - var unmarshaller = DateTimeUnmarshaller.Instance; + var unmarshaller = NullableDateTimeUnmarshaller.Instance; response.UpdateTime = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/CleanRoomsML/Generated/Model/Internal/MarshallTransformations/GetMLInputChannelResponseUnmarshaller.cs b/sdk/src/Services/CleanRoomsML/Generated/Model/Internal/MarshallTransformations/GetMLInputChannelResponseUnmarshaller.cs index beb0e53aabdd..12e62a097f9d 100644 --- a/sdk/src/Services/CleanRoomsML/Generated/Model/Internal/MarshallTransformations/GetMLInputChannelResponseUnmarshaller.cs +++ b/sdk/src/Services/CleanRoomsML/Generated/Model/Internal/MarshallTransformations/GetMLInputChannelResponseUnmarshaller.cs @@ -66,7 +66,7 @@ public override AmazonWebServiceResponse Unmarshall(JsonUnmarshallerContext cont } if (context.TestExpression("createTime", targetDepth)) { - var unmarshaller = DateTimeUnmarshaller.Instance; + var unmarshaller = NullableDateTimeUnmarshaller.Instance; response.CreateTime = unmarshaller.Unmarshall(context); continue; } @@ -108,13 +108,13 @@ public override AmazonWebServiceResponse Unmarshall(JsonUnmarshallerContext cont } if (context.TestExpression("numberOfFiles", targetDepth)) { - var unmarshaller = DoubleUnmarshaller.Instance; + var unmarshaller = NullableDoubleUnmarshaller.Instance; response.NumberOfFiles = unmarshaller.Unmarshall(context); continue; } if (context.TestExpression("numberOfRecords", targetDepth)) { - var unmarshaller = LongUnmarshaller.Instance; + var unmarshaller = NullableLongUnmarshaller.Instance; response.NumberOfRecords = unmarshaller.Unmarshall(context); continue; } @@ -126,13 +126,13 @@ public override AmazonWebServiceResponse Unmarshall(JsonUnmarshallerContext cont } if (context.TestExpression("retentionInDays", targetDepth)) { - var unmarshaller = IntUnmarshaller.Instance; + var unmarshaller = NullableIntUnmarshaller.Instance; response.RetentionInDays = unmarshaller.Unmarshall(context); continue; } if (context.TestExpression("sizeInGb", targetDepth)) { - var unmarshaller = DoubleUnmarshaller.Instance; + var unmarshaller = NullableDoubleUnmarshaller.Instance; response.SizeInGb = unmarshaller.Unmarshall(context); continue; } @@ -156,7 +156,7 @@ public override AmazonWebServiceResponse Unmarshall(JsonUnmarshallerContext cont } if (context.TestExpression("updateTime", targetDepth)) { - var unmarshaller = DateTimeUnmarshaller.Instance; + var unmarshaller = NullableDateTimeUnmarshaller.Instance; response.UpdateTime = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/CleanRoomsML/Generated/Model/Internal/MarshallTransformations/GetTrainedModelInferenceJobResponseUnmarshaller.cs b/sdk/src/Services/CleanRoomsML/Generated/Model/Internal/MarshallTransformations/GetTrainedModelInferenceJobResponseUnmarshaller.cs index a48d22d842f5..55bc8037e4f8 100644 --- a/sdk/src/Services/CleanRoomsML/Generated/Model/Internal/MarshallTransformations/GetTrainedModelInferenceJobResponseUnmarshaller.cs +++ b/sdk/src/Services/CleanRoomsML/Generated/Model/Internal/MarshallTransformations/GetTrainedModelInferenceJobResponseUnmarshaller.cs @@ -66,7 +66,7 @@ public override AmazonWebServiceResponse Unmarshall(JsonUnmarshallerContext cont } if (context.TestExpression("createTime", targetDepth)) { - var unmarshaller = DateTimeUnmarshaller.Instance; + var unmarshaller = NullableDateTimeUnmarshaller.Instance; response.CreateTime = unmarshaller.Unmarshall(context); continue; } @@ -180,7 +180,7 @@ public override AmazonWebServiceResponse Unmarshall(JsonUnmarshallerContext cont } if (context.TestExpression("updateTime", targetDepth)) { - var unmarshaller = DateTimeUnmarshaller.Instance; + var unmarshaller = NullableDateTimeUnmarshaller.Instance; response.UpdateTime = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/CleanRoomsML/Generated/Model/Internal/MarshallTransformations/GetTrainedModelResponseUnmarshaller.cs b/sdk/src/Services/CleanRoomsML/Generated/Model/Internal/MarshallTransformations/GetTrainedModelResponseUnmarshaller.cs index db7e719320d6..2de95510cfcc 100644 --- a/sdk/src/Services/CleanRoomsML/Generated/Model/Internal/MarshallTransformations/GetTrainedModelResponseUnmarshaller.cs +++ b/sdk/src/Services/CleanRoomsML/Generated/Model/Internal/MarshallTransformations/GetTrainedModelResponseUnmarshaller.cs @@ -66,7 +66,7 @@ public override AmazonWebServiceResponse Unmarshall(JsonUnmarshallerContext cont } if (context.TestExpression("createTime", targetDepth)) { - var unmarshaller = DateTimeUnmarshaller.Instance; + var unmarshaller = NullableDateTimeUnmarshaller.Instance; response.CreateTime = unmarshaller.Unmarshall(context); continue; } @@ -180,7 +180,7 @@ public override AmazonWebServiceResponse Unmarshall(JsonUnmarshallerContext cont } if (context.TestExpression("updateTime", targetDepth)) { - var unmarshaller = DateTimeUnmarshaller.Instance; + var unmarshaller = NullableDateTimeUnmarshaller.Instance; response.UpdateTime = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/CleanRoomsML/Generated/Model/Internal/MarshallTransformations/InferenceContainerExecutionParametersMarshaller.cs b/sdk/src/Services/CleanRoomsML/Generated/Model/Internal/MarshallTransformations/InferenceContainerExecutionParametersMarshaller.cs index 088a4b46915c..857a5bd92c13 100644 --- a/sdk/src/Services/CleanRoomsML/Generated/Model/Internal/MarshallTransformations/InferenceContainerExecutionParametersMarshaller.cs +++ b/sdk/src/Services/CleanRoomsML/Generated/Model/Internal/MarshallTransformations/InferenceContainerExecutionParametersMarshaller.cs @@ -51,7 +51,7 @@ public void Marshall(InferenceContainerExecutionParameters requestObject, JsonMa if(requestObject.IsSetMaxPayloadInMB()) { context.Writer.WritePropertyName("maxPayloadInMB"); - context.Writer.Write(requestObject.MaxPayloadInMB); + context.Writer.Write(requestObject.MaxPayloadInMB.Value); } } diff --git a/sdk/src/Services/CleanRoomsML/Generated/Model/Internal/MarshallTransformations/InferenceContainerExecutionParametersUnmarshaller.cs b/sdk/src/Services/CleanRoomsML/Generated/Model/Internal/MarshallTransformations/InferenceContainerExecutionParametersUnmarshaller.cs index 7cb9d819358d..359fc2d9f468 100644 --- a/sdk/src/Services/CleanRoomsML/Generated/Model/Internal/MarshallTransformations/InferenceContainerExecutionParametersUnmarshaller.cs +++ b/sdk/src/Services/CleanRoomsML/Generated/Model/Internal/MarshallTransformations/InferenceContainerExecutionParametersUnmarshaller.cs @@ -68,7 +68,7 @@ public InferenceContainerExecutionParameters Unmarshall(JsonUnmarshallerContext { if (context.TestExpression("maxPayloadInMB", targetDepth)) { - var unmarshaller = IntUnmarshaller.Instance; + var unmarshaller = NullableIntUnmarshaller.Instance; unmarshalledObject.MaxPayloadInMB = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/CleanRoomsML/Generated/Model/Internal/MarshallTransformations/InferenceResourceConfigMarshaller.cs b/sdk/src/Services/CleanRoomsML/Generated/Model/Internal/MarshallTransformations/InferenceResourceConfigMarshaller.cs index 6378b85f7efd..5b8f0fa7b1b5 100644 --- a/sdk/src/Services/CleanRoomsML/Generated/Model/Internal/MarshallTransformations/InferenceResourceConfigMarshaller.cs +++ b/sdk/src/Services/CleanRoomsML/Generated/Model/Internal/MarshallTransformations/InferenceResourceConfigMarshaller.cs @@ -51,7 +51,7 @@ public void Marshall(InferenceResourceConfig requestObject, JsonMarshallerContex if(requestObject.IsSetInstanceCount()) { context.Writer.WritePropertyName("instanceCount"); - context.Writer.Write(requestObject.InstanceCount); + context.Writer.Write(requestObject.InstanceCount.Value); } if(requestObject.IsSetInstanceType()) diff --git a/sdk/src/Services/CleanRoomsML/Generated/Model/Internal/MarshallTransformations/InferenceResourceConfigUnmarshaller.cs b/sdk/src/Services/CleanRoomsML/Generated/Model/Internal/MarshallTransformations/InferenceResourceConfigUnmarshaller.cs index f4beb04d010a..bafee92497f2 100644 --- a/sdk/src/Services/CleanRoomsML/Generated/Model/Internal/MarshallTransformations/InferenceResourceConfigUnmarshaller.cs +++ b/sdk/src/Services/CleanRoomsML/Generated/Model/Internal/MarshallTransformations/InferenceResourceConfigUnmarshaller.cs @@ -68,7 +68,7 @@ public InferenceResourceConfig Unmarshall(JsonUnmarshallerContext context) { if (context.TestExpression("instanceCount", targetDepth)) { - var unmarshaller = IntUnmarshaller.Instance; + var unmarshaller = NullableIntUnmarshaller.Instance; unmarshalledObject.InstanceCount = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/CleanRoomsML/Generated/Model/Internal/MarshallTransformations/MLInputChannelSummaryUnmarshaller.cs b/sdk/src/Services/CleanRoomsML/Generated/Model/Internal/MarshallTransformations/MLInputChannelSummaryUnmarshaller.cs index 057a8fcc468f..cfeb9ff0734a 100644 --- a/sdk/src/Services/CleanRoomsML/Generated/Model/Internal/MarshallTransformations/MLInputChannelSummaryUnmarshaller.cs +++ b/sdk/src/Services/CleanRoomsML/Generated/Model/Internal/MarshallTransformations/MLInputChannelSummaryUnmarshaller.cs @@ -80,7 +80,7 @@ public MLInputChannelSummary Unmarshall(JsonUnmarshallerContext context) } if (context.TestExpression("createTime", targetDepth)) { - var unmarshaller = DateTimeUnmarshaller.Instance; + var unmarshaller = NullableDateTimeUnmarshaller.Instance; unmarshalledObject.CreateTime = unmarshaller.Unmarshall(context); continue; } @@ -122,7 +122,7 @@ public MLInputChannelSummary Unmarshall(JsonUnmarshallerContext context) } if (context.TestExpression("updateTime", targetDepth)) { - var unmarshaller = DateTimeUnmarshaller.Instance; + var unmarshaller = NullableDateTimeUnmarshaller.Instance; unmarshalledObject.UpdateTime = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/CleanRoomsML/Generated/Model/Internal/MarshallTransformations/PutMLConfigurationRequestMarshaller.cs b/sdk/src/Services/CleanRoomsML/Generated/Model/Internal/MarshallTransformations/PutMLConfigurationRequestMarshaller.cs index b1705ed0d9b1..3e0b844b9b5a 100644 --- a/sdk/src/Services/CleanRoomsML/Generated/Model/Internal/MarshallTransformations/PutMLConfigurationRequestMarshaller.cs +++ b/sdk/src/Services/CleanRoomsML/Generated/Model/Internal/MarshallTransformations/PutMLConfigurationRequestMarshaller.cs @@ -64,26 +64,29 @@ public IRequest Marshall(PutMLConfigurationRequest publicRequest) throw new AmazonCleanRoomsMLException("Request object does not have required field MembershipIdentifier set"); request.AddPathResource("{membershipIdentifier}", StringUtils.FromString(publicRequest.MembershipIdentifier)); request.ResourcePath = "/memberships/{membershipIdentifier}/ml-configurations"; - using (StringWriter stringWriter = new StringWriter(CultureInfo.InvariantCulture)) + using (MemoryStream memoryStream = new MemoryStream()) { - JsonWriter writer = new JsonWriter(stringWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetDefaultOutputLocation()) + using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) { - context.Writer.WritePropertyName("defaultOutputLocation"); - context.Writer.WriteObjectStart(); + JsonWriter writer = new JsonWriter(streamWriter); + writer.Validate = false; + writer.WriteObjectStart(); + var context = new JsonMarshallerContext(request, writer); + if(publicRequest.IsSetDefaultOutputLocation()) + { + context.Writer.WritePropertyName("defaultOutputLocation"); + context.Writer.WriteObjectStart(); - var marshaller = MLOutputConfigurationMarshaller.Instance; - marshaller.Marshall(publicRequest.DefaultOutputLocation, context); + var marshaller = MLOutputConfigurationMarshaller.Instance; + marshaller.Marshall(publicRequest.DefaultOutputLocation, context); - context.Writer.WriteObjectEnd(); + context.Writer.WriteObjectEnd(); + } + + writer.WriteObjectEnd(); } - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); + request.Content = memoryStream.ToArray(); } diff --git a/sdk/src/Services/CleanRoomsML/Generated/Model/Internal/MarshallTransformations/ResourceConfigMarshaller.cs b/sdk/src/Services/CleanRoomsML/Generated/Model/Internal/MarshallTransformations/ResourceConfigMarshaller.cs index 35e575e50211..9f3a4d670564 100644 --- a/sdk/src/Services/CleanRoomsML/Generated/Model/Internal/MarshallTransformations/ResourceConfigMarshaller.cs +++ b/sdk/src/Services/CleanRoomsML/Generated/Model/Internal/MarshallTransformations/ResourceConfigMarshaller.cs @@ -51,7 +51,7 @@ public void Marshall(ResourceConfig requestObject, JsonMarshallerContext context if(requestObject.IsSetInstanceCount()) { context.Writer.WritePropertyName("instanceCount"); - context.Writer.Write(requestObject.InstanceCount); + context.Writer.Write(requestObject.InstanceCount.Value); } if(requestObject.IsSetInstanceType()) @@ -63,7 +63,7 @@ public void Marshall(ResourceConfig requestObject, JsonMarshallerContext context if(requestObject.IsSetVolumeSizeInGB()) { context.Writer.WritePropertyName("volumeSizeInGB"); - context.Writer.Write(requestObject.VolumeSizeInGB); + context.Writer.Write(requestObject.VolumeSizeInGB.Value); } } diff --git a/sdk/src/Services/CleanRoomsML/Generated/Model/Internal/MarshallTransformations/ResourceConfigUnmarshaller.cs b/sdk/src/Services/CleanRoomsML/Generated/Model/Internal/MarshallTransformations/ResourceConfigUnmarshaller.cs index 1174c96fbea9..3a7fd70819d9 100644 --- a/sdk/src/Services/CleanRoomsML/Generated/Model/Internal/MarshallTransformations/ResourceConfigUnmarshaller.cs +++ b/sdk/src/Services/CleanRoomsML/Generated/Model/Internal/MarshallTransformations/ResourceConfigUnmarshaller.cs @@ -68,7 +68,7 @@ public ResourceConfig Unmarshall(JsonUnmarshallerContext context) { if (context.TestExpression("instanceCount", targetDepth)) { - var unmarshaller = IntUnmarshaller.Instance; + var unmarshaller = NullableIntUnmarshaller.Instance; unmarshalledObject.InstanceCount = unmarshaller.Unmarshall(context); continue; } @@ -80,7 +80,7 @@ public ResourceConfig Unmarshall(JsonUnmarshallerContext context) } if (context.TestExpression("volumeSizeInGB", targetDepth)) { - var unmarshaller = IntUnmarshaller.Instance; + var unmarshaller = NullableIntUnmarshaller.Instance; unmarshalledObject.VolumeSizeInGB = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/CleanRoomsML/Generated/Model/Internal/MarshallTransformations/StartTrainedModelExportJobRequestMarshaller.cs b/sdk/src/Services/CleanRoomsML/Generated/Model/Internal/MarshallTransformations/StartTrainedModelExportJobRequestMarshaller.cs index 558b3ed3c3fc..3ba54adde681 100644 --- a/sdk/src/Services/CleanRoomsML/Generated/Model/Internal/MarshallTransformations/StartTrainedModelExportJobRequestMarshaller.cs +++ b/sdk/src/Services/CleanRoomsML/Generated/Model/Internal/MarshallTransformations/StartTrainedModelExportJobRequestMarshaller.cs @@ -67,38 +67,41 @@ public IRequest Marshall(StartTrainedModelExportJobRequest publicRequest) throw new AmazonCleanRoomsMLException("Request object does not have required field TrainedModelArn set"); request.AddPathResource("{trainedModelArn}", StringUtils.FromString(publicRequest.TrainedModelArn)); request.ResourcePath = "/memberships/{membershipIdentifier}/trained-models/{trainedModelArn}/export-jobs"; - using (StringWriter stringWriter = new StringWriter(CultureInfo.InvariantCulture)) + using (MemoryStream memoryStream = new MemoryStream()) { - JsonWriter writer = new JsonWriter(stringWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetDescription()) + using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) { - context.Writer.WritePropertyName("description"); - context.Writer.Write(publicRequest.Description); - } + JsonWriter writer = new JsonWriter(streamWriter); + writer.Validate = false; + writer.WriteObjectStart(); + var context = new JsonMarshallerContext(request, writer); + if(publicRequest.IsSetDescription()) + { + context.Writer.WritePropertyName("description"); + context.Writer.Write(publicRequest.Description); + } - if(publicRequest.IsSetName()) - { - context.Writer.WritePropertyName("name"); - context.Writer.Write(publicRequest.Name); - } + if(publicRequest.IsSetName()) + { + context.Writer.WritePropertyName("name"); + context.Writer.Write(publicRequest.Name); + } - if(publicRequest.IsSetOutputConfiguration()) - { - context.Writer.WritePropertyName("outputConfiguration"); - context.Writer.WriteObjectStart(); + if(publicRequest.IsSetOutputConfiguration()) + { + context.Writer.WritePropertyName("outputConfiguration"); + context.Writer.WriteObjectStart(); + + var marshaller = TrainedModelExportOutputConfigurationMarshaller.Instance; + marshaller.Marshall(publicRequest.OutputConfiguration, context); - var marshaller = TrainedModelExportOutputConfigurationMarshaller.Instance; - marshaller.Marshall(publicRequest.OutputConfiguration, context); + context.Writer.WriteObjectEnd(); + } - context.Writer.WriteObjectEnd(); + writer.WriteObjectEnd(); } - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); + request.Content = memoryStream.ToArray(); } diff --git a/sdk/src/Services/CleanRoomsML/Generated/Model/Internal/MarshallTransformations/StartTrainedModelInferenceJobRequestMarshaller.cs b/sdk/src/Services/CleanRoomsML/Generated/Model/Internal/MarshallTransformations/StartTrainedModelInferenceJobRequestMarshaller.cs index 12979a4cd593..9a74ab19691d 100644 --- a/sdk/src/Services/CleanRoomsML/Generated/Model/Internal/MarshallTransformations/StartTrainedModelInferenceJobRequestMarshaller.cs +++ b/sdk/src/Services/CleanRoomsML/Generated/Model/Internal/MarshallTransformations/StartTrainedModelInferenceJobRequestMarshaller.cs @@ -64,117 +64,120 @@ public IRequest Marshall(StartTrainedModelInferenceJobRequest publicRequest) throw new AmazonCleanRoomsMLException("Request object does not have required field MembershipIdentifier set"); request.AddPathResource("{membershipIdentifier}", StringUtils.FromString(publicRequest.MembershipIdentifier)); request.ResourcePath = "/memberships/{membershipIdentifier}/trained-model-inference-jobs"; - using (StringWriter stringWriter = new StringWriter(CultureInfo.InvariantCulture)) + using (MemoryStream memoryStream = new MemoryStream()) { - JsonWriter writer = new JsonWriter(stringWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetConfiguredModelAlgorithmAssociationArn()) + using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) { - context.Writer.WritePropertyName("configuredModelAlgorithmAssociationArn"); - context.Writer.Write(publicRequest.ConfiguredModelAlgorithmAssociationArn); - } - - if(publicRequest.IsSetContainerExecutionParameters()) - { - context.Writer.WritePropertyName("containerExecutionParameters"); - context.Writer.WriteObjectStart(); + JsonWriter writer = new JsonWriter(streamWriter); + writer.Validate = false; + writer.WriteObjectStart(); + var context = new JsonMarshallerContext(request, writer); + if(publicRequest.IsSetConfiguredModelAlgorithmAssociationArn()) + { + context.Writer.WritePropertyName("configuredModelAlgorithmAssociationArn"); + context.Writer.Write(publicRequest.ConfiguredModelAlgorithmAssociationArn); + } - var marshaller = InferenceContainerExecutionParametersMarshaller.Instance; - marshaller.Marshall(publicRequest.ContainerExecutionParameters, context); + if(publicRequest.IsSetContainerExecutionParameters()) + { + context.Writer.WritePropertyName("containerExecutionParameters"); + context.Writer.WriteObjectStart(); - context.Writer.WriteObjectEnd(); - } + var marshaller = InferenceContainerExecutionParametersMarshaller.Instance; + marshaller.Marshall(publicRequest.ContainerExecutionParameters, context); - if(publicRequest.IsSetDataSource()) - { - context.Writer.WritePropertyName("dataSource"); - context.Writer.WriteObjectStart(); + context.Writer.WriteObjectEnd(); + } - var marshaller = ModelInferenceDataSourceMarshaller.Instance; - marshaller.Marshall(publicRequest.DataSource, context); + if(publicRequest.IsSetDataSource()) + { + context.Writer.WritePropertyName("dataSource"); + context.Writer.WriteObjectStart(); - context.Writer.WriteObjectEnd(); - } + var marshaller = ModelInferenceDataSourceMarshaller.Instance; + marshaller.Marshall(publicRequest.DataSource, context); - if(publicRequest.IsSetDescription()) - { - context.Writer.WritePropertyName("description"); - context.Writer.Write(publicRequest.Description); - } + context.Writer.WriteObjectEnd(); + } - if(publicRequest.IsSetEnvironment()) - { - context.Writer.WritePropertyName("environment"); - context.Writer.WriteObjectStart(); - foreach (var publicRequestEnvironmentKvp in publicRequest.Environment) + if(publicRequest.IsSetDescription()) { - context.Writer.WritePropertyName(publicRequestEnvironmentKvp.Key); - var publicRequestEnvironmentValue = publicRequestEnvironmentKvp.Value; + context.Writer.WritePropertyName("description"); + context.Writer.Write(publicRequest.Description); + } - context.Writer.Write(publicRequestEnvironmentValue); + if(publicRequest.IsSetEnvironment()) + { + context.Writer.WritePropertyName("environment"); + context.Writer.WriteObjectStart(); + foreach (var publicRequestEnvironmentKvp in publicRequest.Environment) + { + context.Writer.WritePropertyName(publicRequestEnvironmentKvp.Key); + var publicRequestEnvironmentValue = publicRequestEnvironmentKvp.Value; + + context.Writer.Write(publicRequestEnvironmentValue); + } + context.Writer.WriteObjectEnd(); } - context.Writer.WriteObjectEnd(); - } - if(publicRequest.IsSetKmsKeyArn()) - { - context.Writer.WritePropertyName("kmsKeyArn"); - context.Writer.Write(publicRequest.KmsKeyArn); - } + if(publicRequest.IsSetKmsKeyArn()) + { + context.Writer.WritePropertyName("kmsKeyArn"); + context.Writer.Write(publicRequest.KmsKeyArn); + } - if(publicRequest.IsSetName()) - { - context.Writer.WritePropertyName("name"); - context.Writer.Write(publicRequest.Name); - } + if(publicRequest.IsSetName()) + { + context.Writer.WritePropertyName("name"); + context.Writer.Write(publicRequest.Name); + } - if(publicRequest.IsSetOutputConfiguration()) - { - context.Writer.WritePropertyName("outputConfiguration"); - context.Writer.WriteObjectStart(); + if(publicRequest.IsSetOutputConfiguration()) + { + context.Writer.WritePropertyName("outputConfiguration"); + context.Writer.WriteObjectStart(); - var marshaller = InferenceOutputConfigurationMarshaller.Instance; - marshaller.Marshall(publicRequest.OutputConfiguration, context); + var marshaller = InferenceOutputConfigurationMarshaller.Instance; + marshaller.Marshall(publicRequest.OutputConfiguration, context); - context.Writer.WriteObjectEnd(); - } + context.Writer.WriteObjectEnd(); + } - if(publicRequest.IsSetResourceConfig()) - { - context.Writer.WritePropertyName("resourceConfig"); - context.Writer.WriteObjectStart(); + if(publicRequest.IsSetResourceConfig()) + { + context.Writer.WritePropertyName("resourceConfig"); + context.Writer.WriteObjectStart(); - var marshaller = InferenceResourceConfigMarshaller.Instance; - marshaller.Marshall(publicRequest.ResourceConfig, context); + var marshaller = InferenceResourceConfigMarshaller.Instance; + marshaller.Marshall(publicRequest.ResourceConfig, context); - context.Writer.WriteObjectEnd(); - } + context.Writer.WriteObjectEnd(); + } - if(publicRequest.IsSetTags()) - { - context.Writer.WritePropertyName("tags"); - context.Writer.WriteObjectStart(); - foreach (var publicRequestTagsKvp in publicRequest.Tags) + if(publicRequest.IsSetTags()) { - context.Writer.WritePropertyName(publicRequestTagsKvp.Key); - var publicRequestTagsValue = publicRequestTagsKvp.Value; + context.Writer.WritePropertyName("tags"); + context.Writer.WriteObjectStart(); + foreach (var publicRequestTagsKvp in publicRequest.Tags) + { + context.Writer.WritePropertyName(publicRequestTagsKvp.Key); + var publicRequestTagsValue = publicRequestTagsKvp.Value; + + context.Writer.Write(publicRequestTagsValue); + } + context.Writer.WriteObjectEnd(); + } - context.Writer.Write(publicRequestTagsValue); + if(publicRequest.IsSetTrainedModelArn()) + { + context.Writer.WritePropertyName("trainedModelArn"); + context.Writer.Write(publicRequest.TrainedModelArn); } - context.Writer.WriteObjectEnd(); - } - if(publicRequest.IsSetTrainedModelArn()) - { - context.Writer.WritePropertyName("trainedModelArn"); - context.Writer.Write(publicRequest.TrainedModelArn); + writer.WriteObjectEnd(); } - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); + request.Content = memoryStream.ToArray(); } diff --git a/sdk/src/Services/CleanRoomsML/Generated/Model/Internal/MarshallTransformations/StoppingConditionMarshaller.cs b/sdk/src/Services/CleanRoomsML/Generated/Model/Internal/MarshallTransformations/StoppingConditionMarshaller.cs index 2451bc5bb19d..519a7b287373 100644 --- a/sdk/src/Services/CleanRoomsML/Generated/Model/Internal/MarshallTransformations/StoppingConditionMarshaller.cs +++ b/sdk/src/Services/CleanRoomsML/Generated/Model/Internal/MarshallTransformations/StoppingConditionMarshaller.cs @@ -51,7 +51,7 @@ public void Marshall(StoppingCondition requestObject, JsonMarshallerContext cont if(requestObject.IsSetMaxRuntimeInSeconds()) { context.Writer.WritePropertyName("maxRuntimeInSeconds"); - context.Writer.Write(requestObject.MaxRuntimeInSeconds); + context.Writer.Write(requestObject.MaxRuntimeInSeconds.Value); } } diff --git a/sdk/src/Services/CleanRoomsML/Generated/Model/Internal/MarshallTransformations/StoppingConditionUnmarshaller.cs b/sdk/src/Services/CleanRoomsML/Generated/Model/Internal/MarshallTransformations/StoppingConditionUnmarshaller.cs index 53c4df786406..a0d493bac074 100644 --- a/sdk/src/Services/CleanRoomsML/Generated/Model/Internal/MarshallTransformations/StoppingConditionUnmarshaller.cs +++ b/sdk/src/Services/CleanRoomsML/Generated/Model/Internal/MarshallTransformations/StoppingConditionUnmarshaller.cs @@ -68,7 +68,7 @@ public StoppingCondition Unmarshall(JsonUnmarshallerContext context) { if (context.TestExpression("maxRuntimeInSeconds", targetDepth)) { - var unmarshaller = IntUnmarshaller.Instance; + var unmarshaller = NullableIntUnmarshaller.Instance; unmarshalledObject.MaxRuntimeInSeconds = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/CleanRoomsML/Generated/Model/Internal/MarshallTransformations/TrainedModelExportsMaxSizeMarshaller.cs b/sdk/src/Services/CleanRoomsML/Generated/Model/Internal/MarshallTransformations/TrainedModelExportsMaxSizeMarshaller.cs index 357ea62b0b58..50814366533d 100644 --- a/sdk/src/Services/CleanRoomsML/Generated/Model/Internal/MarshallTransformations/TrainedModelExportsMaxSizeMarshaller.cs +++ b/sdk/src/Services/CleanRoomsML/Generated/Model/Internal/MarshallTransformations/TrainedModelExportsMaxSizeMarshaller.cs @@ -57,13 +57,13 @@ public void Marshall(TrainedModelExportsMaxSize requestObject, JsonMarshallerCon if(requestObject.IsSetValue()) { context.Writer.WritePropertyName("value"); - if(StringUtils.IsSpecialDoubleValue(requestObject.Value)) + if(StringUtils.IsSpecialDoubleValue(requestObject.Value.Value)) { - context.Writer.Write(StringUtils.FromSpecialDoubleValue(requestObject.Value)); + context.Writer.Write(StringUtils.FromSpecialDoubleValue(requestObject.Value.Value)); } else { - context.Writer.Write(requestObject.Value); + context.Writer.Write(requestObject.Value.Value); } } diff --git a/sdk/src/Services/CleanRoomsML/Generated/Model/Internal/MarshallTransformations/TrainedModelExportsMaxSizeUnmarshaller.cs b/sdk/src/Services/CleanRoomsML/Generated/Model/Internal/MarshallTransformations/TrainedModelExportsMaxSizeUnmarshaller.cs index 5eb88d54e7c1..3cb8af253c00 100644 --- a/sdk/src/Services/CleanRoomsML/Generated/Model/Internal/MarshallTransformations/TrainedModelExportsMaxSizeUnmarshaller.cs +++ b/sdk/src/Services/CleanRoomsML/Generated/Model/Internal/MarshallTransformations/TrainedModelExportsMaxSizeUnmarshaller.cs @@ -74,7 +74,7 @@ public TrainedModelExportsMaxSize Unmarshall(JsonUnmarshallerContext context) } if (context.TestExpression("value", targetDepth)) { - var unmarshaller = DoubleUnmarshaller.Instance; + var unmarshaller = NullableDoubleUnmarshaller.Instance; unmarshalledObject.Value = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/CleanRoomsML/Generated/Model/Internal/MarshallTransformations/TrainedModelInferenceJobSummaryUnmarshaller.cs b/sdk/src/Services/CleanRoomsML/Generated/Model/Internal/MarshallTransformations/TrainedModelInferenceJobSummaryUnmarshaller.cs index 65649f9d8ea7..dd7337ca6b48 100644 --- a/sdk/src/Services/CleanRoomsML/Generated/Model/Internal/MarshallTransformations/TrainedModelInferenceJobSummaryUnmarshaller.cs +++ b/sdk/src/Services/CleanRoomsML/Generated/Model/Internal/MarshallTransformations/TrainedModelInferenceJobSummaryUnmarshaller.cs @@ -80,7 +80,7 @@ public TrainedModelInferenceJobSummary Unmarshall(JsonUnmarshallerContext contex } if (context.TestExpression("createTime", targetDepth)) { - var unmarshaller = DateTimeUnmarshaller.Instance; + var unmarshaller = NullableDateTimeUnmarshaller.Instance; unmarshalledObject.CreateTime = unmarshaller.Unmarshall(context); continue; } @@ -152,7 +152,7 @@ public TrainedModelInferenceJobSummary Unmarshall(JsonUnmarshallerContext contex } if (context.TestExpression("updateTime", targetDepth)) { - var unmarshaller = DateTimeUnmarshaller.Instance; + var unmarshaller = NullableDateTimeUnmarshaller.Instance; unmarshalledObject.UpdateTime = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/CleanRoomsML/Generated/Model/Internal/MarshallTransformations/TrainedModelInferenceMaxOutputSizeMarshaller.cs b/sdk/src/Services/CleanRoomsML/Generated/Model/Internal/MarshallTransformations/TrainedModelInferenceMaxOutputSizeMarshaller.cs index 3078bb1e86b3..4feba5b386bd 100644 --- a/sdk/src/Services/CleanRoomsML/Generated/Model/Internal/MarshallTransformations/TrainedModelInferenceMaxOutputSizeMarshaller.cs +++ b/sdk/src/Services/CleanRoomsML/Generated/Model/Internal/MarshallTransformations/TrainedModelInferenceMaxOutputSizeMarshaller.cs @@ -57,13 +57,13 @@ public void Marshall(TrainedModelInferenceMaxOutputSize requestObject, JsonMarsh if(requestObject.IsSetValue()) { context.Writer.WritePropertyName("value"); - if(StringUtils.IsSpecialDoubleValue(requestObject.Value)) + if(StringUtils.IsSpecialDoubleValue(requestObject.Value.Value)) { - context.Writer.Write(StringUtils.FromSpecialDoubleValue(requestObject.Value)); + context.Writer.Write(StringUtils.FromSpecialDoubleValue(requestObject.Value.Value)); } else { - context.Writer.Write(requestObject.Value); + context.Writer.Write(requestObject.Value.Value); } } diff --git a/sdk/src/Services/CleanRoomsML/Generated/Model/Internal/MarshallTransformations/TrainedModelInferenceMaxOutputSizeUnmarshaller.cs b/sdk/src/Services/CleanRoomsML/Generated/Model/Internal/MarshallTransformations/TrainedModelInferenceMaxOutputSizeUnmarshaller.cs index 8a2a39c39f5f..df55aa36178b 100644 --- a/sdk/src/Services/CleanRoomsML/Generated/Model/Internal/MarshallTransformations/TrainedModelInferenceMaxOutputSizeUnmarshaller.cs +++ b/sdk/src/Services/CleanRoomsML/Generated/Model/Internal/MarshallTransformations/TrainedModelInferenceMaxOutputSizeUnmarshaller.cs @@ -74,7 +74,7 @@ public TrainedModelInferenceMaxOutputSize Unmarshall(JsonUnmarshallerContext con } if (context.TestExpression("value", targetDepth)) { - var unmarshaller = DoubleUnmarshaller.Instance; + var unmarshaller = NullableDoubleUnmarshaller.Instance; unmarshalledObject.Value = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/CleanRoomsML/Generated/Model/Internal/MarshallTransformations/TrainedModelSummaryUnmarshaller.cs b/sdk/src/Services/CleanRoomsML/Generated/Model/Internal/MarshallTransformations/TrainedModelSummaryUnmarshaller.cs index e5eb6ffd8c59..e9e2108b10eb 100644 --- a/sdk/src/Services/CleanRoomsML/Generated/Model/Internal/MarshallTransformations/TrainedModelSummaryUnmarshaller.cs +++ b/sdk/src/Services/CleanRoomsML/Generated/Model/Internal/MarshallTransformations/TrainedModelSummaryUnmarshaller.cs @@ -80,7 +80,7 @@ public TrainedModelSummary Unmarshall(JsonUnmarshallerContext context) } if (context.TestExpression("createTime", targetDepth)) { - var unmarshaller = DateTimeUnmarshaller.Instance; + var unmarshaller = NullableDateTimeUnmarshaller.Instance; unmarshalledObject.CreateTime = unmarshaller.Unmarshall(context); continue; } @@ -116,7 +116,7 @@ public TrainedModelSummary Unmarshall(JsonUnmarshallerContext context) } if (context.TestExpression("updateTime", targetDepth)) { - var unmarshaller = DateTimeUnmarshaller.Instance; + var unmarshaller = NullableDateTimeUnmarshaller.Instance; unmarshalledObject.UpdateTime = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/CleanRoomsML/Generated/Model/Internal/MarshallTransformations/WorkerComputeConfigurationMarshaller.cs b/sdk/src/Services/CleanRoomsML/Generated/Model/Internal/MarshallTransformations/WorkerComputeConfigurationMarshaller.cs index 5422bf0ab46d..60fdef808a7c 100644 --- a/sdk/src/Services/CleanRoomsML/Generated/Model/Internal/MarshallTransformations/WorkerComputeConfigurationMarshaller.cs +++ b/sdk/src/Services/CleanRoomsML/Generated/Model/Internal/MarshallTransformations/WorkerComputeConfigurationMarshaller.cs @@ -51,7 +51,7 @@ public void Marshall(WorkerComputeConfiguration requestObject, JsonMarshallerCon if(requestObject.IsSetNumber()) { context.Writer.WritePropertyName("number"); - context.Writer.Write(requestObject.Number); + context.Writer.Write(requestObject.Number.Value); } if(requestObject.IsSetType()) diff --git a/sdk/src/Services/CleanRoomsML/Generated/Model/Internal/MarshallTransformations/WorkerComputeConfigurationUnmarshaller.cs b/sdk/src/Services/CleanRoomsML/Generated/Model/Internal/MarshallTransformations/WorkerComputeConfigurationUnmarshaller.cs index 5268e4d5332e..60e9b5a66a48 100644 --- a/sdk/src/Services/CleanRoomsML/Generated/Model/Internal/MarshallTransformations/WorkerComputeConfigurationUnmarshaller.cs +++ b/sdk/src/Services/CleanRoomsML/Generated/Model/Internal/MarshallTransformations/WorkerComputeConfigurationUnmarshaller.cs @@ -68,7 +68,7 @@ public WorkerComputeConfiguration Unmarshall(JsonUnmarshallerContext context) { if (context.TestExpression("number", targetDepth)) { - var unmarshaller = IntUnmarshaller.Instance; + var unmarshaller = NullableIntUnmarshaller.Instance; unmarshalledObject.Number = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/CleanRoomsML/Generated/Model/ListCollaborationConfiguredModelAlgorithmAssociationsRequest.cs b/sdk/src/Services/CleanRoomsML/Generated/Model/ListCollaborationConfiguredModelAlgorithmAssociationsRequest.cs index 084437d72ec7..1970f55537ee 100644 --- a/sdk/src/Services/CleanRoomsML/Generated/Model/ListCollaborationConfiguredModelAlgorithmAssociationsRequest.cs +++ b/sdk/src/Services/CleanRoomsML/Generated/Model/ListCollaborationConfiguredModelAlgorithmAssociationsRequest.cs @@ -66,9 +66,9 @@ internal bool IsSetCollaborationIdentifier() /// /// [AWSProperty(Min=1, Max=100)] - public int MaxResults + public int? MaxResults { - get { return this._maxResults.GetValueOrDefault(); } + get { return this._maxResults; } set { this._maxResults = value; } } diff --git a/sdk/src/Services/CleanRoomsML/Generated/Model/ListCollaborationMLInputChannelsRequest.cs b/sdk/src/Services/CleanRoomsML/Generated/Model/ListCollaborationMLInputChannelsRequest.cs index b17640758736..de5b6334604f 100644 --- a/sdk/src/Services/CleanRoomsML/Generated/Model/ListCollaborationMLInputChannelsRequest.cs +++ b/sdk/src/Services/CleanRoomsML/Generated/Model/ListCollaborationMLInputChannelsRequest.cs @@ -66,9 +66,9 @@ internal bool IsSetCollaborationIdentifier() /// /// [AWSProperty(Min=1, Max=100)] - public int MaxResults + public int? MaxResults { - get { return this._maxResults.GetValueOrDefault(); } + get { return this._maxResults; } set { this._maxResults = value; } } diff --git a/sdk/src/Services/CleanRoomsML/Generated/Model/ListCollaborationTrainedModelExportJobsRequest.cs b/sdk/src/Services/CleanRoomsML/Generated/Model/ListCollaborationTrainedModelExportJobsRequest.cs index d57ceeeea1c9..0e4160cd8a6b 100644 --- a/sdk/src/Services/CleanRoomsML/Generated/Model/ListCollaborationTrainedModelExportJobsRequest.cs +++ b/sdk/src/Services/CleanRoomsML/Generated/Model/ListCollaborationTrainedModelExportJobsRequest.cs @@ -67,9 +67,9 @@ internal bool IsSetCollaborationIdentifier() /// /// [AWSProperty(Min=1, Max=100)] - public int MaxResults + public int? MaxResults { - get { return this._maxResults.GetValueOrDefault(); } + get { return this._maxResults; } set { this._maxResults = value; } } diff --git a/sdk/src/Services/CleanRoomsML/Generated/Model/ListCollaborationTrainedModelInferenceJobsRequest.cs b/sdk/src/Services/CleanRoomsML/Generated/Model/ListCollaborationTrainedModelInferenceJobsRequest.cs index ca7f709c0a4c..4004d8f7af7d 100644 --- a/sdk/src/Services/CleanRoomsML/Generated/Model/ListCollaborationTrainedModelInferenceJobsRequest.cs +++ b/sdk/src/Services/CleanRoomsML/Generated/Model/ListCollaborationTrainedModelInferenceJobsRequest.cs @@ -67,9 +67,9 @@ internal bool IsSetCollaborationIdentifier() /// /// [AWSProperty(Min=1, Max=100)] - public int MaxResults + public int? MaxResults { - get { return this._maxResults.GetValueOrDefault(); } + get { return this._maxResults; } set { this._maxResults = value; } } diff --git a/sdk/src/Services/CleanRoomsML/Generated/Model/ListCollaborationTrainedModelsRequest.cs b/sdk/src/Services/CleanRoomsML/Generated/Model/ListCollaborationTrainedModelsRequest.cs index 899474055412..c21db08f5db5 100644 --- a/sdk/src/Services/CleanRoomsML/Generated/Model/ListCollaborationTrainedModelsRequest.cs +++ b/sdk/src/Services/CleanRoomsML/Generated/Model/ListCollaborationTrainedModelsRequest.cs @@ -66,9 +66,9 @@ internal bool IsSetCollaborationIdentifier() /// /// [AWSProperty(Min=1, Max=100)] - public int MaxResults + public int? MaxResults { - get { return this._maxResults.GetValueOrDefault(); } + get { return this._maxResults; } set { this._maxResults = value; } } diff --git a/sdk/src/Services/CleanRoomsML/Generated/Model/ListConfiguredModelAlgorithmAssociationsRequest.cs b/sdk/src/Services/CleanRoomsML/Generated/Model/ListConfiguredModelAlgorithmAssociationsRequest.cs index 33f84dd36c84..277a23732037 100644 --- a/sdk/src/Services/CleanRoomsML/Generated/Model/ListConfiguredModelAlgorithmAssociationsRequest.cs +++ b/sdk/src/Services/CleanRoomsML/Generated/Model/ListConfiguredModelAlgorithmAssociationsRequest.cs @@ -46,9 +46,9 @@ public partial class ListConfiguredModelAlgorithmAssociationsRequest : AmazonCle /// /// [AWSProperty(Min=1, Max=100)] - public int MaxResults + public int? MaxResults { - get { return this._maxResults.GetValueOrDefault(); } + get { return this._maxResults; } set { this._maxResults = value; } } diff --git a/sdk/src/Services/CleanRoomsML/Generated/Model/ListConfiguredModelAlgorithmsRequest.cs b/sdk/src/Services/CleanRoomsML/Generated/Model/ListConfiguredModelAlgorithmsRequest.cs index dad7fd367a2f..9d55395b4ef4 100644 --- a/sdk/src/Services/CleanRoomsML/Generated/Model/ListConfiguredModelAlgorithmsRequest.cs +++ b/sdk/src/Services/CleanRoomsML/Generated/Model/ListConfiguredModelAlgorithmsRequest.cs @@ -45,9 +45,9 @@ public partial class ListConfiguredModelAlgorithmsRequest : AmazonCleanRoomsMLRe /// /// [AWSProperty(Min=1, Max=100)] - public int MaxResults + public int? MaxResults { - get { return this._maxResults.GetValueOrDefault(); } + get { return this._maxResults; } set { this._maxResults = value; } } diff --git a/sdk/src/Services/CleanRoomsML/Generated/Model/ListMLInputChannelsRequest.cs b/sdk/src/Services/CleanRoomsML/Generated/Model/ListMLInputChannelsRequest.cs index 5729d8d49ffc..70850ca34e4a 100644 --- a/sdk/src/Services/CleanRoomsML/Generated/Model/ListMLInputChannelsRequest.cs +++ b/sdk/src/Services/CleanRoomsML/Generated/Model/ListMLInputChannelsRequest.cs @@ -46,9 +46,9 @@ public partial class ListMLInputChannelsRequest : AmazonCleanRoomsMLRequest /// /// [AWSProperty(Min=1, Max=100)] - public int MaxResults + public int? MaxResults { - get { return this._maxResults.GetValueOrDefault(); } + get { return this._maxResults; } set { this._maxResults = value; } } diff --git a/sdk/src/Services/CleanRoomsML/Generated/Model/ListTrainedModelInferenceJobsRequest.cs b/sdk/src/Services/CleanRoomsML/Generated/Model/ListTrainedModelInferenceJobsRequest.cs index 27a0c241c073..90eb1baf0c3f 100644 --- a/sdk/src/Services/CleanRoomsML/Generated/Model/ListTrainedModelInferenceJobsRequest.cs +++ b/sdk/src/Services/CleanRoomsML/Generated/Model/ListTrainedModelInferenceJobsRequest.cs @@ -47,9 +47,9 @@ public partial class ListTrainedModelInferenceJobsRequest : AmazonCleanRoomsMLRe /// /// [AWSProperty(Min=1, Max=100)] - public int MaxResults + public int? MaxResults { - get { return this._maxResults.GetValueOrDefault(); } + get { return this._maxResults; } set { this._maxResults = value; } } diff --git a/sdk/src/Services/CleanRoomsML/Generated/Model/ListTrainedModelsRequest.cs b/sdk/src/Services/CleanRoomsML/Generated/Model/ListTrainedModelsRequest.cs index ebe80c359248..983cf55c09f4 100644 --- a/sdk/src/Services/CleanRoomsML/Generated/Model/ListTrainedModelsRequest.cs +++ b/sdk/src/Services/CleanRoomsML/Generated/Model/ListTrainedModelsRequest.cs @@ -46,9 +46,9 @@ public partial class ListTrainedModelsRequest : AmazonCleanRoomsMLRequest /// /// [AWSProperty(Min=1, Max=100)] - public int MaxResults + public int? MaxResults { - get { return this._maxResults.GetValueOrDefault(); } + get { return this._maxResults; } set { this._maxResults = value; } } diff --git a/sdk/src/Services/CleanRoomsML/Generated/Model/MLInputChannelSummary.cs b/sdk/src/Services/CleanRoomsML/Generated/Model/MLInputChannelSummary.cs index fb25fa787c62..b9f7c30958ae 100644 --- a/sdk/src/Services/CleanRoomsML/Generated/Model/MLInputChannelSummary.cs +++ b/sdk/src/Services/CleanRoomsML/Generated/Model/MLInputChannelSummary.cs @@ -90,9 +90,9 @@ internal bool IsSetConfiguredModelAlgorithmAssociations() /// /// [AWSProperty(Required=true)] - public DateTime CreateTime + public DateTime? CreateTime { - get { return this._createTime.GetValueOrDefault(); } + get { return this._createTime; } set { this._createTime = value; } } @@ -223,9 +223,9 @@ internal bool IsSetStatus() /// /// [AWSProperty(Required=true)] - public DateTime UpdateTime + public DateTime? UpdateTime { - get { return this._updateTime.GetValueOrDefault(); } + get { return this._updateTime; } set { this._updateTime = value; } } diff --git a/sdk/src/Services/CleanRoomsML/Generated/Model/RelevanceMetric.cs b/sdk/src/Services/CleanRoomsML/Generated/Model/RelevanceMetric.cs index e96b6c816e64..05c736ab235b 100644 --- a/sdk/src/Services/CleanRoomsML/Generated/Model/RelevanceMetric.cs +++ b/sdk/src/Services/CleanRoomsML/Generated/Model/RelevanceMetric.cs @@ -59,14 +59,8 @@ internal bool IsSetAudienceSize() /// The relevance score of the generated audience. /// /// -<<<<<<< HEAD - public double? Score -||||||| Commit version number update changes - public double Score -======= [AWSProperty(Min=0, Max=10)] - public double Score ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b + public double? Score { get { return this._score; } set { this._score = value; } diff --git a/sdk/src/Services/CleanRoomsML/Generated/Model/ResourceConfig.cs b/sdk/src/Services/CleanRoomsML/Generated/Model/ResourceConfig.cs index 606b48c22365..074419794c08 100644 --- a/sdk/src/Services/CleanRoomsML/Generated/Model/ResourceConfig.cs +++ b/sdk/src/Services/CleanRoomsML/Generated/Model/ResourceConfig.cs @@ -45,9 +45,9 @@ public partial class ResourceConfig /// /// [AWSProperty(Min=1, Max=1)] - public int InstanceCount + public int? InstanceCount { - get { return this._instanceCount.GetValueOrDefault(); } + get { return this._instanceCount; } set { this._instanceCount = value; } } @@ -83,9 +83,9 @@ internal bool IsSetInstanceType() /// /// [AWSProperty(Required=true, Min=1, Max=8192)] - public int VolumeSizeInGB + public int? VolumeSizeInGB { - get { return this._volumeSizeInGB.GetValueOrDefault(); } + get { return this._volumeSizeInGB; } set { this._volumeSizeInGB = value; } } diff --git a/sdk/src/Services/CleanRoomsML/Generated/Model/StoppingCondition.cs b/sdk/src/Services/CleanRoomsML/Generated/Model/StoppingCondition.cs index bef34363f2d9..48df630abe74 100644 --- a/sdk/src/Services/CleanRoomsML/Generated/Model/StoppingCondition.cs +++ b/sdk/src/Services/CleanRoomsML/Generated/Model/StoppingCondition.cs @@ -43,9 +43,9 @@ public partial class StoppingCondition /// /// [AWSProperty(Min=1, Max=2419200)] - public int MaxRuntimeInSeconds + public int? MaxRuntimeInSeconds { - get { return this._maxRuntimeInSeconds.GetValueOrDefault(); } + get { return this._maxRuntimeInSeconds; } set { this._maxRuntimeInSeconds = value; } } diff --git a/sdk/src/Services/CleanRoomsML/Generated/Model/TrainedModelExportsMaxSize.cs b/sdk/src/Services/CleanRoomsML/Generated/Model/TrainedModelExportsMaxSize.cs index ce2e235cb24e..254ebf99ad6a 100644 --- a/sdk/src/Services/CleanRoomsML/Generated/Model/TrainedModelExportsMaxSize.cs +++ b/sdk/src/Services/CleanRoomsML/Generated/Model/TrainedModelExportsMaxSize.cs @@ -64,9 +64,9 @@ internal bool IsSetUnit() /// /// [AWSProperty(Required=true, Max=10)] - public double Value + public double? Value { - get { return this._value.GetValueOrDefault(); } + get { return this._value; } set { this._value = value; } } diff --git a/sdk/src/Services/CleanRoomsML/Generated/Model/TrainedModelInferenceJobSummary.cs b/sdk/src/Services/CleanRoomsML/Generated/Model/TrainedModelInferenceJobSummary.cs index 9f91f92b8722..fed8ee671756 100644 --- a/sdk/src/Services/CleanRoomsML/Generated/Model/TrainedModelInferenceJobSummary.cs +++ b/sdk/src/Services/CleanRoomsML/Generated/Model/TrainedModelInferenceJobSummary.cs @@ -97,9 +97,9 @@ internal bool IsSetConfiguredModelAlgorithmAssociationArn() /// /// [AWSProperty(Required=true)] - public DateTime CreateTime + public DateTime? CreateTime { - get { return this._createTime.GetValueOrDefault(); } + get { return this._createTime; } set { this._createTime = value; } } @@ -322,9 +322,9 @@ internal bool IsSetTrainedModelInferenceJobArn() /// /// [AWSProperty(Required=true)] - public DateTime UpdateTime + public DateTime? UpdateTime { - get { return this._updateTime.GetValueOrDefault(); } + get { return this._updateTime; } set { this._updateTime = value; } } diff --git a/sdk/src/Services/CleanRoomsML/Generated/Model/TrainedModelInferenceMaxOutputSize.cs b/sdk/src/Services/CleanRoomsML/Generated/Model/TrainedModelInferenceMaxOutputSize.cs index d388089f7790..c4c505d2c423 100644 --- a/sdk/src/Services/CleanRoomsML/Generated/Model/TrainedModelInferenceMaxOutputSize.cs +++ b/sdk/src/Services/CleanRoomsML/Generated/Model/TrainedModelInferenceMaxOutputSize.cs @@ -63,9 +63,9 @@ internal bool IsSetUnit() /// /// [AWSProperty(Required=true, Max=10)] - public double Value + public double? Value { - get { return this._value.GetValueOrDefault(); } + get { return this._value; } set { this._value = value; } } diff --git a/sdk/src/Services/CleanRoomsML/Generated/Model/TrainedModelSummary.cs b/sdk/src/Services/CleanRoomsML/Generated/Model/TrainedModelSummary.cs index 68ded951cd28..6d5f71c1f50e 100644 --- a/sdk/src/Services/CleanRoomsML/Generated/Model/TrainedModelSummary.cs +++ b/sdk/src/Services/CleanRoomsML/Generated/Model/TrainedModelSummary.cs @@ -90,9 +90,9 @@ internal bool IsSetConfiguredModelAlgorithmAssociationArn() /// /// [AWSProperty(Required=true)] - public DateTime CreateTime + public DateTime? CreateTime { - get { return this._createTime.GetValueOrDefault(); } + get { return this._createTime; } set { this._createTime = value; } } @@ -204,9 +204,9 @@ internal bool IsSetTrainedModelArn() /// /// [AWSProperty(Required=true)] - public DateTime UpdateTime + public DateTime? UpdateTime { - get { return this._updateTime.GetValueOrDefault(); } + get { return this._updateTime; } set { this._updateTime = value; } } diff --git a/sdk/src/Services/CleanRoomsML/Generated/Model/WorkerComputeConfiguration.cs b/sdk/src/Services/CleanRoomsML/Generated/Model/WorkerComputeConfiguration.cs index aa134afd0fc5..6e279925fad1 100644 --- a/sdk/src/Services/CleanRoomsML/Generated/Model/WorkerComputeConfiguration.cs +++ b/sdk/src/Services/CleanRoomsML/Generated/Model/WorkerComputeConfiguration.cs @@ -44,9 +44,9 @@ public partial class WorkerComputeConfiguration /// /// [AWSProperty(Min=2, Max=400)] - public int Number + public int? Number { - get { return this._number.GetValueOrDefault(); } + get { return this._number; } set { this._number = value; } } diff --git a/sdk/src/Services/CleanRoomsML/Generated/Model/_bcl45+netstandard/IListCollaborationConfiguredModelAlgorithmAssociationsPaginator.cs b/sdk/src/Services/CleanRoomsML/Generated/Model/_bcl+netstandard/IListCollaborationConfiguredModelAlgorithmAssociationsPaginator.cs similarity index 100% rename from sdk/src/Services/CleanRoomsML/Generated/Model/_bcl45+netstandard/IListCollaborationConfiguredModelAlgorithmAssociationsPaginator.cs rename to sdk/src/Services/CleanRoomsML/Generated/Model/_bcl+netstandard/IListCollaborationConfiguredModelAlgorithmAssociationsPaginator.cs diff --git a/sdk/src/Services/CleanRoomsML/Generated/Model/_bcl45+netstandard/IListCollaborationMLInputChannelsPaginator.cs b/sdk/src/Services/CleanRoomsML/Generated/Model/_bcl+netstandard/IListCollaborationMLInputChannelsPaginator.cs similarity index 100% rename from sdk/src/Services/CleanRoomsML/Generated/Model/_bcl45+netstandard/IListCollaborationMLInputChannelsPaginator.cs rename to sdk/src/Services/CleanRoomsML/Generated/Model/_bcl+netstandard/IListCollaborationMLInputChannelsPaginator.cs diff --git a/sdk/src/Services/CleanRoomsML/Generated/Model/_bcl45+netstandard/IListCollaborationTrainedModelExportJobsPaginator.cs b/sdk/src/Services/CleanRoomsML/Generated/Model/_bcl+netstandard/IListCollaborationTrainedModelExportJobsPaginator.cs similarity index 100% rename from sdk/src/Services/CleanRoomsML/Generated/Model/_bcl45+netstandard/IListCollaborationTrainedModelExportJobsPaginator.cs rename to sdk/src/Services/CleanRoomsML/Generated/Model/_bcl+netstandard/IListCollaborationTrainedModelExportJobsPaginator.cs diff --git a/sdk/src/Services/CleanRoomsML/Generated/Model/_bcl45+netstandard/IListCollaborationTrainedModelInferenceJobsPaginator.cs b/sdk/src/Services/CleanRoomsML/Generated/Model/_bcl+netstandard/IListCollaborationTrainedModelInferenceJobsPaginator.cs similarity index 100% rename from sdk/src/Services/CleanRoomsML/Generated/Model/_bcl45+netstandard/IListCollaborationTrainedModelInferenceJobsPaginator.cs rename to sdk/src/Services/CleanRoomsML/Generated/Model/_bcl+netstandard/IListCollaborationTrainedModelInferenceJobsPaginator.cs diff --git a/sdk/src/Services/CleanRoomsML/Generated/Model/_bcl45+netstandard/IListCollaborationTrainedModelsPaginator.cs b/sdk/src/Services/CleanRoomsML/Generated/Model/_bcl+netstandard/IListCollaborationTrainedModelsPaginator.cs similarity index 100% rename from sdk/src/Services/CleanRoomsML/Generated/Model/_bcl45+netstandard/IListCollaborationTrainedModelsPaginator.cs rename to sdk/src/Services/CleanRoomsML/Generated/Model/_bcl+netstandard/IListCollaborationTrainedModelsPaginator.cs diff --git a/sdk/src/Services/CleanRoomsML/Generated/Model/_bcl45+netstandard/IListConfiguredModelAlgorithmAssociationsPaginator.cs b/sdk/src/Services/CleanRoomsML/Generated/Model/_bcl+netstandard/IListConfiguredModelAlgorithmAssociationsPaginator.cs similarity index 100% rename from sdk/src/Services/CleanRoomsML/Generated/Model/_bcl45+netstandard/IListConfiguredModelAlgorithmAssociationsPaginator.cs rename to sdk/src/Services/CleanRoomsML/Generated/Model/_bcl+netstandard/IListConfiguredModelAlgorithmAssociationsPaginator.cs diff --git a/sdk/src/Services/CleanRoomsML/Generated/Model/_bcl45+netstandard/IListConfiguredModelAlgorithmsPaginator.cs b/sdk/src/Services/CleanRoomsML/Generated/Model/_bcl+netstandard/IListConfiguredModelAlgorithmsPaginator.cs similarity index 100% rename from sdk/src/Services/CleanRoomsML/Generated/Model/_bcl45+netstandard/IListConfiguredModelAlgorithmsPaginator.cs rename to sdk/src/Services/CleanRoomsML/Generated/Model/_bcl+netstandard/IListConfiguredModelAlgorithmsPaginator.cs diff --git a/sdk/src/Services/CleanRoomsML/Generated/Model/_bcl45+netstandard/IListMLInputChannelsPaginator.cs b/sdk/src/Services/CleanRoomsML/Generated/Model/_bcl+netstandard/IListMLInputChannelsPaginator.cs similarity index 100% rename from sdk/src/Services/CleanRoomsML/Generated/Model/_bcl45+netstandard/IListMLInputChannelsPaginator.cs rename to sdk/src/Services/CleanRoomsML/Generated/Model/_bcl+netstandard/IListMLInputChannelsPaginator.cs diff --git a/sdk/src/Services/CleanRoomsML/Generated/Model/_bcl45+netstandard/IListTrainedModelInferenceJobsPaginator.cs b/sdk/src/Services/CleanRoomsML/Generated/Model/_bcl+netstandard/IListTrainedModelInferenceJobsPaginator.cs similarity index 100% rename from sdk/src/Services/CleanRoomsML/Generated/Model/_bcl45+netstandard/IListTrainedModelInferenceJobsPaginator.cs rename to sdk/src/Services/CleanRoomsML/Generated/Model/_bcl+netstandard/IListTrainedModelInferenceJobsPaginator.cs diff --git a/sdk/src/Services/CleanRoomsML/Generated/Model/_bcl45+netstandard/IListTrainedModelsPaginator.cs b/sdk/src/Services/CleanRoomsML/Generated/Model/_bcl+netstandard/IListTrainedModelsPaginator.cs similarity index 100% rename from sdk/src/Services/CleanRoomsML/Generated/Model/_bcl45+netstandard/IListTrainedModelsPaginator.cs rename to sdk/src/Services/CleanRoomsML/Generated/Model/_bcl+netstandard/IListTrainedModelsPaginator.cs diff --git a/sdk/src/Services/CleanRoomsML/Generated/Model/_bcl45+netstandard/ListCollaborationConfiguredModelAlgorithmAssociationsPaginator.cs b/sdk/src/Services/CleanRoomsML/Generated/Model/_bcl+netstandard/ListCollaborationConfiguredModelAlgorithmAssociationsPaginator.cs similarity index 100% rename from sdk/src/Services/CleanRoomsML/Generated/Model/_bcl45+netstandard/ListCollaborationConfiguredModelAlgorithmAssociationsPaginator.cs rename to sdk/src/Services/CleanRoomsML/Generated/Model/_bcl+netstandard/ListCollaborationConfiguredModelAlgorithmAssociationsPaginator.cs diff --git a/sdk/src/Services/CleanRoomsML/Generated/Model/_bcl45+netstandard/ListCollaborationMLInputChannelsPaginator.cs b/sdk/src/Services/CleanRoomsML/Generated/Model/_bcl+netstandard/ListCollaborationMLInputChannelsPaginator.cs similarity index 100% rename from sdk/src/Services/CleanRoomsML/Generated/Model/_bcl45+netstandard/ListCollaborationMLInputChannelsPaginator.cs rename to sdk/src/Services/CleanRoomsML/Generated/Model/_bcl+netstandard/ListCollaborationMLInputChannelsPaginator.cs diff --git a/sdk/src/Services/CleanRoomsML/Generated/Model/_bcl45+netstandard/ListCollaborationTrainedModelExportJobsPaginator.cs b/sdk/src/Services/CleanRoomsML/Generated/Model/_bcl+netstandard/ListCollaborationTrainedModelExportJobsPaginator.cs similarity index 100% rename from sdk/src/Services/CleanRoomsML/Generated/Model/_bcl45+netstandard/ListCollaborationTrainedModelExportJobsPaginator.cs rename to sdk/src/Services/CleanRoomsML/Generated/Model/_bcl+netstandard/ListCollaborationTrainedModelExportJobsPaginator.cs diff --git a/sdk/src/Services/CleanRoomsML/Generated/Model/_bcl45+netstandard/ListCollaborationTrainedModelInferenceJobsPaginator.cs b/sdk/src/Services/CleanRoomsML/Generated/Model/_bcl+netstandard/ListCollaborationTrainedModelInferenceJobsPaginator.cs similarity index 100% rename from sdk/src/Services/CleanRoomsML/Generated/Model/_bcl45+netstandard/ListCollaborationTrainedModelInferenceJobsPaginator.cs rename to sdk/src/Services/CleanRoomsML/Generated/Model/_bcl+netstandard/ListCollaborationTrainedModelInferenceJobsPaginator.cs diff --git a/sdk/src/Services/CleanRoomsML/Generated/Model/_bcl45+netstandard/ListCollaborationTrainedModelsPaginator.cs b/sdk/src/Services/CleanRoomsML/Generated/Model/_bcl+netstandard/ListCollaborationTrainedModelsPaginator.cs similarity index 100% rename from sdk/src/Services/CleanRoomsML/Generated/Model/_bcl45+netstandard/ListCollaborationTrainedModelsPaginator.cs rename to sdk/src/Services/CleanRoomsML/Generated/Model/_bcl+netstandard/ListCollaborationTrainedModelsPaginator.cs diff --git a/sdk/src/Services/CleanRoomsML/Generated/Model/_bcl45+netstandard/ListConfiguredModelAlgorithmAssociationsPaginator.cs b/sdk/src/Services/CleanRoomsML/Generated/Model/_bcl+netstandard/ListConfiguredModelAlgorithmAssociationsPaginator.cs similarity index 100% rename from sdk/src/Services/CleanRoomsML/Generated/Model/_bcl45+netstandard/ListConfiguredModelAlgorithmAssociationsPaginator.cs rename to sdk/src/Services/CleanRoomsML/Generated/Model/_bcl+netstandard/ListConfiguredModelAlgorithmAssociationsPaginator.cs diff --git a/sdk/src/Services/CleanRoomsML/Generated/Model/_bcl45+netstandard/ListConfiguredModelAlgorithmsPaginator.cs b/sdk/src/Services/CleanRoomsML/Generated/Model/_bcl+netstandard/ListConfiguredModelAlgorithmsPaginator.cs similarity index 100% rename from sdk/src/Services/CleanRoomsML/Generated/Model/_bcl45+netstandard/ListConfiguredModelAlgorithmsPaginator.cs rename to sdk/src/Services/CleanRoomsML/Generated/Model/_bcl+netstandard/ListConfiguredModelAlgorithmsPaginator.cs diff --git a/sdk/src/Services/CleanRoomsML/Generated/Model/_bcl45+netstandard/ListMLInputChannelsPaginator.cs b/sdk/src/Services/CleanRoomsML/Generated/Model/_bcl+netstandard/ListMLInputChannelsPaginator.cs similarity index 100% rename from sdk/src/Services/CleanRoomsML/Generated/Model/_bcl45+netstandard/ListMLInputChannelsPaginator.cs rename to sdk/src/Services/CleanRoomsML/Generated/Model/_bcl+netstandard/ListMLInputChannelsPaginator.cs diff --git a/sdk/src/Services/CleanRoomsML/Generated/Model/_bcl45+netstandard/ListTrainedModelInferenceJobsPaginator.cs b/sdk/src/Services/CleanRoomsML/Generated/Model/_bcl+netstandard/ListTrainedModelInferenceJobsPaginator.cs similarity index 100% rename from sdk/src/Services/CleanRoomsML/Generated/Model/_bcl45+netstandard/ListTrainedModelInferenceJobsPaginator.cs rename to sdk/src/Services/CleanRoomsML/Generated/Model/_bcl+netstandard/ListTrainedModelInferenceJobsPaginator.cs diff --git a/sdk/src/Services/CleanRoomsML/Generated/Model/_bcl45+netstandard/ListTrainedModelsPaginator.cs b/sdk/src/Services/CleanRoomsML/Generated/Model/_bcl+netstandard/ListTrainedModelsPaginator.cs similarity index 100% rename from sdk/src/Services/CleanRoomsML/Generated/Model/_bcl45+netstandard/ListTrainedModelsPaginator.cs rename to sdk/src/Services/CleanRoomsML/Generated/Model/_bcl+netstandard/ListTrainedModelsPaginator.cs diff --git a/sdk/src/Services/CleanRoomsML/Generated/_bcl/AmazonCleanRoomsMLClient.cs b/sdk/src/Services/CleanRoomsML/Generated/_bcl/AmazonCleanRoomsMLClient.cs index 41894b177974..02168f84dced 100644 --- a/sdk/src/Services/CleanRoomsML/Generated/_bcl/AmazonCleanRoomsMLClient.cs +++ b/sdk/src/Services/CleanRoomsML/Generated/_bcl/AmazonCleanRoomsMLClient.cs @@ -287,6 +287,136 @@ protected override void Dispose(bool disposing) #endregion + #region CancelTrainedModel + + + /// + /// Submits a request to cancel the trained model job. + /// + /// Container for the necessary parameters to execute the CancelTrainedModel service method. + /// + /// The response from the CancelTrainedModel service method, as returned by CleanRoomsML. + /// + /// You do not have sufficient access to perform this action. + /// + /// + /// You can't complete this action because another resource depends on this resource. + /// + /// + /// The resource you are requesting does not exist. + /// + /// + /// The request parameters for this request are incorrect. + /// + /// REST API Reference for CancelTrainedModel Operation + public virtual CancelTrainedModelResponse CancelTrainedModel(CancelTrainedModelRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = CancelTrainedModelRequestMarshaller.Instance; + options.ResponseUnmarshaller = CancelTrainedModelResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// Submits a request to cancel the trained model job. + /// + /// Container for the necessary parameters to execute the CancelTrainedModel service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the CancelTrainedModel service method, as returned by CleanRoomsML. + /// + /// You do not have sufficient access to perform this action. + /// + /// + /// You can't complete this action because another resource depends on this resource. + /// + /// + /// The resource you are requesting does not exist. + /// + /// + /// The request parameters for this request are incorrect. + /// + /// REST API Reference for CancelTrainedModel Operation + public virtual Task CancelTrainedModelAsync(CancelTrainedModelRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = CancelTrainedModelRequestMarshaller.Instance; + options.ResponseUnmarshaller = CancelTrainedModelResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + + #region CancelTrainedModelInferenceJob + + + /// + /// Submits a request to cancel a trained model inference job. + /// + /// Container for the necessary parameters to execute the CancelTrainedModelInferenceJob service method. + /// + /// The response from the CancelTrainedModelInferenceJob service method, as returned by CleanRoomsML. + /// + /// You do not have sufficient access to perform this action. + /// + /// + /// You can't complete this action because another resource depends on this resource. + /// + /// + /// The resource you are requesting does not exist. + /// + /// + /// The request parameters for this request are incorrect. + /// + /// REST API Reference for CancelTrainedModelInferenceJob Operation + public virtual CancelTrainedModelInferenceJobResponse CancelTrainedModelInferenceJob(CancelTrainedModelInferenceJobRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = CancelTrainedModelInferenceJobRequestMarshaller.Instance; + options.ResponseUnmarshaller = CancelTrainedModelInferenceJobResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// Submits a request to cancel a trained model inference job. + /// + /// Container for the necessary parameters to execute the CancelTrainedModelInferenceJob service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the CancelTrainedModelInferenceJob service method, as returned by CleanRoomsML. + /// + /// You do not have sufficient access to perform this action. + /// + /// + /// You can't complete this action because another resource depends on this resource. + /// + /// + /// The resource you are requesting does not exist. + /// + /// + /// The request parameters for this request are incorrect. + /// + /// REST API Reference for CancelTrainedModelInferenceJob Operation + public virtual Task CancelTrainedModelInferenceJobAsync(CancelTrainedModelInferenceJobRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = CancelTrainedModelInferenceJobRequestMarshaller.Instance; + options.ResponseUnmarshaller = CancelTrainedModelInferenceJobResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + #region CreateAudienceModel @@ -435,79 +565,81 @@ public virtual CreateConfiguredAudienceModelResponse CreateConfiguredAudienceMod #endregion - #region CreateTrainingDataset + #region CreateConfiguredModelAlgorithm /// - /// Defines the information necessary to create a training dataset. In Clean Rooms ML, - /// the TrainingDataset is metadata that points to a Glue table, which is read - /// only during AudienceModel creation. + /// Creates a configured model algorithm using a container image stored in an ECR repository. /// - /// Container for the necessary parameters to execute the CreateTrainingDataset service method. + /// Container for the necessary parameters to execute the CreateConfiguredModelAlgorithm service method. /// - /// The response from the CreateTrainingDataset service method, as returned by CleanRoomsML. + /// The response from the CreateConfiguredModelAlgorithm service method, as returned by CleanRoomsML. /// /// You do not have sufficient access to perform this action. /// /// /// You can't complete this action because another resource depends on this resource. /// + /// + /// You have exceeded your service quota. + /// /// /// The request parameters for this request are incorrect. /// - /// REST API Reference for CreateTrainingDataset Operation - public virtual CreateTrainingDatasetResponse CreateTrainingDataset(CreateTrainingDatasetRequest request) + /// REST API Reference for CreateConfiguredModelAlgorithm Operation + public virtual CreateConfiguredModelAlgorithmResponse CreateConfiguredModelAlgorithm(CreateConfiguredModelAlgorithmRequest request) { var options = new InvokeOptions(); - options.RequestMarshaller = CreateTrainingDatasetRequestMarshaller.Instance; - options.ResponseUnmarshaller = CreateTrainingDatasetResponseUnmarshaller.Instance; + options.RequestMarshaller = CreateConfiguredModelAlgorithmRequestMarshaller.Instance; + options.ResponseUnmarshaller = CreateConfiguredModelAlgorithmResponseUnmarshaller.Instance; - return Invoke(request, options); + return Invoke(request, options); } /// - /// Defines the information necessary to create a training dataset. In Clean Rooms ML, - /// the TrainingDataset is metadata that points to a Glue table, which is read - /// only during AudienceModel creation. + /// Creates a configured model algorithm using a container image stored in an ECR repository. /// - /// Container for the necessary parameters to execute the CreateTrainingDataset service method. + /// Container for the necessary parameters to execute the CreateConfiguredModelAlgorithm service method. /// /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// /// - /// The response from the CreateTrainingDataset service method, as returned by CleanRoomsML. + /// The response from the CreateConfiguredModelAlgorithm service method, as returned by CleanRoomsML. /// /// You do not have sufficient access to perform this action. /// /// /// You can't complete this action because another resource depends on this resource. /// + /// + /// You have exceeded your service quota. + /// /// /// The request parameters for this request are incorrect. /// - /// REST API Reference for CreateTrainingDataset Operation - public virtual Task CreateTrainingDatasetAsync(CreateTrainingDatasetRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + /// REST API Reference for CreateConfiguredModelAlgorithm Operation + public virtual Task CreateConfiguredModelAlgorithmAsync(CreateConfiguredModelAlgorithmRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { var options = new InvokeOptions(); - options.RequestMarshaller = CreateTrainingDatasetRequestMarshaller.Instance; - options.ResponseUnmarshaller = CreateTrainingDatasetResponseUnmarshaller.Instance; + options.RequestMarshaller = CreateConfiguredModelAlgorithmRequestMarshaller.Instance; + options.ResponseUnmarshaller = CreateConfiguredModelAlgorithmResponseUnmarshaller.Instance; - return InvokeAsync(request, options, cancellationToken); + return InvokeAsync(request, options, cancellationToken); } #endregion - #region DeleteAudienceGenerationJob + #region CreateConfiguredModelAlgorithmAssociation /// - /// Deletes the specified audience generation job, and removes all data associated with - /// the job. + /// Associates a configured model algorithm to a collaboration for use by any member of + /// the collaboration. /// - /// Container for the necessary parameters to execute the DeleteAudienceGenerationJob service method. + /// Container for the necessary parameters to execute the CreateConfiguredModelAlgorithmAssociation service method. /// - /// The response from the DeleteAudienceGenerationJob service method, as returned by CleanRoomsML. + /// The response from the CreateConfiguredModelAlgorithmAssociation service method, as returned by CleanRoomsML. /// /// You do not have sufficient access to perform this action. /// @@ -517,30 +649,33 @@ public virtual CreateTrainingDatasetResponse CreateTrainingDataset(CreateTrainin /// /// The resource you are requesting does not exist. /// + /// + /// You have exceeded your service quota. + /// /// /// The request parameters for this request are incorrect. /// - /// REST API Reference for DeleteAudienceGenerationJob Operation - public virtual DeleteAudienceGenerationJobResponse DeleteAudienceGenerationJob(DeleteAudienceGenerationJobRequest request) + /// REST API Reference for CreateConfiguredModelAlgorithmAssociation Operation + public virtual CreateConfiguredModelAlgorithmAssociationResponse CreateConfiguredModelAlgorithmAssociation(CreateConfiguredModelAlgorithmAssociationRequest request) { var options = new InvokeOptions(); - options.RequestMarshaller = DeleteAudienceGenerationJobRequestMarshaller.Instance; - options.ResponseUnmarshaller = DeleteAudienceGenerationJobResponseUnmarshaller.Instance; + options.RequestMarshaller = CreateConfiguredModelAlgorithmAssociationRequestMarshaller.Instance; + options.ResponseUnmarshaller = CreateConfiguredModelAlgorithmAssociationResponseUnmarshaller.Instance; - return Invoke(request, options); + return Invoke(request, options); } /// - /// Deletes the specified audience generation job, and removes all data associated with - /// the job. + /// Associates a configured model algorithm to a collaboration for use by any member of + /// the collaboration. /// - /// Container for the necessary parameters to execute the DeleteAudienceGenerationJob service method. + /// Container for the necessary parameters to execute the CreateConfiguredModelAlgorithmAssociation service method. /// /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// /// - /// The response from the DeleteAudienceGenerationJob service method, as returned by CleanRoomsML. + /// The response from the CreateConfiguredModelAlgorithmAssociation service method, as returned by CleanRoomsML. /// /// You do not have sufficient access to perform this action. /// @@ -550,31 +685,34 @@ public virtual DeleteAudienceGenerationJobResponse DeleteAudienceGenerationJob(D /// /// The resource you are requesting does not exist. /// + /// + /// You have exceeded your service quota. + /// /// /// The request parameters for this request are incorrect. /// - /// REST API Reference for DeleteAudienceGenerationJob Operation - public virtual Task DeleteAudienceGenerationJobAsync(DeleteAudienceGenerationJobRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + /// REST API Reference for CreateConfiguredModelAlgorithmAssociation Operation + public virtual Task CreateConfiguredModelAlgorithmAssociationAsync(CreateConfiguredModelAlgorithmAssociationRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { var options = new InvokeOptions(); - options.RequestMarshaller = DeleteAudienceGenerationJobRequestMarshaller.Instance; - options.ResponseUnmarshaller = DeleteAudienceGenerationJobResponseUnmarshaller.Instance; + options.RequestMarshaller = CreateConfiguredModelAlgorithmAssociationRequestMarshaller.Instance; + options.ResponseUnmarshaller = CreateConfiguredModelAlgorithmAssociationResponseUnmarshaller.Instance; - return InvokeAsync(request, options, cancellationToken); + return InvokeAsync(request, options, cancellationToken); } #endregion - #region DeleteAudienceModel + #region CreateMLInputChannel /// - /// Specifies an audience model that you want to delete. You can't delete an audience - /// model if there are any configured audience models that depend on the audience model. + /// Provides the information to create an ML input channel. An ML input channel is the + /// result of a query that can be used for ML modeling. /// - /// Container for the necessary parameters to execute the DeleteAudienceModel service method. + /// Container for the necessary parameters to execute the CreateMLInputChannel service method. /// - /// The response from the DeleteAudienceModel service method, as returned by CleanRoomsML. + /// The response from the CreateMLInputChannel service method, as returned by CleanRoomsML. /// /// You do not have sufficient access to perform this action. /// @@ -584,30 +722,33 @@ public virtual DeleteAudienceGenerationJobResponse DeleteAudienceGenerationJob(D /// /// The resource you are requesting does not exist. /// + /// + /// You have exceeded your service quota. + /// /// /// The request parameters for this request are incorrect. /// - /// REST API Reference for DeleteAudienceModel Operation - public virtual DeleteAudienceModelResponse DeleteAudienceModel(DeleteAudienceModelRequest request) + /// REST API Reference for CreateMLInputChannel Operation + public virtual CreateMLInputChannelResponse CreateMLInputChannel(CreateMLInputChannelRequest request) { var options = new InvokeOptions(); - options.RequestMarshaller = DeleteAudienceModelRequestMarshaller.Instance; - options.ResponseUnmarshaller = DeleteAudienceModelResponseUnmarshaller.Instance; + options.RequestMarshaller = CreateMLInputChannelRequestMarshaller.Instance; + options.ResponseUnmarshaller = CreateMLInputChannelResponseUnmarshaller.Instance; - return Invoke(request, options); + return Invoke(request, options); } /// - /// Specifies an audience model that you want to delete. You can't delete an audience - /// model if there are any configured audience models that depend on the audience model. + /// Provides the information to create an ML input channel. An ML input channel is the + /// result of a query that can be used for ML modeling. /// - /// Container for the necessary parameters to execute the DeleteAudienceModel service method. + /// Container for the necessary parameters to execute the CreateMLInputChannel service method. /// /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// /// - /// The response from the DeleteAudienceModel service method, as returned by CleanRoomsML. + /// The response from the CreateMLInputChannel service method, as returned by CleanRoomsML. /// /// You do not have sufficient access to perform this action. /// @@ -617,33 +758,34 @@ public virtual DeleteAudienceModelResponse DeleteAudienceModel(DeleteAudienceMod /// /// The resource you are requesting does not exist. /// + /// + /// You have exceeded your service quota. + /// /// /// The request parameters for this request are incorrect. /// - /// REST API Reference for DeleteAudienceModel Operation - public virtual Task DeleteAudienceModelAsync(DeleteAudienceModelRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + /// REST API Reference for CreateMLInputChannel Operation + public virtual Task CreateMLInputChannelAsync(CreateMLInputChannelRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { var options = new InvokeOptions(); - options.RequestMarshaller = DeleteAudienceModelRequestMarshaller.Instance; - options.ResponseUnmarshaller = DeleteAudienceModelResponseUnmarshaller.Instance; + options.RequestMarshaller = CreateMLInputChannelRequestMarshaller.Instance; + options.ResponseUnmarshaller = CreateMLInputChannelResponseUnmarshaller.Instance; - return InvokeAsync(request, options, cancellationToken); + return InvokeAsync(request, options, cancellationToken); } #endregion - #region DeleteConfiguredAudienceModel + #region CreateTrainedModel /// - /// Deletes the specified configured audience model. You can't delete a configured audience - /// model if there are any lookalike models that use the configured audience model. If - /// you delete a configured audience model, it will be removed from any collaborations - /// that it is associated to. + /// Creates a trained model from an associated configured model algorithm using data from + /// any member of the collaboration. /// - /// Container for the necessary parameters to execute the DeleteConfiguredAudienceModel service method. + /// Container for the necessary parameters to execute the CreateTrainedModel service method. /// - /// The response from the DeleteConfiguredAudienceModel service method, as returned by CleanRoomsML. + /// The response from the CreateTrainedModel service method, as returned by CleanRoomsML. /// /// You do not have sufficient access to perform this action. /// @@ -653,32 +795,33 @@ public virtual DeleteAudienceModelResponse DeleteAudienceModel(DeleteAudienceMod /// /// The resource you are requesting does not exist. /// + /// + /// You have exceeded your service quota. + /// /// /// The request parameters for this request are incorrect. /// - /// REST API Reference for DeleteConfiguredAudienceModel Operation - public virtual DeleteConfiguredAudienceModelResponse DeleteConfiguredAudienceModel(DeleteConfiguredAudienceModelRequest request) + /// REST API Reference for CreateTrainedModel Operation + public virtual CreateTrainedModelResponse CreateTrainedModel(CreateTrainedModelRequest request) { var options = new InvokeOptions(); - options.RequestMarshaller = DeleteConfiguredAudienceModelRequestMarshaller.Instance; - options.ResponseUnmarshaller = DeleteConfiguredAudienceModelResponseUnmarshaller.Instance; + options.RequestMarshaller = CreateTrainedModelRequestMarshaller.Instance; + options.ResponseUnmarshaller = CreateTrainedModelResponseUnmarshaller.Instance; - return Invoke(request, options); + return Invoke(request, options); } /// - /// Deletes the specified configured audience model. You can't delete a configured audience - /// model if there are any lookalike models that use the configured audience model. If - /// you delete a configured audience model, it will be removed from any collaborations - /// that it is associated to. + /// Creates a trained model from an associated configured model algorithm using data from + /// any member of the collaboration. /// - /// Container for the necessary parameters to execute the DeleteConfiguredAudienceModel service method. + /// Container for the necessary parameters to execute the CreateTrainedModel service method. /// /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// /// - /// The response from the DeleteConfiguredAudienceModel service method, as returned by CleanRoomsML. + /// The response from the CreateTrainedModel service method, as returned by CleanRoomsML. /// /// You do not have sufficient access to perform this action. /// @@ -688,92 +831,97 @@ public virtual DeleteConfiguredAudienceModelResponse DeleteConfiguredAudienceMod /// /// The resource you are requesting does not exist. /// + /// + /// You have exceeded your service quota. + /// /// /// The request parameters for this request are incorrect. /// - /// REST API Reference for DeleteConfiguredAudienceModel Operation - public virtual Task DeleteConfiguredAudienceModelAsync(DeleteConfiguredAudienceModelRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + /// REST API Reference for CreateTrainedModel Operation + public virtual Task CreateTrainedModelAsync(CreateTrainedModelRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { var options = new InvokeOptions(); - options.RequestMarshaller = DeleteConfiguredAudienceModelRequestMarshaller.Instance; - options.ResponseUnmarshaller = DeleteConfiguredAudienceModelResponseUnmarshaller.Instance; + options.RequestMarshaller = CreateTrainedModelRequestMarshaller.Instance; + options.ResponseUnmarshaller = CreateTrainedModelResponseUnmarshaller.Instance; - return InvokeAsync(request, options, cancellationToken); + return InvokeAsync(request, options, cancellationToken); } #endregion - #region DeleteConfiguredAudienceModelPolicy + #region CreateTrainingDataset /// - /// Deletes the specified configured audience model policy. + /// Defines the information necessary to create a training dataset. In Clean Rooms ML, + /// the TrainingDataset is metadata that points to a Glue table, which is read + /// only during AudienceModel creation. /// - /// Container for the necessary parameters to execute the DeleteConfiguredAudienceModelPolicy service method. + /// Container for the necessary parameters to execute the CreateTrainingDataset service method. /// - /// The response from the DeleteConfiguredAudienceModelPolicy service method, as returned by CleanRoomsML. + /// The response from the CreateTrainingDataset service method, as returned by CleanRoomsML. /// /// You do not have sufficient access to perform this action. /// - /// - /// The resource you are requesting does not exist. + /// + /// You can't complete this action because another resource depends on this resource. /// /// /// The request parameters for this request are incorrect. /// - /// REST API Reference for DeleteConfiguredAudienceModelPolicy Operation - public virtual DeleteConfiguredAudienceModelPolicyResponse DeleteConfiguredAudienceModelPolicy(DeleteConfiguredAudienceModelPolicyRequest request) + /// REST API Reference for CreateTrainingDataset Operation + public virtual CreateTrainingDatasetResponse CreateTrainingDataset(CreateTrainingDatasetRequest request) { var options = new InvokeOptions(); - options.RequestMarshaller = DeleteConfiguredAudienceModelPolicyRequestMarshaller.Instance; - options.ResponseUnmarshaller = DeleteConfiguredAudienceModelPolicyResponseUnmarshaller.Instance; + options.RequestMarshaller = CreateTrainingDatasetRequestMarshaller.Instance; + options.ResponseUnmarshaller = CreateTrainingDatasetResponseUnmarshaller.Instance; - return Invoke(request, options); + return Invoke(request, options); } /// - /// Deletes the specified configured audience model policy. + /// Defines the information necessary to create a training dataset. In Clean Rooms ML, + /// the TrainingDataset is metadata that points to a Glue table, which is read + /// only during AudienceModel creation. /// - /// Container for the necessary parameters to execute the DeleteConfiguredAudienceModelPolicy service method. + /// Container for the necessary parameters to execute the CreateTrainingDataset service method. /// /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// /// - /// The response from the DeleteConfiguredAudienceModelPolicy service method, as returned by CleanRoomsML. + /// The response from the CreateTrainingDataset service method, as returned by CleanRoomsML. /// /// You do not have sufficient access to perform this action. /// - /// - /// The resource you are requesting does not exist. + /// + /// You can't complete this action because another resource depends on this resource. /// /// /// The request parameters for this request are incorrect. /// - /// REST API Reference for DeleteConfiguredAudienceModelPolicy Operation - public virtual Task DeleteConfiguredAudienceModelPolicyAsync(DeleteConfiguredAudienceModelPolicyRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + /// REST API Reference for CreateTrainingDataset Operation + public virtual Task CreateTrainingDatasetAsync(CreateTrainingDatasetRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { var options = new InvokeOptions(); - options.RequestMarshaller = DeleteConfiguredAudienceModelPolicyRequestMarshaller.Instance; - options.ResponseUnmarshaller = DeleteConfiguredAudienceModelPolicyResponseUnmarshaller.Instance; + options.RequestMarshaller = CreateTrainingDatasetRequestMarshaller.Instance; + options.ResponseUnmarshaller = CreateTrainingDatasetResponseUnmarshaller.Instance; - return InvokeAsync(request, options, cancellationToken); + return InvokeAsync(request, options, cancellationToken); } #endregion - #region DeleteTrainingDataset + #region DeleteAudienceGenerationJob /// - /// Specifies a training dataset that you want to delete. You can't delete a training - /// dataset if there are any audience models that depend on the training dataset. In Clean - /// Rooms ML, the TrainingDataset is metadata that points to a Glue table, which - /// is read only during AudienceModel creation. This action deletes the metadata. + /// Deletes the specified audience generation job, and removes all data associated with + /// the job. /// - /// Container for the necessary parameters to execute the DeleteTrainingDataset service method. + /// Container for the necessary parameters to execute the DeleteAudienceGenerationJob service method. /// - /// The response from the DeleteTrainingDataset service method, as returned by CleanRoomsML. + /// The response from the DeleteAudienceGenerationJob service method, as returned by CleanRoomsML. /// /// You do not have sufficient access to perform this action. /// @@ -786,29 +934,27 @@ public virtual DeleteConfiguredAudienceModelPolicyResponse DeleteConfiguredAudie /// /// The request parameters for this request are incorrect. /// - /// REST API Reference for DeleteTrainingDataset Operation - public virtual DeleteTrainingDatasetResponse DeleteTrainingDataset(DeleteTrainingDatasetRequest request) + /// REST API Reference for DeleteAudienceGenerationJob Operation + public virtual DeleteAudienceGenerationJobResponse DeleteAudienceGenerationJob(DeleteAudienceGenerationJobRequest request) { var options = new InvokeOptions(); - options.RequestMarshaller = DeleteTrainingDatasetRequestMarshaller.Instance; - options.ResponseUnmarshaller = DeleteTrainingDatasetResponseUnmarshaller.Instance; + options.RequestMarshaller = DeleteAudienceGenerationJobRequestMarshaller.Instance; + options.ResponseUnmarshaller = DeleteAudienceGenerationJobResponseUnmarshaller.Instance; - return Invoke(request, options); + return Invoke(request, options); } /// - /// Specifies a training dataset that you want to delete. You can't delete a training - /// dataset if there are any audience models that depend on the training dataset. In Clean - /// Rooms ML, the TrainingDataset is metadata that points to a Glue table, which - /// is read only during AudienceModel creation. This action deletes the metadata. + /// Deletes the specified audience generation job, and removes all data associated with + /// the job. /// - /// Container for the necessary parameters to execute the DeleteTrainingDataset service method. + /// Container for the necessary parameters to execute the DeleteAudienceGenerationJob service method. /// /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// /// - /// The response from the DeleteTrainingDataset service method, as returned by CleanRoomsML. + /// The response from the DeleteAudienceGenerationJob service method, as returned by CleanRoomsML. /// /// You do not have sufficient access to perform this action. /// @@ -821,145 +967,165 @@ public virtual DeleteTrainingDatasetResponse DeleteTrainingDataset(DeleteTrainin /// /// The request parameters for this request are incorrect. /// - /// REST API Reference for DeleteTrainingDataset Operation - public virtual Task DeleteTrainingDatasetAsync(DeleteTrainingDatasetRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + /// REST API Reference for DeleteAudienceGenerationJob Operation + public virtual Task DeleteAudienceGenerationJobAsync(DeleteAudienceGenerationJobRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { var options = new InvokeOptions(); - options.RequestMarshaller = DeleteTrainingDatasetRequestMarshaller.Instance; - options.ResponseUnmarshaller = DeleteTrainingDatasetResponseUnmarshaller.Instance; + options.RequestMarshaller = DeleteAudienceGenerationJobRequestMarshaller.Instance; + options.ResponseUnmarshaller = DeleteAudienceGenerationJobResponseUnmarshaller.Instance; - return InvokeAsync(request, options, cancellationToken); + return InvokeAsync(request, options, cancellationToken); } #endregion - #region GetAudienceGenerationJob + #region DeleteAudienceModel /// - /// Returns information about an audience generation job. + /// Specifies an audience model that you want to delete. You can't delete an audience + /// model if there are any configured audience models that depend on the audience model. /// - /// Container for the necessary parameters to execute the GetAudienceGenerationJob service method. + /// Container for the necessary parameters to execute the DeleteAudienceModel service method. /// - /// The response from the GetAudienceGenerationJob service method, as returned by CleanRoomsML. + /// The response from the DeleteAudienceModel service method, as returned by CleanRoomsML. /// /// You do not have sufficient access to perform this action. /// + /// + /// You can't complete this action because another resource depends on this resource. + /// /// /// The resource you are requesting does not exist. /// /// /// The request parameters for this request are incorrect. /// - /// REST API Reference for GetAudienceGenerationJob Operation - public virtual GetAudienceGenerationJobResponse GetAudienceGenerationJob(GetAudienceGenerationJobRequest request) + /// REST API Reference for DeleteAudienceModel Operation + public virtual DeleteAudienceModelResponse DeleteAudienceModel(DeleteAudienceModelRequest request) { var options = new InvokeOptions(); - options.RequestMarshaller = GetAudienceGenerationJobRequestMarshaller.Instance; - options.ResponseUnmarshaller = GetAudienceGenerationJobResponseUnmarshaller.Instance; + options.RequestMarshaller = DeleteAudienceModelRequestMarshaller.Instance; + options.ResponseUnmarshaller = DeleteAudienceModelResponseUnmarshaller.Instance; - return Invoke(request, options); + return Invoke(request, options); } /// - /// Returns information about an audience generation job. + /// Specifies an audience model that you want to delete. You can't delete an audience + /// model if there are any configured audience models that depend on the audience model. /// - /// Container for the necessary parameters to execute the GetAudienceGenerationJob service method. + /// Container for the necessary parameters to execute the DeleteAudienceModel service method. /// /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// /// - /// The response from the GetAudienceGenerationJob service method, as returned by CleanRoomsML. + /// The response from the DeleteAudienceModel service method, as returned by CleanRoomsML. /// /// You do not have sufficient access to perform this action. /// + /// + /// You can't complete this action because another resource depends on this resource. + /// /// /// The resource you are requesting does not exist. /// /// /// The request parameters for this request are incorrect. /// - /// REST API Reference for GetAudienceGenerationJob Operation - public virtual Task GetAudienceGenerationJobAsync(GetAudienceGenerationJobRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + /// REST API Reference for DeleteAudienceModel Operation + public virtual Task DeleteAudienceModelAsync(DeleteAudienceModelRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { var options = new InvokeOptions(); - options.RequestMarshaller = GetAudienceGenerationJobRequestMarshaller.Instance; - options.ResponseUnmarshaller = GetAudienceGenerationJobResponseUnmarshaller.Instance; + options.RequestMarshaller = DeleteAudienceModelRequestMarshaller.Instance; + options.ResponseUnmarshaller = DeleteAudienceModelResponseUnmarshaller.Instance; - return InvokeAsync(request, options, cancellationToken); + return InvokeAsync(request, options, cancellationToken); } #endregion - #region GetAudienceModel + #region DeleteConfiguredAudienceModel /// - /// Returns information about an audience model + /// Deletes the specified configured audience model. You can't delete a configured audience + /// model if there are any lookalike models that use the configured audience model. If + /// you delete a configured audience model, it will be removed from any collaborations + /// that it is associated to. /// - /// Container for the necessary parameters to execute the GetAudienceModel service method. + /// Container for the necessary parameters to execute the DeleteConfiguredAudienceModel service method. /// - /// The response from the GetAudienceModel service method, as returned by CleanRoomsML. + /// The response from the DeleteConfiguredAudienceModel service method, as returned by CleanRoomsML. /// /// You do not have sufficient access to perform this action. /// + /// + /// You can't complete this action because another resource depends on this resource. + /// /// /// The resource you are requesting does not exist. /// /// /// The request parameters for this request are incorrect. /// - /// REST API Reference for GetAudienceModel Operation - public virtual GetAudienceModelResponse GetAudienceModel(GetAudienceModelRequest request) + /// REST API Reference for DeleteConfiguredAudienceModel Operation + public virtual DeleteConfiguredAudienceModelResponse DeleteConfiguredAudienceModel(DeleteConfiguredAudienceModelRequest request) { var options = new InvokeOptions(); - options.RequestMarshaller = GetAudienceModelRequestMarshaller.Instance; - options.ResponseUnmarshaller = GetAudienceModelResponseUnmarshaller.Instance; + options.RequestMarshaller = DeleteConfiguredAudienceModelRequestMarshaller.Instance; + options.ResponseUnmarshaller = DeleteConfiguredAudienceModelResponseUnmarshaller.Instance; - return Invoke(request, options); + return Invoke(request, options); } /// - /// Returns information about an audience model + /// Deletes the specified configured audience model. You can't delete a configured audience + /// model if there are any lookalike models that use the configured audience model. If + /// you delete a configured audience model, it will be removed from any collaborations + /// that it is associated to. /// - /// Container for the necessary parameters to execute the GetAudienceModel service method. + /// Container for the necessary parameters to execute the DeleteConfiguredAudienceModel service method. /// /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// /// - /// The response from the GetAudienceModel service method, as returned by CleanRoomsML. + /// The response from the DeleteConfiguredAudienceModel service method, as returned by CleanRoomsML. /// /// You do not have sufficient access to perform this action. /// + /// + /// You can't complete this action because another resource depends on this resource. + /// /// /// The resource you are requesting does not exist. /// /// /// The request parameters for this request are incorrect. /// - /// REST API Reference for GetAudienceModel Operation - public virtual Task GetAudienceModelAsync(GetAudienceModelRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + /// REST API Reference for DeleteConfiguredAudienceModel Operation + public virtual Task DeleteConfiguredAudienceModelAsync(DeleteConfiguredAudienceModelRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { var options = new InvokeOptions(); - options.RequestMarshaller = GetAudienceModelRequestMarshaller.Instance; - options.ResponseUnmarshaller = GetAudienceModelResponseUnmarshaller.Instance; + options.RequestMarshaller = DeleteConfiguredAudienceModelRequestMarshaller.Instance; + options.ResponseUnmarshaller = DeleteConfiguredAudienceModelResponseUnmarshaller.Instance; - return InvokeAsync(request, options, cancellationToken); + return InvokeAsync(request, options, cancellationToken); } #endregion - #region GetConfiguredAudienceModel + #region DeleteConfiguredAudienceModelPolicy /// - /// Returns information about a specified configured audience model. + /// Deletes the specified configured audience model policy. /// - /// Container for the necessary parameters to execute the GetConfiguredAudienceModel service method. + /// Container for the necessary parameters to execute the DeleteConfiguredAudienceModelPolicy service method. /// - /// The response from the GetConfiguredAudienceModel service method, as returned by CleanRoomsML. + /// The response from the DeleteConfiguredAudienceModelPolicy service method, as returned by CleanRoomsML. /// /// You do not have sufficient access to perform this action. /// @@ -969,26 +1135,26 @@ public virtual GetAudienceModelResponse GetAudienceModel(GetAudienceModelRequest /// /// The request parameters for this request are incorrect. /// - /// REST API Reference for GetConfiguredAudienceModel Operation - public virtual GetConfiguredAudienceModelResponse GetConfiguredAudienceModel(GetConfiguredAudienceModelRequest request) + /// REST API Reference for DeleteConfiguredAudienceModelPolicy Operation + public virtual DeleteConfiguredAudienceModelPolicyResponse DeleteConfiguredAudienceModelPolicy(DeleteConfiguredAudienceModelPolicyRequest request) { var options = new InvokeOptions(); - options.RequestMarshaller = GetConfiguredAudienceModelRequestMarshaller.Instance; - options.ResponseUnmarshaller = GetConfiguredAudienceModelResponseUnmarshaller.Instance; + options.RequestMarshaller = DeleteConfiguredAudienceModelPolicyRequestMarshaller.Instance; + options.ResponseUnmarshaller = DeleteConfiguredAudienceModelPolicyResponseUnmarshaller.Instance; - return Invoke(request, options); + return Invoke(request, options); } /// - /// Returns information about a specified configured audience model. + /// Deletes the specified configured audience model policy. /// - /// Container for the necessary parameters to execute the GetConfiguredAudienceModel service method. + /// Container for the necessary parameters to execute the DeleteConfiguredAudienceModelPolicy service method. /// /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// /// - /// The response from the GetConfiguredAudienceModel service method, as returned by CleanRoomsML. + /// The response from the DeleteConfiguredAudienceModelPolicy service method, as returned by CleanRoomsML. /// /// You do not have sufficient access to perform this action. /// @@ -998,403 +1164,2031 @@ public virtual GetConfiguredAudienceModelResponse GetConfiguredAudienceModel(Get /// /// The request parameters for this request are incorrect. /// - /// REST API Reference for GetConfiguredAudienceModel Operation - public virtual Task GetConfiguredAudienceModelAsync(GetConfiguredAudienceModelRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + /// REST API Reference for DeleteConfiguredAudienceModelPolicy Operation + public virtual Task DeleteConfiguredAudienceModelPolicyAsync(DeleteConfiguredAudienceModelPolicyRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { var options = new InvokeOptions(); - options.RequestMarshaller = GetConfiguredAudienceModelRequestMarshaller.Instance; - options.ResponseUnmarshaller = GetConfiguredAudienceModelResponseUnmarshaller.Instance; + options.RequestMarshaller = DeleteConfiguredAudienceModelPolicyRequestMarshaller.Instance; + options.ResponseUnmarshaller = DeleteConfiguredAudienceModelPolicyResponseUnmarshaller.Instance; - return InvokeAsync(request, options, cancellationToken); + return InvokeAsync(request, options, cancellationToken); } #endregion - #region GetConfiguredAudienceModelPolicy + #region DeleteConfiguredModelAlgorithm /// - /// Returns information about a configured audience model policy. + /// Deletes a configured model algorithm. /// - /// Container for the necessary parameters to execute the GetConfiguredAudienceModelPolicy service method. + /// Container for the necessary parameters to execute the DeleteConfiguredModelAlgorithm service method. /// - /// The response from the GetConfiguredAudienceModelPolicy service method, as returned by CleanRoomsML. + /// The response from the DeleteConfiguredModelAlgorithm service method, as returned by CleanRoomsML. /// /// You do not have sufficient access to perform this action. /// + /// + /// You can't complete this action because another resource depends on this resource. + /// /// /// The resource you are requesting does not exist. /// /// /// The request parameters for this request are incorrect. /// - /// REST API Reference for GetConfiguredAudienceModelPolicy Operation - public virtual GetConfiguredAudienceModelPolicyResponse GetConfiguredAudienceModelPolicy(GetConfiguredAudienceModelPolicyRequest request) + /// REST API Reference for DeleteConfiguredModelAlgorithm Operation + public virtual DeleteConfiguredModelAlgorithmResponse DeleteConfiguredModelAlgorithm(DeleteConfiguredModelAlgorithmRequest request) { var options = new InvokeOptions(); - options.RequestMarshaller = GetConfiguredAudienceModelPolicyRequestMarshaller.Instance; - options.ResponseUnmarshaller = GetConfiguredAudienceModelPolicyResponseUnmarshaller.Instance; + options.RequestMarshaller = DeleteConfiguredModelAlgorithmRequestMarshaller.Instance; + options.ResponseUnmarshaller = DeleteConfiguredModelAlgorithmResponseUnmarshaller.Instance; - return Invoke(request, options); + return Invoke(request, options); } /// - /// Returns information about a configured audience model policy. + /// Deletes a configured model algorithm. /// - /// Container for the necessary parameters to execute the GetConfiguredAudienceModelPolicy service method. + /// Container for the necessary parameters to execute the DeleteConfiguredModelAlgorithm service method. /// /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// /// - /// The response from the GetConfiguredAudienceModelPolicy service method, as returned by CleanRoomsML. + /// The response from the DeleteConfiguredModelAlgorithm service method, as returned by CleanRoomsML. /// /// You do not have sufficient access to perform this action. /// + /// + /// You can't complete this action because another resource depends on this resource. + /// /// /// The resource you are requesting does not exist. /// /// /// The request parameters for this request are incorrect. /// - /// REST API Reference for GetConfiguredAudienceModelPolicy Operation - public virtual Task GetConfiguredAudienceModelPolicyAsync(GetConfiguredAudienceModelPolicyRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + /// REST API Reference for DeleteConfiguredModelAlgorithm Operation + public virtual Task DeleteConfiguredModelAlgorithmAsync(DeleteConfiguredModelAlgorithmRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { var options = new InvokeOptions(); - options.RequestMarshaller = GetConfiguredAudienceModelPolicyRequestMarshaller.Instance; - options.ResponseUnmarshaller = GetConfiguredAudienceModelPolicyResponseUnmarshaller.Instance; + options.RequestMarshaller = DeleteConfiguredModelAlgorithmRequestMarshaller.Instance; + options.ResponseUnmarshaller = DeleteConfiguredModelAlgorithmResponseUnmarshaller.Instance; - return InvokeAsync(request, options, cancellationToken); + return InvokeAsync(request, options, cancellationToken); } #endregion - #region GetTrainingDataset + #region DeleteConfiguredModelAlgorithmAssociation /// - /// Returns information about a training dataset. + /// Deletes a configured model algorithm association. /// - /// Container for the necessary parameters to execute the GetTrainingDataset service method. + /// Container for the necessary parameters to execute the DeleteConfiguredModelAlgorithmAssociation service method. /// - /// The response from the GetTrainingDataset service method, as returned by CleanRoomsML. + /// The response from the DeleteConfiguredModelAlgorithmAssociation service method, as returned by CleanRoomsML. /// /// You do not have sufficient access to perform this action. /// + /// + /// You can't complete this action because another resource depends on this resource. + /// /// /// The resource you are requesting does not exist. /// /// /// The request parameters for this request are incorrect. /// - /// REST API Reference for GetTrainingDataset Operation - public virtual GetTrainingDatasetResponse GetTrainingDataset(GetTrainingDatasetRequest request) + /// REST API Reference for DeleteConfiguredModelAlgorithmAssociation Operation + public virtual DeleteConfiguredModelAlgorithmAssociationResponse DeleteConfiguredModelAlgorithmAssociation(DeleteConfiguredModelAlgorithmAssociationRequest request) { var options = new InvokeOptions(); - options.RequestMarshaller = GetTrainingDatasetRequestMarshaller.Instance; - options.ResponseUnmarshaller = GetTrainingDatasetResponseUnmarshaller.Instance; + options.RequestMarshaller = DeleteConfiguredModelAlgorithmAssociationRequestMarshaller.Instance; + options.ResponseUnmarshaller = DeleteConfiguredModelAlgorithmAssociationResponseUnmarshaller.Instance; - return Invoke(request, options); + return Invoke(request, options); } /// - /// Returns information about a training dataset. + /// Deletes a configured model algorithm association. /// - /// Container for the necessary parameters to execute the GetTrainingDataset service method. + /// Container for the necessary parameters to execute the DeleteConfiguredModelAlgorithmAssociation service method. /// /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// /// - /// The response from the GetTrainingDataset service method, as returned by CleanRoomsML. + /// The response from the DeleteConfiguredModelAlgorithmAssociation service method, as returned by CleanRoomsML. /// /// You do not have sufficient access to perform this action. /// + /// + /// You can't complete this action because another resource depends on this resource. + /// /// /// The resource you are requesting does not exist. /// /// /// The request parameters for this request are incorrect. /// - /// REST API Reference for GetTrainingDataset Operation - public virtual Task GetTrainingDatasetAsync(GetTrainingDatasetRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + /// REST API Reference for DeleteConfiguredModelAlgorithmAssociation Operation + public virtual Task DeleteConfiguredModelAlgorithmAssociationAsync(DeleteConfiguredModelAlgorithmAssociationRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = DeleteConfiguredModelAlgorithmAssociationRequestMarshaller.Instance; + options.ResponseUnmarshaller = DeleteConfiguredModelAlgorithmAssociationResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + + #region DeleteMLConfiguration + + + /// + /// Deletes a ML modeling configuration. + /// + /// Container for the necessary parameters to execute the DeleteMLConfiguration service method. + /// + /// The response from the DeleteMLConfiguration service method, as returned by CleanRoomsML. + /// + /// You do not have sufficient access to perform this action. + /// + /// + /// The resource you are requesting does not exist. + /// + /// + /// The request parameters for this request are incorrect. + /// + /// REST API Reference for DeleteMLConfiguration Operation + public virtual DeleteMLConfigurationResponse DeleteMLConfiguration(DeleteMLConfigurationRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = DeleteMLConfigurationRequestMarshaller.Instance; + options.ResponseUnmarshaller = DeleteMLConfigurationResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// Deletes a ML modeling configuration. + /// + /// Container for the necessary parameters to execute the DeleteMLConfiguration service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the DeleteMLConfiguration service method, as returned by CleanRoomsML. + /// + /// You do not have sufficient access to perform this action. + /// + /// + /// The resource you are requesting does not exist. + /// + /// + /// The request parameters for this request are incorrect. + /// + /// REST API Reference for DeleteMLConfiguration Operation + public virtual Task DeleteMLConfigurationAsync(DeleteMLConfigurationRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = DeleteMLConfigurationRequestMarshaller.Instance; + options.ResponseUnmarshaller = DeleteMLConfigurationResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + + #region DeleteMLInputChannelData + + + /// + /// Provides the information necessary to delete an ML input channel. + /// + /// Container for the necessary parameters to execute the DeleteMLInputChannelData service method. + /// + /// The response from the DeleteMLInputChannelData service method, as returned by CleanRoomsML. + /// + /// You do not have sufficient access to perform this action. + /// + /// + /// You can't complete this action because another resource depends on this resource. + /// + /// + /// The resource you are requesting does not exist. + /// + /// + /// The request parameters for this request are incorrect. + /// + /// REST API Reference for DeleteMLInputChannelData Operation + public virtual DeleteMLInputChannelDataResponse DeleteMLInputChannelData(DeleteMLInputChannelDataRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = DeleteMLInputChannelDataRequestMarshaller.Instance; + options.ResponseUnmarshaller = DeleteMLInputChannelDataResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// Provides the information necessary to delete an ML input channel. + /// + /// Container for the necessary parameters to execute the DeleteMLInputChannelData service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the DeleteMLInputChannelData service method, as returned by CleanRoomsML. + /// + /// You do not have sufficient access to perform this action. + /// + /// + /// You can't complete this action because another resource depends on this resource. + /// + /// + /// The resource you are requesting does not exist. + /// + /// + /// The request parameters for this request are incorrect. + /// + /// REST API Reference for DeleteMLInputChannelData Operation + public virtual Task DeleteMLInputChannelDataAsync(DeleteMLInputChannelDataRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = DeleteMLInputChannelDataRequestMarshaller.Instance; + options.ResponseUnmarshaller = DeleteMLInputChannelDataResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + + #region DeleteTrainedModelOutput + + + /// + /// Deletes the output of a trained model. + /// + /// Container for the necessary parameters to execute the DeleteTrainedModelOutput service method. + /// + /// The response from the DeleteTrainedModelOutput service method, as returned by CleanRoomsML. + /// + /// You do not have sufficient access to perform this action. + /// + /// + /// You can't complete this action because another resource depends on this resource. + /// + /// + /// The resource you are requesting does not exist. + /// + /// + /// The request parameters for this request are incorrect. + /// + /// REST API Reference for DeleteTrainedModelOutput Operation + public virtual DeleteTrainedModelOutputResponse DeleteTrainedModelOutput(DeleteTrainedModelOutputRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = DeleteTrainedModelOutputRequestMarshaller.Instance; + options.ResponseUnmarshaller = DeleteTrainedModelOutputResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// Deletes the output of a trained model. + /// + /// Container for the necessary parameters to execute the DeleteTrainedModelOutput service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the DeleteTrainedModelOutput service method, as returned by CleanRoomsML. + /// + /// You do not have sufficient access to perform this action. + /// + /// + /// You can't complete this action because another resource depends on this resource. + /// + /// + /// The resource you are requesting does not exist. + /// + /// + /// The request parameters for this request are incorrect. + /// + /// REST API Reference for DeleteTrainedModelOutput Operation + public virtual Task DeleteTrainedModelOutputAsync(DeleteTrainedModelOutputRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = DeleteTrainedModelOutputRequestMarshaller.Instance; + options.ResponseUnmarshaller = DeleteTrainedModelOutputResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + + #region DeleteTrainingDataset + + + /// + /// Specifies a training dataset that you want to delete. You can't delete a training + /// dataset if there are any audience models that depend on the training dataset. In Clean + /// Rooms ML, the TrainingDataset is metadata that points to a Glue table, which + /// is read only during AudienceModel creation. This action deletes the metadata. + /// + /// Container for the necessary parameters to execute the DeleteTrainingDataset service method. + /// + /// The response from the DeleteTrainingDataset service method, as returned by CleanRoomsML. + /// + /// You do not have sufficient access to perform this action. + /// + /// + /// You can't complete this action because another resource depends on this resource. + /// + /// + /// The resource you are requesting does not exist. + /// + /// + /// The request parameters for this request are incorrect. + /// + /// REST API Reference for DeleteTrainingDataset Operation + public virtual DeleteTrainingDatasetResponse DeleteTrainingDataset(DeleteTrainingDatasetRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = DeleteTrainingDatasetRequestMarshaller.Instance; + options.ResponseUnmarshaller = DeleteTrainingDatasetResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// Specifies a training dataset that you want to delete. You can't delete a training + /// dataset if there are any audience models that depend on the training dataset. In Clean + /// Rooms ML, the TrainingDataset is metadata that points to a Glue table, which + /// is read only during AudienceModel creation. This action deletes the metadata. + /// + /// Container for the necessary parameters to execute the DeleteTrainingDataset service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the DeleteTrainingDataset service method, as returned by CleanRoomsML. + /// + /// You do not have sufficient access to perform this action. + /// + /// + /// You can't complete this action because another resource depends on this resource. + /// + /// + /// The resource you are requesting does not exist. + /// + /// + /// The request parameters for this request are incorrect. + /// + /// REST API Reference for DeleteTrainingDataset Operation + public virtual Task DeleteTrainingDatasetAsync(DeleteTrainingDatasetRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = DeleteTrainingDatasetRequestMarshaller.Instance; + options.ResponseUnmarshaller = DeleteTrainingDatasetResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + + #region GetAudienceGenerationJob + + + /// + /// Returns information about an audience generation job. + /// + /// Container for the necessary parameters to execute the GetAudienceGenerationJob service method. + /// + /// The response from the GetAudienceGenerationJob service method, as returned by CleanRoomsML. + /// + /// You do not have sufficient access to perform this action. + /// + /// + /// The resource you are requesting does not exist. + /// + /// + /// The request parameters for this request are incorrect. + /// + /// REST API Reference for GetAudienceGenerationJob Operation + public virtual GetAudienceGenerationJobResponse GetAudienceGenerationJob(GetAudienceGenerationJobRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = GetAudienceGenerationJobRequestMarshaller.Instance; + options.ResponseUnmarshaller = GetAudienceGenerationJobResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// Returns information about an audience generation job. + /// + /// Container for the necessary parameters to execute the GetAudienceGenerationJob service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the GetAudienceGenerationJob service method, as returned by CleanRoomsML. + /// + /// You do not have sufficient access to perform this action. + /// + /// + /// The resource you are requesting does not exist. + /// + /// + /// The request parameters for this request are incorrect. + /// + /// REST API Reference for GetAudienceGenerationJob Operation + public virtual Task GetAudienceGenerationJobAsync(GetAudienceGenerationJobRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = GetAudienceGenerationJobRequestMarshaller.Instance; + options.ResponseUnmarshaller = GetAudienceGenerationJobResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + + #region GetAudienceModel + + + /// + /// Returns information about an audience model + /// + /// Container for the necessary parameters to execute the GetAudienceModel service method. + /// + /// The response from the GetAudienceModel service method, as returned by CleanRoomsML. + /// + /// You do not have sufficient access to perform this action. + /// + /// + /// The resource you are requesting does not exist. + /// + /// + /// The request parameters for this request are incorrect. + /// + /// REST API Reference for GetAudienceModel Operation + public virtual GetAudienceModelResponse GetAudienceModel(GetAudienceModelRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = GetAudienceModelRequestMarshaller.Instance; + options.ResponseUnmarshaller = GetAudienceModelResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// Returns information about an audience model + /// + /// Container for the necessary parameters to execute the GetAudienceModel service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the GetAudienceModel service method, as returned by CleanRoomsML. + /// + /// You do not have sufficient access to perform this action. + /// + /// + /// The resource you are requesting does not exist. + /// + /// + /// The request parameters for this request are incorrect. + /// + /// REST API Reference for GetAudienceModel Operation + public virtual Task GetAudienceModelAsync(GetAudienceModelRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = GetAudienceModelRequestMarshaller.Instance; + options.ResponseUnmarshaller = GetAudienceModelResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + + #region GetCollaborationConfiguredModelAlgorithmAssociation + + + /// + /// Returns information about the configured model algorithm association in a collaboration. + /// + /// Container for the necessary parameters to execute the GetCollaborationConfiguredModelAlgorithmAssociation service method. + /// + /// The response from the GetCollaborationConfiguredModelAlgorithmAssociation service method, as returned by CleanRoomsML. + /// + /// You do not have sufficient access to perform this action. + /// + /// + /// The resource you are requesting does not exist. + /// + /// + /// The request parameters for this request are incorrect. + /// + /// REST API Reference for GetCollaborationConfiguredModelAlgorithmAssociation Operation + public virtual GetCollaborationConfiguredModelAlgorithmAssociationResponse GetCollaborationConfiguredModelAlgorithmAssociation(GetCollaborationConfiguredModelAlgorithmAssociationRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = GetCollaborationConfiguredModelAlgorithmAssociationRequestMarshaller.Instance; + options.ResponseUnmarshaller = GetCollaborationConfiguredModelAlgorithmAssociationResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// Returns information about the configured model algorithm association in a collaboration. + /// + /// Container for the necessary parameters to execute the GetCollaborationConfiguredModelAlgorithmAssociation service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the GetCollaborationConfiguredModelAlgorithmAssociation service method, as returned by CleanRoomsML. + /// + /// You do not have sufficient access to perform this action. + /// + /// + /// The resource you are requesting does not exist. + /// + /// + /// The request parameters for this request are incorrect. + /// + /// REST API Reference for GetCollaborationConfiguredModelAlgorithmAssociation Operation + public virtual Task GetCollaborationConfiguredModelAlgorithmAssociationAsync(GetCollaborationConfiguredModelAlgorithmAssociationRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = GetCollaborationConfiguredModelAlgorithmAssociationRequestMarshaller.Instance; + options.ResponseUnmarshaller = GetCollaborationConfiguredModelAlgorithmAssociationResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + + #region GetCollaborationMLInputChannel + + + /// + /// Returns information about a specific ML input channel in a collaboration. + /// + /// Container for the necessary parameters to execute the GetCollaborationMLInputChannel service method. + /// + /// The response from the GetCollaborationMLInputChannel service method, as returned by CleanRoomsML. + /// + /// You do not have sufficient access to perform this action. + /// + /// + /// The resource you are requesting does not exist. + /// + /// + /// The request parameters for this request are incorrect. + /// + /// REST API Reference for GetCollaborationMLInputChannel Operation + public virtual GetCollaborationMLInputChannelResponse GetCollaborationMLInputChannel(GetCollaborationMLInputChannelRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = GetCollaborationMLInputChannelRequestMarshaller.Instance; + options.ResponseUnmarshaller = GetCollaborationMLInputChannelResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// Returns information about a specific ML input channel in a collaboration. + /// + /// Container for the necessary parameters to execute the GetCollaborationMLInputChannel service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the GetCollaborationMLInputChannel service method, as returned by CleanRoomsML. + /// + /// You do not have sufficient access to perform this action. + /// + /// + /// The resource you are requesting does not exist. + /// + /// + /// The request parameters for this request are incorrect. + /// + /// REST API Reference for GetCollaborationMLInputChannel Operation + public virtual Task GetCollaborationMLInputChannelAsync(GetCollaborationMLInputChannelRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = GetCollaborationMLInputChannelRequestMarshaller.Instance; + options.ResponseUnmarshaller = GetCollaborationMLInputChannelResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + + #region GetCollaborationTrainedModel + + + /// + /// Returns information about a trained model in a collaboration. + /// + /// Container for the necessary parameters to execute the GetCollaborationTrainedModel service method. + /// + /// The response from the GetCollaborationTrainedModel service method, as returned by CleanRoomsML. + /// + /// You do not have sufficient access to perform this action. + /// + /// + /// The resource you are requesting does not exist. + /// + /// + /// The request parameters for this request are incorrect. + /// + /// REST API Reference for GetCollaborationTrainedModel Operation + public virtual GetCollaborationTrainedModelResponse GetCollaborationTrainedModel(GetCollaborationTrainedModelRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = GetCollaborationTrainedModelRequestMarshaller.Instance; + options.ResponseUnmarshaller = GetCollaborationTrainedModelResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// Returns information about a trained model in a collaboration. + /// + /// Container for the necessary parameters to execute the GetCollaborationTrainedModel service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the GetCollaborationTrainedModel service method, as returned by CleanRoomsML. + /// + /// You do not have sufficient access to perform this action. + /// + /// + /// The resource you are requesting does not exist. + /// + /// + /// The request parameters for this request are incorrect. + /// + /// REST API Reference for GetCollaborationTrainedModel Operation + public virtual Task GetCollaborationTrainedModelAsync(GetCollaborationTrainedModelRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = GetCollaborationTrainedModelRequestMarshaller.Instance; + options.ResponseUnmarshaller = GetCollaborationTrainedModelResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + + #region GetConfiguredAudienceModel + + + /// + /// Returns information about a specified configured audience model. + /// + /// Container for the necessary parameters to execute the GetConfiguredAudienceModel service method. + /// + /// The response from the GetConfiguredAudienceModel service method, as returned by CleanRoomsML. + /// + /// You do not have sufficient access to perform this action. + /// + /// + /// The resource you are requesting does not exist. + /// + /// + /// The request parameters for this request are incorrect. + /// + /// REST API Reference for GetConfiguredAudienceModel Operation + public virtual GetConfiguredAudienceModelResponse GetConfiguredAudienceModel(GetConfiguredAudienceModelRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = GetConfiguredAudienceModelRequestMarshaller.Instance; + options.ResponseUnmarshaller = GetConfiguredAudienceModelResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// Returns information about a specified configured audience model. + /// + /// Container for the necessary parameters to execute the GetConfiguredAudienceModel service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the GetConfiguredAudienceModel service method, as returned by CleanRoomsML. + /// + /// You do not have sufficient access to perform this action. + /// + /// + /// The resource you are requesting does not exist. + /// + /// + /// The request parameters for this request are incorrect. + /// + /// REST API Reference for GetConfiguredAudienceModel Operation + public virtual Task GetConfiguredAudienceModelAsync(GetConfiguredAudienceModelRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = GetConfiguredAudienceModelRequestMarshaller.Instance; + options.ResponseUnmarshaller = GetConfiguredAudienceModelResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + + #region GetConfiguredAudienceModelPolicy + + + /// + /// Returns information about a configured audience model policy. + /// + /// Container for the necessary parameters to execute the GetConfiguredAudienceModelPolicy service method. + /// + /// The response from the GetConfiguredAudienceModelPolicy service method, as returned by CleanRoomsML. + /// + /// You do not have sufficient access to perform this action. + /// + /// + /// The resource you are requesting does not exist. + /// + /// + /// The request parameters for this request are incorrect. + /// + /// REST API Reference for GetConfiguredAudienceModelPolicy Operation + public virtual GetConfiguredAudienceModelPolicyResponse GetConfiguredAudienceModelPolicy(GetConfiguredAudienceModelPolicyRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = GetConfiguredAudienceModelPolicyRequestMarshaller.Instance; + options.ResponseUnmarshaller = GetConfiguredAudienceModelPolicyResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// Returns information about a configured audience model policy. + /// + /// Container for the necessary parameters to execute the GetConfiguredAudienceModelPolicy service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the GetConfiguredAudienceModelPolicy service method, as returned by CleanRoomsML. + /// + /// You do not have sufficient access to perform this action. + /// + /// + /// The resource you are requesting does not exist. + /// + /// + /// The request parameters for this request are incorrect. + /// + /// REST API Reference for GetConfiguredAudienceModelPolicy Operation + public virtual Task GetConfiguredAudienceModelPolicyAsync(GetConfiguredAudienceModelPolicyRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = GetConfiguredAudienceModelPolicyRequestMarshaller.Instance; + options.ResponseUnmarshaller = GetConfiguredAudienceModelPolicyResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + + #region GetConfiguredModelAlgorithm + + + /// + /// Returns information about a configured model algorithm. + /// + /// Container for the necessary parameters to execute the GetConfiguredModelAlgorithm service method. + /// + /// The response from the GetConfiguredModelAlgorithm service method, as returned by CleanRoomsML. + /// + /// You do not have sufficient access to perform this action. + /// + /// + /// The resource you are requesting does not exist. + /// + /// + /// The request parameters for this request are incorrect. + /// + /// REST API Reference for GetConfiguredModelAlgorithm Operation + public virtual GetConfiguredModelAlgorithmResponse GetConfiguredModelAlgorithm(GetConfiguredModelAlgorithmRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = GetConfiguredModelAlgorithmRequestMarshaller.Instance; + options.ResponseUnmarshaller = GetConfiguredModelAlgorithmResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// Returns information about a configured model algorithm. + /// + /// Container for the necessary parameters to execute the GetConfiguredModelAlgorithm service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the GetConfiguredModelAlgorithm service method, as returned by CleanRoomsML. + /// + /// You do not have sufficient access to perform this action. + /// + /// + /// The resource you are requesting does not exist. + /// + /// + /// The request parameters for this request are incorrect. + /// + /// REST API Reference for GetConfiguredModelAlgorithm Operation + public virtual Task GetConfiguredModelAlgorithmAsync(GetConfiguredModelAlgorithmRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = GetConfiguredModelAlgorithmRequestMarshaller.Instance; + options.ResponseUnmarshaller = GetConfiguredModelAlgorithmResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + + #region GetConfiguredModelAlgorithmAssociation + + + /// + /// Returns information about a configured model algorithm association. + /// + /// Container for the necessary parameters to execute the GetConfiguredModelAlgorithmAssociation service method. + /// + /// The response from the GetConfiguredModelAlgorithmAssociation service method, as returned by CleanRoomsML. + /// + /// You do not have sufficient access to perform this action. + /// + /// + /// The resource you are requesting does not exist. + /// + /// + /// The request parameters for this request are incorrect. + /// + /// REST API Reference for GetConfiguredModelAlgorithmAssociation Operation + public virtual GetConfiguredModelAlgorithmAssociationResponse GetConfiguredModelAlgorithmAssociation(GetConfiguredModelAlgorithmAssociationRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = GetConfiguredModelAlgorithmAssociationRequestMarshaller.Instance; + options.ResponseUnmarshaller = GetConfiguredModelAlgorithmAssociationResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// Returns information about a configured model algorithm association. + /// + /// Container for the necessary parameters to execute the GetConfiguredModelAlgorithmAssociation service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the GetConfiguredModelAlgorithmAssociation service method, as returned by CleanRoomsML. + /// + /// You do not have sufficient access to perform this action. + /// + /// + /// The resource you are requesting does not exist. + /// + /// + /// The request parameters for this request are incorrect. + /// + /// REST API Reference for GetConfiguredModelAlgorithmAssociation Operation + public virtual Task GetConfiguredModelAlgorithmAssociationAsync(GetConfiguredModelAlgorithmAssociationRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = GetConfiguredModelAlgorithmAssociationRequestMarshaller.Instance; + options.ResponseUnmarshaller = GetConfiguredModelAlgorithmAssociationResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + + #region GetMLConfiguration + + + /// + /// Returns information about a specific ML configuration. + /// + /// Container for the necessary parameters to execute the GetMLConfiguration service method. + /// + /// The response from the GetMLConfiguration service method, as returned by CleanRoomsML. + /// + /// You do not have sufficient access to perform this action. + /// + /// + /// The resource you are requesting does not exist. + /// + /// + /// The request parameters for this request are incorrect. + /// + /// REST API Reference for GetMLConfiguration Operation + public virtual GetMLConfigurationResponse GetMLConfiguration(GetMLConfigurationRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = GetMLConfigurationRequestMarshaller.Instance; + options.ResponseUnmarshaller = GetMLConfigurationResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// Returns information about a specific ML configuration. + /// + /// Container for the necessary parameters to execute the GetMLConfiguration service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the GetMLConfiguration service method, as returned by CleanRoomsML. + /// + /// You do not have sufficient access to perform this action. + /// + /// + /// The resource you are requesting does not exist. + /// + /// + /// The request parameters for this request are incorrect. + /// + /// REST API Reference for GetMLConfiguration Operation + public virtual Task GetMLConfigurationAsync(GetMLConfigurationRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = GetMLConfigurationRequestMarshaller.Instance; + options.ResponseUnmarshaller = GetMLConfigurationResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + + #region GetMLInputChannel + + + /// + /// Returns information about an ML input channel. + /// + /// Container for the necessary parameters to execute the GetMLInputChannel service method. + /// + /// The response from the GetMLInputChannel service method, as returned by CleanRoomsML. + /// + /// You do not have sufficient access to perform this action. + /// + /// + /// The resource you are requesting does not exist. + /// + /// + /// The request parameters for this request are incorrect. + /// + /// REST API Reference for GetMLInputChannel Operation + public virtual GetMLInputChannelResponse GetMLInputChannel(GetMLInputChannelRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = GetMLInputChannelRequestMarshaller.Instance; + options.ResponseUnmarshaller = GetMLInputChannelResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// Returns information about an ML input channel. + /// + /// Container for the necessary parameters to execute the GetMLInputChannel service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the GetMLInputChannel service method, as returned by CleanRoomsML. + /// + /// You do not have sufficient access to perform this action. + /// + /// + /// The resource you are requesting does not exist. + /// + /// + /// The request parameters for this request are incorrect. + /// + /// REST API Reference for GetMLInputChannel Operation + public virtual Task GetMLInputChannelAsync(GetMLInputChannelRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = GetMLInputChannelRequestMarshaller.Instance; + options.ResponseUnmarshaller = GetMLInputChannelResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + + #region GetTrainedModel + + + /// + /// Returns information about a trained model. + /// + /// Container for the necessary parameters to execute the GetTrainedModel service method. + /// + /// The response from the GetTrainedModel service method, as returned by CleanRoomsML. + /// + /// You do not have sufficient access to perform this action. + /// + /// + /// The resource you are requesting does not exist. + /// + /// + /// The request parameters for this request are incorrect. + /// + /// REST API Reference for GetTrainedModel Operation + public virtual GetTrainedModelResponse GetTrainedModel(GetTrainedModelRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = GetTrainedModelRequestMarshaller.Instance; + options.ResponseUnmarshaller = GetTrainedModelResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// Returns information about a trained model. + /// + /// Container for the necessary parameters to execute the GetTrainedModel service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the GetTrainedModel service method, as returned by CleanRoomsML. + /// + /// You do not have sufficient access to perform this action. + /// + /// + /// The resource you are requesting does not exist. + /// + /// + /// The request parameters for this request are incorrect. + /// + /// REST API Reference for GetTrainedModel Operation + public virtual Task GetTrainedModelAsync(GetTrainedModelRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = GetTrainedModelRequestMarshaller.Instance; + options.ResponseUnmarshaller = GetTrainedModelResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + + #region GetTrainedModelInferenceJob + + + /// + /// Returns information about a trained model inference job. + /// + /// Container for the necessary parameters to execute the GetTrainedModelInferenceJob service method. + /// + /// The response from the GetTrainedModelInferenceJob service method, as returned by CleanRoomsML. + /// + /// You do not have sufficient access to perform this action. + /// + /// + /// The resource you are requesting does not exist. + /// + /// + /// The request parameters for this request are incorrect. + /// + /// REST API Reference for GetTrainedModelInferenceJob Operation + public virtual GetTrainedModelInferenceJobResponse GetTrainedModelInferenceJob(GetTrainedModelInferenceJobRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = GetTrainedModelInferenceJobRequestMarshaller.Instance; + options.ResponseUnmarshaller = GetTrainedModelInferenceJobResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// Returns information about a trained model inference job. + /// + /// Container for the necessary parameters to execute the GetTrainedModelInferenceJob service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the GetTrainedModelInferenceJob service method, as returned by CleanRoomsML. + /// + /// You do not have sufficient access to perform this action. + /// + /// + /// The resource you are requesting does not exist. + /// + /// + /// The request parameters for this request are incorrect. + /// + /// REST API Reference for GetTrainedModelInferenceJob Operation + public virtual Task GetTrainedModelInferenceJobAsync(GetTrainedModelInferenceJobRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = GetTrainedModelInferenceJobRequestMarshaller.Instance; + options.ResponseUnmarshaller = GetTrainedModelInferenceJobResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + + #region GetTrainingDataset + + + /// + /// Returns information about a training dataset. + /// + /// Container for the necessary parameters to execute the GetTrainingDataset service method. + /// + /// The response from the GetTrainingDataset service method, as returned by CleanRoomsML. + /// + /// You do not have sufficient access to perform this action. + /// + /// + /// The resource you are requesting does not exist. + /// + /// + /// The request parameters for this request are incorrect. + /// + /// REST API Reference for GetTrainingDataset Operation + public virtual GetTrainingDatasetResponse GetTrainingDataset(GetTrainingDatasetRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = GetTrainingDatasetRequestMarshaller.Instance; + options.ResponseUnmarshaller = GetTrainingDatasetResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// Returns information about a training dataset. + /// + /// Container for the necessary parameters to execute the GetTrainingDataset service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the GetTrainingDataset service method, as returned by CleanRoomsML. + /// + /// You do not have sufficient access to perform this action. + /// + /// + /// The resource you are requesting does not exist. + /// + /// + /// The request parameters for this request are incorrect. + /// + /// REST API Reference for GetTrainingDataset Operation + public virtual Task GetTrainingDatasetAsync(GetTrainingDatasetRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = GetTrainingDatasetRequestMarshaller.Instance; + options.ResponseUnmarshaller = GetTrainingDatasetResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + + #region ListAudienceExportJobs + + + /// + /// Returns a list of the audience export jobs. + /// + /// Container for the necessary parameters to execute the ListAudienceExportJobs service method. + /// + /// The response from the ListAudienceExportJobs service method, as returned by CleanRoomsML. + /// + /// You do not have sufficient access to perform this action. + /// + /// + /// The request parameters for this request are incorrect. + /// + /// REST API Reference for ListAudienceExportJobs Operation + public virtual ListAudienceExportJobsResponse ListAudienceExportJobs(ListAudienceExportJobsRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = ListAudienceExportJobsRequestMarshaller.Instance; + options.ResponseUnmarshaller = ListAudienceExportJobsResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// Returns a list of the audience export jobs. + /// + /// Container for the necessary parameters to execute the ListAudienceExportJobs service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the ListAudienceExportJobs service method, as returned by CleanRoomsML. + /// + /// You do not have sufficient access to perform this action. + /// + /// + /// The request parameters for this request are incorrect. + /// + /// REST API Reference for ListAudienceExportJobs Operation + public virtual Task ListAudienceExportJobsAsync(ListAudienceExportJobsRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = ListAudienceExportJobsRequestMarshaller.Instance; + options.ResponseUnmarshaller = ListAudienceExportJobsResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + + #region ListAudienceGenerationJobs + + + /// + /// Returns a list of audience generation jobs. + /// + /// Container for the necessary parameters to execute the ListAudienceGenerationJobs service method. + /// + /// The response from the ListAudienceGenerationJobs service method, as returned by CleanRoomsML. + /// + /// You do not have sufficient access to perform this action. + /// + /// + /// The request parameters for this request are incorrect. + /// + /// REST API Reference for ListAudienceGenerationJobs Operation + public virtual ListAudienceGenerationJobsResponse ListAudienceGenerationJobs(ListAudienceGenerationJobsRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = ListAudienceGenerationJobsRequestMarshaller.Instance; + options.ResponseUnmarshaller = ListAudienceGenerationJobsResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// Returns a list of audience generation jobs. + /// + /// Container for the necessary parameters to execute the ListAudienceGenerationJobs service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the ListAudienceGenerationJobs service method, as returned by CleanRoomsML. + /// + /// You do not have sufficient access to perform this action. + /// + /// + /// The request parameters for this request are incorrect. + /// + /// REST API Reference for ListAudienceGenerationJobs Operation + public virtual Task ListAudienceGenerationJobsAsync(ListAudienceGenerationJobsRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = ListAudienceGenerationJobsRequestMarshaller.Instance; + options.ResponseUnmarshaller = ListAudienceGenerationJobsResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + + #region ListAudienceModels + + + /// + /// Returns a list of audience models. + /// + /// Container for the necessary parameters to execute the ListAudienceModels service method. + /// + /// The response from the ListAudienceModels service method, as returned by CleanRoomsML. + /// + /// You do not have sufficient access to perform this action. + /// + /// + /// The request parameters for this request are incorrect. + /// + /// REST API Reference for ListAudienceModels Operation + public virtual ListAudienceModelsResponse ListAudienceModels(ListAudienceModelsRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = ListAudienceModelsRequestMarshaller.Instance; + options.ResponseUnmarshaller = ListAudienceModelsResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// Returns a list of audience models. + /// + /// Container for the necessary parameters to execute the ListAudienceModels service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the ListAudienceModels service method, as returned by CleanRoomsML. + /// + /// You do not have sufficient access to perform this action. + /// + /// + /// The request parameters for this request are incorrect. + /// + /// REST API Reference for ListAudienceModels Operation + public virtual Task ListAudienceModelsAsync(ListAudienceModelsRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = ListAudienceModelsRequestMarshaller.Instance; + options.ResponseUnmarshaller = ListAudienceModelsResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + + #region ListCollaborationConfiguredModelAlgorithmAssociations + + + /// + /// Returns a list of the configured model algorithm associations in a collaboration. + /// + /// Container for the necessary parameters to execute the ListCollaborationConfiguredModelAlgorithmAssociations service method. + /// + /// The response from the ListCollaborationConfiguredModelAlgorithmAssociations service method, as returned by CleanRoomsML. + /// + /// You do not have sufficient access to perform this action. + /// + /// + /// The request parameters for this request are incorrect. + /// + /// REST API Reference for ListCollaborationConfiguredModelAlgorithmAssociations Operation + public virtual ListCollaborationConfiguredModelAlgorithmAssociationsResponse ListCollaborationConfiguredModelAlgorithmAssociations(ListCollaborationConfiguredModelAlgorithmAssociationsRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = ListCollaborationConfiguredModelAlgorithmAssociationsRequestMarshaller.Instance; + options.ResponseUnmarshaller = ListCollaborationConfiguredModelAlgorithmAssociationsResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// Returns a list of the configured model algorithm associations in a collaboration. + /// + /// Container for the necessary parameters to execute the ListCollaborationConfiguredModelAlgorithmAssociations service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the ListCollaborationConfiguredModelAlgorithmAssociations service method, as returned by CleanRoomsML. + /// + /// You do not have sufficient access to perform this action. + /// + /// + /// The request parameters for this request are incorrect. + /// + /// REST API Reference for ListCollaborationConfiguredModelAlgorithmAssociations Operation + public virtual Task ListCollaborationConfiguredModelAlgorithmAssociationsAsync(ListCollaborationConfiguredModelAlgorithmAssociationsRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = ListCollaborationConfiguredModelAlgorithmAssociationsRequestMarshaller.Instance; + options.ResponseUnmarshaller = ListCollaborationConfiguredModelAlgorithmAssociationsResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + + #region ListCollaborationMLInputChannels + + + /// + /// Returns a list of the ML input channels in a collaboration. + /// + /// Container for the necessary parameters to execute the ListCollaborationMLInputChannels service method. + /// + /// The response from the ListCollaborationMLInputChannels service method, as returned by CleanRoomsML. + /// + /// You do not have sufficient access to perform this action. + /// + /// + /// The request parameters for this request are incorrect. + /// + /// REST API Reference for ListCollaborationMLInputChannels Operation + public virtual ListCollaborationMLInputChannelsResponse ListCollaborationMLInputChannels(ListCollaborationMLInputChannelsRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = ListCollaborationMLInputChannelsRequestMarshaller.Instance; + options.ResponseUnmarshaller = ListCollaborationMLInputChannelsResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// Returns a list of the ML input channels in a collaboration. + /// + /// Container for the necessary parameters to execute the ListCollaborationMLInputChannels service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the ListCollaborationMLInputChannels service method, as returned by CleanRoomsML. + /// + /// You do not have sufficient access to perform this action. + /// + /// + /// The request parameters for this request are incorrect. + /// + /// REST API Reference for ListCollaborationMLInputChannels Operation + public virtual Task ListCollaborationMLInputChannelsAsync(ListCollaborationMLInputChannelsRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = ListCollaborationMLInputChannelsRequestMarshaller.Instance; + options.ResponseUnmarshaller = ListCollaborationMLInputChannelsResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + + #region ListCollaborationTrainedModelExportJobs + + + /// + /// Returns a list of the export jobs for a trained model in a collaboration. + /// + /// Container for the necessary parameters to execute the ListCollaborationTrainedModelExportJobs service method. + /// + /// The response from the ListCollaborationTrainedModelExportJobs service method, as returned by CleanRoomsML. + /// + /// You do not have sufficient access to perform this action. + /// + /// + /// The request parameters for this request are incorrect. + /// + /// REST API Reference for ListCollaborationTrainedModelExportJobs Operation + public virtual ListCollaborationTrainedModelExportJobsResponse ListCollaborationTrainedModelExportJobs(ListCollaborationTrainedModelExportJobsRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = ListCollaborationTrainedModelExportJobsRequestMarshaller.Instance; + options.ResponseUnmarshaller = ListCollaborationTrainedModelExportJobsResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// Returns a list of the export jobs for a trained model in a collaboration. + /// + /// Container for the necessary parameters to execute the ListCollaborationTrainedModelExportJobs service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the ListCollaborationTrainedModelExportJobs service method, as returned by CleanRoomsML. + /// + /// You do not have sufficient access to perform this action. + /// + /// + /// The request parameters for this request are incorrect. + /// + /// REST API Reference for ListCollaborationTrainedModelExportJobs Operation + public virtual Task ListCollaborationTrainedModelExportJobsAsync(ListCollaborationTrainedModelExportJobsRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = ListCollaborationTrainedModelExportJobsRequestMarshaller.Instance; + options.ResponseUnmarshaller = ListCollaborationTrainedModelExportJobsResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + + #region ListCollaborationTrainedModelInferenceJobs + + + /// + /// Returns a list of trained model inference jobs in a specified collaboration. + /// + /// Container for the necessary parameters to execute the ListCollaborationTrainedModelInferenceJobs service method. + /// + /// The response from the ListCollaborationTrainedModelInferenceJobs service method, as returned by CleanRoomsML. + /// + /// You do not have sufficient access to perform this action. + /// + /// + /// The request parameters for this request are incorrect. + /// + /// REST API Reference for ListCollaborationTrainedModelInferenceJobs Operation + public virtual ListCollaborationTrainedModelInferenceJobsResponse ListCollaborationTrainedModelInferenceJobs(ListCollaborationTrainedModelInferenceJobsRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = ListCollaborationTrainedModelInferenceJobsRequestMarshaller.Instance; + options.ResponseUnmarshaller = ListCollaborationTrainedModelInferenceJobsResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// Returns a list of trained model inference jobs in a specified collaboration. + /// + /// Container for the necessary parameters to execute the ListCollaborationTrainedModelInferenceJobs service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the ListCollaborationTrainedModelInferenceJobs service method, as returned by CleanRoomsML. + /// + /// You do not have sufficient access to perform this action. + /// + /// + /// The request parameters for this request are incorrect. + /// + /// REST API Reference for ListCollaborationTrainedModelInferenceJobs Operation + public virtual Task ListCollaborationTrainedModelInferenceJobsAsync(ListCollaborationTrainedModelInferenceJobsRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = ListCollaborationTrainedModelInferenceJobsRequestMarshaller.Instance; + options.ResponseUnmarshaller = ListCollaborationTrainedModelInferenceJobsResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + + #region ListCollaborationTrainedModels + + + /// + /// Returns a list of the trained models in a collaboration. + /// + /// Container for the necessary parameters to execute the ListCollaborationTrainedModels service method. + /// + /// The response from the ListCollaborationTrainedModels service method, as returned by CleanRoomsML. + /// + /// You do not have sufficient access to perform this action. + /// + /// + /// The request parameters for this request are incorrect. + /// + /// REST API Reference for ListCollaborationTrainedModels Operation + public virtual ListCollaborationTrainedModelsResponse ListCollaborationTrainedModels(ListCollaborationTrainedModelsRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = ListCollaborationTrainedModelsRequestMarshaller.Instance; + options.ResponseUnmarshaller = ListCollaborationTrainedModelsResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// Returns a list of the trained models in a collaboration. + /// + /// Container for the necessary parameters to execute the ListCollaborationTrainedModels service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the ListCollaborationTrainedModels service method, as returned by CleanRoomsML. + /// + /// You do not have sufficient access to perform this action. + /// + /// + /// The request parameters for this request are incorrect. + /// + /// REST API Reference for ListCollaborationTrainedModels Operation + public virtual Task ListCollaborationTrainedModelsAsync(ListCollaborationTrainedModelsRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = ListCollaborationTrainedModelsRequestMarshaller.Instance; + options.ResponseUnmarshaller = ListCollaborationTrainedModelsResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + + #region ListConfiguredAudienceModels + + + /// + /// Returns a list of the configured audience models. + /// + /// Container for the necessary parameters to execute the ListConfiguredAudienceModels service method. + /// + /// The response from the ListConfiguredAudienceModels service method, as returned by CleanRoomsML. + /// + /// You do not have sufficient access to perform this action. + /// + /// + /// The request parameters for this request are incorrect. + /// + /// REST API Reference for ListConfiguredAudienceModels Operation + public virtual ListConfiguredAudienceModelsResponse ListConfiguredAudienceModels(ListConfiguredAudienceModelsRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = ListConfiguredAudienceModelsRequestMarshaller.Instance; + options.ResponseUnmarshaller = ListConfiguredAudienceModelsResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// Returns a list of the configured audience models. + /// + /// Container for the necessary parameters to execute the ListConfiguredAudienceModels service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the ListConfiguredAudienceModels service method, as returned by CleanRoomsML. + /// + /// You do not have sufficient access to perform this action. + /// + /// + /// The request parameters for this request are incorrect. + /// + /// REST API Reference for ListConfiguredAudienceModels Operation + public virtual Task ListConfiguredAudienceModelsAsync(ListConfiguredAudienceModelsRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = ListConfiguredAudienceModelsRequestMarshaller.Instance; + options.ResponseUnmarshaller = ListConfiguredAudienceModelsResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + + #region ListConfiguredModelAlgorithmAssociations + + + /// + /// Returns a list of configured model algorithm associations. + /// + /// Container for the necessary parameters to execute the ListConfiguredModelAlgorithmAssociations service method. + /// + /// The response from the ListConfiguredModelAlgorithmAssociations service method, as returned by CleanRoomsML. + /// + /// You do not have sufficient access to perform this action. + /// + /// + /// The request parameters for this request are incorrect. + /// + /// REST API Reference for ListConfiguredModelAlgorithmAssociations Operation + public virtual ListConfiguredModelAlgorithmAssociationsResponse ListConfiguredModelAlgorithmAssociations(ListConfiguredModelAlgorithmAssociationsRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = ListConfiguredModelAlgorithmAssociationsRequestMarshaller.Instance; + options.ResponseUnmarshaller = ListConfiguredModelAlgorithmAssociationsResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// Returns a list of configured model algorithm associations. + /// + /// Container for the necessary parameters to execute the ListConfiguredModelAlgorithmAssociations service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the ListConfiguredModelAlgorithmAssociations service method, as returned by CleanRoomsML. + /// + /// You do not have sufficient access to perform this action. + /// + /// + /// The request parameters for this request are incorrect. + /// + /// REST API Reference for ListConfiguredModelAlgorithmAssociations Operation + public virtual Task ListConfiguredModelAlgorithmAssociationsAsync(ListConfiguredModelAlgorithmAssociationsRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { var options = new InvokeOptions(); - options.RequestMarshaller = GetTrainingDatasetRequestMarshaller.Instance; - options.ResponseUnmarshaller = GetTrainingDatasetResponseUnmarshaller.Instance; + options.RequestMarshaller = ListConfiguredModelAlgorithmAssociationsRequestMarshaller.Instance; + options.ResponseUnmarshaller = ListConfiguredModelAlgorithmAssociationsResponseUnmarshaller.Instance; - return InvokeAsync(request, options, cancellationToken); + return InvokeAsync(request, options, cancellationToken); } #endregion - #region ListAudienceExportJobs + #region ListConfiguredModelAlgorithms /// - /// Returns a list of the audience export jobs. + /// Returns a list of configured model algorithms. /// - /// Container for the necessary parameters to execute the ListAudienceExportJobs service method. + /// Container for the necessary parameters to execute the ListConfiguredModelAlgorithms service method. /// - /// The response from the ListAudienceExportJobs service method, as returned by CleanRoomsML. + /// The response from the ListConfiguredModelAlgorithms service method, as returned by CleanRoomsML. /// /// You do not have sufficient access to perform this action. /// /// /// The request parameters for this request are incorrect. /// - /// REST API Reference for ListAudienceExportJobs Operation - public virtual ListAudienceExportJobsResponse ListAudienceExportJobs(ListAudienceExportJobsRequest request) + /// REST API Reference for ListConfiguredModelAlgorithms Operation + public virtual ListConfiguredModelAlgorithmsResponse ListConfiguredModelAlgorithms(ListConfiguredModelAlgorithmsRequest request) { var options = new InvokeOptions(); - options.RequestMarshaller = ListAudienceExportJobsRequestMarshaller.Instance; - options.ResponseUnmarshaller = ListAudienceExportJobsResponseUnmarshaller.Instance; + options.RequestMarshaller = ListConfiguredModelAlgorithmsRequestMarshaller.Instance; + options.ResponseUnmarshaller = ListConfiguredModelAlgorithmsResponseUnmarshaller.Instance; - return Invoke(request, options); + return Invoke(request, options); } /// - /// Returns a list of the audience export jobs. + /// Returns a list of configured model algorithms. /// - /// Container for the necessary parameters to execute the ListAudienceExportJobs service method. + /// Container for the necessary parameters to execute the ListConfiguredModelAlgorithms service method. /// /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// /// - /// The response from the ListAudienceExportJobs service method, as returned by CleanRoomsML. + /// The response from the ListConfiguredModelAlgorithms service method, as returned by CleanRoomsML. /// /// You do not have sufficient access to perform this action. /// /// /// The request parameters for this request are incorrect. /// - /// REST API Reference for ListAudienceExportJobs Operation - public virtual Task ListAudienceExportJobsAsync(ListAudienceExportJobsRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + /// REST API Reference for ListConfiguredModelAlgorithms Operation + public virtual Task ListConfiguredModelAlgorithmsAsync(ListConfiguredModelAlgorithmsRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { var options = new InvokeOptions(); - options.RequestMarshaller = ListAudienceExportJobsRequestMarshaller.Instance; - options.ResponseUnmarshaller = ListAudienceExportJobsResponseUnmarshaller.Instance; + options.RequestMarshaller = ListConfiguredModelAlgorithmsRequestMarshaller.Instance; + options.ResponseUnmarshaller = ListConfiguredModelAlgorithmsResponseUnmarshaller.Instance; - return InvokeAsync(request, options, cancellationToken); + return InvokeAsync(request, options, cancellationToken); } #endregion - #region ListAudienceGenerationJobs + #region ListMLInputChannels /// - /// Returns a list of audience generation jobs. + /// Returns a list of ML input channels. /// - /// Container for the necessary parameters to execute the ListAudienceGenerationJobs service method. + /// Container for the necessary parameters to execute the ListMLInputChannels service method. /// - /// The response from the ListAudienceGenerationJobs service method, as returned by CleanRoomsML. + /// The response from the ListMLInputChannels service method, as returned by CleanRoomsML. /// /// You do not have sufficient access to perform this action. /// /// /// The request parameters for this request are incorrect. /// - /// REST API Reference for ListAudienceGenerationJobs Operation - public virtual ListAudienceGenerationJobsResponse ListAudienceGenerationJobs(ListAudienceGenerationJobsRequest request) + /// REST API Reference for ListMLInputChannels Operation + public virtual ListMLInputChannelsResponse ListMLInputChannels(ListMLInputChannelsRequest request) { var options = new InvokeOptions(); - options.RequestMarshaller = ListAudienceGenerationJobsRequestMarshaller.Instance; - options.ResponseUnmarshaller = ListAudienceGenerationJobsResponseUnmarshaller.Instance; + options.RequestMarshaller = ListMLInputChannelsRequestMarshaller.Instance; + options.ResponseUnmarshaller = ListMLInputChannelsResponseUnmarshaller.Instance; - return Invoke(request, options); + return Invoke(request, options); } /// - /// Returns a list of audience generation jobs. + /// Returns a list of ML input channels. /// - /// Container for the necessary parameters to execute the ListAudienceGenerationJobs service method. + /// Container for the necessary parameters to execute the ListMLInputChannels service method. /// /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// /// - /// The response from the ListAudienceGenerationJobs service method, as returned by CleanRoomsML. + /// The response from the ListMLInputChannels service method, as returned by CleanRoomsML. /// /// You do not have sufficient access to perform this action. /// /// /// The request parameters for this request are incorrect. /// - /// REST API Reference for ListAudienceGenerationJobs Operation - public virtual Task ListAudienceGenerationJobsAsync(ListAudienceGenerationJobsRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + /// REST API Reference for ListMLInputChannels Operation + public virtual Task ListMLInputChannelsAsync(ListMLInputChannelsRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { var options = new InvokeOptions(); - options.RequestMarshaller = ListAudienceGenerationJobsRequestMarshaller.Instance; - options.ResponseUnmarshaller = ListAudienceGenerationJobsResponseUnmarshaller.Instance; + options.RequestMarshaller = ListMLInputChannelsRequestMarshaller.Instance; + options.ResponseUnmarshaller = ListMLInputChannelsResponseUnmarshaller.Instance; - return InvokeAsync(request, options, cancellationToken); + return InvokeAsync(request, options, cancellationToken); } #endregion - #region ListAudienceModels + #region ListTagsForResource /// - /// Returns a list of audience models. + /// Returns a list of tags for a provided resource. /// - /// Container for the necessary parameters to execute the ListAudienceModels service method. + /// Container for the necessary parameters to execute the ListTagsForResource service method. /// - /// The response from the ListAudienceModels service method, as returned by CleanRoomsML. + /// The response from the ListTagsForResource service method, as returned by CleanRoomsML. /// /// You do not have sufficient access to perform this action. /// + /// + /// The resource you are requesting does not exist. + /// /// /// The request parameters for this request are incorrect. /// - /// REST API Reference for ListAudienceModels Operation - public virtual ListAudienceModelsResponse ListAudienceModels(ListAudienceModelsRequest request) + /// REST API Reference for ListTagsForResource Operation + public virtual ListTagsForResourceResponse ListTagsForResource(ListTagsForResourceRequest request) { var options = new InvokeOptions(); - options.RequestMarshaller = ListAudienceModelsRequestMarshaller.Instance; - options.ResponseUnmarshaller = ListAudienceModelsResponseUnmarshaller.Instance; + options.RequestMarshaller = ListTagsForResourceRequestMarshaller.Instance; + options.ResponseUnmarshaller = ListTagsForResourceResponseUnmarshaller.Instance; - return Invoke(request, options); + return Invoke(request, options); } /// - /// Returns a list of audience models. + /// Returns a list of tags for a provided resource. /// - /// Container for the necessary parameters to execute the ListAudienceModels service method. + /// Container for the necessary parameters to execute the ListTagsForResource service method. /// /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// /// - /// The response from the ListAudienceModels service method, as returned by CleanRoomsML. + /// The response from the ListTagsForResource service method, as returned by CleanRoomsML. /// /// You do not have sufficient access to perform this action. /// + /// + /// The resource you are requesting does not exist. + /// /// /// The request parameters for this request are incorrect. /// - /// REST API Reference for ListAudienceModels Operation - public virtual Task ListAudienceModelsAsync(ListAudienceModelsRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + /// REST API Reference for ListTagsForResource Operation + public virtual Task ListTagsForResourceAsync(ListTagsForResourceRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { var options = new InvokeOptions(); - options.RequestMarshaller = ListAudienceModelsRequestMarshaller.Instance; - options.ResponseUnmarshaller = ListAudienceModelsResponseUnmarshaller.Instance; + options.RequestMarshaller = ListTagsForResourceRequestMarshaller.Instance; + options.ResponseUnmarshaller = ListTagsForResourceResponseUnmarshaller.Instance; - return InvokeAsync(request, options, cancellationToken); + return InvokeAsync(request, options, cancellationToken); } #endregion - #region ListConfiguredAudienceModels + #region ListTrainedModelInferenceJobs /// - /// Returns a list of the configured audience models. + /// Returns a list of trained model inference jobs that match the request parameters. /// - /// Container for the necessary parameters to execute the ListConfiguredAudienceModels service method. + /// Container for the necessary parameters to execute the ListTrainedModelInferenceJobs service method. /// - /// The response from the ListConfiguredAudienceModels service method, as returned by CleanRoomsML. + /// The response from the ListTrainedModelInferenceJobs service method, as returned by CleanRoomsML. /// /// You do not have sufficient access to perform this action. /// /// /// The request parameters for this request are incorrect. /// - /// REST API Reference for ListConfiguredAudienceModels Operation - public virtual ListConfiguredAudienceModelsResponse ListConfiguredAudienceModels(ListConfiguredAudienceModelsRequest request) + /// REST API Reference for ListTrainedModelInferenceJobs Operation + public virtual ListTrainedModelInferenceJobsResponse ListTrainedModelInferenceJobs(ListTrainedModelInferenceJobsRequest request) { var options = new InvokeOptions(); - options.RequestMarshaller = ListConfiguredAudienceModelsRequestMarshaller.Instance; - options.ResponseUnmarshaller = ListConfiguredAudienceModelsResponseUnmarshaller.Instance; + options.RequestMarshaller = ListTrainedModelInferenceJobsRequestMarshaller.Instance; + options.ResponseUnmarshaller = ListTrainedModelInferenceJobsResponseUnmarshaller.Instance; - return Invoke(request, options); + return Invoke(request, options); } /// - /// Returns a list of the configured audience models. + /// Returns a list of trained model inference jobs that match the request parameters. /// - /// Container for the necessary parameters to execute the ListConfiguredAudienceModels service method. + /// Container for the necessary parameters to execute the ListTrainedModelInferenceJobs service method. /// /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// /// - /// The response from the ListConfiguredAudienceModels service method, as returned by CleanRoomsML. + /// The response from the ListTrainedModelInferenceJobs service method, as returned by CleanRoomsML. /// /// You do not have sufficient access to perform this action. /// /// /// The request parameters for this request are incorrect. /// - /// REST API Reference for ListConfiguredAudienceModels Operation - public virtual Task ListConfiguredAudienceModelsAsync(ListConfiguredAudienceModelsRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + /// REST API Reference for ListTrainedModelInferenceJobs Operation + public virtual Task ListTrainedModelInferenceJobsAsync(ListTrainedModelInferenceJobsRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { var options = new InvokeOptions(); - options.RequestMarshaller = ListConfiguredAudienceModelsRequestMarshaller.Instance; - options.ResponseUnmarshaller = ListConfiguredAudienceModelsResponseUnmarshaller.Instance; + options.RequestMarshaller = ListTrainedModelInferenceJobsRequestMarshaller.Instance; + options.ResponseUnmarshaller = ListTrainedModelInferenceJobsResponseUnmarshaller.Instance; - return InvokeAsync(request, options, cancellationToken); + return InvokeAsync(request, options, cancellationToken); } #endregion - #region ListTagsForResource + #region ListTrainedModels /// - /// Returns a list of tags for a provided resource. + /// Returns a list of trained models. /// - /// Container for the necessary parameters to execute the ListTagsForResource service method. + /// Container for the necessary parameters to execute the ListTrainedModels service method. /// - /// The response from the ListTagsForResource service method, as returned by CleanRoomsML. + /// The response from the ListTrainedModels service method, as returned by CleanRoomsML. /// /// You do not have sufficient access to perform this action. /// - /// - /// The resource you are requesting does not exist. - /// /// /// The request parameters for this request are incorrect. /// - /// REST API Reference for ListTagsForResource Operation - public virtual ListTagsForResourceResponse ListTagsForResource(ListTagsForResourceRequest request) + /// REST API Reference for ListTrainedModels Operation + public virtual ListTrainedModelsResponse ListTrainedModels(ListTrainedModelsRequest request) { var options = new InvokeOptions(); - options.RequestMarshaller = ListTagsForResourceRequestMarshaller.Instance; - options.ResponseUnmarshaller = ListTagsForResourceResponseUnmarshaller.Instance; + options.RequestMarshaller = ListTrainedModelsRequestMarshaller.Instance; + options.ResponseUnmarshaller = ListTrainedModelsResponseUnmarshaller.Instance; - return Invoke(request, options); + return Invoke(request, options); } /// - /// Returns a list of tags for a provided resource. + /// Returns a list of trained models. /// - /// Container for the necessary parameters to execute the ListTagsForResource service method. + /// Container for the necessary parameters to execute the ListTrainedModels service method. /// /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// /// - /// The response from the ListTagsForResource service method, as returned by CleanRoomsML. + /// The response from the ListTrainedModels service method, as returned by CleanRoomsML. /// /// You do not have sufficient access to perform this action. /// - /// - /// The resource you are requesting does not exist. - /// /// /// The request parameters for this request are incorrect. /// - /// REST API Reference for ListTagsForResource Operation - public virtual Task ListTagsForResourceAsync(ListTagsForResourceRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + /// REST API Reference for ListTrainedModels Operation + public virtual Task ListTrainedModelsAsync(ListTrainedModelsRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { var options = new InvokeOptions(); - options.RequestMarshaller = ListTagsForResourceRequestMarshaller.Instance; - options.ResponseUnmarshaller = ListTagsForResourceResponseUnmarshaller.Instance; + options.RequestMarshaller = ListTrainedModelsRequestMarshaller.Instance; + options.ResponseUnmarshaller = ListTrainedModelsResponseUnmarshaller.Instance; - return InvokeAsync(request, options, cancellationToken); + return InvokeAsync(request, options, cancellationToken); } #endregion @@ -1511,6 +3305,59 @@ public virtual PutConfiguredAudienceModelPolicyResponse PutConfiguredAudienceMod #endregion + #region PutMLConfiguration + + + /// + /// Assigns information about an ML configuration. + /// + /// Container for the necessary parameters to execute the PutMLConfiguration service method. + /// + /// The response from the PutMLConfiguration service method, as returned by CleanRoomsML. + /// + /// You do not have sufficient access to perform this action. + /// + /// + /// The request parameters for this request are incorrect. + /// + /// REST API Reference for PutMLConfiguration Operation + public virtual PutMLConfigurationResponse PutMLConfiguration(PutMLConfigurationRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = PutMLConfigurationRequestMarshaller.Instance; + options.ResponseUnmarshaller = PutMLConfigurationResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// Assigns information about an ML configuration. + /// + /// Container for the necessary parameters to execute the PutMLConfiguration service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the PutMLConfiguration service method, as returned by CleanRoomsML. + /// + /// You do not have sufficient access to perform this action. + /// + /// + /// The request parameters for this request are incorrect. + /// + /// REST API Reference for PutMLConfiguration Operation + public virtual Task PutMLConfigurationAsync(PutMLConfigurationRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = PutMLConfigurationRequestMarshaller.Instance; + options.ResponseUnmarshaller = PutMLConfigurationResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + #region StartAudienceExportJob @@ -1653,6 +3500,142 @@ public virtual StartAudienceGenerationJobResponse StartAudienceGenerationJob(Sta #endregion + #region StartTrainedModelExportJob + + + /// + /// Provides the information necessary to start a trained model export job. + /// + /// Container for the necessary parameters to execute the StartTrainedModelExportJob service method. + /// + /// The response from the StartTrainedModelExportJob service method, as returned by CleanRoomsML. + /// + /// You do not have sufficient access to perform this action. + /// + /// + /// You can't complete this action because another resource depends on this resource. + /// + /// + /// The resource you are requesting does not exist. + /// + /// + /// The request parameters for this request are incorrect. + /// + /// REST API Reference for StartTrainedModelExportJob Operation + public virtual StartTrainedModelExportJobResponse StartTrainedModelExportJob(StartTrainedModelExportJobRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = StartTrainedModelExportJobRequestMarshaller.Instance; + options.ResponseUnmarshaller = StartTrainedModelExportJobResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// Provides the information necessary to start a trained model export job. + /// + /// Container for the necessary parameters to execute the StartTrainedModelExportJob service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the StartTrainedModelExportJob service method, as returned by CleanRoomsML. + /// + /// You do not have sufficient access to perform this action. + /// + /// + /// You can't complete this action because another resource depends on this resource. + /// + /// + /// The resource you are requesting does not exist. + /// + /// + /// The request parameters for this request are incorrect. + /// + /// REST API Reference for StartTrainedModelExportJob Operation + public virtual Task StartTrainedModelExportJobAsync(StartTrainedModelExportJobRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = StartTrainedModelExportJobRequestMarshaller.Instance; + options.ResponseUnmarshaller = StartTrainedModelExportJobResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + + #region StartTrainedModelInferenceJob + + + /// + /// Defines the information necessary to begin a trained model inference job. + /// + /// Container for the necessary parameters to execute the StartTrainedModelInferenceJob service method. + /// + /// The response from the StartTrainedModelInferenceJob service method, as returned by CleanRoomsML. + /// + /// You do not have sufficient access to perform this action. + /// + /// + /// You can't complete this action because another resource depends on this resource. + /// + /// + /// The resource you are requesting does not exist. + /// + /// + /// You have exceeded your service quota. + /// + /// + /// The request parameters for this request are incorrect. + /// + /// REST API Reference for StartTrainedModelInferenceJob Operation + public virtual StartTrainedModelInferenceJobResponse StartTrainedModelInferenceJob(StartTrainedModelInferenceJobRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = StartTrainedModelInferenceJobRequestMarshaller.Instance; + options.ResponseUnmarshaller = StartTrainedModelInferenceJobResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// Defines the information necessary to begin a trained model inference job. + /// + /// Container for the necessary parameters to execute the StartTrainedModelInferenceJob service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the StartTrainedModelInferenceJob service method, as returned by CleanRoomsML. + /// + /// You do not have sufficient access to perform this action. + /// + /// + /// You can't complete this action because another resource depends on this resource. + /// + /// + /// The resource you are requesting does not exist. + /// + /// + /// You have exceeded your service quota. + /// + /// + /// The request parameters for this request are incorrect. + /// + /// REST API Reference for StartTrainedModelInferenceJob Operation + public virtual Task StartTrainedModelInferenceJobAsync(StartTrainedModelInferenceJobRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = StartTrainedModelInferenceJobRequestMarshaller.Instance; + options.ResponseUnmarshaller = StartTrainedModelInferenceJobResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + #region TagResource diff --git a/sdk/src/Services/CleanRoomsML/Properties/AssemblyInfo.cs b/sdk/src/Services/CleanRoomsML/Properties/AssemblyInfo.cs index 471369225995..e07724a2364b 100644 --- a/sdk/src/Services/CleanRoomsML/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/CleanRoomsML/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.7")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/Cloud9/Cloud9.sln b/sdk/src/Services/Cloud9/Cloud9.sln index 68f01aa28151..73b4e1a4e82a 100644 --- a/sdk/src/Services/Cloud9/Cloud9.sln +++ b/sdk/src/Services/Cloud9/Cloud9.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {FA25A634-BE29-44F8-A065-B29B2A66985A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {FA25A634-BE29-44F8-A065-B29B2A66985A}.Debug|Any CPU.Build.0 = Debug|Any CPU {FA25A634-BE29-44F8-A065-B29B2A66985A}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {AB6E8E13-2568-4ADD-8804-0D9A3F5B0A20}.Debug|Any CPU.Build.0 = Debug|Any CPU {AB6E8E13-2568-4ADD-8804-0D9A3F5B0A20}.Release|Any CPU.ActiveCfg = Release|Any CPU {AB6E8E13-2568-4ADD-8804-0D9A3F5B0A20}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {C57EDD77-C2C5-40F7-BAA3-7EF0F5E92DFC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C57EDD77-C2C5-40F7-BAA3-7EF0F5E92DFC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C57EDD77-C2C5-40F7-BAA3-7EF0F5E92DFC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C57EDD77-C2C5-40F7-BAA3-7EF0F5E92DFC}.Release|Any CPU.Build.0 = Release|Any CPU - {6BABA741-D7C0-4557-B1F7-197B18F1E769}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6BABA741-D7C0-4557-B1F7-197B18F1E769}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6BABA741-D7C0-4557-B1F7-197B18F1E769}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6BABA741-D7C0-4557-B1F7-197B18F1E769}.Release|Any CPU.Build.0 = Release|Any CPU - {67BBAEBA-D88E-401A-91FC-58BF6009D6FC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {67BBAEBA-D88E-401A-91FC-58BF6009D6FC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {67BBAEBA-D88E-401A-91FC-58BF6009D6FC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {67BBAEBA-D88E-401A-91FC-58BF6009D6FC}.Release|Any CPU.Build.0 = Release|Any CPU - {BA57E086-EC5F-4408-9961-22B26D8AAE26}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BA57E086-EC5F-4408-9961-22B26D8AAE26}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BA57E086-EC5F-4408-9961-22B26D8AAE26}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BA57E086-EC5F-4408-9961-22B26D8AAE26}.Release|Any CPU.Build.0 = Release|Any CPU - {2E2D580E-AC83-4D5E-BF23-9D8754458474}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2E2D580E-AC83-4D5E-BF23-9D8754458474}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2E2D580E-AC83-4D5E-BF23-9D8754458474}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2E2D580E-AC83-4D5E-BF23-9D8754458474}.Release|Any CPU.Build.0 = Release|Any CPU - {32F97B32-3A4F-4D5B-9AD3-32FAAA627D38}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {32F97B32-3A4F-4D5B-9AD3-32FAAA627D38}.Debug|Any CPU.Build.0 = Debug|Any CPU - {32F97B32-3A4F-4D5B-9AD3-32FAAA627D38}.Release|Any CPU.ActiveCfg = Release|Any CPU - {32F97B32-3A4F-4D5B-9AD3-32FAAA627D38}.Release|Any CPU.Build.0 = Release|Any CPU - {B792FC80-6758-41DA-B9A1-33C41BDEFF29}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B792FC80-6758-41DA-B9A1-33C41BDEFF29}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B792FC80-6758-41DA-B9A1-33C41BDEFF29}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B792FC80-6758-41DA-B9A1-33C41BDEFF29}.Release|Any CPU.Build.0 = Release|Any CPU - {E77220B2-CDD0-4574-9229-3F2A18345C1B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E77220B2-CDD0-4574-9229-3F2A18345C1B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E77220B2-CDD0-4574-9229-3F2A18345C1B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E77220B2-CDD0-4574-9229-3F2A18345C1B}.Release|Any CPU.Build.0 = Release|Any CPU - {D6A682D6-6DD5-4FA7-AB9E-2C725E98863E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D6A682D6-6DD5-4FA7-AB9E-2C725E98863E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D6A682D6-6DD5-4FA7-AB9E-2C725E98863E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D6A682D6-6DD5-4FA7-AB9E-2C725E98863E}.Release|Any CPU.Build.0 = Release|Any CPU - {04FE6166-9027-4683-B13D-DFFEBD72D8B5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {04FE6166-9027-4683-B13D-DFFEBD72D8B5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {04FE6166-9027-4683-B13D-DFFEBD72D8B5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {04FE6166-9027-4683-B13D-DFFEBD72D8B5}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {C57EDD77-C2C5-40F7-BAA3-7EF0F5E92DFC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C57EDD77-C2C5-40F7-BAA3-7EF0F5E92DFC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C57EDD77-C2C5-40F7-BAA3-7EF0F5E92DFC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C57EDD77-C2C5-40F7-BAA3-7EF0F5E92DFC}.Release|Any CPU.Build.0 = Release|Any CPU - {6BABA741-D7C0-4557-B1F7-197B18F1E769}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6BABA741-D7C0-4557-B1F7-197B18F1E769}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6BABA741-D7C0-4557-B1F7-197B18F1E769}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6BABA741-D7C0-4557-B1F7-197B18F1E769}.Release|Any CPU.Build.0 = Release|Any CPU - {67BBAEBA-D88E-401A-91FC-58BF6009D6FC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {67BBAEBA-D88E-401A-91FC-58BF6009D6FC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {67BBAEBA-D88E-401A-91FC-58BF6009D6FC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {67BBAEBA-D88E-401A-91FC-58BF6009D6FC}.Release|Any CPU.Build.0 = Release|Any CPU - {BA57E086-EC5F-4408-9961-22B26D8AAE26}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BA57E086-EC5F-4408-9961-22B26D8AAE26}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BA57E086-EC5F-4408-9961-22B26D8AAE26}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BA57E086-EC5F-4408-9961-22B26D8AAE26}.Release|Any CPU.Build.0 = Release|Any CPU - {2E2D580E-AC83-4D5E-BF23-9D8754458474}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2E2D580E-AC83-4D5E-BF23-9D8754458474}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2E2D580E-AC83-4D5E-BF23-9D8754458474}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2E2D580E-AC83-4D5E-BF23-9D8754458474}.Release|Any CPU.Build.0 = Release|Any CPU - {32F97B32-3A4F-4D5B-9AD3-32FAAA627D38}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {32F97B32-3A4F-4D5B-9AD3-32FAAA627D38}.Debug|Any CPU.Build.0 = Debug|Any CPU - {32F97B32-3A4F-4D5B-9AD3-32FAAA627D38}.Release|Any CPU.ActiveCfg = Release|Any CPU - {32F97B32-3A4F-4D5B-9AD3-32FAAA627D38}.Release|Any CPU.Build.0 = Release|Any CPU - {B792FC80-6758-41DA-B9A1-33C41BDEFF29}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B792FC80-6758-41DA-B9A1-33C41BDEFF29}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B792FC80-6758-41DA-B9A1-33C41BDEFF29}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B792FC80-6758-41DA-B9A1-33C41BDEFF29}.Release|Any CPU.Build.0 = Release|Any CPU - {E77220B2-CDD0-4574-9229-3F2A18345C1B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E77220B2-CDD0-4574-9229-3F2A18345C1B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E77220B2-CDD0-4574-9229-3F2A18345C1B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E77220B2-CDD0-4574-9229-3F2A18345C1B}.Release|Any CPU.Build.0 = Release|Any CPU - {D6A682D6-6DD5-4FA7-AB9E-2C725E98863E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D6A682D6-6DD5-4FA7-AB9E-2C725E98863E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D6A682D6-6DD5-4FA7-AB9E-2C725E98863E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D6A682D6-6DD5-4FA7-AB9E-2C725E98863E}.Release|Any CPU.Build.0 = Release|Any CPU - {04FE6166-9027-4683-B13D-DFFEBD72D8B5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {04FE6166-9027-4683-B13D-DFFEBD72D8B5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {04FE6166-9027-4683-B13D-DFFEBD72D8B5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {04FE6166-9027-4683-B13D-DFFEBD72D8B5}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {FA25A634-BE29-44F8-A065-B29B2A66985A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {5111F797-3DB4-4F9C-A493-F9AC36FCD254} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {5F2310CB-534C-4E6F-BADF-8B307636D9D7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {40050310-8BA7-439E-BED7-806F46796877} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {AB6E8E13-2568-4ADD-8804-0D9A3F5B0A20} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {C57EDD77-C2C5-40F7-BAA3-7EF0F5E92DFC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6BABA741-D7C0-4557-B1F7-197B18F1E769} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {67BBAEBA-D88E-401A-91FC-58BF6009D6FC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {BA57E086-EC5F-4408-9961-22B26D8AAE26} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {2E2D580E-AC83-4D5E-BF23-9D8754458474} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {32F97B32-3A4F-4D5B-9AD3-32FAAA627D38} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B792FC80-6758-41DA-B9A1-33C41BDEFF29} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E77220B2-CDD0-4574-9229-3F2A18345C1B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D6A682D6-6DD5-4FA7-AB9E-2C725E98863E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {04FE6166-9027-4683-B13D-DFFEBD72D8B5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {C57EDD77-C2C5-40F7-BAA3-7EF0F5E92DFC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6BABA741-D7C0-4557-B1F7-197B18F1E769} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {67BBAEBA-D88E-401A-91FC-58BF6009D6FC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {BA57E086-EC5F-4408-9961-22B26D8AAE26} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {2E2D580E-AC83-4D5E-BF23-9D8754458474} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {32F97B32-3A4F-4D5B-9AD3-32FAAA627D38} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B792FC80-6758-41DA-B9A1-33C41BDEFF29} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E77220B2-CDD0-4574-9229-3F2A18345C1B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D6A682D6-6DD5-4FA7-AB9E-2C725E98863E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {04FE6166-9027-4683-B13D-DFFEBD72D8B5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {007ECD35-D8F0-482E-8ED9-C31248DAE93E} diff --git a/sdk/src/Services/Cloud9/Generated/AmazonCloud9Config.cs b/sdk/src/Services/Cloud9/Generated/AmazonCloud9Config.cs index 494d2e004d5a..d171d267bfea 100644 --- a/sdk/src/Services/Cloud9/Generated/AmazonCloud9Config.cs +++ b/sdk/src/Services/Cloud9/Generated/AmazonCloud9Config.cs @@ -34,16 +34,10 @@ namespace Amazon.Cloud9 public partial class AmazonCloud9Config : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("Cloud9", "4.0.0.0"); private static readonly AmazonCloud9EndpointResolver EndpointResolver = new AmazonCloud9EndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("Cloud9", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("Cloud9", "3.7.400.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/Cloud9/Properties/AssemblyInfo.cs b/sdk/src/Services/Cloud9/Properties/AssemblyInfo.cs index 47d8f6dbef2e..7753215b9570 100644 --- a/sdk/src/Services/Cloud9/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/Cloud9/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/CloudControlApi/CloudControlApi.sln b/sdk/src/Services/CloudControlApi/CloudControlApi.sln index 847600d56d48..265fc79adf24 100644 --- a/sdk/src/Services/CloudControlApi/CloudControlApi.sln +++ b/sdk/src/Services/CloudControlApi/CloudControlApi.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {0BB53CE5-C136-4594-8E4B-22C1D8DBBED0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {0BB53CE5-C136-4594-8E4B-22C1D8DBBED0}.Debug|Any CPU.Build.0 = Debug|Any CPU {0BB53CE5-C136-4594-8E4B-22C1D8DBBED0}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {C6F8EAE3-CD2C-431E-BA3C-5ECAC32E3B61}.Debug|Any CPU.Build.0 = Debug|Any CPU {C6F8EAE3-CD2C-431E-BA3C-5ECAC32E3B61}.Release|Any CPU.ActiveCfg = Release|Any CPU {C6F8EAE3-CD2C-431E-BA3C-5ECAC32E3B61}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {D6E041C1-F49F-4A4D-A9D3-5A06EBAA823F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D6E041C1-F49F-4A4D-A9D3-5A06EBAA823F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D6E041C1-F49F-4A4D-A9D3-5A06EBAA823F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D6E041C1-F49F-4A4D-A9D3-5A06EBAA823F}.Release|Any CPU.Build.0 = Release|Any CPU - {17FCCCF8-AAA3-46A1-A996-C6EA3BF15029}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {17FCCCF8-AAA3-46A1-A996-C6EA3BF15029}.Debug|Any CPU.Build.0 = Debug|Any CPU - {17FCCCF8-AAA3-46A1-A996-C6EA3BF15029}.Release|Any CPU.ActiveCfg = Release|Any CPU - {17FCCCF8-AAA3-46A1-A996-C6EA3BF15029}.Release|Any CPU.Build.0 = Release|Any CPU - {54A3BA6C-3901-47DE-9FA2-20B582E6CFFF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {54A3BA6C-3901-47DE-9FA2-20B582E6CFFF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {54A3BA6C-3901-47DE-9FA2-20B582E6CFFF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {54A3BA6C-3901-47DE-9FA2-20B582E6CFFF}.Release|Any CPU.Build.0 = Release|Any CPU - {AC2B1D50-8554-4528-9655-93F6C6E4C49E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AC2B1D50-8554-4528-9655-93F6C6E4C49E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AC2B1D50-8554-4528-9655-93F6C6E4C49E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AC2B1D50-8554-4528-9655-93F6C6E4C49E}.Release|Any CPU.Build.0 = Release|Any CPU - {D041F591-D63F-4E8C-BEAE-68D4E3653E7A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D041F591-D63F-4E8C-BEAE-68D4E3653E7A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D041F591-D63F-4E8C-BEAE-68D4E3653E7A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D041F591-D63F-4E8C-BEAE-68D4E3653E7A}.Release|Any CPU.Build.0 = Release|Any CPU - {1CC0F517-220A-4B99-BA95-715FC8393BE2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1CC0F517-220A-4B99-BA95-715FC8393BE2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1CC0F517-220A-4B99-BA95-715FC8393BE2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1CC0F517-220A-4B99-BA95-715FC8393BE2}.Release|Any CPU.Build.0 = Release|Any CPU - {F9EC0FF4-5DE3-4CCC-8BFA-D36B42E93632}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F9EC0FF4-5DE3-4CCC-8BFA-D36B42E93632}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F9EC0FF4-5DE3-4CCC-8BFA-D36B42E93632}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F9EC0FF4-5DE3-4CCC-8BFA-D36B42E93632}.Release|Any CPU.Build.0 = Release|Any CPU - {891C4C9C-B8EF-48F8-B34E-FF13425FEAA1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {891C4C9C-B8EF-48F8-B34E-FF13425FEAA1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {891C4C9C-B8EF-48F8-B34E-FF13425FEAA1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {891C4C9C-B8EF-48F8-B34E-FF13425FEAA1}.Release|Any CPU.Build.0 = Release|Any CPU - {1F0DD2E0-F057-47C3-97E9-9BE32F632C2C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1F0DD2E0-F057-47C3-97E9-9BE32F632C2C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1F0DD2E0-F057-47C3-97E9-9BE32F632C2C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1F0DD2E0-F057-47C3-97E9-9BE32F632C2C}.Release|Any CPU.Build.0 = Release|Any CPU - {A9B19472-3C21-49E9-86CE-568FAB99FC08}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A9B19472-3C21-49E9-86CE-568FAB99FC08}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A9B19472-3C21-49E9-86CE-568FAB99FC08}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A9B19472-3C21-49E9-86CE-568FAB99FC08}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {D6E041C1-F49F-4A4D-A9D3-5A06EBAA823F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D6E041C1-F49F-4A4D-A9D3-5A06EBAA823F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D6E041C1-F49F-4A4D-A9D3-5A06EBAA823F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D6E041C1-F49F-4A4D-A9D3-5A06EBAA823F}.Release|Any CPU.Build.0 = Release|Any CPU - {17FCCCF8-AAA3-46A1-A996-C6EA3BF15029}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {17FCCCF8-AAA3-46A1-A996-C6EA3BF15029}.Debug|Any CPU.Build.0 = Debug|Any CPU - {17FCCCF8-AAA3-46A1-A996-C6EA3BF15029}.Release|Any CPU.ActiveCfg = Release|Any CPU - {17FCCCF8-AAA3-46A1-A996-C6EA3BF15029}.Release|Any CPU.Build.0 = Release|Any CPU - {54A3BA6C-3901-47DE-9FA2-20B582E6CFFF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {54A3BA6C-3901-47DE-9FA2-20B582E6CFFF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {54A3BA6C-3901-47DE-9FA2-20B582E6CFFF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {54A3BA6C-3901-47DE-9FA2-20B582E6CFFF}.Release|Any CPU.Build.0 = Release|Any CPU - {AC2B1D50-8554-4528-9655-93F6C6E4C49E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AC2B1D50-8554-4528-9655-93F6C6E4C49E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AC2B1D50-8554-4528-9655-93F6C6E4C49E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AC2B1D50-8554-4528-9655-93F6C6E4C49E}.Release|Any CPU.Build.0 = Release|Any CPU - {D041F591-D63F-4E8C-BEAE-68D4E3653E7A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D041F591-D63F-4E8C-BEAE-68D4E3653E7A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D041F591-D63F-4E8C-BEAE-68D4E3653E7A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D041F591-D63F-4E8C-BEAE-68D4E3653E7A}.Release|Any CPU.Build.0 = Release|Any CPU - {1CC0F517-220A-4B99-BA95-715FC8393BE2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1CC0F517-220A-4B99-BA95-715FC8393BE2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1CC0F517-220A-4B99-BA95-715FC8393BE2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1CC0F517-220A-4B99-BA95-715FC8393BE2}.Release|Any CPU.Build.0 = Release|Any CPU - {F9EC0FF4-5DE3-4CCC-8BFA-D36B42E93632}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F9EC0FF4-5DE3-4CCC-8BFA-D36B42E93632}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F9EC0FF4-5DE3-4CCC-8BFA-D36B42E93632}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F9EC0FF4-5DE3-4CCC-8BFA-D36B42E93632}.Release|Any CPU.Build.0 = Release|Any CPU - {891C4C9C-B8EF-48F8-B34E-FF13425FEAA1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {891C4C9C-B8EF-48F8-B34E-FF13425FEAA1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {891C4C9C-B8EF-48F8-B34E-FF13425FEAA1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {891C4C9C-B8EF-48F8-B34E-FF13425FEAA1}.Release|Any CPU.Build.0 = Release|Any CPU - {1F0DD2E0-F057-47C3-97E9-9BE32F632C2C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1F0DD2E0-F057-47C3-97E9-9BE32F632C2C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1F0DD2E0-F057-47C3-97E9-9BE32F632C2C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1F0DD2E0-F057-47C3-97E9-9BE32F632C2C}.Release|Any CPU.Build.0 = Release|Any CPU - {A9B19472-3C21-49E9-86CE-568FAB99FC08}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A9B19472-3C21-49E9-86CE-568FAB99FC08}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A9B19472-3C21-49E9-86CE-568FAB99FC08}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A9B19472-3C21-49E9-86CE-568FAB99FC08}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {0BB53CE5-C136-4594-8E4B-22C1D8DBBED0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {EF50F0DE-D33D-4A00-95C8-B8470676924E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {FCCE1584-F32C-42C5-8F35-06C98027D87B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {E733CC27-3774-48B1-9E66-8E7048318053} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {C6F8EAE3-CD2C-431E-BA3C-5ECAC32E3B61} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {D6E041C1-F49F-4A4D-A9D3-5A06EBAA823F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {17FCCCF8-AAA3-46A1-A996-C6EA3BF15029} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {54A3BA6C-3901-47DE-9FA2-20B582E6CFFF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {AC2B1D50-8554-4528-9655-93F6C6E4C49E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D041F591-D63F-4E8C-BEAE-68D4E3653E7A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {1CC0F517-220A-4B99-BA95-715FC8393BE2} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F9EC0FF4-5DE3-4CCC-8BFA-D36B42E93632} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {891C4C9C-B8EF-48F8-B34E-FF13425FEAA1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {1F0DD2E0-F057-47C3-97E9-9BE32F632C2C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A9B19472-3C21-49E9-86CE-568FAB99FC08} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {D6E041C1-F49F-4A4D-A9D3-5A06EBAA823F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {17FCCCF8-AAA3-46A1-A996-C6EA3BF15029} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {54A3BA6C-3901-47DE-9FA2-20B582E6CFFF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {AC2B1D50-8554-4528-9655-93F6C6E4C49E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D041F591-D63F-4E8C-BEAE-68D4E3653E7A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {1CC0F517-220A-4B99-BA95-715FC8393BE2} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F9EC0FF4-5DE3-4CCC-8BFA-D36B42E93632} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {891C4C9C-B8EF-48F8-B34E-FF13425FEAA1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {1F0DD2E0-F057-47C3-97E9-9BE32F632C2C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A9B19472-3C21-49E9-86CE-568FAB99FC08} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {AF3D69B1-A43D-477D-9CCC-AD2E6347F9DF} diff --git a/sdk/src/Services/CloudControlApi/Generated/AmazonCloudControlApiConfig.cs b/sdk/src/Services/CloudControlApi/Generated/AmazonCloudControlApiConfig.cs index 7631e2ae1daa..8bc9c6117b92 100644 --- a/sdk/src/Services/CloudControlApi/Generated/AmazonCloudControlApiConfig.cs +++ b/sdk/src/Services/CloudControlApi/Generated/AmazonCloudControlApiConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.CloudControlApi public partial class AmazonCloudControlApiConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("CloudControl", "4.0.0.0"); private static readonly AmazonCloudControlApiEndpointResolver EndpointResolver = new AmazonCloudControlApiEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("CloudControl", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("CloudControl", "3.7.401.2"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/CloudControlApi/Generated/Model/HookProgressEvent.cs b/sdk/src/Services/CloudControlApi/Generated/Model/HookProgressEvent.cs index b07f2eff6da9..290fb14d1b1f 100644 --- a/sdk/src/Services/CloudControlApi/Generated/Model/HookProgressEvent.cs +++ b/sdk/src/Services/CloudControlApi/Generated/Model/HookProgressEvent.cs @@ -82,9 +82,9 @@ internal bool IsSetFailureMode() /// The time that the Hook invocation request initiated. /// /// - public DateTime HookEventTime + public DateTime? HookEventTime { - get { return this._hookEventTime.GetValueOrDefault(); } + get { return this._hookEventTime; } set { this._hookEventTime = value; } } diff --git a/sdk/src/Services/CloudControlApi/Generated/Model/Internal/MarshallTransformations/HookProgressEventUnmarshaller.cs b/sdk/src/Services/CloudControlApi/Generated/Model/Internal/MarshallTransformations/HookProgressEventUnmarshaller.cs index 9b737380b3e7..0140fa6c422c 100644 --- a/sdk/src/Services/CloudControlApi/Generated/Model/Internal/MarshallTransformations/HookProgressEventUnmarshaller.cs +++ b/sdk/src/Services/CloudControlApi/Generated/Model/Internal/MarshallTransformations/HookProgressEventUnmarshaller.cs @@ -74,7 +74,7 @@ public HookProgressEvent Unmarshall(JsonUnmarshallerContext context) } if (context.TestExpression("HookEventTime", targetDepth)) { - var unmarshaller = DateTimeUnmarshaller.Instance; + var unmarshaller = NullableDateTimeUnmarshaller.Instance; unmarshalledObject.HookEventTime = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/CloudControlApi/Properties/AssemblyInfo.cs b/sdk/src/Services/CloudControlApi/Properties/AssemblyInfo.cs index a4770b242f0f..712c0bc15d8e 100644 --- a/sdk/src/Services/CloudControlApi/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/CloudControlApi/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.2")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/CloudDirectory/CloudDirectory.sln b/sdk/src/Services/CloudDirectory/CloudDirectory.sln index 0eb17baf9622..41f3f72df801 100644 --- a/sdk/src/Services/CloudDirectory/CloudDirectory.sln +++ b/sdk/src/Services/CloudDirectory/CloudDirectory.sln @@ -94,7 +94,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {74948266-BB33-4348-A737-85F547C66F57}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {74948266-BB33-4348-A737-85F547C66F57}.Debug|Any CPU.Build.0 = Debug|Any CPU {74948266-BB33-4348-A737-85F547C66F57}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -119,113 +126,6 @@ Global {E9576DFB-5B39-4682-B095-410D4169AC86}.Debug|Any CPU.Build.0 = Debug|Any CPU {E9576DFB-5B39-4682-B095-410D4169AC86}.Release|Any CPU.ActiveCfg = Release|Any CPU {E9576DFB-5B39-4682-B095-410D4169AC86}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {35A64B80-D2D1-412D-A826-E3534BF77212}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {35A64B80-D2D1-412D-A826-E3534BF77212}.Debug|Any CPU.Build.0 = Debug|Any CPU - {35A64B80-D2D1-412D-A826-E3534BF77212}.Release|Any CPU.ActiveCfg = Release|Any CPU - {35A64B80-D2D1-412D-A826-E3534BF77212}.Release|Any CPU.Build.0 = Release|Any CPU - {491BF274-204C-4EEC-93CA-FAD71F8EEA1F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {491BF274-204C-4EEC-93CA-FAD71F8EEA1F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {491BF274-204C-4EEC-93CA-FAD71F8EEA1F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {491BF274-204C-4EEC-93CA-FAD71F8EEA1F}.Release|Any CPU.Build.0 = Release|Any CPU - {E5EC301A-DB91-4123-9F04-42175D2D20A6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E5EC301A-DB91-4123-9F04-42175D2D20A6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E5EC301A-DB91-4123-9F04-42175D2D20A6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E5EC301A-DB91-4123-9F04-42175D2D20A6}.Release|Any CPU.Build.0 = Release|Any CPU - {791F877D-8CFC-42E6-A3ED-1C776EC9F973}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {791F877D-8CFC-42E6-A3ED-1C776EC9F973}.Debug|Any CPU.Build.0 = Debug|Any CPU - {791F877D-8CFC-42E6-A3ED-1C776EC9F973}.Release|Any CPU.ActiveCfg = Release|Any CPU - {791F877D-8CFC-42E6-A3ED-1C776EC9F973}.Release|Any CPU.Build.0 = Release|Any CPU - {8ACF7E8F-B246-4248-A388-F3F9093996A7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8ACF7E8F-B246-4248-A388-F3F9093996A7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8ACF7E8F-B246-4248-A388-F3F9093996A7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8ACF7E8F-B246-4248-A388-F3F9093996A7}.Release|Any CPU.Build.0 = Release|Any CPU - {FC34DFC9-5CAE-4A4F-8F4C-201385876C8D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FC34DFC9-5CAE-4A4F-8F4C-201385876C8D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FC34DFC9-5CAE-4A4F-8F4C-201385876C8D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FC34DFC9-5CAE-4A4F-8F4C-201385876C8D}.Release|Any CPU.Build.0 = Release|Any CPU - {701EF94D-0C93-4F68-A6EB-6A98E4B328B2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {701EF94D-0C93-4F68-A6EB-6A98E4B328B2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {701EF94D-0C93-4F68-A6EB-6A98E4B328B2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {701EF94D-0C93-4F68-A6EB-6A98E4B328B2}.Release|Any CPU.Build.0 = Release|Any CPU - {B3B94C6A-4BB6-4E51-B354-1FF20F05922F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B3B94C6A-4BB6-4E51-B354-1FF20F05922F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B3B94C6A-4BB6-4E51-B354-1FF20F05922F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B3B94C6A-4BB6-4E51-B354-1FF20F05922F}.Release|Any CPU.Build.0 = Release|Any CPU - {0C59CD12-7DED-4E2F-8AD2-9D66EBDEA98C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0C59CD12-7DED-4E2F-8AD2-9D66EBDEA98C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0C59CD12-7DED-4E2F-8AD2-9D66EBDEA98C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0C59CD12-7DED-4E2F-8AD2-9D66EBDEA98C}.Release|Any CPU.Build.0 = Release|Any CPU - {71436802-BC74-406C-86C3-3ABF03EA8388}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {71436802-BC74-406C-86C3-3ABF03EA8388}.Debug|Any CPU.Build.0 = Debug|Any CPU - {71436802-BC74-406C-86C3-3ABF03EA8388}.Release|Any CPU.ActiveCfg = Release|Any CPU - {71436802-BC74-406C-86C3-3ABF03EA8388}.Release|Any CPU.Build.0 = Release|Any CPU - {C7B7DE17-6C49-4F3A-A663-A147FA118EE8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C7B7DE17-6C49-4F3A-A663-A147FA118EE8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C7B7DE17-6C49-4F3A-A663-A147FA118EE8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C7B7DE17-6C49-4F3A-A663-A147FA118EE8}.Release|Any CPU.Build.0 = Release|Any CPU - {0675EBD7-92DA-4C38-950C-944CCB467C67}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0675EBD7-92DA-4C38-950C-944CCB467C67}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0675EBD7-92DA-4C38-950C-944CCB467C67}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0675EBD7-92DA-4C38-950C-944CCB467C67}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {35A64B80-D2D1-412D-A826-E3534BF77212}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {35A64B80-D2D1-412D-A826-E3534BF77212}.Debug|Any CPU.Build.0 = Debug|Any CPU - {35A64B80-D2D1-412D-A826-E3534BF77212}.Release|Any CPU.ActiveCfg = Release|Any CPU - {35A64B80-D2D1-412D-A826-E3534BF77212}.Release|Any CPU.Build.0 = Release|Any CPU - {491BF274-204C-4EEC-93CA-FAD71F8EEA1F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {491BF274-204C-4EEC-93CA-FAD71F8EEA1F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {491BF274-204C-4EEC-93CA-FAD71F8EEA1F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {491BF274-204C-4EEC-93CA-FAD71F8EEA1F}.Release|Any CPU.Build.0 = Release|Any CPU - {E5EC301A-DB91-4123-9F04-42175D2D20A6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E5EC301A-DB91-4123-9F04-42175D2D20A6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E5EC301A-DB91-4123-9F04-42175D2D20A6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E5EC301A-DB91-4123-9F04-42175D2D20A6}.Release|Any CPU.Build.0 = Release|Any CPU - {791F877D-8CFC-42E6-A3ED-1C776EC9F973}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {791F877D-8CFC-42E6-A3ED-1C776EC9F973}.Debug|Any CPU.Build.0 = Debug|Any CPU - {791F877D-8CFC-42E6-A3ED-1C776EC9F973}.Release|Any CPU.ActiveCfg = Release|Any CPU - {791F877D-8CFC-42E6-A3ED-1C776EC9F973}.Release|Any CPU.Build.0 = Release|Any CPU - {8ACF7E8F-B246-4248-A388-F3F9093996A7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8ACF7E8F-B246-4248-A388-F3F9093996A7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8ACF7E8F-B246-4248-A388-F3F9093996A7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8ACF7E8F-B246-4248-A388-F3F9093996A7}.Release|Any CPU.Build.0 = Release|Any CPU - {FC34DFC9-5CAE-4A4F-8F4C-201385876C8D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FC34DFC9-5CAE-4A4F-8F4C-201385876C8D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FC34DFC9-5CAE-4A4F-8F4C-201385876C8D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FC34DFC9-5CAE-4A4F-8F4C-201385876C8D}.Release|Any CPU.Build.0 = Release|Any CPU - {701EF94D-0C93-4F68-A6EB-6A98E4B328B2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {701EF94D-0C93-4F68-A6EB-6A98E4B328B2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {701EF94D-0C93-4F68-A6EB-6A98E4B328B2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {701EF94D-0C93-4F68-A6EB-6A98E4B328B2}.Release|Any CPU.Build.0 = Release|Any CPU - {B3B94C6A-4BB6-4E51-B354-1FF20F05922F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B3B94C6A-4BB6-4E51-B354-1FF20F05922F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B3B94C6A-4BB6-4E51-B354-1FF20F05922F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B3B94C6A-4BB6-4E51-B354-1FF20F05922F}.Release|Any CPU.Build.0 = Release|Any CPU - {0C59CD12-7DED-4E2F-8AD2-9D66EBDEA98C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0C59CD12-7DED-4E2F-8AD2-9D66EBDEA98C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0C59CD12-7DED-4E2F-8AD2-9D66EBDEA98C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0C59CD12-7DED-4E2F-8AD2-9D66EBDEA98C}.Release|Any CPU.Build.0 = Release|Any CPU - {71436802-BC74-406C-86C3-3ABF03EA8388}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {71436802-BC74-406C-86C3-3ABF03EA8388}.Debug|Any CPU.Build.0 = Debug|Any CPU - {71436802-BC74-406C-86C3-3ABF03EA8388}.Release|Any CPU.ActiveCfg = Release|Any CPU - {71436802-BC74-406C-86C3-3ABF03EA8388}.Release|Any CPU.Build.0 = Release|Any CPU - {C7B7DE17-6C49-4F3A-A663-A147FA118EE8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C7B7DE17-6C49-4F3A-A663-A147FA118EE8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C7B7DE17-6C49-4F3A-A663-A147FA118EE8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C7B7DE17-6C49-4F3A-A663-A147FA118EE8}.Release|Any CPU.Build.0 = Release|Any CPU - {0675EBD7-92DA-4C38-950C-944CCB467C67}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0675EBD7-92DA-4C38-950C-944CCB467C67}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0675EBD7-92DA-4C38-950C-944CCB467C67}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0675EBD7-92DA-4C38-950C-944CCB467C67}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -242,42 +142,14 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {74948266-BB33-4348-A737-85F547C66F57} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {3317966C-E105-48F4-B3D6-F6BEB8522E19} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {92D55608-F953-4BDB-8D64-D090D7B79BE9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {4117ABB4-139F-4AE4-9FF8-DE555094BDE6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {70370C70-E122-456E-A400-01113F83CEDC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {E9576DFB-5B39-4682-B095-410D4169AC86} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {35A64B80-D2D1-412D-A826-E3534BF77212} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {491BF274-204C-4EEC-93CA-FAD71F8EEA1F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E5EC301A-DB91-4123-9F04-42175D2D20A6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {791F877D-8CFC-42E6-A3ED-1C776EC9F973} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8ACF7E8F-B246-4248-A388-F3F9093996A7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {FC34DFC9-5CAE-4A4F-8F4C-201385876C8D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {701EF94D-0C93-4F68-A6EB-6A98E4B328B2} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B3B94C6A-4BB6-4E51-B354-1FF20F05922F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0C59CD12-7DED-4E2F-8AD2-9D66EBDEA98C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {71436802-BC74-406C-86C3-3ABF03EA8388} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C7B7DE17-6C49-4F3A-A663-A147FA118EE8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0675EBD7-92DA-4C38-950C-944CCB467C67} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {35A64B80-D2D1-412D-A826-E3534BF77212} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {491BF274-204C-4EEC-93CA-FAD71F8EEA1F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E5EC301A-DB91-4123-9F04-42175D2D20A6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {791F877D-8CFC-42E6-A3ED-1C776EC9F973} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8ACF7E8F-B246-4248-A388-F3F9093996A7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {FC34DFC9-5CAE-4A4F-8F4C-201385876C8D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {701EF94D-0C93-4F68-A6EB-6A98E4B328B2} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B3B94C6A-4BB6-4E51-B354-1FF20F05922F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0C59CD12-7DED-4E2F-8AD2-9D66EBDEA98C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {71436802-BC74-406C-86C3-3ABF03EA8388} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C7B7DE17-6C49-4F3A-A663-A147FA118EE8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0675EBD7-92DA-4C38-950C-944CCB467C67} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {2B8F91D5-BFBB-4F63-B388-EB7A8A8EDAEF} diff --git a/sdk/src/Services/CloudDirectory/Generated/AmazonCloudDirectoryConfig.cs b/sdk/src/Services/CloudDirectory/Generated/AmazonCloudDirectoryConfig.cs index 1e84e39168eb..29f53f16a52a 100644 --- a/sdk/src/Services/CloudDirectory/Generated/AmazonCloudDirectoryConfig.cs +++ b/sdk/src/Services/CloudDirectory/Generated/AmazonCloudDirectoryConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.CloudDirectory public partial class AmazonCloudDirectoryConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("CloudDirectory", "4.0.0.0"); private static readonly AmazonCloudDirectoryEndpointResolver EndpointResolver = new AmazonCloudDirectoryEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("CloudDirectory", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("CloudDirectory", "3.7.400.54"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/CloudDirectory/Properties/AssemblyInfo.cs b/sdk/src/Services/CloudDirectory/Properties/AssemblyInfo.cs index cd56c5454083..d60ca8891bfb 100644 --- a/sdk/src/Services/CloudDirectory/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/CloudDirectory/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.54")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/CloudFormation/CloudFormation.sln b/sdk/src/Services/CloudFormation/CloudFormation.sln index 91aa4d430739..2ce23d4043fd 100644 --- a/sdk/src/Services/CloudFormation/CloudFormation.sln +++ b/sdk/src/Services/CloudFormation/CloudFormation.sln @@ -92,7 +92,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {F28E68A7-537E-4A60-898F-C4FFDD90A727}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {F28E68A7-537E-4A60-898F-C4FFDD90A727}.Debug|Any CPU.Build.0 = Debug|Any CPU {F28E68A7-537E-4A60-898F-C4FFDD90A727}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -113,97 +120,6 @@ Global {489E4A08-29B5-429F-9D67-C09CC5BA5F4E}.Debug|Any CPU.Build.0 = Debug|Any CPU {489E4A08-29B5-429F-9D67-C09CC5BA5F4E}.Release|Any CPU.ActiveCfg = Release|Any CPU {489E4A08-29B5-429F-9D67-C09CC5BA5F4E}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {B32A7308-DA04-46A5-A3FF-FDED8DB2CCF6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B32A7308-DA04-46A5-A3FF-FDED8DB2CCF6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B32A7308-DA04-46A5-A3FF-FDED8DB2CCF6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B32A7308-DA04-46A5-A3FF-FDED8DB2CCF6}.Release|Any CPU.Build.0 = Release|Any CPU - {FF46CCCA-7186-409C-9E98-E582DD8C6D33}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FF46CCCA-7186-409C-9E98-E582DD8C6D33}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FF46CCCA-7186-409C-9E98-E582DD8C6D33}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FF46CCCA-7186-409C-9E98-E582DD8C6D33}.Release|Any CPU.Build.0 = Release|Any CPU - {1244BA18-F6B9-496D-A5A4-E381E5D2A9DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1244BA18-F6B9-496D-A5A4-E381E5D2A9DC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1244BA18-F6B9-496D-A5A4-E381E5D2A9DC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1244BA18-F6B9-496D-A5A4-E381E5D2A9DC}.Release|Any CPU.Build.0 = Release|Any CPU - {7079529B-9A94-4C04-A495-175D709F03B3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7079529B-9A94-4C04-A495-175D709F03B3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7079529B-9A94-4C04-A495-175D709F03B3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7079529B-9A94-4C04-A495-175D709F03B3}.Release|Any CPU.Build.0 = Release|Any CPU - {DC8FB949-6C64-40BF-8F58-70D2411E5CEE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DC8FB949-6C64-40BF-8F58-70D2411E5CEE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DC8FB949-6C64-40BF-8F58-70D2411E5CEE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DC8FB949-6C64-40BF-8F58-70D2411E5CEE}.Release|Any CPU.Build.0 = Release|Any CPU - {5AACA371-5267-4303-A02C-9C5129BC3AF8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5AACA371-5267-4303-A02C-9C5129BC3AF8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5AACA371-5267-4303-A02C-9C5129BC3AF8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5AACA371-5267-4303-A02C-9C5129BC3AF8}.Release|Any CPU.Build.0 = Release|Any CPU - {C2B29337-77AB-4AA9-B89D-65CFE002EEB4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C2B29337-77AB-4AA9-B89D-65CFE002EEB4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C2B29337-77AB-4AA9-B89D-65CFE002EEB4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C2B29337-77AB-4AA9-B89D-65CFE002EEB4}.Release|Any CPU.Build.0 = Release|Any CPU - {0D738061-C1FF-4D18-A11C-D51DF3CCC985}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0D738061-C1FF-4D18-A11C-D51DF3CCC985}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0D738061-C1FF-4D18-A11C-D51DF3CCC985}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0D738061-C1FF-4D18-A11C-D51DF3CCC985}.Release|Any CPU.Build.0 = Release|Any CPU - {B38253B2-EE3A-443A-ABB7-DB20B94761D4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B38253B2-EE3A-443A-ABB7-DB20B94761D4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B38253B2-EE3A-443A-ABB7-DB20B94761D4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B38253B2-EE3A-443A-ABB7-DB20B94761D4}.Release|Any CPU.Build.0 = Release|Any CPU - {697478AE-F8CE-4D42-AEA4-331DBD519B91}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {697478AE-F8CE-4D42-AEA4-331DBD519B91}.Debug|Any CPU.Build.0 = Debug|Any CPU - {697478AE-F8CE-4D42-AEA4-331DBD519B91}.Release|Any CPU.ActiveCfg = Release|Any CPU - {697478AE-F8CE-4D42-AEA4-331DBD519B91}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {B32A7308-DA04-46A5-A3FF-FDED8DB2CCF6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B32A7308-DA04-46A5-A3FF-FDED8DB2CCF6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B32A7308-DA04-46A5-A3FF-FDED8DB2CCF6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B32A7308-DA04-46A5-A3FF-FDED8DB2CCF6}.Release|Any CPU.Build.0 = Release|Any CPU - {FF46CCCA-7186-409C-9E98-E582DD8C6D33}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FF46CCCA-7186-409C-9E98-E582DD8C6D33}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FF46CCCA-7186-409C-9E98-E582DD8C6D33}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FF46CCCA-7186-409C-9E98-E582DD8C6D33}.Release|Any CPU.Build.0 = Release|Any CPU - {1244BA18-F6B9-496D-A5A4-E381E5D2A9DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1244BA18-F6B9-496D-A5A4-E381E5D2A9DC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1244BA18-F6B9-496D-A5A4-E381E5D2A9DC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1244BA18-F6B9-496D-A5A4-E381E5D2A9DC}.Release|Any CPU.Build.0 = Release|Any CPU - {7079529B-9A94-4C04-A495-175D709F03B3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7079529B-9A94-4C04-A495-175D709F03B3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7079529B-9A94-4C04-A495-175D709F03B3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7079529B-9A94-4C04-A495-175D709F03B3}.Release|Any CPU.Build.0 = Release|Any CPU - {DC8FB949-6C64-40BF-8F58-70D2411E5CEE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DC8FB949-6C64-40BF-8F58-70D2411E5CEE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DC8FB949-6C64-40BF-8F58-70D2411E5CEE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DC8FB949-6C64-40BF-8F58-70D2411E5CEE}.Release|Any CPU.Build.0 = Release|Any CPU - {5AACA371-5267-4303-A02C-9C5129BC3AF8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5AACA371-5267-4303-A02C-9C5129BC3AF8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5AACA371-5267-4303-A02C-9C5129BC3AF8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5AACA371-5267-4303-A02C-9C5129BC3AF8}.Release|Any CPU.Build.0 = Release|Any CPU - {C2B29337-77AB-4AA9-B89D-65CFE002EEB4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C2B29337-77AB-4AA9-B89D-65CFE002EEB4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C2B29337-77AB-4AA9-B89D-65CFE002EEB4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C2B29337-77AB-4AA9-B89D-65CFE002EEB4}.Release|Any CPU.Build.0 = Release|Any CPU - {0D738061-C1FF-4D18-A11C-D51DF3CCC985}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0D738061-C1FF-4D18-A11C-D51DF3CCC985}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0D738061-C1FF-4D18-A11C-D51DF3CCC985}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0D738061-C1FF-4D18-A11C-D51DF3CCC985}.Release|Any CPU.Build.0 = Release|Any CPU - {B38253B2-EE3A-443A-ABB7-DB20B94761D4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B38253B2-EE3A-443A-ABB7-DB20B94761D4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B38253B2-EE3A-443A-ABB7-DB20B94761D4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B38253B2-EE3A-443A-ABB7-DB20B94761D4}.Release|Any CPU.Build.0 = Release|Any CPU - {697478AE-F8CE-4D42-AEA4-331DBD519B91}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {697478AE-F8CE-4D42-AEA4-331DBD519B91}.Debug|Any CPU.Build.0 = Debug|Any CPU - {697478AE-F8CE-4D42-AEA4-331DBD519B91}.Release|Any CPU.ActiveCfg = Release|Any CPU - {697478AE-F8CE-4D42-AEA4-331DBD519B91}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -220,37 +136,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {F28E68A7-537E-4A60-898F-C4FFDD90A727} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {609BEAD5-7265-41C8-93F4-23E21ABE395E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {3C96B3EE-D5A0-4AC3-BDED-C5CFFBB8E3B0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {25C5C490-E3B0-4341-A0DF-D62BB895B0A9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {489E4A08-29B5-429F-9D67-C09CC5BA5F4E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {B32A7308-DA04-46A5-A3FF-FDED8DB2CCF6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {FF46CCCA-7186-409C-9E98-E582DD8C6D33} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {1244BA18-F6B9-496D-A5A4-E381E5D2A9DC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {7079529B-9A94-4C04-A495-175D709F03B3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {DC8FB949-6C64-40BF-8F58-70D2411E5CEE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {5AACA371-5267-4303-A02C-9C5129BC3AF8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C2B29337-77AB-4AA9-B89D-65CFE002EEB4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0D738061-C1FF-4D18-A11C-D51DF3CCC985} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B38253B2-EE3A-443A-ABB7-DB20B94761D4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {697478AE-F8CE-4D42-AEA4-331DBD519B91} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B32A7308-DA04-46A5-A3FF-FDED8DB2CCF6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {FF46CCCA-7186-409C-9E98-E582DD8C6D33} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {1244BA18-F6B9-496D-A5A4-E381E5D2A9DC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {7079529B-9A94-4C04-A495-175D709F03B3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {DC8FB949-6C64-40BF-8F58-70D2411E5CEE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {5AACA371-5267-4303-A02C-9C5129BC3AF8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C2B29337-77AB-4AA9-B89D-65CFE002EEB4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0D738061-C1FF-4D18-A11C-D51DF3CCC985} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B38253B2-EE3A-443A-ABB7-DB20B94761D4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {697478AE-F8CE-4D42-AEA4-331DBD519B91} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {FCDDB67B-7188-41C6-A05B-7EFF7FE0149E} diff --git a/sdk/src/Services/CloudFormation/Generated/AmazonCloudFormationConfig.cs b/sdk/src/Services/CloudFormation/Generated/AmazonCloudFormationConfig.cs index 4181f48d9699..d885148c87ed 100644 --- a/sdk/src/Services/CloudFormation/Generated/AmazonCloudFormationConfig.cs +++ b/sdk/src/Services/CloudFormation/Generated/AmazonCloudFormationConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.CloudFormation public partial class AmazonCloudFormationConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("CloudFormation", "4.0.0.0"); private static readonly AmazonCloudFormationEndpointResolver EndpointResolver = new AmazonCloudFormationEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("CloudFormation", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("CloudFormation", "3.7.400.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/CloudFormation/Generated/_bcl/AmazonCloudFormationClient.cs b/sdk/src/Services/CloudFormation/Generated/_bcl/AmazonCloudFormationClient.cs index 9cbef633e116..df94f4b1658c 100644 --- a/sdk/src/Services/CloudFormation/Generated/_bcl/AmazonCloudFormationClient.cs +++ b/sdk/src/Services/CloudFormation/Generated/_bcl/AmazonCloudFormationClient.cs @@ -45,9 +45,9 @@ namespace Amazon.CloudFormation /// CloudFormation allows you to create and manage Amazon Web Services infrastructure /// deployments predictably and repeatedly. You can use CloudFormation to leverage Amazon /// Web Services products, such as Amazon Elastic Compute Cloud, Amazon Elastic Block - /// Store, Amazon Simple Notification Service, Elastic Load Balancing, and Auto Scaling - /// to build highly reliable, highly scalable, cost-effective applications without creating - /// or configuring the underlying Amazon Web Services infrastructure. + /// Store, Amazon Simple Notification Service, Elastic Load Balancing, and Amazon EC2 + /// Auto Scaling to build highly reliable, highly scalable, cost-effective applications + /// without creating or configuring the underlying Amazon Web Services infrastructure. /// /// /// @@ -354,17 +354,11 @@ public virtual ActivateOrganizationsAccessResponse ActivateOrganizationsAccess(A /// /// Activates a public third-party extension, making it available for use in stack templates. - /// For more information, see Using - /// public extensions in the CloudFormation User Guide. - /// - /// - /// /// Once you have activated a public third-party extension in your account and Region, /// use SetTypeConfiguration /// to specify configuration properties for the extension. For more information, see Configuring - /// extensions at the account level in the CloudFormation User Guide. - /// + /// href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/registry-public.html">Using + /// public extensions in the CloudFormation User Guide. /// /// Container for the necessary parameters to execute the ActivateType service method. /// @@ -388,17 +382,11 @@ public virtual ActivateTypeResponse ActivateType(ActivateTypeRequest request) /// /// Activates a public third-party extension, making it available for use in stack templates. - /// For more information, see Using - /// public extensions in the CloudFormation User Guide. - /// - /// - /// /// Once you have activated a public third-party extension in your account and Region, /// use SetTypeConfiguration /// to specify configuration properties for the extension. For more information, see Configuring - /// extensions at the account level in the CloudFormation User Guide. - /// + /// href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/registry-public.html">Using + /// public extensions in the CloudFormation User Guide. /// /// Container for the necessary parameters to execute the ActivateType service method. /// @@ -433,8 +421,9 @@ public virtual ActivateTypeResponse ActivateType(ActivateTypeRequest request) /// /// /// - /// For more information, see Configuring - /// extensions at the account level in the CloudFormation User Guide. + /// For more information, see Edit + /// configuration data for extensions in your account in the CloudFormation User + /// Guide. /// /// /// Container for the necessary parameters to execute the BatchDescribeTypeConfigurations service method. @@ -463,8 +452,9 @@ public virtual BatchDescribeTypeConfigurationsResponse BatchDescribeTypeConfigur /// /// /// - /// For more information, see Configuring - /// extensions at the account level in the CloudFormation User Guide. + /// For more information, see Edit + /// configuration data for extensions in your account in the CloudFormation User + /// Guide. /// /// /// Container for the necessary parameters to execute the BatchDescribeTypeConfigurations service method. @@ -558,8 +548,8 @@ public virtual CancelUpdateStackResponse CancelUpdateStack(CancelUpdateStackRequ /// /// For a specified stack that's in the UPDATE_ROLLBACK_FAILED state, continues /// rolling it back to the UPDATE_ROLLBACK_COMPLETE state. Depending on the cause - /// of the failure, you can manually - /// fix the error and continue the rollback. By continuing the rollback, you can return + /// of the failure, you can manually fix + /// the error and continue the rollback. By continuing the rollback, you can return /// your stack to a working state (the UPDATE_ROLLBACK_COMPLETE state), and then /// try to update the stack again. /// @@ -593,8 +583,8 @@ public virtual ContinueUpdateRollbackResponse ContinueUpdateRollback(ContinueUpd /// /// For a specified stack that's in the UPDATE_ROLLBACK_FAILED state, continues /// rolling it back to the UPDATE_ROLLBACK_COMPLETE state. Depending on the cause - /// of the failure, you can manually - /// fix the error and continue the rollback. By continuing the rollback, you can return + /// of the failure, you can manually fix + /// the error and continue the rollback. By continuing the rollback, you can return /// your stack to a working state (the UPDATE_ROLLBACK_COMPLETE state), and then /// try to update the stack again. /// @@ -848,6 +838,14 @@ public virtual CreateGeneratedTemplateResponse CreateGeneratedTemplate(CreateGen /// Creates a stack as specified in the template. After the call completes successfully, /// the stack creation starts. You can check the status of the stack through the DescribeStacks /// operation. + /// + /// + /// + /// For more information about creating a stack and monitoring stack progress, see Managing + /// Amazon Web Services resources as a single unit with CloudFormation stacks in the + /// CloudFormation User Guide. + /// /// /// Container for the necessary parameters to execute the CreateStack service method. /// @@ -886,6 +884,14 @@ public virtual CreateStackResponse CreateStack(CreateStackRequest request) /// Creates a stack as specified in the template. After the call completes successfully, /// the stack creation starts. You can check the status of the stack through the DescribeStacks /// operation. + /// + /// + /// + /// For more information about creating a stack and monitoring stack progress, see Managing + /// Amazon Web Services resources as a single unit with CloudFormation stacks in the + /// CloudFormation User Guide. + /// /// /// Container for the necessary parameters to execute the CreateStack service method. /// @@ -1361,6 +1367,12 @@ public virtual DeleteGeneratedTemplateResponse DeleteGeneratedTemplate(DeleteGen /// Deletes a specified stack. Once the call completes successfully, stack deletion starts. /// Deleted stacks don't show up in the DescribeStacks operation if the deletion /// has been completed successfully. + /// + /// + /// + /// For more information about deleting a stack, see Delete + /// a stack from the CloudFormation console in the CloudFormation User Guide. + /// /// /// Container for the necessary parameters to execute the DeleteStack service method. /// @@ -1383,6 +1395,12 @@ public virtual DeleteStackResponse DeleteStack(DeleteStackRequest request) /// Deletes a specified stack. Once the call completes successfully, stack deletion starts. /// Deleted stacks don't show up in the DescribeStacks operation if the deletion /// has been completed successfully. + /// + /// + /// + /// For more information about deleting a stack, see Delete + /// a stack from the CloudFormation console in the CloudFormation User Guide. + /// /// /// Container for the necessary parameters to execute the DeleteStack service method. /// @@ -1640,8 +1658,8 @@ public virtual DeregisterTypeResponse DeregisterType(DeregisterTypeRequest reque /// /// Retrieves your account's CloudFormation limits, such as the maximum number of stacks /// that you can create in your account. For more information about account limits, see - /// CloudFormation - /// Quotas in the CloudFormation User Guide. + /// Understand + /// CloudFormation quotas in the CloudFormation User Guide. /// /// Container for the necessary parameters to execute the DescribeAccountLimits service method. /// @@ -1660,8 +1678,8 @@ public virtual DescribeAccountLimitsResponse DescribeAccountLimits(DescribeAccou /// /// Retrieves your account's CloudFormation limits, such as the maximum number of stacks /// that you can create in your account. For more information about account limits, see - /// CloudFormation - /// Quotas in the CloudFormation User Guide. + /// Understand + /// CloudFormation quotas in the CloudFormation User Guide. /// /// Container for the necessary parameters to execute the DescribeAccountLimits service method. /// @@ -1686,8 +1704,8 @@ public virtual DescribeAccountLimitsResponse DescribeAccountLimits(DescribeAccou /// /// Returns the inputs for the change set and a list of changes that CloudFormation will - /// make if you execute the change set. For more information, see Updating - /// Stacks Using Change Sets in the CloudFormation User Guide. + /// make if you execute the change set. For more information, see Update + /// CloudFormation stacks using change sets in the CloudFormation User Guide. /// /// Container for the necessary parameters to execute the DescribeChangeSet service method. /// @@ -1709,8 +1727,8 @@ public virtual DescribeChangeSetResponse DescribeChangeSet(DescribeChangeSetRequ /// /// Returns the inputs for the change set and a list of changes that CloudFormation will - /// make if you execute the change set. For more information, see Updating - /// Stacks Using Change Sets in the CloudFormation User Guide. + /// make if you execute the change set. For more information, see Update + /// CloudFormation stacks using change sets in the CloudFormation User Guide. /// /// Container for the necessary parameters to execute the DescribeChangeSet service method. /// @@ -1920,8 +1938,8 @@ public virtual DescribeOrganizationsAccessResponse DescribeOrganizationsAccess(D ///
  • /// /// Publishing - /// extensions to make them available for public use in the CloudFormation CLI - /// User Guide + /// extensions to make them available for public use in the CloudFormation Command + /// Line Interface (CLI) User Guide /// ///
    • /// @@ -1962,8 +1980,8 @@ public virtual DescribePublisherResponse DescribePublisher(DescribePublisherRequ ///
  • /// /// Publishing - /// extensions to make them available for public use in the CloudFormation CLI - /// User Guide + /// extensions to make them available for public use in the CloudFormation Command + /// Line Interface (CLI) User Guide /// ///
    • /// @@ -2044,8 +2062,8 @@ public virtual DescribeResourceScanResponse DescribeResourceScan(DescribeResourc /// from its expected configuration, as defined in the stack template and any values specified /// as template parameters. A stack is considered to have drifted if one or more of its /// resources have drifted. For more information about stack and resource drift, see Detecting - /// Unregulated Configuration Changes to Stacks and Resources. + /// href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/using-cfn-stack-drift.html">Detect + /// unmanaged configuration changes to stacks and resources with drift detection. /// /// /// @@ -2076,8 +2094,8 @@ public virtual DescribeStackDriftDetectionStatusResponse DescribeStackDriftDetec /// from its expected configuration, as defined in the stack template and any values specified /// as template parameters. A stack is considered to have drifted if one or more of its /// resources have drifted. For more information about stack and resource drift, see Detecting - /// Unregulated Configuration Changes to Stacks and Resources. + /// href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/using-cfn-stack-drift.html">Detect + /// unmanaged configuration changes to stacks and resources with drift detection. /// /// /// @@ -2111,8 +2129,8 @@ public virtual DescribeStackDriftDetectionStatusResponse DescribeStackDriftDetec /// /// Returns all stack related events for a specified stack in reverse chronological order. - /// For more information about a stack's event history, see CloudFormation - /// stack creation events in the CloudFormation User Guide. + /// For more information about a stack's event history, see Understand + /// CloudFormation stack creation events in the CloudFormation User Guide. /// /// /// @@ -2137,8 +2155,8 @@ public virtual DescribeStackEventsResponse DescribeStackEvents(DescribeStackEven /// /// Returns all stack related events for a specified stack in reverse chronological order. - /// For more information about a stack's event history, see CloudFormation - /// stack creation events in the CloudFormation User Guide. + /// For more information about a stack's event history, see Understand + /// CloudFormation stack creation events in the CloudFormation User Guide. /// /// /// @@ -2297,8 +2315,8 @@ public virtual DescribeStackResourceResponse DescribeStackResource(DescribeStack /// that has been checked for drift. Resources that haven't yet been checked for drift /// aren't included. Resources that don't currently support drift detection aren't checked, /// and so not included. For a list of resources that support drift detection, see Resources - /// that Support Drift Detection. + /// href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/resource-import-supported-resources.html">Resource + /// type support for imports and drift detection. /// /// /// @@ -2331,8 +2349,8 @@ public virtual DescribeStackResourceDriftsResponse DescribeStackResourceDrifts(D /// that has been checked for drift. Resources that haven't yet been checked for drift /// aren't included. Resources that don't currently support drift detection aren't checked, /// and so not included. For a list of resources that support drift detection, see Resources - /// that Support Drift Detection. + /// href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/resource-import-supported-resources.html">Resource + /// type support for imports and drift detection. /// /// /// @@ -2382,7 +2400,7 @@ public virtual DescribeStackResourceDriftsResponse DescribeStackResourceDrifts(D /// You must specify either StackName or PhysicalResourceId, but not both. /// In addition, you can specify LogicalResourceId to filter the returned result. /// For more information about resources, the LogicalResourceId and PhysicalResourceId, - /// go to the CloudFormation + /// see the CloudFormation /// User Guide. /// /// @@ -2427,7 +2445,7 @@ public virtual DescribeStackResourcesResponse DescribeStackResources(DescribeSta /// You must specify either StackName or PhysicalResourceId, but not both. /// In addition, you can specify LogicalResourceId to filter the returned result. /// For more information about resources, the LogicalResourceId and PhysicalResourceId, - /// go to the CloudFormation + /// see the CloudFormation /// User Guide. /// /// @@ -2461,8 +2479,8 @@ public virtual DescribeStackResourcesResponse DescribeStackResources(DescribeSta /// /// Returns the description for the specified stack; if no stack name was specified, then /// it returns the description for all the stacks created. For more information about - /// a stack's event history, see CloudFormation - /// stack creation events in the CloudFormation User Guide. + /// a stack's event history, see Understand + /// CloudFormation stack creation events in the CloudFormation User Guide. /// /// /// @@ -2482,8 +2500,8 @@ public virtual DescribeStacksResponse DescribeStacks() /// /// Returns the description for the specified stack; if no stack name was specified, then /// it returns the description for all the stacks created. For more information about - /// a stack's event history, see CloudFormation - /// stack creation events in the CloudFormation User Guide. + /// a stack's event history, see Understand + /// CloudFormation stack creation events in the CloudFormation User Guide. /// /// /// @@ -2508,8 +2526,8 @@ public virtual DescribeStacksResponse DescribeStacks(DescribeStacksRequest reque /// /// Returns the description for the specified stack; if no stack name was specified, then /// it returns the description for all the stacks created. For more information about - /// a stack's event history, see CloudFormation - /// stack creation events in the CloudFormation User Guide. + /// a stack's event history, see Understand + /// CloudFormation stack creation events in the CloudFormation User Guide. /// /// /// @@ -2531,8 +2549,8 @@ public virtual DescribeStacksResponse DescribeStacks(DescribeStacksRequest reque /// /// Returns the description for the specified stack; if no stack name was specified, then /// it returns the description for all the stacks created. For more information about - /// a stack's event history, see CloudFormation - /// stack creation events in the CloudFormation User Guide. + /// a stack's event history, see Understand + /// CloudFormation stack creation events in the CloudFormation User Guide. /// /// /// @@ -2807,8 +2825,8 @@ public virtual DescribeTypeRegistrationResponse DescribeTypeRegistration(Describ /// template configuration. Only resource properties explicitly defined in the stack template /// are checked for drift. A stack is considered to have drifted if one or more of its /// resources differ from their expected template configurations. For more information, - /// see Detecting - /// Unregulated Configuration Changes to Stacks and Resources. + /// see Detect + /// unmanaged configuration changes to stacks and resources with drift detection. /// /// /// @@ -2817,8 +2835,8 @@ public virtual DescribeTypeRegistrationResponse DescribeTypeRegistration(Describ /// /// /// - /// For a list of stack resources that currently support drift detection, see Resources - /// that Support Drift Detection. + /// For a list of stack resources that currently support drift detection, see Resource + /// type support for imports and drift detection. /// /// /// @@ -2857,8 +2875,8 @@ public virtual DetectStackDriftResponse DetectStackDrift(DetectStackDriftRequest /// template configuration. Only resource properties explicitly defined in the stack template /// are checked for drift. A stack is considered to have drifted if one or more of its /// resources differ from their expected template configurations. For more information, - /// see Detecting - /// Unregulated Configuration Changes to Stacks and Resources. + /// see Detect + /// unmanaged configuration changes to stacks and resources with drift detection. /// /// /// @@ -2867,8 +2885,8 @@ public virtual DetectStackDriftResponse DetectStackDrift(DetectStackDriftRequest /// /// /// - /// For a list of stack resources that currently support drift detection, see Resources - /// that Support Drift Detection. + /// For a list of stack resources that currently support drift detection, see Resource + /// type support for imports and drift detection. /// /// /// @@ -2912,8 +2930,8 @@ public virtual DetectStackDriftResponse DetectStackDrift(DetectStackDriftRequest /// and any values specified as template parameters. This information includes actual /// and expected property values for resources in which CloudFormation detects drift. /// Only resource properties explicitly defined in the stack template are checked for - /// drift. For more information about stack and resource drift, see Detecting - /// Unregulated Configuration Changes to Stacks and Resources. + /// drift. For more information about stack and resource drift, see Detect + /// unmanaged configuration changes to stacks and resources with drift detection. /// /// /// @@ -2923,8 +2941,8 @@ public virtual DetectStackDriftResponse DetectStackDrift(DetectStackDriftRequest /// /// /// Resources that don't currently support drift detection can't be checked. For a list - /// of resources that support drift detection, see Resources - /// that Support Drift Detection. + /// of resources that support drift detection, see Resource + /// type support for imports and drift detection. /// /// /// Container for the necessary parameters to execute the DetectStackResourceDrift service method. @@ -2947,8 +2965,8 @@ public virtual DetectStackResourceDriftResponse DetectStackResourceDrift(DetectS /// and any values specified as template parameters. This information includes actual /// and expected property values for resources in which CloudFormation detects drift. /// Only resource properties explicitly defined in the stack template are checked for - /// drift. For more information about stack and resource drift, see Detecting - /// Unregulated Configuration Changes to Stacks and Resources. + /// drift. For more information about stack and resource drift, see Detect + /// unmanaged configuration changes to stacks and resources with drift detection. /// /// /// @@ -2958,8 +2976,8 @@ public virtual DetectStackResourceDriftResponse DetectStackResourceDrift(DetectS /// /// /// Resources that don't currently support drift detection can't be checked. For a list - /// of resources that support drift detection, see Resources - /// that Support Drift Detection. + /// of resources that support drift detection, see Resource + /// type support for imports and drift detection. /// /// /// Container for the necessary parameters to execute the DetectStackResourceDrift service method. @@ -3694,8 +3712,8 @@ public virtual ListChangeSetsResponse ListChangeSets(ListChangeSetsRequest reque /// /// /// - /// For more information, see - /// CloudFormation export stack output values. + /// For more information, see Get + /// exported outputs from a deployed CloudFormation stack. /// /// /// Container for the necessary parameters to execute the ListExports service method. @@ -3720,8 +3738,8 @@ public virtual ListExportsResponse ListExports(ListExportsRequest request) /// /// /// - /// For more information, see - /// CloudFormation export stack output values. + /// For more information, see Get + /// exported outputs from a deployed CloudFormation stack. /// /// /// Container for the necessary parameters to execute the ListExports service method. @@ -4635,8 +4653,8 @@ public virtual ListTypeVersionsResponse ListTypeVersions(ListTypeVersionsRequest /// Publishes the specified extension to the CloudFormation registry as a public extension /// in this Region. Public extensions are available for use by all CloudFormation users. /// For more information about publishing extensions, see Publishing - /// extensions to make them available for public use in the CloudFormation CLI - /// User Guide. + /// extensions to make them available for public use in the CloudFormation Command + /// Line Interface (CLI) User Guide. /// /// /// @@ -4668,8 +4686,8 @@ public virtual PublishTypeResponse PublishType(PublishTypeRequest request) /// Publishes the specified extension to the CloudFormation registry as a public extension /// in this Region. Public extensions are available for use by all CloudFormation users. /// For more information about publishing extensions, see Publishing - /// extensions to make them available for public use in the CloudFormation CLI - /// User Guide. + /// extensions to make them available for public use in the CloudFormation Command + /// Line Interface (CLI) User Guide. /// /// /// @@ -4781,9 +4799,9 @@ public virtual RecordHandlerProgressResponse RecordHandlerProgress(RecordHandler /// /// /// For information about requirements for registering as a public extension publisher, - /// see Registering - /// your account to publish CloudFormation extensions in the CloudFormation CLI - /// User Guide. + /// see Prerequisite: + /// Registering your account to publish CloudFormation extensions in the CloudFormation + /// Command Line Interface (CLI) User Guide. /// /// /// Container for the necessary parameters to execute the RegisterPublisher service method. @@ -4811,9 +4829,9 @@ public virtual RegisterPublisherResponse RegisterPublisher(RegisterPublisherRequ /// /// /// For information about requirements for registering as a public extension publisher, - /// see Registering - /// your account to publish CloudFormation extensions in the CloudFormation CLI - /// User Guide. + /// see Prerequisite: + /// Registering your account to publish CloudFormation extensions in the CloudFormation + /// Command Line Interface (CLI) User Guide. /// /// /// Container for the necessary parameters to execute the RegisterPublisher service method. @@ -4861,7 +4879,8 @@ public virtual RegisterPublisherResponse RegisterPublisher(RegisterPublisherRequ /// /// For more information about how to develop extensions and ready them for registration, /// see Creating - /// Resource Providers in the CloudFormation CLI User Guide. + /// resource types using the CloudFormation CLI in the CloudFormation Command Line + /// Interface (CLI) User Guide. /// /// /// @@ -4878,8 +4897,9 @@ public virtual RegisterPublisherResponse RegisterPublisher(RegisterPublisherRequ /// /// Once you have registered a private extension in your account and Region, use SetTypeConfiguration /// to specify configuration properties for the extension. For more information, see Configuring - /// extensions at the account level in the CloudFormation User Guide. + /// href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/registry-set-configuration.html">Edit + /// configuration data for extensions in your account in the CloudFormation User + /// Guide. /// /// /// Container for the necessary parameters to execute the RegisterType service method. @@ -4920,7 +4940,8 @@ public virtual RegisterTypeResponse RegisterType(RegisterTypeRequest request) /// /// For more information about how to develop extensions and ready them for registration, /// see Creating - /// Resource Providers in the CloudFormation CLI User Guide. + /// resource types using the CloudFormation CLI in the CloudFormation Command Line + /// Interface (CLI) User Guide. /// /// /// @@ -4937,8 +4958,9 @@ public virtual RegisterTypeResponse RegisterType(RegisterTypeRequest request) /// /// Once you have registered a private extension in your account and Region, use SetTypeConfiguration /// to specify configuration properties for the extension. For more information, see Configuring - /// extensions at the account level in the CloudFormation User Guide. + /// href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/registry-set-configuration.html">Edit + /// configuration data for extensions in your account in the CloudFormation User + /// Guide. /// /// /// Container for the necessary parameters to execute the RegisterType service method. @@ -5131,15 +5153,17 @@ public virtual SetStackPolicyResponse SetStackPolicy(SetStackPolicyRequest reque /// /// To view the current configuration data for an extension, refer to the ConfigurationSchema /// element of DescribeType. - /// For more information, see Configuring - /// extensions at the account level in the CloudFormation User Guide. + /// For more information, see Edit + /// configuration data for extensions in your account in the CloudFormation User + /// Guide. /// /// /// /// It's strongly recommended that you use dynamic references to restrict sensitive configuration /// definitions, such as third-party credentials. For more details on dynamic references, - /// see Using dynamic references to specify template - /// values in the CloudFormation User Guide. + /// see Specify + /// values stored in other services using dynamic references in the CloudFormation + /// User Guide. /// /// /// @@ -5171,15 +5195,17 @@ public virtual SetTypeConfigurationResponse SetTypeConfiguration(SetTypeConfigur /// /// To view the current configuration data for an extension, refer to the ConfigurationSchema /// element of DescribeType. - /// For more information, see Configuring - /// extensions at the account level in the CloudFormation User Guide. + /// For more information, see Edit + /// configuration data for extensions in your account in the CloudFormation User + /// Guide. /// /// /// /// It's strongly recommended that you use dynamic references to restrict sensitive configuration /// definitions, such as third-party credentials. For more details on dynamic references, - /// see Using dynamic references to specify template - /// values in the CloudFormation User Guide. + /// see Specify + /// values stored in other services using dynamic references in the CloudFormation + /// User Guide. /// /// /// @@ -5483,7 +5509,8 @@ public virtual StopStackSetOperationResponse StopStackSetOperation(StopStackSetO /// /// /// For more information, see Testing - /// your public extension prior to publishing in the CloudFormation CLI User Guide. + /// your public extension before publishing in the CloudFormation Command Line + /// Interface (CLI) User Guide. /// /// /// @@ -5505,8 +5532,8 @@ public virtual StopStackSetOperationResponse StopStackSetOperation(StopStackSetO /// /// An extension must have a test status of PASSED before it can be published. /// For more information, see Publishing - /// extensions to make them available for public use in the CloudFormation CLI - /// User Guide. + /// extensions to make them available for public use in the CloudFormation Command + /// Line Interface (CLI) User Guide. /// /// /// Container for the necessary parameters to execute the TestType service method. @@ -5544,7 +5571,8 @@ public virtual TestTypeResponse TestType(TestTypeRequest request) /// /// /// For more information, see Testing - /// your public extension prior to publishing in the CloudFormation CLI User Guide. + /// your public extension before publishing in the CloudFormation Command Line + /// Interface (CLI) User Guide. /// /// /// @@ -5566,8 +5594,8 @@ public virtual TestTypeResponse TestType(TestTypeRequest request) /// /// An extension must have a test status of PASSED before it can be published. /// For more information, see Publishing - /// extensions to make them available for public use in the CloudFormation CLI - /// User Guide. + /// extensions to make them available for public use in the CloudFormation Command + /// Line Interface (CLI) User Guide. /// /// /// Container for the necessary parameters to execute the TestType service method. @@ -5686,9 +5714,10 @@ public virtual UpdateGeneratedTemplateResponse UpdateGeneratedTemplate(UpdateGen /// /// /// - /// For more information about creating an update template, updating a stack, and monitoring - /// the progress of the update, see Updating - /// a Stack. + /// For more information about updating a stack and monitoring the progress of the update, + /// see Managing + /// Amazon Web Services resources as a single unit with CloudFormation stacks in the + /// CloudFormation User Guide. /// /// /// Container for the necessary parameters to execute the UpdateStack service method. @@ -5724,9 +5753,10 @@ public virtual UpdateStackResponse UpdateStack(UpdateStackRequest request) /// /// /// - /// For more information about creating an update template, updating a stack, and monitoring - /// the progress of the update, see Updating - /// a Stack. + /// For more information about updating a stack and monitoring the progress of the update, + /// see Managing + /// Amazon Web Services resources as a single unit with CloudFormation stacks in the + /// CloudFormation User Guide. /// /// /// Container for the necessary parameters to execute the UpdateStack service method. @@ -5988,8 +6018,8 @@ public virtual UpdateStackSetResponse UpdateStackSet(UpdateStackSetRequest reque /// /// Updates termination protection for the specified stack. If a user attempts to delete /// a stack with termination protection enabled, the operation fails and the stack remains - /// unchanged. For more information, see Protecting - /// a Stack From Being Deleted in the CloudFormation User Guide. + /// unchanged. For more information, see Protect + /// a CloudFormation stack from being deleted in the CloudFormation User Guide. /// /// /// @@ -6015,8 +6045,8 @@ public virtual UpdateTerminationProtectionResponse UpdateTerminationProtection(U /// /// Updates termination protection for the specified stack. If a user attempts to delete /// a stack with termination protection enabled, the operation fails and the stack remains - /// unchanged. For more information, see Protecting - /// a Stack From Being Deleted in the CloudFormation User Guide. + /// unchanged. For more information, see Protect + /// a CloudFormation stack from being deleted in the CloudFormation User Guide. /// /// /// diff --git a/sdk/src/Services/CloudFormation/Properties/AssemblyInfo.cs b/sdk/src/Services/CloudFormation/Properties/AssemblyInfo.cs index e61d54c4dbed..b6eb076c6bd1 100644 --- a/sdk/src/Services/CloudFormation/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/CloudFormation/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/CloudFront/CloudFront.sln b/sdk/src/Services/CloudFront/CloudFront.sln index 98acd74d39e4..d611f7fd993c 100644 --- a/sdk/src/Services/CloudFront/CloudFront.sln +++ b/sdk/src/Services/CloudFront/CloudFront.sln @@ -92,7 +92,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {11C028E6-D4B7-45D5-ABC2-820392347AC6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {11C028E6-D4B7-45D5-ABC2-820392347AC6}.Debug|Any CPU.Build.0 = Debug|Any CPU {11C028E6-D4B7-45D5-ABC2-820392347AC6}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -113,97 +120,6 @@ Global {10765D07-94B4-4D47-8850-8BB3C19DF277}.Debug|Any CPU.Build.0 = Debug|Any CPU {10765D07-94B4-4D47-8850-8BB3C19DF277}.Release|Any CPU.ActiveCfg = Release|Any CPU {10765D07-94B4-4D47-8850-8BB3C19DF277}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {A8E1EEF3-222B-4267-974A-02DDE0CE3703}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A8E1EEF3-222B-4267-974A-02DDE0CE3703}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A8E1EEF3-222B-4267-974A-02DDE0CE3703}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A8E1EEF3-222B-4267-974A-02DDE0CE3703}.Release|Any CPU.Build.0 = Release|Any CPU - {6A28F052-8085-4EB6-B41A-EA87687CD427}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6A28F052-8085-4EB6-B41A-EA87687CD427}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6A28F052-8085-4EB6-B41A-EA87687CD427}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6A28F052-8085-4EB6-B41A-EA87687CD427}.Release|Any CPU.Build.0 = Release|Any CPU - {9E0C922C-31D5-48D1-A5CA-0DD4F8B0299E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9E0C922C-31D5-48D1-A5CA-0DD4F8B0299E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9E0C922C-31D5-48D1-A5CA-0DD4F8B0299E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9E0C922C-31D5-48D1-A5CA-0DD4F8B0299E}.Release|Any CPU.Build.0 = Release|Any CPU - {63191EA1-2E2B-40E5-BF2F-FC97E9B5DF46}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {63191EA1-2E2B-40E5-BF2F-FC97E9B5DF46}.Debug|Any CPU.Build.0 = Debug|Any CPU - {63191EA1-2E2B-40E5-BF2F-FC97E9B5DF46}.Release|Any CPU.ActiveCfg = Release|Any CPU - {63191EA1-2E2B-40E5-BF2F-FC97E9B5DF46}.Release|Any CPU.Build.0 = Release|Any CPU - {6C7B0542-53F4-41B4-977B-4481316817B3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6C7B0542-53F4-41B4-977B-4481316817B3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6C7B0542-53F4-41B4-977B-4481316817B3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6C7B0542-53F4-41B4-977B-4481316817B3}.Release|Any CPU.Build.0 = Release|Any CPU - {0AB55AA6-F339-429B-BDA2-783A158945C5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0AB55AA6-F339-429B-BDA2-783A158945C5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0AB55AA6-F339-429B-BDA2-783A158945C5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0AB55AA6-F339-429B-BDA2-783A158945C5}.Release|Any CPU.Build.0 = Release|Any CPU - {FA1EE09F-CB87-41F5-B914-C70B3A0148F5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FA1EE09F-CB87-41F5-B914-C70B3A0148F5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FA1EE09F-CB87-41F5-B914-C70B3A0148F5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FA1EE09F-CB87-41F5-B914-C70B3A0148F5}.Release|Any CPU.Build.0 = Release|Any CPU - {EF695AB2-862A-46FB-8EF0-3D5E90FA36C3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EF695AB2-862A-46FB-8EF0-3D5E90FA36C3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EF695AB2-862A-46FB-8EF0-3D5E90FA36C3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EF695AB2-862A-46FB-8EF0-3D5E90FA36C3}.Release|Any CPU.Build.0 = Release|Any CPU - {A6DB5FBD-B786-4BA2-B441-CB227EC9F69F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A6DB5FBD-B786-4BA2-B441-CB227EC9F69F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A6DB5FBD-B786-4BA2-B441-CB227EC9F69F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A6DB5FBD-B786-4BA2-B441-CB227EC9F69F}.Release|Any CPU.Build.0 = Release|Any CPU - {8A5CA608-A359-4218-96AD-0C375F8BC915}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8A5CA608-A359-4218-96AD-0C375F8BC915}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8A5CA608-A359-4218-96AD-0C375F8BC915}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8A5CA608-A359-4218-96AD-0C375F8BC915}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {A8E1EEF3-222B-4267-974A-02DDE0CE3703}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A8E1EEF3-222B-4267-974A-02DDE0CE3703}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A8E1EEF3-222B-4267-974A-02DDE0CE3703}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A8E1EEF3-222B-4267-974A-02DDE0CE3703}.Release|Any CPU.Build.0 = Release|Any CPU - {6A28F052-8085-4EB6-B41A-EA87687CD427}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6A28F052-8085-4EB6-B41A-EA87687CD427}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6A28F052-8085-4EB6-B41A-EA87687CD427}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6A28F052-8085-4EB6-B41A-EA87687CD427}.Release|Any CPU.Build.0 = Release|Any CPU - {9E0C922C-31D5-48D1-A5CA-0DD4F8B0299E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9E0C922C-31D5-48D1-A5CA-0DD4F8B0299E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9E0C922C-31D5-48D1-A5CA-0DD4F8B0299E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9E0C922C-31D5-48D1-A5CA-0DD4F8B0299E}.Release|Any CPU.Build.0 = Release|Any CPU - {63191EA1-2E2B-40E5-BF2F-FC97E9B5DF46}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {63191EA1-2E2B-40E5-BF2F-FC97E9B5DF46}.Debug|Any CPU.Build.0 = Debug|Any CPU - {63191EA1-2E2B-40E5-BF2F-FC97E9B5DF46}.Release|Any CPU.ActiveCfg = Release|Any CPU - {63191EA1-2E2B-40E5-BF2F-FC97E9B5DF46}.Release|Any CPU.Build.0 = Release|Any CPU - {6C7B0542-53F4-41B4-977B-4481316817B3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6C7B0542-53F4-41B4-977B-4481316817B3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6C7B0542-53F4-41B4-977B-4481316817B3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6C7B0542-53F4-41B4-977B-4481316817B3}.Release|Any CPU.Build.0 = Release|Any CPU - {0AB55AA6-F339-429B-BDA2-783A158945C5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0AB55AA6-F339-429B-BDA2-783A158945C5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0AB55AA6-F339-429B-BDA2-783A158945C5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0AB55AA6-F339-429B-BDA2-783A158945C5}.Release|Any CPU.Build.0 = Release|Any CPU - {FA1EE09F-CB87-41F5-B914-C70B3A0148F5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FA1EE09F-CB87-41F5-B914-C70B3A0148F5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FA1EE09F-CB87-41F5-B914-C70B3A0148F5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FA1EE09F-CB87-41F5-B914-C70B3A0148F5}.Release|Any CPU.Build.0 = Release|Any CPU - {EF695AB2-862A-46FB-8EF0-3D5E90FA36C3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EF695AB2-862A-46FB-8EF0-3D5E90FA36C3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EF695AB2-862A-46FB-8EF0-3D5E90FA36C3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EF695AB2-862A-46FB-8EF0-3D5E90FA36C3}.Release|Any CPU.Build.0 = Release|Any CPU - {A6DB5FBD-B786-4BA2-B441-CB227EC9F69F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A6DB5FBD-B786-4BA2-B441-CB227EC9F69F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A6DB5FBD-B786-4BA2-B441-CB227EC9F69F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A6DB5FBD-B786-4BA2-B441-CB227EC9F69F}.Release|Any CPU.Build.0 = Release|Any CPU - {8A5CA608-A359-4218-96AD-0C375F8BC915}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8A5CA608-A359-4218-96AD-0C375F8BC915}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8A5CA608-A359-4218-96AD-0C375F8BC915}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8A5CA608-A359-4218-96AD-0C375F8BC915}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -220,37 +136,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {11C028E6-D4B7-45D5-ABC2-820392347AC6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {82210520-3B07-4D59-AE4B-93F42565EA69} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {C462B557-5A9F-4962-A8CA-7CEDD1FE8A1B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {F70EED7E-DDA8-4CBA-B5CC-5219D957D09C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {10765D07-94B4-4D47-8850-8BB3C19DF277} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {A8E1EEF3-222B-4267-974A-02DDE0CE3703} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6A28F052-8085-4EB6-B41A-EA87687CD427} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {9E0C922C-31D5-48D1-A5CA-0DD4F8B0299E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {63191EA1-2E2B-40E5-BF2F-FC97E9B5DF46} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6C7B0542-53F4-41B4-977B-4481316817B3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0AB55AA6-F339-429B-BDA2-783A158945C5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {FA1EE09F-CB87-41F5-B914-C70B3A0148F5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {EF695AB2-862A-46FB-8EF0-3D5E90FA36C3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A6DB5FBD-B786-4BA2-B441-CB227EC9F69F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8A5CA608-A359-4218-96AD-0C375F8BC915} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {A8E1EEF3-222B-4267-974A-02DDE0CE3703} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6A28F052-8085-4EB6-B41A-EA87687CD427} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {9E0C922C-31D5-48D1-A5CA-0DD4F8B0299E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {63191EA1-2E2B-40E5-BF2F-FC97E9B5DF46} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6C7B0542-53F4-41B4-977B-4481316817B3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0AB55AA6-F339-429B-BDA2-783A158945C5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {FA1EE09F-CB87-41F5-B914-C70B3A0148F5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {EF695AB2-862A-46FB-8EF0-3D5E90FA36C3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A6DB5FBD-B786-4BA2-B441-CB227EC9F69F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8A5CA608-A359-4218-96AD-0C375F8BC915} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {E79E3F74-924B-4025-8843-5BA57909F518} diff --git a/sdk/src/Services/CloudFront/Generated/AmazonCloudFrontConfig.cs b/sdk/src/Services/CloudFront/Generated/AmazonCloudFrontConfig.cs index 82a3c72c0828..dc7c0e0558a7 100644 --- a/sdk/src/Services/CloudFront/Generated/AmazonCloudFrontConfig.cs +++ b/sdk/src/Services/CloudFront/Generated/AmazonCloudFrontConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.CloudFront public partial class AmazonCloudFrontConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("CloudFront", "4.0.0.0"); private static readonly AmazonCloudFrontEndpointResolver EndpointResolver = new AmazonCloudFrontEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("CloudFront", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("CloudFront", "3.7.401.5"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/CloudFront/Generated/Model/_bcl45+netstandard/IListPublicKeysPaginator.cs b/sdk/src/Services/CloudFront/Generated/Model/_bcl+netstandard/IListPublicKeysPaginator.cs similarity index 100% rename from sdk/src/Services/CloudFront/Generated/Model/_bcl45+netstandard/IListPublicKeysPaginator.cs rename to sdk/src/Services/CloudFront/Generated/Model/_bcl+netstandard/IListPublicKeysPaginator.cs diff --git a/sdk/src/Services/CloudFront/Generated/Model/_bcl+netstandard/ListCloudFrontOriginAccessIdentitiesPaginator.cs b/sdk/src/Services/CloudFront/Generated/Model/_bcl+netstandard/ListCloudFrontOriginAccessIdentitiesPaginator.cs index a4924d5fd233..278be19204e4 100644 --- a/sdk/src/Services/CloudFront/Generated/Model/_bcl+netstandard/ListCloudFrontOriginAccessIdentitiesPaginator.cs +++ b/sdk/src/Services/CloudFront/Generated/Model/_bcl+netstandard/ListCloudFrontOriginAccessIdentitiesPaginator.cs @@ -70,7 +70,7 @@ IEnumerable IPaginator IPaginator< cancellationToken.ThrowIfCancellationRequested(); yield return response; } - while (response.CloudFrontOriginAccessIdentityList.IsTruncated.GetValueOrDefault()); + while (!string.IsNullOrEmpty(marker)); } #endif } diff --git a/sdk/src/Services/CloudFront/Generated/Model/_bcl+netstandard/ListDistributionsPaginator.cs b/sdk/src/Services/CloudFront/Generated/Model/_bcl+netstandard/ListDistributionsPaginator.cs index e435e9a27ae4..fdb54ebc4020 100644 --- a/sdk/src/Services/CloudFront/Generated/Model/_bcl+netstandard/ListDistributionsPaginator.cs +++ b/sdk/src/Services/CloudFront/Generated/Model/_bcl+netstandard/ListDistributionsPaginator.cs @@ -70,7 +70,7 @@ IEnumerable IPaginator.Pag marker = response.DistributionList.NextMarker; yield return response; } - while (response.DistributionList.IsTruncated.GetValueOrDefault()); + while (!string.IsNullOrEmpty(marker)); } #endif #if AWS_ASYNC_ENUMERABLES_API @@ -91,7 +91,7 @@ async IAsyncEnumerable IPaginator IPaginator.Pag marker = response.InvalidationList.NextMarker; yield return response; } - while (response.InvalidationList.IsTruncated.GetValueOrDefault()); + while (!string.IsNullOrEmpty(marker)); } #endif #if AWS_ASYNC_ENUMERABLES_API @@ -91,7 +91,7 @@ async IAsyncEnumerable IPaginator IPaginator IPaginatorAmazon /// CloudFront Developer Guide. + /// + /// /// /// public partial class AmazonCloudFrontClient : AmazonServiceClient, IAmazonCloudFront @@ -8967,7 +8969,8 @@ public virtual ListKeyValueStoresResponse ListKeyValueStores(ListKeyValueStoresR /// - /// Gets the list of CloudFront origin access controls in this Amazon Web Services account. + /// Gets the list of CloudFront origin access controls (OACs) in this Amazon Web Services + /// account. /// /// /// @@ -8977,6 +8980,13 @@ public virtual ListKeyValueStoresResponse ListKeyValueStores(ListKeyValueStoresR /// another request that specifies the NextMarker value from the current response /// as the Marker value in the next request. /// + /// + /// + /// If you're not using origin access controls for your Amazon Web Services account, the + /// ListOriginAccessControls operation doesn't return the Items element + /// in the response. + /// + /// /// /// Container for the necessary parameters to execute the ListOriginAccessControls service method. /// @@ -8996,7 +9006,8 @@ public virtual ListOriginAccessControlsResponse ListOriginAccessControls(ListOri /// - /// Gets the list of CloudFront origin access controls in this Amazon Web Services account. + /// Gets the list of CloudFront origin access controls (OACs) in this Amazon Web Services + /// account. /// /// /// @@ -9006,6 +9017,13 @@ public virtual ListOriginAccessControlsResponse ListOriginAccessControls(ListOri /// another request that specifies the NextMarker value from the current response /// as the Marker value in the next request. /// + /// + /// + /// If you're not using origin access controls for your Amazon Web Services account, the + /// ListOriginAccessControls operation doesn't return the Items element + /// in the response. + /// + /// /// /// Container for the necessary parameters to execute the ListOriginAccessControls service method. /// @@ -10223,9 +10241,9 @@ public virtual UpdateContinuousDeploymentPolicyResponse UpdateContinuousDeployme /// ///
    • /// - /// You must rename the ETag field to IfMatch, leaving the value unchanged. - /// (Set the value of IfMatch to the value of ETag, then remove the ETag - /// field.) + /// You must copy the ETag field value from the response. (You'll use it for the + /// IfMatch parameter in your request.) Then, remove the ETag field from + /// the distribution configuration. /// ///
    • /// @@ -10233,7 +10251,7 @@ public virtual UpdateContinuousDeploymentPolicyResponse UpdateContinuousDeployme /// ///
  • /// - /// Submit an UpdateDistribution request, providing the distribution configuration. + /// Submit an UpdateDistribution request, providing the updated distribution configuration. /// The new configuration replaces the existing configuration. The values that you specify /// in an UpdateDistribution request are not merged into your existing configuration. /// Make sure to include all fields: the ones that you modified and also the ones that @@ -10521,9 +10539,9 @@ public virtual UpdateDistributionResponse UpdateDistribution(UpdateDistributionR /// ///
    • /// - /// You must rename the ETag field to IfMatch, leaving the value unchanged. - /// (Set the value of IfMatch to the value of ETag, then remove the ETag - /// field.) + /// You must copy the ETag field value from the response. (You'll use it for the + /// IfMatch parameter in your request.) Then, remove the ETag field from + /// the distribution configuration. /// ///
    • /// @@ -10531,7 +10549,7 @@ public virtual UpdateDistributionResponse UpdateDistribution(UpdateDistributionR /// ///
  • /// - /// Submit an UpdateDistribution request, providing the distribution configuration. + /// Submit an UpdateDistribution request, providing the updated distribution configuration. /// The new configuration replaces the existing configuration. The values that you specify /// in an UpdateDistribution request are not merged into your existing configuration. /// Make sure to include all fields: the ones that you modified and also the ones that diff --git a/sdk/src/Services/CloudFront/Properties/AssemblyInfo.cs b/sdk/src/Services/CloudFront/Properties/AssemblyInfo.cs index 43532e610bed..bd95818f6264 100644 --- a/sdk/src/Services/CloudFront/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/CloudFront/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3.4.0")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3.4.0")] -[assembly: AssemblyFileVersion("3.7.401.5")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/CloudFrontKeyValueStore/CloudFrontKeyValueStore.sln b/sdk/src/Services/CloudFrontKeyValueStore/CloudFrontKeyValueStore.sln index a69017fc4b13..e77ffdeafca3 100644 --- a/sdk/src/Services/CloudFrontKeyValueStore/CloudFrontKeyValueStore.sln +++ b/sdk/src/Services/CloudFrontKeyValueStore/CloudFrontKeyValueStore.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {EC7FEBCF-8289-4035-8CEC-74E419F676FA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {EC7FEBCF-8289-4035-8CEC-74E419F676FA}.Debug|Any CPU.Build.0 = Debug|Any CPU {EC7FEBCF-8289-4035-8CEC-74E419F676FA}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {62D8856F-CBEE-46E4-9820-D65E070FCBE3}.Debug|Any CPU.Build.0 = Debug|Any CPU {62D8856F-CBEE-46E4-9820-D65E070FCBE3}.Release|Any CPU.ActiveCfg = Release|Any CPU {62D8856F-CBEE-46E4-9820-D65E070FCBE3}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {63436C83-8741-451C-889F-49212D7A6939}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {63436C83-8741-451C-889F-49212D7A6939}.Debug|Any CPU.Build.0 = Debug|Any CPU - {63436C83-8741-451C-889F-49212D7A6939}.Release|Any CPU.ActiveCfg = Release|Any CPU - {63436C83-8741-451C-889F-49212D7A6939}.Release|Any CPU.Build.0 = Release|Any CPU - {67228771-15C6-41AD-A61A-EEE2D04FB46D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {67228771-15C6-41AD-A61A-EEE2D04FB46D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {67228771-15C6-41AD-A61A-EEE2D04FB46D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {67228771-15C6-41AD-A61A-EEE2D04FB46D}.Release|Any CPU.Build.0 = Release|Any CPU - {7FB0132D-ECBA-4E10-8D43-F7555209BDE2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7FB0132D-ECBA-4E10-8D43-F7555209BDE2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7FB0132D-ECBA-4E10-8D43-F7555209BDE2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7FB0132D-ECBA-4E10-8D43-F7555209BDE2}.Release|Any CPU.Build.0 = Release|Any CPU - {319095CA-3D81-4B7B-92EB-D04F31B010BE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {319095CA-3D81-4B7B-92EB-D04F31B010BE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {319095CA-3D81-4B7B-92EB-D04F31B010BE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {319095CA-3D81-4B7B-92EB-D04F31B010BE}.Release|Any CPU.Build.0 = Release|Any CPU - {4291F302-BC8B-49EC-91BD-CAE8BF2F23C9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4291F302-BC8B-49EC-91BD-CAE8BF2F23C9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4291F302-BC8B-49EC-91BD-CAE8BF2F23C9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4291F302-BC8B-49EC-91BD-CAE8BF2F23C9}.Release|Any CPU.Build.0 = Release|Any CPU - {1ADC41AE-6CC5-420E-8D28-6343BE80387B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1ADC41AE-6CC5-420E-8D28-6343BE80387B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1ADC41AE-6CC5-420E-8D28-6343BE80387B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1ADC41AE-6CC5-420E-8D28-6343BE80387B}.Release|Any CPU.Build.0 = Release|Any CPU - {C000A519-A045-4BFF-B758-B087FB2EBF1A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C000A519-A045-4BFF-B758-B087FB2EBF1A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C000A519-A045-4BFF-B758-B087FB2EBF1A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C000A519-A045-4BFF-B758-B087FB2EBF1A}.Release|Any CPU.Build.0 = Release|Any CPU - {7D43CA4E-1DE0-4FF1-86A8-CB9DE2F6E2F7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7D43CA4E-1DE0-4FF1-86A8-CB9DE2F6E2F7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7D43CA4E-1DE0-4FF1-86A8-CB9DE2F6E2F7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7D43CA4E-1DE0-4FF1-86A8-CB9DE2F6E2F7}.Release|Any CPU.Build.0 = Release|Any CPU - {B6089AF9-8278-4886-9439-1AFBC28E6BE1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B6089AF9-8278-4886-9439-1AFBC28E6BE1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B6089AF9-8278-4886-9439-1AFBC28E6BE1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B6089AF9-8278-4886-9439-1AFBC28E6BE1}.Release|Any CPU.Build.0 = Release|Any CPU - {F6522C2C-A0F5-4D02-84D3-5BBB16659937}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F6522C2C-A0F5-4D02-84D3-5BBB16659937}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F6522C2C-A0F5-4D02-84D3-5BBB16659937}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F6522C2C-A0F5-4D02-84D3-5BBB16659937}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {63436C83-8741-451C-889F-49212D7A6939}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {63436C83-8741-451C-889F-49212D7A6939}.Debug|Any CPU.Build.0 = Debug|Any CPU - {63436C83-8741-451C-889F-49212D7A6939}.Release|Any CPU.ActiveCfg = Release|Any CPU - {63436C83-8741-451C-889F-49212D7A6939}.Release|Any CPU.Build.0 = Release|Any CPU - {67228771-15C6-41AD-A61A-EEE2D04FB46D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {67228771-15C6-41AD-A61A-EEE2D04FB46D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {67228771-15C6-41AD-A61A-EEE2D04FB46D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {67228771-15C6-41AD-A61A-EEE2D04FB46D}.Release|Any CPU.Build.0 = Release|Any CPU - {7FB0132D-ECBA-4E10-8D43-F7555209BDE2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7FB0132D-ECBA-4E10-8D43-F7555209BDE2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7FB0132D-ECBA-4E10-8D43-F7555209BDE2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7FB0132D-ECBA-4E10-8D43-F7555209BDE2}.Release|Any CPU.Build.0 = Release|Any CPU - {319095CA-3D81-4B7B-92EB-D04F31B010BE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {319095CA-3D81-4B7B-92EB-D04F31B010BE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {319095CA-3D81-4B7B-92EB-D04F31B010BE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {319095CA-3D81-4B7B-92EB-D04F31B010BE}.Release|Any CPU.Build.0 = Release|Any CPU - {4291F302-BC8B-49EC-91BD-CAE8BF2F23C9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4291F302-BC8B-49EC-91BD-CAE8BF2F23C9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4291F302-BC8B-49EC-91BD-CAE8BF2F23C9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4291F302-BC8B-49EC-91BD-CAE8BF2F23C9}.Release|Any CPU.Build.0 = Release|Any CPU - {1ADC41AE-6CC5-420E-8D28-6343BE80387B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1ADC41AE-6CC5-420E-8D28-6343BE80387B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1ADC41AE-6CC5-420E-8D28-6343BE80387B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1ADC41AE-6CC5-420E-8D28-6343BE80387B}.Release|Any CPU.Build.0 = Release|Any CPU - {C000A519-A045-4BFF-B758-B087FB2EBF1A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C000A519-A045-4BFF-B758-B087FB2EBF1A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C000A519-A045-4BFF-B758-B087FB2EBF1A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C000A519-A045-4BFF-B758-B087FB2EBF1A}.Release|Any CPU.Build.0 = Release|Any CPU - {7D43CA4E-1DE0-4FF1-86A8-CB9DE2F6E2F7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7D43CA4E-1DE0-4FF1-86A8-CB9DE2F6E2F7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7D43CA4E-1DE0-4FF1-86A8-CB9DE2F6E2F7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7D43CA4E-1DE0-4FF1-86A8-CB9DE2F6E2F7}.Release|Any CPU.Build.0 = Release|Any CPU - {B6089AF9-8278-4886-9439-1AFBC28E6BE1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B6089AF9-8278-4886-9439-1AFBC28E6BE1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B6089AF9-8278-4886-9439-1AFBC28E6BE1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B6089AF9-8278-4886-9439-1AFBC28E6BE1}.Release|Any CPU.Build.0 = Release|Any CPU - {F6522C2C-A0F5-4D02-84D3-5BBB16659937}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F6522C2C-A0F5-4D02-84D3-5BBB16659937}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F6522C2C-A0F5-4D02-84D3-5BBB16659937}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F6522C2C-A0F5-4D02-84D3-5BBB16659937}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {EC7FEBCF-8289-4035-8CEC-74E419F676FA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {75C0D298-0A08-4D64-A1FB-83D7DAFA5C0E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {125668D1-FCB3-41C7-BC78-1B75BBD48745} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {3A8FBDAB-31C7-41FE-B6D7-EB7CBF9A17E5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {62D8856F-CBEE-46E4-9820-D65E070FCBE3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {63436C83-8741-451C-889F-49212D7A6939} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {67228771-15C6-41AD-A61A-EEE2D04FB46D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {7FB0132D-ECBA-4E10-8D43-F7555209BDE2} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {319095CA-3D81-4B7B-92EB-D04F31B010BE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4291F302-BC8B-49EC-91BD-CAE8BF2F23C9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {1ADC41AE-6CC5-420E-8D28-6343BE80387B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C000A519-A045-4BFF-B758-B087FB2EBF1A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {7D43CA4E-1DE0-4FF1-86A8-CB9DE2F6E2F7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B6089AF9-8278-4886-9439-1AFBC28E6BE1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F6522C2C-A0F5-4D02-84D3-5BBB16659937} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {63436C83-8741-451C-889F-49212D7A6939} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {67228771-15C6-41AD-A61A-EEE2D04FB46D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {7FB0132D-ECBA-4E10-8D43-F7555209BDE2} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {319095CA-3D81-4B7B-92EB-D04F31B010BE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4291F302-BC8B-49EC-91BD-CAE8BF2F23C9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {1ADC41AE-6CC5-420E-8D28-6343BE80387B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C000A519-A045-4BFF-B758-B087FB2EBF1A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {7D43CA4E-1DE0-4FF1-86A8-CB9DE2F6E2F7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B6089AF9-8278-4886-9439-1AFBC28E6BE1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F6522C2C-A0F5-4D02-84D3-5BBB16659937} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {9EF8C2C9-714E-4811-AD29-F48021545FE4} diff --git a/sdk/src/Services/CloudFrontKeyValueStore/Generated/AmazonCloudFrontKeyValueStoreConfig.cs b/sdk/src/Services/CloudFrontKeyValueStore/Generated/AmazonCloudFrontKeyValueStoreConfig.cs index 70516e4fa91d..282a9bd036e6 100644 --- a/sdk/src/Services/CloudFrontKeyValueStore/Generated/AmazonCloudFrontKeyValueStoreConfig.cs +++ b/sdk/src/Services/CloudFrontKeyValueStore/Generated/AmazonCloudFrontKeyValueStoreConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.CloudFrontKeyValueStore public partial class AmazonCloudFrontKeyValueStoreConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("CloudFront KeyValueStore", "4.0.0.0"); private static readonly AmazonCloudFrontKeyValueStoreEndpointResolver EndpointResolver = new AmazonCloudFrontKeyValueStoreEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("CloudFront KeyValueStore", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("CloudFront KeyValueStore", "3.7.400.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/CloudFrontKeyValueStore/Properties/AssemblyInfo.cs b/sdk/src/Services/CloudFrontKeyValueStore/Properties/AssemblyInfo.cs index 0664780e123a..14f60bd308a0 100644 --- a/sdk/src/Services/CloudFrontKeyValueStore/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/CloudFrontKeyValueStore/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/CloudHSM/CloudHSM.sln b/sdk/src/Services/CloudHSM/CloudHSM.sln index 16bdc1d98cb6..6f7f727da22f 100644 --- a/sdk/src/Services/CloudHSM/CloudHSM.sln +++ b/sdk/src/Services/CloudHSM/CloudHSM.sln @@ -92,7 +92,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {34012F53-4275-4A30-8D2B-D49F802795AF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {34012F53-4275-4A30-8D2B-D49F802795AF}.Debug|Any CPU.Build.0 = Debug|Any CPU {34012F53-4275-4A30-8D2B-D49F802795AF}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -113,97 +120,6 @@ Global {87050912-D5A5-4EF1-9D6D-63D72A0ED747}.Debug|Any CPU.Build.0 = Debug|Any CPU {87050912-D5A5-4EF1-9D6D-63D72A0ED747}.Release|Any CPU.ActiveCfg = Release|Any CPU {87050912-D5A5-4EF1-9D6D-63D72A0ED747}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {8C891BBE-F7BB-4EE7-ACB8-8BC33F2DD4B0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8C891BBE-F7BB-4EE7-ACB8-8BC33F2DD4B0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8C891BBE-F7BB-4EE7-ACB8-8BC33F2DD4B0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8C891BBE-F7BB-4EE7-ACB8-8BC33F2DD4B0}.Release|Any CPU.Build.0 = Release|Any CPU - {63C7DCB5-5FC3-43D7-ACED-07523B64C22A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {63C7DCB5-5FC3-43D7-ACED-07523B64C22A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {63C7DCB5-5FC3-43D7-ACED-07523B64C22A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {63C7DCB5-5FC3-43D7-ACED-07523B64C22A}.Release|Any CPU.Build.0 = Release|Any CPU - {63CCC859-4BA0-4C7B-A81C-D7FD49F3FFF8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {63CCC859-4BA0-4C7B-A81C-D7FD49F3FFF8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {63CCC859-4BA0-4C7B-A81C-D7FD49F3FFF8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {63CCC859-4BA0-4C7B-A81C-D7FD49F3FFF8}.Release|Any CPU.Build.0 = Release|Any CPU - {89874489-82C4-4B1E-B418-792A15890140}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {89874489-82C4-4B1E-B418-792A15890140}.Debug|Any CPU.Build.0 = Debug|Any CPU - {89874489-82C4-4B1E-B418-792A15890140}.Release|Any CPU.ActiveCfg = Release|Any CPU - {89874489-82C4-4B1E-B418-792A15890140}.Release|Any CPU.Build.0 = Release|Any CPU - {89A92F9E-3E28-46BD-9EEE-EFBD0D2FB58B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {89A92F9E-3E28-46BD-9EEE-EFBD0D2FB58B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {89A92F9E-3E28-46BD-9EEE-EFBD0D2FB58B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {89A92F9E-3E28-46BD-9EEE-EFBD0D2FB58B}.Release|Any CPU.Build.0 = Release|Any CPU - {5C01F985-2521-4B9A-8843-E78F1315D5F9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5C01F985-2521-4B9A-8843-E78F1315D5F9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5C01F985-2521-4B9A-8843-E78F1315D5F9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5C01F985-2521-4B9A-8843-E78F1315D5F9}.Release|Any CPU.Build.0 = Release|Any CPU - {A79B0A0D-EBEA-47A8-A881-1D4895AE5A65}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A79B0A0D-EBEA-47A8-A881-1D4895AE5A65}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A79B0A0D-EBEA-47A8-A881-1D4895AE5A65}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A79B0A0D-EBEA-47A8-A881-1D4895AE5A65}.Release|Any CPU.Build.0 = Release|Any CPU - {4A6FE333-9841-4AEC-B62E-69BC2FAF235B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4A6FE333-9841-4AEC-B62E-69BC2FAF235B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4A6FE333-9841-4AEC-B62E-69BC2FAF235B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4A6FE333-9841-4AEC-B62E-69BC2FAF235B}.Release|Any CPU.Build.0 = Release|Any CPU - {7E8A818D-E831-47F3-84E5-BCBF7927443B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7E8A818D-E831-47F3-84E5-BCBF7927443B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7E8A818D-E831-47F3-84E5-BCBF7927443B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7E8A818D-E831-47F3-84E5-BCBF7927443B}.Release|Any CPU.Build.0 = Release|Any CPU - {76148A57-0BFA-4C02-8FFF-EDD601EF3FE8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {76148A57-0BFA-4C02-8FFF-EDD601EF3FE8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {76148A57-0BFA-4C02-8FFF-EDD601EF3FE8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {76148A57-0BFA-4C02-8FFF-EDD601EF3FE8}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {8C891BBE-F7BB-4EE7-ACB8-8BC33F2DD4B0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8C891BBE-F7BB-4EE7-ACB8-8BC33F2DD4B0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8C891BBE-F7BB-4EE7-ACB8-8BC33F2DD4B0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8C891BBE-F7BB-4EE7-ACB8-8BC33F2DD4B0}.Release|Any CPU.Build.0 = Release|Any CPU - {63C7DCB5-5FC3-43D7-ACED-07523B64C22A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {63C7DCB5-5FC3-43D7-ACED-07523B64C22A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {63C7DCB5-5FC3-43D7-ACED-07523B64C22A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {63C7DCB5-5FC3-43D7-ACED-07523B64C22A}.Release|Any CPU.Build.0 = Release|Any CPU - {63CCC859-4BA0-4C7B-A81C-D7FD49F3FFF8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {63CCC859-4BA0-4C7B-A81C-D7FD49F3FFF8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {63CCC859-4BA0-4C7B-A81C-D7FD49F3FFF8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {63CCC859-4BA0-4C7B-A81C-D7FD49F3FFF8}.Release|Any CPU.Build.0 = Release|Any CPU - {89874489-82C4-4B1E-B418-792A15890140}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {89874489-82C4-4B1E-B418-792A15890140}.Debug|Any CPU.Build.0 = Debug|Any CPU - {89874489-82C4-4B1E-B418-792A15890140}.Release|Any CPU.ActiveCfg = Release|Any CPU - {89874489-82C4-4B1E-B418-792A15890140}.Release|Any CPU.Build.0 = Release|Any CPU - {89A92F9E-3E28-46BD-9EEE-EFBD0D2FB58B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {89A92F9E-3E28-46BD-9EEE-EFBD0D2FB58B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {89A92F9E-3E28-46BD-9EEE-EFBD0D2FB58B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {89A92F9E-3E28-46BD-9EEE-EFBD0D2FB58B}.Release|Any CPU.Build.0 = Release|Any CPU - {5C01F985-2521-4B9A-8843-E78F1315D5F9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5C01F985-2521-4B9A-8843-E78F1315D5F9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5C01F985-2521-4B9A-8843-E78F1315D5F9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5C01F985-2521-4B9A-8843-E78F1315D5F9}.Release|Any CPU.Build.0 = Release|Any CPU - {A79B0A0D-EBEA-47A8-A881-1D4895AE5A65}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A79B0A0D-EBEA-47A8-A881-1D4895AE5A65}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A79B0A0D-EBEA-47A8-A881-1D4895AE5A65}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A79B0A0D-EBEA-47A8-A881-1D4895AE5A65}.Release|Any CPU.Build.0 = Release|Any CPU - {4A6FE333-9841-4AEC-B62E-69BC2FAF235B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4A6FE333-9841-4AEC-B62E-69BC2FAF235B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4A6FE333-9841-4AEC-B62E-69BC2FAF235B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4A6FE333-9841-4AEC-B62E-69BC2FAF235B}.Release|Any CPU.Build.0 = Release|Any CPU - {7E8A818D-E831-47F3-84E5-BCBF7927443B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7E8A818D-E831-47F3-84E5-BCBF7927443B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7E8A818D-E831-47F3-84E5-BCBF7927443B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7E8A818D-E831-47F3-84E5-BCBF7927443B}.Release|Any CPU.Build.0 = Release|Any CPU - {76148A57-0BFA-4C02-8FFF-EDD601EF3FE8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {76148A57-0BFA-4C02-8FFF-EDD601EF3FE8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {76148A57-0BFA-4C02-8FFF-EDD601EF3FE8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {76148A57-0BFA-4C02-8FFF-EDD601EF3FE8}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -220,37 +136,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {34012F53-4275-4A30-8D2B-D49F802795AF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {3124CDF7-8043-4270-A322-545F25E48F01} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {AD899905-8B48-4FA8-B250-D700CA4F75FD} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {3972065D-1B30-483F-84B7-5B97506069A1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {87050912-D5A5-4EF1-9D6D-63D72A0ED747} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {8C891BBE-F7BB-4EE7-ACB8-8BC33F2DD4B0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {63C7DCB5-5FC3-43D7-ACED-07523B64C22A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {63CCC859-4BA0-4C7B-A81C-D7FD49F3FFF8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {89874489-82C4-4B1E-B418-792A15890140} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {89A92F9E-3E28-46BD-9EEE-EFBD0D2FB58B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {5C01F985-2521-4B9A-8843-E78F1315D5F9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A79B0A0D-EBEA-47A8-A881-1D4895AE5A65} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4A6FE333-9841-4AEC-B62E-69BC2FAF235B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {7E8A818D-E831-47F3-84E5-BCBF7927443B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {76148A57-0BFA-4C02-8FFF-EDD601EF3FE8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {8C891BBE-F7BB-4EE7-ACB8-8BC33F2DD4B0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {63C7DCB5-5FC3-43D7-ACED-07523B64C22A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {63CCC859-4BA0-4C7B-A81C-D7FD49F3FFF8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {89874489-82C4-4B1E-B418-792A15890140} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {89A92F9E-3E28-46BD-9EEE-EFBD0D2FB58B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {5C01F985-2521-4B9A-8843-E78F1315D5F9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A79B0A0D-EBEA-47A8-A881-1D4895AE5A65} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4A6FE333-9841-4AEC-B62E-69BC2FAF235B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {7E8A818D-E831-47F3-84E5-BCBF7927443B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {76148A57-0BFA-4C02-8FFF-EDD601EF3FE8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {6092D8B9-404C-461E-8BED-2BC12277D63C} diff --git a/sdk/src/Services/CloudHSM/Generated/AmazonCloudHSMConfig.cs b/sdk/src/Services/CloudHSM/Generated/AmazonCloudHSMConfig.cs index 4b756cc74e32..e5d5e9c2e5e2 100644 --- a/sdk/src/Services/CloudHSM/Generated/AmazonCloudHSMConfig.cs +++ b/sdk/src/Services/CloudHSM/Generated/AmazonCloudHSMConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.CloudHSM public partial class AmazonCloudHSMConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("CloudHSM", "4.0.0.0"); private static readonly AmazonCloudHSMEndpointResolver EndpointResolver = new AmazonCloudHSMEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("CloudHSM", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("CloudHSM", "3.7.400.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/CloudHSM/Properties/AssemblyInfo.cs b/sdk/src/Services/CloudHSM/Properties/AssemblyInfo.cs index 61a77f66bc23..6b3abab624ce 100644 --- a/sdk/src/Services/CloudHSM/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/CloudHSM/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/CloudHSMV2/CloudHSMV2.sln b/sdk/src/Services/CloudHSMV2/CloudHSMV2.sln index e3ecf0642d69..08fabcbc2272 100644 --- a/sdk/src/Services/CloudHSMV2/CloudHSMV2.sln +++ b/sdk/src/Services/CloudHSMV2/CloudHSMV2.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {24A5C6C6-D410-4B3C-96F3-C491610A5FBE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {24A5C6C6-D410-4B3C-96F3-C491610A5FBE}.Debug|Any CPU.Build.0 = Debug|Any CPU {24A5C6C6-D410-4B3C-96F3-C491610A5FBE}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {973EA8DB-67F7-43EC-8E68-64030037DDAC}.Debug|Any CPU.Build.0 = Debug|Any CPU {973EA8DB-67F7-43EC-8E68-64030037DDAC}.Release|Any CPU.ActiveCfg = Release|Any CPU {973EA8DB-67F7-43EC-8E68-64030037DDAC}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {AE7DF776-4E29-4FF3-A7DE-A79176EDDDB5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AE7DF776-4E29-4FF3-A7DE-A79176EDDDB5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AE7DF776-4E29-4FF3-A7DE-A79176EDDDB5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AE7DF776-4E29-4FF3-A7DE-A79176EDDDB5}.Release|Any CPU.Build.0 = Release|Any CPU - {F4CE246A-6139-485F-934A-C4003E5CE4AF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F4CE246A-6139-485F-934A-C4003E5CE4AF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F4CE246A-6139-485F-934A-C4003E5CE4AF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F4CE246A-6139-485F-934A-C4003E5CE4AF}.Release|Any CPU.Build.0 = Release|Any CPU - {8F7BB06E-EB2A-4CA0-8C5E-733ED10B0EA6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8F7BB06E-EB2A-4CA0-8C5E-733ED10B0EA6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8F7BB06E-EB2A-4CA0-8C5E-733ED10B0EA6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8F7BB06E-EB2A-4CA0-8C5E-733ED10B0EA6}.Release|Any CPU.Build.0 = Release|Any CPU - {95B472F2-5D71-496D-B3A7-5CF5B9676C9C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {95B472F2-5D71-496D-B3A7-5CF5B9676C9C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {95B472F2-5D71-496D-B3A7-5CF5B9676C9C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {95B472F2-5D71-496D-B3A7-5CF5B9676C9C}.Release|Any CPU.Build.0 = Release|Any CPU - {DE96F8D9-40FD-442D-BC6E-6CEC050EB609}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DE96F8D9-40FD-442D-BC6E-6CEC050EB609}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DE96F8D9-40FD-442D-BC6E-6CEC050EB609}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DE96F8D9-40FD-442D-BC6E-6CEC050EB609}.Release|Any CPU.Build.0 = Release|Any CPU - {2323CDEF-34AE-4B4C-BCFB-D2AFD9784032}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2323CDEF-34AE-4B4C-BCFB-D2AFD9784032}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2323CDEF-34AE-4B4C-BCFB-D2AFD9784032}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2323CDEF-34AE-4B4C-BCFB-D2AFD9784032}.Release|Any CPU.Build.0 = Release|Any CPU - {55376EB6-C063-4D68-9877-935D84703011}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {55376EB6-C063-4D68-9877-935D84703011}.Debug|Any CPU.Build.0 = Debug|Any CPU - {55376EB6-C063-4D68-9877-935D84703011}.Release|Any CPU.ActiveCfg = Release|Any CPU - {55376EB6-C063-4D68-9877-935D84703011}.Release|Any CPU.Build.0 = Release|Any CPU - {EF28D0D0-9B73-4CA4-889F-282DA4239B37}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EF28D0D0-9B73-4CA4-889F-282DA4239B37}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EF28D0D0-9B73-4CA4-889F-282DA4239B37}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EF28D0D0-9B73-4CA4-889F-282DA4239B37}.Release|Any CPU.Build.0 = Release|Any CPU - {DB5493C6-44DC-4271-B4D2-B9F6D834CD3D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DB5493C6-44DC-4271-B4D2-B9F6D834CD3D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DB5493C6-44DC-4271-B4D2-B9F6D834CD3D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DB5493C6-44DC-4271-B4D2-B9F6D834CD3D}.Release|Any CPU.Build.0 = Release|Any CPU - {DD022018-3333-4FC6-972A-A0C67204EE86}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DD022018-3333-4FC6-972A-A0C67204EE86}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DD022018-3333-4FC6-972A-A0C67204EE86}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DD022018-3333-4FC6-972A-A0C67204EE86}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {AE7DF776-4E29-4FF3-A7DE-A79176EDDDB5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AE7DF776-4E29-4FF3-A7DE-A79176EDDDB5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AE7DF776-4E29-4FF3-A7DE-A79176EDDDB5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AE7DF776-4E29-4FF3-A7DE-A79176EDDDB5}.Release|Any CPU.Build.0 = Release|Any CPU - {F4CE246A-6139-485F-934A-C4003E5CE4AF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F4CE246A-6139-485F-934A-C4003E5CE4AF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F4CE246A-6139-485F-934A-C4003E5CE4AF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F4CE246A-6139-485F-934A-C4003E5CE4AF}.Release|Any CPU.Build.0 = Release|Any CPU - {8F7BB06E-EB2A-4CA0-8C5E-733ED10B0EA6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8F7BB06E-EB2A-4CA0-8C5E-733ED10B0EA6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8F7BB06E-EB2A-4CA0-8C5E-733ED10B0EA6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8F7BB06E-EB2A-4CA0-8C5E-733ED10B0EA6}.Release|Any CPU.Build.0 = Release|Any CPU - {95B472F2-5D71-496D-B3A7-5CF5B9676C9C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {95B472F2-5D71-496D-B3A7-5CF5B9676C9C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {95B472F2-5D71-496D-B3A7-5CF5B9676C9C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {95B472F2-5D71-496D-B3A7-5CF5B9676C9C}.Release|Any CPU.Build.0 = Release|Any CPU - {DE96F8D9-40FD-442D-BC6E-6CEC050EB609}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DE96F8D9-40FD-442D-BC6E-6CEC050EB609}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DE96F8D9-40FD-442D-BC6E-6CEC050EB609}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DE96F8D9-40FD-442D-BC6E-6CEC050EB609}.Release|Any CPU.Build.0 = Release|Any CPU - {2323CDEF-34AE-4B4C-BCFB-D2AFD9784032}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2323CDEF-34AE-4B4C-BCFB-D2AFD9784032}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2323CDEF-34AE-4B4C-BCFB-D2AFD9784032}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2323CDEF-34AE-4B4C-BCFB-D2AFD9784032}.Release|Any CPU.Build.0 = Release|Any CPU - {55376EB6-C063-4D68-9877-935D84703011}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {55376EB6-C063-4D68-9877-935D84703011}.Debug|Any CPU.Build.0 = Debug|Any CPU - {55376EB6-C063-4D68-9877-935D84703011}.Release|Any CPU.ActiveCfg = Release|Any CPU - {55376EB6-C063-4D68-9877-935D84703011}.Release|Any CPU.Build.0 = Release|Any CPU - {EF28D0D0-9B73-4CA4-889F-282DA4239B37}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EF28D0D0-9B73-4CA4-889F-282DA4239B37}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EF28D0D0-9B73-4CA4-889F-282DA4239B37}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EF28D0D0-9B73-4CA4-889F-282DA4239B37}.Release|Any CPU.Build.0 = Release|Any CPU - {DB5493C6-44DC-4271-B4D2-B9F6D834CD3D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DB5493C6-44DC-4271-B4D2-B9F6D834CD3D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DB5493C6-44DC-4271-B4D2-B9F6D834CD3D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DB5493C6-44DC-4271-B4D2-B9F6D834CD3D}.Release|Any CPU.Build.0 = Release|Any CPU - {DD022018-3333-4FC6-972A-A0C67204EE86}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DD022018-3333-4FC6-972A-A0C67204EE86}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DD022018-3333-4FC6-972A-A0C67204EE86}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DD022018-3333-4FC6-972A-A0C67204EE86}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {24A5C6C6-D410-4B3C-96F3-C491610A5FBE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {11115062-FCCD-43FF-8F87-0931DB19E950} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {819880F0-3B58-4AAF-AC58-052CAB9CDBBB} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {A3AAE5E9-404F-45EC-91D2-5161F0A7C817} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {973EA8DB-67F7-43EC-8E68-64030037DDAC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {AE7DF776-4E29-4FF3-A7DE-A79176EDDDB5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F4CE246A-6139-485F-934A-C4003E5CE4AF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8F7BB06E-EB2A-4CA0-8C5E-733ED10B0EA6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {95B472F2-5D71-496D-B3A7-5CF5B9676C9C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {DE96F8D9-40FD-442D-BC6E-6CEC050EB609} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {2323CDEF-34AE-4B4C-BCFB-D2AFD9784032} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {55376EB6-C063-4D68-9877-935D84703011} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {EF28D0D0-9B73-4CA4-889F-282DA4239B37} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {DB5493C6-44DC-4271-B4D2-B9F6D834CD3D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {DD022018-3333-4FC6-972A-A0C67204EE86} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {AE7DF776-4E29-4FF3-A7DE-A79176EDDDB5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F4CE246A-6139-485F-934A-C4003E5CE4AF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8F7BB06E-EB2A-4CA0-8C5E-733ED10B0EA6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {95B472F2-5D71-496D-B3A7-5CF5B9676C9C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {DE96F8D9-40FD-442D-BC6E-6CEC050EB609} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {2323CDEF-34AE-4B4C-BCFB-D2AFD9784032} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {55376EB6-C063-4D68-9877-935D84703011} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {EF28D0D0-9B73-4CA4-889F-282DA4239B37} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {DB5493C6-44DC-4271-B4D2-B9F6D834CD3D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {DD022018-3333-4FC6-972A-A0C67204EE86} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {B5DBCBC4-E313-45F3-862A-B8F169C45D2F} diff --git a/sdk/src/Services/CloudHSMV2/Generated/AmazonCloudHSMV2Config.cs b/sdk/src/Services/CloudHSMV2/Generated/AmazonCloudHSMV2Config.cs index af56b5a67160..f963cfd16422 100644 --- a/sdk/src/Services/CloudHSMV2/Generated/AmazonCloudHSMV2Config.cs +++ b/sdk/src/Services/CloudHSMV2/Generated/AmazonCloudHSMV2Config.cs @@ -34,16 +34,10 @@ namespace Amazon.CloudHSMV2 public partial class AmazonCloudHSMV2Config : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("CloudHSM V2", "4.0.0.0"); private static readonly AmazonCloudHSMV2EndpointResolver EndpointResolver = new AmazonCloudHSMV2EndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("CloudHSM V2", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("CloudHSM V2", "3.7.400.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/CloudHSMV2/Properties/AssemblyInfo.cs b/sdk/src/Services/CloudHSMV2/Properties/AssemblyInfo.cs index 7e940a11c270..60deceb5baaf 100644 --- a/sdk/src/Services/CloudHSMV2/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/CloudHSMV2/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/CloudSearch/CloudSearch.sln b/sdk/src/Services/CloudSearch/CloudSearch.sln index 9a414ac017bd..f50b088cd9d8 100644 --- a/sdk/src/Services/CloudSearch/CloudSearch.sln +++ b/sdk/src/Services/CloudSearch/CloudSearch.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {3159105D-E13C-4760-A713-E6CB2F710FE0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {3159105D-E13C-4760-A713-E6CB2F710FE0}.Debug|Any CPU.Build.0 = Debug|Any CPU {3159105D-E13C-4760-A713-E6CB2F710FE0}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {A3EDFAFC-F000-4F1B-9026-57388B084F28}.Debug|Any CPU.Build.0 = Debug|Any CPU {A3EDFAFC-F000-4F1B-9026-57388B084F28}.Release|Any CPU.ActiveCfg = Release|Any CPU {A3EDFAFC-F000-4F1B-9026-57388B084F28}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {62EB3DD7-D490-41F9-B764-05518776384D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {62EB3DD7-D490-41F9-B764-05518776384D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {62EB3DD7-D490-41F9-B764-05518776384D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {62EB3DD7-D490-41F9-B764-05518776384D}.Release|Any CPU.Build.0 = Release|Any CPU - {15274B6A-CBAD-477C-AF0D-B3DD7C4B3CAC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {15274B6A-CBAD-477C-AF0D-B3DD7C4B3CAC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {15274B6A-CBAD-477C-AF0D-B3DD7C4B3CAC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {15274B6A-CBAD-477C-AF0D-B3DD7C4B3CAC}.Release|Any CPU.Build.0 = Release|Any CPU - {93F1962A-89AE-4D37-8FEF-F822EC071562}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {93F1962A-89AE-4D37-8FEF-F822EC071562}.Debug|Any CPU.Build.0 = Debug|Any CPU - {93F1962A-89AE-4D37-8FEF-F822EC071562}.Release|Any CPU.ActiveCfg = Release|Any CPU - {93F1962A-89AE-4D37-8FEF-F822EC071562}.Release|Any CPU.Build.0 = Release|Any CPU - {2C36A9F7-48E1-4EEA-8481-BBDE62285902}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2C36A9F7-48E1-4EEA-8481-BBDE62285902}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2C36A9F7-48E1-4EEA-8481-BBDE62285902}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2C36A9F7-48E1-4EEA-8481-BBDE62285902}.Release|Any CPU.Build.0 = Release|Any CPU - {60171656-4000-4E6A-807F-088C8D679EB5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {60171656-4000-4E6A-807F-088C8D679EB5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {60171656-4000-4E6A-807F-088C8D679EB5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {60171656-4000-4E6A-807F-088C8D679EB5}.Release|Any CPU.Build.0 = Release|Any CPU - {9F20977D-85F4-4B85-B316-D8EF87569D5E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9F20977D-85F4-4B85-B316-D8EF87569D5E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9F20977D-85F4-4B85-B316-D8EF87569D5E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9F20977D-85F4-4B85-B316-D8EF87569D5E}.Release|Any CPU.Build.0 = Release|Any CPU - {A8D1EFEA-5F99-41BF-9004-8B3DE83A7CE2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A8D1EFEA-5F99-41BF-9004-8B3DE83A7CE2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A8D1EFEA-5F99-41BF-9004-8B3DE83A7CE2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A8D1EFEA-5F99-41BF-9004-8B3DE83A7CE2}.Release|Any CPU.Build.0 = Release|Any CPU - {4AB31B4A-DBDE-4EE1-9B3F-052859823DDE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4AB31B4A-DBDE-4EE1-9B3F-052859823DDE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4AB31B4A-DBDE-4EE1-9B3F-052859823DDE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4AB31B4A-DBDE-4EE1-9B3F-052859823DDE}.Release|Any CPU.Build.0 = Release|Any CPU - {1D83A2C6-8AF5-49F7-806C-16DE888A62B6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1D83A2C6-8AF5-49F7-806C-16DE888A62B6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1D83A2C6-8AF5-49F7-806C-16DE888A62B6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1D83A2C6-8AF5-49F7-806C-16DE888A62B6}.Release|Any CPU.Build.0 = Release|Any CPU - {0C78A374-ACDD-4D94-A25E-42FB85C94E9B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0C78A374-ACDD-4D94-A25E-42FB85C94E9B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0C78A374-ACDD-4D94-A25E-42FB85C94E9B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0C78A374-ACDD-4D94-A25E-42FB85C94E9B}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {62EB3DD7-D490-41F9-B764-05518776384D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {62EB3DD7-D490-41F9-B764-05518776384D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {62EB3DD7-D490-41F9-B764-05518776384D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {62EB3DD7-D490-41F9-B764-05518776384D}.Release|Any CPU.Build.0 = Release|Any CPU - {15274B6A-CBAD-477C-AF0D-B3DD7C4B3CAC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {15274B6A-CBAD-477C-AF0D-B3DD7C4B3CAC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {15274B6A-CBAD-477C-AF0D-B3DD7C4B3CAC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {15274B6A-CBAD-477C-AF0D-B3DD7C4B3CAC}.Release|Any CPU.Build.0 = Release|Any CPU - {93F1962A-89AE-4D37-8FEF-F822EC071562}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {93F1962A-89AE-4D37-8FEF-F822EC071562}.Debug|Any CPU.Build.0 = Debug|Any CPU - {93F1962A-89AE-4D37-8FEF-F822EC071562}.Release|Any CPU.ActiveCfg = Release|Any CPU - {93F1962A-89AE-4D37-8FEF-F822EC071562}.Release|Any CPU.Build.0 = Release|Any CPU - {2C36A9F7-48E1-4EEA-8481-BBDE62285902}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2C36A9F7-48E1-4EEA-8481-BBDE62285902}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2C36A9F7-48E1-4EEA-8481-BBDE62285902}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2C36A9F7-48E1-4EEA-8481-BBDE62285902}.Release|Any CPU.Build.0 = Release|Any CPU - {60171656-4000-4E6A-807F-088C8D679EB5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {60171656-4000-4E6A-807F-088C8D679EB5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {60171656-4000-4E6A-807F-088C8D679EB5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {60171656-4000-4E6A-807F-088C8D679EB5}.Release|Any CPU.Build.0 = Release|Any CPU - {9F20977D-85F4-4B85-B316-D8EF87569D5E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9F20977D-85F4-4B85-B316-D8EF87569D5E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9F20977D-85F4-4B85-B316-D8EF87569D5E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9F20977D-85F4-4B85-B316-D8EF87569D5E}.Release|Any CPU.Build.0 = Release|Any CPU - {A8D1EFEA-5F99-41BF-9004-8B3DE83A7CE2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A8D1EFEA-5F99-41BF-9004-8B3DE83A7CE2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A8D1EFEA-5F99-41BF-9004-8B3DE83A7CE2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A8D1EFEA-5F99-41BF-9004-8B3DE83A7CE2}.Release|Any CPU.Build.0 = Release|Any CPU - {4AB31B4A-DBDE-4EE1-9B3F-052859823DDE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4AB31B4A-DBDE-4EE1-9B3F-052859823DDE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4AB31B4A-DBDE-4EE1-9B3F-052859823DDE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4AB31B4A-DBDE-4EE1-9B3F-052859823DDE}.Release|Any CPU.Build.0 = Release|Any CPU - {1D83A2C6-8AF5-49F7-806C-16DE888A62B6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1D83A2C6-8AF5-49F7-806C-16DE888A62B6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1D83A2C6-8AF5-49F7-806C-16DE888A62B6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1D83A2C6-8AF5-49F7-806C-16DE888A62B6}.Release|Any CPU.Build.0 = Release|Any CPU - {0C78A374-ACDD-4D94-A25E-42FB85C94E9B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0C78A374-ACDD-4D94-A25E-42FB85C94E9B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0C78A374-ACDD-4D94-A25E-42FB85C94E9B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0C78A374-ACDD-4D94-A25E-42FB85C94E9B}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {3159105D-E13C-4760-A713-E6CB2F710FE0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {0706A454-676B-48B2-92FF-53EC3FFD72BD} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {3DF0A3B9-8A68-4B64-8EC3-ED89ACAFC78C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {55AFEA2B-4E14-4A61-A768-9BD0ACC097B7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {A3EDFAFC-F000-4F1B-9026-57388B084F28} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {62EB3DD7-D490-41F9-B764-05518776384D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {15274B6A-CBAD-477C-AF0D-B3DD7C4B3CAC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {93F1962A-89AE-4D37-8FEF-F822EC071562} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {2C36A9F7-48E1-4EEA-8481-BBDE62285902} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {60171656-4000-4E6A-807F-088C8D679EB5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {9F20977D-85F4-4B85-B316-D8EF87569D5E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A8D1EFEA-5F99-41BF-9004-8B3DE83A7CE2} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4AB31B4A-DBDE-4EE1-9B3F-052859823DDE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {1D83A2C6-8AF5-49F7-806C-16DE888A62B6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0C78A374-ACDD-4D94-A25E-42FB85C94E9B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {62EB3DD7-D490-41F9-B764-05518776384D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {15274B6A-CBAD-477C-AF0D-B3DD7C4B3CAC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {93F1962A-89AE-4D37-8FEF-F822EC071562} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {2C36A9F7-48E1-4EEA-8481-BBDE62285902} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {60171656-4000-4E6A-807F-088C8D679EB5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {9F20977D-85F4-4B85-B316-D8EF87569D5E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A8D1EFEA-5F99-41BF-9004-8B3DE83A7CE2} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4AB31B4A-DBDE-4EE1-9B3F-052859823DDE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {1D83A2C6-8AF5-49F7-806C-16DE888A62B6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0C78A374-ACDD-4D94-A25E-42FB85C94E9B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {8B65849B-75FE-4A43-8354-B7C21E1FE943} diff --git a/sdk/src/Services/CloudSearch/Generated/AmazonCloudSearchConfig.cs b/sdk/src/Services/CloudSearch/Generated/AmazonCloudSearchConfig.cs index c3e6d963e0d1..f303bd773a07 100644 --- a/sdk/src/Services/CloudSearch/Generated/AmazonCloudSearchConfig.cs +++ b/sdk/src/Services/CloudSearch/Generated/AmazonCloudSearchConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.CloudSearch public partial class AmazonCloudSearchConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("CloudSearch", "4.0.0.0"); private static readonly AmazonCloudSearchEndpointResolver EndpointResolver = new AmazonCloudSearchEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("CloudSearch", "3.7.400.27"); -======= - InternalSDKUtils.BuildUserAgentString("CloudSearch", "3.7.400.54"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/CloudSearch/Properties/AssemblyInfo.cs b/sdk/src/Services/CloudSearch/Properties/AssemblyInfo.cs index 85b817f137f5..8a79374897f5 100644 --- a/sdk/src/Services/CloudSearch/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/CloudSearch/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.27")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.54")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/CloudSearchDomain/CloudSearchDomain.sln b/sdk/src/Services/CloudSearchDomain/CloudSearchDomain.sln index fff5b5e12752..4a3345648270 100644 --- a/sdk/src/Services/CloudSearchDomain/CloudSearchDomain.sln +++ b/sdk/src/Services/CloudSearchDomain/CloudSearchDomain.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {09A3F767-311E-4882-ABA1-F92D51F18760}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {09A3F767-311E-4882-ABA1-F92D51F18760}.Debug|Any CPU.Build.0 = Debug|Any CPU {09A3F767-311E-4882-ABA1-F92D51F18760}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {3798BDF4-0D32-439C-A6E0-348C2CE442A9}.Debug|Any CPU.Build.0 = Debug|Any CPU {3798BDF4-0D32-439C-A6E0-348C2CE442A9}.Release|Any CPU.ActiveCfg = Release|Any CPU {3798BDF4-0D32-439C-A6E0-348C2CE442A9}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {39C3B18F-6BAF-4740-A54B-36DEF583AEDC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {39C3B18F-6BAF-4740-A54B-36DEF583AEDC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {39C3B18F-6BAF-4740-A54B-36DEF583AEDC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {39C3B18F-6BAF-4740-A54B-36DEF583AEDC}.Release|Any CPU.Build.0 = Release|Any CPU - {399F0FCA-D095-475B-BADF-5AC5F955A7DB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {399F0FCA-D095-475B-BADF-5AC5F955A7DB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {399F0FCA-D095-475B-BADF-5AC5F955A7DB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {399F0FCA-D095-475B-BADF-5AC5F955A7DB}.Release|Any CPU.Build.0 = Release|Any CPU - {DE17CE10-77C4-4F1E-A59B-49C075BFFADD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DE17CE10-77C4-4F1E-A59B-49C075BFFADD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DE17CE10-77C4-4F1E-A59B-49C075BFFADD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DE17CE10-77C4-4F1E-A59B-49C075BFFADD}.Release|Any CPU.Build.0 = Release|Any CPU - {0D4FE2C0-4F72-4E28-A834-A91C03FF5388}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0D4FE2C0-4F72-4E28-A834-A91C03FF5388}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0D4FE2C0-4F72-4E28-A834-A91C03FF5388}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0D4FE2C0-4F72-4E28-A834-A91C03FF5388}.Release|Any CPU.Build.0 = Release|Any CPU - {5ADFF412-4775-4BC0-8AC3-7E1C230F4BCE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5ADFF412-4775-4BC0-8AC3-7E1C230F4BCE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5ADFF412-4775-4BC0-8AC3-7E1C230F4BCE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5ADFF412-4775-4BC0-8AC3-7E1C230F4BCE}.Release|Any CPU.Build.0 = Release|Any CPU - {19C156BE-42AE-49D3-ADAE-B9AA5D2B6673}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {19C156BE-42AE-49D3-ADAE-B9AA5D2B6673}.Debug|Any CPU.Build.0 = Debug|Any CPU - {19C156BE-42AE-49D3-ADAE-B9AA5D2B6673}.Release|Any CPU.ActiveCfg = Release|Any CPU - {19C156BE-42AE-49D3-ADAE-B9AA5D2B6673}.Release|Any CPU.Build.0 = Release|Any CPU - {FD468879-121A-458E-8A24-28CC0F971FB8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FD468879-121A-458E-8A24-28CC0F971FB8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FD468879-121A-458E-8A24-28CC0F971FB8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FD468879-121A-458E-8A24-28CC0F971FB8}.Release|Any CPU.Build.0 = Release|Any CPU - {C7939A69-A18D-4601-9C27-5E5E36174B3D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C7939A69-A18D-4601-9C27-5E5E36174B3D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C7939A69-A18D-4601-9C27-5E5E36174B3D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C7939A69-A18D-4601-9C27-5E5E36174B3D}.Release|Any CPU.Build.0 = Release|Any CPU - {A62AD997-AA92-4618-92C9-C05337F0CF35}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A62AD997-AA92-4618-92C9-C05337F0CF35}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A62AD997-AA92-4618-92C9-C05337F0CF35}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A62AD997-AA92-4618-92C9-C05337F0CF35}.Release|Any CPU.Build.0 = Release|Any CPU - {7EC7DD2A-26BB-4BC7-B490-770450F842A6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7EC7DD2A-26BB-4BC7-B490-770450F842A6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7EC7DD2A-26BB-4BC7-B490-770450F842A6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7EC7DD2A-26BB-4BC7-B490-770450F842A6}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {39C3B18F-6BAF-4740-A54B-36DEF583AEDC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {39C3B18F-6BAF-4740-A54B-36DEF583AEDC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {39C3B18F-6BAF-4740-A54B-36DEF583AEDC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {39C3B18F-6BAF-4740-A54B-36DEF583AEDC}.Release|Any CPU.Build.0 = Release|Any CPU - {399F0FCA-D095-475B-BADF-5AC5F955A7DB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {399F0FCA-D095-475B-BADF-5AC5F955A7DB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {399F0FCA-D095-475B-BADF-5AC5F955A7DB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {399F0FCA-D095-475B-BADF-5AC5F955A7DB}.Release|Any CPU.Build.0 = Release|Any CPU - {DE17CE10-77C4-4F1E-A59B-49C075BFFADD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DE17CE10-77C4-4F1E-A59B-49C075BFFADD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DE17CE10-77C4-4F1E-A59B-49C075BFFADD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DE17CE10-77C4-4F1E-A59B-49C075BFFADD}.Release|Any CPU.Build.0 = Release|Any CPU - {0D4FE2C0-4F72-4E28-A834-A91C03FF5388}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0D4FE2C0-4F72-4E28-A834-A91C03FF5388}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0D4FE2C0-4F72-4E28-A834-A91C03FF5388}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0D4FE2C0-4F72-4E28-A834-A91C03FF5388}.Release|Any CPU.Build.0 = Release|Any CPU - {5ADFF412-4775-4BC0-8AC3-7E1C230F4BCE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5ADFF412-4775-4BC0-8AC3-7E1C230F4BCE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5ADFF412-4775-4BC0-8AC3-7E1C230F4BCE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5ADFF412-4775-4BC0-8AC3-7E1C230F4BCE}.Release|Any CPU.Build.0 = Release|Any CPU - {19C156BE-42AE-49D3-ADAE-B9AA5D2B6673}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {19C156BE-42AE-49D3-ADAE-B9AA5D2B6673}.Debug|Any CPU.Build.0 = Debug|Any CPU - {19C156BE-42AE-49D3-ADAE-B9AA5D2B6673}.Release|Any CPU.ActiveCfg = Release|Any CPU - {19C156BE-42AE-49D3-ADAE-B9AA5D2B6673}.Release|Any CPU.Build.0 = Release|Any CPU - {FD468879-121A-458E-8A24-28CC0F971FB8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FD468879-121A-458E-8A24-28CC0F971FB8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FD468879-121A-458E-8A24-28CC0F971FB8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FD468879-121A-458E-8A24-28CC0F971FB8}.Release|Any CPU.Build.0 = Release|Any CPU - {C7939A69-A18D-4601-9C27-5E5E36174B3D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C7939A69-A18D-4601-9C27-5E5E36174B3D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C7939A69-A18D-4601-9C27-5E5E36174B3D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C7939A69-A18D-4601-9C27-5E5E36174B3D}.Release|Any CPU.Build.0 = Release|Any CPU - {A62AD997-AA92-4618-92C9-C05337F0CF35}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A62AD997-AA92-4618-92C9-C05337F0CF35}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A62AD997-AA92-4618-92C9-C05337F0CF35}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A62AD997-AA92-4618-92C9-C05337F0CF35}.Release|Any CPU.Build.0 = Release|Any CPU - {7EC7DD2A-26BB-4BC7-B490-770450F842A6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7EC7DD2A-26BB-4BC7-B490-770450F842A6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7EC7DD2A-26BB-4BC7-B490-770450F842A6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7EC7DD2A-26BB-4BC7-B490-770450F842A6}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {09A3F767-311E-4882-ABA1-F92D51F18760} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {5507ECA1-DB60-4D23-BAB9-B8A70772B034} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {8CF49136-E7A3-43FA-9C2B-33805B5573EF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {B9B7AA6F-D3AF-434D-86E6-18B9D2853DEC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {3798BDF4-0D32-439C-A6E0-348C2CE442A9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {39C3B18F-6BAF-4740-A54B-36DEF583AEDC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {399F0FCA-D095-475B-BADF-5AC5F955A7DB} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {DE17CE10-77C4-4F1E-A59B-49C075BFFADD} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0D4FE2C0-4F72-4E28-A834-A91C03FF5388} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {5ADFF412-4775-4BC0-8AC3-7E1C230F4BCE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {19C156BE-42AE-49D3-ADAE-B9AA5D2B6673} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {FD468879-121A-458E-8A24-28CC0F971FB8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C7939A69-A18D-4601-9C27-5E5E36174B3D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A62AD997-AA92-4618-92C9-C05337F0CF35} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {7EC7DD2A-26BB-4BC7-B490-770450F842A6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {39C3B18F-6BAF-4740-A54B-36DEF583AEDC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {399F0FCA-D095-475B-BADF-5AC5F955A7DB} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {DE17CE10-77C4-4F1E-A59B-49C075BFFADD} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0D4FE2C0-4F72-4E28-A834-A91C03FF5388} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {5ADFF412-4775-4BC0-8AC3-7E1C230F4BCE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {19C156BE-42AE-49D3-ADAE-B9AA5D2B6673} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {FD468879-121A-458E-8A24-28CC0F971FB8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C7939A69-A18D-4601-9C27-5E5E36174B3D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A62AD997-AA92-4618-92C9-C05337F0CF35} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {7EC7DD2A-26BB-4BC7-B490-770450F842A6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {21E5D1A2-7C03-4FC6-B863-2EFE9B89DA17} diff --git a/sdk/src/Services/CloudSearchDomain/Generated/AmazonCloudSearchDomainConfig.cs b/sdk/src/Services/CloudSearchDomain/Generated/AmazonCloudSearchDomainConfig.cs index 54c32a64a465..df8c94410e25 100644 --- a/sdk/src/Services/CloudSearchDomain/Generated/AmazonCloudSearchDomainConfig.cs +++ b/sdk/src/Services/CloudSearchDomain/Generated/AmazonCloudSearchDomainConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.CloudSearchDomain public partial class AmazonCloudSearchDomainConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("CloudSearch Domain", "4.0.0.0"); private static readonly AmazonCloudSearchDomainEndpointResolver EndpointResolver = new AmazonCloudSearchDomainEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("CloudSearch Domain", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("CloudSearch Domain", "3.7.400.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/CloudSearchDomain/Properties/AssemblyInfo.cs b/sdk/src/Services/CloudSearchDomain/Properties/AssemblyInfo.cs index cae90150b27f..aa8844971957 100644 --- a/sdk/src/Services/CloudSearchDomain/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/CloudSearchDomain/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/CloudTrail/CloudTrail.sln b/sdk/src/Services/CloudTrail/CloudTrail.sln index badcb4447aca..714f14b470d2 100644 --- a/sdk/src/Services/CloudTrail/CloudTrail.sln +++ b/sdk/src/Services/CloudTrail/CloudTrail.sln @@ -92,7 +92,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {060DE27C-6968-46E7-832E-0C6A8DF1265B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {060DE27C-6968-46E7-832E-0C6A8DF1265B}.Debug|Any CPU.Build.0 = Debug|Any CPU {060DE27C-6968-46E7-832E-0C6A8DF1265B}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -113,97 +120,6 @@ Global {00FC67A5-FFFE-4CFE-8924-95E346804399}.Debug|Any CPU.Build.0 = Debug|Any CPU {00FC67A5-FFFE-4CFE-8924-95E346804399}.Release|Any CPU.ActiveCfg = Release|Any CPU {00FC67A5-FFFE-4CFE-8924-95E346804399}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {A4D44369-51EE-4CD8-87B2-372BC041627F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A4D44369-51EE-4CD8-87B2-372BC041627F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A4D44369-51EE-4CD8-87B2-372BC041627F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A4D44369-51EE-4CD8-87B2-372BC041627F}.Release|Any CPU.Build.0 = Release|Any CPU - {5E207D70-E283-4E38-AFDB-9C3A701139D6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5E207D70-E283-4E38-AFDB-9C3A701139D6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5E207D70-E283-4E38-AFDB-9C3A701139D6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5E207D70-E283-4E38-AFDB-9C3A701139D6}.Release|Any CPU.Build.0 = Release|Any CPU - {887A5116-5334-470A-A4D5-86B699997C36}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {887A5116-5334-470A-A4D5-86B699997C36}.Debug|Any CPU.Build.0 = Debug|Any CPU - {887A5116-5334-470A-A4D5-86B699997C36}.Release|Any CPU.ActiveCfg = Release|Any CPU - {887A5116-5334-470A-A4D5-86B699997C36}.Release|Any CPU.Build.0 = Release|Any CPU - {B39E0EA3-7503-4D9D-898F-6FD659288D35}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B39E0EA3-7503-4D9D-898F-6FD659288D35}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B39E0EA3-7503-4D9D-898F-6FD659288D35}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B39E0EA3-7503-4D9D-898F-6FD659288D35}.Release|Any CPU.Build.0 = Release|Any CPU - {4ED2B18F-46CC-4547-935E-9F2B6737A58E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4ED2B18F-46CC-4547-935E-9F2B6737A58E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4ED2B18F-46CC-4547-935E-9F2B6737A58E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4ED2B18F-46CC-4547-935E-9F2B6737A58E}.Release|Any CPU.Build.0 = Release|Any CPU - {E9103A77-6F56-4B4E-B8EF-43073F303E30}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E9103A77-6F56-4B4E-B8EF-43073F303E30}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E9103A77-6F56-4B4E-B8EF-43073F303E30}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E9103A77-6F56-4B4E-B8EF-43073F303E30}.Release|Any CPU.Build.0 = Release|Any CPU - {A5D635D5-C1F4-4DB0-B7FE-BB0876CDC395}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A5D635D5-C1F4-4DB0-B7FE-BB0876CDC395}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A5D635D5-C1F4-4DB0-B7FE-BB0876CDC395}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A5D635D5-C1F4-4DB0-B7FE-BB0876CDC395}.Release|Any CPU.Build.0 = Release|Any CPU - {3DAA7B26-ED23-491E-A670-B158F9FB0399}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3DAA7B26-ED23-491E-A670-B158F9FB0399}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3DAA7B26-ED23-491E-A670-B158F9FB0399}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3DAA7B26-ED23-491E-A670-B158F9FB0399}.Release|Any CPU.Build.0 = Release|Any CPU - {F8C08463-6B96-46C5-8B19-AF1008EAF2F5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F8C08463-6B96-46C5-8B19-AF1008EAF2F5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F8C08463-6B96-46C5-8B19-AF1008EAF2F5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F8C08463-6B96-46C5-8B19-AF1008EAF2F5}.Release|Any CPU.Build.0 = Release|Any CPU - {F18C7C21-B44C-4FB7-9404-57D67E4766E1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F18C7C21-B44C-4FB7-9404-57D67E4766E1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F18C7C21-B44C-4FB7-9404-57D67E4766E1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F18C7C21-B44C-4FB7-9404-57D67E4766E1}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {A4D44369-51EE-4CD8-87B2-372BC041627F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A4D44369-51EE-4CD8-87B2-372BC041627F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A4D44369-51EE-4CD8-87B2-372BC041627F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A4D44369-51EE-4CD8-87B2-372BC041627F}.Release|Any CPU.Build.0 = Release|Any CPU - {5E207D70-E283-4E38-AFDB-9C3A701139D6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5E207D70-E283-4E38-AFDB-9C3A701139D6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5E207D70-E283-4E38-AFDB-9C3A701139D6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5E207D70-E283-4E38-AFDB-9C3A701139D6}.Release|Any CPU.Build.0 = Release|Any CPU - {887A5116-5334-470A-A4D5-86B699997C36}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {887A5116-5334-470A-A4D5-86B699997C36}.Debug|Any CPU.Build.0 = Debug|Any CPU - {887A5116-5334-470A-A4D5-86B699997C36}.Release|Any CPU.ActiveCfg = Release|Any CPU - {887A5116-5334-470A-A4D5-86B699997C36}.Release|Any CPU.Build.0 = Release|Any CPU - {B39E0EA3-7503-4D9D-898F-6FD659288D35}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B39E0EA3-7503-4D9D-898F-6FD659288D35}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B39E0EA3-7503-4D9D-898F-6FD659288D35}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B39E0EA3-7503-4D9D-898F-6FD659288D35}.Release|Any CPU.Build.0 = Release|Any CPU - {4ED2B18F-46CC-4547-935E-9F2B6737A58E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4ED2B18F-46CC-4547-935E-9F2B6737A58E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4ED2B18F-46CC-4547-935E-9F2B6737A58E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4ED2B18F-46CC-4547-935E-9F2B6737A58E}.Release|Any CPU.Build.0 = Release|Any CPU - {E9103A77-6F56-4B4E-B8EF-43073F303E30}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E9103A77-6F56-4B4E-B8EF-43073F303E30}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E9103A77-6F56-4B4E-B8EF-43073F303E30}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E9103A77-6F56-4B4E-B8EF-43073F303E30}.Release|Any CPU.Build.0 = Release|Any CPU - {A5D635D5-C1F4-4DB0-B7FE-BB0876CDC395}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A5D635D5-C1F4-4DB0-B7FE-BB0876CDC395}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A5D635D5-C1F4-4DB0-B7FE-BB0876CDC395}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A5D635D5-C1F4-4DB0-B7FE-BB0876CDC395}.Release|Any CPU.Build.0 = Release|Any CPU - {3DAA7B26-ED23-491E-A670-B158F9FB0399}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3DAA7B26-ED23-491E-A670-B158F9FB0399}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3DAA7B26-ED23-491E-A670-B158F9FB0399}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3DAA7B26-ED23-491E-A670-B158F9FB0399}.Release|Any CPU.Build.0 = Release|Any CPU - {F8C08463-6B96-46C5-8B19-AF1008EAF2F5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F8C08463-6B96-46C5-8B19-AF1008EAF2F5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F8C08463-6B96-46C5-8B19-AF1008EAF2F5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F8C08463-6B96-46C5-8B19-AF1008EAF2F5}.Release|Any CPU.Build.0 = Release|Any CPU - {F18C7C21-B44C-4FB7-9404-57D67E4766E1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F18C7C21-B44C-4FB7-9404-57D67E4766E1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F18C7C21-B44C-4FB7-9404-57D67E4766E1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F18C7C21-B44C-4FB7-9404-57D67E4766E1}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -220,37 +136,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {060DE27C-6968-46E7-832E-0C6A8DF1265B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {6EFAB6A1-99C2-4570-9170-A4A9DC5EC3B7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {2FD1CA1C-AAEB-4359-A0D9-4B646A77BDB2} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {58CA7177-0E96-4C51-876D-F108B39FCB39} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {00FC67A5-FFFE-4CFE-8924-95E346804399} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {A4D44369-51EE-4CD8-87B2-372BC041627F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {5E207D70-E283-4E38-AFDB-9C3A701139D6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {887A5116-5334-470A-A4D5-86B699997C36} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B39E0EA3-7503-4D9D-898F-6FD659288D35} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4ED2B18F-46CC-4547-935E-9F2B6737A58E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E9103A77-6F56-4B4E-B8EF-43073F303E30} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A5D635D5-C1F4-4DB0-B7FE-BB0876CDC395} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {3DAA7B26-ED23-491E-A670-B158F9FB0399} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F8C08463-6B96-46C5-8B19-AF1008EAF2F5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F18C7C21-B44C-4FB7-9404-57D67E4766E1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {A4D44369-51EE-4CD8-87B2-372BC041627F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {5E207D70-E283-4E38-AFDB-9C3A701139D6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {887A5116-5334-470A-A4D5-86B699997C36} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B39E0EA3-7503-4D9D-898F-6FD659288D35} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4ED2B18F-46CC-4547-935E-9F2B6737A58E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E9103A77-6F56-4B4E-B8EF-43073F303E30} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A5D635D5-C1F4-4DB0-B7FE-BB0876CDC395} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {3DAA7B26-ED23-491E-A670-B158F9FB0399} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F8C08463-6B96-46C5-8B19-AF1008EAF2F5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F18C7C21-B44C-4FB7-9404-57D67E4766E1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {BB3A9D0A-F527-4D76-BDC9-807B5FF0A437} diff --git a/sdk/src/Services/CloudTrail/Generated/AmazonCloudTrailConfig.cs b/sdk/src/Services/CloudTrail/Generated/AmazonCloudTrailConfig.cs index c3cdd6706c3b..1eaa8271416d 100644 --- a/sdk/src/Services/CloudTrail/Generated/AmazonCloudTrailConfig.cs +++ b/sdk/src/Services/CloudTrail/Generated/AmazonCloudTrailConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.CloudTrail public partial class AmazonCloudTrailConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("CloudTrail", "4.0.0.0"); private static readonly AmazonCloudTrailEndpointResolver EndpointResolver = new AmazonCloudTrailEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("CloudTrail", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("CloudTrail", "3.7.401.3"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/CloudTrail/Generated/Model/GenerateResponseException.cs b/sdk/src/Services/CloudTrail/Generated/Model/GenerateResponseException.cs index d4bbf94d0939..86a17df7b88a 100644 --- a/sdk/src/Services/CloudTrail/Generated/Model/GenerateResponseException.cs +++ b/sdk/src/Services/CloudTrail/Generated/Model/GenerateResponseException.cs @@ -107,11 +107,6 @@ protected GenerateResponseException(System.Runtime.Serialization.SerializationIn /// The that holds the serialized object data about the exception being thrown. /// The that contains contextual information about the source or destination. /// The parameter is a null reference (Nothing in Visual Basic). -#if BCL35 - [System.Security.Permissions.SecurityPermission( - System.Security.Permissions.SecurityAction.LinkDemand, - Flags = System.Security.Permissions.SecurityPermissionFlag.SerializationFormatter)] -#endif [System.Security.SecurityCritical] // These FxCop rules are giving false-positives for this method [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Security", "CA2123:OverrideLinkDemandsShouldBeIdenticalToBase")] diff --git a/sdk/src/Services/CloudTrail/Generated/Model/Internal/MarshallTransformations/GenerateQueryRequestMarshaller.cs b/sdk/src/Services/CloudTrail/Generated/Model/Internal/MarshallTransformations/GenerateQueryRequestMarshaller.cs index 3be0be81e087..01d49aaea0b7 100644 --- a/sdk/src/Services/CloudTrail/Generated/Model/Internal/MarshallTransformations/GenerateQueryRequestMarshaller.cs +++ b/sdk/src/Services/CloudTrail/Generated/Model/Internal/MarshallTransformations/GenerateQueryRequestMarshaller.cs @@ -63,32 +63,35 @@ public IRequest Marshall(GenerateQueryRequest publicRequest) request.HttpMethod = "POST"; request.ResourcePath = "/"; - using (StringWriter stringWriter = new StringWriter(CultureInfo.InvariantCulture)) + using (MemoryStream memoryStream = new MemoryStream()) { - JsonWriter writer = new JsonWriter(stringWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetEventDataStores()) + using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) { - context.Writer.WritePropertyName("EventDataStores"); - context.Writer.WriteArrayStart(); - foreach(var publicRequestEventDataStoresListValue in publicRequest.EventDataStores) + JsonWriter writer = new JsonWriter(streamWriter); + writer.Validate = false; + writer.WriteObjectStart(); + var context = new JsonMarshallerContext(request, writer); + if(publicRequest.IsSetEventDataStores()) { - context.Writer.Write(publicRequestEventDataStoresListValue); + context.Writer.WritePropertyName("EventDataStores"); + context.Writer.WriteArrayStart(); + foreach(var publicRequestEventDataStoresListValue in publicRequest.EventDataStores) + { + context.Writer.Write(publicRequestEventDataStoresListValue); + } + context.Writer.WriteArrayEnd(); } - context.Writer.WriteArrayEnd(); - } - if(publicRequest.IsSetPrompt()) - { - context.Writer.WritePropertyName("Prompt"); - context.Writer.Write(publicRequest.Prompt); + if(publicRequest.IsSetPrompt()) + { + context.Writer.WritePropertyName("Prompt"); + context.Writer.Write(publicRequest.Prompt); + } + + writer.WriteObjectEnd(); } - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); + request.Content = memoryStream.ToArray(); } diff --git a/sdk/src/Services/CloudTrail/Generated/_bcl/AmazonCloudTrailClient.cs b/sdk/src/Services/CloudTrail/Generated/_bcl/AmazonCloudTrailClient.cs index 6b6d2c7aeaa5..870eb8d0049a 100644 --- a/sdk/src/Services/CloudTrail/Generated/_bcl/AmazonCloudTrailClient.cs +++ b/sdk/src/Services/CloudTrail/Generated/_bcl/AmazonCloudTrailClient.cs @@ -2877,6 +2877,155 @@ public virtual EnableFederationResponse EnableFederation(EnableFederationRequest #endregion + #region GenerateQuery + + + /// + /// Generates a query from a natural language prompt. This operation uses generative + /// artificial intelligence (generative AI) to produce a ready-to-use SQL query from the + /// prompt. + /// + /// + /// + /// The prompt can be a question or a statement about the event data in your event data + /// store. For example, you can enter prompts like "What are my top errors in the past + /// month?" and “Give me a list of users that used SNS.” + /// + /// + /// + /// The prompt must be in English. For information about limitations, permissions, and + /// supported Regions, see Create + /// CloudTrail Lake queries from natural language prompts in the CloudTrail + /// user guide. + /// + /// + /// + /// Do not include any personally identifying, confidential, or sensitive information + /// in your prompts. + /// + /// + /// + /// This feature uses generative AI large language models (LLMs); we recommend double-checking + /// the LLM response. + /// + /// + /// + /// Container for the necessary parameters to execute the GenerateQuery service method. + /// + /// The response from the GenerateQuery service method, as returned by CloudTrail. + /// + /// The specified event data store ARN is not valid or does not map to an event data store + /// in your account. + /// + /// + /// The specified event data store was not found. + /// + /// + /// This exception is thrown when a valid query could not be generated for the provided + /// prompt. + /// + /// + /// The event data store is inactive. + /// + /// + /// The request includes a parameter that is not valid. + /// + /// + /// This exception is thrown when the management account does not have a service-linked + /// role. + /// + /// + /// This exception is thrown when the requested operation is not permitted. + /// + /// + /// This exception is thrown when the requested operation is not supported. + /// + /// REST API Reference for GenerateQuery Operation + public virtual GenerateQueryResponse GenerateQuery(GenerateQueryRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = GenerateQueryRequestMarshaller.Instance; + options.ResponseUnmarshaller = GenerateQueryResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// Generates a query from a natural language prompt. This operation uses generative + /// artificial intelligence (generative AI) to produce a ready-to-use SQL query from the + /// prompt. + /// + /// + /// + /// The prompt can be a question or a statement about the event data in your event data + /// store. For example, you can enter prompts like "What are my top errors in the past + /// month?" and “Give me a list of users that used SNS.” + /// + /// + /// + /// The prompt must be in English. For information about limitations, permissions, and + /// supported Regions, see Create + /// CloudTrail Lake queries from natural language prompts in the CloudTrail + /// user guide. + /// + /// + /// + /// Do not include any personally identifying, confidential, or sensitive information + /// in your prompts. + /// + /// + /// + /// This feature uses generative AI large language models (LLMs); we recommend double-checking + /// the LLM response. + /// + /// + /// + /// Container for the necessary parameters to execute the GenerateQuery service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the GenerateQuery service method, as returned by CloudTrail. + /// + /// The specified event data store ARN is not valid or does not map to an event data store + /// in your account. + /// + /// + /// The specified event data store was not found. + /// + /// + /// This exception is thrown when a valid query could not be generated for the provided + /// prompt. + /// + /// + /// The event data store is inactive. + /// + /// + /// The request includes a parameter that is not valid. + /// + /// + /// This exception is thrown when the management account does not have a service-linked + /// role. + /// + /// + /// This exception is thrown when the requested operation is not permitted. + /// + /// + /// This exception is thrown when the requested operation is not supported. + /// + /// REST API Reference for GenerateQuery Operation + public virtual Task GenerateQueryAsync(GenerateQueryRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = GenerateQueryRequestMarshaller.Instance; + options.ResponseUnmarshaller = GenerateQueryResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + #region GetChannel @@ -6294,6 +6443,12 @@ public virtual RegisterOrganizationDelegatedAdminResponse RegisterOrganizationDe /// /// /// + /// + /// This exception is thrown when the specified resource is not ready for an operation. + /// This can occur when you try to run an operation on a resource before CloudTrail has + /// time to fully load the resource, or because another operation is modifying the resource. + /// If this exception occurs, wait a few minutes, and then try the operation again. + /// /// /// The specified event data store ARN is not valid or does not map to an event data store /// in your account. @@ -6404,6 +6559,12 @@ public virtual RemoveTagsResponse RemoveTags(RemoveTagsRequest request) /// /// /// + /// + /// This exception is thrown when the specified resource is not ready for an operation. + /// This can occur when you try to run an operation on a resource before CloudTrail has + /// time to fully load the resource, or because another operation is modifying the resource. + /// If this exception occurs, wait a few minutes, and then try the operation again. + /// /// /// The specified event data store ARN is not valid or does not map to an event data store /// in your account. diff --git a/sdk/src/Services/CloudTrail/Properties/AssemblyInfo.cs b/sdk/src/Services/CloudTrail/Properties/AssemblyInfo.cs index 5cc2f58ac62b..e96e78eae832 100644 --- a/sdk/src/Services/CloudTrail/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/CloudTrail/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.3")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/CloudTrailData/CloudTrailData.sln b/sdk/src/Services/CloudTrailData/CloudTrailData.sln index 51fd4c8d4006..8c76a534724a 100644 --- a/sdk/src/Services/CloudTrailData/CloudTrailData.sln +++ b/sdk/src/Services/CloudTrailData/CloudTrailData.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {29EDA98A-E962-4DA3-B427-D8F913A40B39}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {29EDA98A-E962-4DA3-B427-D8F913A40B39}.Debug|Any CPU.Build.0 = Debug|Any CPU {29EDA98A-E962-4DA3-B427-D8F913A40B39}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {F710D811-F7B9-44B5-B443-DAF6F883B91F}.Debug|Any CPU.Build.0 = Debug|Any CPU {F710D811-F7B9-44B5-B443-DAF6F883B91F}.Release|Any CPU.ActiveCfg = Release|Any CPU {F710D811-F7B9-44B5-B443-DAF6F883B91F}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {D66A4D56-48E9-48E9-B102-33F71B221488}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D66A4D56-48E9-48E9-B102-33F71B221488}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D66A4D56-48E9-48E9-B102-33F71B221488}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D66A4D56-48E9-48E9-B102-33F71B221488}.Release|Any CPU.Build.0 = Release|Any CPU - {D2B9B058-C036-4FBD-9639-AD23EACF11DD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D2B9B058-C036-4FBD-9639-AD23EACF11DD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D2B9B058-C036-4FBD-9639-AD23EACF11DD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D2B9B058-C036-4FBD-9639-AD23EACF11DD}.Release|Any CPU.Build.0 = Release|Any CPU - {C3D0EAC0-B145-4B8B-8367-4A4FA1D1C719}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C3D0EAC0-B145-4B8B-8367-4A4FA1D1C719}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C3D0EAC0-B145-4B8B-8367-4A4FA1D1C719}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C3D0EAC0-B145-4B8B-8367-4A4FA1D1C719}.Release|Any CPU.Build.0 = Release|Any CPU - {6565B25E-B834-4D34-8E4D-3EC7D49FA43D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6565B25E-B834-4D34-8E4D-3EC7D49FA43D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6565B25E-B834-4D34-8E4D-3EC7D49FA43D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6565B25E-B834-4D34-8E4D-3EC7D49FA43D}.Release|Any CPU.Build.0 = Release|Any CPU - {2B41B9C2-1761-4B96-800C-0AEA523DC1B0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2B41B9C2-1761-4B96-800C-0AEA523DC1B0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2B41B9C2-1761-4B96-800C-0AEA523DC1B0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2B41B9C2-1761-4B96-800C-0AEA523DC1B0}.Release|Any CPU.Build.0 = Release|Any CPU - {0337878D-5598-4E67-B124-0D1F869E4873}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0337878D-5598-4E67-B124-0D1F869E4873}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0337878D-5598-4E67-B124-0D1F869E4873}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0337878D-5598-4E67-B124-0D1F869E4873}.Release|Any CPU.Build.0 = Release|Any CPU - {7005D9FF-9C31-497E-8D51-5C76D9C68D33}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7005D9FF-9C31-497E-8D51-5C76D9C68D33}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7005D9FF-9C31-497E-8D51-5C76D9C68D33}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7005D9FF-9C31-497E-8D51-5C76D9C68D33}.Release|Any CPU.Build.0 = Release|Any CPU - {B881EB35-E4DA-4AA8-9F58-7D4F9560DF50}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B881EB35-E4DA-4AA8-9F58-7D4F9560DF50}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B881EB35-E4DA-4AA8-9F58-7D4F9560DF50}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B881EB35-E4DA-4AA8-9F58-7D4F9560DF50}.Release|Any CPU.Build.0 = Release|Any CPU - {70EBA081-9C22-4B08-9816-2ECD29734B20}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {70EBA081-9C22-4B08-9816-2ECD29734B20}.Debug|Any CPU.Build.0 = Debug|Any CPU - {70EBA081-9C22-4B08-9816-2ECD29734B20}.Release|Any CPU.ActiveCfg = Release|Any CPU - {70EBA081-9C22-4B08-9816-2ECD29734B20}.Release|Any CPU.Build.0 = Release|Any CPU - {A178C8BB-4D81-49B4-878A-0B9C5646D852}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A178C8BB-4D81-49B4-878A-0B9C5646D852}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A178C8BB-4D81-49B4-878A-0B9C5646D852}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A178C8BB-4D81-49B4-878A-0B9C5646D852}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {D66A4D56-48E9-48E9-B102-33F71B221488}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D66A4D56-48E9-48E9-B102-33F71B221488}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D66A4D56-48E9-48E9-B102-33F71B221488}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D66A4D56-48E9-48E9-B102-33F71B221488}.Release|Any CPU.Build.0 = Release|Any CPU - {D2B9B058-C036-4FBD-9639-AD23EACF11DD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D2B9B058-C036-4FBD-9639-AD23EACF11DD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D2B9B058-C036-4FBD-9639-AD23EACF11DD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D2B9B058-C036-4FBD-9639-AD23EACF11DD}.Release|Any CPU.Build.0 = Release|Any CPU - {C3D0EAC0-B145-4B8B-8367-4A4FA1D1C719}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C3D0EAC0-B145-4B8B-8367-4A4FA1D1C719}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C3D0EAC0-B145-4B8B-8367-4A4FA1D1C719}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C3D0EAC0-B145-4B8B-8367-4A4FA1D1C719}.Release|Any CPU.Build.0 = Release|Any CPU - {6565B25E-B834-4D34-8E4D-3EC7D49FA43D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6565B25E-B834-4D34-8E4D-3EC7D49FA43D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6565B25E-B834-4D34-8E4D-3EC7D49FA43D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6565B25E-B834-4D34-8E4D-3EC7D49FA43D}.Release|Any CPU.Build.0 = Release|Any CPU - {2B41B9C2-1761-4B96-800C-0AEA523DC1B0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2B41B9C2-1761-4B96-800C-0AEA523DC1B0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2B41B9C2-1761-4B96-800C-0AEA523DC1B0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2B41B9C2-1761-4B96-800C-0AEA523DC1B0}.Release|Any CPU.Build.0 = Release|Any CPU - {0337878D-5598-4E67-B124-0D1F869E4873}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0337878D-5598-4E67-B124-0D1F869E4873}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0337878D-5598-4E67-B124-0D1F869E4873}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0337878D-5598-4E67-B124-0D1F869E4873}.Release|Any CPU.Build.0 = Release|Any CPU - {7005D9FF-9C31-497E-8D51-5C76D9C68D33}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7005D9FF-9C31-497E-8D51-5C76D9C68D33}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7005D9FF-9C31-497E-8D51-5C76D9C68D33}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7005D9FF-9C31-497E-8D51-5C76D9C68D33}.Release|Any CPU.Build.0 = Release|Any CPU - {B881EB35-E4DA-4AA8-9F58-7D4F9560DF50}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B881EB35-E4DA-4AA8-9F58-7D4F9560DF50}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B881EB35-E4DA-4AA8-9F58-7D4F9560DF50}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B881EB35-E4DA-4AA8-9F58-7D4F9560DF50}.Release|Any CPU.Build.0 = Release|Any CPU - {70EBA081-9C22-4B08-9816-2ECD29734B20}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {70EBA081-9C22-4B08-9816-2ECD29734B20}.Debug|Any CPU.Build.0 = Debug|Any CPU - {70EBA081-9C22-4B08-9816-2ECD29734B20}.Release|Any CPU.ActiveCfg = Release|Any CPU - {70EBA081-9C22-4B08-9816-2ECD29734B20}.Release|Any CPU.Build.0 = Release|Any CPU - {A178C8BB-4D81-49B4-878A-0B9C5646D852}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A178C8BB-4D81-49B4-878A-0B9C5646D852}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A178C8BB-4D81-49B4-878A-0B9C5646D852}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A178C8BB-4D81-49B4-878A-0B9C5646D852}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {29EDA98A-E962-4DA3-B427-D8F913A40B39} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {FE5DE0A8-D8D9-4774-8AF0-822576904A24} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {97307E84-9CC1-470C-8325-C492D464F8A9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {C1290463-882A-4135-AE42-DE5A59218879} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {F710D811-F7B9-44B5-B443-DAF6F883B91F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {D66A4D56-48E9-48E9-B102-33F71B221488} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D2B9B058-C036-4FBD-9639-AD23EACF11DD} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C3D0EAC0-B145-4B8B-8367-4A4FA1D1C719} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6565B25E-B834-4D34-8E4D-3EC7D49FA43D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {2B41B9C2-1761-4B96-800C-0AEA523DC1B0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0337878D-5598-4E67-B124-0D1F869E4873} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {7005D9FF-9C31-497E-8D51-5C76D9C68D33} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B881EB35-E4DA-4AA8-9F58-7D4F9560DF50} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {70EBA081-9C22-4B08-9816-2ECD29734B20} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A178C8BB-4D81-49B4-878A-0B9C5646D852} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {D66A4D56-48E9-48E9-B102-33F71B221488} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D2B9B058-C036-4FBD-9639-AD23EACF11DD} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C3D0EAC0-B145-4B8B-8367-4A4FA1D1C719} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6565B25E-B834-4D34-8E4D-3EC7D49FA43D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {2B41B9C2-1761-4B96-800C-0AEA523DC1B0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0337878D-5598-4E67-B124-0D1F869E4873} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {7005D9FF-9C31-497E-8D51-5C76D9C68D33} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B881EB35-E4DA-4AA8-9F58-7D4F9560DF50} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {70EBA081-9C22-4B08-9816-2ECD29734B20} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A178C8BB-4D81-49B4-878A-0B9C5646D852} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {93FF2364-1C6A-4223-AD50-AA5CBF2A4CD8} diff --git a/sdk/src/Services/CloudTrailData/Generated/AmazonCloudTrailDataConfig.cs b/sdk/src/Services/CloudTrailData/Generated/AmazonCloudTrailDataConfig.cs index c5e1f3349c22..4cec5506e4c8 100644 --- a/sdk/src/Services/CloudTrailData/Generated/AmazonCloudTrailDataConfig.cs +++ b/sdk/src/Services/CloudTrailData/Generated/AmazonCloudTrailDataConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.CloudTrailData public partial class AmazonCloudTrailDataConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("CloudTrail Data", "4.0.0.0"); private static readonly AmazonCloudTrailDataEndpointResolver EndpointResolver = new AmazonCloudTrailDataEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("CloudTrail Data", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("CloudTrail Data", "3.7.400.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/CloudTrailData/Properties/AssemblyInfo.cs b/sdk/src/Services/CloudTrailData/Properties/AssemblyInfo.cs index 7072abace6b6..0548a440df2a 100644 --- a/sdk/src/Services/CloudTrailData/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/CloudTrailData/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/CloudWatch/CloudWatch.sln b/sdk/src/Services/CloudWatch/CloudWatch.sln index 1f53e9523610..08cebd8a6bb0 100644 --- a/sdk/src/Services/CloudWatch/CloudWatch.sln +++ b/sdk/src/Services/CloudWatch/CloudWatch.sln @@ -92,7 +92,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {7D01BE5B-6B11-4833-95B8-C27880A0D127}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {7D01BE5B-6B11-4833-95B8-C27880A0D127}.Debug|Any CPU.Build.0 = Debug|Any CPU {7D01BE5B-6B11-4833-95B8-C27880A0D127}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -113,97 +120,6 @@ Global {979AB54D-9ACB-4296-B43E-F63430EE5B17}.Debug|Any CPU.Build.0 = Debug|Any CPU {979AB54D-9ACB-4296-B43E-F63430EE5B17}.Release|Any CPU.ActiveCfg = Release|Any CPU {979AB54D-9ACB-4296-B43E-F63430EE5B17}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {41B2307B-5816-439F-8315-3700DA27C0D8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {41B2307B-5816-439F-8315-3700DA27C0D8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {41B2307B-5816-439F-8315-3700DA27C0D8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {41B2307B-5816-439F-8315-3700DA27C0D8}.Release|Any CPU.Build.0 = Release|Any CPU - {6EA7F605-E6AD-4D39-82D8-C2B8ACECAD76}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6EA7F605-E6AD-4D39-82D8-C2B8ACECAD76}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6EA7F605-E6AD-4D39-82D8-C2B8ACECAD76}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6EA7F605-E6AD-4D39-82D8-C2B8ACECAD76}.Release|Any CPU.Build.0 = Release|Any CPU - {552EDDB6-E946-4245-812C-D48B0353A214}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {552EDDB6-E946-4245-812C-D48B0353A214}.Debug|Any CPU.Build.0 = Debug|Any CPU - {552EDDB6-E946-4245-812C-D48B0353A214}.Release|Any CPU.ActiveCfg = Release|Any CPU - {552EDDB6-E946-4245-812C-D48B0353A214}.Release|Any CPU.Build.0 = Release|Any CPU - {C2F574E4-868E-4BBC-A3EF-D7604239447E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C2F574E4-868E-4BBC-A3EF-D7604239447E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C2F574E4-868E-4BBC-A3EF-D7604239447E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C2F574E4-868E-4BBC-A3EF-D7604239447E}.Release|Any CPU.Build.0 = Release|Any CPU - {F78CA534-2F40-4EC7-B8DA-2DDF4D23D119}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F78CA534-2F40-4EC7-B8DA-2DDF4D23D119}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F78CA534-2F40-4EC7-B8DA-2DDF4D23D119}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F78CA534-2F40-4EC7-B8DA-2DDF4D23D119}.Release|Any CPU.Build.0 = Release|Any CPU - {2887CBC9-E00E-4965-9A83-A2B0E994DCF4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2887CBC9-E00E-4965-9A83-A2B0E994DCF4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2887CBC9-E00E-4965-9A83-A2B0E994DCF4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2887CBC9-E00E-4965-9A83-A2B0E994DCF4}.Release|Any CPU.Build.0 = Release|Any CPU - {D61E4ED3-40F3-4239-94CC-91A08003DD62}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D61E4ED3-40F3-4239-94CC-91A08003DD62}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D61E4ED3-40F3-4239-94CC-91A08003DD62}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D61E4ED3-40F3-4239-94CC-91A08003DD62}.Release|Any CPU.Build.0 = Release|Any CPU - {DACF3BF9-5FC9-462A-87EF-D7657A43AA85}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DACF3BF9-5FC9-462A-87EF-D7657A43AA85}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DACF3BF9-5FC9-462A-87EF-D7657A43AA85}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DACF3BF9-5FC9-462A-87EF-D7657A43AA85}.Release|Any CPU.Build.0 = Release|Any CPU - {BA5D6067-F892-42BB-94C3-3259B863EF04}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BA5D6067-F892-42BB-94C3-3259B863EF04}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BA5D6067-F892-42BB-94C3-3259B863EF04}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BA5D6067-F892-42BB-94C3-3259B863EF04}.Release|Any CPU.Build.0 = Release|Any CPU - {5C60A97C-F2E2-4FA2-B01C-BA404699CB16}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5C60A97C-F2E2-4FA2-B01C-BA404699CB16}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5C60A97C-F2E2-4FA2-B01C-BA404699CB16}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5C60A97C-F2E2-4FA2-B01C-BA404699CB16}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {41B2307B-5816-439F-8315-3700DA27C0D8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {41B2307B-5816-439F-8315-3700DA27C0D8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {41B2307B-5816-439F-8315-3700DA27C0D8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {41B2307B-5816-439F-8315-3700DA27C0D8}.Release|Any CPU.Build.0 = Release|Any CPU - {6EA7F605-E6AD-4D39-82D8-C2B8ACECAD76}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6EA7F605-E6AD-4D39-82D8-C2B8ACECAD76}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6EA7F605-E6AD-4D39-82D8-C2B8ACECAD76}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6EA7F605-E6AD-4D39-82D8-C2B8ACECAD76}.Release|Any CPU.Build.0 = Release|Any CPU - {552EDDB6-E946-4245-812C-D48B0353A214}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {552EDDB6-E946-4245-812C-D48B0353A214}.Debug|Any CPU.Build.0 = Debug|Any CPU - {552EDDB6-E946-4245-812C-D48B0353A214}.Release|Any CPU.ActiveCfg = Release|Any CPU - {552EDDB6-E946-4245-812C-D48B0353A214}.Release|Any CPU.Build.0 = Release|Any CPU - {C2F574E4-868E-4BBC-A3EF-D7604239447E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C2F574E4-868E-4BBC-A3EF-D7604239447E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C2F574E4-868E-4BBC-A3EF-D7604239447E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C2F574E4-868E-4BBC-A3EF-D7604239447E}.Release|Any CPU.Build.0 = Release|Any CPU - {F78CA534-2F40-4EC7-B8DA-2DDF4D23D119}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F78CA534-2F40-4EC7-B8DA-2DDF4D23D119}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F78CA534-2F40-4EC7-B8DA-2DDF4D23D119}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F78CA534-2F40-4EC7-B8DA-2DDF4D23D119}.Release|Any CPU.Build.0 = Release|Any CPU - {2887CBC9-E00E-4965-9A83-A2B0E994DCF4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2887CBC9-E00E-4965-9A83-A2B0E994DCF4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2887CBC9-E00E-4965-9A83-A2B0E994DCF4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2887CBC9-E00E-4965-9A83-A2B0E994DCF4}.Release|Any CPU.Build.0 = Release|Any CPU - {D61E4ED3-40F3-4239-94CC-91A08003DD62}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D61E4ED3-40F3-4239-94CC-91A08003DD62}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D61E4ED3-40F3-4239-94CC-91A08003DD62}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D61E4ED3-40F3-4239-94CC-91A08003DD62}.Release|Any CPU.Build.0 = Release|Any CPU - {DACF3BF9-5FC9-462A-87EF-D7657A43AA85}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DACF3BF9-5FC9-462A-87EF-D7657A43AA85}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DACF3BF9-5FC9-462A-87EF-D7657A43AA85}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DACF3BF9-5FC9-462A-87EF-D7657A43AA85}.Release|Any CPU.Build.0 = Release|Any CPU - {BA5D6067-F892-42BB-94C3-3259B863EF04}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BA5D6067-F892-42BB-94C3-3259B863EF04}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BA5D6067-F892-42BB-94C3-3259B863EF04}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BA5D6067-F892-42BB-94C3-3259B863EF04}.Release|Any CPU.Build.0 = Release|Any CPU - {5C60A97C-F2E2-4FA2-B01C-BA404699CB16}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5C60A97C-F2E2-4FA2-B01C-BA404699CB16}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5C60A97C-F2E2-4FA2-B01C-BA404699CB16}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5C60A97C-F2E2-4FA2-B01C-BA404699CB16}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -220,37 +136,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7D01BE5B-6B11-4833-95B8-C27880A0D127} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {1C3156A2-25F1-4086-B6F2-D2457F59615C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {4C6CAEA1-1360-400B-B385-6A89389F5DB9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {DAFF5C48-2753-43B5-A761-083AD25184C1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {979AB54D-9ACB-4296-B43E-F63430EE5B17} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {41B2307B-5816-439F-8315-3700DA27C0D8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6EA7F605-E6AD-4D39-82D8-C2B8ACECAD76} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {552EDDB6-E946-4245-812C-D48B0353A214} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C2F574E4-868E-4BBC-A3EF-D7604239447E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F78CA534-2F40-4EC7-B8DA-2DDF4D23D119} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {2887CBC9-E00E-4965-9A83-A2B0E994DCF4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D61E4ED3-40F3-4239-94CC-91A08003DD62} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {DACF3BF9-5FC9-462A-87EF-D7657A43AA85} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {BA5D6067-F892-42BB-94C3-3259B863EF04} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {5C60A97C-F2E2-4FA2-B01C-BA404699CB16} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {41B2307B-5816-439F-8315-3700DA27C0D8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6EA7F605-E6AD-4D39-82D8-C2B8ACECAD76} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {552EDDB6-E946-4245-812C-D48B0353A214} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C2F574E4-868E-4BBC-A3EF-D7604239447E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F78CA534-2F40-4EC7-B8DA-2DDF4D23D119} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {2887CBC9-E00E-4965-9A83-A2B0E994DCF4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D61E4ED3-40F3-4239-94CC-91A08003DD62} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {DACF3BF9-5FC9-462A-87EF-D7657A43AA85} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {BA5D6067-F892-42BB-94C3-3259B863EF04} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {5C60A97C-F2E2-4FA2-B01C-BA404699CB16} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {54F71B58-90BD-451A-8848-EFA62F4F0FF4} diff --git a/sdk/src/Services/CloudWatch/Generated/AmazonCloudWatchConfig.cs b/sdk/src/Services/CloudWatch/Generated/AmazonCloudWatchConfig.cs index 76f1c1d83df5..9e9683fc2379 100644 --- a/sdk/src/Services/CloudWatch/Generated/AmazonCloudWatchConfig.cs +++ b/sdk/src/Services/CloudWatch/Generated/AmazonCloudWatchConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.CloudWatch public partial class AmazonCloudWatchConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("CloudWatch", "4.0.0.0"); private static readonly AmazonCloudWatchEndpointResolver EndpointResolver = new AmazonCloudWatchEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("CloudWatch", "3.7.401.24"); -======= - InternalSDKUtils.BuildUserAgentString("CloudWatch", "3.7.402.0"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/PutMetricDataRequestMarshaller.cs b/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/PutMetricDataRequestMarshaller.cs index 64b73acb0259..8d4965dccd62 100644 --- a/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/PutMetricDataRequestMarshaller.cs +++ b/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/PutMetricDataRequestMarshaller.cs @@ -62,124 +62,149 @@ public IRequest Marshall(PutMetricDataRequest publicRequest) { if(publicRequest.IsSetEntityMetricData()) { - int publicRequestlistValueIndex = 1; - foreach(var publicRequestlistValue in publicRequest.EntityMetricData) + if (publicRequest.EntityMetricData.Count == 0) + request.Parameters.Add("EntityMetricData", ""); + else { - if(publicRequestlistValue.IsSetEntity()) - { - if(publicRequestlistValue.Entity.IsSetAttributes()) + int publicRequestlistValueIndex = 1; + foreach(var publicRequestlistValue in publicRequest.EntityMetricData) + { + if(publicRequestlistValue.IsSetEntity()) { - int mapIndex = 1; - foreach(var key in publicRequestlistValue.Entity.Attributes.Keys) + if(publicRequestlistValue.Entity.IsSetAttributes()) { - String value; - bool hasValue = publicRequestlistValue.Entity.Attributes.TryGetValue(key, out value); - request.Parameters.Add("EntityMetricData" + "." + "member" + "." + publicRequestlistValueIndex + "." + "Entity" + "." + "Attributes" + "." + "entry" + "." + mapIndex + "." + "key", StringUtils.FromString(key)); - if (hasValue) + int mapIndex = 1; + foreach(var key in publicRequestlistValue.Entity.Attributes.Keys) { - request.Parameters.Add("EntityMetricData" + "." + "member" + "." + publicRequestlistValueIndex + "." + "Entity" + "." + "Attributes" + "." + "entry" + "." + mapIndex + "." + "value", StringUtils.FromString(value)); + String value; + bool hasValue = publicRequestlistValue.Entity.Attributes.TryGetValue(key, out value); + request.Parameters.Add("EntityMetricData" + "." + "member" + "." + publicRequestlistValueIndex + "." + "Entity" + "." + "Attributes" + "." + "entry" + "." + mapIndex + "." + "key", StringUtils.FromString(key)); + if (hasValue) + { + request.Parameters.Add("EntityMetricData" + "." + "member" + "." + publicRequestlistValueIndex + "." + "Entity" + "." + "Attributes" + "." + "entry" + "." + mapIndex + "." + "value", StringUtils.FromString(value)); + } + mapIndex++; } - mapIndex++; } - } - if(publicRequestlistValue.Entity.IsSetKeyAttributes()) - { - int mapIndex = 1; - foreach(var key in publicRequestlistValue.Entity.KeyAttributes.Keys) + if(publicRequestlistValue.Entity.IsSetKeyAttributes()) { - String value; - bool hasValue = publicRequestlistValue.Entity.KeyAttributes.TryGetValue(key, out value); - request.Parameters.Add("EntityMetricData" + "." + "member" + "." + publicRequestlistValueIndex + "." + "Entity" + "." + "KeyAttributes" + "." + "entry" + "." + mapIndex + "." + "key", StringUtils.FromString(key)); - if (hasValue) + int mapIndex = 1; + foreach(var key in publicRequestlistValue.Entity.KeyAttributes.Keys) { - request.Parameters.Add("EntityMetricData" + "." + "member" + "." + publicRequestlistValueIndex + "." + "Entity" + "." + "KeyAttributes" + "." + "entry" + "." + mapIndex + "." + "value", StringUtils.FromString(value)); + String value; + bool hasValue = publicRequestlistValue.Entity.KeyAttributes.TryGetValue(key, out value); + request.Parameters.Add("EntityMetricData" + "." + "member" + "." + publicRequestlistValueIndex + "." + "Entity" + "." + "KeyAttributes" + "." + "entry" + "." + mapIndex + "." + "key", StringUtils.FromString(key)); + if (hasValue) + { + request.Parameters.Add("EntityMetricData" + "." + "member" + "." + publicRequestlistValueIndex + "." + "Entity" + "." + "KeyAttributes" + "." + "entry" + "." + mapIndex + "." + "value", StringUtils.FromString(value)); + } + mapIndex++; } - mapIndex++; } } - } - if(publicRequestlistValue.IsSetMetricData()) - { - int publicRequestlistValuelistValueIndex = 1; - foreach(var publicRequestlistValuelistValue in publicRequestlistValue.MetricData) + if(publicRequestlistValue.IsSetMetricData()) { - if(publicRequestlistValuelistValue.IsSetCounts()) - { - int publicRequestlistValuelistValuelistValueIndex = 1; - foreach(var publicRequestlistValuelistValuelistValue in publicRequestlistValuelistValue.Counts) - { - request.Parameters.Add("EntityMetricData" + "." + "member" + "." + publicRequestlistValueIndex + "." + "MetricData" + "." + "member" + "." + publicRequestlistValuelistValueIndex + "." + "Counts" + "." + "member" + "." + publicRequestlistValuelistValuelistValueIndex, StringUtils.FromDouble(publicRequestlistValuelistValuelistValue)); - publicRequestlistValuelistValuelistValueIndex++; - } - } - if(publicRequestlistValuelistValue.IsSetDimensions()) + if (publicRequestlistValue.MetricData.Count == 0) + request.Parameters.Add("EntityMetricData" + "." + "member" + "." + publicRequestlistValueIndex + "." + "MetricData", ""); + else { - int publicRequestlistValuelistValuelistValueIndex = 1; - foreach(var publicRequestlistValuelistValuelistValue in publicRequestlistValuelistValue.Dimensions) - { - if(publicRequestlistValuelistValuelistValue.IsSetName()) + int publicRequestlistValuelistValueIndex = 1; + foreach(var publicRequestlistValuelistValue in publicRequestlistValue.MetricData) + { + if(publicRequestlistValuelistValue.IsSetCounts()) { - request.Parameters.Add("EntityMetricData" + "." + "member" + "." + publicRequestlistValueIndex + "." + "MetricData" + "." + "member" + "." + publicRequestlistValuelistValueIndex + "." + "Dimensions" + "." + "member" + "." + publicRequestlistValuelistValuelistValueIndex + "." + "Name", StringUtils.FromString(publicRequestlistValuelistValuelistValue.Name)); + if (publicRequestlistValuelistValue.Counts.Count == 0) + request.Parameters.Add("EntityMetricData" + "." + "member" + "." + publicRequestlistValueIndex + "." + "MetricData" + "." + "member" + "." + publicRequestlistValuelistValueIndex + "." + "Counts", ""); + else + { + int publicRequestlistValuelistValuelistValueIndex = 1; + foreach(var publicRequestlistValuelistValuelistValue in publicRequestlistValuelistValue.Counts) + { + request.Parameters.Add("EntityMetricData" + "." + "member" + "." + publicRequestlistValueIndex + "." + "MetricData" + "." + "member" + "." + publicRequestlistValuelistValueIndex + "." + "Counts" + "." + "member" + "." + publicRequestlistValuelistValuelistValueIndex, StringUtils.FromDouble(publicRequestlistValuelistValuelistValue)); + publicRequestlistValuelistValuelistValueIndex++; + } + } } - if(publicRequestlistValuelistValuelistValue.IsSetValue()) + if(publicRequestlistValuelistValue.IsSetDimensions()) { - request.Parameters.Add("EntityMetricData" + "." + "member" + "." + publicRequestlistValueIndex + "." + "MetricData" + "." + "member" + "." + publicRequestlistValuelistValueIndex + "." + "Dimensions" + "." + "member" + "." + publicRequestlistValuelistValuelistValueIndex + "." + "Value", StringUtils.FromString(publicRequestlistValuelistValuelistValue.Value)); + if (publicRequestlistValuelistValue.Dimensions.Count == 0) + request.Parameters.Add("EntityMetricData" + "." + "member" + "." + publicRequestlistValueIndex + "." + "MetricData" + "." + "member" + "." + publicRequestlistValuelistValueIndex + "." + "Dimensions", ""); + else + { + int publicRequestlistValuelistValuelistValueIndex = 1; + foreach(var publicRequestlistValuelistValuelistValue in publicRequestlistValuelistValue.Dimensions) + { + if(publicRequestlistValuelistValuelistValue.IsSetName()) + { + request.Parameters.Add("EntityMetricData" + "." + "member" + "." + publicRequestlistValueIndex + "." + "MetricData" + "." + "member" + "." + publicRequestlistValuelistValueIndex + "." + "Dimensions" + "." + "member" + "." + publicRequestlistValuelistValuelistValueIndex + "." + "Name", StringUtils.FromString(publicRequestlistValuelistValuelistValue.Name)); + } + if(publicRequestlistValuelistValuelistValue.IsSetValue()) + { + request.Parameters.Add("EntityMetricData" + "." + "member" + "." + publicRequestlistValueIndex + "." + "MetricData" + "." + "member" + "." + publicRequestlistValuelistValueIndex + "." + "Dimensions" + "." + "member" + "." + publicRequestlistValuelistValuelistValueIndex + "." + "Value", StringUtils.FromString(publicRequestlistValuelistValuelistValue.Value)); + } + publicRequestlistValuelistValuelistValueIndex++; + } + } } - publicRequestlistValuelistValuelistValueIndex++; - } - } - if(publicRequestlistValuelistValue.IsSetMetricName()) - { - request.Parameters.Add("EntityMetricData" + "." + "member" + "." + publicRequestlistValueIndex + "." + "MetricData" + "." + "member" + "." + publicRequestlistValuelistValueIndex + "." + "MetricName", StringUtils.FromString(publicRequestlistValuelistValue.MetricName)); - } - if(publicRequestlistValuelistValue.IsSetStatisticValues()) - { - if(publicRequestlistValuelistValue.StatisticValues.IsSetMaximum()) - { - request.Parameters.Add("EntityMetricData" + "." + "member" + "." + publicRequestlistValueIndex + "." + "MetricData" + "." + "member" + "." + publicRequestlistValuelistValueIndex + "." + "StatisticValues" + "." + "Maximum", StringUtils.FromDouble(publicRequestlistValuelistValue.StatisticValues.Maximum)); - } - if(publicRequestlistValuelistValue.StatisticValues.IsSetMinimum()) - { - request.Parameters.Add("EntityMetricData" + "." + "member" + "." + publicRequestlistValueIndex + "." + "MetricData" + "." + "member" + "." + publicRequestlistValuelistValueIndex + "." + "StatisticValues" + "." + "Minimum", StringUtils.FromDouble(publicRequestlistValuelistValue.StatisticValues.Minimum)); - } - if(publicRequestlistValuelistValue.StatisticValues.IsSetSampleCount()) - { - request.Parameters.Add("EntityMetricData" + "." + "member" + "." + publicRequestlistValueIndex + "." + "MetricData" + "." + "member" + "." + publicRequestlistValuelistValueIndex + "." + "StatisticValues" + "." + "SampleCount", StringUtils.FromDouble(publicRequestlistValuelistValue.StatisticValues.SampleCount)); - } - if(publicRequestlistValuelistValue.StatisticValues.IsSetSum()) - { - request.Parameters.Add("EntityMetricData" + "." + "member" + "." + publicRequestlistValueIndex + "." + "MetricData" + "." + "member" + "." + publicRequestlistValuelistValueIndex + "." + "StatisticValues" + "." + "Sum", StringUtils.FromDouble(publicRequestlistValuelistValue.StatisticValues.Sum)); - } - } - if(publicRequestlistValuelistValue.IsSetStorageResolution()) - { - request.Parameters.Add("EntityMetricData" + "." + "member" + "." + publicRequestlistValueIndex + "." + "MetricData" + "." + "member" + "." + publicRequestlistValuelistValueIndex + "." + "StorageResolution", StringUtils.FromInt(publicRequestlistValuelistValue.StorageResolution)); - } - if(publicRequestlistValuelistValue.IsSetTimestampUtc()) - { - request.Parameters.Add("EntityMetricData" + "." + "member" + "." + publicRequestlistValueIndex + "." + "MetricData" + "." + "member" + "." + publicRequestlistValuelistValueIndex + "." + "Timestamp", StringUtils.FromDateTimeToISO8601WithOptionalMs(publicRequestlistValuelistValue.TimestampUtc)); - } - if(publicRequestlistValuelistValue.IsSetUnit()) - { - request.Parameters.Add("EntityMetricData" + "." + "member" + "." + publicRequestlistValueIndex + "." + "MetricData" + "." + "member" + "." + publicRequestlistValuelistValueIndex + "." + "Unit", StringUtils.FromString(publicRequestlistValuelistValue.Unit)); - } - if(publicRequestlistValuelistValue.IsSetValue()) - { - request.Parameters.Add("EntityMetricData" + "." + "member" + "." + publicRequestlistValueIndex + "." + "MetricData" + "." + "member" + "." + publicRequestlistValuelistValueIndex + "." + "Value", StringUtils.FromDouble(publicRequestlistValuelistValue.Value)); - } - if(publicRequestlistValuelistValue.IsSetValues()) - { - int publicRequestlistValuelistValuelistValueIndex = 1; - foreach(var publicRequestlistValuelistValuelistValue in publicRequestlistValuelistValue.Values) - { - request.Parameters.Add("EntityMetricData" + "." + "member" + "." + publicRequestlistValueIndex + "." + "MetricData" + "." + "member" + "." + publicRequestlistValuelistValueIndex + "." + "Values" + "." + "member" + "." + publicRequestlistValuelistValuelistValueIndex, StringUtils.FromDouble(publicRequestlistValuelistValuelistValue)); - publicRequestlistValuelistValuelistValueIndex++; - } + if(publicRequestlistValuelistValue.IsSetMetricName()) + { + request.Parameters.Add("EntityMetricData" + "." + "member" + "." + publicRequestlistValueIndex + "." + "MetricData" + "." + "member" + "." + publicRequestlistValuelistValueIndex + "." + "MetricName", StringUtils.FromString(publicRequestlistValuelistValue.MetricName)); + } + if(publicRequestlistValuelistValue.IsSetStatisticValues()) + { + if(publicRequestlistValuelistValue.StatisticValues.IsSetMaximum()) + { + request.Parameters.Add("EntityMetricData" + "." + "member" + "." + publicRequestlistValueIndex + "." + "MetricData" + "." + "member" + "." + publicRequestlistValuelistValueIndex + "." + "StatisticValues" + "." + "Maximum", StringUtils.FromDouble(publicRequestlistValuelistValue.StatisticValues.Maximum)); + } + if(publicRequestlistValuelistValue.StatisticValues.IsSetMinimum()) + { + request.Parameters.Add("EntityMetricData" + "." + "member" + "." + publicRequestlistValueIndex + "." + "MetricData" + "." + "member" + "." + publicRequestlistValuelistValueIndex + "." + "StatisticValues" + "." + "Minimum", StringUtils.FromDouble(publicRequestlistValuelistValue.StatisticValues.Minimum)); + } + if(publicRequestlistValuelistValue.StatisticValues.IsSetSampleCount()) + { + request.Parameters.Add("EntityMetricData" + "." + "member" + "." + publicRequestlistValueIndex + "." + "MetricData" + "." + "member" + "." + publicRequestlistValuelistValueIndex + "." + "StatisticValues" + "." + "SampleCount", StringUtils.FromDouble(publicRequestlistValuelistValue.StatisticValues.SampleCount)); + } + if(publicRequestlistValuelistValue.StatisticValues.IsSetSum()) + { + request.Parameters.Add("EntityMetricData" + "." + "member" + "." + publicRequestlistValueIndex + "." + "MetricData" + "." + "member" + "." + publicRequestlistValuelistValueIndex + "." + "StatisticValues" + "." + "Sum", StringUtils.FromDouble(publicRequestlistValuelistValue.StatisticValues.Sum)); + } + } + if(publicRequestlistValuelistValue.IsSetStorageResolution()) + { + request.Parameters.Add("EntityMetricData" + "." + "member" + "." + publicRequestlistValueIndex + "." + "MetricData" + "." + "member" + "." + publicRequestlistValuelistValueIndex + "." + "StorageResolution", StringUtils.FromInt(publicRequestlistValuelistValue.StorageResolution)); + } + if(publicRequestlistValuelistValue.IsSetTimestampUtc()) + { + request.Parameters.Add("EntityMetricData" + "." + "member" + "." + publicRequestlistValueIndex + "." + "MetricData" + "." + "member" + "." + publicRequestlistValuelistValueIndex + "." + "Timestamp", StringUtils.FromDateTimeToISO8601WithOptionalMs(publicRequestlistValuelistValue.TimestampUtc)); + } + if(publicRequestlistValuelistValue.IsSetUnit()) + { + request.Parameters.Add("EntityMetricData" + "." + "member" + "." + publicRequestlistValueIndex + "." + "MetricData" + "." + "member" + "." + publicRequestlistValuelistValueIndex + "." + "Unit", StringUtils.FromString(publicRequestlistValuelistValue.Unit)); + } + if(publicRequestlistValuelistValue.IsSetValue()) + { + request.Parameters.Add("EntityMetricData" + "." + "member" + "." + publicRequestlistValueIndex + "." + "MetricData" + "." + "member" + "." + publicRequestlistValuelistValueIndex + "." + "Value", StringUtils.FromDouble(publicRequestlistValuelistValue.Value)); + } + if(publicRequestlistValuelistValue.IsSetValues()) + { + if (publicRequestlistValuelistValue.Values.Count == 0) + request.Parameters.Add("EntityMetricData" + "." + "member" + "." + publicRequestlistValueIndex + "." + "MetricData" + "." + "member" + "." + publicRequestlistValuelistValueIndex + "." + "Values", ""); + else + { + int publicRequestlistValuelistValuelistValueIndex = 1; + foreach(var publicRequestlistValuelistValuelistValue in publicRequestlistValuelistValue.Values) + { + request.Parameters.Add("EntityMetricData" + "." + "member" + "." + publicRequestlistValueIndex + "." + "MetricData" + "." + "member" + "." + publicRequestlistValuelistValueIndex + "." + "Values" + "." + "member" + "." + publicRequestlistValuelistValuelistValueIndex, StringUtils.FromDouble(publicRequestlistValuelistValuelistValue)); + publicRequestlistValuelistValuelistValueIndex++; + } + } + } + publicRequestlistValuelistValueIndex++; + } } - publicRequestlistValuelistValueIndex++; } - } - publicRequestlistValueIndex++; + publicRequestlistValueIndex++; + } } } if(publicRequest.IsSetMetricData()) diff --git a/sdk/src/Services/CloudWatch/Generated/Model/PutMetricDataRequest.cs b/sdk/src/Services/CloudWatch/Generated/Model/PutMetricDataRequest.cs index 0dd8ec2312fe..934797240d88 100644 --- a/sdk/src/Services/CloudWatch/Generated/Model/PutMetricDataRequest.cs +++ b/sdk/src/Services/CloudWatch/Generated/Model/PutMetricDataRequest.cs @@ -248,9 +248,9 @@ internal bool IsSetNamespace() /// This parameter is required when EntityMetricData is included. /// /// - public bool StrictEntityValidation + public bool? StrictEntityValidation { - get { return this._strictEntityValidation.GetValueOrDefault(); } + get { return this._strictEntityValidation; } set { this._strictEntityValidation = value; } } diff --git a/sdk/src/Services/CloudWatch/Generated/_bcl/AmazonCloudWatchClient.cs b/sdk/src/Services/CloudWatch/Generated/_bcl/AmazonCloudWatchClient.cs index 03b4a0fe824e..fb85e7eef16f 100644 --- a/sdk/src/Services/CloudWatch/Generated/_bcl/AmazonCloudWatchClient.cs +++ b/sdk/src/Services/CloudWatch/Generated/_bcl/AmazonCloudWatchClient.cs @@ -3324,25 +3324,34 @@ public virtual PutMetricAlarmResponse PutMetricAlarm(PutMetricAlarmRequest reque /// - /// Publishes metric data points to Amazon CloudWatch. CloudWatch associates the data - /// points with the specified metric. If the specified metric does not exist, CloudWatch - /// creates the metric. When CloudWatch creates a metric, it can take up to fifteen minutes - /// for the metric to appear in calls to ListMetrics. + /// Publishes metric data to Amazon CloudWatch. CloudWatch associates the data with the + /// specified metric. If the specified metric does not exist, CloudWatch creates the metric. + /// When CloudWatch creates a metric, it can take up to fifteen minutes for the metric + /// to appear in calls to ListMetrics. /// /// /// - /// You can publish either individual data points in the Value field, or arrays - /// of values and the number of times each value occurred during the period by using the - /// Values and Counts fields in the MetricData structure. Using the - /// Values and Counts method enables you to publish up to 150 values per - /// metric with one PutMetricData request, and supports retrieving percentile statistics - /// on this data. + /// You can publish metrics with associated entity data (so that related telemetry can + /// be found and viewed together), or publish metric data by itself. To send entity data + /// with your metrics, use the EntityMetricData parameter. To send metrics without + /// entity data, use the MetricData parameter. The EntityMetricData structure + /// includes MetricData structures for the metric data. + /// + /// + /// + /// You can publish either individual values in the Value field, or arrays of values + /// and the number of times each value occurred during the period by using the Values + /// and Counts fields in the MetricData structure. Using the Values + /// and Counts method enables you to publish up to 150 values per metric with one + /// PutMetricData request, and supports retrieving percentile statistics on this + /// data. /// /// /// /// Each PutMetricData request is limited to 1 MB in size for HTTP POST requests. /// You can send a payload compressed by gzip. Each request is also limited to no more - /// than 1000 different metrics. + /// than 1000 different metrics (across both the MetricData and EntityMetricData + /// properties). /// /// /// @@ -3370,7 +3379,7 @@ public virtual PutMetricAlarmResponse PutMetricAlarm(PutMetricAlarmRequest reque /// to become available for GetMetricData /// or GetMetricStatistics /// from the time they are submitted. Data points with time stamps between 3 and 24 hours - /// ago can take as much as 2 hours to become available for for GetMetricData + /// ago can take as much as 2 hours to become available for GetMetricData /// or GetMetricStatistics. /// /// @@ -3418,25 +3427,34 @@ public virtual PutMetricDataResponse PutMetricData(PutMetricDataRequest request) /// - /// Publishes metric data points to Amazon CloudWatch. CloudWatch associates the data - /// points with the specified metric. If the specified metric does not exist, CloudWatch - /// creates the metric. When CloudWatch creates a metric, it can take up to fifteen minutes - /// for the metric to appear in calls to ListMetrics. + /// Publishes metric data to Amazon CloudWatch. CloudWatch associates the data with the + /// specified metric. If the specified metric does not exist, CloudWatch creates the metric. + /// When CloudWatch creates a metric, it can take up to fifteen minutes for the metric + /// to appear in calls to ListMetrics. /// /// /// - /// You can publish either individual data points in the Value field, or arrays - /// of values and the number of times each value occurred during the period by using the - /// Values and Counts fields in the MetricData structure. Using the - /// Values and Counts method enables you to publish up to 150 values per - /// metric with one PutMetricData request, and supports retrieving percentile statistics - /// on this data. + /// You can publish metrics with associated entity data (so that related telemetry can + /// be found and viewed together), or publish metric data by itself. To send entity data + /// with your metrics, use the EntityMetricData parameter. To send metrics without + /// entity data, use the MetricData parameter. The EntityMetricData structure + /// includes MetricData structures for the metric data. + /// + /// + /// + /// You can publish either individual values in the Value field, or arrays of values + /// and the number of times each value occurred during the period by using the Values + /// and Counts fields in the MetricData structure. Using the Values + /// and Counts method enables you to publish up to 150 values per metric with one + /// PutMetricData request, and supports retrieving percentile statistics on this + /// data. /// /// /// /// Each PutMetricData request is limited to 1 MB in size for HTTP POST requests. /// You can send a payload compressed by gzip. Each request is also limited to no more - /// than 1000 different metrics. + /// than 1000 different metrics (across both the MetricData and EntityMetricData + /// properties). /// /// /// @@ -3464,7 +3482,7 @@ public virtual PutMetricDataResponse PutMetricData(PutMetricDataRequest request) /// to become available for GetMetricData /// or GetMetricStatistics /// from the time they are submitted. Data points with time stamps between 3 and 24 hours - /// ago can take as much as 2 hours to become available for for GetMetricData + /// ago can take as much as 2 hours to become available for GetMetricData /// or GetMetricStatistics. /// /// diff --git a/sdk/src/Services/CloudWatch/Properties/AssemblyInfo.cs b/sdk/src/Services/CloudWatch/Properties/AssemblyInfo.cs index b0ed11b4224b..b08a14373440 100644 --- a/sdk/src/Services/CloudWatch/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/CloudWatch/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.24")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.402.0")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/CloudWatchEvents/CloudWatchEvents.sln b/sdk/src/Services/CloudWatchEvents/CloudWatchEvents.sln index ce3743f6de0d..ca96a1d66679 100644 --- a/sdk/src/Services/CloudWatchEvents/CloudWatchEvents.sln +++ b/sdk/src/Services/CloudWatchEvents/CloudWatchEvents.sln @@ -92,7 +92,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {1758FA54-B0A0-47A5-A7DB-4A93EF525CC9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {1758FA54-B0A0-47A5-A7DB-4A93EF525CC9}.Debug|Any CPU.Build.0 = Debug|Any CPU {1758FA54-B0A0-47A5-A7DB-4A93EF525CC9}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -113,97 +120,6 @@ Global {5D47D8D5-9E76-46BB-A334-8F6A3A736FF1}.Debug|Any CPU.Build.0 = Debug|Any CPU {5D47D8D5-9E76-46BB-A334-8F6A3A736FF1}.Release|Any CPU.ActiveCfg = Release|Any CPU {5D47D8D5-9E76-46BB-A334-8F6A3A736FF1}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {46448469-4521-40C6-8B65-E94A5A4CE3F4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {46448469-4521-40C6-8B65-E94A5A4CE3F4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {46448469-4521-40C6-8B65-E94A5A4CE3F4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {46448469-4521-40C6-8B65-E94A5A4CE3F4}.Release|Any CPU.Build.0 = Release|Any CPU - {47C161A1-3D56-4BDF-81DE-725C7A0ACBC0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {47C161A1-3D56-4BDF-81DE-725C7A0ACBC0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {47C161A1-3D56-4BDF-81DE-725C7A0ACBC0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {47C161A1-3D56-4BDF-81DE-725C7A0ACBC0}.Release|Any CPU.Build.0 = Release|Any CPU - {9D4D6CB9-1A13-44AB-9018-5775EFC5EB4F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9D4D6CB9-1A13-44AB-9018-5775EFC5EB4F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9D4D6CB9-1A13-44AB-9018-5775EFC5EB4F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9D4D6CB9-1A13-44AB-9018-5775EFC5EB4F}.Release|Any CPU.Build.0 = Release|Any CPU - {A14754C7-6A7B-4B73-B8EE-AEF35E31D708}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A14754C7-6A7B-4B73-B8EE-AEF35E31D708}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A14754C7-6A7B-4B73-B8EE-AEF35E31D708}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A14754C7-6A7B-4B73-B8EE-AEF35E31D708}.Release|Any CPU.Build.0 = Release|Any CPU - {DFE7ECC3-E63D-4F9E-B9DA-DB3D19E00CDA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DFE7ECC3-E63D-4F9E-B9DA-DB3D19E00CDA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DFE7ECC3-E63D-4F9E-B9DA-DB3D19E00CDA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DFE7ECC3-E63D-4F9E-B9DA-DB3D19E00CDA}.Release|Any CPU.Build.0 = Release|Any CPU - {A699E261-0809-4591-987D-21916EC99A1D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A699E261-0809-4591-987D-21916EC99A1D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A699E261-0809-4591-987D-21916EC99A1D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A699E261-0809-4591-987D-21916EC99A1D}.Release|Any CPU.Build.0 = Release|Any CPU - {B83E3227-94CE-49BC-94BC-E313D24F3699}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B83E3227-94CE-49BC-94BC-E313D24F3699}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B83E3227-94CE-49BC-94BC-E313D24F3699}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B83E3227-94CE-49BC-94BC-E313D24F3699}.Release|Any CPU.Build.0 = Release|Any CPU - {246273E5-5DC1-4A0E-9AC4-925E1F5EEE72}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {246273E5-5DC1-4A0E-9AC4-925E1F5EEE72}.Debug|Any CPU.Build.0 = Debug|Any CPU - {246273E5-5DC1-4A0E-9AC4-925E1F5EEE72}.Release|Any CPU.ActiveCfg = Release|Any CPU - {246273E5-5DC1-4A0E-9AC4-925E1F5EEE72}.Release|Any CPU.Build.0 = Release|Any CPU - {6094A014-19BC-4C72-A78C-8C2A70649E00}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6094A014-19BC-4C72-A78C-8C2A70649E00}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6094A014-19BC-4C72-A78C-8C2A70649E00}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6094A014-19BC-4C72-A78C-8C2A70649E00}.Release|Any CPU.Build.0 = Release|Any CPU - {D1A15FE2-60BF-4B0D-8E1D-6E47D01EF9F2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D1A15FE2-60BF-4B0D-8E1D-6E47D01EF9F2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D1A15FE2-60BF-4B0D-8E1D-6E47D01EF9F2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D1A15FE2-60BF-4B0D-8E1D-6E47D01EF9F2}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {46448469-4521-40C6-8B65-E94A5A4CE3F4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {46448469-4521-40C6-8B65-E94A5A4CE3F4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {46448469-4521-40C6-8B65-E94A5A4CE3F4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {46448469-4521-40C6-8B65-E94A5A4CE3F4}.Release|Any CPU.Build.0 = Release|Any CPU - {47C161A1-3D56-4BDF-81DE-725C7A0ACBC0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {47C161A1-3D56-4BDF-81DE-725C7A0ACBC0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {47C161A1-3D56-4BDF-81DE-725C7A0ACBC0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {47C161A1-3D56-4BDF-81DE-725C7A0ACBC0}.Release|Any CPU.Build.0 = Release|Any CPU - {9D4D6CB9-1A13-44AB-9018-5775EFC5EB4F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9D4D6CB9-1A13-44AB-9018-5775EFC5EB4F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9D4D6CB9-1A13-44AB-9018-5775EFC5EB4F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9D4D6CB9-1A13-44AB-9018-5775EFC5EB4F}.Release|Any CPU.Build.0 = Release|Any CPU - {A14754C7-6A7B-4B73-B8EE-AEF35E31D708}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A14754C7-6A7B-4B73-B8EE-AEF35E31D708}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A14754C7-6A7B-4B73-B8EE-AEF35E31D708}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A14754C7-6A7B-4B73-B8EE-AEF35E31D708}.Release|Any CPU.Build.0 = Release|Any CPU - {DFE7ECC3-E63D-4F9E-B9DA-DB3D19E00CDA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DFE7ECC3-E63D-4F9E-B9DA-DB3D19E00CDA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DFE7ECC3-E63D-4F9E-B9DA-DB3D19E00CDA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DFE7ECC3-E63D-4F9E-B9DA-DB3D19E00CDA}.Release|Any CPU.Build.0 = Release|Any CPU - {A699E261-0809-4591-987D-21916EC99A1D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A699E261-0809-4591-987D-21916EC99A1D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A699E261-0809-4591-987D-21916EC99A1D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A699E261-0809-4591-987D-21916EC99A1D}.Release|Any CPU.Build.0 = Release|Any CPU - {B83E3227-94CE-49BC-94BC-E313D24F3699}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B83E3227-94CE-49BC-94BC-E313D24F3699}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B83E3227-94CE-49BC-94BC-E313D24F3699}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B83E3227-94CE-49BC-94BC-E313D24F3699}.Release|Any CPU.Build.0 = Release|Any CPU - {246273E5-5DC1-4A0E-9AC4-925E1F5EEE72}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {246273E5-5DC1-4A0E-9AC4-925E1F5EEE72}.Debug|Any CPU.Build.0 = Debug|Any CPU - {246273E5-5DC1-4A0E-9AC4-925E1F5EEE72}.Release|Any CPU.ActiveCfg = Release|Any CPU - {246273E5-5DC1-4A0E-9AC4-925E1F5EEE72}.Release|Any CPU.Build.0 = Release|Any CPU - {6094A014-19BC-4C72-A78C-8C2A70649E00}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6094A014-19BC-4C72-A78C-8C2A70649E00}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6094A014-19BC-4C72-A78C-8C2A70649E00}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6094A014-19BC-4C72-A78C-8C2A70649E00}.Release|Any CPU.Build.0 = Release|Any CPU - {D1A15FE2-60BF-4B0D-8E1D-6E47D01EF9F2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D1A15FE2-60BF-4B0D-8E1D-6E47D01EF9F2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D1A15FE2-60BF-4B0D-8E1D-6E47D01EF9F2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D1A15FE2-60BF-4B0D-8E1D-6E47D01EF9F2}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -220,37 +136,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {1758FA54-B0A0-47A5-A7DB-4A93EF525CC9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {DC41FA21-92E0-47EE-8B94-74D99E51DEF7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {E4AE65B2-9345-47A3-84BB-1292FF7607CB} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {AB95F6D9-5D9E-4CB4-A2AA-A9E85FE744B9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {5D47D8D5-9E76-46BB-A334-8F6A3A736FF1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {46448469-4521-40C6-8B65-E94A5A4CE3F4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {47C161A1-3D56-4BDF-81DE-725C7A0ACBC0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {9D4D6CB9-1A13-44AB-9018-5775EFC5EB4F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A14754C7-6A7B-4B73-B8EE-AEF35E31D708} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {DFE7ECC3-E63D-4F9E-B9DA-DB3D19E00CDA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A699E261-0809-4591-987D-21916EC99A1D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B83E3227-94CE-49BC-94BC-E313D24F3699} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {246273E5-5DC1-4A0E-9AC4-925E1F5EEE72} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6094A014-19BC-4C72-A78C-8C2A70649E00} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D1A15FE2-60BF-4B0D-8E1D-6E47D01EF9F2} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {46448469-4521-40C6-8B65-E94A5A4CE3F4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {47C161A1-3D56-4BDF-81DE-725C7A0ACBC0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {9D4D6CB9-1A13-44AB-9018-5775EFC5EB4F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A14754C7-6A7B-4B73-B8EE-AEF35E31D708} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {DFE7ECC3-E63D-4F9E-B9DA-DB3D19E00CDA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A699E261-0809-4591-987D-21916EC99A1D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B83E3227-94CE-49BC-94BC-E313D24F3699} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {246273E5-5DC1-4A0E-9AC4-925E1F5EEE72} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6094A014-19BC-4C72-A78C-8C2A70649E00} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D1A15FE2-60BF-4B0D-8E1D-6E47D01EF9F2} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {8BD85481-4769-49DB-9CFA-433CF3267E23} diff --git a/sdk/src/Services/CloudWatchEvents/Generated/AmazonCloudWatchEventsConfig.cs b/sdk/src/Services/CloudWatchEvents/Generated/AmazonCloudWatchEventsConfig.cs index ad807250db16..1543cd8cb9e0 100644 --- a/sdk/src/Services/CloudWatchEvents/Generated/AmazonCloudWatchEventsConfig.cs +++ b/sdk/src/Services/CloudWatchEvents/Generated/AmazonCloudWatchEventsConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.CloudWatchEvents public partial class AmazonCloudWatchEventsConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("CloudWatch Events", "4.0.0.0"); private static readonly AmazonCloudWatchEventsEndpointResolver EndpointResolver = new AmazonCloudWatchEventsEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("CloudWatch Events", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("CloudWatch Events", "3.7.400.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/CloudWatchEvents/Properties/AssemblyInfo.cs b/sdk/src/Services/CloudWatchEvents/Properties/AssemblyInfo.cs index 03fcec1f4332..8dc3a137fcc7 100644 --- a/sdk/src/Services/CloudWatchEvents/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/CloudWatchEvents/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/CloudWatchEvidently/CloudWatchEvidently.sln b/sdk/src/Services/CloudWatchEvidently/CloudWatchEvidently.sln index 18ea5a2fa5c1..cf6b54d03468 100644 --- a/sdk/src/Services/CloudWatchEvidently/CloudWatchEvidently.sln +++ b/sdk/src/Services/CloudWatchEvidently/CloudWatchEvidently.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {D016E75C-9C05-40FD-914A-55245813FCC7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {D016E75C-9C05-40FD-914A-55245813FCC7}.Debug|Any CPU.Build.0 = Debug|Any CPU {D016E75C-9C05-40FD-914A-55245813FCC7}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {B6415D95-E941-4028-A385-28ABA5F67504}.Debug|Any CPU.Build.0 = Debug|Any CPU {B6415D95-E941-4028-A385-28ABA5F67504}.Release|Any CPU.ActiveCfg = Release|Any CPU {B6415D95-E941-4028-A385-28ABA5F67504}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {2F5ED881-0E08-4ED9-BF65-1E6CFBFD9970}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2F5ED881-0E08-4ED9-BF65-1E6CFBFD9970}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2F5ED881-0E08-4ED9-BF65-1E6CFBFD9970}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2F5ED881-0E08-4ED9-BF65-1E6CFBFD9970}.Release|Any CPU.Build.0 = Release|Any CPU - {F99EE72F-2E64-44C6-852C-5B1374E088BA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F99EE72F-2E64-44C6-852C-5B1374E088BA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F99EE72F-2E64-44C6-852C-5B1374E088BA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F99EE72F-2E64-44C6-852C-5B1374E088BA}.Release|Any CPU.Build.0 = Release|Any CPU - {860BA0F6-F4ED-4900-8F20-6654A811D946}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {860BA0F6-F4ED-4900-8F20-6654A811D946}.Debug|Any CPU.Build.0 = Debug|Any CPU - {860BA0F6-F4ED-4900-8F20-6654A811D946}.Release|Any CPU.ActiveCfg = Release|Any CPU - {860BA0F6-F4ED-4900-8F20-6654A811D946}.Release|Any CPU.Build.0 = Release|Any CPU - {C85034CB-4AAC-4F39-AD3B-CA5AB2D73B41}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C85034CB-4AAC-4F39-AD3B-CA5AB2D73B41}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C85034CB-4AAC-4F39-AD3B-CA5AB2D73B41}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C85034CB-4AAC-4F39-AD3B-CA5AB2D73B41}.Release|Any CPU.Build.0 = Release|Any CPU - {1917C8B8-6679-49E0-93E7-96F398A842C3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1917C8B8-6679-49E0-93E7-96F398A842C3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1917C8B8-6679-49E0-93E7-96F398A842C3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1917C8B8-6679-49E0-93E7-96F398A842C3}.Release|Any CPU.Build.0 = Release|Any CPU - {87A8DF73-31CC-4E0D-8682-21A135B46707}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87A8DF73-31CC-4E0D-8682-21A135B46707}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87A8DF73-31CC-4E0D-8682-21A135B46707}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87A8DF73-31CC-4E0D-8682-21A135B46707}.Release|Any CPU.Build.0 = Release|Any CPU - {3DC3579A-D2C0-43BE-BB89-028DD7BAE24E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3DC3579A-D2C0-43BE-BB89-028DD7BAE24E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3DC3579A-D2C0-43BE-BB89-028DD7BAE24E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3DC3579A-D2C0-43BE-BB89-028DD7BAE24E}.Release|Any CPU.Build.0 = Release|Any CPU - {FFE4E6DB-4CB8-46D5-98EF-A48C4044FECA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FFE4E6DB-4CB8-46D5-98EF-A48C4044FECA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FFE4E6DB-4CB8-46D5-98EF-A48C4044FECA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FFE4E6DB-4CB8-46D5-98EF-A48C4044FECA}.Release|Any CPU.Build.0 = Release|Any CPU - {AC5FCB69-E079-481F-A723-64D55EA76F9A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AC5FCB69-E079-481F-A723-64D55EA76F9A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AC5FCB69-E079-481F-A723-64D55EA76F9A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AC5FCB69-E079-481F-A723-64D55EA76F9A}.Release|Any CPU.Build.0 = Release|Any CPU - {D2DE0799-261B-4524-9D02-B7A4EA2DA733}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D2DE0799-261B-4524-9D02-B7A4EA2DA733}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D2DE0799-261B-4524-9D02-B7A4EA2DA733}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D2DE0799-261B-4524-9D02-B7A4EA2DA733}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {2F5ED881-0E08-4ED9-BF65-1E6CFBFD9970}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2F5ED881-0E08-4ED9-BF65-1E6CFBFD9970}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2F5ED881-0E08-4ED9-BF65-1E6CFBFD9970}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2F5ED881-0E08-4ED9-BF65-1E6CFBFD9970}.Release|Any CPU.Build.0 = Release|Any CPU - {F99EE72F-2E64-44C6-852C-5B1374E088BA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F99EE72F-2E64-44C6-852C-5B1374E088BA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F99EE72F-2E64-44C6-852C-5B1374E088BA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F99EE72F-2E64-44C6-852C-5B1374E088BA}.Release|Any CPU.Build.0 = Release|Any CPU - {860BA0F6-F4ED-4900-8F20-6654A811D946}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {860BA0F6-F4ED-4900-8F20-6654A811D946}.Debug|Any CPU.Build.0 = Debug|Any CPU - {860BA0F6-F4ED-4900-8F20-6654A811D946}.Release|Any CPU.ActiveCfg = Release|Any CPU - {860BA0F6-F4ED-4900-8F20-6654A811D946}.Release|Any CPU.Build.0 = Release|Any CPU - {C85034CB-4AAC-4F39-AD3B-CA5AB2D73B41}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C85034CB-4AAC-4F39-AD3B-CA5AB2D73B41}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C85034CB-4AAC-4F39-AD3B-CA5AB2D73B41}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C85034CB-4AAC-4F39-AD3B-CA5AB2D73B41}.Release|Any CPU.Build.0 = Release|Any CPU - {1917C8B8-6679-49E0-93E7-96F398A842C3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1917C8B8-6679-49E0-93E7-96F398A842C3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1917C8B8-6679-49E0-93E7-96F398A842C3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1917C8B8-6679-49E0-93E7-96F398A842C3}.Release|Any CPU.Build.0 = Release|Any CPU - {87A8DF73-31CC-4E0D-8682-21A135B46707}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87A8DF73-31CC-4E0D-8682-21A135B46707}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87A8DF73-31CC-4E0D-8682-21A135B46707}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87A8DF73-31CC-4E0D-8682-21A135B46707}.Release|Any CPU.Build.0 = Release|Any CPU - {3DC3579A-D2C0-43BE-BB89-028DD7BAE24E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3DC3579A-D2C0-43BE-BB89-028DD7BAE24E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3DC3579A-D2C0-43BE-BB89-028DD7BAE24E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3DC3579A-D2C0-43BE-BB89-028DD7BAE24E}.Release|Any CPU.Build.0 = Release|Any CPU - {FFE4E6DB-4CB8-46D5-98EF-A48C4044FECA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FFE4E6DB-4CB8-46D5-98EF-A48C4044FECA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FFE4E6DB-4CB8-46D5-98EF-A48C4044FECA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FFE4E6DB-4CB8-46D5-98EF-A48C4044FECA}.Release|Any CPU.Build.0 = Release|Any CPU - {AC5FCB69-E079-481F-A723-64D55EA76F9A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AC5FCB69-E079-481F-A723-64D55EA76F9A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AC5FCB69-E079-481F-A723-64D55EA76F9A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AC5FCB69-E079-481F-A723-64D55EA76F9A}.Release|Any CPU.Build.0 = Release|Any CPU - {D2DE0799-261B-4524-9D02-B7A4EA2DA733}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D2DE0799-261B-4524-9D02-B7A4EA2DA733}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D2DE0799-261B-4524-9D02-B7A4EA2DA733}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D2DE0799-261B-4524-9D02-B7A4EA2DA733}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {D016E75C-9C05-40FD-914A-55245813FCC7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {C466CF53-0607-498E-8A27-44915622F731} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {680F38E0-BA9D-43A8-8743-B3E4592C415C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {B3CA9C78-8CEA-4B72-B805-F431F70C8534} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {B6415D95-E941-4028-A385-28ABA5F67504} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {2F5ED881-0E08-4ED9-BF65-1E6CFBFD9970} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F99EE72F-2E64-44C6-852C-5B1374E088BA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {860BA0F6-F4ED-4900-8F20-6654A811D946} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C85034CB-4AAC-4F39-AD3B-CA5AB2D73B41} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {1917C8B8-6679-49E0-93E7-96F398A842C3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {87A8DF73-31CC-4E0D-8682-21A135B46707} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {3DC3579A-D2C0-43BE-BB89-028DD7BAE24E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {FFE4E6DB-4CB8-46D5-98EF-A48C4044FECA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {AC5FCB69-E079-481F-A723-64D55EA76F9A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D2DE0799-261B-4524-9D02-B7A4EA2DA733} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {2F5ED881-0E08-4ED9-BF65-1E6CFBFD9970} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F99EE72F-2E64-44C6-852C-5B1374E088BA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {860BA0F6-F4ED-4900-8F20-6654A811D946} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C85034CB-4AAC-4F39-AD3B-CA5AB2D73B41} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {1917C8B8-6679-49E0-93E7-96F398A842C3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {87A8DF73-31CC-4E0D-8682-21A135B46707} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {3DC3579A-D2C0-43BE-BB89-028DD7BAE24E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {FFE4E6DB-4CB8-46D5-98EF-A48C4044FECA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {AC5FCB69-E079-481F-A723-64D55EA76F9A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D2DE0799-261B-4524-9D02-B7A4EA2DA733} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {7BE1C831-D295-40E8-AFF7-62473F5E4282} diff --git a/sdk/src/Services/CloudWatchEvidently/Generated/AmazonCloudWatchEvidentlyConfig.cs b/sdk/src/Services/CloudWatchEvidently/Generated/AmazonCloudWatchEvidentlyConfig.cs index 72321511d788..4d683cdda27d 100644 --- a/sdk/src/Services/CloudWatchEvidently/Generated/AmazonCloudWatchEvidentlyConfig.cs +++ b/sdk/src/Services/CloudWatchEvidently/Generated/AmazonCloudWatchEvidentlyConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.CloudWatchEvidently public partial class AmazonCloudWatchEvidentlyConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("Evidently", "4.0.0.0"); private static readonly AmazonCloudWatchEvidentlyEndpointResolver EndpointResolver = new AmazonCloudWatchEvidentlyEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("Evidently", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("Evidently", "3.7.400.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/CloudWatchEvidently/Properties/AssemblyInfo.cs b/sdk/src/Services/CloudWatchEvidently/Properties/AssemblyInfo.cs index 712676ae2cad..dfa957379a96 100644 --- a/sdk/src/Services/CloudWatchEvidently/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/CloudWatchEvidently/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/CloudWatchLogs/CloudWatchLogs.sln b/sdk/src/Services/CloudWatchLogs/CloudWatchLogs.sln index 7bcc326bd51d..98ab13e5a58f 100644 --- a/sdk/src/Services/CloudWatchLogs/CloudWatchLogs.sln +++ b/sdk/src/Services/CloudWatchLogs/CloudWatchLogs.sln @@ -92,7 +92,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {C6BA117F-799A-41E5-BFB1-B074309DB35A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {C6BA117F-799A-41E5-BFB1-B074309DB35A}.Debug|Any CPU.Build.0 = Debug|Any CPU {C6BA117F-799A-41E5-BFB1-B074309DB35A}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -113,97 +120,6 @@ Global {3A6CF028-F554-4501-8409-1F7B831BFA11}.Debug|Any CPU.Build.0 = Debug|Any CPU {3A6CF028-F554-4501-8409-1F7B831BFA11}.Release|Any CPU.ActiveCfg = Release|Any CPU {3A6CF028-F554-4501-8409-1F7B831BFA11}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {131921B7-4795-45B2-9374-5E8C906744B8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {131921B7-4795-45B2-9374-5E8C906744B8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {131921B7-4795-45B2-9374-5E8C906744B8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {131921B7-4795-45B2-9374-5E8C906744B8}.Release|Any CPU.Build.0 = Release|Any CPU - {DB1ED976-89D5-4D16-BCD8-7C69442BD8FD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DB1ED976-89D5-4D16-BCD8-7C69442BD8FD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DB1ED976-89D5-4D16-BCD8-7C69442BD8FD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DB1ED976-89D5-4D16-BCD8-7C69442BD8FD}.Release|Any CPU.Build.0 = Release|Any CPU - {78E9BCB8-437B-4586-BE6F-691D59A44723}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {78E9BCB8-437B-4586-BE6F-691D59A44723}.Debug|Any CPU.Build.0 = Debug|Any CPU - {78E9BCB8-437B-4586-BE6F-691D59A44723}.Release|Any CPU.ActiveCfg = Release|Any CPU - {78E9BCB8-437B-4586-BE6F-691D59A44723}.Release|Any CPU.Build.0 = Release|Any CPU - {15CE9EAB-0ADF-489E-9BD2-F8EBC4648513}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {15CE9EAB-0ADF-489E-9BD2-F8EBC4648513}.Debug|Any CPU.Build.0 = Debug|Any CPU - {15CE9EAB-0ADF-489E-9BD2-F8EBC4648513}.Release|Any CPU.ActiveCfg = Release|Any CPU - {15CE9EAB-0ADF-489E-9BD2-F8EBC4648513}.Release|Any CPU.Build.0 = Release|Any CPU - {FC77DC20-A226-4D93-9715-1D1DBA6571C5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FC77DC20-A226-4D93-9715-1D1DBA6571C5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FC77DC20-A226-4D93-9715-1D1DBA6571C5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FC77DC20-A226-4D93-9715-1D1DBA6571C5}.Release|Any CPU.Build.0 = Release|Any CPU - {2A29EAE0-2DEE-4B20-BE2F-B1D2568609B6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2A29EAE0-2DEE-4B20-BE2F-B1D2568609B6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2A29EAE0-2DEE-4B20-BE2F-B1D2568609B6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2A29EAE0-2DEE-4B20-BE2F-B1D2568609B6}.Release|Any CPU.Build.0 = Release|Any CPU - {A40D7DC1-99F2-40BE-90DF-B5C92D28F71F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A40D7DC1-99F2-40BE-90DF-B5C92D28F71F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A40D7DC1-99F2-40BE-90DF-B5C92D28F71F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A40D7DC1-99F2-40BE-90DF-B5C92D28F71F}.Release|Any CPU.Build.0 = Release|Any CPU - {7FDCD81D-0415-4BB2-A8CA-9FF0BB668577}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7FDCD81D-0415-4BB2-A8CA-9FF0BB668577}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7FDCD81D-0415-4BB2-A8CA-9FF0BB668577}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7FDCD81D-0415-4BB2-A8CA-9FF0BB668577}.Release|Any CPU.Build.0 = Release|Any CPU - {EE2BB082-95C8-47F8-953F-7470A9039A4C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EE2BB082-95C8-47F8-953F-7470A9039A4C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EE2BB082-95C8-47F8-953F-7470A9039A4C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EE2BB082-95C8-47F8-953F-7470A9039A4C}.Release|Any CPU.Build.0 = Release|Any CPU - {B503214E-83C5-4FBA-B6FB-187B6374BD59}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B503214E-83C5-4FBA-B6FB-187B6374BD59}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B503214E-83C5-4FBA-B6FB-187B6374BD59}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B503214E-83C5-4FBA-B6FB-187B6374BD59}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {131921B7-4795-45B2-9374-5E8C906744B8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {131921B7-4795-45B2-9374-5E8C906744B8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {131921B7-4795-45B2-9374-5E8C906744B8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {131921B7-4795-45B2-9374-5E8C906744B8}.Release|Any CPU.Build.0 = Release|Any CPU - {DB1ED976-89D5-4D16-BCD8-7C69442BD8FD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DB1ED976-89D5-4D16-BCD8-7C69442BD8FD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DB1ED976-89D5-4D16-BCD8-7C69442BD8FD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DB1ED976-89D5-4D16-BCD8-7C69442BD8FD}.Release|Any CPU.Build.0 = Release|Any CPU - {78E9BCB8-437B-4586-BE6F-691D59A44723}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {78E9BCB8-437B-4586-BE6F-691D59A44723}.Debug|Any CPU.Build.0 = Debug|Any CPU - {78E9BCB8-437B-4586-BE6F-691D59A44723}.Release|Any CPU.ActiveCfg = Release|Any CPU - {78E9BCB8-437B-4586-BE6F-691D59A44723}.Release|Any CPU.Build.0 = Release|Any CPU - {15CE9EAB-0ADF-489E-9BD2-F8EBC4648513}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {15CE9EAB-0ADF-489E-9BD2-F8EBC4648513}.Debug|Any CPU.Build.0 = Debug|Any CPU - {15CE9EAB-0ADF-489E-9BD2-F8EBC4648513}.Release|Any CPU.ActiveCfg = Release|Any CPU - {15CE9EAB-0ADF-489E-9BD2-F8EBC4648513}.Release|Any CPU.Build.0 = Release|Any CPU - {FC77DC20-A226-4D93-9715-1D1DBA6571C5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FC77DC20-A226-4D93-9715-1D1DBA6571C5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FC77DC20-A226-4D93-9715-1D1DBA6571C5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FC77DC20-A226-4D93-9715-1D1DBA6571C5}.Release|Any CPU.Build.0 = Release|Any CPU - {2A29EAE0-2DEE-4B20-BE2F-B1D2568609B6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2A29EAE0-2DEE-4B20-BE2F-B1D2568609B6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2A29EAE0-2DEE-4B20-BE2F-B1D2568609B6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2A29EAE0-2DEE-4B20-BE2F-B1D2568609B6}.Release|Any CPU.Build.0 = Release|Any CPU - {A40D7DC1-99F2-40BE-90DF-B5C92D28F71F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A40D7DC1-99F2-40BE-90DF-B5C92D28F71F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A40D7DC1-99F2-40BE-90DF-B5C92D28F71F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A40D7DC1-99F2-40BE-90DF-B5C92D28F71F}.Release|Any CPU.Build.0 = Release|Any CPU - {7FDCD81D-0415-4BB2-A8CA-9FF0BB668577}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7FDCD81D-0415-4BB2-A8CA-9FF0BB668577}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7FDCD81D-0415-4BB2-A8CA-9FF0BB668577}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7FDCD81D-0415-4BB2-A8CA-9FF0BB668577}.Release|Any CPU.Build.0 = Release|Any CPU - {EE2BB082-95C8-47F8-953F-7470A9039A4C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EE2BB082-95C8-47F8-953F-7470A9039A4C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EE2BB082-95C8-47F8-953F-7470A9039A4C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EE2BB082-95C8-47F8-953F-7470A9039A4C}.Release|Any CPU.Build.0 = Release|Any CPU - {B503214E-83C5-4FBA-B6FB-187B6374BD59}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B503214E-83C5-4FBA-B6FB-187B6374BD59}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B503214E-83C5-4FBA-B6FB-187B6374BD59}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B503214E-83C5-4FBA-B6FB-187B6374BD59}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -220,37 +136,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {C6BA117F-799A-41E5-BFB1-B074309DB35A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {5971017E-4CBA-43C8-B54D-F03B24599448} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {23CF93CB-B9B3-4D39-B2E1-CFB6F30470FE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {5C57DE4C-796E-444F-A219-135D6102D032} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {3A6CF028-F554-4501-8409-1F7B831BFA11} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {131921B7-4795-45B2-9374-5E8C906744B8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {DB1ED976-89D5-4D16-BCD8-7C69442BD8FD} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {78E9BCB8-437B-4586-BE6F-691D59A44723} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {15CE9EAB-0ADF-489E-9BD2-F8EBC4648513} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {FC77DC20-A226-4D93-9715-1D1DBA6571C5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {2A29EAE0-2DEE-4B20-BE2F-B1D2568609B6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A40D7DC1-99F2-40BE-90DF-B5C92D28F71F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {7FDCD81D-0415-4BB2-A8CA-9FF0BB668577} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {EE2BB082-95C8-47F8-953F-7470A9039A4C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B503214E-83C5-4FBA-B6FB-187B6374BD59} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {131921B7-4795-45B2-9374-5E8C906744B8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {DB1ED976-89D5-4D16-BCD8-7C69442BD8FD} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {78E9BCB8-437B-4586-BE6F-691D59A44723} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {15CE9EAB-0ADF-489E-9BD2-F8EBC4648513} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {FC77DC20-A226-4D93-9715-1D1DBA6571C5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {2A29EAE0-2DEE-4B20-BE2F-B1D2568609B6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A40D7DC1-99F2-40BE-90DF-B5C92D28F71F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {7FDCD81D-0415-4BB2-A8CA-9FF0BB668577} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {EE2BB082-95C8-47F8-953F-7470A9039A4C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B503214E-83C5-4FBA-B6FB-187B6374BD59} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {2FFE86E6-5396-4BCE-9469-B9754D64E68B} diff --git a/sdk/src/Services/CloudWatchLogs/Generated/AmazonCloudWatchLogsConfig.cs b/sdk/src/Services/CloudWatchLogs/Generated/AmazonCloudWatchLogsConfig.cs index 1ca21c4ed398..ee9965996d13 100644 --- a/sdk/src/Services/CloudWatchLogs/Generated/AmazonCloudWatchLogsConfig.cs +++ b/sdk/src/Services/CloudWatchLogs/Generated/AmazonCloudWatchLogsConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.CloudWatchLogs public partial class AmazonCloudWatchLogsConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("CloudWatch Logs", "4.0.0.0"); private static readonly AmazonCloudWatchLogsEndpointResolver EndpointResolver = new AmazonCloudWatchLogsEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("CloudWatch Logs", "3.7.403.12"); -======= - InternalSDKUtils.BuildUserAgentString("CloudWatch Logs", "3.7.406.8"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/CloudWatchLogs/Generated/Model/Internal/MarshallTransformations/UpdateAnomalyRequestMarshaller.cs b/sdk/src/Services/CloudWatchLogs/Generated/Model/Internal/MarshallTransformations/UpdateAnomalyRequestMarshaller.cs index bc7d79236b0d..0f4210a99e34 100644 --- a/sdk/src/Services/CloudWatchLogs/Generated/Model/Internal/MarshallTransformations/UpdateAnomalyRequestMarshaller.cs +++ b/sdk/src/Services/CloudWatchLogs/Generated/Model/Internal/MarshallTransformations/UpdateAnomalyRequestMarshaller.cs @@ -83,6 +83,12 @@ public IRequest Marshall(UpdateAnomalyRequest publicRequest) context.Writer.Write(publicRequest.AnomalyId); } + if(publicRequest.IsSetBaseline()) + { + context.Writer.WritePropertyName("baseline"); + context.Writer.Write(publicRequest.Baseline.Value); + } + if(publicRequest.IsSetPatternId()) { context.Writer.WritePropertyName("patternId"); @@ -109,81 +115,7 @@ public IRequest Marshall(UpdateAnomalyRequest publicRequest) writer.WriteObjectEnd(); } -<<<<<<< HEAD request.Content = memoryStream.ToArray(); -||||||| Commit version number update changes - if(publicRequest.IsSetAnomalyId()) - { - context.Writer.WritePropertyName("anomalyId"); - context.Writer.Write(publicRequest.AnomalyId); - } - - if(publicRequest.IsSetPatternId()) - { - context.Writer.WritePropertyName("patternId"); - context.Writer.Write(publicRequest.PatternId); - } - - if(publicRequest.IsSetSuppressionPeriod()) - { - context.Writer.WritePropertyName("suppressionPeriod"); - context.Writer.WriteObjectStart(); - - var marshaller = SuppressionPeriodMarshaller.Instance; - marshaller.Marshall(publicRequest.SuppressionPeriod, context); - - context.Writer.WriteObjectEnd(); - } - - if(publicRequest.IsSetSuppressionType()) - { - context.Writer.WritePropertyName("suppressionType"); - context.Writer.Write(publicRequest.SuppressionType); - } - - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); -======= - if(publicRequest.IsSetAnomalyId()) - { - context.Writer.WritePropertyName("anomalyId"); - context.Writer.Write(publicRequest.AnomalyId); - } - - if(publicRequest.IsSetBaseline()) - { - context.Writer.WritePropertyName("baseline"); - context.Writer.Write(publicRequest.Baseline); - } - - if(publicRequest.IsSetPatternId()) - { - context.Writer.WritePropertyName("patternId"); - context.Writer.Write(publicRequest.PatternId); - } - - if(publicRequest.IsSetSuppressionPeriod()) - { - context.Writer.WritePropertyName("suppressionPeriod"); - context.Writer.WriteObjectStart(); - - var marshaller = SuppressionPeriodMarshaller.Instance; - marshaller.Marshall(publicRequest.SuppressionPeriod, context); - - context.Writer.WriteObjectEnd(); - } - - if(publicRequest.IsSetSuppressionType()) - { - context.Writer.WritePropertyName("suppressionType"); - context.Writer.Write(publicRequest.SuppressionType); - } - - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b } diff --git a/sdk/src/Services/CloudWatchLogs/Generated/Model/UpdateAnomalyRequest.cs b/sdk/src/Services/CloudWatchLogs/Generated/Model/UpdateAnomalyRequest.cs index dc2ec5717cc5..eba59b284141 100644 --- a/sdk/src/Services/CloudWatchLogs/Generated/Model/UpdateAnomalyRequest.cs +++ b/sdk/src/Services/CloudWatchLogs/Generated/Model/UpdateAnomalyRequest.cs @@ -111,9 +111,9 @@ internal bool IsSetAnomalyId() /// The default is false /// /// - public bool Baseline + public bool? Baseline { - get { return this._baseline.GetValueOrDefault(); } + get { return this._baseline; } set { this._baseline = value; } } diff --git a/sdk/src/Services/CloudWatchLogs/Generated/_bcl/AmazonCloudWatchLogsClient.cs b/sdk/src/Services/CloudWatchLogs/Generated/_bcl/AmazonCloudWatchLogsClient.cs index ed1a85994122..28c5074401f5 100644 --- a/sdk/src/Services/CloudWatchLogs/Generated/_bcl/AmazonCloudWatchLogsClient.cs +++ b/sdk/src/Services/CloudWatchLogs/Generated/_bcl/AmazonCloudWatchLogsClient.cs @@ -631,7 +631,7 @@ public virtual CancelExportTaskResponse CancelExportTask(CancelExportTaskRequest /// /// /// - /// You can't update an existing delivery. You can only create and delete deliveries. + /// To update an existing delivery configuration, use UpdateDeliveryConfiguration. /// /// /// Container for the necessary parameters to execute the CreateDelivery service method. @@ -719,7 +719,7 @@ public virtual CreateDeliveryResponse CreateDelivery(CreateDeliveryRequest reque /// /// /// - /// You can't update an existing delivery. You can only create and delete deliveries. + /// To update an existing delivery configuration, use UpdateDeliveryConfiguration. /// /// /// Container for the necessary parameters to execute the CreateDelivery service method. @@ -2958,7 +2958,7 @@ public virtual DescribeExportTasksResponse DescribeExportTasks(DescribeExportTas /// /// /// - /// CloudWatch Logs doesn’t support IAM policies that control access to the DescribeLogGroups + /// CloudWatch Logs doesn't support IAM policies that control access to the DescribeLogGroups /// action by using the aws:ResourceTag/key-name condition key. Other CloudWatch /// Logs actions do support the use of the aws:ResourceTag/key-name condition /// key to control access. For more information about using tags to control access, see @@ -2994,7 +2994,7 @@ public virtual DescribeLogGroupsResponse DescribeLogGroups() /// /// /// - /// CloudWatch Logs doesn’t support IAM policies that control access to the DescribeLogGroups + /// CloudWatch Logs doesn't support IAM policies that control access to the DescribeLogGroups /// action by using the aws:ResourceTag/key-name condition key. Other CloudWatch /// Logs actions do support the use of the aws:ResourceTag/key-name condition /// key to control access. For more information about using tags to control access, see @@ -3035,7 +3035,7 @@ public virtual DescribeLogGroupsResponse DescribeLogGroups(DescribeLogGroupsRequ /// /// /// - /// CloudWatch Logs doesn’t support IAM policies that control access to the DescribeLogGroups + /// CloudWatch Logs doesn't support IAM policies that control access to the DescribeLogGroups /// action by using the aws:ResourceTag/key-name condition key. Other CloudWatch /// Logs actions do support the use of the aws:ResourceTag/key-name condition /// key to control access. For more information about using tags to control access, see @@ -3073,7 +3073,7 @@ public virtual DescribeLogGroupsResponse DescribeLogGroups(DescribeLogGroupsRequ /// /// /// - /// CloudWatch Logs doesn’t support IAM policies that control access to the DescribeLogGroups + /// CloudWatch Logs doesn't support IAM policies that control access to the DescribeLogGroups /// action by using the aws:ResourceTag/key-name condition key. Other CloudWatch /// Logs actions do support the use of the aws:ResourceTag/key-name condition /// key to control access. For more information about using tags to control access, see @@ -6514,14 +6514,14 @@ public virtual PutResourcePolicyResponse PutResourcePolicy(PutResourcePolicyRequ /// /// /// - /// CloudWatch Logs doesn’t immediately delete log events when they reach their retention + /// CloudWatch Logs doesn't immediately delete log events when they reach their retention /// setting. It typically takes up to 72 hours after that before log events are deleted, /// but in rare situations might take longer. /// /// /// /// To illustrate, imagine that you change a log group to have a longer retention setting - /// when it contains log events that are past the expiration date, but haven’t been deleted. + /// when it contains log events that are past the expiration date, but haven't been deleted. /// Those log events will take up to 72 hours to be deleted after the new retention date /// is reached. To make sure that log data is deleted permanently, keep a log group at /// its lower retention setting until 72 hours after the previous retention period ends. @@ -6570,14 +6570,14 @@ public virtual PutRetentionPolicyResponse PutRetentionPolicy(PutRetentionPolicyR /// /// /// - /// CloudWatch Logs doesn’t immediately delete log events when they reach their retention + /// CloudWatch Logs doesn't immediately delete log events when they reach their retention /// setting. It typically takes up to 72 hours after that before log events are deleted, /// but in rare situations might take longer. /// /// /// /// To illustrate, imagine that you change a log group to have a longer retention setting - /// when it contains log events that are past the expiration date, but haven’t been deleted. + /// when it contains log events that are past the expiration date, but haven't been deleted. /// Those log events will take up to 72 hours to be deleted after the new retention date /// is reached. To make sure that log data is deleted permanently, keep a log group at /// its lower retention setting until 72 hours after the previous retention period ends. @@ -7244,7 +7244,7 @@ public virtual StopQueryResponse StopQuery(StopQueryRequest request) /// /// /// - /// CloudWatch Logs doesn’t support IAM policies that prevent users from assigning specified + /// CloudWatch Logs doesn't support IAM policies that prevent users from assigning specified /// tags to log groups using the aws:Resource/key-name or aws:TagKeys /// condition keys. For more information about using tags to control access, see Controlling /// access to Amazon Web Services resources using tags. @@ -7294,7 +7294,7 @@ public virtual TagLogGroupResponse TagLogGroup(TagLogGroupRequest request) /// /// /// - /// CloudWatch Logs doesn’t support IAM policies that prevent users from assigning specified + /// CloudWatch Logs doesn't support IAM policies that prevent users from assigning specified /// tags to log groups using the aws:Resource/key-name or aws:TagKeys /// condition keys. For more information about using tags to control access, see Controlling /// access to Amazon Web Services resources using tags. @@ -7518,7 +7518,7 @@ public virtual TestMetricFilterResponse TestMetricFilter(TestMetricFilterRequest /// /// /// - /// CloudWatch Logs doesn’t support IAM policies that prevent users from assigning specified + /// CloudWatch Logs doesn't support IAM policies that prevent users from assigning specified /// tags to log groups using the aws:Resource/key-name or aws:TagKeys /// condition keys. /// @@ -7559,7 +7559,7 @@ public virtual UntagLogGroupResponse UntagLogGroup(UntagLogGroupRequest request) /// /// /// - /// CloudWatch Logs doesn’t support IAM policies that prevent users from assigning specified + /// CloudWatch Logs doesn't support IAM policies that prevent users from assigning specified /// tags to log groups using the aws:Resource/key-name or aws:TagKeys /// condition keys. /// @@ -7650,9 +7650,9 @@ public virtual UntagResourceResponse UntagResource(UntagResourceRequest request) /// /// Use this operation to suppress anomaly detection for a specified anomaly or - /// pattern. If you suppress an anomaly, CloudWatch Logs won’t report new occurrences + /// pattern. If you suppress an anomaly, CloudWatch Logs won't report new occurrences /// of that anomaly and won't update that anomaly with new data. If you suppress a pattern, - /// CloudWatch Logs won’t report any anomalies related to that pattern. + /// CloudWatch Logs won't report any anomalies related to that pattern. /// /// /// @@ -7695,9 +7695,9 @@ public virtual UpdateAnomalyResponse UpdateAnomaly(UpdateAnomalyRequest request) /// /// Use this operation to suppress anomaly detection for a specified anomaly or - /// pattern. If you suppress an anomaly, CloudWatch Logs won’t report new occurrences + /// pattern. If you suppress an anomaly, CloudWatch Logs won't report new occurrences /// of that anomaly and won't update that anomaly with new data. If you suppress a pattern, - /// CloudWatch Logs won’t report any anomalies related to that pattern. + /// CloudWatch Logs won't report any anomalies related to that pattern. /// /// /// diff --git a/sdk/src/Services/CloudWatchLogs/Properties/AssemblyInfo.cs b/sdk/src/Services/CloudWatchLogs/Properties/AssemblyInfo.cs index 05512531c95d..b693ebc82b35 100644 --- a/sdk/src/Services/CloudWatchLogs/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/CloudWatchLogs/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.403.12")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.406.8")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/CloudWatchRUM/CloudWatchRUM.sln b/sdk/src/Services/CloudWatchRUM/CloudWatchRUM.sln index 09026e231ec0..233df0dc1b4d 100644 --- a/sdk/src/Services/CloudWatchRUM/CloudWatchRUM.sln +++ b/sdk/src/Services/CloudWatchRUM/CloudWatchRUM.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {82B31FCC-3F36-4228-B0F1-06A5423C575D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {82B31FCC-3F36-4228-B0F1-06A5423C575D}.Debug|Any CPU.Build.0 = Debug|Any CPU {82B31FCC-3F36-4228-B0F1-06A5423C575D}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {2802DA76-ECFE-441E-8938-91FD93FDA1FA}.Debug|Any CPU.Build.0 = Debug|Any CPU {2802DA76-ECFE-441E-8938-91FD93FDA1FA}.Release|Any CPU.ActiveCfg = Release|Any CPU {2802DA76-ECFE-441E-8938-91FD93FDA1FA}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {2BF142D9-302B-4E27-824B-FCA4D5F3A167}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2BF142D9-302B-4E27-824B-FCA4D5F3A167}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2BF142D9-302B-4E27-824B-FCA4D5F3A167}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2BF142D9-302B-4E27-824B-FCA4D5F3A167}.Release|Any CPU.Build.0 = Release|Any CPU - {FBB6A4B2-7242-4610-B504-C9E3E7C01863}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FBB6A4B2-7242-4610-B504-C9E3E7C01863}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FBB6A4B2-7242-4610-B504-C9E3E7C01863}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FBB6A4B2-7242-4610-B504-C9E3E7C01863}.Release|Any CPU.Build.0 = Release|Any CPU - {C5FE1205-F3FA-4EFB-987F-EEAFB56A132D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C5FE1205-F3FA-4EFB-987F-EEAFB56A132D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C5FE1205-F3FA-4EFB-987F-EEAFB56A132D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C5FE1205-F3FA-4EFB-987F-EEAFB56A132D}.Release|Any CPU.Build.0 = Release|Any CPU - {E19D0F5D-A2B4-4FA1-BC7A-935531974055}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E19D0F5D-A2B4-4FA1-BC7A-935531974055}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E19D0F5D-A2B4-4FA1-BC7A-935531974055}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E19D0F5D-A2B4-4FA1-BC7A-935531974055}.Release|Any CPU.Build.0 = Release|Any CPU - {4CEE3DE0-DC54-41B5-9AC1-702B68F05252}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4CEE3DE0-DC54-41B5-9AC1-702B68F05252}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4CEE3DE0-DC54-41B5-9AC1-702B68F05252}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4CEE3DE0-DC54-41B5-9AC1-702B68F05252}.Release|Any CPU.Build.0 = Release|Any CPU - {10D27ED2-540C-4CCF-8A36-97394D3B5AB0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {10D27ED2-540C-4CCF-8A36-97394D3B5AB0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {10D27ED2-540C-4CCF-8A36-97394D3B5AB0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {10D27ED2-540C-4CCF-8A36-97394D3B5AB0}.Release|Any CPU.Build.0 = Release|Any CPU - {384D0DA8-20F4-4FF4-B027-D58C36DEFF3A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {384D0DA8-20F4-4FF4-B027-D58C36DEFF3A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {384D0DA8-20F4-4FF4-B027-D58C36DEFF3A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {384D0DA8-20F4-4FF4-B027-D58C36DEFF3A}.Release|Any CPU.Build.0 = Release|Any CPU - {3FA59BFE-4E39-46A1-826C-7F8FC07AEAB7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3FA59BFE-4E39-46A1-826C-7F8FC07AEAB7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3FA59BFE-4E39-46A1-826C-7F8FC07AEAB7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3FA59BFE-4E39-46A1-826C-7F8FC07AEAB7}.Release|Any CPU.Build.0 = Release|Any CPU - {FB63ACB8-F948-4814-897C-D09A6B574F7A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FB63ACB8-F948-4814-897C-D09A6B574F7A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FB63ACB8-F948-4814-897C-D09A6B574F7A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FB63ACB8-F948-4814-897C-D09A6B574F7A}.Release|Any CPU.Build.0 = Release|Any CPU - {4D0EDE04-3EB8-4A13-9856-6F22B3321385}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4D0EDE04-3EB8-4A13-9856-6F22B3321385}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4D0EDE04-3EB8-4A13-9856-6F22B3321385}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4D0EDE04-3EB8-4A13-9856-6F22B3321385}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {2BF142D9-302B-4E27-824B-FCA4D5F3A167}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2BF142D9-302B-4E27-824B-FCA4D5F3A167}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2BF142D9-302B-4E27-824B-FCA4D5F3A167}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2BF142D9-302B-4E27-824B-FCA4D5F3A167}.Release|Any CPU.Build.0 = Release|Any CPU - {FBB6A4B2-7242-4610-B504-C9E3E7C01863}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FBB6A4B2-7242-4610-B504-C9E3E7C01863}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FBB6A4B2-7242-4610-B504-C9E3E7C01863}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FBB6A4B2-7242-4610-B504-C9E3E7C01863}.Release|Any CPU.Build.0 = Release|Any CPU - {C5FE1205-F3FA-4EFB-987F-EEAFB56A132D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C5FE1205-F3FA-4EFB-987F-EEAFB56A132D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C5FE1205-F3FA-4EFB-987F-EEAFB56A132D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C5FE1205-F3FA-4EFB-987F-EEAFB56A132D}.Release|Any CPU.Build.0 = Release|Any CPU - {E19D0F5D-A2B4-4FA1-BC7A-935531974055}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E19D0F5D-A2B4-4FA1-BC7A-935531974055}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E19D0F5D-A2B4-4FA1-BC7A-935531974055}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E19D0F5D-A2B4-4FA1-BC7A-935531974055}.Release|Any CPU.Build.0 = Release|Any CPU - {4CEE3DE0-DC54-41B5-9AC1-702B68F05252}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4CEE3DE0-DC54-41B5-9AC1-702B68F05252}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4CEE3DE0-DC54-41B5-9AC1-702B68F05252}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4CEE3DE0-DC54-41B5-9AC1-702B68F05252}.Release|Any CPU.Build.0 = Release|Any CPU - {10D27ED2-540C-4CCF-8A36-97394D3B5AB0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {10D27ED2-540C-4CCF-8A36-97394D3B5AB0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {10D27ED2-540C-4CCF-8A36-97394D3B5AB0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {10D27ED2-540C-4CCF-8A36-97394D3B5AB0}.Release|Any CPU.Build.0 = Release|Any CPU - {384D0DA8-20F4-4FF4-B027-D58C36DEFF3A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {384D0DA8-20F4-4FF4-B027-D58C36DEFF3A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {384D0DA8-20F4-4FF4-B027-D58C36DEFF3A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {384D0DA8-20F4-4FF4-B027-D58C36DEFF3A}.Release|Any CPU.Build.0 = Release|Any CPU - {3FA59BFE-4E39-46A1-826C-7F8FC07AEAB7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3FA59BFE-4E39-46A1-826C-7F8FC07AEAB7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3FA59BFE-4E39-46A1-826C-7F8FC07AEAB7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3FA59BFE-4E39-46A1-826C-7F8FC07AEAB7}.Release|Any CPU.Build.0 = Release|Any CPU - {FB63ACB8-F948-4814-897C-D09A6B574F7A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FB63ACB8-F948-4814-897C-D09A6B574F7A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FB63ACB8-F948-4814-897C-D09A6B574F7A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FB63ACB8-F948-4814-897C-D09A6B574F7A}.Release|Any CPU.Build.0 = Release|Any CPU - {4D0EDE04-3EB8-4A13-9856-6F22B3321385}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4D0EDE04-3EB8-4A13-9856-6F22B3321385}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4D0EDE04-3EB8-4A13-9856-6F22B3321385}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4D0EDE04-3EB8-4A13-9856-6F22B3321385}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {82B31FCC-3F36-4228-B0F1-06A5423C575D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {904319D4-EABA-439A-809D-7623D6B721E5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {549B1BD6-904F-4D34-841E-D2F434DAE957} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {F77C7629-5213-4887-A0E2-6B2357847721} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {2802DA76-ECFE-441E-8938-91FD93FDA1FA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {2BF142D9-302B-4E27-824B-FCA4D5F3A167} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {FBB6A4B2-7242-4610-B504-C9E3E7C01863} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C5FE1205-F3FA-4EFB-987F-EEAFB56A132D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E19D0F5D-A2B4-4FA1-BC7A-935531974055} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4CEE3DE0-DC54-41B5-9AC1-702B68F05252} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {10D27ED2-540C-4CCF-8A36-97394D3B5AB0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {384D0DA8-20F4-4FF4-B027-D58C36DEFF3A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {3FA59BFE-4E39-46A1-826C-7F8FC07AEAB7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {FB63ACB8-F948-4814-897C-D09A6B574F7A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4D0EDE04-3EB8-4A13-9856-6F22B3321385} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {2BF142D9-302B-4E27-824B-FCA4D5F3A167} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {FBB6A4B2-7242-4610-B504-C9E3E7C01863} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C5FE1205-F3FA-4EFB-987F-EEAFB56A132D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E19D0F5D-A2B4-4FA1-BC7A-935531974055} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4CEE3DE0-DC54-41B5-9AC1-702B68F05252} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {10D27ED2-540C-4CCF-8A36-97394D3B5AB0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {384D0DA8-20F4-4FF4-B027-D58C36DEFF3A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {3FA59BFE-4E39-46A1-826C-7F8FC07AEAB7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {FB63ACB8-F948-4814-897C-D09A6B574F7A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4D0EDE04-3EB8-4A13-9856-6F22B3321385} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {E2B5771D-DEE4-49C7-BEF6-87EF1E05A616} diff --git a/sdk/src/Services/CloudWatchRUM/Generated/AmazonCloudWatchRUMConfig.cs b/sdk/src/Services/CloudWatchRUM/Generated/AmazonCloudWatchRUMConfig.cs index 6e78d96c4982..8798a92bd407 100644 --- a/sdk/src/Services/CloudWatchRUM/Generated/AmazonCloudWatchRUMConfig.cs +++ b/sdk/src/Services/CloudWatchRUM/Generated/AmazonCloudWatchRUMConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.CloudWatchRUM public partial class AmazonCloudWatchRUMConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("RUM", "4.0.0.0"); private static readonly AmazonCloudWatchRUMEndpointResolver EndpointResolver = new AmazonCloudWatchRUMEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("RUM", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("RUM", "3.7.400.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/CloudWatchRUM/Properties/AssemblyInfo.cs b/sdk/src/Services/CloudWatchRUM/Properties/AssemblyInfo.cs index 54df26b6117c..e237f868921f 100644 --- a/sdk/src/Services/CloudWatchRUM/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/CloudWatchRUM/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/CodeArtifact/CodeArtifact.sln b/sdk/src/Services/CodeArtifact/CodeArtifact.sln index 4fff4c982671..fffd8d0143b7 100644 --- a/sdk/src/Services/CodeArtifact/CodeArtifact.sln +++ b/sdk/src/Services/CodeArtifact/CodeArtifact.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {D4715E4E-697B-4938-A370-80077F195E59}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {D4715E4E-697B-4938-A370-80077F195E59}.Debug|Any CPU.Build.0 = Debug|Any CPU {D4715E4E-697B-4938-A370-80077F195E59}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {4DEAA14D-9716-4865-9FB6-3661034D963A}.Debug|Any CPU.Build.0 = Debug|Any CPU {4DEAA14D-9716-4865-9FB6-3661034D963A}.Release|Any CPU.ActiveCfg = Release|Any CPU {4DEAA14D-9716-4865-9FB6-3661034D963A}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {614F4B47-8838-4100-B891-A3D0D646DAFA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {614F4B47-8838-4100-B891-A3D0D646DAFA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {614F4B47-8838-4100-B891-A3D0D646DAFA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {614F4B47-8838-4100-B891-A3D0D646DAFA}.Release|Any CPU.Build.0 = Release|Any CPU - {B7429EFC-E83D-4775-92B8-0370300942E4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B7429EFC-E83D-4775-92B8-0370300942E4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B7429EFC-E83D-4775-92B8-0370300942E4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B7429EFC-E83D-4775-92B8-0370300942E4}.Release|Any CPU.Build.0 = Release|Any CPU - {31CE5ACC-7398-416B-906B-92ABDA284474}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {31CE5ACC-7398-416B-906B-92ABDA284474}.Debug|Any CPU.Build.0 = Debug|Any CPU - {31CE5ACC-7398-416B-906B-92ABDA284474}.Release|Any CPU.ActiveCfg = Release|Any CPU - {31CE5ACC-7398-416B-906B-92ABDA284474}.Release|Any CPU.Build.0 = Release|Any CPU - {AA3A643B-C09E-4136-8B98-B12DE6AB8263}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AA3A643B-C09E-4136-8B98-B12DE6AB8263}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AA3A643B-C09E-4136-8B98-B12DE6AB8263}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AA3A643B-C09E-4136-8B98-B12DE6AB8263}.Release|Any CPU.Build.0 = Release|Any CPU - {FA3C3C20-C167-4237-90F5-A9FCAEB32B8E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FA3C3C20-C167-4237-90F5-A9FCAEB32B8E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FA3C3C20-C167-4237-90F5-A9FCAEB32B8E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FA3C3C20-C167-4237-90F5-A9FCAEB32B8E}.Release|Any CPU.Build.0 = Release|Any CPU - {00953580-C28B-454A-8314-31D5780AC507}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {00953580-C28B-454A-8314-31D5780AC507}.Debug|Any CPU.Build.0 = Debug|Any CPU - {00953580-C28B-454A-8314-31D5780AC507}.Release|Any CPU.ActiveCfg = Release|Any CPU - {00953580-C28B-454A-8314-31D5780AC507}.Release|Any CPU.Build.0 = Release|Any CPU - {1C0C88FB-5044-49E6-AB66-653057AC6A17}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1C0C88FB-5044-49E6-AB66-653057AC6A17}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1C0C88FB-5044-49E6-AB66-653057AC6A17}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1C0C88FB-5044-49E6-AB66-653057AC6A17}.Release|Any CPU.Build.0 = Release|Any CPU - {6138673A-9CB4-4FE6-8538-2F34EABA2A34}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6138673A-9CB4-4FE6-8538-2F34EABA2A34}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6138673A-9CB4-4FE6-8538-2F34EABA2A34}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6138673A-9CB4-4FE6-8538-2F34EABA2A34}.Release|Any CPU.Build.0 = Release|Any CPU - {23652EED-CC26-4D32-A02B-745C417BECAC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {23652EED-CC26-4D32-A02B-745C417BECAC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {23652EED-CC26-4D32-A02B-745C417BECAC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {23652EED-CC26-4D32-A02B-745C417BECAC}.Release|Any CPU.Build.0 = Release|Any CPU - {352217B1-4AE9-448F-9D90-0C6E446612A8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {352217B1-4AE9-448F-9D90-0C6E446612A8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {352217B1-4AE9-448F-9D90-0C6E446612A8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {352217B1-4AE9-448F-9D90-0C6E446612A8}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {614F4B47-8838-4100-B891-A3D0D646DAFA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {614F4B47-8838-4100-B891-A3D0D646DAFA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {614F4B47-8838-4100-B891-A3D0D646DAFA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {614F4B47-8838-4100-B891-A3D0D646DAFA}.Release|Any CPU.Build.0 = Release|Any CPU - {B7429EFC-E83D-4775-92B8-0370300942E4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B7429EFC-E83D-4775-92B8-0370300942E4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B7429EFC-E83D-4775-92B8-0370300942E4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B7429EFC-E83D-4775-92B8-0370300942E4}.Release|Any CPU.Build.0 = Release|Any CPU - {31CE5ACC-7398-416B-906B-92ABDA284474}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {31CE5ACC-7398-416B-906B-92ABDA284474}.Debug|Any CPU.Build.0 = Debug|Any CPU - {31CE5ACC-7398-416B-906B-92ABDA284474}.Release|Any CPU.ActiveCfg = Release|Any CPU - {31CE5ACC-7398-416B-906B-92ABDA284474}.Release|Any CPU.Build.0 = Release|Any CPU - {AA3A643B-C09E-4136-8B98-B12DE6AB8263}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AA3A643B-C09E-4136-8B98-B12DE6AB8263}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AA3A643B-C09E-4136-8B98-B12DE6AB8263}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AA3A643B-C09E-4136-8B98-B12DE6AB8263}.Release|Any CPU.Build.0 = Release|Any CPU - {FA3C3C20-C167-4237-90F5-A9FCAEB32B8E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FA3C3C20-C167-4237-90F5-A9FCAEB32B8E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FA3C3C20-C167-4237-90F5-A9FCAEB32B8E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FA3C3C20-C167-4237-90F5-A9FCAEB32B8E}.Release|Any CPU.Build.0 = Release|Any CPU - {00953580-C28B-454A-8314-31D5780AC507}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {00953580-C28B-454A-8314-31D5780AC507}.Debug|Any CPU.Build.0 = Debug|Any CPU - {00953580-C28B-454A-8314-31D5780AC507}.Release|Any CPU.ActiveCfg = Release|Any CPU - {00953580-C28B-454A-8314-31D5780AC507}.Release|Any CPU.Build.0 = Release|Any CPU - {1C0C88FB-5044-49E6-AB66-653057AC6A17}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1C0C88FB-5044-49E6-AB66-653057AC6A17}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1C0C88FB-5044-49E6-AB66-653057AC6A17}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1C0C88FB-5044-49E6-AB66-653057AC6A17}.Release|Any CPU.Build.0 = Release|Any CPU - {6138673A-9CB4-4FE6-8538-2F34EABA2A34}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6138673A-9CB4-4FE6-8538-2F34EABA2A34}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6138673A-9CB4-4FE6-8538-2F34EABA2A34}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6138673A-9CB4-4FE6-8538-2F34EABA2A34}.Release|Any CPU.Build.0 = Release|Any CPU - {23652EED-CC26-4D32-A02B-745C417BECAC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {23652EED-CC26-4D32-A02B-745C417BECAC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {23652EED-CC26-4D32-A02B-745C417BECAC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {23652EED-CC26-4D32-A02B-745C417BECAC}.Release|Any CPU.Build.0 = Release|Any CPU - {352217B1-4AE9-448F-9D90-0C6E446612A8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {352217B1-4AE9-448F-9D90-0C6E446612A8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {352217B1-4AE9-448F-9D90-0C6E446612A8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {352217B1-4AE9-448F-9D90-0C6E446612A8}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {D4715E4E-697B-4938-A370-80077F195E59} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {0F150C7A-B7D0-4792-B401-DC3930F6063F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {1A7E4E62-17A7-406A-835B-AAC5E3FD7048} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {A98EEC65-EBFB-4A60-BED4-4F3CCD637CFC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {4DEAA14D-9716-4865-9FB6-3661034D963A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {614F4B47-8838-4100-B891-A3D0D646DAFA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B7429EFC-E83D-4775-92B8-0370300942E4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {31CE5ACC-7398-416B-906B-92ABDA284474} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {AA3A643B-C09E-4136-8B98-B12DE6AB8263} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {FA3C3C20-C167-4237-90F5-A9FCAEB32B8E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {00953580-C28B-454A-8314-31D5780AC507} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {1C0C88FB-5044-49E6-AB66-653057AC6A17} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6138673A-9CB4-4FE6-8538-2F34EABA2A34} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {23652EED-CC26-4D32-A02B-745C417BECAC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {352217B1-4AE9-448F-9D90-0C6E446612A8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {614F4B47-8838-4100-B891-A3D0D646DAFA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B7429EFC-E83D-4775-92B8-0370300942E4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {31CE5ACC-7398-416B-906B-92ABDA284474} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {AA3A643B-C09E-4136-8B98-B12DE6AB8263} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {FA3C3C20-C167-4237-90F5-A9FCAEB32B8E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {00953580-C28B-454A-8314-31D5780AC507} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {1C0C88FB-5044-49E6-AB66-653057AC6A17} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6138673A-9CB4-4FE6-8538-2F34EABA2A34} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {23652EED-CC26-4D32-A02B-745C417BECAC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {352217B1-4AE9-448F-9D90-0C6E446612A8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {8029ABD1-C2E6-4521-BAC1-6C0B00267A7A} diff --git a/sdk/src/Services/CodeArtifact/Generated/AmazonCodeArtifactConfig.cs b/sdk/src/Services/CodeArtifact/Generated/AmazonCodeArtifactConfig.cs index e81b79f9f074..06727dd55806 100644 --- a/sdk/src/Services/CodeArtifact/Generated/AmazonCodeArtifactConfig.cs +++ b/sdk/src/Services/CodeArtifact/Generated/AmazonCodeArtifactConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.CodeArtifact public partial class AmazonCodeArtifactConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("codeartifact", "4.0.0.0"); private static readonly AmazonCodeArtifactEndpointResolver EndpointResolver = new AmazonCodeArtifactEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("codeartifact", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("codeartifact", "3.7.401.26"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/CodeArtifact/Properties/AssemblyInfo.cs b/sdk/src/Services/CodeArtifact/Properties/AssemblyInfo.cs index 36f84739a643..2c1c96abc7df 100644 --- a/sdk/src/Services/CodeArtifact/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/CodeArtifact/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.26")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/CodeBuild/CodeBuild.sln b/sdk/src/Services/CodeBuild/CodeBuild.sln index e17dd6f958fd..c40eab70d191 100644 --- a/sdk/src/Services/CodeBuild/CodeBuild.sln +++ b/sdk/src/Services/CodeBuild/CodeBuild.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {7330810C-045E-4E09-A6CD-4B5956F21432}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {7330810C-045E-4E09-A6CD-4B5956F21432}.Debug|Any CPU.Build.0 = Debug|Any CPU {7330810C-045E-4E09-A6CD-4B5956F21432}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {2E4C2270-71B7-487F-B90D-3697789B7C65}.Debug|Any CPU.Build.0 = Debug|Any CPU {2E4C2270-71B7-487F-B90D-3697789B7C65}.Release|Any CPU.ActiveCfg = Release|Any CPU {2E4C2270-71B7-487F-B90D-3697789B7C65}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {56A1D0F1-12F8-4B7C-960C-4098FD8B2A26}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {56A1D0F1-12F8-4B7C-960C-4098FD8B2A26}.Debug|Any CPU.Build.0 = Debug|Any CPU - {56A1D0F1-12F8-4B7C-960C-4098FD8B2A26}.Release|Any CPU.ActiveCfg = Release|Any CPU - {56A1D0F1-12F8-4B7C-960C-4098FD8B2A26}.Release|Any CPU.Build.0 = Release|Any CPU - {8EBCEBCF-BE53-4A79-8D84-096D8440F6ED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8EBCEBCF-BE53-4A79-8D84-096D8440F6ED}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8EBCEBCF-BE53-4A79-8D84-096D8440F6ED}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8EBCEBCF-BE53-4A79-8D84-096D8440F6ED}.Release|Any CPU.Build.0 = Release|Any CPU - {2A6599D6-3C61-4200-A171-63F79CAA318C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2A6599D6-3C61-4200-A171-63F79CAA318C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2A6599D6-3C61-4200-A171-63F79CAA318C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2A6599D6-3C61-4200-A171-63F79CAA318C}.Release|Any CPU.Build.0 = Release|Any CPU - {052F4E8E-7029-4221-9096-766D7D2BD373}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {052F4E8E-7029-4221-9096-766D7D2BD373}.Debug|Any CPU.Build.0 = Debug|Any CPU - {052F4E8E-7029-4221-9096-766D7D2BD373}.Release|Any CPU.ActiveCfg = Release|Any CPU - {052F4E8E-7029-4221-9096-766D7D2BD373}.Release|Any CPU.Build.0 = Release|Any CPU - {3EA8A9E4-BBB3-4327-ABE0-0C48FE97B934}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3EA8A9E4-BBB3-4327-ABE0-0C48FE97B934}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3EA8A9E4-BBB3-4327-ABE0-0C48FE97B934}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3EA8A9E4-BBB3-4327-ABE0-0C48FE97B934}.Release|Any CPU.Build.0 = Release|Any CPU - {40D51E3E-5E04-445F-90C2-5CAA0B595233}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {40D51E3E-5E04-445F-90C2-5CAA0B595233}.Debug|Any CPU.Build.0 = Debug|Any CPU - {40D51E3E-5E04-445F-90C2-5CAA0B595233}.Release|Any CPU.ActiveCfg = Release|Any CPU - {40D51E3E-5E04-445F-90C2-5CAA0B595233}.Release|Any CPU.Build.0 = Release|Any CPU - {08B4BEDD-C001-4DA9-8BF2-AA610A43B380}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {08B4BEDD-C001-4DA9-8BF2-AA610A43B380}.Debug|Any CPU.Build.0 = Debug|Any CPU - {08B4BEDD-C001-4DA9-8BF2-AA610A43B380}.Release|Any CPU.ActiveCfg = Release|Any CPU - {08B4BEDD-C001-4DA9-8BF2-AA610A43B380}.Release|Any CPU.Build.0 = Release|Any CPU - {33B83F63-6F40-4834-9DDD-5E39540F4E75}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {33B83F63-6F40-4834-9DDD-5E39540F4E75}.Debug|Any CPU.Build.0 = Debug|Any CPU - {33B83F63-6F40-4834-9DDD-5E39540F4E75}.Release|Any CPU.ActiveCfg = Release|Any CPU - {33B83F63-6F40-4834-9DDD-5E39540F4E75}.Release|Any CPU.Build.0 = Release|Any CPU - {D4AA7E8E-1377-4DAE-92D7-FE9F2E32A51A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D4AA7E8E-1377-4DAE-92D7-FE9F2E32A51A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D4AA7E8E-1377-4DAE-92D7-FE9F2E32A51A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D4AA7E8E-1377-4DAE-92D7-FE9F2E32A51A}.Release|Any CPU.Build.0 = Release|Any CPU - {0974F732-C4ED-4114-B741-C410D6978BB6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0974F732-C4ED-4114-B741-C410D6978BB6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0974F732-C4ED-4114-B741-C410D6978BB6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0974F732-C4ED-4114-B741-C410D6978BB6}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {56A1D0F1-12F8-4B7C-960C-4098FD8B2A26}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {56A1D0F1-12F8-4B7C-960C-4098FD8B2A26}.Debug|Any CPU.Build.0 = Debug|Any CPU - {56A1D0F1-12F8-4B7C-960C-4098FD8B2A26}.Release|Any CPU.ActiveCfg = Release|Any CPU - {56A1D0F1-12F8-4B7C-960C-4098FD8B2A26}.Release|Any CPU.Build.0 = Release|Any CPU - {8EBCEBCF-BE53-4A79-8D84-096D8440F6ED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8EBCEBCF-BE53-4A79-8D84-096D8440F6ED}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8EBCEBCF-BE53-4A79-8D84-096D8440F6ED}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8EBCEBCF-BE53-4A79-8D84-096D8440F6ED}.Release|Any CPU.Build.0 = Release|Any CPU - {2A6599D6-3C61-4200-A171-63F79CAA318C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2A6599D6-3C61-4200-A171-63F79CAA318C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2A6599D6-3C61-4200-A171-63F79CAA318C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2A6599D6-3C61-4200-A171-63F79CAA318C}.Release|Any CPU.Build.0 = Release|Any CPU - {052F4E8E-7029-4221-9096-766D7D2BD373}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {052F4E8E-7029-4221-9096-766D7D2BD373}.Debug|Any CPU.Build.0 = Debug|Any CPU - {052F4E8E-7029-4221-9096-766D7D2BD373}.Release|Any CPU.ActiveCfg = Release|Any CPU - {052F4E8E-7029-4221-9096-766D7D2BD373}.Release|Any CPU.Build.0 = Release|Any CPU - {3EA8A9E4-BBB3-4327-ABE0-0C48FE97B934}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3EA8A9E4-BBB3-4327-ABE0-0C48FE97B934}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3EA8A9E4-BBB3-4327-ABE0-0C48FE97B934}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3EA8A9E4-BBB3-4327-ABE0-0C48FE97B934}.Release|Any CPU.Build.0 = Release|Any CPU - {40D51E3E-5E04-445F-90C2-5CAA0B595233}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {40D51E3E-5E04-445F-90C2-5CAA0B595233}.Debug|Any CPU.Build.0 = Debug|Any CPU - {40D51E3E-5E04-445F-90C2-5CAA0B595233}.Release|Any CPU.ActiveCfg = Release|Any CPU - {40D51E3E-5E04-445F-90C2-5CAA0B595233}.Release|Any CPU.Build.0 = Release|Any CPU - {08B4BEDD-C001-4DA9-8BF2-AA610A43B380}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {08B4BEDD-C001-4DA9-8BF2-AA610A43B380}.Debug|Any CPU.Build.0 = Debug|Any CPU - {08B4BEDD-C001-4DA9-8BF2-AA610A43B380}.Release|Any CPU.ActiveCfg = Release|Any CPU - {08B4BEDD-C001-4DA9-8BF2-AA610A43B380}.Release|Any CPU.Build.0 = Release|Any CPU - {33B83F63-6F40-4834-9DDD-5E39540F4E75}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {33B83F63-6F40-4834-9DDD-5E39540F4E75}.Debug|Any CPU.Build.0 = Debug|Any CPU - {33B83F63-6F40-4834-9DDD-5E39540F4E75}.Release|Any CPU.ActiveCfg = Release|Any CPU - {33B83F63-6F40-4834-9DDD-5E39540F4E75}.Release|Any CPU.Build.0 = Release|Any CPU - {D4AA7E8E-1377-4DAE-92D7-FE9F2E32A51A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D4AA7E8E-1377-4DAE-92D7-FE9F2E32A51A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D4AA7E8E-1377-4DAE-92D7-FE9F2E32A51A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D4AA7E8E-1377-4DAE-92D7-FE9F2E32A51A}.Release|Any CPU.Build.0 = Release|Any CPU - {0974F732-C4ED-4114-B741-C410D6978BB6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0974F732-C4ED-4114-B741-C410D6978BB6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0974F732-C4ED-4114-B741-C410D6978BB6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0974F732-C4ED-4114-B741-C410D6978BB6}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7330810C-045E-4E09-A6CD-4B5956F21432} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {2FAB12C7-AF3F-405E-84B7-7CA160BE2FDA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {FF376522-D701-4270-87A1-DE3A40BB6E00} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {11B4EF00-F5C2-42A5-AB13-563284C949FE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {2E4C2270-71B7-487F-B90D-3697789B7C65} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {56A1D0F1-12F8-4B7C-960C-4098FD8B2A26} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8EBCEBCF-BE53-4A79-8D84-096D8440F6ED} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {2A6599D6-3C61-4200-A171-63F79CAA318C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {052F4E8E-7029-4221-9096-766D7D2BD373} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {3EA8A9E4-BBB3-4327-ABE0-0C48FE97B934} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {40D51E3E-5E04-445F-90C2-5CAA0B595233} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {08B4BEDD-C001-4DA9-8BF2-AA610A43B380} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {33B83F63-6F40-4834-9DDD-5E39540F4E75} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D4AA7E8E-1377-4DAE-92D7-FE9F2E32A51A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0974F732-C4ED-4114-B741-C410D6978BB6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {56A1D0F1-12F8-4B7C-960C-4098FD8B2A26} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8EBCEBCF-BE53-4A79-8D84-096D8440F6ED} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {2A6599D6-3C61-4200-A171-63F79CAA318C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {052F4E8E-7029-4221-9096-766D7D2BD373} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {3EA8A9E4-BBB3-4327-ABE0-0C48FE97B934} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {40D51E3E-5E04-445F-90C2-5CAA0B595233} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {08B4BEDD-C001-4DA9-8BF2-AA610A43B380} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {33B83F63-6F40-4834-9DDD-5E39540F4E75} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D4AA7E8E-1377-4DAE-92D7-FE9F2E32A51A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0974F732-C4ED-4114-B741-C410D6978BB6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {70BF983A-E2C9-46CF-8265-E2483CA6CFCB} diff --git a/sdk/src/Services/CodeBuild/Generated/AmazonCodeBuildConfig.cs b/sdk/src/Services/CodeBuild/Generated/AmazonCodeBuildConfig.cs index 117b2ae53eda..c20482c8a223 100644 --- a/sdk/src/Services/CodeBuild/Generated/AmazonCodeBuildConfig.cs +++ b/sdk/src/Services/CodeBuild/Generated/AmazonCodeBuildConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.CodeBuild public partial class AmazonCodeBuildConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("CodeBuild", "4.0.0.0"); private static readonly AmazonCodeBuildEndpointResolver EndpointResolver = new AmazonCodeBuildEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("CodeBuild", "3.7.403.5"); -======= - InternalSDKUtils.BuildUserAgentString("CodeBuild", "3.7.407.4"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/CodeBuild/Generated/Model/AutoRetryConfig.cs b/sdk/src/Services/CodeBuild/Generated/Model/AutoRetryConfig.cs index 540518d550e3..73344b619f0a 100644 --- a/sdk/src/Services/CodeBuild/Generated/Model/AutoRetryConfig.cs +++ b/sdk/src/Services/CodeBuild/Generated/Model/AutoRetryConfig.cs @@ -47,9 +47,9 @@ public partial class AutoRetryConfig /// to automatically retry your build for up to 2 additional times. /// /// - public int AutoRetryLimit + public int? AutoRetryLimit { - get { return this._autoRetryLimit.GetValueOrDefault(); } + get { return this._autoRetryLimit; } set { this._autoRetryLimit = value; } } @@ -66,9 +66,9 @@ internal bool IsSetAutoRetryLimit() /// auto-retry number of 0. /// /// - public int AutoRetryNumber + public int? AutoRetryNumber { - get { return this._autoRetryNumber.GetValueOrDefault(); } + get { return this._autoRetryNumber; } set { this._autoRetryNumber = value; } } diff --git a/sdk/src/Services/CodeBuild/Generated/Model/ComputeConfiguration.cs b/sdk/src/Services/CodeBuild/Generated/Model/ComputeConfiguration.cs index 28da03596263..b1cceead3090 100644 --- a/sdk/src/Services/CodeBuild/Generated/Model/ComputeConfiguration.cs +++ b/sdk/src/Services/CodeBuild/Generated/Model/ComputeConfiguration.cs @@ -46,9 +46,9 @@ public partial class ComputeConfiguration /// The amount of disk space of the instance type included in your fleet. /// /// - public long Disk + public long? Disk { - get { return this._disk.GetValueOrDefault(); } + get { return this._disk; } set { this._disk = value; } } @@ -82,9 +82,9 @@ internal bool IsSetMachineType() /// The amount of memory of the instance type included in your fleet. /// /// - public long Memory + public long? Memory { - get { return this._memory.GetValueOrDefault(); } + get { return this._memory; } set { this._memory = value; } } @@ -100,9 +100,9 @@ internal bool IsSetMemory() /// The number of vCPUs of the instance type included in your fleet. /// /// - public long VCpu + public long? VCpu { - get { return this._vCpu.GetValueOrDefault(); } + get { return this._vCpu; } set { this._vCpu = value; } } diff --git a/sdk/src/Services/CodeBuild/Generated/Model/CreateProjectRequest.cs b/sdk/src/Services/CodeBuild/Generated/Model/CreateProjectRequest.cs index 1dafdf82a73a..aad24b250b97 100644 --- a/sdk/src/Services/CodeBuild/Generated/Model/CreateProjectRequest.cs +++ b/sdk/src/Services/CodeBuild/Generated/Model/CreateProjectRequest.cs @@ -85,9 +85,9 @@ internal bool IsSetArtifacts() /// to automatically retry your build for up to 2 additional times. /// /// - public int AutoRetryLimit + public int? AutoRetryLimit { - get { return this._autoRetryLimit.GetValueOrDefault(); } + get { return this._autoRetryLimit; } set { this._autoRetryLimit = value; } } diff --git a/sdk/src/Services/CodeBuild/Generated/Model/Internal/MarshallTransformations/AutoRetryConfigUnmarshaller.cs b/sdk/src/Services/CodeBuild/Generated/Model/Internal/MarshallTransformations/AutoRetryConfigUnmarshaller.cs index 47c481aab484..dff580227f68 100644 --- a/sdk/src/Services/CodeBuild/Generated/Model/Internal/MarshallTransformations/AutoRetryConfigUnmarshaller.cs +++ b/sdk/src/Services/CodeBuild/Generated/Model/Internal/MarshallTransformations/AutoRetryConfigUnmarshaller.cs @@ -68,13 +68,13 @@ public AutoRetryConfig Unmarshall(JsonUnmarshallerContext context) { if (context.TestExpression("autoRetryLimit", targetDepth)) { - var unmarshaller = IntUnmarshaller.Instance; + var unmarshaller = NullableIntUnmarshaller.Instance; unmarshalledObject.AutoRetryLimit = unmarshaller.Unmarshall(context); continue; } if (context.TestExpression("autoRetryNumber", targetDepth)) { - var unmarshaller = IntUnmarshaller.Instance; + var unmarshaller = NullableIntUnmarshaller.Instance; unmarshalledObject.AutoRetryNumber = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/CodeBuild/Generated/Model/Internal/MarshallTransformations/ComputeConfigurationMarshaller.cs b/sdk/src/Services/CodeBuild/Generated/Model/Internal/MarshallTransformations/ComputeConfigurationMarshaller.cs index 839655eccbd0..7469bc3d89a3 100644 --- a/sdk/src/Services/CodeBuild/Generated/Model/Internal/MarshallTransformations/ComputeConfigurationMarshaller.cs +++ b/sdk/src/Services/CodeBuild/Generated/Model/Internal/MarshallTransformations/ComputeConfigurationMarshaller.cs @@ -51,7 +51,7 @@ public void Marshall(ComputeConfiguration requestObject, JsonMarshallerContext c if(requestObject.IsSetDisk()) { context.Writer.WritePropertyName("disk"); - context.Writer.Write(requestObject.Disk); + context.Writer.Write(requestObject.Disk.Value); } if(requestObject.IsSetMachineType()) @@ -63,13 +63,13 @@ public void Marshall(ComputeConfiguration requestObject, JsonMarshallerContext c if(requestObject.IsSetMemory()) { context.Writer.WritePropertyName("memory"); - context.Writer.Write(requestObject.Memory); + context.Writer.Write(requestObject.Memory.Value); } if(requestObject.IsSetVCpu()) { context.Writer.WritePropertyName("vCpu"); - context.Writer.Write(requestObject.VCpu); + context.Writer.Write(requestObject.VCpu.Value); } } diff --git a/sdk/src/Services/CodeBuild/Generated/Model/Internal/MarshallTransformations/ComputeConfigurationUnmarshaller.cs b/sdk/src/Services/CodeBuild/Generated/Model/Internal/MarshallTransformations/ComputeConfigurationUnmarshaller.cs index 8949a184cf71..8e0f132af4b3 100644 --- a/sdk/src/Services/CodeBuild/Generated/Model/Internal/MarshallTransformations/ComputeConfigurationUnmarshaller.cs +++ b/sdk/src/Services/CodeBuild/Generated/Model/Internal/MarshallTransformations/ComputeConfigurationUnmarshaller.cs @@ -68,7 +68,7 @@ public ComputeConfiguration Unmarshall(JsonUnmarshallerContext context) { if (context.TestExpression("disk", targetDepth)) { - var unmarshaller = LongUnmarshaller.Instance; + var unmarshaller = NullableLongUnmarshaller.Instance; unmarshalledObject.Disk = unmarshaller.Unmarshall(context); continue; } @@ -80,13 +80,13 @@ public ComputeConfiguration Unmarshall(JsonUnmarshallerContext context) } if (context.TestExpression("memory", targetDepth)) { - var unmarshaller = LongUnmarshaller.Instance; + var unmarshaller = NullableLongUnmarshaller.Instance; unmarshalledObject.Memory = unmarshaller.Unmarshall(context); continue; } if (context.TestExpression("vCpu", targetDepth)) { - var unmarshaller = LongUnmarshaller.Instance; + var unmarshaller = NullableLongUnmarshaller.Instance; unmarshalledObject.VCpu = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/CodeBuild/Generated/Model/Internal/MarshallTransformations/CreateFleetRequestMarshaller.cs b/sdk/src/Services/CodeBuild/Generated/Model/Internal/MarshallTransformations/CreateFleetRequestMarshaller.cs index 1cfe74bcb312..1fc0af02fabf 100644 --- a/sdk/src/Services/CodeBuild/Generated/Model/Internal/MarshallTransformations/CreateFleetRequestMarshaller.cs +++ b/sdk/src/Services/CodeBuild/Generated/Model/Internal/MarshallTransformations/CreateFleetRequestMarshaller.cs @@ -77,36 +77,22 @@ public IRequest Marshall(CreateFleetRequest publicRequest) context.Writer.Write(publicRequest.BaseCapacity.Value); } -<<<<<<< HEAD + if(publicRequest.IsSetComputeConfiguration()) + { + context.Writer.WritePropertyName("computeConfiguration"); + context.Writer.WriteObjectStart(); + + var marshaller = ComputeConfigurationMarshaller.Instance; + marshaller.Marshall(publicRequest.ComputeConfiguration, context); + + context.Writer.WriteObjectEnd(); + } + if(publicRequest.IsSetComputeType()) { context.Writer.WritePropertyName("computeType"); context.Writer.Write(publicRequest.ComputeType); } -||||||| Commit version number update changes - if(publicRequest.IsSetComputeType()) - { - context.Writer.WritePropertyName("computeType"); - context.Writer.Write(publicRequest.ComputeType); - } -======= - if(publicRequest.IsSetComputeConfiguration()) - { - context.Writer.WritePropertyName("computeConfiguration"); - context.Writer.WriteObjectStart(); - - var marshaller = ComputeConfigurationMarshaller.Instance; - marshaller.Marshall(publicRequest.ComputeConfiguration, context); - - context.Writer.WriteObjectEnd(); - } - - if(publicRequest.IsSetComputeType()) - { - context.Writer.WritePropertyName("computeType"); - context.Writer.Write(publicRequest.ComputeType); - } ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b if(publicRequest.IsSetEnvironmentType()) { @@ -138,33 +124,21 @@ public IRequest Marshall(CreateFleetRequest publicRequest) context.Writer.Write(publicRequest.OverflowBehavior); } -<<<<<<< HEAD - if(publicRequest.IsSetScalingConfiguration()) + if(publicRequest.IsSetProxyConfiguration()) { - context.Writer.WritePropertyName("scalingConfiguration"); + context.Writer.WritePropertyName("proxyConfiguration"); context.Writer.WriteObjectStart(); -||||||| Commit version number update changes - if(publicRequest.IsSetScalingConfiguration()) - { - context.Writer.WritePropertyName("scalingConfiguration"); - context.Writer.WriteObjectStart(); -======= - if(publicRequest.IsSetProxyConfiguration()) - { - context.Writer.WritePropertyName("proxyConfiguration"); - context.Writer.WriteObjectStart(); - var marshaller = ProxyConfigurationMarshaller.Instance; - marshaller.Marshall(publicRequest.ProxyConfiguration, context); + var marshaller = ProxyConfigurationMarshaller.Instance; + marshaller.Marshall(publicRequest.ProxyConfiguration, context); - context.Writer.WriteObjectEnd(); - } + context.Writer.WriteObjectEnd(); + } - if(publicRequest.IsSetScalingConfiguration()) - { - context.Writer.WritePropertyName("scalingConfiguration"); - context.Writer.WriteObjectStart(); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b + if(publicRequest.IsSetScalingConfiguration()) + { + context.Writer.WritePropertyName("scalingConfiguration"); + context.Writer.WriteObjectStart(); var marshaller = ScalingConfigurationInputMarshaller.Instance; marshaller.Marshall(publicRequest.ScalingConfiguration, context); diff --git a/sdk/src/Services/CodeBuild/Generated/Model/Internal/MarshallTransformations/CreateProjectRequestMarshaller.cs b/sdk/src/Services/CodeBuild/Generated/Model/Internal/MarshallTransformations/CreateProjectRequestMarshaller.cs index 93c03f844c71..5b0f2549eaa8 100644 --- a/sdk/src/Services/CodeBuild/Generated/Model/Internal/MarshallTransformations/CreateProjectRequestMarshaller.cs +++ b/sdk/src/Services/CodeBuild/Generated/Model/Internal/MarshallTransformations/CreateProjectRequestMarshaller.cs @@ -76,32 +76,18 @@ public IRequest Marshall(CreateProjectRequest publicRequest) context.Writer.WritePropertyName("artifacts"); context.Writer.WriteObjectStart(); -<<<<<<< HEAD var marshaller = ProjectArtifactsMarshaller.Instance; marshaller.Marshall(publicRequest.Artifacts, context); -||||||| Commit version number update changes - if(publicRequest.IsSetBadgeEnabled()) - { - context.Writer.WritePropertyName("badgeEnabled"); - context.Writer.Write(publicRequest.BadgeEnabled); - } -======= - if(publicRequest.IsSetAutoRetryLimit()) - { - context.Writer.WritePropertyName("autoRetryLimit"); - context.Writer.Write(publicRequest.AutoRetryLimit); - } - - if(publicRequest.IsSetBadgeEnabled()) - { - context.Writer.WritePropertyName("badgeEnabled"); - context.Writer.Write(publicRequest.BadgeEnabled); - } ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b context.Writer.WriteObjectEnd(); } + if(publicRequest.IsSetAutoRetryLimit()) + { + context.Writer.WritePropertyName("autoRetryLimit"); + context.Writer.Write(publicRequest.AutoRetryLimit.Value); + } + if(publicRequest.IsSetBadgeEnabled()) { context.Writer.WritePropertyName("badgeEnabled"); diff --git a/sdk/src/Services/CodeBuild/Generated/Model/Internal/MarshallTransformations/ProjectUnmarshaller.cs b/sdk/src/Services/CodeBuild/Generated/Model/Internal/MarshallTransformations/ProjectUnmarshaller.cs index e4ca62c962fc..c822e06cf61e 100644 --- a/sdk/src/Services/CodeBuild/Generated/Model/Internal/MarshallTransformations/ProjectUnmarshaller.cs +++ b/sdk/src/Services/CodeBuild/Generated/Model/Internal/MarshallTransformations/ProjectUnmarshaller.cs @@ -80,7 +80,7 @@ public Project Unmarshall(JsonUnmarshallerContext context) } if (context.TestExpression("autoRetryLimit", targetDepth)) { - var unmarshaller = IntUnmarshaller.Instance; + var unmarshaller = NullableIntUnmarshaller.Instance; unmarshalledObject.AutoRetryLimit = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/CodeBuild/Generated/Model/Internal/MarshallTransformations/StartBuildRequestMarshaller.cs b/sdk/src/Services/CodeBuild/Generated/Model/Internal/MarshallTransformations/StartBuildRequestMarshaller.cs index c9f5677f3ac0..7b85645c6ca1 100644 --- a/sdk/src/Services/CodeBuild/Generated/Model/Internal/MarshallTransformations/StartBuildRequestMarshaller.cs +++ b/sdk/src/Services/CodeBuild/Generated/Model/Internal/MarshallTransformations/StartBuildRequestMarshaller.cs @@ -82,31 +82,17 @@ public IRequest Marshall(StartBuildRequest publicRequest) context.Writer.WriteObjectEnd(); } -<<<<<<< HEAD + if(publicRequest.IsSetAutoRetryLimitOverride()) + { + context.Writer.WritePropertyName("autoRetryLimitOverride"); + context.Writer.Write(publicRequest.AutoRetryLimitOverride.Value); + } + if(publicRequest.IsSetBuildspecOverride()) { context.Writer.WritePropertyName("buildspecOverride"); context.Writer.Write(publicRequest.BuildspecOverride); } -||||||| Commit version number update changes - if(publicRequest.IsSetBuildspecOverride()) - { - context.Writer.WritePropertyName("buildspecOverride"); - context.Writer.Write(publicRequest.BuildspecOverride); - } -======= - if(publicRequest.IsSetAutoRetryLimitOverride()) - { - context.Writer.WritePropertyName("autoRetryLimitOverride"); - context.Writer.Write(publicRequest.AutoRetryLimitOverride); - } - - if(publicRequest.IsSetBuildspecOverride()) - { - context.Writer.WritePropertyName("buildspecOverride"); - context.Writer.Write(publicRequest.BuildspecOverride); - } ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b if(publicRequest.IsSetBuildStatusConfigOverride()) { diff --git a/sdk/src/Services/CodeBuild/Generated/Model/Internal/MarshallTransformations/UpdateFleetRequestMarshaller.cs b/sdk/src/Services/CodeBuild/Generated/Model/Internal/MarshallTransformations/UpdateFleetRequestMarshaller.cs index 3e8e85e30a49..2aaf228688de 100644 --- a/sdk/src/Services/CodeBuild/Generated/Model/Internal/MarshallTransformations/UpdateFleetRequestMarshaller.cs +++ b/sdk/src/Services/CodeBuild/Generated/Model/Internal/MarshallTransformations/UpdateFleetRequestMarshaller.cs @@ -83,36 +83,22 @@ public IRequest Marshall(UpdateFleetRequest publicRequest) context.Writer.Write(publicRequest.BaseCapacity.Value); } -<<<<<<< HEAD + if(publicRequest.IsSetComputeConfiguration()) + { + context.Writer.WritePropertyName("computeConfiguration"); + context.Writer.WriteObjectStart(); + + var marshaller = ComputeConfigurationMarshaller.Instance; + marshaller.Marshall(publicRequest.ComputeConfiguration, context); + + context.Writer.WriteObjectEnd(); + } + if(publicRequest.IsSetComputeType()) { context.Writer.WritePropertyName("computeType"); context.Writer.Write(publicRequest.ComputeType); } -||||||| Commit version number update changes - if(publicRequest.IsSetComputeType()) - { - context.Writer.WritePropertyName("computeType"); - context.Writer.Write(publicRequest.ComputeType); - } -======= - if(publicRequest.IsSetComputeConfiguration()) - { - context.Writer.WritePropertyName("computeConfiguration"); - context.Writer.WriteObjectStart(); - - var marshaller = ComputeConfigurationMarshaller.Instance; - marshaller.Marshall(publicRequest.ComputeConfiguration, context); - - context.Writer.WriteObjectEnd(); - } - - if(publicRequest.IsSetComputeType()) - { - context.Writer.WritePropertyName("computeType"); - context.Writer.Write(publicRequest.ComputeType); - } ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b if(publicRequest.IsSetEnvironmentType()) { @@ -138,33 +124,21 @@ public IRequest Marshall(UpdateFleetRequest publicRequest) context.Writer.Write(publicRequest.OverflowBehavior); } -<<<<<<< HEAD - if(publicRequest.IsSetScalingConfiguration()) + if(publicRequest.IsSetProxyConfiguration()) { - context.Writer.WritePropertyName("scalingConfiguration"); + context.Writer.WritePropertyName("proxyConfiguration"); context.Writer.WriteObjectStart(); -||||||| Commit version number update changes - if(publicRequest.IsSetScalingConfiguration()) - { - context.Writer.WritePropertyName("scalingConfiguration"); - context.Writer.WriteObjectStart(); -======= - if(publicRequest.IsSetProxyConfiguration()) - { - context.Writer.WritePropertyName("proxyConfiguration"); - context.Writer.WriteObjectStart(); - var marshaller = ProxyConfigurationMarshaller.Instance; - marshaller.Marshall(publicRequest.ProxyConfiguration, context); + var marshaller = ProxyConfigurationMarshaller.Instance; + marshaller.Marshall(publicRequest.ProxyConfiguration, context); - context.Writer.WriteObjectEnd(); - } + context.Writer.WriteObjectEnd(); + } - if(publicRequest.IsSetScalingConfiguration()) - { - context.Writer.WritePropertyName("scalingConfiguration"); - context.Writer.WriteObjectStart(); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b + if(publicRequest.IsSetScalingConfiguration()) + { + context.Writer.WritePropertyName("scalingConfiguration"); + context.Writer.WriteObjectStart(); var marshaller = ScalingConfigurationInputMarshaller.Instance; marshaller.Marshall(publicRequest.ScalingConfiguration, context); diff --git a/sdk/src/Services/CodeBuild/Generated/Model/Internal/MarshallTransformations/UpdateProjectRequestMarshaller.cs b/sdk/src/Services/CodeBuild/Generated/Model/Internal/MarshallTransformations/UpdateProjectRequestMarshaller.cs index 5d7153b32f65..6995494364e2 100644 --- a/sdk/src/Services/CodeBuild/Generated/Model/Internal/MarshallTransformations/UpdateProjectRequestMarshaller.cs +++ b/sdk/src/Services/CodeBuild/Generated/Model/Internal/MarshallTransformations/UpdateProjectRequestMarshaller.cs @@ -76,32 +76,18 @@ public IRequest Marshall(UpdateProjectRequest publicRequest) context.Writer.WritePropertyName("artifacts"); context.Writer.WriteObjectStart(); -<<<<<<< HEAD var marshaller = ProjectArtifactsMarshaller.Instance; marshaller.Marshall(publicRequest.Artifacts, context); -||||||| Commit version number update changes - if(publicRequest.IsSetBadgeEnabled()) - { - context.Writer.WritePropertyName("badgeEnabled"); - context.Writer.Write(publicRequest.BadgeEnabled); - } -======= - if(publicRequest.IsSetAutoRetryLimit()) - { - context.Writer.WritePropertyName("autoRetryLimit"); - context.Writer.Write(publicRequest.AutoRetryLimit); - } - - if(publicRequest.IsSetBadgeEnabled()) - { - context.Writer.WritePropertyName("badgeEnabled"); - context.Writer.Write(publicRequest.BadgeEnabled); - } ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b context.Writer.WriteObjectEnd(); } + if(publicRequest.IsSetAutoRetryLimit()) + { + context.Writer.WritePropertyName("autoRetryLimit"); + context.Writer.Write(publicRequest.AutoRetryLimit.Value); + } + if(publicRequest.IsSetBadgeEnabled()) { context.Writer.WritePropertyName("badgeEnabled"); diff --git a/sdk/src/Services/CodeBuild/Generated/Model/Project.cs b/sdk/src/Services/CodeBuild/Generated/Model/Project.cs index ac59f441906e..a8f881d7d4c7 100644 --- a/sdk/src/Services/CodeBuild/Generated/Model/Project.cs +++ b/sdk/src/Services/CodeBuild/Generated/Model/Project.cs @@ -108,9 +108,9 @@ internal bool IsSetArtifacts() /// to automatically retry your build for up to 2 additional times. /// /// - public int AutoRetryLimit + public int? AutoRetryLimit { - get { return this._autoRetryLimit.GetValueOrDefault(); } + get { return this._autoRetryLimit; } set { this._autoRetryLimit = value; } } diff --git a/sdk/src/Services/CodeBuild/Generated/Model/StartBuildRequest.cs b/sdk/src/Services/CodeBuild/Generated/Model/StartBuildRequest.cs index 28bd2b47775b..c71a89528898 100644 --- a/sdk/src/Services/CodeBuild/Generated/Model/StartBuildRequest.cs +++ b/sdk/src/Services/CodeBuild/Generated/Model/StartBuildRequest.cs @@ -105,9 +105,9 @@ internal bool IsSetArtifactsOverride() /// to automatically retry your build for up to 2 additional times. /// /// - public int AutoRetryLimitOverride + public int? AutoRetryLimitOverride { - get { return this._autoRetryLimitOverride.GetValueOrDefault(); } + get { return this._autoRetryLimitOverride; } set { this._autoRetryLimitOverride = value; } } diff --git a/sdk/src/Services/CodeBuild/Generated/Model/UpdateProjectRequest.cs b/sdk/src/Services/CodeBuild/Generated/Model/UpdateProjectRequest.cs index c31edcd5248a..89aef60ce6bf 100644 --- a/sdk/src/Services/CodeBuild/Generated/Model/UpdateProjectRequest.cs +++ b/sdk/src/Services/CodeBuild/Generated/Model/UpdateProjectRequest.cs @@ -84,9 +84,9 @@ internal bool IsSetArtifacts() /// to automatically retry your build for up to 2 additional times. /// /// - public int AutoRetryLimit + public int? AutoRetryLimit { - get { return this._autoRetryLimit.GetValueOrDefault(); } + get { return this._autoRetryLimit; } set { this._autoRetryLimit = value; } } diff --git a/sdk/src/Services/CodeBuild/Properties/AssemblyInfo.cs b/sdk/src/Services/CodeBuild/Properties/AssemblyInfo.cs index 9a35f84fd631..7b87457f308b 100644 --- a/sdk/src/Services/CodeBuild/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/CodeBuild/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.403.5")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.407.4")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/CodeCatalyst/CodeCatalyst.sln b/sdk/src/Services/CodeCatalyst/CodeCatalyst.sln index 8c2d5c3f24a6..426c620acf37 100644 --- a/sdk/src/Services/CodeCatalyst/CodeCatalyst.sln +++ b/sdk/src/Services/CodeCatalyst/CodeCatalyst.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {30BF377D-D879-4283-9A9C-8660DAD4D922}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {30BF377D-D879-4283-9A9C-8660DAD4D922}.Debug|Any CPU.Build.0 = Debug|Any CPU {30BF377D-D879-4283-9A9C-8660DAD4D922}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {D77F8C27-2D20-4CE3-8289-E6F10AF18D0D}.Debug|Any CPU.Build.0 = Debug|Any CPU {D77F8C27-2D20-4CE3-8289-E6F10AF18D0D}.Release|Any CPU.ActiveCfg = Release|Any CPU {D77F8C27-2D20-4CE3-8289-E6F10AF18D0D}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {C4B0438C-77BC-4F9F-9097-E7795C6D2320}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C4B0438C-77BC-4F9F-9097-E7795C6D2320}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C4B0438C-77BC-4F9F-9097-E7795C6D2320}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C4B0438C-77BC-4F9F-9097-E7795C6D2320}.Release|Any CPU.Build.0 = Release|Any CPU - {68DD7C31-9ABD-4285-8424-2E42B0A84C70}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {68DD7C31-9ABD-4285-8424-2E42B0A84C70}.Debug|Any CPU.Build.0 = Debug|Any CPU - {68DD7C31-9ABD-4285-8424-2E42B0A84C70}.Release|Any CPU.ActiveCfg = Release|Any CPU - {68DD7C31-9ABD-4285-8424-2E42B0A84C70}.Release|Any CPU.Build.0 = Release|Any CPU - {AD59556C-DC31-4315-A9BF-DD58C339DD16}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AD59556C-DC31-4315-A9BF-DD58C339DD16}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AD59556C-DC31-4315-A9BF-DD58C339DD16}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AD59556C-DC31-4315-A9BF-DD58C339DD16}.Release|Any CPU.Build.0 = Release|Any CPU - {73626075-DAF7-4002-9C9D-6EF6A37B0368}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {73626075-DAF7-4002-9C9D-6EF6A37B0368}.Debug|Any CPU.Build.0 = Debug|Any CPU - {73626075-DAF7-4002-9C9D-6EF6A37B0368}.Release|Any CPU.ActiveCfg = Release|Any CPU - {73626075-DAF7-4002-9C9D-6EF6A37B0368}.Release|Any CPU.Build.0 = Release|Any CPU - {97E6A453-4056-4AB4-906B-999E3F494D40}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {97E6A453-4056-4AB4-906B-999E3F494D40}.Debug|Any CPU.Build.0 = Debug|Any CPU - {97E6A453-4056-4AB4-906B-999E3F494D40}.Release|Any CPU.ActiveCfg = Release|Any CPU - {97E6A453-4056-4AB4-906B-999E3F494D40}.Release|Any CPU.Build.0 = Release|Any CPU - {C573876E-A0BC-4EDA-AF88-382DEA7339B9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C573876E-A0BC-4EDA-AF88-382DEA7339B9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C573876E-A0BC-4EDA-AF88-382DEA7339B9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C573876E-A0BC-4EDA-AF88-382DEA7339B9}.Release|Any CPU.Build.0 = Release|Any CPU - {7118A4FC-1905-4277-9BE0-E31810F97BE3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7118A4FC-1905-4277-9BE0-E31810F97BE3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7118A4FC-1905-4277-9BE0-E31810F97BE3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7118A4FC-1905-4277-9BE0-E31810F97BE3}.Release|Any CPU.Build.0 = Release|Any CPU - {BDF1D127-072B-482F-A29E-10CA96AF0D18}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BDF1D127-072B-482F-A29E-10CA96AF0D18}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BDF1D127-072B-482F-A29E-10CA96AF0D18}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BDF1D127-072B-482F-A29E-10CA96AF0D18}.Release|Any CPU.Build.0 = Release|Any CPU - {50221C2F-7EBD-45B0-84C1-4185B995BA63}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {50221C2F-7EBD-45B0-84C1-4185B995BA63}.Debug|Any CPU.Build.0 = Debug|Any CPU - {50221C2F-7EBD-45B0-84C1-4185B995BA63}.Release|Any CPU.ActiveCfg = Release|Any CPU - {50221C2F-7EBD-45B0-84C1-4185B995BA63}.Release|Any CPU.Build.0 = Release|Any CPU - {07EA75A7-1452-4A7C-9687-40E72CC698CF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {07EA75A7-1452-4A7C-9687-40E72CC698CF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {07EA75A7-1452-4A7C-9687-40E72CC698CF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {07EA75A7-1452-4A7C-9687-40E72CC698CF}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {C4B0438C-77BC-4F9F-9097-E7795C6D2320}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C4B0438C-77BC-4F9F-9097-E7795C6D2320}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C4B0438C-77BC-4F9F-9097-E7795C6D2320}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C4B0438C-77BC-4F9F-9097-E7795C6D2320}.Release|Any CPU.Build.0 = Release|Any CPU - {68DD7C31-9ABD-4285-8424-2E42B0A84C70}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {68DD7C31-9ABD-4285-8424-2E42B0A84C70}.Debug|Any CPU.Build.0 = Debug|Any CPU - {68DD7C31-9ABD-4285-8424-2E42B0A84C70}.Release|Any CPU.ActiveCfg = Release|Any CPU - {68DD7C31-9ABD-4285-8424-2E42B0A84C70}.Release|Any CPU.Build.0 = Release|Any CPU - {AD59556C-DC31-4315-A9BF-DD58C339DD16}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AD59556C-DC31-4315-A9BF-DD58C339DD16}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AD59556C-DC31-4315-A9BF-DD58C339DD16}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AD59556C-DC31-4315-A9BF-DD58C339DD16}.Release|Any CPU.Build.0 = Release|Any CPU - {73626075-DAF7-4002-9C9D-6EF6A37B0368}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {73626075-DAF7-4002-9C9D-6EF6A37B0368}.Debug|Any CPU.Build.0 = Debug|Any CPU - {73626075-DAF7-4002-9C9D-6EF6A37B0368}.Release|Any CPU.ActiveCfg = Release|Any CPU - {73626075-DAF7-4002-9C9D-6EF6A37B0368}.Release|Any CPU.Build.0 = Release|Any CPU - {97E6A453-4056-4AB4-906B-999E3F494D40}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {97E6A453-4056-4AB4-906B-999E3F494D40}.Debug|Any CPU.Build.0 = Debug|Any CPU - {97E6A453-4056-4AB4-906B-999E3F494D40}.Release|Any CPU.ActiveCfg = Release|Any CPU - {97E6A453-4056-4AB4-906B-999E3F494D40}.Release|Any CPU.Build.0 = Release|Any CPU - {C573876E-A0BC-4EDA-AF88-382DEA7339B9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C573876E-A0BC-4EDA-AF88-382DEA7339B9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C573876E-A0BC-4EDA-AF88-382DEA7339B9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C573876E-A0BC-4EDA-AF88-382DEA7339B9}.Release|Any CPU.Build.0 = Release|Any CPU - {7118A4FC-1905-4277-9BE0-E31810F97BE3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7118A4FC-1905-4277-9BE0-E31810F97BE3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7118A4FC-1905-4277-9BE0-E31810F97BE3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7118A4FC-1905-4277-9BE0-E31810F97BE3}.Release|Any CPU.Build.0 = Release|Any CPU - {BDF1D127-072B-482F-A29E-10CA96AF0D18}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BDF1D127-072B-482F-A29E-10CA96AF0D18}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BDF1D127-072B-482F-A29E-10CA96AF0D18}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BDF1D127-072B-482F-A29E-10CA96AF0D18}.Release|Any CPU.Build.0 = Release|Any CPU - {50221C2F-7EBD-45B0-84C1-4185B995BA63}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {50221C2F-7EBD-45B0-84C1-4185B995BA63}.Debug|Any CPU.Build.0 = Debug|Any CPU - {50221C2F-7EBD-45B0-84C1-4185B995BA63}.Release|Any CPU.ActiveCfg = Release|Any CPU - {50221C2F-7EBD-45B0-84C1-4185B995BA63}.Release|Any CPU.Build.0 = Release|Any CPU - {07EA75A7-1452-4A7C-9687-40E72CC698CF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {07EA75A7-1452-4A7C-9687-40E72CC698CF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {07EA75A7-1452-4A7C-9687-40E72CC698CF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {07EA75A7-1452-4A7C-9687-40E72CC698CF}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {30BF377D-D879-4283-9A9C-8660DAD4D922} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {E0A4A823-B02C-417B-BCC7-CC5113B919E0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {0B0BA0FF-9587-4BEC-965C-14DB84FCB751} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {48AA2528-FE69-485E-8F38-429AF5A04052} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {D77F8C27-2D20-4CE3-8289-E6F10AF18D0D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {C4B0438C-77BC-4F9F-9097-E7795C6D2320} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {68DD7C31-9ABD-4285-8424-2E42B0A84C70} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {AD59556C-DC31-4315-A9BF-DD58C339DD16} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {73626075-DAF7-4002-9C9D-6EF6A37B0368} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {97E6A453-4056-4AB4-906B-999E3F494D40} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C573876E-A0BC-4EDA-AF88-382DEA7339B9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {7118A4FC-1905-4277-9BE0-E31810F97BE3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {BDF1D127-072B-482F-A29E-10CA96AF0D18} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {50221C2F-7EBD-45B0-84C1-4185B995BA63} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {07EA75A7-1452-4A7C-9687-40E72CC698CF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {C4B0438C-77BC-4F9F-9097-E7795C6D2320} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {68DD7C31-9ABD-4285-8424-2E42B0A84C70} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {AD59556C-DC31-4315-A9BF-DD58C339DD16} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {73626075-DAF7-4002-9C9D-6EF6A37B0368} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {97E6A453-4056-4AB4-906B-999E3F494D40} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C573876E-A0BC-4EDA-AF88-382DEA7339B9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {7118A4FC-1905-4277-9BE0-E31810F97BE3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {BDF1D127-072B-482F-A29E-10CA96AF0D18} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {50221C2F-7EBD-45B0-84C1-4185B995BA63} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {07EA75A7-1452-4A7C-9687-40E72CC698CF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {5F6264EC-4E92-4D22-9105-A4968041C0FC} diff --git a/sdk/src/Services/CodeCatalyst/Generated/AmazonCodeCatalystConfig.cs b/sdk/src/Services/CodeCatalyst/Generated/AmazonCodeCatalystConfig.cs index ec9a88472261..4ae4136bec41 100644 --- a/sdk/src/Services/CodeCatalyst/Generated/AmazonCodeCatalystConfig.cs +++ b/sdk/src/Services/CodeCatalyst/Generated/AmazonCodeCatalystConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.CodeCatalyst public partial class AmazonCodeCatalystConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("CodeCatalyst", "4.0.0.0"); private static readonly AmazonCodeCatalystEndpointResolver EndpointResolver = new AmazonCodeCatalystEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("CodeCatalyst", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("CodeCatalyst", "3.7.400.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/CodeCatalyst/Properties/AssemblyInfo.cs b/sdk/src/Services/CodeCatalyst/Properties/AssemblyInfo.cs index 8704e055ca58..ceddfeecce74 100644 --- a/sdk/src/Services/CodeCatalyst/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/CodeCatalyst/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/CodeCommit/CodeCommit.sln b/sdk/src/Services/CodeCommit/CodeCommit.sln index 10ae668f65e8..aee88e4b8ffb 100644 --- a/sdk/src/Services/CodeCommit/CodeCommit.sln +++ b/sdk/src/Services/CodeCommit/CodeCommit.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {20CF9429-F046-49A3-AFE7-4F14390557C9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {20CF9429-F046-49A3-AFE7-4F14390557C9}.Debug|Any CPU.Build.0 = Debug|Any CPU {20CF9429-F046-49A3-AFE7-4F14390557C9}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {C9705393-9E5E-4DC2-A818-0B2D348E80E6}.Debug|Any CPU.Build.0 = Debug|Any CPU {C9705393-9E5E-4DC2-A818-0B2D348E80E6}.Release|Any CPU.ActiveCfg = Release|Any CPU {C9705393-9E5E-4DC2-A818-0B2D348E80E6}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {7830502A-D8DC-4767-BB66-FF21409146B6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7830502A-D8DC-4767-BB66-FF21409146B6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7830502A-D8DC-4767-BB66-FF21409146B6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7830502A-D8DC-4767-BB66-FF21409146B6}.Release|Any CPU.Build.0 = Release|Any CPU - {5EC299E7-C2D9-4B83-B060-FD9CFE085DE1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5EC299E7-C2D9-4B83-B060-FD9CFE085DE1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5EC299E7-C2D9-4B83-B060-FD9CFE085DE1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5EC299E7-C2D9-4B83-B060-FD9CFE085DE1}.Release|Any CPU.Build.0 = Release|Any CPU - {FCD0916F-1826-4200-A9B3-BFCD4720F529}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FCD0916F-1826-4200-A9B3-BFCD4720F529}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FCD0916F-1826-4200-A9B3-BFCD4720F529}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FCD0916F-1826-4200-A9B3-BFCD4720F529}.Release|Any CPU.Build.0 = Release|Any CPU - {9ED02A20-3532-43D7-A098-EFADAF72710A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9ED02A20-3532-43D7-A098-EFADAF72710A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9ED02A20-3532-43D7-A098-EFADAF72710A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9ED02A20-3532-43D7-A098-EFADAF72710A}.Release|Any CPU.Build.0 = Release|Any CPU - {3C047D57-6246-4B53-9798-A120248943D6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3C047D57-6246-4B53-9798-A120248943D6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3C047D57-6246-4B53-9798-A120248943D6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3C047D57-6246-4B53-9798-A120248943D6}.Release|Any CPU.Build.0 = Release|Any CPU - {E72A4B41-FE77-4212-A9FF-A0D453CC2617}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E72A4B41-FE77-4212-A9FF-A0D453CC2617}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E72A4B41-FE77-4212-A9FF-A0D453CC2617}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E72A4B41-FE77-4212-A9FF-A0D453CC2617}.Release|Any CPU.Build.0 = Release|Any CPU - {1E10BB40-79CC-4EBF-8915-514A2015A696}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1E10BB40-79CC-4EBF-8915-514A2015A696}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1E10BB40-79CC-4EBF-8915-514A2015A696}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1E10BB40-79CC-4EBF-8915-514A2015A696}.Release|Any CPU.Build.0 = Release|Any CPU - {C48B1D77-7776-4F07-BA94-FAFFC29C0C8C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C48B1D77-7776-4F07-BA94-FAFFC29C0C8C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C48B1D77-7776-4F07-BA94-FAFFC29C0C8C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C48B1D77-7776-4F07-BA94-FAFFC29C0C8C}.Release|Any CPU.Build.0 = Release|Any CPU - {FE926603-8058-47F3-9576-32759F73961D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FE926603-8058-47F3-9576-32759F73961D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FE926603-8058-47F3-9576-32759F73961D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FE926603-8058-47F3-9576-32759F73961D}.Release|Any CPU.Build.0 = Release|Any CPU - {8B482FC3-31E6-4AC0-B68F-46B4C22A6BB1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8B482FC3-31E6-4AC0-B68F-46B4C22A6BB1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8B482FC3-31E6-4AC0-B68F-46B4C22A6BB1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8B482FC3-31E6-4AC0-B68F-46B4C22A6BB1}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {7830502A-D8DC-4767-BB66-FF21409146B6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7830502A-D8DC-4767-BB66-FF21409146B6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7830502A-D8DC-4767-BB66-FF21409146B6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7830502A-D8DC-4767-BB66-FF21409146B6}.Release|Any CPU.Build.0 = Release|Any CPU - {5EC299E7-C2D9-4B83-B060-FD9CFE085DE1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5EC299E7-C2D9-4B83-B060-FD9CFE085DE1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5EC299E7-C2D9-4B83-B060-FD9CFE085DE1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5EC299E7-C2D9-4B83-B060-FD9CFE085DE1}.Release|Any CPU.Build.0 = Release|Any CPU - {FCD0916F-1826-4200-A9B3-BFCD4720F529}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FCD0916F-1826-4200-A9B3-BFCD4720F529}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FCD0916F-1826-4200-A9B3-BFCD4720F529}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FCD0916F-1826-4200-A9B3-BFCD4720F529}.Release|Any CPU.Build.0 = Release|Any CPU - {9ED02A20-3532-43D7-A098-EFADAF72710A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9ED02A20-3532-43D7-A098-EFADAF72710A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9ED02A20-3532-43D7-A098-EFADAF72710A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9ED02A20-3532-43D7-A098-EFADAF72710A}.Release|Any CPU.Build.0 = Release|Any CPU - {3C047D57-6246-4B53-9798-A120248943D6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3C047D57-6246-4B53-9798-A120248943D6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3C047D57-6246-4B53-9798-A120248943D6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3C047D57-6246-4B53-9798-A120248943D6}.Release|Any CPU.Build.0 = Release|Any CPU - {E72A4B41-FE77-4212-A9FF-A0D453CC2617}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E72A4B41-FE77-4212-A9FF-A0D453CC2617}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E72A4B41-FE77-4212-A9FF-A0D453CC2617}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E72A4B41-FE77-4212-A9FF-A0D453CC2617}.Release|Any CPU.Build.0 = Release|Any CPU - {1E10BB40-79CC-4EBF-8915-514A2015A696}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1E10BB40-79CC-4EBF-8915-514A2015A696}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1E10BB40-79CC-4EBF-8915-514A2015A696}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1E10BB40-79CC-4EBF-8915-514A2015A696}.Release|Any CPU.Build.0 = Release|Any CPU - {C48B1D77-7776-4F07-BA94-FAFFC29C0C8C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C48B1D77-7776-4F07-BA94-FAFFC29C0C8C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C48B1D77-7776-4F07-BA94-FAFFC29C0C8C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C48B1D77-7776-4F07-BA94-FAFFC29C0C8C}.Release|Any CPU.Build.0 = Release|Any CPU - {FE926603-8058-47F3-9576-32759F73961D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FE926603-8058-47F3-9576-32759F73961D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FE926603-8058-47F3-9576-32759F73961D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FE926603-8058-47F3-9576-32759F73961D}.Release|Any CPU.Build.0 = Release|Any CPU - {8B482FC3-31E6-4AC0-B68F-46B4C22A6BB1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8B482FC3-31E6-4AC0-B68F-46B4C22A6BB1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8B482FC3-31E6-4AC0-B68F-46B4C22A6BB1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8B482FC3-31E6-4AC0-B68F-46B4C22A6BB1}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {20CF9429-F046-49A3-AFE7-4F14390557C9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {448BC3A6-3183-4629-BEB0-E4A47A6FF8AD} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {C52FE64D-30FB-4C25-B61B-5BAE7DBFEB3A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {CC2F99E2-C569-4693-90D9-1A7C21BD7853} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {C9705393-9E5E-4DC2-A818-0B2D348E80E6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {7830502A-D8DC-4767-BB66-FF21409146B6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {5EC299E7-C2D9-4B83-B060-FD9CFE085DE1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {FCD0916F-1826-4200-A9B3-BFCD4720F529} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {9ED02A20-3532-43D7-A098-EFADAF72710A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {3C047D57-6246-4B53-9798-A120248943D6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E72A4B41-FE77-4212-A9FF-A0D453CC2617} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {1E10BB40-79CC-4EBF-8915-514A2015A696} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C48B1D77-7776-4F07-BA94-FAFFC29C0C8C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {FE926603-8058-47F3-9576-32759F73961D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8B482FC3-31E6-4AC0-B68F-46B4C22A6BB1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {7830502A-D8DC-4767-BB66-FF21409146B6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {5EC299E7-C2D9-4B83-B060-FD9CFE085DE1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {FCD0916F-1826-4200-A9B3-BFCD4720F529} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {9ED02A20-3532-43D7-A098-EFADAF72710A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {3C047D57-6246-4B53-9798-A120248943D6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E72A4B41-FE77-4212-A9FF-A0D453CC2617} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {1E10BB40-79CC-4EBF-8915-514A2015A696} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C48B1D77-7776-4F07-BA94-FAFFC29C0C8C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {FE926603-8058-47F3-9576-32759F73961D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8B482FC3-31E6-4AC0-B68F-46B4C22A6BB1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {11D38D42-810B-46DB-9362-DDF71EB48F0A} diff --git a/sdk/src/Services/CodeCommit/Generated/AmazonCodeCommitConfig.cs b/sdk/src/Services/CodeCommit/Generated/AmazonCodeCommitConfig.cs index f0d0bd1400c8..e8094367a889 100644 --- a/sdk/src/Services/CodeCommit/Generated/AmazonCodeCommitConfig.cs +++ b/sdk/src/Services/CodeCommit/Generated/AmazonCodeCommitConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.CodeCommit public partial class AmazonCodeCommitConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("CodeCommit", "4.0.0.0"); private static readonly AmazonCodeCommitEndpointResolver EndpointResolver = new AmazonCodeCommitEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("CodeCommit", "3.7.401.26"); -======= - InternalSDKUtils.BuildUserAgentString("CodeCommit", "3.7.401.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/CodeCommit/Properties/AssemblyInfo.cs b/sdk/src/Services/CodeCommit/Properties/AssemblyInfo.cs index 9ce8bfb2b13b..13f11ff0b72b 100644 --- a/sdk/src/Services/CodeCommit/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/CodeCommit/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/CodeConnections/CodeConnections.sln b/sdk/src/Services/CodeConnections/CodeConnections.sln index d52ce40b5f0f..d456a8821e62 100644 --- a/sdk/src/Services/CodeConnections/CodeConnections.sln +++ b/sdk/src/Services/CodeConnections/CodeConnections.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {623082DD-526E-4B36-9FAF-EB0D0843ABE0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {623082DD-526E-4B36-9FAF-EB0D0843ABE0}.Debug|Any CPU.Build.0 = Debug|Any CPU {623082DD-526E-4B36-9FAF-EB0D0843ABE0}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {58206D28-8EF4-4754-8204-31031E7DB4F2}.Debug|Any CPU.Build.0 = Debug|Any CPU {58206D28-8EF4-4754-8204-31031E7DB4F2}.Release|Any CPU.ActiveCfg = Release|Any CPU {58206D28-8EF4-4754-8204-31031E7DB4F2}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {03D770DF-7D83-4C1B-8B0F-E6115A379F60}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {03D770DF-7D83-4C1B-8B0F-E6115A379F60}.Debug|Any CPU.Build.0 = Debug|Any CPU - {03D770DF-7D83-4C1B-8B0F-E6115A379F60}.Release|Any CPU.ActiveCfg = Release|Any CPU - {03D770DF-7D83-4C1B-8B0F-E6115A379F60}.Release|Any CPU.Build.0 = Release|Any CPU - {DB2A7FC2-F102-4E24-9BC5-0D3AD6F5F069}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DB2A7FC2-F102-4E24-9BC5-0D3AD6F5F069}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DB2A7FC2-F102-4E24-9BC5-0D3AD6F5F069}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DB2A7FC2-F102-4E24-9BC5-0D3AD6F5F069}.Release|Any CPU.Build.0 = Release|Any CPU - {6000E832-2E76-4763-B02F-CC1D6CE64896}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6000E832-2E76-4763-B02F-CC1D6CE64896}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6000E832-2E76-4763-B02F-CC1D6CE64896}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6000E832-2E76-4763-B02F-CC1D6CE64896}.Release|Any CPU.Build.0 = Release|Any CPU - {CB5DACC2-320F-4E2D-9B95-C5374963F87E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CB5DACC2-320F-4E2D-9B95-C5374963F87E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CB5DACC2-320F-4E2D-9B95-C5374963F87E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CB5DACC2-320F-4E2D-9B95-C5374963F87E}.Release|Any CPU.Build.0 = Release|Any CPU - {C14F9DA2-A563-41D0-B385-22B66D3751EC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C14F9DA2-A563-41D0-B385-22B66D3751EC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C14F9DA2-A563-41D0-B385-22B66D3751EC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C14F9DA2-A563-41D0-B385-22B66D3751EC}.Release|Any CPU.Build.0 = Release|Any CPU - {29401107-8038-4454-A1AB-F31BBBD3BD2C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {29401107-8038-4454-A1AB-F31BBBD3BD2C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {29401107-8038-4454-A1AB-F31BBBD3BD2C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {29401107-8038-4454-A1AB-F31BBBD3BD2C}.Release|Any CPU.Build.0 = Release|Any CPU - {6A84804A-F4F5-4FB3-BE85-DDF2108C0C06}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6A84804A-F4F5-4FB3-BE85-DDF2108C0C06}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6A84804A-F4F5-4FB3-BE85-DDF2108C0C06}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6A84804A-F4F5-4FB3-BE85-DDF2108C0C06}.Release|Any CPU.Build.0 = Release|Any CPU - {720FAE01-3C4F-4F6B-BA87-201794F8BD67}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {720FAE01-3C4F-4F6B-BA87-201794F8BD67}.Debug|Any CPU.Build.0 = Debug|Any CPU - {720FAE01-3C4F-4F6B-BA87-201794F8BD67}.Release|Any CPU.ActiveCfg = Release|Any CPU - {720FAE01-3C4F-4F6B-BA87-201794F8BD67}.Release|Any CPU.Build.0 = Release|Any CPU - {9E4743D8-2E23-4266-96AB-5E5D9E39511A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9E4743D8-2E23-4266-96AB-5E5D9E39511A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9E4743D8-2E23-4266-96AB-5E5D9E39511A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9E4743D8-2E23-4266-96AB-5E5D9E39511A}.Release|Any CPU.Build.0 = Release|Any CPU - {557E7724-2694-4371-8E84-C8C7D2DFA485}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {557E7724-2694-4371-8E84-C8C7D2DFA485}.Debug|Any CPU.Build.0 = Debug|Any CPU - {557E7724-2694-4371-8E84-C8C7D2DFA485}.Release|Any CPU.ActiveCfg = Release|Any CPU - {557E7724-2694-4371-8E84-C8C7D2DFA485}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {03D770DF-7D83-4C1B-8B0F-E6115A379F60}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {03D770DF-7D83-4C1B-8B0F-E6115A379F60}.Debug|Any CPU.Build.0 = Debug|Any CPU - {03D770DF-7D83-4C1B-8B0F-E6115A379F60}.Release|Any CPU.ActiveCfg = Release|Any CPU - {03D770DF-7D83-4C1B-8B0F-E6115A379F60}.Release|Any CPU.Build.0 = Release|Any CPU - {DB2A7FC2-F102-4E24-9BC5-0D3AD6F5F069}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DB2A7FC2-F102-4E24-9BC5-0D3AD6F5F069}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DB2A7FC2-F102-4E24-9BC5-0D3AD6F5F069}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DB2A7FC2-F102-4E24-9BC5-0D3AD6F5F069}.Release|Any CPU.Build.0 = Release|Any CPU - {6000E832-2E76-4763-B02F-CC1D6CE64896}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6000E832-2E76-4763-B02F-CC1D6CE64896}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6000E832-2E76-4763-B02F-CC1D6CE64896}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6000E832-2E76-4763-B02F-CC1D6CE64896}.Release|Any CPU.Build.0 = Release|Any CPU - {CB5DACC2-320F-4E2D-9B95-C5374963F87E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CB5DACC2-320F-4E2D-9B95-C5374963F87E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CB5DACC2-320F-4E2D-9B95-C5374963F87E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CB5DACC2-320F-4E2D-9B95-C5374963F87E}.Release|Any CPU.Build.0 = Release|Any CPU - {C14F9DA2-A563-41D0-B385-22B66D3751EC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C14F9DA2-A563-41D0-B385-22B66D3751EC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C14F9DA2-A563-41D0-B385-22B66D3751EC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C14F9DA2-A563-41D0-B385-22B66D3751EC}.Release|Any CPU.Build.0 = Release|Any CPU - {29401107-8038-4454-A1AB-F31BBBD3BD2C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {29401107-8038-4454-A1AB-F31BBBD3BD2C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {29401107-8038-4454-A1AB-F31BBBD3BD2C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {29401107-8038-4454-A1AB-F31BBBD3BD2C}.Release|Any CPU.Build.0 = Release|Any CPU - {6A84804A-F4F5-4FB3-BE85-DDF2108C0C06}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6A84804A-F4F5-4FB3-BE85-DDF2108C0C06}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6A84804A-F4F5-4FB3-BE85-DDF2108C0C06}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6A84804A-F4F5-4FB3-BE85-DDF2108C0C06}.Release|Any CPU.Build.0 = Release|Any CPU - {720FAE01-3C4F-4F6B-BA87-201794F8BD67}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {720FAE01-3C4F-4F6B-BA87-201794F8BD67}.Debug|Any CPU.Build.0 = Debug|Any CPU - {720FAE01-3C4F-4F6B-BA87-201794F8BD67}.Release|Any CPU.ActiveCfg = Release|Any CPU - {720FAE01-3C4F-4F6B-BA87-201794F8BD67}.Release|Any CPU.Build.0 = Release|Any CPU - {9E4743D8-2E23-4266-96AB-5E5D9E39511A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9E4743D8-2E23-4266-96AB-5E5D9E39511A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9E4743D8-2E23-4266-96AB-5E5D9E39511A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9E4743D8-2E23-4266-96AB-5E5D9E39511A}.Release|Any CPU.Build.0 = Release|Any CPU - {557E7724-2694-4371-8E84-C8C7D2DFA485}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {557E7724-2694-4371-8E84-C8C7D2DFA485}.Debug|Any CPU.Build.0 = Debug|Any CPU - {557E7724-2694-4371-8E84-C8C7D2DFA485}.Release|Any CPU.ActiveCfg = Release|Any CPU - {557E7724-2694-4371-8E84-C8C7D2DFA485}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {623082DD-526E-4B36-9FAF-EB0D0843ABE0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {BF7CFE3F-6482-4470-8CAA-AF44BA2E6EFE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {73CB30F2-F8A0-4013-95E3-73C3C73B1B07} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {65BBFDF2-BC23-40A3-9E92-FC3DFFFF06B1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {58206D28-8EF4-4754-8204-31031E7DB4F2} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {03D770DF-7D83-4C1B-8B0F-E6115A379F60} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {DB2A7FC2-F102-4E24-9BC5-0D3AD6F5F069} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6000E832-2E76-4763-B02F-CC1D6CE64896} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {CB5DACC2-320F-4E2D-9B95-C5374963F87E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C14F9DA2-A563-41D0-B385-22B66D3751EC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {29401107-8038-4454-A1AB-F31BBBD3BD2C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6A84804A-F4F5-4FB3-BE85-DDF2108C0C06} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {720FAE01-3C4F-4F6B-BA87-201794F8BD67} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {9E4743D8-2E23-4266-96AB-5E5D9E39511A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {557E7724-2694-4371-8E84-C8C7D2DFA485} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {03D770DF-7D83-4C1B-8B0F-E6115A379F60} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {DB2A7FC2-F102-4E24-9BC5-0D3AD6F5F069} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6000E832-2E76-4763-B02F-CC1D6CE64896} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {CB5DACC2-320F-4E2D-9B95-C5374963F87E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C14F9DA2-A563-41D0-B385-22B66D3751EC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {29401107-8038-4454-A1AB-F31BBBD3BD2C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6A84804A-F4F5-4FB3-BE85-DDF2108C0C06} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {720FAE01-3C4F-4F6B-BA87-201794F8BD67} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {9E4743D8-2E23-4266-96AB-5E5D9E39511A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {557E7724-2694-4371-8E84-C8C7D2DFA485} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {4BC10F49-1C69-4FF2-8F67-4D7E7ADDA8BA} diff --git a/sdk/src/Services/CodeConnections/Generated/AmazonCodeConnectionsConfig.cs b/sdk/src/Services/CodeConnections/Generated/AmazonCodeConnectionsConfig.cs index 2a283ae919c7..1fc3562e5a49 100644 --- a/sdk/src/Services/CodeConnections/Generated/AmazonCodeConnectionsConfig.cs +++ b/sdk/src/Services/CodeConnections/Generated/AmazonCodeConnectionsConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.CodeConnections public partial class AmazonCodeConnectionsConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("CodeConnections", "4.0.0.0"); private static readonly AmazonCodeConnectionsEndpointResolver EndpointResolver = new AmazonCodeConnectionsEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("CodeConnections", "3.7.401.5"); -======= - InternalSDKUtils.BuildUserAgentString("CodeConnections", "3.7.401.32"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/CodeConnections/Properties/AssemblyInfo.cs b/sdk/src/Services/CodeConnections/Properties/AssemblyInfo.cs index 45fdf3cf3cb4..46116a4f7f51 100644 --- a/sdk/src/Services/CodeConnections/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/CodeConnections/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.5")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.32")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/CodeDeploy/CodeDeploy.sln b/sdk/src/Services/CodeDeploy/CodeDeploy.sln index cfe8c3f904d4..6885b269f6bc 100644 --- a/sdk/src/Services/CodeDeploy/CodeDeploy.sln +++ b/sdk/src/Services/CodeDeploy/CodeDeploy.sln @@ -92,7 +92,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {6BAC7710-E6A7-4B40-ADC5-E816CC0D7856}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {6BAC7710-E6A7-4B40-ADC5-E816CC0D7856}.Debug|Any CPU.Build.0 = Debug|Any CPU {6BAC7710-E6A7-4B40-ADC5-E816CC0D7856}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -113,97 +120,6 @@ Global {28B0F7FD-77F1-4123-ABE0-7027824AE850}.Debug|Any CPU.Build.0 = Debug|Any CPU {28B0F7FD-77F1-4123-ABE0-7027824AE850}.Release|Any CPU.ActiveCfg = Release|Any CPU {28B0F7FD-77F1-4123-ABE0-7027824AE850}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {294559CA-E56B-4DAB-BAAD-6BA62B38F212}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {294559CA-E56B-4DAB-BAAD-6BA62B38F212}.Debug|Any CPU.Build.0 = Debug|Any CPU - {294559CA-E56B-4DAB-BAAD-6BA62B38F212}.Release|Any CPU.ActiveCfg = Release|Any CPU - {294559CA-E56B-4DAB-BAAD-6BA62B38F212}.Release|Any CPU.Build.0 = Release|Any CPU - {BC46EBAC-A2F5-49C0-939F-E797CB1304EC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BC46EBAC-A2F5-49C0-939F-E797CB1304EC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BC46EBAC-A2F5-49C0-939F-E797CB1304EC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BC46EBAC-A2F5-49C0-939F-E797CB1304EC}.Release|Any CPU.Build.0 = Release|Any CPU - {0C9B3873-F178-4643-9C57-2B07C3B86C6A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0C9B3873-F178-4643-9C57-2B07C3B86C6A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0C9B3873-F178-4643-9C57-2B07C3B86C6A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0C9B3873-F178-4643-9C57-2B07C3B86C6A}.Release|Any CPU.Build.0 = Release|Any CPU - {B1A8A1FE-5126-49F2-A619-0977F6AA97B0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B1A8A1FE-5126-49F2-A619-0977F6AA97B0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B1A8A1FE-5126-49F2-A619-0977F6AA97B0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B1A8A1FE-5126-49F2-A619-0977F6AA97B0}.Release|Any CPU.Build.0 = Release|Any CPU - {B454B40B-1AC4-438C-8E43-6CE29744BEC7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B454B40B-1AC4-438C-8E43-6CE29744BEC7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B454B40B-1AC4-438C-8E43-6CE29744BEC7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B454B40B-1AC4-438C-8E43-6CE29744BEC7}.Release|Any CPU.Build.0 = Release|Any CPU - {F00F5F2E-FA8E-4EFE-8E23-02BC125BFB9E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F00F5F2E-FA8E-4EFE-8E23-02BC125BFB9E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F00F5F2E-FA8E-4EFE-8E23-02BC125BFB9E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F00F5F2E-FA8E-4EFE-8E23-02BC125BFB9E}.Release|Any CPU.Build.0 = Release|Any CPU - {8550C332-C733-4F78-97F2-8B492CE2EA1C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8550C332-C733-4F78-97F2-8B492CE2EA1C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8550C332-C733-4F78-97F2-8B492CE2EA1C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8550C332-C733-4F78-97F2-8B492CE2EA1C}.Release|Any CPU.Build.0 = Release|Any CPU - {5561FE01-4082-4EFF-A911-A575922C4196}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5561FE01-4082-4EFF-A911-A575922C4196}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5561FE01-4082-4EFF-A911-A575922C4196}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5561FE01-4082-4EFF-A911-A575922C4196}.Release|Any CPU.Build.0 = Release|Any CPU - {918F43B9-2B25-43CC-B5F7-C35477DAA9ED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {918F43B9-2B25-43CC-B5F7-C35477DAA9ED}.Debug|Any CPU.Build.0 = Debug|Any CPU - {918F43B9-2B25-43CC-B5F7-C35477DAA9ED}.Release|Any CPU.ActiveCfg = Release|Any CPU - {918F43B9-2B25-43CC-B5F7-C35477DAA9ED}.Release|Any CPU.Build.0 = Release|Any CPU - {71FD5193-27C7-454A-BB55-C64DDA33B547}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {71FD5193-27C7-454A-BB55-C64DDA33B547}.Debug|Any CPU.Build.0 = Debug|Any CPU - {71FD5193-27C7-454A-BB55-C64DDA33B547}.Release|Any CPU.ActiveCfg = Release|Any CPU - {71FD5193-27C7-454A-BB55-C64DDA33B547}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {294559CA-E56B-4DAB-BAAD-6BA62B38F212}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {294559CA-E56B-4DAB-BAAD-6BA62B38F212}.Debug|Any CPU.Build.0 = Debug|Any CPU - {294559CA-E56B-4DAB-BAAD-6BA62B38F212}.Release|Any CPU.ActiveCfg = Release|Any CPU - {294559CA-E56B-4DAB-BAAD-6BA62B38F212}.Release|Any CPU.Build.0 = Release|Any CPU - {BC46EBAC-A2F5-49C0-939F-E797CB1304EC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BC46EBAC-A2F5-49C0-939F-E797CB1304EC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BC46EBAC-A2F5-49C0-939F-E797CB1304EC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BC46EBAC-A2F5-49C0-939F-E797CB1304EC}.Release|Any CPU.Build.0 = Release|Any CPU - {0C9B3873-F178-4643-9C57-2B07C3B86C6A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0C9B3873-F178-4643-9C57-2B07C3B86C6A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0C9B3873-F178-4643-9C57-2B07C3B86C6A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0C9B3873-F178-4643-9C57-2B07C3B86C6A}.Release|Any CPU.Build.0 = Release|Any CPU - {B1A8A1FE-5126-49F2-A619-0977F6AA97B0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B1A8A1FE-5126-49F2-A619-0977F6AA97B0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B1A8A1FE-5126-49F2-A619-0977F6AA97B0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B1A8A1FE-5126-49F2-A619-0977F6AA97B0}.Release|Any CPU.Build.0 = Release|Any CPU - {B454B40B-1AC4-438C-8E43-6CE29744BEC7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B454B40B-1AC4-438C-8E43-6CE29744BEC7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B454B40B-1AC4-438C-8E43-6CE29744BEC7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B454B40B-1AC4-438C-8E43-6CE29744BEC7}.Release|Any CPU.Build.0 = Release|Any CPU - {F00F5F2E-FA8E-4EFE-8E23-02BC125BFB9E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F00F5F2E-FA8E-4EFE-8E23-02BC125BFB9E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F00F5F2E-FA8E-4EFE-8E23-02BC125BFB9E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F00F5F2E-FA8E-4EFE-8E23-02BC125BFB9E}.Release|Any CPU.Build.0 = Release|Any CPU - {8550C332-C733-4F78-97F2-8B492CE2EA1C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8550C332-C733-4F78-97F2-8B492CE2EA1C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8550C332-C733-4F78-97F2-8B492CE2EA1C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8550C332-C733-4F78-97F2-8B492CE2EA1C}.Release|Any CPU.Build.0 = Release|Any CPU - {5561FE01-4082-4EFF-A911-A575922C4196}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5561FE01-4082-4EFF-A911-A575922C4196}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5561FE01-4082-4EFF-A911-A575922C4196}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5561FE01-4082-4EFF-A911-A575922C4196}.Release|Any CPU.Build.0 = Release|Any CPU - {918F43B9-2B25-43CC-B5F7-C35477DAA9ED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {918F43B9-2B25-43CC-B5F7-C35477DAA9ED}.Debug|Any CPU.Build.0 = Debug|Any CPU - {918F43B9-2B25-43CC-B5F7-C35477DAA9ED}.Release|Any CPU.ActiveCfg = Release|Any CPU - {918F43B9-2B25-43CC-B5F7-C35477DAA9ED}.Release|Any CPU.Build.0 = Release|Any CPU - {71FD5193-27C7-454A-BB55-C64DDA33B547}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {71FD5193-27C7-454A-BB55-C64DDA33B547}.Debug|Any CPU.Build.0 = Debug|Any CPU - {71FD5193-27C7-454A-BB55-C64DDA33B547}.Release|Any CPU.ActiveCfg = Release|Any CPU - {71FD5193-27C7-454A-BB55-C64DDA33B547}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -220,37 +136,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {6BAC7710-E6A7-4B40-ADC5-E816CC0D7856} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {84C5DC1D-446E-46B5-8D07-870E852F698A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {E40019D1-FB32-41EF-BC04-F9CE95D83096} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {00098DC2-6EE5-4F3A-9A82-E766AF3C7687} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {28B0F7FD-77F1-4123-ABE0-7027824AE850} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {294559CA-E56B-4DAB-BAAD-6BA62B38F212} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {BC46EBAC-A2F5-49C0-939F-E797CB1304EC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0C9B3873-F178-4643-9C57-2B07C3B86C6A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B1A8A1FE-5126-49F2-A619-0977F6AA97B0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B454B40B-1AC4-438C-8E43-6CE29744BEC7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F00F5F2E-FA8E-4EFE-8E23-02BC125BFB9E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8550C332-C733-4F78-97F2-8B492CE2EA1C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {5561FE01-4082-4EFF-A911-A575922C4196} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {918F43B9-2B25-43CC-B5F7-C35477DAA9ED} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {71FD5193-27C7-454A-BB55-C64DDA33B547} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {294559CA-E56B-4DAB-BAAD-6BA62B38F212} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {BC46EBAC-A2F5-49C0-939F-E797CB1304EC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0C9B3873-F178-4643-9C57-2B07C3B86C6A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B1A8A1FE-5126-49F2-A619-0977F6AA97B0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B454B40B-1AC4-438C-8E43-6CE29744BEC7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F00F5F2E-FA8E-4EFE-8E23-02BC125BFB9E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8550C332-C733-4F78-97F2-8B492CE2EA1C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {5561FE01-4082-4EFF-A911-A575922C4196} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {918F43B9-2B25-43CC-B5F7-C35477DAA9ED} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {71FD5193-27C7-454A-BB55-C64DDA33B547} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {57AB46C5-9F39-45CB-AC41-8A200C592909} diff --git a/sdk/src/Services/CodeDeploy/Generated/AmazonCodeDeployConfig.cs b/sdk/src/Services/CodeDeploy/Generated/AmazonCodeDeployConfig.cs index bb896586cf61..2b683d7658f8 100644 --- a/sdk/src/Services/CodeDeploy/Generated/AmazonCodeDeployConfig.cs +++ b/sdk/src/Services/CodeDeploy/Generated/AmazonCodeDeployConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.CodeDeploy public partial class AmazonCodeDeployConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("CodeDeploy", "4.0.0.0"); private static readonly AmazonCodeDeployEndpointResolver EndpointResolver = new AmazonCodeDeployEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("CodeDeploy", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("CodeDeploy", "3.7.400.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/CodeDeploy/Properties/AssemblyInfo.cs b/sdk/src/Services/CodeDeploy/Properties/AssemblyInfo.cs index a278899cb073..b81b1c3b812a 100644 --- a/sdk/src/Services/CodeDeploy/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/CodeDeploy/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/CodeGuruProfiler/CodeGuruProfiler.sln b/sdk/src/Services/CodeGuruProfiler/CodeGuruProfiler.sln index 9a69d5a6adf8..efa230dcbe24 100644 --- a/sdk/src/Services/CodeGuruProfiler/CodeGuruProfiler.sln +++ b/sdk/src/Services/CodeGuruProfiler/CodeGuruProfiler.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {3F983C50-6916-4E84-ABE7-EA2656D02C0B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {3F983C50-6916-4E84-ABE7-EA2656D02C0B}.Debug|Any CPU.Build.0 = Debug|Any CPU {3F983C50-6916-4E84-ABE7-EA2656D02C0B}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {E02B3953-F433-4097-B079-E66ED980F77D}.Debug|Any CPU.Build.0 = Debug|Any CPU {E02B3953-F433-4097-B079-E66ED980F77D}.Release|Any CPU.ActiveCfg = Release|Any CPU {E02B3953-F433-4097-B079-E66ED980F77D}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {2D6D50C4-472D-4EEB-837A-DE7D16C9372A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2D6D50C4-472D-4EEB-837A-DE7D16C9372A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2D6D50C4-472D-4EEB-837A-DE7D16C9372A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2D6D50C4-472D-4EEB-837A-DE7D16C9372A}.Release|Any CPU.Build.0 = Release|Any CPU - {94358CA6-46C9-44CA-A33D-48F35FC53641}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {94358CA6-46C9-44CA-A33D-48F35FC53641}.Debug|Any CPU.Build.0 = Debug|Any CPU - {94358CA6-46C9-44CA-A33D-48F35FC53641}.Release|Any CPU.ActiveCfg = Release|Any CPU - {94358CA6-46C9-44CA-A33D-48F35FC53641}.Release|Any CPU.Build.0 = Release|Any CPU - {ECD94BB2-1312-4565-BB3B-2C25203740E7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {ECD94BB2-1312-4565-BB3B-2C25203740E7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {ECD94BB2-1312-4565-BB3B-2C25203740E7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {ECD94BB2-1312-4565-BB3B-2C25203740E7}.Release|Any CPU.Build.0 = Release|Any CPU - {08F35224-723D-4C86-8C71-E6CA8BBE1A90}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {08F35224-723D-4C86-8C71-E6CA8BBE1A90}.Debug|Any CPU.Build.0 = Debug|Any CPU - {08F35224-723D-4C86-8C71-E6CA8BBE1A90}.Release|Any CPU.ActiveCfg = Release|Any CPU - {08F35224-723D-4C86-8C71-E6CA8BBE1A90}.Release|Any CPU.Build.0 = Release|Any CPU - {2D31B97F-D10D-4D7F-B7D7-2D54061AB357}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2D31B97F-D10D-4D7F-B7D7-2D54061AB357}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2D31B97F-D10D-4D7F-B7D7-2D54061AB357}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2D31B97F-D10D-4D7F-B7D7-2D54061AB357}.Release|Any CPU.Build.0 = Release|Any CPU - {5790F39C-D9CA-40C6-9AA4-0B7878789B84}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5790F39C-D9CA-40C6-9AA4-0B7878789B84}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5790F39C-D9CA-40C6-9AA4-0B7878789B84}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5790F39C-D9CA-40C6-9AA4-0B7878789B84}.Release|Any CPU.Build.0 = Release|Any CPU - {DBCDA7E7-8AB1-4F8C-BAB4-C7FC1F1A37E8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DBCDA7E7-8AB1-4F8C-BAB4-C7FC1F1A37E8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DBCDA7E7-8AB1-4F8C-BAB4-C7FC1F1A37E8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DBCDA7E7-8AB1-4F8C-BAB4-C7FC1F1A37E8}.Release|Any CPU.Build.0 = Release|Any CPU - {D6B5FF83-1677-451C-B4B8-DE2365A8E65A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D6B5FF83-1677-451C-B4B8-DE2365A8E65A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D6B5FF83-1677-451C-B4B8-DE2365A8E65A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D6B5FF83-1677-451C-B4B8-DE2365A8E65A}.Release|Any CPU.Build.0 = Release|Any CPU - {DE8D9F82-804E-48EF-BAC6-13167AC8FD78}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DE8D9F82-804E-48EF-BAC6-13167AC8FD78}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DE8D9F82-804E-48EF-BAC6-13167AC8FD78}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DE8D9F82-804E-48EF-BAC6-13167AC8FD78}.Release|Any CPU.Build.0 = Release|Any CPU - {540C3B40-DBC0-4EEC-BC53-A1EB46ECC413}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {540C3B40-DBC0-4EEC-BC53-A1EB46ECC413}.Debug|Any CPU.Build.0 = Debug|Any CPU - {540C3B40-DBC0-4EEC-BC53-A1EB46ECC413}.Release|Any CPU.ActiveCfg = Release|Any CPU - {540C3B40-DBC0-4EEC-BC53-A1EB46ECC413}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {2D6D50C4-472D-4EEB-837A-DE7D16C9372A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2D6D50C4-472D-4EEB-837A-DE7D16C9372A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2D6D50C4-472D-4EEB-837A-DE7D16C9372A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2D6D50C4-472D-4EEB-837A-DE7D16C9372A}.Release|Any CPU.Build.0 = Release|Any CPU - {94358CA6-46C9-44CA-A33D-48F35FC53641}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {94358CA6-46C9-44CA-A33D-48F35FC53641}.Debug|Any CPU.Build.0 = Debug|Any CPU - {94358CA6-46C9-44CA-A33D-48F35FC53641}.Release|Any CPU.ActiveCfg = Release|Any CPU - {94358CA6-46C9-44CA-A33D-48F35FC53641}.Release|Any CPU.Build.0 = Release|Any CPU - {ECD94BB2-1312-4565-BB3B-2C25203740E7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {ECD94BB2-1312-4565-BB3B-2C25203740E7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {ECD94BB2-1312-4565-BB3B-2C25203740E7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {ECD94BB2-1312-4565-BB3B-2C25203740E7}.Release|Any CPU.Build.0 = Release|Any CPU - {08F35224-723D-4C86-8C71-E6CA8BBE1A90}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {08F35224-723D-4C86-8C71-E6CA8BBE1A90}.Debug|Any CPU.Build.0 = Debug|Any CPU - {08F35224-723D-4C86-8C71-E6CA8BBE1A90}.Release|Any CPU.ActiveCfg = Release|Any CPU - {08F35224-723D-4C86-8C71-E6CA8BBE1A90}.Release|Any CPU.Build.0 = Release|Any CPU - {2D31B97F-D10D-4D7F-B7D7-2D54061AB357}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2D31B97F-D10D-4D7F-B7D7-2D54061AB357}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2D31B97F-D10D-4D7F-B7D7-2D54061AB357}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2D31B97F-D10D-4D7F-B7D7-2D54061AB357}.Release|Any CPU.Build.0 = Release|Any CPU - {5790F39C-D9CA-40C6-9AA4-0B7878789B84}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5790F39C-D9CA-40C6-9AA4-0B7878789B84}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5790F39C-D9CA-40C6-9AA4-0B7878789B84}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5790F39C-D9CA-40C6-9AA4-0B7878789B84}.Release|Any CPU.Build.0 = Release|Any CPU - {DBCDA7E7-8AB1-4F8C-BAB4-C7FC1F1A37E8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DBCDA7E7-8AB1-4F8C-BAB4-C7FC1F1A37E8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DBCDA7E7-8AB1-4F8C-BAB4-C7FC1F1A37E8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DBCDA7E7-8AB1-4F8C-BAB4-C7FC1F1A37E8}.Release|Any CPU.Build.0 = Release|Any CPU - {D6B5FF83-1677-451C-B4B8-DE2365A8E65A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D6B5FF83-1677-451C-B4B8-DE2365A8E65A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D6B5FF83-1677-451C-B4B8-DE2365A8E65A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D6B5FF83-1677-451C-B4B8-DE2365A8E65A}.Release|Any CPU.Build.0 = Release|Any CPU - {DE8D9F82-804E-48EF-BAC6-13167AC8FD78}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DE8D9F82-804E-48EF-BAC6-13167AC8FD78}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DE8D9F82-804E-48EF-BAC6-13167AC8FD78}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DE8D9F82-804E-48EF-BAC6-13167AC8FD78}.Release|Any CPU.Build.0 = Release|Any CPU - {540C3B40-DBC0-4EEC-BC53-A1EB46ECC413}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {540C3B40-DBC0-4EEC-BC53-A1EB46ECC413}.Debug|Any CPU.Build.0 = Debug|Any CPU - {540C3B40-DBC0-4EEC-BC53-A1EB46ECC413}.Release|Any CPU.ActiveCfg = Release|Any CPU - {540C3B40-DBC0-4EEC-BC53-A1EB46ECC413}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {3F983C50-6916-4E84-ABE7-EA2656D02C0B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {874FA9A1-F96D-466E-8634-F6E8236B8E44} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {185E60CF-1880-4F98-BF85-17F8DC89087B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {74BED14F-5E47-4F3B-93D3-9C5DA01F5C86} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {E02B3953-F433-4097-B079-E66ED980F77D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {2D6D50C4-472D-4EEB-837A-DE7D16C9372A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {94358CA6-46C9-44CA-A33D-48F35FC53641} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {ECD94BB2-1312-4565-BB3B-2C25203740E7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {08F35224-723D-4C86-8C71-E6CA8BBE1A90} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {2D31B97F-D10D-4D7F-B7D7-2D54061AB357} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {5790F39C-D9CA-40C6-9AA4-0B7878789B84} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {DBCDA7E7-8AB1-4F8C-BAB4-C7FC1F1A37E8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D6B5FF83-1677-451C-B4B8-DE2365A8E65A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {DE8D9F82-804E-48EF-BAC6-13167AC8FD78} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {540C3B40-DBC0-4EEC-BC53-A1EB46ECC413} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {2D6D50C4-472D-4EEB-837A-DE7D16C9372A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {94358CA6-46C9-44CA-A33D-48F35FC53641} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {ECD94BB2-1312-4565-BB3B-2C25203740E7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {08F35224-723D-4C86-8C71-E6CA8BBE1A90} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {2D31B97F-D10D-4D7F-B7D7-2D54061AB357} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {5790F39C-D9CA-40C6-9AA4-0B7878789B84} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {DBCDA7E7-8AB1-4F8C-BAB4-C7FC1F1A37E8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D6B5FF83-1677-451C-B4B8-DE2365A8E65A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {DE8D9F82-804E-48EF-BAC6-13167AC8FD78} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {540C3B40-DBC0-4EEC-BC53-A1EB46ECC413} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {F310BE36-67D7-4F12-9993-3580ABD01EC5} diff --git a/sdk/src/Services/CodeGuruProfiler/Generated/AmazonCodeGuruProfilerConfig.cs b/sdk/src/Services/CodeGuruProfiler/Generated/AmazonCodeGuruProfilerConfig.cs index 4df8bb489994..497c500f547d 100644 --- a/sdk/src/Services/CodeGuruProfiler/Generated/AmazonCodeGuruProfilerConfig.cs +++ b/sdk/src/Services/CodeGuruProfiler/Generated/AmazonCodeGuruProfilerConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.CodeGuruProfiler public partial class AmazonCodeGuruProfilerConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("CodeGuruProfiler", "4.0.0.0"); private static readonly AmazonCodeGuruProfilerEndpointResolver EndpointResolver = new AmazonCodeGuruProfilerEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("CodeGuruProfiler", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("CodeGuruProfiler", "3.7.400.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/CodeGuruProfiler/Properties/AssemblyInfo.cs b/sdk/src/Services/CodeGuruProfiler/Properties/AssemblyInfo.cs index 064813fe6f3f..cb3d46f6bcaf 100644 --- a/sdk/src/Services/CodeGuruProfiler/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/CodeGuruProfiler/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/CodeGuruReviewer/CodeGuruReviewer.sln b/sdk/src/Services/CodeGuruReviewer/CodeGuruReviewer.sln index 57dc8211357d..6da99573a0c0 100644 --- a/sdk/src/Services/CodeGuruReviewer/CodeGuruReviewer.sln +++ b/sdk/src/Services/CodeGuruReviewer/CodeGuruReviewer.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {D43F72BE-DD05-4789-AFA0-D0EC3A44C8C3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {D43F72BE-DD05-4789-AFA0-D0EC3A44C8C3}.Debug|Any CPU.Build.0 = Debug|Any CPU {D43F72BE-DD05-4789-AFA0-D0EC3A44C8C3}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {A2C1065F-384D-486F-9BF0-15730D2CBC1A}.Debug|Any CPU.Build.0 = Debug|Any CPU {A2C1065F-384D-486F-9BF0-15730D2CBC1A}.Release|Any CPU.ActiveCfg = Release|Any CPU {A2C1065F-384D-486F-9BF0-15730D2CBC1A}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {08CCC6FB-F1BF-4BB6-A5B3-9A205020010C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {08CCC6FB-F1BF-4BB6-A5B3-9A205020010C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {08CCC6FB-F1BF-4BB6-A5B3-9A205020010C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {08CCC6FB-F1BF-4BB6-A5B3-9A205020010C}.Release|Any CPU.Build.0 = Release|Any CPU - {B3EC88DA-57A4-45EF-B566-8403D2D18778}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B3EC88DA-57A4-45EF-B566-8403D2D18778}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B3EC88DA-57A4-45EF-B566-8403D2D18778}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B3EC88DA-57A4-45EF-B566-8403D2D18778}.Release|Any CPU.Build.0 = Release|Any CPU - {FE608913-BF6D-4713-AB6C-C003B15BA3FA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FE608913-BF6D-4713-AB6C-C003B15BA3FA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FE608913-BF6D-4713-AB6C-C003B15BA3FA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FE608913-BF6D-4713-AB6C-C003B15BA3FA}.Release|Any CPU.Build.0 = Release|Any CPU - {B70A52B7-5F60-4300-A343-A50A11F462B9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B70A52B7-5F60-4300-A343-A50A11F462B9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B70A52B7-5F60-4300-A343-A50A11F462B9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B70A52B7-5F60-4300-A343-A50A11F462B9}.Release|Any CPU.Build.0 = Release|Any CPU - {41D89995-4762-49A2-A2BC-939BDE4A1965}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {41D89995-4762-49A2-A2BC-939BDE4A1965}.Debug|Any CPU.Build.0 = Debug|Any CPU - {41D89995-4762-49A2-A2BC-939BDE4A1965}.Release|Any CPU.ActiveCfg = Release|Any CPU - {41D89995-4762-49A2-A2BC-939BDE4A1965}.Release|Any CPU.Build.0 = Release|Any CPU - {2CF1CE0C-D269-48FF-B17C-7FE23DF5EC1E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2CF1CE0C-D269-48FF-B17C-7FE23DF5EC1E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2CF1CE0C-D269-48FF-B17C-7FE23DF5EC1E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2CF1CE0C-D269-48FF-B17C-7FE23DF5EC1E}.Release|Any CPU.Build.0 = Release|Any CPU - {18C57FA3-1CC7-4021-B930-B6CE97C585CA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {18C57FA3-1CC7-4021-B930-B6CE97C585CA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {18C57FA3-1CC7-4021-B930-B6CE97C585CA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {18C57FA3-1CC7-4021-B930-B6CE97C585CA}.Release|Any CPU.Build.0 = Release|Any CPU - {54A201A0-6527-4F67-B0E2-A39080E2193D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {54A201A0-6527-4F67-B0E2-A39080E2193D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {54A201A0-6527-4F67-B0E2-A39080E2193D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {54A201A0-6527-4F67-B0E2-A39080E2193D}.Release|Any CPU.Build.0 = Release|Any CPU - {79198557-6033-4937-8F28-528F8F7D5832}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {79198557-6033-4937-8F28-528F8F7D5832}.Debug|Any CPU.Build.0 = Debug|Any CPU - {79198557-6033-4937-8F28-528F8F7D5832}.Release|Any CPU.ActiveCfg = Release|Any CPU - {79198557-6033-4937-8F28-528F8F7D5832}.Release|Any CPU.Build.0 = Release|Any CPU - {3122E62A-5E67-4FE2-B926-55C18A07960A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3122E62A-5E67-4FE2-B926-55C18A07960A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3122E62A-5E67-4FE2-B926-55C18A07960A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3122E62A-5E67-4FE2-B926-55C18A07960A}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {08CCC6FB-F1BF-4BB6-A5B3-9A205020010C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {08CCC6FB-F1BF-4BB6-A5B3-9A205020010C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {08CCC6FB-F1BF-4BB6-A5B3-9A205020010C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {08CCC6FB-F1BF-4BB6-A5B3-9A205020010C}.Release|Any CPU.Build.0 = Release|Any CPU - {B3EC88DA-57A4-45EF-B566-8403D2D18778}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B3EC88DA-57A4-45EF-B566-8403D2D18778}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B3EC88DA-57A4-45EF-B566-8403D2D18778}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B3EC88DA-57A4-45EF-B566-8403D2D18778}.Release|Any CPU.Build.0 = Release|Any CPU - {FE608913-BF6D-4713-AB6C-C003B15BA3FA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FE608913-BF6D-4713-AB6C-C003B15BA3FA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FE608913-BF6D-4713-AB6C-C003B15BA3FA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FE608913-BF6D-4713-AB6C-C003B15BA3FA}.Release|Any CPU.Build.0 = Release|Any CPU - {B70A52B7-5F60-4300-A343-A50A11F462B9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B70A52B7-5F60-4300-A343-A50A11F462B9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B70A52B7-5F60-4300-A343-A50A11F462B9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B70A52B7-5F60-4300-A343-A50A11F462B9}.Release|Any CPU.Build.0 = Release|Any CPU - {41D89995-4762-49A2-A2BC-939BDE4A1965}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {41D89995-4762-49A2-A2BC-939BDE4A1965}.Debug|Any CPU.Build.0 = Debug|Any CPU - {41D89995-4762-49A2-A2BC-939BDE4A1965}.Release|Any CPU.ActiveCfg = Release|Any CPU - {41D89995-4762-49A2-A2BC-939BDE4A1965}.Release|Any CPU.Build.0 = Release|Any CPU - {2CF1CE0C-D269-48FF-B17C-7FE23DF5EC1E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2CF1CE0C-D269-48FF-B17C-7FE23DF5EC1E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2CF1CE0C-D269-48FF-B17C-7FE23DF5EC1E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2CF1CE0C-D269-48FF-B17C-7FE23DF5EC1E}.Release|Any CPU.Build.0 = Release|Any CPU - {18C57FA3-1CC7-4021-B930-B6CE97C585CA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {18C57FA3-1CC7-4021-B930-B6CE97C585CA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {18C57FA3-1CC7-4021-B930-B6CE97C585CA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {18C57FA3-1CC7-4021-B930-B6CE97C585CA}.Release|Any CPU.Build.0 = Release|Any CPU - {54A201A0-6527-4F67-B0E2-A39080E2193D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {54A201A0-6527-4F67-B0E2-A39080E2193D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {54A201A0-6527-4F67-B0E2-A39080E2193D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {54A201A0-6527-4F67-B0E2-A39080E2193D}.Release|Any CPU.Build.0 = Release|Any CPU - {79198557-6033-4937-8F28-528F8F7D5832}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {79198557-6033-4937-8F28-528F8F7D5832}.Debug|Any CPU.Build.0 = Debug|Any CPU - {79198557-6033-4937-8F28-528F8F7D5832}.Release|Any CPU.ActiveCfg = Release|Any CPU - {79198557-6033-4937-8F28-528F8F7D5832}.Release|Any CPU.Build.0 = Release|Any CPU - {3122E62A-5E67-4FE2-B926-55C18A07960A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3122E62A-5E67-4FE2-B926-55C18A07960A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3122E62A-5E67-4FE2-B926-55C18A07960A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3122E62A-5E67-4FE2-B926-55C18A07960A}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {D43F72BE-DD05-4789-AFA0-D0EC3A44C8C3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {4EB3432C-692B-4D73-8ACC-80EBB4C78878} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {B7EBF902-8027-4BB3-8DEB-3A295B5F73A4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {337FFE21-8BCA-4A75-BC6B-0DEB3155A265} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {A2C1065F-384D-486F-9BF0-15730D2CBC1A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {08CCC6FB-F1BF-4BB6-A5B3-9A205020010C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B3EC88DA-57A4-45EF-B566-8403D2D18778} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {FE608913-BF6D-4713-AB6C-C003B15BA3FA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B70A52B7-5F60-4300-A343-A50A11F462B9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {41D89995-4762-49A2-A2BC-939BDE4A1965} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {2CF1CE0C-D269-48FF-B17C-7FE23DF5EC1E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {18C57FA3-1CC7-4021-B930-B6CE97C585CA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {54A201A0-6527-4F67-B0E2-A39080E2193D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {79198557-6033-4937-8F28-528F8F7D5832} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {3122E62A-5E67-4FE2-B926-55C18A07960A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {08CCC6FB-F1BF-4BB6-A5B3-9A205020010C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B3EC88DA-57A4-45EF-B566-8403D2D18778} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {FE608913-BF6D-4713-AB6C-C003B15BA3FA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B70A52B7-5F60-4300-A343-A50A11F462B9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {41D89995-4762-49A2-A2BC-939BDE4A1965} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {2CF1CE0C-D269-48FF-B17C-7FE23DF5EC1E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {18C57FA3-1CC7-4021-B930-B6CE97C585CA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {54A201A0-6527-4F67-B0E2-A39080E2193D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {79198557-6033-4937-8F28-528F8F7D5832} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {3122E62A-5E67-4FE2-B926-55C18A07960A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {01DD4756-CC3D-48B9-8FA9-DBDC5179824D} diff --git a/sdk/src/Services/CodeGuruReviewer/Generated/AmazonCodeGuruReviewerConfig.cs b/sdk/src/Services/CodeGuruReviewer/Generated/AmazonCodeGuruReviewerConfig.cs index 6ebc17600285..59850a38c468 100644 --- a/sdk/src/Services/CodeGuruReviewer/Generated/AmazonCodeGuruReviewerConfig.cs +++ b/sdk/src/Services/CodeGuruReviewer/Generated/AmazonCodeGuruReviewerConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.CodeGuruReviewer public partial class AmazonCodeGuruReviewerConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("CodeGuru Reviewer", "4.0.0.0"); private static readonly AmazonCodeGuruReviewerEndpointResolver EndpointResolver = new AmazonCodeGuruReviewerEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("CodeGuru Reviewer", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("CodeGuru Reviewer", "3.7.400.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/CodeGuruReviewer/Properties/AssemblyInfo.cs b/sdk/src/Services/CodeGuruReviewer/Properties/AssemblyInfo.cs index 3373aada4e2a..bb1cc42afa66 100644 --- a/sdk/src/Services/CodeGuruReviewer/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/CodeGuruReviewer/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/CodeGuruSecurity/CodeGuruSecurity.sln b/sdk/src/Services/CodeGuruSecurity/CodeGuruSecurity.sln index c38e642e9a1e..31f956d2eba5 100644 --- a/sdk/src/Services/CodeGuruSecurity/CodeGuruSecurity.sln +++ b/sdk/src/Services/CodeGuruSecurity/CodeGuruSecurity.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {379CD340-6FF0-4E9E-848D-37E0853AEFB3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {379CD340-6FF0-4E9E-848D-37E0853AEFB3}.Debug|Any CPU.Build.0 = Debug|Any CPU {379CD340-6FF0-4E9E-848D-37E0853AEFB3}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {A4026B7A-95ED-4BC7-8979-5E322E5D4951}.Debug|Any CPU.Build.0 = Debug|Any CPU {A4026B7A-95ED-4BC7-8979-5E322E5D4951}.Release|Any CPU.ActiveCfg = Release|Any CPU {A4026B7A-95ED-4BC7-8979-5E322E5D4951}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {251293D1-B481-42D5-B218-0D7A7D39ECD6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {251293D1-B481-42D5-B218-0D7A7D39ECD6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {251293D1-B481-42D5-B218-0D7A7D39ECD6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {251293D1-B481-42D5-B218-0D7A7D39ECD6}.Release|Any CPU.Build.0 = Release|Any CPU - {A45BE045-600E-45C3-AEB7-63A9702334DD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A45BE045-600E-45C3-AEB7-63A9702334DD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A45BE045-600E-45C3-AEB7-63A9702334DD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A45BE045-600E-45C3-AEB7-63A9702334DD}.Release|Any CPU.Build.0 = Release|Any CPU - {F76E975A-80B9-470B-A998-3ADEEAE76E6D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F76E975A-80B9-470B-A998-3ADEEAE76E6D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F76E975A-80B9-470B-A998-3ADEEAE76E6D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F76E975A-80B9-470B-A998-3ADEEAE76E6D}.Release|Any CPU.Build.0 = Release|Any CPU - {6E3B6400-4607-445E-825E-0E6747598998}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6E3B6400-4607-445E-825E-0E6747598998}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6E3B6400-4607-445E-825E-0E6747598998}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6E3B6400-4607-445E-825E-0E6747598998}.Release|Any CPU.Build.0 = Release|Any CPU - {6C77CAD7-FEE2-433F-B2C8-2C0DA7717DF5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6C77CAD7-FEE2-433F-B2C8-2C0DA7717DF5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6C77CAD7-FEE2-433F-B2C8-2C0DA7717DF5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6C77CAD7-FEE2-433F-B2C8-2C0DA7717DF5}.Release|Any CPU.Build.0 = Release|Any CPU - {60FBA7E4-32F3-4192-BD73-017A05B64940}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {60FBA7E4-32F3-4192-BD73-017A05B64940}.Debug|Any CPU.Build.0 = Debug|Any CPU - {60FBA7E4-32F3-4192-BD73-017A05B64940}.Release|Any CPU.ActiveCfg = Release|Any CPU - {60FBA7E4-32F3-4192-BD73-017A05B64940}.Release|Any CPU.Build.0 = Release|Any CPU - {A7128519-38C5-4492-9C0E-E61887FD03E2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A7128519-38C5-4492-9C0E-E61887FD03E2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A7128519-38C5-4492-9C0E-E61887FD03E2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A7128519-38C5-4492-9C0E-E61887FD03E2}.Release|Any CPU.Build.0 = Release|Any CPU - {DA994F55-2DCB-4972-B720-3404762924B6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DA994F55-2DCB-4972-B720-3404762924B6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DA994F55-2DCB-4972-B720-3404762924B6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DA994F55-2DCB-4972-B720-3404762924B6}.Release|Any CPU.Build.0 = Release|Any CPU - {99297953-B6C4-4805-AC26-D3CFA503B7DE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {99297953-B6C4-4805-AC26-D3CFA503B7DE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {99297953-B6C4-4805-AC26-D3CFA503B7DE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {99297953-B6C4-4805-AC26-D3CFA503B7DE}.Release|Any CPU.Build.0 = Release|Any CPU - {6C2E7096-83B4-4D7D-B371-80F49F4991F7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6C2E7096-83B4-4D7D-B371-80F49F4991F7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6C2E7096-83B4-4D7D-B371-80F49F4991F7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6C2E7096-83B4-4D7D-B371-80F49F4991F7}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {251293D1-B481-42D5-B218-0D7A7D39ECD6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {251293D1-B481-42D5-B218-0D7A7D39ECD6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {251293D1-B481-42D5-B218-0D7A7D39ECD6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {251293D1-B481-42D5-B218-0D7A7D39ECD6}.Release|Any CPU.Build.0 = Release|Any CPU - {A45BE045-600E-45C3-AEB7-63A9702334DD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A45BE045-600E-45C3-AEB7-63A9702334DD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A45BE045-600E-45C3-AEB7-63A9702334DD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A45BE045-600E-45C3-AEB7-63A9702334DD}.Release|Any CPU.Build.0 = Release|Any CPU - {F76E975A-80B9-470B-A998-3ADEEAE76E6D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F76E975A-80B9-470B-A998-3ADEEAE76E6D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F76E975A-80B9-470B-A998-3ADEEAE76E6D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F76E975A-80B9-470B-A998-3ADEEAE76E6D}.Release|Any CPU.Build.0 = Release|Any CPU - {6E3B6400-4607-445E-825E-0E6747598998}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6E3B6400-4607-445E-825E-0E6747598998}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6E3B6400-4607-445E-825E-0E6747598998}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6E3B6400-4607-445E-825E-0E6747598998}.Release|Any CPU.Build.0 = Release|Any CPU - {6C77CAD7-FEE2-433F-B2C8-2C0DA7717DF5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6C77CAD7-FEE2-433F-B2C8-2C0DA7717DF5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6C77CAD7-FEE2-433F-B2C8-2C0DA7717DF5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6C77CAD7-FEE2-433F-B2C8-2C0DA7717DF5}.Release|Any CPU.Build.0 = Release|Any CPU - {60FBA7E4-32F3-4192-BD73-017A05B64940}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {60FBA7E4-32F3-4192-BD73-017A05B64940}.Debug|Any CPU.Build.0 = Debug|Any CPU - {60FBA7E4-32F3-4192-BD73-017A05B64940}.Release|Any CPU.ActiveCfg = Release|Any CPU - {60FBA7E4-32F3-4192-BD73-017A05B64940}.Release|Any CPU.Build.0 = Release|Any CPU - {A7128519-38C5-4492-9C0E-E61887FD03E2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A7128519-38C5-4492-9C0E-E61887FD03E2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A7128519-38C5-4492-9C0E-E61887FD03E2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A7128519-38C5-4492-9C0E-E61887FD03E2}.Release|Any CPU.Build.0 = Release|Any CPU - {DA994F55-2DCB-4972-B720-3404762924B6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DA994F55-2DCB-4972-B720-3404762924B6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DA994F55-2DCB-4972-B720-3404762924B6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DA994F55-2DCB-4972-B720-3404762924B6}.Release|Any CPU.Build.0 = Release|Any CPU - {99297953-B6C4-4805-AC26-D3CFA503B7DE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {99297953-B6C4-4805-AC26-D3CFA503B7DE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {99297953-B6C4-4805-AC26-D3CFA503B7DE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {99297953-B6C4-4805-AC26-D3CFA503B7DE}.Release|Any CPU.Build.0 = Release|Any CPU - {6C2E7096-83B4-4D7D-B371-80F49F4991F7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6C2E7096-83B4-4D7D-B371-80F49F4991F7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6C2E7096-83B4-4D7D-B371-80F49F4991F7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6C2E7096-83B4-4D7D-B371-80F49F4991F7}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {379CD340-6FF0-4E9E-848D-37E0853AEFB3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {7308DDD5-A652-4267-8CB8-C2F7A3AB7E6F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {443A6F47-383E-49D1-A75A-750E5BA89764} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {1281FEB3-FCAF-46B4-AB67-7F2B7340FC2A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {A4026B7A-95ED-4BC7-8979-5E322E5D4951} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {251293D1-B481-42D5-B218-0D7A7D39ECD6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A45BE045-600E-45C3-AEB7-63A9702334DD} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F76E975A-80B9-470B-A998-3ADEEAE76E6D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6E3B6400-4607-445E-825E-0E6747598998} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6C77CAD7-FEE2-433F-B2C8-2C0DA7717DF5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {60FBA7E4-32F3-4192-BD73-017A05B64940} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A7128519-38C5-4492-9C0E-E61887FD03E2} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {DA994F55-2DCB-4972-B720-3404762924B6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {99297953-B6C4-4805-AC26-D3CFA503B7DE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6C2E7096-83B4-4D7D-B371-80F49F4991F7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {251293D1-B481-42D5-B218-0D7A7D39ECD6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A45BE045-600E-45C3-AEB7-63A9702334DD} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F76E975A-80B9-470B-A998-3ADEEAE76E6D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6E3B6400-4607-445E-825E-0E6747598998} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6C77CAD7-FEE2-433F-B2C8-2C0DA7717DF5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {60FBA7E4-32F3-4192-BD73-017A05B64940} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A7128519-38C5-4492-9C0E-E61887FD03E2} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {DA994F55-2DCB-4972-B720-3404762924B6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {99297953-B6C4-4805-AC26-D3CFA503B7DE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6C2E7096-83B4-4D7D-B371-80F49F4991F7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {4D6844D8-F2E8-4599-B844-F22D31856802} diff --git a/sdk/src/Services/CodeGuruSecurity/Generated/AmazonCodeGuruSecurityConfig.cs b/sdk/src/Services/CodeGuruSecurity/Generated/AmazonCodeGuruSecurityConfig.cs index 2f9f1b34ae17..100ca3a8e27d 100644 --- a/sdk/src/Services/CodeGuruSecurity/Generated/AmazonCodeGuruSecurityConfig.cs +++ b/sdk/src/Services/CodeGuruSecurity/Generated/AmazonCodeGuruSecurityConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.CodeGuruSecurity public partial class AmazonCodeGuruSecurityConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("CodeGuru Security", "4.0.0.0"); private static readonly AmazonCodeGuruSecurityEndpointResolver EndpointResolver = new AmazonCodeGuruSecurityEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("CodeGuru Security", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("CodeGuru Security", "3.7.400.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/CodeGuruSecurity/Properties/AssemblyInfo.cs b/sdk/src/Services/CodeGuruSecurity/Properties/AssemblyInfo.cs index dde38ac7d4bb..36ad310a24f5 100644 --- a/sdk/src/Services/CodeGuruSecurity/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/CodeGuruSecurity/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/CodePipeline/CodePipeline.sln b/sdk/src/Services/CodePipeline/CodePipeline.sln index e23cfe0799af..f9a010021a76 100644 --- a/sdk/src/Services/CodePipeline/CodePipeline.sln +++ b/sdk/src/Services/CodePipeline/CodePipeline.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {DBCCAAFE-4E1D-4BCC-8113-4265D69E7B13}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {DBCCAAFE-4E1D-4BCC-8113-4265D69E7B13}.Debug|Any CPU.Build.0 = Debug|Any CPU {DBCCAAFE-4E1D-4BCC-8113-4265D69E7B13}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {126DCD53-81DA-4749-B7DF-E5D8260B0E7C}.Debug|Any CPU.Build.0 = Debug|Any CPU {126DCD53-81DA-4749-B7DF-E5D8260B0E7C}.Release|Any CPU.ActiveCfg = Release|Any CPU {126DCD53-81DA-4749-B7DF-E5D8260B0E7C}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {1F51ED75-B2A5-4B9B-9AEE-B57ECAFA6B9C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1F51ED75-B2A5-4B9B-9AEE-B57ECAFA6B9C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1F51ED75-B2A5-4B9B-9AEE-B57ECAFA6B9C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1F51ED75-B2A5-4B9B-9AEE-B57ECAFA6B9C}.Release|Any CPU.Build.0 = Release|Any CPU - {B66D8529-AA85-4740-A3C1-2E559E9622F7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B66D8529-AA85-4740-A3C1-2E559E9622F7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B66D8529-AA85-4740-A3C1-2E559E9622F7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B66D8529-AA85-4740-A3C1-2E559E9622F7}.Release|Any CPU.Build.0 = Release|Any CPU - {293823AA-0983-4F97-9ECF-2762675D3EBB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {293823AA-0983-4F97-9ECF-2762675D3EBB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {293823AA-0983-4F97-9ECF-2762675D3EBB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {293823AA-0983-4F97-9ECF-2762675D3EBB}.Release|Any CPU.Build.0 = Release|Any CPU - {DC035DF0-EA75-478C-AF41-71C7FA08ED64}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DC035DF0-EA75-478C-AF41-71C7FA08ED64}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DC035DF0-EA75-478C-AF41-71C7FA08ED64}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DC035DF0-EA75-478C-AF41-71C7FA08ED64}.Release|Any CPU.Build.0 = Release|Any CPU - {E1C4FE40-8AA8-4219-8FDF-BE3C51F5A4B9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E1C4FE40-8AA8-4219-8FDF-BE3C51F5A4B9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E1C4FE40-8AA8-4219-8FDF-BE3C51F5A4B9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E1C4FE40-8AA8-4219-8FDF-BE3C51F5A4B9}.Release|Any CPU.Build.0 = Release|Any CPU - {AFEB44FA-A9B8-49D6-B2BA-62D4F501B277}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AFEB44FA-A9B8-49D6-B2BA-62D4F501B277}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AFEB44FA-A9B8-49D6-B2BA-62D4F501B277}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AFEB44FA-A9B8-49D6-B2BA-62D4F501B277}.Release|Any CPU.Build.0 = Release|Any CPU - {92CC4A73-69F5-47B1-843B-2E00C250D807}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {92CC4A73-69F5-47B1-843B-2E00C250D807}.Debug|Any CPU.Build.0 = Debug|Any CPU - {92CC4A73-69F5-47B1-843B-2E00C250D807}.Release|Any CPU.ActiveCfg = Release|Any CPU - {92CC4A73-69F5-47B1-843B-2E00C250D807}.Release|Any CPU.Build.0 = Release|Any CPU - {63FBAE21-2DDB-4176-8564-6258E4374093}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {63FBAE21-2DDB-4176-8564-6258E4374093}.Debug|Any CPU.Build.0 = Debug|Any CPU - {63FBAE21-2DDB-4176-8564-6258E4374093}.Release|Any CPU.ActiveCfg = Release|Any CPU - {63FBAE21-2DDB-4176-8564-6258E4374093}.Release|Any CPU.Build.0 = Release|Any CPU - {40C6D343-63D3-4380-A3B0-F1172664B196}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {40C6D343-63D3-4380-A3B0-F1172664B196}.Debug|Any CPU.Build.0 = Debug|Any CPU - {40C6D343-63D3-4380-A3B0-F1172664B196}.Release|Any CPU.ActiveCfg = Release|Any CPU - {40C6D343-63D3-4380-A3B0-F1172664B196}.Release|Any CPU.Build.0 = Release|Any CPU - {79216E96-0479-4C92-8058-8EBF6D342C2D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {79216E96-0479-4C92-8058-8EBF6D342C2D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {79216E96-0479-4C92-8058-8EBF6D342C2D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {79216E96-0479-4C92-8058-8EBF6D342C2D}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {1F51ED75-B2A5-4B9B-9AEE-B57ECAFA6B9C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1F51ED75-B2A5-4B9B-9AEE-B57ECAFA6B9C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1F51ED75-B2A5-4B9B-9AEE-B57ECAFA6B9C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1F51ED75-B2A5-4B9B-9AEE-B57ECAFA6B9C}.Release|Any CPU.Build.0 = Release|Any CPU - {B66D8529-AA85-4740-A3C1-2E559E9622F7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B66D8529-AA85-4740-A3C1-2E559E9622F7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B66D8529-AA85-4740-A3C1-2E559E9622F7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B66D8529-AA85-4740-A3C1-2E559E9622F7}.Release|Any CPU.Build.0 = Release|Any CPU - {293823AA-0983-4F97-9ECF-2762675D3EBB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {293823AA-0983-4F97-9ECF-2762675D3EBB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {293823AA-0983-4F97-9ECF-2762675D3EBB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {293823AA-0983-4F97-9ECF-2762675D3EBB}.Release|Any CPU.Build.0 = Release|Any CPU - {DC035DF0-EA75-478C-AF41-71C7FA08ED64}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DC035DF0-EA75-478C-AF41-71C7FA08ED64}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DC035DF0-EA75-478C-AF41-71C7FA08ED64}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DC035DF0-EA75-478C-AF41-71C7FA08ED64}.Release|Any CPU.Build.0 = Release|Any CPU - {E1C4FE40-8AA8-4219-8FDF-BE3C51F5A4B9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E1C4FE40-8AA8-4219-8FDF-BE3C51F5A4B9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E1C4FE40-8AA8-4219-8FDF-BE3C51F5A4B9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E1C4FE40-8AA8-4219-8FDF-BE3C51F5A4B9}.Release|Any CPU.Build.0 = Release|Any CPU - {AFEB44FA-A9B8-49D6-B2BA-62D4F501B277}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AFEB44FA-A9B8-49D6-B2BA-62D4F501B277}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AFEB44FA-A9B8-49D6-B2BA-62D4F501B277}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AFEB44FA-A9B8-49D6-B2BA-62D4F501B277}.Release|Any CPU.Build.0 = Release|Any CPU - {92CC4A73-69F5-47B1-843B-2E00C250D807}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {92CC4A73-69F5-47B1-843B-2E00C250D807}.Debug|Any CPU.Build.0 = Debug|Any CPU - {92CC4A73-69F5-47B1-843B-2E00C250D807}.Release|Any CPU.ActiveCfg = Release|Any CPU - {92CC4A73-69F5-47B1-843B-2E00C250D807}.Release|Any CPU.Build.0 = Release|Any CPU - {63FBAE21-2DDB-4176-8564-6258E4374093}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {63FBAE21-2DDB-4176-8564-6258E4374093}.Debug|Any CPU.Build.0 = Debug|Any CPU - {63FBAE21-2DDB-4176-8564-6258E4374093}.Release|Any CPU.ActiveCfg = Release|Any CPU - {63FBAE21-2DDB-4176-8564-6258E4374093}.Release|Any CPU.Build.0 = Release|Any CPU - {40C6D343-63D3-4380-A3B0-F1172664B196}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {40C6D343-63D3-4380-A3B0-F1172664B196}.Debug|Any CPU.Build.0 = Debug|Any CPU - {40C6D343-63D3-4380-A3B0-F1172664B196}.Release|Any CPU.ActiveCfg = Release|Any CPU - {40C6D343-63D3-4380-A3B0-F1172664B196}.Release|Any CPU.Build.0 = Release|Any CPU - {79216E96-0479-4C92-8058-8EBF6D342C2D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {79216E96-0479-4C92-8058-8EBF6D342C2D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {79216E96-0479-4C92-8058-8EBF6D342C2D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {79216E96-0479-4C92-8058-8EBF6D342C2D}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {DBCCAAFE-4E1D-4BCC-8113-4265D69E7B13} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {6E8711DE-2616-48EA-8281-A1D1042919DC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {D07F4456-5111-4FA4-94D6-43495BDDDECB} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {3DF68F9D-DD2D-4449-AA3F-D3459BCF1C2B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {126DCD53-81DA-4749-B7DF-E5D8260B0E7C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {1F51ED75-B2A5-4B9B-9AEE-B57ECAFA6B9C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B66D8529-AA85-4740-A3C1-2E559E9622F7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {293823AA-0983-4F97-9ECF-2762675D3EBB} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {DC035DF0-EA75-478C-AF41-71C7FA08ED64} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E1C4FE40-8AA8-4219-8FDF-BE3C51F5A4B9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {AFEB44FA-A9B8-49D6-B2BA-62D4F501B277} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {92CC4A73-69F5-47B1-843B-2E00C250D807} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {63FBAE21-2DDB-4176-8564-6258E4374093} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {40C6D343-63D3-4380-A3B0-F1172664B196} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {79216E96-0479-4C92-8058-8EBF6D342C2D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {1F51ED75-B2A5-4B9B-9AEE-B57ECAFA6B9C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B66D8529-AA85-4740-A3C1-2E559E9622F7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {293823AA-0983-4F97-9ECF-2762675D3EBB} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {DC035DF0-EA75-478C-AF41-71C7FA08ED64} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E1C4FE40-8AA8-4219-8FDF-BE3C51F5A4B9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {AFEB44FA-A9B8-49D6-B2BA-62D4F501B277} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {92CC4A73-69F5-47B1-843B-2E00C250D807} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {63FBAE21-2DDB-4176-8564-6258E4374093} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {40C6D343-63D3-4380-A3B0-F1172664B196} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {79216E96-0479-4C92-8058-8EBF6D342C2D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {636024F3-C737-4B52-A056-73D0A4829E85} diff --git a/sdk/src/Services/CodePipeline/Generated/AmazonCodePipelineConfig.cs b/sdk/src/Services/CodePipeline/Generated/AmazonCodePipelineConfig.cs index d5a5b33d5b1b..be7e670c2cd6 100644 --- a/sdk/src/Services/CodePipeline/Generated/AmazonCodePipelineConfig.cs +++ b/sdk/src/Services/CodePipeline/Generated/AmazonCodePipelineConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.CodePipeline public partial class AmazonCodePipelineConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("CodePipeline", "4.0.0.0"); private static readonly AmazonCodePipelineEndpointResolver EndpointResolver = new AmazonCodePipelineEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("CodePipeline", "3.7.401.24"); -======= - InternalSDKUtils.BuildUserAgentString("CodePipeline", "3.7.404.19"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/CodePipeline/Generated/Model/Internal/MarshallTransformations/RetryStageMetadataUnmarshaller.cs b/sdk/src/Services/CodePipeline/Generated/Model/Internal/MarshallTransformations/RetryStageMetadataUnmarshaller.cs index 9f3fc6411626..25d90a409c95 100644 --- a/sdk/src/Services/CodePipeline/Generated/Model/Internal/MarshallTransformations/RetryStageMetadataUnmarshaller.cs +++ b/sdk/src/Services/CodePipeline/Generated/Model/Internal/MarshallTransformations/RetryStageMetadataUnmarshaller.cs @@ -68,7 +68,7 @@ public RetryStageMetadata Unmarshall(JsonUnmarshallerContext context) { if (context.TestExpression("autoStageRetryAttempt", targetDepth)) { - var unmarshaller = IntUnmarshaller.Instance; + var unmarshaller = NullableIntUnmarshaller.Instance; unmarshalledObject.AutoStageRetryAttempt = unmarshaller.Unmarshall(context); continue; } @@ -80,7 +80,7 @@ public RetryStageMetadata Unmarshall(JsonUnmarshallerContext context) } if (context.TestExpression("manualStageRetryAttempt", targetDepth)) { - var unmarshaller = IntUnmarshaller.Instance; + var unmarshaller = NullableIntUnmarshaller.Instance; unmarshalledObject.ManualStageRetryAttempt = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/CodePipeline/Generated/Model/RetryStageMetadata.cs b/sdk/src/Services/CodePipeline/Generated/Model/RetryStageMetadata.cs index e725ad9e4c8d..bf29a01426cd 100644 --- a/sdk/src/Services/CodePipeline/Generated/Model/RetryStageMetadata.cs +++ b/sdk/src/Services/CodePipeline/Generated/Model/RetryStageMetadata.cs @@ -47,9 +47,9 @@ public partial class RetryStageMetadata /// /// [AWSProperty(Min=1)] - public int AutoStageRetryAttempt + public int? AutoStageRetryAttempt { - get { return this._autoStageRetryAttempt.GetValueOrDefault(); } + get { return this._autoStageRetryAttempt; } set { this._autoStageRetryAttempt = value; } } @@ -86,9 +86,9 @@ internal bool IsSetLatestRetryTrigger() /// /// [AWSProperty(Min=1)] - public int ManualStageRetryAttempt + public int? ManualStageRetryAttempt { - get { return this._manualStageRetryAttempt.GetValueOrDefault(); } + get { return this._manualStageRetryAttempt; } set { this._manualStageRetryAttempt = value; } } diff --git a/sdk/src/Services/CodePipeline/Generated/_bcl/AmazonCodePipelineClient.cs b/sdk/src/Services/CodePipeline/Generated/_bcl/AmazonCodePipelineClient.cs index d216d414361b..b0b5649647ea 100644 --- a/sdk/src/Services/CodePipeline/Generated/_bcl/AmazonCodePipelineClient.cs +++ b/sdk/src/Services/CodePipeline/Generated/_bcl/AmazonCodePipelineClient.cs @@ -165,6 +165,10 @@ namespace Amazon.CodePipeline /// /// Invoke /// + ///
  • + /// + /// Compute + /// ///
    • /// /// Pipelines also include transitions, which allow the transition of artifacts diff --git a/sdk/src/Services/CodePipeline/Generated/_bcl/IAmazonCodePipeline.cs b/sdk/src/Services/CodePipeline/Generated/_bcl/IAmazonCodePipeline.cs index 994f45a2e7a3..599115d76cc1 100644 --- a/sdk/src/Services/CodePipeline/Generated/_bcl/IAmazonCodePipeline.cs +++ b/sdk/src/Services/CodePipeline/Generated/_bcl/IAmazonCodePipeline.cs @@ -157,6 +157,10 @@ namespace Amazon.CodePipeline /// /// Invoke /// + ///
  • + /// + /// Compute + /// ///
    • /// /// Pipelines also include transitions, which allow the transition of artifacts diff --git a/sdk/src/Services/CodePipeline/Properties/AssemblyInfo.cs b/sdk/src/Services/CodePipeline/Properties/AssemblyInfo.cs index d1bfdf071ed7..27add9f241dd 100644 --- a/sdk/src/Services/CodePipeline/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/CodePipeline/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.24")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.404.19")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/CodeStarNotifications/CodeStarNotifications.sln b/sdk/src/Services/CodeStarNotifications/CodeStarNotifications.sln index 46ffd3c3a6ce..83dd341d03d9 100644 --- a/sdk/src/Services/CodeStarNotifications/CodeStarNotifications.sln +++ b/sdk/src/Services/CodeStarNotifications/CodeStarNotifications.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {36EDFF3A-7439-48E2-A7A7-AAA36B10632B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {36EDFF3A-7439-48E2-A7A7-AAA36B10632B}.Debug|Any CPU.Build.0 = Debug|Any CPU {36EDFF3A-7439-48E2-A7A7-AAA36B10632B}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {75C47AB9-0BE1-4C83-A7A1-AE15B4BE5BFA}.Debug|Any CPU.Build.0 = Debug|Any CPU {75C47AB9-0BE1-4C83-A7A1-AE15B4BE5BFA}.Release|Any CPU.ActiveCfg = Release|Any CPU {75C47AB9-0BE1-4C83-A7A1-AE15B4BE5BFA}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {C7F86B46-1B49-4138-B1F3-13F630108DB3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C7F86B46-1B49-4138-B1F3-13F630108DB3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C7F86B46-1B49-4138-B1F3-13F630108DB3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C7F86B46-1B49-4138-B1F3-13F630108DB3}.Release|Any CPU.Build.0 = Release|Any CPU - {571C89C1-3824-4180-A1C8-2E12FED0DAFD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {571C89C1-3824-4180-A1C8-2E12FED0DAFD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {571C89C1-3824-4180-A1C8-2E12FED0DAFD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {571C89C1-3824-4180-A1C8-2E12FED0DAFD}.Release|Any CPU.Build.0 = Release|Any CPU - {B5AA7ADD-CAA8-43FE-95ED-235550F4713C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B5AA7ADD-CAA8-43FE-95ED-235550F4713C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B5AA7ADD-CAA8-43FE-95ED-235550F4713C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B5AA7ADD-CAA8-43FE-95ED-235550F4713C}.Release|Any CPU.Build.0 = Release|Any CPU - {A93473C5-B648-4FF1-812F-9484FFA618F5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A93473C5-B648-4FF1-812F-9484FFA618F5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A93473C5-B648-4FF1-812F-9484FFA618F5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A93473C5-B648-4FF1-812F-9484FFA618F5}.Release|Any CPU.Build.0 = Release|Any CPU - {CBB76875-5241-4504-B4C2-E11FCDBF119F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CBB76875-5241-4504-B4C2-E11FCDBF119F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CBB76875-5241-4504-B4C2-E11FCDBF119F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CBB76875-5241-4504-B4C2-E11FCDBF119F}.Release|Any CPU.Build.0 = Release|Any CPU - {E70AFA79-EBE3-4864-A902-6544F6118FF1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E70AFA79-EBE3-4864-A902-6544F6118FF1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E70AFA79-EBE3-4864-A902-6544F6118FF1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E70AFA79-EBE3-4864-A902-6544F6118FF1}.Release|Any CPU.Build.0 = Release|Any CPU - {6B23E8E5-FB03-4FAE-AA4A-CC1404451510}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6B23E8E5-FB03-4FAE-AA4A-CC1404451510}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6B23E8E5-FB03-4FAE-AA4A-CC1404451510}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6B23E8E5-FB03-4FAE-AA4A-CC1404451510}.Release|Any CPU.Build.0 = Release|Any CPU - {E16C6A6F-654B-40A8-A18F-BAF2E1F1B8D4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E16C6A6F-654B-40A8-A18F-BAF2E1F1B8D4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E16C6A6F-654B-40A8-A18F-BAF2E1F1B8D4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E16C6A6F-654B-40A8-A18F-BAF2E1F1B8D4}.Release|Any CPU.Build.0 = Release|Any CPU - {0B672DCD-16CB-4683-B764-ECC17C854141}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0B672DCD-16CB-4683-B764-ECC17C854141}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0B672DCD-16CB-4683-B764-ECC17C854141}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0B672DCD-16CB-4683-B764-ECC17C854141}.Release|Any CPU.Build.0 = Release|Any CPU - {316CC1F2-BD8F-4B54-9DCB-945182CD77B9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {316CC1F2-BD8F-4B54-9DCB-945182CD77B9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {316CC1F2-BD8F-4B54-9DCB-945182CD77B9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {316CC1F2-BD8F-4B54-9DCB-945182CD77B9}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {C7F86B46-1B49-4138-B1F3-13F630108DB3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C7F86B46-1B49-4138-B1F3-13F630108DB3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C7F86B46-1B49-4138-B1F3-13F630108DB3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C7F86B46-1B49-4138-B1F3-13F630108DB3}.Release|Any CPU.Build.0 = Release|Any CPU - {571C89C1-3824-4180-A1C8-2E12FED0DAFD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {571C89C1-3824-4180-A1C8-2E12FED0DAFD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {571C89C1-3824-4180-A1C8-2E12FED0DAFD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {571C89C1-3824-4180-A1C8-2E12FED0DAFD}.Release|Any CPU.Build.0 = Release|Any CPU - {B5AA7ADD-CAA8-43FE-95ED-235550F4713C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B5AA7ADD-CAA8-43FE-95ED-235550F4713C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B5AA7ADD-CAA8-43FE-95ED-235550F4713C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B5AA7ADD-CAA8-43FE-95ED-235550F4713C}.Release|Any CPU.Build.0 = Release|Any CPU - {A93473C5-B648-4FF1-812F-9484FFA618F5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A93473C5-B648-4FF1-812F-9484FFA618F5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A93473C5-B648-4FF1-812F-9484FFA618F5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A93473C5-B648-4FF1-812F-9484FFA618F5}.Release|Any CPU.Build.0 = Release|Any CPU - {CBB76875-5241-4504-B4C2-E11FCDBF119F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CBB76875-5241-4504-B4C2-E11FCDBF119F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CBB76875-5241-4504-B4C2-E11FCDBF119F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CBB76875-5241-4504-B4C2-E11FCDBF119F}.Release|Any CPU.Build.0 = Release|Any CPU - {E70AFA79-EBE3-4864-A902-6544F6118FF1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E70AFA79-EBE3-4864-A902-6544F6118FF1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E70AFA79-EBE3-4864-A902-6544F6118FF1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E70AFA79-EBE3-4864-A902-6544F6118FF1}.Release|Any CPU.Build.0 = Release|Any CPU - {6B23E8E5-FB03-4FAE-AA4A-CC1404451510}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6B23E8E5-FB03-4FAE-AA4A-CC1404451510}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6B23E8E5-FB03-4FAE-AA4A-CC1404451510}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6B23E8E5-FB03-4FAE-AA4A-CC1404451510}.Release|Any CPU.Build.0 = Release|Any CPU - {E16C6A6F-654B-40A8-A18F-BAF2E1F1B8D4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E16C6A6F-654B-40A8-A18F-BAF2E1F1B8D4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E16C6A6F-654B-40A8-A18F-BAF2E1F1B8D4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E16C6A6F-654B-40A8-A18F-BAF2E1F1B8D4}.Release|Any CPU.Build.0 = Release|Any CPU - {0B672DCD-16CB-4683-B764-ECC17C854141}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0B672DCD-16CB-4683-B764-ECC17C854141}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0B672DCD-16CB-4683-B764-ECC17C854141}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0B672DCD-16CB-4683-B764-ECC17C854141}.Release|Any CPU.Build.0 = Release|Any CPU - {316CC1F2-BD8F-4B54-9DCB-945182CD77B9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {316CC1F2-BD8F-4B54-9DCB-945182CD77B9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {316CC1F2-BD8F-4B54-9DCB-945182CD77B9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {316CC1F2-BD8F-4B54-9DCB-945182CD77B9}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {36EDFF3A-7439-48E2-A7A7-AAA36B10632B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {7F1C86C9-F459-4B6D-9FFD-6CBC163E71A2} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {04F3FF87-0044-4DD4-9BC6-1951894326E5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {F49140DD-2C46-4A2B-B374-3CFF35143718} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {75C47AB9-0BE1-4C83-A7A1-AE15B4BE5BFA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {C7F86B46-1B49-4138-B1F3-13F630108DB3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {571C89C1-3824-4180-A1C8-2E12FED0DAFD} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B5AA7ADD-CAA8-43FE-95ED-235550F4713C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A93473C5-B648-4FF1-812F-9484FFA618F5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {CBB76875-5241-4504-B4C2-E11FCDBF119F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E70AFA79-EBE3-4864-A902-6544F6118FF1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6B23E8E5-FB03-4FAE-AA4A-CC1404451510} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E16C6A6F-654B-40A8-A18F-BAF2E1F1B8D4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0B672DCD-16CB-4683-B764-ECC17C854141} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {316CC1F2-BD8F-4B54-9DCB-945182CD77B9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {C7F86B46-1B49-4138-B1F3-13F630108DB3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {571C89C1-3824-4180-A1C8-2E12FED0DAFD} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B5AA7ADD-CAA8-43FE-95ED-235550F4713C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A93473C5-B648-4FF1-812F-9484FFA618F5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {CBB76875-5241-4504-B4C2-E11FCDBF119F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E70AFA79-EBE3-4864-A902-6544F6118FF1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6B23E8E5-FB03-4FAE-AA4A-CC1404451510} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E16C6A6F-654B-40A8-A18F-BAF2E1F1B8D4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0B672DCD-16CB-4683-B764-ECC17C854141} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {316CC1F2-BD8F-4B54-9DCB-945182CD77B9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {A017A78D-13C2-4A2A-BFFF-D47EB137C8E0} diff --git a/sdk/src/Services/CodeStarNotifications/Generated/AmazonCodeStarNotificationsConfig.cs b/sdk/src/Services/CodeStarNotifications/Generated/AmazonCodeStarNotificationsConfig.cs index 21aa399cff33..95ffdca08537 100644 --- a/sdk/src/Services/CodeStarNotifications/Generated/AmazonCodeStarNotificationsConfig.cs +++ b/sdk/src/Services/CodeStarNotifications/Generated/AmazonCodeStarNotificationsConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.CodeStarNotifications public partial class AmazonCodeStarNotificationsConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("codestar notifications", "4.0.0.0"); private static readonly AmazonCodeStarNotificationsEndpointResolver EndpointResolver = new AmazonCodeStarNotificationsEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("codestar notifications", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("codestar notifications", "3.7.400.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/CodeStarNotifications/Properties/AssemblyInfo.cs b/sdk/src/Services/CodeStarNotifications/Properties/AssemblyInfo.cs index bffe492fab6d..07d460fe58d7 100644 --- a/sdk/src/Services/CodeStarNotifications/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/CodeStarNotifications/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/CodeStarconnections/CodeStarconnections.sln b/sdk/src/Services/CodeStarconnections/CodeStarconnections.sln index 281deccc3e6c..0bd7a65b6657 100644 --- a/sdk/src/Services/CodeStarconnections/CodeStarconnections.sln +++ b/sdk/src/Services/CodeStarconnections/CodeStarconnections.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {939D69D9-A292-40D2-9180-B779D5B97E7C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {939D69D9-A292-40D2-9180-B779D5B97E7C}.Debug|Any CPU.Build.0 = Debug|Any CPU {939D69D9-A292-40D2-9180-B779D5B97E7C}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {BF87BCCF-7EF7-4828-A118-6731CF64CB48}.Debug|Any CPU.Build.0 = Debug|Any CPU {BF87BCCF-7EF7-4828-A118-6731CF64CB48}.Release|Any CPU.ActiveCfg = Release|Any CPU {BF87BCCF-7EF7-4828-A118-6731CF64CB48}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {CBFD7FDD-95FC-448E-B55C-4CF74EEB6470}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CBFD7FDD-95FC-448E-B55C-4CF74EEB6470}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CBFD7FDD-95FC-448E-B55C-4CF74EEB6470}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CBFD7FDD-95FC-448E-B55C-4CF74EEB6470}.Release|Any CPU.Build.0 = Release|Any CPU - {8FC44195-D28E-4DB9-A6C2-40E6124A77AB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8FC44195-D28E-4DB9-A6C2-40E6124A77AB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8FC44195-D28E-4DB9-A6C2-40E6124A77AB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8FC44195-D28E-4DB9-A6C2-40E6124A77AB}.Release|Any CPU.Build.0 = Release|Any CPU - {DCD6186D-5A87-4AA2-8F74-B01C0C290318}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DCD6186D-5A87-4AA2-8F74-B01C0C290318}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DCD6186D-5A87-4AA2-8F74-B01C0C290318}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DCD6186D-5A87-4AA2-8F74-B01C0C290318}.Release|Any CPU.Build.0 = Release|Any CPU - {5B4DDCCC-541D-464C-BC69-AE4F1BD04E89}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5B4DDCCC-541D-464C-BC69-AE4F1BD04E89}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5B4DDCCC-541D-464C-BC69-AE4F1BD04E89}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5B4DDCCC-541D-464C-BC69-AE4F1BD04E89}.Release|Any CPU.Build.0 = Release|Any CPU - {CB6FC6AC-31C5-4B7F-8227-B88494959304}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CB6FC6AC-31C5-4B7F-8227-B88494959304}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CB6FC6AC-31C5-4B7F-8227-B88494959304}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CB6FC6AC-31C5-4B7F-8227-B88494959304}.Release|Any CPU.Build.0 = Release|Any CPU - {190E6F0A-5C47-4A2C-A1D4-1F0C8A8C4C0B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {190E6F0A-5C47-4A2C-A1D4-1F0C8A8C4C0B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {190E6F0A-5C47-4A2C-A1D4-1F0C8A8C4C0B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {190E6F0A-5C47-4A2C-A1D4-1F0C8A8C4C0B}.Release|Any CPU.Build.0 = Release|Any CPU - {2F1E932A-95E9-4645-B96E-3D05A2058B54}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2F1E932A-95E9-4645-B96E-3D05A2058B54}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2F1E932A-95E9-4645-B96E-3D05A2058B54}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2F1E932A-95E9-4645-B96E-3D05A2058B54}.Release|Any CPU.Build.0 = Release|Any CPU - {FBEC4B08-48CA-4633-9964-3A6CD29A6351}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FBEC4B08-48CA-4633-9964-3A6CD29A6351}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FBEC4B08-48CA-4633-9964-3A6CD29A6351}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FBEC4B08-48CA-4633-9964-3A6CD29A6351}.Release|Any CPU.Build.0 = Release|Any CPU - {D4DD7215-7D65-4F46-865B-ECD70F0B2931}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D4DD7215-7D65-4F46-865B-ECD70F0B2931}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D4DD7215-7D65-4F46-865B-ECD70F0B2931}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D4DD7215-7D65-4F46-865B-ECD70F0B2931}.Release|Any CPU.Build.0 = Release|Any CPU - {B3CB3F50-9DBD-4F84-80FA-450E5125BAA4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B3CB3F50-9DBD-4F84-80FA-450E5125BAA4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B3CB3F50-9DBD-4F84-80FA-450E5125BAA4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B3CB3F50-9DBD-4F84-80FA-450E5125BAA4}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {CBFD7FDD-95FC-448E-B55C-4CF74EEB6470}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CBFD7FDD-95FC-448E-B55C-4CF74EEB6470}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CBFD7FDD-95FC-448E-B55C-4CF74EEB6470}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CBFD7FDD-95FC-448E-B55C-4CF74EEB6470}.Release|Any CPU.Build.0 = Release|Any CPU - {8FC44195-D28E-4DB9-A6C2-40E6124A77AB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8FC44195-D28E-4DB9-A6C2-40E6124A77AB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8FC44195-D28E-4DB9-A6C2-40E6124A77AB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8FC44195-D28E-4DB9-A6C2-40E6124A77AB}.Release|Any CPU.Build.0 = Release|Any CPU - {DCD6186D-5A87-4AA2-8F74-B01C0C290318}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DCD6186D-5A87-4AA2-8F74-B01C0C290318}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DCD6186D-5A87-4AA2-8F74-B01C0C290318}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DCD6186D-5A87-4AA2-8F74-B01C0C290318}.Release|Any CPU.Build.0 = Release|Any CPU - {5B4DDCCC-541D-464C-BC69-AE4F1BD04E89}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5B4DDCCC-541D-464C-BC69-AE4F1BD04E89}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5B4DDCCC-541D-464C-BC69-AE4F1BD04E89}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5B4DDCCC-541D-464C-BC69-AE4F1BD04E89}.Release|Any CPU.Build.0 = Release|Any CPU - {CB6FC6AC-31C5-4B7F-8227-B88494959304}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CB6FC6AC-31C5-4B7F-8227-B88494959304}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CB6FC6AC-31C5-4B7F-8227-B88494959304}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CB6FC6AC-31C5-4B7F-8227-B88494959304}.Release|Any CPU.Build.0 = Release|Any CPU - {190E6F0A-5C47-4A2C-A1D4-1F0C8A8C4C0B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {190E6F0A-5C47-4A2C-A1D4-1F0C8A8C4C0B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {190E6F0A-5C47-4A2C-A1D4-1F0C8A8C4C0B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {190E6F0A-5C47-4A2C-A1D4-1F0C8A8C4C0B}.Release|Any CPU.Build.0 = Release|Any CPU - {2F1E932A-95E9-4645-B96E-3D05A2058B54}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2F1E932A-95E9-4645-B96E-3D05A2058B54}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2F1E932A-95E9-4645-B96E-3D05A2058B54}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2F1E932A-95E9-4645-B96E-3D05A2058B54}.Release|Any CPU.Build.0 = Release|Any CPU - {FBEC4B08-48CA-4633-9964-3A6CD29A6351}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FBEC4B08-48CA-4633-9964-3A6CD29A6351}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FBEC4B08-48CA-4633-9964-3A6CD29A6351}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FBEC4B08-48CA-4633-9964-3A6CD29A6351}.Release|Any CPU.Build.0 = Release|Any CPU - {D4DD7215-7D65-4F46-865B-ECD70F0B2931}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D4DD7215-7D65-4F46-865B-ECD70F0B2931}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D4DD7215-7D65-4F46-865B-ECD70F0B2931}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D4DD7215-7D65-4F46-865B-ECD70F0B2931}.Release|Any CPU.Build.0 = Release|Any CPU - {B3CB3F50-9DBD-4F84-80FA-450E5125BAA4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B3CB3F50-9DBD-4F84-80FA-450E5125BAA4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B3CB3F50-9DBD-4F84-80FA-450E5125BAA4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B3CB3F50-9DBD-4F84-80FA-450E5125BAA4}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {939D69D9-A292-40D2-9180-B779D5B97E7C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {60128016-7E95-49B2-A787-526AB503DFEC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {918160DB-021C-4E6B-A592-A29BA97A61CC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {917971CD-3E59-42C4-A9B2-CC2CC3C93860} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {BF87BCCF-7EF7-4828-A118-6731CF64CB48} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {CBFD7FDD-95FC-448E-B55C-4CF74EEB6470} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8FC44195-D28E-4DB9-A6C2-40E6124A77AB} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {DCD6186D-5A87-4AA2-8F74-B01C0C290318} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {5B4DDCCC-541D-464C-BC69-AE4F1BD04E89} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {CB6FC6AC-31C5-4B7F-8227-B88494959304} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {190E6F0A-5C47-4A2C-A1D4-1F0C8A8C4C0B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {2F1E932A-95E9-4645-B96E-3D05A2058B54} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {FBEC4B08-48CA-4633-9964-3A6CD29A6351} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D4DD7215-7D65-4F46-865B-ECD70F0B2931} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B3CB3F50-9DBD-4F84-80FA-450E5125BAA4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {CBFD7FDD-95FC-448E-B55C-4CF74EEB6470} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8FC44195-D28E-4DB9-A6C2-40E6124A77AB} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {DCD6186D-5A87-4AA2-8F74-B01C0C290318} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {5B4DDCCC-541D-464C-BC69-AE4F1BD04E89} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {CB6FC6AC-31C5-4B7F-8227-B88494959304} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {190E6F0A-5C47-4A2C-A1D4-1F0C8A8C4C0B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {2F1E932A-95E9-4645-B96E-3D05A2058B54} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {FBEC4B08-48CA-4633-9964-3A6CD29A6351} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D4DD7215-7D65-4F46-865B-ECD70F0B2931} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B3CB3F50-9DBD-4F84-80FA-450E5125BAA4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {D09EA657-79E4-4451-B2DA-4FFCF8DDB424} diff --git a/sdk/src/Services/CodeStarconnections/Generated/AmazonCodeStarconnectionsConfig.cs b/sdk/src/Services/CodeStarconnections/Generated/AmazonCodeStarconnectionsConfig.cs index e892ad5c052d..0b3cf5389909 100644 --- a/sdk/src/Services/CodeStarconnections/Generated/AmazonCodeStarconnectionsConfig.cs +++ b/sdk/src/Services/CodeStarconnections/Generated/AmazonCodeStarconnectionsConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.CodeStarconnections public partial class AmazonCodeStarconnectionsConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("CodeStar connections", "4.0.0.0"); private static readonly AmazonCodeStarconnectionsEndpointResolver EndpointResolver = new AmazonCodeStarconnectionsEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("CodeStar connections", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("CodeStar connections", "3.7.400.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/CodeStarconnections/Properties/AssemblyInfo.cs b/sdk/src/Services/CodeStarconnections/Properties/AssemblyInfo.cs index 195b9e22f5df..18e4f924a039 100644 --- a/sdk/src/Services/CodeStarconnections/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/CodeStarconnections/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/CognitoIdentity/CognitoIdentity.sln b/sdk/src/Services/CognitoIdentity/CognitoIdentity.sln index 9672740561c1..8cc97d5488b7 100644 --- a/sdk/src/Services/CognitoIdentity/CognitoIdentity.sln +++ b/sdk/src/Services/CognitoIdentity/CognitoIdentity.sln @@ -96,7 +96,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {A552648F-D0A8-452D-A6E0-64E1FE3FC44F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {A552648F-D0A8-452D-A6E0-64E1FE3FC44F}.Debug|Any CPU.Build.0 = Debug|Any CPU {A552648F-D0A8-452D-A6E0-64E1FE3FC44F}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -113,81 +120,6 @@ Global {C4E8CCE4-016B-4686-A48D-7E9338EE8850}.Debug|Any CPU.Build.0 = Debug|Any CPU {C4E8CCE4-016B-4686-A48D-7E9338EE8850}.Release|Any CPU.ActiveCfg = Release|Any CPU {C4E8CCE4-016B-4686-A48D-7E9338EE8850}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {83EE41F5-FBA2-471D-ADA9-0156074ABACE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {83EE41F5-FBA2-471D-ADA9-0156074ABACE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {83EE41F5-FBA2-471D-ADA9-0156074ABACE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {83EE41F5-FBA2-471D-ADA9-0156074ABACE}.Release|Any CPU.Build.0 = Release|Any CPU - {EB356936-20D1-429C-A8FC-CF06527EAD6C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EB356936-20D1-429C-A8FC-CF06527EAD6C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EB356936-20D1-429C-A8FC-CF06527EAD6C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EB356936-20D1-429C-A8FC-CF06527EAD6C}.Release|Any CPU.Build.0 = Release|Any CPU - {64A29682-A520-4EB2-B514-530C53C5A9FE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {64A29682-A520-4EB2-B514-530C53C5A9FE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {64A29682-A520-4EB2-B514-530C53C5A9FE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {64A29682-A520-4EB2-B514-530C53C5A9FE}.Release|Any CPU.Build.0 = Release|Any CPU - {A835AC06-9647-40B8-8BFD-C887FB97A07B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A835AC06-9647-40B8-8BFD-C887FB97A07B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A835AC06-9647-40B8-8BFD-C887FB97A07B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A835AC06-9647-40B8-8BFD-C887FB97A07B}.Release|Any CPU.Build.0 = Release|Any CPU - {07380343-4BC7-4FB6-8673-679F8E8FC97A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {07380343-4BC7-4FB6-8673-679F8E8FC97A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {07380343-4BC7-4FB6-8673-679F8E8FC97A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {07380343-4BC7-4FB6-8673-679F8E8FC97A}.Release|Any CPU.Build.0 = Release|Any CPU - {7C0CAD24-CA79-4CAF-828D-CB2C5DDFF20E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7C0CAD24-CA79-4CAF-828D-CB2C5DDFF20E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7C0CAD24-CA79-4CAF-828D-CB2C5DDFF20E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7C0CAD24-CA79-4CAF-828D-CB2C5DDFF20E}.Release|Any CPU.Build.0 = Release|Any CPU - {7D019797-D8C0-4595-8FE9-A9094A7DBBEA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7D019797-D8C0-4595-8FE9-A9094A7DBBEA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7D019797-D8C0-4595-8FE9-A9094A7DBBEA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7D019797-D8C0-4595-8FE9-A9094A7DBBEA}.Release|Any CPU.Build.0 = Release|Any CPU - {A71B614C-99B8-4038-AF3A-90184D9F9CEC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A71B614C-99B8-4038-AF3A-90184D9F9CEC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A71B614C-99B8-4038-AF3A-90184D9F9CEC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A71B614C-99B8-4038-AF3A-90184D9F9CEC}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {83EE41F5-FBA2-471D-ADA9-0156074ABACE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {83EE41F5-FBA2-471D-ADA9-0156074ABACE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {83EE41F5-FBA2-471D-ADA9-0156074ABACE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {83EE41F5-FBA2-471D-ADA9-0156074ABACE}.Release|Any CPU.Build.0 = Release|Any CPU - {EB356936-20D1-429C-A8FC-CF06527EAD6C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EB356936-20D1-429C-A8FC-CF06527EAD6C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EB356936-20D1-429C-A8FC-CF06527EAD6C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EB356936-20D1-429C-A8FC-CF06527EAD6C}.Release|Any CPU.Build.0 = Release|Any CPU - {64A29682-A520-4EB2-B514-530C53C5A9FE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {64A29682-A520-4EB2-B514-530C53C5A9FE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {64A29682-A520-4EB2-B514-530C53C5A9FE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {64A29682-A520-4EB2-B514-530C53C5A9FE}.Release|Any CPU.Build.0 = Release|Any CPU - {A835AC06-9647-40B8-8BFD-C887FB97A07B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A835AC06-9647-40B8-8BFD-C887FB97A07B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A835AC06-9647-40B8-8BFD-C887FB97A07B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A835AC06-9647-40B8-8BFD-C887FB97A07B}.Release|Any CPU.Build.0 = Release|Any CPU - {07380343-4BC7-4FB6-8673-679F8E8FC97A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {07380343-4BC7-4FB6-8673-679F8E8FC97A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {07380343-4BC7-4FB6-8673-679F8E8FC97A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {07380343-4BC7-4FB6-8673-679F8E8FC97A}.Release|Any CPU.Build.0 = Release|Any CPU - {7C0CAD24-CA79-4CAF-828D-CB2C5DDFF20E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7C0CAD24-CA79-4CAF-828D-CB2C5DDFF20E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7C0CAD24-CA79-4CAF-828D-CB2C5DDFF20E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7C0CAD24-CA79-4CAF-828D-CB2C5DDFF20E}.Release|Any CPU.Build.0 = Release|Any CPU - {7D019797-D8C0-4595-8FE9-A9094A7DBBEA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7D019797-D8C0-4595-8FE9-A9094A7DBBEA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7D019797-D8C0-4595-8FE9-A9094A7DBBEA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7D019797-D8C0-4595-8FE9-A9094A7DBBEA}.Release|Any CPU.Build.0 = Release|Any CPU - {A71B614C-99B8-4038-AF3A-90184D9F9CEC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A71B614C-99B8-4038-AF3A-90184D9F9CEC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A71B614C-99B8-4038-AF3A-90184D9F9CEC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A71B614C-99B8-4038-AF3A-90184D9F9CEC}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -205,32 +137,12 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {A552648F-D0A8-452D-A6E0-64E1FE3FC44F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {A831D2B7-EF3D-4692-B3E1-D2B007A2531B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {1E12101F-3BC9-423D-9AEC-DBD2170F3BDD} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {C4E8CCE4-016B-4686-A48D-7E9338EE8850} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {83EE41F5-FBA2-471D-ADA9-0156074ABACE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {EB356936-20D1-429C-A8FC-CF06527EAD6C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {64A29682-A520-4EB2-B514-530C53C5A9FE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A835AC06-9647-40B8-8BFD-C887FB97A07B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {07380343-4BC7-4FB6-8673-679F8E8FC97A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {7C0CAD24-CA79-4CAF-828D-CB2C5DDFF20E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {7D019797-D8C0-4595-8FE9-A9094A7DBBEA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A71B614C-99B8-4038-AF3A-90184D9F9CEC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {83EE41F5-FBA2-471D-ADA9-0156074ABACE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {EB356936-20D1-429C-A8FC-CF06527EAD6C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {64A29682-A520-4EB2-B514-530C53C5A9FE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A835AC06-9647-40B8-8BFD-C887FB97A07B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {07380343-4BC7-4FB6-8673-679F8E8FC97A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {7C0CAD24-CA79-4CAF-828D-CB2C5DDFF20E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {7D019797-D8C0-4595-8FE9-A9094A7DBBEA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A71B614C-99B8-4038-AF3A-90184D9F9CEC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {544872FF-B5F1-4118-A6EB-FA2FE837A1FF} diff --git a/sdk/src/Services/CognitoIdentity/Generated/AmazonCognitoIdentityConfig.cs b/sdk/src/Services/CognitoIdentity/Generated/AmazonCognitoIdentityConfig.cs index 71ce3f14877e..1d5b867ad1b5 100644 --- a/sdk/src/Services/CognitoIdentity/Generated/AmazonCognitoIdentityConfig.cs +++ b/sdk/src/Services/CognitoIdentity/Generated/AmazonCognitoIdentityConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.CognitoIdentity public partial class AmazonCognitoIdentityConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("Cognito Identity", "4.0.0.0"); private static readonly AmazonCognitoIdentityEndpointResolver EndpointResolver = new AmazonCognitoIdentityEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("Cognito Identity", "3.7.401.8"); -======= - InternalSDKUtils.BuildUserAgentString("Cognito Identity", "3.7.401.35"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/CognitoIdentity/Properties/AssemblyInfo.cs b/sdk/src/Services/CognitoIdentity/Properties/AssemblyInfo.cs index b3a5529b847a..a2703674c25d 100644 --- a/sdk/src/Services/CognitoIdentity/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/CognitoIdentity/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.8")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.35")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/CognitoIdentityProvider/CognitoIdentityProvider.sln b/sdk/src/Services/CognitoIdentityProvider/CognitoIdentityProvider.sln index 7fe30c849b84..ceb0181e7f75 100644 --- a/sdk/src/Services/CognitoIdentityProvider/CognitoIdentityProvider.sln +++ b/sdk/src/Services/CognitoIdentityProvider/CognitoIdentityProvider.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {2D0CFDE6-7037-4BAA-9BC7-00D5F8DE827D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {2D0CFDE6-7037-4BAA-9BC7-00D5F8DE827D}.Debug|Any CPU.Build.0 = Debug|Any CPU {2D0CFDE6-7037-4BAA-9BC7-00D5F8DE827D}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {B7DEC2FC-E0B1-4EEE-97E8-66BD275FF011}.Debug|Any CPU.Build.0 = Debug|Any CPU {B7DEC2FC-E0B1-4EEE-97E8-66BD275FF011}.Release|Any CPU.ActiveCfg = Release|Any CPU {B7DEC2FC-E0B1-4EEE-97E8-66BD275FF011}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {DD078874-C5B2-439E-B861-D46057D8DA9A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DD078874-C5B2-439E-B861-D46057D8DA9A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DD078874-C5B2-439E-B861-D46057D8DA9A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DD078874-C5B2-439E-B861-D46057D8DA9A}.Release|Any CPU.Build.0 = Release|Any CPU - {58F89E48-2198-4588-A4EC-17830EDA653B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {58F89E48-2198-4588-A4EC-17830EDA653B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {58F89E48-2198-4588-A4EC-17830EDA653B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {58F89E48-2198-4588-A4EC-17830EDA653B}.Release|Any CPU.Build.0 = Release|Any CPU - {967A195E-06AE-44E7-BFDE-F2C74C140F13}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {967A195E-06AE-44E7-BFDE-F2C74C140F13}.Debug|Any CPU.Build.0 = Debug|Any CPU - {967A195E-06AE-44E7-BFDE-F2C74C140F13}.Release|Any CPU.ActiveCfg = Release|Any CPU - {967A195E-06AE-44E7-BFDE-F2C74C140F13}.Release|Any CPU.Build.0 = Release|Any CPU - {6E1F4541-F00A-4EB3-A0B3-26DD0AD275A1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6E1F4541-F00A-4EB3-A0B3-26DD0AD275A1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6E1F4541-F00A-4EB3-A0B3-26DD0AD275A1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6E1F4541-F00A-4EB3-A0B3-26DD0AD275A1}.Release|Any CPU.Build.0 = Release|Any CPU - {B650E905-0538-4117-8D6E-8E900F4E897E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B650E905-0538-4117-8D6E-8E900F4E897E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B650E905-0538-4117-8D6E-8E900F4E897E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B650E905-0538-4117-8D6E-8E900F4E897E}.Release|Any CPU.Build.0 = Release|Any CPU - {87930472-F3C2-43C2-961E-BC01B38BF122}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87930472-F3C2-43C2-961E-BC01B38BF122}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87930472-F3C2-43C2-961E-BC01B38BF122}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87930472-F3C2-43C2-961E-BC01B38BF122}.Release|Any CPU.Build.0 = Release|Any CPU - {775FDC3A-1BCD-4D95-B820-238DC9B1AF72}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {775FDC3A-1BCD-4D95-B820-238DC9B1AF72}.Debug|Any CPU.Build.0 = Debug|Any CPU - {775FDC3A-1BCD-4D95-B820-238DC9B1AF72}.Release|Any CPU.ActiveCfg = Release|Any CPU - {775FDC3A-1BCD-4D95-B820-238DC9B1AF72}.Release|Any CPU.Build.0 = Release|Any CPU - {A8A2E619-4E84-42FE-A060-7F46052D47B8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A8A2E619-4E84-42FE-A060-7F46052D47B8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A8A2E619-4E84-42FE-A060-7F46052D47B8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A8A2E619-4E84-42FE-A060-7F46052D47B8}.Release|Any CPU.Build.0 = Release|Any CPU - {09301F2F-84A4-4623-B5BF-1C2E955FADF9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {09301F2F-84A4-4623-B5BF-1C2E955FADF9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {09301F2F-84A4-4623-B5BF-1C2E955FADF9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {09301F2F-84A4-4623-B5BF-1C2E955FADF9}.Release|Any CPU.Build.0 = Release|Any CPU - {5DA5D171-DC70-410D-A77E-B1AC89FD5260}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5DA5D171-DC70-410D-A77E-B1AC89FD5260}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5DA5D171-DC70-410D-A77E-B1AC89FD5260}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5DA5D171-DC70-410D-A77E-B1AC89FD5260}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {DD078874-C5B2-439E-B861-D46057D8DA9A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DD078874-C5B2-439E-B861-D46057D8DA9A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DD078874-C5B2-439E-B861-D46057D8DA9A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DD078874-C5B2-439E-B861-D46057D8DA9A}.Release|Any CPU.Build.0 = Release|Any CPU - {58F89E48-2198-4588-A4EC-17830EDA653B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {58F89E48-2198-4588-A4EC-17830EDA653B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {58F89E48-2198-4588-A4EC-17830EDA653B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {58F89E48-2198-4588-A4EC-17830EDA653B}.Release|Any CPU.Build.0 = Release|Any CPU - {967A195E-06AE-44E7-BFDE-F2C74C140F13}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {967A195E-06AE-44E7-BFDE-F2C74C140F13}.Debug|Any CPU.Build.0 = Debug|Any CPU - {967A195E-06AE-44E7-BFDE-F2C74C140F13}.Release|Any CPU.ActiveCfg = Release|Any CPU - {967A195E-06AE-44E7-BFDE-F2C74C140F13}.Release|Any CPU.Build.0 = Release|Any CPU - {6E1F4541-F00A-4EB3-A0B3-26DD0AD275A1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6E1F4541-F00A-4EB3-A0B3-26DD0AD275A1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6E1F4541-F00A-4EB3-A0B3-26DD0AD275A1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6E1F4541-F00A-4EB3-A0B3-26DD0AD275A1}.Release|Any CPU.Build.0 = Release|Any CPU - {B650E905-0538-4117-8D6E-8E900F4E897E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B650E905-0538-4117-8D6E-8E900F4E897E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B650E905-0538-4117-8D6E-8E900F4E897E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B650E905-0538-4117-8D6E-8E900F4E897E}.Release|Any CPU.Build.0 = Release|Any CPU - {87930472-F3C2-43C2-961E-BC01B38BF122}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87930472-F3C2-43C2-961E-BC01B38BF122}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87930472-F3C2-43C2-961E-BC01B38BF122}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87930472-F3C2-43C2-961E-BC01B38BF122}.Release|Any CPU.Build.0 = Release|Any CPU - {775FDC3A-1BCD-4D95-B820-238DC9B1AF72}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {775FDC3A-1BCD-4D95-B820-238DC9B1AF72}.Debug|Any CPU.Build.0 = Debug|Any CPU - {775FDC3A-1BCD-4D95-B820-238DC9B1AF72}.Release|Any CPU.ActiveCfg = Release|Any CPU - {775FDC3A-1BCD-4D95-B820-238DC9B1AF72}.Release|Any CPU.Build.0 = Release|Any CPU - {A8A2E619-4E84-42FE-A060-7F46052D47B8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A8A2E619-4E84-42FE-A060-7F46052D47B8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A8A2E619-4E84-42FE-A060-7F46052D47B8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A8A2E619-4E84-42FE-A060-7F46052D47B8}.Release|Any CPU.Build.0 = Release|Any CPU - {09301F2F-84A4-4623-B5BF-1C2E955FADF9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {09301F2F-84A4-4623-B5BF-1C2E955FADF9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {09301F2F-84A4-4623-B5BF-1C2E955FADF9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {09301F2F-84A4-4623-B5BF-1C2E955FADF9}.Release|Any CPU.Build.0 = Release|Any CPU - {5DA5D171-DC70-410D-A77E-B1AC89FD5260}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5DA5D171-DC70-410D-A77E-B1AC89FD5260}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5DA5D171-DC70-410D-A77E-B1AC89FD5260}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5DA5D171-DC70-410D-A77E-B1AC89FD5260}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {2D0CFDE6-7037-4BAA-9BC7-00D5F8DE827D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {B6C6A7CC-36CC-4C59-80B3-A80B48FC9B7D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {DA91CC08-B848-4759-8CEA-F6E4B008CEB0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {909852B2-6649-49FC-92FE-BDC99C148932} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {B7DEC2FC-E0B1-4EEE-97E8-66BD275FF011} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {DD078874-C5B2-439E-B861-D46057D8DA9A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {58F89E48-2198-4588-A4EC-17830EDA653B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {967A195E-06AE-44E7-BFDE-F2C74C140F13} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6E1F4541-F00A-4EB3-A0B3-26DD0AD275A1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B650E905-0538-4117-8D6E-8E900F4E897E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {87930472-F3C2-43C2-961E-BC01B38BF122} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {775FDC3A-1BCD-4D95-B820-238DC9B1AF72} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A8A2E619-4E84-42FE-A060-7F46052D47B8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {09301F2F-84A4-4623-B5BF-1C2E955FADF9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {5DA5D171-DC70-410D-A77E-B1AC89FD5260} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {DD078874-C5B2-439E-B861-D46057D8DA9A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {58F89E48-2198-4588-A4EC-17830EDA653B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {967A195E-06AE-44E7-BFDE-F2C74C140F13} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6E1F4541-F00A-4EB3-A0B3-26DD0AD275A1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B650E905-0538-4117-8D6E-8E900F4E897E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {87930472-F3C2-43C2-961E-BC01B38BF122} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {775FDC3A-1BCD-4D95-B820-238DC9B1AF72} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A8A2E619-4E84-42FE-A060-7F46052D47B8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {09301F2F-84A4-4623-B5BF-1C2E955FADF9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {5DA5D171-DC70-410D-A77E-B1AC89FD5260} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {210292FB-F38F-44D7-BDCD-7146615DE163} diff --git a/sdk/src/Services/CognitoIdentityProvider/Generated/AmazonCognitoIdentityProviderConfig.cs b/sdk/src/Services/CognitoIdentityProvider/Generated/AmazonCognitoIdentityProviderConfig.cs index 621d8de35094..623e92e0f344 100644 --- a/sdk/src/Services/CognitoIdentityProvider/Generated/AmazonCognitoIdentityProviderConfig.cs +++ b/sdk/src/Services/CognitoIdentityProvider/Generated/AmazonCognitoIdentityProviderConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.CognitoIdentityProvider public partial class AmazonCognitoIdentityProviderConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("Cognito Identity Provider", "4.0.0.0"); private static readonly AmazonCognitoIdentityProviderEndpointResolver EndpointResolver = new AmazonCognitoIdentityProviderEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("Cognito Identity Provider", "3.7.403.7"); -======= - InternalSDKUtils.BuildUserAgentString("Cognito Identity Provider", "3.7.403.34"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/CognitoIdentityProvider/Properties/AssemblyInfo.cs b/sdk/src/Services/CognitoIdentityProvider/Properties/AssemblyInfo.cs index 3709156a1b48..8ab9631b8099 100644 --- a/sdk/src/Services/CognitoIdentityProvider/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/CognitoIdentityProvider/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.403.7")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.403.34")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/CognitoSync/CognitoSync.sln b/sdk/src/Services/CognitoSync/CognitoSync.sln index bbbab22a8e2a..13bf1f7d753e 100644 --- a/sdk/src/Services/CognitoSync/CognitoSync.sln +++ b/sdk/src/Services/CognitoSync/CognitoSync.sln @@ -116,7 +116,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {98F18FC6-48FC-453F-B854-0C71A0BC2AF1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {98F18FC6-48FC-453F-B854-0C71A0BC2AF1}.Debug|Any CPU.Build.0 = Debug|Any CPU {98F18FC6-48FC-453F-B854-0C71A0BC2AF1}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -137,97 +144,6 @@ Global {19D536E1-5A53-4F4F-8C48-4F89DCAE3252}.Debug|Any CPU.Build.0 = Debug|Any CPU {19D536E1-5A53-4F4F-8C48-4F89DCAE3252}.Release|Any CPU.ActiveCfg = Release|Any CPU {19D536E1-5A53-4F4F-8C48-4F89DCAE3252}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {8392048A-3A60-4AAA-969B-087A10A5BF22}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8392048A-3A60-4AAA-969B-087A10A5BF22}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8392048A-3A60-4AAA-969B-087A10A5BF22}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8392048A-3A60-4AAA-969B-087A10A5BF22}.Release|Any CPU.Build.0 = Release|Any CPU - {E62390D5-5074-4902-BA7F-B3F07C52157F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E62390D5-5074-4902-BA7F-B3F07C52157F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E62390D5-5074-4902-BA7F-B3F07C52157F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E62390D5-5074-4902-BA7F-B3F07C52157F}.Release|Any CPU.Build.0 = Release|Any CPU - {EE373EA2-3F4A-4715-91AA-234687C758ED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EE373EA2-3F4A-4715-91AA-234687C758ED}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EE373EA2-3F4A-4715-91AA-234687C758ED}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EE373EA2-3F4A-4715-91AA-234687C758ED}.Release|Any CPU.Build.0 = Release|Any CPU - {A33569CF-BE32-4EF7-97DB-5F72F010FFD8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A33569CF-BE32-4EF7-97DB-5F72F010FFD8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A33569CF-BE32-4EF7-97DB-5F72F010FFD8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A33569CF-BE32-4EF7-97DB-5F72F010FFD8}.Release|Any CPU.Build.0 = Release|Any CPU - {7D2232AD-C1FB-4E95-922D-5A9188490126}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7D2232AD-C1FB-4E95-922D-5A9188490126}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7D2232AD-C1FB-4E95-922D-5A9188490126}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7D2232AD-C1FB-4E95-922D-5A9188490126}.Release|Any CPU.Build.0 = Release|Any CPU - {E6A6EB89-B98F-43B1-A2EE-0FB76C22B060}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E6A6EB89-B98F-43B1-A2EE-0FB76C22B060}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E6A6EB89-B98F-43B1-A2EE-0FB76C22B060}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E6A6EB89-B98F-43B1-A2EE-0FB76C22B060}.Release|Any CPU.Build.0 = Release|Any CPU - {B5625359-BC15-48CA-8099-3AB1A70F3554}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B5625359-BC15-48CA-8099-3AB1A70F3554}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B5625359-BC15-48CA-8099-3AB1A70F3554}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B5625359-BC15-48CA-8099-3AB1A70F3554}.Release|Any CPU.Build.0 = Release|Any CPU - {CB2C7C60-4911-4348-B695-70D10A5B66F4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CB2C7C60-4911-4348-B695-70D10A5B66F4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CB2C7C60-4911-4348-B695-70D10A5B66F4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CB2C7C60-4911-4348-B695-70D10A5B66F4}.Release|Any CPU.Build.0 = Release|Any CPU - {E1580E4A-5043-498D-B0D7-6748F087BF73}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E1580E4A-5043-498D-B0D7-6748F087BF73}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E1580E4A-5043-498D-B0D7-6748F087BF73}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E1580E4A-5043-498D-B0D7-6748F087BF73}.Release|Any CPU.Build.0 = Release|Any CPU - {6CA7325B-B442-4E72-A819-7CA9EFB3A542}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6CA7325B-B442-4E72-A819-7CA9EFB3A542}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6CA7325B-B442-4E72-A819-7CA9EFB3A542}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6CA7325B-B442-4E72-A819-7CA9EFB3A542}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {8392048A-3A60-4AAA-969B-087A10A5BF22}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8392048A-3A60-4AAA-969B-087A10A5BF22}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8392048A-3A60-4AAA-969B-087A10A5BF22}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8392048A-3A60-4AAA-969B-087A10A5BF22}.Release|Any CPU.Build.0 = Release|Any CPU - {E62390D5-5074-4902-BA7F-B3F07C52157F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E62390D5-5074-4902-BA7F-B3F07C52157F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E62390D5-5074-4902-BA7F-B3F07C52157F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E62390D5-5074-4902-BA7F-B3F07C52157F}.Release|Any CPU.Build.0 = Release|Any CPU - {EE373EA2-3F4A-4715-91AA-234687C758ED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EE373EA2-3F4A-4715-91AA-234687C758ED}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EE373EA2-3F4A-4715-91AA-234687C758ED}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EE373EA2-3F4A-4715-91AA-234687C758ED}.Release|Any CPU.Build.0 = Release|Any CPU - {A33569CF-BE32-4EF7-97DB-5F72F010FFD8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A33569CF-BE32-4EF7-97DB-5F72F010FFD8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A33569CF-BE32-4EF7-97DB-5F72F010FFD8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A33569CF-BE32-4EF7-97DB-5F72F010FFD8}.Release|Any CPU.Build.0 = Release|Any CPU - {7D2232AD-C1FB-4E95-922D-5A9188490126}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7D2232AD-C1FB-4E95-922D-5A9188490126}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7D2232AD-C1FB-4E95-922D-5A9188490126}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7D2232AD-C1FB-4E95-922D-5A9188490126}.Release|Any CPU.Build.0 = Release|Any CPU - {E6A6EB89-B98F-43B1-A2EE-0FB76C22B060}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E6A6EB89-B98F-43B1-A2EE-0FB76C22B060}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E6A6EB89-B98F-43B1-A2EE-0FB76C22B060}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E6A6EB89-B98F-43B1-A2EE-0FB76C22B060}.Release|Any CPU.Build.0 = Release|Any CPU - {B5625359-BC15-48CA-8099-3AB1A70F3554}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B5625359-BC15-48CA-8099-3AB1A70F3554}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B5625359-BC15-48CA-8099-3AB1A70F3554}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B5625359-BC15-48CA-8099-3AB1A70F3554}.Release|Any CPU.Build.0 = Release|Any CPU - {CB2C7C60-4911-4348-B695-70D10A5B66F4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CB2C7C60-4911-4348-B695-70D10A5B66F4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CB2C7C60-4911-4348-B695-70D10A5B66F4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CB2C7C60-4911-4348-B695-70D10A5B66F4}.Release|Any CPU.Build.0 = Release|Any CPU - {E1580E4A-5043-498D-B0D7-6748F087BF73}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E1580E4A-5043-498D-B0D7-6748F087BF73}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E1580E4A-5043-498D-B0D7-6748F087BF73}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E1580E4A-5043-498D-B0D7-6748F087BF73}.Release|Any CPU.Build.0 = Release|Any CPU - {6CA7325B-B442-4E72-A819-7CA9EFB3A542}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6CA7325B-B442-4E72-A819-7CA9EFB3A542}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6CA7325B-B442-4E72-A819-7CA9EFB3A542}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6CA7325B-B442-4E72-A819-7CA9EFB3A542}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -248,37 +164,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {98F18FC6-48FC-453F-B854-0C71A0BC2AF1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {22E6F55E-8070-4BB6-82AA-D0E4C2E5C642} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {5ECA8D69-9FA4-4099-B928-39A5D0097F07} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {EB1568C6-99DA-4402-89CA-5C6D1846F949} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {19D536E1-5A53-4F4F-8C48-4F89DCAE3252} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {8392048A-3A60-4AAA-969B-087A10A5BF22} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E62390D5-5074-4902-BA7F-B3F07C52157F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {EE373EA2-3F4A-4715-91AA-234687C758ED} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A33569CF-BE32-4EF7-97DB-5F72F010FFD8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {7D2232AD-C1FB-4E95-922D-5A9188490126} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E6A6EB89-B98F-43B1-A2EE-0FB76C22B060} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B5625359-BC15-48CA-8099-3AB1A70F3554} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {CB2C7C60-4911-4348-B695-70D10A5B66F4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E1580E4A-5043-498D-B0D7-6748F087BF73} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6CA7325B-B442-4E72-A819-7CA9EFB3A542} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {8392048A-3A60-4AAA-969B-087A10A5BF22} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E62390D5-5074-4902-BA7F-B3F07C52157F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {EE373EA2-3F4A-4715-91AA-234687C758ED} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A33569CF-BE32-4EF7-97DB-5F72F010FFD8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {7D2232AD-C1FB-4E95-922D-5A9188490126} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E6A6EB89-B98F-43B1-A2EE-0FB76C22B060} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B5625359-BC15-48CA-8099-3AB1A70F3554} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {CB2C7C60-4911-4348-B695-70D10A5B66F4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E1580E4A-5043-498D-B0D7-6748F087BF73} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6CA7325B-B442-4E72-A819-7CA9EFB3A542} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {869F3A25-A329-4595-AD9D-5EE5326204F8} diff --git a/sdk/src/Services/CognitoSync/Generated/AmazonCognitoSyncConfig.cs b/sdk/src/Services/CognitoSync/Generated/AmazonCognitoSyncConfig.cs index 87fdcfd13582..87e499090920 100644 --- a/sdk/src/Services/CognitoSync/Generated/AmazonCognitoSyncConfig.cs +++ b/sdk/src/Services/CognitoSync/Generated/AmazonCognitoSyncConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.CognitoSync public partial class AmazonCognitoSyncConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("Cognito Sync", "4.0.0.0"); private static readonly AmazonCognitoSyncEndpointResolver EndpointResolver = new AmazonCognitoSyncEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("Cognito Sync", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("Cognito Sync", "3.7.400.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/CognitoSync/Properties/AssemblyInfo.cs b/sdk/src/Services/CognitoSync/Properties/AssemblyInfo.cs index ebafec0606da..8ba57ea76c66 100644 --- a/sdk/src/Services/CognitoSync/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/CognitoSync/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/Comprehend/Comprehend.sln b/sdk/src/Services/Comprehend/Comprehend.sln index 7435be37c08d..652a644b1a83 100644 --- a/sdk/src/Services/Comprehend/Comprehend.sln +++ b/sdk/src/Services/Comprehend/Comprehend.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {BB12244A-BFDD-4993-AD84-74254E693EFB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {BB12244A-BFDD-4993-AD84-74254E693EFB}.Debug|Any CPU.Build.0 = Debug|Any CPU {BB12244A-BFDD-4993-AD84-74254E693EFB}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {34BDC53D-C840-40C6-AB81-141A528C8A50}.Debug|Any CPU.Build.0 = Debug|Any CPU {34BDC53D-C840-40C6-AB81-141A528C8A50}.Release|Any CPU.ActiveCfg = Release|Any CPU {34BDC53D-C840-40C6-AB81-141A528C8A50}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {AB0AF94C-B34E-43E9-A897-FEB1481FCE71}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AB0AF94C-B34E-43E9-A897-FEB1481FCE71}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AB0AF94C-B34E-43E9-A897-FEB1481FCE71}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AB0AF94C-B34E-43E9-A897-FEB1481FCE71}.Release|Any CPU.Build.0 = Release|Any CPU - {4AD0DB36-2CEA-44E2-A923-FAB1763E64F4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4AD0DB36-2CEA-44E2-A923-FAB1763E64F4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4AD0DB36-2CEA-44E2-A923-FAB1763E64F4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4AD0DB36-2CEA-44E2-A923-FAB1763E64F4}.Release|Any CPU.Build.0 = Release|Any CPU - {EF6ED6A6-745D-4338-B9B8-C9C8249416AA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EF6ED6A6-745D-4338-B9B8-C9C8249416AA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EF6ED6A6-745D-4338-B9B8-C9C8249416AA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EF6ED6A6-745D-4338-B9B8-C9C8249416AA}.Release|Any CPU.Build.0 = Release|Any CPU - {6C27CA97-5A23-49EC-9142-0A498771534C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6C27CA97-5A23-49EC-9142-0A498771534C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6C27CA97-5A23-49EC-9142-0A498771534C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6C27CA97-5A23-49EC-9142-0A498771534C}.Release|Any CPU.Build.0 = Release|Any CPU - {9C6D5FC5-0C42-4167-9D69-AD77D44DD368}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9C6D5FC5-0C42-4167-9D69-AD77D44DD368}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9C6D5FC5-0C42-4167-9D69-AD77D44DD368}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9C6D5FC5-0C42-4167-9D69-AD77D44DD368}.Release|Any CPU.Build.0 = Release|Any CPU - {FB8CFDBA-A33D-4845-8DF4-1512221B9DFC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FB8CFDBA-A33D-4845-8DF4-1512221B9DFC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FB8CFDBA-A33D-4845-8DF4-1512221B9DFC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FB8CFDBA-A33D-4845-8DF4-1512221B9DFC}.Release|Any CPU.Build.0 = Release|Any CPU - {03C2B555-89E1-48EE-9B80-35250F86AB20}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {03C2B555-89E1-48EE-9B80-35250F86AB20}.Debug|Any CPU.Build.0 = Debug|Any CPU - {03C2B555-89E1-48EE-9B80-35250F86AB20}.Release|Any CPU.ActiveCfg = Release|Any CPU - {03C2B555-89E1-48EE-9B80-35250F86AB20}.Release|Any CPU.Build.0 = Release|Any CPU - {F0EA2A91-6FD6-4B6D-91BC-4248CFDEE2F6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F0EA2A91-6FD6-4B6D-91BC-4248CFDEE2F6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F0EA2A91-6FD6-4B6D-91BC-4248CFDEE2F6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F0EA2A91-6FD6-4B6D-91BC-4248CFDEE2F6}.Release|Any CPU.Build.0 = Release|Any CPU - {912710D2-A8E3-493D-8104-C9C99A25CB13}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {912710D2-A8E3-493D-8104-C9C99A25CB13}.Debug|Any CPU.Build.0 = Debug|Any CPU - {912710D2-A8E3-493D-8104-C9C99A25CB13}.Release|Any CPU.ActiveCfg = Release|Any CPU - {912710D2-A8E3-493D-8104-C9C99A25CB13}.Release|Any CPU.Build.0 = Release|Any CPU - {6F9367D9-C583-44EB-B611-7819C4ACC0E5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6F9367D9-C583-44EB-B611-7819C4ACC0E5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6F9367D9-C583-44EB-B611-7819C4ACC0E5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6F9367D9-C583-44EB-B611-7819C4ACC0E5}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {AB0AF94C-B34E-43E9-A897-FEB1481FCE71}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AB0AF94C-B34E-43E9-A897-FEB1481FCE71}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AB0AF94C-B34E-43E9-A897-FEB1481FCE71}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AB0AF94C-B34E-43E9-A897-FEB1481FCE71}.Release|Any CPU.Build.0 = Release|Any CPU - {4AD0DB36-2CEA-44E2-A923-FAB1763E64F4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4AD0DB36-2CEA-44E2-A923-FAB1763E64F4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4AD0DB36-2CEA-44E2-A923-FAB1763E64F4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4AD0DB36-2CEA-44E2-A923-FAB1763E64F4}.Release|Any CPU.Build.0 = Release|Any CPU - {EF6ED6A6-745D-4338-B9B8-C9C8249416AA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EF6ED6A6-745D-4338-B9B8-C9C8249416AA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EF6ED6A6-745D-4338-B9B8-C9C8249416AA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EF6ED6A6-745D-4338-B9B8-C9C8249416AA}.Release|Any CPU.Build.0 = Release|Any CPU - {6C27CA97-5A23-49EC-9142-0A498771534C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6C27CA97-5A23-49EC-9142-0A498771534C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6C27CA97-5A23-49EC-9142-0A498771534C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6C27CA97-5A23-49EC-9142-0A498771534C}.Release|Any CPU.Build.0 = Release|Any CPU - {9C6D5FC5-0C42-4167-9D69-AD77D44DD368}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9C6D5FC5-0C42-4167-9D69-AD77D44DD368}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9C6D5FC5-0C42-4167-9D69-AD77D44DD368}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9C6D5FC5-0C42-4167-9D69-AD77D44DD368}.Release|Any CPU.Build.0 = Release|Any CPU - {FB8CFDBA-A33D-4845-8DF4-1512221B9DFC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FB8CFDBA-A33D-4845-8DF4-1512221B9DFC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FB8CFDBA-A33D-4845-8DF4-1512221B9DFC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FB8CFDBA-A33D-4845-8DF4-1512221B9DFC}.Release|Any CPU.Build.0 = Release|Any CPU - {03C2B555-89E1-48EE-9B80-35250F86AB20}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {03C2B555-89E1-48EE-9B80-35250F86AB20}.Debug|Any CPU.Build.0 = Debug|Any CPU - {03C2B555-89E1-48EE-9B80-35250F86AB20}.Release|Any CPU.ActiveCfg = Release|Any CPU - {03C2B555-89E1-48EE-9B80-35250F86AB20}.Release|Any CPU.Build.0 = Release|Any CPU - {F0EA2A91-6FD6-4B6D-91BC-4248CFDEE2F6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F0EA2A91-6FD6-4B6D-91BC-4248CFDEE2F6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F0EA2A91-6FD6-4B6D-91BC-4248CFDEE2F6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F0EA2A91-6FD6-4B6D-91BC-4248CFDEE2F6}.Release|Any CPU.Build.0 = Release|Any CPU - {912710D2-A8E3-493D-8104-C9C99A25CB13}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {912710D2-A8E3-493D-8104-C9C99A25CB13}.Debug|Any CPU.Build.0 = Debug|Any CPU - {912710D2-A8E3-493D-8104-C9C99A25CB13}.Release|Any CPU.ActiveCfg = Release|Any CPU - {912710D2-A8E3-493D-8104-C9C99A25CB13}.Release|Any CPU.Build.0 = Release|Any CPU - {6F9367D9-C583-44EB-B611-7819C4ACC0E5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6F9367D9-C583-44EB-B611-7819C4ACC0E5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6F9367D9-C583-44EB-B611-7819C4ACC0E5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6F9367D9-C583-44EB-B611-7819C4ACC0E5}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {BB12244A-BFDD-4993-AD84-74254E693EFB} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {E119C424-E0DE-44F1-A123-005A582F6222} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {91627159-F4FE-4694-B4C0-EDC77FFF8AF1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {FE9A9918-0E76-4BFC-9CDE-0AF4D769E955} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {34BDC53D-C840-40C6-AB81-141A528C8A50} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {AB0AF94C-B34E-43E9-A897-FEB1481FCE71} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4AD0DB36-2CEA-44E2-A923-FAB1763E64F4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {EF6ED6A6-745D-4338-B9B8-C9C8249416AA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6C27CA97-5A23-49EC-9142-0A498771534C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {9C6D5FC5-0C42-4167-9D69-AD77D44DD368} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {FB8CFDBA-A33D-4845-8DF4-1512221B9DFC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {03C2B555-89E1-48EE-9B80-35250F86AB20} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F0EA2A91-6FD6-4B6D-91BC-4248CFDEE2F6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {912710D2-A8E3-493D-8104-C9C99A25CB13} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6F9367D9-C583-44EB-B611-7819C4ACC0E5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {AB0AF94C-B34E-43E9-A897-FEB1481FCE71} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4AD0DB36-2CEA-44E2-A923-FAB1763E64F4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {EF6ED6A6-745D-4338-B9B8-C9C8249416AA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6C27CA97-5A23-49EC-9142-0A498771534C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {9C6D5FC5-0C42-4167-9D69-AD77D44DD368} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {FB8CFDBA-A33D-4845-8DF4-1512221B9DFC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {03C2B555-89E1-48EE-9B80-35250F86AB20} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F0EA2A91-6FD6-4B6D-91BC-4248CFDEE2F6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {912710D2-A8E3-493D-8104-C9C99A25CB13} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6F9367D9-C583-44EB-B611-7819C4ACC0E5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {EBDB7B6D-5E86-40D9-83CA-4FE34C5AC929} diff --git a/sdk/src/Services/Comprehend/Generated/AmazonComprehendConfig.cs b/sdk/src/Services/Comprehend/Generated/AmazonComprehendConfig.cs index 62cf662eebe9..22a60c8569af 100644 --- a/sdk/src/Services/Comprehend/Generated/AmazonComprehendConfig.cs +++ b/sdk/src/Services/Comprehend/Generated/AmazonComprehendConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.Comprehend public partial class AmazonComprehendConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("Comprehend", "4.0.0.0"); private static readonly AmazonComprehendEndpointResolver EndpointResolver = new AmazonComprehendEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("Comprehend", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("Comprehend", "3.7.400.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/Comprehend/Properties/AssemblyInfo.cs b/sdk/src/Services/Comprehend/Properties/AssemblyInfo.cs index c70cae2bdfb7..6a56cbd2ab68 100644 --- a/sdk/src/Services/Comprehend/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/Comprehend/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/ComprehendMedical/ComprehendMedical.sln b/sdk/src/Services/ComprehendMedical/ComprehendMedical.sln index dfc8aa5157b4..698db801e3c4 100644 --- a/sdk/src/Services/ComprehendMedical/ComprehendMedical.sln +++ b/sdk/src/Services/ComprehendMedical/ComprehendMedical.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {DE2180C4-AAC4-49F5-A7F0-8D3E33C5B49A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {DE2180C4-AAC4-49F5-A7F0-8D3E33C5B49A}.Debug|Any CPU.Build.0 = Debug|Any CPU {DE2180C4-AAC4-49F5-A7F0-8D3E33C5B49A}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {617D75B1-7E0D-4681-A6A9-992CBC65F5A0}.Debug|Any CPU.Build.0 = Debug|Any CPU {617D75B1-7E0D-4681-A6A9-992CBC65F5A0}.Release|Any CPU.ActiveCfg = Release|Any CPU {617D75B1-7E0D-4681-A6A9-992CBC65F5A0}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {4F2F6769-AAF6-474A-8EEA-F5D07B1CE43C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4F2F6769-AAF6-474A-8EEA-F5D07B1CE43C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4F2F6769-AAF6-474A-8EEA-F5D07B1CE43C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4F2F6769-AAF6-474A-8EEA-F5D07B1CE43C}.Release|Any CPU.Build.0 = Release|Any CPU - {E0E1C793-87F8-44DB-A000-415B5E984D87}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E0E1C793-87F8-44DB-A000-415B5E984D87}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E0E1C793-87F8-44DB-A000-415B5E984D87}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E0E1C793-87F8-44DB-A000-415B5E984D87}.Release|Any CPU.Build.0 = Release|Any CPU - {4A6405FF-0F9A-4157-8D93-8467A671BD59}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4A6405FF-0F9A-4157-8D93-8467A671BD59}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4A6405FF-0F9A-4157-8D93-8467A671BD59}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4A6405FF-0F9A-4157-8D93-8467A671BD59}.Release|Any CPU.Build.0 = Release|Any CPU - {F6829BC2-8080-40CB-B89B-C392832904C4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F6829BC2-8080-40CB-B89B-C392832904C4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F6829BC2-8080-40CB-B89B-C392832904C4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F6829BC2-8080-40CB-B89B-C392832904C4}.Release|Any CPU.Build.0 = Release|Any CPU - {D62E8953-3354-4EB3-85CD-4153A4CB0D40}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D62E8953-3354-4EB3-85CD-4153A4CB0D40}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D62E8953-3354-4EB3-85CD-4153A4CB0D40}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D62E8953-3354-4EB3-85CD-4153A4CB0D40}.Release|Any CPU.Build.0 = Release|Any CPU - {A9E3A377-CC15-406C-A899-D0BD43058B61}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A9E3A377-CC15-406C-A899-D0BD43058B61}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A9E3A377-CC15-406C-A899-D0BD43058B61}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A9E3A377-CC15-406C-A899-D0BD43058B61}.Release|Any CPU.Build.0 = Release|Any CPU - {3C64978E-84FD-424C-B697-F2B581741E71}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3C64978E-84FD-424C-B697-F2B581741E71}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3C64978E-84FD-424C-B697-F2B581741E71}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3C64978E-84FD-424C-B697-F2B581741E71}.Release|Any CPU.Build.0 = Release|Any CPU - {3EB25FDD-A1E5-4AB3-8849-D5F3F8B4E5D4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3EB25FDD-A1E5-4AB3-8849-D5F3F8B4E5D4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3EB25FDD-A1E5-4AB3-8849-D5F3F8B4E5D4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3EB25FDD-A1E5-4AB3-8849-D5F3F8B4E5D4}.Release|Any CPU.Build.0 = Release|Any CPU - {B463CC78-2BD2-4AB2-9F69-EBE19B6F2F44}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B463CC78-2BD2-4AB2-9F69-EBE19B6F2F44}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B463CC78-2BD2-4AB2-9F69-EBE19B6F2F44}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B463CC78-2BD2-4AB2-9F69-EBE19B6F2F44}.Release|Any CPU.Build.0 = Release|Any CPU - {8F675C5D-BF0E-459C-8BB2-1E57D43905C7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8F675C5D-BF0E-459C-8BB2-1E57D43905C7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8F675C5D-BF0E-459C-8BB2-1E57D43905C7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8F675C5D-BF0E-459C-8BB2-1E57D43905C7}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {4F2F6769-AAF6-474A-8EEA-F5D07B1CE43C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4F2F6769-AAF6-474A-8EEA-F5D07B1CE43C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4F2F6769-AAF6-474A-8EEA-F5D07B1CE43C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4F2F6769-AAF6-474A-8EEA-F5D07B1CE43C}.Release|Any CPU.Build.0 = Release|Any CPU - {E0E1C793-87F8-44DB-A000-415B5E984D87}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E0E1C793-87F8-44DB-A000-415B5E984D87}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E0E1C793-87F8-44DB-A000-415B5E984D87}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E0E1C793-87F8-44DB-A000-415B5E984D87}.Release|Any CPU.Build.0 = Release|Any CPU - {4A6405FF-0F9A-4157-8D93-8467A671BD59}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4A6405FF-0F9A-4157-8D93-8467A671BD59}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4A6405FF-0F9A-4157-8D93-8467A671BD59}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4A6405FF-0F9A-4157-8D93-8467A671BD59}.Release|Any CPU.Build.0 = Release|Any CPU - {F6829BC2-8080-40CB-B89B-C392832904C4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F6829BC2-8080-40CB-B89B-C392832904C4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F6829BC2-8080-40CB-B89B-C392832904C4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F6829BC2-8080-40CB-B89B-C392832904C4}.Release|Any CPU.Build.0 = Release|Any CPU - {D62E8953-3354-4EB3-85CD-4153A4CB0D40}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D62E8953-3354-4EB3-85CD-4153A4CB0D40}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D62E8953-3354-4EB3-85CD-4153A4CB0D40}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D62E8953-3354-4EB3-85CD-4153A4CB0D40}.Release|Any CPU.Build.0 = Release|Any CPU - {A9E3A377-CC15-406C-A899-D0BD43058B61}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A9E3A377-CC15-406C-A899-D0BD43058B61}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A9E3A377-CC15-406C-A899-D0BD43058B61}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A9E3A377-CC15-406C-A899-D0BD43058B61}.Release|Any CPU.Build.0 = Release|Any CPU - {3C64978E-84FD-424C-B697-F2B581741E71}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3C64978E-84FD-424C-B697-F2B581741E71}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3C64978E-84FD-424C-B697-F2B581741E71}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3C64978E-84FD-424C-B697-F2B581741E71}.Release|Any CPU.Build.0 = Release|Any CPU - {3EB25FDD-A1E5-4AB3-8849-D5F3F8B4E5D4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3EB25FDD-A1E5-4AB3-8849-D5F3F8B4E5D4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3EB25FDD-A1E5-4AB3-8849-D5F3F8B4E5D4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3EB25FDD-A1E5-4AB3-8849-D5F3F8B4E5D4}.Release|Any CPU.Build.0 = Release|Any CPU - {B463CC78-2BD2-4AB2-9F69-EBE19B6F2F44}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B463CC78-2BD2-4AB2-9F69-EBE19B6F2F44}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B463CC78-2BD2-4AB2-9F69-EBE19B6F2F44}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B463CC78-2BD2-4AB2-9F69-EBE19B6F2F44}.Release|Any CPU.Build.0 = Release|Any CPU - {8F675C5D-BF0E-459C-8BB2-1E57D43905C7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8F675C5D-BF0E-459C-8BB2-1E57D43905C7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8F675C5D-BF0E-459C-8BB2-1E57D43905C7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8F675C5D-BF0E-459C-8BB2-1E57D43905C7}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {DE2180C4-AAC4-49F5-A7F0-8D3E33C5B49A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {A669F76E-396E-48A0-AF29-B2C42F4BC3A7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {F6296EB4-F245-40B7-BDBB-2B912C227D27} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {D5E6E5D2-FA2E-42DB-9238-E7D3ADD8D20A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {617D75B1-7E0D-4681-A6A9-992CBC65F5A0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {4F2F6769-AAF6-474A-8EEA-F5D07B1CE43C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E0E1C793-87F8-44DB-A000-415B5E984D87} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4A6405FF-0F9A-4157-8D93-8467A671BD59} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F6829BC2-8080-40CB-B89B-C392832904C4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D62E8953-3354-4EB3-85CD-4153A4CB0D40} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A9E3A377-CC15-406C-A899-D0BD43058B61} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {3C64978E-84FD-424C-B697-F2B581741E71} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {3EB25FDD-A1E5-4AB3-8849-D5F3F8B4E5D4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B463CC78-2BD2-4AB2-9F69-EBE19B6F2F44} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8F675C5D-BF0E-459C-8BB2-1E57D43905C7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {4F2F6769-AAF6-474A-8EEA-F5D07B1CE43C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E0E1C793-87F8-44DB-A000-415B5E984D87} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4A6405FF-0F9A-4157-8D93-8467A671BD59} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F6829BC2-8080-40CB-B89B-C392832904C4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D62E8953-3354-4EB3-85CD-4153A4CB0D40} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A9E3A377-CC15-406C-A899-D0BD43058B61} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {3C64978E-84FD-424C-B697-F2B581741E71} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {3EB25FDD-A1E5-4AB3-8849-D5F3F8B4E5D4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B463CC78-2BD2-4AB2-9F69-EBE19B6F2F44} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8F675C5D-BF0E-459C-8BB2-1E57D43905C7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {B77BBD89-DAAD-4597-B829-687425AC19E9} diff --git a/sdk/src/Services/ComprehendMedical/Generated/AmazonComprehendMedicalConfig.cs b/sdk/src/Services/ComprehendMedical/Generated/AmazonComprehendMedicalConfig.cs index 664eb9041167..7c992b1f143f 100644 --- a/sdk/src/Services/ComprehendMedical/Generated/AmazonComprehendMedicalConfig.cs +++ b/sdk/src/Services/ComprehendMedical/Generated/AmazonComprehendMedicalConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.ComprehendMedical public partial class AmazonComprehendMedicalConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("ComprehendMedical", "4.0.0.0"); private static readonly AmazonComprehendMedicalEndpointResolver EndpointResolver = new AmazonComprehendMedicalEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("ComprehendMedical", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("ComprehendMedical", "3.7.400.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/ComprehendMedical/Properties/AssemblyInfo.cs b/sdk/src/Services/ComprehendMedical/Properties/AssemblyInfo.cs index 7583d0b462de..07ae37117f23 100644 --- a/sdk/src/Services/ComprehendMedical/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/ComprehendMedical/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/ComputeOptimizer/ComputeOptimizer.sln b/sdk/src/Services/ComputeOptimizer/ComputeOptimizer.sln index ddb9c3d90a19..f6f3939bf62a 100644 --- a/sdk/src/Services/ComputeOptimizer/ComputeOptimizer.sln +++ b/sdk/src/Services/ComputeOptimizer/ComputeOptimizer.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {E732C86A-280F-4635-B32F-0AD9A0C92F33}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {E732C86A-280F-4635-B32F-0AD9A0C92F33}.Debug|Any CPU.Build.0 = Debug|Any CPU {E732C86A-280F-4635-B32F-0AD9A0C92F33}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {24463629-5F9E-48B4-A4ED-F5F6781F3DEA}.Debug|Any CPU.Build.0 = Debug|Any CPU {24463629-5F9E-48B4-A4ED-F5F6781F3DEA}.Release|Any CPU.ActiveCfg = Release|Any CPU {24463629-5F9E-48B4-A4ED-F5F6781F3DEA}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {61C2AA35-05CF-45C1-9951-68F54AC77E98}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {61C2AA35-05CF-45C1-9951-68F54AC77E98}.Debug|Any CPU.Build.0 = Debug|Any CPU - {61C2AA35-05CF-45C1-9951-68F54AC77E98}.Release|Any CPU.ActiveCfg = Release|Any CPU - {61C2AA35-05CF-45C1-9951-68F54AC77E98}.Release|Any CPU.Build.0 = Release|Any CPU - {43373129-BAB0-41B8-BAB7-51C3E87D0AF7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {43373129-BAB0-41B8-BAB7-51C3E87D0AF7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {43373129-BAB0-41B8-BAB7-51C3E87D0AF7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {43373129-BAB0-41B8-BAB7-51C3E87D0AF7}.Release|Any CPU.Build.0 = Release|Any CPU - {0B1BB941-D523-41F1-92DA-78FA9387DADB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0B1BB941-D523-41F1-92DA-78FA9387DADB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0B1BB941-D523-41F1-92DA-78FA9387DADB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0B1BB941-D523-41F1-92DA-78FA9387DADB}.Release|Any CPU.Build.0 = Release|Any CPU - {C59CA93B-ECCE-4216-B7C1-5B14550C173D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C59CA93B-ECCE-4216-B7C1-5B14550C173D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C59CA93B-ECCE-4216-B7C1-5B14550C173D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C59CA93B-ECCE-4216-B7C1-5B14550C173D}.Release|Any CPU.Build.0 = Release|Any CPU - {52D375F6-F31B-49B8-8C3B-51D83CDC1078}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {52D375F6-F31B-49B8-8C3B-51D83CDC1078}.Debug|Any CPU.Build.0 = Debug|Any CPU - {52D375F6-F31B-49B8-8C3B-51D83CDC1078}.Release|Any CPU.ActiveCfg = Release|Any CPU - {52D375F6-F31B-49B8-8C3B-51D83CDC1078}.Release|Any CPU.Build.0 = Release|Any CPU - {061BE431-A69E-4DDC-9F8B-55068C82E3C8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {061BE431-A69E-4DDC-9F8B-55068C82E3C8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {061BE431-A69E-4DDC-9F8B-55068C82E3C8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {061BE431-A69E-4DDC-9F8B-55068C82E3C8}.Release|Any CPU.Build.0 = Release|Any CPU - {7515F751-04C9-42B3-B3CC-439F499CD2BB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7515F751-04C9-42B3-B3CC-439F499CD2BB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7515F751-04C9-42B3-B3CC-439F499CD2BB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7515F751-04C9-42B3-B3CC-439F499CD2BB}.Release|Any CPU.Build.0 = Release|Any CPU - {C6A1D456-D0DB-4CB9-B150-07D1B2AB038A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C6A1D456-D0DB-4CB9-B150-07D1B2AB038A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C6A1D456-D0DB-4CB9-B150-07D1B2AB038A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C6A1D456-D0DB-4CB9-B150-07D1B2AB038A}.Release|Any CPU.Build.0 = Release|Any CPU - {A9216F81-C377-4447-930B-EF5E05B14FDB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A9216F81-C377-4447-930B-EF5E05B14FDB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A9216F81-C377-4447-930B-EF5E05B14FDB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A9216F81-C377-4447-930B-EF5E05B14FDB}.Release|Any CPU.Build.0 = Release|Any CPU - {0F744AC2-609C-4E9C-B1FE-D6FA4E8DA843}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0F744AC2-609C-4E9C-B1FE-D6FA4E8DA843}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0F744AC2-609C-4E9C-B1FE-D6FA4E8DA843}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0F744AC2-609C-4E9C-B1FE-D6FA4E8DA843}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {61C2AA35-05CF-45C1-9951-68F54AC77E98}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {61C2AA35-05CF-45C1-9951-68F54AC77E98}.Debug|Any CPU.Build.0 = Debug|Any CPU - {61C2AA35-05CF-45C1-9951-68F54AC77E98}.Release|Any CPU.ActiveCfg = Release|Any CPU - {61C2AA35-05CF-45C1-9951-68F54AC77E98}.Release|Any CPU.Build.0 = Release|Any CPU - {43373129-BAB0-41B8-BAB7-51C3E87D0AF7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {43373129-BAB0-41B8-BAB7-51C3E87D0AF7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {43373129-BAB0-41B8-BAB7-51C3E87D0AF7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {43373129-BAB0-41B8-BAB7-51C3E87D0AF7}.Release|Any CPU.Build.0 = Release|Any CPU - {0B1BB941-D523-41F1-92DA-78FA9387DADB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0B1BB941-D523-41F1-92DA-78FA9387DADB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0B1BB941-D523-41F1-92DA-78FA9387DADB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0B1BB941-D523-41F1-92DA-78FA9387DADB}.Release|Any CPU.Build.0 = Release|Any CPU - {C59CA93B-ECCE-4216-B7C1-5B14550C173D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C59CA93B-ECCE-4216-B7C1-5B14550C173D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C59CA93B-ECCE-4216-B7C1-5B14550C173D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C59CA93B-ECCE-4216-B7C1-5B14550C173D}.Release|Any CPU.Build.0 = Release|Any CPU - {52D375F6-F31B-49B8-8C3B-51D83CDC1078}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {52D375F6-F31B-49B8-8C3B-51D83CDC1078}.Debug|Any CPU.Build.0 = Debug|Any CPU - {52D375F6-F31B-49B8-8C3B-51D83CDC1078}.Release|Any CPU.ActiveCfg = Release|Any CPU - {52D375F6-F31B-49B8-8C3B-51D83CDC1078}.Release|Any CPU.Build.0 = Release|Any CPU - {061BE431-A69E-4DDC-9F8B-55068C82E3C8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {061BE431-A69E-4DDC-9F8B-55068C82E3C8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {061BE431-A69E-4DDC-9F8B-55068C82E3C8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {061BE431-A69E-4DDC-9F8B-55068C82E3C8}.Release|Any CPU.Build.0 = Release|Any CPU - {7515F751-04C9-42B3-B3CC-439F499CD2BB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7515F751-04C9-42B3-B3CC-439F499CD2BB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7515F751-04C9-42B3-B3CC-439F499CD2BB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7515F751-04C9-42B3-B3CC-439F499CD2BB}.Release|Any CPU.Build.0 = Release|Any CPU - {C6A1D456-D0DB-4CB9-B150-07D1B2AB038A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C6A1D456-D0DB-4CB9-B150-07D1B2AB038A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C6A1D456-D0DB-4CB9-B150-07D1B2AB038A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C6A1D456-D0DB-4CB9-B150-07D1B2AB038A}.Release|Any CPU.Build.0 = Release|Any CPU - {A9216F81-C377-4447-930B-EF5E05B14FDB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A9216F81-C377-4447-930B-EF5E05B14FDB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A9216F81-C377-4447-930B-EF5E05B14FDB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A9216F81-C377-4447-930B-EF5E05B14FDB}.Release|Any CPU.Build.0 = Release|Any CPU - {0F744AC2-609C-4E9C-B1FE-D6FA4E8DA843}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0F744AC2-609C-4E9C-B1FE-D6FA4E8DA843}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0F744AC2-609C-4E9C-B1FE-D6FA4E8DA843}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0F744AC2-609C-4E9C-B1FE-D6FA4E8DA843}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {E732C86A-280F-4635-B32F-0AD9A0C92F33} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {FAF0F7ED-7714-4814-81AD-D8A7E9624EF0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {9AB6C848-E1F4-4BAC-AB27-C631F20340A6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {799D3DC0-B492-4C0F-955A-FC239F406CDF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {24463629-5F9E-48B4-A4ED-F5F6781F3DEA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {61C2AA35-05CF-45C1-9951-68F54AC77E98} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {43373129-BAB0-41B8-BAB7-51C3E87D0AF7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0B1BB941-D523-41F1-92DA-78FA9387DADB} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C59CA93B-ECCE-4216-B7C1-5B14550C173D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {52D375F6-F31B-49B8-8C3B-51D83CDC1078} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {061BE431-A69E-4DDC-9F8B-55068C82E3C8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {7515F751-04C9-42B3-B3CC-439F499CD2BB} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C6A1D456-D0DB-4CB9-B150-07D1B2AB038A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A9216F81-C377-4447-930B-EF5E05B14FDB} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0F744AC2-609C-4E9C-B1FE-D6FA4E8DA843} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {61C2AA35-05CF-45C1-9951-68F54AC77E98} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {43373129-BAB0-41B8-BAB7-51C3E87D0AF7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0B1BB941-D523-41F1-92DA-78FA9387DADB} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C59CA93B-ECCE-4216-B7C1-5B14550C173D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {52D375F6-F31B-49B8-8C3B-51D83CDC1078} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {061BE431-A69E-4DDC-9F8B-55068C82E3C8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {7515F751-04C9-42B3-B3CC-439F499CD2BB} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C6A1D456-D0DB-4CB9-B150-07D1B2AB038A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A9216F81-C377-4447-930B-EF5E05B14FDB} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0F744AC2-609C-4E9C-B1FE-D6FA4E8DA843} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {D82F6D78-3BFD-4D4E-9314-69F7FB32AFC9} diff --git a/sdk/src/Services/ComputeOptimizer/Generated/AmazonComputeOptimizerConfig.cs b/sdk/src/Services/ComputeOptimizer/Generated/AmazonComputeOptimizerConfig.cs index a067f35b20ea..022040cefbd0 100644 --- a/sdk/src/Services/ComputeOptimizer/Generated/AmazonComputeOptimizerConfig.cs +++ b/sdk/src/Services/ComputeOptimizer/Generated/AmazonComputeOptimizerConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.ComputeOptimizer public partial class AmazonComputeOptimizerConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("Compute Optimizer", "4.0.0.0"); private static readonly AmazonComputeOptimizerEndpointResolver EndpointResolver = new AmazonComputeOptimizerEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("Compute Optimizer", "3.7.400.27"); -======= - InternalSDKUtils.BuildUserAgentString("Compute Optimizer", "3.7.400.54"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/ComputeOptimizer/Properties/AssemblyInfo.cs b/sdk/src/Services/ComputeOptimizer/Properties/AssemblyInfo.cs index 19767ead081f..f61d3447a940 100644 --- a/sdk/src/Services/ComputeOptimizer/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/ComputeOptimizer/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.27")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.54")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/ConfigService/ConfigService.sln b/sdk/src/Services/ConfigService/ConfigService.sln index 2df37c9ec111..8332d9e0d4e9 100644 --- a/sdk/src/Services/ConfigService/ConfigService.sln +++ b/sdk/src/Services/ConfigService/ConfigService.sln @@ -92,7 +92,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {33A8F798-2594-4490-9770-97E0EADE5E25}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {33A8F798-2594-4490-9770-97E0EADE5E25}.Debug|Any CPU.Build.0 = Debug|Any CPU {33A8F798-2594-4490-9770-97E0EADE5E25}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -113,97 +120,6 @@ Global {443CD7C1-EE47-41E1-BA7D-CAE560F02793}.Debug|Any CPU.Build.0 = Debug|Any CPU {443CD7C1-EE47-41E1-BA7D-CAE560F02793}.Release|Any CPU.ActiveCfg = Release|Any CPU {443CD7C1-EE47-41E1-BA7D-CAE560F02793}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {D9145B74-78EA-4A85-B91D-737F9C4B0D98}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D9145B74-78EA-4A85-B91D-737F9C4B0D98}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D9145B74-78EA-4A85-B91D-737F9C4B0D98}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D9145B74-78EA-4A85-B91D-737F9C4B0D98}.Release|Any CPU.Build.0 = Release|Any CPU - {58BFEEB3-E5D5-409D-8C10-0D89369381EA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {58BFEEB3-E5D5-409D-8C10-0D89369381EA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {58BFEEB3-E5D5-409D-8C10-0D89369381EA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {58BFEEB3-E5D5-409D-8C10-0D89369381EA}.Release|Any CPU.Build.0 = Release|Any CPU - {39B44623-1E91-4EE4-AF89-E342FEBF94D4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {39B44623-1E91-4EE4-AF89-E342FEBF94D4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {39B44623-1E91-4EE4-AF89-E342FEBF94D4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {39B44623-1E91-4EE4-AF89-E342FEBF94D4}.Release|Any CPU.Build.0 = Release|Any CPU - {A4D2EF74-4A07-4965-A126-99AA29E6D635}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A4D2EF74-4A07-4965-A126-99AA29E6D635}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A4D2EF74-4A07-4965-A126-99AA29E6D635}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A4D2EF74-4A07-4965-A126-99AA29E6D635}.Release|Any CPU.Build.0 = Release|Any CPU - {5211E592-37D0-4C26-AB89-E91EB84623CD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5211E592-37D0-4C26-AB89-E91EB84623CD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5211E592-37D0-4C26-AB89-E91EB84623CD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5211E592-37D0-4C26-AB89-E91EB84623CD}.Release|Any CPU.Build.0 = Release|Any CPU - {59C4F199-BBC3-4CA5-A466-B7947DDB8351}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {59C4F199-BBC3-4CA5-A466-B7947DDB8351}.Debug|Any CPU.Build.0 = Debug|Any CPU - {59C4F199-BBC3-4CA5-A466-B7947DDB8351}.Release|Any CPU.ActiveCfg = Release|Any CPU - {59C4F199-BBC3-4CA5-A466-B7947DDB8351}.Release|Any CPU.Build.0 = Release|Any CPU - {B1F01363-E90F-42E9-ACBF-073EDF294406}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B1F01363-E90F-42E9-ACBF-073EDF294406}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B1F01363-E90F-42E9-ACBF-073EDF294406}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B1F01363-E90F-42E9-ACBF-073EDF294406}.Release|Any CPU.Build.0 = Release|Any CPU - {D6ECFAED-7C3F-4FC4-9052-4083F6FDEF34}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D6ECFAED-7C3F-4FC4-9052-4083F6FDEF34}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D6ECFAED-7C3F-4FC4-9052-4083F6FDEF34}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D6ECFAED-7C3F-4FC4-9052-4083F6FDEF34}.Release|Any CPU.Build.0 = Release|Any CPU - {B763ADE9-D49B-44A7-BF38-C7308F461B3E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B763ADE9-D49B-44A7-BF38-C7308F461B3E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B763ADE9-D49B-44A7-BF38-C7308F461B3E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B763ADE9-D49B-44A7-BF38-C7308F461B3E}.Release|Any CPU.Build.0 = Release|Any CPU - {916F055A-3169-4D4A-9145-803755753360}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {916F055A-3169-4D4A-9145-803755753360}.Debug|Any CPU.Build.0 = Debug|Any CPU - {916F055A-3169-4D4A-9145-803755753360}.Release|Any CPU.ActiveCfg = Release|Any CPU - {916F055A-3169-4D4A-9145-803755753360}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {D9145B74-78EA-4A85-B91D-737F9C4B0D98}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D9145B74-78EA-4A85-B91D-737F9C4B0D98}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D9145B74-78EA-4A85-B91D-737F9C4B0D98}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D9145B74-78EA-4A85-B91D-737F9C4B0D98}.Release|Any CPU.Build.0 = Release|Any CPU - {58BFEEB3-E5D5-409D-8C10-0D89369381EA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {58BFEEB3-E5D5-409D-8C10-0D89369381EA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {58BFEEB3-E5D5-409D-8C10-0D89369381EA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {58BFEEB3-E5D5-409D-8C10-0D89369381EA}.Release|Any CPU.Build.0 = Release|Any CPU - {39B44623-1E91-4EE4-AF89-E342FEBF94D4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {39B44623-1E91-4EE4-AF89-E342FEBF94D4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {39B44623-1E91-4EE4-AF89-E342FEBF94D4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {39B44623-1E91-4EE4-AF89-E342FEBF94D4}.Release|Any CPU.Build.0 = Release|Any CPU - {A4D2EF74-4A07-4965-A126-99AA29E6D635}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A4D2EF74-4A07-4965-A126-99AA29E6D635}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A4D2EF74-4A07-4965-A126-99AA29E6D635}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A4D2EF74-4A07-4965-A126-99AA29E6D635}.Release|Any CPU.Build.0 = Release|Any CPU - {5211E592-37D0-4C26-AB89-E91EB84623CD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5211E592-37D0-4C26-AB89-E91EB84623CD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5211E592-37D0-4C26-AB89-E91EB84623CD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5211E592-37D0-4C26-AB89-E91EB84623CD}.Release|Any CPU.Build.0 = Release|Any CPU - {59C4F199-BBC3-4CA5-A466-B7947DDB8351}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {59C4F199-BBC3-4CA5-A466-B7947DDB8351}.Debug|Any CPU.Build.0 = Debug|Any CPU - {59C4F199-BBC3-4CA5-A466-B7947DDB8351}.Release|Any CPU.ActiveCfg = Release|Any CPU - {59C4F199-BBC3-4CA5-A466-B7947DDB8351}.Release|Any CPU.Build.0 = Release|Any CPU - {B1F01363-E90F-42E9-ACBF-073EDF294406}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B1F01363-E90F-42E9-ACBF-073EDF294406}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B1F01363-E90F-42E9-ACBF-073EDF294406}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B1F01363-E90F-42E9-ACBF-073EDF294406}.Release|Any CPU.Build.0 = Release|Any CPU - {D6ECFAED-7C3F-4FC4-9052-4083F6FDEF34}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D6ECFAED-7C3F-4FC4-9052-4083F6FDEF34}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D6ECFAED-7C3F-4FC4-9052-4083F6FDEF34}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D6ECFAED-7C3F-4FC4-9052-4083F6FDEF34}.Release|Any CPU.Build.0 = Release|Any CPU - {B763ADE9-D49B-44A7-BF38-C7308F461B3E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B763ADE9-D49B-44A7-BF38-C7308F461B3E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B763ADE9-D49B-44A7-BF38-C7308F461B3E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B763ADE9-D49B-44A7-BF38-C7308F461B3E}.Release|Any CPU.Build.0 = Release|Any CPU - {916F055A-3169-4D4A-9145-803755753360}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {916F055A-3169-4D4A-9145-803755753360}.Debug|Any CPU.Build.0 = Debug|Any CPU - {916F055A-3169-4D4A-9145-803755753360}.Release|Any CPU.ActiveCfg = Release|Any CPU - {916F055A-3169-4D4A-9145-803755753360}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -220,37 +136,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {33A8F798-2594-4490-9770-97E0EADE5E25} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {82ED48EE-5965-4AC8-BB3A-B8C5DD02E139} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {BC9C3410-43FD-4AE8-9EE5-B9D1EE4A7F25} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {685CE15F-E776-4F5E-BA81-2C3D48DB4539} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {443CD7C1-EE47-41E1-BA7D-CAE560F02793} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {D9145B74-78EA-4A85-B91D-737F9C4B0D98} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {58BFEEB3-E5D5-409D-8C10-0D89369381EA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {39B44623-1E91-4EE4-AF89-E342FEBF94D4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A4D2EF74-4A07-4965-A126-99AA29E6D635} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {5211E592-37D0-4C26-AB89-E91EB84623CD} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {59C4F199-BBC3-4CA5-A466-B7947DDB8351} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B1F01363-E90F-42E9-ACBF-073EDF294406} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D6ECFAED-7C3F-4FC4-9052-4083F6FDEF34} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B763ADE9-D49B-44A7-BF38-C7308F461B3E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {916F055A-3169-4D4A-9145-803755753360} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {D9145B74-78EA-4A85-B91D-737F9C4B0D98} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {58BFEEB3-E5D5-409D-8C10-0D89369381EA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {39B44623-1E91-4EE4-AF89-E342FEBF94D4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A4D2EF74-4A07-4965-A126-99AA29E6D635} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {5211E592-37D0-4C26-AB89-E91EB84623CD} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {59C4F199-BBC3-4CA5-A466-B7947DDB8351} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B1F01363-E90F-42E9-ACBF-073EDF294406} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D6ECFAED-7C3F-4FC4-9052-4083F6FDEF34} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B763ADE9-D49B-44A7-BF38-C7308F461B3E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {916F055A-3169-4D4A-9145-803755753360} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {A21CBF66-9EB2-4D88-A63E-467D374CBA17} diff --git a/sdk/src/Services/ConfigService/Generated/AmazonConfigServiceConfig.cs b/sdk/src/Services/ConfigService/Generated/AmazonConfigServiceConfig.cs index 4e8bdbb990c0..792ebf696574 100644 --- a/sdk/src/Services/ConfigService/Generated/AmazonConfigServiceConfig.cs +++ b/sdk/src/Services/ConfigService/Generated/AmazonConfigServiceConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.ConfigService public partial class AmazonConfigServiceConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("Config Service", "4.0.0.0"); private static readonly AmazonConfigServiceEndpointResolver EndpointResolver = new AmazonConfigServiceEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("Config Service", "3.7.401.22"); -======= - InternalSDKUtils.BuildUserAgentString("Config Service", "3.7.401.49"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/ConfigService/Properties/AssemblyInfo.cs b/sdk/src/Services/ConfigService/Properties/AssemblyInfo.cs index ad9978a49885..cf0efc6d2f59 100644 --- a/sdk/src/Services/ConfigService/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/ConfigService/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.22")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.49")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/Connect/Connect.sln b/sdk/src/Services/Connect/Connect.sln index ce7e4e013712..994e5782a7f1 100644 --- a/sdk/src/Services/Connect/Connect.sln +++ b/sdk/src/Services/Connect/Connect.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {9C59DEAD-EC1E-49C8-ADBF-260AF8B3DE2F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {9C59DEAD-EC1E-49C8-ADBF-260AF8B3DE2F}.Debug|Any CPU.Build.0 = Debug|Any CPU {9C59DEAD-EC1E-49C8-ADBF-260AF8B3DE2F}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {CF2B5FBF-6F86-4DE0-8526-EF89ACD8A750}.Debug|Any CPU.Build.0 = Debug|Any CPU {CF2B5FBF-6F86-4DE0-8526-EF89ACD8A750}.Release|Any CPU.ActiveCfg = Release|Any CPU {CF2B5FBF-6F86-4DE0-8526-EF89ACD8A750}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {7F4ED1C4-2C08-4245-8F4F-E856F7A58F8B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7F4ED1C4-2C08-4245-8F4F-E856F7A58F8B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7F4ED1C4-2C08-4245-8F4F-E856F7A58F8B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7F4ED1C4-2C08-4245-8F4F-E856F7A58F8B}.Release|Any CPU.Build.0 = Release|Any CPU - {709AE0A7-1DAD-4CE8-A3DB-E6B7C93A1383}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {709AE0A7-1DAD-4CE8-A3DB-E6B7C93A1383}.Debug|Any CPU.Build.0 = Debug|Any CPU - {709AE0A7-1DAD-4CE8-A3DB-E6B7C93A1383}.Release|Any CPU.ActiveCfg = Release|Any CPU - {709AE0A7-1DAD-4CE8-A3DB-E6B7C93A1383}.Release|Any CPU.Build.0 = Release|Any CPU - {0FABDF47-58CA-47CC-8426-680BFA77BA62}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0FABDF47-58CA-47CC-8426-680BFA77BA62}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0FABDF47-58CA-47CC-8426-680BFA77BA62}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0FABDF47-58CA-47CC-8426-680BFA77BA62}.Release|Any CPU.Build.0 = Release|Any CPU - {A81CF8E5-F4BB-4DAD-BFE2-56D2DE7C2555}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A81CF8E5-F4BB-4DAD-BFE2-56D2DE7C2555}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A81CF8E5-F4BB-4DAD-BFE2-56D2DE7C2555}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A81CF8E5-F4BB-4DAD-BFE2-56D2DE7C2555}.Release|Any CPU.Build.0 = Release|Any CPU - {3850C7DE-3A2C-4B88-96AE-B4E4DB70EB8C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3850C7DE-3A2C-4B88-96AE-B4E4DB70EB8C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3850C7DE-3A2C-4B88-96AE-B4E4DB70EB8C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3850C7DE-3A2C-4B88-96AE-B4E4DB70EB8C}.Release|Any CPU.Build.0 = Release|Any CPU - {CCC4690A-CC24-4EC0-9C3E-446C055D89C9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CCC4690A-CC24-4EC0-9C3E-446C055D89C9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CCC4690A-CC24-4EC0-9C3E-446C055D89C9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CCC4690A-CC24-4EC0-9C3E-446C055D89C9}.Release|Any CPU.Build.0 = Release|Any CPU - {E7419AF6-B025-415C-B746-A483674D06E1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E7419AF6-B025-415C-B746-A483674D06E1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E7419AF6-B025-415C-B746-A483674D06E1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E7419AF6-B025-415C-B746-A483674D06E1}.Release|Any CPU.Build.0 = Release|Any CPU - {588F72AD-9718-4DDD-93D9-53582A54719C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {588F72AD-9718-4DDD-93D9-53582A54719C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {588F72AD-9718-4DDD-93D9-53582A54719C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {588F72AD-9718-4DDD-93D9-53582A54719C}.Release|Any CPU.Build.0 = Release|Any CPU - {D343FE66-6198-465F-967D-3D71C1F8016F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D343FE66-6198-465F-967D-3D71C1F8016F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D343FE66-6198-465F-967D-3D71C1F8016F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D343FE66-6198-465F-967D-3D71C1F8016F}.Release|Any CPU.Build.0 = Release|Any CPU - {B36FFB7D-B592-470E-ABD0-10388FAC03D7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B36FFB7D-B592-470E-ABD0-10388FAC03D7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B36FFB7D-B592-470E-ABD0-10388FAC03D7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B36FFB7D-B592-470E-ABD0-10388FAC03D7}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {7F4ED1C4-2C08-4245-8F4F-E856F7A58F8B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7F4ED1C4-2C08-4245-8F4F-E856F7A58F8B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7F4ED1C4-2C08-4245-8F4F-E856F7A58F8B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7F4ED1C4-2C08-4245-8F4F-E856F7A58F8B}.Release|Any CPU.Build.0 = Release|Any CPU - {709AE0A7-1DAD-4CE8-A3DB-E6B7C93A1383}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {709AE0A7-1DAD-4CE8-A3DB-E6B7C93A1383}.Debug|Any CPU.Build.0 = Debug|Any CPU - {709AE0A7-1DAD-4CE8-A3DB-E6B7C93A1383}.Release|Any CPU.ActiveCfg = Release|Any CPU - {709AE0A7-1DAD-4CE8-A3DB-E6B7C93A1383}.Release|Any CPU.Build.0 = Release|Any CPU - {0FABDF47-58CA-47CC-8426-680BFA77BA62}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0FABDF47-58CA-47CC-8426-680BFA77BA62}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0FABDF47-58CA-47CC-8426-680BFA77BA62}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0FABDF47-58CA-47CC-8426-680BFA77BA62}.Release|Any CPU.Build.0 = Release|Any CPU - {A81CF8E5-F4BB-4DAD-BFE2-56D2DE7C2555}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A81CF8E5-F4BB-4DAD-BFE2-56D2DE7C2555}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A81CF8E5-F4BB-4DAD-BFE2-56D2DE7C2555}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A81CF8E5-F4BB-4DAD-BFE2-56D2DE7C2555}.Release|Any CPU.Build.0 = Release|Any CPU - {3850C7DE-3A2C-4B88-96AE-B4E4DB70EB8C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3850C7DE-3A2C-4B88-96AE-B4E4DB70EB8C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3850C7DE-3A2C-4B88-96AE-B4E4DB70EB8C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3850C7DE-3A2C-4B88-96AE-B4E4DB70EB8C}.Release|Any CPU.Build.0 = Release|Any CPU - {CCC4690A-CC24-4EC0-9C3E-446C055D89C9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CCC4690A-CC24-4EC0-9C3E-446C055D89C9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CCC4690A-CC24-4EC0-9C3E-446C055D89C9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CCC4690A-CC24-4EC0-9C3E-446C055D89C9}.Release|Any CPU.Build.0 = Release|Any CPU - {E7419AF6-B025-415C-B746-A483674D06E1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E7419AF6-B025-415C-B746-A483674D06E1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E7419AF6-B025-415C-B746-A483674D06E1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E7419AF6-B025-415C-B746-A483674D06E1}.Release|Any CPU.Build.0 = Release|Any CPU - {588F72AD-9718-4DDD-93D9-53582A54719C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {588F72AD-9718-4DDD-93D9-53582A54719C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {588F72AD-9718-4DDD-93D9-53582A54719C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {588F72AD-9718-4DDD-93D9-53582A54719C}.Release|Any CPU.Build.0 = Release|Any CPU - {D343FE66-6198-465F-967D-3D71C1F8016F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D343FE66-6198-465F-967D-3D71C1F8016F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D343FE66-6198-465F-967D-3D71C1F8016F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D343FE66-6198-465F-967D-3D71C1F8016F}.Release|Any CPU.Build.0 = Release|Any CPU - {B36FFB7D-B592-470E-ABD0-10388FAC03D7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B36FFB7D-B592-470E-ABD0-10388FAC03D7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B36FFB7D-B592-470E-ABD0-10388FAC03D7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B36FFB7D-B592-470E-ABD0-10388FAC03D7}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {9C59DEAD-EC1E-49C8-ADBF-260AF8B3DE2F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {29E197BB-9AAE-42E9-BBC5-1DF9B3AF5E0D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {E7D8012A-31FE-4C24-B91F-54A493F1887E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {34E06E04-EA53-4164-B78D-33A822F3D64E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {CF2B5FBF-6F86-4DE0-8526-EF89ACD8A750} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {7F4ED1C4-2C08-4245-8F4F-E856F7A58F8B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {709AE0A7-1DAD-4CE8-A3DB-E6B7C93A1383} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0FABDF47-58CA-47CC-8426-680BFA77BA62} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A81CF8E5-F4BB-4DAD-BFE2-56D2DE7C2555} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {3850C7DE-3A2C-4B88-96AE-B4E4DB70EB8C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {CCC4690A-CC24-4EC0-9C3E-446C055D89C9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E7419AF6-B025-415C-B746-A483674D06E1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {588F72AD-9718-4DDD-93D9-53582A54719C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D343FE66-6198-465F-967D-3D71C1F8016F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B36FFB7D-B592-470E-ABD0-10388FAC03D7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {7F4ED1C4-2C08-4245-8F4F-E856F7A58F8B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {709AE0A7-1DAD-4CE8-A3DB-E6B7C93A1383} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0FABDF47-58CA-47CC-8426-680BFA77BA62} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A81CF8E5-F4BB-4DAD-BFE2-56D2DE7C2555} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {3850C7DE-3A2C-4B88-96AE-B4E4DB70EB8C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {CCC4690A-CC24-4EC0-9C3E-446C055D89C9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E7419AF6-B025-415C-B746-A483674D06E1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {588F72AD-9718-4DDD-93D9-53582A54719C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D343FE66-6198-465F-967D-3D71C1F8016F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B36FFB7D-B592-470E-ABD0-10388FAC03D7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {4F9C8110-1FC5-4440-BB69-47286DF948AA} diff --git a/sdk/src/Services/Connect/Generated/AmazonConnectConfig.cs b/sdk/src/Services/Connect/Generated/AmazonConnectConfig.cs index 2938c5cbc9c8..428b802532d6 100644 --- a/sdk/src/Services/Connect/Generated/AmazonConnectConfig.cs +++ b/sdk/src/Services/Connect/Generated/AmazonConnectConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.Connect public partial class AmazonConnectConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("Connect", "4.0.0.0"); private static readonly AmazonConnectEndpointResolver EndpointResolver = new AmazonConnectEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("Connect", "3.7.404.11"); -======= - InternalSDKUtils.BuildUserAgentString("Connect", "3.7.408.10"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/Connect/Generated/Model/Internal/MarshallTransformations/StartOutboundChatContactRequestMarshaller.cs b/sdk/src/Services/Connect/Generated/Model/Internal/MarshallTransformations/StartOutboundChatContactRequestMarshaller.cs index 97bdd00625d6..044dd18461eb 100644 --- a/sdk/src/Services/Connect/Generated/Model/Internal/MarshallTransformations/StartOutboundChatContactRequestMarshaller.cs +++ b/sdk/src/Services/Connect/Generated/Model/Internal/MarshallTransformations/StartOutboundChatContactRequestMarshaller.cs @@ -61,138 +61,141 @@ public IRequest Marshall(StartOutboundChatContactRequest publicRequest) request.HttpMethod = "PUT"; request.ResourcePath = "/contact/outbound-chat"; - using (StringWriter stringWriter = new StringWriter(CultureInfo.InvariantCulture)) + using (MemoryStream memoryStream = new MemoryStream()) { - JsonWriter writer = new JsonWriter(stringWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetAttributes()) + using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) { - context.Writer.WritePropertyName("Attributes"); - context.Writer.WriteObjectStart(); - foreach (var publicRequestAttributesKvp in publicRequest.Attributes) + JsonWriter writer = new JsonWriter(streamWriter); + writer.Validate = false; + writer.WriteObjectStart(); + var context = new JsonMarshallerContext(request, writer); + if(publicRequest.IsSetAttributes()) { - context.Writer.WritePropertyName(publicRequestAttributesKvp.Key); - var publicRequestAttributesValue = publicRequestAttributesKvp.Value; + context.Writer.WritePropertyName("Attributes"); + context.Writer.WriteObjectStart(); + foreach (var publicRequestAttributesKvp in publicRequest.Attributes) + { + context.Writer.WritePropertyName(publicRequestAttributesKvp.Key); + var publicRequestAttributesValue = publicRequestAttributesKvp.Value; - context.Writer.Write(publicRequestAttributesValue); + context.Writer.Write(publicRequestAttributesValue); + } + context.Writer.WriteObjectEnd(); } - context.Writer.WriteObjectEnd(); - } - if(publicRequest.IsSetChatDurationInMinutes()) - { - context.Writer.WritePropertyName("ChatDurationInMinutes"); - context.Writer.Write(publicRequest.ChatDurationInMinutes); - } + if(publicRequest.IsSetChatDurationInMinutes()) + { + context.Writer.WritePropertyName("ChatDurationInMinutes"); + context.Writer.Write(publicRequest.ChatDurationInMinutes.Value); + } - if(publicRequest.IsSetClientToken()) - { - context.Writer.WritePropertyName("ClientToken"); - context.Writer.Write(publicRequest.ClientToken); - } + if(publicRequest.IsSetClientToken()) + { + context.Writer.WritePropertyName("ClientToken"); + context.Writer.Write(publicRequest.ClientToken); + } - else if(!(publicRequest.IsSetClientToken())) - { - context.Writer.WritePropertyName("ClientToken"); - context.Writer.Write(Guid.NewGuid().ToString()); - } - if(publicRequest.IsSetContactFlowId()) - { - context.Writer.WritePropertyName("ContactFlowId"); - context.Writer.Write(publicRequest.ContactFlowId); - } + else if(!(publicRequest.IsSetClientToken())) + { + context.Writer.WritePropertyName("ClientToken"); + context.Writer.Write(Guid.NewGuid().ToString()); + } + if(publicRequest.IsSetContactFlowId()) + { + context.Writer.WritePropertyName("ContactFlowId"); + context.Writer.Write(publicRequest.ContactFlowId); + } - if(publicRequest.IsSetDestinationEndpoint()) - { - context.Writer.WritePropertyName("DestinationEndpoint"); - context.Writer.WriteObjectStart(); + if(publicRequest.IsSetDestinationEndpoint()) + { + context.Writer.WritePropertyName("DestinationEndpoint"); + context.Writer.WriteObjectStart(); - var marshaller = EndpointMarshaller.Instance; - marshaller.Marshall(publicRequest.DestinationEndpoint, context); + var marshaller = EndpointMarshaller.Instance; + marshaller.Marshall(publicRequest.DestinationEndpoint, context); - context.Writer.WriteObjectEnd(); - } + context.Writer.WriteObjectEnd(); + } - if(publicRequest.IsSetInitialSystemMessage()) - { - context.Writer.WritePropertyName("InitialSystemMessage"); - context.Writer.WriteObjectStart(); + if(publicRequest.IsSetInitialSystemMessage()) + { + context.Writer.WritePropertyName("InitialSystemMessage"); + context.Writer.WriteObjectStart(); - var marshaller = ChatMessageMarshaller.Instance; - marshaller.Marshall(publicRequest.InitialSystemMessage, context); + var marshaller = ChatMessageMarshaller.Instance; + marshaller.Marshall(publicRequest.InitialSystemMessage, context); - context.Writer.WriteObjectEnd(); - } - - if(publicRequest.IsSetInstanceId()) - { - context.Writer.WritePropertyName("InstanceId"); - context.Writer.Write(publicRequest.InstanceId); - } + context.Writer.WriteObjectEnd(); + } - if(publicRequest.IsSetParticipantDetails()) - { - context.Writer.WritePropertyName("ParticipantDetails"); - context.Writer.WriteObjectStart(); + if(publicRequest.IsSetInstanceId()) + { + context.Writer.WritePropertyName("InstanceId"); + context.Writer.Write(publicRequest.InstanceId); + } - var marshaller = ParticipantDetailsMarshaller.Instance; - marshaller.Marshall(publicRequest.ParticipantDetails, context); + if(publicRequest.IsSetParticipantDetails()) + { + context.Writer.WritePropertyName("ParticipantDetails"); + context.Writer.WriteObjectStart(); - context.Writer.WriteObjectEnd(); - } + var marshaller = ParticipantDetailsMarshaller.Instance; + marshaller.Marshall(publicRequest.ParticipantDetails, context); - if(publicRequest.IsSetRelatedContactId()) - { - context.Writer.WritePropertyName("RelatedContactId"); - context.Writer.Write(publicRequest.RelatedContactId); - } + context.Writer.WriteObjectEnd(); + } - if(publicRequest.IsSetSegmentAttributes()) - { - context.Writer.WritePropertyName("SegmentAttributes"); - context.Writer.WriteObjectStart(); - foreach (var publicRequestSegmentAttributesKvp in publicRequest.SegmentAttributes) + if(publicRequest.IsSetRelatedContactId()) { - context.Writer.WritePropertyName(publicRequestSegmentAttributesKvp.Key); - var publicRequestSegmentAttributesValue = publicRequestSegmentAttributesKvp.Value; + context.Writer.WritePropertyName("RelatedContactId"); + context.Writer.Write(publicRequest.RelatedContactId); + } + if(publicRequest.IsSetSegmentAttributes()) + { + context.Writer.WritePropertyName("SegmentAttributes"); context.Writer.WriteObjectStart(); + foreach (var publicRequestSegmentAttributesKvp in publicRequest.SegmentAttributes) + { + context.Writer.WritePropertyName(publicRequestSegmentAttributesKvp.Key); + var publicRequestSegmentAttributesValue = publicRequestSegmentAttributesKvp.Value; - var marshaller = SegmentAttributeValueMarshaller.Instance; - marshaller.Marshall(publicRequestSegmentAttributesValue, context); + context.Writer.WriteObjectStart(); + var marshaller = SegmentAttributeValueMarshaller.Instance; + marshaller.Marshall(publicRequestSegmentAttributesValue, context); + + context.Writer.WriteObjectEnd(); + } context.Writer.WriteObjectEnd(); } - context.Writer.WriteObjectEnd(); - } - if(publicRequest.IsSetSourceEndpoint()) - { - context.Writer.WritePropertyName("SourceEndpoint"); - context.Writer.WriteObjectStart(); + if(publicRequest.IsSetSourceEndpoint()) + { + context.Writer.WritePropertyName("SourceEndpoint"); + context.Writer.WriteObjectStart(); - var marshaller = EndpointMarshaller.Instance; - marshaller.Marshall(publicRequest.SourceEndpoint, context); + var marshaller = EndpointMarshaller.Instance; + marshaller.Marshall(publicRequest.SourceEndpoint, context); - context.Writer.WriteObjectEnd(); - } + context.Writer.WriteObjectEnd(); + } - if(publicRequest.IsSetSupportedMessagingContentTypes()) - { - context.Writer.WritePropertyName("SupportedMessagingContentTypes"); - context.Writer.WriteArrayStart(); - foreach(var publicRequestSupportedMessagingContentTypesListValue in publicRequest.SupportedMessagingContentTypes) + if(publicRequest.IsSetSupportedMessagingContentTypes()) { - context.Writer.Write(publicRequestSupportedMessagingContentTypesListValue); + context.Writer.WritePropertyName("SupportedMessagingContentTypes"); + context.Writer.WriteArrayStart(); + foreach(var publicRequestSupportedMessagingContentTypesListValue in publicRequest.SupportedMessagingContentTypes) + { + context.Writer.Write(publicRequestSupportedMessagingContentTypesListValue); + } + context.Writer.WriteArrayEnd(); } - context.Writer.WriteArrayEnd(); + + writer.WriteObjectEnd(); } - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); + request.Content = memoryStream.ToArray(); } diff --git a/sdk/src/Services/Connect/Generated/Model/Internal/MarshallTransformations/StartScreenSharingRequestMarshaller.cs b/sdk/src/Services/Connect/Generated/Model/Internal/MarshallTransformations/StartScreenSharingRequestMarshaller.cs index a420935eb8fe..fc3bfe3b8ac3 100644 --- a/sdk/src/Services/Connect/Generated/Model/Internal/MarshallTransformations/StartScreenSharingRequestMarshaller.cs +++ b/sdk/src/Services/Connect/Generated/Model/Internal/MarshallTransformations/StartScreenSharingRequestMarshaller.cs @@ -61,38 +61,41 @@ public IRequest Marshall(StartScreenSharingRequest publicRequest) request.HttpMethod = "PUT"; request.ResourcePath = "/contact/screen-sharing"; - using (StringWriter stringWriter = new StringWriter(CultureInfo.InvariantCulture)) + using (MemoryStream memoryStream = new MemoryStream()) { - JsonWriter writer = new JsonWriter(stringWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetClientToken()) + using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) { - context.Writer.WritePropertyName("ClientToken"); - context.Writer.Write(publicRequest.ClientToken); - } + JsonWriter writer = new JsonWriter(streamWriter); + writer.Validate = false; + writer.WriteObjectStart(); + var context = new JsonMarshallerContext(request, writer); + if(publicRequest.IsSetClientToken()) + { + context.Writer.WritePropertyName("ClientToken"); + context.Writer.Write(publicRequest.ClientToken); + } - else if(!(publicRequest.IsSetClientToken())) - { - context.Writer.WritePropertyName("ClientToken"); - context.Writer.Write(Guid.NewGuid().ToString()); - } - if(publicRequest.IsSetContactId()) - { - context.Writer.WritePropertyName("ContactId"); - context.Writer.Write(publicRequest.ContactId); - } + else if(!(publicRequest.IsSetClientToken())) + { + context.Writer.WritePropertyName("ClientToken"); + context.Writer.Write(Guid.NewGuid().ToString()); + } + if(publicRequest.IsSetContactId()) + { + context.Writer.WritePropertyName("ContactId"); + context.Writer.Write(publicRequest.ContactId); + } - if(publicRequest.IsSetInstanceId()) - { - context.Writer.WritePropertyName("InstanceId"); - context.Writer.Write(publicRequest.InstanceId); + if(publicRequest.IsSetInstanceId()) + { + context.Writer.WritePropertyName("InstanceId"); + context.Writer.Write(publicRequest.InstanceId); + } + + writer.WriteObjectEnd(); } - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); + request.Content = memoryStream.ToArray(); } diff --git a/sdk/src/Services/Connect/Generated/Model/StartOutboundChatContactRequest.cs b/sdk/src/Services/Connect/Generated/Model/StartOutboundChatContactRequest.cs index 76171b83e0bd..60a283d682ae 100644 --- a/sdk/src/Services/Connect/Generated/Model/StartOutboundChatContactRequest.cs +++ b/sdk/src/Services/Connect/Generated/Model/StartOutboundChatContactRequest.cs @@ -106,9 +106,9 @@ internal bool IsSetAttributes() /// /// [AWSProperty(Min=60, Max=10080)] - public int ChatDurationInMinutes + public int? ChatDurationInMinutes { - get { return this._chatDurationInMinutes.GetValueOrDefault(); } + get { return this._chatDurationInMinutes; } set { this._chatDurationInMinutes = value; } } diff --git a/sdk/src/Services/Connect/Generated/_bcl/AmazonConnectClient.cs b/sdk/src/Services/Connect/Generated/_bcl/AmazonConnectClient.cs index bfd9ed019ca5..476e19911ce8 100644 --- a/sdk/src/Services/Connect/Generated/_bcl/AmazonConnectClient.cs +++ b/sdk/src/Services/Connect/Generated/_bcl/AmazonConnectClient.cs @@ -375,13 +375,8 @@ public virtual ActivateEvaluationFormResponse ActivateEvaluationForm(ActivateEva /// - /// This API is in preview release for Amazon Connect and is subject to change. - /// - /// - /// /// Associates the specified dataset for a Amazon Connect instance with the target account. /// You can associate only one dataset in a single call. - /// /// /// Container for the necessary parameters to execute the AssociateAnalyticsDataSet service method. /// @@ -413,13 +408,8 @@ public virtual AssociateAnalyticsDataSetResponse AssociateAnalyticsDataSet(Assoc /// - /// This API is in preview release for Amazon Connect and is subject to change. - /// - /// - /// /// Associates the specified dataset for a Amazon Connect instance with the target account. /// You can associate only one dataset in a single call. - /// /// /// Container for the necessary parameters to execute the AssociateAnalyticsDataSet service method. /// @@ -1435,7 +1425,8 @@ public virtual AssociateSecurityKeyResponse AssociateSecurityKey(AssociateSecuri /// - /// Associates an agent with a traffic distribution group. + /// Associates an agent with a traffic distribution group. This API can be called only + /// in the Region where the traffic distribution group is created. /// /// Container for the necessary parameters to execute the AssociateTrafficDistributionGroupUser service method. /// @@ -1470,7 +1461,8 @@ public virtual AssociateTrafficDistributionGroupUserResponse AssociateTrafficDis /// - /// Associates an agent with a traffic distribution group. + /// Associates an agent with a traffic distribution group. This API can be called only + /// in the Region where the traffic distribution group is created. /// /// Container for the necessary parameters to execute the AssociateTrafficDistributionGroupUser service method. /// @@ -1583,13 +1575,8 @@ public virtual AssociateUserProficienciesResponse AssociateUserProficiencies(Ass /// - /// This API is in preview release for Amazon Connect and is subject to change. - /// - /// - /// /// Associates a list of analytics datasets for a given Amazon Connect instance to a target /// account. You can associate multiple datasets in a single call. - /// /// /// Container for the necessary parameters to execute the BatchAssociateAnalyticsDataSet service method. /// @@ -1621,13 +1608,8 @@ public virtual BatchAssociateAnalyticsDataSetResponse BatchAssociateAnalyticsDat /// - /// This API is in preview release for Amazon Connect and is subject to change. - /// - /// - /// /// Associates a list of analytics datasets for a given Amazon Connect instance to a target /// account. You can associate multiple datasets in a single call. - /// /// /// Container for the necessary parameters to execute the BatchAssociateAnalyticsDataSet service method. /// @@ -1666,13 +1648,8 @@ public virtual BatchAssociateAnalyticsDataSetResponse BatchAssociateAnalyticsDat /// - /// This API is in preview release for Amazon Connect and is subject to change. - /// - /// - /// /// Removes a list of analytics datasets associated with a given Amazon Connect instance. /// You can disassociate multiple datasets in a single call. - /// /// /// Container for the necessary parameters to execute the BatchDisassociateAnalyticsDataSet service method. /// @@ -1704,13 +1681,8 @@ public virtual BatchDisassociateAnalyticsDataSetResponse BatchDisassociateAnalyt /// - /// This API is in preview release for Amazon Connect and is subject to change. - /// - /// - /// /// Removes a list of analytics datasets associated with a given Amazon Connect instance. /// You can disassociate multiple datasets in a single call. - /// /// /// Container for the necessary parameters to execute the BatchDisassociateAnalyticsDataSet service method. /// @@ -3792,7 +3764,7 @@ public virtual CreateTaskTemplateResponse CreateTaskTemplate(CreateTaskTemplateR /// /// Creates a traffic distribution group given an Amazon Connect instance that has been - /// replicated. + /// replicated. /// /// /// @@ -3849,7 +3821,7 @@ public virtual CreateTrafficDistributionGroupResponse CreateTrafficDistributionG /// /// Creates a traffic distribution group given an Amazon Connect instance that has been - /// replicated. + /// replicated. /// /// /// @@ -6626,12 +6598,9 @@ public virtual DescribeAuthenticationProfileResponse DescribeAuthenticationProfi /// /// /// - /// Contact information remains available in Amazon Connect for 24 months, and then it - /// is deleted. - /// - /// - /// - /// Only data from November 12, 2021, and later is returned by this API. + /// Contact information remains available in Amazon Connect for 24 months from the InitiationTimestamp, + /// and then it is deleted. Only contact information that is available in Amazon Connect + /// is returned by this API /// /// /// @@ -6673,12 +6642,9 @@ public virtual DescribeContactResponse DescribeContact(DescribeContactRequest re /// /// /// - /// Contact information remains available in Amazon Connect for 24 months, and then it - /// is deleted. - /// - /// - /// - /// Only data from November 12, 2021, and later is returned by this API. + /// Contact information remains available in Amazon Connect for 24 months from the InitiationTimestamp, + /// and then it is deleted. Only contact information that is available in Amazon Connect + /// is returned by this API /// /// /// @@ -8489,12 +8455,7 @@ public virtual DescribeVocabularyResponse DescribeVocabulary(DescribeVocabularyR /// - /// This API is in preview release for Amazon Connect and is subject to change. - /// - /// - /// /// Removes the dataset ID associated with a given Amazon Connect instance. - /// /// /// Container for the necessary parameters to execute the DisassociateAnalyticsDataSet service method. /// @@ -8526,12 +8487,7 @@ public virtual DisassociateAnalyticsDataSetResponse DisassociateAnalyticsDataSet /// - /// This API is in preview release for Amazon Connect and is subject to change. - /// - /// - /// /// Removes the dataset ID associated with a given Amazon Connect instance. - /// /// /// Container for the necessary parameters to execute the DisassociateAnalyticsDataSet service method. /// @@ -9384,7 +9340,8 @@ public virtual DisassociateSecurityKeyResponse DisassociateSecurityKey(Disassoci /// - /// Disassociates an agent from a traffic distribution group. + /// Disassociates an agent from a traffic distribution group. This API can be called only + /// in the Region where the traffic distribution group is created. /// /// Container for the necessary parameters to execute the DisassociateTrafficDistributionGroupUser service method. /// @@ -9419,7 +9376,8 @@ public virtual DisassociateTrafficDistributionGroupUserResponse DisassociateTraf /// - /// Disassociates an agent from a traffic distribution group. + /// Disassociates an agent from a traffic distribution group. This API can be called only + /// in the Region where the traffic distribution group is created. /// /// Container for the necessary parameters to execute the DisassociateTrafficDistributionGroupUser service method. /// @@ -10212,7 +10170,7 @@ public virtual GetMetricDataResponse GetMetricData(GetMetricDataRequest request) /// the previous version of this API. It has new metrics, offers filtering at a metric /// level, and offers the ability to filter and group data by channels, queues, routing /// profiles, agents, and agent hierarchy levels. It can retrieve historical data for - /// the last 3 months, at varying intervals. + /// the last 3 months, at varying intervals. It does not support agent queues. /// /// /// @@ -10259,7 +10217,7 @@ public virtual GetMetricDataV2Response GetMetricDataV2(GetMetricDataV2Request re /// the previous version of this API. It has new metrics, offers filtering at a metric /// level, and offers the ability to filter and group data by channels, queues, routing /// profiles, agents, and agent hierarchy levels. It can retrieve historical data for - /// the last 3 months, at varying intervals. + /// the last 3 months, at varying intervals. It does not support agent queues. /// /// /// @@ -10738,12 +10696,7 @@ public virtual ListAgentStatusesResponse ListAgentStatuses(ListAgentStatusesRequ /// - /// This API is in preview release for Amazon Connect and is subject to change. - /// - /// - /// /// Lists the association status of requested dataset ID for a given Amazon Connect instance. - /// /// /// Container for the necessary parameters to execute the ListAnalyticsDataAssociations service method. /// @@ -10775,12 +10728,7 @@ public virtual ListAnalyticsDataAssociationsResponse ListAnalyticsDataAssociatio /// - /// This API is in preview release for Amazon Connect and is subject to change. - /// - /// - /// /// Lists the association status of requested dataset ID for a given Amazon Connect instance. - /// /// /// Container for the necessary parameters to execute the ListAnalyticsDataAssociations service method. /// @@ -16811,6 +16759,151 @@ public virtual StartContactStreamingResponse StartContactStreaming(StartContactS #endregion + #region StartOutboundChatContact + + + /// + /// Initiates a new outbound SMS contact to a customer. Response of this API provides + /// the ContactId of the outbound SMS contact created. + /// + /// + /// + /// SourceEndpoint only supports Endpoints with CONNECT_PHONENUMBER_ARN + /// as Type and DestinationEndpoint only supports Endpoints with TELEPHONE_NUMBER + /// as Type. ContactFlowId initiates the flow to manage the new SMS contact created. + /// + /// + /// + /// This API can be used to initiate outbound SMS contacts for an agent or it can also + /// deflect an ongoing contact to an outbound SMS contact by using the StartOutboundChatContact + /// Flow Action. + /// + /// + /// + /// For more information about using SMS in Amazon Connect, see the following topics in + /// the Amazon Connect Administrator Guide: + /// + /// + /// + /// Container for the necessary parameters to execute the StartOutboundChatContact service method. + /// + /// The response from the StartOutboundChatContact service method, as returned by Connect. + /// + /// You do not have sufficient permissions to perform this action. + /// + /// + /// Operation cannot be performed at this time as there is a conflict with another operation + /// or contact state. + /// + /// + /// Request processing failed because of an error or failure with the service. + /// + /// + /// The request is not valid. + /// + /// + /// The allowed limit for the resource has been exceeded. + /// + /// + /// The specified resource was not found. + /// + /// + /// The throttling limit has been exceeded. + /// + /// REST API Reference for StartOutboundChatContact Operation + public virtual StartOutboundChatContactResponse StartOutboundChatContact(StartOutboundChatContactRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = StartOutboundChatContactRequestMarshaller.Instance; + options.ResponseUnmarshaller = StartOutboundChatContactResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// Initiates a new outbound SMS contact to a customer. Response of this API provides + /// the ContactId of the outbound SMS contact created. + /// + /// + /// + /// SourceEndpoint only supports Endpoints with CONNECT_PHONENUMBER_ARN + /// as Type and DestinationEndpoint only supports Endpoints with TELEPHONE_NUMBER + /// as Type. ContactFlowId initiates the flow to manage the new SMS contact created. + /// + /// + /// + /// This API can be used to initiate outbound SMS contacts for an agent or it can also + /// deflect an ongoing contact to an outbound SMS contact by using the StartOutboundChatContact + /// Flow Action. + /// + /// + /// + /// For more information about using SMS in Amazon Connect, see the following topics in + /// the Amazon Connect Administrator Guide: + /// + /// + /// + /// Container for the necessary parameters to execute the StartOutboundChatContact service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the StartOutboundChatContact service method, as returned by Connect. + /// + /// You do not have sufficient permissions to perform this action. + /// + /// + /// Operation cannot be performed at this time as there is a conflict with another operation + /// or contact state. + /// + /// + /// Request processing failed because of an error or failure with the service. + /// + /// + /// The request is not valid. + /// + /// + /// The allowed limit for the resource has been exceeded. + /// + /// + /// The specified resource was not found. + /// + /// + /// The throttling limit has been exceeded. + /// + /// REST API Reference for StartOutboundChatContact Operation + public virtual Task StartOutboundChatContactAsync(StartOutboundChatContactRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = StartOutboundChatContactRequestMarshaller.Instance; + options.ResponseUnmarshaller = StartOutboundChatContactResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + #region StartOutboundVoiceContact @@ -16950,6 +17043,89 @@ public virtual StartOutboundVoiceContactResponse StartOutboundVoiceContact(Start #endregion + #region StartScreenSharing + + + /// + /// Starts screen sharing for a contact. For more information about screen sharing, see + /// Set + /// up in-app, web, video calling, and screen sharing capabilities in the Amazon + /// Connect Administrator Guide. + /// + /// Container for the necessary parameters to execute the StartScreenSharing service method. + /// + /// The response from the StartScreenSharing service method, as returned by Connect. + /// + /// You do not have sufficient permissions to perform this action. + /// + /// + /// Request processing failed because of an error or failure with the service. + /// + /// + /// One or more of the specified parameters are not valid. + /// + /// + /// The request is not valid. + /// + /// + /// The specified resource was not found. + /// + /// + /// The throttling limit has been exceeded. + /// + /// REST API Reference for StartScreenSharing Operation + public virtual StartScreenSharingResponse StartScreenSharing(StartScreenSharingRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = StartScreenSharingRequestMarshaller.Instance; + options.ResponseUnmarshaller = StartScreenSharingResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// Starts screen sharing for a contact. For more information about screen sharing, see + /// Set + /// up in-app, web, video calling, and screen sharing capabilities in the Amazon + /// Connect Administrator Guide. + /// + /// Container for the necessary parameters to execute the StartScreenSharing service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the StartScreenSharing service method, as returned by Connect. + /// + /// You do not have sufficient permissions to perform this action. + /// + /// + /// Request processing failed because of an error or failure with the service. + /// + /// + /// One or more of the specified parameters are not valid. + /// + /// + /// The request is not valid. + /// + /// + /// The specified resource was not found. + /// + /// + /// The throttling limit has been exceeded. + /// + /// REST API Reference for StartScreenSharing Operation + public virtual Task StartScreenSharingAsync(StartScreenSharingRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = StartScreenSharingRequestMarshaller.Instance; + options.ResponseUnmarshaller = StartScreenSharingResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + #region StartTaskContact diff --git a/sdk/src/Services/Connect/Properties/AssemblyInfo.cs b/sdk/src/Services/Connect/Properties/AssemblyInfo.cs index 3ac92ec4f3e3..14d7128d7746 100644 --- a/sdk/src/Services/Connect/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/Connect/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.404.11")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.408.10")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/ConnectCampaignService/ConnectCampaignService.sln b/sdk/src/Services/ConnectCampaignService/ConnectCampaignService.sln index 22ec411619db..a55d99db50e2 100644 --- a/sdk/src/Services/ConnectCampaignService/ConnectCampaignService.sln +++ b/sdk/src/Services/ConnectCampaignService/ConnectCampaignService.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {E531AED3-94C6-4053-AC81-A1840DA4AA8E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {E531AED3-94C6-4053-AC81-A1840DA4AA8E}.Debug|Any CPU.Build.0 = Debug|Any CPU {E531AED3-94C6-4053-AC81-A1840DA4AA8E}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {9F38CE3C-9026-43A5-9F91-5CBE70FAD14D}.Debug|Any CPU.Build.0 = Debug|Any CPU {9F38CE3C-9026-43A5-9F91-5CBE70FAD14D}.Release|Any CPU.ActiveCfg = Release|Any CPU {9F38CE3C-9026-43A5-9F91-5CBE70FAD14D}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {DEABB1BE-5BE8-4D43-93EE-C15690F710C5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DEABB1BE-5BE8-4D43-93EE-C15690F710C5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DEABB1BE-5BE8-4D43-93EE-C15690F710C5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DEABB1BE-5BE8-4D43-93EE-C15690F710C5}.Release|Any CPU.Build.0 = Release|Any CPU - {965AF99E-6E95-48FF-B2D8-DCCB9A32E48D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {965AF99E-6E95-48FF-B2D8-DCCB9A32E48D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {965AF99E-6E95-48FF-B2D8-DCCB9A32E48D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {965AF99E-6E95-48FF-B2D8-DCCB9A32E48D}.Release|Any CPU.Build.0 = Release|Any CPU - {E1A34C7B-70D6-420A-9678-C6C6CE7F3AA8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E1A34C7B-70D6-420A-9678-C6C6CE7F3AA8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E1A34C7B-70D6-420A-9678-C6C6CE7F3AA8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E1A34C7B-70D6-420A-9678-C6C6CE7F3AA8}.Release|Any CPU.Build.0 = Release|Any CPU - {B3975199-6254-488A-8A91-34227645E305}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B3975199-6254-488A-8A91-34227645E305}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B3975199-6254-488A-8A91-34227645E305}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B3975199-6254-488A-8A91-34227645E305}.Release|Any CPU.Build.0 = Release|Any CPU - {61E0DE96-3D43-4748-B233-ECC63AAA5668}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {61E0DE96-3D43-4748-B233-ECC63AAA5668}.Debug|Any CPU.Build.0 = Debug|Any CPU - {61E0DE96-3D43-4748-B233-ECC63AAA5668}.Release|Any CPU.ActiveCfg = Release|Any CPU - {61E0DE96-3D43-4748-B233-ECC63AAA5668}.Release|Any CPU.Build.0 = Release|Any CPU - {4D0F8991-0762-4DDC-8890-33E655914009}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4D0F8991-0762-4DDC-8890-33E655914009}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4D0F8991-0762-4DDC-8890-33E655914009}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4D0F8991-0762-4DDC-8890-33E655914009}.Release|Any CPU.Build.0 = Release|Any CPU - {7C77C27C-C3EF-48ED-9E33-6B95AD6DF178}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7C77C27C-C3EF-48ED-9E33-6B95AD6DF178}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7C77C27C-C3EF-48ED-9E33-6B95AD6DF178}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7C77C27C-C3EF-48ED-9E33-6B95AD6DF178}.Release|Any CPU.Build.0 = Release|Any CPU - {0A9789D8-31F8-4CCE-A2B1-4B464C792121}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0A9789D8-31F8-4CCE-A2B1-4B464C792121}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0A9789D8-31F8-4CCE-A2B1-4B464C792121}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0A9789D8-31F8-4CCE-A2B1-4B464C792121}.Release|Any CPU.Build.0 = Release|Any CPU - {F57AB9BE-3042-4677-8249-8D2DBE9C4F89}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F57AB9BE-3042-4677-8249-8D2DBE9C4F89}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F57AB9BE-3042-4677-8249-8D2DBE9C4F89}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F57AB9BE-3042-4677-8249-8D2DBE9C4F89}.Release|Any CPU.Build.0 = Release|Any CPU - {6E83F4B2-5080-4175-B9FF-B2EF01346F03}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6E83F4B2-5080-4175-B9FF-B2EF01346F03}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6E83F4B2-5080-4175-B9FF-B2EF01346F03}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6E83F4B2-5080-4175-B9FF-B2EF01346F03}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {DEABB1BE-5BE8-4D43-93EE-C15690F710C5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DEABB1BE-5BE8-4D43-93EE-C15690F710C5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DEABB1BE-5BE8-4D43-93EE-C15690F710C5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DEABB1BE-5BE8-4D43-93EE-C15690F710C5}.Release|Any CPU.Build.0 = Release|Any CPU - {965AF99E-6E95-48FF-B2D8-DCCB9A32E48D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {965AF99E-6E95-48FF-B2D8-DCCB9A32E48D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {965AF99E-6E95-48FF-B2D8-DCCB9A32E48D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {965AF99E-6E95-48FF-B2D8-DCCB9A32E48D}.Release|Any CPU.Build.0 = Release|Any CPU - {E1A34C7B-70D6-420A-9678-C6C6CE7F3AA8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E1A34C7B-70D6-420A-9678-C6C6CE7F3AA8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E1A34C7B-70D6-420A-9678-C6C6CE7F3AA8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E1A34C7B-70D6-420A-9678-C6C6CE7F3AA8}.Release|Any CPU.Build.0 = Release|Any CPU - {B3975199-6254-488A-8A91-34227645E305}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B3975199-6254-488A-8A91-34227645E305}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B3975199-6254-488A-8A91-34227645E305}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B3975199-6254-488A-8A91-34227645E305}.Release|Any CPU.Build.0 = Release|Any CPU - {61E0DE96-3D43-4748-B233-ECC63AAA5668}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {61E0DE96-3D43-4748-B233-ECC63AAA5668}.Debug|Any CPU.Build.0 = Debug|Any CPU - {61E0DE96-3D43-4748-B233-ECC63AAA5668}.Release|Any CPU.ActiveCfg = Release|Any CPU - {61E0DE96-3D43-4748-B233-ECC63AAA5668}.Release|Any CPU.Build.0 = Release|Any CPU - {4D0F8991-0762-4DDC-8890-33E655914009}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4D0F8991-0762-4DDC-8890-33E655914009}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4D0F8991-0762-4DDC-8890-33E655914009}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4D0F8991-0762-4DDC-8890-33E655914009}.Release|Any CPU.Build.0 = Release|Any CPU - {7C77C27C-C3EF-48ED-9E33-6B95AD6DF178}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7C77C27C-C3EF-48ED-9E33-6B95AD6DF178}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7C77C27C-C3EF-48ED-9E33-6B95AD6DF178}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7C77C27C-C3EF-48ED-9E33-6B95AD6DF178}.Release|Any CPU.Build.0 = Release|Any CPU - {0A9789D8-31F8-4CCE-A2B1-4B464C792121}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0A9789D8-31F8-4CCE-A2B1-4B464C792121}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0A9789D8-31F8-4CCE-A2B1-4B464C792121}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0A9789D8-31F8-4CCE-A2B1-4B464C792121}.Release|Any CPU.Build.0 = Release|Any CPU - {F57AB9BE-3042-4677-8249-8D2DBE9C4F89}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F57AB9BE-3042-4677-8249-8D2DBE9C4F89}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F57AB9BE-3042-4677-8249-8D2DBE9C4F89}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F57AB9BE-3042-4677-8249-8D2DBE9C4F89}.Release|Any CPU.Build.0 = Release|Any CPU - {6E83F4B2-5080-4175-B9FF-B2EF01346F03}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6E83F4B2-5080-4175-B9FF-B2EF01346F03}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6E83F4B2-5080-4175-B9FF-B2EF01346F03}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6E83F4B2-5080-4175-B9FF-B2EF01346F03}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {E531AED3-94C6-4053-AC81-A1840DA4AA8E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {7F22CCEB-4D4C-424C-B165-62DB66F8A914} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {C15EC23C-D2C1-4556-8EA1-7C7F845F9103} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {81434A7D-8833-414A-A80D-1D793E51F58C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {9F38CE3C-9026-43A5-9F91-5CBE70FAD14D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {DEABB1BE-5BE8-4D43-93EE-C15690F710C5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {965AF99E-6E95-48FF-B2D8-DCCB9A32E48D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E1A34C7B-70D6-420A-9678-C6C6CE7F3AA8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B3975199-6254-488A-8A91-34227645E305} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {61E0DE96-3D43-4748-B233-ECC63AAA5668} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4D0F8991-0762-4DDC-8890-33E655914009} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {7C77C27C-C3EF-48ED-9E33-6B95AD6DF178} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0A9789D8-31F8-4CCE-A2B1-4B464C792121} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F57AB9BE-3042-4677-8249-8D2DBE9C4F89} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6E83F4B2-5080-4175-B9FF-B2EF01346F03} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {DEABB1BE-5BE8-4D43-93EE-C15690F710C5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {965AF99E-6E95-48FF-B2D8-DCCB9A32E48D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E1A34C7B-70D6-420A-9678-C6C6CE7F3AA8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B3975199-6254-488A-8A91-34227645E305} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {61E0DE96-3D43-4748-B233-ECC63AAA5668} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4D0F8991-0762-4DDC-8890-33E655914009} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {7C77C27C-C3EF-48ED-9E33-6B95AD6DF178} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0A9789D8-31F8-4CCE-A2B1-4B464C792121} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F57AB9BE-3042-4677-8249-8D2DBE9C4F89} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6E83F4B2-5080-4175-B9FF-B2EF01346F03} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {1084F279-EC02-49EB-9EA2-4536D90CA85D} diff --git a/sdk/src/Services/ConnectCampaignService/Generated/AmazonConnectCampaignServiceConfig.cs b/sdk/src/Services/ConnectCampaignService/Generated/AmazonConnectCampaignServiceConfig.cs index 4bab85066fbd..d7d52bb0b30f 100644 --- a/sdk/src/Services/ConnectCampaignService/Generated/AmazonConnectCampaignServiceConfig.cs +++ b/sdk/src/Services/ConnectCampaignService/Generated/AmazonConnectCampaignServiceConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.ConnectCampaignService public partial class AmazonConnectCampaignServiceConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("ConnectCampaigns", "4.0.0.0"); private static readonly AmazonConnectCampaignServiceEndpointResolver EndpointResolver = new AmazonConnectCampaignServiceEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("ConnectCampaigns", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("ConnectCampaigns", "3.7.400.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/ConnectCampaignService/Properties/AssemblyInfo.cs b/sdk/src/Services/ConnectCampaignService/Properties/AssemblyInfo.cs index 50710dc8859d..1e6ca3e707ee 100644 --- a/sdk/src/Services/ConnectCampaignService/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/ConnectCampaignService/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/ConnectCampaignsV2/AWSSDK.ConnectCampaignsV2.Net35.csproj b/sdk/src/Services/ConnectCampaignsV2/AWSSDK.ConnectCampaignsV2.Net35.csproj deleted file mode 100644 index 1761883d7b6b..000000000000 --- a/sdk/src/Services/ConnectCampaignsV2/AWSSDK.ConnectCampaignsV2.Net35.csproj +++ /dev/null @@ -1,83 +0,0 @@ - - - true - net35 - $(DefineConstants);BCL;BCL35;AWS_APM_API;CODE_ANALYSIS - portable - true - AWSSDK.ConnectCampaignsV2 - AWSSDK.ConnectCampaignsV2 - - false - false - false - false - false - false - false - false - true - true - - - C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v3.5\Profile\Client - - false - CA1822 - - - ../../../AWSDotNetSDK.ruleset - - - ../../../AWSDotNetSDKForBuild.ruleset - - - - - - ../../../awssdk.dll.snk - - - - - $(AWSKeyFile) - - - - - - - - - - - - - - - - - - - - - - - all - - - all - - - - - - - - - C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\v3.5\System.Data.Entity.dll - - - - - \ No newline at end of file diff --git a/sdk/src/Services/ConnectCampaignsV2/AWSSDK.ConnectCampaignsV2.Net45.csproj b/sdk/src/Services/ConnectCampaignsV2/AWSSDK.ConnectCampaignsV2.NetFramework.csproj similarity index 80% rename from sdk/src/Services/ConnectCampaignsV2/AWSSDK.ConnectCampaignsV2.Net45.csproj rename to sdk/src/Services/ConnectCampaignsV2/AWSSDK.ConnectCampaignsV2.NetFramework.csproj index db09407f4995..768c65d87983 100644 --- a/sdk/src/Services/ConnectCampaignsV2/AWSSDK.ConnectCampaignsV2.Net45.csproj +++ b/sdk/src/Services/ConnectCampaignsV2/AWSSDK.ConnectCampaignsV2.NetFramework.csproj @@ -1,8 +1,8 @@ true - net45 - $(DefineConstants);BCL;BCL45;AWS_ASYNC_API;CODE_ANALYSIS + net472 + $(DefineConstants);BCL;AWS_ASYNC_API;CODE_ANALYSIS portable true AWSSDK.ConnectCampaignsV2 @@ -21,6 +21,16 @@ CA1822 + + + 11.0 + + + 9.0 + ../../../AWSDotNetSDK.ruleset @@ -45,14 +55,13 @@ - - + diff --git a/sdk/src/Services/ConnectCampaignsV2/AWSSDK.ConnectCampaignsV2.NetStandard.csproj b/sdk/src/Services/ConnectCampaignsV2/AWSSDK.ConnectCampaignsV2.NetStandard.csproj index 704dc9886483..8985199db986 100644 --- a/sdk/src/Services/ConnectCampaignsV2/AWSSDK.ConnectCampaignsV2.NetStandard.csproj +++ b/sdk/src/Services/ConnectCampaignsV2/AWSSDK.ConnectCampaignsV2.NetStandard.csproj @@ -31,6 +31,16 @@ true + + + 11.0 + + + 9.0 + ../../../AWSDotNetSDK.ruleset @@ -55,8 +65,6 @@ - - diff --git a/sdk/src/Services/ConnectCampaignsV2/ConnectCampaignsV2.sln b/sdk/src/Services/ConnectCampaignsV2/ConnectCampaignsV2.sln index 0d274c69ed70..6f954e7f738d 100644 --- a/sdk/src/Services/ConnectCampaignsV2/ConnectCampaignsV2.sln +++ b/sdk/src/Services/ConnectCampaignsV2/ConnectCampaignsV2.sln @@ -4,9 +4,7 @@ VisualStudioVersion = 15.0.26730.12 MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Core", "Core", "{9863FCB3-BFA4-4B9C-B8F6-302BA5F660B8}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.Core.Net35", "../../Core/AWSSDK.Core.Net35.csproj", "{1FACE5D0-97BF-4069-B4F7-0FE28BB160F8}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.Core.Net45", "../../Core/AWSSDK.Core.Net45.csproj", "{7DE3AFA0-1B2D-41B1-82BD-120B8B210B43}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.Core.NetFramework", "../../Core/AWSSDK.Core.NetFramework.csproj", "{7DE3AFA0-1B2D-41B1-82BD-120B8B210B43}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.Core.NetStandard", "../../Core/AWSSDK.Core.NetStandard.csproj", "{A855B58E-ED32-40AE-AE8F-054F448B9F2C}" EndProject @@ -14,27 +12,19 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Services", "Services", "{93 EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ConnectCampaignsV2", "ConnectCampaignsV2", "{3E0D8D4C-20D8-4FDC-9AC3-90A2724728A2}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.ConnectCampaignsV2.Net35", "AWSSDK.ConnectCampaignsV2.Net35.csproj", "{9E6D433F-9E4F-4C0C-8126-C334C84AA0FE}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.ConnectCampaignsV2.Net45", "AWSSDK.ConnectCampaignsV2.Net45.csproj", "{2C51D710-222D-4B3B-84B9-B8CF7C679F35}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.ConnectCampaignsV2.NetFramework", "AWSSDK.ConnectCampaignsV2.NetFramework.csproj", "{6A9B4061-ECFE-42FB-A0D6-00EBFC045439}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.ConnectCampaignsV2.NetStandard", "AWSSDK.ConnectCampaignsV2.NetStandard.csproj", "{A544EEEB-1FA3-475D-8C45-A6F6B7A02D44}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Test", "Test", "{12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.UnitTests.ConnectCampaignsV2.Net35", "../../../test/Services/ConnectCampaignsV2/UnitTests/AWSSDK.UnitTests.ConnectCampaignsV2.Net35.csproj", "{352FC0EC-98B6-4ECC-B30E-D83B6308F92D}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.UnitTests.ConnectCampaignsV2.Net45", "../../../test/Services/ConnectCampaignsV2/UnitTests/AWSSDK.UnitTests.ConnectCampaignsV2.Net45.csproj", "{8DF54D07-6B6C-4637-A5BE-F1CE061B4683}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.UnitTests.ConnectCampaignsV2.NetFramework", "../../../test/Services/ConnectCampaignsV2/UnitTests/AWSSDK.UnitTests.ConnectCampaignsV2.NetFramework.csproj", "{57CA926F-AE43-4C01-9B74-450733224360}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ServiceClientGeneratorLib", "../../../../generator/ServiceClientGeneratorLib/ServiceClientGeneratorLib.csproj", "{7BEE7C44-BE12-43CC-AFB9-B5852A1F43C8}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.UnitTestUtilities.Net35", "../../../test/UnitTests/Custom/AWSSDK.UnitTestUtilities.Net35.csproj", "{A23CE153-A4A3-4D3A-A6DC-0DD1B207118E}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.UnitTestUtilities.Net45", "../../../test/UnitTests/Custom/AWSSDK.UnitTestUtilities.Net45.csproj", "{002B183F-E568-49CD-9D06-CBCFF2C2921F}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.IntegrationTestUtilities.Net35", "../../../test/IntegrationTests/AWSSDK.IntegrationTestUtilities.Net35.csproj", "{924D2906-70D6-4D77-8603-816648B2CCA6}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.UnitTestUtilities.NetFramework", "../../../test/UnitTests/Custom/AWSSDK.UnitTestUtilities.NetFramework.csproj", "{002B183F-E568-49CD-9D06-CBCFF2C2921F}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.IntegrationTestUtilities.Net45", "../../../test/IntegrationTests/AWSSDK.IntegrationTestUtilities.Net45.csproj", "{7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.IntegrationTestUtilities.NetFramework", "../../../test/IntegrationTests/AWSSDK.IntegrationTestUtilities.NetFramework.csproj", "{7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.CommonTest", "../../../test/Common/AWSSDK.CommonTest.csproj", "{66F78F86-68D7-4538-8EA5-A669A08E1C19}" EndProject @@ -44,25 +34,15 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UnitTests.NetStandard.CoreO EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "IntegrationTestDependencies", "IntegrationTestDependencies", "{939EC5C2-8345-43E2-8F97-72EEEBEEA0AC}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.Extensions.CrtIntegration.Net35", "../../../../extensions/src/AWSSDK.Extensions.CrtIntegration/AWSSDK.Extensions.CrtIntegration.Net35.csproj", "{3E986E9B-48AB-40A8-A46A-FB25AE7B2DC8}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.Extensions.CrtIntegration.Net45", "../../../../extensions/src/AWSSDK.Extensions.CrtIntegration/AWSSDK.Extensions.CrtIntegration.Net45.csproj", "{01623051-2FF1-4B5F-962C-DF3FBDDF7BED}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.IdentityManagement.Net35", "../IdentityManagement/AWSSDK.IdentityManagement.Net35.csproj", "{A031FA18-6BA5-4D91-A451-6AFB1504AF15}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.SecurityToken.Net35", "../SecurityToken/AWSSDK.SecurityToken.Net35.csproj", "{6E17BDF3-A1B7-4457-B7CB-13218023C86E}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.SimpleNotificationService.Net35", "../SimpleNotificationService/AWSSDK.SimpleNotificationService.Net35.csproj", "{0C3D3915-82BC-4D29-A81C-B6E047E8C2BD}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.S3.Net35", "../S3/AWSSDK.S3.Net35.csproj", "{67B70461-C3DB-41CD-95D5-9DF2F5018977}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.Extensions.CrtIntegration.NetFramework", "../../../../extensions/src/AWSSDK.Extensions.CrtIntegration/AWSSDK.Extensions.CrtIntegration.NetFramework.csproj", "{ED60A502-A0F7-4F55-A173-26911509FDC5}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.IdentityManagement.Net45", "../IdentityManagement/AWSSDK.IdentityManagement.Net45.csproj", "{0FC36310-0EC9-44D4-940F-99BC98F80DB1}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.IdentityManagement.NetFramework", "../IdentityManagement/AWSSDK.IdentityManagement.NetFramework.csproj", "{5199C7ED-90FC-445B-917E-D00CA4B8B66F}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.S3.Net45", "../S3/AWSSDK.S3.Net45.csproj", "{D019AF7A-4F3A-401C-9D81-FF3D08AC671B}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.S3.NetFramework", "../S3/AWSSDK.S3.NetFramework.csproj", "{19C11639-101C-48BD-9F90-5FAB04C4AC15}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.SecurityToken.Net45", "../SecurityToken/AWSSDK.SecurityToken.Net45.csproj", "{5241C36F-4C42-4850-A482-87A969BB78D9}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.SecurityToken.NetFramework", "../SecurityToken/AWSSDK.SecurityToken.NetFramework.csproj", "{DBC00840-CADC-4242-A3D5-14935BD3D321}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.SimpleNotificationService.Net45", "../SimpleNotificationService/AWSSDK.SimpleNotificationService.Net45.csproj", "{D470F8C9-BAB7-442C-9E5E-B054DF92640C}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.SimpleNotificationService.NetFramework", "../SimpleNotificationService/AWSSDK.SimpleNotificationService.NetFramework.csproj", "{B3553078-74FD-4261-A19A-564655E9013B}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -70,10 +50,6 @@ Global Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {1FACE5D0-97BF-4069-B4F7-0FE28BB160F8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1FACE5D0-97BF-4069-B4F7-0FE28BB160F8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1FACE5D0-97BF-4069-B4F7-0FE28BB160F8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1FACE5D0-97BF-4069-B4F7-0FE28BB160F8}.Release|Any CPU.Build.0 = Release|Any CPU {7DE3AFA0-1B2D-41B1-82BD-120B8B210B43}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {7DE3AFA0-1B2D-41B1-82BD-120B8B210B43}.Debug|Any CPU.Build.0 = Debug|Any CPU {7DE3AFA0-1B2D-41B1-82BD-120B8B210B43}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -82,42 +58,26 @@ Global {A855B58E-ED32-40AE-AE8F-054F448B9F2C}.Debug|Any CPU.Build.0 = Debug|Any CPU {A855B58E-ED32-40AE-AE8F-054F448B9F2C}.Release|Any CPU.ActiveCfg = Release|Any CPU {A855B58E-ED32-40AE-AE8F-054F448B9F2C}.Release|Any CPU.Build.0 = Release|Any CPU - {9E6D433F-9E4F-4C0C-8126-C334C84AA0FE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9E6D433F-9E4F-4C0C-8126-C334C84AA0FE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9E6D433F-9E4F-4C0C-8126-C334C84AA0FE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9E6D433F-9E4F-4C0C-8126-C334C84AA0FE}.Release|Any CPU.Build.0 = Release|Any CPU - {2C51D710-222D-4B3B-84B9-B8CF7C679F35}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2C51D710-222D-4B3B-84B9-B8CF7C679F35}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2C51D710-222D-4B3B-84B9-B8CF7C679F35}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2C51D710-222D-4B3B-84B9-B8CF7C679F35}.Release|Any CPU.Build.0 = Release|Any CPU + {6A9B4061-ECFE-42FB-A0D6-00EBFC045439}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {6A9B4061-ECFE-42FB-A0D6-00EBFC045439}.Debug|Any CPU.Build.0 = Debug|Any CPU + {6A9B4061-ECFE-42FB-A0D6-00EBFC045439}.Release|Any CPU.ActiveCfg = Release|Any CPU + {6A9B4061-ECFE-42FB-A0D6-00EBFC045439}.Release|Any CPU.Build.0 = Release|Any CPU {A544EEEB-1FA3-475D-8C45-A6F6B7A02D44}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {A544EEEB-1FA3-475D-8C45-A6F6B7A02D44}.Debug|Any CPU.Build.0 = Debug|Any CPU {A544EEEB-1FA3-475D-8C45-A6F6B7A02D44}.Release|Any CPU.ActiveCfg = Release|Any CPU {A544EEEB-1FA3-475D-8C45-A6F6B7A02D44}.Release|Any CPU.Build.0 = Release|Any CPU - {352FC0EC-98B6-4ECC-B30E-D83B6308F92D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {352FC0EC-98B6-4ECC-B30E-D83B6308F92D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {352FC0EC-98B6-4ECC-B30E-D83B6308F92D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {352FC0EC-98B6-4ECC-B30E-D83B6308F92D}.Release|Any CPU.Build.0 = Release|Any CPU - {8DF54D07-6B6C-4637-A5BE-F1CE061B4683}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8DF54D07-6B6C-4637-A5BE-F1CE061B4683}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8DF54D07-6B6C-4637-A5BE-F1CE061B4683}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8DF54D07-6B6C-4637-A5BE-F1CE061B4683}.Release|Any CPU.Build.0 = Release|Any CPU + {57CA926F-AE43-4C01-9B74-450733224360}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {57CA926F-AE43-4C01-9B74-450733224360}.Debug|Any CPU.Build.0 = Debug|Any CPU + {57CA926F-AE43-4C01-9B74-450733224360}.Release|Any CPU.ActiveCfg = Release|Any CPU + {57CA926F-AE43-4C01-9B74-450733224360}.Release|Any CPU.Build.0 = Release|Any CPU {7BEE7C44-BE12-43CC-AFB9-B5852A1F43C8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {7BEE7C44-BE12-43CC-AFB9-B5852A1F43C8}.Debug|Any CPU.Build.0 = Debug|Any CPU {7BEE7C44-BE12-43CC-AFB9-B5852A1F43C8}.Release|Any CPU.ActiveCfg = Release|Any CPU {7BEE7C44-BE12-43CC-AFB9-B5852A1F43C8}.Release|Any CPU.Build.0 = Release|Any CPU - {A23CE153-A4A3-4D3A-A6DC-0DD1B207118E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A23CE153-A4A3-4D3A-A6DC-0DD1B207118E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A23CE153-A4A3-4D3A-A6DC-0DD1B207118E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A23CE153-A4A3-4D3A-A6DC-0DD1B207118E}.Release|Any CPU.Build.0 = Release|Any CPU {002B183F-E568-49CD-9D06-CBCFF2C2921F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {002B183F-E568-49CD-9D06-CBCFF2C2921F}.Debug|Any CPU.Build.0 = Debug|Any CPU {002B183F-E568-49CD-9D06-CBCFF2C2921F}.Release|Any CPU.ActiveCfg = Release|Any CPU {002B183F-E568-49CD-9D06-CBCFF2C2921F}.Release|Any CPU.Build.0 = Release|Any CPU - {924D2906-70D6-4D77-8603-816648B2CCA6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {924D2906-70D6-4D77-8603-816648B2CCA6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {924D2906-70D6-4D77-8603-816648B2CCA6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {924D2906-70D6-4D77-8603-816648B2CCA6}.Release|Any CPU.Build.0 = Release|Any CPU {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7}.Debug|Any CPU.Build.0 = Debug|Any CPU {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -134,78 +94,48 @@ Global {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {3E986E9B-48AB-40A8-A46A-FB25AE7B2DC8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3E986E9B-48AB-40A8-A46A-FB25AE7B2DC8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3E986E9B-48AB-40A8-A46A-FB25AE7B2DC8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3E986E9B-48AB-40A8-A46A-FB25AE7B2DC8}.Release|Any CPU.Build.0 = Release|Any CPU - {01623051-2FF1-4B5F-962C-DF3FBDDF7BED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {01623051-2FF1-4B5F-962C-DF3FBDDF7BED}.Debug|Any CPU.Build.0 = Debug|Any CPU - {01623051-2FF1-4B5F-962C-DF3FBDDF7BED}.Release|Any CPU.ActiveCfg = Release|Any CPU - {01623051-2FF1-4B5F-962C-DF3FBDDF7BED}.Release|Any CPU.Build.0 = Release|Any CPU - {A031FA18-6BA5-4D91-A451-6AFB1504AF15}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A031FA18-6BA5-4D91-A451-6AFB1504AF15}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A031FA18-6BA5-4D91-A451-6AFB1504AF15}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A031FA18-6BA5-4D91-A451-6AFB1504AF15}.Release|Any CPU.Build.0 = Release|Any CPU - {6E17BDF3-A1B7-4457-B7CB-13218023C86E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6E17BDF3-A1B7-4457-B7CB-13218023C86E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6E17BDF3-A1B7-4457-B7CB-13218023C86E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6E17BDF3-A1B7-4457-B7CB-13218023C86E}.Release|Any CPU.Build.0 = Release|Any CPU - {0C3D3915-82BC-4D29-A81C-B6E047E8C2BD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0C3D3915-82BC-4D29-A81C-B6E047E8C2BD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0C3D3915-82BC-4D29-A81C-B6E047E8C2BD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0C3D3915-82BC-4D29-A81C-B6E047E8C2BD}.Release|Any CPU.Build.0 = Release|Any CPU - {67B70461-C3DB-41CD-95D5-9DF2F5018977}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {67B70461-C3DB-41CD-95D5-9DF2F5018977}.Debug|Any CPU.Build.0 = Debug|Any CPU - {67B70461-C3DB-41CD-95D5-9DF2F5018977}.Release|Any CPU.ActiveCfg = Release|Any CPU - {67B70461-C3DB-41CD-95D5-9DF2F5018977}.Release|Any CPU.Build.0 = Release|Any CPU - {0FC36310-0EC9-44D4-940F-99BC98F80DB1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0FC36310-0EC9-44D4-940F-99BC98F80DB1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0FC36310-0EC9-44D4-940F-99BC98F80DB1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0FC36310-0EC9-44D4-940F-99BC98F80DB1}.Release|Any CPU.Build.0 = Release|Any CPU - {D019AF7A-4F3A-401C-9D81-FF3D08AC671B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D019AF7A-4F3A-401C-9D81-FF3D08AC671B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D019AF7A-4F3A-401C-9D81-FF3D08AC671B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D019AF7A-4F3A-401C-9D81-FF3D08AC671B}.Release|Any CPU.Build.0 = Release|Any CPU - {5241C36F-4C42-4850-A482-87A969BB78D9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5241C36F-4C42-4850-A482-87A969BB78D9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5241C36F-4C42-4850-A482-87A969BB78D9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5241C36F-4C42-4850-A482-87A969BB78D9}.Release|Any CPU.Build.0 = Release|Any CPU - {D470F8C9-BAB7-442C-9E5E-B054DF92640C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D470F8C9-BAB7-442C-9E5E-B054DF92640C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D470F8C9-BAB7-442C-9E5E-B054DF92640C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D470F8C9-BAB7-442C-9E5E-B054DF92640C}.Release|Any CPU.Build.0 = Release|Any CPU + {ED60A502-A0F7-4F55-A173-26911509FDC5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {ED60A502-A0F7-4F55-A173-26911509FDC5}.Debug|Any CPU.Build.0 = Debug|Any CPU + {ED60A502-A0F7-4F55-A173-26911509FDC5}.Release|Any CPU.ActiveCfg = Release|Any CPU + {ED60A502-A0F7-4F55-A173-26911509FDC5}.Release|Any CPU.Build.0 = Release|Any CPU + {5199C7ED-90FC-445B-917E-D00CA4B8B66F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {5199C7ED-90FC-445B-917E-D00CA4B8B66F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {5199C7ED-90FC-445B-917E-D00CA4B8B66F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {5199C7ED-90FC-445B-917E-D00CA4B8B66F}.Release|Any CPU.Build.0 = Release|Any CPU + {19C11639-101C-48BD-9F90-5FAB04C4AC15}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {19C11639-101C-48BD-9F90-5FAB04C4AC15}.Debug|Any CPU.Build.0 = Debug|Any CPU + {19C11639-101C-48BD-9F90-5FAB04C4AC15}.Release|Any CPU.ActiveCfg = Release|Any CPU + {19C11639-101C-48BD-9F90-5FAB04C4AC15}.Release|Any CPU.Build.0 = Release|Any CPU + {DBC00840-CADC-4242-A3D5-14935BD3D321}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {DBC00840-CADC-4242-A3D5-14935BD3D321}.Debug|Any CPU.Build.0 = Debug|Any CPU + {DBC00840-CADC-4242-A3D5-14935BD3D321}.Release|Any CPU.ActiveCfg = Release|Any CPU + {DBC00840-CADC-4242-A3D5-14935BD3D321}.Release|Any CPU.Build.0 = Release|Any CPU + {B3553078-74FD-4261-A19A-564655E9013B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B3553078-74FD-4261-A19A-564655E9013B}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B3553078-74FD-4261-A19A-564655E9013B}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B3553078-74FD-4261-A19A-564655E9013B}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution - {1FACE5D0-97BF-4069-B4F7-0FE28BB160F8} = {9863FCB3-BFA4-4B9C-B8F6-302BA5F660B8} {7DE3AFA0-1B2D-41B1-82BD-120B8B210B43} = {9863FCB3-BFA4-4B9C-B8F6-302BA5F660B8} {A855B58E-ED32-40AE-AE8F-054F448B9F2C} = {9863FCB3-BFA4-4B9C-B8F6-302BA5F660B8} {3E0D8D4C-20D8-4FDC-9AC3-90A2724728A2} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AB} - {9E6D433F-9E4F-4C0C-8126-C334C84AA0FE} = {3E0D8D4C-20D8-4FDC-9AC3-90A2724728A2} - {2C51D710-222D-4B3B-84B9-B8CF7C679F35} = {3E0D8D4C-20D8-4FDC-9AC3-90A2724728A2} + {6A9B4061-ECFE-42FB-A0D6-00EBFC045439} = {3E0D8D4C-20D8-4FDC-9AC3-90A2724728A2} {A544EEEB-1FA3-475D-8C45-A6F6B7A02D44} = {3E0D8D4C-20D8-4FDC-9AC3-90A2724728A2} - {352FC0EC-98B6-4ECC-B30E-D83B6308F92D} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {8DF54D07-6B6C-4637-A5BE-F1CE061B4683} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {57CA926F-AE43-4C01-9B74-450733224360} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7BEE7C44-BE12-43CC-AFB9-B5852A1F43C8} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {A23CE153-A4A3-4D3A-A6DC-0DD1B207118E} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {924D2906-70D6-4D77-8603-816648B2CCA6} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {3E986E9B-48AB-40A8-A46A-FB25AE7B2DC8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {01623051-2FF1-4B5F-962C-DF3FBDDF7BED} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A031FA18-6BA5-4D91-A451-6AFB1504AF15} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6E17BDF3-A1B7-4457-B7CB-13218023C86E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0C3D3915-82BC-4D29-A81C-B6E047E8C2BD} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {67B70461-C3DB-41CD-95D5-9DF2F5018977} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0FC36310-0EC9-44D4-940F-99BC98F80DB1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D019AF7A-4F3A-401C-9D81-FF3D08AC671B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {5241C36F-4C42-4850-A482-87A969BB78D9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D470F8C9-BAB7-442C-9E5E-B054DF92640C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} + {ED60A502-A0F7-4F55-A173-26911509FDC5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} + {5199C7ED-90FC-445B-917E-D00CA4B8B66F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} + {19C11639-101C-48BD-9F90-5FAB04C4AC15} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} + {DBC00840-CADC-4242-A3D5-14935BD3D321} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} + {B3553078-74FD-4261-A19A-564655E9013B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {082C6C03-CC4C-41A8-AAC9-0F2A816CA631} diff --git a/sdk/src/Services/ConnectCampaignsV2/Generated/AmazonConnectCampaignsV2Config.cs b/sdk/src/Services/ConnectCampaignsV2/Generated/AmazonConnectCampaignsV2Config.cs index b66817a1afa6..58d642e22cb9 100644 --- a/sdk/src/Services/ConnectCampaignsV2/Generated/AmazonConnectCampaignsV2Config.cs +++ b/sdk/src/Services/ConnectCampaignsV2/Generated/AmazonConnectCampaignsV2Config.cs @@ -21,6 +21,8 @@ using Amazon.Runtime; using Amazon.Runtime.Internal; using Amazon.Util.Internal; +using Amazon.Runtime.Internal.Auth; +using Amazon.Runtime.Endpoints; using Amazon.ConnectCampaignsV2.Internal; namespace Amazon.ConnectCampaignsV2 @@ -32,7 +34,10 @@ namespace Amazon.ConnectCampaignsV2 public partial class AmazonConnectCampaignsV2Config : ClientConfig { private static readonly string UserAgentString = - InternalSDKUtils.BuildUserAgentString("ConnectCampaignsV2", "3.7.400.0"); + InternalSDKUtils.BuildUserAgentString("ConnectCampaignsV2", "4.0.0.0"); + + private static readonly AmazonConnectCampaignsV2EndpointResolver EndpointResolver = + new AmazonConnectCampaignsV2EndpointResolver(); private string _userAgent = UserAgentString; /// @@ -89,5 +94,24 @@ public override string UserAgent } } + /// + /// Returns the endpoint that will be used for a particular request. + /// + /// A Container class for parameters used for endpoint resolution. + /// The resolved endpoint for the given request. + public override Amazon.Runtime.Endpoints.Endpoint DetermineServiceOperationEndpoint(ServiceOperationEndpointParameters parameters) + { + var requestContext = new RequestContext(false, new AWS4Signer()) + { + ClientConfig = this, + OriginalRequest = parameters.Request, + Request = new DefaultRequest(parameters.Request, ServiceId) + }; + + var executionContext = new Amazon.Runtime.Internal.ExecutionContext(requestContext, null); + return EndpointResolver.GetEndpoint(executionContext); + } + + } } \ No newline at end of file diff --git a/sdk/src/Services/ConnectCampaignsV2/Generated/AmazonConnectCampaignsV2DefaultConfiguration.cs b/sdk/src/Services/ConnectCampaignsV2/Generated/AmazonConnectCampaignsV2DefaultConfiguration.cs index f6169fff8415..367db75227b5 100644 --- a/sdk/src/Services/ConnectCampaignsV2/Generated/AmazonConnectCampaignsV2DefaultConfiguration.cs +++ b/sdk/src/Services/ConnectCampaignsV2/Generated/AmazonConnectCampaignsV2DefaultConfiguration.cs @@ -43,8 +43,7 @@ public static ReadOnlyCollection GetAllConfigurations() InRegion, CrossRegion, Mobile, - Auto, - Legacy + Auto }); } @@ -55,7 +54,6 @@ public static ReadOnlyCollection GetAllConfigurations() { Name = DefaultConfigurationMode.Standard, RetryMode = RequestRetryMode.Standard, - StsRegionalEndpoints = StsRegionalEndpointsValue.Regional, S3UsEast1RegionalEndpoint = S3UsEast1RegionalEndpointValue.Regional, // 0:00:03.1 ConnectTimeout = TimeSpan.FromMilliseconds(3100L), @@ -71,7 +69,6 @@ public static ReadOnlyCollection GetAllConfigurations() { Name = DefaultConfigurationMode.InRegion, RetryMode = RequestRetryMode.Standard, - StsRegionalEndpoints = StsRegionalEndpointsValue.Regional, S3UsEast1RegionalEndpoint = S3UsEast1RegionalEndpointValue.Regional, // 0:00:01.1 ConnectTimeout = TimeSpan.FromMilliseconds(1100L), @@ -87,7 +84,6 @@ public static ReadOnlyCollection GetAllConfigurations() { Name = DefaultConfigurationMode.CrossRegion, RetryMode = RequestRetryMode.Standard, - StsRegionalEndpoints = StsRegionalEndpointsValue.Regional, S3UsEast1RegionalEndpoint = S3UsEast1RegionalEndpointValue.Regional, // 0:00:03.1 ConnectTimeout = TimeSpan.FromMilliseconds(3100L), @@ -103,7 +99,6 @@ public static ReadOnlyCollection GetAllConfigurations() { Name = DefaultConfigurationMode.Mobile, RetryMode = RequestRetryMode.Standard, - StsRegionalEndpoints = StsRegionalEndpointsValue.Regional, S3UsEast1RegionalEndpoint = S3UsEast1RegionalEndpointValue.Regional, // 0:00:30 ConnectTimeout = TimeSpan.FromMilliseconds(30000L), @@ -119,7 +114,6 @@ public static ReadOnlyCollection GetAllConfigurations() { Name = DefaultConfigurationMode.Auto, RetryMode = RequestRetryMode.Standard, - StsRegionalEndpoints = StsRegionalEndpointsValue.Regional, S3UsEast1RegionalEndpoint = S3UsEast1RegionalEndpointValue.Regional, // 0:00:01.1 ConnectTimeout = TimeSpan.FromMilliseconds(1100L), @@ -128,19 +122,5 @@ public static ReadOnlyCollection GetAllConfigurations() TimeToFirstByteTimeout = null, HttpRequestTimeout = null }; - /// - ///

    The LEGACY mode provides default settings that vary per SDK and were used prior to establishment of defaults_mode

    - ///     - public static IDefaultConfiguration Legacy {get;} = new DefaultConfiguration - { - Name = DefaultConfigurationMode.Legacy, - RetryMode = RequestRetryMode.Legacy, - StsRegionalEndpoints = StsRegionalEndpointsValue.Legacy, - S3UsEast1RegionalEndpoint = S3UsEast1RegionalEndpointValue.Legacy, - ConnectTimeout = null, - TlsNegotiationTimeout = null, - TimeToFirstByteTimeout = null, - HttpRequestTimeout = null - }; } } \ No newline at end of file diff --git a/sdk/src/Services/ConnectCampaignsV2/Generated/Model/AccessDeniedException.cs b/sdk/src/Services/ConnectCampaignsV2/Generated/Model/AccessDeniedException.cs index 8e3dfaa32189..5a48cfc58029 100644 --- a/sdk/src/Services/ConnectCampaignsV2/Generated/Model/AccessDeniedException.cs +++ b/sdk/src/Services/ConnectCampaignsV2/Generated/Model/AccessDeniedException.cs @@ -108,11 +108,6 @@ protected AccessDeniedException(System.Runtime.Serialization.SerializationInfo i /// The that holds the serialized object data about the exception being thrown. /// The that contains contextual information about the source or destination. /// The parameter is a null reference (Nothing in Visual Basic). -#if BCL35 - [System.Security.Permissions.SecurityPermission( - System.Security.Permissions.SecurityAction.LinkDemand, - Flags = System.Security.Permissions.SecurityPermissionFlag.SerializationFormatter)] -#endif [System.Security.SecurityCritical] // These FxCop rules are giving false-positives for this method [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Security", "CA2123:OverrideLinkDemandsShouldBeIdenticalToBase")] diff --git a/sdk/src/Services/ConnectCampaignsV2/Generated/Model/AnswerMachineDetectionConfig.cs b/sdk/src/Services/ConnectCampaignsV2/Generated/Model/AnswerMachineDetectionConfig.cs index c3f1cdfca89f..4d26307aff4c 100644 --- a/sdk/src/Services/ConnectCampaignsV2/Generated/Model/AnswerMachineDetectionConfig.cs +++ b/sdk/src/Services/ConnectCampaignsV2/Generated/Model/AnswerMachineDetectionConfig.cs @@ -43,9 +43,9 @@ public partial class AnswerMachineDetectionConfig /// Enable or disable await answer machine prompt /// ///     - public bool AwaitAnswerMachinePrompt + public bool? AwaitAnswerMachinePrompt { - get { return this._awaitAnswerMachinePrompt.GetValueOrDefault(); } + get { return this._awaitAnswerMachinePrompt; } set { this._awaitAnswerMachinePrompt = value; } } @@ -62,9 +62,9 @@ internal bool IsSetAwaitAnswerMachinePrompt() /// ///     [AWSProperty(Required=true)] - public bool EnableAnswerMachineDetection + public bool? EnableAnswerMachineDetection { - get { return this._enableAnswerMachineDetection.GetValueOrDefault(); } + get { return this._enableAnswerMachineDetection; } set { this._enableAnswerMachineDetection = value; } } diff --git a/sdk/src/Services/ConnectCampaignsV2/Generated/Model/CommunicationLimit.cs b/sdk/src/Services/ConnectCampaignsV2/Generated/Model/CommunicationLimit.cs index 8fd9817f5365..4fe395a83792 100644 --- a/sdk/src/Services/ConnectCampaignsV2/Generated/Model/CommunicationLimit.cs +++ b/sdk/src/Services/ConnectCampaignsV2/Generated/Model/CommunicationLimit.cs @@ -45,9 +45,9 @@ public partial class CommunicationLimit ///     ///     [AWSProperty(Required=true, Min=1, Max=30)] - public int Frequency + public int? Frequency { - get { return this._frequency.GetValueOrDefault(); } + get { return this._frequency; } set { this._frequency = value; } } @@ -64,9 +64,9 @@ internal bool IsSetFrequency() /// ///     [AWSProperty(Required=true, Min=1)] - public int MaxCountPerRecipient + public int? MaxCountPerRecipient { - get { return this._maxCountPerRecipient.GetValueOrDefault(); } + get { return this._maxCountPerRecipient; } set { this._maxCountPerRecipient = value; } } diff --git a/sdk/src/Services/ConnectCampaignsV2/Generated/Model/ConflictException.cs b/sdk/src/Services/ConnectCampaignsV2/Generated/Model/ConflictException.cs index 455fb3d5d63d..91d92af2d291 100644 --- a/sdk/src/Services/ConnectCampaignsV2/Generated/Model/ConflictException.cs +++ b/sdk/src/Services/ConnectCampaignsV2/Generated/Model/ConflictException.cs @@ -109,11 +109,6 @@ protected ConflictException(System.Runtime.Serialization.SerializationInfo info, /// The that holds the serialized object data about the exception being thrown. /// The that contains contextual information about the source or destination. /// The parameter is a null reference (Nothing in Visual Basic). -#if BCL35 - [System.Security.Permissions.SecurityPermission( - System.Security.Permissions.SecurityAction.LinkDemand, - Flags = System.Security.Permissions.SecurityPermissionFlag.SerializationFormatter)] -#endif [System.Security.SecurityCritical] // These FxCop rules are giving false-positives for this method [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Security", "CA2123:OverrideLinkDemandsShouldBeIdenticalToBase")] diff --git a/sdk/src/Services/ConnectCampaignsV2/Generated/Model/EmailChannelSubtypeConfig.cs b/sdk/src/Services/ConnectCampaignsV2/Generated/Model/EmailChannelSubtypeConfig.cs index 97844398bd95..44d5aa2ed477 100644 --- a/sdk/src/Services/ConnectCampaignsV2/Generated/Model/EmailChannelSubtypeConfig.cs +++ b/sdk/src/Services/ConnectCampaignsV2/Generated/Model/EmailChannelSubtypeConfig.cs @@ -42,9 +42,9 @@ public partial class EmailChannelSubtypeConfig /// Gets and sets the property Capacity. ///     [AWSProperty(Max=1)] - public double Capacity + public double? Capacity { - get { return this._capacity.GetValueOrDefault(); } + get { return this._capacity; } set { this._capacity = value; } } diff --git a/sdk/src/Services/ConnectCampaignsV2/Generated/Model/EncryptionConfig.cs b/sdk/src/Services/ConnectCampaignsV2/Generated/Model/EncryptionConfig.cs index 6fc850212552..02711c32e898 100644 --- a/sdk/src/Services/ConnectCampaignsV2/Generated/Model/EncryptionConfig.cs +++ b/sdk/src/Services/ConnectCampaignsV2/Generated/Model/EncryptionConfig.cs @@ -44,9 +44,9 @@ public partial class EncryptionConfig /// Gets and sets the property Enabled. ///     [AWSProperty(Required=true)] - public bool Enabled + public bool? Enabled { - get { return this._enabled.GetValueOrDefault(); } + get { return this._enabled; } set { this._enabled = value; } } diff --git a/sdk/src/Services/ConnectCampaignsV2/Generated/Model/Internal/MarshallTransformations/AnswerMachineDetectionConfigMarshaller.cs b/sdk/src/Services/ConnectCampaignsV2/Generated/Model/Internal/MarshallTransformations/AnswerMachineDetectionConfigMarshaller.cs index 8b87290f841b..ba0e54ae0e8c 100644 --- a/sdk/src/Services/ConnectCampaignsV2/Generated/Model/Internal/MarshallTransformations/AnswerMachineDetectionConfigMarshaller.cs +++ b/sdk/src/Services/ConnectCampaignsV2/Generated/Model/Internal/MarshallTransformations/AnswerMachineDetectionConfigMarshaller.cs @@ -51,13 +51,13 @@ public void Marshall(AnswerMachineDetectionConfig requestObject, JsonMarshallerC if(requestObject.IsSetAwaitAnswerMachinePrompt()) { context.Writer.WritePropertyName("awaitAnswerMachinePrompt"); - context.Writer.Write(requestObject.AwaitAnswerMachinePrompt); + context.Writer.Write(requestObject.AwaitAnswerMachinePrompt.Value); } if(requestObject.IsSetEnableAnswerMachineDetection()) { context.Writer.WritePropertyName("enableAnswerMachineDetection"); - context.Writer.Write(requestObject.EnableAnswerMachineDetection); + context.Writer.Write(requestObject.EnableAnswerMachineDetection.Value); } } diff --git a/sdk/src/Services/ConnectCampaignsV2/Generated/Model/Internal/MarshallTransformations/AnswerMachineDetectionConfigUnmarshaller.cs b/sdk/src/Services/ConnectCampaignsV2/Generated/Model/Internal/MarshallTransformations/AnswerMachineDetectionConfigUnmarshaller.cs index 4dd9898a1b4c..711d160cf577 100644 --- a/sdk/src/Services/ConnectCampaignsV2/Generated/Model/Internal/MarshallTransformations/AnswerMachineDetectionConfigUnmarshaller.cs +++ b/sdk/src/Services/ConnectCampaignsV2/Generated/Model/Internal/MarshallTransformations/AnswerMachineDetectionConfigUnmarshaller.cs @@ -68,13 +68,13 @@ public AnswerMachineDetectionConfig Unmarshall(JsonUnmarshallerContext context) { if (context.TestExpression("awaitAnswerMachinePrompt", targetDepth)) { - var unmarshaller = BoolUnmarshaller.Instance; + var unmarshaller = NullableBoolUnmarshaller.Instance; unmarshalledObject.AwaitAnswerMachinePrompt = unmarshaller.Unmarshall(context); continue; } if (context.TestExpression("enableAnswerMachineDetection", targetDepth)) { - var unmarshaller = BoolUnmarshaller.Instance; + var unmarshaller = NullableBoolUnmarshaller.Instance; unmarshalledObject.EnableAnswerMachineDetection = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/ConnectCampaignsV2/Generated/Model/Internal/MarshallTransformations/CommunicationLimitMarshaller.cs b/sdk/src/Services/ConnectCampaignsV2/Generated/Model/Internal/MarshallTransformations/CommunicationLimitMarshaller.cs index b1f7a56c5179..bbfcf3d1fd0c 100644 --- a/sdk/src/Services/ConnectCampaignsV2/Generated/Model/Internal/MarshallTransformations/CommunicationLimitMarshaller.cs +++ b/sdk/src/Services/ConnectCampaignsV2/Generated/Model/Internal/MarshallTransformations/CommunicationLimitMarshaller.cs @@ -51,13 +51,13 @@ public void Marshall(CommunicationLimit requestObject, JsonMarshallerContext con if(requestObject.IsSetFrequency()) { context.Writer.WritePropertyName("frequency"); - context.Writer.Write(requestObject.Frequency); + context.Writer.Write(requestObject.Frequency.Value); } if(requestObject.IsSetMaxCountPerRecipient()) { context.Writer.WritePropertyName("maxCountPerRecipient"); - context.Writer.Write(requestObject.MaxCountPerRecipient); + context.Writer.Write(requestObject.MaxCountPerRecipient.Value); } if(requestObject.IsSetUnit()) diff --git a/sdk/src/Services/ConnectCampaignsV2/Generated/Model/Internal/MarshallTransformations/CommunicationLimitUnmarshaller.cs b/sdk/src/Services/ConnectCampaignsV2/Generated/Model/Internal/MarshallTransformations/CommunicationLimitUnmarshaller.cs index ea5133c28fe4..6c1e6b4e5660 100644 --- a/sdk/src/Services/ConnectCampaignsV2/Generated/Model/Internal/MarshallTransformations/CommunicationLimitUnmarshaller.cs +++ b/sdk/src/Services/ConnectCampaignsV2/Generated/Model/Internal/MarshallTransformations/CommunicationLimitUnmarshaller.cs @@ -68,13 +68,13 @@ public CommunicationLimit Unmarshall(JsonUnmarshallerContext context) { if (context.TestExpression("frequency", targetDepth)) { - var unmarshaller = IntUnmarshaller.Instance; + var unmarshaller = NullableIntUnmarshaller.Instance; unmarshalledObject.Frequency = unmarshaller.Unmarshall(context); continue; } if (context.TestExpression("maxCountPerRecipient", targetDepth)) { - var unmarshaller = IntUnmarshaller.Instance; + var unmarshaller = NullableIntUnmarshaller.Instance; unmarshalledObject.MaxCountPerRecipient = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/ConnectCampaignsV2/Generated/Model/Internal/MarshallTransformations/CreateCampaignRequestMarshaller.cs b/sdk/src/Services/ConnectCampaignsV2/Generated/Model/Internal/MarshallTransformations/CreateCampaignRequestMarshaller.cs index dc764ff5b95f..90ff1e185580 100644 --- a/sdk/src/Services/ConnectCampaignsV2/Generated/Model/Internal/MarshallTransformations/CreateCampaignRequestMarshaller.cs +++ b/sdk/src/Services/ConnectCampaignsV2/Generated/Model/Internal/MarshallTransformations/CreateCampaignRequestMarshaller.cs @@ -61,102 +61,105 @@ public IRequest Marshall(CreateCampaignRequest publicRequest) request.HttpMethod = "PUT"; request.ResourcePath = "/v2/campaigns"; - using (StringWriter stringWriter = new StringWriter(CultureInfo.InvariantCulture)) + using (MemoryStream memoryStream = new MemoryStream()) { - JsonWriter writer = new JsonWriter(stringWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetChannelSubtypeConfig()) + using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) { - context.Writer.WritePropertyName("channelSubtypeConfig"); - context.Writer.WriteObjectStart(); + JsonWriter writer = new JsonWriter(streamWriter); + writer.Validate = false; + writer.WriteObjectStart(); + var context = new JsonMarshallerContext(request, writer); + if(publicRequest.IsSetChannelSubtypeConfig()) + { + context.Writer.WritePropertyName("channelSubtypeConfig"); + context.Writer.WriteObjectStart(); - var marshaller = ChannelSubtypeConfigMarshaller.Instance; - marshaller.Marshall(publicRequest.ChannelSubtypeConfig, context); + var marshaller = ChannelSubtypeConfigMarshaller.Instance; + marshaller.Marshall(publicRequest.ChannelSubtypeConfig, context); - context.Writer.WriteObjectEnd(); - } + context.Writer.WriteObjectEnd(); + } - if(publicRequest.IsSetCommunicationLimitsOverride()) - { - context.Writer.WritePropertyName("communicationLimitsOverride"); - context.Writer.WriteObjectStart(); + if(publicRequest.IsSetCommunicationLimitsOverride()) + { + context.Writer.WritePropertyName("communicationLimitsOverride"); + context.Writer.WriteObjectStart(); - var marshaller = CommunicationLimitsConfigMarshaller.Instance; - marshaller.Marshall(publicRequest.CommunicationLimitsOverride, context); + var marshaller = CommunicationLimitsConfigMarshaller.Instance; + marshaller.Marshall(publicRequest.CommunicationLimitsOverride, context); - context.Writer.WriteObjectEnd(); - } + context.Writer.WriteObjectEnd(); + } - if(publicRequest.IsSetCommunicationTimeConfig()) - { - context.Writer.WritePropertyName("communicationTimeConfig"); - context.Writer.WriteObjectStart(); + if(publicRequest.IsSetCommunicationTimeConfig()) + { + context.Writer.WritePropertyName("communicationTimeConfig"); + context.Writer.WriteObjectStart(); - var marshaller = CommunicationTimeConfigMarshaller.Instance; - marshaller.Marshall(publicRequest.CommunicationTimeConfig, context); + var marshaller = CommunicationTimeConfigMarshaller.Instance; + marshaller.Marshall(publicRequest.CommunicationTimeConfig, context); - context.Writer.WriteObjectEnd(); - } + context.Writer.WriteObjectEnd(); + } - if(publicRequest.IsSetConnectCampaignFlowArn()) - { - context.Writer.WritePropertyName("connectCampaignFlowArn"); - context.Writer.Write(publicRequest.ConnectCampaignFlowArn); - } + if(publicRequest.IsSetConnectCampaignFlowArn()) + { + context.Writer.WritePropertyName("connectCampaignFlowArn"); + context.Writer.Write(publicRequest.ConnectCampaignFlowArn); + } - if(publicRequest.IsSetConnectInstanceId()) - { - context.Writer.WritePropertyName("connectInstanceId"); - context.Writer.Write(publicRequest.ConnectInstanceId); - } + if(publicRequest.IsSetConnectInstanceId()) + { + context.Writer.WritePropertyName("connectInstanceId"); + context.Writer.Write(publicRequest.ConnectInstanceId); + } - if(publicRequest.IsSetName()) - { - context.Writer.WritePropertyName("name"); - context.Writer.Write(publicRequest.Name); - } + if(publicRequest.IsSetName()) + { + context.Writer.WritePropertyName("name"); + context.Writer.Write(publicRequest.Name); + } - if(publicRequest.IsSetSchedule()) - { - context.Writer.WritePropertyName("schedule"); - context.Writer.WriteObjectStart(); + if(publicRequest.IsSetSchedule()) + { + context.Writer.WritePropertyName("schedule"); + context.Writer.WriteObjectStart(); - var marshaller = ScheduleMarshaller.Instance; - marshaller.Marshall(publicRequest.Schedule, context); + var marshaller = ScheduleMarshaller.Instance; + marshaller.Marshall(publicRequest.Schedule, context); - context.Writer.WriteObjectEnd(); - } + context.Writer.WriteObjectEnd(); + } - if(publicRequest.IsSetSource()) - { - context.Writer.WritePropertyName("source"); - context.Writer.WriteObjectStart(); + if(publicRequest.IsSetSource()) + { + context.Writer.WritePropertyName("source"); + context.Writer.WriteObjectStart(); - var marshaller = SourceMarshaller.Instance; - marshaller.Marshall(publicRequest.Source, context); + var marshaller = SourceMarshaller.Instance; + marshaller.Marshall(publicRequest.Source, context); - context.Writer.WriteObjectEnd(); - } + context.Writer.WriteObjectEnd(); + } - if(publicRequest.IsSetTags()) - { - context.Writer.WritePropertyName("tags"); - context.Writer.WriteObjectStart(); - foreach (var publicRequestTagsKvp in publicRequest.Tags) + if(publicRequest.IsSetTags()) { - context.Writer.WritePropertyName(publicRequestTagsKvp.Key); - var publicRequestTagsValue = publicRequestTagsKvp.Value; - - context.Writer.Write(publicRequestTagsValue); + context.Writer.WritePropertyName("tags"); + context.Writer.WriteObjectStart(); + foreach (var publicRequestTagsKvp in publicRequest.Tags) + { + context.Writer.WritePropertyName(publicRequestTagsKvp.Key); + var publicRequestTagsValue = publicRequestTagsKvp.Value; + + context.Writer.Write(publicRequestTagsValue); + } + context.Writer.WriteObjectEnd(); } - context.Writer.WriteObjectEnd(); + + writer.WriteObjectEnd(); } - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); + request.Content = memoryStream.ToArray(); } diff --git a/sdk/src/Services/ConnectCampaignsV2/Generated/Model/Internal/MarshallTransformations/DeleteConnectInstanceIntegrationRequestMarshaller.cs b/sdk/src/Services/ConnectCampaignsV2/Generated/Model/Internal/MarshallTransformations/DeleteConnectInstanceIntegrationRequestMarshaller.cs index a8c7ec39b833..41612392167d 100644 --- a/sdk/src/Services/ConnectCampaignsV2/Generated/Model/Internal/MarshallTransformations/DeleteConnectInstanceIntegrationRequestMarshaller.cs +++ b/sdk/src/Services/ConnectCampaignsV2/Generated/Model/Internal/MarshallTransformations/DeleteConnectInstanceIntegrationRequestMarshaller.cs @@ -64,26 +64,29 @@ public IRequest Marshall(DeleteConnectInstanceIntegrationRequest publicRequest) throw new AmazonConnectCampaignsV2Exception("Request object does not have required field ConnectInstanceId set"); request.AddPathResource("{connectInstanceId}", StringUtils.FromString(publicRequest.ConnectInstanceId)); request.ResourcePath = "/v2/connect-instance/{connectInstanceId}/integrations/delete"; - using (StringWriter stringWriter = new StringWriter(CultureInfo.InvariantCulture)) + using (MemoryStream memoryStream = new MemoryStream()) { - JsonWriter writer = new JsonWriter(stringWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetIntegrationIdentifier()) + using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) { - context.Writer.WritePropertyName("integrationIdentifier"); - context.Writer.WriteObjectStart(); + JsonWriter writer = new JsonWriter(streamWriter); + writer.Validate = false; + writer.WriteObjectStart(); + var context = new JsonMarshallerContext(request, writer); + if(publicRequest.IsSetIntegrationIdentifier()) + { + context.Writer.WritePropertyName("integrationIdentifier"); + context.Writer.WriteObjectStart(); - var marshaller = IntegrationIdentifierMarshaller.Instance; - marshaller.Marshall(publicRequest.IntegrationIdentifier, context); + var marshaller = IntegrationIdentifierMarshaller.Instance; + marshaller.Marshall(publicRequest.IntegrationIdentifier, context); - context.Writer.WriteObjectEnd(); + context.Writer.WriteObjectEnd(); + } + + writer.WriteObjectEnd(); } - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); + request.Content = memoryStream.ToArray(); } diff --git a/sdk/src/Services/ConnectCampaignsV2/Generated/Model/Internal/MarshallTransformations/EmailChannelSubtypeConfigMarshaller.cs b/sdk/src/Services/ConnectCampaignsV2/Generated/Model/Internal/MarshallTransformations/EmailChannelSubtypeConfigMarshaller.cs index ece0db465a1e..b96174563b50 100644 --- a/sdk/src/Services/ConnectCampaignsV2/Generated/Model/Internal/MarshallTransformations/EmailChannelSubtypeConfigMarshaller.cs +++ b/sdk/src/Services/ConnectCampaignsV2/Generated/Model/Internal/MarshallTransformations/EmailChannelSubtypeConfigMarshaller.cs @@ -51,13 +51,13 @@ public void Marshall(EmailChannelSubtypeConfig requestObject, JsonMarshallerCont if(requestObject.IsSetCapacity()) { context.Writer.WritePropertyName("capacity"); - if(StringUtils.IsSpecialDoubleValue(requestObject.Capacity)) + if(StringUtils.IsSpecialDoubleValue(requestObject.Capacity.Value)) { - context.Writer.Write(StringUtils.FromSpecialDoubleValue(requestObject.Capacity)); + context.Writer.Write(StringUtils.FromSpecialDoubleValue(requestObject.Capacity.Value)); } else { - context.Writer.Write(requestObject.Capacity); + context.Writer.Write(requestObject.Capacity.Value); } } diff --git a/sdk/src/Services/ConnectCampaignsV2/Generated/Model/Internal/MarshallTransformations/EmailChannelSubtypeConfigUnmarshaller.cs b/sdk/src/Services/ConnectCampaignsV2/Generated/Model/Internal/MarshallTransformations/EmailChannelSubtypeConfigUnmarshaller.cs index da489b3d4dc4..8da295ca4696 100644 --- a/sdk/src/Services/ConnectCampaignsV2/Generated/Model/Internal/MarshallTransformations/EmailChannelSubtypeConfigUnmarshaller.cs +++ b/sdk/src/Services/ConnectCampaignsV2/Generated/Model/Internal/MarshallTransformations/EmailChannelSubtypeConfigUnmarshaller.cs @@ -68,7 +68,7 @@ public EmailChannelSubtypeConfig Unmarshall(JsonUnmarshallerContext context) { if (context.TestExpression("capacity", targetDepth)) { - var unmarshaller = DoubleUnmarshaller.Instance; + var unmarshaller = NullableDoubleUnmarshaller.Instance; unmarshalledObject.Capacity = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/ConnectCampaignsV2/Generated/Model/Internal/MarshallTransformations/EncryptionConfigMarshaller.cs b/sdk/src/Services/ConnectCampaignsV2/Generated/Model/Internal/MarshallTransformations/EncryptionConfigMarshaller.cs index 643a0d23685d..0bd6fed0821d 100644 --- a/sdk/src/Services/ConnectCampaignsV2/Generated/Model/Internal/MarshallTransformations/EncryptionConfigMarshaller.cs +++ b/sdk/src/Services/ConnectCampaignsV2/Generated/Model/Internal/MarshallTransformations/EncryptionConfigMarshaller.cs @@ -51,7 +51,7 @@ public void Marshall(EncryptionConfig requestObject, JsonMarshallerContext conte if(requestObject.IsSetEnabled()) { context.Writer.WritePropertyName("enabled"); - context.Writer.Write(requestObject.Enabled); + context.Writer.Write(requestObject.Enabled.Value); } if(requestObject.IsSetEncryptionType()) diff --git a/sdk/src/Services/ConnectCampaignsV2/Generated/Model/Internal/MarshallTransformations/EncryptionConfigUnmarshaller.cs b/sdk/src/Services/ConnectCampaignsV2/Generated/Model/Internal/MarshallTransformations/EncryptionConfigUnmarshaller.cs index c6257c2ed210..3e97e468507d 100644 --- a/sdk/src/Services/ConnectCampaignsV2/Generated/Model/Internal/MarshallTransformations/EncryptionConfigUnmarshaller.cs +++ b/sdk/src/Services/ConnectCampaignsV2/Generated/Model/Internal/MarshallTransformations/EncryptionConfigUnmarshaller.cs @@ -68,7 +68,7 @@ public EncryptionConfig Unmarshall(JsonUnmarshallerContext context) { if (context.TestExpression("enabled", targetDepth)) { - var unmarshaller = BoolUnmarshaller.Instance; + var unmarshaller = NullableBoolUnmarshaller.Instance; unmarshalledObject.Enabled = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/ConnectCampaignsV2/Generated/Model/Internal/MarshallTransformations/GetCampaignStateBatchRequestMarshaller.cs b/sdk/src/Services/ConnectCampaignsV2/Generated/Model/Internal/MarshallTransformations/GetCampaignStateBatchRequestMarshaller.cs index 5c063d481549..83de4ca5115a 100644 --- a/sdk/src/Services/ConnectCampaignsV2/Generated/Model/Internal/MarshallTransformations/GetCampaignStateBatchRequestMarshaller.cs +++ b/sdk/src/Services/ConnectCampaignsV2/Generated/Model/Internal/MarshallTransformations/GetCampaignStateBatchRequestMarshaller.cs @@ -61,26 +61,29 @@ public IRequest Marshall(GetCampaignStateBatchRequest publicRequest) request.HttpMethod = "POST"; request.ResourcePath = "/v2/campaigns-state"; - using (StringWriter stringWriter = new StringWriter(CultureInfo.InvariantCulture)) + using (MemoryStream memoryStream = new MemoryStream()) { - JsonWriter writer = new JsonWriter(stringWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetCampaignIds()) + using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) { - context.Writer.WritePropertyName("campaignIds"); - context.Writer.WriteArrayStart(); - foreach(var publicRequestCampaignIdsListValue in publicRequest.CampaignIds) + JsonWriter writer = new JsonWriter(streamWriter); + writer.Validate = false; + writer.WriteObjectStart(); + var context = new JsonMarshallerContext(request, writer); + if(publicRequest.IsSetCampaignIds()) { - context.Writer.Write(publicRequestCampaignIdsListValue); + context.Writer.WritePropertyName("campaignIds"); + context.Writer.WriteArrayStart(); + foreach(var publicRequestCampaignIdsListValue in publicRequest.CampaignIds) + { + context.Writer.Write(publicRequestCampaignIdsListValue); + } + context.Writer.WriteArrayEnd(); } - context.Writer.WriteArrayEnd(); + + writer.WriteObjectEnd(); } - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); + request.Content = memoryStream.ToArray(); } diff --git a/sdk/src/Services/ConnectCampaignsV2/Generated/Model/Internal/MarshallTransformations/ListCampaignsRequestMarshaller.cs b/sdk/src/Services/ConnectCampaignsV2/Generated/Model/Internal/MarshallTransformations/ListCampaignsRequestMarshaller.cs index 0ff907da262a..70cb92929703 100644 --- a/sdk/src/Services/ConnectCampaignsV2/Generated/Model/Internal/MarshallTransformations/ListCampaignsRequestMarshaller.cs +++ b/sdk/src/Services/ConnectCampaignsV2/Generated/Model/Internal/MarshallTransformations/ListCampaignsRequestMarshaller.cs @@ -61,38 +61,41 @@ public IRequest Marshall(ListCampaignsRequest publicRequest) request.HttpMethod = "POST"; request.ResourcePath = "/v2/campaigns-summary"; - using (StringWriter stringWriter = new StringWriter(CultureInfo.InvariantCulture)) + using (MemoryStream memoryStream = new MemoryStream()) { - JsonWriter writer = new JsonWriter(stringWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetFilters()) + using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) { - context.Writer.WritePropertyName("filters"); - context.Writer.WriteObjectStart(); + JsonWriter writer = new JsonWriter(streamWriter); + writer.Validate = false; + writer.WriteObjectStart(); + var context = new JsonMarshallerContext(request, writer); + if(publicRequest.IsSetFilters()) + { + context.Writer.WritePropertyName("filters"); + context.Writer.WriteObjectStart(); - var marshaller = CampaignFiltersMarshaller.Instance; - marshaller.Marshall(publicRequest.Filters, context); + var marshaller = CampaignFiltersMarshaller.Instance; + marshaller.Marshall(publicRequest.Filters, context); - context.Writer.WriteObjectEnd(); - } + context.Writer.WriteObjectEnd(); + } - if(publicRequest.IsSetMaxResults()) - { - context.Writer.WritePropertyName("maxResults"); - context.Writer.Write(publicRequest.MaxResults); - } + if(publicRequest.IsSetMaxResults()) + { + context.Writer.WritePropertyName("maxResults"); + context.Writer.Write(publicRequest.MaxResults.Value); + } - if(publicRequest.IsSetNextToken()) - { - context.Writer.WritePropertyName("nextToken"); - context.Writer.Write(publicRequest.NextToken); + if(publicRequest.IsSetNextToken()) + { + context.Writer.WritePropertyName("nextToken"); + context.Writer.Write(publicRequest.NextToken); + } + + writer.WriteObjectEnd(); } - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); + request.Content = memoryStream.ToArray(); } diff --git a/sdk/src/Services/ConnectCampaignsV2/Generated/Model/Internal/MarshallTransformations/PredictiveConfigMarshaller.cs b/sdk/src/Services/ConnectCampaignsV2/Generated/Model/Internal/MarshallTransformations/PredictiveConfigMarshaller.cs index 117d3ba6fe68..2ff6d3307448 100644 --- a/sdk/src/Services/ConnectCampaignsV2/Generated/Model/Internal/MarshallTransformations/PredictiveConfigMarshaller.cs +++ b/sdk/src/Services/ConnectCampaignsV2/Generated/Model/Internal/MarshallTransformations/PredictiveConfigMarshaller.cs @@ -51,13 +51,13 @@ public void Marshall(PredictiveConfig requestObject, JsonMarshallerContext conte if(requestObject.IsSetBandwidthAllocation()) { context.Writer.WritePropertyName("bandwidthAllocation"); - if(StringUtils.IsSpecialDoubleValue(requestObject.BandwidthAllocation)) + if(StringUtils.IsSpecialDoubleValue(requestObject.BandwidthAllocation.Value)) { - context.Writer.Write(StringUtils.FromSpecialDoubleValue(requestObject.BandwidthAllocation)); + context.Writer.Write(StringUtils.FromSpecialDoubleValue(requestObject.BandwidthAllocation.Value)); } else { - context.Writer.Write(requestObject.BandwidthAllocation); + context.Writer.Write(requestObject.BandwidthAllocation.Value); } } diff --git a/sdk/src/Services/ConnectCampaignsV2/Generated/Model/Internal/MarshallTransformations/PredictiveConfigUnmarshaller.cs b/sdk/src/Services/ConnectCampaignsV2/Generated/Model/Internal/MarshallTransformations/PredictiveConfigUnmarshaller.cs index 756a7eea0246..338725e2ae2c 100644 --- a/sdk/src/Services/ConnectCampaignsV2/Generated/Model/Internal/MarshallTransformations/PredictiveConfigUnmarshaller.cs +++ b/sdk/src/Services/ConnectCampaignsV2/Generated/Model/Internal/MarshallTransformations/PredictiveConfigUnmarshaller.cs @@ -68,7 +68,7 @@ public PredictiveConfig Unmarshall(JsonUnmarshallerContext context) { if (context.TestExpression("bandwidthAllocation", targetDepth)) { - var unmarshaller = DoubleUnmarshaller.Instance; + var unmarshaller = NullableDoubleUnmarshaller.Instance; unmarshalledObject.BandwidthAllocation = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/ConnectCampaignsV2/Generated/Model/Internal/MarshallTransformations/ProgressiveConfigMarshaller.cs b/sdk/src/Services/ConnectCampaignsV2/Generated/Model/Internal/MarshallTransformations/ProgressiveConfigMarshaller.cs index e059139b0e81..4be09f4fc43c 100644 --- a/sdk/src/Services/ConnectCampaignsV2/Generated/Model/Internal/MarshallTransformations/ProgressiveConfigMarshaller.cs +++ b/sdk/src/Services/ConnectCampaignsV2/Generated/Model/Internal/MarshallTransformations/ProgressiveConfigMarshaller.cs @@ -51,13 +51,13 @@ public void Marshall(ProgressiveConfig requestObject, JsonMarshallerContext cont if(requestObject.IsSetBandwidthAllocation()) { context.Writer.WritePropertyName("bandwidthAllocation"); - if(StringUtils.IsSpecialDoubleValue(requestObject.BandwidthAllocation)) + if(StringUtils.IsSpecialDoubleValue(requestObject.BandwidthAllocation.Value)) { - context.Writer.Write(StringUtils.FromSpecialDoubleValue(requestObject.BandwidthAllocation)); + context.Writer.Write(StringUtils.FromSpecialDoubleValue(requestObject.BandwidthAllocation.Value)); } else { - context.Writer.Write(requestObject.BandwidthAllocation); + context.Writer.Write(requestObject.BandwidthAllocation.Value); } } diff --git a/sdk/src/Services/ConnectCampaignsV2/Generated/Model/Internal/MarshallTransformations/ProgressiveConfigUnmarshaller.cs b/sdk/src/Services/ConnectCampaignsV2/Generated/Model/Internal/MarshallTransformations/ProgressiveConfigUnmarshaller.cs index 0b2daebbdbe2..7ac5389a50e0 100644 --- a/sdk/src/Services/ConnectCampaignsV2/Generated/Model/Internal/MarshallTransformations/ProgressiveConfigUnmarshaller.cs +++ b/sdk/src/Services/ConnectCampaignsV2/Generated/Model/Internal/MarshallTransformations/ProgressiveConfigUnmarshaller.cs @@ -68,7 +68,7 @@ public ProgressiveConfig Unmarshall(JsonUnmarshallerContext context) { if (context.TestExpression("bandwidthAllocation", targetDepth)) { - var unmarshaller = DoubleUnmarshaller.Instance; + var unmarshaller = NullableDoubleUnmarshaller.Instance; unmarshalledObject.BandwidthAllocation = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/ConnectCampaignsV2/Generated/Model/Internal/MarshallTransformations/PutConnectInstanceIntegrationRequestMarshaller.cs b/sdk/src/Services/ConnectCampaignsV2/Generated/Model/Internal/MarshallTransformations/PutConnectInstanceIntegrationRequestMarshaller.cs index 630ec3a249d2..3451d97bf396 100644 --- a/sdk/src/Services/ConnectCampaignsV2/Generated/Model/Internal/MarshallTransformations/PutConnectInstanceIntegrationRequestMarshaller.cs +++ b/sdk/src/Services/ConnectCampaignsV2/Generated/Model/Internal/MarshallTransformations/PutConnectInstanceIntegrationRequestMarshaller.cs @@ -64,26 +64,29 @@ public IRequest Marshall(PutConnectInstanceIntegrationRequest publicRequest) throw new AmazonConnectCampaignsV2Exception("Request object does not have required field ConnectInstanceId set"); request.AddPathResource("{connectInstanceId}", StringUtils.FromString(publicRequest.ConnectInstanceId)); request.ResourcePath = "/v2/connect-instance/{connectInstanceId}/integrations"; - using (StringWriter stringWriter = new StringWriter(CultureInfo.InvariantCulture)) + using (MemoryStream memoryStream = new MemoryStream()) { - JsonWriter writer = new JsonWriter(stringWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetIntegrationConfig()) + using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) { - context.Writer.WritePropertyName("integrationConfig"); - context.Writer.WriteObjectStart(); + JsonWriter writer = new JsonWriter(streamWriter); + writer.Validate = false; + writer.WriteObjectStart(); + var context = new JsonMarshallerContext(request, writer); + if(publicRequest.IsSetIntegrationConfig()) + { + context.Writer.WritePropertyName("integrationConfig"); + context.Writer.WriteObjectStart(); - var marshaller = IntegrationConfigMarshaller.Instance; - marshaller.Marshall(publicRequest.IntegrationConfig, context); + var marshaller = IntegrationConfigMarshaller.Instance; + marshaller.Marshall(publicRequest.IntegrationConfig, context); - context.Writer.WriteObjectEnd(); + context.Writer.WriteObjectEnd(); + } + + writer.WriteObjectEnd(); } - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); + request.Content = memoryStream.ToArray(); } diff --git a/sdk/src/Services/ConnectCampaignsV2/Generated/Model/Internal/MarshallTransformations/PutOutboundRequestBatchRequestMarshaller.cs b/sdk/src/Services/ConnectCampaignsV2/Generated/Model/Internal/MarshallTransformations/PutOutboundRequestBatchRequestMarshaller.cs index 4747711f18c4..d2f9d0ab311b 100644 --- a/sdk/src/Services/ConnectCampaignsV2/Generated/Model/Internal/MarshallTransformations/PutOutboundRequestBatchRequestMarshaller.cs +++ b/sdk/src/Services/ConnectCampaignsV2/Generated/Model/Internal/MarshallTransformations/PutOutboundRequestBatchRequestMarshaller.cs @@ -64,31 +64,34 @@ public IRequest Marshall(PutOutboundRequestBatchRequest publicRequest) throw new AmazonConnectCampaignsV2Exception("Request object does not have required field Id set"); request.AddPathResource("{id}", StringUtils.FromString(publicRequest.Id)); request.ResourcePath = "/v2/campaigns/{id}/outbound-requests"; - using (StringWriter stringWriter = new StringWriter(CultureInfo.InvariantCulture)) + using (MemoryStream memoryStream = new MemoryStream()) { - JsonWriter writer = new JsonWriter(stringWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetOutboundRequests()) + using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) { - context.Writer.WritePropertyName("outboundRequests"); - context.Writer.WriteArrayStart(); - foreach(var publicRequestOutboundRequestsListValue in publicRequest.OutboundRequests) + JsonWriter writer = new JsonWriter(streamWriter); + writer.Validate = false; + writer.WriteObjectStart(); + var context = new JsonMarshallerContext(request, writer); + if(publicRequest.IsSetOutboundRequests()) { - context.Writer.WriteObjectStart(); + context.Writer.WritePropertyName("outboundRequests"); + context.Writer.WriteArrayStart(); + foreach(var publicRequestOutboundRequestsListValue in publicRequest.OutboundRequests) + { + context.Writer.WriteObjectStart(); - var marshaller = OutboundRequestMarshaller.Instance; - marshaller.Marshall(publicRequestOutboundRequestsListValue, context); + var marshaller = OutboundRequestMarshaller.Instance; + marshaller.Marshall(publicRequestOutboundRequestsListValue, context); - context.Writer.WriteObjectEnd(); + context.Writer.WriteObjectEnd(); + } + context.Writer.WriteArrayEnd(); } - context.Writer.WriteArrayEnd(); + + writer.WriteObjectEnd(); } - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); + request.Content = memoryStream.ToArray(); } diff --git a/sdk/src/Services/ConnectCampaignsV2/Generated/Model/Internal/MarshallTransformations/ScheduleUnmarshaller.cs b/sdk/src/Services/ConnectCampaignsV2/Generated/Model/Internal/MarshallTransformations/ScheduleUnmarshaller.cs index 7f43fe21bc4c..79b216bcf627 100644 --- a/sdk/src/Services/ConnectCampaignsV2/Generated/Model/Internal/MarshallTransformations/ScheduleUnmarshaller.cs +++ b/sdk/src/Services/ConnectCampaignsV2/Generated/Model/Internal/MarshallTransformations/ScheduleUnmarshaller.cs @@ -68,7 +68,7 @@ public Schedule Unmarshall(JsonUnmarshallerContext context) { if (context.TestExpression("endTime", targetDepth)) { - var unmarshaller = DateTimeUnmarshaller.Instance; + var unmarshaller = NullableDateTimeUnmarshaller.Instance; unmarshalledObject.EndTime = unmarshaller.Unmarshall(context); continue; } @@ -80,7 +80,7 @@ public Schedule Unmarshall(JsonUnmarshallerContext context) } if (context.TestExpression("startTime", targetDepth)) { - var unmarshaller = DateTimeUnmarshaller.Instance; + var unmarshaller = NullableDateTimeUnmarshaller.Instance; unmarshalledObject.StartTime = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/ConnectCampaignsV2/Generated/Model/Internal/MarshallTransformations/SmsChannelSubtypeConfigMarshaller.cs b/sdk/src/Services/ConnectCampaignsV2/Generated/Model/Internal/MarshallTransformations/SmsChannelSubtypeConfigMarshaller.cs index 7cadb4eebd72..6025611467e3 100644 --- a/sdk/src/Services/ConnectCampaignsV2/Generated/Model/Internal/MarshallTransformations/SmsChannelSubtypeConfigMarshaller.cs +++ b/sdk/src/Services/ConnectCampaignsV2/Generated/Model/Internal/MarshallTransformations/SmsChannelSubtypeConfigMarshaller.cs @@ -51,13 +51,13 @@ public void Marshall(SmsChannelSubtypeConfig requestObject, JsonMarshallerContex if(requestObject.IsSetCapacity()) { context.Writer.WritePropertyName("capacity"); - if(StringUtils.IsSpecialDoubleValue(requestObject.Capacity)) + if(StringUtils.IsSpecialDoubleValue(requestObject.Capacity.Value)) { - context.Writer.Write(StringUtils.FromSpecialDoubleValue(requestObject.Capacity)); + context.Writer.Write(StringUtils.FromSpecialDoubleValue(requestObject.Capacity.Value)); } else { - context.Writer.Write(requestObject.Capacity); + context.Writer.Write(requestObject.Capacity.Value); } } diff --git a/sdk/src/Services/ConnectCampaignsV2/Generated/Model/Internal/MarshallTransformations/SmsChannelSubtypeConfigUnmarshaller.cs b/sdk/src/Services/ConnectCampaignsV2/Generated/Model/Internal/MarshallTransformations/SmsChannelSubtypeConfigUnmarshaller.cs index c17fdafb86cc..29fc732bf4d9 100644 --- a/sdk/src/Services/ConnectCampaignsV2/Generated/Model/Internal/MarshallTransformations/SmsChannelSubtypeConfigUnmarshaller.cs +++ b/sdk/src/Services/ConnectCampaignsV2/Generated/Model/Internal/MarshallTransformations/SmsChannelSubtypeConfigUnmarshaller.cs @@ -68,7 +68,7 @@ public SmsChannelSubtypeConfig Unmarshall(JsonUnmarshallerContext context) { if (context.TestExpression("capacity", targetDepth)) { - var unmarshaller = DoubleUnmarshaller.Instance; + var unmarshaller = NullableDoubleUnmarshaller.Instance; unmarshalledObject.Capacity = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/ConnectCampaignsV2/Generated/Model/Internal/MarshallTransformations/StartInstanceOnboardingJobRequestMarshaller.cs b/sdk/src/Services/ConnectCampaignsV2/Generated/Model/Internal/MarshallTransformations/StartInstanceOnboardingJobRequestMarshaller.cs index b31cddf19712..cc57d0ea77ee 100644 --- a/sdk/src/Services/ConnectCampaignsV2/Generated/Model/Internal/MarshallTransformations/StartInstanceOnboardingJobRequestMarshaller.cs +++ b/sdk/src/Services/ConnectCampaignsV2/Generated/Model/Internal/MarshallTransformations/StartInstanceOnboardingJobRequestMarshaller.cs @@ -64,26 +64,29 @@ public IRequest Marshall(StartInstanceOnboardingJobRequest publicRequest) throw new AmazonConnectCampaignsV2Exception("Request object does not have required field ConnectInstanceId set"); request.AddPathResource("{connectInstanceId}", StringUtils.FromString(publicRequest.ConnectInstanceId)); request.ResourcePath = "/v2/connect-instance/{connectInstanceId}/onboarding"; - using (StringWriter stringWriter = new StringWriter(CultureInfo.InvariantCulture)) + using (MemoryStream memoryStream = new MemoryStream()) { - JsonWriter writer = new JsonWriter(stringWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetEncryptionConfig()) + using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) { - context.Writer.WritePropertyName("encryptionConfig"); - context.Writer.WriteObjectStart(); + JsonWriter writer = new JsonWriter(streamWriter); + writer.Validate = false; + writer.WriteObjectStart(); + var context = new JsonMarshallerContext(request, writer); + if(publicRequest.IsSetEncryptionConfig()) + { + context.Writer.WritePropertyName("encryptionConfig"); + context.Writer.WriteObjectStart(); - var marshaller = EncryptionConfigMarshaller.Instance; - marshaller.Marshall(publicRequest.EncryptionConfig, context); + var marshaller = EncryptionConfigMarshaller.Instance; + marshaller.Marshall(publicRequest.EncryptionConfig, context); - context.Writer.WriteObjectEnd(); + context.Writer.WriteObjectEnd(); + } + + writer.WriteObjectEnd(); } - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); + request.Content = memoryStream.ToArray(); } diff --git a/sdk/src/Services/ConnectCampaignsV2/Generated/Model/Internal/MarshallTransformations/TagResourceRequestMarshaller.cs b/sdk/src/Services/ConnectCampaignsV2/Generated/Model/Internal/MarshallTransformations/TagResourceRequestMarshaller.cs index 699143efea2b..810c9b03a0a1 100644 --- a/sdk/src/Services/ConnectCampaignsV2/Generated/Model/Internal/MarshallTransformations/TagResourceRequestMarshaller.cs +++ b/sdk/src/Services/ConnectCampaignsV2/Generated/Model/Internal/MarshallTransformations/TagResourceRequestMarshaller.cs @@ -64,29 +64,32 @@ public IRequest Marshall(TagResourceRequest publicRequest) throw new AmazonConnectCampaignsV2Exception("Request object does not have required field Arn set"); request.AddPathResource("{arn}", StringUtils.FromString(publicRequest.Arn)); request.ResourcePath = "/v2/tags/{arn}"; - using (StringWriter stringWriter = new StringWriter(CultureInfo.InvariantCulture)) + using (MemoryStream memoryStream = new MemoryStream()) { - JsonWriter writer = new JsonWriter(stringWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetTags()) + using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) { - context.Writer.WritePropertyName("tags"); - context.Writer.WriteObjectStart(); - foreach (var publicRequestTagsKvp in publicRequest.Tags) + JsonWriter writer = new JsonWriter(streamWriter); + writer.Validate = false; + writer.WriteObjectStart(); + var context = new JsonMarshallerContext(request, writer); + if(publicRequest.IsSetTags()) { - context.Writer.WritePropertyName(publicRequestTagsKvp.Key); - var publicRequestTagsValue = publicRequestTagsKvp.Value; + context.Writer.WritePropertyName("tags"); + context.Writer.WriteObjectStart(); + foreach (var publicRequestTagsKvp in publicRequest.Tags) + { + context.Writer.WritePropertyName(publicRequestTagsKvp.Key); + var publicRequestTagsValue = publicRequestTagsKvp.Value; - context.Writer.Write(publicRequestTagsValue); + context.Writer.Write(publicRequestTagsValue); + } + context.Writer.WriteObjectEnd(); } - context.Writer.WriteObjectEnd(); + + writer.WriteObjectEnd(); } - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); + request.Content = memoryStream.ToArray(); } diff --git a/sdk/src/Services/ConnectCampaignsV2/Generated/Model/Internal/MarshallTransformations/TelephonyChannelSubtypeConfigMarshaller.cs b/sdk/src/Services/ConnectCampaignsV2/Generated/Model/Internal/MarshallTransformations/TelephonyChannelSubtypeConfigMarshaller.cs index cc272439aa88..e4edcf6ff4e2 100644 --- a/sdk/src/Services/ConnectCampaignsV2/Generated/Model/Internal/MarshallTransformations/TelephonyChannelSubtypeConfigMarshaller.cs +++ b/sdk/src/Services/ConnectCampaignsV2/Generated/Model/Internal/MarshallTransformations/TelephonyChannelSubtypeConfigMarshaller.cs @@ -51,13 +51,13 @@ public void Marshall(TelephonyChannelSubtypeConfig requestObject, JsonMarshaller if(requestObject.IsSetCapacity()) { context.Writer.WritePropertyName("capacity"); - if(StringUtils.IsSpecialDoubleValue(requestObject.Capacity)) + if(StringUtils.IsSpecialDoubleValue(requestObject.Capacity.Value)) { - context.Writer.Write(StringUtils.FromSpecialDoubleValue(requestObject.Capacity)); + context.Writer.Write(StringUtils.FromSpecialDoubleValue(requestObject.Capacity.Value)); } else { - context.Writer.Write(requestObject.Capacity); + context.Writer.Write(requestObject.Capacity.Value); } } diff --git a/sdk/src/Services/ConnectCampaignsV2/Generated/Model/Internal/MarshallTransformations/TelephonyChannelSubtypeConfigUnmarshaller.cs b/sdk/src/Services/ConnectCampaignsV2/Generated/Model/Internal/MarshallTransformations/TelephonyChannelSubtypeConfigUnmarshaller.cs index f4e8657a7b54..bd5f60a61e3f 100644 --- a/sdk/src/Services/ConnectCampaignsV2/Generated/Model/Internal/MarshallTransformations/TelephonyChannelSubtypeConfigUnmarshaller.cs +++ b/sdk/src/Services/ConnectCampaignsV2/Generated/Model/Internal/MarshallTransformations/TelephonyChannelSubtypeConfigUnmarshaller.cs @@ -68,7 +68,7 @@ public TelephonyChannelSubtypeConfig Unmarshall(JsonUnmarshallerContext context) { if (context.TestExpression("capacity", targetDepth)) { - var unmarshaller = DoubleUnmarshaller.Instance; + var unmarshaller = NullableDoubleUnmarshaller.Instance; unmarshalledObject.Capacity = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/ConnectCampaignsV2/Generated/Model/Internal/MarshallTransformations/UpdateCampaignChannelSubtypeConfigRequestMarshaller.cs b/sdk/src/Services/ConnectCampaignsV2/Generated/Model/Internal/MarshallTransformations/UpdateCampaignChannelSubtypeConfigRequestMarshaller.cs index 965759fde514..ebfb8a52c938 100644 --- a/sdk/src/Services/ConnectCampaignsV2/Generated/Model/Internal/MarshallTransformations/UpdateCampaignChannelSubtypeConfigRequestMarshaller.cs +++ b/sdk/src/Services/ConnectCampaignsV2/Generated/Model/Internal/MarshallTransformations/UpdateCampaignChannelSubtypeConfigRequestMarshaller.cs @@ -64,26 +64,29 @@ public IRequest Marshall(UpdateCampaignChannelSubtypeConfigRequest publicRequest throw new AmazonConnectCampaignsV2Exception("Request object does not have required field Id set"); request.AddPathResource("{id}", StringUtils.FromString(publicRequest.Id)); request.ResourcePath = "/v2/campaigns/{id}/channel-subtype-config"; - using (StringWriter stringWriter = new StringWriter(CultureInfo.InvariantCulture)) + using (MemoryStream memoryStream = new MemoryStream()) { - JsonWriter writer = new JsonWriter(stringWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetChannelSubtypeConfig()) + using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) { - context.Writer.WritePropertyName("channelSubtypeConfig"); - context.Writer.WriteObjectStart(); + JsonWriter writer = new JsonWriter(streamWriter); + writer.Validate = false; + writer.WriteObjectStart(); + var context = new JsonMarshallerContext(request, writer); + if(publicRequest.IsSetChannelSubtypeConfig()) + { + context.Writer.WritePropertyName("channelSubtypeConfig"); + context.Writer.WriteObjectStart(); - var marshaller = ChannelSubtypeConfigMarshaller.Instance; - marshaller.Marshall(publicRequest.ChannelSubtypeConfig, context); + var marshaller = ChannelSubtypeConfigMarshaller.Instance; + marshaller.Marshall(publicRequest.ChannelSubtypeConfig, context); - context.Writer.WriteObjectEnd(); + context.Writer.WriteObjectEnd(); + } + + writer.WriteObjectEnd(); } - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); + request.Content = memoryStream.ToArray(); } diff --git a/sdk/src/Services/ConnectCampaignsV2/Generated/Model/Internal/MarshallTransformations/UpdateCampaignCommunicationLimitsRequestMarshaller.cs b/sdk/src/Services/ConnectCampaignsV2/Generated/Model/Internal/MarshallTransformations/UpdateCampaignCommunicationLimitsRequestMarshaller.cs index 6cebbf65f68f..8c0a83571ed0 100644 --- a/sdk/src/Services/ConnectCampaignsV2/Generated/Model/Internal/MarshallTransformations/UpdateCampaignCommunicationLimitsRequestMarshaller.cs +++ b/sdk/src/Services/ConnectCampaignsV2/Generated/Model/Internal/MarshallTransformations/UpdateCampaignCommunicationLimitsRequestMarshaller.cs @@ -64,26 +64,29 @@ public IRequest Marshall(UpdateCampaignCommunicationLimitsRequest publicRequest) throw new AmazonConnectCampaignsV2Exception("Request object does not have required field Id set"); request.AddPathResource("{id}", StringUtils.FromString(publicRequest.Id)); request.ResourcePath = "/v2/campaigns/{id}/communication-limits"; - using (StringWriter stringWriter = new StringWriter(CultureInfo.InvariantCulture)) + using (MemoryStream memoryStream = new MemoryStream()) { - JsonWriter writer = new JsonWriter(stringWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetCommunicationLimitsOverride()) + using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) { - context.Writer.WritePropertyName("communicationLimitsOverride"); - context.Writer.WriteObjectStart(); + JsonWriter writer = new JsonWriter(streamWriter); + writer.Validate = false; + writer.WriteObjectStart(); + var context = new JsonMarshallerContext(request, writer); + if(publicRequest.IsSetCommunicationLimitsOverride()) + { + context.Writer.WritePropertyName("communicationLimitsOverride"); + context.Writer.WriteObjectStart(); - var marshaller = CommunicationLimitsConfigMarshaller.Instance; - marshaller.Marshall(publicRequest.CommunicationLimitsOverride, context); + var marshaller = CommunicationLimitsConfigMarshaller.Instance; + marshaller.Marshall(publicRequest.CommunicationLimitsOverride, context); - context.Writer.WriteObjectEnd(); + context.Writer.WriteObjectEnd(); + } + + writer.WriteObjectEnd(); } - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); + request.Content = memoryStream.ToArray(); } diff --git a/sdk/src/Services/ConnectCampaignsV2/Generated/Model/Internal/MarshallTransformations/UpdateCampaignCommunicationTimeRequestMarshaller.cs b/sdk/src/Services/ConnectCampaignsV2/Generated/Model/Internal/MarshallTransformations/UpdateCampaignCommunicationTimeRequestMarshaller.cs index 3db971ec0788..a5350a3a7531 100644 --- a/sdk/src/Services/ConnectCampaignsV2/Generated/Model/Internal/MarshallTransformations/UpdateCampaignCommunicationTimeRequestMarshaller.cs +++ b/sdk/src/Services/ConnectCampaignsV2/Generated/Model/Internal/MarshallTransformations/UpdateCampaignCommunicationTimeRequestMarshaller.cs @@ -64,26 +64,29 @@ public IRequest Marshall(UpdateCampaignCommunicationTimeRequest publicRequest) throw new AmazonConnectCampaignsV2Exception("Request object does not have required field Id set"); request.AddPathResource("{id}", StringUtils.FromString(publicRequest.Id)); request.ResourcePath = "/v2/campaigns/{id}/communication-time"; - using (StringWriter stringWriter = new StringWriter(CultureInfo.InvariantCulture)) + using (MemoryStream memoryStream = new MemoryStream()) { - JsonWriter writer = new JsonWriter(stringWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetCommunicationTimeConfig()) + using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) { - context.Writer.WritePropertyName("communicationTimeConfig"); - context.Writer.WriteObjectStart(); + JsonWriter writer = new JsonWriter(streamWriter); + writer.Validate = false; + writer.WriteObjectStart(); + var context = new JsonMarshallerContext(request, writer); + if(publicRequest.IsSetCommunicationTimeConfig()) + { + context.Writer.WritePropertyName("communicationTimeConfig"); + context.Writer.WriteObjectStart(); - var marshaller = CommunicationTimeConfigMarshaller.Instance; - marshaller.Marshall(publicRequest.CommunicationTimeConfig, context); + var marshaller = CommunicationTimeConfigMarshaller.Instance; + marshaller.Marshall(publicRequest.CommunicationTimeConfig, context); - context.Writer.WriteObjectEnd(); + context.Writer.WriteObjectEnd(); + } + + writer.WriteObjectEnd(); } - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); + request.Content = memoryStream.ToArray(); } diff --git a/sdk/src/Services/ConnectCampaignsV2/Generated/Model/Internal/MarshallTransformations/UpdateCampaignFlowAssociationRequestMarshaller.cs b/sdk/src/Services/ConnectCampaignsV2/Generated/Model/Internal/MarshallTransformations/UpdateCampaignFlowAssociationRequestMarshaller.cs index 1b283676d5a9..5e5e97b45c73 100644 --- a/sdk/src/Services/ConnectCampaignsV2/Generated/Model/Internal/MarshallTransformations/UpdateCampaignFlowAssociationRequestMarshaller.cs +++ b/sdk/src/Services/ConnectCampaignsV2/Generated/Model/Internal/MarshallTransformations/UpdateCampaignFlowAssociationRequestMarshaller.cs @@ -64,21 +64,24 @@ public IRequest Marshall(UpdateCampaignFlowAssociationRequest publicRequest) throw new AmazonConnectCampaignsV2Exception("Request object does not have required field Id set"); request.AddPathResource("{id}", StringUtils.FromString(publicRequest.Id)); request.ResourcePath = "/v2/campaigns/{id}/flow"; - using (StringWriter stringWriter = new StringWriter(CultureInfo.InvariantCulture)) + using (MemoryStream memoryStream = new MemoryStream()) { - JsonWriter writer = new JsonWriter(stringWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetConnectCampaignFlowArn()) + using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) { - context.Writer.WritePropertyName("connectCampaignFlowArn"); - context.Writer.Write(publicRequest.ConnectCampaignFlowArn); + JsonWriter writer = new JsonWriter(streamWriter); + writer.Validate = false; + writer.WriteObjectStart(); + var context = new JsonMarshallerContext(request, writer); + if(publicRequest.IsSetConnectCampaignFlowArn()) + { + context.Writer.WritePropertyName("connectCampaignFlowArn"); + context.Writer.Write(publicRequest.ConnectCampaignFlowArn); + } + + writer.WriteObjectEnd(); } - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); + request.Content = memoryStream.ToArray(); } diff --git a/sdk/src/Services/ConnectCampaignsV2/Generated/Model/Internal/MarshallTransformations/UpdateCampaignNameRequestMarshaller.cs b/sdk/src/Services/ConnectCampaignsV2/Generated/Model/Internal/MarshallTransformations/UpdateCampaignNameRequestMarshaller.cs index d9cb3c8e8b85..1cc72848399a 100644 --- a/sdk/src/Services/ConnectCampaignsV2/Generated/Model/Internal/MarshallTransformations/UpdateCampaignNameRequestMarshaller.cs +++ b/sdk/src/Services/ConnectCampaignsV2/Generated/Model/Internal/MarshallTransformations/UpdateCampaignNameRequestMarshaller.cs @@ -64,21 +64,24 @@ public IRequest Marshall(UpdateCampaignNameRequest publicRequest) throw new AmazonConnectCampaignsV2Exception("Request object does not have required field Id set"); request.AddPathResource("{id}", StringUtils.FromString(publicRequest.Id)); request.ResourcePath = "/v2/campaigns/{id}/name"; - using (StringWriter stringWriter = new StringWriter(CultureInfo.InvariantCulture)) + using (MemoryStream memoryStream = new MemoryStream()) { - JsonWriter writer = new JsonWriter(stringWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetName()) + using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) { - context.Writer.WritePropertyName("name"); - context.Writer.Write(publicRequest.Name); + JsonWriter writer = new JsonWriter(streamWriter); + writer.Validate = false; + writer.WriteObjectStart(); + var context = new JsonMarshallerContext(request, writer); + if(publicRequest.IsSetName()) + { + context.Writer.WritePropertyName("name"); + context.Writer.Write(publicRequest.Name); + } + + writer.WriteObjectEnd(); } - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); + request.Content = memoryStream.ToArray(); } diff --git a/sdk/src/Services/ConnectCampaignsV2/Generated/Model/Internal/MarshallTransformations/UpdateCampaignScheduleRequestMarshaller.cs b/sdk/src/Services/ConnectCampaignsV2/Generated/Model/Internal/MarshallTransformations/UpdateCampaignScheduleRequestMarshaller.cs index 83effd44e374..690f297d9873 100644 --- a/sdk/src/Services/ConnectCampaignsV2/Generated/Model/Internal/MarshallTransformations/UpdateCampaignScheduleRequestMarshaller.cs +++ b/sdk/src/Services/ConnectCampaignsV2/Generated/Model/Internal/MarshallTransformations/UpdateCampaignScheduleRequestMarshaller.cs @@ -64,26 +64,29 @@ public IRequest Marshall(UpdateCampaignScheduleRequest publicRequest) throw new AmazonConnectCampaignsV2Exception("Request object does not have required field Id set"); request.AddPathResource("{id}", StringUtils.FromString(publicRequest.Id)); request.ResourcePath = "/v2/campaigns/{id}/schedule"; - using (StringWriter stringWriter = new StringWriter(CultureInfo.InvariantCulture)) + using (MemoryStream memoryStream = new MemoryStream()) { - JsonWriter writer = new JsonWriter(stringWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetSchedule()) + using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) { - context.Writer.WritePropertyName("schedule"); - context.Writer.WriteObjectStart(); + JsonWriter writer = new JsonWriter(streamWriter); + writer.Validate = false; + writer.WriteObjectStart(); + var context = new JsonMarshallerContext(request, writer); + if(publicRequest.IsSetSchedule()) + { + context.Writer.WritePropertyName("schedule"); + context.Writer.WriteObjectStart(); - var marshaller = ScheduleMarshaller.Instance; - marshaller.Marshall(publicRequest.Schedule, context); + var marshaller = ScheduleMarshaller.Instance; + marshaller.Marshall(publicRequest.Schedule, context); - context.Writer.WriteObjectEnd(); + context.Writer.WriteObjectEnd(); + } + + writer.WriteObjectEnd(); } - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); + request.Content = memoryStream.ToArray(); } diff --git a/sdk/src/Services/ConnectCampaignsV2/Generated/Model/Internal/MarshallTransformations/UpdateCampaignSourceRequestMarshaller.cs b/sdk/src/Services/ConnectCampaignsV2/Generated/Model/Internal/MarshallTransformations/UpdateCampaignSourceRequestMarshaller.cs index 38ac50cfee4e..294f8bf7da46 100644 --- a/sdk/src/Services/ConnectCampaignsV2/Generated/Model/Internal/MarshallTransformations/UpdateCampaignSourceRequestMarshaller.cs +++ b/sdk/src/Services/ConnectCampaignsV2/Generated/Model/Internal/MarshallTransformations/UpdateCampaignSourceRequestMarshaller.cs @@ -64,26 +64,29 @@ public IRequest Marshall(UpdateCampaignSourceRequest publicRequest) throw new AmazonConnectCampaignsV2Exception("Request object does not have required field Id set"); request.AddPathResource("{id}", StringUtils.FromString(publicRequest.Id)); request.ResourcePath = "/v2/campaigns/{id}/source"; - using (StringWriter stringWriter = new StringWriter(CultureInfo.InvariantCulture)) + using (MemoryStream memoryStream = new MemoryStream()) { - JsonWriter writer = new JsonWriter(stringWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetSource()) + using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) { - context.Writer.WritePropertyName("source"); - context.Writer.WriteObjectStart(); + JsonWriter writer = new JsonWriter(streamWriter); + writer.Validate = false; + writer.WriteObjectStart(); + var context = new JsonMarshallerContext(request, writer); + if(publicRequest.IsSetSource()) + { + context.Writer.WritePropertyName("source"); + context.Writer.WriteObjectStart(); - var marshaller = SourceMarshaller.Instance; - marshaller.Marshall(publicRequest.Source, context); + var marshaller = SourceMarshaller.Instance; + marshaller.Marshall(publicRequest.Source, context); - context.Writer.WriteObjectEnd(); + context.Writer.WriteObjectEnd(); + } + + writer.WriteObjectEnd(); } - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); + request.Content = memoryStream.ToArray(); } diff --git a/sdk/src/Services/ConnectCampaignsV2/Generated/Model/InternalServerException.cs b/sdk/src/Services/ConnectCampaignsV2/Generated/Model/InternalServerException.cs index 4d2e774e2422..027c04f402b6 100644 --- a/sdk/src/Services/ConnectCampaignsV2/Generated/Model/InternalServerException.cs +++ b/sdk/src/Services/ConnectCampaignsV2/Generated/Model/InternalServerException.cs @@ -110,11 +110,6 @@ protected InternalServerException(System.Runtime.Serialization.SerializationInfo /// The that holds the serialized object data about the exception being thrown. /// The that contains contextual information about the source or destination. /// The parameter is a null reference (Nothing in Visual Basic). -#if BCL35 - [System.Security.Permissions.SecurityPermission( - System.Security.Permissions.SecurityAction.LinkDemand, - Flags = System.Security.Permissions.SecurityPermissionFlag.SerializationFormatter)] -#endif [System.Security.SecurityCritical] // These FxCop rules are giving false-positives for this method [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Security", "CA2123:OverrideLinkDemandsShouldBeIdenticalToBase")] diff --git a/sdk/src/Services/ConnectCampaignsV2/Generated/Model/InvalidCampaignStateException.cs b/sdk/src/Services/ConnectCampaignsV2/Generated/Model/InvalidCampaignStateException.cs index 16fa53dea1e4..185d6dde50ac 100644 --- a/sdk/src/Services/ConnectCampaignsV2/Generated/Model/InvalidCampaignStateException.cs +++ b/sdk/src/Services/ConnectCampaignsV2/Generated/Model/InvalidCampaignStateException.cs @@ -111,11 +111,6 @@ protected InvalidCampaignStateException(System.Runtime.Serialization.Serializati /// The that holds the serialized object data about the exception being thrown. /// The that contains contextual information about the source or destination. /// The parameter is a null reference (Nothing in Visual Basic). -#if BCL35 - [System.Security.Permissions.SecurityPermission( - System.Security.Permissions.SecurityAction.LinkDemand, - Flags = System.Security.Permissions.SecurityPermissionFlag.SerializationFormatter)] -#endif [System.Security.SecurityCritical] // These FxCop rules are giving false-positives for this method [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Security", "CA2123:OverrideLinkDemandsShouldBeIdenticalToBase")] diff --git a/sdk/src/Services/ConnectCampaignsV2/Generated/Model/InvalidStateException.cs b/sdk/src/Services/ConnectCampaignsV2/Generated/Model/InvalidStateException.cs index 98a54bb351c9..ba9909b8e2f7 100644 --- a/sdk/src/Services/ConnectCampaignsV2/Generated/Model/InvalidStateException.cs +++ b/sdk/src/Services/ConnectCampaignsV2/Generated/Model/InvalidStateException.cs @@ -108,11 +108,6 @@ protected InvalidStateException(System.Runtime.Serialization.SerializationInfo i /// The that holds the serialized object data about the exception being thrown. /// The that contains contextual information about the source or destination. /// The parameter is a null reference (Nothing in Visual Basic). -#if BCL35 - [System.Security.Permissions.SecurityPermission( - System.Security.Permissions.SecurityAction.LinkDemand, - Flags = System.Security.Permissions.SecurityPermissionFlag.SerializationFormatter)] -#endif [System.Security.SecurityCritical] // These FxCop rules are giving false-positives for this method [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Security", "CA2123:OverrideLinkDemandsShouldBeIdenticalToBase")] diff --git a/sdk/src/Services/ConnectCampaignsV2/Generated/Model/ListCampaignsRequest.cs b/sdk/src/Services/ConnectCampaignsV2/Generated/Model/ListCampaignsRequest.cs index cd37b3fe619a..7d7cf7aa96f3 100644 --- a/sdk/src/Services/ConnectCampaignsV2/Generated/Model/ListCampaignsRequest.cs +++ b/sdk/src/Services/ConnectCampaignsV2/Generated/Model/ListCampaignsRequest.cs @@ -59,9 +59,9 @@ internal bool IsSetFilters() /// Gets and sets the property MaxResults. ///     [AWSProperty(Min=1, Max=50)] - public int MaxResults + public int? MaxResults { - get { return this._maxResults.GetValueOrDefault(); } + get { return this._maxResults; } set { this._maxResults = value; } } diff --git a/sdk/src/Services/ConnectCampaignsV2/Generated/Model/ListConnectInstanceIntegrationsRequest.cs b/sdk/src/Services/ConnectCampaignsV2/Generated/Model/ListConnectInstanceIntegrationsRequest.cs index 678eef3471b4..667607de514a 100644 --- a/sdk/src/Services/ConnectCampaignsV2/Generated/Model/ListConnectInstanceIntegrationsRequest.cs +++ b/sdk/src/Services/ConnectCampaignsV2/Generated/Model/ListConnectInstanceIntegrationsRequest.cs @@ -59,9 +59,9 @@ internal bool IsSetConnectInstanceId() /// Gets and sets the property MaxResults. ///     [AWSProperty(Min=1, Max=50)] - public int MaxResults + public int? MaxResults { - get { return this._maxResults.GetValueOrDefault(); } + get { return this._maxResults; } set { this._maxResults = value; } } diff --git a/sdk/src/Services/ConnectCampaignsV2/Generated/Model/OutboundRequest.cs b/sdk/src/Services/ConnectCampaignsV2/Generated/Model/OutboundRequest.cs index 058d5be853f1..eb8a9e8ee19e 100644 --- a/sdk/src/Services/ConnectCampaignsV2/Generated/Model/OutboundRequest.cs +++ b/sdk/src/Services/ConnectCampaignsV2/Generated/Model/OutboundRequest.cs @@ -74,9 +74,9 @@ internal bool IsSetClientToken() /// Gets and sets the property ExpirationTime. ///     [AWSProperty(Required=true)] - public DateTime ExpirationTime + public DateTime? ExpirationTime { - get { return this._expirationTime.GetValueOrDefault(); } + get { return this._expirationTime; } set { this._expirationTime = value; } } diff --git a/sdk/src/Services/ConnectCampaignsV2/Generated/Model/PredictiveConfig.cs b/sdk/src/Services/ConnectCampaignsV2/Generated/Model/PredictiveConfig.cs index 6029f8cdc60b..50a3ba5e0264 100644 --- a/sdk/src/Services/ConnectCampaignsV2/Generated/Model/PredictiveConfig.cs +++ b/sdk/src/Services/ConnectCampaignsV2/Generated/Model/PredictiveConfig.cs @@ -40,9 +40,9 @@ public partial class PredictiveConfig /// Gets and sets the property BandwidthAllocation. ///     [AWSProperty(Required=true, Min=0, Max=1)] - public double BandwidthAllocation + public double? BandwidthAllocation { - get { return this._bandwidthAllocation.GetValueOrDefault(); } + get { return this._bandwidthAllocation; } set { this._bandwidthAllocation = value; } } diff --git a/sdk/src/Services/ConnectCampaignsV2/Generated/Model/ProgressiveConfig.cs b/sdk/src/Services/ConnectCampaignsV2/Generated/Model/ProgressiveConfig.cs index afafe47cf15f..efdb6a8218a3 100644 --- a/sdk/src/Services/ConnectCampaignsV2/Generated/Model/ProgressiveConfig.cs +++ b/sdk/src/Services/ConnectCampaignsV2/Generated/Model/ProgressiveConfig.cs @@ -40,9 +40,9 @@ public partial class ProgressiveConfig /// Gets and sets the property BandwidthAllocation. ///     [AWSProperty(Required=true, Min=0, Max=1)] - public double BandwidthAllocation + public double? BandwidthAllocation { - get { return this._bandwidthAllocation.GetValueOrDefault(); } + get { return this._bandwidthAllocation; } set { this._bandwidthAllocation = value; } } diff --git a/sdk/src/Services/ConnectCampaignsV2/Generated/Model/ResourceNotFoundException.cs b/sdk/src/Services/ConnectCampaignsV2/Generated/Model/ResourceNotFoundException.cs index b6031f873e59..2b4be1fb7211 100644 --- a/sdk/src/Services/ConnectCampaignsV2/Generated/Model/ResourceNotFoundException.cs +++ b/sdk/src/Services/ConnectCampaignsV2/Generated/Model/ResourceNotFoundException.cs @@ -108,11 +108,6 @@ protected ResourceNotFoundException(System.Runtime.Serialization.SerializationIn /// The that holds the serialized object data about the exception being thrown. /// The that contains contextual information about the source or destination. /// The parameter is a null reference (Nothing in Visual Basic). -#if BCL35 - [System.Security.Permissions.SecurityPermission( - System.Security.Permissions.SecurityAction.LinkDemand, - Flags = System.Security.Permissions.SecurityPermissionFlag.SerializationFormatter)] -#endif [System.Security.SecurityCritical] // These FxCop rules are giving false-positives for this method [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Security", "CA2123:OverrideLinkDemandsShouldBeIdenticalToBase")] diff --git a/sdk/src/Services/ConnectCampaignsV2/Generated/Model/Schedule.cs b/sdk/src/Services/ConnectCampaignsV2/Generated/Model/Schedule.cs index bf0073e97ff7..ddcdf7471f2e 100644 --- a/sdk/src/Services/ConnectCampaignsV2/Generated/Model/Schedule.cs +++ b/sdk/src/Services/ConnectCampaignsV2/Generated/Model/Schedule.cs @@ -42,9 +42,9 @@ public partial class Schedule /// Gets and sets the property EndTime. ///     [AWSProperty(Required=true)] - public DateTime EndTime + public DateTime? EndTime { - get { return this._endTime.GetValueOrDefault(); } + get { return this._endTime; } set { this._endTime = value; } } @@ -74,9 +74,9 @@ internal bool IsSetRefreshFrequency() /// Gets and sets the property StartTime. ///     [AWSProperty(Required=true)] - public DateTime StartTime + public DateTime? StartTime { - get { return this._startTime.GetValueOrDefault(); } + get { return this._startTime; } set { this._startTime = value; } } diff --git a/sdk/src/Services/ConnectCampaignsV2/Generated/Model/ServiceQuotaExceededException.cs b/sdk/src/Services/ConnectCampaignsV2/Generated/Model/ServiceQuotaExceededException.cs index 7cb529ec3919..5c1870c0027b 100644 --- a/sdk/src/Services/ConnectCampaignsV2/Generated/Model/ServiceQuotaExceededException.cs +++ b/sdk/src/Services/ConnectCampaignsV2/Generated/Model/ServiceQuotaExceededException.cs @@ -108,11 +108,6 @@ protected ServiceQuotaExceededException(System.Runtime.Serialization.Serializati /// The that holds the serialized object data about the exception being thrown. /// The that contains contextual information about the source or destination. /// The parameter is a null reference (Nothing in Visual Basic). -#if BCL35 - [System.Security.Permissions.SecurityPermission( - System.Security.Permissions.SecurityAction.LinkDemand, - Flags = System.Security.Permissions.SecurityPermissionFlag.SerializationFormatter)] -#endif [System.Security.SecurityCritical] // These FxCop rules are giving false-positives for this method [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Security", "CA2123:OverrideLinkDemandsShouldBeIdenticalToBase")] diff --git a/sdk/src/Services/ConnectCampaignsV2/Generated/Model/SmsChannelSubtypeConfig.cs b/sdk/src/Services/ConnectCampaignsV2/Generated/Model/SmsChannelSubtypeConfig.cs index 5e759d80ab78..bf1ef4b87941 100644 --- a/sdk/src/Services/ConnectCampaignsV2/Generated/Model/SmsChannelSubtypeConfig.cs +++ b/sdk/src/Services/ConnectCampaignsV2/Generated/Model/SmsChannelSubtypeConfig.cs @@ -42,9 +42,9 @@ public partial class SmsChannelSubtypeConfig /// Gets and sets the property Capacity. /// [AWSProperty(Max=1)] - public double Capacity + public double? Capacity { - get { return this._capacity.GetValueOrDefault(); } + get { return this._capacity; } set { this._capacity = value; } } diff --git a/sdk/src/Services/ConnectCampaignsV2/Generated/Model/TelephonyChannelSubtypeConfig.cs b/sdk/src/Services/ConnectCampaignsV2/Generated/Model/TelephonyChannelSubtypeConfig.cs index 165b8a74c6d3..ea888e40bbef 100644 --- a/sdk/src/Services/ConnectCampaignsV2/Generated/Model/TelephonyChannelSubtypeConfig.cs +++ b/sdk/src/Services/ConnectCampaignsV2/Generated/Model/TelephonyChannelSubtypeConfig.cs @@ -43,9 +43,9 @@ public partial class TelephonyChannelSubtypeConfig /// Gets and sets the property Capacity. /// [AWSProperty(Max=1)] - public double Capacity + public double? Capacity { - get { return this._capacity.GetValueOrDefault(); } + get { return this._capacity; } set { this._capacity = value; } } diff --git a/sdk/src/Services/ConnectCampaignsV2/Generated/Model/ThrottlingException.cs b/sdk/src/Services/ConnectCampaignsV2/Generated/Model/ThrottlingException.cs index 4bbc57c35f44..482cfff740d6 100644 --- a/sdk/src/Services/ConnectCampaignsV2/Generated/Model/ThrottlingException.cs +++ b/sdk/src/Services/ConnectCampaignsV2/Generated/Model/ThrottlingException.cs @@ -110,11 +110,6 @@ protected ThrottlingException(System.Runtime.Serialization.SerializationInfo inf /// The that holds the serialized object data about the exception being thrown. /// The that contains contextual information about the source or destination. /// The parameter is a null reference (Nothing in Visual Basic). -#if BCL35 - [System.Security.Permissions.SecurityPermission( - System.Security.Permissions.SecurityAction.LinkDemand, - Flags = System.Security.Permissions.SecurityPermissionFlag.SerializationFormatter)] -#endif [System.Security.SecurityCritical] // These FxCop rules are giving false-positives for this method [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Security", "CA2123:OverrideLinkDemandsShouldBeIdenticalToBase")] diff --git a/sdk/src/Services/ConnectCampaignsV2/Generated/Model/ValidationException.cs b/sdk/src/Services/ConnectCampaignsV2/Generated/Model/ValidationException.cs index d980e3893799..4e5d5e4b5851 100644 --- a/sdk/src/Services/ConnectCampaignsV2/Generated/Model/ValidationException.cs +++ b/sdk/src/Services/ConnectCampaignsV2/Generated/Model/ValidationException.cs @@ -108,11 +108,6 @@ protected ValidationException(System.Runtime.Serialization.SerializationInfo inf /// The that holds the serialized object data about the exception being thrown. /// The that contains contextual information about the source or destination. /// The parameter is a null reference (Nothing in Visual Basic). -#if BCL35 - [System.Security.Permissions.SecurityPermission( - System.Security.Permissions.SecurityAction.LinkDemand, - Flags = System.Security.Permissions.SecurityPermissionFlag.SerializationFormatter)] -#endif [System.Security.SecurityCritical] // These FxCop rules are giving false-positives for this method [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Security", "CA2123:OverrideLinkDemandsShouldBeIdenticalToBase")] diff --git a/sdk/src/Services/ConnectCampaignsV2/Generated/Model/_bcl45+netstandard/ConnectCampaignsV2PaginatorFactory.cs b/sdk/src/Services/ConnectCampaignsV2/Generated/Model/_bcl+netstandard/ConnectCampaignsV2PaginatorFactory.cs similarity index 100% rename from sdk/src/Services/ConnectCampaignsV2/Generated/Model/_bcl45+netstandard/ConnectCampaignsV2PaginatorFactory.cs rename to sdk/src/Services/ConnectCampaignsV2/Generated/Model/_bcl+netstandard/ConnectCampaignsV2PaginatorFactory.cs diff --git a/sdk/src/Services/ConnectCampaignsV2/Generated/Model/_bcl45+netstandard/IConnectCampaignsV2PaginatorFactory.cs b/sdk/src/Services/ConnectCampaignsV2/Generated/Model/_bcl+netstandard/IConnectCampaignsV2PaginatorFactory.cs similarity index 100% rename from sdk/src/Services/ConnectCampaignsV2/Generated/Model/_bcl45+netstandard/IConnectCampaignsV2PaginatorFactory.cs rename to sdk/src/Services/ConnectCampaignsV2/Generated/Model/_bcl+netstandard/IConnectCampaignsV2PaginatorFactory.cs diff --git a/sdk/src/Services/ConnectCampaignsV2/Generated/Model/_bcl45+netstandard/IListCampaignsPaginator.cs b/sdk/src/Services/ConnectCampaignsV2/Generated/Model/_bcl+netstandard/IListCampaignsPaginator.cs similarity index 100% rename from sdk/src/Services/ConnectCampaignsV2/Generated/Model/_bcl45+netstandard/IListCampaignsPaginator.cs rename to sdk/src/Services/ConnectCampaignsV2/Generated/Model/_bcl+netstandard/IListCampaignsPaginator.cs diff --git a/sdk/src/Services/ConnectCampaignsV2/Generated/Model/_bcl45+netstandard/IListConnectInstanceIntegrationsPaginator.cs b/sdk/src/Services/ConnectCampaignsV2/Generated/Model/_bcl+netstandard/IListConnectInstanceIntegrationsPaginator.cs similarity index 100% rename from sdk/src/Services/ConnectCampaignsV2/Generated/Model/_bcl45+netstandard/IListConnectInstanceIntegrationsPaginator.cs rename to sdk/src/Services/ConnectCampaignsV2/Generated/Model/_bcl+netstandard/IListConnectInstanceIntegrationsPaginator.cs diff --git a/sdk/src/Services/ConnectCampaignsV2/Generated/Model/_bcl45+netstandard/ListCampaignsPaginator.cs b/sdk/src/Services/ConnectCampaignsV2/Generated/Model/_bcl+netstandard/ListCampaignsPaginator.cs similarity index 100% rename from sdk/src/Services/ConnectCampaignsV2/Generated/Model/_bcl45+netstandard/ListCampaignsPaginator.cs rename to sdk/src/Services/ConnectCampaignsV2/Generated/Model/_bcl+netstandard/ListCampaignsPaginator.cs diff --git a/sdk/src/Services/ConnectCampaignsV2/Generated/Model/_bcl45+netstandard/ListConnectInstanceIntegrationsPaginator.cs b/sdk/src/Services/ConnectCampaignsV2/Generated/Model/_bcl+netstandard/ListConnectInstanceIntegrationsPaginator.cs similarity index 100% rename from sdk/src/Services/ConnectCampaignsV2/Generated/Model/_bcl45+netstandard/ListConnectInstanceIntegrationsPaginator.cs rename to sdk/src/Services/ConnectCampaignsV2/Generated/Model/_bcl+netstandard/ListConnectInstanceIntegrationsPaginator.cs diff --git a/sdk/src/Services/ConnectCampaignsV2/Generated/_bcl45/AmazonConnectCampaignsV2Client.cs b/sdk/src/Services/ConnectCampaignsV2/Generated/_bcl/AmazonConnectCampaignsV2Client.cs similarity index 99% rename from sdk/src/Services/ConnectCampaignsV2/Generated/_bcl45/AmazonConnectCampaignsV2Client.cs rename to sdk/src/Services/ConnectCampaignsV2/Generated/_bcl/AmazonConnectCampaignsV2Client.cs index ce2401ffc437..53270e8d0edd 100644 --- a/sdk/src/Services/ConnectCampaignsV2/Generated/_bcl45/AmazonConnectCampaignsV2Client.cs +++ b/sdk/src/Services/ConnectCampaignsV2/Generated/_bcl/AmazonConnectCampaignsV2Client.cs @@ -32,6 +32,7 @@ using Amazon.Runtime.Internal; using Amazon.Runtime.Internal.Auth; using Amazon.Runtime.Internal.Transform; +using Amazon.Runtime.Endpoints; #pragma warning disable CS1570 namespace Amazon.ConnectCampaignsV2 @@ -2699,16 +2700,8 @@ public virtual UpdateCampaignSourceResponse UpdateCampaignSource(UpdateCampaignS /// The resolved endpoint for the given request. public Amazon.Runtime.Endpoints.Endpoint DetermineServiceOperationEndpoint(AmazonWebServiceRequest request) { - var requestContext = new Amazon.Runtime.Internal.RequestContext(false, CreateSigner()) - { - ClientConfig = Config, - OriginalRequest = request, - Request = new Amazon.Runtime.Internal.DefaultRequest(request, ServiceMetadata.ServiceId) - }; - - var executionContext = new Amazon.Runtime.Internal.ExecutionContext(requestContext, null); - var resolver = new AmazonConnectCampaignsV2EndpointResolver(); - return resolver.GetEndpoint(executionContext); + var parameters = new ServiceOperationEndpointParameters(request); + return Config.DetermineServiceOperationEndpoint(parameters); } #endregion diff --git a/sdk/src/Services/ConnectCampaignsV2/Generated/_bcl45/IAmazonConnectCampaignsV2.cs b/sdk/src/Services/ConnectCampaignsV2/Generated/_bcl/IAmazonConnectCampaignsV2.cs similarity index 100% rename from sdk/src/Services/ConnectCampaignsV2/Generated/_bcl45/IAmazonConnectCampaignsV2.cs rename to sdk/src/Services/ConnectCampaignsV2/Generated/_bcl/IAmazonConnectCampaignsV2.cs diff --git a/sdk/src/Services/ConnectCampaignsV2/Generated/_bcl35/AmazonConnectCampaignsV2Client.cs b/sdk/src/Services/ConnectCampaignsV2/Generated/_bcl35/AmazonConnectCampaignsV2Client.cs deleted file mode 100644 index 58574c55ac26..000000000000 --- a/sdk/src/Services/ConnectCampaignsV2/Generated/_bcl35/AmazonConnectCampaignsV2Client.cs +++ /dev/null @@ -1,2576 +0,0 @@ -/* - * 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. - */ - -/* - * Do not modify this file. This file is generated from the connectcampaignsv2-2024-04-23.normal.json service model. - */ - - -using System; -using System.Collections.Generic; -using System.Net; - -using Amazon.ConnectCampaignsV2.Model; -using Amazon.ConnectCampaignsV2.Model.Internal.MarshallTransformations; -using Amazon.ConnectCampaignsV2.Internal; -using Amazon.Runtime; -using Amazon.Runtime.Internal; -using Amazon.Runtime.Internal.Auth; -using Amazon.Runtime.Internal.Transform; - -#pragma warning disable CS1570 -namespace Amazon.ConnectCampaignsV2 -{ - /// - /// Implementation for accessing ConnectCampaignsV2 - /// - /// Provide APIs to create and manage Amazon Connect Campaigns. - /// - public partial class AmazonConnectCampaignsV2Client : AmazonServiceClient, IAmazonConnectCampaignsV2 - { - private static IServiceMetadata serviceMetadata = new AmazonConnectCampaignsV2Metadata(); - -#if BCL45 || AWS_ASYNC_ENUMERABLES_API - private IConnectCampaignsV2PaginatorFactory _paginators; - - /// - /// Paginators for the service - /// - public IConnectCampaignsV2PaginatorFactory Paginators - { - get - { - if (this._paginators == null) - { - this._paginators = new ConnectCampaignsV2PaginatorFactory(this); - } - return this._paginators; - } - } -#endif - #region Constructors - - /// - /// Constructs AmazonConnectCampaignsV2Client with the credentials loaded from the application's - /// default configuration, and if unsuccessful from the Instance Profile service on an EC2 instance. - /// - /// Example App.config with credentials set. - /// - /// <?xml version="1.0" encoding="utf-8" ?> - /// <configuration> - /// <appSettings> - /// <add key="AWSProfileName" value="AWS Default"/> - /// </appSettings> - /// </configuration> - /// - /// - /// - public AmazonConnectCampaignsV2Client() - : base(FallbackCredentialsFactory.GetCredentials(), new AmazonConnectCampaignsV2Config()) { } - - /// - /// Constructs AmazonConnectCampaignsV2Client with the credentials loaded from the application's - /// default configuration, and if unsuccessful from the Instance Profile service on an EC2 instance. - /// - /// Example App.config with credentials set. - /// - /// <?xml version="1.0" encoding="utf-8" ?> - /// <configuration> - /// <appSettings> - /// <add key="AWSProfileName" value="AWS Default"/> - /// </appSettings> - /// </configuration> - /// - /// - /// - /// The region to connect. - public AmazonConnectCampaignsV2Client(RegionEndpoint region) - : base(FallbackCredentialsFactory.GetCredentials(), new AmazonConnectCampaignsV2Config{RegionEndpoint = region}) { } - - /// - /// Constructs AmazonConnectCampaignsV2Client with the credentials loaded from the application's - /// default configuration, and if unsuccessful from the Instance Profile service on an EC2 instance. - /// - /// Example App.config with credentials set. - /// - /// <?xml version="1.0" encoding="utf-8" ?> - /// <configuration> - /// <appSettings> - /// <add key="AWSProfileName" value="AWS Default"/> - /// </appSettings> - /// </configuration> - /// - /// - /// - /// The AmazonConnectCampaignsV2Client Configuration Object - public AmazonConnectCampaignsV2Client(AmazonConnectCampaignsV2Config config) - : base(FallbackCredentialsFactory.GetCredentials(config), config){} - /// - /// Constructs AmazonConnectCampaignsV2Client with AWS Credentials - /// - /// AWS Credentials - public AmazonConnectCampaignsV2Client(AWSCredentials credentials) - : this(credentials, new AmazonConnectCampaignsV2Config()) - { - } - - /// - /// Constructs AmazonConnectCampaignsV2Client with AWS Credentials - /// - /// AWS Credentials - /// The region to connect. - public AmazonConnectCampaignsV2Client(AWSCredentials credentials, RegionEndpoint region) - : this(credentials, new AmazonConnectCampaignsV2Config{RegionEndpoint = region}) - { - } - - /// - /// Constructs AmazonConnectCampaignsV2Client with AWS Credentials and an - /// AmazonConnectCampaignsV2Client Configuration object. - /// - /// AWS Credentials - /// The AmazonConnectCampaignsV2Client Configuration Object - public AmazonConnectCampaignsV2Client(AWSCredentials credentials, AmazonConnectCampaignsV2Config clientConfig) - : base(credentials, clientConfig) - { - } - - /// - /// Constructs AmazonConnectCampaignsV2Client with AWS Access Key ID and AWS Secret Key - /// - /// AWS Access Key ID - /// AWS Secret Access Key - public AmazonConnectCampaignsV2Client(string awsAccessKeyId, string awsSecretAccessKey) - : this(awsAccessKeyId, awsSecretAccessKey, new AmazonConnectCampaignsV2Config()) - { - } - - /// - /// Constructs AmazonConnectCampaignsV2Client with AWS Access Key ID and AWS Secret Key - /// - /// AWS Access Key ID - /// AWS Secret Access Key - /// The region to connect. - public AmazonConnectCampaignsV2Client(string awsAccessKeyId, string awsSecretAccessKey, RegionEndpoint region) - : this(awsAccessKeyId, awsSecretAccessKey, new AmazonConnectCampaignsV2Config() {RegionEndpoint=region}) - { - } - - /// - /// Constructs AmazonConnectCampaignsV2Client with AWS Access Key ID, AWS Secret Key and an - /// AmazonConnectCampaignsV2Client Configuration object. - /// - /// AWS Access Key ID - /// AWS Secret Access Key - /// The AmazonConnectCampaignsV2Client Configuration Object - public AmazonConnectCampaignsV2Client(string awsAccessKeyId, string awsSecretAccessKey, AmazonConnectCampaignsV2Config clientConfig) - : base(awsAccessKeyId, awsSecretAccessKey, clientConfig) - { - } - - /// - /// Constructs AmazonConnectCampaignsV2Client with AWS Access Key ID and AWS Secret Key - /// - /// AWS Access Key ID - /// AWS Secret Access Key - /// AWS Session Token - public AmazonConnectCampaignsV2Client(string awsAccessKeyId, string awsSecretAccessKey, string awsSessionToken) - : this(awsAccessKeyId, awsSecretAccessKey, awsSessionToken, new AmazonConnectCampaignsV2Config()) - { - } - - /// - /// Constructs AmazonConnectCampaignsV2Client with AWS Access Key ID and AWS Secret Key - /// - /// AWS Access Key ID - /// AWS Secret Access Key - /// AWS Session Token - /// The region to connect. - public AmazonConnectCampaignsV2Client(string awsAccessKeyId, string awsSecretAccessKey, string awsSessionToken, RegionEndpoint region) - : this(awsAccessKeyId, awsSecretAccessKey, awsSessionToken, new AmazonConnectCampaignsV2Config{RegionEndpoint = region}) - { - } - - /// - /// Constructs AmazonConnectCampaignsV2Client with AWS Access Key ID, AWS Secret Key and an - /// AmazonConnectCampaignsV2Client Configuration object. - /// - /// AWS Access Key ID - /// AWS Secret Access Key - /// AWS Session Token - /// The AmazonConnectCampaignsV2Client Configuration Object - public AmazonConnectCampaignsV2Client(string awsAccessKeyId, string awsSecretAccessKey, string awsSessionToken, AmazonConnectCampaignsV2Config clientConfig) - : base(awsAccessKeyId, awsSecretAccessKey, awsSessionToken, clientConfig) - { - } - - #endregion - - #region Overrides - - - /// - /// Creates the signer for the service. - /// - protected override AbstractAWSSigner CreateSigner() - { - return new AWS4Signer(); - } - - /// - /// Customize the pipeline - /// - /// - protected override void CustomizeRuntimePipeline(RuntimePipeline pipeline) - { - pipeline.RemoveHandler(); - pipeline.AddHandlerAfter(new AmazonConnectCampaignsV2EndpointResolver()); - } - /// - /// Capture metadata for the service. - /// - protected override IServiceMetadata ServiceMetadata - { - get - { - return serviceMetadata; - } - } - - #endregion - - #region Dispose - - /// - /// Disposes the service client. - /// - protected override void Dispose(bool disposing) - { - base.Dispose(disposing); - } - - #endregion - - - #region CreateCampaign - - /// - /// Creates a campaign for the specified Amazon Connect account. This API is idempotent. - /// - /// Container for the necessary parameters to execute the CreateCampaign service method. - /// - /// The response from the CreateCampaign service method, as returned by ConnectCampaignsV2. - /// - /// You do not have sufficient access to perform this action. - /// - /// - /// The request could not be processed because of conflict in the current state of the - /// resource. - /// - /// - /// Request processing failed because of an error or failure with the service. - /// - /// - /// The specified resource was not found. - /// - /// - /// Request would cause a service quota to be exceeded. - /// - /// - /// The request was denied due to request throttling. - /// - /// - /// The input fails to satisfy the constraints specified by an AWS service. - /// - /// REST API Reference for CreateCampaign Operation - public virtual CreateCampaignResponse CreateCampaign(CreateCampaignRequest request) - { - var options = new InvokeOptions(); - options.RequestMarshaller = CreateCampaignRequestMarshaller.Instance; - options.ResponseUnmarshaller = CreateCampaignResponseUnmarshaller.Instance; - - return Invoke(request, options); - } - - /// - /// Initiates the asynchronous execution of the CreateCampaign operation. - /// - /// - /// Container for the necessary parameters to execute the CreateCampaign operation on AmazonConnectCampaignsV2Client. - /// An AsyncCallback delegate that is invoked when the operation completes. - /// A user-defined state object that is passed to the callback procedure. Retrieve this object from within the callback - /// procedure using the AsyncState property. - /// - /// An IAsyncResult that can be used to poll or wait for results, or both; this value is also needed when invoking EndCreateCampaign - /// operation. - /// REST API Reference for CreateCampaign Operation - public virtual IAsyncResult BeginCreateCampaign(CreateCampaignRequest request, AsyncCallback callback, object state) - { - var options = new InvokeOptions(); - options.RequestMarshaller = CreateCampaignRequestMarshaller.Instance; - options.ResponseUnmarshaller = CreateCampaignResponseUnmarshaller.Instance; - - return BeginInvoke(request, options, callback, state); - } - - /// - /// Finishes the asynchronous execution of the CreateCampaign operation. - /// - /// - /// The IAsyncResult returned by the call to BeginCreateCampaign. - /// - /// Returns a CreateCampaignResult from ConnectCampaignsV2. - /// REST API Reference for CreateCampaign Operation - public virtual CreateCampaignResponse EndCreateCampaign(IAsyncResult asyncResult) - { - return EndInvoke(asyncResult); - } - - #endregion - - #region DeleteCampaign - - /// - /// Deletes a campaign from the specified Amazon Connect account. - /// - /// Container for the necessary parameters to execute the DeleteCampaign service method. - /// - /// The response from the DeleteCampaign service method, as returned by ConnectCampaignsV2. - /// - /// You do not have sufficient access to perform this action. - /// - /// - /// Request processing failed because of an error or failure with the service. - /// - /// - /// The specified resource was not found. - /// - /// - /// The input fails to satisfy the constraints specified by an AWS service. - /// - /// REST API Reference for DeleteCampaign Operation - public virtual DeleteCampaignResponse DeleteCampaign(DeleteCampaignRequest request) - { - var options = new InvokeOptions(); - options.RequestMarshaller = DeleteCampaignRequestMarshaller.Instance; - options.ResponseUnmarshaller = DeleteCampaignResponseUnmarshaller.Instance; - - return Invoke(request, options); - } - - /// - /// Initiates the asynchronous execution of the DeleteCampaign operation. - /// - /// - /// Container for the necessary parameters to execute the DeleteCampaign operation on AmazonConnectCampaignsV2Client. - /// An AsyncCallback delegate that is invoked when the operation completes. - /// A user-defined state object that is passed to the callback procedure. Retrieve this object from within the callback - /// procedure using the AsyncState property. - /// - /// An IAsyncResult that can be used to poll or wait for results, or both; this value is also needed when invoking EndDeleteCampaign - /// operation. - /// REST API Reference for DeleteCampaign Operation - public virtual IAsyncResult BeginDeleteCampaign(DeleteCampaignRequest request, AsyncCallback callback, object state) - { - var options = new InvokeOptions(); - options.RequestMarshaller = DeleteCampaignRequestMarshaller.Instance; - options.ResponseUnmarshaller = DeleteCampaignResponseUnmarshaller.Instance; - - return BeginInvoke(request, options, callback, state); - } - - /// - /// Finishes the asynchronous execution of the DeleteCampaign operation. - /// - /// - /// The IAsyncResult returned by the call to BeginDeleteCampaign. - /// - /// Returns a DeleteCampaignResult from ConnectCampaignsV2. - /// REST API Reference for DeleteCampaign Operation - public virtual DeleteCampaignResponse EndDeleteCampaign(IAsyncResult asyncResult) - { - return EndInvoke(asyncResult); - } - - #endregion - - #region DeleteCampaignChannelSubtypeConfig - - /// - /// Deletes the channel subtype config of a campaign. This API is idempotent. - /// - /// Container for the necessary parameters to execute the DeleteCampaignChannelSubtypeConfig service method. - /// - /// The response from the DeleteCampaignChannelSubtypeConfig service method, as returned by ConnectCampaignsV2. - /// - /// You do not have sufficient access to perform this action. - /// - /// - /// The request could not be processed because of conflict in the current state of the - /// resource. - /// - /// - /// Request processing failed because of an error or failure with the service. - /// - /// - /// The specified resource was not found. - /// - /// - /// The input fails to satisfy the constraints specified by an AWS service. - /// - /// REST API Reference for DeleteCampaignChannelSubtypeConfig Operation - public virtual DeleteCampaignChannelSubtypeConfigResponse DeleteCampaignChannelSubtypeConfig(DeleteCampaignChannelSubtypeConfigRequest request) - { - var options = new InvokeOptions(); - options.RequestMarshaller = DeleteCampaignChannelSubtypeConfigRequestMarshaller.Instance; - options.ResponseUnmarshaller = DeleteCampaignChannelSubtypeConfigResponseUnmarshaller.Instance; - - return Invoke(request, options); - } - - /// - /// Initiates the asynchronous execution of the DeleteCampaignChannelSubtypeConfig operation. - /// - /// - /// Container for the necessary parameters to execute the DeleteCampaignChannelSubtypeConfig operation on AmazonConnectCampaignsV2Client. - /// An AsyncCallback delegate that is invoked when the operation completes. - /// A user-defined state object that is passed to the callback procedure. Retrieve this object from within the callback - /// procedure using the AsyncState property. - /// - /// An IAsyncResult that can be used to poll or wait for results, or both; this value is also needed when invoking EndDeleteCampaignChannelSubtypeConfig - /// operation. - /// REST API Reference for DeleteCampaignChannelSubtypeConfig Operation - public virtual IAsyncResult BeginDeleteCampaignChannelSubtypeConfig(DeleteCampaignChannelSubtypeConfigRequest request, AsyncCallback callback, object state) - { - var options = new InvokeOptions(); - options.RequestMarshaller = DeleteCampaignChannelSubtypeConfigRequestMarshaller.Instance; - options.ResponseUnmarshaller = DeleteCampaignChannelSubtypeConfigResponseUnmarshaller.Instance; - - return BeginInvoke(request, options, callback, state); - } - - /// - /// Finishes the asynchronous execution of the DeleteCampaignChannelSubtypeConfig operation. - /// - /// - /// The IAsyncResult returned by the call to BeginDeleteCampaignChannelSubtypeConfig. - /// - /// Returns a DeleteCampaignChannelSubtypeConfigResult from ConnectCampaignsV2. - /// REST API Reference for DeleteCampaignChannelSubtypeConfig Operation - public virtual DeleteCampaignChannelSubtypeConfigResponse EndDeleteCampaignChannelSubtypeConfig(IAsyncResult asyncResult) - { - return EndInvoke(asyncResult); - } - - #endregion - - #region DeleteCampaignCommunicationLimits - - /// - /// Deletes the communication limits config for a campaign. This API is idempotent. - /// - /// Container for the necessary parameters to execute the DeleteCampaignCommunicationLimits service method. - /// - /// The response from the DeleteCampaignCommunicationLimits service method, as returned by ConnectCampaignsV2. - /// - /// You do not have sufficient access to perform this action. - /// - /// - /// The request could not be processed because of conflict in the current state of the - /// resource. - /// - /// - /// Request processing failed because of an error or failure with the service. - /// - /// - /// The request could not be processed because of conflict in the current state of the - /// campaign. - /// - /// - /// The specified resource was not found. - /// - /// - /// The input fails to satisfy the constraints specified by an AWS service. - /// - /// REST API Reference for DeleteCampaignCommunicationLimits Operation - public virtual DeleteCampaignCommunicationLimitsResponse DeleteCampaignCommunicationLimits(DeleteCampaignCommunicationLimitsRequest request) - { - var options = new InvokeOptions(); - options.RequestMarshaller = DeleteCampaignCommunicationLimitsRequestMarshaller.Instance; - options.ResponseUnmarshaller = DeleteCampaignCommunicationLimitsResponseUnmarshaller.Instance; - - return Invoke(request, options); - } - - /// - /// Initiates the asynchronous execution of the DeleteCampaignCommunicationLimits operation. - /// - /// - /// Container for the necessary parameters to execute the DeleteCampaignCommunicationLimits operation on AmazonConnectCampaignsV2Client. - /// An AsyncCallback delegate that is invoked when the operation completes. - /// A user-defined state object that is passed to the callback procedure. Retrieve this object from within the callback - /// procedure using the AsyncState property. - /// - /// An IAsyncResult that can be used to poll or wait for results, or both; this value is also needed when invoking EndDeleteCampaignCommunicationLimits - /// operation. - /// REST API Reference for DeleteCampaignCommunicationLimits Operation - public virtual IAsyncResult BeginDeleteCampaignCommunicationLimits(DeleteCampaignCommunicationLimitsRequest request, AsyncCallback callback, object state) - { - var options = new InvokeOptions(); - options.RequestMarshaller = DeleteCampaignCommunicationLimitsRequestMarshaller.Instance; - options.ResponseUnmarshaller = DeleteCampaignCommunicationLimitsResponseUnmarshaller.Instance; - - return BeginInvoke(request, options, callback, state); - } - - /// - /// Finishes the asynchronous execution of the DeleteCampaignCommunicationLimits operation. - /// - /// - /// The IAsyncResult returned by the call to BeginDeleteCampaignCommunicationLimits. - /// - /// Returns a DeleteCampaignCommunicationLimitsResult from ConnectCampaignsV2. - /// REST API Reference for DeleteCampaignCommunicationLimits Operation - public virtual DeleteCampaignCommunicationLimitsResponse EndDeleteCampaignCommunicationLimits(IAsyncResult asyncResult) - { - return EndInvoke(asyncResult); - } - - #endregion - - #region DeleteCampaignCommunicationTime - - /// - /// Deletes the communication time config for a campaign. This API is idempotent. - /// - /// Container for the necessary parameters to execute the DeleteCampaignCommunicationTime service method. - /// - /// The response from the DeleteCampaignCommunicationTime service method, as returned by ConnectCampaignsV2. - /// - /// You do not have sufficient access to perform this action. - /// - /// - /// The request could not be processed because of conflict in the current state of the - /// resource. - /// - /// - /// Request processing failed because of an error or failure with the service. - /// - /// - /// The request could not be processed because of conflict in the current state of the - /// campaign. - /// - /// - /// The specified resource was not found. - /// - /// - /// The input fails to satisfy the constraints specified by an AWS service. - /// - /// REST API Reference for DeleteCampaignCommunicationTime Operation - public virtual DeleteCampaignCommunicationTimeResponse DeleteCampaignCommunicationTime(DeleteCampaignCommunicationTimeRequest request) - { - var options = new InvokeOptions(); - options.RequestMarshaller = DeleteCampaignCommunicationTimeRequestMarshaller.Instance; - options.ResponseUnmarshaller = DeleteCampaignCommunicationTimeResponseUnmarshaller.Instance; - - return Invoke(request, options); - } - - /// - /// Initiates the asynchronous execution of the DeleteCampaignCommunicationTime operation. - /// - /// - /// Container for the necessary parameters to execute the DeleteCampaignCommunicationTime operation on AmazonConnectCampaignsV2Client. - /// An AsyncCallback delegate that is invoked when the operation completes. - /// A user-defined state object that is passed to the callback procedure. Retrieve this object from within the callback - /// procedure using the AsyncState property. - /// - /// An IAsyncResult that can be used to poll or wait for results, or both; this value is also needed when invoking EndDeleteCampaignCommunicationTime - /// operation. - /// REST API Reference for DeleteCampaignCommunicationTime Operation - public virtual IAsyncResult BeginDeleteCampaignCommunicationTime(DeleteCampaignCommunicationTimeRequest request, AsyncCallback callback, object state) - { - var options = new InvokeOptions(); - options.RequestMarshaller = DeleteCampaignCommunicationTimeRequestMarshaller.Instance; - options.ResponseUnmarshaller = DeleteCampaignCommunicationTimeResponseUnmarshaller.Instance; - - return BeginInvoke(request, options, callback, state); - } - - /// - /// Finishes the asynchronous execution of the DeleteCampaignCommunicationTime operation. - /// - /// - /// The IAsyncResult returned by the call to BeginDeleteCampaignCommunicationTime. - /// - /// Returns a DeleteCampaignCommunicationTimeResult from ConnectCampaignsV2. - /// REST API Reference for DeleteCampaignCommunicationTime Operation - public virtual DeleteCampaignCommunicationTimeResponse EndDeleteCampaignCommunicationTime(IAsyncResult asyncResult) - { - return EndInvoke(asyncResult); - } - - #endregion - - #region DeleteConnectInstanceConfig - - /// - /// Deletes a connect instance config from the specified AWS account. - /// - /// Container for the necessary parameters to execute the DeleteConnectInstanceConfig service method. - /// - /// The response from the DeleteConnectInstanceConfig service method, as returned by ConnectCampaignsV2. - /// - /// You do not have sufficient access to perform this action. - /// - /// - /// Request processing failed because of an error or failure with the service. - /// - /// - /// The request could not be processed because of conflict in the current state. - /// - /// - /// The specified resource was not found. - /// - /// - /// The request was denied due to request throttling. - /// - /// - /// The input fails to satisfy the constraints specified by an AWS service. - /// - /// REST API Reference for DeleteConnectInstanceConfig Operation - public virtual DeleteConnectInstanceConfigResponse DeleteConnectInstanceConfig(DeleteConnectInstanceConfigRequest request) - { - var options = new InvokeOptions(); - options.RequestMarshaller = DeleteConnectInstanceConfigRequestMarshaller.Instance; - options.ResponseUnmarshaller = DeleteConnectInstanceConfigResponseUnmarshaller.Instance; - - return Invoke(request, options); - } - - /// - /// Initiates the asynchronous execution of the DeleteConnectInstanceConfig operation. - /// - /// - /// Container for the necessary parameters to execute the DeleteConnectInstanceConfig operation on AmazonConnectCampaignsV2Client. - /// An AsyncCallback delegate that is invoked when the operation completes. - /// A user-defined state object that is passed to the callback procedure. Retrieve this object from within the callback - /// procedure using the AsyncState property. - /// - /// An IAsyncResult that can be used to poll or wait for results, or both; this value is also needed when invoking EndDeleteConnectInstanceConfig - /// operation. - /// REST API Reference for DeleteConnectInstanceConfig Operation - public virtual IAsyncResult BeginDeleteConnectInstanceConfig(DeleteConnectInstanceConfigRequest request, AsyncCallback callback, object state) - { - var options = new InvokeOptions(); - options.RequestMarshaller = DeleteConnectInstanceConfigRequestMarshaller.Instance; - options.ResponseUnmarshaller = DeleteConnectInstanceConfigResponseUnmarshaller.Instance; - - return BeginInvoke(request, options, callback, state); - } - - /// - /// Finishes the asynchronous execution of the DeleteConnectInstanceConfig operation. - /// - /// - /// The IAsyncResult returned by the call to BeginDeleteConnectInstanceConfig. - /// - /// Returns a DeleteConnectInstanceConfigResult from ConnectCampaignsV2. - /// REST API Reference for DeleteConnectInstanceConfig Operation - public virtual DeleteConnectInstanceConfigResponse EndDeleteConnectInstanceConfig(IAsyncResult asyncResult) - { - return EndInvoke(asyncResult); - } - - #endregion - - #region DeleteConnectInstanceIntegration - - /// - /// Delete the integration for the specified Amazon Connect instance. - /// - /// Container for the necessary parameters to execute the DeleteConnectInstanceIntegration service method. - /// - /// The response from the DeleteConnectInstanceIntegration service method, as returned by ConnectCampaignsV2. - /// - /// You do not have sufficient access to perform this action. - /// - /// - /// Request processing failed because of an error or failure with the service. - /// - /// - /// The specified resource was not found. - /// - /// - /// The request was denied due to request throttling. - /// - /// - /// The input fails to satisfy the constraints specified by an AWS service. - /// - /// REST API Reference for DeleteConnectInstanceIntegration Operation - public virtual DeleteConnectInstanceIntegrationResponse DeleteConnectInstanceIntegration(DeleteConnectInstanceIntegrationRequest request) - { - var options = new InvokeOptions(); - options.RequestMarshaller = DeleteConnectInstanceIntegrationRequestMarshaller.Instance; - options.ResponseUnmarshaller = DeleteConnectInstanceIntegrationResponseUnmarshaller.Instance; - - return Invoke(request, options); - } - - /// - /// Initiates the asynchronous execution of the DeleteConnectInstanceIntegration operation. - /// - /// - /// Container for the necessary parameters to execute the DeleteConnectInstanceIntegration operation on AmazonConnectCampaignsV2Client. - /// An AsyncCallback delegate that is invoked when the operation completes. - /// A user-defined state object that is passed to the callback procedure. Retrieve this object from within the callback - /// procedure using the AsyncState property. - /// - /// An IAsyncResult that can be used to poll or wait for results, or both; this value is also needed when invoking EndDeleteConnectInstanceIntegration - /// operation. - /// REST API Reference for DeleteConnectInstanceIntegration Operation - public virtual IAsyncResult BeginDeleteConnectInstanceIntegration(DeleteConnectInstanceIntegrationRequest request, AsyncCallback callback, object state) - { - var options = new InvokeOptions(); - options.RequestMarshaller = DeleteConnectInstanceIntegrationRequestMarshaller.Instance; - options.ResponseUnmarshaller = DeleteConnectInstanceIntegrationResponseUnmarshaller.Instance; - - return BeginInvoke(request, options, callback, state); - } - - /// - /// Finishes the asynchronous execution of the DeleteConnectInstanceIntegration operation. - /// - /// - /// The IAsyncResult returned by the call to BeginDeleteConnectInstanceIntegration. - /// - /// Returns a DeleteConnectInstanceIntegrationResult from ConnectCampaignsV2. - /// REST API Reference for DeleteConnectInstanceIntegration Operation - public virtual DeleteConnectInstanceIntegrationResponse EndDeleteConnectInstanceIntegration(IAsyncResult asyncResult) - { - return EndInvoke(asyncResult); - } - - #endregion - - #region DeleteInstanceOnboardingJob - - /// - /// Delete the Connect Campaigns onboarding job for the specified Amazon Connect instance. - /// - /// Container for the necessary parameters to execute the DeleteInstanceOnboardingJob service method. - /// - /// The response from the DeleteInstanceOnboardingJob service method, as returned by ConnectCampaignsV2. - /// - /// You do not have sufficient access to perform this action. - /// - /// - /// Request processing failed because of an error or failure with the service. - /// - /// - /// The request could not be processed because of conflict in the current state. - /// - /// - /// The specified resource was not found. - /// - /// - /// The input fails to satisfy the constraints specified by an AWS service. - /// - /// REST API Reference for DeleteInstanceOnboardingJob Operation - public virtual DeleteInstanceOnboardingJobResponse DeleteInstanceOnboardingJob(DeleteInstanceOnboardingJobRequest request) - { - var options = new InvokeOptions(); - options.RequestMarshaller = DeleteInstanceOnboardingJobRequestMarshaller.Instance; - options.ResponseUnmarshaller = DeleteInstanceOnboardingJobResponseUnmarshaller.Instance; - - return Invoke(request, options); - } - - /// - /// Initiates the asynchronous execution of the DeleteInstanceOnboardingJob operation. - /// - /// - /// Container for the necessary parameters to execute the DeleteInstanceOnboardingJob operation on AmazonConnectCampaignsV2Client. - /// An AsyncCallback delegate that is invoked when the operation completes. - /// A user-defined state object that is passed to the callback procedure. Retrieve this object from within the callback - /// procedure using the AsyncState property. - /// - /// An IAsyncResult that can be used to poll or wait for results, or both; this value is also needed when invoking EndDeleteInstanceOnboardingJob - /// operation. - /// REST API Reference for DeleteInstanceOnboardingJob Operation - public virtual IAsyncResult BeginDeleteInstanceOnboardingJob(DeleteInstanceOnboardingJobRequest request, AsyncCallback callback, object state) - { - var options = new InvokeOptions(); - options.RequestMarshaller = DeleteInstanceOnboardingJobRequestMarshaller.Instance; - options.ResponseUnmarshaller = DeleteInstanceOnboardingJobResponseUnmarshaller.Instance; - - return BeginInvoke(request, options, callback, state); - } - - /// - /// Finishes the asynchronous execution of the DeleteInstanceOnboardingJob operation. - /// - /// - /// The IAsyncResult returned by the call to BeginDeleteInstanceOnboardingJob. - /// - /// Returns a DeleteInstanceOnboardingJobResult from ConnectCampaignsV2. - /// REST API Reference for DeleteInstanceOnboardingJob Operation - public virtual DeleteInstanceOnboardingJobResponse EndDeleteInstanceOnboardingJob(IAsyncResult asyncResult) - { - return EndInvoke(asyncResult); - } - - #endregion - - #region DescribeCampaign - - /// - /// Describes the specific campaign. - /// - /// Container for the necessary parameters to execute the DescribeCampaign service method. - /// - /// The response from the DescribeCampaign service method, as returned by ConnectCampaignsV2. - /// - /// You do not have sufficient access to perform this action. - /// - /// - /// Request processing failed because of an error or failure with the service. - /// - /// - /// The specified resource was not found. - /// - /// - /// The input fails to satisfy the constraints specified by an AWS service. - /// - /// REST API Reference for DescribeCampaign Operation - public virtual DescribeCampaignResponse DescribeCampaign(DescribeCampaignRequest request) - { - var options = new InvokeOptions(); - options.RequestMarshaller = DescribeCampaignRequestMarshaller.Instance; - options.ResponseUnmarshaller = DescribeCampaignResponseUnmarshaller.Instance; - - return Invoke(request, options); - } - - /// - /// Initiates the asynchronous execution of the DescribeCampaign operation. - /// - /// - /// Container for the necessary parameters to execute the DescribeCampaign operation on AmazonConnectCampaignsV2Client. - /// An AsyncCallback delegate that is invoked when the operation completes. - /// A user-defined state object that is passed to the callback procedure. Retrieve this object from within the callback - /// procedure using the AsyncState property. - /// - /// An IAsyncResult that can be used to poll or wait for results, or both; this value is also needed when invoking EndDescribeCampaign - /// operation. - /// REST API Reference for DescribeCampaign Operation - public virtual IAsyncResult BeginDescribeCampaign(DescribeCampaignRequest request, AsyncCallback callback, object state) - { - var options = new InvokeOptions(); - options.RequestMarshaller = DescribeCampaignRequestMarshaller.Instance; - options.ResponseUnmarshaller = DescribeCampaignResponseUnmarshaller.Instance; - - return BeginInvoke(request, options, callback, state); - } - - /// - /// Finishes the asynchronous execution of the DescribeCampaign operation. - /// - /// - /// The IAsyncResult returned by the call to BeginDescribeCampaign. - /// - /// Returns a DescribeCampaignResult from ConnectCampaignsV2. - /// REST API Reference for DescribeCampaign Operation - public virtual DescribeCampaignResponse EndDescribeCampaign(IAsyncResult asyncResult) - { - return EndInvoke(asyncResult); - } - - #endregion - - #region GetCampaignState - - /// - /// Get state of a campaign for the specified Amazon Connect account. - /// - /// Container for the necessary parameters to execute the GetCampaignState service method. - /// - /// The response from the GetCampaignState service method, as returned by ConnectCampaignsV2. - /// - /// You do not have sufficient access to perform this action. - /// - /// - /// Request processing failed because of an error or failure with the service. - /// - /// - /// The specified resource was not found. - /// - /// - /// The request was denied due to request throttling. - /// - /// - /// The input fails to satisfy the constraints specified by an AWS service. - /// - /// REST API Reference for GetCampaignState Operation - public virtual GetCampaignStateResponse GetCampaignState(GetCampaignStateRequest request) - { - var options = new InvokeOptions(); - options.RequestMarshaller = GetCampaignStateRequestMarshaller.Instance; - options.ResponseUnmarshaller = GetCampaignStateResponseUnmarshaller.Instance; - - return Invoke(request, options); - } - - /// - /// Initiates the asynchronous execution of the GetCampaignState operation. - /// - /// - /// Container for the necessary parameters to execute the GetCampaignState operation on AmazonConnectCampaignsV2Client. - /// An AsyncCallback delegate that is invoked when the operation completes. - /// A user-defined state object that is passed to the callback procedure. Retrieve this object from within the callback - /// procedure using the AsyncState property. - /// - /// An IAsyncResult that can be used to poll or wait for results, or both; this value is also needed when invoking EndGetCampaignState - /// operation. - /// REST API Reference for GetCampaignState Operation - public virtual IAsyncResult BeginGetCampaignState(GetCampaignStateRequest request, AsyncCallback callback, object state) - { - var options = new InvokeOptions(); - options.RequestMarshaller = GetCampaignStateRequestMarshaller.Instance; - options.ResponseUnmarshaller = GetCampaignStateResponseUnmarshaller.Instance; - - return BeginInvoke(request, options, callback, state); - } - - /// - /// Finishes the asynchronous execution of the GetCampaignState operation. - /// - /// - /// The IAsyncResult returned by the call to BeginGetCampaignState. - /// - /// Returns a GetCampaignStateResult from ConnectCampaignsV2. - /// REST API Reference for GetCampaignState Operation - public virtual GetCampaignStateResponse EndGetCampaignState(IAsyncResult asyncResult) - { - return EndInvoke(asyncResult); - } - - #endregion - - #region GetCampaignStateBatch - - /// - /// Get state of campaigns for the specified Amazon Connect account. - /// - /// Container for the necessary parameters to execute the GetCampaignStateBatch service method. - /// - /// The response from the GetCampaignStateBatch service method, as returned by ConnectCampaignsV2. - /// - /// You do not have sufficient access to perform this action. - /// - /// - /// Request processing failed because of an error or failure with the service. - /// - /// - /// The request was denied due to request throttling. - /// - /// - /// The input fails to satisfy the constraints specified by an AWS service. - /// - /// REST API Reference for GetCampaignStateBatch Operation - public virtual GetCampaignStateBatchResponse GetCampaignStateBatch(GetCampaignStateBatchRequest request) - { - var options = new InvokeOptions(); - options.RequestMarshaller = GetCampaignStateBatchRequestMarshaller.Instance; - options.ResponseUnmarshaller = GetCampaignStateBatchResponseUnmarshaller.Instance; - - return Invoke(request, options); - } - - /// - /// Initiates the asynchronous execution of the GetCampaignStateBatch operation. - /// - /// - /// Container for the necessary parameters to execute the GetCampaignStateBatch operation on AmazonConnectCampaignsV2Client. - /// An AsyncCallback delegate that is invoked when the operation completes. - /// A user-defined state object that is passed to the callback procedure. Retrieve this object from within the callback - /// procedure using the AsyncState property. - /// - /// An IAsyncResult that can be used to poll or wait for results, or both; this value is also needed when invoking EndGetCampaignStateBatch - /// operation. - /// REST API Reference for GetCampaignStateBatch Operation - public virtual IAsyncResult BeginGetCampaignStateBatch(GetCampaignStateBatchRequest request, AsyncCallback callback, object state) - { - var options = new InvokeOptions(); - options.RequestMarshaller = GetCampaignStateBatchRequestMarshaller.Instance; - options.ResponseUnmarshaller = GetCampaignStateBatchResponseUnmarshaller.Instance; - - return BeginInvoke(request, options, callback, state); - } - - /// - /// Finishes the asynchronous execution of the GetCampaignStateBatch operation. - /// - /// - /// The IAsyncResult returned by the call to BeginGetCampaignStateBatch. - /// - /// Returns a GetCampaignStateBatchResult from ConnectCampaignsV2. - /// REST API Reference for GetCampaignStateBatch Operation - public virtual GetCampaignStateBatchResponse EndGetCampaignStateBatch(IAsyncResult asyncResult) - { - return EndInvoke(asyncResult); - } - - #endregion - - #region GetConnectInstanceConfig - - /// - /// Get the specific Connect instance config. - /// - /// Container for the necessary parameters to execute the GetConnectInstanceConfig service method. - /// - /// The response from the GetConnectInstanceConfig service method, as returned by ConnectCampaignsV2. - /// - /// You do not have sufficient access to perform this action. - /// - /// - /// Request processing failed because of an error or failure with the service. - /// - /// - /// The specified resource was not found. - /// - /// - /// The input fails to satisfy the constraints specified by an AWS service. - /// - /// REST API Reference for GetConnectInstanceConfig Operation - public virtual GetConnectInstanceConfigResponse GetConnectInstanceConfig(GetConnectInstanceConfigRequest request) - { - var options = new InvokeOptions(); - options.RequestMarshaller = GetConnectInstanceConfigRequestMarshaller.Instance; - options.ResponseUnmarshaller = GetConnectInstanceConfigResponseUnmarshaller.Instance; - - return Invoke(request, options); - } - - /// - /// Initiates the asynchronous execution of the GetConnectInstanceConfig operation. - /// - /// - /// Container for the necessary parameters to execute the GetConnectInstanceConfig operation on AmazonConnectCampaignsV2Client. - /// An AsyncCallback delegate that is invoked when the operation completes. - /// A user-defined state object that is passed to the callback procedure. Retrieve this object from within the callback - /// procedure using the AsyncState property. - /// - /// An IAsyncResult that can be used to poll or wait for results, or both; this value is also needed when invoking EndGetConnectInstanceConfig - /// operation. - /// REST API Reference for GetConnectInstanceConfig Operation - public virtual IAsyncResult BeginGetConnectInstanceConfig(GetConnectInstanceConfigRequest request, AsyncCallback callback, object state) - { - var options = new InvokeOptions(); - options.RequestMarshaller = GetConnectInstanceConfigRequestMarshaller.Instance; - options.ResponseUnmarshaller = GetConnectInstanceConfigResponseUnmarshaller.Instance; - - return BeginInvoke(request, options, callback, state); - } - - /// - /// Finishes the asynchronous execution of the GetConnectInstanceConfig operation. - /// - /// - /// The IAsyncResult returned by the call to BeginGetConnectInstanceConfig. - /// - /// Returns a GetConnectInstanceConfigResult from ConnectCampaignsV2. - /// REST API Reference for GetConnectInstanceConfig Operation - public virtual GetConnectInstanceConfigResponse EndGetConnectInstanceConfig(IAsyncResult asyncResult) - { - return EndInvoke(asyncResult); - } - - #endregion - - #region GetInstanceOnboardingJobStatus - - /// - /// Get the specific instance onboarding job status. - /// - /// Container for the necessary parameters to execute the GetInstanceOnboardingJobStatus service method. - /// - /// The response from the GetInstanceOnboardingJobStatus service method, as returned by ConnectCampaignsV2. - /// - /// You do not have sufficient access to perform this action. - /// - /// - /// Request processing failed because of an error or failure with the service. - /// - /// - /// The specified resource was not found. - /// - /// - /// The input fails to satisfy the constraints specified by an AWS service. - /// - /// REST API Reference for GetInstanceOnboardingJobStatus Operation - public virtual GetInstanceOnboardingJobStatusResponse GetInstanceOnboardingJobStatus(GetInstanceOnboardingJobStatusRequest request) - { - var options = new InvokeOptions(); - options.RequestMarshaller = GetInstanceOnboardingJobStatusRequestMarshaller.Instance; - options.ResponseUnmarshaller = GetInstanceOnboardingJobStatusResponseUnmarshaller.Instance; - - return Invoke(request, options); - } - - /// - /// Initiates the asynchronous execution of the GetInstanceOnboardingJobStatus operation. - /// - /// - /// Container for the necessary parameters to execute the GetInstanceOnboardingJobStatus operation on AmazonConnectCampaignsV2Client. - /// An AsyncCallback delegate that is invoked when the operation completes. - /// A user-defined state object that is passed to the callback procedure. Retrieve this object from within the callback - /// procedure using the AsyncState property. - /// - /// An IAsyncResult that can be used to poll or wait for results, or both; this value is also needed when invoking EndGetInstanceOnboardingJobStatus - /// operation. - /// REST API Reference for GetInstanceOnboardingJobStatus Operation - public virtual IAsyncResult BeginGetInstanceOnboardingJobStatus(GetInstanceOnboardingJobStatusRequest request, AsyncCallback callback, object state) - { - var options = new InvokeOptions(); - options.RequestMarshaller = GetInstanceOnboardingJobStatusRequestMarshaller.Instance; - options.ResponseUnmarshaller = GetInstanceOnboardingJobStatusResponseUnmarshaller.Instance; - - return BeginInvoke(request, options, callback, state); - } - - /// - /// Finishes the asynchronous execution of the GetInstanceOnboardingJobStatus operation. - /// - /// - /// The IAsyncResult returned by the call to BeginGetInstanceOnboardingJobStatus. - /// - /// Returns a GetInstanceOnboardingJobStatusResult from ConnectCampaignsV2. - /// REST API Reference for GetInstanceOnboardingJobStatus Operation - public virtual GetInstanceOnboardingJobStatusResponse EndGetInstanceOnboardingJobStatus(IAsyncResult asyncResult) - { - return EndInvoke(asyncResult); - } - - #endregion - - #region ListCampaigns - - /// - /// Provides summary information about the campaigns under the specified Amazon Connect - /// account. - /// - /// Container for the necessary parameters to execute the ListCampaigns service method. - /// - /// The response from the ListCampaigns service method, as returned by ConnectCampaignsV2. - /// - /// You do not have sufficient access to perform this action. - /// - /// - /// Request processing failed because of an error or failure with the service. - /// - /// - /// The input fails to satisfy the constraints specified by an AWS service. - /// - /// REST API Reference for ListCampaigns Operation - public virtual ListCampaignsResponse ListCampaigns(ListCampaignsRequest request) - { - var options = new InvokeOptions(); - options.RequestMarshaller = ListCampaignsRequestMarshaller.Instance; - options.ResponseUnmarshaller = ListCampaignsResponseUnmarshaller.Instance; - - return Invoke(request, options); - } - - /// - /// Initiates the asynchronous execution of the ListCampaigns operation. - /// - /// - /// Container for the necessary parameters to execute the ListCampaigns operation on AmazonConnectCampaignsV2Client. - /// An AsyncCallback delegate that is invoked when the operation completes. - /// A user-defined state object that is passed to the callback procedure. Retrieve this object from within the callback - /// procedure using the AsyncState property. - /// - /// An IAsyncResult that can be used to poll or wait for results, or both; this value is also needed when invoking EndListCampaigns - /// operation. - /// REST API Reference for ListCampaigns Operation - public virtual IAsyncResult BeginListCampaigns(ListCampaignsRequest request, AsyncCallback callback, object state) - { - var options = new InvokeOptions(); - options.RequestMarshaller = ListCampaignsRequestMarshaller.Instance; - options.ResponseUnmarshaller = ListCampaignsResponseUnmarshaller.Instance; - - return BeginInvoke(request, options, callback, state); - } - - /// - /// Finishes the asynchronous execution of the ListCampaigns operation. - /// - /// - /// The IAsyncResult returned by the call to BeginListCampaigns. - /// - /// Returns a ListCampaignsResult from ConnectCampaignsV2. - /// REST API Reference for ListCampaigns Operation - public virtual ListCampaignsResponse EndListCampaigns(IAsyncResult asyncResult) - { - return EndInvoke(asyncResult); - } - - #endregion - - #region ListConnectInstanceIntegrations - - /// - /// Provides summary information about the integration under the specified Connect instance. - /// - /// Container for the necessary parameters to execute the ListConnectInstanceIntegrations service method. - /// - /// The response from the ListConnectInstanceIntegrations service method, as returned by ConnectCampaignsV2. - /// - /// You do not have sufficient access to perform this action. - /// - /// - /// Request processing failed because of an error or failure with the service. - /// - /// - /// The specified resource was not found. - /// - /// - /// The request was denied due to request throttling. - /// - /// - /// The input fails to satisfy the constraints specified by an AWS service. - /// - /// REST API Reference for ListConnectInstanceIntegrations Operation - public virtual ListConnectInstanceIntegrationsResponse ListConnectInstanceIntegrations(ListConnectInstanceIntegrationsRequest request) - { - var options = new InvokeOptions(); - options.RequestMarshaller = ListConnectInstanceIntegrationsRequestMarshaller.Instance; - options.ResponseUnmarshaller = ListConnectInstanceIntegrationsResponseUnmarshaller.Instance; - - return Invoke(request, options); - } - - /// - /// Initiates the asynchronous execution of the ListConnectInstanceIntegrations operation. - /// - /// - /// Container for the necessary parameters to execute the ListConnectInstanceIntegrations operation on AmazonConnectCampaignsV2Client. - /// An AsyncCallback delegate that is invoked when the operation completes. - /// A user-defined state object that is passed to the callback procedure. Retrieve this object from within the callback - /// procedure using the AsyncState property. - /// - /// An IAsyncResult that can be used to poll or wait for results, or both; this value is also needed when invoking EndListConnectInstanceIntegrations - /// operation. - /// REST API Reference for ListConnectInstanceIntegrations Operation - public virtual IAsyncResult BeginListConnectInstanceIntegrations(ListConnectInstanceIntegrationsRequest request, AsyncCallback callback, object state) - { - var options = new InvokeOptions(); - options.RequestMarshaller = ListConnectInstanceIntegrationsRequestMarshaller.Instance; - options.ResponseUnmarshaller = ListConnectInstanceIntegrationsResponseUnmarshaller.Instance; - - return BeginInvoke(request, options, callback, state); - } - - /// - /// Finishes the asynchronous execution of the ListConnectInstanceIntegrations operation. - /// - /// - /// The IAsyncResult returned by the call to BeginListConnectInstanceIntegrations. - /// - /// Returns a ListConnectInstanceIntegrationsResult from ConnectCampaignsV2. - /// REST API Reference for ListConnectInstanceIntegrations Operation - public virtual ListConnectInstanceIntegrationsResponse EndListConnectInstanceIntegrations(IAsyncResult asyncResult) - { - return EndInvoke(asyncResult); - } - - #endregion - - #region ListTagsForResource - - /// - /// List tags for a resource. - /// - /// Container for the necessary parameters to execute the ListTagsForResource service method. - /// - /// The response from the ListTagsForResource service method, as returned by ConnectCampaignsV2. - /// - /// You do not have sufficient access to perform this action. - /// - /// - /// Request processing failed because of an error or failure with the service. - /// - /// - /// The specified resource was not found. - /// - /// - /// The request was denied due to request throttling. - /// - /// - /// The input fails to satisfy the constraints specified by an AWS service. - /// - /// REST API Reference for ListTagsForResource Operation - public virtual ListTagsForResourceResponse ListTagsForResource(ListTagsForResourceRequest request) - { - var options = new InvokeOptions(); - options.RequestMarshaller = ListTagsForResourceRequestMarshaller.Instance; - options.ResponseUnmarshaller = ListTagsForResourceResponseUnmarshaller.Instance; - - return Invoke(request, options); - } - - /// - /// Initiates the asynchronous execution of the ListTagsForResource operation. - /// - /// - /// Container for the necessary parameters to execute the ListTagsForResource operation on AmazonConnectCampaignsV2Client. - /// An AsyncCallback delegate that is invoked when the operation completes. - /// A user-defined state object that is passed to the callback procedure. Retrieve this object from within the callback - /// procedure using the AsyncState property. - /// - /// An IAsyncResult that can be used to poll or wait for results, or both; this value is also needed when invoking EndListTagsForResource - /// operation. - /// REST API Reference for ListTagsForResource Operation - public virtual IAsyncResult BeginListTagsForResource(ListTagsForResourceRequest request, AsyncCallback callback, object state) - { - var options = new InvokeOptions(); - options.RequestMarshaller = ListTagsForResourceRequestMarshaller.Instance; - options.ResponseUnmarshaller = ListTagsForResourceResponseUnmarshaller.Instance; - - return BeginInvoke(request, options, callback, state); - } - - /// - /// Finishes the asynchronous execution of the ListTagsForResource operation. - /// - /// - /// The IAsyncResult returned by the call to BeginListTagsForResource. - /// - /// Returns a ListTagsForResourceResult from ConnectCampaignsV2. - /// REST API Reference for ListTagsForResource Operation - public virtual ListTagsForResourceResponse EndListTagsForResource(IAsyncResult asyncResult) - { - return EndInvoke(asyncResult); - } - - #endregion - - #region PauseCampaign - - /// - /// Pauses a campaign for the specified Amazon Connect account. - /// - /// Container for the necessary parameters to execute the PauseCampaign service method. - /// - /// The response from the PauseCampaign service method, as returned by ConnectCampaignsV2. - /// - /// You do not have sufficient access to perform this action. - /// - /// - /// The request could not be processed because of conflict in the current state of the - /// resource. - /// - /// - /// Request processing failed because of an error or failure with the service. - /// - /// - /// The request could not be processed because of conflict in the current state of the - /// campaign. - /// - /// - /// The specified resource was not found. - /// - /// - /// The request was denied due to request throttling. - /// - /// - /// The input fails to satisfy the constraints specified by an AWS service. - /// - /// REST API Reference for PauseCampaign Operation - public virtual PauseCampaignResponse PauseCampaign(PauseCampaignRequest request) - { - var options = new InvokeOptions(); - options.RequestMarshaller = PauseCampaignRequestMarshaller.Instance; - options.ResponseUnmarshaller = PauseCampaignResponseUnmarshaller.Instance; - - return Invoke(request, options); - } - - /// - /// Initiates the asynchronous execution of the PauseCampaign operation. - /// - /// - /// Container for the necessary parameters to execute the PauseCampaign operation on AmazonConnectCampaignsV2Client. - /// An AsyncCallback delegate that is invoked when the operation completes. - /// A user-defined state object that is passed to the callback procedure. Retrieve this object from within the callback - /// procedure using the AsyncState property. - /// - /// An IAsyncResult that can be used to poll or wait for results, or both; this value is also needed when invoking EndPauseCampaign - /// operation. - /// REST API Reference for PauseCampaign Operation - public virtual IAsyncResult BeginPauseCampaign(PauseCampaignRequest request, AsyncCallback callback, object state) - { - var options = new InvokeOptions(); - options.RequestMarshaller = PauseCampaignRequestMarshaller.Instance; - options.ResponseUnmarshaller = PauseCampaignResponseUnmarshaller.Instance; - - return BeginInvoke(request, options, callback, state); - } - - /// - /// Finishes the asynchronous execution of the PauseCampaign operation. - /// - /// - /// The IAsyncResult returned by the call to BeginPauseCampaign. - /// - /// Returns a PauseCampaignResult from ConnectCampaignsV2. - /// REST API Reference for PauseCampaign Operation - public virtual PauseCampaignResponse EndPauseCampaign(IAsyncResult asyncResult) - { - return EndInvoke(asyncResult); - } - - #endregion - - #region PutConnectInstanceIntegration - - /// - /// Put or update the integration for the specified Amazon Connect instance. - /// - /// Container for the necessary parameters to execute the PutConnectInstanceIntegration service method. - /// - /// The response from the PutConnectInstanceIntegration service method, as returned by ConnectCampaignsV2. - /// - /// You do not have sufficient access to perform this action. - /// - /// - /// The request could not be processed because of conflict in the current state of the - /// resource. - /// - /// - /// Request processing failed because of an error or failure with the service. - /// - /// - /// The specified resource was not found. - /// - /// - /// The request was denied due to request throttling. - /// - /// - /// The input fails to satisfy the constraints specified by an AWS service. - /// - /// REST API Reference for PutConnectInstanceIntegration Operation - public virtual PutConnectInstanceIntegrationResponse PutConnectInstanceIntegration(PutConnectInstanceIntegrationRequest request) - { - var options = new InvokeOptions(); - options.RequestMarshaller = PutConnectInstanceIntegrationRequestMarshaller.Instance; - options.ResponseUnmarshaller = PutConnectInstanceIntegrationResponseUnmarshaller.Instance; - - return Invoke(request, options); - } - - /// - /// Initiates the asynchronous execution of the PutConnectInstanceIntegration operation. - /// - /// - /// Container for the necessary parameters to execute the PutConnectInstanceIntegration operation on AmazonConnectCampaignsV2Client. - /// An AsyncCallback delegate that is invoked when the operation completes. - /// A user-defined state object that is passed to the callback procedure. Retrieve this object from within the callback - /// procedure using the AsyncState property. - /// - /// An IAsyncResult that can be used to poll or wait for results, or both; this value is also needed when invoking EndPutConnectInstanceIntegration - /// operation. - /// REST API Reference for PutConnectInstanceIntegration Operation - public virtual IAsyncResult BeginPutConnectInstanceIntegration(PutConnectInstanceIntegrationRequest request, AsyncCallback callback, object state) - { - var options = new InvokeOptions(); - options.RequestMarshaller = PutConnectInstanceIntegrationRequestMarshaller.Instance; - options.ResponseUnmarshaller = PutConnectInstanceIntegrationResponseUnmarshaller.Instance; - - return BeginInvoke(request, options, callback, state); - } - - /// - /// Finishes the asynchronous execution of the PutConnectInstanceIntegration operation. - /// - /// - /// The IAsyncResult returned by the call to BeginPutConnectInstanceIntegration. - /// - /// Returns a PutConnectInstanceIntegrationResult from ConnectCampaignsV2. - /// REST API Reference for PutConnectInstanceIntegration Operation - public virtual PutConnectInstanceIntegrationResponse EndPutConnectInstanceIntegration(IAsyncResult asyncResult) - { - return EndInvoke(asyncResult); - } - - #endregion - - #region PutOutboundRequestBatch - - /// - /// Creates outbound requests for the specified campaign Amazon Connect account. This - /// API is idempotent. - /// - /// Container for the necessary parameters to execute the PutOutboundRequestBatch service method. - /// - /// The response from the PutOutboundRequestBatch service method, as returned by ConnectCampaignsV2. - /// - /// You do not have sufficient access to perform this action. - /// - /// - /// The request could not be processed because of conflict in the current state of the - /// resource. - /// - /// - /// Request processing failed because of an error or failure with the service. - /// - /// - /// The request could not be processed because of conflict in the current state of the - /// campaign. - /// - /// - /// The specified resource was not found. - /// - /// - /// The request was denied due to request throttling. - /// - /// - /// The input fails to satisfy the constraints specified by an AWS service. - /// - /// REST API Reference for PutOutboundRequestBatch Operation - public virtual PutOutboundRequestBatchResponse PutOutboundRequestBatch(PutOutboundRequestBatchRequest request) - { - var options = new InvokeOptions(); - options.RequestMarshaller = PutOutboundRequestBatchRequestMarshaller.Instance; - options.ResponseUnmarshaller = PutOutboundRequestBatchResponseUnmarshaller.Instance; - - return Invoke(request, options); - } - - /// - /// Initiates the asynchronous execution of the PutOutboundRequestBatch operation. - /// - /// - /// Container for the necessary parameters to execute the PutOutboundRequestBatch operation on AmazonConnectCampaignsV2Client. - /// An AsyncCallback delegate that is invoked when the operation completes. - /// A user-defined state object that is passed to the callback procedure. Retrieve this object from within the callback - /// procedure using the AsyncState property. - /// - /// An IAsyncResult that can be used to poll or wait for results, or both; this value is also needed when invoking EndPutOutboundRequestBatch - /// operation. - /// REST API Reference for PutOutboundRequestBatch Operation - public virtual IAsyncResult BeginPutOutboundRequestBatch(PutOutboundRequestBatchRequest request, AsyncCallback callback, object state) - { - var options = new InvokeOptions(); - options.RequestMarshaller = PutOutboundRequestBatchRequestMarshaller.Instance; - options.ResponseUnmarshaller = PutOutboundRequestBatchResponseUnmarshaller.Instance; - - return BeginInvoke(request, options, callback, state); - } - - /// - /// Finishes the asynchronous execution of the PutOutboundRequestBatch operation. - /// - /// - /// The IAsyncResult returned by the call to BeginPutOutboundRequestBatch. - /// - /// Returns a PutOutboundRequestBatchResult from ConnectCampaignsV2. - /// REST API Reference for PutOutboundRequestBatch Operation - public virtual PutOutboundRequestBatchResponse EndPutOutboundRequestBatch(IAsyncResult asyncResult) - { - return EndInvoke(asyncResult); - } - - #endregion - - #region ResumeCampaign - - /// - /// Stops a campaign for the specified Amazon Connect account. - /// - /// Container for the necessary parameters to execute the ResumeCampaign service method. - /// - /// The response from the ResumeCampaign service method, as returned by ConnectCampaignsV2. - /// - /// You do not have sufficient access to perform this action. - /// - /// - /// The request could not be processed because of conflict in the current state of the - /// resource. - /// - /// - /// Request processing failed because of an error or failure with the service. - /// - /// - /// The request could not be processed because of conflict in the current state of the - /// campaign. - /// - /// - /// The specified resource was not found. - /// - /// - /// The request was denied due to request throttling. - /// - /// - /// The input fails to satisfy the constraints specified by an AWS service. - /// - /// REST API Reference for ResumeCampaign Operation - public virtual ResumeCampaignResponse ResumeCampaign(ResumeCampaignRequest request) - { - var options = new InvokeOptions(); - options.RequestMarshaller = ResumeCampaignRequestMarshaller.Instance; - options.ResponseUnmarshaller = ResumeCampaignResponseUnmarshaller.Instance; - - return Invoke(request, options); - } - - /// - /// Initiates the asynchronous execution of the ResumeCampaign operation. - /// - /// - /// Container for the necessary parameters to execute the ResumeCampaign operation on AmazonConnectCampaignsV2Client. - /// An AsyncCallback delegate that is invoked when the operation completes. - /// A user-defined state object that is passed to the callback procedure. Retrieve this object from within the callback - /// procedure using the AsyncState property. - /// - /// An IAsyncResult that can be used to poll or wait for results, or both; this value is also needed when invoking EndResumeCampaign - /// operation. - /// REST API Reference for ResumeCampaign Operation - public virtual IAsyncResult BeginResumeCampaign(ResumeCampaignRequest request, AsyncCallback callback, object state) - { - var options = new InvokeOptions(); - options.RequestMarshaller = ResumeCampaignRequestMarshaller.Instance; - options.ResponseUnmarshaller = ResumeCampaignResponseUnmarshaller.Instance; - - return BeginInvoke(request, options, callback, state); - } - - /// - /// Finishes the asynchronous execution of the ResumeCampaign operation. - /// - /// - /// The IAsyncResult returned by the call to BeginResumeCampaign. - /// - /// Returns a ResumeCampaignResult from ConnectCampaignsV2. - /// REST API Reference for ResumeCampaign Operation - public virtual ResumeCampaignResponse EndResumeCampaign(IAsyncResult asyncResult) - { - return EndInvoke(asyncResult); - } - - #endregion - - #region StartCampaign - - /// - /// Starts a campaign for the specified Amazon Connect account. - /// - /// Container for the necessary parameters to execute the StartCampaign service method. - /// - /// The response from the StartCampaign service method, as returned by ConnectCampaignsV2. - /// - /// You do not have sufficient access to perform this action. - /// - /// - /// The request could not be processed because of conflict in the current state of the - /// resource. - /// - /// - /// Request processing failed because of an error or failure with the service. - /// - /// - /// The request could not be processed because of conflict in the current state of the - /// campaign. - /// - /// - /// The specified resource was not found. - /// - /// - /// The request was denied due to request throttling. - /// - /// - /// The input fails to satisfy the constraints specified by an AWS service. - /// - /// REST API Reference for StartCampaign Operation - public virtual StartCampaignResponse StartCampaign(StartCampaignRequest request) - { - var options = new InvokeOptions(); - options.RequestMarshaller = StartCampaignRequestMarshaller.Instance; - options.ResponseUnmarshaller = StartCampaignResponseUnmarshaller.Instance; - - return Invoke(request, options); - } - - /// - /// Initiates the asynchronous execution of the StartCampaign operation. - /// - /// - /// Container for the necessary parameters to execute the StartCampaign operation on AmazonConnectCampaignsV2Client. - /// An AsyncCallback delegate that is invoked when the operation completes. - /// A user-defined state object that is passed to the callback procedure. Retrieve this object from within the callback - /// procedure using the AsyncState property. - /// - /// An IAsyncResult that can be used to poll or wait for results, or both; this value is also needed when invoking EndStartCampaign - /// operation. - /// REST API Reference for StartCampaign Operation - public virtual IAsyncResult BeginStartCampaign(StartCampaignRequest request, AsyncCallback callback, object state) - { - var options = new InvokeOptions(); - options.RequestMarshaller = StartCampaignRequestMarshaller.Instance; - options.ResponseUnmarshaller = StartCampaignResponseUnmarshaller.Instance; - - return BeginInvoke(request, options, callback, state); - } - - /// - /// Finishes the asynchronous execution of the StartCampaign operation. - /// - /// - /// The IAsyncResult returned by the call to BeginStartCampaign. - /// - /// Returns a StartCampaignResult from ConnectCampaignsV2. - /// REST API Reference for StartCampaign Operation - public virtual StartCampaignResponse EndStartCampaign(IAsyncResult asyncResult) - { - return EndInvoke(asyncResult); - } - - #endregion - - #region StartInstanceOnboardingJob - - /// - /// Onboard the specific Amazon Connect instance to Connect Campaigns. - /// - /// Container for the necessary parameters to execute the StartInstanceOnboardingJob service method. - /// - /// The response from the StartInstanceOnboardingJob service method, as returned by ConnectCampaignsV2. - /// - /// You do not have sufficient access to perform this action. - /// - /// - /// The request could not be processed because of conflict in the current state of the - /// resource. - /// - /// - /// Request processing failed because of an error or failure with the service. - /// - /// - /// The specified resource was not found. - /// - /// - /// The request was denied due to request throttling. - /// - /// - /// The input fails to satisfy the constraints specified by an AWS service. - /// - /// REST API Reference for StartInstanceOnboardingJob Operation - public virtual StartInstanceOnboardingJobResponse StartInstanceOnboardingJob(StartInstanceOnboardingJobRequest request) - { - var options = new InvokeOptions(); - options.RequestMarshaller = StartInstanceOnboardingJobRequestMarshaller.Instance; - options.ResponseUnmarshaller = StartInstanceOnboardingJobResponseUnmarshaller.Instance; - - return Invoke(request, options); - } - - /// - /// Initiates the asynchronous execution of the StartInstanceOnboardingJob operation. - /// - /// - /// Container for the necessary parameters to execute the StartInstanceOnboardingJob operation on AmazonConnectCampaignsV2Client. - /// An AsyncCallback delegate that is invoked when the operation completes. - /// A user-defined state object that is passed to the callback procedure. Retrieve this object from within the callback - /// procedure using the AsyncState property. - /// - /// An IAsyncResult that can be used to poll or wait for results, or both; this value is also needed when invoking EndStartInstanceOnboardingJob - /// operation. - /// REST API Reference for StartInstanceOnboardingJob Operation - public virtual IAsyncResult BeginStartInstanceOnboardingJob(StartInstanceOnboardingJobRequest request, AsyncCallback callback, object state) - { - var options = new InvokeOptions(); - options.RequestMarshaller = StartInstanceOnboardingJobRequestMarshaller.Instance; - options.ResponseUnmarshaller = StartInstanceOnboardingJobResponseUnmarshaller.Instance; - - return BeginInvoke(request, options, callback, state); - } - - /// - /// Finishes the asynchronous execution of the StartInstanceOnboardingJob operation. - /// - /// - /// The IAsyncResult returned by the call to BeginStartInstanceOnboardingJob. - /// - /// Returns a StartInstanceOnboardingJobResult from ConnectCampaignsV2. - /// REST API Reference for StartInstanceOnboardingJob Operation - public virtual StartInstanceOnboardingJobResponse EndStartInstanceOnboardingJob(IAsyncResult asyncResult) - { - return EndInvoke(asyncResult); - } - - #endregion - - #region StopCampaign - - /// - /// Stops a campaign for the specified Amazon Connect account. - /// - /// Container for the necessary parameters to execute the StopCampaign service method. - /// - /// The response from the StopCampaign service method, as returned by ConnectCampaignsV2. - /// - /// You do not have sufficient access to perform this action. - /// - /// - /// The request could not be processed because of conflict in the current state of the - /// resource. - /// - /// - /// Request processing failed because of an error or failure with the service. - /// - /// - /// The request could not be processed because of conflict in the current state of the - /// campaign. - /// - /// - /// The specified resource was not found. - /// - /// - /// The request was denied due to request throttling. - /// - /// - /// The input fails to satisfy the constraints specified by an AWS service. - /// - /// REST API Reference for StopCampaign Operation - public virtual StopCampaignResponse StopCampaign(StopCampaignRequest request) - { - var options = new InvokeOptions(); - options.RequestMarshaller = StopCampaignRequestMarshaller.Instance; - options.ResponseUnmarshaller = StopCampaignResponseUnmarshaller.Instance; - - return Invoke(request, options); - } - - /// - /// Initiates the asynchronous execution of the StopCampaign operation. - /// - /// - /// Container for the necessary parameters to execute the StopCampaign operation on AmazonConnectCampaignsV2Client. - /// An AsyncCallback delegate that is invoked when the operation completes. - /// A user-defined state object that is passed to the callback procedure. Retrieve this object from within the callback - /// procedure using the AsyncState property. - /// - /// An IAsyncResult that can be used to poll or wait for results, or both; this value is also needed when invoking EndStopCampaign - /// operation. - /// REST API Reference for StopCampaign Operation - public virtual IAsyncResult BeginStopCampaign(StopCampaignRequest request, AsyncCallback callback, object state) - { - var options = new InvokeOptions(); - options.RequestMarshaller = StopCampaignRequestMarshaller.Instance; - options.ResponseUnmarshaller = StopCampaignResponseUnmarshaller.Instance; - - return BeginInvoke(request, options, callback, state); - } - - /// - /// Finishes the asynchronous execution of the StopCampaign operation. - /// - /// - /// The IAsyncResult returned by the call to BeginStopCampaign. - /// - /// Returns a StopCampaignResult from ConnectCampaignsV2. - /// REST API Reference for StopCampaign Operation - public virtual StopCampaignResponse EndStopCampaign(IAsyncResult asyncResult) - { - return EndInvoke(asyncResult); - } - - #endregion - - #region TagResource - - /// - /// Tag a resource. - /// - /// Container for the necessary parameters to execute the TagResource service method. - /// - /// The response from the TagResource service method, as returned by ConnectCampaignsV2. - /// - /// You do not have sufficient access to perform this action. - /// - /// - /// Request processing failed because of an error or failure with the service. - /// - /// - /// The specified resource was not found. - /// - /// - /// The request was denied due to request throttling. - /// - /// - /// The input fails to satisfy the constraints specified by an AWS service. - /// - /// REST API Reference for TagResource Operation - public virtual TagResourceResponse TagResource(TagResourceRequest request) - { - var options = new InvokeOptions(); - options.RequestMarshaller = TagResourceRequestMarshaller.Instance; - options.ResponseUnmarshaller = TagResourceResponseUnmarshaller.Instance; - - return Invoke(request, options); - } - - /// - /// Initiates the asynchronous execution of the TagResource operation. - /// - /// - /// Container for the necessary parameters to execute the TagResource operation on AmazonConnectCampaignsV2Client. - /// An AsyncCallback delegate that is invoked when the operation completes. - /// A user-defined state object that is passed to the callback procedure. Retrieve this object from within the callback - /// procedure using the AsyncState property. - /// - /// An IAsyncResult that can be used to poll or wait for results, or both; this value is also needed when invoking EndTagResource - /// operation. - /// REST API Reference for TagResource Operation - public virtual IAsyncResult BeginTagResource(TagResourceRequest request, AsyncCallback callback, object state) - { - var options = new InvokeOptions(); - options.RequestMarshaller = TagResourceRequestMarshaller.Instance; - options.ResponseUnmarshaller = TagResourceResponseUnmarshaller.Instance; - - return BeginInvoke(request, options, callback, state); - } - - /// - /// Finishes the asynchronous execution of the TagResource operation. - /// - /// - /// The IAsyncResult returned by the call to BeginTagResource. - /// - /// Returns a TagResourceResult from ConnectCampaignsV2. - /// REST API Reference for TagResource Operation - public virtual TagResourceResponse EndTagResource(IAsyncResult asyncResult) - { - return EndInvoke(asyncResult); - } - - #endregion - - #region UntagResource - - /// - /// Untag a resource. - /// - /// Container for the necessary parameters to execute the UntagResource service method. - /// - /// The response from the UntagResource service method, as returned by ConnectCampaignsV2. - /// - /// You do not have sufficient access to perform this action. - /// - /// - /// Request processing failed because of an error or failure with the service. - /// - /// - /// The specified resource was not found. - /// - /// - /// The request was denied due to request throttling. - /// - /// - /// The input fails to satisfy the constraints specified by an AWS service. - /// - /// REST API Reference for UntagResource Operation - public virtual UntagResourceResponse UntagResource(UntagResourceRequest request) - { - var options = new InvokeOptions(); - options.RequestMarshaller = UntagResourceRequestMarshaller.Instance; - options.ResponseUnmarshaller = UntagResourceResponseUnmarshaller.Instance; - - return Invoke(request, options); - } - - /// - /// Initiates the asynchronous execution of the UntagResource operation. - /// - /// - /// Container for the necessary parameters to execute the UntagResource operation on AmazonConnectCampaignsV2Client. - /// An AsyncCallback delegate that is invoked when the operation completes. - /// A user-defined state object that is passed to the callback procedure. Retrieve this object from within the callback - /// procedure using the AsyncState property. - /// - /// An IAsyncResult that can be used to poll or wait for results, or both; this value is also needed when invoking EndUntagResource - /// operation. - /// REST API Reference for UntagResource Operation - public virtual IAsyncResult BeginUntagResource(UntagResourceRequest request, AsyncCallback callback, object state) - { - var options = new InvokeOptions(); - options.RequestMarshaller = UntagResourceRequestMarshaller.Instance; - options.ResponseUnmarshaller = UntagResourceResponseUnmarshaller.Instance; - - return BeginInvoke(request, options, callback, state); - } - - /// - /// Finishes the asynchronous execution of the UntagResource operation. - /// - /// - /// The IAsyncResult returned by the call to BeginUntagResource. - /// - /// Returns a UntagResourceResult from ConnectCampaignsV2. - /// REST API Reference for UntagResource Operation - public virtual UntagResourceResponse EndUntagResource(IAsyncResult asyncResult) - { - return EndInvoke(asyncResult); - } - - #endregion - - #region UpdateCampaignChannelSubtypeConfig - - /// - /// Updates the channel subtype config of a campaign. This API is idempotent. - /// - /// Container for the necessary parameters to execute the UpdateCampaignChannelSubtypeConfig service method. - /// - /// The response from the UpdateCampaignChannelSubtypeConfig service method, as returned by ConnectCampaignsV2. - /// - /// You do not have sufficient access to perform this action. - /// - /// - /// The request could not be processed because of conflict in the current state of the - /// resource. - /// - /// - /// Request processing failed because of an error or failure with the service. - /// - /// - /// The specified resource was not found. - /// - /// - /// The input fails to satisfy the constraints specified by an AWS service. - /// - /// REST API Reference for UpdateCampaignChannelSubtypeConfig Operation - public virtual UpdateCampaignChannelSubtypeConfigResponse UpdateCampaignChannelSubtypeConfig(UpdateCampaignChannelSubtypeConfigRequest request) - { - var options = new InvokeOptions(); - options.RequestMarshaller = UpdateCampaignChannelSubtypeConfigRequestMarshaller.Instance; - options.ResponseUnmarshaller = UpdateCampaignChannelSubtypeConfigResponseUnmarshaller.Instance; - - return Invoke(request, options); - } - - /// - /// Initiates the asynchronous execution of the UpdateCampaignChannelSubtypeConfig operation. - /// - /// - /// Container for the necessary parameters to execute the UpdateCampaignChannelSubtypeConfig operation on AmazonConnectCampaignsV2Client. - /// An AsyncCallback delegate that is invoked when the operation completes. - /// A user-defined state object that is passed to the callback procedure. Retrieve this object from within the callback - /// procedure using the AsyncState property. - /// - /// An IAsyncResult that can be used to poll or wait for results, or both; this value is also needed when invoking EndUpdateCampaignChannelSubtypeConfig - /// operation. - /// REST API Reference for UpdateCampaignChannelSubtypeConfig Operation - public virtual IAsyncResult BeginUpdateCampaignChannelSubtypeConfig(UpdateCampaignChannelSubtypeConfigRequest request, AsyncCallback callback, object state) - { - var options = new InvokeOptions(); - options.RequestMarshaller = UpdateCampaignChannelSubtypeConfigRequestMarshaller.Instance; - options.ResponseUnmarshaller = UpdateCampaignChannelSubtypeConfigResponseUnmarshaller.Instance; - - return BeginInvoke(request, options, callback, state); - } - - /// - /// Finishes the asynchronous execution of the UpdateCampaignChannelSubtypeConfig operation. - /// - /// - /// The IAsyncResult returned by the call to BeginUpdateCampaignChannelSubtypeConfig. - /// - /// Returns a UpdateCampaignChannelSubtypeConfigResult from ConnectCampaignsV2. - /// REST API Reference for UpdateCampaignChannelSubtypeConfig Operation - public virtual UpdateCampaignChannelSubtypeConfigResponse EndUpdateCampaignChannelSubtypeConfig(IAsyncResult asyncResult) - { - return EndInvoke(asyncResult); - } - - #endregion - - #region UpdateCampaignCommunicationLimits - - /// - /// Updates the communication limits config for a campaign. This API is idempotent. - /// - /// Container for the necessary parameters to execute the UpdateCampaignCommunicationLimits service method. - /// - /// The response from the UpdateCampaignCommunicationLimits service method, as returned by ConnectCampaignsV2. - /// - /// You do not have sufficient access to perform this action. - /// - /// - /// The request could not be processed because of conflict in the current state of the - /// resource. - /// - /// - /// Request processing failed because of an error or failure with the service. - /// - /// - /// The request could not be processed because of conflict in the current state of the - /// campaign. - /// - /// - /// The specified resource was not found. - /// - /// - /// The input fails to satisfy the constraints specified by an AWS service. - /// - /// REST API Reference for UpdateCampaignCommunicationLimits Operation - public virtual UpdateCampaignCommunicationLimitsResponse UpdateCampaignCommunicationLimits(UpdateCampaignCommunicationLimitsRequest request) - { - var options = new InvokeOptions(); - options.RequestMarshaller = UpdateCampaignCommunicationLimitsRequestMarshaller.Instance; - options.ResponseUnmarshaller = UpdateCampaignCommunicationLimitsResponseUnmarshaller.Instance; - - return Invoke(request, options); - } - - /// - /// Initiates the asynchronous execution of the UpdateCampaignCommunicationLimits operation. - /// - /// - /// Container for the necessary parameters to execute the UpdateCampaignCommunicationLimits operation on AmazonConnectCampaignsV2Client. - /// An AsyncCallback delegate that is invoked when the operation completes. - /// A user-defined state object that is passed to the callback procedure. Retrieve this object from within the callback - /// procedure using the AsyncState property. - /// - /// An IAsyncResult that can be used to poll or wait for results, or both; this value is also needed when invoking EndUpdateCampaignCommunicationLimits - /// operation. - /// REST API Reference for UpdateCampaignCommunicationLimits Operation - public virtual IAsyncResult BeginUpdateCampaignCommunicationLimits(UpdateCampaignCommunicationLimitsRequest request, AsyncCallback callback, object state) - { - var options = new InvokeOptions(); - options.RequestMarshaller = UpdateCampaignCommunicationLimitsRequestMarshaller.Instance; - options.ResponseUnmarshaller = UpdateCampaignCommunicationLimitsResponseUnmarshaller.Instance; - - return BeginInvoke(request, options, callback, state); - } - - /// - /// Finishes the asynchronous execution of the UpdateCampaignCommunicationLimits operation. - /// - /// - /// The IAsyncResult returned by the call to BeginUpdateCampaignCommunicationLimits. - /// - /// Returns a UpdateCampaignCommunicationLimitsResult from ConnectCampaignsV2. - /// REST API Reference for UpdateCampaignCommunicationLimits Operation - public virtual UpdateCampaignCommunicationLimitsResponse EndUpdateCampaignCommunicationLimits(IAsyncResult asyncResult) - { - return EndInvoke(asyncResult); - } - - #endregion - - #region UpdateCampaignCommunicationTime - - /// - /// Updates the communication time config for a campaign. This API is idempotent. - /// - /// Container for the necessary parameters to execute the UpdateCampaignCommunicationTime service method. - /// - /// The response from the UpdateCampaignCommunicationTime service method, as returned by ConnectCampaignsV2. - /// - /// You do not have sufficient access to perform this action. - /// - /// - /// The request could not be processed because of conflict in the current state of the - /// resource. - /// - /// - /// Request processing failed because of an error or failure with the service. - /// - /// - /// The request could not be processed because of conflict in the current state of the - /// campaign. - /// - /// - /// The specified resource was not found. - /// - /// - /// The input fails to satisfy the constraints specified by an AWS service. - /// - /// REST API Reference for UpdateCampaignCommunicationTime Operation - public virtual UpdateCampaignCommunicationTimeResponse UpdateCampaignCommunicationTime(UpdateCampaignCommunicationTimeRequest request) - { - var options = new InvokeOptions(); - options.RequestMarshaller = UpdateCampaignCommunicationTimeRequestMarshaller.Instance; - options.ResponseUnmarshaller = UpdateCampaignCommunicationTimeResponseUnmarshaller.Instance; - - return Invoke(request, options); - } - - /// - /// Initiates the asynchronous execution of the UpdateCampaignCommunicationTime operation. - /// - /// - /// Container for the necessary parameters to execute the UpdateCampaignCommunicationTime operation on AmazonConnectCampaignsV2Client. - /// An AsyncCallback delegate that is invoked when the operation completes. - /// A user-defined state object that is passed to the callback procedure. Retrieve this object from within the callback - /// procedure using the AsyncState property. - /// - /// An IAsyncResult that can be used to poll or wait for results, or both; this value is also needed when invoking EndUpdateCampaignCommunicationTime - /// operation. - /// REST API Reference for UpdateCampaignCommunicationTime Operation - public virtual IAsyncResult BeginUpdateCampaignCommunicationTime(UpdateCampaignCommunicationTimeRequest request, AsyncCallback callback, object state) - { - var options = new InvokeOptions(); - options.RequestMarshaller = UpdateCampaignCommunicationTimeRequestMarshaller.Instance; - options.ResponseUnmarshaller = UpdateCampaignCommunicationTimeResponseUnmarshaller.Instance; - - return BeginInvoke(request, options, callback, state); - } - - /// - /// Finishes the asynchronous execution of the UpdateCampaignCommunicationTime operation. - /// - /// - /// The IAsyncResult returned by the call to BeginUpdateCampaignCommunicationTime. - /// - /// Returns a UpdateCampaignCommunicationTimeResult from ConnectCampaignsV2. - /// REST API Reference for UpdateCampaignCommunicationTime Operation - public virtual UpdateCampaignCommunicationTimeResponse EndUpdateCampaignCommunicationTime(IAsyncResult asyncResult) - { - return EndInvoke(asyncResult); - } - - #endregion - - #region UpdateCampaignFlowAssociation - - /// - /// Updates the campaign flow associated with a campaign. This API is idempotent. - /// - /// Container for the necessary parameters to execute the UpdateCampaignFlowAssociation service method. - /// - /// The response from the UpdateCampaignFlowAssociation service method, as returned by ConnectCampaignsV2. - /// - /// You do not have sufficient access to perform this action. - /// - /// - /// The request could not be processed because of conflict in the current state of the - /// resource. - /// - /// - /// Request processing failed because of an error or failure with the service. - /// - /// - /// The request could not be processed because of conflict in the current state of the - /// campaign. - /// - /// - /// The specified resource was not found. - /// - /// - /// The input fails to satisfy the constraints specified by an AWS service. - /// - /// REST API Reference for UpdateCampaignFlowAssociation Operation - public virtual UpdateCampaignFlowAssociationResponse UpdateCampaignFlowAssociation(UpdateCampaignFlowAssociationRequest request) - { - var options = new InvokeOptions(); - options.RequestMarshaller = UpdateCampaignFlowAssociationRequestMarshaller.Instance; - options.ResponseUnmarshaller = UpdateCampaignFlowAssociationResponseUnmarshaller.Instance; - - return Invoke(request, options); - } - - /// - /// Initiates the asynchronous execution of the UpdateCampaignFlowAssociation operation. - /// - /// - /// Container for the necessary parameters to execute the UpdateCampaignFlowAssociation operation on AmazonConnectCampaignsV2Client. - /// An AsyncCallback delegate that is invoked when the operation completes. - /// A user-defined state object that is passed to the callback procedure. Retrieve this object from within the callback - /// procedure using the AsyncState property. - /// - /// An IAsyncResult that can be used to poll or wait for results, or both; this value is also needed when invoking EndUpdateCampaignFlowAssociation - /// operation. - /// REST API Reference for UpdateCampaignFlowAssociation Operation - public virtual IAsyncResult BeginUpdateCampaignFlowAssociation(UpdateCampaignFlowAssociationRequest request, AsyncCallback callback, object state) - { - var options = new InvokeOptions(); - options.RequestMarshaller = UpdateCampaignFlowAssociationRequestMarshaller.Instance; - options.ResponseUnmarshaller = UpdateCampaignFlowAssociationResponseUnmarshaller.Instance; - - return BeginInvoke(request, options, callback, state); - } - - /// - /// Finishes the asynchronous execution of the UpdateCampaignFlowAssociation operation. - /// - /// - /// The IAsyncResult returned by the call to BeginUpdateCampaignFlowAssociation. - /// - /// Returns a UpdateCampaignFlowAssociationResult from ConnectCampaignsV2. - /// REST API Reference for UpdateCampaignFlowAssociation Operation - public virtual UpdateCampaignFlowAssociationResponse EndUpdateCampaignFlowAssociation(IAsyncResult asyncResult) - { - return EndInvoke(asyncResult); - } - - #endregion - - #region UpdateCampaignName - - /// - /// Updates the name of a campaign. This API is idempotent. - /// - /// Container for the necessary parameters to execute the UpdateCampaignName service method. - /// - /// The response from the UpdateCampaignName service method, as returned by ConnectCampaignsV2. - /// - /// You do not have sufficient access to perform this action. - /// - /// - /// The request could not be processed because of conflict in the current state of the - /// resource. - /// - /// - /// Request processing failed because of an error or failure with the service. - /// - /// - /// The specified resource was not found. - /// - /// - /// The input fails to satisfy the constraints specified by an AWS service. - /// - /// REST API Reference for UpdateCampaignName Operation - public virtual UpdateCampaignNameResponse UpdateCampaignName(UpdateCampaignNameRequest request) - { - var options = new InvokeOptions(); - options.RequestMarshaller = UpdateCampaignNameRequestMarshaller.Instance; - options.ResponseUnmarshaller = UpdateCampaignNameResponseUnmarshaller.Instance; - - return Invoke(request, options); - } - - /// - /// Initiates the asynchronous execution of the UpdateCampaignName operation. - /// - /// - /// Container for the necessary parameters to execute the UpdateCampaignName operation on AmazonConnectCampaignsV2Client. - /// An AsyncCallback delegate that is invoked when the operation completes. - /// A user-defined state object that is passed to the callback procedure. Retrieve this object from within the callback - /// procedure using the AsyncState property. - /// - /// An IAsyncResult that can be used to poll or wait for results, or both; this value is also needed when invoking EndUpdateCampaignName - /// operation. - /// REST API Reference for UpdateCampaignName Operation - public virtual IAsyncResult BeginUpdateCampaignName(UpdateCampaignNameRequest request, AsyncCallback callback, object state) - { - var options = new InvokeOptions(); - options.RequestMarshaller = UpdateCampaignNameRequestMarshaller.Instance; - options.ResponseUnmarshaller = UpdateCampaignNameResponseUnmarshaller.Instance; - - return BeginInvoke(request, options, callback, state); - } - - /// - /// Finishes the asynchronous execution of the UpdateCampaignName operation. - /// - /// - /// The IAsyncResult returned by the call to BeginUpdateCampaignName. - /// - /// Returns a UpdateCampaignNameResult from ConnectCampaignsV2. - /// REST API Reference for UpdateCampaignName Operation - public virtual UpdateCampaignNameResponse EndUpdateCampaignName(IAsyncResult asyncResult) - { - return EndInvoke(asyncResult); - } - - #endregion - - #region UpdateCampaignSchedule - - /// - /// Updates the schedule for a campaign. This API is idempotent. - /// - /// Container for the necessary parameters to execute the UpdateCampaignSchedule service method. - /// - /// The response from the UpdateCampaignSchedule service method, as returned by ConnectCampaignsV2. - /// - /// You do not have sufficient access to perform this action. - /// - /// - /// The request could not be processed because of conflict in the current state of the - /// resource. - /// - /// - /// Request processing failed because of an error or failure with the service. - /// - /// - /// The request could not be processed because of conflict in the current state of the - /// campaign. - /// - /// - /// The specified resource was not found. - /// - /// - /// The input fails to satisfy the constraints specified by an AWS service. - /// - /// REST API Reference for UpdateCampaignSchedule Operation - public virtual UpdateCampaignScheduleResponse UpdateCampaignSchedule(UpdateCampaignScheduleRequest request) - { - var options = new InvokeOptions(); - options.RequestMarshaller = UpdateCampaignScheduleRequestMarshaller.Instance; - options.ResponseUnmarshaller = UpdateCampaignScheduleResponseUnmarshaller.Instance; - - return Invoke(request, options); - } - - /// - /// Initiates the asynchronous execution of the UpdateCampaignSchedule operation. - /// - /// - /// Container for the necessary parameters to execute the UpdateCampaignSchedule operation on AmazonConnectCampaignsV2Client. - /// An AsyncCallback delegate that is invoked when the operation completes. - /// A user-defined state object that is passed to the callback procedure. Retrieve this object from within the callback - /// procedure using the AsyncState property. - /// - /// An IAsyncResult that can be used to poll or wait for results, or both; this value is also needed when invoking EndUpdateCampaignSchedule - /// operation. - /// REST API Reference for UpdateCampaignSchedule Operation - public virtual IAsyncResult BeginUpdateCampaignSchedule(UpdateCampaignScheduleRequest request, AsyncCallback callback, object state) - { - var options = new InvokeOptions(); - options.RequestMarshaller = UpdateCampaignScheduleRequestMarshaller.Instance; - options.ResponseUnmarshaller = UpdateCampaignScheduleResponseUnmarshaller.Instance; - - return BeginInvoke(request, options, callback, state); - } - - /// - /// Finishes the asynchronous execution of the UpdateCampaignSchedule operation. - /// - /// - /// The IAsyncResult returned by the call to BeginUpdateCampaignSchedule. - /// - /// Returns a UpdateCampaignScheduleResult from ConnectCampaignsV2. - /// REST API Reference for UpdateCampaignSchedule Operation - public virtual UpdateCampaignScheduleResponse EndUpdateCampaignSchedule(IAsyncResult asyncResult) - { - return EndInvoke(asyncResult); - } - - #endregion - - #region UpdateCampaignSource - - /// - /// Updates the campaign source with a campaign. This API is idempotent. - /// - /// Container for the necessary parameters to execute the UpdateCampaignSource service method. - /// - /// The response from the UpdateCampaignSource service method, as returned by ConnectCampaignsV2. - /// - /// You do not have sufficient access to perform this action. - /// - /// - /// The request could not be processed because of conflict in the current state of the - /// resource. - /// - /// - /// Request processing failed because of an error or failure with the service. - /// - /// - /// The request could not be processed because of conflict in the current state of the - /// campaign. - /// - /// - /// The specified resource was not found. - /// - /// - /// The input fails to satisfy the constraints specified by an AWS service. - /// - /// REST API Reference for UpdateCampaignSource Operation - public virtual UpdateCampaignSourceResponse UpdateCampaignSource(UpdateCampaignSourceRequest request) - { - var options = new InvokeOptions(); - options.RequestMarshaller = UpdateCampaignSourceRequestMarshaller.Instance; - options.ResponseUnmarshaller = UpdateCampaignSourceResponseUnmarshaller.Instance; - - return Invoke(request, options); - } - - /// - /// Initiates the asynchronous execution of the UpdateCampaignSource operation. - /// - /// - /// Container for the necessary parameters to execute the UpdateCampaignSource operation on AmazonConnectCampaignsV2Client. - /// An AsyncCallback delegate that is invoked when the operation completes. - /// A user-defined state object that is passed to the callback procedure. Retrieve this object from within the callback - /// procedure using the AsyncState property. - /// - /// An IAsyncResult that can be used to poll or wait for results, or both; this value is also needed when invoking EndUpdateCampaignSource - /// operation. - /// REST API Reference for UpdateCampaignSource Operation - public virtual IAsyncResult BeginUpdateCampaignSource(UpdateCampaignSourceRequest request, AsyncCallback callback, object state) - { - var options = new InvokeOptions(); - options.RequestMarshaller = UpdateCampaignSourceRequestMarshaller.Instance; - options.ResponseUnmarshaller = UpdateCampaignSourceResponseUnmarshaller.Instance; - - return BeginInvoke(request, options, callback, state); - } - - /// - /// Finishes the asynchronous execution of the UpdateCampaignSource operation. - /// - /// - /// The IAsyncResult returned by the call to BeginUpdateCampaignSource. - /// - /// Returns a UpdateCampaignSourceResult from ConnectCampaignsV2. - /// REST API Reference for UpdateCampaignSource Operation - public virtual UpdateCampaignSourceResponse EndUpdateCampaignSource(IAsyncResult asyncResult) - { - return EndInvoke(asyncResult); - } - - #endregion - - #region DetermineServiceOperationEndpoint - - /// - /// Returns the endpoint that will be used for a particular request. - /// - /// Request for the desired service operation. - /// The resolved endpoint for the given request. - public Amazon.Runtime.Endpoints.Endpoint DetermineServiceOperationEndpoint(AmazonWebServiceRequest request) - { - var requestContext = new Amazon.Runtime.Internal.RequestContext(false, CreateSigner()) - { - ClientConfig = Config, - OriginalRequest = request, - Request = new Amazon.Runtime.Internal.DefaultRequest(request, ServiceMetadata.ServiceId) - }; - - var executionContext = new Amazon.Runtime.Internal.ExecutionContext(requestContext, null); - var resolver = new AmazonConnectCampaignsV2EndpointResolver(); - return resolver.GetEndpoint(executionContext); - } - - #endregion - - } -} \ No newline at end of file diff --git a/sdk/src/Services/ConnectCampaignsV2/Generated/_bcl35/IAmazonConnectCampaignsV2.cs b/sdk/src/Services/ConnectCampaignsV2/Generated/_bcl35/IAmazonConnectCampaignsV2.cs deleted file mode 100644 index 22310c1d211a..000000000000 --- a/sdk/src/Services/ConnectCampaignsV2/Generated/_bcl35/IAmazonConnectCampaignsV2.cs +++ /dev/null @@ -1,1897 +0,0 @@ -/* - * 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. - */ - -/* - * Do not modify this file. This file is generated from the connectcampaignsv2-2024-04-23.normal.json service model. - */ - - -using System; -using System.Collections.Generic; - -using Amazon.Runtime; -using Amazon.ConnectCampaignsV2.Model; - -#pragma warning disable CS1570 -namespace Amazon.ConnectCampaignsV2 -{ - /// - /// Interface for accessing ConnectCampaignsV2 - /// - /// Provide APIs to create and manage Amazon Connect Campaigns. - /// - public partial interface IAmazonConnectCampaignsV2 : IAmazonService, IDisposable - { - - -#if BCL45 || AWS_ASYNC_ENUMERABLES_API - /// - /// Paginators for the service - /// - IConnectCampaignsV2PaginatorFactory Paginators { get; } -#endif - - - - #region CreateCampaign - - - /// - /// Creates a campaign for the specified Amazon Connect account. This API is idempotent. - /// - /// Container for the necessary parameters to execute the CreateCampaign service method. - /// - /// The response from the CreateCampaign service method, as returned by ConnectCampaignsV2. - /// - /// You do not have sufficient access to perform this action. - /// - /// - /// The request could not be processed because of conflict in the current state of the - /// resource. - /// - /// - /// Request processing failed because of an error or failure with the service. - /// - /// - /// The specified resource was not found. - /// - /// - /// Request would cause a service quota to be exceeded. - /// - /// - /// The request was denied due to request throttling. - /// - /// - /// The input fails to satisfy the constraints specified by an AWS service. - /// - /// REST API Reference for CreateCampaign Operation - CreateCampaignResponse CreateCampaign(CreateCampaignRequest request); - - /// - /// Initiates the asynchronous execution of the CreateCampaign operation. - /// - /// - /// Container for the necessary parameters to execute the CreateCampaign operation on AmazonConnectCampaignsV2Client. - /// An AsyncCallback delegate that is invoked when the operation completes. - /// A user-defined state object that is passed to the callback procedure. Retrieve this object from within the callback - /// procedure using the AsyncState property. - /// - /// An IAsyncResult that can be used to poll or wait for results, or both; this value is also needed when invoking EndCreateCampaign - /// operation. - /// REST API Reference for CreateCampaign Operation - IAsyncResult BeginCreateCampaign(CreateCampaignRequest request, AsyncCallback callback, object state); - - - - /// - /// Finishes the asynchronous execution of the CreateCampaign operation. - /// - /// - /// The IAsyncResult returned by the call to BeginCreateCampaign. - /// - /// Returns a CreateCampaignResult from ConnectCampaignsV2. - /// REST API Reference for CreateCampaign Operation - CreateCampaignResponse EndCreateCampaign(IAsyncResult asyncResult); - - #endregion - - #region DeleteCampaign - - - /// - /// Deletes a campaign from the specified Amazon Connect account. - /// - /// Container for the necessary parameters to execute the DeleteCampaign service method. - /// - /// The response from the DeleteCampaign service method, as returned by ConnectCampaignsV2. - /// - /// You do not have sufficient access to perform this action. - /// - /// - /// Request processing failed because of an error or failure with the service. - /// - /// - /// The specified resource was not found. - /// - /// - /// The input fails to satisfy the constraints specified by an AWS service. - /// - /// REST API Reference for DeleteCampaign Operation - DeleteCampaignResponse DeleteCampaign(DeleteCampaignRequest request); - - /// - /// Initiates the asynchronous execution of the DeleteCampaign operation. - /// - /// - /// Container for the necessary parameters to execute the DeleteCampaign operation on AmazonConnectCampaignsV2Client. - /// An AsyncCallback delegate that is invoked when the operation completes. - /// A user-defined state object that is passed to the callback procedure. Retrieve this object from within the callback - /// procedure using the AsyncState property. - /// - /// An IAsyncResult that can be used to poll or wait for results, or both; this value is also needed when invoking EndDeleteCampaign - /// operation. - /// REST API Reference for DeleteCampaign Operation - IAsyncResult BeginDeleteCampaign(DeleteCampaignRequest request, AsyncCallback callback, object state); - - - - /// - /// Finishes the asynchronous execution of the DeleteCampaign operation. - /// - /// - /// The IAsyncResult returned by the call to BeginDeleteCampaign. - /// - /// Returns a DeleteCampaignResult from ConnectCampaignsV2. - /// REST API Reference for DeleteCampaign Operation - DeleteCampaignResponse EndDeleteCampaign(IAsyncResult asyncResult); - - #endregion - - #region DeleteCampaignChannelSubtypeConfig - - - /// - /// Deletes the channel subtype config of a campaign. This API is idempotent. - /// - /// Container for the necessary parameters to execute the DeleteCampaignChannelSubtypeConfig service method. - /// - /// The response from the DeleteCampaignChannelSubtypeConfig service method, as returned by ConnectCampaignsV2. - /// - /// You do not have sufficient access to perform this action. - /// - /// - /// The request could not be processed because of conflict in the current state of the - /// resource. - /// - /// - /// Request processing failed because of an error or failure with the service. - /// - /// - /// The specified resource was not found. - /// - /// - /// The input fails to satisfy the constraints specified by an AWS service. - /// - /// REST API Reference for DeleteCampaignChannelSubtypeConfig Operation - DeleteCampaignChannelSubtypeConfigResponse DeleteCampaignChannelSubtypeConfig(DeleteCampaignChannelSubtypeConfigRequest request); - - /// - /// Initiates the asynchronous execution of the DeleteCampaignChannelSubtypeConfig operation. - /// - /// - /// Container for the necessary parameters to execute the DeleteCampaignChannelSubtypeConfig operation on AmazonConnectCampaignsV2Client. - /// An AsyncCallback delegate that is invoked when the operation completes. - /// A user-defined state object that is passed to the callback procedure. Retrieve this object from within the callback - /// procedure using the AsyncState property. - /// - /// An IAsyncResult that can be used to poll or wait for results, or both; this value is also needed when invoking EndDeleteCampaignChannelSubtypeConfig - /// operation. - /// REST API Reference for DeleteCampaignChannelSubtypeConfig Operation - IAsyncResult BeginDeleteCampaignChannelSubtypeConfig(DeleteCampaignChannelSubtypeConfigRequest request, AsyncCallback callback, object state); - - - - /// - /// Finishes the asynchronous execution of the DeleteCampaignChannelSubtypeConfig operation. - /// - /// - /// The IAsyncResult returned by the call to BeginDeleteCampaignChannelSubtypeConfig. - /// - /// Returns a DeleteCampaignChannelSubtypeConfigResult from ConnectCampaignsV2. - /// REST API Reference for DeleteCampaignChannelSubtypeConfig Operation - DeleteCampaignChannelSubtypeConfigResponse EndDeleteCampaignChannelSubtypeConfig(IAsyncResult asyncResult); - - #endregion - - #region DeleteCampaignCommunicationLimits - - - /// - /// Deletes the communication limits config for a campaign. This API is idempotent. - /// - /// Container for the necessary parameters to execute the DeleteCampaignCommunicationLimits service method. - /// - /// The response from the DeleteCampaignCommunicationLimits service method, as returned by ConnectCampaignsV2. - /// - /// You do not have sufficient access to perform this action. - /// - /// - /// The request could not be processed because of conflict in the current state of the - /// resource. - /// - /// - /// Request processing failed because of an error or failure with the service. - /// - /// - /// The request could not be processed because of conflict in the current state of the - /// campaign. - /// - /// - /// The specified resource was not found. - /// - /// - /// The input fails to satisfy the constraints specified by an AWS service. - /// - /// REST API Reference for DeleteCampaignCommunicationLimits Operation - DeleteCampaignCommunicationLimitsResponse DeleteCampaignCommunicationLimits(DeleteCampaignCommunicationLimitsRequest request); - - /// - /// Initiates the asynchronous execution of the DeleteCampaignCommunicationLimits operation. - /// - /// - /// Container for the necessary parameters to execute the DeleteCampaignCommunicationLimits operation on AmazonConnectCampaignsV2Client. - /// An AsyncCallback delegate that is invoked when the operation completes. - /// A user-defined state object that is passed to the callback procedure. Retrieve this object from within the callback - /// procedure using the AsyncState property. - /// - /// An IAsyncResult that can be used to poll or wait for results, or both; this value is also needed when invoking EndDeleteCampaignCommunicationLimits - /// operation. - /// REST API Reference for DeleteCampaignCommunicationLimits Operation - IAsyncResult BeginDeleteCampaignCommunicationLimits(DeleteCampaignCommunicationLimitsRequest request, AsyncCallback callback, object state); - - - - /// - /// Finishes the asynchronous execution of the DeleteCampaignCommunicationLimits operation. - /// - /// - /// The IAsyncResult returned by the call to BeginDeleteCampaignCommunicationLimits. - /// - /// Returns a DeleteCampaignCommunicationLimitsResult from ConnectCampaignsV2. - /// REST API Reference for DeleteCampaignCommunicationLimits Operation - DeleteCampaignCommunicationLimitsResponse EndDeleteCampaignCommunicationLimits(IAsyncResult asyncResult); - - #endregion - - #region DeleteCampaignCommunicationTime - - - /// - /// Deletes the communication time config for a campaign. This API is idempotent. - /// - /// Container for the necessary parameters to execute the DeleteCampaignCommunicationTime service method. - /// - /// The response from the DeleteCampaignCommunicationTime service method, as returned by ConnectCampaignsV2. - /// - /// You do not have sufficient access to perform this action. - /// - /// - /// The request could not be processed because of conflict in the current state of the - /// resource. - /// - /// - /// Request processing failed because of an error or failure with the service. - /// - /// - /// The request could not be processed because of conflict in the current state of the - /// campaign. - /// - /// - /// The specified resource was not found. - /// - /// - /// The input fails to satisfy the constraints specified by an AWS service. - /// - /// REST API Reference for DeleteCampaignCommunicationTime Operation - DeleteCampaignCommunicationTimeResponse DeleteCampaignCommunicationTime(DeleteCampaignCommunicationTimeRequest request); - - /// - /// Initiates the asynchronous execution of the DeleteCampaignCommunicationTime operation. - /// - /// - /// Container for the necessary parameters to execute the DeleteCampaignCommunicationTime operation on AmazonConnectCampaignsV2Client. - /// An AsyncCallback delegate that is invoked when the operation completes. - /// A user-defined state object that is passed to the callback procedure. Retrieve this object from within the callback - /// procedure using the AsyncState property. - /// - /// An IAsyncResult that can be used to poll or wait for results, or both; this value is also needed when invoking EndDeleteCampaignCommunicationTime - /// operation. - /// REST API Reference for DeleteCampaignCommunicationTime Operation - IAsyncResult BeginDeleteCampaignCommunicationTime(DeleteCampaignCommunicationTimeRequest request, AsyncCallback callback, object state); - - - - /// - /// Finishes the asynchronous execution of the DeleteCampaignCommunicationTime operation. - /// - /// - /// The IAsyncResult returned by the call to BeginDeleteCampaignCommunicationTime. - /// - /// Returns a DeleteCampaignCommunicationTimeResult from ConnectCampaignsV2. - /// REST API Reference for DeleteCampaignCommunicationTime Operation - DeleteCampaignCommunicationTimeResponse EndDeleteCampaignCommunicationTime(IAsyncResult asyncResult); - - #endregion - - #region DeleteConnectInstanceConfig - - - /// - /// Deletes a connect instance config from the specified AWS account. - /// - /// Container for the necessary parameters to execute the DeleteConnectInstanceConfig service method. - /// - /// The response from the DeleteConnectInstanceConfig service method, as returned by ConnectCampaignsV2. - /// - /// You do not have sufficient access to perform this action. - /// - /// - /// Request processing failed because of an error or failure with the service. - /// - /// - /// The request could not be processed because of conflict in the current state. - /// - /// - /// The specified resource was not found. - /// - /// - /// The request was denied due to request throttling. - /// - /// - /// The input fails to satisfy the constraints specified by an AWS service. - /// - /// REST API Reference for DeleteConnectInstanceConfig Operation - DeleteConnectInstanceConfigResponse DeleteConnectInstanceConfig(DeleteConnectInstanceConfigRequest request); - - /// - /// Initiates the asynchronous execution of the DeleteConnectInstanceConfig operation. - /// - /// - /// Container for the necessary parameters to execute the DeleteConnectInstanceConfig operation on AmazonConnectCampaignsV2Client. - /// An AsyncCallback delegate that is invoked when the operation completes. - /// A user-defined state object that is passed to the callback procedure. Retrieve this object from within the callback - /// procedure using the AsyncState property. - /// - /// An IAsyncResult that can be used to poll or wait for results, or both; this value is also needed when invoking EndDeleteConnectInstanceConfig - /// operation. - /// REST API Reference for DeleteConnectInstanceConfig Operation - IAsyncResult BeginDeleteConnectInstanceConfig(DeleteConnectInstanceConfigRequest request, AsyncCallback callback, object state); - - - - /// - /// Finishes the asynchronous execution of the DeleteConnectInstanceConfig operation. - /// - /// - /// The IAsyncResult returned by the call to BeginDeleteConnectInstanceConfig. - /// - /// Returns a DeleteConnectInstanceConfigResult from ConnectCampaignsV2. - /// REST API Reference for DeleteConnectInstanceConfig Operation - DeleteConnectInstanceConfigResponse EndDeleteConnectInstanceConfig(IAsyncResult asyncResult); - - #endregion - - #region DeleteConnectInstanceIntegration - - - /// - /// Delete the integration for the specified Amazon Connect instance. - /// - /// Container for the necessary parameters to execute the DeleteConnectInstanceIntegration service method. - /// - /// The response from the DeleteConnectInstanceIntegration service method, as returned by ConnectCampaignsV2. - /// - /// You do not have sufficient access to perform this action. - /// - /// - /// Request processing failed because of an error or failure with the service. - /// - /// - /// The specified resource was not found. - /// - /// - /// The request was denied due to request throttling. - /// - /// - /// The input fails to satisfy the constraints specified by an AWS service. - /// - /// REST API Reference for DeleteConnectInstanceIntegration Operation - DeleteConnectInstanceIntegrationResponse DeleteConnectInstanceIntegration(DeleteConnectInstanceIntegrationRequest request); - - /// - /// Initiates the asynchronous execution of the DeleteConnectInstanceIntegration operation. - /// - /// - /// Container for the necessary parameters to execute the DeleteConnectInstanceIntegration operation on AmazonConnectCampaignsV2Client. - /// An AsyncCallback delegate that is invoked when the operation completes. - /// A user-defined state object that is passed to the callback procedure. Retrieve this object from within the callback - /// procedure using the AsyncState property. - /// - /// An IAsyncResult that can be used to poll or wait for results, or both; this value is also needed when invoking EndDeleteConnectInstanceIntegration - /// operation. - /// REST API Reference for DeleteConnectInstanceIntegration Operation - IAsyncResult BeginDeleteConnectInstanceIntegration(DeleteConnectInstanceIntegrationRequest request, AsyncCallback callback, object state); - - - - /// - /// Finishes the asynchronous execution of the DeleteConnectInstanceIntegration operation. - /// - /// - /// The IAsyncResult returned by the call to BeginDeleteConnectInstanceIntegration. - /// - /// Returns a DeleteConnectInstanceIntegrationResult from ConnectCampaignsV2. - /// REST API Reference for DeleteConnectInstanceIntegration Operation - DeleteConnectInstanceIntegrationResponse EndDeleteConnectInstanceIntegration(IAsyncResult asyncResult); - - #endregion - - #region DeleteInstanceOnboardingJob - - - /// - /// Delete the Connect Campaigns onboarding job for the specified Amazon Connect instance. - /// - /// Container for the necessary parameters to execute the DeleteInstanceOnboardingJob service method. - /// - /// The response from the DeleteInstanceOnboardingJob service method, as returned by ConnectCampaignsV2. - /// - /// You do not have sufficient access to perform this action. - /// - /// - /// Request processing failed because of an error or failure with the service. - /// - /// - /// The request could not be processed because of conflict in the current state. - /// - /// - /// The specified resource was not found. - /// - /// - /// The input fails to satisfy the constraints specified by an AWS service. - /// - /// REST API Reference for DeleteInstanceOnboardingJob Operation - DeleteInstanceOnboardingJobResponse DeleteInstanceOnboardingJob(DeleteInstanceOnboardingJobRequest request); - - /// - /// Initiates the asynchronous execution of the DeleteInstanceOnboardingJob operation. - /// - /// - /// Container for the necessary parameters to execute the DeleteInstanceOnboardingJob operation on AmazonConnectCampaignsV2Client. - /// An AsyncCallback delegate that is invoked when the operation completes. - /// A user-defined state object that is passed to the callback procedure. Retrieve this object from within the callback - /// procedure using the AsyncState property. - /// - /// An IAsyncResult that can be used to poll or wait for results, or both; this value is also needed when invoking EndDeleteInstanceOnboardingJob - /// operation. - /// REST API Reference for DeleteInstanceOnboardingJob Operation - IAsyncResult BeginDeleteInstanceOnboardingJob(DeleteInstanceOnboardingJobRequest request, AsyncCallback callback, object state); - - - - /// - /// Finishes the asynchronous execution of the DeleteInstanceOnboardingJob operation. - /// - /// - /// The IAsyncResult returned by the call to BeginDeleteInstanceOnboardingJob. - /// - /// Returns a DeleteInstanceOnboardingJobResult from ConnectCampaignsV2. - /// REST API Reference for DeleteInstanceOnboardingJob Operation - DeleteInstanceOnboardingJobResponse EndDeleteInstanceOnboardingJob(IAsyncResult asyncResult); - - #endregion - - #region DescribeCampaign - - - /// - /// Describes the specific campaign. - /// - /// Container for the necessary parameters to execute the DescribeCampaign service method. - /// - /// The response from the DescribeCampaign service method, as returned by ConnectCampaignsV2. - /// - /// You do not have sufficient access to perform this action. - /// - /// - /// Request processing failed because of an error or failure with the service. - /// - /// - /// The specified resource was not found. - /// - /// - /// The input fails to satisfy the constraints specified by an AWS service. - /// - /// REST API Reference for DescribeCampaign Operation - DescribeCampaignResponse DescribeCampaign(DescribeCampaignRequest request); - - /// - /// Initiates the asynchronous execution of the DescribeCampaign operation. - /// - /// - /// Container for the necessary parameters to execute the DescribeCampaign operation on AmazonConnectCampaignsV2Client. - /// An AsyncCallback delegate that is invoked when the operation completes. - /// A user-defined state object that is passed to the callback procedure. Retrieve this object from within the callback - /// procedure using the AsyncState property. - /// - /// An IAsyncResult that can be used to poll or wait for results, or both; this value is also needed when invoking EndDescribeCampaign - /// operation. - /// REST API Reference for DescribeCampaign Operation - IAsyncResult BeginDescribeCampaign(DescribeCampaignRequest request, AsyncCallback callback, object state); - - - - /// - /// Finishes the asynchronous execution of the DescribeCampaign operation. - /// - /// - /// The IAsyncResult returned by the call to BeginDescribeCampaign. - /// - /// Returns a DescribeCampaignResult from ConnectCampaignsV2. - /// REST API Reference for DescribeCampaign Operation - DescribeCampaignResponse EndDescribeCampaign(IAsyncResult asyncResult); - - #endregion - - #region GetCampaignState - - - /// - /// Get state of a campaign for the specified Amazon Connect account. - /// - /// Container for the necessary parameters to execute the GetCampaignState service method. - /// - /// The response from the GetCampaignState service method, as returned by ConnectCampaignsV2. - /// - /// You do not have sufficient access to perform this action. - /// - /// - /// Request processing failed because of an error or failure with the service. - /// - /// - /// The specified resource was not found. - /// - /// - /// The request was denied due to request throttling. - /// - /// - /// The input fails to satisfy the constraints specified by an AWS service. - /// - /// REST API Reference for GetCampaignState Operation - GetCampaignStateResponse GetCampaignState(GetCampaignStateRequest request); - - /// - /// Initiates the asynchronous execution of the GetCampaignState operation. - /// - /// - /// Container for the necessary parameters to execute the GetCampaignState operation on AmazonConnectCampaignsV2Client. - /// An AsyncCallback delegate that is invoked when the operation completes. - /// A user-defined state object that is passed to the callback procedure. Retrieve this object from within the callback - /// procedure using the AsyncState property. - /// - /// An IAsyncResult that can be used to poll or wait for results, or both; this value is also needed when invoking EndGetCampaignState - /// operation. - /// REST API Reference for GetCampaignState Operation - IAsyncResult BeginGetCampaignState(GetCampaignStateRequest request, AsyncCallback callback, object state); - - - - /// - /// Finishes the asynchronous execution of the GetCampaignState operation. - /// - /// - /// The IAsyncResult returned by the call to BeginGetCampaignState. - /// - /// Returns a GetCampaignStateResult from ConnectCampaignsV2. - /// REST API Reference for GetCampaignState Operation - GetCampaignStateResponse EndGetCampaignState(IAsyncResult asyncResult); - - #endregion - - #region GetCampaignStateBatch - - - /// - /// Get state of campaigns for the specified Amazon Connect account. - /// - /// Container for the necessary parameters to execute the GetCampaignStateBatch service method. - /// - /// The response from the GetCampaignStateBatch service method, as returned by ConnectCampaignsV2. - /// - /// You do not have sufficient access to perform this action. - /// - /// - /// Request processing failed because of an error or failure with the service. - /// - /// - /// The request was denied due to request throttling. - /// - /// - /// The input fails to satisfy the constraints specified by an AWS service. - /// - /// REST API Reference for GetCampaignStateBatch Operation - GetCampaignStateBatchResponse GetCampaignStateBatch(GetCampaignStateBatchRequest request); - - /// - /// Initiates the asynchronous execution of the GetCampaignStateBatch operation. - /// - /// - /// Container for the necessary parameters to execute the GetCampaignStateBatch operation on AmazonConnectCampaignsV2Client. - /// An AsyncCallback delegate that is invoked when the operation completes. - /// A user-defined state object that is passed to the callback procedure. Retrieve this object from within the callback - /// procedure using the AsyncState property. - /// - /// An IAsyncResult that can be used to poll or wait for results, or both; this value is also needed when invoking EndGetCampaignStateBatch - /// operation. - /// REST API Reference for GetCampaignStateBatch Operation - IAsyncResult BeginGetCampaignStateBatch(GetCampaignStateBatchRequest request, AsyncCallback callback, object state); - - - - /// - /// Finishes the asynchronous execution of the GetCampaignStateBatch operation. - /// - /// - /// The IAsyncResult returned by the call to BeginGetCampaignStateBatch. - /// - /// Returns a GetCampaignStateBatchResult from ConnectCampaignsV2. - /// REST API Reference for GetCampaignStateBatch Operation - GetCampaignStateBatchResponse EndGetCampaignStateBatch(IAsyncResult asyncResult); - - #endregion - - #region GetConnectInstanceConfig - - - /// - /// Get the specific Connect instance config. - /// - /// Container for the necessary parameters to execute the GetConnectInstanceConfig service method. - /// - /// The response from the GetConnectInstanceConfig service method, as returned by ConnectCampaignsV2. - /// - /// You do not have sufficient access to perform this action. - /// - /// - /// Request processing failed because of an error or failure with the service. - /// - /// - /// The specified resource was not found. - /// - /// - /// The input fails to satisfy the constraints specified by an AWS service. - /// - /// REST API Reference for GetConnectInstanceConfig Operation - GetConnectInstanceConfigResponse GetConnectInstanceConfig(GetConnectInstanceConfigRequest request); - - /// - /// Initiates the asynchronous execution of the GetConnectInstanceConfig operation. - /// - /// - /// Container for the necessary parameters to execute the GetConnectInstanceConfig operation on AmazonConnectCampaignsV2Client. - /// An AsyncCallback delegate that is invoked when the operation completes. - /// A user-defined state object that is passed to the callback procedure. Retrieve this object from within the callback - /// procedure using the AsyncState property. - /// - /// An IAsyncResult that can be used to poll or wait for results, or both; this value is also needed when invoking EndGetConnectInstanceConfig - /// operation. - /// REST API Reference for GetConnectInstanceConfig Operation - IAsyncResult BeginGetConnectInstanceConfig(GetConnectInstanceConfigRequest request, AsyncCallback callback, object state); - - - - /// - /// Finishes the asynchronous execution of the GetConnectInstanceConfig operation. - /// - /// - /// The IAsyncResult returned by the call to BeginGetConnectInstanceConfig. - /// - /// Returns a GetConnectInstanceConfigResult from ConnectCampaignsV2. - /// REST API Reference for GetConnectInstanceConfig Operation - GetConnectInstanceConfigResponse EndGetConnectInstanceConfig(IAsyncResult asyncResult); - - #endregion - - #region GetInstanceOnboardingJobStatus - - - /// - /// Get the specific instance onboarding job status. - /// - /// Container for the necessary parameters to execute the GetInstanceOnboardingJobStatus service method. - /// - /// The response from the GetInstanceOnboardingJobStatus service method, as returned by ConnectCampaignsV2. - /// - /// You do not have sufficient access to perform this action. - /// - /// - /// Request processing failed because of an error or failure with the service. - /// - /// - /// The specified resource was not found. - /// - /// - /// The input fails to satisfy the constraints specified by an AWS service. - /// - /// REST API Reference for GetInstanceOnboardingJobStatus Operation - GetInstanceOnboardingJobStatusResponse GetInstanceOnboardingJobStatus(GetInstanceOnboardingJobStatusRequest request); - - /// - /// Initiates the asynchronous execution of the GetInstanceOnboardingJobStatus operation. - /// - /// - /// Container for the necessary parameters to execute the GetInstanceOnboardingJobStatus operation on AmazonConnectCampaignsV2Client. - /// An AsyncCallback delegate that is invoked when the operation completes. - /// A user-defined state object that is passed to the callback procedure. Retrieve this object from within the callback - /// procedure using the AsyncState property. - /// - /// An IAsyncResult that can be used to poll or wait for results, or both; this value is also needed when invoking EndGetInstanceOnboardingJobStatus - /// operation. - /// REST API Reference for GetInstanceOnboardingJobStatus Operation - IAsyncResult BeginGetInstanceOnboardingJobStatus(GetInstanceOnboardingJobStatusRequest request, AsyncCallback callback, object state); - - - - /// - /// Finishes the asynchronous execution of the GetInstanceOnboardingJobStatus operation. - /// - /// - /// The IAsyncResult returned by the call to BeginGetInstanceOnboardingJobStatus. - /// - /// Returns a GetInstanceOnboardingJobStatusResult from ConnectCampaignsV2. - /// REST API Reference for GetInstanceOnboardingJobStatus Operation - GetInstanceOnboardingJobStatusResponse EndGetInstanceOnboardingJobStatus(IAsyncResult asyncResult); - - #endregion - - #region ListCampaigns - - - /// - /// Provides summary information about the campaigns under the specified Amazon Connect - /// account. - /// - /// Container for the necessary parameters to execute the ListCampaigns service method. - /// - /// The response from the ListCampaigns service method, as returned by ConnectCampaignsV2. - /// - /// You do not have sufficient access to perform this action. - /// - /// - /// Request processing failed because of an error or failure with the service. - /// - /// - /// The input fails to satisfy the constraints specified by an AWS service. - /// - /// REST API Reference for ListCampaigns Operation - ListCampaignsResponse ListCampaigns(ListCampaignsRequest request); - - /// - /// Initiates the asynchronous execution of the ListCampaigns operation. - /// - /// - /// Container for the necessary parameters to execute the ListCampaigns operation on AmazonConnectCampaignsV2Client. - /// An AsyncCallback delegate that is invoked when the operation completes. - /// A user-defined state object that is passed to the callback procedure. Retrieve this object from within the callback - /// procedure using the AsyncState property. - /// - /// An IAsyncResult that can be used to poll or wait for results, or both; this value is also needed when invoking EndListCampaigns - /// operation. - /// REST API Reference for ListCampaigns Operation - IAsyncResult BeginListCampaigns(ListCampaignsRequest request, AsyncCallback callback, object state); - - - - /// - /// Finishes the asynchronous execution of the ListCampaigns operation. - /// - /// - /// The IAsyncResult returned by the call to BeginListCampaigns. - /// - /// Returns a ListCampaignsResult from ConnectCampaignsV2. - /// REST API Reference for ListCampaigns Operation - ListCampaignsResponse EndListCampaigns(IAsyncResult asyncResult); - - #endregion - - #region ListConnectInstanceIntegrations - - - /// - /// Provides summary information about the integration under the specified Connect instance. - /// - /// Container for the necessary parameters to execute the ListConnectInstanceIntegrations service method. - /// - /// The response from the ListConnectInstanceIntegrations service method, as returned by ConnectCampaignsV2. - /// - /// You do not have sufficient access to perform this action. - /// - /// - /// Request processing failed because of an error or failure with the service. - /// - /// - /// The specified resource was not found. - /// - /// - /// The request was denied due to request throttling. - /// - /// - /// The input fails to satisfy the constraints specified by an AWS service. - /// - /// REST API Reference for ListConnectInstanceIntegrations Operation - ListConnectInstanceIntegrationsResponse ListConnectInstanceIntegrations(ListConnectInstanceIntegrationsRequest request); - - /// - /// Initiates the asynchronous execution of the ListConnectInstanceIntegrations operation. - /// - /// - /// Container for the necessary parameters to execute the ListConnectInstanceIntegrations operation on AmazonConnectCampaignsV2Client. - /// An AsyncCallback delegate that is invoked when the operation completes. - /// A user-defined state object that is passed to the callback procedure. Retrieve this object from within the callback - /// procedure using the AsyncState property. - /// - /// An IAsyncResult that can be used to poll or wait for results, or both; this value is also needed when invoking EndListConnectInstanceIntegrations - /// operation. - /// REST API Reference for ListConnectInstanceIntegrations Operation - IAsyncResult BeginListConnectInstanceIntegrations(ListConnectInstanceIntegrationsRequest request, AsyncCallback callback, object state); - - - - /// - /// Finishes the asynchronous execution of the ListConnectInstanceIntegrations operation. - /// - /// - /// The IAsyncResult returned by the call to BeginListConnectInstanceIntegrations. - /// - /// Returns a ListConnectInstanceIntegrationsResult from ConnectCampaignsV2. - /// REST API Reference for ListConnectInstanceIntegrations Operation - ListConnectInstanceIntegrationsResponse EndListConnectInstanceIntegrations(IAsyncResult asyncResult); - - #endregion - - #region ListTagsForResource - - - /// - /// List tags for a resource. - /// - /// Container for the necessary parameters to execute the ListTagsForResource service method. - /// - /// The response from the ListTagsForResource service method, as returned by ConnectCampaignsV2. - /// - /// You do not have sufficient access to perform this action. - /// - /// - /// Request processing failed because of an error or failure with the service. - /// - /// - /// The specified resource was not found. - /// - /// - /// The request was denied due to request throttling. - /// - /// - /// The input fails to satisfy the constraints specified by an AWS service. - /// - /// REST API Reference for ListTagsForResource Operation - ListTagsForResourceResponse ListTagsForResource(ListTagsForResourceRequest request); - - /// - /// Initiates the asynchronous execution of the ListTagsForResource operation. - /// - /// - /// Container for the necessary parameters to execute the ListTagsForResource operation on AmazonConnectCampaignsV2Client. - /// An AsyncCallback delegate that is invoked when the operation completes. - /// A user-defined state object that is passed to the callback procedure. Retrieve this object from within the callback - /// procedure using the AsyncState property. - /// - /// An IAsyncResult that can be used to poll or wait for results, or both; this value is also needed when invoking EndListTagsForResource - /// operation. - /// REST API Reference for ListTagsForResource Operation - IAsyncResult BeginListTagsForResource(ListTagsForResourceRequest request, AsyncCallback callback, object state); - - - - /// - /// Finishes the asynchronous execution of the ListTagsForResource operation. - /// - /// - /// The IAsyncResult returned by the call to BeginListTagsForResource. - /// - /// Returns a ListTagsForResourceResult from ConnectCampaignsV2. - /// REST API Reference for ListTagsForResource Operation - ListTagsForResourceResponse EndListTagsForResource(IAsyncResult asyncResult); - - #endregion - - #region PauseCampaign - - - /// - /// Pauses a campaign for the specified Amazon Connect account. - /// - /// Container for the necessary parameters to execute the PauseCampaign service method. - /// - /// The response from the PauseCampaign service method, as returned by ConnectCampaignsV2. - /// - /// You do not have sufficient access to perform this action. - /// - /// - /// The request could not be processed because of conflict in the current state of the - /// resource. - /// - /// - /// Request processing failed because of an error or failure with the service. - /// - /// - /// The request could not be processed because of conflict in the current state of the - /// campaign. - /// - /// - /// The specified resource was not found. - /// - /// - /// The request was denied due to request throttling. - /// - /// - /// The input fails to satisfy the constraints specified by an AWS service. - /// - /// REST API Reference for PauseCampaign Operation - PauseCampaignResponse PauseCampaign(PauseCampaignRequest request); - - /// - /// Initiates the asynchronous execution of the PauseCampaign operation. - /// - /// - /// Container for the necessary parameters to execute the PauseCampaign operation on AmazonConnectCampaignsV2Client. - /// An AsyncCallback delegate that is invoked when the operation completes. - /// A user-defined state object that is passed to the callback procedure. Retrieve this object from within the callback - /// procedure using the AsyncState property. - /// - /// An IAsyncResult that can be used to poll or wait for results, or both; this value is also needed when invoking EndPauseCampaign - /// operation. - /// REST API Reference for PauseCampaign Operation - IAsyncResult BeginPauseCampaign(PauseCampaignRequest request, AsyncCallback callback, object state); - - - - /// - /// Finishes the asynchronous execution of the PauseCampaign operation. - /// - /// - /// The IAsyncResult returned by the call to BeginPauseCampaign. - /// - /// Returns a PauseCampaignResult from ConnectCampaignsV2. - /// REST API Reference for PauseCampaign Operation - PauseCampaignResponse EndPauseCampaign(IAsyncResult asyncResult); - - #endregion - - #region PutConnectInstanceIntegration - - - /// - /// Put or update the integration for the specified Amazon Connect instance. - /// - /// Container for the necessary parameters to execute the PutConnectInstanceIntegration service method. - /// - /// The response from the PutConnectInstanceIntegration service method, as returned by ConnectCampaignsV2. - /// - /// You do not have sufficient access to perform this action. - /// - /// - /// The request could not be processed because of conflict in the current state of the - /// resource. - /// - /// - /// Request processing failed because of an error or failure with the service. - /// - /// - /// The specified resource was not found. - /// - /// - /// The request was denied due to request throttling. - /// - /// - /// The input fails to satisfy the constraints specified by an AWS service. - /// - /// REST API Reference for PutConnectInstanceIntegration Operation - PutConnectInstanceIntegrationResponse PutConnectInstanceIntegration(PutConnectInstanceIntegrationRequest request); - - /// - /// Initiates the asynchronous execution of the PutConnectInstanceIntegration operation. - /// - /// - /// Container for the necessary parameters to execute the PutConnectInstanceIntegration operation on AmazonConnectCampaignsV2Client. - /// An AsyncCallback delegate that is invoked when the operation completes. - /// A user-defined state object that is passed to the callback procedure. Retrieve this object from within the callback - /// procedure using the AsyncState property. - /// - /// An IAsyncResult that can be used to poll or wait for results, or both; this value is also needed when invoking EndPutConnectInstanceIntegration - /// operation. - /// REST API Reference for PutConnectInstanceIntegration Operation - IAsyncResult BeginPutConnectInstanceIntegration(PutConnectInstanceIntegrationRequest request, AsyncCallback callback, object state); - - - - /// - /// Finishes the asynchronous execution of the PutConnectInstanceIntegration operation. - /// - /// - /// The IAsyncResult returned by the call to BeginPutConnectInstanceIntegration. - /// - /// Returns a PutConnectInstanceIntegrationResult from ConnectCampaignsV2. - /// REST API Reference for PutConnectInstanceIntegration Operation - PutConnectInstanceIntegrationResponse EndPutConnectInstanceIntegration(IAsyncResult asyncResult); - - #endregion - - #region PutOutboundRequestBatch - - - /// - /// Creates outbound requests for the specified campaign Amazon Connect account. This - /// API is idempotent. - /// - /// Container for the necessary parameters to execute the PutOutboundRequestBatch service method. - /// - /// The response from the PutOutboundRequestBatch service method, as returned by ConnectCampaignsV2. - /// - /// You do not have sufficient access to perform this action. - /// - /// - /// The request could not be processed because of conflict in the current state of the - /// resource. - /// - /// - /// Request processing failed because of an error or failure with the service. - /// - /// - /// The request could not be processed because of conflict in the current state of the - /// campaign. - /// - /// - /// The specified resource was not found. - /// - /// - /// The request was denied due to request throttling. - /// - /// - /// The input fails to satisfy the constraints specified by an AWS service. - /// - /// REST API Reference for PutOutboundRequestBatch Operation - PutOutboundRequestBatchResponse PutOutboundRequestBatch(PutOutboundRequestBatchRequest request); - - /// - /// Initiates the asynchronous execution of the PutOutboundRequestBatch operation. - /// - /// - /// Container for the necessary parameters to execute the PutOutboundRequestBatch operation on AmazonConnectCampaignsV2Client. - /// An AsyncCallback delegate that is invoked when the operation completes. - /// A user-defined state object that is passed to the callback procedure. Retrieve this object from within the callback - /// procedure using the AsyncState property. - /// - /// An IAsyncResult that can be used to poll or wait for results, or both; this value is also needed when invoking EndPutOutboundRequestBatch - /// operation. - /// REST API Reference for PutOutboundRequestBatch Operation - IAsyncResult BeginPutOutboundRequestBatch(PutOutboundRequestBatchRequest request, AsyncCallback callback, object state); - - - - /// - /// Finishes the asynchronous execution of the PutOutboundRequestBatch operation. - /// - /// - /// The IAsyncResult returned by the call to BeginPutOutboundRequestBatch. - /// - /// Returns a PutOutboundRequestBatchResult from ConnectCampaignsV2. - /// REST API Reference for PutOutboundRequestBatch Operation - PutOutboundRequestBatchResponse EndPutOutboundRequestBatch(IAsyncResult asyncResult); - - #endregion - - #region ResumeCampaign - - - /// - /// Stops a campaign for the specified Amazon Connect account. - /// - /// Container for the necessary parameters to execute the ResumeCampaign service method. - /// - /// The response from the ResumeCampaign service method, as returned by ConnectCampaignsV2. - /// - /// You do not have sufficient access to perform this action. - /// - /// - /// The request could not be processed because of conflict in the current state of the - /// resource. - /// - /// - /// Request processing failed because of an error or failure with the service. - /// - /// - /// The request could not be processed because of conflict in the current state of the - /// campaign. - /// - /// - /// The specified resource was not found. - /// - /// - /// The request was denied due to request throttling. - /// - /// - /// The input fails to satisfy the constraints specified by an AWS service. - /// - /// REST API Reference for ResumeCampaign Operation - ResumeCampaignResponse ResumeCampaign(ResumeCampaignRequest request); - - /// - /// Initiates the asynchronous execution of the ResumeCampaign operation. - /// - /// - /// Container for the necessary parameters to execute the ResumeCampaign operation on AmazonConnectCampaignsV2Client. - /// An AsyncCallback delegate that is invoked when the operation completes. - /// A user-defined state object that is passed to the callback procedure. Retrieve this object from within the callback - /// procedure using the AsyncState property. - /// - /// An IAsyncResult that can be used to poll or wait for results, or both; this value is also needed when invoking EndResumeCampaign - /// operation. - /// REST API Reference for ResumeCampaign Operation - IAsyncResult BeginResumeCampaign(ResumeCampaignRequest request, AsyncCallback callback, object state); - - - - /// - /// Finishes the asynchronous execution of the ResumeCampaign operation. - /// - /// - /// The IAsyncResult returned by the call to BeginResumeCampaign. - /// - /// Returns a ResumeCampaignResult from ConnectCampaignsV2. - /// REST API Reference for ResumeCampaign Operation - ResumeCampaignResponse EndResumeCampaign(IAsyncResult asyncResult); - - #endregion - - #region StartCampaign - - - /// - /// Starts a campaign for the specified Amazon Connect account. - /// - /// Container for the necessary parameters to execute the StartCampaign service method. - /// - /// The response from the StartCampaign service method, as returned by ConnectCampaignsV2. - /// - /// You do not have sufficient access to perform this action. - /// - /// - /// The request could not be processed because of conflict in the current state of the - /// resource. - /// - /// - /// Request processing failed because of an error or failure with the service. - /// - /// - /// The request could not be processed because of conflict in the current state of the - /// campaign. - /// - /// - /// The specified resource was not found. - /// - /// - /// The request was denied due to request throttling. - /// - /// - /// The input fails to satisfy the constraints specified by an AWS service. - /// - /// REST API Reference for StartCampaign Operation - StartCampaignResponse StartCampaign(StartCampaignRequest request); - - /// - /// Initiates the asynchronous execution of the StartCampaign operation. - /// - /// - /// Container for the necessary parameters to execute the StartCampaign operation on AmazonConnectCampaignsV2Client. - /// An AsyncCallback delegate that is invoked when the operation completes. - /// A user-defined state object that is passed to the callback procedure. Retrieve this object from within the callback - /// procedure using the AsyncState property. - /// - /// An IAsyncResult that can be used to poll or wait for results, or both; this value is also needed when invoking EndStartCampaign - /// operation. - /// REST API Reference for StartCampaign Operation - IAsyncResult BeginStartCampaign(StartCampaignRequest request, AsyncCallback callback, object state); - - - - /// - /// Finishes the asynchronous execution of the StartCampaign operation. - /// - /// - /// The IAsyncResult returned by the call to BeginStartCampaign. - /// - /// Returns a StartCampaignResult from ConnectCampaignsV2. - /// REST API Reference for StartCampaign Operation - StartCampaignResponse EndStartCampaign(IAsyncResult asyncResult); - - #endregion - - #region StartInstanceOnboardingJob - - - /// - /// Onboard the specific Amazon Connect instance to Connect Campaigns. - /// - /// Container for the necessary parameters to execute the StartInstanceOnboardingJob service method. - /// - /// The response from the StartInstanceOnboardingJob service method, as returned by ConnectCampaignsV2. - /// - /// You do not have sufficient access to perform this action. - /// - /// - /// The request could not be processed because of conflict in the current state of the - /// resource. - /// - /// - /// Request processing failed because of an error or failure with the service. - /// - /// - /// The specified resource was not found. - /// - /// - /// The request was denied due to request throttling. - /// - /// - /// The input fails to satisfy the constraints specified by an AWS service. - /// - /// REST API Reference for StartInstanceOnboardingJob Operation - StartInstanceOnboardingJobResponse StartInstanceOnboardingJob(StartInstanceOnboardingJobRequest request); - - /// - /// Initiates the asynchronous execution of the StartInstanceOnboardingJob operation. - /// - /// - /// Container for the necessary parameters to execute the StartInstanceOnboardingJob operation on AmazonConnectCampaignsV2Client. - /// An AsyncCallback delegate that is invoked when the operation completes. - /// A user-defined state object that is passed to the callback procedure. Retrieve this object from within the callback - /// procedure using the AsyncState property. - /// - /// An IAsyncResult that can be used to poll or wait for results, or both; this value is also needed when invoking EndStartInstanceOnboardingJob - /// operation. - /// REST API Reference for StartInstanceOnboardingJob Operation - IAsyncResult BeginStartInstanceOnboardingJob(StartInstanceOnboardingJobRequest request, AsyncCallback callback, object state); - - - - /// - /// Finishes the asynchronous execution of the StartInstanceOnboardingJob operation. - /// - /// - /// The IAsyncResult returned by the call to BeginStartInstanceOnboardingJob. - /// - /// Returns a StartInstanceOnboardingJobResult from ConnectCampaignsV2. - /// REST API Reference for StartInstanceOnboardingJob Operation - StartInstanceOnboardingJobResponse EndStartInstanceOnboardingJob(IAsyncResult asyncResult); - - #endregion - - #region StopCampaign - - - /// - /// Stops a campaign for the specified Amazon Connect account. - /// - /// Container for the necessary parameters to execute the StopCampaign service method. - /// - /// The response from the StopCampaign service method, as returned by ConnectCampaignsV2. - /// - /// You do not have sufficient access to perform this action. - /// - /// - /// The request could not be processed because of conflict in the current state of the - /// resource. - /// - /// - /// Request processing failed because of an error or failure with the service. - /// - /// - /// The request could not be processed because of conflict in the current state of the - /// campaign. - /// - /// - /// The specified resource was not found. - /// - /// - /// The request was denied due to request throttling. - /// - /// - /// The input fails to satisfy the constraints specified by an AWS service. - /// - /// REST API Reference for StopCampaign Operation - StopCampaignResponse StopCampaign(StopCampaignRequest request); - - /// - /// Initiates the asynchronous execution of the StopCampaign operation. - /// - /// - /// Container for the necessary parameters to execute the StopCampaign operation on AmazonConnectCampaignsV2Client. - /// An AsyncCallback delegate that is invoked when the operation completes. - /// A user-defined state object that is passed to the callback procedure. Retrieve this object from within the callback - /// procedure using the AsyncState property. - /// - /// An IAsyncResult that can be used to poll or wait for results, or both; this value is also needed when invoking EndStopCampaign - /// operation. - /// REST API Reference for StopCampaign Operation - IAsyncResult BeginStopCampaign(StopCampaignRequest request, AsyncCallback callback, object state); - - - - /// - /// Finishes the asynchronous execution of the StopCampaign operation. - /// - /// - /// The IAsyncResult returned by the call to BeginStopCampaign. - /// - /// Returns a StopCampaignResult from ConnectCampaignsV2. - /// REST API Reference for StopCampaign Operation - StopCampaignResponse EndStopCampaign(IAsyncResult asyncResult); - - #endregion - - #region TagResource - - - /// - /// Tag a resource. - /// - /// Container for the necessary parameters to execute the TagResource service method. - /// - /// The response from the TagResource service method, as returned by ConnectCampaignsV2. - /// - /// You do not have sufficient access to perform this action. - /// - /// - /// Request processing failed because of an error or failure with the service. - /// - /// - /// The specified resource was not found. - /// - /// - /// The request was denied due to request throttling. - /// - /// - /// The input fails to satisfy the constraints specified by an AWS service. - /// - /// REST API Reference for TagResource Operation - TagResourceResponse TagResource(TagResourceRequest request); - - /// - /// Initiates the asynchronous execution of the TagResource operation. - /// - /// - /// Container for the necessary parameters to execute the TagResource operation on AmazonConnectCampaignsV2Client. - /// An AsyncCallback delegate that is invoked when the operation completes. - /// A user-defined state object that is passed to the callback procedure. Retrieve this object from within the callback - /// procedure using the AsyncState property. - /// - /// An IAsyncResult that can be used to poll or wait for results, or both; this value is also needed when invoking EndTagResource - /// operation. - /// REST API Reference for TagResource Operation - IAsyncResult BeginTagResource(TagResourceRequest request, AsyncCallback callback, object state); - - - - /// - /// Finishes the asynchronous execution of the TagResource operation. - /// - /// - /// The IAsyncResult returned by the call to BeginTagResource. - /// - /// Returns a TagResourceResult from ConnectCampaignsV2. - /// REST API Reference for TagResource Operation - TagResourceResponse EndTagResource(IAsyncResult asyncResult); - - #endregion - - #region UntagResource - - - /// - /// Untag a resource. - /// - /// Container for the necessary parameters to execute the UntagResource service method. - /// - /// The response from the UntagResource service method, as returned by ConnectCampaignsV2. - /// - /// You do not have sufficient access to perform this action. - /// - /// - /// Request processing failed because of an error or failure with the service. - /// - /// - /// The specified resource was not found. - /// - /// - /// The request was denied due to request throttling. - /// - /// - /// The input fails to satisfy the constraints specified by an AWS service. - /// - /// REST API Reference for UntagResource Operation - UntagResourceResponse UntagResource(UntagResourceRequest request); - - /// - /// Initiates the asynchronous execution of the UntagResource operation. - /// - /// - /// Container for the necessary parameters to execute the UntagResource operation on AmazonConnectCampaignsV2Client. - /// An AsyncCallback delegate that is invoked when the operation completes. - /// A user-defined state object that is passed to the callback procedure. Retrieve this object from within the callback - /// procedure using the AsyncState property. - /// - /// An IAsyncResult that can be used to poll or wait for results, or both; this value is also needed when invoking EndUntagResource - /// operation. - /// REST API Reference for UntagResource Operation - IAsyncResult BeginUntagResource(UntagResourceRequest request, AsyncCallback callback, object state); - - - - /// - /// Finishes the asynchronous execution of the UntagResource operation. - /// - /// - /// The IAsyncResult returned by the call to BeginUntagResource. - /// - /// Returns a UntagResourceResult from ConnectCampaignsV2. - /// REST API Reference for UntagResource Operation - UntagResourceResponse EndUntagResource(IAsyncResult asyncResult); - - #endregion - - #region UpdateCampaignChannelSubtypeConfig - - - /// - /// Updates the channel subtype config of a campaign. This API is idempotent. - /// - /// Container for the necessary parameters to execute the UpdateCampaignChannelSubtypeConfig service method. - /// - /// The response from the UpdateCampaignChannelSubtypeConfig service method, as returned by ConnectCampaignsV2. - /// - /// You do not have sufficient access to perform this action. - /// - /// - /// The request could not be processed because of conflict in the current state of the - /// resource. - /// - /// - /// Request processing failed because of an error or failure with the service. - /// - /// - /// The specified resource was not found. - /// - /// - /// The input fails to satisfy the constraints specified by an AWS service. - /// - /// REST API Reference for UpdateCampaignChannelSubtypeConfig Operation - UpdateCampaignChannelSubtypeConfigResponse UpdateCampaignChannelSubtypeConfig(UpdateCampaignChannelSubtypeConfigRequest request); - - /// - /// Initiates the asynchronous execution of the UpdateCampaignChannelSubtypeConfig operation. - /// - /// - /// Container for the necessary parameters to execute the UpdateCampaignChannelSubtypeConfig operation on AmazonConnectCampaignsV2Client. - /// An AsyncCallback delegate that is invoked when the operation completes. - /// A user-defined state object that is passed to the callback procedure. Retrieve this object from within the callback - /// procedure using the AsyncState property. - /// - /// An IAsyncResult that can be used to poll or wait for results, or both; this value is also needed when invoking EndUpdateCampaignChannelSubtypeConfig - /// operation. - /// REST API Reference for UpdateCampaignChannelSubtypeConfig Operation - IAsyncResult BeginUpdateCampaignChannelSubtypeConfig(UpdateCampaignChannelSubtypeConfigRequest request, AsyncCallback callback, object state); - - - - /// - /// Finishes the asynchronous execution of the UpdateCampaignChannelSubtypeConfig operation. - /// - /// - /// The IAsyncResult returned by the call to BeginUpdateCampaignChannelSubtypeConfig. - /// - /// Returns a UpdateCampaignChannelSubtypeConfigResult from ConnectCampaignsV2. - /// REST API Reference for UpdateCampaignChannelSubtypeConfig Operation - UpdateCampaignChannelSubtypeConfigResponse EndUpdateCampaignChannelSubtypeConfig(IAsyncResult asyncResult); - - #endregion - - #region UpdateCampaignCommunicationLimits - - - /// - /// Updates the communication limits config for a campaign. This API is idempotent. - /// - /// Container for the necessary parameters to execute the UpdateCampaignCommunicationLimits service method. - /// - /// The response from the UpdateCampaignCommunicationLimits service method, as returned by ConnectCampaignsV2. - /// - /// You do not have sufficient access to perform this action. - /// - /// - /// The request could not be processed because of conflict in the current state of the - /// resource. - /// - /// - /// Request processing failed because of an error or failure with the service. - /// - /// - /// The request could not be processed because of conflict in the current state of the - /// campaign. - /// - /// - /// The specified resource was not found. - /// - /// - /// The input fails to satisfy the constraints specified by an AWS service. - /// - /// REST API Reference for UpdateCampaignCommunicationLimits Operation - UpdateCampaignCommunicationLimitsResponse UpdateCampaignCommunicationLimits(UpdateCampaignCommunicationLimitsRequest request); - - /// - /// Initiates the asynchronous execution of the UpdateCampaignCommunicationLimits operation. - /// - /// - /// Container for the necessary parameters to execute the UpdateCampaignCommunicationLimits operation on AmazonConnectCampaignsV2Client. - /// An AsyncCallback delegate that is invoked when the operation completes. - /// A user-defined state object that is passed to the callback procedure. Retrieve this object from within the callback - /// procedure using the AsyncState property. - /// - /// An IAsyncResult that can be used to poll or wait for results, or both; this value is also needed when invoking EndUpdateCampaignCommunicationLimits - /// operation. - /// REST API Reference for UpdateCampaignCommunicationLimits Operation - IAsyncResult BeginUpdateCampaignCommunicationLimits(UpdateCampaignCommunicationLimitsRequest request, AsyncCallback callback, object state); - - - - /// - /// Finishes the asynchronous execution of the UpdateCampaignCommunicationLimits operation. - /// - /// - /// The IAsyncResult returned by the call to BeginUpdateCampaignCommunicationLimits. - /// - /// Returns a UpdateCampaignCommunicationLimitsResult from ConnectCampaignsV2. - /// REST API Reference for UpdateCampaignCommunicationLimits Operation - UpdateCampaignCommunicationLimitsResponse EndUpdateCampaignCommunicationLimits(IAsyncResult asyncResult); - - #endregion - - #region UpdateCampaignCommunicationTime - - - /// - /// Updates the communication time config for a campaign. This API is idempotent. - /// - /// Container for the necessary parameters to execute the UpdateCampaignCommunicationTime service method. - /// - /// The response from the UpdateCampaignCommunicationTime service method, as returned by ConnectCampaignsV2. - /// - /// You do not have sufficient access to perform this action. - /// - /// - /// The request could not be processed because of conflict in the current state of the - /// resource. - /// - /// - /// Request processing failed because of an error or failure with the service. - /// - /// - /// The request could not be processed because of conflict in the current state of the - /// campaign. - /// - /// - /// The specified resource was not found. - /// - /// - /// The input fails to satisfy the constraints specified by an AWS service. - /// - /// REST API Reference for UpdateCampaignCommunicationTime Operation - UpdateCampaignCommunicationTimeResponse UpdateCampaignCommunicationTime(UpdateCampaignCommunicationTimeRequest request); - - /// - /// Initiates the asynchronous execution of the UpdateCampaignCommunicationTime operation. - /// - /// - /// Container for the necessary parameters to execute the UpdateCampaignCommunicationTime operation on AmazonConnectCampaignsV2Client. - /// An AsyncCallback delegate that is invoked when the operation completes. - /// A user-defined state object that is passed to the callback procedure. Retrieve this object from within the callback - /// procedure using the AsyncState property. - /// - /// An IAsyncResult that can be used to poll or wait for results, or both; this value is also needed when invoking EndUpdateCampaignCommunicationTime - /// operation. - /// REST API Reference for UpdateCampaignCommunicationTime Operation - IAsyncResult BeginUpdateCampaignCommunicationTime(UpdateCampaignCommunicationTimeRequest request, AsyncCallback callback, object state); - - - - /// - /// Finishes the asynchronous execution of the UpdateCampaignCommunicationTime operation. - /// - /// - /// The IAsyncResult returned by the call to BeginUpdateCampaignCommunicationTime. - /// - /// Returns a UpdateCampaignCommunicationTimeResult from ConnectCampaignsV2. - /// REST API Reference for UpdateCampaignCommunicationTime Operation - UpdateCampaignCommunicationTimeResponse EndUpdateCampaignCommunicationTime(IAsyncResult asyncResult); - - #endregion - - #region UpdateCampaignFlowAssociation - - - /// - /// Updates the campaign flow associated with a campaign. This API is idempotent. - /// - /// Container for the necessary parameters to execute the UpdateCampaignFlowAssociation service method. - /// - /// The response from the UpdateCampaignFlowAssociation service method, as returned by ConnectCampaignsV2. - /// - /// You do not have sufficient access to perform this action. - /// - /// - /// The request could not be processed because of conflict in the current state of the - /// resource. - /// - /// - /// Request processing failed because of an error or failure with the service. - /// - /// - /// The request could not be processed because of conflict in the current state of the - /// campaign. - /// - /// - /// The specified resource was not found. - /// - /// - /// The input fails to satisfy the constraints specified by an AWS service. - /// - /// REST API Reference for UpdateCampaignFlowAssociation Operation - UpdateCampaignFlowAssociationResponse UpdateCampaignFlowAssociation(UpdateCampaignFlowAssociationRequest request); - - /// - /// Initiates the asynchronous execution of the UpdateCampaignFlowAssociation operation. - /// - /// - /// Container for the necessary parameters to execute the UpdateCampaignFlowAssociation operation on AmazonConnectCampaignsV2Client. - /// An AsyncCallback delegate that is invoked when the operation completes. - /// A user-defined state object that is passed to the callback procedure. Retrieve this object from within the callback - /// procedure using the AsyncState property. - /// - /// An IAsyncResult that can be used to poll or wait for results, or both; this value is also needed when invoking EndUpdateCampaignFlowAssociation - /// operation. - /// REST API Reference for UpdateCampaignFlowAssociation Operation - IAsyncResult BeginUpdateCampaignFlowAssociation(UpdateCampaignFlowAssociationRequest request, AsyncCallback callback, object state); - - - - /// - /// Finishes the asynchronous execution of the UpdateCampaignFlowAssociation operation. - /// - /// - /// The IAsyncResult returned by the call to BeginUpdateCampaignFlowAssociation. - /// - /// Returns a UpdateCampaignFlowAssociationResult from ConnectCampaignsV2. - /// REST API Reference for UpdateCampaignFlowAssociation Operation - UpdateCampaignFlowAssociationResponse EndUpdateCampaignFlowAssociation(IAsyncResult asyncResult); - - #endregion - - #region UpdateCampaignName - - - /// - /// Updates the name of a campaign. This API is idempotent. - /// - /// Container for the necessary parameters to execute the UpdateCampaignName service method. - /// - /// The response from the UpdateCampaignName service method, as returned by ConnectCampaignsV2. - /// - /// You do not have sufficient access to perform this action. - /// - /// - /// The request could not be processed because of conflict in the current state of the - /// resource. - /// - /// - /// Request processing failed because of an error or failure with the service. - /// - /// - /// The specified resource was not found. - /// - /// - /// The input fails to satisfy the constraints specified by an AWS service. - /// - /// REST API Reference for UpdateCampaignName Operation - UpdateCampaignNameResponse UpdateCampaignName(UpdateCampaignNameRequest request); - - /// - /// Initiates the asynchronous execution of the UpdateCampaignName operation. - /// - /// - /// Container for the necessary parameters to execute the UpdateCampaignName operation on AmazonConnectCampaignsV2Client. - /// An AsyncCallback delegate that is invoked when the operation completes. - /// A user-defined state object that is passed to the callback procedure. Retrieve this object from within the callback - /// procedure using the AsyncState property. - /// - /// An IAsyncResult that can be used to poll or wait for results, or both; this value is also needed when invoking EndUpdateCampaignName - /// operation. - /// REST API Reference for UpdateCampaignName Operation - IAsyncResult BeginUpdateCampaignName(UpdateCampaignNameRequest request, AsyncCallback callback, object state); - - - - /// - /// Finishes the asynchronous execution of the UpdateCampaignName operation. - /// - /// - /// The IAsyncResult returned by the call to BeginUpdateCampaignName. - /// - /// Returns a UpdateCampaignNameResult from ConnectCampaignsV2. - /// REST API Reference for UpdateCampaignName Operation - UpdateCampaignNameResponse EndUpdateCampaignName(IAsyncResult asyncResult); - - #endregion - - #region UpdateCampaignSchedule - - - /// - /// Updates the schedule for a campaign. This API is idempotent. - /// - /// Container for the necessary parameters to execute the UpdateCampaignSchedule service method. - /// - /// The response from the UpdateCampaignSchedule service method, as returned by ConnectCampaignsV2. - /// - /// You do not have sufficient access to perform this action. - /// - /// - /// The request could not be processed because of conflict in the current state of the - /// resource. - /// - /// - /// Request processing failed because of an error or failure with the service. - /// - /// - /// The request could not be processed because of conflict in the current state of the - /// campaign. - /// - /// - /// The specified resource was not found. - /// - /// - /// The input fails to satisfy the constraints specified by an AWS service. - /// - /// REST API Reference for UpdateCampaignSchedule Operation - UpdateCampaignScheduleResponse UpdateCampaignSchedule(UpdateCampaignScheduleRequest request); - - /// - /// Initiates the asynchronous execution of the UpdateCampaignSchedule operation. - /// - /// - /// Container for the necessary parameters to execute the UpdateCampaignSchedule operation on AmazonConnectCampaignsV2Client. - /// An AsyncCallback delegate that is invoked when the operation completes. - /// A user-defined state object that is passed to the callback procedure. Retrieve this object from within the callback - /// procedure using the AsyncState property. - /// - /// An IAsyncResult that can be used to poll or wait for results, or both; this value is also needed when invoking EndUpdateCampaignSchedule - /// operation. - /// REST API Reference for UpdateCampaignSchedule Operation - IAsyncResult BeginUpdateCampaignSchedule(UpdateCampaignScheduleRequest request, AsyncCallback callback, object state); - - - - /// - /// Finishes the asynchronous execution of the UpdateCampaignSchedule operation. - /// - /// - /// The IAsyncResult returned by the call to BeginUpdateCampaignSchedule. - /// - /// Returns a UpdateCampaignScheduleResult from ConnectCampaignsV2. - /// REST API Reference for UpdateCampaignSchedule Operation - UpdateCampaignScheduleResponse EndUpdateCampaignSchedule(IAsyncResult asyncResult); - - #endregion - - #region UpdateCampaignSource - - - /// - /// Updates the campaign source with a campaign. This API is idempotent. - /// - /// Container for the necessary parameters to execute the UpdateCampaignSource service method. - /// - /// The response from the UpdateCampaignSource service method, as returned by ConnectCampaignsV2. - /// - /// You do not have sufficient access to perform this action. - /// - /// - /// The request could not be processed because of conflict in the current state of the - /// resource. - /// - /// - /// Request processing failed because of an error or failure with the service. - /// - /// - /// The request could not be processed because of conflict in the current state of the - /// campaign. - /// - /// - /// The specified resource was not found. - /// - /// - /// The input fails to satisfy the constraints specified by an AWS service. - /// - /// REST API Reference for UpdateCampaignSource Operation - UpdateCampaignSourceResponse UpdateCampaignSource(UpdateCampaignSourceRequest request); - - /// - /// Initiates the asynchronous execution of the UpdateCampaignSource operation. - /// - /// - /// Container for the necessary parameters to execute the UpdateCampaignSource operation on AmazonConnectCampaignsV2Client. - /// An AsyncCallback delegate that is invoked when the operation completes. - /// A user-defined state object that is passed to the callback procedure. Retrieve this object from within the callback - /// procedure using the AsyncState property. - /// - /// An IAsyncResult that can be used to poll or wait for results, or both; this value is also needed when invoking EndUpdateCampaignSource - /// operation. - /// REST API Reference for UpdateCampaignSource Operation - IAsyncResult BeginUpdateCampaignSource(UpdateCampaignSourceRequest request, AsyncCallback callback, object state); - - - - /// - /// Finishes the asynchronous execution of the UpdateCampaignSource operation. - /// - /// - /// The IAsyncResult returned by the call to BeginUpdateCampaignSource. - /// - /// Returns a UpdateCampaignSourceResult from ConnectCampaignsV2. - /// REST API Reference for UpdateCampaignSource Operation - UpdateCampaignSourceResponse EndUpdateCampaignSource(IAsyncResult asyncResult); - - #endregion - - #region DetermineServiceOperationEndpoint - - /// - /// Returns the endpoint that will be used for a particular request. - /// - /// Request for the desired service operation. - /// The resolved endpoint for the given request. - Amazon.Runtime.Endpoints.Endpoint DetermineServiceOperationEndpoint(AmazonWebServiceRequest request); - - #endregion - - } -} \ No newline at end of file diff --git a/sdk/src/Services/ConnectCampaignsV2/Generated/_netstandard/AmazonConnectCampaignsV2Client.cs b/sdk/src/Services/ConnectCampaignsV2/Generated/_netstandard/AmazonConnectCampaignsV2Client.cs index 522dc2cc8e3f..57a2940f7236 100644 --- a/sdk/src/Services/ConnectCampaignsV2/Generated/_netstandard/AmazonConnectCampaignsV2Client.cs +++ b/sdk/src/Services/ConnectCampaignsV2/Generated/_netstandard/AmazonConnectCampaignsV2Client.cs @@ -32,6 +32,7 @@ using Amazon.Runtime.Internal; using Amazon.Runtime.Internal.Auth; using Amazon.Runtime.Internal.Transform; +using Amazon.Runtime.Endpoints; #pragma warning disable CS1570 namespace Amazon.ConnectCampaignsV2 @@ -1922,16 +1923,8 @@ internal virtual UpdateCampaignSourceResponse UpdateCampaignSource(UpdateCampaig /// The resolved endpoint for the given request. public Amazon.Runtime.Endpoints.Endpoint DetermineServiceOperationEndpoint(AmazonWebServiceRequest request) { - var requestContext = new Amazon.Runtime.Internal.RequestContext(false, CreateSigner()) - { - ClientConfig = Config, - OriginalRequest = request, - Request = new Amazon.Runtime.Internal.DefaultRequest(request, ServiceMetadata.ServiceId) - }; - - var executionContext = new Amazon.Runtime.Internal.ExecutionContext(requestContext, null); - var resolver = new AmazonConnectCampaignsV2EndpointResolver(); - return resolver.GetEndpoint(executionContext); + var parameters = new ServiceOperationEndpointParameters(request); + return Config.DetermineServiceOperationEndpoint(parameters); } #endregion diff --git a/sdk/src/Services/ConnectCampaignsV2/Generated/_netstandard/IAmazonConnectCampaignsV2.cs b/sdk/src/Services/ConnectCampaignsV2/Generated/_netstandard/IAmazonConnectCampaignsV2.cs index b7336ceb418e..801464f2c6a0 100644 --- a/sdk/src/Services/ConnectCampaignsV2/Generated/_netstandard/IAmazonConnectCampaignsV2.cs +++ b/sdk/src/Services/ConnectCampaignsV2/Generated/_netstandard/IAmazonConnectCampaignsV2.cs @@ -1187,5 +1187,33 @@ public partial interface IAmazonConnectCampaignsV2 : IAmazonService, IDisposable #endregion + #region Static factory interface methods +#if NET8_0_OR_GREATER +// Warning CA1033 is issued when the child types can not call the method defined in parent types. +// In this use case the intended caller is only meant to be the interface as a factory +// method to create the child types. Given the SDK use case the warning can be ignored. +#pragma warning disable CA1033 + /// + [System.Diagnostics.CodeAnalysis.DynamicDependency(System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicProperties, typeof(AmazonConnectCampaignsV2Config))] + static ClientConfig IAmazonService.CreateDefaultClientConfig() => new AmazonConnectCampaignsV2Config(); + + /// + [System.Diagnostics.CodeAnalysis.UnconditionalSuppressMessage("AssemblyLoadTrimming", "IL2026:RequiresUnreferencedCode", + Justification = "This suppression is here to ignore the warnings caused by CognitoSync. See justification in IAmazonService.")] + static IAmazonService IAmazonService.CreateDefaultServiceClient(AWSCredentials awsCredentials, ClientConfig clientConfig) + { + var serviceClientConfig = clientConfig as AmazonConnectCampaignsV2Config; + if (serviceClientConfig == null) + { + throw new AmazonClientException("ClientConfig is not of type AmazonConnectCampaignsV2Config to create AmazonConnectCampaignsV2Client"); + } + + return awsCredentials == null ? + new AmazonConnectCampaignsV2Client(serviceClientConfig) : + new AmazonConnectCampaignsV2Client(awsCredentials, serviceClientConfig); + } +#pragma warning restore CA1033 +#endif + #endregion } } \ No newline at end of file diff --git a/sdk/src/Services/ConnectCampaignsV2/Properties/AssemblyInfo.cs b/sdk/src/Services/ConnectCampaignsV2/Properties/AssemblyInfo.cs index 550c37057ba3..21a6dc3365f9 100644 --- a/sdk/src/Services/ConnectCampaignsV2/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/ConnectCampaignsV2/Properties/AssemblyInfo.cs @@ -7,10 +7,8 @@ // set of attributes. Change these attribute values to modify the information // associated with an assembly. [assembly: AssemblyTitle("AWSSDK.ConnectCampaignsV2")] -#if BCL35 -[assembly: AssemblyDescription("The Amazon Web Services SDK for .NET (3.5) - AmazonConnectCampaignServiceV2. Added Amazon Connect Outbound Campaigns V2 SDK.")] -#elif BCL45 -[assembly: AssemblyDescription("The Amazon Web Services SDK for .NET (4.5) - AmazonConnectCampaignServiceV2. Added Amazon Connect Outbound Campaigns V2 SDK.")] +#if BCL +[assembly: AssemblyDescription("The Amazon Web Services SDK for .NET (4.7.2) - AmazonConnectCampaignServiceV2. Added Amazon Connect Outbound Campaigns V2 SDK.")] #elif NETSTANDARD20 [assembly: AssemblyDescription("The Amazon Web Services SDK for .NET (NetStandard 2.0) - AmazonConnectCampaignServiceV2. Added Amazon Connect Outbound Campaigns V2 SDK.")] #elif NETCOREAPP3_1 @@ -43,9 +41,9 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.0")] - #if BCL -[assembly: System.Security.AllowPartiallyTrustedCallers] -#endif \ No newline at end of file +[assembly: AssemblyVersion("4.0")] +#else +[assembly: AssemblyVersion("4.0.0.0")] +#endif +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/src/Services/ConnectCases/ConnectCases.sln b/sdk/src/Services/ConnectCases/ConnectCases.sln index 67751b6c37d0..7e0b93e05bd2 100644 --- a/sdk/src/Services/ConnectCases/ConnectCases.sln +++ b/sdk/src/Services/ConnectCases/ConnectCases.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {CF6F1D3B-A104-423D-B08D-3BA15C20AD24}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {CF6F1D3B-A104-423D-B08D-3BA15C20AD24}.Debug|Any CPU.Build.0 = Debug|Any CPU {CF6F1D3B-A104-423D-B08D-3BA15C20AD24}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {963D3F68-52F9-4D39-8286-C30A6B76E786}.Debug|Any CPU.Build.0 = Debug|Any CPU {963D3F68-52F9-4D39-8286-C30A6B76E786}.Release|Any CPU.ActiveCfg = Release|Any CPU {963D3F68-52F9-4D39-8286-C30A6B76E786}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {E42A3F56-CD99-48B1-91F4-D3F4D5AA1310}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E42A3F56-CD99-48B1-91F4-D3F4D5AA1310}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E42A3F56-CD99-48B1-91F4-D3F4D5AA1310}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E42A3F56-CD99-48B1-91F4-D3F4D5AA1310}.Release|Any CPU.Build.0 = Release|Any CPU - {36B9FC40-6855-4848-A0C5-2B7E1A3A299E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {36B9FC40-6855-4848-A0C5-2B7E1A3A299E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {36B9FC40-6855-4848-A0C5-2B7E1A3A299E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {36B9FC40-6855-4848-A0C5-2B7E1A3A299E}.Release|Any CPU.Build.0 = Release|Any CPU - {810E7B06-EB8F-4412-AA67-2CC0883F9FAB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {810E7B06-EB8F-4412-AA67-2CC0883F9FAB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {810E7B06-EB8F-4412-AA67-2CC0883F9FAB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {810E7B06-EB8F-4412-AA67-2CC0883F9FAB}.Release|Any CPU.Build.0 = Release|Any CPU - {89E502F0-A366-4B32-955E-226EEB6DD3D2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {89E502F0-A366-4B32-955E-226EEB6DD3D2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {89E502F0-A366-4B32-955E-226EEB6DD3D2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {89E502F0-A366-4B32-955E-226EEB6DD3D2}.Release|Any CPU.Build.0 = Release|Any CPU - {5EC61053-FCCF-490B-82AE-C6E917AF5937}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5EC61053-FCCF-490B-82AE-C6E917AF5937}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5EC61053-FCCF-490B-82AE-C6E917AF5937}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5EC61053-FCCF-490B-82AE-C6E917AF5937}.Release|Any CPU.Build.0 = Release|Any CPU - {149C80AB-6D48-474F-9289-2BF1AAC0BA37}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {149C80AB-6D48-474F-9289-2BF1AAC0BA37}.Debug|Any CPU.Build.0 = Debug|Any CPU - {149C80AB-6D48-474F-9289-2BF1AAC0BA37}.Release|Any CPU.ActiveCfg = Release|Any CPU - {149C80AB-6D48-474F-9289-2BF1AAC0BA37}.Release|Any CPU.Build.0 = Release|Any CPU - {8893CA2A-3C5D-46B2-8E95-81A90E06261E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8893CA2A-3C5D-46B2-8E95-81A90E06261E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8893CA2A-3C5D-46B2-8E95-81A90E06261E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8893CA2A-3C5D-46B2-8E95-81A90E06261E}.Release|Any CPU.Build.0 = Release|Any CPU - {32AF5BE4-319C-4089-B9DA-6261543CEC00}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {32AF5BE4-319C-4089-B9DA-6261543CEC00}.Debug|Any CPU.Build.0 = Debug|Any CPU - {32AF5BE4-319C-4089-B9DA-6261543CEC00}.Release|Any CPU.ActiveCfg = Release|Any CPU - {32AF5BE4-319C-4089-B9DA-6261543CEC00}.Release|Any CPU.Build.0 = Release|Any CPU - {19F5C47F-90BE-49B0-AB47-5E8ABF15A8A0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {19F5C47F-90BE-49B0-AB47-5E8ABF15A8A0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {19F5C47F-90BE-49B0-AB47-5E8ABF15A8A0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {19F5C47F-90BE-49B0-AB47-5E8ABF15A8A0}.Release|Any CPU.Build.0 = Release|Any CPU - {F8F7E4E2-D207-4D91-A91B-0AF7FBA455D4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F8F7E4E2-D207-4D91-A91B-0AF7FBA455D4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F8F7E4E2-D207-4D91-A91B-0AF7FBA455D4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F8F7E4E2-D207-4D91-A91B-0AF7FBA455D4}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {E42A3F56-CD99-48B1-91F4-D3F4D5AA1310}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E42A3F56-CD99-48B1-91F4-D3F4D5AA1310}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E42A3F56-CD99-48B1-91F4-D3F4D5AA1310}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E42A3F56-CD99-48B1-91F4-D3F4D5AA1310}.Release|Any CPU.Build.0 = Release|Any CPU - {36B9FC40-6855-4848-A0C5-2B7E1A3A299E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {36B9FC40-6855-4848-A0C5-2B7E1A3A299E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {36B9FC40-6855-4848-A0C5-2B7E1A3A299E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {36B9FC40-6855-4848-A0C5-2B7E1A3A299E}.Release|Any CPU.Build.0 = Release|Any CPU - {810E7B06-EB8F-4412-AA67-2CC0883F9FAB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {810E7B06-EB8F-4412-AA67-2CC0883F9FAB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {810E7B06-EB8F-4412-AA67-2CC0883F9FAB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {810E7B06-EB8F-4412-AA67-2CC0883F9FAB}.Release|Any CPU.Build.0 = Release|Any CPU - {89E502F0-A366-4B32-955E-226EEB6DD3D2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {89E502F0-A366-4B32-955E-226EEB6DD3D2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {89E502F0-A366-4B32-955E-226EEB6DD3D2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {89E502F0-A366-4B32-955E-226EEB6DD3D2}.Release|Any CPU.Build.0 = Release|Any CPU - {5EC61053-FCCF-490B-82AE-C6E917AF5937}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5EC61053-FCCF-490B-82AE-C6E917AF5937}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5EC61053-FCCF-490B-82AE-C6E917AF5937}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5EC61053-FCCF-490B-82AE-C6E917AF5937}.Release|Any CPU.Build.0 = Release|Any CPU - {149C80AB-6D48-474F-9289-2BF1AAC0BA37}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {149C80AB-6D48-474F-9289-2BF1AAC0BA37}.Debug|Any CPU.Build.0 = Debug|Any CPU - {149C80AB-6D48-474F-9289-2BF1AAC0BA37}.Release|Any CPU.ActiveCfg = Release|Any CPU - {149C80AB-6D48-474F-9289-2BF1AAC0BA37}.Release|Any CPU.Build.0 = Release|Any CPU - {8893CA2A-3C5D-46B2-8E95-81A90E06261E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8893CA2A-3C5D-46B2-8E95-81A90E06261E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8893CA2A-3C5D-46B2-8E95-81A90E06261E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8893CA2A-3C5D-46B2-8E95-81A90E06261E}.Release|Any CPU.Build.0 = Release|Any CPU - {32AF5BE4-319C-4089-B9DA-6261543CEC00}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {32AF5BE4-319C-4089-B9DA-6261543CEC00}.Debug|Any CPU.Build.0 = Debug|Any CPU - {32AF5BE4-319C-4089-B9DA-6261543CEC00}.Release|Any CPU.ActiveCfg = Release|Any CPU - {32AF5BE4-319C-4089-B9DA-6261543CEC00}.Release|Any CPU.Build.0 = Release|Any CPU - {19F5C47F-90BE-49B0-AB47-5E8ABF15A8A0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {19F5C47F-90BE-49B0-AB47-5E8ABF15A8A0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {19F5C47F-90BE-49B0-AB47-5E8ABF15A8A0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {19F5C47F-90BE-49B0-AB47-5E8ABF15A8A0}.Release|Any CPU.Build.0 = Release|Any CPU - {F8F7E4E2-D207-4D91-A91B-0AF7FBA455D4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F8F7E4E2-D207-4D91-A91B-0AF7FBA455D4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F8F7E4E2-D207-4D91-A91B-0AF7FBA455D4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F8F7E4E2-D207-4D91-A91B-0AF7FBA455D4}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {CF6F1D3B-A104-423D-B08D-3BA15C20AD24} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {B21AD176-7A93-4060-B2AB-6E72EB3BD1D5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {3DA9F7E8-F1D1-4779-A413-7FF7C2CC234A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {C6A15EA1-642C-4B88-BA56-F064217ABB21} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {963D3F68-52F9-4D39-8286-C30A6B76E786} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {E42A3F56-CD99-48B1-91F4-D3F4D5AA1310} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {36B9FC40-6855-4848-A0C5-2B7E1A3A299E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {810E7B06-EB8F-4412-AA67-2CC0883F9FAB} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {89E502F0-A366-4B32-955E-226EEB6DD3D2} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {5EC61053-FCCF-490B-82AE-C6E917AF5937} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {149C80AB-6D48-474F-9289-2BF1AAC0BA37} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8893CA2A-3C5D-46B2-8E95-81A90E06261E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {32AF5BE4-319C-4089-B9DA-6261543CEC00} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {19F5C47F-90BE-49B0-AB47-5E8ABF15A8A0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F8F7E4E2-D207-4D91-A91B-0AF7FBA455D4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {E42A3F56-CD99-48B1-91F4-D3F4D5AA1310} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {36B9FC40-6855-4848-A0C5-2B7E1A3A299E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {810E7B06-EB8F-4412-AA67-2CC0883F9FAB} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {89E502F0-A366-4B32-955E-226EEB6DD3D2} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {5EC61053-FCCF-490B-82AE-C6E917AF5937} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {149C80AB-6D48-474F-9289-2BF1AAC0BA37} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8893CA2A-3C5D-46B2-8E95-81A90E06261E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {32AF5BE4-319C-4089-B9DA-6261543CEC00} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {19F5C47F-90BE-49B0-AB47-5E8ABF15A8A0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F8F7E4E2-D207-4D91-A91B-0AF7FBA455D4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {60966660-FA16-41B0-A516-ECA6A98DEC98} diff --git a/sdk/src/Services/ConnectCases/Generated/AmazonConnectCasesConfig.cs b/sdk/src/Services/ConnectCases/Generated/AmazonConnectCasesConfig.cs index fc4c77a088e0..1c77447b1a52 100644 --- a/sdk/src/Services/ConnectCases/Generated/AmazonConnectCasesConfig.cs +++ b/sdk/src/Services/ConnectCases/Generated/AmazonConnectCasesConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.ConnectCases public partial class AmazonConnectCasesConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("ConnectCases", "4.0.0.0"); private static readonly AmazonConnectCasesEndpointResolver EndpointResolver = new AmazonConnectCasesEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("ConnectCases", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("ConnectCases", "3.7.400.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/ConnectCases/Properties/AssemblyInfo.cs b/sdk/src/Services/ConnectCases/Properties/AssemblyInfo.cs index f0d458da6dbc..de1fda28f02e 100644 --- a/sdk/src/Services/ConnectCases/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/ConnectCases/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/ConnectContactLens/ConnectContactLens.sln b/sdk/src/Services/ConnectContactLens/ConnectContactLens.sln index 1c90d0cc9b62..15cb18b7fcdc 100644 --- a/sdk/src/Services/ConnectContactLens/ConnectContactLens.sln +++ b/sdk/src/Services/ConnectContactLens/ConnectContactLens.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {99276958-44FA-40E1-AC04-1F9746803125}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {99276958-44FA-40E1-AC04-1F9746803125}.Debug|Any CPU.Build.0 = Debug|Any CPU {99276958-44FA-40E1-AC04-1F9746803125}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {81FE0E49-0480-4BCC-8623-6D47F37EC500}.Debug|Any CPU.Build.0 = Debug|Any CPU {81FE0E49-0480-4BCC-8623-6D47F37EC500}.Release|Any CPU.ActiveCfg = Release|Any CPU {81FE0E49-0480-4BCC-8623-6D47F37EC500}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {221F2031-8C01-4773-88E8-5AEDEEA2859F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {221F2031-8C01-4773-88E8-5AEDEEA2859F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {221F2031-8C01-4773-88E8-5AEDEEA2859F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {221F2031-8C01-4773-88E8-5AEDEEA2859F}.Release|Any CPU.Build.0 = Release|Any CPU - {923847B6-BF0E-44BD-83C9-EC58FC64A0B2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {923847B6-BF0E-44BD-83C9-EC58FC64A0B2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {923847B6-BF0E-44BD-83C9-EC58FC64A0B2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {923847B6-BF0E-44BD-83C9-EC58FC64A0B2}.Release|Any CPU.Build.0 = Release|Any CPU - {8254B158-4D11-4658-82D5-BEF50A74E524}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8254B158-4D11-4658-82D5-BEF50A74E524}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8254B158-4D11-4658-82D5-BEF50A74E524}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8254B158-4D11-4658-82D5-BEF50A74E524}.Release|Any CPU.Build.0 = Release|Any CPU - {A81EA4DB-72B4-4529-A37F-57C2EA976AD1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A81EA4DB-72B4-4529-A37F-57C2EA976AD1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A81EA4DB-72B4-4529-A37F-57C2EA976AD1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A81EA4DB-72B4-4529-A37F-57C2EA976AD1}.Release|Any CPU.Build.0 = Release|Any CPU - {73B59468-E32D-479F-B0D1-711213DAD7E8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {73B59468-E32D-479F-B0D1-711213DAD7E8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {73B59468-E32D-479F-B0D1-711213DAD7E8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {73B59468-E32D-479F-B0D1-711213DAD7E8}.Release|Any CPU.Build.0 = Release|Any CPU - {63140406-99EE-4596-BEBA-06E028DCF0B4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {63140406-99EE-4596-BEBA-06E028DCF0B4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {63140406-99EE-4596-BEBA-06E028DCF0B4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {63140406-99EE-4596-BEBA-06E028DCF0B4}.Release|Any CPU.Build.0 = Release|Any CPU - {8376F5A5-530C-46CE-87C2-8232D7602824}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8376F5A5-530C-46CE-87C2-8232D7602824}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8376F5A5-530C-46CE-87C2-8232D7602824}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8376F5A5-530C-46CE-87C2-8232D7602824}.Release|Any CPU.Build.0 = Release|Any CPU - {82609CBB-2C87-473F-8581-71530D65907F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {82609CBB-2C87-473F-8581-71530D65907F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {82609CBB-2C87-473F-8581-71530D65907F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {82609CBB-2C87-473F-8581-71530D65907F}.Release|Any CPU.Build.0 = Release|Any CPU - {346EEF4D-6E8A-4CA1-9FD9-EC9B861B9594}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {346EEF4D-6E8A-4CA1-9FD9-EC9B861B9594}.Debug|Any CPU.Build.0 = Debug|Any CPU - {346EEF4D-6E8A-4CA1-9FD9-EC9B861B9594}.Release|Any CPU.ActiveCfg = Release|Any CPU - {346EEF4D-6E8A-4CA1-9FD9-EC9B861B9594}.Release|Any CPU.Build.0 = Release|Any CPU - {28DD7D78-7663-42EC-AB62-65F5541C2BBD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {28DD7D78-7663-42EC-AB62-65F5541C2BBD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {28DD7D78-7663-42EC-AB62-65F5541C2BBD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {28DD7D78-7663-42EC-AB62-65F5541C2BBD}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {221F2031-8C01-4773-88E8-5AEDEEA2859F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {221F2031-8C01-4773-88E8-5AEDEEA2859F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {221F2031-8C01-4773-88E8-5AEDEEA2859F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {221F2031-8C01-4773-88E8-5AEDEEA2859F}.Release|Any CPU.Build.0 = Release|Any CPU - {923847B6-BF0E-44BD-83C9-EC58FC64A0B2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {923847B6-BF0E-44BD-83C9-EC58FC64A0B2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {923847B6-BF0E-44BD-83C9-EC58FC64A0B2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {923847B6-BF0E-44BD-83C9-EC58FC64A0B2}.Release|Any CPU.Build.0 = Release|Any CPU - {8254B158-4D11-4658-82D5-BEF50A74E524}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8254B158-4D11-4658-82D5-BEF50A74E524}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8254B158-4D11-4658-82D5-BEF50A74E524}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8254B158-4D11-4658-82D5-BEF50A74E524}.Release|Any CPU.Build.0 = Release|Any CPU - {A81EA4DB-72B4-4529-A37F-57C2EA976AD1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A81EA4DB-72B4-4529-A37F-57C2EA976AD1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A81EA4DB-72B4-4529-A37F-57C2EA976AD1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A81EA4DB-72B4-4529-A37F-57C2EA976AD1}.Release|Any CPU.Build.0 = Release|Any CPU - {73B59468-E32D-479F-B0D1-711213DAD7E8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {73B59468-E32D-479F-B0D1-711213DAD7E8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {73B59468-E32D-479F-B0D1-711213DAD7E8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {73B59468-E32D-479F-B0D1-711213DAD7E8}.Release|Any CPU.Build.0 = Release|Any CPU - {63140406-99EE-4596-BEBA-06E028DCF0B4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {63140406-99EE-4596-BEBA-06E028DCF0B4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {63140406-99EE-4596-BEBA-06E028DCF0B4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {63140406-99EE-4596-BEBA-06E028DCF0B4}.Release|Any CPU.Build.0 = Release|Any CPU - {8376F5A5-530C-46CE-87C2-8232D7602824}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8376F5A5-530C-46CE-87C2-8232D7602824}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8376F5A5-530C-46CE-87C2-8232D7602824}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8376F5A5-530C-46CE-87C2-8232D7602824}.Release|Any CPU.Build.0 = Release|Any CPU - {82609CBB-2C87-473F-8581-71530D65907F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {82609CBB-2C87-473F-8581-71530D65907F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {82609CBB-2C87-473F-8581-71530D65907F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {82609CBB-2C87-473F-8581-71530D65907F}.Release|Any CPU.Build.0 = Release|Any CPU - {346EEF4D-6E8A-4CA1-9FD9-EC9B861B9594}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {346EEF4D-6E8A-4CA1-9FD9-EC9B861B9594}.Debug|Any CPU.Build.0 = Debug|Any CPU - {346EEF4D-6E8A-4CA1-9FD9-EC9B861B9594}.Release|Any CPU.ActiveCfg = Release|Any CPU - {346EEF4D-6E8A-4CA1-9FD9-EC9B861B9594}.Release|Any CPU.Build.0 = Release|Any CPU - {28DD7D78-7663-42EC-AB62-65F5541C2BBD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {28DD7D78-7663-42EC-AB62-65F5541C2BBD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {28DD7D78-7663-42EC-AB62-65F5541C2BBD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {28DD7D78-7663-42EC-AB62-65F5541C2BBD}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {99276958-44FA-40E1-AC04-1F9746803125} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {39A77249-620F-4FC7-A459-7172B2DABE03} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {E6A188BA-8694-4980-B13C-6D0AD8F56394} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {F5618989-82F4-4BF2-9FE7-C3B823122983} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {81FE0E49-0480-4BCC-8623-6D47F37EC500} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {221F2031-8C01-4773-88E8-5AEDEEA2859F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {923847B6-BF0E-44BD-83C9-EC58FC64A0B2} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8254B158-4D11-4658-82D5-BEF50A74E524} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A81EA4DB-72B4-4529-A37F-57C2EA976AD1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {73B59468-E32D-479F-B0D1-711213DAD7E8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {63140406-99EE-4596-BEBA-06E028DCF0B4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8376F5A5-530C-46CE-87C2-8232D7602824} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {82609CBB-2C87-473F-8581-71530D65907F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {346EEF4D-6E8A-4CA1-9FD9-EC9B861B9594} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {28DD7D78-7663-42EC-AB62-65F5541C2BBD} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {221F2031-8C01-4773-88E8-5AEDEEA2859F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {923847B6-BF0E-44BD-83C9-EC58FC64A0B2} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8254B158-4D11-4658-82D5-BEF50A74E524} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A81EA4DB-72B4-4529-A37F-57C2EA976AD1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {73B59468-E32D-479F-B0D1-711213DAD7E8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {63140406-99EE-4596-BEBA-06E028DCF0B4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8376F5A5-530C-46CE-87C2-8232D7602824} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {82609CBB-2C87-473F-8581-71530D65907F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {346EEF4D-6E8A-4CA1-9FD9-EC9B861B9594} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {28DD7D78-7663-42EC-AB62-65F5541C2BBD} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {299A3F93-8C9A-4061-99A4-435EF645E03A} diff --git a/sdk/src/Services/ConnectContactLens/Generated/AmazonConnectContactLensConfig.cs b/sdk/src/Services/ConnectContactLens/Generated/AmazonConnectContactLensConfig.cs index 5a710216dce0..1e4694adf082 100644 --- a/sdk/src/Services/ConnectContactLens/Generated/AmazonConnectContactLensConfig.cs +++ b/sdk/src/Services/ConnectContactLens/Generated/AmazonConnectContactLensConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.ConnectContactLens public partial class AmazonConnectContactLensConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("Connect Contact Lens", "4.0.0.0"); private static readonly AmazonConnectContactLensEndpointResolver EndpointResolver = new AmazonConnectContactLensEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("Connect Contact Lens", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("Connect Contact Lens", "3.7.400.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/ConnectContactLens/Properties/AssemblyInfo.cs b/sdk/src/Services/ConnectContactLens/Properties/AssemblyInfo.cs index 80db6dc8faf1..3ed77f7ee37c 100644 --- a/sdk/src/Services/ConnectContactLens/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/ConnectContactLens/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/ConnectParticipant/ConnectParticipant.sln b/sdk/src/Services/ConnectParticipant/ConnectParticipant.sln index b9339ad4f2a6..db9724730387 100644 --- a/sdk/src/Services/ConnectParticipant/ConnectParticipant.sln +++ b/sdk/src/Services/ConnectParticipant/ConnectParticipant.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {AB55EB60-37AD-4C6C-93BF-0732D44722B7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {AB55EB60-37AD-4C6C-93BF-0732D44722B7}.Debug|Any CPU.Build.0 = Debug|Any CPU {AB55EB60-37AD-4C6C-93BF-0732D44722B7}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {542AC834-DD0F-4E49-B46D-2A61F53BCD44}.Debug|Any CPU.Build.0 = Debug|Any CPU {542AC834-DD0F-4E49-B46D-2A61F53BCD44}.Release|Any CPU.ActiveCfg = Release|Any CPU {542AC834-DD0F-4E49-B46D-2A61F53BCD44}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {EFE58BFA-EEFF-4B9C-89C5-CB4A0777C01D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EFE58BFA-EEFF-4B9C-89C5-CB4A0777C01D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EFE58BFA-EEFF-4B9C-89C5-CB4A0777C01D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EFE58BFA-EEFF-4B9C-89C5-CB4A0777C01D}.Release|Any CPU.Build.0 = Release|Any CPU - {82E4B047-CE9E-4665-B2C0-A2796488D68F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {82E4B047-CE9E-4665-B2C0-A2796488D68F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {82E4B047-CE9E-4665-B2C0-A2796488D68F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {82E4B047-CE9E-4665-B2C0-A2796488D68F}.Release|Any CPU.Build.0 = Release|Any CPU - {BB50E439-57E7-4308-ABB0-072BD2CCD888}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BB50E439-57E7-4308-ABB0-072BD2CCD888}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BB50E439-57E7-4308-ABB0-072BD2CCD888}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BB50E439-57E7-4308-ABB0-072BD2CCD888}.Release|Any CPU.Build.0 = Release|Any CPU - {4E0E3A4F-45C2-4F3C-BD61-25978BAC824E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4E0E3A4F-45C2-4F3C-BD61-25978BAC824E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4E0E3A4F-45C2-4F3C-BD61-25978BAC824E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4E0E3A4F-45C2-4F3C-BD61-25978BAC824E}.Release|Any CPU.Build.0 = Release|Any CPU - {E13E608D-4CB8-4201-B6DB-80F450CC5897}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E13E608D-4CB8-4201-B6DB-80F450CC5897}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E13E608D-4CB8-4201-B6DB-80F450CC5897}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E13E608D-4CB8-4201-B6DB-80F450CC5897}.Release|Any CPU.Build.0 = Release|Any CPU - {F845E661-C3DA-479C-8AFD-8B98C773FDA4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F845E661-C3DA-479C-8AFD-8B98C773FDA4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F845E661-C3DA-479C-8AFD-8B98C773FDA4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F845E661-C3DA-479C-8AFD-8B98C773FDA4}.Release|Any CPU.Build.0 = Release|Any CPU - {320ADEE3-14C1-46DA-80E6-71D0E07E814F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {320ADEE3-14C1-46DA-80E6-71D0E07E814F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {320ADEE3-14C1-46DA-80E6-71D0E07E814F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {320ADEE3-14C1-46DA-80E6-71D0E07E814F}.Release|Any CPU.Build.0 = Release|Any CPU - {103C03A4-6C68-4515-B9B6-39F71F15AD60}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {103C03A4-6C68-4515-B9B6-39F71F15AD60}.Debug|Any CPU.Build.0 = Debug|Any CPU - {103C03A4-6C68-4515-B9B6-39F71F15AD60}.Release|Any CPU.ActiveCfg = Release|Any CPU - {103C03A4-6C68-4515-B9B6-39F71F15AD60}.Release|Any CPU.Build.0 = Release|Any CPU - {E7AC7C77-5C26-48D5-B1A4-0E186B08501D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E7AC7C77-5C26-48D5-B1A4-0E186B08501D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E7AC7C77-5C26-48D5-B1A4-0E186B08501D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E7AC7C77-5C26-48D5-B1A4-0E186B08501D}.Release|Any CPU.Build.0 = Release|Any CPU - {B3642598-0F8F-47FD-A80F-BCC464142C68}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B3642598-0F8F-47FD-A80F-BCC464142C68}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B3642598-0F8F-47FD-A80F-BCC464142C68}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B3642598-0F8F-47FD-A80F-BCC464142C68}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {EFE58BFA-EEFF-4B9C-89C5-CB4A0777C01D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EFE58BFA-EEFF-4B9C-89C5-CB4A0777C01D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EFE58BFA-EEFF-4B9C-89C5-CB4A0777C01D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EFE58BFA-EEFF-4B9C-89C5-CB4A0777C01D}.Release|Any CPU.Build.0 = Release|Any CPU - {82E4B047-CE9E-4665-B2C0-A2796488D68F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {82E4B047-CE9E-4665-B2C0-A2796488D68F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {82E4B047-CE9E-4665-B2C0-A2796488D68F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {82E4B047-CE9E-4665-B2C0-A2796488D68F}.Release|Any CPU.Build.0 = Release|Any CPU - {BB50E439-57E7-4308-ABB0-072BD2CCD888}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BB50E439-57E7-4308-ABB0-072BD2CCD888}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BB50E439-57E7-4308-ABB0-072BD2CCD888}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BB50E439-57E7-4308-ABB0-072BD2CCD888}.Release|Any CPU.Build.0 = Release|Any CPU - {4E0E3A4F-45C2-4F3C-BD61-25978BAC824E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4E0E3A4F-45C2-4F3C-BD61-25978BAC824E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4E0E3A4F-45C2-4F3C-BD61-25978BAC824E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4E0E3A4F-45C2-4F3C-BD61-25978BAC824E}.Release|Any CPU.Build.0 = Release|Any CPU - {E13E608D-4CB8-4201-B6DB-80F450CC5897}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E13E608D-4CB8-4201-B6DB-80F450CC5897}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E13E608D-4CB8-4201-B6DB-80F450CC5897}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E13E608D-4CB8-4201-B6DB-80F450CC5897}.Release|Any CPU.Build.0 = Release|Any CPU - {F845E661-C3DA-479C-8AFD-8B98C773FDA4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F845E661-C3DA-479C-8AFD-8B98C773FDA4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F845E661-C3DA-479C-8AFD-8B98C773FDA4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F845E661-C3DA-479C-8AFD-8B98C773FDA4}.Release|Any CPU.Build.0 = Release|Any CPU - {320ADEE3-14C1-46DA-80E6-71D0E07E814F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {320ADEE3-14C1-46DA-80E6-71D0E07E814F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {320ADEE3-14C1-46DA-80E6-71D0E07E814F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {320ADEE3-14C1-46DA-80E6-71D0E07E814F}.Release|Any CPU.Build.0 = Release|Any CPU - {103C03A4-6C68-4515-B9B6-39F71F15AD60}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {103C03A4-6C68-4515-B9B6-39F71F15AD60}.Debug|Any CPU.Build.0 = Debug|Any CPU - {103C03A4-6C68-4515-B9B6-39F71F15AD60}.Release|Any CPU.ActiveCfg = Release|Any CPU - {103C03A4-6C68-4515-B9B6-39F71F15AD60}.Release|Any CPU.Build.0 = Release|Any CPU - {E7AC7C77-5C26-48D5-B1A4-0E186B08501D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E7AC7C77-5C26-48D5-B1A4-0E186B08501D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E7AC7C77-5C26-48D5-B1A4-0E186B08501D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E7AC7C77-5C26-48D5-B1A4-0E186B08501D}.Release|Any CPU.Build.0 = Release|Any CPU - {B3642598-0F8F-47FD-A80F-BCC464142C68}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B3642598-0F8F-47FD-A80F-BCC464142C68}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B3642598-0F8F-47FD-A80F-BCC464142C68}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B3642598-0F8F-47FD-A80F-BCC464142C68}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {AB55EB60-37AD-4C6C-93BF-0732D44722B7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {C0F06ADB-E7EE-43F7-9793-2E20B080847C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {2728EDE9-80F2-4838-9E52-333DFDB8441D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {F3E4D92F-5D2C-465B-B192-EF071FE3B75D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {542AC834-DD0F-4E49-B46D-2A61F53BCD44} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {EFE58BFA-EEFF-4B9C-89C5-CB4A0777C01D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {82E4B047-CE9E-4665-B2C0-A2796488D68F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {BB50E439-57E7-4308-ABB0-072BD2CCD888} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4E0E3A4F-45C2-4F3C-BD61-25978BAC824E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E13E608D-4CB8-4201-B6DB-80F450CC5897} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F845E661-C3DA-479C-8AFD-8B98C773FDA4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {320ADEE3-14C1-46DA-80E6-71D0E07E814F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {103C03A4-6C68-4515-B9B6-39F71F15AD60} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E7AC7C77-5C26-48D5-B1A4-0E186B08501D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B3642598-0F8F-47FD-A80F-BCC464142C68} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {EFE58BFA-EEFF-4B9C-89C5-CB4A0777C01D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {82E4B047-CE9E-4665-B2C0-A2796488D68F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {BB50E439-57E7-4308-ABB0-072BD2CCD888} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4E0E3A4F-45C2-4F3C-BD61-25978BAC824E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E13E608D-4CB8-4201-B6DB-80F450CC5897} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F845E661-C3DA-479C-8AFD-8B98C773FDA4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {320ADEE3-14C1-46DA-80E6-71D0E07E814F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {103C03A4-6C68-4515-B9B6-39F71F15AD60} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E7AC7C77-5C26-48D5-B1A4-0E186B08501D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B3642598-0F8F-47FD-A80F-BCC464142C68} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {78F98133-A405-426D-A0BE-BD6C02A5B587} diff --git a/sdk/src/Services/ConnectParticipant/Generated/AmazonConnectParticipantConfig.cs b/sdk/src/Services/ConnectParticipant/Generated/AmazonConnectParticipantConfig.cs index 8cc2b575e91b..736f657dc6d8 100644 --- a/sdk/src/Services/ConnectParticipant/Generated/AmazonConnectParticipantConfig.cs +++ b/sdk/src/Services/ConnectParticipant/Generated/AmazonConnectParticipantConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.ConnectParticipant public partial class AmazonConnectParticipantConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("ConnectParticipant", "4.0.0.0"); private static readonly AmazonConnectParticipantEndpointResolver EndpointResolver = new AmazonConnectParticipantEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("ConnectParticipant", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("ConnectParticipant", "3.7.400.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/ConnectParticipant/Properties/AssemblyInfo.cs b/sdk/src/Services/ConnectParticipant/Properties/AssemblyInfo.cs index c28ef8227ec5..f23225839224 100644 --- a/sdk/src/Services/ConnectParticipant/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/ConnectParticipant/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/ConnectWisdomService/ConnectWisdomService.sln b/sdk/src/Services/ConnectWisdomService/ConnectWisdomService.sln index 542db2ea6374..7c46f8a87035 100644 --- a/sdk/src/Services/ConnectWisdomService/ConnectWisdomService.sln +++ b/sdk/src/Services/ConnectWisdomService/ConnectWisdomService.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {121C0D5D-11BA-4D1A-A9FC-81EE93C6D194}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {121C0D5D-11BA-4D1A-A9FC-81EE93C6D194}.Debug|Any CPU.Build.0 = Debug|Any CPU {121C0D5D-11BA-4D1A-A9FC-81EE93C6D194}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {D2F4E6C5-3734-4524-921D-C970FF5F1132}.Debug|Any CPU.Build.0 = Debug|Any CPU {D2F4E6C5-3734-4524-921D-C970FF5F1132}.Release|Any CPU.ActiveCfg = Release|Any CPU {D2F4E6C5-3734-4524-921D-C970FF5F1132}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {619A4549-76BA-4095-9280-2319E0CFEB5C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {619A4549-76BA-4095-9280-2319E0CFEB5C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {619A4549-76BA-4095-9280-2319E0CFEB5C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {619A4549-76BA-4095-9280-2319E0CFEB5C}.Release|Any CPU.Build.0 = Release|Any CPU - {5D600485-E202-482F-A283-810E0BEF6233}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5D600485-E202-482F-A283-810E0BEF6233}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5D600485-E202-482F-A283-810E0BEF6233}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5D600485-E202-482F-A283-810E0BEF6233}.Release|Any CPU.Build.0 = Release|Any CPU - {93E3CDAE-0864-49F7-8B98-B8247CA3E9A1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {93E3CDAE-0864-49F7-8B98-B8247CA3E9A1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {93E3CDAE-0864-49F7-8B98-B8247CA3E9A1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {93E3CDAE-0864-49F7-8B98-B8247CA3E9A1}.Release|Any CPU.Build.0 = Release|Any CPU - {6642B892-C94E-461F-BD6D-1529722DDEDB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6642B892-C94E-461F-BD6D-1529722DDEDB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6642B892-C94E-461F-BD6D-1529722DDEDB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6642B892-C94E-461F-BD6D-1529722DDEDB}.Release|Any CPU.Build.0 = Release|Any CPU - {32E55A89-F926-4FF3-AB5B-648E248E09F8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {32E55A89-F926-4FF3-AB5B-648E248E09F8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {32E55A89-F926-4FF3-AB5B-648E248E09F8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {32E55A89-F926-4FF3-AB5B-648E248E09F8}.Release|Any CPU.Build.0 = Release|Any CPU - {2A6EE3A2-DD22-4E9A-9FDD-914CE718932F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2A6EE3A2-DD22-4E9A-9FDD-914CE718932F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2A6EE3A2-DD22-4E9A-9FDD-914CE718932F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2A6EE3A2-DD22-4E9A-9FDD-914CE718932F}.Release|Any CPU.Build.0 = Release|Any CPU - {3A3D819B-6A46-4166-9F62-C25580ADFCE6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3A3D819B-6A46-4166-9F62-C25580ADFCE6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3A3D819B-6A46-4166-9F62-C25580ADFCE6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3A3D819B-6A46-4166-9F62-C25580ADFCE6}.Release|Any CPU.Build.0 = Release|Any CPU - {0380718E-6F33-4C8C-B912-F6347F657CBB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0380718E-6F33-4C8C-B912-F6347F657CBB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0380718E-6F33-4C8C-B912-F6347F657CBB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0380718E-6F33-4C8C-B912-F6347F657CBB}.Release|Any CPU.Build.0 = Release|Any CPU - {680FD030-5E80-47CC-BF36-09F1B9518C2A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {680FD030-5E80-47CC-BF36-09F1B9518C2A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {680FD030-5E80-47CC-BF36-09F1B9518C2A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {680FD030-5E80-47CC-BF36-09F1B9518C2A}.Release|Any CPU.Build.0 = Release|Any CPU - {17C03E90-DEDA-4FFA-A873-C73B3DF7E75D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {17C03E90-DEDA-4FFA-A873-C73B3DF7E75D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {17C03E90-DEDA-4FFA-A873-C73B3DF7E75D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {17C03E90-DEDA-4FFA-A873-C73B3DF7E75D}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {619A4549-76BA-4095-9280-2319E0CFEB5C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {619A4549-76BA-4095-9280-2319E0CFEB5C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {619A4549-76BA-4095-9280-2319E0CFEB5C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {619A4549-76BA-4095-9280-2319E0CFEB5C}.Release|Any CPU.Build.0 = Release|Any CPU - {5D600485-E202-482F-A283-810E0BEF6233}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5D600485-E202-482F-A283-810E0BEF6233}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5D600485-E202-482F-A283-810E0BEF6233}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5D600485-E202-482F-A283-810E0BEF6233}.Release|Any CPU.Build.0 = Release|Any CPU - {93E3CDAE-0864-49F7-8B98-B8247CA3E9A1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {93E3CDAE-0864-49F7-8B98-B8247CA3E9A1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {93E3CDAE-0864-49F7-8B98-B8247CA3E9A1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {93E3CDAE-0864-49F7-8B98-B8247CA3E9A1}.Release|Any CPU.Build.0 = Release|Any CPU - {6642B892-C94E-461F-BD6D-1529722DDEDB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6642B892-C94E-461F-BD6D-1529722DDEDB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6642B892-C94E-461F-BD6D-1529722DDEDB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6642B892-C94E-461F-BD6D-1529722DDEDB}.Release|Any CPU.Build.0 = Release|Any CPU - {32E55A89-F926-4FF3-AB5B-648E248E09F8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {32E55A89-F926-4FF3-AB5B-648E248E09F8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {32E55A89-F926-4FF3-AB5B-648E248E09F8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {32E55A89-F926-4FF3-AB5B-648E248E09F8}.Release|Any CPU.Build.0 = Release|Any CPU - {2A6EE3A2-DD22-4E9A-9FDD-914CE718932F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2A6EE3A2-DD22-4E9A-9FDD-914CE718932F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2A6EE3A2-DD22-4E9A-9FDD-914CE718932F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2A6EE3A2-DD22-4E9A-9FDD-914CE718932F}.Release|Any CPU.Build.0 = Release|Any CPU - {3A3D819B-6A46-4166-9F62-C25580ADFCE6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3A3D819B-6A46-4166-9F62-C25580ADFCE6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3A3D819B-6A46-4166-9F62-C25580ADFCE6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3A3D819B-6A46-4166-9F62-C25580ADFCE6}.Release|Any CPU.Build.0 = Release|Any CPU - {0380718E-6F33-4C8C-B912-F6347F657CBB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0380718E-6F33-4C8C-B912-F6347F657CBB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0380718E-6F33-4C8C-B912-F6347F657CBB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0380718E-6F33-4C8C-B912-F6347F657CBB}.Release|Any CPU.Build.0 = Release|Any CPU - {680FD030-5E80-47CC-BF36-09F1B9518C2A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {680FD030-5E80-47CC-BF36-09F1B9518C2A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {680FD030-5E80-47CC-BF36-09F1B9518C2A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {680FD030-5E80-47CC-BF36-09F1B9518C2A}.Release|Any CPU.Build.0 = Release|Any CPU - {17C03E90-DEDA-4FFA-A873-C73B3DF7E75D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {17C03E90-DEDA-4FFA-A873-C73B3DF7E75D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {17C03E90-DEDA-4FFA-A873-C73B3DF7E75D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {17C03E90-DEDA-4FFA-A873-C73B3DF7E75D}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {121C0D5D-11BA-4D1A-A9FC-81EE93C6D194} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {C7935F17-6CA5-415D-859B-D80C4300524A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {CBF79C5C-5858-4334-9F45-4D4B10F90C99} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {B89C2821-2151-4DCD-966C-0A87F9D7E63D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {D2F4E6C5-3734-4524-921D-C970FF5F1132} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {619A4549-76BA-4095-9280-2319E0CFEB5C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {5D600485-E202-482F-A283-810E0BEF6233} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {93E3CDAE-0864-49F7-8B98-B8247CA3E9A1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6642B892-C94E-461F-BD6D-1529722DDEDB} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {32E55A89-F926-4FF3-AB5B-648E248E09F8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {2A6EE3A2-DD22-4E9A-9FDD-914CE718932F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {3A3D819B-6A46-4166-9F62-C25580ADFCE6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0380718E-6F33-4C8C-B912-F6347F657CBB} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {680FD030-5E80-47CC-BF36-09F1B9518C2A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {17C03E90-DEDA-4FFA-A873-C73B3DF7E75D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {619A4549-76BA-4095-9280-2319E0CFEB5C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {5D600485-E202-482F-A283-810E0BEF6233} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {93E3CDAE-0864-49F7-8B98-B8247CA3E9A1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6642B892-C94E-461F-BD6D-1529722DDEDB} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {32E55A89-F926-4FF3-AB5B-648E248E09F8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {2A6EE3A2-DD22-4E9A-9FDD-914CE718932F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {3A3D819B-6A46-4166-9F62-C25580ADFCE6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0380718E-6F33-4C8C-B912-F6347F657CBB} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {680FD030-5E80-47CC-BF36-09F1B9518C2A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {17C03E90-DEDA-4FFA-A873-C73B3DF7E75D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {FD83FE8F-3E88-486E-8BEA-4FAC4DAC2A23} diff --git a/sdk/src/Services/ConnectWisdomService/Generated/AmazonConnectWisdomServiceConfig.cs b/sdk/src/Services/ConnectWisdomService/Generated/AmazonConnectWisdomServiceConfig.cs index b58cde3e7fa0..9a806278991a 100644 --- a/sdk/src/Services/ConnectWisdomService/Generated/AmazonConnectWisdomServiceConfig.cs +++ b/sdk/src/Services/ConnectWisdomService/Generated/AmazonConnectWisdomServiceConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.ConnectWisdomService public partial class AmazonConnectWisdomServiceConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("Wisdom", "4.0.0.0"); private static readonly AmazonConnectWisdomServiceEndpointResolver EndpointResolver = new AmazonConnectWisdomServiceEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("Wisdom", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("Wisdom", "3.7.400.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/ConnectWisdomService/Properties/AssemblyInfo.cs b/sdk/src/Services/ConnectWisdomService/Properties/AssemblyInfo.cs index 4dc8b2234480..b4c551f57096 100644 --- a/sdk/src/Services/ConnectWisdomService/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/ConnectWisdomService/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/ControlCatalog/ControlCatalog.sln b/sdk/src/Services/ControlCatalog/ControlCatalog.sln index cf99849eff82..09b41a733d68 100644 --- a/sdk/src/Services/ControlCatalog/ControlCatalog.sln +++ b/sdk/src/Services/ControlCatalog/ControlCatalog.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {428D8D42-F60D-4EFA-85D2-D034B2383A88}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {428D8D42-F60D-4EFA-85D2-D034B2383A88}.Debug|Any CPU.Build.0 = Debug|Any CPU {428D8D42-F60D-4EFA-85D2-D034B2383A88}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {8585A22F-C13A-4835-87B0-8310CC60D8F6}.Debug|Any CPU.Build.0 = Debug|Any CPU {8585A22F-C13A-4835-87B0-8310CC60D8F6}.Release|Any CPU.ActiveCfg = Release|Any CPU {8585A22F-C13A-4835-87B0-8310CC60D8F6}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {F89C9EE6-F67D-4D96-9B4E-D40762BF40CD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F89C9EE6-F67D-4D96-9B4E-D40762BF40CD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F89C9EE6-F67D-4D96-9B4E-D40762BF40CD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F89C9EE6-F67D-4D96-9B4E-D40762BF40CD}.Release|Any CPU.Build.0 = Release|Any CPU - {E7438538-6FF7-4618-B7E8-0EF1C7FDDBD6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E7438538-6FF7-4618-B7E8-0EF1C7FDDBD6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E7438538-6FF7-4618-B7E8-0EF1C7FDDBD6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E7438538-6FF7-4618-B7E8-0EF1C7FDDBD6}.Release|Any CPU.Build.0 = Release|Any CPU - {5038BBE0-980E-4E76-991A-1EE8E327B9FA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5038BBE0-980E-4E76-991A-1EE8E327B9FA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5038BBE0-980E-4E76-991A-1EE8E327B9FA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5038BBE0-980E-4E76-991A-1EE8E327B9FA}.Release|Any CPU.Build.0 = Release|Any CPU - {9A1E403F-9AC3-442C-894F-47644C14928B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9A1E403F-9AC3-442C-894F-47644C14928B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9A1E403F-9AC3-442C-894F-47644C14928B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9A1E403F-9AC3-442C-894F-47644C14928B}.Release|Any CPU.Build.0 = Release|Any CPU - {D867297C-9B76-4DBE-936E-CE4BD6FEA674}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D867297C-9B76-4DBE-936E-CE4BD6FEA674}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D867297C-9B76-4DBE-936E-CE4BD6FEA674}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D867297C-9B76-4DBE-936E-CE4BD6FEA674}.Release|Any CPU.Build.0 = Release|Any CPU - {68E28151-F393-4722-8239-3650D6FDBA3C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {68E28151-F393-4722-8239-3650D6FDBA3C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {68E28151-F393-4722-8239-3650D6FDBA3C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {68E28151-F393-4722-8239-3650D6FDBA3C}.Release|Any CPU.Build.0 = Release|Any CPU - {68973F21-A16F-4248-9EFE-E8C508D88158}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {68973F21-A16F-4248-9EFE-E8C508D88158}.Debug|Any CPU.Build.0 = Debug|Any CPU - {68973F21-A16F-4248-9EFE-E8C508D88158}.Release|Any CPU.ActiveCfg = Release|Any CPU - {68973F21-A16F-4248-9EFE-E8C508D88158}.Release|Any CPU.Build.0 = Release|Any CPU - {C5BEC60D-86F6-4500-A3CC-992DF9ABDEAF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C5BEC60D-86F6-4500-A3CC-992DF9ABDEAF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C5BEC60D-86F6-4500-A3CC-992DF9ABDEAF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C5BEC60D-86F6-4500-A3CC-992DF9ABDEAF}.Release|Any CPU.Build.0 = Release|Any CPU - {9395EBEF-F2D5-4932-B401-2253F8820ABA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9395EBEF-F2D5-4932-B401-2253F8820ABA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9395EBEF-F2D5-4932-B401-2253F8820ABA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9395EBEF-F2D5-4932-B401-2253F8820ABA}.Release|Any CPU.Build.0 = Release|Any CPU - {E8ED6875-1BAB-4497-8132-616231747BA6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E8ED6875-1BAB-4497-8132-616231747BA6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E8ED6875-1BAB-4497-8132-616231747BA6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E8ED6875-1BAB-4497-8132-616231747BA6}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {F89C9EE6-F67D-4D96-9B4E-D40762BF40CD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F89C9EE6-F67D-4D96-9B4E-D40762BF40CD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F89C9EE6-F67D-4D96-9B4E-D40762BF40CD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F89C9EE6-F67D-4D96-9B4E-D40762BF40CD}.Release|Any CPU.Build.0 = Release|Any CPU - {E7438538-6FF7-4618-B7E8-0EF1C7FDDBD6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E7438538-6FF7-4618-B7E8-0EF1C7FDDBD6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E7438538-6FF7-4618-B7E8-0EF1C7FDDBD6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E7438538-6FF7-4618-B7E8-0EF1C7FDDBD6}.Release|Any CPU.Build.0 = Release|Any CPU - {5038BBE0-980E-4E76-991A-1EE8E327B9FA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5038BBE0-980E-4E76-991A-1EE8E327B9FA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5038BBE0-980E-4E76-991A-1EE8E327B9FA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5038BBE0-980E-4E76-991A-1EE8E327B9FA}.Release|Any CPU.Build.0 = Release|Any CPU - {9A1E403F-9AC3-442C-894F-47644C14928B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9A1E403F-9AC3-442C-894F-47644C14928B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9A1E403F-9AC3-442C-894F-47644C14928B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9A1E403F-9AC3-442C-894F-47644C14928B}.Release|Any CPU.Build.0 = Release|Any CPU - {D867297C-9B76-4DBE-936E-CE4BD6FEA674}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D867297C-9B76-4DBE-936E-CE4BD6FEA674}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D867297C-9B76-4DBE-936E-CE4BD6FEA674}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D867297C-9B76-4DBE-936E-CE4BD6FEA674}.Release|Any CPU.Build.0 = Release|Any CPU - {68E28151-F393-4722-8239-3650D6FDBA3C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {68E28151-F393-4722-8239-3650D6FDBA3C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {68E28151-F393-4722-8239-3650D6FDBA3C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {68E28151-F393-4722-8239-3650D6FDBA3C}.Release|Any CPU.Build.0 = Release|Any CPU - {68973F21-A16F-4248-9EFE-E8C508D88158}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {68973F21-A16F-4248-9EFE-E8C508D88158}.Debug|Any CPU.Build.0 = Debug|Any CPU - {68973F21-A16F-4248-9EFE-E8C508D88158}.Release|Any CPU.ActiveCfg = Release|Any CPU - {68973F21-A16F-4248-9EFE-E8C508D88158}.Release|Any CPU.Build.0 = Release|Any CPU - {C5BEC60D-86F6-4500-A3CC-992DF9ABDEAF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C5BEC60D-86F6-4500-A3CC-992DF9ABDEAF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C5BEC60D-86F6-4500-A3CC-992DF9ABDEAF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C5BEC60D-86F6-4500-A3CC-992DF9ABDEAF}.Release|Any CPU.Build.0 = Release|Any CPU - {9395EBEF-F2D5-4932-B401-2253F8820ABA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9395EBEF-F2D5-4932-B401-2253F8820ABA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9395EBEF-F2D5-4932-B401-2253F8820ABA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9395EBEF-F2D5-4932-B401-2253F8820ABA}.Release|Any CPU.Build.0 = Release|Any CPU - {E8ED6875-1BAB-4497-8132-616231747BA6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E8ED6875-1BAB-4497-8132-616231747BA6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E8ED6875-1BAB-4497-8132-616231747BA6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E8ED6875-1BAB-4497-8132-616231747BA6}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {428D8D42-F60D-4EFA-85D2-D034B2383A88} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {0CEF941E-762D-4155-A9F1-63985392F6FD} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {183CADA6-9C4C-48C3-8C29-5D9C28624003} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {8BB781AC-F441-45CF-8618-3538E8EC6022} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {8585A22F-C13A-4835-87B0-8310CC60D8F6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {F89C9EE6-F67D-4D96-9B4E-D40762BF40CD} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E7438538-6FF7-4618-B7E8-0EF1C7FDDBD6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {5038BBE0-980E-4E76-991A-1EE8E327B9FA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {9A1E403F-9AC3-442C-894F-47644C14928B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D867297C-9B76-4DBE-936E-CE4BD6FEA674} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {68E28151-F393-4722-8239-3650D6FDBA3C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {68973F21-A16F-4248-9EFE-E8C508D88158} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C5BEC60D-86F6-4500-A3CC-992DF9ABDEAF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {9395EBEF-F2D5-4932-B401-2253F8820ABA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E8ED6875-1BAB-4497-8132-616231747BA6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {F89C9EE6-F67D-4D96-9B4E-D40762BF40CD} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E7438538-6FF7-4618-B7E8-0EF1C7FDDBD6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {5038BBE0-980E-4E76-991A-1EE8E327B9FA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {9A1E403F-9AC3-442C-894F-47644C14928B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D867297C-9B76-4DBE-936E-CE4BD6FEA674} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {68E28151-F393-4722-8239-3650D6FDBA3C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {68973F21-A16F-4248-9EFE-E8C508D88158} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C5BEC60D-86F6-4500-A3CC-992DF9ABDEAF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {9395EBEF-F2D5-4932-B401-2253F8820ABA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E8ED6875-1BAB-4497-8132-616231747BA6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {207336B7-0EA8-473B-98D5-6E3EB12A86F2} diff --git a/sdk/src/Services/ControlCatalog/Generated/AmazonControlCatalogConfig.cs b/sdk/src/Services/ControlCatalog/Generated/AmazonControlCatalogConfig.cs index 101c4c1e31da..6d9059c4e9ca 100644 --- a/sdk/src/Services/ControlCatalog/Generated/AmazonControlCatalogConfig.cs +++ b/sdk/src/Services/ControlCatalog/Generated/AmazonControlCatalogConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.ControlCatalog public partial class AmazonControlCatalogConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("ControlCatalog", "4.0.0.0"); private static readonly AmazonControlCatalogEndpointResolver EndpointResolver = new AmazonControlCatalogEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("ControlCatalog", "3.7.401.24"); -======= - InternalSDKUtils.BuildUserAgentString("ControlCatalog", "3.7.402.6"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/ControlCatalog/Properties/AssemblyInfo.cs b/sdk/src/Services/ControlCatalog/Properties/AssemblyInfo.cs index a2996ae2f9ad..6be62c67b586 100644 --- a/sdk/src/Services/ControlCatalog/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/ControlCatalog/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.24")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.402.6")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/ControlTower/ControlTower.sln b/sdk/src/Services/ControlTower/ControlTower.sln index 3d9ad3f90d08..0004cd89b29f 100644 --- a/sdk/src/Services/ControlTower/ControlTower.sln +++ b/sdk/src/Services/ControlTower/ControlTower.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {75B2E926-4819-434D-9514-35B7DEC25359}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {75B2E926-4819-434D-9514-35B7DEC25359}.Debug|Any CPU.Build.0 = Debug|Any CPU {75B2E926-4819-434D-9514-35B7DEC25359}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {E147A9B6-1892-427D-8D0B-E158727C6CEF}.Debug|Any CPU.Build.0 = Debug|Any CPU {E147A9B6-1892-427D-8D0B-E158727C6CEF}.Release|Any CPU.ActiveCfg = Release|Any CPU {E147A9B6-1892-427D-8D0B-E158727C6CEF}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {65FF5863-5915-4AF7-BC98-3F38F209B411}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {65FF5863-5915-4AF7-BC98-3F38F209B411}.Debug|Any CPU.Build.0 = Debug|Any CPU - {65FF5863-5915-4AF7-BC98-3F38F209B411}.Release|Any CPU.ActiveCfg = Release|Any CPU - {65FF5863-5915-4AF7-BC98-3F38F209B411}.Release|Any CPU.Build.0 = Release|Any CPU - {9F0D0DED-2DFB-4812-BD4E-8D4D3A49644C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9F0D0DED-2DFB-4812-BD4E-8D4D3A49644C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9F0D0DED-2DFB-4812-BD4E-8D4D3A49644C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9F0D0DED-2DFB-4812-BD4E-8D4D3A49644C}.Release|Any CPU.Build.0 = Release|Any CPU - {8FEC6E7B-0043-4590-9436-93D564318739}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8FEC6E7B-0043-4590-9436-93D564318739}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8FEC6E7B-0043-4590-9436-93D564318739}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8FEC6E7B-0043-4590-9436-93D564318739}.Release|Any CPU.Build.0 = Release|Any CPU - {871882ED-1262-4D9A-96F4-01BB38AED208}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {871882ED-1262-4D9A-96F4-01BB38AED208}.Debug|Any CPU.Build.0 = Debug|Any CPU - {871882ED-1262-4D9A-96F4-01BB38AED208}.Release|Any CPU.ActiveCfg = Release|Any CPU - {871882ED-1262-4D9A-96F4-01BB38AED208}.Release|Any CPU.Build.0 = Release|Any CPU - {9FD34315-2075-4CC6-B564-024C7AF6D480}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9FD34315-2075-4CC6-B564-024C7AF6D480}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9FD34315-2075-4CC6-B564-024C7AF6D480}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9FD34315-2075-4CC6-B564-024C7AF6D480}.Release|Any CPU.Build.0 = Release|Any CPU - {589F5201-81DF-40C4-B8EC-6884ECDDC5E0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {589F5201-81DF-40C4-B8EC-6884ECDDC5E0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {589F5201-81DF-40C4-B8EC-6884ECDDC5E0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {589F5201-81DF-40C4-B8EC-6884ECDDC5E0}.Release|Any CPU.Build.0 = Release|Any CPU - {7F0FCB9B-02BB-4F23-90BD-5FA8ABF9DD58}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7F0FCB9B-02BB-4F23-90BD-5FA8ABF9DD58}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7F0FCB9B-02BB-4F23-90BD-5FA8ABF9DD58}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7F0FCB9B-02BB-4F23-90BD-5FA8ABF9DD58}.Release|Any CPU.Build.0 = Release|Any CPU - {5FFF1CB4-106D-45FF-99CD-AE7ED2CB9EDC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5FFF1CB4-106D-45FF-99CD-AE7ED2CB9EDC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5FFF1CB4-106D-45FF-99CD-AE7ED2CB9EDC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5FFF1CB4-106D-45FF-99CD-AE7ED2CB9EDC}.Release|Any CPU.Build.0 = Release|Any CPU - {2AE1ACBB-ECB8-4501-9357-245F5EFA8A38}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2AE1ACBB-ECB8-4501-9357-245F5EFA8A38}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2AE1ACBB-ECB8-4501-9357-245F5EFA8A38}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2AE1ACBB-ECB8-4501-9357-245F5EFA8A38}.Release|Any CPU.Build.0 = Release|Any CPU - {BD7D6673-988E-496D-95DC-B3975B05DB63}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BD7D6673-988E-496D-95DC-B3975B05DB63}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BD7D6673-988E-496D-95DC-B3975B05DB63}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BD7D6673-988E-496D-95DC-B3975B05DB63}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {65FF5863-5915-4AF7-BC98-3F38F209B411}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {65FF5863-5915-4AF7-BC98-3F38F209B411}.Debug|Any CPU.Build.0 = Debug|Any CPU - {65FF5863-5915-4AF7-BC98-3F38F209B411}.Release|Any CPU.ActiveCfg = Release|Any CPU - {65FF5863-5915-4AF7-BC98-3F38F209B411}.Release|Any CPU.Build.0 = Release|Any CPU - {9F0D0DED-2DFB-4812-BD4E-8D4D3A49644C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9F0D0DED-2DFB-4812-BD4E-8D4D3A49644C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9F0D0DED-2DFB-4812-BD4E-8D4D3A49644C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9F0D0DED-2DFB-4812-BD4E-8D4D3A49644C}.Release|Any CPU.Build.0 = Release|Any CPU - {8FEC6E7B-0043-4590-9436-93D564318739}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8FEC6E7B-0043-4590-9436-93D564318739}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8FEC6E7B-0043-4590-9436-93D564318739}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8FEC6E7B-0043-4590-9436-93D564318739}.Release|Any CPU.Build.0 = Release|Any CPU - {871882ED-1262-4D9A-96F4-01BB38AED208}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {871882ED-1262-4D9A-96F4-01BB38AED208}.Debug|Any CPU.Build.0 = Debug|Any CPU - {871882ED-1262-4D9A-96F4-01BB38AED208}.Release|Any CPU.ActiveCfg = Release|Any CPU - {871882ED-1262-4D9A-96F4-01BB38AED208}.Release|Any CPU.Build.0 = Release|Any CPU - {9FD34315-2075-4CC6-B564-024C7AF6D480}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9FD34315-2075-4CC6-B564-024C7AF6D480}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9FD34315-2075-4CC6-B564-024C7AF6D480}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9FD34315-2075-4CC6-B564-024C7AF6D480}.Release|Any CPU.Build.0 = Release|Any CPU - {589F5201-81DF-40C4-B8EC-6884ECDDC5E0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {589F5201-81DF-40C4-B8EC-6884ECDDC5E0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {589F5201-81DF-40C4-B8EC-6884ECDDC5E0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {589F5201-81DF-40C4-B8EC-6884ECDDC5E0}.Release|Any CPU.Build.0 = Release|Any CPU - {7F0FCB9B-02BB-4F23-90BD-5FA8ABF9DD58}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7F0FCB9B-02BB-4F23-90BD-5FA8ABF9DD58}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7F0FCB9B-02BB-4F23-90BD-5FA8ABF9DD58}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7F0FCB9B-02BB-4F23-90BD-5FA8ABF9DD58}.Release|Any CPU.Build.0 = Release|Any CPU - {5FFF1CB4-106D-45FF-99CD-AE7ED2CB9EDC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5FFF1CB4-106D-45FF-99CD-AE7ED2CB9EDC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5FFF1CB4-106D-45FF-99CD-AE7ED2CB9EDC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5FFF1CB4-106D-45FF-99CD-AE7ED2CB9EDC}.Release|Any CPU.Build.0 = Release|Any CPU - {2AE1ACBB-ECB8-4501-9357-245F5EFA8A38}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2AE1ACBB-ECB8-4501-9357-245F5EFA8A38}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2AE1ACBB-ECB8-4501-9357-245F5EFA8A38}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2AE1ACBB-ECB8-4501-9357-245F5EFA8A38}.Release|Any CPU.Build.0 = Release|Any CPU - {BD7D6673-988E-496D-95DC-B3975B05DB63}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BD7D6673-988E-496D-95DC-B3975B05DB63}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BD7D6673-988E-496D-95DC-B3975B05DB63}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BD7D6673-988E-496D-95DC-B3975B05DB63}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {75B2E926-4819-434D-9514-35B7DEC25359} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {B5FD3990-BBD3-401E-BF4B-470F607260C5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {ECC3EB05-FFA5-4068-A0CF-F660AF73722B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {6FE7F58A-8FF1-47EA-8F49-B605C549CE09} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {E147A9B6-1892-427D-8D0B-E158727C6CEF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {65FF5863-5915-4AF7-BC98-3F38F209B411} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {9F0D0DED-2DFB-4812-BD4E-8D4D3A49644C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8FEC6E7B-0043-4590-9436-93D564318739} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {871882ED-1262-4D9A-96F4-01BB38AED208} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {9FD34315-2075-4CC6-B564-024C7AF6D480} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {589F5201-81DF-40C4-B8EC-6884ECDDC5E0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {7F0FCB9B-02BB-4F23-90BD-5FA8ABF9DD58} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {5FFF1CB4-106D-45FF-99CD-AE7ED2CB9EDC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {2AE1ACBB-ECB8-4501-9357-245F5EFA8A38} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {BD7D6673-988E-496D-95DC-B3975B05DB63} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {65FF5863-5915-4AF7-BC98-3F38F209B411} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {9F0D0DED-2DFB-4812-BD4E-8D4D3A49644C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8FEC6E7B-0043-4590-9436-93D564318739} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {871882ED-1262-4D9A-96F4-01BB38AED208} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {9FD34315-2075-4CC6-B564-024C7AF6D480} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {589F5201-81DF-40C4-B8EC-6884ECDDC5E0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {7F0FCB9B-02BB-4F23-90BD-5FA8ABF9DD58} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {5FFF1CB4-106D-45FF-99CD-AE7ED2CB9EDC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {2AE1ACBB-ECB8-4501-9357-245F5EFA8A38} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {BD7D6673-988E-496D-95DC-B3975B05DB63} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {C66CDB2D-3EF9-4B51-A6E6-04C1627D56EF} diff --git a/sdk/src/Services/ControlTower/Generated/AmazonControlTowerConfig.cs b/sdk/src/Services/ControlTower/Generated/AmazonControlTowerConfig.cs index fe1acc481253..fb47a4c34b90 100644 --- a/sdk/src/Services/ControlTower/Generated/AmazonControlTowerConfig.cs +++ b/sdk/src/Services/ControlTower/Generated/AmazonControlTowerConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.ControlTower public partial class AmazonControlTowerConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("ControlTower", "4.0.0.0"); private static readonly AmazonControlTowerEndpointResolver EndpointResolver = new AmazonControlTowerEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("ControlTower", "3.7.400.27"); -======= - InternalSDKUtils.BuildUserAgentString("ControlTower", "3.7.401.4"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/ControlTower/Generated/Model/Internal/MarshallTransformations/ResetEnabledControlRequestMarshaller.cs b/sdk/src/Services/ControlTower/Generated/Model/Internal/MarshallTransformations/ResetEnabledControlRequestMarshaller.cs index 318275895a21..7e777a53041c 100644 --- a/sdk/src/Services/ControlTower/Generated/Model/Internal/MarshallTransformations/ResetEnabledControlRequestMarshaller.cs +++ b/sdk/src/Services/ControlTower/Generated/Model/Internal/MarshallTransformations/ResetEnabledControlRequestMarshaller.cs @@ -61,21 +61,24 @@ public IRequest Marshall(ResetEnabledControlRequest publicRequest) request.HttpMethod = "POST"; request.ResourcePath = "/reset-enabled-control"; - using (StringWriter stringWriter = new StringWriter(CultureInfo.InvariantCulture)) + using (MemoryStream memoryStream = new MemoryStream()) { - JsonWriter writer = new JsonWriter(stringWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetEnabledControlIdentifier()) + using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) { - context.Writer.WritePropertyName("enabledControlIdentifier"); - context.Writer.Write(publicRequest.EnabledControlIdentifier); + JsonWriter writer = new JsonWriter(streamWriter); + writer.Validate = false; + writer.WriteObjectStart(); + var context = new JsonMarshallerContext(request, writer); + if(publicRequest.IsSetEnabledControlIdentifier()) + { + context.Writer.WritePropertyName("enabledControlIdentifier"); + context.Writer.Write(publicRequest.EnabledControlIdentifier); + } + + writer.WriteObjectEnd(); } - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); + request.Content = memoryStream.ToArray(); } diff --git a/sdk/src/Services/ControlTower/Generated/_bcl/AmazonControlTowerClient.cs b/sdk/src/Services/ControlTower/Generated/_bcl/AmazonControlTowerClient.cs index bb0745dc48de..8fa777e41528 100644 --- a/sdk/src/Services/ControlTower/Generated/_bcl/AmazonControlTowerClient.cs +++ b/sdk/src/Services/ControlTower/Generated/_bcl/AmazonControlTowerClient.cs @@ -2305,6 +2305,91 @@ public virtual ResetEnabledBaselineResponse ResetEnabledBaseline(ResetEnabledBas #endregion + #region ResetEnabledControl + + + /// + /// Resets an enabled control. + /// + /// Container for the necessary parameters to execute the ResetEnabledControl service method. + /// + /// The response from the ResetEnabledControl service method, as returned by ControlTower. + /// + /// You do not have sufficient access to perform this action. + /// + /// + /// Updating or deleting the resource can cause an inconsistent state. + /// + /// + /// An unexpected error occurred during processing of a request. + /// + /// + /// The request references a resource that does not exist. + /// + /// + /// The request would cause a service quota to be exceeded. The limit is 10 concurrent + /// operations. + /// + /// + /// The request was denied due to request throttling. + /// + /// + /// The input does not satisfy the constraints specified by an Amazon Web Services service. + /// + /// REST API Reference for ResetEnabledControl Operation + public virtual ResetEnabledControlResponse ResetEnabledControl(ResetEnabledControlRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = ResetEnabledControlRequestMarshaller.Instance; + options.ResponseUnmarshaller = ResetEnabledControlResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// Resets an enabled control. + /// + /// Container for the necessary parameters to execute the ResetEnabledControl service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the ResetEnabledControl service method, as returned by ControlTower. + /// + /// You do not have sufficient access to perform this action. + /// + /// + /// Updating or deleting the resource can cause an inconsistent state. + /// + /// + /// An unexpected error occurred during processing of a request. + /// + /// + /// The request references a resource that does not exist. + /// + /// + /// The request would cause a service quota to be exceeded. The limit is 10 concurrent + /// operations. + /// + /// + /// The request was denied due to request throttling. + /// + /// + /// The input does not satisfy the constraints specified by an Amazon Web Services service. + /// + /// REST API Reference for ResetEnabledControl Operation + public virtual Task ResetEnabledControlAsync(ResetEnabledControlRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = ResetEnabledControlRequestMarshaller.Instance; + options.ResponseUnmarshaller = ResetEnabledControlResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + #region ResetLandingZone @@ -2620,10 +2705,11 @@ public virtual UpdateEnabledBaselineResponse UpdateEnabledBaseline(UpdateEnabled /// /// /// - /// If the DriftSummary status for the control shows as DRIFTED, you cannot call - /// this API. Instead, you can update the control by calling DisableControl and - /// again calling EnableControl, or you can run an extending governance operation. - /// For usage examples, see the + /// If the DriftSummary status for the control shows as DRIFTED, you cannot + /// call this API. Instead, you can update the control by calling the ResetEnabledControl + /// API. Alternatively, you can call DisableControl and then call EnableControl + /// again. Also, you can run an extending governance operation to repair drift. For usage + /// examples, see the /// Controls Reference Guide . /// /// @@ -2679,10 +2765,11 @@ public virtual UpdateEnabledControlResponse UpdateEnabledControl(UpdateEnabledCo /// /// /// - /// If the DriftSummary status for the control shows as DRIFTED, you cannot call - /// this API. Instead, you can update the control by calling DisableControl and - /// again calling EnableControl, or you can run an extending governance operation. - /// For usage examples, see the + /// If the DriftSummary status for the control shows as DRIFTED, you cannot + /// call this API. Instead, you can update the control by calling the ResetEnabledControl + /// API. Alternatively, you can call DisableControl and then call EnableControl + /// again. Also, you can run an extending governance operation to repair drift. For usage + /// examples, see the /// Controls Reference Guide . /// /// diff --git a/sdk/src/Services/ControlTower/Properties/AssemblyInfo.cs b/sdk/src/Services/ControlTower/Properties/AssemblyInfo.cs index 5b97e2b95e03..92e6d824046b 100644 --- a/sdk/src/Services/ControlTower/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/ControlTower/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.27")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.4")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/CostAndUsageReport/CostAndUsageReport.sln b/sdk/src/Services/CostAndUsageReport/CostAndUsageReport.sln index f72fb53d5358..61ac2487f80d 100644 --- a/sdk/src/Services/CostAndUsageReport/CostAndUsageReport.sln +++ b/sdk/src/Services/CostAndUsageReport/CostAndUsageReport.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {7B54F35F-B3EA-49DF-83E3-42E3140DBC6D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {7B54F35F-B3EA-49DF-83E3-42E3140DBC6D}.Debug|Any CPU.Build.0 = Debug|Any CPU {7B54F35F-B3EA-49DF-83E3-42E3140DBC6D}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {FFF6DD39-1D07-4532-B6AF-A9800AACFA9C}.Debug|Any CPU.Build.0 = Debug|Any CPU {FFF6DD39-1D07-4532-B6AF-A9800AACFA9C}.Release|Any CPU.ActiveCfg = Release|Any CPU {FFF6DD39-1D07-4532-B6AF-A9800AACFA9C}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {6CE277F9-3771-4F2F-99BC-A9E464A967C7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6CE277F9-3771-4F2F-99BC-A9E464A967C7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6CE277F9-3771-4F2F-99BC-A9E464A967C7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6CE277F9-3771-4F2F-99BC-A9E464A967C7}.Release|Any CPU.Build.0 = Release|Any CPU - {E91244E6-DFB3-4103-BCA4-744484FB9B6B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E91244E6-DFB3-4103-BCA4-744484FB9B6B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E91244E6-DFB3-4103-BCA4-744484FB9B6B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E91244E6-DFB3-4103-BCA4-744484FB9B6B}.Release|Any CPU.Build.0 = Release|Any CPU - {AFA33ED4-647A-47CC-81A2-C235907EABA5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AFA33ED4-647A-47CC-81A2-C235907EABA5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AFA33ED4-647A-47CC-81A2-C235907EABA5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AFA33ED4-647A-47CC-81A2-C235907EABA5}.Release|Any CPU.Build.0 = Release|Any CPU - {D965AE6A-FCA9-4E7F-B2ED-8FB348A90692}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D965AE6A-FCA9-4E7F-B2ED-8FB348A90692}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D965AE6A-FCA9-4E7F-B2ED-8FB348A90692}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D965AE6A-FCA9-4E7F-B2ED-8FB348A90692}.Release|Any CPU.Build.0 = Release|Any CPU - {523489DF-A3B8-4BE7-9DED-9663591CD297}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {523489DF-A3B8-4BE7-9DED-9663591CD297}.Debug|Any CPU.Build.0 = Debug|Any CPU - {523489DF-A3B8-4BE7-9DED-9663591CD297}.Release|Any CPU.ActiveCfg = Release|Any CPU - {523489DF-A3B8-4BE7-9DED-9663591CD297}.Release|Any CPU.Build.0 = Release|Any CPU - {8B9AC348-BB99-40A3-9627-22D3199D6A98}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8B9AC348-BB99-40A3-9627-22D3199D6A98}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8B9AC348-BB99-40A3-9627-22D3199D6A98}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8B9AC348-BB99-40A3-9627-22D3199D6A98}.Release|Any CPU.Build.0 = Release|Any CPU - {569B6CD4-9C57-478F-9D15-DF6D59B5B993}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {569B6CD4-9C57-478F-9D15-DF6D59B5B993}.Debug|Any CPU.Build.0 = Debug|Any CPU - {569B6CD4-9C57-478F-9D15-DF6D59B5B993}.Release|Any CPU.ActiveCfg = Release|Any CPU - {569B6CD4-9C57-478F-9D15-DF6D59B5B993}.Release|Any CPU.Build.0 = Release|Any CPU - {54D0273A-3ADD-49BD-B0E2-D4E753EB40D4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {54D0273A-3ADD-49BD-B0E2-D4E753EB40D4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {54D0273A-3ADD-49BD-B0E2-D4E753EB40D4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {54D0273A-3ADD-49BD-B0E2-D4E753EB40D4}.Release|Any CPU.Build.0 = Release|Any CPU - {B20F42D7-A3CE-436B-801D-DEE46D5F8B47}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B20F42D7-A3CE-436B-801D-DEE46D5F8B47}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B20F42D7-A3CE-436B-801D-DEE46D5F8B47}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B20F42D7-A3CE-436B-801D-DEE46D5F8B47}.Release|Any CPU.Build.0 = Release|Any CPU - {9D5A16B8-F05E-4106-9007-626BC07F7B10}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9D5A16B8-F05E-4106-9007-626BC07F7B10}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9D5A16B8-F05E-4106-9007-626BC07F7B10}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9D5A16B8-F05E-4106-9007-626BC07F7B10}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {6CE277F9-3771-4F2F-99BC-A9E464A967C7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6CE277F9-3771-4F2F-99BC-A9E464A967C7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6CE277F9-3771-4F2F-99BC-A9E464A967C7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6CE277F9-3771-4F2F-99BC-A9E464A967C7}.Release|Any CPU.Build.0 = Release|Any CPU - {E91244E6-DFB3-4103-BCA4-744484FB9B6B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E91244E6-DFB3-4103-BCA4-744484FB9B6B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E91244E6-DFB3-4103-BCA4-744484FB9B6B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E91244E6-DFB3-4103-BCA4-744484FB9B6B}.Release|Any CPU.Build.0 = Release|Any CPU - {AFA33ED4-647A-47CC-81A2-C235907EABA5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AFA33ED4-647A-47CC-81A2-C235907EABA5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AFA33ED4-647A-47CC-81A2-C235907EABA5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AFA33ED4-647A-47CC-81A2-C235907EABA5}.Release|Any CPU.Build.0 = Release|Any CPU - {D965AE6A-FCA9-4E7F-B2ED-8FB348A90692}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D965AE6A-FCA9-4E7F-B2ED-8FB348A90692}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D965AE6A-FCA9-4E7F-B2ED-8FB348A90692}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D965AE6A-FCA9-4E7F-B2ED-8FB348A90692}.Release|Any CPU.Build.0 = Release|Any CPU - {523489DF-A3B8-4BE7-9DED-9663591CD297}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {523489DF-A3B8-4BE7-9DED-9663591CD297}.Debug|Any CPU.Build.0 = Debug|Any CPU - {523489DF-A3B8-4BE7-9DED-9663591CD297}.Release|Any CPU.ActiveCfg = Release|Any CPU - {523489DF-A3B8-4BE7-9DED-9663591CD297}.Release|Any CPU.Build.0 = Release|Any CPU - {8B9AC348-BB99-40A3-9627-22D3199D6A98}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8B9AC348-BB99-40A3-9627-22D3199D6A98}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8B9AC348-BB99-40A3-9627-22D3199D6A98}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8B9AC348-BB99-40A3-9627-22D3199D6A98}.Release|Any CPU.Build.0 = Release|Any CPU - {569B6CD4-9C57-478F-9D15-DF6D59B5B993}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {569B6CD4-9C57-478F-9D15-DF6D59B5B993}.Debug|Any CPU.Build.0 = Debug|Any CPU - {569B6CD4-9C57-478F-9D15-DF6D59B5B993}.Release|Any CPU.ActiveCfg = Release|Any CPU - {569B6CD4-9C57-478F-9D15-DF6D59B5B993}.Release|Any CPU.Build.0 = Release|Any CPU - {54D0273A-3ADD-49BD-B0E2-D4E753EB40D4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {54D0273A-3ADD-49BD-B0E2-D4E753EB40D4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {54D0273A-3ADD-49BD-B0E2-D4E753EB40D4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {54D0273A-3ADD-49BD-B0E2-D4E753EB40D4}.Release|Any CPU.Build.0 = Release|Any CPU - {B20F42D7-A3CE-436B-801D-DEE46D5F8B47}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B20F42D7-A3CE-436B-801D-DEE46D5F8B47}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B20F42D7-A3CE-436B-801D-DEE46D5F8B47}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B20F42D7-A3CE-436B-801D-DEE46D5F8B47}.Release|Any CPU.Build.0 = Release|Any CPU - {9D5A16B8-F05E-4106-9007-626BC07F7B10}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9D5A16B8-F05E-4106-9007-626BC07F7B10}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9D5A16B8-F05E-4106-9007-626BC07F7B10}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9D5A16B8-F05E-4106-9007-626BC07F7B10}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7B54F35F-B3EA-49DF-83E3-42E3140DBC6D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {E78B9AB9-5B36-4454-AB4A-BFC88A67DEBD} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {FBB5C384-F70E-4165-BC1F-9DA778A7116C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {111A2A11-1148-49D1-B079-401B851671B0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {FFF6DD39-1D07-4532-B6AF-A9800AACFA9C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {6CE277F9-3771-4F2F-99BC-A9E464A967C7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E91244E6-DFB3-4103-BCA4-744484FB9B6B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {AFA33ED4-647A-47CC-81A2-C235907EABA5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D965AE6A-FCA9-4E7F-B2ED-8FB348A90692} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {523489DF-A3B8-4BE7-9DED-9663591CD297} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8B9AC348-BB99-40A3-9627-22D3199D6A98} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {569B6CD4-9C57-478F-9D15-DF6D59B5B993} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {54D0273A-3ADD-49BD-B0E2-D4E753EB40D4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B20F42D7-A3CE-436B-801D-DEE46D5F8B47} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {9D5A16B8-F05E-4106-9007-626BC07F7B10} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {6CE277F9-3771-4F2F-99BC-A9E464A967C7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E91244E6-DFB3-4103-BCA4-744484FB9B6B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {AFA33ED4-647A-47CC-81A2-C235907EABA5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D965AE6A-FCA9-4E7F-B2ED-8FB348A90692} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {523489DF-A3B8-4BE7-9DED-9663591CD297} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8B9AC348-BB99-40A3-9627-22D3199D6A98} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {569B6CD4-9C57-478F-9D15-DF6D59B5B993} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {54D0273A-3ADD-49BD-B0E2-D4E753EB40D4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B20F42D7-A3CE-436B-801D-DEE46D5F8B47} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {9D5A16B8-F05E-4106-9007-626BC07F7B10} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {822B42C6-0339-44D6-B297-D0DC9D6A2E26} diff --git a/sdk/src/Services/CostAndUsageReport/Generated/AmazonCostAndUsageReportConfig.cs b/sdk/src/Services/CostAndUsageReport/Generated/AmazonCostAndUsageReportConfig.cs index 52111746872a..e2e9a557e7ee 100644 --- a/sdk/src/Services/CostAndUsageReport/Generated/AmazonCostAndUsageReportConfig.cs +++ b/sdk/src/Services/CostAndUsageReport/Generated/AmazonCostAndUsageReportConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.CostAndUsageReport public partial class AmazonCostAndUsageReportConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("Cost and Usage Report Service", "4.0.0.0"); private static readonly AmazonCostAndUsageReportEndpointResolver EndpointResolver = new AmazonCostAndUsageReportEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("Cost and Usage Report Service", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("Cost and Usage Report Service", "3.7.400.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/CostAndUsageReport/Properties/AssemblyInfo.cs b/sdk/src/Services/CostAndUsageReport/Properties/AssemblyInfo.cs index 90acea86cd43..81208bb21ee1 100644 --- a/sdk/src/Services/CostAndUsageReport/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/CostAndUsageReport/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/CostExplorer/CostExplorer.sln b/sdk/src/Services/CostExplorer/CostExplorer.sln index 214eb4d88aaa..7b9db956d913 100644 --- a/sdk/src/Services/CostExplorer/CostExplorer.sln +++ b/sdk/src/Services/CostExplorer/CostExplorer.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {89EBC37D-B8FF-4275-85B8-7BEA8E2444CF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {89EBC37D-B8FF-4275-85B8-7BEA8E2444CF}.Debug|Any CPU.Build.0 = Debug|Any CPU {89EBC37D-B8FF-4275-85B8-7BEA8E2444CF}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {2DEB23C6-7565-45A7-9477-CF2CE652D363}.Debug|Any CPU.Build.0 = Debug|Any CPU {2DEB23C6-7565-45A7-9477-CF2CE652D363}.Release|Any CPU.ActiveCfg = Release|Any CPU {2DEB23C6-7565-45A7-9477-CF2CE652D363}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {C2167D40-2EC7-4852-A099-257A001E5090}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C2167D40-2EC7-4852-A099-257A001E5090}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C2167D40-2EC7-4852-A099-257A001E5090}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C2167D40-2EC7-4852-A099-257A001E5090}.Release|Any CPU.Build.0 = Release|Any CPU - {93533D41-3A06-4220-A54E-BBC509FCF919}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {93533D41-3A06-4220-A54E-BBC509FCF919}.Debug|Any CPU.Build.0 = Debug|Any CPU - {93533D41-3A06-4220-A54E-BBC509FCF919}.Release|Any CPU.ActiveCfg = Release|Any CPU - {93533D41-3A06-4220-A54E-BBC509FCF919}.Release|Any CPU.Build.0 = Release|Any CPU - {88BD281C-FC0F-4F1E-9FAB-B29F29CCFD92}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {88BD281C-FC0F-4F1E-9FAB-B29F29CCFD92}.Debug|Any CPU.Build.0 = Debug|Any CPU - {88BD281C-FC0F-4F1E-9FAB-B29F29CCFD92}.Release|Any CPU.ActiveCfg = Release|Any CPU - {88BD281C-FC0F-4F1E-9FAB-B29F29CCFD92}.Release|Any CPU.Build.0 = Release|Any CPU - {A4DB227B-76AE-4C5F-94E5-538982859066}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A4DB227B-76AE-4C5F-94E5-538982859066}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A4DB227B-76AE-4C5F-94E5-538982859066}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A4DB227B-76AE-4C5F-94E5-538982859066}.Release|Any CPU.Build.0 = Release|Any CPU - {F81630CC-1E0F-4563-AC8A-B8F7447C5618}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F81630CC-1E0F-4563-AC8A-B8F7447C5618}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F81630CC-1E0F-4563-AC8A-B8F7447C5618}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F81630CC-1E0F-4563-AC8A-B8F7447C5618}.Release|Any CPU.Build.0 = Release|Any CPU - {525D8977-AC0F-4392-872D-844B2284EF74}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {525D8977-AC0F-4392-872D-844B2284EF74}.Debug|Any CPU.Build.0 = Debug|Any CPU - {525D8977-AC0F-4392-872D-844B2284EF74}.Release|Any CPU.ActiveCfg = Release|Any CPU - {525D8977-AC0F-4392-872D-844B2284EF74}.Release|Any CPU.Build.0 = Release|Any CPU - {C1FC69E8-5F03-44A0-88C9-502C1DC64AE0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C1FC69E8-5F03-44A0-88C9-502C1DC64AE0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C1FC69E8-5F03-44A0-88C9-502C1DC64AE0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C1FC69E8-5F03-44A0-88C9-502C1DC64AE0}.Release|Any CPU.Build.0 = Release|Any CPU - {283579A7-9747-4018-ABA2-BEE332C895B5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {283579A7-9747-4018-ABA2-BEE332C895B5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {283579A7-9747-4018-ABA2-BEE332C895B5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {283579A7-9747-4018-ABA2-BEE332C895B5}.Release|Any CPU.Build.0 = Release|Any CPU - {72CB92AC-F391-4374-B1BE-82C8AC467578}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {72CB92AC-F391-4374-B1BE-82C8AC467578}.Debug|Any CPU.Build.0 = Debug|Any CPU - {72CB92AC-F391-4374-B1BE-82C8AC467578}.Release|Any CPU.ActiveCfg = Release|Any CPU - {72CB92AC-F391-4374-B1BE-82C8AC467578}.Release|Any CPU.Build.0 = Release|Any CPU - {9B95F68E-F026-4595-B432-F34CA12B5259}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9B95F68E-F026-4595-B432-F34CA12B5259}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9B95F68E-F026-4595-B432-F34CA12B5259}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9B95F68E-F026-4595-B432-F34CA12B5259}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {C2167D40-2EC7-4852-A099-257A001E5090}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C2167D40-2EC7-4852-A099-257A001E5090}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C2167D40-2EC7-4852-A099-257A001E5090}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C2167D40-2EC7-4852-A099-257A001E5090}.Release|Any CPU.Build.0 = Release|Any CPU - {93533D41-3A06-4220-A54E-BBC509FCF919}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {93533D41-3A06-4220-A54E-BBC509FCF919}.Debug|Any CPU.Build.0 = Debug|Any CPU - {93533D41-3A06-4220-A54E-BBC509FCF919}.Release|Any CPU.ActiveCfg = Release|Any CPU - {93533D41-3A06-4220-A54E-BBC509FCF919}.Release|Any CPU.Build.0 = Release|Any CPU - {88BD281C-FC0F-4F1E-9FAB-B29F29CCFD92}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {88BD281C-FC0F-4F1E-9FAB-B29F29CCFD92}.Debug|Any CPU.Build.0 = Debug|Any CPU - {88BD281C-FC0F-4F1E-9FAB-B29F29CCFD92}.Release|Any CPU.ActiveCfg = Release|Any CPU - {88BD281C-FC0F-4F1E-9FAB-B29F29CCFD92}.Release|Any CPU.Build.0 = Release|Any CPU - {A4DB227B-76AE-4C5F-94E5-538982859066}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A4DB227B-76AE-4C5F-94E5-538982859066}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A4DB227B-76AE-4C5F-94E5-538982859066}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A4DB227B-76AE-4C5F-94E5-538982859066}.Release|Any CPU.Build.0 = Release|Any CPU - {F81630CC-1E0F-4563-AC8A-B8F7447C5618}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F81630CC-1E0F-4563-AC8A-B8F7447C5618}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F81630CC-1E0F-4563-AC8A-B8F7447C5618}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F81630CC-1E0F-4563-AC8A-B8F7447C5618}.Release|Any CPU.Build.0 = Release|Any CPU - {525D8977-AC0F-4392-872D-844B2284EF74}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {525D8977-AC0F-4392-872D-844B2284EF74}.Debug|Any CPU.Build.0 = Debug|Any CPU - {525D8977-AC0F-4392-872D-844B2284EF74}.Release|Any CPU.ActiveCfg = Release|Any CPU - {525D8977-AC0F-4392-872D-844B2284EF74}.Release|Any CPU.Build.0 = Release|Any CPU - {C1FC69E8-5F03-44A0-88C9-502C1DC64AE0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C1FC69E8-5F03-44A0-88C9-502C1DC64AE0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C1FC69E8-5F03-44A0-88C9-502C1DC64AE0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C1FC69E8-5F03-44A0-88C9-502C1DC64AE0}.Release|Any CPU.Build.0 = Release|Any CPU - {283579A7-9747-4018-ABA2-BEE332C895B5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {283579A7-9747-4018-ABA2-BEE332C895B5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {283579A7-9747-4018-ABA2-BEE332C895B5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {283579A7-9747-4018-ABA2-BEE332C895B5}.Release|Any CPU.Build.0 = Release|Any CPU - {72CB92AC-F391-4374-B1BE-82C8AC467578}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {72CB92AC-F391-4374-B1BE-82C8AC467578}.Debug|Any CPU.Build.0 = Debug|Any CPU - {72CB92AC-F391-4374-B1BE-82C8AC467578}.Release|Any CPU.ActiveCfg = Release|Any CPU - {72CB92AC-F391-4374-B1BE-82C8AC467578}.Release|Any CPU.Build.0 = Release|Any CPU - {9B95F68E-F026-4595-B432-F34CA12B5259}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9B95F68E-F026-4595-B432-F34CA12B5259}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9B95F68E-F026-4595-B432-F34CA12B5259}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9B95F68E-F026-4595-B432-F34CA12B5259}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {89EBC37D-B8FF-4275-85B8-7BEA8E2444CF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {B8B37667-046B-43BD-809D-67A4E1FAEBC7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {AE448807-CA5F-460C-9189-33431D47F9A2} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {71AC9E61-E32A-4DE1-B520-C578105D165E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {2DEB23C6-7565-45A7-9477-CF2CE652D363} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {C2167D40-2EC7-4852-A099-257A001E5090} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {93533D41-3A06-4220-A54E-BBC509FCF919} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {88BD281C-FC0F-4F1E-9FAB-B29F29CCFD92} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A4DB227B-76AE-4C5F-94E5-538982859066} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F81630CC-1E0F-4563-AC8A-B8F7447C5618} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {525D8977-AC0F-4392-872D-844B2284EF74} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C1FC69E8-5F03-44A0-88C9-502C1DC64AE0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {283579A7-9747-4018-ABA2-BEE332C895B5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {72CB92AC-F391-4374-B1BE-82C8AC467578} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {9B95F68E-F026-4595-B432-F34CA12B5259} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {C2167D40-2EC7-4852-A099-257A001E5090} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {93533D41-3A06-4220-A54E-BBC509FCF919} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {88BD281C-FC0F-4F1E-9FAB-B29F29CCFD92} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A4DB227B-76AE-4C5F-94E5-538982859066} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F81630CC-1E0F-4563-AC8A-B8F7447C5618} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {525D8977-AC0F-4392-872D-844B2284EF74} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C1FC69E8-5F03-44A0-88C9-502C1DC64AE0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {283579A7-9747-4018-ABA2-BEE332C895B5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {72CB92AC-F391-4374-B1BE-82C8AC467578} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {9B95F68E-F026-4595-B432-F34CA12B5259} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {A2E95C0A-EE97-49F3-A652-912409D48D4F} diff --git a/sdk/src/Services/CostExplorer/Generated/AmazonCostExplorerConfig.cs b/sdk/src/Services/CostExplorer/Generated/AmazonCostExplorerConfig.cs index bb939cb703ea..b4560ce0f9bf 100644 --- a/sdk/src/Services/CostExplorer/Generated/AmazonCostExplorerConfig.cs +++ b/sdk/src/Services/CostExplorer/Generated/AmazonCostExplorerConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.CostExplorer public partial class AmazonCostExplorerConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("Cost Explorer", "4.0.0.0"); private static readonly AmazonCostExplorerEndpointResolver EndpointResolver = new AmazonCostExplorerEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("Cost Explorer", "3.7.401.5"); -======= - InternalSDKUtils.BuildUserAgentString("Cost Explorer", "3.7.401.32"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/CostExplorer/Properties/AssemblyInfo.cs b/sdk/src/Services/CostExplorer/Properties/AssemblyInfo.cs index e34e28fbcced..78c8596dcac5 100644 --- a/sdk/src/Services/CostExplorer/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/CostExplorer/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.5")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.32")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/CostOptimizationHub/CostOptimizationHub.sln b/sdk/src/Services/CostOptimizationHub/CostOptimizationHub.sln index 32522be69c89..2c0a73ac6479 100644 --- a/sdk/src/Services/CostOptimizationHub/CostOptimizationHub.sln +++ b/sdk/src/Services/CostOptimizationHub/CostOptimizationHub.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {DB77ABC5-7BCE-4DAB-AC10-ED4CBBFA9F05}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {DB77ABC5-7BCE-4DAB-AC10-ED4CBBFA9F05}.Debug|Any CPU.Build.0 = Debug|Any CPU {DB77ABC5-7BCE-4DAB-AC10-ED4CBBFA9F05}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {A6F0910F-9FD4-4558-9531-3411CB69ED69}.Debug|Any CPU.Build.0 = Debug|Any CPU {A6F0910F-9FD4-4558-9531-3411CB69ED69}.Release|Any CPU.ActiveCfg = Release|Any CPU {A6F0910F-9FD4-4558-9531-3411CB69ED69}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {82E66184-956C-4F73-8C3B-4D56EBD94973}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {82E66184-956C-4F73-8C3B-4D56EBD94973}.Debug|Any CPU.Build.0 = Debug|Any CPU - {82E66184-956C-4F73-8C3B-4D56EBD94973}.Release|Any CPU.ActiveCfg = Release|Any CPU - {82E66184-956C-4F73-8C3B-4D56EBD94973}.Release|Any CPU.Build.0 = Release|Any CPU - {8EDE34FC-B452-4876-A89A-85914A3AEA64}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8EDE34FC-B452-4876-A89A-85914A3AEA64}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8EDE34FC-B452-4876-A89A-85914A3AEA64}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8EDE34FC-B452-4876-A89A-85914A3AEA64}.Release|Any CPU.Build.0 = Release|Any CPU - {7BF32B3A-5ED6-4161-A938-DFFBF22997D8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7BF32B3A-5ED6-4161-A938-DFFBF22997D8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7BF32B3A-5ED6-4161-A938-DFFBF22997D8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7BF32B3A-5ED6-4161-A938-DFFBF22997D8}.Release|Any CPU.Build.0 = Release|Any CPU - {678F082D-19B8-4F64-90BD-88DA12F7B4CC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {678F082D-19B8-4F64-90BD-88DA12F7B4CC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {678F082D-19B8-4F64-90BD-88DA12F7B4CC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {678F082D-19B8-4F64-90BD-88DA12F7B4CC}.Release|Any CPU.Build.0 = Release|Any CPU - {1B5A1A2D-F6C6-4427-BB47-2EE3186F1BB3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1B5A1A2D-F6C6-4427-BB47-2EE3186F1BB3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1B5A1A2D-F6C6-4427-BB47-2EE3186F1BB3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1B5A1A2D-F6C6-4427-BB47-2EE3186F1BB3}.Release|Any CPU.Build.0 = Release|Any CPU - {64F7D712-5D21-498C-89B9-70306F251FF4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {64F7D712-5D21-498C-89B9-70306F251FF4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {64F7D712-5D21-498C-89B9-70306F251FF4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {64F7D712-5D21-498C-89B9-70306F251FF4}.Release|Any CPU.Build.0 = Release|Any CPU - {00162F00-0E05-444C-B7B1-052EED57DADF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {00162F00-0E05-444C-B7B1-052EED57DADF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {00162F00-0E05-444C-B7B1-052EED57DADF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {00162F00-0E05-444C-B7B1-052EED57DADF}.Release|Any CPU.Build.0 = Release|Any CPU - {A760BB08-6B93-4B21-89E9-7555EEDDA0A5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A760BB08-6B93-4B21-89E9-7555EEDDA0A5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A760BB08-6B93-4B21-89E9-7555EEDDA0A5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A760BB08-6B93-4B21-89E9-7555EEDDA0A5}.Release|Any CPU.Build.0 = Release|Any CPU - {7E10B1DA-6C72-40D8-A7D6-BA0931AF960E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7E10B1DA-6C72-40D8-A7D6-BA0931AF960E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7E10B1DA-6C72-40D8-A7D6-BA0931AF960E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7E10B1DA-6C72-40D8-A7D6-BA0931AF960E}.Release|Any CPU.Build.0 = Release|Any CPU - {3255D7A8-C465-41FF-83C5-1B18323B616C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3255D7A8-C465-41FF-83C5-1B18323B616C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3255D7A8-C465-41FF-83C5-1B18323B616C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3255D7A8-C465-41FF-83C5-1B18323B616C}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {82E66184-956C-4F73-8C3B-4D56EBD94973}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {82E66184-956C-4F73-8C3B-4D56EBD94973}.Debug|Any CPU.Build.0 = Debug|Any CPU - {82E66184-956C-4F73-8C3B-4D56EBD94973}.Release|Any CPU.ActiveCfg = Release|Any CPU - {82E66184-956C-4F73-8C3B-4D56EBD94973}.Release|Any CPU.Build.0 = Release|Any CPU - {8EDE34FC-B452-4876-A89A-85914A3AEA64}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8EDE34FC-B452-4876-A89A-85914A3AEA64}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8EDE34FC-B452-4876-A89A-85914A3AEA64}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8EDE34FC-B452-4876-A89A-85914A3AEA64}.Release|Any CPU.Build.0 = Release|Any CPU - {7BF32B3A-5ED6-4161-A938-DFFBF22997D8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7BF32B3A-5ED6-4161-A938-DFFBF22997D8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7BF32B3A-5ED6-4161-A938-DFFBF22997D8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7BF32B3A-5ED6-4161-A938-DFFBF22997D8}.Release|Any CPU.Build.0 = Release|Any CPU - {678F082D-19B8-4F64-90BD-88DA12F7B4CC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {678F082D-19B8-4F64-90BD-88DA12F7B4CC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {678F082D-19B8-4F64-90BD-88DA12F7B4CC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {678F082D-19B8-4F64-90BD-88DA12F7B4CC}.Release|Any CPU.Build.0 = Release|Any CPU - {1B5A1A2D-F6C6-4427-BB47-2EE3186F1BB3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1B5A1A2D-F6C6-4427-BB47-2EE3186F1BB3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1B5A1A2D-F6C6-4427-BB47-2EE3186F1BB3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1B5A1A2D-F6C6-4427-BB47-2EE3186F1BB3}.Release|Any CPU.Build.0 = Release|Any CPU - {64F7D712-5D21-498C-89B9-70306F251FF4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {64F7D712-5D21-498C-89B9-70306F251FF4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {64F7D712-5D21-498C-89B9-70306F251FF4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {64F7D712-5D21-498C-89B9-70306F251FF4}.Release|Any CPU.Build.0 = Release|Any CPU - {00162F00-0E05-444C-B7B1-052EED57DADF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {00162F00-0E05-444C-B7B1-052EED57DADF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {00162F00-0E05-444C-B7B1-052EED57DADF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {00162F00-0E05-444C-B7B1-052EED57DADF}.Release|Any CPU.Build.0 = Release|Any CPU - {A760BB08-6B93-4B21-89E9-7555EEDDA0A5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A760BB08-6B93-4B21-89E9-7555EEDDA0A5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A760BB08-6B93-4B21-89E9-7555EEDDA0A5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A760BB08-6B93-4B21-89E9-7555EEDDA0A5}.Release|Any CPU.Build.0 = Release|Any CPU - {7E10B1DA-6C72-40D8-A7D6-BA0931AF960E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7E10B1DA-6C72-40D8-A7D6-BA0931AF960E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7E10B1DA-6C72-40D8-A7D6-BA0931AF960E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7E10B1DA-6C72-40D8-A7D6-BA0931AF960E}.Release|Any CPU.Build.0 = Release|Any CPU - {3255D7A8-C465-41FF-83C5-1B18323B616C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3255D7A8-C465-41FF-83C5-1B18323B616C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3255D7A8-C465-41FF-83C5-1B18323B616C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3255D7A8-C465-41FF-83C5-1B18323B616C}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {DB77ABC5-7BCE-4DAB-AC10-ED4CBBFA9F05} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {07F26EB9-506A-4096-A494-87D6DC679E44} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {05F1C716-A472-4936-A66D-BDABC569E322} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {060E8723-0908-46E3-BD21-695BC68DE92D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {A6F0910F-9FD4-4558-9531-3411CB69ED69} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {82E66184-956C-4F73-8C3B-4D56EBD94973} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8EDE34FC-B452-4876-A89A-85914A3AEA64} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {7BF32B3A-5ED6-4161-A938-DFFBF22997D8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {678F082D-19B8-4F64-90BD-88DA12F7B4CC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {1B5A1A2D-F6C6-4427-BB47-2EE3186F1BB3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {64F7D712-5D21-498C-89B9-70306F251FF4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {00162F00-0E05-444C-B7B1-052EED57DADF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A760BB08-6B93-4B21-89E9-7555EEDDA0A5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {7E10B1DA-6C72-40D8-A7D6-BA0931AF960E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {3255D7A8-C465-41FF-83C5-1B18323B616C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {82E66184-956C-4F73-8C3B-4D56EBD94973} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8EDE34FC-B452-4876-A89A-85914A3AEA64} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {7BF32B3A-5ED6-4161-A938-DFFBF22997D8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {678F082D-19B8-4F64-90BD-88DA12F7B4CC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {1B5A1A2D-F6C6-4427-BB47-2EE3186F1BB3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {64F7D712-5D21-498C-89B9-70306F251FF4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {00162F00-0E05-444C-B7B1-052EED57DADF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A760BB08-6B93-4B21-89E9-7555EEDDA0A5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {7E10B1DA-6C72-40D8-A7D6-BA0931AF960E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {3255D7A8-C465-41FF-83C5-1B18323B616C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {A49FF592-05FD-4043-8E71-6195EE27AD8C} diff --git a/sdk/src/Services/CostOptimizationHub/Generated/AmazonCostOptimizationHubConfig.cs b/sdk/src/Services/CostOptimizationHub/Generated/AmazonCostOptimizationHubConfig.cs index e80b8898abcf..f604dcc097f8 100644 --- a/sdk/src/Services/CostOptimizationHub/Generated/AmazonCostOptimizationHubConfig.cs +++ b/sdk/src/Services/CostOptimizationHub/Generated/AmazonCostOptimizationHubConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.CostOptimizationHub public partial class AmazonCostOptimizationHubConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("Cost Optimization Hub", "4.0.0.0"); private static readonly AmazonCostOptimizationHubEndpointResolver EndpointResolver = new AmazonCostOptimizationHubEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("Cost Optimization Hub", "3.7.401.23"); -======= - InternalSDKUtils.BuildUserAgentString("Cost Optimization Hub", "3.7.401.50"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/CostOptimizationHub/Properties/AssemblyInfo.cs b/sdk/src/Services/CostOptimizationHub/Properties/AssemblyInfo.cs index 00b06198a7a4..9df13a9bff0f 100644 --- a/sdk/src/Services/CostOptimizationHub/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/CostOptimizationHub/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.23")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.50")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/CustomerProfiles/CustomerProfiles.sln b/sdk/src/Services/CustomerProfiles/CustomerProfiles.sln index 03383af83bde..32cf2804fd6a 100644 --- a/sdk/src/Services/CustomerProfiles/CustomerProfiles.sln +++ b/sdk/src/Services/CustomerProfiles/CustomerProfiles.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {5280F974-368A-4379-A5DE-1515CB8B9674}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {5280F974-368A-4379-A5DE-1515CB8B9674}.Debug|Any CPU.Build.0 = Debug|Any CPU {5280F974-368A-4379-A5DE-1515CB8B9674}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {792E4972-4190-4FCF-ACA1-2825D79D0A7A}.Debug|Any CPU.Build.0 = Debug|Any CPU {792E4972-4190-4FCF-ACA1-2825D79D0A7A}.Release|Any CPU.ActiveCfg = Release|Any CPU {792E4972-4190-4FCF-ACA1-2825D79D0A7A}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {46496B76-9904-42E9-B2B0-AF51F9C518C8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {46496B76-9904-42E9-B2B0-AF51F9C518C8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {46496B76-9904-42E9-B2B0-AF51F9C518C8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {46496B76-9904-42E9-B2B0-AF51F9C518C8}.Release|Any CPU.Build.0 = Release|Any CPU - {35757B26-8AF0-4416-B535-2D4BE2A0F963}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {35757B26-8AF0-4416-B535-2D4BE2A0F963}.Debug|Any CPU.Build.0 = Debug|Any CPU - {35757B26-8AF0-4416-B535-2D4BE2A0F963}.Release|Any CPU.ActiveCfg = Release|Any CPU - {35757B26-8AF0-4416-B535-2D4BE2A0F963}.Release|Any CPU.Build.0 = Release|Any CPU - {CB7A3272-5264-4116-920F-B15D578C9633}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CB7A3272-5264-4116-920F-B15D578C9633}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CB7A3272-5264-4116-920F-B15D578C9633}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CB7A3272-5264-4116-920F-B15D578C9633}.Release|Any CPU.Build.0 = Release|Any CPU - {6A6D72C6-E247-45AA-BA9E-5924F4D43A18}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6A6D72C6-E247-45AA-BA9E-5924F4D43A18}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6A6D72C6-E247-45AA-BA9E-5924F4D43A18}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6A6D72C6-E247-45AA-BA9E-5924F4D43A18}.Release|Any CPU.Build.0 = Release|Any CPU - {5FA948A8-C9B9-4330-AFED-0A22553AB590}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5FA948A8-C9B9-4330-AFED-0A22553AB590}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5FA948A8-C9B9-4330-AFED-0A22553AB590}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5FA948A8-C9B9-4330-AFED-0A22553AB590}.Release|Any CPU.Build.0 = Release|Any CPU - {572F25BC-4555-4005-A33E-2A4F5EEE01CE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {572F25BC-4555-4005-A33E-2A4F5EEE01CE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {572F25BC-4555-4005-A33E-2A4F5EEE01CE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {572F25BC-4555-4005-A33E-2A4F5EEE01CE}.Release|Any CPU.Build.0 = Release|Any CPU - {C56D4A9C-3C33-4318-A52F-39A2E9971F5D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C56D4A9C-3C33-4318-A52F-39A2E9971F5D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C56D4A9C-3C33-4318-A52F-39A2E9971F5D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C56D4A9C-3C33-4318-A52F-39A2E9971F5D}.Release|Any CPU.Build.0 = Release|Any CPU - {432051E5-2C12-4F1C-8658-2295F4D8EABC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {432051E5-2C12-4F1C-8658-2295F4D8EABC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {432051E5-2C12-4F1C-8658-2295F4D8EABC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {432051E5-2C12-4F1C-8658-2295F4D8EABC}.Release|Any CPU.Build.0 = Release|Any CPU - {708EAC72-3860-4185-9868-F2586FC1593E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {708EAC72-3860-4185-9868-F2586FC1593E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {708EAC72-3860-4185-9868-F2586FC1593E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {708EAC72-3860-4185-9868-F2586FC1593E}.Release|Any CPU.Build.0 = Release|Any CPU - {FD573CF8-03ED-4B23-BC7D-172EC45AB5F7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FD573CF8-03ED-4B23-BC7D-172EC45AB5F7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FD573CF8-03ED-4B23-BC7D-172EC45AB5F7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FD573CF8-03ED-4B23-BC7D-172EC45AB5F7}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {46496B76-9904-42E9-B2B0-AF51F9C518C8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {46496B76-9904-42E9-B2B0-AF51F9C518C8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {46496B76-9904-42E9-B2B0-AF51F9C518C8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {46496B76-9904-42E9-B2B0-AF51F9C518C8}.Release|Any CPU.Build.0 = Release|Any CPU - {35757B26-8AF0-4416-B535-2D4BE2A0F963}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {35757B26-8AF0-4416-B535-2D4BE2A0F963}.Debug|Any CPU.Build.0 = Debug|Any CPU - {35757B26-8AF0-4416-B535-2D4BE2A0F963}.Release|Any CPU.ActiveCfg = Release|Any CPU - {35757B26-8AF0-4416-B535-2D4BE2A0F963}.Release|Any CPU.Build.0 = Release|Any CPU - {CB7A3272-5264-4116-920F-B15D578C9633}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CB7A3272-5264-4116-920F-B15D578C9633}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CB7A3272-5264-4116-920F-B15D578C9633}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CB7A3272-5264-4116-920F-B15D578C9633}.Release|Any CPU.Build.0 = Release|Any CPU - {6A6D72C6-E247-45AA-BA9E-5924F4D43A18}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6A6D72C6-E247-45AA-BA9E-5924F4D43A18}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6A6D72C6-E247-45AA-BA9E-5924F4D43A18}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6A6D72C6-E247-45AA-BA9E-5924F4D43A18}.Release|Any CPU.Build.0 = Release|Any CPU - {5FA948A8-C9B9-4330-AFED-0A22553AB590}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5FA948A8-C9B9-4330-AFED-0A22553AB590}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5FA948A8-C9B9-4330-AFED-0A22553AB590}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5FA948A8-C9B9-4330-AFED-0A22553AB590}.Release|Any CPU.Build.0 = Release|Any CPU - {572F25BC-4555-4005-A33E-2A4F5EEE01CE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {572F25BC-4555-4005-A33E-2A4F5EEE01CE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {572F25BC-4555-4005-A33E-2A4F5EEE01CE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {572F25BC-4555-4005-A33E-2A4F5EEE01CE}.Release|Any CPU.Build.0 = Release|Any CPU - {C56D4A9C-3C33-4318-A52F-39A2E9971F5D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C56D4A9C-3C33-4318-A52F-39A2E9971F5D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C56D4A9C-3C33-4318-A52F-39A2E9971F5D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C56D4A9C-3C33-4318-A52F-39A2E9971F5D}.Release|Any CPU.Build.0 = Release|Any CPU - {432051E5-2C12-4F1C-8658-2295F4D8EABC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {432051E5-2C12-4F1C-8658-2295F4D8EABC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {432051E5-2C12-4F1C-8658-2295F4D8EABC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {432051E5-2C12-4F1C-8658-2295F4D8EABC}.Release|Any CPU.Build.0 = Release|Any CPU - {708EAC72-3860-4185-9868-F2586FC1593E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {708EAC72-3860-4185-9868-F2586FC1593E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {708EAC72-3860-4185-9868-F2586FC1593E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {708EAC72-3860-4185-9868-F2586FC1593E}.Release|Any CPU.Build.0 = Release|Any CPU - {FD573CF8-03ED-4B23-BC7D-172EC45AB5F7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FD573CF8-03ED-4B23-BC7D-172EC45AB5F7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FD573CF8-03ED-4B23-BC7D-172EC45AB5F7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FD573CF8-03ED-4B23-BC7D-172EC45AB5F7}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {5280F974-368A-4379-A5DE-1515CB8B9674} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {A83DB2E4-E9F2-4652-B01A-1BD2495B925D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {27430E99-013D-4274-AF52-17217CE21D32} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {EC86D19D-49EF-4672-8C84-A5C8D0E22019} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {792E4972-4190-4FCF-ACA1-2825D79D0A7A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {46496B76-9904-42E9-B2B0-AF51F9C518C8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {35757B26-8AF0-4416-B535-2D4BE2A0F963} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {CB7A3272-5264-4116-920F-B15D578C9633} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6A6D72C6-E247-45AA-BA9E-5924F4D43A18} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {5FA948A8-C9B9-4330-AFED-0A22553AB590} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {572F25BC-4555-4005-A33E-2A4F5EEE01CE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C56D4A9C-3C33-4318-A52F-39A2E9971F5D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {432051E5-2C12-4F1C-8658-2295F4D8EABC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {708EAC72-3860-4185-9868-F2586FC1593E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {FD573CF8-03ED-4B23-BC7D-172EC45AB5F7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {46496B76-9904-42E9-B2B0-AF51F9C518C8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {35757B26-8AF0-4416-B535-2D4BE2A0F963} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {CB7A3272-5264-4116-920F-B15D578C9633} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6A6D72C6-E247-45AA-BA9E-5924F4D43A18} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {5FA948A8-C9B9-4330-AFED-0A22553AB590} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {572F25BC-4555-4005-A33E-2A4F5EEE01CE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C56D4A9C-3C33-4318-A52F-39A2E9971F5D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {432051E5-2C12-4F1C-8658-2295F4D8EABC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {708EAC72-3860-4185-9868-F2586FC1593E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {FD573CF8-03ED-4B23-BC7D-172EC45AB5F7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {83BD277A-D58F-43B0-84AB-1902D9906BF9} diff --git a/sdk/src/Services/CustomerProfiles/Generated/AmazonCustomerProfilesConfig.cs b/sdk/src/Services/CustomerProfiles/Generated/AmazonCustomerProfilesConfig.cs index 6e6990dbade6..62ef715279d0 100644 --- a/sdk/src/Services/CustomerProfiles/Generated/AmazonCustomerProfilesConfig.cs +++ b/sdk/src/Services/CustomerProfiles/Generated/AmazonCustomerProfilesConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.CustomerProfiles public partial class AmazonCustomerProfilesConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("Customer Profiles", "4.0.0.0"); private static readonly AmazonCustomerProfilesEndpointResolver EndpointResolver = new AmazonCustomerProfilesEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("Customer Profiles", "3.7.401.0"); -======= - InternalSDKUtils.BuildUserAgentString("Customer Profiles", "3.7.401.27"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/CustomerProfiles/Properties/AssemblyInfo.cs b/sdk/src/Services/CustomerProfiles/Properties/AssemblyInfo.cs index 5b45dd1e803d..87ca39f94539 100644 --- a/sdk/src/Services/CustomerProfiles/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/CustomerProfiles/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.0")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.27")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/DAX/DAX.sln b/sdk/src/Services/DAX/DAX.sln index 07ccc93b1b41..de6aa492ca19 100644 --- a/sdk/src/Services/DAX/DAX.sln +++ b/sdk/src/Services/DAX/DAX.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {43268163-AA72-4342-A4A6-5ABFB480ED79}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {43268163-AA72-4342-A4A6-5ABFB480ED79}.Debug|Any CPU.Build.0 = Debug|Any CPU {43268163-AA72-4342-A4A6-5ABFB480ED79}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {3F39F465-45AD-486D-A65C-42926AC58840}.Debug|Any CPU.Build.0 = Debug|Any CPU {3F39F465-45AD-486D-A65C-42926AC58840}.Release|Any CPU.ActiveCfg = Release|Any CPU {3F39F465-45AD-486D-A65C-42926AC58840}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {39E5A9A5-EB5F-4605-8EA4-FB500E61F974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {39E5A9A5-EB5F-4605-8EA4-FB500E61F974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {39E5A9A5-EB5F-4605-8EA4-FB500E61F974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {39E5A9A5-EB5F-4605-8EA4-FB500E61F974}.Release|Any CPU.Build.0 = Release|Any CPU - {EAD8A6E0-46D1-4EDF-B803-701F97F45DFB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EAD8A6E0-46D1-4EDF-B803-701F97F45DFB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EAD8A6E0-46D1-4EDF-B803-701F97F45DFB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EAD8A6E0-46D1-4EDF-B803-701F97F45DFB}.Release|Any CPU.Build.0 = Release|Any CPU - {A469F9E4-9FC8-4561-AFA3-B3094E137178}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A469F9E4-9FC8-4561-AFA3-B3094E137178}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A469F9E4-9FC8-4561-AFA3-B3094E137178}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A469F9E4-9FC8-4561-AFA3-B3094E137178}.Release|Any CPU.Build.0 = Release|Any CPU - {951B3B79-2FA6-4A2A-A5B3-C70AB71790E5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {951B3B79-2FA6-4A2A-A5B3-C70AB71790E5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {951B3B79-2FA6-4A2A-A5B3-C70AB71790E5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {951B3B79-2FA6-4A2A-A5B3-C70AB71790E5}.Release|Any CPU.Build.0 = Release|Any CPU - {DF705042-1EF9-4D01-9B69-C2DC2385731D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DF705042-1EF9-4D01-9B69-C2DC2385731D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DF705042-1EF9-4D01-9B69-C2DC2385731D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DF705042-1EF9-4D01-9B69-C2DC2385731D}.Release|Any CPU.Build.0 = Release|Any CPU - {573795E3-6708-440C-8A74-60E7961F3EF8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {573795E3-6708-440C-8A74-60E7961F3EF8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {573795E3-6708-440C-8A74-60E7961F3EF8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {573795E3-6708-440C-8A74-60E7961F3EF8}.Release|Any CPU.Build.0 = Release|Any CPU - {2891E839-3C2A-4323-B153-DA9BED0A794F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2891E839-3C2A-4323-B153-DA9BED0A794F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2891E839-3C2A-4323-B153-DA9BED0A794F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2891E839-3C2A-4323-B153-DA9BED0A794F}.Release|Any CPU.Build.0 = Release|Any CPU - {86EA2604-E99B-45F8-8BB0-BAA5C73291AE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {86EA2604-E99B-45F8-8BB0-BAA5C73291AE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {86EA2604-E99B-45F8-8BB0-BAA5C73291AE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {86EA2604-E99B-45F8-8BB0-BAA5C73291AE}.Release|Any CPU.Build.0 = Release|Any CPU - {DB14334F-CAA8-440B-9F97-C2C6D68697DE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DB14334F-CAA8-440B-9F97-C2C6D68697DE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DB14334F-CAA8-440B-9F97-C2C6D68697DE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DB14334F-CAA8-440B-9F97-C2C6D68697DE}.Release|Any CPU.Build.0 = Release|Any CPU - {6B0E3D6D-50E8-481C-96E5-9B00272C568D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6B0E3D6D-50E8-481C-96E5-9B00272C568D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6B0E3D6D-50E8-481C-96E5-9B00272C568D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6B0E3D6D-50E8-481C-96E5-9B00272C568D}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {39E5A9A5-EB5F-4605-8EA4-FB500E61F974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {39E5A9A5-EB5F-4605-8EA4-FB500E61F974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {39E5A9A5-EB5F-4605-8EA4-FB500E61F974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {39E5A9A5-EB5F-4605-8EA4-FB500E61F974}.Release|Any CPU.Build.0 = Release|Any CPU - {EAD8A6E0-46D1-4EDF-B803-701F97F45DFB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EAD8A6E0-46D1-4EDF-B803-701F97F45DFB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EAD8A6E0-46D1-4EDF-B803-701F97F45DFB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EAD8A6E0-46D1-4EDF-B803-701F97F45DFB}.Release|Any CPU.Build.0 = Release|Any CPU - {A469F9E4-9FC8-4561-AFA3-B3094E137178}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A469F9E4-9FC8-4561-AFA3-B3094E137178}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A469F9E4-9FC8-4561-AFA3-B3094E137178}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A469F9E4-9FC8-4561-AFA3-B3094E137178}.Release|Any CPU.Build.0 = Release|Any CPU - {951B3B79-2FA6-4A2A-A5B3-C70AB71790E5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {951B3B79-2FA6-4A2A-A5B3-C70AB71790E5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {951B3B79-2FA6-4A2A-A5B3-C70AB71790E5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {951B3B79-2FA6-4A2A-A5B3-C70AB71790E5}.Release|Any CPU.Build.0 = Release|Any CPU - {DF705042-1EF9-4D01-9B69-C2DC2385731D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DF705042-1EF9-4D01-9B69-C2DC2385731D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DF705042-1EF9-4D01-9B69-C2DC2385731D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DF705042-1EF9-4D01-9B69-C2DC2385731D}.Release|Any CPU.Build.0 = Release|Any CPU - {573795E3-6708-440C-8A74-60E7961F3EF8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {573795E3-6708-440C-8A74-60E7961F3EF8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {573795E3-6708-440C-8A74-60E7961F3EF8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {573795E3-6708-440C-8A74-60E7961F3EF8}.Release|Any CPU.Build.0 = Release|Any CPU - {2891E839-3C2A-4323-B153-DA9BED0A794F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2891E839-3C2A-4323-B153-DA9BED0A794F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2891E839-3C2A-4323-B153-DA9BED0A794F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2891E839-3C2A-4323-B153-DA9BED0A794F}.Release|Any CPU.Build.0 = Release|Any CPU - {86EA2604-E99B-45F8-8BB0-BAA5C73291AE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {86EA2604-E99B-45F8-8BB0-BAA5C73291AE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {86EA2604-E99B-45F8-8BB0-BAA5C73291AE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {86EA2604-E99B-45F8-8BB0-BAA5C73291AE}.Release|Any CPU.Build.0 = Release|Any CPU - {DB14334F-CAA8-440B-9F97-C2C6D68697DE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DB14334F-CAA8-440B-9F97-C2C6D68697DE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DB14334F-CAA8-440B-9F97-C2C6D68697DE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DB14334F-CAA8-440B-9F97-C2C6D68697DE}.Release|Any CPU.Build.0 = Release|Any CPU - {6B0E3D6D-50E8-481C-96E5-9B00272C568D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6B0E3D6D-50E8-481C-96E5-9B00272C568D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6B0E3D6D-50E8-481C-96E5-9B00272C568D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6B0E3D6D-50E8-481C-96E5-9B00272C568D}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {43268163-AA72-4342-A4A6-5ABFB480ED79} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {D620814A-D23B-4E8C-B174-7BFAC4A56E27} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {DC49FBA4-8F6F-42D6-9500-35D95788B4EC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {20CF1E23-76EA-4347-998B-2878D093EE0B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {3F39F465-45AD-486D-A65C-42926AC58840} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {39E5A9A5-EB5F-4605-8EA4-FB500E61F974} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {EAD8A6E0-46D1-4EDF-B803-701F97F45DFB} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A469F9E4-9FC8-4561-AFA3-B3094E137178} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {951B3B79-2FA6-4A2A-A5B3-C70AB71790E5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {DF705042-1EF9-4D01-9B69-C2DC2385731D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {573795E3-6708-440C-8A74-60E7961F3EF8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {2891E839-3C2A-4323-B153-DA9BED0A794F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {86EA2604-E99B-45F8-8BB0-BAA5C73291AE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {DB14334F-CAA8-440B-9F97-C2C6D68697DE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6B0E3D6D-50E8-481C-96E5-9B00272C568D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {39E5A9A5-EB5F-4605-8EA4-FB500E61F974} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {EAD8A6E0-46D1-4EDF-B803-701F97F45DFB} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A469F9E4-9FC8-4561-AFA3-B3094E137178} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {951B3B79-2FA6-4A2A-A5B3-C70AB71790E5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {DF705042-1EF9-4D01-9B69-C2DC2385731D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {573795E3-6708-440C-8A74-60E7961F3EF8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {2891E839-3C2A-4323-B153-DA9BED0A794F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {86EA2604-E99B-45F8-8BB0-BAA5C73291AE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {DB14334F-CAA8-440B-9F97-C2C6D68697DE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6B0E3D6D-50E8-481C-96E5-9B00272C568D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {B7C255F3-A16A-4426-B441-757764B23455} diff --git a/sdk/src/Services/DAX/Generated/AmazonDAXConfig.cs b/sdk/src/Services/DAX/Generated/AmazonDAXConfig.cs index e01b7eee48e4..eba941fbe68a 100644 --- a/sdk/src/Services/DAX/Generated/AmazonDAXConfig.cs +++ b/sdk/src/Services/DAX/Generated/AmazonDAXConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.DAX public partial class AmazonDAXConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("DAX", "4.0.0.0"); private static readonly AmazonDAXEndpointResolver EndpointResolver = new AmazonDAXEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("DAX", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("DAX", "3.7.400.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/DAX/Properties/AssemblyInfo.cs b/sdk/src/Services/DAX/Properties/AssemblyInfo.cs index 778eb744a791..647e84331f09 100644 --- a/sdk/src/Services/DAX/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/DAX/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/DLM/DLM.sln b/sdk/src/Services/DLM/DLM.sln index 6ead3584b172..34b7e3f59721 100644 --- a/sdk/src/Services/DLM/DLM.sln +++ b/sdk/src/Services/DLM/DLM.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {C2E44319-66C8-45E6-A958-83A1145954ED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {C2E44319-66C8-45E6-A958-83A1145954ED}.Debug|Any CPU.Build.0 = Debug|Any CPU {C2E44319-66C8-45E6-A958-83A1145954ED}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {7DDEEB8D-AF11-4FD8-A8BB-EB74637E515D}.Debug|Any CPU.Build.0 = Debug|Any CPU {7DDEEB8D-AF11-4FD8-A8BB-EB74637E515D}.Release|Any CPU.ActiveCfg = Release|Any CPU {7DDEEB8D-AF11-4FD8-A8BB-EB74637E515D}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {0A8B16F2-ED2B-4C03-BF24-1FE8BDA24523}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0A8B16F2-ED2B-4C03-BF24-1FE8BDA24523}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0A8B16F2-ED2B-4C03-BF24-1FE8BDA24523}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0A8B16F2-ED2B-4C03-BF24-1FE8BDA24523}.Release|Any CPU.Build.0 = Release|Any CPU - {E3875E76-18B2-4D99-B6C7-A1E9FCE22ED1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E3875E76-18B2-4D99-B6C7-A1E9FCE22ED1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E3875E76-18B2-4D99-B6C7-A1E9FCE22ED1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E3875E76-18B2-4D99-B6C7-A1E9FCE22ED1}.Release|Any CPU.Build.0 = Release|Any CPU - {945041B7-C967-4DDA-AC27-1C5250374E07}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {945041B7-C967-4DDA-AC27-1C5250374E07}.Debug|Any CPU.Build.0 = Debug|Any CPU - {945041B7-C967-4DDA-AC27-1C5250374E07}.Release|Any CPU.ActiveCfg = Release|Any CPU - {945041B7-C967-4DDA-AC27-1C5250374E07}.Release|Any CPU.Build.0 = Release|Any CPU - {D003AC11-AE4B-4FDE-9639-8A434A679821}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D003AC11-AE4B-4FDE-9639-8A434A679821}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D003AC11-AE4B-4FDE-9639-8A434A679821}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D003AC11-AE4B-4FDE-9639-8A434A679821}.Release|Any CPU.Build.0 = Release|Any CPU - {75AE3129-626B-4765-808B-3191CF67F60B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {75AE3129-626B-4765-808B-3191CF67F60B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {75AE3129-626B-4765-808B-3191CF67F60B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {75AE3129-626B-4765-808B-3191CF67F60B}.Release|Any CPU.Build.0 = Release|Any CPU - {541FC3D6-354D-49E5-9040-61953B8079FE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {541FC3D6-354D-49E5-9040-61953B8079FE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {541FC3D6-354D-49E5-9040-61953B8079FE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {541FC3D6-354D-49E5-9040-61953B8079FE}.Release|Any CPU.Build.0 = Release|Any CPU - {0F5298AC-608D-498F-A39E-C426C5FA7E63}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0F5298AC-608D-498F-A39E-C426C5FA7E63}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0F5298AC-608D-498F-A39E-C426C5FA7E63}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0F5298AC-608D-498F-A39E-C426C5FA7E63}.Release|Any CPU.Build.0 = Release|Any CPU - {743F4338-4BFC-4844-9927-F4F60E28A95A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {743F4338-4BFC-4844-9927-F4F60E28A95A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {743F4338-4BFC-4844-9927-F4F60E28A95A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {743F4338-4BFC-4844-9927-F4F60E28A95A}.Release|Any CPU.Build.0 = Release|Any CPU - {B492AEEB-E89B-4C0D-809C-9EAEA6281884}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B492AEEB-E89B-4C0D-809C-9EAEA6281884}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B492AEEB-E89B-4C0D-809C-9EAEA6281884}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B492AEEB-E89B-4C0D-809C-9EAEA6281884}.Release|Any CPU.Build.0 = Release|Any CPU - {FF05F810-1A68-42F4-9A39-84A0C44EABC8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FF05F810-1A68-42F4-9A39-84A0C44EABC8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FF05F810-1A68-42F4-9A39-84A0C44EABC8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FF05F810-1A68-42F4-9A39-84A0C44EABC8}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {0A8B16F2-ED2B-4C03-BF24-1FE8BDA24523}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0A8B16F2-ED2B-4C03-BF24-1FE8BDA24523}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0A8B16F2-ED2B-4C03-BF24-1FE8BDA24523}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0A8B16F2-ED2B-4C03-BF24-1FE8BDA24523}.Release|Any CPU.Build.0 = Release|Any CPU - {E3875E76-18B2-4D99-B6C7-A1E9FCE22ED1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E3875E76-18B2-4D99-B6C7-A1E9FCE22ED1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E3875E76-18B2-4D99-B6C7-A1E9FCE22ED1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E3875E76-18B2-4D99-B6C7-A1E9FCE22ED1}.Release|Any CPU.Build.0 = Release|Any CPU - {945041B7-C967-4DDA-AC27-1C5250374E07}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {945041B7-C967-4DDA-AC27-1C5250374E07}.Debug|Any CPU.Build.0 = Debug|Any CPU - {945041B7-C967-4DDA-AC27-1C5250374E07}.Release|Any CPU.ActiveCfg = Release|Any CPU - {945041B7-C967-4DDA-AC27-1C5250374E07}.Release|Any CPU.Build.0 = Release|Any CPU - {D003AC11-AE4B-4FDE-9639-8A434A679821}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D003AC11-AE4B-4FDE-9639-8A434A679821}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D003AC11-AE4B-4FDE-9639-8A434A679821}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D003AC11-AE4B-4FDE-9639-8A434A679821}.Release|Any CPU.Build.0 = Release|Any CPU - {75AE3129-626B-4765-808B-3191CF67F60B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {75AE3129-626B-4765-808B-3191CF67F60B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {75AE3129-626B-4765-808B-3191CF67F60B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {75AE3129-626B-4765-808B-3191CF67F60B}.Release|Any CPU.Build.0 = Release|Any CPU - {541FC3D6-354D-49E5-9040-61953B8079FE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {541FC3D6-354D-49E5-9040-61953B8079FE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {541FC3D6-354D-49E5-9040-61953B8079FE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {541FC3D6-354D-49E5-9040-61953B8079FE}.Release|Any CPU.Build.0 = Release|Any CPU - {0F5298AC-608D-498F-A39E-C426C5FA7E63}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0F5298AC-608D-498F-A39E-C426C5FA7E63}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0F5298AC-608D-498F-A39E-C426C5FA7E63}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0F5298AC-608D-498F-A39E-C426C5FA7E63}.Release|Any CPU.Build.0 = Release|Any CPU - {743F4338-4BFC-4844-9927-F4F60E28A95A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {743F4338-4BFC-4844-9927-F4F60E28A95A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {743F4338-4BFC-4844-9927-F4F60E28A95A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {743F4338-4BFC-4844-9927-F4F60E28A95A}.Release|Any CPU.Build.0 = Release|Any CPU - {B492AEEB-E89B-4C0D-809C-9EAEA6281884}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B492AEEB-E89B-4C0D-809C-9EAEA6281884}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B492AEEB-E89B-4C0D-809C-9EAEA6281884}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B492AEEB-E89B-4C0D-809C-9EAEA6281884}.Release|Any CPU.Build.0 = Release|Any CPU - {FF05F810-1A68-42F4-9A39-84A0C44EABC8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FF05F810-1A68-42F4-9A39-84A0C44EABC8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FF05F810-1A68-42F4-9A39-84A0C44EABC8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FF05F810-1A68-42F4-9A39-84A0C44EABC8}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {C2E44319-66C8-45E6-A958-83A1145954ED} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {CE3F77CC-5F0A-4FE0-AFAB-D7F6202A2594} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {A2730B83-2AA1-48C1-B5BD-8D30DC1B7DEF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {6F4F36D4-752C-4199-A8AE-6683AABB5974} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {7DDEEB8D-AF11-4FD8-A8BB-EB74637E515D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {0A8B16F2-ED2B-4C03-BF24-1FE8BDA24523} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E3875E76-18B2-4D99-B6C7-A1E9FCE22ED1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {945041B7-C967-4DDA-AC27-1C5250374E07} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D003AC11-AE4B-4FDE-9639-8A434A679821} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {75AE3129-626B-4765-808B-3191CF67F60B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {541FC3D6-354D-49E5-9040-61953B8079FE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0F5298AC-608D-498F-A39E-C426C5FA7E63} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {743F4338-4BFC-4844-9927-F4F60E28A95A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B492AEEB-E89B-4C0D-809C-9EAEA6281884} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {FF05F810-1A68-42F4-9A39-84A0C44EABC8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {0A8B16F2-ED2B-4C03-BF24-1FE8BDA24523} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E3875E76-18B2-4D99-B6C7-A1E9FCE22ED1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {945041B7-C967-4DDA-AC27-1C5250374E07} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D003AC11-AE4B-4FDE-9639-8A434A679821} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {75AE3129-626B-4765-808B-3191CF67F60B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {541FC3D6-354D-49E5-9040-61953B8079FE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0F5298AC-608D-498F-A39E-C426C5FA7E63} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {743F4338-4BFC-4844-9927-F4F60E28A95A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B492AEEB-E89B-4C0D-809C-9EAEA6281884} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {FF05F810-1A68-42F4-9A39-84A0C44EABC8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {D619923A-11BF-4CA4-9ACA-2DAC7CBE95D2} diff --git a/sdk/src/Services/DLM/Generated/AmazonDLMConfig.cs b/sdk/src/Services/DLM/Generated/AmazonDLMConfig.cs index dc8d651a9f7e..2ef63934ad3a 100644 --- a/sdk/src/Services/DLM/Generated/AmazonDLMConfig.cs +++ b/sdk/src/Services/DLM/Generated/AmazonDLMConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.DLM public partial class AmazonDLMConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("DLM", "4.0.0.0"); private static readonly AmazonDLMEndpointResolver EndpointResolver = new AmazonDLMEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("DLM", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("DLM", "3.7.400.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/DLM/Properties/AssemblyInfo.cs b/sdk/src/Services/DLM/Properties/AssemblyInfo.cs index c097b6b632fb..d091d6d9bdc7 100644 --- a/sdk/src/Services/DLM/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/DLM/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/DataExchange/DataExchange.sln b/sdk/src/Services/DataExchange/DataExchange.sln index 261df82afe29..77070beefda0 100644 --- a/sdk/src/Services/DataExchange/DataExchange.sln +++ b/sdk/src/Services/DataExchange/DataExchange.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {7D8F3451-8511-42E5-8EB7-D578D3618D9E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {7D8F3451-8511-42E5-8EB7-D578D3618D9E}.Debug|Any CPU.Build.0 = Debug|Any CPU {7D8F3451-8511-42E5-8EB7-D578D3618D9E}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {228A4279-7350-4D15-B511-B5211EEDCFB8}.Debug|Any CPU.Build.0 = Debug|Any CPU {228A4279-7350-4D15-B511-B5211EEDCFB8}.Release|Any CPU.ActiveCfg = Release|Any CPU {228A4279-7350-4D15-B511-B5211EEDCFB8}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {7FC15BA1-75EE-4376-944A-C4B0EE64FDB4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7FC15BA1-75EE-4376-944A-C4B0EE64FDB4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7FC15BA1-75EE-4376-944A-C4B0EE64FDB4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7FC15BA1-75EE-4376-944A-C4B0EE64FDB4}.Release|Any CPU.Build.0 = Release|Any CPU - {1FCE37FF-E469-4EDF-AFF5-86BD15F0CA09}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1FCE37FF-E469-4EDF-AFF5-86BD15F0CA09}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1FCE37FF-E469-4EDF-AFF5-86BD15F0CA09}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1FCE37FF-E469-4EDF-AFF5-86BD15F0CA09}.Release|Any CPU.Build.0 = Release|Any CPU - {182980CE-AD1D-410F-AFC7-DFA4881499C4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {182980CE-AD1D-410F-AFC7-DFA4881499C4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {182980CE-AD1D-410F-AFC7-DFA4881499C4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {182980CE-AD1D-410F-AFC7-DFA4881499C4}.Release|Any CPU.Build.0 = Release|Any CPU - {D46A9F9B-2EA5-40DC-84F2-54300C3E1B14}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D46A9F9B-2EA5-40DC-84F2-54300C3E1B14}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D46A9F9B-2EA5-40DC-84F2-54300C3E1B14}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D46A9F9B-2EA5-40DC-84F2-54300C3E1B14}.Release|Any CPU.Build.0 = Release|Any CPU - {2EA6D203-5EB2-44BB-8F09-0711A87BA274}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2EA6D203-5EB2-44BB-8F09-0711A87BA274}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2EA6D203-5EB2-44BB-8F09-0711A87BA274}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2EA6D203-5EB2-44BB-8F09-0711A87BA274}.Release|Any CPU.Build.0 = Release|Any CPU - {31230B0A-D9DE-4416-AF60-21B45515F46B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {31230B0A-D9DE-4416-AF60-21B45515F46B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {31230B0A-D9DE-4416-AF60-21B45515F46B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {31230B0A-D9DE-4416-AF60-21B45515F46B}.Release|Any CPU.Build.0 = Release|Any CPU - {7B6ABBFE-7B44-4041-A81D-DAAB413358F7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7B6ABBFE-7B44-4041-A81D-DAAB413358F7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7B6ABBFE-7B44-4041-A81D-DAAB413358F7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7B6ABBFE-7B44-4041-A81D-DAAB413358F7}.Release|Any CPU.Build.0 = Release|Any CPU - {DCDA88CF-3588-4A15-B5FD-0FBC57BAF1B6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DCDA88CF-3588-4A15-B5FD-0FBC57BAF1B6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DCDA88CF-3588-4A15-B5FD-0FBC57BAF1B6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DCDA88CF-3588-4A15-B5FD-0FBC57BAF1B6}.Release|Any CPU.Build.0 = Release|Any CPU - {20406D57-2230-4F65-A105-D900DE9AFACE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {20406D57-2230-4F65-A105-D900DE9AFACE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {20406D57-2230-4F65-A105-D900DE9AFACE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {20406D57-2230-4F65-A105-D900DE9AFACE}.Release|Any CPU.Build.0 = Release|Any CPU - {69162E0C-84D5-45F6-AB83-246F4F3791B1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {69162E0C-84D5-45F6-AB83-246F4F3791B1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {69162E0C-84D5-45F6-AB83-246F4F3791B1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {69162E0C-84D5-45F6-AB83-246F4F3791B1}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {7FC15BA1-75EE-4376-944A-C4B0EE64FDB4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7FC15BA1-75EE-4376-944A-C4B0EE64FDB4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7FC15BA1-75EE-4376-944A-C4B0EE64FDB4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7FC15BA1-75EE-4376-944A-C4B0EE64FDB4}.Release|Any CPU.Build.0 = Release|Any CPU - {1FCE37FF-E469-4EDF-AFF5-86BD15F0CA09}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1FCE37FF-E469-4EDF-AFF5-86BD15F0CA09}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1FCE37FF-E469-4EDF-AFF5-86BD15F0CA09}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1FCE37FF-E469-4EDF-AFF5-86BD15F0CA09}.Release|Any CPU.Build.0 = Release|Any CPU - {182980CE-AD1D-410F-AFC7-DFA4881499C4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {182980CE-AD1D-410F-AFC7-DFA4881499C4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {182980CE-AD1D-410F-AFC7-DFA4881499C4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {182980CE-AD1D-410F-AFC7-DFA4881499C4}.Release|Any CPU.Build.0 = Release|Any CPU - {D46A9F9B-2EA5-40DC-84F2-54300C3E1B14}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D46A9F9B-2EA5-40DC-84F2-54300C3E1B14}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D46A9F9B-2EA5-40DC-84F2-54300C3E1B14}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D46A9F9B-2EA5-40DC-84F2-54300C3E1B14}.Release|Any CPU.Build.0 = Release|Any CPU - {2EA6D203-5EB2-44BB-8F09-0711A87BA274}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2EA6D203-5EB2-44BB-8F09-0711A87BA274}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2EA6D203-5EB2-44BB-8F09-0711A87BA274}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2EA6D203-5EB2-44BB-8F09-0711A87BA274}.Release|Any CPU.Build.0 = Release|Any CPU - {31230B0A-D9DE-4416-AF60-21B45515F46B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {31230B0A-D9DE-4416-AF60-21B45515F46B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {31230B0A-D9DE-4416-AF60-21B45515F46B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {31230B0A-D9DE-4416-AF60-21B45515F46B}.Release|Any CPU.Build.0 = Release|Any CPU - {7B6ABBFE-7B44-4041-A81D-DAAB413358F7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7B6ABBFE-7B44-4041-A81D-DAAB413358F7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7B6ABBFE-7B44-4041-A81D-DAAB413358F7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7B6ABBFE-7B44-4041-A81D-DAAB413358F7}.Release|Any CPU.Build.0 = Release|Any CPU - {DCDA88CF-3588-4A15-B5FD-0FBC57BAF1B6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DCDA88CF-3588-4A15-B5FD-0FBC57BAF1B6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DCDA88CF-3588-4A15-B5FD-0FBC57BAF1B6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DCDA88CF-3588-4A15-B5FD-0FBC57BAF1B6}.Release|Any CPU.Build.0 = Release|Any CPU - {20406D57-2230-4F65-A105-D900DE9AFACE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {20406D57-2230-4F65-A105-D900DE9AFACE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {20406D57-2230-4F65-A105-D900DE9AFACE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {20406D57-2230-4F65-A105-D900DE9AFACE}.Release|Any CPU.Build.0 = Release|Any CPU - {69162E0C-84D5-45F6-AB83-246F4F3791B1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {69162E0C-84D5-45F6-AB83-246F4F3791B1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {69162E0C-84D5-45F6-AB83-246F4F3791B1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {69162E0C-84D5-45F6-AB83-246F4F3791B1}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7D8F3451-8511-42E5-8EB7-D578D3618D9E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {BD20B680-8F89-45B2-A12D-916E32D53038} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {848B9E08-479A-4988-B460-72E337D5C926} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {A6296EC4-8EA4-4CC4-A22D-BB0968DC42F1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {228A4279-7350-4D15-B511-B5211EEDCFB8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {7FC15BA1-75EE-4376-944A-C4B0EE64FDB4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {1FCE37FF-E469-4EDF-AFF5-86BD15F0CA09} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {182980CE-AD1D-410F-AFC7-DFA4881499C4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D46A9F9B-2EA5-40DC-84F2-54300C3E1B14} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {2EA6D203-5EB2-44BB-8F09-0711A87BA274} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {31230B0A-D9DE-4416-AF60-21B45515F46B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {7B6ABBFE-7B44-4041-A81D-DAAB413358F7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {DCDA88CF-3588-4A15-B5FD-0FBC57BAF1B6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {20406D57-2230-4F65-A105-D900DE9AFACE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {69162E0C-84D5-45F6-AB83-246F4F3791B1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {7FC15BA1-75EE-4376-944A-C4B0EE64FDB4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {1FCE37FF-E469-4EDF-AFF5-86BD15F0CA09} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {182980CE-AD1D-410F-AFC7-DFA4881499C4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D46A9F9B-2EA5-40DC-84F2-54300C3E1B14} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {2EA6D203-5EB2-44BB-8F09-0711A87BA274} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {31230B0A-D9DE-4416-AF60-21B45515F46B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {7B6ABBFE-7B44-4041-A81D-DAAB413358F7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {DCDA88CF-3588-4A15-B5FD-0FBC57BAF1B6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {20406D57-2230-4F65-A105-D900DE9AFACE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {69162E0C-84D5-45F6-AB83-246F4F3791B1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {39D1662A-9203-4593-AEB2-B89BBCA78A2B} diff --git a/sdk/src/Services/DataExchange/Generated/AmazonDataExchangeConfig.cs b/sdk/src/Services/DataExchange/Generated/AmazonDataExchangeConfig.cs index 7d65ab1d10e6..85ca3676aca4 100644 --- a/sdk/src/Services/DataExchange/Generated/AmazonDataExchangeConfig.cs +++ b/sdk/src/Services/DataExchange/Generated/AmazonDataExchangeConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.DataExchange public partial class AmazonDataExchangeConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("DataExchange", "4.0.0.0"); private static readonly AmazonDataExchangeEndpointResolver EndpointResolver = new AmazonDataExchangeEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("DataExchange", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("DataExchange", "3.7.401.17"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/DataExchange/Generated/Model/AcceptDataGrantResponse.cs b/sdk/src/Services/DataExchange/Generated/Model/AcceptDataGrantResponse.cs index 6a8991c25a15..ba48b7362d5e 100644 --- a/sdk/src/Services/DataExchange/Generated/Model/AcceptDataGrantResponse.cs +++ b/sdk/src/Services/DataExchange/Generated/Model/AcceptDataGrantResponse.cs @@ -73,9 +73,9 @@ internal bool IsSetAcceptanceState() /// The timestamp of when the data grant was accepted. /// /// - public DateTime AcceptedAt + public DateTime? AcceptedAt { - get { return this._acceptedAt.GetValueOrDefault(); } + get { return this._acceptedAt; } set { this._acceptedAt = value; } } @@ -111,9 +111,9 @@ internal bool IsSetArn() /// /// [AWSProperty(Required=true)] - public DateTime CreatedAt + public DateTime? CreatedAt { - get { return this._createdAt.GetValueOrDefault(); } + get { return this._createdAt; } set { this._createdAt = value; } } @@ -167,9 +167,9 @@ internal bool IsSetDescription() /// The timestamp of when access to the associated data set ends. /// /// - public DateTime EndsAt + public DateTime? EndsAt { - get { return this._endsAt.GetValueOrDefault(); } + get { return this._endsAt; } set { this._endsAt = value; } } @@ -280,9 +280,9 @@ internal bool IsSetSenderPrincipal() /// /// [AWSProperty(Required=true)] - public DateTime UpdatedAt + public DateTime? UpdatedAt { - get { return this._updatedAt.GetValueOrDefault(); } + get { return this._updatedAt; } set { this._updatedAt = value; } } diff --git a/sdk/src/Services/DataExchange/Generated/Model/CreateDataGrantRequest.cs b/sdk/src/Services/DataExchange/Generated/Model/CreateDataGrantRequest.cs index a0dfee673a4c..712599cf9b1c 100644 --- a/sdk/src/Services/DataExchange/Generated/Model/CreateDataGrantRequest.cs +++ b/sdk/src/Services/DataExchange/Generated/Model/CreateDataGrantRequest.cs @@ -67,9 +67,9 @@ internal bool IsSetDescription() /// The timestamp of when access to the associated data set ends. /// /// - public DateTime EndsAt + public DateTime? EndsAt { - get { return this._endsAt.GetValueOrDefault(); } + get { return this._endsAt; } set { this._endsAt = value; } } diff --git a/sdk/src/Services/DataExchange/Generated/Model/CreateDataGrantResponse.cs b/sdk/src/Services/DataExchange/Generated/Model/CreateDataGrantResponse.cs index fdad6af4000e..b8f0f99c9a72 100644 --- a/sdk/src/Services/DataExchange/Generated/Model/CreateDataGrantResponse.cs +++ b/sdk/src/Services/DataExchange/Generated/Model/CreateDataGrantResponse.cs @@ -75,9 +75,9 @@ internal bool IsSetAcceptanceState() /// The timestamp of when the data grant was accepted. /// /// - public DateTime AcceptedAt + public DateTime? AcceptedAt { - get { return this._acceptedAt.GetValueOrDefault(); } + get { return this._acceptedAt; } set { this._acceptedAt = value; } } @@ -113,9 +113,9 @@ internal bool IsSetArn() /// /// [AWSProperty(Required=true)] - public DateTime CreatedAt + public DateTime? CreatedAt { - get { return this._createdAt.GetValueOrDefault(); } + get { return this._createdAt; } set { this._createdAt = value; } } @@ -169,9 +169,9 @@ internal bool IsSetDescription() /// The timestamp of when access to the associated data set ends. /// /// - public DateTime EndsAt + public DateTime? EndsAt { - get { return this._endsAt.GetValueOrDefault(); } + get { return this._endsAt; } set { this._endsAt = value; } } @@ -320,9 +320,9 @@ internal bool IsSetTags() /// /// [AWSProperty(Required=true)] - public DateTime UpdatedAt + public DateTime? UpdatedAt { - get { return this._updatedAt.GetValueOrDefault(); } + get { return this._updatedAt; } set { this._updatedAt = value; } } diff --git a/sdk/src/Services/DataExchange/Generated/Model/DataGrantSummaryEntry.cs b/sdk/src/Services/DataExchange/Generated/Model/DataGrantSummaryEntry.cs index 66ebcf45b987..5753e2a11b71 100644 --- a/sdk/src/Services/DataExchange/Generated/Model/DataGrantSummaryEntry.cs +++ b/sdk/src/Services/DataExchange/Generated/Model/DataGrantSummaryEntry.cs @@ -72,9 +72,9 @@ internal bool IsSetAcceptanceState() /// The timestamp of when the data grant was accepted. /// /// - public DateTime AcceptedAt + public DateTime? AcceptedAt { - get { return this._acceptedAt.GetValueOrDefault(); } + get { return this._acceptedAt; } set { this._acceptedAt = value; } } @@ -110,9 +110,9 @@ internal bool IsSetArn() /// /// [AWSProperty(Required=true)] - public DateTime CreatedAt + public DateTime? CreatedAt { - get { return this._createdAt.GetValueOrDefault(); } + get { return this._createdAt; } set { this._createdAt = value; } } @@ -147,9 +147,9 @@ internal bool IsSetDataSetId() /// The timestamp of when access to the associated data set ends. ///     /// - public DateTime EndsAt + public DateTime? EndsAt { - get { return this._endsAt.GetValueOrDefault(); } + get { return this._endsAt; } set { this._endsAt = value; } } @@ -261,9 +261,9 @@ internal bool IsSetSourceDataSetId() ///     /// [AWSProperty(Required=true)] - public DateTime UpdatedAt + public DateTime? UpdatedAt { - get { return this._updatedAt.GetValueOrDefault(); } + get { return this._updatedAt; } set { this._updatedAt = value; } } diff --git a/sdk/src/Services/DataExchange/Generated/Model/GetDataGrantResponse.cs b/sdk/src/Services/DataExchange/Generated/Model/GetDataGrantResponse.cs index 48145f9f66b3..b8827f5a736e 100644 --- a/sdk/src/Services/DataExchange/Generated/Model/GetDataGrantResponse.cs +++ b/sdk/src/Services/DataExchange/Generated/Model/GetDataGrantResponse.cs @@ -75,9 +75,9 @@ internal bool IsSetAcceptanceState() /// The timestamp of when the data grant was accepted. ///     /// - public DateTime AcceptedAt + public DateTime? AcceptedAt { - get { return this._acceptedAt.GetValueOrDefault(); } + get { return this._acceptedAt; } set { this._acceptedAt = value; } } @@ -113,9 +113,9 @@ internal bool IsSetArn() ///     /// [AWSProperty(Required=true)] - public DateTime CreatedAt + public DateTime? CreatedAt { - get { return this._createdAt.GetValueOrDefault(); } + get { return this._createdAt; } set { this._createdAt = value; } } @@ -169,9 +169,9 @@ internal bool IsSetDescription() /// The timestamp of when access to the associated data set ends. /// /// - public DateTime EndsAt + public DateTime? EndsAt { - get { return this._endsAt.GetValueOrDefault(); } + get { return this._endsAt; } set { this._endsAt = value; } } @@ -320,9 +320,9 @@ internal bool IsSetTags() /// /// [AWSProperty(Required=true)] - public DateTime UpdatedAt + public DateTime? UpdatedAt { - get { return this._updatedAt.GetValueOrDefault(); } + get { return this._updatedAt; } set { this._updatedAt = value; } } diff --git a/sdk/src/Services/DataExchange/Generated/Model/GetReceivedDataGrantResponse.cs b/sdk/src/Services/DataExchange/Generated/Model/GetReceivedDataGrantResponse.cs index ae2f6119f14d..712a3e3bbf12 100644 --- a/sdk/src/Services/DataExchange/Generated/Model/GetReceivedDataGrantResponse.cs +++ b/sdk/src/Services/DataExchange/Generated/Model/GetReceivedDataGrantResponse.cs @@ -73,9 +73,9 @@ internal bool IsSetAcceptanceState() /// The timestamp of when the data grant was accepted. /// /// - public DateTime AcceptedAt + public DateTime? AcceptedAt { - get { return this._acceptedAt.GetValueOrDefault(); } + get { return this._acceptedAt; } set { this._acceptedAt = value; } } @@ -111,9 +111,9 @@ internal bool IsSetArn() /// /// [AWSProperty(Required=true)] - public DateTime CreatedAt + public DateTime? CreatedAt { - get { return this._createdAt.GetValueOrDefault(); } + get { return this._createdAt; } set { this._createdAt = value; } } @@ -167,9 +167,9 @@ internal bool IsSetDescription() /// The timestamp of when access to the associated data set ends. /// /// - public DateTime EndsAt + public DateTime? EndsAt { - get { return this._endsAt.GetValueOrDefault(); } + get { return this._endsAt; } set { this._endsAt = value; } } @@ -280,9 +280,9 @@ internal bool IsSetSenderPrincipal() /// /// [AWSProperty(Required=true)] - public DateTime UpdatedAt + public DateTime? UpdatedAt { - get { return this._updatedAt.GetValueOrDefault(); } + get { return this._updatedAt; } set { this._updatedAt = value; } } diff --git a/sdk/src/Services/DataExchange/Generated/Model/Internal/MarshallTransformations/AcceptDataGrantResponseUnmarshaller.cs b/sdk/src/Services/DataExchange/Generated/Model/Internal/MarshallTransformations/AcceptDataGrantResponseUnmarshaller.cs index f036415e3f6d..4f66949c57aa 100644 --- a/sdk/src/Services/DataExchange/Generated/Model/Internal/MarshallTransformations/AcceptDataGrantResponseUnmarshaller.cs +++ b/sdk/src/Services/DataExchange/Generated/Model/Internal/MarshallTransformations/AcceptDataGrantResponseUnmarshaller.cs @@ -60,7 +60,7 @@ public override AmazonWebServiceResponse Unmarshall(JsonUnmarshallerContext cont } if (context.TestExpression("AcceptedAt", targetDepth)) { - var unmarshaller = DateTimeUnmarshaller.Instance; + var unmarshaller = NullableDateTimeUnmarshaller.Instance; response.AcceptedAt = unmarshaller.Unmarshall(context); continue; } @@ -72,7 +72,7 @@ public override AmazonWebServiceResponse Unmarshall(JsonUnmarshallerContext cont } if (context.TestExpression("CreatedAt", targetDepth)) { - var unmarshaller = DateTimeUnmarshaller.Instance; + var unmarshaller = NullableDateTimeUnmarshaller.Instance; response.CreatedAt = unmarshaller.Unmarshall(context); continue; } @@ -90,7 +90,7 @@ public override AmazonWebServiceResponse Unmarshall(JsonUnmarshallerContext cont } if (context.TestExpression("EndsAt", targetDepth)) { - var unmarshaller = DateTimeUnmarshaller.Instance; + var unmarshaller = NullableDateTimeUnmarshaller.Instance; response.EndsAt = unmarshaller.Unmarshall(context); continue; } @@ -126,7 +126,7 @@ public override AmazonWebServiceResponse Unmarshall(JsonUnmarshallerContext cont } if (context.TestExpression("UpdatedAt", targetDepth)) { - var unmarshaller = DateTimeUnmarshaller.Instance; + var unmarshaller = NullableDateTimeUnmarshaller.Instance; response.UpdatedAt = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/DataExchange/Generated/Model/Internal/MarshallTransformations/CreateDataGrantRequestMarshaller.cs b/sdk/src/Services/DataExchange/Generated/Model/Internal/MarshallTransformations/CreateDataGrantRequestMarshaller.cs index 56283f423a7b..2d224e0135b0 100644 --- a/sdk/src/Services/DataExchange/Generated/Model/Internal/MarshallTransformations/CreateDataGrantRequestMarshaller.cs +++ b/sdk/src/Services/DataExchange/Generated/Model/Internal/MarshallTransformations/CreateDataGrantRequestMarshaller.cs @@ -61,65 +61,68 @@ public IRequest Marshall(CreateDataGrantRequest publicRequest) request.HttpMethod = "POST"; request.ResourcePath = "/v1/data-grants"; - using (StringWriter stringWriter = new StringWriter(CultureInfo.InvariantCulture)) + using (MemoryStream memoryStream = new MemoryStream()) { - JsonWriter writer = new JsonWriter(stringWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetDescription()) + using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) { - context.Writer.WritePropertyName("Description"); - context.Writer.Write(publicRequest.Description); - } - - if(publicRequest.IsSetEndsAt()) - { - context.Writer.WritePropertyName("EndsAt"); - context.Writer.Write(StringUtils.FromDateTimeToISO8601WithOptionalMs(publicRequest.EndsAt)); - } + JsonWriter writer = new JsonWriter(streamWriter); + writer.Validate = false; + writer.WriteObjectStart(); + var context = new JsonMarshallerContext(request, writer); + if(publicRequest.IsSetDescription()) + { + context.Writer.WritePropertyName("Description"); + context.Writer.Write(publicRequest.Description); + } - if(publicRequest.IsSetGrantDistributionScope()) - { - context.Writer.WritePropertyName("GrantDistributionScope"); - context.Writer.Write(publicRequest.GrantDistributionScope); - } + if(publicRequest.IsSetEndsAt()) + { + context.Writer.WritePropertyName("EndsAt"); + context.Writer.Write(StringUtils.FromDateTimeToISO8601WithOptionalMs(publicRequest.EndsAt)); + } - if(publicRequest.IsSetName()) - { - context.Writer.WritePropertyName("Name"); - context.Writer.Write(publicRequest.Name); - } + if(publicRequest.IsSetGrantDistributionScope()) + { + context.Writer.WritePropertyName("GrantDistributionScope"); + context.Writer.Write(publicRequest.GrantDistributionScope); + } - if(publicRequest.IsSetReceiverPrincipal()) - { - context.Writer.WritePropertyName("ReceiverPrincipal"); - context.Writer.Write(publicRequest.ReceiverPrincipal); - } + if(publicRequest.IsSetName()) + { + context.Writer.WritePropertyName("Name"); + context.Writer.Write(publicRequest.Name); + } - if(publicRequest.IsSetSourceDataSetId()) - { - context.Writer.WritePropertyName("SourceDataSetId"); - context.Writer.Write(publicRequest.SourceDataSetId); - } + if(publicRequest.IsSetReceiverPrincipal()) + { + context.Writer.WritePropertyName("ReceiverPrincipal"); + context.Writer.Write(publicRequest.ReceiverPrincipal); + } - if(publicRequest.IsSetTags()) - { - context.Writer.WritePropertyName("Tags"); - context.Writer.WriteObjectStart(); - foreach (var publicRequestTagsKvp in publicRequest.Tags) + if(publicRequest.IsSetSourceDataSetId()) { - context.Writer.WritePropertyName(publicRequestTagsKvp.Key); - var publicRequestTagsValue = publicRequestTagsKvp.Value; + context.Writer.WritePropertyName("SourceDataSetId"); + context.Writer.Write(publicRequest.SourceDataSetId); + } - context.Writer.Write(publicRequestTagsValue); + if(publicRequest.IsSetTags()) + { + context.Writer.WritePropertyName("Tags"); + context.Writer.WriteObjectStart(); + foreach (var publicRequestTagsKvp in publicRequest.Tags) + { + context.Writer.WritePropertyName(publicRequestTagsKvp.Key); + var publicRequestTagsValue = publicRequestTagsKvp.Value; + + context.Writer.Write(publicRequestTagsValue); + } + context.Writer.WriteObjectEnd(); } - context.Writer.WriteObjectEnd(); + + writer.WriteObjectEnd(); } - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); + request.Content = memoryStream.ToArray(); } diff --git a/sdk/src/Services/DataExchange/Generated/Model/Internal/MarshallTransformations/CreateDataGrantResponseUnmarshaller.cs b/sdk/src/Services/DataExchange/Generated/Model/Internal/MarshallTransformations/CreateDataGrantResponseUnmarshaller.cs index be39ba15e380..0c9ace1915ca 100644 --- a/sdk/src/Services/DataExchange/Generated/Model/Internal/MarshallTransformations/CreateDataGrantResponseUnmarshaller.cs +++ b/sdk/src/Services/DataExchange/Generated/Model/Internal/MarshallTransformations/CreateDataGrantResponseUnmarshaller.cs @@ -60,7 +60,7 @@ public override AmazonWebServiceResponse Unmarshall(JsonUnmarshallerContext cont } if (context.TestExpression("AcceptedAt", targetDepth)) { - var unmarshaller = DateTimeUnmarshaller.Instance; + var unmarshaller = NullableDateTimeUnmarshaller.Instance; response.AcceptedAt = unmarshaller.Unmarshall(context); continue; } @@ -72,7 +72,7 @@ public override AmazonWebServiceResponse Unmarshall(JsonUnmarshallerContext cont } if (context.TestExpression("CreatedAt", targetDepth)) { - var unmarshaller = DateTimeUnmarshaller.Instance; + var unmarshaller = NullableDateTimeUnmarshaller.Instance; response.CreatedAt = unmarshaller.Unmarshall(context); continue; } @@ -90,7 +90,7 @@ public override AmazonWebServiceResponse Unmarshall(JsonUnmarshallerContext cont } if (context.TestExpression("EndsAt", targetDepth)) { - var unmarshaller = DateTimeUnmarshaller.Instance; + var unmarshaller = NullableDateTimeUnmarshaller.Instance; response.EndsAt = unmarshaller.Unmarshall(context); continue; } @@ -138,7 +138,7 @@ public override AmazonWebServiceResponse Unmarshall(JsonUnmarshallerContext cont } if (context.TestExpression("UpdatedAt", targetDepth)) { - var unmarshaller = DateTimeUnmarshaller.Instance; + var unmarshaller = NullableDateTimeUnmarshaller.Instance; response.UpdatedAt = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/DataExchange/Generated/Model/Internal/MarshallTransformations/DataGrantSummaryEntryUnmarshaller.cs b/sdk/src/Services/DataExchange/Generated/Model/Internal/MarshallTransformations/DataGrantSummaryEntryUnmarshaller.cs index 87588d49ef95..4c211fb2a202 100644 --- a/sdk/src/Services/DataExchange/Generated/Model/Internal/MarshallTransformations/DataGrantSummaryEntryUnmarshaller.cs +++ b/sdk/src/Services/DataExchange/Generated/Model/Internal/MarshallTransformations/DataGrantSummaryEntryUnmarshaller.cs @@ -74,7 +74,7 @@ public DataGrantSummaryEntry Unmarshall(JsonUnmarshallerContext context) } if (context.TestExpression("AcceptedAt", targetDepth)) { - var unmarshaller = DateTimeUnmarshaller.Instance; + var unmarshaller = NullableDateTimeUnmarshaller.Instance; unmarshalledObject.AcceptedAt = unmarshaller.Unmarshall(context); continue; } @@ -86,7 +86,7 @@ public DataGrantSummaryEntry Unmarshall(JsonUnmarshallerContext context) } if (context.TestExpression("CreatedAt", targetDepth)) { - var unmarshaller = DateTimeUnmarshaller.Instance; + var unmarshaller = NullableDateTimeUnmarshaller.Instance; unmarshalledObject.CreatedAt = unmarshaller.Unmarshall(context); continue; } @@ -98,7 +98,7 @@ public DataGrantSummaryEntry Unmarshall(JsonUnmarshallerContext context) } if (context.TestExpression("EndsAt", targetDepth)) { - var unmarshaller = DateTimeUnmarshaller.Instance; + var unmarshaller = NullableDateTimeUnmarshaller.Instance; unmarshalledObject.EndsAt = unmarshaller.Unmarshall(context); continue; } @@ -134,7 +134,7 @@ public DataGrantSummaryEntry Unmarshall(JsonUnmarshallerContext context) } if (context.TestExpression("UpdatedAt", targetDepth)) { - var unmarshaller = DateTimeUnmarshaller.Instance; + var unmarshaller = NullableDateTimeUnmarshaller.Instance; unmarshalledObject.UpdatedAt = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/DataExchange/Generated/Model/Internal/MarshallTransformations/GetDataGrantResponseUnmarshaller.cs b/sdk/src/Services/DataExchange/Generated/Model/Internal/MarshallTransformations/GetDataGrantResponseUnmarshaller.cs index f14528329dda..24e1a8925d7c 100644 --- a/sdk/src/Services/DataExchange/Generated/Model/Internal/MarshallTransformations/GetDataGrantResponseUnmarshaller.cs +++ b/sdk/src/Services/DataExchange/Generated/Model/Internal/MarshallTransformations/GetDataGrantResponseUnmarshaller.cs @@ -60,7 +60,7 @@ public override AmazonWebServiceResponse Unmarshall(JsonUnmarshallerContext cont } if (context.TestExpression("AcceptedAt", targetDepth)) { - var unmarshaller = DateTimeUnmarshaller.Instance; + var unmarshaller = NullableDateTimeUnmarshaller.Instance; response.AcceptedAt = unmarshaller.Unmarshall(context); continue; } @@ -72,7 +72,7 @@ public override AmazonWebServiceResponse Unmarshall(JsonUnmarshallerContext cont } if (context.TestExpression("CreatedAt", targetDepth)) { - var unmarshaller = DateTimeUnmarshaller.Instance; + var unmarshaller = NullableDateTimeUnmarshaller.Instance; response.CreatedAt = unmarshaller.Unmarshall(context); continue; } @@ -90,7 +90,7 @@ public override AmazonWebServiceResponse Unmarshall(JsonUnmarshallerContext cont } if (context.TestExpression("EndsAt", targetDepth)) { - var unmarshaller = DateTimeUnmarshaller.Instance; + var unmarshaller = NullableDateTimeUnmarshaller.Instance; response.EndsAt = unmarshaller.Unmarshall(context); continue; } @@ -138,7 +138,7 @@ public override AmazonWebServiceResponse Unmarshall(JsonUnmarshallerContext cont } if (context.TestExpression("UpdatedAt", targetDepth)) { - var unmarshaller = DateTimeUnmarshaller.Instance; + var unmarshaller = NullableDateTimeUnmarshaller.Instance; response.UpdatedAt = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/DataExchange/Generated/Model/Internal/MarshallTransformations/GetReceivedDataGrantResponseUnmarshaller.cs b/sdk/src/Services/DataExchange/Generated/Model/Internal/MarshallTransformations/GetReceivedDataGrantResponseUnmarshaller.cs index ffab6d4e7a08..dc28601e8d31 100644 --- a/sdk/src/Services/DataExchange/Generated/Model/Internal/MarshallTransformations/GetReceivedDataGrantResponseUnmarshaller.cs +++ b/sdk/src/Services/DataExchange/Generated/Model/Internal/MarshallTransformations/GetReceivedDataGrantResponseUnmarshaller.cs @@ -60,7 +60,7 @@ public override AmazonWebServiceResponse Unmarshall(JsonUnmarshallerContext cont } if (context.TestExpression("AcceptedAt", targetDepth)) { - var unmarshaller = DateTimeUnmarshaller.Instance; + var unmarshaller = NullableDateTimeUnmarshaller.Instance; response.AcceptedAt = unmarshaller.Unmarshall(context); continue; } @@ -72,7 +72,7 @@ public override AmazonWebServiceResponse Unmarshall(JsonUnmarshallerContext cont } if (context.TestExpression("CreatedAt", targetDepth)) { - var unmarshaller = DateTimeUnmarshaller.Instance; + var unmarshaller = NullableDateTimeUnmarshaller.Instance; response.CreatedAt = unmarshaller.Unmarshall(context); continue; } @@ -90,7 +90,7 @@ public override AmazonWebServiceResponse Unmarshall(JsonUnmarshallerContext cont } if (context.TestExpression("EndsAt", targetDepth)) { - var unmarshaller = DateTimeUnmarshaller.Instance; + var unmarshaller = NullableDateTimeUnmarshaller.Instance; response.EndsAt = unmarshaller.Unmarshall(context); continue; } @@ -126,7 +126,7 @@ public override AmazonWebServiceResponse Unmarshall(JsonUnmarshallerContext cont } if (context.TestExpression("UpdatedAt", targetDepth)) { - var unmarshaller = DateTimeUnmarshaller.Instance; + var unmarshaller = NullableDateTimeUnmarshaller.Instance; response.UpdatedAt = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/DataExchange/Generated/Model/Internal/MarshallTransformations/ReceivedDataGrantSummariesEntryUnmarshaller.cs b/sdk/src/Services/DataExchange/Generated/Model/Internal/MarshallTransformations/ReceivedDataGrantSummariesEntryUnmarshaller.cs index da995590b308..01911832e9fe 100644 --- a/sdk/src/Services/DataExchange/Generated/Model/Internal/MarshallTransformations/ReceivedDataGrantSummariesEntryUnmarshaller.cs +++ b/sdk/src/Services/DataExchange/Generated/Model/Internal/MarshallTransformations/ReceivedDataGrantSummariesEntryUnmarshaller.cs @@ -74,7 +74,7 @@ public ReceivedDataGrantSummariesEntry Unmarshall(JsonUnmarshallerContext contex } if (context.TestExpression("AcceptedAt", targetDepth)) { - var unmarshaller = DateTimeUnmarshaller.Instance; + var unmarshaller = NullableDateTimeUnmarshaller.Instance; unmarshalledObject.AcceptedAt = unmarshaller.Unmarshall(context); continue; } @@ -86,7 +86,7 @@ public ReceivedDataGrantSummariesEntry Unmarshall(JsonUnmarshallerContext contex } if (context.TestExpression("CreatedAt", targetDepth)) { - var unmarshaller = DateTimeUnmarshaller.Instance; + var unmarshaller = NullableDateTimeUnmarshaller.Instance; unmarshalledObject.CreatedAt = unmarshaller.Unmarshall(context); continue; } @@ -98,7 +98,7 @@ public ReceivedDataGrantSummariesEntry Unmarshall(JsonUnmarshallerContext contex } if (context.TestExpression("EndsAt", targetDepth)) { - var unmarshaller = DateTimeUnmarshaller.Instance; + var unmarshaller = NullableDateTimeUnmarshaller.Instance; unmarshalledObject.EndsAt = unmarshaller.Unmarshall(context); continue; } @@ -128,7 +128,7 @@ public ReceivedDataGrantSummariesEntry Unmarshall(JsonUnmarshallerContext contex } if (context.TestExpression("UpdatedAt", targetDepth)) { - var unmarshaller = DateTimeUnmarshaller.Instance; + var unmarshaller = NullableDateTimeUnmarshaller.Instance; unmarshalledObject.UpdatedAt = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/DataExchange/Generated/Model/ListDataGrantsRequest.cs b/sdk/src/Services/DataExchange/Generated/Model/ListDataGrantsRequest.cs index 96cfc5db31aa..ccc630ea96e4 100644 --- a/sdk/src/Services/DataExchange/Generated/Model/ListDataGrantsRequest.cs +++ b/sdk/src/Services/DataExchange/Generated/Model/ListDataGrantsRequest.cs @@ -45,9 +45,9 @@ public partial class ListDataGrantsRequest : AmazonDataExchangeRequest /// /// [AWSProperty(Min=1, Max=200)] - public int MaxResults + public int? MaxResults { - get { return this._maxResults.GetValueOrDefault(); } + get { return this._maxResults; } set { this._maxResults = value; } } diff --git a/sdk/src/Services/DataExchange/Generated/Model/ListReceivedDataGrantsRequest.cs b/sdk/src/Services/DataExchange/Generated/Model/ListReceivedDataGrantsRequest.cs index 1161391387ec..26f2676982a7 100644 --- a/sdk/src/Services/DataExchange/Generated/Model/ListReceivedDataGrantsRequest.cs +++ b/sdk/src/Services/DataExchange/Generated/Model/ListReceivedDataGrantsRequest.cs @@ -64,9 +64,9 @@ internal bool IsSetAcceptanceState() /// /// [AWSProperty(Min=1, Max=200)] - public int MaxResults + public int? MaxResults { - get { return this._maxResults.GetValueOrDefault(); } + get { return this._maxResults; } set { this._maxResults = value; } } diff --git a/sdk/src/Services/DataExchange/Generated/Model/ReceivedDataGrantSummariesEntry.cs b/sdk/src/Services/DataExchange/Generated/Model/ReceivedDataGrantSummariesEntry.cs index 22cc5c65638c..baa6d20bcd01 100644 --- a/sdk/src/Services/DataExchange/Generated/Model/ReceivedDataGrantSummariesEntry.cs +++ b/sdk/src/Services/DataExchange/Generated/Model/ReceivedDataGrantSummariesEntry.cs @@ -71,9 +71,9 @@ internal bool IsSetAcceptanceState() /// The timestamp of when the data grant was accepted. /// /// - public DateTime AcceptedAt + public DateTime? AcceptedAt { - get { return this._acceptedAt.GetValueOrDefault(); } + get { return this._acceptedAt; } set { this._acceptedAt = value; } } @@ -109,9 +109,9 @@ internal bool IsSetArn() /// /// [AWSProperty(Required=true)] - public DateTime CreatedAt + public DateTime? CreatedAt { - get { return this._createdAt.GetValueOrDefault(); } + get { return this._createdAt; } set { this._createdAt = value; } } @@ -146,9 +146,9 @@ internal bool IsSetDataSetId() /// The timestamp of when access to the associated data set ends. /// /// - public DateTime EndsAt + public DateTime? EndsAt { - get { return this._endsAt.GetValueOrDefault(); } + get { return this._endsAt; } set { this._endsAt = value; } } @@ -241,9 +241,9 @@ internal bool IsSetSenderPrincipal() /// /// [AWSProperty(Required=true)] - public DateTime UpdatedAt + public DateTime? UpdatedAt { - get { return this._updatedAt.GetValueOrDefault(); } + get { return this._updatedAt; } set { this._updatedAt = value; } } diff --git a/sdk/src/Services/DataExchange/Generated/Model/_bcl45+netstandard/IListDataGrantsPaginator.cs b/sdk/src/Services/DataExchange/Generated/Model/_bcl+netstandard/IListDataGrantsPaginator.cs similarity index 100% rename from sdk/src/Services/DataExchange/Generated/Model/_bcl45+netstandard/IListDataGrantsPaginator.cs rename to sdk/src/Services/DataExchange/Generated/Model/_bcl+netstandard/IListDataGrantsPaginator.cs diff --git a/sdk/src/Services/DataExchange/Generated/Model/_bcl45+netstandard/IListReceivedDataGrantsPaginator.cs b/sdk/src/Services/DataExchange/Generated/Model/_bcl+netstandard/IListReceivedDataGrantsPaginator.cs similarity index 100% rename from sdk/src/Services/DataExchange/Generated/Model/_bcl45+netstandard/IListReceivedDataGrantsPaginator.cs rename to sdk/src/Services/DataExchange/Generated/Model/_bcl+netstandard/IListReceivedDataGrantsPaginator.cs diff --git a/sdk/src/Services/DataExchange/Generated/Model/_bcl45+netstandard/ListDataGrantsPaginator.cs b/sdk/src/Services/DataExchange/Generated/Model/_bcl+netstandard/ListDataGrantsPaginator.cs similarity index 100% rename from sdk/src/Services/DataExchange/Generated/Model/_bcl45+netstandard/ListDataGrantsPaginator.cs rename to sdk/src/Services/DataExchange/Generated/Model/_bcl+netstandard/ListDataGrantsPaginator.cs diff --git a/sdk/src/Services/DataExchange/Generated/Model/_bcl45+netstandard/ListReceivedDataGrantsPaginator.cs b/sdk/src/Services/DataExchange/Generated/Model/_bcl+netstandard/ListReceivedDataGrantsPaginator.cs similarity index 100% rename from sdk/src/Services/DataExchange/Generated/Model/_bcl45+netstandard/ListReceivedDataGrantsPaginator.cs rename to sdk/src/Services/DataExchange/Generated/Model/_bcl+netstandard/ListReceivedDataGrantsPaginator.cs diff --git a/sdk/src/Services/DataExchange/Generated/_bcl/AmazonDataExchangeClient.cs b/sdk/src/Services/DataExchange/Generated/_bcl/AmazonDataExchangeClient.cs index 6f0259f3743a..579cd3f0794f 100644 --- a/sdk/src/Services/DataExchange/Generated/_bcl/AmazonDataExchangeClient.cs +++ b/sdk/src/Services/DataExchange/Generated/_bcl/AmazonDataExchangeClient.cs @@ -292,6 +292,85 @@ protected override void Dispose(bool disposing) #endregion + #region AcceptDataGrant + + + /// + /// This operation accepts a data grant. + /// + /// Container for the necessary parameters to execute the AcceptDataGrant service method. + /// + /// The response from the AcceptDataGrant service method, as returned by DataExchange. + /// + /// Access to the resource is denied. + /// + /// + /// The request couldn't be completed because it conflicted with the current state of + /// the resource. + /// + /// + /// An exception occurred with the service. + /// + /// + /// The resource couldn't be found. + /// + /// + /// The limit on the number of requests per second was exceeded. + /// + /// + /// The request was invalid. + /// + /// REST API Reference for AcceptDataGrant Operation + public virtual AcceptDataGrantResponse AcceptDataGrant(AcceptDataGrantRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = AcceptDataGrantRequestMarshaller.Instance; + options.ResponseUnmarshaller = AcceptDataGrantResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// This operation accepts a data grant. + /// + /// Container for the necessary parameters to execute the AcceptDataGrant service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the AcceptDataGrant service method, as returned by DataExchange. + /// + /// Access to the resource is denied. + /// + /// + /// The request couldn't be completed because it conflicted with the current state of + /// the resource. + /// + /// + /// An exception occurred with the service. + /// + /// + /// The resource couldn't be found. + /// + /// + /// The limit on the number of requests per second was exceeded. + /// + /// + /// The request was invalid. + /// + /// REST API Reference for AcceptDataGrant Operation + public virtual Task AcceptDataGrantAsync(AcceptDataGrantRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = AcceptDataGrantRequestMarshaller.Instance; + options.ResponseUnmarshaller = AcceptDataGrantResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + #region CancelJob @@ -367,6 +446,83 @@ public virtual CancelJobResponse CancelJob(CancelJobRequest request) #endregion + #region CreateDataGrant + + + /// + /// This operation creates a data grant. + /// + /// Container for the necessary parameters to execute the CreateDataGrant service method. + /// + /// The response from the CreateDataGrant service method, as returned by DataExchange. + /// + /// Access to the resource is denied. + /// + /// + /// An exception occurred with the service. + /// + /// + /// The resource couldn't be found. + /// + /// + /// The request has exceeded the quotas imposed by the service. + /// + /// + /// The limit on the number of requests per second was exceeded. + /// + /// + /// The request was invalid. + /// + /// REST API Reference for CreateDataGrant Operation + public virtual CreateDataGrantResponse CreateDataGrant(CreateDataGrantRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = CreateDataGrantRequestMarshaller.Instance; + options.ResponseUnmarshaller = CreateDataGrantResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// This operation creates a data grant. + /// + /// Container for the necessary parameters to execute the CreateDataGrant service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the CreateDataGrant service method, as returned by DataExchange. + /// + /// Access to the resource is denied. + /// + /// + /// An exception occurred with the service. + /// + /// + /// The resource couldn't be found. + /// + /// + /// The request has exceeded the quotas imposed by the service. + /// + /// + /// The limit on the number of requests per second was exceeded. + /// + /// + /// The request was invalid. + /// + /// REST API Reference for CreateDataGrant Operation + public virtual Task CreateDataGrantAsync(CreateDataGrantRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = CreateDataGrantRequestMarshaller.Instance; + options.ResponseUnmarshaller = CreateDataGrantResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + #region CreateDataSet @@ -738,6 +894,77 @@ public virtual DeleteAssetResponse DeleteAsset(DeleteAssetRequest request) #endregion + #region DeleteDataGrant + + + /// + /// This operation deletes a data grant. + /// + /// Container for the necessary parameters to execute the DeleteDataGrant service method. + /// + /// The response from the DeleteDataGrant service method, as returned by DataExchange. + /// + /// Access to the resource is denied. + /// + /// + /// An exception occurred with the service. + /// + /// + /// The resource couldn't be found. + /// + /// + /// The limit on the number of requests per second was exceeded. + /// + /// + /// The request was invalid. + /// + /// REST API Reference for DeleteDataGrant Operation + public virtual DeleteDataGrantResponse DeleteDataGrant(DeleteDataGrantRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = DeleteDataGrantRequestMarshaller.Instance; + options.ResponseUnmarshaller = DeleteDataGrantResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// This operation deletes a data grant. + /// + /// Container for the necessary parameters to execute the DeleteDataGrant service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the DeleteDataGrant service method, as returned by DataExchange. + /// + /// Access to the resource is denied. + /// + /// + /// An exception occurred with the service. + /// + /// + /// The resource couldn't be found. + /// + /// + /// The limit on the number of requests per second was exceeded. + /// + /// + /// The request was invalid. + /// + /// REST API Reference for DeleteDataGrant Operation + public virtual Task DeleteDataGrantAsync(DeleteDataGrantRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = DeleteDataGrantRequestMarshaller.Instance; + options.ResponseUnmarshaller = DeleteDataGrantResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + #region DeleteDataSet @@ -1026,6 +1253,77 @@ public virtual GetAssetResponse GetAsset(GetAssetRequest request) #endregion + #region GetDataGrant + + + /// + /// This operation returns information about a data grant. + /// + /// Container for the necessary parameters to execute the GetDataGrant service method. + /// + /// The response from the GetDataGrant service method, as returned by DataExchange. + /// + /// Access to the resource is denied. + /// + /// + /// An exception occurred with the service. + /// + /// + /// The resource couldn't be found. + /// + /// + /// The limit on the number of requests per second was exceeded. + /// + /// + /// The request was invalid. + /// + /// REST API Reference for GetDataGrant Operation + public virtual GetDataGrantResponse GetDataGrant(GetDataGrantRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = GetDataGrantRequestMarshaller.Instance; + options.ResponseUnmarshaller = GetDataGrantResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// This operation returns information about a data grant. + /// + /// Container for the necessary parameters to execute the GetDataGrant service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the GetDataGrant service method, as returned by DataExchange. + /// + /// Access to the resource is denied. + /// + /// + /// An exception occurred with the service. + /// + /// + /// The resource couldn't be found. + /// + /// + /// The limit on the number of requests per second was exceeded. + /// + /// + /// The request was invalid. + /// + /// REST API Reference for GetDataGrant Operation + public virtual Task GetDataGrantAsync(GetDataGrantRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = GetDataGrantRequestMarshaller.Instance; + options.ResponseUnmarshaller = GetDataGrantResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + #region GetDataSet @@ -1221,6 +1519,77 @@ public virtual GetJobResponse GetJob(GetJobRequest request) #endregion + #region GetReceivedDataGrant + + + /// + /// This operation returns information about a received data grant. + /// + /// Container for the necessary parameters to execute the GetReceivedDataGrant service method. + /// + /// The response from the GetReceivedDataGrant service method, as returned by DataExchange. + /// + /// Access to the resource is denied. + /// + /// + /// An exception occurred with the service. + /// + /// + /// The resource couldn't be found. + /// + /// + /// The limit on the number of requests per second was exceeded. + /// + /// + /// The request was invalid. + /// + /// REST API Reference for GetReceivedDataGrant Operation + public virtual GetReceivedDataGrantResponse GetReceivedDataGrant(GetReceivedDataGrantRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = GetReceivedDataGrantRequestMarshaller.Instance; + options.ResponseUnmarshaller = GetReceivedDataGrantResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// This operation returns information about a received data grant. + /// + /// Container for the necessary parameters to execute the GetReceivedDataGrant service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the GetReceivedDataGrant service method, as returned by DataExchange. + /// + /// Access to the resource is denied. + /// + /// + /// An exception occurred with the service. + /// + /// + /// The resource couldn't be found. + /// + /// + /// The limit on the number of requests per second was exceeded. + /// + /// + /// The request was invalid. + /// + /// REST API Reference for GetReceivedDataGrant Operation + public virtual Task GetReceivedDataGrantAsync(GetReceivedDataGrantRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = GetReceivedDataGrantRequestMarshaller.Instance; + options.ResponseUnmarshaller = GetReceivedDataGrantResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + #region GetRevision @@ -1286,6 +1655,77 @@ public virtual GetRevisionResponse GetRevision(GetRevisionRequest request) #endregion + #region ListDataGrants + + + /// + /// This operation returns information about all data grants. + /// + /// Container for the necessary parameters to execute the ListDataGrants service method. + /// + /// The response from the ListDataGrants service method, as returned by DataExchange. + /// + /// Access to the resource is denied. + /// + /// + /// An exception occurred with the service. + /// + /// + /// The resource couldn't be found. + /// + /// + /// The limit on the number of requests per second was exceeded. + /// + /// + /// The request was invalid. + /// + /// REST API Reference for ListDataGrants Operation + public virtual ListDataGrantsResponse ListDataGrants(ListDataGrantsRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = ListDataGrantsRequestMarshaller.Instance; + options.ResponseUnmarshaller = ListDataGrantsResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// This operation returns information about all data grants. + /// + /// Container for the necessary parameters to execute the ListDataGrants service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the ListDataGrants service method, as returned by DataExchange. + /// + /// Access to the resource is denied. + /// + /// + /// An exception occurred with the service. + /// + /// + /// The resource couldn't be found. + /// + /// + /// The limit on the number of requests per second was exceeded. + /// + /// + /// The request was invalid. + /// + /// REST API Reference for ListDataGrants Operation + public virtual Task ListDataGrantsAsync(ListDataGrantsRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = ListDataGrantsRequestMarshaller.Instance; + options.ResponseUnmarshaller = ListDataGrantsResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + #region ListDataSetRevisions @@ -1356,8 +1796,7 @@ public virtual ListDataSetRevisionsResponse ListDataSetRevisions(ListDataSetRevi /// /// This operation lists your data sets. When listing by origin OWNED, results are sorted - /// by CreatedAt in descending order. When listing by origin ENTITLED, there is no order - /// and the maxResults parameter is ignored. + /// by CreatedAt in descending order. When listing by origin ENTITLED, there is no order. /// /// Container for the necessary parameters to execute the ListDataSets service method. /// @@ -1387,8 +1826,7 @@ public virtual ListDataSetsResponse ListDataSets(ListDataSetsRequest request) /// /// This operation lists your data sets. When listing by origin OWNED, results are sorted - /// by CreatedAt in descending order. When listing by origin ENTITLED, there is no order - /// and the maxResults parameter is ignored. + /// by CreatedAt in descending order. When listing by origin ENTITLED, there is no order. /// /// Container for the necessary parameters to execute the ListDataSets service method. /// @@ -1550,6 +1988,77 @@ public virtual ListJobsResponse ListJobs(ListJobsRequest request) #endregion + #region ListReceivedDataGrants + + + /// + /// This operation returns information about all received data grants. + /// + /// Container for the necessary parameters to execute the ListReceivedDataGrants service method. + /// + /// The response from the ListReceivedDataGrants service method, as returned by DataExchange. + /// + /// Access to the resource is denied. + /// + /// + /// An exception occurred with the service. + /// + /// + /// The resource couldn't be found. + /// + /// + /// The limit on the number of requests per second was exceeded. + /// + /// + /// The request was invalid. + /// + /// REST API Reference for ListReceivedDataGrants Operation + public virtual ListReceivedDataGrantsResponse ListReceivedDataGrants(ListReceivedDataGrantsRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = ListReceivedDataGrantsRequestMarshaller.Instance; + options.ResponseUnmarshaller = ListReceivedDataGrantsResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// This operation returns information about all received data grants. + /// + /// Container for the necessary parameters to execute the ListReceivedDataGrants service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the ListReceivedDataGrants service method, as returned by DataExchange. + /// + /// Access to the resource is denied. + /// + /// + /// An exception occurred with the service. + /// + /// + /// The resource couldn't be found. + /// + /// + /// The limit on the number of requests per second was exceeded. + /// + /// + /// The request was invalid. + /// + /// REST API Reference for ListReceivedDataGrants Operation + public virtual Task ListReceivedDataGrantsAsync(ListReceivedDataGrantsRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = ListReceivedDataGrantsRequestMarshaller.Instance; + options.ResponseUnmarshaller = ListReceivedDataGrantsResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + #region ListRevisionAssets diff --git a/sdk/src/Services/DataExchange/Properties/AssemblyInfo.cs b/sdk/src/Services/DataExchange/Properties/AssemblyInfo.cs index 193ef90554ca..2c9497e59a63 100644 --- a/sdk/src/Services/DataExchange/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/DataExchange/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.17")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/DataPipeline/DataPipeline.sln b/sdk/src/Services/DataPipeline/DataPipeline.sln index 54817ca4d30d..6eb61320fccc 100644 --- a/sdk/src/Services/DataPipeline/DataPipeline.sln +++ b/sdk/src/Services/DataPipeline/DataPipeline.sln @@ -92,7 +92,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {D07EC89D-6B7F-420B-A4B6-AB8F14DEFA0E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {D07EC89D-6B7F-420B-A4B6-AB8F14DEFA0E}.Debug|Any CPU.Build.0 = Debug|Any CPU {D07EC89D-6B7F-420B-A4B6-AB8F14DEFA0E}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -113,97 +120,6 @@ Global {B840DA76-C173-4B17-9EB0-000DBFDFCBA0}.Debug|Any CPU.Build.0 = Debug|Any CPU {B840DA76-C173-4B17-9EB0-000DBFDFCBA0}.Release|Any CPU.ActiveCfg = Release|Any CPU {B840DA76-C173-4B17-9EB0-000DBFDFCBA0}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {764D4285-A527-4F4D-BF8B-65B7B54D59A8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {764D4285-A527-4F4D-BF8B-65B7B54D59A8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {764D4285-A527-4F4D-BF8B-65B7B54D59A8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {764D4285-A527-4F4D-BF8B-65B7B54D59A8}.Release|Any CPU.Build.0 = Release|Any CPU - {D194ACA1-058A-4FC0-8D01-0C37CE5853F6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D194ACA1-058A-4FC0-8D01-0C37CE5853F6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D194ACA1-058A-4FC0-8D01-0C37CE5853F6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D194ACA1-058A-4FC0-8D01-0C37CE5853F6}.Release|Any CPU.Build.0 = Release|Any CPU - {5D73A199-D5EE-49F7-8E55-3B660B088351}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5D73A199-D5EE-49F7-8E55-3B660B088351}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5D73A199-D5EE-49F7-8E55-3B660B088351}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5D73A199-D5EE-49F7-8E55-3B660B088351}.Release|Any CPU.Build.0 = Release|Any CPU - {6690B86E-6906-4319-A655-CDC086C4C0C0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6690B86E-6906-4319-A655-CDC086C4C0C0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6690B86E-6906-4319-A655-CDC086C4C0C0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6690B86E-6906-4319-A655-CDC086C4C0C0}.Release|Any CPU.Build.0 = Release|Any CPU - {E5217589-3234-4B33-A9A5-0533CF35D4B5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E5217589-3234-4B33-A9A5-0533CF35D4B5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E5217589-3234-4B33-A9A5-0533CF35D4B5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E5217589-3234-4B33-A9A5-0533CF35D4B5}.Release|Any CPU.Build.0 = Release|Any CPU - {78B5B214-D0EA-457A-8631-6726AE27A4C1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {78B5B214-D0EA-457A-8631-6726AE27A4C1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {78B5B214-D0EA-457A-8631-6726AE27A4C1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {78B5B214-D0EA-457A-8631-6726AE27A4C1}.Release|Any CPU.Build.0 = Release|Any CPU - {661A52A3-F19B-4771-B07B-D1B719D52CDF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {661A52A3-F19B-4771-B07B-D1B719D52CDF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {661A52A3-F19B-4771-B07B-D1B719D52CDF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {661A52A3-F19B-4771-B07B-D1B719D52CDF}.Release|Any CPU.Build.0 = Release|Any CPU - {DC83FD8D-5E9E-411B-85A0-7C8AE2B4F9C9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DC83FD8D-5E9E-411B-85A0-7C8AE2B4F9C9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DC83FD8D-5E9E-411B-85A0-7C8AE2B4F9C9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DC83FD8D-5E9E-411B-85A0-7C8AE2B4F9C9}.Release|Any CPU.Build.0 = Release|Any CPU - {608D8129-5180-4902-A31B-C0AD2574E86A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {608D8129-5180-4902-A31B-C0AD2574E86A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {608D8129-5180-4902-A31B-C0AD2574E86A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {608D8129-5180-4902-A31B-C0AD2574E86A}.Release|Any CPU.Build.0 = Release|Any CPU - {964DC113-CE71-49B3-8CF0-4EF1AB7D97F8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {964DC113-CE71-49B3-8CF0-4EF1AB7D97F8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {964DC113-CE71-49B3-8CF0-4EF1AB7D97F8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {964DC113-CE71-49B3-8CF0-4EF1AB7D97F8}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {764D4285-A527-4F4D-BF8B-65B7B54D59A8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {764D4285-A527-4F4D-BF8B-65B7B54D59A8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {764D4285-A527-4F4D-BF8B-65B7B54D59A8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {764D4285-A527-4F4D-BF8B-65B7B54D59A8}.Release|Any CPU.Build.0 = Release|Any CPU - {D194ACA1-058A-4FC0-8D01-0C37CE5853F6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D194ACA1-058A-4FC0-8D01-0C37CE5853F6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D194ACA1-058A-4FC0-8D01-0C37CE5853F6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D194ACA1-058A-4FC0-8D01-0C37CE5853F6}.Release|Any CPU.Build.0 = Release|Any CPU - {5D73A199-D5EE-49F7-8E55-3B660B088351}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5D73A199-D5EE-49F7-8E55-3B660B088351}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5D73A199-D5EE-49F7-8E55-3B660B088351}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5D73A199-D5EE-49F7-8E55-3B660B088351}.Release|Any CPU.Build.0 = Release|Any CPU - {6690B86E-6906-4319-A655-CDC086C4C0C0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6690B86E-6906-4319-A655-CDC086C4C0C0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6690B86E-6906-4319-A655-CDC086C4C0C0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6690B86E-6906-4319-A655-CDC086C4C0C0}.Release|Any CPU.Build.0 = Release|Any CPU - {E5217589-3234-4B33-A9A5-0533CF35D4B5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E5217589-3234-4B33-A9A5-0533CF35D4B5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E5217589-3234-4B33-A9A5-0533CF35D4B5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E5217589-3234-4B33-A9A5-0533CF35D4B5}.Release|Any CPU.Build.0 = Release|Any CPU - {78B5B214-D0EA-457A-8631-6726AE27A4C1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {78B5B214-D0EA-457A-8631-6726AE27A4C1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {78B5B214-D0EA-457A-8631-6726AE27A4C1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {78B5B214-D0EA-457A-8631-6726AE27A4C1}.Release|Any CPU.Build.0 = Release|Any CPU - {661A52A3-F19B-4771-B07B-D1B719D52CDF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {661A52A3-F19B-4771-B07B-D1B719D52CDF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {661A52A3-F19B-4771-B07B-D1B719D52CDF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {661A52A3-F19B-4771-B07B-D1B719D52CDF}.Release|Any CPU.Build.0 = Release|Any CPU - {DC83FD8D-5E9E-411B-85A0-7C8AE2B4F9C9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DC83FD8D-5E9E-411B-85A0-7C8AE2B4F9C9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DC83FD8D-5E9E-411B-85A0-7C8AE2B4F9C9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DC83FD8D-5E9E-411B-85A0-7C8AE2B4F9C9}.Release|Any CPU.Build.0 = Release|Any CPU - {608D8129-5180-4902-A31B-C0AD2574E86A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {608D8129-5180-4902-A31B-C0AD2574E86A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {608D8129-5180-4902-A31B-C0AD2574E86A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {608D8129-5180-4902-A31B-C0AD2574E86A}.Release|Any CPU.Build.0 = Release|Any CPU - {964DC113-CE71-49B3-8CF0-4EF1AB7D97F8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {964DC113-CE71-49B3-8CF0-4EF1AB7D97F8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {964DC113-CE71-49B3-8CF0-4EF1AB7D97F8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {964DC113-CE71-49B3-8CF0-4EF1AB7D97F8}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -220,37 +136,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {D07EC89D-6B7F-420B-A4B6-AB8F14DEFA0E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {97E93042-FC80-40AD-99F6-EE137D142BFD} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {7DAE0C5D-FC77-47F7-80B3-7BA8CFC49DFD} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {4C49C0DA-BC38-49CC-BBA9-7E4091FA0997} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {B840DA76-C173-4B17-9EB0-000DBFDFCBA0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {764D4285-A527-4F4D-BF8B-65B7B54D59A8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D194ACA1-058A-4FC0-8D01-0C37CE5853F6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {5D73A199-D5EE-49F7-8E55-3B660B088351} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6690B86E-6906-4319-A655-CDC086C4C0C0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E5217589-3234-4B33-A9A5-0533CF35D4B5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {78B5B214-D0EA-457A-8631-6726AE27A4C1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {661A52A3-F19B-4771-B07B-D1B719D52CDF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {DC83FD8D-5E9E-411B-85A0-7C8AE2B4F9C9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {608D8129-5180-4902-A31B-C0AD2574E86A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {964DC113-CE71-49B3-8CF0-4EF1AB7D97F8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {764D4285-A527-4F4D-BF8B-65B7B54D59A8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D194ACA1-058A-4FC0-8D01-0C37CE5853F6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {5D73A199-D5EE-49F7-8E55-3B660B088351} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6690B86E-6906-4319-A655-CDC086C4C0C0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E5217589-3234-4B33-A9A5-0533CF35D4B5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {78B5B214-D0EA-457A-8631-6726AE27A4C1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {661A52A3-F19B-4771-B07B-D1B719D52CDF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {DC83FD8D-5E9E-411B-85A0-7C8AE2B4F9C9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {608D8129-5180-4902-A31B-C0AD2574E86A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {964DC113-CE71-49B3-8CF0-4EF1AB7D97F8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {DC0176C1-EA46-4CCA-BA1B-521863AF9B36} diff --git a/sdk/src/Services/DataPipeline/Generated/AmazonDataPipelineConfig.cs b/sdk/src/Services/DataPipeline/Generated/AmazonDataPipelineConfig.cs index ac0eac5cb4a4..f23ca9dfd9ff 100644 --- a/sdk/src/Services/DataPipeline/Generated/AmazonDataPipelineConfig.cs +++ b/sdk/src/Services/DataPipeline/Generated/AmazonDataPipelineConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.DataPipeline public partial class AmazonDataPipelineConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("Data Pipeline", "4.0.0.0"); private static readonly AmazonDataPipelineEndpointResolver EndpointResolver = new AmazonDataPipelineEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("Data Pipeline", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("Data Pipeline", "3.7.400.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/DataPipeline/Properties/AssemblyInfo.cs b/sdk/src/Services/DataPipeline/Properties/AssemblyInfo.cs index b670078d9379..eb53974137d7 100644 --- a/sdk/src/Services/DataPipeline/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/DataPipeline/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/DataSync/DataSync.sln b/sdk/src/Services/DataSync/DataSync.sln index 9bd09841f8e2..4b58ba1e2669 100644 --- a/sdk/src/Services/DataSync/DataSync.sln +++ b/sdk/src/Services/DataSync/DataSync.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {10206236-E4B8-45EE-ABFB-20D2CD3572F1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {10206236-E4B8-45EE-ABFB-20D2CD3572F1}.Debug|Any CPU.Build.0 = Debug|Any CPU {10206236-E4B8-45EE-ABFB-20D2CD3572F1}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {ED75B296-F408-41F8-980A-9B367349B922}.Debug|Any CPU.Build.0 = Debug|Any CPU {ED75B296-F408-41F8-980A-9B367349B922}.Release|Any CPU.ActiveCfg = Release|Any CPU {ED75B296-F408-41F8-980A-9B367349B922}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {FA06A267-7840-424C-8834-183E24A1CCDF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FA06A267-7840-424C-8834-183E24A1CCDF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FA06A267-7840-424C-8834-183E24A1CCDF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FA06A267-7840-424C-8834-183E24A1CCDF}.Release|Any CPU.Build.0 = Release|Any CPU - {46AE401B-D7AE-44D7-96A1-47985E26CF27}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {46AE401B-D7AE-44D7-96A1-47985E26CF27}.Debug|Any CPU.Build.0 = Debug|Any CPU - {46AE401B-D7AE-44D7-96A1-47985E26CF27}.Release|Any CPU.ActiveCfg = Release|Any CPU - {46AE401B-D7AE-44D7-96A1-47985E26CF27}.Release|Any CPU.Build.0 = Release|Any CPU - {74D9F141-998C-4A20-8818-7CFA8D99CE0D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {74D9F141-998C-4A20-8818-7CFA8D99CE0D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {74D9F141-998C-4A20-8818-7CFA8D99CE0D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {74D9F141-998C-4A20-8818-7CFA8D99CE0D}.Release|Any CPU.Build.0 = Release|Any CPU - {83BD6F0B-133C-43C6-BFD9-A52AF54C1BD4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {83BD6F0B-133C-43C6-BFD9-A52AF54C1BD4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {83BD6F0B-133C-43C6-BFD9-A52AF54C1BD4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {83BD6F0B-133C-43C6-BFD9-A52AF54C1BD4}.Release|Any CPU.Build.0 = Release|Any CPU - {09E77EE6-21E1-475C-947A-3753EE7CB0F4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {09E77EE6-21E1-475C-947A-3753EE7CB0F4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {09E77EE6-21E1-475C-947A-3753EE7CB0F4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {09E77EE6-21E1-475C-947A-3753EE7CB0F4}.Release|Any CPU.Build.0 = Release|Any CPU - {6571BF51-82C6-4EE6-9F6A-06A9E5994DAB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6571BF51-82C6-4EE6-9F6A-06A9E5994DAB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6571BF51-82C6-4EE6-9F6A-06A9E5994DAB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6571BF51-82C6-4EE6-9F6A-06A9E5994DAB}.Release|Any CPU.Build.0 = Release|Any CPU - {48BD86CC-F202-488F-ABB9-039A323E431F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {48BD86CC-F202-488F-ABB9-039A323E431F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {48BD86CC-F202-488F-ABB9-039A323E431F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {48BD86CC-F202-488F-ABB9-039A323E431F}.Release|Any CPU.Build.0 = Release|Any CPU - {91B51978-EAAD-4D0A-AB43-52C34EB13935}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {91B51978-EAAD-4D0A-AB43-52C34EB13935}.Debug|Any CPU.Build.0 = Debug|Any CPU - {91B51978-EAAD-4D0A-AB43-52C34EB13935}.Release|Any CPU.ActiveCfg = Release|Any CPU - {91B51978-EAAD-4D0A-AB43-52C34EB13935}.Release|Any CPU.Build.0 = Release|Any CPU - {FED81DCD-866A-4ED9-9A22-F89739299FE4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FED81DCD-866A-4ED9-9A22-F89739299FE4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FED81DCD-866A-4ED9-9A22-F89739299FE4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FED81DCD-866A-4ED9-9A22-F89739299FE4}.Release|Any CPU.Build.0 = Release|Any CPU - {5527298F-1615-49F1-8981-12D27D582744}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5527298F-1615-49F1-8981-12D27D582744}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5527298F-1615-49F1-8981-12D27D582744}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5527298F-1615-49F1-8981-12D27D582744}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {FA06A267-7840-424C-8834-183E24A1CCDF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FA06A267-7840-424C-8834-183E24A1CCDF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FA06A267-7840-424C-8834-183E24A1CCDF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FA06A267-7840-424C-8834-183E24A1CCDF}.Release|Any CPU.Build.0 = Release|Any CPU - {46AE401B-D7AE-44D7-96A1-47985E26CF27}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {46AE401B-D7AE-44D7-96A1-47985E26CF27}.Debug|Any CPU.Build.0 = Debug|Any CPU - {46AE401B-D7AE-44D7-96A1-47985E26CF27}.Release|Any CPU.ActiveCfg = Release|Any CPU - {46AE401B-D7AE-44D7-96A1-47985E26CF27}.Release|Any CPU.Build.0 = Release|Any CPU - {74D9F141-998C-4A20-8818-7CFA8D99CE0D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {74D9F141-998C-4A20-8818-7CFA8D99CE0D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {74D9F141-998C-4A20-8818-7CFA8D99CE0D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {74D9F141-998C-4A20-8818-7CFA8D99CE0D}.Release|Any CPU.Build.0 = Release|Any CPU - {83BD6F0B-133C-43C6-BFD9-A52AF54C1BD4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {83BD6F0B-133C-43C6-BFD9-A52AF54C1BD4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {83BD6F0B-133C-43C6-BFD9-A52AF54C1BD4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {83BD6F0B-133C-43C6-BFD9-A52AF54C1BD4}.Release|Any CPU.Build.0 = Release|Any CPU - {09E77EE6-21E1-475C-947A-3753EE7CB0F4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {09E77EE6-21E1-475C-947A-3753EE7CB0F4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {09E77EE6-21E1-475C-947A-3753EE7CB0F4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {09E77EE6-21E1-475C-947A-3753EE7CB0F4}.Release|Any CPU.Build.0 = Release|Any CPU - {6571BF51-82C6-4EE6-9F6A-06A9E5994DAB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6571BF51-82C6-4EE6-9F6A-06A9E5994DAB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6571BF51-82C6-4EE6-9F6A-06A9E5994DAB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6571BF51-82C6-4EE6-9F6A-06A9E5994DAB}.Release|Any CPU.Build.0 = Release|Any CPU - {48BD86CC-F202-488F-ABB9-039A323E431F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {48BD86CC-F202-488F-ABB9-039A323E431F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {48BD86CC-F202-488F-ABB9-039A323E431F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {48BD86CC-F202-488F-ABB9-039A323E431F}.Release|Any CPU.Build.0 = Release|Any CPU - {91B51978-EAAD-4D0A-AB43-52C34EB13935}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {91B51978-EAAD-4D0A-AB43-52C34EB13935}.Debug|Any CPU.Build.0 = Debug|Any CPU - {91B51978-EAAD-4D0A-AB43-52C34EB13935}.Release|Any CPU.ActiveCfg = Release|Any CPU - {91B51978-EAAD-4D0A-AB43-52C34EB13935}.Release|Any CPU.Build.0 = Release|Any CPU - {FED81DCD-866A-4ED9-9A22-F89739299FE4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FED81DCD-866A-4ED9-9A22-F89739299FE4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FED81DCD-866A-4ED9-9A22-F89739299FE4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FED81DCD-866A-4ED9-9A22-F89739299FE4}.Release|Any CPU.Build.0 = Release|Any CPU - {5527298F-1615-49F1-8981-12D27D582744}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5527298F-1615-49F1-8981-12D27D582744}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5527298F-1615-49F1-8981-12D27D582744}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5527298F-1615-49F1-8981-12D27D582744}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {10206236-E4B8-45EE-ABFB-20D2CD3572F1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {AF55FBF2-C160-4C1E-AC2E-01B0058CEA9D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {EA0833CB-4527-45BE-ADAD-26EAA83871E5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {8B3EFC7A-D7F7-40D4-98C4-058BD6E51955} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {ED75B296-F408-41F8-980A-9B367349B922} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {FA06A267-7840-424C-8834-183E24A1CCDF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {46AE401B-D7AE-44D7-96A1-47985E26CF27} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {74D9F141-998C-4A20-8818-7CFA8D99CE0D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {83BD6F0B-133C-43C6-BFD9-A52AF54C1BD4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {09E77EE6-21E1-475C-947A-3753EE7CB0F4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6571BF51-82C6-4EE6-9F6A-06A9E5994DAB} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {48BD86CC-F202-488F-ABB9-039A323E431F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {91B51978-EAAD-4D0A-AB43-52C34EB13935} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {FED81DCD-866A-4ED9-9A22-F89739299FE4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {5527298F-1615-49F1-8981-12D27D582744} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {FA06A267-7840-424C-8834-183E24A1CCDF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {46AE401B-D7AE-44D7-96A1-47985E26CF27} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {74D9F141-998C-4A20-8818-7CFA8D99CE0D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {83BD6F0B-133C-43C6-BFD9-A52AF54C1BD4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {09E77EE6-21E1-475C-947A-3753EE7CB0F4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6571BF51-82C6-4EE6-9F6A-06A9E5994DAB} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {48BD86CC-F202-488F-ABB9-039A323E431F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {91B51978-EAAD-4D0A-AB43-52C34EB13935} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {FED81DCD-866A-4ED9-9A22-F89739299FE4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {5527298F-1615-49F1-8981-12D27D582744} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {070F4565-70F9-4123-AE81-074E3B4F7BDE} diff --git a/sdk/src/Services/DataSync/Generated/AmazonDataSyncConfig.cs b/sdk/src/Services/DataSync/Generated/AmazonDataSyncConfig.cs index 52bfec35fdc2..e8fe4dec416d 100644 --- a/sdk/src/Services/DataSync/Generated/AmazonDataSyncConfig.cs +++ b/sdk/src/Services/DataSync/Generated/AmazonDataSyncConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.DataSync public partial class AmazonDataSyncConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("DataSync", "4.0.0.0"); private static readonly AmazonDataSyncEndpointResolver EndpointResolver = new AmazonDataSyncEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("DataSync", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("DataSync", "3.7.401.10"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/DataSync/Generated/Model/DescribeTaskExecutionResponse.cs b/sdk/src/Services/DataSync/Generated/Model/DescribeTaskExecutionResponse.cs index 7af461212fb4..b353730aa2e2 100644 --- a/sdk/src/Services/DataSync/Generated/Model/DescribeTaskExecutionResponse.cs +++ b/sdk/src/Services/DataSync/Generated/Model/DescribeTaskExecutionResponse.cs @@ -316,9 +316,9 @@ internal bool IsSetFilesListed() /// destination without comparing differences between the locations. /// /// - public long FilesPrepared + public long? FilesPrepared { - get { return this._filesPrepared.GetValueOrDefault(); } + get { return this._filesPrepared; } set { this._filesPrepared = value; } } diff --git a/sdk/src/Services/DataSync/Generated/Model/Internal/MarshallTransformations/CreateTaskRequestMarshaller.cs b/sdk/src/Services/DataSync/Generated/Model/Internal/MarshallTransformations/CreateTaskRequestMarshaller.cs index 402c68dc85c1..51e2cde28fd3 100644 --- a/sdk/src/Services/DataSync/Generated/Model/Internal/MarshallTransformations/CreateTaskRequestMarshaller.cs +++ b/sdk/src/Services/DataSync/Generated/Model/Internal/MarshallTransformations/CreateTaskRequestMarshaller.cs @@ -176,6 +176,12 @@ public IRequest Marshall(CreateTaskRequest publicRequest) context.Writer.WriteArrayEnd(); } + if(publicRequest.IsSetTaskMode()) + { + context.Writer.WritePropertyName("TaskMode"); + context.Writer.Write(publicRequest.TaskMode); + } + if(publicRequest.IsSetTaskReportConfig()) { context.Writer.WritePropertyName("TaskReportConfig"); @@ -186,36 +192,6 @@ public IRequest Marshall(CreateTaskRequest publicRequest) context.Writer.WriteObjectEnd(); } -<<<<<<< HEAD -||||||| Commit version number update changes - context.Writer.WriteArrayEnd(); - } - - if(publicRequest.IsSetTaskReportConfig()) - { - context.Writer.WritePropertyName("TaskReportConfig"); - context.Writer.WriteObjectStart(); - - var marshaller = TaskReportConfigMarshaller.Instance; - marshaller.Marshall(publicRequest.TaskReportConfig, context); -======= - context.Writer.WriteArrayEnd(); - } - - if(publicRequest.IsSetTaskMode()) - { - context.Writer.WritePropertyName("TaskMode"); - context.Writer.Write(publicRequest.TaskMode); - } - - if(publicRequest.IsSetTaskReportConfig()) - { - context.Writer.WritePropertyName("TaskReportConfig"); - context.Writer.WriteObjectStart(); - - var marshaller = TaskReportConfigMarshaller.Instance; - marshaller.Marshall(publicRequest.TaskReportConfig, context); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b writer.WriteObjectEnd(); } diff --git a/sdk/src/Services/DataSync/Generated/Model/Internal/MarshallTransformations/DescribeTaskExecutionResponseUnmarshaller.cs b/sdk/src/Services/DataSync/Generated/Model/Internal/MarshallTransformations/DescribeTaskExecutionResponseUnmarshaller.cs index 365d117d3dd5..2aa114dbcdbf 100644 --- a/sdk/src/Services/DataSync/Generated/Model/Internal/MarshallTransformations/DescribeTaskExecutionResponseUnmarshaller.cs +++ b/sdk/src/Services/DataSync/Generated/Model/Internal/MarshallTransformations/DescribeTaskExecutionResponseUnmarshaller.cs @@ -114,7 +114,7 @@ public override AmazonWebServiceResponse Unmarshall(JsonUnmarshallerContext cont } if (context.TestExpression("FilesPrepared", targetDepth)) { - var unmarshaller = LongUnmarshaller.Instance; + var unmarshaller = NullableLongUnmarshaller.Instance; response.FilesPrepared = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/DataSync/Generated/Model/Internal/MarshallTransformations/TaskExecutionFilesFailedDetailUnmarshaller.cs b/sdk/src/Services/DataSync/Generated/Model/Internal/MarshallTransformations/TaskExecutionFilesFailedDetailUnmarshaller.cs index 468f3e0942e1..230b5ada8d28 100644 --- a/sdk/src/Services/DataSync/Generated/Model/Internal/MarshallTransformations/TaskExecutionFilesFailedDetailUnmarshaller.cs +++ b/sdk/src/Services/DataSync/Generated/Model/Internal/MarshallTransformations/TaskExecutionFilesFailedDetailUnmarshaller.cs @@ -68,25 +68,25 @@ public TaskExecutionFilesFailedDetail Unmarshall(JsonUnmarshallerContext context { if (context.TestExpression("Delete", targetDepth)) { - var unmarshaller = LongUnmarshaller.Instance; + var unmarshaller = NullableLongUnmarshaller.Instance; unmarshalledObject.Delete = unmarshaller.Unmarshall(context); continue; } if (context.TestExpression("Prepare", targetDepth)) { - var unmarshaller = LongUnmarshaller.Instance; + var unmarshaller = NullableLongUnmarshaller.Instance; unmarshalledObject.Prepare = unmarshaller.Unmarshall(context); continue; } if (context.TestExpression("Transfer", targetDepth)) { - var unmarshaller = LongUnmarshaller.Instance; + var unmarshaller = NullableLongUnmarshaller.Instance; unmarshalledObject.Transfer = unmarshaller.Unmarshall(context); continue; } if (context.TestExpression("Verify", targetDepth)) { - var unmarshaller = LongUnmarshaller.Instance; + var unmarshaller = NullableLongUnmarshaller.Instance; unmarshalledObject.Verify = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/DataSync/Generated/Model/Internal/MarshallTransformations/TaskExecutionFilesListedDetailUnmarshaller.cs b/sdk/src/Services/DataSync/Generated/Model/Internal/MarshallTransformations/TaskExecutionFilesListedDetailUnmarshaller.cs index 41fa7c2b4728..cd2c46537bed 100644 --- a/sdk/src/Services/DataSync/Generated/Model/Internal/MarshallTransformations/TaskExecutionFilesListedDetailUnmarshaller.cs +++ b/sdk/src/Services/DataSync/Generated/Model/Internal/MarshallTransformations/TaskExecutionFilesListedDetailUnmarshaller.cs @@ -68,13 +68,13 @@ public TaskExecutionFilesListedDetail Unmarshall(JsonUnmarshallerContext context { if (context.TestExpression("AtDestinationForDelete", targetDepth)) { - var unmarshaller = LongUnmarshaller.Instance; + var unmarshaller = NullableLongUnmarshaller.Instance; unmarshalledObject.AtDestinationForDelete = unmarshaller.Unmarshall(context); continue; } if (context.TestExpression("AtSource", targetDepth)) { - var unmarshaller = LongUnmarshaller.Instance; + var unmarshaller = NullableLongUnmarshaller.Instance; unmarshalledObject.AtSource = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/DataSync/Generated/Model/TaskExecutionFilesFailedDetail.cs b/sdk/src/Services/DataSync/Generated/Model/TaskExecutionFilesFailedDetail.cs index 453492e400ae..430d8d875b38 100644 --- a/sdk/src/Services/DataSync/Generated/Model/TaskExecutionFilesFailedDetail.cs +++ b/sdk/src/Services/DataSync/Generated/Model/TaskExecutionFilesFailedDetail.cs @@ -53,9 +53,9 @@ public partial class TaskExecutionFilesFailedDetail /// The number of objects that DataSync fails to delete during your task execution. /// /// - public long Delete + public long? Delete { - get { return this._delete.GetValueOrDefault(); } + get { return this._delete; } set { this._delete = value; } } @@ -71,9 +71,9 @@ internal bool IsSetDelete() /// The number of objects that DataSync fails to prepare during your task execution. /// /// - public long Prepare + public long? Prepare { - get { return this._prepare.GetValueOrDefault(); } + get { return this._prepare; } set { this._prepare = value; } } @@ -89,9 +89,9 @@ internal bool IsSetPrepare() /// The number of objects that DataSync fails to transfer during your task execution. /// /// - public long Transfer + public long? Transfer { - get { return this._transfer.GetValueOrDefault(); } + get { return this._transfer; } set { this._transfer = value; } } @@ -107,9 +107,9 @@ internal bool IsSetTransfer() /// The number of objects that DataSync fails to verify during your task execution. /// /// - public long Verify + public long? Verify { - get { return this._verify.GetValueOrDefault(); } + get { return this._verify; } set { this._verify = value; } } diff --git a/sdk/src/Services/DataSync/Generated/Model/TaskExecutionFilesListedDetail.cs b/sdk/src/Services/DataSync/Generated/Model/TaskExecutionFilesListedDetail.cs index c0a50ae9f261..7aac9a532dde 100644 --- a/sdk/src/Services/DataSync/Generated/Model/TaskExecutionFilesListedDetail.cs +++ b/sdk/src/Services/DataSync/Generated/Model/TaskExecutionFilesListedDetail.cs @@ -52,9 +52,9 @@ public partial class TaskExecutionFilesListedDetail /// your task to delete data in the destination that isn't in the source. /// /// - public long AtDestinationForDelete + public long? AtDestinationForDelete { - get { return this._atDestinationForDelete.GetValueOrDefault(); } + get { return this._atDestinationForDelete; } set { this._atDestinationForDelete = value; } } @@ -86,9 +86,9 @@ internal bool IsSetAtDestinationForDelete() /// /// /// - public long AtSource + public long? AtSource { - get { return this._atSource.GetValueOrDefault(); } + get { return this._atSource; } set { this._atSource = value; } } diff --git a/sdk/src/Services/DataSync/Generated/_bcl/AmazonDataSyncClient.cs b/sdk/src/Services/DataSync/Generated/_bcl/AmazonDataSyncClient.cs index dbf0807b0f7e..9aae52da90a3 100644 --- a/sdk/src/Services/DataSync/Generated/_bcl/AmazonDataSyncClient.cs +++ b/sdk/src/Services/DataSync/Generated/_bcl/AmazonDataSyncClient.cs @@ -408,29 +408,14 @@ public virtual CancelTaskExecutionResponse CancelTaskExecution(CancelTaskExecuti /// - /// Activates an DataSync agent that you've deployed in your storage environment. The - /// activation process associates the agent with your Amazon Web Services account. + /// Activates an DataSync agent that you deploy in your storage environment. The activation + /// process associates the agent with your Amazon Web Services account. /// /// /// - /// If you haven't deployed an agent yet, see the following topics to learn more: + /// If you haven't deployed an agent yet, see Do + /// I need a DataSync agent? /// - /// - /// - /// If you're transferring between Amazon Web Services storage services, you don't need - /// a DataSync agent. - /// - /// /// /// Container for the necessary parameters to execute the CreateAgent service method. /// @@ -453,29 +438,14 @@ public virtual CreateAgentResponse CreateAgent(CreateAgentRequest request) /// - /// Activates an DataSync agent that you've deployed in your storage environment. The - /// activation process associates the agent with your Amazon Web Services account. + /// Activates an DataSync agent that you deploy in your storage environment. The activation + /// process associates the agent with your Amazon Web Services account. /// /// /// - /// If you haven't deployed an agent yet, see the following topics to learn more: - /// - /// - /// - /// If you're transferring between Amazon Web Services storage services, you don't need - /// a DataSync agent. + /// If you haven't deployed an agent yet, see Do + /// I need a DataSync agent? /// - /// /// /// Container for the necessary parameters to execute the CreateAgent service method. /// @@ -2520,7 +2490,17 @@ public virtual DescribeTaskResponse DescribeTask(DescribeTaskRequest request) /// /// Provides information about an execution of your DataSync task. You can use this operation - /// to help monitor the progress of an ongoing transfer or check the results of the transfer. + /// to help monitor the progress of an ongoing data transfer or check the results of the + /// transfer. + /// + /// + /// + /// Some DescribeTaskExecution response elements are only relevant to a specific + /// task mode. For information, see Understanding + /// task mode differences and Understanding + /// data transfer performance counters. + /// + /// /// /// Container for the necessary parameters to execute the DescribeTaskExecution service method. /// @@ -2544,7 +2524,17 @@ public virtual DescribeTaskExecutionResponse DescribeTaskExecution(DescribeTaskE /// /// Provides information about an execution of your DataSync task. You can use this operation - /// to help monitor the progress of an ongoing transfer or check the results of the transfer. + /// to help monitor the progress of an ongoing data transfer or check the results of the + /// transfer. + /// + /// + /// + /// Some DescribeTaskExecution response elements are only relevant to a specific + /// task mode. For information, see Understanding + /// task mode differences and Understanding + /// data transfer performance counters. + /// + /// /// /// Container for the necessary parameters to execute the DescribeTaskExecution service method. /// @@ -3183,7 +3173,7 @@ public virtual StartDiscoveryJobResponse StartDiscoveryJob(StartDiscoveryJobRequ /// /// /// - /// There are several phases to a task execution. For more information, see Task + /// There are several steps to a task execution. For more information, see Task /// execution statuses. /// /// @@ -3220,7 +3210,7 @@ public virtual StartTaskExecutionResponse StartTaskExecution(StartTaskExecutionR /// /// /// - /// There are several phases to a task execution. For more information, see Task + /// There are several steps to a task execution. For more information, see Task /// execution statuses. /// /// diff --git a/sdk/src/Services/DataSync/Properties/AssemblyInfo.cs b/sdk/src/Services/DataSync/Properties/AssemblyInfo.cs index 69ef9003e133..5858e85bcb50 100644 --- a/sdk/src/Services/DataSync/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/DataSync/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.10")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/DataZone/DataZone.sln b/sdk/src/Services/DataZone/DataZone.sln index d2035694b565..ec334d792e6d 100644 --- a/sdk/src/Services/DataZone/DataZone.sln +++ b/sdk/src/Services/DataZone/DataZone.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {E9E31B23-384E-466D-B539-E4F2755A4E38}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {E9E31B23-384E-466D-B539-E4F2755A4E38}.Debug|Any CPU.Build.0 = Debug|Any CPU {E9E31B23-384E-466D-B539-E4F2755A4E38}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {C503AEBE-E910-486E-98DA-B028D36548A5}.Debug|Any CPU.Build.0 = Debug|Any CPU {C503AEBE-E910-486E-98DA-B028D36548A5}.Release|Any CPU.ActiveCfg = Release|Any CPU {C503AEBE-E910-486E-98DA-B028D36548A5}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {7454FB9A-089D-4297-8FA9-2F29AA992D7A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7454FB9A-089D-4297-8FA9-2F29AA992D7A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7454FB9A-089D-4297-8FA9-2F29AA992D7A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7454FB9A-089D-4297-8FA9-2F29AA992D7A}.Release|Any CPU.Build.0 = Release|Any CPU - {50C4DAAC-5562-4E84-B973-FE09ECDA04AF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {50C4DAAC-5562-4E84-B973-FE09ECDA04AF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {50C4DAAC-5562-4E84-B973-FE09ECDA04AF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {50C4DAAC-5562-4E84-B973-FE09ECDA04AF}.Release|Any CPU.Build.0 = Release|Any CPU - {2C5117E5-C1F7-499F-925A-2021F93F2830}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2C5117E5-C1F7-499F-925A-2021F93F2830}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2C5117E5-C1F7-499F-925A-2021F93F2830}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2C5117E5-C1F7-499F-925A-2021F93F2830}.Release|Any CPU.Build.0 = Release|Any CPU - {837D0F43-087A-4BC3-890A-66657B6CA25D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {837D0F43-087A-4BC3-890A-66657B6CA25D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {837D0F43-087A-4BC3-890A-66657B6CA25D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {837D0F43-087A-4BC3-890A-66657B6CA25D}.Release|Any CPU.Build.0 = Release|Any CPU - {A8E9EF19-3703-4372-A0E8-BC7F0ED5011E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A8E9EF19-3703-4372-A0E8-BC7F0ED5011E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A8E9EF19-3703-4372-A0E8-BC7F0ED5011E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A8E9EF19-3703-4372-A0E8-BC7F0ED5011E}.Release|Any CPU.Build.0 = Release|Any CPU - {9D07D6A2-B97B-480A-A182-D3A43CB0A671}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9D07D6A2-B97B-480A-A182-D3A43CB0A671}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9D07D6A2-B97B-480A-A182-D3A43CB0A671}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9D07D6A2-B97B-480A-A182-D3A43CB0A671}.Release|Any CPU.Build.0 = Release|Any CPU - {0EF8D77A-76FC-4E67-84EF-4BBAD4D260E6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0EF8D77A-76FC-4E67-84EF-4BBAD4D260E6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0EF8D77A-76FC-4E67-84EF-4BBAD4D260E6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0EF8D77A-76FC-4E67-84EF-4BBAD4D260E6}.Release|Any CPU.Build.0 = Release|Any CPU - {992FA990-72DD-4C56-9282-F3794137F886}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {992FA990-72DD-4C56-9282-F3794137F886}.Debug|Any CPU.Build.0 = Debug|Any CPU - {992FA990-72DD-4C56-9282-F3794137F886}.Release|Any CPU.ActiveCfg = Release|Any CPU - {992FA990-72DD-4C56-9282-F3794137F886}.Release|Any CPU.Build.0 = Release|Any CPU - {E36472C4-95E9-4043-B596-DB6A631BA10E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E36472C4-95E9-4043-B596-DB6A631BA10E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E36472C4-95E9-4043-B596-DB6A631BA10E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E36472C4-95E9-4043-B596-DB6A631BA10E}.Release|Any CPU.Build.0 = Release|Any CPU - {CF1B1BE9-262A-4DEE-8EBB-E7AA0F4CC2C1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CF1B1BE9-262A-4DEE-8EBB-E7AA0F4CC2C1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CF1B1BE9-262A-4DEE-8EBB-E7AA0F4CC2C1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CF1B1BE9-262A-4DEE-8EBB-E7AA0F4CC2C1}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {7454FB9A-089D-4297-8FA9-2F29AA992D7A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7454FB9A-089D-4297-8FA9-2F29AA992D7A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7454FB9A-089D-4297-8FA9-2F29AA992D7A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7454FB9A-089D-4297-8FA9-2F29AA992D7A}.Release|Any CPU.Build.0 = Release|Any CPU - {50C4DAAC-5562-4E84-B973-FE09ECDA04AF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {50C4DAAC-5562-4E84-B973-FE09ECDA04AF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {50C4DAAC-5562-4E84-B973-FE09ECDA04AF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {50C4DAAC-5562-4E84-B973-FE09ECDA04AF}.Release|Any CPU.Build.0 = Release|Any CPU - {2C5117E5-C1F7-499F-925A-2021F93F2830}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2C5117E5-C1F7-499F-925A-2021F93F2830}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2C5117E5-C1F7-499F-925A-2021F93F2830}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2C5117E5-C1F7-499F-925A-2021F93F2830}.Release|Any CPU.Build.0 = Release|Any CPU - {837D0F43-087A-4BC3-890A-66657B6CA25D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {837D0F43-087A-4BC3-890A-66657B6CA25D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {837D0F43-087A-4BC3-890A-66657B6CA25D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {837D0F43-087A-4BC3-890A-66657B6CA25D}.Release|Any CPU.Build.0 = Release|Any CPU - {A8E9EF19-3703-4372-A0E8-BC7F0ED5011E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A8E9EF19-3703-4372-A0E8-BC7F0ED5011E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A8E9EF19-3703-4372-A0E8-BC7F0ED5011E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A8E9EF19-3703-4372-A0E8-BC7F0ED5011E}.Release|Any CPU.Build.0 = Release|Any CPU - {9D07D6A2-B97B-480A-A182-D3A43CB0A671}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9D07D6A2-B97B-480A-A182-D3A43CB0A671}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9D07D6A2-B97B-480A-A182-D3A43CB0A671}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9D07D6A2-B97B-480A-A182-D3A43CB0A671}.Release|Any CPU.Build.0 = Release|Any CPU - {0EF8D77A-76FC-4E67-84EF-4BBAD4D260E6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0EF8D77A-76FC-4E67-84EF-4BBAD4D260E6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0EF8D77A-76FC-4E67-84EF-4BBAD4D260E6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0EF8D77A-76FC-4E67-84EF-4BBAD4D260E6}.Release|Any CPU.Build.0 = Release|Any CPU - {992FA990-72DD-4C56-9282-F3794137F886}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {992FA990-72DD-4C56-9282-F3794137F886}.Debug|Any CPU.Build.0 = Debug|Any CPU - {992FA990-72DD-4C56-9282-F3794137F886}.Release|Any CPU.ActiveCfg = Release|Any CPU - {992FA990-72DD-4C56-9282-F3794137F886}.Release|Any CPU.Build.0 = Release|Any CPU - {E36472C4-95E9-4043-B596-DB6A631BA10E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E36472C4-95E9-4043-B596-DB6A631BA10E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E36472C4-95E9-4043-B596-DB6A631BA10E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E36472C4-95E9-4043-B596-DB6A631BA10E}.Release|Any CPU.Build.0 = Release|Any CPU - {CF1B1BE9-262A-4DEE-8EBB-E7AA0F4CC2C1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CF1B1BE9-262A-4DEE-8EBB-E7AA0F4CC2C1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CF1B1BE9-262A-4DEE-8EBB-E7AA0F4CC2C1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CF1B1BE9-262A-4DEE-8EBB-E7AA0F4CC2C1}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {E9E31B23-384E-466D-B539-E4F2755A4E38} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {A735365B-A373-4C18-8E21-25CEFC6EC28C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {8971BC45-E8B0-4B6F-A539-0D5A9846B957} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {CA5129FA-3C3B-4BDD-82C5-53C9071E6E7B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {C503AEBE-E910-486E-98DA-B028D36548A5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {7454FB9A-089D-4297-8FA9-2F29AA992D7A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {50C4DAAC-5562-4E84-B973-FE09ECDA04AF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {2C5117E5-C1F7-499F-925A-2021F93F2830} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {837D0F43-087A-4BC3-890A-66657B6CA25D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A8E9EF19-3703-4372-A0E8-BC7F0ED5011E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {9D07D6A2-B97B-480A-A182-D3A43CB0A671} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0EF8D77A-76FC-4E67-84EF-4BBAD4D260E6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {992FA990-72DD-4C56-9282-F3794137F886} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E36472C4-95E9-4043-B596-DB6A631BA10E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {CF1B1BE9-262A-4DEE-8EBB-E7AA0F4CC2C1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {7454FB9A-089D-4297-8FA9-2F29AA992D7A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {50C4DAAC-5562-4E84-B973-FE09ECDA04AF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {2C5117E5-C1F7-499F-925A-2021F93F2830} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {837D0F43-087A-4BC3-890A-66657B6CA25D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A8E9EF19-3703-4372-A0E8-BC7F0ED5011E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {9D07D6A2-B97B-480A-A182-D3A43CB0A671} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0EF8D77A-76FC-4E67-84EF-4BBAD4D260E6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {992FA990-72DD-4C56-9282-F3794137F886} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E36472C4-95E9-4043-B596-DB6A631BA10E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {CF1B1BE9-262A-4DEE-8EBB-E7AA0F4CC2C1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {5418B7C3-FB30-4AC8-87CE-B8504EAFBADA} diff --git a/sdk/src/Services/DataZone/Generated/AmazonDataZoneConfig.cs b/sdk/src/Services/DataZone/Generated/AmazonDataZoneConfig.cs index 07dda5e3eec2..ff66bcf391ef 100644 --- a/sdk/src/Services/DataZone/Generated/AmazonDataZoneConfig.cs +++ b/sdk/src/Services/DataZone/Generated/AmazonDataZoneConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.DataZone public partial class AmazonDataZoneConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("DataZone", "4.0.0.0"); private static readonly AmazonDataZoneEndpointResolver EndpointResolver = new AmazonDataZoneEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("DataZone", "3.7.405.13"); -======= - InternalSDKUtils.BuildUserAgentString("DataZone", "3.7.406.17"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/DataZone/Properties/AssemblyInfo.cs b/sdk/src/Services/DataZone/Properties/AssemblyInfo.cs index 1ba9db53a78d..4ef823aab2da 100644 --- a/sdk/src/Services/DataZone/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/DataZone/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.405.13")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.406.17")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/DatabaseMigrationService/DatabaseMigrationService.sln b/sdk/src/Services/DatabaseMigrationService/DatabaseMigrationService.sln index 405482be2c45..1371c22a765d 100644 --- a/sdk/src/Services/DatabaseMigrationService/DatabaseMigrationService.sln +++ b/sdk/src/Services/DatabaseMigrationService/DatabaseMigrationService.sln @@ -92,7 +92,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {620E4155-9C71-44E2-9ACB-8E903A5675C6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {620E4155-9C71-44E2-9ACB-8E903A5675C6}.Debug|Any CPU.Build.0 = Debug|Any CPU {620E4155-9C71-44E2-9ACB-8E903A5675C6}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -113,97 +120,6 @@ Global {C00AC9F9-EF66-4C89-8814-31A9409A1679}.Debug|Any CPU.Build.0 = Debug|Any CPU {C00AC9F9-EF66-4C89-8814-31A9409A1679}.Release|Any CPU.ActiveCfg = Release|Any CPU {C00AC9F9-EF66-4C89-8814-31A9409A1679}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {0C0E34B7-BCE4-4C44-BFFD-93A13253C214}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0C0E34B7-BCE4-4C44-BFFD-93A13253C214}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0C0E34B7-BCE4-4C44-BFFD-93A13253C214}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0C0E34B7-BCE4-4C44-BFFD-93A13253C214}.Release|Any CPU.Build.0 = Release|Any CPU - {ECA1C474-76B7-4C90-B29B-31A88A89E69B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {ECA1C474-76B7-4C90-B29B-31A88A89E69B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {ECA1C474-76B7-4C90-B29B-31A88A89E69B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {ECA1C474-76B7-4C90-B29B-31A88A89E69B}.Release|Any CPU.Build.0 = Release|Any CPU - {9B3AFBE0-C323-4611-B26D-27A6DAFAB9D8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9B3AFBE0-C323-4611-B26D-27A6DAFAB9D8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9B3AFBE0-C323-4611-B26D-27A6DAFAB9D8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9B3AFBE0-C323-4611-B26D-27A6DAFAB9D8}.Release|Any CPU.Build.0 = Release|Any CPU - {CBA431A5-23A9-44C4-AFED-E8118995EC58}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CBA431A5-23A9-44C4-AFED-E8118995EC58}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CBA431A5-23A9-44C4-AFED-E8118995EC58}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CBA431A5-23A9-44C4-AFED-E8118995EC58}.Release|Any CPU.Build.0 = Release|Any CPU - {0E662856-D8A8-4480-A203-CACBCCEB2331}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0E662856-D8A8-4480-A203-CACBCCEB2331}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0E662856-D8A8-4480-A203-CACBCCEB2331}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0E662856-D8A8-4480-A203-CACBCCEB2331}.Release|Any CPU.Build.0 = Release|Any CPU - {2E0B1846-0171-4991-ADB3-381176D87ED9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2E0B1846-0171-4991-ADB3-381176D87ED9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2E0B1846-0171-4991-ADB3-381176D87ED9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2E0B1846-0171-4991-ADB3-381176D87ED9}.Release|Any CPU.Build.0 = Release|Any CPU - {2835623E-A11F-4254-BC4A-BC7CEB91FB76}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2835623E-A11F-4254-BC4A-BC7CEB91FB76}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2835623E-A11F-4254-BC4A-BC7CEB91FB76}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2835623E-A11F-4254-BC4A-BC7CEB91FB76}.Release|Any CPU.Build.0 = Release|Any CPU - {5572E403-E6A2-4D1A-8CE6-A6B008DF27A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5572E403-E6A2-4D1A-8CE6-A6B008DF27A2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5572E403-E6A2-4D1A-8CE6-A6B008DF27A2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5572E403-E6A2-4D1A-8CE6-A6B008DF27A2}.Release|Any CPU.Build.0 = Release|Any CPU - {A517C5EB-E743-442F-A200-B7777D54CF6D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A517C5EB-E743-442F-A200-B7777D54CF6D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A517C5EB-E743-442F-A200-B7777D54CF6D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A517C5EB-E743-442F-A200-B7777D54CF6D}.Release|Any CPU.Build.0 = Release|Any CPU - {93CD6063-D667-44FA-A263-FA9A0C7391F0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {93CD6063-D667-44FA-A263-FA9A0C7391F0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {93CD6063-D667-44FA-A263-FA9A0C7391F0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {93CD6063-D667-44FA-A263-FA9A0C7391F0}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {0C0E34B7-BCE4-4C44-BFFD-93A13253C214}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0C0E34B7-BCE4-4C44-BFFD-93A13253C214}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0C0E34B7-BCE4-4C44-BFFD-93A13253C214}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0C0E34B7-BCE4-4C44-BFFD-93A13253C214}.Release|Any CPU.Build.0 = Release|Any CPU - {ECA1C474-76B7-4C90-B29B-31A88A89E69B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {ECA1C474-76B7-4C90-B29B-31A88A89E69B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {ECA1C474-76B7-4C90-B29B-31A88A89E69B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {ECA1C474-76B7-4C90-B29B-31A88A89E69B}.Release|Any CPU.Build.0 = Release|Any CPU - {9B3AFBE0-C323-4611-B26D-27A6DAFAB9D8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9B3AFBE0-C323-4611-B26D-27A6DAFAB9D8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9B3AFBE0-C323-4611-B26D-27A6DAFAB9D8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9B3AFBE0-C323-4611-B26D-27A6DAFAB9D8}.Release|Any CPU.Build.0 = Release|Any CPU - {CBA431A5-23A9-44C4-AFED-E8118995EC58}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CBA431A5-23A9-44C4-AFED-E8118995EC58}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CBA431A5-23A9-44C4-AFED-E8118995EC58}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CBA431A5-23A9-44C4-AFED-E8118995EC58}.Release|Any CPU.Build.0 = Release|Any CPU - {0E662856-D8A8-4480-A203-CACBCCEB2331}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0E662856-D8A8-4480-A203-CACBCCEB2331}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0E662856-D8A8-4480-A203-CACBCCEB2331}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0E662856-D8A8-4480-A203-CACBCCEB2331}.Release|Any CPU.Build.0 = Release|Any CPU - {2E0B1846-0171-4991-ADB3-381176D87ED9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2E0B1846-0171-4991-ADB3-381176D87ED9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2E0B1846-0171-4991-ADB3-381176D87ED9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2E0B1846-0171-4991-ADB3-381176D87ED9}.Release|Any CPU.Build.0 = Release|Any CPU - {2835623E-A11F-4254-BC4A-BC7CEB91FB76}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2835623E-A11F-4254-BC4A-BC7CEB91FB76}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2835623E-A11F-4254-BC4A-BC7CEB91FB76}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2835623E-A11F-4254-BC4A-BC7CEB91FB76}.Release|Any CPU.Build.0 = Release|Any CPU - {5572E403-E6A2-4D1A-8CE6-A6B008DF27A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5572E403-E6A2-4D1A-8CE6-A6B008DF27A2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5572E403-E6A2-4D1A-8CE6-A6B008DF27A2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5572E403-E6A2-4D1A-8CE6-A6B008DF27A2}.Release|Any CPU.Build.0 = Release|Any CPU - {A517C5EB-E743-442F-A200-B7777D54CF6D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A517C5EB-E743-442F-A200-B7777D54CF6D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A517C5EB-E743-442F-A200-B7777D54CF6D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A517C5EB-E743-442F-A200-B7777D54CF6D}.Release|Any CPU.Build.0 = Release|Any CPU - {93CD6063-D667-44FA-A263-FA9A0C7391F0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {93CD6063-D667-44FA-A263-FA9A0C7391F0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {93CD6063-D667-44FA-A263-FA9A0C7391F0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {93CD6063-D667-44FA-A263-FA9A0C7391F0}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -220,37 +136,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {620E4155-9C71-44E2-9ACB-8E903A5675C6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {36B4F1EF-C4AA-46B4-BC7D-00C8B2F209C7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {060ADE29-6608-4D76-B460-FAE4AAC7EAD8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {65489DC6-03D1-449B-8DDD-C666AA12C15A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {C00AC9F9-EF66-4C89-8814-31A9409A1679} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {0C0E34B7-BCE4-4C44-BFFD-93A13253C214} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {ECA1C474-76B7-4C90-B29B-31A88A89E69B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {9B3AFBE0-C323-4611-B26D-27A6DAFAB9D8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {CBA431A5-23A9-44C4-AFED-E8118995EC58} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0E662856-D8A8-4480-A203-CACBCCEB2331} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {2E0B1846-0171-4991-ADB3-381176D87ED9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {2835623E-A11F-4254-BC4A-BC7CEB91FB76} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {5572E403-E6A2-4D1A-8CE6-A6B008DF27A2} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A517C5EB-E743-442F-A200-B7777D54CF6D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {93CD6063-D667-44FA-A263-FA9A0C7391F0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {0C0E34B7-BCE4-4C44-BFFD-93A13253C214} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {ECA1C474-76B7-4C90-B29B-31A88A89E69B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {9B3AFBE0-C323-4611-B26D-27A6DAFAB9D8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {CBA431A5-23A9-44C4-AFED-E8118995EC58} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0E662856-D8A8-4480-A203-CACBCCEB2331} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {2E0B1846-0171-4991-ADB3-381176D87ED9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {2835623E-A11F-4254-BC4A-BC7CEB91FB76} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {5572E403-E6A2-4D1A-8CE6-A6B008DF27A2} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A517C5EB-E743-442F-A200-B7777D54CF6D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {93CD6063-D667-44FA-A263-FA9A0C7391F0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {D0E2C4B2-E87B-4BBB-9B6C-45DFB3DB823C} diff --git a/sdk/src/Services/DatabaseMigrationService/Generated/AmazonDatabaseMigrationServiceConfig.cs b/sdk/src/Services/DatabaseMigrationService/Generated/AmazonDatabaseMigrationServiceConfig.cs index 0941d87fd4d0..b4339639a5b9 100644 --- a/sdk/src/Services/DatabaseMigrationService/Generated/AmazonDatabaseMigrationServiceConfig.cs +++ b/sdk/src/Services/DatabaseMigrationService/Generated/AmazonDatabaseMigrationServiceConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.DatabaseMigrationService public partial class AmazonDatabaseMigrationServiceConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("Database Migration Service", "4.0.0.0"); private static readonly AmazonDatabaseMigrationServiceEndpointResolver EndpointResolver = new AmazonDatabaseMigrationServiceEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("Database Migration Service", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("Database Migration Service", "3.7.402.17"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/DatabaseMigrationService/Generated/Model/CreateDataMigrationRequest.cs b/sdk/src/Services/DatabaseMigrationService/Generated/Model/CreateDataMigrationRequest.cs index 40d6b23d6889..2d8d77276fb3 100644 --- a/sdk/src/Services/DatabaseMigrationService/Generated/Model/CreateDataMigrationRequest.cs +++ b/sdk/src/Services/DatabaseMigrationService/Generated/Model/CreateDataMigrationRequest.cs @@ -104,9 +104,9 @@ internal bool IsSetDataMigrationType() /// Specifies whether to enable CloudWatch logs for the data migration. /// /// - public bool EnableCloudwatchLogs + public bool? EnableCloudwatchLogs { - get { return this._enableCloudwatchLogs.GetValueOrDefault(); } + get { return this._enableCloudwatchLogs; } set { this._enableCloudwatchLogs = value; } } @@ -142,9 +142,9 @@ internal bool IsSetMigrationProjectIdentifier() /// the source, and then load them to the target. /// /// - public int NumberOfJobs + public int? NumberOfJobs { - get { return this._numberOfJobs.GetValueOrDefault(); } + get { return this._numberOfJobs; } set { this._numberOfJobs = value; } } diff --git a/sdk/src/Services/DatabaseMigrationService/Generated/Model/DataMigration.cs b/sdk/src/Services/DatabaseMigrationService/Generated/Model/DataMigration.cs index 2ddec33f94e9..5e7673240bc6 100644 --- a/sdk/src/Services/DatabaseMigrationService/Generated/Model/DataMigration.cs +++ b/sdk/src/Services/DatabaseMigrationService/Generated/Model/DataMigration.cs @@ -93,9 +93,9 @@ internal bool IsSetDataMigrationCidrBlocks() /// The UTC time when DMS created the data migration. /// /// - public DateTime DataMigrationCreateTime + public DateTime? DataMigrationCreateTime { - get { return this._dataMigrationCreateTime.GetValueOrDefault(); } + get { return this._dataMigrationCreateTime; } set { this._dataMigrationCreateTime = value; } } @@ -111,9 +111,9 @@ internal bool IsSetDataMigrationCreateTime() /// The UTC time when data migration ended. /// /// - public DateTime DataMigrationEndTime + public DateTime? DataMigrationEndTime { - get { return this._dataMigrationEndTime.GetValueOrDefault(); } + get { return this._dataMigrationEndTime; } set { this._dataMigrationEndTime = value; } } @@ -165,9 +165,9 @@ internal bool IsSetDataMigrationSettings() /// The UTC time when DMS started the data migration. /// /// - public DateTime DataMigrationStartTime + public DateTime? DataMigrationStartTime { - get { return this._dataMigrationStartTime.GetValueOrDefault(); } + get { return this._dataMigrationStartTime; } set { this._dataMigrationStartTime = value; } } diff --git a/sdk/src/Services/DatabaseMigrationService/Generated/Model/DataMigrationSettings.cs b/sdk/src/Services/DatabaseMigrationService/Generated/Model/DataMigrationSettings.cs index 82a929849532..dfbda4814be5 100644 --- a/sdk/src/Services/DatabaseMigrationService/Generated/Model/DataMigrationSettings.cs +++ b/sdk/src/Services/DatabaseMigrationService/Generated/Model/DataMigrationSettings.cs @@ -45,9 +45,9 @@ public partial class DataMigrationSettings /// Whether to enable CloudWatch logging for the data migration. /// /// - public bool CloudwatchLogsEnabled + public bool? CloudwatchLogsEnabled { - get { return this._cloudwatchLogsEnabled.GetValueOrDefault(); } + get { return this._cloudwatchLogsEnabled; } set { this._cloudwatchLogsEnabled = value; } } @@ -64,9 +64,9 @@ internal bool IsSetCloudwatchLogsEnabled() /// the source, and then load them to the target. /// /// - public int NumberOfJobs + public int? NumberOfJobs { - get { return this._numberOfJobs.GetValueOrDefault(); } + get { return this._numberOfJobs; } set { this._numberOfJobs = value; } } diff --git a/sdk/src/Services/DatabaseMigrationService/Generated/Model/DataMigrationStatistics.cs b/sdk/src/Services/DatabaseMigrationService/Generated/Model/DataMigrationStatistics.cs index ef621024ade4..2820cdc9632a 100644 --- a/sdk/src/Services/DatabaseMigrationService/Generated/Model/DataMigrationStatistics.cs +++ b/sdk/src/Services/DatabaseMigrationService/Generated/Model/DataMigrationStatistics.cs @@ -51,9 +51,9 @@ public partial class DataMigrationStatistics /// The current latency of the change data capture (CDC) operation. /// /// - public int CDCLatency + public int? CDCLatency { - get { return this._cdcLatency.GetValueOrDefault(); } + get { return this._cdcLatency; } set { this._cdcLatency = value; } } @@ -69,9 +69,9 @@ internal bool IsSetCDCLatency() /// The elapsed duration of the data migration run. /// /// - public long ElapsedTimeMillis + public long? ElapsedTimeMillis { - get { return this._elapsedTimeMillis.GetValueOrDefault(); } + get { return this._elapsedTimeMillis; } set { this._elapsedTimeMillis = value; } } @@ -87,9 +87,9 @@ internal bool IsSetElapsedTimeMillis() /// The data migration's progress in the full-load migration phase. /// /// - public int FullLoadPercentage + public int? FullLoadPercentage { - get { return this._fullLoadPercentage.GetValueOrDefault(); } + get { return this._fullLoadPercentage; } set { this._fullLoadPercentage = value; } } @@ -105,9 +105,9 @@ internal bool IsSetFullLoadPercentage() /// The time when the migration started. /// /// - public DateTime StartTime + public DateTime? StartTime { - get { return this._startTime.GetValueOrDefault(); } + get { return this._startTime; } set { this._startTime = value; } } @@ -123,9 +123,9 @@ internal bool IsSetStartTime() /// The time when the migration stopped or failed. /// /// - public DateTime StopTime + public DateTime? StopTime { - get { return this._stopTime.GetValueOrDefault(); } + get { return this._stopTime; } set { this._stopTime = value; } } @@ -141,9 +141,9 @@ internal bool IsSetStopTime() /// The number of tables that DMS failed to process. /// /// - public int TablesErrored + public int? TablesErrored { - get { return this._tablesErrored.GetValueOrDefault(); } + get { return this._tablesErrored; } set { this._tablesErrored = value; } } @@ -159,9 +159,9 @@ internal bool IsSetTablesErrored() /// The number of tables loaded in the current data migration run. /// /// - public int TablesLoaded + public int? TablesLoaded { - get { return this._tablesLoaded.GetValueOrDefault(); } + get { return this._tablesLoaded; } set { this._tablesLoaded = value; } } @@ -177,9 +177,9 @@ internal bool IsSetTablesLoaded() /// The data migration's table loading progress. /// /// - public int TablesLoading + public int? TablesLoading { - get { return this._tablesLoading.GetValueOrDefault(); } + get { return this._tablesLoading; } set { this._tablesLoading = value; } } @@ -195,9 +195,9 @@ internal bool IsSetTablesLoading() /// The number of tables that are waiting for processing. /// /// - public int TablesQueued + public int? TablesQueued { - get { return this._tablesQueued.GetValueOrDefault(); } + get { return this._tablesQueued; } set { this._tablesQueued = value; } } diff --git a/sdk/src/Services/DatabaseMigrationService/Generated/Model/DescribeDataMigrationsRequest.cs b/sdk/src/Services/DatabaseMigrationService/Generated/Model/DescribeDataMigrationsRequest.cs index 53bfb8cdefae..1fd061085a09 100644 --- a/sdk/src/Services/DatabaseMigrationService/Generated/Model/DescribeDataMigrationsRequest.cs +++ b/sdk/src/Services/DatabaseMigrationService/Generated/Model/DescribeDataMigrationsRequest.cs @@ -88,9 +88,9 @@ internal bool IsSetMarker() /// in the response so that the remaining results can be retrieved. /// /// - public int MaxRecords + public int? MaxRecords { - get { return this._maxRecords.GetValueOrDefault(); } + get { return this._maxRecords; } set { this._maxRecords = value; } } @@ -108,9 +108,9 @@ internal bool IsSetMaxRecords() /// otherwise, choose false (the default). /// /// - public bool WithoutSettings + public bool? WithoutSettings { - get { return this._withoutSettings.GetValueOrDefault(); } + get { return this._withoutSettings; } set { this._withoutSettings = value; } } @@ -128,9 +128,9 @@ internal bool IsSetWithoutSettings() /// otherwise, choose false (the default). /// /// - public bool WithoutStatistics + public bool? WithoutStatistics { - get { return this._withoutStatistics.GetValueOrDefault(); } + get { return this._withoutStatistics; } set { this._withoutStatistics = value; } } diff --git a/sdk/src/Services/DatabaseMigrationService/Generated/Model/FailedDependencyException.cs b/sdk/src/Services/DatabaseMigrationService/Generated/Model/FailedDependencyException.cs index f61c74aa00e6..05b6bea54fdf 100644 --- a/sdk/src/Services/DatabaseMigrationService/Generated/Model/FailedDependencyException.cs +++ b/sdk/src/Services/DatabaseMigrationService/Generated/Model/FailedDependencyException.cs @@ -106,11 +106,6 @@ protected FailedDependencyException(System.Runtime.Serialization.SerializationIn /// The that holds the serialized object data about the exception being thrown. /// The that contains contextual information about the source or destination. /// The parameter is a null reference (Nothing in Visual Basic). -#if BCL35 - [System.Security.Permissions.SecurityPermission( - System.Security.Permissions.SecurityAction.LinkDemand, - Flags = System.Security.Permissions.SecurityPermissionFlag.SerializationFormatter)] -#endif [System.Security.SecurityCritical] // These FxCop rules are giving false-positives for this method [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Security", "CA2123:OverrideLinkDemandsShouldBeIdenticalToBase")] diff --git a/sdk/src/Services/DatabaseMigrationService/Generated/Model/Internal/MarshallTransformations/CreateDataMigrationRequestMarshaller.cs b/sdk/src/Services/DatabaseMigrationService/Generated/Model/Internal/MarshallTransformations/CreateDataMigrationRequestMarshaller.cs index ecf022b94bd6..ea36e8bfb597 100644 --- a/sdk/src/Services/DatabaseMigrationService/Generated/Model/Internal/MarshallTransformations/CreateDataMigrationRequestMarshaller.cs +++ b/sdk/src/Services/DatabaseMigrationService/Generated/Model/Internal/MarshallTransformations/CreateDataMigrationRequestMarshaller.cs @@ -63,89 +63,92 @@ public IRequest Marshall(CreateDataMigrationRequest publicRequest) request.HttpMethod = "POST"; request.ResourcePath = "/"; - using (StringWriter stringWriter = new StringWriter(CultureInfo.InvariantCulture)) + using (MemoryStream memoryStream = new MemoryStream()) { - JsonWriter writer = new JsonWriter(stringWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetDataMigrationName()) + using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) { - context.Writer.WritePropertyName("DataMigrationName"); - context.Writer.Write(publicRequest.DataMigrationName); - } - - if(publicRequest.IsSetDataMigrationType()) - { - context.Writer.WritePropertyName("DataMigrationType"); - context.Writer.Write(publicRequest.DataMigrationType); - } - - if(publicRequest.IsSetEnableCloudwatchLogs()) - { - context.Writer.WritePropertyName("EnableCloudwatchLogs"); - context.Writer.Write(publicRequest.EnableCloudwatchLogs); - } - - if(publicRequest.IsSetMigrationProjectIdentifier()) - { - context.Writer.WritePropertyName("MigrationProjectIdentifier"); - context.Writer.Write(publicRequest.MigrationProjectIdentifier); - } - - if(publicRequest.IsSetNumberOfJobs()) - { - context.Writer.WritePropertyName("NumberOfJobs"); - context.Writer.Write(publicRequest.NumberOfJobs); - } + JsonWriter writer = new JsonWriter(streamWriter); + writer.Validate = false; + writer.WriteObjectStart(); + var context = new JsonMarshallerContext(request, writer); + if(publicRequest.IsSetDataMigrationName()) + { + context.Writer.WritePropertyName("DataMigrationName"); + context.Writer.Write(publicRequest.DataMigrationName); + } - if(publicRequest.IsSetSelectionRules()) - { - context.Writer.WritePropertyName("SelectionRules"); - context.Writer.Write(publicRequest.SelectionRules); - } + if(publicRequest.IsSetDataMigrationType()) + { + context.Writer.WritePropertyName("DataMigrationType"); + context.Writer.Write(publicRequest.DataMigrationType); + } - if(publicRequest.IsSetServiceAccessRoleArn()) - { - context.Writer.WritePropertyName("ServiceAccessRoleArn"); - context.Writer.Write(publicRequest.ServiceAccessRoleArn); - } + if(publicRequest.IsSetEnableCloudwatchLogs()) + { + context.Writer.WritePropertyName("EnableCloudwatchLogs"); + context.Writer.Write(publicRequest.EnableCloudwatchLogs.Value); + } - if(publicRequest.IsSetSourceDataSettings()) - { - context.Writer.WritePropertyName("SourceDataSettings"); - context.Writer.WriteArrayStart(); - foreach(var publicRequestSourceDataSettingsListValue in publicRequest.SourceDataSettings) + if(publicRequest.IsSetMigrationProjectIdentifier()) { - context.Writer.WriteObjectStart(); + context.Writer.WritePropertyName("MigrationProjectIdentifier"); + context.Writer.Write(publicRequest.MigrationProjectIdentifier); + } - var marshaller = SourceDataSettingMarshaller.Instance; - marshaller.Marshall(publicRequestSourceDataSettingsListValue, context); + if(publicRequest.IsSetNumberOfJobs()) + { + context.Writer.WritePropertyName("NumberOfJobs"); + context.Writer.Write(publicRequest.NumberOfJobs.Value); + } - context.Writer.WriteObjectEnd(); + if(publicRequest.IsSetSelectionRules()) + { + context.Writer.WritePropertyName("SelectionRules"); + context.Writer.Write(publicRequest.SelectionRules); } - context.Writer.WriteArrayEnd(); - } - if(publicRequest.IsSetTags()) - { - context.Writer.WritePropertyName("Tags"); - context.Writer.WriteArrayStart(); - foreach(var publicRequestTagsListValue in publicRequest.Tags) + if(publicRequest.IsSetServiceAccessRoleArn()) { - context.Writer.WriteObjectStart(); + context.Writer.WritePropertyName("ServiceAccessRoleArn"); + context.Writer.Write(publicRequest.ServiceAccessRoleArn); + } - var marshaller = TagMarshaller.Instance; - marshaller.Marshall(publicRequestTagsListValue, context); + if(publicRequest.IsSetSourceDataSettings()) + { + context.Writer.WritePropertyName("SourceDataSettings"); + context.Writer.WriteArrayStart(); + foreach(var publicRequestSourceDataSettingsListValue in publicRequest.SourceDataSettings) + { + context.Writer.WriteObjectStart(); + + var marshaller = SourceDataSettingMarshaller.Instance; + marshaller.Marshall(publicRequestSourceDataSettingsListValue, context); + + context.Writer.WriteObjectEnd(); + } + context.Writer.WriteArrayEnd(); + } - context.Writer.WriteObjectEnd(); + if(publicRequest.IsSetTags()) + { + context.Writer.WritePropertyName("Tags"); + context.Writer.WriteArrayStart(); + foreach(var publicRequestTagsListValue in publicRequest.Tags) + { + context.Writer.WriteObjectStart(); + + var marshaller = TagMarshaller.Instance; + marshaller.Marshall(publicRequestTagsListValue, context); + + context.Writer.WriteObjectEnd(); + } + context.Writer.WriteArrayEnd(); } - context.Writer.WriteArrayEnd(); + + writer.WriteObjectEnd(); } - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); + request.Content = memoryStream.ToArray(); } diff --git a/sdk/src/Services/DatabaseMigrationService/Generated/Model/Internal/MarshallTransformations/DataMigrationSettingsUnmarshaller.cs b/sdk/src/Services/DatabaseMigrationService/Generated/Model/Internal/MarshallTransformations/DataMigrationSettingsUnmarshaller.cs index f097d409c8d9..111bda8662ef 100644 --- a/sdk/src/Services/DatabaseMigrationService/Generated/Model/Internal/MarshallTransformations/DataMigrationSettingsUnmarshaller.cs +++ b/sdk/src/Services/DatabaseMigrationService/Generated/Model/Internal/MarshallTransformations/DataMigrationSettingsUnmarshaller.cs @@ -68,13 +68,13 @@ public DataMigrationSettings Unmarshall(JsonUnmarshallerContext context) { if (context.TestExpression("CloudwatchLogsEnabled", targetDepth)) { - var unmarshaller = BoolUnmarshaller.Instance; + var unmarshaller = NullableBoolUnmarshaller.Instance; unmarshalledObject.CloudwatchLogsEnabled = unmarshaller.Unmarshall(context); continue; } if (context.TestExpression("NumberOfJobs", targetDepth)) { - var unmarshaller = IntUnmarshaller.Instance; + var unmarshaller = NullableIntUnmarshaller.Instance; unmarshalledObject.NumberOfJobs = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/DatabaseMigrationService/Generated/Model/Internal/MarshallTransformations/DataMigrationStatisticsUnmarshaller.cs b/sdk/src/Services/DatabaseMigrationService/Generated/Model/Internal/MarshallTransformations/DataMigrationStatisticsUnmarshaller.cs index 9281d25edd63..7ec4117f5c00 100644 --- a/sdk/src/Services/DatabaseMigrationService/Generated/Model/Internal/MarshallTransformations/DataMigrationStatisticsUnmarshaller.cs +++ b/sdk/src/Services/DatabaseMigrationService/Generated/Model/Internal/MarshallTransformations/DataMigrationStatisticsUnmarshaller.cs @@ -68,55 +68,55 @@ public DataMigrationStatistics Unmarshall(JsonUnmarshallerContext context) { if (context.TestExpression("CDCLatency", targetDepth)) { - var unmarshaller = IntUnmarshaller.Instance; + var unmarshaller = NullableIntUnmarshaller.Instance; unmarshalledObject.CDCLatency = unmarshaller.Unmarshall(context); continue; } if (context.TestExpression("ElapsedTimeMillis", targetDepth)) { - var unmarshaller = LongUnmarshaller.Instance; + var unmarshaller = NullableLongUnmarshaller.Instance; unmarshalledObject.ElapsedTimeMillis = unmarshaller.Unmarshall(context); continue; } if (context.TestExpression("FullLoadPercentage", targetDepth)) { - var unmarshaller = IntUnmarshaller.Instance; + var unmarshaller = NullableIntUnmarshaller.Instance; unmarshalledObject.FullLoadPercentage = unmarshaller.Unmarshall(context); continue; } if (context.TestExpression("StartTime", targetDepth)) { - var unmarshaller = DateTimeUnmarshaller.Instance; + var unmarshaller = NullableDateTimeUnmarshaller.Instance; unmarshalledObject.StartTime = unmarshaller.Unmarshall(context); continue; } if (context.TestExpression("StopTime", targetDepth)) { - var unmarshaller = DateTimeUnmarshaller.Instance; + var unmarshaller = NullableDateTimeUnmarshaller.Instance; unmarshalledObject.StopTime = unmarshaller.Unmarshall(context); continue; } if (context.TestExpression("TablesErrored", targetDepth)) { - var unmarshaller = IntUnmarshaller.Instance; + var unmarshaller = NullableIntUnmarshaller.Instance; unmarshalledObject.TablesErrored = unmarshaller.Unmarshall(context); continue; } if (context.TestExpression("TablesLoaded", targetDepth)) { - var unmarshaller = IntUnmarshaller.Instance; + var unmarshaller = NullableIntUnmarshaller.Instance; unmarshalledObject.TablesLoaded = unmarshaller.Unmarshall(context); continue; } if (context.TestExpression("TablesLoading", targetDepth)) { - var unmarshaller = IntUnmarshaller.Instance; + var unmarshaller = NullableIntUnmarshaller.Instance; unmarshalledObject.TablesLoading = unmarshaller.Unmarshall(context); continue; } if (context.TestExpression("TablesQueued", targetDepth)) { - var unmarshaller = IntUnmarshaller.Instance; + var unmarshaller = NullableIntUnmarshaller.Instance; unmarshalledObject.TablesQueued = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/DatabaseMigrationService/Generated/Model/Internal/MarshallTransformations/DataMigrationUnmarshaller.cs b/sdk/src/Services/DatabaseMigrationService/Generated/Model/Internal/MarshallTransformations/DataMigrationUnmarshaller.cs index 9763ccd12da0..65c809fb9561 100644 --- a/sdk/src/Services/DatabaseMigrationService/Generated/Model/Internal/MarshallTransformations/DataMigrationUnmarshaller.cs +++ b/sdk/src/Services/DatabaseMigrationService/Generated/Model/Internal/MarshallTransformations/DataMigrationUnmarshaller.cs @@ -80,13 +80,13 @@ public DataMigration Unmarshall(JsonUnmarshallerContext context) } if (context.TestExpression("DataMigrationCreateTime", targetDepth)) { - var unmarshaller = DateTimeUnmarshaller.Instance; + var unmarshaller = NullableDateTimeUnmarshaller.Instance; unmarshalledObject.DataMigrationCreateTime = unmarshaller.Unmarshall(context); continue; } if (context.TestExpression("DataMigrationEndTime", targetDepth)) { - var unmarshaller = DateTimeUnmarshaller.Instance; + var unmarshaller = NullableDateTimeUnmarshaller.Instance; unmarshalledObject.DataMigrationEndTime = unmarshaller.Unmarshall(context); continue; } @@ -104,7 +104,7 @@ public DataMigration Unmarshall(JsonUnmarshallerContext context) } if (context.TestExpression("DataMigrationStartTime", targetDepth)) { - var unmarshaller = DateTimeUnmarshaller.Instance; + var unmarshaller = NullableDateTimeUnmarshaller.Instance; unmarshalledObject.DataMigrationStartTime = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/DatabaseMigrationService/Generated/Model/Internal/MarshallTransformations/DeleteDataMigrationRequestMarshaller.cs b/sdk/src/Services/DatabaseMigrationService/Generated/Model/Internal/MarshallTransformations/DeleteDataMigrationRequestMarshaller.cs index 0b830414a40d..02b90d5a9fba 100644 --- a/sdk/src/Services/DatabaseMigrationService/Generated/Model/Internal/MarshallTransformations/DeleteDataMigrationRequestMarshaller.cs +++ b/sdk/src/Services/DatabaseMigrationService/Generated/Model/Internal/MarshallTransformations/DeleteDataMigrationRequestMarshaller.cs @@ -63,21 +63,24 @@ public IRequest Marshall(DeleteDataMigrationRequest publicRequest) request.HttpMethod = "POST"; request.ResourcePath = "/"; - using (StringWriter stringWriter = new StringWriter(CultureInfo.InvariantCulture)) + using (MemoryStream memoryStream = new MemoryStream()) { - JsonWriter writer = new JsonWriter(stringWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetDataMigrationIdentifier()) + using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) { - context.Writer.WritePropertyName("DataMigrationIdentifier"); - context.Writer.Write(publicRequest.DataMigrationIdentifier); + JsonWriter writer = new JsonWriter(streamWriter); + writer.Validate = false; + writer.WriteObjectStart(); + var context = new JsonMarshallerContext(request, writer); + if(publicRequest.IsSetDataMigrationIdentifier()) + { + context.Writer.WritePropertyName("DataMigrationIdentifier"); + context.Writer.Write(publicRequest.DataMigrationIdentifier); + } + + writer.WriteObjectEnd(); } - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); + request.Content = memoryStream.ToArray(); } diff --git a/sdk/src/Services/DatabaseMigrationService/Generated/Model/Internal/MarshallTransformations/DescribeDataMigrationsRequestMarshaller.cs b/sdk/src/Services/DatabaseMigrationService/Generated/Model/Internal/MarshallTransformations/DescribeDataMigrationsRequestMarshaller.cs index eaad743ce0b5..735173f586ee 100644 --- a/sdk/src/Services/DatabaseMigrationService/Generated/Model/Internal/MarshallTransformations/DescribeDataMigrationsRequestMarshaller.cs +++ b/sdk/src/Services/DatabaseMigrationService/Generated/Model/Internal/MarshallTransformations/DescribeDataMigrationsRequestMarshaller.cs @@ -63,55 +63,58 @@ public IRequest Marshall(DescribeDataMigrationsRequest publicRequest) request.HttpMethod = "POST"; request.ResourcePath = "/"; - using (StringWriter stringWriter = new StringWriter(CultureInfo.InvariantCulture)) + using (MemoryStream memoryStream = new MemoryStream()) { - JsonWriter writer = new JsonWriter(stringWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetFilters()) + using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) { - context.Writer.WritePropertyName("Filters"); - context.Writer.WriteArrayStart(); - foreach(var publicRequestFiltersListValue in publicRequest.Filters) + JsonWriter writer = new JsonWriter(streamWriter); + writer.Validate = false; + writer.WriteObjectStart(); + var context = new JsonMarshallerContext(request, writer); + if(publicRequest.IsSetFilters()) { - context.Writer.WriteObjectStart(); - - var marshaller = FilterMarshaller.Instance; - marshaller.Marshall(publicRequestFiltersListValue, context); + context.Writer.WritePropertyName("Filters"); + context.Writer.WriteArrayStart(); + foreach(var publicRequestFiltersListValue in publicRequest.Filters) + { + context.Writer.WriteObjectStart(); + + var marshaller = FilterMarshaller.Instance; + marshaller.Marshall(publicRequestFiltersListValue, context); + + context.Writer.WriteObjectEnd(); + } + context.Writer.WriteArrayEnd(); + } - context.Writer.WriteObjectEnd(); + if(publicRequest.IsSetMarker()) + { + context.Writer.WritePropertyName("Marker"); + context.Writer.Write(publicRequest.Marker); } - context.Writer.WriteArrayEnd(); - } - if(publicRequest.IsSetMarker()) - { - context.Writer.WritePropertyName("Marker"); - context.Writer.Write(publicRequest.Marker); - } + if(publicRequest.IsSetMaxRecords()) + { + context.Writer.WritePropertyName("MaxRecords"); + context.Writer.Write(publicRequest.MaxRecords.Value); + } - if(publicRequest.IsSetMaxRecords()) - { - context.Writer.WritePropertyName("MaxRecords"); - context.Writer.Write(publicRequest.MaxRecords); - } + if(publicRequest.IsSetWithoutSettings()) + { + context.Writer.WritePropertyName("WithoutSettings"); + context.Writer.Write(publicRequest.WithoutSettings.Value); + } - if(publicRequest.IsSetWithoutSettings()) - { - context.Writer.WritePropertyName("WithoutSettings"); - context.Writer.Write(publicRequest.WithoutSettings); - } + if(publicRequest.IsSetWithoutStatistics()) + { + context.Writer.WritePropertyName("WithoutStatistics"); + context.Writer.Write(publicRequest.WithoutStatistics.Value); + } - if(publicRequest.IsSetWithoutStatistics()) - { - context.Writer.WritePropertyName("WithoutStatistics"); - context.Writer.Write(publicRequest.WithoutStatistics); + writer.WriteObjectEnd(); } - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); + request.Content = memoryStream.ToArray(); } diff --git a/sdk/src/Services/DatabaseMigrationService/Generated/Model/Internal/MarshallTransformations/ModifyDataMigrationRequestMarshaller.cs b/sdk/src/Services/DatabaseMigrationService/Generated/Model/Internal/MarshallTransformations/ModifyDataMigrationRequestMarshaller.cs index dfa85d8d307c..3dd2dff4b61e 100644 --- a/sdk/src/Services/DatabaseMigrationService/Generated/Model/Internal/MarshallTransformations/ModifyDataMigrationRequestMarshaller.cs +++ b/sdk/src/Services/DatabaseMigrationService/Generated/Model/Internal/MarshallTransformations/ModifyDataMigrationRequestMarshaller.cs @@ -63,73 +63,76 @@ public IRequest Marshall(ModifyDataMigrationRequest publicRequest) request.HttpMethod = "POST"; request.ResourcePath = "/"; - using (StringWriter stringWriter = new StringWriter(CultureInfo.InvariantCulture)) + using (MemoryStream memoryStream = new MemoryStream()) { - JsonWriter writer = new JsonWriter(stringWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetDataMigrationIdentifier()) + using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) { - context.Writer.WritePropertyName("DataMigrationIdentifier"); - context.Writer.Write(publicRequest.DataMigrationIdentifier); - } - - if(publicRequest.IsSetDataMigrationName()) - { - context.Writer.WritePropertyName("DataMigrationName"); - context.Writer.Write(publicRequest.DataMigrationName); - } - - if(publicRequest.IsSetDataMigrationType()) - { - context.Writer.WritePropertyName("DataMigrationType"); - context.Writer.Write(publicRequest.DataMigrationType); - } + JsonWriter writer = new JsonWriter(streamWriter); + writer.Validate = false; + writer.WriteObjectStart(); + var context = new JsonMarshallerContext(request, writer); + if(publicRequest.IsSetDataMigrationIdentifier()) + { + context.Writer.WritePropertyName("DataMigrationIdentifier"); + context.Writer.Write(publicRequest.DataMigrationIdentifier); + } - if(publicRequest.IsSetEnableCloudwatchLogs()) - { - context.Writer.WritePropertyName("EnableCloudwatchLogs"); - context.Writer.Write(publicRequest.EnableCloudwatchLogs); - } + if(publicRequest.IsSetDataMigrationName()) + { + context.Writer.WritePropertyName("DataMigrationName"); + context.Writer.Write(publicRequest.DataMigrationName); + } - if(publicRequest.IsSetNumberOfJobs()) - { - context.Writer.WritePropertyName("NumberOfJobs"); - context.Writer.Write(publicRequest.NumberOfJobs); - } + if(publicRequest.IsSetDataMigrationType()) + { + context.Writer.WritePropertyName("DataMigrationType"); + context.Writer.Write(publicRequest.DataMigrationType); + } - if(publicRequest.IsSetSelectionRules()) - { - context.Writer.WritePropertyName("SelectionRules"); - context.Writer.Write(publicRequest.SelectionRules); - } + if(publicRequest.IsSetEnableCloudwatchLogs()) + { + context.Writer.WritePropertyName("EnableCloudwatchLogs"); + context.Writer.Write(publicRequest.EnableCloudwatchLogs.Value); + } - if(publicRequest.IsSetServiceAccessRoleArn()) - { - context.Writer.WritePropertyName("ServiceAccessRoleArn"); - context.Writer.Write(publicRequest.ServiceAccessRoleArn); - } + if(publicRequest.IsSetNumberOfJobs()) + { + context.Writer.WritePropertyName("NumberOfJobs"); + context.Writer.Write(publicRequest.NumberOfJobs.Value); + } - if(publicRequest.IsSetSourceDataSettings()) - { - context.Writer.WritePropertyName("SourceDataSettings"); - context.Writer.WriteArrayStart(); - foreach(var publicRequestSourceDataSettingsListValue in publicRequest.SourceDataSettings) + if(publicRequest.IsSetSelectionRules()) { - context.Writer.WriteObjectStart(); + context.Writer.WritePropertyName("SelectionRules"); + context.Writer.Write(publicRequest.SelectionRules); + } - var marshaller = SourceDataSettingMarshaller.Instance; - marshaller.Marshall(publicRequestSourceDataSettingsListValue, context); + if(publicRequest.IsSetServiceAccessRoleArn()) + { + context.Writer.WritePropertyName("ServiceAccessRoleArn"); + context.Writer.Write(publicRequest.ServiceAccessRoleArn); + } - context.Writer.WriteObjectEnd(); + if(publicRequest.IsSetSourceDataSettings()) + { + context.Writer.WritePropertyName("SourceDataSettings"); + context.Writer.WriteArrayStart(); + foreach(var publicRequestSourceDataSettingsListValue in publicRequest.SourceDataSettings) + { + context.Writer.WriteObjectStart(); + + var marshaller = SourceDataSettingMarshaller.Instance; + marshaller.Marshall(publicRequestSourceDataSettingsListValue, context); + + context.Writer.WriteObjectEnd(); + } + context.Writer.WriteArrayEnd(); } - context.Writer.WriteArrayEnd(); + + writer.WriteObjectEnd(); } - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); + request.Content = memoryStream.ToArray(); } diff --git a/sdk/src/Services/DatabaseMigrationService/Generated/Model/Internal/MarshallTransformations/ReplicationTaskAssessmentRunResultStatisticUnmarshaller.cs b/sdk/src/Services/DatabaseMigrationService/Generated/Model/Internal/MarshallTransformations/ReplicationTaskAssessmentRunResultStatisticUnmarshaller.cs index 1de94af9c073..2c70d01e1d7a 100644 --- a/sdk/src/Services/DatabaseMigrationService/Generated/Model/Internal/MarshallTransformations/ReplicationTaskAssessmentRunResultStatisticUnmarshaller.cs +++ b/sdk/src/Services/DatabaseMigrationService/Generated/Model/Internal/MarshallTransformations/ReplicationTaskAssessmentRunResultStatisticUnmarshaller.cs @@ -68,31 +68,31 @@ public ReplicationTaskAssessmentRunResultStatistic Unmarshall(JsonUnmarshallerCo { if (context.TestExpression("Cancelled", targetDepth)) { - var unmarshaller = IntUnmarshaller.Instance; + var unmarshaller = NullableIntUnmarshaller.Instance; unmarshalledObject.Cancelled = unmarshaller.Unmarshall(context); continue; } if (context.TestExpression("Error", targetDepth)) { - var unmarshaller = IntUnmarshaller.Instance; + var unmarshaller = NullableIntUnmarshaller.Instance; unmarshalledObject.Error = unmarshaller.Unmarshall(context); continue; } if (context.TestExpression("Failed", targetDepth)) { - var unmarshaller = IntUnmarshaller.Instance; + var unmarshaller = NullableIntUnmarshaller.Instance; unmarshalledObject.Failed = unmarshaller.Unmarshall(context); continue; } if (context.TestExpression("Passed", targetDepth)) { - var unmarshaller = IntUnmarshaller.Instance; + var unmarshaller = NullableIntUnmarshaller.Instance; unmarshalledObject.Passed = unmarshaller.Unmarshall(context); continue; } if (context.TestExpression("Warning", targetDepth)) { - var unmarshaller = IntUnmarshaller.Instance; + var unmarshaller = NullableIntUnmarshaller.Instance; unmarshalledObject.Warning = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/DatabaseMigrationService/Generated/Model/Internal/MarshallTransformations/ReplicationTaskAssessmentRunUnmarshaller.cs b/sdk/src/Services/DatabaseMigrationService/Generated/Model/Internal/MarshallTransformations/ReplicationTaskAssessmentRunUnmarshaller.cs index 86bc25f50d1b..4a3d969ce402 100644 --- a/sdk/src/Services/DatabaseMigrationService/Generated/Model/Internal/MarshallTransformations/ReplicationTaskAssessmentRunUnmarshaller.cs +++ b/sdk/src/Services/DatabaseMigrationService/Generated/Model/Internal/MarshallTransformations/ReplicationTaskAssessmentRunUnmarshaller.cs @@ -80,7 +80,7 @@ public ReplicationTaskAssessmentRun Unmarshall(JsonUnmarshallerContext context) } if (context.TestExpression("IsLatestTaskAssessmentRun", targetDepth)) { - var unmarshaller = BoolUnmarshaller.Instance; + var unmarshaller = NullableBoolUnmarshaller.Instance; unmarshalledObject.IsLatestTaskAssessmentRun = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/DatabaseMigrationService/Generated/Model/Internal/MarshallTransformations/SourceDataSettingUnmarshaller.cs b/sdk/src/Services/DatabaseMigrationService/Generated/Model/Internal/MarshallTransformations/SourceDataSettingUnmarshaller.cs index 362a776463ae..0b1e544d9726 100644 --- a/sdk/src/Services/DatabaseMigrationService/Generated/Model/Internal/MarshallTransformations/SourceDataSettingUnmarshaller.cs +++ b/sdk/src/Services/DatabaseMigrationService/Generated/Model/Internal/MarshallTransformations/SourceDataSettingUnmarshaller.cs @@ -74,13 +74,13 @@ public SourceDataSetting Unmarshall(JsonUnmarshallerContext context) } if (context.TestExpression("CDCStartTime", targetDepth)) { - var unmarshaller = DateTimeUnmarshaller.Instance; + var unmarshaller = NullableDateTimeUnmarshaller.Instance; unmarshalledObject.CDCStartTime = unmarshaller.Unmarshall(context); continue; } if (context.TestExpression("CDCStopTime", targetDepth)) { - var unmarshaller = DateTimeUnmarshaller.Instance; + var unmarshaller = NullableDateTimeUnmarshaller.Instance; unmarshalledObject.CDCStopTime = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/DatabaseMigrationService/Generated/Model/Internal/MarshallTransformations/StartDataMigrationRequestMarshaller.cs b/sdk/src/Services/DatabaseMigrationService/Generated/Model/Internal/MarshallTransformations/StartDataMigrationRequestMarshaller.cs index 36e1219e4e39..9365fafa22b1 100644 --- a/sdk/src/Services/DatabaseMigrationService/Generated/Model/Internal/MarshallTransformations/StartDataMigrationRequestMarshaller.cs +++ b/sdk/src/Services/DatabaseMigrationService/Generated/Model/Internal/MarshallTransformations/StartDataMigrationRequestMarshaller.cs @@ -63,27 +63,30 @@ public IRequest Marshall(StartDataMigrationRequest publicRequest) request.HttpMethod = "POST"; request.ResourcePath = "/"; - using (StringWriter stringWriter = new StringWriter(CultureInfo.InvariantCulture)) + using (MemoryStream memoryStream = new MemoryStream()) { - JsonWriter writer = new JsonWriter(stringWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetDataMigrationIdentifier()) + using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) { - context.Writer.WritePropertyName("DataMigrationIdentifier"); - context.Writer.Write(publicRequest.DataMigrationIdentifier); - } + JsonWriter writer = new JsonWriter(streamWriter); + writer.Validate = false; + writer.WriteObjectStart(); + var context = new JsonMarshallerContext(request, writer); + if(publicRequest.IsSetDataMigrationIdentifier()) + { + context.Writer.WritePropertyName("DataMigrationIdentifier"); + context.Writer.Write(publicRequest.DataMigrationIdentifier); + } - if(publicRequest.IsSetStartType()) - { - context.Writer.WritePropertyName("StartType"); - context.Writer.Write(publicRequest.StartType); + if(publicRequest.IsSetStartType()) + { + context.Writer.WritePropertyName("StartType"); + context.Writer.Write(publicRequest.StartType); + } + + writer.WriteObjectEnd(); } - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); + request.Content = memoryStream.ToArray(); } diff --git a/sdk/src/Services/DatabaseMigrationService/Generated/Model/Internal/MarshallTransformations/StartReplicationTaskAssessmentRunRequestMarshaller.cs b/sdk/src/Services/DatabaseMigrationService/Generated/Model/Internal/MarshallTransformations/StartReplicationTaskAssessmentRunRequestMarshaller.cs index f54def4b4f60..29bbad4924cf 100644 --- a/sdk/src/Services/DatabaseMigrationService/Generated/Model/Internal/MarshallTransformations/StartReplicationTaskAssessmentRunRequestMarshaller.cs +++ b/sdk/src/Services/DatabaseMigrationService/Generated/Model/Internal/MarshallTransformations/StartReplicationTaskAssessmentRunRequestMarshaller.cs @@ -135,36 +135,26 @@ public IRequest Marshall(StartReplicationTaskAssessmentRunRequest publicRequest) context.Writer.Write(publicRequest.ServiceAccessRoleArn); } - writer.WriteObjectEnd(); - } - -<<<<<<< HEAD - request.Content = memoryStream.ToArray(); -||||||| Commit version number update changes - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); -======= - if(publicRequest.IsSetTags()) - { - context.Writer.WritePropertyName("Tags"); - context.Writer.WriteArrayStart(); - foreach(var publicRequestTagsListValue in publicRequest.Tags) + if(publicRequest.IsSetTags()) { - context.Writer.WriteObjectStart(); + context.Writer.WritePropertyName("Tags"); + context.Writer.WriteArrayStart(); + foreach(var publicRequestTagsListValue in publicRequest.Tags) + { + context.Writer.WriteObjectStart(); - var marshaller = TagMarshaller.Instance; - marshaller.Marshall(publicRequestTagsListValue, context); + var marshaller = TagMarshaller.Instance; + marshaller.Marshall(publicRequestTagsListValue, context); - context.Writer.WriteObjectEnd(); + context.Writer.WriteObjectEnd(); + } + context.Writer.WriteArrayEnd(); } - context.Writer.WriteArrayEnd(); + + writer.WriteObjectEnd(); } - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b + request.Content = memoryStream.ToArray(); } diff --git a/sdk/src/Services/DatabaseMigrationService/Generated/Model/Internal/MarshallTransformations/StopDataMigrationRequestMarshaller.cs b/sdk/src/Services/DatabaseMigrationService/Generated/Model/Internal/MarshallTransformations/StopDataMigrationRequestMarshaller.cs index 749224b550f4..a315fbc3aaa7 100644 --- a/sdk/src/Services/DatabaseMigrationService/Generated/Model/Internal/MarshallTransformations/StopDataMigrationRequestMarshaller.cs +++ b/sdk/src/Services/DatabaseMigrationService/Generated/Model/Internal/MarshallTransformations/StopDataMigrationRequestMarshaller.cs @@ -63,21 +63,24 @@ public IRequest Marshall(StopDataMigrationRequest publicRequest) request.HttpMethod = "POST"; request.ResourcePath = "/"; - using (StringWriter stringWriter = new StringWriter(CultureInfo.InvariantCulture)) + using (MemoryStream memoryStream = new MemoryStream()) { - JsonWriter writer = new JsonWriter(stringWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetDataMigrationIdentifier()) + using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) { - context.Writer.WritePropertyName("DataMigrationIdentifier"); - context.Writer.Write(publicRequest.DataMigrationIdentifier); + JsonWriter writer = new JsonWriter(streamWriter); + writer.Validate = false; + writer.WriteObjectStart(); + var context = new JsonMarshallerContext(request, writer); + if(publicRequest.IsSetDataMigrationIdentifier()) + { + context.Writer.WritePropertyName("DataMigrationIdentifier"); + context.Writer.Write(publicRequest.DataMigrationIdentifier); + } + + writer.WriteObjectEnd(); } - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); + request.Content = memoryStream.ToArray(); } diff --git a/sdk/src/Services/DatabaseMigrationService/Generated/Model/ModifyDataMigrationRequest.cs b/sdk/src/Services/DatabaseMigrationService/Generated/Model/ModifyDataMigrationRequest.cs index 3e084e279323..a40faed4944d 100644 --- a/sdk/src/Services/DatabaseMigrationService/Generated/Model/ModifyDataMigrationRequest.cs +++ b/sdk/src/Services/DatabaseMigrationService/Generated/Model/ModifyDataMigrationRequest.cs @@ -105,9 +105,9 @@ internal bool IsSetDataMigrationType() /// Whether to enable Cloudwatch logs for the data migration. /// /// - public bool EnableCloudwatchLogs + public bool? EnableCloudwatchLogs { - get { return this._enableCloudwatchLogs.GetValueOrDefault(); } + get { return this._enableCloudwatchLogs; } set { this._enableCloudwatchLogs = value; } } @@ -124,9 +124,9 @@ internal bool IsSetEnableCloudwatchLogs() /// the source, and then load them to the target. /// /// - public int NumberOfJobs + public int? NumberOfJobs { - get { return this._numberOfJobs.GetValueOrDefault(); } + get { return this._numberOfJobs; } set { this._numberOfJobs = value; } } diff --git a/sdk/src/Services/DatabaseMigrationService/Generated/Model/ReplicationTaskAssessmentRun.cs b/sdk/src/Services/DatabaseMigrationService/Generated/Model/ReplicationTaskAssessmentRun.cs index a5543a4ec12c..aa9bed5eebae 100644 --- a/sdk/src/Services/DatabaseMigrationService/Generated/Model/ReplicationTaskAssessmentRun.cs +++ b/sdk/src/Services/DatabaseMigrationService/Generated/Model/ReplicationTaskAssessmentRun.cs @@ -100,9 +100,9 @@ internal bool IsSetAssessmentRunName() /// The status is either true or false. /// /// - public bool IsLatestTaskAssessmentRun + public bool? IsLatestTaskAssessmentRun { - get { return this._isLatestTaskAssessmentRun.GetValueOrDefault(); } + get { return this._isLatestTaskAssessmentRun; } set { this._isLatestTaskAssessmentRun = value; } } diff --git a/sdk/src/Services/DatabaseMigrationService/Generated/Model/ReplicationTaskAssessmentRunResultStatistic.cs b/sdk/src/Services/DatabaseMigrationService/Generated/Model/ReplicationTaskAssessmentRunResultStatistic.cs index 128431166bb0..e57526a202c2 100644 --- a/sdk/src/Services/DatabaseMigrationService/Generated/Model/ReplicationTaskAssessmentRunResultStatistic.cs +++ b/sdk/src/Services/DatabaseMigrationService/Generated/Model/ReplicationTaskAssessmentRunResultStatistic.cs @@ -47,9 +47,9 @@ public partial class ReplicationTaskAssessmentRunResultStatistic /// /// /// - public int Cancelled + public int? Cancelled { - get { return this._cancelled.GetValueOrDefault(); } + get { return this._cancelled; } set { this._cancelled = value; } } @@ -66,9 +66,9 @@ internal bool IsSetCancelled() /// complete properly. /// /// - public int Error + public int? Error { - get { return this._error.GetValueOrDefault(); } + get { return this._error; } set { this._error = value; } } @@ -85,9 +85,9 @@ internal bool IsSetError() /// assessment run. /// /// - public int Failed + public int? Failed { - get { return this._failed.GetValueOrDefault(); } + get { return this._failed; } set { this._failed = value; } } @@ -104,9 +104,9 @@ internal bool IsSetFailed() /// run. /// /// - public int Passed + public int? Passed { - get { return this._passed.GetValueOrDefault(); } + get { return this._passed; } set { this._passed = value; } } @@ -122,9 +122,9 @@ internal bool IsSetPassed() /// Indicates that the recent completed AssessmentRun triggered a warning. /// /// - public int Warning + public int? Warning { - get { return this._warning.GetValueOrDefault(); } + get { return this._warning; } set { this._warning = value; } } diff --git a/sdk/src/Services/DatabaseMigrationService/Generated/Model/SourceDataSetting.cs b/sdk/src/Services/DatabaseMigrationService/Generated/Model/SourceDataSetting.cs index e8b239c03348..09cfffbdb726 100644 --- a/sdk/src/Services/DatabaseMigrationService/Generated/Model/SourceDataSetting.cs +++ b/sdk/src/Services/DatabaseMigrationService/Generated/Model/SourceDataSetting.cs @@ -63,9 +63,9 @@ internal bool IsSetCDCStartPosition() /// The change data capture (CDC) start time for the source data provider. /// /// - public DateTime CDCStartTime + public DateTime? CDCStartTime { - get { return this._cdcStartTime.GetValueOrDefault(); } + get { return this._cdcStartTime; } set { this._cdcStartTime = value; } } @@ -81,9 +81,9 @@ internal bool IsSetCDCStartTime() /// The change data capture (CDC) stop time for the source data provider. /// /// - public DateTime CDCStopTime + public DateTime? CDCStopTime { - get { return this._cdcStopTime.GetValueOrDefault(); } + get { return this._cdcStopTime; } set { this._cdcStopTime = value; } } diff --git a/sdk/src/Services/DatabaseMigrationService/Generated/Model/_bcl45+netstandard/DescribeDataMigrationsPaginator.cs b/sdk/src/Services/DatabaseMigrationService/Generated/Model/_bcl+netstandard/DescribeDataMigrationsPaginator.cs similarity index 100% rename from sdk/src/Services/DatabaseMigrationService/Generated/Model/_bcl45+netstandard/DescribeDataMigrationsPaginator.cs rename to sdk/src/Services/DatabaseMigrationService/Generated/Model/_bcl+netstandard/DescribeDataMigrationsPaginator.cs diff --git a/sdk/src/Services/DatabaseMigrationService/Generated/Model/_bcl45+netstandard/IDescribeDataMigrationsPaginator.cs b/sdk/src/Services/DatabaseMigrationService/Generated/Model/_bcl+netstandard/IDescribeDataMigrationsPaginator.cs similarity index 100% rename from sdk/src/Services/DatabaseMigrationService/Generated/Model/_bcl45+netstandard/IDescribeDataMigrationsPaginator.cs rename to sdk/src/Services/DatabaseMigrationService/Generated/Model/_bcl+netstandard/IDescribeDataMigrationsPaginator.cs diff --git a/sdk/src/Services/DatabaseMigrationService/Generated/_bcl/AmazonDatabaseMigrationServiceClient.cs b/sdk/src/Services/DatabaseMigrationService/Generated/_bcl/AmazonDatabaseMigrationServiceClient.cs index a10037f57317..661af047875b 100644 --- a/sdk/src/Services/DatabaseMigrationService/Generated/_bcl/AmazonDatabaseMigrationServiceClient.cs +++ b/sdk/src/Services/DatabaseMigrationService/Generated/_bcl/AmazonDatabaseMigrationServiceClient.cs @@ -292,6 +292,9 @@ protected override void Dispose(bool disposing) /// Container for the necessary parameters to execute the AddTagsToResource service method. /// /// The response from the AddTagsToResource service method, as returned by DatabaseMigrationService. + /// + /// The resource is in a state that prevents it from being used for database migration. + /// /// /// The resource could not be found. /// @@ -319,6 +322,9 @@ public virtual AddTagsToResourceResponse AddTagsToResource(AddTagsToResourceRequ /// /// /// The response from the AddTagsToResource service method, as returned by DatabaseMigrationService. + /// + /// The resource is in a state that prevents it from being used for database migration. + /// /// /// The resource could not be found. /// @@ -533,6 +539,77 @@ public virtual CancelReplicationTaskAssessmentRunResponse CancelReplicationTaskA #endregion + #region CreateDataMigration + + + /// + /// Creates a data migration using the provided settings. + /// + /// Container for the necessary parameters to execute the CreateDataMigration service method. + /// + /// The response from the CreateDataMigration service method, as returned by DatabaseMigrationService. + /// + /// A dependency threw an exception. + /// + /// + /// The action or operation requested isn't valid. + /// + /// + /// The resource you are attempting to create already exists. + /// + /// + /// The resource could not be found. + /// + /// + /// The quota for this resource quota has been exceeded. + /// + /// REST API Reference for CreateDataMigration Operation + public virtual CreateDataMigrationResponse CreateDataMigration(CreateDataMigrationRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = CreateDataMigrationRequestMarshaller.Instance; + options.ResponseUnmarshaller = CreateDataMigrationResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// Creates a data migration using the provided settings. + /// + /// Container for the necessary parameters to execute the CreateDataMigration service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the CreateDataMigration service method, as returned by DatabaseMigrationService. + /// + /// A dependency threw an exception. + /// + /// + /// The action or operation requested isn't valid. + /// + /// + /// The resource you are attempting to create already exists. + /// + /// + /// The resource could not be found. + /// + /// + /// The quota for this resource quota has been exceeded. + /// + /// REST API Reference for CreateDataMigration Operation + public virtual Task CreateDataMigrationAsync(CreateDataMigrationRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = CreateDataMigrationRequestMarshaller.Instance; + options.ResponseUnmarshaller = CreateDataMigrationResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + #region CreateDataProvider @@ -546,6 +623,9 @@ public virtual CancelReplicationTaskAssessmentRunResponse CancelReplicationTaskA /// /// DMS was denied access to the endpoint. Check that the role is correctly configured. /// + /// + /// A dependency threw an exception. + /// /// /// The resource you are attempting to create already exists. /// @@ -576,6 +656,9 @@ public virtual CreateDataProviderResponse CreateDataProvider(CreateDataProviderR /// /// DMS was denied access to the endpoint. Check that the role is correctly configured. /// + /// + /// A dependency threw an exception. + /// /// /// The resource you are attempting to create already exists. /// @@ -923,6 +1006,9 @@ public virtual CreateFleetAdvisorCollectorResponse CreateFleetAdvisorCollector(C /// /// DMS was denied access to the endpoint. Check that the role is correctly configured. /// + /// + /// A dependency threw an exception. + /// /// /// The resource is in a state that prevents it from being used for database migration. /// @@ -967,6 +1053,9 @@ public virtual CreateInstanceProfileResponse CreateInstanceProfile(CreateInstanc /// /// DMS was denied access to the endpoint. Check that the role is correctly configured. /// + /// + /// A dependency threw an exception. + /// /// /// The resource is in a state that prevents it from being used for database migration. /// @@ -1019,6 +1108,9 @@ public virtual CreateInstanceProfileResponse CreateInstanceProfile(CreateInstanc /// /// DMS was denied access to the endpoint. Check that the role is correctly configured. /// + /// + /// A dependency threw an exception. + /// /// /// The resource you are attempting to create already exists. /// @@ -1064,6 +1156,9 @@ public virtual CreateMigrationProjectResponse CreateMigrationProject(CreateMigra /// /// DMS was denied access to the endpoint. Check that the role is correctly configured. /// + /// + /// A dependency threw an exception. + /// /// /// The resource you are attempting to create already exists. /// @@ -1623,6 +1718,65 @@ public virtual DeleteConnectionResponse DeleteConnection(DeleteConnectionRequest #endregion + #region DeleteDataMigration + + + /// + /// Deletes the specified data migration. + /// + /// Container for the necessary parameters to execute the DeleteDataMigration service method. + /// + /// The response from the DeleteDataMigration service method, as returned by DatabaseMigrationService. + /// + /// A dependency threw an exception. + /// + /// + /// The resource is in a state that prevents it from being used for database migration. + /// + /// + /// The resource could not be found. + /// + /// REST API Reference for DeleteDataMigration Operation + public virtual DeleteDataMigrationResponse DeleteDataMigration(DeleteDataMigrationRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = DeleteDataMigrationRequestMarshaller.Instance; + options.ResponseUnmarshaller = DeleteDataMigrationResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// Deletes the specified data migration. + /// + /// Container for the necessary parameters to execute the DeleteDataMigration service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the DeleteDataMigration service method, as returned by DatabaseMigrationService. + /// + /// A dependency threw an exception. + /// + /// + /// The resource is in a state that prevents it from being used for database migration. + /// + /// + /// The resource could not be found. + /// + /// REST API Reference for DeleteDataMigration Operation + public virtual Task DeleteDataMigrationAsync(DeleteDataMigrationRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = DeleteDataMigrationRequestMarshaller.Instance; + options.ResponseUnmarshaller = DeleteDataMigrationResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + #region DeleteDataProvider @@ -1642,6 +1796,9 @@ public virtual DeleteConnectionResponse DeleteConnection(DeleteConnectionRequest /// /// DMS was denied access to the endpoint. Check that the role is correctly configured. /// + /// + /// A dependency threw an exception. + /// /// /// The resource is in a state that prevents it from being used for database migration. /// @@ -1678,6 +1835,9 @@ public virtual DeleteDataProviderResponse DeleteDataProvider(DeleteDataProviderR /// /// DMS was denied access to the endpoint. Check that the role is correctly configured. /// + /// + /// A dependency threw an exception. + /// /// /// The resource is in a state that prevents it from being used for database migration. /// @@ -1823,6 +1983,9 @@ public virtual DeleteEventSubscriptionResponse DeleteEventSubscription(DeleteEve /// Container for the necessary parameters to execute the DeleteFleetAdvisorCollector service method. /// /// The response from the DeleteFleetAdvisorCollector service method, as returned by DatabaseMigrationService. + /// + /// DMS was denied access to the endpoint. Check that the role is correctly configured. + /// /// /// The specified collector doesn't exist. /// @@ -1849,6 +2012,9 @@ public virtual DeleteFleetAdvisorCollectorResponse DeleteFleetAdvisorCollector(D /// /// /// The response from the DeleteFleetAdvisorCollector service method, as returned by DatabaseMigrationService. + /// + /// DMS was denied access to the endpoint. Check that the role is correctly configured. + /// /// /// The specified collector doesn't exist. /// @@ -1876,6 +2042,9 @@ public virtual DeleteFleetAdvisorCollectorResponse DeleteFleetAdvisorCollector(D /// Container for the necessary parameters to execute the DeleteFleetAdvisorDatabases service method. /// /// The response from the DeleteFleetAdvisorDatabases service method, as returned by DatabaseMigrationService. + /// + /// DMS was denied access to the endpoint. Check that the role is correctly configured. + /// /// /// The action or operation requested isn't valid. /// @@ -1902,6 +2071,9 @@ public virtual DeleteFleetAdvisorDatabasesResponse DeleteFleetAdvisorDatabases(D /// /// /// The response from the DeleteFleetAdvisorDatabases service method, as returned by DatabaseMigrationService. + /// + /// DMS was denied access to the endpoint. Check that the role is correctly configured. + /// /// /// The action or operation requested isn't valid. /// @@ -1939,6 +2111,9 @@ public virtual DeleteFleetAdvisorDatabasesResponse DeleteFleetAdvisorDatabases(D /// /// DMS was denied access to the endpoint. Check that the role is correctly configured. /// + /// + /// A dependency threw an exception. + /// /// /// The resource is in a state that prevents it from being used for database migration. /// @@ -1975,6 +2150,9 @@ public virtual DeleteInstanceProfileResponse DeleteInstanceProfile(DeleteInstanc /// /// DMS was denied access to the endpoint. Check that the role is correctly configured. /// + /// + /// A dependency threw an exception. + /// /// /// The resource is in a state that prevents it from being used for database migration. /// @@ -2011,6 +2189,9 @@ public virtual DeleteInstanceProfileResponse DeleteInstanceProfile(DeleteInstanc /// /// DMS was denied access to the endpoint. Check that the role is correctly configured. /// + /// + /// A dependency threw an exception. + /// /// /// The resource is in a state that prevents it from being used for database migration. /// @@ -2046,6 +2227,9 @@ public virtual DeleteMigrationProjectResponse DeleteMigrationProject(DeleteMigra /// /// DMS was denied access to the endpoint. Check that the role is correctly configured. /// + /// + /// A dependency threw an exception. + /// /// /// The resource is in a state that prevents it from being used for database migration. /// @@ -2690,6 +2874,65 @@ public virtual DescribeConversionConfigurationResponse DescribeConversionConfigu #endregion + #region DescribeDataMigrations + + + /// + /// Returns information about data migrations. + /// + /// Container for the necessary parameters to execute the DescribeDataMigrations service method. + /// + /// The response from the DescribeDataMigrations service method, as returned by DatabaseMigrationService. + /// + /// A dependency threw an exception. + /// + /// + /// The resource is in a state that prevents it from being used for database migration. + /// + /// + /// The resource could not be found. + /// + /// REST API Reference for DescribeDataMigrations Operation + public virtual DescribeDataMigrationsResponse DescribeDataMigrations(DescribeDataMigrationsRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = DescribeDataMigrationsRequestMarshaller.Instance; + options.ResponseUnmarshaller = DescribeDataMigrationsResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// Returns information about data migrations. + /// + /// Container for the necessary parameters to execute the DescribeDataMigrations service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the DescribeDataMigrations service method, as returned by DatabaseMigrationService. + /// + /// A dependency threw an exception. + /// + /// + /// The resource is in a state that prevents it from being used for database migration. + /// + /// + /// The resource could not be found. + /// + /// REST API Reference for DescribeDataMigrations Operation + public virtual Task DescribeDataMigrationsAsync(DescribeDataMigrationsRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = DescribeDataMigrationsRequestMarshaller.Instance; + options.ResponseUnmarshaller = DescribeDataMigrationsResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + #region DescribeDataProviders @@ -2702,6 +2945,9 @@ public virtual DescribeConversionConfigurationResponse DescribeConversionConfigu /// /// DMS was denied access to the endpoint. Check that the role is correctly configured. /// + /// + /// A dependency threw an exception. + /// /// /// The resource could not be found. /// @@ -2728,6 +2974,9 @@ public virtual DescribeDataProvidersResponse DescribeDataProviders(DescribeDataP /// /// DMS was denied access to the endpoint. Check that the role is correctly configured. /// + /// + /// A dependency threw an exception. + /// /// /// The resource could not be found. /// @@ -3362,6 +3611,9 @@ public virtual DescribeFleetAdvisorSchemasResponse DescribeFleetAdvisorSchemas(D /// /// DMS was denied access to the endpoint. Check that the role is correctly configured. /// + /// + /// A dependency threw an exception. + /// /// /// The resource could not be found. /// @@ -3388,6 +3640,9 @@ public virtual DescribeInstanceProfilesResponse DescribeInstanceProfiles(Describ /// /// DMS was denied access to the endpoint. Check that the role is correctly configured. /// + /// + /// A dependency threw an exception. + /// /// /// The resource could not be found. /// @@ -3652,6 +3907,9 @@ public virtual DescribeMetadataModelImportsResponse DescribeMetadataModelImports /// /// DMS was denied access to the endpoint. Check that the role is correctly configured. /// + /// + /// A dependency threw an exception. + /// /// /// The resource could not be found. /// @@ -3678,6 +3936,9 @@ public virtual DescribeMigrationProjectsResponse DescribeMigrationProjects(Descr /// /// DMS was denied access to the endpoint. Check that the role is correctly configured. /// + /// + /// A dependency threw an exception. + /// /// /// The resource could not be found. /// @@ -4723,6 +4984,9 @@ public virtual ImportCertificateResponse ImportCertificate(ImportCertificateRequ /// Container for the necessary parameters to execute the ListTagsForResource service method. /// /// The response from the ListTagsForResource service method, as returned by DatabaseMigrationService. + /// + /// The resource is in a state that prevents it from being used for database migration. + /// /// /// The resource could not be found. /// @@ -4748,6 +5012,9 @@ public virtual ListTagsForResourceResponse ListTagsForResource(ListTagsForResour /// /// /// The response from the ListTagsForResource service method, as returned by DatabaseMigrationService. + /// + /// The resource is in a state that prevents it from being used for database migration. + /// /// /// The resource could not be found. /// @@ -4816,6 +5083,65 @@ public virtual ModifyConversionConfigurationResponse ModifyConversionConfigurati #endregion + #region ModifyDataMigration + + + /// + /// Modifies an existing DMS data migration. + /// + /// Container for the necessary parameters to execute the ModifyDataMigration service method. + /// + /// The response from the ModifyDataMigration service method, as returned by DatabaseMigrationService. + /// + /// A dependency threw an exception. + /// + /// + /// The resource is in a state that prevents it from being used for database migration. + /// + /// + /// The resource could not be found. + /// + /// REST API Reference for ModifyDataMigration Operation + public virtual ModifyDataMigrationResponse ModifyDataMigration(ModifyDataMigrationRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = ModifyDataMigrationRequestMarshaller.Instance; + options.ResponseUnmarshaller = ModifyDataMigrationResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// Modifies an existing DMS data migration. + /// + /// Container for the necessary parameters to execute the ModifyDataMigration service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the ModifyDataMigration service method, as returned by DatabaseMigrationService. + /// + /// A dependency threw an exception. + /// + /// + /// The resource is in a state that prevents it from being used for database migration. + /// + /// + /// The resource could not be found. + /// + /// REST API Reference for ModifyDataMigration Operation + public virtual Task ModifyDataMigrationAsync(ModifyDataMigrationRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = ModifyDataMigrationRequestMarshaller.Instance; + options.ResponseUnmarshaller = ModifyDataMigrationResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + #region ModifyDataProvider @@ -4835,6 +5161,9 @@ public virtual ModifyConversionConfigurationResponse ModifyConversionConfigurati /// /// DMS was denied access to the endpoint. Check that the role is correctly configured. /// + /// + /// A dependency threw an exception. + /// /// /// The resource is in a state that prevents it from being used for database migration. /// @@ -4871,6 +5200,9 @@ public virtual ModifyDataProviderResponse ModifyDataProvider(ModifyDataProviderR /// /// DMS was denied access to the endpoint. Check that the role is correctly configured. /// + /// + /// A dependency threw an exception. + /// /// /// The resource is in a state that prevents it from being used for database migration. /// @@ -5096,6 +5428,9 @@ public virtual ModifyEventSubscriptionResponse ModifyEventSubscription(ModifyEve /// /// DMS was denied access to the endpoint. Check that the role is correctly configured. /// + /// + /// A dependency threw an exception. + /// /// /// The resource is in a state that prevents it from being used for database migration. /// @@ -5141,6 +5476,9 @@ public virtual ModifyInstanceProfileResponse ModifyInstanceProfile(ModifyInstanc /// /// DMS was denied access to the endpoint. Check that the role is correctly configured. /// + /// + /// A dependency threw an exception. + /// /// /// The resource is in a state that prevents it from being used for database migration. /// @@ -5186,6 +5524,9 @@ public virtual ModifyInstanceProfileResponse ModifyInstanceProfile(ModifyInstanc /// /// DMS was denied access to the endpoint. Check that the role is correctly configured. /// + /// + /// A dependency threw an exception. + /// /// /// The resource is in a state that prevents it from being used for database migration. /// @@ -5227,6 +5568,9 @@ public virtual ModifyMigrationProjectResponse ModifyMigrationProject(ModifyMigra /// /// DMS was denied access to the endpoint. Check that the role is correctly configured. /// + /// + /// A dependency threw an exception. + /// /// /// The resource is in a state that prevents it from being used for database migration. /// @@ -5955,6 +6299,9 @@ public virtual ReloadTablesResponse ReloadTables(ReloadTablesRequest request) /// Container for the necessary parameters to execute the RemoveTagsFromResource service method. /// /// The response from the RemoveTagsFromResource service method, as returned by DatabaseMigrationService. + /// + /// The resource is in a state that prevents it from being used for database migration. + /// /// /// The resource could not be found. /// @@ -5980,6 +6327,9 @@ public virtual RemoveTagsFromResourceResponse RemoveTagsFromResource(RemoveTagsF /// /// /// The response from the RemoveTagsFromResource service method, as returned by DatabaseMigrationService. + /// + /// The resource is in a state that prevents it from being used for database migration. + /// /// /// The resource could not be found. /// @@ -6050,6 +6400,77 @@ public virtual RunFleetAdvisorLsaAnalysisResponse RunFleetAdvisorLsaAnalysis(Run #endregion + #region StartDataMigration + + + /// + /// Starts the specified data migration. + /// + /// Container for the necessary parameters to execute the StartDataMigration service method. + /// + /// The response from the StartDataMigration service method, as returned by DatabaseMigrationService. + /// + /// A dependency threw an exception. + /// + /// + /// The action or operation requested isn't valid. + /// + /// + /// The resource is in a state that prevents it from being used for database migration. + /// + /// + /// The resource could not be found. + /// + /// + /// The quota for this resource quota has been exceeded. + /// + /// REST API Reference for StartDataMigration Operation + public virtual StartDataMigrationResponse StartDataMigration(StartDataMigrationRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = StartDataMigrationRequestMarshaller.Instance; + options.ResponseUnmarshaller = StartDataMigrationResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// Starts the specified data migration. + /// + /// Container for the necessary parameters to execute the StartDataMigration service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the StartDataMigration service method, as returned by DatabaseMigrationService. + /// + /// A dependency threw an exception. + /// + /// + /// The action or operation requested isn't valid. + /// + /// + /// The resource is in a state that prevents it from being used for database migration. + /// + /// + /// The resource could not be found. + /// + /// + /// The quota for this resource quota has been exceeded. + /// + /// REST API Reference for StartDataMigration Operation + public virtual Task StartDataMigrationAsync(StartDataMigrationRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = StartDataMigrationRequestMarshaller.Instance; + options.ResponseUnmarshaller = StartDataMigrationResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + #region StartExtensionPackAssociation @@ -7051,6 +7472,65 @@ public virtual StartReplicationTaskAssessmentRunResponse StartReplicationTaskAss #endregion + #region StopDataMigration + + + /// + /// Stops the specified data migration. + /// + /// Container for the necessary parameters to execute the StopDataMigration service method. + /// + /// The response from the StopDataMigration service method, as returned by DatabaseMigrationService. + /// + /// A dependency threw an exception. + /// + /// + /// The resource is in a state that prevents it from being used for database migration. + /// + /// + /// The resource could not be found. + /// + /// REST API Reference for StopDataMigration Operation + public virtual StopDataMigrationResponse StopDataMigration(StopDataMigrationRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = StopDataMigrationRequestMarshaller.Instance; + options.ResponseUnmarshaller = StopDataMigrationResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// Stops the specified data migration. + /// + /// Container for the necessary parameters to execute the StopDataMigration service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the StopDataMigration service method, as returned by DatabaseMigrationService. + /// + /// A dependency threw an exception. + /// + /// + /// The resource is in a state that prevents it from being used for database migration. + /// + /// + /// The resource could not be found. + /// + /// REST API Reference for StopDataMigration Operation + public virtual Task StopDataMigrationAsync(StopDataMigrationRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = StopDataMigrationRequestMarshaller.Instance; + options.ResponseUnmarshaller = StopDataMigrationResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + #region StopReplication diff --git a/sdk/src/Services/DatabaseMigrationService/Properties/AssemblyInfo.cs b/sdk/src/Services/DatabaseMigrationService/Properties/AssemblyInfo.cs index a7aa720b7f1c..34a3b4d21f65 100644 --- a/sdk/src/Services/DatabaseMigrationService/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/DatabaseMigrationService/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.402.17")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/Deadline/Deadline.sln b/sdk/src/Services/Deadline/Deadline.sln index 8e171a8f4c7b..bd420dabf0dc 100644 --- a/sdk/src/Services/Deadline/Deadline.sln +++ b/sdk/src/Services/Deadline/Deadline.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {353E7417-0D65-4936-9933-22F91B746489}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {353E7417-0D65-4936-9933-22F91B746489}.Debug|Any CPU.Build.0 = Debug|Any CPU {353E7417-0D65-4936-9933-22F91B746489}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {66FCBAAA-C884-4A4A-9925-9B186A4271B7}.Debug|Any CPU.Build.0 = Debug|Any CPU {66FCBAAA-C884-4A4A-9925-9B186A4271B7}.Release|Any CPU.ActiveCfg = Release|Any CPU {66FCBAAA-C884-4A4A-9925-9B186A4271B7}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {7F5EF463-733B-4428-A521-5ABF5D77F3B6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7F5EF463-733B-4428-A521-5ABF5D77F3B6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7F5EF463-733B-4428-A521-5ABF5D77F3B6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7F5EF463-733B-4428-A521-5ABF5D77F3B6}.Release|Any CPU.Build.0 = Release|Any CPU - {4D8A6084-4B5E-4962-81F5-716F168C47A1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4D8A6084-4B5E-4962-81F5-716F168C47A1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4D8A6084-4B5E-4962-81F5-716F168C47A1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4D8A6084-4B5E-4962-81F5-716F168C47A1}.Release|Any CPU.Build.0 = Release|Any CPU - {7CFF9F78-C831-40CB-B796-AB3D9567B573}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7CFF9F78-C831-40CB-B796-AB3D9567B573}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7CFF9F78-C831-40CB-B796-AB3D9567B573}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7CFF9F78-C831-40CB-B796-AB3D9567B573}.Release|Any CPU.Build.0 = Release|Any CPU - {DD22DBDE-CAB2-4DE6-8EE7-8A2F4231A848}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DD22DBDE-CAB2-4DE6-8EE7-8A2F4231A848}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DD22DBDE-CAB2-4DE6-8EE7-8A2F4231A848}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DD22DBDE-CAB2-4DE6-8EE7-8A2F4231A848}.Release|Any CPU.Build.0 = Release|Any CPU - {BD4CB8CE-C938-4A5F-91CA-E43F0F194C54}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BD4CB8CE-C938-4A5F-91CA-E43F0F194C54}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BD4CB8CE-C938-4A5F-91CA-E43F0F194C54}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BD4CB8CE-C938-4A5F-91CA-E43F0F194C54}.Release|Any CPU.Build.0 = Release|Any CPU - {4E785ECF-7086-4242-9223-4174483102C8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4E785ECF-7086-4242-9223-4174483102C8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4E785ECF-7086-4242-9223-4174483102C8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4E785ECF-7086-4242-9223-4174483102C8}.Release|Any CPU.Build.0 = Release|Any CPU - {6E2D7197-18B8-48FD-99C0-C3B71B048B48}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6E2D7197-18B8-48FD-99C0-C3B71B048B48}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6E2D7197-18B8-48FD-99C0-C3B71B048B48}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6E2D7197-18B8-48FD-99C0-C3B71B048B48}.Release|Any CPU.Build.0 = Release|Any CPU - {5B22494A-499D-4DB7-9BBE-616EB3AC29D9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5B22494A-499D-4DB7-9BBE-616EB3AC29D9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5B22494A-499D-4DB7-9BBE-616EB3AC29D9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5B22494A-499D-4DB7-9BBE-616EB3AC29D9}.Release|Any CPU.Build.0 = Release|Any CPU - {40F57765-9081-4821-AA74-67992A3A35C0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {40F57765-9081-4821-AA74-67992A3A35C0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {40F57765-9081-4821-AA74-67992A3A35C0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {40F57765-9081-4821-AA74-67992A3A35C0}.Release|Any CPU.Build.0 = Release|Any CPU - {ECA44148-37D7-4C6B-A363-FE6FFB93DEAB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {ECA44148-37D7-4C6B-A363-FE6FFB93DEAB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {ECA44148-37D7-4C6B-A363-FE6FFB93DEAB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {ECA44148-37D7-4C6B-A363-FE6FFB93DEAB}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {7F5EF463-733B-4428-A521-5ABF5D77F3B6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7F5EF463-733B-4428-A521-5ABF5D77F3B6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7F5EF463-733B-4428-A521-5ABF5D77F3B6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7F5EF463-733B-4428-A521-5ABF5D77F3B6}.Release|Any CPU.Build.0 = Release|Any CPU - {4D8A6084-4B5E-4962-81F5-716F168C47A1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4D8A6084-4B5E-4962-81F5-716F168C47A1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4D8A6084-4B5E-4962-81F5-716F168C47A1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4D8A6084-4B5E-4962-81F5-716F168C47A1}.Release|Any CPU.Build.0 = Release|Any CPU - {7CFF9F78-C831-40CB-B796-AB3D9567B573}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7CFF9F78-C831-40CB-B796-AB3D9567B573}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7CFF9F78-C831-40CB-B796-AB3D9567B573}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7CFF9F78-C831-40CB-B796-AB3D9567B573}.Release|Any CPU.Build.0 = Release|Any CPU - {DD22DBDE-CAB2-4DE6-8EE7-8A2F4231A848}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DD22DBDE-CAB2-4DE6-8EE7-8A2F4231A848}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DD22DBDE-CAB2-4DE6-8EE7-8A2F4231A848}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DD22DBDE-CAB2-4DE6-8EE7-8A2F4231A848}.Release|Any CPU.Build.0 = Release|Any CPU - {BD4CB8CE-C938-4A5F-91CA-E43F0F194C54}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BD4CB8CE-C938-4A5F-91CA-E43F0F194C54}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BD4CB8CE-C938-4A5F-91CA-E43F0F194C54}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BD4CB8CE-C938-4A5F-91CA-E43F0F194C54}.Release|Any CPU.Build.0 = Release|Any CPU - {4E785ECF-7086-4242-9223-4174483102C8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4E785ECF-7086-4242-9223-4174483102C8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4E785ECF-7086-4242-9223-4174483102C8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4E785ECF-7086-4242-9223-4174483102C8}.Release|Any CPU.Build.0 = Release|Any CPU - {6E2D7197-18B8-48FD-99C0-C3B71B048B48}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6E2D7197-18B8-48FD-99C0-C3B71B048B48}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6E2D7197-18B8-48FD-99C0-C3B71B048B48}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6E2D7197-18B8-48FD-99C0-C3B71B048B48}.Release|Any CPU.Build.0 = Release|Any CPU - {5B22494A-499D-4DB7-9BBE-616EB3AC29D9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5B22494A-499D-4DB7-9BBE-616EB3AC29D9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5B22494A-499D-4DB7-9BBE-616EB3AC29D9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5B22494A-499D-4DB7-9BBE-616EB3AC29D9}.Release|Any CPU.Build.0 = Release|Any CPU - {40F57765-9081-4821-AA74-67992A3A35C0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {40F57765-9081-4821-AA74-67992A3A35C0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {40F57765-9081-4821-AA74-67992A3A35C0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {40F57765-9081-4821-AA74-67992A3A35C0}.Release|Any CPU.Build.0 = Release|Any CPU - {ECA44148-37D7-4C6B-A363-FE6FFB93DEAB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {ECA44148-37D7-4C6B-A363-FE6FFB93DEAB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {ECA44148-37D7-4C6B-A363-FE6FFB93DEAB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {ECA44148-37D7-4C6B-A363-FE6FFB93DEAB}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {353E7417-0D65-4936-9933-22F91B746489} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {4DB9A259-2194-4258-B0CB-D84BAE5C7518} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {451B1C19-2CB8-4CAC-A6B3-19067D503FB1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {93327EC6-CA74-44C9-AA0D-1AA688F506C5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {66FCBAAA-C884-4A4A-9925-9B186A4271B7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {7F5EF463-733B-4428-A521-5ABF5D77F3B6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4D8A6084-4B5E-4962-81F5-716F168C47A1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {7CFF9F78-C831-40CB-B796-AB3D9567B573} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {DD22DBDE-CAB2-4DE6-8EE7-8A2F4231A848} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {BD4CB8CE-C938-4A5F-91CA-E43F0F194C54} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4E785ECF-7086-4242-9223-4174483102C8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6E2D7197-18B8-48FD-99C0-C3B71B048B48} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {5B22494A-499D-4DB7-9BBE-616EB3AC29D9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {40F57765-9081-4821-AA74-67992A3A35C0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {ECA44148-37D7-4C6B-A363-FE6FFB93DEAB} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {7F5EF463-733B-4428-A521-5ABF5D77F3B6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4D8A6084-4B5E-4962-81F5-716F168C47A1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {7CFF9F78-C831-40CB-B796-AB3D9567B573} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {DD22DBDE-CAB2-4DE6-8EE7-8A2F4231A848} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {BD4CB8CE-C938-4A5F-91CA-E43F0F194C54} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4E785ECF-7086-4242-9223-4174483102C8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6E2D7197-18B8-48FD-99C0-C3B71B048B48} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {5B22494A-499D-4DB7-9BBE-616EB3AC29D9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {40F57765-9081-4821-AA74-67992A3A35C0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {ECA44148-37D7-4C6B-A363-FE6FFB93DEAB} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {EDA28852-9E34-404C-8B16-5F6D4597F2C2} diff --git a/sdk/src/Services/Deadline/Generated/AmazonDeadlineConfig.cs b/sdk/src/Services/Deadline/Generated/AmazonDeadlineConfig.cs index c3b16aa403e1..616e2b4107d7 100644 --- a/sdk/src/Services/Deadline/Generated/AmazonDeadlineConfig.cs +++ b/sdk/src/Services/Deadline/Generated/AmazonDeadlineConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.Deadline public partial class AmazonDeadlineConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("deadline", "4.0.0.0"); private static readonly AmazonDeadlineEndpointResolver EndpointResolver = new AmazonDeadlineEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("deadline", "3.7.401.18"); -======= - InternalSDKUtils.BuildUserAgentString("deadline", "3.7.403.2"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/Deadline/Generated/Model/Internal/MarshallTransformations/CreateJobRequestMarshaller.cs b/sdk/src/Services/Deadline/Generated/Model/Internal/MarshallTransformations/CreateJobRequestMarshaller.cs index b11938623fc0..7b1285d9afea 100644 --- a/sdk/src/Services/Deadline/Generated/Model/Internal/MarshallTransformations/CreateJobRequestMarshaller.cs +++ b/sdk/src/Services/Deadline/Generated/Model/Internal/MarshallTransformations/CreateJobRequestMarshaller.cs @@ -123,31 +123,17 @@ public IRequest Marshall(CreateJobRequest publicRequest) context.Writer.Write(publicRequest.Priority.Value); } -<<<<<<< HEAD + if(publicRequest.IsSetSourceJobId()) + { + context.Writer.WritePropertyName("sourceJobId"); + context.Writer.Write(publicRequest.SourceJobId); + } + if(publicRequest.IsSetStorageProfileId()) { context.Writer.WritePropertyName("storageProfileId"); context.Writer.Write(publicRequest.StorageProfileId); } -||||||| Commit version number update changes - if(publicRequest.IsSetStorageProfileId()) - { - context.Writer.WritePropertyName("storageProfileId"); - context.Writer.Write(publicRequest.StorageProfileId); - } -======= - if(publicRequest.IsSetSourceJobId()) - { - context.Writer.WritePropertyName("sourceJobId"); - context.Writer.Write(publicRequest.SourceJobId); - } - - if(publicRequest.IsSetStorageProfileId()) - { - context.Writer.WritePropertyName("storageProfileId"); - context.Writer.Write(publicRequest.StorageProfileId); - } ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b if(publicRequest.IsSetTargetTaskRunStatus()) { diff --git a/sdk/src/Services/Deadline/Generated/Model/ListJobParameterDefinitionsRequest.cs b/sdk/src/Services/Deadline/Generated/Model/ListJobParameterDefinitionsRequest.cs index 8899c0470c6f..eee7c5b44dbe 100644 --- a/sdk/src/Services/Deadline/Generated/Model/ListJobParameterDefinitionsRequest.cs +++ b/sdk/src/Services/Deadline/Generated/Model/ListJobParameterDefinitionsRequest.cs @@ -87,9 +87,9 @@ internal bool IsSetJobId() /// /// [AWSProperty(Min=1, Max=100)] - public int MaxResults + public int? MaxResults { - get { return this._maxResults.GetValueOrDefault(); } + get { return this._maxResults; } set { this._maxResults = value; } } diff --git a/sdk/src/Services/Deadline/Generated/Model/_bcl45+netstandard/IListJobParameterDefinitionsPaginator.cs b/sdk/src/Services/Deadline/Generated/Model/_bcl+netstandard/IListJobParameterDefinitionsPaginator.cs similarity index 100% rename from sdk/src/Services/Deadline/Generated/Model/_bcl45+netstandard/IListJobParameterDefinitionsPaginator.cs rename to sdk/src/Services/Deadline/Generated/Model/_bcl+netstandard/IListJobParameterDefinitionsPaginator.cs diff --git a/sdk/src/Services/Deadline/Generated/Model/_bcl45+netstandard/ListJobParameterDefinitionsPaginator.cs b/sdk/src/Services/Deadline/Generated/Model/_bcl+netstandard/ListJobParameterDefinitionsPaginator.cs similarity index 100% rename from sdk/src/Services/Deadline/Generated/Model/_bcl45+netstandard/ListJobParameterDefinitionsPaginator.cs rename to sdk/src/Services/Deadline/Generated/Model/_bcl+netstandard/ListJobParameterDefinitionsPaginator.cs diff --git a/sdk/src/Services/Deadline/Generated/_bcl/AmazonDeadlineClient.cs b/sdk/src/Services/Deadline/Generated/_bcl/AmazonDeadlineClient.cs index d6617ee938d2..39a93e198cc0 100644 --- a/sdk/src/Services/Deadline/Generated/_bcl/AmazonDeadlineClient.cs +++ b/sdk/src/Services/Deadline/Generated/_bcl/AmazonDeadlineClient.cs @@ -4927,6 +4927,79 @@ public virtual ListJobMembersResponse ListJobMembers(ListJobMembersRequest reque #endregion + #region ListJobParameterDefinitions + + + /// + /// Lists parameter definitions of a job. + /// + /// Container for the necessary parameters to execute the ListJobParameterDefinitions service method. + /// + /// The response from the ListJobParameterDefinitions service method, as returned by Deadline. + /// + /// You don't have permission to perform the action. + /// + /// + /// Deadline Cloud can't process your request right now. Try again later. + /// + /// + /// The requested resource can't be found. + /// + /// + /// Your request exceeded a request rate quota. + /// + /// + /// The request isn't valid. This can occur if your request contains malformed JSON or + /// unsupported characters. + /// + /// REST API Reference for ListJobParameterDefinitions Operation + public virtual ListJobParameterDefinitionsResponse ListJobParameterDefinitions(ListJobParameterDefinitionsRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = ListJobParameterDefinitionsRequestMarshaller.Instance; + options.ResponseUnmarshaller = ListJobParameterDefinitionsResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// Lists parameter definitions of a job. + /// + /// Container for the necessary parameters to execute the ListJobParameterDefinitions service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the ListJobParameterDefinitions service method, as returned by Deadline. + /// + /// You don't have permission to perform the action. + /// + /// + /// Deadline Cloud can't process your request right now. Try again later. + /// + /// + /// The requested resource can't be found. + /// + /// + /// Your request exceeded a request rate quota. + /// + /// + /// The request isn't valid. This can occur if your request contains malformed JSON or + /// unsupported characters. + /// + /// REST API Reference for ListJobParameterDefinitions Operation + public virtual Task ListJobParameterDefinitionsAsync(ListJobParameterDefinitionsRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = ListJobParameterDefinitionsRequestMarshaller.Instance; + options.ResponseUnmarshaller = ListJobParameterDefinitionsResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + #region ListJobs diff --git a/sdk/src/Services/Deadline/Properties/AssemblyInfo.cs b/sdk/src/Services/Deadline/Properties/AssemblyInfo.cs index da64348be4a3..d835c011ed80 100644 --- a/sdk/src/Services/Deadline/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/Deadline/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.18")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.403.2")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/Detective/Detective.sln b/sdk/src/Services/Detective/Detective.sln index 640458533c2f..19d2b8797fd1 100644 --- a/sdk/src/Services/Detective/Detective.sln +++ b/sdk/src/Services/Detective/Detective.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {0B6E1E55-530C-4BEE-93C0-6E7C639F6FD7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {0B6E1E55-530C-4BEE-93C0-6E7C639F6FD7}.Debug|Any CPU.Build.0 = Debug|Any CPU {0B6E1E55-530C-4BEE-93C0-6E7C639F6FD7}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {BB40AB77-7242-4B13-BCB3-9136A6FD9350}.Debug|Any CPU.Build.0 = Debug|Any CPU {BB40AB77-7242-4B13-BCB3-9136A6FD9350}.Release|Any CPU.ActiveCfg = Release|Any CPU {BB40AB77-7242-4B13-BCB3-9136A6FD9350}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {75FD3473-0360-415B-8B3B-33F6C7FBE7B7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {75FD3473-0360-415B-8B3B-33F6C7FBE7B7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {75FD3473-0360-415B-8B3B-33F6C7FBE7B7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {75FD3473-0360-415B-8B3B-33F6C7FBE7B7}.Release|Any CPU.Build.0 = Release|Any CPU - {72CF5748-305A-4B1A-A0DA-376F9D85CA1A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {72CF5748-305A-4B1A-A0DA-376F9D85CA1A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {72CF5748-305A-4B1A-A0DA-376F9D85CA1A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {72CF5748-305A-4B1A-A0DA-376F9D85CA1A}.Release|Any CPU.Build.0 = Release|Any CPU - {382C1547-714F-44FF-8CC7-7556B1E82DAE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {382C1547-714F-44FF-8CC7-7556B1E82DAE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {382C1547-714F-44FF-8CC7-7556B1E82DAE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {382C1547-714F-44FF-8CC7-7556B1E82DAE}.Release|Any CPU.Build.0 = Release|Any CPU - {AC6862DE-A9EF-44DC-A29C-A88B707EFCB3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AC6862DE-A9EF-44DC-A29C-A88B707EFCB3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AC6862DE-A9EF-44DC-A29C-A88B707EFCB3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AC6862DE-A9EF-44DC-A29C-A88B707EFCB3}.Release|Any CPU.Build.0 = Release|Any CPU - {D2DDE4FD-E2AE-4F7A-BB14-E142E0268171}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D2DDE4FD-E2AE-4F7A-BB14-E142E0268171}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D2DDE4FD-E2AE-4F7A-BB14-E142E0268171}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D2DDE4FD-E2AE-4F7A-BB14-E142E0268171}.Release|Any CPU.Build.0 = Release|Any CPU - {A709B1E2-D200-4ECB-A522-C22C449DA4EF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A709B1E2-D200-4ECB-A522-C22C449DA4EF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A709B1E2-D200-4ECB-A522-C22C449DA4EF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A709B1E2-D200-4ECB-A522-C22C449DA4EF}.Release|Any CPU.Build.0 = Release|Any CPU - {125E44F6-C5DB-4635-8162-B69C5D71087A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {125E44F6-C5DB-4635-8162-B69C5D71087A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {125E44F6-C5DB-4635-8162-B69C5D71087A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {125E44F6-C5DB-4635-8162-B69C5D71087A}.Release|Any CPU.Build.0 = Release|Any CPU - {0C5A93AA-6EC2-4FC9-A668-A2299BF6B129}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0C5A93AA-6EC2-4FC9-A668-A2299BF6B129}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0C5A93AA-6EC2-4FC9-A668-A2299BF6B129}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0C5A93AA-6EC2-4FC9-A668-A2299BF6B129}.Release|Any CPU.Build.0 = Release|Any CPU - {FC9278A8-4B1B-425B-B7FD-784DBDCC5558}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FC9278A8-4B1B-425B-B7FD-784DBDCC5558}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FC9278A8-4B1B-425B-B7FD-784DBDCC5558}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FC9278A8-4B1B-425B-B7FD-784DBDCC5558}.Release|Any CPU.Build.0 = Release|Any CPU - {F1272B42-59B6-4C2E-8D44-15792ED405DE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F1272B42-59B6-4C2E-8D44-15792ED405DE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F1272B42-59B6-4C2E-8D44-15792ED405DE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F1272B42-59B6-4C2E-8D44-15792ED405DE}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {75FD3473-0360-415B-8B3B-33F6C7FBE7B7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {75FD3473-0360-415B-8B3B-33F6C7FBE7B7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {75FD3473-0360-415B-8B3B-33F6C7FBE7B7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {75FD3473-0360-415B-8B3B-33F6C7FBE7B7}.Release|Any CPU.Build.0 = Release|Any CPU - {72CF5748-305A-4B1A-A0DA-376F9D85CA1A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {72CF5748-305A-4B1A-A0DA-376F9D85CA1A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {72CF5748-305A-4B1A-A0DA-376F9D85CA1A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {72CF5748-305A-4B1A-A0DA-376F9D85CA1A}.Release|Any CPU.Build.0 = Release|Any CPU - {382C1547-714F-44FF-8CC7-7556B1E82DAE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {382C1547-714F-44FF-8CC7-7556B1E82DAE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {382C1547-714F-44FF-8CC7-7556B1E82DAE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {382C1547-714F-44FF-8CC7-7556B1E82DAE}.Release|Any CPU.Build.0 = Release|Any CPU - {AC6862DE-A9EF-44DC-A29C-A88B707EFCB3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AC6862DE-A9EF-44DC-A29C-A88B707EFCB3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AC6862DE-A9EF-44DC-A29C-A88B707EFCB3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AC6862DE-A9EF-44DC-A29C-A88B707EFCB3}.Release|Any CPU.Build.0 = Release|Any CPU - {D2DDE4FD-E2AE-4F7A-BB14-E142E0268171}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D2DDE4FD-E2AE-4F7A-BB14-E142E0268171}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D2DDE4FD-E2AE-4F7A-BB14-E142E0268171}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D2DDE4FD-E2AE-4F7A-BB14-E142E0268171}.Release|Any CPU.Build.0 = Release|Any CPU - {A709B1E2-D200-4ECB-A522-C22C449DA4EF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A709B1E2-D200-4ECB-A522-C22C449DA4EF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A709B1E2-D200-4ECB-A522-C22C449DA4EF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A709B1E2-D200-4ECB-A522-C22C449DA4EF}.Release|Any CPU.Build.0 = Release|Any CPU - {125E44F6-C5DB-4635-8162-B69C5D71087A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {125E44F6-C5DB-4635-8162-B69C5D71087A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {125E44F6-C5DB-4635-8162-B69C5D71087A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {125E44F6-C5DB-4635-8162-B69C5D71087A}.Release|Any CPU.Build.0 = Release|Any CPU - {0C5A93AA-6EC2-4FC9-A668-A2299BF6B129}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0C5A93AA-6EC2-4FC9-A668-A2299BF6B129}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0C5A93AA-6EC2-4FC9-A668-A2299BF6B129}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0C5A93AA-6EC2-4FC9-A668-A2299BF6B129}.Release|Any CPU.Build.0 = Release|Any CPU - {FC9278A8-4B1B-425B-B7FD-784DBDCC5558}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FC9278A8-4B1B-425B-B7FD-784DBDCC5558}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FC9278A8-4B1B-425B-B7FD-784DBDCC5558}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FC9278A8-4B1B-425B-B7FD-784DBDCC5558}.Release|Any CPU.Build.0 = Release|Any CPU - {F1272B42-59B6-4C2E-8D44-15792ED405DE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F1272B42-59B6-4C2E-8D44-15792ED405DE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F1272B42-59B6-4C2E-8D44-15792ED405DE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F1272B42-59B6-4C2E-8D44-15792ED405DE}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {0B6E1E55-530C-4BEE-93C0-6E7C639F6FD7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {1228A780-DE6F-4334-AFFF-98717DF98581} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {4C21F0EE-690A-4F88-B036-31B11E8409C1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {8D050F8E-5313-4494-A388-11560A8FC3D0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {BB40AB77-7242-4B13-BCB3-9136A6FD9350} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {75FD3473-0360-415B-8B3B-33F6C7FBE7B7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {72CF5748-305A-4B1A-A0DA-376F9D85CA1A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {382C1547-714F-44FF-8CC7-7556B1E82DAE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {AC6862DE-A9EF-44DC-A29C-A88B707EFCB3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D2DDE4FD-E2AE-4F7A-BB14-E142E0268171} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A709B1E2-D200-4ECB-A522-C22C449DA4EF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {125E44F6-C5DB-4635-8162-B69C5D71087A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0C5A93AA-6EC2-4FC9-A668-A2299BF6B129} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {FC9278A8-4B1B-425B-B7FD-784DBDCC5558} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F1272B42-59B6-4C2E-8D44-15792ED405DE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {75FD3473-0360-415B-8B3B-33F6C7FBE7B7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {72CF5748-305A-4B1A-A0DA-376F9D85CA1A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {382C1547-714F-44FF-8CC7-7556B1E82DAE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {AC6862DE-A9EF-44DC-A29C-A88B707EFCB3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D2DDE4FD-E2AE-4F7A-BB14-E142E0268171} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A709B1E2-D200-4ECB-A522-C22C449DA4EF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {125E44F6-C5DB-4635-8162-B69C5D71087A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0C5A93AA-6EC2-4FC9-A668-A2299BF6B129} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {FC9278A8-4B1B-425B-B7FD-784DBDCC5558} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F1272B42-59B6-4C2E-8D44-15792ED405DE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {88F61FD5-B36D-474C-B41A-CB047956CA94} diff --git a/sdk/src/Services/Detective/Generated/AmazonDetectiveConfig.cs b/sdk/src/Services/Detective/Generated/AmazonDetectiveConfig.cs index 9eb5e052086e..9e10e0f25a86 100644 --- a/sdk/src/Services/Detective/Generated/AmazonDetectiveConfig.cs +++ b/sdk/src/Services/Detective/Generated/AmazonDetectiveConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.Detective public partial class AmazonDetectiveConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("Detective", "4.0.0.0"); private static readonly AmazonDetectiveEndpointResolver EndpointResolver = new AmazonDetectiveEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("Detective", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("Detective", "3.7.400.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/Detective/Properties/AssemblyInfo.cs b/sdk/src/Services/Detective/Properties/AssemblyInfo.cs index f925582b65e8..ea7c5c707757 100644 --- a/sdk/src/Services/Detective/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/Detective/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/DevOpsGuru/DevOpsGuru.sln b/sdk/src/Services/DevOpsGuru/DevOpsGuru.sln index 3e4bf633233f..48fac8633589 100644 --- a/sdk/src/Services/DevOpsGuru/DevOpsGuru.sln +++ b/sdk/src/Services/DevOpsGuru/DevOpsGuru.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {AB63E029-67B5-49F2-A837-7A06640A503D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {AB63E029-67B5-49F2-A837-7A06640A503D}.Debug|Any CPU.Build.0 = Debug|Any CPU {AB63E029-67B5-49F2-A837-7A06640A503D}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {9E9E69C7-A1BB-4FD9-BCA8-7943A5B44786}.Debug|Any CPU.Build.0 = Debug|Any CPU {9E9E69C7-A1BB-4FD9-BCA8-7943A5B44786}.Release|Any CPU.ActiveCfg = Release|Any CPU {9E9E69C7-A1BB-4FD9-BCA8-7943A5B44786}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {C3A90C59-28C3-45CE-A99E-C155DE25A712}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C3A90C59-28C3-45CE-A99E-C155DE25A712}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C3A90C59-28C3-45CE-A99E-C155DE25A712}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C3A90C59-28C3-45CE-A99E-C155DE25A712}.Release|Any CPU.Build.0 = Release|Any CPU - {342D4B59-0D5A-4BBB-94B0-3684E6ECBD04}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {342D4B59-0D5A-4BBB-94B0-3684E6ECBD04}.Debug|Any CPU.Build.0 = Debug|Any CPU - {342D4B59-0D5A-4BBB-94B0-3684E6ECBD04}.Release|Any CPU.ActiveCfg = Release|Any CPU - {342D4B59-0D5A-4BBB-94B0-3684E6ECBD04}.Release|Any CPU.Build.0 = Release|Any CPU - {E6E3F826-8410-4B03-ABEE-B3154B08ADAF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E6E3F826-8410-4B03-ABEE-B3154B08ADAF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E6E3F826-8410-4B03-ABEE-B3154B08ADAF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E6E3F826-8410-4B03-ABEE-B3154B08ADAF}.Release|Any CPU.Build.0 = Release|Any CPU - {C676DE92-05E0-4454-AA0C-7A2EE5E5A4E0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C676DE92-05E0-4454-AA0C-7A2EE5E5A4E0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C676DE92-05E0-4454-AA0C-7A2EE5E5A4E0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C676DE92-05E0-4454-AA0C-7A2EE5E5A4E0}.Release|Any CPU.Build.0 = Release|Any CPU - {D99EBC00-F1F0-470F-908F-35A6D74FE266}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D99EBC00-F1F0-470F-908F-35A6D74FE266}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D99EBC00-F1F0-470F-908F-35A6D74FE266}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D99EBC00-F1F0-470F-908F-35A6D74FE266}.Release|Any CPU.Build.0 = Release|Any CPU - {42DE675C-15E7-4AC3-9356-42F4CED81974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {42DE675C-15E7-4AC3-9356-42F4CED81974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {42DE675C-15E7-4AC3-9356-42F4CED81974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {42DE675C-15E7-4AC3-9356-42F4CED81974}.Release|Any CPU.Build.0 = Release|Any CPU - {80878793-8473-4121-8197-144AFEB5EB4D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {80878793-8473-4121-8197-144AFEB5EB4D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {80878793-8473-4121-8197-144AFEB5EB4D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {80878793-8473-4121-8197-144AFEB5EB4D}.Release|Any CPU.Build.0 = Release|Any CPU - {A167EBEE-3300-4D7C-BA43-516CE31385E3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A167EBEE-3300-4D7C-BA43-516CE31385E3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A167EBEE-3300-4D7C-BA43-516CE31385E3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A167EBEE-3300-4D7C-BA43-516CE31385E3}.Release|Any CPU.Build.0 = Release|Any CPU - {E915C237-E045-4E2A-9379-0460202BAFCD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E915C237-E045-4E2A-9379-0460202BAFCD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E915C237-E045-4E2A-9379-0460202BAFCD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E915C237-E045-4E2A-9379-0460202BAFCD}.Release|Any CPU.Build.0 = Release|Any CPU - {A8A31FD9-663C-4447-9ECF-50F207FE9D84}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A8A31FD9-663C-4447-9ECF-50F207FE9D84}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A8A31FD9-663C-4447-9ECF-50F207FE9D84}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A8A31FD9-663C-4447-9ECF-50F207FE9D84}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {C3A90C59-28C3-45CE-A99E-C155DE25A712}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C3A90C59-28C3-45CE-A99E-C155DE25A712}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C3A90C59-28C3-45CE-A99E-C155DE25A712}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C3A90C59-28C3-45CE-A99E-C155DE25A712}.Release|Any CPU.Build.0 = Release|Any CPU - {342D4B59-0D5A-4BBB-94B0-3684E6ECBD04}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {342D4B59-0D5A-4BBB-94B0-3684E6ECBD04}.Debug|Any CPU.Build.0 = Debug|Any CPU - {342D4B59-0D5A-4BBB-94B0-3684E6ECBD04}.Release|Any CPU.ActiveCfg = Release|Any CPU - {342D4B59-0D5A-4BBB-94B0-3684E6ECBD04}.Release|Any CPU.Build.0 = Release|Any CPU - {E6E3F826-8410-4B03-ABEE-B3154B08ADAF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E6E3F826-8410-4B03-ABEE-B3154B08ADAF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E6E3F826-8410-4B03-ABEE-B3154B08ADAF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E6E3F826-8410-4B03-ABEE-B3154B08ADAF}.Release|Any CPU.Build.0 = Release|Any CPU - {C676DE92-05E0-4454-AA0C-7A2EE5E5A4E0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C676DE92-05E0-4454-AA0C-7A2EE5E5A4E0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C676DE92-05E0-4454-AA0C-7A2EE5E5A4E0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C676DE92-05E0-4454-AA0C-7A2EE5E5A4E0}.Release|Any CPU.Build.0 = Release|Any CPU - {D99EBC00-F1F0-470F-908F-35A6D74FE266}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D99EBC00-F1F0-470F-908F-35A6D74FE266}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D99EBC00-F1F0-470F-908F-35A6D74FE266}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D99EBC00-F1F0-470F-908F-35A6D74FE266}.Release|Any CPU.Build.0 = Release|Any CPU - {42DE675C-15E7-4AC3-9356-42F4CED81974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {42DE675C-15E7-4AC3-9356-42F4CED81974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {42DE675C-15E7-4AC3-9356-42F4CED81974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {42DE675C-15E7-4AC3-9356-42F4CED81974}.Release|Any CPU.Build.0 = Release|Any CPU - {80878793-8473-4121-8197-144AFEB5EB4D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {80878793-8473-4121-8197-144AFEB5EB4D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {80878793-8473-4121-8197-144AFEB5EB4D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {80878793-8473-4121-8197-144AFEB5EB4D}.Release|Any CPU.Build.0 = Release|Any CPU - {A167EBEE-3300-4D7C-BA43-516CE31385E3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A167EBEE-3300-4D7C-BA43-516CE31385E3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A167EBEE-3300-4D7C-BA43-516CE31385E3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A167EBEE-3300-4D7C-BA43-516CE31385E3}.Release|Any CPU.Build.0 = Release|Any CPU - {E915C237-E045-4E2A-9379-0460202BAFCD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E915C237-E045-4E2A-9379-0460202BAFCD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E915C237-E045-4E2A-9379-0460202BAFCD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E915C237-E045-4E2A-9379-0460202BAFCD}.Release|Any CPU.Build.0 = Release|Any CPU - {A8A31FD9-663C-4447-9ECF-50F207FE9D84}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A8A31FD9-663C-4447-9ECF-50F207FE9D84}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A8A31FD9-663C-4447-9ECF-50F207FE9D84}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A8A31FD9-663C-4447-9ECF-50F207FE9D84}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {AB63E029-67B5-49F2-A837-7A06640A503D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {6E2AF094-D05E-4598-B2D7-4138B4C00FB1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {2AF0E5B6-15BF-4558-A768-4A4418B3F854} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {22082C25-B398-46EF-B0FA-3B88769E0742} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {9E9E69C7-A1BB-4FD9-BCA8-7943A5B44786} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {C3A90C59-28C3-45CE-A99E-C155DE25A712} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {342D4B59-0D5A-4BBB-94B0-3684E6ECBD04} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E6E3F826-8410-4B03-ABEE-B3154B08ADAF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C676DE92-05E0-4454-AA0C-7A2EE5E5A4E0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D99EBC00-F1F0-470F-908F-35A6D74FE266} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {42DE675C-15E7-4AC3-9356-42F4CED81974} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {80878793-8473-4121-8197-144AFEB5EB4D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A167EBEE-3300-4D7C-BA43-516CE31385E3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E915C237-E045-4E2A-9379-0460202BAFCD} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A8A31FD9-663C-4447-9ECF-50F207FE9D84} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {C3A90C59-28C3-45CE-A99E-C155DE25A712} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {342D4B59-0D5A-4BBB-94B0-3684E6ECBD04} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E6E3F826-8410-4B03-ABEE-B3154B08ADAF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C676DE92-05E0-4454-AA0C-7A2EE5E5A4E0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D99EBC00-F1F0-470F-908F-35A6D74FE266} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {42DE675C-15E7-4AC3-9356-42F4CED81974} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {80878793-8473-4121-8197-144AFEB5EB4D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A167EBEE-3300-4D7C-BA43-516CE31385E3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E915C237-E045-4E2A-9379-0460202BAFCD} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A8A31FD9-663C-4447-9ECF-50F207FE9D84} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {96C00B05-AA04-4B32-999F-A9BE0DA00834} diff --git a/sdk/src/Services/DevOpsGuru/Generated/AmazonDevOpsGuruConfig.cs b/sdk/src/Services/DevOpsGuru/Generated/AmazonDevOpsGuruConfig.cs index 1b7d39d8bd4d..dd96da8b4bc3 100644 --- a/sdk/src/Services/DevOpsGuru/Generated/AmazonDevOpsGuruConfig.cs +++ b/sdk/src/Services/DevOpsGuru/Generated/AmazonDevOpsGuruConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.DevOpsGuru public partial class AmazonDevOpsGuruConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("DevOps Guru", "4.0.0.0"); private static readonly AmazonDevOpsGuruEndpointResolver EndpointResolver = new AmazonDevOpsGuruEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("DevOps Guru", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("DevOps Guru", "3.7.400.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/DevOpsGuru/Properties/AssemblyInfo.cs b/sdk/src/Services/DevOpsGuru/Properties/AssemblyInfo.cs index 93075276e516..a37ac982d366 100644 --- a/sdk/src/Services/DevOpsGuru/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/DevOpsGuru/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/DeviceFarm/DeviceFarm.sln b/sdk/src/Services/DeviceFarm/DeviceFarm.sln index 472a91242d46..d9969008a8e5 100644 --- a/sdk/src/Services/DeviceFarm/DeviceFarm.sln +++ b/sdk/src/Services/DeviceFarm/DeviceFarm.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {18C474CF-A2B8-4EDD-B81A-CD6EE79471F5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {18C474CF-A2B8-4EDD-B81A-CD6EE79471F5}.Debug|Any CPU.Build.0 = Debug|Any CPU {18C474CF-A2B8-4EDD-B81A-CD6EE79471F5}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {642C9BD0-DB79-437A-A03F-8D4ABBCF6606}.Debug|Any CPU.Build.0 = Debug|Any CPU {642C9BD0-DB79-437A-A03F-8D4ABBCF6606}.Release|Any CPU.ActiveCfg = Release|Any CPU {642C9BD0-DB79-437A-A03F-8D4ABBCF6606}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {BD2FC4D6-D7E5-4F94-875A-B1E6AD22B496}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BD2FC4D6-D7E5-4F94-875A-B1E6AD22B496}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BD2FC4D6-D7E5-4F94-875A-B1E6AD22B496}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BD2FC4D6-D7E5-4F94-875A-B1E6AD22B496}.Release|Any CPU.Build.0 = Release|Any CPU - {D0E27196-4101-4241-AC51-A8BE677D0CCE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D0E27196-4101-4241-AC51-A8BE677D0CCE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D0E27196-4101-4241-AC51-A8BE677D0CCE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D0E27196-4101-4241-AC51-A8BE677D0CCE}.Release|Any CPU.Build.0 = Release|Any CPU - {9F2A8BDA-8FE6-48DC-BCF8-8AC3F1CC3506}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9F2A8BDA-8FE6-48DC-BCF8-8AC3F1CC3506}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9F2A8BDA-8FE6-48DC-BCF8-8AC3F1CC3506}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9F2A8BDA-8FE6-48DC-BCF8-8AC3F1CC3506}.Release|Any CPU.Build.0 = Release|Any CPU - {A865E341-1767-492C-8B2A-3A580FE26142}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A865E341-1767-492C-8B2A-3A580FE26142}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A865E341-1767-492C-8B2A-3A580FE26142}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A865E341-1767-492C-8B2A-3A580FE26142}.Release|Any CPU.Build.0 = Release|Any CPU - {B600CB6D-BC59-49D5-8E9A-C1EA503FB341}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B600CB6D-BC59-49D5-8E9A-C1EA503FB341}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B600CB6D-BC59-49D5-8E9A-C1EA503FB341}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B600CB6D-BC59-49D5-8E9A-C1EA503FB341}.Release|Any CPU.Build.0 = Release|Any CPU - {19D868B5-E2FB-4C02-87A9-7F7944426BEC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {19D868B5-E2FB-4C02-87A9-7F7944426BEC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {19D868B5-E2FB-4C02-87A9-7F7944426BEC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {19D868B5-E2FB-4C02-87A9-7F7944426BEC}.Release|Any CPU.Build.0 = Release|Any CPU - {D820F42F-C03C-4641-8F54-364F02E598E1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D820F42F-C03C-4641-8F54-364F02E598E1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D820F42F-C03C-4641-8F54-364F02E598E1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D820F42F-C03C-4641-8F54-364F02E598E1}.Release|Any CPU.Build.0 = Release|Any CPU - {A1D34EF9-EAE5-4504-A2ED-81612477E925}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A1D34EF9-EAE5-4504-A2ED-81612477E925}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A1D34EF9-EAE5-4504-A2ED-81612477E925}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A1D34EF9-EAE5-4504-A2ED-81612477E925}.Release|Any CPU.Build.0 = Release|Any CPU - {CA1C82AA-C3C2-47E3-983B-66E5DFAD1457}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CA1C82AA-C3C2-47E3-983B-66E5DFAD1457}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CA1C82AA-C3C2-47E3-983B-66E5DFAD1457}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CA1C82AA-C3C2-47E3-983B-66E5DFAD1457}.Release|Any CPU.Build.0 = Release|Any CPU - {FE4ED9D7-D3F0-409C-9F9D-74736F06568F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FE4ED9D7-D3F0-409C-9F9D-74736F06568F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FE4ED9D7-D3F0-409C-9F9D-74736F06568F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FE4ED9D7-D3F0-409C-9F9D-74736F06568F}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {BD2FC4D6-D7E5-4F94-875A-B1E6AD22B496}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BD2FC4D6-D7E5-4F94-875A-B1E6AD22B496}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BD2FC4D6-D7E5-4F94-875A-B1E6AD22B496}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BD2FC4D6-D7E5-4F94-875A-B1E6AD22B496}.Release|Any CPU.Build.0 = Release|Any CPU - {D0E27196-4101-4241-AC51-A8BE677D0CCE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D0E27196-4101-4241-AC51-A8BE677D0CCE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D0E27196-4101-4241-AC51-A8BE677D0CCE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D0E27196-4101-4241-AC51-A8BE677D0CCE}.Release|Any CPU.Build.0 = Release|Any CPU - {9F2A8BDA-8FE6-48DC-BCF8-8AC3F1CC3506}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9F2A8BDA-8FE6-48DC-BCF8-8AC3F1CC3506}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9F2A8BDA-8FE6-48DC-BCF8-8AC3F1CC3506}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9F2A8BDA-8FE6-48DC-BCF8-8AC3F1CC3506}.Release|Any CPU.Build.0 = Release|Any CPU - {A865E341-1767-492C-8B2A-3A580FE26142}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A865E341-1767-492C-8B2A-3A580FE26142}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A865E341-1767-492C-8B2A-3A580FE26142}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A865E341-1767-492C-8B2A-3A580FE26142}.Release|Any CPU.Build.0 = Release|Any CPU - {B600CB6D-BC59-49D5-8E9A-C1EA503FB341}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B600CB6D-BC59-49D5-8E9A-C1EA503FB341}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B600CB6D-BC59-49D5-8E9A-C1EA503FB341}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B600CB6D-BC59-49D5-8E9A-C1EA503FB341}.Release|Any CPU.Build.0 = Release|Any CPU - {19D868B5-E2FB-4C02-87A9-7F7944426BEC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {19D868B5-E2FB-4C02-87A9-7F7944426BEC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {19D868B5-E2FB-4C02-87A9-7F7944426BEC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {19D868B5-E2FB-4C02-87A9-7F7944426BEC}.Release|Any CPU.Build.0 = Release|Any CPU - {D820F42F-C03C-4641-8F54-364F02E598E1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D820F42F-C03C-4641-8F54-364F02E598E1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D820F42F-C03C-4641-8F54-364F02E598E1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D820F42F-C03C-4641-8F54-364F02E598E1}.Release|Any CPU.Build.0 = Release|Any CPU - {A1D34EF9-EAE5-4504-A2ED-81612477E925}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A1D34EF9-EAE5-4504-A2ED-81612477E925}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A1D34EF9-EAE5-4504-A2ED-81612477E925}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A1D34EF9-EAE5-4504-A2ED-81612477E925}.Release|Any CPU.Build.0 = Release|Any CPU - {CA1C82AA-C3C2-47E3-983B-66E5DFAD1457}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CA1C82AA-C3C2-47E3-983B-66E5DFAD1457}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CA1C82AA-C3C2-47E3-983B-66E5DFAD1457}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CA1C82AA-C3C2-47E3-983B-66E5DFAD1457}.Release|Any CPU.Build.0 = Release|Any CPU - {FE4ED9D7-D3F0-409C-9F9D-74736F06568F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FE4ED9D7-D3F0-409C-9F9D-74736F06568F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FE4ED9D7-D3F0-409C-9F9D-74736F06568F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FE4ED9D7-D3F0-409C-9F9D-74736F06568F}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {18C474CF-A2B8-4EDD-B81A-CD6EE79471F5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {FEDF345D-1C39-487D-8B00-9BCEF7E6CC27} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {811E3D54-BA5F-4342-8157-5DEEFE77E386} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {34805D95-2845-4ADE-82CC-49303EDF5C44} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {642C9BD0-DB79-437A-A03F-8D4ABBCF6606} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {BD2FC4D6-D7E5-4F94-875A-B1E6AD22B496} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D0E27196-4101-4241-AC51-A8BE677D0CCE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {9F2A8BDA-8FE6-48DC-BCF8-8AC3F1CC3506} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A865E341-1767-492C-8B2A-3A580FE26142} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B600CB6D-BC59-49D5-8E9A-C1EA503FB341} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {19D868B5-E2FB-4C02-87A9-7F7944426BEC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D820F42F-C03C-4641-8F54-364F02E598E1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A1D34EF9-EAE5-4504-A2ED-81612477E925} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {CA1C82AA-C3C2-47E3-983B-66E5DFAD1457} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {FE4ED9D7-D3F0-409C-9F9D-74736F06568F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {BD2FC4D6-D7E5-4F94-875A-B1E6AD22B496} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D0E27196-4101-4241-AC51-A8BE677D0CCE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {9F2A8BDA-8FE6-48DC-BCF8-8AC3F1CC3506} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A865E341-1767-492C-8B2A-3A580FE26142} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B600CB6D-BC59-49D5-8E9A-C1EA503FB341} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {19D868B5-E2FB-4C02-87A9-7F7944426BEC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D820F42F-C03C-4641-8F54-364F02E598E1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A1D34EF9-EAE5-4504-A2ED-81612477E925} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {CA1C82AA-C3C2-47E3-983B-66E5DFAD1457} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {FE4ED9D7-D3F0-409C-9F9D-74736F06568F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {C2445AB4-61B9-47FC-9394-F52D052F57FE} diff --git a/sdk/src/Services/DeviceFarm/Generated/AmazonDeviceFarmConfig.cs b/sdk/src/Services/DeviceFarm/Generated/AmazonDeviceFarmConfig.cs index 16e8d3d42648..24490e0d199f 100644 --- a/sdk/src/Services/DeviceFarm/Generated/AmazonDeviceFarmConfig.cs +++ b/sdk/src/Services/DeviceFarm/Generated/AmazonDeviceFarmConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.DeviceFarm public partial class AmazonDeviceFarmConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("Device Farm", "4.0.0.0"); private static readonly AmazonDeviceFarmEndpointResolver EndpointResolver = new AmazonDeviceFarmEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("Device Farm", "3.7.401.14"); -======= - InternalSDKUtils.BuildUserAgentString("Device Farm", "3.7.401.41"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/DeviceFarm/Properties/AssemblyInfo.cs b/sdk/src/Services/DeviceFarm/Properties/AssemblyInfo.cs index 1df9a328a397..383daa5d066c 100644 --- a/sdk/src/Services/DeviceFarm/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/DeviceFarm/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.14")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.41")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/DirectConnect/DirectConnect.sln b/sdk/src/Services/DirectConnect/DirectConnect.sln index d19800ccee56..181feebd2249 100644 --- a/sdk/src/Services/DirectConnect/DirectConnect.sln +++ b/sdk/src/Services/DirectConnect/DirectConnect.sln @@ -92,7 +92,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {D8BDA429-9550-48EA-B453-FC60CB9C8C89}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {D8BDA429-9550-48EA-B453-FC60CB9C8C89}.Debug|Any CPU.Build.0 = Debug|Any CPU {D8BDA429-9550-48EA-B453-FC60CB9C8C89}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -113,97 +120,6 @@ Global {85E287DC-F32D-4892-9374-B0D1A7D50A90}.Debug|Any CPU.Build.0 = Debug|Any CPU {85E287DC-F32D-4892-9374-B0D1A7D50A90}.Release|Any CPU.ActiveCfg = Release|Any CPU {85E287DC-F32D-4892-9374-B0D1A7D50A90}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {848B3186-7C6B-4285-9275-A7B857584354}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {848B3186-7C6B-4285-9275-A7B857584354}.Debug|Any CPU.Build.0 = Debug|Any CPU - {848B3186-7C6B-4285-9275-A7B857584354}.Release|Any CPU.ActiveCfg = Release|Any CPU - {848B3186-7C6B-4285-9275-A7B857584354}.Release|Any CPU.Build.0 = Release|Any CPU - {A3A633AB-377B-4971-8B6D-A583332F7DF8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A3A633AB-377B-4971-8B6D-A583332F7DF8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A3A633AB-377B-4971-8B6D-A583332F7DF8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A3A633AB-377B-4971-8B6D-A583332F7DF8}.Release|Any CPU.Build.0 = Release|Any CPU - {949908A9-D051-44E7-8D4E-3E263FD2C318}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {949908A9-D051-44E7-8D4E-3E263FD2C318}.Debug|Any CPU.Build.0 = Debug|Any CPU - {949908A9-D051-44E7-8D4E-3E263FD2C318}.Release|Any CPU.ActiveCfg = Release|Any CPU - {949908A9-D051-44E7-8D4E-3E263FD2C318}.Release|Any CPU.Build.0 = Release|Any CPU - {3134A1C6-492D-468C-AC27-E4A6630E8C79}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3134A1C6-492D-468C-AC27-E4A6630E8C79}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3134A1C6-492D-468C-AC27-E4A6630E8C79}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3134A1C6-492D-468C-AC27-E4A6630E8C79}.Release|Any CPU.Build.0 = Release|Any CPU - {6728220A-45E5-47EC-9337-84BE37374852}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6728220A-45E5-47EC-9337-84BE37374852}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6728220A-45E5-47EC-9337-84BE37374852}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6728220A-45E5-47EC-9337-84BE37374852}.Release|Any CPU.Build.0 = Release|Any CPU - {F78CB26C-8FB4-4CC7-A092-D4C298B6A8AD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F78CB26C-8FB4-4CC7-A092-D4C298B6A8AD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F78CB26C-8FB4-4CC7-A092-D4C298B6A8AD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F78CB26C-8FB4-4CC7-A092-D4C298B6A8AD}.Release|Any CPU.Build.0 = Release|Any CPU - {EC83141D-C0D4-4B6A-9B8D-8D8417317559}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EC83141D-C0D4-4B6A-9B8D-8D8417317559}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EC83141D-C0D4-4B6A-9B8D-8D8417317559}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EC83141D-C0D4-4B6A-9B8D-8D8417317559}.Release|Any CPU.Build.0 = Release|Any CPU - {1D67785C-B275-436D-BAE6-D374AE0BA987}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1D67785C-B275-436D-BAE6-D374AE0BA987}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1D67785C-B275-436D-BAE6-D374AE0BA987}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1D67785C-B275-436D-BAE6-D374AE0BA987}.Release|Any CPU.Build.0 = Release|Any CPU - {D11AEA08-5EDC-4F83-85F6-CFF7B5B745EA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D11AEA08-5EDC-4F83-85F6-CFF7B5B745EA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D11AEA08-5EDC-4F83-85F6-CFF7B5B745EA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D11AEA08-5EDC-4F83-85F6-CFF7B5B745EA}.Release|Any CPU.Build.0 = Release|Any CPU - {B5006A89-D902-4E04-990D-871A2291E783}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B5006A89-D902-4E04-990D-871A2291E783}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B5006A89-D902-4E04-990D-871A2291E783}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B5006A89-D902-4E04-990D-871A2291E783}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {848B3186-7C6B-4285-9275-A7B857584354}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {848B3186-7C6B-4285-9275-A7B857584354}.Debug|Any CPU.Build.0 = Debug|Any CPU - {848B3186-7C6B-4285-9275-A7B857584354}.Release|Any CPU.ActiveCfg = Release|Any CPU - {848B3186-7C6B-4285-9275-A7B857584354}.Release|Any CPU.Build.0 = Release|Any CPU - {A3A633AB-377B-4971-8B6D-A583332F7DF8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A3A633AB-377B-4971-8B6D-A583332F7DF8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A3A633AB-377B-4971-8B6D-A583332F7DF8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A3A633AB-377B-4971-8B6D-A583332F7DF8}.Release|Any CPU.Build.0 = Release|Any CPU - {949908A9-D051-44E7-8D4E-3E263FD2C318}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {949908A9-D051-44E7-8D4E-3E263FD2C318}.Debug|Any CPU.Build.0 = Debug|Any CPU - {949908A9-D051-44E7-8D4E-3E263FD2C318}.Release|Any CPU.ActiveCfg = Release|Any CPU - {949908A9-D051-44E7-8D4E-3E263FD2C318}.Release|Any CPU.Build.0 = Release|Any CPU - {3134A1C6-492D-468C-AC27-E4A6630E8C79}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3134A1C6-492D-468C-AC27-E4A6630E8C79}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3134A1C6-492D-468C-AC27-E4A6630E8C79}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3134A1C6-492D-468C-AC27-E4A6630E8C79}.Release|Any CPU.Build.0 = Release|Any CPU - {6728220A-45E5-47EC-9337-84BE37374852}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6728220A-45E5-47EC-9337-84BE37374852}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6728220A-45E5-47EC-9337-84BE37374852}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6728220A-45E5-47EC-9337-84BE37374852}.Release|Any CPU.Build.0 = Release|Any CPU - {F78CB26C-8FB4-4CC7-A092-D4C298B6A8AD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F78CB26C-8FB4-4CC7-A092-D4C298B6A8AD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F78CB26C-8FB4-4CC7-A092-D4C298B6A8AD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F78CB26C-8FB4-4CC7-A092-D4C298B6A8AD}.Release|Any CPU.Build.0 = Release|Any CPU - {EC83141D-C0D4-4B6A-9B8D-8D8417317559}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EC83141D-C0D4-4B6A-9B8D-8D8417317559}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EC83141D-C0D4-4B6A-9B8D-8D8417317559}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EC83141D-C0D4-4B6A-9B8D-8D8417317559}.Release|Any CPU.Build.0 = Release|Any CPU - {1D67785C-B275-436D-BAE6-D374AE0BA987}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1D67785C-B275-436D-BAE6-D374AE0BA987}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1D67785C-B275-436D-BAE6-D374AE0BA987}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1D67785C-B275-436D-BAE6-D374AE0BA987}.Release|Any CPU.Build.0 = Release|Any CPU - {D11AEA08-5EDC-4F83-85F6-CFF7B5B745EA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D11AEA08-5EDC-4F83-85F6-CFF7B5B745EA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D11AEA08-5EDC-4F83-85F6-CFF7B5B745EA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D11AEA08-5EDC-4F83-85F6-CFF7B5B745EA}.Release|Any CPU.Build.0 = Release|Any CPU - {B5006A89-D902-4E04-990D-871A2291E783}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B5006A89-D902-4E04-990D-871A2291E783}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B5006A89-D902-4E04-990D-871A2291E783}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B5006A89-D902-4E04-990D-871A2291E783}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -220,37 +136,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {D8BDA429-9550-48EA-B453-FC60CB9C8C89} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {5DCB76A4-5A31-4FC2-A259-86C40B733EFE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {3A3F41B4-31D0-4367-96E0-52F184722573} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {4BA00FEF-D6A3-4B54-B56D-4334596DB81F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {85E287DC-F32D-4892-9374-B0D1A7D50A90} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {848B3186-7C6B-4285-9275-A7B857584354} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A3A633AB-377B-4971-8B6D-A583332F7DF8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {949908A9-D051-44E7-8D4E-3E263FD2C318} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {3134A1C6-492D-468C-AC27-E4A6630E8C79} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6728220A-45E5-47EC-9337-84BE37374852} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F78CB26C-8FB4-4CC7-A092-D4C298B6A8AD} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {EC83141D-C0D4-4B6A-9B8D-8D8417317559} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {1D67785C-B275-436D-BAE6-D374AE0BA987} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D11AEA08-5EDC-4F83-85F6-CFF7B5B745EA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B5006A89-D902-4E04-990D-871A2291E783} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {848B3186-7C6B-4285-9275-A7B857584354} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A3A633AB-377B-4971-8B6D-A583332F7DF8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {949908A9-D051-44E7-8D4E-3E263FD2C318} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {3134A1C6-492D-468C-AC27-E4A6630E8C79} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6728220A-45E5-47EC-9337-84BE37374852} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F78CB26C-8FB4-4CC7-A092-D4C298B6A8AD} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {EC83141D-C0D4-4B6A-9B8D-8D8417317559} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {1D67785C-B275-436D-BAE6-D374AE0BA987} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D11AEA08-5EDC-4F83-85F6-CFF7B5B745EA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B5006A89-D902-4E04-990D-871A2291E783} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {CC3226D9-BDAD-4C93-B188-0BFFCEC26466} diff --git a/sdk/src/Services/DirectConnect/Generated/AmazonDirectConnectConfig.cs b/sdk/src/Services/DirectConnect/Generated/AmazonDirectConnectConfig.cs index 0a4b6b4aeece..f6b4a93c9dbb 100644 --- a/sdk/src/Services/DirectConnect/Generated/AmazonDirectConnectConfig.cs +++ b/sdk/src/Services/DirectConnect/Generated/AmazonDirectConnectConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.DirectConnect public partial class AmazonDirectConnectConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("Direct Connect", "4.0.0.0"); private static readonly AmazonDirectConnectEndpointResolver EndpointResolver = new AmazonDirectConnectEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("Direct Connect", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("Direct Connect", "3.7.400.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/DirectConnect/Properties/AssemblyInfo.cs b/sdk/src/Services/DirectConnect/Properties/AssemblyInfo.cs index a03e09bbed69..8deabff1ce31 100644 --- a/sdk/src/Services/DirectConnect/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/DirectConnect/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/DirectoryService/DirectoryService.sln b/sdk/src/Services/DirectoryService/DirectoryService.sln index 11247e96ecfb..b4f3cc1a8201 100644 --- a/sdk/src/Services/DirectoryService/DirectoryService.sln +++ b/sdk/src/Services/DirectoryService/DirectoryService.sln @@ -92,7 +92,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {1C538DF6-8CA6-4E47-B04D-D67C3D3DFA75}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {1C538DF6-8CA6-4E47-B04D-D67C3D3DFA75}.Debug|Any CPU.Build.0 = Debug|Any CPU {1C538DF6-8CA6-4E47-B04D-D67C3D3DFA75}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -113,97 +120,6 @@ Global {99C8D498-BA04-4CC0-B5BF-89F6ED6F6F9A}.Debug|Any CPU.Build.0 = Debug|Any CPU {99C8D498-BA04-4CC0-B5BF-89F6ED6F6F9A}.Release|Any CPU.ActiveCfg = Release|Any CPU {99C8D498-BA04-4CC0-B5BF-89F6ED6F6F9A}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {B760BE54-8A66-4A7F-B0BE-9942953D7DF1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B760BE54-8A66-4A7F-B0BE-9942953D7DF1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B760BE54-8A66-4A7F-B0BE-9942953D7DF1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B760BE54-8A66-4A7F-B0BE-9942953D7DF1}.Release|Any CPU.Build.0 = Release|Any CPU - {4B1CDB32-3E30-48BD-B838-79442A593B2D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4B1CDB32-3E30-48BD-B838-79442A593B2D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4B1CDB32-3E30-48BD-B838-79442A593B2D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4B1CDB32-3E30-48BD-B838-79442A593B2D}.Release|Any CPU.Build.0 = Release|Any CPU - {B5A1906E-2AE4-44FE-A748-3A2E49D09389}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B5A1906E-2AE4-44FE-A748-3A2E49D09389}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B5A1906E-2AE4-44FE-A748-3A2E49D09389}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B5A1906E-2AE4-44FE-A748-3A2E49D09389}.Release|Any CPU.Build.0 = Release|Any CPU - {6E8274DC-D156-4F91-BD6E-30756A8EBF32}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6E8274DC-D156-4F91-BD6E-30756A8EBF32}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6E8274DC-D156-4F91-BD6E-30756A8EBF32}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6E8274DC-D156-4F91-BD6E-30756A8EBF32}.Release|Any CPU.Build.0 = Release|Any CPU - {47FFB489-CF54-4580-8E5B-9630F17040A0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {47FFB489-CF54-4580-8E5B-9630F17040A0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {47FFB489-CF54-4580-8E5B-9630F17040A0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {47FFB489-CF54-4580-8E5B-9630F17040A0}.Release|Any CPU.Build.0 = Release|Any CPU - {29DE54F5-8439-41C0-8138-A44C1E02EF66}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {29DE54F5-8439-41C0-8138-A44C1E02EF66}.Debug|Any CPU.Build.0 = Debug|Any CPU - {29DE54F5-8439-41C0-8138-A44C1E02EF66}.Release|Any CPU.ActiveCfg = Release|Any CPU - {29DE54F5-8439-41C0-8138-A44C1E02EF66}.Release|Any CPU.Build.0 = Release|Any CPU - {0ACA47F4-5A03-4056-8B34-622FF287046A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0ACA47F4-5A03-4056-8B34-622FF287046A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0ACA47F4-5A03-4056-8B34-622FF287046A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0ACA47F4-5A03-4056-8B34-622FF287046A}.Release|Any CPU.Build.0 = Release|Any CPU - {4CBDD5C8-F802-478F-91DA-FFDE21CE6E51}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4CBDD5C8-F802-478F-91DA-FFDE21CE6E51}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4CBDD5C8-F802-478F-91DA-FFDE21CE6E51}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4CBDD5C8-F802-478F-91DA-FFDE21CE6E51}.Release|Any CPU.Build.0 = Release|Any CPU - {32382168-6F67-4FBE-B8BF-586085045F3F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {32382168-6F67-4FBE-B8BF-586085045F3F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {32382168-6F67-4FBE-B8BF-586085045F3F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {32382168-6F67-4FBE-B8BF-586085045F3F}.Release|Any CPU.Build.0 = Release|Any CPU - {ABE2D619-2EAD-4A29-A64E-76A760E9DE96}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {ABE2D619-2EAD-4A29-A64E-76A760E9DE96}.Debug|Any CPU.Build.0 = Debug|Any CPU - {ABE2D619-2EAD-4A29-A64E-76A760E9DE96}.Release|Any CPU.ActiveCfg = Release|Any CPU - {ABE2D619-2EAD-4A29-A64E-76A760E9DE96}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {B760BE54-8A66-4A7F-B0BE-9942953D7DF1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B760BE54-8A66-4A7F-B0BE-9942953D7DF1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B760BE54-8A66-4A7F-B0BE-9942953D7DF1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B760BE54-8A66-4A7F-B0BE-9942953D7DF1}.Release|Any CPU.Build.0 = Release|Any CPU - {4B1CDB32-3E30-48BD-B838-79442A593B2D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4B1CDB32-3E30-48BD-B838-79442A593B2D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4B1CDB32-3E30-48BD-B838-79442A593B2D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4B1CDB32-3E30-48BD-B838-79442A593B2D}.Release|Any CPU.Build.0 = Release|Any CPU - {B5A1906E-2AE4-44FE-A748-3A2E49D09389}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B5A1906E-2AE4-44FE-A748-3A2E49D09389}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B5A1906E-2AE4-44FE-A748-3A2E49D09389}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B5A1906E-2AE4-44FE-A748-3A2E49D09389}.Release|Any CPU.Build.0 = Release|Any CPU - {6E8274DC-D156-4F91-BD6E-30756A8EBF32}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6E8274DC-D156-4F91-BD6E-30756A8EBF32}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6E8274DC-D156-4F91-BD6E-30756A8EBF32}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6E8274DC-D156-4F91-BD6E-30756A8EBF32}.Release|Any CPU.Build.0 = Release|Any CPU - {47FFB489-CF54-4580-8E5B-9630F17040A0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {47FFB489-CF54-4580-8E5B-9630F17040A0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {47FFB489-CF54-4580-8E5B-9630F17040A0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {47FFB489-CF54-4580-8E5B-9630F17040A0}.Release|Any CPU.Build.0 = Release|Any CPU - {29DE54F5-8439-41C0-8138-A44C1E02EF66}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {29DE54F5-8439-41C0-8138-A44C1E02EF66}.Debug|Any CPU.Build.0 = Debug|Any CPU - {29DE54F5-8439-41C0-8138-A44C1E02EF66}.Release|Any CPU.ActiveCfg = Release|Any CPU - {29DE54F5-8439-41C0-8138-A44C1E02EF66}.Release|Any CPU.Build.0 = Release|Any CPU - {0ACA47F4-5A03-4056-8B34-622FF287046A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0ACA47F4-5A03-4056-8B34-622FF287046A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0ACA47F4-5A03-4056-8B34-622FF287046A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0ACA47F4-5A03-4056-8B34-622FF287046A}.Release|Any CPU.Build.0 = Release|Any CPU - {4CBDD5C8-F802-478F-91DA-FFDE21CE6E51}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4CBDD5C8-F802-478F-91DA-FFDE21CE6E51}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4CBDD5C8-F802-478F-91DA-FFDE21CE6E51}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4CBDD5C8-F802-478F-91DA-FFDE21CE6E51}.Release|Any CPU.Build.0 = Release|Any CPU - {32382168-6F67-4FBE-B8BF-586085045F3F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {32382168-6F67-4FBE-B8BF-586085045F3F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {32382168-6F67-4FBE-B8BF-586085045F3F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {32382168-6F67-4FBE-B8BF-586085045F3F}.Release|Any CPU.Build.0 = Release|Any CPU - {ABE2D619-2EAD-4A29-A64E-76A760E9DE96}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {ABE2D619-2EAD-4A29-A64E-76A760E9DE96}.Debug|Any CPU.Build.0 = Debug|Any CPU - {ABE2D619-2EAD-4A29-A64E-76A760E9DE96}.Release|Any CPU.ActiveCfg = Release|Any CPU - {ABE2D619-2EAD-4A29-A64E-76A760E9DE96}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -220,37 +136,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {1C538DF6-8CA6-4E47-B04D-D67C3D3DFA75} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {B4441E4A-8869-49FA-A817-83EA4DD2A10A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {E744D1B7-39C2-4201-8F23-FE478504D8B9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {0F84938A-67DC-4982-A3F9-6369C9E3F940} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {99C8D498-BA04-4CC0-B5BF-89F6ED6F6F9A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {B760BE54-8A66-4A7F-B0BE-9942953D7DF1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4B1CDB32-3E30-48BD-B838-79442A593B2D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B5A1906E-2AE4-44FE-A748-3A2E49D09389} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6E8274DC-D156-4F91-BD6E-30756A8EBF32} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {47FFB489-CF54-4580-8E5B-9630F17040A0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {29DE54F5-8439-41C0-8138-A44C1E02EF66} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0ACA47F4-5A03-4056-8B34-622FF287046A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4CBDD5C8-F802-478F-91DA-FFDE21CE6E51} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {32382168-6F67-4FBE-B8BF-586085045F3F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {ABE2D619-2EAD-4A29-A64E-76A760E9DE96} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B760BE54-8A66-4A7F-B0BE-9942953D7DF1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4B1CDB32-3E30-48BD-B838-79442A593B2D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B5A1906E-2AE4-44FE-A748-3A2E49D09389} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6E8274DC-D156-4F91-BD6E-30756A8EBF32} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {47FFB489-CF54-4580-8E5B-9630F17040A0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {29DE54F5-8439-41C0-8138-A44C1E02EF66} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0ACA47F4-5A03-4056-8B34-622FF287046A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4CBDD5C8-F802-478F-91DA-FFDE21CE6E51} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {32382168-6F67-4FBE-B8BF-586085045F3F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {ABE2D619-2EAD-4A29-A64E-76A760E9DE96} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {AC2015A1-4C6E-46E9-B7FE-234D8D04B660} diff --git a/sdk/src/Services/DirectoryService/Generated/AmazonDirectoryServiceConfig.cs b/sdk/src/Services/DirectoryService/Generated/AmazonDirectoryServiceConfig.cs index fcfdac972059..8ea9d77710bf 100644 --- a/sdk/src/Services/DirectoryService/Generated/AmazonDirectoryServiceConfig.cs +++ b/sdk/src/Services/DirectoryService/Generated/AmazonDirectoryServiceConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.DirectoryService public partial class AmazonDirectoryServiceConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("Directory Service", "4.0.0.0"); private static readonly AmazonDirectoryServiceEndpointResolver EndpointResolver = new AmazonDirectoryServiceEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("Directory Service", "3.7.401.5"); -======= - InternalSDKUtils.BuildUserAgentString("Directory Service", "3.7.401.32"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/DirectoryService/Properties/AssemblyInfo.cs b/sdk/src/Services/DirectoryService/Properties/AssemblyInfo.cs index 7be205006be7..41bc06ecf474 100644 --- a/sdk/src/Services/DirectoryService/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/DirectoryService/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.5")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.32")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/DirectoryServiceData/DirectoryServiceData.sln b/sdk/src/Services/DirectoryServiceData/DirectoryServiceData.sln index 71dca6e51856..9d28b2fc7e18 100644 --- a/sdk/src/Services/DirectoryServiceData/DirectoryServiceData.sln +++ b/sdk/src/Services/DirectoryServiceData/DirectoryServiceData.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {47D9C2A1-64DD-4AE9-8FAA-042CC6026D01}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {47D9C2A1-64DD-4AE9-8FAA-042CC6026D01}.Debug|Any CPU.Build.0 = Debug|Any CPU {47D9C2A1-64DD-4AE9-8FAA-042CC6026D01}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {D8D916AE-6A5B-40A8-9594-A9CAC0D5F1D8}.Debug|Any CPU.Build.0 = Debug|Any CPU {D8D916AE-6A5B-40A8-9594-A9CAC0D5F1D8}.Release|Any CPU.ActiveCfg = Release|Any CPU {D8D916AE-6A5B-40A8-9594-A9CAC0D5F1D8}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {BBCB961A-9C19-46B5-8D07-DDC079D5187D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BBCB961A-9C19-46B5-8D07-DDC079D5187D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BBCB961A-9C19-46B5-8D07-DDC079D5187D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BBCB961A-9C19-46B5-8D07-DDC079D5187D}.Release|Any CPU.Build.0 = Release|Any CPU - {D5ABB3BB-6A20-4B80-A9BB-658D9D96B32F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D5ABB3BB-6A20-4B80-A9BB-658D9D96B32F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D5ABB3BB-6A20-4B80-A9BB-658D9D96B32F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D5ABB3BB-6A20-4B80-A9BB-658D9D96B32F}.Release|Any CPU.Build.0 = Release|Any CPU - {CCA5DCF7-1BC1-49E6-9F17-F0DFC93CE765}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CCA5DCF7-1BC1-49E6-9F17-F0DFC93CE765}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CCA5DCF7-1BC1-49E6-9F17-F0DFC93CE765}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CCA5DCF7-1BC1-49E6-9F17-F0DFC93CE765}.Release|Any CPU.Build.0 = Release|Any CPU - {7A779FEB-88D3-4209-AEB1-2DC42C99CBA7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7A779FEB-88D3-4209-AEB1-2DC42C99CBA7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7A779FEB-88D3-4209-AEB1-2DC42C99CBA7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7A779FEB-88D3-4209-AEB1-2DC42C99CBA7}.Release|Any CPU.Build.0 = Release|Any CPU - {72DAE78D-8D5A-4352-BBD0-4402A0AFD4E9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {72DAE78D-8D5A-4352-BBD0-4402A0AFD4E9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {72DAE78D-8D5A-4352-BBD0-4402A0AFD4E9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {72DAE78D-8D5A-4352-BBD0-4402A0AFD4E9}.Release|Any CPU.Build.0 = Release|Any CPU - {4701D12F-09B7-461E-8292-523AC930E179}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4701D12F-09B7-461E-8292-523AC930E179}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4701D12F-09B7-461E-8292-523AC930E179}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4701D12F-09B7-461E-8292-523AC930E179}.Release|Any CPU.Build.0 = Release|Any CPU - {A3D106F8-7DE7-490F-98A6-A2C4BA259293}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A3D106F8-7DE7-490F-98A6-A2C4BA259293}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A3D106F8-7DE7-490F-98A6-A2C4BA259293}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A3D106F8-7DE7-490F-98A6-A2C4BA259293}.Release|Any CPU.Build.0 = Release|Any CPU - {31063426-B6B8-4EF0-BB96-2A2798E5F153}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {31063426-B6B8-4EF0-BB96-2A2798E5F153}.Debug|Any CPU.Build.0 = Debug|Any CPU - {31063426-B6B8-4EF0-BB96-2A2798E5F153}.Release|Any CPU.ActiveCfg = Release|Any CPU - {31063426-B6B8-4EF0-BB96-2A2798E5F153}.Release|Any CPU.Build.0 = Release|Any CPU - {CAD817A5-84E5-490D-A161-3E716B56D41E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CAD817A5-84E5-490D-A161-3E716B56D41E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CAD817A5-84E5-490D-A161-3E716B56D41E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CAD817A5-84E5-490D-A161-3E716B56D41E}.Release|Any CPU.Build.0 = Release|Any CPU - {E9A064CC-6FAF-4AD3-AE33-7E61FE69A388}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E9A064CC-6FAF-4AD3-AE33-7E61FE69A388}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E9A064CC-6FAF-4AD3-AE33-7E61FE69A388}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E9A064CC-6FAF-4AD3-AE33-7E61FE69A388}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {BBCB961A-9C19-46B5-8D07-DDC079D5187D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BBCB961A-9C19-46B5-8D07-DDC079D5187D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BBCB961A-9C19-46B5-8D07-DDC079D5187D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BBCB961A-9C19-46B5-8D07-DDC079D5187D}.Release|Any CPU.Build.0 = Release|Any CPU - {D5ABB3BB-6A20-4B80-A9BB-658D9D96B32F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D5ABB3BB-6A20-4B80-A9BB-658D9D96B32F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D5ABB3BB-6A20-4B80-A9BB-658D9D96B32F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D5ABB3BB-6A20-4B80-A9BB-658D9D96B32F}.Release|Any CPU.Build.0 = Release|Any CPU - {CCA5DCF7-1BC1-49E6-9F17-F0DFC93CE765}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CCA5DCF7-1BC1-49E6-9F17-F0DFC93CE765}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CCA5DCF7-1BC1-49E6-9F17-F0DFC93CE765}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CCA5DCF7-1BC1-49E6-9F17-F0DFC93CE765}.Release|Any CPU.Build.0 = Release|Any CPU - {7A779FEB-88D3-4209-AEB1-2DC42C99CBA7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7A779FEB-88D3-4209-AEB1-2DC42C99CBA7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7A779FEB-88D3-4209-AEB1-2DC42C99CBA7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7A779FEB-88D3-4209-AEB1-2DC42C99CBA7}.Release|Any CPU.Build.0 = Release|Any CPU - {72DAE78D-8D5A-4352-BBD0-4402A0AFD4E9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {72DAE78D-8D5A-4352-BBD0-4402A0AFD4E9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {72DAE78D-8D5A-4352-BBD0-4402A0AFD4E9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {72DAE78D-8D5A-4352-BBD0-4402A0AFD4E9}.Release|Any CPU.Build.0 = Release|Any CPU - {4701D12F-09B7-461E-8292-523AC930E179}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4701D12F-09B7-461E-8292-523AC930E179}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4701D12F-09B7-461E-8292-523AC930E179}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4701D12F-09B7-461E-8292-523AC930E179}.Release|Any CPU.Build.0 = Release|Any CPU - {A3D106F8-7DE7-490F-98A6-A2C4BA259293}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A3D106F8-7DE7-490F-98A6-A2C4BA259293}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A3D106F8-7DE7-490F-98A6-A2C4BA259293}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A3D106F8-7DE7-490F-98A6-A2C4BA259293}.Release|Any CPU.Build.0 = Release|Any CPU - {31063426-B6B8-4EF0-BB96-2A2798E5F153}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {31063426-B6B8-4EF0-BB96-2A2798E5F153}.Debug|Any CPU.Build.0 = Debug|Any CPU - {31063426-B6B8-4EF0-BB96-2A2798E5F153}.Release|Any CPU.ActiveCfg = Release|Any CPU - {31063426-B6B8-4EF0-BB96-2A2798E5F153}.Release|Any CPU.Build.0 = Release|Any CPU - {CAD817A5-84E5-490D-A161-3E716B56D41E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CAD817A5-84E5-490D-A161-3E716B56D41E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CAD817A5-84E5-490D-A161-3E716B56D41E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CAD817A5-84E5-490D-A161-3E716B56D41E}.Release|Any CPU.Build.0 = Release|Any CPU - {E9A064CC-6FAF-4AD3-AE33-7E61FE69A388}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E9A064CC-6FAF-4AD3-AE33-7E61FE69A388}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E9A064CC-6FAF-4AD3-AE33-7E61FE69A388}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E9A064CC-6FAF-4AD3-AE33-7E61FE69A388}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {47D9C2A1-64DD-4AE9-8FAA-042CC6026D01} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {5E02F619-C56D-4932-BB53-7B975ACD7485} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {EBAF69D6-F789-4E9F-8D33-CA2C2AA5C8CD} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {93D56143-8C6B-4B2E-B156-6896867342B3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {D8D916AE-6A5B-40A8-9594-A9CAC0D5F1D8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {BBCB961A-9C19-46B5-8D07-DDC079D5187D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D5ABB3BB-6A20-4B80-A9BB-658D9D96B32F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {CCA5DCF7-1BC1-49E6-9F17-F0DFC93CE765} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {7A779FEB-88D3-4209-AEB1-2DC42C99CBA7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {72DAE78D-8D5A-4352-BBD0-4402A0AFD4E9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4701D12F-09B7-461E-8292-523AC930E179} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A3D106F8-7DE7-490F-98A6-A2C4BA259293} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {31063426-B6B8-4EF0-BB96-2A2798E5F153} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {CAD817A5-84E5-490D-A161-3E716B56D41E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E9A064CC-6FAF-4AD3-AE33-7E61FE69A388} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {BBCB961A-9C19-46B5-8D07-DDC079D5187D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D5ABB3BB-6A20-4B80-A9BB-658D9D96B32F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {CCA5DCF7-1BC1-49E6-9F17-F0DFC93CE765} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {7A779FEB-88D3-4209-AEB1-2DC42C99CBA7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {72DAE78D-8D5A-4352-BBD0-4402A0AFD4E9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4701D12F-09B7-461E-8292-523AC930E179} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A3D106F8-7DE7-490F-98A6-A2C4BA259293} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {31063426-B6B8-4EF0-BB96-2A2798E5F153} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {CAD817A5-84E5-490D-A161-3E716B56D41E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E9A064CC-6FAF-4AD3-AE33-7E61FE69A388} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {76D87346-9E73-479C-AF84-1CFB19B5E52F} diff --git a/sdk/src/Services/DirectoryServiceData/Generated/AmazonDirectoryServiceDataConfig.cs b/sdk/src/Services/DirectoryServiceData/Generated/AmazonDirectoryServiceDataConfig.cs index ee6331a11424..5c0423811d8d 100644 --- a/sdk/src/Services/DirectoryServiceData/Generated/AmazonDirectoryServiceDataConfig.cs +++ b/sdk/src/Services/DirectoryServiceData/Generated/AmazonDirectoryServiceDataConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.DirectoryServiceData public partial class AmazonDirectoryServiceDataConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("Directory Service Data", "4.0.0.0"); private static readonly AmazonDirectoryServiceDataEndpointResolver EndpointResolver = new AmazonDirectoryServiceDataEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("Directory Service Data", "3.7.400.5"); -======= - InternalSDKUtils.BuildUserAgentString("Directory Service Data", "3.7.400.32"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/DirectoryServiceData/Properties/AssemblyInfo.cs b/sdk/src/Services/DirectoryServiceData/Properties/AssemblyInfo.cs index 2ab3ba3913fd..5e8d291d28ab 100644 --- a/sdk/src/Services/DirectoryServiceData/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/DirectoryServiceData/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.5")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.32")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/DocDB/DocDB.sln b/sdk/src/Services/DocDB/DocDB.sln index c369ad37e761..4d6f0480f029 100644 --- a/sdk/src/Services/DocDB/DocDB.sln +++ b/sdk/src/Services/DocDB/DocDB.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {EC8751E3-2701-4EFA-B908-CF021D586F0E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {EC8751E3-2701-4EFA-B908-CF021D586F0E}.Debug|Any CPU.Build.0 = Debug|Any CPU {EC8751E3-2701-4EFA-B908-CF021D586F0E}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {C0835B80-50EE-4E2B-8F74-D921E0CAEEF9}.Debug|Any CPU.Build.0 = Debug|Any CPU {C0835B80-50EE-4E2B-8F74-D921E0CAEEF9}.Release|Any CPU.ActiveCfg = Release|Any CPU {C0835B80-50EE-4E2B-8F74-D921E0CAEEF9}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {07F56694-EC57-420D-9AFD-BC2C3A804C62}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {07F56694-EC57-420D-9AFD-BC2C3A804C62}.Debug|Any CPU.Build.0 = Debug|Any CPU - {07F56694-EC57-420D-9AFD-BC2C3A804C62}.Release|Any CPU.ActiveCfg = Release|Any CPU - {07F56694-EC57-420D-9AFD-BC2C3A804C62}.Release|Any CPU.Build.0 = Release|Any CPU - {0EBC4F27-5B31-4925-ADA2-00DFD6A47202}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0EBC4F27-5B31-4925-ADA2-00DFD6A47202}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0EBC4F27-5B31-4925-ADA2-00DFD6A47202}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0EBC4F27-5B31-4925-ADA2-00DFD6A47202}.Release|Any CPU.Build.0 = Release|Any CPU - {E15CE334-3E0D-4EEF-A513-95387BC0A1BE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E15CE334-3E0D-4EEF-A513-95387BC0A1BE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E15CE334-3E0D-4EEF-A513-95387BC0A1BE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E15CE334-3E0D-4EEF-A513-95387BC0A1BE}.Release|Any CPU.Build.0 = Release|Any CPU - {E322813C-C210-4F35-825F-D9BB4C3B4957}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E322813C-C210-4F35-825F-D9BB4C3B4957}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E322813C-C210-4F35-825F-D9BB4C3B4957}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E322813C-C210-4F35-825F-D9BB4C3B4957}.Release|Any CPU.Build.0 = Release|Any CPU - {BA6FB96C-A3E9-468F-9B54-5DC8958416DA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BA6FB96C-A3E9-468F-9B54-5DC8958416DA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BA6FB96C-A3E9-468F-9B54-5DC8958416DA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BA6FB96C-A3E9-468F-9B54-5DC8958416DA}.Release|Any CPU.Build.0 = Release|Any CPU - {16152AB8-53E6-4597-8447-73219C8D38C9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {16152AB8-53E6-4597-8447-73219C8D38C9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {16152AB8-53E6-4597-8447-73219C8D38C9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {16152AB8-53E6-4597-8447-73219C8D38C9}.Release|Any CPU.Build.0 = Release|Any CPU - {4F49FDD5-70D4-4F97-B125-0ACE99E6E90B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4F49FDD5-70D4-4F97-B125-0ACE99E6E90B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4F49FDD5-70D4-4F97-B125-0ACE99E6E90B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4F49FDD5-70D4-4F97-B125-0ACE99E6E90B}.Release|Any CPU.Build.0 = Release|Any CPU - {E442A104-626A-4D1C-8C62-636BE65593E3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E442A104-626A-4D1C-8C62-636BE65593E3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E442A104-626A-4D1C-8C62-636BE65593E3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E442A104-626A-4D1C-8C62-636BE65593E3}.Release|Any CPU.Build.0 = Release|Any CPU - {7705BB47-BCBE-40EB-9494-5BB181E7BD23}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7705BB47-BCBE-40EB-9494-5BB181E7BD23}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7705BB47-BCBE-40EB-9494-5BB181E7BD23}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7705BB47-BCBE-40EB-9494-5BB181E7BD23}.Release|Any CPU.Build.0 = Release|Any CPU - {85F0303A-D885-405D-91FA-7203B0B4F22A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {85F0303A-D885-405D-91FA-7203B0B4F22A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {85F0303A-D885-405D-91FA-7203B0B4F22A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {85F0303A-D885-405D-91FA-7203B0B4F22A}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {07F56694-EC57-420D-9AFD-BC2C3A804C62}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {07F56694-EC57-420D-9AFD-BC2C3A804C62}.Debug|Any CPU.Build.0 = Debug|Any CPU - {07F56694-EC57-420D-9AFD-BC2C3A804C62}.Release|Any CPU.ActiveCfg = Release|Any CPU - {07F56694-EC57-420D-9AFD-BC2C3A804C62}.Release|Any CPU.Build.0 = Release|Any CPU - {0EBC4F27-5B31-4925-ADA2-00DFD6A47202}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0EBC4F27-5B31-4925-ADA2-00DFD6A47202}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0EBC4F27-5B31-4925-ADA2-00DFD6A47202}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0EBC4F27-5B31-4925-ADA2-00DFD6A47202}.Release|Any CPU.Build.0 = Release|Any CPU - {E15CE334-3E0D-4EEF-A513-95387BC0A1BE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E15CE334-3E0D-4EEF-A513-95387BC0A1BE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E15CE334-3E0D-4EEF-A513-95387BC0A1BE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E15CE334-3E0D-4EEF-A513-95387BC0A1BE}.Release|Any CPU.Build.0 = Release|Any CPU - {E322813C-C210-4F35-825F-D9BB4C3B4957}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E322813C-C210-4F35-825F-D9BB4C3B4957}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E322813C-C210-4F35-825F-D9BB4C3B4957}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E322813C-C210-4F35-825F-D9BB4C3B4957}.Release|Any CPU.Build.0 = Release|Any CPU - {BA6FB96C-A3E9-468F-9B54-5DC8958416DA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BA6FB96C-A3E9-468F-9B54-5DC8958416DA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BA6FB96C-A3E9-468F-9B54-5DC8958416DA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BA6FB96C-A3E9-468F-9B54-5DC8958416DA}.Release|Any CPU.Build.0 = Release|Any CPU - {16152AB8-53E6-4597-8447-73219C8D38C9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {16152AB8-53E6-4597-8447-73219C8D38C9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {16152AB8-53E6-4597-8447-73219C8D38C9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {16152AB8-53E6-4597-8447-73219C8D38C9}.Release|Any CPU.Build.0 = Release|Any CPU - {4F49FDD5-70D4-4F97-B125-0ACE99E6E90B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4F49FDD5-70D4-4F97-B125-0ACE99E6E90B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4F49FDD5-70D4-4F97-B125-0ACE99E6E90B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4F49FDD5-70D4-4F97-B125-0ACE99E6E90B}.Release|Any CPU.Build.0 = Release|Any CPU - {E442A104-626A-4D1C-8C62-636BE65593E3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E442A104-626A-4D1C-8C62-636BE65593E3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E442A104-626A-4D1C-8C62-636BE65593E3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E442A104-626A-4D1C-8C62-636BE65593E3}.Release|Any CPU.Build.0 = Release|Any CPU - {7705BB47-BCBE-40EB-9494-5BB181E7BD23}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7705BB47-BCBE-40EB-9494-5BB181E7BD23}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7705BB47-BCBE-40EB-9494-5BB181E7BD23}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7705BB47-BCBE-40EB-9494-5BB181E7BD23}.Release|Any CPU.Build.0 = Release|Any CPU - {85F0303A-D885-405D-91FA-7203B0B4F22A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {85F0303A-D885-405D-91FA-7203B0B4F22A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {85F0303A-D885-405D-91FA-7203B0B4F22A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {85F0303A-D885-405D-91FA-7203B0B4F22A}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {EC8751E3-2701-4EFA-B908-CF021D586F0E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {ACD9258B-ACA6-4BCA-A26E-5FB117A50E40} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {C546D3EB-21F6-48EB-B525-96B2ABC4656A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {B093B684-AC29-4F0C-9413-77B1DBDEC053} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {C0835B80-50EE-4E2B-8F74-D921E0CAEEF9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {07F56694-EC57-420D-9AFD-BC2C3A804C62} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0EBC4F27-5B31-4925-ADA2-00DFD6A47202} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E15CE334-3E0D-4EEF-A513-95387BC0A1BE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E322813C-C210-4F35-825F-D9BB4C3B4957} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {BA6FB96C-A3E9-468F-9B54-5DC8958416DA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {16152AB8-53E6-4597-8447-73219C8D38C9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4F49FDD5-70D4-4F97-B125-0ACE99E6E90B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E442A104-626A-4D1C-8C62-636BE65593E3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {7705BB47-BCBE-40EB-9494-5BB181E7BD23} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {85F0303A-D885-405D-91FA-7203B0B4F22A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {07F56694-EC57-420D-9AFD-BC2C3A804C62} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0EBC4F27-5B31-4925-ADA2-00DFD6A47202} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E15CE334-3E0D-4EEF-A513-95387BC0A1BE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E322813C-C210-4F35-825F-D9BB4C3B4957} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {BA6FB96C-A3E9-468F-9B54-5DC8958416DA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {16152AB8-53E6-4597-8447-73219C8D38C9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4F49FDD5-70D4-4F97-B125-0ACE99E6E90B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E442A104-626A-4D1C-8C62-636BE65593E3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {7705BB47-BCBE-40EB-9494-5BB181E7BD23} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {85F0303A-D885-405D-91FA-7203B0B4F22A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {DA031C76-8FCD-41FE-B859-7C3C841ABD6E} diff --git a/sdk/src/Services/DocDB/Generated/AmazonDocDBConfig.cs b/sdk/src/Services/DocDB/Generated/AmazonDocDBConfig.cs index 47422a084999..ef1ca8513d8f 100644 --- a/sdk/src/Services/DocDB/Generated/AmazonDocDBConfig.cs +++ b/sdk/src/Services/DocDB/Generated/AmazonDocDBConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.DocDB public partial class AmazonDocDBConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("DocDB", "4.0.0.0"); private static readonly AmazonDocDBEndpointResolver EndpointResolver = new AmazonDocDBEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("DocDB", "3.7.401.20"); -======= - InternalSDKUtils.BuildUserAgentString("DocDB", "3.7.401.47"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/DocDB/Properties/AssemblyInfo.cs b/sdk/src/Services/DocDB/Properties/AssemblyInfo.cs index 0a96bec167b9..7874584572c3 100644 --- a/sdk/src/Services/DocDB/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/DocDB/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.20")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.47")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/DocDBElastic/DocDBElastic.sln b/sdk/src/Services/DocDBElastic/DocDBElastic.sln index 51ad2cbf999c..53695ae7035f 100644 --- a/sdk/src/Services/DocDBElastic/DocDBElastic.sln +++ b/sdk/src/Services/DocDBElastic/DocDBElastic.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {7BAEDCD4-D05D-4C88-AAEE-F1B8C3E924EA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {7BAEDCD4-D05D-4C88-AAEE-F1B8C3E924EA}.Debug|Any CPU.Build.0 = Debug|Any CPU {7BAEDCD4-D05D-4C88-AAEE-F1B8C3E924EA}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {84C3E720-7B43-422F-9531-DE32D1FBB8DF}.Debug|Any CPU.Build.0 = Debug|Any CPU {84C3E720-7B43-422F-9531-DE32D1FBB8DF}.Release|Any CPU.ActiveCfg = Release|Any CPU {84C3E720-7B43-422F-9531-DE32D1FBB8DF}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {EE15AE0E-4A77-4D05-9007-3328902FA1D6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EE15AE0E-4A77-4D05-9007-3328902FA1D6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EE15AE0E-4A77-4D05-9007-3328902FA1D6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EE15AE0E-4A77-4D05-9007-3328902FA1D6}.Release|Any CPU.Build.0 = Release|Any CPU - {5B28A537-F8F3-42B8-B007-C473BED69778}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5B28A537-F8F3-42B8-B007-C473BED69778}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5B28A537-F8F3-42B8-B007-C473BED69778}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5B28A537-F8F3-42B8-B007-C473BED69778}.Release|Any CPU.Build.0 = Release|Any CPU - {4A92951C-113C-4C0C-B88E-C0BFFDDBDBA1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4A92951C-113C-4C0C-B88E-C0BFFDDBDBA1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4A92951C-113C-4C0C-B88E-C0BFFDDBDBA1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4A92951C-113C-4C0C-B88E-C0BFFDDBDBA1}.Release|Any CPU.Build.0 = Release|Any CPU - {58F0D3B4-BD8B-48FE-B46C-463C7AC55DA7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {58F0D3B4-BD8B-48FE-B46C-463C7AC55DA7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {58F0D3B4-BD8B-48FE-B46C-463C7AC55DA7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {58F0D3B4-BD8B-48FE-B46C-463C7AC55DA7}.Release|Any CPU.Build.0 = Release|Any CPU - {92D40FA8-22B6-4F05-BF93-BDF394DE0C77}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {92D40FA8-22B6-4F05-BF93-BDF394DE0C77}.Debug|Any CPU.Build.0 = Debug|Any CPU - {92D40FA8-22B6-4F05-BF93-BDF394DE0C77}.Release|Any CPU.ActiveCfg = Release|Any CPU - {92D40FA8-22B6-4F05-BF93-BDF394DE0C77}.Release|Any CPU.Build.0 = Release|Any CPU - {AFDACC81-C6E2-43DD-B079-4B0857082F35}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AFDACC81-C6E2-43DD-B079-4B0857082F35}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AFDACC81-C6E2-43DD-B079-4B0857082F35}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AFDACC81-C6E2-43DD-B079-4B0857082F35}.Release|Any CPU.Build.0 = Release|Any CPU - {97D430C3-37EE-4C35-997A-C74677B6353A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {97D430C3-37EE-4C35-997A-C74677B6353A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {97D430C3-37EE-4C35-997A-C74677B6353A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {97D430C3-37EE-4C35-997A-C74677B6353A}.Release|Any CPU.Build.0 = Release|Any CPU - {4397AF05-43DB-4F93-A8C8-40DAB8B53AE8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4397AF05-43DB-4F93-A8C8-40DAB8B53AE8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4397AF05-43DB-4F93-A8C8-40DAB8B53AE8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4397AF05-43DB-4F93-A8C8-40DAB8B53AE8}.Release|Any CPU.Build.0 = Release|Any CPU - {0829C11C-91D4-49E6-A828-F77D592BCFCA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0829C11C-91D4-49E6-A828-F77D592BCFCA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0829C11C-91D4-49E6-A828-F77D592BCFCA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0829C11C-91D4-49E6-A828-F77D592BCFCA}.Release|Any CPU.Build.0 = Release|Any CPU - {F34393D8-559E-4DCB-A677-4C8C99C24AD7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F34393D8-559E-4DCB-A677-4C8C99C24AD7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F34393D8-559E-4DCB-A677-4C8C99C24AD7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F34393D8-559E-4DCB-A677-4C8C99C24AD7}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {EE15AE0E-4A77-4D05-9007-3328902FA1D6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EE15AE0E-4A77-4D05-9007-3328902FA1D6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EE15AE0E-4A77-4D05-9007-3328902FA1D6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EE15AE0E-4A77-4D05-9007-3328902FA1D6}.Release|Any CPU.Build.0 = Release|Any CPU - {5B28A537-F8F3-42B8-B007-C473BED69778}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5B28A537-F8F3-42B8-B007-C473BED69778}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5B28A537-F8F3-42B8-B007-C473BED69778}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5B28A537-F8F3-42B8-B007-C473BED69778}.Release|Any CPU.Build.0 = Release|Any CPU - {4A92951C-113C-4C0C-B88E-C0BFFDDBDBA1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4A92951C-113C-4C0C-B88E-C0BFFDDBDBA1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4A92951C-113C-4C0C-B88E-C0BFFDDBDBA1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4A92951C-113C-4C0C-B88E-C0BFFDDBDBA1}.Release|Any CPU.Build.0 = Release|Any CPU - {58F0D3B4-BD8B-48FE-B46C-463C7AC55DA7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {58F0D3B4-BD8B-48FE-B46C-463C7AC55DA7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {58F0D3B4-BD8B-48FE-B46C-463C7AC55DA7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {58F0D3B4-BD8B-48FE-B46C-463C7AC55DA7}.Release|Any CPU.Build.0 = Release|Any CPU - {92D40FA8-22B6-4F05-BF93-BDF394DE0C77}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {92D40FA8-22B6-4F05-BF93-BDF394DE0C77}.Debug|Any CPU.Build.0 = Debug|Any CPU - {92D40FA8-22B6-4F05-BF93-BDF394DE0C77}.Release|Any CPU.ActiveCfg = Release|Any CPU - {92D40FA8-22B6-4F05-BF93-BDF394DE0C77}.Release|Any CPU.Build.0 = Release|Any CPU - {AFDACC81-C6E2-43DD-B079-4B0857082F35}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AFDACC81-C6E2-43DD-B079-4B0857082F35}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AFDACC81-C6E2-43DD-B079-4B0857082F35}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AFDACC81-C6E2-43DD-B079-4B0857082F35}.Release|Any CPU.Build.0 = Release|Any CPU - {97D430C3-37EE-4C35-997A-C74677B6353A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {97D430C3-37EE-4C35-997A-C74677B6353A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {97D430C3-37EE-4C35-997A-C74677B6353A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {97D430C3-37EE-4C35-997A-C74677B6353A}.Release|Any CPU.Build.0 = Release|Any CPU - {4397AF05-43DB-4F93-A8C8-40DAB8B53AE8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4397AF05-43DB-4F93-A8C8-40DAB8B53AE8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4397AF05-43DB-4F93-A8C8-40DAB8B53AE8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4397AF05-43DB-4F93-A8C8-40DAB8B53AE8}.Release|Any CPU.Build.0 = Release|Any CPU - {0829C11C-91D4-49E6-A828-F77D592BCFCA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0829C11C-91D4-49E6-A828-F77D592BCFCA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0829C11C-91D4-49E6-A828-F77D592BCFCA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0829C11C-91D4-49E6-A828-F77D592BCFCA}.Release|Any CPU.Build.0 = Release|Any CPU - {F34393D8-559E-4DCB-A677-4C8C99C24AD7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F34393D8-559E-4DCB-A677-4C8C99C24AD7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F34393D8-559E-4DCB-A677-4C8C99C24AD7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F34393D8-559E-4DCB-A677-4C8C99C24AD7}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7BAEDCD4-D05D-4C88-AAEE-F1B8C3E924EA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {942808A1-AD44-4476-BFCB-964B025FB9AC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {F6C548AD-55B0-4B52-A24F-EDDFE4793BC4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {48E9E180-4FB2-4C20-BBA2-ED8B75071D17} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {84C3E720-7B43-422F-9531-DE32D1FBB8DF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {EE15AE0E-4A77-4D05-9007-3328902FA1D6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {5B28A537-F8F3-42B8-B007-C473BED69778} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4A92951C-113C-4C0C-B88E-C0BFFDDBDBA1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {58F0D3B4-BD8B-48FE-B46C-463C7AC55DA7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {92D40FA8-22B6-4F05-BF93-BDF394DE0C77} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {AFDACC81-C6E2-43DD-B079-4B0857082F35} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {97D430C3-37EE-4C35-997A-C74677B6353A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4397AF05-43DB-4F93-A8C8-40DAB8B53AE8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0829C11C-91D4-49E6-A828-F77D592BCFCA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F34393D8-559E-4DCB-A677-4C8C99C24AD7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {EE15AE0E-4A77-4D05-9007-3328902FA1D6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {5B28A537-F8F3-42B8-B007-C473BED69778} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4A92951C-113C-4C0C-B88E-C0BFFDDBDBA1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {58F0D3B4-BD8B-48FE-B46C-463C7AC55DA7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {92D40FA8-22B6-4F05-BF93-BDF394DE0C77} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {AFDACC81-C6E2-43DD-B079-4B0857082F35} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {97D430C3-37EE-4C35-997A-C74677B6353A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4397AF05-43DB-4F93-A8C8-40DAB8B53AE8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0829C11C-91D4-49E6-A828-F77D592BCFCA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F34393D8-559E-4DCB-A677-4C8C99C24AD7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {6C103698-6EF1-430B-B0C3-4D26421AB79A} diff --git a/sdk/src/Services/DocDBElastic/Generated/AmazonDocDBElasticConfig.cs b/sdk/src/Services/DocDBElastic/Generated/AmazonDocDBElasticConfig.cs index b3db65758ab5..9205da353284 100644 --- a/sdk/src/Services/DocDBElastic/Generated/AmazonDocDBElasticConfig.cs +++ b/sdk/src/Services/DocDBElastic/Generated/AmazonDocDBElasticConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.DocDBElastic public partial class AmazonDocDBElasticConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("DocDB Elastic", "4.0.0.0"); private static readonly AmazonDocDBElasticEndpointResolver EndpointResolver = new AmazonDocDBElasticEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("DocDB Elastic", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("DocDB Elastic", "3.7.401.8"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/DocDBElastic/Generated/Model/Internal/MarshallTransformations/ApplyPendingMaintenanceActionRequestMarshaller.cs b/sdk/src/Services/DocDBElastic/Generated/Model/Internal/MarshallTransformations/ApplyPendingMaintenanceActionRequestMarshaller.cs index 2928431b1466..bbb075c641ca 100644 --- a/sdk/src/Services/DocDBElastic/Generated/Model/Internal/MarshallTransformations/ApplyPendingMaintenanceActionRequestMarshaller.cs +++ b/sdk/src/Services/DocDBElastic/Generated/Model/Internal/MarshallTransformations/ApplyPendingMaintenanceActionRequestMarshaller.cs @@ -61,39 +61,42 @@ public IRequest Marshall(ApplyPendingMaintenanceActionRequest publicRequest) request.HttpMethod = "POST"; request.ResourcePath = "/pending-action"; - using (StringWriter stringWriter = new StringWriter(CultureInfo.InvariantCulture)) + using (MemoryStream memoryStream = new MemoryStream()) { - JsonWriter writer = new JsonWriter(stringWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetApplyAction()) + using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) { - context.Writer.WritePropertyName("applyAction"); - context.Writer.Write(publicRequest.ApplyAction); - } + JsonWriter writer = new JsonWriter(streamWriter); + writer.Validate = false; + writer.WriteObjectStart(); + var context = new JsonMarshallerContext(request, writer); + if(publicRequest.IsSetApplyAction()) + { + context.Writer.WritePropertyName("applyAction"); + context.Writer.Write(publicRequest.ApplyAction); + } - if(publicRequest.IsSetApplyOn()) - { - context.Writer.WritePropertyName("applyOn"); - context.Writer.Write(publicRequest.ApplyOn); - } + if(publicRequest.IsSetApplyOn()) + { + context.Writer.WritePropertyName("applyOn"); + context.Writer.Write(publicRequest.ApplyOn); + } - if(publicRequest.IsSetOptInType()) - { - context.Writer.WritePropertyName("optInType"); - context.Writer.Write(publicRequest.OptInType); - } + if(publicRequest.IsSetOptInType()) + { + context.Writer.WritePropertyName("optInType"); + context.Writer.Write(publicRequest.OptInType); + } - if(publicRequest.IsSetResourceArn()) - { - context.Writer.WritePropertyName("resourceArn"); - context.Writer.Write(publicRequest.ResourceArn); + if(publicRequest.IsSetResourceArn()) + { + context.Writer.WritePropertyName("resourceArn"); + context.Writer.Write(publicRequest.ResourceArn); + } + + writer.WriteObjectEnd(); } - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); + request.Content = memoryStream.ToArray(); } diff --git a/sdk/src/Services/DocDBElastic/Generated/Model/ListPendingMaintenanceActionsRequest.cs b/sdk/src/Services/DocDBElastic/Generated/Model/ListPendingMaintenanceActionsRequest.cs index 2efbce489c40..0501629bc3f0 100644 --- a/sdk/src/Services/DocDBElastic/Generated/Model/ListPendingMaintenanceActionsRequest.cs +++ b/sdk/src/Services/DocDBElastic/Generated/Model/ListPendingMaintenanceActionsRequest.cs @@ -47,9 +47,9 @@ public partial class ListPendingMaintenanceActionsRequest : AmazonDocDBElasticRe /// /// [AWSProperty(Min=1, Max=100)] - public int MaxResults + public int? MaxResults { - get { return this._maxResults.GetValueOrDefault(); } + get { return this._maxResults; } set { this._maxResults = value; } } diff --git a/sdk/src/Services/DocDBElastic/Generated/Model/_bcl45+netstandard/IListPendingMaintenanceActionsPaginator.cs b/sdk/src/Services/DocDBElastic/Generated/Model/_bcl+netstandard/IListPendingMaintenanceActionsPaginator.cs similarity index 100% rename from sdk/src/Services/DocDBElastic/Generated/Model/_bcl45+netstandard/IListPendingMaintenanceActionsPaginator.cs rename to sdk/src/Services/DocDBElastic/Generated/Model/_bcl+netstandard/IListPendingMaintenanceActionsPaginator.cs diff --git a/sdk/src/Services/DocDBElastic/Generated/Model/_bcl45+netstandard/ListPendingMaintenanceActionsPaginator.cs b/sdk/src/Services/DocDBElastic/Generated/Model/_bcl+netstandard/ListPendingMaintenanceActionsPaginator.cs similarity index 100% rename from sdk/src/Services/DocDBElastic/Generated/Model/_bcl45+netstandard/ListPendingMaintenanceActionsPaginator.cs rename to sdk/src/Services/DocDBElastic/Generated/Model/_bcl+netstandard/ListPendingMaintenanceActionsPaginator.cs diff --git a/sdk/src/Services/DocDBElastic/Generated/_bcl/AmazonDocDBElasticClient.cs b/sdk/src/Services/DocDBElastic/Generated/_bcl/AmazonDocDBElasticClient.cs index 6a177e16b7a3..4b284053a7de 100644 --- a/sdk/src/Services/DocDBElastic/Generated/_bcl/AmazonDocDBElasticClient.cs +++ b/sdk/src/Services/DocDBElastic/Generated/_bcl/AmazonDocDBElasticClient.cs @@ -291,6 +291,83 @@ protected override void Dispose(bool disposing) #endregion + #region ApplyPendingMaintenanceAction + + + /// + /// The type of pending maintenance action to be applied to the resource. + /// + /// Container for the necessary parameters to execute the ApplyPendingMaintenanceAction service method. + /// + /// The response from the ApplyPendingMaintenanceAction service method, as returned by DocDBElastic. + /// + /// An exception that occurs when there are not sufficient permissions to perform an action. + /// + /// + /// There was an access conflict. + /// + /// + /// There was an internal server error. + /// + /// + /// The specified resource could not be located. + /// + /// + /// ThrottlingException will be thrown when request was denied due to request throttling. + /// + /// + /// A structure defining a validation exception. + /// + /// REST API Reference for ApplyPendingMaintenanceAction Operation + public virtual ApplyPendingMaintenanceActionResponse ApplyPendingMaintenanceAction(ApplyPendingMaintenanceActionRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = ApplyPendingMaintenanceActionRequestMarshaller.Instance; + options.ResponseUnmarshaller = ApplyPendingMaintenanceActionResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// The type of pending maintenance action to be applied to the resource. + /// + /// Container for the necessary parameters to execute the ApplyPendingMaintenanceAction service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the ApplyPendingMaintenanceAction service method, as returned by DocDBElastic. + /// + /// An exception that occurs when there are not sufficient permissions to perform an action. + /// + /// + /// There was an access conflict. + /// + /// + /// There was an internal server error. + /// + /// + /// The specified resource could not be located. + /// + /// + /// ThrottlingException will be thrown when request was denied due to request throttling. + /// + /// + /// A structure defining a validation exception. + /// + /// REST API Reference for ApplyPendingMaintenanceAction Operation + public virtual Task ApplyPendingMaintenanceActionAsync(ApplyPendingMaintenanceActionRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = ApplyPendingMaintenanceActionRequestMarshaller.Instance; + options.ResponseUnmarshaller = ApplyPendingMaintenanceActionResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + #region CopyClusterSnapshot @@ -830,6 +907,83 @@ public virtual GetClusterSnapshotResponse GetClusterSnapshot(GetClusterSnapshotR #endregion + #region GetPendingMaintenanceAction + + + /// + /// Retrieves all maintenance actions that are pending. + /// + /// Container for the necessary parameters to execute the GetPendingMaintenanceAction service method. + /// + /// The response from the GetPendingMaintenanceAction service method, as returned by DocDBElastic. + /// + /// An exception that occurs when there are not sufficient permissions to perform an action. + /// + /// + /// There was an access conflict. + /// + /// + /// There was an internal server error. + /// + /// + /// The specified resource could not be located. + /// + /// + /// ThrottlingException will be thrown when request was denied due to request throttling. + /// + /// + /// A structure defining a validation exception. + /// + /// REST API Reference for GetPendingMaintenanceAction Operation + public virtual GetPendingMaintenanceActionResponse GetPendingMaintenanceAction(GetPendingMaintenanceActionRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = GetPendingMaintenanceActionRequestMarshaller.Instance; + options.ResponseUnmarshaller = GetPendingMaintenanceActionResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// Retrieves all maintenance actions that are pending. + /// + /// Container for the necessary parameters to execute the GetPendingMaintenanceAction service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the GetPendingMaintenanceAction service method, as returned by DocDBElastic. + /// + /// An exception that occurs when there are not sufficient permissions to perform an action. + /// + /// + /// There was an access conflict. + /// + /// + /// There was an internal server error. + /// + /// + /// The specified resource could not be located. + /// + /// + /// ThrottlingException will be thrown when request was denied due to request throttling. + /// + /// + /// A structure defining a validation exception. + /// + /// REST API Reference for GetPendingMaintenanceAction Operation + public virtual Task GetPendingMaintenanceActionAsync(GetPendingMaintenanceActionRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = GetPendingMaintenanceActionRequestMarshaller.Instance; + options.ResponseUnmarshaller = GetPendingMaintenanceActionResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + #region ListClusters @@ -960,6 +1114,71 @@ public virtual ListClusterSnapshotsResponse ListClusterSnapshots(ListClusterSnap #endregion + #region ListPendingMaintenanceActions + + + /// + /// Retrieves a list of all maintenance actions that are pending. + /// + /// Container for the necessary parameters to execute the ListPendingMaintenanceActions service method. + /// + /// The response from the ListPendingMaintenanceActions service method, as returned by DocDBElastic. + /// + /// An exception that occurs when there are not sufficient permissions to perform an action. + /// + /// + /// There was an internal server error. + /// + /// + /// ThrottlingException will be thrown when request was denied due to request throttling. + /// + /// + /// A structure defining a validation exception. + /// + /// REST API Reference for ListPendingMaintenanceActions Operation + public virtual ListPendingMaintenanceActionsResponse ListPendingMaintenanceActions(ListPendingMaintenanceActionsRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = ListPendingMaintenanceActionsRequestMarshaller.Instance; + options.ResponseUnmarshaller = ListPendingMaintenanceActionsResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// Retrieves a list of all maintenance actions that are pending. + /// + /// Container for the necessary parameters to execute the ListPendingMaintenanceActions service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the ListPendingMaintenanceActions service method, as returned by DocDBElastic. + /// + /// An exception that occurs when there are not sufficient permissions to perform an action. + /// + /// + /// There was an internal server error. + /// + /// + /// ThrottlingException will be thrown when request was denied due to request throttling. + /// + /// + /// A structure defining a validation exception. + /// + /// REST API Reference for ListPendingMaintenanceActions Operation + public virtual Task ListPendingMaintenanceActionsAsync(ListPendingMaintenanceActionsRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = ListPendingMaintenanceActionsRequestMarshaller.Instance; + options.ResponseUnmarshaller = ListPendingMaintenanceActionsResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + #region ListTagsForResource diff --git a/sdk/src/Services/DocDBElastic/Properties/AssemblyInfo.cs b/sdk/src/Services/DocDBElastic/Properties/AssemblyInfo.cs index 483ffe977a43..1014273b771b 100644 --- a/sdk/src/Services/DocDBElastic/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/DocDBElastic/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.8")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/Drs/Drs.sln b/sdk/src/Services/Drs/Drs.sln index 9aa81cd598cd..eac1c18aa2db 100644 --- a/sdk/src/Services/Drs/Drs.sln +++ b/sdk/src/Services/Drs/Drs.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {0037BFF0-6500-4F40-85F2-58B60B5ED963}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {0037BFF0-6500-4F40-85F2-58B60B5ED963}.Debug|Any CPU.Build.0 = Debug|Any CPU {0037BFF0-6500-4F40-85F2-58B60B5ED963}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {198909B5-3A88-48B5-AC6C-00CC6E79AD83}.Debug|Any CPU.Build.0 = Debug|Any CPU {198909B5-3A88-48B5-AC6C-00CC6E79AD83}.Release|Any CPU.ActiveCfg = Release|Any CPU {198909B5-3A88-48B5-AC6C-00CC6E79AD83}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {509536DF-C761-49EF-A559-6D4610AFCBA8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {509536DF-C761-49EF-A559-6D4610AFCBA8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {509536DF-C761-49EF-A559-6D4610AFCBA8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {509536DF-C761-49EF-A559-6D4610AFCBA8}.Release|Any CPU.Build.0 = Release|Any CPU - {6F26D2D0-E9F6-44F5-846A-3101098E557F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6F26D2D0-E9F6-44F5-846A-3101098E557F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6F26D2D0-E9F6-44F5-846A-3101098E557F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6F26D2D0-E9F6-44F5-846A-3101098E557F}.Release|Any CPU.Build.0 = Release|Any CPU - {F83130B5-B84C-4205-88E9-AAF2E9E454CD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F83130B5-B84C-4205-88E9-AAF2E9E454CD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F83130B5-B84C-4205-88E9-AAF2E9E454CD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F83130B5-B84C-4205-88E9-AAF2E9E454CD}.Release|Any CPU.Build.0 = Release|Any CPU - {8D4EEF51-E9C0-4E9B-8CF3-152F37316757}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8D4EEF51-E9C0-4E9B-8CF3-152F37316757}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8D4EEF51-E9C0-4E9B-8CF3-152F37316757}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8D4EEF51-E9C0-4E9B-8CF3-152F37316757}.Release|Any CPU.Build.0 = Release|Any CPU - {BF1C7D1E-B85D-4059-B99A-F7B00FAD4505}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BF1C7D1E-B85D-4059-B99A-F7B00FAD4505}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BF1C7D1E-B85D-4059-B99A-F7B00FAD4505}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BF1C7D1E-B85D-4059-B99A-F7B00FAD4505}.Release|Any CPU.Build.0 = Release|Any CPU - {597A54F2-A1BB-4AD9-BC54-84DF02BF5976}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {597A54F2-A1BB-4AD9-BC54-84DF02BF5976}.Debug|Any CPU.Build.0 = Debug|Any CPU - {597A54F2-A1BB-4AD9-BC54-84DF02BF5976}.Release|Any CPU.ActiveCfg = Release|Any CPU - {597A54F2-A1BB-4AD9-BC54-84DF02BF5976}.Release|Any CPU.Build.0 = Release|Any CPU - {E6A8AE69-FBF2-43FA-81AC-3A1ED7006633}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E6A8AE69-FBF2-43FA-81AC-3A1ED7006633}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E6A8AE69-FBF2-43FA-81AC-3A1ED7006633}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E6A8AE69-FBF2-43FA-81AC-3A1ED7006633}.Release|Any CPU.Build.0 = Release|Any CPU - {E4EE034C-7E46-446D-8DC1-9CF1084226B0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E4EE034C-7E46-446D-8DC1-9CF1084226B0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E4EE034C-7E46-446D-8DC1-9CF1084226B0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E4EE034C-7E46-446D-8DC1-9CF1084226B0}.Release|Any CPU.Build.0 = Release|Any CPU - {C1805425-02C3-4C15-82C4-068D37CF6B79}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C1805425-02C3-4C15-82C4-068D37CF6B79}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C1805425-02C3-4C15-82C4-068D37CF6B79}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C1805425-02C3-4C15-82C4-068D37CF6B79}.Release|Any CPU.Build.0 = Release|Any CPU - {E673F014-E206-4207-A834-D3C6E00A96BB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E673F014-E206-4207-A834-D3C6E00A96BB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E673F014-E206-4207-A834-D3C6E00A96BB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E673F014-E206-4207-A834-D3C6E00A96BB}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {509536DF-C761-49EF-A559-6D4610AFCBA8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {509536DF-C761-49EF-A559-6D4610AFCBA8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {509536DF-C761-49EF-A559-6D4610AFCBA8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {509536DF-C761-49EF-A559-6D4610AFCBA8}.Release|Any CPU.Build.0 = Release|Any CPU - {6F26D2D0-E9F6-44F5-846A-3101098E557F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6F26D2D0-E9F6-44F5-846A-3101098E557F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6F26D2D0-E9F6-44F5-846A-3101098E557F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6F26D2D0-E9F6-44F5-846A-3101098E557F}.Release|Any CPU.Build.0 = Release|Any CPU - {F83130B5-B84C-4205-88E9-AAF2E9E454CD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F83130B5-B84C-4205-88E9-AAF2E9E454CD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F83130B5-B84C-4205-88E9-AAF2E9E454CD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F83130B5-B84C-4205-88E9-AAF2E9E454CD}.Release|Any CPU.Build.0 = Release|Any CPU - {8D4EEF51-E9C0-4E9B-8CF3-152F37316757}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8D4EEF51-E9C0-4E9B-8CF3-152F37316757}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8D4EEF51-E9C0-4E9B-8CF3-152F37316757}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8D4EEF51-E9C0-4E9B-8CF3-152F37316757}.Release|Any CPU.Build.0 = Release|Any CPU - {BF1C7D1E-B85D-4059-B99A-F7B00FAD4505}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BF1C7D1E-B85D-4059-B99A-F7B00FAD4505}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BF1C7D1E-B85D-4059-B99A-F7B00FAD4505}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BF1C7D1E-B85D-4059-B99A-F7B00FAD4505}.Release|Any CPU.Build.0 = Release|Any CPU - {597A54F2-A1BB-4AD9-BC54-84DF02BF5976}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {597A54F2-A1BB-4AD9-BC54-84DF02BF5976}.Debug|Any CPU.Build.0 = Debug|Any CPU - {597A54F2-A1BB-4AD9-BC54-84DF02BF5976}.Release|Any CPU.ActiveCfg = Release|Any CPU - {597A54F2-A1BB-4AD9-BC54-84DF02BF5976}.Release|Any CPU.Build.0 = Release|Any CPU - {E6A8AE69-FBF2-43FA-81AC-3A1ED7006633}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E6A8AE69-FBF2-43FA-81AC-3A1ED7006633}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E6A8AE69-FBF2-43FA-81AC-3A1ED7006633}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E6A8AE69-FBF2-43FA-81AC-3A1ED7006633}.Release|Any CPU.Build.0 = Release|Any CPU - {E4EE034C-7E46-446D-8DC1-9CF1084226B0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E4EE034C-7E46-446D-8DC1-9CF1084226B0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E4EE034C-7E46-446D-8DC1-9CF1084226B0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E4EE034C-7E46-446D-8DC1-9CF1084226B0}.Release|Any CPU.Build.0 = Release|Any CPU - {C1805425-02C3-4C15-82C4-068D37CF6B79}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C1805425-02C3-4C15-82C4-068D37CF6B79}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C1805425-02C3-4C15-82C4-068D37CF6B79}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C1805425-02C3-4C15-82C4-068D37CF6B79}.Release|Any CPU.Build.0 = Release|Any CPU - {E673F014-E206-4207-A834-D3C6E00A96BB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E673F014-E206-4207-A834-D3C6E00A96BB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E673F014-E206-4207-A834-D3C6E00A96BB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E673F014-E206-4207-A834-D3C6E00A96BB}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {0037BFF0-6500-4F40-85F2-58B60B5ED963} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {BB834E3E-5ACD-4404-A134-3E192FFE420B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {74B43874-586B-49D6-849D-6D4BBA9551C2} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {28FDE333-BA86-441A-94A6-03354F25CA59} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {198909B5-3A88-48B5-AC6C-00CC6E79AD83} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {509536DF-C761-49EF-A559-6D4610AFCBA8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6F26D2D0-E9F6-44F5-846A-3101098E557F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F83130B5-B84C-4205-88E9-AAF2E9E454CD} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8D4EEF51-E9C0-4E9B-8CF3-152F37316757} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {BF1C7D1E-B85D-4059-B99A-F7B00FAD4505} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {597A54F2-A1BB-4AD9-BC54-84DF02BF5976} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E6A8AE69-FBF2-43FA-81AC-3A1ED7006633} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E4EE034C-7E46-446D-8DC1-9CF1084226B0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C1805425-02C3-4C15-82C4-068D37CF6B79} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E673F014-E206-4207-A834-D3C6E00A96BB} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {509536DF-C761-49EF-A559-6D4610AFCBA8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6F26D2D0-E9F6-44F5-846A-3101098E557F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F83130B5-B84C-4205-88E9-AAF2E9E454CD} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8D4EEF51-E9C0-4E9B-8CF3-152F37316757} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {BF1C7D1E-B85D-4059-B99A-F7B00FAD4505} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {597A54F2-A1BB-4AD9-BC54-84DF02BF5976} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E6A8AE69-FBF2-43FA-81AC-3A1ED7006633} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E4EE034C-7E46-446D-8DC1-9CF1084226B0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C1805425-02C3-4C15-82C4-068D37CF6B79} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E673F014-E206-4207-A834-D3C6E00A96BB} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {91E1FC97-C95B-470D-9F2C-414E44FD436F} diff --git a/sdk/src/Services/Drs/Generated/AmazonDrsConfig.cs b/sdk/src/Services/Drs/Generated/AmazonDrsConfig.cs index 0f2f4ca46ecd..ae2287eab0d5 100644 --- a/sdk/src/Services/Drs/Generated/AmazonDrsConfig.cs +++ b/sdk/src/Services/Drs/Generated/AmazonDrsConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.Drs public partial class AmazonDrsConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("drs", "4.0.0.0"); private static readonly AmazonDrsEndpointResolver EndpointResolver = new AmazonDrsEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("drs", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("drs", "3.7.400.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/Drs/Properties/AssemblyInfo.cs b/sdk/src/Services/Drs/Properties/AssemblyInfo.cs index 091e2d75f4ff..9179a0e6c4e1 100644 --- a/sdk/src/Services/Drs/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/Drs/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/DynamoDBStreams/DynamoDBStreams.sln b/sdk/src/Services/DynamoDBStreams/DynamoDBStreams.sln index 3319e01416aa..3fe19299b84a 100644 --- a/sdk/src/Services/DynamoDBStreams/DynamoDBStreams.sln +++ b/sdk/src/Services/DynamoDBStreams/DynamoDBStreams.sln @@ -30,6 +30,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.IntegrationTestUtili EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.CommonTest", "../../../test/Common/AWSSDK.CommonTest.csproj", "{66F78F86-68D7-4538-8EA5-A669A08E1C19}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.CommonTest.NetStandard", "../../../test/NetStandard/Common/AWSSDK.CommonTest.NetStandard.csproj", "{87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UnitTests.NetStandard.CoreOnly", "../../../test/NetStandard/UnitTests/UnitTests.NetStandard.CoreOnly.csproj", "{B969DE99-0634-4989-A318-086AE1699974}" +EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "IntegrationTestDependencies", "IntegrationTestDependencies", "{939EC5C2-8345-43E2-8F97-72EEEBEEA0AC}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.Extensions.CrtIntegration.NetFramework", "../../../../extensions/src/AWSSDK.Extensions.CrtIntegration/AWSSDK.Extensions.CrtIntegration.NetFramework.csproj", "{1C5161B4-FA0E-4E47-9AA8-D0D6868740F8}" @@ -88,6 +92,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {1C5161B4-FA0E-4E47-9AA8-D0D6868740F8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {1C5161B4-FA0E-4E47-9AA8-D0D6868740F8}.Debug|Any CPU.Build.0 = Debug|Any CPU {1C5161B4-FA0E-4E47-9AA8-D0D6868740F8}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -124,6 +136,8 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {1C5161B4-FA0E-4E47-9AA8-D0D6868740F8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {FCEAB511-D065-474C-A91E-ECB903DAEB63} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {90CD99EA-8F1F-4C22-97C5-E7D4A32DF7BA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} diff --git a/sdk/src/Services/DynamoDBv2/DynamoDBv2.sln b/sdk/src/Services/DynamoDBv2/DynamoDBv2.sln index 899677054a67..48a624e3b670 100644 --- a/sdk/src/Services/DynamoDBv2/DynamoDBv2.sln +++ b/sdk/src/Services/DynamoDBv2/DynamoDBv2.sln @@ -92,7 +92,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {F05CE6FA-2200-4AD6-B235-3282C082C87B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {F05CE6FA-2200-4AD6-B235-3282C082C87B}.Debug|Any CPU.Build.0 = Debug|Any CPU {F05CE6FA-2200-4AD6-B235-3282C082C87B}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -113,97 +120,6 @@ Global {938FEF02-6B7E-46DB-8ABE-39A56A4052C6}.Debug|Any CPU.Build.0 = Debug|Any CPU {938FEF02-6B7E-46DB-8ABE-39A56A4052C6}.Release|Any CPU.ActiveCfg = Release|Any CPU {938FEF02-6B7E-46DB-8ABE-39A56A4052C6}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {B15DDC00-F302-4A30-80E3-F866D059FE55}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B15DDC00-F302-4A30-80E3-F866D059FE55}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B15DDC00-F302-4A30-80E3-F866D059FE55}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B15DDC00-F302-4A30-80E3-F866D059FE55}.Release|Any CPU.Build.0 = Release|Any CPU - {D04FAD66-5C0C-44C7-AD16-97B7BDAE4715}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D04FAD66-5C0C-44C7-AD16-97B7BDAE4715}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D04FAD66-5C0C-44C7-AD16-97B7BDAE4715}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D04FAD66-5C0C-44C7-AD16-97B7BDAE4715}.Release|Any CPU.Build.0 = Release|Any CPU - {8082160D-96FD-4C05-A17B-A3C13486B1A9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8082160D-96FD-4C05-A17B-A3C13486B1A9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8082160D-96FD-4C05-A17B-A3C13486B1A9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8082160D-96FD-4C05-A17B-A3C13486B1A9}.Release|Any CPU.Build.0 = Release|Any CPU - {358EA53B-D459-445F-81C2-F11B8673870D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {358EA53B-D459-445F-81C2-F11B8673870D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {358EA53B-D459-445F-81C2-F11B8673870D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {358EA53B-D459-445F-81C2-F11B8673870D}.Release|Any CPU.Build.0 = Release|Any CPU - {0984752C-125C-4ADF-9E50-CB513469858E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0984752C-125C-4ADF-9E50-CB513469858E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0984752C-125C-4ADF-9E50-CB513469858E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0984752C-125C-4ADF-9E50-CB513469858E}.Release|Any CPU.Build.0 = Release|Any CPU - {5F287DBB-8741-4CD1-8238-68DC95AFC22A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5F287DBB-8741-4CD1-8238-68DC95AFC22A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5F287DBB-8741-4CD1-8238-68DC95AFC22A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5F287DBB-8741-4CD1-8238-68DC95AFC22A}.Release|Any CPU.Build.0 = Release|Any CPU - {35C79C8C-D69A-4765-94EE-5C205E310035}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {35C79C8C-D69A-4765-94EE-5C205E310035}.Debug|Any CPU.Build.0 = Debug|Any CPU - {35C79C8C-D69A-4765-94EE-5C205E310035}.Release|Any CPU.ActiveCfg = Release|Any CPU - {35C79C8C-D69A-4765-94EE-5C205E310035}.Release|Any CPU.Build.0 = Release|Any CPU - {76A0BE3B-C788-4A62-B1A8-5C1B4FC4854F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {76A0BE3B-C788-4A62-B1A8-5C1B4FC4854F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {76A0BE3B-C788-4A62-B1A8-5C1B4FC4854F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {76A0BE3B-C788-4A62-B1A8-5C1B4FC4854F}.Release|Any CPU.Build.0 = Release|Any CPU - {264D60C2-E0CD-4B82-B1BD-0A2D23473BD7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {264D60C2-E0CD-4B82-B1BD-0A2D23473BD7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {264D60C2-E0CD-4B82-B1BD-0A2D23473BD7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {264D60C2-E0CD-4B82-B1BD-0A2D23473BD7}.Release|Any CPU.Build.0 = Release|Any CPU - {316FE050-A13C-4767-A452-8157D7C3D9BD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {316FE050-A13C-4767-A452-8157D7C3D9BD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {316FE050-A13C-4767-A452-8157D7C3D9BD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {316FE050-A13C-4767-A452-8157D7C3D9BD}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {B15DDC00-F302-4A30-80E3-F866D059FE55}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B15DDC00-F302-4A30-80E3-F866D059FE55}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B15DDC00-F302-4A30-80E3-F866D059FE55}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B15DDC00-F302-4A30-80E3-F866D059FE55}.Release|Any CPU.Build.0 = Release|Any CPU - {D04FAD66-5C0C-44C7-AD16-97B7BDAE4715}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D04FAD66-5C0C-44C7-AD16-97B7BDAE4715}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D04FAD66-5C0C-44C7-AD16-97B7BDAE4715}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D04FAD66-5C0C-44C7-AD16-97B7BDAE4715}.Release|Any CPU.Build.0 = Release|Any CPU - {8082160D-96FD-4C05-A17B-A3C13486B1A9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8082160D-96FD-4C05-A17B-A3C13486B1A9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8082160D-96FD-4C05-A17B-A3C13486B1A9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8082160D-96FD-4C05-A17B-A3C13486B1A9}.Release|Any CPU.Build.0 = Release|Any CPU - {358EA53B-D459-445F-81C2-F11B8673870D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {358EA53B-D459-445F-81C2-F11B8673870D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {358EA53B-D459-445F-81C2-F11B8673870D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {358EA53B-D459-445F-81C2-F11B8673870D}.Release|Any CPU.Build.0 = Release|Any CPU - {0984752C-125C-4ADF-9E50-CB513469858E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0984752C-125C-4ADF-9E50-CB513469858E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0984752C-125C-4ADF-9E50-CB513469858E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0984752C-125C-4ADF-9E50-CB513469858E}.Release|Any CPU.Build.0 = Release|Any CPU - {5F287DBB-8741-4CD1-8238-68DC95AFC22A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5F287DBB-8741-4CD1-8238-68DC95AFC22A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5F287DBB-8741-4CD1-8238-68DC95AFC22A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5F287DBB-8741-4CD1-8238-68DC95AFC22A}.Release|Any CPU.Build.0 = Release|Any CPU - {35C79C8C-D69A-4765-94EE-5C205E310035}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {35C79C8C-D69A-4765-94EE-5C205E310035}.Debug|Any CPU.Build.0 = Debug|Any CPU - {35C79C8C-D69A-4765-94EE-5C205E310035}.Release|Any CPU.ActiveCfg = Release|Any CPU - {35C79C8C-D69A-4765-94EE-5C205E310035}.Release|Any CPU.Build.0 = Release|Any CPU - {76A0BE3B-C788-4A62-B1A8-5C1B4FC4854F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {76A0BE3B-C788-4A62-B1A8-5C1B4FC4854F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {76A0BE3B-C788-4A62-B1A8-5C1B4FC4854F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {76A0BE3B-C788-4A62-B1A8-5C1B4FC4854F}.Release|Any CPU.Build.0 = Release|Any CPU - {264D60C2-E0CD-4B82-B1BD-0A2D23473BD7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {264D60C2-E0CD-4B82-B1BD-0A2D23473BD7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {264D60C2-E0CD-4B82-B1BD-0A2D23473BD7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {264D60C2-E0CD-4B82-B1BD-0A2D23473BD7}.Release|Any CPU.Build.0 = Release|Any CPU - {316FE050-A13C-4767-A452-8157D7C3D9BD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {316FE050-A13C-4767-A452-8157D7C3D9BD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {316FE050-A13C-4767-A452-8157D7C3D9BD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {316FE050-A13C-4767-A452-8157D7C3D9BD}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -220,37 +136,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {F05CE6FA-2200-4AD6-B235-3282C082C87B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {0E3A04EB-72BA-417C-9711-82833775C88D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {0D0DCE79-4BE3-4DE4-ABA1-B69A7B0380FA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {E7C4B0F7-A097-4715-AA2F-1FB6FE427E3F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {938FEF02-6B7E-46DB-8ABE-39A56A4052C6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {B15DDC00-F302-4A30-80E3-F866D059FE55} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D04FAD66-5C0C-44C7-AD16-97B7BDAE4715} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8082160D-96FD-4C05-A17B-A3C13486B1A9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {358EA53B-D459-445F-81C2-F11B8673870D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0984752C-125C-4ADF-9E50-CB513469858E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {5F287DBB-8741-4CD1-8238-68DC95AFC22A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {35C79C8C-D69A-4765-94EE-5C205E310035} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {76A0BE3B-C788-4A62-B1A8-5C1B4FC4854F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {264D60C2-E0CD-4B82-B1BD-0A2D23473BD7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {316FE050-A13C-4767-A452-8157D7C3D9BD} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B15DDC00-F302-4A30-80E3-F866D059FE55} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D04FAD66-5C0C-44C7-AD16-97B7BDAE4715} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8082160D-96FD-4C05-A17B-A3C13486B1A9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {358EA53B-D459-445F-81C2-F11B8673870D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0984752C-125C-4ADF-9E50-CB513469858E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {5F287DBB-8741-4CD1-8238-68DC95AFC22A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {35C79C8C-D69A-4765-94EE-5C205E310035} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {76A0BE3B-C788-4A62-B1A8-5C1B4FC4854F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {264D60C2-E0CD-4B82-B1BD-0A2D23473BD7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {316FE050-A13C-4767-A452-8157D7C3D9BD} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {7C82480B-D645-4E3A-B4AD-650183206F4D} diff --git a/sdk/src/Services/DynamoDBv2/Generated/AmazonDynamoDBConfig.cs b/sdk/src/Services/DynamoDBv2/Generated/AmazonDynamoDBConfig.cs index 2eaf2c47a42a..30deed75d69d 100644 --- a/sdk/src/Services/DynamoDBv2/Generated/AmazonDynamoDBConfig.cs +++ b/sdk/src/Services/DynamoDBv2/Generated/AmazonDynamoDBConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.DynamoDBv2 public partial class AmazonDynamoDBConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("DynamoDB", "4.0.0.0"); private static readonly AmazonDynamoDBEndpointResolver EndpointResolver = new AmazonDynamoDBEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("DynamoDB", "3.7.401.4"); -======= - InternalSDKUtils.BuildUserAgentString("DynamoDB", "3.7.403.3"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/DynamoDBv2/Generated/Model/GlobalSecondaryIndexWarmThroughputDescription.cs b/sdk/src/Services/DynamoDBv2/Generated/Model/GlobalSecondaryIndexWarmThroughputDescription.cs index cc461c433901..22287640fc5a 100644 --- a/sdk/src/Services/DynamoDBv2/Generated/Model/GlobalSecondaryIndexWarmThroughputDescription.cs +++ b/sdk/src/Services/DynamoDBv2/Generated/Model/GlobalSecondaryIndexWarmThroughputDescription.cs @@ -45,9 +45,9 @@ public partial class GlobalSecondaryIndexWarmThroughputDescription /// /// [AWSProperty(Min=1)] - public long ReadUnitsPerSecond + public long? ReadUnitsPerSecond { - get { return this._readUnitsPerSecond.GetValueOrDefault(); } + get { return this._readUnitsPerSecond; } set { this._readUnitsPerSecond = value; } } @@ -83,9 +83,9 @@ internal bool IsSetStatus() /// /// [AWSProperty(Min=1)] - public long WriteUnitsPerSecond + public long? WriteUnitsPerSecond { - get { return this._writeUnitsPerSecond.GetValueOrDefault(); } + get { return this._writeUnitsPerSecond; } set { this._writeUnitsPerSecond = value; } } diff --git a/sdk/src/Services/DynamoDBv2/Generated/Model/Internal/MarshallTransformations/CreateTableRequestMarshaller.cs b/sdk/src/Services/DynamoDBv2/Generated/Model/Internal/MarshallTransformations/CreateTableRequestMarshaller.cs index 9e45e75ab3fc..cc49b526e0c0 100644 --- a/sdk/src/Services/DynamoDBv2/Generated/Model/Internal/MarshallTransformations/CreateTableRequestMarshaller.cs +++ b/sdk/src/Services/DynamoDBv2/Generated/Model/Internal/MarshallTransformations/CreateTableRequestMarshaller.cs @@ -225,31 +225,21 @@ public IRequest Marshall(CreateTableRequest publicRequest) context.Writer.WriteArrayEnd(); } - writer.WriteObjectEnd(); - } + if(publicRequest.IsSetWarmThroughput()) + { + context.Writer.WritePropertyName("WarmThroughput"); + context.Writer.WriteObjectStart(); -<<<<<<< HEAD - request.Content = memoryStream.ToArray(); -||||||| Commit version number update changes - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); -======= - if(publicRequest.IsSetWarmThroughput()) - { - context.Writer.WritePropertyName("WarmThroughput"); - context.Writer.WriteObjectStart(); + var marshaller = WarmThroughputMarshaller.Instance; + marshaller.Marshall(publicRequest.WarmThroughput, context); - var marshaller = WarmThroughputMarshaller.Instance; - marshaller.Marshall(publicRequest.WarmThroughput, context); + context.Writer.WriteObjectEnd(); + } - context.Writer.WriteObjectEnd(); + writer.WriteObjectEnd(); } - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b + request.Content = memoryStream.ToArray(); } diff --git a/sdk/src/Services/DynamoDBv2/Generated/Model/Internal/MarshallTransformations/GlobalSecondaryIndexWarmThroughputDescriptionUnmarshaller.cs b/sdk/src/Services/DynamoDBv2/Generated/Model/Internal/MarshallTransformations/GlobalSecondaryIndexWarmThroughputDescriptionUnmarshaller.cs index 872628410fba..c071a40376fe 100644 --- a/sdk/src/Services/DynamoDBv2/Generated/Model/Internal/MarshallTransformations/GlobalSecondaryIndexWarmThroughputDescriptionUnmarshaller.cs +++ b/sdk/src/Services/DynamoDBv2/Generated/Model/Internal/MarshallTransformations/GlobalSecondaryIndexWarmThroughputDescriptionUnmarshaller.cs @@ -68,7 +68,7 @@ public GlobalSecondaryIndexWarmThroughputDescription Unmarshall(JsonUnmarshaller { if (context.TestExpression("ReadUnitsPerSecond", targetDepth)) { - var unmarshaller = LongUnmarshaller.Instance; + var unmarshaller = NullableLongUnmarshaller.Instance; unmarshalledObject.ReadUnitsPerSecond = unmarshaller.Unmarshall(context); continue; } @@ -80,7 +80,7 @@ public GlobalSecondaryIndexWarmThroughputDescription Unmarshall(JsonUnmarshaller } if (context.TestExpression("WriteUnitsPerSecond", targetDepth)) { - var unmarshaller = LongUnmarshaller.Instance; + var unmarshaller = NullableLongUnmarshaller.Instance; unmarshalledObject.WriteUnitsPerSecond = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/DynamoDBv2/Generated/Model/Internal/MarshallTransformations/TableWarmThroughputDescriptionUnmarshaller.cs b/sdk/src/Services/DynamoDBv2/Generated/Model/Internal/MarshallTransformations/TableWarmThroughputDescriptionUnmarshaller.cs index 49d23c01976f..ea8f7ce79da6 100644 --- a/sdk/src/Services/DynamoDBv2/Generated/Model/Internal/MarshallTransformations/TableWarmThroughputDescriptionUnmarshaller.cs +++ b/sdk/src/Services/DynamoDBv2/Generated/Model/Internal/MarshallTransformations/TableWarmThroughputDescriptionUnmarshaller.cs @@ -68,7 +68,7 @@ public TableWarmThroughputDescription Unmarshall(JsonUnmarshallerContext context { if (context.TestExpression("ReadUnitsPerSecond", targetDepth)) { - var unmarshaller = LongUnmarshaller.Instance; + var unmarshaller = NullableLongUnmarshaller.Instance; unmarshalledObject.ReadUnitsPerSecond = unmarshaller.Unmarshall(context); continue; } @@ -80,7 +80,7 @@ public TableWarmThroughputDescription Unmarshall(JsonUnmarshallerContext context } if (context.TestExpression("WriteUnitsPerSecond", targetDepth)) { - var unmarshaller = LongUnmarshaller.Instance; + var unmarshaller = NullableLongUnmarshaller.Instance; unmarshalledObject.WriteUnitsPerSecond = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/DynamoDBv2/Generated/Model/Internal/MarshallTransformations/UpdateTableRequestMarshaller.cs b/sdk/src/Services/DynamoDBv2/Generated/Model/Internal/MarshallTransformations/UpdateTableRequestMarshaller.cs index f421563ad54c..68b3a6760dde 100644 --- a/sdk/src/Services/DynamoDBv2/Generated/Model/Internal/MarshallTransformations/UpdateTableRequestMarshaller.cs +++ b/sdk/src/Services/DynamoDBv2/Generated/Model/Internal/MarshallTransformations/UpdateTableRequestMarshaller.cs @@ -187,31 +187,21 @@ public IRequest Marshall(UpdateTableRequest publicRequest) context.Writer.Write(publicRequest.TableName); } - writer.WriteObjectEnd(); - } + if(publicRequest.IsSetWarmThroughput()) + { + context.Writer.WritePropertyName("WarmThroughput"); + context.Writer.WriteObjectStart(); -<<<<<<< HEAD - request.Content = memoryStream.ToArray(); -||||||| Commit version number update changes - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); -======= - if(publicRequest.IsSetWarmThroughput()) - { - context.Writer.WritePropertyName("WarmThroughput"); - context.Writer.WriteObjectStart(); + var marshaller = WarmThroughputMarshaller.Instance; + marshaller.Marshall(publicRequest.WarmThroughput, context); - var marshaller = WarmThroughputMarshaller.Instance; - marshaller.Marshall(publicRequest.WarmThroughput, context); + context.Writer.WriteObjectEnd(); + } - context.Writer.WriteObjectEnd(); + writer.WriteObjectEnd(); } - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b + request.Content = memoryStream.ToArray(); } diff --git a/sdk/src/Services/DynamoDBv2/Generated/Model/Internal/MarshallTransformations/WarmThroughputMarshaller.cs b/sdk/src/Services/DynamoDBv2/Generated/Model/Internal/MarshallTransformations/WarmThroughputMarshaller.cs index 924af3b426a9..6c5f9220e065 100644 --- a/sdk/src/Services/DynamoDBv2/Generated/Model/Internal/MarshallTransformations/WarmThroughputMarshaller.cs +++ b/sdk/src/Services/DynamoDBv2/Generated/Model/Internal/MarshallTransformations/WarmThroughputMarshaller.cs @@ -51,13 +51,13 @@ public void Marshall(WarmThroughput requestObject, JsonMarshallerContext context if(requestObject.IsSetReadUnitsPerSecond()) { context.Writer.WritePropertyName("ReadUnitsPerSecond"); - context.Writer.Write(requestObject.ReadUnitsPerSecond); + context.Writer.Write(requestObject.ReadUnitsPerSecond.Value); } if(requestObject.IsSetWriteUnitsPerSecond()) { context.Writer.WritePropertyName("WriteUnitsPerSecond"); - context.Writer.Write(requestObject.WriteUnitsPerSecond); + context.Writer.Write(requestObject.WriteUnitsPerSecond.Value); } } diff --git a/sdk/src/Services/DynamoDBv2/Generated/Model/Internal/MarshallTransformations/WarmThroughputUnmarshaller.cs b/sdk/src/Services/DynamoDBv2/Generated/Model/Internal/MarshallTransformations/WarmThroughputUnmarshaller.cs index 1e533613db54..a96651dba5c5 100644 --- a/sdk/src/Services/DynamoDBv2/Generated/Model/Internal/MarshallTransformations/WarmThroughputUnmarshaller.cs +++ b/sdk/src/Services/DynamoDBv2/Generated/Model/Internal/MarshallTransformations/WarmThroughputUnmarshaller.cs @@ -68,13 +68,13 @@ public WarmThroughput Unmarshall(JsonUnmarshallerContext context) { if (context.TestExpression("ReadUnitsPerSecond", targetDepth)) { - var unmarshaller = LongUnmarshaller.Instance; + var unmarshaller = NullableLongUnmarshaller.Instance; unmarshalledObject.ReadUnitsPerSecond = unmarshaller.Unmarshall(context); continue; } if (context.TestExpression("WriteUnitsPerSecond", targetDepth)) { - var unmarshaller = LongUnmarshaller.Instance; + var unmarshaller = NullableLongUnmarshaller.Instance; unmarshalledObject.WriteUnitsPerSecond = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/DynamoDBv2/Generated/Model/TableWarmThroughputDescription.cs b/sdk/src/Services/DynamoDBv2/Generated/Model/TableWarmThroughputDescription.cs index 6e9078b997de..a2da8cb08dba 100644 --- a/sdk/src/Services/DynamoDBv2/Generated/Model/TableWarmThroughputDescription.cs +++ b/sdk/src/Services/DynamoDBv2/Generated/Model/TableWarmThroughputDescription.cs @@ -46,9 +46,9 @@ public partial class TableWarmThroughputDescription /// /// [AWSProperty(Min=1)] - public long ReadUnitsPerSecond + public long? ReadUnitsPerSecond { - get { return this._readUnitsPerSecond.GetValueOrDefault(); } + get { return this._readUnitsPerSecond; } set { this._readUnitsPerSecond = value; } } @@ -83,9 +83,9 @@ internal bool IsSetStatus() /// /// [AWSProperty(Min=1)] - public long WriteUnitsPerSecond + public long? WriteUnitsPerSecond { - get { return this._writeUnitsPerSecond.GetValueOrDefault(); } + get { return this._writeUnitsPerSecond; } set { this._writeUnitsPerSecond = value; } } diff --git a/sdk/src/Services/DynamoDBv2/Generated/Model/WarmThroughput.cs b/sdk/src/Services/DynamoDBv2/Generated/Model/WarmThroughput.cs index 270997423edd..5edee75403b7 100644 --- a/sdk/src/Services/DynamoDBv2/Generated/Model/WarmThroughput.cs +++ b/sdk/src/Services/DynamoDBv2/Generated/Model/WarmThroughput.cs @@ -45,9 +45,9 @@ public partial class WarmThroughput /// Represents the number of read operations your base table can instantaneously support. /// /// - public long ReadUnitsPerSecond + public long? ReadUnitsPerSecond { - get { return this._readUnitsPerSecond.GetValueOrDefault(); } + get { return this._readUnitsPerSecond; } set { this._readUnitsPerSecond = value; } } @@ -63,9 +63,9 @@ internal bool IsSetReadUnitsPerSecond() /// Represents the number of write operations your base table can instantaneously support. /// /// - public long WriteUnitsPerSecond + public long? WriteUnitsPerSecond { - get { return this._writeUnitsPerSecond.GetValueOrDefault(); } + get { return this._writeUnitsPerSecond; } set { this._writeUnitsPerSecond = value; } } diff --git a/sdk/src/Services/DynamoDBv2/Properties/AssemblyInfo.cs b/sdk/src/Services/DynamoDBv2/Properties/AssemblyInfo.cs index 4ec34539a70f..e158b5008ede 100644 --- a/sdk/src/Services/DynamoDBv2/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/DynamoDBv2/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.4")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.403.3")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/EBS/EBS.sln b/sdk/src/Services/EBS/EBS.sln index d230d91658bb..554ab10e5749 100644 --- a/sdk/src/Services/EBS/EBS.sln +++ b/sdk/src/Services/EBS/EBS.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {07FA603F-F559-4B6A-AE03-51E6946C8E76}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {07FA603F-F559-4B6A-AE03-51E6946C8E76}.Debug|Any CPU.Build.0 = Debug|Any CPU {07FA603F-F559-4B6A-AE03-51E6946C8E76}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {95F277E8-99BA-4DE0-8C01-E8CC97847C30}.Debug|Any CPU.Build.0 = Debug|Any CPU {95F277E8-99BA-4DE0-8C01-E8CC97847C30}.Release|Any CPU.ActiveCfg = Release|Any CPU {95F277E8-99BA-4DE0-8C01-E8CC97847C30}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {5CAD7089-6872-49FF-B894-EED143CB8C9C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5CAD7089-6872-49FF-B894-EED143CB8C9C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5CAD7089-6872-49FF-B894-EED143CB8C9C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5CAD7089-6872-49FF-B894-EED143CB8C9C}.Release|Any CPU.Build.0 = Release|Any CPU - {B72848A5-B49A-4870-966F-FAFB3D8C9E5B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B72848A5-B49A-4870-966F-FAFB3D8C9E5B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B72848A5-B49A-4870-966F-FAFB3D8C9E5B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B72848A5-B49A-4870-966F-FAFB3D8C9E5B}.Release|Any CPU.Build.0 = Release|Any CPU - {7351BFB6-D878-4282-A803-553634095B6D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7351BFB6-D878-4282-A803-553634095B6D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7351BFB6-D878-4282-A803-553634095B6D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7351BFB6-D878-4282-A803-553634095B6D}.Release|Any CPU.Build.0 = Release|Any CPU - {8207F664-5B1C-4BA1-BE98-E47375078B8F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8207F664-5B1C-4BA1-BE98-E47375078B8F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8207F664-5B1C-4BA1-BE98-E47375078B8F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8207F664-5B1C-4BA1-BE98-E47375078B8F}.Release|Any CPU.Build.0 = Release|Any CPU - {44F1F01C-461F-4F97-B6DD-23A93AE8FC39}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {44F1F01C-461F-4F97-B6DD-23A93AE8FC39}.Debug|Any CPU.Build.0 = Debug|Any CPU - {44F1F01C-461F-4F97-B6DD-23A93AE8FC39}.Release|Any CPU.ActiveCfg = Release|Any CPU - {44F1F01C-461F-4F97-B6DD-23A93AE8FC39}.Release|Any CPU.Build.0 = Release|Any CPU - {15E8AFF8-03C6-4513-AE12-1D197907F3B7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {15E8AFF8-03C6-4513-AE12-1D197907F3B7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {15E8AFF8-03C6-4513-AE12-1D197907F3B7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {15E8AFF8-03C6-4513-AE12-1D197907F3B7}.Release|Any CPU.Build.0 = Release|Any CPU - {C9E6BC48-286E-4224-BCBA-67A38084C8E8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C9E6BC48-286E-4224-BCBA-67A38084C8E8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C9E6BC48-286E-4224-BCBA-67A38084C8E8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C9E6BC48-286E-4224-BCBA-67A38084C8E8}.Release|Any CPU.Build.0 = Release|Any CPU - {D994185B-8353-464C-A1F8-A8A4965C21E0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D994185B-8353-464C-A1F8-A8A4965C21E0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D994185B-8353-464C-A1F8-A8A4965C21E0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D994185B-8353-464C-A1F8-A8A4965C21E0}.Release|Any CPU.Build.0 = Release|Any CPU - {474EBF01-1306-46C7-B29B-A69FDA9105EA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {474EBF01-1306-46C7-B29B-A69FDA9105EA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {474EBF01-1306-46C7-B29B-A69FDA9105EA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {474EBF01-1306-46C7-B29B-A69FDA9105EA}.Release|Any CPU.Build.0 = Release|Any CPU - {987D9EEB-89DD-4984-86DE-8E0A27EA7CCF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {987D9EEB-89DD-4984-86DE-8E0A27EA7CCF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {987D9EEB-89DD-4984-86DE-8E0A27EA7CCF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {987D9EEB-89DD-4984-86DE-8E0A27EA7CCF}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {5CAD7089-6872-49FF-B894-EED143CB8C9C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5CAD7089-6872-49FF-B894-EED143CB8C9C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5CAD7089-6872-49FF-B894-EED143CB8C9C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5CAD7089-6872-49FF-B894-EED143CB8C9C}.Release|Any CPU.Build.0 = Release|Any CPU - {B72848A5-B49A-4870-966F-FAFB3D8C9E5B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B72848A5-B49A-4870-966F-FAFB3D8C9E5B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B72848A5-B49A-4870-966F-FAFB3D8C9E5B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B72848A5-B49A-4870-966F-FAFB3D8C9E5B}.Release|Any CPU.Build.0 = Release|Any CPU - {7351BFB6-D878-4282-A803-553634095B6D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7351BFB6-D878-4282-A803-553634095B6D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7351BFB6-D878-4282-A803-553634095B6D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7351BFB6-D878-4282-A803-553634095B6D}.Release|Any CPU.Build.0 = Release|Any CPU - {8207F664-5B1C-4BA1-BE98-E47375078B8F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8207F664-5B1C-4BA1-BE98-E47375078B8F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8207F664-5B1C-4BA1-BE98-E47375078B8F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8207F664-5B1C-4BA1-BE98-E47375078B8F}.Release|Any CPU.Build.0 = Release|Any CPU - {44F1F01C-461F-4F97-B6DD-23A93AE8FC39}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {44F1F01C-461F-4F97-B6DD-23A93AE8FC39}.Debug|Any CPU.Build.0 = Debug|Any CPU - {44F1F01C-461F-4F97-B6DD-23A93AE8FC39}.Release|Any CPU.ActiveCfg = Release|Any CPU - {44F1F01C-461F-4F97-B6DD-23A93AE8FC39}.Release|Any CPU.Build.0 = Release|Any CPU - {15E8AFF8-03C6-4513-AE12-1D197907F3B7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {15E8AFF8-03C6-4513-AE12-1D197907F3B7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {15E8AFF8-03C6-4513-AE12-1D197907F3B7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {15E8AFF8-03C6-4513-AE12-1D197907F3B7}.Release|Any CPU.Build.0 = Release|Any CPU - {C9E6BC48-286E-4224-BCBA-67A38084C8E8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C9E6BC48-286E-4224-BCBA-67A38084C8E8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C9E6BC48-286E-4224-BCBA-67A38084C8E8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C9E6BC48-286E-4224-BCBA-67A38084C8E8}.Release|Any CPU.Build.0 = Release|Any CPU - {D994185B-8353-464C-A1F8-A8A4965C21E0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D994185B-8353-464C-A1F8-A8A4965C21E0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D994185B-8353-464C-A1F8-A8A4965C21E0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D994185B-8353-464C-A1F8-A8A4965C21E0}.Release|Any CPU.Build.0 = Release|Any CPU - {474EBF01-1306-46C7-B29B-A69FDA9105EA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {474EBF01-1306-46C7-B29B-A69FDA9105EA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {474EBF01-1306-46C7-B29B-A69FDA9105EA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {474EBF01-1306-46C7-B29B-A69FDA9105EA}.Release|Any CPU.Build.0 = Release|Any CPU - {987D9EEB-89DD-4984-86DE-8E0A27EA7CCF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {987D9EEB-89DD-4984-86DE-8E0A27EA7CCF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {987D9EEB-89DD-4984-86DE-8E0A27EA7CCF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {987D9EEB-89DD-4984-86DE-8E0A27EA7CCF}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {07FA603F-F559-4B6A-AE03-51E6946C8E76} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {BDCDA633-7BF8-4643-80F8-372D102AE4EA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {522EA8CB-2F40-44FE-8F7D-3CD0E0DE5020} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {EFA56E28-013D-420E-A662-02370C484163} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {95F277E8-99BA-4DE0-8C01-E8CC97847C30} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {5CAD7089-6872-49FF-B894-EED143CB8C9C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B72848A5-B49A-4870-966F-FAFB3D8C9E5B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {7351BFB6-D878-4282-A803-553634095B6D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8207F664-5B1C-4BA1-BE98-E47375078B8F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {44F1F01C-461F-4F97-B6DD-23A93AE8FC39} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {15E8AFF8-03C6-4513-AE12-1D197907F3B7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C9E6BC48-286E-4224-BCBA-67A38084C8E8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D994185B-8353-464C-A1F8-A8A4965C21E0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {474EBF01-1306-46C7-B29B-A69FDA9105EA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {987D9EEB-89DD-4984-86DE-8E0A27EA7CCF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {5CAD7089-6872-49FF-B894-EED143CB8C9C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B72848A5-B49A-4870-966F-FAFB3D8C9E5B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {7351BFB6-D878-4282-A803-553634095B6D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8207F664-5B1C-4BA1-BE98-E47375078B8F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {44F1F01C-461F-4F97-B6DD-23A93AE8FC39} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {15E8AFF8-03C6-4513-AE12-1D197907F3B7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C9E6BC48-286E-4224-BCBA-67A38084C8E8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D994185B-8353-464C-A1F8-A8A4965C21E0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {474EBF01-1306-46C7-B29B-A69FDA9105EA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {987D9EEB-89DD-4984-86DE-8E0A27EA7CCF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {2AE163CC-E7D1-49FB-9651-22F07DB97F23} diff --git a/sdk/src/Services/EBS/Generated/AmazonEBSConfig.cs b/sdk/src/Services/EBS/Generated/AmazonEBSConfig.cs index 65fbb68cb5cf..35315769bc6f 100644 --- a/sdk/src/Services/EBS/Generated/AmazonEBSConfig.cs +++ b/sdk/src/Services/EBS/Generated/AmazonEBSConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.EBS public partial class AmazonEBSConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("EBS", "4.0.0.0"); private static readonly AmazonEBSEndpointResolver EndpointResolver = new AmazonEBSEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("EBS", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("EBS", "3.7.400.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/EBS/Properties/AssemblyInfo.cs b/sdk/src/Services/EBS/Properties/AssemblyInfo.cs index e357f70dcec1..e10842701d06 100644 --- a/sdk/src/Services/EBS/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/EBS/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/EC2/EC2.sln b/sdk/src/Services/EC2/EC2.sln index 65269ce01db5..f954590ba2ff 100644 --- a/sdk/src/Services/EC2/EC2.sln +++ b/sdk/src/Services/EC2/EC2.sln @@ -92,7 +92,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {2B082D76-FB16-4323-AE99-B168BFE5A772}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {2B082D76-FB16-4323-AE99-B168BFE5A772}.Debug|Any CPU.Build.0 = Debug|Any CPU {2B082D76-FB16-4323-AE99-B168BFE5A772}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -113,97 +120,6 @@ Global {9B0CA077-1C68-445C-BF1E-C149DCD1B649}.Debug|Any CPU.Build.0 = Debug|Any CPU {9B0CA077-1C68-445C-BF1E-C149DCD1B649}.Release|Any CPU.ActiveCfg = Release|Any CPU {9B0CA077-1C68-445C-BF1E-C149DCD1B649}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {2704CB32-CB27-44AF-8633-FE417764F4F0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2704CB32-CB27-44AF-8633-FE417764F4F0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2704CB32-CB27-44AF-8633-FE417764F4F0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2704CB32-CB27-44AF-8633-FE417764F4F0}.Release|Any CPU.Build.0 = Release|Any CPU - {AF866EBB-D9EE-45E4-9E8C-5D2766226B04}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AF866EBB-D9EE-45E4-9E8C-5D2766226B04}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AF866EBB-D9EE-45E4-9E8C-5D2766226B04}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AF866EBB-D9EE-45E4-9E8C-5D2766226B04}.Release|Any CPU.Build.0 = Release|Any CPU - {29E91593-A3A3-47D9-9821-C24D217BAE83}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {29E91593-A3A3-47D9-9821-C24D217BAE83}.Debug|Any CPU.Build.0 = Debug|Any CPU - {29E91593-A3A3-47D9-9821-C24D217BAE83}.Release|Any CPU.ActiveCfg = Release|Any CPU - {29E91593-A3A3-47D9-9821-C24D217BAE83}.Release|Any CPU.Build.0 = Release|Any CPU - {90254270-6C20-4044-9375-7215FD32D44F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {90254270-6C20-4044-9375-7215FD32D44F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {90254270-6C20-4044-9375-7215FD32D44F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {90254270-6C20-4044-9375-7215FD32D44F}.Release|Any CPU.Build.0 = Release|Any CPU - {4E49C5FC-7D0B-46E0-B6BA-CABE044A5A1A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4E49C5FC-7D0B-46E0-B6BA-CABE044A5A1A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4E49C5FC-7D0B-46E0-B6BA-CABE044A5A1A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4E49C5FC-7D0B-46E0-B6BA-CABE044A5A1A}.Release|Any CPU.Build.0 = Release|Any CPU - {EF671C1B-9772-45A8-9D7F-C919D9CCFA14}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EF671C1B-9772-45A8-9D7F-C919D9CCFA14}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EF671C1B-9772-45A8-9D7F-C919D9CCFA14}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EF671C1B-9772-45A8-9D7F-C919D9CCFA14}.Release|Any CPU.Build.0 = Release|Any CPU - {CBEA4C25-54C6-4A47-9F8B-F85D37CBA4DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CBEA4C25-54C6-4A47-9F8B-F85D37CBA4DC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CBEA4C25-54C6-4A47-9F8B-F85D37CBA4DC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CBEA4C25-54C6-4A47-9F8B-F85D37CBA4DC}.Release|Any CPU.Build.0 = Release|Any CPU - {7D2B576F-1256-4672-87D5-43D38D8E0978}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7D2B576F-1256-4672-87D5-43D38D8E0978}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7D2B576F-1256-4672-87D5-43D38D8E0978}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7D2B576F-1256-4672-87D5-43D38D8E0978}.Release|Any CPU.Build.0 = Release|Any CPU - {73D2AAD7-D04D-423B-95AE-5DD33437C36C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {73D2AAD7-D04D-423B-95AE-5DD33437C36C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {73D2AAD7-D04D-423B-95AE-5DD33437C36C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {73D2AAD7-D04D-423B-95AE-5DD33437C36C}.Release|Any CPU.Build.0 = Release|Any CPU - {0A4F10C8-9A7F-4375-B206-5AFEDD875D1D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0A4F10C8-9A7F-4375-B206-5AFEDD875D1D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0A4F10C8-9A7F-4375-B206-5AFEDD875D1D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0A4F10C8-9A7F-4375-B206-5AFEDD875D1D}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {2704CB32-CB27-44AF-8633-FE417764F4F0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2704CB32-CB27-44AF-8633-FE417764F4F0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2704CB32-CB27-44AF-8633-FE417764F4F0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2704CB32-CB27-44AF-8633-FE417764F4F0}.Release|Any CPU.Build.0 = Release|Any CPU - {AF866EBB-D9EE-45E4-9E8C-5D2766226B04}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AF866EBB-D9EE-45E4-9E8C-5D2766226B04}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AF866EBB-D9EE-45E4-9E8C-5D2766226B04}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AF866EBB-D9EE-45E4-9E8C-5D2766226B04}.Release|Any CPU.Build.0 = Release|Any CPU - {29E91593-A3A3-47D9-9821-C24D217BAE83}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {29E91593-A3A3-47D9-9821-C24D217BAE83}.Debug|Any CPU.Build.0 = Debug|Any CPU - {29E91593-A3A3-47D9-9821-C24D217BAE83}.Release|Any CPU.ActiveCfg = Release|Any CPU - {29E91593-A3A3-47D9-9821-C24D217BAE83}.Release|Any CPU.Build.0 = Release|Any CPU - {90254270-6C20-4044-9375-7215FD32D44F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {90254270-6C20-4044-9375-7215FD32D44F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {90254270-6C20-4044-9375-7215FD32D44F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {90254270-6C20-4044-9375-7215FD32D44F}.Release|Any CPU.Build.0 = Release|Any CPU - {4E49C5FC-7D0B-46E0-B6BA-CABE044A5A1A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4E49C5FC-7D0B-46E0-B6BA-CABE044A5A1A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4E49C5FC-7D0B-46E0-B6BA-CABE044A5A1A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4E49C5FC-7D0B-46E0-B6BA-CABE044A5A1A}.Release|Any CPU.Build.0 = Release|Any CPU - {EF671C1B-9772-45A8-9D7F-C919D9CCFA14}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EF671C1B-9772-45A8-9D7F-C919D9CCFA14}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EF671C1B-9772-45A8-9D7F-C919D9CCFA14}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EF671C1B-9772-45A8-9D7F-C919D9CCFA14}.Release|Any CPU.Build.0 = Release|Any CPU - {CBEA4C25-54C6-4A47-9F8B-F85D37CBA4DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CBEA4C25-54C6-4A47-9F8B-F85D37CBA4DC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CBEA4C25-54C6-4A47-9F8B-F85D37CBA4DC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CBEA4C25-54C6-4A47-9F8B-F85D37CBA4DC}.Release|Any CPU.Build.0 = Release|Any CPU - {7D2B576F-1256-4672-87D5-43D38D8E0978}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7D2B576F-1256-4672-87D5-43D38D8E0978}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7D2B576F-1256-4672-87D5-43D38D8E0978}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7D2B576F-1256-4672-87D5-43D38D8E0978}.Release|Any CPU.Build.0 = Release|Any CPU - {73D2AAD7-D04D-423B-95AE-5DD33437C36C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {73D2AAD7-D04D-423B-95AE-5DD33437C36C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {73D2AAD7-D04D-423B-95AE-5DD33437C36C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {73D2AAD7-D04D-423B-95AE-5DD33437C36C}.Release|Any CPU.Build.0 = Release|Any CPU - {0A4F10C8-9A7F-4375-B206-5AFEDD875D1D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0A4F10C8-9A7F-4375-B206-5AFEDD875D1D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0A4F10C8-9A7F-4375-B206-5AFEDD875D1D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0A4F10C8-9A7F-4375-B206-5AFEDD875D1D}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -220,37 +136,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {2B082D76-FB16-4323-AE99-B168BFE5A772} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {CFF96FAC-1F52-4864-8092-1F380047D756} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {E5995442-7377-40F2-A7D3-5EF5C6481EE1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {81A10049-16BE-4909-BFD8-94FF1AE8C49F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {9B0CA077-1C68-445C-BF1E-C149DCD1B649} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {2704CB32-CB27-44AF-8633-FE417764F4F0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {AF866EBB-D9EE-45E4-9E8C-5D2766226B04} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {29E91593-A3A3-47D9-9821-C24D217BAE83} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {90254270-6C20-4044-9375-7215FD32D44F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4E49C5FC-7D0B-46E0-B6BA-CABE044A5A1A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {EF671C1B-9772-45A8-9D7F-C919D9CCFA14} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {CBEA4C25-54C6-4A47-9F8B-F85D37CBA4DC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {7D2B576F-1256-4672-87D5-43D38D8E0978} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {73D2AAD7-D04D-423B-95AE-5DD33437C36C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0A4F10C8-9A7F-4375-B206-5AFEDD875D1D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {2704CB32-CB27-44AF-8633-FE417764F4F0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {AF866EBB-D9EE-45E4-9E8C-5D2766226B04} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {29E91593-A3A3-47D9-9821-C24D217BAE83} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {90254270-6C20-4044-9375-7215FD32D44F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4E49C5FC-7D0B-46E0-B6BA-CABE044A5A1A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {EF671C1B-9772-45A8-9D7F-C919D9CCFA14} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {CBEA4C25-54C6-4A47-9F8B-F85D37CBA4DC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {7D2B576F-1256-4672-87D5-43D38D8E0978} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {73D2AAD7-D04D-423B-95AE-5DD33437C36C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0A4F10C8-9A7F-4375-B206-5AFEDD875D1D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {71085CA4-4D58-42E9-BEAA-A3022B9C011F} diff --git a/sdk/src/Services/EC2/Generated/AmazonEC2Config.cs b/sdk/src/Services/EC2/Generated/AmazonEC2Config.cs index 7d97ac44192b..58997eb3b95a 100644 --- a/sdk/src/Services/EC2/Generated/AmazonEC2Config.cs +++ b/sdk/src/Services/EC2/Generated/AmazonEC2Config.cs @@ -34,16 +34,10 @@ namespace Amazon.EC2 public partial class AmazonEC2Config : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("EC2", "4.0.0.0"); private static readonly AmazonEC2EndpointResolver EndpointResolver = new AmazonEC2EndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("EC2", "3.7.406.4"); -======= - InternalSDKUtils.BuildUserAgentString("EC2", "3.7.416.0"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/EC2/Generated/Model/AcceptCapacityReservationBillingOwnershipResponse.cs b/sdk/src/Services/EC2/Generated/Model/AcceptCapacityReservationBillingOwnershipResponse.cs index d22052b65533..c2f84ecdd704 100644 --- a/sdk/src/Services/EC2/Generated/Model/AcceptCapacityReservationBillingOwnershipResponse.cs +++ b/sdk/src/Services/EC2/Generated/Model/AcceptCapacityReservationBillingOwnershipResponse.cs @@ -42,9 +42,9 @@ public partial class AcceptCapacityReservationBillingOwnershipResponse : AmazonW /// Returns true if the request succeeds; otherwise, it returns an error. /// /// - public bool Return + public bool? Return { - get { return this._return.GetValueOrDefault(); } + get { return this._return; } set { this._return = value; } } diff --git a/sdk/src/Services/EC2/Generated/Model/AssociateCapacityReservationBillingOwnerResponse.cs b/sdk/src/Services/EC2/Generated/Model/AssociateCapacityReservationBillingOwnerResponse.cs index cc48fb5d35e5..cc1f089ebc08 100644 --- a/sdk/src/Services/EC2/Generated/Model/AssociateCapacityReservationBillingOwnerResponse.cs +++ b/sdk/src/Services/EC2/Generated/Model/AssociateCapacityReservationBillingOwnerResponse.cs @@ -42,9 +42,9 @@ public partial class AssociateCapacityReservationBillingOwnerResponse : AmazonWe /// Returns true if the request succeeds; otherwise, it returns an error. /// /// - public bool Return + public bool? Return { - get { return this._return.GetValueOrDefault(); } + get { return this._return; } set { this._return = value; } } diff --git a/sdk/src/Services/EC2/Generated/Model/CapacityReservationBillingRequest.cs b/sdk/src/Services/EC2/Generated/Model/CapacityReservationBillingRequest.cs index f3b519de5503..928ada8a4958 100644 --- a/sdk/src/Services/EC2/Generated/Model/CapacityReservationBillingRequest.cs +++ b/sdk/src/Services/EC2/Generated/Model/CapacityReservationBillingRequest.cs @@ -85,9 +85,9 @@ internal bool IsSetCapacityReservationInfo() /// The date and time, in UTC time format, at which the request was initiated. /// /// - public DateTime LastUpdateTime + public DateTime? LastUpdateTime { - get { return this._lastUpdateTime.GetValueOrDefault(); } + get { return this._lastUpdateTime; } set { this._lastUpdateTime = value; } } diff --git a/sdk/src/Services/EC2/Generated/Model/DescribeCapacityReservationBillingRequestsRequest.cs b/sdk/src/Services/EC2/Generated/Model/DescribeCapacityReservationBillingRequestsRequest.cs index c7ddb0361dd1..86d8f3fac35b 100644 --- a/sdk/src/Services/EC2/Generated/Model/DescribeCapacityReservationBillingRequestsRequest.cs +++ b/sdk/src/Services/EC2/Generated/Model/DescribeCapacityReservationBillingRequestsRequest.cs @@ -105,9 +105,9 @@ internal bool IsSetFilters() /// /// [AWSProperty(Min=1, Max=1000)] - public int MaxResults + public int? MaxResults { - get { return this._maxResults.GetValueOrDefault(); } + get { return this._maxResults; } set { this._maxResults = value; } } diff --git a/sdk/src/Services/EC2/Generated/Model/DescribeInstanceImageMetadataRequest.cs b/sdk/src/Services/EC2/Generated/Model/DescribeInstanceImageMetadataRequest.cs index d290447e1670..a3a0fda453be 100644 --- a/sdk/src/Services/EC2/Generated/Model/DescribeInstanceImageMetadataRequest.cs +++ b/sdk/src/Services/EC2/Generated/Model/DescribeInstanceImageMetadataRequest.cs @@ -169,9 +169,9 @@ internal bool IsSetInstanceIds() /// /// [AWSProperty(Min=1, Max=1000)] - public int MaxResults + public int? MaxResults { - get { return this._maxResults.GetValueOrDefault(); } + get { return this._maxResults; } set { this._maxResults = value; } } diff --git a/sdk/src/Services/EC2/Generated/Model/DescribeSecurityGroupVpcAssociationsRequest.cs b/sdk/src/Services/EC2/Generated/Model/DescribeSecurityGroupVpcAssociationsRequest.cs index 1172aefec8c7..a9eca5e37e39 100644 --- a/sdk/src/Services/EC2/Generated/Model/DescribeSecurityGroupVpcAssociationsRequest.cs +++ b/sdk/src/Services/EC2/Generated/Model/DescribeSecurityGroupVpcAssociationsRequest.cs @@ -95,9 +95,9 @@ internal bool IsSetFilters() /// /// [AWSProperty(Min=5, Max=1000)] - public int MaxResults + public int? MaxResults { - get { return this._maxResults.GetValueOrDefault(); } + get { return this._maxResults; } set { this._maxResults = value; } } diff --git a/sdk/src/Services/EC2/Generated/Model/DisassociateCapacityReservationBillingOwnerResponse.cs b/sdk/src/Services/EC2/Generated/Model/DisassociateCapacityReservationBillingOwnerResponse.cs index cd4ec1794b62..aabc47f8960f 100644 --- a/sdk/src/Services/EC2/Generated/Model/DisassociateCapacityReservationBillingOwnerResponse.cs +++ b/sdk/src/Services/EC2/Generated/Model/DisassociateCapacityReservationBillingOwnerResponse.cs @@ -42,9 +42,9 @@ public partial class DisassociateCapacityReservationBillingOwnerResponse : Amazo /// Returns true if the request succeeds; otherwise, it returns an error. /// /// - public bool Return + public bool? Return { - get { return this._return.GetValueOrDefault(); } + get { return this._return; } set { this._return = value; } } diff --git a/sdk/src/Services/EC2/Generated/Model/ImageMetadata.cs b/sdk/src/Services/EC2/Generated/Model/ImageMetadata.cs index ce1c6c3468f6..4c0d84998c82 100644 --- a/sdk/src/Services/EC2/Generated/Model/ImageMetadata.cs +++ b/sdk/src/Services/EC2/Generated/Model/ImageMetadata.cs @@ -127,9 +127,9 @@ internal bool IsSetImageOwnerAlias() /// (AMI owner) or explicit (shared with your account) launch permissions. /// /// - public bool IsPublic + public bool? IsPublic { - get { return this._isPublic.GetValueOrDefault(); } + get { return this._isPublic; } set { this._isPublic = value; } } diff --git a/sdk/src/Services/EC2/Generated/Model/InstanceImageMetadata.cs b/sdk/src/Services/EC2/Generated/Model/InstanceImageMetadata.cs index 170b76c30891..d50547f57a72 100644 --- a/sdk/src/Services/EC2/Generated/Model/InstanceImageMetadata.cs +++ b/sdk/src/Services/EC2/Generated/Model/InstanceImageMetadata.cs @@ -122,9 +122,9 @@ internal bool IsSetInstanceType() /// The time the instance was launched. /// /// - public DateTime LaunchTime + public DateTime? LaunchTime { - get { return this._launchTime.GetValueOrDefault(); } + get { return this._launchTime; } set { this._launchTime = value; } } diff --git a/sdk/src/Services/EC2/Generated/Model/Internal/MarshallTransformations/AcceptCapacityReservationBillingOwnershipResponseUnmarshaller.cs b/sdk/src/Services/EC2/Generated/Model/Internal/MarshallTransformations/AcceptCapacityReservationBillingOwnershipResponseUnmarshaller.cs index e45c089e578d..a5807ca7cfc8 100644 --- a/sdk/src/Services/EC2/Generated/Model/Internal/MarshallTransformations/AcceptCapacityReservationBillingOwnershipResponseUnmarshaller.cs +++ b/sdk/src/Services/EC2/Generated/Model/Internal/MarshallTransformations/AcceptCapacityReservationBillingOwnershipResponseUnmarshaller.cs @@ -58,7 +58,7 @@ public override AmazonWebServiceResponse Unmarshall(XmlUnmarshallerContext conte if (context.TestExpression("return", targetDepth)) { - var unmarshaller = BoolUnmarshaller.Instance; + var unmarshaller = NullableBoolUnmarshaller.Instance; response.Return = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/EC2/Generated/Model/Internal/MarshallTransformations/AssociateCapacityReservationBillingOwnerResponseUnmarshaller.cs b/sdk/src/Services/EC2/Generated/Model/Internal/MarshallTransformations/AssociateCapacityReservationBillingOwnerResponseUnmarshaller.cs index e5792200bef9..3b1c2da4fb65 100644 --- a/sdk/src/Services/EC2/Generated/Model/Internal/MarshallTransformations/AssociateCapacityReservationBillingOwnerResponseUnmarshaller.cs +++ b/sdk/src/Services/EC2/Generated/Model/Internal/MarshallTransformations/AssociateCapacityReservationBillingOwnerResponseUnmarshaller.cs @@ -58,7 +58,7 @@ public override AmazonWebServiceResponse Unmarshall(XmlUnmarshallerContext conte if (context.TestExpression("return", targetDepth)) { - var unmarshaller = BoolUnmarshaller.Instance; + var unmarshaller = NullableBoolUnmarshaller.Instance; response.Return = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/EC2/Generated/Model/Internal/MarshallTransformations/CapacityReservationBillingRequestUnmarshaller.cs b/sdk/src/Services/EC2/Generated/Model/Internal/MarshallTransformations/CapacityReservationBillingRequestUnmarshaller.cs index 4e17d736d75d..028b9015f2a3 100644 --- a/sdk/src/Services/EC2/Generated/Model/Internal/MarshallTransformations/CapacityReservationBillingRequestUnmarshaller.cs +++ b/sdk/src/Services/EC2/Generated/Model/Internal/MarshallTransformations/CapacityReservationBillingRequestUnmarshaller.cs @@ -69,7 +69,7 @@ public CapacityReservationBillingRequest Unmarshall(XmlUnmarshallerContext conte } if (context.TestExpression("lastUpdateTime", targetDepth)) { - var unmarshaller = DateTimeUnmarshaller.Instance; + var unmarshaller = NullableDateTimeUnmarshaller.Instance; unmarshalledObject.LastUpdateTime = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/EC2/Generated/Model/Internal/MarshallTransformations/DescribeCapacityReservationBillingRequestsRequestMarshaller.cs b/sdk/src/Services/EC2/Generated/Model/Internal/MarshallTransformations/DescribeCapacityReservationBillingRequestsRequestMarshaller.cs index 905449992c7f..4bf4ed9d354a 100644 --- a/sdk/src/Services/EC2/Generated/Model/Internal/MarshallTransformations/DescribeCapacityReservationBillingRequestsRequestMarshaller.cs +++ b/sdk/src/Services/EC2/Generated/Model/Internal/MarshallTransformations/DescribeCapacityReservationBillingRequestsRequestMarshaller.cs @@ -61,32 +61,47 @@ public IRequest Marshall(DescribeCapacityReservationBillingRequestsRequest publi { if(publicRequest.IsSetCapacityReservationIds()) { - int publicRequestlistValueIndex = 1; - foreach(var publicRequestlistValue in publicRequest.CapacityReservationIds) + if (publicRequest.CapacityReservationIds.Count == 0) + request.Parameters.Add("CapacityReservationId", ""); + else { - request.Parameters.Add("CapacityReservationId" + "." + publicRequestlistValueIndex, StringUtils.FromString(publicRequestlistValue)); - publicRequestlistValueIndex++; + int publicRequestlistValueIndex = 1; + foreach(var publicRequestlistValue in publicRequest.CapacityReservationIds) + { + request.Parameters.Add("CapacityReservationId" + "." + publicRequestlistValueIndex, StringUtils.FromString(publicRequestlistValue)); + publicRequestlistValueIndex++; + } } } if(publicRequest.IsSetFilters()) { - int publicRequestlistValueIndex = 1; - foreach(var publicRequestlistValue in publicRequest.Filters) + if (publicRequest.Filters.Count == 0) + request.Parameters.Add("Filter", ""); + else { - if(publicRequestlistValue.IsSetName()) - { - request.Parameters.Add("Filter" + "." + publicRequestlistValueIndex + "." + "Name", StringUtils.FromString(publicRequestlistValue.Name)); - } - if(publicRequestlistValue.IsSetValues()) - { - int publicRequestlistValuelistValueIndex = 1; - foreach(var publicRequestlistValuelistValue in publicRequestlistValue.Values) + int publicRequestlistValueIndex = 1; + foreach(var publicRequestlistValue in publicRequest.Filters) + { + if(publicRequestlistValue.IsSetName()) { - request.Parameters.Add("Filter" + "." + publicRequestlistValueIndex + "." + "Value" + "." + publicRequestlistValuelistValueIndex, StringUtils.FromString(publicRequestlistValuelistValue)); - publicRequestlistValuelistValueIndex++; + request.Parameters.Add("Filter" + "." + publicRequestlistValueIndex + "." + "Name", StringUtils.FromString(publicRequestlistValue.Name)); } - } - publicRequestlistValueIndex++; + if(publicRequestlistValue.IsSetValues()) + { + if (publicRequestlistValue.Values.Count == 0) + request.Parameters.Add("Filter" + "." + publicRequestlistValueIndex + "." + "Value", ""); + else + { + int publicRequestlistValuelistValueIndex = 1; + foreach(var publicRequestlistValuelistValue in publicRequestlistValue.Values) + { + request.Parameters.Add("Filter" + "." + publicRequestlistValueIndex + "." + "Value" + "." + publicRequestlistValuelistValueIndex, StringUtils.FromString(publicRequestlistValuelistValue)); + publicRequestlistValuelistValueIndex++; + } + } + } + publicRequestlistValueIndex++; + } } } if(publicRequest.IsSetMaxResults()) diff --git a/sdk/src/Services/EC2/Generated/Model/Internal/MarshallTransformations/DescribeInstanceImageMetadataRequestMarshaller.cs b/sdk/src/Services/EC2/Generated/Model/Internal/MarshallTransformations/DescribeInstanceImageMetadataRequestMarshaller.cs index fff5c2bc31d9..bed5433cbdb9 100644 --- a/sdk/src/Services/EC2/Generated/Model/Internal/MarshallTransformations/DescribeInstanceImageMetadataRequestMarshaller.cs +++ b/sdk/src/Services/EC2/Generated/Model/Internal/MarshallTransformations/DescribeInstanceImageMetadataRequestMarshaller.cs @@ -61,32 +61,47 @@ public IRequest Marshall(DescribeInstanceImageMetadataRequest publicRequest) { if(publicRequest.IsSetFilters()) { - int publicRequestlistValueIndex = 1; - foreach(var publicRequestlistValue in publicRequest.Filters) + if (publicRequest.Filters.Count == 0) + request.Parameters.Add("Filter", ""); + else { - if(publicRequestlistValue.IsSetName()) - { - request.Parameters.Add("Filter" + "." + publicRequestlistValueIndex + "." + "Name", StringUtils.FromString(publicRequestlistValue.Name)); - } - if(publicRequestlistValue.IsSetValues()) - { - int publicRequestlistValuelistValueIndex = 1; - foreach(var publicRequestlistValuelistValue in publicRequestlistValue.Values) + int publicRequestlistValueIndex = 1; + foreach(var publicRequestlistValue in publicRequest.Filters) + { + if(publicRequestlistValue.IsSetName()) { - request.Parameters.Add("Filter" + "." + publicRequestlistValueIndex + "." + "Value" + "." + publicRequestlistValuelistValueIndex, StringUtils.FromString(publicRequestlistValuelistValue)); - publicRequestlistValuelistValueIndex++; + request.Parameters.Add("Filter" + "." + publicRequestlistValueIndex + "." + "Name", StringUtils.FromString(publicRequestlistValue.Name)); } - } - publicRequestlistValueIndex++; + if(publicRequestlistValue.IsSetValues()) + { + if (publicRequestlistValue.Values.Count == 0) + request.Parameters.Add("Filter" + "." + publicRequestlistValueIndex + "." + "Value", ""); + else + { + int publicRequestlistValuelistValueIndex = 1; + foreach(var publicRequestlistValuelistValue in publicRequestlistValue.Values) + { + request.Parameters.Add("Filter" + "." + publicRequestlistValueIndex + "." + "Value" + "." + publicRequestlistValuelistValueIndex, StringUtils.FromString(publicRequestlistValuelistValue)); + publicRequestlistValuelistValueIndex++; + } + } + } + publicRequestlistValueIndex++; + } } } if(publicRequest.IsSetInstanceIds()) { - int publicRequestlistValueIndex = 1; - foreach(var publicRequestlistValue in publicRequest.InstanceIds) + if (publicRequest.InstanceIds.Count == 0) + request.Parameters.Add("InstanceId", ""); + else { - request.Parameters.Add("InstanceId" + "." + publicRequestlistValueIndex, StringUtils.FromString(publicRequestlistValue)); - publicRequestlistValueIndex++; + int publicRequestlistValueIndex = 1; + foreach(var publicRequestlistValue in publicRequest.InstanceIds) + { + request.Parameters.Add("InstanceId" + "." + publicRequestlistValueIndex, StringUtils.FromString(publicRequestlistValue)); + publicRequestlistValueIndex++; + } } } if(publicRequest.IsSetMaxResults()) diff --git a/sdk/src/Services/EC2/Generated/Model/Internal/MarshallTransformations/DescribeSecurityGroupVpcAssociationsRequestMarshaller.cs b/sdk/src/Services/EC2/Generated/Model/Internal/MarshallTransformations/DescribeSecurityGroupVpcAssociationsRequestMarshaller.cs index 5262faadc00f..c1e7b29e2fd1 100644 --- a/sdk/src/Services/EC2/Generated/Model/Internal/MarshallTransformations/DescribeSecurityGroupVpcAssociationsRequestMarshaller.cs +++ b/sdk/src/Services/EC2/Generated/Model/Internal/MarshallTransformations/DescribeSecurityGroupVpcAssociationsRequestMarshaller.cs @@ -61,23 +61,33 @@ public IRequest Marshall(DescribeSecurityGroupVpcAssociationsRequest publicReque { if(publicRequest.IsSetFilters()) { - int publicRequestlistValueIndex = 1; - foreach(var publicRequestlistValue in publicRequest.Filters) + if (publicRequest.Filters.Count == 0) + request.Parameters.Add("Filter", ""); + else { - if(publicRequestlistValue.IsSetName()) - { - request.Parameters.Add("Filter" + "." + publicRequestlistValueIndex + "." + "Name", StringUtils.FromString(publicRequestlistValue.Name)); - } - if(publicRequestlistValue.IsSetValues()) - { - int publicRequestlistValuelistValueIndex = 1; - foreach(var publicRequestlistValuelistValue in publicRequestlistValue.Values) + int publicRequestlistValueIndex = 1; + foreach(var publicRequestlistValue in publicRequest.Filters) + { + if(publicRequestlistValue.IsSetName()) { - request.Parameters.Add("Filter" + "." + publicRequestlistValueIndex + "." + "Value" + "." + publicRequestlistValuelistValueIndex, StringUtils.FromString(publicRequestlistValuelistValue)); - publicRequestlistValuelistValueIndex++; + request.Parameters.Add("Filter" + "." + publicRequestlistValueIndex + "." + "Name", StringUtils.FromString(publicRequestlistValue.Name)); } - } - publicRequestlistValueIndex++; + if(publicRequestlistValue.IsSetValues()) + { + if (publicRequestlistValue.Values.Count == 0) + request.Parameters.Add("Filter" + "." + publicRequestlistValueIndex + "." + "Value", ""); + else + { + int publicRequestlistValuelistValueIndex = 1; + foreach(var publicRequestlistValuelistValue in publicRequestlistValue.Values) + { + request.Parameters.Add("Filter" + "." + publicRequestlistValueIndex + "." + "Value" + "." + publicRequestlistValuelistValueIndex, StringUtils.FromString(publicRequestlistValuelistValue)); + publicRequestlistValuelistValueIndex++; + } + } + } + publicRequestlistValueIndex++; + } } } if(publicRequest.IsSetMaxResults()) diff --git a/sdk/src/Services/EC2/Generated/Model/Internal/MarshallTransformations/DisassociateCapacityReservationBillingOwnerResponseUnmarshaller.cs b/sdk/src/Services/EC2/Generated/Model/Internal/MarshallTransformations/DisassociateCapacityReservationBillingOwnerResponseUnmarshaller.cs index 7718911fd562..155c9d0dc173 100644 --- a/sdk/src/Services/EC2/Generated/Model/Internal/MarshallTransformations/DisassociateCapacityReservationBillingOwnerResponseUnmarshaller.cs +++ b/sdk/src/Services/EC2/Generated/Model/Internal/MarshallTransformations/DisassociateCapacityReservationBillingOwnerResponseUnmarshaller.cs @@ -58,7 +58,7 @@ public override AmazonWebServiceResponse Unmarshall(XmlUnmarshallerContext conte if (context.TestExpression("return", targetDepth)) { - var unmarshaller = BoolUnmarshaller.Instance; + var unmarshaller = NullableBoolUnmarshaller.Instance; response.Return = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/EC2/Generated/Model/Internal/MarshallTransformations/ImageMetadataUnmarshaller.cs b/sdk/src/Services/EC2/Generated/Model/Internal/MarshallTransformations/ImageMetadataUnmarshaller.cs index f7347a8674ac..aa4f41ba5ef1 100644 --- a/sdk/src/Services/EC2/Generated/Model/Internal/MarshallTransformations/ImageMetadataUnmarshaller.cs +++ b/sdk/src/Services/EC2/Generated/Model/Internal/MarshallTransformations/ImageMetadataUnmarshaller.cs @@ -81,7 +81,7 @@ public ImageMetadata Unmarshall(XmlUnmarshallerContext context) } if (context.TestExpression("isPublic", targetDepth)) { - var unmarshaller = BoolUnmarshaller.Instance; + var unmarshaller = NullableBoolUnmarshaller.Instance; unmarshalledObject.IsPublic = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/EC2/Generated/Model/Internal/MarshallTransformations/InstanceImageMetadataUnmarshaller.cs b/sdk/src/Services/EC2/Generated/Model/Internal/MarshallTransformations/InstanceImageMetadataUnmarshaller.cs index 9585b237e3bd..5e35143c6f3a 100644 --- a/sdk/src/Services/EC2/Generated/Model/Internal/MarshallTransformations/InstanceImageMetadataUnmarshaller.cs +++ b/sdk/src/Services/EC2/Generated/Model/Internal/MarshallTransformations/InstanceImageMetadataUnmarshaller.cs @@ -81,7 +81,7 @@ public InstanceImageMetadata Unmarshall(XmlUnmarshallerContext context) } if (context.TestExpression("launchTime", targetDepth)) { - var unmarshaller = DateTimeUnmarshaller.Instance; + var unmarshaller = NullableDateTimeUnmarshaller.Instance; unmarshalledObject.LaunchTime = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/EC2/Generated/Model/Internal/MarshallTransformations/ModifyInstanceCpuOptionsResponseUnmarshaller.cs b/sdk/src/Services/EC2/Generated/Model/Internal/MarshallTransformations/ModifyInstanceCpuOptionsResponseUnmarshaller.cs index afdfdacfe5d5..6431831c1f3e 100644 --- a/sdk/src/Services/EC2/Generated/Model/Internal/MarshallTransformations/ModifyInstanceCpuOptionsResponseUnmarshaller.cs +++ b/sdk/src/Services/EC2/Generated/Model/Internal/MarshallTransformations/ModifyInstanceCpuOptionsResponseUnmarshaller.cs @@ -58,7 +58,7 @@ public override AmazonWebServiceResponse Unmarshall(XmlUnmarshallerContext conte if (context.TestExpression("coreCount", targetDepth)) { - var unmarshaller = IntUnmarshaller.Instance; + var unmarshaller = NullableIntUnmarshaller.Instance; response.CoreCount = unmarshaller.Unmarshall(context); continue; } @@ -70,7 +70,7 @@ public override AmazonWebServiceResponse Unmarshall(XmlUnmarshallerContext conte } if (context.TestExpression("threadsPerCore", targetDepth)) { - var unmarshaller = IntUnmarshaller.Instance; + var unmarshaller = NullableIntUnmarshaller.Instance; response.ThreadsPerCore = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/EC2/Generated/Model/Internal/MarshallTransformations/RejectCapacityReservationBillingOwnershipResponseUnmarshaller.cs b/sdk/src/Services/EC2/Generated/Model/Internal/MarshallTransformations/RejectCapacityReservationBillingOwnershipResponseUnmarshaller.cs index 04e0add49ec2..b847c9800a97 100644 --- a/sdk/src/Services/EC2/Generated/Model/Internal/MarshallTransformations/RejectCapacityReservationBillingOwnershipResponseUnmarshaller.cs +++ b/sdk/src/Services/EC2/Generated/Model/Internal/MarshallTransformations/RejectCapacityReservationBillingOwnershipResponseUnmarshaller.cs @@ -58,7 +58,7 @@ public override AmazonWebServiceResponse Unmarshall(XmlUnmarshallerContext conte if (context.TestExpression("return", targetDepth)) { - var unmarshaller = BoolUnmarshaller.Instance; + var unmarshaller = NullableBoolUnmarshaller.Instance; response.Return = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/EC2/Generated/Model/Internal/MarshallTransformations/RevokedSecurityGroupRuleUnmarshaller.cs b/sdk/src/Services/EC2/Generated/Model/Internal/MarshallTransformations/RevokedSecurityGroupRuleUnmarshaller.cs index f800f8106eb9..3a88c54799be 100644 --- a/sdk/src/Services/EC2/Generated/Model/Internal/MarshallTransformations/RevokedSecurityGroupRuleUnmarshaller.cs +++ b/sdk/src/Services/EC2/Generated/Model/Internal/MarshallTransformations/RevokedSecurityGroupRuleUnmarshaller.cs @@ -75,7 +75,7 @@ public RevokedSecurityGroupRule Unmarshall(XmlUnmarshallerContext context) } if (context.TestExpression("fromPort", targetDepth)) { - var unmarshaller = IntUnmarshaller.Instance; + var unmarshaller = NullableIntUnmarshaller.Instance; unmarshalledObject.FromPort = unmarshaller.Unmarshall(context); continue; } @@ -93,7 +93,7 @@ public RevokedSecurityGroupRule Unmarshall(XmlUnmarshallerContext context) } if (context.TestExpression("isEgress", targetDepth)) { - var unmarshaller = BoolUnmarshaller.Instance; + var unmarshaller = NullableBoolUnmarshaller.Instance; unmarshalledObject.IsEgress = unmarshaller.Unmarshall(context); continue; } @@ -117,7 +117,7 @@ public RevokedSecurityGroupRule Unmarshall(XmlUnmarshallerContext context) } if (context.TestExpression("toPort", targetDepth)) { - var unmarshaller = IntUnmarshaller.Instance; + var unmarshaller = NullableIntUnmarshaller.Instance; unmarshalledObject.ToPort = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/EC2/Generated/Model/ModifyInstanceCpuOptionsRequest.cs b/sdk/src/Services/EC2/Generated/Model/ModifyInstanceCpuOptionsRequest.cs index bc7d6256612e..0259b7ced2f0 100644 --- a/sdk/src/Services/EC2/Generated/Model/ModifyInstanceCpuOptionsRequest.cs +++ b/sdk/src/Services/EC2/Generated/Model/ModifyInstanceCpuOptionsRequest.cs @@ -63,9 +63,9 @@ public partial class ModifyInstanceCpuOptionsRequest : AmazonEC2Request /// /// [AWSProperty(Required=true)] - public int CoreCount + public int? CoreCount { - get { return this._coreCount.GetValueOrDefault(); } + get { return this._coreCount; } set { this._coreCount = value; } } @@ -101,9 +101,9 @@ internal bool IsSetInstanceId() /// /// [AWSProperty(Required=true)] - public int ThreadsPerCore + public int? ThreadsPerCore { - get { return this._threadsPerCore.GetValueOrDefault(); } + get { return this._threadsPerCore; } set { this._threadsPerCore = value; } } diff --git a/sdk/src/Services/EC2/Generated/Model/ModifyInstanceCpuOptionsResponse.cs b/sdk/src/Services/EC2/Generated/Model/ModifyInstanceCpuOptionsResponse.cs index 619899a8ca70..5635ae3c34f2 100644 --- a/sdk/src/Services/EC2/Generated/Model/ModifyInstanceCpuOptionsResponse.cs +++ b/sdk/src/Services/EC2/Generated/Model/ModifyInstanceCpuOptionsResponse.cs @@ -44,9 +44,9 @@ public partial class ModifyInstanceCpuOptionsResponse : AmazonWebServiceResponse /// The number of CPU cores that are running for the specified instance after the update. /// /// - public int CoreCount + public int? CoreCount { - get { return this._coreCount.GetValueOrDefault(); } + get { return this._coreCount; } set { this._coreCount = value; } } @@ -81,9 +81,9 @@ internal bool IsSetInstanceId() /// the update. /// /// - public int ThreadsPerCore + public int? ThreadsPerCore { - get { return this._threadsPerCore.GetValueOrDefault(); } + get { return this._threadsPerCore; } set { this._threadsPerCore = value; } } diff --git a/sdk/src/Services/EC2/Generated/Model/RejectCapacityReservationBillingOwnershipResponse.cs b/sdk/src/Services/EC2/Generated/Model/RejectCapacityReservationBillingOwnershipResponse.cs index aa7b3d27f9c5..91133535005c 100644 --- a/sdk/src/Services/EC2/Generated/Model/RejectCapacityReservationBillingOwnershipResponse.cs +++ b/sdk/src/Services/EC2/Generated/Model/RejectCapacityReservationBillingOwnershipResponse.cs @@ -42,9 +42,9 @@ public partial class RejectCapacityReservationBillingOwnershipResponse : AmazonW /// Returns true if the request succeeds; otherwise, it returns an error. /// /// - public bool Return + public bool? Return { - get { return this._return.GetValueOrDefault(); } + get { return this._return; } set { this._return = value; } } diff --git a/sdk/src/Services/EC2/Generated/Model/RevokedSecurityGroupRule.cs b/sdk/src/Services/EC2/Generated/Model/RevokedSecurityGroupRule.cs index 7409463bddff..a752f12c160c 100644 --- a/sdk/src/Services/EC2/Generated/Model/RevokedSecurityGroupRule.cs +++ b/sdk/src/Services/EC2/Generated/Model/RevokedSecurityGroupRule.cs @@ -107,9 +107,9 @@ internal bool IsSetDescription() /// The 'from' port number of the security group rule. /// /// - public int FromPort + public int? FromPort { - get { return this._fromPort.GetValueOrDefault(); } + get { return this._fromPort; } set { this._fromPort = value; } } @@ -161,9 +161,9 @@ internal bool IsSetIpProtocol() /// Defines if a security group rule is an outbound rule. /// /// - public bool IsEgress + public bool? IsEgress { - get { return this._isEgress.GetValueOrDefault(); } + get { return this._isEgress; } set { this._isEgress = value; } } @@ -233,9 +233,9 @@ internal bool IsSetSecurityGroupRuleId() /// The 'to' port number of the security group rule. /// /// - public int ToPort + public int? ToPort { - get { return this._toPort.GetValueOrDefault(); } + get { return this._toPort; } set { this._toPort = value; } } diff --git a/sdk/src/Services/EC2/Generated/Model/_bcl45+netstandard/DescribeCapacityReservationBillingRequestsPaginator.cs b/sdk/src/Services/EC2/Generated/Model/_bcl+netstandard/DescribeCapacityReservationBillingRequestsPaginator.cs similarity index 100% rename from sdk/src/Services/EC2/Generated/Model/_bcl45+netstandard/DescribeCapacityReservationBillingRequestsPaginator.cs rename to sdk/src/Services/EC2/Generated/Model/_bcl+netstandard/DescribeCapacityReservationBillingRequestsPaginator.cs diff --git a/sdk/src/Services/EC2/Generated/Model/_bcl45+netstandard/DescribeInstanceImageMetadataPaginator.cs b/sdk/src/Services/EC2/Generated/Model/_bcl+netstandard/DescribeInstanceImageMetadataPaginator.cs similarity index 100% rename from sdk/src/Services/EC2/Generated/Model/_bcl45+netstandard/DescribeInstanceImageMetadataPaginator.cs rename to sdk/src/Services/EC2/Generated/Model/_bcl+netstandard/DescribeInstanceImageMetadataPaginator.cs diff --git a/sdk/src/Services/EC2/Generated/Model/_bcl45+netstandard/DescribeSecurityGroupVpcAssociationsPaginator.cs b/sdk/src/Services/EC2/Generated/Model/_bcl+netstandard/DescribeSecurityGroupVpcAssociationsPaginator.cs similarity index 100% rename from sdk/src/Services/EC2/Generated/Model/_bcl45+netstandard/DescribeSecurityGroupVpcAssociationsPaginator.cs rename to sdk/src/Services/EC2/Generated/Model/_bcl+netstandard/DescribeSecurityGroupVpcAssociationsPaginator.cs diff --git a/sdk/src/Services/EC2/Generated/Model/_bcl45+netstandard/IDescribeCapacityReservationBillingRequestsPaginator.cs b/sdk/src/Services/EC2/Generated/Model/_bcl+netstandard/IDescribeCapacityReservationBillingRequestsPaginator.cs similarity index 100% rename from sdk/src/Services/EC2/Generated/Model/_bcl45+netstandard/IDescribeCapacityReservationBillingRequestsPaginator.cs rename to sdk/src/Services/EC2/Generated/Model/_bcl+netstandard/IDescribeCapacityReservationBillingRequestsPaginator.cs diff --git a/sdk/src/Services/EC2/Generated/Model/_bcl45+netstandard/IDescribeInstanceImageMetadataPaginator.cs b/sdk/src/Services/EC2/Generated/Model/_bcl+netstandard/IDescribeInstanceImageMetadataPaginator.cs similarity index 100% rename from sdk/src/Services/EC2/Generated/Model/_bcl45+netstandard/IDescribeInstanceImageMetadataPaginator.cs rename to sdk/src/Services/EC2/Generated/Model/_bcl+netstandard/IDescribeInstanceImageMetadataPaginator.cs diff --git a/sdk/src/Services/EC2/Generated/Model/_bcl45+netstandard/IDescribeSecurityGroupVpcAssociationsPaginator.cs b/sdk/src/Services/EC2/Generated/Model/_bcl+netstandard/IDescribeSecurityGroupVpcAssociationsPaginator.cs similarity index 100% rename from sdk/src/Services/EC2/Generated/Model/_bcl45+netstandard/IDescribeSecurityGroupVpcAssociationsPaginator.cs rename to sdk/src/Services/EC2/Generated/Model/_bcl+netstandard/IDescribeSecurityGroupVpcAssociationsPaginator.cs diff --git a/sdk/src/Services/EC2/Generated/_bcl/AmazonEC2Client.cs b/sdk/src/Services/EC2/Generated/_bcl/AmazonEC2Client.cs index 6c9c8a4e7bea..8262c1f07ae6 100644 --- a/sdk/src/Services/EC2/Generated/_bcl/AmazonEC2Client.cs +++ b/sdk/src/Services/EC2/Generated/_bcl/AmazonEC2Client.cs @@ -324,6 +324,51 @@ public virtual AcceptAddressTransferResponse AcceptAddressTransfer(AcceptAddress #endregion + #region AcceptCapacityReservationBillingOwnership + + + /// + /// Accepts a request to assign billing of the available capacity of a shared Capacity + /// Reservation to your account. For more information, see + /// Billing assignment for shared Amazon EC2 Capacity Reservations. + /// + /// Container for the necessary parameters to execute the AcceptCapacityReservationBillingOwnership service method. + /// + /// The response from the AcceptCapacityReservationBillingOwnership service method, as returned by EC2. + /// REST API Reference for AcceptCapacityReservationBillingOwnership Operation + public virtual AcceptCapacityReservationBillingOwnershipResponse AcceptCapacityReservationBillingOwnership(AcceptCapacityReservationBillingOwnershipRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = AcceptCapacityReservationBillingOwnershipRequestMarshaller.Instance; + options.ResponseUnmarshaller = AcceptCapacityReservationBillingOwnershipResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// Accepts a request to assign billing of the available capacity of a shared Capacity + /// Reservation to your account. For more information, see + /// Billing assignment for shared Amazon EC2 Capacity Reservations. + /// + /// Container for the necessary parameters to execute the AcceptCapacityReservationBillingOwnership service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the AcceptCapacityReservationBillingOwnership service method, as returned by EC2. + /// REST API Reference for AcceptCapacityReservationBillingOwnership Operation + public virtual Task AcceptCapacityReservationBillingOwnershipAsync(AcceptCapacityReservationBillingOwnershipRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = AcceptCapacityReservationBillingOwnershipRequestMarshaller.Instance; + options.ResponseUnmarshaller = AcceptCapacityReservationBillingOwnershipResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + #region AcceptReservedInstancesExchangeQuote @@ -1226,7 +1271,7 @@ public virtual AssignPrivateIpAddressesResponse AssignPrivateIpAddresses(AssignP /// /// Assigns private IPv4 addresses to a private NAT gateway. For more information, see - /// Work + /// Work /// with NAT gateways in the Amazon VPC User Guide. /// /// Container for the necessary parameters to execute the AssignPrivateNatGatewayAddress service method. @@ -1245,7 +1290,7 @@ public virtual AssignPrivateNatGatewayAddressResponse AssignPrivateNatGatewayAdd /// /// Assigns private IPv4 addresses to a private NAT gateway. For more information, see - /// Work + /// Work /// with NAT gateways in the Amazon VPC User Guide. /// /// Container for the necessary parameters to execute the AssignPrivateNatGatewayAddress service method. @@ -1363,6 +1408,53 @@ public virtual AssociateAddressResponse AssociateAddress(AssociateAddressRequest #endregion + #region AssociateCapacityReservationBillingOwner + + + /// + /// Initiates a request to assign billing of the unused capacity of a shared Capacity + /// Reservation to a consumer account that is consolidated under the same Amazon Web Services + /// organizations payer account. For more information, see Billing + /// assignment for shared Amazon EC2 Capacity Reservations. + /// + /// Container for the necessary parameters to execute the AssociateCapacityReservationBillingOwner service method. + /// + /// The response from the AssociateCapacityReservationBillingOwner service method, as returned by EC2. + /// REST API Reference for AssociateCapacityReservationBillingOwner Operation + public virtual AssociateCapacityReservationBillingOwnerResponse AssociateCapacityReservationBillingOwner(AssociateCapacityReservationBillingOwnerRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = AssociateCapacityReservationBillingOwnerRequestMarshaller.Instance; + options.ResponseUnmarshaller = AssociateCapacityReservationBillingOwnerResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// Initiates a request to assign billing of the unused capacity of a shared Capacity + /// Reservation to a consumer account that is consolidated under the same Amazon Web Services + /// organizations payer account. For more information, see Billing + /// assignment for shared Amazon EC2 Capacity Reservations. + /// + /// Container for the necessary parameters to execute the AssociateCapacityReservationBillingOwner service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the AssociateCapacityReservationBillingOwner service method, as returned by EC2. + /// REST API Reference for AssociateCapacityReservationBillingOwner Operation + public virtual Task AssociateCapacityReservationBillingOwnerAsync(AssociateCapacityReservationBillingOwnerRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = AssociateCapacityReservationBillingOwnerRequestMarshaller.Instance; + options.ResponseUnmarshaller = AssociateCapacityReservationBillingOwnerResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + #region AssociateClientVpnTargetNetwork @@ -1785,7 +1877,7 @@ public virtual AssociateIpamResourceDiscoveryResponse AssociateIpamResourceDisco /// /// Associates Elastic IP addresses (EIPs) and private IPv4 addresses with a public NAT - /// gateway. For more information, see Work + /// gateway. For more information, see Work /// with NAT gateways in the Amazon VPC User Guide. /// /// @@ -1803,7 +1895,7 @@ public virtual AssociateIpamResourceDiscoveryResponse AssociateIpamResourceDisco /// associate. You can see the network border group for the subnet's AZ by viewing the /// details of the subnet. Similarly, you can view the network border group of an EIP /// by viewing the details of the EIP address. For more information about network border - /// groups and EIPs, see Allocate + /// groups and EIPs, see Allocate /// an Elastic IP address in the Amazon VPC User Guide. /// /// @@ -1824,7 +1916,7 @@ public virtual AssociateNatGatewayAddressResponse AssociateNatGatewayAddress(Ass /// /// Associates Elastic IP addresses (EIPs) and private IPv4 addresses with a public NAT - /// gateway. For more information, see Work + /// gateway. For more information, see Work /// with NAT gateways in the Amazon VPC User Guide. /// /// @@ -1842,7 +1934,7 @@ public virtual AssociateNatGatewayAddressResponse AssociateNatGatewayAddress(Ass /// associate. You can see the network border group for the subnet's AZ by viewing the /// details of the subnet. Similarly, you can view the network border group of an EIP /// by viewing the details of the EIP address. For more information about network border - /// groups and EIPs, see Allocate + /// groups and EIPs, see Allocate /// an Elastic IP address in the Amazon VPC User Guide. /// /// @@ -1926,6 +2018,97 @@ public virtual AssociateRouteTableResponse AssociateRouteTable(AssociateRouteTab #endregion + #region AssociateSecurityGroupVpc + + + /// + /// Associates a security group with another VPC in the same Region. This enables you + /// to use the same security group with network interfaces and instances in the specified + /// VPC. + /// + ///
    • + /// + /// The VPC you want to associate the security group with must be in the same Region. + /// + ///
    • + /// + /// You can associate the security group with another VPC if your account owns the VPC + /// or if the VPC was shared with you. + /// + ///
    • + /// + /// You must own the security group and the VPC that it was created in. + /// + ///
    • + /// + /// You cannot use this feature with default security groups. + /// + ///
    • + /// + /// You cannot use this feature with the default VPC. + /// + ///
    + ///     + /// Container for the necessary parameters to execute the AssociateSecurityGroupVpc service method. + /// + /// The response from the AssociateSecurityGroupVpc service method, as returned by EC2. + /// REST API Reference for AssociateSecurityGroupVpc Operation + public virtual AssociateSecurityGroupVpcResponse AssociateSecurityGroupVpc(AssociateSecurityGroupVpcRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = AssociateSecurityGroupVpcRequestMarshaller.Instance; + options.ResponseUnmarshaller = AssociateSecurityGroupVpcResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// Associates a security group with another VPC in the same Region. This enables you + /// to use the same security group with network interfaces and instances in the specified + /// VPC. + /// + ///
    • + /// + /// The VPC you want to associate the security group with must be in the same Region. + /// + ///
    • + /// + /// You can associate the security group with another VPC if your account owns the VPC + /// or if the VPC was shared with you. + /// + ///
    • + /// + /// You must own the security group and the VPC that it was created in. + /// + ///
    • + /// + /// You cannot use this feature with default security groups. + /// + ///
    • + /// + /// You cannot use this feature with the default VPC. + /// + ///
    + ///     + /// Container for the necessary parameters to execute the AssociateSecurityGroupVpc service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the AssociateSecurityGroupVpc service method, as returned by EC2. + /// REST API Reference for AssociateSecurityGroupVpc Operation + public virtual Task AssociateSecurityGroupVpcAsync(AssociateSecurityGroupVpcRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = AssociateSecurityGroupVpcRequestMarshaller.Instance; + options.ResponseUnmarshaller = AssociateSecurityGroupVpcResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + #region AssociateSubnetCidrBlock @@ -2577,8 +2760,8 @@ public virtual AttachVolumeResponse AttachVolume(AttachVolumeRequest request) /// - /// Attaches a virtual private gateway to a VPC. You can attach one virtual private gateway - /// to one VPC at a time. + /// Attaches an available virtual private gateway to a VPC. You can attach one virtual + /// private gateway to one VPC at a time. /// /// /// @@ -2602,8 +2785,8 @@ public virtual AttachVpnGatewayResponse AttachVpnGateway(AttachVpnGatewayRequest /// - /// Attaches a virtual private gateway to a VPC. You can attach one virtual private gateway - /// to one VPC at a time. + /// Attaches an available virtual private gateway to a VPC. You can attach one virtual + /// private gateway to one VPC at a time. /// /// /// @@ -3885,10 +4068,10 @@ public virtual CreateCapacityReservationResponse CreateCapacityReservation(Creat /// - /// Create a new Capacity Reservation by splitting the available capacity of the source - /// Capacity Reservation. The new Capacity Reservation will have the same attributes as - /// the source Capacity Reservation except for tags. The source Capacity Reservation must - /// be active and owned by your Amazon Web Services account. + /// Create a new Capacity Reservation by splitting the capacity of the source Capacity + /// Reservation. The new Capacity Reservation will have the same attributes as the source + /// Capacity Reservation except for tags. The source Capacity Reservation must be active + /// and owned by your Amazon Web Services account. /// /// Container for the necessary parameters to execute the CreateCapacityReservationBySplitting service method. /// @@ -3905,10 +4088,10 @@ public virtual CreateCapacityReservationBySplittingResponse CreateCapacityReserv /// - /// Create a new Capacity Reservation by splitting the available capacity of the source - /// Capacity Reservation. The new Capacity Reservation will have the same attributes as - /// the source Capacity Reservation except for tags. The source Capacity Reservation must - /// be active and owned by your Amazon Web Services account. + /// Create a new Capacity Reservation by splitting the capacity of the source Capacity + /// Reservation. The new Capacity Reservation will have the same attributes as the source + /// Capacity Reservation except for tags. The source Capacity Reservation must be active + /// and owned by your Amazon Web Services account. /// /// Container for the necessary parameters to execute the CreateCapacityReservationBySplitting service method. /// @@ -4275,7 +4458,7 @@ public virtual CreateCustomerGatewayResponse CreateCustomerGateway(CreateCustome /// /// Creates a default subnet with a size /20 IPv4 CIDR block in the specified Availability /// Zone in your default VPC. You can have only one default subnet per Availability Zone. - /// For more information, see Create + /// For more information, see Create /// a default subnet in the Amazon VPC User Guide. /// /// Container for the necessary parameters to execute the CreateDefaultSubnet service method. @@ -4295,7 +4478,7 @@ public virtual CreateDefaultSubnetResponse CreateDefaultSubnet(CreateDefaultSubn /// /// Creates a default subnet with a size /20 IPv4 CIDR block in the specified Availability /// Zone in your default VPC. You can have only one default subnet per Availability Zone. - /// For more information, see Create + /// For more information, see Create /// a default subnet in the Amazon VPC User Guide. /// /// Container for the necessary parameters to execute the CreateDefaultSubnet service method. @@ -4655,7 +4838,7 @@ public virtual CreateFleetResponse CreateFleet(CreateFleetRequest request) /// /// Flow log data for a monitored network interface is recorded as flow log records, which /// are log events consisting of fields that describe the traffic flow. For more information, - /// see Flow + /// see Flow /// log records in the Amazon VPC User Guide. /// /// @@ -4693,7 +4876,7 @@ public virtual CreateFlowLogsResponse CreateFlowLogs(CreateFlowLogsRequest reque /// /// Flow log data for a monitored network interface is recorded as flow log records, which /// are log events consisting of fields that describe the traffic flow. For more information, - /// see Flow + /// see Flow /// log records in the Amazon VPC User Guide. /// /// @@ -5469,10 +5652,10 @@ public virtual CreateIpamScopeResponse CreateIpamScope(CreateIpamScopeRequest re /// /// Creates an ED25519 or 2048-bit RSA key pair with the specified name and in the specified - /// PEM or PPK format. Amazon EC2 stores the public key and displays the private key for - /// you to save to a file. The private key is returned as an unencrypted PEM encoded PKCS#1 - /// private key or an unencrypted PPK formatted private key for use with PuTTY. If a key - /// with the specified name already exists, Amazon EC2 returns an error. + /// format. Amazon EC2 stores the public key and displays the private key for you to save + /// to a file. The private key is returned as an unencrypted PEM encoded PKCS#1 private + /// key or an unencrypted PPK formatted private key for use with PuTTY. If a key with + /// the specified name already exists, Amazon EC2 returns an error. /// /// /// @@ -5487,7 +5670,7 @@ public virtual CreateIpamScopeResponse CreateIpamScope(CreateIpamScopeRequest re /// /// /// For more information, see Amazon - /// EC2 key pairs in the Amazon Elastic Compute Cloud User Guide. + /// EC2 key pairs in the Amazon EC2 User Guide. /// /// /// Container for the necessary parameters to execute the CreateKeyPair service method. @@ -5506,10 +5689,10 @@ public virtual CreateKeyPairResponse CreateKeyPair(CreateKeyPairRequest request) /// /// Creates an ED25519 or 2048-bit RSA key pair with the specified name and in the specified - /// PEM or PPK format. Amazon EC2 stores the public key and displays the private key for - /// you to save to a file. The private key is returned as an unencrypted PEM encoded PKCS#1 - /// private key or an unencrypted PPK formatted private key for use with PuTTY. If a key - /// with the specified name already exists, Amazon EC2 returns an error. + /// format. Amazon EC2 stores the public key and displays the private key for you to save + /// to a file. The private key is returned as an unencrypted PEM encoded PKCS#1 private + /// key or an unencrypted PPK formatted private key for use with PuTTY. If a key with + /// the specified name already exists, Amazon EC2 returns an error. /// /// /// @@ -5524,7 +5707,7 @@ public virtual CreateKeyPairResponse CreateKeyPair(CreateKeyPairRequest request) /// /// /// For more information, see Amazon - /// EC2 key pairs in the Amazon Elastic Compute Cloud User Guide. + /// EC2 key pairs in the Amazon EC2 User Guide. /// /// /// Container for the necessary parameters to execute the CreateKeyPair service method. @@ -5959,7 +6142,7 @@ public virtual CreateManagedPrefixListResponse CreateManagedPrefixList(CreateMan /// fail to launch. You can see the network border group for the subnet's AZ by viewing /// the details of the subnet. Similarly, you can view the network border group of an /// EIP by viewing the details of the EIP address. For more information about network - /// border groups and EIPs, see Allocate + /// border groups and EIPs, see Allocate /// an Elastic IP address in the Amazon VPC User Guide. /// /// @@ -6008,7 +6191,7 @@ public virtual CreateNatGatewayResponse CreateNatGateway(CreateNatGatewayRequest /// fail to launch. You can see the network border group for the subnet's AZ by viewing /// the details of the subnet. Similarly, you can view the network border group of an /// EIP by viewing the details of the EIP address. For more information about network - /// border groups and EIPs, see Allocate + /// border groups and EIPs, see Allocate /// an Elastic IP address in the Amazon VPC User Guide. /// /// @@ -6920,9 +7103,8 @@ public virtual CreateRouteTableResponse CreateRouteTable(CreateRouteTableRequest /// /// A security group acts as a virtual firewall for your instance to control inbound and /// outbound traffic. For more information, see Amazon - /// EC2 security groups in the Amazon Elastic Compute Cloud User Guide and - /// Security - /// groups for your VPC in the Amazon Virtual Private Cloud User Guide. + /// EC2 security groups in the Amazon EC2 User Guide and Security + /// groups for your VPC in the Amazon VPC User Guide. /// /// /// @@ -6968,9 +7150,8 @@ public virtual CreateSecurityGroupResponse CreateSecurityGroup(CreateSecurityGro /// /// A security group acts as a virtual firewall for your instance to control inbound and /// outbound traffic. For more information, see Amazon - /// EC2 security groups in the Amazon Elastic Compute Cloud User Guide and - /// Security - /// groups for your VPC in the Amazon Virtual Private Cloud User Guide. + /// EC2 security groups in the Amazon EC2 User Guide and Security + /// groups for your VPC in the Amazon VPC User Guide. /// /// /// @@ -7459,8 +7640,8 @@ public virtual CreateSubnetResponse CreateSubnet(CreateSubnetRequest request) /// /// Creates a subnet CIDR reservation. For more information, see Subnet - /// CIDR reservations in the Amazon VPC User Guide and Assign - /// prefixes to network interfaces in the Amazon EC2 User Guide. + /// CIDR reservations in the Amazon VPC User Guide and Manage + /// prefixes for your network interfaces in the Amazon EC2 User Guide. /// /// Container for the necessary parameters to execute the CreateSubnetCidrReservation service method. /// @@ -7478,8 +7659,8 @@ public virtual CreateSubnetCidrReservationResponse CreateSubnetCidrReservation(C /// /// Creates a subnet CIDR reservation. For more information, see Subnet - /// CIDR reservations in the Amazon VPC User Guide and Assign - /// prefixes to network interfaces in the Amazon EC2 User Guide. + /// CIDR reservations in the Amazon VPC User Guide and Manage + /// prefixes for your network interfaces in the Amazon EC2 User Guide. /// /// Container for the necessary parameters to execute the CreateSubnetCidrReservation service method. /// @@ -7710,7 +7891,7 @@ public virtual CreateTrafficMirrorFilterRuleResponse CreateTrafficMirrorFilterRu /// /// /// - /// By default, no traffic is mirrored. Use CreateTrafficMirrorFilter + /// By default, no traffic is mirrored. Use CreateTrafficMirrorFilter /// to create filter rules that specify the traffic to mirror. /// /// @@ -7745,7 +7926,7 @@ public virtual CreateTrafficMirrorSessionResponse CreateTrafficMirrorSession(Cre /// /// /// - /// By default, no traffic is mirrored. Use CreateTrafficMirrorFilter + /// By default, no traffic is mirrored. Use CreateTrafficMirrorFilter /// to create filter rules that specify the traffic to mirror. /// /// @@ -11242,8 +11423,8 @@ public virtual DeleteRouteTableResponse DeleteRouteTable(DeleteRouteTableRequest /// /// /// If you attempt to delete a security group that is associated with an instance or network - /// interface or is referenced by another security group in the same VPC, the operation - /// fails with DependencyViolation. + /// interface, is referenced by another security group in the same VPC, or has a VPC association, + /// the operation fails with DependencyViolation. /// ///     /// Container for the necessary parameters to execute the DeleteSecurityGroup service method. @@ -11266,8 +11447,8 @@ public virtual DeleteSecurityGroupResponse DeleteSecurityGroup(DeleteSecurityGro /// /// /// If you attempt to delete a security group that is associated with an instance or network - /// interface or is referenced by another security group in the same VPC, the operation - /// fails with DependencyViolation. + /// interface, is referenced by another security group in the same VPC, or has a VPC association, + /// the operation fails with DependencyViolation. /// ///     /// Container for the necessary parameters to execute the DeleteSecurityGroup service method. @@ -12453,8 +12634,14 @@ public virtual DeleteVolumeResponse DeleteVolume(DeleteVolumeRequest request) /// are associated with the VPC before you can delete it. For example, you must terminate /// all instances running in the VPC, delete all security groups associated with the VPC /// (except the default one), delete all route tables associated with the VPC (except - /// the default one), and so on. When you delete the VPC, it deletes the VPC's default - /// security group, network ACL, and route table. + /// the default one), and so on. When you delete the VPC, it deletes the default security + /// group, network ACL, and route table for the VPC. + /// + /// + /// + /// If you created a flow log for the VPC that you are deleting, note that flow logs for + /// deleted VPCs are eventually automatically removed. + /// /// /// Container for the necessary parameters to execute the DeleteVpc service method. /// @@ -12475,8 +12662,14 @@ public virtual DeleteVpcResponse DeleteVpc(DeleteVpcRequest request) /// are associated with the VPC before you can delete it. For example, you must terminate /// all instances running in the VPC, delete all security groups associated with the VPC /// (except the default one), delete all route tables associated with the VPC (except - /// the default one), and so on. When you delete the VPC, it deletes the VPC's default - /// security group, network ACL, and route table. + /// the default one), and so on. When you delete the VPC, it deletes the default security + /// group, network ACL, and route table for the VPC. + /// + /// + /// + /// If you created a flow log for the VPC that you are deleting, note that flow logs for + /// deleted VPCs are eventually automatically removed. + /// /// /// Container for the necessary parameters to execute the DeleteVpc service method. /// @@ -14137,6 +14330,51 @@ public virtual DescribeCapacityBlockOfferingsResponse DescribeCapacityBlockOffer #endregion + #region DescribeCapacityReservationBillingRequests + + + /// + /// Describes a request to assign the billing of the unused capacity of a Capacity Reservation. + /// For more information, see + /// Billing assignment for shared Amazon EC2 Capacity Reservations. + /// + /// Container for the necessary parameters to execute the DescribeCapacityReservationBillingRequests service method. + /// + /// The response from the DescribeCapacityReservationBillingRequests service method, as returned by EC2. + /// REST API Reference for DescribeCapacityReservationBillingRequests Operation + public virtual DescribeCapacityReservationBillingRequestsResponse DescribeCapacityReservationBillingRequests(DescribeCapacityReservationBillingRequestsRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = DescribeCapacityReservationBillingRequestsRequestMarshaller.Instance; + options.ResponseUnmarshaller = DescribeCapacityReservationBillingRequestsResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// Describes a request to assign the billing of the unused capacity of a Capacity Reservation. + /// For more information, see + /// Billing assignment for shared Amazon EC2 Capacity Reservations. + /// + /// Container for the necessary parameters to execute the DescribeCapacityReservationBillingRequests service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the DescribeCapacityReservationBillingRequests service method, as returned by EC2. + /// REST API Reference for DescribeCapacityReservationBillingRequests Operation + public virtual Task DescribeCapacityReservationBillingRequestsAsync(DescribeCapacityReservationBillingRequestsRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = DescribeCapacityReservationBillingRequestsRequestMarshaller.Instance; + options.ResponseUnmarshaller = DescribeCapacityReservationBillingRequestsResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + #region DescribeCapacityReservationFleets @@ -14917,9 +15155,7 @@ public virtual DescribeEgressOnlyInternetGatewaysResponse DescribeEgressOnlyInte /// /// /// - /// Amazon Elastic Graphics reached end of life on January 8, 2024. For workloads that - /// require graphics acceleration, we recommend that you use Amazon EC2 G4, G5, or G6 - /// instances. + /// Amazon Elastic Graphics reached end of life on January 8, 2024. /// /// /// @@ -14943,9 +15179,7 @@ public virtual DescribeElasticGpusResponse DescribeElasticGpus(DescribeElasticGp /// /// /// - /// Amazon Elastic Graphics reached end of life on January 8, 2024. For workloads that - /// require graphics acceleration, we recommend that you use Amazon EC2 G4, G5, or G6 - /// instances. + /// Amazon Elastic Graphics reached end of life on January 8, 2024. /// /// /// @@ -16495,6 +16729,111 @@ public virtual DescribeInstanceEventWindowsResponse DescribeInstanceEventWindows #endregion + #region DescribeInstanceImageMetadata + + + /// + /// Describes the AMI that was used to launch an instance, even if the AMI is deprecated, + /// deregistered, or made private (no longer public or shared with your account). + /// + /// + /// + /// If you specify instance IDs, the output includes information for only the specified + /// instances. If you specify filters, the output includes information for only those + /// instances that meet the filter criteria. If you do not specify instance IDs or filters, + /// the output includes information for all instances, which can affect performance. + /// + /// + /// + /// If you specify an instance ID that is not valid, an instance that doesn't exist, or + /// an instance that you do not own, an error (InvalidInstanceID.NotFound) is returned. + /// + /// + /// + /// Recently terminated instances might appear in the returned results. This interval + /// is usually less than one hour. + /// + /// + /// + /// In the rare case where an Availability Zone is experiencing a service disruption and + /// you specify instance IDs that are in the affected Availability Zone, or do not specify + /// any instance IDs at all, the call fails. If you specify only instance IDs that are + /// in an unaffected Availability Zone, the call works normally. + /// + /// + /// + /// The order of the elements in the response, including those within nested structures, + /// might vary. Applications should not assume the elements appear in a particular order. + /// + /// + /// + /// Container for the necessary parameters to execute the DescribeInstanceImageMetadata service method. + /// + /// The response from the DescribeInstanceImageMetadata service method, as returned by EC2. + /// REST API Reference for DescribeInstanceImageMetadata Operation + public virtual DescribeInstanceImageMetadataResponse DescribeInstanceImageMetadata(DescribeInstanceImageMetadataRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = DescribeInstanceImageMetadataRequestMarshaller.Instance; + options.ResponseUnmarshaller = DescribeInstanceImageMetadataResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// Describes the AMI that was used to launch an instance, even if the AMI is deprecated, + /// deregistered, or made private (no longer public or shared with your account). + /// + /// + /// + /// If you specify instance IDs, the output includes information for only the specified + /// instances. If you specify filters, the output includes information for only those + /// instances that meet the filter criteria. If you do not specify instance IDs or filters, + /// the output includes information for all instances, which can affect performance. + /// + /// + /// + /// If you specify an instance ID that is not valid, an instance that doesn't exist, or + /// an instance that you do not own, an error (InvalidInstanceID.NotFound) is returned. + /// + /// + /// + /// Recently terminated instances might appear in the returned results. This interval + /// is usually less than one hour. + /// + /// + /// + /// In the rare case where an Availability Zone is experiencing a service disruption and + /// you specify instance IDs that are in the affected Availability Zone, or do not specify + /// any instance IDs at all, the call fails. If you specify only instance IDs that are + /// in an unaffected Availability Zone, the call works normally. + /// + /// + /// + /// The order of the elements in the response, including those within nested structures, + /// might vary. Applications should not assume the elements appear in a particular order. + /// + /// + /// + /// Container for the necessary parameters to execute the DescribeInstanceImageMetadata service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the DescribeInstanceImageMetadata service method, as returned by EC2. + /// REST API Reference for DescribeInstanceImageMetadata Operation + public virtual Task DescribeInstanceImageMetadataAsync(DescribeInstanceImageMetadataRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = DescribeInstanceImageMetadataRequestMarshaller.Instance; + options.ResponseUnmarshaller = DescribeInstanceImageMetadataResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + #region DescribeInstances @@ -16951,7 +17290,7 @@ public virtual DescribeInstanceStatusResponse DescribeInstanceStatus(DescribeIns ///
  • /// /// p3dn.24xlarge | p4d.24xlarge | p4de.24xlarge | p5.48xlarge - /// + /// | p5e.48xlarge /// ///
  • /// @@ -17012,7 +17351,7 @@ public virtual DescribeInstanceTopologyResponse DescribeInstanceTopology(Describ ///
  • /// /// p3dn.24xlarge | p4d.24xlarge | p4de.24xlarge | p5.48xlarge - /// + /// | p5e.48xlarge /// ///
  • /// @@ -17568,7 +17907,7 @@ public virtual DescribeIpv6PoolsResponse DescribeIpv6Pools(DescribeIpv6PoolsRequ /// /// /// For more information about key pairs, see Amazon - /// EC2 key pairs in the Amazon Elastic Compute Cloud User Guide. + /// EC2 key pairs in the Amazon EC2 User Guide. /// ///
    • /// @@ -17586,7 +17925,7 @@ public virtual DescribeKeyPairsResponse DescribeKeyPairs() /// /// /// For more information about key pairs, see Amazon - /// EC2 key pairs in the Amazon Elastic Compute Cloud User Guide. + /// EC2 key pairs in the Amazon EC2 User Guide. /// ///     /// Container for the necessary parameters to execute the DescribeKeyPairs service method. @@ -17609,7 +17948,7 @@ public virtual DescribeKeyPairsResponse DescribeKeyPairs(DescribeKeyPairsRequest /// /// /// For more information about key pairs, see Amazon - /// EC2 key pairs in the Amazon Elastic Compute Cloud User Guide. + /// EC2 key pairs in the Amazon EC2 User Guide. /// /// /// @@ -17629,7 +17968,7 @@ public virtual DescribeKeyPairsResponse DescribeKeyPairs(DescribeKeyPairsRequest /// /// /// For more information about key pairs, see Amazon - /// EC2 key pairs in the Amazon Elastic Compute Cloud User Guide. + /// EC2 key pairs in the Amazon EC2 User Guide. /// /// /// Container for the necessary parameters to execute the DescribeKeyPairs service method. @@ -19994,8 +20333,8 @@ public virtual DescribeScheduledInstancesResponse DescribeScheduledInstances(Des /// - /// Describes the VPCs on the other side of a VPC peering connection that are referencing - /// the security groups you've specified in this request. + /// Describes the VPCs on the other side of a VPC peering or Transit Gateway connection + /// that are referencing the security groups you've specified in this request. /// /// Container for the necessary parameters to execute the DescribeSecurityGroupReferences service method. /// @@ -20012,8 +20351,8 @@ public virtual DescribeSecurityGroupReferencesResponse DescribeSecurityGroupRefe /// - /// Describes the VPCs on the other side of a VPC peering connection that are referencing - /// the security groups you've specified in this request. + /// Describes the VPCs on the other side of a VPC peering or Transit Gateway connection + /// that are referencing the security groups you've specified in this request. /// /// Container for the necessary parameters to execute the DescribeSecurityGroupReferences service method. /// @@ -20141,6 +20480,47 @@ public virtual DescribeSecurityGroupsResponse DescribeSecurityGroups(DescribeSec #endregion + #region DescribeSecurityGroupVpcAssociations + + + /// + /// Describes security group VPC associations made with AssociateSecurityGroupVpc. + /// + /// Container for the necessary parameters to execute the DescribeSecurityGroupVpcAssociations service method. + /// + /// The response from the DescribeSecurityGroupVpcAssociations service method, as returned by EC2. + /// REST API Reference for DescribeSecurityGroupVpcAssociations Operation + public virtual DescribeSecurityGroupVpcAssociationsResponse DescribeSecurityGroupVpcAssociations(DescribeSecurityGroupVpcAssociationsRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = DescribeSecurityGroupVpcAssociationsRequestMarshaller.Instance; + options.ResponseUnmarshaller = DescribeSecurityGroupVpcAssociationsResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// Describes security group VPC associations made with AssociateSecurityGroupVpc. + /// + /// Container for the necessary parameters to execute the DescribeSecurityGroupVpcAssociations service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the DescribeSecurityGroupVpcAssociations service method, as returned by EC2. + /// REST API Reference for DescribeSecurityGroupVpcAssociations Operation + public virtual Task DescribeSecurityGroupVpcAssociationsAsync(DescribeSecurityGroupVpcAssociationsRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = DescribeSecurityGroupVpcAssociationsRequestMarshaller.Instance; + options.ResponseUnmarshaller = DescribeSecurityGroupVpcAssociationsResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + #region DescribeSnapshotAttribute @@ -21096,10 +21476,14 @@ public virtual DescribeSpotPriceHistoryResponse DescribeSpotPriceHistory(Describ /// - /// Describes the stale security group rules for security groups in a specified VPC. Rules - /// are stale when they reference a deleted security group in a peered VPC. Rules can - /// also be stale if they reference a security group in a peer VPC for which the VPC peering - /// connection has been deleted. + /// Describes the stale security group rules for security groups referenced across a VPC + /// peering connection, transit gateway connection, or with a security group VPC association. + /// Rules are stale when they reference a deleted security group. Rules can also be stale + /// if they reference a security group in a peer VPC for which the VPC peering connection + /// has been deleted, across a transit gateway where the transit gateway has been deleted + /// (or the + /// transit gateway security group referencing feature has been disabled), or if a + /// security group VPC association has been disassociated. /// /// Container for the necessary parameters to execute the DescribeStaleSecurityGroups service method. /// @@ -21116,10 +21500,14 @@ public virtual DescribeStaleSecurityGroupsResponse DescribeStaleSecurityGroups(D /// - /// Describes the stale security group rules for security groups in a specified VPC. Rules - /// are stale when they reference a deleted security group in a peered VPC. Rules can - /// also be stale if they reference a security group in a peer VPC for which the VPC peering - /// connection has been deleted. + /// Describes the stale security group rules for security groups referenced across a VPC + /// peering connection, transit gateway connection, or with a security group VPC association. + /// Rules are stale when they reference a deleted security group. Rules can also be stale + /// if they reference a security group in a peer VPC for which the VPC peering connection + /// has been deleted, across a transit gateway where the transit gateway has been deleted + /// (or the + /// transit gateway security group referencing feature has been disabled), or if a + /// security group VPC association has been disassociated. /// /// Container for the necessary parameters to execute the DescribeStaleSecurityGroups service method. /// @@ -24224,7 +24612,7 @@ public virtual DisableFastSnapshotRestoresResponse DisableFastSnapshotRestores(D /// /// /// - /// You can re-enable a disabled AMI using EnableImage. + /// You can re-enable a disabled AMI using EnableImage. /// /// /// @@ -24267,7 +24655,7 @@ public virtual DisableImageResponse DisableImage(DisableImageRequest request) /// /// /// - /// You can re-enable a disabled AMI using EnableImage. + /// You can re-enable a disabled AMI using EnableImage. /// /// /// @@ -24924,6 +25312,53 @@ public virtual DisassociateAddressResponse DisassociateAddress(DisassociateAddre #endregion + #region DisassociateCapacityReservationBillingOwner + + + /// + /// Cancels a pending request to assign billing of the unused capacity of a Capacity Reservation + /// to a consumer account, or revokes a request that has already been accepted. For more + /// information, see Billing + /// assignment for shared Amazon EC2 Capacity Reservations. + /// + /// Container for the necessary parameters to execute the DisassociateCapacityReservationBillingOwner service method. + /// + /// The response from the DisassociateCapacityReservationBillingOwner service method, as returned by EC2. + /// REST API Reference for DisassociateCapacityReservationBillingOwner Operation + public virtual DisassociateCapacityReservationBillingOwnerResponse DisassociateCapacityReservationBillingOwner(DisassociateCapacityReservationBillingOwnerRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = DisassociateCapacityReservationBillingOwnerRequestMarshaller.Instance; + options.ResponseUnmarshaller = DisassociateCapacityReservationBillingOwnerResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// Cancels a pending request to assign billing of the unused capacity of a Capacity Reservation + /// to a consumer account, or revokes a request that has already been accepted. For more + /// information, see Billing + /// assignment for shared Amazon EC2 Capacity Reservations. + /// + /// Container for the necessary parameters to execute the DisassociateCapacityReservationBillingOwner service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the DisassociateCapacityReservationBillingOwner service method, as returned by EC2. + /// REST API Reference for DisassociateCapacityReservationBillingOwner Operation + public virtual Task DisassociateCapacityReservationBillingOwnerAsync(DisassociateCapacityReservationBillingOwnerRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = DisassociateCapacityReservationBillingOwnerRequestMarshaller.Instance; + options.ResponseUnmarshaller = DisassociateCapacityReservationBillingOwnerResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + #region DisassociateClientVpnTargetNetwork @@ -25253,7 +25688,7 @@ public virtual DisassociateIpamResourceDiscoveryResponse DisassociateIpamResourc /// /// Disassociates secondary Elastic IP addresses (EIPs) from a public NAT gateway. You - /// cannot disassociate your primary EIP. For more information, see Edit + /// cannot disassociate your primary EIP. For more information, see Edit /// secondary IP address associations in the Amazon VPC User Guide. /// /// @@ -25287,7 +25722,7 @@ public virtual DisassociateNatGatewayAddressResponse DisassociateNatGatewayAddre /// /// Disassociates secondary Elastic IP addresses (EIPs) from a public NAT gateway. You - /// cannot disassociate your primary EIP. For more information, see Edit + /// cannot disassociate your primary EIP. For more information, see Edit /// secondary IP address associations in the Amazon VPC User Guide. /// /// @@ -25380,6 +25815,53 @@ public virtual DisassociateRouteTableResponse DisassociateRouteTable(Disassociat #endregion + #region DisassociateSecurityGroupVpc + + + /// + /// Disassociates a security group from a VPC. You cannot disassociate the security group + /// if any Elastic network interfaces in the associated VPC are still associated with + /// the security group. Note that the disassociation is asynchronous and you can check + /// the status of the request with DescribeSecurityGroupVpcAssociations. + /// + /// Container for the necessary parameters to execute the DisassociateSecurityGroupVpc service method. + /// + /// The response from the DisassociateSecurityGroupVpc service method, as returned by EC2. + /// REST API Reference for DisassociateSecurityGroupVpc Operation + public virtual DisassociateSecurityGroupVpcResponse DisassociateSecurityGroupVpc(DisassociateSecurityGroupVpcRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = DisassociateSecurityGroupVpcRequestMarshaller.Instance; + options.ResponseUnmarshaller = DisassociateSecurityGroupVpcResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// Disassociates a security group from a VPC. You cannot disassociate the security group + /// if any Elastic network interfaces in the associated VPC are still associated with + /// the security group. Note that the disassociation is asynchronous and you can check + /// the status of the request with DescribeSecurityGroupVpcAssociations. + /// + /// Container for the necessary parameters to execute the DisassociateSecurityGroupVpc service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the DisassociateSecurityGroupVpc service method, as returned by EC2. + /// REST API Reference for DisassociateSecurityGroupVpc Operation + public virtual Task DisassociateSecurityGroupVpcAsync(DisassociateSecurityGroupVpcRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = DisassociateSecurityGroupVpcRequestMarshaller.Instance; + options.ResponseUnmarshaller = DisassociateSecurityGroupVpcResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + #region DisassociateSubnetCidrBlock @@ -27770,12 +28252,11 @@ public virtual GetInstanceTpmEkPubResponse GetInstanceTpmEkPub(GetInstanceTpmEkP /// /// /// - /// For more information, see Preview - /// instance types with specified attributes, Attribute-based - /// instance type selection for EC2 Fleet, Attribute-based - /// instance type selection for Spot Fleet, and Spot + /// For more information, see Preview + /// instance types with specified attributes, Specify + /// attributes for instance type selection for EC2 Fleet or Spot Fleet, and Spot /// placement score in the Amazon EC2 User Guide, and Creating - /// an Auto Scaling group using attribute-based instance type selection in the Amazon + /// mixed instance groups using attribute-based instance type selection in the Amazon /// EC2 Auto Scaling User Guide. /// /// @@ -27806,12 +28287,11 @@ public virtual GetInstanceTypesFromInstanceRequirementsResponse GetInstanceTypes /// /// /// - /// For more information, see Preview - /// instance types with specified attributes, Attribute-based - /// instance type selection for EC2 Fleet, Attribute-based - /// instance type selection for Spot Fleet, and Spot + /// For more information, see Preview + /// instance types with specified attributes, Specify + /// attributes for instance type selection for EC2 Fleet or Spot Fleet, and Spot /// placement score in the Amazon EC2 User Guide, and Creating - /// an Auto Scaling group using attribute-based instance type selection in the Amazon + /// mixed instance groups using attribute-based instance type selection in the Amazon /// EC2 Auto Scaling User Guide. /// /// @@ -29598,16 +30078,14 @@ public virtual ImportInstanceResponse ImportInstance(ImportInstanceRequest reque /// - /// Imports the public key from an RSA or ED25519 key pair that you created with a third-party - /// tool. Compare this with CreateKeyPair, in which Amazon Web Services creates - /// the key pair and gives the keys to you (Amazon Web Services keeps a copy of the public - /// key). With ImportKeyPair, you create the key pair and give Amazon Web Services just - /// the public key. The private key is never transferred between you and Amazon Web Services. + /// Imports the public key from an RSA or ED25519 key pair that you created using a third-party + /// tool. You give Amazon Web Services only the public key. The private key is never transferred + /// between you and Amazon Web Services. /// /// /// - /// For more information about key pairs, see Amazon - /// EC2 key pairs in the Amazon Elastic Compute Cloud User Guide. + /// For more information about the requirements for importing a key pair, see Create + /// a key pair and import the public key to Amazon EC2 in the Amazon EC2 User Guide. /// /// /// Container for the necessary parameters to execute the ImportKeyPair service method. @@ -29625,16 +30103,14 @@ public virtual ImportKeyPairResponse ImportKeyPair(ImportKeyPairRequest request) /// - /// Imports the public key from an RSA or ED25519 key pair that you created with a third-party - /// tool. Compare this with CreateKeyPair, in which Amazon Web Services creates - /// the key pair and gives the keys to you (Amazon Web Services keeps a copy of the public - /// key). With ImportKeyPair, you create the key pair and give Amazon Web Services just - /// the public key. The private key is never transferred between you and Amazon Web Services. + /// Imports the public key from an RSA or ED25519 key pair that you created using a third-party + /// tool. You give Amazon Web Services only the public key. The private key is never transferred + /// between you and Amazon Web Services. /// /// /// - /// For more information about key pairs, see Amazon - /// EC2 key pairs in the Amazon Elastic Compute Cloud User Guide. + /// For more information about the requirements for importing a key pair, see Create + /// a key pair and import the public key to Amazon EC2 in the Amazon EC2 User Guide. /// /// /// Container for the necessary parameters to execute the ImportKeyPair service method. @@ -30977,6 +31453,81 @@ public virtual ModifyInstanceCapacityReservationAttributesResponse ModifyInstanc #endregion + #region ModifyInstanceCpuOptions + + + /// + /// By default, all vCPUs for the instance type are active when you launch an instance. + /// When you configure the number of active vCPUs for the instance, it can help you save + /// on licensing costs and optimize performance. The base cost of the instance remains + /// unchanged. + /// + /// + /// + /// The number of active vCPUs equals the number of threads per CPU core multiplied by + /// the number of cores. The instance must be in a Stopped state before you make + /// changes. + /// + /// + /// + /// Some instance type options do not support this capability. For more information, see + /// Supported + /// CPU options in the Amazon EC2 User Guide. + /// + /// + /// + /// Container for the necessary parameters to execute the ModifyInstanceCpuOptions service method. + /// + /// The response from the ModifyInstanceCpuOptions service method, as returned by EC2. + /// REST API Reference for ModifyInstanceCpuOptions Operation + public virtual ModifyInstanceCpuOptionsResponse ModifyInstanceCpuOptions(ModifyInstanceCpuOptionsRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = ModifyInstanceCpuOptionsRequestMarshaller.Instance; + options.ResponseUnmarshaller = ModifyInstanceCpuOptionsResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// By default, all vCPUs for the instance type are active when you launch an instance. + /// When you configure the number of active vCPUs for the instance, it can help you save + /// on licensing costs and optimize performance. The base cost of the instance remains + /// unchanged. + /// + /// + /// + /// The number of active vCPUs equals the number of threads per CPU core multiplied by + /// the number of cores. The instance must be in a Stopped state before you make + /// changes. + /// + /// + /// + /// Some instance type options do not support this capability. For more information, see + /// Supported + /// CPU options in the Amazon EC2 User Guide. + /// + /// + /// + /// Container for the necessary parameters to execute the ModifyInstanceCpuOptions service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the ModifyInstanceCpuOptions service method, as returned by EC2. + /// REST API Reference for ModifyInstanceCpuOptions Operation + public virtual Task ModifyInstanceCpuOptionsAsync(ModifyInstanceCpuOptionsRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = ModifyInstanceCpuOptionsRequestMarshaller.Instance; + options.ResponseUnmarshaller = ModifyInstanceCpuOptionsResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + #region ModifyInstanceCreditSpecification @@ -35016,6 +35567,51 @@ public virtual RegisterTransitGatewayMulticastGroupSourcesResponse RegisterTrans #endregion + #region RejectCapacityReservationBillingOwnership + + + /// + /// Rejects a request to assign billing of the available capacity of a shared Capacity + /// Reservation to your account. For more information, see + /// Billing assignment for shared Amazon EC2 Capacity Reservations. + /// + /// Container for the necessary parameters to execute the RejectCapacityReservationBillingOwnership service method. + /// + /// The response from the RejectCapacityReservationBillingOwnership service method, as returned by EC2. + /// REST API Reference for RejectCapacityReservationBillingOwnership Operation + public virtual RejectCapacityReservationBillingOwnershipResponse RejectCapacityReservationBillingOwnership(RejectCapacityReservationBillingOwnershipRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = RejectCapacityReservationBillingOwnershipRequestMarshaller.Instance; + options.ResponseUnmarshaller = RejectCapacityReservationBillingOwnershipResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// Rejects a request to assign billing of the available capacity of a shared Capacity + /// Reservation to your account. For more information, see + /// Billing assignment for shared Amazon EC2 Capacity Reservations. + /// + /// Container for the necessary parameters to execute the RejectCapacityReservationBillingOwnership service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the RejectCapacityReservationBillingOwnership service method, as returned by EC2. + /// REST API Reference for RejectCapacityReservationBillingOwnership Operation + public virtual Task RejectCapacityReservationBillingOwnershipAsync(RejectCapacityReservationBillingOwnershipRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = RejectCapacityReservationBillingOwnershipRequestMarshaller.Instance; + options.ResponseUnmarshaller = RejectCapacityReservationBillingOwnershipResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + #region RejectTransitGatewayMulticastDomainAssociations @@ -38127,7 +38723,7 @@ public virtual UnassignPrivateIpAddressesResponse UnassignPrivateIpAddresses(Una /// /// Unassigns secondary private IPv4 addresses from a private NAT gateway. You cannot - /// unassign your primary private IP. For more information, see Edit + /// unassign your primary private IP. For more information, see Edit /// secondary IP address associations in the Amazon VPC User Guide. /// /// @@ -38161,7 +38757,7 @@ public virtual UnassignPrivateNatGatewayAddressResponse UnassignPrivateNatGatewa /// /// Unassigns secondary private IPv4 addresses from a private NAT gateway. You cannot - /// unassign your primary private IP. For more information, see Edit + /// unassign your primary private IP. For more information, see Edit /// secondary IP address associations in the Amazon VPC User Guide. /// /// diff --git a/sdk/src/Services/EC2/Properties/AssemblyInfo.cs b/sdk/src/Services/EC2/Properties/AssemblyInfo.cs index b9357e6e6710..d9905a8549b2 100644 --- a/sdk/src/Services/EC2/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/EC2/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.406.4")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.416.0")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/EC2InstanceConnect/EC2InstanceConnect.sln b/sdk/src/Services/EC2InstanceConnect/EC2InstanceConnect.sln index f85ad59be78a..4168b2db1a13 100644 --- a/sdk/src/Services/EC2InstanceConnect/EC2InstanceConnect.sln +++ b/sdk/src/Services/EC2InstanceConnect/EC2InstanceConnect.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {2999BC08-5E79-461A-BD60-431C7FDD1C9F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {2999BC08-5E79-461A-BD60-431C7FDD1C9F}.Debug|Any CPU.Build.0 = Debug|Any CPU {2999BC08-5E79-461A-BD60-431C7FDD1C9F}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {CF33F254-B727-4329-AC83-489DF0CB08B3}.Debug|Any CPU.Build.0 = Debug|Any CPU {CF33F254-B727-4329-AC83-489DF0CB08B3}.Release|Any CPU.ActiveCfg = Release|Any CPU {CF33F254-B727-4329-AC83-489DF0CB08B3}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {EBA29B17-2E67-4D35-8F72-DA404B833E40}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EBA29B17-2E67-4D35-8F72-DA404B833E40}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EBA29B17-2E67-4D35-8F72-DA404B833E40}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EBA29B17-2E67-4D35-8F72-DA404B833E40}.Release|Any CPU.Build.0 = Release|Any CPU - {62BCDB75-12AE-4F59-B3C9-26385E10D4EE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {62BCDB75-12AE-4F59-B3C9-26385E10D4EE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {62BCDB75-12AE-4F59-B3C9-26385E10D4EE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {62BCDB75-12AE-4F59-B3C9-26385E10D4EE}.Release|Any CPU.Build.0 = Release|Any CPU - {888D260E-C36D-4CC4-8F88-92AEAC88838D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {888D260E-C36D-4CC4-8F88-92AEAC88838D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {888D260E-C36D-4CC4-8F88-92AEAC88838D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {888D260E-C36D-4CC4-8F88-92AEAC88838D}.Release|Any CPU.Build.0 = Release|Any CPU - {D1FCAB22-EC9B-4C28-A76A-21D6817A2CD9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D1FCAB22-EC9B-4C28-A76A-21D6817A2CD9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D1FCAB22-EC9B-4C28-A76A-21D6817A2CD9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D1FCAB22-EC9B-4C28-A76A-21D6817A2CD9}.Release|Any CPU.Build.0 = Release|Any CPU - {E813EAB3-FAB3-4D0B-B6A5-93220E631AF9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E813EAB3-FAB3-4D0B-B6A5-93220E631AF9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E813EAB3-FAB3-4D0B-B6A5-93220E631AF9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E813EAB3-FAB3-4D0B-B6A5-93220E631AF9}.Release|Any CPU.Build.0 = Release|Any CPU - {87C9F6D1-44FD-4568-BB0E-51C670A93857}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87C9F6D1-44FD-4568-BB0E-51C670A93857}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87C9F6D1-44FD-4568-BB0E-51C670A93857}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87C9F6D1-44FD-4568-BB0E-51C670A93857}.Release|Any CPU.Build.0 = Release|Any CPU - {B5A4AE11-490B-46F5-9F78-DDA4646EC18E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B5A4AE11-490B-46F5-9F78-DDA4646EC18E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B5A4AE11-490B-46F5-9F78-DDA4646EC18E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B5A4AE11-490B-46F5-9F78-DDA4646EC18E}.Release|Any CPU.Build.0 = Release|Any CPU - {3F83DD0D-377D-4621-8C0A-4A172EC4D6EC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3F83DD0D-377D-4621-8C0A-4A172EC4D6EC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3F83DD0D-377D-4621-8C0A-4A172EC4D6EC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3F83DD0D-377D-4621-8C0A-4A172EC4D6EC}.Release|Any CPU.Build.0 = Release|Any CPU - {2A2BFFC7-8E4E-4166-8AA0-00667A7B6675}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2A2BFFC7-8E4E-4166-8AA0-00667A7B6675}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2A2BFFC7-8E4E-4166-8AA0-00667A7B6675}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2A2BFFC7-8E4E-4166-8AA0-00667A7B6675}.Release|Any CPU.Build.0 = Release|Any CPU - {AE3D4057-E657-4175-B335-FE2AD34FCB6D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AE3D4057-E657-4175-B335-FE2AD34FCB6D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AE3D4057-E657-4175-B335-FE2AD34FCB6D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AE3D4057-E657-4175-B335-FE2AD34FCB6D}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {EBA29B17-2E67-4D35-8F72-DA404B833E40}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EBA29B17-2E67-4D35-8F72-DA404B833E40}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EBA29B17-2E67-4D35-8F72-DA404B833E40}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EBA29B17-2E67-4D35-8F72-DA404B833E40}.Release|Any CPU.Build.0 = Release|Any CPU - {62BCDB75-12AE-4F59-B3C9-26385E10D4EE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {62BCDB75-12AE-4F59-B3C9-26385E10D4EE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {62BCDB75-12AE-4F59-B3C9-26385E10D4EE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {62BCDB75-12AE-4F59-B3C9-26385E10D4EE}.Release|Any CPU.Build.0 = Release|Any CPU - {888D260E-C36D-4CC4-8F88-92AEAC88838D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {888D260E-C36D-4CC4-8F88-92AEAC88838D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {888D260E-C36D-4CC4-8F88-92AEAC88838D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {888D260E-C36D-4CC4-8F88-92AEAC88838D}.Release|Any CPU.Build.0 = Release|Any CPU - {D1FCAB22-EC9B-4C28-A76A-21D6817A2CD9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D1FCAB22-EC9B-4C28-A76A-21D6817A2CD9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D1FCAB22-EC9B-4C28-A76A-21D6817A2CD9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D1FCAB22-EC9B-4C28-A76A-21D6817A2CD9}.Release|Any CPU.Build.0 = Release|Any CPU - {E813EAB3-FAB3-4D0B-B6A5-93220E631AF9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E813EAB3-FAB3-4D0B-B6A5-93220E631AF9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E813EAB3-FAB3-4D0B-B6A5-93220E631AF9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E813EAB3-FAB3-4D0B-B6A5-93220E631AF9}.Release|Any CPU.Build.0 = Release|Any CPU - {87C9F6D1-44FD-4568-BB0E-51C670A93857}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87C9F6D1-44FD-4568-BB0E-51C670A93857}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87C9F6D1-44FD-4568-BB0E-51C670A93857}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87C9F6D1-44FD-4568-BB0E-51C670A93857}.Release|Any CPU.Build.0 = Release|Any CPU - {B5A4AE11-490B-46F5-9F78-DDA4646EC18E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B5A4AE11-490B-46F5-9F78-DDA4646EC18E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B5A4AE11-490B-46F5-9F78-DDA4646EC18E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B5A4AE11-490B-46F5-9F78-DDA4646EC18E}.Release|Any CPU.Build.0 = Release|Any CPU - {3F83DD0D-377D-4621-8C0A-4A172EC4D6EC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3F83DD0D-377D-4621-8C0A-4A172EC4D6EC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3F83DD0D-377D-4621-8C0A-4A172EC4D6EC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3F83DD0D-377D-4621-8C0A-4A172EC4D6EC}.Release|Any CPU.Build.0 = Release|Any CPU - {2A2BFFC7-8E4E-4166-8AA0-00667A7B6675}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2A2BFFC7-8E4E-4166-8AA0-00667A7B6675}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2A2BFFC7-8E4E-4166-8AA0-00667A7B6675}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2A2BFFC7-8E4E-4166-8AA0-00667A7B6675}.Release|Any CPU.Build.0 = Release|Any CPU - {AE3D4057-E657-4175-B335-FE2AD34FCB6D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AE3D4057-E657-4175-B335-FE2AD34FCB6D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AE3D4057-E657-4175-B335-FE2AD34FCB6D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AE3D4057-E657-4175-B335-FE2AD34FCB6D}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {2999BC08-5E79-461A-BD60-431C7FDD1C9F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {66525D2C-6E5F-41E6-BA3C-788061DA5740} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {68669A8C-F22B-4499-964D-9EFD02CF0DC0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {3947B5DB-E5DF-4123-BECA-8163E41EC9D3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {CF33F254-B727-4329-AC83-489DF0CB08B3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {EBA29B17-2E67-4D35-8F72-DA404B833E40} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {62BCDB75-12AE-4F59-B3C9-26385E10D4EE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {888D260E-C36D-4CC4-8F88-92AEAC88838D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D1FCAB22-EC9B-4C28-A76A-21D6817A2CD9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E813EAB3-FAB3-4D0B-B6A5-93220E631AF9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {87C9F6D1-44FD-4568-BB0E-51C670A93857} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B5A4AE11-490B-46F5-9F78-DDA4646EC18E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {3F83DD0D-377D-4621-8C0A-4A172EC4D6EC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {2A2BFFC7-8E4E-4166-8AA0-00667A7B6675} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {AE3D4057-E657-4175-B335-FE2AD34FCB6D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {EBA29B17-2E67-4D35-8F72-DA404B833E40} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {62BCDB75-12AE-4F59-B3C9-26385E10D4EE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {888D260E-C36D-4CC4-8F88-92AEAC88838D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D1FCAB22-EC9B-4C28-A76A-21D6817A2CD9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E813EAB3-FAB3-4D0B-B6A5-93220E631AF9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {87C9F6D1-44FD-4568-BB0E-51C670A93857} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B5A4AE11-490B-46F5-9F78-DDA4646EC18E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {3F83DD0D-377D-4621-8C0A-4A172EC4D6EC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {2A2BFFC7-8E4E-4166-8AA0-00667A7B6675} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {AE3D4057-E657-4175-B335-FE2AD34FCB6D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {A11CF810-DFDB-43C3-8705-B1CB28FEDFCE} diff --git a/sdk/src/Services/EC2InstanceConnect/Generated/AmazonEC2InstanceConnectConfig.cs b/sdk/src/Services/EC2InstanceConnect/Generated/AmazonEC2InstanceConnectConfig.cs index 97bc568ac7df..eb66f7b71501 100644 --- a/sdk/src/Services/EC2InstanceConnect/Generated/AmazonEC2InstanceConnectConfig.cs +++ b/sdk/src/Services/EC2InstanceConnect/Generated/AmazonEC2InstanceConnectConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.EC2InstanceConnect public partial class AmazonEC2InstanceConnectConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("EC2 Instance Connect", "4.0.0.0"); private static readonly AmazonEC2InstanceConnectEndpointResolver EndpointResolver = new AmazonEC2InstanceConnectEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("EC2 Instance Connect", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("EC2 Instance Connect", "3.7.400.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/EC2InstanceConnect/Properties/AssemblyInfo.cs b/sdk/src/Services/EC2InstanceConnect/Properties/AssemblyInfo.cs index f328a6f29443..df68d893fa60 100644 --- a/sdk/src/Services/EC2InstanceConnect/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/EC2InstanceConnect/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/ECR/ECR.sln b/sdk/src/Services/ECR/ECR.sln index fa25757e7e60..aae7434cc411 100644 --- a/sdk/src/Services/ECR/ECR.sln +++ b/sdk/src/Services/ECR/ECR.sln @@ -92,7 +92,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {789BEF72-67C6-46D9-BD4A-70AA4F56CB93}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {789BEF72-67C6-46D9-BD4A-70AA4F56CB93}.Debug|Any CPU.Build.0 = Debug|Any CPU {789BEF72-67C6-46D9-BD4A-70AA4F56CB93}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -113,97 +120,6 @@ Global {A4200ED2-E1C0-4C56-91FA-65BE4E1B393C}.Debug|Any CPU.Build.0 = Debug|Any CPU {A4200ED2-E1C0-4C56-91FA-65BE4E1B393C}.Release|Any CPU.ActiveCfg = Release|Any CPU {A4200ED2-E1C0-4C56-91FA-65BE4E1B393C}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {01B4878F-5268-4BC5-A8F4-29C14E3B70A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {01B4878F-5268-4BC5-A8F4-29C14E3B70A2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {01B4878F-5268-4BC5-A8F4-29C14E3B70A2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {01B4878F-5268-4BC5-A8F4-29C14E3B70A2}.Release|Any CPU.Build.0 = Release|Any CPU - {50C00B42-E01D-4AED-B20B-77537CDD9C32}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {50C00B42-E01D-4AED-B20B-77537CDD9C32}.Debug|Any CPU.Build.0 = Debug|Any CPU - {50C00B42-E01D-4AED-B20B-77537CDD9C32}.Release|Any CPU.ActiveCfg = Release|Any CPU - {50C00B42-E01D-4AED-B20B-77537CDD9C32}.Release|Any CPU.Build.0 = Release|Any CPU - {8611157E-BAC5-456F-BAF8-E255511E4BEA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8611157E-BAC5-456F-BAF8-E255511E4BEA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8611157E-BAC5-456F-BAF8-E255511E4BEA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8611157E-BAC5-456F-BAF8-E255511E4BEA}.Release|Any CPU.Build.0 = Release|Any CPU - {2E7F6A24-299F-4B31-9EA8-1B181C37C6A5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2E7F6A24-299F-4B31-9EA8-1B181C37C6A5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2E7F6A24-299F-4B31-9EA8-1B181C37C6A5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2E7F6A24-299F-4B31-9EA8-1B181C37C6A5}.Release|Any CPU.Build.0 = Release|Any CPU - {01D8FD56-DF16-4524-BF5F-DE22F5A0C472}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {01D8FD56-DF16-4524-BF5F-DE22F5A0C472}.Debug|Any CPU.Build.0 = Debug|Any CPU - {01D8FD56-DF16-4524-BF5F-DE22F5A0C472}.Release|Any CPU.ActiveCfg = Release|Any CPU - {01D8FD56-DF16-4524-BF5F-DE22F5A0C472}.Release|Any CPU.Build.0 = Release|Any CPU - {51018B14-10D6-4DCA-88EE-E1BF553A7448}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {51018B14-10D6-4DCA-88EE-E1BF553A7448}.Debug|Any CPU.Build.0 = Debug|Any CPU - {51018B14-10D6-4DCA-88EE-E1BF553A7448}.Release|Any CPU.ActiveCfg = Release|Any CPU - {51018B14-10D6-4DCA-88EE-E1BF553A7448}.Release|Any CPU.Build.0 = Release|Any CPU - {7B399DCE-6807-4F2B-93A0-2713FF2CDC36}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7B399DCE-6807-4F2B-93A0-2713FF2CDC36}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7B399DCE-6807-4F2B-93A0-2713FF2CDC36}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7B399DCE-6807-4F2B-93A0-2713FF2CDC36}.Release|Any CPU.Build.0 = Release|Any CPU - {C7760EC2-B809-4403-82CA-21F0AF9D699D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C7760EC2-B809-4403-82CA-21F0AF9D699D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C7760EC2-B809-4403-82CA-21F0AF9D699D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C7760EC2-B809-4403-82CA-21F0AF9D699D}.Release|Any CPU.Build.0 = Release|Any CPU - {BF7CAC23-DB05-4AFC-9E2F-94D63F3A28FF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BF7CAC23-DB05-4AFC-9E2F-94D63F3A28FF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BF7CAC23-DB05-4AFC-9E2F-94D63F3A28FF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BF7CAC23-DB05-4AFC-9E2F-94D63F3A28FF}.Release|Any CPU.Build.0 = Release|Any CPU - {4EA6C513-F04B-437E-BA13-BC36965786CD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4EA6C513-F04B-437E-BA13-BC36965786CD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4EA6C513-F04B-437E-BA13-BC36965786CD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4EA6C513-F04B-437E-BA13-BC36965786CD}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {01B4878F-5268-4BC5-A8F4-29C14E3B70A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {01B4878F-5268-4BC5-A8F4-29C14E3B70A2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {01B4878F-5268-4BC5-A8F4-29C14E3B70A2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {01B4878F-5268-4BC5-A8F4-29C14E3B70A2}.Release|Any CPU.Build.0 = Release|Any CPU - {50C00B42-E01D-4AED-B20B-77537CDD9C32}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {50C00B42-E01D-4AED-B20B-77537CDD9C32}.Debug|Any CPU.Build.0 = Debug|Any CPU - {50C00B42-E01D-4AED-B20B-77537CDD9C32}.Release|Any CPU.ActiveCfg = Release|Any CPU - {50C00B42-E01D-4AED-B20B-77537CDD9C32}.Release|Any CPU.Build.0 = Release|Any CPU - {8611157E-BAC5-456F-BAF8-E255511E4BEA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8611157E-BAC5-456F-BAF8-E255511E4BEA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8611157E-BAC5-456F-BAF8-E255511E4BEA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8611157E-BAC5-456F-BAF8-E255511E4BEA}.Release|Any CPU.Build.0 = Release|Any CPU - {2E7F6A24-299F-4B31-9EA8-1B181C37C6A5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2E7F6A24-299F-4B31-9EA8-1B181C37C6A5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2E7F6A24-299F-4B31-9EA8-1B181C37C6A5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2E7F6A24-299F-4B31-9EA8-1B181C37C6A5}.Release|Any CPU.Build.0 = Release|Any CPU - {01D8FD56-DF16-4524-BF5F-DE22F5A0C472}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {01D8FD56-DF16-4524-BF5F-DE22F5A0C472}.Debug|Any CPU.Build.0 = Debug|Any CPU - {01D8FD56-DF16-4524-BF5F-DE22F5A0C472}.Release|Any CPU.ActiveCfg = Release|Any CPU - {01D8FD56-DF16-4524-BF5F-DE22F5A0C472}.Release|Any CPU.Build.0 = Release|Any CPU - {51018B14-10D6-4DCA-88EE-E1BF553A7448}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {51018B14-10D6-4DCA-88EE-E1BF553A7448}.Debug|Any CPU.Build.0 = Debug|Any CPU - {51018B14-10D6-4DCA-88EE-E1BF553A7448}.Release|Any CPU.ActiveCfg = Release|Any CPU - {51018B14-10D6-4DCA-88EE-E1BF553A7448}.Release|Any CPU.Build.0 = Release|Any CPU - {7B399DCE-6807-4F2B-93A0-2713FF2CDC36}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7B399DCE-6807-4F2B-93A0-2713FF2CDC36}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7B399DCE-6807-4F2B-93A0-2713FF2CDC36}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7B399DCE-6807-4F2B-93A0-2713FF2CDC36}.Release|Any CPU.Build.0 = Release|Any CPU - {C7760EC2-B809-4403-82CA-21F0AF9D699D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C7760EC2-B809-4403-82CA-21F0AF9D699D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C7760EC2-B809-4403-82CA-21F0AF9D699D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C7760EC2-B809-4403-82CA-21F0AF9D699D}.Release|Any CPU.Build.0 = Release|Any CPU - {BF7CAC23-DB05-4AFC-9E2F-94D63F3A28FF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BF7CAC23-DB05-4AFC-9E2F-94D63F3A28FF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BF7CAC23-DB05-4AFC-9E2F-94D63F3A28FF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BF7CAC23-DB05-4AFC-9E2F-94D63F3A28FF}.Release|Any CPU.Build.0 = Release|Any CPU - {4EA6C513-F04B-437E-BA13-BC36965786CD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4EA6C513-F04B-437E-BA13-BC36965786CD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4EA6C513-F04B-437E-BA13-BC36965786CD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4EA6C513-F04B-437E-BA13-BC36965786CD}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -220,37 +136,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {789BEF72-67C6-46D9-BD4A-70AA4F56CB93} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {BD68A31D-870F-4D62-99ED-28B9CA7A3F64} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {DF99F6F5-45C0-4C77-BB0A-00F983E90583} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {E7720FCE-6AF1-4BFE-A9F6-4586EB1E17FC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {A4200ED2-E1C0-4C56-91FA-65BE4E1B393C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {01B4878F-5268-4BC5-A8F4-29C14E3B70A2} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {50C00B42-E01D-4AED-B20B-77537CDD9C32} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8611157E-BAC5-456F-BAF8-E255511E4BEA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {2E7F6A24-299F-4B31-9EA8-1B181C37C6A5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {01D8FD56-DF16-4524-BF5F-DE22F5A0C472} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {51018B14-10D6-4DCA-88EE-E1BF553A7448} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {7B399DCE-6807-4F2B-93A0-2713FF2CDC36} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C7760EC2-B809-4403-82CA-21F0AF9D699D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {BF7CAC23-DB05-4AFC-9E2F-94D63F3A28FF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4EA6C513-F04B-437E-BA13-BC36965786CD} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {01B4878F-5268-4BC5-A8F4-29C14E3B70A2} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {50C00B42-E01D-4AED-B20B-77537CDD9C32} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8611157E-BAC5-456F-BAF8-E255511E4BEA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {2E7F6A24-299F-4B31-9EA8-1B181C37C6A5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {01D8FD56-DF16-4524-BF5F-DE22F5A0C472} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {51018B14-10D6-4DCA-88EE-E1BF553A7448} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {7B399DCE-6807-4F2B-93A0-2713FF2CDC36} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C7760EC2-B809-4403-82CA-21F0AF9D699D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {BF7CAC23-DB05-4AFC-9E2F-94D63F3A28FF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4EA6C513-F04B-437E-BA13-BC36965786CD} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {711C888A-14D6-4560-AC1C-63E0C279F59B} diff --git a/sdk/src/Services/ECR/Generated/AmazonECRConfig.cs b/sdk/src/Services/ECR/Generated/AmazonECRConfig.cs index bd3f9b27f1c1..f832f6b33176 100644 --- a/sdk/src/Services/ECR/Generated/AmazonECRConfig.cs +++ b/sdk/src/Services/ECR/Generated/AmazonECRConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.ECR public partial class AmazonECRConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("ECR", "4.0.0.0"); private static readonly AmazonECREndpointResolver EndpointResolver = new AmazonECREndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("ECR", "3.7.404.5"); -======= - InternalSDKUtils.BuildUserAgentString("ECR", "3.7.404.32"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/ECR/Properties/AssemblyInfo.cs b/sdk/src/Services/ECR/Properties/AssemblyInfo.cs index a80189df7bcf..f0d17b6032a1 100644 --- a/sdk/src/Services/ECR/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/ECR/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.404.5")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.404.32")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/ECRPublic/ECRPublic.sln b/sdk/src/Services/ECRPublic/ECRPublic.sln index 78c01802ccb1..90e2fb5454aa 100644 --- a/sdk/src/Services/ECRPublic/ECRPublic.sln +++ b/sdk/src/Services/ECRPublic/ECRPublic.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {96BBE9AF-CDBA-480B-920A-52A87A8C78F4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {96BBE9AF-CDBA-480B-920A-52A87A8C78F4}.Debug|Any CPU.Build.0 = Debug|Any CPU {96BBE9AF-CDBA-480B-920A-52A87A8C78F4}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {0C503615-4F59-4BB4-9B70-11473CCB5EEA}.Debug|Any CPU.Build.0 = Debug|Any CPU {0C503615-4F59-4BB4-9B70-11473CCB5EEA}.Release|Any CPU.ActiveCfg = Release|Any CPU {0C503615-4F59-4BB4-9B70-11473CCB5EEA}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {006A274F-96C8-4AA1-AD0A-F7B88EEECE74}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {006A274F-96C8-4AA1-AD0A-F7B88EEECE74}.Debug|Any CPU.Build.0 = Debug|Any CPU - {006A274F-96C8-4AA1-AD0A-F7B88EEECE74}.Release|Any CPU.ActiveCfg = Release|Any CPU - {006A274F-96C8-4AA1-AD0A-F7B88EEECE74}.Release|Any CPU.Build.0 = Release|Any CPU - {9AC644ED-80DE-40C5-9CC1-B6033F5507C7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9AC644ED-80DE-40C5-9CC1-B6033F5507C7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9AC644ED-80DE-40C5-9CC1-B6033F5507C7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9AC644ED-80DE-40C5-9CC1-B6033F5507C7}.Release|Any CPU.Build.0 = Release|Any CPU - {E5816821-1CB6-4A3B-9590-45D83BCA6D7D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E5816821-1CB6-4A3B-9590-45D83BCA6D7D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E5816821-1CB6-4A3B-9590-45D83BCA6D7D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E5816821-1CB6-4A3B-9590-45D83BCA6D7D}.Release|Any CPU.Build.0 = Release|Any CPU - {7DDF68FB-A7DF-48EB-8FE8-C529FDF163C1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7DDF68FB-A7DF-48EB-8FE8-C529FDF163C1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7DDF68FB-A7DF-48EB-8FE8-C529FDF163C1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7DDF68FB-A7DF-48EB-8FE8-C529FDF163C1}.Release|Any CPU.Build.0 = Release|Any CPU - {8608746F-6C77-4CC1-ACE0-A86700A2D435}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8608746F-6C77-4CC1-ACE0-A86700A2D435}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8608746F-6C77-4CC1-ACE0-A86700A2D435}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8608746F-6C77-4CC1-ACE0-A86700A2D435}.Release|Any CPU.Build.0 = Release|Any CPU - {2E886E00-55F6-4480-BB03-C1F81EBB23C7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2E886E00-55F6-4480-BB03-C1F81EBB23C7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2E886E00-55F6-4480-BB03-C1F81EBB23C7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2E886E00-55F6-4480-BB03-C1F81EBB23C7}.Release|Any CPU.Build.0 = Release|Any CPU - {BEC61241-02F7-4E5B-8102-E090A307D7AE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BEC61241-02F7-4E5B-8102-E090A307D7AE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BEC61241-02F7-4E5B-8102-E090A307D7AE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BEC61241-02F7-4E5B-8102-E090A307D7AE}.Release|Any CPU.Build.0 = Release|Any CPU - {0F708F6A-FF29-4BC5-AFFE-3A281F003211}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0F708F6A-FF29-4BC5-AFFE-3A281F003211}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0F708F6A-FF29-4BC5-AFFE-3A281F003211}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0F708F6A-FF29-4BC5-AFFE-3A281F003211}.Release|Any CPU.Build.0 = Release|Any CPU - {699B8D63-C23E-4EAA-8624-05FCC50F1396}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {699B8D63-C23E-4EAA-8624-05FCC50F1396}.Debug|Any CPU.Build.0 = Debug|Any CPU - {699B8D63-C23E-4EAA-8624-05FCC50F1396}.Release|Any CPU.ActiveCfg = Release|Any CPU - {699B8D63-C23E-4EAA-8624-05FCC50F1396}.Release|Any CPU.Build.0 = Release|Any CPU - {FF5ACE71-70CA-4858-95B3-2D1C484EF7C9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FF5ACE71-70CA-4858-95B3-2D1C484EF7C9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FF5ACE71-70CA-4858-95B3-2D1C484EF7C9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FF5ACE71-70CA-4858-95B3-2D1C484EF7C9}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {006A274F-96C8-4AA1-AD0A-F7B88EEECE74}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {006A274F-96C8-4AA1-AD0A-F7B88EEECE74}.Debug|Any CPU.Build.0 = Debug|Any CPU - {006A274F-96C8-4AA1-AD0A-F7B88EEECE74}.Release|Any CPU.ActiveCfg = Release|Any CPU - {006A274F-96C8-4AA1-AD0A-F7B88EEECE74}.Release|Any CPU.Build.0 = Release|Any CPU - {9AC644ED-80DE-40C5-9CC1-B6033F5507C7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9AC644ED-80DE-40C5-9CC1-B6033F5507C7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9AC644ED-80DE-40C5-9CC1-B6033F5507C7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9AC644ED-80DE-40C5-9CC1-B6033F5507C7}.Release|Any CPU.Build.0 = Release|Any CPU - {E5816821-1CB6-4A3B-9590-45D83BCA6D7D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E5816821-1CB6-4A3B-9590-45D83BCA6D7D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E5816821-1CB6-4A3B-9590-45D83BCA6D7D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E5816821-1CB6-4A3B-9590-45D83BCA6D7D}.Release|Any CPU.Build.0 = Release|Any CPU - {7DDF68FB-A7DF-48EB-8FE8-C529FDF163C1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7DDF68FB-A7DF-48EB-8FE8-C529FDF163C1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7DDF68FB-A7DF-48EB-8FE8-C529FDF163C1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7DDF68FB-A7DF-48EB-8FE8-C529FDF163C1}.Release|Any CPU.Build.0 = Release|Any CPU - {8608746F-6C77-4CC1-ACE0-A86700A2D435}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8608746F-6C77-4CC1-ACE0-A86700A2D435}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8608746F-6C77-4CC1-ACE0-A86700A2D435}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8608746F-6C77-4CC1-ACE0-A86700A2D435}.Release|Any CPU.Build.0 = Release|Any CPU - {2E886E00-55F6-4480-BB03-C1F81EBB23C7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2E886E00-55F6-4480-BB03-C1F81EBB23C7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2E886E00-55F6-4480-BB03-C1F81EBB23C7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2E886E00-55F6-4480-BB03-C1F81EBB23C7}.Release|Any CPU.Build.0 = Release|Any CPU - {BEC61241-02F7-4E5B-8102-E090A307D7AE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BEC61241-02F7-4E5B-8102-E090A307D7AE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BEC61241-02F7-4E5B-8102-E090A307D7AE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BEC61241-02F7-4E5B-8102-E090A307D7AE}.Release|Any CPU.Build.0 = Release|Any CPU - {0F708F6A-FF29-4BC5-AFFE-3A281F003211}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0F708F6A-FF29-4BC5-AFFE-3A281F003211}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0F708F6A-FF29-4BC5-AFFE-3A281F003211}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0F708F6A-FF29-4BC5-AFFE-3A281F003211}.Release|Any CPU.Build.0 = Release|Any CPU - {699B8D63-C23E-4EAA-8624-05FCC50F1396}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {699B8D63-C23E-4EAA-8624-05FCC50F1396}.Debug|Any CPU.Build.0 = Debug|Any CPU - {699B8D63-C23E-4EAA-8624-05FCC50F1396}.Release|Any CPU.ActiveCfg = Release|Any CPU - {699B8D63-C23E-4EAA-8624-05FCC50F1396}.Release|Any CPU.Build.0 = Release|Any CPU - {FF5ACE71-70CA-4858-95B3-2D1C484EF7C9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FF5ACE71-70CA-4858-95B3-2D1C484EF7C9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FF5ACE71-70CA-4858-95B3-2D1C484EF7C9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FF5ACE71-70CA-4858-95B3-2D1C484EF7C9}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {96BBE9AF-CDBA-480B-920A-52A87A8C78F4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {419EF291-4181-41E2-8752-D55BD94336B4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {E3DF000D-5119-460C-9DFF-199CB23DE253} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {7567A684-E38E-4BC0-9C72-F5EF159F1D80} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {0C503615-4F59-4BB4-9B70-11473CCB5EEA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {006A274F-96C8-4AA1-AD0A-F7B88EEECE74} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {9AC644ED-80DE-40C5-9CC1-B6033F5507C7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E5816821-1CB6-4A3B-9590-45D83BCA6D7D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {7DDF68FB-A7DF-48EB-8FE8-C529FDF163C1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8608746F-6C77-4CC1-ACE0-A86700A2D435} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {2E886E00-55F6-4480-BB03-C1F81EBB23C7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {BEC61241-02F7-4E5B-8102-E090A307D7AE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0F708F6A-FF29-4BC5-AFFE-3A281F003211} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {699B8D63-C23E-4EAA-8624-05FCC50F1396} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {FF5ACE71-70CA-4858-95B3-2D1C484EF7C9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {006A274F-96C8-4AA1-AD0A-F7B88EEECE74} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {9AC644ED-80DE-40C5-9CC1-B6033F5507C7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E5816821-1CB6-4A3B-9590-45D83BCA6D7D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {7DDF68FB-A7DF-48EB-8FE8-C529FDF163C1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8608746F-6C77-4CC1-ACE0-A86700A2D435} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {2E886E00-55F6-4480-BB03-C1F81EBB23C7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {BEC61241-02F7-4E5B-8102-E090A307D7AE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0F708F6A-FF29-4BC5-AFFE-3A281F003211} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {699B8D63-C23E-4EAA-8624-05FCC50F1396} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {FF5ACE71-70CA-4858-95B3-2D1C484EF7C9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {F300847F-4C13-4839-A316-BFA39F1C6D80} diff --git a/sdk/src/Services/ECRPublic/Generated/AmazonECRPublicConfig.cs b/sdk/src/Services/ECRPublic/Generated/AmazonECRPublicConfig.cs index 64c6ed20dbb5..8d757497f04c 100644 --- a/sdk/src/Services/ECRPublic/Generated/AmazonECRPublicConfig.cs +++ b/sdk/src/Services/ECRPublic/Generated/AmazonECRPublicConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.ECRPublic public partial class AmazonECRPublicConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("ECR PUBLIC", "4.0.0.0"); private static readonly AmazonECRPublicEndpointResolver EndpointResolver = new AmazonECRPublicEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("ECR PUBLIC", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("ECR PUBLIC", "3.7.400.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/ECRPublic/Properties/AssemblyInfo.cs b/sdk/src/Services/ECRPublic/Properties/AssemblyInfo.cs index ae2638769436..76a855afed8c 100644 --- a/sdk/src/Services/ECRPublic/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/ECRPublic/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/ECS/ECS.sln b/sdk/src/Services/ECS/ECS.sln index 8a757c8eb2f7..2d616fde10d6 100644 --- a/sdk/src/Services/ECS/ECS.sln +++ b/sdk/src/Services/ECS/ECS.sln @@ -96,7 +96,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {1B8FAC05-25E7-4BD3-8963-EE3F7705C711}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {1B8FAC05-25E7-4BD3-8963-EE3F7705C711}.Debug|Any CPU.Build.0 = Debug|Any CPU {1B8FAC05-25E7-4BD3-8963-EE3F7705C711}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -125,129 +132,6 @@ Global {E77C9D77-2CA6-4102-93D3-05A49A3B3298}.Debug|Any CPU.Build.0 = Debug|Any CPU {E77C9D77-2CA6-4102-93D3-05A49A3B3298}.Release|Any CPU.ActiveCfg = Release|Any CPU {E77C9D77-2CA6-4102-93D3-05A49A3B3298}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {CF0EF003-F2B2-490B-962B-DA5B786925B8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CF0EF003-F2B2-490B-962B-DA5B786925B8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CF0EF003-F2B2-490B-962B-DA5B786925B8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CF0EF003-F2B2-490B-962B-DA5B786925B8}.Release|Any CPU.Build.0 = Release|Any CPU - {CFF552D7-AEF9-4724-B6F0-4B48F582D43C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CFF552D7-AEF9-4724-B6F0-4B48F582D43C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CFF552D7-AEF9-4724-B6F0-4B48F582D43C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CFF552D7-AEF9-4724-B6F0-4B48F582D43C}.Release|Any CPU.Build.0 = Release|Any CPU - {A1D86829-0651-4846-B1FD-4E14E1A9B042}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A1D86829-0651-4846-B1FD-4E14E1A9B042}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A1D86829-0651-4846-B1FD-4E14E1A9B042}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A1D86829-0651-4846-B1FD-4E14E1A9B042}.Release|Any CPU.Build.0 = Release|Any CPU - {BE6388F2-E8A4-496B-A44E-5471E02BFFE2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BE6388F2-E8A4-496B-A44E-5471E02BFFE2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BE6388F2-E8A4-496B-A44E-5471E02BFFE2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BE6388F2-E8A4-496B-A44E-5471E02BFFE2}.Release|Any CPU.Build.0 = Release|Any CPU - {AA894FA6-CC50-432B-A556-D7BBA02BBA77}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AA894FA6-CC50-432B-A556-D7BBA02BBA77}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AA894FA6-CC50-432B-A556-D7BBA02BBA77}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AA894FA6-CC50-432B-A556-D7BBA02BBA77}.Release|Any CPU.Build.0 = Release|Any CPU - {722FF99A-65B5-47AB-8365-7EEE31980FD7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {722FF99A-65B5-47AB-8365-7EEE31980FD7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {722FF99A-65B5-47AB-8365-7EEE31980FD7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {722FF99A-65B5-47AB-8365-7EEE31980FD7}.Release|Any CPU.Build.0 = Release|Any CPU - {FF9F03F1-2DC7-48F0-AD54-22EC7D7D4E37}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FF9F03F1-2DC7-48F0-AD54-22EC7D7D4E37}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FF9F03F1-2DC7-48F0-AD54-22EC7D7D4E37}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FF9F03F1-2DC7-48F0-AD54-22EC7D7D4E37}.Release|Any CPU.Build.0 = Release|Any CPU - {C2DB1CFB-5E6B-4D05-8FFF-E9E72FB5F7CC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C2DB1CFB-5E6B-4D05-8FFF-E9E72FB5F7CC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C2DB1CFB-5E6B-4D05-8FFF-E9E72FB5F7CC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C2DB1CFB-5E6B-4D05-8FFF-E9E72FB5F7CC}.Release|Any CPU.Build.0 = Release|Any CPU - {8B288C63-BAF1-4457-9851-CC4BAC41E2D2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8B288C63-BAF1-4457-9851-CC4BAC41E2D2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8B288C63-BAF1-4457-9851-CC4BAC41E2D2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8B288C63-BAF1-4457-9851-CC4BAC41E2D2}.Release|Any CPU.Build.0 = Release|Any CPU - {511A8E94-65EE-4443-BC11-C823B4F2184C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {511A8E94-65EE-4443-BC11-C823B4F2184C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {511A8E94-65EE-4443-BC11-C823B4F2184C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {511A8E94-65EE-4443-BC11-C823B4F2184C}.Release|Any CPU.Build.0 = Release|Any CPU - {0BDBE905-DFE0-476F-9FE7-E74A7A0417D7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0BDBE905-DFE0-476F-9FE7-E74A7A0417D7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0BDBE905-DFE0-476F-9FE7-E74A7A0417D7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0BDBE905-DFE0-476F-9FE7-E74A7A0417D7}.Release|Any CPU.Build.0 = Release|Any CPU - {6CF2B3CC-8F88-4DEB-B63C-0196E4F592AD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6CF2B3CC-8F88-4DEB-B63C-0196E4F592AD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6CF2B3CC-8F88-4DEB-B63C-0196E4F592AD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6CF2B3CC-8F88-4DEB-B63C-0196E4F592AD}.Release|Any CPU.Build.0 = Release|Any CPU - {D8CD1CBC-E508-4958-ABF4-B60E57869BAD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D8CD1CBC-E508-4958-ABF4-B60E57869BAD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D8CD1CBC-E508-4958-ABF4-B60E57869BAD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D8CD1CBC-E508-4958-ABF4-B60E57869BAD}.Release|Any CPU.Build.0 = Release|Any CPU - {180A6BE2-5EF8-407B-BF7C-492B067F2308}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {180A6BE2-5EF8-407B-BF7C-492B067F2308}.Debug|Any CPU.Build.0 = Debug|Any CPU - {180A6BE2-5EF8-407B-BF7C-492B067F2308}.Release|Any CPU.ActiveCfg = Release|Any CPU - {180A6BE2-5EF8-407B-BF7C-492B067F2308}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {CF0EF003-F2B2-490B-962B-DA5B786925B8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CF0EF003-F2B2-490B-962B-DA5B786925B8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CF0EF003-F2B2-490B-962B-DA5B786925B8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CF0EF003-F2B2-490B-962B-DA5B786925B8}.Release|Any CPU.Build.0 = Release|Any CPU - {CFF552D7-AEF9-4724-B6F0-4B48F582D43C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CFF552D7-AEF9-4724-B6F0-4B48F582D43C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CFF552D7-AEF9-4724-B6F0-4B48F582D43C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CFF552D7-AEF9-4724-B6F0-4B48F582D43C}.Release|Any CPU.Build.0 = Release|Any CPU - {A1D86829-0651-4846-B1FD-4E14E1A9B042}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A1D86829-0651-4846-B1FD-4E14E1A9B042}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A1D86829-0651-4846-B1FD-4E14E1A9B042}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A1D86829-0651-4846-B1FD-4E14E1A9B042}.Release|Any CPU.Build.0 = Release|Any CPU - {BE6388F2-E8A4-496B-A44E-5471E02BFFE2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BE6388F2-E8A4-496B-A44E-5471E02BFFE2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BE6388F2-E8A4-496B-A44E-5471E02BFFE2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BE6388F2-E8A4-496B-A44E-5471E02BFFE2}.Release|Any CPU.Build.0 = Release|Any CPU - {AA894FA6-CC50-432B-A556-D7BBA02BBA77}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AA894FA6-CC50-432B-A556-D7BBA02BBA77}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AA894FA6-CC50-432B-A556-D7BBA02BBA77}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AA894FA6-CC50-432B-A556-D7BBA02BBA77}.Release|Any CPU.Build.0 = Release|Any CPU - {722FF99A-65B5-47AB-8365-7EEE31980FD7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {722FF99A-65B5-47AB-8365-7EEE31980FD7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {722FF99A-65B5-47AB-8365-7EEE31980FD7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {722FF99A-65B5-47AB-8365-7EEE31980FD7}.Release|Any CPU.Build.0 = Release|Any CPU - {FF9F03F1-2DC7-48F0-AD54-22EC7D7D4E37}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FF9F03F1-2DC7-48F0-AD54-22EC7D7D4E37}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FF9F03F1-2DC7-48F0-AD54-22EC7D7D4E37}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FF9F03F1-2DC7-48F0-AD54-22EC7D7D4E37}.Release|Any CPU.Build.0 = Release|Any CPU - {C2DB1CFB-5E6B-4D05-8FFF-E9E72FB5F7CC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C2DB1CFB-5E6B-4D05-8FFF-E9E72FB5F7CC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C2DB1CFB-5E6B-4D05-8FFF-E9E72FB5F7CC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C2DB1CFB-5E6B-4D05-8FFF-E9E72FB5F7CC}.Release|Any CPU.Build.0 = Release|Any CPU - {8B288C63-BAF1-4457-9851-CC4BAC41E2D2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8B288C63-BAF1-4457-9851-CC4BAC41E2D2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8B288C63-BAF1-4457-9851-CC4BAC41E2D2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8B288C63-BAF1-4457-9851-CC4BAC41E2D2}.Release|Any CPU.Build.0 = Release|Any CPU - {511A8E94-65EE-4443-BC11-C823B4F2184C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {511A8E94-65EE-4443-BC11-C823B4F2184C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {511A8E94-65EE-4443-BC11-C823B4F2184C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {511A8E94-65EE-4443-BC11-C823B4F2184C}.Release|Any CPU.Build.0 = Release|Any CPU - {0BDBE905-DFE0-476F-9FE7-E74A7A0417D7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0BDBE905-DFE0-476F-9FE7-E74A7A0417D7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0BDBE905-DFE0-476F-9FE7-E74A7A0417D7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0BDBE905-DFE0-476F-9FE7-E74A7A0417D7}.Release|Any CPU.Build.0 = Release|Any CPU - {6CF2B3CC-8F88-4DEB-B63C-0196E4F592AD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6CF2B3CC-8F88-4DEB-B63C-0196E4F592AD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6CF2B3CC-8F88-4DEB-B63C-0196E4F592AD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6CF2B3CC-8F88-4DEB-B63C-0196E4F592AD}.Release|Any CPU.Build.0 = Release|Any CPU - {D8CD1CBC-E508-4958-ABF4-B60E57869BAD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D8CD1CBC-E508-4958-ABF4-B60E57869BAD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D8CD1CBC-E508-4958-ABF4-B60E57869BAD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D8CD1CBC-E508-4958-ABF4-B60E57869BAD}.Release|Any CPU.Build.0 = Release|Any CPU - {180A6BE2-5EF8-407B-BF7C-492B067F2308}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {180A6BE2-5EF8-407B-BF7C-492B067F2308}.Debug|Any CPU.Build.0 = Debug|Any CPU - {180A6BE2-5EF8-407B-BF7C-492B067F2308}.Release|Any CPU.ActiveCfg = Release|Any CPU - {180A6BE2-5EF8-407B-BF7C-492B067F2308}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -264,7 +148,8 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {1B8FAC05-25E7-4BD3-8963-EE3F7705C711} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {01BAA10C-C9E2-4F0A-93CD-5939C24BD9BE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {918D81C7-8BCE-49B0-B7CE-DD789413258A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} @@ -272,39 +157,6 @@ Global {1BBC02AE-C35C-403D-932E-F67B1DE971F9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {8E854D86-39BF-4B45-93B8-74C517E22335} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {E77C9D77-2CA6-4102-93D3-05A49A3B3298} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {CF0EF003-F2B2-490B-962B-DA5B786925B8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {CFF552D7-AEF9-4724-B6F0-4B48F582D43C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A1D86829-0651-4846-B1FD-4E14E1A9B042} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {BE6388F2-E8A4-496B-A44E-5471E02BFFE2} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {AA894FA6-CC50-432B-A556-D7BBA02BBA77} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {722FF99A-65B5-47AB-8365-7EEE31980FD7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {FF9F03F1-2DC7-48F0-AD54-22EC7D7D4E37} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C2DB1CFB-5E6B-4D05-8FFF-E9E72FB5F7CC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8B288C63-BAF1-4457-9851-CC4BAC41E2D2} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {511A8E94-65EE-4443-BC11-C823B4F2184C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0BDBE905-DFE0-476F-9FE7-E74A7A0417D7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6CF2B3CC-8F88-4DEB-B63C-0196E4F592AD} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D8CD1CBC-E508-4958-ABF4-B60E57869BAD} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {180A6BE2-5EF8-407B-BF7C-492B067F2308} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {CF0EF003-F2B2-490B-962B-DA5B786925B8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {CFF552D7-AEF9-4724-B6F0-4B48F582D43C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A1D86829-0651-4846-B1FD-4E14E1A9B042} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {BE6388F2-E8A4-496B-A44E-5471E02BFFE2} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {AA894FA6-CC50-432B-A556-D7BBA02BBA77} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {722FF99A-65B5-47AB-8365-7EEE31980FD7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {FF9F03F1-2DC7-48F0-AD54-22EC7D7D4E37} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C2DB1CFB-5E6B-4D05-8FFF-E9E72FB5F7CC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8B288C63-BAF1-4457-9851-CC4BAC41E2D2} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {511A8E94-65EE-4443-BC11-C823B4F2184C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0BDBE905-DFE0-476F-9FE7-E74A7A0417D7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6CF2B3CC-8F88-4DEB-B63C-0196E4F592AD} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D8CD1CBC-E508-4958-ABF4-B60E57869BAD} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {180A6BE2-5EF8-407B-BF7C-492B067F2308} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {C9F3091F-443C-4DBD-8192-C1DD3333ECAF} diff --git a/sdk/src/Services/ECS/Generated/AmazonECSConfig.cs b/sdk/src/Services/ECS/Generated/AmazonECSConfig.cs index aeed72325fba..80fea85f4ddc 100644 --- a/sdk/src/Services/ECS/Generated/AmazonECSConfig.cs +++ b/sdk/src/Services/ECS/Generated/AmazonECSConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.ECS public partial class AmazonECSConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("ECS", "4.0.0.0"); private static readonly AmazonECSEndpointResolver EndpointResolver = new AmazonECSEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("ECS", "3.7.402.21"); -======= - InternalSDKUtils.BuildUserAgentString("ECS", "3.7.404.10"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/ECS/Generated/Model/CreatedAt.cs b/sdk/src/Services/ECS/Generated/Model/CreatedAt.cs index 3abb2695f0be..88399a9d399b 100644 --- a/sdk/src/Services/ECS/Generated/Model/CreatedAt.cs +++ b/sdk/src/Services/ECS/Generated/Model/CreatedAt.cs @@ -50,9 +50,9 @@ public partial class CreatedAt /// is yyyy-MM-dd HH:mm:ss.SSSSSS. /// /// - public DateTime After + public DateTime? After { - get { return this._after.GetValueOrDefault(); } + get { return this._after; } set { this._after = value; } } @@ -69,9 +69,9 @@ internal bool IsSetAfter() /// format is yyyy-MM-dd HH:mm:ss.SSSSSS. /// /// - public DateTime Before + public DateTime? Before { - get { return this._before.GetValueOrDefault(); } + get { return this._before; } set { this._before = value; } } diff --git a/sdk/src/Services/ECS/Generated/Model/Internal/MarshallTransformations/CreatedAtMarshaller.cs b/sdk/src/Services/ECS/Generated/Model/Internal/MarshallTransformations/CreatedAtMarshaller.cs index 118b96b57cc9..dd32594b04bf 100644 --- a/sdk/src/Services/ECS/Generated/Model/Internal/MarshallTransformations/CreatedAtMarshaller.cs +++ b/sdk/src/Services/ECS/Generated/Model/Internal/MarshallTransformations/CreatedAtMarshaller.cs @@ -51,13 +51,13 @@ public void Marshall(CreatedAt requestObject, JsonMarshallerContext context) if(requestObject.IsSetAfter()) { context.Writer.WritePropertyName("after"); - context.Writer.Write(requestObject.After); + context.Writer.Write(requestObject.After.Value); } if(requestObject.IsSetBefore()) { context.Writer.WritePropertyName("before"); - context.Writer.Write(requestObject.Before); + context.Writer.Write(requestObject.Before.Value); } } diff --git a/sdk/src/Services/ECS/Generated/Model/Internal/MarshallTransformations/DescribeServiceDeploymentsRequestMarshaller.cs b/sdk/src/Services/ECS/Generated/Model/Internal/MarshallTransformations/DescribeServiceDeploymentsRequestMarshaller.cs index eb1bbb104035..9f07a8c87e36 100644 --- a/sdk/src/Services/ECS/Generated/Model/Internal/MarshallTransformations/DescribeServiceDeploymentsRequestMarshaller.cs +++ b/sdk/src/Services/ECS/Generated/Model/Internal/MarshallTransformations/DescribeServiceDeploymentsRequestMarshaller.cs @@ -63,26 +63,29 @@ public IRequest Marshall(DescribeServiceDeploymentsRequest publicRequest) request.HttpMethod = "POST"; request.ResourcePath = "/"; - using (StringWriter stringWriter = new StringWriter(CultureInfo.InvariantCulture)) + using (MemoryStream memoryStream = new MemoryStream()) { - JsonWriter writer = new JsonWriter(stringWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetServiceDeploymentArns()) + using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) { - context.Writer.WritePropertyName("serviceDeploymentArns"); - context.Writer.WriteArrayStart(); - foreach(var publicRequestServiceDeploymentArnsListValue in publicRequest.ServiceDeploymentArns) + JsonWriter writer = new JsonWriter(streamWriter); + writer.Validate = false; + writer.WriteObjectStart(); + var context = new JsonMarshallerContext(request, writer); + if(publicRequest.IsSetServiceDeploymentArns()) { - context.Writer.Write(publicRequestServiceDeploymentArnsListValue); + context.Writer.WritePropertyName("serviceDeploymentArns"); + context.Writer.WriteArrayStart(); + foreach(var publicRequestServiceDeploymentArnsListValue in publicRequest.ServiceDeploymentArns) + { + context.Writer.Write(publicRequestServiceDeploymentArnsListValue); + } + context.Writer.WriteArrayEnd(); } - context.Writer.WriteArrayEnd(); + + writer.WriteObjectEnd(); } - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); + request.Content = memoryStream.ToArray(); } diff --git a/sdk/src/Services/ECS/Generated/Model/Internal/MarshallTransformations/DescribeServiceRevisionsRequestMarshaller.cs b/sdk/src/Services/ECS/Generated/Model/Internal/MarshallTransformations/DescribeServiceRevisionsRequestMarshaller.cs index d3a3053b0322..e4fe8c7de0a7 100644 --- a/sdk/src/Services/ECS/Generated/Model/Internal/MarshallTransformations/DescribeServiceRevisionsRequestMarshaller.cs +++ b/sdk/src/Services/ECS/Generated/Model/Internal/MarshallTransformations/DescribeServiceRevisionsRequestMarshaller.cs @@ -63,26 +63,29 @@ public IRequest Marshall(DescribeServiceRevisionsRequest publicRequest) request.HttpMethod = "POST"; request.ResourcePath = "/"; - using (StringWriter stringWriter = new StringWriter(CultureInfo.InvariantCulture)) + using (MemoryStream memoryStream = new MemoryStream()) { - JsonWriter writer = new JsonWriter(stringWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetServiceRevisionArns()) + using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) { - context.Writer.WritePropertyName("serviceRevisionArns"); - context.Writer.WriteArrayStart(); - foreach(var publicRequestServiceRevisionArnsListValue in publicRequest.ServiceRevisionArns) + JsonWriter writer = new JsonWriter(streamWriter); + writer.Validate = false; + writer.WriteObjectStart(); + var context = new JsonMarshallerContext(request, writer); + if(publicRequest.IsSetServiceRevisionArns()) { - context.Writer.Write(publicRequestServiceRevisionArnsListValue); + context.Writer.WritePropertyName("serviceRevisionArns"); + context.Writer.WriteArrayStart(); + foreach(var publicRequestServiceRevisionArnsListValue in publicRequest.ServiceRevisionArns) + { + context.Writer.Write(publicRequestServiceRevisionArnsListValue); + } + context.Writer.WriteArrayEnd(); } - context.Writer.WriteArrayEnd(); + + writer.WriteObjectEnd(); } - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); + request.Content = memoryStream.ToArray(); } diff --git a/sdk/src/Services/ECS/Generated/Model/Internal/MarshallTransformations/ListServiceDeploymentsRequestMarshaller.cs b/sdk/src/Services/ECS/Generated/Model/Internal/MarshallTransformations/ListServiceDeploymentsRequestMarshaller.cs index 47a818d77088..6054bbd71045 100644 --- a/sdk/src/Services/ECS/Generated/Model/Internal/MarshallTransformations/ListServiceDeploymentsRequestMarshaller.cs +++ b/sdk/src/Services/ECS/Generated/Model/Internal/MarshallTransformations/ListServiceDeploymentsRequestMarshaller.cs @@ -63,61 +63,64 @@ public IRequest Marshall(ListServiceDeploymentsRequest publicRequest) request.HttpMethod = "POST"; request.ResourcePath = "/"; - using (StringWriter stringWriter = new StringWriter(CultureInfo.InvariantCulture)) + using (MemoryStream memoryStream = new MemoryStream()) { - JsonWriter writer = new JsonWriter(stringWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetCluster()) + using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) { - context.Writer.WritePropertyName("cluster"); - context.Writer.Write(publicRequest.Cluster); - } + JsonWriter writer = new JsonWriter(streamWriter); + writer.Validate = false; + writer.WriteObjectStart(); + var context = new JsonMarshallerContext(request, writer); + if(publicRequest.IsSetCluster()) + { + context.Writer.WritePropertyName("cluster"); + context.Writer.Write(publicRequest.Cluster); + } - if(publicRequest.IsSetCreatedAt()) - { - context.Writer.WritePropertyName("createdAt"); - context.Writer.WriteObjectStart(); + if(publicRequest.IsSetCreatedAt()) + { + context.Writer.WritePropertyName("createdAt"); + context.Writer.WriteObjectStart(); - var marshaller = CreatedAtMarshaller.Instance; - marshaller.Marshall(publicRequest.CreatedAt, context); + var marshaller = CreatedAtMarshaller.Instance; + marshaller.Marshall(publicRequest.CreatedAt, context); - context.Writer.WriteObjectEnd(); - } + context.Writer.WriteObjectEnd(); + } - if(publicRequest.IsSetMaxResults()) - { - context.Writer.WritePropertyName("maxResults"); - context.Writer.Write(publicRequest.MaxResults); - } + if(publicRequest.IsSetMaxResults()) + { + context.Writer.WritePropertyName("maxResults"); + context.Writer.Write(publicRequest.MaxResults.Value); + } - if(publicRequest.IsSetNextToken()) - { - context.Writer.WritePropertyName("nextToken"); - context.Writer.Write(publicRequest.NextToken); - } + if(publicRequest.IsSetNextToken()) + { + context.Writer.WritePropertyName("nextToken"); + context.Writer.Write(publicRequest.NextToken); + } - if(publicRequest.IsSetService()) - { - context.Writer.WritePropertyName("service"); - context.Writer.Write(publicRequest.Service); - } + if(publicRequest.IsSetService()) + { + context.Writer.WritePropertyName("service"); + context.Writer.Write(publicRequest.Service); + } - if(publicRequest.IsSetStatus()) - { - context.Writer.WritePropertyName("status"); - context.Writer.WriteArrayStart(); - foreach(var publicRequestStatusListValue in publicRequest.Status) + if(publicRequest.IsSetStatus()) { - context.Writer.Write(publicRequestStatusListValue); + context.Writer.WritePropertyName("status"); + context.Writer.WriteArrayStart(); + foreach(var publicRequestStatusListValue in publicRequest.Status) + { + context.Writer.Write(publicRequestStatusListValue); + } + context.Writer.WriteArrayEnd(); } - context.Writer.WriteArrayEnd(); + + writer.WriteObjectEnd(); } - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); + request.Content = memoryStream.ToArray(); } diff --git a/sdk/src/Services/ECS/Generated/Model/Internal/MarshallTransformations/RollbackUnmarshaller.cs b/sdk/src/Services/ECS/Generated/Model/Internal/MarshallTransformations/RollbackUnmarshaller.cs index e85742cdfc3f..95460986f63d 100644 --- a/sdk/src/Services/ECS/Generated/Model/Internal/MarshallTransformations/RollbackUnmarshaller.cs +++ b/sdk/src/Services/ECS/Generated/Model/Internal/MarshallTransformations/RollbackUnmarshaller.cs @@ -80,7 +80,7 @@ public Rollback Unmarshall(JsonUnmarshallerContext context) } if (context.TestExpression("startedAt", targetDepth)) { - var unmarshaller = DateTimeUnmarshaller.Instance; + var unmarshaller = NullableDateTimeUnmarshaller.Instance; unmarshalledObject.StartedAt = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/ECS/Generated/Model/Internal/MarshallTransformations/ServiceDeploymentBriefUnmarshaller.cs b/sdk/src/Services/ECS/Generated/Model/Internal/MarshallTransformations/ServiceDeploymentBriefUnmarshaller.cs index 9e374d7f926d..44e626c33e23 100644 --- a/sdk/src/Services/ECS/Generated/Model/Internal/MarshallTransformations/ServiceDeploymentBriefUnmarshaller.cs +++ b/sdk/src/Services/ECS/Generated/Model/Internal/MarshallTransformations/ServiceDeploymentBriefUnmarshaller.cs @@ -74,13 +74,13 @@ public ServiceDeploymentBrief Unmarshall(JsonUnmarshallerContext context) } if (context.TestExpression("createdAt", targetDepth)) { - var unmarshaller = DateTimeUnmarshaller.Instance; + var unmarshaller = NullableDateTimeUnmarshaller.Instance; unmarshalledObject.CreatedAt = unmarshaller.Unmarshall(context); continue; } if (context.TestExpression("finishedAt", targetDepth)) { - var unmarshaller = DateTimeUnmarshaller.Instance; + var unmarshaller = NullableDateTimeUnmarshaller.Instance; unmarshalledObject.FinishedAt = unmarshaller.Unmarshall(context); continue; } @@ -98,7 +98,7 @@ public ServiceDeploymentBrief Unmarshall(JsonUnmarshallerContext context) } if (context.TestExpression("startedAt", targetDepth)) { - var unmarshaller = DateTimeUnmarshaller.Instance; + var unmarshaller = NullableDateTimeUnmarshaller.Instance; unmarshalledObject.StartedAt = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/ECS/Generated/Model/Internal/MarshallTransformations/ServiceDeploymentCircuitBreakerUnmarshaller.cs b/sdk/src/Services/ECS/Generated/Model/Internal/MarshallTransformations/ServiceDeploymentCircuitBreakerUnmarshaller.cs index fd04d17d69f6..1f9b6369b9cb 100644 --- a/sdk/src/Services/ECS/Generated/Model/Internal/MarshallTransformations/ServiceDeploymentCircuitBreakerUnmarshaller.cs +++ b/sdk/src/Services/ECS/Generated/Model/Internal/MarshallTransformations/ServiceDeploymentCircuitBreakerUnmarshaller.cs @@ -68,7 +68,7 @@ public ServiceDeploymentCircuitBreaker Unmarshall(JsonUnmarshallerContext contex { if (context.TestExpression("failureCount", targetDepth)) { - var unmarshaller = IntUnmarshaller.Instance; + var unmarshaller = NullableIntUnmarshaller.Instance; unmarshalledObject.FailureCount = unmarshaller.Unmarshall(context); continue; } @@ -80,7 +80,7 @@ public ServiceDeploymentCircuitBreaker Unmarshall(JsonUnmarshallerContext contex } if (context.TestExpression("threshold", targetDepth)) { - var unmarshaller = IntUnmarshaller.Instance; + var unmarshaller = NullableIntUnmarshaller.Instance; unmarshalledObject.Threshold = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/ECS/Generated/Model/Internal/MarshallTransformations/ServiceDeploymentUnmarshaller.cs b/sdk/src/Services/ECS/Generated/Model/Internal/MarshallTransformations/ServiceDeploymentUnmarshaller.cs index c54fd9c56ad3..730bd759f609 100644 --- a/sdk/src/Services/ECS/Generated/Model/Internal/MarshallTransformations/ServiceDeploymentUnmarshaller.cs +++ b/sdk/src/Services/ECS/Generated/Model/Internal/MarshallTransformations/ServiceDeploymentUnmarshaller.cs @@ -80,7 +80,7 @@ public ServiceDeployment Unmarshall(JsonUnmarshallerContext context) } if (context.TestExpression("createdAt", targetDepth)) { - var unmarshaller = DateTimeUnmarshaller.Instance; + var unmarshaller = NullableDateTimeUnmarshaller.Instance; unmarshalledObject.CreatedAt = unmarshaller.Unmarshall(context); continue; } @@ -98,7 +98,7 @@ public ServiceDeployment Unmarshall(JsonUnmarshallerContext context) } if (context.TestExpression("finishedAt", targetDepth)) { - var unmarshaller = DateTimeUnmarshaller.Instance; + var unmarshaller = NullableDateTimeUnmarshaller.Instance; unmarshalledObject.FinishedAt = unmarshaller.Unmarshall(context); continue; } @@ -128,7 +128,7 @@ public ServiceDeployment Unmarshall(JsonUnmarshallerContext context) } if (context.TestExpression("startedAt", targetDepth)) { - var unmarshaller = DateTimeUnmarshaller.Instance; + var unmarshaller = NullableDateTimeUnmarshaller.Instance; unmarshalledObject.StartedAt = unmarshaller.Unmarshall(context); continue; } @@ -146,7 +146,7 @@ public ServiceDeployment Unmarshall(JsonUnmarshallerContext context) } if (context.TestExpression("stoppedAt", targetDepth)) { - var unmarshaller = DateTimeUnmarshaller.Instance; + var unmarshaller = NullableDateTimeUnmarshaller.Instance; unmarshalledObject.StoppedAt = unmarshaller.Unmarshall(context); continue; } @@ -158,7 +158,7 @@ public ServiceDeployment Unmarshall(JsonUnmarshallerContext context) } if (context.TestExpression("updatedAt", targetDepth)) { - var unmarshaller = DateTimeUnmarshaller.Instance; + var unmarshaller = NullableDateTimeUnmarshaller.Instance; unmarshalledObject.UpdatedAt = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/ECS/Generated/Model/Internal/MarshallTransformations/ServiceRevisionSummaryUnmarshaller.cs b/sdk/src/Services/ECS/Generated/Model/Internal/MarshallTransformations/ServiceRevisionSummaryUnmarshaller.cs index 765c1f15acc2..05d4b66ea875 100644 --- a/sdk/src/Services/ECS/Generated/Model/Internal/MarshallTransformations/ServiceRevisionSummaryUnmarshaller.cs +++ b/sdk/src/Services/ECS/Generated/Model/Internal/MarshallTransformations/ServiceRevisionSummaryUnmarshaller.cs @@ -74,19 +74,19 @@ public ServiceRevisionSummary Unmarshall(JsonUnmarshallerContext context) } if (context.TestExpression("pendingTaskCount", targetDepth)) { - var unmarshaller = IntUnmarshaller.Instance; + var unmarshaller = NullableIntUnmarshaller.Instance; unmarshalledObject.PendingTaskCount = unmarshaller.Unmarshall(context); continue; } if (context.TestExpression("requestedTaskCount", targetDepth)) { - var unmarshaller = IntUnmarshaller.Instance; + var unmarshaller = NullableIntUnmarshaller.Instance; unmarshalledObject.RequestedTaskCount = unmarshaller.Unmarshall(context); continue; } if (context.TestExpression("runningTaskCount", targetDepth)) { - var unmarshaller = IntUnmarshaller.Instance; + var unmarshaller = NullableIntUnmarshaller.Instance; unmarshalledObject.RunningTaskCount = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/ECS/Generated/Model/Internal/MarshallTransformations/ServiceRevisionUnmarshaller.cs b/sdk/src/Services/ECS/Generated/Model/Internal/MarshallTransformations/ServiceRevisionUnmarshaller.cs index aff94c6aae2c..98937e8da4b5 100644 --- a/sdk/src/Services/ECS/Generated/Model/Internal/MarshallTransformations/ServiceRevisionUnmarshaller.cs +++ b/sdk/src/Services/ECS/Generated/Model/Internal/MarshallTransformations/ServiceRevisionUnmarshaller.cs @@ -86,7 +86,7 @@ public ServiceRevision Unmarshall(JsonUnmarshallerContext context) } if (context.TestExpression("createdAt", targetDepth)) { - var unmarshaller = DateTimeUnmarshaller.Instance; + var unmarshaller = NullableDateTimeUnmarshaller.Instance; unmarshalledObject.CreatedAt = unmarshaller.Unmarshall(context); continue; } @@ -98,7 +98,7 @@ public ServiceRevision Unmarshall(JsonUnmarshallerContext context) } if (context.TestExpression("guardDutyEnabled", targetDepth)) { - var unmarshaller = BoolUnmarshaller.Instance; + var unmarshaller = NullableBoolUnmarshaller.Instance; unmarshalledObject.GuardDutyEnabled = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/ECS/Generated/Model/ListServiceDeploymentsRequest.cs b/sdk/src/Services/ECS/Generated/Model/ListServiceDeploymentsRequest.cs index 922655ce58ea..6a123c796085 100644 --- a/sdk/src/Services/ECS/Generated/Model/ListServiceDeploymentsRequest.cs +++ b/sdk/src/Services/ECS/Generated/Model/ListServiceDeploymentsRequest.cs @@ -107,9 +107,9 @@ internal bool IsSetCreatedAt() /// returns up to 20 results and a nextToken value if applicable. /// /// - public int MaxResults + public int? MaxResults { - get { return this._maxResults.GetValueOrDefault(); } + get { return this._maxResults; } set { this._maxResults = value; } } diff --git a/sdk/src/Services/ECS/Generated/Model/Rollback.cs b/sdk/src/Services/ECS/Generated/Model/Rollback.cs index 2c84f878a6cf..b23c9d3e8f19 100644 --- a/sdk/src/Services/ECS/Generated/Model/Rollback.cs +++ b/sdk/src/Services/ECS/Generated/Model/Rollback.cs @@ -94,9 +94,9 @@ internal bool IsSetServiceRevisionArn() /// Time time that the rollback started. The format is yyyy-MM-dd HH:mm:ss.SSSSSS. /// /// - public DateTime StartedAt + public DateTime? StartedAt { - get { return this._startedAt.GetValueOrDefault(); } + get { return this._startedAt; } set { this._startedAt = value; } } diff --git a/sdk/src/Services/ECS/Generated/Model/ServiceDeployment.cs b/sdk/src/Services/ECS/Generated/Model/ServiceDeployment.cs index 38047a099c83..b4517529b7c3 100644 --- a/sdk/src/Services/ECS/Generated/Model/ServiceDeployment.cs +++ b/sdk/src/Services/ECS/Generated/Model/ServiceDeployment.cs @@ -101,9 +101,9 @@ internal bool IsSetClusterArn() /// The time the service deployment was created. The format is yyyy-MM-dd HH:mm:ss.SSSSSS. /// /// - public DateTime CreatedAt + public DateTime? CreatedAt { - get { return this._createdAt.GetValueOrDefault(); } + get { return this._createdAt; } set { this._createdAt = value; } } @@ -152,9 +152,9 @@ internal bool IsSetDeploymentConfiguration() /// The time the service deployment finished. The format is yyyy-MM-dd HH:mm:ss.SSSSSS. /// /// - public DateTime FinishedAt + public DateTime? FinishedAt { - get { return this._finishedAt.GetValueOrDefault(); } + get { return this._finishedAt; } set { this._finishedAt = value; } } @@ -242,9 +242,9 @@ internal bool IsSetSourceServiceRevisions() /// The time the service deployment statred. The format is yyyy-MM-dd HH:mm:ss.SSSSSS. /// /// - public DateTime StartedAt + public DateTime? StartedAt { - get { return this._startedAt.GetValueOrDefault(); } + get { return this._startedAt; } set { this._startedAt = value; } } @@ -311,9 +311,9 @@ internal bool IsSetStatusReason() /// /// /// - public DateTime StoppedAt + public DateTime? StoppedAt { - get { return this._stoppedAt.GetValueOrDefault(); } + get { return this._stoppedAt; } set { this._stoppedAt = value; } } @@ -347,9 +347,9 @@ internal bool IsSetTargetServiceRevision() /// The time that the service deployment was last updated. The format is yyyy-MM-dd HH:mm:ss.SSSSSS. /// /// - public DateTime UpdatedAt + public DateTime? UpdatedAt { - get { return this._updatedAt.GetValueOrDefault(); } + get { return this._updatedAt; } set { this._updatedAt = value; } } diff --git a/sdk/src/Services/ECS/Generated/Model/ServiceDeploymentBrief.cs b/sdk/src/Services/ECS/Generated/Model/ServiceDeploymentBrief.cs index be223c2544c3..70b0786286b3 100644 --- a/sdk/src/Services/ECS/Generated/Model/ServiceDeploymentBrief.cs +++ b/sdk/src/Services/ECS/Generated/Model/ServiceDeploymentBrief.cs @@ -73,9 +73,9 @@ internal bool IsSetClusterArn() /// The time that the service deployment was created. The format is yyyy-MM-dd HH:mm:ss.SSSSSS. /// /// - public DateTime CreatedAt + public DateTime? CreatedAt { - get { return this._createdAt.GetValueOrDefault(); } + get { return this._createdAt; } set { this._createdAt = value; } } @@ -91,9 +91,9 @@ internal bool IsSetCreatedAt() /// The time that the service deployment completed. The format is yyyy-MM-dd HH:mm:ss.SSSSSS. /// /// - public DateTime FinishedAt + public DateTime? FinishedAt { - get { return this._finishedAt.GetValueOrDefault(); } + get { return this._finishedAt; } set { this._finishedAt = value; } } @@ -145,9 +145,9 @@ internal bool IsSetServiceDeploymentArn() /// The time that the service deployment statred. The format is yyyy-MM-dd HH:mm:ss.SSSSSS. /// /// - public DateTime StartedAt + public DateTime? StartedAt { - get { return this._startedAt.GetValueOrDefault(); } + get { return this._startedAt; } set { this._startedAt = value; } } diff --git a/sdk/src/Services/ECS/Generated/Model/ServiceDeploymentCircuitBreaker.cs b/sdk/src/Services/ECS/Generated/Model/ServiceDeploymentCircuitBreaker.cs index 78cefae92d54..5502543ec402 100644 --- a/sdk/src/Services/ECS/Generated/Model/ServiceDeploymentCircuitBreaker.cs +++ b/sdk/src/Services/ECS/Generated/Model/ServiceDeploymentCircuitBreaker.cs @@ -55,9 +55,9 @@ public partial class ServiceDeploymentCircuitBreaker /// The number of times the circuit breaker detected a service deploymeny failure. /// /// - public int FailureCount + public int? FailureCount { - get { return this._failureCount.GetValueOrDefault(); } + get { return this._failureCount; } set { this._failureCount = value; } } @@ -103,9 +103,9 @@ internal bool IsSetStatus() /// 0.5 * desired task count /// /// - public int Threshold + public int? Threshold { - get { return this._threshold.GetValueOrDefault(); } + get { return this._threshold; } set { this._threshold = value; } } diff --git a/sdk/src/Services/ECS/Generated/Model/ServiceRevision.cs b/sdk/src/Services/ECS/Generated/Model/ServiceRevision.cs index 8c9f6fd395d3..f90a7d49d2bb 100644 --- a/sdk/src/Services/ECS/Generated/Model/ServiceRevision.cs +++ b/sdk/src/Services/ECS/Generated/Model/ServiceRevision.cs @@ -122,9 +122,9 @@ internal bool IsSetContainerImages() /// The time that the service revision was created. The format is yyyy-mm-dd HH:mm:ss.SSSSS. /// /// - public DateTime CreatedAt + public DateTime? CreatedAt { - get { return this._createdAt.GetValueOrDefault(); } + get { return this._createdAt; } set { this._createdAt = value; } } @@ -155,9 +155,9 @@ internal bool IsSetFargateEphemeralStorage() /// Indicates whether Runtime Monitoring is turned on. /// /// - public bool GuardDutyEnabled + public bool? GuardDutyEnabled { - get { return this._guardDutyEnabled.GetValueOrDefault(); } + get { return this._guardDutyEnabled; } set { this._guardDutyEnabled = value; } } diff --git a/sdk/src/Services/ECS/Generated/Model/ServiceRevisionSummary.cs b/sdk/src/Services/ECS/Generated/Model/ServiceRevisionSummary.cs index a7fcd139c4b9..6c1327848d65 100644 --- a/sdk/src/Services/ECS/Generated/Model/ServiceRevisionSummary.cs +++ b/sdk/src/Services/ECS/Generated/Model/ServiceRevisionSummary.cs @@ -64,9 +64,9 @@ internal bool IsSetArn() /// The number of pending tasks for the service revision. /// /// - public int PendingTaskCount + public int? PendingTaskCount { - get { return this._pendingTaskCount.GetValueOrDefault(); } + get { return this._pendingTaskCount; } set { this._pendingTaskCount = value; } } @@ -82,9 +82,9 @@ internal bool IsSetPendingTaskCount() /// The number of requested tasks for the service revision. /// /// - public int RequestedTaskCount + public int? RequestedTaskCount { - get { return this._requestedTaskCount.GetValueOrDefault(); } + get { return this._requestedTaskCount; } set { this._requestedTaskCount = value; } } @@ -100,9 +100,9 @@ internal bool IsSetRequestedTaskCount() /// The number of running tasks for the service revision. /// /// - public int RunningTaskCount + public int? RunningTaskCount { - get { return this._runningTaskCount.GetValueOrDefault(); } + get { return this._runningTaskCount; } set { this._runningTaskCount = value; } } diff --git a/sdk/src/Services/ECS/Generated/_bcl/AmazonECSClient.cs b/sdk/src/Services/ECS/Generated/_bcl/AmazonECSClient.cs index ddc043e174f9..578947fe50d8 100644 --- a/sdk/src/Services/ECS/Generated/_bcl/AmazonECSClient.cs +++ b/sdk/src/Services/ECS/Generated/_bcl/AmazonECSClient.cs @@ -426,12 +426,11 @@ public virtual CreateCapacityProviderResponse CreateCapacityProvider(CreateCapac /// /// /// - /// When you call the CreateCluster - /// API operation, Amazon ECS attempts to create the Amazon ECS service-linked role for - /// your account. This is so that it can manage required resources in other Amazon Web - /// Services services on your behalf. However, if the user that makes the call doesn't - /// have permissions to create the service-linked role, it isn't created. For more information, - /// see Using + /// When you call the CreateCluster API operation, Amazon ECS attempts to create + /// the Amazon ECS service-linked role for your account. This is so that it can manage + /// required resources in other Amazon Web Services services on your behalf. However, + /// if the user that makes the call doesn't have permissions to create the service-linked + /// role, it isn't created. For more information, see Using /// service-linked roles for Amazon ECS in the Amazon Elastic Container Service /// Developer Guide. /// @@ -485,12 +484,11 @@ public virtual CreateClusterResponse CreateCluster(CreateClusterRequest request) /// /// /// - /// When you call the CreateCluster - /// API operation, Amazon ECS attempts to create the Amazon ECS service-linked role for - /// your account. This is so that it can manage required resources in other Amazon Web - /// Services services on your behalf. However, if the user that makes the call doesn't - /// have permissions to create the service-linked role, it isn't created. For more information, - /// see Using + /// When you call the CreateCluster API operation, Amazon ECS attempts to create + /// the Amazon ECS service-linked role for your account. This is so that it can manage + /// required resources in other Amazon Web Services services on your behalf. However, + /// if the user that makes the call doesn't have permissions to create the service-linked + /// role, it isn't created. For more information, see Using /// service-linked roles for Amazon ECS in the Amazon Elastic Container Service /// Developer Guide. /// @@ -548,7 +546,7 @@ public virtual CreateClusterResponse CreateCluster(CreateClusterRequest request) /// Runs and maintains your desired number of tasks from a specified task definition. /// If the number of tasks running in a service drops below the desiredCount, Amazon /// ECS runs another copy of the task in the specified cluster. To update an existing - /// service, use UpdateService. + /// service, see the UpdateService action. /// /// /// @@ -556,6 +554,10 @@ public virtual CreateClusterResponse CreateCluster(CreateClusterRequest request) /// authorization. When a task definition revision is not specified, authorization will /// occur using the latest revision of a task definition. /// + /// + /// + /// Amazon Elastic Inference (EI) is no longer available to customers. + /// /// /// /// In addition to maintaining the desired count of tasks in your service, you can optionally @@ -664,16 +666,6 @@ public virtual CreateClusterResponse CreateCluster(CreateClusterRequest request) /// ECS task placement in the Amazon Elastic Container Service Developer Guide /// /// - /// - /// - /// Starting April 15, 2023, Amazon Web Services will not onboard new customers to Amazon - /// Elastic Inference (EI), and will help current customers migrate their workloads to - /// options that offer better price and performance. After April 15, 2023, new customers - /// will not be able to launch instances with Amazon EI accelerators in Amazon SageMaker, - /// Amazon ECS, or Amazon EC2. However, customers who have used Amazon EI at least once - /// during the past 30-day period are considered current customers and will be able to - /// continue using the service. - /// /// /// Container for the necessary parameters to execute the CreateService service method. /// @@ -737,7 +729,7 @@ public virtual CreateServiceResponse CreateService(CreateServiceRequest request) /// Runs and maintains your desired number of tasks from a specified task definition. /// If the number of tasks running in a service drops below the desiredCount, Amazon /// ECS runs another copy of the task in the specified cluster. To update an existing - /// service, use UpdateService. + /// service, see the UpdateService action. /// /// /// @@ -745,6 +737,10 @@ public virtual CreateServiceResponse CreateService(CreateServiceRequest request) /// authorization. When a task definition revision is not specified, authorization will /// occur using the latest revision of a task definition. /// + /// + /// + /// Amazon Elastic Inference (EI) is no longer available to customers. + /// /// /// /// In addition to maintaining the desired count of tasks in your service, you can optionally @@ -853,16 +849,6 @@ public virtual CreateServiceResponse CreateService(CreateServiceRequest request) /// ECS task placement in the Amazon Elastic Container Service Developer Guide /// /// - /// - /// - /// Starting April 15, 2023, Amazon Web Services will not onboard new customers to Amazon - /// Elastic Inference (EI), and will help current customers migrate their workloads to - /// options that offer better price and performance. After April 15, 2023, new customers - /// will not be able to launch instances with Amazon EI accelerators in Amazon SageMaker, - /// Amazon ECS, or Amazon EC2. However, customers who have used Amazon EI at least once - /// during the past 30-day period are considered current customers and will be able to - /// continue using the service. - /// /// /// Container for the necessary parameters to execute the CreateService service method. /// @@ -2547,6 +2533,278 @@ public virtual DescribeContainerInstancesResponse DescribeContainerInstances(Des #endregion + #region DescribeServiceDeployments + + + /// + /// Describes one or more of your service deployments. + /// + /// + /// + /// A service deployment happens when you release a software update for the service. For + /// more information, see Amazon + /// ECS service deployments. + /// + /// + /// Container for the necessary parameters to execute the DescribeServiceDeployments service method. + /// + /// The response from the DescribeServiceDeployments service method, as returned by ECS. + /// + /// You don't have authorization to perform the requested action. + /// + /// + /// These errors are usually caused by a client action. This client action might be using + /// an action or resource on behalf of a user that doesn't have permissions to use the + /// action or resource. Or, it might be specifying an identifier that isn't valid. + /// + /// + /// + /// The following list includes additional causes for the error: + /// + ///
    • + /// + /// The RunTask could not be processed because you use managed scaling and there + /// is a capacity error because the quota of tasks in the PROVISIONING per cluster + /// has been reached. For information about the service quotas, see Amazon + /// ECS service quotas. + /// + ///
    + ///     + /// + /// The specified cluster wasn't found. You can view your available clusters with ListClusters. + /// Amazon ECS clusters are Region specific. + /// + /// + /// The specified parameter isn't valid. Review the available parameters for the API request. + /// + /// + /// These errors are usually caused by a server issue. + /// + /// + /// The specified service wasn't found. You can view your available services with ListServices. + /// Amazon ECS services are cluster specific and Region specific. + /// + /// + /// The specified task isn't supported in this Region. + /// + /// REST API Reference for DescribeServiceDeployments Operation + public virtual DescribeServiceDeploymentsResponse DescribeServiceDeployments(DescribeServiceDeploymentsRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = DescribeServiceDeploymentsRequestMarshaller.Instance; + options.ResponseUnmarshaller = DescribeServiceDeploymentsResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// Describes one or more of your service deployments. + /// + /// + /// + /// A service deployment happens when you release a software update for the service. For + /// more information, see Amazon + /// ECS service deployments. + /// + /// + /// Container for the necessary parameters to execute the DescribeServiceDeployments service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the DescribeServiceDeployments service method, as returned by ECS. + /// + /// You don't have authorization to perform the requested action. + /// + /// + /// These errors are usually caused by a client action. This client action might be using + /// an action or resource on behalf of a user that doesn't have permissions to use the + /// action or resource. Or, it might be specifying an identifier that isn't valid. + /// + /// + /// + /// The following list includes additional causes for the error: + /// + ///
    • + /// + /// The RunTask could not be processed because you use managed scaling and there + /// is a capacity error because the quota of tasks in the PROVISIONING per cluster + /// has been reached. For information about the service quotas, see Amazon + /// ECS service quotas. + /// + ///
    + ///     + /// + /// The specified cluster wasn't found. You can view your available clusters with ListClusters. + /// Amazon ECS clusters are Region specific. + /// + /// + /// The specified parameter isn't valid. Review the available parameters for the API request. + /// + /// + /// These errors are usually caused by a server issue. + /// + /// + /// The specified service wasn't found. You can view your available services with ListServices. + /// Amazon ECS services are cluster specific and Region specific. + /// + /// + /// The specified task isn't supported in this Region. + /// + /// REST API Reference for DescribeServiceDeployments Operation + public virtual Task DescribeServiceDeploymentsAsync(DescribeServiceDeploymentsRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = DescribeServiceDeploymentsRequestMarshaller.Instance; + options.ResponseUnmarshaller = DescribeServiceDeploymentsResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + + #region DescribeServiceRevisions + + + /// + /// Describes one or more service revisions. + /// + /// + /// + /// A service revision is a version of the service that includes the values for the Amazon + /// ECS resources (for example, task definition) and the environment resources (for example, + /// load balancers, subnets, and security groups). For more information, see Amazon + /// ECS service revisions. + /// + /// + /// + /// You can't describe a service revision that was created before October 25, 2024. + /// + /// + /// Container for the necessary parameters to execute the DescribeServiceRevisions service method. + /// + /// The response from the DescribeServiceRevisions service method, as returned by ECS. + /// + /// You don't have authorization to perform the requested action. + /// + /// + /// These errors are usually caused by a client action. This client action might be using + /// an action or resource on behalf of a user that doesn't have permissions to use the + /// action or resource. Or, it might be specifying an identifier that isn't valid. + /// + /// + /// + /// The following list includes additional causes for the error: + /// + ///
    • + /// + /// The RunTask could not be processed because you use managed scaling and there + /// is a capacity error because the quota of tasks in the PROVISIONING per cluster + /// has been reached. For information about the service quotas, see Amazon + /// ECS service quotas. + /// + ///
    + ///     + /// + /// The specified cluster wasn't found. You can view your available clusters with ListClusters. + /// Amazon ECS clusters are Region specific. + /// + /// + /// The specified parameter isn't valid. Review the available parameters for the API request. + /// + /// + /// These errors are usually caused by a server issue. + /// + /// + /// The specified service wasn't found. You can view your available services with ListServices. + /// Amazon ECS services are cluster specific and Region specific. + /// + /// + /// The specified task isn't supported in this Region. + /// + /// REST API Reference for DescribeServiceRevisions Operation + public virtual DescribeServiceRevisionsResponse DescribeServiceRevisions(DescribeServiceRevisionsRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = DescribeServiceRevisionsRequestMarshaller.Instance; + options.ResponseUnmarshaller = DescribeServiceRevisionsResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// Describes one or more service revisions. + /// + /// + /// + /// A service revision is a version of the service that includes the values for the Amazon + /// ECS resources (for example, task definition) and the environment resources (for example, + /// load balancers, subnets, and security groups). For more information, see Amazon + /// ECS service revisions. + /// + /// + /// + /// You can't describe a service revision that was created before October 25, 2024. + /// + /// + /// Container for the necessary parameters to execute the DescribeServiceRevisions service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the DescribeServiceRevisions service method, as returned by ECS. + /// + /// You don't have authorization to perform the requested action. + /// + /// + /// These errors are usually caused by a client action. This client action might be using + /// an action or resource on behalf of a user that doesn't have permissions to use the + /// action or resource. Or, it might be specifying an identifier that isn't valid. + /// + /// + /// + /// The following list includes additional causes for the error: + /// + ///
    • + /// + /// The RunTask could not be processed because you use managed scaling and there + /// is a capacity error because the quota of tasks in the PROVISIONING per cluster + /// has been reached. For information about the service quotas, see Amazon + /// ECS service quotas. + /// + ///
    + ///     + /// + /// The specified cluster wasn't found. You can view your available clusters with ListClusters. + /// Amazon ECS clusters are Region specific. + /// + /// + /// The specified parameter isn't valid. Review the available parameters for the API request. + /// + /// + /// These errors are usually caused by a server issue. + /// + /// + /// The specified service wasn't found. You can view your available services with ListServices. + /// Amazon ECS services are cluster specific and Region specific. + /// + /// + /// The specified task isn't supported in this Region. + /// + /// REST API Reference for DescribeServiceRevisions Operation + public virtual Task DescribeServiceRevisionsAsync(DescribeServiceRevisionsRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = DescribeServiceRevisionsRequestMarshaller.Instance; + options.ResponseUnmarshaller = DescribeServiceRevisionsResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + #region DescribeServices @@ -3637,6 +3895,137 @@ public virtual ListContainerInstancesResponse ListContainerInstances(ListContain #endregion + #region ListServiceDeployments + + + /// + /// This operation lists all the service deployments that meet the specified filter criteria. + /// + /// + /// + /// A service deployment happens when you release a softwre update for the service. You + /// route traffic from the running service revisions to the new service revison and control + /// the number of running tasks. + /// + /// + /// + /// This API returns the values that you use for the request parameters in DescribeServiceRevisions. + /// + /// + /// Container for the necessary parameters to execute the ListServiceDeployments service method. + /// + /// The response from the ListServiceDeployments service method, as returned by ECS. + /// + /// You don't have authorization to perform the requested action. + /// + /// + /// These errors are usually caused by a client action. This client action might be using + /// an action or resource on behalf of a user that doesn't have permissions to use the + /// action or resource. Or, it might be specifying an identifier that isn't valid. + /// + /// + /// + /// The following list includes additional causes for the error: + /// + ///
    • + /// + /// The RunTask could not be processed because you use managed scaling and there + /// is a capacity error because the quota of tasks in the PROVISIONING per cluster + /// has been reached. For information about the service quotas, see Amazon + /// ECS service quotas. + /// + ///
    + ///     + /// + /// The specified parameter isn't valid. Review the available parameters for the API request. + /// + /// + /// These errors are usually caused by a server issue. + /// + /// + /// The specified service wasn't found. You can view your available services with ListServices. + /// Amazon ECS services are cluster specific and Region specific. + /// + /// + /// The specified task isn't supported in this Region. + /// + /// REST API Reference for ListServiceDeployments Operation + public virtual ListServiceDeploymentsResponse ListServiceDeployments(ListServiceDeploymentsRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = ListServiceDeploymentsRequestMarshaller.Instance; + options.ResponseUnmarshaller = ListServiceDeploymentsResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// This operation lists all the service deployments that meet the specified filter criteria. + /// + /// + /// + /// A service deployment happens when you release a softwre update for the service. You + /// route traffic from the running service revisions to the new service revison and control + /// the number of running tasks. + /// + /// + /// + /// This API returns the values that you use for the request parameters in DescribeServiceRevisions. + /// + /// + /// Container for the necessary parameters to execute the ListServiceDeployments service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the ListServiceDeployments service method, as returned by ECS. + /// + /// You don't have authorization to perform the requested action. + /// + /// + /// These errors are usually caused by a client action. This client action might be using + /// an action or resource on behalf of a user that doesn't have permissions to use the + /// action or resource. Or, it might be specifying an identifier that isn't valid. + /// + /// + /// + /// The following list includes additional causes for the error: + /// + ///
    • + /// + /// The RunTask could not be processed because you use managed scaling and there + /// is a capacity error because the quota of tasks in the PROVISIONING per cluster + /// has been reached. For information about the service quotas, see Amazon + /// ECS service quotas. + /// + ///
    + ///     + /// + /// The specified parameter isn't valid. Review the available parameters for the API request. + /// + /// + /// These errors are usually caused by a server issue. + /// + /// + /// The specified service wasn't found. You can view your available services with ListServices. + /// Amazon ECS services are cluster specific and Region specific. + /// + /// + /// The specified task isn't supported in this Region. + /// + /// REST API Reference for ListServiceDeployments Operation + public virtual Task ListServiceDeploymentsAsync(ListServiceDeploymentsRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = ListServiceDeploymentsRequestMarshaller.Instance; + options.ResponseUnmarshaller = ListServiceDeploymentsResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + #region ListServices @@ -4836,6 +5225,10 @@ public virtual RegisterTaskDefinitionResponse RegisterTaskDefinition(RegisterTas /// authorization. When a task definition revision is not specified, authorization will /// occur using the latest revision of a task definition. /// + ///     + /// + /// Amazon Elastic Inference (EI) is no longer available to customers. + /// /// /// /// You can allow Amazon ECS to place tasks for you, or you can customize how Amazon ECS @@ -4850,16 +5243,6 @@ public virtual RegisterTaskDefinitionResponse RegisterTaskDefinition(RegisterTas /// /// /// - /// Starting April 15, 2023, Amazon Web Services will not onboard new customers to Amazon - /// Elastic Inference (EI), and will help current customers migrate their workloads to - /// options that offer better price and performance. After April 15, 2023, new customers - /// will not be able to launch instances with Amazon EI accelerators in Amazon SageMaker, - /// Amazon ECS, or Amazon EC2. However, customers who have used Amazon EI at least once - /// during the past 30-day period are considered current customers and will be able to - /// continue using the service. - /// - /// - /// /// You can attach Amazon EBS volumes to Amazon ECS tasks by configuring the volume when /// creating or updating a service. For more infomation, see Amazon /// EBS volumes in the Amazon Elastic Container Service Developer Guide. @@ -4980,6 +5363,10 @@ public virtual RunTaskResponse RunTask(RunTaskRequest request) /// authorization. When a task definition revision is not specified, authorization will /// occur using the latest revision of a task definition. /// + ///     + /// + /// Amazon Elastic Inference (EI) is no longer available to customers. + /// /// /// /// You can allow Amazon ECS to place tasks for you, or you can customize how Amazon ECS @@ -4994,16 +5381,6 @@ public virtual RunTaskResponse RunTask(RunTaskRequest request) /// /// /// - /// Starting April 15, 2023, Amazon Web Services will not onboard new customers to Amazon - /// Elastic Inference (EI), and will help current customers migrate their workloads to - /// options that offer better price and performance. After April 15, 2023, new customers - /// will not be able to launch instances with Amazon EI accelerators in Amazon SageMaker, - /// Amazon ECS, or Amazon EC2. However, customers who have used Amazon EI at least once - /// during the past 30-day period are considered current customers and will be able to - /// continue using the service. - /// - /// - /// /// You can attach Amazon EBS volumes to Amazon ECS tasks by configuring the volume when /// creating or updating a service. For more infomation, see Amazon /// EBS volumes in the Amazon Elastic Container Service Developer Guide. @@ -5132,17 +5509,11 @@ public virtual RunTaskResponse RunTask(RunTaskRequest request) /// authorization. When a task definition revision is not specified, authorization will /// occur using the latest revision of a task definition. /// - /// + /// /// - /// Starting April 15, 2023, Amazon Web Services will not onboard new customers to Amazon - /// Elastic Inference (EI), and will help current customers migrate their workloads to - /// options that offer better price and performance. After April 15, 2023, new customers - /// will not be able to launch instances with Amazon EI accelerators in Amazon SageMaker, - /// Amazon ECS, or Amazon EC2. However, customers who have used Amazon EI at least once - /// during the past 30-day period are considered current customers and will be able to - /// continue using the service. + /// Amazon Elastic Inference (EI) is no longer available to customers. /// - /// + /// /// /// Alternatively, you can useRunTask to place tasks for you. For more information, /// see Scheduling @@ -5210,17 +5581,11 @@ public virtual StartTaskResponse StartTask(StartTaskRequest request) /// authorization. When a task definition revision is not specified, authorization will /// occur using the latest revision of a task definition. /// - /// + /// /// - /// Starting April 15, 2023, Amazon Web Services will not onboard new customers to Amazon - /// Elastic Inference (EI), and will help current customers migrate their workloads to - /// options that offer better price and performance. After April 15, 2023, new customers - /// will not be able to launch instances with Amazon EI accelerators in Amazon SageMaker, - /// Amazon ECS, or Amazon EC2. However, customers who have used Amazon EI at least once - /// during the past 30-day period are considered current customers and will be able to - /// continue using the service. + /// Amazon Elastic Inference (EI) is no longer available to customers. /// - /// + /// /// /// Alternatively, you can useRunTask to place tasks for you. For more information, /// see Scheduling diff --git a/sdk/src/Services/ECS/Properties/AssemblyInfo.cs b/sdk/src/Services/ECS/Properties/AssemblyInfo.cs index e8380be0f755..efde5d290f64 100644 --- a/sdk/src/Services/ECS/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/ECS/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.402.21")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.404.10")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/EKS/EKS.sln b/sdk/src/Services/EKS/EKS.sln index 761f39650676..7896d77b028e 100644 --- a/sdk/src/Services/EKS/EKS.sln +++ b/sdk/src/Services/EKS/EKS.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {45C4354E-3DE3-4982-9C9D-0E5A8D0CEE5E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {45C4354E-3DE3-4982-9C9D-0E5A8D0CEE5E}.Debug|Any CPU.Build.0 = Debug|Any CPU {45C4354E-3DE3-4982-9C9D-0E5A8D0CEE5E}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {D134D84E-EDCE-45B6-9437-7AB854D70F0A}.Debug|Any CPU.Build.0 = Debug|Any CPU {D134D84E-EDCE-45B6-9437-7AB854D70F0A}.Release|Any CPU.ActiveCfg = Release|Any CPU {D134D84E-EDCE-45B6-9437-7AB854D70F0A}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {F0A95B8F-6E26-4046-9E4A-4BFE8CFE625B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F0A95B8F-6E26-4046-9E4A-4BFE8CFE625B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F0A95B8F-6E26-4046-9E4A-4BFE8CFE625B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F0A95B8F-6E26-4046-9E4A-4BFE8CFE625B}.Release|Any CPU.Build.0 = Release|Any CPU - {F76A9487-73CE-4786-8C7F-CAAEF8D2739E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F76A9487-73CE-4786-8C7F-CAAEF8D2739E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F76A9487-73CE-4786-8C7F-CAAEF8D2739E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F76A9487-73CE-4786-8C7F-CAAEF8D2739E}.Release|Any CPU.Build.0 = Release|Any CPU - {A1060F58-3876-47B7-B61E-FFCB5137F332}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A1060F58-3876-47B7-B61E-FFCB5137F332}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A1060F58-3876-47B7-B61E-FFCB5137F332}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A1060F58-3876-47B7-B61E-FFCB5137F332}.Release|Any CPU.Build.0 = Release|Any CPU - {C05741E3-DD89-4FF8-9EE2-18241AA94E0E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C05741E3-DD89-4FF8-9EE2-18241AA94E0E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C05741E3-DD89-4FF8-9EE2-18241AA94E0E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C05741E3-DD89-4FF8-9EE2-18241AA94E0E}.Release|Any CPU.Build.0 = Release|Any CPU - {E0D0BEB1-9F21-4D7C-967D-0A8664D91C6F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E0D0BEB1-9F21-4D7C-967D-0A8664D91C6F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E0D0BEB1-9F21-4D7C-967D-0A8664D91C6F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E0D0BEB1-9F21-4D7C-967D-0A8664D91C6F}.Release|Any CPU.Build.0 = Release|Any CPU - {41101F05-BACA-4F9F-8FE4-21ACFE579EFE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {41101F05-BACA-4F9F-8FE4-21ACFE579EFE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {41101F05-BACA-4F9F-8FE4-21ACFE579EFE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {41101F05-BACA-4F9F-8FE4-21ACFE579EFE}.Release|Any CPU.Build.0 = Release|Any CPU - {62AFAA75-3718-4537-82BD-7E50C9A60F53}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {62AFAA75-3718-4537-82BD-7E50C9A60F53}.Debug|Any CPU.Build.0 = Debug|Any CPU - {62AFAA75-3718-4537-82BD-7E50C9A60F53}.Release|Any CPU.ActiveCfg = Release|Any CPU - {62AFAA75-3718-4537-82BD-7E50C9A60F53}.Release|Any CPU.Build.0 = Release|Any CPU - {ACFF2FA2-BA1D-4240-9BD9-B879BD6B5BBD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {ACFF2FA2-BA1D-4240-9BD9-B879BD6B5BBD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {ACFF2FA2-BA1D-4240-9BD9-B879BD6B5BBD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {ACFF2FA2-BA1D-4240-9BD9-B879BD6B5BBD}.Release|Any CPU.Build.0 = Release|Any CPU - {FD3BF4E6-BAE6-41AF-B8F0-419B82EE8C06}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FD3BF4E6-BAE6-41AF-B8F0-419B82EE8C06}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FD3BF4E6-BAE6-41AF-B8F0-419B82EE8C06}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FD3BF4E6-BAE6-41AF-B8F0-419B82EE8C06}.Release|Any CPU.Build.0 = Release|Any CPU - {2E695341-90EB-40C4-AF20-3BB375DC09F6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2E695341-90EB-40C4-AF20-3BB375DC09F6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2E695341-90EB-40C4-AF20-3BB375DC09F6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2E695341-90EB-40C4-AF20-3BB375DC09F6}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {F0A95B8F-6E26-4046-9E4A-4BFE8CFE625B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F0A95B8F-6E26-4046-9E4A-4BFE8CFE625B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F0A95B8F-6E26-4046-9E4A-4BFE8CFE625B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F0A95B8F-6E26-4046-9E4A-4BFE8CFE625B}.Release|Any CPU.Build.0 = Release|Any CPU - {F76A9487-73CE-4786-8C7F-CAAEF8D2739E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F76A9487-73CE-4786-8C7F-CAAEF8D2739E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F76A9487-73CE-4786-8C7F-CAAEF8D2739E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F76A9487-73CE-4786-8C7F-CAAEF8D2739E}.Release|Any CPU.Build.0 = Release|Any CPU - {A1060F58-3876-47B7-B61E-FFCB5137F332}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A1060F58-3876-47B7-B61E-FFCB5137F332}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A1060F58-3876-47B7-B61E-FFCB5137F332}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A1060F58-3876-47B7-B61E-FFCB5137F332}.Release|Any CPU.Build.0 = Release|Any CPU - {C05741E3-DD89-4FF8-9EE2-18241AA94E0E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C05741E3-DD89-4FF8-9EE2-18241AA94E0E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C05741E3-DD89-4FF8-9EE2-18241AA94E0E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C05741E3-DD89-4FF8-9EE2-18241AA94E0E}.Release|Any CPU.Build.0 = Release|Any CPU - {E0D0BEB1-9F21-4D7C-967D-0A8664D91C6F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E0D0BEB1-9F21-4D7C-967D-0A8664D91C6F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E0D0BEB1-9F21-4D7C-967D-0A8664D91C6F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E0D0BEB1-9F21-4D7C-967D-0A8664D91C6F}.Release|Any CPU.Build.0 = Release|Any CPU - {41101F05-BACA-4F9F-8FE4-21ACFE579EFE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {41101F05-BACA-4F9F-8FE4-21ACFE579EFE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {41101F05-BACA-4F9F-8FE4-21ACFE579EFE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {41101F05-BACA-4F9F-8FE4-21ACFE579EFE}.Release|Any CPU.Build.0 = Release|Any CPU - {62AFAA75-3718-4537-82BD-7E50C9A60F53}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {62AFAA75-3718-4537-82BD-7E50C9A60F53}.Debug|Any CPU.Build.0 = Debug|Any CPU - {62AFAA75-3718-4537-82BD-7E50C9A60F53}.Release|Any CPU.ActiveCfg = Release|Any CPU - {62AFAA75-3718-4537-82BD-7E50C9A60F53}.Release|Any CPU.Build.0 = Release|Any CPU - {ACFF2FA2-BA1D-4240-9BD9-B879BD6B5BBD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {ACFF2FA2-BA1D-4240-9BD9-B879BD6B5BBD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {ACFF2FA2-BA1D-4240-9BD9-B879BD6B5BBD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {ACFF2FA2-BA1D-4240-9BD9-B879BD6B5BBD}.Release|Any CPU.Build.0 = Release|Any CPU - {FD3BF4E6-BAE6-41AF-B8F0-419B82EE8C06}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FD3BF4E6-BAE6-41AF-B8F0-419B82EE8C06}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FD3BF4E6-BAE6-41AF-B8F0-419B82EE8C06}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FD3BF4E6-BAE6-41AF-B8F0-419B82EE8C06}.Release|Any CPU.Build.0 = Release|Any CPU - {2E695341-90EB-40C4-AF20-3BB375DC09F6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2E695341-90EB-40C4-AF20-3BB375DC09F6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2E695341-90EB-40C4-AF20-3BB375DC09F6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2E695341-90EB-40C4-AF20-3BB375DC09F6}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {45C4354E-3DE3-4982-9C9D-0E5A8D0CEE5E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {5B926330-1DA3-49E1-B801-287849BC4939} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {A67677A4-DF7A-4680-855D-3AB161D32702} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {B58B554C-D9B8-4E35-B064-00BF073CF989} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {D134D84E-EDCE-45B6-9437-7AB854D70F0A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {F0A95B8F-6E26-4046-9E4A-4BFE8CFE625B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F76A9487-73CE-4786-8C7F-CAAEF8D2739E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A1060F58-3876-47B7-B61E-FFCB5137F332} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C05741E3-DD89-4FF8-9EE2-18241AA94E0E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E0D0BEB1-9F21-4D7C-967D-0A8664D91C6F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {41101F05-BACA-4F9F-8FE4-21ACFE579EFE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {62AFAA75-3718-4537-82BD-7E50C9A60F53} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {ACFF2FA2-BA1D-4240-9BD9-B879BD6B5BBD} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {FD3BF4E6-BAE6-41AF-B8F0-419B82EE8C06} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {2E695341-90EB-40C4-AF20-3BB375DC09F6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {F0A95B8F-6E26-4046-9E4A-4BFE8CFE625B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F76A9487-73CE-4786-8C7F-CAAEF8D2739E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A1060F58-3876-47B7-B61E-FFCB5137F332} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C05741E3-DD89-4FF8-9EE2-18241AA94E0E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E0D0BEB1-9F21-4D7C-967D-0A8664D91C6F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {41101F05-BACA-4F9F-8FE4-21ACFE579EFE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {62AFAA75-3718-4537-82BD-7E50C9A60F53} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {ACFF2FA2-BA1D-4240-9BD9-B879BD6B5BBD} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {FD3BF4E6-BAE6-41AF-B8F0-419B82EE8C06} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {2E695341-90EB-40C4-AF20-3BB375DC09F6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {1EBC774C-329F-44FB-BD42-F7206CDAC511} diff --git a/sdk/src/Services/EKS/Generated/AmazonEKSConfig.cs b/sdk/src/Services/EKS/Generated/AmazonEKSConfig.cs index c1e935357f38..86dce758e3f2 100644 --- a/sdk/src/Services/EKS/Generated/AmazonEKSConfig.cs +++ b/sdk/src/Services/EKS/Generated/AmazonEKSConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.EKS public partial class AmazonEKSConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("EKS", "4.0.0.0"); private static readonly AmazonEKSEndpointResolver EndpointResolver = new AmazonEKSEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("EKS", "3.7.402.22"); -======= - InternalSDKUtils.BuildUserAgentString("EKS", "3.7.404.6"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/EKS/Generated/Model/Internal/MarshallTransformations/CreateClusterRequestMarshaller.cs b/sdk/src/Services/EKS/Generated/Model/Internal/MarshallTransformations/CreateClusterRequestMarshaller.cs index d0c86c816499..34d4381d88e5 100644 --- a/sdk/src/Services/EKS/Generated/Model/Internal/MarshallTransformations/CreateClusterRequestMarshaller.cs +++ b/sdk/src/Services/EKS/Generated/Model/Internal/MarshallTransformations/CreateClusterRequestMarshaller.cs @@ -200,31 +200,21 @@ public IRequest Marshall(CreateClusterRequest publicRequest) context.Writer.Write(publicRequest.Version); } - writer.WriteObjectEnd(); - } + if(publicRequest.IsSetZonalShiftConfig()) + { + context.Writer.WritePropertyName("zonalShiftConfig"); + context.Writer.WriteObjectStart(); -<<<<<<< HEAD - request.Content = memoryStream.ToArray(); -||||||| Commit version number update changes - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); -======= - if(publicRequest.IsSetZonalShiftConfig()) - { - context.Writer.WritePropertyName("zonalShiftConfig"); - context.Writer.WriteObjectStart(); + var marshaller = ZonalShiftConfigRequestMarshaller.Instance; + marshaller.Marshall(publicRequest.ZonalShiftConfig, context); - var marshaller = ZonalShiftConfigRequestMarshaller.Instance; - marshaller.Marshall(publicRequest.ZonalShiftConfig, context); + context.Writer.WriteObjectEnd(); + } - context.Writer.WriteObjectEnd(); + writer.WriteObjectEnd(); } - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b + request.Content = memoryStream.ToArray(); } diff --git a/sdk/src/Services/EKS/Generated/Model/Internal/MarshallTransformations/UpdateClusterConfigRequestMarshaller.cs b/sdk/src/Services/EKS/Generated/Model/Internal/MarshallTransformations/UpdateClusterConfigRequestMarshaller.cs index b7ca5dea7181..5cbb957a9196 100644 --- a/sdk/src/Services/EKS/Generated/Model/Internal/MarshallTransformations/UpdateClusterConfigRequestMarshaller.cs +++ b/sdk/src/Services/EKS/Generated/Model/Internal/MarshallTransformations/UpdateClusterConfigRequestMarshaller.cs @@ -127,31 +127,21 @@ public IRequest Marshall(UpdateClusterConfigRequest publicRequest) context.Writer.WriteObjectEnd(); } - writer.WriteObjectEnd(); - } + if(publicRequest.IsSetZonalShiftConfig()) + { + context.Writer.WritePropertyName("zonalShiftConfig"); + context.Writer.WriteObjectStart(); -<<<<<<< HEAD - request.Content = memoryStream.ToArray(); -||||||| Commit version number update changes - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); -======= - if(publicRequest.IsSetZonalShiftConfig()) - { - context.Writer.WritePropertyName("zonalShiftConfig"); - context.Writer.WriteObjectStart(); + var marshaller = ZonalShiftConfigRequestMarshaller.Instance; + marshaller.Marshall(publicRequest.ZonalShiftConfig, context); - var marshaller = ZonalShiftConfigRequestMarshaller.Instance; - marshaller.Marshall(publicRequest.ZonalShiftConfig, context); + context.Writer.WriteObjectEnd(); + } - context.Writer.WriteObjectEnd(); + writer.WriteObjectEnd(); } - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b + request.Content = memoryStream.ToArray(); } diff --git a/sdk/src/Services/EKS/Generated/Model/Internal/MarshallTransformations/ZonalShiftConfigRequestMarshaller.cs b/sdk/src/Services/EKS/Generated/Model/Internal/MarshallTransformations/ZonalShiftConfigRequestMarshaller.cs index 4cc42243e1b3..83b9e54cc989 100644 --- a/sdk/src/Services/EKS/Generated/Model/Internal/MarshallTransformations/ZonalShiftConfigRequestMarshaller.cs +++ b/sdk/src/Services/EKS/Generated/Model/Internal/MarshallTransformations/ZonalShiftConfigRequestMarshaller.cs @@ -51,7 +51,7 @@ public void Marshall(ZonalShiftConfigRequest requestObject, JsonMarshallerContex if(requestObject.IsSetEnabled()) { context.Writer.WritePropertyName("enabled"); - context.Writer.Write(requestObject.Enabled); + context.Writer.Write(requestObject.Enabled.Value); } } diff --git a/sdk/src/Services/EKS/Generated/Model/Internal/MarshallTransformations/ZonalShiftConfigResponseUnmarshaller.cs b/sdk/src/Services/EKS/Generated/Model/Internal/MarshallTransformations/ZonalShiftConfigResponseUnmarshaller.cs index 4ce394f44223..c24fda340587 100644 --- a/sdk/src/Services/EKS/Generated/Model/Internal/MarshallTransformations/ZonalShiftConfigResponseUnmarshaller.cs +++ b/sdk/src/Services/EKS/Generated/Model/Internal/MarshallTransformations/ZonalShiftConfigResponseUnmarshaller.cs @@ -68,7 +68,7 @@ public ZonalShiftConfigResponse Unmarshall(JsonUnmarshallerContext context) { if (context.TestExpression("enabled", targetDepth)) { - var unmarshaller = BoolUnmarshaller.Instance; + var unmarshaller = NullableBoolUnmarshaller.Instance; unmarshalledObject.Enabled = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/EKS/Generated/Model/ZonalShiftConfigRequest.cs b/sdk/src/Services/EKS/Generated/Model/ZonalShiftConfigRequest.cs index ee696558829a..159bc8b558ef 100644 --- a/sdk/src/Services/EKS/Generated/Model/ZonalShiftConfigRequest.cs +++ b/sdk/src/Services/EKS/Generated/Model/ZonalShiftConfigRequest.cs @@ -43,9 +43,9 @@ public partial class ZonalShiftConfigRequest /// cluster. /// /// - public bool Enabled + public bool? Enabled { - get { return this._enabled.GetValueOrDefault(); } + get { return this._enabled; } set { this._enabled = value; } } diff --git a/sdk/src/Services/EKS/Generated/Model/ZonalShiftConfigResponse.cs b/sdk/src/Services/EKS/Generated/Model/ZonalShiftConfigResponse.cs index 4fbba80f6ff1..3ee397113bc7 100644 --- a/sdk/src/Services/EKS/Generated/Model/ZonalShiftConfigResponse.cs +++ b/sdk/src/Services/EKS/Generated/Model/ZonalShiftConfigResponse.cs @@ -42,9 +42,9 @@ public partial class ZonalShiftConfigResponse /// Whether the zonal shift is enabled. /// /// - public bool Enabled + public bool? Enabled { - get { return this._enabled.GetValueOrDefault(); } + get { return this._enabled; } set { this._enabled = value; } } diff --git a/sdk/src/Services/EKS/Generated/_bcl/AmazonEKSClient.cs b/sdk/src/Services/EKS/Generated/_bcl/AmazonEKSClient.cs index 2175bce9102d..ae54c881e692 100644 --- a/sdk/src/Services/EKS/Generated/_bcl/AmazonEKSClient.cs +++ b/sdk/src/Services/EKS/Generated/_bcl/AmazonEKSClient.cs @@ -4779,6 +4779,11 @@ public virtual UpdateAddonResponse UpdateAddon(UpdateAddonRequest request) /// /// /// + /// You can also use this API operation to enable or disable ARC zonal shift. If zonal + /// shift is enabled, Amazon Web Services configures zonal autoshift for the cluster. + /// + /// + /// /// Cluster updates are asynchronous, and they should finish within a few minutes. During /// an update, the cluster status moves to UPDATING (this status transition is /// eventually consistent). When the update is complete (either Failed or Successful), @@ -4859,6 +4864,11 @@ public virtual UpdateClusterConfigResponse UpdateClusterConfig(UpdateClusterConf /// /// /// + /// You can also use this API operation to enable or disable ARC zonal shift. If zonal + /// shift is enabled, Amazon Web Services configures zonal autoshift for the cluster. + /// + /// + /// /// Cluster updates are asynchronous, and they should finish within a few minutes. During /// an update, the cluster status moves to UPDATING (this status transition is /// eventually consistent). When the update is complete (either Failed or Successful), diff --git a/sdk/src/Services/EKS/Properties/AssemblyInfo.cs b/sdk/src/Services/EKS/Properties/AssemblyInfo.cs index f3052bb38cbf..996a2fbdcb50 100644 --- a/sdk/src/Services/EKS/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/EKS/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.402.22")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.404.6")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/EKSAuth/EKSAuth.sln b/sdk/src/Services/EKSAuth/EKSAuth.sln index 694493078cc0..2c177f1463f1 100644 --- a/sdk/src/Services/EKSAuth/EKSAuth.sln +++ b/sdk/src/Services/EKSAuth/EKSAuth.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {6D1A109B-658F-40B4-93E5-9D20F4161095}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {6D1A109B-658F-40B4-93E5-9D20F4161095}.Debug|Any CPU.Build.0 = Debug|Any CPU {6D1A109B-658F-40B4-93E5-9D20F4161095}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {E9BDAD36-65D8-4613-B32C-CAE0918B5F0B}.Debug|Any CPU.Build.0 = Debug|Any CPU {E9BDAD36-65D8-4613-B32C-CAE0918B5F0B}.Release|Any CPU.ActiveCfg = Release|Any CPU {E9BDAD36-65D8-4613-B32C-CAE0918B5F0B}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {DB5DDE41-9A42-4FE8-8BF5-1D9692FAEC0E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DB5DDE41-9A42-4FE8-8BF5-1D9692FAEC0E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DB5DDE41-9A42-4FE8-8BF5-1D9692FAEC0E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DB5DDE41-9A42-4FE8-8BF5-1D9692FAEC0E}.Release|Any CPU.Build.0 = Release|Any CPU - {6CBE06EF-1358-483E-A881-12FB07922B76}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6CBE06EF-1358-483E-A881-12FB07922B76}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6CBE06EF-1358-483E-A881-12FB07922B76}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6CBE06EF-1358-483E-A881-12FB07922B76}.Release|Any CPU.Build.0 = Release|Any CPU - {32AEC1B9-2270-4BBA-82B9-3E8D7F003A56}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {32AEC1B9-2270-4BBA-82B9-3E8D7F003A56}.Debug|Any CPU.Build.0 = Debug|Any CPU - {32AEC1B9-2270-4BBA-82B9-3E8D7F003A56}.Release|Any CPU.ActiveCfg = Release|Any CPU - {32AEC1B9-2270-4BBA-82B9-3E8D7F003A56}.Release|Any CPU.Build.0 = Release|Any CPU - {11513962-E726-41A5-90E6-1C37003E083B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {11513962-E726-41A5-90E6-1C37003E083B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {11513962-E726-41A5-90E6-1C37003E083B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {11513962-E726-41A5-90E6-1C37003E083B}.Release|Any CPU.Build.0 = Release|Any CPU - {0E0668B8-2835-4AC1-9B81-53563309FE91}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0E0668B8-2835-4AC1-9B81-53563309FE91}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0E0668B8-2835-4AC1-9B81-53563309FE91}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0E0668B8-2835-4AC1-9B81-53563309FE91}.Release|Any CPU.Build.0 = Release|Any CPU - {6026C207-FC33-4510-B45D-2ED2E97CED99}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6026C207-FC33-4510-B45D-2ED2E97CED99}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6026C207-FC33-4510-B45D-2ED2E97CED99}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6026C207-FC33-4510-B45D-2ED2E97CED99}.Release|Any CPU.Build.0 = Release|Any CPU - {FFC2C4B2-0FAC-479C-ABEB-9FFF688A1F64}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FFC2C4B2-0FAC-479C-ABEB-9FFF688A1F64}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FFC2C4B2-0FAC-479C-ABEB-9FFF688A1F64}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FFC2C4B2-0FAC-479C-ABEB-9FFF688A1F64}.Release|Any CPU.Build.0 = Release|Any CPU - {330C4028-7496-4CCD-A3DA-776C80C0864C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {330C4028-7496-4CCD-A3DA-776C80C0864C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {330C4028-7496-4CCD-A3DA-776C80C0864C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {330C4028-7496-4CCD-A3DA-776C80C0864C}.Release|Any CPU.Build.0 = Release|Any CPU - {E0FB3CF6-3CEF-4C08-A2BC-7481D184AF34}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E0FB3CF6-3CEF-4C08-A2BC-7481D184AF34}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E0FB3CF6-3CEF-4C08-A2BC-7481D184AF34}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E0FB3CF6-3CEF-4C08-A2BC-7481D184AF34}.Release|Any CPU.Build.0 = Release|Any CPU - {E670AEE6-C82E-44E2-B37E-A6340FDE09B2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E670AEE6-C82E-44E2-B37E-A6340FDE09B2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E670AEE6-C82E-44E2-B37E-A6340FDE09B2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E670AEE6-C82E-44E2-B37E-A6340FDE09B2}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {DB5DDE41-9A42-4FE8-8BF5-1D9692FAEC0E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DB5DDE41-9A42-4FE8-8BF5-1D9692FAEC0E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DB5DDE41-9A42-4FE8-8BF5-1D9692FAEC0E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DB5DDE41-9A42-4FE8-8BF5-1D9692FAEC0E}.Release|Any CPU.Build.0 = Release|Any CPU - {6CBE06EF-1358-483E-A881-12FB07922B76}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6CBE06EF-1358-483E-A881-12FB07922B76}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6CBE06EF-1358-483E-A881-12FB07922B76}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6CBE06EF-1358-483E-A881-12FB07922B76}.Release|Any CPU.Build.0 = Release|Any CPU - {32AEC1B9-2270-4BBA-82B9-3E8D7F003A56}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {32AEC1B9-2270-4BBA-82B9-3E8D7F003A56}.Debug|Any CPU.Build.0 = Debug|Any CPU - {32AEC1B9-2270-4BBA-82B9-3E8D7F003A56}.Release|Any CPU.ActiveCfg = Release|Any CPU - {32AEC1B9-2270-4BBA-82B9-3E8D7F003A56}.Release|Any CPU.Build.0 = Release|Any CPU - {11513962-E726-41A5-90E6-1C37003E083B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {11513962-E726-41A5-90E6-1C37003E083B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {11513962-E726-41A5-90E6-1C37003E083B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {11513962-E726-41A5-90E6-1C37003E083B}.Release|Any CPU.Build.0 = Release|Any CPU - {0E0668B8-2835-4AC1-9B81-53563309FE91}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0E0668B8-2835-4AC1-9B81-53563309FE91}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0E0668B8-2835-4AC1-9B81-53563309FE91}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0E0668B8-2835-4AC1-9B81-53563309FE91}.Release|Any CPU.Build.0 = Release|Any CPU - {6026C207-FC33-4510-B45D-2ED2E97CED99}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6026C207-FC33-4510-B45D-2ED2E97CED99}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6026C207-FC33-4510-B45D-2ED2E97CED99}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6026C207-FC33-4510-B45D-2ED2E97CED99}.Release|Any CPU.Build.0 = Release|Any CPU - {FFC2C4B2-0FAC-479C-ABEB-9FFF688A1F64}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FFC2C4B2-0FAC-479C-ABEB-9FFF688A1F64}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FFC2C4B2-0FAC-479C-ABEB-9FFF688A1F64}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FFC2C4B2-0FAC-479C-ABEB-9FFF688A1F64}.Release|Any CPU.Build.0 = Release|Any CPU - {330C4028-7496-4CCD-A3DA-776C80C0864C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {330C4028-7496-4CCD-A3DA-776C80C0864C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {330C4028-7496-4CCD-A3DA-776C80C0864C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {330C4028-7496-4CCD-A3DA-776C80C0864C}.Release|Any CPU.Build.0 = Release|Any CPU - {E0FB3CF6-3CEF-4C08-A2BC-7481D184AF34}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E0FB3CF6-3CEF-4C08-A2BC-7481D184AF34}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E0FB3CF6-3CEF-4C08-A2BC-7481D184AF34}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E0FB3CF6-3CEF-4C08-A2BC-7481D184AF34}.Release|Any CPU.Build.0 = Release|Any CPU - {E670AEE6-C82E-44E2-B37E-A6340FDE09B2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E670AEE6-C82E-44E2-B37E-A6340FDE09B2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E670AEE6-C82E-44E2-B37E-A6340FDE09B2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E670AEE6-C82E-44E2-B37E-A6340FDE09B2}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {6D1A109B-658F-40B4-93E5-9D20F4161095} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {68F02B67-DA67-495A-B5D5-28319D06CBB7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {CF995624-2489-46F8-A1A6-35143C1A3D01} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {C8A7B2F7-7E5B-4CE8-9EA4-B92E08CB3531} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {E9BDAD36-65D8-4613-B32C-CAE0918B5F0B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {DB5DDE41-9A42-4FE8-8BF5-1D9692FAEC0E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6CBE06EF-1358-483E-A881-12FB07922B76} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {32AEC1B9-2270-4BBA-82B9-3E8D7F003A56} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {11513962-E726-41A5-90E6-1C37003E083B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0E0668B8-2835-4AC1-9B81-53563309FE91} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6026C207-FC33-4510-B45D-2ED2E97CED99} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {FFC2C4B2-0FAC-479C-ABEB-9FFF688A1F64} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {330C4028-7496-4CCD-A3DA-776C80C0864C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E0FB3CF6-3CEF-4C08-A2BC-7481D184AF34} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E670AEE6-C82E-44E2-B37E-A6340FDE09B2} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {DB5DDE41-9A42-4FE8-8BF5-1D9692FAEC0E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6CBE06EF-1358-483E-A881-12FB07922B76} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {32AEC1B9-2270-4BBA-82B9-3E8D7F003A56} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {11513962-E726-41A5-90E6-1C37003E083B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0E0668B8-2835-4AC1-9B81-53563309FE91} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6026C207-FC33-4510-B45D-2ED2E97CED99} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {FFC2C4B2-0FAC-479C-ABEB-9FFF688A1F64} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {330C4028-7496-4CCD-A3DA-776C80C0864C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E0FB3CF6-3CEF-4C08-A2BC-7481D184AF34} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E670AEE6-C82E-44E2-B37E-A6340FDE09B2} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {6B294238-D0C8-4F3B-8449-6AC9DBA20506} diff --git a/sdk/src/Services/EKSAuth/Generated/AmazonEKSAuthConfig.cs b/sdk/src/Services/EKSAuth/Generated/AmazonEKSAuthConfig.cs index 72f769165b30..544c98b98c4d 100644 --- a/sdk/src/Services/EKSAuth/Generated/AmazonEKSAuthConfig.cs +++ b/sdk/src/Services/EKSAuth/Generated/AmazonEKSAuthConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.EKSAuth public partial class AmazonEKSAuthConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("EKS Auth", "4.0.0.0"); private static readonly AmazonEKSAuthEndpointResolver EndpointResolver = new AmazonEKSAuthEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("EKS Auth", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("EKS Auth", "3.7.400.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/EKSAuth/Properties/AssemblyInfo.cs b/sdk/src/Services/EKSAuth/Properties/AssemblyInfo.cs index e5680a4d6851..eda853750595 100644 --- a/sdk/src/Services/EKSAuth/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/EKSAuth/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/EMRContainers/EMRContainers.sln b/sdk/src/Services/EMRContainers/EMRContainers.sln index 02ada2fca360..2c24298566a5 100644 --- a/sdk/src/Services/EMRContainers/EMRContainers.sln +++ b/sdk/src/Services/EMRContainers/EMRContainers.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {77FD8AC8-D5A0-48D8-AF21-50CAD6E4C3EA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {77FD8AC8-D5A0-48D8-AF21-50CAD6E4C3EA}.Debug|Any CPU.Build.0 = Debug|Any CPU {77FD8AC8-D5A0-48D8-AF21-50CAD6E4C3EA}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {6357B553-84E1-420B-B7B7-81CF821D6E54}.Debug|Any CPU.Build.0 = Debug|Any CPU {6357B553-84E1-420B-B7B7-81CF821D6E54}.Release|Any CPU.ActiveCfg = Release|Any CPU {6357B553-84E1-420B-B7B7-81CF821D6E54}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {E13E3B1F-D9C2-43CE-BA96-E161E6782E55}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E13E3B1F-D9C2-43CE-BA96-E161E6782E55}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E13E3B1F-D9C2-43CE-BA96-E161E6782E55}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E13E3B1F-D9C2-43CE-BA96-E161E6782E55}.Release|Any CPU.Build.0 = Release|Any CPU - {FBCD03C7-0D8F-4BF1-A095-DC866738F62D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FBCD03C7-0D8F-4BF1-A095-DC866738F62D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FBCD03C7-0D8F-4BF1-A095-DC866738F62D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FBCD03C7-0D8F-4BF1-A095-DC866738F62D}.Release|Any CPU.Build.0 = Release|Any CPU - {32F70011-7524-4805-871D-FE8A66686CE3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {32F70011-7524-4805-871D-FE8A66686CE3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {32F70011-7524-4805-871D-FE8A66686CE3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {32F70011-7524-4805-871D-FE8A66686CE3}.Release|Any CPU.Build.0 = Release|Any CPU - {546F246B-FC3F-40F4-808E-DD300AB60EE6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {546F246B-FC3F-40F4-808E-DD300AB60EE6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {546F246B-FC3F-40F4-808E-DD300AB60EE6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {546F246B-FC3F-40F4-808E-DD300AB60EE6}.Release|Any CPU.Build.0 = Release|Any CPU - {E6954BCB-A2DE-4A7B-8901-EF3DFAE3D37D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E6954BCB-A2DE-4A7B-8901-EF3DFAE3D37D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E6954BCB-A2DE-4A7B-8901-EF3DFAE3D37D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E6954BCB-A2DE-4A7B-8901-EF3DFAE3D37D}.Release|Any CPU.Build.0 = Release|Any CPU - {1F222B5F-F54E-44F0-98BC-42C2EACE275E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1F222B5F-F54E-44F0-98BC-42C2EACE275E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1F222B5F-F54E-44F0-98BC-42C2EACE275E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1F222B5F-F54E-44F0-98BC-42C2EACE275E}.Release|Any CPU.Build.0 = Release|Any CPU - {A4A28990-ADD2-4115-97C0-A1DB9DC7CC5D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A4A28990-ADD2-4115-97C0-A1DB9DC7CC5D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A4A28990-ADD2-4115-97C0-A1DB9DC7CC5D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A4A28990-ADD2-4115-97C0-A1DB9DC7CC5D}.Release|Any CPU.Build.0 = Release|Any CPU - {659596FE-5B71-4F38-8D82-42E632A54281}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {659596FE-5B71-4F38-8D82-42E632A54281}.Debug|Any CPU.Build.0 = Debug|Any CPU - {659596FE-5B71-4F38-8D82-42E632A54281}.Release|Any CPU.ActiveCfg = Release|Any CPU - {659596FE-5B71-4F38-8D82-42E632A54281}.Release|Any CPU.Build.0 = Release|Any CPU - {221FFB2A-DA73-4245-9455-F02BA778C82F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {221FFB2A-DA73-4245-9455-F02BA778C82F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {221FFB2A-DA73-4245-9455-F02BA778C82F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {221FFB2A-DA73-4245-9455-F02BA778C82F}.Release|Any CPU.Build.0 = Release|Any CPU - {BB2A1348-1C14-4A25-90C0-9861F0542E19}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BB2A1348-1C14-4A25-90C0-9861F0542E19}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BB2A1348-1C14-4A25-90C0-9861F0542E19}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BB2A1348-1C14-4A25-90C0-9861F0542E19}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {E13E3B1F-D9C2-43CE-BA96-E161E6782E55}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E13E3B1F-D9C2-43CE-BA96-E161E6782E55}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E13E3B1F-D9C2-43CE-BA96-E161E6782E55}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E13E3B1F-D9C2-43CE-BA96-E161E6782E55}.Release|Any CPU.Build.0 = Release|Any CPU - {FBCD03C7-0D8F-4BF1-A095-DC866738F62D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FBCD03C7-0D8F-4BF1-A095-DC866738F62D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FBCD03C7-0D8F-4BF1-A095-DC866738F62D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FBCD03C7-0D8F-4BF1-A095-DC866738F62D}.Release|Any CPU.Build.0 = Release|Any CPU - {32F70011-7524-4805-871D-FE8A66686CE3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {32F70011-7524-4805-871D-FE8A66686CE3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {32F70011-7524-4805-871D-FE8A66686CE3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {32F70011-7524-4805-871D-FE8A66686CE3}.Release|Any CPU.Build.0 = Release|Any CPU - {546F246B-FC3F-40F4-808E-DD300AB60EE6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {546F246B-FC3F-40F4-808E-DD300AB60EE6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {546F246B-FC3F-40F4-808E-DD300AB60EE6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {546F246B-FC3F-40F4-808E-DD300AB60EE6}.Release|Any CPU.Build.0 = Release|Any CPU - {E6954BCB-A2DE-4A7B-8901-EF3DFAE3D37D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E6954BCB-A2DE-4A7B-8901-EF3DFAE3D37D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E6954BCB-A2DE-4A7B-8901-EF3DFAE3D37D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E6954BCB-A2DE-4A7B-8901-EF3DFAE3D37D}.Release|Any CPU.Build.0 = Release|Any CPU - {1F222B5F-F54E-44F0-98BC-42C2EACE275E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1F222B5F-F54E-44F0-98BC-42C2EACE275E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1F222B5F-F54E-44F0-98BC-42C2EACE275E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1F222B5F-F54E-44F0-98BC-42C2EACE275E}.Release|Any CPU.Build.0 = Release|Any CPU - {A4A28990-ADD2-4115-97C0-A1DB9DC7CC5D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A4A28990-ADD2-4115-97C0-A1DB9DC7CC5D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A4A28990-ADD2-4115-97C0-A1DB9DC7CC5D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A4A28990-ADD2-4115-97C0-A1DB9DC7CC5D}.Release|Any CPU.Build.0 = Release|Any CPU - {659596FE-5B71-4F38-8D82-42E632A54281}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {659596FE-5B71-4F38-8D82-42E632A54281}.Debug|Any CPU.Build.0 = Debug|Any CPU - {659596FE-5B71-4F38-8D82-42E632A54281}.Release|Any CPU.ActiveCfg = Release|Any CPU - {659596FE-5B71-4F38-8D82-42E632A54281}.Release|Any CPU.Build.0 = Release|Any CPU - {221FFB2A-DA73-4245-9455-F02BA778C82F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {221FFB2A-DA73-4245-9455-F02BA778C82F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {221FFB2A-DA73-4245-9455-F02BA778C82F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {221FFB2A-DA73-4245-9455-F02BA778C82F}.Release|Any CPU.Build.0 = Release|Any CPU - {BB2A1348-1C14-4A25-90C0-9861F0542E19}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BB2A1348-1C14-4A25-90C0-9861F0542E19}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BB2A1348-1C14-4A25-90C0-9861F0542E19}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BB2A1348-1C14-4A25-90C0-9861F0542E19}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {77FD8AC8-D5A0-48D8-AF21-50CAD6E4C3EA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {BBE4C193-142A-4B77-B237-8D03F9CAD1BF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {869E76CC-DDFF-4AF4-852D-157A69E2F925} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {352A9C8F-577D-4B12-8AD8-5BDFEC6DF3F6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {6357B553-84E1-420B-B7B7-81CF821D6E54} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {E13E3B1F-D9C2-43CE-BA96-E161E6782E55} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {FBCD03C7-0D8F-4BF1-A095-DC866738F62D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {32F70011-7524-4805-871D-FE8A66686CE3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {546F246B-FC3F-40F4-808E-DD300AB60EE6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E6954BCB-A2DE-4A7B-8901-EF3DFAE3D37D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {1F222B5F-F54E-44F0-98BC-42C2EACE275E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A4A28990-ADD2-4115-97C0-A1DB9DC7CC5D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {659596FE-5B71-4F38-8D82-42E632A54281} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {221FFB2A-DA73-4245-9455-F02BA778C82F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {BB2A1348-1C14-4A25-90C0-9861F0542E19} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {E13E3B1F-D9C2-43CE-BA96-E161E6782E55} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {FBCD03C7-0D8F-4BF1-A095-DC866738F62D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {32F70011-7524-4805-871D-FE8A66686CE3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {546F246B-FC3F-40F4-808E-DD300AB60EE6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E6954BCB-A2DE-4A7B-8901-EF3DFAE3D37D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {1F222B5F-F54E-44F0-98BC-42C2EACE275E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A4A28990-ADD2-4115-97C0-A1DB9DC7CC5D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {659596FE-5B71-4F38-8D82-42E632A54281} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {221FFB2A-DA73-4245-9455-F02BA778C82F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {BB2A1348-1C14-4A25-90C0-9861F0542E19} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {8EACA0FC-F262-488F-8839-1034F6E77948} diff --git a/sdk/src/Services/EMRContainers/Generated/AmazonEMRContainersConfig.cs b/sdk/src/Services/EMRContainers/Generated/AmazonEMRContainersConfig.cs index 7ffc48b97f20..d4ae9e9db880 100644 --- a/sdk/src/Services/EMRContainers/Generated/AmazonEMRContainersConfig.cs +++ b/sdk/src/Services/EMRContainers/Generated/AmazonEMRContainersConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.EMRContainers public partial class AmazonEMRContainersConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("EMR containers", "4.0.0.0"); private static readonly AmazonEMRContainersEndpointResolver EndpointResolver = new AmazonEMRContainersEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("EMR containers", "3.7.401.15"); -======= - InternalSDKUtils.BuildUserAgentString("EMR containers", "3.7.401.42"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/EMRContainers/Properties/AssemblyInfo.cs b/sdk/src/Services/EMRContainers/Properties/AssemblyInfo.cs index a1c782e3d0d4..a2f2d08f3388 100644 --- a/sdk/src/Services/EMRContainers/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/EMRContainers/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.15")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.42")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/EMRServerless/EMRServerless.sln b/sdk/src/Services/EMRServerless/EMRServerless.sln index 27127a411c4a..9624b29f1ca8 100644 --- a/sdk/src/Services/EMRServerless/EMRServerless.sln +++ b/sdk/src/Services/EMRServerless/EMRServerless.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {467BF172-517A-43BA-9B4B-1F18EFB09E20}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {467BF172-517A-43BA-9B4B-1F18EFB09E20}.Debug|Any CPU.Build.0 = Debug|Any CPU {467BF172-517A-43BA-9B4B-1F18EFB09E20}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {C2E4C21C-4DFC-4564-86A2-16926865EAE8}.Debug|Any CPU.Build.0 = Debug|Any CPU {C2E4C21C-4DFC-4564-86A2-16926865EAE8}.Release|Any CPU.ActiveCfg = Release|Any CPU {C2E4C21C-4DFC-4564-86A2-16926865EAE8}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {D15DC2B8-0A59-4D1F-861A-0E9C6BA2949D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D15DC2B8-0A59-4D1F-861A-0E9C6BA2949D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D15DC2B8-0A59-4D1F-861A-0E9C6BA2949D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D15DC2B8-0A59-4D1F-861A-0E9C6BA2949D}.Release|Any CPU.Build.0 = Release|Any CPU - {F73BC978-8E56-4E4E-A1E9-04BEF2DC9D44}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F73BC978-8E56-4E4E-A1E9-04BEF2DC9D44}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F73BC978-8E56-4E4E-A1E9-04BEF2DC9D44}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F73BC978-8E56-4E4E-A1E9-04BEF2DC9D44}.Release|Any CPU.Build.0 = Release|Any CPU - {405E31B8-74FF-4E1C-8764-42BBD5FA75EF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {405E31B8-74FF-4E1C-8764-42BBD5FA75EF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {405E31B8-74FF-4E1C-8764-42BBD5FA75EF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {405E31B8-74FF-4E1C-8764-42BBD5FA75EF}.Release|Any CPU.Build.0 = Release|Any CPU - {8BA68A05-5A02-439B-8F54-C2788D98C50B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8BA68A05-5A02-439B-8F54-C2788D98C50B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8BA68A05-5A02-439B-8F54-C2788D98C50B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8BA68A05-5A02-439B-8F54-C2788D98C50B}.Release|Any CPU.Build.0 = Release|Any CPU - {4D2BA36B-67BA-4A25-A8F6-E8BFF8B39C2A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4D2BA36B-67BA-4A25-A8F6-E8BFF8B39C2A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4D2BA36B-67BA-4A25-A8F6-E8BFF8B39C2A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4D2BA36B-67BA-4A25-A8F6-E8BFF8B39C2A}.Release|Any CPU.Build.0 = Release|Any CPU - {1FD372BD-5191-484B-BD51-9E9A033D2A15}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1FD372BD-5191-484B-BD51-9E9A033D2A15}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1FD372BD-5191-484B-BD51-9E9A033D2A15}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1FD372BD-5191-484B-BD51-9E9A033D2A15}.Release|Any CPU.Build.0 = Release|Any CPU - {074C7AAF-DDF6-4A75-9F7E-D3BA9DC859F5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {074C7AAF-DDF6-4A75-9F7E-D3BA9DC859F5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {074C7AAF-DDF6-4A75-9F7E-D3BA9DC859F5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {074C7AAF-DDF6-4A75-9F7E-D3BA9DC859F5}.Release|Any CPU.Build.0 = Release|Any CPU - {66B6EC56-D562-4C7B-8A61-2CB5731B2887}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {66B6EC56-D562-4C7B-8A61-2CB5731B2887}.Debug|Any CPU.Build.0 = Debug|Any CPU - {66B6EC56-D562-4C7B-8A61-2CB5731B2887}.Release|Any CPU.ActiveCfg = Release|Any CPU - {66B6EC56-D562-4C7B-8A61-2CB5731B2887}.Release|Any CPU.Build.0 = Release|Any CPU - {2A061305-8CF4-44A8-8786-375F1D6ABFC3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2A061305-8CF4-44A8-8786-375F1D6ABFC3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2A061305-8CF4-44A8-8786-375F1D6ABFC3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2A061305-8CF4-44A8-8786-375F1D6ABFC3}.Release|Any CPU.Build.0 = Release|Any CPU - {897DE719-435D-4952-B359-91BB09182FF4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {897DE719-435D-4952-B359-91BB09182FF4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {897DE719-435D-4952-B359-91BB09182FF4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {897DE719-435D-4952-B359-91BB09182FF4}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {D15DC2B8-0A59-4D1F-861A-0E9C6BA2949D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D15DC2B8-0A59-4D1F-861A-0E9C6BA2949D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D15DC2B8-0A59-4D1F-861A-0E9C6BA2949D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D15DC2B8-0A59-4D1F-861A-0E9C6BA2949D}.Release|Any CPU.Build.0 = Release|Any CPU - {F73BC978-8E56-4E4E-A1E9-04BEF2DC9D44}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F73BC978-8E56-4E4E-A1E9-04BEF2DC9D44}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F73BC978-8E56-4E4E-A1E9-04BEF2DC9D44}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F73BC978-8E56-4E4E-A1E9-04BEF2DC9D44}.Release|Any CPU.Build.0 = Release|Any CPU - {405E31B8-74FF-4E1C-8764-42BBD5FA75EF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {405E31B8-74FF-4E1C-8764-42BBD5FA75EF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {405E31B8-74FF-4E1C-8764-42BBD5FA75EF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {405E31B8-74FF-4E1C-8764-42BBD5FA75EF}.Release|Any CPU.Build.0 = Release|Any CPU - {8BA68A05-5A02-439B-8F54-C2788D98C50B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8BA68A05-5A02-439B-8F54-C2788D98C50B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8BA68A05-5A02-439B-8F54-C2788D98C50B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8BA68A05-5A02-439B-8F54-C2788D98C50B}.Release|Any CPU.Build.0 = Release|Any CPU - {4D2BA36B-67BA-4A25-A8F6-E8BFF8B39C2A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4D2BA36B-67BA-4A25-A8F6-E8BFF8B39C2A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4D2BA36B-67BA-4A25-A8F6-E8BFF8B39C2A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4D2BA36B-67BA-4A25-A8F6-E8BFF8B39C2A}.Release|Any CPU.Build.0 = Release|Any CPU - {1FD372BD-5191-484B-BD51-9E9A033D2A15}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1FD372BD-5191-484B-BD51-9E9A033D2A15}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1FD372BD-5191-484B-BD51-9E9A033D2A15}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1FD372BD-5191-484B-BD51-9E9A033D2A15}.Release|Any CPU.Build.0 = Release|Any CPU - {074C7AAF-DDF6-4A75-9F7E-D3BA9DC859F5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {074C7AAF-DDF6-4A75-9F7E-D3BA9DC859F5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {074C7AAF-DDF6-4A75-9F7E-D3BA9DC859F5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {074C7AAF-DDF6-4A75-9F7E-D3BA9DC859F5}.Release|Any CPU.Build.0 = Release|Any CPU - {66B6EC56-D562-4C7B-8A61-2CB5731B2887}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {66B6EC56-D562-4C7B-8A61-2CB5731B2887}.Debug|Any CPU.Build.0 = Debug|Any CPU - {66B6EC56-D562-4C7B-8A61-2CB5731B2887}.Release|Any CPU.ActiveCfg = Release|Any CPU - {66B6EC56-D562-4C7B-8A61-2CB5731B2887}.Release|Any CPU.Build.0 = Release|Any CPU - {2A061305-8CF4-44A8-8786-375F1D6ABFC3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2A061305-8CF4-44A8-8786-375F1D6ABFC3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2A061305-8CF4-44A8-8786-375F1D6ABFC3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2A061305-8CF4-44A8-8786-375F1D6ABFC3}.Release|Any CPU.Build.0 = Release|Any CPU - {897DE719-435D-4952-B359-91BB09182FF4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {897DE719-435D-4952-B359-91BB09182FF4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {897DE719-435D-4952-B359-91BB09182FF4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {897DE719-435D-4952-B359-91BB09182FF4}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {467BF172-517A-43BA-9B4B-1F18EFB09E20} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {640B517F-C4F3-4BD6-90BC-6B2FFA470B61} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {473D6467-4761-4F3D-94B0-6357C56CD7EB} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {B9059631-D5E0-4278-91DB-CFE81DD848BB} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {C2E4C21C-4DFC-4564-86A2-16926865EAE8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {D15DC2B8-0A59-4D1F-861A-0E9C6BA2949D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F73BC978-8E56-4E4E-A1E9-04BEF2DC9D44} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {405E31B8-74FF-4E1C-8764-42BBD5FA75EF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8BA68A05-5A02-439B-8F54-C2788D98C50B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4D2BA36B-67BA-4A25-A8F6-E8BFF8B39C2A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {1FD372BD-5191-484B-BD51-9E9A033D2A15} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {074C7AAF-DDF6-4A75-9F7E-D3BA9DC859F5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {66B6EC56-D562-4C7B-8A61-2CB5731B2887} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {2A061305-8CF4-44A8-8786-375F1D6ABFC3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {897DE719-435D-4952-B359-91BB09182FF4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {D15DC2B8-0A59-4D1F-861A-0E9C6BA2949D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F73BC978-8E56-4E4E-A1E9-04BEF2DC9D44} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {405E31B8-74FF-4E1C-8764-42BBD5FA75EF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8BA68A05-5A02-439B-8F54-C2788D98C50B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4D2BA36B-67BA-4A25-A8F6-E8BFF8B39C2A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {1FD372BD-5191-484B-BD51-9E9A033D2A15} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {074C7AAF-DDF6-4A75-9F7E-D3BA9DC859F5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {66B6EC56-D562-4C7B-8A61-2CB5731B2887} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {2A061305-8CF4-44A8-8786-375F1D6ABFC3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {897DE719-435D-4952-B359-91BB09182FF4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {E36D698E-B445-4929-AB8B-345A26373484} diff --git a/sdk/src/Services/EMRServerless/Generated/AmazonEMRServerlessConfig.cs b/sdk/src/Services/EMRServerless/Generated/AmazonEMRServerlessConfig.cs index e7021774dd38..acf66872d248 100644 --- a/sdk/src/Services/EMRServerless/Generated/AmazonEMRServerlessConfig.cs +++ b/sdk/src/Services/EMRServerless/Generated/AmazonEMRServerlessConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.EMRServerless public partial class AmazonEMRServerlessConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("EMR Serverless", "4.0.0.0"); private static readonly AmazonEMRServerlessEndpointResolver EndpointResolver = new AmazonEMRServerlessEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("EMR Serverless", "3.7.401.4"); -======= - InternalSDKUtils.BuildUserAgentString("EMR Serverless", "3.7.401.31"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/EMRServerless/Properties/AssemblyInfo.cs b/sdk/src/Services/EMRServerless/Properties/AssemblyInfo.cs index 03888dec025f..c9ccd09abf0d 100644 --- a/sdk/src/Services/EMRServerless/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/EMRServerless/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.4")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.31")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/ElastiCache/ElastiCache.sln b/sdk/src/Services/ElastiCache/ElastiCache.sln index cbe6353696f4..581c3cd23776 100644 --- a/sdk/src/Services/ElastiCache/ElastiCache.sln +++ b/sdk/src/Services/ElastiCache/ElastiCache.sln @@ -92,7 +92,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {A351999F-03C0-46B9-A8B7-87087EF1472C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {A351999F-03C0-46B9-A8B7-87087EF1472C}.Debug|Any CPU.Build.0 = Debug|Any CPU {A351999F-03C0-46B9-A8B7-87087EF1472C}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -113,97 +120,6 @@ Global {FE5E5E9F-C11A-43B5-B5E1-3BC9864EABD8}.Debug|Any CPU.Build.0 = Debug|Any CPU {FE5E5E9F-C11A-43B5-B5E1-3BC9864EABD8}.Release|Any CPU.ActiveCfg = Release|Any CPU {FE5E5E9F-C11A-43B5-B5E1-3BC9864EABD8}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {57424849-C7DD-48AF-B05D-9AD8533FF02C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {57424849-C7DD-48AF-B05D-9AD8533FF02C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {57424849-C7DD-48AF-B05D-9AD8533FF02C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {57424849-C7DD-48AF-B05D-9AD8533FF02C}.Release|Any CPU.Build.0 = Release|Any CPU - {41D62FE9-8844-40F1-BBC8-F40C2A2D64C0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {41D62FE9-8844-40F1-BBC8-F40C2A2D64C0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {41D62FE9-8844-40F1-BBC8-F40C2A2D64C0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {41D62FE9-8844-40F1-BBC8-F40C2A2D64C0}.Release|Any CPU.Build.0 = Release|Any CPU - {AD3E9564-047C-4DD5-BF60-BAE76B763E17}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AD3E9564-047C-4DD5-BF60-BAE76B763E17}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AD3E9564-047C-4DD5-BF60-BAE76B763E17}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AD3E9564-047C-4DD5-BF60-BAE76B763E17}.Release|Any CPU.Build.0 = Release|Any CPU - {80C1982F-B3AC-4297-836C-7E7CE52F47FD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {80C1982F-B3AC-4297-836C-7E7CE52F47FD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {80C1982F-B3AC-4297-836C-7E7CE52F47FD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {80C1982F-B3AC-4297-836C-7E7CE52F47FD}.Release|Any CPU.Build.0 = Release|Any CPU - {451108BA-4859-433F-9A36-65E9BC82AAD4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {451108BA-4859-433F-9A36-65E9BC82AAD4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {451108BA-4859-433F-9A36-65E9BC82AAD4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {451108BA-4859-433F-9A36-65E9BC82AAD4}.Release|Any CPU.Build.0 = Release|Any CPU - {68DD27DA-DA40-462D-B7EB-39169D491525}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {68DD27DA-DA40-462D-B7EB-39169D491525}.Debug|Any CPU.Build.0 = Debug|Any CPU - {68DD27DA-DA40-462D-B7EB-39169D491525}.Release|Any CPU.ActiveCfg = Release|Any CPU - {68DD27DA-DA40-462D-B7EB-39169D491525}.Release|Any CPU.Build.0 = Release|Any CPU - {B15A261F-F242-4A25-B0B2-9EE40BEAD9E1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B15A261F-F242-4A25-B0B2-9EE40BEAD9E1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B15A261F-F242-4A25-B0B2-9EE40BEAD9E1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B15A261F-F242-4A25-B0B2-9EE40BEAD9E1}.Release|Any CPU.Build.0 = Release|Any CPU - {9EB11488-9612-4001-8689-59BB5CAEB527}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9EB11488-9612-4001-8689-59BB5CAEB527}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9EB11488-9612-4001-8689-59BB5CAEB527}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9EB11488-9612-4001-8689-59BB5CAEB527}.Release|Any CPU.Build.0 = Release|Any CPU - {A1975635-11E1-4770-AC04-29865E9A6FE3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A1975635-11E1-4770-AC04-29865E9A6FE3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A1975635-11E1-4770-AC04-29865E9A6FE3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A1975635-11E1-4770-AC04-29865E9A6FE3}.Release|Any CPU.Build.0 = Release|Any CPU - {2A9A7152-A818-41D5-B1E0-375BED67F36C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2A9A7152-A818-41D5-B1E0-375BED67F36C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2A9A7152-A818-41D5-B1E0-375BED67F36C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2A9A7152-A818-41D5-B1E0-375BED67F36C}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {57424849-C7DD-48AF-B05D-9AD8533FF02C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {57424849-C7DD-48AF-B05D-9AD8533FF02C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {57424849-C7DD-48AF-B05D-9AD8533FF02C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {57424849-C7DD-48AF-B05D-9AD8533FF02C}.Release|Any CPU.Build.0 = Release|Any CPU - {41D62FE9-8844-40F1-BBC8-F40C2A2D64C0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {41D62FE9-8844-40F1-BBC8-F40C2A2D64C0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {41D62FE9-8844-40F1-BBC8-F40C2A2D64C0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {41D62FE9-8844-40F1-BBC8-F40C2A2D64C0}.Release|Any CPU.Build.0 = Release|Any CPU - {AD3E9564-047C-4DD5-BF60-BAE76B763E17}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AD3E9564-047C-4DD5-BF60-BAE76B763E17}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AD3E9564-047C-4DD5-BF60-BAE76B763E17}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AD3E9564-047C-4DD5-BF60-BAE76B763E17}.Release|Any CPU.Build.0 = Release|Any CPU - {80C1982F-B3AC-4297-836C-7E7CE52F47FD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {80C1982F-B3AC-4297-836C-7E7CE52F47FD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {80C1982F-B3AC-4297-836C-7E7CE52F47FD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {80C1982F-B3AC-4297-836C-7E7CE52F47FD}.Release|Any CPU.Build.0 = Release|Any CPU - {451108BA-4859-433F-9A36-65E9BC82AAD4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {451108BA-4859-433F-9A36-65E9BC82AAD4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {451108BA-4859-433F-9A36-65E9BC82AAD4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {451108BA-4859-433F-9A36-65E9BC82AAD4}.Release|Any CPU.Build.0 = Release|Any CPU - {68DD27DA-DA40-462D-B7EB-39169D491525}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {68DD27DA-DA40-462D-B7EB-39169D491525}.Debug|Any CPU.Build.0 = Debug|Any CPU - {68DD27DA-DA40-462D-B7EB-39169D491525}.Release|Any CPU.ActiveCfg = Release|Any CPU - {68DD27DA-DA40-462D-B7EB-39169D491525}.Release|Any CPU.Build.0 = Release|Any CPU - {B15A261F-F242-4A25-B0B2-9EE40BEAD9E1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B15A261F-F242-4A25-B0B2-9EE40BEAD9E1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B15A261F-F242-4A25-B0B2-9EE40BEAD9E1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B15A261F-F242-4A25-B0B2-9EE40BEAD9E1}.Release|Any CPU.Build.0 = Release|Any CPU - {9EB11488-9612-4001-8689-59BB5CAEB527}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9EB11488-9612-4001-8689-59BB5CAEB527}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9EB11488-9612-4001-8689-59BB5CAEB527}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9EB11488-9612-4001-8689-59BB5CAEB527}.Release|Any CPU.Build.0 = Release|Any CPU - {A1975635-11E1-4770-AC04-29865E9A6FE3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A1975635-11E1-4770-AC04-29865E9A6FE3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A1975635-11E1-4770-AC04-29865E9A6FE3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A1975635-11E1-4770-AC04-29865E9A6FE3}.Release|Any CPU.Build.0 = Release|Any CPU - {2A9A7152-A818-41D5-B1E0-375BED67F36C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2A9A7152-A818-41D5-B1E0-375BED67F36C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2A9A7152-A818-41D5-B1E0-375BED67F36C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2A9A7152-A818-41D5-B1E0-375BED67F36C}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -220,37 +136,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {A351999F-03C0-46B9-A8B7-87087EF1472C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {503509B9-FF2D-4D64-92D2-8CBF8D43F3CC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {FC547772-BD51-4302-B045-8877313AEFB2} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {D9B4A4A8-4A48-4546-9E91-65742AA05D9E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {FE5E5E9F-C11A-43B5-B5E1-3BC9864EABD8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {57424849-C7DD-48AF-B05D-9AD8533FF02C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {41D62FE9-8844-40F1-BBC8-F40C2A2D64C0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {AD3E9564-047C-4DD5-BF60-BAE76B763E17} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {80C1982F-B3AC-4297-836C-7E7CE52F47FD} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {451108BA-4859-433F-9A36-65E9BC82AAD4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {68DD27DA-DA40-462D-B7EB-39169D491525} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B15A261F-F242-4A25-B0B2-9EE40BEAD9E1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {9EB11488-9612-4001-8689-59BB5CAEB527} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A1975635-11E1-4770-AC04-29865E9A6FE3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {2A9A7152-A818-41D5-B1E0-375BED67F36C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {57424849-C7DD-48AF-B05D-9AD8533FF02C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {41D62FE9-8844-40F1-BBC8-F40C2A2D64C0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {AD3E9564-047C-4DD5-BF60-BAE76B763E17} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {80C1982F-B3AC-4297-836C-7E7CE52F47FD} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {451108BA-4859-433F-9A36-65E9BC82AAD4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {68DD27DA-DA40-462D-B7EB-39169D491525} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B15A261F-F242-4A25-B0B2-9EE40BEAD9E1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {9EB11488-9612-4001-8689-59BB5CAEB527} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A1975635-11E1-4770-AC04-29865E9A6FE3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {2A9A7152-A818-41D5-B1E0-375BED67F36C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {5072AAEE-6EE2-4A96-B11F-C2C73FB99671} diff --git a/sdk/src/Services/ElastiCache/Generated/AmazonElastiCacheConfig.cs b/sdk/src/Services/ElastiCache/Generated/AmazonElastiCacheConfig.cs index f566c564c25e..178a8f3a84b4 100644 --- a/sdk/src/Services/ElastiCache/Generated/AmazonElastiCacheConfig.cs +++ b/sdk/src/Services/ElastiCache/Generated/AmazonElastiCacheConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.ElastiCache public partial class AmazonElastiCacheConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("ElastiCache", "4.0.0.0"); private static readonly AmazonElastiCacheEndpointResolver EndpointResolver = new AmazonElastiCacheEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("ElastiCache", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("ElastiCache", "3.7.401.21"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/ElastiCache/Generated/_bcl/AmazonElastiCacheClient.cs b/sdk/src/Services/ElastiCache/Generated/_bcl/AmazonElastiCacheClient.cs index e6f158b2d89f..b6db6a9b6427 100644 --- a/sdk/src/Services/ElastiCache/Generated/_bcl/AmazonElastiCacheClient.cs +++ b/sdk/src/Services/ElastiCache/Generated/_bcl/AmazonElastiCacheClient.cs @@ -331,8 +331,8 @@ protected override void Dispose(bool disposing) /// The requested replication group is not in the available state. /// /// - /// The state of the serverless cache snapshot was not received. Available for Redis OSS - /// and Serverless Memcached only. + /// The state of the serverless cache snapshot was not received. Available for Valkey, + /// Redis OSS and Serverless Memcached only. /// /// /// The account for these credentials is not currently active. @@ -348,7 +348,7 @@ protected override void Dispose(bool disposing) /// /// /// This serverless cache snapshot could not be found or does not exist. Available for - /// Redis OSS and Serverless Memcached only. + /// Valkey, Redis OSS and Serverless Memcached only. /// /// /// The requested snapshot name does not refer to an existing snapshot. @@ -424,8 +424,8 @@ public virtual AddTagsToResourceResponse AddTagsToResource(AddTagsToResourceRequ /// The requested replication group is not in the available state. /// /// - /// The state of the serverless cache snapshot was not received. Available for Redis OSS - /// and Serverless Memcached only. + /// The state of the serverless cache snapshot was not received. Available for Valkey, + /// Redis OSS and Serverless Memcached only. /// /// /// The account for these credentials is not currently active. @@ -441,7 +441,7 @@ public virtual AddTagsToResourceResponse AddTagsToResource(AddTagsToResourceRequ /// /// /// This serverless cache snapshot could not be found or does not exist. Available for - /// Redis OSS and Serverless Memcached only. + /// Valkey, Redis OSS and Serverless Memcached only. /// /// /// The requested snapshot name does not refer to an existing snapshot. @@ -739,8 +739,8 @@ public virtual CompleteMigrationResponse CompleteMigration(CompleteMigrationRequ /// - /// Creates a copy of an existing serverless cache’s snapshot. Available for Redis OSS - /// and Serverless Memcached only. + /// Creates a copy of an existing serverless cache’s snapshot. Available for Valkey, Redis + /// OSS and Serverless Memcached only. /// /// Container for the necessary parameters to execute the CopyServerlessCacheSnapshot service method. /// @@ -752,20 +752,20 @@ public virtual CompleteMigrationResponse CompleteMigration(CompleteMigrationRequ /// The value for a parameter is invalid. /// /// - /// The state of the serverless cache snapshot was not received. Available for Redis OSS - /// and Serverless Memcached only. + /// The state of the serverless cache snapshot was not received. Available for Valkey, + /// Redis OSS and Serverless Memcached only. /// /// - /// A serverless cache snapshot with this name already exists. Available for Redis OSS - /// and Serverless Memcached only. + /// A serverless cache snapshot with this name already exists. Available for Valkey, Redis + /// OSS and Serverless Memcached only. /// /// /// This serverless cache snapshot could not be found or does not exist. Available for - /// Redis OSS and Serverless Memcached only. + /// Valkey, Redis OSS and Serverless Memcached only. /// /// /// The number of serverless cache snapshots exceeds the customer snapshot quota. Available - /// for Redis OSS and Serverless Memcached only. + /// for Valkey, Redis OSS and Serverless Memcached only. /// /// /// The specified service linked role (SLR) was not found. @@ -787,8 +787,8 @@ public virtual CopyServerlessCacheSnapshotResponse CopyServerlessCacheSnapshot(C /// - /// Creates a copy of an existing serverless cache’s snapshot. Available for Redis OSS - /// and Serverless Memcached only. + /// Creates a copy of an existing serverless cache’s snapshot. Available for Valkey, Redis + /// OSS and Serverless Memcached only. /// /// Container for the necessary parameters to execute the CopyServerlessCacheSnapshot service method. /// @@ -803,20 +803,20 @@ public virtual CopyServerlessCacheSnapshotResponse CopyServerlessCacheSnapshot(C /// The value for a parameter is invalid. /// /// - /// The state of the serverless cache snapshot was not received. Available for Redis OSS - /// and Serverless Memcached only. + /// The state of the serverless cache snapshot was not received. Available for Valkey, + /// Redis OSS and Serverless Memcached only. /// /// - /// A serverless cache snapshot with this name already exists. Available for Redis OSS - /// and Serverless Memcached only. + /// A serverless cache snapshot with this name already exists. Available for Valkey, Redis + /// OSS and Serverless Memcached only. /// /// /// This serverless cache snapshot could not be found or does not exist. Available for - /// Redis OSS and Serverless Memcached only. + /// Valkey, Redis OSS and Serverless Memcached only. /// /// /// The number of serverless cache snapshots exceeds the customer snapshot quota. Available - /// for Redis OSS and Serverless Memcached only. + /// for Valkey, Redis OSS and Serverless Memcached only. /// /// /// The specified service linked role (SLR) was not found. @@ -846,7 +846,7 @@ public virtual CopyServerlessCacheSnapshotResponse CopyServerlessCacheSnapshot(C /// /// /// - /// This operation is valid for Redis OSS only. + /// This operation is valid for Valkey or Redis OSS only. /// /// /// @@ -992,7 +992,7 @@ public virtual CopySnapshotResponse CopySnapshot(CopySnapshotRequest request) /// /// /// - /// This operation is valid for Redis OSS only. + /// This operation is valid for Valkey or Redis OSS only. /// /// /// @@ -1142,11 +1142,11 @@ public virtual CopySnapshotResponse CopySnapshot(CopySnapshotRequest request) /// /// Creates a cluster. All nodes in the cluster run the same protocol-compliant cache - /// engine software, either Memcached or Redis OSS. + /// engine software, either Memcached, Valkey or Redis OSS. /// /// /// - /// This operation is not supported for Redis OSS (cluster mode enabled) clusters. + /// This operation is not supported for Valkey or Redis OSS (cluster mode enabled) clusters. /// /// /// Container for the necessary parameters to execute the CreateCacheCluster service method. @@ -1216,11 +1216,11 @@ public virtual CreateCacheClusterResponse CreateCacheCluster(CreateCacheClusterR /// /// Creates a cluster. All nodes in the cluster run the same protocol-compliant cache - /// engine software, either Memcached or Redis OSS. + /// engine software, either Memcached, Valkey or Redis OSS. /// /// /// - /// This operation is not supported for Redis OSS (cluster mode enabled) clusters. + /// This operation is not supported for Valkey or Redis OSS (cluster mode enabled) clusters. /// /// /// Container for the necessary parameters to execute the CreateCacheCluster service method. @@ -1619,10 +1619,10 @@ public virtual CreateCacheSubnetGroupResponse CreateCacheSubnetGroup(CreateCache /// - /// Global Datastore for Redis OSS offers fully managed, fast, reliable and secure cross-region - /// replication. Using Global Datastore for Redis OSS, you can create cross-region read - /// replica clusters for ElastiCache (Redis OSS) to enable low-latency reads and disaster - /// recovery across regions. For more information, see Replication + /// Global Datastore offers fully managed, fast, reliable and secure cross-region replication. + /// Using Global Datastore with Valkey or Redis OSS, you can create cross-region read + /// replica clusters for ElastiCache to enable low-latency reads and disaster recovery + /// across regions. For more information, see Replication /// Across Regions Using Global Datastore. /// ///
    • @@ -1666,10 +1666,10 @@ public virtual CreateGlobalReplicationGroupResponse CreateGlobalReplicationGroup /// - /// Global Datastore for Redis OSS offers fully managed, fast, reliable and secure cross-region - /// replication. Using Global Datastore for Redis OSS, you can create cross-region read - /// replica clusters for ElastiCache (Redis OSS) to enable low-latency reads and disaster - /// recovery across regions. For more information, see Replication + /// Global Datastore offers fully managed, fast, reliable and secure cross-region replication. + /// Using Global Datastore with Valkey or Redis OSS, you can create cross-region read + /// replica clusters for ElastiCache to enable low-latency reads and disaster recovery + /// across regions. For more information, see Replication /// Across Regions Using Global Datastore. /// ///
      • @@ -1720,8 +1720,8 @@ public virtual CreateGlobalReplicationGroupResponse CreateGlobalReplicationGroup /// - /// Creates a Redis OSS (cluster mode disabled) or a Redis OSS (cluster mode enabled) - /// replication group. + /// Creates a Valkey or Redis OSS (cluster mode disabled) or a Valkey or Redis OSS (cluster + /// mode enabled) replication group. /// /// /// @@ -1730,22 +1730,22 @@ public virtual CreateGlobalReplicationGroupResponse CreateGlobalReplicationGroup /// /// /// - /// A Redis OSS (cluster mode disabled) replication group is a collection of nodes, where - /// one of the nodes is a read/write primary and the others are read-only replicas. Writes - /// to the primary are asynchronously propagated to the replicas. + /// A Valkey or Redis OSS (cluster mode disabled) replication group is a collection of + /// nodes, where one of the nodes is a read/write primary and the others are read-only + /// replicas. Writes to the primary are asynchronously propagated to the replicas. /// /// /// - /// A Redis OSS cluster-mode enabled cluster is comprised of from 1 to 90 shards (API/CLI: - /// node groups). Each shard has a primary node and up to 5 read-only replica nodes. The - /// configuration can range from 90 shards and 0 replicas to 15 shards and 5 replicas, - /// which is the maximum number or replicas allowed. + /// A Valkey or Redis OSS cluster-mode enabled cluster is comprised of from 1 to 90 shards + /// (API/CLI: node groups). Each shard has a primary node and up to 5 read-only replica + /// nodes. The configuration can range from 90 shards and 0 replicas to 15 shards and + /// 5 replicas, which is the maximum number or replicas allowed. /// /// /// - /// The node or shard limit can be increased to a maximum of 500 per cluster if the Redis - /// OSS engine version is 5.0.6 or higher. For example, you can choose to configure a - /// 500 node cluster that ranges between 83 shards (one primary and 5 replicas per shard) + /// The node or shard limit can be increased to a maximum of 500 per cluster if the Valkey + /// or Redis OSS engine version is 5.0.6 or higher. For example, you can choose to configure + /// a 500 node cluster that ranges between 83 shards (one primary and 5 replicas per shard) /// and 500 shards (single primary and no replicas). Make sure there are enough available /// IP addresses to accommodate the increase. Common pitfalls include the subnets in the /// subnet group have too small a CIDR range or the subnets are shared and heavily used @@ -1760,15 +1760,15 @@ public virtual CreateGlobalReplicationGroupResponse CreateGlobalReplicationGroup /// /// /// - /// When a Redis OSS (cluster mode disabled) replication group has been successfully created, - /// you can add one or more read replicas to it, up to a total of 5 read replicas. If - /// you need to increase or decrease the number of node groups (console: shards), you - /// can use ElastiCache (Redis OSS) scaling. For more information, see Scaling - /// ElastiCache (Redis OSS) Clusters in the ElastiCache User Guide. + /// When a Valkey or Redis OSS (cluster mode disabled) replication group has been successfully + /// created, you can add one or more read replicas to it, up to a total of 5 read replicas. + /// If you need to increase or decrease the number of node groups (console: shards), you + /// can use scaling. For more information, see Scaling + /// self-designed clusters in the ElastiCache User Guide. /// /// /// - /// This operation is valid for Redis OSS only. + /// This operation is valid for Valkey and Redis OSS only. /// /// /// @@ -1854,8 +1854,8 @@ public virtual CreateReplicationGroupResponse CreateReplicationGroup(CreateRepli /// - /// Creates a Redis OSS (cluster mode disabled) or a Redis OSS (cluster mode enabled) - /// replication group. + /// Creates a Valkey or Redis OSS (cluster mode disabled) or a Valkey or Redis OSS (cluster + /// mode enabled) replication group. /// /// /// @@ -1864,22 +1864,22 @@ public virtual CreateReplicationGroupResponse CreateReplicationGroup(CreateRepli /// /// /// - /// A Redis OSS (cluster mode disabled) replication group is a collection of nodes, where - /// one of the nodes is a read/write primary and the others are read-only replicas. Writes - /// to the primary are asynchronously propagated to the replicas. + /// A Valkey or Redis OSS (cluster mode disabled) replication group is a collection of + /// nodes, where one of the nodes is a read/write primary and the others are read-only + /// replicas. Writes to the primary are asynchronously propagated to the replicas. /// /// /// - /// A Redis OSS cluster-mode enabled cluster is comprised of from 1 to 90 shards (API/CLI: - /// node groups). Each shard has a primary node and up to 5 read-only replica nodes. The - /// configuration can range from 90 shards and 0 replicas to 15 shards and 5 replicas, - /// which is the maximum number or replicas allowed. + /// A Valkey or Redis OSS cluster-mode enabled cluster is comprised of from 1 to 90 shards + /// (API/CLI: node groups). Each shard has a primary node and up to 5 read-only replica + /// nodes. The configuration can range from 90 shards and 0 replicas to 15 shards and + /// 5 replicas, which is the maximum number or replicas allowed. /// /// /// - /// The node or shard limit can be increased to a maximum of 500 per cluster if the Redis - /// OSS engine version is 5.0.6 or higher. For example, you can choose to configure a - /// 500 node cluster that ranges between 83 shards (one primary and 5 replicas per shard) + /// The node or shard limit can be increased to a maximum of 500 per cluster if the Valkey + /// or Redis OSS engine version is 5.0.6 or higher. For example, you can choose to configure + /// a 500 node cluster that ranges between 83 shards (one primary and 5 replicas per shard) /// and 500 shards (single primary and no replicas). Make sure there are enough available /// IP addresses to accommodate the increase. Common pitfalls include the subnets in the /// subnet group have too small a CIDR range or the subnets are shared and heavily used @@ -1894,15 +1894,15 @@ public virtual CreateReplicationGroupResponse CreateReplicationGroup(CreateRepli /// /// /// - /// When a Redis OSS (cluster mode disabled) replication group has been successfully created, - /// you can add one or more read replicas to it, up to a total of 5 read replicas. If - /// you need to increase or decrease the number of node groups (console: shards), you - /// can use ElastiCache (Redis OSS) scaling. For more information, see Scaling - /// ElastiCache (Redis OSS) Clusters in the ElastiCache User Guide. + /// When a Valkey or Redis OSS (cluster mode disabled) replication group has been successfully + /// created, you can add one or more read replicas to it, up to a total of 5 read replicas. + /// If you need to increase or decrease the number of node groups (console: shards), you + /// can use scaling. For more information, see Scaling + /// self-designed clusters in the ElastiCache User Guide. /// /// /// - /// This operation is valid for Redis OSS only. + /// This operation is valid for Valkey and Redis OSS only. /// /// /// @@ -2107,7 +2107,7 @@ public virtual CreateServerlessCacheResponse CreateServerlessCache(CreateServerl /// /// This API creates a copy of an entire ServerlessCache at a specific moment in time. - /// Available for Redis OSS and Serverless Memcached only. + /// Available for Valkey, Redis OSS and Serverless Memcached only. /// /// Container for the necessary parameters to execute the CreateServerlessCacheSnapshot service method. /// @@ -2125,12 +2125,12 @@ public virtual CreateServerlessCacheResponse CreateServerlessCache(CreateServerl /// The serverless cache was not found or does not exist. /// /// - /// A serverless cache snapshot with this name already exists. Available for Redis OSS - /// and Serverless Memcached only. + /// A serverless cache snapshot with this name already exists. Available for Valkey, Redis + /// OSS and Serverless Memcached only. /// /// /// The number of serverless cache snapshots exceeds the customer snapshot quota. Available - /// for Redis OSS and Serverless Memcached only. + /// for Valkey, Redis OSS and Serverless Memcached only. /// /// /// The specified service linked role (SLR) was not found. @@ -2153,7 +2153,7 @@ public virtual CreateServerlessCacheSnapshotResponse CreateServerlessCacheSnapsh /// /// This API creates a copy of an entire ServerlessCache at a specific moment in time. - /// Available for Redis OSS and Serverless Memcached only. + /// Available for Valkey, Redis OSS and Serverless Memcached only. /// /// Container for the necessary parameters to execute the CreateServerlessCacheSnapshot service method. /// @@ -2174,12 +2174,12 @@ public virtual CreateServerlessCacheSnapshotResponse CreateServerlessCacheSnapsh /// The serverless cache was not found or does not exist. /// /// - /// A serverless cache snapshot with this name already exists. Available for Redis OSS - /// and Serverless Memcached only. + /// A serverless cache snapshot with this name already exists. Available for Valkey, Redis + /// OSS and Serverless Memcached only. /// /// /// The number of serverless cache snapshots exceeds the customer snapshot quota. Available - /// for Redis OSS and Serverless Memcached only. + /// for Valkey, Redis OSS and Serverless Memcached only. /// /// /// The specified service linked role (SLR) was not found. @@ -2209,7 +2209,7 @@ public virtual CreateServerlessCacheSnapshotResponse CreateServerlessCacheSnapsh /// /// /// - /// This operation is valid for Redis OSS only. + /// This operation is valid for Valkey or Redis OSS only. /// /// ///
      @@ -2242,12 +2242,13 @@ public virtual CreateServerlessCacheSnapshotResponse CreateServerlessCacheSnapsh /// ///
      • /// - /// Creating a snapshot of a Redis OSS cluster running on a cache.t1.micro cache - /// node. + /// Creating a snapshot of a Valkey or Redis OSS cluster running on a cache.t1.micro + /// cache node. /// ///
      • /// - /// Creating a snapshot of a cluster that is running Memcached rather than Redis OSS. + /// Creating a snapshot of a cluster that is running Memcached rather than Valkey or Redis + /// OSS. /// ///
      /// @@ -2278,7 +2279,7 @@ public virtual CreateSnapshotResponse CreateSnapshot(CreateSnapshotRequest reque /// /// /// - /// This operation is valid for Redis OSS only. + /// This operation is valid for Valkey or Redis OSS only. /// /// ///
    @@ -2314,12 +2315,13 @@ public virtual CreateSnapshotResponse CreateSnapshot(CreateSnapshotRequest reque /// ///
    • /// - /// Creating a snapshot of a Redis OSS cluster running on a cache.t1.micro cache - /// node. + /// Creating a snapshot of a Valkey or Redis OSS cluster running on a cache.t1.micro + /// cache node. /// ///
    • /// - /// Creating a snapshot of a cluster that is running Memcached rather than Redis OSS. + /// Creating a snapshot of a cluster that is running Memcached rather than Valkey or Redis + /// OSS. /// ///
    /// @@ -2350,8 +2352,8 @@ public virtual CreateSnapshotResponse CreateSnapshot(CreateSnapshotRequest reque /// - /// For Redis OSS engine version 6.0 onwards: Creates a Redis OSS user. For more information, - /// see Using + /// For Valkey engine version 7.2 onwards and Redis OSS 6.0 and onwards: Creates a user. + /// For more information, see Using /// Role Based Access Control (RBAC). /// /// Container for the necessary parameters to execute the CreateUser service method. @@ -2392,8 +2394,8 @@ public virtual CreateUserResponse CreateUser(CreateUserRequest request) /// - /// For Redis OSS engine version 6.0 onwards: Creates a Redis OSS user. For more information, - /// see Using + /// For Valkey engine version 7.2 onwards and Redis OSS 6.0 and onwards: Creates a user. + /// For more information, see Using /// Role Based Access Control (RBAC). /// /// Container for the necessary parameters to execute the CreateUser service method. @@ -2441,8 +2443,8 @@ public virtual CreateUserResponse CreateUser(CreateUserRequest request) /// - /// For Redis OSS engine version 6.0 onwards: Creates a Redis OSS user group. For more - /// information, see Using + /// For Valkey engine version 7.2 onwards and Redis OSS 6.0 onwards: Creates a user group. + /// For more information, see Using /// Role Based Access Control (RBAC) /// /// Container for the necessary parameters to execute the CreateUserGroup service method. @@ -2486,8 +2488,8 @@ public virtual CreateUserGroupResponse CreateUserGroup(CreateUserGroupRequest re /// - /// For Redis OSS engine version 6.0 onwards: Creates a Redis OSS user group. For more - /// information, see Using + /// For Valkey engine version 7.2 onwards and Redis OSS 6.0 onwards: Creates a user group. + /// For more information, see Using /// Role Based Access Control (RBAC) /// /// Container for the necessary parameters to execute the CreateUserGroup service method. @@ -2603,10 +2605,10 @@ public virtual DecreaseNodeGroupsInGlobalReplicationGroupResponse DecreaseNodeGr /// - /// Dynamically decreases the number of replicas in a Redis OSS (cluster mode disabled) - /// replication group or the number of replica nodes in one or more node groups (shards) - /// of a Redis OSS (cluster mode enabled) replication group. This operation is performed - /// with no cluster down time. + /// Dynamically decreases the number of replicas in a Valkey or Redis OSS (cluster mode + /// disabled) replication group or the number of replica nodes in one or more node groups + /// (shards) of a Valkey or Redis OSS (cluster mode enabled) replication group. This operation + /// is performed with no cluster down time. /// /// Container for the necessary parameters to execute the DecreaseReplicaCount service method. /// @@ -2664,10 +2666,10 @@ public virtual DecreaseReplicaCountResponse DecreaseReplicaCount(DecreaseReplica /// - /// Dynamically decreases the number of replicas in a Redis OSS (cluster mode disabled) - /// replication group or the number of replica nodes in one or more node groups (shards) - /// of a Redis OSS (cluster mode enabled) replication group. This operation is performed - /// with no cluster down time. + /// Dynamically decreases the number of replicas in a Valkey or Redis OSS (cluster mode + /// disabled) replication group or the number of replica nodes in one or more node groups + /// (shards) of a Valkey or Redis OSS (cluster mode enabled) replication group. This operation + /// is performed with no cluster down time. /// /// Container for the necessary parameters to execute the DecreaseReplicaCount service method. /// @@ -2743,11 +2745,11 @@ public virtual DecreaseReplicaCountResponse DecreaseReplicaCount(DecreaseReplica /// ///
    • /// - /// Redis OSS (cluster mode enabled) clusters + /// Valkey or Redis OSS (cluster mode enabled) clusters /// ///
    • /// - /// Redis OSS (cluster mode disabled) clusters + /// Valkey or Redis OSS (cluster mode disabled) clusters /// ///
    • /// @@ -2763,7 +2765,7 @@ public virtual DecreaseReplicaCountResponse DecreaseReplicaCount(DecreaseReplica /// ///
    • /// - /// A cluster from a Redis OSS (cluster mode enabled) replication group + /// A cluster from a Valkey or Redis OSS (cluster mode enabled) replication group /// ///
    • /// @@ -2794,12 +2796,13 @@ public virtual DecreaseReplicaCountResponse DecreaseReplicaCount(DecreaseReplica /// ///
      • /// - /// Creating a snapshot of a Redis OSS cluster running on a cache.t1.micro cache - /// node. + /// Creating a snapshot of a Valkey or Redis OSS cluster running on a cache.t1.micro + /// cache node. /// ///
      • /// - /// Creating a snapshot of a cluster that is running Memcached rather than Redis OSS. + /// Creating a snapshot of a cluster that is running Memcached rather than Valkey or Redis + /// OSS. /// ///
      /// @@ -2832,11 +2835,11 @@ public virtual DeleteCacheClusterResponse DeleteCacheCluster(DeleteCacheClusterR /// ///
      • /// - /// Redis OSS (cluster mode enabled) clusters + /// Valkey or Redis OSS (cluster mode enabled) clusters /// ///
      • /// - /// Redis OSS (cluster mode disabled) clusters + /// Valkey or Redis OSS (cluster mode disabled) clusters /// ///
      • /// @@ -2852,7 +2855,7 @@ public virtual DeleteCacheClusterResponse DeleteCacheCluster(DeleteCacheClusterR /// ///
      • /// - /// A cluster from a Redis OSS (cluster mode enabled) replication group + /// A cluster from a Valkey or Redis OSS (cluster mode enabled) replication group /// ///
      • /// @@ -2886,12 +2889,13 @@ public virtual DeleteCacheClusterResponse DeleteCacheCluster(DeleteCacheClusterR /// ///
        • /// - /// Creating a snapshot of a Redis OSS cluster running on a cache.t1.micro cache - /// node. + /// Creating a snapshot of a Valkey or Redis OSS cluster running on a cache.t1.micro + /// cache node. /// ///
        • /// - /// Creating a snapshot of a cluster that is running Memcached rather than Redis OSS. + /// Creating a snapshot of a cluster that is running Memcached rather than Valkey or Redis + /// OSS. /// ///
        /// @@ -3285,12 +3289,13 @@ public virtual DeleteGlobalReplicationGroupResponse DeleteGlobalReplicationGroup /// ///
        • /// - /// Creating a snapshot of a Redis OSS cluster running on a cache.t1.micro cache - /// node. + /// Creating a snapshot of a Valkey or Redis OSS cluster running on a cache.t1.micro + /// cache node. /// ///
        • /// - /// Creating a snapshot of a cluster that is running Memcached rather than Redis OSS. + /// Creating a snapshot of a cluster that is running Memcached rather than Valkey or Redis + /// OSS. /// ///
        /// @@ -3359,12 +3364,13 @@ public virtual DeleteReplicationGroupResponse DeleteReplicationGroup(DeleteRepli /// ///
        • /// - /// Creating a snapshot of a Redis OSS cluster running on a cache.t1.micro cache - /// node. + /// Creating a snapshot of a Valkey or Redis OSS cluster running on a cache.t1.micro + /// cache node. /// ///
        • /// - /// Creating a snapshot of a cluster that is running Memcached rather than Redis OSS. + /// Creating a snapshot of a cluster that is running Memcached rather than Valkey or Redis + /// OSS. /// ///
        /// @@ -3418,8 +3424,8 @@ public virtual DeleteReplicationGroupResponse DeleteReplicationGroup(DeleteRepli /// The serverless cache was not found or does not exist. /// /// - /// A serverless cache snapshot with this name already exists. Available for Redis OSS - /// and Serverless Memcached only. + /// A serverless cache snapshot with this name already exists. Available for Valkey, Redis + /// OSS and Serverless Memcached only. /// /// /// The specified service linked role (SLR) was not found. @@ -3467,8 +3473,8 @@ public virtual DeleteServerlessCacheResponse DeleteServerlessCache(DeleteServerl /// The serverless cache was not found or does not exist. /// /// - /// A serverless cache snapshot with this name already exists. Available for Redis OSS - /// and Serverless Memcached only. + /// A serverless cache snapshot with this name already exists. Available for Valkey, Redis + /// OSS and Serverless Memcached only. /// /// /// The specified service linked role (SLR) was not found. @@ -3489,8 +3495,8 @@ public virtual DeleteServerlessCacheResponse DeleteServerlessCache(DeleteServerl /// - /// Deletes an existing serverless cache snapshot. Available for Redis OSS and Serverless - /// Memcached only. + /// Deletes an existing serverless cache snapshot. Available for Valkey, Redis OSS and + /// Serverless Memcached only. /// /// Container for the necessary parameters to execute the DeleteServerlessCacheSnapshot service method. /// @@ -3499,12 +3505,12 @@ public virtual DeleteServerlessCacheResponse DeleteServerlessCache(DeleteServerl /// The value for a parameter is invalid. /// /// - /// The state of the serverless cache snapshot was not received. Available for Redis OSS - /// and Serverless Memcached only. + /// The state of the serverless cache snapshot was not received. Available for Valkey, + /// Redis OSS and Serverless Memcached only. /// /// /// This serverless cache snapshot could not be found or does not exist. Available for - /// Redis OSS and Serverless Memcached only. + /// Valkey, Redis OSS and Serverless Memcached only. /// /// /// The specified service linked role (SLR) was not found. @@ -3521,8 +3527,8 @@ public virtual DeleteServerlessCacheSnapshotResponse DeleteServerlessCacheSnapsh /// - /// Deletes an existing serverless cache snapshot. Available for Redis OSS and Serverless - /// Memcached only. + /// Deletes an existing serverless cache snapshot. Available for Valkey, Redis OSS and + /// Serverless Memcached only. /// /// Container for the necessary parameters to execute the DeleteServerlessCacheSnapshot service method. /// @@ -3534,12 +3540,12 @@ public virtual DeleteServerlessCacheSnapshotResponse DeleteServerlessCacheSnapsh /// The value for a parameter is invalid. /// /// - /// The state of the serverless cache snapshot was not received. Available for Redis OSS - /// and Serverless Memcached only. + /// The state of the serverless cache snapshot was not received. Available for Valkey, + /// Redis OSS and Serverless Memcached only. /// /// /// This serverless cache snapshot could not be found or does not exist. Available for - /// Redis OSS and Serverless Memcached only. + /// Valkey, Redis OSS and Serverless Memcached only. /// /// /// The specified service linked role (SLR) was not found. @@ -3566,7 +3572,7 @@ public virtual DeleteServerlessCacheSnapshotResponse DeleteServerlessCacheSnapsh /// /// /// - /// This operation is valid for Redis OSS only. + /// This operation is valid for Valkey or Redis OSS only. /// /// ///
    @@ -3603,7 +3609,7 @@ public virtual DeleteSnapshotResponse DeleteSnapshot(DeleteSnapshotRequest reque /// /// /// - /// This operation is valid for Redis OSS only. + /// This operation is valid for Valkey or Redis OSS only. /// /// ///     @@ -3641,9 +3647,9 @@ public virtual DeleteSnapshotResponse DeleteSnapshot(DeleteSnapshotRequest reque /// - /// For Redis OSS engine version 6.0 onwards: Deletes a user. The user will be removed - /// from all user groups and in turn removed from all replication groups. For more information, - /// see Using + /// For Valkey engine version 7.2 onwards and Redis OSS 6.0 onwards: Deletes a user. The + /// user will be removed from all user groups and in turn removed from all replication + /// groups. For more information, see Using /// Role Based Access Control (RBAC). /// /// Container for the necessary parameters to execute the DeleteUser service method. @@ -3676,9 +3682,9 @@ public virtual DeleteUserResponse DeleteUser(DeleteUserRequest request) /// - /// For Redis OSS engine version 6.0 onwards: Deletes a user. The user will be removed - /// from all user groups and in turn removed from all replication groups. For more information, - /// see Using + /// For Valkey engine version 7.2 onwards and Redis OSS 6.0 onwards: Deletes a user. The + /// user will be removed from all user groups and in turn removed from all replication + /// groups. For more information, see Using /// Role Based Access Control (RBAC). /// /// Container for the necessary parameters to execute the DeleteUser service method. @@ -3718,9 +3724,9 @@ public virtual DeleteUserResponse DeleteUser(DeleteUserRequest request) /// - /// For Redis OSS engine version 6.0 onwards: Deletes a user group. The user group must - /// first be disassociated from the replication group before it can be deleted. For more - /// information, see Using + /// For Valkey engine version 7.2 onwards and Redis OSS 6.0 onwards: Deletes a user group. + /// The user group must first be disassociated from the replication group before it can + /// be deleted. For more information, see Using /// Role Based Access Control (RBAC). /// /// Container for the necessary parameters to execute the DeleteUserGroup service method. @@ -3750,9 +3756,9 @@ public virtual DeleteUserGroupResponse DeleteUserGroup(DeleteUserGroupRequest re /// - /// For Redis OSS engine version 6.0 onwards: Deletes a user group. The user group must - /// first be disassociated from the replication group before it can be deleted. For more - /// information, see Using + /// For Valkey engine version 7.2 onwards and Redis OSS 6.0 onwards: Deletes a user group. + /// The user group must first be disassociated from the replication group before it can + /// be deleted. For more information, see Using /// Role Based Access Control (RBAC). /// /// Container for the necessary parameters to execute the DeleteUserGroup service method. @@ -4701,7 +4707,7 @@ public virtual DescribeGlobalReplicationGroupsResponse DescribeGlobalReplication /// /// /// - /// This operation is valid for Redis OSS only. + /// This operation is valid for Valkey or Redis OSS only. /// /// ///     @@ -4729,7 +4735,7 @@ public virtual DescribeReplicationGroupsResponse DescribeReplicationGroups() /// /// /// - /// This operation is valid for Redis OSS only. + /// This operation is valid for Valkey or Redis OSS only. /// /// ///     @@ -4762,7 +4768,7 @@ public virtual DescribeReplicationGroupsResponse DescribeReplicationGroups(Descr /// /// /// - /// This operation is valid for Redis OSS only. + /// This operation is valid for Valkey or Redis OSS only. /// /// /// @@ -4792,7 +4798,7 @@ public virtual DescribeReplicationGroupsResponse DescribeReplicationGroups(Descr /// /// /// - /// This operation is valid for Redis OSS only. + /// This operation is valid for Valkey or Redis OSS only. /// /// /// @@ -5103,7 +5109,7 @@ public virtual DescribeServerlessCachesResponse DescribeServerlessCaches(Describ /// Returns information about serverless cache snapshots. By default, this API lists all /// of the customer’s serverless cache snapshots. It can also describe a single serverless /// cache snapshot, or the snapshots associated with a particular serverless cache. Available - /// for Redis OSS and Serverless Memcached only. + /// for Valkey, Redis OSS and Serverless Memcached only. /// /// Container for the necessary parameters to execute the DescribeServerlessCacheSnapshots service method. /// @@ -5119,7 +5125,7 @@ public virtual DescribeServerlessCachesResponse DescribeServerlessCaches(Describ ///     /// /// This serverless cache snapshot could not be found or does not exist. Available for - /// Redis OSS and Serverless Memcached only. + /// Valkey, Redis OSS and Serverless Memcached only. /// /// REST API Reference for DescribeServerlessCacheSnapshots Operation public virtual DescribeServerlessCacheSnapshotsResponse DescribeServerlessCacheSnapshots(DescribeServerlessCacheSnapshotsRequest request) @@ -5136,7 +5142,7 @@ public virtual DescribeServerlessCacheSnapshotsResponse DescribeServerlessCacheS /// Returns information about serverless cache snapshots. By default, this API lists all /// of the customer’s serverless cache snapshots. It can also describe a single serverless /// cache snapshot, or the snapshots associated with a particular serverless cache. Available - /// for Redis OSS and Serverless Memcached only. + /// for Valkey, Redis OSS and Serverless Memcached only. /// /// Container for the necessary parameters to execute the DescribeServerlessCacheSnapshots service method. /// @@ -5155,7 +5161,7 @@ public virtual DescribeServerlessCacheSnapshotsResponse DescribeServerlessCacheS ///     /// /// This serverless cache snapshot could not be found or does not exist. Available for - /// Redis OSS and Serverless Memcached only. + /// Valkey, Redis OSS and Serverless Memcached only. /// /// REST API Reference for DescribeServerlessCacheSnapshots Operation public virtual Task DescribeServerlessCacheSnapshotsAsync(DescribeServerlessCacheSnapshotsRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) @@ -5238,7 +5244,7 @@ public virtual DescribeServiceUpdatesResponse DescribeServiceUpdates(DescribeSer /// /// /// - /// This operation is valid for Redis OSS only. + /// This operation is valid for Valkey or Redis OSS only. /// /// /// @@ -5270,7 +5276,7 @@ public virtual DescribeSnapshotsResponse DescribeSnapshots() /// /// /// - /// This operation is valid for Redis OSS only. + /// This operation is valid for Valkey or Redis OSS only. /// /// /// @@ -5307,7 +5313,7 @@ public virtual DescribeSnapshotsResponse DescribeSnapshots(DescribeSnapshotsRequ /// /// /// - /// This operation is valid for Redis OSS only. + /// This operation is valid for Valkey or Redis OSS only. /// /// /// @@ -5341,7 +5347,7 @@ public virtual DescribeSnapshotsResponse DescribeSnapshots(DescribeSnapshotsRequ /// /// /// - /// This operation is valid for Redis OSS only. + /// This operation is valid for Valkey or Redis OSS only. /// /// /// @@ -5620,7 +5626,7 @@ public virtual DisassociateGlobalReplicationGroupResponse DisassociateGlobalRepl /// /// Provides the functionality to export the serverless cache snapshot data to Amazon - /// S3. Available for Redis OSS only. + /// S3. Available for Valkey and Redis OSS only. /// /// Container for the necessary parameters to execute the ExportServerlessCacheSnapshot service method. /// @@ -5629,12 +5635,12 @@ public virtual DisassociateGlobalReplicationGroupResponse DisassociateGlobalRepl /// The value for a parameter is invalid. /// /// - /// The state of the serverless cache snapshot was not received. Available for Redis OSS - /// and Serverless Memcached only. + /// The state of the serverless cache snapshot was not received. Available for Valkey, + /// Redis OSS and Serverless Memcached only. /// /// /// This serverless cache snapshot could not be found or does not exist. Available for - /// Redis OSS and Serverless Memcached only. + /// Valkey, Redis OSS and Serverless Memcached only. /// /// /// The specified service linked role (SLR) was not found. @@ -5652,7 +5658,7 @@ public virtual ExportServerlessCacheSnapshotResponse ExportServerlessCacheSnapsh /// /// Provides the functionality to export the serverless cache snapshot data to Amazon - /// S3. Available for Redis OSS only. + /// S3. Available for Valkey and Redis OSS only. /// /// Container for the necessary parameters to execute the ExportServerlessCacheSnapshot service method. /// @@ -5664,12 +5670,12 @@ public virtual ExportServerlessCacheSnapshotResponse ExportServerlessCacheSnapsh /// The value for a parameter is invalid. /// /// - /// The state of the serverless cache snapshot was not received. Available for Redis OSS - /// and Serverless Memcached only. + /// The state of the serverless cache snapshot was not received. Available for Valkey, + /// Redis OSS and Serverless Memcached only. /// /// /// This serverless cache snapshot could not be found or does not exist. Available for - /// Redis OSS and Serverless Memcached only. + /// Valkey, Redis OSS and Serverless Memcached only. /// /// /// The specified service linked role (SLR) was not found. @@ -5816,10 +5822,10 @@ public virtual IncreaseNodeGroupsInGlobalReplicationGroupResponse IncreaseNodeGr /// - /// Dynamically increases the number of replicas in a Redis OSS (cluster mode disabled) - /// replication group or the number of replica nodes in one or more node groups (shards) - /// of a Redis OSS (cluster mode enabled) replication group. This operation is performed - /// with no cluster down time. + /// Dynamically increases the number of replicas in a Valkey or Redis OSS (cluster mode + /// disabled) replication group or the number of replica nodes in one or more node groups + /// (shards) of a Valkey or Redis OSS (cluster mode enabled) replication group. This operation + /// is performed with no cluster down time. /// /// Container for the necessary parameters to execute the IncreaseReplicaCount service method. /// @@ -5877,10 +5883,10 @@ public virtual IncreaseReplicaCountResponse IncreaseReplicaCount(IncreaseReplica /// - /// Dynamically increases the number of replicas in a Redis OSS (cluster mode disabled) - /// replication group or the number of replica nodes in one or more node groups (shards) - /// of a Redis OSS (cluster mode enabled) replication group. This operation is performed - /// with no cluster down time. + /// Dynamically increases the number of replicas in a Valkey or Redis OSS (cluster mode + /// disabled) replication group or the number of replica nodes in one or more node groups + /// (shards) of a Valkey or Redis OSS (cluster mode enabled) replication group. This operation + /// is performed with no cluster down time. /// /// Container for the necessary parameters to execute the IncreaseReplicaCount service method. /// @@ -5945,7 +5951,7 @@ public virtual IncreaseReplicaCountResponse IncreaseReplicaCount(IncreaseReplica /// - /// Lists all available node types that you can scale your Redis OSS cluster's or replication + /// Lists all available node types that you can scale with your cluster's replication /// group's current node type. /// /// @@ -5982,7 +5988,7 @@ public virtual ListAllowedNodeTypeModificationsResponse ListAllowedNodeTypeModif /// - /// Lists all available node types that you can scale your Redis OSS cluster's or replication + /// Lists all available node types that you can scale with your cluster's replication /// group's current node type. /// /// @@ -6067,8 +6073,8 @@ public virtual ListAllowedNodeTypeModificationsResponse ListAllowedNodeTypeModif /// The requested replication group is not in the available state. /// /// - /// The state of the serverless cache snapshot was not received. Available for Redis OSS - /// and Serverless Memcached only. + /// The state of the serverless cache snapshot was not received. Available for Valkey, + /// Redis OSS and Serverless Memcached only. /// /// /// The account for these credentials is not currently active. @@ -6084,7 +6090,7 @@ public virtual ListAllowedNodeTypeModificationsResponse ListAllowedNodeTypeModif /// /// /// This serverless cache snapshot could not be found or does not exist. Available for - /// Redis OSS and Serverless Memcached only. + /// Valkey, Redis OSS and Serverless Memcached only. /// /// /// The requested snapshot name does not refer to an existing snapshot. @@ -6151,8 +6157,8 @@ public virtual ListTagsForResourceResponse ListTagsForResource(ListTagsForResour /// The requested replication group is not in the available state. /// /// - /// The state of the serverless cache snapshot was not received. Available for Redis OSS - /// and Serverless Memcached only. + /// The state of the serverless cache snapshot was not received. Available for Valkey, + /// Redis OSS and Serverless Memcached only. /// /// /// The account for these credentials is not currently active. @@ -6168,7 +6174,7 @@ public virtual ListTagsForResourceResponse ListTagsForResource(ListTagsForResour /// /// /// This serverless cache snapshot could not be found or does not exist. Available for - /// Redis OSS and Serverless Memcached only. + /// Valkey, Redis OSS and Serverless Memcached only. /// /// /// The requested snapshot name does not refer to an existing snapshot. @@ -6531,14 +6537,13 @@ public virtual ModifyGlobalReplicationGroupResponse ModifyGlobalReplicationGroup /// - /// Modifies the settings for a replication group. This is limited to Redis OSS 7 and - /// newer. + /// Modifies the settings for a replication group. This is limited to Valkey and Redis + /// OSS 7 and above. /// /// /// - /// This operation is valid for Redis OSS only. + /// This operation is valid for Valkey or Redis OSS only. /// /// /// @@ -6620,14 +6625,13 @@ public virtual ModifyReplicationGroupResponse ModifyReplicationGroup(ModifyRepli /// - /// Modifies the settings for a replication group. This is limited to Redis OSS 7 and - /// newer. + /// Modifies the settings for a replication group. This is limited to Valkey and Redis + /// OSS 7 and above. /// /// /// - /// This operation is valid for Redis OSS only. + /// This operation is valid for Valkey or Redis OSS only. /// /// /// @@ -7078,8 +7082,7 @@ public virtual ModifyUserGroupResponse ModifyUserGroup(ModifyUserGroupRequest re /// /// Allows you to purchase a reserved cache node offering. Reserved nodes are not eligible /// for cancellation and are non-refundable. For more information, see Managing - /// Costs with Reserved Nodes for Redis OSS or Managing - /// Costs with Reserved Nodes for Memcached. + /// Costs with Reserved Nodes. /// /// Container for the necessary parameters to execute the PurchaseReservedCacheNodesOffering service method. /// @@ -7118,8 +7121,7 @@ public virtual PurchaseReservedCacheNodesOfferingResponse PurchaseReservedCacheN /// /// Allows you to purchase a reserved cache node offering. Reserved nodes are not eligible /// for cancellation and are non-refundable. For more information, see Managing - /// Costs with Reserved Nodes for Redis OSS or Managing - /// Costs with Reserved Nodes for Memcached. + /// Costs with Reserved Nodes. /// /// Container for the necessary parameters to execute the PurchaseReservedCacheNodesOffering service method. /// @@ -7238,14 +7240,14 @@ public virtual RebalanceSlotsInGlobalReplicationGroupResponse RebalanceSlotsInGl /// /// /// - /// Rebooting a cluster is currently supported on Memcached and Redis OSS (cluster mode - /// disabled) clusters. Rebooting is not supported on Redis OSS (cluster mode enabled) - /// clusters. + /// Rebooting a cluster is currently supported on Memcached, Valkey and Redis OSS (cluster + /// mode disabled) clusters. Rebooting is not supported on Valkey or Redis OSS (cluster + /// mode enabled) clusters. /// /// /// - /// If you make changes to parameters that require a Redis OSS (cluster mode enabled) - /// cluster reboot for the changes to be applied, see Rebooting + /// If you make changes to parameters that require a Valkey or Redis OSS (cluster mode + /// enabled) cluster reboot for the changes to be applied, see Rebooting /// a Cluster for an alternate process. /// /// @@ -7286,14 +7288,14 @@ public virtual RebootCacheClusterResponse RebootCacheCluster(RebootCacheClusterR /// /// /// - /// Rebooting a cluster is currently supported on Memcached and Redis OSS (cluster mode - /// disabled) clusters. Rebooting is not supported on Redis OSS (cluster mode enabled) - /// clusters. + /// Rebooting a cluster is currently supported on Memcached, Valkey and Redis OSS (cluster + /// mode disabled) clusters. Rebooting is not supported on Valkey or Redis OSS (cluster + /// mode enabled) clusters. /// /// /// - /// If you make changes to parameters that require a Redis OSS (cluster mode enabled) - /// cluster reboot for the changes to be applied, see Rebooting + /// If you make changes to parameters that require a Valkey or Redis OSS (cluster mode + /// enabled) cluster reboot for the changes to be applied, see Rebooting /// a Cluster for an alternate process. /// /// @@ -7357,8 +7359,8 @@ public virtual RebootCacheClusterResponse RebootCacheCluster(RebootCacheClusterR /// The requested replication group is not in the available state. /// /// - /// The state of the serverless cache snapshot was not received. Available for Redis OSS - /// and Serverless Memcached only. + /// The state of the serverless cache snapshot was not received. Available for Valkey, + /// Redis OSS and Serverless Memcached only. /// /// /// The account for these credentials is not currently active. @@ -7374,7 +7376,7 @@ public virtual RebootCacheClusterResponse RebootCacheCluster(RebootCacheClusterR /// /// /// This serverless cache snapshot could not be found or does not exist. Available for - /// Redis OSS and Serverless Memcached only. + /// Valkey, Redis OSS and Serverless Memcached only. /// /// /// The requested snapshot name does not refer to an existing snapshot. @@ -7435,8 +7437,8 @@ public virtual RemoveTagsFromResourceResponse RemoveTagsFromResource(RemoveTagsF /// The requested replication group is not in the available state. /// /// - /// The state of the serverless cache snapshot was not received. Available for Redis OSS - /// and Serverless Memcached only. + /// The state of the serverless cache snapshot was not received. Available for Valkey, + /// Redis OSS and Serverless Memcached only. /// /// /// The account for these credentials is not currently active. @@ -7452,7 +7454,7 @@ public virtual RemoveTagsFromResourceResponse RemoveTagsFromResource(RemoveTagsF /// /// /// This serverless cache snapshot could not be found or does not exist. Available for - /// Redis OSS and Serverless Memcached only. + /// Valkey, Redis OSS and Serverless Memcached only. /// /// /// The requested snapshot name does not refer to an existing snapshot. @@ -7736,9 +7738,9 @@ public virtual StartMigrationResponse StartMigration(StartMigrationRequest reque /// ///
  • /// - /// If calling this operation multiple times on different shards in the same Redis OSS - /// (cluster mode enabled) replication group, the first node replacement must complete - /// before a subsequent call can be made. + /// If calling this operation multiple times on different shards in the same Valkey or + /// Redis OSS (cluster mode enabled) replication group, the first node replacement must + /// complete before a subsequent call can be made. /// ///
  • /// @@ -7864,9 +7866,9 @@ public virtual TestFailoverResponse TestFailover(TestFailoverRequest request) /// ///
  • /// - /// If calling this operation multiple times on different shards in the same Redis OSS - /// (cluster mode enabled) replication group, the first node replacement must complete - /// before a subsequent call can be made. + /// If calling this operation multiple times on different shards in the same Valkey or + /// Redis OSS (cluster mode enabled) replication group, the first node replacement must + /// complete before a subsequent call can be made. /// ///
  • /// diff --git a/sdk/src/Services/ElastiCache/Properties/AssemblyInfo.cs b/sdk/src/Services/ElastiCache/Properties/AssemblyInfo.cs index d030fdd06782..2627f9f7b922 100644 --- a/sdk/src/Services/ElastiCache/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/ElastiCache/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.21")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/ElasticBeanstalk/ElasticBeanstalk.sln b/sdk/src/Services/ElasticBeanstalk/ElasticBeanstalk.sln index bf2adccb1bd2..97e4a1f848da 100644 --- a/sdk/src/Services/ElasticBeanstalk/ElasticBeanstalk.sln +++ b/sdk/src/Services/ElasticBeanstalk/ElasticBeanstalk.sln @@ -92,7 +92,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {9EC6DD3D-A1C4-4A68-8431-29B873FBB1CF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {9EC6DD3D-A1C4-4A68-8431-29B873FBB1CF}.Debug|Any CPU.Build.0 = Debug|Any CPU {9EC6DD3D-A1C4-4A68-8431-29B873FBB1CF}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -113,97 +120,6 @@ Global {B38E03B7-EB84-4EB5-9517-AFC087D5F874}.Debug|Any CPU.Build.0 = Debug|Any CPU {B38E03B7-EB84-4EB5-9517-AFC087D5F874}.Release|Any CPU.ActiveCfg = Release|Any CPU {B38E03B7-EB84-4EB5-9517-AFC087D5F874}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {CB31A802-5281-459C-B85E-D29EE79BF636}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CB31A802-5281-459C-B85E-D29EE79BF636}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CB31A802-5281-459C-B85E-D29EE79BF636}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CB31A802-5281-459C-B85E-D29EE79BF636}.Release|Any CPU.Build.0 = Release|Any CPU - {3602FABD-7B5C-4868-A901-755847B57028}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3602FABD-7B5C-4868-A901-755847B57028}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3602FABD-7B5C-4868-A901-755847B57028}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3602FABD-7B5C-4868-A901-755847B57028}.Release|Any CPU.Build.0 = Release|Any CPU - {E5B5AB49-590D-41E9-90A0-487B0183ED55}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E5B5AB49-590D-41E9-90A0-487B0183ED55}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E5B5AB49-590D-41E9-90A0-487B0183ED55}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E5B5AB49-590D-41E9-90A0-487B0183ED55}.Release|Any CPU.Build.0 = Release|Any CPU - {F583A530-B8C6-49D8-A41F-0637FC12BE8D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F583A530-B8C6-49D8-A41F-0637FC12BE8D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F583A530-B8C6-49D8-A41F-0637FC12BE8D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F583A530-B8C6-49D8-A41F-0637FC12BE8D}.Release|Any CPU.Build.0 = Release|Any CPU - {F2AF1F67-CCD8-46BB-9D20-346DBEE5AD82}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F2AF1F67-CCD8-46BB-9D20-346DBEE5AD82}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F2AF1F67-CCD8-46BB-9D20-346DBEE5AD82}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F2AF1F67-CCD8-46BB-9D20-346DBEE5AD82}.Release|Any CPU.Build.0 = Release|Any CPU - {8A14B464-D2C1-4247-97B7-7F8B3D54AEFA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8A14B464-D2C1-4247-97B7-7F8B3D54AEFA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8A14B464-D2C1-4247-97B7-7F8B3D54AEFA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8A14B464-D2C1-4247-97B7-7F8B3D54AEFA}.Release|Any CPU.Build.0 = Release|Any CPU - {62E6A406-EDC0-49D4-8238-285CDBD5A118}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {62E6A406-EDC0-49D4-8238-285CDBD5A118}.Debug|Any CPU.Build.0 = Debug|Any CPU - {62E6A406-EDC0-49D4-8238-285CDBD5A118}.Release|Any CPU.ActiveCfg = Release|Any CPU - {62E6A406-EDC0-49D4-8238-285CDBD5A118}.Release|Any CPU.Build.0 = Release|Any CPU - {E3FD528B-1F17-412E-8E03-0E97CA9F7483}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E3FD528B-1F17-412E-8E03-0E97CA9F7483}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E3FD528B-1F17-412E-8E03-0E97CA9F7483}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E3FD528B-1F17-412E-8E03-0E97CA9F7483}.Release|Any CPU.Build.0 = Release|Any CPU - {C9507F12-7FE3-474F-B19E-FAA21723F529}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C9507F12-7FE3-474F-B19E-FAA21723F529}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C9507F12-7FE3-474F-B19E-FAA21723F529}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C9507F12-7FE3-474F-B19E-FAA21723F529}.Release|Any CPU.Build.0 = Release|Any CPU - {1809134B-0393-4CC0-8409-CC637989DAB4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1809134B-0393-4CC0-8409-CC637989DAB4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1809134B-0393-4CC0-8409-CC637989DAB4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1809134B-0393-4CC0-8409-CC637989DAB4}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {CB31A802-5281-459C-B85E-D29EE79BF636}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CB31A802-5281-459C-B85E-D29EE79BF636}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CB31A802-5281-459C-B85E-D29EE79BF636}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CB31A802-5281-459C-B85E-D29EE79BF636}.Release|Any CPU.Build.0 = Release|Any CPU - {3602FABD-7B5C-4868-A901-755847B57028}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3602FABD-7B5C-4868-A901-755847B57028}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3602FABD-7B5C-4868-A901-755847B57028}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3602FABD-7B5C-4868-A901-755847B57028}.Release|Any CPU.Build.0 = Release|Any CPU - {E5B5AB49-590D-41E9-90A0-487B0183ED55}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E5B5AB49-590D-41E9-90A0-487B0183ED55}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E5B5AB49-590D-41E9-90A0-487B0183ED55}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E5B5AB49-590D-41E9-90A0-487B0183ED55}.Release|Any CPU.Build.0 = Release|Any CPU - {F583A530-B8C6-49D8-A41F-0637FC12BE8D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F583A530-B8C6-49D8-A41F-0637FC12BE8D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F583A530-B8C6-49D8-A41F-0637FC12BE8D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F583A530-B8C6-49D8-A41F-0637FC12BE8D}.Release|Any CPU.Build.0 = Release|Any CPU - {F2AF1F67-CCD8-46BB-9D20-346DBEE5AD82}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F2AF1F67-CCD8-46BB-9D20-346DBEE5AD82}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F2AF1F67-CCD8-46BB-9D20-346DBEE5AD82}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F2AF1F67-CCD8-46BB-9D20-346DBEE5AD82}.Release|Any CPU.Build.0 = Release|Any CPU - {8A14B464-D2C1-4247-97B7-7F8B3D54AEFA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8A14B464-D2C1-4247-97B7-7F8B3D54AEFA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8A14B464-D2C1-4247-97B7-7F8B3D54AEFA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8A14B464-D2C1-4247-97B7-7F8B3D54AEFA}.Release|Any CPU.Build.0 = Release|Any CPU - {62E6A406-EDC0-49D4-8238-285CDBD5A118}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {62E6A406-EDC0-49D4-8238-285CDBD5A118}.Debug|Any CPU.Build.0 = Debug|Any CPU - {62E6A406-EDC0-49D4-8238-285CDBD5A118}.Release|Any CPU.ActiveCfg = Release|Any CPU - {62E6A406-EDC0-49D4-8238-285CDBD5A118}.Release|Any CPU.Build.0 = Release|Any CPU - {E3FD528B-1F17-412E-8E03-0E97CA9F7483}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E3FD528B-1F17-412E-8E03-0E97CA9F7483}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E3FD528B-1F17-412E-8E03-0E97CA9F7483}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E3FD528B-1F17-412E-8E03-0E97CA9F7483}.Release|Any CPU.Build.0 = Release|Any CPU - {C9507F12-7FE3-474F-B19E-FAA21723F529}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C9507F12-7FE3-474F-B19E-FAA21723F529}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C9507F12-7FE3-474F-B19E-FAA21723F529}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C9507F12-7FE3-474F-B19E-FAA21723F529}.Release|Any CPU.Build.0 = Release|Any CPU - {1809134B-0393-4CC0-8409-CC637989DAB4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1809134B-0393-4CC0-8409-CC637989DAB4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1809134B-0393-4CC0-8409-CC637989DAB4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1809134B-0393-4CC0-8409-CC637989DAB4}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -220,37 +136,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {9EC6DD3D-A1C4-4A68-8431-29B873FBB1CF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {8689C4D6-D0FB-4D6B-8E57-300D7EAFC630} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {80CA3D73-6ED6-4980-917E-2400D51A054F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {07CF7C72-5220-422F-A51F-EF1791813CA6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {B38E03B7-EB84-4EB5-9517-AFC087D5F874} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {CB31A802-5281-459C-B85E-D29EE79BF636} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {3602FABD-7B5C-4868-A901-755847B57028} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E5B5AB49-590D-41E9-90A0-487B0183ED55} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F583A530-B8C6-49D8-A41F-0637FC12BE8D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F2AF1F67-CCD8-46BB-9D20-346DBEE5AD82} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8A14B464-D2C1-4247-97B7-7F8B3D54AEFA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {62E6A406-EDC0-49D4-8238-285CDBD5A118} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E3FD528B-1F17-412E-8E03-0E97CA9F7483} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C9507F12-7FE3-474F-B19E-FAA21723F529} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {1809134B-0393-4CC0-8409-CC637989DAB4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {CB31A802-5281-459C-B85E-D29EE79BF636} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {3602FABD-7B5C-4868-A901-755847B57028} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E5B5AB49-590D-41E9-90A0-487B0183ED55} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F583A530-B8C6-49D8-A41F-0637FC12BE8D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F2AF1F67-CCD8-46BB-9D20-346DBEE5AD82} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8A14B464-D2C1-4247-97B7-7F8B3D54AEFA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {62E6A406-EDC0-49D4-8238-285CDBD5A118} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E3FD528B-1F17-412E-8E03-0E97CA9F7483} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C9507F12-7FE3-474F-B19E-FAA21723F529} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {1809134B-0393-4CC0-8409-CC637989DAB4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {6DBCC06A-C0C5-43A3-B03E-2420A47A9810} diff --git a/sdk/src/Services/ElasticBeanstalk/Generated/AmazonElasticBeanstalkConfig.cs b/sdk/src/Services/ElasticBeanstalk/Generated/AmazonElasticBeanstalkConfig.cs index c4b8e7d8c690..82b3c5d54f82 100644 --- a/sdk/src/Services/ElasticBeanstalk/Generated/AmazonElasticBeanstalkConfig.cs +++ b/sdk/src/Services/ElasticBeanstalk/Generated/AmazonElasticBeanstalkConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.ElasticBeanstalk public partial class AmazonElasticBeanstalkConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("Elastic Beanstalk", "4.0.0.0"); private static readonly AmazonElasticBeanstalkEndpointResolver EndpointResolver = new AmazonElasticBeanstalkEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("Elastic Beanstalk", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("Elastic Beanstalk", "3.7.400.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/ElasticBeanstalk/Properties/AssemblyInfo.cs b/sdk/src/Services/ElasticBeanstalk/Properties/AssemblyInfo.cs index d91353a486cf..56dc29d2b7fa 100644 --- a/sdk/src/Services/ElasticBeanstalk/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/ElasticBeanstalk/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/ElasticFileSystem/ElasticFileSystem.sln b/sdk/src/Services/ElasticFileSystem/ElasticFileSystem.sln index 9cc60f3e4df4..9ef45fb07dfd 100644 --- a/sdk/src/Services/ElasticFileSystem/ElasticFileSystem.sln +++ b/sdk/src/Services/ElasticFileSystem/ElasticFileSystem.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {88FC982E-5E63-4A8E-991C-6C7C4A25BDCB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {88FC982E-5E63-4A8E-991C-6C7C4A25BDCB}.Debug|Any CPU.Build.0 = Debug|Any CPU {88FC982E-5E63-4A8E-991C-6C7C4A25BDCB}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {94286476-AEA3-43EE-972F-8F7E98781634}.Debug|Any CPU.Build.0 = Debug|Any CPU {94286476-AEA3-43EE-972F-8F7E98781634}.Release|Any CPU.ActiveCfg = Release|Any CPU {94286476-AEA3-43EE-972F-8F7E98781634}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {2076AD59-2129-416A-A63D-F4ADE9868476}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2076AD59-2129-416A-A63D-F4ADE9868476}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2076AD59-2129-416A-A63D-F4ADE9868476}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2076AD59-2129-416A-A63D-F4ADE9868476}.Release|Any CPU.Build.0 = Release|Any CPU - {6B3F31EB-1A83-4023-B6A0-50F13CF44CAE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6B3F31EB-1A83-4023-B6A0-50F13CF44CAE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6B3F31EB-1A83-4023-B6A0-50F13CF44CAE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6B3F31EB-1A83-4023-B6A0-50F13CF44CAE}.Release|Any CPU.Build.0 = Release|Any CPU - {8E499259-FD89-408D-9CEE-900205204D2A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8E499259-FD89-408D-9CEE-900205204D2A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8E499259-FD89-408D-9CEE-900205204D2A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8E499259-FD89-408D-9CEE-900205204D2A}.Release|Any CPU.Build.0 = Release|Any CPU - {1026E3B9-49E8-4DBA-942F-8FABE6FB7A3E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1026E3B9-49E8-4DBA-942F-8FABE6FB7A3E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1026E3B9-49E8-4DBA-942F-8FABE6FB7A3E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1026E3B9-49E8-4DBA-942F-8FABE6FB7A3E}.Release|Any CPU.Build.0 = Release|Any CPU - {C66D0B6B-861A-41AD-A26B-83AB1829C276}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C66D0B6B-861A-41AD-A26B-83AB1829C276}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C66D0B6B-861A-41AD-A26B-83AB1829C276}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C66D0B6B-861A-41AD-A26B-83AB1829C276}.Release|Any CPU.Build.0 = Release|Any CPU - {6AAB4077-8CE6-472F-BFCE-067B6F400129}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6AAB4077-8CE6-472F-BFCE-067B6F400129}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6AAB4077-8CE6-472F-BFCE-067B6F400129}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6AAB4077-8CE6-472F-BFCE-067B6F400129}.Release|Any CPU.Build.0 = Release|Any CPU - {A1C3DF3C-203C-462F-8388-2B72CA4996F8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A1C3DF3C-203C-462F-8388-2B72CA4996F8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A1C3DF3C-203C-462F-8388-2B72CA4996F8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A1C3DF3C-203C-462F-8388-2B72CA4996F8}.Release|Any CPU.Build.0 = Release|Any CPU - {47279C5D-9B7D-45D7-92F2-A1CD5C9AAFE4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {47279C5D-9B7D-45D7-92F2-A1CD5C9AAFE4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {47279C5D-9B7D-45D7-92F2-A1CD5C9AAFE4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {47279C5D-9B7D-45D7-92F2-A1CD5C9AAFE4}.Release|Any CPU.Build.0 = Release|Any CPU - {D602FD5A-409A-415E-A0EE-B711A3F24665}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D602FD5A-409A-415E-A0EE-B711A3F24665}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D602FD5A-409A-415E-A0EE-B711A3F24665}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D602FD5A-409A-415E-A0EE-B711A3F24665}.Release|Any CPU.Build.0 = Release|Any CPU - {4B351568-C267-472C-A202-D9D98EE6A97D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4B351568-C267-472C-A202-D9D98EE6A97D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4B351568-C267-472C-A202-D9D98EE6A97D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4B351568-C267-472C-A202-D9D98EE6A97D}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {2076AD59-2129-416A-A63D-F4ADE9868476}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2076AD59-2129-416A-A63D-F4ADE9868476}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2076AD59-2129-416A-A63D-F4ADE9868476}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2076AD59-2129-416A-A63D-F4ADE9868476}.Release|Any CPU.Build.0 = Release|Any CPU - {6B3F31EB-1A83-4023-B6A0-50F13CF44CAE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6B3F31EB-1A83-4023-B6A0-50F13CF44CAE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6B3F31EB-1A83-4023-B6A0-50F13CF44CAE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6B3F31EB-1A83-4023-B6A0-50F13CF44CAE}.Release|Any CPU.Build.0 = Release|Any CPU - {8E499259-FD89-408D-9CEE-900205204D2A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8E499259-FD89-408D-9CEE-900205204D2A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8E499259-FD89-408D-9CEE-900205204D2A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8E499259-FD89-408D-9CEE-900205204D2A}.Release|Any CPU.Build.0 = Release|Any CPU - {1026E3B9-49E8-4DBA-942F-8FABE6FB7A3E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1026E3B9-49E8-4DBA-942F-8FABE6FB7A3E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1026E3B9-49E8-4DBA-942F-8FABE6FB7A3E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1026E3B9-49E8-4DBA-942F-8FABE6FB7A3E}.Release|Any CPU.Build.0 = Release|Any CPU - {C66D0B6B-861A-41AD-A26B-83AB1829C276}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C66D0B6B-861A-41AD-A26B-83AB1829C276}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C66D0B6B-861A-41AD-A26B-83AB1829C276}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C66D0B6B-861A-41AD-A26B-83AB1829C276}.Release|Any CPU.Build.0 = Release|Any CPU - {6AAB4077-8CE6-472F-BFCE-067B6F400129}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6AAB4077-8CE6-472F-BFCE-067B6F400129}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6AAB4077-8CE6-472F-BFCE-067B6F400129}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6AAB4077-8CE6-472F-BFCE-067B6F400129}.Release|Any CPU.Build.0 = Release|Any CPU - {A1C3DF3C-203C-462F-8388-2B72CA4996F8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A1C3DF3C-203C-462F-8388-2B72CA4996F8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A1C3DF3C-203C-462F-8388-2B72CA4996F8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A1C3DF3C-203C-462F-8388-2B72CA4996F8}.Release|Any CPU.Build.0 = Release|Any CPU - {47279C5D-9B7D-45D7-92F2-A1CD5C9AAFE4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {47279C5D-9B7D-45D7-92F2-A1CD5C9AAFE4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {47279C5D-9B7D-45D7-92F2-A1CD5C9AAFE4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {47279C5D-9B7D-45D7-92F2-A1CD5C9AAFE4}.Release|Any CPU.Build.0 = Release|Any CPU - {D602FD5A-409A-415E-A0EE-B711A3F24665}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D602FD5A-409A-415E-A0EE-B711A3F24665}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D602FD5A-409A-415E-A0EE-B711A3F24665}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D602FD5A-409A-415E-A0EE-B711A3F24665}.Release|Any CPU.Build.0 = Release|Any CPU - {4B351568-C267-472C-A202-D9D98EE6A97D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4B351568-C267-472C-A202-D9D98EE6A97D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4B351568-C267-472C-A202-D9D98EE6A97D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4B351568-C267-472C-A202-D9D98EE6A97D}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {88FC982E-5E63-4A8E-991C-6C7C4A25BDCB} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {D6F277C8-C4DE-4B39-8594-C74D16B9ACC2} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {F0B20787-95E6-4C06-945C-1636876FEF47} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {9065ADF5-480D-4846-AC05-C2AF63C51796} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {94286476-AEA3-43EE-972F-8F7E98781634} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {2076AD59-2129-416A-A63D-F4ADE9868476} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6B3F31EB-1A83-4023-B6A0-50F13CF44CAE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8E499259-FD89-408D-9CEE-900205204D2A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {1026E3B9-49E8-4DBA-942F-8FABE6FB7A3E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C66D0B6B-861A-41AD-A26B-83AB1829C276} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6AAB4077-8CE6-472F-BFCE-067B6F400129} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A1C3DF3C-203C-462F-8388-2B72CA4996F8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {47279C5D-9B7D-45D7-92F2-A1CD5C9AAFE4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D602FD5A-409A-415E-A0EE-B711A3F24665} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4B351568-C267-472C-A202-D9D98EE6A97D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {2076AD59-2129-416A-A63D-F4ADE9868476} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6B3F31EB-1A83-4023-B6A0-50F13CF44CAE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8E499259-FD89-408D-9CEE-900205204D2A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {1026E3B9-49E8-4DBA-942F-8FABE6FB7A3E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C66D0B6B-861A-41AD-A26B-83AB1829C276} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6AAB4077-8CE6-472F-BFCE-067B6F400129} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A1C3DF3C-203C-462F-8388-2B72CA4996F8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {47279C5D-9B7D-45D7-92F2-A1CD5C9AAFE4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D602FD5A-409A-415E-A0EE-B711A3F24665} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4B351568-C267-472C-A202-D9D98EE6A97D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {780076A5-E2EF-4EAD-B8BC-93E753721DAB} diff --git a/sdk/src/Services/ElasticFileSystem/Generated/AmazonElasticFileSystemConfig.cs b/sdk/src/Services/ElasticFileSystem/Generated/AmazonElasticFileSystemConfig.cs index cc1625feebaf..6f343dd49d13 100644 --- a/sdk/src/Services/ElasticFileSystem/Generated/AmazonElasticFileSystemConfig.cs +++ b/sdk/src/Services/ElasticFileSystem/Generated/AmazonElasticFileSystemConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.ElasticFileSystem public partial class AmazonElasticFileSystemConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("EFS", "4.0.0.0"); private static readonly AmazonElasticFileSystemEndpointResolver EndpointResolver = new AmazonElasticFileSystemEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("EFS", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("EFS", "3.7.400.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/ElasticFileSystem/Properties/AssemblyInfo.cs b/sdk/src/Services/ElasticFileSystem/Properties/AssemblyInfo.cs index d64cb284e689..9922aa9e8464 100644 --- a/sdk/src/Services/ElasticFileSystem/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/ElasticFileSystem/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/ElasticInference/ElasticInference.sln b/sdk/src/Services/ElasticInference/ElasticInference.sln index ce0162ce08dd..c18fcdba5cbd 100644 --- a/sdk/src/Services/ElasticInference/ElasticInference.sln +++ b/sdk/src/Services/ElasticInference/ElasticInference.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {8DFD8114-1081-4908-8646-030201C5B0C5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {8DFD8114-1081-4908-8646-030201C5B0C5}.Debug|Any CPU.Build.0 = Debug|Any CPU {8DFD8114-1081-4908-8646-030201C5B0C5}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {419242CE-17E4-4CFA-8D05-005D8163740E}.Debug|Any CPU.Build.0 = Debug|Any CPU {419242CE-17E4-4CFA-8D05-005D8163740E}.Release|Any CPU.ActiveCfg = Release|Any CPU {419242CE-17E4-4CFA-8D05-005D8163740E}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {EE7B8254-7513-46E6-80B4-68AF12A96942}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EE7B8254-7513-46E6-80B4-68AF12A96942}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EE7B8254-7513-46E6-80B4-68AF12A96942}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EE7B8254-7513-46E6-80B4-68AF12A96942}.Release|Any CPU.Build.0 = Release|Any CPU - {0B39190B-0EEC-40A2-925C-505BBC90CEB3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0B39190B-0EEC-40A2-925C-505BBC90CEB3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0B39190B-0EEC-40A2-925C-505BBC90CEB3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0B39190B-0EEC-40A2-925C-505BBC90CEB3}.Release|Any CPU.Build.0 = Release|Any CPU - {CD03F15F-B8A5-48EE-BBD1-98F5F6CF7757}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CD03F15F-B8A5-48EE-BBD1-98F5F6CF7757}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CD03F15F-B8A5-48EE-BBD1-98F5F6CF7757}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CD03F15F-B8A5-48EE-BBD1-98F5F6CF7757}.Release|Any CPU.Build.0 = Release|Any CPU - {5C6D515F-3DF6-4815-972E-21C4B6DBF2AC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5C6D515F-3DF6-4815-972E-21C4B6DBF2AC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5C6D515F-3DF6-4815-972E-21C4B6DBF2AC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5C6D515F-3DF6-4815-972E-21C4B6DBF2AC}.Release|Any CPU.Build.0 = Release|Any CPU - {288B3CFB-013C-499F-881C-DAE71DF57CDA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {288B3CFB-013C-499F-881C-DAE71DF57CDA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {288B3CFB-013C-499F-881C-DAE71DF57CDA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {288B3CFB-013C-499F-881C-DAE71DF57CDA}.Release|Any CPU.Build.0 = Release|Any CPU - {EE4F1144-1836-466C-92AC-F53661A6AC55}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EE4F1144-1836-466C-92AC-F53661A6AC55}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EE4F1144-1836-466C-92AC-F53661A6AC55}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EE4F1144-1836-466C-92AC-F53661A6AC55}.Release|Any CPU.Build.0 = Release|Any CPU - {AD42A52C-C0CE-4EE9-93BA-886C471EA71D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AD42A52C-C0CE-4EE9-93BA-886C471EA71D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AD42A52C-C0CE-4EE9-93BA-886C471EA71D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AD42A52C-C0CE-4EE9-93BA-886C471EA71D}.Release|Any CPU.Build.0 = Release|Any CPU - {099850AB-3DD3-4A67-A1FA-CF0F20D15B16}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {099850AB-3DD3-4A67-A1FA-CF0F20D15B16}.Debug|Any CPU.Build.0 = Debug|Any CPU - {099850AB-3DD3-4A67-A1FA-CF0F20D15B16}.Release|Any CPU.ActiveCfg = Release|Any CPU - {099850AB-3DD3-4A67-A1FA-CF0F20D15B16}.Release|Any CPU.Build.0 = Release|Any CPU - {A0121585-0B19-4E63-A393-0EE910D1F031}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A0121585-0B19-4E63-A393-0EE910D1F031}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A0121585-0B19-4E63-A393-0EE910D1F031}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A0121585-0B19-4E63-A393-0EE910D1F031}.Release|Any CPU.Build.0 = Release|Any CPU - {9AF259F6-BF5A-428D-B264-C7887B045FA9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9AF259F6-BF5A-428D-B264-C7887B045FA9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9AF259F6-BF5A-428D-B264-C7887B045FA9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9AF259F6-BF5A-428D-B264-C7887B045FA9}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {EE7B8254-7513-46E6-80B4-68AF12A96942}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EE7B8254-7513-46E6-80B4-68AF12A96942}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EE7B8254-7513-46E6-80B4-68AF12A96942}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EE7B8254-7513-46E6-80B4-68AF12A96942}.Release|Any CPU.Build.0 = Release|Any CPU - {0B39190B-0EEC-40A2-925C-505BBC90CEB3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0B39190B-0EEC-40A2-925C-505BBC90CEB3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0B39190B-0EEC-40A2-925C-505BBC90CEB3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0B39190B-0EEC-40A2-925C-505BBC90CEB3}.Release|Any CPU.Build.0 = Release|Any CPU - {CD03F15F-B8A5-48EE-BBD1-98F5F6CF7757}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CD03F15F-B8A5-48EE-BBD1-98F5F6CF7757}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CD03F15F-B8A5-48EE-BBD1-98F5F6CF7757}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CD03F15F-B8A5-48EE-BBD1-98F5F6CF7757}.Release|Any CPU.Build.0 = Release|Any CPU - {5C6D515F-3DF6-4815-972E-21C4B6DBF2AC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5C6D515F-3DF6-4815-972E-21C4B6DBF2AC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5C6D515F-3DF6-4815-972E-21C4B6DBF2AC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5C6D515F-3DF6-4815-972E-21C4B6DBF2AC}.Release|Any CPU.Build.0 = Release|Any CPU - {288B3CFB-013C-499F-881C-DAE71DF57CDA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {288B3CFB-013C-499F-881C-DAE71DF57CDA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {288B3CFB-013C-499F-881C-DAE71DF57CDA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {288B3CFB-013C-499F-881C-DAE71DF57CDA}.Release|Any CPU.Build.0 = Release|Any CPU - {EE4F1144-1836-466C-92AC-F53661A6AC55}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EE4F1144-1836-466C-92AC-F53661A6AC55}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EE4F1144-1836-466C-92AC-F53661A6AC55}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EE4F1144-1836-466C-92AC-F53661A6AC55}.Release|Any CPU.Build.0 = Release|Any CPU - {AD42A52C-C0CE-4EE9-93BA-886C471EA71D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AD42A52C-C0CE-4EE9-93BA-886C471EA71D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AD42A52C-C0CE-4EE9-93BA-886C471EA71D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AD42A52C-C0CE-4EE9-93BA-886C471EA71D}.Release|Any CPU.Build.0 = Release|Any CPU - {099850AB-3DD3-4A67-A1FA-CF0F20D15B16}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {099850AB-3DD3-4A67-A1FA-CF0F20D15B16}.Debug|Any CPU.Build.0 = Debug|Any CPU - {099850AB-3DD3-4A67-A1FA-CF0F20D15B16}.Release|Any CPU.ActiveCfg = Release|Any CPU - {099850AB-3DD3-4A67-A1FA-CF0F20D15B16}.Release|Any CPU.Build.0 = Release|Any CPU - {A0121585-0B19-4E63-A393-0EE910D1F031}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A0121585-0B19-4E63-A393-0EE910D1F031}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A0121585-0B19-4E63-A393-0EE910D1F031}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A0121585-0B19-4E63-A393-0EE910D1F031}.Release|Any CPU.Build.0 = Release|Any CPU - {9AF259F6-BF5A-428D-B264-C7887B045FA9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9AF259F6-BF5A-428D-B264-C7887B045FA9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9AF259F6-BF5A-428D-B264-C7887B045FA9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9AF259F6-BF5A-428D-B264-C7887B045FA9}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {8DFD8114-1081-4908-8646-030201C5B0C5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {68E1855C-6040-4BD0-9928-E1CFD37BA88C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {459C180D-74D7-478F-B513-CE9AB8D995F2} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {23ABF8EF-383E-4BE8-9C20-2FB344DB714E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {419242CE-17E4-4CFA-8D05-005D8163740E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {EE7B8254-7513-46E6-80B4-68AF12A96942} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0B39190B-0EEC-40A2-925C-505BBC90CEB3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {CD03F15F-B8A5-48EE-BBD1-98F5F6CF7757} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {5C6D515F-3DF6-4815-972E-21C4B6DBF2AC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {288B3CFB-013C-499F-881C-DAE71DF57CDA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {EE4F1144-1836-466C-92AC-F53661A6AC55} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {AD42A52C-C0CE-4EE9-93BA-886C471EA71D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {099850AB-3DD3-4A67-A1FA-CF0F20D15B16} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A0121585-0B19-4E63-A393-0EE910D1F031} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {9AF259F6-BF5A-428D-B264-C7887B045FA9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {EE7B8254-7513-46E6-80B4-68AF12A96942} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0B39190B-0EEC-40A2-925C-505BBC90CEB3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {CD03F15F-B8A5-48EE-BBD1-98F5F6CF7757} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {5C6D515F-3DF6-4815-972E-21C4B6DBF2AC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {288B3CFB-013C-499F-881C-DAE71DF57CDA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {EE4F1144-1836-466C-92AC-F53661A6AC55} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {AD42A52C-C0CE-4EE9-93BA-886C471EA71D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {099850AB-3DD3-4A67-A1FA-CF0F20D15B16} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A0121585-0B19-4E63-A393-0EE910D1F031} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {9AF259F6-BF5A-428D-B264-C7887B045FA9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {1D56E8DA-3037-4872-8208-34D543730AF7} diff --git a/sdk/src/Services/ElasticInference/Generated/AmazonElasticInferenceConfig.cs b/sdk/src/Services/ElasticInference/Generated/AmazonElasticInferenceConfig.cs index cfa7a1f8b851..186f20d927e6 100644 --- a/sdk/src/Services/ElasticInference/Generated/AmazonElasticInferenceConfig.cs +++ b/sdk/src/Services/ElasticInference/Generated/AmazonElasticInferenceConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.ElasticInference public partial class AmazonElasticInferenceConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("Elastic Inference", "4.0.0.0"); private static readonly AmazonElasticInferenceEndpointResolver EndpointResolver = new AmazonElasticInferenceEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("Elastic Inference", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("Elastic Inference", "3.7.400.54"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/ElasticInference/Generated/_bcl/AmazonElasticInferenceClient.cs b/sdk/src/Services/ElasticInference/Generated/_bcl/AmazonElasticInferenceClient.cs index 686c64c9ac19..3ddf5af32171 100644 --- a/sdk/src/Services/ElasticInference/Generated/_bcl/AmazonElasticInferenceClient.cs +++ b/sdk/src/Services/ElasticInference/Generated/_bcl/AmazonElasticInferenceClient.cs @@ -40,17 +40,13 @@ namespace Amazon.ElasticInference /// /// Implementation for accessing ElasticInference /// - /// Elastic Inference public APIs. - /// - /// + /// /// - /// February 15, 2023: Starting April 15, 2023, AWS will not onboard new customers to - /// Amazon Elastic Inference (EI), and will help current customers migrate their workloads - /// to options that offer better price and performance. After April 15, 2023, new customers - /// will not be able to launch instances with Amazon EI accelerators in Amazon SageMaker, - /// Amazon ECS, or Amazon EC2. However, customers who have used Amazon EI at least once - /// during the past 30-day period are considered current customers and will be able to - /// continue using the service. + /// Amazon Elastic Inference is no longer available. + /// + /// + /// + /// Elastic Inference public APIs. /// /// public partial class AmazonElasticInferenceClient : AmazonServiceClient, IAmazonElasticInference @@ -280,18 +276,14 @@ protected override void Dispose(bool disposing) /// - /// Describes the locations in which a given accelerator type or set of types is present - /// in a given region. - /// - /// + /// /// - /// February 15, 2023: Starting April 15, 2023, AWS will not onboard new customers to - /// Amazon Elastic Inference (EI), and will help current customers migrate their workloads - /// to options that offer better price and performance. After April 15, 2023, new customers - /// will not be able to launch instances with Amazon EI accelerators in Amazon SageMaker, - /// Amazon ECS, or Amazon EC2. However, customers who have used Amazon EI at least once - /// during the past 30-day period are considered current customers and will be able to - /// continue using the service. + /// Amazon Elastic Inference is no longer available. + /// + /// + /// + /// Describes the locations in which a given accelerator type or set of types is present + /// in a given region. /// /// /// Container for the necessary parameters to execute the DescribeAcceleratorOfferings service method. @@ -318,18 +310,14 @@ public virtual DescribeAcceleratorOfferingsResponse DescribeAcceleratorOfferings /// - /// Describes the locations in which a given accelerator type or set of types is present - /// in a given region. - /// - /// + /// + /// + /// Amazon Elastic Inference is no longer available. + /// + /// /// - /// February 15, 2023: Starting April 15, 2023, AWS will not onboard new customers to - /// Amazon Elastic Inference (EI), and will help current customers migrate their workloads - /// to options that offer better price and performance. After April 15, 2023, new customers - /// will not be able to launch instances with Amazon EI accelerators in Amazon SageMaker, - /// Amazon ECS, or Amazon EC2. However, customers who have used Amazon EI at least once - /// during the past 30-day period are considered current customers and will be able to - /// continue using the service. + /// Describes the locations in which a given accelerator type or set of types is present + /// in a given region. /// /// /// Container for the necessary parameters to execute the DescribeAcceleratorOfferings service method. @@ -363,18 +351,14 @@ public virtual DescribeAcceleratorOfferingsResponse DescribeAcceleratorOfferings /// - /// Describes information over a provided set of accelerators belonging to an account. - /// - /// - /// + /// + /// + /// Amazon Elastic Inference is no longer available. + /// + /// /// - /// February 15, 2023: Starting April 15, 2023, AWS will not onboard new customers to - /// Amazon Elastic Inference (EI), and will help current customers migrate their workloads - /// to options that offer better price and performance. After April 15, 2023, new customers - /// will not be able to launch instances with Amazon EI accelerators in Amazon SageMaker, - /// Amazon ECS, or Amazon EC2. However, customers who have used Amazon EI at least once - /// during the past 30-day period are considered current customers and will be able to - /// continue using the service. + /// Describes information over a provided set of accelerators belonging to an account. + /// /// /// /// Container for the necessary parameters to execute the DescribeAccelerators service method. @@ -401,18 +385,14 @@ public virtual DescribeAcceleratorsResponse DescribeAccelerators(DescribeAcceler /// - /// Describes information over a provided set of accelerators belonging to an account. - /// - /// - /// + /// /// - /// February 15, 2023: Starting April 15, 2023, AWS will not onboard new customers to - /// Amazon Elastic Inference (EI), and will help current customers migrate their workloads - /// to options that offer better price and performance. After April 15, 2023, new customers - /// will not be able to launch instances with Amazon EI accelerators in Amazon SageMaker, - /// Amazon ECS, or Amazon EC2. However, customers who have used Amazon EI at least once - /// during the past 30-day period are considered current customers and will be able to - /// continue using the service. + /// Amazon Elastic Inference is no longer available. + /// + /// + /// + /// Describes information over a provided set of accelerators belonging to an account. + /// /// /// /// Container for the necessary parameters to execute the DescribeAccelerators service method. @@ -446,18 +426,14 @@ public virtual DescribeAcceleratorsResponse DescribeAccelerators(DescribeAcceler /// - /// Describes the accelerator types available in a given region, as well as their characteristics, - /// such as memory and throughput. - /// - /// + /// + /// + /// Amazon Elastic Inference is no longer available. + /// + /// /// - /// February 15, 2023: Starting April 15, 2023, AWS will not onboard new customers to - /// Amazon Elastic Inference (EI), and will help current customers migrate their workloads - /// to options that offer better price and performance. After April 15, 2023, new customers - /// will not be able to launch instances with Amazon EI accelerators in Amazon SageMaker, - /// Amazon ECS, or Amazon EC2. However, customers who have used Amazon EI at least once - /// during the past 30-day period are considered current customers and will be able to - /// continue using the service. + /// Describes the accelerator types available in a given region, as well as their characteristics, + /// such as memory and throughput. /// /// /// Container for the necessary parameters to execute the DescribeAcceleratorTypes service method. @@ -478,18 +454,14 @@ public virtual DescribeAcceleratorTypesResponse DescribeAcceleratorTypes(Describ /// - /// Describes the accelerator types available in a given region, as well as their characteristics, - /// such as memory and throughput. - /// - /// + /// /// - /// February 15, 2023: Starting April 15, 2023, AWS will not onboard new customers to - /// Amazon Elastic Inference (EI), and will help current customers migrate their workloads - /// to options that offer better price and performance. After April 15, 2023, new customers - /// will not be able to launch instances with Amazon EI accelerators in Amazon SageMaker, - /// Amazon ECS, or Amazon EC2. However, customers who have used Amazon EI at least once - /// during the past 30-day period are considered current customers and will be able to - /// continue using the service. + /// Amazon Elastic Inference is no longer available. + /// + /// + /// + /// Describes the accelerator types available in a given region, as well as their characteristics, + /// such as memory and throughput. /// /// /// Container for the necessary parameters to execute the DescribeAcceleratorTypes service method. @@ -517,17 +489,13 @@ public virtual DescribeAcceleratorTypesResponse DescribeAcceleratorTypes(Describ /// - /// Returns all tags of an Elastic Inference Accelerator. - /// - /// + /// + /// + /// Amazon Elastic Inference is no longer available. + /// + /// /// - /// February 15, 2023: Starting April 15, 2023, AWS will not onboard new customers to - /// Amazon Elastic Inference (EI), and will help current customers migrate their workloads - /// to options that offer better price and performance. After April 15, 2023, new customers - /// will not be able to launch instances with Amazon EI accelerators in Amazon SageMaker, - /// Amazon ECS, or Amazon EC2. However, customers who have used Amazon EI at least once - /// during the past 30-day period are considered current customers and will be able to - /// continue using the service. + /// Returns all tags of an Elastic Inference Accelerator. /// /// /// Container for the necessary parameters to execute the ListTagsForResource service method. @@ -554,17 +522,13 @@ public virtual ListTagsForResourceResponse ListTagsForResource(ListTagsForResour /// - /// Returns all tags of an Elastic Inference Accelerator. - /// - /// + /// + /// + /// Amazon Elastic Inference is no longer available. + /// + /// /// - /// February 15, 2023: Starting April 15, 2023, AWS will not onboard new customers to - /// Amazon Elastic Inference (EI), and will help current customers migrate their workloads - /// to options that offer better price and performance. After April 15, 2023, new customers - /// will not be able to launch instances with Amazon EI accelerators in Amazon SageMaker, - /// Amazon ECS, or Amazon EC2. However, customers who have used Amazon EI at least once - /// during the past 30-day period are considered current customers and will be able to - /// continue using the service. + /// Returns all tags of an Elastic Inference Accelerator. /// /// /// Container for the necessary parameters to execute the ListTagsForResource service method. @@ -598,17 +562,13 @@ public virtual ListTagsForResourceResponse ListTagsForResource(ListTagsForResour /// - /// Adds the specified tags to an Elastic Inference Accelerator. - /// - /// + /// + /// + /// Amazon Elastic Inference is no longer available. + /// + /// /// - /// February 15, 2023: Starting April 15, 2023, AWS will not onboard new customers to - /// Amazon Elastic Inference (EI), and will help current customers migrate their workloads - /// to options that offer better price and performance. After April 15, 2023, new customers - /// will not be able to launch instances with Amazon EI accelerators in Amazon SageMaker, - /// Amazon ECS, or Amazon EC2. However, customers who have used Amazon EI at least once - /// during the past 30-day period are considered current customers and will be able to - /// continue using the service. + /// Adds the specified tags to an Elastic Inference Accelerator. /// /// /// Container for the necessary parameters to execute the TagResource service method. @@ -635,17 +595,13 @@ public virtual TagResourceResponse TagResource(TagResourceRequest request) /// - /// Adds the specified tags to an Elastic Inference Accelerator. - /// - /// + /// + /// + /// Amazon Elastic Inference is no longer available. + /// + /// /// - /// February 15, 2023: Starting April 15, 2023, AWS will not onboard new customers to - /// Amazon Elastic Inference (EI), and will help current customers migrate their workloads - /// to options that offer better price and performance. After April 15, 2023, new customers - /// will not be able to launch instances with Amazon EI accelerators in Amazon SageMaker, - /// Amazon ECS, or Amazon EC2. However, customers who have used Amazon EI at least once - /// during the past 30-day period are considered current customers and will be able to - /// continue using the service. + /// Adds the specified tags to an Elastic Inference Accelerator. /// /// /// Container for the necessary parameters to execute the TagResource service method. @@ -679,17 +635,13 @@ public virtual TagResourceResponse TagResource(TagResourceRequest request) /// - /// Removes the specified tags from an Elastic Inference Accelerator. - /// - /// + /// + /// + /// Amazon Elastic Inference is no longer available. + /// + /// /// - /// February 15, 2023: Starting April 15, 2023, AWS will not onboard new customers to - /// Amazon Elastic Inference (EI), and will help current customers migrate their workloads - /// to options that offer better price and performance. After April 15, 2023, new customers - /// will not be able to launch instances with Amazon EI accelerators in Amazon SageMaker, - /// Amazon ECS, or Amazon EC2. However, customers who have used Amazon EI at least once - /// during the past 30-day period are considered current customers and will be able to - /// continue using the service. + /// Removes the specified tags from an Elastic Inference Accelerator. /// /// /// Container for the necessary parameters to execute the UntagResource service method. @@ -716,17 +668,13 @@ public virtual UntagResourceResponse UntagResource(UntagResourceRequest request) /// - /// Removes the specified tags from an Elastic Inference Accelerator. - /// - /// + /// + /// + /// Amazon Elastic Inference is no longer available. + /// + /// /// - /// February 15, 2023: Starting April 15, 2023, AWS will not onboard new customers to - /// Amazon Elastic Inference (EI), and will help current customers migrate their workloads - /// to options that offer better price and performance. After April 15, 2023, new customers - /// will not be able to launch instances with Amazon EI accelerators in Amazon SageMaker, - /// Amazon ECS, or Amazon EC2. However, customers who have used Amazon EI at least once - /// during the past 30-day period are considered current customers and will be able to - /// continue using the service. + /// Removes the specified tags from an Elastic Inference Accelerator. /// /// /// Container for the necessary parameters to execute the UntagResource service method. diff --git a/sdk/src/Services/ElasticInference/Properties/AssemblyInfo.cs b/sdk/src/Services/ElasticInference/Properties/AssemblyInfo.cs index dd401141bd17..3d3177d05567 100644 --- a/sdk/src/Services/ElasticInference/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/ElasticInference/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.54")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/ElasticLoadBalancing/ElasticLoadBalancing.sln b/sdk/src/Services/ElasticLoadBalancing/ElasticLoadBalancing.sln index 327f7d4fc26b..f195c5948518 100644 --- a/sdk/src/Services/ElasticLoadBalancing/ElasticLoadBalancing.sln +++ b/sdk/src/Services/ElasticLoadBalancing/ElasticLoadBalancing.sln @@ -92,7 +92,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {3B87DD79-64B7-4232-B91C-BFF58147ACEB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {3B87DD79-64B7-4232-B91C-BFF58147ACEB}.Debug|Any CPU.Build.0 = Debug|Any CPU {3B87DD79-64B7-4232-B91C-BFF58147ACEB}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -113,97 +120,6 @@ Global {10AA4A7A-A52B-4281-AF05-6B3A997772F2}.Debug|Any CPU.Build.0 = Debug|Any CPU {10AA4A7A-A52B-4281-AF05-6B3A997772F2}.Release|Any CPU.ActiveCfg = Release|Any CPU {10AA4A7A-A52B-4281-AF05-6B3A997772F2}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {93398DBA-895A-48DF-8181-D4BB6BF4C7B0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {93398DBA-895A-48DF-8181-D4BB6BF4C7B0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {93398DBA-895A-48DF-8181-D4BB6BF4C7B0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {93398DBA-895A-48DF-8181-D4BB6BF4C7B0}.Release|Any CPU.Build.0 = Release|Any CPU - {4568130D-B968-4A0A-B45D-44DB86036609}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4568130D-B968-4A0A-B45D-44DB86036609}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4568130D-B968-4A0A-B45D-44DB86036609}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4568130D-B968-4A0A-B45D-44DB86036609}.Release|Any CPU.Build.0 = Release|Any CPU - {2437B81C-B9FD-475D-80D5-74C87AD92E47}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2437B81C-B9FD-475D-80D5-74C87AD92E47}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2437B81C-B9FD-475D-80D5-74C87AD92E47}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2437B81C-B9FD-475D-80D5-74C87AD92E47}.Release|Any CPU.Build.0 = Release|Any CPU - {345498C7-5BD4-4F49-A4FD-505BC1D2F88F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {345498C7-5BD4-4F49-A4FD-505BC1D2F88F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {345498C7-5BD4-4F49-A4FD-505BC1D2F88F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {345498C7-5BD4-4F49-A4FD-505BC1D2F88F}.Release|Any CPU.Build.0 = Release|Any CPU - {E7A9245C-F695-4A8C-904D-7B3B473F95B0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E7A9245C-F695-4A8C-904D-7B3B473F95B0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E7A9245C-F695-4A8C-904D-7B3B473F95B0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E7A9245C-F695-4A8C-904D-7B3B473F95B0}.Release|Any CPU.Build.0 = Release|Any CPU - {ACB2B741-D99E-4109-BBE5-2940A1214AA8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {ACB2B741-D99E-4109-BBE5-2940A1214AA8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {ACB2B741-D99E-4109-BBE5-2940A1214AA8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {ACB2B741-D99E-4109-BBE5-2940A1214AA8}.Release|Any CPU.Build.0 = Release|Any CPU - {2885BE15-E8EE-48C2-8420-D6088371D201}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2885BE15-E8EE-48C2-8420-D6088371D201}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2885BE15-E8EE-48C2-8420-D6088371D201}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2885BE15-E8EE-48C2-8420-D6088371D201}.Release|Any CPU.Build.0 = Release|Any CPU - {09BA32B1-5902-4630-A102-DB7617456CC4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {09BA32B1-5902-4630-A102-DB7617456CC4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {09BA32B1-5902-4630-A102-DB7617456CC4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {09BA32B1-5902-4630-A102-DB7617456CC4}.Release|Any CPU.Build.0 = Release|Any CPU - {55129E56-BAF2-439F-AFF8-3A9A48674254}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {55129E56-BAF2-439F-AFF8-3A9A48674254}.Debug|Any CPU.Build.0 = Debug|Any CPU - {55129E56-BAF2-439F-AFF8-3A9A48674254}.Release|Any CPU.ActiveCfg = Release|Any CPU - {55129E56-BAF2-439F-AFF8-3A9A48674254}.Release|Any CPU.Build.0 = Release|Any CPU - {57E9A58F-005D-48F2-A15F-4501F42F4D35}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {57E9A58F-005D-48F2-A15F-4501F42F4D35}.Debug|Any CPU.Build.0 = Debug|Any CPU - {57E9A58F-005D-48F2-A15F-4501F42F4D35}.Release|Any CPU.ActiveCfg = Release|Any CPU - {57E9A58F-005D-48F2-A15F-4501F42F4D35}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {93398DBA-895A-48DF-8181-D4BB6BF4C7B0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {93398DBA-895A-48DF-8181-D4BB6BF4C7B0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {93398DBA-895A-48DF-8181-D4BB6BF4C7B0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {93398DBA-895A-48DF-8181-D4BB6BF4C7B0}.Release|Any CPU.Build.0 = Release|Any CPU - {4568130D-B968-4A0A-B45D-44DB86036609}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4568130D-B968-4A0A-B45D-44DB86036609}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4568130D-B968-4A0A-B45D-44DB86036609}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4568130D-B968-4A0A-B45D-44DB86036609}.Release|Any CPU.Build.0 = Release|Any CPU - {2437B81C-B9FD-475D-80D5-74C87AD92E47}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2437B81C-B9FD-475D-80D5-74C87AD92E47}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2437B81C-B9FD-475D-80D5-74C87AD92E47}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2437B81C-B9FD-475D-80D5-74C87AD92E47}.Release|Any CPU.Build.0 = Release|Any CPU - {345498C7-5BD4-4F49-A4FD-505BC1D2F88F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {345498C7-5BD4-4F49-A4FD-505BC1D2F88F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {345498C7-5BD4-4F49-A4FD-505BC1D2F88F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {345498C7-5BD4-4F49-A4FD-505BC1D2F88F}.Release|Any CPU.Build.0 = Release|Any CPU - {E7A9245C-F695-4A8C-904D-7B3B473F95B0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E7A9245C-F695-4A8C-904D-7B3B473F95B0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E7A9245C-F695-4A8C-904D-7B3B473F95B0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E7A9245C-F695-4A8C-904D-7B3B473F95B0}.Release|Any CPU.Build.0 = Release|Any CPU - {ACB2B741-D99E-4109-BBE5-2940A1214AA8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {ACB2B741-D99E-4109-BBE5-2940A1214AA8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {ACB2B741-D99E-4109-BBE5-2940A1214AA8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {ACB2B741-D99E-4109-BBE5-2940A1214AA8}.Release|Any CPU.Build.0 = Release|Any CPU - {2885BE15-E8EE-48C2-8420-D6088371D201}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2885BE15-E8EE-48C2-8420-D6088371D201}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2885BE15-E8EE-48C2-8420-D6088371D201}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2885BE15-E8EE-48C2-8420-D6088371D201}.Release|Any CPU.Build.0 = Release|Any CPU - {09BA32B1-5902-4630-A102-DB7617456CC4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {09BA32B1-5902-4630-A102-DB7617456CC4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {09BA32B1-5902-4630-A102-DB7617456CC4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {09BA32B1-5902-4630-A102-DB7617456CC4}.Release|Any CPU.Build.0 = Release|Any CPU - {55129E56-BAF2-439F-AFF8-3A9A48674254}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {55129E56-BAF2-439F-AFF8-3A9A48674254}.Debug|Any CPU.Build.0 = Debug|Any CPU - {55129E56-BAF2-439F-AFF8-3A9A48674254}.Release|Any CPU.ActiveCfg = Release|Any CPU - {55129E56-BAF2-439F-AFF8-3A9A48674254}.Release|Any CPU.Build.0 = Release|Any CPU - {57E9A58F-005D-48F2-A15F-4501F42F4D35}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {57E9A58F-005D-48F2-A15F-4501F42F4D35}.Debug|Any CPU.Build.0 = Debug|Any CPU - {57E9A58F-005D-48F2-A15F-4501F42F4D35}.Release|Any CPU.ActiveCfg = Release|Any CPU - {57E9A58F-005D-48F2-A15F-4501F42F4D35}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -220,37 +136,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {3B87DD79-64B7-4232-B91C-BFF58147ACEB} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {4C6D9E19-5480-4C7B-8E60-5B1635F912D5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {D33C368D-6014-46AD-8432-5F52D03099CA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {7EFFF64B-8531-4813-B1BC-49CC81A4C832} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {10AA4A7A-A52B-4281-AF05-6B3A997772F2} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {93398DBA-895A-48DF-8181-D4BB6BF4C7B0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4568130D-B968-4A0A-B45D-44DB86036609} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {2437B81C-B9FD-475D-80D5-74C87AD92E47} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {345498C7-5BD4-4F49-A4FD-505BC1D2F88F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E7A9245C-F695-4A8C-904D-7B3B473F95B0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {ACB2B741-D99E-4109-BBE5-2940A1214AA8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {2885BE15-E8EE-48C2-8420-D6088371D201} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {09BA32B1-5902-4630-A102-DB7617456CC4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {55129E56-BAF2-439F-AFF8-3A9A48674254} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {57E9A58F-005D-48F2-A15F-4501F42F4D35} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {93398DBA-895A-48DF-8181-D4BB6BF4C7B0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4568130D-B968-4A0A-B45D-44DB86036609} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {2437B81C-B9FD-475D-80D5-74C87AD92E47} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {345498C7-5BD4-4F49-A4FD-505BC1D2F88F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E7A9245C-F695-4A8C-904D-7B3B473F95B0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {ACB2B741-D99E-4109-BBE5-2940A1214AA8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {2885BE15-E8EE-48C2-8420-D6088371D201} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {09BA32B1-5902-4630-A102-DB7617456CC4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {55129E56-BAF2-439F-AFF8-3A9A48674254} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {57E9A58F-005D-48F2-A15F-4501F42F4D35} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {B6009B23-2F67-479A-8C07-3D5D931B3AC3} diff --git a/sdk/src/Services/ElasticLoadBalancing/Generated/AmazonElasticLoadBalancingConfig.cs b/sdk/src/Services/ElasticLoadBalancing/Generated/AmazonElasticLoadBalancingConfig.cs index dd7d300d3ed4..5fdf5e89db52 100644 --- a/sdk/src/Services/ElasticLoadBalancing/Generated/AmazonElasticLoadBalancingConfig.cs +++ b/sdk/src/Services/ElasticLoadBalancing/Generated/AmazonElasticLoadBalancingConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.ElasticLoadBalancing public partial class AmazonElasticLoadBalancingConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("Elastic Load Balancing", "4.0.0.0"); private static readonly AmazonElasticLoadBalancingEndpointResolver EndpointResolver = new AmazonElasticLoadBalancingEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("Elastic Load Balancing", "3.7.401.24"); -======= - InternalSDKUtils.BuildUserAgentString("Elastic Load Balancing", "3.7.401.51"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/ElasticLoadBalancing/Properties/AssemblyInfo.cs b/sdk/src/Services/ElasticLoadBalancing/Properties/AssemblyInfo.cs index a11efc6f9cfa..a5e5d1c5c82e 100644 --- a/sdk/src/Services/ElasticLoadBalancing/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/ElasticLoadBalancing/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.24")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.51")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/ElasticLoadBalancingV2/ElasticLoadBalancingV2.sln b/sdk/src/Services/ElasticLoadBalancingV2/ElasticLoadBalancingV2.sln index 04cd872819ef..47d31a019443 100644 --- a/sdk/src/Services/ElasticLoadBalancingV2/ElasticLoadBalancingV2.sln +++ b/sdk/src/Services/ElasticLoadBalancingV2/ElasticLoadBalancingV2.sln @@ -92,7 +92,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {CD1F3AA6-81AA-4FF0-BD2F-409391BD84EA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {CD1F3AA6-81AA-4FF0-BD2F-409391BD84EA}.Debug|Any CPU.Build.0 = Debug|Any CPU {CD1F3AA6-81AA-4FF0-BD2F-409391BD84EA}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -113,97 +120,6 @@ Global {227385E8-04FA-4F5B-BE89-B77E3C04F6BE}.Debug|Any CPU.Build.0 = Debug|Any CPU {227385E8-04FA-4F5B-BE89-B77E3C04F6BE}.Release|Any CPU.ActiveCfg = Release|Any CPU {227385E8-04FA-4F5B-BE89-B77E3C04F6BE}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {82BA42EE-477D-41D2-B03F-D25945586F4D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {82BA42EE-477D-41D2-B03F-D25945586F4D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {82BA42EE-477D-41D2-B03F-D25945586F4D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {82BA42EE-477D-41D2-B03F-D25945586F4D}.Release|Any CPU.Build.0 = Release|Any CPU - {4926302B-777A-44F8-96A6-664097B34C2F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4926302B-777A-44F8-96A6-664097B34C2F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4926302B-777A-44F8-96A6-664097B34C2F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4926302B-777A-44F8-96A6-664097B34C2F}.Release|Any CPU.Build.0 = Release|Any CPU - {A2292ACD-3361-48EE-BD39-CCF178FF8441}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A2292ACD-3361-48EE-BD39-CCF178FF8441}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A2292ACD-3361-48EE-BD39-CCF178FF8441}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A2292ACD-3361-48EE-BD39-CCF178FF8441}.Release|Any CPU.Build.0 = Release|Any CPU - {03BBE447-4AE8-447F-84E3-08DF950AFF98}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {03BBE447-4AE8-447F-84E3-08DF950AFF98}.Debug|Any CPU.Build.0 = Debug|Any CPU - {03BBE447-4AE8-447F-84E3-08DF950AFF98}.Release|Any CPU.ActiveCfg = Release|Any CPU - {03BBE447-4AE8-447F-84E3-08DF950AFF98}.Release|Any CPU.Build.0 = Release|Any CPU - {B939C27F-42F1-4317-91FA-3EB9FDB05788}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B939C27F-42F1-4317-91FA-3EB9FDB05788}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B939C27F-42F1-4317-91FA-3EB9FDB05788}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B939C27F-42F1-4317-91FA-3EB9FDB05788}.Release|Any CPU.Build.0 = Release|Any CPU - {C897B9F7-E7C2-42B9-826D-A9B3EAE32811}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C897B9F7-E7C2-42B9-826D-A9B3EAE32811}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C897B9F7-E7C2-42B9-826D-A9B3EAE32811}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C897B9F7-E7C2-42B9-826D-A9B3EAE32811}.Release|Any CPU.Build.0 = Release|Any CPU - {D981294D-2D30-4AEE-B922-36C40E068F3B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D981294D-2D30-4AEE-B922-36C40E068F3B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D981294D-2D30-4AEE-B922-36C40E068F3B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D981294D-2D30-4AEE-B922-36C40E068F3B}.Release|Any CPU.Build.0 = Release|Any CPU - {ADD82A46-4F5B-4EEB-BA43-712CB3BE9DA0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {ADD82A46-4F5B-4EEB-BA43-712CB3BE9DA0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {ADD82A46-4F5B-4EEB-BA43-712CB3BE9DA0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {ADD82A46-4F5B-4EEB-BA43-712CB3BE9DA0}.Release|Any CPU.Build.0 = Release|Any CPU - {2C0E6869-EA03-4AD3-954E-9DB9010794EA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2C0E6869-EA03-4AD3-954E-9DB9010794EA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2C0E6869-EA03-4AD3-954E-9DB9010794EA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2C0E6869-EA03-4AD3-954E-9DB9010794EA}.Release|Any CPU.Build.0 = Release|Any CPU - {EE3D62DF-F407-4C86-BC53-F64B9F682251}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EE3D62DF-F407-4C86-BC53-F64B9F682251}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EE3D62DF-F407-4C86-BC53-F64B9F682251}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EE3D62DF-F407-4C86-BC53-F64B9F682251}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {82BA42EE-477D-41D2-B03F-D25945586F4D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {82BA42EE-477D-41D2-B03F-D25945586F4D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {82BA42EE-477D-41D2-B03F-D25945586F4D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {82BA42EE-477D-41D2-B03F-D25945586F4D}.Release|Any CPU.Build.0 = Release|Any CPU - {4926302B-777A-44F8-96A6-664097B34C2F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4926302B-777A-44F8-96A6-664097B34C2F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4926302B-777A-44F8-96A6-664097B34C2F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4926302B-777A-44F8-96A6-664097B34C2F}.Release|Any CPU.Build.0 = Release|Any CPU - {A2292ACD-3361-48EE-BD39-CCF178FF8441}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A2292ACD-3361-48EE-BD39-CCF178FF8441}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A2292ACD-3361-48EE-BD39-CCF178FF8441}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A2292ACD-3361-48EE-BD39-CCF178FF8441}.Release|Any CPU.Build.0 = Release|Any CPU - {03BBE447-4AE8-447F-84E3-08DF950AFF98}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {03BBE447-4AE8-447F-84E3-08DF950AFF98}.Debug|Any CPU.Build.0 = Debug|Any CPU - {03BBE447-4AE8-447F-84E3-08DF950AFF98}.Release|Any CPU.ActiveCfg = Release|Any CPU - {03BBE447-4AE8-447F-84E3-08DF950AFF98}.Release|Any CPU.Build.0 = Release|Any CPU - {B939C27F-42F1-4317-91FA-3EB9FDB05788}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B939C27F-42F1-4317-91FA-3EB9FDB05788}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B939C27F-42F1-4317-91FA-3EB9FDB05788}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B939C27F-42F1-4317-91FA-3EB9FDB05788}.Release|Any CPU.Build.0 = Release|Any CPU - {C897B9F7-E7C2-42B9-826D-A9B3EAE32811}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C897B9F7-E7C2-42B9-826D-A9B3EAE32811}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C897B9F7-E7C2-42B9-826D-A9B3EAE32811}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C897B9F7-E7C2-42B9-826D-A9B3EAE32811}.Release|Any CPU.Build.0 = Release|Any CPU - {D981294D-2D30-4AEE-B922-36C40E068F3B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D981294D-2D30-4AEE-B922-36C40E068F3B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D981294D-2D30-4AEE-B922-36C40E068F3B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D981294D-2D30-4AEE-B922-36C40E068F3B}.Release|Any CPU.Build.0 = Release|Any CPU - {ADD82A46-4F5B-4EEB-BA43-712CB3BE9DA0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {ADD82A46-4F5B-4EEB-BA43-712CB3BE9DA0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {ADD82A46-4F5B-4EEB-BA43-712CB3BE9DA0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {ADD82A46-4F5B-4EEB-BA43-712CB3BE9DA0}.Release|Any CPU.Build.0 = Release|Any CPU - {2C0E6869-EA03-4AD3-954E-9DB9010794EA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2C0E6869-EA03-4AD3-954E-9DB9010794EA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2C0E6869-EA03-4AD3-954E-9DB9010794EA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2C0E6869-EA03-4AD3-954E-9DB9010794EA}.Release|Any CPU.Build.0 = Release|Any CPU - {EE3D62DF-F407-4C86-BC53-F64B9F682251}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EE3D62DF-F407-4C86-BC53-F64B9F682251}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EE3D62DF-F407-4C86-BC53-F64B9F682251}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EE3D62DF-F407-4C86-BC53-F64B9F682251}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -220,37 +136,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {CD1F3AA6-81AA-4FF0-BD2F-409391BD84EA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {DF0B024B-3478-4DD9-B7E8-0BA510939B1A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {25383550-86FA-49C8-AD9F-903664017B24} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {76D00CE2-03BD-483A-BAC8-66467AEC69B2} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {227385E8-04FA-4F5B-BE89-B77E3C04F6BE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {82BA42EE-477D-41D2-B03F-D25945586F4D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4926302B-777A-44F8-96A6-664097B34C2F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A2292ACD-3361-48EE-BD39-CCF178FF8441} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {03BBE447-4AE8-447F-84E3-08DF950AFF98} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B939C27F-42F1-4317-91FA-3EB9FDB05788} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C897B9F7-E7C2-42B9-826D-A9B3EAE32811} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D981294D-2D30-4AEE-B922-36C40E068F3B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {ADD82A46-4F5B-4EEB-BA43-712CB3BE9DA0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {2C0E6869-EA03-4AD3-954E-9DB9010794EA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {EE3D62DF-F407-4C86-BC53-F64B9F682251} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {82BA42EE-477D-41D2-B03F-D25945586F4D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4926302B-777A-44F8-96A6-664097B34C2F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A2292ACD-3361-48EE-BD39-CCF178FF8441} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {03BBE447-4AE8-447F-84E3-08DF950AFF98} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B939C27F-42F1-4317-91FA-3EB9FDB05788} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C897B9F7-E7C2-42B9-826D-A9B3EAE32811} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D981294D-2D30-4AEE-B922-36C40E068F3B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {ADD82A46-4F5B-4EEB-BA43-712CB3BE9DA0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {2C0E6869-EA03-4AD3-954E-9DB9010794EA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {EE3D62DF-F407-4C86-BC53-F64B9F682251} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {64230406-344C-450E-8AEA-F160F6114BB4} diff --git a/sdk/src/Services/ElasticLoadBalancingV2/Generated/AmazonElasticLoadBalancingV2Config.cs b/sdk/src/Services/ElasticLoadBalancingV2/Generated/AmazonElasticLoadBalancingV2Config.cs index d0753fac6f73..26af6b0522ac 100644 --- a/sdk/src/Services/ElasticLoadBalancingV2/Generated/AmazonElasticLoadBalancingV2Config.cs +++ b/sdk/src/Services/ElasticLoadBalancingV2/Generated/AmazonElasticLoadBalancingV2Config.cs @@ -34,16 +34,10 @@ namespace Amazon.ElasticLoadBalancingV2 public partial class AmazonElasticLoadBalancingV2Config : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("Elastic Load Balancing v2", "4.0.0.0"); private static readonly AmazonElasticLoadBalancingV2EndpointResolver EndpointResolver = new AmazonElasticLoadBalancingV2EndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("Elastic Load Balancing v2", "3.7.404.7"); -======= - InternalSDKUtils.BuildUserAgentString("Elastic Load Balancing v2", "3.7.406.9"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/ElasticLoadBalancingV2/Generated/Model/Internal/MarshallTransformations/CreateLoadBalancerRequestMarshaller.cs b/sdk/src/Services/ElasticLoadBalancingV2/Generated/Model/Internal/MarshallTransformations/CreateLoadBalancerRequestMarshaller.cs index e70d8c736cea..9ede4d7af288 100644 --- a/sdk/src/Services/ElasticLoadBalancingV2/Generated/Model/Internal/MarshallTransformations/CreateLoadBalancerRequestMarshaller.cs +++ b/sdk/src/Services/ElasticLoadBalancingV2/Generated/Model/Internal/MarshallTransformations/CreateLoadBalancerRequestMarshaller.cs @@ -99,7 +99,6 @@ public IRequest Marshall(CreateLoadBalancerRequest publicRequest) request.Parameters.Add("SubnetMappings", ""); else { -<<<<<<< HEAD int publicRequestlistValueIndex = 1; foreach(var publicRequestlistValue in publicRequest.SubnetMappings) { @@ -115,53 +114,16 @@ public IRequest Marshall(CreateLoadBalancerRequest publicRequest) { request.Parameters.Add("SubnetMappings" + "." + "member" + "." + publicRequestlistValueIndex + "." + "PrivateIPv4Address", StringUtils.FromString(publicRequestlistValue.PrivateIPv4Address)); } + if(publicRequestlistValue.IsSetSourceNatIpv6Prefix()) + { + request.Parameters.Add("SubnetMappings" + "." + "member" + "." + publicRequestlistValueIndex + "." + "SourceNatIpv6Prefix", StringUtils.FromString(publicRequestlistValue.SourceNatIpv6Prefix)); + } if(publicRequestlistValue.IsSetSubnetId()) { request.Parameters.Add("SubnetMappings" + "." + "member" + "." + publicRequestlistValueIndex + "." + "SubnetId", StringUtils.FromString(publicRequestlistValue.SubnetId)); } publicRequestlistValueIndex++; } -||||||| Commit version number update changes - if(publicRequestlistValue.IsSetAllocationId()) - { - request.Parameters.Add("SubnetMappings" + "." + "member" + "." + publicRequestlistValueIndex + "." + "AllocationId", StringUtils.FromString(publicRequestlistValue.AllocationId)); - } - if(publicRequestlistValue.IsSetIPv6Address()) - { - request.Parameters.Add("SubnetMappings" + "." + "member" + "." + publicRequestlistValueIndex + "." + "IPv6Address", StringUtils.FromString(publicRequestlistValue.IPv6Address)); - } - if(publicRequestlistValue.IsSetPrivateIPv4Address()) - { - request.Parameters.Add("SubnetMappings" + "." + "member" + "." + publicRequestlistValueIndex + "." + "PrivateIPv4Address", StringUtils.FromString(publicRequestlistValue.PrivateIPv4Address)); - } - if(publicRequestlistValue.IsSetSubnetId()) - { - request.Parameters.Add("SubnetMappings" + "." + "member" + "." + publicRequestlistValueIndex + "." + "SubnetId", StringUtils.FromString(publicRequestlistValue.SubnetId)); - } - publicRequestlistValueIndex++; -======= - if(publicRequestlistValue.IsSetAllocationId()) - { - request.Parameters.Add("SubnetMappings" + "." + "member" + "." + publicRequestlistValueIndex + "." + "AllocationId", StringUtils.FromString(publicRequestlistValue.AllocationId)); - } - if(publicRequestlistValue.IsSetIPv6Address()) - { - request.Parameters.Add("SubnetMappings" + "." + "member" + "." + publicRequestlistValueIndex + "." + "IPv6Address", StringUtils.FromString(publicRequestlistValue.IPv6Address)); - } - if(publicRequestlistValue.IsSetPrivateIPv4Address()) - { - request.Parameters.Add("SubnetMappings" + "." + "member" + "." + publicRequestlistValueIndex + "." + "PrivateIPv4Address", StringUtils.FromString(publicRequestlistValue.PrivateIPv4Address)); - } - if(publicRequestlistValue.IsSetSourceNatIpv6Prefix()) - { - request.Parameters.Add("SubnetMappings" + "." + "member" + "." + publicRequestlistValueIndex + "." + "SourceNatIpv6Prefix", StringUtils.FromString(publicRequestlistValue.SourceNatIpv6Prefix)); - } - if(publicRequestlistValue.IsSetSubnetId()) - { - request.Parameters.Add("SubnetMappings" + "." + "member" + "." + publicRequestlistValueIndex + "." + "SubnetId", StringUtils.FromString(publicRequestlistValue.SubnetId)); - } - publicRequestlistValueIndex++; ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b } } if(publicRequest.IsSetSubnets()) diff --git a/sdk/src/Services/ElasticLoadBalancingV2/Generated/Model/Internal/MarshallTransformations/SetSubnetsRequestMarshaller.cs b/sdk/src/Services/ElasticLoadBalancingV2/Generated/Model/Internal/MarshallTransformations/SetSubnetsRequestMarshaller.cs index a826228661f9..3c7bb8510e6b 100644 --- a/sdk/src/Services/ElasticLoadBalancingV2/Generated/Model/Internal/MarshallTransformations/SetSubnetsRequestMarshaller.cs +++ b/sdk/src/Services/ElasticLoadBalancingV2/Generated/Model/Internal/MarshallTransformations/SetSubnetsRequestMarshaller.cs @@ -77,7 +77,6 @@ public IRequest Marshall(SetSubnetsRequest publicRequest) request.Parameters.Add("SubnetMappings", ""); else { -<<<<<<< HEAD int publicRequestlistValueIndex = 1; foreach(var publicRequestlistValue in publicRequest.SubnetMappings) { @@ -93,53 +92,16 @@ public IRequest Marshall(SetSubnetsRequest publicRequest) { request.Parameters.Add("SubnetMappings" + "." + "member" + "." + publicRequestlistValueIndex + "." + "PrivateIPv4Address", StringUtils.FromString(publicRequestlistValue.PrivateIPv4Address)); } + if(publicRequestlistValue.IsSetSourceNatIpv6Prefix()) + { + request.Parameters.Add("SubnetMappings" + "." + "member" + "." + publicRequestlistValueIndex + "." + "SourceNatIpv6Prefix", StringUtils.FromString(publicRequestlistValue.SourceNatIpv6Prefix)); + } if(publicRequestlistValue.IsSetSubnetId()) { request.Parameters.Add("SubnetMappings" + "." + "member" + "." + publicRequestlistValueIndex + "." + "SubnetId", StringUtils.FromString(publicRequestlistValue.SubnetId)); } publicRequestlistValueIndex++; } -||||||| Commit version number update changes - if(publicRequestlistValue.IsSetAllocationId()) - { - request.Parameters.Add("SubnetMappings" + "." + "member" + "." + publicRequestlistValueIndex + "." + "AllocationId", StringUtils.FromString(publicRequestlistValue.AllocationId)); - } - if(publicRequestlistValue.IsSetIPv6Address()) - { - request.Parameters.Add("SubnetMappings" + "." + "member" + "." + publicRequestlistValueIndex + "." + "IPv6Address", StringUtils.FromString(publicRequestlistValue.IPv6Address)); - } - if(publicRequestlistValue.IsSetPrivateIPv4Address()) - { - request.Parameters.Add("SubnetMappings" + "." + "member" + "." + publicRequestlistValueIndex + "." + "PrivateIPv4Address", StringUtils.FromString(publicRequestlistValue.PrivateIPv4Address)); - } - if(publicRequestlistValue.IsSetSubnetId()) - { - request.Parameters.Add("SubnetMappings" + "." + "member" + "." + publicRequestlistValueIndex + "." + "SubnetId", StringUtils.FromString(publicRequestlistValue.SubnetId)); - } - publicRequestlistValueIndex++; -======= - if(publicRequestlistValue.IsSetAllocationId()) - { - request.Parameters.Add("SubnetMappings" + "." + "member" + "." + publicRequestlistValueIndex + "." + "AllocationId", StringUtils.FromString(publicRequestlistValue.AllocationId)); - } - if(publicRequestlistValue.IsSetIPv6Address()) - { - request.Parameters.Add("SubnetMappings" + "." + "member" + "." + publicRequestlistValueIndex + "." + "IPv6Address", StringUtils.FromString(publicRequestlistValue.IPv6Address)); - } - if(publicRequestlistValue.IsSetPrivateIPv4Address()) - { - request.Parameters.Add("SubnetMappings" + "." + "member" + "." + publicRequestlistValueIndex + "." + "PrivateIPv4Address", StringUtils.FromString(publicRequestlistValue.PrivateIPv4Address)); - } - if(publicRequestlistValue.IsSetSourceNatIpv6Prefix()) - { - request.Parameters.Add("SubnetMappings" + "." + "member" + "." + publicRequestlistValueIndex + "." + "SourceNatIpv6Prefix", StringUtils.FromString(publicRequestlistValue.SourceNatIpv6Prefix)); - } - if(publicRequestlistValue.IsSetSubnetId()) - { - request.Parameters.Add("SubnetMappings" + "." + "member" + "." + publicRequestlistValueIndex + "." + "SubnetId", StringUtils.FromString(publicRequestlistValue.SubnetId)); - } - publicRequestlistValueIndex++; ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b } } if(publicRequest.IsSetSubnets()) diff --git a/sdk/src/Services/ElasticLoadBalancingV2/Generated/_bcl/AmazonElasticLoadBalancingV2Client.cs b/sdk/src/Services/ElasticLoadBalancingV2/Generated/_bcl/AmazonElasticLoadBalancingV2Client.cs index 91d1d0c1f009..b2006027397a 100644 --- a/sdk/src/Services/ElasticLoadBalancingV2/Generated/_bcl/AmazonElasticLoadBalancingV2Client.cs +++ b/sdk/src/Services/ElasticLoadBalancingV2/Generated/_bcl/AmazonElasticLoadBalancingV2Client.cs @@ -1524,7 +1524,7 @@ public virtual DeleteRuleResponse DeleteRule(DeleteRuleRequest request) /// /// The response from the DeleteSharedTrustStoreAssociation service method, as returned by ElasticLoadBalancingV2. /// - /// The specified association cannot be within the same account. + /// The specified association can't be within the same account. /// /// /// The specified association does not exist. @@ -1553,7 +1553,7 @@ public virtual DeleteSharedTrustStoreAssociationResponse DeleteSharedTrustStoreA /// /// The response from the DeleteSharedTrustStoreAssociation service method, as returned by ElasticLoadBalancingV2. /// - /// The specified association cannot be within the same account. + /// The specified association can't be within the same account. /// /// /// The specified association does not exist. @@ -3563,7 +3563,7 @@ public virtual ModifyTrustStoreResponse ModifyTrustStore(ModifyTrustStoreRequest /// /// /// - /// With a Network Load Balancer, you cannot register instances by instance ID if they + /// With a Network Load Balancer, you can't register instances by instance ID if they /// have the following instance types: C1, CC1, CC2, CG1, CG2, CR1, CS1, G1, G2, HI1, /// HS1, M1, M2, M3, and T1. You can register instances of these types by IP address. /// @@ -3613,7 +3613,7 @@ public virtual RegisterTargetsResponse RegisterTargets(RegisterTargetsRequest re /// /// /// - /// With a Network Load Balancer, you cannot register instances by instance ID if they + /// With a Network Load Balancer, you can't register instances by instance ID if they /// have the following instance types: C1, CC1, CC2, CG1, CG2, CR1, CS1, G1, G2, HI1, /// HS1, M1, M2, M3, and T1. You can register instances of these types by IP address. /// diff --git a/sdk/src/Services/ElasticLoadBalancingV2/Properties/AssemblyInfo.cs b/sdk/src/Services/ElasticLoadBalancingV2/Properties/AssemblyInfo.cs index c68e50e2701a..d24dee94ee6e 100644 --- a/sdk/src/Services/ElasticLoadBalancingV2/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/ElasticLoadBalancingV2/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.404.7")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.406.9")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/ElasticMapReduce/ElasticMapReduce.sln b/sdk/src/Services/ElasticMapReduce/ElasticMapReduce.sln index 44d83d201bdf..c54f0d27714b 100644 --- a/sdk/src/Services/ElasticMapReduce/ElasticMapReduce.sln +++ b/sdk/src/Services/ElasticMapReduce/ElasticMapReduce.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {AB26ECED-1AB5-41D6-B78A-C208A402CEAF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {AB26ECED-1AB5-41D6-B78A-C208A402CEAF}.Debug|Any CPU.Build.0 = Debug|Any CPU {AB26ECED-1AB5-41D6-B78A-C208A402CEAF}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {B692BDBF-EAF7-43AF-849B-473725CF93E0}.Debug|Any CPU.Build.0 = Debug|Any CPU {B692BDBF-EAF7-43AF-849B-473725CF93E0}.Release|Any CPU.ActiveCfg = Release|Any CPU {B692BDBF-EAF7-43AF-849B-473725CF93E0}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {E3DA7833-7A03-4639-96DC-4E29E1FE12AC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E3DA7833-7A03-4639-96DC-4E29E1FE12AC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E3DA7833-7A03-4639-96DC-4E29E1FE12AC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E3DA7833-7A03-4639-96DC-4E29E1FE12AC}.Release|Any CPU.Build.0 = Release|Any CPU - {0DEF3393-A7A9-4F13-9DD9-90B94D06A1E2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0DEF3393-A7A9-4F13-9DD9-90B94D06A1E2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0DEF3393-A7A9-4F13-9DD9-90B94D06A1E2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0DEF3393-A7A9-4F13-9DD9-90B94D06A1E2}.Release|Any CPU.Build.0 = Release|Any CPU - {2929A446-E881-4750-8A7B-1F84FA505B78}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2929A446-E881-4750-8A7B-1F84FA505B78}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2929A446-E881-4750-8A7B-1F84FA505B78}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2929A446-E881-4750-8A7B-1F84FA505B78}.Release|Any CPU.Build.0 = Release|Any CPU - {01AB50AB-2BF7-4887-85BE-F2A635D31388}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {01AB50AB-2BF7-4887-85BE-F2A635D31388}.Debug|Any CPU.Build.0 = Debug|Any CPU - {01AB50AB-2BF7-4887-85BE-F2A635D31388}.Release|Any CPU.ActiveCfg = Release|Any CPU - {01AB50AB-2BF7-4887-85BE-F2A635D31388}.Release|Any CPU.Build.0 = Release|Any CPU - {D827E63F-CF9A-49AD-85A7-2CA0EA55AE71}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D827E63F-CF9A-49AD-85A7-2CA0EA55AE71}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D827E63F-CF9A-49AD-85A7-2CA0EA55AE71}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D827E63F-CF9A-49AD-85A7-2CA0EA55AE71}.Release|Any CPU.Build.0 = Release|Any CPU - {68672CE5-7B94-498C-9157-015974D534B5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {68672CE5-7B94-498C-9157-015974D534B5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {68672CE5-7B94-498C-9157-015974D534B5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {68672CE5-7B94-498C-9157-015974D534B5}.Release|Any CPU.Build.0 = Release|Any CPU - {1EAB5ADE-2AB8-4718-ABF8-DD92C0CD3500}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1EAB5ADE-2AB8-4718-ABF8-DD92C0CD3500}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1EAB5ADE-2AB8-4718-ABF8-DD92C0CD3500}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1EAB5ADE-2AB8-4718-ABF8-DD92C0CD3500}.Release|Any CPU.Build.0 = Release|Any CPU - {E6F84FBF-CE9A-4B0E-ADFE-3D3607A72004}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E6F84FBF-CE9A-4B0E-ADFE-3D3607A72004}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E6F84FBF-CE9A-4B0E-ADFE-3D3607A72004}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E6F84FBF-CE9A-4B0E-ADFE-3D3607A72004}.Release|Any CPU.Build.0 = Release|Any CPU - {0C8E606D-66A8-404C-B1D7-04A023FDD8A9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0C8E606D-66A8-404C-B1D7-04A023FDD8A9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0C8E606D-66A8-404C-B1D7-04A023FDD8A9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0C8E606D-66A8-404C-B1D7-04A023FDD8A9}.Release|Any CPU.Build.0 = Release|Any CPU - {0E168D30-8B73-4728-8ECC-18658C820ED4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0E168D30-8B73-4728-8ECC-18658C820ED4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0E168D30-8B73-4728-8ECC-18658C820ED4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0E168D30-8B73-4728-8ECC-18658C820ED4}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {E3DA7833-7A03-4639-96DC-4E29E1FE12AC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E3DA7833-7A03-4639-96DC-4E29E1FE12AC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E3DA7833-7A03-4639-96DC-4E29E1FE12AC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E3DA7833-7A03-4639-96DC-4E29E1FE12AC}.Release|Any CPU.Build.0 = Release|Any CPU - {0DEF3393-A7A9-4F13-9DD9-90B94D06A1E2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0DEF3393-A7A9-4F13-9DD9-90B94D06A1E2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0DEF3393-A7A9-4F13-9DD9-90B94D06A1E2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0DEF3393-A7A9-4F13-9DD9-90B94D06A1E2}.Release|Any CPU.Build.0 = Release|Any CPU - {2929A446-E881-4750-8A7B-1F84FA505B78}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2929A446-E881-4750-8A7B-1F84FA505B78}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2929A446-E881-4750-8A7B-1F84FA505B78}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2929A446-E881-4750-8A7B-1F84FA505B78}.Release|Any CPU.Build.0 = Release|Any CPU - {01AB50AB-2BF7-4887-85BE-F2A635D31388}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {01AB50AB-2BF7-4887-85BE-F2A635D31388}.Debug|Any CPU.Build.0 = Debug|Any CPU - {01AB50AB-2BF7-4887-85BE-F2A635D31388}.Release|Any CPU.ActiveCfg = Release|Any CPU - {01AB50AB-2BF7-4887-85BE-F2A635D31388}.Release|Any CPU.Build.0 = Release|Any CPU - {D827E63F-CF9A-49AD-85A7-2CA0EA55AE71}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D827E63F-CF9A-49AD-85A7-2CA0EA55AE71}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D827E63F-CF9A-49AD-85A7-2CA0EA55AE71}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D827E63F-CF9A-49AD-85A7-2CA0EA55AE71}.Release|Any CPU.Build.0 = Release|Any CPU - {68672CE5-7B94-498C-9157-015974D534B5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {68672CE5-7B94-498C-9157-015974D534B5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {68672CE5-7B94-498C-9157-015974D534B5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {68672CE5-7B94-498C-9157-015974D534B5}.Release|Any CPU.Build.0 = Release|Any CPU - {1EAB5ADE-2AB8-4718-ABF8-DD92C0CD3500}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1EAB5ADE-2AB8-4718-ABF8-DD92C0CD3500}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1EAB5ADE-2AB8-4718-ABF8-DD92C0CD3500}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1EAB5ADE-2AB8-4718-ABF8-DD92C0CD3500}.Release|Any CPU.Build.0 = Release|Any CPU - {E6F84FBF-CE9A-4B0E-ADFE-3D3607A72004}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E6F84FBF-CE9A-4B0E-ADFE-3D3607A72004}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E6F84FBF-CE9A-4B0E-ADFE-3D3607A72004}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E6F84FBF-CE9A-4B0E-ADFE-3D3607A72004}.Release|Any CPU.Build.0 = Release|Any CPU - {0C8E606D-66A8-404C-B1D7-04A023FDD8A9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0C8E606D-66A8-404C-B1D7-04A023FDD8A9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0C8E606D-66A8-404C-B1D7-04A023FDD8A9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0C8E606D-66A8-404C-B1D7-04A023FDD8A9}.Release|Any CPU.Build.0 = Release|Any CPU - {0E168D30-8B73-4728-8ECC-18658C820ED4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0E168D30-8B73-4728-8ECC-18658C820ED4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0E168D30-8B73-4728-8ECC-18658C820ED4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0E168D30-8B73-4728-8ECC-18658C820ED4}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {AB26ECED-1AB5-41D6-B78A-C208A402CEAF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {30F2451F-B7ED-4396-B95D-1FF37F82BB70} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {5B6E9689-F04E-4A4D-A352-C49FB5B10A61} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {B62FBA28-55E2-4D56-9D3F-AD3B78BFFDBD} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {B692BDBF-EAF7-43AF-849B-473725CF93E0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {E3DA7833-7A03-4639-96DC-4E29E1FE12AC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0DEF3393-A7A9-4F13-9DD9-90B94D06A1E2} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {2929A446-E881-4750-8A7B-1F84FA505B78} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {01AB50AB-2BF7-4887-85BE-F2A635D31388} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D827E63F-CF9A-49AD-85A7-2CA0EA55AE71} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {68672CE5-7B94-498C-9157-015974D534B5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {1EAB5ADE-2AB8-4718-ABF8-DD92C0CD3500} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E6F84FBF-CE9A-4B0E-ADFE-3D3607A72004} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0C8E606D-66A8-404C-B1D7-04A023FDD8A9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0E168D30-8B73-4728-8ECC-18658C820ED4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {E3DA7833-7A03-4639-96DC-4E29E1FE12AC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0DEF3393-A7A9-4F13-9DD9-90B94D06A1E2} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {2929A446-E881-4750-8A7B-1F84FA505B78} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {01AB50AB-2BF7-4887-85BE-F2A635D31388} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D827E63F-CF9A-49AD-85A7-2CA0EA55AE71} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {68672CE5-7B94-498C-9157-015974D534B5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {1EAB5ADE-2AB8-4718-ABF8-DD92C0CD3500} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E6F84FBF-CE9A-4B0E-ADFE-3D3607A72004} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0C8E606D-66A8-404C-B1D7-04A023FDD8A9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0E168D30-8B73-4728-8ECC-18658C820ED4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {04B5E167-65F6-4A91-8851-4F97B90367E1} diff --git a/sdk/src/Services/ElasticMapReduce/Generated/AmazonElasticMapReduceConfig.cs b/sdk/src/Services/ElasticMapReduce/Generated/AmazonElasticMapReduceConfig.cs index c2b116466d56..61ce719c9768 100644 --- a/sdk/src/Services/ElasticMapReduce/Generated/AmazonElasticMapReduceConfig.cs +++ b/sdk/src/Services/ElasticMapReduce/Generated/AmazonElasticMapReduceConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.ElasticMapReduce public partial class AmazonElasticMapReduceConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("EMR", "4.0.0.0"); private static readonly AmazonElasticMapReduceEndpointResolver EndpointResolver = new AmazonElasticMapReduceEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("EMR", "3.7.401.7"); -======= - InternalSDKUtils.BuildUserAgentString("EMR", "3.7.402.20"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/ElasticMapReduce/Properties/AssemblyInfo.cs b/sdk/src/Services/ElasticMapReduce/Properties/AssemblyInfo.cs index 148dee1fde37..0b5a7dfcc5af 100644 --- a/sdk/src/Services/ElasticMapReduce/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/ElasticMapReduce/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.7")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.402.20")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/ElasticTranscoder/ElasticTranscoder.sln b/sdk/src/Services/ElasticTranscoder/ElasticTranscoder.sln index 6dda37a07bae..6adb4bd08872 100644 --- a/sdk/src/Services/ElasticTranscoder/ElasticTranscoder.sln +++ b/sdk/src/Services/ElasticTranscoder/ElasticTranscoder.sln @@ -18,23 +18,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.ElasticTranscoder.Ne EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Test", "Test", "{12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B}" EndProject -<<<<<<< HEAD -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.IntegrationTests.ElasticTranscoder.NetFramework", "../../../test/Services/ElasticTranscoder/IntegrationTests/AWSSDK.IntegrationTests.ElasticTranscoder.NetFramework.csproj", "{BB5DEDEE-13EC-4C9D-A182-E78D4EA56495}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.UnitTests.ElasticTranscoder.NetFramework", "../../../test/Services/ElasticTranscoder/UnitTests/AWSSDK.UnitTests.ElasticTranscoder.NetFramework.csproj", "{4E1EE2D1-4EFE-4F99-845C-7EBEE1F4E682}" -||||||| Commit version number update changes -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.IntegrationTests.ElasticTranscoder.Net35", "../../../test/Services/ElasticTranscoder/IntegrationTests/AWSSDK.IntegrationTests.ElasticTranscoder.Net35.csproj", "{A1B68941-7722-42BB-91DC-0D558278A69E}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.IntegrationTests.ElasticTranscoder.Net45", "../../../test/Services/ElasticTranscoder/IntegrationTests/AWSSDK.IntegrationTests.ElasticTranscoder.Net45.csproj", "{9AF08228-52E7-4767-812C-981BD3210994}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.UnitTests.ElasticTranscoder.Net35", "../../../test/Services/ElasticTranscoder/UnitTests/AWSSDK.UnitTests.ElasticTranscoder.Net35.csproj", "{25BA0C39-A22D-4E41-B92A-E589F4CE8E2E}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.UnitTests.ElasticTranscoder.Net45", "../../../test/Services/ElasticTranscoder/UnitTests/AWSSDK.UnitTests.ElasticTranscoder.Net45.csproj", "{C43D9ED1-7FB1-4ADD-A329-0BC935A1441D}" -======= -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.UnitTests.ElasticTranscoder.Net35", "../../../test/Services/ElasticTranscoder/UnitTests/AWSSDK.UnitTests.ElasticTranscoder.Net35.csproj", "{25BA0C39-A22D-4E41-B92A-E589F4CE8E2E}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.UnitTests.ElasticTranscoder.Net45", "../../../test/Services/ElasticTranscoder/UnitTests/AWSSDK.UnitTests.ElasticTranscoder.Net45.csproj", "{C43D9ED1-7FB1-4ADD-A329-0BC935A1441D}" ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ServiceClientGeneratorLib", "../../../../generator/ServiceClientGeneratorLib/ServiceClientGeneratorLib.csproj", "{7BEE7C44-BE12-43CC-AFB9-B5852A1F43C8}" EndProject @@ -46,55 +30,17 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.CommonTest", "../../ EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.CommonTest.NetStandard", "../../../test/NetStandard/Common/AWSSDK.CommonTest.NetStandard.csproj", "{87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}" EndProject -<<<<<<< HEAD -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.S3.NetFramework", "../S3/AWSSDK.S3.NetFramework.csproj", "{660ADD14-9D8C-43FE-9346-D3C29332388E}" -||||||| Commit version number update changes -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.S3.Net35", "../S3/AWSSDK.S3.Net35.csproj", "{43A1B58D-0AA3-4686-BBC3-4748D4E8EE94}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.S3.Net45", "../S3/AWSSDK.S3.Net45.csproj", "{D71DF6F7-0A00-4A3A-BE1C-96541A4635D1}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.Extensions.CrtIntegration.Net35", "../../../../extensions/src/AWSSDK.Extensions.CrtIntegration/AWSSDK.Extensions.CrtIntegration.Net35.csproj", "{946F6289-0D75-4A6C-84E5-EEA626960B6F}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.Extensions.CrtIntegration.Net45", "../../../../extensions/src/AWSSDK.Extensions.CrtIntegration/AWSSDK.Extensions.CrtIntegration.Net45.csproj", "{4F9483C0-BD93-4D86-9533-A3996E6A79A0}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.IdentityManagement.Net35", "../IdentityManagement/AWSSDK.IdentityManagement.Net35.csproj", "{1388C73A-6291-49F2-8A21-34A7282A8D50}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.SecurityToken.Net35", "../SecurityToken/AWSSDK.SecurityToken.Net35.csproj", "{4DB7D94E-04C0-4C4C-AFAE-FC0E179AC698}" -======= Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UnitTests.NetStandard.CoreOnly", "../../../test/NetStandard/UnitTests/UnitTests.NetStandard.CoreOnly.csproj", "{B969DE99-0634-4989-A318-086AE1699974}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "IntegrationTestDependencies", "IntegrationTestDependencies", "{939EC5C2-8345-43E2-8F97-72EEEBEEA0AC}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.Extensions.CrtIntegration.Net35", "../../../../extensions/src/AWSSDK.Extensions.CrtIntegration/AWSSDK.Extensions.CrtIntegration.Net35.csproj", "{946F6289-0D75-4A6C-84E5-EEA626960B6F}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.Extensions.CrtIntegration.Net45", "../../../../extensions/src/AWSSDK.Extensions.CrtIntegration/AWSSDK.Extensions.CrtIntegration.Net45.csproj", "{4F9483C0-BD93-4D86-9533-A3996E6A79A0}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.IdentityManagement.Net35", "../IdentityManagement/AWSSDK.IdentityManagement.Net35.csproj", "{1388C73A-6291-49F2-8A21-34A7282A8D50}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.SecurityToken.Net35", "../SecurityToken/AWSSDK.SecurityToken.Net35.csproj", "{4DB7D94E-04C0-4C4C-AFAE-FC0E179AC698}" ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.Extensions.CrtIntegration.NetFramework", "../../../../extensions/src/AWSSDK.Extensions.CrtIntegration/AWSSDK.Extensions.CrtIntegration.NetFramework.csproj", "{64F4723A-B116-4C65-BD88-A3CFEC7FDBBF}" EndProject -<<<<<<< HEAD Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.IdentityManagement.NetFramework", "../IdentityManagement/AWSSDK.IdentityManagement.NetFramework.csproj", "{2771BF3F-235D-4CB7-B1AB-E2400DFB9AD1}" -||||||| Commit version number update changes -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.IdentityManagement.Net45", "../IdentityManagement/AWSSDK.IdentityManagement.Net45.csproj", "{18739F9B-6DF0-4C7E-BF24-399A66D3A05C}" -======= -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.S3.Net35", "../S3/AWSSDK.S3.Net35.csproj", "{43A1B58D-0AA3-4686-BBC3-4748D4E8EE94}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.IdentityManagement.Net45", "../IdentityManagement/AWSSDK.IdentityManagement.Net45.csproj", "{18739F9B-6DF0-4C7E-BF24-399A66D3A05C}" ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.S3.NetFramework", "../S3/AWSSDK.S3.NetFramework.csproj", "{660ADD14-9D8C-43FE-9346-D3C29332388E}" EndProject -<<<<<<< HEAD Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.SecurityToken.NetFramework", "../SecurityToken/AWSSDK.SecurityToken.NetFramework.csproj", "{C3D4739E-5740-4375-81E2-E59A37DF48B9}" -||||||| Commit version number update changes -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.SecurityToken.Net45", "../SecurityToken/AWSSDK.SecurityToken.Net45.csproj", "{78F2E641-612B-4029-90B9-33B6EF21319A}" -======= -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.S3.Net45", "../S3/AWSSDK.S3.Net45.csproj", "{D71DF6F7-0A00-4A3A-BE1C-96541A4635D1}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.SecurityToken.Net45", "../SecurityToken/AWSSDK.SecurityToken.Net45.csproj", "{78F2E641-612B-4029-90B9-33B6EF21319A}" ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.SimpleNotificationService.NetFramework", "../SimpleNotificationService/AWSSDK.SimpleNotificationService.NetFramework.csproj", "{3D4B640C-35BD-422B-80B0-BAA7DCB73285}" EndProject @@ -120,42 +66,10 @@ Global {09D06DF6-88CD-45C5-BC6F-F0051E82EDC1}.Debug|Any CPU.Build.0 = Debug|Any CPU {09D06DF6-88CD-45C5-BC6F-F0051E82EDC1}.Release|Any CPU.ActiveCfg = Release|Any CPU {09D06DF6-88CD-45C5-BC6F-F0051E82EDC1}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD - {BB5DEDEE-13EC-4C9D-A182-E78D4EA56495}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BB5DEDEE-13EC-4C9D-A182-E78D4EA56495}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BB5DEDEE-13EC-4C9D-A182-E78D4EA56495}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BB5DEDEE-13EC-4C9D-A182-E78D4EA56495}.Release|Any CPU.Build.0 = Release|Any CPU {4E1EE2D1-4EFE-4F99-845C-7EBEE1F4E682}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {4E1EE2D1-4EFE-4F99-845C-7EBEE1F4E682}.Debug|Any CPU.Build.0 = Debug|Any CPU {4E1EE2D1-4EFE-4F99-845C-7EBEE1F4E682}.Release|Any CPU.ActiveCfg = Release|Any CPU {4E1EE2D1-4EFE-4F99-845C-7EBEE1F4E682}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {A1B68941-7722-42BB-91DC-0D558278A69E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A1B68941-7722-42BB-91DC-0D558278A69E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A1B68941-7722-42BB-91DC-0D558278A69E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A1B68941-7722-42BB-91DC-0D558278A69E}.Release|Any CPU.Build.0 = Release|Any CPU - {9AF08228-52E7-4767-812C-981BD3210994}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9AF08228-52E7-4767-812C-981BD3210994}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9AF08228-52E7-4767-812C-981BD3210994}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9AF08228-52E7-4767-812C-981BD3210994}.Release|Any CPU.Build.0 = Release|Any CPU - {25BA0C39-A22D-4E41-B92A-E589F4CE8E2E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {25BA0C39-A22D-4E41-B92A-E589F4CE8E2E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {25BA0C39-A22D-4E41-B92A-E589F4CE8E2E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {25BA0C39-A22D-4E41-B92A-E589F4CE8E2E}.Release|Any CPU.Build.0 = Release|Any CPU - {C43D9ED1-7FB1-4ADD-A329-0BC935A1441D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C43D9ED1-7FB1-4ADD-A329-0BC935A1441D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C43D9ED1-7FB1-4ADD-A329-0BC935A1441D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C43D9ED1-7FB1-4ADD-A329-0BC935A1441D}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {25BA0C39-A22D-4E41-B92A-E589F4CE8E2E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {25BA0C39-A22D-4E41-B92A-E589F4CE8E2E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {25BA0C39-A22D-4E41-B92A-E589F4CE8E2E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {25BA0C39-A22D-4E41-B92A-E589F4CE8E2E}.Release|Any CPU.Build.0 = Release|Any CPU - {C43D9ED1-7FB1-4ADD-A329-0BC935A1441D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C43D9ED1-7FB1-4ADD-A329-0BC935A1441D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C43D9ED1-7FB1-4ADD-A329-0BC935A1441D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C43D9ED1-7FB1-4ADD-A329-0BC935A1441D}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b {7BEE7C44-BE12-43CC-AFB9-B5852A1F43C8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {7BEE7C44-BE12-43CC-AFB9-B5852A1F43C8}.Debug|Any CPU.Build.0 = Debug|Any CPU {7BEE7C44-BE12-43CC-AFB9-B5852A1F43C8}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -172,11 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD - {660ADD14-9D8C-43FE-9346-D3C29332388E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {660ADD14-9D8C-43FE-9346-D3C29332388E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {660ADD14-9D8C-43FE-9346-D3C29332388E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {660ADD14-9D8C-43FE-9346-D3C29332388E}.Release|Any CPU.Build.0 = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {64F4723A-B116-4C65-BD88-A3CFEC7FDBBF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {64F4723A-B116-4C65-BD88-A3CFEC7FDBBF}.Debug|Any CPU.Build.0 = Debug|Any CPU {64F4723A-B116-4C65-BD88-A3CFEC7FDBBF}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -185,6 +102,10 @@ Global {2771BF3F-235D-4CB7-B1AB-E2400DFB9AD1}.Debug|Any CPU.Build.0 = Debug|Any CPU {2771BF3F-235D-4CB7-B1AB-E2400DFB9AD1}.Release|Any CPU.ActiveCfg = Release|Any CPU {2771BF3F-235D-4CB7-B1AB-E2400DFB9AD1}.Release|Any CPU.Build.0 = Release|Any CPU + {660ADD14-9D8C-43FE-9346-D3C29332388E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {660ADD14-9D8C-43FE-9346-D3C29332388E}.Debug|Any CPU.Build.0 = Debug|Any CPU + {660ADD14-9D8C-43FE-9346-D3C29332388E}.Release|Any CPU.ActiveCfg = Release|Any CPU + {660ADD14-9D8C-43FE-9346-D3C29332388E}.Release|Any CPU.Build.0 = Release|Any CPU {C3D4739E-5740-4375-81E2-E59A37DF48B9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {C3D4739E-5740-4375-81E2-E59A37DF48B9}.Debug|Any CPU.Build.0 = Debug|Any CPU {C3D4739E-5740-4375-81E2-E59A37DF48B9}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -193,97 +114,6 @@ Global {3D4B640C-35BD-422B-80B0-BAA7DCB73285}.Debug|Any CPU.Build.0 = Debug|Any CPU {3D4B640C-35BD-422B-80B0-BAA7DCB73285}.Release|Any CPU.ActiveCfg = Release|Any CPU {3D4B640C-35BD-422B-80B0-BAA7DCB73285}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {43A1B58D-0AA3-4686-BBC3-4748D4E8EE94}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {43A1B58D-0AA3-4686-BBC3-4748D4E8EE94}.Debug|Any CPU.Build.0 = Debug|Any CPU - {43A1B58D-0AA3-4686-BBC3-4748D4E8EE94}.Release|Any CPU.ActiveCfg = Release|Any CPU - {43A1B58D-0AA3-4686-BBC3-4748D4E8EE94}.Release|Any CPU.Build.0 = Release|Any CPU - {D71DF6F7-0A00-4A3A-BE1C-96541A4635D1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D71DF6F7-0A00-4A3A-BE1C-96541A4635D1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D71DF6F7-0A00-4A3A-BE1C-96541A4635D1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D71DF6F7-0A00-4A3A-BE1C-96541A4635D1}.Release|Any CPU.Build.0 = Release|Any CPU - {946F6289-0D75-4A6C-84E5-EEA626960B6F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {946F6289-0D75-4A6C-84E5-EEA626960B6F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {946F6289-0D75-4A6C-84E5-EEA626960B6F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {946F6289-0D75-4A6C-84E5-EEA626960B6F}.Release|Any CPU.Build.0 = Release|Any CPU - {4F9483C0-BD93-4D86-9533-A3996E6A79A0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4F9483C0-BD93-4D86-9533-A3996E6A79A0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4F9483C0-BD93-4D86-9533-A3996E6A79A0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4F9483C0-BD93-4D86-9533-A3996E6A79A0}.Release|Any CPU.Build.0 = Release|Any CPU - {1388C73A-6291-49F2-8A21-34A7282A8D50}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1388C73A-6291-49F2-8A21-34A7282A8D50}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1388C73A-6291-49F2-8A21-34A7282A8D50}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1388C73A-6291-49F2-8A21-34A7282A8D50}.Release|Any CPU.Build.0 = Release|Any CPU - {4DB7D94E-04C0-4C4C-AFAE-FC0E179AC698}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4DB7D94E-04C0-4C4C-AFAE-FC0E179AC698}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4DB7D94E-04C0-4C4C-AFAE-FC0E179AC698}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4DB7D94E-04C0-4C4C-AFAE-FC0E179AC698}.Release|Any CPU.Build.0 = Release|Any CPU - {2DC6BE77-562D-4E13-AB33-521A4177DD09}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2DC6BE77-562D-4E13-AB33-521A4177DD09}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2DC6BE77-562D-4E13-AB33-521A4177DD09}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2DC6BE77-562D-4E13-AB33-521A4177DD09}.Release|Any CPU.Build.0 = Release|Any CPU - {18739F9B-6DF0-4C7E-BF24-399A66D3A05C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {18739F9B-6DF0-4C7E-BF24-399A66D3A05C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {18739F9B-6DF0-4C7E-BF24-399A66D3A05C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {18739F9B-6DF0-4C7E-BF24-399A66D3A05C}.Release|Any CPU.Build.0 = Release|Any CPU - {78F2E641-612B-4029-90B9-33B6EF21319A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {78F2E641-612B-4029-90B9-33B6EF21319A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {78F2E641-612B-4029-90B9-33B6EF21319A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {78F2E641-612B-4029-90B9-33B6EF21319A}.Release|Any CPU.Build.0 = Release|Any CPU - {52D4A44C-F161-4AF2-8DAE-37AAB931A20A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {52D4A44C-F161-4AF2-8DAE-37AAB931A20A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {52D4A44C-F161-4AF2-8DAE-37AAB931A20A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {52D4A44C-F161-4AF2-8DAE-37AAB931A20A}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {946F6289-0D75-4A6C-84E5-EEA626960B6F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {946F6289-0D75-4A6C-84E5-EEA626960B6F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {946F6289-0D75-4A6C-84E5-EEA626960B6F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {946F6289-0D75-4A6C-84E5-EEA626960B6F}.Release|Any CPU.Build.0 = Release|Any CPU - {4F9483C0-BD93-4D86-9533-A3996E6A79A0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4F9483C0-BD93-4D86-9533-A3996E6A79A0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4F9483C0-BD93-4D86-9533-A3996E6A79A0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4F9483C0-BD93-4D86-9533-A3996E6A79A0}.Release|Any CPU.Build.0 = Release|Any CPU - {1388C73A-6291-49F2-8A21-34A7282A8D50}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1388C73A-6291-49F2-8A21-34A7282A8D50}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1388C73A-6291-49F2-8A21-34A7282A8D50}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1388C73A-6291-49F2-8A21-34A7282A8D50}.Release|Any CPU.Build.0 = Release|Any CPU - {4DB7D94E-04C0-4C4C-AFAE-FC0E179AC698}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4DB7D94E-04C0-4C4C-AFAE-FC0E179AC698}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4DB7D94E-04C0-4C4C-AFAE-FC0E179AC698}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4DB7D94E-04C0-4C4C-AFAE-FC0E179AC698}.Release|Any CPU.Build.0 = Release|Any CPU - {2DC6BE77-562D-4E13-AB33-521A4177DD09}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2DC6BE77-562D-4E13-AB33-521A4177DD09}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2DC6BE77-562D-4E13-AB33-521A4177DD09}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2DC6BE77-562D-4E13-AB33-521A4177DD09}.Release|Any CPU.Build.0 = Release|Any CPU - {43A1B58D-0AA3-4686-BBC3-4748D4E8EE94}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {43A1B58D-0AA3-4686-BBC3-4748D4E8EE94}.Debug|Any CPU.Build.0 = Debug|Any CPU - {43A1B58D-0AA3-4686-BBC3-4748D4E8EE94}.Release|Any CPU.ActiveCfg = Release|Any CPU - {43A1B58D-0AA3-4686-BBC3-4748D4E8EE94}.Release|Any CPU.Build.0 = Release|Any CPU - {18739F9B-6DF0-4C7E-BF24-399A66D3A05C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {18739F9B-6DF0-4C7E-BF24-399A66D3A05C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {18739F9B-6DF0-4C7E-BF24-399A66D3A05C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {18739F9B-6DF0-4C7E-BF24-399A66D3A05C}.Release|Any CPU.Build.0 = Release|Any CPU - {D71DF6F7-0A00-4A3A-BE1C-96541A4635D1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D71DF6F7-0A00-4A3A-BE1C-96541A4635D1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D71DF6F7-0A00-4A3A-BE1C-96541A4635D1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D71DF6F7-0A00-4A3A-BE1C-96541A4635D1}.Release|Any CPU.Build.0 = Release|Any CPU - {78F2E641-612B-4029-90B9-33B6EF21319A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {78F2E641-612B-4029-90B9-33B6EF21319A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {78F2E641-612B-4029-90B9-33B6EF21319A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {78F2E641-612B-4029-90B9-33B6EF21319A}.Release|Any CPU.Build.0 = Release|Any CPU - {52D4A44C-F161-4AF2-8DAE-37AAB931A20A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {52D4A44C-F161-4AF2-8DAE-37AAB931A20A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {52D4A44C-F161-4AF2-8DAE-37AAB931A20A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {52D4A44C-F161-4AF2-8DAE-37AAB931A20A}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -294,53 +124,18 @@ Global {17474B1D-11D4-C377-01EF-16C2B68DE75F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AB} {4D848420-6971-43A2-B752-68355CBD3E10} = {17474B1D-11D4-C377-01EF-16C2B68DE75F} {09D06DF6-88CD-45C5-BC6F-F0051E82EDC1} = {17474B1D-11D4-C377-01EF-16C2B68DE75F} -<<<<<<< HEAD - {BB5DEDEE-13EC-4C9D-A182-E78D4EA56495} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {4E1EE2D1-4EFE-4F99-845C-7EBEE1F4E682} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -||||||| Commit version number update changes - {A1B68941-7722-42BB-91DC-0D558278A69E} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {9AF08228-52E7-4767-812C-981BD3210994} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {25BA0C39-A22D-4E41-B92A-E589F4CE8E2E} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {C43D9ED1-7FB1-4ADD-A329-0BC935A1441D} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -======= - {25BA0C39-A22D-4E41-B92A-E589F4CE8E2E} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {C43D9ED1-7FB1-4ADD-A329-0BC935A1441D} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b {7BEE7C44-BE12-43CC-AFB9-B5852A1F43C8} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD - {660ADD14-9D8C-43FE-9346-D3C29332388E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {64F4723A-B116-4C65-BD88-A3CFEC7FDBBF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {2771BF3F-235D-4CB7-B1AB-E2400DFB9AD1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} + {660ADD14-9D8C-43FE-9346-D3C29332388E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {C3D4739E-5740-4375-81E2-E59A37DF48B9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {3D4B640C-35BD-422B-80B0-BAA7DCB73285} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {43A1B58D-0AA3-4686-BBC3-4748D4E8EE94} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D71DF6F7-0A00-4A3A-BE1C-96541A4635D1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {946F6289-0D75-4A6C-84E5-EEA626960B6F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4F9483C0-BD93-4D86-9533-A3996E6A79A0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {1388C73A-6291-49F2-8A21-34A7282A8D50} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4DB7D94E-04C0-4C4C-AFAE-FC0E179AC698} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {2DC6BE77-562D-4E13-AB33-521A4177DD09} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {18739F9B-6DF0-4C7E-BF24-399A66D3A05C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {78F2E641-612B-4029-90B9-33B6EF21319A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {52D4A44C-F161-4AF2-8DAE-37AAB931A20A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {946F6289-0D75-4A6C-84E5-EEA626960B6F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4F9483C0-BD93-4D86-9533-A3996E6A79A0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {1388C73A-6291-49F2-8A21-34A7282A8D50} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4DB7D94E-04C0-4C4C-AFAE-FC0E179AC698} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {2DC6BE77-562D-4E13-AB33-521A4177DD09} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {43A1B58D-0AA3-4686-BBC3-4748D4E8EE94} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {18739F9B-6DF0-4C7E-BF24-399A66D3A05C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D71DF6F7-0A00-4A3A-BE1C-96541A4635D1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {78F2E641-612B-4029-90B9-33B6EF21319A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {52D4A44C-F161-4AF2-8DAE-37AAB931A20A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {A27EB3F1-D09E-4506-B75B-4D7AC7431981} diff --git a/sdk/src/Services/ElasticTranscoder/Generated/AmazonElasticTranscoderConfig.cs b/sdk/src/Services/ElasticTranscoder/Generated/AmazonElasticTranscoderConfig.cs index ffe19c3faad6..7aaebb125a30 100644 --- a/sdk/src/Services/ElasticTranscoder/Generated/AmazonElasticTranscoderConfig.cs +++ b/sdk/src/Services/ElasticTranscoder/Generated/AmazonElasticTranscoderConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.ElasticTranscoder public partial class AmazonElasticTranscoderConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("Elastic Transcoder", "4.0.0.0"); private static readonly AmazonElasticTranscoderEndpointResolver EndpointResolver = new AmazonElasticTranscoderEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("Elastic Transcoder", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("Elastic Transcoder", "3.7.400.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/ElasticTranscoder/Properties/AssemblyInfo.cs b/sdk/src/Services/ElasticTranscoder/Properties/AssemblyInfo.cs index e092aa52a5a4..e819d7898c6e 100644 --- a/sdk/src/Services/ElasticTranscoder/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/ElasticTranscoder/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/Elasticsearch/Elasticsearch.sln b/sdk/src/Services/Elasticsearch/Elasticsearch.sln index ce53161f73a2..10fafa72708a 100644 --- a/sdk/src/Services/Elasticsearch/Elasticsearch.sln +++ b/sdk/src/Services/Elasticsearch/Elasticsearch.sln @@ -92,7 +92,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {B62A0106-3EAF-4E56-86A1-2809E6AB75A0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {B62A0106-3EAF-4E56-86A1-2809E6AB75A0}.Debug|Any CPU.Build.0 = Debug|Any CPU {B62A0106-3EAF-4E56-86A1-2809E6AB75A0}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -113,97 +120,6 @@ Global {12F4AF9D-5444-4FEA-B650-210DF3369791}.Debug|Any CPU.Build.0 = Debug|Any CPU {12F4AF9D-5444-4FEA-B650-210DF3369791}.Release|Any CPU.ActiveCfg = Release|Any CPU {12F4AF9D-5444-4FEA-B650-210DF3369791}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {A58AC322-89B0-4565-B608-530885076703}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A58AC322-89B0-4565-B608-530885076703}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A58AC322-89B0-4565-B608-530885076703}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A58AC322-89B0-4565-B608-530885076703}.Release|Any CPU.Build.0 = Release|Any CPU - {2FF68257-0B6D-4853-B6B0-25BFBCF6FC43}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2FF68257-0B6D-4853-B6B0-25BFBCF6FC43}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2FF68257-0B6D-4853-B6B0-25BFBCF6FC43}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2FF68257-0B6D-4853-B6B0-25BFBCF6FC43}.Release|Any CPU.Build.0 = Release|Any CPU - {2FE3ED38-4C7B-4313-AFA7-68153CA2BA0F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2FE3ED38-4C7B-4313-AFA7-68153CA2BA0F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2FE3ED38-4C7B-4313-AFA7-68153CA2BA0F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2FE3ED38-4C7B-4313-AFA7-68153CA2BA0F}.Release|Any CPU.Build.0 = Release|Any CPU - {403E4AB6-D2D5-44F1-ACC9-0CFFD73E0D24}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {403E4AB6-D2D5-44F1-ACC9-0CFFD73E0D24}.Debug|Any CPU.Build.0 = Debug|Any CPU - {403E4AB6-D2D5-44F1-ACC9-0CFFD73E0D24}.Release|Any CPU.ActiveCfg = Release|Any CPU - {403E4AB6-D2D5-44F1-ACC9-0CFFD73E0D24}.Release|Any CPU.Build.0 = Release|Any CPU - {D57CFB59-273A-4B75-A984-A5FC0CC376A1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D57CFB59-273A-4B75-A984-A5FC0CC376A1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D57CFB59-273A-4B75-A984-A5FC0CC376A1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D57CFB59-273A-4B75-A984-A5FC0CC376A1}.Release|Any CPU.Build.0 = Release|Any CPU - {413D35C6-21E6-44CB-9337-687EF74B5A2B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {413D35C6-21E6-44CB-9337-687EF74B5A2B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {413D35C6-21E6-44CB-9337-687EF74B5A2B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {413D35C6-21E6-44CB-9337-687EF74B5A2B}.Release|Any CPU.Build.0 = Release|Any CPU - {14E3AADA-42A5-481E-9F9F-C0AF8EEC6619}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {14E3AADA-42A5-481E-9F9F-C0AF8EEC6619}.Debug|Any CPU.Build.0 = Debug|Any CPU - {14E3AADA-42A5-481E-9F9F-C0AF8EEC6619}.Release|Any CPU.ActiveCfg = Release|Any CPU - {14E3AADA-42A5-481E-9F9F-C0AF8EEC6619}.Release|Any CPU.Build.0 = Release|Any CPU - {04152B88-5F22-4ED0-94A7-4DAF9DEF8500}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {04152B88-5F22-4ED0-94A7-4DAF9DEF8500}.Debug|Any CPU.Build.0 = Debug|Any CPU - {04152B88-5F22-4ED0-94A7-4DAF9DEF8500}.Release|Any CPU.ActiveCfg = Release|Any CPU - {04152B88-5F22-4ED0-94A7-4DAF9DEF8500}.Release|Any CPU.Build.0 = Release|Any CPU - {AAAA3382-BA0C-4F46-897B-8790E027B5AB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AAAA3382-BA0C-4F46-897B-8790E027B5AB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AAAA3382-BA0C-4F46-897B-8790E027B5AB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AAAA3382-BA0C-4F46-897B-8790E027B5AB}.Release|Any CPU.Build.0 = Release|Any CPU - {EB0A44B8-9C94-45C7-8043-2138811A1477}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EB0A44B8-9C94-45C7-8043-2138811A1477}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EB0A44B8-9C94-45C7-8043-2138811A1477}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EB0A44B8-9C94-45C7-8043-2138811A1477}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {A58AC322-89B0-4565-B608-530885076703}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A58AC322-89B0-4565-B608-530885076703}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A58AC322-89B0-4565-B608-530885076703}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A58AC322-89B0-4565-B608-530885076703}.Release|Any CPU.Build.0 = Release|Any CPU - {2FF68257-0B6D-4853-B6B0-25BFBCF6FC43}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2FF68257-0B6D-4853-B6B0-25BFBCF6FC43}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2FF68257-0B6D-4853-B6B0-25BFBCF6FC43}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2FF68257-0B6D-4853-B6B0-25BFBCF6FC43}.Release|Any CPU.Build.0 = Release|Any CPU - {2FE3ED38-4C7B-4313-AFA7-68153CA2BA0F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2FE3ED38-4C7B-4313-AFA7-68153CA2BA0F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2FE3ED38-4C7B-4313-AFA7-68153CA2BA0F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2FE3ED38-4C7B-4313-AFA7-68153CA2BA0F}.Release|Any CPU.Build.0 = Release|Any CPU - {403E4AB6-D2D5-44F1-ACC9-0CFFD73E0D24}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {403E4AB6-D2D5-44F1-ACC9-0CFFD73E0D24}.Debug|Any CPU.Build.0 = Debug|Any CPU - {403E4AB6-D2D5-44F1-ACC9-0CFFD73E0D24}.Release|Any CPU.ActiveCfg = Release|Any CPU - {403E4AB6-D2D5-44F1-ACC9-0CFFD73E0D24}.Release|Any CPU.Build.0 = Release|Any CPU - {D57CFB59-273A-4B75-A984-A5FC0CC376A1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D57CFB59-273A-4B75-A984-A5FC0CC376A1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D57CFB59-273A-4B75-A984-A5FC0CC376A1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D57CFB59-273A-4B75-A984-A5FC0CC376A1}.Release|Any CPU.Build.0 = Release|Any CPU - {413D35C6-21E6-44CB-9337-687EF74B5A2B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {413D35C6-21E6-44CB-9337-687EF74B5A2B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {413D35C6-21E6-44CB-9337-687EF74B5A2B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {413D35C6-21E6-44CB-9337-687EF74B5A2B}.Release|Any CPU.Build.0 = Release|Any CPU - {14E3AADA-42A5-481E-9F9F-C0AF8EEC6619}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {14E3AADA-42A5-481E-9F9F-C0AF8EEC6619}.Debug|Any CPU.Build.0 = Debug|Any CPU - {14E3AADA-42A5-481E-9F9F-C0AF8EEC6619}.Release|Any CPU.ActiveCfg = Release|Any CPU - {14E3AADA-42A5-481E-9F9F-C0AF8EEC6619}.Release|Any CPU.Build.0 = Release|Any CPU - {04152B88-5F22-4ED0-94A7-4DAF9DEF8500}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {04152B88-5F22-4ED0-94A7-4DAF9DEF8500}.Debug|Any CPU.Build.0 = Debug|Any CPU - {04152B88-5F22-4ED0-94A7-4DAF9DEF8500}.Release|Any CPU.ActiveCfg = Release|Any CPU - {04152B88-5F22-4ED0-94A7-4DAF9DEF8500}.Release|Any CPU.Build.0 = Release|Any CPU - {AAAA3382-BA0C-4F46-897B-8790E027B5AB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AAAA3382-BA0C-4F46-897B-8790E027B5AB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AAAA3382-BA0C-4F46-897B-8790E027B5AB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AAAA3382-BA0C-4F46-897B-8790E027B5AB}.Release|Any CPU.Build.0 = Release|Any CPU - {EB0A44B8-9C94-45C7-8043-2138811A1477}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EB0A44B8-9C94-45C7-8043-2138811A1477}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EB0A44B8-9C94-45C7-8043-2138811A1477}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EB0A44B8-9C94-45C7-8043-2138811A1477}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -220,37 +136,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {B62A0106-3EAF-4E56-86A1-2809E6AB75A0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {189542C6-D459-45D7-A7B7-EC48602149D8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {7159091D-2D10-4805-B4E8-98AB16F71D55} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {73F428F0-6236-4E98-82FF-11F1842A7432} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {12F4AF9D-5444-4FEA-B650-210DF3369791} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {A58AC322-89B0-4565-B608-530885076703} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {2FF68257-0B6D-4853-B6B0-25BFBCF6FC43} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {2FE3ED38-4C7B-4313-AFA7-68153CA2BA0F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {403E4AB6-D2D5-44F1-ACC9-0CFFD73E0D24} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D57CFB59-273A-4B75-A984-A5FC0CC376A1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {413D35C6-21E6-44CB-9337-687EF74B5A2B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {14E3AADA-42A5-481E-9F9F-C0AF8EEC6619} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {04152B88-5F22-4ED0-94A7-4DAF9DEF8500} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {AAAA3382-BA0C-4F46-897B-8790E027B5AB} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {EB0A44B8-9C94-45C7-8043-2138811A1477} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {A58AC322-89B0-4565-B608-530885076703} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {2FF68257-0B6D-4853-B6B0-25BFBCF6FC43} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {2FE3ED38-4C7B-4313-AFA7-68153CA2BA0F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {403E4AB6-D2D5-44F1-ACC9-0CFFD73E0D24} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D57CFB59-273A-4B75-A984-A5FC0CC376A1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {413D35C6-21E6-44CB-9337-687EF74B5A2B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {14E3AADA-42A5-481E-9F9F-C0AF8EEC6619} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {04152B88-5F22-4ED0-94A7-4DAF9DEF8500} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {AAAA3382-BA0C-4F46-897B-8790E027B5AB} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {EB0A44B8-9C94-45C7-8043-2138811A1477} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {A6641B3F-AF3E-4CD1-9272-A6B0DE767B77} diff --git a/sdk/src/Services/Elasticsearch/Generated/AmazonElasticsearchConfig.cs b/sdk/src/Services/Elasticsearch/Generated/AmazonElasticsearchConfig.cs index 225f3cfa1a4b..f2457daa4a18 100644 --- a/sdk/src/Services/Elasticsearch/Generated/AmazonElasticsearchConfig.cs +++ b/sdk/src/Services/Elasticsearch/Generated/AmazonElasticsearchConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.Elasticsearch public partial class AmazonElasticsearchConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("Elasticsearch Service", "4.0.0.0"); private static readonly AmazonElasticsearchEndpointResolver EndpointResolver = new AmazonElasticsearchEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("Elasticsearch Service", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("Elasticsearch Service", "3.7.400.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/Elasticsearch/Properties/AssemblyInfo.cs b/sdk/src/Services/Elasticsearch/Properties/AssemblyInfo.cs index a2dfbeb666cc..71cc4ec6640e 100644 --- a/sdk/src/Services/Elasticsearch/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/Elasticsearch/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/EntityResolution/EntityResolution.sln b/sdk/src/Services/EntityResolution/EntityResolution.sln index 3fa7336ff4ed..4eddf1436cd0 100644 --- a/sdk/src/Services/EntityResolution/EntityResolution.sln +++ b/sdk/src/Services/EntityResolution/EntityResolution.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {CB76E67A-D7F8-45CA-8F86-79E33A273FEA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {CB76E67A-D7F8-45CA-8F86-79E33A273FEA}.Debug|Any CPU.Build.0 = Debug|Any CPU {CB76E67A-D7F8-45CA-8F86-79E33A273FEA}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {3F0C1D11-94A0-44B0-B9A3-65F82DBB7E17}.Debug|Any CPU.Build.0 = Debug|Any CPU {3F0C1D11-94A0-44B0-B9A3-65F82DBB7E17}.Release|Any CPU.ActiveCfg = Release|Any CPU {3F0C1D11-94A0-44B0-B9A3-65F82DBB7E17}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {0BFBFB20-288E-41D2-B7A2-BB6CAC25CDE7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0BFBFB20-288E-41D2-B7A2-BB6CAC25CDE7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0BFBFB20-288E-41D2-B7A2-BB6CAC25CDE7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0BFBFB20-288E-41D2-B7A2-BB6CAC25CDE7}.Release|Any CPU.Build.0 = Release|Any CPU - {C451D241-ACB7-4288-B062-7AC994319646}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C451D241-ACB7-4288-B062-7AC994319646}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C451D241-ACB7-4288-B062-7AC994319646}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C451D241-ACB7-4288-B062-7AC994319646}.Release|Any CPU.Build.0 = Release|Any CPU - {D2AC612F-3F52-458C-B2DE-AE073008681C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D2AC612F-3F52-458C-B2DE-AE073008681C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D2AC612F-3F52-458C-B2DE-AE073008681C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D2AC612F-3F52-458C-B2DE-AE073008681C}.Release|Any CPU.Build.0 = Release|Any CPU - {AFF5E06D-FE95-41CC-873F-D654B2F2185B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AFF5E06D-FE95-41CC-873F-D654B2F2185B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AFF5E06D-FE95-41CC-873F-D654B2F2185B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AFF5E06D-FE95-41CC-873F-D654B2F2185B}.Release|Any CPU.Build.0 = Release|Any CPU - {9FC02E66-1947-48A4-9190-B818BA1CC99A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9FC02E66-1947-48A4-9190-B818BA1CC99A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9FC02E66-1947-48A4-9190-B818BA1CC99A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9FC02E66-1947-48A4-9190-B818BA1CC99A}.Release|Any CPU.Build.0 = Release|Any CPU - {66A37CA5-A425-45E8-ADC8-E94882222CE2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {66A37CA5-A425-45E8-ADC8-E94882222CE2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {66A37CA5-A425-45E8-ADC8-E94882222CE2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {66A37CA5-A425-45E8-ADC8-E94882222CE2}.Release|Any CPU.Build.0 = Release|Any CPU - {214C4D78-740A-4532-832A-8C51CF6B598C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {214C4D78-740A-4532-832A-8C51CF6B598C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {214C4D78-740A-4532-832A-8C51CF6B598C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {214C4D78-740A-4532-832A-8C51CF6B598C}.Release|Any CPU.Build.0 = Release|Any CPU - {4ECB033B-B4C5-4B84-BF7E-6E54698907E0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4ECB033B-B4C5-4B84-BF7E-6E54698907E0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4ECB033B-B4C5-4B84-BF7E-6E54698907E0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4ECB033B-B4C5-4B84-BF7E-6E54698907E0}.Release|Any CPU.Build.0 = Release|Any CPU - {B7C0096E-4BE0-4704-B960-D875E0A699C0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B7C0096E-4BE0-4704-B960-D875E0A699C0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B7C0096E-4BE0-4704-B960-D875E0A699C0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B7C0096E-4BE0-4704-B960-D875E0A699C0}.Release|Any CPU.Build.0 = Release|Any CPU - {688C8A98-F7ED-4A39-A733-D65D4F174F06}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {688C8A98-F7ED-4A39-A733-D65D4F174F06}.Debug|Any CPU.Build.0 = Debug|Any CPU - {688C8A98-F7ED-4A39-A733-D65D4F174F06}.Release|Any CPU.ActiveCfg = Release|Any CPU - {688C8A98-F7ED-4A39-A733-D65D4F174F06}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {0BFBFB20-288E-41D2-B7A2-BB6CAC25CDE7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0BFBFB20-288E-41D2-B7A2-BB6CAC25CDE7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0BFBFB20-288E-41D2-B7A2-BB6CAC25CDE7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0BFBFB20-288E-41D2-B7A2-BB6CAC25CDE7}.Release|Any CPU.Build.0 = Release|Any CPU - {C451D241-ACB7-4288-B062-7AC994319646}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C451D241-ACB7-4288-B062-7AC994319646}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C451D241-ACB7-4288-B062-7AC994319646}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C451D241-ACB7-4288-B062-7AC994319646}.Release|Any CPU.Build.0 = Release|Any CPU - {D2AC612F-3F52-458C-B2DE-AE073008681C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D2AC612F-3F52-458C-B2DE-AE073008681C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D2AC612F-3F52-458C-B2DE-AE073008681C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D2AC612F-3F52-458C-B2DE-AE073008681C}.Release|Any CPU.Build.0 = Release|Any CPU - {AFF5E06D-FE95-41CC-873F-D654B2F2185B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AFF5E06D-FE95-41CC-873F-D654B2F2185B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AFF5E06D-FE95-41CC-873F-D654B2F2185B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AFF5E06D-FE95-41CC-873F-D654B2F2185B}.Release|Any CPU.Build.0 = Release|Any CPU - {9FC02E66-1947-48A4-9190-B818BA1CC99A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9FC02E66-1947-48A4-9190-B818BA1CC99A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9FC02E66-1947-48A4-9190-B818BA1CC99A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9FC02E66-1947-48A4-9190-B818BA1CC99A}.Release|Any CPU.Build.0 = Release|Any CPU - {66A37CA5-A425-45E8-ADC8-E94882222CE2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {66A37CA5-A425-45E8-ADC8-E94882222CE2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {66A37CA5-A425-45E8-ADC8-E94882222CE2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {66A37CA5-A425-45E8-ADC8-E94882222CE2}.Release|Any CPU.Build.0 = Release|Any CPU - {214C4D78-740A-4532-832A-8C51CF6B598C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {214C4D78-740A-4532-832A-8C51CF6B598C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {214C4D78-740A-4532-832A-8C51CF6B598C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {214C4D78-740A-4532-832A-8C51CF6B598C}.Release|Any CPU.Build.0 = Release|Any CPU - {4ECB033B-B4C5-4B84-BF7E-6E54698907E0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4ECB033B-B4C5-4B84-BF7E-6E54698907E0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4ECB033B-B4C5-4B84-BF7E-6E54698907E0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4ECB033B-B4C5-4B84-BF7E-6E54698907E0}.Release|Any CPU.Build.0 = Release|Any CPU - {B7C0096E-4BE0-4704-B960-D875E0A699C0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B7C0096E-4BE0-4704-B960-D875E0A699C0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B7C0096E-4BE0-4704-B960-D875E0A699C0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B7C0096E-4BE0-4704-B960-D875E0A699C0}.Release|Any CPU.Build.0 = Release|Any CPU - {688C8A98-F7ED-4A39-A733-D65D4F174F06}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {688C8A98-F7ED-4A39-A733-D65D4F174F06}.Debug|Any CPU.Build.0 = Debug|Any CPU - {688C8A98-F7ED-4A39-A733-D65D4F174F06}.Release|Any CPU.ActiveCfg = Release|Any CPU - {688C8A98-F7ED-4A39-A733-D65D4F174F06}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {CB76E67A-D7F8-45CA-8F86-79E33A273FEA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {8019260D-6978-4776-B3EC-BB21FAE9F24C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {EE46BBEB-7E45-47D4-B45E-A7C33485B35F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {562CF5AC-254D-4954-A6F8-9C3B44E7C7A3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {3F0C1D11-94A0-44B0-B9A3-65F82DBB7E17} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {0BFBFB20-288E-41D2-B7A2-BB6CAC25CDE7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C451D241-ACB7-4288-B062-7AC994319646} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D2AC612F-3F52-458C-B2DE-AE073008681C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {AFF5E06D-FE95-41CC-873F-D654B2F2185B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {9FC02E66-1947-48A4-9190-B818BA1CC99A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {66A37CA5-A425-45E8-ADC8-E94882222CE2} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {214C4D78-740A-4532-832A-8C51CF6B598C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4ECB033B-B4C5-4B84-BF7E-6E54698907E0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B7C0096E-4BE0-4704-B960-D875E0A699C0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {688C8A98-F7ED-4A39-A733-D65D4F174F06} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {0BFBFB20-288E-41D2-B7A2-BB6CAC25CDE7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C451D241-ACB7-4288-B062-7AC994319646} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D2AC612F-3F52-458C-B2DE-AE073008681C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {AFF5E06D-FE95-41CC-873F-D654B2F2185B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {9FC02E66-1947-48A4-9190-B818BA1CC99A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {66A37CA5-A425-45E8-ADC8-E94882222CE2} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {214C4D78-740A-4532-832A-8C51CF6B598C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4ECB033B-B4C5-4B84-BF7E-6E54698907E0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B7C0096E-4BE0-4704-B960-D875E0A699C0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {688C8A98-F7ED-4A39-A733-D65D4F174F06} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {63385ACA-6C12-4B9C-8144-980228AAE864} diff --git a/sdk/src/Services/EntityResolution/Generated/AmazonEntityResolutionConfig.cs b/sdk/src/Services/EntityResolution/Generated/AmazonEntityResolutionConfig.cs index f914cfb91585..b57e906ffabb 100644 --- a/sdk/src/Services/EntityResolution/Generated/AmazonEntityResolutionConfig.cs +++ b/sdk/src/Services/EntityResolution/Generated/AmazonEntityResolutionConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.EntityResolution public partial class AmazonEntityResolutionConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("EntityResolution", "4.0.0.0"); private static readonly AmazonEntityResolutionEndpointResolver EndpointResolver = new AmazonEntityResolutionEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("EntityResolution", "3.7.401.16"); -======= - InternalSDKUtils.BuildUserAgentString("EntityResolution", "3.7.401.43"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/EntityResolution/Properties/AssemblyInfo.cs b/sdk/src/Services/EntityResolution/Properties/AssemblyInfo.cs index 8a2f99c38adc..689b29a58e70 100644 --- a/sdk/src/Services/EntityResolution/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/EntityResolution/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.16")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.43")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/EventBridge/EventBridge.sln b/sdk/src/Services/EventBridge/EventBridge.sln index f2d970141ce3..17c962306230 100644 --- a/sdk/src/Services/EventBridge/EventBridge.sln +++ b/sdk/src/Services/EventBridge/EventBridge.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {97526E0F-3D4C-446C-BBE1-6E8DD5FD5F66}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {97526E0F-3D4C-446C-BBE1-6E8DD5FD5F66}.Debug|Any CPU.Build.0 = Debug|Any CPU {97526E0F-3D4C-446C-BBE1-6E8DD5FD5F66}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {29A04E37-26AB-406B-A383-2F0221F424E8}.Debug|Any CPU.Build.0 = Debug|Any CPU {29A04E37-26AB-406B-A383-2F0221F424E8}.Release|Any CPU.ActiveCfg = Release|Any CPU {29A04E37-26AB-406B-A383-2F0221F424E8}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {941EFABB-DFFC-4DF8-9082-5728D93FE0EA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {941EFABB-DFFC-4DF8-9082-5728D93FE0EA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {941EFABB-DFFC-4DF8-9082-5728D93FE0EA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {941EFABB-DFFC-4DF8-9082-5728D93FE0EA}.Release|Any CPU.Build.0 = Release|Any CPU - {C0045E99-B371-4D3E-82F2-B7D314F796A9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C0045E99-B371-4D3E-82F2-B7D314F796A9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C0045E99-B371-4D3E-82F2-B7D314F796A9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C0045E99-B371-4D3E-82F2-B7D314F796A9}.Release|Any CPU.Build.0 = Release|Any CPU - {044800CA-D27A-4B31-89E8-0EDA338C5497}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {044800CA-D27A-4B31-89E8-0EDA338C5497}.Debug|Any CPU.Build.0 = Debug|Any CPU - {044800CA-D27A-4B31-89E8-0EDA338C5497}.Release|Any CPU.ActiveCfg = Release|Any CPU - {044800CA-D27A-4B31-89E8-0EDA338C5497}.Release|Any CPU.Build.0 = Release|Any CPU - {77249C6E-2BFD-4B0D-812B-5ABDA68D31DE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {77249C6E-2BFD-4B0D-812B-5ABDA68D31DE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {77249C6E-2BFD-4B0D-812B-5ABDA68D31DE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {77249C6E-2BFD-4B0D-812B-5ABDA68D31DE}.Release|Any CPU.Build.0 = Release|Any CPU - {D5FE6DCE-8729-491F-9716-1C8A8558189D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D5FE6DCE-8729-491F-9716-1C8A8558189D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D5FE6DCE-8729-491F-9716-1C8A8558189D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D5FE6DCE-8729-491F-9716-1C8A8558189D}.Release|Any CPU.Build.0 = Release|Any CPU - {B707EC2D-92FD-4C28-AA49-F7DA394BEE75}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B707EC2D-92FD-4C28-AA49-F7DA394BEE75}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B707EC2D-92FD-4C28-AA49-F7DA394BEE75}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B707EC2D-92FD-4C28-AA49-F7DA394BEE75}.Release|Any CPU.Build.0 = Release|Any CPU - {21394348-1D8F-4F4E-AC67-555B427FF7A6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {21394348-1D8F-4F4E-AC67-555B427FF7A6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {21394348-1D8F-4F4E-AC67-555B427FF7A6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {21394348-1D8F-4F4E-AC67-555B427FF7A6}.Release|Any CPU.Build.0 = Release|Any CPU - {4734AC93-A6AB-4D2C-B81E-17435E6DCFE7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4734AC93-A6AB-4D2C-B81E-17435E6DCFE7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4734AC93-A6AB-4D2C-B81E-17435E6DCFE7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4734AC93-A6AB-4D2C-B81E-17435E6DCFE7}.Release|Any CPU.Build.0 = Release|Any CPU - {5DB17BBA-5075-4C66-A0B0-B146C27EB927}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5DB17BBA-5075-4C66-A0B0-B146C27EB927}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5DB17BBA-5075-4C66-A0B0-B146C27EB927}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5DB17BBA-5075-4C66-A0B0-B146C27EB927}.Release|Any CPU.Build.0 = Release|Any CPU - {C63E4C15-5792-4885-B8EF-AD61F3CC891C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C63E4C15-5792-4885-B8EF-AD61F3CC891C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C63E4C15-5792-4885-B8EF-AD61F3CC891C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C63E4C15-5792-4885-B8EF-AD61F3CC891C}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {941EFABB-DFFC-4DF8-9082-5728D93FE0EA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {941EFABB-DFFC-4DF8-9082-5728D93FE0EA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {941EFABB-DFFC-4DF8-9082-5728D93FE0EA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {941EFABB-DFFC-4DF8-9082-5728D93FE0EA}.Release|Any CPU.Build.0 = Release|Any CPU - {C0045E99-B371-4D3E-82F2-B7D314F796A9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C0045E99-B371-4D3E-82F2-B7D314F796A9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C0045E99-B371-4D3E-82F2-B7D314F796A9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C0045E99-B371-4D3E-82F2-B7D314F796A9}.Release|Any CPU.Build.0 = Release|Any CPU - {044800CA-D27A-4B31-89E8-0EDA338C5497}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {044800CA-D27A-4B31-89E8-0EDA338C5497}.Debug|Any CPU.Build.0 = Debug|Any CPU - {044800CA-D27A-4B31-89E8-0EDA338C5497}.Release|Any CPU.ActiveCfg = Release|Any CPU - {044800CA-D27A-4B31-89E8-0EDA338C5497}.Release|Any CPU.Build.0 = Release|Any CPU - {77249C6E-2BFD-4B0D-812B-5ABDA68D31DE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {77249C6E-2BFD-4B0D-812B-5ABDA68D31DE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {77249C6E-2BFD-4B0D-812B-5ABDA68D31DE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {77249C6E-2BFD-4B0D-812B-5ABDA68D31DE}.Release|Any CPU.Build.0 = Release|Any CPU - {D5FE6DCE-8729-491F-9716-1C8A8558189D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D5FE6DCE-8729-491F-9716-1C8A8558189D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D5FE6DCE-8729-491F-9716-1C8A8558189D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D5FE6DCE-8729-491F-9716-1C8A8558189D}.Release|Any CPU.Build.0 = Release|Any CPU - {B707EC2D-92FD-4C28-AA49-F7DA394BEE75}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B707EC2D-92FD-4C28-AA49-F7DA394BEE75}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B707EC2D-92FD-4C28-AA49-F7DA394BEE75}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B707EC2D-92FD-4C28-AA49-F7DA394BEE75}.Release|Any CPU.Build.0 = Release|Any CPU - {21394348-1D8F-4F4E-AC67-555B427FF7A6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {21394348-1D8F-4F4E-AC67-555B427FF7A6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {21394348-1D8F-4F4E-AC67-555B427FF7A6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {21394348-1D8F-4F4E-AC67-555B427FF7A6}.Release|Any CPU.Build.0 = Release|Any CPU - {4734AC93-A6AB-4D2C-B81E-17435E6DCFE7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4734AC93-A6AB-4D2C-B81E-17435E6DCFE7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4734AC93-A6AB-4D2C-B81E-17435E6DCFE7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4734AC93-A6AB-4D2C-B81E-17435E6DCFE7}.Release|Any CPU.Build.0 = Release|Any CPU - {5DB17BBA-5075-4C66-A0B0-B146C27EB927}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5DB17BBA-5075-4C66-A0B0-B146C27EB927}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5DB17BBA-5075-4C66-A0B0-B146C27EB927}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5DB17BBA-5075-4C66-A0B0-B146C27EB927}.Release|Any CPU.Build.0 = Release|Any CPU - {C63E4C15-5792-4885-B8EF-AD61F3CC891C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C63E4C15-5792-4885-B8EF-AD61F3CC891C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C63E4C15-5792-4885-B8EF-AD61F3CC891C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C63E4C15-5792-4885-B8EF-AD61F3CC891C}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {97526E0F-3D4C-446C-BBE1-6E8DD5FD5F66} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {3FB03F1E-6122-4E27-B885-B95BC5A608D7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {3787DA73-A0EB-4696-AC75-A586F283C3AD} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {31EC1DE3-2713-436E-8866-7D167A5DB6D8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {29A04E37-26AB-406B-A383-2F0221F424E8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {941EFABB-DFFC-4DF8-9082-5728D93FE0EA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C0045E99-B371-4D3E-82F2-B7D314F796A9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {044800CA-D27A-4B31-89E8-0EDA338C5497} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {77249C6E-2BFD-4B0D-812B-5ABDA68D31DE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D5FE6DCE-8729-491F-9716-1C8A8558189D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B707EC2D-92FD-4C28-AA49-F7DA394BEE75} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {21394348-1D8F-4F4E-AC67-555B427FF7A6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4734AC93-A6AB-4D2C-B81E-17435E6DCFE7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {5DB17BBA-5075-4C66-A0B0-B146C27EB927} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C63E4C15-5792-4885-B8EF-AD61F3CC891C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {941EFABB-DFFC-4DF8-9082-5728D93FE0EA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C0045E99-B371-4D3E-82F2-B7D314F796A9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {044800CA-D27A-4B31-89E8-0EDA338C5497} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {77249C6E-2BFD-4B0D-812B-5ABDA68D31DE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D5FE6DCE-8729-491F-9716-1C8A8558189D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B707EC2D-92FD-4C28-AA49-F7DA394BEE75} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {21394348-1D8F-4F4E-AC67-555B427FF7A6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4734AC93-A6AB-4D2C-B81E-17435E6DCFE7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {5DB17BBA-5075-4C66-A0B0-B146C27EB927} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C63E4C15-5792-4885-B8EF-AD61F3CC891C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {5AFCF2B3-B31A-4209-B4C5-D3A5C4E0C78E} diff --git a/sdk/src/Services/EventBridge/Generated/AmazonEventBridgeConfig.cs b/sdk/src/Services/EventBridge/Generated/AmazonEventBridgeConfig.cs index 8768eacad8a4..33d1c38e954b 100644 --- a/sdk/src/Services/EventBridge/Generated/AmazonEventBridgeConfig.cs +++ b/sdk/src/Services/EventBridge/Generated/AmazonEventBridgeConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.EventBridge public partial class AmazonEventBridgeConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("EventBridge", "4.0.0.0"); private static readonly AmazonEventBridgeEndpointResolver EndpointResolver = new AmazonEventBridgeEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("EventBridge", "3.7.401.24"); -======= - InternalSDKUtils.BuildUserAgentString("EventBridge", "3.7.401.51"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// @@ -107,7 +101,7 @@ public override string UserAgent /// The resolved endpoint for the given request. public override Amazon.Runtime.Endpoints.Endpoint DetermineServiceOperationEndpoint(ServiceOperationEndpointParameters parameters) { - var requestContext = new RequestContext(false, new EventBridgeSigner()) + var requestContext = new RequestContext(false, new AWSEndpointAuthSchemeSigner()) { ClientConfig = this, OriginalRequest = parameters.Request, diff --git a/sdk/src/Services/EventBridge/Generated/_bcl/AmazonEventBridgeClient.cs b/sdk/src/Services/EventBridge/Generated/_bcl/AmazonEventBridgeClient.cs index 684fe0b6b10f..62b78b95e0dc 100644 --- a/sdk/src/Services/EventBridge/Generated/_bcl/AmazonEventBridgeClient.cs +++ b/sdk/src/Services/EventBridge/Generated/_bcl/AmazonEventBridgeClient.cs @@ -235,7 +235,7 @@ public AmazonEventBridgeClient(string awsAccessKeyId, string awsSecretAccessKey, /// protected override AbstractAWSSigner CreateSigner() { - return new EventBridgeSigner(); + return new AWSEndpointAuthSchemeSigner(); } /// diff --git a/sdk/src/Services/EventBridge/Properties/AssemblyInfo.cs b/sdk/src/Services/EventBridge/Properties/AssemblyInfo.cs index 9dfe0e1a544f..d8ff5b6f6cd4 100644 --- a/sdk/src/Services/EventBridge/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/EventBridge/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.24")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.51")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/FIS/FIS.sln b/sdk/src/Services/FIS/FIS.sln index 98d49e88a950..cef704382dc4 100644 --- a/sdk/src/Services/FIS/FIS.sln +++ b/sdk/src/Services/FIS/FIS.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {D1CA88EA-8705-4BA7-9E08-08F1931A17EC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {D1CA88EA-8705-4BA7-9E08-08F1931A17EC}.Debug|Any CPU.Build.0 = Debug|Any CPU {D1CA88EA-8705-4BA7-9E08-08F1931A17EC}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {D269CBEF-E442-47A4-9E55-CEC83C07419D}.Debug|Any CPU.Build.0 = Debug|Any CPU {D269CBEF-E442-47A4-9E55-CEC83C07419D}.Release|Any CPU.ActiveCfg = Release|Any CPU {D269CBEF-E442-47A4-9E55-CEC83C07419D}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {1972B299-48BC-403D-B758-EA5FE9495048}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1972B299-48BC-403D-B758-EA5FE9495048}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1972B299-48BC-403D-B758-EA5FE9495048}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1972B299-48BC-403D-B758-EA5FE9495048}.Release|Any CPU.Build.0 = Release|Any CPU - {196D504F-175C-4425-A3A2-2B044FFF05AA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {196D504F-175C-4425-A3A2-2B044FFF05AA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {196D504F-175C-4425-A3A2-2B044FFF05AA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {196D504F-175C-4425-A3A2-2B044FFF05AA}.Release|Any CPU.Build.0 = Release|Any CPU - {7797FF90-9D29-4E2E-8494-05F230AD6E5E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7797FF90-9D29-4E2E-8494-05F230AD6E5E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7797FF90-9D29-4E2E-8494-05F230AD6E5E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7797FF90-9D29-4E2E-8494-05F230AD6E5E}.Release|Any CPU.Build.0 = Release|Any CPU - {7F769090-7C6C-42B2-88F2-12CBD1461C88}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7F769090-7C6C-42B2-88F2-12CBD1461C88}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7F769090-7C6C-42B2-88F2-12CBD1461C88}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7F769090-7C6C-42B2-88F2-12CBD1461C88}.Release|Any CPU.Build.0 = Release|Any CPU - {0E100F08-7100-4C74-BA5E-535B5CA10AF3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0E100F08-7100-4C74-BA5E-535B5CA10AF3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0E100F08-7100-4C74-BA5E-535B5CA10AF3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0E100F08-7100-4C74-BA5E-535B5CA10AF3}.Release|Any CPU.Build.0 = Release|Any CPU - {7C0948C8-7D3E-4E6E-81A8-3F51C5B08403}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7C0948C8-7D3E-4E6E-81A8-3F51C5B08403}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7C0948C8-7D3E-4E6E-81A8-3F51C5B08403}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7C0948C8-7D3E-4E6E-81A8-3F51C5B08403}.Release|Any CPU.Build.0 = Release|Any CPU - {664782E4-C4CE-4A57-8F63-6CAA71BFFEEA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {664782E4-C4CE-4A57-8F63-6CAA71BFFEEA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {664782E4-C4CE-4A57-8F63-6CAA71BFFEEA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {664782E4-C4CE-4A57-8F63-6CAA71BFFEEA}.Release|Any CPU.Build.0 = Release|Any CPU - {09E777D4-6B1B-40B5-B30F-45C904B09586}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {09E777D4-6B1B-40B5-B30F-45C904B09586}.Debug|Any CPU.Build.0 = Debug|Any CPU - {09E777D4-6B1B-40B5-B30F-45C904B09586}.Release|Any CPU.ActiveCfg = Release|Any CPU - {09E777D4-6B1B-40B5-B30F-45C904B09586}.Release|Any CPU.Build.0 = Release|Any CPU - {9EDEC8A5-42CD-41FB-AB68-C3A4D2FC1A6C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9EDEC8A5-42CD-41FB-AB68-C3A4D2FC1A6C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9EDEC8A5-42CD-41FB-AB68-C3A4D2FC1A6C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9EDEC8A5-42CD-41FB-AB68-C3A4D2FC1A6C}.Release|Any CPU.Build.0 = Release|Any CPU - {ED531338-93FC-4FE0-BA4C-345A019E77C6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {ED531338-93FC-4FE0-BA4C-345A019E77C6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {ED531338-93FC-4FE0-BA4C-345A019E77C6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {ED531338-93FC-4FE0-BA4C-345A019E77C6}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {1972B299-48BC-403D-B758-EA5FE9495048}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1972B299-48BC-403D-B758-EA5FE9495048}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1972B299-48BC-403D-B758-EA5FE9495048}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1972B299-48BC-403D-B758-EA5FE9495048}.Release|Any CPU.Build.0 = Release|Any CPU - {196D504F-175C-4425-A3A2-2B044FFF05AA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {196D504F-175C-4425-A3A2-2B044FFF05AA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {196D504F-175C-4425-A3A2-2B044FFF05AA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {196D504F-175C-4425-A3A2-2B044FFF05AA}.Release|Any CPU.Build.0 = Release|Any CPU - {7797FF90-9D29-4E2E-8494-05F230AD6E5E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7797FF90-9D29-4E2E-8494-05F230AD6E5E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7797FF90-9D29-4E2E-8494-05F230AD6E5E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7797FF90-9D29-4E2E-8494-05F230AD6E5E}.Release|Any CPU.Build.0 = Release|Any CPU - {7F769090-7C6C-42B2-88F2-12CBD1461C88}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7F769090-7C6C-42B2-88F2-12CBD1461C88}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7F769090-7C6C-42B2-88F2-12CBD1461C88}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7F769090-7C6C-42B2-88F2-12CBD1461C88}.Release|Any CPU.Build.0 = Release|Any CPU - {0E100F08-7100-4C74-BA5E-535B5CA10AF3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0E100F08-7100-4C74-BA5E-535B5CA10AF3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0E100F08-7100-4C74-BA5E-535B5CA10AF3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0E100F08-7100-4C74-BA5E-535B5CA10AF3}.Release|Any CPU.Build.0 = Release|Any CPU - {7C0948C8-7D3E-4E6E-81A8-3F51C5B08403}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7C0948C8-7D3E-4E6E-81A8-3F51C5B08403}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7C0948C8-7D3E-4E6E-81A8-3F51C5B08403}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7C0948C8-7D3E-4E6E-81A8-3F51C5B08403}.Release|Any CPU.Build.0 = Release|Any CPU - {664782E4-C4CE-4A57-8F63-6CAA71BFFEEA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {664782E4-C4CE-4A57-8F63-6CAA71BFFEEA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {664782E4-C4CE-4A57-8F63-6CAA71BFFEEA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {664782E4-C4CE-4A57-8F63-6CAA71BFFEEA}.Release|Any CPU.Build.0 = Release|Any CPU - {09E777D4-6B1B-40B5-B30F-45C904B09586}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {09E777D4-6B1B-40B5-B30F-45C904B09586}.Debug|Any CPU.Build.0 = Debug|Any CPU - {09E777D4-6B1B-40B5-B30F-45C904B09586}.Release|Any CPU.ActiveCfg = Release|Any CPU - {09E777D4-6B1B-40B5-B30F-45C904B09586}.Release|Any CPU.Build.0 = Release|Any CPU - {9EDEC8A5-42CD-41FB-AB68-C3A4D2FC1A6C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9EDEC8A5-42CD-41FB-AB68-C3A4D2FC1A6C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9EDEC8A5-42CD-41FB-AB68-C3A4D2FC1A6C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9EDEC8A5-42CD-41FB-AB68-C3A4D2FC1A6C}.Release|Any CPU.Build.0 = Release|Any CPU - {ED531338-93FC-4FE0-BA4C-345A019E77C6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {ED531338-93FC-4FE0-BA4C-345A019E77C6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {ED531338-93FC-4FE0-BA4C-345A019E77C6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {ED531338-93FC-4FE0-BA4C-345A019E77C6}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {D1CA88EA-8705-4BA7-9E08-08F1931A17EC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {84C08C4F-A1F1-4DF9-8EC1-72F56D202A0F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {A5668591-E062-4038-9FFB-F4B79F4094BA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {130316F2-72BD-4EE3-8574-F5C5F63B5B51} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {D269CBEF-E442-47A4-9E55-CEC83C07419D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {1972B299-48BC-403D-B758-EA5FE9495048} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {196D504F-175C-4425-A3A2-2B044FFF05AA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {7797FF90-9D29-4E2E-8494-05F230AD6E5E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {7F769090-7C6C-42B2-88F2-12CBD1461C88} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0E100F08-7100-4C74-BA5E-535B5CA10AF3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {7C0948C8-7D3E-4E6E-81A8-3F51C5B08403} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {664782E4-C4CE-4A57-8F63-6CAA71BFFEEA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {09E777D4-6B1B-40B5-B30F-45C904B09586} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {9EDEC8A5-42CD-41FB-AB68-C3A4D2FC1A6C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {ED531338-93FC-4FE0-BA4C-345A019E77C6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {1972B299-48BC-403D-B758-EA5FE9495048} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {196D504F-175C-4425-A3A2-2B044FFF05AA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {7797FF90-9D29-4E2E-8494-05F230AD6E5E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {7F769090-7C6C-42B2-88F2-12CBD1461C88} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0E100F08-7100-4C74-BA5E-535B5CA10AF3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {7C0948C8-7D3E-4E6E-81A8-3F51C5B08403} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {664782E4-C4CE-4A57-8F63-6CAA71BFFEEA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {09E777D4-6B1B-40B5-B30F-45C904B09586} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {9EDEC8A5-42CD-41FB-AB68-C3A4D2FC1A6C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {ED531338-93FC-4FE0-BA4C-345A019E77C6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {B11ADE77-1242-43A3-910C-D1B5809F2249} diff --git a/sdk/src/Services/FIS/Generated/AmazonFISConfig.cs b/sdk/src/Services/FIS/Generated/AmazonFISConfig.cs index db676528b5e9..50ced0886be2 100644 --- a/sdk/src/Services/FIS/Generated/AmazonFISConfig.cs +++ b/sdk/src/Services/FIS/Generated/AmazonFISConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.FIS public partial class AmazonFISConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("fis", "4.0.0.0"); private static readonly AmazonFISEndpointResolver EndpointResolver = new AmazonFISEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("fis", "3.7.402.12"); -======= - InternalSDKUtils.BuildUserAgentString("fis", "3.7.403.4"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/FIS/Generated/Model/Internal/MarshallTransformations/CreateExperimentTemplateRequestMarshaller.cs b/sdk/src/Services/FIS/Generated/Model/Internal/MarshallTransformations/CreateExperimentTemplateRequestMarshaller.cs index 2255748323ff..becc43215c3d 100644 --- a/sdk/src/Services/FIS/Generated/Model/Internal/MarshallTransformations/CreateExperimentTemplateRequestMarshaller.cs +++ b/sdk/src/Services/FIS/Generated/Model/Internal/MarshallTransformations/CreateExperimentTemplateRequestMarshaller.cs @@ -94,7 +94,6 @@ public IRequest Marshall(CreateExperimentTemplateRequest publicRequest) context.Writer.Write(publicRequest.ClientToken); } -<<<<<<< HEAD else if(!(publicRequest.IsSetClientToken())) { context.Writer.WritePropertyName("clientToken"); @@ -105,28 +104,6 @@ public IRequest Marshall(CreateExperimentTemplateRequest publicRequest) context.Writer.WritePropertyName("description"); context.Writer.Write(publicRequest.Description); } -||||||| Commit version number update changes - if(publicRequest.IsSetLogConfiguration()) - { - context.Writer.WritePropertyName("logConfiguration"); - context.Writer.WriteObjectStart(); -======= - if(publicRequest.IsSetExperimentReportConfiguration()) - { - context.Writer.WritePropertyName("experimentReportConfiguration"); - context.Writer.WriteObjectStart(); - - var marshaller = CreateExperimentTemplateReportConfigurationInputMarshaller.Instance; - marshaller.Marshall(publicRequest.ExperimentReportConfiguration, context); - - context.Writer.WriteObjectEnd(); - } - - if(publicRequest.IsSetLogConfiguration()) - { - context.Writer.WritePropertyName("logConfiguration"); - context.Writer.WriteObjectStart(); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b if(publicRequest.IsSetExperimentOptions()) { @@ -139,6 +116,17 @@ public IRequest Marshall(CreateExperimentTemplateRequest publicRequest) context.Writer.WriteObjectEnd(); } + if(publicRequest.IsSetExperimentReportConfiguration()) + { + context.Writer.WritePropertyName("experimentReportConfiguration"); + context.Writer.WriteObjectStart(); + + var marshaller = CreateExperimentTemplateReportConfigurationInputMarshaller.Instance; + marshaller.Marshall(publicRequest.ExperimentReportConfiguration, context); + + context.Writer.WriteObjectEnd(); + } + if(publicRequest.IsSetLogConfiguration()) { context.Writer.WritePropertyName("logConfiguration"); diff --git a/sdk/src/Services/FIS/Generated/Model/Internal/MarshallTransformations/UpdateExperimentTemplateRequestMarshaller.cs b/sdk/src/Services/FIS/Generated/Model/Internal/MarshallTransformations/UpdateExperimentTemplateRequestMarshaller.cs index 4d58fafb6ce9..08756b545a96 100644 --- a/sdk/src/Services/FIS/Generated/Model/Internal/MarshallTransformations/UpdateExperimentTemplateRequestMarshaller.cs +++ b/sdk/src/Services/FIS/Generated/Model/Internal/MarshallTransformations/UpdateExperimentTemplateRequestMarshaller.cs @@ -97,36 +97,24 @@ public IRequest Marshall(UpdateExperimentTemplateRequest publicRequest) context.Writer.Write(publicRequest.Description); } -<<<<<<< HEAD if(publicRequest.IsSetExperimentOptions()) { context.Writer.WritePropertyName("experimentOptions"); context.Writer.WriteObjectStart(); -||||||| Commit version number update changes - if(publicRequest.IsSetLogConfiguration()) - { - context.Writer.WritePropertyName("logConfiguration"); - context.Writer.WriteObjectStart(); -======= - if(publicRequest.IsSetExperimentReportConfiguration()) - { - context.Writer.WritePropertyName("experimentReportConfiguration"); - context.Writer.WriteObjectStart(); - var marshaller = UpdateExperimentTemplateReportConfigurationInputMarshaller.Instance; - marshaller.Marshall(publicRequest.ExperimentReportConfiguration, context); + var marshaller = UpdateExperimentTemplateExperimentOptionsInputMarshaller.Instance; + marshaller.Marshall(publicRequest.ExperimentOptions, context); - context.Writer.WriteObjectEnd(); - } + context.Writer.WriteObjectEnd(); + } - if(publicRequest.IsSetLogConfiguration()) - { - context.Writer.WritePropertyName("logConfiguration"); - context.Writer.WriteObjectStart(); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b + if(publicRequest.IsSetExperimentReportConfiguration()) + { + context.Writer.WritePropertyName("experimentReportConfiguration"); + context.Writer.WriteObjectStart(); - var marshaller = UpdateExperimentTemplateExperimentOptionsInputMarshaller.Instance; - marshaller.Marshall(publicRequest.ExperimentOptions, context); + var marshaller = UpdateExperimentTemplateReportConfigurationInputMarshaller.Instance; + marshaller.Marshall(publicRequest.ExperimentReportConfiguration, context); context.Writer.WriteObjectEnd(); } diff --git a/sdk/src/Services/FIS/Properties/AssemblyInfo.cs b/sdk/src/Services/FIS/Properties/AssemblyInfo.cs index 5b380c3ed171..3c8840e93389 100644 --- a/sdk/src/Services/FIS/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/FIS/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.402.12")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.403.4")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/FMS/FMS.sln b/sdk/src/Services/FMS/FMS.sln index 8cd16a1793ab..03757f7ff1a9 100644 --- a/sdk/src/Services/FMS/FMS.sln +++ b/sdk/src/Services/FMS/FMS.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {1F2F1F22-2BE5-4555-A09F-4E7222292D76}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {1F2F1F22-2BE5-4555-A09F-4E7222292D76}.Debug|Any CPU.Build.0 = Debug|Any CPU {1F2F1F22-2BE5-4555-A09F-4E7222292D76}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {F03B2EC1-A72D-4C3B-996C-6D2ADC7F2640}.Debug|Any CPU.Build.0 = Debug|Any CPU {F03B2EC1-A72D-4C3B-996C-6D2ADC7F2640}.Release|Any CPU.ActiveCfg = Release|Any CPU {F03B2EC1-A72D-4C3B-996C-6D2ADC7F2640}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {2963612C-5770-4DF8-86C5-CD76E871A207}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2963612C-5770-4DF8-86C5-CD76E871A207}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2963612C-5770-4DF8-86C5-CD76E871A207}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2963612C-5770-4DF8-86C5-CD76E871A207}.Release|Any CPU.Build.0 = Release|Any CPU - {5F255617-2519-4963-94B2-F4FED26E779A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5F255617-2519-4963-94B2-F4FED26E779A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5F255617-2519-4963-94B2-F4FED26E779A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5F255617-2519-4963-94B2-F4FED26E779A}.Release|Any CPU.Build.0 = Release|Any CPU - {5C1E34BA-22F0-448A-B65B-DA48348FEA1A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5C1E34BA-22F0-448A-B65B-DA48348FEA1A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5C1E34BA-22F0-448A-B65B-DA48348FEA1A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5C1E34BA-22F0-448A-B65B-DA48348FEA1A}.Release|Any CPU.Build.0 = Release|Any CPU - {E97C9A7C-A8EC-45C7-A8E6-200281D498DE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E97C9A7C-A8EC-45C7-A8E6-200281D498DE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E97C9A7C-A8EC-45C7-A8E6-200281D498DE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E97C9A7C-A8EC-45C7-A8E6-200281D498DE}.Release|Any CPU.Build.0 = Release|Any CPU - {8220247B-7109-402F-8334-8ABF725E8101}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8220247B-7109-402F-8334-8ABF725E8101}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8220247B-7109-402F-8334-8ABF725E8101}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8220247B-7109-402F-8334-8ABF725E8101}.Release|Any CPU.Build.0 = Release|Any CPU - {4FC78800-2FD4-4BCE-ABD7-4A0380190343}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4FC78800-2FD4-4BCE-ABD7-4A0380190343}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4FC78800-2FD4-4BCE-ABD7-4A0380190343}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4FC78800-2FD4-4BCE-ABD7-4A0380190343}.Release|Any CPU.Build.0 = Release|Any CPU - {07232411-E0A4-4E8B-B266-47D011F3EE2E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {07232411-E0A4-4E8B-B266-47D011F3EE2E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {07232411-E0A4-4E8B-B266-47D011F3EE2E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {07232411-E0A4-4E8B-B266-47D011F3EE2E}.Release|Any CPU.Build.0 = Release|Any CPU - {2FC407B4-5AAA-4CF6-B41A-7F2F23A358C7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2FC407B4-5AAA-4CF6-B41A-7F2F23A358C7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2FC407B4-5AAA-4CF6-B41A-7F2F23A358C7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2FC407B4-5AAA-4CF6-B41A-7F2F23A358C7}.Release|Any CPU.Build.0 = Release|Any CPU - {BBF8D941-AB45-4DBB-886E-0C76867268D4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BBF8D941-AB45-4DBB-886E-0C76867268D4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BBF8D941-AB45-4DBB-886E-0C76867268D4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BBF8D941-AB45-4DBB-886E-0C76867268D4}.Release|Any CPU.Build.0 = Release|Any CPU - {AF36998F-6E46-43BF-8ED7-7ACBCF84B01D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AF36998F-6E46-43BF-8ED7-7ACBCF84B01D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AF36998F-6E46-43BF-8ED7-7ACBCF84B01D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AF36998F-6E46-43BF-8ED7-7ACBCF84B01D}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {2963612C-5770-4DF8-86C5-CD76E871A207}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2963612C-5770-4DF8-86C5-CD76E871A207}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2963612C-5770-4DF8-86C5-CD76E871A207}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2963612C-5770-4DF8-86C5-CD76E871A207}.Release|Any CPU.Build.0 = Release|Any CPU - {5F255617-2519-4963-94B2-F4FED26E779A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5F255617-2519-4963-94B2-F4FED26E779A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5F255617-2519-4963-94B2-F4FED26E779A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5F255617-2519-4963-94B2-F4FED26E779A}.Release|Any CPU.Build.0 = Release|Any CPU - {5C1E34BA-22F0-448A-B65B-DA48348FEA1A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5C1E34BA-22F0-448A-B65B-DA48348FEA1A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5C1E34BA-22F0-448A-B65B-DA48348FEA1A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5C1E34BA-22F0-448A-B65B-DA48348FEA1A}.Release|Any CPU.Build.0 = Release|Any CPU - {E97C9A7C-A8EC-45C7-A8E6-200281D498DE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E97C9A7C-A8EC-45C7-A8E6-200281D498DE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E97C9A7C-A8EC-45C7-A8E6-200281D498DE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E97C9A7C-A8EC-45C7-A8E6-200281D498DE}.Release|Any CPU.Build.0 = Release|Any CPU - {8220247B-7109-402F-8334-8ABF725E8101}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8220247B-7109-402F-8334-8ABF725E8101}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8220247B-7109-402F-8334-8ABF725E8101}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8220247B-7109-402F-8334-8ABF725E8101}.Release|Any CPU.Build.0 = Release|Any CPU - {4FC78800-2FD4-4BCE-ABD7-4A0380190343}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4FC78800-2FD4-4BCE-ABD7-4A0380190343}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4FC78800-2FD4-4BCE-ABD7-4A0380190343}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4FC78800-2FD4-4BCE-ABD7-4A0380190343}.Release|Any CPU.Build.0 = Release|Any CPU - {07232411-E0A4-4E8B-B266-47D011F3EE2E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {07232411-E0A4-4E8B-B266-47D011F3EE2E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {07232411-E0A4-4E8B-B266-47D011F3EE2E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {07232411-E0A4-4E8B-B266-47D011F3EE2E}.Release|Any CPU.Build.0 = Release|Any CPU - {2FC407B4-5AAA-4CF6-B41A-7F2F23A358C7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2FC407B4-5AAA-4CF6-B41A-7F2F23A358C7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2FC407B4-5AAA-4CF6-B41A-7F2F23A358C7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2FC407B4-5AAA-4CF6-B41A-7F2F23A358C7}.Release|Any CPU.Build.0 = Release|Any CPU - {BBF8D941-AB45-4DBB-886E-0C76867268D4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BBF8D941-AB45-4DBB-886E-0C76867268D4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BBF8D941-AB45-4DBB-886E-0C76867268D4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BBF8D941-AB45-4DBB-886E-0C76867268D4}.Release|Any CPU.Build.0 = Release|Any CPU - {AF36998F-6E46-43BF-8ED7-7ACBCF84B01D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AF36998F-6E46-43BF-8ED7-7ACBCF84B01D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AF36998F-6E46-43BF-8ED7-7ACBCF84B01D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AF36998F-6E46-43BF-8ED7-7ACBCF84B01D}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {1F2F1F22-2BE5-4555-A09F-4E7222292D76} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {068F8D92-C58E-4D63-A1C7-45D6D60B597A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {EA7D9B32-7458-4CE8-887A-B5B15AA98271} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {60212EB0-A48A-416A-B22E-BBFF953A271E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {F03B2EC1-A72D-4C3B-996C-6D2ADC7F2640} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {2963612C-5770-4DF8-86C5-CD76E871A207} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {5F255617-2519-4963-94B2-F4FED26E779A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {5C1E34BA-22F0-448A-B65B-DA48348FEA1A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E97C9A7C-A8EC-45C7-A8E6-200281D498DE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8220247B-7109-402F-8334-8ABF725E8101} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4FC78800-2FD4-4BCE-ABD7-4A0380190343} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {07232411-E0A4-4E8B-B266-47D011F3EE2E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {2FC407B4-5AAA-4CF6-B41A-7F2F23A358C7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {BBF8D941-AB45-4DBB-886E-0C76867268D4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {AF36998F-6E46-43BF-8ED7-7ACBCF84B01D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {2963612C-5770-4DF8-86C5-CD76E871A207} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {5F255617-2519-4963-94B2-F4FED26E779A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {5C1E34BA-22F0-448A-B65B-DA48348FEA1A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E97C9A7C-A8EC-45C7-A8E6-200281D498DE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8220247B-7109-402F-8334-8ABF725E8101} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4FC78800-2FD4-4BCE-ABD7-4A0380190343} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {07232411-E0A4-4E8B-B266-47D011F3EE2E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {2FC407B4-5AAA-4CF6-B41A-7F2F23A358C7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {BBF8D941-AB45-4DBB-886E-0C76867268D4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {AF36998F-6E46-43BF-8ED7-7ACBCF84B01D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {760E8AFC-7237-4627-A555-9C09D8685336} diff --git a/sdk/src/Services/FMS/Generated/AmazonFMSConfig.cs b/sdk/src/Services/FMS/Generated/AmazonFMSConfig.cs index c1b434f78b0b..190a43968f08 100644 --- a/sdk/src/Services/FMS/Generated/AmazonFMSConfig.cs +++ b/sdk/src/Services/FMS/Generated/AmazonFMSConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.FMS public partial class AmazonFMSConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("FMS", "4.0.0.0"); private static readonly AmazonFMSEndpointResolver EndpointResolver = new AmazonFMSEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("FMS", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("FMS", "3.7.401.17"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/FMS/Properties/AssemblyInfo.cs b/sdk/src/Services/FMS/Properties/AssemblyInfo.cs index a41f552a8980..a3cff3fd1e37 100644 --- a/sdk/src/Services/FMS/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/FMS/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.17")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/FSx/FSx.sln b/sdk/src/Services/FSx/FSx.sln index ed30944c0389..42c074af4e7b 100644 --- a/sdk/src/Services/FSx/FSx.sln +++ b/sdk/src/Services/FSx/FSx.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {9284B1DB-BBC8-4203-A4A8-FBAA2B7C95AA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {9284B1DB-BBC8-4203-A4A8-FBAA2B7C95AA}.Debug|Any CPU.Build.0 = Debug|Any CPU {9284B1DB-BBC8-4203-A4A8-FBAA2B7C95AA}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {83AB91C4-6340-4423-81E8-C50A735C66A1}.Debug|Any CPU.Build.0 = Debug|Any CPU {83AB91C4-6340-4423-81E8-C50A735C66A1}.Release|Any CPU.ActiveCfg = Release|Any CPU {83AB91C4-6340-4423-81E8-C50A735C66A1}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {128CACF3-C6DB-4B55-9DA9-3E24F204D585}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {128CACF3-C6DB-4B55-9DA9-3E24F204D585}.Debug|Any CPU.Build.0 = Debug|Any CPU - {128CACF3-C6DB-4B55-9DA9-3E24F204D585}.Release|Any CPU.ActiveCfg = Release|Any CPU - {128CACF3-C6DB-4B55-9DA9-3E24F204D585}.Release|Any CPU.Build.0 = Release|Any CPU - {2AD57D38-8265-4BB0-9B2C-2E84B3430751}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2AD57D38-8265-4BB0-9B2C-2E84B3430751}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2AD57D38-8265-4BB0-9B2C-2E84B3430751}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2AD57D38-8265-4BB0-9B2C-2E84B3430751}.Release|Any CPU.Build.0 = Release|Any CPU - {1B9226B2-7AA0-4D31-958F-76FA68359EFF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1B9226B2-7AA0-4D31-958F-76FA68359EFF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1B9226B2-7AA0-4D31-958F-76FA68359EFF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1B9226B2-7AA0-4D31-958F-76FA68359EFF}.Release|Any CPU.Build.0 = Release|Any CPU - {5C87D4A0-473E-4AFE-82CA-A87DA3656891}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5C87D4A0-473E-4AFE-82CA-A87DA3656891}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5C87D4A0-473E-4AFE-82CA-A87DA3656891}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5C87D4A0-473E-4AFE-82CA-A87DA3656891}.Release|Any CPU.Build.0 = Release|Any CPU - {E20E2BC8-9298-442C-8D6A-648B83944430}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E20E2BC8-9298-442C-8D6A-648B83944430}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E20E2BC8-9298-442C-8D6A-648B83944430}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E20E2BC8-9298-442C-8D6A-648B83944430}.Release|Any CPU.Build.0 = Release|Any CPU - {29DEF369-F3DF-48EB-AF16-99388F23A80E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {29DEF369-F3DF-48EB-AF16-99388F23A80E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {29DEF369-F3DF-48EB-AF16-99388F23A80E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {29DEF369-F3DF-48EB-AF16-99388F23A80E}.Release|Any CPU.Build.0 = Release|Any CPU - {016ACC51-A721-446D-99F1-E9DDA1C2714D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {016ACC51-A721-446D-99F1-E9DDA1C2714D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {016ACC51-A721-446D-99F1-E9DDA1C2714D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {016ACC51-A721-446D-99F1-E9DDA1C2714D}.Release|Any CPU.Build.0 = Release|Any CPU - {7791DEC8-89C8-4C51-A390-2FA4657B1C96}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7791DEC8-89C8-4C51-A390-2FA4657B1C96}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7791DEC8-89C8-4C51-A390-2FA4657B1C96}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7791DEC8-89C8-4C51-A390-2FA4657B1C96}.Release|Any CPU.Build.0 = Release|Any CPU - {D8D48FB5-FD7C-4F17-B894-6AEA135D92AC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D8D48FB5-FD7C-4F17-B894-6AEA135D92AC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D8D48FB5-FD7C-4F17-B894-6AEA135D92AC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D8D48FB5-FD7C-4F17-B894-6AEA135D92AC}.Release|Any CPU.Build.0 = Release|Any CPU - {C21DBD68-E63A-42BF-BFA8-00CB748F17B8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C21DBD68-E63A-42BF-BFA8-00CB748F17B8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C21DBD68-E63A-42BF-BFA8-00CB748F17B8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C21DBD68-E63A-42BF-BFA8-00CB748F17B8}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {128CACF3-C6DB-4B55-9DA9-3E24F204D585}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {128CACF3-C6DB-4B55-9DA9-3E24F204D585}.Debug|Any CPU.Build.0 = Debug|Any CPU - {128CACF3-C6DB-4B55-9DA9-3E24F204D585}.Release|Any CPU.ActiveCfg = Release|Any CPU - {128CACF3-C6DB-4B55-9DA9-3E24F204D585}.Release|Any CPU.Build.0 = Release|Any CPU - {2AD57D38-8265-4BB0-9B2C-2E84B3430751}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2AD57D38-8265-4BB0-9B2C-2E84B3430751}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2AD57D38-8265-4BB0-9B2C-2E84B3430751}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2AD57D38-8265-4BB0-9B2C-2E84B3430751}.Release|Any CPU.Build.0 = Release|Any CPU - {1B9226B2-7AA0-4D31-958F-76FA68359EFF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1B9226B2-7AA0-4D31-958F-76FA68359EFF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1B9226B2-7AA0-4D31-958F-76FA68359EFF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1B9226B2-7AA0-4D31-958F-76FA68359EFF}.Release|Any CPU.Build.0 = Release|Any CPU - {5C87D4A0-473E-4AFE-82CA-A87DA3656891}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5C87D4A0-473E-4AFE-82CA-A87DA3656891}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5C87D4A0-473E-4AFE-82CA-A87DA3656891}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5C87D4A0-473E-4AFE-82CA-A87DA3656891}.Release|Any CPU.Build.0 = Release|Any CPU - {E20E2BC8-9298-442C-8D6A-648B83944430}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E20E2BC8-9298-442C-8D6A-648B83944430}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E20E2BC8-9298-442C-8D6A-648B83944430}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E20E2BC8-9298-442C-8D6A-648B83944430}.Release|Any CPU.Build.0 = Release|Any CPU - {29DEF369-F3DF-48EB-AF16-99388F23A80E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {29DEF369-F3DF-48EB-AF16-99388F23A80E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {29DEF369-F3DF-48EB-AF16-99388F23A80E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {29DEF369-F3DF-48EB-AF16-99388F23A80E}.Release|Any CPU.Build.0 = Release|Any CPU - {016ACC51-A721-446D-99F1-E9DDA1C2714D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {016ACC51-A721-446D-99F1-E9DDA1C2714D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {016ACC51-A721-446D-99F1-E9DDA1C2714D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {016ACC51-A721-446D-99F1-E9DDA1C2714D}.Release|Any CPU.Build.0 = Release|Any CPU - {7791DEC8-89C8-4C51-A390-2FA4657B1C96}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7791DEC8-89C8-4C51-A390-2FA4657B1C96}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7791DEC8-89C8-4C51-A390-2FA4657B1C96}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7791DEC8-89C8-4C51-A390-2FA4657B1C96}.Release|Any CPU.Build.0 = Release|Any CPU - {D8D48FB5-FD7C-4F17-B894-6AEA135D92AC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D8D48FB5-FD7C-4F17-B894-6AEA135D92AC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D8D48FB5-FD7C-4F17-B894-6AEA135D92AC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D8D48FB5-FD7C-4F17-B894-6AEA135D92AC}.Release|Any CPU.Build.0 = Release|Any CPU - {C21DBD68-E63A-42BF-BFA8-00CB748F17B8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C21DBD68-E63A-42BF-BFA8-00CB748F17B8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C21DBD68-E63A-42BF-BFA8-00CB748F17B8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C21DBD68-E63A-42BF-BFA8-00CB748F17B8}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {9284B1DB-BBC8-4203-A4A8-FBAA2B7C95AA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {3BF013CA-995D-45ED-B903-DAAD02FE1D2F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {4B164D27-69C8-4D0D-ACEC-6E18039E7C1F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {F5FDBEC4-E2F7-4FC1-8EBD-A246B0339E4F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {83AB91C4-6340-4423-81E8-C50A735C66A1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {128CACF3-C6DB-4B55-9DA9-3E24F204D585} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {2AD57D38-8265-4BB0-9B2C-2E84B3430751} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {1B9226B2-7AA0-4D31-958F-76FA68359EFF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {5C87D4A0-473E-4AFE-82CA-A87DA3656891} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E20E2BC8-9298-442C-8D6A-648B83944430} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {29DEF369-F3DF-48EB-AF16-99388F23A80E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {016ACC51-A721-446D-99F1-E9DDA1C2714D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {7791DEC8-89C8-4C51-A390-2FA4657B1C96} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D8D48FB5-FD7C-4F17-B894-6AEA135D92AC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C21DBD68-E63A-42BF-BFA8-00CB748F17B8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {128CACF3-C6DB-4B55-9DA9-3E24F204D585} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {2AD57D38-8265-4BB0-9B2C-2E84B3430751} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {1B9226B2-7AA0-4D31-958F-76FA68359EFF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {5C87D4A0-473E-4AFE-82CA-A87DA3656891} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E20E2BC8-9298-442C-8D6A-648B83944430} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {29DEF369-F3DF-48EB-AF16-99388F23A80E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {016ACC51-A721-446D-99F1-E9DDA1C2714D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {7791DEC8-89C8-4C51-A390-2FA4657B1C96} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D8D48FB5-FD7C-4F17-B894-6AEA135D92AC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C21DBD68-E63A-42BF-BFA8-00CB748F17B8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {E3718C21-9135-4709-AA91-21879B06F4EE} diff --git a/sdk/src/Services/FSx/Generated/AmazonFSxConfig.cs b/sdk/src/Services/FSx/Generated/AmazonFSxConfig.cs index fd1c73a2686f..123b16ba7bee 100644 --- a/sdk/src/Services/FSx/Generated/AmazonFSxConfig.cs +++ b/sdk/src/Services/FSx/Generated/AmazonFSxConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.FSx public partial class AmazonFSxConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("FSx", "4.0.0.0"); private static readonly AmazonFSxEndpointResolver EndpointResolver = new AmazonFSxEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("FSx", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("FSx", "3.7.400.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/FSx/Properties/AssemblyInfo.cs b/sdk/src/Services/FSx/Properties/AssemblyInfo.cs index 67e43a8ea370..5698ef531bbd 100644 --- a/sdk/src/Services/FSx/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/FSx/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/FinSpaceData/FinSpaceData.sln b/sdk/src/Services/FinSpaceData/FinSpaceData.sln index a2370dc0b73f..8ad3a42a933a 100644 --- a/sdk/src/Services/FinSpaceData/FinSpaceData.sln +++ b/sdk/src/Services/FinSpaceData/FinSpaceData.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {9B3E450E-144A-4D00-9CEC-713D9CF8B8DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {9B3E450E-144A-4D00-9CEC-713D9CF8B8DC}.Debug|Any CPU.Build.0 = Debug|Any CPU {9B3E450E-144A-4D00-9CEC-713D9CF8B8DC}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {1856253A-7F12-487D-9856-B2DC5B5A1386}.Debug|Any CPU.Build.0 = Debug|Any CPU {1856253A-7F12-487D-9856-B2DC5B5A1386}.Release|Any CPU.ActiveCfg = Release|Any CPU {1856253A-7F12-487D-9856-B2DC5B5A1386}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {4632E326-7FB4-48A2-A48E-A7BA311A8EB3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4632E326-7FB4-48A2-A48E-A7BA311A8EB3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4632E326-7FB4-48A2-A48E-A7BA311A8EB3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4632E326-7FB4-48A2-A48E-A7BA311A8EB3}.Release|Any CPU.Build.0 = Release|Any CPU - {74AAA4A9-D14F-47A7-8D1B-24D4363273D7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {74AAA4A9-D14F-47A7-8D1B-24D4363273D7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {74AAA4A9-D14F-47A7-8D1B-24D4363273D7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {74AAA4A9-D14F-47A7-8D1B-24D4363273D7}.Release|Any CPU.Build.0 = Release|Any CPU - {E80328EF-5C1D-422B-8D5A-CE0D89044EB7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E80328EF-5C1D-422B-8D5A-CE0D89044EB7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E80328EF-5C1D-422B-8D5A-CE0D89044EB7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E80328EF-5C1D-422B-8D5A-CE0D89044EB7}.Release|Any CPU.Build.0 = Release|Any CPU - {5F6C600C-EFBE-4DD0-8B0E-ECD3A1F3AE54}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5F6C600C-EFBE-4DD0-8B0E-ECD3A1F3AE54}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5F6C600C-EFBE-4DD0-8B0E-ECD3A1F3AE54}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5F6C600C-EFBE-4DD0-8B0E-ECD3A1F3AE54}.Release|Any CPU.Build.0 = Release|Any CPU - {73D84F38-5206-459A-9485-2585D9FAA1EA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {73D84F38-5206-459A-9485-2585D9FAA1EA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {73D84F38-5206-459A-9485-2585D9FAA1EA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {73D84F38-5206-459A-9485-2585D9FAA1EA}.Release|Any CPU.Build.0 = Release|Any CPU - {3EDE3540-3F11-4D46-924C-4E29A0FD56DF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3EDE3540-3F11-4D46-924C-4E29A0FD56DF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3EDE3540-3F11-4D46-924C-4E29A0FD56DF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3EDE3540-3F11-4D46-924C-4E29A0FD56DF}.Release|Any CPU.Build.0 = Release|Any CPU - {4F9A06D6-CB7B-4B31-9672-19E6C50BDAAE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4F9A06D6-CB7B-4B31-9672-19E6C50BDAAE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4F9A06D6-CB7B-4B31-9672-19E6C50BDAAE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4F9A06D6-CB7B-4B31-9672-19E6C50BDAAE}.Release|Any CPU.Build.0 = Release|Any CPU - {307A6FB8-BD76-4E39-8C51-749C0D977D72}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {307A6FB8-BD76-4E39-8C51-749C0D977D72}.Debug|Any CPU.Build.0 = Debug|Any CPU - {307A6FB8-BD76-4E39-8C51-749C0D977D72}.Release|Any CPU.ActiveCfg = Release|Any CPU - {307A6FB8-BD76-4E39-8C51-749C0D977D72}.Release|Any CPU.Build.0 = Release|Any CPU - {1C107B00-6F38-4A0D-B9A2-6F1747D50530}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1C107B00-6F38-4A0D-B9A2-6F1747D50530}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1C107B00-6F38-4A0D-B9A2-6F1747D50530}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1C107B00-6F38-4A0D-B9A2-6F1747D50530}.Release|Any CPU.Build.0 = Release|Any CPU - {1B2A0A85-4E76-48CE-B808-AE119CED51B0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1B2A0A85-4E76-48CE-B808-AE119CED51B0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1B2A0A85-4E76-48CE-B808-AE119CED51B0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1B2A0A85-4E76-48CE-B808-AE119CED51B0}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {4632E326-7FB4-48A2-A48E-A7BA311A8EB3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4632E326-7FB4-48A2-A48E-A7BA311A8EB3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4632E326-7FB4-48A2-A48E-A7BA311A8EB3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4632E326-7FB4-48A2-A48E-A7BA311A8EB3}.Release|Any CPU.Build.0 = Release|Any CPU - {74AAA4A9-D14F-47A7-8D1B-24D4363273D7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {74AAA4A9-D14F-47A7-8D1B-24D4363273D7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {74AAA4A9-D14F-47A7-8D1B-24D4363273D7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {74AAA4A9-D14F-47A7-8D1B-24D4363273D7}.Release|Any CPU.Build.0 = Release|Any CPU - {E80328EF-5C1D-422B-8D5A-CE0D89044EB7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E80328EF-5C1D-422B-8D5A-CE0D89044EB7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E80328EF-5C1D-422B-8D5A-CE0D89044EB7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E80328EF-5C1D-422B-8D5A-CE0D89044EB7}.Release|Any CPU.Build.0 = Release|Any CPU - {5F6C600C-EFBE-4DD0-8B0E-ECD3A1F3AE54}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5F6C600C-EFBE-4DD0-8B0E-ECD3A1F3AE54}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5F6C600C-EFBE-4DD0-8B0E-ECD3A1F3AE54}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5F6C600C-EFBE-4DD0-8B0E-ECD3A1F3AE54}.Release|Any CPU.Build.0 = Release|Any CPU - {73D84F38-5206-459A-9485-2585D9FAA1EA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {73D84F38-5206-459A-9485-2585D9FAA1EA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {73D84F38-5206-459A-9485-2585D9FAA1EA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {73D84F38-5206-459A-9485-2585D9FAA1EA}.Release|Any CPU.Build.0 = Release|Any CPU - {3EDE3540-3F11-4D46-924C-4E29A0FD56DF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3EDE3540-3F11-4D46-924C-4E29A0FD56DF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3EDE3540-3F11-4D46-924C-4E29A0FD56DF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3EDE3540-3F11-4D46-924C-4E29A0FD56DF}.Release|Any CPU.Build.0 = Release|Any CPU - {4F9A06D6-CB7B-4B31-9672-19E6C50BDAAE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4F9A06D6-CB7B-4B31-9672-19E6C50BDAAE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4F9A06D6-CB7B-4B31-9672-19E6C50BDAAE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4F9A06D6-CB7B-4B31-9672-19E6C50BDAAE}.Release|Any CPU.Build.0 = Release|Any CPU - {307A6FB8-BD76-4E39-8C51-749C0D977D72}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {307A6FB8-BD76-4E39-8C51-749C0D977D72}.Debug|Any CPU.Build.0 = Debug|Any CPU - {307A6FB8-BD76-4E39-8C51-749C0D977D72}.Release|Any CPU.ActiveCfg = Release|Any CPU - {307A6FB8-BD76-4E39-8C51-749C0D977D72}.Release|Any CPU.Build.0 = Release|Any CPU - {1C107B00-6F38-4A0D-B9A2-6F1747D50530}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1C107B00-6F38-4A0D-B9A2-6F1747D50530}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1C107B00-6F38-4A0D-B9A2-6F1747D50530}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1C107B00-6F38-4A0D-B9A2-6F1747D50530}.Release|Any CPU.Build.0 = Release|Any CPU - {1B2A0A85-4E76-48CE-B808-AE119CED51B0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1B2A0A85-4E76-48CE-B808-AE119CED51B0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1B2A0A85-4E76-48CE-B808-AE119CED51B0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1B2A0A85-4E76-48CE-B808-AE119CED51B0}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {9B3E450E-144A-4D00-9CEC-713D9CF8B8DC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {DECA59F0-1DF9-473E-A365-6A46ABA1D2CA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {81B9C6B5-3D07-4E80-85D9-AFBA9F30DABB} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {6C48D98A-9BBE-4C48-A651-59000359A0F0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {1856253A-7F12-487D-9856-B2DC5B5A1386} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {4632E326-7FB4-48A2-A48E-A7BA311A8EB3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {74AAA4A9-D14F-47A7-8D1B-24D4363273D7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E80328EF-5C1D-422B-8D5A-CE0D89044EB7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {5F6C600C-EFBE-4DD0-8B0E-ECD3A1F3AE54} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {73D84F38-5206-459A-9485-2585D9FAA1EA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {3EDE3540-3F11-4D46-924C-4E29A0FD56DF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4F9A06D6-CB7B-4B31-9672-19E6C50BDAAE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {307A6FB8-BD76-4E39-8C51-749C0D977D72} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {1C107B00-6F38-4A0D-B9A2-6F1747D50530} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {1B2A0A85-4E76-48CE-B808-AE119CED51B0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {4632E326-7FB4-48A2-A48E-A7BA311A8EB3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {74AAA4A9-D14F-47A7-8D1B-24D4363273D7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E80328EF-5C1D-422B-8D5A-CE0D89044EB7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {5F6C600C-EFBE-4DD0-8B0E-ECD3A1F3AE54} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {73D84F38-5206-459A-9485-2585D9FAA1EA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {3EDE3540-3F11-4D46-924C-4E29A0FD56DF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4F9A06D6-CB7B-4B31-9672-19E6C50BDAAE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {307A6FB8-BD76-4E39-8C51-749C0D977D72} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {1C107B00-6F38-4A0D-B9A2-6F1747D50530} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {1B2A0A85-4E76-48CE-B808-AE119CED51B0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {C223238B-0AAB-4365-AB64-1C3528A9DBB2} diff --git a/sdk/src/Services/FinSpaceData/Generated/AmazonFinSpaceDataConfig.cs b/sdk/src/Services/FinSpaceData/Generated/AmazonFinSpaceDataConfig.cs index dbd6e7e70b8e..299d910b4fcb 100644 --- a/sdk/src/Services/FinSpaceData/Generated/AmazonFinSpaceDataConfig.cs +++ b/sdk/src/Services/FinSpaceData/Generated/AmazonFinSpaceDataConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.FinSpaceData public partial class AmazonFinSpaceDataConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("finspace data", "4.0.0.0"); private static readonly AmazonFinSpaceDataEndpointResolver EndpointResolver = new AmazonFinSpaceDataEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("finspace data", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("finspace data", "3.7.400.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/FinSpaceData/Properties/AssemblyInfo.cs b/sdk/src/Services/FinSpaceData/Properties/AssemblyInfo.cs index 48f3c20c11d0..84d118b35091 100644 --- a/sdk/src/Services/FinSpaceData/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/FinSpaceData/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/Finspace/Finspace.sln b/sdk/src/Services/Finspace/Finspace.sln index 5735355a46da..ebfe42ef7ea2 100644 --- a/sdk/src/Services/Finspace/Finspace.sln +++ b/sdk/src/Services/Finspace/Finspace.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {1C95114C-8EBF-48E0-A792-FD4085B5EF63}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {1C95114C-8EBF-48E0-A792-FD4085B5EF63}.Debug|Any CPU.Build.0 = Debug|Any CPU {1C95114C-8EBF-48E0-A792-FD4085B5EF63}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {E436B7F2-90AC-4A5A-927B-727B9152E817}.Debug|Any CPU.Build.0 = Debug|Any CPU {E436B7F2-90AC-4A5A-927B-727B9152E817}.Release|Any CPU.ActiveCfg = Release|Any CPU {E436B7F2-90AC-4A5A-927B-727B9152E817}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {9328B90D-031D-4412-A605-B5B3FBE0FAC9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9328B90D-031D-4412-A605-B5B3FBE0FAC9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9328B90D-031D-4412-A605-B5B3FBE0FAC9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9328B90D-031D-4412-A605-B5B3FBE0FAC9}.Release|Any CPU.Build.0 = Release|Any CPU - {69A1F61B-BBBB-4B58-B207-B7DCCBA4C2FC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {69A1F61B-BBBB-4B58-B207-B7DCCBA4C2FC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {69A1F61B-BBBB-4B58-B207-B7DCCBA4C2FC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {69A1F61B-BBBB-4B58-B207-B7DCCBA4C2FC}.Release|Any CPU.Build.0 = Release|Any CPU - {FCB64D88-5BFC-4F75-8843-341BF4ADB68C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FCB64D88-5BFC-4F75-8843-341BF4ADB68C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FCB64D88-5BFC-4F75-8843-341BF4ADB68C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FCB64D88-5BFC-4F75-8843-341BF4ADB68C}.Release|Any CPU.Build.0 = Release|Any CPU - {5B897162-D652-4AD8-9721-B122525701BE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5B897162-D652-4AD8-9721-B122525701BE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5B897162-D652-4AD8-9721-B122525701BE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5B897162-D652-4AD8-9721-B122525701BE}.Release|Any CPU.Build.0 = Release|Any CPU - {39B4F076-5D6C-4083-89B4-8AA366B98799}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {39B4F076-5D6C-4083-89B4-8AA366B98799}.Debug|Any CPU.Build.0 = Debug|Any CPU - {39B4F076-5D6C-4083-89B4-8AA366B98799}.Release|Any CPU.ActiveCfg = Release|Any CPU - {39B4F076-5D6C-4083-89B4-8AA366B98799}.Release|Any CPU.Build.0 = Release|Any CPU - {F2D73645-F300-4008-B885-B3C9C5DEB88B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F2D73645-F300-4008-B885-B3C9C5DEB88B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F2D73645-F300-4008-B885-B3C9C5DEB88B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F2D73645-F300-4008-B885-B3C9C5DEB88B}.Release|Any CPU.Build.0 = Release|Any CPU - {1246FF33-BEBA-4281-B2CC-B5D1A786DFA8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1246FF33-BEBA-4281-B2CC-B5D1A786DFA8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1246FF33-BEBA-4281-B2CC-B5D1A786DFA8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1246FF33-BEBA-4281-B2CC-B5D1A786DFA8}.Release|Any CPU.Build.0 = Release|Any CPU - {BBD6487A-BB12-40C3-A032-B551370AC42F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BBD6487A-BB12-40C3-A032-B551370AC42F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BBD6487A-BB12-40C3-A032-B551370AC42F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BBD6487A-BB12-40C3-A032-B551370AC42F}.Release|Any CPU.Build.0 = Release|Any CPU - {4E5862E1-54C9-4B09-9246-F383128F781F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4E5862E1-54C9-4B09-9246-F383128F781F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4E5862E1-54C9-4B09-9246-F383128F781F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4E5862E1-54C9-4B09-9246-F383128F781F}.Release|Any CPU.Build.0 = Release|Any CPU - {FE204E08-1A54-4A56-95BE-86CEADBDAE38}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FE204E08-1A54-4A56-95BE-86CEADBDAE38}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FE204E08-1A54-4A56-95BE-86CEADBDAE38}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FE204E08-1A54-4A56-95BE-86CEADBDAE38}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {9328B90D-031D-4412-A605-B5B3FBE0FAC9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9328B90D-031D-4412-A605-B5B3FBE0FAC9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9328B90D-031D-4412-A605-B5B3FBE0FAC9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9328B90D-031D-4412-A605-B5B3FBE0FAC9}.Release|Any CPU.Build.0 = Release|Any CPU - {69A1F61B-BBBB-4B58-B207-B7DCCBA4C2FC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {69A1F61B-BBBB-4B58-B207-B7DCCBA4C2FC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {69A1F61B-BBBB-4B58-B207-B7DCCBA4C2FC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {69A1F61B-BBBB-4B58-B207-B7DCCBA4C2FC}.Release|Any CPU.Build.0 = Release|Any CPU - {FCB64D88-5BFC-4F75-8843-341BF4ADB68C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FCB64D88-5BFC-4F75-8843-341BF4ADB68C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FCB64D88-5BFC-4F75-8843-341BF4ADB68C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FCB64D88-5BFC-4F75-8843-341BF4ADB68C}.Release|Any CPU.Build.0 = Release|Any CPU - {5B897162-D652-4AD8-9721-B122525701BE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5B897162-D652-4AD8-9721-B122525701BE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5B897162-D652-4AD8-9721-B122525701BE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5B897162-D652-4AD8-9721-B122525701BE}.Release|Any CPU.Build.0 = Release|Any CPU - {39B4F076-5D6C-4083-89B4-8AA366B98799}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {39B4F076-5D6C-4083-89B4-8AA366B98799}.Debug|Any CPU.Build.0 = Debug|Any CPU - {39B4F076-5D6C-4083-89B4-8AA366B98799}.Release|Any CPU.ActiveCfg = Release|Any CPU - {39B4F076-5D6C-4083-89B4-8AA366B98799}.Release|Any CPU.Build.0 = Release|Any CPU - {F2D73645-F300-4008-B885-B3C9C5DEB88B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F2D73645-F300-4008-B885-B3C9C5DEB88B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F2D73645-F300-4008-B885-B3C9C5DEB88B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F2D73645-F300-4008-B885-B3C9C5DEB88B}.Release|Any CPU.Build.0 = Release|Any CPU - {1246FF33-BEBA-4281-B2CC-B5D1A786DFA8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1246FF33-BEBA-4281-B2CC-B5D1A786DFA8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1246FF33-BEBA-4281-B2CC-B5D1A786DFA8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1246FF33-BEBA-4281-B2CC-B5D1A786DFA8}.Release|Any CPU.Build.0 = Release|Any CPU - {BBD6487A-BB12-40C3-A032-B551370AC42F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BBD6487A-BB12-40C3-A032-B551370AC42F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BBD6487A-BB12-40C3-A032-B551370AC42F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BBD6487A-BB12-40C3-A032-B551370AC42F}.Release|Any CPU.Build.0 = Release|Any CPU - {4E5862E1-54C9-4B09-9246-F383128F781F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4E5862E1-54C9-4B09-9246-F383128F781F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4E5862E1-54C9-4B09-9246-F383128F781F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4E5862E1-54C9-4B09-9246-F383128F781F}.Release|Any CPU.Build.0 = Release|Any CPU - {FE204E08-1A54-4A56-95BE-86CEADBDAE38}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FE204E08-1A54-4A56-95BE-86CEADBDAE38}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FE204E08-1A54-4A56-95BE-86CEADBDAE38}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FE204E08-1A54-4A56-95BE-86CEADBDAE38}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {1C95114C-8EBF-48E0-A792-FD4085B5EF63} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {FF5781F7-4101-42AD-BC71-C660F5DD9744} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {7E8EEB7A-9ACE-402F-A712-7334EF4DA276} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {E7144CF3-218C-4A9A-9959-2955F475C5BC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {E436B7F2-90AC-4A5A-927B-727B9152E817} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {9328B90D-031D-4412-A605-B5B3FBE0FAC9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {69A1F61B-BBBB-4B58-B207-B7DCCBA4C2FC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {FCB64D88-5BFC-4F75-8843-341BF4ADB68C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {5B897162-D652-4AD8-9721-B122525701BE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {39B4F076-5D6C-4083-89B4-8AA366B98799} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F2D73645-F300-4008-B885-B3C9C5DEB88B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {1246FF33-BEBA-4281-B2CC-B5D1A786DFA8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {BBD6487A-BB12-40C3-A032-B551370AC42F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4E5862E1-54C9-4B09-9246-F383128F781F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {FE204E08-1A54-4A56-95BE-86CEADBDAE38} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {9328B90D-031D-4412-A605-B5B3FBE0FAC9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {69A1F61B-BBBB-4B58-B207-B7DCCBA4C2FC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {FCB64D88-5BFC-4F75-8843-341BF4ADB68C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {5B897162-D652-4AD8-9721-B122525701BE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {39B4F076-5D6C-4083-89B4-8AA366B98799} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F2D73645-F300-4008-B885-B3C9C5DEB88B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {1246FF33-BEBA-4281-B2CC-B5D1A786DFA8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {BBD6487A-BB12-40C3-A032-B551370AC42F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4E5862E1-54C9-4B09-9246-F383128F781F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {FE204E08-1A54-4A56-95BE-86CEADBDAE38} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {F7A66460-121E-43F5-A03D-8C3094965846} diff --git a/sdk/src/Services/Finspace/Generated/AmazonFinspaceConfig.cs b/sdk/src/Services/Finspace/Generated/AmazonFinspaceConfig.cs index 1579ece76c88..c347dfcaa2d8 100644 --- a/sdk/src/Services/Finspace/Generated/AmazonFinspaceConfig.cs +++ b/sdk/src/Services/Finspace/Generated/AmazonFinspaceConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.Finspace public partial class AmazonFinspaceConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("finspace", "4.0.0.0"); private static readonly AmazonFinspaceEndpointResolver EndpointResolver = new AmazonFinspaceEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("finspace", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("finspace", "3.7.400.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/Finspace/Properties/AssemblyInfo.cs b/sdk/src/Services/Finspace/Properties/AssemblyInfo.cs index 7e8410654221..e5c1a85a92e5 100644 --- a/sdk/src/Services/Finspace/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/Finspace/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/ForecastQueryService/ForecastQueryService.sln b/sdk/src/Services/ForecastQueryService/ForecastQueryService.sln index 0bd7cc72625d..c30daf9b586c 100644 --- a/sdk/src/Services/ForecastQueryService/ForecastQueryService.sln +++ b/sdk/src/Services/ForecastQueryService/ForecastQueryService.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {103CF6C6-1F57-400F-9019-504CF1F798FE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {103CF6C6-1F57-400F-9019-504CF1F798FE}.Debug|Any CPU.Build.0 = Debug|Any CPU {103CF6C6-1F57-400F-9019-504CF1F798FE}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {9E2C9FD0-C9A9-4C1F-9DB0-839BE50DDFFC}.Debug|Any CPU.Build.0 = Debug|Any CPU {9E2C9FD0-C9A9-4C1F-9DB0-839BE50DDFFC}.Release|Any CPU.ActiveCfg = Release|Any CPU {9E2C9FD0-C9A9-4C1F-9DB0-839BE50DDFFC}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {E5FA70BD-2C5D-4EF7-9F22-AE9BE71E6550}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E5FA70BD-2C5D-4EF7-9F22-AE9BE71E6550}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E5FA70BD-2C5D-4EF7-9F22-AE9BE71E6550}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E5FA70BD-2C5D-4EF7-9F22-AE9BE71E6550}.Release|Any CPU.Build.0 = Release|Any CPU - {390F148F-62E1-4844-AA6E-FAF478F9CA83}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {390F148F-62E1-4844-AA6E-FAF478F9CA83}.Debug|Any CPU.Build.0 = Debug|Any CPU - {390F148F-62E1-4844-AA6E-FAF478F9CA83}.Release|Any CPU.ActiveCfg = Release|Any CPU - {390F148F-62E1-4844-AA6E-FAF478F9CA83}.Release|Any CPU.Build.0 = Release|Any CPU - {E7C45999-0301-4B17-9644-558B4924747B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E7C45999-0301-4B17-9644-558B4924747B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E7C45999-0301-4B17-9644-558B4924747B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E7C45999-0301-4B17-9644-558B4924747B}.Release|Any CPU.Build.0 = Release|Any CPU - {2B59FEAC-7286-4034-8F4C-78FB7CD10F00}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2B59FEAC-7286-4034-8F4C-78FB7CD10F00}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2B59FEAC-7286-4034-8F4C-78FB7CD10F00}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2B59FEAC-7286-4034-8F4C-78FB7CD10F00}.Release|Any CPU.Build.0 = Release|Any CPU - {C8482285-8BC7-45CE-B22B-98695DFFC73D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C8482285-8BC7-45CE-B22B-98695DFFC73D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C8482285-8BC7-45CE-B22B-98695DFFC73D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C8482285-8BC7-45CE-B22B-98695DFFC73D}.Release|Any CPU.Build.0 = Release|Any CPU - {D0C690DE-9672-486A-BBF1-50D993AF514A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D0C690DE-9672-486A-BBF1-50D993AF514A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D0C690DE-9672-486A-BBF1-50D993AF514A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D0C690DE-9672-486A-BBF1-50D993AF514A}.Release|Any CPU.Build.0 = Release|Any CPU - {434F114D-CC34-40A4-9100-6402F7ABEC2F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {434F114D-CC34-40A4-9100-6402F7ABEC2F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {434F114D-CC34-40A4-9100-6402F7ABEC2F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {434F114D-CC34-40A4-9100-6402F7ABEC2F}.Release|Any CPU.Build.0 = Release|Any CPU - {895F07D1-9395-4C4B-95F0-523D9AFE3A58}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {895F07D1-9395-4C4B-95F0-523D9AFE3A58}.Debug|Any CPU.Build.0 = Debug|Any CPU - {895F07D1-9395-4C4B-95F0-523D9AFE3A58}.Release|Any CPU.ActiveCfg = Release|Any CPU - {895F07D1-9395-4C4B-95F0-523D9AFE3A58}.Release|Any CPU.Build.0 = Release|Any CPU - {4C153AFF-2749-4F08-988A-122C60F845FA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4C153AFF-2749-4F08-988A-122C60F845FA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4C153AFF-2749-4F08-988A-122C60F845FA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4C153AFF-2749-4F08-988A-122C60F845FA}.Release|Any CPU.Build.0 = Release|Any CPU - {B988FF5B-D395-46DE-84C0-63B2044F6C47}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B988FF5B-D395-46DE-84C0-63B2044F6C47}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B988FF5B-D395-46DE-84C0-63B2044F6C47}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B988FF5B-D395-46DE-84C0-63B2044F6C47}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {E5FA70BD-2C5D-4EF7-9F22-AE9BE71E6550}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E5FA70BD-2C5D-4EF7-9F22-AE9BE71E6550}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E5FA70BD-2C5D-4EF7-9F22-AE9BE71E6550}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E5FA70BD-2C5D-4EF7-9F22-AE9BE71E6550}.Release|Any CPU.Build.0 = Release|Any CPU - {390F148F-62E1-4844-AA6E-FAF478F9CA83}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {390F148F-62E1-4844-AA6E-FAF478F9CA83}.Debug|Any CPU.Build.0 = Debug|Any CPU - {390F148F-62E1-4844-AA6E-FAF478F9CA83}.Release|Any CPU.ActiveCfg = Release|Any CPU - {390F148F-62E1-4844-AA6E-FAF478F9CA83}.Release|Any CPU.Build.0 = Release|Any CPU - {E7C45999-0301-4B17-9644-558B4924747B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E7C45999-0301-4B17-9644-558B4924747B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E7C45999-0301-4B17-9644-558B4924747B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E7C45999-0301-4B17-9644-558B4924747B}.Release|Any CPU.Build.0 = Release|Any CPU - {2B59FEAC-7286-4034-8F4C-78FB7CD10F00}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2B59FEAC-7286-4034-8F4C-78FB7CD10F00}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2B59FEAC-7286-4034-8F4C-78FB7CD10F00}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2B59FEAC-7286-4034-8F4C-78FB7CD10F00}.Release|Any CPU.Build.0 = Release|Any CPU - {C8482285-8BC7-45CE-B22B-98695DFFC73D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C8482285-8BC7-45CE-B22B-98695DFFC73D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C8482285-8BC7-45CE-B22B-98695DFFC73D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C8482285-8BC7-45CE-B22B-98695DFFC73D}.Release|Any CPU.Build.0 = Release|Any CPU - {D0C690DE-9672-486A-BBF1-50D993AF514A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D0C690DE-9672-486A-BBF1-50D993AF514A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D0C690DE-9672-486A-BBF1-50D993AF514A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D0C690DE-9672-486A-BBF1-50D993AF514A}.Release|Any CPU.Build.0 = Release|Any CPU - {434F114D-CC34-40A4-9100-6402F7ABEC2F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {434F114D-CC34-40A4-9100-6402F7ABEC2F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {434F114D-CC34-40A4-9100-6402F7ABEC2F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {434F114D-CC34-40A4-9100-6402F7ABEC2F}.Release|Any CPU.Build.0 = Release|Any CPU - {895F07D1-9395-4C4B-95F0-523D9AFE3A58}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {895F07D1-9395-4C4B-95F0-523D9AFE3A58}.Debug|Any CPU.Build.0 = Debug|Any CPU - {895F07D1-9395-4C4B-95F0-523D9AFE3A58}.Release|Any CPU.ActiveCfg = Release|Any CPU - {895F07D1-9395-4C4B-95F0-523D9AFE3A58}.Release|Any CPU.Build.0 = Release|Any CPU - {4C153AFF-2749-4F08-988A-122C60F845FA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4C153AFF-2749-4F08-988A-122C60F845FA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4C153AFF-2749-4F08-988A-122C60F845FA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4C153AFF-2749-4F08-988A-122C60F845FA}.Release|Any CPU.Build.0 = Release|Any CPU - {B988FF5B-D395-46DE-84C0-63B2044F6C47}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B988FF5B-D395-46DE-84C0-63B2044F6C47}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B988FF5B-D395-46DE-84C0-63B2044F6C47}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B988FF5B-D395-46DE-84C0-63B2044F6C47}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {103CF6C6-1F57-400F-9019-504CF1F798FE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {17816A01-9A95-43CB-966B-8D961B202DF8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {99306167-697A-4619-8B16-CE4366D245C7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {1E8646D5-1F25-4FF6-9A87-16C75890B388} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {9E2C9FD0-C9A9-4C1F-9DB0-839BE50DDFFC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {E5FA70BD-2C5D-4EF7-9F22-AE9BE71E6550} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {390F148F-62E1-4844-AA6E-FAF478F9CA83} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E7C45999-0301-4B17-9644-558B4924747B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {2B59FEAC-7286-4034-8F4C-78FB7CD10F00} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C8482285-8BC7-45CE-B22B-98695DFFC73D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D0C690DE-9672-486A-BBF1-50D993AF514A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {434F114D-CC34-40A4-9100-6402F7ABEC2F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {895F07D1-9395-4C4B-95F0-523D9AFE3A58} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4C153AFF-2749-4F08-988A-122C60F845FA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B988FF5B-D395-46DE-84C0-63B2044F6C47} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {E5FA70BD-2C5D-4EF7-9F22-AE9BE71E6550} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {390F148F-62E1-4844-AA6E-FAF478F9CA83} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E7C45999-0301-4B17-9644-558B4924747B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {2B59FEAC-7286-4034-8F4C-78FB7CD10F00} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C8482285-8BC7-45CE-B22B-98695DFFC73D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D0C690DE-9672-486A-BBF1-50D993AF514A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {434F114D-CC34-40A4-9100-6402F7ABEC2F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {895F07D1-9395-4C4B-95F0-523D9AFE3A58} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4C153AFF-2749-4F08-988A-122C60F845FA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B988FF5B-D395-46DE-84C0-63B2044F6C47} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {CA29AA94-7319-4481-85F0-B236F53DB367} diff --git a/sdk/src/Services/ForecastQueryService/Generated/AmazonForecastQueryServiceConfig.cs b/sdk/src/Services/ForecastQueryService/Generated/AmazonForecastQueryServiceConfig.cs index f37427f26806..e1146f01029a 100644 --- a/sdk/src/Services/ForecastQueryService/Generated/AmazonForecastQueryServiceConfig.cs +++ b/sdk/src/Services/ForecastQueryService/Generated/AmazonForecastQueryServiceConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.ForecastQueryService public partial class AmazonForecastQueryServiceConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("forecastquery", "4.0.0.0"); private static readonly AmazonForecastQueryServiceEndpointResolver EndpointResolver = new AmazonForecastQueryServiceEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("forecastquery", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("forecastquery", "3.7.400.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/ForecastQueryService/Properties/AssemblyInfo.cs b/sdk/src/Services/ForecastQueryService/Properties/AssemblyInfo.cs index b11aaf30d4b2..1b986365ad16 100644 --- a/sdk/src/Services/ForecastQueryService/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/ForecastQueryService/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/ForecastService/ForecastService.sln b/sdk/src/Services/ForecastService/ForecastService.sln index aa3c4c8629c4..9a29ae4b741a 100644 --- a/sdk/src/Services/ForecastService/ForecastService.sln +++ b/sdk/src/Services/ForecastService/ForecastService.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {800B2FD2-40BF-4ED8-BE15-F6C0FC975C78}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {800B2FD2-40BF-4ED8-BE15-F6C0FC975C78}.Debug|Any CPU.Build.0 = Debug|Any CPU {800B2FD2-40BF-4ED8-BE15-F6C0FC975C78}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {9BD6009A-6029-4AC9-9EA2-741E7D16D9E6}.Debug|Any CPU.Build.0 = Debug|Any CPU {9BD6009A-6029-4AC9-9EA2-741E7D16D9E6}.Release|Any CPU.ActiveCfg = Release|Any CPU {9BD6009A-6029-4AC9-9EA2-741E7D16D9E6}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {37350BE7-0002-4C9D-BD3D-D397931167B4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {37350BE7-0002-4C9D-BD3D-D397931167B4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {37350BE7-0002-4C9D-BD3D-D397931167B4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {37350BE7-0002-4C9D-BD3D-D397931167B4}.Release|Any CPU.Build.0 = Release|Any CPU - {647968A1-12D4-49E8-ABC8-6690F05CD450}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {647968A1-12D4-49E8-ABC8-6690F05CD450}.Debug|Any CPU.Build.0 = Debug|Any CPU - {647968A1-12D4-49E8-ABC8-6690F05CD450}.Release|Any CPU.ActiveCfg = Release|Any CPU - {647968A1-12D4-49E8-ABC8-6690F05CD450}.Release|Any CPU.Build.0 = Release|Any CPU - {F5C2FF83-72D0-41CC-A9DA-88ED2E420B96}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F5C2FF83-72D0-41CC-A9DA-88ED2E420B96}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F5C2FF83-72D0-41CC-A9DA-88ED2E420B96}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F5C2FF83-72D0-41CC-A9DA-88ED2E420B96}.Release|Any CPU.Build.0 = Release|Any CPU - {EC610C5E-11EC-4FFF-A8F2-BACAD440DDF0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EC610C5E-11EC-4FFF-A8F2-BACAD440DDF0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EC610C5E-11EC-4FFF-A8F2-BACAD440DDF0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EC610C5E-11EC-4FFF-A8F2-BACAD440DDF0}.Release|Any CPU.Build.0 = Release|Any CPU - {15444B5F-8E98-4C9A-B3EB-BCD54EC1417F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {15444B5F-8E98-4C9A-B3EB-BCD54EC1417F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {15444B5F-8E98-4C9A-B3EB-BCD54EC1417F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {15444B5F-8E98-4C9A-B3EB-BCD54EC1417F}.Release|Any CPU.Build.0 = Release|Any CPU - {B3F295AC-516B-42C1-83ED-ABA921BA4F04}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B3F295AC-516B-42C1-83ED-ABA921BA4F04}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B3F295AC-516B-42C1-83ED-ABA921BA4F04}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B3F295AC-516B-42C1-83ED-ABA921BA4F04}.Release|Any CPU.Build.0 = Release|Any CPU - {77972E35-787A-40AF-8DA6-CB05814C1D3D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {77972E35-787A-40AF-8DA6-CB05814C1D3D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {77972E35-787A-40AF-8DA6-CB05814C1D3D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {77972E35-787A-40AF-8DA6-CB05814C1D3D}.Release|Any CPU.Build.0 = Release|Any CPU - {ADCD2799-FE32-4164-B8A4-EE007C1BAD4A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {ADCD2799-FE32-4164-B8A4-EE007C1BAD4A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {ADCD2799-FE32-4164-B8A4-EE007C1BAD4A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {ADCD2799-FE32-4164-B8A4-EE007C1BAD4A}.Release|Any CPU.Build.0 = Release|Any CPU - {2427CCB3-681E-40FF-A6E8-96CDC1D8D57F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2427CCB3-681E-40FF-A6E8-96CDC1D8D57F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2427CCB3-681E-40FF-A6E8-96CDC1D8D57F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2427CCB3-681E-40FF-A6E8-96CDC1D8D57F}.Release|Any CPU.Build.0 = Release|Any CPU - {4F476F92-279F-44A3-88F8-3DD84A44868F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4F476F92-279F-44A3-88F8-3DD84A44868F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4F476F92-279F-44A3-88F8-3DD84A44868F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4F476F92-279F-44A3-88F8-3DD84A44868F}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {37350BE7-0002-4C9D-BD3D-D397931167B4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {37350BE7-0002-4C9D-BD3D-D397931167B4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {37350BE7-0002-4C9D-BD3D-D397931167B4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {37350BE7-0002-4C9D-BD3D-D397931167B4}.Release|Any CPU.Build.0 = Release|Any CPU - {647968A1-12D4-49E8-ABC8-6690F05CD450}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {647968A1-12D4-49E8-ABC8-6690F05CD450}.Debug|Any CPU.Build.0 = Debug|Any CPU - {647968A1-12D4-49E8-ABC8-6690F05CD450}.Release|Any CPU.ActiveCfg = Release|Any CPU - {647968A1-12D4-49E8-ABC8-6690F05CD450}.Release|Any CPU.Build.0 = Release|Any CPU - {F5C2FF83-72D0-41CC-A9DA-88ED2E420B96}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F5C2FF83-72D0-41CC-A9DA-88ED2E420B96}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F5C2FF83-72D0-41CC-A9DA-88ED2E420B96}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F5C2FF83-72D0-41CC-A9DA-88ED2E420B96}.Release|Any CPU.Build.0 = Release|Any CPU - {EC610C5E-11EC-4FFF-A8F2-BACAD440DDF0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EC610C5E-11EC-4FFF-A8F2-BACAD440DDF0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EC610C5E-11EC-4FFF-A8F2-BACAD440DDF0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EC610C5E-11EC-4FFF-A8F2-BACAD440DDF0}.Release|Any CPU.Build.0 = Release|Any CPU - {15444B5F-8E98-4C9A-B3EB-BCD54EC1417F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {15444B5F-8E98-4C9A-B3EB-BCD54EC1417F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {15444B5F-8E98-4C9A-B3EB-BCD54EC1417F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {15444B5F-8E98-4C9A-B3EB-BCD54EC1417F}.Release|Any CPU.Build.0 = Release|Any CPU - {B3F295AC-516B-42C1-83ED-ABA921BA4F04}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B3F295AC-516B-42C1-83ED-ABA921BA4F04}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B3F295AC-516B-42C1-83ED-ABA921BA4F04}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B3F295AC-516B-42C1-83ED-ABA921BA4F04}.Release|Any CPU.Build.0 = Release|Any CPU - {77972E35-787A-40AF-8DA6-CB05814C1D3D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {77972E35-787A-40AF-8DA6-CB05814C1D3D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {77972E35-787A-40AF-8DA6-CB05814C1D3D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {77972E35-787A-40AF-8DA6-CB05814C1D3D}.Release|Any CPU.Build.0 = Release|Any CPU - {ADCD2799-FE32-4164-B8A4-EE007C1BAD4A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {ADCD2799-FE32-4164-B8A4-EE007C1BAD4A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {ADCD2799-FE32-4164-B8A4-EE007C1BAD4A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {ADCD2799-FE32-4164-B8A4-EE007C1BAD4A}.Release|Any CPU.Build.0 = Release|Any CPU - {2427CCB3-681E-40FF-A6E8-96CDC1D8D57F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2427CCB3-681E-40FF-A6E8-96CDC1D8D57F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2427CCB3-681E-40FF-A6E8-96CDC1D8D57F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2427CCB3-681E-40FF-A6E8-96CDC1D8D57F}.Release|Any CPU.Build.0 = Release|Any CPU - {4F476F92-279F-44A3-88F8-3DD84A44868F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4F476F92-279F-44A3-88F8-3DD84A44868F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4F476F92-279F-44A3-88F8-3DD84A44868F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4F476F92-279F-44A3-88F8-3DD84A44868F}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {800B2FD2-40BF-4ED8-BE15-F6C0FC975C78} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {07740D32-D1D9-4EE8-A84C-CD9E858C3A2C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {4166C7E4-7BB5-4D76-8356-7D60DB0C236A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {F4551122-46BB-4CCE-99FE-E0CD3FBC003C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {9BD6009A-6029-4AC9-9EA2-741E7D16D9E6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {37350BE7-0002-4C9D-BD3D-D397931167B4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {647968A1-12D4-49E8-ABC8-6690F05CD450} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F5C2FF83-72D0-41CC-A9DA-88ED2E420B96} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {EC610C5E-11EC-4FFF-A8F2-BACAD440DDF0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {15444B5F-8E98-4C9A-B3EB-BCD54EC1417F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B3F295AC-516B-42C1-83ED-ABA921BA4F04} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {77972E35-787A-40AF-8DA6-CB05814C1D3D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {ADCD2799-FE32-4164-B8A4-EE007C1BAD4A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {2427CCB3-681E-40FF-A6E8-96CDC1D8D57F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4F476F92-279F-44A3-88F8-3DD84A44868F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {37350BE7-0002-4C9D-BD3D-D397931167B4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {647968A1-12D4-49E8-ABC8-6690F05CD450} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F5C2FF83-72D0-41CC-A9DA-88ED2E420B96} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {EC610C5E-11EC-4FFF-A8F2-BACAD440DDF0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {15444B5F-8E98-4C9A-B3EB-BCD54EC1417F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B3F295AC-516B-42C1-83ED-ABA921BA4F04} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {77972E35-787A-40AF-8DA6-CB05814C1D3D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {ADCD2799-FE32-4164-B8A4-EE007C1BAD4A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {2427CCB3-681E-40FF-A6E8-96CDC1D8D57F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4F476F92-279F-44A3-88F8-3DD84A44868F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {34E75DC7-42D6-48D8-A96A-4C3CE7C6453F} diff --git a/sdk/src/Services/ForecastService/Generated/AmazonForecastServiceConfig.cs b/sdk/src/Services/ForecastService/Generated/AmazonForecastServiceConfig.cs index f85aa5d84e6c..2c4cda8cae99 100644 --- a/sdk/src/Services/ForecastService/Generated/AmazonForecastServiceConfig.cs +++ b/sdk/src/Services/ForecastService/Generated/AmazonForecastServiceConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.ForecastService public partial class AmazonForecastServiceConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("forecast", "4.0.0.0"); private static readonly AmazonForecastServiceEndpointResolver EndpointResolver = new AmazonForecastServiceEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("forecast", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("forecast", "3.7.400.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/ForecastService/Properties/AssemblyInfo.cs b/sdk/src/Services/ForecastService/Properties/AssemblyInfo.cs index be4735dfe825..23414eff8529 100644 --- a/sdk/src/Services/ForecastService/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/ForecastService/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/FraudDetector/FraudDetector.sln b/sdk/src/Services/FraudDetector/FraudDetector.sln index e98f19331c24..509a61e62aa6 100644 --- a/sdk/src/Services/FraudDetector/FraudDetector.sln +++ b/sdk/src/Services/FraudDetector/FraudDetector.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {E738F516-8911-43DA-BCB5-A114315BAE75}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {E738F516-8911-43DA-BCB5-A114315BAE75}.Debug|Any CPU.Build.0 = Debug|Any CPU {E738F516-8911-43DA-BCB5-A114315BAE75}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {2CAB8401-F658-49CB-B8CF-7634B57787DE}.Debug|Any CPU.Build.0 = Debug|Any CPU {2CAB8401-F658-49CB-B8CF-7634B57787DE}.Release|Any CPU.ActiveCfg = Release|Any CPU {2CAB8401-F658-49CB-B8CF-7634B57787DE}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {633C6B94-E3CB-4818-AE6E-D682A759846F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {633C6B94-E3CB-4818-AE6E-D682A759846F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {633C6B94-E3CB-4818-AE6E-D682A759846F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {633C6B94-E3CB-4818-AE6E-D682A759846F}.Release|Any CPU.Build.0 = Release|Any CPU - {EACD886D-CA99-482E-9610-D1DEEEE02E67}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EACD886D-CA99-482E-9610-D1DEEEE02E67}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EACD886D-CA99-482E-9610-D1DEEEE02E67}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EACD886D-CA99-482E-9610-D1DEEEE02E67}.Release|Any CPU.Build.0 = Release|Any CPU - {46547DFB-980C-43A1-8B46-AECF30511531}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {46547DFB-980C-43A1-8B46-AECF30511531}.Debug|Any CPU.Build.0 = Debug|Any CPU - {46547DFB-980C-43A1-8B46-AECF30511531}.Release|Any CPU.ActiveCfg = Release|Any CPU - {46547DFB-980C-43A1-8B46-AECF30511531}.Release|Any CPU.Build.0 = Release|Any CPU - {844DC64A-64BC-4F8B-A88D-D800470A8690}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {844DC64A-64BC-4F8B-A88D-D800470A8690}.Debug|Any CPU.Build.0 = Debug|Any CPU - {844DC64A-64BC-4F8B-A88D-D800470A8690}.Release|Any CPU.ActiveCfg = Release|Any CPU - {844DC64A-64BC-4F8B-A88D-D800470A8690}.Release|Any CPU.Build.0 = Release|Any CPU - {4486A217-EF02-44A0-AABF-FC8A3C841ED8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4486A217-EF02-44A0-AABF-FC8A3C841ED8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4486A217-EF02-44A0-AABF-FC8A3C841ED8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4486A217-EF02-44A0-AABF-FC8A3C841ED8}.Release|Any CPU.Build.0 = Release|Any CPU - {B5835CD4-9850-4A88-B9D0-73365E6B574A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B5835CD4-9850-4A88-B9D0-73365E6B574A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B5835CD4-9850-4A88-B9D0-73365E6B574A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B5835CD4-9850-4A88-B9D0-73365E6B574A}.Release|Any CPU.Build.0 = Release|Any CPU - {E06F6E05-E747-4DDA-966C-C3A05B4F5695}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E06F6E05-E747-4DDA-966C-C3A05B4F5695}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E06F6E05-E747-4DDA-966C-C3A05B4F5695}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E06F6E05-E747-4DDA-966C-C3A05B4F5695}.Release|Any CPU.Build.0 = Release|Any CPU - {A5517993-38E2-4199-AC50-3012D97735CC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A5517993-38E2-4199-AC50-3012D97735CC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A5517993-38E2-4199-AC50-3012D97735CC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A5517993-38E2-4199-AC50-3012D97735CC}.Release|Any CPU.Build.0 = Release|Any CPU - {8A3D4103-3EE7-4393-9450-E33E0D418CB0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8A3D4103-3EE7-4393-9450-E33E0D418CB0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8A3D4103-3EE7-4393-9450-E33E0D418CB0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8A3D4103-3EE7-4393-9450-E33E0D418CB0}.Release|Any CPU.Build.0 = Release|Any CPU - {26F5C98B-C575-43DD-A543-90FB11EDDAE3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {26F5C98B-C575-43DD-A543-90FB11EDDAE3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {26F5C98B-C575-43DD-A543-90FB11EDDAE3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {26F5C98B-C575-43DD-A543-90FB11EDDAE3}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {633C6B94-E3CB-4818-AE6E-D682A759846F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {633C6B94-E3CB-4818-AE6E-D682A759846F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {633C6B94-E3CB-4818-AE6E-D682A759846F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {633C6B94-E3CB-4818-AE6E-D682A759846F}.Release|Any CPU.Build.0 = Release|Any CPU - {EACD886D-CA99-482E-9610-D1DEEEE02E67}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EACD886D-CA99-482E-9610-D1DEEEE02E67}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EACD886D-CA99-482E-9610-D1DEEEE02E67}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EACD886D-CA99-482E-9610-D1DEEEE02E67}.Release|Any CPU.Build.0 = Release|Any CPU - {46547DFB-980C-43A1-8B46-AECF30511531}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {46547DFB-980C-43A1-8B46-AECF30511531}.Debug|Any CPU.Build.0 = Debug|Any CPU - {46547DFB-980C-43A1-8B46-AECF30511531}.Release|Any CPU.ActiveCfg = Release|Any CPU - {46547DFB-980C-43A1-8B46-AECF30511531}.Release|Any CPU.Build.0 = Release|Any CPU - {844DC64A-64BC-4F8B-A88D-D800470A8690}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {844DC64A-64BC-4F8B-A88D-D800470A8690}.Debug|Any CPU.Build.0 = Debug|Any CPU - {844DC64A-64BC-4F8B-A88D-D800470A8690}.Release|Any CPU.ActiveCfg = Release|Any CPU - {844DC64A-64BC-4F8B-A88D-D800470A8690}.Release|Any CPU.Build.0 = Release|Any CPU - {4486A217-EF02-44A0-AABF-FC8A3C841ED8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4486A217-EF02-44A0-AABF-FC8A3C841ED8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4486A217-EF02-44A0-AABF-FC8A3C841ED8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4486A217-EF02-44A0-AABF-FC8A3C841ED8}.Release|Any CPU.Build.0 = Release|Any CPU - {B5835CD4-9850-4A88-B9D0-73365E6B574A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B5835CD4-9850-4A88-B9D0-73365E6B574A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B5835CD4-9850-4A88-B9D0-73365E6B574A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B5835CD4-9850-4A88-B9D0-73365E6B574A}.Release|Any CPU.Build.0 = Release|Any CPU - {E06F6E05-E747-4DDA-966C-C3A05B4F5695}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E06F6E05-E747-4DDA-966C-C3A05B4F5695}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E06F6E05-E747-4DDA-966C-C3A05B4F5695}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E06F6E05-E747-4DDA-966C-C3A05B4F5695}.Release|Any CPU.Build.0 = Release|Any CPU - {A5517993-38E2-4199-AC50-3012D97735CC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A5517993-38E2-4199-AC50-3012D97735CC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A5517993-38E2-4199-AC50-3012D97735CC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A5517993-38E2-4199-AC50-3012D97735CC}.Release|Any CPU.Build.0 = Release|Any CPU - {8A3D4103-3EE7-4393-9450-E33E0D418CB0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8A3D4103-3EE7-4393-9450-E33E0D418CB0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8A3D4103-3EE7-4393-9450-E33E0D418CB0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8A3D4103-3EE7-4393-9450-E33E0D418CB0}.Release|Any CPU.Build.0 = Release|Any CPU - {26F5C98B-C575-43DD-A543-90FB11EDDAE3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {26F5C98B-C575-43DD-A543-90FB11EDDAE3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {26F5C98B-C575-43DD-A543-90FB11EDDAE3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {26F5C98B-C575-43DD-A543-90FB11EDDAE3}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {E738F516-8911-43DA-BCB5-A114315BAE75} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {4F337C89-4B51-4238-8634-0CE498DC3DCA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {626E758C-560D-441D-912A-B31A71BA8502} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {0560FCB4-893F-4141-8A78-74C6FD7DBD4A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {2CAB8401-F658-49CB-B8CF-7634B57787DE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {633C6B94-E3CB-4818-AE6E-D682A759846F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {EACD886D-CA99-482E-9610-D1DEEEE02E67} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {46547DFB-980C-43A1-8B46-AECF30511531} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {844DC64A-64BC-4F8B-A88D-D800470A8690} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4486A217-EF02-44A0-AABF-FC8A3C841ED8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B5835CD4-9850-4A88-B9D0-73365E6B574A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E06F6E05-E747-4DDA-966C-C3A05B4F5695} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A5517993-38E2-4199-AC50-3012D97735CC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8A3D4103-3EE7-4393-9450-E33E0D418CB0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {26F5C98B-C575-43DD-A543-90FB11EDDAE3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {633C6B94-E3CB-4818-AE6E-D682A759846F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {EACD886D-CA99-482E-9610-D1DEEEE02E67} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {46547DFB-980C-43A1-8B46-AECF30511531} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {844DC64A-64BC-4F8B-A88D-D800470A8690} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4486A217-EF02-44A0-AABF-FC8A3C841ED8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B5835CD4-9850-4A88-B9D0-73365E6B574A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E06F6E05-E747-4DDA-966C-C3A05B4F5695} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A5517993-38E2-4199-AC50-3012D97735CC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8A3D4103-3EE7-4393-9450-E33E0D418CB0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {26F5C98B-C575-43DD-A543-90FB11EDDAE3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {CF84DB7A-6E51-443B-A705-4A54811910D7} diff --git a/sdk/src/Services/FraudDetector/Generated/AmazonFraudDetectorConfig.cs b/sdk/src/Services/FraudDetector/Generated/AmazonFraudDetectorConfig.cs index 7ea43d294dc5..76180ecc070d 100644 --- a/sdk/src/Services/FraudDetector/Generated/AmazonFraudDetectorConfig.cs +++ b/sdk/src/Services/FraudDetector/Generated/AmazonFraudDetectorConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.FraudDetector public partial class AmazonFraudDetectorConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("FraudDetector", "4.0.0.0"); private static readonly AmazonFraudDetectorEndpointResolver EndpointResolver = new AmazonFraudDetectorEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("FraudDetector", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("FraudDetector", "3.7.400.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/FraudDetector/Properties/AssemblyInfo.cs b/sdk/src/Services/FraudDetector/Properties/AssemblyInfo.cs index e4a7bad723a5..05a3c5c0d4ed 100644 --- a/sdk/src/Services/FraudDetector/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/FraudDetector/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/FreeTier/FreeTier.sln b/sdk/src/Services/FreeTier/FreeTier.sln index a28ccf9e6463..eb201c96f440 100644 --- a/sdk/src/Services/FreeTier/FreeTier.sln +++ b/sdk/src/Services/FreeTier/FreeTier.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {B2DAE535-E4F3-41C4-BF3E-06079E587481}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {B2DAE535-E4F3-41C4-BF3E-06079E587481}.Debug|Any CPU.Build.0 = Debug|Any CPU {B2DAE535-E4F3-41C4-BF3E-06079E587481}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {6F5FD0BA-77D0-4506-BF54-06A96A914166}.Debug|Any CPU.Build.0 = Debug|Any CPU {6F5FD0BA-77D0-4506-BF54-06A96A914166}.Release|Any CPU.ActiveCfg = Release|Any CPU {6F5FD0BA-77D0-4506-BF54-06A96A914166}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {05069434-5E96-48BE-AAC3-90E7F4AEEABF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {05069434-5E96-48BE-AAC3-90E7F4AEEABF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {05069434-5E96-48BE-AAC3-90E7F4AEEABF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {05069434-5E96-48BE-AAC3-90E7F4AEEABF}.Release|Any CPU.Build.0 = Release|Any CPU - {43E0C637-8407-4997-9E1C-06FAAA127C93}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {43E0C637-8407-4997-9E1C-06FAAA127C93}.Debug|Any CPU.Build.0 = Debug|Any CPU - {43E0C637-8407-4997-9E1C-06FAAA127C93}.Release|Any CPU.ActiveCfg = Release|Any CPU - {43E0C637-8407-4997-9E1C-06FAAA127C93}.Release|Any CPU.Build.0 = Release|Any CPU - {BAF0FDA6-4B9F-4415-9D94-730CC6DB7AC8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BAF0FDA6-4B9F-4415-9D94-730CC6DB7AC8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BAF0FDA6-4B9F-4415-9D94-730CC6DB7AC8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BAF0FDA6-4B9F-4415-9D94-730CC6DB7AC8}.Release|Any CPU.Build.0 = Release|Any CPU - {32AFAF81-68BD-4195-817E-BA83E0DB8E32}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {32AFAF81-68BD-4195-817E-BA83E0DB8E32}.Debug|Any CPU.Build.0 = Debug|Any CPU - {32AFAF81-68BD-4195-817E-BA83E0DB8E32}.Release|Any CPU.ActiveCfg = Release|Any CPU - {32AFAF81-68BD-4195-817E-BA83E0DB8E32}.Release|Any CPU.Build.0 = Release|Any CPU - {DEA9CBEE-676E-47CD-B82F-67546B3D8943}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DEA9CBEE-676E-47CD-B82F-67546B3D8943}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DEA9CBEE-676E-47CD-B82F-67546B3D8943}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DEA9CBEE-676E-47CD-B82F-67546B3D8943}.Release|Any CPU.Build.0 = Release|Any CPU - {2D1A00C9-6460-4066-B8DF-D6E14423E62E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2D1A00C9-6460-4066-B8DF-D6E14423E62E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2D1A00C9-6460-4066-B8DF-D6E14423E62E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2D1A00C9-6460-4066-B8DF-D6E14423E62E}.Release|Any CPU.Build.0 = Release|Any CPU - {451D8477-AE1F-4AFF-85C8-9D5EB2E41EE5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {451D8477-AE1F-4AFF-85C8-9D5EB2E41EE5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {451D8477-AE1F-4AFF-85C8-9D5EB2E41EE5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {451D8477-AE1F-4AFF-85C8-9D5EB2E41EE5}.Release|Any CPU.Build.0 = Release|Any CPU - {D4C14DAF-0BC6-4C53-81CE-66D27CA44607}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D4C14DAF-0BC6-4C53-81CE-66D27CA44607}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D4C14DAF-0BC6-4C53-81CE-66D27CA44607}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D4C14DAF-0BC6-4C53-81CE-66D27CA44607}.Release|Any CPU.Build.0 = Release|Any CPU - {27D2CA2A-8F95-4132-AEE3-8F6028B4ADBF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {27D2CA2A-8F95-4132-AEE3-8F6028B4ADBF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {27D2CA2A-8F95-4132-AEE3-8F6028B4ADBF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {27D2CA2A-8F95-4132-AEE3-8F6028B4ADBF}.Release|Any CPU.Build.0 = Release|Any CPU - {A1C7F73C-AC38-40C6-95B6-A42D0A6CC814}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A1C7F73C-AC38-40C6-95B6-A42D0A6CC814}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A1C7F73C-AC38-40C6-95B6-A42D0A6CC814}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A1C7F73C-AC38-40C6-95B6-A42D0A6CC814}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {05069434-5E96-48BE-AAC3-90E7F4AEEABF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {05069434-5E96-48BE-AAC3-90E7F4AEEABF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {05069434-5E96-48BE-AAC3-90E7F4AEEABF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {05069434-5E96-48BE-AAC3-90E7F4AEEABF}.Release|Any CPU.Build.0 = Release|Any CPU - {43E0C637-8407-4997-9E1C-06FAAA127C93}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {43E0C637-8407-4997-9E1C-06FAAA127C93}.Debug|Any CPU.Build.0 = Debug|Any CPU - {43E0C637-8407-4997-9E1C-06FAAA127C93}.Release|Any CPU.ActiveCfg = Release|Any CPU - {43E0C637-8407-4997-9E1C-06FAAA127C93}.Release|Any CPU.Build.0 = Release|Any CPU - {BAF0FDA6-4B9F-4415-9D94-730CC6DB7AC8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BAF0FDA6-4B9F-4415-9D94-730CC6DB7AC8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BAF0FDA6-4B9F-4415-9D94-730CC6DB7AC8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BAF0FDA6-4B9F-4415-9D94-730CC6DB7AC8}.Release|Any CPU.Build.0 = Release|Any CPU - {32AFAF81-68BD-4195-817E-BA83E0DB8E32}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {32AFAF81-68BD-4195-817E-BA83E0DB8E32}.Debug|Any CPU.Build.0 = Debug|Any CPU - {32AFAF81-68BD-4195-817E-BA83E0DB8E32}.Release|Any CPU.ActiveCfg = Release|Any CPU - {32AFAF81-68BD-4195-817E-BA83E0DB8E32}.Release|Any CPU.Build.0 = Release|Any CPU - {DEA9CBEE-676E-47CD-B82F-67546B3D8943}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DEA9CBEE-676E-47CD-B82F-67546B3D8943}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DEA9CBEE-676E-47CD-B82F-67546B3D8943}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DEA9CBEE-676E-47CD-B82F-67546B3D8943}.Release|Any CPU.Build.0 = Release|Any CPU - {2D1A00C9-6460-4066-B8DF-D6E14423E62E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2D1A00C9-6460-4066-B8DF-D6E14423E62E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2D1A00C9-6460-4066-B8DF-D6E14423E62E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2D1A00C9-6460-4066-B8DF-D6E14423E62E}.Release|Any CPU.Build.0 = Release|Any CPU - {451D8477-AE1F-4AFF-85C8-9D5EB2E41EE5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {451D8477-AE1F-4AFF-85C8-9D5EB2E41EE5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {451D8477-AE1F-4AFF-85C8-9D5EB2E41EE5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {451D8477-AE1F-4AFF-85C8-9D5EB2E41EE5}.Release|Any CPU.Build.0 = Release|Any CPU - {D4C14DAF-0BC6-4C53-81CE-66D27CA44607}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D4C14DAF-0BC6-4C53-81CE-66D27CA44607}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D4C14DAF-0BC6-4C53-81CE-66D27CA44607}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D4C14DAF-0BC6-4C53-81CE-66D27CA44607}.Release|Any CPU.Build.0 = Release|Any CPU - {27D2CA2A-8F95-4132-AEE3-8F6028B4ADBF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {27D2CA2A-8F95-4132-AEE3-8F6028B4ADBF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {27D2CA2A-8F95-4132-AEE3-8F6028B4ADBF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {27D2CA2A-8F95-4132-AEE3-8F6028B4ADBF}.Release|Any CPU.Build.0 = Release|Any CPU - {A1C7F73C-AC38-40C6-95B6-A42D0A6CC814}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A1C7F73C-AC38-40C6-95B6-A42D0A6CC814}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A1C7F73C-AC38-40C6-95B6-A42D0A6CC814}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A1C7F73C-AC38-40C6-95B6-A42D0A6CC814}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {B2DAE535-E4F3-41C4-BF3E-06079E587481} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {2C415326-45E9-4352-B9E0-23635BA05FDF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {449FFA9E-FDD1-43E9-9816-5D311AD98CC3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {FB2D7E83-1A9B-4ADF-AECC-9139D8988996} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {6F5FD0BA-77D0-4506-BF54-06A96A914166} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {05069434-5E96-48BE-AAC3-90E7F4AEEABF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {43E0C637-8407-4997-9E1C-06FAAA127C93} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {BAF0FDA6-4B9F-4415-9D94-730CC6DB7AC8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {32AFAF81-68BD-4195-817E-BA83E0DB8E32} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {DEA9CBEE-676E-47CD-B82F-67546B3D8943} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {2D1A00C9-6460-4066-B8DF-D6E14423E62E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {451D8477-AE1F-4AFF-85C8-9D5EB2E41EE5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D4C14DAF-0BC6-4C53-81CE-66D27CA44607} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {27D2CA2A-8F95-4132-AEE3-8F6028B4ADBF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A1C7F73C-AC38-40C6-95B6-A42D0A6CC814} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {05069434-5E96-48BE-AAC3-90E7F4AEEABF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {43E0C637-8407-4997-9E1C-06FAAA127C93} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {BAF0FDA6-4B9F-4415-9D94-730CC6DB7AC8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {32AFAF81-68BD-4195-817E-BA83E0DB8E32} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {DEA9CBEE-676E-47CD-B82F-67546B3D8943} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {2D1A00C9-6460-4066-B8DF-D6E14423E62E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {451D8477-AE1F-4AFF-85C8-9D5EB2E41EE5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D4C14DAF-0BC6-4C53-81CE-66D27CA44607} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {27D2CA2A-8F95-4132-AEE3-8F6028B4ADBF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A1C7F73C-AC38-40C6-95B6-A42D0A6CC814} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {1BA63E11-B551-4879-8D4E-F6FC8A2D491B} diff --git a/sdk/src/Services/FreeTier/Generated/AmazonFreeTierConfig.cs b/sdk/src/Services/FreeTier/Generated/AmazonFreeTierConfig.cs index d8dca471a4b5..b62398401906 100644 --- a/sdk/src/Services/FreeTier/Generated/AmazonFreeTierConfig.cs +++ b/sdk/src/Services/FreeTier/Generated/AmazonFreeTierConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.FreeTier public partial class AmazonFreeTierConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("FreeTier", "4.0.0.0"); private static readonly AmazonFreeTierEndpointResolver EndpointResolver = new AmazonFreeTierEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("FreeTier", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("FreeTier", "3.7.400.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/FreeTier/Properties/AssemblyInfo.cs b/sdk/src/Services/FreeTier/Properties/AssemblyInfo.cs index 2769b6deb273..5bcecadd0da4 100644 --- a/sdk/src/Services/FreeTier/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/FreeTier/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/GameLift/GameLift.sln b/sdk/src/Services/GameLift/GameLift.sln index 90171d97c782..ed7715201685 100644 --- a/sdk/src/Services/GameLift/GameLift.sln +++ b/sdk/src/Services/GameLift/GameLift.sln @@ -92,7 +92,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {C091E937-15A1-443C-8A86-EFC9B3E185CD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {C091E937-15A1-443C-8A86-EFC9B3E185CD}.Debug|Any CPU.Build.0 = Debug|Any CPU {C091E937-15A1-443C-8A86-EFC9B3E185CD}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -113,97 +120,6 @@ Global {8FB41AE7-28BA-4530-A2EA-E49079C63D6E}.Debug|Any CPU.Build.0 = Debug|Any CPU {8FB41AE7-28BA-4530-A2EA-E49079C63D6E}.Release|Any CPU.ActiveCfg = Release|Any CPU {8FB41AE7-28BA-4530-A2EA-E49079C63D6E}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {3F5148D5-350D-4B26-942B-19F9FB091722}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3F5148D5-350D-4B26-942B-19F9FB091722}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3F5148D5-350D-4B26-942B-19F9FB091722}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3F5148D5-350D-4B26-942B-19F9FB091722}.Release|Any CPU.Build.0 = Release|Any CPU - {3F88B5CE-5F96-4D01-9EAF-6ECA400309AB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3F88B5CE-5F96-4D01-9EAF-6ECA400309AB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3F88B5CE-5F96-4D01-9EAF-6ECA400309AB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3F88B5CE-5F96-4D01-9EAF-6ECA400309AB}.Release|Any CPU.Build.0 = Release|Any CPU - {0EF0711F-E11C-4740-AF48-23D1E3537881}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0EF0711F-E11C-4740-AF48-23D1E3537881}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0EF0711F-E11C-4740-AF48-23D1E3537881}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0EF0711F-E11C-4740-AF48-23D1E3537881}.Release|Any CPU.Build.0 = Release|Any CPU - {5F050019-F439-481D-929B-ACE2011DAE33}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5F050019-F439-481D-929B-ACE2011DAE33}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5F050019-F439-481D-929B-ACE2011DAE33}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5F050019-F439-481D-929B-ACE2011DAE33}.Release|Any CPU.Build.0 = Release|Any CPU - {4F691531-E640-4257-B6BD-01B3E6C2F3B7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4F691531-E640-4257-B6BD-01B3E6C2F3B7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4F691531-E640-4257-B6BD-01B3E6C2F3B7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4F691531-E640-4257-B6BD-01B3E6C2F3B7}.Release|Any CPU.Build.0 = Release|Any CPU - {FEA396A9-6937-4231-B894-B27562A716CB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FEA396A9-6937-4231-B894-B27562A716CB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FEA396A9-6937-4231-B894-B27562A716CB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FEA396A9-6937-4231-B894-B27562A716CB}.Release|Any CPU.Build.0 = Release|Any CPU - {67C34A96-61E4-4C9C-A68C-C8B938D8694C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {67C34A96-61E4-4C9C-A68C-C8B938D8694C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {67C34A96-61E4-4C9C-A68C-C8B938D8694C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {67C34A96-61E4-4C9C-A68C-C8B938D8694C}.Release|Any CPU.Build.0 = Release|Any CPU - {6F57F9B4-A642-49CA-A03F-8F7FD7975AF3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6F57F9B4-A642-49CA-A03F-8F7FD7975AF3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6F57F9B4-A642-49CA-A03F-8F7FD7975AF3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6F57F9B4-A642-49CA-A03F-8F7FD7975AF3}.Release|Any CPU.Build.0 = Release|Any CPU - {A1D34EF9-FBAF-49C6-9E3F-9EC375FC5CE0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A1D34EF9-FBAF-49C6-9E3F-9EC375FC5CE0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A1D34EF9-FBAF-49C6-9E3F-9EC375FC5CE0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A1D34EF9-FBAF-49C6-9E3F-9EC375FC5CE0}.Release|Any CPU.Build.0 = Release|Any CPU - {779B7913-B5A3-4DBD-81D2-6935F555AAE7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {779B7913-B5A3-4DBD-81D2-6935F555AAE7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {779B7913-B5A3-4DBD-81D2-6935F555AAE7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {779B7913-B5A3-4DBD-81D2-6935F555AAE7}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {3F5148D5-350D-4B26-942B-19F9FB091722}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3F5148D5-350D-4B26-942B-19F9FB091722}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3F5148D5-350D-4B26-942B-19F9FB091722}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3F5148D5-350D-4B26-942B-19F9FB091722}.Release|Any CPU.Build.0 = Release|Any CPU - {3F88B5CE-5F96-4D01-9EAF-6ECA400309AB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3F88B5CE-5F96-4D01-9EAF-6ECA400309AB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3F88B5CE-5F96-4D01-9EAF-6ECA400309AB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3F88B5CE-5F96-4D01-9EAF-6ECA400309AB}.Release|Any CPU.Build.0 = Release|Any CPU - {0EF0711F-E11C-4740-AF48-23D1E3537881}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0EF0711F-E11C-4740-AF48-23D1E3537881}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0EF0711F-E11C-4740-AF48-23D1E3537881}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0EF0711F-E11C-4740-AF48-23D1E3537881}.Release|Any CPU.Build.0 = Release|Any CPU - {5F050019-F439-481D-929B-ACE2011DAE33}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5F050019-F439-481D-929B-ACE2011DAE33}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5F050019-F439-481D-929B-ACE2011DAE33}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5F050019-F439-481D-929B-ACE2011DAE33}.Release|Any CPU.Build.0 = Release|Any CPU - {4F691531-E640-4257-B6BD-01B3E6C2F3B7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4F691531-E640-4257-B6BD-01B3E6C2F3B7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4F691531-E640-4257-B6BD-01B3E6C2F3B7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4F691531-E640-4257-B6BD-01B3E6C2F3B7}.Release|Any CPU.Build.0 = Release|Any CPU - {FEA396A9-6937-4231-B894-B27562A716CB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FEA396A9-6937-4231-B894-B27562A716CB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FEA396A9-6937-4231-B894-B27562A716CB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FEA396A9-6937-4231-B894-B27562A716CB}.Release|Any CPU.Build.0 = Release|Any CPU - {67C34A96-61E4-4C9C-A68C-C8B938D8694C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {67C34A96-61E4-4C9C-A68C-C8B938D8694C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {67C34A96-61E4-4C9C-A68C-C8B938D8694C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {67C34A96-61E4-4C9C-A68C-C8B938D8694C}.Release|Any CPU.Build.0 = Release|Any CPU - {6F57F9B4-A642-49CA-A03F-8F7FD7975AF3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6F57F9B4-A642-49CA-A03F-8F7FD7975AF3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6F57F9B4-A642-49CA-A03F-8F7FD7975AF3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6F57F9B4-A642-49CA-A03F-8F7FD7975AF3}.Release|Any CPU.Build.0 = Release|Any CPU - {A1D34EF9-FBAF-49C6-9E3F-9EC375FC5CE0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A1D34EF9-FBAF-49C6-9E3F-9EC375FC5CE0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A1D34EF9-FBAF-49C6-9E3F-9EC375FC5CE0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A1D34EF9-FBAF-49C6-9E3F-9EC375FC5CE0}.Release|Any CPU.Build.0 = Release|Any CPU - {779B7913-B5A3-4DBD-81D2-6935F555AAE7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {779B7913-B5A3-4DBD-81D2-6935F555AAE7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {779B7913-B5A3-4DBD-81D2-6935F555AAE7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {779B7913-B5A3-4DBD-81D2-6935F555AAE7}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -220,37 +136,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {C091E937-15A1-443C-8A86-EFC9B3E185CD} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {106353CB-F2B5-4BD7-83AA-447E47735566} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {2386B8F5-752D-4BD7-B504-A45E029F99E1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {56ADDBB0-08BB-4BFD-A7AD-5F2FBE939CFC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {8FB41AE7-28BA-4530-A2EA-E49079C63D6E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {3F5148D5-350D-4B26-942B-19F9FB091722} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {3F88B5CE-5F96-4D01-9EAF-6ECA400309AB} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0EF0711F-E11C-4740-AF48-23D1E3537881} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {5F050019-F439-481D-929B-ACE2011DAE33} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4F691531-E640-4257-B6BD-01B3E6C2F3B7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {FEA396A9-6937-4231-B894-B27562A716CB} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {67C34A96-61E4-4C9C-A68C-C8B938D8694C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6F57F9B4-A642-49CA-A03F-8F7FD7975AF3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A1D34EF9-FBAF-49C6-9E3F-9EC375FC5CE0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {779B7913-B5A3-4DBD-81D2-6935F555AAE7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {3F5148D5-350D-4B26-942B-19F9FB091722} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {3F88B5CE-5F96-4D01-9EAF-6ECA400309AB} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0EF0711F-E11C-4740-AF48-23D1E3537881} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {5F050019-F439-481D-929B-ACE2011DAE33} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4F691531-E640-4257-B6BD-01B3E6C2F3B7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {FEA396A9-6937-4231-B894-B27562A716CB} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {67C34A96-61E4-4C9C-A68C-C8B938D8694C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6F57F9B4-A642-49CA-A03F-8F7FD7975AF3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A1D34EF9-FBAF-49C6-9E3F-9EC375FC5CE0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {779B7913-B5A3-4DBD-81D2-6935F555AAE7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {07ABF260-3A63-418B-A892-CD37DE495328} diff --git a/sdk/src/Services/GameLift/Generated/AmazonGameLiftConfig.cs b/sdk/src/Services/GameLift/Generated/AmazonGameLiftConfig.cs index 4d8937efc5e2..4a260611c822 100644 --- a/sdk/src/Services/GameLift/Generated/AmazonGameLiftConfig.cs +++ b/sdk/src/Services/GameLift/Generated/AmazonGameLiftConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.GameLift public partial class AmazonGameLiftConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("GameLift", "4.0.0.0"); private static readonly AmazonGameLiftEndpointResolver EndpointResolver = new AmazonGameLiftEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("GameLift", "3.7.401.11"); -======= - InternalSDKUtils.BuildUserAgentString("GameLift", "3.7.402.4"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/GameLift/Generated/Model/ContainerDefinition.cs b/sdk/src/Services/GameLift/Generated/Model/ContainerDefinition.cs deleted file mode 100644 index 5ef020ab5c80..000000000000 --- a/sdk/src/Services/GameLift/Generated/Model/ContainerDefinition.cs +++ /dev/null @@ -1,346 +0,0 @@ -/* - * 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. - */ - -/* - * Do not modify this file. This file is generated from the gamelift-2015-10-01.normal.json service model. - */ -using System; -using System.Collections.Generic; -using System.Xml.Serialization; -using System.Text; -using System.IO; -using System.Net; - -using Amazon.Runtime; -using Amazon.Runtime.Internal; - -#pragma warning disable CS0612,CS0618,CS1570 -namespace Amazon.GameLift.Model -{ - /// - /// This data type is used with the Amazon GameLift containers feature, which is currently - /// in public preview. - /// - /// - /// - /// Describes a container in a container fleet, the resources available to the container, - /// and the commands that are run when the container starts. Container properties can't - /// be updated. To change a property, create a new container group definition. See also - /// ContainerDefinitionInput. - /// - /// - /// - /// Part of: ContainerGroupDefinition - /// - /// - /// - /// Returned by: DescribeContainerGroupDefinition, ListContainerGroupDefinitions - /// - /// - /// - public partial class ContainerDefinition - { - private List _command = AWSConfigs.InitializeCollections ? new List() : null; - private string _containerName; - private int? _cpu; - private List _dependsOn = AWSConfigs.InitializeCollections ? new List() : null; - private List _entryPoint = AWSConfigs.InitializeCollections ? new List() : null; - private List _environment = AWSConfigs.InitializeCollections ? new List() : null; - private bool? _essential; - private ContainerHealthCheck _healthCheck; - private string _imageUri; - private ContainerMemoryLimits _memoryLimits; - private ContainerPortConfiguration _portConfiguration; - private string _resolvedImageDigest; - private string _workingDirectory; - - /// - /// Gets and sets the property Command. - /// - /// A command that's passed to the container on startup. Each argument for the command - /// is an additional string in the array. See the ContainerDefinition::command - /// parameter in the Amazon Elastic Container Service API reference. - /// - /// - [AWSProperty(Min=1, Max=20)] - public List Command - { - get { return this._command; } - set { this._command = value; } - } - - // Check to see if Command property is set - internal bool IsSetCommand() - { - return this._command != null && (this._command.Count > 0 || !AWSConfigs.InitializeCollections); - } - - /// - /// Gets and sets the property ContainerName. - /// - /// The container definition identifier. Container names are unique within a container - /// group definition. - /// - /// - [AWSProperty(Required=true, Min=1, Max=128)] - public string ContainerName - { - get { return this._containerName; } - set { this._containerName = value; } - } - - // Check to see if ContainerName property is set - internal bool IsSetContainerName() - { - return this._containerName != null; - } - - /// - /// Gets and sets the property Cpu. - /// - /// The number of CPU units that are reserved for the container. Note: 1 vCPU unit equals - /// 1024 CPU units. If no resources are reserved, the container shares the total CPU limit - /// for the container group. - /// - /// - /// - /// Related data type: ContainerGroupDefinition$TotalCpuLimit - /// - /// - [AWSProperty(Min=1, Max=10240)] - public int? Cpu - { - get { return this._cpu; } - set { this._cpu = value; } - } - - // Check to see if Cpu property is set - internal bool IsSetCpu() - { - return this._cpu.HasValue; - } - - /// - /// Gets and sets the property DependsOn. - /// - /// Indicates that the container relies on the status of other containers in the same - /// container group during its startup and shutdown sequences. A container might have - /// dependencies on multiple containers. - /// - /// - [AWSProperty(Min=1, Max=10)] - public List DependsOn - { - get { return this._dependsOn; } - set { this._dependsOn = value; } - } - - // Check to see if DependsOn property is set - internal bool IsSetDependsOn() - { - return this._dependsOn != null && (this._dependsOn.Count > 0 || !AWSConfigs.InitializeCollections); - } - - /// - /// Gets and sets the property EntryPoint. - /// - /// The entry point that's passed to the container on startup. If there are multiple arguments, - /// each argument is an additional string in the array. See the ContainerDefinition::entryPoint - /// parameter in the Amazon Elastic Container Service API Reference. - /// - /// - [AWSProperty(Min=1, Max=20)] - public List EntryPoint - { - get { return this._entryPoint; } - set { this._entryPoint = value; } - } - - // Check to see if EntryPoint property is set - internal bool IsSetEntryPoint() - { - return this._entryPoint != null && (this._entryPoint.Count > 0 || !AWSConfigs.InitializeCollections); - } - - /// - /// Gets and sets the property Environment. - /// - /// A set of environment variables that's passed to the container on startup. See the - /// ContainerDefinition::environment - /// parameter in the Amazon Elastic Container Service API Reference. - /// - /// - [AWSProperty(Min=1, Max=20)] - public List Environment - { - get { return this._environment; } - set { this._environment = value; } - } - - // Check to see if Environment property is set - internal bool IsSetEnvironment() - { - return this._environment != null && (this._environment.Count > 0 || !AWSConfigs.InitializeCollections); - } - - /// - /// Gets and sets the property Essential. - /// - /// Indicates whether the container is vital to the container group. If an essential container - /// fails, the entire container group is restarted. - /// - /// - public bool? Essential - { - get { return this._essential; } - set { this._essential = value; } - } - - // Check to see if Essential property is set - internal bool IsSetEssential() - { - return this._essential.HasValue; - } - - /// - /// Gets and sets the property HealthCheck. - /// - /// A configuration for a non-terminal health check. A container, which automatically - /// restarts if it stops functioning, also restarts if it fails this health check. If - /// an essential container in the daemon group fails a health check, the entire container - /// group is restarted. The essential container in the replica group doesn't use this - /// health check mechanism, because the Amazon GameLift Agent automatically handles the - /// task. - /// - /// - public ContainerHealthCheck HealthCheck - { - get { return this._healthCheck; } - set { this._healthCheck = value; } - } - - // Check to see if HealthCheck property is set - internal bool IsSetHealthCheck() - { - return this._healthCheck != null; - } - - /// - /// Gets and sets the property ImageUri. - /// - /// The URI to the image that $short; copied and deployed to a container fleet. For a - /// more specific identifier, see ResolvedImageDigest. - /// - /// - [AWSProperty(Required=true, Min=1, Max=255)] - public string ImageUri - { - get { return this._imageUri; } - set { this._imageUri = value; } - } - - // Check to see if ImageUri property is set - internal bool IsSetImageUri() - { - return this._imageUri != null; - } - - /// - /// Gets and sets the property MemoryLimits. - /// - /// The amount of memory that Amazon GameLift makes available to the container. If memory - /// limits aren't set for an individual container, the container shares the container - /// group's total memory allocation. - /// - /// - /// - /// Related data type: ContainerGroupDefinition$TotalMemoryLimit - /// - /// - public ContainerMemoryLimits MemoryLimits - { - get { return this._memoryLimits; } - set { this._memoryLimits = value; } - } - - // Check to see if MemoryLimits property is set - internal bool IsSetMemoryLimits() - { - return this._memoryLimits != null; - } - - /// - /// Gets and sets the property PortConfiguration. - /// - /// Defines the ports that are available to assign to processes in the container. For - /// example, a game server process requires a container port to allow game clients to - /// connect to it. Container ports aren't directly accessed by inbound traffic. Amazon - /// GameLift maps these container ports to externally accessible connection ports, which - /// are assigned as needed from the container fleet's ConnectionPortRange. - /// - /// - public ContainerPortConfiguration PortConfiguration - { - get { return this._portConfiguration; } - set { this._portConfiguration = value; } - } - - // Check to see if PortConfiguration property is set - internal bool IsSetPortConfiguration() - { - return this._portConfiguration != null; - } - - /// - /// Gets and sets the property ResolvedImageDigest. - /// - /// A unique and immutable identifier for the container image that is deployed to a container - /// fleet. The digest is a SHA 256 hash of the container image manifest. - /// - /// - public string ResolvedImageDigest - { - get { return this._resolvedImageDigest; } - set { this._resolvedImageDigest = value; } - } - - // Check to see if ResolvedImageDigest property is set - internal bool IsSetResolvedImageDigest() - { - return this._resolvedImageDigest != null; - } - - /// - /// Gets and sets the property WorkingDirectory. - /// - /// The directory in the container where commands are run. See the ContainerDefinition::workingDirectory - /// parameter in the Amazon Elastic Container Service API Reference. - /// - /// - [AWSProperty(Min=1, Max=255)] - public string WorkingDirectory - { - get { return this._workingDirectory; } - set { this._workingDirectory = value; } - } - - // Check to see if WorkingDirectory property is set - internal bool IsSetWorkingDirectory() - { - return this._workingDirectory != null; - } - - } -} \ No newline at end of file diff --git a/sdk/src/Services/GameLift/Generated/Model/ContainerDefinitionInput.cs b/sdk/src/Services/GameLift/Generated/Model/ContainerDefinitionInput.cs deleted file mode 100644 index 236f43cf5b7f..000000000000 --- a/sdk/src/Services/GameLift/Generated/Model/ContainerDefinitionInput.cs +++ /dev/null @@ -1,395 +0,0 @@ -/* - * 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. - */ - -/* - * Do not modify this file. This file is generated from the gamelift-2015-10-01.normal.json service model. - */ -using System; -using System.Collections.Generic; -using System.Xml.Serialization; -using System.Text; -using System.IO; -using System.Net; - -using Amazon.Runtime; -using Amazon.Runtime.Internal; - -#pragma warning disable CS0612,CS0618,CS1570 -namespace Amazon.GameLift.Model -{ - /// - /// This data type is used with the Amazon GameLift containers feature, which is currently - /// in public preview. - /// - /// - /// - /// Describes a container's configuration, resources, and start instructions. Use this - /// data type to create a container group definition. For the properties of a container - /// that's been deployed to a fleet, see ContainerDefinition. You can't change - /// these properties after you've created the container group definition. If you need - /// a container group with different properties, then you must create a new one. - /// - /// - /// - /// Used with: CreateContainerGroupDefinition - /// - /// - public partial class ContainerDefinitionInput - { - private List _command = AWSConfigs.InitializeCollections ? new List() : null; - private string _containerName; - private int? _cpu; - private List _dependsOn = AWSConfigs.InitializeCollections ? new List() : null; - private List _entryPoint = AWSConfigs.InitializeCollections ? new List() : null; - private List _environment = AWSConfigs.InitializeCollections ? new List() : null; - private bool? _essential; - private ContainerHealthCheck _healthCheck; - private string _imageUri; - private ContainerMemoryLimits _memoryLimits; - private ContainerPortConfiguration _portConfiguration; - private string _workingDirectory; - - /// - /// Gets and sets the property Command. - /// - /// A command to pass to the container on startup. Add multiple arguments as additional - /// strings in the array. See the ContainerDefinition - /// command parameter in the Amazon Elastic Container Service API reference. - /// - /// - /// - [AWSProperty(Min=1, Max=20)] - public List Command - { - get { return this._command; } - set { this._command = value; } - } - - // Check to see if Command property is set - internal bool IsSetCommand() - { - return this._command != null && (this._command.Count > 0 || !AWSConfigs.InitializeCollections); - } - - /// - /// Gets and sets the property ContainerName. - /// - /// A string that uniquely identifies the container definition within a container group. - /// - /// - [AWSProperty(Required=true, Min=1, Max=128)] - public string ContainerName - { - get { return this._containerName; } - set { this._containerName = value; } - } - - // Check to see if ContainerName property is set - internal bool IsSetContainerName() - { - return this._containerName != null; - } - - /// - /// Gets and sets the property Cpu. - /// - /// The number of CPU units to reserve for this container. The container can use more - /// resources when needed, if available. Note: 1 vCPU unit equals 1024 CPU units. If you - /// don't reserve CPU units for this container, then it shares the total CPU limit for - /// the container group. This property is similar to the Amazon ECS container definition - /// parameter environment - /// (Amazon Elastic Container Service Developer Guide). - /// - /// - /// - /// Related data type: ContainerGroupDefinition$TotalCpuLimit - /// - /// - [AWSProperty(Min=1, Max=10240)] - public int? Cpu - { - get { return this._cpu; } - set { this._cpu = value; } - } - - // Check to see if Cpu property is set - internal bool IsSetCpu() - { - return this._cpu.HasValue; - } - - /// - /// Gets and sets the property DependsOn. - /// - /// Sets up dependencies between this container and the status of other containers in - /// the same container group. A container can have dependencies on multiple different - /// containers. - /// - /// - /// - /// You can use dependencies to establish a startup/shutdown sequence across the container - /// group. A container startup dependency is reversed on shutdown. - /// - /// - /// - /// For example, you might specify that SideCarContainerB has a START dependency - /// on SideCarContainerA. This dependency means that SideCarContainerB can't start until - /// after SideCarContainerA has started. This dependency is reversed on shutdown, which - /// means that SideCarContainerB must shut down before SideCarContainerA can shut down. - /// - /// - /// - [AWSProperty(Min=1, Max=10)] - public List DependsOn - { - get { return this._dependsOn; } - set { this._dependsOn = value; } - } - - // Check to see if DependsOn property is set - internal bool IsSetDependsOn() - { - return this._dependsOn != null && (this._dependsOn.Count > 0 || !AWSConfigs.InitializeCollections); - } - - /// - /// Gets and sets the property EntryPoint. - /// - /// An entry point to pass to the container on startup. Add multiple arguments as additional - /// strings in the array. See the ContainerDefinition::entryPoint - /// parameter in the Amazon Elastic Container Service API Reference. - /// - /// - [AWSProperty(Min=1, Max=20)] - public List EntryPoint - { - get { return this._entryPoint; } - set { this._entryPoint = value; } - } - - // Check to see if EntryPoint property is set - internal bool IsSetEntryPoint() - { - return this._entryPoint != null && (this._entryPoint.Count > 0 || !AWSConfigs.InitializeCollections); - } - - /// - /// Gets and sets the property Environment. - /// - /// A set of environment variables to pass to the container on startup. See the ContainerDefinition::environment - /// parameter in the Amazon Elastic Container Service API Reference. - /// - /// - [AWSProperty(Min=1, Max=20)] - public List Environment - { - get { return this._environment; } - set { this._environment = value; } - } - - // Check to see if Environment property is set - internal bool IsSetEnvironment() - { - return this._environment != null && (this._environment.Count > 0 || !AWSConfigs.InitializeCollections); - } - - /// - /// Gets and sets the property Essential. - /// - /// Specifies whether the container is vital for the container group to function properly. - /// If an essential container fails, it causes the entire container group to restart. - /// Each container group must have an essential container. - /// - /// - /// - /// Replica container groups - A replica group must have exactly one essential - /// container. Use the following to configure an essential replica container: - /// - ///
    • - /// - /// Choose a container is running your game server and the Amazon GameLift Agent. - /// - ///
    • - /// - /// Include a port configuration. This container runs your game server processes, and - /// each process requires a container port to allow access to game clients. - /// - ///
    • - /// - /// Don't configure a health check. The Agent handles this task for the essential replica - /// container. - /// - ///
    - /// - /// Daemon container groups - A daemon group must have at least one essential - /// container. - /// - /// - /// - /// - /// - ///     - public bool? Essential - { - get { return this._essential; } - set { this._essential = value; } - } - - // Check to see if Essential property is set - internal bool IsSetEssential() - { - return this._essential.HasValue; - } - - /// - /// Gets and sets the property HealthCheck. - /// - /// Configuration for a non-terminal health check. A container automatically restarts - /// if it stops functioning. This parameter lets you define additional reasons to consider - /// a container unhealthy and restart it. You can set a health check for any container - /// except for the essential container in the replica container group. If an essential - /// container in the daemon group fails a health check, the entire container group is - /// restarted. - /// - /// - public ContainerHealthCheck HealthCheck - { - get { return this._healthCheck; } - set { this._healthCheck = value; } - } - - // Check to see if HealthCheck property is set - internal bool IsSetHealthCheck() - { - return this._healthCheck != null; - } - - /// - /// Gets and sets the property ImageUri. - /// - /// The location of a container image that $short; will copy and deploy to a container - /// fleet. Images in Amazon Elastic Container Registry private repositories are supported. - /// The repository must be in the same Amazon Web Services account and Amazon Web Services - /// Region where you're creating the container group definition. For limits on image size, - /// see Amazon GameLift - /// endpoints and quotas. You can use any of the following image URI formats: - /// - ///
    • - /// - /// Image ID only: [AWS account].dkr.ecr.[AWS region].amazonaws.com/[repository ID] - /// - /// - ///
    • - /// - /// Image ID and digest: [AWS account].dkr.ecr.[AWS region].amazonaws.com/[repository - /// ID]@[digest] - /// - ///
    • - /// - /// Image ID and tag: [AWS account].dkr.ecr.[AWS region].amazonaws.com/[repository - /// ID]:[tag] - /// - ///
    - ///     - [AWSProperty(Required=true, Min=1, Max=255)] - public string ImageUri - { - get { return this._imageUri; } - set { this._imageUri = value; } - } - - // Check to see if ImageUri property is set - internal bool IsSetImageUri() - { - return this._imageUri != null; - } - - /// - /// Gets and sets the property MemoryLimits. - /// - /// The amount of memory to make available to the container. If you don't specify memory - /// limits for this container, then it shares the container group's total memory allocation. - /// - /// - /// - /// - /// Related data type: ContainerGroupDefinition$TotalMemoryLimit - /// - /// - public ContainerMemoryLimits MemoryLimits - { - get { return this._memoryLimits; } - set { this._memoryLimits = value; } - } - - // Check to see if MemoryLimits property is set - internal bool IsSetMemoryLimits() - { - return this._memoryLimits != null; - } - - /// - /// Gets and sets the property PortConfiguration. - /// - /// A set of ports that Amazon GameLift can assign to processes in the container. All - /// processes that accept inbound traffic connections, including game server processes, - /// must be assigned a port from this set. The set of ports must be large enough to assign - /// one to each process in the container that needs one. If the container includes your - /// game server, include enough ports to assign one port to each concurrent server process - /// (as defined in a container fleet's RuntimeConfiguration). For more details, - /// see Networking - /// for container fleets. - /// - /// - /// - /// Container ports aren't directly accessed by inbound traffic. Amazon GameLift maps - /// these container ports to externally accessible connection ports, which are assigned - /// as needed from the container fleet's ConnectionPortRange. - /// - /// - public ContainerPortConfiguration PortConfiguration - { - get { return this._portConfiguration; } - set { this._portConfiguration = value; } - } - - // Check to see if PortConfiguration property is set - internal bool IsSetPortConfiguration() - { - return this._portConfiguration != null; - } - - /// - /// Gets and sets the property WorkingDirectory. - /// - /// The directory in the container where commands are run. See the ContainerDefinition::workingDirectory - /// parameter in the Amazon Elastic Container Service API Reference. - /// - /// - [AWSProperty(Min=1, Max=255)] - public string WorkingDirectory - { - get { return this._workingDirectory; } - set { this._workingDirectory = value; } - } - - // Check to see if WorkingDirectory property is set - internal bool IsSetWorkingDirectory() - { - return this._workingDirectory != null; - } - - } -} \ No newline at end of file diff --git a/sdk/src/Services/GameLift/Generated/Model/ContainerFleet.cs b/sdk/src/Services/GameLift/Generated/Model/ContainerFleet.cs index e21600a1d373..3e5aebe8367e 100644 --- a/sdk/src/Services/GameLift/Generated/Model/ContainerFleet.cs +++ b/sdk/src/Services/GameLift/Generated/Model/ContainerFleet.cs @@ -88,9 +88,9 @@ internal bool IsSetBillingType() /// in Unix time as milliseconds (for example "1469498468.057"). /// ///     - public DateTime CreationTime + public DateTime? CreationTime { - get { return this._creationTime.GetValueOrDefault(); } + get { return this._creationTime; } set { this._creationTime = value; } } @@ -249,9 +249,9 @@ internal bool IsSetGameServerContainerGroupDefinitionName() /// ///     [AWSProperty(Min=1, Max=5000)] - public int GameServerContainerGroupsPerInstance + public int? GameServerContainerGroupsPerInstance { - get { return this._gameServerContainerGroupsPerInstance.GetValueOrDefault(); } + get { return this._gameServerContainerGroupsPerInstance; } set { this._gameServerContainerGroupsPerInstance = value; } } @@ -398,9 +398,9 @@ internal bool IsSetLogConfiguration() /// ///     [AWSProperty(Min=1, Max=5000)] - public int MaximumGameServerContainerGroupsPerInstance + public int? MaximumGameServerContainerGroupsPerInstance { - get { return this._maximumGameServerContainerGroupsPerInstance.GetValueOrDefault(); } + get { return this._maximumGameServerContainerGroupsPerInstance; } set { this._maximumGameServerContainerGroupsPerInstance = value; } } diff --git a/sdk/src/Services/GameLift/Generated/Model/ContainerGroupDefinition.cs b/sdk/src/Services/GameLift/Generated/Model/ContainerGroupDefinition.cs index 974c5a603316..b60d323b6853 100644 --- a/sdk/src/Services/GameLift/Generated/Model/ContainerGroupDefinition.cs +++ b/sdk/src/Services/GameLift/Generated/Model/ContainerGroupDefinition.cs @@ -285,27 +285,11 @@ internal bool IsSetStatusReason() /// type of container group. /// ///     -<<<<<<< HEAD - [AWSProperty(Min=128, Max=10240)] - public int? TotalCpuLimit -||||||| Commit version number update changes - [AWSProperty(Min=128, Max=10240)] - public int TotalCpuLimit -======= [AWSProperty(Min=1, Max=10)] public List SupportContainerDefinitions ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b { -<<<<<<< HEAD - get { return this._totalCpuLimit; } - set { this._totalCpuLimit = value; } -||||||| Commit version number update changes - get { return this._totalCpuLimit.GetValueOrDefault(); } - set { this._totalCpuLimit = value; } -======= get { return this._supportContainerDefinitions; } set { this._supportContainerDefinitions = value; } ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b } // Check to see if SupportContainerDefinitions property is set @@ -328,9 +312,9 @@ internal bool IsSetSupportContainerDefinitions() /// ///     [AWSProperty(Min=4, Max=1024000)] - public int TotalMemoryLimitMebibytes + public int? TotalMemoryLimitMebibytes { - get { return this._totalMemoryLimitMebibytes.GetValueOrDefault(); } + get { return this._totalMemoryLimitMebibytes; } set { this._totalMemoryLimitMebibytes = value; } } @@ -351,9 +335,9 @@ internal bool IsSetTotalMemoryLimitMebibytes() /// ///     [AWSProperty(Max=10)] - public double TotalVcpuLimit + public double? TotalVcpuLimit { - get { return this._totalVcpuLimit.GetValueOrDefault(); } + get { return this._totalVcpuLimit; } set { this._totalVcpuLimit = value; } } @@ -391,27 +375,11 @@ internal bool IsSetVersionDescription() /// or delete individual versions or the entire container group definition. /// ///     -<<<<<<< HEAD - [AWSProperty(Min=4, Max=1024000)] - public int? TotalMemoryLimit -||||||| Commit version number update changes - [AWSProperty(Min=4, Max=1024000)] - public int TotalMemoryLimit -======= [AWSProperty(Min=1)] - public int VersionNumber ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b + public int? VersionNumber { -<<<<<<< HEAD - get { return this._totalMemoryLimit; } - set { this._totalMemoryLimit = value; } -||||||| Commit version number update changes - get { return this._totalMemoryLimit.GetValueOrDefault(); } - set { this._totalMemoryLimit = value; } -======= - get { return this._versionNumber.GetValueOrDefault(); } + get { return this._versionNumber; } set { this._versionNumber = value; } ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b } // Check to see if VersionNumber property is set diff --git a/sdk/src/Services/GameLift/Generated/Model/ContainerGroupsConfiguration.cs b/sdk/src/Services/GameLift/Generated/Model/ContainerGroupsConfiguration.cs deleted file mode 100644 index 500c55e8c60f..000000000000 --- a/sdk/src/Services/GameLift/Generated/Model/ContainerGroupsConfiguration.cs +++ /dev/null @@ -1,141 +0,0 @@ -/* - * 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. - */ - -/* - * Do not modify this file. This file is generated from the gamelift-2015-10-01.normal.json service model. - */ -using System; -using System.Collections.Generic; -using System.Xml.Serialization; -using System.Text; -using System.IO; -using System.Net; - -using Amazon.Runtime; -using Amazon.Runtime.Internal; - -#pragma warning disable CS0612,CS0618,CS1570 -namespace Amazon.GameLift.Model -{ - /// - /// This data type is used with the Amazon GameLift containers feature, which is currently - /// in public preview. - /// - /// - /// - /// Configuration details for a set of container groups, for use when creating a fleet - /// with compute type CONTAINER. - /// - /// - /// - /// Used with: CreateFleet - /// - /// - public partial class ContainerGroupsConfiguration - { - private ConnectionPortRange _connectionPortRange; - private List _containerGroupDefinitionNames = AWSConfigs.InitializeCollections ? new List() : null; - private int? _desiredReplicaContainerGroupsPerInstance; - - /// - /// Gets and sets the property ConnectionPortRange. - /// - /// A set of ports to allow inbound traffic, including game clients, to connect to processes - /// running in the container fleet. - /// - /// - /// - /// Connection ports are dynamically mapped to container ports, which are assigned to - /// individual processes running in a container. The connection port range must have enough - /// ports to map to all container ports across a fleet instance. To calculate the minimum - /// connection ports needed, use the following formula: - /// - /// - /// - /// [Total number of container ports as defined for containers in the replica container - /// group] * [Desired or calculated number of replica container groups per instance] + - /// [Total number of container ports as defined for containers in the daemon container - /// group] - /// - /// - /// - /// As a best practice, double the minimum number of connection ports. - /// - /// - /// - /// Use the fleet's EC2InboundPermissions property to control external access to - /// connection ports. Set this property to the connection port numbers that you want to - /// open access to. See IpPermission for more details. - /// - /// - /// - [AWSProperty(Required=true)] - public ConnectionPortRange ConnectionPortRange - { - get { return this._connectionPortRange; } - set { this._connectionPortRange = value; } - } - - // Check to see if ConnectionPortRange property is set - internal bool IsSetConnectionPortRange() - { - return this._connectionPortRange != null; - } - - /// - /// Gets and sets the property ContainerGroupDefinitionNames. - /// - /// The list of container group definition names to deploy to a new container fleet. - /// - /// - [AWSProperty(Required=true, Min=1, Max=2)] - public List ContainerGroupDefinitionNames - { - get { return this._containerGroupDefinitionNames; } - set { this._containerGroupDefinitionNames = value; } - } - - // Check to see if ContainerGroupDefinitionNames property is set - internal bool IsSetContainerGroupDefinitionNames() - { - return this._containerGroupDefinitionNames != null && (this._containerGroupDefinitionNames.Count > 0 || !AWSConfigs.InitializeCollections); - } - - /// - /// Gets and sets the property DesiredReplicaContainerGroupsPerInstance. - /// - /// The number of times to replicate the replica container group on each instance in a - /// container fleet. By default, Amazon GameLift calculates the maximum number of replica - /// container groups that can fit on a fleet instance (based on CPU and memory resources). - /// Leave this parameter empty if you want to use the maximum number, or specify a desired - /// number to override the maximum. The desired number is used if it's less than the maximum - /// number. - /// - /// - [AWSProperty(Min=1, Max=5000)] - public int? DesiredReplicaContainerGroupsPerInstance - { - get { return this._desiredReplicaContainerGroupsPerInstance; } - set { this._desiredReplicaContainerGroupsPerInstance = value; } - } - - // Check to see if DesiredReplicaContainerGroupsPerInstance property is set - internal bool IsSetDesiredReplicaContainerGroupsPerInstance() - { - return this._desiredReplicaContainerGroupsPerInstance.HasValue; - } - - } -} \ No newline at end of file diff --git a/sdk/src/Services/GameLift/Generated/Model/ContainerGroupsPerInstance.cs b/sdk/src/Services/GameLift/Generated/Model/ContainerGroupsPerInstance.cs deleted file mode 100644 index e5207aa5b38c..000000000000 --- a/sdk/src/Services/GameLift/Generated/Model/ContainerGroupsPerInstance.cs +++ /dev/null @@ -1,116 +0,0 @@ -/* - * 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. - */ - -/* - * Do not modify this file. This file is generated from the gamelift-2015-10-01.normal.json service model. - */ -using System; -using System.Collections.Generic; -using System.Xml.Serialization; -using System.Text; -using System.IO; -using System.Net; - -using Amazon.Runtime; -using Amazon.Runtime.Internal; - -#pragma warning disable CS0612,CS0618,CS1570 -namespace Amazon.GameLift.Model -{ - /// - /// This data type is used with the Amazon GameLift containers feature, which is currently - /// in public preview. - /// - /// - /// - /// Determines how many replica container groups that Amazon GameLift deploys to each - /// instance in a container fleet. - /// - /// - /// - /// Amazon GameLift calculates the maximum possible replica groups per instance based - /// on the instance 's CPU and memory resources. When deploying a fleet, Amazon GameLift - /// places replica container groups on each fleet instance based on the following: - /// - ///
    • - /// - /// If no desired value is set, Amazon GameLift places the calculated maximum. - /// - ///
    • - /// - /// If a desired number is set to a value higher than the calculated maximum, fleet creation - /// fails.. - /// - ///
    • - /// - /// If a desired number is set to a value lower than the calculated maximum, Amazon GameLift - /// places the desired number. - /// - ///
    - /// - /// Part of: ContainerGroupsConfiguration, ContainerGroupsAttributes - /// - /// - /// - /// - /// Returned by: DescribeFleetAttributes, CreateFleet - /// - ///     - public partial class ContainerGroupsPerInstance - { - private int? _desiredReplicaContainerGroupsPerInstance; - private int? _maxReplicaContainerGroupsPerInstance; - - /// - /// Gets and sets the property DesiredReplicaContainerGroupsPerInstance. - /// - /// The desired number of replica container groups to place on each fleet instance. - /// - /// - [AWSProperty(Min=1, Max=5000)] - public int? DesiredReplicaContainerGroupsPerInstance - { - get { return this._desiredReplicaContainerGroupsPerInstance; } - set { this._desiredReplicaContainerGroupsPerInstance = value; } - } - - // Check to see if DesiredReplicaContainerGroupsPerInstance property is set - internal bool IsSetDesiredReplicaContainerGroupsPerInstance() - { - return this._desiredReplicaContainerGroupsPerInstance.HasValue; - } - - /// - /// Gets and sets the property MaxReplicaContainerGroupsPerInstance. - /// - /// The maximum possible number of replica container groups that each fleet instance can - /// have. - /// - /// - [AWSProperty(Min=1, Max=5000)] - public int? MaxReplicaContainerGroupsPerInstance - { - get { return this._maxReplicaContainerGroupsPerInstance; } - set { this._maxReplicaContainerGroupsPerInstance = value; } - } - - // Check to see if MaxReplicaContainerGroupsPerInstance property is set - internal bool IsSetMaxReplicaContainerGroupsPerInstance() - { - return this._maxReplicaContainerGroupsPerInstance.HasValue; - } - - } -} \ No newline at end of file diff --git a/sdk/src/Services/GameLift/Generated/Model/ContainerMemoryLimits.cs b/sdk/src/Services/GameLift/Generated/Model/ContainerMemoryLimits.cs deleted file mode 100644 index 5daefbbb4fef..000000000000 --- a/sdk/src/Services/GameLift/Generated/Model/ContainerMemoryLimits.cs +++ /dev/null @@ -1,93 +0,0 @@ -/* - * 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. - */ - -/* - * Do not modify this file. This file is generated from the gamelift-2015-10-01.normal.json service model. - */ -using System; -using System.Collections.Generic; -using System.Xml.Serialization; -using System.Text; -using System.IO; -using System.Net; - -using Amazon.Runtime; -using Amazon.Runtime.Internal; - -#pragma warning disable CS0612,CS0618,CS1570 -namespace Amazon.GameLift.Model -{ - /// - /// Specifies how much memory is available to a container. You can't change this value - /// after you create this object. - /// - /// - /// - /// Part of: ContainerDefinition$MemoryLimits - /// - /// - public partial class ContainerMemoryLimits - { - private int? _hardLimit; - private int? _softLimit; - - /// - /// Gets and sets the property HardLimit. - /// - /// The maximum amount of memory that the container can use. If a container attempts to - /// exceed this limit, the container is stopped. This property is similar to the Amazon - /// ECS container definition parameter memory - /// in the Amazon Elastic Container Service Developer Guide. - /// - /// - [AWSProperty(Min=4, Max=1024000)] - public int? HardLimit - { - get { return this._hardLimit; } - set { this._hardLimit = value; } - } - - // Check to see if HardLimit property is set - internal bool IsSetHardLimit() - { - return this._hardLimit.HasValue; - } - - /// - /// Gets and sets the property SoftLimit. - /// - /// The amount of memory that is reserved for a container. When the container group's - /// shared memory is under contention, the system attempts to maintain the container memory - /// usage at this soft limit. However, the container can use more memory when needed, - /// if available. This property is similar to the Amazon ECS container definition parameter - /// memoryreservation - /// (Amazon Elastic Container Service Developer Guide). - /// - /// - [AWSProperty(Min=4, Max=1024000)] - public int? SoftLimit - { - get { return this._softLimit; } - set { this._softLimit = value; } - } - - // Check to see if SoftLimit property is set - internal bool IsSetSoftLimit() - { - return this._softLimit.HasValue; - } - - } -} \ No newline at end of file diff --git a/sdk/src/Services/GameLift/Generated/Model/ContainerPortMapping.cs b/sdk/src/Services/GameLift/Generated/Model/ContainerPortMapping.cs deleted file mode 100644 index 7126f9bf70c0..000000000000 --- a/sdk/src/Services/GameLift/Generated/Model/ContainerPortMapping.cs +++ /dev/null @@ -1,112 +0,0 @@ -/* - * 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. - */ - -/* - * Do not modify this file. This file is generated from the gamelift-2015-10-01.normal.json service model. - */ -using System; -using System.Collections.Generic; -using System.Xml.Serialization; -using System.Text; -using System.IO; -using System.Net; - -using Amazon.Runtime; -using Amazon.Runtime.Internal; - -#pragma warning disable CS0612,CS0618,CS1570 -namespace Amazon.GameLift.Model -{ - /// - /// This data type is used with the Amazon GameLift containers feature, which is currently - /// in public preview. - /// - /// - /// - /// Defines how an internal-facing container port is mapped to an external-facing connection - /// port on a fleet instance of compute type CONTAINER. Incoming traffic, such - /// as a game client, uses a connection port to connect to a process in the container - /// fleet. Amazon GameLift directs the inbound traffic to the container port that is assigned - /// to the process, such as a game session, running on a container. - /// - /// - /// - /// Part of: ContainerAttributes - /// - /// - public partial class ContainerPortMapping - { - private int? _connectionPort; - private int? _containerPort; - private IpProtocol _protocol; - - /// - /// Gets and sets the property ConnectionPort. - /// - /// The port opened on the fleet instance. This is also called the "host port". - /// - /// - [AWSProperty(Sensitive=true, Min=1, Max=60000)] - public int? ConnectionPort - { - get { return this._connectionPort; } - set { this._connectionPort = value; } - } - - // Check to see if ConnectionPort property is set - internal bool IsSetConnectionPort() - { - return this._connectionPort.HasValue; - } - - /// - /// Gets and sets the property ContainerPort. - /// - /// The port opened on the container. - /// - /// - [AWSProperty(Sensitive=true, Min=1, Max=60000)] - public int? ContainerPort - { - get { return this._containerPort; } - set { this._containerPort = value; } - } - - // Check to see if ContainerPort property is set - internal bool IsSetContainerPort() - { - return this._containerPort.HasValue; - } - - /// - /// Gets and sets the property Protocol. - /// - /// The network protocol that this mapping supports. - /// - /// - public IpProtocol Protocol - { - get { return this._protocol; } - set { this._protocol = value; } - } - - // Check to see if Protocol property is set - internal bool IsSetProtocol() - { - return this._protocol != null; - } - - } -} \ No newline at end of file diff --git a/sdk/src/Services/GameLift/Generated/Model/CreateContainerFleetRequest.cs b/sdk/src/Services/GameLift/Generated/Model/CreateContainerFleetRequest.cs index 86548457d7df..87525bf53529 100644 --- a/sdk/src/Services/GameLift/Generated/Model/CreateContainerFleetRequest.cs +++ b/sdk/src/Services/GameLift/Generated/Model/CreateContainerFleetRequest.cs @@ -271,9 +271,9 @@ internal bool IsSetGameServerContainerGroupDefinitionName() /// ///     [AWSProperty(Min=1, Max=5000)] - public int GameServerContainerGroupsPerInstance + public int? GameServerContainerGroupsPerInstance { - get { return this._gameServerContainerGroupsPerInstance.GetValueOrDefault(); } + get { return this._gameServerContainerGroupsPerInstance; } set { this._gameServerContainerGroupsPerInstance = value; } } diff --git a/sdk/src/Services/GameLift/Generated/Model/CreateContainerGroupDefinitionRequest.cs b/sdk/src/Services/GameLift/Generated/Model/CreateContainerGroupDefinitionRequest.cs index 4653121c9c31..1d9a278ed914 100644 --- a/sdk/src/Services/GameLift/Generated/Model/CreateContainerGroupDefinitionRequest.cs +++ b/sdk/src/Services/GameLift/Generated/Model/CreateContainerGroupDefinitionRequest.cs @@ -358,27 +358,11 @@ internal bool IsSetTags() /// Default value: 1024 /// ///     -<<<<<<< HEAD - [AWSProperty(Required=true, Min=128, Max=10240)] - public int? TotalCpuLimit -||||||| Commit version number update changes - [AWSProperty(Required=true, Min=128, Max=10240)] - public int TotalCpuLimit -======= [AWSProperty(Required=true, Min=4, Max=1024000)] - public int TotalMemoryLimitMebibytes ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b + public int? TotalMemoryLimitMebibytes { -<<<<<<< HEAD - get { return this._totalCpuLimit; } - set { this._totalCpuLimit = value; } -||||||| Commit version number update changes - get { return this._totalCpuLimit.GetValueOrDefault(); } - set { this._totalCpuLimit = value; } -======= - get { return this._totalMemoryLimitMebibytes.GetValueOrDefault(); } + get { return this._totalMemoryLimitMebibytes; } set { this._totalMemoryLimitMebibytes = value; } ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b } // Check to see if TotalMemoryLimitMebibytes property is set @@ -400,17 +384,10 @@ internal bool IsSetTotalMemoryLimitMebibytes() /// Default value: 1 /// ///     -<<<<<<< HEAD - [AWSProperty(Required=true, Min=4, Max=1024000)] - public int? TotalMemoryLimit -||||||| Commit version number update changes - [AWSProperty(Required=true, Min=4, Max=1024000)] - public int TotalMemoryLimit -======= [AWSProperty(Required=true, Max=10)] - public double TotalVcpuLimit + public double? TotalVcpuLimit { - get { return this._totalVcpuLimit.GetValueOrDefault(); } + get { return this._totalVcpuLimit; } set { this._totalVcpuLimit = value; } } @@ -428,18 +405,9 @@ internal bool IsSetTotalVcpuLimit() ///     [AWSProperty(Min=1, Max=1024)] public string VersionDescription ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b { -<<<<<<< HEAD - get { return this._totalMemoryLimit; } - set { this._totalMemoryLimit = value; } -||||||| Commit version number update changes - get { return this._totalMemoryLimit.GetValueOrDefault(); } - set { this._totalMemoryLimit = value; } -======= get { return this._versionDescription; } set { this._versionDescription = value; } ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b } // Check to see if VersionDescription property is set diff --git a/sdk/src/Services/GameLift/Generated/Model/DeleteContainerGroupDefinitionRequest.cs b/sdk/src/Services/GameLift/Generated/Model/DeleteContainerGroupDefinitionRequest.cs index d404fa2b5e4c..ba7b07216a35 100644 --- a/sdk/src/Services/GameLift/Generated/Model/DeleteContainerGroupDefinitionRequest.cs +++ b/sdk/src/Services/GameLift/Generated/Model/DeleteContainerGroupDefinitionRequest.cs @@ -98,9 +98,9 @@ internal bool IsSetName() /// ///     [AWSProperty(Min=0)] - public int VersionCountToRetain + public int? VersionCountToRetain { - get { return this._versionCountToRetain.GetValueOrDefault(); } + get { return this._versionCountToRetain; } set { this._versionCountToRetain = value; } } @@ -117,9 +117,9 @@ internal bool IsSetVersionCountToRetain() /// ///     [AWSProperty(Min=1)] - public int VersionNumber + public int? VersionNumber { - get { return this._versionNumber.GetValueOrDefault(); } + get { return this._versionNumber; } set { this._versionNumber = value; } } diff --git a/sdk/src/Services/GameLift/Generated/Model/DeploymentConfiguration.cs b/sdk/src/Services/GameLift/Generated/Model/DeploymentConfiguration.cs index dae1a7687665..0dcf0b5d9f70 100644 --- a/sdk/src/Services/GameLift/Generated/Model/DeploymentConfiguration.cs +++ b/sdk/src/Services/GameLift/Generated/Model/DeploymentConfiguration.cs @@ -67,9 +67,9 @@ internal bool IsSetImpairmentStrategy() /// ///     [AWSProperty(Min=30, Max=75)] - public int MinimumHealthyPercentage + public int? MinimumHealthyPercentage { - get { return this._minimumHealthyPercentage.GetValueOrDefault(); } + get { return this._minimumHealthyPercentage; } set { this._minimumHealthyPercentage = value; } } diff --git a/sdk/src/Services/GameLift/Generated/Model/DescribeContainerGroupDefinitionRequest.cs b/sdk/src/Services/GameLift/Generated/Model/DescribeContainerGroupDefinitionRequest.cs index de82f5630903..7a02183d4646 100644 --- a/sdk/src/Services/GameLift/Generated/Model/DescribeContainerGroupDefinitionRequest.cs +++ b/sdk/src/Services/GameLift/Generated/Model/DescribeContainerGroupDefinitionRequest.cs @@ -100,9 +100,9 @@ internal bool IsSetName() /// ///     [AWSProperty(Min=1)] - public int VersionNumber + public int? VersionNumber { - get { return this._versionNumber.GetValueOrDefault(); } + get { return this._versionNumber; } set { this._versionNumber = value; } } diff --git a/sdk/src/Services/GameLift/Generated/Model/FleetDeployment.cs b/sdk/src/Services/GameLift/Generated/Model/FleetDeployment.cs index dd1c3a465332..e413a8fd26b4 100644 --- a/sdk/src/Services/GameLift/Generated/Model/FleetDeployment.cs +++ b/sdk/src/Services/GameLift/Generated/Model/FleetDeployment.cs @@ -51,9 +51,9 @@ public partial class FleetDeployment /// in Unix time as milliseconds (for example "1469498468.057"). /// ///     - public DateTime CreationTime + public DateTime? CreationTime { - get { return this._creationTime.GetValueOrDefault(); } + get { return this._creationTime; } set { this._creationTime = value; } } diff --git a/sdk/src/Services/GameLift/Generated/Model/GameServerContainerGroupCounts.cs b/sdk/src/Services/GameLift/Generated/Model/GameServerContainerGroupCounts.cs index f9df121668c2..12654772a03c 100644 --- a/sdk/src/Services/GameLift/Generated/Model/GameServerContainerGroupCounts.cs +++ b/sdk/src/Services/GameLift/Generated/Model/GameServerContainerGroupCounts.cs @@ -57,9 +57,9 @@ public partial class GameServerContainerGroupCounts /// ///     [AWSProperty(Min=0)] - public int ACTIVE + public int? ACTIVE { - get { return this._active.GetValueOrDefault(); } + get { return this._active; } set { this._active = value; } } @@ -76,9 +76,9 @@ internal bool IsSetACTIVE() /// ///     [AWSProperty(Min=0)] - public int IDLE + public int? IDLE { - get { return this._idle.GetValueOrDefault(); } + get { return this._idle; } set { this._idle = value; } } @@ -95,9 +95,9 @@ internal bool IsSetIDLE() /// ///     [AWSProperty(Min=0)] - public int PENDING + public int? PENDING { - get { return this._pending.GetValueOrDefault(); } + get { return this._pending; } set { this._pending = value; } } @@ -114,9 +114,9 @@ internal bool IsSetPENDING() /// ///     [AWSProperty(Min=0)] - public int TERMINATING + public int? TERMINATING { - get { return this._terminating.GetValueOrDefault(); } + get { return this._terminating; } set { this._terminating = value; } } diff --git a/sdk/src/Services/GameLift/Generated/Model/GameSessionCreationLimitPolicy.cs b/sdk/src/Services/GameLift/Generated/Model/GameSessionCreationLimitPolicy.cs index 6c608cecfbdd..ae8d4b53bf3d 100644 --- a/sdk/src/Services/GameLift/Generated/Model/GameSessionCreationLimitPolicy.cs +++ b/sdk/src/Services/GameLift/Generated/Model/GameSessionCreationLimitPolicy.cs @@ -63,9 +63,9 @@ public partial class GameSessionCreationLimitPolicy ///     /// [AWSProperty(Min=0)] - public int NewGameSessionsPerCreator + public int? NewGameSessionsPerCreator { - get { return this._newGameSessionsPerCreator.GetValueOrDefault(); } + get { return this._newGameSessionsPerCreator; } set { this._newGameSessionsPerCreator = value; } } @@ -82,9 +82,9 @@ internal bool IsSetNewGameSessionsPerCreator() /// /// [AWSProperty(Min=0)] - public int PolicyPeriodInMinutes + public int? PolicyPeriodInMinutes { - get { return this._policyPeriodInMinutes.GetValueOrDefault(); } + get { return this._policyPeriodInMinutes; } set { this._policyPeriodInMinutes = value; } } diff --git a/sdk/src/Services/GameLift/Generated/Model/Internal/MarshallTransformations/ContainerDefinitionInputMarshaller.cs b/sdk/src/Services/GameLift/Generated/Model/Internal/MarshallTransformations/ContainerDefinitionInputMarshaller.cs deleted file mode 100644 index cca8c1210874..000000000000 --- a/sdk/src/Services/GameLift/Generated/Model/Internal/MarshallTransformations/ContainerDefinitionInputMarshaller.cs +++ /dev/null @@ -1,176 +0,0 @@ -/* - * 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. - */ - -/* - * Do not modify this file. This file is generated from the gamelift-2015-10-01.normal.json service model. - */ -using System; -using System.Collections.Generic; -using System.Globalization; -using System.IO; -using System.Text; -using System.Xml.Serialization; - -using Amazon.GameLift.Model; -using Amazon.Runtime; -using Amazon.Runtime.Internal; -using Amazon.Runtime.Internal.Transform; -using Amazon.Runtime.Internal.Util; -using ThirdParty.Json.LitJson; - -#pragma warning disable CS0612,CS0618 -namespace Amazon.GameLift.Model.Internal.MarshallTransformations -{ - /// - /// ContainerDefinitionInput Marshaller - /// - public class ContainerDefinitionInputMarshaller : IRequestMarshaller - { - /// - /// Unmarshaller the response from the service to the response class. - /// - /// - /// - /// - public void Marshall(ContainerDefinitionInput requestObject, JsonMarshallerContext context) - { - if(requestObject == null) - return; - if(requestObject.IsSetCommand()) - { - context.Writer.WritePropertyName("Command"); - context.Writer.WriteArrayStart(); - foreach(var requestObjectCommandListValue in requestObject.Command) - { - context.Writer.Write(requestObjectCommandListValue); - } - context.Writer.WriteArrayEnd(); - } - - if(requestObject.IsSetContainerName()) - { - context.Writer.WritePropertyName("ContainerName"); - context.Writer.Write(requestObject.ContainerName); - } - - if(requestObject.IsSetCpu()) - { - context.Writer.WritePropertyName("Cpu"); - context.Writer.Write(requestObject.Cpu.Value); - } - - if(requestObject.IsSetDependsOn()) - { - context.Writer.WritePropertyName("DependsOn"); - context.Writer.WriteArrayStart(); - foreach(var requestObjectDependsOnListValue in requestObject.DependsOn) - { - context.Writer.WriteObjectStart(); - - var marshaller = ContainerDependencyMarshaller.Instance; - marshaller.Marshall(requestObjectDependsOnListValue, context); - - context.Writer.WriteObjectEnd(); - } - context.Writer.WriteArrayEnd(); - } - - if(requestObject.IsSetEntryPoint()) - { - context.Writer.WritePropertyName("EntryPoint"); - context.Writer.WriteArrayStart(); - foreach(var requestObjectEntryPointListValue in requestObject.EntryPoint) - { - context.Writer.Write(requestObjectEntryPointListValue); - } - context.Writer.WriteArrayEnd(); - } - - if(requestObject.IsSetEnvironment()) - { - context.Writer.WritePropertyName("Environment"); - context.Writer.WriteArrayStart(); - foreach(var requestObjectEnvironmentListValue in requestObject.Environment) - { - context.Writer.WriteObjectStart(); - - var marshaller = ContainerEnvironmentMarshaller.Instance; - marshaller.Marshall(requestObjectEnvironmentListValue, context); - - context.Writer.WriteObjectEnd(); - } - context.Writer.WriteArrayEnd(); - } - - if(requestObject.IsSetEssential()) - { - context.Writer.WritePropertyName("Essential"); - context.Writer.Write(requestObject.Essential.Value); - } - - if(requestObject.IsSetHealthCheck()) - { - context.Writer.WritePropertyName("HealthCheck"); - context.Writer.WriteObjectStart(); - - var marshaller = ContainerHealthCheckMarshaller.Instance; - marshaller.Marshall(requestObject.HealthCheck, context); - - context.Writer.WriteObjectEnd(); - } - - if(requestObject.IsSetImageUri()) - { - context.Writer.WritePropertyName("ImageUri"); - context.Writer.Write(requestObject.ImageUri); - } - - if(requestObject.IsSetMemoryLimits()) - { - context.Writer.WritePropertyName("MemoryLimits"); - context.Writer.WriteObjectStart(); - - var marshaller = ContainerMemoryLimitsMarshaller.Instance; - marshaller.Marshall(requestObject.MemoryLimits, context); - - context.Writer.WriteObjectEnd(); - } - - if(requestObject.IsSetPortConfiguration()) - { - context.Writer.WritePropertyName("PortConfiguration"); - context.Writer.WriteObjectStart(); - - var marshaller = ContainerPortConfigurationMarshaller.Instance; - marshaller.Marshall(requestObject.PortConfiguration, context); - - context.Writer.WriteObjectEnd(); - } - - if(requestObject.IsSetWorkingDirectory()) - { - context.Writer.WritePropertyName("WorkingDirectory"); - context.Writer.Write(requestObject.WorkingDirectory); - } - - } - - /// - /// Singleton Marshaller. - /// - public readonly static ContainerDefinitionInputMarshaller Instance = new ContainerDefinitionInputMarshaller(); - - } -} \ No newline at end of file diff --git a/sdk/src/Services/GameLift/Generated/Model/Internal/MarshallTransformations/ContainerDefinitionUnmarshaller.cs b/sdk/src/Services/GameLift/Generated/Model/Internal/MarshallTransformations/ContainerDefinitionUnmarshaller.cs deleted file mode 100644 index 6dd65951af48..000000000000 --- a/sdk/src/Services/GameLift/Generated/Model/Internal/MarshallTransformations/ContainerDefinitionUnmarshaller.cs +++ /dev/null @@ -1,165 +0,0 @@ -/* - * 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. - */ - -/* - * Do not modify this file. This file is generated from the gamelift-2015-10-01.normal.json service model. - */ -using System; -using System.Collections.Generic; -using System.Globalization; -using System.IO; -using System.Net; -using System.Text; -using System.Xml.Serialization; - -using Amazon.GameLift.Model; -using Amazon.Runtime; -using Amazon.Runtime.Internal; -using Amazon.Runtime.Internal.Transform; -using Amazon.Runtime.Internal.Util; -using ThirdParty.Json.LitJson; - -#pragma warning disable CS0612,CS0618 -namespace Amazon.GameLift.Model.Internal.MarshallTransformations -{ - /// - /// Response Unmarshaller for ContainerDefinition Object - /// - public class ContainerDefinitionUnmarshaller : IUnmarshaller, IUnmarshaller - { - /// - /// Unmarshaller the response from the service to the response class. - /// - /// - /// - ContainerDefinition IUnmarshaller.Unmarshall(XmlUnmarshallerContext context) - { - throw new NotImplementedException(); - } - - /// - /// Unmarshaller the response from the service to the response class. - /// - /// - /// The unmarshalled object - public ContainerDefinition Unmarshall(JsonUnmarshallerContext context) - { - ContainerDefinition unmarshalledObject = new ContainerDefinition(); - if (context.IsEmptyResponse) - return null; - context.Read(); - if (context.CurrentTokenType == JsonToken.Null) - return null; - - int targetDepth = context.CurrentDepth; - while (context.ReadAtDepth(targetDepth)) - { - if (context.TestExpression("Command", targetDepth)) - { - var unmarshaller = new ListUnmarshaller(StringUnmarshaller.Instance); - unmarshalledObject.Command = unmarshaller.Unmarshall(context); - continue; - } - if (context.TestExpression("ContainerName", targetDepth)) - { - var unmarshaller = StringUnmarshaller.Instance; - unmarshalledObject.ContainerName = unmarshaller.Unmarshall(context); - continue; - } - if (context.TestExpression("Cpu", targetDepth)) - { - var unmarshaller = NullableIntUnmarshaller.Instance; - unmarshalledObject.Cpu = unmarshaller.Unmarshall(context); - continue; - } - if (context.TestExpression("DependsOn", targetDepth)) - { - var unmarshaller = new ListUnmarshaller(ContainerDependencyUnmarshaller.Instance); - unmarshalledObject.DependsOn = unmarshaller.Unmarshall(context); - continue; - } - if (context.TestExpression("EntryPoint", targetDepth)) - { - var unmarshaller = new ListUnmarshaller(StringUnmarshaller.Instance); - unmarshalledObject.EntryPoint = unmarshaller.Unmarshall(context); - continue; - } - if (context.TestExpression("Environment", targetDepth)) - { - var unmarshaller = new ListUnmarshaller(ContainerEnvironmentUnmarshaller.Instance); - unmarshalledObject.Environment = unmarshaller.Unmarshall(context); - continue; - } - if (context.TestExpression("Essential", targetDepth)) - { - var unmarshaller = NullableBoolUnmarshaller.Instance; - unmarshalledObject.Essential = unmarshaller.Unmarshall(context); - continue; - } - if (context.TestExpression("HealthCheck", targetDepth)) - { - var unmarshaller = ContainerHealthCheckUnmarshaller.Instance; - unmarshalledObject.HealthCheck = unmarshaller.Unmarshall(context); - continue; - } - if (context.TestExpression("ImageUri", targetDepth)) - { - var unmarshaller = StringUnmarshaller.Instance; - unmarshalledObject.ImageUri = unmarshaller.Unmarshall(context); - continue; - } - if (context.TestExpression("MemoryLimits", targetDepth)) - { - var unmarshaller = ContainerMemoryLimitsUnmarshaller.Instance; - unmarshalledObject.MemoryLimits = unmarshaller.Unmarshall(context); - continue; - } - if (context.TestExpression("PortConfiguration", targetDepth)) - { - var unmarshaller = ContainerPortConfigurationUnmarshaller.Instance; - unmarshalledObject.PortConfiguration = unmarshaller.Unmarshall(context); - continue; - } - if (context.TestExpression("ResolvedImageDigest", targetDepth)) - { - var unmarshaller = StringUnmarshaller.Instance; - unmarshalledObject.ResolvedImageDigest = unmarshaller.Unmarshall(context); - continue; - } - if (context.TestExpression("WorkingDirectory", targetDepth)) - { - var unmarshaller = StringUnmarshaller.Instance; - unmarshalledObject.WorkingDirectory = unmarshaller.Unmarshall(context); - continue; - } - } - return unmarshalledObject; - } - - - private static ContainerDefinitionUnmarshaller _instance = new ContainerDefinitionUnmarshaller(); - - /// - /// Gets the singleton. - /// - public static ContainerDefinitionUnmarshaller Instance - { - get - { - return _instance; - } - } - } -} \ No newline at end of file diff --git a/sdk/src/Services/GameLift/Generated/Model/Internal/MarshallTransformations/ContainerFleetUnmarshaller.cs b/sdk/src/Services/GameLift/Generated/Model/Internal/MarshallTransformations/ContainerFleetUnmarshaller.cs index 5f9e3347d587..73837390d6ce 100644 --- a/sdk/src/Services/GameLift/Generated/Model/Internal/MarshallTransformations/ContainerFleetUnmarshaller.cs +++ b/sdk/src/Services/GameLift/Generated/Model/Internal/MarshallTransformations/ContainerFleetUnmarshaller.cs @@ -74,7 +74,7 @@ public ContainerFleet Unmarshall(JsonUnmarshallerContext context) } if (context.TestExpression("CreationTime", targetDepth)) { - var unmarshaller = DateTimeUnmarshaller.Instance; + var unmarshaller = NullableDateTimeUnmarshaller.Instance; unmarshalledObject.CreationTime = unmarshaller.Unmarshall(context); continue; } @@ -122,7 +122,7 @@ public ContainerFleet Unmarshall(JsonUnmarshallerContext context) } if (context.TestExpression("GameServerContainerGroupsPerInstance", targetDepth)) { - var unmarshaller = IntUnmarshaller.Instance; + var unmarshaller = NullableIntUnmarshaller.Instance; unmarshalledObject.GameServerContainerGroupsPerInstance = unmarshaller.Unmarshall(context); continue; } @@ -164,7 +164,7 @@ public ContainerFleet Unmarshall(JsonUnmarshallerContext context) } if (context.TestExpression("MaximumGameServerContainerGroupsPerInstance", targetDepth)) { - var unmarshaller = IntUnmarshaller.Instance; + var unmarshaller = NullableIntUnmarshaller.Instance; unmarshalledObject.MaximumGameServerContainerGroupsPerInstance = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/GameLift/Generated/Model/Internal/MarshallTransformations/ContainerGroupDefinitionUnmarshaller.cs b/sdk/src/Services/GameLift/Generated/Model/Internal/MarshallTransformations/ContainerGroupDefinitionUnmarshaller.cs index 27311e2fa086..bf41d7f9ae01 100644 --- a/sdk/src/Services/GameLift/Generated/Model/Internal/MarshallTransformations/ContainerGroupDefinitionUnmarshaller.cs +++ b/sdk/src/Services/GameLift/Generated/Model/Internal/MarshallTransformations/ContainerGroupDefinitionUnmarshaller.cs @@ -122,20 +122,13 @@ public ContainerGroupDefinition Unmarshall(JsonUnmarshallerContext context) } if (context.TestExpression("TotalMemoryLimitMebibytes", targetDepth)) { -<<<<<<< HEAD var unmarshaller = NullableIntUnmarshaller.Instance; - unmarshalledObject.TotalCpuLimit = unmarshaller.Unmarshall(context); -||||||| Commit version number update changes - var unmarshaller = IntUnmarshaller.Instance; - unmarshalledObject.TotalCpuLimit = unmarshaller.Unmarshall(context); -======= - var unmarshaller = IntUnmarshaller.Instance; unmarshalledObject.TotalMemoryLimitMebibytes = unmarshaller.Unmarshall(context); continue; } if (context.TestExpression("TotalVcpuLimit", targetDepth)) { - var unmarshaller = DoubleUnmarshaller.Instance; + var unmarshaller = NullableDoubleUnmarshaller.Instance; unmarshalledObject.TotalVcpuLimit = unmarshaller.Unmarshall(context); continue; } @@ -143,21 +136,12 @@ public ContainerGroupDefinition Unmarshall(JsonUnmarshallerContext context) { var unmarshaller = StringUnmarshaller.Instance; unmarshalledObject.VersionDescription = unmarshaller.Unmarshall(context); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b continue; } if (context.TestExpression("VersionNumber", targetDepth)) { -<<<<<<< HEAD var unmarshaller = NullableIntUnmarshaller.Instance; - unmarshalledObject.TotalMemoryLimit = unmarshaller.Unmarshall(context); -||||||| Commit version number update changes - var unmarshaller = IntUnmarshaller.Instance; - unmarshalledObject.TotalMemoryLimit = unmarshaller.Unmarshall(context); -======= - var unmarshaller = IntUnmarshaller.Instance; unmarshalledObject.VersionNumber = unmarshaller.Unmarshall(context); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b continue; } } diff --git a/sdk/src/Services/GameLift/Generated/Model/Internal/MarshallTransformations/ContainerGroupsConfigurationMarshaller.cs b/sdk/src/Services/GameLift/Generated/Model/Internal/MarshallTransformations/ContainerGroupsConfigurationMarshaller.cs deleted file mode 100644 index b1f840c96407..000000000000 --- a/sdk/src/Services/GameLift/Generated/Model/Internal/MarshallTransformations/ContainerGroupsConfigurationMarshaller.cs +++ /dev/null @@ -1,87 +0,0 @@ -/* - * 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. - */ - -/* - * Do not modify this file. This file is generated from the gamelift-2015-10-01.normal.json service model. - */ -using System; -using System.Collections.Generic; -using System.Globalization; -using System.IO; -using System.Text; -using System.Xml.Serialization; - -using Amazon.GameLift.Model; -using Amazon.Runtime; -using Amazon.Runtime.Internal; -using Amazon.Runtime.Internal.Transform; -using Amazon.Runtime.Internal.Util; -using ThirdParty.Json.LitJson; - -#pragma warning disable CS0612,CS0618 -namespace Amazon.GameLift.Model.Internal.MarshallTransformations -{ - /// - /// ContainerGroupsConfiguration Marshaller - /// - public class ContainerGroupsConfigurationMarshaller : IRequestMarshaller - { - /// - /// Unmarshaller the response from the service to the response class. - /// - /// - /// - /// - public void Marshall(ContainerGroupsConfiguration requestObject, JsonMarshallerContext context) - { - if(requestObject == null) - return; - if(requestObject.IsSetConnectionPortRange()) - { - context.Writer.WritePropertyName("ConnectionPortRange"); - context.Writer.WriteObjectStart(); - - var marshaller = ConnectionPortRangeMarshaller.Instance; - marshaller.Marshall(requestObject.ConnectionPortRange, context); - - context.Writer.WriteObjectEnd(); - } - - if(requestObject.IsSetContainerGroupDefinitionNames()) - { - context.Writer.WritePropertyName("ContainerGroupDefinitionNames"); - context.Writer.WriteArrayStart(); - foreach(var requestObjectContainerGroupDefinitionNamesListValue in requestObject.ContainerGroupDefinitionNames) - { - context.Writer.Write(requestObjectContainerGroupDefinitionNamesListValue); - } - context.Writer.WriteArrayEnd(); - } - - if(requestObject.IsSetDesiredReplicaContainerGroupsPerInstance()) - { - context.Writer.WritePropertyName("DesiredReplicaContainerGroupsPerInstance"); - context.Writer.Write(requestObject.DesiredReplicaContainerGroupsPerInstance.Value); - } - - } - - /// - /// Singleton Marshaller. - /// - public readonly static ContainerGroupsConfigurationMarshaller Instance = new ContainerGroupsConfigurationMarshaller(); - - } -} \ No newline at end of file diff --git a/sdk/src/Services/GameLift/Generated/Model/Internal/MarshallTransformations/ContainerGroupsPerInstanceUnmarshaller.cs b/sdk/src/Services/GameLift/Generated/Model/Internal/MarshallTransformations/ContainerGroupsPerInstanceUnmarshaller.cs deleted file mode 100644 index eb35edc2a108..000000000000 --- a/sdk/src/Services/GameLift/Generated/Model/Internal/MarshallTransformations/ContainerGroupsPerInstanceUnmarshaller.cs +++ /dev/null @@ -1,99 +0,0 @@ -/* - * 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. - */ - -/* - * Do not modify this file. This file is generated from the gamelift-2015-10-01.normal.json service model. - */ -using System; -using System.Collections.Generic; -using System.Globalization; -using System.IO; -using System.Net; -using System.Text; -using System.Xml.Serialization; - -using Amazon.GameLift.Model; -using Amazon.Runtime; -using Amazon.Runtime.Internal; -using Amazon.Runtime.Internal.Transform; -using Amazon.Runtime.Internal.Util; -using ThirdParty.Json.LitJson; - -#pragma warning disable CS0612,CS0618 -namespace Amazon.GameLift.Model.Internal.MarshallTransformations -{ - /// - /// Response Unmarshaller for ContainerGroupsPerInstance Object - /// - public class ContainerGroupsPerInstanceUnmarshaller : IUnmarshaller, IUnmarshaller - { - /// - /// Unmarshaller the response from the service to the response class. - /// - /// - /// - ContainerGroupsPerInstance IUnmarshaller.Unmarshall(XmlUnmarshallerContext context) - { - throw new NotImplementedException(); - } - - /// - /// Unmarshaller the response from the service to the response class. - /// - /// - /// The unmarshalled object - public ContainerGroupsPerInstance Unmarshall(JsonUnmarshallerContext context) - { - ContainerGroupsPerInstance unmarshalledObject = new ContainerGroupsPerInstance(); - if (context.IsEmptyResponse) - return null; - context.Read(); - if (context.CurrentTokenType == JsonToken.Null) - return null; - - int targetDepth = context.CurrentDepth; - while (context.ReadAtDepth(targetDepth)) - { - if (context.TestExpression("DesiredReplicaContainerGroupsPerInstance", targetDepth)) - { - var unmarshaller = NullableIntUnmarshaller.Instance; - unmarshalledObject.DesiredReplicaContainerGroupsPerInstance = unmarshaller.Unmarshall(context); - continue; - } - if (context.TestExpression("MaxReplicaContainerGroupsPerInstance", targetDepth)) - { - var unmarshaller = NullableIntUnmarshaller.Instance; - unmarshalledObject.MaxReplicaContainerGroupsPerInstance = unmarshaller.Unmarshall(context); - continue; - } - } - return unmarshalledObject; - } - - - private static ContainerGroupsPerInstanceUnmarshaller _instance = new ContainerGroupsPerInstanceUnmarshaller(); - - /// - /// Gets the singleton. - /// - public static ContainerGroupsPerInstanceUnmarshaller Instance - { - get - { - return _instance; - } - } - } -} \ No newline at end of file diff --git a/sdk/src/Services/GameLift/Generated/Model/Internal/MarshallTransformations/ContainerMemoryLimitsMarshaller.cs b/sdk/src/Services/GameLift/Generated/Model/Internal/MarshallTransformations/ContainerMemoryLimitsMarshaller.cs deleted file mode 100644 index 4b14d5d308d9..000000000000 --- a/sdk/src/Services/GameLift/Generated/Model/Internal/MarshallTransformations/ContainerMemoryLimitsMarshaller.cs +++ /dev/null @@ -1,71 +0,0 @@ -/* - * 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. - */ - -/* - * Do not modify this file. This file is generated from the gamelift-2015-10-01.normal.json service model. - */ -using System; -using System.Collections.Generic; -using System.Globalization; -using System.IO; -using System.Text; -using System.Xml.Serialization; - -using Amazon.GameLift.Model; -using Amazon.Runtime; -using Amazon.Runtime.Internal; -using Amazon.Runtime.Internal.Transform; -using Amazon.Runtime.Internal.Util; -using ThirdParty.Json.LitJson; - -#pragma warning disable CS0612,CS0618 -namespace Amazon.GameLift.Model.Internal.MarshallTransformations -{ - /// - /// ContainerMemoryLimits Marshaller - /// - public class ContainerMemoryLimitsMarshaller : IRequestMarshaller - { - /// - /// Unmarshaller the response from the service to the response class. - /// - /// - /// - /// - public void Marshall(ContainerMemoryLimits requestObject, JsonMarshallerContext context) - { - if(requestObject == null) - return; - if(requestObject.IsSetHardLimit()) - { - context.Writer.WritePropertyName("HardLimit"); - context.Writer.Write(requestObject.HardLimit.Value); - } - - if(requestObject.IsSetSoftLimit()) - { - context.Writer.WritePropertyName("SoftLimit"); - context.Writer.Write(requestObject.SoftLimit.Value); - } - - } - - /// - /// Singleton Marshaller. - /// - public readonly static ContainerMemoryLimitsMarshaller Instance = new ContainerMemoryLimitsMarshaller(); - - } -} \ No newline at end of file diff --git a/sdk/src/Services/GameLift/Generated/Model/Internal/MarshallTransformations/ContainerMemoryLimitsUnmarshaller.cs b/sdk/src/Services/GameLift/Generated/Model/Internal/MarshallTransformations/ContainerMemoryLimitsUnmarshaller.cs deleted file mode 100644 index 3bd9de687c76..000000000000 --- a/sdk/src/Services/GameLift/Generated/Model/Internal/MarshallTransformations/ContainerMemoryLimitsUnmarshaller.cs +++ /dev/null @@ -1,99 +0,0 @@ -/* - * 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. - */ - -/* - * Do not modify this file. This file is generated from the gamelift-2015-10-01.normal.json service model. - */ -using System; -using System.Collections.Generic; -using System.Globalization; -using System.IO; -using System.Net; -using System.Text; -using System.Xml.Serialization; - -using Amazon.GameLift.Model; -using Amazon.Runtime; -using Amazon.Runtime.Internal; -using Amazon.Runtime.Internal.Transform; -using Amazon.Runtime.Internal.Util; -using ThirdParty.Json.LitJson; - -#pragma warning disable CS0612,CS0618 -namespace Amazon.GameLift.Model.Internal.MarshallTransformations -{ - /// - /// Response Unmarshaller for ContainerMemoryLimits Object - /// - public class ContainerMemoryLimitsUnmarshaller : IUnmarshaller, IUnmarshaller - { - /// - /// Unmarshaller the response from the service to the response class. - /// - /// - /// - ContainerMemoryLimits IUnmarshaller.Unmarshall(XmlUnmarshallerContext context) - { - throw new NotImplementedException(); - } - - /// - /// Unmarshaller the response from the service to the response class. - /// - /// - /// The unmarshalled object - public ContainerMemoryLimits Unmarshall(JsonUnmarshallerContext context) - { - ContainerMemoryLimits unmarshalledObject = new ContainerMemoryLimits(); - if (context.IsEmptyResponse) - return null; - context.Read(); - if (context.CurrentTokenType == JsonToken.Null) - return null; - - int targetDepth = context.CurrentDepth; - while (context.ReadAtDepth(targetDepth)) - { - if (context.TestExpression("HardLimit", targetDepth)) - { - var unmarshaller = NullableIntUnmarshaller.Instance; - unmarshalledObject.HardLimit = unmarshaller.Unmarshall(context); - continue; - } - if (context.TestExpression("SoftLimit", targetDepth)) - { - var unmarshaller = NullableIntUnmarshaller.Instance; - unmarshalledObject.SoftLimit = unmarshaller.Unmarshall(context); - continue; - } - } - return unmarshalledObject; - } - - - private static ContainerMemoryLimitsUnmarshaller _instance = new ContainerMemoryLimitsUnmarshaller(); - - /// - /// Gets the singleton. - /// - public static ContainerMemoryLimitsUnmarshaller Instance - { - get - { - return _instance; - } - } - } -} \ No newline at end of file diff --git a/sdk/src/Services/GameLift/Generated/Model/Internal/MarshallTransformations/ContainerPortMappingUnmarshaller.cs b/sdk/src/Services/GameLift/Generated/Model/Internal/MarshallTransformations/ContainerPortMappingUnmarshaller.cs deleted file mode 100644 index 7537bde42258..000000000000 --- a/sdk/src/Services/GameLift/Generated/Model/Internal/MarshallTransformations/ContainerPortMappingUnmarshaller.cs +++ /dev/null @@ -1,105 +0,0 @@ -/* - * 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. - */ - -/* - * Do not modify this file. This file is generated from the gamelift-2015-10-01.normal.json service model. - */ -using System; -using System.Collections.Generic; -using System.Globalization; -using System.IO; -using System.Net; -using System.Text; -using System.Xml.Serialization; - -using Amazon.GameLift.Model; -using Amazon.Runtime; -using Amazon.Runtime.Internal; -using Amazon.Runtime.Internal.Transform; -using Amazon.Runtime.Internal.Util; -using ThirdParty.Json.LitJson; - -#pragma warning disable CS0612,CS0618 -namespace Amazon.GameLift.Model.Internal.MarshallTransformations -{ - /// - /// Response Unmarshaller for ContainerPortMapping Object - /// - public class ContainerPortMappingUnmarshaller : IUnmarshaller, IUnmarshaller - { - /// - /// Unmarshaller the response from the service to the response class. - /// - /// - /// - ContainerPortMapping IUnmarshaller.Unmarshall(XmlUnmarshallerContext context) - { - throw new NotImplementedException(); - } - - /// - /// Unmarshaller the response from the service to the response class. - /// - /// - /// The unmarshalled object - public ContainerPortMapping Unmarshall(JsonUnmarshallerContext context) - { - ContainerPortMapping unmarshalledObject = new ContainerPortMapping(); - if (context.IsEmptyResponse) - return null; - context.Read(); - if (context.CurrentTokenType == JsonToken.Null) - return null; - - int targetDepth = context.CurrentDepth; - while (context.ReadAtDepth(targetDepth)) - { - if (context.TestExpression("ConnectionPort", targetDepth)) - { - var unmarshaller = NullableIntUnmarshaller.Instance; - unmarshalledObject.ConnectionPort = unmarshaller.Unmarshall(context); - continue; - } - if (context.TestExpression("ContainerPort", targetDepth)) - { - var unmarshaller = NullableIntUnmarshaller.Instance; - unmarshalledObject.ContainerPort = unmarshaller.Unmarshall(context); - continue; - } - if (context.TestExpression("Protocol", targetDepth)) - { - var unmarshaller = StringUnmarshaller.Instance; - unmarshalledObject.Protocol = unmarshaller.Unmarshall(context); - continue; - } - } - return unmarshalledObject; - } - - - private static ContainerPortMappingUnmarshaller _instance = new ContainerPortMappingUnmarshaller(); - - /// - /// Gets the singleton. - /// - public static ContainerPortMappingUnmarshaller Instance - { - get - { - return _instance; - } - } - } -} \ No newline at end of file diff --git a/sdk/src/Services/GameLift/Generated/Model/Internal/MarshallTransformations/CreateContainerFleetRequestMarshaller.cs b/sdk/src/Services/GameLift/Generated/Model/Internal/MarshallTransformations/CreateContainerFleetRequestMarshaller.cs index 47d2ba05dca4..555ef24947fc 100644 --- a/sdk/src/Services/GameLift/Generated/Model/Internal/MarshallTransformations/CreateContainerFleetRequestMarshaller.cs +++ b/sdk/src/Services/GameLift/Generated/Model/Internal/MarshallTransformations/CreateContainerFleetRequestMarshaller.cs @@ -63,155 +63,158 @@ public IRequest Marshall(CreateContainerFleetRequest publicRequest) request.HttpMethod = "POST"; request.ResourcePath = "/"; - using (StringWriter stringWriter = new StringWriter(CultureInfo.InvariantCulture)) + using (MemoryStream memoryStream = new MemoryStream()) { - JsonWriter writer = new JsonWriter(stringWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetBillingType()) + using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) { - context.Writer.WritePropertyName("BillingType"); - context.Writer.Write(publicRequest.BillingType); - } - - if(publicRequest.IsSetDescription()) - { - context.Writer.WritePropertyName("Description"); - context.Writer.Write(publicRequest.Description); - } - - if(publicRequest.IsSetFleetRoleArn()) - { - context.Writer.WritePropertyName("FleetRoleArn"); - context.Writer.Write(publicRequest.FleetRoleArn); - } - - if(publicRequest.IsSetGameServerContainerGroupDefinitionName()) - { - context.Writer.WritePropertyName("GameServerContainerGroupDefinitionName"); - context.Writer.Write(publicRequest.GameServerContainerGroupDefinitionName); - } - - if(publicRequest.IsSetGameServerContainerGroupsPerInstance()) - { - context.Writer.WritePropertyName("GameServerContainerGroupsPerInstance"); - context.Writer.Write(publicRequest.GameServerContainerGroupsPerInstance); - } - - if(publicRequest.IsSetGameSessionCreationLimitPolicy()) - { - context.Writer.WritePropertyName("GameSessionCreationLimitPolicy"); - context.Writer.WriteObjectStart(); - - var marshaller = GameSessionCreationLimitPolicyMarshaller.Instance; - marshaller.Marshall(publicRequest.GameSessionCreationLimitPolicy, context); + JsonWriter writer = new JsonWriter(streamWriter); + writer.Validate = false; + writer.WriteObjectStart(); + var context = new JsonMarshallerContext(request, writer); + if(publicRequest.IsSetBillingType()) + { + context.Writer.WritePropertyName("BillingType"); + context.Writer.Write(publicRequest.BillingType); + } - context.Writer.WriteObjectEnd(); - } + if(publicRequest.IsSetDescription()) + { + context.Writer.WritePropertyName("Description"); + context.Writer.Write(publicRequest.Description); + } - if(publicRequest.IsSetInstanceConnectionPortRange()) - { - context.Writer.WritePropertyName("InstanceConnectionPortRange"); - context.Writer.WriteObjectStart(); + if(publicRequest.IsSetFleetRoleArn()) + { + context.Writer.WritePropertyName("FleetRoleArn"); + context.Writer.Write(publicRequest.FleetRoleArn); + } - var marshaller = ConnectionPortRangeMarshaller.Instance; - marshaller.Marshall(publicRequest.InstanceConnectionPortRange, context); + if(publicRequest.IsSetGameServerContainerGroupDefinitionName()) + { + context.Writer.WritePropertyName("GameServerContainerGroupDefinitionName"); + context.Writer.Write(publicRequest.GameServerContainerGroupDefinitionName); + } - context.Writer.WriteObjectEnd(); - } + if(publicRequest.IsSetGameServerContainerGroupsPerInstance()) + { + context.Writer.WritePropertyName("GameServerContainerGroupsPerInstance"); + context.Writer.Write(publicRequest.GameServerContainerGroupsPerInstance.Value); + } - if(publicRequest.IsSetInstanceInboundPermissions()) - { - context.Writer.WritePropertyName("InstanceInboundPermissions"); - context.Writer.WriteArrayStart(); - foreach(var publicRequestInstanceInboundPermissionsListValue in publicRequest.InstanceInboundPermissions) + if(publicRequest.IsSetGameSessionCreationLimitPolicy()) { + context.Writer.WritePropertyName("GameSessionCreationLimitPolicy"); context.Writer.WriteObjectStart(); - var marshaller = IpPermissionMarshaller.Instance; - marshaller.Marshall(publicRequestInstanceInboundPermissionsListValue, context); + var marshaller = GameSessionCreationLimitPolicyMarshaller.Instance; + marshaller.Marshall(publicRequest.GameSessionCreationLimitPolicy, context); context.Writer.WriteObjectEnd(); } - context.Writer.WriteArrayEnd(); - } - if(publicRequest.IsSetInstanceType()) - { - context.Writer.WritePropertyName("InstanceType"); - context.Writer.Write(publicRequest.InstanceType); - } - - if(publicRequest.IsSetLocations()) - { - context.Writer.WritePropertyName("Locations"); - context.Writer.WriteArrayStart(); - foreach(var publicRequestLocationsListValue in publicRequest.Locations) + if(publicRequest.IsSetInstanceConnectionPortRange()) { + context.Writer.WritePropertyName("InstanceConnectionPortRange"); context.Writer.WriteObjectStart(); - var marshaller = LocationConfigurationMarshaller.Instance; - marshaller.Marshall(publicRequestLocationsListValue, context); + var marshaller = ConnectionPortRangeMarshaller.Instance; + marshaller.Marshall(publicRequest.InstanceConnectionPortRange, context); context.Writer.WriteObjectEnd(); } - context.Writer.WriteArrayEnd(); - } - - if(publicRequest.IsSetLogConfiguration()) - { - context.Writer.WritePropertyName("LogConfiguration"); - context.Writer.WriteObjectStart(); - - var marshaller = LogConfigurationMarshaller.Instance; - marshaller.Marshall(publicRequest.LogConfiguration, context); - - context.Writer.WriteObjectEnd(); - } - if(publicRequest.IsSetMetricGroups()) - { - context.Writer.WritePropertyName("MetricGroups"); - context.Writer.WriteArrayStart(); - foreach(var publicRequestMetricGroupsListValue in publicRequest.MetricGroups) + if(publicRequest.IsSetInstanceInboundPermissions()) { - context.Writer.Write(publicRequestMetricGroupsListValue); + context.Writer.WritePropertyName("InstanceInboundPermissions"); + context.Writer.WriteArrayStart(); + foreach(var publicRequestInstanceInboundPermissionsListValue in publicRequest.InstanceInboundPermissions) + { + context.Writer.WriteObjectStart(); + + var marshaller = IpPermissionMarshaller.Instance; + marshaller.Marshall(publicRequestInstanceInboundPermissionsListValue, context); + + context.Writer.WriteObjectEnd(); + } + context.Writer.WriteArrayEnd(); } - context.Writer.WriteArrayEnd(); - } - if(publicRequest.IsSetNewGameSessionProtectionPolicy()) - { - context.Writer.WritePropertyName("NewGameSessionProtectionPolicy"); - context.Writer.Write(publicRequest.NewGameSessionProtectionPolicy); - } + if(publicRequest.IsSetInstanceType()) + { + context.Writer.WritePropertyName("InstanceType"); + context.Writer.Write(publicRequest.InstanceType); + } - if(publicRequest.IsSetPerInstanceContainerGroupDefinitionName()) - { - context.Writer.WritePropertyName("PerInstanceContainerGroupDefinitionName"); - context.Writer.Write(publicRequest.PerInstanceContainerGroupDefinitionName); - } + if(publicRequest.IsSetLocations()) + { + context.Writer.WritePropertyName("Locations"); + context.Writer.WriteArrayStart(); + foreach(var publicRequestLocationsListValue in publicRequest.Locations) + { + context.Writer.WriteObjectStart(); + + var marshaller = LocationConfigurationMarshaller.Instance; + marshaller.Marshall(publicRequestLocationsListValue, context); + + context.Writer.WriteObjectEnd(); + } + context.Writer.WriteArrayEnd(); + } - if(publicRequest.IsSetTags()) - { - context.Writer.WritePropertyName("Tags"); - context.Writer.WriteArrayStart(); - foreach(var publicRequestTagsListValue in publicRequest.Tags) + if(publicRequest.IsSetLogConfiguration()) { + context.Writer.WritePropertyName("LogConfiguration"); context.Writer.WriteObjectStart(); - var marshaller = TagMarshaller.Instance; - marshaller.Marshall(publicRequestTagsListValue, context); + var marshaller = LogConfigurationMarshaller.Instance; + marshaller.Marshall(publicRequest.LogConfiguration, context); context.Writer.WriteObjectEnd(); } - context.Writer.WriteArrayEnd(); + + if(publicRequest.IsSetMetricGroups()) + { + context.Writer.WritePropertyName("MetricGroups"); + context.Writer.WriteArrayStart(); + foreach(var publicRequestMetricGroupsListValue in publicRequest.MetricGroups) + { + context.Writer.Write(publicRequestMetricGroupsListValue); + } + context.Writer.WriteArrayEnd(); + } + + if(publicRequest.IsSetNewGameSessionProtectionPolicy()) + { + context.Writer.WritePropertyName("NewGameSessionProtectionPolicy"); + context.Writer.Write(publicRequest.NewGameSessionProtectionPolicy); + } + + if(publicRequest.IsSetPerInstanceContainerGroupDefinitionName()) + { + context.Writer.WritePropertyName("PerInstanceContainerGroupDefinitionName"); + context.Writer.Write(publicRequest.PerInstanceContainerGroupDefinitionName); + } + + if(publicRequest.IsSetTags()) + { + context.Writer.WritePropertyName("Tags"); + context.Writer.WriteArrayStart(); + foreach(var publicRequestTagsListValue in publicRequest.Tags) + { + context.Writer.WriteObjectStart(); + + var marshaller = TagMarshaller.Instance; + marshaller.Marshall(publicRequestTagsListValue, context); + + context.Writer.WriteObjectEnd(); + } + context.Writer.WriteArrayEnd(); + } + + writer.WriteObjectEnd(); } - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); + request.Content = memoryStream.ToArray(); } diff --git a/sdk/src/Services/GameLift/Generated/Model/Internal/MarshallTransformations/CreateContainerGroupDefinitionRequestMarshaller.cs b/sdk/src/Services/GameLift/Generated/Model/Internal/MarshallTransformations/CreateContainerGroupDefinitionRequestMarshaller.cs index a90d124fbe26..cd1033940835 100644 --- a/sdk/src/Services/GameLift/Generated/Model/Internal/MarshallTransformations/CreateContainerGroupDefinitionRequestMarshaller.cs +++ b/sdk/src/Services/GameLift/Generated/Model/Internal/MarshallTransformations/CreateContainerGroupDefinitionRequestMarshaller.cs @@ -65,72 +65,28 @@ public IRequest Marshall(CreateContainerGroupDefinitionRequest publicRequest) request.ResourcePath = "/"; using (MemoryStream memoryStream = new MemoryStream()) { -<<<<<<< HEAD using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) -||||||| Commit version number update changes - JsonWriter writer = new JsonWriter(stringWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetContainerDefinitions()) -======= - JsonWriter writer = new JsonWriter(stringWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetContainerGroupType()) ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b { -<<<<<<< HEAD JsonWriter writer = new JsonWriter(streamWriter); writer.Validate = false; writer.WriteObjectStart(); var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetContainerDefinitions()) + if(publicRequest.IsSetContainerGroupType()) { - context.Writer.WritePropertyName("ContainerDefinitions"); - context.Writer.WriteArrayStart(); - foreach(var publicRequestContainerDefinitionsListValue in publicRequest.ContainerDefinitions) - { - context.Writer.WriteObjectStart(); - - var marshaller = ContainerDefinitionInputMarshaller.Instance; - marshaller.Marshall(publicRequestContainerDefinitionsListValue, context); - - context.Writer.WriteObjectEnd(); - } - context.Writer.WriteArrayEnd(); + context.Writer.WritePropertyName("ContainerGroupType"); + context.Writer.Write(publicRequest.ContainerGroupType); } -||||||| Commit version number update changes - context.Writer.WritePropertyName("ContainerDefinitions"); - context.Writer.WriteArrayStart(); - foreach(var publicRequestContainerDefinitionsListValue in publicRequest.ContainerDefinitions) + + if(publicRequest.IsSetGameServerContainerDefinition()) { + context.Writer.WritePropertyName("GameServerContainerDefinition"); context.Writer.WriteObjectStart(); - var marshaller = ContainerDefinitionInputMarshaller.Instance; - marshaller.Marshall(publicRequestContainerDefinitionsListValue, context); + var marshaller = GameServerContainerDefinitionInputMarshaller.Instance; + marshaller.Marshall(publicRequest.GameServerContainerDefinition, context); context.Writer.WriteObjectEnd(); } - context.Writer.WriteArrayEnd(); - } -======= - context.Writer.WritePropertyName("ContainerGroupType"); - context.Writer.Write(publicRequest.ContainerGroupType); - } - - if(publicRequest.IsSetGameServerContainerDefinition()) - { - context.Writer.WritePropertyName("GameServerContainerDefinition"); - context.Writer.WriteObjectStart(); - - var marshaller = GameServerContainerDefinitionInputMarshaller.Instance; - marshaller.Marshall(publicRequest.GameServerContainerDefinition, context); - - context.Writer.WriteObjectEnd(); - } ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b if(publicRequest.IsSetName()) { @@ -138,40 +94,26 @@ public IRequest Marshall(CreateContainerGroupDefinitionRequest publicRequest) context.Writer.Write(publicRequest.Name); } -<<<<<<< HEAD if(publicRequest.IsSetOperatingSystem()) { context.Writer.WritePropertyName("OperatingSystem"); context.Writer.Write(publicRequest.OperatingSystem); } -||||||| Commit version number update changes - if(publicRequest.IsSetSchedulingStrategy()) - { - context.Writer.WritePropertyName("SchedulingStrategy"); - context.Writer.Write(publicRequest.SchedulingStrategy); - } -======= - if(publicRequest.IsSetSupportContainerDefinitions()) - { - context.Writer.WritePropertyName("SupportContainerDefinitions"); - context.Writer.WriteArrayStart(); - foreach(var publicRequestSupportContainerDefinitionsListValue in publicRequest.SupportContainerDefinitions) - { - context.Writer.WriteObjectStart(); - var marshaller = SupportContainerDefinitionInputMarshaller.Instance; - marshaller.Marshall(publicRequestSupportContainerDefinitionsListValue, context); + if(publicRequest.IsSetSupportContainerDefinitions()) + { + context.Writer.WritePropertyName("SupportContainerDefinitions"); + context.Writer.WriteArrayStart(); + foreach(var publicRequestSupportContainerDefinitionsListValue in publicRequest.SupportContainerDefinitions) + { + context.Writer.WriteObjectStart(); - context.Writer.WriteObjectEnd(); - } - context.Writer.WriteArrayEnd(); - } ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b + var marshaller = SupportContainerDefinitionInputMarshaller.Instance; + marshaller.Marshall(publicRequestSupportContainerDefinitionsListValue, context); - if(publicRequest.IsSetSchedulingStrategy()) - { - context.Writer.WritePropertyName("SchedulingStrategy"); - context.Writer.Write(publicRequest.SchedulingStrategy); + context.Writer.WriteObjectEnd(); + } + context.Writer.WriteArrayEnd(); } if(publicRequest.IsSetTags()) @@ -190,58 +132,32 @@ public IRequest Marshall(CreateContainerGroupDefinitionRequest publicRequest) context.Writer.WriteArrayEnd(); } - if(publicRequest.IsSetTotalCpuLimit()) + if(publicRequest.IsSetTotalMemoryLimitMebibytes()) { - context.Writer.WritePropertyName("TotalCpuLimit"); - context.Writer.Write(publicRequest.TotalCpuLimit.Value); + context.Writer.WritePropertyName("TotalMemoryLimitMebibytes"); + context.Writer.Write(publicRequest.TotalMemoryLimitMebibytes.Value); } -<<<<<<< HEAD - if(publicRequest.IsSetTotalMemoryLimit()) + if(publicRequest.IsSetTotalVcpuLimit()) { - context.Writer.WritePropertyName("TotalMemoryLimit"); - context.Writer.Write(publicRequest.TotalMemoryLimit.Value); + context.Writer.WritePropertyName("TotalVcpuLimit"); + if(StringUtils.IsSpecialDoubleValue(publicRequest.TotalVcpuLimit.Value)) + { + context.Writer.Write(StringUtils.FromSpecialDoubleValue(publicRequest.TotalVcpuLimit.Value)); + } + else + { + context.Writer.Write(publicRequest.TotalVcpuLimit.Value); + } } -||||||| Commit version number update changes - if(publicRequest.IsSetTotalCpuLimit()) - { - context.Writer.WritePropertyName("TotalCpuLimit"); - context.Writer.Write(publicRequest.TotalCpuLimit); - } -======= - if(publicRequest.IsSetTotalMemoryLimitMebibytes()) - { - context.Writer.WritePropertyName("TotalMemoryLimitMebibytes"); - context.Writer.Write(publicRequest.TotalMemoryLimitMebibytes); - } - if(publicRequest.IsSetTotalVcpuLimit()) - { - context.Writer.WritePropertyName("TotalVcpuLimit"); - if(StringUtils.IsSpecialDoubleValue(publicRequest.TotalVcpuLimit)) + if(publicRequest.IsSetVersionDescription()) { - context.Writer.Write(StringUtils.FromSpecialDoubleValue(publicRequest.TotalVcpuLimit)); + context.Writer.WritePropertyName("VersionDescription"); + context.Writer.Write(publicRequest.VersionDescription); } - else - { - context.Writer.Write(publicRequest.TotalVcpuLimit); - } - } ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b -<<<<<<< HEAD writer.WriteObjectEnd(); -||||||| Commit version number update changes - if(publicRequest.IsSetTotalMemoryLimit()) - { - context.Writer.WritePropertyName("TotalMemoryLimit"); - context.Writer.Write(publicRequest.TotalMemoryLimit); -======= - if(publicRequest.IsSetVersionDescription()) - { - context.Writer.WritePropertyName("VersionDescription"); - context.Writer.Write(publicRequest.VersionDescription); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b } request.Content = memoryStream.ToArray(); diff --git a/sdk/src/Services/GameLift/Generated/Model/Internal/MarshallTransformations/CreateFleetRequestMarshaller.cs b/sdk/src/Services/GameLift/Generated/Model/Internal/MarshallTransformations/CreateFleetRequestMarshaller.cs index 90585d632fb3..01a39086aa03 100644 --- a/sdk/src/Services/GameLift/Generated/Model/Internal/MarshallTransformations/CreateFleetRequestMarshaller.cs +++ b/sdk/src/Services/GameLift/Generated/Model/Internal/MarshallTransformations/CreateFleetRequestMarshaller.cs @@ -88,7 +88,6 @@ public IRequest Marshall(CreateFleetRequest publicRequest) context.Writer.Write(publicRequest.BuildId); } -<<<<<<< HEAD if(publicRequest.IsSetCertificateConfiguration()) { context.Writer.WritePropertyName("CertificateConfiguration"); @@ -105,41 +104,6 @@ public IRequest Marshall(CreateFleetRequest publicRequest) context.Writer.WritePropertyName("ComputeType"); context.Writer.Write(publicRequest.ComputeType); } -||||||| Commit version number update changes - if(publicRequest.IsSetContainerGroupsConfiguration()) - { - context.Writer.WritePropertyName("ContainerGroupsConfiguration"); - context.Writer.WriteObjectStart(); - - var marshaller = ContainerGroupsConfigurationMarshaller.Instance; - marshaller.Marshall(publicRequest.ContainerGroupsConfiguration, context); - - context.Writer.WriteObjectEnd(); - } - - if(publicRequest.IsSetDescription()) - { - context.Writer.WritePropertyName("Description"); - context.Writer.Write(publicRequest.Description); - } -======= - if(publicRequest.IsSetDescription()) - { - context.Writer.WritePropertyName("Description"); - context.Writer.Write(publicRequest.Description); - } ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b - - if(publicRequest.IsSetContainerGroupsConfiguration()) - { - context.Writer.WritePropertyName("ContainerGroupsConfiguration"); - context.Writer.WriteObjectStart(); - - var marshaller = ContainerGroupsConfigurationMarshaller.Instance; - marshaller.Marshall(publicRequest.ContainerGroupsConfiguration, context); - - context.Writer.WriteObjectEnd(); - } if(publicRequest.IsSetDescription()) { diff --git a/sdk/src/Services/GameLift/Generated/Model/Internal/MarshallTransformations/DeleteContainerFleetRequestMarshaller.cs b/sdk/src/Services/GameLift/Generated/Model/Internal/MarshallTransformations/DeleteContainerFleetRequestMarshaller.cs index e3e5c0323792..99e85fe3899b 100644 --- a/sdk/src/Services/GameLift/Generated/Model/Internal/MarshallTransformations/DeleteContainerFleetRequestMarshaller.cs +++ b/sdk/src/Services/GameLift/Generated/Model/Internal/MarshallTransformations/DeleteContainerFleetRequestMarshaller.cs @@ -63,21 +63,24 @@ public IRequest Marshall(DeleteContainerFleetRequest publicRequest) request.HttpMethod = "POST"; request.ResourcePath = "/"; - using (StringWriter stringWriter = new StringWriter(CultureInfo.InvariantCulture)) + using (MemoryStream memoryStream = new MemoryStream()) { - JsonWriter writer = new JsonWriter(stringWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetFleetId()) + using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) { - context.Writer.WritePropertyName("FleetId"); - context.Writer.Write(publicRequest.FleetId); + JsonWriter writer = new JsonWriter(streamWriter); + writer.Validate = false; + writer.WriteObjectStart(); + var context = new JsonMarshallerContext(request, writer); + if(publicRequest.IsSetFleetId()) + { + context.Writer.WritePropertyName("FleetId"); + context.Writer.Write(publicRequest.FleetId); + } + + writer.WriteObjectEnd(); } - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); + request.Content = memoryStream.ToArray(); } diff --git a/sdk/src/Services/GameLift/Generated/Model/Internal/MarshallTransformations/DeleteContainerGroupDefinitionRequestMarshaller.cs b/sdk/src/Services/GameLift/Generated/Model/Internal/MarshallTransformations/DeleteContainerGroupDefinitionRequestMarshaller.cs index bdb098121fea..82f9cf918033 100644 --- a/sdk/src/Services/GameLift/Generated/Model/Internal/MarshallTransformations/DeleteContainerGroupDefinitionRequestMarshaller.cs +++ b/sdk/src/Services/GameLift/Generated/Model/Internal/MarshallTransformations/DeleteContainerGroupDefinitionRequestMarshaller.cs @@ -77,32 +77,22 @@ public IRequest Marshall(DeleteContainerGroupDefinitionRequest publicRequest) context.Writer.Write(publicRequest.Name); } - writer.WriteObjectEnd(); - } + if(publicRequest.IsSetVersionCountToRetain()) + { + context.Writer.WritePropertyName("VersionCountToRetain"); + context.Writer.Write(publicRequest.VersionCountToRetain.Value); + } -<<<<<<< HEAD - request.Content = memoryStream.ToArray(); -||||||| Commit version number update changes - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); -======= - if(publicRequest.IsSetVersionCountToRetain()) - { - context.Writer.WritePropertyName("VersionCountToRetain"); - context.Writer.Write(publicRequest.VersionCountToRetain); - } + if(publicRequest.IsSetVersionNumber()) + { + context.Writer.WritePropertyName("VersionNumber"); + context.Writer.Write(publicRequest.VersionNumber.Value); + } - if(publicRequest.IsSetVersionNumber()) - { - context.Writer.WritePropertyName("VersionNumber"); - context.Writer.Write(publicRequest.VersionNumber); + writer.WriteObjectEnd(); } - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b + request.Content = memoryStream.ToArray(); } diff --git a/sdk/src/Services/GameLift/Generated/Model/Internal/MarshallTransformations/DeploymentConfigurationMarshaller.cs b/sdk/src/Services/GameLift/Generated/Model/Internal/MarshallTransformations/DeploymentConfigurationMarshaller.cs index 9e792505ad49..4b1045f8fe99 100644 --- a/sdk/src/Services/GameLift/Generated/Model/Internal/MarshallTransformations/DeploymentConfigurationMarshaller.cs +++ b/sdk/src/Services/GameLift/Generated/Model/Internal/MarshallTransformations/DeploymentConfigurationMarshaller.cs @@ -57,7 +57,7 @@ public void Marshall(DeploymentConfiguration requestObject, JsonMarshallerContex if(requestObject.IsSetMinimumHealthyPercentage()) { context.Writer.WritePropertyName("MinimumHealthyPercentage"); - context.Writer.Write(requestObject.MinimumHealthyPercentage); + context.Writer.Write(requestObject.MinimumHealthyPercentage.Value); } if(requestObject.IsSetProtectionStrategy()) diff --git a/sdk/src/Services/GameLift/Generated/Model/Internal/MarshallTransformations/DeploymentConfigurationUnmarshaller.cs b/sdk/src/Services/GameLift/Generated/Model/Internal/MarshallTransformations/DeploymentConfigurationUnmarshaller.cs index 869af599e15d..088efb100c49 100644 --- a/sdk/src/Services/GameLift/Generated/Model/Internal/MarshallTransformations/DeploymentConfigurationUnmarshaller.cs +++ b/sdk/src/Services/GameLift/Generated/Model/Internal/MarshallTransformations/DeploymentConfigurationUnmarshaller.cs @@ -74,7 +74,7 @@ public DeploymentConfiguration Unmarshall(JsonUnmarshallerContext context) } if (context.TestExpression("MinimumHealthyPercentage", targetDepth)) { - var unmarshaller = IntUnmarshaller.Instance; + var unmarshaller = NullableIntUnmarshaller.Instance; unmarshalledObject.MinimumHealthyPercentage = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/GameLift/Generated/Model/Internal/MarshallTransformations/DescribeContainerFleetRequestMarshaller.cs b/sdk/src/Services/GameLift/Generated/Model/Internal/MarshallTransformations/DescribeContainerFleetRequestMarshaller.cs index 318652399068..8c80c01e38b3 100644 --- a/sdk/src/Services/GameLift/Generated/Model/Internal/MarshallTransformations/DescribeContainerFleetRequestMarshaller.cs +++ b/sdk/src/Services/GameLift/Generated/Model/Internal/MarshallTransformations/DescribeContainerFleetRequestMarshaller.cs @@ -63,21 +63,24 @@ public IRequest Marshall(DescribeContainerFleetRequest publicRequest) request.HttpMethod = "POST"; request.ResourcePath = "/"; - using (StringWriter stringWriter = new StringWriter(CultureInfo.InvariantCulture)) + using (MemoryStream memoryStream = new MemoryStream()) { - JsonWriter writer = new JsonWriter(stringWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetFleetId()) + using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) { - context.Writer.WritePropertyName("FleetId"); - context.Writer.Write(publicRequest.FleetId); + JsonWriter writer = new JsonWriter(streamWriter); + writer.Validate = false; + writer.WriteObjectStart(); + var context = new JsonMarshallerContext(request, writer); + if(publicRequest.IsSetFleetId()) + { + context.Writer.WritePropertyName("FleetId"); + context.Writer.Write(publicRequest.FleetId); + } + + writer.WriteObjectEnd(); } - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); + request.Content = memoryStream.ToArray(); } diff --git a/sdk/src/Services/GameLift/Generated/Model/Internal/MarshallTransformations/DescribeContainerGroupDefinitionRequestMarshaller.cs b/sdk/src/Services/GameLift/Generated/Model/Internal/MarshallTransformations/DescribeContainerGroupDefinitionRequestMarshaller.cs index 653196c28c13..9d9066cf9236 100644 --- a/sdk/src/Services/GameLift/Generated/Model/Internal/MarshallTransformations/DescribeContainerGroupDefinitionRequestMarshaller.cs +++ b/sdk/src/Services/GameLift/Generated/Model/Internal/MarshallTransformations/DescribeContainerGroupDefinitionRequestMarshaller.cs @@ -77,26 +77,16 @@ public IRequest Marshall(DescribeContainerGroupDefinitionRequest publicRequest) context.Writer.Write(publicRequest.Name); } + if(publicRequest.IsSetVersionNumber()) + { + context.Writer.WritePropertyName("VersionNumber"); + context.Writer.Write(publicRequest.VersionNumber.Value); + } + writer.WriteObjectEnd(); } -<<<<<<< HEAD request.Content = memoryStream.ToArray(); -||||||| Commit version number update changes - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); -======= - if(publicRequest.IsSetVersionNumber()) - { - context.Writer.WritePropertyName("VersionNumber"); - context.Writer.Write(publicRequest.VersionNumber); - } - - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b } diff --git a/sdk/src/Services/GameLift/Generated/Model/Internal/MarshallTransformations/DescribeFleetDeploymentRequestMarshaller.cs b/sdk/src/Services/GameLift/Generated/Model/Internal/MarshallTransformations/DescribeFleetDeploymentRequestMarshaller.cs index d6767c03bd40..762dd1c2f422 100644 --- a/sdk/src/Services/GameLift/Generated/Model/Internal/MarshallTransformations/DescribeFleetDeploymentRequestMarshaller.cs +++ b/sdk/src/Services/GameLift/Generated/Model/Internal/MarshallTransformations/DescribeFleetDeploymentRequestMarshaller.cs @@ -63,27 +63,30 @@ public IRequest Marshall(DescribeFleetDeploymentRequest publicRequest) request.HttpMethod = "POST"; request.ResourcePath = "/"; - using (StringWriter stringWriter = new StringWriter(CultureInfo.InvariantCulture)) + using (MemoryStream memoryStream = new MemoryStream()) { - JsonWriter writer = new JsonWriter(stringWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetDeploymentId()) + using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) { - context.Writer.WritePropertyName("DeploymentId"); - context.Writer.Write(publicRequest.DeploymentId); - } + JsonWriter writer = new JsonWriter(streamWriter); + writer.Validate = false; + writer.WriteObjectStart(); + var context = new JsonMarshallerContext(request, writer); + if(publicRequest.IsSetDeploymentId()) + { + context.Writer.WritePropertyName("DeploymentId"); + context.Writer.Write(publicRequest.DeploymentId); + } - if(publicRequest.IsSetFleetId()) - { - context.Writer.WritePropertyName("FleetId"); - context.Writer.Write(publicRequest.FleetId); + if(publicRequest.IsSetFleetId()) + { + context.Writer.WritePropertyName("FleetId"); + context.Writer.Write(publicRequest.FleetId); + } + + writer.WriteObjectEnd(); } - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); + request.Content = memoryStream.ToArray(); } diff --git a/sdk/src/Services/GameLift/Generated/Model/Internal/MarshallTransformations/FleetDeploymentUnmarshaller.cs b/sdk/src/Services/GameLift/Generated/Model/Internal/MarshallTransformations/FleetDeploymentUnmarshaller.cs index d7a41b015a25..62bafbd2ea58 100644 --- a/sdk/src/Services/GameLift/Generated/Model/Internal/MarshallTransformations/FleetDeploymentUnmarshaller.cs +++ b/sdk/src/Services/GameLift/Generated/Model/Internal/MarshallTransformations/FleetDeploymentUnmarshaller.cs @@ -68,7 +68,7 @@ public FleetDeployment Unmarshall(JsonUnmarshallerContext context) { if (context.TestExpression("CreationTime", targetDepth)) { - var unmarshaller = DateTimeUnmarshaller.Instance; + var unmarshaller = NullableDateTimeUnmarshaller.Instance; unmarshalledObject.CreationTime = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/GameLift/Generated/Model/Internal/MarshallTransformations/GameServerContainerGroupCountsUnmarshaller.cs b/sdk/src/Services/GameLift/Generated/Model/Internal/MarshallTransformations/GameServerContainerGroupCountsUnmarshaller.cs index 01d80be8c1f4..4b24526b381f 100644 --- a/sdk/src/Services/GameLift/Generated/Model/Internal/MarshallTransformations/GameServerContainerGroupCountsUnmarshaller.cs +++ b/sdk/src/Services/GameLift/Generated/Model/Internal/MarshallTransformations/GameServerContainerGroupCountsUnmarshaller.cs @@ -68,25 +68,25 @@ public GameServerContainerGroupCounts Unmarshall(JsonUnmarshallerContext context { if (context.TestExpression("ACTIVE", targetDepth)) { - var unmarshaller = IntUnmarshaller.Instance; + var unmarshaller = NullableIntUnmarshaller.Instance; unmarshalledObject.ACTIVE = unmarshaller.Unmarshall(context); continue; } if (context.TestExpression("IDLE", targetDepth)) { - var unmarshaller = IntUnmarshaller.Instance; + var unmarshaller = NullableIntUnmarshaller.Instance; unmarshalledObject.IDLE = unmarshaller.Unmarshall(context); continue; } if (context.TestExpression("PENDING", targetDepth)) { - var unmarshaller = IntUnmarshaller.Instance; + var unmarshaller = NullableIntUnmarshaller.Instance; unmarshalledObject.PENDING = unmarshaller.Unmarshall(context); continue; } if (context.TestExpression("TERMINATING", targetDepth)) { - var unmarshaller = IntUnmarshaller.Instance; + var unmarshaller = NullableIntUnmarshaller.Instance; unmarshalledObject.TERMINATING = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/GameLift/Generated/Model/Internal/MarshallTransformations/GameSessionCreationLimitPolicyMarshaller.cs b/sdk/src/Services/GameLift/Generated/Model/Internal/MarshallTransformations/GameSessionCreationLimitPolicyMarshaller.cs index 1f03dd51c812..3bcdacaa425b 100644 --- a/sdk/src/Services/GameLift/Generated/Model/Internal/MarshallTransformations/GameSessionCreationLimitPolicyMarshaller.cs +++ b/sdk/src/Services/GameLift/Generated/Model/Internal/MarshallTransformations/GameSessionCreationLimitPolicyMarshaller.cs @@ -51,13 +51,13 @@ public void Marshall(GameSessionCreationLimitPolicy requestObject, JsonMarshalle if(requestObject.IsSetNewGameSessionsPerCreator()) { context.Writer.WritePropertyName("NewGameSessionsPerCreator"); - context.Writer.Write(requestObject.NewGameSessionsPerCreator); + context.Writer.Write(requestObject.NewGameSessionsPerCreator.Value); } if(requestObject.IsSetPolicyPeriodInMinutes()) { context.Writer.WritePropertyName("PolicyPeriodInMinutes"); - context.Writer.Write(requestObject.PolicyPeriodInMinutes); + context.Writer.Write(requestObject.PolicyPeriodInMinutes.Value); } } diff --git a/sdk/src/Services/GameLift/Generated/Model/Internal/MarshallTransformations/GameSessionCreationLimitPolicyUnmarshaller.cs b/sdk/src/Services/GameLift/Generated/Model/Internal/MarshallTransformations/GameSessionCreationLimitPolicyUnmarshaller.cs index 8b38819e6620..b8ba8dda1f5d 100644 --- a/sdk/src/Services/GameLift/Generated/Model/Internal/MarshallTransformations/GameSessionCreationLimitPolicyUnmarshaller.cs +++ b/sdk/src/Services/GameLift/Generated/Model/Internal/MarshallTransformations/GameSessionCreationLimitPolicyUnmarshaller.cs @@ -68,13 +68,13 @@ public GameSessionCreationLimitPolicy Unmarshall(JsonUnmarshallerContext context { if (context.TestExpression("NewGameSessionsPerCreator", targetDepth)) { - var unmarshaller = IntUnmarshaller.Instance; + var unmarshaller = NullableIntUnmarshaller.Instance; unmarshalledObject.NewGameSessionsPerCreator = unmarshaller.Unmarshall(context); continue; } if (context.TestExpression("PolicyPeriodInMinutes", targetDepth)) { - var unmarshaller = IntUnmarshaller.Instance; + var unmarshaller = NullableIntUnmarshaller.Instance; unmarshalledObject.PolicyPeriodInMinutes = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/GameLift/Generated/Model/Internal/MarshallTransformations/ListComputeRequestMarshaller.cs b/sdk/src/Services/GameLift/Generated/Model/Internal/MarshallTransformations/ListComputeRequestMarshaller.cs index 6ba3662e12ed..74e28293f162 100644 --- a/sdk/src/Services/GameLift/Generated/Model/Internal/MarshallTransformations/ListComputeRequestMarshaller.cs +++ b/sdk/src/Services/GameLift/Generated/Model/Internal/MarshallTransformations/ListComputeRequestMarshaller.cs @@ -65,38 +65,24 @@ public IRequest Marshall(ListComputeRequest publicRequest) request.ResourcePath = "/"; using (MemoryStream memoryStream = new MemoryStream()) { -<<<<<<< HEAD using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) -||||||| Commit version number update changes - JsonWriter writer = new JsonWriter(stringWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetFleetId()) -======= - JsonWriter writer = new JsonWriter(stringWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetComputeStatus()) - { - context.Writer.WritePropertyName("ComputeStatus"); - context.Writer.Write(publicRequest.ComputeStatus); - } - - if(publicRequest.IsSetContainerGroupDefinitionName()) - { - context.Writer.WritePropertyName("ContainerGroupDefinitionName"); - context.Writer.Write(publicRequest.ContainerGroupDefinitionName); - } - - if(publicRequest.IsSetFleetId()) ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b { JsonWriter writer = new JsonWriter(streamWriter); writer.Validate = false; writer.WriteObjectStart(); var context = new JsonMarshallerContext(request, writer); + if(publicRequest.IsSetComputeStatus()) + { + context.Writer.WritePropertyName("ComputeStatus"); + context.Writer.Write(publicRequest.ComputeStatus); + } + + if(publicRequest.IsSetContainerGroupDefinitionName()) + { + context.Writer.WritePropertyName("ContainerGroupDefinitionName"); + context.Writer.Write(publicRequest.ContainerGroupDefinitionName); + } + if(publicRequest.IsSetFleetId()) { context.Writer.WritePropertyName("FleetId"); diff --git a/sdk/src/Services/GameLift/Generated/Model/Internal/MarshallTransformations/ListContainerFleetsRequestMarshaller.cs b/sdk/src/Services/GameLift/Generated/Model/Internal/MarshallTransformations/ListContainerFleetsRequestMarshaller.cs index 9670e6f3c4c9..8eeb63596059 100644 --- a/sdk/src/Services/GameLift/Generated/Model/Internal/MarshallTransformations/ListContainerFleetsRequestMarshaller.cs +++ b/sdk/src/Services/GameLift/Generated/Model/Internal/MarshallTransformations/ListContainerFleetsRequestMarshaller.cs @@ -63,33 +63,36 @@ public IRequest Marshall(ListContainerFleetsRequest publicRequest) request.HttpMethod = "POST"; request.ResourcePath = "/"; - using (StringWriter stringWriter = new StringWriter(CultureInfo.InvariantCulture)) + using (MemoryStream memoryStream = new MemoryStream()) { - JsonWriter writer = new JsonWriter(stringWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetContainerGroupDefinitionName()) + using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) { - context.Writer.WritePropertyName("ContainerGroupDefinitionName"); - context.Writer.Write(publicRequest.ContainerGroupDefinitionName); - } + JsonWriter writer = new JsonWriter(streamWriter); + writer.Validate = false; + writer.WriteObjectStart(); + var context = new JsonMarshallerContext(request, writer); + if(publicRequest.IsSetContainerGroupDefinitionName()) + { + context.Writer.WritePropertyName("ContainerGroupDefinitionName"); + context.Writer.Write(publicRequest.ContainerGroupDefinitionName); + } - if(publicRequest.IsSetLimit()) - { - context.Writer.WritePropertyName("Limit"); - context.Writer.Write(publicRequest.Limit); - } + if(publicRequest.IsSetLimit()) + { + context.Writer.WritePropertyName("Limit"); + context.Writer.Write(publicRequest.Limit.Value); + } - if(publicRequest.IsSetNextToken()) - { - context.Writer.WritePropertyName("NextToken"); - context.Writer.Write(publicRequest.NextToken); + if(publicRequest.IsSetNextToken()) + { + context.Writer.WritePropertyName("NextToken"); + context.Writer.Write(publicRequest.NextToken); + } + + writer.WriteObjectEnd(); } - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); + request.Content = memoryStream.ToArray(); } diff --git a/sdk/src/Services/GameLift/Generated/Model/Internal/MarshallTransformations/ListContainerGroupDefinitionVersionsRequestMarshaller.cs b/sdk/src/Services/GameLift/Generated/Model/Internal/MarshallTransformations/ListContainerGroupDefinitionVersionsRequestMarshaller.cs index 0e377cc485db..40e9590310d7 100644 --- a/sdk/src/Services/GameLift/Generated/Model/Internal/MarshallTransformations/ListContainerGroupDefinitionVersionsRequestMarshaller.cs +++ b/sdk/src/Services/GameLift/Generated/Model/Internal/MarshallTransformations/ListContainerGroupDefinitionVersionsRequestMarshaller.cs @@ -63,33 +63,36 @@ public IRequest Marshall(ListContainerGroupDefinitionVersionsRequest publicReque request.HttpMethod = "POST"; request.ResourcePath = "/"; - using (StringWriter stringWriter = new StringWriter(CultureInfo.InvariantCulture)) + using (MemoryStream memoryStream = new MemoryStream()) { - JsonWriter writer = new JsonWriter(stringWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetLimit()) + using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) { - context.Writer.WritePropertyName("Limit"); - context.Writer.Write(publicRequest.Limit); - } + JsonWriter writer = new JsonWriter(streamWriter); + writer.Validate = false; + writer.WriteObjectStart(); + var context = new JsonMarshallerContext(request, writer); + if(publicRequest.IsSetLimit()) + { + context.Writer.WritePropertyName("Limit"); + context.Writer.Write(publicRequest.Limit.Value); + } - if(publicRequest.IsSetName()) - { - context.Writer.WritePropertyName("Name"); - context.Writer.Write(publicRequest.Name); - } + if(publicRequest.IsSetName()) + { + context.Writer.WritePropertyName("Name"); + context.Writer.Write(publicRequest.Name); + } - if(publicRequest.IsSetNextToken()) - { - context.Writer.WritePropertyName("NextToken"); - context.Writer.Write(publicRequest.NextToken); + if(publicRequest.IsSetNextToken()) + { + context.Writer.WritePropertyName("NextToken"); + context.Writer.Write(publicRequest.NextToken); + } + + writer.WriteObjectEnd(); } - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); + request.Content = memoryStream.ToArray(); } diff --git a/sdk/src/Services/GameLift/Generated/Model/Internal/MarshallTransformations/ListContainerGroupDefinitionsRequestMarshaller.cs b/sdk/src/Services/GameLift/Generated/Model/Internal/MarshallTransformations/ListContainerGroupDefinitionsRequestMarshaller.cs index 28c6db3391c5..d608040f6b57 100644 --- a/sdk/src/Services/GameLift/Generated/Model/Internal/MarshallTransformations/ListContainerGroupDefinitionsRequestMarshaller.cs +++ b/sdk/src/Services/GameLift/Generated/Model/Internal/MarshallTransformations/ListContainerGroupDefinitionsRequestMarshaller.cs @@ -65,32 +65,18 @@ public IRequest Marshall(ListContainerGroupDefinitionsRequest publicRequest) request.ResourcePath = "/"; using (MemoryStream memoryStream = new MemoryStream()) { -<<<<<<< HEAD using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) -||||||| Commit version number update changes - JsonWriter writer = new JsonWriter(stringWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetLimit()) -======= - JsonWriter writer = new JsonWriter(stringWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetContainerGroupType()) - { - context.Writer.WritePropertyName("ContainerGroupType"); - context.Writer.Write(publicRequest.ContainerGroupType); - } - - if(publicRequest.IsSetLimit()) ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b { JsonWriter writer = new JsonWriter(streamWriter); writer.Validate = false; writer.WriteObjectStart(); var context = new JsonMarshallerContext(request, writer); + if(publicRequest.IsSetContainerGroupType()) + { + context.Writer.WritePropertyName("ContainerGroupType"); + context.Writer.Write(publicRequest.ContainerGroupType); + } + if(publicRequest.IsSetLimit()) { context.Writer.WritePropertyName("Limit"); @@ -103,32 +89,10 @@ public IRequest Marshall(ListContainerGroupDefinitionsRequest publicRequest) context.Writer.Write(publicRequest.NextToken); } -<<<<<<< HEAD - if(publicRequest.IsSetSchedulingStrategy()) - { - context.Writer.WritePropertyName("SchedulingStrategy"); - context.Writer.Write(publicRequest.SchedulingStrategy); - } - writer.WriteObjectEnd(); } request.Content = memoryStream.ToArray(); -||||||| Commit version number update changes - if(publicRequest.IsSetSchedulingStrategy()) - { - context.Writer.WritePropertyName("SchedulingStrategy"); - context.Writer.Write(publicRequest.SchedulingStrategy); - } - - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); -======= - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b } diff --git a/sdk/src/Services/GameLift/Generated/Model/Internal/MarshallTransformations/ListFleetDeploymentsRequestMarshaller.cs b/sdk/src/Services/GameLift/Generated/Model/Internal/MarshallTransformations/ListFleetDeploymentsRequestMarshaller.cs index 01bd5ede5ffb..eb93891969a7 100644 --- a/sdk/src/Services/GameLift/Generated/Model/Internal/MarshallTransformations/ListFleetDeploymentsRequestMarshaller.cs +++ b/sdk/src/Services/GameLift/Generated/Model/Internal/MarshallTransformations/ListFleetDeploymentsRequestMarshaller.cs @@ -63,33 +63,36 @@ public IRequest Marshall(ListFleetDeploymentsRequest publicRequest) request.HttpMethod = "POST"; request.ResourcePath = "/"; - using (StringWriter stringWriter = new StringWriter(CultureInfo.InvariantCulture)) + using (MemoryStream memoryStream = new MemoryStream()) { - JsonWriter writer = new JsonWriter(stringWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetFleetId()) + using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) { - context.Writer.WritePropertyName("FleetId"); - context.Writer.Write(publicRequest.FleetId); - } + JsonWriter writer = new JsonWriter(streamWriter); + writer.Validate = false; + writer.WriteObjectStart(); + var context = new JsonMarshallerContext(request, writer); + if(publicRequest.IsSetFleetId()) + { + context.Writer.WritePropertyName("FleetId"); + context.Writer.Write(publicRequest.FleetId); + } - if(publicRequest.IsSetLimit()) - { - context.Writer.WritePropertyName("Limit"); - context.Writer.Write(publicRequest.Limit); - } + if(publicRequest.IsSetLimit()) + { + context.Writer.WritePropertyName("Limit"); + context.Writer.Write(publicRequest.Limit.Value); + } - if(publicRequest.IsSetNextToken()) - { - context.Writer.WritePropertyName("NextToken"); - context.Writer.Write(publicRequest.NextToken); + if(publicRequest.IsSetNextToken()) + { + context.Writer.WritePropertyName("NextToken"); + context.Writer.Write(publicRequest.NextToken); + } + + writer.WriteObjectEnd(); } - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); + request.Content = memoryStream.ToArray(); } diff --git a/sdk/src/Services/GameLift/Generated/Model/Internal/MarshallTransformations/ListFleetsRequestMarshaller.cs b/sdk/src/Services/GameLift/Generated/Model/Internal/MarshallTransformations/ListFleetsRequestMarshaller.cs index 2e6485b13802..f5118d38d560 100644 --- a/sdk/src/Services/GameLift/Generated/Model/Internal/MarshallTransformations/ListFleetsRequestMarshaller.cs +++ b/sdk/src/Services/GameLift/Generated/Model/Internal/MarshallTransformations/ListFleetsRequestMarshaller.cs @@ -77,37 +77,11 @@ public IRequest Marshall(ListFleetsRequest publicRequest) context.Writer.Write(publicRequest.BuildId); } -<<<<<<< HEAD - if(publicRequest.IsSetContainerGroupDefinitionName()) - { - context.Writer.WritePropertyName("ContainerGroupDefinitionName"); - context.Writer.Write(publicRequest.ContainerGroupDefinitionName); - } - if(publicRequest.IsSetLimit()) { context.Writer.WritePropertyName("Limit"); context.Writer.Write(publicRequest.Limit.Value); } -||||||| Commit version number update changes - if(publicRequest.IsSetContainerGroupDefinitionName()) - { - context.Writer.WritePropertyName("ContainerGroupDefinitionName"); - context.Writer.Write(publicRequest.ContainerGroupDefinitionName); - } - - if(publicRequest.IsSetLimit()) - { - context.Writer.WritePropertyName("Limit"); - context.Writer.Write(publicRequest.Limit); - } -======= - if(publicRequest.IsSetLimit()) - { - context.Writer.WritePropertyName("Limit"); - context.Writer.Write(publicRequest.Limit); - } ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b if(publicRequest.IsSetNextToken()) { diff --git a/sdk/src/Services/GameLift/Generated/Model/Internal/MarshallTransformations/ReplicaContainerGroupCountsUnmarshaller.cs b/sdk/src/Services/GameLift/Generated/Model/Internal/MarshallTransformations/ReplicaContainerGroupCountsUnmarshaller.cs deleted file mode 100644 index df6425c69cae..000000000000 --- a/sdk/src/Services/GameLift/Generated/Model/Internal/MarshallTransformations/ReplicaContainerGroupCountsUnmarshaller.cs +++ /dev/null @@ -1,111 +0,0 @@ -/* - * 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. - */ - -/* - * Do not modify this file. This file is generated from the gamelift-2015-10-01.normal.json service model. - */ -using System; -using System.Collections.Generic; -using System.Globalization; -using System.IO; -using System.Net; -using System.Text; -using System.Xml.Serialization; - -using Amazon.GameLift.Model; -using Amazon.Runtime; -using Amazon.Runtime.Internal; -using Amazon.Runtime.Internal.Transform; -using Amazon.Runtime.Internal.Util; -using ThirdParty.Json.LitJson; - -#pragma warning disable CS0612,CS0618 -namespace Amazon.GameLift.Model.Internal.MarshallTransformations -{ - /// - /// Response Unmarshaller for ReplicaContainerGroupCounts Object - /// - public class ReplicaContainerGroupCountsUnmarshaller : IUnmarshaller, IUnmarshaller - { - /// - /// Unmarshaller the response from the service to the response class. - /// - /// - /// - ReplicaContainerGroupCounts IUnmarshaller.Unmarshall(XmlUnmarshallerContext context) - { - throw new NotImplementedException(); - } - - /// - /// Unmarshaller the response from the service to the response class. - /// - /// - /// The unmarshalled object - public ReplicaContainerGroupCounts Unmarshall(JsonUnmarshallerContext context) - { - ReplicaContainerGroupCounts unmarshalledObject = new ReplicaContainerGroupCounts(); - if (context.IsEmptyResponse) - return null; - context.Read(); - if (context.CurrentTokenType == JsonToken.Null) - return null; - - int targetDepth = context.CurrentDepth; - while (context.ReadAtDepth(targetDepth)) - { - if (context.TestExpression("ACTIVE", targetDepth)) - { - var unmarshaller = NullableIntUnmarshaller.Instance; - unmarshalledObject.ACTIVE = unmarshaller.Unmarshall(context); - continue; - } - if (context.TestExpression("IDLE", targetDepth)) - { - var unmarshaller = NullableIntUnmarshaller.Instance; - unmarshalledObject.IDLE = unmarshaller.Unmarshall(context); - continue; - } - if (context.TestExpression("PENDING", targetDepth)) - { - var unmarshaller = NullableIntUnmarshaller.Instance; - unmarshalledObject.PENDING = unmarshaller.Unmarshall(context); - continue; - } - if (context.TestExpression("TERMINATING", targetDepth)) - { - var unmarshaller = NullableIntUnmarshaller.Instance; - unmarshalledObject.TERMINATING = unmarshaller.Unmarshall(context); - continue; - } - } - return unmarshalledObject; - } - - - private static ReplicaContainerGroupCountsUnmarshaller _instance = new ReplicaContainerGroupCountsUnmarshaller(); - - /// - /// Gets the singleton. - /// - public static ReplicaContainerGroupCountsUnmarshaller Instance - { - get - { - return _instance; - } - } - } -} \ No newline at end of file diff --git a/sdk/src/Services/GameLift/Generated/Model/Internal/MarshallTransformations/SupportContainerDefinitionInputMarshaller.cs b/sdk/src/Services/GameLift/Generated/Model/Internal/MarshallTransformations/SupportContainerDefinitionInputMarshaller.cs index 01c2556953e8..998a1828db3e 100644 --- a/sdk/src/Services/GameLift/Generated/Model/Internal/MarshallTransformations/SupportContainerDefinitionInputMarshaller.cs +++ b/sdk/src/Services/GameLift/Generated/Model/Internal/MarshallTransformations/SupportContainerDefinitionInputMarshaller.cs @@ -89,7 +89,7 @@ public void Marshall(SupportContainerDefinitionInput requestObject, JsonMarshall if(requestObject.IsSetEssential()) { context.Writer.WritePropertyName("Essential"); - context.Writer.Write(requestObject.Essential); + context.Writer.Write(requestObject.Essential.Value); } if(requestObject.IsSetHealthCheck()) @@ -112,7 +112,7 @@ public void Marshall(SupportContainerDefinitionInput requestObject, JsonMarshall if(requestObject.IsSetMemoryHardLimitMebibytes()) { context.Writer.WritePropertyName("MemoryHardLimitMebibytes"); - context.Writer.Write(requestObject.MemoryHardLimitMebibytes); + context.Writer.Write(requestObject.MemoryHardLimitMebibytes.Value); } if(requestObject.IsSetMountPoints()) @@ -145,13 +145,13 @@ public void Marshall(SupportContainerDefinitionInput requestObject, JsonMarshall if(requestObject.IsSetVcpu()) { context.Writer.WritePropertyName("Vcpu"); - if(StringUtils.IsSpecialDoubleValue(requestObject.Vcpu)) + if(StringUtils.IsSpecialDoubleValue(requestObject.Vcpu.Value)) { - context.Writer.Write(StringUtils.FromSpecialDoubleValue(requestObject.Vcpu)); + context.Writer.Write(StringUtils.FromSpecialDoubleValue(requestObject.Vcpu.Value)); } else { - context.Writer.Write(requestObject.Vcpu); + context.Writer.Write(requestObject.Vcpu.Value); } } diff --git a/sdk/src/Services/GameLift/Generated/Model/Internal/MarshallTransformations/SupportContainerDefinitionUnmarshaller.cs b/sdk/src/Services/GameLift/Generated/Model/Internal/MarshallTransformations/SupportContainerDefinitionUnmarshaller.cs index 9dcc168f58f5..71775e4508a3 100644 --- a/sdk/src/Services/GameLift/Generated/Model/Internal/MarshallTransformations/SupportContainerDefinitionUnmarshaller.cs +++ b/sdk/src/Services/GameLift/Generated/Model/Internal/MarshallTransformations/SupportContainerDefinitionUnmarshaller.cs @@ -86,7 +86,7 @@ public SupportContainerDefinition Unmarshall(JsonUnmarshallerContext context) } if (context.TestExpression("Essential", targetDepth)) { - var unmarshaller = BoolUnmarshaller.Instance; + var unmarshaller = NullableBoolUnmarshaller.Instance; unmarshalledObject.Essential = unmarshaller.Unmarshall(context); continue; } @@ -104,7 +104,7 @@ public SupportContainerDefinition Unmarshall(JsonUnmarshallerContext context) } if (context.TestExpression("MemoryHardLimitMebibytes", targetDepth)) { - var unmarshaller = IntUnmarshaller.Instance; + var unmarshaller = NullableIntUnmarshaller.Instance; unmarshalledObject.MemoryHardLimitMebibytes = unmarshaller.Unmarshall(context); continue; } @@ -128,7 +128,7 @@ public SupportContainerDefinition Unmarshall(JsonUnmarshallerContext context) } if (context.TestExpression("Vcpu", targetDepth)) { - var unmarshaller = DoubleUnmarshaller.Instance; + var unmarshaller = NullableDoubleUnmarshaller.Instance; unmarshalledObject.Vcpu = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/GameLift/Generated/Model/Internal/MarshallTransformations/UpdateContainerFleetRequestMarshaller.cs b/sdk/src/Services/GameLift/Generated/Model/Internal/MarshallTransformations/UpdateContainerFleetRequestMarshaller.cs index 555bd68c216f..e16ae00cf9ec 100644 --- a/sdk/src/Services/GameLift/Generated/Model/Internal/MarshallTransformations/UpdateContainerFleetRequestMarshaller.cs +++ b/sdk/src/Services/GameLift/Generated/Model/Internal/MarshallTransformations/UpdateContainerFleetRequestMarshaller.cs @@ -63,149 +63,152 @@ public IRequest Marshall(UpdateContainerFleetRequest publicRequest) request.HttpMethod = "POST"; request.ResourcePath = "/"; - using (StringWriter stringWriter = new StringWriter(CultureInfo.InvariantCulture)) + using (MemoryStream memoryStream = new MemoryStream()) { - JsonWriter writer = new JsonWriter(stringWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetDeploymentConfiguration()) + using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) { - context.Writer.WritePropertyName("DeploymentConfiguration"); - context.Writer.WriteObjectStart(); - - var marshaller = DeploymentConfigurationMarshaller.Instance; - marshaller.Marshall(publicRequest.DeploymentConfiguration, context); - - context.Writer.WriteObjectEnd(); - } - - if(publicRequest.IsSetDescription()) - { - context.Writer.WritePropertyName("Description"); - context.Writer.Write(publicRequest.Description); - } - - if(publicRequest.IsSetFleetId()) - { - context.Writer.WritePropertyName("FleetId"); - context.Writer.Write(publicRequest.FleetId); - } - - if(publicRequest.IsSetGameServerContainerGroupDefinitionName()) - { - context.Writer.WritePropertyName("GameServerContainerGroupDefinitionName"); - context.Writer.Write(publicRequest.GameServerContainerGroupDefinitionName); - } - - if(publicRequest.IsSetGameServerContainerGroupsPerInstance()) - { - context.Writer.WritePropertyName("GameServerContainerGroupsPerInstance"); - context.Writer.Write(publicRequest.GameServerContainerGroupsPerInstance); - } + JsonWriter writer = new JsonWriter(streamWriter); + writer.Validate = false; + writer.WriteObjectStart(); + var context = new JsonMarshallerContext(request, writer); + if(publicRequest.IsSetDeploymentConfiguration()) + { + context.Writer.WritePropertyName("DeploymentConfiguration"); + context.Writer.WriteObjectStart(); - if(publicRequest.IsSetGameSessionCreationLimitPolicy()) - { - context.Writer.WritePropertyName("GameSessionCreationLimitPolicy"); - context.Writer.WriteObjectStart(); + var marshaller = DeploymentConfigurationMarshaller.Instance; + marshaller.Marshall(publicRequest.DeploymentConfiguration, context); - var marshaller = GameSessionCreationLimitPolicyMarshaller.Instance; - marshaller.Marshall(publicRequest.GameSessionCreationLimitPolicy, context); + context.Writer.WriteObjectEnd(); + } - context.Writer.WriteObjectEnd(); - } + if(publicRequest.IsSetDescription()) + { + context.Writer.WritePropertyName("Description"); + context.Writer.Write(publicRequest.Description); + } - if(publicRequest.IsSetInstanceConnectionPortRange()) - { - context.Writer.WritePropertyName("InstanceConnectionPortRange"); - context.Writer.WriteObjectStart(); + if(publicRequest.IsSetFleetId()) + { + context.Writer.WritePropertyName("FleetId"); + context.Writer.Write(publicRequest.FleetId); + } - var marshaller = ConnectionPortRangeMarshaller.Instance; - marshaller.Marshall(publicRequest.InstanceConnectionPortRange, context); + if(publicRequest.IsSetGameServerContainerGroupDefinitionName()) + { + context.Writer.WritePropertyName("GameServerContainerGroupDefinitionName"); + context.Writer.Write(publicRequest.GameServerContainerGroupDefinitionName); + } - context.Writer.WriteObjectEnd(); - } + if(publicRequest.IsSetGameServerContainerGroupsPerInstance()) + { + context.Writer.WritePropertyName("GameServerContainerGroupsPerInstance"); + context.Writer.Write(publicRequest.GameServerContainerGroupsPerInstance.Value); + } - if(publicRequest.IsSetInstanceInboundPermissionAuthorizations()) - { - context.Writer.WritePropertyName("InstanceInboundPermissionAuthorizations"); - context.Writer.WriteArrayStart(); - foreach(var publicRequestInstanceInboundPermissionAuthorizationsListValue in publicRequest.InstanceInboundPermissionAuthorizations) + if(publicRequest.IsSetGameSessionCreationLimitPolicy()) { + context.Writer.WritePropertyName("GameSessionCreationLimitPolicy"); context.Writer.WriteObjectStart(); - var marshaller = IpPermissionMarshaller.Instance; - marshaller.Marshall(publicRequestInstanceInboundPermissionAuthorizationsListValue, context); + var marshaller = GameSessionCreationLimitPolicyMarshaller.Instance; + marshaller.Marshall(publicRequest.GameSessionCreationLimitPolicy, context); context.Writer.WriteObjectEnd(); } - context.Writer.WriteArrayEnd(); - } - if(publicRequest.IsSetInstanceInboundPermissionRevocations()) - { - context.Writer.WritePropertyName("InstanceInboundPermissionRevocations"); - context.Writer.WriteArrayStart(); - foreach(var publicRequestInstanceInboundPermissionRevocationsListValue in publicRequest.InstanceInboundPermissionRevocations) + if(publicRequest.IsSetInstanceConnectionPortRange()) { + context.Writer.WritePropertyName("InstanceConnectionPortRange"); context.Writer.WriteObjectStart(); - var marshaller = IpPermissionMarshaller.Instance; - marshaller.Marshall(publicRequestInstanceInboundPermissionRevocationsListValue, context); + var marshaller = ConnectionPortRangeMarshaller.Instance; + marshaller.Marshall(publicRequest.InstanceConnectionPortRange, context); context.Writer.WriteObjectEnd(); } - context.Writer.WriteArrayEnd(); - } - if(publicRequest.IsSetLogConfiguration()) - { - context.Writer.WritePropertyName("LogConfiguration"); - context.Writer.WriteObjectStart(); + if(publicRequest.IsSetInstanceInboundPermissionAuthorizations()) + { + context.Writer.WritePropertyName("InstanceInboundPermissionAuthorizations"); + context.Writer.WriteArrayStart(); + foreach(var publicRequestInstanceInboundPermissionAuthorizationsListValue in publicRequest.InstanceInboundPermissionAuthorizations) + { + context.Writer.WriteObjectStart(); + + var marshaller = IpPermissionMarshaller.Instance; + marshaller.Marshall(publicRequestInstanceInboundPermissionAuthorizationsListValue, context); + + context.Writer.WriteObjectEnd(); + } + context.Writer.WriteArrayEnd(); + } - var marshaller = LogConfigurationMarshaller.Instance; - marshaller.Marshall(publicRequest.LogConfiguration, context); + if(publicRequest.IsSetInstanceInboundPermissionRevocations()) + { + context.Writer.WritePropertyName("InstanceInboundPermissionRevocations"); + context.Writer.WriteArrayStart(); + foreach(var publicRequestInstanceInboundPermissionRevocationsListValue in publicRequest.InstanceInboundPermissionRevocations) + { + context.Writer.WriteObjectStart(); + + var marshaller = IpPermissionMarshaller.Instance; + marshaller.Marshall(publicRequestInstanceInboundPermissionRevocationsListValue, context); + + context.Writer.WriteObjectEnd(); + } + context.Writer.WriteArrayEnd(); + } - context.Writer.WriteObjectEnd(); - } + if(publicRequest.IsSetLogConfiguration()) + { + context.Writer.WritePropertyName("LogConfiguration"); + context.Writer.WriteObjectStart(); - if(publicRequest.IsSetMetricGroups()) - { - context.Writer.WritePropertyName("MetricGroups"); - context.Writer.WriteArrayStart(); - foreach(var publicRequestMetricGroupsListValue in publicRequest.MetricGroups) + var marshaller = LogConfigurationMarshaller.Instance; + marshaller.Marshall(publicRequest.LogConfiguration, context); + + context.Writer.WriteObjectEnd(); + } + + if(publicRequest.IsSetMetricGroups()) { - context.Writer.Write(publicRequestMetricGroupsListValue); + context.Writer.WritePropertyName("MetricGroups"); + context.Writer.WriteArrayStart(); + foreach(var publicRequestMetricGroupsListValue in publicRequest.MetricGroups) + { + context.Writer.Write(publicRequestMetricGroupsListValue); + } + context.Writer.WriteArrayEnd(); } - context.Writer.WriteArrayEnd(); - } - if(publicRequest.IsSetNewGameSessionProtectionPolicy()) - { - context.Writer.WritePropertyName("NewGameSessionProtectionPolicy"); - context.Writer.Write(publicRequest.NewGameSessionProtectionPolicy); - } + if(publicRequest.IsSetNewGameSessionProtectionPolicy()) + { + context.Writer.WritePropertyName("NewGameSessionProtectionPolicy"); + context.Writer.Write(publicRequest.NewGameSessionProtectionPolicy); + } - if(publicRequest.IsSetPerInstanceContainerGroupDefinitionName()) - { - context.Writer.WritePropertyName("PerInstanceContainerGroupDefinitionName"); - context.Writer.Write(publicRequest.PerInstanceContainerGroupDefinitionName); - } + if(publicRequest.IsSetPerInstanceContainerGroupDefinitionName()) + { + context.Writer.WritePropertyName("PerInstanceContainerGroupDefinitionName"); + context.Writer.Write(publicRequest.PerInstanceContainerGroupDefinitionName); + } - if(publicRequest.IsSetRemoveAttributes()) - { - context.Writer.WritePropertyName("RemoveAttributes"); - context.Writer.WriteArrayStart(); - foreach(var publicRequestRemoveAttributesListValue in publicRequest.RemoveAttributes) + if(publicRequest.IsSetRemoveAttributes()) { - context.Writer.Write(publicRequestRemoveAttributesListValue); + context.Writer.WritePropertyName("RemoveAttributes"); + context.Writer.WriteArrayStart(); + foreach(var publicRequestRemoveAttributesListValue in publicRequest.RemoveAttributes) + { + context.Writer.Write(publicRequestRemoveAttributesListValue); + } + context.Writer.WriteArrayEnd(); } - context.Writer.WriteArrayEnd(); + + writer.WriteObjectEnd(); } - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); + request.Content = memoryStream.ToArray(); } diff --git a/sdk/src/Services/GameLift/Generated/Model/Internal/MarshallTransformations/UpdateContainerGroupDefinitionRequestMarshaller.cs b/sdk/src/Services/GameLift/Generated/Model/Internal/MarshallTransformations/UpdateContainerGroupDefinitionRequestMarshaller.cs index cf48449e29f3..5e4f761bcda4 100644 --- a/sdk/src/Services/GameLift/Generated/Model/Internal/MarshallTransformations/UpdateContainerGroupDefinitionRequestMarshaller.cs +++ b/sdk/src/Services/GameLift/Generated/Model/Internal/MarshallTransformations/UpdateContainerGroupDefinitionRequestMarshaller.cs @@ -63,85 +63,88 @@ public IRequest Marshall(UpdateContainerGroupDefinitionRequest publicRequest) request.HttpMethod = "POST"; request.ResourcePath = "/"; - using (StringWriter stringWriter = new StringWriter(CultureInfo.InvariantCulture)) + using (MemoryStream memoryStream = new MemoryStream()) { - JsonWriter writer = new JsonWriter(stringWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetGameServerContainerDefinition()) + using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) { - context.Writer.WritePropertyName("GameServerContainerDefinition"); - context.Writer.WriteObjectStart(); - - var marshaller = GameServerContainerDefinitionInputMarshaller.Instance; - marshaller.Marshall(publicRequest.GameServerContainerDefinition, context); - - context.Writer.WriteObjectEnd(); - } + JsonWriter writer = new JsonWriter(streamWriter); + writer.Validate = false; + writer.WriteObjectStart(); + var context = new JsonMarshallerContext(request, writer); + if(publicRequest.IsSetGameServerContainerDefinition()) + { + context.Writer.WritePropertyName("GameServerContainerDefinition"); + context.Writer.WriteObjectStart(); - if(publicRequest.IsSetName()) - { - context.Writer.WritePropertyName("Name"); - context.Writer.Write(publicRequest.Name); - } + var marshaller = GameServerContainerDefinitionInputMarshaller.Instance; + marshaller.Marshall(publicRequest.GameServerContainerDefinition, context); - if(publicRequest.IsSetOperatingSystem()) - { - context.Writer.WritePropertyName("OperatingSystem"); - context.Writer.Write(publicRequest.OperatingSystem); - } + context.Writer.WriteObjectEnd(); + } - if(publicRequest.IsSetSourceVersionNumber()) - { - context.Writer.WritePropertyName("SourceVersionNumber"); - context.Writer.Write(publicRequest.SourceVersionNumber); - } + if(publicRequest.IsSetName()) + { + context.Writer.WritePropertyName("Name"); + context.Writer.Write(publicRequest.Name); + } - if(publicRequest.IsSetSupportContainerDefinitions()) - { - context.Writer.WritePropertyName("SupportContainerDefinitions"); - context.Writer.WriteArrayStart(); - foreach(var publicRequestSupportContainerDefinitionsListValue in publicRequest.SupportContainerDefinitions) + if(publicRequest.IsSetOperatingSystem()) { - context.Writer.WriteObjectStart(); + context.Writer.WritePropertyName("OperatingSystem"); + context.Writer.Write(publicRequest.OperatingSystem); + } - var marshaller = SupportContainerDefinitionInputMarshaller.Instance; - marshaller.Marshall(publicRequestSupportContainerDefinitionsListValue, context); + if(publicRequest.IsSetSourceVersionNumber()) + { + context.Writer.WritePropertyName("SourceVersionNumber"); + context.Writer.Write(publicRequest.SourceVersionNumber.Value); + } - context.Writer.WriteObjectEnd(); + if(publicRequest.IsSetSupportContainerDefinitions()) + { + context.Writer.WritePropertyName("SupportContainerDefinitions"); + context.Writer.WriteArrayStart(); + foreach(var publicRequestSupportContainerDefinitionsListValue in publicRequest.SupportContainerDefinitions) + { + context.Writer.WriteObjectStart(); + + var marshaller = SupportContainerDefinitionInputMarshaller.Instance; + marshaller.Marshall(publicRequestSupportContainerDefinitionsListValue, context); + + context.Writer.WriteObjectEnd(); + } + context.Writer.WriteArrayEnd(); } - context.Writer.WriteArrayEnd(); - } - if(publicRequest.IsSetTotalMemoryLimitMebibytes()) - { - context.Writer.WritePropertyName("TotalMemoryLimitMebibytes"); - context.Writer.Write(publicRequest.TotalMemoryLimitMebibytes); - } + if(publicRequest.IsSetTotalMemoryLimitMebibytes()) + { + context.Writer.WritePropertyName("TotalMemoryLimitMebibytes"); + context.Writer.Write(publicRequest.TotalMemoryLimitMebibytes.Value); + } - if(publicRequest.IsSetTotalVcpuLimit()) - { - context.Writer.WritePropertyName("TotalVcpuLimit"); - if(StringUtils.IsSpecialDoubleValue(publicRequest.TotalVcpuLimit)) + if(publicRequest.IsSetTotalVcpuLimit()) { - context.Writer.Write(StringUtils.FromSpecialDoubleValue(publicRequest.TotalVcpuLimit)); + context.Writer.WritePropertyName("TotalVcpuLimit"); + if(StringUtils.IsSpecialDoubleValue(publicRequest.TotalVcpuLimit.Value)) + { + context.Writer.Write(StringUtils.FromSpecialDoubleValue(publicRequest.TotalVcpuLimit.Value)); + } + else + { + context.Writer.Write(publicRequest.TotalVcpuLimit.Value); + } } - else + + if(publicRequest.IsSetVersionDescription()) { - context.Writer.Write(publicRequest.TotalVcpuLimit); + context.Writer.WritePropertyName("VersionDescription"); + context.Writer.Write(publicRequest.VersionDescription); } - } - if(publicRequest.IsSetVersionDescription()) - { - context.Writer.WritePropertyName("VersionDescription"); - context.Writer.Write(publicRequest.VersionDescription); + writer.WriteObjectEnd(); } - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); + request.Content = memoryStream.ToArray(); } diff --git a/sdk/src/Services/GameLift/Generated/Model/ListContainerFleetsRequest.cs b/sdk/src/Services/GameLift/Generated/Model/ListContainerFleetsRequest.cs index 7e6390eeab8f..f59c0b49bf0d 100644 --- a/sdk/src/Services/GameLift/Generated/Model/ListContainerFleetsRequest.cs +++ b/sdk/src/Services/GameLift/Generated/Model/ListContainerFleetsRequest.cs @@ -106,9 +106,9 @@ internal bool IsSetContainerGroupDefinitionName() /// /// [AWSProperty(Min=1)] - public int Limit + public int? Limit { - get { return this._limit.GetValueOrDefault(); } + get { return this._limit; } set { this._limit = value; } } diff --git a/sdk/src/Services/GameLift/Generated/Model/ListContainerGroupDefinitionVersionsRequest.cs b/sdk/src/Services/GameLift/Generated/Model/ListContainerGroupDefinitionVersionsRequest.cs index 26a40f82571d..71ae9f36e016 100644 --- a/sdk/src/Services/GameLift/Generated/Model/ListContainerGroupDefinitionVersionsRequest.cs +++ b/sdk/src/Services/GameLift/Generated/Model/ListContainerGroupDefinitionVersionsRequest.cs @@ -82,9 +82,9 @@ public partial class ListContainerGroupDefinitionVersionsRequest : AmazonGameLif /// /// [AWSProperty(Min=1, Max=100)] - public int Limit + public int? Limit { - get { return this._limit.GetValueOrDefault(); } + get { return this._limit; } set { this._limit = value; } } diff --git a/sdk/src/Services/GameLift/Generated/Model/ListContainerGroupDefinitionsRequest.cs b/sdk/src/Services/GameLift/Generated/Model/ListContainerGroupDefinitionsRequest.cs index 8c9baa610fc2..f23a8996dd58 100644 --- a/sdk/src/Services/GameLift/Generated/Model/ListContainerGroupDefinitionsRequest.cs +++ b/sdk/src/Services/GameLift/Generated/Model/ListContainerGroupDefinitionsRequest.cs @@ -110,16 +110,8 @@ internal bool IsSetContainerGroupType() /// to get results as a set of sequential pages. /// /// -<<<<<<< HEAD - [AWSProperty(Min=1, Max=10)] - public int? Limit -||||||| Commit version number update changes - [AWSProperty(Min=1, Max=10)] - public int Limit -======= [AWSProperty(Min=1, Max=100)] - public int Limit ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b + public int? Limit { get { return this._limit; } set { this._limit = value; } diff --git a/sdk/src/Services/GameLift/Generated/Model/ListFleetDeploymentsRequest.cs b/sdk/src/Services/GameLift/Generated/Model/ListFleetDeploymentsRequest.cs index 17de0bc0550a..6442309d948c 100644 --- a/sdk/src/Services/GameLift/Generated/Model/ListFleetDeploymentsRequest.cs +++ b/sdk/src/Services/GameLift/Generated/Model/ListFleetDeploymentsRequest.cs @@ -105,9 +105,9 @@ internal bool IsSetFleetId() /// /// [AWSProperty(Min=1)] - public int Limit + public int? Limit { - get { return this._limit.GetValueOrDefault(); } + get { return this._limit; } set { this._limit = value; } } diff --git a/sdk/src/Services/GameLift/Generated/Model/ReplicaContainerGroupCounts.cs b/sdk/src/Services/GameLift/Generated/Model/ReplicaContainerGroupCounts.cs deleted file mode 100644 index 5e4b510c55db..000000000000 --- a/sdk/src/Services/GameLift/Generated/Model/ReplicaContainerGroupCounts.cs +++ /dev/null @@ -1,134 +0,0 @@ -/* - * 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. - */ - -/* - * Do not modify this file. This file is generated from the gamelift-2015-10-01.normal.json service model. - */ -using System; -using System.Collections.Generic; -using System.Xml.Serialization; -using System.Text; -using System.IO; -using System.Net; - -using Amazon.Runtime; -using Amazon.Runtime.Internal; - -#pragma warning disable CS0612,CS0618,CS1570 -namespace Amazon.GameLift.Model -{ - /// - /// This data type is used with the Amazon GameLift containers feature, which is currently - /// in public preview. - /// - /// - /// - /// The number and status of replica container groups that are deployed across a fleet - /// with compute type CONTAINER. This information, combined with the number of - /// server processes being hosted per container group (see RuntimeConfiguration), - /// tells you how many game sessions the fleet is currently capable of hosting concurrently. - /// - /// - /// - /// Returned by: DescribeFleetCapacity, DescribeFleetLocationCapacity - /// - /// - /// - public partial class ReplicaContainerGroupCounts - { - private int? _active; - private int? _idle; - private int? _pending; - private int? _terminating; - - /// - /// Gets and sets the property ACTIVE. - /// - /// The number of container groups that have active game sessions. - /// - /// - [AWSProperty(Min=0)] - public int? ACTIVE - { - get { return this._active; } - set { this._active = value; } - } - - // Check to see if ACTIVE property is set - internal bool IsSetACTIVE() - { - return this._active.HasValue; - } - - /// - /// Gets and sets the property IDLE. - /// - /// The number of container groups that have no active game sessions. - /// - /// - [AWSProperty(Min=0)] - public int? IDLE - { - get { return this._idle; } - set { this._idle = value; } - } - - // Check to see if IDLE property is set - internal bool IsSetIDLE() - { - return this._idle.HasValue; - } - - /// - /// Gets and sets the property PENDING. - /// - /// The number of container groups that are starting up but have not yet registered. - /// - /// - /// - [AWSProperty(Min=0)] - public int? PENDING - { - get { return this._pending; } - set { this._pending = value; } - } - - // Check to see if PENDING property is set - internal bool IsSetPENDING() - { - return this._pending.HasValue; - } - - /// - /// Gets and sets the property TERMINATING. - /// - /// The number of container groups that are in the process of shutting down. - /// - /// - [AWSProperty(Min=0)] - public int? TERMINATING - { - get { return this._terminating; } - set { this._terminating = value; } - } - - // Check to see if TERMINATING property is set - internal bool IsSetTERMINATING() - { - return this._terminating.HasValue; - } - - } -} \ No newline at end of file diff --git a/sdk/src/Services/GameLift/Generated/Model/SupportContainerDefinition.cs b/sdk/src/Services/GameLift/Generated/Model/SupportContainerDefinition.cs index f45ddd9b9c79..58a2acc3459e 100644 --- a/sdk/src/Services/GameLift/Generated/Model/SupportContainerDefinition.cs +++ b/sdk/src/Services/GameLift/Generated/Model/SupportContainerDefinition.cs @@ -133,9 +133,9 @@ internal bool IsSetEnvironmentOverride() /// fails, the entire container group restarts. /// /// - public bool Essential + public bool? Essential { - get { return this._essential.GetValueOrDefault(); } + get { return this._essential; } set { this._essential = value; } } @@ -198,9 +198,9 @@ internal bool IsSetImageUri() /// /// [AWSProperty(Min=4, Max=1024000)] - public int MemoryHardLimitMebibytes + public int? MemoryHardLimitMebibytes { - get { return this._memoryHardLimitMebibytes.GetValueOrDefault(); } + get { return this._memoryHardLimitMebibytes; } set { this._memoryHardLimitMebibytes = value; } } @@ -283,9 +283,9 @@ internal bool IsSetResolvedImageDigest() /// /// [AWSProperty(Max=10)] - public double Vcpu + public double? Vcpu { - get { return this._vcpu.GetValueOrDefault(); } + get { return this._vcpu; } set { this._vcpu = value; } } diff --git a/sdk/src/Services/GameLift/Generated/Model/SupportContainerDefinitionInput.cs b/sdk/src/Services/GameLift/Generated/Model/SupportContainerDefinitionInput.cs index 4d16bb3b13e4..495006232b1c 100644 --- a/sdk/src/Services/GameLift/Generated/Model/SupportContainerDefinitionInput.cs +++ b/sdk/src/Services/GameLift/Generated/Model/SupportContainerDefinitionInput.cs @@ -142,9 +142,9 @@ internal bool IsSetEnvironmentOverride() /// healthy. /// /// - public bool Essential + public bool? Essential { - get { return this._essential.GetValueOrDefault(); } + get { return this._essential; } set { this._essential = value; } } @@ -229,9 +229,9 @@ internal bool IsSetImageUri() /// /// [AWSProperty(Min=4, Max=1024000)] - public int MemoryHardLimitMebibytes + public int? MemoryHardLimitMebibytes { - get { return this._memoryHardLimitMebibytes.GetValueOrDefault(); } + get { return this._memoryHardLimitMebibytes; } set { this._memoryHardLimitMebibytes = value; } } @@ -301,9 +301,9 @@ internal bool IsSetPortConfiguration() /// /// [AWSProperty(Max=10)] - public double Vcpu + public double? Vcpu { - get { return this._vcpu.GetValueOrDefault(); } + get { return this._vcpu; } set { this._vcpu = value; } } diff --git a/sdk/src/Services/GameLift/Generated/Model/UpdateContainerFleetRequest.cs b/sdk/src/Services/GameLift/Generated/Model/UpdateContainerFleetRequest.cs index cf11838dc7be..33c6ac662233 100644 --- a/sdk/src/Services/GameLift/Generated/Model/UpdateContainerFleetRequest.cs +++ b/sdk/src/Services/GameLift/Generated/Model/UpdateContainerFleetRequest.cs @@ -218,9 +218,9 @@ internal bool IsSetGameServerContainerGroupDefinitionName() /// /// [AWSProperty(Min=1, Max=5000)] - public int GameServerContainerGroupsPerInstance + public int? GameServerContainerGroupsPerInstance { - get { return this._gameServerContainerGroupsPerInstance.GetValueOrDefault(); } + get { return this._gameServerContainerGroupsPerInstance; } set { this._gameServerContainerGroupsPerInstance = value; } } diff --git a/sdk/src/Services/GameLift/Generated/Model/UpdateContainerGroupDefinitionRequest.cs b/sdk/src/Services/GameLift/Generated/Model/UpdateContainerGroupDefinitionRequest.cs index bdbb09f774d1..306226fdea57 100644 --- a/sdk/src/Services/GameLift/Generated/Model/UpdateContainerGroupDefinitionRequest.cs +++ b/sdk/src/Services/GameLift/Generated/Model/UpdateContainerGroupDefinitionRequest.cs @@ -176,9 +176,9 @@ internal bool IsSetOperatingSystem() /// /// [AWSProperty(Min=1)] - public int SourceVersionNumber + public int? SourceVersionNumber { - get { return this._sourceVersionNumber.GetValueOrDefault(); } + get { return this._sourceVersionNumber; } set { this._sourceVersionNumber = value; } } @@ -218,9 +218,9 @@ internal bool IsSetSupportContainerDefinitions() /// /// [AWSProperty(Min=4, Max=1024000)] - public int TotalMemoryLimitMebibytes + public int? TotalMemoryLimitMebibytes { - get { return this._totalMemoryLimitMebibytes.GetValueOrDefault(); } + get { return this._totalMemoryLimitMebibytes; } set { this._totalMemoryLimitMebibytes = value; } } @@ -240,9 +240,9 @@ internal bool IsSetTotalMemoryLimitMebibytes() /// /// [AWSProperty(Max=10)] - public double TotalVcpuLimit + public double? TotalVcpuLimit { - get { return this._totalVcpuLimit.GetValueOrDefault(); } + get { return this._totalVcpuLimit; } set { this._totalVcpuLimit = value; } } diff --git a/sdk/src/Services/GameLift/Generated/Model/_bcl45+netstandard/IListContainerFleetsPaginator.cs b/sdk/src/Services/GameLift/Generated/Model/_bcl+netstandard/IListContainerFleetsPaginator.cs similarity index 100% rename from sdk/src/Services/GameLift/Generated/Model/_bcl45+netstandard/IListContainerFleetsPaginator.cs rename to sdk/src/Services/GameLift/Generated/Model/_bcl+netstandard/IListContainerFleetsPaginator.cs diff --git a/sdk/src/Services/GameLift/Generated/Model/_bcl45+netstandard/IListContainerGroupDefinitionVersionsPaginator.cs b/sdk/src/Services/GameLift/Generated/Model/_bcl+netstandard/IListContainerGroupDefinitionVersionsPaginator.cs similarity index 100% rename from sdk/src/Services/GameLift/Generated/Model/_bcl45+netstandard/IListContainerGroupDefinitionVersionsPaginator.cs rename to sdk/src/Services/GameLift/Generated/Model/_bcl+netstandard/IListContainerGroupDefinitionVersionsPaginator.cs diff --git a/sdk/src/Services/GameLift/Generated/Model/_bcl45+netstandard/IListFleetDeploymentsPaginator.cs b/sdk/src/Services/GameLift/Generated/Model/_bcl+netstandard/IListFleetDeploymentsPaginator.cs similarity index 100% rename from sdk/src/Services/GameLift/Generated/Model/_bcl45+netstandard/IListFleetDeploymentsPaginator.cs rename to sdk/src/Services/GameLift/Generated/Model/_bcl+netstandard/IListFleetDeploymentsPaginator.cs diff --git a/sdk/src/Services/GameLift/Generated/Model/_bcl45+netstandard/ListContainerFleetsPaginator.cs b/sdk/src/Services/GameLift/Generated/Model/_bcl+netstandard/ListContainerFleetsPaginator.cs similarity index 100% rename from sdk/src/Services/GameLift/Generated/Model/_bcl45+netstandard/ListContainerFleetsPaginator.cs rename to sdk/src/Services/GameLift/Generated/Model/_bcl+netstandard/ListContainerFleetsPaginator.cs diff --git a/sdk/src/Services/GameLift/Generated/Model/_bcl45+netstandard/ListContainerGroupDefinitionVersionsPaginator.cs b/sdk/src/Services/GameLift/Generated/Model/_bcl+netstandard/ListContainerGroupDefinitionVersionsPaginator.cs similarity index 100% rename from sdk/src/Services/GameLift/Generated/Model/_bcl45+netstandard/ListContainerGroupDefinitionVersionsPaginator.cs rename to sdk/src/Services/GameLift/Generated/Model/_bcl+netstandard/ListContainerGroupDefinitionVersionsPaginator.cs diff --git a/sdk/src/Services/GameLift/Generated/Model/_bcl45+netstandard/ListFleetDeploymentsPaginator.cs b/sdk/src/Services/GameLift/Generated/Model/_bcl+netstandard/ListFleetDeploymentsPaginator.cs similarity index 100% rename from sdk/src/Services/GameLift/Generated/Model/_bcl45+netstandard/ListFleetDeploymentsPaginator.cs rename to sdk/src/Services/GameLift/Generated/Model/_bcl+netstandard/ListFleetDeploymentsPaginator.cs diff --git a/sdk/src/Services/GameLift/Generated/_bcl/AmazonGameLiftClient.cs b/sdk/src/Services/GameLift/Generated/_bcl/AmazonGameLiftClient.cs index 65c39a7f77fa..8cc0c2426112 100644 --- a/sdk/src/Services/GameLift/Generated/_bcl/AmazonGameLiftClient.cs +++ b/sdk/src/Services/GameLift/Generated/_bcl/AmazonGameLiftClient.cs @@ -848,43 +848,46 @@ public virtual CreateAliasResponse CreateAlias(CreateAliasRequest request) /// - /// Creates a new Amazon GameLift build resource for your game server binary files. Combine - /// game server binaries into a zip file for use with Amazon GameLift. + /// Creates an Amazon GameLift build resource for your game server software and stores + /// the software for deployment to hosting resources. Combine game server binaries and + /// dependencies into a single .zip file /// /// /// - /// When setting up a new game build for Amazon GameLift, we recommend using the CLI command - /// upload-build - /// . This helper command combines two tasks: (1) it uploads your build files from - /// a file directory to an Amazon GameLift Amazon S3 location, and (2) it creates a new - /// build resource. + /// Use the CLI command upload-build + /// to quickly and simply create a new build and upload your game build .zip file + /// to Amazon GameLift Amazon S3. This helper command eliminates the need to explicitly + /// manage access permissions. /// /// /// - /// You can use the CreateBuild operation in the following scenarios: + /// Alternatively, use the CreateBuild action for the following scenarios: /// ///
    • /// - /// Create a new game build with build files that are in an Amazon S3 location under an - /// Amazon Web Services account that you control. To use this option, you give Amazon - /// GameLift access to the Amazon S3 bucket. With permissions in place, specify a build - /// name, operating system, and the Amazon S3 storage location of your game build. + /// You want to create a build and upload a game build zip file from in an Amazon S3 location + /// that you control. In this scenario, you need to give Amazon GameLift permission to + /// access to the Amazon S3 bucket. With permission in place, call CreateBuild + /// and specify a build name, the build's runtime operating system, and the Amazon S3 + /// storage location where the build file is stored. /// ///
    • /// - /// Upload your build files to a Amazon GameLift Amazon S3 location. To use this option, - /// specify a build name and operating system. This operation creates a new build resource - /// and also returns an Amazon S3 location with temporary access credentials. Use the - /// credentials to manually upload your build files to the specified Amazon S3 location. - /// For more information, see Uploading - /// Objects in the Amazon S3 Developer Guide. After you upload build files - /// to the Amazon GameLift Amazon S3 location, you can't update them. + /// You want to create a build and upload a local game build zip file to an Amazon S3 + /// location that's controlled by Amazon GameLift. (See the upload-build CLI command + /// for this scenario.) In this scenario, you need to request temporary access credentials + /// to the Amazon GameLift Amazon S3 location. Specify a build name and the build's runtime + /// operating system. The response provides an Amazon S3 location and a set of temporary + /// access credentials. Use the credentials to upload your build files to the specified + /// Amazon S3 location (see Uploading + /// Objects in the Amazon S3 Developer Guide). You can't update build files + /// after uploading them to Amazon GameLift Amazon S3. /// ///
    /// - /// If successful, this operation creates a new build resource with a unique build ID - /// and places it in INITIALIZED status. A build must be in READY status - /// before you can create fleets with it. + /// If successful, this action creates a new build resource with a unique build ID and + /// places it in INITIALIZED status. When the build reaches READY status, + /// you can create fleets with it. /// /// /// @@ -940,43 +943,46 @@ public virtual CreateBuildResponse CreateBuild(CreateBuildRequest request) /// - /// Creates a new Amazon GameLift build resource for your game server binary files. Combine - /// game server binaries into a zip file for use with Amazon GameLift. + /// Creates an Amazon GameLift build resource for your game server software and stores + /// the software for deployment to hosting resources. Combine game server binaries and + /// dependencies into a single .zip file /// /// /// - /// When setting up a new game build for Amazon GameLift, we recommend using the CLI command - /// upload-build - /// . This helper command combines two tasks: (1) it uploads your build files from - /// a file directory to an Amazon GameLift Amazon S3 location, and (2) it creates a new - /// build resource. + /// Use the CLI command upload-build + /// to quickly and simply create a new build and upload your game build .zip file + /// to Amazon GameLift Amazon S3. This helper command eliminates the need to explicitly + /// manage access permissions. /// /// /// - /// You can use the CreateBuild operation in the following scenarios: + /// Alternatively, use the CreateBuild action for the following scenarios: /// ///
    • /// - /// Create a new game build with build files that are in an Amazon S3 location under an - /// Amazon Web Services account that you control. To use this option, you give Amazon - /// GameLift access to the Amazon S3 bucket. With permissions in place, specify a build - /// name, operating system, and the Amazon S3 storage location of your game build. + /// You want to create a build and upload a game build zip file from in an Amazon S3 location + /// that you control. In this scenario, you need to give Amazon GameLift permission to + /// access to the Amazon S3 bucket. With permission in place, call CreateBuild + /// and specify a build name, the build's runtime operating system, and the Amazon S3 + /// storage location where the build file is stored. /// ///
    • /// - /// Upload your build files to a Amazon GameLift Amazon S3 location. To use this option, - /// specify a build name and operating system. This operation creates a new build resource - /// and also returns an Amazon S3 location with temporary access credentials. Use the - /// credentials to manually upload your build files to the specified Amazon S3 location. - /// For more information, see Uploading - /// Objects in the Amazon S3 Developer Guide. After you upload build files - /// to the Amazon GameLift Amazon S3 location, you can't update them. + /// You want to create a build and upload a local game build zip file to an Amazon S3 + /// location that's controlled by Amazon GameLift. (See the upload-build CLI command + /// for this scenario.) In this scenario, you need to request temporary access credentials + /// to the Amazon GameLift Amazon S3 location. Specify a build name and the build's runtime + /// operating system. The response provides an Amazon S3 location and a set of temporary + /// access credentials. Use the credentials to upload your build files to the specified + /// Amazon S3 location (see Uploading + /// Objects in the Amazon S3 Developer Guide). You can't update build files + /// after uploading them to Amazon GameLift Amazon S3. /// ///
    /// - /// If successful, this operation creates a new build resource with a unique build ID - /// and places it in INITIALIZED status. A build must be in READY status - /// before you can create fleets with it. + /// If successful, this action creates a new build resource with a unique build ID and + /// places it in INITIALIZED status. When the build reaches READY status, + /// you can create fleets with it. /// /// /// @@ -1035,87 +1041,115 @@ public virtual CreateBuildResponse CreateBuild(CreateBuildRequest request) #endregion - #region CreateContainerGroupDefinition + #region CreateContainerFleet /// - /// This operation is used with the Amazon GameLift containers feature, which is currently - /// in public preview. + /// Creates a managed fleet of Amazon Elastic Compute Cloud (Amazon EC2) instances to + /// host your containerized game servers. Use this operation to define how to deploy a + /// container architecture onto each fleet instance and configure fleet settings. You + /// can create a container fleet in any Amazon Web Services Regions that Amazon GameLift + /// supports for multi-location fleets. A container fleet can be deployed to a single + /// location or multiple locations. Container fleets are deployed with Amazon Linux 2023 + /// as the instance operating system. /// /// /// - /// Creates a ContainerGroupDefinition resource that describes a set of containers - /// for hosting your game server with Amazon GameLift managed EC2 hosting. An Amazon GameLift - /// container group is similar to a container "task" and "pod". Each container group can - /// have one or more containers. + /// Define the fleet's container architecture using container group definitions. Each + /// fleet can have one of the following container group types: + /// + ///
    • + /// + /// The game server container group runs your game server build and dependent software. + /// Amazon GameLift deploys one or more replicas of this container group to each fleet + /// instance. The number of replicas depends on the computing capabilities of the fleet + /// instance in use. + /// + ///
    • + /// + /// An optional per-instance container group might be used to run other software that + /// only needs to run once per instance, such as background services, logging, or test + /// processes. One per-instance container group is deployed to each fleet instance. + /// + ///
    + /// + /// Each container group can include the definition for one or more containers. A container + /// definition specifies a container image that is stored in an Amazon Elastic Container + /// Registry (Amazon ECR) public or private repository. /// /// /// - /// Use container group definitions when you create a container fleet. Container group - /// definitions determine how Amazon GameLift deploys your containers to each instance - /// in a container fleet. + /// Request options /// /// /// - /// You can create two types of container groups, based on scheduling strategy: + /// Use this operation to make the following types of requests. Most fleet settings have + /// default values, so you can create a working fleet with a minimal configuration and + /// default values, which you can customize later. /// ///
    • /// - /// A replica container group manages the containers that run your game server - /// application and supporting software. Replica container groups might be replicated - /// multiple times on each fleet instance, depending on instance resources. + /// Create a fleet with no container groups. You can configure a container fleet and then + /// add container group definitions later. In this scenario, no fleet instances are deployed, + /// and the fleet can't host game sessions until you add a game server container group + /// definition. Provide the following required parameter values: /// - ///
    • + ///
      • /// - /// A daemon container group manages containers that run other software, such as - /// background services, logging, or test processes. You might use a daemon container - /// group for processes that need to run only once per fleet instance, or processes that - /// need to persist independently of the replica container group. + /// FleetRoleArn /// - ///
      + ///
  • /// - /// To create a container group definition, specify a group name, a list of container - /// definitions, and maximum total CPU and memory requirements for the container group. - /// Specify an operating system and scheduling strategy or use the default values. When - /// using the Amazon Web Services CLI tool, you can pass in your container definitions - /// as a JSON file. + /// Create a fleet with a game server container group. Provide the following required + /// parameter values: /// - /// + ///
    • /// - /// This operation requires Identity and Access Management (IAM) permissions to access - /// container images in Amazon ECR repositories. See - /// IAM permissions for Amazon GameLift for help setting the appropriate permissions. + /// FleetRoleArn /// - /// + ///
    • /// - /// If successful, this operation creates a new ContainerGroupDefinition resource - /// with an ARN value assigned. You can't change the properties of a container group definition. - /// Instead, create a new one. + /// GameServerContainerGroupDefinitionName /// - /// + ///
  • /// - /// Learn more + /// Create a fleet with a game server container group and a per-instance container group. + /// Provide the following required parameter values: /// ///
    • + /// + /// Results + /// + /// + /// + /// If successful, this operation creates a new container fleet resource, places it in + /// PENDING status, and initiates the fleet + /// creation workflow. For fleets with container groups, this workflow starts a fleet + /// deployment and transitions the status to ACTIVE. Fleets without a container + /// group are placed in CREATED status. + /// + /// + /// + /// You can update most of the properties of a fleet, including container group definitions, + /// and deploy the update across all fleet instances. Use a fleet update to deploy a new + /// game server version update across the container fleet. /// - /// /// - /// Container for the necessary parameters to execute the CreateContainerGroupDefinition service method. + /// Container for the necessary parameters to execute the CreateContainerFleet service method. /// - /// The response from the CreateContainerGroupDefinition service method, as returned by GameLift. + /// The response from the CreateContainerFleet service method, as returned by GameLift. /// /// The requested operation would cause a conflict with the current state of a service /// resource associated with the request. Resolve the conflict before retrying this request. @@ -1142,98 +1176,126 @@ public virtual CreateBuildResponse CreateBuild(CreateBuildRequest request) /// /// The requested operation is not supported in the Region specified. /// - /// REST API Reference for CreateContainerGroupDefinition Operation - public virtual CreateContainerGroupDefinitionResponse CreateContainerGroupDefinition(CreateContainerGroupDefinitionRequest request) + /// REST API Reference for CreateContainerFleet Operation + public virtual CreateContainerFleetResponse CreateContainerFleet(CreateContainerFleetRequest request) { var options = new InvokeOptions(); - options.RequestMarshaller = CreateContainerGroupDefinitionRequestMarshaller.Instance; - options.ResponseUnmarshaller = CreateContainerGroupDefinitionResponseUnmarshaller.Instance; + options.RequestMarshaller = CreateContainerFleetRequestMarshaller.Instance; + options.ResponseUnmarshaller = CreateContainerFleetResponseUnmarshaller.Instance; - return Invoke(request, options); + return Invoke(request, options); } /// - /// This operation is used with the Amazon GameLift containers feature, which is currently - /// in public preview. + /// Creates a managed fleet of Amazon Elastic Compute Cloud (Amazon EC2) instances to + /// host your containerized game servers. Use this operation to define how to deploy a + /// container architecture onto each fleet instance and configure fleet settings. You + /// can create a container fleet in any Amazon Web Services Regions that Amazon GameLift + /// supports for multi-location fleets. A container fleet can be deployed to a single + /// location or multiple locations. Container fleets are deployed with Amazon Linux 2023 + /// as the instance operating system. /// /// /// - /// Creates a ContainerGroupDefinition resource that describes a set of containers - /// for hosting your game server with Amazon GameLift managed EC2 hosting. An Amazon GameLift - /// container group is similar to a container "task" and "pod". Each container group can - /// have one or more containers. + /// Define the fleet's container architecture using container group definitions. Each + /// fleet can have one of the following container group types: + /// + ///
    • + /// + /// The game server container group runs your game server build and dependent software. + /// Amazon GameLift deploys one or more replicas of this container group to each fleet + /// instance. The number of replicas depends on the computing capabilities of the fleet + /// instance in use. + /// + ///
    • + /// + /// An optional per-instance container group might be used to run other software that + /// only needs to run once per instance, such as background services, logging, or test + /// processes. One per-instance container group is deployed to each fleet instance. + /// + ///
    + /// + /// Each container group can include the definition for one or more containers. A container + /// definition specifies a container image that is stored in an Amazon Elastic Container + /// Registry (Amazon ECR) public or private repository. /// /// /// - /// Use container group definitions when you create a container fleet. Container group - /// definitions determine how Amazon GameLift deploys your containers to each instance - /// in a container fleet. + /// Request options /// /// /// - /// You can create two types of container groups, based on scheduling strategy: + /// Use this operation to make the following types of requests. Most fleet settings have + /// default values, so you can create a working fleet with a minimal configuration and + /// default values, which you can customize later. /// ///
    • /// - /// A replica container group manages the containers that run your game server - /// application and supporting software. Replica container groups might be replicated - /// multiple times on each fleet instance, depending on instance resources. + /// Create a fleet with no container groups. You can configure a container fleet and then + /// add container group definitions later. In this scenario, no fleet instances are deployed, + /// and the fleet can't host game sessions until you add a game server container group + /// definition. Provide the following required parameter values: /// - ///
    • + ///
      • /// - /// A daemon container group manages containers that run other software, such as - /// background services, logging, or test processes. You might use a daemon container - /// group for processes that need to run only once per fleet instance, or processes that - /// need to persist independently of the replica container group. + /// FleetRoleArn /// - ///
      + ///
  • /// - /// To create a container group definition, specify a group name, a list of container - /// definitions, and maximum total CPU and memory requirements for the container group. - /// Specify an operating system and scheduling strategy or use the default values. When - /// using the Amazon Web Services CLI tool, you can pass in your container definitions - /// as a JSON file. + /// Create a fleet with a game server container group. Provide the following required + /// parameter values: /// - /// + ///
    • /// - /// This operation requires Identity and Access Management (IAM) permissions to access - /// container images in Amazon ECR repositories. See - /// IAM permissions for Amazon GameLift for help setting the appropriate permissions. + /// FleetRoleArn /// - /// + ///
    • /// - /// If successful, this operation creates a new ContainerGroupDefinition resource - /// with an ARN value assigned. You can't change the properties of a container group definition. - /// Instead, create a new one. + /// GameServerContainerGroupDefinitionName /// - /// + ///
  • /// - /// Learn more + /// Create a fleet with a game server container group and a per-instance container group. + /// Provide the following required parameter values: /// ///
    • + /// + /// Results + /// + /// + /// + /// If successful, this operation creates a new container fleet resource, places it in + /// PENDING status, and initiates the fleet + /// creation workflow. For fleets with container groups, this workflow starts a fleet + /// deployment and transitions the status to ACTIVE. Fleets without a container + /// group are placed in CREATED status. + /// + /// + /// + /// You can update most of the properties of a fleet, including container group definitions, + /// and deploy the update across all fleet instances. Use a fleet update to deploy a new + /// game server version update across the container fleet. /// - /// ///     - /// Container for the necessary parameters to execute the CreateContainerGroupDefinition service method. + /// Container for the necessary parameters to execute the CreateContainerFleet service method. /// /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// /// - /// The response from the CreateContainerGroupDefinition service method, as returned by GameLift. + /// The response from the CreateContainerFleet service method, as returned by GameLift. /// /// The requested operation would cause a conflict with the current state of a service /// resource associated with the request. Resolve the conflict before retrying this request. @@ -1260,204 +1322,186 @@ public virtual CreateContainerGroupDefinitionResponse CreateContainerGroupDefini /// /// The requested operation is not supported in the Region specified. /// - /// REST API Reference for CreateContainerGroupDefinition Operation - public virtual Task CreateContainerGroupDefinitionAsync(CreateContainerGroupDefinitionRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + /// REST API Reference for CreateContainerFleet Operation + public virtual Task CreateContainerFleetAsync(CreateContainerFleetRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { var options = new InvokeOptions(); - options.RequestMarshaller = CreateContainerGroupDefinitionRequestMarshaller.Instance; - options.ResponseUnmarshaller = CreateContainerGroupDefinitionResponseUnmarshaller.Instance; + options.RequestMarshaller = CreateContainerFleetRequestMarshaller.Instance; + options.ResponseUnmarshaller = CreateContainerFleetResponseUnmarshaller.Instance; - return InvokeAsync(request, options, cancellationToken); + return InvokeAsync(request, options, cancellationToken); } #endregion - #region CreateFleet + #region CreateContainerGroupDefinition /// - /// This operation has been expanded to use with the Amazon GameLift containers feature, - /// which is currently in public preview. + /// Creates a ContainerGroupDefinition that describes a set of containers for hosting + /// your game server with Amazon GameLift managed containers hosting. An Amazon GameLift + /// container group is similar to a container task or pod. Use container group definitions + /// when you create a container fleet with CreateContainerFleet. /// /// /// - /// Creates a fleet of compute resources to host your game servers. Use this operation - /// to set up the following types of fleets based on compute type: - /// - /// - /// - /// Managed EC2 fleet - /// - /// - /// - /// An EC2 fleet is a set of Amazon Elastic Compute Cloud (Amazon EC2) instances. Your - /// game server build is deployed to each fleet instance. Amazon GameLift manages the - /// fleet's instances and controls the lifecycle of game server processes, which host - /// game sessions for players. EC2 fleets can have instances in multiple locations. Each - /// instance in the fleet is designated a Compute. + /// A container group definition determines how Amazon GameLift deploys your containers + /// to each instance in a container fleet. You can maintain multiple versions of a container + /// group definition. /// /// /// - /// To create an EC2 fleet, provide these required parameters: + /// There are two types of container groups: /// ///
    • /// - /// Either BuildId or ScriptId - /// - ///
    • - /// - /// ComputeType set to EC2 (the default value) + /// A game server container group has the containers that run your game server + /// application and supporting software. A game server container group can have these + /// container types: /// - ///
    • + ///
      • /// - /// EC2InboundPermissions + /// Game server container. This container runs your game server. You can define one game + /// server container in a game server container group. /// ///
      • /// - /// EC2InstanceType + /// Support container. This container runs software in parallel with your game server. + /// You can define up to 8 support containers in a game server group. /// - ///
      • + ///
      /// - /// FleetType + /// When building a game server container group definition, you can choose to bundle your + /// game server executable and all dependent software into a single game server container. + /// Alternatively, you can separate the software into one game server container and one + /// or more support containers. /// - ///
    • + /// /// - /// Name + /// On a container fleet instance, a game server container group can be deployed multiple + /// times (depending on the compute resources of the instance). This means that all containers + /// in the container group are replicated together. /// ///
    • /// - /// RuntimeConfiguration with at least one ServerProcesses configuration - /// - ///
    - /// - /// If successful, this operation creates a new fleet resource and places it in NEW - /// status while Amazon GameLift initiates the fleet - /// creation workflow. To debug your fleet, fetch logs, view performance metrics or - /// other actions on the fleet, create a development fleet with port 22/3389 open. As - /// a best practice, we recommend opening ports for remote access only when you need them - /// and closing them when you're finished. + /// A per-instance container group has containers for processes that aren't replicated + /// on a container fleet instance. This might include background services, logging, test + /// processes, or processes that need to persist independently of the game server container + /// group. When building a per-instance container group, you can define up to 10 support + /// containers. /// - /// + /// /// - /// When the fleet status is ACTIVE, you can adjust capacity settings and turn autoscaling - /// on/off for each location. + /// This operation requires Identity and Access Management (IAM) permissions to access + /// container images in Amazon ECR repositories. See + /// IAM permissions for Amazon GameLift for help setting the appropriate permissions. /// - /// + /// /// - /// Managed container fleet + /// Request options /// /// /// - /// A container fleet is a set of Amazon Elastic Compute Cloud (Amazon EC2) instances. - /// Your container architecture is deployed to each fleet instance based on the fleet - /// configuration. Amazon GameLift manages the containers on each fleet instance and controls - /// the lifecycle of game server processes, which host game sessions for players. Container - /// fleets can have instances in multiple locations. Each container on an instance that - /// runs game server processes is registered as a Compute. + /// Use this operation to make the following types of requests. You can specify values + /// for the minimum required parameters and customize optional values later. /// - /// + ///
    • /// - /// To create a container fleet, provide these required parameters: + /// Create a game server container group definition. Provide the following required parameter + /// values: /// ///
      • /// - /// ComputeType set to CONTAINER + /// Name /// ///
      • /// - /// ContainerGroupsConfiguration + /// ContainerGroupType (GAME_SERVER) /// ///
      • /// - /// EC2InboundPermissions + /// OperatingSystem (omit to use default value) /// ///
      • /// - /// EC2InstanceType + /// TotalMemoryLimitMebibytes (omit to use default value) /// ///
      • /// - /// FleetType set to ON_DEMAND + /// TotalVcpuLimit (omit to use default value) /// ///
      • /// - /// Name + /// At least one GameServerContainerDefinition /// - ///
      • + ///
        • /// - /// RuntimeConfiguration with at least one ServerProcesses configuration + /// ContainerName /// - ///
        + ///
      • /// - /// If successful, this operation creates a new fleet resource and places it in NEW - /// status while Amazon GameLift initiates the fleet - /// creation workflow. + /// ImageUrl /// - /// + ///
      • /// - /// When the fleet status is ACTIVE, you can adjust capacity settings and turn autoscaling - /// on/off for each location. + /// PortConfiguration /// - /// + ///
      • /// - /// Anywhere fleet + /// ServerSdkVersion (omit to use default value) /// - /// + ///
  • /// - /// An Anywhere fleet represents compute resources that are not owned or managed by Amazon - /// GameLift. You might create an Anywhere fleet with your local machine for testing, - /// or use one to host game servers with on-premises hardware or other game hosting solutions. - /// + /// Create a per-instance container group definition. Provide the following required parameter + /// values: /// - /// + ///
    • /// - /// To create an Anywhere fleet, provide these required parameters: + /// Name /// - ///
      • + ///
      • /// - /// ComputeType set to ANYWHERE + /// ContainerGroupType (PER_INSTANCE) /// ///
      • /// - /// Locations specifying a custom location + /// OperatingSystem (omit to use default value) /// ///
      • /// - /// Name + /// TotalMemoryLimitMebibytes (omit to use default value) /// - ///
      + ///
    • /// - /// If successful, this operation creates a new fleet resource and places it in ACTIVE - /// status. You can register computes with a fleet in ACTIVE status. + /// TotalVcpuLimit (omit to use default value) /// - /// + ///
    • /// - /// Learn more + /// At least one SupportContainerDefinition /// - /// + ///
    • /// - /// Debug - /// fleet creation issues + /// Results /// /// /// - /// Multi-location - /// fleets + /// If successful, this request creates a ContainerGroupDefinition resource and + /// assigns a unique ARN value. You can update most properties of a container group definition + /// by calling UpdateContainerGroupDefinition, and optionally save the update as + /// a new version. /// ///     - /// Container for the necessary parameters to execute the CreateFleet service method. + /// Container for the necessary parameters to execute the CreateContainerGroupDefinition service method. /// - /// The response from the CreateFleet service method, as returned by GameLift. + /// The response from the CreateContainerGroupDefinition service method, as returned by GameLift. /// /// The requested operation would cause a conflict with the current state of a service /// resource associated with the request. Resolve the conflict before retrying this request. @@ -1474,15 +1518,6 @@ public virtual CreateContainerGroupDefinitionResponse CreateContainerGroupDefini /// The requested operation would cause the resource to exceed the allowed service limit. /// Resolve the issue before retrying. /// - /// - /// The requested resources was not found. The resource was either not created yet or - /// deleted. - /// - /// - /// The operation failed because Amazon GameLift has not yet finished validating this - /// compute. We recommend attempting 8 to 10 retries over 3 to 5 minutes with exponential - /// backoffs and jitter. - /// /// /// The requested tagging operation did not succeed. This may be due to invalid tag format /// or the maximum tag limit may have been exceeded. Resolve the issue before retrying. @@ -1493,203 +1528,185 @@ public virtual CreateContainerGroupDefinitionResponse CreateContainerGroupDefini /// /// The requested operation is not supported in the Region specified. /// - /// REST API Reference for CreateFleet Operation - public virtual CreateFleetResponse CreateFleet(CreateFleetRequest request) + /// REST API Reference for CreateContainerGroupDefinition Operation + public virtual CreateContainerGroupDefinitionResponse CreateContainerGroupDefinition(CreateContainerGroupDefinitionRequest request) { var options = new InvokeOptions(); - options.RequestMarshaller = CreateFleetRequestMarshaller.Instance; - options.ResponseUnmarshaller = CreateFleetResponseUnmarshaller.Instance; + options.RequestMarshaller = CreateContainerGroupDefinitionRequestMarshaller.Instance; + options.ResponseUnmarshaller = CreateContainerGroupDefinitionResponseUnmarshaller.Instance; - return Invoke(request, options); + return Invoke(request, options); } /// - /// This operation has been expanded to use with the Amazon GameLift containers feature, - /// which is currently in public preview. + /// Creates a ContainerGroupDefinition that describes a set of containers for hosting + /// your game server with Amazon GameLift managed containers hosting. An Amazon GameLift + /// container group is similar to a container task or pod. Use container group definitions + /// when you create a container fleet with CreateContainerFleet. /// /// /// - /// Creates a fleet of compute resources to host your game servers. Use this operation - /// to set up the following types of fleets based on compute type: - /// - /// - /// - /// Managed EC2 fleet - /// - /// - /// - /// An EC2 fleet is a set of Amazon Elastic Compute Cloud (Amazon EC2) instances. Your - /// game server build is deployed to each fleet instance. Amazon GameLift manages the - /// fleet's instances and controls the lifecycle of game server processes, which host - /// game sessions for players. EC2 fleets can have instances in multiple locations. Each - /// instance in the fleet is designated a Compute. + /// A container group definition determines how Amazon GameLift deploys your containers + /// to each instance in a container fleet. You can maintain multiple versions of a container + /// group definition. /// /// /// - /// To create an EC2 fleet, provide these required parameters: + /// There are two types of container groups: /// ///
    • /// - /// Either BuildId or ScriptId + /// A game server container group has the containers that run your game server + /// application and supporting software. A game server container group can have these + /// container types: /// - ///
    • + ///
      • /// - /// ComputeType set to EC2 (the default value) + /// Game server container. This container runs your game server. You can define one game + /// server container in a game server container group. /// ///
      • /// - /// EC2InboundPermissions + /// Support container. This container runs software in parallel with your game server. + /// You can define up to 8 support containers in a game server group. /// - ///
      • + ///
      /// - /// EC2InstanceType + /// When building a game server container group definition, you can choose to bundle your + /// game server executable and all dependent software into a single game server container. + /// Alternatively, you can separate the software into one game server container and one + /// or more support containers. /// - ///
    • + /// /// - /// FleetType + /// On a container fleet instance, a game server container group can be deployed multiple + /// times (depending on the compute resources of the instance). This means that all containers + /// in the container group are replicated together. /// ///
    • /// - /// Name + /// A per-instance container group has containers for processes that aren't replicated + /// on a container fleet instance. This might include background services, logging, test + /// processes, or processes that need to persist independently of the game server container + /// group. When building a per-instance container group, you can define up to 10 support + /// containers. /// - ///
    • + ///
    /// - /// RuntimeConfiguration with at least one ServerProcesses configuration + /// This operation requires Identity and Access Management (IAM) permissions to access + /// container images in Amazon ECR repositories. See + /// IAM permissions for Amazon GameLift for help setting the appropriate permissions. /// - /// + /// /// - /// If successful, this operation creates a new fleet resource and places it in NEW - /// status while Amazon GameLift initiates the fleet - /// creation workflow. To debug your fleet, fetch logs, view performance metrics or - /// other actions on the fleet, create a development fleet with port 22/3389 open. As - /// a best practice, we recommend opening ports for remote access only when you need them - /// and closing them when you're finished. + /// Request options /// /// /// - /// When the fleet status is ACTIVE, you can adjust capacity settings and turn autoscaling - /// on/off for each location. + /// Use this operation to make the following types of requests. You can specify values + /// for the minimum required parameters and customize optional values later. /// - /// + ///
    • /// - /// Managed container fleet + /// Create a game server container group definition. Provide the following required parameter + /// values: /// - /// + ///
      • /// - /// A container fleet is a set of Amazon Elastic Compute Cloud (Amazon EC2) instances. - /// Your container architecture is deployed to each fleet instance based on the fleet - /// configuration. Amazon GameLift manages the containers on each fleet instance and controls - /// the lifecycle of game server processes, which host game sessions for players. Container - /// fleets can have instances in multiple locations. Each container on an instance that - /// runs game server processes is registered as a Compute. + /// Name /// - /// + ///
      • /// - /// To create a container fleet, provide these required parameters: + /// ContainerGroupType (GAME_SERVER) /// - ///
        • + ///
        • /// - /// ComputeType set to CONTAINER + /// OperatingSystem (omit to use default value) /// ///
        • /// - /// ContainerGroupsConfiguration + /// TotalMemoryLimitMebibytes (omit to use default value) /// ///
        • /// - /// EC2InboundPermissions + /// TotalVcpuLimit (omit to use default value) /// ///
        • /// - /// EC2InstanceType + /// At least one GameServerContainerDefinition /// - ///
        • + ///
          • /// - /// FleetType set to ON_DEMAND + /// ContainerName /// ///
          • /// - /// Name + /// ImageUrl /// ///
          • /// - /// RuntimeConfiguration with at least one ServerProcesses configuration - /// - ///
          - /// - /// If successful, this operation creates a new fleet resource and places it in NEW - /// status while Amazon GameLift initiates the fleet - /// creation workflow. - /// - /// - /// - /// When the fleet status is ACTIVE, you can adjust capacity settings and turn autoscaling - /// on/off for each location. + /// PortConfiguration /// - /// + ///
        • /// - /// Anywhere fleet + /// ServerSdkVersion (omit to use default value) /// - /// + ///
    • /// - /// An Anywhere fleet represents compute resources that are not owned or managed by Amazon - /// GameLift. You might create an Anywhere fleet with your local machine for testing, - /// or use one to host game servers with on-premises hardware or other game hosting solutions. - /// + /// Create a per-instance container group definition. Provide the following required parameter + /// values: /// - /// + ///
      • /// - /// To create an Anywhere fleet, provide these required parameters: + /// Name /// - ///
        • + ///
        • /// - /// ComputeType set to ANYWHERE + /// ContainerGroupType (PER_INSTANCE) /// ///
        • /// - /// Locations specifying a custom location + /// OperatingSystem (omit to use default value) /// ///
        • /// - /// Name + /// TotalMemoryLimitMebibytes (omit to use default value) /// - ///
        + ///
      • /// - /// If successful, this operation creates a new fleet resource and places it in ACTIVE - /// status. You can register computes with a fleet in ACTIVE status. + /// TotalVcpuLimit (omit to use default value) /// - /// + ///
      • /// - /// Learn more + /// At least one SupportContainerDefinition /// - /// + ///
    /// - /// Debug - /// fleet creation issues + /// Results /// /// /// - /// Multi-location - /// fleets + /// If successful, this request creates a ContainerGroupDefinition resource and + /// assigns a unique ARN value. You can update most properties of a container group definition + /// by calling UpdateContainerGroupDefinition, and optionally save the update as + /// a new version. /// ///     - /// Container for the necessary parameters to execute the CreateFleet service method. + /// Container for the necessary parameters to execute the CreateContainerGroupDefinition service method. /// /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// /// - /// The response from the CreateFleet service method, as returned by GameLift. + /// The response from the CreateContainerGroupDefinition service method, as returned by GameLift. /// /// The requested operation would cause a conflict with the current state of a service /// resource associated with the request. Resolve the conflict before retrying this request. @@ -1706,15 +1723,6 @@ public virtual CreateFleetResponse CreateFleet(CreateFleetRequest request) /// The requested operation would cause the resource to exceed the allowed service limit. /// Resolve the issue before retrying. /// - /// - /// The requested resources was not found. The resource was either not created yet or - /// deleted. - /// - /// - /// The operation failed because Amazon GameLift has not yet finished validating this - /// compute. We recommend attempting 8 to 10 retries over 3 to 5 minutes with exponential - /// backoffs and jitter. - /// /// /// The requested tagging operation did not succeed. This may be due to invalid tag format /// or the maximum tag limit may have been exceeded. Resolve the issue before retrying. @@ -1725,48 +1733,114 @@ public virtual CreateFleetResponse CreateFleet(CreateFleetRequest request) /// /// The requested operation is not supported in the Region specified. /// - /// REST API Reference for CreateFleet Operation - public virtual Task CreateFleetAsync(CreateFleetRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + /// REST API Reference for CreateContainerGroupDefinition Operation + public virtual Task CreateContainerGroupDefinitionAsync(CreateContainerGroupDefinitionRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { var options = new InvokeOptions(); - options.RequestMarshaller = CreateFleetRequestMarshaller.Instance; - options.ResponseUnmarshaller = CreateFleetResponseUnmarshaller.Instance; + options.RequestMarshaller = CreateContainerGroupDefinitionRequestMarshaller.Instance; + options.ResponseUnmarshaller = CreateContainerGroupDefinitionResponseUnmarshaller.Instance; - return InvokeAsync(request, options, cancellationToken); + return InvokeAsync(request, options, cancellationToken); } #endregion - #region CreateFleetLocations + #region CreateFleet /// - /// This operation has been expanded to use with the Amazon GameLift containers feature, - /// which is currently in public preview. + /// Creates a fleet of compute resources to host your game servers. Use this operation + /// to set up the following types of fleets based on compute type: /// /// /// - /// Adds remote locations to an EC2 or container fleet and begins populating the new locations - /// with instances. The new instances conform to the fleet's instance type, auto-scaling, - /// and other configuration settings. + /// Managed EC2 fleet /// - /// + /// /// - /// You can't add remote locations to a fleet that resides in an Amazon Web Services Region - /// that doesn't support multiple locations. Fleets created prior to March 2021 can't - /// support multiple locations. + /// An EC2 fleet is a set of Amazon Elastic Compute Cloud (Amazon EC2) instances. Your + /// game server build is deployed to each fleet instance. Amazon GameLift manages the + /// fleet's instances and controls the lifecycle of game server processes, which host + /// game sessions for players. EC2 fleets can have instances in multiple locations. Each + /// instance in the fleet is designated a Compute. /// - /// + /// /// - /// To add fleet locations, specify the fleet to be updated and provide a list of one - /// or more locations. + /// To create an EC2 fleet, provide these required parameters: + /// + ///
    • + /// + /// Either BuildId or ScriptId + /// + ///
    • + /// + /// ComputeType set to EC2 (the default value) + /// + ///
    • + /// + /// EC2InboundPermissions + /// + ///
    • + /// + /// EC2InstanceType + /// + ///
    • + /// + /// FleetType + /// + ///
    • + /// + /// Name + /// + ///
    • + /// + /// RuntimeConfiguration with at least one ServerProcesses configuration + /// + ///
    + /// + /// If successful, this operation creates a new fleet resource and places it in NEW + /// status while Amazon GameLift initiates the fleet + /// creation workflow. To debug your fleet, fetch logs, view performance metrics or + /// other actions on the fleet, create a development fleet with port 22/3389 open. As + /// a best practice, we recommend opening ports for remote access only when you need them + /// and closing them when you're finished. /// /// /// - /// If successful, this operation returns the list of added locations with their status - /// set to NEW. Amazon GameLift initiates the process of starting an instance in - /// each added location. You can track the status of each new location by monitoring location - /// creation events using DescribeFleetEvents. + /// When the fleet status is ACTIVE, you can adjust capacity settings and turn autoscaling + /// on/off for each location. + /// + /// + /// + /// Anywhere fleet + /// + /// + /// + /// An Anywhere fleet represents compute resources that are not owned or managed by Amazon + /// GameLift. You might create an Anywhere fleet with your local machine for testing, + /// or use one to host game servers with on-premises hardware or other game hosting solutions. + /// + /// + /// + /// + /// To create an Anywhere fleet, provide these required parameters: + /// + ///
    • + /// + /// ComputeType set to ANYWHERE + /// + ///
    • + /// + /// Locations specifying a custom location + /// + ///
    • + /// + /// Name + /// + ///
    + /// + /// If successful, this operation creates a new fleet resource and places it in ACTIVE + /// status. You can register computes with a fleet in ACTIVE status. /// /// /// @@ -1779,18 +1853,18 @@ public virtual CreateFleetResponse CreateFleet(CreateFleetRequest request) /// /// /// - /// Update - /// fleet locations + /// Debug + /// fleet creation issues /// /// /// - /// - /// Amazon GameLift service locations for managed hosting. + /// Multi-location + /// fleets /// ///     - /// Container for the necessary parameters to execute the CreateFleetLocations service method. + /// Container for the necessary parameters to execute the CreateFleet service method. /// - /// The response from the CreateFleetLocations service method, as returned by GameLift. + /// The response from the CreateFleet service method, as returned by GameLift. /// /// The requested operation would cause a conflict with the current state of a service /// resource associated with the request. Resolve the conflict before retrying this request. @@ -1799,10 +1873,6 @@ public virtual CreateFleetResponse CreateFleet(CreateFleetRequest request) /// The service encountered an unrecoverable internal failure while processing the request. /// Clients can retry such requests immediately or after a waiting period. /// - /// - /// The requested operation would cause a conflict with the current state of a resource - /// associated with the request and/or the fleet. Resolve the conflict before retrying. - /// /// /// One or more parameter values in the request are invalid. Correct the invalid parameter /// values before retrying. @@ -1820,84 +1890,250 @@ public virtual CreateFleetResponse CreateFleet(CreateFleetRequest request) /// compute. We recommend attempting 8 to 10 retries over 3 to 5 minutes with exponential /// backoffs and jitter. /// + /// + /// The requested tagging operation did not succeed. This may be due to invalid tag format + /// or the maximum tag limit may have been exceeded. Resolve the issue before retrying. + /// /// /// The client failed authentication. Clients should not retry such requests. /// /// /// The requested operation is not supported in the Region specified. /// - /// REST API Reference for CreateFleetLocations Operation - public virtual CreateFleetLocationsResponse CreateFleetLocations(CreateFleetLocationsRequest request) + /// REST API Reference for CreateFleet Operation + public virtual CreateFleetResponse CreateFleet(CreateFleetRequest request) { var options = new InvokeOptions(); - options.RequestMarshaller = CreateFleetLocationsRequestMarshaller.Instance; - options.ResponseUnmarshaller = CreateFleetLocationsResponseUnmarshaller.Instance; + options.RequestMarshaller = CreateFleetRequestMarshaller.Instance; + options.ResponseUnmarshaller = CreateFleetResponseUnmarshaller.Instance; - return Invoke(request, options); + return Invoke(request, options); } /// - /// This operation has been expanded to use with the Amazon GameLift containers feature, - /// which is currently in public preview. + /// Creates a fleet of compute resources to host your game servers. Use this operation + /// to set up the following types of fleets based on compute type: /// /// /// - /// Adds remote locations to an EC2 or container fleet and begins populating the new locations - /// with instances. The new instances conform to the fleet's instance type, auto-scaling, - /// and other configuration settings. + /// Managed EC2 fleet /// - /// + /// /// - /// You can't add remote locations to a fleet that resides in an Amazon Web Services Region - /// that doesn't support multiple locations. Fleets created prior to March 2021 can't - /// support multiple locations. + /// An EC2 fleet is a set of Amazon Elastic Compute Cloud (Amazon EC2) instances. Your + /// game server build is deployed to each fleet instance. Amazon GameLift manages the + /// fleet's instances and controls the lifecycle of game server processes, which host + /// game sessions for players. EC2 fleets can have instances in multiple locations. Each + /// instance in the fleet is designated a Compute. /// - /// + /// /// - /// To add fleet locations, specify the fleet to be updated and provide a list of one - /// or more locations. + /// To create an EC2 fleet, provide these required parameters: /// - /// + ///
    • /// - /// If successful, this operation returns the list of added locations with their status - /// set to NEW. Amazon GameLift initiates the process of starting an instance in - /// each added location. You can track the status of each new location by monitoring location - /// creation events using DescribeFleetEvents. + /// Either BuildId or ScriptId /// - /// + ///
    • /// - /// Learn more + /// ComputeType set to EC2 (the default value) /// - /// + ///
    • /// - /// Setting - /// up fleets + /// EC2InboundPermissions /// - /// + ///
    • /// - /// Update - /// fleet locations + /// EC2InstanceType /// - /// + ///
    • /// - /// - /// Amazon GameLift service locations for managed hosting. + /// FleetType /// - ///
    - /// Container for the necessary parameters to execute the CreateFleetLocations service method. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// - /// - /// The response from the CreateFleetLocations service method, as returned by GameLift. - /// - /// The requested operation would cause a conflict with the current state of a service - /// resource associated with the request. Resolve the conflict before retrying this request. - /// - /// - /// The service encountered an unrecoverable internal failure while processing the request. - /// Clients can retry such requests immediately or after a waiting period. + ///
  • + /// + /// Name + /// + ///
  • + /// + /// RuntimeConfiguration with at least one ServerProcesses configuration + /// + ///
    • + /// + /// If successful, this operation creates a new fleet resource and places it in NEW + /// status while Amazon GameLift initiates the fleet + /// creation workflow. To debug your fleet, fetch logs, view performance metrics or + /// other actions on the fleet, create a development fleet with port 22/3389 open. As + /// a best practice, we recommend opening ports for remote access only when you need them + /// and closing them when you're finished. + /// + /// + /// + /// When the fleet status is ACTIVE, you can adjust capacity settings and turn autoscaling + /// on/off for each location. + /// + /// + /// + /// Anywhere fleet + /// + /// + /// + /// An Anywhere fleet represents compute resources that are not owned or managed by Amazon + /// GameLift. You might create an Anywhere fleet with your local machine for testing, + /// or use one to host game servers with on-premises hardware or other game hosting solutions. + /// + /// + /// + /// + /// To create an Anywhere fleet, provide these required parameters: + /// + ///
    • + /// + /// ComputeType set to ANYWHERE + /// + ///
    • + /// + /// Locations specifying a custom location + /// + ///
    • + /// + /// Name + /// + ///
    + /// + /// If successful, this operation creates a new fleet resource and places it in ACTIVE + /// status. You can register computes with a fleet in ACTIVE status. + /// + /// + /// + /// Learn more + /// + /// + /// + /// Setting + /// up fleets + /// + /// + /// + /// Debug + /// fleet creation issues + /// + /// + /// + /// Multi-location + /// fleets + /// + /// + /// Container for the necessary parameters to execute the CreateFleet service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the CreateFleet service method, as returned by GameLift. + /// + /// The requested operation would cause a conflict with the current state of a service + /// resource associated with the request. Resolve the conflict before retrying this request. + /// + /// + /// The service encountered an unrecoverable internal failure while processing the request. + /// Clients can retry such requests immediately or after a waiting period. + /// + /// + /// One or more parameter values in the request are invalid. Correct the invalid parameter + /// values before retrying. + /// + /// + /// The requested operation would cause the resource to exceed the allowed service limit. + /// Resolve the issue before retrying. + /// + /// + /// The requested resources was not found. The resource was either not created yet or + /// deleted. + /// + /// + /// The operation failed because Amazon GameLift has not yet finished validating this + /// compute. We recommend attempting 8 to 10 retries over 3 to 5 minutes with exponential + /// backoffs and jitter. + /// + /// + /// The requested tagging operation did not succeed. This may be due to invalid tag format + /// or the maximum tag limit may have been exceeded. Resolve the issue before retrying. + /// + /// + /// The client failed authentication. Clients should not retry such requests. + /// + /// + /// The requested operation is not supported in the Region specified. + /// + /// REST API Reference for CreateFleet Operation + public virtual Task CreateFleetAsync(CreateFleetRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = CreateFleetRequestMarshaller.Instance; + options.ResponseUnmarshaller = CreateFleetResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + + #region CreateFleetLocations + + + /// + /// Adds remote locations to a managed EC2 fleet or managed container fleet and begins + /// populating the new locations with instances. The new instances conform to the fleet's + /// instance type, auto-scaling, and other configuration settings. + /// + /// + /// + /// You can't add remote locations to a fleet that resides in an Amazon Web Services Region + /// that doesn't support multiple locations. Fleets created prior to March 2021 can't + /// support multiple locations. + /// + /// + /// + /// To add fleet locations, specify the fleet to be updated and provide a list of one + /// or more locations. + /// + /// + /// + /// If successful, this operation returns the list of added locations with their status + /// set to NEW. Amazon GameLift initiates the process of starting an instance in + /// each added location. You can track the status of each new location by monitoring location + /// creation events using DescribeFleetEvents. + /// + /// + /// + /// Learn more + /// + /// + /// + /// Setting + /// up fleets + /// + /// + /// + /// Update + /// fleet locations + /// + /// + /// + /// + /// Amazon GameLift service locations for managed hosting. + /// + /// + /// Container for the necessary parameters to execute the CreateFleetLocations service method. + /// + /// The response from the CreateFleetLocations service method, as returned by GameLift. + /// + /// The requested operation would cause a conflict with the current state of a service + /// resource associated with the request. Resolve the conflict before retrying this request. + /// + /// + /// The service encountered an unrecoverable internal failure while processing the request. + /// Clients can retry such requests immediately or after a waiting period. /// /// /// The requested operation would cause a conflict with the current state of a resource @@ -1915,100 +2151,1075 @@ public virtual CreateFleetLocationsResponse CreateFleetLocations(CreateFleetLoca /// The requested resources was not found. The resource was either not created yet or /// deleted. /// - /// - /// The operation failed because Amazon GameLift has not yet finished validating this - /// compute. We recommend attempting 8 to 10 retries over 3 to 5 minutes with exponential - /// backoffs and jitter. - /// - /// - /// The client failed authentication. Clients should not retry such requests. + /// + /// The operation failed because Amazon GameLift has not yet finished validating this + /// compute. We recommend attempting 8 to 10 retries over 3 to 5 minutes with exponential + /// backoffs and jitter. + /// + /// + /// The client failed authentication. Clients should not retry such requests. + /// + /// + /// The requested operation is not supported in the Region specified. + /// + /// REST API Reference for CreateFleetLocations Operation + public virtual CreateFleetLocationsResponse CreateFleetLocations(CreateFleetLocationsRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = CreateFleetLocationsRequestMarshaller.Instance; + options.ResponseUnmarshaller = CreateFleetLocationsResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// Adds remote locations to a managed EC2 fleet or managed container fleet and begins + /// populating the new locations with instances. The new instances conform to the fleet's + /// instance type, auto-scaling, and other configuration settings. + /// + /// + /// + /// You can't add remote locations to a fleet that resides in an Amazon Web Services Region + /// that doesn't support multiple locations. Fleets created prior to March 2021 can't + /// support multiple locations. + /// + /// + /// + /// To add fleet locations, specify the fleet to be updated and provide a list of one + /// or more locations. + /// + /// + /// + /// If successful, this operation returns the list of added locations with their status + /// set to NEW. Amazon GameLift initiates the process of starting an instance in + /// each added location. You can track the status of each new location by monitoring location + /// creation events using DescribeFleetEvents. + /// + /// + /// + /// Learn more + /// + /// + /// + /// Setting + /// up fleets + /// + /// + /// + /// Update + /// fleet locations + /// + /// + /// + /// + /// Amazon GameLift service locations for managed hosting. + /// + /// + /// Container for the necessary parameters to execute the CreateFleetLocations service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the CreateFleetLocations service method, as returned by GameLift. + /// + /// The requested operation would cause a conflict with the current state of a service + /// resource associated with the request. Resolve the conflict before retrying this request. + /// + /// + /// The service encountered an unrecoverable internal failure while processing the request. + /// Clients can retry such requests immediately or after a waiting period. + /// + /// + /// The requested operation would cause a conflict with the current state of a resource + /// associated with the request and/or the fleet. Resolve the conflict before retrying. + /// + /// + /// One or more parameter values in the request are invalid. Correct the invalid parameter + /// values before retrying. + /// + /// + /// The requested operation would cause the resource to exceed the allowed service limit. + /// Resolve the issue before retrying. + /// + /// + /// The requested resources was not found. The resource was either not created yet or + /// deleted. + /// + /// + /// The operation failed because Amazon GameLift has not yet finished validating this + /// compute. We recommend attempting 8 to 10 retries over 3 to 5 minutes with exponential + /// backoffs and jitter. + /// + /// + /// The client failed authentication. Clients should not retry such requests. + /// + /// + /// The requested operation is not supported in the Region specified. + /// + /// REST API Reference for CreateFleetLocations Operation + public virtual Task CreateFleetLocationsAsync(CreateFleetLocationsRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = CreateFleetLocationsRequestMarshaller.Instance; + options.ResponseUnmarshaller = CreateFleetLocationsResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + + #region CreateGameServerGroup + + + /// + /// This operation is used with the Amazon GameLift FleetIQ solution and game server + /// groups. + /// + /// + /// + /// Creates a Amazon GameLift FleetIQ game server group for managing game hosting on a + /// collection of Amazon Elastic Compute Cloud instances for game hosting. This operation + /// creates the game server group, creates an Auto Scaling group in your Amazon Web Services + /// account, and establishes a link between the two groups. You can view the status of + /// your game server groups in the Amazon GameLift console. Game server group metrics + /// and events are emitted to Amazon CloudWatch. + /// + /// + /// + /// Before creating a new game server group, you must have the following: + /// + ///
    • + /// + /// An Amazon Elastic Compute Cloud launch template that specifies how to launch Amazon + /// Elastic Compute Cloud instances with your game server build. For more information, + /// see + /// Launching an Instance from a Launch Template in the Amazon Elastic Compute + /// Cloud User Guide. + /// + ///
    • + /// + /// An IAM role that extends limited access to your Amazon Web Services account to allow + /// Amazon GameLift FleetIQ to create and interact with the Auto Scaling group. For more + /// information, see Create + /// IAM roles for cross-service interaction in the Amazon GameLift FleetIQ Developer + /// Guide. + /// + ///
    + /// + /// To create a new game server group, specify a unique group name, IAM role and Amazon + /// Elastic Compute Cloud launch template, and provide a list of instance types that can + /// be used in the group. You must also set initial maximum and minimum limits on the + /// group's instance count. You can optionally set an Auto Scaling policy with target + /// tracking based on a Amazon GameLift FleetIQ metric. + /// + /// + /// + /// Once the game server group and corresponding Auto Scaling group are created, you have + /// full access to change the Auto Scaling group's configuration as needed. Several properties + /// that are set when creating a game server group, including maximum/minimum size and + /// auto-scaling policy settings, must be updated directly in the Auto Scaling group. + /// Keep in mind that some Auto Scaling group properties are periodically updated by Amazon + /// GameLift FleetIQ as part of its balancing activities to optimize for availability + /// and cost. + /// + /// + /// + /// Learn more + /// + /// + /// + /// Amazon + /// GameLift FleetIQ Guide + /// + ///     + /// Container for the necessary parameters to execute the CreateGameServerGroup service method. + /// + /// The response from the CreateGameServerGroup service method, as returned by GameLift. + /// + /// The requested operation would cause a conflict with the current state of a service + /// resource associated with the request. Resolve the conflict before retrying this request. + /// + /// + /// The service encountered an unrecoverable internal failure while processing the request. + /// Clients can retry such requests immediately or after a waiting period. + /// + /// + /// One or more parameter values in the request are invalid. Correct the invalid parameter + /// values before retrying. + /// + /// + /// The requested operation would cause the resource to exceed the allowed service limit. + /// Resolve the issue before retrying. + /// + /// + /// The client failed authentication. Clients should not retry such requests. + /// + /// REST API Reference for CreateGameServerGroup Operation + public virtual CreateGameServerGroupResponse CreateGameServerGroup(CreateGameServerGroupRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = CreateGameServerGroupRequestMarshaller.Instance; + options.ResponseUnmarshaller = CreateGameServerGroupResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// This operation is used with the Amazon GameLift FleetIQ solution and game server + /// groups. + /// + /// + /// + /// Creates a Amazon GameLift FleetIQ game server group for managing game hosting on a + /// collection of Amazon Elastic Compute Cloud instances for game hosting. This operation + /// creates the game server group, creates an Auto Scaling group in your Amazon Web Services + /// account, and establishes a link between the two groups. You can view the status of + /// your game server groups in the Amazon GameLift console. Game server group metrics + /// and events are emitted to Amazon CloudWatch. + /// + /// + /// + /// Before creating a new game server group, you must have the following: + /// + ///
    • + /// + /// An Amazon Elastic Compute Cloud launch template that specifies how to launch Amazon + /// Elastic Compute Cloud instances with your game server build. For more information, + /// see + /// Launching an Instance from a Launch Template in the Amazon Elastic Compute + /// Cloud User Guide. + /// + ///
    • + /// + /// An IAM role that extends limited access to your Amazon Web Services account to allow + /// Amazon GameLift FleetIQ to create and interact with the Auto Scaling group. For more + /// information, see Create + /// IAM roles for cross-service interaction in the Amazon GameLift FleetIQ Developer + /// Guide. + /// + ///
    + /// + /// To create a new game server group, specify a unique group name, IAM role and Amazon + /// Elastic Compute Cloud launch template, and provide a list of instance types that can + /// be used in the group. You must also set initial maximum and minimum limits on the + /// group's instance count. You can optionally set an Auto Scaling policy with target + /// tracking based on a Amazon GameLift FleetIQ metric. + /// + /// + /// + /// Once the game server group and corresponding Auto Scaling group are created, you have + /// full access to change the Auto Scaling group's configuration as needed. Several properties + /// that are set when creating a game server group, including maximum/minimum size and + /// auto-scaling policy settings, must be updated directly in the Auto Scaling group. + /// Keep in mind that some Auto Scaling group properties are periodically updated by Amazon + /// GameLift FleetIQ as part of its balancing activities to optimize for availability + /// and cost. + /// + /// + /// + /// Learn more + /// + /// + /// + /// Amazon + /// GameLift FleetIQ Guide + /// + ///     + /// Container for the necessary parameters to execute the CreateGameServerGroup service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the CreateGameServerGroup service method, as returned by GameLift. + /// + /// The requested operation would cause a conflict with the current state of a service + /// resource associated with the request. Resolve the conflict before retrying this request. + /// + /// + /// The service encountered an unrecoverable internal failure while processing the request. + /// Clients can retry such requests immediately or after a waiting period. + /// + /// + /// One or more parameter values in the request are invalid. Correct the invalid parameter + /// values before retrying. + /// + /// + /// The requested operation would cause the resource to exceed the allowed service limit. + /// Resolve the issue before retrying. + /// + /// + /// The client failed authentication. Clients should not retry such requests. + /// + /// REST API Reference for CreateGameServerGroup Operation + public virtual Task CreateGameServerGroupAsync(CreateGameServerGroupRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = CreateGameServerGroupRequestMarshaller.Instance; + options.ResponseUnmarshaller = CreateGameServerGroupResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + + #region CreateGameSession + + + /// + /// Creates a multiplayer game session for players in a specific fleet location. This + /// operation prompts an available server process to start a game session and retrieves + /// connection information for the new game session. As an alternative, consider using + /// the Amazon GameLift game session placement feature with StartGameSessionPlacement + /// , which uses the FleetIQ algorithm and queues to optimize the placement process. + /// + /// + /// + /// When creating a game session, you specify exactly where you want to place it and provide + /// a set of game session configuration settings. The target fleet must be in ACTIVE + /// status. + /// + /// + /// + /// You can use this operation in the following ways: + /// + ///
    • + /// + /// To create a game session on an instance in a fleet's home Region, provide a fleet + /// or alias ID along with your game session configuration. + /// + ///
    • + /// + /// To create a game session on an instance in a fleet's remote location, provide a fleet + /// or alias ID and a location name, along with your game session configuration. + /// + ///
    • + /// + /// To create a game session on an instance in an Anywhere fleet, specify the fleet's + /// custom location. + /// + ///
    + /// + /// If successful, Amazon GameLift initiates a workflow to start a new game session and + /// returns a GameSession object containing the game session configuration and + /// status. When the game session status is ACTIVE, it is updated with connection + /// information and you can create player sessions for the game session. By default, newly + /// created game sessions are open to new players. You can restrict new player access + /// by using UpdateGameSession + /// to change the game session's player session creation policy. + /// + /// + /// + /// Amazon GameLift retains logs for active for 14 days. To access the logs, call GetGameSessionLogUrl + /// to download the log files. + /// + /// + /// + /// Available in Amazon GameLift Local. + /// + /// + /// + /// Learn more + /// + /// + /// + /// Start + /// a game session + /// + /// + /// + /// All + /// APIs by task + /// + ///     + /// Container for the necessary parameters to execute the CreateGameSession service method. + /// + /// The response from the CreateGameSession service method, as returned by GameLift. + /// + /// The requested operation would cause a conflict with the current state of a service + /// resource associated with the request. Resolve the conflict before retrying this request. + /// + /// + /// The specified fleet has no available instances to fulfill a CreateGameSession + /// request. Clients can retry such requests immediately or after a waiting period. + /// + /// + /// A game session with this custom ID string already exists in this fleet. Resolve this + /// conflict before retrying this request. + /// + /// + /// The service encountered an unrecoverable internal failure while processing the request. + /// Clients can retry such requests immediately or after a waiting period. + /// + /// + /// The requested operation would cause a conflict with the current state of a resource + /// associated with the request and/or the fleet. Resolve the conflict before retrying. + /// + /// + /// One or more parameter values in the request are invalid. Correct the invalid parameter + /// values before retrying. + /// + /// + /// The requested operation would cause the resource to exceed the allowed service limit. + /// Resolve the issue before retrying. + /// + /// + /// The requested resources was not found. The resource was either not created yet or + /// deleted. + /// + /// + /// The service is unable to resolve the routing for a particular alias because it has + /// a terminal RoutingStrategy associated with it. The message returned in this + /// exception is the message defined in the routing strategy itself. Such requests should + /// only be retried if the routing strategy for the specified alias is modified. + /// + /// + /// The client failed authentication. Clients should not retry such requests. + /// + /// + /// The requested operation is not supported in the Region specified. + /// + /// REST API Reference for CreateGameSession Operation + public virtual CreateGameSessionResponse CreateGameSession(CreateGameSessionRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = CreateGameSessionRequestMarshaller.Instance; + options.ResponseUnmarshaller = CreateGameSessionResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// Creates a multiplayer game session for players in a specific fleet location. This + /// operation prompts an available server process to start a game session and retrieves + /// connection information for the new game session. As an alternative, consider using + /// the Amazon GameLift game session placement feature with StartGameSessionPlacement + /// , which uses the FleetIQ algorithm and queues to optimize the placement process. + /// + /// + /// + /// When creating a game session, you specify exactly where you want to place it and provide + /// a set of game session configuration settings. The target fleet must be in ACTIVE + /// status. + /// + /// + /// + /// You can use this operation in the following ways: + /// + ///
    • + /// + /// To create a game session on an instance in a fleet's home Region, provide a fleet + /// or alias ID along with your game session configuration. + /// + ///
    • + /// + /// To create a game session on an instance in a fleet's remote location, provide a fleet + /// or alias ID and a location name, along with your game session configuration. + /// + ///
    • + /// + /// To create a game session on an instance in an Anywhere fleet, specify the fleet's + /// custom location. + /// + ///
    + /// + /// If successful, Amazon GameLift initiates a workflow to start a new game session and + /// returns a GameSession object containing the game session configuration and + /// status. When the game session status is ACTIVE, it is updated with connection + /// information and you can create player sessions for the game session. By default, newly + /// created game sessions are open to new players. You can restrict new player access + /// by using UpdateGameSession + /// to change the game session's player session creation policy. + /// + /// + /// + /// Amazon GameLift retains logs for active for 14 days. To access the logs, call GetGameSessionLogUrl + /// to download the log files. + /// + /// + /// + /// Available in Amazon GameLift Local. + /// + /// + /// + /// Learn more + /// + /// + /// + /// Start + /// a game session + /// + /// + /// + /// All + /// APIs by task + /// + ///     + /// Container for the necessary parameters to execute the CreateGameSession service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the CreateGameSession service method, as returned by GameLift. + /// + /// The requested operation would cause a conflict with the current state of a service + /// resource associated with the request. Resolve the conflict before retrying this request. + /// + /// + /// The specified fleet has no available instances to fulfill a CreateGameSession + /// request. Clients can retry such requests immediately or after a waiting period. + /// + /// + /// A game session with this custom ID string already exists in this fleet. Resolve this + /// conflict before retrying this request. + /// + /// + /// The service encountered an unrecoverable internal failure while processing the request. + /// Clients can retry such requests immediately or after a waiting period. + /// + /// + /// The requested operation would cause a conflict with the current state of a resource + /// associated with the request and/or the fleet. Resolve the conflict before retrying. + /// + /// + /// One or more parameter values in the request are invalid. Correct the invalid parameter + /// values before retrying. + /// + /// + /// The requested operation would cause the resource to exceed the allowed service limit. + /// Resolve the issue before retrying. + /// + /// + /// The requested resources was not found. The resource was either not created yet or + /// deleted. + /// + /// + /// The service is unable to resolve the routing for a particular alias because it has + /// a terminal RoutingStrategy associated with it. The message returned in this + /// exception is the message defined in the routing strategy itself. Such requests should + /// only be retried if the routing strategy for the specified alias is modified. + /// + /// + /// The client failed authentication. Clients should not retry such requests. + /// + /// + /// The requested operation is not supported in the Region specified. + /// + /// REST API Reference for CreateGameSession Operation + public virtual Task CreateGameSessionAsync(CreateGameSessionRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = CreateGameSessionRequestMarshaller.Instance; + options.ResponseUnmarshaller = CreateGameSessionResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + + #region CreateGameSessionQueue + + + /// + /// Creates a placement queue that processes requests for new game sessions. A queue uses + /// FleetIQ algorithms to determine the best placement locations and find an available + /// game server there, then prompts the game server process to start a new game session. + /// + /// + /// + /// + /// A game session queue is configured with a set of destinations (Amazon GameLift fleets + /// or aliases), which determine the locations where the queue can place new game sessions. + /// These destinations can span multiple fleet types (Spot and On-Demand), instance types, + /// and Amazon Web Services Regions. If the queue includes multi-location fleets, the + /// queue is able to place game sessions in all of a fleet's remote locations. You can + /// opt to filter out individual locations if needed. + /// + /// + /// + /// The queue configuration also determines how FleetIQ selects the best available placement + /// for a new game session. Before searching for an available game server, FleetIQ first + /// prioritizes the queue's destinations and locations, with the best placement locations + /// on top. You can set up the queue to use the FleetIQ default prioritization or provide + /// an alternate set of priorities. + /// + /// + /// + /// To create a new queue, provide a name, timeout value, and a list of destinations. + /// Optionally, specify a sort configuration and/or a filter, and define a set of latency + /// cap policies. You can also include the ARN for an Amazon Simple Notification Service + /// (SNS) topic to receive notifications of game session placement activity. Notifications + /// using SNS or CloudWatch events is the preferred way to track placement activity. + /// + /// + /// + /// If successful, a new GameSessionQueue object is returned with an assigned queue + /// ARN. New game session requests, which are submitted to queue with StartGameSessionPlacement + /// or StartMatchmaking, + /// reference a queue's name or ARN. + /// + /// + /// + /// Learn more + /// + /// + /// + /// + /// Design a game session queue + /// + /// + /// + /// + /// Create a game session queue + /// + /// + /// + /// Related actions + /// + /// + /// + /// CreateGameSessionQueue + /// | DescribeGameSessionQueues + /// | UpdateGameSessionQueue + /// | DeleteGameSessionQueue + /// | All + /// APIs by task + /// + /// + /// Container for the necessary parameters to execute the CreateGameSessionQueue service method. + /// + /// The response from the CreateGameSessionQueue service method, as returned by GameLift. + /// + /// The service encountered an unrecoverable internal failure while processing the request. + /// Clients can retry such requests immediately or after a waiting period. + /// + /// + /// One or more parameter values in the request are invalid. Correct the invalid parameter + /// values before retrying. + /// + /// + /// The requested operation would cause the resource to exceed the allowed service limit. + /// Resolve the issue before retrying. + /// + /// + /// The requested resources was not found. The resource was either not created yet or + /// deleted. + /// + /// + /// The requested tagging operation did not succeed. This may be due to invalid tag format + /// or the maximum tag limit may have been exceeded. Resolve the issue before retrying. + /// + /// + /// The client failed authentication. Clients should not retry such requests. + /// + /// REST API Reference for CreateGameSessionQueue Operation + public virtual CreateGameSessionQueueResponse CreateGameSessionQueue(CreateGameSessionQueueRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = CreateGameSessionQueueRequestMarshaller.Instance; + options.ResponseUnmarshaller = CreateGameSessionQueueResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// Creates a placement queue that processes requests for new game sessions. A queue uses + /// FleetIQ algorithms to determine the best placement locations and find an available + /// game server there, then prompts the game server process to start a new game session. + /// + /// + /// + /// + /// A game session queue is configured with a set of destinations (Amazon GameLift fleets + /// or aliases), which determine the locations where the queue can place new game sessions. + /// These destinations can span multiple fleet types (Spot and On-Demand), instance types, + /// and Amazon Web Services Regions. If the queue includes multi-location fleets, the + /// queue is able to place game sessions in all of a fleet's remote locations. You can + /// opt to filter out individual locations if needed. + /// + /// + /// + /// The queue configuration also determines how FleetIQ selects the best available placement + /// for a new game session. Before searching for an available game server, FleetIQ first + /// prioritizes the queue's destinations and locations, with the best placement locations + /// on top. You can set up the queue to use the FleetIQ default prioritization or provide + /// an alternate set of priorities. + /// + /// + /// + /// To create a new queue, provide a name, timeout value, and a list of destinations. + /// Optionally, specify a sort configuration and/or a filter, and define a set of latency + /// cap policies. You can also include the ARN for an Amazon Simple Notification Service + /// (SNS) topic to receive notifications of game session placement activity. Notifications + /// using SNS or CloudWatch events is the preferred way to track placement activity. + /// + /// + /// + /// If successful, a new GameSessionQueue object is returned with an assigned queue + /// ARN. New game session requests, which are submitted to queue with StartGameSessionPlacement + /// or StartMatchmaking, + /// reference a queue's name or ARN. + /// + /// + /// + /// Learn more + /// + /// + /// + /// + /// Design a game session queue + /// + /// + /// + /// + /// Create a game session queue + /// + /// + /// + /// Related actions + /// + /// + /// + /// CreateGameSessionQueue + /// | DescribeGameSessionQueues + /// | UpdateGameSessionQueue + /// | DeleteGameSessionQueue + /// | All + /// APIs by task + /// + /// + /// Container for the necessary parameters to execute the CreateGameSessionQueue service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the CreateGameSessionQueue service method, as returned by GameLift. + /// + /// The service encountered an unrecoverable internal failure while processing the request. + /// Clients can retry such requests immediately or after a waiting period. + /// + /// + /// One or more parameter values in the request are invalid. Correct the invalid parameter + /// values before retrying. + /// + /// + /// The requested operation would cause the resource to exceed the allowed service limit. + /// Resolve the issue before retrying. + /// + /// + /// The requested resources was not found. The resource was either not created yet or + /// deleted. + /// + /// + /// The requested tagging operation did not succeed. This may be due to invalid tag format + /// or the maximum tag limit may have been exceeded. Resolve the issue before retrying. + /// + /// + /// The client failed authentication. Clients should not retry such requests. + /// + /// REST API Reference for CreateGameSessionQueue Operation + public virtual Task CreateGameSessionQueueAsync(CreateGameSessionQueueRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = CreateGameSessionQueueRequestMarshaller.Instance; + options.ResponseUnmarshaller = CreateGameSessionQueueResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + + #region CreateLocation + + + /// + /// Creates a custom location for use in an Anywhere fleet. + /// + /// Container for the necessary parameters to execute the CreateLocation service method. + /// + /// The response from the CreateLocation service method, as returned by GameLift. + /// + /// The requested operation would cause a conflict with the current state of a service + /// resource associated with the request. Resolve the conflict before retrying this request. + /// + /// + /// The service encountered an unrecoverable internal failure while processing the request. + /// Clients can retry such requests immediately or after a waiting period. + /// + /// + /// One or more parameter values in the request are invalid. Correct the invalid parameter + /// values before retrying. + /// + /// + /// The requested operation would cause the resource to exceed the allowed service limit. + /// Resolve the issue before retrying. + /// + /// + /// The requested tagging operation did not succeed. This may be due to invalid tag format + /// or the maximum tag limit may have been exceeded. Resolve the issue before retrying. + /// + /// + /// The client failed authentication. Clients should not retry such requests. + /// + /// REST API Reference for CreateLocation Operation + public virtual CreateLocationResponse CreateLocation(CreateLocationRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = CreateLocationRequestMarshaller.Instance; + options.ResponseUnmarshaller = CreateLocationResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// Creates a custom location for use in an Anywhere fleet. + /// + /// Container for the necessary parameters to execute the CreateLocation service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the CreateLocation service method, as returned by GameLift. + /// + /// The requested operation would cause a conflict with the current state of a service + /// resource associated with the request. Resolve the conflict before retrying this request. + /// + /// + /// The service encountered an unrecoverable internal failure while processing the request. + /// Clients can retry such requests immediately or after a waiting period. + /// + /// + /// One or more parameter values in the request are invalid. Correct the invalid parameter + /// values before retrying. + /// + /// + /// The requested operation would cause the resource to exceed the allowed service limit. + /// Resolve the issue before retrying. + /// + /// + /// The requested tagging operation did not succeed. This may be due to invalid tag format + /// or the maximum tag limit may have been exceeded. Resolve the issue before retrying. + /// + /// + /// The client failed authentication. Clients should not retry such requests. + /// + /// REST API Reference for CreateLocation Operation + public virtual Task CreateLocationAsync(CreateLocationRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = CreateLocationRequestMarshaller.Instance; + options.ResponseUnmarshaller = CreateLocationResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + + #region CreateMatchmakingConfiguration + + + /// + /// Defines a new matchmaking configuration for use with FlexMatch. Whether your are using + /// FlexMatch with Amazon GameLift hosting or as a standalone matchmaking service, the + /// matchmaking configuration sets out rules for matching players and forming teams. If + /// you're also using Amazon GameLift hosting, it defines how to start game sessions for + /// each match. Your matchmaking system can use multiple configurations to handle different + /// game scenarios. All matchmaking requests identify the matchmaking configuration to + /// use and provide player attributes consistent with that configuration. + /// + /// + /// + /// To create a matchmaking configuration, you must provide the following: configuration + /// name and FlexMatch mode (with or without Amazon GameLift hosting); a rule set that + /// specifies how to evaluate players and find acceptable matches; whether player acceptance + /// is required; and the maximum time allowed for a matchmaking attempt. When using FlexMatch + /// with Amazon GameLift hosting, you also need to identify the game session queue to + /// use when starting a game session for the match. + /// + /// + /// + /// In addition, you must set up an Amazon Simple Notification Service topic to receive + /// matchmaking notifications. Provide the topic ARN in the matchmaking configuration. + /// + /// + /// + /// Learn more + /// + /// + /// + /// + /// Design a FlexMatch matchmaker + /// + /// + /// + /// + /// Set up FlexMatch event notification + /// + /// + /// Container for the necessary parameters to execute the CreateMatchmakingConfiguration service method. + /// + /// The response from the CreateMatchmakingConfiguration service method, as returned by GameLift. + /// + /// The service encountered an unrecoverable internal failure while processing the request. + /// Clients can retry such requests immediately or after a waiting period. + /// + /// + /// One or more parameter values in the request are invalid. Correct the invalid parameter + /// values before retrying. + /// + /// + /// The requested operation would cause the resource to exceed the allowed service limit. + /// Resolve the issue before retrying. + /// + /// + /// The requested resources was not found. The resource was either not created yet or + /// deleted. + /// + /// + /// The requested tagging operation did not succeed. This may be due to invalid tag format + /// or the maximum tag limit may have been exceeded. Resolve the issue before retrying. + /// + /// + /// The requested operation is not supported in the Region specified. + /// + /// REST API Reference for CreateMatchmakingConfiguration Operation + public virtual CreateMatchmakingConfigurationResponse CreateMatchmakingConfiguration(CreateMatchmakingConfigurationRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = CreateMatchmakingConfigurationRequestMarshaller.Instance; + options.ResponseUnmarshaller = CreateMatchmakingConfigurationResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// Defines a new matchmaking configuration for use with FlexMatch. Whether your are using + /// FlexMatch with Amazon GameLift hosting or as a standalone matchmaking service, the + /// matchmaking configuration sets out rules for matching players and forming teams. If + /// you're also using Amazon GameLift hosting, it defines how to start game sessions for + /// each match. Your matchmaking system can use multiple configurations to handle different + /// game scenarios. All matchmaking requests identify the matchmaking configuration to + /// use and provide player attributes consistent with that configuration. + /// + /// + /// + /// To create a matchmaking configuration, you must provide the following: configuration + /// name and FlexMatch mode (with or without Amazon GameLift hosting); a rule set that + /// specifies how to evaluate players and find acceptable matches; whether player acceptance + /// is required; and the maximum time allowed for a matchmaking attempt. When using FlexMatch + /// with Amazon GameLift hosting, you also need to identify the game session queue to + /// use when starting a game session for the match. + /// + /// + /// + /// In addition, you must set up an Amazon Simple Notification Service topic to receive + /// matchmaking notifications. Provide the topic ARN in the matchmaking configuration. + /// + /// + /// + /// Learn more + /// + /// + /// + /// + /// Design a FlexMatch matchmaker + /// + /// + /// + /// + /// Set up FlexMatch event notification + /// + /// + /// Container for the necessary parameters to execute the CreateMatchmakingConfiguration service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the CreateMatchmakingConfiguration service method, as returned by GameLift. + /// + /// The service encountered an unrecoverable internal failure while processing the request. + /// Clients can retry such requests immediately or after a waiting period. + /// + /// + /// One or more parameter values in the request are invalid. Correct the invalid parameter + /// values before retrying. + /// + /// + /// The requested operation would cause the resource to exceed the allowed service limit. + /// Resolve the issue before retrying. + /// + /// + /// The requested resources was not found. The resource was either not created yet or + /// deleted. + /// + /// + /// The requested tagging operation did not succeed. This may be due to invalid tag format + /// or the maximum tag limit may have been exceeded. Resolve the issue before retrying. /// /// /// The requested operation is not supported in the Region specified. /// - /// REST API Reference for CreateFleetLocations Operation - public virtual Task CreateFleetLocationsAsync(CreateFleetLocationsRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + /// REST API Reference for CreateMatchmakingConfiguration Operation + public virtual Task CreateMatchmakingConfigurationAsync(CreateMatchmakingConfigurationRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { var options = new InvokeOptions(); - options.RequestMarshaller = CreateFleetLocationsRequestMarshaller.Instance; - options.ResponseUnmarshaller = CreateFleetLocationsResponseUnmarshaller.Instance; + options.RequestMarshaller = CreateMatchmakingConfigurationRequestMarshaller.Instance; + options.ResponseUnmarshaller = CreateMatchmakingConfigurationResponseUnmarshaller.Instance; - return InvokeAsync(request, options, cancellationToken); + return InvokeAsync(request, options, cancellationToken); } #endregion - #region CreateGameServerGroup + #region CreateMatchmakingRuleSet /// - /// This operation is used with the Amazon GameLift FleetIQ solution and game server - /// groups. + /// Creates a new rule set for FlexMatch matchmaking. A rule set describes the type of + /// match to create, such as the number and size of teams. It also sets the parameters + /// for acceptable player matches, such as minimum skill level or character type. /// /// /// - /// Creates a Amazon GameLift FleetIQ game server group for managing game hosting on a - /// collection of Amazon Elastic Compute Cloud instances for game hosting. This operation - /// creates the game server group, creates an Auto Scaling group in your Amazon Web Services - /// account, and establishes a link between the two groups. You can view the status of - /// your game server groups in the Amazon GameLift console. Game server group metrics - /// and events are emitted to Amazon CloudWatch. + /// To create a matchmaking rule set, provide unique rule set name and the rule set body + /// in JSON format. Rule sets must be defined in the same Region as the matchmaking configuration + /// they are used with. /// /// /// - /// Before creating a new game server group, you must have the following: - /// - ///
    • - /// - /// An Amazon Elastic Compute Cloud launch template that specifies how to launch Amazon - /// Elastic Compute Cloud instances with your game server build. For more information, - /// see - /// Launching an Instance from a Launch Template in the Amazon Elastic Compute - /// Cloud User Guide. - /// - ///
    • - /// - /// An IAM role that extends limited access to your Amazon Web Services account to allow - /// Amazon GameLift FleetIQ to create and interact with the Auto Scaling group. For more - /// information, see Create - /// IAM roles for cross-service interaction in the Amazon GameLift FleetIQ Developer - /// Guide. + /// Since matchmaking rule sets cannot be edited, it is a good idea to check the rule + /// set syntax using ValidateMatchmakingRuleSet + /// before creating a new rule set. /// - ///
    + /// /// - /// To create a new game server group, specify a unique group name, IAM role and Amazon - /// Elastic Compute Cloud launch template, and provide a list of instance types that can - /// be used in the group. You must also set initial maximum and minimum limits on the - /// group's instance count. You can optionally set an Auto Scaling policy with target - /// tracking based on a Amazon GameLift FleetIQ metric. + /// Learn more /// - /// + ///
    • /// - /// Once the game server group and corresponding Auto Scaling group are created, you have - /// full access to change the Auto Scaling group's configuration as needed. Several properties - /// that are set when creating a game server group, including maximum/minimum size and - /// auto-scaling policy settings, must be updated directly in the Auto Scaling group. - /// Keep in mind that some Auto Scaling group properties are periodically updated by Amazon - /// GameLift FleetIQ as part of its balancing activities to optimize for availability - /// and cost. + /// Build + /// a rule set /// - /// + ///
    • /// - /// Learn more + /// Design + /// a matchmaker /// - /// + ///
    • /// - /// Amazon - /// GameLift FleetIQ Guide + /// Matchmaking + /// with FlexMatch /// + ///
    ///     - /// Container for the necessary parameters to execute the CreateGameServerGroup service method. + /// Container for the necessary parameters to execute the CreateMatchmakingRuleSet service method. /// - /// The response from the CreateGameServerGroup service method, as returned by GameLift. - /// - /// The requested operation would cause a conflict with the current state of a service - /// resource associated with the request. Resolve the conflict before retrying this request. - /// + /// The response from the CreateMatchmakingRuleSet service method, as returned by GameLift. /// /// The service encountered an unrecoverable internal failure while processing the request. /// Clients can retry such requests immediately or after a waiting period. @@ -2021,91 +3232,68 @@ public virtual CreateFleetLocationsResponse CreateFleetLocations(CreateFleetLoca /// The requested operation would cause the resource to exceed the allowed service limit. /// Resolve the issue before retrying. /// - /// - /// The client failed authentication. Clients should not retry such requests. + /// + /// The requested tagging operation did not succeed. This may be due to invalid tag format + /// or the maximum tag limit may have been exceeded. Resolve the issue before retrying. /// - /// REST API Reference for CreateGameServerGroup Operation - public virtual CreateGameServerGroupResponse CreateGameServerGroup(CreateGameServerGroupRequest request) + /// + /// The requested operation is not supported in the Region specified. + /// + /// REST API Reference for CreateMatchmakingRuleSet Operation + public virtual CreateMatchmakingRuleSetResponse CreateMatchmakingRuleSet(CreateMatchmakingRuleSetRequest request) { var options = new InvokeOptions(); - options.RequestMarshaller = CreateGameServerGroupRequestMarshaller.Instance; - options.ResponseUnmarshaller = CreateGameServerGroupResponseUnmarshaller.Instance; + options.RequestMarshaller = CreateMatchmakingRuleSetRequestMarshaller.Instance; + options.ResponseUnmarshaller = CreateMatchmakingRuleSetResponseUnmarshaller.Instance; - return Invoke(request, options); + return Invoke(request, options); } /// - /// This operation is used with the Amazon GameLift FleetIQ solution and game server - /// groups. + /// Creates a new rule set for FlexMatch matchmaking. A rule set describes the type of + /// match to create, such as the number and size of teams. It also sets the parameters + /// for acceptable player matches, such as minimum skill level or character type. /// /// /// - /// Creates a Amazon GameLift FleetIQ game server group for managing game hosting on a - /// collection of Amazon Elastic Compute Cloud instances for game hosting. This operation - /// creates the game server group, creates an Auto Scaling group in your Amazon Web Services - /// account, and establishes a link between the two groups. You can view the status of - /// your game server groups in the Amazon GameLift console. Game server group metrics - /// and events are emitted to Amazon CloudWatch. + /// To create a matchmaking rule set, provide unique rule set name and the rule set body + /// in JSON format. Rule sets must be defined in the same Region as the matchmaking configuration + /// they are used with. /// /// /// - /// Before creating a new game server group, you must have the following: - /// - ///
    • - /// - /// An Amazon Elastic Compute Cloud launch template that specifies how to launch Amazon - /// Elastic Compute Cloud instances with your game server build. For more information, - /// see - /// Launching an Instance from a Launch Template in the Amazon Elastic Compute - /// Cloud User Guide. - /// - ///
    • - /// - /// An IAM role that extends limited access to your Amazon Web Services account to allow - /// Amazon GameLift FleetIQ to create and interact with the Auto Scaling group. For more - /// information, see Create - /// IAM roles for cross-service interaction in the Amazon GameLift FleetIQ Developer - /// Guide. + /// Since matchmaking rule sets cannot be edited, it is a good idea to check the rule + /// set syntax using ValidateMatchmakingRuleSet + /// before creating a new rule set. /// - ///
    + /// /// - /// To create a new game server group, specify a unique group name, IAM role and Amazon - /// Elastic Compute Cloud launch template, and provide a list of instance types that can - /// be used in the group. You must also set initial maximum and minimum limits on the - /// group's instance count. You can optionally set an Auto Scaling policy with target - /// tracking based on a Amazon GameLift FleetIQ metric. + /// Learn more /// - /// + ///
    • /// - /// Once the game server group and corresponding Auto Scaling group are created, you have - /// full access to change the Auto Scaling group's configuration as needed. Several properties - /// that are set when creating a game server group, including maximum/minimum size and - /// auto-scaling policy settings, must be updated directly in the Auto Scaling group. - /// Keep in mind that some Auto Scaling group properties are periodically updated by Amazon - /// GameLift FleetIQ as part of its balancing activities to optimize for availability - /// and cost. + /// Build + /// a rule set /// - /// + ///
    • /// - /// Learn more + /// Design + /// a matchmaker /// - /// + ///
    • /// - /// Amazon - /// GameLift FleetIQ Guide + /// Matchmaking + /// with FlexMatch /// + ///
    ///     - /// Container for the necessary parameters to execute the CreateGameServerGroup service method. + /// Container for the necessary parameters to execute the CreateMatchmakingRuleSet service method. /// /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// /// - /// The response from the CreateGameServerGroup service method, as returned by GameLift. - /// - /// The requested operation would cause a conflict with the current state of a service - /// resource associated with the request. Resolve the conflict before retrying this request. - /// + /// The response from the CreateMatchmakingRuleSet service method, as returned by GameLift. /// /// The service encountered an unrecoverable internal failure while processing the request. /// Clients can retry such requests immediately or after a waiting period. @@ -2118,83 +3306,55 @@ public virtual CreateGameServerGroupResponse CreateGameServerGroup(CreateGameSer /// The requested operation would cause the resource to exceed the allowed service limit. /// Resolve the issue before retrying. /// - /// - /// The client failed authentication. Clients should not retry such requests. + /// + /// The requested tagging operation did not succeed. This may be due to invalid tag format + /// or the maximum tag limit may have been exceeded. Resolve the issue before retrying. /// - /// REST API Reference for CreateGameServerGroup Operation - public virtual Task CreateGameServerGroupAsync(CreateGameServerGroupRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + /// + /// The requested operation is not supported in the Region specified. + /// + /// REST API Reference for CreateMatchmakingRuleSet Operation + public virtual Task CreateMatchmakingRuleSetAsync(CreateMatchmakingRuleSetRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { var options = new InvokeOptions(); - options.RequestMarshaller = CreateGameServerGroupRequestMarshaller.Instance; - options.ResponseUnmarshaller = CreateGameServerGroupResponseUnmarshaller.Instance; + options.RequestMarshaller = CreateMatchmakingRuleSetRequestMarshaller.Instance; + options.ResponseUnmarshaller = CreateMatchmakingRuleSetResponseUnmarshaller.Instance; - return InvokeAsync(request, options, cancellationToken); + return InvokeAsync(request, options, cancellationToken); } #endregion - #region CreateGameSession + #region CreatePlayerSession /// - /// Creates a multiplayer game session for players in a specific fleet location. This - /// operation prompts an available server process to start a game session and retrieves - /// connection information for the new game session. As an alternative, consider using - /// the Amazon GameLift game session placement feature with StartGameSessionPlacement - /// , which uses the FleetIQ algorithm and queues to optimize the placement process. + /// Reserves an open player slot in a game session for a player. New player sessions can + /// be created in any game session with an open slot that is in ACTIVE status and + /// has a player creation policy of ACCEPT_ALL. You can add a group of players + /// to a game session with CreatePlayerSessions + /// . /// /// /// - /// When creating a game session, you specify exactly where you want to place it and provide - /// a set of game session configuration settings. The target fleet must be in ACTIVE - /// status. - /// - /// - /// - /// You can use this operation in the following ways: - /// - ///
    • - /// - /// To create a game session on an instance in a fleet's home Region, provide a fleet - /// or alias ID along with your game session configuration. - /// - ///
    • - /// - /// To create a game session on an instance in a fleet's remote location, provide a fleet - /// or alias ID and a location name, along with your game session configuration. - /// - ///
    • - /// - /// To create a game session on an instance in an Anywhere fleet, specify the fleet's - /// custom location. - /// - ///
    - /// - /// If successful, Amazon GameLift initiates a workflow to start a new game session and - /// returns a GameSession object containing the game session configuration and - /// status. When the game session status is ACTIVE, it is updated with connection - /// information and you can create player sessions for the game session. By default, newly - /// created game sessions are open to new players. You can restrict new player access - /// by using UpdateGameSession - /// to change the game session's player session creation policy. - /// - /// - /// - /// Amazon GameLift retains logs for active for 14 days. To access the logs, call GetGameSessionLogUrl - /// to download the log files. + /// To create a player session, specify a game session ID, player ID, and optionally a + /// set of player data. /// /// /// - /// Available in Amazon GameLift Local. + /// If successful, a slot is reserved in the game session for the player and a new PlayerSessions + /// object is returned with a player session ID. The player references the player session + /// ID when sending a connection request to the game session, and the game server can + /// use it to validate the player reservation with the Amazon GameLift service. Player + /// sessions cannot be updated. /// /// /// - /// Learn more + /// The maximum number of players per game session is 200. It is not adjustable. /// /// /// - /// Start - /// a game session + /// Related actions /// /// /// @@ -2202,37 +3362,27 @@ public virtual CreateGameServerGroupResponse CreateGameServerGroup(CreateGameSer /// APIs by task /// ///     - /// Container for the necessary parameters to execute the CreateGameSession service method. + /// A unique identifier for the game session to add a player to. + /// A unique identifier for a player. Player IDs are developer-defined. /// - /// The response from the CreateGameSession service method, as returned by GameLift. - /// - /// The requested operation would cause a conflict with the current state of a service - /// resource associated with the request. Resolve the conflict before retrying this request. - /// - /// - /// The specified fleet has no available instances to fulfill a CreateGameSession - /// request. Clients can retry such requests immediately or after a waiting period. - /// - /// - /// A game session with this custom ID string already exists in this fleet. Resolve this - /// conflict before retrying this request. + /// The response from the CreatePlayerSession service method, as returned by GameLift. + /// + /// The game instance is currently full and cannot allow the requested player(s) to join. + /// Clients can retry such requests immediately or after a waiting period. /// /// /// The service encountered an unrecoverable internal failure while processing the request. /// Clients can retry such requests immediately or after a waiting period. /// - /// + /// /// The requested operation would cause a conflict with the current state of a resource - /// associated with the request and/or the fleet. Resolve the conflict before retrying. + /// associated with the request and/or the game instance. Resolve the conflict before + /// retrying. /// /// /// One or more parameter values in the request are invalid. Correct the invalid parameter /// values before retrying. /// - /// - /// The requested operation would cause the resource to exceed the allowed service limit. - /// Resolve the issue before retrying. - /// /// /// The requested resources was not found. The resource was either not created yet or /// deleted. @@ -2246,79 +3396,43 @@ public virtual CreateGameServerGroupResponse CreateGameServerGroup(CreateGameSer /// /// The client failed authentication. Clients should not retry such requests. /// - /// - /// The requested operation is not supported in the Region specified. - /// - /// REST API Reference for CreateGameSession Operation - public virtual CreateGameSessionResponse CreateGameSession(CreateGameSessionRequest request) + /// REST API Reference for CreatePlayerSession Operation + public virtual CreatePlayerSessionResponse CreatePlayerSession(string gameSessionId, string playerId) { - var options = new InvokeOptions(); - options.RequestMarshaller = CreateGameSessionRequestMarshaller.Instance; - options.ResponseUnmarshaller = CreateGameSessionResponseUnmarshaller.Instance; - - return Invoke(request, options); + var request = new CreatePlayerSessionRequest(); + request.GameSessionId = gameSessionId; + request.PlayerId = playerId; + return CreatePlayerSession(request); } /// - /// Creates a multiplayer game session for players in a specific fleet location. This - /// operation prompts an available server process to start a game session and retrieves - /// connection information for the new game session. As an alternative, consider using - /// the Amazon GameLift game session placement feature with StartGameSessionPlacement - /// , which uses the FleetIQ algorithm and queues to optimize the placement process. + /// Reserves an open player slot in a game session for a player. New player sessions can + /// be created in any game session with an open slot that is in ACTIVE status and + /// has a player creation policy of ACCEPT_ALL. You can add a group of players + /// to a game session with CreatePlayerSessions + /// . /// /// /// - /// When creating a game session, you specify exactly where you want to place it and provide - /// a set of game session configuration settings. The target fleet must be in ACTIVE - /// status. - /// - /// - /// - /// You can use this operation in the following ways: - /// - ///
    • - /// - /// To create a game session on an instance in a fleet's home Region, provide a fleet - /// or alias ID along with your game session configuration. - /// - ///
    • - /// - /// To create a game session on an instance in a fleet's remote location, provide a fleet - /// or alias ID and a location name, along with your game session configuration. - /// - ///
    • - /// - /// To create a game session on an instance in an Anywhere fleet, specify the fleet's - /// custom location. - /// - ///
    - /// - /// If successful, Amazon GameLift initiates a workflow to start a new game session and - /// returns a GameSession object containing the game session configuration and - /// status. When the game session status is ACTIVE, it is updated with connection - /// information and you can create player sessions for the game session. By default, newly - /// created game sessions are open to new players. You can restrict new player access - /// by using UpdateGameSession - /// to change the game session's player session creation policy. - /// - /// - /// - /// Amazon GameLift retains logs for active for 14 days. To access the logs, call GetGameSessionLogUrl - /// to download the log files. + /// To create a player session, specify a game session ID, player ID, and optionally a + /// set of player data. /// /// /// - /// Available in Amazon GameLift Local. + /// If successful, a slot is reserved in the game session for the player and a new PlayerSessions + /// object is returned with a player session ID. The player references the player session + /// ID when sending a connection request to the game session, and the game server can + /// use it to validate the player reservation with the Amazon GameLift service. Player + /// sessions cannot be updated. /// /// /// - /// Learn more + /// The maximum number of players per game session is 200. It is not adjustable. /// /// /// - /// Start - /// a game session + /// Related actions /// /// /// @@ -2326,40 +3440,26 @@ public virtual CreateGameSessionResponse CreateGameSession(CreateGameSessionRequ /// APIs by task /// ///     - /// Container for the necessary parameters to execute the CreateGameSession service method. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// + /// Container for the necessary parameters to execute the CreatePlayerSession service method. /// - /// The response from the CreateGameSession service method, as returned by GameLift. - /// - /// The requested operation would cause a conflict with the current state of a service - /// resource associated with the request. Resolve the conflict before retrying this request. - /// - /// - /// The specified fleet has no available instances to fulfill a CreateGameSession - /// request. Clients can retry such requests immediately or after a waiting period. - /// - /// - /// A game session with this custom ID string already exists in this fleet. Resolve this - /// conflict before retrying this request. + /// The response from the CreatePlayerSession service method, as returned by GameLift. + /// + /// The game instance is currently full and cannot allow the requested player(s) to join. + /// Clients can retry such requests immediately or after a waiting period. /// /// /// The service encountered an unrecoverable internal failure while processing the request. /// Clients can retry such requests immediately or after a waiting period. /// - /// + /// /// The requested operation would cause a conflict with the current state of a resource - /// associated with the request and/or the fleet. Resolve the conflict before retrying. + /// associated with the request and/or the game instance. Resolve the conflict before + /// retrying. /// /// /// One or more parameter values in the request are invalid. Correct the invalid parameter /// values before retrying. /// - /// - /// The requested operation would cause the resource to exceed the allowed service limit. - /// Resolve the issue before retrying. - /// /// /// The requested resources was not found. The resource was either not created yet or /// deleted. @@ -2373,75 +3473,121 @@ public virtual CreateGameSessionResponse CreateGameSession(CreateGameSessionRequ /// /// The client failed authentication. Clients should not retry such requests. /// - /// - /// The requested operation is not supported in the Region specified. - /// - /// REST API Reference for CreateGameSession Operation - public virtual Task CreateGameSessionAsync(CreateGameSessionRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + /// REST API Reference for CreatePlayerSession Operation + public virtual CreatePlayerSessionResponse CreatePlayerSession(CreatePlayerSessionRequest request) { var options = new InvokeOptions(); - options.RequestMarshaller = CreateGameSessionRequestMarshaller.Instance; - options.ResponseUnmarshaller = CreateGameSessionResponseUnmarshaller.Instance; - - return InvokeAsync(request, options, cancellationToken); - } + options.RequestMarshaller = CreatePlayerSessionRequestMarshaller.Instance; + options.ResponseUnmarshaller = CreatePlayerSessionResponseUnmarshaller.Instance; - #endregion - - #region CreateGameSessionQueue + return Invoke(request, options); + } /// - /// Creates a placement queue that processes requests for new game sessions. A queue uses - /// FleetIQ algorithms to determine the best placement locations and find an available - /// game server there, then prompts the game server process to start a new game session. - /// + /// Reserves an open player slot in a game session for a player. New player sessions can + /// be created in any game session with an open slot that is in ACTIVE status and + /// has a player creation policy of ACCEPT_ALL. You can add a group of players + /// to a game session with CreatePlayerSessions + /// . /// /// /// - /// A game session queue is configured with a set of destinations (Amazon GameLift fleets - /// or aliases), which determine the locations where the queue can place new game sessions. - /// These destinations can span multiple fleet types (Spot and On-Demand), instance types, - /// and Amazon Web Services Regions. If the queue includes multi-location fleets, the - /// queue is able to place game sessions in all of a fleet's remote locations. You can - /// opt to filter out individual locations if needed. + /// To create a player session, specify a game session ID, player ID, and optionally a + /// set of player data. /// /// /// - /// The queue configuration also determines how FleetIQ selects the best available placement - /// for a new game session. Before searching for an available game server, FleetIQ first - /// prioritizes the queue's destinations and locations, with the best placement locations - /// on top. You can set up the queue to use the FleetIQ default prioritization or provide - /// an alternate set of priorities. + /// If successful, a slot is reserved in the game session for the player and a new PlayerSessions + /// object is returned with a player session ID. The player references the player session + /// ID when sending a connection request to the game session, and the game server can + /// use it to validate the player reservation with the Amazon GameLift service. Player + /// sessions cannot be updated. /// /// /// - /// To create a new queue, provide a name, timeout value, and a list of destinations. - /// Optionally, specify a sort configuration and/or a filter, and define a set of latency - /// cap policies. You can also include the ARN for an Amazon Simple Notification Service - /// (SNS) topic to receive notifications of game session placement activity. Notifications - /// using SNS or CloudWatch events is the preferred way to track placement activity. + /// The maximum number of players per game session is 200. It is not adjustable. /// /// /// - /// If successful, a new GameSessionQueue object is returned with an assigned queue - /// ARN. New game session requests, which are submitted to queue with StartGameSessionPlacement - /// or StartMatchmaking, - /// reference a queue's name or ARN. + /// Related actions + /// + /// + /// + /// All + /// APIs by task /// + /// + /// A unique identifier for the game session to add a player to. + /// A unique identifier for a player. Player IDs are developer-defined. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the CreatePlayerSession service method, as returned by GameLift. + /// + /// The game instance is currently full and cannot allow the requested player(s) to join. + /// Clients can retry such requests immediately or after a waiting period. + /// + /// + /// The service encountered an unrecoverable internal failure while processing the request. + /// Clients can retry such requests immediately or after a waiting period. + /// + /// + /// The requested operation would cause a conflict with the current state of a resource + /// associated with the request and/or the game instance. Resolve the conflict before + /// retrying. + /// + /// + /// One or more parameter values in the request are invalid. Correct the invalid parameter + /// values before retrying. + /// + /// + /// The requested resources was not found. The resource was either not created yet or + /// deleted. + /// + /// + /// The service is unable to resolve the routing for a particular alias because it has + /// a terminal RoutingStrategy associated with it. The message returned in this + /// exception is the message defined in the routing strategy itself. Such requests should + /// only be retried if the routing strategy for the specified alias is modified. + /// + /// + /// The client failed authentication. Clients should not retry such requests. + /// + /// REST API Reference for CreatePlayerSession Operation + public virtual Task CreatePlayerSessionAsync(string gameSessionId, string playerId, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var request = new CreatePlayerSessionRequest(); + request.GameSessionId = gameSessionId; + request.PlayerId = playerId; + return CreatePlayerSessionAsync(request, cancellationToken); + } + + + /// + /// Reserves an open player slot in a game session for a player. New player sessions can + /// be created in any game session with an open slot that is in ACTIVE status and + /// has a player creation policy of ACCEPT_ALL. You can add a group of players + /// to a game session with CreatePlayerSessions + /// . + /// /// /// - /// Learn more + /// To create a player session, specify a game session ID, player ID, and optionally a + /// set of player data. /// /// /// - /// - /// Design a game session queue + /// If successful, a slot is reserved in the game session for the player and a new PlayerSessions + /// object is returned with a player session ID. The player references the player session + /// ID when sending a connection request to the game session, and the game server can + /// use it to validate the player reservation with the Amazon GameLift service. Player + /// sessions cannot be updated. /// /// /// - /// - /// Create a game session queue + /// The maximum number of players per game session is 200. It is not adjustable. /// /// /// @@ -2449,102 +3595,84 @@ public virtual CreateGameSessionResponse CreateGameSession(CreateGameSessionRequ /// /// /// - /// CreateGameSessionQueue - /// | DescribeGameSessionQueues - /// | UpdateGameSessionQueue - /// | DeleteGameSessionQueue - /// | All + /// All /// APIs by task /// /// - /// Container for the necessary parameters to execute the CreateGameSessionQueue service method. + /// Container for the necessary parameters to execute the CreatePlayerSession service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// /// - /// The response from the CreateGameSessionQueue service method, as returned by GameLift. + /// The response from the CreatePlayerSession service method, as returned by GameLift. + /// + /// The game instance is currently full and cannot allow the requested player(s) to join. + /// Clients can retry such requests immediately or after a waiting period. + /// /// /// The service encountered an unrecoverable internal failure while processing the request. /// Clients can retry such requests immediately or after a waiting period. /// + /// + /// The requested operation would cause a conflict with the current state of a resource + /// associated with the request and/or the game instance. Resolve the conflict before + /// retrying. + /// /// /// One or more parameter values in the request are invalid. Correct the invalid parameter /// values before retrying. /// - /// - /// The requested operation would cause the resource to exceed the allowed service limit. - /// Resolve the issue before retrying. - /// /// /// The requested resources was not found. The resource was either not created yet or /// deleted. /// - /// - /// The requested tagging operation did not succeed. This may be due to invalid tag format - /// or the maximum tag limit may have been exceeded. Resolve the issue before retrying. + /// + /// The service is unable to resolve the routing for a particular alias because it has + /// a terminal RoutingStrategy associated with it. The message returned in this + /// exception is the message defined in the routing strategy itself. Such requests should + /// only be retried if the routing strategy for the specified alias is modified. /// /// /// The client failed authentication. Clients should not retry such requests. /// - /// REST API Reference for CreateGameSessionQueue Operation - public virtual CreateGameSessionQueueResponse CreateGameSessionQueue(CreateGameSessionQueueRequest request) + /// REST API Reference for CreatePlayerSession Operation + public virtual Task CreatePlayerSessionAsync(CreatePlayerSessionRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { var options = new InvokeOptions(); - options.RequestMarshaller = CreateGameSessionQueueRequestMarshaller.Instance; - options.ResponseUnmarshaller = CreateGameSessionQueueResponseUnmarshaller.Instance; - - return Invoke(request, options); + options.RequestMarshaller = CreatePlayerSessionRequestMarshaller.Instance; + options.ResponseUnmarshaller = CreatePlayerSessionResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); } + #endregion + + #region CreatePlayerSessions + /// - /// Creates a placement queue that processes requests for new game sessions. A queue uses - /// FleetIQ algorithms to determine the best placement locations and find an available - /// game server there, then prompts the game server process to start a new game session. + /// Reserves open slots in a game session for a group of players. New player sessions + /// can be created in any game session with an open slot that is in ACTIVE status + /// and has a player creation policy of ACCEPT_ALL. To add a single player to a + /// game session, use CreatePlayerSession /// /// /// /// - /// A game session queue is configured with a set of destinations (Amazon GameLift fleets - /// or aliases), which determine the locations where the queue can place new game sessions. - /// These destinations can span multiple fleet types (Spot and On-Demand), instance types, - /// and Amazon Web Services Regions. If the queue includes multi-location fleets, the - /// queue is able to place game sessions in all of a fleet's remote locations. You can - /// opt to filter out individual locations if needed. - /// - /// - /// - /// The queue configuration also determines how FleetIQ selects the best available placement - /// for a new game session. Before searching for an available game server, FleetIQ first - /// prioritizes the queue's destinations and locations, with the best placement locations - /// on top. You can set up the queue to use the FleetIQ default prioritization or provide - /// an alternate set of priorities. - /// - /// - /// - /// To create a new queue, provide a name, timeout value, and a list of destinations. - /// Optionally, specify a sort configuration and/or a filter, and define a set of latency - /// cap policies. You can also include the ARN for an Amazon Simple Notification Service - /// (SNS) topic to receive notifications of game session placement activity. Notifications - /// using SNS or CloudWatch events is the preferred way to track placement activity. - /// - /// - /// - /// If successful, a new GameSessionQueue object is returned with an assigned queue - /// ARN. New game session requests, which are submitted to queue with StartGameSessionPlacement - /// or StartMatchmaking, - /// reference a queue's name or ARN. - /// - /// - /// - /// Learn more + /// To create player sessions, specify a game session ID and a list of player IDs. Optionally, + /// provide a set of player data for each player ID. /// /// /// - /// - /// Design a game session queue + /// If successful, a slot is reserved in the game session for each player, and new PlayerSession + /// objects are returned with player session IDs. Each player references their player + /// session ID when sending a connection request to the game session, and the game server + /// can use it to validate the player reservation with the Amazon GameLift service. Player + /// sessions cannot be updated. /// /// /// - /// - /// Create a game session queue + /// The maximum number of players per game session is 200. It is not adjustable. /// /// /// @@ -2552,242 +3680,325 @@ public virtual CreateGameSessionQueueResponse CreateGameSessionQueue(CreateGameS /// /// /// - /// CreateGameSessionQueue - /// | DescribeGameSessionQueues - /// | UpdateGameSessionQueue - /// | DeleteGameSessionQueue - /// | All + /// All /// APIs by task /// /// - /// Container for the necessary parameters to execute the CreateGameSessionQueue service method. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// + /// A unique identifier for the game session to add players to. + /// List of unique identifiers for the players to be added. /// - /// The response from the CreateGameSessionQueue service method, as returned by GameLift. + /// The response from the CreatePlayerSessions service method, as returned by GameLift. + /// + /// The game instance is currently full and cannot allow the requested player(s) to join. + /// Clients can retry such requests immediately or after a waiting period. + /// /// /// The service encountered an unrecoverable internal failure while processing the request. /// Clients can retry such requests immediately or after a waiting period. /// + /// + /// The requested operation would cause a conflict with the current state of a resource + /// associated with the request and/or the game instance. Resolve the conflict before + /// retrying. + /// /// /// One or more parameter values in the request are invalid. Correct the invalid parameter /// values before retrying. /// - /// - /// The requested operation would cause the resource to exceed the allowed service limit. - /// Resolve the issue before retrying. - /// /// /// The requested resources was not found. The resource was either not created yet or /// deleted. /// - /// - /// The requested tagging operation did not succeed. This may be due to invalid tag format - /// or the maximum tag limit may have been exceeded. Resolve the issue before retrying. + /// + /// The service is unable to resolve the routing for a particular alias because it has + /// a terminal RoutingStrategy associated with it. The message returned in this + /// exception is the message defined in the routing strategy itself. Such requests should + /// only be retried if the routing strategy for the specified alias is modified. /// /// /// The client failed authentication. Clients should not retry such requests. /// - /// REST API Reference for CreateGameSessionQueue Operation - public virtual Task CreateGameSessionQueueAsync(CreateGameSessionQueueRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + /// REST API Reference for CreatePlayerSessions Operation + public virtual CreatePlayerSessionsResponse CreatePlayerSessions(string gameSessionId, List playerIds) { - var options = new InvokeOptions(); - options.RequestMarshaller = CreateGameSessionQueueRequestMarshaller.Instance; - options.ResponseUnmarshaller = CreateGameSessionQueueResponseUnmarshaller.Instance; - - return InvokeAsync(request, options, cancellationToken); + var request = new CreatePlayerSessionsRequest(); + request.GameSessionId = gameSessionId; + request.PlayerIds = playerIds; + return CreatePlayerSessions(request); } - #endregion - - #region CreateLocation - /// - /// Creates a custom location for use in an Anywhere fleet. + /// Reserves open slots in a game session for a group of players. New player sessions + /// can be created in any game session with an open slot that is in ACTIVE status + /// and has a player creation policy of ACCEPT_ALL. To add a single player to a + /// game session, use CreatePlayerSession + /// + /// + /// + /// + /// To create player sessions, specify a game session ID and a list of player IDs. Optionally, + /// provide a set of player data for each player ID. + /// + /// + /// + /// If successful, a slot is reserved in the game session for each player, and new PlayerSession + /// objects are returned with player session IDs. Each player references their player + /// session ID when sending a connection request to the game session, and the game server + /// can use it to validate the player reservation with the Amazon GameLift service. Player + /// sessions cannot be updated. + /// + /// + /// + /// The maximum number of players per game session is 200. It is not adjustable. + /// + /// + /// + /// Related actions + /// + /// + /// + /// All + /// APIs by task + /// /// - /// Container for the necessary parameters to execute the CreateLocation service method. + /// Container for the necessary parameters to execute the CreatePlayerSessions service method. /// - /// The response from the CreateLocation service method, as returned by GameLift. - /// - /// The requested operation would cause a conflict with the current state of a service - /// resource associated with the request. Resolve the conflict before retrying this request. + /// The response from the CreatePlayerSessions service method, as returned by GameLift. + /// + /// The game instance is currently full and cannot allow the requested player(s) to join. + /// Clients can retry such requests immediately or after a waiting period. /// /// /// The service encountered an unrecoverable internal failure while processing the request. /// Clients can retry such requests immediately or after a waiting period. /// + /// + /// The requested operation would cause a conflict with the current state of a resource + /// associated with the request and/or the game instance. Resolve the conflict before + /// retrying. + /// /// /// One or more parameter values in the request are invalid. Correct the invalid parameter /// values before retrying. /// - /// - /// The requested operation would cause the resource to exceed the allowed service limit. - /// Resolve the issue before retrying. + /// + /// The requested resources was not found. The resource was either not created yet or + /// deleted. /// - /// - /// The requested tagging operation did not succeed. This may be due to invalid tag format - /// or the maximum tag limit may have been exceeded. Resolve the issue before retrying. + /// + /// The service is unable to resolve the routing for a particular alias because it has + /// a terminal RoutingStrategy associated with it. The message returned in this + /// exception is the message defined in the routing strategy itself. Such requests should + /// only be retried if the routing strategy for the specified alias is modified. /// /// /// The client failed authentication. Clients should not retry such requests. /// - /// REST API Reference for CreateLocation Operation - public virtual CreateLocationResponse CreateLocation(CreateLocationRequest request) + /// REST API Reference for CreatePlayerSessions Operation + public virtual CreatePlayerSessionsResponse CreatePlayerSessions(CreatePlayerSessionsRequest request) { var options = new InvokeOptions(); - options.RequestMarshaller = CreateLocationRequestMarshaller.Instance; - options.ResponseUnmarshaller = CreateLocationResponseUnmarshaller.Instance; + options.RequestMarshaller = CreatePlayerSessionsRequestMarshaller.Instance; + options.ResponseUnmarshaller = CreatePlayerSessionsResponseUnmarshaller.Instance; - return Invoke(request, options); + return Invoke(request, options); } /// - /// Creates a custom location for use in an Anywhere fleet. + /// Reserves open slots in a game session for a group of players. New player sessions + /// can be created in any game session with an open slot that is in ACTIVE status + /// and has a player creation policy of ACCEPT_ALL. To add a single player to a + /// game session, use CreatePlayerSession + /// + /// + /// + /// + /// To create player sessions, specify a game session ID and a list of player IDs. Optionally, + /// provide a set of player data for each player ID. + /// + /// + /// + /// If successful, a slot is reserved in the game session for each player, and new PlayerSession + /// objects are returned with player session IDs. Each player references their player + /// session ID when sending a connection request to the game session, and the game server + /// can use it to validate the player reservation with the Amazon GameLift service. Player + /// sessions cannot be updated. + /// + /// + /// + /// The maximum number of players per game session is 200. It is not adjustable. + /// + /// + /// + /// Related actions + /// + /// + /// + /// All + /// APIs by task + /// /// - /// Container for the necessary parameters to execute the CreateLocation service method. + /// A unique identifier for the game session to add players to. + /// List of unique identifiers for the players to be added. /// /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// /// - /// The response from the CreateLocation service method, as returned by GameLift. - /// - /// The requested operation would cause a conflict with the current state of a service - /// resource associated with the request. Resolve the conflict before retrying this request. + /// The response from the CreatePlayerSessions service method, as returned by GameLift. + /// + /// The game instance is currently full and cannot allow the requested player(s) to join. + /// Clients can retry such requests immediately or after a waiting period. /// /// /// The service encountered an unrecoverable internal failure while processing the request. /// Clients can retry such requests immediately or after a waiting period. /// + /// + /// The requested operation would cause a conflict with the current state of a resource + /// associated with the request and/or the game instance. Resolve the conflict before + /// retrying. + /// /// /// One or more parameter values in the request are invalid. Correct the invalid parameter /// values before retrying. /// - /// - /// The requested operation would cause the resource to exceed the allowed service limit. - /// Resolve the issue before retrying. + /// + /// The requested resources was not found. The resource was either not created yet or + /// deleted. /// - /// - /// The requested tagging operation did not succeed. This may be due to invalid tag format - /// or the maximum tag limit may have been exceeded. Resolve the issue before retrying. + /// + /// The service is unable to resolve the routing for a particular alias because it has + /// a terminal RoutingStrategy associated with it. The message returned in this + /// exception is the message defined in the routing strategy itself. Such requests should + /// only be retried if the routing strategy for the specified alias is modified. /// /// /// The client failed authentication. Clients should not retry such requests. /// - /// REST API Reference for CreateLocation Operation - public virtual Task CreateLocationAsync(CreateLocationRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + /// REST API Reference for CreatePlayerSessions Operation + public virtual Task CreatePlayerSessionsAsync(string gameSessionId, List playerIds, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { - var options = new InvokeOptions(); - options.RequestMarshaller = CreateLocationRequestMarshaller.Instance; - options.ResponseUnmarshaller = CreateLocationResponseUnmarshaller.Instance; - - return InvokeAsync(request, options, cancellationToken); + var request = new CreatePlayerSessionsRequest(); + request.GameSessionId = gameSessionId; + request.PlayerIds = playerIds; + return CreatePlayerSessionsAsync(request, cancellationToken); } - #endregion - - #region CreateMatchmakingConfiguration - /// - /// Defines a new matchmaking configuration for use with FlexMatch. Whether your are using - /// FlexMatch with Amazon GameLift hosting or as a standalone matchmaking service, the - /// matchmaking configuration sets out rules for matching players and forming teams. If - /// you're also using Amazon GameLift hosting, it defines how to start game sessions for - /// each match. Your matchmaking system can use multiple configurations to handle different - /// game scenarios. All matchmaking requests identify the matchmaking configuration to - /// use and provide player attributes consistent with that configuration. + /// Reserves open slots in a game session for a group of players. New player sessions + /// can be created in any game session with an open slot that is in ACTIVE status + /// and has a player creation policy of ACCEPT_ALL. To add a single player to a + /// game session, use CreatePlayerSession + /// /// /// /// - /// To create a matchmaking configuration, you must provide the following: configuration - /// name and FlexMatch mode (with or without Amazon GameLift hosting); a rule set that - /// specifies how to evaluate players and find acceptable matches; whether player acceptance - /// is required; and the maximum time allowed for a matchmaking attempt. When using FlexMatch - /// with Amazon GameLift hosting, you also need to identify the game session queue to - /// use when starting a game session for the match. + /// To create player sessions, specify a game session ID and a list of player IDs. Optionally, + /// provide a set of player data for each player ID. /// /// /// - /// In addition, you must set up an Amazon Simple Notification Service topic to receive - /// matchmaking notifications. Provide the topic ARN in the matchmaking configuration. + /// If successful, a slot is reserved in the game session for each player, and new PlayerSession + /// objects are returned with player session IDs. Each player references their player + /// session ID when sending a connection request to the game session, and the game server + /// can use it to validate the player reservation with the Amazon GameLift service. Player + /// sessions cannot be updated. /// /// /// - /// Learn more + /// The maximum number of players per game session is 200. It is not adjustable. /// /// /// - /// - /// Design a FlexMatch matchmaker + /// Related actions /// /// /// - /// - /// Set up FlexMatch event notification + /// All + /// APIs by task /// /// - /// Container for the necessary parameters to execute the CreateMatchmakingConfiguration service method. + /// Container for the necessary parameters to execute the CreatePlayerSessions service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// /// - /// The response from the CreateMatchmakingConfiguration service method, as returned by GameLift. + /// The response from the CreatePlayerSessions service method, as returned by GameLift. + /// + /// The game instance is currently full and cannot allow the requested player(s) to join. + /// Clients can retry such requests immediately or after a waiting period. + /// /// /// The service encountered an unrecoverable internal failure while processing the request. /// Clients can retry such requests immediately or after a waiting period. /// + /// + /// The requested operation would cause a conflict with the current state of a resource + /// associated with the request and/or the game instance. Resolve the conflict before + /// retrying. + /// /// /// One or more parameter values in the request are invalid. Correct the invalid parameter /// values before retrying. /// - /// - /// The requested operation would cause the resource to exceed the allowed service limit. - /// Resolve the issue before retrying. - /// /// /// The requested resources was not found. The resource was either not created yet or /// deleted. /// - /// - /// The requested tagging operation did not succeed. This may be due to invalid tag format - /// or the maximum tag limit may have been exceeded. Resolve the issue before retrying. + /// + /// The service is unable to resolve the routing for a particular alias because it has + /// a terminal RoutingStrategy associated with it. The message returned in this + /// exception is the message defined in the routing strategy itself. Such requests should + /// only be retried if the routing strategy for the specified alias is modified. /// - /// - /// The requested operation is not supported in the Region specified. + /// + /// The client failed authentication. Clients should not retry such requests. /// - /// REST API Reference for CreateMatchmakingConfiguration Operation - public virtual CreateMatchmakingConfigurationResponse CreateMatchmakingConfiguration(CreateMatchmakingConfigurationRequest request) + /// REST API Reference for CreatePlayerSessions Operation + public virtual Task CreatePlayerSessionsAsync(CreatePlayerSessionsRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { var options = new InvokeOptions(); - options.RequestMarshaller = CreateMatchmakingConfigurationRequestMarshaller.Instance; - options.ResponseUnmarshaller = CreateMatchmakingConfigurationResponseUnmarshaller.Instance; - - return Invoke(request, options); + options.RequestMarshaller = CreatePlayerSessionsRequestMarshaller.Instance; + options.ResponseUnmarshaller = CreatePlayerSessionsResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); } + #endregion + + #region CreateScript + /// - /// Defines a new matchmaking configuration for use with FlexMatch. Whether your are using - /// FlexMatch with Amazon GameLift hosting or as a standalone matchmaking service, the - /// matchmaking configuration sets out rules for matching players and forming teams. If - /// you're also using Amazon GameLift hosting, it defines how to start game sessions for - /// each match. Your matchmaking system can use multiple configurations to handle different - /// game scenarios. All matchmaking requests identify the matchmaking configuration to - /// use and provide player attributes consistent with that configuration. + /// Creates a script resource for your Realtime Servers script. Realtime scripts are JavaScript + /// files that provide configuration settings and optional custom game logic for your + /// game. Script logic is executed during an active game session. To deploy Realtime Servers + /// for hosting, create an Amazon GameLift managed fleet with the script. /// /// /// - /// To create a matchmaking configuration, you must provide the following: configuration - /// name and FlexMatch mode (with or without Amazon GameLift hosting); a rule set that - /// specifies how to evaluate players and find acceptable matches; whether player acceptance - /// is required; and the maximum time allowed for a matchmaking attempt. When using FlexMatch - /// with Amazon GameLift hosting, you also need to identify the game session queue to - /// use when starting a game session for the match. + /// To create a script resource, specify a script name and provide the script file(s). + /// The script files and all dependencies must be combined into a single .zip file. You + /// can upload the .zip file from either of these locations: /// - /// + ///
    • /// - /// In addition, you must set up an Amazon Simple Notification Service topic to receive - /// matchmaking notifications. Provide the topic ARN in the matchmaking configuration. + /// A locally available directory. Use the ZipFile parameter for this option. + /// + ///
    • + /// + /// An Amazon Simple Storage Service (Amazon S3) bucket under your Amazon Web Services + /// account. Use the StorageLocation parameter for this option. You'll need to + /// have an Identity Access Management (IAM) role that allows the Amazon GameLift service + /// to access your S3 bucket. + /// + ///
    + /// + /// If the call is successful, Amazon GameLift creates a new script resource with a unique + /// script ID. The script is uploaded to an Amazon S3 bucket that is owned by Amazon GameLift. /// /// /// @@ -2795,21 +4006,31 @@ public virtual CreateMatchmakingConfigurationResponse CreateMatchmakingConfigura /// /// /// - /// - /// Design a FlexMatch matchmaker + /// Amazon + /// GameLift Realtime Servers /// /// /// - /// - /// Set up FlexMatch event notification + /// Set + /// Up a Role for Amazon GameLift Access + /// + /// + /// + /// Related actions + /// + /// + /// + /// All + /// APIs by task /// ///     - /// Container for the necessary parameters to execute the CreateMatchmakingConfiguration service method. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// + /// Container for the necessary parameters to execute the CreateScript service method. /// - /// The response from the CreateMatchmakingConfiguration service method, as returned by GameLift. + /// The response from the CreateScript service method, as returned by GameLift. + /// + /// The requested operation would cause a conflict with the current state of a service + /// resource associated with the request. Resolve the conflict before retrying this request. + /// /// /// The service encountered an unrecoverable internal failure while processing the request. /// Clients can retry such requests immediately or after a waiting period. @@ -2818,77 +4039,86 @@ public virtual CreateMatchmakingConfigurationResponse CreateMatchmakingConfigura /// One or more parameter values in the request are invalid. Correct the invalid parameter /// values before retrying. /// - /// - /// The requested operation would cause the resource to exceed the allowed service limit. - /// Resolve the issue before retrying. - /// - /// - /// The requested resources was not found. The resource was either not created yet or - /// deleted. - /// /// /// The requested tagging operation did not succeed. This may be due to invalid tag format /// or the maximum tag limit may have been exceeded. Resolve the issue before retrying. /// - /// - /// The requested operation is not supported in the Region specified. + /// + /// The client failed authentication. Clients should not retry such requests. /// - /// REST API Reference for CreateMatchmakingConfiguration Operation - public virtual Task CreateMatchmakingConfigurationAsync(CreateMatchmakingConfigurationRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + /// REST API Reference for CreateScript Operation + public virtual CreateScriptResponse CreateScript(CreateScriptRequest request) { var options = new InvokeOptions(); - options.RequestMarshaller = CreateMatchmakingConfigurationRequestMarshaller.Instance; - options.ResponseUnmarshaller = CreateMatchmakingConfigurationResponseUnmarshaller.Instance; - - return InvokeAsync(request, options, cancellationToken); - } + options.RequestMarshaller = CreateScriptRequestMarshaller.Instance; + options.ResponseUnmarshaller = CreateScriptResponseUnmarshaller.Instance; - #endregion - - #region CreateMatchmakingRuleSet + return Invoke(request, options); + } /// - /// Creates a new rule set for FlexMatch matchmaking. A rule set describes the type of - /// match to create, such as the number and size of teams. It also sets the parameters - /// for acceptable player matches, such as minimum skill level or character type. + /// Creates a script resource for your Realtime Servers script. Realtime scripts are JavaScript + /// files that provide configuration settings and optional custom game logic for your + /// game. Script logic is executed during an active game session. To deploy Realtime Servers + /// for hosting, create an Amazon GameLift managed fleet with the script. /// /// /// - /// To create a matchmaking rule set, provide unique rule set name and the rule set body - /// in JSON format. Rule sets must be defined in the same Region as the matchmaking configuration - /// they are used with. + /// To create a script resource, specify a script name and provide the script file(s). + /// The script files and all dependencies must be combined into a single .zip file. You + /// can upload the .zip file from either of these locations: + /// + ///
    • + /// + /// A locally available directory. Use the ZipFile parameter for this option. + /// + ///
    • + /// + /// An Amazon Simple Storage Service (Amazon S3) bucket under your Amazon Web Services + /// account. Use the StorageLocation parameter for this option. You'll need to + /// have an Identity Access Management (IAM) role that allows the Amazon GameLift service + /// to access your S3 bucket. + /// + ///
    + /// + /// If the call is successful, Amazon GameLift creates a new script resource with a unique + /// script ID. The script is uploaded to an Amazon S3 bucket that is owned by Amazon GameLift. /// /// /// - /// Since matchmaking rule sets cannot be edited, it is a good idea to check the rule - /// set syntax using ValidateMatchmakingRuleSet - /// before creating a new rule set. + /// Learn more /// /// /// - /// Learn more + /// Amazon + /// GameLift Realtime Servers /// - /// ///     - /// Container for the necessary parameters to execute the CreateMatchmakingRuleSet service method. + /// Container for the necessary parameters to execute the CreateScript service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// /// - /// The response from the CreateMatchmakingRuleSet service method, as returned by GameLift. + /// The response from the CreateScript service method, as returned by GameLift. + /// + /// The requested operation would cause a conflict with the current state of a service + /// resource associated with the request. Resolve the conflict before retrying this request. + /// /// /// The service encountered an unrecoverable internal failure while processing the request. /// Clients can retry such requests immediately or after a waiting period. @@ -2897,72 +4127,79 @@ public virtual CreateMatchmakingConfigurationResponse CreateMatchmakingConfigura /// One or more parameter values in the request are invalid. Correct the invalid parameter /// values before retrying. /// - /// - /// The requested operation would cause the resource to exceed the allowed service limit. - /// Resolve the issue before retrying. - /// /// /// The requested tagging operation did not succeed. This may be due to invalid tag format /// or the maximum tag limit may have been exceeded. Resolve the issue before retrying. /// - /// - /// The requested operation is not supported in the Region specified. + /// + /// The client failed authentication. Clients should not retry such requests. /// - /// REST API Reference for CreateMatchmakingRuleSet Operation - public virtual CreateMatchmakingRuleSetResponse CreateMatchmakingRuleSet(CreateMatchmakingRuleSetRequest request) + /// REST API Reference for CreateScript Operation + public virtual Task CreateScriptAsync(CreateScriptRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { var options = new InvokeOptions(); - options.RequestMarshaller = CreateMatchmakingRuleSetRequestMarshaller.Instance; - options.ResponseUnmarshaller = CreateMatchmakingRuleSetResponseUnmarshaller.Instance; - - return Invoke(request, options); + options.RequestMarshaller = CreateScriptRequestMarshaller.Instance; + options.ResponseUnmarshaller = CreateScriptResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); } + #endregion + + #region CreateVpcPeeringAuthorization + /// - /// Creates a new rule set for FlexMatch matchmaking. A rule set describes the type of - /// match to create, such as the number and size of teams. It also sets the parameters - /// for acceptable player matches, such as minimum skill level or character type. + /// Requests authorization to create or delete a peer connection between the VPC for your + /// Amazon GameLift fleet and a virtual private cloud (VPC) in your Amazon Web Services + /// account. VPC peering enables the game servers on your fleet to communicate directly + /// with other Amazon Web Services resources. After you've received authorization, use + /// CreateVpcPeeringConnection + /// to establish the peering connection. For more information, see VPC + /// Peering with Amazon GameLift Fleets. /// /// /// - /// To create a matchmaking rule set, provide unique rule set name and the rule set body - /// in JSON format. Rule sets must be defined in the same Region as the matchmaking configuration - /// they are used with. + /// You can peer with VPCs that are owned by any Amazon Web Services account you have + /// access to, including the account that you use to manage your Amazon GameLift fleets. + /// You cannot peer with VPCs that are in different Regions. /// /// /// - /// Since matchmaking rule sets cannot be edited, it is a good idea to check the rule - /// set syntax using ValidateMatchmakingRuleSet - /// before creating a new rule set. + /// To request authorization to create a connection, call this operation from the Amazon + /// Web Services account with the VPC that you want to peer to your Amazon GameLift fleet. + /// For example, to enable your game servers to retrieve data from a DynamoDB table, use + /// the account that manages that DynamoDB resource. Identify the following values: (1) + /// The ID of the VPC that you want to peer with, and (2) the ID of the Amazon Web Services + /// account that you use to manage Amazon GameLift. If successful, VPC peering is authorized + /// for the specified VPC. /// /// /// - /// Learn more + /// To request authorization to delete a connection, call this operation from the Amazon + /// Web Services account with the VPC that is peered with your Amazon GameLift fleet. + /// Identify the following values: (1) VPC ID that you want to delete the peering connection + /// for, and (2) ID of the Amazon Web Services account that you use to manage Amazon GameLift. + /// /// - /// /// - /// Container for the necessary parameters to execute the CreateMatchmakingRuleSet service method. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// + /// Container for the necessary parameters to execute the CreateVpcPeeringAuthorization service method. /// - /// The response from the CreateMatchmakingRuleSet service method, as returned by GameLift. + /// The response from the CreateVpcPeeringAuthorization service method, as returned by GameLift. /// /// The service encountered an unrecoverable internal failure while processing the request. /// Clients can retry such requests immediately or after a waiting period. @@ -2971,55 +4208,61 @@ public virtual CreateMatchmakingRuleSetResponse CreateMatchmakingRuleSet(CreateM /// One or more parameter values in the request are invalid. Correct the invalid parameter /// values before retrying. /// - /// - /// The requested operation would cause the resource to exceed the allowed service limit. - /// Resolve the issue before retrying. - /// - /// - /// The requested tagging operation did not succeed. This may be due to invalid tag format - /// or the maximum tag limit may have been exceeded. Resolve the issue before retrying. + /// + /// The requested resources was not found. The resource was either not created yet or + /// deleted. /// - /// - /// The requested operation is not supported in the Region specified. + /// + /// The client failed authentication. Clients should not retry such requests. /// - /// REST API Reference for CreateMatchmakingRuleSet Operation - public virtual Task CreateMatchmakingRuleSetAsync(CreateMatchmakingRuleSetRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + /// REST API Reference for CreateVpcPeeringAuthorization Operation + public virtual CreateVpcPeeringAuthorizationResponse CreateVpcPeeringAuthorization(CreateVpcPeeringAuthorizationRequest request) { var options = new InvokeOptions(); - options.RequestMarshaller = CreateMatchmakingRuleSetRequestMarshaller.Instance; - options.ResponseUnmarshaller = CreateMatchmakingRuleSetResponseUnmarshaller.Instance; - - return InvokeAsync(request, options, cancellationToken); - } + options.RequestMarshaller = CreateVpcPeeringAuthorizationRequestMarshaller.Instance; + options.ResponseUnmarshaller = CreateVpcPeeringAuthorizationResponseUnmarshaller.Instance; - #endregion - - #region CreatePlayerSession + return Invoke(request, options); + } /// - /// Reserves an open player slot in a game session for a player. New player sessions can - /// be created in any game session with an open slot that is in ACTIVE status and - /// has a player creation policy of ACCEPT_ALL. You can add a group of players - /// to a game session with CreatePlayerSessions - /// . + /// Requests authorization to create or delete a peer connection between the VPC for your + /// Amazon GameLift fleet and a virtual private cloud (VPC) in your Amazon Web Services + /// account. VPC peering enables the game servers on your fleet to communicate directly + /// with other Amazon Web Services resources. After you've received authorization, use + /// CreateVpcPeeringConnection + /// to establish the peering connection. For more information, see VPC + /// Peering with Amazon GameLift Fleets. /// /// /// - /// To create a player session, specify a game session ID, player ID, and optionally a - /// set of player data. + /// You can peer with VPCs that are owned by any Amazon Web Services account you have + /// access to, including the account that you use to manage your Amazon GameLift fleets. + /// You cannot peer with VPCs that are in different Regions. /// /// /// - /// If successful, a slot is reserved in the game session for the player and a new PlayerSessions - /// object is returned with a player session ID. The player references the player session - /// ID when sending a connection request to the game session, and the game server can - /// use it to validate the player reservation with the Amazon GameLift service. Player - /// sessions cannot be updated. + /// To request authorization to create a connection, call this operation from the Amazon + /// Web Services account with the VPC that you want to peer to your Amazon GameLift fleet. + /// For example, to enable your game servers to retrieve data from a DynamoDB table, use + /// the account that manages that DynamoDB resource. Identify the following values: (1) + /// The ID of the VPC that you want to peer with, and (2) the ID of the Amazon Web Services + /// account that you use to manage Amazon GameLift. If successful, VPC peering is authorized + /// for the specified VPC. /// /// /// - /// The maximum number of players per game session is 200. It is not adjustable. + /// To request authorization to delete a connection, call this operation from the Amazon + /// Web Services account with the VPC that is peered with your Amazon GameLift fleet. + /// Identify the following values: (1) VPC ID that you want to delete the peering connection + /// for, and (2) ID of the Amazon Web Services account that you use to manage Amazon GameLift. + /// + /// + /// + /// + /// The authorization remains valid for 24 hours unless it is canceled. You must create + /// or delete the peering connection while the authorization is valid. /// /// /// @@ -3031,23 +4274,16 @@ public virtual CreateMatchmakingRuleSetResponse CreateMatchmakingRuleSet(CreateM /// APIs by task /// /// - /// A unique identifier for the game session to add a player to. - /// A unique identifier for a player. Player IDs are developer-defined. + /// Container for the necessary parameters to execute the CreateVpcPeeringAuthorization service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// /// - /// The response from the CreatePlayerSession service method, as returned by GameLift. - /// - /// The game instance is currently full and cannot allow the requested player(s) to join. - /// Clients can retry such requests immediately or after a waiting period. - /// + /// The response from the CreateVpcPeeringAuthorization service method, as returned by GameLift. /// /// The service encountered an unrecoverable internal failure while processing the request. /// Clients can retry such requests immediately or after a waiting period. /// - /// - /// The requested operation would cause a conflict with the current state of a resource - /// associated with the request and/or the game instance. Resolve the conflict before - /// retrying. - /// /// /// One or more parameter values in the request are invalid. Correct the invalid parameter /// values before retrying. @@ -3056,48 +4292,54 @@ public virtual CreateMatchmakingRuleSetResponse CreateMatchmakingRuleSet(CreateM /// The requested resources was not found. The resource was either not created yet or /// deleted. /// - /// - /// The service is unable to resolve the routing for a particular alias because it has - /// a terminal RoutingStrategy associated with it. The message returned in this - /// exception is the message defined in the routing strategy itself. Such requests should - /// only be retried if the routing strategy for the specified alias is modified. - /// /// /// The client failed authentication. Clients should not retry such requests. /// - /// REST API Reference for CreatePlayerSession Operation - public virtual CreatePlayerSessionResponse CreatePlayerSession(string gameSessionId, string playerId) + /// REST API Reference for CreateVpcPeeringAuthorization Operation + public virtual Task CreateVpcPeeringAuthorizationAsync(CreateVpcPeeringAuthorizationRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { - var request = new CreatePlayerSessionRequest(); - request.GameSessionId = gameSessionId; - request.PlayerId = playerId; - return CreatePlayerSession(request); + var options = new InvokeOptions(); + options.RequestMarshaller = CreateVpcPeeringAuthorizationRequestMarshaller.Instance; + options.ResponseUnmarshaller = CreateVpcPeeringAuthorizationResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); } + #endregion + + #region CreateVpcPeeringConnection + /// - /// Reserves an open player slot in a game session for a player. New player sessions can - /// be created in any game session with an open slot that is in ACTIVE status and - /// has a player creation policy of ACCEPT_ALL. You can add a group of players - /// to a game session with CreatePlayerSessions - /// . + /// Establishes a VPC peering connection between a virtual private cloud (VPC) in an Amazon + /// Web Services account with the VPC for your Amazon GameLift fleet. VPC peering enables + /// the game servers on your fleet to communicate directly with other Amazon Web Services + /// resources. You can peer with VPCs in any Amazon Web Services account that you have + /// access to, including the account that you use to manage your Amazon GameLift fleets. + /// You cannot peer with VPCs that are in different Regions. For more information, see + /// VPC + /// Peering with Amazon GameLift Fleets. /// /// /// - /// To create a player session, specify a game session ID, player ID, and optionally a - /// set of player data. - /// - /// - /// - /// If successful, a slot is reserved in the game session for the player and a new PlayerSessions - /// object is returned with a player session ID. The player references the player session - /// ID when sending a connection request to the game session, and the game server can - /// use it to validate the player reservation with the Amazon GameLift service. Player - /// sessions cannot be updated. + /// Before calling this operation to establish the peering connection, you first need + /// to use CreateVpcPeeringAuthorization + /// and identify the VPC you want to peer with. Once the authorization for the specified + /// VPC is issued, you have 24 hours to establish the connection. These two operations + /// handle all tasks necessary to peer the two VPCs, including acceptance, updating routing + /// tables, etc. /// /// /// - /// The maximum number of players per game session is 200. It is not adjustable. + /// To establish the connection, call this operation from the Amazon Web Services account + /// that is used to manage the Amazon GameLift fleets. Identify the following values: + /// (1) The ID of the fleet you want to be enable a VPC peering connection for; (2) The + /// Amazon Web Services account with the VPC that you want to peer with; and (3) The ID + /// of the VPC you want to peer with. This operation is asynchronous. If successful, a + /// connection request is created. You can use continuous polling to track the request's + /// status using DescribeVpcPeeringConnections + /// , or by monitoring fleet events for success or failure using DescribeFleetEvents + /// . /// /// /// @@ -3109,22 +4351,13 @@ public virtual CreatePlayerSessionResponse CreatePlayerSession(string gameSessio /// APIs by task /// /// - /// Container for the necessary parameters to execute the CreatePlayerSession service method. + /// Container for the necessary parameters to execute the CreateVpcPeeringConnection service method. /// - /// The response from the CreatePlayerSession service method, as returned by GameLift. - /// - /// The game instance is currently full and cannot allow the requested player(s) to join. - /// Clients can retry such requests immediately or after a waiting period. - /// + /// The response from the CreateVpcPeeringConnection service method, as returned by GameLift. /// /// The service encountered an unrecoverable internal failure while processing the request. /// Clients can retry such requests immediately or after a waiting period. /// - /// - /// The requested operation would cause a conflict with the current state of a resource - /// associated with the request and/or the game instance. Resolve the conflict before - /// retrying. - /// /// /// One or more parameter values in the request are invalid. Correct the invalid parameter /// values before retrying. @@ -3133,49 +4366,50 @@ public virtual CreatePlayerSessionResponse CreatePlayerSession(string gameSessio /// The requested resources was not found. The resource was either not created yet or /// deleted. /// - /// - /// The service is unable to resolve the routing for a particular alias because it has - /// a terminal RoutingStrategy associated with it. The message returned in this - /// exception is the message defined in the routing strategy itself. Such requests should - /// only be retried if the routing strategy for the specified alias is modified. - /// /// /// The client failed authentication. Clients should not retry such requests. /// - /// REST API Reference for CreatePlayerSession Operation - public virtual CreatePlayerSessionResponse CreatePlayerSession(CreatePlayerSessionRequest request) + /// REST API Reference for CreateVpcPeeringConnection Operation + public virtual CreateVpcPeeringConnectionResponse CreateVpcPeeringConnection(CreateVpcPeeringConnectionRequest request) { var options = new InvokeOptions(); - options.RequestMarshaller = CreatePlayerSessionRequestMarshaller.Instance; - options.ResponseUnmarshaller = CreatePlayerSessionResponseUnmarshaller.Instance; + options.RequestMarshaller = CreateVpcPeeringConnectionRequestMarshaller.Instance; + options.ResponseUnmarshaller = CreateVpcPeeringConnectionResponseUnmarshaller.Instance; - return Invoke(request, options); + return Invoke(request, options); } /// - /// Reserves an open player slot in a game session for a player. New player sessions can - /// be created in any game session with an open slot that is in ACTIVE status and - /// has a player creation policy of ACCEPT_ALL. You can add a group of players - /// to a game session with CreatePlayerSessions - /// . + /// Establishes a VPC peering connection between a virtual private cloud (VPC) in an Amazon + /// Web Services account with the VPC for your Amazon GameLift fleet. VPC peering enables + /// the game servers on your fleet to communicate directly with other Amazon Web Services + /// resources. You can peer with VPCs in any Amazon Web Services account that you have + /// access to, including the account that you use to manage your Amazon GameLift fleets. + /// You cannot peer with VPCs that are in different Regions. For more information, see + /// VPC + /// Peering with Amazon GameLift Fleets. /// /// /// - /// To create a player session, specify a game session ID, player ID, and optionally a - /// set of player data. - /// - /// - /// - /// If successful, a slot is reserved in the game session for the player and a new PlayerSessions - /// object is returned with a player session ID. The player references the player session - /// ID when sending a connection request to the game session, and the game server can - /// use it to validate the player reservation with the Amazon GameLift service. Player - /// sessions cannot be updated. + /// Before calling this operation to establish the peering connection, you first need + /// to use CreateVpcPeeringAuthorization + /// and identify the VPC you want to peer with. Once the authorization for the specified + /// VPC is issued, you have 24 hours to establish the connection. These two operations + /// handle all tasks necessary to peer the two VPCs, including acceptance, updating routing + /// tables, etc. /// /// /// - /// The maximum number of players per game session is 200. It is not adjustable. + /// To establish the connection, call this operation from the Amazon Web Services account + /// that is used to manage the Amazon GameLift fleets. Identify the following values: + /// (1) The ID of the fleet you want to be enable a VPC peering connection for; (2) The + /// Amazon Web Services account with the VPC that you want to peer with; and (3) The ID + /// of the VPC you want to peer with. This operation is asynchronous. If successful, a + /// connection request is created. You can use continuous polling to track the request's + /// status using DescribeVpcPeeringConnections + /// , or by monitoring fleet events for success or failure using DescribeFleetEvents + /// . /// /// /// @@ -3187,26 +4421,16 @@ public virtual CreatePlayerSessionResponse CreatePlayerSession(CreatePlayerSessi /// APIs by task /// /// - /// A unique identifier for the game session to add a player to. - /// A unique identifier for a player. Player IDs are developer-defined. + /// Container for the necessary parameters to execute the CreateVpcPeeringConnection service method. /// /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// /// - /// The response from the CreatePlayerSession service method, as returned by GameLift. - /// - /// The game instance is currently full and cannot allow the requested player(s) to join. - /// Clients can retry such requests immediately or after a waiting period. - /// + /// The response from the CreateVpcPeeringConnection service method, as returned by GameLift. /// /// The service encountered an unrecoverable internal failure while processing the request. /// Clients can retry such requests immediately or after a waiting period. /// - /// - /// The requested operation would cause a conflict with the current state of a resource - /// associated with the request and/or the game instance. Resolve the conflict before - /// retrying. - /// /// /// One or more parameter values in the request are invalid. Correct the invalid parameter /// values before retrying. @@ -3215,49 +4439,75 @@ public virtual CreatePlayerSessionResponse CreatePlayerSession(CreatePlayerSessi /// The requested resources was not found. The resource was either not created yet or /// deleted. /// - /// - /// The service is unable to resolve the routing for a particular alias because it has - /// a terminal RoutingStrategy associated with it. The message returned in this - /// exception is the message defined in the routing strategy itself. Such requests should - /// only be retried if the routing strategy for the specified alias is modified. - /// /// /// The client failed authentication. Clients should not retry such requests. /// - /// REST API Reference for CreatePlayerSession Operation - public virtual Task CreatePlayerSessionAsync(string gameSessionId, string playerId, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + /// REST API Reference for CreateVpcPeeringConnection Operation + public virtual Task CreateVpcPeeringConnectionAsync(CreateVpcPeeringConnectionRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { - var request = new CreatePlayerSessionRequest(); - request.GameSessionId = gameSessionId; - request.PlayerId = playerId; - return CreatePlayerSessionAsync(request, cancellationToken); + var options = new InvokeOptions(); + options.RequestMarshaller = CreateVpcPeeringConnectionRequestMarshaller.Instance; + options.ResponseUnmarshaller = CreateVpcPeeringConnectionResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); } + #endregion + + #region DeleteAlias + /// - /// Reserves an open player slot in a game session for a player. New player sessions can - /// be created in any game session with an open slot that is in ACTIVE status and - /// has a player creation policy of ACCEPT_ALL. You can add a group of players - /// to a game session with CreatePlayerSessions - /// . + /// Deletes an alias. This operation removes all record of the alias. Game clients attempting + /// to access a server process using the deleted alias receive an error. To delete an + /// alias, specify the alias ID to be deleted. /// /// /// - /// To create a player session, specify a game session ID, player ID, and optionally a - /// set of player data. - /// - /// - /// - /// If successful, a slot is reserved in the game session for the player and a new PlayerSessions - /// object is returned with a player session ID. The player references the player session - /// ID when sending a connection request to the game session, and the game server can - /// use it to validate the player reservation with the Amazon GameLift service. Player - /// sessions cannot be updated. + /// Related actions /// /// /// - /// The maximum number of players per game session is 200. It is not adjustable. + /// All + /// APIs by task /// + /// + /// A unique identifier of the alias that you want to delete. You can use either the alias ID or ARN value. + /// + /// The response from the DeleteAlias service method, as returned by GameLift. + /// + /// The service encountered an unrecoverable internal failure while processing the request. + /// Clients can retry such requests immediately or after a waiting period. + /// + /// + /// One or more parameter values in the request are invalid. Correct the invalid parameter + /// values before retrying. + /// + /// + /// The requested resources was not found. The resource was either not created yet or + /// deleted. + /// + /// + /// The requested tagging operation did not succeed. This may be due to invalid tag format + /// or the maximum tag limit may have been exceeded. Resolve the issue before retrying. + /// + /// + /// The client failed authentication. Clients should not retry such requests. + /// + /// REST API Reference for DeleteAlias Operation + public virtual DeleteAliasResponse DeleteAlias(string aliasId) + { + var request = new DeleteAliasRequest(); + request.AliasId = aliasId; + return DeleteAlias(request); + } + + + /// + /// Deletes an alias. This operation removes all record of the alias. Game clients attempting + /// to access a server process using the deleted alias receive an error. To delete an + /// alias, specify the alias ID to be deleted. + /// /// /// /// Related actions @@ -3268,25 +4518,13 @@ public virtual CreatePlayerSessionResponse CreatePlayerSession(CreatePlayerSessi /// APIs by task /// /// - /// Container for the necessary parameters to execute the CreatePlayerSession service method. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// + /// Container for the necessary parameters to execute the DeleteAlias service method. /// - /// The response from the CreatePlayerSession service method, as returned by GameLift. - /// - /// The game instance is currently full and cannot allow the requested player(s) to join. - /// Clients can retry such requests immediately or after a waiting period. - /// + /// The response from the DeleteAlias service method, as returned by GameLift. /// /// The service encountered an unrecoverable internal failure while processing the request. /// Clients can retry such requests immediately or after a waiting period. /// - /// - /// The requested operation would cause a conflict with the current state of a resource - /// associated with the request and/or the game instance. Resolve the conflict before - /// retrying. - /// /// /// One or more parameter values in the request are invalid. Correct the invalid parameter /// values before retrying. @@ -3295,56 +4533,31 @@ public virtual CreatePlayerSessionResponse CreatePlayerSession(CreatePlayerSessi /// The requested resources was not found. The resource was either not created yet or /// deleted. /// - /// - /// The service is unable to resolve the routing for a particular alias because it has - /// a terminal RoutingStrategy associated with it. The message returned in this - /// exception is the message defined in the routing strategy itself. Such requests should - /// only be retried if the routing strategy for the specified alias is modified. + /// + /// The requested tagging operation did not succeed. This may be due to invalid tag format + /// or the maximum tag limit may have been exceeded. Resolve the issue before retrying. /// /// /// The client failed authentication. Clients should not retry such requests. /// - /// REST API Reference for CreatePlayerSession Operation - public virtual Task CreatePlayerSessionAsync(CreatePlayerSessionRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + /// REST API Reference for DeleteAlias Operation + public virtual DeleteAliasResponse DeleteAlias(DeleteAliasRequest request) { var options = new InvokeOptions(); - options.RequestMarshaller = CreatePlayerSessionRequestMarshaller.Instance; - options.ResponseUnmarshaller = CreatePlayerSessionResponseUnmarshaller.Instance; - - return InvokeAsync(request, options, cancellationToken); - } + options.RequestMarshaller = DeleteAliasRequestMarshaller.Instance; + options.ResponseUnmarshaller = DeleteAliasResponseUnmarshaller.Instance; - #endregion - - #region CreatePlayerSessions + return Invoke(request, options); + } /// - /// Reserves open slots in a game session for a group of players. New player sessions - /// can be created in any game session with an open slot that is in ACTIVE status - /// and has a player creation policy of ACCEPT_ALL. To add a single player to a - /// game session, use CreatePlayerSession - /// + /// Deletes an alias. This operation removes all record of the alias. Game clients attempting + /// to access a server process using the deleted alias receive an error. To delete an + /// alias, specify the alias ID to be deleted. /// /// /// - /// To create player sessions, specify a game session ID and a list of player IDs. Optionally, - /// provide a set of player data for each player ID. - /// - /// - /// - /// If successful, a slot is reserved in the game session for each player, and new PlayerSession - /// objects are returned with player session IDs. Each player references their player - /// session ID when sending a connection request to the game session, and the game server - /// can use it to validate the player reservation with the Amazon GameLift service. Player - /// sessions cannot be updated. - /// - /// - /// - /// The maximum number of players per game session is 200. It is not adjustable. - /// - /// - /// /// Related actions /// /// @@ -3353,23 +4566,16 @@ public virtual CreatePlayerSessionResponse CreatePlayerSession(CreatePlayerSessi /// APIs by task /// /// - /// A unique identifier for the game session to add players to. - /// List of unique identifiers for the players to be added. - /// - /// The response from the CreatePlayerSessions service method, as returned by GameLift. - /// - /// The game instance is currently full and cannot allow the requested player(s) to join. - /// Clients can retry such requests immediately or after a waiting period. - /// + /// A unique identifier of the alias that you want to delete. You can use either the alias ID or ARN value. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the DeleteAlias service method, as returned by GameLift. /// /// The service encountered an unrecoverable internal failure while processing the request. /// Clients can retry such requests immediately or after a waiting period. /// - /// - /// The requested operation would cause a conflict with the current state of a resource - /// associated with the request and/or the game instance. Resolve the conflict before - /// retrying. - /// /// /// One or more parameter values in the request are invalid. Correct the invalid parameter /// values before retrying. @@ -3378,51 +4584,29 @@ public virtual CreatePlayerSessionResponse CreatePlayerSession(CreatePlayerSessi /// The requested resources was not found. The resource was either not created yet or /// deleted. /// - /// - /// The service is unable to resolve the routing for a particular alias because it has - /// a terminal RoutingStrategy associated with it. The message returned in this - /// exception is the message defined in the routing strategy itself. Such requests should - /// only be retried if the routing strategy for the specified alias is modified. + /// + /// The requested tagging operation did not succeed. This may be due to invalid tag format + /// or the maximum tag limit may have been exceeded. Resolve the issue before retrying. /// /// /// The client failed authentication. Clients should not retry such requests. /// - /// REST API Reference for CreatePlayerSessions Operation - public virtual CreatePlayerSessionsResponse CreatePlayerSessions(string gameSessionId, List playerIds) + /// REST API Reference for DeleteAlias Operation + public virtual Task DeleteAliasAsync(string aliasId, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { - var request = new CreatePlayerSessionsRequest(); - request.GameSessionId = gameSessionId; - request.PlayerIds = playerIds; - return CreatePlayerSessions(request); + var request = new DeleteAliasRequest(); + request.AliasId = aliasId; + return DeleteAliasAsync(request, cancellationToken); } /// - /// Reserves open slots in a game session for a group of players. New player sessions - /// can be created in any game session with an open slot that is in ACTIVE status - /// and has a player creation policy of ACCEPT_ALL. To add a single player to a - /// game session, use CreatePlayerSession - /// + /// Deletes an alias. This operation removes all record of the alias. Game clients attempting + /// to access a server process using the deleted alias receive an error. To delete an + /// alias, specify the alias ID to be deleted. /// /// /// - /// To create player sessions, specify a game session ID and a list of player IDs. Optionally, - /// provide a set of player data for each player ID. - /// - /// - /// - /// If successful, a slot is reserved in the game session for each player, and new PlayerSession - /// objects are returned with player session IDs. Each player references their player - /// session ID when sending a connection request to the game session, and the game server - /// can use it to validate the player reservation with the Amazon GameLift service. Player - /// sessions cannot be updated. - /// - /// - /// - /// The maximum number of players per game session is 200. It is not adjustable. - /// - /// - /// /// Related actions /// /// @@ -3431,22 +4615,16 @@ public virtual CreatePlayerSessionsResponse CreatePlayerSessions(string gameSess /// APIs by task /// /// - /// Container for the necessary parameters to execute the CreatePlayerSessions service method. + /// Container for the necessary parameters to execute the DeleteAlias service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// /// - /// The response from the CreatePlayerSessions service method, as returned by GameLift. - /// - /// The game instance is currently full and cannot allow the requested player(s) to join. - /// Clients can retry such requests immediately or after a waiting period. - /// + /// The response from the DeleteAlias service method, as returned by GameLift. /// /// The service encountered an unrecoverable internal failure while processing the request. /// Clients can retry such requests immediately or after a waiting period. /// - /// - /// The requested operation would cause a conflict with the current state of a resource - /// associated with the request and/or the game instance. Resolve the conflict before - /// retrying. - /// /// /// One or more parameter values in the request are invalid. Correct the invalid parameter /// values before retrying. @@ -3455,53 +4633,45 @@ public virtual CreatePlayerSessionsResponse CreatePlayerSessions(string gameSess /// The requested resources was not found. The resource was either not created yet or /// deleted. /// - /// - /// The service is unable to resolve the routing for a particular alias because it has - /// a terminal RoutingStrategy associated with it. The message returned in this - /// exception is the message defined in the routing strategy itself. Such requests should - /// only be retried if the routing strategy for the specified alias is modified. + /// + /// The requested tagging operation did not succeed. This may be due to invalid tag format + /// or the maximum tag limit may have been exceeded. Resolve the issue before retrying. /// /// /// The client failed authentication. Clients should not retry such requests. /// - /// REST API Reference for CreatePlayerSessions Operation - public virtual CreatePlayerSessionsResponse CreatePlayerSessions(CreatePlayerSessionsRequest request) + /// REST API Reference for DeleteAlias Operation + public virtual Task DeleteAliasAsync(DeleteAliasRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { var options = new InvokeOptions(); - options.RequestMarshaller = CreatePlayerSessionsRequestMarshaller.Instance; - options.ResponseUnmarshaller = CreatePlayerSessionsResponseUnmarshaller.Instance; - - return Invoke(request, options); + options.RequestMarshaller = DeleteAliasRequestMarshaller.Instance; + options.ResponseUnmarshaller = DeleteAliasResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); } + #endregion + + #region DeleteBuild + /// - /// Reserves open slots in a game session for a group of players. New player sessions - /// can be created in any game session with an open slot that is in ACTIVE status - /// and has a player creation policy of ACCEPT_ALL. To add a single player to a - /// game session, use CreatePlayerSession - /// + /// Deletes a build. This operation permanently deletes the build resource and any uploaded + /// build files. Deleting a build does not affect the status of any active fleets using + /// the build, but you can no longer create new fleets with the deleted build. /// /// /// - /// To create player sessions, specify a game session ID and a list of player IDs. Optionally, - /// provide a set of player data for each player ID. - /// - /// - /// - /// If successful, a slot is reserved in the game session for each player, and new PlayerSession - /// objects are returned with player session IDs. Each player references their player - /// session ID when sending a connection request to the game session, and the game server - /// can use it to validate the player reservation with the Amazon GameLift service. Player - /// sessions cannot be updated. + /// To delete a build, specify the build ID. /// /// /// - /// The maximum number of players per game session is 200. It is not adjustable. + /// Learn more /// /// /// - /// Related actions + /// + /// Upload a Custom Server Build /// /// /// @@ -3509,26 +4679,13 @@ public virtual CreatePlayerSessionsResponse CreatePlayerSessions(CreatePlayerSes /// APIs by task /// /// - /// A unique identifier for the game session to add players to. - /// List of unique identifiers for the players to be added. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// + /// A unique identifier for the build to delete. You can use either the build ID or ARN value. /// - /// The response from the CreatePlayerSessions service method, as returned by GameLift. - /// - /// The game instance is currently full and cannot allow the requested player(s) to join. - /// Clients can retry such requests immediately or after a waiting period. - /// + /// The response from the DeleteBuild service method, as returned by GameLift. /// /// The service encountered an unrecoverable internal failure while processing the request. /// Clients can retry such requests immediately or after a waiting period. /// - /// - /// The requested operation would cause a conflict with the current state of a resource - /// associated with the request and/or the game instance. Resolve the conflict before - /// retrying. - /// /// /// One or more parameter values in the request are invalid. Correct the invalid parameter /// values before retrying. @@ -3537,52 +4694,39 @@ public virtual CreatePlayerSessionsResponse CreatePlayerSessions(CreatePlayerSes /// The requested resources was not found. The resource was either not created yet or /// deleted. /// - /// - /// The service is unable to resolve the routing for a particular alias because it has - /// a terminal RoutingStrategy associated with it. The message returned in this - /// exception is the message defined in the routing strategy itself. Such requests should - /// only be retried if the routing strategy for the specified alias is modified. + /// + /// The requested tagging operation did not succeed. This may be due to invalid tag format + /// or the maximum tag limit may have been exceeded. Resolve the issue before retrying. /// /// /// The client failed authentication. Clients should not retry such requests. /// - /// REST API Reference for CreatePlayerSessions Operation - public virtual Task CreatePlayerSessionsAsync(string gameSessionId, List playerIds, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + /// REST API Reference for DeleteBuild Operation + public virtual DeleteBuildResponse DeleteBuild(string buildId) { - var request = new CreatePlayerSessionsRequest(); - request.GameSessionId = gameSessionId; - request.PlayerIds = playerIds; - return CreatePlayerSessionsAsync(request, cancellationToken); + var request = new DeleteBuildRequest(); + request.BuildId = buildId; + return DeleteBuild(request); } /// - /// Reserves open slots in a game session for a group of players. New player sessions - /// can be created in any game session with an open slot that is in ACTIVE status - /// and has a player creation policy of ACCEPT_ALL. To add a single player to a - /// game session, use CreatePlayerSession - /// + /// Deletes a build. This operation permanently deletes the build resource and any uploaded + /// build files. Deleting a build does not affect the status of any active fleets using + /// the build, but you can no longer create new fleets with the deleted build. /// /// /// - /// To create player sessions, specify a game session ID and a list of player IDs. Optionally, - /// provide a set of player data for each player ID. - /// - /// - /// - /// If successful, a slot is reserved in the game session for each player, and new PlayerSession - /// objects are returned with player session IDs. Each player references their player - /// session ID when sending a connection request to the game session, and the game server - /// can use it to validate the player reservation with the Amazon GameLift service. Player - /// sessions cannot be updated. + /// To delete a build, specify the build ID. /// /// /// - /// The maximum number of players per game session is 200. It is not adjustable. + /// Learn more /// /// /// - /// Related actions + /// + /// Upload a Custom Server Build /// /// /// @@ -3590,25 +4734,13 @@ public virtual CreatePlayerSessionsResponse CreatePlayerSessions(CreatePlayerSes /// APIs by task /// /// - /// Container for the necessary parameters to execute the CreatePlayerSessions service method. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// + /// Container for the necessary parameters to execute the DeleteBuild service method. /// - /// The response from the CreatePlayerSessions service method, as returned by GameLift. - /// - /// The game instance is currently full and cannot allow the requested player(s) to join. - /// Clients can retry such requests immediately or after a waiting period. - /// + /// The response from the DeleteBuild service method, as returned by GameLift. /// /// The service encountered an unrecoverable internal failure while processing the request. /// Clients can retry such requests immediately or after a waiting period. /// - /// - /// The requested operation would cause a conflict with the current state of a resource - /// associated with the request and/or the game instance. Resolve the conflict before - /// retrying. - /// /// /// One or more parameter values in the request are invalid. Correct the invalid parameter /// values before retrying. @@ -3617,60 +4749,32 @@ public virtual CreatePlayerSessionsResponse CreatePlayerSessions(CreatePlayerSes /// The requested resources was not found. The resource was either not created yet or /// deleted. /// - /// - /// The service is unable to resolve the routing for a particular alias because it has - /// a terminal RoutingStrategy associated with it. The message returned in this - /// exception is the message defined in the routing strategy itself. Such requests should - /// only be retried if the routing strategy for the specified alias is modified. + /// + /// The requested tagging operation did not succeed. This may be due to invalid tag format + /// or the maximum tag limit may have been exceeded. Resolve the issue before retrying. /// /// /// The client failed authentication. Clients should not retry such requests. /// - /// REST API Reference for CreatePlayerSessions Operation - public virtual Task CreatePlayerSessionsAsync(CreatePlayerSessionsRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + /// REST API Reference for DeleteBuild Operation + public virtual DeleteBuildResponse DeleteBuild(DeleteBuildRequest request) { var options = new InvokeOptions(); - options.RequestMarshaller = CreatePlayerSessionsRequestMarshaller.Instance; - options.ResponseUnmarshaller = CreatePlayerSessionsResponseUnmarshaller.Instance; - - return InvokeAsync(request, options, cancellationToken); - } + options.RequestMarshaller = DeleteBuildRequestMarshaller.Instance; + options.ResponseUnmarshaller = DeleteBuildResponseUnmarshaller.Instance; - #endregion - - #region CreateScript + return Invoke(request, options); + } /// - /// Creates a new script record for your Realtime Servers script. Realtime scripts are - /// JavaScript that provide configuration settings and optional custom game logic for - /// your game. The script is deployed when you create a Realtime Servers fleet to host - /// your game sessions. Script logic is executed during an active game session. + /// Deletes a build. This operation permanently deletes the build resource and any uploaded + /// build files. Deleting a build does not affect the status of any active fleets using + /// the build, but you can no longer create new fleets with the deleted build. /// /// /// - /// To create a new script record, specify a script name and provide the script file(s). - /// The script files and all dependencies must be zipped into a single file. You can pull - /// the zip file from either of these locations: - /// - ///
    • - /// - /// A locally available directory. Use the ZipFile parameter for this option. - /// - ///
    • - /// - /// An Amazon Simple Storage Service (Amazon S3) bucket under your Amazon Web Services - /// account. Use the StorageLocation parameter for this option. You'll need to - /// have an Identity Access Management (IAM) role that allows the Amazon GameLift service - /// to access your S3 bucket. - /// - ///
    - /// - /// If the call is successful, a new script record is created with a unique script ID. - /// If the script file is provided as a local file, the file is uploaded to an Amazon - /// GameLift-owned S3 bucket and the script record's storage location reflects this location. - /// If the script file is provided as an S3 bucket, Amazon GameLift accesses the file - /// at this storage location as needed for deployment. + /// To delete a build, specify the build ID. /// /// /// @@ -3678,17 +4782,8 @@ public virtual CreatePlayerSessionsResponse CreatePlayerSessions(CreatePlayerSes /// /// /// - /// Amazon - /// GameLift Realtime Servers - /// - /// - /// - /// Set - /// Up a Role for Amazon GameLift Access - /// - /// - /// - /// Related actions + /// + /// Upload a Custom Server Build /// /// /// @@ -3696,13 +4791,12 @@ public virtual CreatePlayerSessionsResponse CreatePlayerSessions(CreatePlayerSes /// APIs by task /// ///     - /// Container for the necessary parameters to execute the CreateScript service method. - /// - /// The response from the CreateScript service method, as returned by GameLift. - /// - /// The requested operation would cause a conflict with the current state of a service - /// resource associated with the request. Resolve the conflict before retrying this request. - /// + /// A unique identifier for the build to delete. You can use either the build ID or ARN value. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the DeleteBuild service method, as returned by GameLift. /// /// The service encountered an unrecoverable internal failure while processing the request. /// Clients can retry such requests immediately or after a waiting period. @@ -3711,6 +4805,10 @@ public virtual CreatePlayerSessionsResponse CreatePlayerSessions(CreatePlayerSes /// One or more parameter values in the request are invalid. Correct the invalid parameter /// values before retrying. /// + /// + /// The requested resources was not found. The resource was either not created yet or + /// deleted. + /// /// /// The requested tagging operation did not succeed. This may be due to invalid tag format /// or the maximum tag limit may have been exceeded. Resolve the issue before retrying. @@ -3718,47 +4816,23 @@ public virtual CreatePlayerSessionsResponse CreatePlayerSessions(CreatePlayerSes /// /// The client failed authentication. Clients should not retry such requests. /// - /// REST API Reference for CreateScript Operation - public virtual CreateScriptResponse CreateScript(CreateScriptRequest request) + /// REST API Reference for DeleteBuild Operation + public virtual Task DeleteBuildAsync(string buildId, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { - var options = new InvokeOptions(); - options.RequestMarshaller = CreateScriptRequestMarshaller.Instance; - options.ResponseUnmarshaller = CreateScriptResponseUnmarshaller.Instance; - - return Invoke(request, options); + var request = new DeleteBuildRequest(); + request.BuildId = buildId; + return DeleteBuildAsync(request, cancellationToken); } /// - /// Creates a new script record for your Realtime Servers script. Realtime scripts are - /// JavaScript that provide configuration settings and optional custom game logic for - /// your game. The script is deployed when you create a Realtime Servers fleet to host - /// your game sessions. Script logic is executed during an active game session. + /// Deletes a build. This operation permanently deletes the build resource and any uploaded + /// build files. Deleting a build does not affect the status of any active fleets using + /// the build, but you can no longer create new fleets with the deleted build. /// /// /// - /// To create a new script record, specify a script name and provide the script file(s). - /// The script files and all dependencies must be zipped into a single file. You can pull - /// the zip file from either of these locations: - /// - ///
    • - /// - /// A locally available directory. Use the ZipFile parameter for this option. - /// - ///
    • - /// - /// An Amazon Simple Storage Service (Amazon S3) bucket under your Amazon Web Services - /// account. Use the StorageLocation parameter for this option. You'll need to - /// have an Identity Access Management (IAM) role that allows the Amazon GameLift service - /// to access your S3 bucket. - /// - ///
    - /// - /// If the call is successful, a new script record is created with a unique script ID. - /// If the script file is provided as a local file, the file is uploaded to an Amazon - /// GameLift-owned S3 bucket and the script record's storage location reflects this location. - /// If the script file is provided as an S3 bucket, Amazon GameLift accesses the file - /// at this storage location as needed for deployment. + /// To delete a build, specify the build ID. /// /// /// @@ -3766,17 +4840,8 @@ public virtual CreateScriptResponse CreateScript(CreateScriptRequest request) /// /// /// - /// Amazon - /// GameLift Realtime Servers - /// - /// - /// - /// Set - /// Up a Role for Amazon GameLift Access - /// - /// - /// - /// Related actions + /// + /// Upload a Custom Server Build /// /// /// @@ -3784,16 +4849,12 @@ public virtual CreateScriptResponse CreateScript(CreateScriptRequest request) /// APIs by task /// ///     - /// Container for the necessary parameters to execute the CreateScript service method. + /// Container for the necessary parameters to execute the DeleteBuild service method. /// /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// /// - /// The response from the CreateScript service method, as returned by GameLift. - /// - /// The requested operation would cause a conflict with the current state of a service - /// resource associated with the request. Resolve the conflict before retrying this request. - /// + /// The response from the DeleteBuild service method, as returned by GameLift. /// /// The service encountered an unrecoverable internal failure while processing the request. /// Clients can retry such requests immediately or after a waiting period. @@ -3802,6 +4863,10 @@ public virtual CreateScriptResponse CreateScript(CreateScriptRequest request) /// One or more parameter values in the request are invalid. Correct the invalid parameter /// values before retrying. /// + /// + /// The requested resources was not found. The resource was either not created yet or + /// deleted. + /// /// /// The requested tagging operation did not succeed. This may be due to invalid tag format /// or the maximum tag limit may have been exceeded. Resolve the issue before retrying. @@ -3809,72 +4874,44 @@ public virtual CreateScriptResponse CreateScript(CreateScriptRequest request) /// /// The client failed authentication. Clients should not retry such requests. /// - /// REST API Reference for CreateScript Operation - public virtual Task CreateScriptAsync(CreateScriptRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + /// REST API Reference for DeleteBuild Operation + public virtual Task DeleteBuildAsync(DeleteBuildRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { var options = new InvokeOptions(); - options.RequestMarshaller = CreateScriptRequestMarshaller.Instance; - options.ResponseUnmarshaller = CreateScriptResponseUnmarshaller.Instance; + options.RequestMarshaller = DeleteBuildRequestMarshaller.Instance; + options.ResponseUnmarshaller = DeleteBuildResponseUnmarshaller.Instance; - return InvokeAsync(request, options, cancellationToken); + return InvokeAsync(request, options, cancellationToken); } #endregion - #region CreateVpcPeeringAuthorization + #region DeleteContainerFleet /// - /// Requests authorization to create or delete a peer connection between the VPC for your - /// Amazon GameLift fleet and a virtual private cloud (VPC) in your Amazon Web Services - /// account. VPC peering enables the game servers on your fleet to communicate directly - /// with other Amazon Web Services resources. After you've received authorization, use - /// CreateVpcPeeringConnection - /// to establish the peering connection. For more information, see VPC - /// Peering with Amazon GameLift Fleets. - /// - /// - /// - /// You can peer with VPCs that are owned by any Amazon Web Services account you have - /// access to, including the account that you use to manage your Amazon GameLift fleets. - /// You cannot peer with VPCs that are in different Regions. - /// - /// - /// - /// To request authorization to create a connection, call this operation from the Amazon - /// Web Services account with the VPC that you want to peer to your Amazon GameLift fleet. - /// For example, to enable your game servers to retrieve data from a DynamoDB table, use - /// the account that manages that DynamoDB resource. Identify the following values: (1) - /// The ID of the VPC that you want to peer with, and (2) the ID of the Amazon Web Services - /// account that you use to manage Amazon GameLift. If successful, VPC peering is authorized - /// for the specified VPC. - /// - /// - /// - /// To request authorization to delete a connection, call this operation from the Amazon - /// Web Services account with the VPC that is peered with your Amazon GameLift fleet. - /// Identify the following values: (1) VPC ID that you want to delete the peering connection - /// for, and (2) ID of the Amazon Web Services account that you use to manage Amazon GameLift. + /// Deletes all resources and information related to a container fleet and shuts down + /// currently running fleet instances, including those in remote locations. The container + /// fleet must be in ACTIVE status to be deleted. /// - /// /// /// - /// The authorization remains valid for 24 hours unless it is canceled. You must create - /// or delete the peering connection while the authorization is valid. + /// To delete a fleet, specify the fleet ID to be terminated. During the deletion process, + /// the fleet status is changed to DELETING. /// /// /// - /// Related actions + /// Learn more /// /// /// - /// All - /// APIs by task + /// Setting + /// up Amazon GameLift Fleets /// /// - /// Container for the necessary parameters to execute the CreateVpcPeeringAuthorization service method. + /// Container for the necessary parameters to execute the DeleteContainerFleet service method. /// - /// The response from the CreateVpcPeeringAuthorization service method, as returned by GameLift. + /// The response from the DeleteContainerFleet service method, as returned by GameLift. /// /// The service encountered an unrecoverable internal failure while processing the request. /// Clients can retry such requests immediately or after a waiting period. @@ -3887,74 +4924,53 @@ public virtual CreateScriptResponse CreateScript(CreateScriptRequest request) /// The requested resources was not found. The resource was either not created yet or /// deleted. /// + /// + /// The requested tagging operation did not succeed. This may be due to invalid tag format + /// or the maximum tag limit may have been exceeded. Resolve the issue before retrying. + /// /// /// The client failed authentication. Clients should not retry such requests. /// - /// REST API Reference for CreateVpcPeeringAuthorization Operation - public virtual CreateVpcPeeringAuthorizationResponse CreateVpcPeeringAuthorization(CreateVpcPeeringAuthorizationRequest request) + /// + /// The requested operation is not supported in the Region specified. + /// + /// REST API Reference for DeleteContainerFleet Operation + public virtual DeleteContainerFleetResponse DeleteContainerFleet(DeleteContainerFleetRequest request) { var options = new InvokeOptions(); - options.RequestMarshaller = CreateVpcPeeringAuthorizationRequestMarshaller.Instance; - options.ResponseUnmarshaller = CreateVpcPeeringAuthorizationResponseUnmarshaller.Instance; + options.RequestMarshaller = DeleteContainerFleetRequestMarshaller.Instance; + options.ResponseUnmarshaller = DeleteContainerFleetResponseUnmarshaller.Instance; - return Invoke(request, options); + return Invoke(request, options); } /// - /// Requests authorization to create or delete a peer connection between the VPC for your - /// Amazon GameLift fleet and a virtual private cloud (VPC) in your Amazon Web Services - /// account. VPC peering enables the game servers on your fleet to communicate directly - /// with other Amazon Web Services resources. After you've received authorization, use - /// CreateVpcPeeringConnection - /// to establish the peering connection. For more information, see VPC - /// Peering with Amazon GameLift Fleets. - /// - /// - /// - /// You can peer with VPCs that are owned by any Amazon Web Services account you have - /// access to, including the account that you use to manage your Amazon GameLift fleets. - /// You cannot peer with VPCs that are in different Regions. - /// - /// - /// - /// To request authorization to create a connection, call this operation from the Amazon - /// Web Services account with the VPC that you want to peer to your Amazon GameLift fleet. - /// For example, to enable your game servers to retrieve data from a DynamoDB table, use - /// the account that manages that DynamoDB resource. Identify the following values: (1) - /// The ID of the VPC that you want to peer with, and (2) the ID of the Amazon Web Services - /// account that you use to manage Amazon GameLift. If successful, VPC peering is authorized - /// for the specified VPC. - /// - /// - /// - /// To request authorization to delete a connection, call this operation from the Amazon - /// Web Services account with the VPC that is peered with your Amazon GameLift fleet. - /// Identify the following values: (1) VPC ID that you want to delete the peering connection - /// for, and (2) ID of the Amazon Web Services account that you use to manage Amazon GameLift. + /// Deletes all resources and information related to a container fleet and shuts down + /// currently running fleet instances, including those in remote locations. The container + /// fleet must be in ACTIVE status to be deleted. /// - /// /// /// - /// The authorization remains valid for 24 hours unless it is canceled. You must create - /// or delete the peering connection while the authorization is valid. + /// To delete a fleet, specify the fleet ID to be terminated. During the deletion process, + /// the fleet status is changed to DELETING. /// /// /// - /// Related actions + /// Learn more /// /// /// - /// All - /// APIs by task + /// Setting + /// up Amazon GameLift Fleets /// /// - /// Container for the necessary parameters to execute the CreateVpcPeeringAuthorization service method. + /// Container for the necessary parameters to execute the DeleteContainerFleet service method. /// /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// /// - /// The response from the CreateVpcPeeringAuthorization service method, as returned by GameLift. + /// The response from the DeleteContainerFleet service method, as returned by GameLift. /// /// The service encountered an unrecoverable internal failure while processing the request. /// Clients can retry such requests immediately or after a waiting period. @@ -3967,68 +4983,69 @@ public virtual CreateVpcPeeringAuthorizationResponse CreateVpcPeeringAuthorizati /// The requested resources was not found. The resource was either not created yet or /// deleted. /// + /// + /// The requested tagging operation did not succeed. This may be due to invalid tag format + /// or the maximum tag limit may have been exceeded. Resolve the issue before retrying. + /// /// /// The client failed authentication. Clients should not retry such requests. /// - /// REST API Reference for CreateVpcPeeringAuthorization Operation - public virtual Task CreateVpcPeeringAuthorizationAsync(CreateVpcPeeringAuthorizationRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + /// + /// The requested operation is not supported in the Region specified. + /// + /// REST API Reference for DeleteContainerFleet Operation + public virtual Task DeleteContainerFleetAsync(DeleteContainerFleetRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { var options = new InvokeOptions(); - options.RequestMarshaller = CreateVpcPeeringAuthorizationRequestMarshaller.Instance; - options.ResponseUnmarshaller = CreateVpcPeeringAuthorizationResponseUnmarshaller.Instance; + options.RequestMarshaller = DeleteContainerFleetRequestMarshaller.Instance; + options.ResponseUnmarshaller = DeleteContainerFleetResponseUnmarshaller.Instance; - return InvokeAsync(request, options, cancellationToken); + return InvokeAsync(request, options, cancellationToken); } #endregion - #region CreateVpcPeeringConnection + #region DeleteContainerGroupDefinition /// - /// Establishes a VPC peering connection between a virtual private cloud (VPC) in an Amazon - /// Web Services account with the VPC for your Amazon GameLift fleet. VPC peering enables - /// the game servers on your fleet to communicate directly with other Amazon Web Services - /// resources. You can peer with VPCs in any Amazon Web Services account that you have - /// access to, including the account that you use to manage your Amazon GameLift fleets. - /// You cannot peer with VPCs that are in different Regions. For more information, see - /// VPC - /// Peering with Amazon GameLift Fleets. + /// Deletes a container group definition. You can delete a container group definition + /// if there are no fleets using the definition. /// /// /// - /// Before calling this operation to establish the peering connection, you first need - /// to use CreateVpcPeeringAuthorization - /// and identify the VPC you want to peer with. Once the authorization for the specified - /// VPC is issued, you have 24 hours to establish the connection. These two operations - /// handle all tasks necessary to peer the two VPCs, including acceptance, updating routing - /// tables, etc. + /// Request options: /// - /// + ///
    • /// - /// To establish the connection, call this operation from the Amazon Web Services account - /// that is used to manage the Amazon GameLift fleets. Identify the following values: - /// (1) The ID of the fleet you want to be enable a VPC peering connection for; (2) The - /// Amazon Web Services account with the VPC that you want to peer with; and (3) The ID - /// of the VPC you want to peer with. This operation is asynchronous. If successful, a - /// connection request is created. You can use continuous polling to track the request's - /// status using DescribeVpcPeeringConnections - /// , or by monitoring fleet events for success or failure using DescribeFleetEvents - /// . + /// Delete an entire container group definition, including all versions. Specify the container + /// group definition name, or use an ARN value without the version number. /// - /// + ///
    • /// - /// Related actions + /// Delete a particular version. Specify the container group definition name and a version + /// number, or use an ARN value that includes the version number. /// - /// + ///
    • /// - /// All - /// APIs by task + /// Keep the newest versions and delete all older versions. Specify the container group + /// definition name and the number of versions to retain. For example, set VersionCountToRetain + /// to 5 to delete all but the five most recent versions. + /// + ///
    + /// + /// Learn more + /// + /// ///     - /// Container for the necessary parameters to execute the CreateVpcPeeringConnection service method. + /// Container for the necessary parameters to execute the DeleteContainerGroupDefinition service method. /// - /// The response from the CreateVpcPeeringConnection service method, as returned by GameLift. + /// The response from the DeleteContainerGroupDefinition service method, as returned by GameLift. /// /// The service encountered an unrecoverable internal failure while processing the request. /// Clients can retry such requests immediately or after a waiting period. @@ -4041,67 +5058,68 @@ public virtual CreateVpcPeeringAuthorizationResponse CreateVpcPeeringAuthorizati /// The requested resources was not found. The resource was either not created yet or /// deleted. /// + /// + /// The requested tagging operation did not succeed. This may be due to invalid tag format + /// or the maximum tag limit may have been exceeded. Resolve the issue before retrying. + /// /// /// The client failed authentication. Clients should not retry such requests. /// - /// REST API Reference for CreateVpcPeeringConnection Operation - public virtual CreateVpcPeeringConnectionResponse CreateVpcPeeringConnection(CreateVpcPeeringConnectionRequest request) + /// + /// The requested operation is not supported in the Region specified. + /// + /// REST API Reference for DeleteContainerGroupDefinition Operation + public virtual DeleteContainerGroupDefinitionResponse DeleteContainerGroupDefinition(DeleteContainerGroupDefinitionRequest request) { var options = new InvokeOptions(); - options.RequestMarshaller = CreateVpcPeeringConnectionRequestMarshaller.Instance; - options.ResponseUnmarshaller = CreateVpcPeeringConnectionResponseUnmarshaller.Instance; + options.RequestMarshaller = DeleteContainerGroupDefinitionRequestMarshaller.Instance; + options.ResponseUnmarshaller = DeleteContainerGroupDefinitionResponseUnmarshaller.Instance; - return Invoke(request, options); + return Invoke(request, options); } /// - /// Establishes a VPC peering connection between a virtual private cloud (VPC) in an Amazon - /// Web Services account with the VPC for your Amazon GameLift fleet. VPC peering enables - /// the game servers on your fleet to communicate directly with other Amazon Web Services - /// resources. You can peer with VPCs in any Amazon Web Services account that you have - /// access to, including the account that you use to manage your Amazon GameLift fleets. - /// You cannot peer with VPCs that are in different Regions. For more information, see - /// VPC - /// Peering with Amazon GameLift Fleets. + /// Deletes a container group definition. You can delete a container group definition + /// if there are no fleets using the definition. /// /// /// - /// Before calling this operation to establish the peering connection, you first need - /// to use CreateVpcPeeringAuthorization - /// and identify the VPC you want to peer with. Once the authorization for the specified - /// VPC is issued, you have 24 hours to establish the connection. These two operations - /// handle all tasks necessary to peer the two VPCs, including acceptance, updating routing - /// tables, etc. + /// Request options: /// - /// + ///
    • /// - /// To establish the connection, call this operation from the Amazon Web Services account - /// that is used to manage the Amazon GameLift fleets. Identify the following values: - /// (1) The ID of the fleet you want to be enable a VPC peering connection for; (2) The - /// Amazon Web Services account with the VPC that you want to peer with; and (3) The ID - /// of the VPC you want to peer with. This operation is asynchronous. If successful, a - /// connection request is created. You can use continuous polling to track the request's - /// status using DescribeVpcPeeringConnections - /// , or by monitoring fleet events for success or failure using DescribeFleetEvents - /// . + /// Delete an entire container group definition, including all versions. Specify the container + /// group definition name, or use an ARN value without the version number. /// - /// + ///
    • /// - /// Related actions + /// Delete a particular version. Specify the container group definition name and a version + /// number, or use an ARN value that includes the version number. /// - /// + ///
    • /// - /// All - /// APIs by task + /// Keep the newest versions and delete all older versions. Specify the container group + /// definition name and the number of versions to retain. For example, set VersionCountToRetain + /// to 5 to delete all but the five most recent versions. + /// + ///
    + /// + /// Learn more + /// + /// ///     - /// Container for the necessary parameters to execute the CreateVpcPeeringConnection service method. + /// Container for the necessary parameters to execute the DeleteContainerGroupDefinition service method. /// /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// /// - /// The response from the CreateVpcPeeringConnection service method, as returned by GameLift. + /// The response from the DeleteContainerGroupDefinition service method, as returned by GameLift. /// /// The service encountered an unrecoverable internal failure while processing the request. /// Clients can retry such requests immediately or after a waiting period. @@ -4114,46 +5132,68 @@ public virtual CreateVpcPeeringConnectionResponse CreateVpcPeeringConnection(Cre /// The requested resources was not found. The resource was either not created yet or /// deleted. /// + /// + /// The requested tagging operation did not succeed. This may be due to invalid tag format + /// or the maximum tag limit may have been exceeded. Resolve the issue before retrying. + /// /// /// The client failed authentication. Clients should not retry such requests. /// - /// REST API Reference for CreateVpcPeeringConnection Operation - public virtual Task CreateVpcPeeringConnectionAsync(CreateVpcPeeringConnectionRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + /// + /// The requested operation is not supported in the Region specified. + /// + /// REST API Reference for DeleteContainerGroupDefinition Operation + public virtual Task DeleteContainerGroupDefinitionAsync(DeleteContainerGroupDefinitionRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { var options = new InvokeOptions(); - options.RequestMarshaller = CreateVpcPeeringConnectionRequestMarshaller.Instance; - options.ResponseUnmarshaller = CreateVpcPeeringConnectionResponseUnmarshaller.Instance; + options.RequestMarshaller = DeleteContainerGroupDefinitionRequestMarshaller.Instance; + options.ResponseUnmarshaller = DeleteContainerGroupDefinitionResponseUnmarshaller.Instance; - return InvokeAsync(request, options, cancellationToken); + return InvokeAsync(request, options, cancellationToken); } #endregion - #region DeleteAlias + #region DeleteFleet /// - /// Deletes an alias. This operation removes all record of the alias. Game clients attempting - /// to access a server process using the deleted alias receive an error. To delete an - /// alias, specify the alias ID to be deleted. + /// Deletes all resources and information related to a fleet and shuts down any currently + /// running fleet instances, including those in remote locations. /// + /// + /// + /// If the fleet being deleted has a VPC peering connection, you first need to get a valid + /// authorization (good for 24 hours) by calling CreateVpcPeeringAuthorization. + /// You don't need to explicitly delete the VPC peering connection. + /// + /// + /// + /// To delete a fleet, specify the fleet ID to be terminated. During the deletion process, + /// the fleet status is changed to DELETING. When completed, the status switches + /// to TERMINATED and the fleet event FLEET_DELETED is emitted. + /// /// /// - /// Related actions + /// Learn more /// /// /// - /// All - /// APIs by task + /// Setting + /// up Amazon GameLift Fleets /// /// - /// A unique identifier of the alias that you want to delete. You can use either the alias ID or ARN value. + /// A unique identifier for the fleet to be deleted. You can use either the fleet ID or ARN value. /// - /// The response from the DeleteAlias service method, as returned by GameLift. + /// The response from the DeleteFleet service method, as returned by GameLift. /// /// The service encountered an unrecoverable internal failure while processing the request. /// Clients can retry such requests immediately or after a waiting period. /// + /// + /// The requested operation would cause a conflict with the current state of a resource + /// associated with the request and/or the fleet. Resolve the conflict before retrying. + /// /// /// One or more parameter values in the request are invalid. Correct the invalid parameter /// values before retrying. @@ -4169,37 +5209,52 @@ public virtual CreateVpcPeeringConnectionResponse CreateVpcPeeringConnection(Cre /// /// The client failed authentication. Clients should not retry such requests. /// - /// REST API Reference for DeleteAlias Operation - public virtual DeleteAliasResponse DeleteAlias(string aliasId) + /// REST API Reference for DeleteFleet Operation + public virtual DeleteFleetResponse DeleteFleet(string fleetId) { - var request = new DeleteAliasRequest(); - request.AliasId = aliasId; - return DeleteAlias(request); + var request = new DeleteFleetRequest(); + request.FleetId = fleetId; + return DeleteFleet(request); } /// - /// Deletes an alias. This operation removes all record of the alias. Game clients attempting - /// to access a server process using the deleted alias receive an error. To delete an - /// alias, specify the alias ID to be deleted. + /// Deletes all resources and information related to a fleet and shuts down any currently + /// running fleet instances, including those in remote locations. /// + /// + /// + /// If the fleet being deleted has a VPC peering connection, you first need to get a valid + /// authorization (good for 24 hours) by calling CreateVpcPeeringAuthorization. + /// You don't need to explicitly delete the VPC peering connection. + /// + /// + /// + /// To delete a fleet, specify the fleet ID to be terminated. During the deletion process, + /// the fleet status is changed to DELETING. When completed, the status switches + /// to TERMINATED and the fleet event FLEET_DELETED is emitted. + /// /// /// - /// Related actions + /// Learn more /// /// /// - /// All - /// APIs by task + /// Setting + /// up Amazon GameLift Fleets /// /// - /// Container for the necessary parameters to execute the DeleteAlias service method. + /// Container for the necessary parameters to execute the DeleteFleet service method. /// - /// The response from the DeleteAlias service method, as returned by GameLift. + /// The response from the DeleteFleet service method, as returned by GameLift. /// /// The service encountered an unrecoverable internal failure while processing the request. /// Clients can retry such requests immediately or after a waiting period. /// + /// + /// The requested operation would cause a conflict with the current state of a resource + /// associated with the request and/or the fleet. Resolve the conflict before retrying. + /// /// /// One or more parameter values in the request are invalid. Correct the invalid parameter /// values before retrying. @@ -4215,42 +5270,57 @@ public virtual DeleteAliasResponse DeleteAlias(string aliasId) /// /// The client failed authentication. Clients should not retry such requests. /// - /// REST API Reference for DeleteAlias Operation - public virtual DeleteAliasResponse DeleteAlias(DeleteAliasRequest request) + /// REST API Reference for DeleteFleet Operation + public virtual DeleteFleetResponse DeleteFleet(DeleteFleetRequest request) { var options = new InvokeOptions(); - options.RequestMarshaller = DeleteAliasRequestMarshaller.Instance; - options.ResponseUnmarshaller = DeleteAliasResponseUnmarshaller.Instance; + options.RequestMarshaller = DeleteFleetRequestMarshaller.Instance; + options.ResponseUnmarshaller = DeleteFleetResponseUnmarshaller.Instance; - return Invoke(request, options); + return Invoke(request, options); } /// - /// Deletes an alias. This operation removes all record of the alias. Game clients attempting - /// to access a server process using the deleted alias receive an error. To delete an - /// alias, specify the alias ID to be deleted. + /// Deletes all resources and information related to a fleet and shuts down any currently + /// running fleet instances, including those in remote locations. /// + /// + /// + /// If the fleet being deleted has a VPC peering connection, you first need to get a valid + /// authorization (good for 24 hours) by calling CreateVpcPeeringAuthorization. + /// You don't need to explicitly delete the VPC peering connection. + /// + /// + /// + /// To delete a fleet, specify the fleet ID to be terminated. During the deletion process, + /// the fleet status is changed to DELETING. When completed, the status switches + /// to TERMINATED and the fleet event FLEET_DELETED is emitted. + /// /// /// - /// Related actions + /// Learn more /// /// /// - /// All - /// APIs by task + /// Setting + /// up Amazon GameLift Fleets /// /// - /// A unique identifier of the alias that you want to delete. You can use either the alias ID or ARN value. + /// A unique identifier for the fleet to be deleted. You can use either the fleet ID or ARN value. /// /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// /// - /// The response from the DeleteAlias service method, as returned by GameLift. + /// The response from the DeleteFleet service method, as returned by GameLift. /// /// The service encountered an unrecoverable internal failure while processing the request. /// Clients can retry such requests immediately or after a waiting period. /// + /// + /// The requested operation would cause a conflict with the current state of a resource + /// associated with the request and/or the fleet. Resolve the conflict before retrying. + /// /// /// One or more parameter values in the request are invalid. Correct the invalid parameter /// values before retrying. @@ -4266,40 +5336,55 @@ public virtual DeleteAliasResponse DeleteAlias(DeleteAliasRequest request) /// /// The client failed authentication. Clients should not retry such requests. /// - /// REST API Reference for DeleteAlias Operation - public virtual Task DeleteAliasAsync(string aliasId, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + /// REST API Reference for DeleteFleet Operation + public virtual Task DeleteFleetAsync(string fleetId, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { - var request = new DeleteAliasRequest(); - request.AliasId = aliasId; - return DeleteAliasAsync(request, cancellationToken); + var request = new DeleteFleetRequest(); + request.FleetId = fleetId; + return DeleteFleetAsync(request, cancellationToken); } /// - /// Deletes an alias. This operation removes all record of the alias. Game clients attempting - /// to access a server process using the deleted alias receive an error. To delete an - /// alias, specify the alias ID to be deleted. + /// Deletes all resources and information related to a fleet and shuts down any currently + /// running fleet instances, including those in remote locations. /// + /// + /// + /// If the fleet being deleted has a VPC peering connection, you first need to get a valid + /// authorization (good for 24 hours) by calling CreateVpcPeeringAuthorization. + /// You don't need to explicitly delete the VPC peering connection. + /// + /// + /// + /// To delete a fleet, specify the fleet ID to be terminated. During the deletion process, + /// the fleet status is changed to DELETING. When completed, the status switches + /// to TERMINATED and the fleet event FLEET_DELETED is emitted. + /// /// /// - /// Related actions + /// Learn more /// /// /// - /// All - /// APIs by task + /// Setting + /// up Amazon GameLift Fleets /// /// - /// Container for the necessary parameters to execute the DeleteAlias service method. + /// Container for the necessary parameters to execute the DeleteFleet service method. /// /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// /// - /// The response from the DeleteAlias service method, as returned by GameLift. + /// The response from the DeleteFleet service method, as returned by GameLift. /// /// The service encountered an unrecoverable internal failure while processing the request. /// Clients can retry such requests immediately or after a waiting period. /// + /// + /// The requested operation would cause a conflict with the current state of a resource + /// associated with the request and/or the fleet. Resolve the conflict before retrying. + /// /// /// One or more parameter values in the request are invalid. Correct the invalid parameter /// values before retrying. @@ -4315,48 +5400,50 @@ public virtual DeleteAliasResponse DeleteAlias(DeleteAliasRequest request) /// /// The client failed authentication. Clients should not retry such requests. /// - /// REST API Reference for DeleteAlias Operation - public virtual Task DeleteAliasAsync(DeleteAliasRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + /// REST API Reference for DeleteFleet Operation + public virtual Task DeleteFleetAsync(DeleteFleetRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { var options = new InvokeOptions(); - options.RequestMarshaller = DeleteAliasRequestMarshaller.Instance; - options.ResponseUnmarshaller = DeleteAliasResponseUnmarshaller.Instance; + options.RequestMarshaller = DeleteFleetRequestMarshaller.Instance; + options.ResponseUnmarshaller = DeleteFleetResponseUnmarshaller.Instance; - return InvokeAsync(request, options, cancellationToken); + return InvokeAsync(request, options, cancellationToken); } #endregion - #region DeleteBuild + #region DeleteFleetLocations /// - /// Deletes a build. This operation permanently deletes the build resource and any uploaded - /// build files. Deleting a build does not affect the status of any active fleets using - /// the build, but you can no longer create new fleets with the deleted build. + /// Removes locations from a multi-location fleet. When deleting a location, all game + /// server process and all instances that are still active in the location are shut down. + /// /// /// /// - /// To delete a build, specify the build ID. + /// To delete fleet locations, identify the fleet ID and provide a list of the locations + /// to be deleted. /// /// /// - /// Learn more + /// If successful, GameLift sets the location status to DELETING, and begins to + /// shut down existing server processes and terminate instances in each location being + /// deleted. When completed, the location status changes to TERMINATED. /// /// /// - /// - /// Upload a Custom Server Build + /// Learn more /// /// /// - /// All - /// APIs by task + /// Setting + /// up Amazon GameLift fleets /// /// - /// A unique identifier for the build to delete. You can use either the build ID or ARN value. + /// Container for the necessary parameters to execute the DeleteFleetLocations service method. /// - /// The response from the DeleteBuild service method, as returned by GameLift. + /// The response from the DeleteFleetLocations service method, as returned by GameLift. /// /// The service encountered an unrecoverable internal failure while processing the request. /// Clients can retry such requests immediately or after a waiting period. @@ -4369,49 +5456,55 @@ public virtual DeleteAliasResponse DeleteAlias(DeleteAliasRequest request) /// The requested resources was not found. The resource was either not created yet or /// deleted. /// - /// - /// The requested tagging operation did not succeed. This may be due to invalid tag format - /// or the maximum tag limit may have been exceeded. Resolve the issue before retrying. - /// /// /// The client failed authentication. Clients should not retry such requests. /// - /// REST API Reference for DeleteBuild Operation - public virtual DeleteBuildResponse DeleteBuild(string buildId) + /// + /// The requested operation is not supported in the Region specified. + /// + /// REST API Reference for DeleteFleetLocations Operation + public virtual DeleteFleetLocationsResponse DeleteFleetLocations(DeleteFleetLocationsRequest request) { - var request = new DeleteBuildRequest(); - request.BuildId = buildId; - return DeleteBuild(request); + var options = new InvokeOptions(); + options.RequestMarshaller = DeleteFleetLocationsRequestMarshaller.Instance; + options.ResponseUnmarshaller = DeleteFleetLocationsResponseUnmarshaller.Instance; + + return Invoke(request, options); } /// - /// Deletes a build. This operation permanently deletes the build resource and any uploaded - /// build files. Deleting a build does not affect the status of any active fleets using - /// the build, but you can no longer create new fleets with the deleted build. + /// Removes locations from a multi-location fleet. When deleting a location, all game + /// server process and all instances that are still active in the location are shut down. + /// /// /// /// - /// To delete a build, specify the build ID. + /// To delete fleet locations, identify the fleet ID and provide a list of the locations + /// to be deleted. /// /// /// - /// Learn more + /// If successful, GameLift sets the location status to DELETING, and begins to + /// shut down existing server processes and terminate instances in each location being + /// deleted. When completed, the location status changes to TERMINATED. /// /// /// - /// - /// Upload a Custom Server Build + /// Learn more /// /// /// - /// All - /// APIs by task + /// Setting + /// up Amazon GameLift fleets /// /// - /// Container for the necessary parameters to execute the DeleteBuild service method. + /// Container for the necessary parameters to execute the DeleteFleetLocations service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// /// - /// The response from the DeleteBuild service method, as returned by GameLift. + /// The response from the DeleteFleetLocations service method, as returned by GameLift. /// /// The service encountered an unrecoverable internal failure while processing the request. /// Clients can retry such requests immediately or after a waiting period. @@ -4424,54 +5517,82 @@ public virtual DeleteBuildResponse DeleteBuild(string buildId) /// The requested resources was not found. The resource was either not created yet or /// deleted. /// - /// - /// The requested tagging operation did not succeed. This may be due to invalid tag format - /// or the maximum tag limit may have been exceeded. Resolve the issue before retrying. - /// /// /// The client failed authentication. Clients should not retry such requests. /// - /// REST API Reference for DeleteBuild Operation - public virtual DeleteBuildResponse DeleteBuild(DeleteBuildRequest request) + /// + /// The requested operation is not supported in the Region specified. + /// + /// REST API Reference for DeleteFleetLocations Operation + public virtual Task DeleteFleetLocationsAsync(DeleteFleetLocationsRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { var options = new InvokeOptions(); - options.RequestMarshaller = DeleteBuildRequestMarshaller.Instance; - options.ResponseUnmarshaller = DeleteBuildResponseUnmarshaller.Instance; - - return Invoke(request, options); + options.RequestMarshaller = DeleteFleetLocationsRequestMarshaller.Instance; + options.ResponseUnmarshaller = DeleteFleetLocationsResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); } + #endregion + + #region DeleteGameServerGroup + /// - /// Deletes a build. This operation permanently deletes the build resource and any uploaded - /// build files. Deleting a build does not affect the status of any active fleets using - /// the build, but you can no longer create new fleets with the deleted build. + /// This operation is used with the Amazon GameLift FleetIQ solution and game server + /// groups. /// /// /// - /// To delete a build, specify the build ID. + /// Terminates a game server group and permanently deletes the game server group record. + /// You have several options for how these resources are impacted when deleting the game + /// server group. Depending on the type of delete operation selected, this operation might + /// affect these resources: + /// + ///
    • + /// + /// The game server group + /// + ///
    • + /// + /// The corresponding Auto Scaling group + /// + ///
    • + /// + /// All game servers that are currently running in the group + /// + ///
    + /// + /// To delete a game server group, identify the game server group to delete and specify + /// the type of delete operation to initiate. Game server groups can only be deleted if + /// they are in ACTIVE or ERROR status. /// /// /// - /// Learn more + /// If the delete request is successful, a series of operations are kicked off. The game + /// server group status is changed to DELETE_SCHEDULED, which prevents new game + /// servers from being registered and stops automatic scaling activity. Once all game + /// servers in the game server group are deregistered, Amazon GameLift FleetIQ can begin + /// deleting resources. If any of the delete operations fail, the game server group is + /// placed in ERROR status. /// /// /// - /// - /// Upload a Custom Server Build + /// Amazon GameLift FleetIQ emits delete events to Amazon CloudWatch. /// /// /// - /// All - /// APIs by task + /// Learn more + /// + /// + /// + /// Amazon + /// GameLift FleetIQ Guide /// ///     - /// A unique identifier for the build to delete. You can use either the build ID or ARN value. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// + /// Container for the necessary parameters to execute the DeleteGameServerGroup service method. /// - /// The response from the DeleteBuild service method, as returned by GameLift. + /// The response from the DeleteGameServerGroup service method, as returned by GameLift. /// /// The service encountered an unrecoverable internal failure while processing the request. /// Clients can retry such requests immediately or after a waiting period. @@ -4484,52 +5605,78 @@ public virtual DeleteBuildResponse DeleteBuild(DeleteBuildRequest request) /// The requested resources was not found. The resource was either not created yet or /// deleted. /// - /// - /// The requested tagging operation did not succeed. This may be due to invalid tag format - /// or the maximum tag limit may have been exceeded. Resolve the issue before retrying. - /// /// /// The client failed authentication. Clients should not retry such requests. /// - /// REST API Reference for DeleteBuild Operation - public virtual Task DeleteBuildAsync(string buildId, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + /// REST API Reference for DeleteGameServerGroup Operation + public virtual DeleteGameServerGroupResponse DeleteGameServerGroup(DeleteGameServerGroupRequest request) { - var request = new DeleteBuildRequest(); - request.BuildId = buildId; - return DeleteBuildAsync(request, cancellationToken); + var options = new InvokeOptions(); + options.RequestMarshaller = DeleteGameServerGroupRequestMarshaller.Instance; + options.ResponseUnmarshaller = DeleteGameServerGroupResponseUnmarshaller.Instance; + + return Invoke(request, options); } /// - /// Deletes a build. This operation permanently deletes the build resource and any uploaded - /// build files. Deleting a build does not affect the status of any active fleets using - /// the build, but you can no longer create new fleets with the deleted build. + /// This operation is used with the Amazon GameLift FleetIQ solution and game server + /// groups. /// /// /// - /// To delete a build, specify the build ID. + /// Terminates a game server group and permanently deletes the game server group record. + /// You have several options for how these resources are impacted when deleting the game + /// server group. Depending on the type of delete operation selected, this operation might + /// affect these resources: + /// + ///
    • + /// + /// The game server group + /// + ///
    • + /// + /// The corresponding Auto Scaling group + /// + ///
    • + /// + /// All game servers that are currently running in the group + /// + ///
    + /// + /// To delete a game server group, identify the game server group to delete and specify + /// the type of delete operation to initiate. Game server groups can only be deleted if + /// they are in ACTIVE or ERROR status. /// /// /// - /// Learn more + /// If the delete request is successful, a series of operations are kicked off. The game + /// server group status is changed to DELETE_SCHEDULED, which prevents new game + /// servers from being registered and stops automatic scaling activity. Once all game + /// servers in the game server group are deregistered, Amazon GameLift FleetIQ can begin + /// deleting resources. If any of the delete operations fail, the game server group is + /// placed in ERROR status. /// /// /// - /// - /// Upload a Custom Server Build + /// Amazon GameLift FleetIQ emits delete events to Amazon CloudWatch. /// /// /// - /// All - /// APIs by task + /// Learn more + /// + /// + /// + /// Amazon + /// GameLift FleetIQ Guide /// ///     - /// Container for the necessary parameters to execute the DeleteBuild service method. + /// Container for the necessary parameters to execute the DeleteGameServerGroup service method. /// /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// /// - /// The response from the DeleteBuild service method, as returned by GameLift. + /// The response from the DeleteGameServerGroup service method, as returned by GameLift. /// /// The service encountered an unrecoverable internal failure while processing the request. /// Clients can retry such requests immediately or after a waiting period. @@ -4542,55 +5689,33 @@ public virtual DeleteBuildResponse DeleteBuild(DeleteBuildRequest request) /// The requested resources was not found. The resource was either not created yet or /// deleted. /// - /// - /// The requested tagging operation did not succeed. This may be due to invalid tag format - /// or the maximum tag limit may have been exceeded. Resolve the issue before retrying. - /// /// /// The client failed authentication. Clients should not retry such requests. /// - /// REST API Reference for DeleteBuild Operation - public virtual Task DeleteBuildAsync(DeleteBuildRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + /// REST API Reference for DeleteGameServerGroup Operation + public virtual Task DeleteGameServerGroupAsync(DeleteGameServerGroupRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { var options = new InvokeOptions(); - options.RequestMarshaller = DeleteBuildRequestMarshaller.Instance; - options.ResponseUnmarshaller = DeleteBuildResponseUnmarshaller.Instance; + options.RequestMarshaller = DeleteGameServerGroupRequestMarshaller.Instance; + options.ResponseUnmarshaller = DeleteGameServerGroupResponseUnmarshaller.Instance; - return InvokeAsync(request, options, cancellationToken); + return InvokeAsync(request, options, cancellationToken); } #endregion - #region DeleteContainerGroupDefinition + #region DeleteGameSessionQueue /// - /// This operation is used with the Amazon GameLift containers feature, which is currently - /// in public preview. - /// - /// - /// - /// Deletes a container group definition resource. You can delete a container group definition - /// if there are no fleets using the definition. - /// - /// - /// - /// To delete a container group definition, identify the resource to delete. - /// - /// - /// - /// Learn more - /// - /// + /// Deletes a game session queue. Once a queue is successfully deleted, unfulfilled StartGameSessionPlacement + /// requests that reference the queue will fail. To delete a queue, specify the queue + /// name. /// - /// Container for the necessary parameters to execute the DeleteContainerGroupDefinition service method. + /// Container for the necessary parameters to execute the DeleteGameSessionQueue service method. /// - /// The response from the DeleteContainerGroupDefinition service method, as returned by GameLift. + /// The response from the DeleteGameSessionQueue service method, as returned by GameLift. /// /// The service encountered an unrecoverable internal failure while processing the request. /// Clients can retry such requests immediately or after a waiting period. @@ -4610,50 +5735,29 @@ public virtual DeleteBuildResponse DeleteBuild(DeleteBuildRequest request) /// /// The client failed authentication. Clients should not retry such requests. /// - /// - /// The requested operation is not supported in the Region specified. - /// - /// REST API Reference for DeleteContainerGroupDefinition Operation - public virtual DeleteContainerGroupDefinitionResponse DeleteContainerGroupDefinition(DeleteContainerGroupDefinitionRequest request) + /// REST API Reference for DeleteGameSessionQueue Operation + public virtual DeleteGameSessionQueueResponse DeleteGameSessionQueue(DeleteGameSessionQueueRequest request) { var options = new InvokeOptions(); - options.RequestMarshaller = DeleteContainerGroupDefinitionRequestMarshaller.Instance; - options.ResponseUnmarshaller = DeleteContainerGroupDefinitionResponseUnmarshaller.Instance; + options.RequestMarshaller = DeleteGameSessionQueueRequestMarshaller.Instance; + options.ResponseUnmarshaller = DeleteGameSessionQueueResponseUnmarshaller.Instance; - return Invoke(request, options); + return Invoke(request, options); } /// - /// This operation is used with the Amazon GameLift containers feature, which is currently - /// in public preview. - /// - /// - /// - /// Deletes a container group definition resource. You can delete a container group definition - /// if there are no fleets using the definition. - /// - /// - /// - /// To delete a container group definition, identify the resource to delete. - /// - /// - /// - /// Learn more - /// - /// + /// Deletes a game session queue. Once a queue is successfully deleted, unfulfilled StartGameSessionPlacement + /// requests that reference the queue will fail. To delete a queue, specify the queue + /// name. /// - /// Container for the necessary parameters to execute the DeleteContainerGroupDefinition service method. + /// Container for the necessary parameters to execute the DeleteGameSessionQueue service method. /// /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// /// - /// The response from the DeleteContainerGroupDefinition service method, as returned by GameLift. + /// The response from the DeleteGameSessionQueue service method, as returned by GameLift. /// /// The service encountered an unrecoverable internal failure while processing the request. /// Clients can retry such requests immediately or after a waiting period. @@ -4673,61 +5777,37 @@ public virtual DeleteContainerGroupDefinitionResponse DeleteContainerGroupDefini /// /// The client failed authentication. Clients should not retry such requests. /// - /// - /// The requested operation is not supported in the Region specified. - /// - /// REST API Reference for DeleteContainerGroupDefinition Operation - public virtual Task DeleteContainerGroupDefinitionAsync(DeleteContainerGroupDefinitionRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + /// REST API Reference for DeleteGameSessionQueue Operation + public virtual Task DeleteGameSessionQueueAsync(DeleteGameSessionQueueRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { var options = new InvokeOptions(); - options.RequestMarshaller = DeleteContainerGroupDefinitionRequestMarshaller.Instance; - options.ResponseUnmarshaller = DeleteContainerGroupDefinitionResponseUnmarshaller.Instance; + options.RequestMarshaller = DeleteGameSessionQueueRequestMarshaller.Instance; + options.ResponseUnmarshaller = DeleteGameSessionQueueResponseUnmarshaller.Instance; - return InvokeAsync(request, options, cancellationToken); + return InvokeAsync(request, options, cancellationToken); } #endregion - #region DeleteFleet + #region DeleteLocation /// - /// Deletes all resources and information related to a fleet and shuts down any currently - /// running fleet instances, including those in remote locations. + /// Deletes a custom location. /// - /// - /// - /// If the fleet being deleted has a VPC peering connection, you first need to get a valid - /// authorization (good for 24 hours) by calling CreateVpcPeeringAuthorization. - /// You don't need to explicitly delete the VPC peering connection. - /// - /// - /// - /// To delete a fleet, specify the fleet ID to be terminated. During the deletion process, - /// the fleet status is changed to DELETING. When completed, the status switches - /// to TERMINATED and the fleet event FLEET_DELETED is emitted. - /// - /// - /// - /// Learn more - /// /// /// - /// Setting - /// up Amazon GameLift Fleets + /// Before deleting a custom location, review any fleets currently using the custom location + /// and deregister the location if it is in use. For more information, see DeregisterCompute. /// /// - /// A unique identifier for the fleet to be deleted. You can use either the fleet ID or ARN value. + /// Container for the necessary parameters to execute the DeleteLocation service method. /// - /// The response from the DeleteFleet service method, as returned by GameLift. + /// The response from the DeleteLocation service method, as returned by GameLift. /// /// The service encountered an unrecoverable internal failure while processing the request. /// Clients can retry such requests immediately or after a waiting period. /// - /// - /// The requested operation would cause a conflict with the current state of a resource - /// associated with the request and/or the fleet. Resolve the conflict before retrying. - /// /// /// One or more parameter values in the request are invalid. Correct the invalid parameter /// values before retrying. @@ -4736,59 +5816,39 @@ public virtual DeleteContainerGroupDefinitionResponse DeleteContainerGroupDefini /// The requested resources was not found. The resource was either not created yet or /// deleted. /// - /// - /// The requested tagging operation did not succeed. This may be due to invalid tag format - /// or the maximum tag limit may have been exceeded. Resolve the issue before retrying. - /// /// /// The client failed authentication. Clients should not retry such requests. /// - /// REST API Reference for DeleteFleet Operation - public virtual DeleteFleetResponse DeleteFleet(string fleetId) + /// REST API Reference for DeleteLocation Operation + public virtual DeleteLocationResponse DeleteLocation(DeleteLocationRequest request) { - var request = new DeleteFleetRequest(); - request.FleetId = fleetId; - return DeleteFleet(request); + var options = new InvokeOptions(); + options.RequestMarshaller = DeleteLocationRequestMarshaller.Instance; + options.ResponseUnmarshaller = DeleteLocationResponseUnmarshaller.Instance; + + return Invoke(request, options); } /// - /// Deletes all resources and information related to a fleet and shuts down any currently - /// running fleet instances, including those in remote locations. + /// Deletes a custom location. /// - /// - /// - /// If the fleet being deleted has a VPC peering connection, you first need to get a valid - /// authorization (good for 24 hours) by calling CreateVpcPeeringAuthorization. - /// You don't need to explicitly delete the VPC peering connection. - /// - /// - /// - /// To delete a fleet, specify the fleet ID to be terminated. During the deletion process, - /// the fleet status is changed to DELETING. When completed, the status switches - /// to TERMINATED and the fleet event FLEET_DELETED is emitted. - /// - /// - /// - /// Learn more - /// /// /// - /// Setting - /// up Amazon GameLift Fleets + /// Before deleting a custom location, review any fleets currently using the custom location + /// and deregister the location if it is in use. For more information, see DeregisterCompute. /// /// - /// Container for the necessary parameters to execute the DeleteFleet service method. + /// Container for the necessary parameters to execute the DeleteLocation service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// /// - /// The response from the DeleteFleet service method, as returned by GameLift. + /// The response from the DeleteLocation service method, as returned by GameLift. /// /// The service encountered an unrecoverable internal failure while processing the request. /// Clients can retry such requests immediately or after a waiting period. /// - /// - /// The requested operation would cause a conflict with the current state of a resource - /// associated with the request and/or the fleet. Resolve the conflict before retrying. - /// /// /// One or more parameter values in the request are invalid. Correct the invalid parameter /// values before retrying. @@ -4797,64 +5857,36 @@ public virtual DeleteFleetResponse DeleteFleet(string fleetId) /// The requested resources was not found. The resource was either not created yet or /// deleted. /// - /// - /// The requested tagging operation did not succeed. This may be due to invalid tag format - /// or the maximum tag limit may have been exceeded. Resolve the issue before retrying. - /// /// /// The client failed authentication. Clients should not retry such requests. /// - /// REST API Reference for DeleteFleet Operation - public virtual DeleteFleetResponse DeleteFleet(DeleteFleetRequest request) + /// REST API Reference for DeleteLocation Operation + public virtual Task DeleteLocationAsync(DeleteLocationRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { var options = new InvokeOptions(); - options.RequestMarshaller = DeleteFleetRequestMarshaller.Instance; - options.ResponseUnmarshaller = DeleteFleetResponseUnmarshaller.Instance; - - return Invoke(request, options); + options.RequestMarshaller = DeleteLocationRequestMarshaller.Instance; + options.ResponseUnmarshaller = DeleteLocationResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); } + #endregion + + #region DeleteMatchmakingConfiguration + /// - /// Deletes all resources and information related to a fleet and shuts down any currently - /// running fleet instances, including those in remote locations. - /// - /// - /// - /// If the fleet being deleted has a VPC peering connection, you first need to get a valid - /// authorization (good for 24 hours) by calling CreateVpcPeeringAuthorization. - /// You don't need to explicitly delete the VPC peering connection. - /// - /// - /// - /// To delete a fleet, specify the fleet ID to be terminated. During the deletion process, - /// the fleet status is changed to DELETING. When completed, the status switches - /// to TERMINATED and the fleet event FLEET_DELETED is emitted. - /// - /// - /// - /// Learn more - /// - /// - /// - /// Setting - /// up Amazon GameLift Fleets - /// + /// Permanently removes a FlexMatch matchmaking configuration. To delete, specify the + /// configuration name. A matchmaking configuration cannot be deleted if it is being used + /// in any active matchmaking tickets. /// - /// A unique identifier for the fleet to be deleted. You can use either the fleet ID or ARN value. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// + /// Container for the necessary parameters to execute the DeleteMatchmakingConfiguration service method. /// - /// The response from the DeleteFleet service method, as returned by GameLift. + /// The response from the DeleteMatchmakingConfiguration service method, as returned by GameLift. /// /// The service encountered an unrecoverable internal failure while processing the request. /// Clients can retry such requests immediately or after a waiting period. /// - /// - /// The requested operation would cause a conflict with the current state of a resource - /// associated with the request and/or the fleet. Resolve the conflict before retrying. - /// /// /// One or more parameter values in the request are invalid. Correct the invalid parameter /// values before retrying. @@ -4867,58 +5899,35 @@ public virtual DeleteFleetResponse DeleteFleet(DeleteFleetRequest request) /// The requested tagging operation did not succeed. This may be due to invalid tag format /// or the maximum tag limit may have been exceeded. Resolve the issue before retrying. /// - /// - /// The client failed authentication. Clients should not retry such requests. + /// + /// The requested operation is not supported in the Region specified. /// - /// REST API Reference for DeleteFleet Operation - public virtual Task DeleteFleetAsync(string fleetId, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + /// REST API Reference for DeleteMatchmakingConfiguration Operation + public virtual DeleteMatchmakingConfigurationResponse DeleteMatchmakingConfiguration(DeleteMatchmakingConfigurationRequest request) { - var request = new DeleteFleetRequest(); - request.FleetId = fleetId; - return DeleteFleetAsync(request, cancellationToken); + var options = new InvokeOptions(); + options.RequestMarshaller = DeleteMatchmakingConfigurationRequestMarshaller.Instance; + options.ResponseUnmarshaller = DeleteMatchmakingConfigurationResponseUnmarshaller.Instance; + + return Invoke(request, options); } /// - /// Deletes all resources and information related to a fleet and shuts down any currently - /// running fleet instances, including those in remote locations. - /// - /// - /// - /// If the fleet being deleted has a VPC peering connection, you first need to get a valid - /// authorization (good for 24 hours) by calling CreateVpcPeeringAuthorization. - /// You don't need to explicitly delete the VPC peering connection. - /// - /// - /// - /// To delete a fleet, specify the fleet ID to be terminated. During the deletion process, - /// the fleet status is changed to DELETING. When completed, the status switches - /// to TERMINATED and the fleet event FLEET_DELETED is emitted. - /// - /// - /// - /// Learn more - /// - /// - /// - /// Setting - /// up Amazon GameLift Fleets - /// + /// Permanently removes a FlexMatch matchmaking configuration. To delete, specify the + /// configuration name. A matchmaking configuration cannot be deleted if it is being used + /// in any active matchmaking tickets. /// - /// Container for the necessary parameters to execute the DeleteFleet service method. + /// Container for the necessary parameters to execute the DeleteMatchmakingConfiguration service method. /// /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// /// - /// The response from the DeleteFleet service method, as returned by GameLift. + /// The response from the DeleteMatchmakingConfiguration service method, as returned by GameLift. /// /// The service encountered an unrecoverable internal failure while processing the request. /// Clients can retry such requests immediately or after a waiting period. /// - /// - /// The requested operation would cause a conflict with the current state of a resource - /// associated with the request and/or the fleet. Resolve the conflict before retrying. - /// /// /// One or more parameter values in the request are invalid. Correct the invalid parameter /// values before retrying. @@ -4931,53 +5940,43 @@ public virtual DeleteFleetResponse DeleteFleet(DeleteFleetRequest request) /// The requested tagging operation did not succeed. This may be due to invalid tag format /// or the maximum tag limit may have been exceeded. Resolve the issue before retrying. /// - /// - /// The client failed authentication. Clients should not retry such requests. + /// + /// The requested operation is not supported in the Region specified. /// - /// REST API Reference for DeleteFleet Operation - public virtual Task DeleteFleetAsync(DeleteFleetRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + /// REST API Reference for DeleteMatchmakingConfiguration Operation + public virtual Task DeleteMatchmakingConfigurationAsync(DeleteMatchmakingConfigurationRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { var options = new InvokeOptions(); - options.RequestMarshaller = DeleteFleetRequestMarshaller.Instance; - options.ResponseUnmarshaller = DeleteFleetResponseUnmarshaller.Instance; + options.RequestMarshaller = DeleteMatchmakingConfigurationRequestMarshaller.Instance; + options.ResponseUnmarshaller = DeleteMatchmakingConfigurationResponseUnmarshaller.Instance; - return InvokeAsync(request, options, cancellationToken); + return InvokeAsync(request, options, cancellationToken); } #endregion - #region DeleteFleetLocations + #region DeleteMatchmakingRuleSet /// - /// Removes locations from a multi-location fleet. When deleting a location, all game - /// server process and all instances that are still active in the location are shut down. - /// + /// Deletes an existing matchmaking rule set. To delete the rule set, provide the rule + /// set name. Rule sets cannot be deleted if they are currently being used by a matchmaking + /// configuration. /// /// /// - /// To delete fleet locations, identify the fleet ID and provide a list of the locations - /// to be deleted. - /// - /// - /// - /// If successful, GameLift sets the location status to DELETING, and begins to - /// shut down existing server processes and terminate instances in each location being - /// deleted. When completed, the location status changes to TERMINATED. - /// - /// - /// /// Learn more /// - /// + /// /// - /// Container for the necessary parameters to execute the DeleteFleetLocations service method. + /// Container for the necessary parameters to execute the DeleteMatchmakingRuleSet service method. /// - /// The response from the DeleteFleetLocations service method, as returned by GameLift. + /// The response from the DeleteMatchmakingRuleSet service method, as returned by GameLift. /// /// The service encountered an unrecoverable internal failure while processing the request. /// Clients can retry such requests immediately or after a waiting period. @@ -4990,55 +5989,46 @@ public virtual DeleteFleetResponse DeleteFleet(DeleteFleetRequest request) /// The requested resources was not found. The resource was either not created yet or /// deleted. /// - /// - /// The client failed authentication. Clients should not retry such requests. - /// + /// + /// The requested tagging operation did not succeed. This may be due to invalid tag format + /// or the maximum tag limit may have been exceeded. Resolve the issue before retrying. + /// /// /// The requested operation is not supported in the Region specified. /// - /// REST API Reference for DeleteFleetLocations Operation - public virtual DeleteFleetLocationsResponse DeleteFleetLocations(DeleteFleetLocationsRequest request) + /// REST API Reference for DeleteMatchmakingRuleSet Operation + public virtual DeleteMatchmakingRuleSetResponse DeleteMatchmakingRuleSet(DeleteMatchmakingRuleSetRequest request) { var options = new InvokeOptions(); - options.RequestMarshaller = DeleteFleetLocationsRequestMarshaller.Instance; - options.ResponseUnmarshaller = DeleteFleetLocationsResponseUnmarshaller.Instance; + options.RequestMarshaller = DeleteMatchmakingRuleSetRequestMarshaller.Instance; + options.ResponseUnmarshaller = DeleteMatchmakingRuleSetResponseUnmarshaller.Instance; - return Invoke(request, options); + return Invoke(request, options); } /// - /// Removes locations from a multi-location fleet. When deleting a location, all game - /// server process and all instances that are still active in the location are shut down. - /// + /// Deletes an existing matchmaking rule set. To delete the rule set, provide the rule + /// set name. Rule sets cannot be deleted if they are currently being used by a matchmaking + /// configuration. /// /// /// - /// To delete fleet locations, identify the fleet ID and provide a list of the locations - /// to be deleted. - /// - /// - /// - /// If successful, GameLift sets the location status to DELETING, and begins to - /// shut down existing server processes and terminate instances in each location being - /// deleted. When completed, the location status changes to TERMINATED. - /// - /// - /// /// Learn more /// - /// + /// /// - /// Container for the necessary parameters to execute the DeleteFleetLocations service method. + /// Container for the necessary parameters to execute the DeleteMatchmakingRuleSet service method. /// /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// /// - /// The response from the DeleteFleetLocations service method, as returned by GameLift. + /// The response from the DeleteMatchmakingRuleSet service method, as returned by GameLift. /// /// The service encountered an unrecoverable internal failure while processing the request. /// Clients can retry such requests immediately or after a waiting period. @@ -5051,82 +6041,42 @@ public virtual DeleteFleetLocationsResponse DeleteFleetLocations(DeleteFleetLoca /// The requested resources was not found. The resource was either not created yet or /// deleted. /// - /// - /// The client failed authentication. Clients should not retry such requests. + /// + /// The requested tagging operation did not succeed. This may be due to invalid tag format + /// or the maximum tag limit may have been exceeded. Resolve the issue before retrying. /// /// /// The requested operation is not supported in the Region specified. /// - /// REST API Reference for DeleteFleetLocations Operation - public virtual Task DeleteFleetLocationsAsync(DeleteFleetLocationsRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + /// REST API Reference for DeleteMatchmakingRuleSet Operation + public virtual Task DeleteMatchmakingRuleSetAsync(DeleteMatchmakingRuleSetRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { var options = new InvokeOptions(); - options.RequestMarshaller = DeleteFleetLocationsRequestMarshaller.Instance; - options.ResponseUnmarshaller = DeleteFleetLocationsResponseUnmarshaller.Instance; + options.RequestMarshaller = DeleteMatchmakingRuleSetRequestMarshaller.Instance; + options.ResponseUnmarshaller = DeleteMatchmakingRuleSetResponseUnmarshaller.Instance; - return InvokeAsync(request, options, cancellationToken); + return InvokeAsync(request, options, cancellationToken); } #endregion - #region DeleteGameServerGroup + #region DeleteScalingPolicy /// - /// This operation is used with the Amazon GameLift FleetIQ solution and game server - /// groups. + /// Deletes a fleet scaling policy. Once deleted, the policy is no longer in force and + /// Amazon GameLift removes all record of it. To delete a scaling policy, specify both + /// the scaling policy name and the fleet ID it is associated with. /// /// /// - /// Terminates a game server group and permanently deletes the game server group record. - /// You have several options for how these resources are impacted when deleting the game - /// server group. Depending on the type of delete operation selected, this operation might - /// affect these resources: - /// - ///
    • - /// - /// The game server group - /// - ///
    • - /// - /// The corresponding Auto Scaling group - /// - ///
    • - /// - /// All game servers that are currently running in the group - /// - ///
    - /// - /// To delete a game server group, identify the game server group to delete and specify - /// the type of delete operation to initiate. Game server groups can only be deleted if - /// they are in ACTIVE or ERROR status. - /// - /// - /// - /// If the delete request is successful, a series of operations are kicked off. The game - /// server group status is changed to DELETE_SCHEDULED, which prevents new game - /// servers from being registered and stops automatic scaling activity. Once all game - /// servers in the game server group are deregistered, Amazon GameLift FleetIQ can begin - /// deleting resources. If any of the delete operations fail, the game server group is - /// placed in ERROR status. - /// - /// - /// - /// Amazon GameLift FleetIQ emits delete events to Amazon CloudWatch. - /// - /// - /// - /// Learn more - /// - /// - /// - /// Amazon - /// GameLift FleetIQ Guide + /// To temporarily suspend scaling policies, use StopFleetActions. + /// This operation suspends all policies for the fleet. /// ///     - /// Container for the necessary parameters to execute the DeleteGameServerGroup service method. + /// Container for the necessary parameters to execute the DeleteScalingPolicy service method. /// - /// The response from the DeleteGameServerGroup service method, as returned by GameLift. + /// The response from the DeleteScalingPolicy service method, as returned by GameLift. /// /// The service encountered an unrecoverable internal failure while processing the request. /// Clients can retry such requests immediately or after a waiting period. @@ -5142,75 +6092,37 @@ public virtual DeleteFleetLocationsResponse DeleteFleetLocations(DeleteFleetLoca /// /// The client failed authentication. Clients should not retry such requests. /// - /// REST API Reference for DeleteGameServerGroup Operation - public virtual DeleteGameServerGroupResponse DeleteGameServerGroup(DeleteGameServerGroupRequest request) + /// + /// The requested operation is not supported in the Region specified. + /// + /// REST API Reference for DeleteScalingPolicy Operation + public virtual DeleteScalingPolicyResponse DeleteScalingPolicy(DeleteScalingPolicyRequest request) { var options = new InvokeOptions(); - options.RequestMarshaller = DeleteGameServerGroupRequestMarshaller.Instance; - options.ResponseUnmarshaller = DeleteGameServerGroupResponseUnmarshaller.Instance; + options.RequestMarshaller = DeleteScalingPolicyRequestMarshaller.Instance; + options.ResponseUnmarshaller = DeleteScalingPolicyResponseUnmarshaller.Instance; - return Invoke(request, options); + return Invoke(request, options); } /// - /// This operation is used with the Amazon GameLift FleetIQ solution and game server - /// groups. + /// Deletes a fleet scaling policy. Once deleted, the policy is no longer in force and + /// Amazon GameLift removes all record of it. To delete a scaling policy, specify both + /// the scaling policy name and the fleet ID it is associated with. /// /// /// - /// Terminates a game server group and permanently deletes the game server group record. - /// You have several options for how these resources are impacted when deleting the game - /// server group. Depending on the type of delete operation selected, this operation might - /// affect these resources: - /// - ///
    • - /// - /// The game server group - /// - ///
    • - /// - /// The corresponding Auto Scaling group - /// - ///
    • - /// - /// All game servers that are currently running in the group - /// - ///
    - /// - /// To delete a game server group, identify the game server group to delete and specify - /// the type of delete operation to initiate. Game server groups can only be deleted if - /// they are in ACTIVE or ERROR status. - /// - /// - /// - /// If the delete request is successful, a series of operations are kicked off. The game - /// server group status is changed to DELETE_SCHEDULED, which prevents new game - /// servers from being registered and stops automatic scaling activity. Once all game - /// servers in the game server group are deregistered, Amazon GameLift FleetIQ can begin - /// deleting resources. If any of the delete operations fail, the game server group is - /// placed in ERROR status. - /// - /// - /// - /// Amazon GameLift FleetIQ emits delete events to Amazon CloudWatch. - /// - /// - /// - /// Learn more - /// - /// - /// - /// Amazon - /// GameLift FleetIQ Guide + /// To temporarily suspend scaling policies, use StopFleetActions. + /// This operation suspends all policies for the fleet. /// ///     - /// Container for the necessary parameters to execute the DeleteGameServerGroup service method. + /// Container for the necessary parameters to execute the DeleteScalingPolicy service method. /// /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// /// - /// The response from the DeleteGameServerGroup service method, as returned by GameLift. + /// The response from the DeleteScalingPolicy service method, as returned by GameLift. /// /// The service encountered an unrecoverable internal failure while processing the request. /// Clients can retry such requests immediately or after a waiting period. @@ -5226,30 +6138,58 @@ public virtual DeleteGameServerGroupResponse DeleteGameServerGroup(DeleteGameSer /// /// The client failed authentication. Clients should not retry such requests. /// - /// REST API Reference for DeleteGameServerGroup Operation - public virtual Task DeleteGameServerGroupAsync(DeleteGameServerGroupRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + /// + /// The requested operation is not supported in the Region specified. + /// + /// REST API Reference for DeleteScalingPolicy Operation + public virtual Task DeleteScalingPolicyAsync(DeleteScalingPolicyRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { var options = new InvokeOptions(); - options.RequestMarshaller = DeleteGameServerGroupRequestMarshaller.Instance; - options.ResponseUnmarshaller = DeleteGameServerGroupResponseUnmarshaller.Instance; + options.RequestMarshaller = DeleteScalingPolicyRequestMarshaller.Instance; + options.ResponseUnmarshaller = DeleteScalingPolicyResponseUnmarshaller.Instance; - return InvokeAsync(request, options, cancellationToken); + return InvokeAsync(request, options, cancellationToken); } #endregion - #region DeleteGameSessionQueue + #region DeleteScript /// - /// Deletes a game session queue. Once a queue is successfully deleted, unfulfilled StartGameSessionPlacement - /// requests that reference the queue will fail. To delete a queue, specify the queue - /// name. + /// Deletes a Realtime script. This operation permanently deletes the script record. If + /// script files were uploaded, they are also deleted (files stored in an S3 bucket are + /// not deleted). + /// + /// + /// + /// To delete a script, specify the script ID. Before deleting a script, be sure to terminate + /// all fleets that are deployed with the script being deleted. Fleet instances periodically + /// check for script updates, and if the script record no longer exists, the instance + /// will go into an error state and be unable to host game sessions. + /// + /// + /// + /// Learn more + /// + /// + /// + /// Amazon + /// GameLift Realtime Servers + /// + /// + /// + /// Related actions + /// + /// + /// + /// All + /// APIs by task + /// /// - /// Container for the necessary parameters to execute the DeleteGameSessionQueue service method. + /// Container for the necessary parameters to execute the DeleteScript service method. /// - /// The response from the DeleteGameSessionQueue service method, as returned by GameLift. + /// The response from the DeleteScript service method, as returned by GameLift. /// /// The service encountered an unrecoverable internal failure while processing the request. /// Clients can retry such requests immediately or after a waiting period. @@ -5269,29 +6209,54 @@ public virtual DeleteGameServerGroupResponse DeleteGameServerGroup(DeleteGameSer /// /// The client failed authentication. Clients should not retry such requests. /// - /// REST API Reference for DeleteGameSessionQueue Operation - public virtual DeleteGameSessionQueueResponse DeleteGameSessionQueue(DeleteGameSessionQueueRequest request) + /// REST API Reference for DeleteScript Operation + public virtual DeleteScriptResponse DeleteScript(DeleteScriptRequest request) { var options = new InvokeOptions(); - options.RequestMarshaller = DeleteGameSessionQueueRequestMarshaller.Instance; - options.ResponseUnmarshaller = DeleteGameSessionQueueResponseUnmarshaller.Instance; + options.RequestMarshaller = DeleteScriptRequestMarshaller.Instance; + options.ResponseUnmarshaller = DeleteScriptResponseUnmarshaller.Instance; - return Invoke(request, options); + return Invoke(request, options); } /// - /// Deletes a game session queue. Once a queue is successfully deleted, unfulfilled StartGameSessionPlacement - /// requests that reference the queue will fail. To delete a queue, specify the queue - /// name. + /// Deletes a Realtime script. This operation permanently deletes the script record. If + /// script files were uploaded, they are also deleted (files stored in an S3 bucket are + /// not deleted). + /// + /// + /// + /// To delete a script, specify the script ID. Before deleting a script, be sure to terminate + /// all fleets that are deployed with the script being deleted. Fleet instances periodically + /// check for script updates, and if the script record no longer exists, the instance + /// will go into an error state and be unable to host game sessions. + /// + /// + /// + /// Learn more + /// + /// + /// + /// Amazon + /// GameLift Realtime Servers + /// + /// + /// + /// Related actions + /// + /// + /// + /// All + /// APIs by task + /// /// - /// Container for the necessary parameters to execute the DeleteGameSessionQueue service method. + /// Container for the necessary parameters to execute the DeleteScript service method. /// /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// /// - /// The response from the DeleteGameSessionQueue service method, as returned by GameLift. + /// The response from the DeleteScript service method, as returned by GameLift. /// /// The service encountered an unrecoverable internal failure while processing the request. /// Clients can retry such requests immediately or after a waiting period. @@ -5311,33 +6276,38 @@ public virtual DeleteGameSessionQueueResponse DeleteGameSessionQueue(DeleteGameS /// /// The client failed authentication. Clients should not retry such requests. /// - /// REST API Reference for DeleteGameSessionQueue Operation - public virtual Task DeleteGameSessionQueueAsync(DeleteGameSessionQueueRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + /// REST API Reference for DeleteScript Operation + public virtual Task DeleteScriptAsync(DeleteScriptRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { var options = new InvokeOptions(); - options.RequestMarshaller = DeleteGameSessionQueueRequestMarshaller.Instance; - options.ResponseUnmarshaller = DeleteGameSessionQueueResponseUnmarshaller.Instance; + options.RequestMarshaller = DeleteScriptRequestMarshaller.Instance; + options.ResponseUnmarshaller = DeleteScriptResponseUnmarshaller.Instance; - return InvokeAsync(request, options, cancellationToken); + return InvokeAsync(request, options, cancellationToken); } #endregion - #region DeleteLocation + #region DeleteVpcPeeringAuthorization /// - /// Deletes a custom location. + /// Cancels a pending VPC peering authorization for the specified VPC. If you need to + /// delete an existing VPC peering connection, use DeleteVpcPeeringConnection. /// /// /// - /// Before deleting a custom location, review any fleets currently using the custom location - /// and deregister the location if it is in use. For more information, see DeregisterCompute. + /// Related actions + /// + /// + /// + /// All + /// APIs by task /// /// - /// Container for the necessary parameters to execute the DeleteLocation service method. + /// Container for the necessary parameters to execute the DeleteVpcPeeringAuthorization service method. /// - /// The response from the DeleteLocation service method, as returned by GameLift. + /// The response from the DeleteVpcPeeringAuthorization service method, as returned by GameLift. /// /// The service encountered an unrecoverable internal failure while processing the request. /// Clients can retry such requests immediately or after a waiting period. @@ -5353,32 +6323,37 @@ public virtual DeleteGameSessionQueueResponse DeleteGameSessionQueue(DeleteGameS /// /// The client failed authentication. Clients should not retry such requests. /// - /// REST API Reference for DeleteLocation Operation - public virtual DeleteLocationResponse DeleteLocation(DeleteLocationRequest request) + /// REST API Reference for DeleteVpcPeeringAuthorization Operation + public virtual DeleteVpcPeeringAuthorizationResponse DeleteVpcPeeringAuthorization(DeleteVpcPeeringAuthorizationRequest request) { var options = new InvokeOptions(); - options.RequestMarshaller = DeleteLocationRequestMarshaller.Instance; - options.ResponseUnmarshaller = DeleteLocationResponseUnmarshaller.Instance; + options.RequestMarshaller = DeleteVpcPeeringAuthorizationRequestMarshaller.Instance; + options.ResponseUnmarshaller = DeleteVpcPeeringAuthorizationResponseUnmarshaller.Instance; - return Invoke(request, options); + return Invoke(request, options); } /// - /// Deletes a custom location. + /// Cancels a pending VPC peering authorization for the specified VPC. If you need to + /// delete an existing VPC peering connection, use DeleteVpcPeeringConnection. /// /// /// - /// Before deleting a custom location, review any fleets currently using the custom location - /// and deregister the location if it is in use. For more information, see DeregisterCompute. + /// Related actions + /// + /// + /// + /// All + /// APIs by task /// /// - /// Container for the necessary parameters to execute the DeleteLocation service method. + /// Container for the necessary parameters to execute the DeleteVpcPeeringAuthorization service method. /// /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// /// - /// The response from the DeleteLocation service method, as returned by GameLift. + /// The response from the DeleteVpcPeeringAuthorization service method, as returned by GameLift. /// /// The service encountered an unrecoverable internal failure while processing the request. /// Clients can retry such requests immediately or after a waiting period. @@ -5394,29 +6369,45 @@ public virtual DeleteLocationResponse DeleteLocation(DeleteLocationRequest reque /// /// The client failed authentication. Clients should not retry such requests. /// - /// REST API Reference for DeleteLocation Operation - public virtual Task DeleteLocationAsync(DeleteLocationRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + /// REST API Reference for DeleteVpcPeeringAuthorization Operation + public virtual Task DeleteVpcPeeringAuthorizationAsync(DeleteVpcPeeringAuthorizationRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { var options = new InvokeOptions(); - options.RequestMarshaller = DeleteLocationRequestMarshaller.Instance; - options.ResponseUnmarshaller = DeleteLocationResponseUnmarshaller.Instance; + options.RequestMarshaller = DeleteVpcPeeringAuthorizationRequestMarshaller.Instance; + options.ResponseUnmarshaller = DeleteVpcPeeringAuthorizationResponseUnmarshaller.Instance; - return InvokeAsync(request, options, cancellationToken); + return InvokeAsync(request, options, cancellationToken); } #endregion - #region DeleteMatchmakingConfiguration + #region DeleteVpcPeeringConnection /// - /// Permanently removes a FlexMatch matchmaking configuration. To delete, specify the - /// configuration name. A matchmaking configuration cannot be deleted if it is being used - /// in any active matchmaking tickets. + /// Removes a VPC peering connection. To delete the connection, you must have a valid + /// authorization for the VPC peering connection that you want to delete.. + /// + /// + /// + /// Once a valid authorization exists, call this operation from the Amazon Web Services + /// account that is used to manage the Amazon GameLift fleets. Identify the connection + /// to delete by the connection ID and fleet ID. If successful, the connection is removed. + /// + /// + /// + /// + /// Related actions + /// + /// + /// + /// All + /// APIs by task + /// /// - /// Container for the necessary parameters to execute the DeleteMatchmakingConfiguration service method. + /// Container for the necessary parameters to execute the DeleteVpcPeeringConnection service method. /// - /// The response from the DeleteMatchmakingConfiguration service method, as returned by GameLift. + /// The response from the DeleteVpcPeeringConnection service method, as returned by GameLift. /// /// The service encountered an unrecoverable internal failure while processing the request. /// Clients can retry such requests immediately or after a waiting period. @@ -5429,35 +6420,47 @@ public virtual DeleteLocationResponse DeleteLocation(DeleteLocationRequest reque /// The requested resources was not found. The resource was either not created yet or /// deleted. /// - /// - /// The requested tagging operation did not succeed. This may be due to invalid tag format - /// or the maximum tag limit may have been exceeded. Resolve the issue before retrying. - /// - /// - /// The requested operation is not supported in the Region specified. + /// + /// The client failed authentication. Clients should not retry such requests. /// - /// REST API Reference for DeleteMatchmakingConfiguration Operation - public virtual DeleteMatchmakingConfigurationResponse DeleteMatchmakingConfiguration(DeleteMatchmakingConfigurationRequest request) + /// REST API Reference for DeleteVpcPeeringConnection Operation + public virtual DeleteVpcPeeringConnectionResponse DeleteVpcPeeringConnection(DeleteVpcPeeringConnectionRequest request) { var options = new InvokeOptions(); - options.RequestMarshaller = DeleteMatchmakingConfigurationRequestMarshaller.Instance; - options.ResponseUnmarshaller = DeleteMatchmakingConfigurationResponseUnmarshaller.Instance; + options.RequestMarshaller = DeleteVpcPeeringConnectionRequestMarshaller.Instance; + options.ResponseUnmarshaller = DeleteVpcPeeringConnectionResponseUnmarshaller.Instance; - return Invoke(request, options); + return Invoke(request, options); } /// - /// Permanently removes a FlexMatch matchmaking configuration. To delete, specify the - /// configuration name. A matchmaking configuration cannot be deleted if it is being used - /// in any active matchmaking tickets. + /// Removes a VPC peering connection. To delete the connection, you must have a valid + /// authorization for the VPC peering connection that you want to delete.. + /// + /// + /// + /// Once a valid authorization exists, call this operation from the Amazon Web Services + /// account that is used to manage the Amazon GameLift fleets. Identify the connection + /// to delete by the connection ID and fleet ID. If successful, the connection is removed. + /// + /// + /// + /// + /// Related actions + /// + /// + /// + /// All + /// APIs by task + /// /// - /// Container for the necessary parameters to execute the DeleteMatchmakingConfiguration service method. + /// Container for the necessary parameters to execute the DeleteVpcPeeringConnection service method. /// /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// /// - /// The response from the DeleteMatchmakingConfiguration service method, as returned by GameLift. + /// The response from the DeleteVpcPeeringConnection service method, as returned by GameLift. /// /// The service encountered an unrecoverable internal failure while processing the request. /// Clients can retry such requests immediately or after a waiting period. @@ -5470,47 +6473,43 @@ public virtual DeleteMatchmakingConfigurationResponse DeleteMatchmakingConfigura /// The requested resources was not found. The resource was either not created yet or /// deleted. /// - /// - /// The requested tagging operation did not succeed. This may be due to invalid tag format - /// or the maximum tag limit may have been exceeded. Resolve the issue before retrying. - /// - /// - /// The requested operation is not supported in the Region specified. + /// + /// The client failed authentication. Clients should not retry such requests. /// - /// REST API Reference for DeleteMatchmakingConfiguration Operation - public virtual Task DeleteMatchmakingConfigurationAsync(DeleteMatchmakingConfigurationRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + /// REST API Reference for DeleteVpcPeeringConnection Operation + public virtual Task DeleteVpcPeeringConnectionAsync(DeleteVpcPeeringConnectionRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { var options = new InvokeOptions(); - options.RequestMarshaller = DeleteMatchmakingConfigurationRequestMarshaller.Instance; - options.ResponseUnmarshaller = DeleteMatchmakingConfigurationResponseUnmarshaller.Instance; + options.RequestMarshaller = DeleteVpcPeeringConnectionRequestMarshaller.Instance; + options.ResponseUnmarshaller = DeleteVpcPeeringConnectionResponseUnmarshaller.Instance; - return InvokeAsync(request, options, cancellationToken); + return InvokeAsync(request, options, cancellationToken); } #endregion - #region DeleteMatchmakingRuleSet + #region DeregisterCompute /// - /// Deletes an existing matchmaking rule set. To delete the rule set, provide the rule - /// set name. Rule sets cannot be deleted if they are currently being used by a matchmaking - /// configuration. + /// Removes a compute resource from an Amazon GameLift Anywhere fleet. Deregistered computes + /// can no longer host game sessions through Amazon GameLift. /// /// /// - /// Learn more + /// For an Anywhere fleet that's running the Amazon GameLift Agent, the Agent handles + /// all compute registry tasks for you. For an Anywhere fleet that doesn't use the Agent, + /// call this operation to deregister fleet computes. /// - ///
    • + /// /// - /// Build - /// a rule set + /// To deregister a compute, call this operation from the compute that's being deregistered + /// and specify the compute name and the fleet ID. /// - ///
    ///     - /// Container for the necessary parameters to execute the DeleteMatchmakingRuleSet service method. + /// Container for the necessary parameters to execute the DeregisterCompute service method. /// - /// The response from the DeleteMatchmakingRuleSet service method, as returned by GameLift. + /// The response from the DeregisterCompute service method, as returned by GameLift. /// /// The service encountered an unrecoverable internal failure while processing the request. /// Clients can retry such requests immediately or after a waiting period. @@ -5523,46 +6522,42 @@ public virtual DeleteMatchmakingConfigurationResponse DeleteMatchmakingConfigura /// The requested resources was not found. The resource was either not created yet or /// deleted. /// - /// - /// The requested tagging operation did not succeed. This may be due to invalid tag format - /// or the maximum tag limit may have been exceeded. Resolve the issue before retrying. - /// - /// - /// The requested operation is not supported in the Region specified. + /// + /// The client failed authentication. Clients should not retry such requests. /// - /// REST API Reference for DeleteMatchmakingRuleSet Operation - public virtual DeleteMatchmakingRuleSetResponse DeleteMatchmakingRuleSet(DeleteMatchmakingRuleSetRequest request) + /// REST API Reference for DeregisterCompute Operation + public virtual DeregisterComputeResponse DeregisterCompute(DeregisterComputeRequest request) { var options = new InvokeOptions(); - options.RequestMarshaller = DeleteMatchmakingRuleSetRequestMarshaller.Instance; - options.ResponseUnmarshaller = DeleteMatchmakingRuleSetResponseUnmarshaller.Instance; + options.RequestMarshaller = DeregisterComputeRequestMarshaller.Instance; + options.ResponseUnmarshaller = DeregisterComputeResponseUnmarshaller.Instance; - return Invoke(request, options); + return Invoke(request, options); } /// - /// Deletes an existing matchmaking rule set. To delete the rule set, provide the rule - /// set name. Rule sets cannot be deleted if they are currently being used by a matchmaking - /// configuration. + /// Removes a compute resource from an Amazon GameLift Anywhere fleet. Deregistered computes + /// can no longer host game sessions through Amazon GameLift. /// /// /// - /// Learn more + /// For an Anywhere fleet that's running the Amazon GameLift Agent, the Agent handles + /// all compute registry tasks for you. For an Anywhere fleet that doesn't use the Agent, + /// call this operation to deregister fleet computes. /// - ///
    • + /// /// - /// Build - /// a rule set + /// To deregister a compute, call this operation from the compute that's being deregistered + /// and specify the compute name and the fleet ID. /// - ///
    ///     - /// Container for the necessary parameters to execute the DeleteMatchmakingRuleSet service method. + /// Container for the necessary parameters to execute the DeregisterCompute service method. /// /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// /// - /// The response from the DeleteMatchmakingRuleSet service method, as returned by GameLift. + /// The response from the DeregisterCompute service method, as returned by GameLift. /// /// The service encountered an unrecoverable internal failure while processing the request. /// Clients can retry such requests immediately or after a waiting period. @@ -5575,42 +6570,53 @@ public virtual DeleteMatchmakingRuleSetResponse DeleteMatchmakingRuleSet(DeleteM /// The requested resources was not found. The resource was either not created yet or /// deleted. /// - /// - /// The requested tagging operation did not succeed. This may be due to invalid tag format - /// or the maximum tag limit may have been exceeded. Resolve the issue before retrying. - /// - /// - /// The requested operation is not supported in the Region specified. + /// + /// The client failed authentication. Clients should not retry such requests. /// - /// REST API Reference for DeleteMatchmakingRuleSet Operation - public virtual Task DeleteMatchmakingRuleSetAsync(DeleteMatchmakingRuleSetRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + /// REST API Reference for DeregisterCompute Operation + public virtual Task DeregisterComputeAsync(DeregisterComputeRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { var options = new InvokeOptions(); - options.RequestMarshaller = DeleteMatchmakingRuleSetRequestMarshaller.Instance; - options.ResponseUnmarshaller = DeleteMatchmakingRuleSetResponseUnmarshaller.Instance; + options.RequestMarshaller = DeregisterComputeRequestMarshaller.Instance; + options.ResponseUnmarshaller = DeregisterComputeResponseUnmarshaller.Instance; - return InvokeAsync(request, options, cancellationToken); + return InvokeAsync(request, options, cancellationToken); } #endregion - #region DeleteScalingPolicy + #region DeregisterGameServer /// - /// Deletes a fleet scaling policy. Once deleted, the policy is no longer in force and - /// Amazon GameLift removes all record of it. To delete a scaling policy, specify both - /// the scaling policy name and the fleet ID it is associated with. + /// This operation is used with the Amazon GameLift FleetIQ solution and game server + /// groups. /// /// /// - /// To temporarily suspend scaling policies, use StopFleetActions. - /// This operation suspends all policies for the fleet. + /// Removes the game server from a game server group. As a result of this operation, the + /// deregistered game server can no longer be claimed and will not be returned in a list + /// of active game servers. + /// + /// + /// + /// To deregister a game server, specify the game server group and game server ID. If + /// successful, this operation emits a CloudWatch event with termination timestamp and + /// reason. + /// + /// + /// + /// Learn more + /// + /// + /// + /// Amazon + /// GameLift FleetIQ Guide /// /// - /// Container for the necessary parameters to execute the DeleteScalingPolicy service method. + /// Container for the necessary parameters to execute the DeregisterGameServer service method. /// - /// The response from the DeleteScalingPolicy service method, as returned by GameLift. + /// The response from the DeregisterGameServer service method, as returned by GameLift. /// /// The service encountered an unrecoverable internal failure while processing the request. /// Clients can retry such requests immediately or after a waiting period. @@ -5626,34 +6632,49 @@ public virtual DeleteMatchmakingRuleSetResponse DeleteMatchmakingRuleSet(DeleteM /// /// The client failed authentication. Clients should not retry such requests. /// - /// REST API Reference for DeleteScalingPolicy Operation - public virtual DeleteScalingPolicyResponse DeleteScalingPolicy(DeleteScalingPolicyRequest request) + /// REST API Reference for DeregisterGameServer Operation + public virtual DeregisterGameServerResponse DeregisterGameServer(DeregisterGameServerRequest request) { var options = new InvokeOptions(); - options.RequestMarshaller = DeleteScalingPolicyRequestMarshaller.Instance; - options.ResponseUnmarshaller = DeleteScalingPolicyResponseUnmarshaller.Instance; + options.RequestMarshaller = DeregisterGameServerRequestMarshaller.Instance; + options.ResponseUnmarshaller = DeregisterGameServerResponseUnmarshaller.Instance; - return Invoke(request, options); + return Invoke(request, options); } /// - /// Deletes a fleet scaling policy. Once deleted, the policy is no longer in force and - /// Amazon GameLift removes all record of it. To delete a scaling policy, specify both - /// the scaling policy name and the fleet ID it is associated with. + /// This operation is used with the Amazon GameLift FleetIQ solution and game server + /// groups. /// /// /// - /// To temporarily suspend scaling policies, use StopFleetActions. - /// This operation suspends all policies for the fleet. + /// Removes the game server from a game server group. As a result of this operation, the + /// deregistered game server can no longer be claimed and will not be returned in a list + /// of active game servers. + /// + /// + /// + /// To deregister a game server, specify the game server group and game server ID. If + /// successful, this operation emits a CloudWatch event with termination timestamp and + /// reason. + /// + /// + /// + /// Learn more + /// + /// + /// + /// Amazon + /// GameLift FleetIQ Guide /// /// - /// Container for the necessary parameters to execute the DeleteScalingPolicy service method. + /// Container for the necessary parameters to execute the DeregisterGameServer service method. /// /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// /// - /// The response from the DeleteScalingPolicy service method, as returned by GameLift. + /// The response from the DeregisterGameServer service method, as returned by GameLift. /// /// The service encountered an unrecoverable internal failure while processing the request. /// Clients can retry such requests immediately or after a waiting period. @@ -5669,41 +6690,29 @@ public virtual DeleteScalingPolicyResponse DeleteScalingPolicy(DeleteScalingPoli /// /// The client failed authentication. Clients should not retry such requests. /// - /// REST API Reference for DeleteScalingPolicy Operation - public virtual Task DeleteScalingPolicyAsync(DeleteScalingPolicyRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + /// REST API Reference for DeregisterGameServer Operation + public virtual Task DeregisterGameServerAsync(DeregisterGameServerRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { var options = new InvokeOptions(); - options.RequestMarshaller = DeleteScalingPolicyRequestMarshaller.Instance; - options.ResponseUnmarshaller = DeleteScalingPolicyResponseUnmarshaller.Instance; + options.RequestMarshaller = DeregisterGameServerRequestMarshaller.Instance; + options.ResponseUnmarshaller = DeregisterGameServerResponseUnmarshaller.Instance; - return InvokeAsync(request, options, cancellationToken); + return InvokeAsync(request, options, cancellationToken); } #endregion - #region DeleteScript + #region DescribeAlias /// - /// Deletes a Realtime script. This operation permanently deletes the script record. If - /// script files were uploaded, they are also deleted (files stored in an S3 bucket are - /// not deleted). + /// Retrieves properties for an alias. This operation returns all alias metadata and settings. + /// To get an alias's target fleet ID only, use ResolveAlias. /// /// /// - /// To delete a script, specify the script ID. Before deleting a script, be sure to terminate - /// all fleets that are deployed with the script being deleted. Fleet instances periodically - /// check for script updates, and if the script record no longer exists, the instance - /// will go into an error state and be unable to host game sessions. - /// - /// - /// - /// Learn more - /// - /// - /// - /// Amazon - /// GameLift Realtime Servers + /// To get alias properties, specify the alias ID. If successful, the requested alias + /// record is returned. /// /// /// @@ -5715,9 +6724,9 @@ public virtual DeleteScalingPolicyResponse DeleteScalingPolicy(DeleteScalingPoli /// APIs by task /// /// - /// Container for the necessary parameters to execute the DeleteScript service method. + /// The unique identifier for the fleet alias that you want to retrieve. You can use either the alias ID or ARN value. /// - /// The response from the DeleteScript service method, as returned by GameLift. + /// The response from the DescribeAlias service method, as returned by GameLift. /// /// The service encountered an unrecoverable internal failure while processing the request. /// Clients can retry such requests immediately or after a waiting period. @@ -5730,44 +6739,26 @@ public virtual DeleteScalingPolicyResponse DeleteScalingPolicy(DeleteScalingPoli /// The requested resources was not found. The resource was either not created yet or /// deleted. /// - /// - /// The requested tagging operation did not succeed. This may be due to invalid tag format - /// or the maximum tag limit may have been exceeded. Resolve the issue before retrying. - /// /// /// The client failed authentication. Clients should not retry such requests. /// - /// REST API Reference for DeleteScript Operation - public virtual DeleteScriptResponse DeleteScript(DeleteScriptRequest request) + /// REST API Reference for DescribeAlias Operation + public virtual DescribeAliasResponse DescribeAlias(string aliasId) { - var options = new InvokeOptions(); - options.RequestMarshaller = DeleteScriptRequestMarshaller.Instance; - options.ResponseUnmarshaller = DeleteScriptResponseUnmarshaller.Instance; - - return Invoke(request, options); + var request = new DescribeAliasRequest(); + request.AliasId = aliasId; + return DescribeAlias(request); } /// - /// Deletes a Realtime script. This operation permanently deletes the script record. If - /// script files were uploaded, they are also deleted (files stored in an S3 bucket are - /// not deleted). + /// Retrieves properties for an alias. This operation returns all alias metadata and settings. + /// To get an alias's target fleet ID only, use ResolveAlias. /// /// /// - /// To delete a script, specify the script ID. Before deleting a script, be sure to terminate - /// all fleets that are deployed with the script being deleted. Fleet instances periodically - /// check for script updates, and if the script record no longer exists, the instance - /// will go into an error state and be unable to host game sessions. - /// - /// - /// - /// Learn more - /// - /// - /// - /// Amazon - /// GameLift Realtime Servers + /// To get alias properties, specify the alias ID. If successful, the requested alias + /// record is returned. /// /// /// @@ -5779,12 +6770,9 @@ public virtual DeleteScriptResponse DeleteScript(DeleteScriptRequest request) /// APIs by task /// /// - /// Container for the necessary parameters to execute the DeleteScript service method. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// + /// Container for the necessary parameters to execute the DescribeAlias service method. /// - /// The response from the DeleteScript service method, as returned by GameLift. + /// The response from the DescribeAlias service method, as returned by GameLift. /// /// The service encountered an unrecoverable internal failure while processing the request. /// Clients can retry such requests immediately or after a waiting period. @@ -5797,34 +6785,31 @@ public virtual DeleteScriptResponse DeleteScript(DeleteScriptRequest request) /// The requested resources was not found. The resource was either not created yet or /// deleted. /// - /// - /// The requested tagging operation did not succeed. This may be due to invalid tag format - /// or the maximum tag limit may have been exceeded. Resolve the issue before retrying. - /// /// /// The client failed authentication. Clients should not retry such requests. /// - /// REST API Reference for DeleteScript Operation - public virtual Task DeleteScriptAsync(DeleteScriptRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + /// REST API Reference for DescribeAlias Operation + public virtual DescribeAliasResponse DescribeAlias(DescribeAliasRequest request) { var options = new InvokeOptions(); - options.RequestMarshaller = DeleteScriptRequestMarshaller.Instance; - options.ResponseUnmarshaller = DeleteScriptResponseUnmarshaller.Instance; - - return InvokeAsync(request, options, cancellationToken); - } + options.RequestMarshaller = DescribeAliasRequestMarshaller.Instance; + options.ResponseUnmarshaller = DescribeAliasResponseUnmarshaller.Instance; - #endregion - - #region DeleteVpcPeeringAuthorization + return Invoke(request, options); + } /// - /// Cancels a pending VPC peering authorization for the specified VPC. If you need to - /// delete an existing VPC peering connection, use DeleteVpcPeeringConnection. + /// Retrieves properties for an alias. This operation returns all alias metadata and settings. + /// To get an alias's target fleet ID only, use ResolveAlias. /// /// /// + /// To get alias properties, specify the alias ID. If successful, the requested alias + /// record is returned. + /// + /// + /// /// Related actions /// /// @@ -5833,9 +6818,12 @@ public virtual DeleteScriptResponse DeleteScript(DeleteScriptRequest request) /// APIs by task /// /// - /// Container for the necessary parameters to execute the DeleteVpcPeeringAuthorization service method. + /// The unique identifier for the fleet alias that you want to retrieve. You can use either the alias ID or ARN value. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// /// - /// The response from the DeleteVpcPeeringAuthorization service method, as returned by GameLift. + /// The response from the DescribeAlias service method, as returned by GameLift. /// /// The service encountered an unrecoverable internal failure while processing the request. /// Clients can retry such requests immediately or after a waiting period. @@ -5851,23 +6839,26 @@ public virtual DeleteScriptResponse DeleteScript(DeleteScriptRequest request) /// /// The client failed authentication. Clients should not retry such requests. /// - /// REST API Reference for DeleteVpcPeeringAuthorization Operation - public virtual DeleteVpcPeeringAuthorizationResponse DeleteVpcPeeringAuthorization(DeleteVpcPeeringAuthorizationRequest request) + /// REST API Reference for DescribeAlias Operation + public virtual Task DescribeAliasAsync(string aliasId, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { - var options = new InvokeOptions(); - options.RequestMarshaller = DeleteVpcPeeringAuthorizationRequestMarshaller.Instance; - options.ResponseUnmarshaller = DeleteVpcPeeringAuthorizationResponseUnmarshaller.Instance; - - return Invoke(request, options); + var request = new DescribeAliasRequest(); + request.AliasId = aliasId; + return DescribeAliasAsync(request, cancellationToken); } /// - /// Cancels a pending VPC peering authorization for the specified VPC. If you need to - /// delete an existing VPC peering connection, use DeleteVpcPeeringConnection. + /// Retrieves properties for an alias. This operation returns all alias metadata and settings. + /// To get an alias's target fleet ID only, use ResolveAlias. /// /// /// + /// To get alias properties, specify the alias ID. If successful, the requested alias + /// record is returned. + /// + /// + /// /// Related actions /// /// @@ -5876,12 +6867,12 @@ public virtual DeleteVpcPeeringAuthorizationResponse DeleteVpcPeeringAuthorizati /// APIs by task /// /// - /// Container for the necessary parameters to execute the DeleteVpcPeeringAuthorization service method. + /// Container for the necessary parameters to execute the DescribeAlias service method. /// /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// /// - /// The response from the DeleteVpcPeeringAuthorization service method, as returned by GameLift. + /// The response from the DescribeAlias service method, as returned by GameLift. /// /// The service encountered an unrecoverable internal failure while processing the request. /// Clients can retry such requests immediately or after a waiting period. @@ -5897,35 +6888,33 @@ public virtual DeleteVpcPeeringAuthorizationResponse DeleteVpcPeeringAuthorizati /// /// The client failed authentication. Clients should not retry such requests. /// - /// REST API Reference for DeleteVpcPeeringAuthorization Operation - public virtual Task DeleteVpcPeeringAuthorizationAsync(DeleteVpcPeeringAuthorizationRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + /// REST API Reference for DescribeAlias Operation + public virtual Task DescribeAliasAsync(DescribeAliasRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { var options = new InvokeOptions(); - options.RequestMarshaller = DeleteVpcPeeringAuthorizationRequestMarshaller.Instance; - options.ResponseUnmarshaller = DeleteVpcPeeringAuthorizationResponseUnmarshaller.Instance; + options.RequestMarshaller = DescribeAliasRequestMarshaller.Instance; + options.ResponseUnmarshaller = DescribeAliasResponseUnmarshaller.Instance; - return InvokeAsync(request, options, cancellationToken); + return InvokeAsync(request, options, cancellationToken); } #endregion - #region DeleteVpcPeeringConnection + #region DescribeBuild /// - /// Removes a VPC peering connection. To delete the connection, you must have a valid - /// authorization for the VPC peering connection that you want to delete.. + /// Retrieves properties for a custom game build. To request a build resource, specify + /// a build ID. If successful, an object containing the build properties is returned. /// /// /// - /// Once a valid authorization exists, call this operation from the Amazon Web Services - /// account that is used to manage the Amazon GameLift fleets. Identify the connection - /// to delete by the connection ID and fleet ID. If successful, the connection is removed. - /// + /// Learn more /// /// /// - /// Related actions + /// + /// Upload a Custom Server Build /// /// /// @@ -5933,9 +6922,9 @@ public virtual DeleteVpcPeeringAuthorizationResponse DeleteVpcPeeringAuthorizati /// APIs by task /// /// - /// Container for the necessary parameters to execute the DeleteVpcPeeringConnection service method. + /// A unique identifier for the build to retrieve properties for. You can use either the build ID or ARN value. /// - /// The response from the DeleteVpcPeeringConnection service method, as returned by GameLift. + /// The response from the DescribeBuild service method, as returned by GameLift. /// /// The service encountered an unrecoverable internal failure while processing the request. /// Clients can retry such requests immediately or after a waiting period. @@ -5951,31 +6940,27 @@ public virtual DeleteVpcPeeringAuthorizationResponse DeleteVpcPeeringAuthorizati /// /// The client failed authentication. Clients should not retry such requests. /// - /// REST API Reference for DeleteVpcPeeringConnection Operation - public virtual DeleteVpcPeeringConnectionResponse DeleteVpcPeeringConnection(DeleteVpcPeeringConnectionRequest request) + /// REST API Reference for DescribeBuild Operation + public virtual DescribeBuildResponse DescribeBuild(string buildId) { - var options = new InvokeOptions(); - options.RequestMarshaller = DeleteVpcPeeringConnectionRequestMarshaller.Instance; - options.ResponseUnmarshaller = DeleteVpcPeeringConnectionResponseUnmarshaller.Instance; - - return Invoke(request, options); + var request = new DescribeBuildRequest(); + request.BuildId = buildId; + return DescribeBuild(request); } /// - /// Removes a VPC peering connection. To delete the connection, you must have a valid - /// authorization for the VPC peering connection that you want to delete.. + /// Retrieves properties for a custom game build. To request a build resource, specify + /// a build ID. If successful, an object containing the build properties is returned. /// /// /// - /// Once a valid authorization exists, call this operation from the Amazon Web Services - /// account that is used to manage the Amazon GameLift fleets. Identify the connection - /// to delete by the connection ID and fleet ID. If successful, the connection is removed. - /// + /// Learn more /// /// /// - /// Related actions + /// + /// Upload a Custom Server Build /// /// /// @@ -5983,12 +6968,9 @@ public virtual DeleteVpcPeeringConnectionResponse DeleteVpcPeeringConnection(Del /// APIs by task /// /// - /// Container for the necessary parameters to execute the DeleteVpcPeeringConnection service method. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// + /// Container for the necessary parameters to execute the DescribeBuild service method. /// - /// The response from the DeleteVpcPeeringConnection service method, as returned by GameLift. + /// The response from the DescribeBuild service method, as returned by GameLift. /// /// The service encountered an unrecoverable internal failure while processing the request. /// Clients can retry such requests immediately or after a waiting period. @@ -6004,45 +6986,42 @@ public virtual DeleteVpcPeeringConnectionResponse DeleteVpcPeeringConnection(Del /// /// The client failed authentication. Clients should not retry such requests. /// - /// REST API Reference for DeleteVpcPeeringConnection Operation - public virtual Task DeleteVpcPeeringConnectionAsync(DeleteVpcPeeringConnectionRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + /// REST API Reference for DescribeBuild Operation + public virtual DescribeBuildResponse DescribeBuild(DescribeBuildRequest request) { var options = new InvokeOptions(); - options.RequestMarshaller = DeleteVpcPeeringConnectionRequestMarshaller.Instance; - options.ResponseUnmarshaller = DeleteVpcPeeringConnectionResponseUnmarshaller.Instance; - - return InvokeAsync(request, options, cancellationToken); - } + options.RequestMarshaller = DescribeBuildRequestMarshaller.Instance; + options.ResponseUnmarshaller = DescribeBuildResponseUnmarshaller.Instance; - #endregion - - #region DeregisterCompute + return Invoke(request, options); + } /// - /// This operation has been expanded to use with the Amazon GameLift containers feature, - /// which is currently in public preview. + /// Retrieves properties for a custom game build. To request a build resource, specify + /// a build ID. If successful, an object containing the build properties is returned. /// /// /// - /// Removes a compute resource from an Amazon GameLift Anywhere fleet or container fleet. - /// Deregistered computes can no longer host game sessions through Amazon GameLift. + /// Learn more /// /// /// - /// For an Anywhere fleet or a container fleet that's running the Amazon GameLift Agent, - /// the Agent handles all compute registry tasks for you. For an Anywhere fleet that doesn't - /// use the Agent, call this operation to deregister fleet computes. + /// + /// Upload a Custom Server Build /// /// /// - /// To deregister a compute, call this operation from the compute that's being deregistered - /// and specify the compute name and the fleet ID. + /// All + /// APIs by task /// /// - /// Container for the necessary parameters to execute the DeregisterCompute service method. + /// A unique identifier for the build to retrieve properties for. You can use either the build ID or ARN value. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// /// - /// The response from the DeregisterCompute service method, as returned by GameLift. + /// The response from the DescribeBuild service method, as returned by GameLift. /// /// The service encountered an unrecoverable internal failure while processing the request. /// Clients can retry such requests immediately or after a waiting period. @@ -6058,44 +7037,40 @@ public virtual DeleteVpcPeeringConnectionResponse DeleteVpcPeeringConnection(Del /// /// The client failed authentication. Clients should not retry such requests. /// - /// REST API Reference for DeregisterCompute Operation - public virtual DeregisterComputeResponse DeregisterCompute(DeregisterComputeRequest request) + /// REST API Reference for DescribeBuild Operation + public virtual Task DescribeBuildAsync(string buildId, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { - var options = new InvokeOptions(); - options.RequestMarshaller = DeregisterComputeRequestMarshaller.Instance; - options.ResponseUnmarshaller = DeregisterComputeResponseUnmarshaller.Instance; - - return Invoke(request, options); + var request = new DescribeBuildRequest(); + request.BuildId = buildId; + return DescribeBuildAsync(request, cancellationToken); } /// - /// This operation has been expanded to use with the Amazon GameLift containers feature, - /// which is currently in public preview. + /// Retrieves properties for a custom game build. To request a build resource, specify + /// a build ID. If successful, an object containing the build properties is returned. /// /// /// - /// Removes a compute resource from an Amazon GameLift Anywhere fleet or container fleet. - /// Deregistered computes can no longer host game sessions through Amazon GameLift. + /// Learn more /// /// /// - /// For an Anywhere fleet or a container fleet that's running the Amazon GameLift Agent, - /// the Agent handles all compute registry tasks for you. For an Anywhere fleet that doesn't - /// use the Agent, call this operation to deregister fleet computes. + /// + /// Upload a Custom Server Build /// /// /// - /// To deregister a compute, call this operation from the compute that's being deregistered - /// and specify the compute name and the fleet ID. + /// All + /// APIs by task /// /// - /// Container for the necessary parameters to execute the DeregisterCompute service method. + /// Container for the necessary parameters to execute the DescribeBuild service method. /// /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// /// - /// The response from the DeregisterCompute service method, as returned by GameLift. + /// The response from the DescribeBuild service method, as returned by GameLift. /// /// The service encountered an unrecoverable internal failure while processing the request. /// Clients can retry such requests immediately or after a waiting period. @@ -6111,50 +7086,48 @@ public virtual DeregisterComputeResponse DeregisterCompute(DeregisterComputeRequ /// /// The client failed authentication. Clients should not retry such requests. /// - /// REST API Reference for DeregisterCompute Operation - public virtual Task DeregisterComputeAsync(DeregisterComputeRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + /// REST API Reference for DescribeBuild Operation + public virtual Task DescribeBuildAsync(DescribeBuildRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { var options = new InvokeOptions(); - options.RequestMarshaller = DeregisterComputeRequestMarshaller.Instance; - options.ResponseUnmarshaller = DeregisterComputeResponseUnmarshaller.Instance; + options.RequestMarshaller = DescribeBuildRequestMarshaller.Instance; + options.ResponseUnmarshaller = DescribeBuildResponseUnmarshaller.Instance; - return InvokeAsync(request, options, cancellationToken); + return InvokeAsync(request, options, cancellationToken); } #endregion - #region DeregisterGameServer + #region DescribeCompute /// - /// This operation is used with the Amazon GameLift FleetIQ solution and game server - /// groups. + /// Retrieves properties for a compute resource in an Amazon GameLift fleet. To get a + /// list of all computes in a fleet, call ListCompute. /// /// /// - /// Removes the game server from a game server group. As a result of this operation, the - /// deregistered game server can no longer be claimed and will not be returned in a list - /// of active game servers. + /// To request information on a specific compute, provide the fleet ID and compute name. /// /// /// - /// To deregister a game server, specify the game server group and game server ID. If - /// successful, this operation emits a CloudWatch event with termination timestamp and - /// reason. + /// If successful, this operation returns details for the requested compute resource. + /// Depending on the fleet's compute type, the result includes the following information: + /// /// - /// + ///
    • /// - /// Learn more + /// For managed EC2 fleets, this operation returns information about the EC2 instance. /// - /// + ///
    • /// - /// Amazon - /// GameLift FleetIQ Guide + /// For Anywhere fleets, this operation returns information about the registered compute. /// + ///
    ///     - /// Container for the necessary parameters to execute the DeregisterGameServer service method. + /// Container for the necessary parameters to execute the DescribeCompute service method. /// - /// The response from the DeregisterGameServer service method, as returned by GameLift. + /// The response from the DescribeCompute service method, as returned by GameLift. /// /// The service encountered an unrecoverable internal failure while processing the request. /// Clients can retry such requests immediately or after a waiting period. @@ -6170,49 +7143,50 @@ public virtual DeregisterComputeResponse DeregisterCompute(DeregisterComputeRequ /// /// The client failed authentication. Clients should not retry such requests. /// - /// REST API Reference for DeregisterGameServer Operation - public virtual DeregisterGameServerResponse DeregisterGameServer(DeregisterGameServerRequest request) + /// + /// The requested operation is not supported in the Region specified. + /// + /// REST API Reference for DescribeCompute Operation + public virtual DescribeComputeResponse DescribeCompute(DescribeComputeRequest request) { var options = new InvokeOptions(); - options.RequestMarshaller = DeregisterGameServerRequestMarshaller.Instance; - options.ResponseUnmarshaller = DeregisterGameServerResponseUnmarshaller.Instance; + options.RequestMarshaller = DescribeComputeRequestMarshaller.Instance; + options.ResponseUnmarshaller = DescribeComputeResponseUnmarshaller.Instance; - return Invoke(request, options); + return Invoke(request, options); } /// - /// This operation is used with the Amazon GameLift FleetIQ solution and game server - /// groups. + /// Retrieves properties for a compute resource in an Amazon GameLift fleet. To get a + /// list of all computes in a fleet, call ListCompute. /// /// /// - /// Removes the game server from a game server group. As a result of this operation, the - /// deregistered game server can no longer be claimed and will not be returned in a list - /// of active game servers. + /// To request information on a specific compute, provide the fleet ID and compute name. /// /// /// - /// To deregister a game server, specify the game server group and game server ID. If - /// successful, this operation emits a CloudWatch event with termination timestamp and - /// reason. + /// If successful, this operation returns details for the requested compute resource. + /// Depending on the fleet's compute type, the result includes the following information: + /// /// - /// + ///
    • /// - /// Learn more + /// For managed EC2 fleets, this operation returns information about the EC2 instance. /// - /// + ///
    • /// - /// Amazon - /// GameLift FleetIQ Guide + /// For Anywhere fleets, this operation returns information about the registered compute. /// + ///
    ///     - /// Container for the necessary parameters to execute the DeregisterGameServer service method. + /// Container for the necessary parameters to execute the DescribeCompute service method. /// /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// /// - /// The response from the DeregisterGameServer service method, as returned by GameLift. + /// The response from the DescribeCompute service method, as returned by GameLift. /// /// The service encountered an unrecoverable internal failure while processing the request. /// Clients can retry such requests immediately or after a waiting period. @@ -6228,43 +7202,58 @@ public virtual DeregisterGameServerResponse DeregisterGameServer(DeregisterGameS /// /// The client failed authentication. Clients should not retry such requests. /// - /// REST API Reference for DeregisterGameServer Operation - public virtual Task DeregisterGameServerAsync(DeregisterGameServerRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + /// + /// The requested operation is not supported in the Region specified. + /// + /// REST API Reference for DescribeCompute Operation + public virtual Task DescribeComputeAsync(DescribeComputeRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { var options = new InvokeOptions(); - options.RequestMarshaller = DeregisterGameServerRequestMarshaller.Instance; - options.ResponseUnmarshaller = DeregisterGameServerResponseUnmarshaller.Instance; + options.RequestMarshaller = DescribeComputeRequestMarshaller.Instance; + options.ResponseUnmarshaller = DescribeComputeResponseUnmarshaller.Instance; - return InvokeAsync(request, options, cancellationToken); + return InvokeAsync(request, options, cancellationToken); } #endregion - #region DescribeAlias + #region DescribeContainerFleet /// - /// Retrieves properties for an alias. This operation returns all alias metadata and settings. - /// To get an alias's target fleet ID only, use ResolveAlias. + /// Retrieves the properties for a container fleet. When requesting attributes for multiple + /// fleets, use the pagination parameters to retrieve results as a set of sequential pages. + /// /// /// /// - /// To get alias properties, specify the alias ID. If successful, the requested alias - /// record is returned. + /// Request options /// - /// + ///
    • /// - /// Related actions + /// Get container fleet properties for a single fleet. Provide either the fleet ID or + /// ARN value. + /// + ///
    + /// + /// Results /// /// /// - /// All - /// APIs by task + /// If successful, a ContainerFleet object is returned. This object includes the + /// fleet properties, including information about the most recent deployment. + /// + /// + /// + /// Some API operations limit the number of fleet IDs that allowed in one request. If + /// a request exceeds this limit, the request fails and the error message contains the + /// maximum allowed number. /// + /// ///     - /// The unique identifier for the fleet alias that you want to retrieve. You can use either the alias ID or ARN value. + /// Container for the necessary parameters to execute the DescribeContainerFleet service method. /// - /// The response from the DescribeAlias service method, as returned by GameLift. + /// The response from the DescribeContainerFleet service method, as returned by GameLift. /// /// The service encountered an unrecoverable internal failure while processing the request. /// Clients can retry such requests immediately or after a waiting period. @@ -6280,37 +7269,57 @@ public virtual DeregisterGameServerResponse DeregisterGameServer(DeregisterGameS /// /// The client failed authentication. Clients should not retry such requests. /// - /// REST API Reference for DescribeAlias Operation - public virtual DescribeAliasResponse DescribeAlias(string aliasId) + /// + /// The requested operation is not supported in the Region specified. + /// + /// REST API Reference for DescribeContainerFleet Operation + public virtual DescribeContainerFleetResponse DescribeContainerFleet(DescribeContainerFleetRequest request) { - var request = new DescribeAliasRequest(); - request.AliasId = aliasId; - return DescribeAlias(request); + var options = new InvokeOptions(); + options.RequestMarshaller = DescribeContainerFleetRequestMarshaller.Instance; + options.ResponseUnmarshaller = DescribeContainerFleetResponseUnmarshaller.Instance; + + return Invoke(request, options); } /// - /// Retrieves properties for an alias. This operation returns all alias metadata and settings. - /// To get an alias's target fleet ID only, use ResolveAlias. + /// Retrieves the properties for a container fleet. When requesting attributes for multiple + /// fleets, use the pagination parameters to retrieve results as a set of sequential pages. + /// /// /// /// - /// To get alias properties, specify the alias ID. If successful, the requested alias - /// record is returned. + /// Request options /// - /// + ///
    • /// - /// Related actions + /// Get container fleet properties for a single fleet. Provide either the fleet ID or + /// ARN value. + /// + ///
    + /// + /// Results /// /// /// - /// All - /// APIs by task + /// If successful, a ContainerFleet object is returned. This object includes the + /// fleet properties, including information about the most recent deployment. + /// + /// + /// + /// Some API operations limit the number of fleet IDs that allowed in one request. If + /// a request exceeds this limit, the request fails and the error message contains the + /// maximum allowed number. /// + /// ///     - /// Container for the necessary parameters to execute the DescribeAlias service method. + /// Container for the necessary parameters to execute the DescribeContainerFleet service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// /// - /// The response from the DescribeAlias service method, as returned by GameLift. + /// The response from the DescribeContainerFleet service method, as returned by GameLift. /// /// The service encountered an unrecoverable internal failure while processing the request. /// Clients can retry such requests immediately or after a waiting period. @@ -6326,42 +7335,65 @@ public virtual DescribeAliasResponse DescribeAlias(string aliasId) /// /// The client failed authentication. Clients should not retry such requests. /// - /// REST API Reference for DescribeAlias Operation - public virtual DescribeAliasResponse DescribeAlias(DescribeAliasRequest request) + /// + /// The requested operation is not supported in the Region specified. + /// + /// REST API Reference for DescribeContainerFleet Operation + public virtual Task DescribeContainerFleetAsync(DescribeContainerFleetRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { var options = new InvokeOptions(); - options.RequestMarshaller = DescribeAliasRequestMarshaller.Instance; - options.ResponseUnmarshaller = DescribeAliasResponseUnmarshaller.Instance; - - return Invoke(request, options); + options.RequestMarshaller = DescribeContainerFleetRequestMarshaller.Instance; + options.ResponseUnmarshaller = DescribeContainerFleetResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); } + #endregion + + #region DescribeContainerGroupDefinition + /// - /// Retrieves properties for an alias. This operation returns all alias metadata and settings. - /// To get an alias's target fleet ID only, use ResolveAlias. + /// Retrieves the properties of a container group definition, including all container + /// definitions in the group. /// /// /// - /// To get alias properties, specify the alias ID. If successful, the requested alias - /// record is returned. + /// Request options: + /// + ///
    • + /// + /// Retrieve the latest version of a container group definition. Specify the container + /// group definition name only, or use an ARN value without a version number. + /// + ///
    • + /// + /// Retrieve a particular version. Specify the container group definition name and a version + /// number, or use an ARN value that includes the version number. + /// + ///
    + /// + /// Results: /// /// /// - /// Related actions + /// If successful, this operation returns the complete properties of a container group + /// definition version. /// /// /// - /// All - /// APIs by task + /// Learn more /// + /// ///     - /// The unique identifier for the fleet alias that you want to retrieve. You can use either the alias ID or ARN value. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// + /// Container for the necessary parameters to execute the DescribeContainerGroupDefinition service method. /// - /// The response from the DescribeAlias service method, as returned by GameLift. + /// The response from the DescribeContainerGroupDefinition service method, as returned by GameLift. /// /// The service encountered an unrecoverable internal failure while processing the request. /// Clients can retry such requests immediately or after a waiting period. @@ -6377,40 +7409,64 @@ public virtual DescribeAliasResponse DescribeAlias(DescribeAliasRequest request) /// /// The client failed authentication. Clients should not retry such requests. /// - /// REST API Reference for DescribeAlias Operation - public virtual Task DescribeAliasAsync(string aliasId, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + /// + /// The requested operation is not supported in the Region specified. + /// + /// REST API Reference for DescribeContainerGroupDefinition Operation + public virtual DescribeContainerGroupDefinitionResponse DescribeContainerGroupDefinition(DescribeContainerGroupDefinitionRequest request) { - var request = new DescribeAliasRequest(); - request.AliasId = aliasId; - return DescribeAliasAsync(request, cancellationToken); + var options = new InvokeOptions(); + options.RequestMarshaller = DescribeContainerGroupDefinitionRequestMarshaller.Instance; + options.ResponseUnmarshaller = DescribeContainerGroupDefinitionResponseUnmarshaller.Instance; + + return Invoke(request, options); } /// - /// Retrieves properties for an alias. This operation returns all alias metadata and settings. - /// To get an alias's target fleet ID only, use ResolveAlias. + /// Retrieves the properties of a container group definition, including all container + /// definitions in the group. /// /// /// - /// To get alias properties, specify the alias ID. If successful, the requested alias - /// record is returned. + /// Request options: + /// + ///
    • + /// + /// Retrieve the latest version of a container group definition. Specify the container + /// group definition name only, or use an ARN value without a version number. + /// + ///
    • + /// + /// Retrieve a particular version. Specify the container group definition name and a version + /// number, or use an ARN value that includes the version number. + /// + ///
    + /// + /// Results: /// /// /// - /// Related actions + /// If successful, this operation returns the complete properties of a container group + /// definition version. /// /// /// - /// All - /// APIs by task + /// Learn more + /// + /// ///     - /// Container for the necessary parameters to execute the DescribeAlias service method. + /// Container for the necessary parameters to execute the DescribeContainerGroupDefinition service method. /// /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// /// - /// The response from the DescribeAlias service method, as returned by GameLift. + /// The response from the DescribeContainerGroupDefinition service method, as returned by GameLift. /// /// The service encountered an unrecoverable internal failure while processing the request. /// Clients can retry such requests immediately or after a waiting period. @@ -6426,43 +7482,96 @@ public virtual DescribeAliasResponse DescribeAlias(DescribeAliasRequest request) /// /// The client failed authentication. Clients should not retry such requests. /// - /// REST API Reference for DescribeAlias Operation - public virtual Task DescribeAliasAsync(DescribeAliasRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + /// + /// The requested operation is not supported in the Region specified. + /// + /// REST API Reference for DescribeContainerGroupDefinition Operation + public virtual Task DescribeContainerGroupDefinitionAsync(DescribeContainerGroupDefinitionRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { var options = new InvokeOptions(); - options.RequestMarshaller = DescribeAliasRequestMarshaller.Instance; - options.ResponseUnmarshaller = DescribeAliasResponseUnmarshaller.Instance; + options.RequestMarshaller = DescribeContainerGroupDefinitionRequestMarshaller.Instance; + options.ResponseUnmarshaller = DescribeContainerGroupDefinitionResponseUnmarshaller.Instance; - return InvokeAsync(request, options, cancellationToken); + return InvokeAsync(request, options, cancellationToken); } #endregion - #region DescribeBuild + #region DescribeEC2InstanceLimits /// - /// Retrieves properties for a custom game build. To request a build resource, specify - /// a build ID. If successful, an object containing the build properties is returned. + /// Retrieves the instance limits and current utilization for an Amazon Web Services Region + /// or location. Instance limits control the number of instances, per instance type, per + /// location, that your Amazon Web Services account can use. Learn more at Amazon + /// EC2 Instance Types. The information returned includes the maximum number of instances + /// allowed and your account's current usage across all fleets. This information can affect + /// your ability to scale your Amazon GameLift fleets. You can request a limit increase + /// for your account by using the Service limits page in the Amazon GameLift console. /// /// /// - /// Learn more + /// Instance limits differ based on whether the instances are deployed in a fleet's home + /// Region or in a remote location. For remote locations, limits also differ based on + /// the combination of home Region and remote location. All requests must specify an Amazon + /// Web Services Region (either explicitly or as your default settings). To get the limit + /// for a remote location, you must also specify the location. For example, the following + /// requests all return different results: + /// + ///
    • + /// + /// Request specifies the Region ap-northeast-1 with no location. The result is + /// limits and usage data on all instance types that are deployed in us-east-2, + /// by all of the fleets that reside in ap-northeast-1. + /// + ///
    • + /// + /// Request specifies the Region us-east-1 with location ca-central-1. The + /// result is limits and usage data on all instance types that are deployed in ca-central-1, + /// by all of the fleets that reside in us-east-2. These limits do not affect fleets + /// in any other Regions that deploy instances to ca-central-1. + /// + ///
    • + /// + /// Request specifies the Region eu-west-1 with location ca-central-1. The + /// result is limits and usage data on all instance types that are deployed in ca-central-1, + /// by all of the fleets that reside in eu-west-1. + /// + ///
    + /// + /// This operation can be used in the following ways: + /// + ///
    • + /// + /// To get limit and usage data for all instance types that are deployed in an Amazon + /// Web Services Region by fleets that reside in the same Region: Specify the Region only. + /// Optionally, specify a single instance type to retrieve information for. + /// + ///
    • + /// + /// To get limit and usage data for all instance types that are deployed to a remote location + /// by fleets that reside in different Amazon Web Services Region: Provide both the Amazon + /// Web Services Region and the remote location. Optionally, specify a single instance + /// type to retrieve information for. + /// + ///
    + /// + /// If successful, an EC2InstanceLimits object is returned with limits and usage + /// data for each requested instance type. /// /// /// - /// - /// Upload a Custom Server Build + /// Learn more /// /// /// - /// All - /// APIs by task + /// Setting + /// up Amazon GameLift fleets /// ///     - /// A unique identifier for the build to retrieve properties for. You can use either the build ID or ARN value. + /// Name of an Amazon EC2 instance type that is supported in Amazon GameLift. A fleet instance type determines the computing resources of each instance in the fleet, including CPU, memory, storage, and networking capacity. Do not specify a value for this parameter to retrieve limits for all instance types. /// - /// The response from the DescribeBuild service method, as returned by GameLift. + /// The response from the DescribeEC2InstanceLimits service method, as returned by GameLift. /// /// The service encountered an unrecoverable internal failure while processing the request. /// Clients can retry such requests immediately or after a waiting period. @@ -6471,44 +7580,93 @@ public virtual DescribeAliasResponse DescribeAlias(DescribeAliasRequest request) /// One or more parameter values in the request are invalid. Correct the invalid parameter /// values before retrying. /// - /// - /// The requested resources was not found. The resource was either not created yet or - /// deleted. - /// /// /// The client failed authentication. Clients should not retry such requests. /// - /// REST API Reference for DescribeBuild Operation - public virtual DescribeBuildResponse DescribeBuild(string buildId) + /// + /// The requested operation is not supported in the Region specified. + /// + /// REST API Reference for DescribeEC2InstanceLimits Operation + public virtual DescribeEC2InstanceLimitsResponse DescribeEC2InstanceLimits(EC2InstanceType ec2InstanceType) { - var request = new DescribeBuildRequest(); - request.BuildId = buildId; - return DescribeBuild(request); + var request = new DescribeEC2InstanceLimitsRequest(); + request.EC2InstanceType = ec2InstanceType; + return DescribeEC2InstanceLimits(request); } /// - /// Retrieves properties for a custom game build. To request a build resource, specify - /// a build ID. If successful, an object containing the build properties is returned. + /// Retrieves the instance limits and current utilization for an Amazon Web Services Region + /// or location. Instance limits control the number of instances, per instance type, per + /// location, that your Amazon Web Services account can use. Learn more at Amazon + /// EC2 Instance Types. The information returned includes the maximum number of instances + /// allowed and your account's current usage across all fleets. This information can affect + /// your ability to scale your Amazon GameLift fleets. You can request a limit increase + /// for your account by using the Service limits page in the Amazon GameLift console. /// /// /// - /// Learn more + /// Instance limits differ based on whether the instances are deployed in a fleet's home + /// Region or in a remote location. For remote locations, limits also differ based on + /// the combination of home Region and remote location. All requests must specify an Amazon + /// Web Services Region (either explicitly or as your default settings). To get the limit + /// for a remote location, you must also specify the location. For example, the following + /// requests all return different results: + /// + ///
    • + /// + /// Request specifies the Region ap-northeast-1 with no location. The result is + /// limits and usage data on all instance types that are deployed in us-east-2, + /// by all of the fleets that reside in ap-northeast-1. + /// + ///
    • + /// + /// Request specifies the Region us-east-1 with location ca-central-1. The + /// result is limits and usage data on all instance types that are deployed in ca-central-1, + /// by all of the fleets that reside in us-east-2. These limits do not affect fleets + /// in any other Regions that deploy instances to ca-central-1. + /// + ///
    • + /// + /// Request specifies the Region eu-west-1 with location ca-central-1. The + /// result is limits and usage data on all instance types that are deployed in ca-central-1, + /// by all of the fleets that reside in eu-west-1. + /// + ///
    + /// + /// This operation can be used in the following ways: + /// + ///
    • + /// + /// To get limit and usage data for all instance types that are deployed in an Amazon + /// Web Services Region by fleets that reside in the same Region: Specify the Region only. + /// Optionally, specify a single instance type to retrieve information for. + /// + ///
    • + /// + /// To get limit and usage data for all instance types that are deployed to a remote location + /// by fleets that reside in different Amazon Web Services Region: Provide both the Amazon + /// Web Services Region and the remote location. Optionally, specify a single instance + /// type to retrieve information for. + /// + ///
    + /// + /// If successful, an EC2InstanceLimits object is returned with limits and usage + /// data for each requested instance type. /// /// /// - /// - /// Upload a Custom Server Build + /// Learn more /// /// /// - /// All - /// APIs by task + /// Setting + /// up Amazon GameLift fleets /// ///     - /// Container for the necessary parameters to execute the DescribeBuild service method. + /// Container for the necessary parameters to execute the DescribeEC2InstanceLimits service method. /// - /// The response from the DescribeBuild service method, as returned by GameLift. + /// The response from the DescribeEC2InstanceLimits service method, as returned by GameLift. /// /// The service encountered an unrecoverable internal failure while processing the request. /// Clients can retry such requests immediately or after a waiting period. @@ -6517,49 +7675,98 @@ public virtual DescribeBuildResponse DescribeBuild(string buildId) /// One or more parameter values in the request are invalid. Correct the invalid parameter /// values before retrying. /// - /// - /// The requested resources was not found. The resource was either not created yet or - /// deleted. - /// /// /// The client failed authentication. Clients should not retry such requests. /// - /// REST API Reference for DescribeBuild Operation - public virtual DescribeBuildResponse DescribeBuild(DescribeBuildRequest request) + /// + /// The requested operation is not supported in the Region specified. + /// + /// REST API Reference for DescribeEC2InstanceLimits Operation + public virtual DescribeEC2InstanceLimitsResponse DescribeEC2InstanceLimits(DescribeEC2InstanceLimitsRequest request) { var options = new InvokeOptions(); - options.RequestMarshaller = DescribeBuildRequestMarshaller.Instance; - options.ResponseUnmarshaller = DescribeBuildResponseUnmarshaller.Instance; + options.RequestMarshaller = DescribeEC2InstanceLimitsRequestMarshaller.Instance; + options.ResponseUnmarshaller = DescribeEC2InstanceLimitsResponseUnmarshaller.Instance; - return Invoke(request, options); + return Invoke(request, options); } /// - /// Retrieves properties for a custom game build. To request a build resource, specify - /// a build ID. If successful, an object containing the build properties is returned. + /// Retrieves the instance limits and current utilization for an Amazon Web Services Region + /// or location. Instance limits control the number of instances, per instance type, per + /// location, that your Amazon Web Services account can use. Learn more at Amazon + /// EC2 Instance Types. The information returned includes the maximum number of instances + /// allowed and your account's current usage across all fleets. This information can affect + /// your ability to scale your Amazon GameLift fleets. You can request a limit increase + /// for your account by using the Service limits page in the Amazon GameLift console. /// /// /// - /// Learn more + /// Instance limits differ based on whether the instances are deployed in a fleet's home + /// Region or in a remote location. For remote locations, limits also differ based on + /// the combination of home Region and remote location. All requests must specify an Amazon + /// Web Services Region (either explicitly or as your default settings). To get the limit + /// for a remote location, you must also specify the location. For example, the following + /// requests all return different results: + /// + ///
    • + /// + /// Request specifies the Region ap-northeast-1 with no location. The result is + /// limits and usage data on all instance types that are deployed in us-east-2, + /// by all of the fleets that reside in ap-northeast-1. + /// + ///
    • + /// + /// Request specifies the Region us-east-1 with location ca-central-1. The + /// result is limits and usage data on all instance types that are deployed in ca-central-1, + /// by all of the fleets that reside in us-east-2. These limits do not affect fleets + /// in any other Regions that deploy instances to ca-central-1. + /// + ///
    • + /// + /// Request specifies the Region eu-west-1 with location ca-central-1. The + /// result is limits and usage data on all instance types that are deployed in ca-central-1, + /// by all of the fleets that reside in eu-west-1. + /// + ///
    + /// + /// This operation can be used in the following ways: + /// + ///
    • + /// + /// To get limit and usage data for all instance types that are deployed in an Amazon + /// Web Services Region by fleets that reside in the same Region: Specify the Region only. + /// Optionally, specify a single instance type to retrieve information for. + /// + ///
    • + /// + /// To get limit and usage data for all instance types that are deployed to a remote location + /// by fleets that reside in different Amazon Web Services Region: Provide both the Amazon + /// Web Services Region and the remote location. Optionally, specify a single instance + /// type to retrieve information for. + /// + ///
    + /// + /// If successful, an EC2InstanceLimits object is returned with limits and usage + /// data for each requested instance type. /// /// /// - /// - /// Upload a Custom Server Build + /// Learn more /// /// /// - /// All - /// APIs by task + /// Setting + /// up Amazon GameLift fleets /// ///     - /// A unique identifier for the build to retrieve properties for. You can use either the build ID or ARN value. + /// Name of an Amazon EC2 instance type that is supported in Amazon GameLift. A fleet instance type determines the computing resources of each instance in the fleet, including CPU, memory, storage, and networking capacity. Do not specify a value for this parameter to retrieve limits for all instance types. /// /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// /// - /// The response from the DescribeBuild service method, as returned by GameLift. + /// The response from the DescribeEC2InstanceLimits service method, as returned by GameLift. /// /// The service encountered an unrecoverable internal failure while processing the request. /// Clients can retry such requests immediately or after a waiting period. @@ -6568,47 +7775,96 @@ public virtual DescribeBuildResponse DescribeBuild(DescribeBuildRequest request) /// One or more parameter values in the request are invalid. Correct the invalid parameter /// values before retrying. /// - /// - /// The requested resources was not found. The resource was either not created yet or - /// deleted. - /// /// /// The client failed authentication. Clients should not retry such requests. /// - /// REST API Reference for DescribeBuild Operation - public virtual Task DescribeBuildAsync(string buildId, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + /// + /// The requested operation is not supported in the Region specified. + /// + /// REST API Reference for DescribeEC2InstanceLimits Operation + public virtual Task DescribeEC2InstanceLimitsAsync(EC2InstanceType ec2InstanceType, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { - var request = new DescribeBuildRequest(); - request.BuildId = buildId; - return DescribeBuildAsync(request, cancellationToken); + var request = new DescribeEC2InstanceLimitsRequest(); + request.EC2InstanceType = ec2InstanceType; + return DescribeEC2InstanceLimitsAsync(request, cancellationToken); } /// - /// Retrieves properties for a custom game build. To request a build resource, specify - /// a build ID. If successful, an object containing the build properties is returned. + /// Retrieves the instance limits and current utilization for an Amazon Web Services Region + /// or location. Instance limits control the number of instances, per instance type, per + /// location, that your Amazon Web Services account can use. Learn more at Amazon + /// EC2 Instance Types. The information returned includes the maximum number of instances + /// allowed and your account's current usage across all fleets. This information can affect + /// your ability to scale your Amazon GameLift fleets. You can request a limit increase + /// for your account by using the Service limits page in the Amazon GameLift console. /// /// /// - /// Learn more + /// Instance limits differ based on whether the instances are deployed in a fleet's home + /// Region or in a remote location. For remote locations, limits also differ based on + /// the combination of home Region and remote location. All requests must specify an Amazon + /// Web Services Region (either explicitly or as your default settings). To get the limit + /// for a remote location, you must also specify the location. For example, the following + /// requests all return different results: + /// + ///
    • + /// + /// Request specifies the Region ap-northeast-1 with no location. The result is + /// limits and usage data on all instance types that are deployed in us-east-2, + /// by all of the fleets that reside in ap-northeast-1. + /// + ///
    • + /// + /// Request specifies the Region us-east-1 with location ca-central-1. The + /// result is limits and usage data on all instance types that are deployed in ca-central-1, + /// by all of the fleets that reside in us-east-2. These limits do not affect fleets + /// in any other Regions that deploy instances to ca-central-1. + /// + ///
    • + /// + /// Request specifies the Region eu-west-1 with location ca-central-1. The + /// result is limits and usage data on all instance types that are deployed in ca-central-1, + /// by all of the fleets that reside in eu-west-1. + /// + ///
    + /// + /// This operation can be used in the following ways: + /// + ///
    • + /// + /// To get limit and usage data for all instance types that are deployed in an Amazon + /// Web Services Region by fleets that reside in the same Region: Specify the Region only. + /// Optionally, specify a single instance type to retrieve information for. + /// + ///
    • + /// + /// To get limit and usage data for all instance types that are deployed to a remote location + /// by fleets that reside in different Amazon Web Services Region: Provide both the Amazon + /// Web Services Region and the remote location. Optionally, specify a single instance + /// type to retrieve information for. + /// + ///
    + /// + /// If successful, an EC2InstanceLimits object is returned with limits and usage + /// data for each requested instance type. /// /// /// - /// - /// Upload a Custom Server Build + /// Learn more /// /// /// - /// All - /// APIs by task + /// Setting + /// up Amazon GameLift fleets /// ///     - /// Container for the necessary parameters to execute the DescribeBuild service method. + /// Container for the necessary parameters to execute the DescribeEC2InstanceLimits service method. /// /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// /// - /// The response from the DescribeBuild service method, as returned by GameLift. + /// The response from the DescribeEC2InstanceLimits service method, as returned by GameLift. /// /// The service encountered an unrecoverable internal failure while processing the request. /// Clients can retry such requests immediately or after a waiting period. @@ -6617,67 +7873,73 @@ public virtual DescribeBuildResponse DescribeBuild(DescribeBuildRequest request) /// One or more parameter values in the request are invalid. Correct the invalid parameter /// values before retrying. /// - /// - /// The requested resources was not found. The resource was either not created yet or - /// deleted. - /// /// /// The client failed authentication. Clients should not retry such requests. /// - /// REST API Reference for DescribeBuild Operation - public virtual Task DescribeBuildAsync(DescribeBuildRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + /// + /// The requested operation is not supported in the Region specified. + /// + /// REST API Reference for DescribeEC2InstanceLimits Operation + public virtual Task DescribeEC2InstanceLimitsAsync(DescribeEC2InstanceLimitsRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { var options = new InvokeOptions(); - options.RequestMarshaller = DescribeBuildRequestMarshaller.Instance; - options.ResponseUnmarshaller = DescribeBuildResponseUnmarshaller.Instance; + options.RequestMarshaller = DescribeEC2InstanceLimitsRequestMarshaller.Instance; + options.ResponseUnmarshaller = DescribeEC2InstanceLimitsResponseUnmarshaller.Instance; - return InvokeAsync(request, options, cancellationToken); + return InvokeAsync(request, options, cancellationToken); } #endregion - #region DescribeCompute + #region DescribeFleetAttributes /// - /// This operation has been expanded to use with the Amazon GameLift containers feature, - /// which is currently in public preview. + /// Retrieves core fleet-wide properties for fleets in an Amazon Web Services Region. + /// Properties include the computing hardware and deployment configuration for instances + /// in the fleet. /// /// /// - /// Retrieves properties for a compute resource in an Amazon GameLift fleet. To get a - /// list of all computes in a fleet, call ListCompute. + /// You can use this operation in the following ways: /// - /// + ///
    • /// - /// To request information on a specific compute, provide the fleet ID and compute name. + /// To get attributes for specific fleets, provide a list of fleet IDs or fleet ARNs. + /// + ///
    • + /// + /// To get attributes for all fleets, do not provide a fleet identifier. + /// + ///
    + /// + /// When requesting attributes for multiple fleets, use the pagination parameters to retrieve + /// results as a set of sequential pages. /// /// /// - /// If successful, this operation returns details for the requested compute resource. - /// Depending on the fleet's compute type, the result includes the following information: - /// + /// If successful, a FleetAttributes object is returned for each fleet requested, + /// unless the fleet identifier is not found. /// - ///
    • + /// /// - /// For EC2 fleets, this operation returns information about the EC2 instance. + /// Some API operations limit the number of fleet IDs that allowed in one request. If + /// a request exceeds this limit, the request fails and the error message contains the + /// maximum allowed number. /// - ///
    • + /// /// - /// For ANYWHERE fleets, this operation returns information about the registered - /// compute. + /// Learn more /// - ///
    • + /// /// - /// For CONTAINER fleets, this operation returns information about the container - /// that's registered as a compute, and the instance it's running on. The compute name - /// is the container name. + /// Setting + /// up Amazon GameLift fleets /// - ///
    ///     - /// Container for the necessary parameters to execute the DescribeCompute service method. + /// Container for the necessary parameters to execute the DescribeFleetAttributes service method. /// - /// The response from the DescribeCompute service method, as returned by GameLift. + /// The response from the DescribeFleetAttributes service method, as returned by GameLift. /// /// The service encountered an unrecoverable internal failure while processing the request. /// Clients can retry such requests immediately or after a waiting period. @@ -6693,117 +7955,66 @@ public virtual DescribeBuildResponse DescribeBuild(DescribeBuildRequest request) /// /// The client failed authentication. Clients should not retry such requests. /// - /// REST API Reference for DescribeCompute Operation - public virtual DescribeComputeResponse DescribeCompute(DescribeComputeRequest request) + /// REST API Reference for DescribeFleetAttributes Operation + public virtual DescribeFleetAttributesResponse DescribeFleetAttributes(DescribeFleetAttributesRequest request) { var options = new InvokeOptions(); - options.RequestMarshaller = DescribeComputeRequestMarshaller.Instance; - options.ResponseUnmarshaller = DescribeComputeResponseUnmarshaller.Instance; + options.RequestMarshaller = DescribeFleetAttributesRequestMarshaller.Instance; + options.ResponseUnmarshaller = DescribeFleetAttributesResponseUnmarshaller.Instance; - return Invoke(request, options); + return Invoke(request, options); } /// - /// This operation has been expanded to use with the Amazon GameLift containers feature, - /// which is currently in public preview. + /// Retrieves core fleet-wide properties for fleets in an Amazon Web Services Region. + /// Properties include the computing hardware and deployment configuration for instances + /// in the fleet. /// /// /// - /// Retrieves properties for a compute resource in an Amazon GameLift fleet. To get a - /// list of all computes in a fleet, call ListCompute. - /// - /// - /// - /// To request information on a specific compute, provide the fleet ID and compute name. - /// - /// - /// - /// If successful, this operation returns details for the requested compute resource. - /// Depending on the fleet's compute type, the result includes the following information: - /// + /// You can use this operation in the following ways: /// ///
    • /// - /// For EC2 fleets, this operation returns information about the EC2 instance. - /// - ///
    • - /// - /// For ANYWHERE fleets, this operation returns information about the registered - /// compute. + /// To get attributes for specific fleets, provide a list of fleet IDs or fleet ARNs. /// ///
    • /// - /// For CONTAINER fleets, this operation returns information about the container - /// that's registered as a compute, and the instance it's running on. The compute name - /// is the container name. + /// To get attributes for all fleets, do not provide a fleet identifier. /// - ///
    - ///     - /// Container for the necessary parameters to execute the DescribeCompute service method. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// - /// - /// The response from the DescribeCompute service method, as returned by GameLift. - /// - /// The service encountered an unrecoverable internal failure while processing the request. - /// Clients can retry such requests immediately or after a waiting period. - /// - /// - /// One or more parameter values in the request are invalid. Correct the invalid parameter - /// values before retrying. - /// - /// - /// The requested resources was not found. The resource was either not created yet or - /// deleted. - /// - /// - /// The client failed authentication. Clients should not retry such requests. - /// - /// REST API Reference for DescribeCompute Operation - public virtual Task DescribeComputeAsync(DescribeComputeRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) - { - var options = new InvokeOptions(); - options.RequestMarshaller = DescribeComputeRequestMarshaller.Instance; - options.ResponseUnmarshaller = DescribeComputeResponseUnmarshaller.Instance; - - return InvokeAsync(request, options, cancellationToken); - } - - #endregion - - #region DescribeContainerGroupDefinition - - - /// - /// This operation is used with the Amazon GameLift containers feature, which is currently - /// in public preview. - /// - /// + /// /// - /// Retrieves the properties of a container group definition, including all container - /// definitions in the group. + /// When requesting attributes for multiple fleets, use the pagination parameters to retrieve + /// results as a set of sequential pages. /// /// /// - /// To retrieve a container group definition, provide a resource identifier. If successful, - /// this operation returns the complete properties of the container group definition. + /// If successful, a FleetAttributes object is returned for each fleet requested, + /// unless the fleet identifier is not found. /// - /// + /// + /// + /// Some API operations limit the number of fleet IDs that allowed in one request. If + /// a request exceeds this limit, the request fails and the error message contains the + /// maximum allowed number. + /// + /// /// /// Learn more /// - /// /// - /// Container for the necessary parameters to execute the DescribeContainerGroupDefinition service method. + /// Container for the necessary parameters to execute the DescribeFleetAttributes service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// /// - /// The response from the DescribeContainerGroupDefinition service method, as returned by GameLift. + /// The response from the DescribeFleetAttributes service method, as returned by GameLift. /// /// The service encountered an unrecoverable internal failure while processing the request. /// Clients can retry such requests immediately or after a waiting period. @@ -6819,51 +8030,79 @@ public virtual DescribeComputeResponse DescribeCompute(DescribeComputeRequest re /// /// The client failed authentication. Clients should not retry such requests. /// - /// - /// The requested operation is not supported in the Region specified. - /// - /// REST API Reference for DescribeContainerGroupDefinition Operation - public virtual DescribeContainerGroupDefinitionResponse DescribeContainerGroupDefinition(DescribeContainerGroupDefinitionRequest request) + /// REST API Reference for DescribeFleetAttributes Operation + public virtual Task DescribeFleetAttributesAsync(DescribeFleetAttributesRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { var options = new InvokeOptions(); - options.RequestMarshaller = DescribeContainerGroupDefinitionRequestMarshaller.Instance; - options.ResponseUnmarshaller = DescribeContainerGroupDefinitionResponseUnmarshaller.Instance; - - return Invoke(request, options); + options.RequestMarshaller = DescribeFleetAttributesRequestMarshaller.Instance; + options.ResponseUnmarshaller = DescribeFleetAttributesResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); } + #endregion + + #region DescribeFleetCapacity + /// - /// This operation is used with the Amazon GameLift containers feature, which is currently - /// in public preview. + /// Retrieves the resource capacity settings for one or more fleets. For a container fleet, + /// this operation also returns counts for game server container groups. /// /// /// - /// Retrieves the properties of a container group definition, including all container - /// definitions in the group. + /// With multi-location fleets, this operation retrieves data for the fleet's home Region + /// only. To retrieve capacity for remote locations, see DescribeFleetLocationCapacity. /// /// /// - /// To retrieve a container group definition, provide a resource identifier. If successful, - /// this operation returns the complete properties of the container group definition. + /// This operation can be used in the following ways: + /// + ///
    • + /// + /// To get capacity data for one or more specific fleets, provide a list of fleet IDs + /// or fleet ARNs. + /// + ///
    • + /// + /// To get capacity data for all fleets, do not provide a fleet identifier. + /// + ///
    + /// + /// When requesting multiple fleets, use the pagination parameters to retrieve results + /// as a set of sequential pages. /// /// /// + /// If successful, a FleetCapacity object is returned for each requested fleet + /// ID. Each FleetCapacity object includes a Location property, which is + /// set to the fleet's home Region. Capacity values are returned only for fleets that + /// currently exist. + /// + /// + /// + /// Some API operations may limit the number of fleet IDs that are allowed in one request. + /// If a request exceeds this limit, the request fails and the error message includes + /// the maximum allowed. + /// + /// + /// /// Learn more /// - /// ///     - /// Container for the necessary parameters to execute the DescribeContainerGroupDefinition service method. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// + /// Container for the necessary parameters to execute the DescribeFleetCapacity service method. /// - /// The response from the DescribeContainerGroupDefinition service method, as returned by GameLift. + /// The response from the DescribeFleetCapacity service method, as returned by GameLift. /// /// The service encountered an unrecoverable internal failure while processing the request. /// Clients can retry such requests immediately or after a waiting period. @@ -6882,81 +8121,58 @@ public virtual DescribeContainerGroupDefinitionResponse DescribeContainerGroupDe /// /// The requested operation is not supported in the Region specified. /// - /// REST API Reference for DescribeContainerGroupDefinition Operation - public virtual Task DescribeContainerGroupDefinitionAsync(DescribeContainerGroupDefinitionRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + /// REST API Reference for DescribeFleetCapacity Operation + public virtual DescribeFleetCapacityResponse DescribeFleetCapacity(DescribeFleetCapacityRequest request) { var options = new InvokeOptions(); - options.RequestMarshaller = DescribeContainerGroupDefinitionRequestMarshaller.Instance; - options.ResponseUnmarshaller = DescribeContainerGroupDefinitionResponseUnmarshaller.Instance; - - return InvokeAsync(request, options, cancellationToken); - } + options.RequestMarshaller = DescribeFleetCapacityRequestMarshaller.Instance; + options.ResponseUnmarshaller = DescribeFleetCapacityResponseUnmarshaller.Instance; - #endregion - - #region DescribeEC2InstanceLimits + return Invoke(request, options); + } /// - /// Retrieves the instance limits and current utilization for an Amazon Web Services Region - /// or location. Instance limits control the number of instances, per instance type, per - /// location, that your Amazon Web Services account can use. Learn more at Amazon - /// EC2 Instance Types. The information returned includes the maximum number of instances - /// allowed and your account's current usage across all fleets. This information can affect - /// your ability to scale your Amazon GameLift fleets. You can request a limit increase - /// for your account by using the Service limits page in the Amazon GameLift console. + /// Retrieves the resource capacity settings for one or more fleets. For a container fleet, + /// this operation also returns counts for game server container groups. /// /// /// - /// Instance limits differ based on whether the instances are deployed in a fleet's home - /// Region or in a remote location. For remote locations, limits also differ based on - /// the combination of home Region and remote location. All requests must specify an Amazon - /// Web Services Region (either explicitly or as your default settings). To get the limit - /// for a remote location, you must also specify the location. For example, the following - /// requests all return different results: + /// With multi-location fleets, this operation retrieves data for the fleet's home Region + /// only. To retrieve capacity for remote locations, see DescribeFleetLocationCapacity. /// - ///
    • + /// /// - /// Request specifies the Region ap-northeast-1 with no location. The result is - /// limits and usage data on all instance types that are deployed in us-east-2, - /// by all of the fleets that reside in ap-northeast-1. + /// This operation can be used in the following ways: /// - ///
    • + ///
      • /// - /// Request specifies the Region us-east-1 with location ca-central-1. The - /// result is limits and usage data on all instance types that are deployed in ca-central-1, - /// by all of the fleets that reside in us-east-2. These limits do not affect fleets - /// in any other Regions that deploy instances to ca-central-1. + /// To get capacity data for one or more specific fleets, provide a list of fleet IDs + /// or fleet ARNs. /// ///
      • /// - /// Request specifies the Region eu-west-1 with location ca-central-1. The - /// result is limits and usage data on all instance types that are deployed in ca-central-1, - /// by all of the fleets that reside in eu-west-1. + /// To get capacity data for all fleets, do not provide a fleet identifier. /// ///
      /// - /// This operation can be used in the following ways: - /// - ///
      • - /// - /// To get limit and usage data for all instance types that are deployed in an Amazon - /// Web Services Region by fleets that reside in the same Region: Specify the Region only. - /// Optionally, specify a single instance type to retrieve information for. + /// When requesting multiple fleets, use the pagination parameters to retrieve results + /// as a set of sequential pages. /// - ///
      • + /// /// - /// To get limit and usage data for all instance types that are deployed to a remote location - /// by fleets that reside in different Amazon Web Services Region: Provide both the Amazon - /// Web Services Region and the remote location. Optionally, specify a single instance - /// type to retrieve information for. + /// If successful, a FleetCapacity object is returned for each requested fleet + /// ID. Each FleetCapacity object includes a Location property, which is + /// set to the fleet's home Region. Capacity values are returned only for fleets that + /// currently exist. /// - ///
      + /// /// - /// If successful, an EC2InstanceLimits object is returned with limits and usage - /// data for each requested instance type. + /// Some API operations may limit the number of fleet IDs that are allowed in one request. + /// If a request exceeds this limit, the request fails and the error message includes + /// the maximum allowed. /// - /// + /// /// /// Learn more /// @@ -6965,10 +8181,18 @@ public virtual DescribeContainerGroupDefinitionResponse DescribeContainerGroupDe /// Setting /// up Amazon GameLift fleets /// + /// + /// + /// GameLift + /// metrics for fleets + /// ///
    - /// Name of an Amazon EC2 instance type that is supported in Amazon GameLift. A fleet instance type determines the computing resources of each instance in the fleet, including CPU, memory, storage, and networking capacity. Do not specify a value for this parameter to retrieve limits for all instance types. + /// Container for the necessary parameters to execute the DescribeFleetCapacity service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// /// - /// The response from the DescribeEC2InstanceLimits service method, as returned by GameLift. + /// The response from the DescribeFleetCapacity service method, as returned by GameLift. /// /// The service encountered an unrecoverable internal failure while processing the request. /// Clients can retry such requests immediately or after a waiting period. @@ -6977,93 +8201,60 @@ public virtual DescribeContainerGroupDefinitionResponse DescribeContainerGroupDe /// One or more parameter values in the request are invalid. Correct the invalid parameter /// values before retrying. /// + /// + /// The requested resources was not found. The resource was either not created yet or + /// deleted. + /// /// /// The client failed authentication. Clients should not retry such requests. /// /// /// The requested operation is not supported in the Region specified. /// - /// REST API Reference for DescribeEC2InstanceLimits Operation - public virtual DescribeEC2InstanceLimitsResponse DescribeEC2InstanceLimits(EC2InstanceType ec2InstanceType) + /// REST API Reference for DescribeFleetCapacity Operation + public virtual Task DescribeFleetCapacityAsync(DescribeFleetCapacityRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { - var request = new DescribeEC2InstanceLimitsRequest(); - request.EC2InstanceType = ec2InstanceType; - return DescribeEC2InstanceLimits(request); + var options = new InvokeOptions(); + options.RequestMarshaller = DescribeFleetCapacityRequestMarshaller.Instance; + options.ResponseUnmarshaller = DescribeFleetCapacityResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); } + #endregion + + #region DescribeFleetDeployment + /// - /// Retrieves the instance limits and current utilization for an Amazon Web Services Region - /// or location. Instance limits control the number of instances, per instance type, per - /// location, that your Amazon Web Services account can use. Learn more at Amazon - /// EC2 Instance Types. The information returned includes the maximum number of instances - /// allowed and your account's current usage across all fleets. This information can affect - /// your ability to scale your Amazon GameLift fleets. You can request a limit increase - /// for your account by using the Service limits page in the Amazon GameLift console. + /// Retrieves information about a managed container fleet deployment. /// /// /// - /// Instance limits differ based on whether the instances are deployed in a fleet's home - /// Region or in a remote location. For remote locations, limits also differ based on - /// the combination of home Region and remote location. All requests must specify an Amazon - /// Web Services Region (either explicitly or as your default settings). To get the limit - /// for a remote location, you must also specify the location. For example, the following - /// requests all return different results: - /// - ///
    • - /// - /// Request specifies the Region ap-northeast-1 with no location. The result is - /// limits and usage data on all instance types that are deployed in us-east-2, - /// by all of the fleets that reside in ap-northeast-1. - /// - ///
    • - /// - /// Request specifies the Region us-east-1 with location ca-central-1. The - /// result is limits and usage data on all instance types that are deployed in ca-central-1, - /// by all of the fleets that reside in us-east-2. These limits do not affect fleets - /// in any other Regions that deploy instances to ca-central-1. - /// - ///
    • - /// - /// Request specifies the Region eu-west-1 with location ca-central-1. The - /// result is limits and usage data on all instance types that are deployed in ca-central-1, - /// by all of the fleets that reside in eu-west-1. - /// - ///
    - /// - /// This operation can be used in the following ways: + /// Request options /// ///
    • /// - /// To get limit and usage data for all instance types that are deployed in an Amazon - /// Web Services Region by fleets that reside in the same Region: Specify the Region only. - /// Optionally, specify a single instance type to retrieve information for. + /// Get information about the latest deployment for a specific fleet. Provide the fleet + /// ID or ARN. /// ///
    • /// - /// To get limit and usage data for all instance types that are deployed to a remote location - /// by fleets that reside in different Amazon Web Services Region: Provide both the Amazon - /// Web Services Region and the remote location. Optionally, specify a single instance - /// type to retrieve information for. - /// - ///
    - /// - /// If successful, an EC2InstanceLimits object is returned with limits and usage - /// data for each requested instance type. + /// Get information about a specific deployment. Provide the fleet ID or ARN and the + /// deployment ID. /// - /// + /// /// - /// Learn more + /// Results /// /// /// - /// Setting - /// up Amazon GameLift fleets + /// If successful, a FleetDeployment object is returned. /// ///     - /// Container for the necessary parameters to execute the DescribeEC2InstanceLimits service method. + /// Container for the necessary parameters to execute the DescribeFleetDeployment service method. /// - /// The response from the DescribeEC2InstanceLimits service method, as returned by GameLift. + /// The response from the DescribeFleetDeployment service method, as returned by GameLift. /// /// The service encountered an unrecoverable internal failure while processing the request. /// Clients can retry such requests immediately or after a waiting period. @@ -7072,81 +8263,106 @@ public virtual DescribeEC2InstanceLimitsResponse DescribeEC2InstanceLimits(EC2In /// One or more parameter values in the request are invalid. Correct the invalid parameter /// values before retrying. /// + /// + /// The requested resources was not found. The resource was either not created yet or + /// deleted. + /// /// /// The client failed authentication. Clients should not retry such requests. /// /// /// The requested operation is not supported in the Region specified. /// - /// REST API Reference for DescribeEC2InstanceLimits Operation - public virtual DescribeEC2InstanceLimitsResponse DescribeEC2InstanceLimits(DescribeEC2InstanceLimitsRequest request) + /// REST API Reference for DescribeFleetDeployment Operation + public virtual DescribeFleetDeploymentResponse DescribeFleetDeployment(DescribeFleetDeploymentRequest request) { var options = new InvokeOptions(); - options.RequestMarshaller = DescribeEC2InstanceLimitsRequestMarshaller.Instance; - options.ResponseUnmarshaller = DescribeEC2InstanceLimitsResponseUnmarshaller.Instance; + options.RequestMarshaller = DescribeFleetDeploymentRequestMarshaller.Instance; + options.ResponseUnmarshaller = DescribeFleetDeploymentResponseUnmarshaller.Instance; - return Invoke(request, options); + return Invoke(request, options); } /// - /// Retrieves the instance limits and current utilization for an Amazon Web Services Region - /// or location. Instance limits control the number of instances, per instance type, per - /// location, that your Amazon Web Services account can use. Learn more at Amazon - /// EC2 Instance Types. The information returned includes the maximum number of instances - /// allowed and your account's current usage across all fleets. This information can affect - /// your ability to scale your Amazon GameLift fleets. You can request a limit increase - /// for your account by using the Service limits page in the Amazon GameLift console. + /// Retrieves information about a managed container fleet deployment. /// /// /// - /// Instance limits differ based on whether the instances are deployed in a fleet's home - /// Region or in a remote location. For remote locations, limits also differ based on - /// the combination of home Region and remote location. All requests must specify an Amazon - /// Web Services Region (either explicitly or as your default settings). To get the limit - /// for a remote location, you must also specify the location. For example, the following - /// requests all return different results: + /// Request options /// ///
    • /// - /// Request specifies the Region ap-northeast-1 with no location. The result is - /// limits and usage data on all instance types that are deployed in us-east-2, - /// by all of the fleets that reside in ap-northeast-1. - /// - ///
    • - /// - /// Request specifies the Region us-east-1 with location ca-central-1. The - /// result is limits and usage data on all instance types that are deployed in ca-central-1, - /// by all of the fleets that reside in us-east-2. These limits do not affect fleets - /// in any other Regions that deploy instances to ca-central-1. + /// Get information about the latest deployment for a specific fleet. Provide the fleet + /// ID or ARN. /// ///
    • /// - /// Request specifies the Region eu-west-1 with location ca-central-1. The - /// result is limits and usage data on all instance types that are deployed in ca-central-1, - /// by all of the fleets that reside in eu-west-1. + /// Get information about a specific deployment. Provide the fleet ID or ARN and the + /// deployment ID. /// ///
    /// - /// This operation can be used in the following ways: + /// Results /// - ///
    • + /// /// - /// To get limit and usage data for all instance types that are deployed in an Amazon - /// Web Services Region by fleets that reside in the same Region: Specify the Region only. - /// Optionally, specify a single instance type to retrieve information for. + /// If successful, a FleetDeployment object is returned. /// - ///
    • + ///
    + /// Container for the necessary parameters to execute the DescribeFleetDeployment service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the DescribeFleetDeployment service method, as returned by GameLift. + /// + /// The service encountered an unrecoverable internal failure while processing the request. + /// Clients can retry such requests immediately or after a waiting period. + /// + /// + /// One or more parameter values in the request are invalid. Correct the invalid parameter + /// values before retrying. + /// + /// + /// The requested resources was not found. The resource was either not created yet or + /// deleted. + /// + /// + /// The client failed authentication. Clients should not retry such requests. + /// + /// + /// The requested operation is not supported in the Region specified. + /// + /// REST API Reference for DescribeFleetDeployment Operation + public virtual Task DescribeFleetDeploymentAsync(DescribeFleetDeploymentRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = DescribeFleetDeploymentRequestMarshaller.Instance; + options.ResponseUnmarshaller = DescribeFleetDeploymentResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + + #region DescribeFleetEvents + + + /// + /// Retrieves entries from a fleet's event log. Fleet events are initiated by changes + /// in status, such as during fleet creation and termination, changes in capacity, etc. + /// If a fleet has multiple locations, events are also initiated by changes to status + /// and capacity in remote locations. + /// + /// /// - /// To get limit and usage data for all instance types that are deployed to a remote location - /// by fleets that reside in different Amazon Web Services Region: Provide both the Amazon - /// Web Services Region and the remote location. Optionally, specify a single instance - /// type to retrieve information for. + /// You can specify a time range to limit the result set. Use the pagination parameters + /// to retrieve results as a set of sequential pages. /// - /// + /// /// - /// If successful, an EC2InstanceLimits object is returned with limits and usage - /// data for each requested instance type. + /// If successful, a collection of event log entries matching the request are returned. /// /// /// @@ -7158,12 +8374,9 @@ public virtual DescribeEC2InstanceLimitsResponse DescribeEC2InstanceLimits(Descr /// up Amazon GameLift fleets /// /// - /// Name of an Amazon EC2 instance type that is supported in Amazon GameLift. A fleet instance type determines the computing resources of each instance in the fleet, including CPU, memory, storage, and networking capacity. Do not specify a value for this parameter to retrieve limits for all instance types. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// + /// Container for the necessary parameters to execute the DescribeFleetEvents service method. /// - /// The response from the DescribeEC2InstanceLimits service method, as returned by GameLift. + /// The response from the DescribeFleetEvents service method, as returned by GameLift. /// /// The service encountered an unrecoverable internal failure while processing the request. /// Clients can retry such requests immediately or after a waiting period. @@ -7172,79 +8385,41 @@ public virtual DescribeEC2InstanceLimitsResponse DescribeEC2InstanceLimits(Descr /// One or more parameter values in the request are invalid. Correct the invalid parameter /// values before retrying. /// + /// + /// The requested resources was not found. The resource was either not created yet or + /// deleted. + /// /// /// The client failed authentication. Clients should not retry such requests. /// /// /// The requested operation is not supported in the Region specified. /// - /// REST API Reference for DescribeEC2InstanceLimits Operation - public virtual Task DescribeEC2InstanceLimitsAsync(EC2InstanceType ec2InstanceType, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + /// REST API Reference for DescribeFleetEvents Operation + public virtual DescribeFleetEventsResponse DescribeFleetEvents(DescribeFleetEventsRequest request) { - var request = new DescribeEC2InstanceLimitsRequest(); - request.EC2InstanceType = ec2InstanceType; - return DescribeEC2InstanceLimitsAsync(request, cancellationToken); + var options = new InvokeOptions(); + options.RequestMarshaller = DescribeFleetEventsRequestMarshaller.Instance; + options.ResponseUnmarshaller = DescribeFleetEventsResponseUnmarshaller.Instance; + + return Invoke(request, options); } /// - /// Retrieves the instance limits and current utilization for an Amazon Web Services Region - /// or location. Instance limits control the number of instances, per instance type, per - /// location, that your Amazon Web Services account can use. Learn more at Amazon - /// EC2 Instance Types. The information returned includes the maximum number of instances - /// allowed and your account's current usage across all fleets. This information can affect - /// your ability to scale your Amazon GameLift fleets. You can request a limit increase - /// for your account by using the Service limits page in the Amazon GameLift console. + /// Retrieves entries from a fleet's event log. Fleet events are initiated by changes + /// in status, such as during fleet creation and termination, changes in capacity, etc. + /// If a fleet has multiple locations, events are also initiated by changes to status + /// and capacity in remote locations. /// /// /// - /// Instance limits differ based on whether the instances are deployed in a fleet's home - /// Region or in a remote location. For remote locations, limits also differ based on - /// the combination of home Region and remote location. All requests must specify an Amazon - /// Web Services Region (either explicitly or as your default settings). To get the limit - /// for a remote location, you must also specify the location. For example, the following - /// requests all return different results: - /// - ///
    • - /// - /// Request specifies the Region ap-northeast-1 with no location. The result is - /// limits and usage data on all instance types that are deployed in us-east-2, - /// by all of the fleets that reside in ap-northeast-1. - /// - ///
    • - /// - /// Request specifies the Region us-east-1 with location ca-central-1. The - /// result is limits and usage data on all instance types that are deployed in ca-central-1, - /// by all of the fleets that reside in us-east-2. These limits do not affect fleets - /// in any other Regions that deploy instances to ca-central-1. - /// - ///
    • - /// - /// Request specifies the Region eu-west-1 with location ca-central-1. The - /// result is limits and usage data on all instance types that are deployed in ca-central-1, - /// by all of the fleets that reside in eu-west-1. - /// - ///
    - /// - /// This operation can be used in the following ways: - /// - ///
    • - /// - /// To get limit and usage data for all instance types that are deployed in an Amazon - /// Web Services Region by fleets that reside in the same Region: Specify the Region only. - /// Optionally, specify a single instance type to retrieve information for. - /// - ///
    • - /// - /// To get limit and usage data for all instance types that are deployed to a remote location - /// by fleets that reside in different Amazon Web Services Region: Provide both the Amazon - /// Web Services Region and the remote location. Optionally, specify a single instance - /// type to retrieve information for. + /// You can specify a time range to limit the result set. Use the pagination parameters + /// to retrieve results as a set of sequential pages. /// - ///
    + /// /// - /// If successful, an EC2InstanceLimits object is returned with limits and usage - /// data for each requested instance type. + /// If successful, a collection of event log entries matching the request are returned. /// /// /// @@ -7256,12 +8431,12 @@ public virtual DescribeEC2InstanceLimitsResponse DescribeEC2InstanceLimits(Descr /// up Amazon GameLift fleets /// ///     - /// Container for the necessary parameters to execute the DescribeEC2InstanceLimits service method. + /// Container for the necessary parameters to execute the DescribeFleetEvents service method. /// /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// /// - /// The response from the DescribeEC2InstanceLimits service method, as returned by GameLift. + /// The response from the DescribeFleetEvents service method, as returned by GameLift. /// /// The service encountered an unrecoverable internal failure while processing the request. /// Clients can retry such requests immediately or after a waiting period. @@ -7270,66 +8445,62 @@ public virtual DescribeEC2InstanceLimitsResponse DescribeEC2InstanceLimits(Descr /// One or more parameter values in the request are invalid. Correct the invalid parameter /// values before retrying. /// + /// + /// The requested resources was not found. The resource was either not created yet or + /// deleted. + /// /// /// The client failed authentication. Clients should not retry such requests. /// /// /// The requested operation is not supported in the Region specified. /// - /// REST API Reference for DescribeEC2InstanceLimits Operation - public virtual Task DescribeEC2InstanceLimitsAsync(DescribeEC2InstanceLimitsRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + /// REST API Reference for DescribeFleetEvents Operation + public virtual Task DescribeFleetEventsAsync(DescribeFleetEventsRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { var options = new InvokeOptions(); - options.RequestMarshaller = DescribeEC2InstanceLimitsRequestMarshaller.Instance; - options.ResponseUnmarshaller = DescribeEC2InstanceLimitsResponseUnmarshaller.Instance; + options.RequestMarshaller = DescribeFleetEventsRequestMarshaller.Instance; + options.ResponseUnmarshaller = DescribeFleetEventsResponseUnmarshaller.Instance; - return InvokeAsync(request, options, cancellationToken); + return InvokeAsync(request, options, cancellationToken); } #endregion - #region DescribeFleetAttributes + #region DescribeFleetLocationAttributes /// - /// This operation has been expanded to use with the Amazon GameLift containers feature, - /// which is currently in public preview. + /// Retrieves information on a fleet's remote locations, including life-cycle status and + /// any suspended fleet activity. /// /// /// - /// Retrieves core fleet-wide properties for fleets in an Amazon Web Services Region. - /// Properties include the computing hardware and deployment configuration for instances - /// in the fleet. - /// - /// - /// - /// You can use this operation in the following ways: + /// This operation can be used in the following ways: /// ///
    • /// - /// To get attributes for specific fleets, provide a list of fleet IDs or fleet ARNs. + /// To get data for specific locations, provide a fleet identifier and a list of locations. + /// Location data is returned in the order that it is requested. /// ///
    • /// - /// To get attributes for all fleets, do not provide a fleet identifier. + /// To get data for all locations, provide a fleet identifier only. Location data is returned + /// in no particular order. /// ///
    /// - /// When requesting attributes for multiple fleets, use the pagination parameters to retrieve - /// results as a set of sequential pages. + /// When requesting attributes for multiple locations, use the pagination parameters to + /// retrieve results as a set of sequential pages. /// /// /// - /// If successful, a FleetAttributes object is returned for each fleet requested, - /// unless the fleet identifier is not found. - /// - /// - /// - /// Some API operations limit the number of fleet IDs that allowed in one request. If - /// a request exceeds this limit, the request fails and the error message contains the - /// maximum allowed number. + /// If successful, a LocationAttributes object is returned for each requested location. + /// If the fleet does not have a requested location, no information is returned. This + /// operation does not return the home Region. To get information on a fleet's home Region, + /// call DescribeFleetAttributes. /// - /// + /// /// /// Learn more /// @@ -7338,10 +8509,15 @@ public virtual DescribeEC2InstanceLimitsResponse DescribeEC2InstanceLimits(Descr /// Setting /// up Amazon GameLift fleets /// + /// + /// + /// + /// Amazon GameLift service locations for managed hosting + /// ///     - /// Container for the necessary parameters to execute the DescribeFleetAttributes service method. + /// Container for the necessary parameters to execute the DescribeFleetLocationAttributes service method. /// - /// The response from the DescribeFleetAttributes service method, as returned by GameLift. + /// The response from the DescribeFleetLocationAttributes service method, as returned by GameLift. /// /// The service encountered an unrecoverable internal failure while processing the request. /// Clients can retry such requests immediately or after a waiting period. @@ -7357,56 +8533,51 @@ public virtual DescribeEC2InstanceLimitsResponse DescribeEC2InstanceLimits(Descr /// /// The client failed authentication. Clients should not retry such requests. /// - /// REST API Reference for DescribeFleetAttributes Operation - public virtual DescribeFleetAttributesResponse DescribeFleetAttributes(DescribeFleetAttributesRequest request) + /// + /// The requested operation is not supported in the Region specified. + /// + /// REST API Reference for DescribeFleetLocationAttributes Operation + public virtual DescribeFleetLocationAttributesResponse DescribeFleetLocationAttributes(DescribeFleetLocationAttributesRequest request) { var options = new InvokeOptions(); - options.RequestMarshaller = DescribeFleetAttributesRequestMarshaller.Instance; - options.ResponseUnmarshaller = DescribeFleetAttributesResponseUnmarshaller.Instance; + options.RequestMarshaller = DescribeFleetLocationAttributesRequestMarshaller.Instance; + options.ResponseUnmarshaller = DescribeFleetLocationAttributesResponseUnmarshaller.Instance; - return Invoke(request, options); + return Invoke(request, options); } /// - /// This operation has been expanded to use with the Amazon GameLift containers feature, - /// which is currently in public preview. + /// Retrieves information on a fleet's remote locations, including life-cycle status and + /// any suspended fleet activity. /// /// /// - /// Retrieves core fleet-wide properties for fleets in an Amazon Web Services Region. - /// Properties include the computing hardware and deployment configuration for instances - /// in the fleet. - /// - /// - /// - /// You can use this operation in the following ways: + /// This operation can be used in the following ways: /// ///
    • /// - /// To get attributes for specific fleets, provide a list of fleet IDs or fleet ARNs. + /// To get data for specific locations, provide a fleet identifier and a list of locations. + /// Location data is returned in the order that it is requested. /// ///
    • /// - /// To get attributes for all fleets, do not provide a fleet identifier. + /// To get data for all locations, provide a fleet identifier only. Location data is returned + /// in no particular order. /// ///
    /// - /// When requesting attributes for multiple fleets, use the pagination parameters to retrieve - /// results as a set of sequential pages. + /// When requesting attributes for multiple locations, use the pagination parameters to + /// retrieve results as a set of sequential pages. /// /// /// - /// If successful, a FleetAttributes object is returned for each fleet requested, - /// unless the fleet identifier is not found. - /// - /// - /// - /// Some API operations limit the number of fleet IDs that allowed in one request. If - /// a request exceeds this limit, the request fails and the error message contains the - /// maximum allowed number. + /// If successful, a LocationAttributes object is returned for each requested location. + /// If the fleet does not have a requested location, no information is returned. This + /// operation does not return the home Region. To get information on a fleet's home Region, + /// call DescribeFleetAttributes. /// - /// + /// /// /// Learn more /// @@ -7415,13 +8586,18 @@ public virtual DescribeFleetAttributesResponse DescribeFleetAttributes(DescribeF /// Setting /// up Amazon GameLift fleets /// + /// + /// + /// + /// Amazon GameLift service locations for managed hosting + /// ///     - /// Container for the necessary parameters to execute the DescribeFleetAttributes service method. + /// Container for the necessary parameters to execute the DescribeFleetLocationAttributes service method. /// /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// /// - /// The response from the DescribeFleetAttributes service method, as returned by GameLift. + /// The response from the DescribeFleetLocationAttributes service method, as returned by GameLift. /// /// The service encountered an unrecoverable internal failure while processing the request. /// Clients can retry such requests immediately or after a waiting period. @@ -7437,68 +8613,46 @@ public virtual DescribeFleetAttributesResponse DescribeFleetAttributes(DescribeF /// /// The client failed authentication. Clients should not retry such requests. /// - /// REST API Reference for DescribeFleetAttributes Operation - public virtual Task DescribeFleetAttributesAsync(DescribeFleetAttributesRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + /// + /// The requested operation is not supported in the Region specified. + /// + /// REST API Reference for DescribeFleetLocationAttributes Operation + public virtual Task DescribeFleetLocationAttributesAsync(DescribeFleetLocationAttributesRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { var options = new InvokeOptions(); - options.RequestMarshaller = DescribeFleetAttributesRequestMarshaller.Instance; - options.ResponseUnmarshaller = DescribeFleetAttributesResponseUnmarshaller.Instance; + options.RequestMarshaller = DescribeFleetLocationAttributesRequestMarshaller.Instance; + options.ResponseUnmarshaller = DescribeFleetLocationAttributesResponseUnmarshaller.Instance; - return InvokeAsync(request, options, cancellationToken); + return InvokeAsync(request, options, cancellationToken); } #endregion - #region DescribeFleetCapacity + #region DescribeFleetLocationCapacity /// - /// This operation has been expanded to use with the Amazon GameLift containers feature, - /// which is currently in public preview. + /// Retrieves the resource capacity settings for a fleet location. The data returned includes + /// the current capacity (number of EC2 instances) and some scaling settings for the requested + /// fleet location. For a managed container fleet, this operation also returns counts + /// for game server container groups. /// /// /// - /// Retrieves the resource capacity settings for one or more fleets. For a container fleet, - /// this operation also returns counts for replica container groups. + /// Use this operation to retrieve capacity information for a fleet's remote location + /// or home Region (you can also retrieve home Region capacity by calling DescribeFleetCapacity). /// /// /// - /// With multi-location fleets, this operation retrieves data for the fleet's home Region - /// only. To retrieve capacity for remote locations, see DescribeFleetLocationCapacity. + /// To retrieve capacity data, identify a fleet and location. /// /// /// - /// This operation can be used in the following ways: - /// - ///
    • - /// - /// To get capacity data for one or more specific fleets, provide a list of fleet IDs - /// or fleet ARNs. - /// - ///
    • - /// - /// To get capacity data for all fleets, do not provide a fleet identifier. - /// - ///
    - /// - /// When requesting multiple fleets, use the pagination parameters to retrieve results - /// as a set of sequential pages. + /// If successful, a FleetCapacity object is returned for the requested fleet location. + /// /// /// /// - /// If successful, a FleetCapacity object is returned for each requested fleet - /// ID. Each FleetCapacity object includes a Location property, which is - /// set to the fleet's home Region. Capacity values are returned only for fleets that - /// currently exist. - /// - /// - /// - /// Some API operations may limit the number of fleet IDs that are allowed in one request. - /// If a request exceeds this limit, the request fails and the error message includes - /// the maximum allowed. - /// - /// - /// /// Learn more /// /// @@ -7508,13 +8662,18 @@ public virtual DescribeFleetAttributesResponse DescribeFleetAttributes(DescribeF /// /// /// + /// + /// Amazon GameLift service locations for managed hosting + /// + /// + /// /// GameLift /// metrics for fleets /// ///     - /// Container for the necessary parameters to execute the DescribeFleetCapacity service method. + /// Container for the necessary parameters to execute the DescribeFleetLocationCapacity service method. /// - /// The response from the DescribeFleetCapacity service method, as returned by GameLift. + /// The response from the DescribeFleetLocationCapacity service method, as returned by GameLift. /// /// The service encountered an unrecoverable internal failure while processing the request. /// Clients can retry such requests immediately or after a waiting period. @@ -7530,64 +8689,42 @@ public virtual DescribeFleetAttributesResponse DescribeFleetAttributes(DescribeF /// /// The client failed authentication. Clients should not retry such requests. /// - /// REST API Reference for DescribeFleetCapacity Operation - public virtual DescribeFleetCapacityResponse DescribeFleetCapacity(DescribeFleetCapacityRequest request) + /// + /// The requested operation is not supported in the Region specified. + /// + /// REST API Reference for DescribeFleetLocationCapacity Operation + public virtual DescribeFleetLocationCapacityResponse DescribeFleetLocationCapacity(DescribeFleetLocationCapacityRequest request) { var options = new InvokeOptions(); - options.RequestMarshaller = DescribeFleetCapacityRequestMarshaller.Instance; - options.ResponseUnmarshaller = DescribeFleetCapacityResponseUnmarshaller.Instance; + options.RequestMarshaller = DescribeFleetLocationCapacityRequestMarshaller.Instance; + options.ResponseUnmarshaller = DescribeFleetLocationCapacityResponseUnmarshaller.Instance; - return Invoke(request, options); + return Invoke(request, options); } /// - /// This operation has been expanded to use with the Amazon GameLift containers feature, - /// which is currently in public preview. + /// Retrieves the resource capacity settings for a fleet location. The data returned includes + /// the current capacity (number of EC2 instances) and some scaling settings for the requested + /// fleet location. For a managed container fleet, this operation also returns counts + /// for game server container groups. /// /// /// - /// Retrieves the resource capacity settings for one or more fleets. For a container fleet, - /// this operation also returns counts for replica container groups. + /// Use this operation to retrieve capacity information for a fleet's remote location + /// or home Region (you can also retrieve home Region capacity by calling DescribeFleetCapacity). /// /// /// - /// With multi-location fleets, this operation retrieves data for the fleet's home Region - /// only. To retrieve capacity for remote locations, see DescribeFleetLocationCapacity. + /// To retrieve capacity data, identify a fleet and location. /// /// /// - /// This operation can be used in the following ways: - /// - ///
    • - /// - /// To get capacity data for one or more specific fleets, provide a list of fleet IDs - /// or fleet ARNs. - /// - ///
    • - /// - /// To get capacity data for all fleets, do not provide a fleet identifier. - /// - ///
    - /// - /// When requesting multiple fleets, use the pagination parameters to retrieve results - /// as a set of sequential pages. + /// If successful, a FleetCapacity object is returned for the requested fleet location. + /// /// /// /// - /// If successful, a FleetCapacity object is returned for each requested fleet - /// ID. Each FleetCapacity object includes a Location property, which is - /// set to the fleet's home Region. Capacity values are returned only for fleets that - /// currently exist. - /// - /// - /// - /// Some API operations may limit the number of fleet IDs that are allowed in one request. - /// If a request exceeds this limit, the request fails and the error message includes - /// the maximum allowed. - /// - /// - /// /// Learn more /// /// @@ -7597,16 +8734,21 @@ public virtual DescribeFleetCapacityResponse DescribeFleetCapacity(DescribeFleet /// /// /// + /// + /// Amazon GameLift service locations for managed hosting + /// + /// + /// /// GameLift /// metrics for fleets /// ///     - /// Container for the necessary parameters to execute the DescribeFleetCapacity service method. + /// Container for the necessary parameters to execute the DescribeFleetLocationCapacity service method. /// /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// /// - /// The response from the DescribeFleetCapacity service method, as returned by GameLift. + /// The response from the DescribeFleetLocationCapacity service method, as returned by GameLift. /// /// The service encountered an unrecoverable internal failure while processing the request. /// Clients can retry such requests immediately or after a waiting period. @@ -7622,35 +8764,38 @@ public virtual DescribeFleetCapacityResponse DescribeFleetCapacity(DescribeFleet /// /// The client failed authentication. Clients should not retry such requests. /// - /// REST API Reference for DescribeFleetCapacity Operation - public virtual Task DescribeFleetCapacityAsync(DescribeFleetCapacityRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + /// + /// The requested operation is not supported in the Region specified. + /// + /// REST API Reference for DescribeFleetLocationCapacity Operation + public virtual Task DescribeFleetLocationCapacityAsync(DescribeFleetLocationCapacityRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { var options = new InvokeOptions(); - options.RequestMarshaller = DescribeFleetCapacityRequestMarshaller.Instance; - options.ResponseUnmarshaller = DescribeFleetCapacityResponseUnmarshaller.Instance; + options.RequestMarshaller = DescribeFleetLocationCapacityRequestMarshaller.Instance; + options.ResponseUnmarshaller = DescribeFleetLocationCapacityResponseUnmarshaller.Instance; - return InvokeAsync(request, options, cancellationToken); + return InvokeAsync(request, options, cancellationToken); } #endregion - #region DescribeFleetEvents + #region DescribeFleetLocationUtilization /// - /// Retrieves entries from a fleet's event log. Fleet events are initiated by changes - /// in status, such as during fleet creation and termination, changes in capacity, etc. - /// If a fleet has multiple locations, events are also initiated by changes to status - /// and capacity in remote locations. + /// Retrieves current usage data for a fleet location. Utilization data provides a snapshot + /// of current game hosting activity at the requested location. Use this operation to + /// retrieve utilization information for a fleet's remote location or home Region (you + /// can also retrieve home Region utilization by calling DescribeFleetUtilization). /// /// /// - /// You can specify a time range to limit the result set. Use the pagination parameters - /// to retrieve results as a set of sequential pages. + /// To retrieve utilization data, identify a fleet and location. /// /// /// - /// If successful, a collection of event log entries matching the request are returned. + /// If successful, a FleetUtilization object is returned for the requested fleet + /// location. /// /// /// @@ -7661,10 +8806,20 @@ public virtual DescribeFleetCapacityResponse DescribeFleetCapacity(DescribeFleet /// Setting /// up Amazon GameLift fleets /// + /// + /// + /// + /// Amazon GameLift service locations for managed hosting + /// + /// + /// + /// GameLift + /// metrics for fleets + /// /// - /// Container for the necessary parameters to execute the DescribeFleetEvents service method. + /// Container for the necessary parameters to execute the DescribeFleetLocationUtilization service method. /// - /// The response from the DescribeFleetEvents service method, as returned by GameLift. + /// The response from the DescribeFleetLocationUtilization service method, as returned by GameLift. /// /// The service encountered an unrecoverable internal failure while processing the request. /// Clients can retry such requests immediately or after a waiting period. @@ -7680,31 +8835,34 @@ public virtual DescribeFleetCapacityResponse DescribeFleetCapacity(DescribeFleet /// /// The client failed authentication. Clients should not retry such requests. /// - /// REST API Reference for DescribeFleetEvents Operation - public virtual DescribeFleetEventsResponse DescribeFleetEvents(DescribeFleetEventsRequest request) + /// + /// The requested operation is not supported in the Region specified. + /// + /// REST API Reference for DescribeFleetLocationUtilization Operation + public virtual DescribeFleetLocationUtilizationResponse DescribeFleetLocationUtilization(DescribeFleetLocationUtilizationRequest request) { var options = new InvokeOptions(); - options.RequestMarshaller = DescribeFleetEventsRequestMarshaller.Instance; - options.ResponseUnmarshaller = DescribeFleetEventsResponseUnmarshaller.Instance; + options.RequestMarshaller = DescribeFleetLocationUtilizationRequestMarshaller.Instance; + options.ResponseUnmarshaller = DescribeFleetLocationUtilizationResponseUnmarshaller.Instance; - return Invoke(request, options); + return Invoke(request, options); } /// - /// Retrieves entries from a fleet's event log. Fleet events are initiated by changes - /// in status, such as during fleet creation and termination, changes in capacity, etc. - /// If a fleet has multiple locations, events are also initiated by changes to status - /// and capacity in remote locations. + /// Retrieves current usage data for a fleet location. Utilization data provides a snapshot + /// of current game hosting activity at the requested location. Use this operation to + /// retrieve utilization information for a fleet's remote location or home Region (you + /// can also retrieve home Region utilization by calling DescribeFleetUtilization). /// /// /// - /// You can specify a time range to limit the result set. Use the pagination parameters - /// to retrieve results as a set of sequential pages. + /// To retrieve utilization data, identify a fleet and location. /// /// /// - /// If successful, a collection of event log entries matching the request are returned. + /// If successful, a FleetUtilization object is returned for the requested fleet + /// location. /// /// /// @@ -7715,13 +8873,23 @@ public virtual DescribeFleetEventsResponse DescribeFleetEvents(DescribeFleetEven /// Setting /// up Amazon GameLift fleets /// + /// + /// + /// + /// Amazon GameLift service locations for managed hosting + /// + /// + /// + /// GameLift + /// metrics for fleets + /// /// - /// Container for the necessary parameters to execute the DescribeFleetEvents service method. + /// Container for the necessary parameters to execute the DescribeFleetLocationUtilization service method. /// /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// /// - /// The response from the DescribeFleetEvents service method, as returned by GameLift. + /// The response from the DescribeFleetLocationUtilization service method, as returned by GameLift. /// /// The service encountered an unrecoverable internal failure while processing the request. /// Clients can retry such requests immediately or after a waiting period. @@ -7737,50 +8905,52 @@ public virtual DescribeFleetEventsResponse DescribeFleetEvents(DescribeFleetEven /// /// The client failed authentication. Clients should not retry such requests. /// - /// REST API Reference for DescribeFleetEvents Operation - public virtual Task DescribeFleetEventsAsync(DescribeFleetEventsRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + /// + /// The requested operation is not supported in the Region specified. + /// + /// REST API Reference for DescribeFleetLocationUtilization Operation + public virtual Task DescribeFleetLocationUtilizationAsync(DescribeFleetLocationUtilizationRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { var options = new InvokeOptions(); - options.RequestMarshaller = DescribeFleetEventsRequestMarshaller.Instance; - options.ResponseUnmarshaller = DescribeFleetEventsResponseUnmarshaller.Instance; + options.RequestMarshaller = DescribeFleetLocationUtilizationRequestMarshaller.Instance; + options.ResponseUnmarshaller = DescribeFleetLocationUtilizationResponseUnmarshaller.Instance; - return InvokeAsync(request, options, cancellationToken); + return InvokeAsync(request, options, cancellationToken); } #endregion - #region DescribeFleetLocationAttributes + #region DescribeFleetPortSettings /// - /// Retrieves information on a fleet's remote locations, including life-cycle status and - /// any suspended fleet activity. + /// Retrieves a fleet's inbound connection permissions. Inbound permissions specify IP + /// addresses and port settings that incoming traffic can use to access server processes + /// in the fleet. Game server processes that are running in the fleet must use a port + /// that falls within this range. To connect to game server processes on a managed container + /// fleet, the port settings should include one or more of the container fleet's connection + /// ports. /// /// /// - /// This operation can be used in the following ways: + /// Use this operation in the following ways: /// ///
    • /// - /// To get data for specific locations, provide a fleet identifier and a list of locations. - /// Location data is returned in the order that it is requested. + /// To retrieve the port settings for a fleet, identify the fleet's unique identifier. + /// /// ///
    • /// - /// To get data for all locations, provide a fleet identifier only. Location data is returned - /// in no particular order. + /// To check the status of recent updates to a fleet remote location, specify the fleet + /// ID and a location. Port setting updates can take time to propagate across all locations. + /// /// ///
    /// - /// When requesting attributes for multiple locations, use the pagination parameters to - /// retrieve results as a set of sequential pages. - /// - /// - /// - /// If successful, a LocationAttributes object is returned for each requested location. - /// If the fleet does not have a requested location, no information is returned. This - /// operation does not return the home Region. To get information on a fleet's home Region, - /// call DescribeFleetAttributes. + /// If successful, a set of IpPermission objects is returned for the requested + /// fleet ID. When specifying a location, this operation returns a pending status. If + /// the requested fleet has been deleted, the result set is empty. /// /// /// @@ -7791,15 +8961,10 @@ public virtual DescribeFleetEventsResponse DescribeFleetEvents(DescribeFleetEven /// Setting /// up Amazon GameLift fleets /// - /// - /// - /// - /// Amazon GameLift service locations for managed hosting - /// ///     - /// Container for the necessary parameters to execute the DescribeFleetLocationAttributes service method. + /// A unique identifier for the fleet to retrieve port settings for. You can use either the fleet ID or ARN value. /// - /// The response from the DescribeFleetLocationAttributes service method, as returned by GameLift. + /// The response from the DescribeFleetPortSettings service method, as returned by GameLift. /// /// The service encountered an unrecoverable internal failure while processing the request. /// Clients can retry such requests immediately or after a waiting period. @@ -7818,46 +8983,43 @@ public virtual DescribeFleetEventsResponse DescribeFleetEvents(DescribeFleetEven /// /// The requested operation is not supported in the Region specified. /// - /// REST API Reference for DescribeFleetLocationAttributes Operation - public virtual DescribeFleetLocationAttributesResponse DescribeFleetLocationAttributes(DescribeFleetLocationAttributesRequest request) + /// REST API Reference for DescribeFleetPortSettings Operation + public virtual DescribeFleetPortSettingsResponse DescribeFleetPortSettings(string fleetId) { - var options = new InvokeOptions(); - options.RequestMarshaller = DescribeFleetLocationAttributesRequestMarshaller.Instance; - options.ResponseUnmarshaller = DescribeFleetLocationAttributesResponseUnmarshaller.Instance; - - return Invoke(request, options); + var request = new DescribeFleetPortSettingsRequest(); + request.FleetId = fleetId; + return DescribeFleetPortSettings(request); } /// - /// Retrieves information on a fleet's remote locations, including life-cycle status and - /// any suspended fleet activity. + /// Retrieves a fleet's inbound connection permissions. Inbound permissions specify IP + /// addresses and port settings that incoming traffic can use to access server processes + /// in the fleet. Game server processes that are running in the fleet must use a port + /// that falls within this range. To connect to game server processes on a managed container + /// fleet, the port settings should include one or more of the container fleet's connection + /// ports. /// /// /// - /// This operation can be used in the following ways: + /// Use this operation in the following ways: /// ///
    • /// - /// To get data for specific locations, provide a fleet identifier and a list of locations. - /// Location data is returned in the order that it is requested. + /// To retrieve the port settings for a fleet, identify the fleet's unique identifier. + /// /// ///
    • /// - /// To get data for all locations, provide a fleet identifier only. Location data is returned - /// in no particular order. + /// To check the status of recent updates to a fleet remote location, specify the fleet + /// ID and a location. Port setting updates can take time to propagate across all locations. + /// /// ///
    /// - /// When requesting attributes for multiple locations, use the pagination parameters to - /// retrieve results as a set of sequential pages. - /// - /// - /// - /// If successful, a LocationAttributes object is returned for each requested location. - /// If the fleet does not have a requested location, no information is returned. This - /// operation does not return the home Region. To get information on a fleet's home Region, - /// call DescribeFleetAttributes. + /// If successful, a set of IpPermission objects is returned for the requested + /// fleet ID. When specifying a location, this operation returns a pending status. If + /// the requested fleet has been deleted, the result set is empty. /// /// /// @@ -7868,18 +9030,10 @@ public virtual DescribeFleetLocationAttributesResponse DescribeFleetLocationAttr /// Setting /// up Amazon GameLift fleets /// - /// - /// - /// - /// Amazon GameLift service locations for managed hosting - /// ///     - /// Container for the necessary parameters to execute the DescribeFleetLocationAttributes service method. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// + /// Container for the necessary parameters to execute the DescribeFleetPortSettings service method. /// - /// The response from the DescribeFleetLocationAttributes service method, as returned by GameLift. + /// The response from the DescribeFleetPortSettings service method, as returned by GameLift. /// /// The service encountered an unrecoverable internal failure while processing the request. /// Clients can retry such requests immediately or after a waiting period. @@ -7898,41 +9052,46 @@ public virtual DescribeFleetLocationAttributesResponse DescribeFleetLocationAttr /// /// The requested operation is not supported in the Region specified. /// - /// REST API Reference for DescribeFleetLocationAttributes Operation - public virtual Task DescribeFleetLocationAttributesAsync(DescribeFleetLocationAttributesRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + /// REST API Reference for DescribeFleetPortSettings Operation + public virtual DescribeFleetPortSettingsResponse DescribeFleetPortSettings(DescribeFleetPortSettingsRequest request) { var options = new InvokeOptions(); - options.RequestMarshaller = DescribeFleetLocationAttributesRequestMarshaller.Instance; - options.ResponseUnmarshaller = DescribeFleetLocationAttributesResponseUnmarshaller.Instance; - - return InvokeAsync(request, options, cancellationToken); - } + options.RequestMarshaller = DescribeFleetPortSettingsRequestMarshaller.Instance; + options.ResponseUnmarshaller = DescribeFleetPortSettingsResponseUnmarshaller.Instance; - #endregion - - #region DescribeFleetLocationCapacity + return Invoke(request, options); + } /// - /// Retrieves the resource capacity settings for a fleet location. The data returned includes - /// the current capacity (number of EC2 instances) and some scaling settings for the requested - /// fleet location. For a container fleet, this operation also returns counts for replica - /// container groups. + /// Retrieves a fleet's inbound connection permissions. Inbound permissions specify IP + /// addresses and port settings that incoming traffic can use to access server processes + /// in the fleet. Game server processes that are running in the fleet must use a port + /// that falls within this range. To connect to game server processes on a managed container + /// fleet, the port settings should include one or more of the container fleet's connection + /// ports. /// /// /// - /// Use this operation to retrieve capacity information for a fleet's remote location - /// or home Region (you can also retrieve home Region capacity by calling DescribeFleetCapacity). + /// Use this operation in the following ways: /// - /// + ///
    • /// - /// To retrieve capacity data, identify a fleet and location. + /// To retrieve the port settings for a fleet, identify the fleet's unique identifier. + /// /// - /// + ///
    • /// - /// If successful, a FleetCapacity object is returned for the requested fleet location. + /// To check the status of recent updates to a fleet remote location, specify the fleet + /// ID and a location. Port setting updates can take time to propagate across all locations. /// /// + ///
    + /// + /// If successful, a set of IpPermission objects is returned for the requested + /// fleet ID. When specifying a location, this operation returns a pending status. If + /// the requested fleet has been deleted, the result set is empty. + /// /// /// /// Learn more @@ -7942,20 +9101,13 @@ public virtual DescribeFleetLocationAttributesResponse DescribeFleetLocationAttr /// Setting /// up Amazon GameLift fleets /// - /// - /// - /// - /// Amazon GameLift service locations for managed hosting - /// - /// - /// - /// GameLift - /// metrics for fleets - /// ///     - /// Container for the necessary parameters to execute the DescribeFleetLocationCapacity service method. + /// A unique identifier for the fleet to retrieve port settings for. You can use either the fleet ID or ARN value. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// /// - /// The response from the DescribeFleetLocationCapacity service method, as returned by GameLift. + /// The response from the DescribeFleetPortSettings service method, as returned by GameLift. /// /// The service encountered an unrecoverable internal failure while processing the request. /// Clients can retry such requests immediately or after a waiting period. @@ -7974,37 +9126,44 @@ public virtual DescribeFleetLocationAttributesResponse DescribeFleetLocationAttr /// /// The requested operation is not supported in the Region specified. /// - /// REST API Reference for DescribeFleetLocationCapacity Operation - public virtual DescribeFleetLocationCapacityResponse DescribeFleetLocationCapacity(DescribeFleetLocationCapacityRequest request) + /// REST API Reference for DescribeFleetPortSettings Operation + public virtual Task DescribeFleetPortSettingsAsync(string fleetId, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { - var options = new InvokeOptions(); - options.RequestMarshaller = DescribeFleetLocationCapacityRequestMarshaller.Instance; - options.ResponseUnmarshaller = DescribeFleetLocationCapacityResponseUnmarshaller.Instance; - - return Invoke(request, options); + var request = new DescribeFleetPortSettingsRequest(); + request.FleetId = fleetId; + return DescribeFleetPortSettingsAsync(request, cancellationToken); } /// - /// Retrieves the resource capacity settings for a fleet location. The data returned includes - /// the current capacity (number of EC2 instances) and some scaling settings for the requested - /// fleet location. For a container fleet, this operation also returns counts for replica - /// container groups. + /// Retrieves a fleet's inbound connection permissions. Inbound permissions specify IP + /// addresses and port settings that incoming traffic can use to access server processes + /// in the fleet. Game server processes that are running in the fleet must use a port + /// that falls within this range. To connect to game server processes on a managed container + /// fleet, the port settings should include one or more of the container fleet's connection + /// ports. /// /// /// - /// Use this operation to retrieve capacity information for a fleet's remote location - /// or home Region (you can also retrieve home Region capacity by calling DescribeFleetCapacity). + /// Use this operation in the following ways: /// - /// + ///
    • /// - /// To retrieve capacity data, identify a fleet and location. + /// To retrieve the port settings for a fleet, identify the fleet's unique identifier. + /// /// - /// + ///
    • /// - /// If successful, a FleetCapacity object is returned for the requested fleet location. + /// To check the status of recent updates to a fleet remote location, specify the fleet + /// ID and a location. Port setting updates can take time to propagate across all locations. /// /// + ///
    + /// + /// If successful, a set of IpPermission objects is returned for the requested + /// fleet ID. When specifying a location, this operation returns a pending status. If + /// the requested fleet has been deleted, the result set is empty. + /// /// /// /// Learn more @@ -8014,23 +9173,13 @@ public virtual DescribeFleetLocationCapacityResponse DescribeFleetLocationCapaci /// Setting /// up Amazon GameLift fleets /// - /// - /// - /// - /// Amazon GameLift service locations for managed hosting - /// - /// - /// - /// GameLift - /// metrics for fleets - /// ///     - /// Container for the necessary parameters to execute the DescribeFleetLocationCapacity service method. + /// Container for the necessary parameters to execute the DescribeFleetPortSettings service method. /// /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// /// - /// The response from the DescribeFleetLocationCapacity service method, as returned by GameLift. + /// The response from the DescribeFleetPortSettings service method, as returned by GameLift. /// /// The service encountered an unrecoverable internal failure while processing the request. /// Clients can retry such requests immediately or after a waiting period. @@ -8049,59 +9198,77 @@ public virtual DescribeFleetLocationCapacityResponse DescribeFleetLocationCapaci /// /// The requested operation is not supported in the Region specified. /// - /// REST API Reference for DescribeFleetLocationCapacity Operation - public virtual Task DescribeFleetLocationCapacityAsync(DescribeFleetLocationCapacityRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + /// REST API Reference for DescribeFleetPortSettings Operation + public virtual Task DescribeFleetPortSettingsAsync(DescribeFleetPortSettingsRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { var options = new InvokeOptions(); - options.RequestMarshaller = DescribeFleetLocationCapacityRequestMarshaller.Instance; - options.ResponseUnmarshaller = DescribeFleetLocationCapacityResponseUnmarshaller.Instance; + options.RequestMarshaller = DescribeFleetPortSettingsRequestMarshaller.Instance; + options.ResponseUnmarshaller = DescribeFleetPortSettingsResponseUnmarshaller.Instance; - return InvokeAsync(request, options, cancellationToken); + return InvokeAsync(request, options, cancellationToken); } #endregion - #region DescribeFleetLocationUtilization + #region DescribeFleetUtilization /// - /// Retrieves current usage data for a fleet location. Utilization data provides a snapshot - /// of current game hosting activity at the requested location. Use this operation to - /// retrieve utilization information for a fleet's remote location or home Region (you - /// can also retrieve home Region utilization by calling DescribeFleetUtilization). + /// Retrieves utilization statistics for one or more fleets. Utilization data provides + /// a snapshot of how the fleet's hosting resources are currently being used. For fleets + /// with remote locations, this operation retrieves data for the fleet's home Region only. + /// See DescribeFleetLocationUtilization + /// to get utilization statistics for a fleet's remote locations. /// /// /// - /// To retrieve utilization data, identify a fleet and location. + /// This operation can be used in the following ways: /// - /// + ///
    • /// - /// If successful, a FleetUtilization object is returned for the requested fleet - /// location. + /// To get utilization data for one or more specific fleets, provide a list of fleet IDs + /// or fleet ARNs. /// - /// + ///
    • /// - /// Learn more + /// To get utilization data for all fleets, do not provide a fleet identifier. + /// + ///
    + /// + /// When requesting multiple fleets, use the pagination parameters to retrieve results + /// as a set of sequential pages. /// /// /// - /// Setting - /// up Amazon GameLift fleets + /// If successful, a FleetUtilization + /// object is returned for each requested fleet ID, unless the fleet identifier is not + /// found. Each fleet utilization object includes a Location property, which is + /// set to the fleet's home Region. + /// + /// + /// + /// Some API operations may limit the number of fleet IDs allowed in one request. If a + /// request exceeds this limit, the request fails and the error message includes the maximum + /// allowed. + /// + /// + /// + /// Learn more /// /// /// - /// - /// Amazon GameLift service locations for managed hosting + /// Setting + /// up Amazon GameLift Fleets /// /// /// /// GameLift - /// metrics for fleets + /// Metrics for Fleets /// ///     - /// Container for the necessary parameters to execute the DescribeFleetLocationUtilization service method. + /// Container for the necessary parameters to execute the DescribeFleetUtilization service method. /// - /// The response from the DescribeFleetLocationUtilization service method, as returned by GameLift. + /// The response from the DescribeFleetUtilization service method, as returned by GameLift. /// /// The service encountered an unrecoverable internal failure while processing the request. /// Clients can retry such requests immediately or after a waiting period. @@ -8117,61 +9284,76 @@ public virtual DescribeFleetLocationCapacityResponse DescribeFleetLocationCapaci /// /// The client failed authentication. Clients should not retry such requests. /// - /// - /// The requested operation is not supported in the Region specified. - /// - /// REST API Reference for DescribeFleetLocationUtilization Operation - public virtual DescribeFleetLocationUtilizationResponse DescribeFleetLocationUtilization(DescribeFleetLocationUtilizationRequest request) + /// REST API Reference for DescribeFleetUtilization Operation + public virtual DescribeFleetUtilizationResponse DescribeFleetUtilization(DescribeFleetUtilizationRequest request) { var options = new InvokeOptions(); - options.RequestMarshaller = DescribeFleetLocationUtilizationRequestMarshaller.Instance; - options.ResponseUnmarshaller = DescribeFleetLocationUtilizationResponseUnmarshaller.Instance; + options.RequestMarshaller = DescribeFleetUtilizationRequestMarshaller.Instance; + options.ResponseUnmarshaller = DescribeFleetUtilizationResponseUnmarshaller.Instance; - return Invoke(request, options); + return Invoke(request, options); } /// - /// Retrieves current usage data for a fleet location. Utilization data provides a snapshot - /// of current game hosting activity at the requested location. Use this operation to - /// retrieve utilization information for a fleet's remote location or home Region (you - /// can also retrieve home Region utilization by calling DescribeFleetUtilization). + /// Retrieves utilization statistics for one or more fleets. Utilization data provides + /// a snapshot of how the fleet's hosting resources are currently being used. For fleets + /// with remote locations, this operation retrieves data for the fleet's home Region only. + /// See DescribeFleetLocationUtilization + /// to get utilization statistics for a fleet's remote locations. /// /// /// - /// To retrieve utilization data, identify a fleet and location. + /// This operation can be used in the following ways: /// - /// + ///
    • /// - /// If successful, a FleetUtilization object is returned for the requested fleet - /// location. + /// To get utilization data for one or more specific fleets, provide a list of fleet IDs + /// or fleet ARNs. /// - /// + ///
    • /// - /// Learn more + /// To get utilization data for all fleets, do not provide a fleet identifier. + /// + ///
    + /// + /// When requesting multiple fleets, use the pagination parameters to retrieve results + /// as a set of sequential pages. /// /// /// - /// Setting - /// up Amazon GameLift fleets + /// If successful, a FleetUtilization + /// object is returned for each requested fleet ID, unless the fleet identifier is not + /// found. Each fleet utilization object includes a Location property, which is + /// set to the fleet's home Region. + /// + /// + /// + /// Some API operations may limit the number of fleet IDs allowed in one request. If a + /// request exceeds this limit, the request fails and the error message includes the maximum + /// allowed. + /// + /// + /// + /// Learn more /// /// /// - /// - /// Amazon GameLift service locations for managed hosting + /// Setting + /// up Amazon GameLift Fleets /// /// /// /// GameLift - /// metrics for fleets + /// Metrics for Fleets /// ///     - /// Container for the necessary parameters to execute the DescribeFleetLocationUtilization service method. + /// Container for the necessary parameters to execute the DescribeFleetUtilization service method. /// /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// /// - /// The response from the DescribeFleetLocationUtilization service method, as returned by GameLift. + /// The response from the DescribeFleetUtilization service method, as returned by GameLift. /// /// The service encountered an unrecoverable internal failure while processing the request. /// Clients can retry such requests immediately or after a waiting period. @@ -8187,51 +9369,34 @@ public virtual DescribeFleetLocationUtilizationResponse DescribeFleetLocationUti /// /// The client failed authentication. Clients should not retry such requests. /// - /// - /// The requested operation is not supported in the Region specified. - /// - /// REST API Reference for DescribeFleetLocationUtilization Operation - public virtual Task DescribeFleetLocationUtilizationAsync(DescribeFleetLocationUtilizationRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + /// REST API Reference for DescribeFleetUtilization Operation + public virtual Task DescribeFleetUtilizationAsync(DescribeFleetUtilizationRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { var options = new InvokeOptions(); - options.RequestMarshaller = DescribeFleetLocationUtilizationRequestMarshaller.Instance; - options.ResponseUnmarshaller = DescribeFleetLocationUtilizationResponseUnmarshaller.Instance; + options.RequestMarshaller = DescribeFleetUtilizationRequestMarshaller.Instance; + options.ResponseUnmarshaller = DescribeFleetUtilizationResponseUnmarshaller.Instance; - return InvokeAsync(request, options, cancellationToken); + return InvokeAsync(request, options, cancellationToken); } #endregion - #region DescribeFleetPortSettings + #region DescribeGameServer /// - /// Retrieves a fleet's inbound connection permissions. Connection permissions specify - /// IP addresses and port settings that incoming traffic can use to access server processes - /// in the fleet. Game server processes that are running in the fleet must use a port - /// that falls within this range. To connect to game server processes on a container fleet, - /// the port settings should include one or more of the fleet's connection ports. + /// This operation is used with the Amazon GameLift FleetIQ solution and game server + /// groups. /// /// /// - /// Use this operation in the following ways: - /// - ///
    • - /// - /// To retrieve the port settings for a fleet, identify the fleet's unique identifier. - /// - /// - ///
    • - /// - /// To check the status of recent updates to a fleet remote location, specify the fleet - /// ID and a location. Port setting updates can take time to propagate across all locations. - /// + /// Retrieves information for a registered game server. Information includes game server + /// status, health check info, and the instance that the game server is running on. /// - ///
    + /// /// - /// If successful, a set of IpPermission objects is returned for the requested - /// fleet ID. When specifying a location, this operation returns a pending status. If - /// the requested fleet has been deleted, the result set is empty. + /// To retrieve game server information, specify the game server ID. If successful, the + /// requested game server object is returned. /// /// /// @@ -8239,13 +9404,13 @@ public virtual DescribeFleetLocationUtilizationResponse DescribeFleetLocationUti /// /// /// - /// Setting - /// up Amazon GameLift fleets + /// Amazon + /// GameLift FleetIQ Guide /// ///     - /// A unique identifier for the fleet to retrieve port settings for. You can use either the fleet ID or ARN value. + /// Container for the necessary parameters to execute the DescribeGameServer service method. /// - /// The response from the DescribeFleetPortSettings service method, as returned by GameLift. + /// The response from the DescribeGameServer service method, as returned by GameLift. /// /// The service encountered an unrecoverable internal failure while processing the request. /// Clients can retry such requests immediately or after a waiting period. @@ -8261,45 +9426,30 @@ public virtual DescribeFleetLocationUtilizationResponse DescribeFleetLocationUti /// /// The client failed authentication. Clients should not retry such requests. /// - /// - /// The requested operation is not supported in the Region specified. - /// - /// REST API Reference for DescribeFleetPortSettings Operation - public virtual DescribeFleetPortSettingsResponse DescribeFleetPortSettings(string fleetId) + /// REST API Reference for DescribeGameServer Operation + public virtual DescribeGameServerResponse DescribeGameServer(DescribeGameServerRequest request) { - var request = new DescribeFleetPortSettingsRequest(); - request.FleetId = fleetId; - return DescribeFleetPortSettings(request); + var options = new InvokeOptions(); + options.RequestMarshaller = DescribeGameServerRequestMarshaller.Instance; + options.ResponseUnmarshaller = DescribeGameServerResponseUnmarshaller.Instance; + + return Invoke(request, options); } /// - /// Retrieves a fleet's inbound connection permissions. Connection permissions specify - /// IP addresses and port settings that incoming traffic can use to access server processes - /// in the fleet. Game server processes that are running in the fleet must use a port - /// that falls within this range. To connect to game server processes on a container fleet, - /// the port settings should include one or more of the fleet's connection ports. + /// This operation is used with the Amazon GameLift FleetIQ solution and game server + /// groups. /// /// /// - /// Use this operation in the following ways: - /// - ///
    • - /// - /// To retrieve the port settings for a fleet, identify the fleet's unique identifier. - /// - /// - ///
    • - /// - /// To check the status of recent updates to a fleet remote location, specify the fleet - /// ID and a location. Port setting updates can take time to propagate across all locations. - /// + /// Retrieves information for a registered game server. Information includes game server + /// status, health check info, and the instance that the game server is running on. /// - ///
    + /// /// - /// If successful, a set of IpPermission objects is returned for the requested - /// fleet ID. When specifying a location, this operation returns a pending status. If - /// the requested fleet has been deleted, the result set is empty. + /// To retrieve game server information, specify the game server ID. If successful, the + /// requested game server object is returned. /// /// /// @@ -8307,13 +9457,16 @@ public virtual DescribeFleetPortSettingsResponse DescribeFleetPortSettings(strin /// /// /// - /// Setting - /// up Amazon GameLift fleets + /// Amazon + /// GameLift FleetIQ Guide /// ///     - /// Container for the necessary parameters to execute the DescribeFleetPortSettings service method. + /// Container for the necessary parameters to execute the DescribeGameServer service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// /// - /// The response from the DescribeFleetPortSettings service method, as returned by GameLift. + /// The response from the DescribeGameServer service method, as returned by GameLift. /// /// The service encountered an unrecoverable internal failure while processing the request. /// Clients can retry such requests immediately or after a waiting period. @@ -8329,47 +9482,36 @@ public virtual DescribeFleetPortSettingsResponse DescribeFleetPortSettings(strin /// /// The client failed authentication. Clients should not retry such requests. /// - /// - /// The requested operation is not supported in the Region specified. - /// - /// REST API Reference for DescribeFleetPortSettings Operation - public virtual DescribeFleetPortSettingsResponse DescribeFleetPortSettings(DescribeFleetPortSettingsRequest request) + /// REST API Reference for DescribeGameServer Operation + public virtual Task DescribeGameServerAsync(DescribeGameServerRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { var options = new InvokeOptions(); - options.RequestMarshaller = DescribeFleetPortSettingsRequestMarshaller.Instance; - options.ResponseUnmarshaller = DescribeFleetPortSettingsResponseUnmarshaller.Instance; - - return Invoke(request, options); + options.RequestMarshaller = DescribeGameServerRequestMarshaller.Instance; + options.ResponseUnmarshaller = DescribeGameServerResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); } + #endregion + + #region DescribeGameServerGroup + /// - /// Retrieves a fleet's inbound connection permissions. Connection permissions specify - /// IP addresses and port settings that incoming traffic can use to access server processes - /// in the fleet. Game server processes that are running in the fleet must use a port - /// that falls within this range. To connect to game server processes on a container fleet, - /// the port settings should include one or more of the fleet's connection ports. + /// This operation is used with the Amazon GameLift FleetIQ solution and game server + /// groups. /// /// /// - /// Use this operation in the following ways: - /// - ///
    • - /// - /// To retrieve the port settings for a fleet, identify the fleet's unique identifier. - /// - /// - ///
    • - /// - /// To check the status of recent updates to a fleet remote location, specify the fleet - /// ID and a location. Port setting updates can take time to propagate across all locations. - /// + /// Retrieves information on a game server group. This operation returns only properties + /// related to Amazon GameLift FleetIQ. To view or update properties for the corresponding + /// Auto Scaling group, such as launch template, auto scaling policies, and maximum/minimum + /// group size, access the Auto Scaling group directly. /// - ///
    + /// /// - /// If successful, a set of IpPermission objects is returned for the requested - /// fleet ID. When specifying a location, this operation returns a pending status. If - /// the requested fleet has been deleted, the result set is empty. + /// To get attributes for a game server group, provide a group name or ARN value. If successful, + /// a GameServerGroup object is returned. /// /// /// @@ -8377,16 +9519,13 @@ public virtual DescribeFleetPortSettingsResponse DescribeFleetPortSettings(Descr /// /// /// - /// Setting - /// up Amazon GameLift fleets + /// Amazon + /// GameLift FleetIQ Guide /// ///     - /// A unique identifier for the fleet to retrieve port settings for. You can use either the fleet ID or ARN value. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// + /// Container for the necessary parameters to execute the DescribeGameServerGroup service method. /// - /// The response from the DescribeFleetPortSettings service method, as returned by GameLift. + /// The response from the DescribeGameServerGroup service method, as returned by GameLift. /// /// The service encountered an unrecoverable internal failure while processing the request. /// Clients can retry such requests immediately or after a waiting period. @@ -8402,45 +9541,32 @@ public virtual DescribeFleetPortSettingsResponse DescribeFleetPortSettings(Descr /// /// The client failed authentication. Clients should not retry such requests. /// - /// - /// The requested operation is not supported in the Region specified. - /// - /// REST API Reference for DescribeFleetPortSettings Operation - public virtual Task DescribeFleetPortSettingsAsync(string fleetId, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + /// REST API Reference for DescribeGameServerGroup Operation + public virtual DescribeGameServerGroupResponse DescribeGameServerGroup(DescribeGameServerGroupRequest request) { - var request = new DescribeFleetPortSettingsRequest(); - request.FleetId = fleetId; - return DescribeFleetPortSettingsAsync(request, cancellationToken); + var options = new InvokeOptions(); + options.RequestMarshaller = DescribeGameServerGroupRequestMarshaller.Instance; + options.ResponseUnmarshaller = DescribeGameServerGroupResponseUnmarshaller.Instance; + + return Invoke(request, options); } /// - /// Retrieves a fleet's inbound connection permissions. Connection permissions specify - /// IP addresses and port settings that incoming traffic can use to access server processes - /// in the fleet. Game server processes that are running in the fleet must use a port - /// that falls within this range. To connect to game server processes on a container fleet, - /// the port settings should include one or more of the fleet's connection ports. - /// - /// - /// - /// Use this operation in the following ways: - /// - ///
    • - /// - /// To retrieve the port settings for a fleet, identify the fleet's unique identifier. - /// - /// - ///
    • - /// - /// To check the status of recent updates to a fleet remote location, specify the fleet - /// ID and a location. Port setting updates can take time to propagate across all locations. + /// This operation is used with the Amazon GameLift FleetIQ solution and game server + /// groups. /// + /// + /// + /// Retrieves information on a game server group. This operation returns only properties + /// related to Amazon GameLift FleetIQ. To view or update properties for the corresponding + /// Auto Scaling group, such as launch template, auto scaling policies, and maximum/minimum + /// group size, access the Auto Scaling group directly. /// - ///
    + /// /// - /// If successful, a set of IpPermission objects is returned for the requested - /// fleet ID. When specifying a location, this operation returns a pending status. If - /// the requested fleet has been deleted, the result set is empty. + /// To get attributes for a game server group, provide a group name or ARN value. If successful, + /// a GameServerGroup object is returned. /// /// /// @@ -8448,16 +9574,16 @@ public virtual DescribeFleetPortSettingsResponse DescribeFleetPortSettings(Descr /// /// /// - /// Setting - /// up Amazon GameLift fleets + /// Amazon + /// GameLift FleetIQ Guide /// ///     - /// Container for the necessary parameters to execute the DescribeFleetPortSettings service method. + /// Container for the necessary parameters to execute the DescribeGameServerGroup service method. /// /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// /// - /// The response from the DescribeFleetPortSettings service method, as returned by GameLift. + /// The response from the DescribeGameServerGroup service method, as returned by GameLift. /// /// The service encountered an unrecoverable internal failure while processing the request. /// Clients can retry such requests immediately or after a waiting period. @@ -8473,80 +9599,59 @@ public virtual DescribeFleetPortSettingsResponse DescribeFleetPortSettings(Descr /// /// The client failed authentication. Clients should not retry such requests. /// - /// - /// The requested operation is not supported in the Region specified. - /// - /// REST API Reference for DescribeFleetPortSettings Operation - public virtual Task DescribeFleetPortSettingsAsync(DescribeFleetPortSettingsRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + /// REST API Reference for DescribeGameServerGroup Operation + public virtual Task DescribeGameServerGroupAsync(DescribeGameServerGroupRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { var options = new InvokeOptions(); - options.RequestMarshaller = DescribeFleetPortSettingsRequestMarshaller.Instance; - options.ResponseUnmarshaller = DescribeFleetPortSettingsResponseUnmarshaller.Instance; + options.RequestMarshaller = DescribeGameServerGroupRequestMarshaller.Instance; + options.ResponseUnmarshaller = DescribeGameServerGroupResponseUnmarshaller.Instance; - return InvokeAsync(request, options, cancellationToken); + return InvokeAsync(request, options, cancellationToken); } #endregion - #region DescribeFleetUtilization + #region DescribeGameServerInstances /// - /// Retrieves utilization statistics for one or more fleets. Utilization data provides - /// a snapshot of how the fleet's hosting resources are currently being used. For fleets - /// with remote locations, this operation retrieves data for the fleet's home Region only. - /// See DescribeFleetLocationUtilization - /// to get utilization statistics for a fleet's remote locations. + /// This operation is used with the Amazon GameLift FleetIQ solution and game server + /// groups. /// /// /// - /// This operation can be used in the following ways: - /// - ///
    • - /// - /// To get utilization data for one or more specific fleets, provide a list of fleet IDs - /// or fleet ARNs. - /// - ///
    • - /// - /// To get utilization data for all fleets, do not provide a fleet identifier. - /// - ///
    - /// - /// When requesting multiple fleets, use the pagination parameters to retrieve results - /// as a set of sequential pages. + /// Retrieves status information about the Amazon EC2 instances associated with a Amazon + /// GameLift FleetIQ game server group. Use this operation to detect when instances are + /// active or not available to host new game servers. /// /// /// - /// If successful, a FleetUtilization - /// object is returned for each requested fleet ID, unless the fleet identifier is not - /// found. Each fleet utilization object includes a Location property, which is - /// set to the fleet's home Region. - /// - /// - /// - /// Some API operations may limit the number of fleet IDs allowed in one request. If a - /// request exceeds this limit, the request fails and the error message includes the maximum - /// allowed. + /// To request status for all instances in the game server group, provide a game server + /// group ID only. To request status for specific instances, provide the game server group + /// ID and one or more instance IDs. Use the pagination parameters to retrieve results + /// in sequential segments. If successful, a collection of GameServerInstance objects + /// is returned. /// - /// + /// /// - /// Learn more + /// This operation is not designed to be called with every game server claim request; + /// this practice can cause you to exceed your API limit, which results in errors. Instead, + /// as a best practice, cache the results and refresh your cache no more than once every + /// 10 seconds. /// /// /// - /// Setting - /// up Amazon GameLift Fleets + /// Learn more /// /// /// - /// GameLift - /// Metrics for Fleets + /// Amazon + /// GameLift FleetIQ Guide /// ///     - /// Container for the necessary parameters to execute the DescribeFleetUtilization service method. + /// Container for the necessary parameters to execute the DescribeGameServerInstances service method. /// - /// The response from the DescribeFleetUtilization service method, as returned by GameLift. + /// The response from the DescribeGameServerInstances service method, as returned by GameLift. /// /// The service encountered an unrecoverable internal failure while processing the request. /// Clients can retry such requests immediately or after a waiting period. @@ -8562,76 +9667,58 @@ public virtual DescribeFleetPortSettingsResponse DescribeFleetPortSettings(Descr /// /// The client failed authentication. Clients should not retry such requests. /// - /// REST API Reference for DescribeFleetUtilization Operation - public virtual DescribeFleetUtilizationResponse DescribeFleetUtilization(DescribeFleetUtilizationRequest request) + /// REST API Reference for DescribeGameServerInstances Operation + public virtual DescribeGameServerInstancesResponse DescribeGameServerInstances(DescribeGameServerInstancesRequest request) { var options = new InvokeOptions(); - options.RequestMarshaller = DescribeFleetUtilizationRequestMarshaller.Instance; - options.ResponseUnmarshaller = DescribeFleetUtilizationResponseUnmarshaller.Instance; + options.RequestMarshaller = DescribeGameServerInstancesRequestMarshaller.Instance; + options.ResponseUnmarshaller = DescribeGameServerInstancesResponseUnmarshaller.Instance; - return Invoke(request, options); + return Invoke(request, options); } /// - /// Retrieves utilization statistics for one or more fleets. Utilization data provides - /// a snapshot of how the fleet's hosting resources are currently being used. For fleets - /// with remote locations, this operation retrieves data for the fleet's home Region only. - /// See DescribeFleetLocationUtilization - /// to get utilization statistics for a fleet's remote locations. + /// This operation is used with the Amazon GameLift FleetIQ solution and game server + /// groups. /// /// /// - /// This operation can be used in the following ways: - /// - ///
    • - /// - /// To get utilization data for one or more specific fleets, provide a list of fleet IDs - /// or fleet ARNs. - /// - ///
    • - /// - /// To get utilization data for all fleets, do not provide a fleet identifier. - /// - ///
    - /// - /// When requesting multiple fleets, use the pagination parameters to retrieve results - /// as a set of sequential pages. + /// Retrieves status information about the Amazon EC2 instances associated with a Amazon + /// GameLift FleetIQ game server group. Use this operation to detect when instances are + /// active or not available to host new game servers. /// /// /// - /// If successful, a FleetUtilization - /// object is returned for each requested fleet ID, unless the fleet identifier is not - /// found. Each fleet utilization object includes a Location property, which is - /// set to the fleet's home Region. - /// - /// - /// - /// Some API operations may limit the number of fleet IDs allowed in one request. If a - /// request exceeds this limit, the request fails and the error message includes the maximum - /// allowed. + /// To request status for all instances in the game server group, provide a game server + /// group ID only. To request status for specific instances, provide the game server group + /// ID and one or more instance IDs. Use the pagination parameters to retrieve results + /// in sequential segments. If successful, a collection of GameServerInstance objects + /// is returned. /// - /// + /// /// - /// Learn more + /// This operation is not designed to be called with every game server claim request; + /// this practice can cause you to exceed your API limit, which results in errors. Instead, + /// as a best practice, cache the results and refresh your cache no more than once every + /// 10 seconds. /// /// /// - /// Setting - /// up Amazon GameLift Fleets + /// Learn more /// /// /// - /// GameLift - /// Metrics for Fleets + /// Amazon + /// GameLift FleetIQ Guide /// ///     - /// Container for the necessary parameters to execute the DescribeFleetUtilization service method. + /// Container for the necessary parameters to execute the DescribeGameServerInstances service method. /// /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// /// - /// The response from the DescribeFleetUtilization service method, as returned by GameLift. + /// The response from the DescribeGameServerInstances service method, as returned by GameLift. /// /// The service encountered an unrecoverable internal failure while processing the request. /// Clients can retry such requests immediately or after a waiting period. @@ -8647,34 +9734,56 @@ public virtual DescribeFleetUtilizationResponse DescribeFleetUtilization(Describ /// /// The client failed authentication. Clients should not retry such requests. /// - /// REST API Reference for DescribeFleetUtilization Operation - public virtual Task DescribeFleetUtilizationAsync(DescribeFleetUtilizationRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + /// REST API Reference for DescribeGameServerInstances Operation + public virtual Task DescribeGameServerInstancesAsync(DescribeGameServerInstancesRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { var options = new InvokeOptions(); - options.RequestMarshaller = DescribeFleetUtilizationRequestMarshaller.Instance; - options.ResponseUnmarshaller = DescribeFleetUtilizationResponseUnmarshaller.Instance; + options.RequestMarshaller = DescribeGameServerInstancesRequestMarshaller.Instance; + options.ResponseUnmarshaller = DescribeGameServerInstancesResponseUnmarshaller.Instance; - return InvokeAsync(request, options, cancellationToken); + return InvokeAsync(request, options, cancellationToken); } #endregion - #region DescribeGameServer + #region DescribeGameSessionDetails /// - /// This operation is used with the Amazon GameLift FleetIQ solution and game server - /// groups. + /// Retrieves additional game session properties, including the game session protection + /// policy in force, a set of one or more game sessions in a specific fleet location. + /// You can optionally filter the results by current game session status. /// /// /// - /// Retrieves information for a registered game server. Information includes game server - /// status, health check info, and the instance that the game server is running on. + /// This operation can be used in the following ways: + /// + ///
    • + /// + /// To retrieve details for all game sessions that are currently running on all locations + /// in a fleet, provide a fleet or alias ID, with an optional status filter. This approach + /// returns details from the fleet's home Region and all remote locations. + /// + ///
    • + /// + /// To retrieve details for all game sessions that are currently running on a specific + /// fleet location, provide a fleet or alias ID and a location name, with optional status + /// filter. The location can be the fleet's home Region or any remote location. + /// + ///
    • + /// + /// To retrieve details for a specific game session, provide the game session ID. This + /// approach looks for the game session ID in all fleets that reside in the Amazon Web + /// Services Region defined in the request. + /// + ///
    + /// + /// Use the pagination parameters to retrieve results as a set of sequential pages. /// /// /// - /// To retrieve game server information, specify the game server ID. If successful, the - /// requested game server object is returned. + /// If successful, a GameSessionDetail object is returned for each game session + /// that matches the request. /// /// /// @@ -8682,13 +9791,18 @@ public virtual DescribeFleetUtilizationResponse DescribeFleetUtilization(Describ /// /// /// - /// Amazon - /// GameLift FleetIQ Guide + /// Find + /// a game session + /// + /// + /// + /// All + /// APIs by task /// ///     - /// Container for the necessary parameters to execute the DescribeGameServer service method. + /// Container for the necessary parameters to execute the DescribeGameSessionDetails service method. /// - /// The response from the DescribeGameServer service method, as returned by GameLift. + /// The response from the DescribeGameSessionDetails service method, as returned by GameLift. /// /// The service encountered an unrecoverable internal failure while processing the request. /// Clients can retry such requests immediately or after a waiting period. @@ -8701,33 +9815,64 @@ public virtual DescribeFleetUtilizationResponse DescribeFleetUtilization(Describ /// The requested resources was not found. The resource was either not created yet or /// deleted. /// + /// + /// The service is unable to resolve the routing for a particular alias because it has + /// a terminal RoutingStrategy associated with it. The message returned in this + /// exception is the message defined in the routing strategy itself. Such requests should + /// only be retried if the routing strategy for the specified alias is modified. + /// /// /// The client failed authentication. Clients should not retry such requests. /// - /// REST API Reference for DescribeGameServer Operation - public virtual DescribeGameServerResponse DescribeGameServer(DescribeGameServerRequest request) + /// + /// The requested operation is not supported in the Region specified. + /// + /// REST API Reference for DescribeGameSessionDetails Operation + public virtual DescribeGameSessionDetailsResponse DescribeGameSessionDetails(DescribeGameSessionDetailsRequest request) { var options = new InvokeOptions(); - options.RequestMarshaller = DescribeGameServerRequestMarshaller.Instance; - options.ResponseUnmarshaller = DescribeGameServerResponseUnmarshaller.Instance; + options.RequestMarshaller = DescribeGameSessionDetailsRequestMarshaller.Instance; + options.ResponseUnmarshaller = DescribeGameSessionDetailsResponseUnmarshaller.Instance; - return Invoke(request, options); + return Invoke(request, options); } /// - /// This operation is used with the Amazon GameLift FleetIQ solution and game server - /// groups. + /// Retrieves additional game session properties, including the game session protection + /// policy in force, a set of one or more game sessions in a specific fleet location. + /// You can optionally filter the results by current game session status. /// /// /// - /// Retrieves information for a registered game server. Information includes game server - /// status, health check info, and the instance that the game server is running on. + /// This operation can be used in the following ways: + /// + ///
    • + /// + /// To retrieve details for all game sessions that are currently running on all locations + /// in a fleet, provide a fleet or alias ID, with an optional status filter. This approach + /// returns details from the fleet's home Region and all remote locations. + /// + ///
    • + /// + /// To retrieve details for all game sessions that are currently running on a specific + /// fleet location, provide a fleet or alias ID and a location name, with optional status + /// filter. The location can be the fleet's home Region or any remote location. + /// + ///
    • + /// + /// To retrieve details for a specific game session, provide the game session ID. This + /// approach looks for the game session ID in all fleets that reside in the Amazon Web + /// Services Region defined in the request. + /// + ///
    + /// + /// Use the pagination parameters to retrieve results as a set of sequential pages. /// /// /// - /// To retrieve game server information, specify the game server ID. If successful, the - /// requested game server object is returned. + /// If successful, a GameSessionDetail object is returned for each game session + /// that matches the request. /// /// /// @@ -8735,16 +9880,21 @@ public virtual DescribeGameServerResponse DescribeGameServer(DescribeGameServerR /// /// /// - /// Amazon - /// GameLift FleetIQ Guide + /// Find + /// a game session + /// + /// + /// + /// All + /// APIs by task /// ///     - /// Container for the necessary parameters to execute the DescribeGameServer service method. + /// Container for the necessary parameters to execute the DescribeGameSessionDetails service method. /// /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// /// - /// The response from the DescribeGameServer service method, as returned by GameLift. + /// The response from the DescribeGameSessionDetails service method, as returned by GameLift. /// /// The service encountered an unrecoverable internal failure while processing the request. /// Clients can retry such requests immediately or after a waiting period. @@ -8757,53 +9907,53 @@ public virtual DescribeGameServerResponse DescribeGameServer(DescribeGameServerR /// The requested resources was not found. The resource was either not created yet or /// deleted. /// + /// + /// The service is unable to resolve the routing for a particular alias because it has + /// a terminal RoutingStrategy associated with it. The message returned in this + /// exception is the message defined in the routing strategy itself. Such requests should + /// only be retried if the routing strategy for the specified alias is modified. + /// /// /// The client failed authentication. Clients should not retry such requests. /// - /// REST API Reference for DescribeGameServer Operation - public virtual Task DescribeGameServerAsync(DescribeGameServerRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + /// + /// The requested operation is not supported in the Region specified. + /// + /// REST API Reference for DescribeGameSessionDetails Operation + public virtual Task DescribeGameSessionDetailsAsync(DescribeGameSessionDetailsRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { var options = new InvokeOptions(); - options.RequestMarshaller = DescribeGameServerRequestMarshaller.Instance; - options.ResponseUnmarshaller = DescribeGameServerResponseUnmarshaller.Instance; + options.RequestMarshaller = DescribeGameSessionDetailsRequestMarshaller.Instance; + options.ResponseUnmarshaller = DescribeGameSessionDetailsResponseUnmarshaller.Instance; - return InvokeAsync(request, options, cancellationToken); + return InvokeAsync(request, options, cancellationToken); } #endregion - #region DescribeGameServerGroup + #region DescribeGameSessionPlacement /// - /// This operation is used with the Amazon GameLift FleetIQ solution and game server - /// groups. + /// Retrieves information, including current status, about a game session placement request. + /// /// /// /// - /// Retrieves information on a game server group. This operation returns only properties - /// related to Amazon GameLift FleetIQ. To view or update properties for the corresponding - /// Auto Scaling group, such as launch template, auto scaling policies, and maximum/minimum - /// group size, access the Auto Scaling group directly. - /// - /// - /// - /// To get attributes for a game server group, provide a group name or ARN value. If successful, - /// a GameServerGroup object is returned. - /// - /// - /// - /// Learn more + /// To get game session placement details, specify the placement ID. /// /// /// - /// Amazon - /// GameLift FleetIQ Guide + /// This operation is not designed to be continually called to track game session status. + /// This practice can cause you to exceed your API limit, which results in errors. Instead, + /// you must configure configure an Amazon Simple Notification Service (SNS) topic to + /// receive notifications from FlexMatch or queues. Continuously polling with DescribeGameSessionPlacement + /// should only be used for games in development with low game session usage. /// /// - /// Container for the necessary parameters to execute the DescribeGameServerGroup service method. + /// Container for the necessary parameters to execute the DescribeGameSessionPlacement service method. /// - /// The response from the DescribeGameServerGroup service method, as returned by GameLift. + /// The response from the DescribeGameSessionPlacement service method, as returned by GameLift. /// /// The service encountered an unrecoverable internal failure while processing the request. /// Clients can retry such requests immediately or after a waiting period. @@ -8819,49 +9969,40 @@ public virtual DescribeGameServerResponse DescribeGameServer(DescribeGameServerR /// /// The client failed authentication. Clients should not retry such requests. /// - /// REST API Reference for DescribeGameServerGroup Operation - public virtual DescribeGameServerGroupResponse DescribeGameServerGroup(DescribeGameServerGroupRequest request) + /// REST API Reference for DescribeGameSessionPlacement Operation + public virtual DescribeGameSessionPlacementResponse DescribeGameSessionPlacement(DescribeGameSessionPlacementRequest request) { var options = new InvokeOptions(); - options.RequestMarshaller = DescribeGameServerGroupRequestMarshaller.Instance; - options.ResponseUnmarshaller = DescribeGameServerGroupResponseUnmarshaller.Instance; + options.RequestMarshaller = DescribeGameSessionPlacementRequestMarshaller.Instance; + options.ResponseUnmarshaller = DescribeGameSessionPlacementResponseUnmarshaller.Instance; - return Invoke(request, options); + return Invoke(request, options); } /// - /// This operation is used with the Amazon GameLift FleetIQ solution and game server - /// groups. + /// Retrieves information, including current status, about a game session placement request. + /// /// /// /// - /// Retrieves information on a game server group. This operation returns only properties - /// related to Amazon GameLift FleetIQ. To view or update properties for the corresponding - /// Auto Scaling group, such as launch template, auto scaling policies, and maximum/minimum - /// group size, access the Auto Scaling group directly. - /// - /// - /// - /// To get attributes for a game server group, provide a group name or ARN value. If successful, - /// a GameServerGroup object is returned. - /// - /// - /// - /// Learn more + /// To get game session placement details, specify the placement ID. /// /// /// - /// Amazon - /// GameLift FleetIQ Guide + /// This operation is not designed to be continually called to track game session status. + /// This practice can cause you to exceed your API limit, which results in errors. Instead, + /// you must configure configure an Amazon Simple Notification Service (SNS) topic to + /// receive notifications from FlexMatch or queues. Continuously polling with DescribeGameSessionPlacement + /// should only be used for games in development with low game session usage. /// /// - /// Container for the necessary parameters to execute the DescribeGameServerGroup service method. + /// Container for the necessary parameters to execute the DescribeGameSessionPlacement service method. /// /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// /// - /// The response from the DescribeGameServerGroup service method, as returned by GameLift. + /// The response from the DescribeGameSessionPlacement service method, as returned by GameLift. /// /// The service encountered an unrecoverable internal failure while processing the request. /// Clients can retry such requests immediately or after a waiting period. @@ -8877,59 +10018,40 @@ public virtual DescribeGameServerGroupResponse DescribeGameServerGroup(DescribeG /// /// The client failed authentication. Clients should not retry such requests. /// - /// REST API Reference for DescribeGameServerGroup Operation - public virtual Task DescribeGameServerGroupAsync(DescribeGameServerGroupRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + /// REST API Reference for DescribeGameSessionPlacement Operation + public virtual Task DescribeGameSessionPlacementAsync(DescribeGameSessionPlacementRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { var options = new InvokeOptions(); - options.RequestMarshaller = DescribeGameServerGroupRequestMarshaller.Instance; - options.ResponseUnmarshaller = DescribeGameServerGroupResponseUnmarshaller.Instance; + options.RequestMarshaller = DescribeGameSessionPlacementRequestMarshaller.Instance; + options.ResponseUnmarshaller = DescribeGameSessionPlacementResponseUnmarshaller.Instance; - return InvokeAsync(request, options, cancellationToken); + return InvokeAsync(request, options, cancellationToken); } #endregion - #region DescribeGameServerInstances + #region DescribeGameSessionQueues /// - /// This operation is used with the Amazon GameLift FleetIQ solution and game server - /// groups. + /// Retrieves the properties for one or more game session queues. When requesting multiple + /// queues, use the pagination parameters to retrieve results as a set of sequential pages. + /// When specifying a list of queues, objects are returned only for queues that currently + /// exist in the Region. /// /// /// - /// Retrieves status information about the Amazon EC2 instances associated with a Amazon - /// GameLift FleetIQ game server group. Use this operation to detect when instances are - /// active or not available to host new game servers. - /// - /// - /// - /// To request status for all instances in the game server group, provide a game server - /// group ID only. To request status for specific instances, provide the game server group - /// ID and one or more instance IDs. Use the pagination parameters to retrieve results - /// in sequential segments. If successful, a collection of GameServerInstance objects - /// is returned. - /// - /// - /// - /// This operation is not designed to be called with every game server claim request; - /// this practice can cause you to exceed your API limit, which results in errors. Instead, - /// as a best practice, cache the results and refresh your cache no more than once every - /// 10 seconds. - /// - /// - /// /// Learn more /// /// /// - /// Amazon - /// GameLift FleetIQ Guide + /// + /// View Your Queues /// /// - /// Container for the necessary parameters to execute the DescribeGameServerInstances service method. + /// Container for the necessary parameters to execute the DescribeGameSessionQueues service method. /// - /// The response from the DescribeGameServerInstances service method, as returned by GameLift. + /// The response from the DescribeGameSessionQueues service method, as returned by GameLift. /// /// The service encountered an unrecoverable internal failure while processing the request. /// Clients can retry such requests immediately or after a waiting period. @@ -8945,58 +10067,39 @@ public virtual DescribeGameServerGroupResponse DescribeGameServerGroup(DescribeG /// /// The client failed authentication. Clients should not retry such requests. /// - /// REST API Reference for DescribeGameServerInstances Operation - public virtual DescribeGameServerInstancesResponse DescribeGameServerInstances(DescribeGameServerInstancesRequest request) + /// REST API Reference for DescribeGameSessionQueues Operation + public virtual DescribeGameSessionQueuesResponse DescribeGameSessionQueues(DescribeGameSessionQueuesRequest request) { var options = new InvokeOptions(); - options.RequestMarshaller = DescribeGameServerInstancesRequestMarshaller.Instance; - options.ResponseUnmarshaller = DescribeGameServerInstancesResponseUnmarshaller.Instance; + options.RequestMarshaller = DescribeGameSessionQueuesRequestMarshaller.Instance; + options.ResponseUnmarshaller = DescribeGameSessionQueuesResponseUnmarshaller.Instance; - return Invoke(request, options); + return Invoke(request, options); } /// - /// This operation is used with the Amazon GameLift FleetIQ solution and game server - /// groups. + /// Retrieves the properties for one or more game session queues. When requesting multiple + /// queues, use the pagination parameters to retrieve results as a set of sequential pages. + /// When specifying a list of queues, objects are returned only for queues that currently + /// exist in the Region. /// /// /// - /// Retrieves status information about the Amazon EC2 instances associated with a Amazon - /// GameLift FleetIQ game server group. Use this operation to detect when instances are - /// active or not available to host new game servers. - /// - /// - /// - /// To request status for all instances in the game server group, provide a game server - /// group ID only. To request status for specific instances, provide the game server group - /// ID and one or more instance IDs. Use the pagination parameters to retrieve results - /// in sequential segments. If successful, a collection of GameServerInstance objects - /// is returned. - /// - /// - /// - /// This operation is not designed to be called with every game server claim request; - /// this practice can cause you to exceed your API limit, which results in errors. Instead, - /// as a best practice, cache the results and refresh your cache no more than once every - /// 10 seconds. - /// - /// - /// /// Learn more /// /// /// - /// Amazon - /// GameLift FleetIQ Guide + /// + /// View Your Queues /// /// - /// Container for the necessary parameters to execute the DescribeGameServerInstances service method. + /// Container for the necessary parameters to execute the DescribeGameSessionQueues service method. /// /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// /// - /// The response from the DescribeGameServerInstances service method, as returned by GameLift. + /// The response from the DescribeGameSessionQueues service method, as returned by GameLift. /// /// The service encountered an unrecoverable internal failure while processing the request. /// Clients can retry such requests immediately or after a waiting period. @@ -9012,25 +10115,24 @@ public virtual DescribeGameServerInstancesResponse DescribeGameServerInstances(D /// /// The client failed authentication. Clients should not retry such requests. /// - /// REST API Reference for DescribeGameServerInstances Operation - public virtual Task DescribeGameServerInstancesAsync(DescribeGameServerInstancesRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + /// REST API Reference for DescribeGameSessionQueues Operation + public virtual Task DescribeGameSessionQueuesAsync(DescribeGameSessionQueuesRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { var options = new InvokeOptions(); - options.RequestMarshaller = DescribeGameServerInstancesRequestMarshaller.Instance; - options.ResponseUnmarshaller = DescribeGameServerInstancesResponseUnmarshaller.Instance; + options.RequestMarshaller = DescribeGameSessionQueuesRequestMarshaller.Instance; + options.ResponseUnmarshaller = DescribeGameSessionQueuesResponseUnmarshaller.Instance; - return InvokeAsync(request, options, cancellationToken); + return InvokeAsync(request, options, cancellationToken); } #endregion - #region DescribeGameSessionDetails + #region DescribeGameSessions /// - /// Retrieves additional game session properties, including the game session protection - /// policy in force, a set of one or more game sessions in a specific fleet location. - /// You can optionally filter the results by current game session status. + /// Retrieves a set of one or more game sessions in a specific fleet location. You can + /// optionally filter the results by current game session status. /// /// /// @@ -9038,30 +10140,42 @@ public virtual DescribeGameServerInstancesResponse DescribeGameServerInstances(D /// ///
    • /// - /// To retrieve details for all game sessions that are currently running on all locations - /// in a fleet, provide a fleet or alias ID, with an optional status filter. This approach - /// returns details from the fleet's home Region and all remote locations. + /// To retrieve all game sessions that are currently running on all locations in a fleet, + /// provide a fleet or alias ID, with an optional status filter. This approach returns + /// all game sessions in the fleet's home Region and all remote locations. /// ///
    • /// - /// To retrieve details for all game sessions that are currently running on a specific - /// fleet location, provide a fleet or alias ID and a location name, with optional status - /// filter. The location can be the fleet's home Region or any remote location. + /// To retrieve all game sessions that are currently running on a specific fleet location, + /// provide a fleet or alias ID and a location name, with optional status filter. The + /// location can be the fleet's home Region or any remote location. /// ///
    • /// - /// To retrieve details for a specific game session, provide the game session ID. This - /// approach looks for the game session ID in all fleets that reside in the Amazon Web - /// Services Region defined in the request. + /// To retrieve a specific game session, provide the game session ID. This approach looks + /// for the game session ID in all fleets that reside in the Amazon Web Services Region + /// defined in the request. + /// + ///
    + /// + /// Use the pagination parameters to retrieve results as a set of sequential pages. + /// + /// + /// + /// If successful, a GameSession object is returned for each game session that + /// matches the request. /// - /// + /// /// - /// Use the pagination parameters to retrieve results as a set of sequential pages. + /// This operation is not designed to be continually called to track game session status. + /// This practice can cause you to exceed your API limit, which results in errors. Instead, + /// you must configure an Amazon Simple Notification Service (SNS) topic to receive notifications + /// from FlexMatch or queues. Continuously polling with DescribeGameSessions should + /// only be used for games in development with low game session usage. /// /// /// - /// If successful, a GameSessionDetail object is returned for each game session - /// that matches the request. + /// Available in Amazon GameLift Local. /// /// /// @@ -9078,9 +10192,9 @@ public virtual DescribeGameServerInstancesResponse DescribeGameServerInstances(D /// APIs by task /// ///     - /// Container for the necessary parameters to execute the DescribeGameSessionDetails service method. + /// Container for the necessary parameters to execute the DescribeGameSessions service method. /// - /// The response from the DescribeGameSessionDetails service method, as returned by GameLift. + /// The response from the DescribeGameSessions service method, as returned by GameLift. /// /// The service encountered an unrecoverable internal failure while processing the request. /// Clients can retry such requests immediately or after a waiting period. @@ -9105,21 +10219,20 @@ public virtual DescribeGameServerInstancesResponse DescribeGameServerInstances(D /// /// The requested operation is not supported in the Region specified. /// - /// REST API Reference for DescribeGameSessionDetails Operation - public virtual DescribeGameSessionDetailsResponse DescribeGameSessionDetails(DescribeGameSessionDetailsRequest request) + /// REST API Reference for DescribeGameSessions Operation + public virtual DescribeGameSessionsResponse DescribeGameSessions(DescribeGameSessionsRequest request) { var options = new InvokeOptions(); - options.RequestMarshaller = DescribeGameSessionDetailsRequestMarshaller.Instance; - options.ResponseUnmarshaller = DescribeGameSessionDetailsResponseUnmarshaller.Instance; + options.RequestMarshaller = DescribeGameSessionsRequestMarshaller.Instance; + options.ResponseUnmarshaller = DescribeGameSessionsResponseUnmarshaller.Instance; - return Invoke(request, options); + return Invoke(request, options); } /// - /// Retrieves additional game session properties, including the game session protection - /// policy in force, a set of one or more game sessions in a specific fleet location. - /// You can optionally filter the results by current game session status. + /// Retrieves a set of one or more game sessions in a specific fleet location. You can + /// optionally filter the results by current game session status. /// /// /// @@ -9127,21 +10240,21 @@ public virtual DescribeGameSessionDetailsResponse DescribeGameSessionDetails(Des /// ///
    • /// - /// To retrieve details for all game sessions that are currently running on all locations - /// in a fleet, provide a fleet or alias ID, with an optional status filter. This approach - /// returns details from the fleet's home Region and all remote locations. + /// To retrieve all game sessions that are currently running on all locations in a fleet, + /// provide a fleet or alias ID, with an optional status filter. This approach returns + /// all game sessions in the fleet's home Region and all remote locations. /// ///
    • /// - /// To retrieve details for all game sessions that are currently running on a specific - /// fleet location, provide a fleet or alias ID and a location name, with optional status - /// filter. The location can be the fleet's home Region or any remote location. + /// To retrieve all game sessions that are currently running on a specific fleet location, + /// provide a fleet or alias ID and a location name, with optional status filter. The + /// location can be the fleet's home Region or any remote location. /// ///
    • /// - /// To retrieve details for a specific game session, provide the game session ID. This - /// approach looks for the game session ID in all fleets that reside in the Amazon Web - /// Services Region defined in the request. + /// To retrieve a specific game session, provide the game session ID. This approach looks + /// for the game session ID in all fleets that reside in the Amazon Web Services Region + /// defined in the request. /// ///
    /// @@ -9149,8 +10262,20 @@ public virtual DescribeGameSessionDetailsResponse DescribeGameSessionDetails(Des /// /// /// - /// If successful, a GameSessionDetail object is returned for each game session - /// that matches the request. + /// If successful, a GameSession object is returned for each game session that + /// matches the request. + /// + /// + /// + /// This operation is not designed to be continually called to track game session status. + /// This practice can cause you to exceed your API limit, which results in errors. Instead, + /// you must configure an Amazon Simple Notification Service (SNS) topic to receive notifications + /// from FlexMatch or queues. Continuously polling with DescribeGameSessions should + /// only be used for games in development with low game session usage. + /// + /// + /// + /// Available in Amazon GameLift Local. /// /// /// @@ -9167,12 +10292,12 @@ public virtual DescribeGameSessionDetailsResponse DescribeGameSessionDetails(Des /// APIs by task /// ///     - /// Container for the necessary parameters to execute the DescribeGameSessionDetails service method. + /// Container for the necessary parameters to execute the DescribeGameSessions service method. /// /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// /// - /// The response from the DescribeGameSessionDetails service method, as returned by GameLift. + /// The response from the DescribeGameSessions service method, as returned by GameLift. /// /// The service encountered an unrecoverable internal failure while processing the request. /// Clients can retry such requests immediately or after a waiting period. @@ -9197,41 +10322,83 @@ public virtual DescribeGameSessionDetailsResponse DescribeGameSessionDetails(Des /// /// The requested operation is not supported in the Region specified. /// - /// REST API Reference for DescribeGameSessionDetails Operation - public virtual Task DescribeGameSessionDetailsAsync(DescribeGameSessionDetailsRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + /// REST API Reference for DescribeGameSessions Operation + public virtual Task DescribeGameSessionsAsync(DescribeGameSessionsRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { var options = new InvokeOptions(); - options.RequestMarshaller = DescribeGameSessionDetailsRequestMarshaller.Instance; - options.ResponseUnmarshaller = DescribeGameSessionDetailsResponseUnmarshaller.Instance; + options.RequestMarshaller = DescribeGameSessionsRequestMarshaller.Instance; + options.ResponseUnmarshaller = DescribeGameSessionsResponseUnmarshaller.Instance; - return InvokeAsync(request, options, cancellationToken); + return InvokeAsync(request, options, cancellationToken); } #endregion - #region DescribeGameSessionPlacement + #region DescribeInstances /// - /// Retrieves information, including current status, about a game session placement request. - /// + /// Retrieves information about the EC2 instances in an Amazon GameLift managed fleet, + /// including instance ID, connection data, and status. You can use this operation with + /// a multi-location fleet to get location-specific instance information. As an alternative, + /// use the operations ListCompute and DescribeCompute to retrieve information + /// for compute resources, including EC2 and Anywhere fleets. /// /// /// - /// To get game session placement details, specify the placement ID. + /// You can call this operation in the following ways: + /// + ///
    • + /// + /// To get information on all instances in a fleet's home Region, specify the fleet ID. + /// + ///
    • + /// + /// To get information on all instances in a fleet's remote location, specify the fleet + /// ID and location name. + /// + ///
    • + /// + /// To get information on a specific instance in a fleet, specify the fleet ID and instance + /// ID. + /// + ///
    + /// + /// Use the pagination parameters to retrieve results as a set of sequential pages. /// /// /// - /// This operation is not designed to be continually called to track game session status. - /// This practice can cause you to exceed your API limit, which results in errors. Instead, - /// you must configure configure an Amazon Simple Notification Service (SNS) topic to - /// receive notifications from FlexMatch or queues. Continuously polling with DescribeGameSessionPlacement - /// should only be used for games in development with low game session usage. + /// If successful, this operation returns Instance objects for each requested instance, + /// listed in no particular order. If you call this operation for an Anywhere fleet, you + /// receive an InvalidRequestException. + /// + /// + /// + /// Learn more + /// + /// + /// + /// Remotely + /// connect to fleet instances + /// + /// + /// + /// Debug + /// fleet issues + /// + /// + /// + /// Related actions + /// + /// + /// + /// All + /// APIs by task /// ///     - /// Container for the necessary parameters to execute the DescribeGameSessionPlacement service method. + /// Container for the necessary parameters to execute the DescribeInstances service method. /// - /// The response from the DescribeGameSessionPlacement service method, as returned by GameLift. + /// The response from the DescribeInstances service method, as returned by GameLift. /// /// The service encountered an unrecoverable internal failure while processing the request. /// Clients can retry such requests immediately or after a waiting period. @@ -9247,40 +10414,85 @@ public virtual DescribeGameSessionDetailsResponse DescribeGameSessionDetails(Des /// /// The client failed authentication. Clients should not retry such requests. /// - /// REST API Reference for DescribeGameSessionPlacement Operation - public virtual DescribeGameSessionPlacementResponse DescribeGameSessionPlacement(DescribeGameSessionPlacementRequest request) + /// + /// The requested operation is not supported in the Region specified. + /// + /// REST API Reference for DescribeInstances Operation + public virtual DescribeInstancesResponse DescribeInstances(DescribeInstancesRequest request) { var options = new InvokeOptions(); - options.RequestMarshaller = DescribeGameSessionPlacementRequestMarshaller.Instance; - options.ResponseUnmarshaller = DescribeGameSessionPlacementResponseUnmarshaller.Instance; + options.RequestMarshaller = DescribeInstancesRequestMarshaller.Instance; + options.ResponseUnmarshaller = DescribeInstancesResponseUnmarshaller.Instance; - return Invoke(request, options); + return Invoke(request, options); } /// - /// Retrieves information, including current status, about a game session placement request. - /// + /// Retrieves information about the EC2 instances in an Amazon GameLift managed fleet, + /// including instance ID, connection data, and status. You can use this operation with + /// a multi-location fleet to get location-specific instance information. As an alternative, + /// use the operations ListCompute and DescribeCompute to retrieve information + /// for compute resources, including EC2 and Anywhere fleets. /// /// /// - /// To get game session placement details, specify the placement ID. + /// You can call this operation in the following ways: + /// + ///
    • + /// + /// To get information on all instances in a fleet's home Region, specify the fleet ID. + /// + ///
    • + /// + /// To get information on all instances in a fleet's remote location, specify the fleet + /// ID and location name. + /// + ///
    • + /// + /// To get information on a specific instance in a fleet, specify the fleet ID and instance + /// ID. + /// + ///
    + /// + /// Use the pagination parameters to retrieve results as a set of sequential pages. /// /// /// - /// This operation is not designed to be continually called to track game session status. - /// This practice can cause you to exceed your API limit, which results in errors. Instead, - /// you must configure configure an Amazon Simple Notification Service (SNS) topic to - /// receive notifications from FlexMatch or queues. Continuously polling with DescribeGameSessionPlacement - /// should only be used for games in development with low game session usage. + /// If successful, this operation returns Instance objects for each requested instance, + /// listed in no particular order. If you call this operation for an Anywhere fleet, you + /// receive an InvalidRequestException. + /// + /// + /// + /// Learn more + /// + /// + /// + /// Remotely + /// connect to fleet instances + /// + /// + /// + /// Debug + /// fleet issues + /// + /// + /// + /// Related actions + /// + /// + /// + /// All + /// APIs by task /// ///     - /// Container for the necessary parameters to execute the DescribeGameSessionPlacement service method. + /// Container for the necessary parameters to execute the DescribeInstances service method. /// /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// /// - /// The response from the DescribeGameSessionPlacement service method, as returned by GameLift. + /// The response from the DescribeInstances service method, as returned by GameLift. /// /// The service encountered an unrecoverable internal failure while processing the request. /// Clients can retry such requests immediately or after a waiting period. @@ -9296,40 +10508,59 @@ public virtual DescribeGameSessionPlacementResponse DescribeGameSessionPlacement /// /// The client failed authentication. Clients should not retry such requests. /// - /// REST API Reference for DescribeGameSessionPlacement Operation - public virtual Task DescribeGameSessionPlacementAsync(DescribeGameSessionPlacementRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + /// + /// The requested operation is not supported in the Region specified. + /// + /// REST API Reference for DescribeInstances Operation + public virtual Task DescribeInstancesAsync(DescribeInstancesRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { var options = new InvokeOptions(); - options.RequestMarshaller = DescribeGameSessionPlacementRequestMarshaller.Instance; - options.ResponseUnmarshaller = DescribeGameSessionPlacementResponseUnmarshaller.Instance; + options.RequestMarshaller = DescribeInstancesRequestMarshaller.Instance; + options.ResponseUnmarshaller = DescribeInstancesResponseUnmarshaller.Instance; - return InvokeAsync(request, options, cancellationToken); + return InvokeAsync(request, options, cancellationToken); } #endregion - #region DescribeGameSessionQueues + #region DescribeMatchmaking /// - /// Retrieves the properties for one or more game session queues. When requesting multiple - /// queues, use the pagination parameters to retrieve results as a set of sequential pages. - /// When specifying a list of queues, objects are returned only for queues that currently - /// exist in the Region. + /// Retrieves one or more matchmaking tickets. Use this operation to retrieve ticket information, + /// including--after a successful match is made--connection information for the resulting + /// new game session. /// /// /// - /// Learn more + /// To request matchmaking tickets, provide a list of up to 10 ticket IDs. If the request + /// is successful, a ticket object is returned for each requested ID that currently exists. + /// + /// + /// + /// This operation is not designed to be continually called to track matchmaking ticket + /// status. This practice can cause you to exceed your API limit, which results in errors. + /// Instead, as a best practice, set up an Amazon Simple Notification Service to receive + /// notifications, and provide the topic ARN in the matchmaking configuration. + /// + /// + /// + /// Learn more + /// + /// + /// + /// + /// Add FlexMatch to a game client /// /// /// - /// - /// View Your Queues + /// + /// Set Up FlexMatch event notification /// /// - /// Container for the necessary parameters to execute the DescribeGameSessionQueues service method. + /// Container for the necessary parameters to execute the DescribeMatchmaking service method. /// - /// The response from the DescribeGameSessionQueues service method, as returned by GameLift. + /// The response from the DescribeMatchmaking service method, as returned by GameLift. /// /// The service encountered an unrecoverable internal failure while processing the request. /// Clients can retry such requests immediately or after a waiting period. @@ -9338,46 +10569,58 @@ public virtual DescribeGameSessionPlacementResponse DescribeGameSessionPlacement /// One or more parameter values in the request are invalid. Correct the invalid parameter /// values before retrying. /// - /// - /// The requested resources was not found. The resource was either not created yet or - /// deleted. - /// - /// - /// The client failed authentication. Clients should not retry such requests. + /// + /// The requested operation is not supported in the Region specified. /// - /// REST API Reference for DescribeGameSessionQueues Operation - public virtual DescribeGameSessionQueuesResponse DescribeGameSessionQueues(DescribeGameSessionQueuesRequest request) + /// REST API Reference for DescribeMatchmaking Operation + public virtual DescribeMatchmakingResponse DescribeMatchmaking(DescribeMatchmakingRequest request) { var options = new InvokeOptions(); - options.RequestMarshaller = DescribeGameSessionQueuesRequestMarshaller.Instance; - options.ResponseUnmarshaller = DescribeGameSessionQueuesResponseUnmarshaller.Instance; + options.RequestMarshaller = DescribeMatchmakingRequestMarshaller.Instance; + options.ResponseUnmarshaller = DescribeMatchmakingResponseUnmarshaller.Instance; - return Invoke(request, options); + return Invoke(request, options); } /// - /// Retrieves the properties for one or more game session queues. When requesting multiple - /// queues, use the pagination parameters to retrieve results as a set of sequential pages. - /// When specifying a list of queues, objects are returned only for queues that currently - /// exist in the Region. + /// Retrieves one or more matchmaking tickets. Use this operation to retrieve ticket information, + /// including--after a successful match is made--connection information for the resulting + /// new game session. /// /// /// + /// To request matchmaking tickets, provide a list of up to 10 ticket IDs. If the request + /// is successful, a ticket object is returned for each requested ID that currently exists. + /// + /// + /// + /// This operation is not designed to be continually called to track matchmaking ticket + /// status. This practice can cause you to exceed your API limit, which results in errors. + /// Instead, as a best practice, set up an Amazon Simple Notification Service to receive + /// notifications, and provide the topic ARN in the matchmaking configuration. + /// + /// + /// /// Learn more /// /// /// - /// - /// View Your Queues + /// + /// Add FlexMatch to a game client + /// + /// + /// + /// + /// Set Up FlexMatch event notification /// /// - /// Container for the necessary parameters to execute the DescribeGameSessionQueues service method. + /// Container for the necessary parameters to execute the DescribeMatchmaking service method. /// /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// /// - /// The response from the DescribeGameSessionQueues service method, as returned by GameLift. + /// The response from the DescribeMatchmaking service method, as returned by GameLift. /// /// The service encountered an unrecoverable internal failure while processing the request. /// Clients can retry such requests immediately or after a waiting period. @@ -9386,74 +10629,38 @@ public virtual DescribeGameSessionQueuesResponse DescribeGameSessionQueues(Descr /// One or more parameter values in the request are invalid. Correct the invalid parameter /// values before retrying. /// - /// - /// The requested resources was not found. The resource was either not created yet or - /// deleted. - /// - /// - /// The client failed authentication. Clients should not retry such requests. + /// + /// The requested operation is not supported in the Region specified. /// - /// REST API Reference for DescribeGameSessionQueues Operation - public virtual Task DescribeGameSessionQueuesAsync(DescribeGameSessionQueuesRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + /// REST API Reference for DescribeMatchmaking Operation + public virtual Task DescribeMatchmakingAsync(DescribeMatchmakingRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { var options = new InvokeOptions(); - options.RequestMarshaller = DescribeGameSessionQueuesRequestMarshaller.Instance; - options.ResponseUnmarshaller = DescribeGameSessionQueuesResponseUnmarshaller.Instance; + options.RequestMarshaller = DescribeMatchmakingRequestMarshaller.Instance; + options.ResponseUnmarshaller = DescribeMatchmakingResponseUnmarshaller.Instance; - return InvokeAsync(request, options, cancellationToken); + return InvokeAsync(request, options, cancellationToken); } #endregion - #region DescribeGameSessions + #region DescribeMatchmakingConfigurations /// - /// Retrieves a set of one or more game sessions in a specific fleet location. You can - /// optionally filter the results by current game session status. + /// Retrieves the details of FlexMatch matchmaking configurations. /// /// /// - /// This operation can be used in the following ways: - /// - ///
    • - /// - /// To retrieve all game sessions that are currently running on all locations in a fleet, - /// provide a fleet or alias ID, with an optional status filter. This approach returns - /// all game sessions in the fleet's home Region and all remote locations. - /// - ///
    • - /// - /// To retrieve all game sessions that are currently running on a specific fleet location, - /// provide a fleet or alias ID and a location name, with optional status filter. The - /// location can be the fleet's home Region or any remote location. - /// - ///
    • - /// - /// To retrieve a specific game session, provide the game session ID. This approach looks - /// for the game session ID in all fleets that reside in the Amazon Web Services Region - /// defined in the request. - /// - ///
    - /// - /// Use the pagination parameters to retrieve results as a set of sequential pages. - /// - /// - /// - /// If successful, a GameSession object is returned for each game session that - /// matches the request. - /// - /// - /// - /// This operation is not designed to be continually called to track game session status. - /// This practice can cause you to exceed your API limit, which results in errors. Instead, - /// you must configure an Amazon Simple Notification Service (SNS) topic to receive notifications - /// from FlexMatch or queues. Continuously polling with DescribeGameSessions should - /// only be used for games in development with low game session usage. + /// This operation offers the following options: (1) retrieve all matchmaking configurations, + /// (2) retrieve configurations for a specified list, or (3) retrieve all configurations + /// that use a specified rule set name. When requesting multiple items, use the pagination + /// parameters to retrieve results as a set of sequential pages. /// /// /// - /// Available in Amazon GameLift Local. + /// If successful, a configuration is returned for each requested name. When specifying + /// a list of names, only configurations that currently exist are returned. /// /// /// @@ -9461,18 +10668,13 @@ public virtual DescribeGameSessionQueuesResponse DescribeGameSessionQueues(Descr /// /// /// - /// Find - /// a game session - /// - /// - /// - /// All - /// APIs by task + /// + /// Setting up FlexMatch matchmakers /// ///     - /// Container for the necessary parameters to execute the DescribeGameSessions service method. + /// Container for the necessary parameters to execute the DescribeMatchmakingConfigurations service method. /// - /// The response from the DescribeGameSessions service method, as returned by GameLift. + /// The response from the DescribeMatchmakingConfigurations service method, as returned by GameLift. /// /// The service encountered an unrecoverable internal failure while processing the request. /// Clients can retry such requests immediately or after a waiting period. @@ -9481,79 +10683,34 @@ public virtual DescribeGameSessionQueuesResponse DescribeGameSessionQueues(Descr /// One or more parameter values in the request are invalid. Correct the invalid parameter /// values before retrying. /// - /// - /// The requested resources was not found. The resource was either not created yet or - /// deleted. - /// - /// - /// The service is unable to resolve the routing for a particular alias because it has - /// a terminal RoutingStrategy associated with it. The message returned in this - /// exception is the message defined in the routing strategy itself. Such requests should - /// only be retried if the routing strategy for the specified alias is modified. - /// - /// - /// The client failed authentication. Clients should not retry such requests. - /// /// /// The requested operation is not supported in the Region specified. /// - /// REST API Reference for DescribeGameSessions Operation - public virtual DescribeGameSessionsResponse DescribeGameSessions(DescribeGameSessionsRequest request) + /// REST API Reference for DescribeMatchmakingConfigurations Operation + public virtual DescribeMatchmakingConfigurationsResponse DescribeMatchmakingConfigurations(DescribeMatchmakingConfigurationsRequest request) { var options = new InvokeOptions(); - options.RequestMarshaller = DescribeGameSessionsRequestMarshaller.Instance; - options.ResponseUnmarshaller = DescribeGameSessionsResponseUnmarshaller.Instance; + options.RequestMarshaller = DescribeMatchmakingConfigurationsRequestMarshaller.Instance; + options.ResponseUnmarshaller = DescribeMatchmakingConfigurationsResponseUnmarshaller.Instance; - return Invoke(request, options); + return Invoke(request, options); } /// - /// Retrieves a set of one or more game sessions in a specific fleet location. You can - /// optionally filter the results by current game session status. + /// Retrieves the details of FlexMatch matchmaking configurations. /// /// /// - /// This operation can be used in the following ways: - /// - ///
    • - /// - /// To retrieve all game sessions that are currently running on all locations in a fleet, - /// provide a fleet or alias ID, with an optional status filter. This approach returns - /// all game sessions in the fleet's home Region and all remote locations. - /// - ///
    • - /// - /// To retrieve all game sessions that are currently running on a specific fleet location, - /// provide a fleet or alias ID and a location name, with optional status filter. The - /// location can be the fleet's home Region or any remote location. - /// - ///
    • - /// - /// To retrieve a specific game session, provide the game session ID. This approach looks - /// for the game session ID in all fleets that reside in the Amazon Web Services Region - /// defined in the request. - /// - ///
    - /// - /// Use the pagination parameters to retrieve results as a set of sequential pages. - /// - /// - /// - /// If successful, a GameSession object is returned for each game session that - /// matches the request. - /// - /// - /// - /// This operation is not designed to be continually called to track game session status. - /// This practice can cause you to exceed your API limit, which results in errors. Instead, - /// you must configure an Amazon Simple Notification Service (SNS) topic to receive notifications - /// from FlexMatch or queues. Continuously polling with DescribeGameSessions should - /// only be used for games in development with low game session usage. + /// This operation offers the following options: (1) retrieve all matchmaking configurations, + /// (2) retrieve configurations for a specified list, or (3) retrieve all configurations + /// that use a specified rule set name. When requesting multiple items, use the pagination + /// parameters to retrieve results as a set of sequential pages. /// /// /// - /// Available in Amazon GameLift Local. + /// If successful, a configuration is returned for each requested name. When specifying + /// a list of names, only configurations that currently exist are returned. /// /// /// @@ -9561,21 +10718,16 @@ public virtual DescribeGameSessionsResponse DescribeGameSessions(DescribeGameSes /// /// /// - /// Find - /// a game session - /// - /// - /// - /// All - /// APIs by task + /// + /// Setting up FlexMatch matchmakers /// ///     - /// Container for the necessary parameters to execute the DescribeGameSessions service method. + /// Container for the necessary parameters to execute the DescribeMatchmakingConfigurations service method. /// /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// /// - /// The response from the DescribeGameSessions service method, as returned by GameLift. + /// The response from the DescribeMatchmakingConfigurations service method, as returned by GameLift. /// /// The service encountered an unrecoverable internal failure while processing the request. /// Clients can retry such requests immediately or after a waiting period. @@ -9584,99 +10736,44 @@ public virtual DescribeGameSessionsResponse DescribeGameSessions(DescribeGameSes /// One or more parameter values in the request are invalid. Correct the invalid parameter /// values before retrying. /// - /// - /// The requested resources was not found. The resource was either not created yet or - /// deleted. - /// - /// - /// The service is unable to resolve the routing for a particular alias because it has - /// a terminal RoutingStrategy associated with it. The message returned in this - /// exception is the message defined in the routing strategy itself. Such requests should - /// only be retried if the routing strategy for the specified alias is modified. - /// - /// - /// The client failed authentication. Clients should not retry such requests. - /// /// /// The requested operation is not supported in the Region specified. /// - /// REST API Reference for DescribeGameSessions Operation - public virtual Task DescribeGameSessionsAsync(DescribeGameSessionsRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + /// REST API Reference for DescribeMatchmakingConfigurations Operation + public virtual Task DescribeMatchmakingConfigurationsAsync(DescribeMatchmakingConfigurationsRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { var options = new InvokeOptions(); - options.RequestMarshaller = DescribeGameSessionsRequestMarshaller.Instance; - options.ResponseUnmarshaller = DescribeGameSessionsResponseUnmarshaller.Instance; + options.RequestMarshaller = DescribeMatchmakingConfigurationsRequestMarshaller.Instance; + options.ResponseUnmarshaller = DescribeMatchmakingConfigurationsResponseUnmarshaller.Instance; - return InvokeAsync(request, options, cancellationToken); + return InvokeAsync(request, options, cancellationToken); } #endregion - #region DescribeInstances + #region DescribeMatchmakingRuleSets /// - /// Retrieves information about the EC2 instances in an Amazon GameLift managed fleet, - /// including instance ID, connection data, and status. You can use this operation with - /// a multi-location fleet to get location-specific instance information. As an alternative, - /// use the operations ListCompute and DescribeCompute to retrieve information - /// for compute resources, including EC2 and Anywhere fleets. + /// Retrieves the details for FlexMatch matchmaking rule sets. You can request all existing + /// rule sets for the Region, or provide a list of one or more rule set names. When requesting + /// multiple items, use the pagination parameters to retrieve results as a set of sequential + /// pages. If successful, a rule set is returned for each requested name. /// /// /// - /// You can call this operation in the following ways: - /// - ///
    • - /// - /// To get information on all instances in a fleet's home Region, specify the fleet ID. - /// - ///
    • - /// - /// To get information on all instances in a fleet's remote location, specify the fleet - /// ID and location name. - /// - ///
    • - /// - /// To get information on a specific instance in a fleet, specify the fleet ID and instance - /// ID. - /// - ///
    - /// - /// Use the pagination parameters to retrieve results as a set of sequential pages. - /// - /// - /// - /// If successful, this operation returns Instance objects for each requested instance, - /// listed in no particular order. If you call this operation for an Anywhere fleet, you - /// receive an InvalidRequestException. - /// - /// - /// /// Learn more /// - /// - /// - /// Remotely - /// connect to fleet instances - /// - /// - /// - /// Debug - /// fleet issues - /// - /// - /// - /// Related actions - /// - /// + /// ///     - /// Container for the necessary parameters to execute the DescribeInstances service method. + /// Container for the necessary parameters to execute the DescribeMatchmakingRuleSets service method. /// - /// The response from the DescribeInstances service method, as returned by GameLift. + /// The response from the DescribeMatchmakingRuleSets service method, as returned by GameLift. /// /// The service encountered an unrecoverable internal failure while processing the request. /// Clients can retry such requests immediately or after a waiting period. @@ -9689,88 +10786,43 @@ public virtual DescribeGameSessionsResponse DescribeGameSessions(DescribeGameSes /// The requested resources was not found. The resource was either not created yet or /// deleted. /// - /// - /// The client failed authentication. Clients should not retry such requests. - /// /// /// The requested operation is not supported in the Region specified. /// - /// REST API Reference for DescribeInstances Operation - public virtual DescribeInstancesResponse DescribeInstances(DescribeInstancesRequest request) + /// REST API Reference for DescribeMatchmakingRuleSets Operation + public virtual DescribeMatchmakingRuleSetsResponse DescribeMatchmakingRuleSets(DescribeMatchmakingRuleSetsRequest request) { var options = new InvokeOptions(); - options.RequestMarshaller = DescribeInstancesRequestMarshaller.Instance; - options.ResponseUnmarshaller = DescribeInstancesResponseUnmarshaller.Instance; + options.RequestMarshaller = DescribeMatchmakingRuleSetsRequestMarshaller.Instance; + options.ResponseUnmarshaller = DescribeMatchmakingRuleSetsResponseUnmarshaller.Instance; - return Invoke(request, options); + return Invoke(request, options); } /// - /// Retrieves information about the EC2 instances in an Amazon GameLift managed fleet, - /// including instance ID, connection data, and status. You can use this operation with - /// a multi-location fleet to get location-specific instance information. As an alternative, - /// use the operations ListCompute and DescribeCompute to retrieve information - /// for compute resources, including EC2 and Anywhere fleets. + /// Retrieves the details for FlexMatch matchmaking rule sets. You can request all existing + /// rule sets for the Region, or provide a list of one or more rule set names. When requesting + /// multiple items, use the pagination parameters to retrieve results as a set of sequential + /// pages. If successful, a rule set is returned for each requested name. /// /// /// - /// You can call this operation in the following ways: - /// - ///
    • - /// - /// To get information on all instances in a fleet's home Region, specify the fleet ID. - /// - ///
    • - /// - /// To get information on all instances in a fleet's remote location, specify the fleet - /// ID and location name. - /// - ///
    • - /// - /// To get information on a specific instance in a fleet, specify the fleet ID and instance - /// ID. - /// - ///
    - /// - /// Use the pagination parameters to retrieve results as a set of sequential pages. - /// - /// - /// - /// If successful, this operation returns Instance objects for each requested instance, - /// listed in no particular order. If you call this operation for an Anywhere fleet, you - /// receive an InvalidRequestException. - /// - /// - /// /// Learn more /// - /// - /// - /// Remotely - /// connect to fleet instances - /// - /// - /// - /// Debug - /// fleet issues - /// - /// - /// - /// Related actions - /// - /// + /// ///     - /// Container for the necessary parameters to execute the DescribeInstances service method. + /// Container for the necessary parameters to execute the DescribeMatchmakingRuleSets service method. /// /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// /// - /// The response from the DescribeInstances service method, as returned by GameLift. + /// The response from the DescribeMatchmakingRuleSets service method, as returned by GameLift. /// /// The service encountered an unrecoverable internal failure while processing the request. /// Clients can retry such requests immediately or after a waiting period. @@ -9783,62 +10835,69 @@ public virtual DescribeInstancesResponse DescribeInstances(DescribeInstancesRequ /// The requested resources was not found. The resource was either not created yet or /// deleted. /// - /// - /// The client failed authentication. Clients should not retry such requests. - /// /// /// The requested operation is not supported in the Region specified. /// - /// REST API Reference for DescribeInstances Operation - public virtual Task DescribeInstancesAsync(DescribeInstancesRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + /// REST API Reference for DescribeMatchmakingRuleSets Operation + public virtual Task DescribeMatchmakingRuleSetsAsync(DescribeMatchmakingRuleSetsRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { var options = new InvokeOptions(); - options.RequestMarshaller = DescribeInstancesRequestMarshaller.Instance; - options.ResponseUnmarshaller = DescribeInstancesResponseUnmarshaller.Instance; + options.RequestMarshaller = DescribeMatchmakingRuleSetsRequestMarshaller.Instance; + options.ResponseUnmarshaller = DescribeMatchmakingRuleSetsResponseUnmarshaller.Instance; - return InvokeAsync(request, options, cancellationToken); + return InvokeAsync(request, options, cancellationToken); } #endregion - #region DescribeMatchmaking + #region DescribePlayerSessions /// - /// Retrieves one or more matchmaking tickets. Use this operation to retrieve ticket information, - /// including--after a successful match is made--connection information for the resulting - /// new game session. + /// Retrieves properties for one or more player sessions. /// /// /// - /// To request matchmaking tickets, provide a list of up to 10 ticket IDs. If the request - /// is successful, a ticket object is returned for each requested ID that currently exists. + /// This action can be used in the following ways: /// - /// + ///
    • /// - /// This operation is not designed to be continually called to track matchmaking ticket - /// status. This practice can cause you to exceed your API limit, which results in errors. - /// Instead, as a best practice, set up an Amazon Simple Notification Service to receive - /// notifications, and provide the topic ARN in the matchmaking configuration. + /// To retrieve a specific player session, provide the player session ID only. /// - /// + ///
    • /// - /// Learn more + /// To retrieve all player sessions in a game session, provide the game session ID only. + /// + ///
    • + /// + /// To retrieve all player sessions for a specific player, provide a player ID only. + /// + ///
    + /// + /// To request player sessions, specify either a player session ID, game session ID, or + /// player ID. You can filter this request by player session status. If you provide a + /// specific PlayerSessionId or PlayerId, Amazon GameLift ignores the filter + /// criteria. Use the pagination parameters to retrieve results as a set of sequential + /// pages. /// /// /// - /// - /// Add FlexMatch to a game client + /// If successful, a PlayerSession object is returned for each session that matches + /// the request. /// /// /// - /// - /// Set Up FlexMatch event notification + /// Related actions + /// + /// + /// + /// All + /// APIs by task /// ///     - /// Container for the necessary parameters to execute the DescribeMatchmaking service method. + /// Container for the necessary parameters to execute the DescribePlayerSessions service method. /// - /// The response from the DescribeMatchmaking service method, as returned by GameLift. + /// The response from the DescribePlayerSessions service method, as returned by GameLift. /// /// The service encountered an unrecoverable internal failure while processing the request. /// Clients can retry such requests immediately or after a waiting period. @@ -9847,58 +10906,72 @@ public virtual DescribeInstancesResponse DescribeInstances(DescribeInstancesRequ /// One or more parameter values in the request are invalid. Correct the invalid parameter /// values before retrying. /// - /// - /// The requested operation is not supported in the Region specified. + /// + /// The requested resources was not found. The resource was either not created yet or + /// deleted. /// - /// REST API Reference for DescribeMatchmaking Operation - public virtual DescribeMatchmakingResponse DescribeMatchmaking(DescribeMatchmakingRequest request) + /// + /// The client failed authentication. Clients should not retry such requests. + /// + /// REST API Reference for DescribePlayerSessions Operation + public virtual DescribePlayerSessionsResponse DescribePlayerSessions(DescribePlayerSessionsRequest request) { var options = new InvokeOptions(); - options.RequestMarshaller = DescribeMatchmakingRequestMarshaller.Instance; - options.ResponseUnmarshaller = DescribeMatchmakingResponseUnmarshaller.Instance; + options.RequestMarshaller = DescribePlayerSessionsRequestMarshaller.Instance; + options.ResponseUnmarshaller = DescribePlayerSessionsResponseUnmarshaller.Instance; - return Invoke(request, options); + return Invoke(request, options); } /// - /// Retrieves one or more matchmaking tickets. Use this operation to retrieve ticket information, - /// including--after a successful match is made--connection information for the resulting - /// new game session. + /// Retrieves properties for one or more player sessions. /// /// /// - /// To request matchmaking tickets, provide a list of up to 10 ticket IDs. If the request - /// is successful, a ticket object is returned for each requested ID that currently exists. + /// This action can be used in the following ways: /// - /// + ///
    • /// - /// This operation is not designed to be continually called to track matchmaking ticket - /// status. This practice can cause you to exceed your API limit, which results in errors. - /// Instead, as a best practice, set up an Amazon Simple Notification Service to receive - /// notifications, and provide the topic ARN in the matchmaking configuration. + /// To retrieve a specific player session, provide the player session ID only. /// - /// + ///
    • /// - /// Learn more + /// To retrieve all player sessions in a game session, provide the game session ID only. + /// + ///
    • + /// + /// To retrieve all player sessions for a specific player, provide a player ID only. + /// + ///
    + /// + /// To request player sessions, specify either a player session ID, game session ID, or + /// player ID. You can filter this request by player session status. If you provide a + /// specific PlayerSessionId or PlayerId, Amazon GameLift ignores the filter + /// criteria. Use the pagination parameters to retrieve results as a set of sequential + /// pages. /// /// /// - /// - /// Add FlexMatch to a game client + /// If successful, a PlayerSession object is returned for each session that matches + /// the request. /// /// /// - /// - /// Set Up FlexMatch event notification + /// Related actions + /// + /// + /// + /// All + /// APIs by task /// ///     - /// Container for the necessary parameters to execute the DescribeMatchmaking service method. + /// Container for the necessary parameters to execute the DescribePlayerSessions service method. /// /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// /// - /// The response from the DescribeMatchmaking service method, as returned by GameLift. + /// The response from the DescribePlayerSessions service method, as returned by GameLift. /// /// The service encountered an unrecoverable internal failure while processing the request. /// Clients can retry such requests immediately or after a waiting period. @@ -9907,38 +10980,42 @@ public virtual DescribeMatchmakingResponse DescribeMatchmaking(DescribeMatchmaki /// One or more parameter values in the request are invalid. Correct the invalid parameter /// values before retrying. /// - /// - /// The requested operation is not supported in the Region specified. + /// + /// The requested resources was not found. The resource was either not created yet or + /// deleted. + /// + /// + /// The client failed authentication. Clients should not retry such requests. /// - /// REST API Reference for DescribeMatchmaking Operation - public virtual Task DescribeMatchmakingAsync(DescribeMatchmakingRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + /// REST API Reference for DescribePlayerSessions Operation + public virtual Task DescribePlayerSessionsAsync(DescribePlayerSessionsRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { var options = new InvokeOptions(); - options.RequestMarshaller = DescribeMatchmakingRequestMarshaller.Instance; - options.ResponseUnmarshaller = DescribeMatchmakingResponseUnmarshaller.Instance; + options.RequestMarshaller = DescribePlayerSessionsRequestMarshaller.Instance; + options.ResponseUnmarshaller = DescribePlayerSessionsResponseUnmarshaller.Instance; - return InvokeAsync(request, options, cancellationToken); + return InvokeAsync(request, options, cancellationToken); } #endregion - #region DescribeMatchmakingConfigurations + #region DescribeRuntimeConfiguration /// - /// Retrieves the details of FlexMatch matchmaking configurations. + /// Retrieves a fleet's runtime configuration settings. The runtime configuration determines + /// which server processes run, and how they run, and how many run concurrently on computes + /// in managed EC2 and Anywhere fleets. You can update a fleet's runtime configuration + /// at any time using UpdateRuntimeConfiguration. /// /// /// - /// This operation offers the following options: (1) retrieve all matchmaking configurations, - /// (2) retrieve configurations for a specified list, or (3) retrieve all configurations - /// that use a specified rule set name. When requesting multiple items, use the pagination - /// parameters to retrieve results as a set of sequential pages. + /// To get the current runtime configuration for a fleet, provide the fleet ID. /// /// /// - /// If successful, a configuration is returned for each requested name. When specifying - /// a list of names, only configurations that currently exist are returned. + /// If successful, a RuntimeConfiguration object is returned for the requested + /// fleet. If the requested fleet has been deleted, the result set is empty. /// /// /// @@ -9946,13 +11023,18 @@ public virtual DescribeMatchmakingResponse DescribeMatchmaking(DescribeMatchmaki /// /// /// - /// - /// Setting up FlexMatch matchmakers + /// Setting + /// up Amazon GameLift fleets + /// + /// + /// + /// Running + /// multiple processes on a fleet /// /// - /// Container for the necessary parameters to execute the DescribeMatchmakingConfigurations service method. + /// Container for the necessary parameters to execute the DescribeRuntimeConfiguration service method. /// - /// The response from the DescribeMatchmakingConfigurations service method, as returned by GameLift. + /// The response from the DescribeRuntimeConfiguration service method, as returned by GameLift. /// /// The service encountered an unrecoverable internal failure while processing the request. /// Clients can retry such requests immediately or after a waiting period. @@ -9961,34 +11043,38 @@ public virtual DescribeMatchmakingResponse DescribeMatchmaking(DescribeMatchmaki /// One or more parameter values in the request are invalid. Correct the invalid parameter /// values before retrying. /// - /// - /// The requested operation is not supported in the Region specified. + /// + /// The requested resources was not found. The resource was either not created yet or + /// deleted. /// - /// REST API Reference for DescribeMatchmakingConfigurations Operation - public virtual DescribeMatchmakingConfigurationsResponse DescribeMatchmakingConfigurations(DescribeMatchmakingConfigurationsRequest request) + /// + /// The client failed authentication. Clients should not retry such requests. + /// + /// REST API Reference for DescribeRuntimeConfiguration Operation + public virtual DescribeRuntimeConfigurationResponse DescribeRuntimeConfiguration(DescribeRuntimeConfigurationRequest request) { var options = new InvokeOptions(); - options.RequestMarshaller = DescribeMatchmakingConfigurationsRequestMarshaller.Instance; - options.ResponseUnmarshaller = DescribeMatchmakingConfigurationsResponseUnmarshaller.Instance; + options.RequestMarshaller = DescribeRuntimeConfigurationRequestMarshaller.Instance; + options.ResponseUnmarshaller = DescribeRuntimeConfigurationResponseUnmarshaller.Instance; - return Invoke(request, options); + return Invoke(request, options); } /// - /// Retrieves the details of FlexMatch matchmaking configurations. + /// Retrieves a fleet's runtime configuration settings. The runtime configuration determines + /// which server processes run, and how they run, and how many run concurrently on computes + /// in managed EC2 and Anywhere fleets. You can update a fleet's runtime configuration + /// at any time using UpdateRuntimeConfiguration. /// /// /// - /// This operation offers the following options: (1) retrieve all matchmaking configurations, - /// (2) retrieve configurations for a specified list, or (3) retrieve all configurations - /// that use a specified rule set name. When requesting multiple items, use the pagination - /// parameters to retrieve results as a set of sequential pages. + /// To get the current runtime configuration for a fleet, provide the fleet ID. /// /// /// - /// If successful, a configuration is returned for each requested name. When specifying - /// a list of names, only configurations that currently exist are returned. + /// If successful, a RuntimeConfiguration object is returned for the requested + /// fleet. If the requested fleet has been deleted, the result set is empty. /// /// /// @@ -9996,16 +11082,21 @@ public virtual DescribeMatchmakingConfigurationsResponse DescribeMatchmakingConf /// /// /// - /// - /// Setting up FlexMatch matchmakers + /// Setting + /// up Amazon GameLift fleets + /// + /// + /// + /// Running + /// multiple processes on a fleet /// /// - /// Container for the necessary parameters to execute the DescribeMatchmakingConfigurations service method. + /// Container for the necessary parameters to execute the DescribeRuntimeConfiguration service method. /// /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// /// - /// The response from the DescribeMatchmakingConfigurations service method, as returned by GameLift. + /// The response from the DescribeRuntimeConfiguration service method, as returned by GameLift. /// /// The service encountered an unrecoverable internal failure while processing the request. /// Clients can retry such requests immediately or after a waiting period. @@ -10014,44 +11105,47 @@ public virtual DescribeMatchmakingConfigurationsResponse DescribeMatchmakingConf /// One or more parameter values in the request are invalid. Correct the invalid parameter /// values before retrying. /// - /// - /// The requested operation is not supported in the Region specified. + /// + /// The requested resources was not found. The resource was either not created yet or + /// deleted. /// - /// REST API Reference for DescribeMatchmakingConfigurations Operation - public virtual Task DescribeMatchmakingConfigurationsAsync(DescribeMatchmakingConfigurationsRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + /// + /// The client failed authentication. Clients should not retry such requests. + /// + /// REST API Reference for DescribeRuntimeConfiguration Operation + public virtual Task DescribeRuntimeConfigurationAsync(DescribeRuntimeConfigurationRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { var options = new InvokeOptions(); - options.RequestMarshaller = DescribeMatchmakingConfigurationsRequestMarshaller.Instance; - options.ResponseUnmarshaller = DescribeMatchmakingConfigurationsResponseUnmarshaller.Instance; + options.RequestMarshaller = DescribeRuntimeConfigurationRequestMarshaller.Instance; + options.ResponseUnmarshaller = DescribeRuntimeConfigurationResponseUnmarshaller.Instance; - return InvokeAsync(request, options, cancellationToken); + return InvokeAsync(request, options, cancellationToken); } #endregion - #region DescribeMatchmakingRuleSets + #region DescribeScalingPolicies /// - /// Retrieves the details for FlexMatch matchmaking rule sets. You can request all existing - /// rule sets for the Region, or provide a list of one or more rule set names. When requesting - /// multiple items, use the pagination parameters to retrieve results as a set of sequential - /// pages. If successful, a rule set is returned for each requested name. + /// Retrieves all scaling policies applied to a fleet. /// /// /// - /// Learn more + /// To get a fleet's scaling policies, specify the fleet ID. You can filter this request + /// by policy status, such as to retrieve only active scaling policies. Use the pagination + /// parameters to retrieve results as a set of sequential pages. If successful, set of + /// ScalingPolicy objects is returned for the fleet. /// - ///
    • + /// /// - /// Build - /// a rule set + /// A fleet may have all of its scaling policies suspended. This operation does not affect + /// the status of the scaling policies, which remains ACTIVE. /// - ///
    ///     - /// Container for the necessary parameters to execute the DescribeMatchmakingRuleSets service method. + /// Container for the necessary parameters to execute the DescribeScalingPolicies service method. /// - /// The response from the DescribeMatchmakingRuleSets service method, as returned by GameLift. + /// The response from the DescribeScalingPolicies service method, as returned by GameLift. /// /// The service encountered an unrecoverable internal failure while processing the request. /// Clients can retry such requests immediately or after a waiting period. @@ -10064,43 +11158,45 @@ public virtual DescribeMatchmakingConfigurationsResponse DescribeMatchmakingConf /// The requested resources was not found. The resource was either not created yet or /// deleted. /// + /// + /// The client failed authentication. Clients should not retry such requests. + /// /// /// The requested operation is not supported in the Region specified. /// - /// REST API Reference for DescribeMatchmakingRuleSets Operation - public virtual DescribeMatchmakingRuleSetsResponse DescribeMatchmakingRuleSets(DescribeMatchmakingRuleSetsRequest request) + /// REST API Reference for DescribeScalingPolicies Operation + public virtual DescribeScalingPoliciesResponse DescribeScalingPolicies(DescribeScalingPoliciesRequest request) { var options = new InvokeOptions(); - options.RequestMarshaller = DescribeMatchmakingRuleSetsRequestMarshaller.Instance; - options.ResponseUnmarshaller = DescribeMatchmakingRuleSetsResponseUnmarshaller.Instance; + options.RequestMarshaller = DescribeScalingPoliciesRequestMarshaller.Instance; + options.ResponseUnmarshaller = DescribeScalingPoliciesResponseUnmarshaller.Instance; - return Invoke(request, options); + return Invoke(request, options); } /// - /// Retrieves the details for FlexMatch matchmaking rule sets. You can request all existing - /// rule sets for the Region, or provide a list of one or more rule set names. When requesting - /// multiple items, use the pagination parameters to retrieve results as a set of sequential - /// pages. If successful, a rule set is returned for each requested name. + /// Retrieves all scaling policies applied to a fleet. /// /// /// - /// Learn more + /// To get a fleet's scaling policies, specify the fleet ID. You can filter this request + /// by policy status, such as to retrieve only active scaling policies. Use the pagination + /// parameters to retrieve results as a set of sequential pages. If successful, set of + /// ScalingPolicy objects is returned for the fleet. /// - ///
    • + /// /// - /// Build - /// a rule set + /// A fleet may have all of its scaling policies suspended. This operation does not affect + /// the status of the scaling policies, which remains ACTIVE. /// - ///
    ///     - /// Container for the necessary parameters to execute the DescribeMatchmakingRuleSets service method. + /// Container for the necessary parameters to execute the DescribeScalingPolicies service method. /// /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// /// - /// The response from the DescribeMatchmakingRuleSets service method, as returned by GameLift. + /// The response from the DescribeScalingPolicies service method, as returned by GameLift. /// /// The service encountered an unrecoverable internal failure while processing the request. /// Clients can retry such requests immediately or after a waiting period. @@ -10113,55 +11209,43 @@ public virtual DescribeMatchmakingRuleSetsResponse DescribeMatchmakingRuleSets(D /// The requested resources was not found. The resource was either not created yet or /// deleted. /// + /// + /// The client failed authentication. Clients should not retry such requests. + /// /// /// The requested operation is not supported in the Region specified. /// - /// REST API Reference for DescribeMatchmakingRuleSets Operation - public virtual Task DescribeMatchmakingRuleSetsAsync(DescribeMatchmakingRuleSetsRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + /// REST API Reference for DescribeScalingPolicies Operation + public virtual Task DescribeScalingPoliciesAsync(DescribeScalingPoliciesRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { var options = new InvokeOptions(); - options.RequestMarshaller = DescribeMatchmakingRuleSetsRequestMarshaller.Instance; - options.ResponseUnmarshaller = DescribeMatchmakingRuleSetsResponseUnmarshaller.Instance; + options.RequestMarshaller = DescribeScalingPoliciesRequestMarshaller.Instance; + options.ResponseUnmarshaller = DescribeScalingPoliciesResponseUnmarshaller.Instance; - return InvokeAsync(request, options, cancellationToken); + return InvokeAsync(request, options, cancellationToken); } #endregion - #region DescribePlayerSessions + #region DescribeScript /// - /// Retrieves properties for one or more player sessions. + /// Retrieves properties for a Realtime script. /// /// /// - /// This action can be used in the following ways: - /// - ///
    • - /// - /// To retrieve a specific player session, provide the player session ID only. - /// - ///
    • - /// - /// To retrieve all player sessions in a game session, provide the game session ID only. - /// - ///
    • - /// - /// To retrieve all player sessions for a specific player, provide a player ID only. + /// To request a script record, specify the script ID. If successful, an object containing + /// the script properties is returned. /// - ///
    + /// /// - /// To request player sessions, specify either a player session ID, game session ID, or - /// player ID. You can filter this request by player session status. If you provide a - /// specific PlayerSessionId or PlayerId, Amazon GameLift ignores the filter - /// criteria. Use the pagination parameters to retrieve results as a set of sequential - /// pages. + /// Learn more /// /// /// - /// If successful, a PlayerSession object is returned for each session that matches - /// the request. + /// Amazon + /// GameLift Realtime Servers /// /// /// @@ -10173,9 +11257,9 @@ public virtual DescribeMatchmakingRuleSetsResponse DescribeMatchmakingRuleSets(D /// APIs by task /// ///     - /// Container for the necessary parameters to execute the DescribePlayerSessions service method. + /// Container for the necessary parameters to execute the DescribeScript service method. /// - /// The response from the DescribePlayerSessions service method, as returned by GameLift. + /// The response from the DescribeScript service method, as returned by GameLift. /// /// The service encountered an unrecoverable internal failure while processing the request. /// Clients can retry such requests immediately or after a waiting period. @@ -10191,48 +11275,33 @@ public virtual DescribeMatchmakingRuleSetsResponse DescribeMatchmakingRuleSets(D /// /// The client failed authentication. Clients should not retry such requests. /// - /// REST API Reference for DescribePlayerSessions Operation - public virtual DescribePlayerSessionsResponse DescribePlayerSessions(DescribePlayerSessionsRequest request) + /// REST API Reference for DescribeScript Operation + public virtual DescribeScriptResponse DescribeScript(DescribeScriptRequest request) { var options = new InvokeOptions(); - options.RequestMarshaller = DescribePlayerSessionsRequestMarshaller.Instance; - options.ResponseUnmarshaller = DescribePlayerSessionsResponseUnmarshaller.Instance; + options.RequestMarshaller = DescribeScriptRequestMarshaller.Instance; + options.ResponseUnmarshaller = DescribeScriptResponseUnmarshaller.Instance; - return Invoke(request, options); + return Invoke(request, options); } /// - /// Retrieves properties for one or more player sessions. + /// Retrieves properties for a Realtime script. /// /// /// - /// This action can be used in the following ways: - /// - ///
    • - /// - /// To retrieve a specific player session, provide the player session ID only. - /// - ///
    • - /// - /// To retrieve all player sessions in a game session, provide the game session ID only. - /// - ///
    • - /// - /// To retrieve all player sessions for a specific player, provide a player ID only. + /// To request a script record, specify the script ID. If successful, an object containing + /// the script properties is returned. /// - ///
    + /// /// - /// To request player sessions, specify either a player session ID, game session ID, or - /// player ID. You can filter this request by player session status. If you provide a - /// specific PlayerSessionId or PlayerId, Amazon GameLift ignores the filter - /// criteria. Use the pagination parameters to retrieve results as a set of sequential - /// pages. + /// Learn more /// /// /// - /// If successful, a PlayerSession object is returned for each session that matches - /// the request. + /// Amazon + /// GameLift Realtime Servers /// /// /// @@ -10244,12 +11313,12 @@ public virtual DescribePlayerSessionsResponse DescribePlayerSessions(DescribePla /// APIs by task /// ///     - /// Container for the necessary parameters to execute the DescribePlayerSessions service method. + /// Container for the necessary parameters to execute the DescribeScript service method. /// /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// /// - /// The response from the DescribePlayerSessions service method, as returned by GameLift. + /// The response from the DescribeScript service method, as returned by GameLift. /// /// The service encountered an unrecoverable internal failure while processing the request. /// Clients can retry such requests immediately or after a waiting period. @@ -10265,56 +11334,39 @@ public virtual DescribePlayerSessionsResponse DescribePlayerSessions(DescribePla /// /// The client failed authentication. Clients should not retry such requests. /// - /// REST API Reference for DescribePlayerSessions Operation - public virtual Task DescribePlayerSessionsAsync(DescribePlayerSessionsRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + /// REST API Reference for DescribeScript Operation + public virtual Task DescribeScriptAsync(DescribeScriptRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { var options = new InvokeOptions(); - options.RequestMarshaller = DescribePlayerSessionsRequestMarshaller.Instance; - options.ResponseUnmarshaller = DescribePlayerSessionsResponseUnmarshaller.Instance; + options.RequestMarshaller = DescribeScriptRequestMarshaller.Instance; + options.ResponseUnmarshaller = DescribeScriptResponseUnmarshaller.Instance; - return InvokeAsync(request, options, cancellationToken); + return InvokeAsync(request, options, cancellationToken); } #endregion - #region DescribeRuntimeConfiguration + #region DescribeVpcPeeringAuthorizations /// - /// Retrieves a fleet's runtime configuration settings. The runtime configuration determines - /// which server processes run, and how, on computes in the fleet. For managed EC2 fleets, - /// the runtime configuration describes server processes that run on each fleet instance. - /// For container fleets, the runtime configuration describes server processes that run - /// in each replica container group. You can update a fleet's runtime configuration at - /// any time using UpdateRuntimeConfiguration. + /// Retrieves valid VPC peering authorizations that are pending for the Amazon Web Services + /// account. This operation returns all VPC peering authorizations and requests for peering. + /// This includes those initiated and received by this account. /// /// /// - /// To get the current runtime configuration for a fleet, provide the fleet ID. - /// - /// - /// - /// If successful, a RuntimeConfiguration object is returned for the requested - /// fleet. If the requested fleet has been deleted, the result set is empty. - /// - /// - /// - /// Learn more - /// - /// - /// - /// Setting - /// up Amazon GameLift fleets + /// Related actions /// /// /// - /// Running - /// multiple processes on a fleet + /// All + /// APIs by task /// /// - /// Container for the necessary parameters to execute the DescribeRuntimeConfiguration service method. + /// Container for the necessary parameters to execute the DescribeVpcPeeringAuthorizations service method. /// - /// The response from the DescribeRuntimeConfiguration service method, as returned by GameLift. + /// The response from the DescribeVpcPeeringAuthorizations service method, as returned by GameLift. /// /// The service encountered an unrecoverable internal failure while processing the request. /// Clients can retry such requests immediately or after a waiting period. @@ -10323,62 +11375,41 @@ public virtual DescribePlayerSessionsResponse DescribePlayerSessions(DescribePla /// One or more parameter values in the request are invalid. Correct the invalid parameter /// values before retrying. /// - /// - /// The requested resources was not found. The resource was either not created yet or - /// deleted. - /// /// /// The client failed authentication. Clients should not retry such requests. /// - /// REST API Reference for DescribeRuntimeConfiguration Operation - public virtual DescribeRuntimeConfigurationResponse DescribeRuntimeConfiguration(DescribeRuntimeConfigurationRequest request) + /// REST API Reference for DescribeVpcPeeringAuthorizations Operation + public virtual DescribeVpcPeeringAuthorizationsResponse DescribeVpcPeeringAuthorizations(DescribeVpcPeeringAuthorizationsRequest request) { var options = new InvokeOptions(); - options.RequestMarshaller = DescribeRuntimeConfigurationRequestMarshaller.Instance; - options.ResponseUnmarshaller = DescribeRuntimeConfigurationResponseUnmarshaller.Instance; + options.RequestMarshaller = DescribeVpcPeeringAuthorizationsRequestMarshaller.Instance; + options.ResponseUnmarshaller = DescribeVpcPeeringAuthorizationsResponseUnmarshaller.Instance; - return Invoke(request, options); + return Invoke(request, options); } /// - /// Retrieves a fleet's runtime configuration settings. The runtime configuration determines - /// which server processes run, and how, on computes in the fleet. For managed EC2 fleets, - /// the runtime configuration describes server processes that run on each fleet instance. - /// For container fleets, the runtime configuration describes server processes that run - /// in each replica container group. You can update a fleet's runtime configuration at - /// any time using UpdateRuntimeConfiguration. + /// Retrieves valid VPC peering authorizations that are pending for the Amazon Web Services + /// account. This operation returns all VPC peering authorizations and requests for peering. + /// This includes those initiated and received by this account. /// /// /// - /// To get the current runtime configuration for a fleet, provide the fleet ID. - /// - /// - /// - /// If successful, a RuntimeConfiguration object is returned for the requested - /// fleet. If the requested fleet has been deleted, the result set is empty. - /// - /// - /// - /// Learn more - /// - /// - /// - /// Setting - /// up Amazon GameLift fleets + /// Related actions /// /// /// - /// Running - /// multiple processes on a fleet + /// All + /// APIs by task /// /// - /// Container for the necessary parameters to execute the DescribeRuntimeConfiguration service method. + /// Container for the necessary parameters to execute the DescribeVpcPeeringAuthorizations service method. /// /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// /// - /// The response from the DescribeRuntimeConfiguration service method, as returned by GameLift. + /// The response from the DescribeVpcPeeringAuthorizations service method, as returned by GameLift. /// /// The service encountered an unrecoverable internal failure while processing the request. /// Clients can retry such requests immediately or after a waiting period. @@ -10387,47 +11418,49 @@ public virtual DescribeRuntimeConfigurationResponse DescribeRuntimeConfiguration /// One or more parameter values in the request are invalid. Correct the invalid parameter /// values before retrying. /// - /// - /// The requested resources was not found. The resource was either not created yet or - /// deleted. - /// /// /// The client failed authentication. Clients should not retry such requests. /// - /// REST API Reference for DescribeRuntimeConfiguration Operation - public virtual Task DescribeRuntimeConfigurationAsync(DescribeRuntimeConfigurationRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + /// REST API Reference for DescribeVpcPeeringAuthorizations Operation + public virtual Task DescribeVpcPeeringAuthorizationsAsync(DescribeVpcPeeringAuthorizationsRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { var options = new InvokeOptions(); - options.RequestMarshaller = DescribeRuntimeConfigurationRequestMarshaller.Instance; - options.ResponseUnmarshaller = DescribeRuntimeConfigurationResponseUnmarshaller.Instance; + options.RequestMarshaller = DescribeVpcPeeringAuthorizationsRequestMarshaller.Instance; + options.ResponseUnmarshaller = DescribeVpcPeeringAuthorizationsResponseUnmarshaller.Instance; - return InvokeAsync(request, options, cancellationToken); + return InvokeAsync(request, options, cancellationToken); } #endregion - #region DescribeScalingPolicies + #region DescribeVpcPeeringConnections /// - /// Retrieves all scaling policies applied to a fleet. + /// Retrieves information on VPC peering connections. Use this operation to get peering + /// information for all fleets or for one specific fleet ID. /// /// /// - /// To get a fleet's scaling policies, specify the fleet ID. You can filter this request - /// by policy status, such as to retrieve only active scaling policies. Use the pagination - /// parameters to retrieve results as a set of sequential pages. If successful, set of - /// ScalingPolicy objects is returned for the fleet. + /// To retrieve connection information, call this operation from the Amazon Web Services + /// account that is used to manage the Amazon GameLift fleets. Specify a fleet ID or leave + /// the parameter empty to retrieve all connection records. If successful, the retrieved + /// information includes both active and pending connections. Active connections identify + /// the IpV4 CIDR block that the VPC uses to connect. /// /// /// - /// A fleet may have all of its scaling policies suspended. This operation does not affect - /// the status of the scaling policies, which remains ACTIVE. + /// Related actions + /// + /// + /// + /// All + /// APIs by task /// /// - /// Container for the necessary parameters to execute the DescribeScalingPolicies service method. + /// Container for the necessary parameters to execute the DescribeVpcPeeringConnections service method. /// - /// The response from the DescribeScalingPolicies service method, as returned by GameLift. + /// The response from the DescribeVpcPeeringConnections service method, as returned by GameLift. /// /// The service encountered an unrecoverable internal failure while processing the request. /// Clients can retry such requests immediately or after a waiting period. @@ -10443,42 +11476,45 @@ public virtual DescribeRuntimeConfigurationResponse DescribeRuntimeConfiguration /// /// The client failed authentication. Clients should not retry such requests. /// - /// - /// The requested operation is not supported in the Region specified. - /// - /// REST API Reference for DescribeScalingPolicies Operation - public virtual DescribeScalingPoliciesResponse DescribeScalingPolicies(DescribeScalingPoliciesRequest request) + /// REST API Reference for DescribeVpcPeeringConnections Operation + public virtual DescribeVpcPeeringConnectionsResponse DescribeVpcPeeringConnections(DescribeVpcPeeringConnectionsRequest request) { var options = new InvokeOptions(); - options.RequestMarshaller = DescribeScalingPoliciesRequestMarshaller.Instance; - options.ResponseUnmarshaller = DescribeScalingPoliciesResponseUnmarshaller.Instance; + options.RequestMarshaller = DescribeVpcPeeringConnectionsRequestMarshaller.Instance; + options.ResponseUnmarshaller = DescribeVpcPeeringConnectionsResponseUnmarshaller.Instance; - return Invoke(request, options); + return Invoke(request, options); } /// - /// Retrieves all scaling policies applied to a fleet. + /// Retrieves information on VPC peering connections. Use this operation to get peering + /// information for all fleets or for one specific fleet ID. /// /// /// - /// To get a fleet's scaling policies, specify the fleet ID. You can filter this request - /// by policy status, such as to retrieve only active scaling policies. Use the pagination - /// parameters to retrieve results as a set of sequential pages. If successful, set of - /// ScalingPolicy objects is returned for the fleet. + /// To retrieve connection information, call this operation from the Amazon Web Services + /// account that is used to manage the Amazon GameLift fleets. Specify a fleet ID or leave + /// the parameter empty to retrieve all connection records. If successful, the retrieved + /// information includes both active and pending connections. Active connections identify + /// the IpV4 CIDR block that the VPC uses to connect. /// /// /// - /// A fleet may have all of its scaling policies suspended. This operation does not affect - /// the status of the scaling policies, which remains ACTIVE. + /// Related actions + /// + /// + /// + /// All + /// APIs by task /// /// - /// Container for the necessary parameters to execute the DescribeScalingPolicies service method. + /// Container for the necessary parameters to execute the DescribeVpcPeeringConnections service method. /// /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// /// - /// The response from the DescribeScalingPolicies service method, as returned by GameLift. + /// The response from the DescribeVpcPeeringConnections service method, as returned by GameLift. /// /// The service encountered an unrecoverable internal failure while processing the request. /// Clients can retry such requests immediately or after a waiting period. @@ -10494,54 +11530,54 @@ public virtual DescribeScalingPoliciesResponse DescribeScalingPolicies(DescribeS /// /// The client failed authentication. Clients should not retry such requests. /// - /// - /// The requested operation is not supported in the Region specified. - /// - /// REST API Reference for DescribeScalingPolicies Operation - public virtual Task DescribeScalingPoliciesAsync(DescribeScalingPoliciesRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + /// REST API Reference for DescribeVpcPeeringConnections Operation + public virtual Task DescribeVpcPeeringConnectionsAsync(DescribeVpcPeeringConnectionsRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { var options = new InvokeOptions(); - options.RequestMarshaller = DescribeScalingPoliciesRequestMarshaller.Instance; - options.ResponseUnmarshaller = DescribeScalingPoliciesResponseUnmarshaller.Instance; + options.RequestMarshaller = DescribeVpcPeeringConnectionsRequestMarshaller.Instance; + options.ResponseUnmarshaller = DescribeVpcPeeringConnectionsResponseUnmarshaller.Instance; - return InvokeAsync(request, options, cancellationToken); + return InvokeAsync(request, options, cancellationToken); } #endregion - #region DescribeScript + #region GetComputeAccess /// - /// Retrieves properties for a Realtime script. + /// Requests authorization to remotely connect to a hosting resource in a Amazon GameLift + /// managed fleet. This operation is not used with Amazon GameLift Anywhere fleets. /// /// /// - /// To request a script record, specify the script ID. If successful, an object containing - /// the script properties is returned. + /// Request options /// /// /// - /// Learn more + /// To request access to a compute, specify the compute name and the fleet ID. /// /// /// - /// Amazon - /// GameLift Realtime Servers + /// Results /// /// /// - /// Related actions + /// If successful, this operation returns a set of temporary Amazon Web Services credentials, + /// including a two-part access key and a session token. /// - /// + ///
    • /// - /// All - /// APIs by task + /// With a managed EC2 fleet (where compute type is EC2), use these credentials + /// with Amazon EC2 Systems Manager (SSM) to start a session with the compute. For more + /// details, see + /// Starting a session (CLI) in the Amazon EC2 Systems Manager User Guide. /// + ///
    ///     - /// Container for the necessary parameters to execute the DescribeScript service method. + /// Container for the necessary parameters to execute the GetComputeAccess service method. /// - /// The response from the DescribeScript service method, as returned by GameLift. + /// The response from the GetComputeAccess service method, as returned by GameLift. /// /// The service encountered an unrecoverable internal failure while processing the request. /// Clients can retry such requests immediately or after a waiting period. @@ -10557,50 +11593,56 @@ public virtual DescribeScalingPoliciesResponse DescribeScalingPolicies(DescribeS /// /// The client failed authentication. Clients should not retry such requests. /// - /// REST API Reference for DescribeScript Operation - public virtual DescribeScriptResponse DescribeScript(DescribeScriptRequest request) + /// + /// The requested operation is not supported in the Region specified. + /// + /// REST API Reference for GetComputeAccess Operation + public virtual GetComputeAccessResponse GetComputeAccess(GetComputeAccessRequest request) { var options = new InvokeOptions(); - options.RequestMarshaller = DescribeScriptRequestMarshaller.Instance; - options.ResponseUnmarshaller = DescribeScriptResponseUnmarshaller.Instance; + options.RequestMarshaller = GetComputeAccessRequestMarshaller.Instance; + options.ResponseUnmarshaller = GetComputeAccessResponseUnmarshaller.Instance; - return Invoke(request, options); + return Invoke(request, options); } /// - /// Retrieves properties for a Realtime script. + /// Requests authorization to remotely connect to a hosting resource in a Amazon GameLift + /// managed fleet. This operation is not used with Amazon GameLift Anywhere fleets. /// /// /// - /// To request a script record, specify the script ID. If successful, an object containing - /// the script properties is returned. + /// Request options /// /// /// - /// Learn more + /// To request access to a compute, specify the compute name and the fleet ID. /// /// /// - /// Amazon - /// GameLift Realtime Servers + /// Results /// /// /// - /// Related actions + /// If successful, this operation returns a set of temporary Amazon Web Services credentials, + /// including a two-part access key and a session token. /// - /// + ///
    • /// - /// All - /// APIs by task + /// With a managed EC2 fleet (where compute type is EC2), use these credentials + /// with Amazon EC2 Systems Manager (SSM) to start a session with the compute. For more + /// details, see + /// Starting a session (CLI) in the Amazon EC2 Systems Manager User Guide. /// + ///
    ///     - /// Container for the necessary parameters to execute the DescribeScript service method. + /// Container for the necessary parameters to execute the GetComputeAccess service method. /// /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// /// - /// The response from the DescribeScript service method, as returned by GameLift. + /// The response from the GetComputeAccess service method, as returned by GameLift. /// /// The service encountered an unrecoverable internal failure while processing the request. /// Clients can retry such requests immediately or after a waiting period. @@ -10616,39 +11658,72 @@ public virtual DescribeScriptResponse DescribeScript(DescribeScriptRequest reque /// /// The client failed authentication. Clients should not retry such requests. /// - /// REST API Reference for DescribeScript Operation - public virtual Task DescribeScriptAsync(DescribeScriptRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + /// + /// The requested operation is not supported in the Region specified. + /// + /// REST API Reference for GetComputeAccess Operation + public virtual Task GetComputeAccessAsync(GetComputeAccessRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { var options = new InvokeOptions(); - options.RequestMarshaller = DescribeScriptRequestMarshaller.Instance; - options.ResponseUnmarshaller = DescribeScriptResponseUnmarshaller.Instance; + options.RequestMarshaller = GetComputeAccessRequestMarshaller.Instance; + options.ResponseUnmarshaller = GetComputeAccessResponseUnmarshaller.Instance; - return InvokeAsync(request, options, cancellationToken); + return InvokeAsync(request, options, cancellationToken); } #endregion - #region DescribeVpcPeeringAuthorizations + #region GetComputeAuthToken /// - /// Retrieves valid VPC peering authorizations that are pending for the Amazon Web Services - /// account. This operation returns all VPC peering authorizations and requests for peering. - /// This includes those initiated and received by this account. + /// Requests an authentication token from Amazon GameLift for a compute resource in an + /// Amazon GameLift fleet. Game servers that are running on the compute use this token + /// to communicate with the Amazon GameLift service, such as when calling the Amazon GameLift + /// server SDK action InitSDK(). Authentication tokens are valid for a limited + /// time span, so you need to request a fresh token before the current token expires. /// /// /// - /// Related actions + /// Request options + /// + ///
    • + /// + /// For managed EC2 fleets (compute type EC2), auth token retrieval and refresh + /// is handled automatically. All game servers that are running on all fleet instances + /// have access to a valid auth token. + /// + ///
    • + /// + /// For Anywhere fleets (compute type ANYWHERE), if you're using the Amazon GameLift + /// Agent, auth token retrieval and refresh is handled automatically for any compute where + /// the Agent is running. If you're not using the Agent, create a mechanism to retrieve + /// and refresh auth tokens for computes that are running game server processes. + /// + ///
    + /// + /// Learn more + /// + /// ///     - /// Container for the necessary parameters to execute the DescribeVpcPeeringAuthorizations service method. + /// Container for the necessary parameters to execute the GetComputeAuthToken service method. /// - /// The response from the DescribeVpcPeeringAuthorizations service method, as returned by GameLift. + /// The response from the GetComputeAuthToken service method, as returned by GameLift. /// /// The service encountered an unrecoverable internal failure while processing the request. /// Clients can retry such requests immediately or after a waiting period. @@ -10657,41 +11732,78 @@ public virtual DescribeScriptResponse DescribeScript(DescribeScriptRequest reque /// One or more parameter values in the request are invalid. Correct the invalid parameter /// values before retrying. /// + /// + /// The requested resources was not found. The resource was either not created yet or + /// deleted. + /// /// /// The client failed authentication. Clients should not retry such requests. /// - /// REST API Reference for DescribeVpcPeeringAuthorizations Operation - public virtual DescribeVpcPeeringAuthorizationsResponse DescribeVpcPeeringAuthorizations(DescribeVpcPeeringAuthorizationsRequest request) + /// + /// The requested operation is not supported in the Region specified. + /// + /// REST API Reference for GetComputeAuthToken Operation + public virtual GetComputeAuthTokenResponse GetComputeAuthToken(GetComputeAuthTokenRequest request) { var options = new InvokeOptions(); - options.RequestMarshaller = DescribeVpcPeeringAuthorizationsRequestMarshaller.Instance; - options.ResponseUnmarshaller = DescribeVpcPeeringAuthorizationsResponseUnmarshaller.Instance; + options.RequestMarshaller = GetComputeAuthTokenRequestMarshaller.Instance; + options.ResponseUnmarshaller = GetComputeAuthTokenResponseUnmarshaller.Instance; - return Invoke(request, options); + return Invoke(request, options); } /// - /// Retrieves valid VPC peering authorizations that are pending for the Amazon Web Services - /// account. This operation returns all VPC peering authorizations and requests for peering. - /// This includes those initiated and received by this account. + /// Requests an authentication token from Amazon GameLift for a compute resource in an + /// Amazon GameLift fleet. Game servers that are running on the compute use this token + /// to communicate with the Amazon GameLift service, such as when calling the Amazon GameLift + /// server SDK action InitSDK(). Authentication tokens are valid for a limited + /// time span, so you need to request a fresh token before the current token expires. /// /// /// - /// Related actions + /// Request options /// - /// + ///
    • /// - /// All - /// APIs by task + /// For managed EC2 fleets (compute type EC2), auth token retrieval and refresh + /// is handled automatically. All game servers that are running on all fleet instances + /// have access to a valid auth token. + /// + ///
    • + /// + /// For Anywhere fleets (compute type ANYWHERE), if you're using the Amazon GameLift + /// Agent, auth token retrieval and refresh is handled automatically for any compute where + /// the Agent is running. If you're not using the Agent, create a mechanism to retrieve + /// and refresh auth tokens for computes that are running game server processes. + /// + ///
    + /// + /// Learn more + /// + /// ///     - /// Container for the necessary parameters to execute the DescribeVpcPeeringAuthorizations service method. + /// Container for the necessary parameters to execute the GetComputeAuthToken service method. /// /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// /// - /// The response from the DescribeVpcPeeringAuthorizations service method, as returned by GameLift. + /// The response from the GetComputeAuthToken service method, as returned by GameLift. /// /// The service encountered an unrecoverable internal failure while processing the request. /// Clients can retry such requests immediately or after a waiting period. @@ -10700,49 +11812,52 @@ public virtual DescribeVpcPeeringAuthorizationsResponse DescribeVpcPeeringAuthor /// One or more parameter values in the request are invalid. Correct the invalid parameter /// values before retrying. /// + /// + /// The requested resources was not found. The resource was either not created yet or + /// deleted. + /// /// /// The client failed authentication. Clients should not retry such requests. /// - /// REST API Reference for DescribeVpcPeeringAuthorizations Operation - public virtual Task DescribeVpcPeeringAuthorizationsAsync(DescribeVpcPeeringAuthorizationsRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + /// + /// The requested operation is not supported in the Region specified. + /// + /// REST API Reference for GetComputeAuthToken Operation + public virtual Task GetComputeAuthTokenAsync(GetComputeAuthTokenRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { var options = new InvokeOptions(); - options.RequestMarshaller = DescribeVpcPeeringAuthorizationsRequestMarshaller.Instance; - options.ResponseUnmarshaller = DescribeVpcPeeringAuthorizationsResponseUnmarshaller.Instance; + options.RequestMarshaller = GetComputeAuthTokenRequestMarshaller.Instance; + options.ResponseUnmarshaller = GetComputeAuthTokenResponseUnmarshaller.Instance; - return InvokeAsync(request, options, cancellationToken); + return InvokeAsync(request, options, cancellationToken); } #endregion - #region DescribeVpcPeeringConnections + #region GetGameSessionLogUrl /// - /// Retrieves information on VPC peering connections. Use this operation to get peering - /// information for all fleets or for one specific fleet ID. + /// Retrieves the location of stored game session logs for a specified game session on + /// Amazon GameLift managed fleets. When a game session is terminated, Amazon GameLift + /// automatically stores the logs in Amazon S3 and retains them for 14 days. Use this + /// URL to download the logs. /// - /// - /// - /// To retrieve connection information, call this operation from the Amazon Web Services - /// account that is used to manage the Amazon GameLift fleets. Specify a fleet ID or leave - /// the parameter empty to retrieve all connection records. If successful, the retrieved - /// information includes both active and pending connections. Active connections identify - /// the IpV4 CIDR block that the VPC uses to connect. - /// - /// + /// /// - /// Related actions + /// See the Amazon + /// Web Services Service Limits page for maximum log file sizes. Log files that exceed + /// this limit are not saved. /// - /// + /// /// /// All /// APIs by task /// /// - /// Container for the necessary parameters to execute the DescribeVpcPeeringConnections service method. + /// A unique identifier for the game session to get logs for. /// - /// The response from the DescribeVpcPeeringConnections service method, as returned by GameLift. + /// The response from the GetGameSessionLogUrl service method, as returned by GameLift. /// /// The service encountered an unrecoverable internal failure while processing the request. /// Clients can retry such requests immediately or after a waiting period. @@ -10758,45 +11873,36 @@ public virtual DescribeVpcPeeringAuthorizationsResponse DescribeVpcPeeringAuthor /// /// The client failed authentication. Clients should not retry such requests. /// - /// REST API Reference for DescribeVpcPeeringConnections Operation - public virtual DescribeVpcPeeringConnectionsResponse DescribeVpcPeeringConnections(DescribeVpcPeeringConnectionsRequest request) + /// REST API Reference for GetGameSessionLogUrl Operation + public virtual GetGameSessionLogUrlResponse GetGameSessionLogUrl(string gameSessionId) { - var options = new InvokeOptions(); - options.RequestMarshaller = DescribeVpcPeeringConnectionsRequestMarshaller.Instance; - options.ResponseUnmarshaller = DescribeVpcPeeringConnectionsResponseUnmarshaller.Instance; - - return Invoke(request, options); + var request = new GetGameSessionLogUrlRequest(); + request.GameSessionId = gameSessionId; + return GetGameSessionLogUrl(request); } /// - /// Retrieves information on VPC peering connections. Use this operation to get peering - /// information for all fleets or for one specific fleet ID. + /// Retrieves the location of stored game session logs for a specified game session on + /// Amazon GameLift managed fleets. When a game session is terminated, Amazon GameLift + /// automatically stores the logs in Amazon S3 and retains them for 14 days. Use this + /// URL to download the logs. /// - /// - /// - /// To retrieve connection information, call this operation from the Amazon Web Services - /// account that is used to manage the Amazon GameLift fleets. Specify a fleet ID or leave - /// the parameter empty to retrieve all connection records. If successful, the retrieved - /// information includes both active and pending connections. Active connections identify - /// the IpV4 CIDR block that the VPC uses to connect. - /// - /// + /// /// - /// Related actions + /// See the Amazon + /// Web Services Service Limits page for maximum log file sizes. Log files that exceed + /// this limit are not saved. /// - /// + /// /// /// All /// APIs by task /// /// - /// Container for the necessary parameters to execute the DescribeVpcPeeringConnections service method. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// + /// Container for the necessary parameters to execute the GetGameSessionLogUrl service method. /// - /// The response from the DescribeVpcPeeringConnections service method, as returned by GameLift. + /// The response from the GetGameSessionLogUrl service method, as returned by GameLift. /// /// The service encountered an unrecoverable internal failure while processing the request. /// Clients can retry such requests immediately or after a waiting period. @@ -10812,77 +11918,41 @@ public virtual DescribeVpcPeeringConnectionsResponse DescribeVpcPeeringConnectio /// /// The client failed authentication. Clients should not retry such requests. /// - /// REST API Reference for DescribeVpcPeeringConnections Operation - public virtual Task DescribeVpcPeeringConnectionsAsync(DescribeVpcPeeringConnectionsRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + /// REST API Reference for GetGameSessionLogUrl Operation + public virtual GetGameSessionLogUrlResponse GetGameSessionLogUrl(GetGameSessionLogUrlRequest request) { var options = new InvokeOptions(); - options.RequestMarshaller = DescribeVpcPeeringConnectionsRequestMarshaller.Instance; - options.ResponseUnmarshaller = DescribeVpcPeeringConnectionsResponseUnmarshaller.Instance; - - return InvokeAsync(request, options, cancellationToken); - } + options.RequestMarshaller = GetGameSessionLogUrlRequestMarshaller.Instance; + options.ResponseUnmarshaller = GetGameSessionLogUrlResponseUnmarshaller.Instance; - #endregion - - #region GetComputeAccess + return Invoke(request, options); + } /// - /// This operation has been expanded to use with the Amazon GameLift containers feature, - /// which is currently in public preview. + /// Retrieves the location of stored game session logs for a specified game session on + /// Amazon GameLift managed fleets. When a game session is terminated, Amazon GameLift + /// automatically stores the logs in Amazon S3 and retains them for 14 days. Use this + /// URL to download the logs. /// - /// - /// - /// Requests authorization to remotely connect to a hosting resource in a Amazon GameLift - /// managed fleet. This operation is not used with Amazon GameLift Anywhere fleets - /// - /// - /// - /// To request access, specify the compute name and the fleet ID. If successful, this - /// operation returns a set of temporary Amazon Web Services credentials, including a - /// two-part access key and a session token. - /// - /// - /// - /// EC2 fleets - /// - /// - /// - /// With an EC2 fleet (where compute type is EC2), use these credentials with Amazon - /// EC2 Systems Manager (SSM) to start a session with the compute. For more details, see - /// - /// Starting a session (CLI) in the Amazon EC2 Systems Manager User Guide. - /// - /// - /// - /// Container fleets - /// - /// - /// - /// With a container fleet (where compute type is CONTAINER), use these credentials - /// and the target value with SSM to connect to the fleet instance where the container - /// is running. After you're connected to the instance, use Docker commands to interact - /// with the container. - /// - /// - /// - /// Learn more - /// - /// /// - /// Container for the necessary parameters to execute the GetComputeAccess service method. + /// A unique identifier for the game session to get logs for. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// /// - /// The response from the GetComputeAccess service method, as returned by GameLift. + /// The response from the GetGameSessionLogUrl service method, as returned by GameLift. /// /// The service encountered an unrecoverable internal failure while processing the request. /// Clients can retry such requests immediately or after a waiting period. @@ -10898,76 +11968,39 @@ public virtual DescribeVpcPeeringConnectionsResponse DescribeVpcPeeringConnectio /// /// The client failed authentication. Clients should not retry such requests. /// - /// REST API Reference for GetComputeAccess Operation - public virtual GetComputeAccessResponse GetComputeAccess(GetComputeAccessRequest request) + /// REST API Reference for GetGameSessionLogUrl Operation + public virtual Task GetGameSessionLogUrlAsync(string gameSessionId, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { - var options = new InvokeOptions(); - options.RequestMarshaller = GetComputeAccessRequestMarshaller.Instance; - options.ResponseUnmarshaller = GetComputeAccessResponseUnmarshaller.Instance; - - return Invoke(request, options); + var request = new GetGameSessionLogUrlRequest(); + request.GameSessionId = gameSessionId; + return GetGameSessionLogUrlAsync(request, cancellationToken); } - - - /// - /// This operation has been expanded to use with the Amazon GameLift containers feature, - /// which is currently in public preview. - /// - /// - /// - /// Requests authorization to remotely connect to a hosting resource in a Amazon GameLift - /// managed fleet. This operation is not used with Amazon GameLift Anywhere fleets - /// - /// - /// - /// To request access, specify the compute name and the fleet ID. If successful, this - /// operation returns a set of temporary Amazon Web Services credentials, including a - /// two-part access key and a session token. - /// - /// - /// - /// EC2 fleets - /// - /// - /// - /// With an EC2 fleet (where compute type is EC2), use these credentials with Amazon - /// EC2 Systems Manager (SSM) to start a session with the compute. For more details, see - /// - /// Starting a session (CLI) in the Amazon EC2 Systems Manager User Guide. - /// - /// - /// - /// Container fleets - /// - /// - /// - /// With a container fleet (where compute type is CONTAINER), use these credentials - /// and the target value with SSM to connect to the fleet instance where the container - /// is running. After you're connected to the instance, use Docker commands to interact - /// with the container. - /// - /// - /// - /// Learn more - /// - /// /// - /// Container for the necessary parameters to execute the GetComputeAccess service method. + /// Container for the necessary parameters to execute the GetGameSessionLogUrl service method. /// /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// /// - /// The response from the GetComputeAccess service method, as returned by GameLift. + /// The response from the GetGameSessionLogUrl service method, as returned by GameLift. /// /// The service encountered an unrecoverable internal failure while processing the request. /// Clients can retry such requests immediately or after a waiting period. @@ -10983,71 +12016,78 @@ public virtual GetComputeAccessResponse GetComputeAccess(GetComputeAccessRequest /// /// The client failed authentication. Clients should not retry such requests. /// - /// REST API Reference for GetComputeAccess Operation - public virtual Task GetComputeAccessAsync(GetComputeAccessRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + /// REST API Reference for GetGameSessionLogUrl Operation + public virtual Task GetGameSessionLogUrlAsync(GetGameSessionLogUrlRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { var options = new InvokeOptions(); - options.RequestMarshaller = GetComputeAccessRequestMarshaller.Instance; - options.ResponseUnmarshaller = GetComputeAccessResponseUnmarshaller.Instance; + options.RequestMarshaller = GetGameSessionLogUrlRequestMarshaller.Instance; + options.ResponseUnmarshaller = GetGameSessionLogUrlResponseUnmarshaller.Instance; - return InvokeAsync(request, options, cancellationToken); + return InvokeAsync(request, options, cancellationToken); } #endregion - #region GetComputeAuthToken + #region GetInstanceAccess /// - /// Requests an authentication token from Amazon GameLift for a compute resource in an - /// Amazon GameLift Anywhere fleet or container fleet. Game servers that are running on - /// the compute use this token to communicate with the Amazon GameLift service, such as - /// when calling the Amazon GameLift server SDK action InitSDK(). Authentication - /// tokens are valid for a limited time span, so you need to request a fresh token before - /// the current token expires. + /// Requests authorization to remotely connect to an instance in an Amazon GameLift managed + /// fleet. Use this operation to connect to instances with game servers that use Amazon + /// GameLift server SDK 4.x or earlier. To connect to instances with game servers that + /// use server SDK 5.x or later, call GetComputeAccess. /// /// /// - /// Use this operation based on the fleet compute type: + /// To request access to an instance, specify IDs for the instance and the fleet it belongs + /// to. You can retrieve instance IDs for a fleet by calling DescribeInstances + /// with the fleet ID. + /// + /// + /// + /// If successful, this operation returns an IP address and credentials. The returned + /// credentials match the operating system of the instance, as follows: /// ///
    • /// - /// For EC2 fleets, auth token retrieval and refresh is handled automatically. - /// All game servers that are running on all fleet instances have access to a valid auth - /// token. + /// For a Windows instance: returns a user name and secret (password) for use with a Windows + /// Remote Desktop client. /// ///
    • /// - /// For ANYWHERE and CONTAINER fleets, if you're using the Amazon GameLift - /// Agent, auth token retrieval and refresh is handled automatically for any container - /// or Anywhere compute where the Agent is running. If you're not using the Agent, create - /// a mechanism to retrieve and refresh auth tokens for computes that are running game - /// server processes. + /// For a Linux instance: returns a user name and secret (RSA private key) for use with + /// an SSH client. You must save the secret to a .pem file. If you're using the + /// CLI, see the example + /// Get credentials for a Linux instance for tips on automatically saving the secret + /// to a .pem file. /// ///
    /// /// Learn more /// - /// ///     - /// Container for the necessary parameters to execute the GetComputeAuthToken service method. + /// Container for the necessary parameters to execute the GetInstanceAccess service method. /// - /// The response from the GetComputeAuthToken service method, as returned by GameLift. + /// The response from the GetInstanceAccess service method, as returned by GameLift. /// /// The service encountered an unrecoverable internal failure while processing the request. /// Clients can retry such requests immediately or after a waiting period. @@ -11063,70 +12103,77 @@ public virtual GetComputeAccessResponse GetComputeAccess(GetComputeAccessRequest /// /// The client failed authentication. Clients should not retry such requests. /// - /// REST API Reference for GetComputeAuthToken Operation - public virtual GetComputeAuthTokenResponse GetComputeAuthToken(GetComputeAuthTokenRequest request) + /// REST API Reference for GetInstanceAccess Operation + public virtual GetInstanceAccessResponse GetInstanceAccess(GetInstanceAccessRequest request) { var options = new InvokeOptions(); - options.RequestMarshaller = GetComputeAuthTokenRequestMarshaller.Instance; - options.ResponseUnmarshaller = GetComputeAuthTokenResponseUnmarshaller.Instance; + options.RequestMarshaller = GetInstanceAccessRequestMarshaller.Instance; + options.ResponseUnmarshaller = GetInstanceAccessResponseUnmarshaller.Instance; - return Invoke(request, options); + return Invoke(request, options); } /// - /// Requests an authentication token from Amazon GameLift for a compute resource in an - /// Amazon GameLift Anywhere fleet or container fleet. Game servers that are running on - /// the compute use this token to communicate with the Amazon GameLift service, such as - /// when calling the Amazon GameLift server SDK action InitSDK(). Authentication - /// tokens are valid for a limited time span, so you need to request a fresh token before - /// the current token expires. + /// Requests authorization to remotely connect to an instance in an Amazon GameLift managed + /// fleet. Use this operation to connect to instances with game servers that use Amazon + /// GameLift server SDK 4.x or earlier. To connect to instances with game servers that + /// use server SDK 5.x or later, call GetComputeAccess. /// /// /// - /// Use this operation based on the fleet compute type: + /// To request access to an instance, specify IDs for the instance and the fleet it belongs + /// to. You can retrieve instance IDs for a fleet by calling DescribeInstances + /// with the fleet ID. + /// + /// + /// + /// If successful, this operation returns an IP address and credentials. The returned + /// credentials match the operating system of the instance, as follows: /// ///
    • /// - /// For EC2 fleets, auth token retrieval and refresh is handled automatically. - /// All game servers that are running on all fleet instances have access to a valid auth - /// token. + /// For a Windows instance: returns a user name and secret (password) for use with a Windows + /// Remote Desktop client. /// ///
    • /// - /// For ANYWHERE and CONTAINER fleets, if you're using the Amazon GameLift - /// Agent, auth token retrieval and refresh is handled automatically for any container - /// or Anywhere compute where the Agent is running. If you're not using the Agent, create - /// a mechanism to retrieve and refresh auth tokens for computes that are running game - /// server processes. + /// For a Linux instance: returns a user name and secret (RSA private key) for use with + /// an SSH client. You must save the secret to a .pem file. If you're using the + /// CLI, see the example + /// Get credentials for a Linux instance for tips on automatically saving the secret + /// to a .pem file. /// ///
    /// /// Learn more /// - /// ///     - /// Container for the necessary parameters to execute the GetComputeAuthToken service method. + /// Container for the necessary parameters to execute the GetInstanceAccess service method. /// /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// /// - /// The response from the GetComputeAuthToken service method, as returned by GameLift. + /// The response from the GetInstanceAccess service method, as returned by GameLift. /// /// The service encountered an unrecoverable internal failure while processing the request. /// Clients can retry such requests immediately or after a waiting period. @@ -11142,42 +12189,43 @@ public virtual GetComputeAuthTokenResponse GetComputeAuthToken(GetComputeAuthTok /// /// The client failed authentication. Clients should not retry such requests. /// - /// REST API Reference for GetComputeAuthToken Operation - public virtual Task GetComputeAuthTokenAsync(GetComputeAuthTokenRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + /// REST API Reference for GetInstanceAccess Operation + public virtual Task GetInstanceAccessAsync(GetInstanceAccessRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { var options = new InvokeOptions(); - options.RequestMarshaller = GetComputeAuthTokenRequestMarshaller.Instance; - options.ResponseUnmarshaller = GetComputeAuthTokenResponseUnmarshaller.Instance; + options.RequestMarshaller = GetInstanceAccessRequestMarshaller.Instance; + options.ResponseUnmarshaller = GetInstanceAccessResponseUnmarshaller.Instance; - return InvokeAsync(request, options, cancellationToken); + return InvokeAsync(request, options, cancellationToken); } #endregion - #region GetGameSessionLogUrl + #region ListAliases /// - /// Retrieves the location of stored game session logs for a specified game session on - /// Amazon GameLift managed fleets. When a game session is terminated, Amazon GameLift - /// automatically stores the logs in Amazon S3 and retains them for 14 days. Use this - /// URL to download the logs. + /// Retrieves all aliases for this Amazon Web Services account. You can filter the result + /// set by alias name and/or routing strategy type. Use the pagination parameters to retrieve + /// results in sequential pages. /// /// /// - /// See the Amazon - /// Web Services Service Limits page for maximum log file sizes. Log files that exceed - /// this limit are not saved. + /// Returned aliases are not listed in any particular order. /// /// /// + /// Related actions + /// + /// + /// /// All /// APIs by task /// /// - /// A unique identifier for the game session to get logs for. + /// Container for the necessary parameters to execute the ListAliases service method. /// - /// The response from the GetGameSessionLogUrl service method, as returned by GameLift. + /// The response from the ListAliases service method, as returned by GameLift. /// /// The service encountered an unrecoverable internal failure while processing the request. /// Clients can retry such requests immediately or after a waiting period. @@ -11186,43 +12234,45 @@ public virtual GetComputeAuthTokenResponse GetComputeAuthToken(GetComputeAuthTok /// One or more parameter values in the request are invalid. Correct the invalid parameter /// values before retrying. /// - /// - /// The requested resources was not found. The resource was either not created yet or - /// deleted. - /// /// /// The client failed authentication. Clients should not retry such requests. /// - /// REST API Reference for GetGameSessionLogUrl Operation - public virtual GetGameSessionLogUrlResponse GetGameSessionLogUrl(string gameSessionId) + /// REST API Reference for ListAliases Operation + public virtual ListAliasesResponse ListAliases(ListAliasesRequest request) { - var request = new GetGameSessionLogUrlRequest(); - request.GameSessionId = gameSessionId; - return GetGameSessionLogUrl(request); + var options = new InvokeOptions(); + options.RequestMarshaller = ListAliasesRequestMarshaller.Instance; + options.ResponseUnmarshaller = ListAliasesResponseUnmarshaller.Instance; + + return Invoke(request, options); } /// - /// Retrieves the location of stored game session logs for a specified game session on - /// Amazon GameLift managed fleets. When a game session is terminated, Amazon GameLift - /// automatically stores the logs in Amazon S3 and retains them for 14 days. Use this - /// URL to download the logs. + /// Retrieves all aliases for this Amazon Web Services account. You can filter the result + /// set by alias name and/or routing strategy type. Use the pagination parameters to retrieve + /// results in sequential pages. /// /// /// - /// See the Amazon - /// Web Services Service Limits page for maximum log file sizes. Log files that exceed - /// this limit are not saved. + /// Returned aliases are not listed in any particular order. /// /// /// + /// Related actions + /// + /// + /// /// All /// APIs by task /// /// - /// Container for the necessary parameters to execute the GetGameSessionLogUrl service method. + /// Container for the necessary parameters to execute the ListAliases service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// /// - /// The response from the GetGameSessionLogUrl service method, as returned by GameLift. + /// The response from the ListAliases service method, as returned by GameLift. /// /// The service encountered an unrecoverable internal failure while processing the request. /// Clients can retry such requests immediately or after a waiting period. @@ -11231,48 +12281,52 @@ public virtual GetGameSessionLogUrlResponse GetGameSessionLogUrl(string gameSess /// One or more parameter values in the request are invalid. Correct the invalid parameter /// values before retrying. /// - /// - /// The requested resources was not found. The resource was either not created yet or - /// deleted. - /// /// /// The client failed authentication. Clients should not retry such requests. /// - /// REST API Reference for GetGameSessionLogUrl Operation - public virtual GetGameSessionLogUrlResponse GetGameSessionLogUrl(GetGameSessionLogUrlRequest request) + /// REST API Reference for ListAliases Operation + public virtual Task ListAliasesAsync(ListAliasesRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { var options = new InvokeOptions(); - options.RequestMarshaller = GetGameSessionLogUrlRequestMarshaller.Instance; - options.ResponseUnmarshaller = GetGameSessionLogUrlResponseUnmarshaller.Instance; - - return Invoke(request, options); + options.RequestMarshaller = ListAliasesRequestMarshaller.Instance; + options.ResponseUnmarshaller = ListAliasesResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); } + #endregion + + #region ListBuilds + /// - /// Retrieves the location of stored game session logs for a specified game session on - /// Amazon GameLift managed fleets. When a game session is terminated, Amazon GameLift - /// automatically stores the logs in Amazon S3 and retains them for 14 days. Use this - /// URL to download the logs. + /// Retrieves build resources for all builds associated with the Amazon Web Services account + /// in use. You can limit results to builds that are in a specific status by using the + /// Status parameter. Use the pagination parameters to retrieve results in a set + /// of sequential pages. /// /// /// - /// See the Amazon - /// Web Services Service Limits page for maximum log file sizes. Log files that exceed - /// this limit are not saved. + /// Build resources are not listed in any particular order. /// /// /// + /// Learn more + /// + /// + /// + /// + /// Upload a Custom Server Build + /// + /// + /// /// All /// APIs by task /// /// - /// A unique identifier for the game session to get logs for. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// + /// Container for the necessary parameters to execute the ListBuilds service method. /// - /// The response from the GetGameSessionLogUrl service method, as returned by GameLift. + /// The response from the ListBuilds service method, as returned by GameLift. /// /// The service encountered an unrecoverable internal failure while processing the request. /// Clients can retry such requests immediately or after a waiting period. @@ -11281,46 +12335,51 @@ public virtual GetGameSessionLogUrlResponse GetGameSessionLogUrl(GetGameSessionL /// One or more parameter values in the request are invalid. Correct the invalid parameter /// values before retrying. /// - /// - /// The requested resources was not found. The resource was either not created yet or - /// deleted. - /// /// /// The client failed authentication. Clients should not retry such requests. /// - /// REST API Reference for GetGameSessionLogUrl Operation - public virtual Task GetGameSessionLogUrlAsync(string gameSessionId, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + /// REST API Reference for ListBuilds Operation + public virtual ListBuildsResponse ListBuilds(ListBuildsRequest request) { - var request = new GetGameSessionLogUrlRequest(); - request.GameSessionId = gameSessionId; - return GetGameSessionLogUrlAsync(request, cancellationToken); + var options = new InvokeOptions(); + options.RequestMarshaller = ListBuildsRequestMarshaller.Instance; + options.ResponseUnmarshaller = ListBuildsResponseUnmarshaller.Instance; + + return Invoke(request, options); } /// - /// Retrieves the location of stored game session logs for a specified game session on - /// Amazon GameLift managed fleets. When a game session is terminated, Amazon GameLift - /// automatically stores the logs in Amazon S3 and retains them for 14 days. Use this - /// URL to download the logs. + /// Retrieves build resources for all builds associated with the Amazon Web Services account + /// in use. You can limit results to builds that are in a specific status by using the + /// Status parameter. Use the pagination parameters to retrieve results in a set + /// of sequential pages. /// /// /// - /// See the Amazon - /// Web Services Service Limits page for maximum log file sizes. Log files that exceed - /// this limit are not saved. + /// Build resources are not listed in any particular order. /// /// /// + /// Learn more + /// + /// + /// + /// + /// Upload a Custom Server Build + /// + /// + /// /// All /// APIs by task /// /// - /// Container for the necessary parameters to execute the GetGameSessionLogUrl service method. + /// Container for the necessary parameters to execute the ListBuilds service method. /// /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// /// - /// The response from the GetGameSessionLogUrl service method, as returned by GameLift. + /// The response from the ListBuilds service method, as returned by GameLift. /// /// The service encountered an unrecoverable internal failure while processing the request. /// Clients can retry such requests immediately or after a waiting period. @@ -11329,85 +12388,66 @@ public virtual GetGameSessionLogUrlResponse GetGameSessionLogUrl(GetGameSessionL /// One or more parameter values in the request are invalid. Correct the invalid parameter /// values before retrying. /// - /// - /// The requested resources was not found. The resource was either not created yet or - /// deleted. - /// /// /// The client failed authentication. Clients should not retry such requests. /// - /// REST API Reference for GetGameSessionLogUrl Operation - public virtual Task GetGameSessionLogUrlAsync(GetGameSessionLogUrlRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + /// REST API Reference for ListBuilds Operation + public virtual Task ListBuildsAsync(ListBuildsRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { var options = new InvokeOptions(); - options.RequestMarshaller = GetGameSessionLogUrlRequestMarshaller.Instance; - options.ResponseUnmarshaller = GetGameSessionLogUrlResponseUnmarshaller.Instance; + options.RequestMarshaller = ListBuildsRequestMarshaller.Instance; + options.ResponseUnmarshaller = ListBuildsResponseUnmarshaller.Instance; - return InvokeAsync(request, options, cancellationToken); + return InvokeAsync(request, options, cancellationToken); } #endregion - #region GetInstanceAccess + #region ListCompute /// - /// Requests authorization to remotely connect to an instance in an Amazon GameLift managed - /// fleet. Use this operation to connect to instances with game servers that use Amazon - /// GameLift server SDK 4.x or earlier. To connect to instances with game servers that - /// use server SDK 5.x or later, call GetComputeAccess. + /// Retrieves information on the compute resources in an Amazon GameLift fleet. Use the + /// pagination parameters to retrieve results in a set of sequential pages. /// /// /// - /// To request access to an instance, specify IDs for the instance and the fleet it belongs - /// to. You can retrieve instance IDs for a fleet by calling DescribeInstances - /// with the fleet ID. - /// - /// - /// - /// If successful, this operation returns an IP address and credentials. The returned - /// credentials match the operating system of the instance, as follows: + /// Request options: /// ///
    • /// - /// For a Windows instance: returns a user name and secret (password) for use with a Windows - /// Remote Desktop client. + /// Retrieve a list of all computes in a fleet. Specify a fleet ID. /// ///
    • /// - /// For a Linux instance: returns a user name and secret (RSA private key) for use with - /// an SSH client. You must save the secret to a .pem file. If you're using the - /// CLI, see the example - /// Get credentials for a Linux instance for tips on automatically saving the secret - /// to a .pem file. + /// Retrieve a list of all computes in a specific fleet location. Specify a fleet ID and + /// location. /// ///
    /// - /// Learn more - /// - /// - /// - /// Remotely - /// connect to fleet instances + /// Results: /// /// /// - /// Debug - /// fleet issues + /// If successful, this operation returns information on a set of computes. Depending + /// on the type of fleet, the result includes the following information: /// - /// + ///
    • /// - /// Related actions + /// For managed EC2 fleets (compute type EC2), this operation returns information + /// about the EC2 instance. Compute names are EC2 instance IDs. /// - /// + ///
    • /// - /// All - /// APIs by task + /// For Anywhere fleets (compute type ANYWHERE), this operation returns compute + /// names and details as provided when the compute was registered with RegisterCompute. + /// This includes GameLiftServiceSdkEndpoint or GameLiftAgentEndpoint. /// + ///
    ///     - /// Container for the necessary parameters to execute the GetInstanceAccess service method. + /// Container for the necessary parameters to execute the ListCompute service method. /// - /// The response from the GetInstanceAccess service method, as returned by GameLift. + /// The response from the ListCompute service method, as returned by GameLift. /// /// The service encountered an unrecoverable internal failure while processing the request. /// Clients can retry such requests immediately or after a waiting period. @@ -11416,84 +12456,68 @@ public virtual GetGameSessionLogUrlResponse GetGameSessionLogUrl(GetGameSessionL /// One or more parameter values in the request are invalid. Correct the invalid parameter /// values before retrying. /// - /// - /// The requested resources was not found. The resource was either not created yet or - /// deleted. - /// /// /// The client failed authentication. Clients should not retry such requests. /// - /// REST API Reference for GetInstanceAccess Operation - public virtual GetInstanceAccessResponse GetInstanceAccess(GetInstanceAccessRequest request) + /// + /// The requested operation is not supported in the Region specified. + /// + /// REST API Reference for ListCompute Operation + public virtual ListComputeResponse ListCompute(ListComputeRequest request) { var options = new InvokeOptions(); - options.RequestMarshaller = GetInstanceAccessRequestMarshaller.Instance; - options.ResponseUnmarshaller = GetInstanceAccessResponseUnmarshaller.Instance; + options.RequestMarshaller = ListComputeRequestMarshaller.Instance; + options.ResponseUnmarshaller = ListComputeResponseUnmarshaller.Instance; - return Invoke(request, options); + return Invoke(request, options); } /// - /// Requests authorization to remotely connect to an instance in an Amazon GameLift managed - /// fleet. Use this operation to connect to instances with game servers that use Amazon - /// GameLift server SDK 4.x or earlier. To connect to instances with game servers that - /// use server SDK 5.x or later, call GetComputeAccess. + /// Retrieves information on the compute resources in an Amazon GameLift fleet. Use the + /// pagination parameters to retrieve results in a set of sequential pages. /// /// /// - /// To request access to an instance, specify IDs for the instance and the fleet it belongs - /// to. You can retrieve instance IDs for a fleet by calling DescribeInstances - /// with the fleet ID. - /// - /// - /// - /// If successful, this operation returns an IP address and credentials. The returned - /// credentials match the operating system of the instance, as follows: + /// Request options: /// ///
    • /// - /// For a Windows instance: returns a user name and secret (password) for use with a Windows - /// Remote Desktop client. + /// Retrieve a list of all computes in a fleet. Specify a fleet ID. /// ///
    • /// - /// For a Linux instance: returns a user name and secret (RSA private key) for use with - /// an SSH client. You must save the secret to a .pem file. If you're using the - /// CLI, see the example - /// Get credentials for a Linux instance for tips on automatically saving the secret - /// to a .pem file. + /// Retrieve a list of all computes in a specific fleet location. Specify a fleet ID and + /// location. /// ///
    /// - /// Learn more - /// - /// - /// - /// Remotely - /// connect to fleet instances + /// Results: /// /// /// - /// Debug - /// fleet issues + /// If successful, this operation returns information on a set of computes. Depending + /// on the type of fleet, the result includes the following information: /// - /// + ///
    • /// - /// Related actions + /// For managed EC2 fleets (compute type EC2), this operation returns information + /// about the EC2 instance. Compute names are EC2 instance IDs. /// - /// + ///
    • /// - /// All - /// APIs by task + /// For Anywhere fleets (compute type ANYWHERE), this operation returns compute + /// names and details as provided when the compute was registered with RegisterCompute. + /// This includes GameLiftServiceSdkEndpoint or GameLiftAgentEndpoint. /// + ///
    ///     - /// Container for the necessary parameters to execute the GetInstanceAccess service method. + /// Container for the necessary parameters to execute the ListCompute service method. /// /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// /// - /// The response from the GetInstanceAccess service method, as returned by GameLift. + /// The response from the ListCompute service method, as returned by GameLift. /// /// The service encountered an unrecoverable internal failure while processing the request. /// Clients can retry such requests immediately or after a waiting period. @@ -11502,50 +12526,70 @@ public virtual GetInstanceAccessResponse GetInstanceAccess(GetInstanceAccessRequ /// One or more parameter values in the request are invalid. Correct the invalid parameter /// values before retrying. /// - /// - /// The requested resources was not found. The resource was either not created yet or - /// deleted. - /// /// /// The client failed authentication. Clients should not retry such requests. /// - /// REST API Reference for GetInstanceAccess Operation - public virtual Task GetInstanceAccessAsync(GetInstanceAccessRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + /// + /// The requested operation is not supported in the Region specified. + /// + /// REST API Reference for ListCompute Operation + public virtual Task ListComputeAsync(ListComputeRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { var options = new InvokeOptions(); - options.RequestMarshaller = GetInstanceAccessRequestMarshaller.Instance; - options.ResponseUnmarshaller = GetInstanceAccessResponseUnmarshaller.Instance; + options.RequestMarshaller = ListComputeRequestMarshaller.Instance; + options.ResponseUnmarshaller = ListComputeResponseUnmarshaller.Instance; - return InvokeAsync(request, options, cancellationToken); + return InvokeAsync(request, options, cancellationToken); } #endregion - #region ListAliases + #region ListContainerFleets /// - /// Retrieves all aliases for this Amazon Web Services account. You can filter the result - /// set by alias name and/or routing strategy type. Use the pagination parameters to retrieve - /// results in sequential pages. + /// Retrieves a collection of container fleet resources in an Amazon Web Services Region. + /// For fleets that have multiple locations, this operation retrieves fleets based on + /// their home Region only. /// - /// + /// /// - /// Returned aliases are not listed in any particular order. + /// Request options /// - /// + ///
    • /// - /// Related actions + /// Get a list of all fleets. Call this operation without specifying a container group + /// definition. + /// + ///
    • + /// + /// Get a list of fleets filtered by container group definition. Provide the container + /// group definition name or ARN value. + /// + ///
    • + /// + /// To get a list of all Realtime Servers fleets with a specific configuration script, + /// provide the script ID. + /// + ///
    + /// + /// Use the pagination parameters to retrieve results as a set of sequential pages. /// /// /// - /// All - /// APIs by task + /// If successful, this operation returns a collection of container fleets that match + /// the request parameters. A NextToken value is also returned if there are more result + /// pages to retrieve. + /// + /// + /// + /// Fleet IDs are returned in no particular order. /// + /// ///     - /// Container for the necessary parameters to execute the ListAliases service method. + /// Container for the necessary parameters to execute the ListContainerFleets service method. /// - /// The response from the ListAliases service method, as returned by GameLift. + /// The response from the ListContainerFleets service method, as returned by GameLift. /// /// The service encountered an unrecoverable internal failure while processing the request. /// Clients can retry such requests immediately or after a waiting period. @@ -11557,42 +12601,66 @@ public virtual GetInstanceAccessResponse GetInstanceAccess(GetInstanceAccessRequ /// /// The client failed authentication. Clients should not retry such requests. /// - /// REST API Reference for ListAliases Operation - public virtual ListAliasesResponse ListAliases(ListAliasesRequest request) + /// + /// The requested operation is not supported in the Region specified. + /// + /// REST API Reference for ListContainerFleets Operation + public virtual ListContainerFleetsResponse ListContainerFleets(ListContainerFleetsRequest request) { var options = new InvokeOptions(); - options.RequestMarshaller = ListAliasesRequestMarshaller.Instance; - options.ResponseUnmarshaller = ListAliasesResponseUnmarshaller.Instance; + options.RequestMarshaller = ListContainerFleetsRequestMarshaller.Instance; + options.ResponseUnmarshaller = ListContainerFleetsResponseUnmarshaller.Instance; - return Invoke(request, options); + return Invoke(request, options); } /// - /// Retrieves all aliases for this Amazon Web Services account. You can filter the result - /// set by alias name and/or routing strategy type. Use the pagination parameters to retrieve - /// results in sequential pages. + /// Retrieves a collection of container fleet resources in an Amazon Web Services Region. + /// For fleets that have multiple locations, this operation retrieves fleets based on + /// their home Region only. /// - /// + /// /// - /// Returned aliases are not listed in any particular order. + /// Request options /// - /// + ///
    • /// - /// Related actions + /// Get a list of all fleets. Call this operation without specifying a container group + /// definition. + /// + ///
    • + /// + /// Get a list of fleets filtered by container group definition. Provide the container + /// group definition name or ARN value. + /// + ///
    • + /// + /// To get a list of all Realtime Servers fleets with a specific configuration script, + /// provide the script ID. + /// + ///
    + /// + /// Use the pagination parameters to retrieve results as a set of sequential pages. /// /// /// - /// All - /// APIs by task + /// If successful, this operation returns a collection of container fleets that match + /// the request parameters. A NextToken value is also returned if there are more result + /// pages to retrieve. + /// + /// + /// + /// Fleet IDs are returned in no particular order. /// + /// ///     - /// Container for the necessary parameters to execute the ListAliases service method. + /// Container for the necessary parameters to execute the ListContainerFleets service method. /// /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// /// - /// The response from the ListAliases service method, as returned by GameLift. + /// The response from the ListContainerFleets service method, as returned by GameLift. /// /// The service encountered an unrecoverable internal failure while processing the request. /// Clients can retry such requests immediately or after a waiting period. @@ -11604,49 +12672,75 @@ public virtual ListAliasesResponse ListAliases(ListAliasesRequest request) /// /// The client failed authentication. Clients should not retry such requests. /// - /// REST API Reference for ListAliases Operation - public virtual Task ListAliasesAsync(ListAliasesRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + /// + /// The requested operation is not supported in the Region specified. + /// + /// REST API Reference for ListContainerFleets Operation + public virtual Task ListContainerFleetsAsync(ListContainerFleetsRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { var options = new InvokeOptions(); - options.RequestMarshaller = ListAliasesRequestMarshaller.Instance; - options.ResponseUnmarshaller = ListAliasesResponseUnmarshaller.Instance; + options.RequestMarshaller = ListContainerFleetsRequestMarshaller.Instance; + options.ResponseUnmarshaller = ListContainerFleetsResponseUnmarshaller.Instance; - return InvokeAsync(request, options, cancellationToken); + return InvokeAsync(request, options, cancellationToken); } #endregion - #region ListBuilds - + #region ListContainerGroupDefinitions - /// - /// Retrieves build resources for all builds associated with the Amazon Web Services account - /// in use. You can limit results to builds that are in a specific status by using the - /// Status parameter. Use the pagination parameters to retrieve results in a set - /// of sequential pages. + + /// + /// Retrieves container group definitions for the Amazon Web Services account and Amazon + /// Web Services Region. Use the pagination parameters to retrieve results in a set of + /// sequential pages. /// - /// + /// /// - /// Build resources are not listed in any particular order. + /// This operation returns only the latest version of each definition. To retrieve all + /// versions of a container group definition, use ListContainerGroupDefinitionVersions. /// - /// + /// /// - /// Learn more + /// Request options: /// - /// + ///
    • /// - /// - /// Upload a Custom Server Build + /// Retrieve the most recent versions of all container group definitions. + /// + ///
    • + /// + /// Retrieve the most recent versions of all container group definitions, filtered by + /// type. Specify the container group type to filter on. + /// + ///
    + /// + /// Results: /// /// /// - /// All - /// APIs by task + /// If successful, this operation returns the complete properties of a set of container + /// group definition versions that match the request. + /// + /// + /// + /// This operation returns the list of container group definitions in no particular order. + /// + /// + /// + /// + /// Learn more + /// + /// ///     - /// Container for the necessary parameters to execute the ListBuilds service method. + /// Container for the necessary parameters to execute the ListContainerGroupDefinitions service method. /// - /// The response from the ListBuilds service method, as returned by GameLift. + /// The response from the ListContainerGroupDefinitions service method, as returned by GameLift. /// /// The service encountered an unrecoverable internal failure while processing the request. /// Clients can retry such requests immediately or after a waiting period. @@ -11658,48 +12752,74 @@ public virtual ListAliasesResponse ListAliases(ListAliasesRequest request) /// /// The client failed authentication. Clients should not retry such requests. /// - /// REST API Reference for ListBuilds Operation - public virtual ListBuildsResponse ListBuilds(ListBuildsRequest request) + /// + /// The requested operation is not supported in the Region specified. + /// + /// REST API Reference for ListContainerGroupDefinitions Operation + public virtual ListContainerGroupDefinitionsResponse ListContainerGroupDefinitions(ListContainerGroupDefinitionsRequest request) { var options = new InvokeOptions(); - options.RequestMarshaller = ListBuildsRequestMarshaller.Instance; - options.ResponseUnmarshaller = ListBuildsResponseUnmarshaller.Instance; + options.RequestMarshaller = ListContainerGroupDefinitionsRequestMarshaller.Instance; + options.ResponseUnmarshaller = ListContainerGroupDefinitionsResponseUnmarshaller.Instance; - return Invoke(request, options); + return Invoke(request, options); } /// - /// Retrieves build resources for all builds associated with the Amazon Web Services account - /// in use. You can limit results to builds that are in a specific status by using the - /// Status parameter. Use the pagination parameters to retrieve results in a set - /// of sequential pages. + /// Retrieves container group definitions for the Amazon Web Services account and Amazon + /// Web Services Region. Use the pagination parameters to retrieve results in a set of + /// sequential pages. /// - /// + /// /// - /// Build resources are not listed in any particular order. + /// This operation returns only the latest version of each definition. To retrieve all + /// versions of a container group definition, use ListContainerGroupDefinitionVersions. /// - /// + /// /// - /// Learn more + /// Request options: /// - /// + ///
    • /// - /// - /// Upload a Custom Server Build + /// Retrieve the most recent versions of all container group definitions. + /// + ///
    • + /// + /// Retrieve the most recent versions of all container group definitions, filtered by + /// type. Specify the container group type to filter on. + /// + ///
    + /// + /// Results: /// /// /// - /// All - /// APIs by task + /// If successful, this operation returns the complete properties of a set of container + /// group definition versions that match the request. + /// + /// + /// + /// This operation returns the list of container group definitions in no particular order. + /// + /// + /// + /// + /// Learn more + /// + /// ///     - /// Container for the necessary parameters to execute the ListBuilds service method. + /// Container for the necessary parameters to execute the ListContainerGroupDefinitions service method. /// /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// /// - /// The response from the ListBuilds service method, as returned by GameLift. + /// The response from the ListContainerGroupDefinitions service method, as returned by GameLift. /// /// The service encountered an unrecoverable internal failure while processing the request. /// Clients can retry such requests immediately or after a waiting period. @@ -11711,66 +12831,65 @@ public virtual ListBuildsResponse ListBuilds(ListBuildsRequest request) /// /// The client failed authentication. Clients should not retry such requests. /// - /// REST API Reference for ListBuilds Operation - public virtual Task ListBuildsAsync(ListBuildsRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + /// + /// The requested operation is not supported in the Region specified. + /// + /// REST API Reference for ListContainerGroupDefinitions Operation + public virtual Task ListContainerGroupDefinitionsAsync(ListContainerGroupDefinitionsRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { var options = new InvokeOptions(); - options.RequestMarshaller = ListBuildsRequestMarshaller.Instance; - options.ResponseUnmarshaller = ListBuildsResponseUnmarshaller.Instance; + options.RequestMarshaller = ListContainerGroupDefinitionsRequestMarshaller.Instance; + options.ResponseUnmarshaller = ListContainerGroupDefinitionsResponseUnmarshaller.Instance; - return InvokeAsync(request, options, cancellationToken); + return InvokeAsync(request, options, cancellationToken); } #endregion - #region ListCompute + #region ListContainerGroupDefinitionVersions /// - /// This operation has been expanded to use with the Amazon GameLift containers feature, - /// which is currently in public preview. + /// Retrieves all versions of a container group definition. Use the pagination parameters + /// to retrieve results in a set of sequential pages. /// /// /// - /// Retrieves information on the compute resources in an Amazon GameLift fleet. + /// Request options: /// - /// + ///
    • /// - /// To request a list of computes, specify the fleet ID. Use the pagination parameters - /// to retrieve results in a set of sequential pages. + /// Get all versions of a specified container group definition. Specify the container + /// group definition name or ARN value. (If the ARN value has a version number, it's ignored.) /// - /// + ///
    /// - /// You can filter the result set by location. + /// Results: /// /// /// - /// If successful, this operation returns information on all computes in the requested - /// fleet. Depending on the fleet's compute type, the result includes the following information: - /// + /// If successful, this operation returns the complete properties of a set of container + /// group definition versions that match the request. /// - ///
    • + /// /// - /// For EC2 fleets, this operation returns information about the EC2 instance. - /// Compute names are instance IDs. + /// This operation returns the list of container group definitions in descending version + /// order (latest first). /// - ///
    • + /// /// - /// For ANYWHERE fleets, this operation returns the compute names and details provided - /// when the compute was registered with RegisterCompute. The GameLiftServiceSdkEndpoint - /// or GameLiftAgentEndpoint is included. + /// Learn more /// - ///
    • + ///
      • /// - /// For CONTAINER fleets, this operation returns information about containers that - /// are registered as computes, and the instances they're running on. Compute names are - /// container names. + /// Manage + /// a container group definition /// ///
      ///
    - /// Container for the necessary parameters to execute the ListCompute service method. + /// Container for the necessary parameters to execute the ListContainerGroupDefinitionVersions service method. /// - /// The response from the ListCompute service method, as returned by GameLift. + /// The response from the ListContainerGroupDefinitionVersions service method, as returned by GameLift. /// /// The service encountered an unrecoverable internal failure while processing the request. /// Clients can retry such requests immediately or after a waiting period. @@ -11779,68 +12898,71 @@ public virtual ListBuildsResponse ListBuilds(ListBuildsRequest request) /// One or more parameter values in the request are invalid. Correct the invalid parameter /// values before retrying. /// + /// + /// The requested resources was not found. The resource was either not created yet or + /// deleted. + /// /// /// The client failed authentication. Clients should not retry such requests. /// - /// REST API Reference for ListCompute Operation - public virtual ListComputeResponse ListCompute(ListComputeRequest request) + /// + /// The requested operation is not supported in the Region specified. + /// + /// REST API Reference for ListContainerGroupDefinitionVersions Operation + public virtual ListContainerGroupDefinitionVersionsResponse ListContainerGroupDefinitionVersions(ListContainerGroupDefinitionVersionsRequest request) { var options = new InvokeOptions(); - options.RequestMarshaller = ListComputeRequestMarshaller.Instance; - options.ResponseUnmarshaller = ListComputeResponseUnmarshaller.Instance; + options.RequestMarshaller = ListContainerGroupDefinitionVersionsRequestMarshaller.Instance; + options.ResponseUnmarshaller = ListContainerGroupDefinitionVersionsResponseUnmarshaller.Instance; - return Invoke(request, options); + return Invoke(request, options); } /// - /// This operation has been expanded to use with the Amazon GameLift containers feature, - /// which is currently in public preview. + /// Retrieves all versions of a container group definition. Use the pagination parameters + /// to retrieve results in a set of sequential pages. /// /// /// - /// Retrieves information on the compute resources in an Amazon GameLift fleet. + /// Request options: /// - /// + ///
    • /// - /// To request a list of computes, specify the fleet ID. Use the pagination parameters - /// to retrieve results in a set of sequential pages. + /// Get all versions of a specified container group definition. Specify the container + /// group definition name or ARN value. (If the ARN value has a version number, it's ignored.) /// - /// + ///
    /// - /// You can filter the result set by location. + /// Results: /// /// /// - /// If successful, this operation returns information on all computes in the requested - /// fleet. Depending on the fleet's compute type, the result includes the following information: - /// + /// If successful, this operation returns the complete properties of a set of container + /// group definition versions that match the request. /// - ///
    • + /// /// - /// For EC2 fleets, this operation returns information about the EC2 instance. - /// Compute names are instance IDs. + /// This operation returns the list of container group definitions in descending version + /// order (latest first). /// - ///
    • + /// /// - /// For ANYWHERE fleets, this operation returns the compute names and details provided - /// when the compute was registered with RegisterCompute. The GameLiftServiceSdkEndpoint - /// or GameLiftAgentEndpoint is included. + /// Learn more /// - ///
    • + ///
      • /// - /// For CONTAINER fleets, this operation returns information about containers that - /// are registered as computes, and the instances they're running on. Compute names are - /// container names. + /// Manage + /// a container group definition /// ///
      ///
    - /// Container for the necessary parameters to execute the ListCompute service method. + /// Container for the necessary parameters to execute the ListContainerGroupDefinitionVersions service method. /// /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// /// - /// The response from the ListCompute service method, as returned by GameLift. + /// The response from the ListContainerGroupDefinitionVersions service method, as returned by GameLift. /// /// The service encountered an unrecoverable internal failure while processing the request. /// Clients can retry such requests immediately or after a waiting period. @@ -11849,54 +12971,75 @@ public virtual ListComputeResponse ListCompute(ListComputeRequest request) /// One or more parameter values in the request are invalid. Correct the invalid parameter /// values before retrying. /// + /// + /// The requested resources was not found. The resource was either not created yet or + /// deleted. + /// /// /// The client failed authentication. Clients should not retry such requests. /// - /// REST API Reference for ListCompute Operation - public virtual Task ListComputeAsync(ListComputeRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + /// + /// The requested operation is not supported in the Region specified. + /// + /// REST API Reference for ListContainerGroupDefinitionVersions Operation + public virtual Task ListContainerGroupDefinitionVersionsAsync(ListContainerGroupDefinitionVersionsRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { var options = new InvokeOptions(); - options.RequestMarshaller = ListComputeRequestMarshaller.Instance; - options.ResponseUnmarshaller = ListComputeResponseUnmarshaller.Instance; + options.RequestMarshaller = ListContainerGroupDefinitionVersionsRequestMarshaller.Instance; + options.ResponseUnmarshaller = ListContainerGroupDefinitionVersionsResponseUnmarshaller.Instance; - return InvokeAsync(request, options, cancellationToken); + return InvokeAsync(request, options, cancellationToken); } #endregion - #region ListContainerGroupDefinitions + #region ListFleetDeployments /// - /// This operation is used with the Amazon GameLift containers feature, which is currently - /// in public preview. + /// Retrieves a collection of container fleet deployments in an Amazon Web Services Region. + /// /// /// /// - /// Retrieves all container group definitions for the Amazon Web Services account and - /// Amazon Web Services Region that are currently in use. You can filter the result set - /// by the container groups' scheduling strategy. Use the pagination parameters to retrieve - /// results in a set of sequential pages. + /// Request options /// - /// + ///
    • /// - /// This operation returns the list of container group definitions in no particular order. + /// Get a list of all deployments. Call this operation without specifying a fleet ID. /// /// - /// + ///
    • /// - /// Learn more + /// Get a list of all deployments for a fleet. Specify the container fleet ID or ARN value. /// - /// + ///
    + /// + /// Use the pagination parameters to retrieve results as a set of sequential pages. + /// + /// + /// + /// Results + /// + /// + /// + /// If successful, this operation returns a list of deployments that match the request + /// parameters. A NextToken value is also returned if there are more result pages to retrieve. + /// + /// + /// + /// Fleet IDs are returned in no particular order. + /// + /// ///     - /// Container for the necessary parameters to execute the ListContainerGroupDefinitions service method. + /// Container for the necessary parameters to execute the ListFleetDeployments service method. /// - /// The response from the ListContainerGroupDefinitions service method, as returned by GameLift. + /// The response from the ListFleetDeployments service method, as returned by GameLift. /// /// The service encountered an unrecoverable internal failure while processing the request. /// Clients can retry such requests immediately or after a waiting period. @@ -11905,56 +13048,74 @@ public virtual ListComputeResponse ListCompute(ListComputeRequest request) /// One or more parameter values in the request are invalid. Correct the invalid parameter /// values before retrying. /// + /// + /// The requested resources was not found. The resource was either not created yet or + /// deleted. + /// /// /// The client failed authentication. Clients should not retry such requests. /// /// /// The requested operation is not supported in the Region specified. /// - /// REST API Reference for ListContainerGroupDefinitions Operation - public virtual ListContainerGroupDefinitionsResponse ListContainerGroupDefinitions(ListContainerGroupDefinitionsRequest request) + /// REST API Reference for ListFleetDeployments Operation + public virtual ListFleetDeploymentsResponse ListFleetDeployments(ListFleetDeploymentsRequest request) { var options = new InvokeOptions(); - options.RequestMarshaller = ListContainerGroupDefinitionsRequestMarshaller.Instance; - options.ResponseUnmarshaller = ListContainerGroupDefinitionsResponseUnmarshaller.Instance; + options.RequestMarshaller = ListFleetDeploymentsRequestMarshaller.Instance; + options.ResponseUnmarshaller = ListFleetDeploymentsResponseUnmarshaller.Instance; - return Invoke(request, options); + return Invoke(request, options); } /// - /// This operation is used with the Amazon GameLift containers feature, which is currently - /// in public preview. + /// Retrieves a collection of container fleet deployments in an Amazon Web Services Region. + /// /// /// /// - /// Retrieves all container group definitions for the Amazon Web Services account and - /// Amazon Web Services Region that are currently in use. You can filter the result set - /// by the container groups' scheduling strategy. Use the pagination parameters to retrieve - /// results in a set of sequential pages. + /// Request options /// - /// + ///
    • /// - /// This operation returns the list of container group definitions in no particular order. + /// Get a list of all deployments. Call this operation without specifying a fleet ID. /// /// - /// + ///
    • /// - /// Learn more + /// Get a list of all deployments for a fleet. Specify the container fleet ID or ARN value. /// - /// + ///
    + /// + /// Use the pagination parameters to retrieve results as a set of sequential pages. + /// + /// + /// + /// Results + /// + /// + /// + /// If successful, this operation returns a list of deployments that match the request + /// parameters. A NextToken value is also returned if there are more result pages to retrieve. + /// + /// + /// + /// Fleet IDs are returned in no particular order. + /// + /// ///     - /// Container for the necessary parameters to execute the ListContainerGroupDefinitions service method. + /// Container for the necessary parameters to execute the ListFleetDeployments service method. /// /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// /// - /// The response from the ListContainerGroupDefinitions service method, as returned by GameLift. + /// The response from the ListFleetDeployments service method, as returned by GameLift. /// /// The service encountered an unrecoverable internal failure while processing the request. /// Clients can retry such requests immediately or after a waiting period. @@ -11963,20 +13124,24 @@ public virtual ListContainerGroupDefinitionsResponse ListContainerGroupDefinitio /// One or more parameter values in the request are invalid. Correct the invalid parameter /// values before retrying. /// + /// + /// The requested resources was not found. The resource was either not created yet or + /// deleted. + /// /// /// The client failed authentication. Clients should not retry such requests. /// /// /// The requested operation is not supported in the Region specified. /// - /// REST API Reference for ListContainerGroupDefinitions Operation - public virtual Task ListContainerGroupDefinitionsAsync(ListContainerGroupDefinitionsRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + /// REST API Reference for ListFleetDeployments Operation + public virtual Task ListFleetDeploymentsAsync(ListFleetDeploymentsRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { var options = new InvokeOptions(); - options.RequestMarshaller = ListContainerGroupDefinitionsRequestMarshaller.Instance; - options.ResponseUnmarshaller = ListContainerGroupDefinitionsResponseUnmarshaller.Instance; + options.RequestMarshaller = ListFleetDeploymentsRequestMarshaller.Instance; + options.ResponseUnmarshaller = ListFleetDeploymentsResponseUnmarshaller.Instance; - return InvokeAsync(request, options, cancellationToken); + return InvokeAsync(request, options, cancellationToken); } #endregion @@ -11985,16 +13150,11 @@ public virtual ListContainerGroupDefinitionsResponse ListContainerGroupDefinitio /// - /// This operation has been expanded to use with the Amazon GameLift containers feature, - /// which is currently in public preview. - /// - /// - /// /// Retrieves a collection of fleet resources in an Amazon Web Services Region. You can /// filter the result set to find only those fleets that are deployed with a specific /// build or script. For fleets that have multiple locations, this operation retrieves /// fleets based on their home Region only. - /// + /// /// /// /// You can use operation in the following ways: @@ -12013,11 +13173,6 @@ public virtual ListContainerGroupDefinitionsResponse ListContainerGroupDefinitio /// To get a list of all Realtime Servers fleets with a specific configuration script, /// provide the script ID. /// - ///
  • - /// - /// To get a list of all fleets with a specific container group definition, provide the - /// ContainerGroupDefinition ID. - /// ///
    • /// /// Use the pagination parameters to retrieve results as a set of sequential pages. @@ -12063,16 +13218,11 @@ public virtual ListFleetsResponse ListFleets(ListFleetsRequest request) /// - /// This operation has been expanded to use with the Amazon GameLift containers feature, - /// which is currently in public preview. - /// - /// - /// /// Retrieves a collection of fleet resources in an Amazon Web Services Region. You can /// filter the result set to find only those fleets that are deployed with a specific /// build or script. For fleets that have multiple locations, this operation retrieves /// fleets based on their home Region only. - /// + /// /// /// /// You can use operation in the following ways: @@ -12091,11 +13241,6 @@ public virtual ListFleetsResponse ListFleets(ListFleetsRequest request) /// To get a list of all Realtime Servers fleets with a specific configuration script, /// provide the script ID. /// - ///
  • - /// - /// To get a list of all fleets with a specific container group definition, provide the - /// ContainerGroupDefinition ID. - /// ///
    • /// /// Use the pagination parameters to retrieve results as a set of sequential pages. @@ -12526,6 +13671,9 @@ public virtual ListScriptsResponse ListScripts(ListScriptsRequest request) /// The requested tagging operation did not succeed. This may be due to invalid tag format /// or the maximum tag limit may have been exceeded. Resolve the issue before retrying. /// + /// + /// The requested operation is not supported in the Region specified. + /// /// REST API Reference for ListTagsForResource Operation public virtual ListTagsForResourceResponse ListTagsForResource(ListTagsForResourceRequest request) { @@ -12593,6 +13741,9 @@ public virtual ListTagsForResourceResponse ListTagsForResource(ListTagsForResour /// The requested tagging operation did not succeed. This may be due to invalid tag format /// or the maximum tag limit may have been exceeded. Resolve the issue before retrying. /// + /// + /// The requested operation is not supported in the Region specified. + /// /// REST API Reference for ListTagsForResource Operation public virtual Task ListTagsForResourceAsync(ListTagsForResourceRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { @@ -12723,6 +13874,9 @@ public virtual ListTagsForResourceResponse ListTagsForResource(ListTagsForResour /// /// The client failed authentication. Clients should not retry such requests. /// + /// + /// The requested operation is not supported in the Region specified. + /// /// REST API Reference for PutScalingPolicy Operation public virtual PutScalingPolicyResponse PutScalingPolicy(PutScalingPolicyRequest request) { @@ -12852,6 +14006,9 @@ public virtual PutScalingPolicyResponse PutScalingPolicy(PutScalingPolicyRequest /// /// The client failed authentication. Clients should not retry such requests. /// + /// + /// The requested operation is not supported in the Region specified. + /// /// REST API Reference for PutScalingPolicy Operation public virtual Task PutScalingPolicyAsync(PutScalingPolicyRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { @@ -12868,19 +14025,13 @@ public virtual PutScalingPolicyResponse PutScalingPolicy(PutScalingPolicyRequest /// - /// This operation has been expanded to use with the Amazon GameLift containers feature, - /// which is currently in public preview. + /// Registers a compute resource in an Amazon GameLift Anywhere fleet. /// /// /// - /// Registers a compute resource in an Amazon GameLift fleet. Register computes with an - /// Amazon GameLift Anywhere fleet or a container fleet. - /// - /// - /// - /// For an Anywhere fleet or a container fleet that's running the Amazon GameLift Agent, - /// the Agent handles all compute registry tasks for you. For an Anywhere fleet that doesn't - /// use the Agent, call this operation to register fleet computes. + /// For an Anywhere fleet that's running the Amazon GameLift Agent, the Agent handles + /// all compute registry tasks for you. For an Anywhere fleet that doesn't use the Agent, + /// call this operation to register fleet computes. /// /// /// @@ -12962,19 +14113,13 @@ public virtual RegisterComputeResponse RegisterCompute(RegisterComputeRequest re /// - /// This operation has been expanded to use with the Amazon GameLift containers feature, - /// which is currently in public preview. + /// Registers a compute resource in an Amazon GameLift Anywhere fleet. /// /// /// - /// Registers a compute resource in an Amazon GameLift fleet. Register computes with an - /// Amazon GameLift Anywhere fleet or a container fleet. - /// - /// - /// - /// For an Anywhere fleet or a container fleet that's running the Amazon GameLift Agent, - /// the Agent handles all compute registry tasks for you. For an Anywhere fleet that doesn't - /// use the Agent, call this operation to register fleet computes. + /// For an Anywhere fleet that's running the Amazon GameLift Agent, the Agent handles + /// all compute registry tasks for you. For an Anywhere fleet that doesn't use the Agent, + /// call this operation to register fleet computes. /// /// /// @@ -14283,8 +15428,7 @@ public virtual StartFleetActionsResponse StartFleetActions(StartFleetActionsRequ /// To track the status of a placement request, call DescribeGameSessionPlacement /// and check the request's status. If the status is FULFILLED, a new game session /// has been created and a game session ARN and Region are referenced. If the placement - /// request times out, you can resubmit the request or retry it with a different queue. - /// + /// request times out, submit a new request to the same queue or a different queue. /// /// /// Container for the necessary parameters to execute the StartGameSessionPlacement service method. @@ -14375,8 +15519,7 @@ public virtual StartGameSessionPlacementResponse StartGameSessionPlacement(Start /// To track the status of a placement request, call DescribeGameSessionPlacement /// and check the request's status. If the status is FULFILLED, a new game session /// has been created and a game session ARN and Region are referenced. If the placement - /// request times out, you can resubmit the request or retry it with a different queue. - /// + /// request times out, submit a new request to the same queue or a different queue. /// /// /// Container for the necessary parameters to execute the StartGameSessionPlacement service method. @@ -15289,6 +16432,9 @@ public virtual SuspendGameServerGroupResponse SuspendGameServerGroup(SuspendGame /// The requested tagging operation did not succeed. This may be due to invalid tag format /// or the maximum tag limit may have been exceeded. Resolve the issue before retrying. /// + /// + /// The requested operation is not supported in the Region specified. + /// /// REST API Reference for TagResource Operation public virtual TagResourceResponse TagResource(TagResourceRequest request) { @@ -15359,6 +16505,9 @@ public virtual TagResourceResponse TagResource(TagResourceRequest request) /// The requested tagging operation did not succeed. This may be due to invalid tag format /// or the maximum tag limit may have been exceeded. Resolve the issue before retrying. /// + /// + /// The requested operation is not supported in the Region specified. + /// /// REST API Reference for TagResource Operation public virtual Task TagResourceAsync(TagResourceRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { @@ -15430,6 +16579,9 @@ public virtual TagResourceResponse TagResource(TagResourceRequest request) /// The requested tagging operation did not succeed. This may be due to invalid tag format /// or the maximum tag limit may have been exceeded. Resolve the issue before retrying. /// + /// + /// The requested operation is not supported in the Region specified. + /// /// REST API Reference for UntagResource Operation public virtual UntagResourceResponse UntagResource(UntagResourceRequest request) { @@ -15449,28 +16601,232 @@ public virtual UntagResourceResponse UntagResource(UntagResourceRequest request) /// /// /// - /// To remove a tag from a resource, specify the unique ARN value for the resource and - /// provide a string list containing one or more tags to remove. This operation succeeds - /// even if the list includes tags that aren't assigned to the resource. - /// - /// - /// + /// To remove a tag from a resource, specify the unique ARN value for the resource and + /// provide a string list containing one or more tags to remove. This operation succeeds + /// even if the list includes tags that aren't assigned to the resource. + /// + /// + /// + /// Learn more + /// + /// + /// + /// Tagging + /// Amazon Web Services Resources in the Amazon Web Services General Reference + /// + /// + /// + /// + /// + /// Amazon Web Services Tagging Strategies + /// + /// + /// + /// Related actions + /// + /// + /// + /// All + /// APIs by task + /// + ///     + /// Container for the necessary parameters to execute the UntagResource service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the UntagResource service method, as returned by GameLift. + /// + /// The service encountered an unrecoverable internal failure while processing the request. + /// Clients can retry such requests immediately or after a waiting period. + /// + /// + /// One or more parameter values in the request are invalid. Correct the invalid parameter + /// values before retrying. + /// + /// + /// The requested resources was not found. The resource was either not created yet or + /// deleted. + /// + /// + /// The requested tagging operation did not succeed. This may be due to invalid tag format + /// or the maximum tag limit may have been exceeded. Resolve the issue before retrying. + /// + /// + /// The requested operation is not supported in the Region specified. + /// + /// REST API Reference for UntagResource Operation + public virtual Task UntagResourceAsync(UntagResourceRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = UntagResourceRequestMarshaller.Instance; + options.ResponseUnmarshaller = UntagResourceResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + + #region UpdateAlias + + + /// + /// Updates properties for an alias. Specify the unique identifier of the alias to be + /// updated and the new property values. When reassigning an alias to a new fleet, provide + /// an updated routing strategy. If successful, the updated alias record is returned. + /// + /// + /// + /// Related actions + /// + /// + /// + /// All + /// APIs by task + /// + /// + /// Container for the necessary parameters to execute the UpdateAlias service method. + /// + /// The response from the UpdateAlias service method, as returned by GameLift. + /// + /// The service encountered an unrecoverable internal failure while processing the request. + /// Clients can retry such requests immediately or after a waiting period. + /// + /// + /// One or more parameter values in the request are invalid. Correct the invalid parameter + /// values before retrying. + /// + /// + /// The requested resources was not found. The resource was either not created yet or + /// deleted. + /// + /// + /// The client failed authentication. Clients should not retry such requests. + /// + /// REST API Reference for UpdateAlias Operation + public virtual UpdateAliasResponse UpdateAlias(UpdateAliasRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = UpdateAliasRequestMarshaller.Instance; + options.ResponseUnmarshaller = UpdateAliasResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// Updates properties for an alias. Specify the unique identifier of the alias to be + /// updated and the new property values. When reassigning an alias to a new fleet, provide + /// an updated routing strategy. If successful, the updated alias record is returned. + /// + /// + /// + /// Related actions + /// + /// + /// + /// All + /// APIs by task + /// + /// + /// Container for the necessary parameters to execute the UpdateAlias service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the UpdateAlias service method, as returned by GameLift. + /// + /// The service encountered an unrecoverable internal failure while processing the request. + /// Clients can retry such requests immediately or after a waiting period. + /// + /// + /// One or more parameter values in the request are invalid. Correct the invalid parameter + /// values before retrying. + /// + /// + /// The requested resources was not found. The resource was either not created yet or + /// deleted. + /// + /// + /// The client failed authentication. Clients should not retry such requests. + /// + /// REST API Reference for UpdateAlias Operation + public virtual Task UpdateAliasAsync(UpdateAliasRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = UpdateAliasRequestMarshaller.Instance; + options.ResponseUnmarshaller = UpdateAliasResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + + #region UpdateBuild + + + /// + /// Updates metadata in a build resource, including the build name and version. To update + /// the metadata, specify the build ID to update and provide the new values. If successful, + /// a build object containing the updated metadata is returned. + /// + /// + /// + /// Learn more + /// + /// + /// + /// + /// Upload a Custom Server Build + /// + /// + /// + /// All + /// APIs by task + /// + /// + /// Container for the necessary parameters to execute the UpdateBuild service method. + /// + /// The response from the UpdateBuild service method, as returned by GameLift. + /// + /// The service encountered an unrecoverable internal failure while processing the request. + /// Clients can retry such requests immediately or after a waiting period. + /// + /// + /// One or more parameter values in the request are invalid. Correct the invalid parameter + /// values before retrying. + /// + /// + /// The requested resources was not found. The resource was either not created yet or + /// deleted. + /// + /// + /// The client failed authentication. Clients should not retry such requests. + /// + /// REST API Reference for UpdateBuild Operation + public virtual UpdateBuildResponse UpdateBuild(UpdateBuildRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = UpdateBuildRequestMarshaller.Instance; + options.ResponseUnmarshaller = UpdateBuildResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// Updates metadata in a build resource, including the build name and version. To update + /// the metadata, specify the build ID to update and provide the new values. If successful, + /// a build object containing the updated metadata is returned. + /// + /// + /// /// Learn more /// /// /// - /// Tagging - /// Amazon Web Services Resources in the Amazon Web Services General Reference - /// - /// - /// - /// - /// - /// Amazon Web Services Tagging Strategies - /// - /// - /// - /// Related actions + /// + /// Upload a Custom Server Build /// /// /// @@ -15478,12 +16834,12 @@ public virtual UntagResourceResponse UntagResource(UntagResourceRequest request) /// APIs by task /// /// - /// Container for the necessary parameters to execute the UntagResource service method. + /// Container for the necessary parameters to execute the UpdateBuild service method. /// /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// /// - /// The response from the UntagResource service method, as returned by GameLift. + /// The response from the UpdateBuild service method, as returned by GameLift. /// /// The service encountered an unrecoverable internal failure while processing the request. /// Clients can retry such requests immediately or after a waiting period. @@ -15496,43 +16852,98 @@ public virtual UntagResourceResponse UntagResource(UntagResourceRequest request) /// The requested resources was not found. The resource was either not created yet or /// deleted. /// - /// - /// The requested tagging operation did not succeed. This may be due to invalid tag format - /// or the maximum tag limit may have been exceeded. Resolve the issue before retrying. + /// + /// The client failed authentication. Clients should not retry such requests. /// - /// REST API Reference for UntagResource Operation - public virtual Task UntagResourceAsync(UntagResourceRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + /// REST API Reference for UpdateBuild Operation + public virtual Task UpdateBuildAsync(UpdateBuildRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { var options = new InvokeOptions(); - options.RequestMarshaller = UntagResourceRequestMarshaller.Instance; - options.ResponseUnmarshaller = UntagResourceResponseUnmarshaller.Instance; + options.RequestMarshaller = UpdateBuildRequestMarshaller.Instance; + options.ResponseUnmarshaller = UpdateBuildResponseUnmarshaller.Instance; - return InvokeAsync(request, options, cancellationToken); + return InvokeAsync(request, options, cancellationToken); } #endregion - #region UpdateAlias + #region UpdateContainerFleet /// - /// Updates properties for an alias. Specify the unique identifier of the alias to be - /// updated and the new property values. When reassigning an alias to a new fleet, provide - /// an updated routing strategy. If successful, the updated alias record is returned. + /// Updates the properties of a managed container fleet. Depending on the properties being + /// updated, this operation might initiate a fleet deployment. You can track deployments + /// for a fleet using DescribeFleetDeployment. /// /// /// - /// Related actions + /// Request options /// /// /// - /// All - /// APIs by task + /// As with CreateContainerFleet, many fleet properties use common defaults or are calculated + /// based on the fleet's container group definitions. + /// + ///
    • + /// + /// Update fleet properties that result in a fleet deployment. Include only those properties + /// that you want to change. Specify deployment configuration settings. + /// + ///
    • + /// + /// Update fleet properties that don't result in a fleet deployment. Include only those + /// properties that you want to change. + /// + ///
    + /// + /// Changes to the following properties initiate a fleet deployment: + /// + ///
    • + /// + /// GameServerContainerGroupDefinition + /// + ///
    • + /// + /// PerInstanceContainerGroupDefinition + /// + ///
    • + /// + /// GameServerContainerGroupsPerInstance + /// + ///
    • + /// + /// InstanceInboundPermissions + /// + ///
    • + /// + /// InstanceConnectionPortRange + /// + ///
    • + /// + /// LogConfiguration + /// + ///
    + /// + /// Results + /// + /// + /// + /// If successful, this operation updates the container fleet resource, and might initiate + /// a new deployment of fleet resources using the deployment configuration provided. A + /// deployment replaces existing fleet instances with new instances that are deployed + /// with the updated fleet properties. The fleet is placed in UPDATING status until + /// the deployment is complete, then return to ACTIVE. + /// + /// + /// + /// You can have only one update deployment active at a time for a fleet. If a second + /// update request initiates a deployment while another deployment is in progress, the + /// first deployment is cancelled. /// ///     - /// Container for the necessary parameters to execute the UpdateAlias service method. + /// Container for the necessary parameters to execute the UpdateContainerFleet service method. /// - /// The response from the UpdateAlias service method, as returned by GameLift. + /// The response from the UpdateContainerFleet service method, as returned by GameLift. /// /// The service encountered an unrecoverable internal failure while processing the request. /// Clients can retry such requests immediately or after a waiting period. @@ -15541,45 +16952,113 @@ public virtual UntagResourceResponse UntagResource(UntagResourceRequest request) /// One or more parameter values in the request are invalid. Correct the invalid parameter /// values before retrying. /// + /// + /// The requested operation would cause the resource to exceed the allowed service limit. + /// Resolve the issue before retrying. + /// /// /// The requested resources was not found. The resource was either not created yet or /// deleted. /// + /// + /// The operation failed because Amazon GameLift has not yet finished validating this + /// compute. We recommend attempting 8 to 10 retries over 3 to 5 minutes with exponential + /// backoffs and jitter. + /// /// /// The client failed authentication. Clients should not retry such requests. /// - /// REST API Reference for UpdateAlias Operation - public virtual UpdateAliasResponse UpdateAlias(UpdateAliasRequest request) + /// + /// The requested operation is not supported in the Region specified. + /// + /// REST API Reference for UpdateContainerFleet Operation + public virtual UpdateContainerFleetResponse UpdateContainerFleet(UpdateContainerFleetRequest request) { var options = new InvokeOptions(); - options.RequestMarshaller = UpdateAliasRequestMarshaller.Instance; - options.ResponseUnmarshaller = UpdateAliasResponseUnmarshaller.Instance; + options.RequestMarshaller = UpdateContainerFleetRequestMarshaller.Instance; + options.ResponseUnmarshaller = UpdateContainerFleetResponseUnmarshaller.Instance; - return Invoke(request, options); + return Invoke(request, options); } /// - /// Updates properties for an alias. Specify the unique identifier of the alias to be - /// updated and the new property values. When reassigning an alias to a new fleet, provide - /// an updated routing strategy. If successful, the updated alias record is returned. + /// Updates the properties of a managed container fleet. Depending on the properties being + /// updated, this operation might initiate a fleet deployment. You can track deployments + /// for a fleet using DescribeFleetDeployment. /// /// /// - /// Related actions + /// Request options /// /// /// - /// All - /// APIs by task + /// As with CreateContainerFleet, many fleet properties use common defaults or are calculated + /// based on the fleet's container group definitions. + /// + ///
    • + /// + /// Update fleet properties that result in a fleet deployment. Include only those properties + /// that you want to change. Specify deployment configuration settings. + /// + ///
    • + /// + /// Update fleet properties that don't result in a fleet deployment. Include only those + /// properties that you want to change. + /// + ///
    + /// + /// Changes to the following properties initiate a fleet deployment: + /// + ///
    • + /// + /// GameServerContainerGroupDefinition + /// + ///
    • + /// + /// PerInstanceContainerGroupDefinition + /// + ///
    • + /// + /// GameServerContainerGroupsPerInstance + /// + ///
    • + /// + /// InstanceInboundPermissions + /// + ///
    • + /// + /// InstanceConnectionPortRange + /// + ///
    • + /// + /// LogConfiguration + /// + ///
    + /// + /// Results + /// + /// + /// + /// If successful, this operation updates the container fleet resource, and might initiate + /// a new deployment of fleet resources using the deployment configuration provided. A + /// deployment replaces existing fleet instances with new instances that are deployed + /// with the updated fleet properties. The fleet is placed in UPDATING status until + /// the deployment is complete, then return to ACTIVE. + /// + /// + /// + /// You can have only one update deployment active at a time for a fleet. If a second + /// update request initiates a deployment while another deployment is in progress, the + /// first deployment is cancelled. /// ///     - /// Container for the necessary parameters to execute the UpdateAlias service method. + /// Container for the necessary parameters to execute the UpdateContainerFleet service method. /// /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// /// - /// The response from the UpdateAlias service method, as returned by GameLift. + /// The response from the UpdateContainerFleet service method, as returned by GameLift. /// /// The service encountered an unrecoverable internal failure while processing the request. /// Clients can retry such requests immediately or after a waiting period. @@ -15588,51 +17067,101 @@ public virtual UpdateAliasResponse UpdateAlias(UpdateAliasRequest request) /// One or more parameter values in the request are invalid. Correct the invalid parameter /// values before retrying. /// + /// + /// The requested operation would cause the resource to exceed the allowed service limit. + /// Resolve the issue before retrying. + /// /// /// The requested resources was not found. The resource was either not created yet or /// deleted. /// + /// + /// The operation failed because Amazon GameLift has not yet finished validating this + /// compute. We recommend attempting 8 to 10 retries over 3 to 5 minutes with exponential + /// backoffs and jitter. + /// /// /// The client failed authentication. Clients should not retry such requests. /// - /// REST API Reference for UpdateAlias Operation - public virtual Task UpdateAliasAsync(UpdateAliasRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + /// + /// The requested operation is not supported in the Region specified. + /// + /// REST API Reference for UpdateContainerFleet Operation + public virtual Task UpdateContainerFleetAsync(UpdateContainerFleetRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { var options = new InvokeOptions(); - options.RequestMarshaller = UpdateAliasRequestMarshaller.Instance; - options.ResponseUnmarshaller = UpdateAliasResponseUnmarshaller.Instance; + options.RequestMarshaller = UpdateContainerFleetRequestMarshaller.Instance; + options.ResponseUnmarshaller = UpdateContainerFleetResponseUnmarshaller.Instance; - return InvokeAsync(request, options, cancellationToken); + return InvokeAsync(request, options, cancellationToken); } #endregion - #region UpdateBuild + #region UpdateContainerGroupDefinition /// - /// Updates metadata in a build resource, including the build name and version. To update - /// the metadata, specify the build ID to update and provide the new values. If successful, - /// a build object containing the updated metadata is returned. + /// Updates properties in an existing container group definition. This operation doesn't + /// replace the definition. Instead, it creates a new version of the definition and saves + /// it separately. You can access all versions that you choose to retain. /// /// /// - /// Learn more + /// The only property you can't update is the container group type. /// /// /// - /// - /// Upload a Custom Server Build + /// Request options: + /// + ///
    • + /// + /// Update based on the latest version of the container group definition. Specify the + /// container group definition name only, or use an ARN value without a version number. + /// Provide updated values for the properties that you want to change only. All other + /// values remain the same as the latest version. + /// + ///
    • + /// + /// Update based on a specific version of the container group definition. Specify the + /// container group definition name and a source version number, or use an ARN value with + /// a version number. Provide updated values for the properties that you want to change + /// only. All other values remain the same as the source version. + /// + ///
    • + /// + /// Change a game server container definition. Provide the updated container definition. + /// + ///
    • + /// + /// Add or change a support container definition. Provide a complete set of container + /// definitions, including the updated definition. + /// + ///
    • + /// + /// Remove a support container definition. Provide a complete set of container definitions, + /// excluding the definition to remove. If the container group has only one support container + /// definition, provide an empty set. + /// + ///
    + /// + /// Results: /// /// /// - /// All - /// APIs by task + /// If successful, this operation returns the complete properties of the new container + /// group definition version. + /// + /// + /// + /// If the container group definition version is used in an active fleets, the update + /// automatically initiates a new fleet deployment of the new version. You can track a + /// fleet's deployments using ListFleetDeployments. /// ///     - /// Container for the necessary parameters to execute the UpdateBuild service method. + /// Container for the necessary parameters to execute the UpdateContainerGroupDefinition service method. /// - /// The response from the UpdateBuild service method, as returned by GameLift. + /// The response from the UpdateContainerGroupDefinition service method, as returned by GameLift. /// /// The service encountered an unrecoverable internal failure while processing the request. /// Clients can retry such requests immediately or after a waiting period. @@ -15641,6 +17170,10 @@ public virtual UpdateAliasResponse UpdateAlias(UpdateAliasRequest request) /// One or more parameter values in the request are invalid. Correct the invalid parameter /// values before retrying. /// + /// + /// The requested operation would cause the resource to exceed the allowed service limit. + /// Resolve the issue before retrying. + /// /// /// The requested resources was not found. The resource was either not created yet or /// deleted. @@ -15648,43 +17181,84 @@ public virtual UpdateAliasResponse UpdateAlias(UpdateAliasRequest request) /// /// The client failed authentication. Clients should not retry such requests. /// - /// REST API Reference for UpdateBuild Operation - public virtual UpdateBuildResponse UpdateBuild(UpdateBuildRequest request) + /// + /// The requested operation is not supported in the Region specified. + /// + /// REST API Reference for UpdateContainerGroupDefinition Operation + public virtual UpdateContainerGroupDefinitionResponse UpdateContainerGroupDefinition(UpdateContainerGroupDefinitionRequest request) { var options = new InvokeOptions(); - options.RequestMarshaller = UpdateBuildRequestMarshaller.Instance; - options.ResponseUnmarshaller = UpdateBuildResponseUnmarshaller.Instance; + options.RequestMarshaller = UpdateContainerGroupDefinitionRequestMarshaller.Instance; + options.ResponseUnmarshaller = UpdateContainerGroupDefinitionResponseUnmarshaller.Instance; - return Invoke(request, options); + return Invoke(request, options); } /// - /// Updates metadata in a build resource, including the build name and version. To update - /// the metadata, specify the build ID to update and provide the new values. If successful, - /// a build object containing the updated metadata is returned. + /// Updates properties in an existing container group definition. This operation doesn't + /// replace the definition. Instead, it creates a new version of the definition and saves + /// it separately. You can access all versions that you choose to retain. /// /// /// - /// Learn more + /// The only property you can't update is the container group type. /// /// /// - /// - /// Upload a Custom Server Build + /// Request options: + /// + ///
    • + /// + /// Update based on the latest version of the container group definition. Specify the + /// container group definition name only, or use an ARN value without a version number. + /// Provide updated values for the properties that you want to change only. All other + /// values remain the same as the latest version. + /// + ///
    • + /// + /// Update based on a specific version of the container group definition. Specify the + /// container group definition name and a source version number, or use an ARN value with + /// a version number. Provide updated values for the properties that you want to change + /// only. All other values remain the same as the source version. + /// + ///
    • + /// + /// Change a game server container definition. Provide the updated container definition. + /// + ///
    • + /// + /// Add or change a support container definition. Provide a complete set of container + /// definitions, including the updated definition. + /// + ///
    • + /// + /// Remove a support container definition. Provide a complete set of container definitions, + /// excluding the definition to remove. If the container group has only one support container + /// definition, provide an empty set. + /// + ///
    + /// + /// Results: /// /// /// - /// All - /// APIs by task + /// If successful, this operation returns the complete properties of the new container + /// group definition version. + /// + /// + /// + /// If the container group definition version is used in an active fleets, the update + /// automatically initiates a new fleet deployment of the new version. You can track a + /// fleet's deployments using ListFleetDeployments. /// ///     - /// Container for the necessary parameters to execute the UpdateBuild service method. + /// Container for the necessary parameters to execute the UpdateContainerGroupDefinition service method. /// /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// /// - /// The response from the UpdateBuild service method, as returned by GameLift. + /// The response from the UpdateContainerGroupDefinition service method, as returned by GameLift. /// /// The service encountered an unrecoverable internal failure while processing the request. /// Clients can retry such requests immediately or after a waiting period. @@ -15693,6 +17267,10 @@ public virtual UpdateBuildResponse UpdateBuild(UpdateBuildRequest request) /// One or more parameter values in the request are invalid. Correct the invalid parameter /// values before retrying. /// + /// + /// The requested operation would cause the resource to exceed the allowed service limit. + /// Resolve the issue before retrying. + /// /// /// The requested resources was not found. The resource was either not created yet or /// deleted. @@ -15700,14 +17278,17 @@ public virtual UpdateBuildResponse UpdateBuild(UpdateBuildRequest request) /// /// The client failed authentication. Clients should not retry such requests. /// - /// REST API Reference for UpdateBuild Operation - public virtual Task UpdateBuildAsync(UpdateBuildRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + /// + /// The requested operation is not supported in the Region specified. + /// + /// REST API Reference for UpdateContainerGroupDefinition Operation + public virtual Task UpdateContainerGroupDefinitionAsync(UpdateContainerGroupDefinitionRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { var options = new InvokeOptions(); - options.RequestMarshaller = UpdateBuildRequestMarshaller.Instance; - options.ResponseUnmarshaller = UpdateBuildResponseUnmarshaller.Instance; + options.RequestMarshaller = UpdateContainerGroupDefinitionRequestMarshaller.Instance; + options.ResponseUnmarshaller = UpdateContainerGroupDefinitionResponseUnmarshaller.Instance; - return InvokeAsync(request, options, cancellationToken); + return InvokeAsync(request, options, cancellationToken); } #endregion @@ -15845,19 +17426,14 @@ public virtual UpdateFleetAttributesResponse UpdateFleetAttributes(UpdateFleetAt /// - /// This operation has been expanded to use with the Amazon GameLift containers feature, - /// which is currently in public preview. + /// Updates capacity settings for a managed EC2 fleet or managed container fleet. For + /// these fleets, you adjust capacity by changing the number of instances in the fleet. + /// Fleet capacity determines the number of game sessions and players that the fleet can + /// host based on its configuration. For fleets with multiple locations, use this operation + /// to manage capacity settings in each location individually. /// /// /// - /// Updates capacity settings for a managed EC2 fleet or container fleet. For these fleets, - /// you adjust capacity by changing the number of instances in the fleet. Fleet capacity - /// determines the number of game sessions and players that the fleet can host based on - /// its configuration. For fleets with multiple locations, use this operation to manage - /// capacity settings in each location individually. - /// - /// - /// /// Use this operation to set these fleet capacity properties: /// ///
    • @@ -15952,19 +17528,14 @@ public virtual UpdateFleetCapacityResponse UpdateFleetCapacity(UpdateFleetCapaci /// - /// This operation has been expanded to use with the Amazon GameLift containers feature, - /// which is currently in public preview. + /// Updates capacity settings for a managed EC2 fleet or managed container fleet. For + /// these fleets, you adjust capacity by changing the number of instances in the fleet. + /// Fleet capacity determines the number of game sessions and players that the fleet can + /// host based on its configuration. For fleets with multiple locations, use this operation + /// to manage capacity settings in each location individually. /// /// /// - /// Updates capacity settings for a managed EC2 fleet or container fleet. For these fleets, - /// you adjust capacity by changing the number of instances in the fleet. Fleet capacity - /// determines the number of game sessions and players that the fleet can host based on - /// its configuration. For fleets with multiple locations, use this operation to manage - /// capacity settings in each location individually. - /// - /// - /// /// Use this operation to set these fleet capacity properties: /// ///
      • @@ -16817,11 +18388,9 @@ public virtual UpdateMatchmakingConfigurationResponse UpdateMatchmakingConfigura /// /// Updates the runtime configuration for the specified fleet. The runtime configuration - /// tells Amazon GameLift how to launch server processes on computes in the fleet. For - /// managed EC2 fleets, it determines what server processes to run on each fleet instance. - /// For container fleets, it describes what server processes to run in each replica container - /// group. You can update a fleet's runtime configuration at any time after the fleet - /// is created; it does not need to be in ACTIVE status. + /// tells Amazon GameLift how to launch server processes on computes in managed EC2 and + /// Anywhere fleets. You can update a fleet's runtime configuration at any time after + /// the fleet is created; it does not need to be in ACTIVE status. /// /// /// @@ -16885,11 +18454,9 @@ public virtual UpdateRuntimeConfigurationResponse UpdateRuntimeConfiguration(Upd /// /// Updates the runtime configuration for the specified fleet. The runtime configuration - /// tells Amazon GameLift how to launch server processes on computes in the fleet. For - /// managed EC2 fleets, it determines what server processes to run on each fleet instance. - /// For container fleets, it describes what server processes to run in each replica container - /// group. You can update a fleet's runtime configuration at any time after the fleet - /// is created; it does not need to be in ACTIVE status. + /// tells Amazon GameLift how to launch server processes on computes in managed EC2 and + /// Anywhere fleets. You can update a fleet's runtime configuration at any time after + /// the fleet is created; it does not need to be in ACTIVE status. /// /// /// diff --git a/sdk/src/Services/GameLift/Properties/AssemblyInfo.cs b/sdk/src/Services/GameLift/Properties/AssemblyInfo.cs index b44471f4af37..fd222c719f2e 100644 --- a/sdk/src/Services/GameLift/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/GameLift/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.11")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.402.4")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/GeoMaps/AWSSDK.GeoMaps.Net35.csproj b/sdk/src/Services/GeoMaps/AWSSDK.GeoMaps.Net35.csproj deleted file mode 100644 index 471e1f3e023d..000000000000 --- a/sdk/src/Services/GeoMaps/AWSSDK.GeoMaps.Net35.csproj +++ /dev/null @@ -1,83 +0,0 @@ - - - true - net35 - $(DefineConstants);BCL;BCL35;AWS_APM_API;CODE_ANALYSIS - portable - true - AWSSDK.GeoMaps - AWSSDK.GeoMaps - - false - false - false - false - false - false - false - false - true - true - - - C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v3.5\Profile\Client - - false - CA1822 - - - ../../../AWSDotNetSDK.ruleset - - - ../../../AWSDotNetSDKForBuild.ruleset - - - - - - ../../../awssdk.dll.snk - - - - - $(AWSKeyFile) - - - - - - - - - - - - - - - - - - - - - - - all - - - all - - - - - - - - - C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\v3.5\System.Data.Entity.dll - - - - - \ No newline at end of file diff --git a/sdk/src/Services/GeoMaps/AWSSDK.GeoMaps.Net45.csproj b/sdk/src/Services/GeoMaps/AWSSDK.GeoMaps.NetFramework.csproj similarity index 80% rename from sdk/src/Services/GeoMaps/AWSSDK.GeoMaps.Net45.csproj rename to sdk/src/Services/GeoMaps/AWSSDK.GeoMaps.NetFramework.csproj index e47e69732411..76b37c94d93e 100644 --- a/sdk/src/Services/GeoMaps/AWSSDK.GeoMaps.Net45.csproj +++ b/sdk/src/Services/GeoMaps/AWSSDK.GeoMaps.NetFramework.csproj @@ -1,8 +1,8 @@ true - net45 - $(DefineConstants);BCL;BCL45;AWS_ASYNC_API;CODE_ANALYSIS + net472 + $(DefineConstants);BCL;AWS_ASYNC_API;CODE_ANALYSIS portable true AWSSDK.GeoMaps @@ -21,6 +21,16 @@ CA1822 + + + 11.0 + + + 9.0 + ../../../AWSDotNetSDK.ruleset @@ -45,14 +55,13 @@ - - + diff --git a/sdk/src/Services/GeoMaps/AWSSDK.GeoMaps.NetStandard.csproj b/sdk/src/Services/GeoMaps/AWSSDK.GeoMaps.NetStandard.csproj index dae21b7dd919..2eb5886bada8 100644 --- a/sdk/src/Services/GeoMaps/AWSSDK.GeoMaps.NetStandard.csproj +++ b/sdk/src/Services/GeoMaps/AWSSDK.GeoMaps.NetStandard.csproj @@ -31,6 +31,16 @@ true + + + 11.0 + + + 9.0 + ../../../AWSDotNetSDK.ruleset @@ -55,8 +65,6 @@ - - diff --git a/sdk/src/Services/GeoMaps/Generated/AmazonGeoMapsConfig.cs b/sdk/src/Services/GeoMaps/Generated/AmazonGeoMapsConfig.cs index 95d3172644d3..a8efd577f76d 100644 --- a/sdk/src/Services/GeoMaps/Generated/AmazonGeoMapsConfig.cs +++ b/sdk/src/Services/GeoMaps/Generated/AmazonGeoMapsConfig.cs @@ -21,6 +21,8 @@ using Amazon.Runtime; using Amazon.Runtime.Internal; using Amazon.Util.Internal; +using Amazon.Runtime.Internal.Auth; +using Amazon.Runtime.Endpoints; using Amazon.GeoMaps.Internal; namespace Amazon.GeoMaps @@ -32,7 +34,10 @@ namespace Amazon.GeoMaps public partial class AmazonGeoMapsConfig : ClientConfig { private static readonly string UserAgentString = - InternalSDKUtils.BuildUserAgentString("Geo Maps", "3.7.400.10"); + InternalSDKUtils.BuildUserAgentString("Geo Maps", "4.0.0.0"); + + private static readonly AmazonGeoMapsEndpointResolver EndpointResolver = + new AmazonGeoMapsEndpointResolver(); private string _userAgent = UserAgentString; /// @@ -89,5 +94,24 @@ public override string UserAgent } } + /// + /// Returns the endpoint that will be used for a particular request. + /// + /// A Container class for parameters used for endpoint resolution. + /// The resolved endpoint for the given request. + public override Amazon.Runtime.Endpoints.Endpoint DetermineServiceOperationEndpoint(ServiceOperationEndpointParameters parameters) + { + var requestContext = new RequestContext(false, new AWS4Signer()) + { + ClientConfig = this, + OriginalRequest = parameters.Request, + Request = new DefaultRequest(parameters.Request, ServiceId) + }; + + var executionContext = new Amazon.Runtime.Internal.ExecutionContext(requestContext, null); + return EndpointResolver.GetEndpoint(executionContext); + } + + } } \ No newline at end of file diff --git a/sdk/src/Services/GeoMaps/Generated/AmazonGeoMapsDefaultConfiguration.cs b/sdk/src/Services/GeoMaps/Generated/AmazonGeoMapsDefaultConfiguration.cs index 5cbdc8d5ee52..6dff7124fd36 100644 --- a/sdk/src/Services/GeoMaps/Generated/AmazonGeoMapsDefaultConfiguration.cs +++ b/sdk/src/Services/GeoMaps/Generated/AmazonGeoMapsDefaultConfiguration.cs @@ -43,8 +43,7 @@ public static ReadOnlyCollection GetAllConfigurations() InRegion, CrossRegion, Mobile, - Auto, - Legacy + Auto }); } @@ -55,7 +54,6 @@ public static ReadOnlyCollection GetAllConfigurations() { Name = DefaultConfigurationMode.Standard, RetryMode = RequestRetryMode.Standard, - StsRegionalEndpoints = StsRegionalEndpointsValue.Regional, S3UsEast1RegionalEndpoint = S3UsEast1RegionalEndpointValue.Regional, // 0:00:03.1 ConnectTimeout = TimeSpan.FromMilliseconds(3100L), @@ -71,7 +69,6 @@ public static ReadOnlyCollection GetAllConfigurations() { Name = DefaultConfigurationMode.InRegion, RetryMode = RequestRetryMode.Standard, - StsRegionalEndpoints = StsRegionalEndpointsValue.Regional, S3UsEast1RegionalEndpoint = S3UsEast1RegionalEndpointValue.Regional, // 0:00:01.1 ConnectTimeout = TimeSpan.FromMilliseconds(1100L), @@ -87,7 +84,6 @@ public static ReadOnlyCollection GetAllConfigurations() { Name = DefaultConfigurationMode.CrossRegion, RetryMode = RequestRetryMode.Standard, - StsRegionalEndpoints = StsRegionalEndpointsValue.Regional, S3UsEast1RegionalEndpoint = S3UsEast1RegionalEndpointValue.Regional, // 0:00:03.1 ConnectTimeout = TimeSpan.FromMilliseconds(3100L), @@ -103,7 +99,6 @@ public static ReadOnlyCollection GetAllConfigurations() { Name = DefaultConfigurationMode.Mobile, RetryMode = RequestRetryMode.Standard, - StsRegionalEndpoints = StsRegionalEndpointsValue.Regional, S3UsEast1RegionalEndpoint = S3UsEast1RegionalEndpointValue.Regional, // 0:00:30 ConnectTimeout = TimeSpan.FromMilliseconds(30000L), @@ -119,7 +114,6 @@ public static ReadOnlyCollection GetAllConfigurations() { Name = DefaultConfigurationMode.Auto, RetryMode = RequestRetryMode.Standard, - StsRegionalEndpoints = StsRegionalEndpointsValue.Regional, S3UsEast1RegionalEndpoint = S3UsEast1RegionalEndpointValue.Regional, // 0:00:01.1 ConnectTimeout = TimeSpan.FromMilliseconds(1100L), @@ -128,19 +122,5 @@ public static ReadOnlyCollection GetAllConfigurations() TimeToFirstByteTimeout = null, HttpRequestTimeout = null }; - /// - ///

        The LEGACY mode provides default settings that vary per SDK and were used prior to establishment of defaults_mode

        - ///         - public static IDefaultConfiguration Legacy {get;} = new DefaultConfiguration - { - Name = DefaultConfigurationMode.Legacy, - RetryMode = RequestRetryMode.Legacy, - StsRegionalEndpoints = StsRegionalEndpointsValue.Legacy, - S3UsEast1RegionalEndpoint = S3UsEast1RegionalEndpointValue.Legacy, - ConnectTimeout = null, - TlsNegotiationTimeout = null, - TimeToFirstByteTimeout = null, - HttpRequestTimeout = null - }; } } \ No newline at end of file diff --git a/sdk/src/Services/GeoMaps/Generated/Model/AccessDeniedException.cs b/sdk/src/Services/GeoMaps/Generated/Model/AccessDeniedException.cs index 1a414713a3ff..36db2b592129 100644 --- a/sdk/src/Services/GeoMaps/Generated/Model/AccessDeniedException.cs +++ b/sdk/src/Services/GeoMaps/Generated/Model/AccessDeniedException.cs @@ -107,11 +107,6 @@ protected AccessDeniedException(System.Runtime.Serialization.SerializationInfo i /// The that holds the serialized object data about the exception being thrown. /// The that contains contextual information about the source or destination. /// The parameter is a null reference (Nothing in Visual Basic). -#if BCL35 - [System.Security.Permissions.SecurityPermission( - System.Security.Permissions.SecurityAction.LinkDemand, - Flags = System.Security.Permissions.SecurityPermissionFlag.SerializationFormatter)] -#endif [System.Security.SecurityCritical] // These FxCop rules are giving false-positives for this method [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Security", "CA2123:OverrideLinkDemandsShouldBeIdenticalToBase")] diff --git a/sdk/src/Services/GeoMaps/Generated/Model/GetStaticMapRequest.cs b/sdk/src/Services/GeoMaps/Generated/Model/GetStaticMapRequest.cs index 5e51a6332daa..265ae8fff271 100644 --- a/sdk/src/Services/GeoMaps/Generated/Model/GetStaticMapRequest.cs +++ b/sdk/src/Services/GeoMaps/Generated/Model/GetStaticMapRequest.cs @@ -221,9 +221,9 @@ internal bool IsSetGeoJsonOverlay() /// ///         [AWSProperty(Required=true, Min=64, Max=1400)] - public int Height + public int? Height { - get { return this._height.GetValueOrDefault(); } + get { return this._height; } set { this._height = value; } } @@ -276,9 +276,9 @@ internal bool IsSetKey() /// Example: 100 ///         ///         - public int Padding + public int? Padding { - get { return this._padding.GetValueOrDefault(); } + get { return this._padding; } set { this._padding = value; } } @@ -308,9 +308,9 @@ internal bool IsSetPadding() ///         ///         [AWSProperty(Min=0, Max=4294967295)] - public long Radius + public long? Radius { - get { return this._radius.GetValueOrDefault(); } + get { return this._radius; } set { this._radius = value; } } @@ -368,9 +368,9 @@ internal bool IsSetStyle() /// ///
      [AWSProperty(Required=true, Min=64, Max=1400)] - public int Width + public int? Width { - get { return this._width.GetValueOrDefault(); } + get { return this._width; } set { this._width = value; } } @@ -392,9 +392,9 @@ internal bool IsSetWidth() /// ///
    [AWSProperty(Min=0, Max=20)] - public float Zoom + public float? Zoom { - get { return this._zoom.GetValueOrDefault(); } + get { return this._zoom; } set { this._zoom = value; } } diff --git a/sdk/src/Services/GeoMaps/Generated/Model/Internal/MarshallTransformations/GetGlyphsResponseUnmarshaller.cs b/sdk/src/Services/GeoMaps/Generated/Model/Internal/MarshallTransformations/GetGlyphsResponseUnmarshaller.cs index 4bb6719421c8..0d609d248ed4 100644 --- a/sdk/src/Services/GeoMaps/Generated/Model/Internal/MarshallTransformations/GetGlyphsResponseUnmarshaller.cs +++ b/sdk/src/Services/GeoMaps/Generated/Model/Internal/MarshallTransformations/GetGlyphsResponseUnmarshaller.cs @@ -51,7 +51,8 @@ public override AmazonWebServiceResponse Unmarshall(JsonUnmarshallerContext cont var ms = new MemoryStream(); Amazon.Util.AWSSDKUtils.CopyStream(context.Stream, ms); ms.Seek(0, SeekOrigin.Begin); - response.Blob = ms; + if (ms.Length > 0) + response.Blob = ms; if (context.ResponseData.IsHeaderPresent("Cache-Control")) response.CacheControl = context.ResponseData.GetHeaderValue("Cache-Control"); if (context.ResponseData.IsHeaderPresent("Content-Type")) diff --git a/sdk/src/Services/GeoMaps/Generated/Model/Internal/MarshallTransformations/GetSpritesResponseUnmarshaller.cs b/sdk/src/Services/GeoMaps/Generated/Model/Internal/MarshallTransformations/GetSpritesResponseUnmarshaller.cs index 953213939b61..a59cf19cce67 100644 --- a/sdk/src/Services/GeoMaps/Generated/Model/Internal/MarshallTransformations/GetSpritesResponseUnmarshaller.cs +++ b/sdk/src/Services/GeoMaps/Generated/Model/Internal/MarshallTransformations/GetSpritesResponseUnmarshaller.cs @@ -51,7 +51,8 @@ public override AmazonWebServiceResponse Unmarshall(JsonUnmarshallerContext cont var ms = new MemoryStream(); Amazon.Util.AWSSDKUtils.CopyStream(context.Stream, ms); ms.Seek(0, SeekOrigin.Begin); - response.Blob = ms; + if (ms.Length > 0) + response.Blob = ms; if (context.ResponseData.IsHeaderPresent("Cache-Control")) response.CacheControl = context.ResponseData.GetHeaderValue("Cache-Control"); if (context.ResponseData.IsHeaderPresent("Content-Type")) diff --git a/sdk/src/Services/GeoMaps/Generated/Model/Internal/MarshallTransformations/GetStaticMapResponseUnmarshaller.cs b/sdk/src/Services/GeoMaps/Generated/Model/Internal/MarshallTransformations/GetStaticMapResponseUnmarshaller.cs index 6405dfb4cf36..2e664c05aae5 100644 --- a/sdk/src/Services/GeoMaps/Generated/Model/Internal/MarshallTransformations/GetStaticMapResponseUnmarshaller.cs +++ b/sdk/src/Services/GeoMaps/Generated/Model/Internal/MarshallTransformations/GetStaticMapResponseUnmarshaller.cs @@ -51,7 +51,8 @@ public override AmazonWebServiceResponse Unmarshall(JsonUnmarshallerContext cont var ms = new MemoryStream(); Amazon.Util.AWSSDKUtils.CopyStream(context.Stream, ms); ms.Seek(0, SeekOrigin.Begin); - response.Blob = ms; + if (ms.Length > 0) + response.Blob = ms; if (context.ResponseData.IsHeaderPresent("Cache-Control")) response.CacheControl = context.ResponseData.GetHeaderValue("Cache-Control"); if (context.ResponseData.IsHeaderPresent("Content-Type")) diff --git a/sdk/src/Services/GeoMaps/Generated/Model/Internal/MarshallTransformations/GetStyleDescriptorResponseUnmarshaller.cs b/sdk/src/Services/GeoMaps/Generated/Model/Internal/MarshallTransformations/GetStyleDescriptorResponseUnmarshaller.cs index 9ca0b3392435..81486e478dde 100644 --- a/sdk/src/Services/GeoMaps/Generated/Model/Internal/MarshallTransformations/GetStyleDescriptorResponseUnmarshaller.cs +++ b/sdk/src/Services/GeoMaps/Generated/Model/Internal/MarshallTransformations/GetStyleDescriptorResponseUnmarshaller.cs @@ -51,7 +51,8 @@ public override AmazonWebServiceResponse Unmarshall(JsonUnmarshallerContext cont var ms = new MemoryStream(); Amazon.Util.AWSSDKUtils.CopyStream(context.Stream, ms); ms.Seek(0, SeekOrigin.Begin); - response.Blob = ms; + if (ms.Length > 0) + response.Blob = ms; if (context.ResponseData.IsHeaderPresent("Cache-Control")) response.CacheControl = context.ResponseData.GetHeaderValue("Cache-Control"); if (context.ResponseData.IsHeaderPresent("Content-Type")) diff --git a/sdk/src/Services/GeoMaps/Generated/Model/Internal/MarshallTransformations/GetTileResponseUnmarshaller.cs b/sdk/src/Services/GeoMaps/Generated/Model/Internal/MarshallTransformations/GetTileResponseUnmarshaller.cs index 9aa3b7e28ba7..0e341ad28729 100644 --- a/sdk/src/Services/GeoMaps/Generated/Model/Internal/MarshallTransformations/GetTileResponseUnmarshaller.cs +++ b/sdk/src/Services/GeoMaps/Generated/Model/Internal/MarshallTransformations/GetTileResponseUnmarshaller.cs @@ -51,7 +51,8 @@ public override AmazonWebServiceResponse Unmarshall(JsonUnmarshallerContext cont var ms = new MemoryStream(); Amazon.Util.AWSSDKUtils.CopyStream(context.Stream, ms); ms.Seek(0, SeekOrigin.Begin); - response.Blob = ms; + if (ms.Length > 0) + response.Blob = ms; if (context.ResponseData.IsHeaderPresent("Cache-Control")) response.CacheControl = context.ResponseData.GetHeaderValue("Cache-Control"); if (context.ResponseData.IsHeaderPresent("Content-Type")) diff --git a/sdk/src/Services/GeoMaps/Generated/Model/InternalServerException.cs b/sdk/src/Services/GeoMaps/Generated/Model/InternalServerException.cs index d0ff3770ac4f..637eab38764d 100644 --- a/sdk/src/Services/GeoMaps/Generated/Model/InternalServerException.cs +++ b/sdk/src/Services/GeoMaps/Generated/Model/InternalServerException.cs @@ -108,11 +108,6 @@ protected InternalServerException(System.Runtime.Serialization.SerializationInfo /// The that holds the serialized object data about the exception being thrown. /// The that contains contextual information about the source or destination. /// The parameter is a null reference (Nothing in Visual Basic). -#if BCL35 - [System.Security.Permissions.SecurityPermission( - System.Security.Permissions.SecurityAction.LinkDemand, - Flags = System.Security.Permissions.SecurityPermissionFlag.SerializationFormatter)] -#endif [System.Security.SecurityCritical] // These FxCop rules are giving false-positives for this method [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Security", "CA2123:OverrideLinkDemandsShouldBeIdenticalToBase")] diff --git a/sdk/src/Services/GeoMaps/Generated/Model/ThrottlingException.cs b/sdk/src/Services/GeoMaps/Generated/Model/ThrottlingException.cs index 9f26a99d8b84..34dbb44c3ea9 100644 --- a/sdk/src/Services/GeoMaps/Generated/Model/ThrottlingException.cs +++ b/sdk/src/Services/GeoMaps/Generated/Model/ThrottlingException.cs @@ -108,11 +108,6 @@ protected ThrottlingException(System.Runtime.Serialization.SerializationInfo inf /// The that holds the serialized object data about the exception being thrown. /// The that contains contextual information about the source or destination. /// The parameter is a null reference (Nothing in Visual Basic). -#if BCL35 - [System.Security.Permissions.SecurityPermission( - System.Security.Permissions.SecurityAction.LinkDemand, - Flags = System.Security.Permissions.SecurityPermissionFlag.SerializationFormatter)] -#endif [System.Security.SecurityCritical] // These FxCop rules are giving false-positives for this method [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Security", "CA2123:OverrideLinkDemandsShouldBeIdenticalToBase")] diff --git a/sdk/src/Services/GeoMaps/Generated/Model/ValidationException.cs b/sdk/src/Services/GeoMaps/Generated/Model/ValidationException.cs index e80bf3815954..b85f890da3ac 100644 --- a/sdk/src/Services/GeoMaps/Generated/Model/ValidationException.cs +++ b/sdk/src/Services/GeoMaps/Generated/Model/ValidationException.cs @@ -110,11 +110,6 @@ protected ValidationException(System.Runtime.Serialization.SerializationInfo inf /// The that holds the serialized object data about the exception being thrown. /// The that contains contextual information about the source or destination. /// The parameter is a null reference (Nothing in Visual Basic). -#if BCL35 - [System.Security.Permissions.SecurityPermission( - System.Security.Permissions.SecurityAction.LinkDemand, - Flags = System.Security.Permissions.SecurityPermissionFlag.SerializationFormatter)] -#endif [System.Security.SecurityCritical] // These FxCop rules are giving false-positives for this method [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Security", "CA2123:OverrideLinkDemandsShouldBeIdenticalToBase")] diff --git a/sdk/src/Services/GeoMaps/Generated/_bcl45/AmazonGeoMapsClient.cs b/sdk/src/Services/GeoMaps/Generated/_bcl/AmazonGeoMapsClient.cs similarity index 97% rename from sdk/src/Services/GeoMaps/Generated/_bcl45/AmazonGeoMapsClient.cs rename to sdk/src/Services/GeoMaps/Generated/_bcl/AmazonGeoMapsClient.cs index 51f096d3d26c..89109d73d8f9 100644 --- a/sdk/src/Services/GeoMaps/Generated/_bcl45/AmazonGeoMapsClient.cs +++ b/sdk/src/Services/GeoMaps/Generated/_bcl/AmazonGeoMapsClient.cs @@ -32,6 +32,7 @@ using Amazon.Runtime.Internal; using Amazon.Runtime.Internal.Auth; using Amazon.Runtime.Internal.Transform; +using Amazon.Runtime.Endpoints; #pragma warning disable CS1570 namespace Amazon.GeoMaps @@ -554,16 +555,8 @@ public virtual GetTileResponse GetTile(GetTileRequest request) /// The resolved endpoint for the given request. public Amazon.Runtime.Endpoints.Endpoint DetermineServiceOperationEndpoint(AmazonWebServiceRequest request) { - var requestContext = new Amazon.Runtime.Internal.RequestContext(false, CreateSigner()) - { - ClientConfig = Config, - OriginalRequest = request, - Request = new Amazon.Runtime.Internal.DefaultRequest(request, ServiceMetadata.ServiceId) - }; - - var executionContext = new Amazon.Runtime.Internal.ExecutionContext(requestContext, null); - var resolver = new AmazonGeoMapsEndpointResolver(); - return resolver.GetEndpoint(executionContext); + var parameters = new ServiceOperationEndpointParameters(request); + return Config.DetermineServiceOperationEndpoint(parameters); } #endregion diff --git a/sdk/src/Services/GeoMaps/Generated/_bcl45/IAmazonGeoMaps.cs b/sdk/src/Services/GeoMaps/Generated/_bcl/IAmazonGeoMaps.cs similarity index 100% rename from sdk/src/Services/GeoMaps/Generated/_bcl45/IAmazonGeoMaps.cs rename to sdk/src/Services/GeoMaps/Generated/_bcl/IAmazonGeoMaps.cs diff --git a/sdk/src/Services/GeoMaps/Generated/_bcl35/AmazonGeoMapsClient.cs b/sdk/src/Services/GeoMaps/Generated/_bcl35/AmazonGeoMapsClient.cs deleted file mode 100644 index 5180aa603865..000000000000 --- a/sdk/src/Services/GeoMaps/Generated/_bcl35/AmazonGeoMapsClient.cs +++ /dev/null @@ -1,606 +0,0 @@ -/* - * 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. - */ - -/* - * Do not modify this file. This file is generated from the geo-maps-2020-11-19.normal.json service model. - */ - - -using System; -using System.Collections.Generic; -using System.Net; - -using Amazon.GeoMaps.Model; -using Amazon.GeoMaps.Model.Internal.MarshallTransformations; -using Amazon.GeoMaps.Internal; -using Amazon.Runtime; -using Amazon.Runtime.Internal; -using Amazon.Runtime.Internal.Auth; -using Amazon.Runtime.Internal.Transform; - -#pragma warning disable CS1570 -namespace Amazon.GeoMaps -{ - /// - /// Implementation for accessing GeoMaps - /// - /// Integrate high-quality base map data into your applications using MapLibre. - /// Capabilities include: - /// - ///
    • - /// - /// Access to comprehensive base map data, allowing you to tailor the map display to your - /// specific needs. - /// - ///
    • - /// - /// Multiple pre-designed map styles suited for various application types, such as navigation, - /// logistics, or data visualization. - /// - ///
    • - /// - /// Generation of static map images for scenarios where interactive maps aren't suitable, - /// such as: - /// - ///
      • - /// - /// Embedding in emails or documents - /// - ///
      • - /// - /// Displaying in low-bandwidth environments - /// - ///
      • - /// - /// Creating printable maps - /// - ///
      • - /// - /// Enhancing application performance by reducing client-side rendering - /// - ///
    - ///     - public partial class AmazonGeoMapsClient : AmazonServiceClient, IAmazonGeoMaps - { - private static IServiceMetadata serviceMetadata = new AmazonGeoMapsMetadata(); - - #region Constructors - - /// - /// Constructs AmazonGeoMapsClient with the credentials loaded from the application's - /// default configuration, and if unsuccessful from the Instance Profile service on an EC2 instance. - /// - /// Example App.config with credentials set. - /// - /// <?xml version="1.0" encoding="utf-8" ?> - /// <configuration> - /// <appSettings> - /// <add key="AWSProfileName" value="AWS Default"/> - /// </appSettings> - /// </configuration> - /// - /// - /// - public AmazonGeoMapsClient() - : base(FallbackCredentialsFactory.GetCredentials(), new AmazonGeoMapsConfig()) { } - - /// - /// Constructs AmazonGeoMapsClient with the credentials loaded from the application's - /// default configuration, and if unsuccessful from the Instance Profile service on an EC2 instance. - /// - /// Example App.config with credentials set. - /// - /// <?xml version="1.0" encoding="utf-8" ?> - /// <configuration> - /// <appSettings> - /// <add key="AWSProfileName" value="AWS Default"/> - /// </appSettings> - /// </configuration> - /// - /// - /// - /// The region to connect. - public AmazonGeoMapsClient(RegionEndpoint region) - : base(FallbackCredentialsFactory.GetCredentials(), new AmazonGeoMapsConfig{RegionEndpoint = region}) { } - - /// - /// Constructs AmazonGeoMapsClient with the credentials loaded from the application's - /// default configuration, and if unsuccessful from the Instance Profile service on an EC2 instance. - /// - /// Example App.config with credentials set. - /// - /// <?xml version="1.0" encoding="utf-8" ?> - /// <configuration> - /// <appSettings> - /// <add key="AWSProfileName" value="AWS Default"/> - /// </appSettings> - /// </configuration> - /// - /// - /// - /// The AmazonGeoMapsClient Configuration Object - public AmazonGeoMapsClient(AmazonGeoMapsConfig config) - : base(FallbackCredentialsFactory.GetCredentials(config), config){} - /// - /// Constructs AmazonGeoMapsClient with AWS Credentials - /// - /// AWS Credentials - public AmazonGeoMapsClient(AWSCredentials credentials) - : this(credentials, new AmazonGeoMapsConfig()) - { - } - - /// - /// Constructs AmazonGeoMapsClient with AWS Credentials - /// - /// AWS Credentials - /// The region to connect. - public AmazonGeoMapsClient(AWSCredentials credentials, RegionEndpoint region) - : this(credentials, new AmazonGeoMapsConfig{RegionEndpoint = region}) - { - } - - /// - /// Constructs AmazonGeoMapsClient with AWS Credentials and an - /// AmazonGeoMapsClient Configuration object. - /// - /// AWS Credentials - /// The AmazonGeoMapsClient Configuration Object - public AmazonGeoMapsClient(AWSCredentials credentials, AmazonGeoMapsConfig clientConfig) - : base(credentials, clientConfig) - { - } - - /// - /// Constructs AmazonGeoMapsClient with AWS Access Key ID and AWS Secret Key - /// - /// AWS Access Key ID - /// AWS Secret Access Key - public AmazonGeoMapsClient(string awsAccessKeyId, string awsSecretAccessKey) - : this(awsAccessKeyId, awsSecretAccessKey, new AmazonGeoMapsConfig()) - { - } - - /// - /// Constructs AmazonGeoMapsClient with AWS Access Key ID and AWS Secret Key - /// - /// AWS Access Key ID - /// AWS Secret Access Key - /// The region to connect. - public AmazonGeoMapsClient(string awsAccessKeyId, string awsSecretAccessKey, RegionEndpoint region) - : this(awsAccessKeyId, awsSecretAccessKey, new AmazonGeoMapsConfig() {RegionEndpoint=region}) - { - } - - /// - /// Constructs AmazonGeoMapsClient with AWS Access Key ID, AWS Secret Key and an - /// AmazonGeoMapsClient Configuration object. - /// - /// AWS Access Key ID - /// AWS Secret Access Key - /// The AmazonGeoMapsClient Configuration Object - public AmazonGeoMapsClient(string awsAccessKeyId, string awsSecretAccessKey, AmazonGeoMapsConfig clientConfig) - : base(awsAccessKeyId, awsSecretAccessKey, clientConfig) - { - } - - /// - /// Constructs AmazonGeoMapsClient with AWS Access Key ID and AWS Secret Key - /// - /// AWS Access Key ID - /// AWS Secret Access Key - /// AWS Session Token - public AmazonGeoMapsClient(string awsAccessKeyId, string awsSecretAccessKey, string awsSessionToken) - : this(awsAccessKeyId, awsSecretAccessKey, awsSessionToken, new AmazonGeoMapsConfig()) - { - } - - /// - /// Constructs AmazonGeoMapsClient with AWS Access Key ID and AWS Secret Key - /// - /// AWS Access Key ID - /// AWS Secret Access Key - /// AWS Session Token - /// The region to connect. - public AmazonGeoMapsClient(string awsAccessKeyId, string awsSecretAccessKey, string awsSessionToken, RegionEndpoint region) - : this(awsAccessKeyId, awsSecretAccessKey, awsSessionToken, new AmazonGeoMapsConfig{RegionEndpoint = region}) - { - } - - /// - /// Constructs AmazonGeoMapsClient with AWS Access Key ID, AWS Secret Key and an - /// AmazonGeoMapsClient Configuration object. - /// - /// AWS Access Key ID - /// AWS Secret Access Key - /// AWS Session Token - /// The AmazonGeoMapsClient Configuration Object - public AmazonGeoMapsClient(string awsAccessKeyId, string awsSecretAccessKey, string awsSessionToken, AmazonGeoMapsConfig clientConfig) - : base(awsAccessKeyId, awsSecretAccessKey, awsSessionToken, clientConfig) - { - } - - #endregion - - #region Overrides - - - /// - /// Creates the signer for the service. - /// - protected override AbstractAWSSigner CreateSigner() - { - return new AWS4Signer(); - } - - /// - /// Customize the pipeline - /// - /// - protected override void CustomizeRuntimePipeline(RuntimePipeline pipeline) - { - pipeline.RemoveHandler(); - pipeline.AddHandlerAfter(new AmazonGeoMapsEndpointResolver()); - } - /// - /// Capture metadata for the service. - /// - protected override IServiceMetadata ServiceMetadata - { - get - { - return serviceMetadata; - } - } - - #endregion - - #region Dispose - - /// - /// Disposes the service client. - /// - protected override void Dispose(bool disposing) - { - base.Dispose(disposing); - } - - #endregion - - - #region GetGlyphs - - /// - /// Returns the map's glyphs. - /// - /// Container for the necessary parameters to execute the GetGlyphs service method. - /// - /// The response from the GetGlyphs service method, as returned by GeoMaps. - /// REST API Reference for GetGlyphs Operation - public virtual GetGlyphsResponse GetGlyphs(GetGlyphsRequest request) - { - var options = new InvokeOptions(); - options.RequestMarshaller = GetGlyphsRequestMarshaller.Instance; - options.ResponseUnmarshaller = GetGlyphsResponseUnmarshaller.Instance; - - return Invoke(request, options); - } - - /// - /// Initiates the asynchronous execution of the GetGlyphs operation. - /// - /// - /// Container for the necessary parameters to execute the GetGlyphs operation on AmazonGeoMapsClient. - /// An AsyncCallback delegate that is invoked when the operation completes. - /// A user-defined state object that is passed to the callback procedure. Retrieve this object from within the callback - /// procedure using the AsyncState property. - /// - /// An IAsyncResult that can be used to poll or wait for results, or both; this value is also needed when invoking EndGetGlyphs - /// operation. - /// REST API Reference for GetGlyphs Operation - public virtual IAsyncResult BeginGetGlyphs(GetGlyphsRequest request, AsyncCallback callback, object state) - { - var options = new InvokeOptions(); - options.RequestMarshaller = GetGlyphsRequestMarshaller.Instance; - options.ResponseUnmarshaller = GetGlyphsResponseUnmarshaller.Instance; - - return BeginInvoke(request, options, callback, state); - } - - /// - /// Finishes the asynchronous execution of the GetGlyphs operation. - /// - /// - /// The IAsyncResult returned by the call to BeginGetGlyphs. - /// - /// Returns a GetGlyphsResult from GeoMaps. - /// REST API Reference for GetGlyphs Operation - public virtual GetGlyphsResponse EndGetGlyphs(IAsyncResult asyncResult) - { - return EndInvoke(asyncResult); - } - - #endregion - - #region GetSprites - - /// - /// Returns the map's sprites. - /// - /// Container for the necessary parameters to execute the GetSprites service method. - /// - /// The response from the GetSprites service method, as returned by GeoMaps. - /// REST API Reference for GetSprites Operation - public virtual GetSpritesResponse GetSprites(GetSpritesRequest request) - { - var options = new InvokeOptions(); - options.RequestMarshaller = GetSpritesRequestMarshaller.Instance; - options.ResponseUnmarshaller = GetSpritesResponseUnmarshaller.Instance; - - return Invoke(request, options); - } - - /// - /// Initiates the asynchronous execution of the GetSprites operation. - /// - /// - /// Container for the necessary parameters to execute the GetSprites operation on AmazonGeoMapsClient. - /// An AsyncCallback delegate that is invoked when the operation completes. - /// A user-defined state object that is passed to the callback procedure. Retrieve this object from within the callback - /// procedure using the AsyncState property. - /// - /// An IAsyncResult that can be used to poll or wait for results, or both; this value is also needed when invoking EndGetSprites - /// operation. - /// REST API Reference for GetSprites Operation - public virtual IAsyncResult BeginGetSprites(GetSpritesRequest request, AsyncCallback callback, object state) - { - var options = new InvokeOptions(); - options.RequestMarshaller = GetSpritesRequestMarshaller.Instance; - options.ResponseUnmarshaller = GetSpritesResponseUnmarshaller.Instance; - - return BeginInvoke(request, options, callback, state); - } - - /// - /// Finishes the asynchronous execution of the GetSprites operation. - /// - /// - /// The IAsyncResult returned by the call to BeginGetSprites. - /// - /// Returns a GetSpritesResult from GeoMaps. - /// REST API Reference for GetSprites Operation - public virtual GetSpritesResponse EndGetSprites(IAsyncResult asyncResult) - { - return EndInvoke(asyncResult); - } - - #endregion - - #region GetStaticMap - - /// - /// Provides high-quality static map images with customizable options. You can modify - /// the map's appearance and overlay additional information. It's an ideal solution for - /// applications requiring tailored static map snapshots. - /// - /// Container for the necessary parameters to execute the GetStaticMap service method. - /// - /// The response from the GetStaticMap service method, as returned by GeoMaps. - /// - /// The request was denied because of insufficient access or permissions. Check with an - /// administrator to verify your permissions. - /// - /// - /// The request processing has failed because of an unknown error, exception or failure. - /// - /// - /// The request was denied due to request throttling. - /// - /// - /// The input fails to satisfy the constraints specified by an AWS service. - /// - /// REST API Reference for GetStaticMap Operation - public virtual GetStaticMapResponse GetStaticMap(GetStaticMapRequest request) - { - var options = new InvokeOptions(); - options.RequestMarshaller = GetStaticMapRequestMarshaller.Instance; - options.ResponseUnmarshaller = GetStaticMapResponseUnmarshaller.Instance; - - return Invoke(request, options); - } - - /// - /// Initiates the asynchronous execution of the GetStaticMap operation. - /// - /// - /// Container for the necessary parameters to execute the GetStaticMap operation on AmazonGeoMapsClient. - /// An AsyncCallback delegate that is invoked when the operation completes. - /// A user-defined state object that is passed to the callback procedure. Retrieve this object from within the callback - /// procedure using the AsyncState property. - /// - /// An IAsyncResult that can be used to poll or wait for results, or both; this value is also needed when invoking EndGetStaticMap - /// operation. - /// REST API Reference for GetStaticMap Operation - public virtual IAsyncResult BeginGetStaticMap(GetStaticMapRequest request, AsyncCallback callback, object state) - { - var options = new InvokeOptions(); - options.RequestMarshaller = GetStaticMapRequestMarshaller.Instance; - options.ResponseUnmarshaller = GetStaticMapResponseUnmarshaller.Instance; - - return BeginInvoke(request, options, callback, state); - } - - /// - /// Finishes the asynchronous execution of the GetStaticMap operation. - /// - /// - /// The IAsyncResult returned by the call to BeginGetStaticMap. - /// - /// Returns a GetStaticMapResult from GeoMaps. - /// REST API Reference for GetStaticMap Operation - public virtual GetStaticMapResponse EndGetStaticMap(IAsyncResult asyncResult) - { - return EndInvoke(asyncResult); - } - - #endregion - - #region GetStyleDescriptor - - /// - /// Returns information about the style. - /// - /// Container for the necessary parameters to execute the GetStyleDescriptor service method. - /// - /// The response from the GetStyleDescriptor service method, as returned by GeoMaps. - /// REST API Reference for GetStyleDescriptor Operation - public virtual GetStyleDescriptorResponse GetStyleDescriptor(GetStyleDescriptorRequest request) - { - var options = new InvokeOptions(); - options.RequestMarshaller = GetStyleDescriptorRequestMarshaller.Instance; - options.ResponseUnmarshaller = GetStyleDescriptorResponseUnmarshaller.Instance; - - return Invoke(request, options); - } - - /// - /// Initiates the asynchronous execution of the GetStyleDescriptor operation. - /// - /// - /// Container for the necessary parameters to execute the GetStyleDescriptor operation on AmazonGeoMapsClient. - /// An AsyncCallback delegate that is invoked when the operation completes. - /// A user-defined state object that is passed to the callback procedure. Retrieve this object from within the callback - /// procedure using the AsyncState property. - /// - /// An IAsyncResult that can be used to poll or wait for results, or both; this value is also needed when invoking EndGetStyleDescriptor - /// operation. - /// REST API Reference for GetStyleDescriptor Operation - public virtual IAsyncResult BeginGetStyleDescriptor(GetStyleDescriptorRequest request, AsyncCallback callback, object state) - { - var options = new InvokeOptions(); - options.RequestMarshaller = GetStyleDescriptorRequestMarshaller.Instance; - options.ResponseUnmarshaller = GetStyleDescriptorResponseUnmarshaller.Instance; - - return BeginInvoke(request, options, callback, state); - } - - /// - /// Finishes the asynchronous execution of the GetStyleDescriptor operation. - /// - /// - /// The IAsyncResult returned by the call to BeginGetStyleDescriptor. - /// - /// Returns a GetStyleDescriptorResult from GeoMaps. - /// REST API Reference for GetStyleDescriptor Operation - public virtual GetStyleDescriptorResponse EndGetStyleDescriptor(IAsyncResult asyncResult) - { - return EndInvoke(asyncResult); - } - - #endregion - - #region GetTile - - /// - /// Returns a tile. Map tiles are used by clients to render a map. they're addressed using - /// a grid arrangement with an X coordinate, Y coordinate, and Z (zoom) level. - /// - /// Container for the necessary parameters to execute the GetTile service method. - /// - /// The response from the GetTile service method, as returned by GeoMaps. - /// - /// The request was denied because of insufficient access or permissions. Check with an - /// administrator to verify your permissions. - /// - /// - /// The request processing has failed because of an unknown error, exception or failure. - /// - /// - /// The request was denied due to request throttling. - /// - /// - /// The input fails to satisfy the constraints specified by an AWS service. - /// - /// REST API Reference for GetTile Operation - public virtual GetTileResponse GetTile(GetTileRequest request) - { - var options = new InvokeOptions(); - options.RequestMarshaller = GetTileRequestMarshaller.Instance; - options.ResponseUnmarshaller = GetTileResponseUnmarshaller.Instance; - - return Invoke(request, options); - } - - /// - /// Initiates the asynchronous execution of the GetTile operation. - /// - /// - /// Container for the necessary parameters to execute the GetTile operation on AmazonGeoMapsClient. - /// An AsyncCallback delegate that is invoked when the operation completes. - /// A user-defined state object that is passed to the callback procedure. Retrieve this object from within the callback - /// procedure using the AsyncState property. - /// - /// An IAsyncResult that can be used to poll or wait for results, or both; this value is also needed when invoking EndGetTile - /// operation. - /// REST API Reference for GetTile Operation - public virtual IAsyncResult BeginGetTile(GetTileRequest request, AsyncCallback callback, object state) - { - var options = new InvokeOptions(); - options.RequestMarshaller = GetTileRequestMarshaller.Instance; - options.ResponseUnmarshaller = GetTileResponseUnmarshaller.Instance; - - return BeginInvoke(request, options, callback, state); - } - - /// - /// Finishes the asynchronous execution of the GetTile operation. - /// - /// - /// The IAsyncResult returned by the call to BeginGetTile. - /// - /// Returns a GetTileResult from GeoMaps. - /// REST API Reference for GetTile Operation - public virtual GetTileResponse EndGetTile(IAsyncResult asyncResult) - { - return EndInvoke(asyncResult); - } - - #endregion - - #region DetermineServiceOperationEndpoint - - /// - /// Returns the endpoint that will be used for a particular request. - /// - /// Request for the desired service operation. - /// The resolved endpoint for the given request. - public Amazon.Runtime.Endpoints.Endpoint DetermineServiceOperationEndpoint(AmazonWebServiceRequest request) - { - var requestContext = new Amazon.Runtime.Internal.RequestContext(false, CreateSigner()) - { - ClientConfig = Config, - OriginalRequest = request, - Request = new Amazon.Runtime.Internal.DefaultRequest(request, ServiceMetadata.ServiceId) - }; - - var executionContext = new Amazon.Runtime.Internal.ExecutionContext(requestContext, null); - var resolver = new AmazonGeoMapsEndpointResolver(); - return resolver.GetEndpoint(executionContext); - } - - #endregion - - } -} \ No newline at end of file diff --git a/sdk/src/Services/GeoMaps/Generated/_bcl35/IAmazonGeoMaps.cs b/sdk/src/Services/GeoMaps/Generated/_bcl35/IAmazonGeoMaps.cs deleted file mode 100644 index 690ab6e0caeb..000000000000 --- a/sdk/src/Services/GeoMaps/Generated/_bcl35/IAmazonGeoMaps.cs +++ /dev/null @@ -1,317 +0,0 @@ -/* - * 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. - */ - -/* - * Do not modify this file. This file is generated from the geo-maps-2020-11-19.normal.json service model. - */ - - -using System; -using System.Collections.Generic; - -using Amazon.Runtime; -using Amazon.GeoMaps.Model; - -#pragma warning disable CS1570 -namespace Amazon.GeoMaps -{ - /// - /// Interface for accessing GeoMaps - /// - /// Integrate high-quality base map data into your applications using MapLibre. - /// Capabilities include: - /// - ///
    • - /// - /// Access to comprehensive base map data, allowing you to tailor the map display to your - /// specific needs. - /// - ///
    • - /// - /// Multiple pre-designed map styles suited for various application types, such as navigation, - /// logistics, or data visualization. - /// - ///
    • - /// - /// Generation of static map images for scenarios where interactive maps aren't suitable, - /// such as: - /// - ///
      • - /// - /// Embedding in emails or documents - /// - ///
      • - /// - /// Displaying in low-bandwidth environments - /// - ///
      • - /// - /// Creating printable maps - /// - ///
      • - /// - /// Enhancing application performance by reducing client-side rendering - /// - ///
    - ///     - public partial interface IAmazonGeoMaps : IAmazonService, IDisposable - { - - - - - - #region GetGlyphs - - - /// - /// Returns the map's glyphs. - /// - /// Container for the necessary parameters to execute the GetGlyphs service method. - /// - /// The response from the GetGlyphs service method, as returned by GeoMaps. - /// REST API Reference for GetGlyphs Operation - GetGlyphsResponse GetGlyphs(GetGlyphsRequest request); - - /// - /// Initiates the asynchronous execution of the GetGlyphs operation. - /// - /// - /// Container for the necessary parameters to execute the GetGlyphs operation on AmazonGeoMapsClient. - /// An AsyncCallback delegate that is invoked when the operation completes. - /// A user-defined state object that is passed to the callback procedure. Retrieve this object from within the callback - /// procedure using the AsyncState property. - /// - /// An IAsyncResult that can be used to poll or wait for results, or both; this value is also needed when invoking EndGetGlyphs - /// operation. - /// REST API Reference for GetGlyphs Operation - IAsyncResult BeginGetGlyphs(GetGlyphsRequest request, AsyncCallback callback, object state); - - - - /// - /// Finishes the asynchronous execution of the GetGlyphs operation. - /// - /// - /// The IAsyncResult returned by the call to BeginGetGlyphs. - /// - /// Returns a GetGlyphsResult from GeoMaps. - /// REST API Reference for GetGlyphs Operation - GetGlyphsResponse EndGetGlyphs(IAsyncResult asyncResult); - - #endregion - - #region GetSprites - - - /// - /// Returns the map's sprites. - /// - /// Container for the necessary parameters to execute the GetSprites service method. - /// - /// The response from the GetSprites service method, as returned by GeoMaps. - /// REST API Reference for GetSprites Operation - GetSpritesResponse GetSprites(GetSpritesRequest request); - - /// - /// Initiates the asynchronous execution of the GetSprites operation. - /// - /// - /// Container for the necessary parameters to execute the GetSprites operation on AmazonGeoMapsClient. - /// An AsyncCallback delegate that is invoked when the operation completes. - /// A user-defined state object that is passed to the callback procedure. Retrieve this object from within the callback - /// procedure using the AsyncState property. - /// - /// An IAsyncResult that can be used to poll or wait for results, or both; this value is also needed when invoking EndGetSprites - /// operation. - /// REST API Reference for GetSprites Operation - IAsyncResult BeginGetSprites(GetSpritesRequest request, AsyncCallback callback, object state); - - - - /// - /// Finishes the asynchronous execution of the GetSprites operation. - /// - /// - /// The IAsyncResult returned by the call to BeginGetSprites. - /// - /// Returns a GetSpritesResult from GeoMaps. - /// REST API Reference for GetSprites Operation - GetSpritesResponse EndGetSprites(IAsyncResult asyncResult); - - #endregion - - #region GetStaticMap - - - /// - /// Provides high-quality static map images with customizable options. You can modify - /// the map's appearance and overlay additional information. It's an ideal solution for - /// applications requiring tailored static map snapshots. - /// - /// Container for the necessary parameters to execute the GetStaticMap service method. - /// - /// The response from the GetStaticMap service method, as returned by GeoMaps. - /// - /// The request was denied because of insufficient access or permissions. Check with an - /// administrator to verify your permissions. - /// - /// - /// The request processing has failed because of an unknown error, exception or failure. - /// - /// - /// The request was denied due to request throttling. - /// - /// - /// The input fails to satisfy the constraints specified by an AWS service. - /// - /// REST API Reference for GetStaticMap Operation - GetStaticMapResponse GetStaticMap(GetStaticMapRequest request); - - /// - /// Initiates the asynchronous execution of the GetStaticMap operation. - /// - /// - /// Container for the necessary parameters to execute the GetStaticMap operation on AmazonGeoMapsClient. - /// An AsyncCallback delegate that is invoked when the operation completes. - /// A user-defined state object that is passed to the callback procedure. Retrieve this object from within the callback - /// procedure using the AsyncState property. - /// - /// An IAsyncResult that can be used to poll or wait for results, or both; this value is also needed when invoking EndGetStaticMap - /// operation. - /// REST API Reference for GetStaticMap Operation - IAsyncResult BeginGetStaticMap(GetStaticMapRequest request, AsyncCallback callback, object state); - - - - /// - /// Finishes the asynchronous execution of the GetStaticMap operation. - /// - /// - /// The IAsyncResult returned by the call to BeginGetStaticMap. - /// - /// Returns a GetStaticMapResult from GeoMaps. - /// REST API Reference for GetStaticMap Operation - GetStaticMapResponse EndGetStaticMap(IAsyncResult asyncResult); - - #endregion - - #region GetStyleDescriptor - - - /// - /// Returns information about the style. - /// - /// Container for the necessary parameters to execute the GetStyleDescriptor service method. - /// - /// The response from the GetStyleDescriptor service method, as returned by GeoMaps. - /// REST API Reference for GetStyleDescriptor Operation - GetStyleDescriptorResponse GetStyleDescriptor(GetStyleDescriptorRequest request); - - /// - /// Initiates the asynchronous execution of the GetStyleDescriptor operation. - /// - /// - /// Container for the necessary parameters to execute the GetStyleDescriptor operation on AmazonGeoMapsClient. - /// An AsyncCallback delegate that is invoked when the operation completes. - /// A user-defined state object that is passed to the callback procedure. Retrieve this object from within the callback - /// procedure using the AsyncState property. - /// - /// An IAsyncResult that can be used to poll or wait for results, or both; this value is also needed when invoking EndGetStyleDescriptor - /// operation. - /// REST API Reference for GetStyleDescriptor Operation - IAsyncResult BeginGetStyleDescriptor(GetStyleDescriptorRequest request, AsyncCallback callback, object state); - - - - /// - /// Finishes the asynchronous execution of the GetStyleDescriptor operation. - /// - /// - /// The IAsyncResult returned by the call to BeginGetStyleDescriptor. - /// - /// Returns a GetStyleDescriptorResult from GeoMaps. - /// REST API Reference for GetStyleDescriptor Operation - GetStyleDescriptorResponse EndGetStyleDescriptor(IAsyncResult asyncResult); - - #endregion - - #region GetTile - - - /// - /// Returns a tile. Map tiles are used by clients to render a map. they're addressed using - /// a grid arrangement with an X coordinate, Y coordinate, and Z (zoom) level. - /// - /// Container for the necessary parameters to execute the GetTile service method. - /// - /// The response from the GetTile service method, as returned by GeoMaps. - /// - /// The request was denied because of insufficient access or permissions. Check with an - /// administrator to verify your permissions. - /// - /// - /// The request processing has failed because of an unknown error, exception or failure. - /// - /// - /// The request was denied due to request throttling. - /// - /// - /// The input fails to satisfy the constraints specified by an AWS service. - /// - /// REST API Reference for GetTile Operation - GetTileResponse GetTile(GetTileRequest request); - - /// - /// Initiates the asynchronous execution of the GetTile operation. - /// - /// - /// Container for the necessary parameters to execute the GetTile operation on AmazonGeoMapsClient. - /// An AsyncCallback delegate that is invoked when the operation completes. - /// A user-defined state object that is passed to the callback procedure. Retrieve this object from within the callback - /// procedure using the AsyncState property. - /// - /// An IAsyncResult that can be used to poll or wait for results, or both; this value is also needed when invoking EndGetTile - /// operation. - /// REST API Reference for GetTile Operation - IAsyncResult BeginGetTile(GetTileRequest request, AsyncCallback callback, object state); - - - - /// - /// Finishes the asynchronous execution of the GetTile operation. - /// - /// - /// The IAsyncResult returned by the call to BeginGetTile. - /// - /// Returns a GetTileResult from GeoMaps. - /// REST API Reference for GetTile Operation - GetTileResponse EndGetTile(IAsyncResult asyncResult); - - #endregion - - #region DetermineServiceOperationEndpoint - - /// - /// Returns the endpoint that will be used for a particular request. - /// - /// Request for the desired service operation. - /// The resolved endpoint for the given request. - Amazon.Runtime.Endpoints.Endpoint DetermineServiceOperationEndpoint(AmazonWebServiceRequest request); - - #endregion - - } -} \ No newline at end of file diff --git a/sdk/src/Services/GeoMaps/Generated/_netstandard/AmazonGeoMapsClient.cs b/sdk/src/Services/GeoMaps/Generated/_netstandard/AmazonGeoMapsClient.cs index cf7075fc61dc..773f59d1c565 100644 --- a/sdk/src/Services/GeoMaps/Generated/_netstandard/AmazonGeoMapsClient.cs +++ b/sdk/src/Services/GeoMaps/Generated/_netstandard/AmazonGeoMapsClient.cs @@ -32,6 +32,7 @@ using Amazon.Runtime.Internal; using Amazon.Runtime.Internal.Auth; using Amazon.Runtime.Internal.Transform; +using Amazon.Runtime.Endpoints; #pragma warning disable CS1570 namespace Amazon.GeoMaps @@ -492,16 +493,8 @@ internal virtual GetTileResponse GetTile(GetTileRequest request) /// The resolved endpoint for the given request. public Amazon.Runtime.Endpoints.Endpoint DetermineServiceOperationEndpoint(AmazonWebServiceRequest request) { - var requestContext = new Amazon.Runtime.Internal.RequestContext(false, CreateSigner()) - { - ClientConfig = Config, - OriginalRequest = request, - Request = new Amazon.Runtime.Internal.DefaultRequest(request, ServiceMetadata.ServiceId) - }; - - var executionContext = new Amazon.Runtime.Internal.ExecutionContext(requestContext, null); - var resolver = new AmazonGeoMapsEndpointResolver(); - return resolver.GetEndpoint(executionContext); + var parameters = new ServiceOperationEndpointParameters(request); + return Config.DetermineServiceOperationEndpoint(parameters); } #endregion diff --git a/sdk/src/Services/GeoMaps/Generated/_netstandard/IAmazonGeoMaps.cs b/sdk/src/Services/GeoMaps/Generated/_netstandard/IAmazonGeoMaps.cs index 254a578ffd30..54563c9727e4 100644 --- a/sdk/src/Services/GeoMaps/Generated/_netstandard/IAmazonGeoMaps.cs +++ b/sdk/src/Services/GeoMaps/Generated/_netstandard/IAmazonGeoMaps.cs @@ -201,5 +201,33 @@ public partial interface IAmazonGeoMaps : IAmazonService, IDisposable #endregion + #region Static factory interface methods +#if NET8_0_OR_GREATER +// Warning CA1033 is issued when the child types can not call the method defined in parent types. +// In this use case the intended caller is only meant to be the interface as a factory +// method to create the child types. Given the SDK use case the warning can be ignored. +#pragma warning disable CA1033 + /// + [System.Diagnostics.CodeAnalysis.DynamicDependency(System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicProperties, typeof(AmazonGeoMapsConfig))] + static ClientConfig IAmazonService.CreateDefaultClientConfig() => new AmazonGeoMapsConfig(); + + /// + [System.Diagnostics.CodeAnalysis.UnconditionalSuppressMessage("AssemblyLoadTrimming", "IL2026:RequiresUnreferencedCode", + Justification = "This suppression is here to ignore the warnings caused by CognitoSync. See justification in IAmazonService.")] + static IAmazonService IAmazonService.CreateDefaultServiceClient(AWSCredentials awsCredentials, ClientConfig clientConfig) + { + var serviceClientConfig = clientConfig as AmazonGeoMapsConfig; + if (serviceClientConfig == null) + { + throw new AmazonClientException("ClientConfig is not of type AmazonGeoMapsConfig to create AmazonGeoMapsClient"); + } + + return awsCredentials == null ? + new AmazonGeoMapsClient(serviceClientConfig) : + new AmazonGeoMapsClient(awsCredentials, serviceClientConfig); + } +#pragma warning restore CA1033 +#endif + #endregion } } \ No newline at end of file diff --git a/sdk/src/Services/GeoMaps/GeoMaps.sln b/sdk/src/Services/GeoMaps/GeoMaps.sln index d6b026820e99..7c3a4e030e2f 100644 --- a/sdk/src/Services/GeoMaps/GeoMaps.sln +++ b/sdk/src/Services/GeoMaps/GeoMaps.sln @@ -4,9 +4,7 @@ VisualStudioVersion = 15.0.26730.12 MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Core", "Core", "{9863FCB3-BFA4-4B9C-B8F6-302BA5F660B8}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.Core.Net35", "../../Core/AWSSDK.Core.Net35.csproj", "{1FACE5D0-97BF-4069-B4F7-0FE28BB160F8}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.Core.Net45", "../../Core/AWSSDK.Core.Net45.csproj", "{7DE3AFA0-1B2D-41B1-82BD-120B8B210B43}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.Core.NetFramework", "../../Core/AWSSDK.Core.NetFramework.csproj", "{7DE3AFA0-1B2D-41B1-82BD-120B8B210B43}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.Core.NetStandard", "../../Core/AWSSDK.Core.NetStandard.csproj", "{A855B58E-ED32-40AE-AE8F-054F448B9F2C}" EndProject @@ -14,27 +12,19 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Services", "Services", "{93 EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "GeoMaps", "GeoMaps", "{55C30A91-58E1-4527-ABE1-639D6EB62BE0}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.GeoMaps.Net35", "AWSSDK.GeoMaps.Net35.csproj", "{27311484-DBD1-4904-B198-9A705D8AC371}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.GeoMaps.Net45", "AWSSDK.GeoMaps.Net45.csproj", "{5A6B618A-4B5E-4F9F-B6EF-E7ABCB76620C}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.GeoMaps.NetFramework", "AWSSDK.GeoMaps.NetFramework.csproj", "{7C598974-3384-4043-93A6-792976652191}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.GeoMaps.NetStandard", "AWSSDK.GeoMaps.NetStandard.csproj", "{F427AC54-7704-4E1D-B3F8-7788D1D55453}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Test", "Test", "{12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.UnitTests.GeoMaps.Net35", "../../../test/Services/GeoMaps/UnitTests/AWSSDK.UnitTests.GeoMaps.Net35.csproj", "{031DD9C5-0142-404D-B95A-68097DEEA78F}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.UnitTests.GeoMaps.Net45", "../../../test/Services/GeoMaps/UnitTests/AWSSDK.UnitTests.GeoMaps.Net45.csproj", "{41439816-6C6D-4066-9E58-E70F075976BE}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.UnitTests.GeoMaps.NetFramework", "../../../test/Services/GeoMaps/UnitTests/AWSSDK.UnitTests.GeoMaps.NetFramework.csproj", "{D3BD940D-546F-407D-9B6D-D907DE1C214E}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ServiceClientGeneratorLib", "../../../../generator/ServiceClientGeneratorLib/ServiceClientGeneratorLib.csproj", "{7BEE7C44-BE12-43CC-AFB9-B5852A1F43C8}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.UnitTestUtilities.Net35", "../../../test/UnitTests/Custom/AWSSDK.UnitTestUtilities.Net35.csproj", "{A23CE153-A4A3-4D3A-A6DC-0DD1B207118E}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.UnitTestUtilities.Net45", "../../../test/UnitTests/Custom/AWSSDK.UnitTestUtilities.Net45.csproj", "{002B183F-E568-49CD-9D06-CBCFF2C2921F}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.IntegrationTestUtilities.Net35", "../../../test/IntegrationTests/AWSSDK.IntegrationTestUtilities.Net35.csproj", "{924D2906-70D6-4D77-8603-816648B2CCA6}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.UnitTestUtilities.NetFramework", "../../../test/UnitTests/Custom/AWSSDK.UnitTestUtilities.NetFramework.csproj", "{002B183F-E568-49CD-9D06-CBCFF2C2921F}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.IntegrationTestUtilities.Net45", "../../../test/IntegrationTests/AWSSDK.IntegrationTestUtilities.Net45.csproj", "{7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.IntegrationTestUtilities.NetFramework", "../../../test/IntegrationTests/AWSSDK.IntegrationTestUtilities.NetFramework.csproj", "{7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.CommonTest", "../../../test/Common/AWSSDK.CommonTest.csproj", "{66F78F86-68D7-4538-8EA5-A669A08E1C19}" EndProject @@ -44,25 +34,15 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UnitTests.NetStandard.CoreO EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "IntegrationTestDependencies", "IntegrationTestDependencies", "{939EC5C2-8345-43E2-8F97-72EEEBEEA0AC}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.Extensions.CrtIntegration.Net35", "../../../../extensions/src/AWSSDK.Extensions.CrtIntegration/AWSSDK.Extensions.CrtIntegration.Net35.csproj", "{4A3310CF-BADB-4090-8A03-2C7BDD3D03EB}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.Extensions.CrtIntegration.Net45", "../../../../extensions/src/AWSSDK.Extensions.CrtIntegration/AWSSDK.Extensions.CrtIntegration.Net45.csproj", "{7478F22C-686D-4DB5-ABA5-F16A1AF99241}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.IdentityManagement.Net35", "../IdentityManagement/AWSSDK.IdentityManagement.Net35.csproj", "{3ED76324-9C6E-48F9-B712-15C02B7AA3A6}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.SecurityToken.Net35", "../SecurityToken/AWSSDK.SecurityToken.Net35.csproj", "{500A793E-12CF-4231-99BC-31A54E8BB0CC}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.SimpleNotificationService.Net35", "../SimpleNotificationService/AWSSDK.SimpleNotificationService.Net35.csproj", "{DF6237E2-C342-4BE0-BDD3-6A863678ADE9}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.S3.Net35", "../S3/AWSSDK.S3.Net35.csproj", "{8B724DD1-472E-4A8F-B56C-DF586479E985}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.Extensions.CrtIntegration.NetFramework", "../../../../extensions/src/AWSSDK.Extensions.CrtIntegration/AWSSDK.Extensions.CrtIntegration.NetFramework.csproj", "{9CEDA7DC-2E4B-4736-8DC7-BF4E90E8DD2E}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.IdentityManagement.Net45", "../IdentityManagement/AWSSDK.IdentityManagement.Net45.csproj", "{6354EF99-F5E4-4C0F-B47A-BF54C7CA7723}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.IdentityManagement.NetFramework", "../IdentityManagement/AWSSDK.IdentityManagement.NetFramework.csproj", "{D16C8543-2687-46C5-8382-D2EE8B415D80}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.S3.Net45", "../S3/AWSSDK.S3.Net45.csproj", "{9CB1236C-EBF7-46F9-A4DA-FD565D715E14}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.S3.NetFramework", "../S3/AWSSDK.S3.NetFramework.csproj", "{6CF06447-3AFA-40FC-B062-19CE71618B3D}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.SecurityToken.Net45", "../SecurityToken/AWSSDK.SecurityToken.Net45.csproj", "{2E37D1DA-C6A7-4B06-A116-2E9A950E1498}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.SecurityToken.NetFramework", "../SecurityToken/AWSSDK.SecurityToken.NetFramework.csproj", "{1E2E1EA8-2A0B-451F-9607-9C9916A9B85E}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.SimpleNotificationService.Net45", "../SimpleNotificationService/AWSSDK.SimpleNotificationService.Net45.csproj", "{5DE00CD1-A926-45FB-ABDE-7777AB4503CB}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.SimpleNotificationService.NetFramework", "../SimpleNotificationService/AWSSDK.SimpleNotificationService.NetFramework.csproj", "{FFA3C6AD-7345-43AE-A8E1-A3DF0790BB0D}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -70,10 +50,6 @@ Global Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {1FACE5D0-97BF-4069-B4F7-0FE28BB160F8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1FACE5D0-97BF-4069-B4F7-0FE28BB160F8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1FACE5D0-97BF-4069-B4F7-0FE28BB160F8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1FACE5D0-97BF-4069-B4F7-0FE28BB160F8}.Release|Any CPU.Build.0 = Release|Any CPU {7DE3AFA0-1B2D-41B1-82BD-120B8B210B43}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {7DE3AFA0-1B2D-41B1-82BD-120B8B210B43}.Debug|Any CPU.Build.0 = Debug|Any CPU {7DE3AFA0-1B2D-41B1-82BD-120B8B210B43}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -82,42 +58,26 @@ Global {A855B58E-ED32-40AE-AE8F-054F448B9F2C}.Debug|Any CPU.Build.0 = Debug|Any CPU {A855B58E-ED32-40AE-AE8F-054F448B9F2C}.Release|Any CPU.ActiveCfg = Release|Any CPU {A855B58E-ED32-40AE-AE8F-054F448B9F2C}.Release|Any CPU.Build.0 = Release|Any CPU - {27311484-DBD1-4904-B198-9A705D8AC371}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {27311484-DBD1-4904-B198-9A705D8AC371}.Debug|Any CPU.Build.0 = Debug|Any CPU - {27311484-DBD1-4904-B198-9A705D8AC371}.Release|Any CPU.ActiveCfg = Release|Any CPU - {27311484-DBD1-4904-B198-9A705D8AC371}.Release|Any CPU.Build.0 = Release|Any CPU - {5A6B618A-4B5E-4F9F-B6EF-E7ABCB76620C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5A6B618A-4B5E-4F9F-B6EF-E7ABCB76620C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5A6B618A-4B5E-4F9F-B6EF-E7ABCB76620C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5A6B618A-4B5E-4F9F-B6EF-E7ABCB76620C}.Release|Any CPU.Build.0 = Release|Any CPU + {7C598974-3384-4043-93A6-792976652191}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {7C598974-3384-4043-93A6-792976652191}.Debug|Any CPU.Build.0 = Debug|Any CPU + {7C598974-3384-4043-93A6-792976652191}.Release|Any CPU.ActiveCfg = Release|Any CPU + {7C598974-3384-4043-93A6-792976652191}.Release|Any CPU.Build.0 = Release|Any CPU {F427AC54-7704-4E1D-B3F8-7788D1D55453}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {F427AC54-7704-4E1D-B3F8-7788D1D55453}.Debug|Any CPU.Build.0 = Debug|Any CPU {F427AC54-7704-4E1D-B3F8-7788D1D55453}.Release|Any CPU.ActiveCfg = Release|Any CPU {F427AC54-7704-4E1D-B3F8-7788D1D55453}.Release|Any CPU.Build.0 = Release|Any CPU - {031DD9C5-0142-404D-B95A-68097DEEA78F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {031DD9C5-0142-404D-B95A-68097DEEA78F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {031DD9C5-0142-404D-B95A-68097DEEA78F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {031DD9C5-0142-404D-B95A-68097DEEA78F}.Release|Any CPU.Build.0 = Release|Any CPU - {41439816-6C6D-4066-9E58-E70F075976BE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {41439816-6C6D-4066-9E58-E70F075976BE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {41439816-6C6D-4066-9E58-E70F075976BE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {41439816-6C6D-4066-9E58-E70F075976BE}.Release|Any CPU.Build.0 = Release|Any CPU + {D3BD940D-546F-407D-9B6D-D907DE1C214E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {D3BD940D-546F-407D-9B6D-D907DE1C214E}.Debug|Any CPU.Build.0 = Debug|Any CPU + {D3BD940D-546F-407D-9B6D-D907DE1C214E}.Release|Any CPU.ActiveCfg = Release|Any CPU + {D3BD940D-546F-407D-9B6D-D907DE1C214E}.Release|Any CPU.Build.0 = Release|Any CPU {7BEE7C44-BE12-43CC-AFB9-B5852A1F43C8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {7BEE7C44-BE12-43CC-AFB9-B5852A1F43C8}.Debug|Any CPU.Build.0 = Debug|Any CPU {7BEE7C44-BE12-43CC-AFB9-B5852A1F43C8}.Release|Any CPU.ActiveCfg = Release|Any CPU {7BEE7C44-BE12-43CC-AFB9-B5852A1F43C8}.Release|Any CPU.Build.0 = Release|Any CPU - {A23CE153-A4A3-4D3A-A6DC-0DD1B207118E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A23CE153-A4A3-4D3A-A6DC-0DD1B207118E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A23CE153-A4A3-4D3A-A6DC-0DD1B207118E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A23CE153-A4A3-4D3A-A6DC-0DD1B207118E}.Release|Any CPU.Build.0 = Release|Any CPU {002B183F-E568-49CD-9D06-CBCFF2C2921F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {002B183F-E568-49CD-9D06-CBCFF2C2921F}.Debug|Any CPU.Build.0 = Debug|Any CPU {002B183F-E568-49CD-9D06-CBCFF2C2921F}.Release|Any CPU.ActiveCfg = Release|Any CPU {002B183F-E568-49CD-9D06-CBCFF2C2921F}.Release|Any CPU.Build.0 = Release|Any CPU - {924D2906-70D6-4D77-8603-816648B2CCA6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {924D2906-70D6-4D77-8603-816648B2CCA6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {924D2906-70D6-4D77-8603-816648B2CCA6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {924D2906-70D6-4D77-8603-816648B2CCA6}.Release|Any CPU.Build.0 = Release|Any CPU {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7}.Debug|Any CPU.Build.0 = Debug|Any CPU {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -134,78 +94,48 @@ Global {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {4A3310CF-BADB-4090-8A03-2C7BDD3D03EB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4A3310CF-BADB-4090-8A03-2C7BDD3D03EB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4A3310CF-BADB-4090-8A03-2C7BDD3D03EB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4A3310CF-BADB-4090-8A03-2C7BDD3D03EB}.Release|Any CPU.Build.0 = Release|Any CPU - {7478F22C-686D-4DB5-ABA5-F16A1AF99241}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7478F22C-686D-4DB5-ABA5-F16A1AF99241}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7478F22C-686D-4DB5-ABA5-F16A1AF99241}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7478F22C-686D-4DB5-ABA5-F16A1AF99241}.Release|Any CPU.Build.0 = Release|Any CPU - {3ED76324-9C6E-48F9-B712-15C02B7AA3A6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3ED76324-9C6E-48F9-B712-15C02B7AA3A6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3ED76324-9C6E-48F9-B712-15C02B7AA3A6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3ED76324-9C6E-48F9-B712-15C02B7AA3A6}.Release|Any CPU.Build.0 = Release|Any CPU - {500A793E-12CF-4231-99BC-31A54E8BB0CC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {500A793E-12CF-4231-99BC-31A54E8BB0CC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {500A793E-12CF-4231-99BC-31A54E8BB0CC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {500A793E-12CF-4231-99BC-31A54E8BB0CC}.Release|Any CPU.Build.0 = Release|Any CPU - {DF6237E2-C342-4BE0-BDD3-6A863678ADE9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DF6237E2-C342-4BE0-BDD3-6A863678ADE9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DF6237E2-C342-4BE0-BDD3-6A863678ADE9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DF6237E2-C342-4BE0-BDD3-6A863678ADE9}.Release|Any CPU.Build.0 = Release|Any CPU - {8B724DD1-472E-4A8F-B56C-DF586479E985}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8B724DD1-472E-4A8F-B56C-DF586479E985}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8B724DD1-472E-4A8F-B56C-DF586479E985}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8B724DD1-472E-4A8F-B56C-DF586479E985}.Release|Any CPU.Build.0 = Release|Any CPU - {6354EF99-F5E4-4C0F-B47A-BF54C7CA7723}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6354EF99-F5E4-4C0F-B47A-BF54C7CA7723}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6354EF99-F5E4-4C0F-B47A-BF54C7CA7723}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6354EF99-F5E4-4C0F-B47A-BF54C7CA7723}.Release|Any CPU.Build.0 = Release|Any CPU - {9CB1236C-EBF7-46F9-A4DA-FD565D715E14}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9CB1236C-EBF7-46F9-A4DA-FD565D715E14}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9CB1236C-EBF7-46F9-A4DA-FD565D715E14}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9CB1236C-EBF7-46F9-A4DA-FD565D715E14}.Release|Any CPU.Build.0 = Release|Any CPU - {2E37D1DA-C6A7-4B06-A116-2E9A950E1498}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2E37D1DA-C6A7-4B06-A116-2E9A950E1498}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2E37D1DA-C6A7-4B06-A116-2E9A950E1498}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2E37D1DA-C6A7-4B06-A116-2E9A950E1498}.Release|Any CPU.Build.0 = Release|Any CPU - {5DE00CD1-A926-45FB-ABDE-7777AB4503CB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5DE00CD1-A926-45FB-ABDE-7777AB4503CB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5DE00CD1-A926-45FB-ABDE-7777AB4503CB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5DE00CD1-A926-45FB-ABDE-7777AB4503CB}.Release|Any CPU.Build.0 = Release|Any CPU + {9CEDA7DC-2E4B-4736-8DC7-BF4E90E8DD2E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {9CEDA7DC-2E4B-4736-8DC7-BF4E90E8DD2E}.Debug|Any CPU.Build.0 = Debug|Any CPU + {9CEDA7DC-2E4B-4736-8DC7-BF4E90E8DD2E}.Release|Any CPU.ActiveCfg = Release|Any CPU + {9CEDA7DC-2E4B-4736-8DC7-BF4E90E8DD2E}.Release|Any CPU.Build.0 = Release|Any CPU + {D16C8543-2687-46C5-8382-D2EE8B415D80}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {D16C8543-2687-46C5-8382-D2EE8B415D80}.Debug|Any CPU.Build.0 = Debug|Any CPU + {D16C8543-2687-46C5-8382-D2EE8B415D80}.Release|Any CPU.ActiveCfg = Release|Any CPU + {D16C8543-2687-46C5-8382-D2EE8B415D80}.Release|Any CPU.Build.0 = Release|Any CPU + {6CF06447-3AFA-40FC-B062-19CE71618B3D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {6CF06447-3AFA-40FC-B062-19CE71618B3D}.Debug|Any CPU.Build.0 = Debug|Any CPU + {6CF06447-3AFA-40FC-B062-19CE71618B3D}.Release|Any CPU.ActiveCfg = Release|Any CPU + {6CF06447-3AFA-40FC-B062-19CE71618B3D}.Release|Any CPU.Build.0 = Release|Any CPU + {1E2E1EA8-2A0B-451F-9607-9C9916A9B85E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {1E2E1EA8-2A0B-451F-9607-9C9916A9B85E}.Debug|Any CPU.Build.0 = Debug|Any CPU + {1E2E1EA8-2A0B-451F-9607-9C9916A9B85E}.Release|Any CPU.ActiveCfg = Release|Any CPU + {1E2E1EA8-2A0B-451F-9607-9C9916A9B85E}.Release|Any CPU.Build.0 = Release|Any CPU + {FFA3C6AD-7345-43AE-A8E1-A3DF0790BB0D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {FFA3C6AD-7345-43AE-A8E1-A3DF0790BB0D}.Debug|Any CPU.Build.0 = Debug|Any CPU + {FFA3C6AD-7345-43AE-A8E1-A3DF0790BB0D}.Release|Any CPU.ActiveCfg = Release|Any CPU + {FFA3C6AD-7345-43AE-A8E1-A3DF0790BB0D}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution - {1FACE5D0-97BF-4069-B4F7-0FE28BB160F8} = {9863FCB3-BFA4-4B9C-B8F6-302BA5F660B8} {7DE3AFA0-1B2D-41B1-82BD-120B8B210B43} = {9863FCB3-BFA4-4B9C-B8F6-302BA5F660B8} {A855B58E-ED32-40AE-AE8F-054F448B9F2C} = {9863FCB3-BFA4-4B9C-B8F6-302BA5F660B8} {55C30A91-58E1-4527-ABE1-639D6EB62BE0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AB} - {27311484-DBD1-4904-B198-9A705D8AC371} = {55C30A91-58E1-4527-ABE1-639D6EB62BE0} - {5A6B618A-4B5E-4F9F-B6EF-E7ABCB76620C} = {55C30A91-58E1-4527-ABE1-639D6EB62BE0} + {7C598974-3384-4043-93A6-792976652191} = {55C30A91-58E1-4527-ABE1-639D6EB62BE0} {F427AC54-7704-4E1D-B3F8-7788D1D55453} = {55C30A91-58E1-4527-ABE1-639D6EB62BE0} - {031DD9C5-0142-404D-B95A-68097DEEA78F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {41439816-6C6D-4066-9E58-E70F075976BE} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {D3BD940D-546F-407D-9B6D-D907DE1C214E} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7BEE7C44-BE12-43CC-AFB9-B5852A1F43C8} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {A23CE153-A4A3-4D3A-A6DC-0DD1B207118E} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {924D2906-70D6-4D77-8603-816648B2CCA6} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {4A3310CF-BADB-4090-8A03-2C7BDD3D03EB} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {7478F22C-686D-4DB5-ABA5-F16A1AF99241} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {3ED76324-9C6E-48F9-B712-15C02B7AA3A6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {500A793E-12CF-4231-99BC-31A54E8BB0CC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {DF6237E2-C342-4BE0-BDD3-6A863678ADE9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8B724DD1-472E-4A8F-B56C-DF586479E985} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6354EF99-F5E4-4C0F-B47A-BF54C7CA7723} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {9CB1236C-EBF7-46F9-A4DA-FD565D715E14} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {2E37D1DA-C6A7-4B06-A116-2E9A950E1498} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {5DE00CD1-A926-45FB-ABDE-7777AB4503CB} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} + {9CEDA7DC-2E4B-4736-8DC7-BF4E90E8DD2E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} + {D16C8543-2687-46C5-8382-D2EE8B415D80} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} + {6CF06447-3AFA-40FC-B062-19CE71618B3D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} + {1E2E1EA8-2A0B-451F-9607-9C9916A9B85E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} + {FFA3C6AD-7345-43AE-A8E1-A3DF0790BB0D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {3ED252A6-BC16-46A8-BA93-3FF18C7DEC56} diff --git a/sdk/src/Services/GeoMaps/Properties/AssemblyInfo.cs b/sdk/src/Services/GeoMaps/Properties/AssemblyInfo.cs index 438e2308ef52..540ac2c7a7a0 100644 --- a/sdk/src/Services/GeoMaps/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/GeoMaps/Properties/AssemblyInfo.cs @@ -7,10 +7,8 @@ // set of attributes. Change these attribute values to modify the information // associated with an assembly. [assembly: AssemblyTitle("AWSSDK.GeoMaps")] -#if BCL35 -[assembly: AssemblyDescription("The Amazon Web Services SDK for .NET (3.5) - Amazon Location Service Maps V2. Release of Amazon Location Maps API. Maps enables you to build digital maps that showcase your locations, visualize your data, and unlock insights to drive your business")] -#elif BCL45 -[assembly: AssemblyDescription("The Amazon Web Services SDK for .NET (4.5) - Amazon Location Service Maps V2. Release of Amazon Location Maps API. Maps enables you to build digital maps that showcase your locations, visualize your data, and unlock insights to drive your business")] +#if BCL +[assembly: AssemblyDescription("The Amazon Web Services SDK for .NET (4.7.2) - Amazon Location Service Maps V2. Release of Amazon Location Maps API. Maps enables you to build digital maps that showcase your locations, visualize your data, and unlock insights to drive your business")] #elif NETSTANDARD20 [assembly: AssemblyDescription("The Amazon Web Services SDK for .NET (NetStandard 2.0) - Amazon Location Service Maps V2. Release of Amazon Location Maps API. Maps enables you to build digital maps that showcase your locations, visualize your data, and unlock insights to drive your business")] #elif NETCOREAPP3_1 @@ -43,9 +41,9 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.10")] - #if BCL -[assembly: System.Security.AllowPartiallyTrustedCallers] -#endif \ No newline at end of file +[assembly: AssemblyVersion("4.0")] +#else +[assembly: AssemblyVersion("4.0.0.0")] +#endif +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/src/Services/GeoPlaces/AWSSDK.GeoPlaces.Net35.csproj b/sdk/src/Services/GeoPlaces/AWSSDK.GeoPlaces.Net35.csproj deleted file mode 100644 index ff0155b5bfb7..000000000000 --- a/sdk/src/Services/GeoPlaces/AWSSDK.GeoPlaces.Net35.csproj +++ /dev/null @@ -1,83 +0,0 @@ - - - true - net35 - $(DefineConstants);BCL;BCL35;AWS_APM_API;CODE_ANALYSIS - portable - true - AWSSDK.GeoPlaces - AWSSDK.GeoPlaces - - false - false - false - false - false - false - false - false - true - true - - - C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v3.5\Profile\Client - - false - CA1822 - - - ../../../AWSDotNetSDK.ruleset - - - ../../../AWSDotNetSDKForBuild.ruleset - - - - - - ../../../awssdk.dll.snk - - - - - $(AWSKeyFile) - - - - - - - - - - - - - - - - - - - - - - - all - - - all - - - - - - - - - C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\v3.5\System.Data.Entity.dll - - - - - \ No newline at end of file diff --git a/sdk/src/Services/GeoPlaces/AWSSDK.GeoPlaces.Net45.csproj b/sdk/src/Services/GeoPlaces/AWSSDK.GeoPlaces.NetFramework.csproj similarity index 80% rename from sdk/src/Services/GeoPlaces/AWSSDK.GeoPlaces.Net45.csproj rename to sdk/src/Services/GeoPlaces/AWSSDK.GeoPlaces.NetFramework.csproj index d24f870b51c6..089970f11bd1 100644 --- a/sdk/src/Services/GeoPlaces/AWSSDK.GeoPlaces.Net45.csproj +++ b/sdk/src/Services/GeoPlaces/AWSSDK.GeoPlaces.NetFramework.csproj @@ -1,8 +1,8 @@ true - net45 - $(DefineConstants);BCL;BCL45;AWS_ASYNC_API;CODE_ANALYSIS + net472 + $(DefineConstants);BCL;AWS_ASYNC_API;CODE_ANALYSIS portable true AWSSDK.GeoPlaces @@ -21,6 +21,16 @@ CA1822 + + + 11.0 + + + 9.0 + ../../../AWSDotNetSDK.ruleset @@ -45,14 +55,13 @@ - - + diff --git a/sdk/src/Services/GeoPlaces/AWSSDK.GeoPlaces.NetStandard.csproj b/sdk/src/Services/GeoPlaces/AWSSDK.GeoPlaces.NetStandard.csproj index 3207a858e8a2..20433b02768a 100644 --- a/sdk/src/Services/GeoPlaces/AWSSDK.GeoPlaces.NetStandard.csproj +++ b/sdk/src/Services/GeoPlaces/AWSSDK.GeoPlaces.NetStandard.csproj @@ -31,6 +31,16 @@ true + + + 11.0 + + + 9.0 + ../../../AWSDotNetSDK.ruleset @@ -55,8 +65,6 @@ - - diff --git a/sdk/src/Services/GeoPlaces/Generated/AmazonGeoPlacesConfig.cs b/sdk/src/Services/GeoPlaces/Generated/AmazonGeoPlacesConfig.cs index 9998db2e3a19..82c9c8a9ec2d 100644 --- a/sdk/src/Services/GeoPlaces/Generated/AmazonGeoPlacesConfig.cs +++ b/sdk/src/Services/GeoPlaces/Generated/AmazonGeoPlacesConfig.cs @@ -21,6 +21,8 @@ using Amazon.Runtime; using Amazon.Runtime.Internal; using Amazon.Util.Internal; +using Amazon.Runtime.Internal.Auth; +using Amazon.Runtime.Endpoints; using Amazon.GeoPlaces.Internal; namespace Amazon.GeoPlaces @@ -32,7 +34,10 @@ namespace Amazon.GeoPlaces public partial class AmazonGeoPlacesConfig : ClientConfig { private static readonly string UserAgentString = - InternalSDKUtils.BuildUserAgentString("Geo Places", "3.7.400.10"); + InternalSDKUtils.BuildUserAgentString("Geo Places", "4.0.0.0"); + + private static readonly AmazonGeoPlacesEndpointResolver EndpointResolver = + new AmazonGeoPlacesEndpointResolver(); private string _userAgent = UserAgentString; /// @@ -89,5 +94,24 @@ public override string UserAgent } } + /// + /// Returns the endpoint that will be used for a particular request. + /// + /// A Container class for parameters used for endpoint resolution. + /// The resolved endpoint for the given request. + public override Amazon.Runtime.Endpoints.Endpoint DetermineServiceOperationEndpoint(ServiceOperationEndpointParameters parameters) + { + var requestContext = new RequestContext(false, new AWS4Signer()) + { + ClientConfig = this, + OriginalRequest = parameters.Request, + Request = new DefaultRequest(parameters.Request, ServiceId) + }; + + var executionContext = new Amazon.Runtime.Internal.ExecutionContext(requestContext, null); + return EndpointResolver.GetEndpoint(executionContext); + } + + } } \ No newline at end of file diff --git a/sdk/src/Services/GeoPlaces/Generated/AmazonGeoPlacesDefaultConfiguration.cs b/sdk/src/Services/GeoPlaces/Generated/AmazonGeoPlacesDefaultConfiguration.cs index 08e15a639e21..7e556c95d75f 100644 --- a/sdk/src/Services/GeoPlaces/Generated/AmazonGeoPlacesDefaultConfiguration.cs +++ b/sdk/src/Services/GeoPlaces/Generated/AmazonGeoPlacesDefaultConfiguration.cs @@ -43,8 +43,7 @@ public static ReadOnlyCollection GetAllConfigurations() InRegion, CrossRegion, Mobile, - Auto, - Legacy + Auto }); } @@ -55,7 +54,6 @@ public static ReadOnlyCollection GetAllConfigurations() { Name = DefaultConfigurationMode.Standard, RetryMode = RequestRetryMode.Standard, - StsRegionalEndpoints = StsRegionalEndpointsValue.Regional, S3UsEast1RegionalEndpoint = S3UsEast1RegionalEndpointValue.Regional, // 0:00:03.1 ConnectTimeout = TimeSpan.FromMilliseconds(3100L), @@ -71,7 +69,6 @@ public static ReadOnlyCollection GetAllConfigurations() { Name = DefaultConfigurationMode.InRegion, RetryMode = RequestRetryMode.Standard, - StsRegionalEndpoints = StsRegionalEndpointsValue.Regional, S3UsEast1RegionalEndpoint = S3UsEast1RegionalEndpointValue.Regional, // 0:00:01.1 ConnectTimeout = TimeSpan.FromMilliseconds(1100L), @@ -87,7 +84,6 @@ public static ReadOnlyCollection GetAllConfigurations() { Name = DefaultConfigurationMode.CrossRegion, RetryMode = RequestRetryMode.Standard, - StsRegionalEndpoints = StsRegionalEndpointsValue.Regional, S3UsEast1RegionalEndpoint = S3UsEast1RegionalEndpointValue.Regional, // 0:00:03.1 ConnectTimeout = TimeSpan.FromMilliseconds(3100L), @@ -103,7 +99,6 @@ public static ReadOnlyCollection GetAllConfigurations() { Name = DefaultConfigurationMode.Mobile, RetryMode = RequestRetryMode.Standard, - StsRegionalEndpoints = StsRegionalEndpointsValue.Regional, S3UsEast1RegionalEndpoint = S3UsEast1RegionalEndpointValue.Regional, // 0:00:30 ConnectTimeout = TimeSpan.FromMilliseconds(30000L), @@ -119,7 +114,6 @@ public static ReadOnlyCollection GetAllConfigurations() { Name = DefaultConfigurationMode.Auto, RetryMode = RequestRetryMode.Standard, - StsRegionalEndpoints = StsRegionalEndpointsValue.Regional, S3UsEast1RegionalEndpoint = S3UsEast1RegionalEndpointValue.Regional, // 0:00:01.1 ConnectTimeout = TimeSpan.FromMilliseconds(1100L), @@ -128,19 +122,5 @@ public static ReadOnlyCollection GetAllConfigurations() TimeToFirstByteTimeout = null, HttpRequestTimeout = null }; - /// - ///

    The LEGACY mode provides default settings that vary per SDK and were used prior to establishment of defaults_mode

    - ///     - public static IDefaultConfiguration Legacy {get;} = new DefaultConfiguration - { - Name = DefaultConfigurationMode.Legacy, - RetryMode = RequestRetryMode.Legacy, - StsRegionalEndpoints = StsRegionalEndpointsValue.Legacy, - S3UsEast1RegionalEndpoint = S3UsEast1RegionalEndpointValue.Legacy, - ConnectTimeout = null, - TlsNegotiationTimeout = null, - TimeToFirstByteTimeout = null, - HttpRequestTimeout = null - }; } } \ No newline at end of file diff --git a/sdk/src/Services/GeoPlaces/Generated/Model/AccessDeniedException.cs b/sdk/src/Services/GeoPlaces/Generated/Model/AccessDeniedException.cs index 603b63b19c26..8f2f9f9fd89a 100644 --- a/sdk/src/Services/GeoPlaces/Generated/Model/AccessDeniedException.cs +++ b/sdk/src/Services/GeoPlaces/Generated/Model/AccessDeniedException.cs @@ -106,11 +106,6 @@ protected AccessDeniedException(System.Runtime.Serialization.SerializationInfo i /// The that holds the serialized object data about the exception being thrown. /// The that contains contextual information about the source or destination. /// The parameter is a null reference (Nothing in Visual Basic). -#if BCL35 - [System.Security.Permissions.SecurityPermission( - System.Security.Permissions.SecurityAction.LinkDemand, - Flags = System.Security.Permissions.SecurityPermissionFlag.SerializationFormatter)] -#endif [System.Security.SecurityCritical] // These FxCop rules are giving false-positives for this method [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Security", "CA2123:OverrideLinkDemandsShouldBeIdenticalToBase")] diff --git a/sdk/src/Services/GeoPlaces/Generated/Model/AccessRestriction.cs b/sdk/src/Services/GeoPlaces/Generated/Model/AccessRestriction.cs index 270a3540f2fe..7de59cb667ff 100644 --- a/sdk/src/Services/GeoPlaces/Generated/Model/AccessRestriction.cs +++ b/sdk/src/Services/GeoPlaces/Generated/Model/AccessRestriction.cs @@ -63,9 +63,9 @@ internal bool IsSetCategories() /// The restriction. /// ///     - public bool Restricted + public bool? Restricted { - get { return this._restricted.GetValueOrDefault(); } + get { return this._restricted; } set { this._restricted = value; } } diff --git a/sdk/src/Services/GeoPlaces/Generated/Model/AddressComponentMatchScores.cs b/sdk/src/Services/GeoPlaces/Generated/Model/AddressComponentMatchScores.cs index a7cfcc8a2699..af65d88fd962 100644 --- a/sdk/src/Services/GeoPlaces/Generated/Model/AddressComponentMatchScores.cs +++ b/sdk/src/Services/GeoPlaces/Generated/Model/AddressComponentMatchScores.cs @@ -55,9 +55,9 @@ public partial class AddressComponentMatchScores ///     ///     [AWSProperty(Min=0, Max=1)] - public double AddressNumber + public double? AddressNumber { - get { return this._addressNumber.GetValueOrDefault(); } + get { return this._addressNumber; } set { this._addressNumber = value; } } @@ -78,9 +78,9 @@ internal bool IsSetAddressNumber() /// ///     [AWSProperty(Min=0, Max=1)] - public double Block + public double? Block { - get { return this._block.GetValueOrDefault(); } + get { return this._block; } set { this._block = value; } } @@ -97,9 +97,9 @@ internal bool IsSetBlock() /// /// [AWSProperty(Min=0, Max=1)] - public double Building + public double? Building { - get { return this._building.GetValueOrDefault(); } + get { return this._building; } set { this._building = value; } } @@ -117,9 +117,9 @@ internal bool IsSetBuilding() /// /// [AWSProperty(Min=0, Max=1)] - public double Country + public double? Country { - get { return this._country.GetValueOrDefault(); } + get { return this._country; } set { this._country = value; } } @@ -136,9 +136,9 @@ internal bool IsSetCountry() /// /// [AWSProperty(Min=0, Max=1)] - public double District + public double? District { - get { return this._district.GetValueOrDefault(); } + get { return this._district; } set { this._district = value; } } @@ -182,9 +182,9 @@ internal bool IsSetIntersection() /// /// [AWSProperty(Min=0, Max=1)] - public double Locality + public double? Locality { - get { return this._locality.GetValueOrDefault(); } + get { return this._locality; } set { this._locality = value; } } @@ -202,9 +202,9 @@ internal bool IsSetLocality() /// /// [AWSProperty(Min=0, Max=1)] - public double PostalCode + public double? PostalCode { - get { return this._postalCode.GetValueOrDefault(); } + get { return this._postalCode; } set { this._postalCode = value; } } @@ -225,9 +225,9 @@ internal bool IsSetPostalCode() /// /// [AWSProperty(Min=0, Max=1)] - public double Region + public double? Region { - get { return this._region.GetValueOrDefault(); } + get { return this._region; } set { this._region = value; } } @@ -248,9 +248,9 @@ internal bool IsSetRegion() /// /// [AWSProperty(Min=0, Max=1)] - public double SubBlock + public double? SubBlock { - get { return this._subBlock.GetValueOrDefault(); } + get { return this._subBlock; } set { this._subBlock = value; } } @@ -271,9 +271,9 @@ internal bool IsSetSubBlock() /// /// [AWSProperty(Min=0, Max=1)] - public double SubDistrict + public double? SubDistrict { - get { return this._subDistrict.GetValueOrDefault(); } + get { return this._subDistrict; } set { this._subDistrict = value; } } @@ -290,9 +290,9 @@ internal bool IsSetSubDistrict() /// /// [AWSProperty(Min=0, Max=1)] - public double SubRegion + public double? SubRegion { - get { return this._subRegion.GetValueOrDefault(); } + get { return this._subRegion; } set { this._subRegion = value; } } diff --git a/sdk/src/Services/GeoPlaces/Generated/Model/AutocompleteRequest.cs b/sdk/src/Services/GeoPlaces/Generated/Model/AutocompleteRequest.cs index d47fad53da4d..435273a52a29 100644 --- a/sdk/src/Services/GeoPlaces/Generated/Model/AutocompleteRequest.cs +++ b/sdk/src/Services/GeoPlaces/Generated/Model/AutocompleteRequest.cs @@ -180,9 +180,9 @@ internal bool IsSetLanguage() /// /// [AWSProperty(Min=1, Max=20)] - public int MaxResults + public int? MaxResults { - get { return this._maxResults.GetValueOrDefault(); } + get { return this._maxResults; } set { this._maxResults = value; } } diff --git a/sdk/src/Services/GeoPlaces/Generated/Model/AutocompleteResultItem.cs b/sdk/src/Services/GeoPlaces/Generated/Model/AutocompleteResultItem.cs index c8f8b63baa14..442dd60679ab 100644 --- a/sdk/src/Services/GeoPlaces/Generated/Model/AutocompleteResultItem.cs +++ b/sdk/src/Services/GeoPlaces/Generated/Model/AutocompleteResultItem.cs @@ -69,9 +69,9 @@ internal bool IsSetAddress() /// /// [AWSProperty(Min=0, Max=4294967295)] - public long Distance + public long? Distance { - get { return this._distance.GetValueOrDefault(); } + get { return this._distance; } set { this._distance = value; } } diff --git a/sdk/src/Services/GeoPlaces/Generated/Model/Category.cs b/sdk/src/Services/GeoPlaces/Generated/Model/Category.cs index 1b23a4e65c32..97d586df121e 100644 --- a/sdk/src/Services/GeoPlaces/Generated/Model/Category.cs +++ b/sdk/src/Services/GeoPlaces/Generated/Model/Category.cs @@ -102,9 +102,9 @@ internal bool IsSetName() /// Boolean which indicates if this category is the primary offered by the place. /// /// - public bool Primary + public bool? Primary { - get { return this._primary.GetValueOrDefault(); } + get { return this._primary; } set { this._primary = value; } } diff --git a/sdk/src/Services/GeoPlaces/Generated/Model/ComponentMatchScores.cs b/sdk/src/Services/GeoPlaces/Generated/Model/ComponentMatchScores.cs index e2e9cda70817..5e1bc2e688e8 100644 --- a/sdk/src/Services/GeoPlaces/Generated/Model/ComponentMatchScores.cs +++ b/sdk/src/Services/GeoPlaces/Generated/Model/ComponentMatchScores.cs @@ -64,9 +64,9 @@ internal bool IsSetAddress() /// /// [AWSProperty(Min=0, Max=1)] - public double Title + public double? Title { - get { return this._title.GetValueOrDefault(); } + get { return this._title; } set { this._title = value; } } diff --git a/sdk/src/Services/GeoPlaces/Generated/Model/FilterCircle.cs b/sdk/src/Services/GeoPlaces/Generated/Model/FilterCircle.cs index b06e0427c48e..2f0270506822 100644 --- a/sdk/src/Services/GeoPlaces/Generated/Model/FilterCircle.cs +++ b/sdk/src/Services/GeoPlaces/Generated/Model/FilterCircle.cs @@ -63,9 +63,9 @@ internal bool IsSetCenter() /// /// [AWSProperty(Required=true, Min=1, Max=21000000)] - public long Radius + public long? Radius { - get { return this._radius.GetValueOrDefault(); } + get { return this._radius; } set { this._radius = value; } } diff --git a/sdk/src/Services/GeoPlaces/Generated/Model/FoodType.cs b/sdk/src/Services/GeoPlaces/Generated/Model/FoodType.cs index bc3b58ab5a70..788b41330110 100644 --- a/sdk/src/Services/GeoPlaces/Generated/Model/FoodType.cs +++ b/sdk/src/Services/GeoPlaces/Generated/Model/FoodType.cs @@ -84,9 +84,9 @@ internal bool IsSetLocalizedName() /// be fast food. /// /// - public bool Primary + public bool? Primary { - get { return this._primary.GetValueOrDefault(); } + get { return this._primary; } set { this._primary = value; } } diff --git a/sdk/src/Services/GeoPlaces/Generated/Model/GeocodeRequest.cs b/sdk/src/Services/GeoPlaces/Generated/Model/GeocodeRequest.cs index c61e05c0242c..421faa7565a8 100644 --- a/sdk/src/Services/GeoPlaces/Generated/Model/GeocodeRequest.cs +++ b/sdk/src/Services/GeoPlaces/Generated/Model/GeocodeRequest.cs @@ -179,9 +179,9 @@ internal bool IsSetLanguage() /// /// [AWSProperty(Min=1, Max=100)] - public int MaxResults + public int? MaxResults { - get { return this._maxResults.GetValueOrDefault(); } + get { return this._maxResults; } set { this._maxResults = value; } } diff --git a/sdk/src/Services/GeoPlaces/Generated/Model/GeocodeResultItem.cs b/sdk/src/Services/GeoPlaces/Generated/Model/GeocodeResultItem.cs index a6737df0e55c..bcda23a6ae26 100644 --- a/sdk/src/Services/GeoPlaces/Generated/Model/GeocodeResultItem.cs +++ b/sdk/src/Services/GeoPlaces/Generated/Model/GeocodeResultItem.cs @@ -93,9 +93,9 @@ internal bool IsSetAddress() /// Boolean indicating if the address provided has been corrected. /// /// - public bool AddressNumberCorrected + public bool? AddressNumberCorrected { - get { return this._addressNumberCorrected.GetValueOrDefault(); } + get { return this._addressNumberCorrected; } set { this._addressNumberCorrected = value; } } @@ -131,9 +131,9 @@ internal bool IsSetCategories() /// /// [AWSProperty(Min=0, Max=4294967295)] - public long Distance + public long? Distance { - get { return this._distance.GetValueOrDefault(); } + get { return this._distance; } set { this._distance = value; } } diff --git a/sdk/src/Services/GeoPlaces/Generated/Model/GetPlaceResponse.cs b/sdk/src/Services/GeoPlaces/Generated/Model/GetPlaceResponse.cs index 980db136374e..5e81ffd75e85 100644 --- a/sdk/src/Services/GeoPlaces/Generated/Model/GetPlaceResponse.cs +++ b/sdk/src/Services/GeoPlaces/Generated/Model/GetPlaceResponse.cs @@ -117,9 +117,9 @@ internal bool IsSetAddress() /// Boolean indicating if the address provided has been corrected. /// /// - public bool AddressNumberCorrected + public bool? AddressNumberCorrected { - get { return this._addressNumberCorrected.GetValueOrDefault(); } + get { return this._addressNumberCorrected; } set { this._addressNumberCorrected = value; } } diff --git a/sdk/src/Services/GeoPlaces/Generated/Model/Highlight.cs b/sdk/src/Services/GeoPlaces/Generated/Model/Highlight.cs index f05059bbd393..ac9049c5d41f 100644 --- a/sdk/src/Services/GeoPlaces/Generated/Model/Highlight.cs +++ b/sdk/src/Services/GeoPlaces/Generated/Model/Highlight.cs @@ -45,9 +45,9 @@ public partial class Highlight /// /// [AWSProperty(Min=0)] - public int EndIndex + public int? EndIndex { - get { return this._endIndex.GetValueOrDefault(); } + get { return this._endIndex; } set { this._endIndex = value; } } @@ -64,9 +64,9 @@ internal bool IsSetEndIndex() /// /// [AWSProperty(Min=0)] - public int StartIndex + public int? StartIndex { - get { return this._startIndex.GetValueOrDefault(); } + get { return this._startIndex; } set { this._startIndex = value; } } diff --git a/sdk/src/Services/GeoPlaces/Generated/Model/Internal/MarshallTransformations/AccessRestrictionUnmarshaller.cs b/sdk/src/Services/GeoPlaces/Generated/Model/Internal/MarshallTransformations/AccessRestrictionUnmarshaller.cs index 4be97927ca2f..7fd0bdcc72a5 100644 --- a/sdk/src/Services/GeoPlaces/Generated/Model/Internal/MarshallTransformations/AccessRestrictionUnmarshaller.cs +++ b/sdk/src/Services/GeoPlaces/Generated/Model/Internal/MarshallTransformations/AccessRestrictionUnmarshaller.cs @@ -74,7 +74,7 @@ public AccessRestriction Unmarshall(JsonUnmarshallerContext context) } if (context.TestExpression("Restricted", targetDepth)) { - var unmarshaller = BoolUnmarshaller.Instance; + var unmarshaller = NullableBoolUnmarshaller.Instance; unmarshalledObject.Restricted = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/GeoPlaces/Generated/Model/Internal/MarshallTransformations/AddressComponentMatchScoresUnmarshaller.cs b/sdk/src/Services/GeoPlaces/Generated/Model/Internal/MarshallTransformations/AddressComponentMatchScoresUnmarshaller.cs index 5361fa5797e8..32e0817623d2 100644 --- a/sdk/src/Services/GeoPlaces/Generated/Model/Internal/MarshallTransformations/AddressComponentMatchScoresUnmarshaller.cs +++ b/sdk/src/Services/GeoPlaces/Generated/Model/Internal/MarshallTransformations/AddressComponentMatchScoresUnmarshaller.cs @@ -68,31 +68,31 @@ public AddressComponentMatchScores Unmarshall(JsonUnmarshallerContext context) { if (context.TestExpression("AddressNumber", targetDepth)) { - var unmarshaller = DoubleUnmarshaller.Instance; + var unmarshaller = NullableDoubleUnmarshaller.Instance; unmarshalledObject.AddressNumber = unmarshaller.Unmarshall(context); continue; } if (context.TestExpression("Block", targetDepth)) { - var unmarshaller = DoubleUnmarshaller.Instance; + var unmarshaller = NullableDoubleUnmarshaller.Instance; unmarshalledObject.Block = unmarshaller.Unmarshall(context); continue; } if (context.TestExpression("Building", targetDepth)) { - var unmarshaller = DoubleUnmarshaller.Instance; + var unmarshaller = NullableDoubleUnmarshaller.Instance; unmarshalledObject.Building = unmarshaller.Unmarshall(context); continue; } if (context.TestExpression("Country", targetDepth)) { - var unmarshaller = DoubleUnmarshaller.Instance; + var unmarshaller = NullableDoubleUnmarshaller.Instance; unmarshalledObject.Country = unmarshaller.Unmarshall(context); continue; } if (context.TestExpression("District", targetDepth)) { - var unmarshaller = DoubleUnmarshaller.Instance; + var unmarshaller = NullableDoubleUnmarshaller.Instance; unmarshalledObject.District = unmarshaller.Unmarshall(context); continue; } @@ -104,37 +104,37 @@ public AddressComponentMatchScores Unmarshall(JsonUnmarshallerContext context) } if (context.TestExpression("Locality", targetDepth)) { - var unmarshaller = DoubleUnmarshaller.Instance; + var unmarshaller = NullableDoubleUnmarshaller.Instance; unmarshalledObject.Locality = unmarshaller.Unmarshall(context); continue; } if (context.TestExpression("PostalCode", targetDepth)) { - var unmarshaller = DoubleUnmarshaller.Instance; + var unmarshaller = NullableDoubleUnmarshaller.Instance; unmarshalledObject.PostalCode = unmarshaller.Unmarshall(context); continue; } if (context.TestExpression("Region", targetDepth)) { - var unmarshaller = DoubleUnmarshaller.Instance; + var unmarshaller = NullableDoubleUnmarshaller.Instance; unmarshalledObject.Region = unmarshaller.Unmarshall(context); continue; } if (context.TestExpression("SubBlock", targetDepth)) { - var unmarshaller = DoubleUnmarshaller.Instance; + var unmarshaller = NullableDoubleUnmarshaller.Instance; unmarshalledObject.SubBlock = unmarshaller.Unmarshall(context); continue; } if (context.TestExpression("SubDistrict", targetDepth)) { - var unmarshaller = DoubleUnmarshaller.Instance; + var unmarshaller = NullableDoubleUnmarshaller.Instance; unmarshalledObject.SubDistrict = unmarshaller.Unmarshall(context); continue; } if (context.TestExpression("SubRegion", targetDepth)) { - var unmarshaller = DoubleUnmarshaller.Instance; + var unmarshaller = NullableDoubleUnmarshaller.Instance; unmarshalledObject.SubRegion = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/GeoPlaces/Generated/Model/Internal/MarshallTransformations/AutocompleteRequestMarshaller.cs b/sdk/src/Services/GeoPlaces/Generated/Model/Internal/MarshallTransformations/AutocompleteRequestMarshaller.cs index dd5442681166..9ad0e449e6ef 100644 --- a/sdk/src/Services/GeoPlaces/Generated/Model/Internal/MarshallTransformations/AutocompleteRequestMarshaller.cs +++ b/sdk/src/Services/GeoPlaces/Generated/Model/Internal/MarshallTransformations/AutocompleteRequestMarshaller.cs @@ -64,84 +64,87 @@ public IRequest Marshall(AutocompleteRequest publicRequest) if (publicRequest.IsSetKey()) request.Parameters.Add("key", StringUtils.FromString(publicRequest.Key)); request.ResourcePath = "/autocomplete"; - using (StringWriter stringWriter = new StringWriter(CultureInfo.InvariantCulture)) + using (MemoryStream memoryStream = new MemoryStream()) { - JsonWriter writer = new JsonWriter(stringWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetAdditionalFeatures()) + using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) { - context.Writer.WritePropertyName("AdditionalFeatures"); - context.Writer.WriteArrayStart(); - foreach(var publicRequestAdditionalFeaturesListValue in publicRequest.AdditionalFeatures) + JsonWriter writer = new JsonWriter(streamWriter); + writer.Validate = false; + writer.WriteObjectStart(); + var context = new JsonMarshallerContext(request, writer); + if(publicRequest.IsSetAdditionalFeatures()) { - context.Writer.Write(publicRequestAdditionalFeaturesListValue); + context.Writer.WritePropertyName("AdditionalFeatures"); + context.Writer.WriteArrayStart(); + foreach(var publicRequestAdditionalFeaturesListValue in publicRequest.AdditionalFeatures) + { + context.Writer.Write(publicRequestAdditionalFeaturesListValue); + } + context.Writer.WriteArrayEnd(); } - context.Writer.WriteArrayEnd(); - } - if(publicRequest.IsSetBiasPosition()) - { - context.Writer.WritePropertyName("BiasPosition"); - context.Writer.WriteArrayStart(); - foreach(var publicRequestBiasPositionListValue in publicRequest.BiasPosition) + if(publicRequest.IsSetBiasPosition()) { - context.Writer.Write(publicRequestBiasPositionListValue); + context.Writer.WritePropertyName("BiasPosition"); + context.Writer.WriteArrayStart(); + foreach(var publicRequestBiasPositionListValue in publicRequest.BiasPosition) + { + context.Writer.Write(publicRequestBiasPositionListValue); + } + context.Writer.WriteArrayEnd(); } - context.Writer.WriteArrayEnd(); - } - if(publicRequest.IsSetFilter()) - { - context.Writer.WritePropertyName("Filter"); - context.Writer.WriteObjectStart(); + if(publicRequest.IsSetFilter()) + { + context.Writer.WritePropertyName("Filter"); + context.Writer.WriteObjectStart(); - var marshaller = AutocompleteFilterMarshaller.Instance; - marshaller.Marshall(publicRequest.Filter, context); + var marshaller = AutocompleteFilterMarshaller.Instance; + marshaller.Marshall(publicRequest.Filter, context); - context.Writer.WriteObjectEnd(); - } + context.Writer.WriteObjectEnd(); + } - if(publicRequest.IsSetIntendedUse()) - { - context.Writer.WritePropertyName("IntendedUse"); - context.Writer.Write(publicRequest.IntendedUse); - } + if(publicRequest.IsSetIntendedUse()) + { + context.Writer.WritePropertyName("IntendedUse"); + context.Writer.Write(publicRequest.IntendedUse); + } - if(publicRequest.IsSetLanguage()) - { - context.Writer.WritePropertyName("Language"); - context.Writer.Write(publicRequest.Language); - } + if(publicRequest.IsSetLanguage()) + { + context.Writer.WritePropertyName("Language"); + context.Writer.Write(publicRequest.Language); + } - if(publicRequest.IsSetMaxResults()) - { - context.Writer.WritePropertyName("MaxResults"); - context.Writer.Write(publicRequest.MaxResults); - } + if(publicRequest.IsSetMaxResults()) + { + context.Writer.WritePropertyName("MaxResults"); + context.Writer.Write(publicRequest.MaxResults.Value); + } - if(publicRequest.IsSetPoliticalView()) - { - context.Writer.WritePropertyName("PoliticalView"); - context.Writer.Write(publicRequest.PoliticalView); - } + if(publicRequest.IsSetPoliticalView()) + { + context.Writer.WritePropertyName("PoliticalView"); + context.Writer.Write(publicRequest.PoliticalView); + } - if(publicRequest.IsSetPostalCodeMode()) - { - context.Writer.WritePropertyName("PostalCodeMode"); - context.Writer.Write(publicRequest.PostalCodeMode); - } + if(publicRequest.IsSetPostalCodeMode()) + { + context.Writer.WritePropertyName("PostalCodeMode"); + context.Writer.Write(publicRequest.PostalCodeMode); + } - if(publicRequest.IsSetQueryText()) - { - context.Writer.WritePropertyName("QueryText"); - context.Writer.Write(publicRequest.QueryText); + if(publicRequest.IsSetQueryText()) + { + context.Writer.WritePropertyName("QueryText"); + context.Writer.Write(publicRequest.QueryText); + } + + writer.WriteObjectEnd(); } - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); + request.Content = memoryStream.ToArray(); } request.UseQueryString = true; diff --git a/sdk/src/Services/GeoPlaces/Generated/Model/Internal/MarshallTransformations/AutocompleteResultItemUnmarshaller.cs b/sdk/src/Services/GeoPlaces/Generated/Model/Internal/MarshallTransformations/AutocompleteResultItemUnmarshaller.cs index cc1678f19604..027b2064b9fb 100644 --- a/sdk/src/Services/GeoPlaces/Generated/Model/Internal/MarshallTransformations/AutocompleteResultItemUnmarshaller.cs +++ b/sdk/src/Services/GeoPlaces/Generated/Model/Internal/MarshallTransformations/AutocompleteResultItemUnmarshaller.cs @@ -74,7 +74,7 @@ public AutocompleteResultItem Unmarshall(JsonUnmarshallerContext context) } if (context.TestExpression("Distance", targetDepth)) { - var unmarshaller = LongUnmarshaller.Instance; + var unmarshaller = NullableLongUnmarshaller.Instance; unmarshalledObject.Distance = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/GeoPlaces/Generated/Model/Internal/MarshallTransformations/CategoryUnmarshaller.cs b/sdk/src/Services/GeoPlaces/Generated/Model/Internal/MarshallTransformations/CategoryUnmarshaller.cs index 3fb34f8dbc5a..dbe924b6e4b0 100644 --- a/sdk/src/Services/GeoPlaces/Generated/Model/Internal/MarshallTransformations/CategoryUnmarshaller.cs +++ b/sdk/src/Services/GeoPlaces/Generated/Model/Internal/MarshallTransformations/CategoryUnmarshaller.cs @@ -86,7 +86,7 @@ public Category Unmarshall(JsonUnmarshallerContext context) } if (context.TestExpression("Primary", targetDepth)) { - var unmarshaller = BoolUnmarshaller.Instance; + var unmarshaller = NullableBoolUnmarshaller.Instance; unmarshalledObject.Primary = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/GeoPlaces/Generated/Model/Internal/MarshallTransformations/ComponentMatchScoresUnmarshaller.cs b/sdk/src/Services/GeoPlaces/Generated/Model/Internal/MarshallTransformations/ComponentMatchScoresUnmarshaller.cs index 794482f3c25a..c0c4482a31be 100644 --- a/sdk/src/Services/GeoPlaces/Generated/Model/Internal/MarshallTransformations/ComponentMatchScoresUnmarshaller.cs +++ b/sdk/src/Services/GeoPlaces/Generated/Model/Internal/MarshallTransformations/ComponentMatchScoresUnmarshaller.cs @@ -74,7 +74,7 @@ public ComponentMatchScores Unmarshall(JsonUnmarshallerContext context) } if (context.TestExpression("Title", targetDepth)) { - var unmarshaller = DoubleUnmarshaller.Instance; + var unmarshaller = NullableDoubleUnmarshaller.Instance; unmarshalledObject.Title = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/GeoPlaces/Generated/Model/Internal/MarshallTransformations/FilterCircleMarshaller.cs b/sdk/src/Services/GeoPlaces/Generated/Model/Internal/MarshallTransformations/FilterCircleMarshaller.cs index 15efafd7db2d..6ee85eaf0cdd 100644 --- a/sdk/src/Services/GeoPlaces/Generated/Model/Internal/MarshallTransformations/FilterCircleMarshaller.cs +++ b/sdk/src/Services/GeoPlaces/Generated/Model/Internal/MarshallTransformations/FilterCircleMarshaller.cs @@ -62,7 +62,7 @@ public void Marshall(FilterCircle requestObject, JsonMarshallerContext context) if(requestObject.IsSetRadius()) { context.Writer.WritePropertyName("Radius"); - context.Writer.Write(requestObject.Radius); + context.Writer.Write(requestObject.Radius.Value); } } diff --git a/sdk/src/Services/GeoPlaces/Generated/Model/Internal/MarshallTransformations/FoodTypeUnmarshaller.cs b/sdk/src/Services/GeoPlaces/Generated/Model/Internal/MarshallTransformations/FoodTypeUnmarshaller.cs index fcb6a1703078..db4bf52875d4 100644 --- a/sdk/src/Services/GeoPlaces/Generated/Model/Internal/MarshallTransformations/FoodTypeUnmarshaller.cs +++ b/sdk/src/Services/GeoPlaces/Generated/Model/Internal/MarshallTransformations/FoodTypeUnmarshaller.cs @@ -80,7 +80,7 @@ public FoodType Unmarshall(JsonUnmarshallerContext context) } if (context.TestExpression("Primary", targetDepth)) { - var unmarshaller = BoolUnmarshaller.Instance; + var unmarshaller = NullableBoolUnmarshaller.Instance; unmarshalledObject.Primary = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/GeoPlaces/Generated/Model/Internal/MarshallTransformations/GeocodeRequestMarshaller.cs b/sdk/src/Services/GeoPlaces/Generated/Model/Internal/MarshallTransformations/GeocodeRequestMarshaller.cs index ab2c14b95114..dcd2d1efa25d 100644 --- a/sdk/src/Services/GeoPlaces/Generated/Model/Internal/MarshallTransformations/GeocodeRequestMarshaller.cs +++ b/sdk/src/Services/GeoPlaces/Generated/Model/Internal/MarshallTransformations/GeocodeRequestMarshaller.cs @@ -64,89 +64,92 @@ public IRequest Marshall(GeocodeRequest publicRequest) if (publicRequest.IsSetKey()) request.Parameters.Add("key", StringUtils.FromString(publicRequest.Key)); request.ResourcePath = "/geocode"; - using (StringWriter stringWriter = new StringWriter(CultureInfo.InvariantCulture)) + using (MemoryStream memoryStream = new MemoryStream()) { - JsonWriter writer = new JsonWriter(stringWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetAdditionalFeatures()) + using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) { - context.Writer.WritePropertyName("AdditionalFeatures"); - context.Writer.WriteArrayStart(); - foreach(var publicRequestAdditionalFeaturesListValue in publicRequest.AdditionalFeatures) + JsonWriter writer = new JsonWriter(streamWriter); + writer.Validate = false; + writer.WriteObjectStart(); + var context = new JsonMarshallerContext(request, writer); + if(publicRequest.IsSetAdditionalFeatures()) { - context.Writer.Write(publicRequestAdditionalFeaturesListValue); + context.Writer.WritePropertyName("AdditionalFeatures"); + context.Writer.WriteArrayStart(); + foreach(var publicRequestAdditionalFeaturesListValue in publicRequest.AdditionalFeatures) + { + context.Writer.Write(publicRequestAdditionalFeaturesListValue); + } + context.Writer.WriteArrayEnd(); } - context.Writer.WriteArrayEnd(); - } - if(publicRequest.IsSetBiasPosition()) - { - context.Writer.WritePropertyName("BiasPosition"); - context.Writer.WriteArrayStart(); - foreach(var publicRequestBiasPositionListValue in publicRequest.BiasPosition) + if(publicRequest.IsSetBiasPosition()) { - context.Writer.Write(publicRequestBiasPositionListValue); + context.Writer.WritePropertyName("BiasPosition"); + context.Writer.WriteArrayStart(); + foreach(var publicRequestBiasPositionListValue in publicRequest.BiasPosition) + { + context.Writer.Write(publicRequestBiasPositionListValue); + } + context.Writer.WriteArrayEnd(); } - context.Writer.WriteArrayEnd(); - } - if(publicRequest.IsSetFilter()) - { - context.Writer.WritePropertyName("Filter"); - context.Writer.WriteObjectStart(); + if(publicRequest.IsSetFilter()) + { + context.Writer.WritePropertyName("Filter"); + context.Writer.WriteObjectStart(); - var marshaller = GeocodeFilterMarshaller.Instance; - marshaller.Marshall(publicRequest.Filter, context); + var marshaller = GeocodeFilterMarshaller.Instance; + marshaller.Marshall(publicRequest.Filter, context); - context.Writer.WriteObjectEnd(); - } + context.Writer.WriteObjectEnd(); + } - if(publicRequest.IsSetIntendedUse()) - { - context.Writer.WritePropertyName("IntendedUse"); - context.Writer.Write(publicRequest.IntendedUse); - } + if(publicRequest.IsSetIntendedUse()) + { + context.Writer.WritePropertyName("IntendedUse"); + context.Writer.Write(publicRequest.IntendedUse); + } - if(publicRequest.IsSetLanguage()) - { - context.Writer.WritePropertyName("Language"); - context.Writer.Write(publicRequest.Language); - } + if(publicRequest.IsSetLanguage()) + { + context.Writer.WritePropertyName("Language"); + context.Writer.Write(publicRequest.Language); + } - if(publicRequest.IsSetMaxResults()) - { - context.Writer.WritePropertyName("MaxResults"); - context.Writer.Write(publicRequest.MaxResults); - } + if(publicRequest.IsSetMaxResults()) + { + context.Writer.WritePropertyName("MaxResults"); + context.Writer.Write(publicRequest.MaxResults.Value); + } - if(publicRequest.IsSetPoliticalView()) - { - context.Writer.WritePropertyName("PoliticalView"); - context.Writer.Write(publicRequest.PoliticalView); - } + if(publicRequest.IsSetPoliticalView()) + { + context.Writer.WritePropertyName("PoliticalView"); + context.Writer.Write(publicRequest.PoliticalView); + } - if(publicRequest.IsSetQueryComponents()) - { - context.Writer.WritePropertyName("QueryComponents"); - context.Writer.WriteObjectStart(); + if(publicRequest.IsSetQueryComponents()) + { + context.Writer.WritePropertyName("QueryComponents"); + context.Writer.WriteObjectStart(); - var marshaller = GeocodeQueryComponentsMarshaller.Instance; - marshaller.Marshall(publicRequest.QueryComponents, context); + var marshaller = GeocodeQueryComponentsMarshaller.Instance; + marshaller.Marshall(publicRequest.QueryComponents, context); - context.Writer.WriteObjectEnd(); - } + context.Writer.WriteObjectEnd(); + } - if(publicRequest.IsSetQueryText()) - { - context.Writer.WritePropertyName("QueryText"); - context.Writer.Write(publicRequest.QueryText); + if(publicRequest.IsSetQueryText()) + { + context.Writer.WritePropertyName("QueryText"); + context.Writer.Write(publicRequest.QueryText); + } + + writer.WriteObjectEnd(); } - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); + request.Content = memoryStream.ToArray(); } request.UseQueryString = true; diff --git a/sdk/src/Services/GeoPlaces/Generated/Model/Internal/MarshallTransformations/GeocodeResultItemUnmarshaller.cs b/sdk/src/Services/GeoPlaces/Generated/Model/Internal/MarshallTransformations/GeocodeResultItemUnmarshaller.cs index 423202c3dd53..0a39e2509a8a 100644 --- a/sdk/src/Services/GeoPlaces/Generated/Model/Internal/MarshallTransformations/GeocodeResultItemUnmarshaller.cs +++ b/sdk/src/Services/GeoPlaces/Generated/Model/Internal/MarshallTransformations/GeocodeResultItemUnmarshaller.cs @@ -80,7 +80,7 @@ public GeocodeResultItem Unmarshall(JsonUnmarshallerContext context) } if (context.TestExpression("AddressNumberCorrected", targetDepth)) { - var unmarshaller = BoolUnmarshaller.Instance; + var unmarshaller = NullableBoolUnmarshaller.Instance; unmarshalledObject.AddressNumberCorrected = unmarshaller.Unmarshall(context); continue; } @@ -92,7 +92,7 @@ public GeocodeResultItem Unmarshall(JsonUnmarshallerContext context) } if (context.TestExpression("Distance", targetDepth)) { - var unmarshaller = LongUnmarshaller.Instance; + var unmarshaller = NullableLongUnmarshaller.Instance; unmarshalledObject.Distance = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/GeoPlaces/Generated/Model/Internal/MarshallTransformations/GetPlaceResponseUnmarshaller.cs b/sdk/src/Services/GeoPlaces/Generated/Model/Internal/MarshallTransformations/GetPlaceResponseUnmarshaller.cs index b694a8d3bf41..48de0beb0446 100644 --- a/sdk/src/Services/GeoPlaces/Generated/Model/Internal/MarshallTransformations/GetPlaceResponseUnmarshaller.cs +++ b/sdk/src/Services/GeoPlaces/Generated/Model/Internal/MarshallTransformations/GetPlaceResponseUnmarshaller.cs @@ -72,7 +72,7 @@ public override AmazonWebServiceResponse Unmarshall(JsonUnmarshallerContext cont } if (context.TestExpression("AddressNumberCorrected", targetDepth)) { - var unmarshaller = BoolUnmarshaller.Instance; + var unmarshaller = NullableBoolUnmarshaller.Instance; response.AddressNumberCorrected = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/GeoPlaces/Generated/Model/Internal/MarshallTransformations/HighlightUnmarshaller.cs b/sdk/src/Services/GeoPlaces/Generated/Model/Internal/MarshallTransformations/HighlightUnmarshaller.cs index 0380a073f325..84c0c0611564 100644 --- a/sdk/src/Services/GeoPlaces/Generated/Model/Internal/MarshallTransformations/HighlightUnmarshaller.cs +++ b/sdk/src/Services/GeoPlaces/Generated/Model/Internal/MarshallTransformations/HighlightUnmarshaller.cs @@ -68,13 +68,13 @@ public Highlight Unmarshall(JsonUnmarshallerContext context) { if (context.TestExpression("EndIndex", targetDepth)) { - var unmarshaller = IntUnmarshaller.Instance; + var unmarshaller = NullableIntUnmarshaller.Instance; unmarshalledObject.EndIndex = unmarshaller.Unmarshall(context); continue; } if (context.TestExpression("StartIndex", targetDepth)) { - var unmarshaller = IntUnmarshaller.Instance; + var unmarshaller = NullableIntUnmarshaller.Instance; unmarshalledObject.StartIndex = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/GeoPlaces/Generated/Model/Internal/MarshallTransformations/MatchScoreDetailsUnmarshaller.cs b/sdk/src/Services/GeoPlaces/Generated/Model/Internal/MarshallTransformations/MatchScoreDetailsUnmarshaller.cs index bca68690fc0e..298bc8b59554 100644 --- a/sdk/src/Services/GeoPlaces/Generated/Model/Internal/MarshallTransformations/MatchScoreDetailsUnmarshaller.cs +++ b/sdk/src/Services/GeoPlaces/Generated/Model/Internal/MarshallTransformations/MatchScoreDetailsUnmarshaller.cs @@ -74,7 +74,7 @@ public MatchScoreDetails Unmarshall(JsonUnmarshallerContext context) } if (context.TestExpression("Overall", targetDepth)) { - var unmarshaller = DoubleUnmarshaller.Instance; + var unmarshaller = NullableDoubleUnmarshaller.Instance; unmarshalledObject.Overall = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/GeoPlaces/Generated/Model/Internal/MarshallTransformations/OpeningHoursUnmarshaller.cs b/sdk/src/Services/GeoPlaces/Generated/Model/Internal/MarshallTransformations/OpeningHoursUnmarshaller.cs index 2fb65351edf3..8e263c2530aa 100644 --- a/sdk/src/Services/GeoPlaces/Generated/Model/Internal/MarshallTransformations/OpeningHoursUnmarshaller.cs +++ b/sdk/src/Services/GeoPlaces/Generated/Model/Internal/MarshallTransformations/OpeningHoursUnmarshaller.cs @@ -86,7 +86,7 @@ public OpeningHours Unmarshall(JsonUnmarshallerContext context) } if (context.TestExpression("OpenNow", targetDepth)) { - var unmarshaller = BoolUnmarshaller.Instance; + var unmarshaller = NullableBoolUnmarshaller.Instance; unmarshalledObject.OpenNow = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/GeoPlaces/Generated/Model/Internal/MarshallTransformations/PhonemeTranscriptionUnmarshaller.cs b/sdk/src/Services/GeoPlaces/Generated/Model/Internal/MarshallTransformations/PhonemeTranscriptionUnmarshaller.cs index 13b80b5d84b0..dbd43fc7d5ef 100644 --- a/sdk/src/Services/GeoPlaces/Generated/Model/Internal/MarshallTransformations/PhonemeTranscriptionUnmarshaller.cs +++ b/sdk/src/Services/GeoPlaces/Generated/Model/Internal/MarshallTransformations/PhonemeTranscriptionUnmarshaller.cs @@ -74,7 +74,7 @@ public PhonemeTranscription Unmarshall(JsonUnmarshallerContext context) } if (context.TestExpression("Preferred", targetDepth)) { - var unmarshaller = BoolUnmarshaller.Instance; + var unmarshaller = NullableBoolUnmarshaller.Instance; unmarshalledObject.Preferred = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/GeoPlaces/Generated/Model/Internal/MarshallTransformations/QueryRefinementUnmarshaller.cs b/sdk/src/Services/GeoPlaces/Generated/Model/Internal/MarshallTransformations/QueryRefinementUnmarshaller.cs index 965772adfdd1..c23ac5220828 100644 --- a/sdk/src/Services/GeoPlaces/Generated/Model/Internal/MarshallTransformations/QueryRefinementUnmarshaller.cs +++ b/sdk/src/Services/GeoPlaces/Generated/Model/Internal/MarshallTransformations/QueryRefinementUnmarshaller.cs @@ -68,7 +68,7 @@ public QueryRefinement Unmarshall(JsonUnmarshallerContext context) { if (context.TestExpression("EndIndex", targetDepth)) { - var unmarshaller = IntUnmarshaller.Instance; + var unmarshaller = NullableIntUnmarshaller.Instance; unmarshalledObject.EndIndex = unmarshaller.Unmarshall(context); continue; } @@ -86,7 +86,7 @@ public QueryRefinement Unmarshall(JsonUnmarshallerContext context) } if (context.TestExpression("StartIndex", targetDepth)) { - var unmarshaller = IntUnmarshaller.Instance; + var unmarshaller = NullableIntUnmarshaller.Instance; unmarshalledObject.StartIndex = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/GeoPlaces/Generated/Model/Internal/MarshallTransformations/ReverseGeocodeRequestMarshaller.cs b/sdk/src/Services/GeoPlaces/Generated/Model/Internal/MarshallTransformations/ReverseGeocodeRequestMarshaller.cs index 9228e9549486..1d7951ca1c00 100644 --- a/sdk/src/Services/GeoPlaces/Generated/Model/Internal/MarshallTransformations/ReverseGeocodeRequestMarshaller.cs +++ b/sdk/src/Services/GeoPlaces/Generated/Model/Internal/MarshallTransformations/ReverseGeocodeRequestMarshaller.cs @@ -64,78 +64,81 @@ public IRequest Marshall(ReverseGeocodeRequest publicRequest) if (publicRequest.IsSetKey()) request.Parameters.Add("key", StringUtils.FromString(publicRequest.Key)); request.ResourcePath = "/reverse-geocode"; - using (StringWriter stringWriter = new StringWriter(CultureInfo.InvariantCulture)) + using (MemoryStream memoryStream = new MemoryStream()) { - JsonWriter writer = new JsonWriter(stringWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetAdditionalFeatures()) + using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) { - context.Writer.WritePropertyName("AdditionalFeatures"); - context.Writer.WriteArrayStart(); - foreach(var publicRequestAdditionalFeaturesListValue in publicRequest.AdditionalFeatures) + JsonWriter writer = new JsonWriter(streamWriter); + writer.Validate = false; + writer.WriteObjectStart(); + var context = new JsonMarshallerContext(request, writer); + if(publicRequest.IsSetAdditionalFeatures()) { - context.Writer.Write(publicRequestAdditionalFeaturesListValue); + context.Writer.WritePropertyName("AdditionalFeatures"); + context.Writer.WriteArrayStart(); + foreach(var publicRequestAdditionalFeaturesListValue in publicRequest.AdditionalFeatures) + { + context.Writer.Write(publicRequestAdditionalFeaturesListValue); + } + context.Writer.WriteArrayEnd(); } - context.Writer.WriteArrayEnd(); - } - if(publicRequest.IsSetFilter()) - { - context.Writer.WritePropertyName("Filter"); - context.Writer.WriteObjectStart(); + if(publicRequest.IsSetFilter()) + { + context.Writer.WritePropertyName("Filter"); + context.Writer.WriteObjectStart(); - var marshaller = ReverseGeocodeFilterMarshaller.Instance; - marshaller.Marshall(publicRequest.Filter, context); + var marshaller = ReverseGeocodeFilterMarshaller.Instance; + marshaller.Marshall(publicRequest.Filter, context); - context.Writer.WriteObjectEnd(); - } + context.Writer.WriteObjectEnd(); + } - if(publicRequest.IsSetIntendedUse()) - { - context.Writer.WritePropertyName("IntendedUse"); - context.Writer.Write(publicRequest.IntendedUse); - } + if(publicRequest.IsSetIntendedUse()) + { + context.Writer.WritePropertyName("IntendedUse"); + context.Writer.Write(publicRequest.IntendedUse); + } - if(publicRequest.IsSetLanguage()) - { - context.Writer.WritePropertyName("Language"); - context.Writer.Write(publicRequest.Language); - } + if(publicRequest.IsSetLanguage()) + { + context.Writer.WritePropertyName("Language"); + context.Writer.Write(publicRequest.Language); + } - if(publicRequest.IsSetMaxResults()) - { - context.Writer.WritePropertyName("MaxResults"); - context.Writer.Write(publicRequest.MaxResults); - } + if(publicRequest.IsSetMaxResults()) + { + context.Writer.WritePropertyName("MaxResults"); + context.Writer.Write(publicRequest.MaxResults.Value); + } - if(publicRequest.IsSetPoliticalView()) - { - context.Writer.WritePropertyName("PoliticalView"); - context.Writer.Write(publicRequest.PoliticalView); - } + if(publicRequest.IsSetPoliticalView()) + { + context.Writer.WritePropertyName("PoliticalView"); + context.Writer.Write(publicRequest.PoliticalView); + } - if(publicRequest.IsSetQueryPosition()) - { - context.Writer.WritePropertyName("QueryPosition"); - context.Writer.WriteArrayStart(); - foreach(var publicRequestQueryPositionListValue in publicRequest.QueryPosition) + if(publicRequest.IsSetQueryPosition()) { - context.Writer.Write(publicRequestQueryPositionListValue); + context.Writer.WritePropertyName("QueryPosition"); + context.Writer.WriteArrayStart(); + foreach(var publicRequestQueryPositionListValue in publicRequest.QueryPosition) + { + context.Writer.Write(publicRequestQueryPositionListValue); + } + context.Writer.WriteArrayEnd(); } - context.Writer.WriteArrayEnd(); - } - if(publicRequest.IsSetQueryRadius()) - { - context.Writer.WritePropertyName("QueryRadius"); - context.Writer.Write(publicRequest.QueryRadius); + if(publicRequest.IsSetQueryRadius()) + { + context.Writer.WritePropertyName("QueryRadius"); + context.Writer.Write(publicRequest.QueryRadius.Value); + } + + writer.WriteObjectEnd(); } - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); + request.Content = memoryStream.ToArray(); } request.UseQueryString = true; diff --git a/sdk/src/Services/GeoPlaces/Generated/Model/Internal/MarshallTransformations/ReverseGeocodeResultItemUnmarshaller.cs b/sdk/src/Services/GeoPlaces/Generated/Model/Internal/MarshallTransformations/ReverseGeocodeResultItemUnmarshaller.cs index 23d58be24747..f6a434886c5c 100644 --- a/sdk/src/Services/GeoPlaces/Generated/Model/Internal/MarshallTransformations/ReverseGeocodeResultItemUnmarshaller.cs +++ b/sdk/src/Services/GeoPlaces/Generated/Model/Internal/MarshallTransformations/ReverseGeocodeResultItemUnmarshaller.cs @@ -80,7 +80,7 @@ public ReverseGeocodeResultItem Unmarshall(JsonUnmarshallerContext context) } if (context.TestExpression("AddressNumberCorrected", targetDepth)) { - var unmarshaller = BoolUnmarshaller.Instance; + var unmarshaller = NullableBoolUnmarshaller.Instance; unmarshalledObject.AddressNumberCorrected = unmarshaller.Unmarshall(context); continue; } @@ -92,7 +92,7 @@ public ReverseGeocodeResultItem Unmarshall(JsonUnmarshallerContext context) } if (context.TestExpression("Distance", targetDepth)) { - var unmarshaller = LongUnmarshaller.Instance; + var unmarshaller = NullableLongUnmarshaller.Instance; unmarshalledObject.Distance = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/GeoPlaces/Generated/Model/Internal/MarshallTransformations/SearchNearbyRequestMarshaller.cs b/sdk/src/Services/GeoPlaces/Generated/Model/Internal/MarshallTransformations/SearchNearbyRequestMarshaller.cs index edcd892e2c60..e85457250f8f 100644 --- a/sdk/src/Services/GeoPlaces/Generated/Model/Internal/MarshallTransformations/SearchNearbyRequestMarshaller.cs +++ b/sdk/src/Services/GeoPlaces/Generated/Model/Internal/MarshallTransformations/SearchNearbyRequestMarshaller.cs @@ -64,84 +64,87 @@ public IRequest Marshall(SearchNearbyRequest publicRequest) if (publicRequest.IsSetKey()) request.Parameters.Add("key", StringUtils.FromString(publicRequest.Key)); request.ResourcePath = "/search-nearby"; - using (StringWriter stringWriter = new StringWriter(CultureInfo.InvariantCulture)) + using (MemoryStream memoryStream = new MemoryStream()) { - JsonWriter writer = new JsonWriter(stringWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetAdditionalFeatures()) + using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) { - context.Writer.WritePropertyName("AdditionalFeatures"); - context.Writer.WriteArrayStart(); - foreach(var publicRequestAdditionalFeaturesListValue in publicRequest.AdditionalFeatures) + JsonWriter writer = new JsonWriter(streamWriter); + writer.Validate = false; + writer.WriteObjectStart(); + var context = new JsonMarshallerContext(request, writer); + if(publicRequest.IsSetAdditionalFeatures()) { - context.Writer.Write(publicRequestAdditionalFeaturesListValue); + context.Writer.WritePropertyName("AdditionalFeatures"); + context.Writer.WriteArrayStart(); + foreach(var publicRequestAdditionalFeaturesListValue in publicRequest.AdditionalFeatures) + { + context.Writer.Write(publicRequestAdditionalFeaturesListValue); + } + context.Writer.WriteArrayEnd(); } - context.Writer.WriteArrayEnd(); - } - if(publicRequest.IsSetFilter()) - { - context.Writer.WritePropertyName("Filter"); - context.Writer.WriteObjectStart(); + if(publicRequest.IsSetFilter()) + { + context.Writer.WritePropertyName("Filter"); + context.Writer.WriteObjectStart(); - var marshaller = SearchNearbyFilterMarshaller.Instance; - marshaller.Marshall(publicRequest.Filter, context); + var marshaller = SearchNearbyFilterMarshaller.Instance; + marshaller.Marshall(publicRequest.Filter, context); - context.Writer.WriteObjectEnd(); - } + context.Writer.WriteObjectEnd(); + } - if(publicRequest.IsSetIntendedUse()) - { - context.Writer.WritePropertyName("IntendedUse"); - context.Writer.Write(publicRequest.IntendedUse); - } + if(publicRequest.IsSetIntendedUse()) + { + context.Writer.WritePropertyName("IntendedUse"); + context.Writer.Write(publicRequest.IntendedUse); + } - if(publicRequest.IsSetLanguage()) - { - context.Writer.WritePropertyName("Language"); - context.Writer.Write(publicRequest.Language); - } + if(publicRequest.IsSetLanguage()) + { + context.Writer.WritePropertyName("Language"); + context.Writer.Write(publicRequest.Language); + } - if(publicRequest.IsSetMaxResults()) - { - context.Writer.WritePropertyName("MaxResults"); - context.Writer.Write(publicRequest.MaxResults); - } + if(publicRequest.IsSetMaxResults()) + { + context.Writer.WritePropertyName("MaxResults"); + context.Writer.Write(publicRequest.MaxResults.Value); + } - if(publicRequest.IsSetNextToken()) - { - context.Writer.WritePropertyName("NextToken"); - context.Writer.Write(publicRequest.NextToken); - } + if(publicRequest.IsSetNextToken()) + { + context.Writer.WritePropertyName("NextToken"); + context.Writer.Write(publicRequest.NextToken); + } - if(publicRequest.IsSetPoliticalView()) - { - context.Writer.WritePropertyName("PoliticalView"); - context.Writer.Write(publicRequest.PoliticalView); - } + if(publicRequest.IsSetPoliticalView()) + { + context.Writer.WritePropertyName("PoliticalView"); + context.Writer.Write(publicRequest.PoliticalView); + } - if(publicRequest.IsSetQueryPosition()) - { - context.Writer.WritePropertyName("QueryPosition"); - context.Writer.WriteArrayStart(); - foreach(var publicRequestQueryPositionListValue in publicRequest.QueryPosition) + if(publicRequest.IsSetQueryPosition()) { - context.Writer.Write(publicRequestQueryPositionListValue); + context.Writer.WritePropertyName("QueryPosition"); + context.Writer.WriteArrayStart(); + foreach(var publicRequestQueryPositionListValue in publicRequest.QueryPosition) + { + context.Writer.Write(publicRequestQueryPositionListValue); + } + context.Writer.WriteArrayEnd(); } - context.Writer.WriteArrayEnd(); - } - if(publicRequest.IsSetQueryRadius()) - { - context.Writer.WritePropertyName("QueryRadius"); - context.Writer.Write(publicRequest.QueryRadius); + if(publicRequest.IsSetQueryRadius()) + { + context.Writer.WritePropertyName("QueryRadius"); + context.Writer.Write(publicRequest.QueryRadius.Value); + } + + writer.WriteObjectEnd(); } - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); + request.Content = memoryStream.ToArray(); } request.UseQueryString = true; diff --git a/sdk/src/Services/GeoPlaces/Generated/Model/Internal/MarshallTransformations/SearchNearbyResultItemUnmarshaller.cs b/sdk/src/Services/GeoPlaces/Generated/Model/Internal/MarshallTransformations/SearchNearbyResultItemUnmarshaller.cs index b391ebfa763e..d3170c4b76fe 100644 --- a/sdk/src/Services/GeoPlaces/Generated/Model/Internal/MarshallTransformations/SearchNearbyResultItemUnmarshaller.cs +++ b/sdk/src/Services/GeoPlaces/Generated/Model/Internal/MarshallTransformations/SearchNearbyResultItemUnmarshaller.cs @@ -86,7 +86,7 @@ public SearchNearbyResultItem Unmarshall(JsonUnmarshallerContext context) } if (context.TestExpression("AddressNumberCorrected", targetDepth)) { - var unmarshaller = BoolUnmarshaller.Instance; + var unmarshaller = NullableBoolUnmarshaller.Instance; unmarshalledObject.AddressNumberCorrected = unmarshaller.Unmarshall(context); continue; } @@ -110,7 +110,7 @@ public SearchNearbyResultItem Unmarshall(JsonUnmarshallerContext context) } if (context.TestExpression("Distance", targetDepth)) { - var unmarshaller = LongUnmarshaller.Instance; + var unmarshaller = NullableLongUnmarshaller.Instance; unmarshalledObject.Distance = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/GeoPlaces/Generated/Model/Internal/MarshallTransformations/SearchTextRequestMarshaller.cs b/sdk/src/Services/GeoPlaces/Generated/Model/Internal/MarshallTransformations/SearchTextRequestMarshaller.cs index 54e7fd5627a1..b5e097f565c3 100644 --- a/sdk/src/Services/GeoPlaces/Generated/Model/Internal/MarshallTransformations/SearchTextRequestMarshaller.cs +++ b/sdk/src/Services/GeoPlaces/Generated/Model/Internal/MarshallTransformations/SearchTextRequestMarshaller.cs @@ -64,90 +64,93 @@ public IRequest Marshall(SearchTextRequest publicRequest) if (publicRequest.IsSetKey()) request.Parameters.Add("key", StringUtils.FromString(publicRequest.Key)); request.ResourcePath = "/search-text"; - using (StringWriter stringWriter = new StringWriter(CultureInfo.InvariantCulture)) + using (MemoryStream memoryStream = new MemoryStream()) { - JsonWriter writer = new JsonWriter(stringWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetAdditionalFeatures()) + using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) { - context.Writer.WritePropertyName("AdditionalFeatures"); - context.Writer.WriteArrayStart(); - foreach(var publicRequestAdditionalFeaturesListValue in publicRequest.AdditionalFeatures) + JsonWriter writer = new JsonWriter(streamWriter); + writer.Validate = false; + writer.WriteObjectStart(); + var context = new JsonMarshallerContext(request, writer); + if(publicRequest.IsSetAdditionalFeatures()) { - context.Writer.Write(publicRequestAdditionalFeaturesListValue); + context.Writer.WritePropertyName("AdditionalFeatures"); + context.Writer.WriteArrayStart(); + foreach(var publicRequestAdditionalFeaturesListValue in publicRequest.AdditionalFeatures) + { + context.Writer.Write(publicRequestAdditionalFeaturesListValue); + } + context.Writer.WriteArrayEnd(); } - context.Writer.WriteArrayEnd(); - } - if(publicRequest.IsSetBiasPosition()) - { - context.Writer.WritePropertyName("BiasPosition"); - context.Writer.WriteArrayStart(); - foreach(var publicRequestBiasPositionListValue in publicRequest.BiasPosition) + if(publicRequest.IsSetBiasPosition()) { - context.Writer.Write(publicRequestBiasPositionListValue); + context.Writer.WritePropertyName("BiasPosition"); + context.Writer.WriteArrayStart(); + foreach(var publicRequestBiasPositionListValue in publicRequest.BiasPosition) + { + context.Writer.Write(publicRequestBiasPositionListValue); + } + context.Writer.WriteArrayEnd(); } - context.Writer.WriteArrayEnd(); - } - if(publicRequest.IsSetFilter()) - { - context.Writer.WritePropertyName("Filter"); - context.Writer.WriteObjectStart(); + if(publicRequest.IsSetFilter()) + { + context.Writer.WritePropertyName("Filter"); + context.Writer.WriteObjectStart(); - var marshaller = SearchTextFilterMarshaller.Instance; - marshaller.Marshall(publicRequest.Filter, context); + var marshaller = SearchTextFilterMarshaller.Instance; + marshaller.Marshall(publicRequest.Filter, context); - context.Writer.WriteObjectEnd(); - } + context.Writer.WriteObjectEnd(); + } - if(publicRequest.IsSetIntendedUse()) - { - context.Writer.WritePropertyName("IntendedUse"); - context.Writer.Write(publicRequest.IntendedUse); - } + if(publicRequest.IsSetIntendedUse()) + { + context.Writer.WritePropertyName("IntendedUse"); + context.Writer.Write(publicRequest.IntendedUse); + } - if(publicRequest.IsSetLanguage()) - { - context.Writer.WritePropertyName("Language"); - context.Writer.Write(publicRequest.Language); - } + if(publicRequest.IsSetLanguage()) + { + context.Writer.WritePropertyName("Language"); + context.Writer.Write(publicRequest.Language); + } - if(publicRequest.IsSetMaxResults()) - { - context.Writer.WritePropertyName("MaxResults"); - context.Writer.Write(publicRequest.MaxResults); - } + if(publicRequest.IsSetMaxResults()) + { + context.Writer.WritePropertyName("MaxResults"); + context.Writer.Write(publicRequest.MaxResults.Value); + } - if(publicRequest.IsSetNextToken()) - { - context.Writer.WritePropertyName("NextToken"); - context.Writer.Write(publicRequest.NextToken); - } + if(publicRequest.IsSetNextToken()) + { + context.Writer.WritePropertyName("NextToken"); + context.Writer.Write(publicRequest.NextToken); + } - if(publicRequest.IsSetPoliticalView()) - { - context.Writer.WritePropertyName("PoliticalView"); - context.Writer.Write(publicRequest.PoliticalView); - } + if(publicRequest.IsSetPoliticalView()) + { + context.Writer.WritePropertyName("PoliticalView"); + context.Writer.Write(publicRequest.PoliticalView); + } - if(publicRequest.IsSetQueryId()) - { - context.Writer.WritePropertyName("QueryId"); - context.Writer.Write(publicRequest.QueryId); - } + if(publicRequest.IsSetQueryId()) + { + context.Writer.WritePropertyName("QueryId"); + context.Writer.Write(publicRequest.QueryId); + } - if(publicRequest.IsSetQueryText()) - { - context.Writer.WritePropertyName("QueryText"); - context.Writer.Write(publicRequest.QueryText); + if(publicRequest.IsSetQueryText()) + { + context.Writer.WritePropertyName("QueryText"); + context.Writer.Write(publicRequest.QueryText); + } + + writer.WriteObjectEnd(); } - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); + request.Content = memoryStream.ToArray(); } request.UseQueryString = true; diff --git a/sdk/src/Services/GeoPlaces/Generated/Model/Internal/MarshallTransformations/SearchTextResultItemUnmarshaller.cs b/sdk/src/Services/GeoPlaces/Generated/Model/Internal/MarshallTransformations/SearchTextResultItemUnmarshaller.cs index 87afb3277ade..6a190c3cf666 100644 --- a/sdk/src/Services/GeoPlaces/Generated/Model/Internal/MarshallTransformations/SearchTextResultItemUnmarshaller.cs +++ b/sdk/src/Services/GeoPlaces/Generated/Model/Internal/MarshallTransformations/SearchTextResultItemUnmarshaller.cs @@ -86,7 +86,7 @@ public SearchTextResultItem Unmarshall(JsonUnmarshallerContext context) } if (context.TestExpression("AddressNumberCorrected", targetDepth)) { - var unmarshaller = BoolUnmarshaller.Instance; + var unmarshaller = NullableBoolUnmarshaller.Instance; unmarshalledObject.AddressNumberCorrected = unmarshaller.Unmarshall(context); continue; } @@ -110,7 +110,7 @@ public SearchTextResultItem Unmarshall(JsonUnmarshallerContext context) } if (context.TestExpression("Distance", targetDepth)) { - var unmarshaller = LongUnmarshaller.Instance; + var unmarshaller = NullableLongUnmarshaller.Instance; unmarshalledObject.Distance = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/GeoPlaces/Generated/Model/Internal/MarshallTransformations/SuggestPlaceResultUnmarshaller.cs b/sdk/src/Services/GeoPlaces/Generated/Model/Internal/MarshallTransformations/SuggestPlaceResultUnmarshaller.cs index 236b83d3a6b2..c446c5531369 100644 --- a/sdk/src/Services/GeoPlaces/Generated/Model/Internal/MarshallTransformations/SuggestPlaceResultUnmarshaller.cs +++ b/sdk/src/Services/GeoPlaces/Generated/Model/Internal/MarshallTransformations/SuggestPlaceResultUnmarshaller.cs @@ -98,7 +98,7 @@ public SuggestPlaceResult Unmarshall(JsonUnmarshallerContext context) } if (context.TestExpression("Distance", targetDepth)) { - var unmarshaller = LongUnmarshaller.Instance; + var unmarshaller = NullableLongUnmarshaller.Instance; unmarshalledObject.Distance = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/GeoPlaces/Generated/Model/Internal/MarshallTransformations/SuggestRequestMarshaller.cs b/sdk/src/Services/GeoPlaces/Generated/Model/Internal/MarshallTransformations/SuggestRequestMarshaller.cs index 7b09d9729ccd..24cfb959fcb2 100644 --- a/sdk/src/Services/GeoPlaces/Generated/Model/Internal/MarshallTransformations/SuggestRequestMarshaller.cs +++ b/sdk/src/Services/GeoPlaces/Generated/Model/Internal/MarshallTransformations/SuggestRequestMarshaller.cs @@ -64,84 +64,87 @@ public IRequest Marshall(SuggestRequest publicRequest) if (publicRequest.IsSetKey()) request.Parameters.Add("key", StringUtils.FromString(publicRequest.Key)); request.ResourcePath = "/suggest"; - using (StringWriter stringWriter = new StringWriter(CultureInfo.InvariantCulture)) + using (MemoryStream memoryStream = new MemoryStream()) { - JsonWriter writer = new JsonWriter(stringWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetAdditionalFeatures()) + using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) { - context.Writer.WritePropertyName("AdditionalFeatures"); - context.Writer.WriteArrayStart(); - foreach(var publicRequestAdditionalFeaturesListValue in publicRequest.AdditionalFeatures) + JsonWriter writer = new JsonWriter(streamWriter); + writer.Validate = false; + writer.WriteObjectStart(); + var context = new JsonMarshallerContext(request, writer); + if(publicRequest.IsSetAdditionalFeatures()) { - context.Writer.Write(publicRequestAdditionalFeaturesListValue); + context.Writer.WritePropertyName("AdditionalFeatures"); + context.Writer.WriteArrayStart(); + foreach(var publicRequestAdditionalFeaturesListValue in publicRequest.AdditionalFeatures) + { + context.Writer.Write(publicRequestAdditionalFeaturesListValue); + } + context.Writer.WriteArrayEnd(); } - context.Writer.WriteArrayEnd(); - } - if(publicRequest.IsSetBiasPosition()) - { - context.Writer.WritePropertyName("BiasPosition"); - context.Writer.WriteArrayStart(); - foreach(var publicRequestBiasPositionListValue in publicRequest.BiasPosition) + if(publicRequest.IsSetBiasPosition()) { - context.Writer.Write(publicRequestBiasPositionListValue); + context.Writer.WritePropertyName("BiasPosition"); + context.Writer.WriteArrayStart(); + foreach(var publicRequestBiasPositionListValue in publicRequest.BiasPosition) + { + context.Writer.Write(publicRequestBiasPositionListValue); + } + context.Writer.WriteArrayEnd(); } - context.Writer.WriteArrayEnd(); - } - if(publicRequest.IsSetFilter()) - { - context.Writer.WritePropertyName("Filter"); - context.Writer.WriteObjectStart(); + if(publicRequest.IsSetFilter()) + { + context.Writer.WritePropertyName("Filter"); + context.Writer.WriteObjectStart(); - var marshaller = SuggestFilterMarshaller.Instance; - marshaller.Marshall(publicRequest.Filter, context); + var marshaller = SuggestFilterMarshaller.Instance; + marshaller.Marshall(publicRequest.Filter, context); - context.Writer.WriteObjectEnd(); - } + context.Writer.WriteObjectEnd(); + } - if(publicRequest.IsSetIntendedUse()) - { - context.Writer.WritePropertyName("IntendedUse"); - context.Writer.Write(publicRequest.IntendedUse); - } + if(publicRequest.IsSetIntendedUse()) + { + context.Writer.WritePropertyName("IntendedUse"); + context.Writer.Write(publicRequest.IntendedUse); + } - if(publicRequest.IsSetLanguage()) - { - context.Writer.WritePropertyName("Language"); - context.Writer.Write(publicRequest.Language); - } + if(publicRequest.IsSetLanguage()) + { + context.Writer.WritePropertyName("Language"); + context.Writer.Write(publicRequest.Language); + } - if(publicRequest.IsSetMaxQueryRefinements()) - { - context.Writer.WritePropertyName("MaxQueryRefinements"); - context.Writer.Write(publicRequest.MaxQueryRefinements); - } + if(publicRequest.IsSetMaxQueryRefinements()) + { + context.Writer.WritePropertyName("MaxQueryRefinements"); + context.Writer.Write(publicRequest.MaxQueryRefinements.Value); + } - if(publicRequest.IsSetMaxResults()) - { - context.Writer.WritePropertyName("MaxResults"); - context.Writer.Write(publicRequest.MaxResults); - } + if(publicRequest.IsSetMaxResults()) + { + context.Writer.WritePropertyName("MaxResults"); + context.Writer.Write(publicRequest.MaxResults.Value); + } - if(publicRequest.IsSetPoliticalView()) - { - context.Writer.WritePropertyName("PoliticalView"); - context.Writer.Write(publicRequest.PoliticalView); - } + if(publicRequest.IsSetPoliticalView()) + { + context.Writer.WritePropertyName("PoliticalView"); + context.Writer.Write(publicRequest.PoliticalView); + } - if(publicRequest.IsSetQueryText()) - { - context.Writer.WritePropertyName("QueryText"); - context.Writer.Write(publicRequest.QueryText); + if(publicRequest.IsSetQueryText()) + { + context.Writer.WritePropertyName("QueryText"); + context.Writer.Write(publicRequest.QueryText); + } + + writer.WriteObjectEnd(); } - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); + request.Content = memoryStream.ToArray(); } request.UseQueryString = true; diff --git a/sdk/src/Services/GeoPlaces/Generated/Model/Internal/MarshallTransformations/TimeZoneUnmarshaller.cs b/sdk/src/Services/GeoPlaces/Generated/Model/Internal/MarshallTransformations/TimeZoneUnmarshaller.cs index 902f871fab93..6cdbcc64b180 100644 --- a/sdk/src/Services/GeoPlaces/Generated/Model/Internal/MarshallTransformations/TimeZoneUnmarshaller.cs +++ b/sdk/src/Services/GeoPlaces/Generated/Model/Internal/MarshallTransformations/TimeZoneUnmarshaller.cs @@ -80,7 +80,7 @@ public TimeZone Unmarshall(JsonUnmarshallerContext context) } if (context.TestExpression("OffsetSeconds", targetDepth)) { - var unmarshaller = LongUnmarshaller.Instance; + var unmarshaller = NullableLongUnmarshaller.Instance; unmarshalledObject.OffsetSeconds = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/GeoPlaces/Generated/Model/InternalServerException.cs b/sdk/src/Services/GeoPlaces/Generated/Model/InternalServerException.cs index c722b7421ed0..f1ed36dcb762 100644 --- a/sdk/src/Services/GeoPlaces/Generated/Model/InternalServerException.cs +++ b/sdk/src/Services/GeoPlaces/Generated/Model/InternalServerException.cs @@ -108,11 +108,6 @@ protected InternalServerException(System.Runtime.Serialization.SerializationInfo /// The that holds the serialized object data about the exception being thrown. /// The that contains contextual information about the source or destination. /// The parameter is a null reference (Nothing in Visual Basic). -#if BCL35 - [System.Security.Permissions.SecurityPermission( - System.Security.Permissions.SecurityAction.LinkDemand, - Flags = System.Security.Permissions.SecurityPermissionFlag.SerializationFormatter)] -#endif [System.Security.SecurityCritical] // These FxCop rules are giving false-positives for this method [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Security", "CA2123:OverrideLinkDemandsShouldBeIdenticalToBase")] diff --git a/sdk/src/Services/GeoPlaces/Generated/Model/MatchScoreDetails.cs b/sdk/src/Services/GeoPlaces/Generated/Model/MatchScoreDetails.cs index 8e99e96c082c..e9f5f43785b5 100644 --- a/sdk/src/Services/GeoPlaces/Generated/Model/MatchScoreDetails.cs +++ b/sdk/src/Services/GeoPlaces/Generated/Model/MatchScoreDetails.cs @@ -64,9 +64,9 @@ internal bool IsSetComponents() /// /// [AWSProperty(Min=0, Max=1)] - public double Overall + public double? Overall { - get { return this._overall.GetValueOrDefault(); } + get { return this._overall; } set { this._overall = value; } } diff --git a/sdk/src/Services/GeoPlaces/Generated/Model/OpeningHours.cs b/sdk/src/Services/GeoPlaces/Generated/Model/OpeningHours.cs index 311a310a4d67..d15c5dcb8440 100644 --- a/sdk/src/Services/GeoPlaces/Generated/Model/OpeningHours.cs +++ b/sdk/src/Services/GeoPlaces/Generated/Model/OpeningHours.cs @@ -104,9 +104,9 @@ internal bool IsSetDisplay() /// Boolean which indicates if the result/place is currently open. /// /// - public bool OpenNow + public bool? OpenNow { - get { return this._openNow.GetValueOrDefault(); } + get { return this._openNow; } set { this._openNow = value; } } diff --git a/sdk/src/Services/GeoPlaces/Generated/Model/PhonemeTranscription.cs b/sdk/src/Services/GeoPlaces/Generated/Model/PhonemeTranscription.cs index bc74a51964ed..a4504254b8ac 100644 --- a/sdk/src/Services/GeoPlaces/Generated/Model/PhonemeTranscription.cs +++ b/sdk/src/Services/GeoPlaces/Generated/Model/PhonemeTranscription.cs @@ -65,9 +65,9 @@ internal bool IsSetLanguage() /// Boolean which indicates if it the preferred pronunciation. /// /// - public bool Preferred + public bool? Preferred { - get { return this._preferred.GetValueOrDefault(); } + get { return this._preferred; } set { this._preferred = value; } } diff --git a/sdk/src/Services/GeoPlaces/Generated/Model/QueryRefinement.cs b/sdk/src/Services/GeoPlaces/Generated/Model/QueryRefinement.cs index d6e6526b2f20..069b3f5c5484 100644 --- a/sdk/src/Services/GeoPlaces/Generated/Model/QueryRefinement.cs +++ b/sdk/src/Services/GeoPlaces/Generated/Model/QueryRefinement.cs @@ -47,9 +47,9 @@ public partial class QueryRefinement /// /// [AWSProperty(Required=true, Min=0)] - public int EndIndex + public int? EndIndex { - get { return this._endIndex.GetValueOrDefault(); } + get { return this._endIndex; } set { this._endIndex = value; } } @@ -104,9 +104,9 @@ internal bool IsSetRefinedTerm() /// /// [AWSProperty(Required=true, Min=0)] - public int StartIndex + public int? StartIndex { - get { return this._startIndex.GetValueOrDefault(); } + get { return this._startIndex; } set { this._startIndex = value; } } diff --git a/sdk/src/Services/GeoPlaces/Generated/Model/ReverseGeocodeRequest.cs b/sdk/src/Services/GeoPlaces/Generated/Model/ReverseGeocodeRequest.cs index 7af18158f4b9..3369498ad53c 100644 --- a/sdk/src/Services/GeoPlaces/Generated/Model/ReverseGeocodeRequest.cs +++ b/sdk/src/Services/GeoPlaces/Generated/Model/ReverseGeocodeRequest.cs @@ -151,9 +151,9 @@ internal bool IsSetLanguage() /// /// [AWSProperty(Min=1, Max=100)] - public int MaxResults + public int? MaxResults { - get { return this._maxResults.GetValueOrDefault(); } + get { return this._maxResults; } set { this._maxResults = value; } } @@ -212,9 +212,9 @@ internal bool IsSetQueryPosition() /// /// [AWSProperty(Min=1, Max=21000000)] - public long QueryRadius + public long? QueryRadius { - get { return this._queryRadius.GetValueOrDefault(); } + get { return this._queryRadius; } set { this._queryRadius = value; } } diff --git a/sdk/src/Services/GeoPlaces/Generated/Model/ReverseGeocodeResultItem.cs b/sdk/src/Services/GeoPlaces/Generated/Model/ReverseGeocodeResultItem.cs index 4ce6cfef68f6..9aba9159f8cb 100644 --- a/sdk/src/Services/GeoPlaces/Generated/Model/ReverseGeocodeResultItem.cs +++ b/sdk/src/Services/GeoPlaces/Generated/Model/ReverseGeocodeResultItem.cs @@ -92,9 +92,9 @@ internal bool IsSetAddress() /// Boolean indicating if the address provided has been corrected. /// /// - public bool AddressNumberCorrected + public bool? AddressNumberCorrected { - get { return this._addressNumberCorrected.GetValueOrDefault(); } + get { return this._addressNumberCorrected; } set { this._addressNumberCorrected = value; } } @@ -130,9 +130,9 @@ internal bool IsSetCategories() /// /// [AWSProperty(Min=0, Max=4294967295)] - public long Distance + public long? Distance { - get { return this._distance.GetValueOrDefault(); } + get { return this._distance; } set { this._distance = value; } } diff --git a/sdk/src/Services/GeoPlaces/Generated/Model/SearchNearbyRequest.cs b/sdk/src/Services/GeoPlaces/Generated/Model/SearchNearbyRequest.cs index 76df2afe575e..df14a66e7fb4 100644 --- a/sdk/src/Services/GeoPlaces/Generated/Model/SearchNearbyRequest.cs +++ b/sdk/src/Services/GeoPlaces/Generated/Model/SearchNearbyRequest.cs @@ -151,9 +151,9 @@ internal bool IsSetLanguage() /// /// [AWSProperty(Min=1, Max=100)] - public int MaxResults + public int? MaxResults { - get { return this._maxResults.GetValueOrDefault(); } + get { return this._maxResults; } set { this._maxResults = value; } } @@ -232,9 +232,9 @@ internal bool IsSetQueryPosition() /// /// [AWSProperty(Min=1, Max=21000000)] - public long QueryRadius + public long? QueryRadius { - get { return this._queryRadius.GetValueOrDefault(); } + get { return this._queryRadius; } set { this._queryRadius = value; } } diff --git a/sdk/src/Services/GeoPlaces/Generated/Model/SearchNearbyResultItem.cs b/sdk/src/Services/GeoPlaces/Generated/Model/SearchNearbyResultItem.cs index a57c5c37a6b1..200af8c7442f 100644 --- a/sdk/src/Services/GeoPlaces/Generated/Model/SearchNearbyResultItem.cs +++ b/sdk/src/Services/GeoPlaces/Generated/Model/SearchNearbyResultItem.cs @@ -116,9 +116,9 @@ internal bool IsSetAddress() /// Boolean indicating if the address provided has been corrected. /// /// - public bool AddressNumberCorrected + public bool? AddressNumberCorrected { - get { return this._addressNumberCorrected.GetValueOrDefault(); } + get { return this._addressNumberCorrected; } set { this._addressNumberCorrected = value; } } @@ -191,9 +191,9 @@ internal bool IsSetContacts() /// /// [AWSProperty(Min=0, Max=4294967295)] - public long Distance + public long? Distance { - get { return this._distance.GetValueOrDefault(); } + get { return this._distance; } set { this._distance = value; } } diff --git a/sdk/src/Services/GeoPlaces/Generated/Model/SearchTextRequest.cs b/sdk/src/Services/GeoPlaces/Generated/Model/SearchTextRequest.cs index c0f664fe90b7..9c5f21954293 100644 --- a/sdk/src/Services/GeoPlaces/Generated/Model/SearchTextRequest.cs +++ b/sdk/src/Services/GeoPlaces/Generated/Model/SearchTextRequest.cs @@ -181,9 +181,9 @@ internal bool IsSetLanguage() /// /// [AWSProperty(Min=1, Max=100)] - public int MaxResults + public int? MaxResults { - get { return this._maxResults.GetValueOrDefault(); } + get { return this._maxResults; } set { this._maxResults = value; } } diff --git a/sdk/src/Services/GeoPlaces/Generated/Model/SearchTextResultItem.cs b/sdk/src/Services/GeoPlaces/Generated/Model/SearchTextResultItem.cs index e390a11d6373..8184e8cbc308 100644 --- a/sdk/src/Services/GeoPlaces/Generated/Model/SearchTextResultItem.cs +++ b/sdk/src/Services/GeoPlaces/Generated/Model/SearchTextResultItem.cs @@ -116,9 +116,9 @@ internal bool IsSetAddress() /// Boolean indicating if the address provided has been corrected. /// /// - public bool AddressNumberCorrected + public bool? AddressNumberCorrected { - get { return this._addressNumberCorrected.GetValueOrDefault(); } + get { return this._addressNumberCorrected; } set { this._addressNumberCorrected = value; } } @@ -191,9 +191,9 @@ internal bool IsSetContacts() /// /// [AWSProperty(Min=0, Max=4294967295)] - public long Distance + public long? Distance { - get { return this._distance.GetValueOrDefault(); } + get { return this._distance; } set { this._distance = value; } } diff --git a/sdk/src/Services/GeoPlaces/Generated/Model/SuggestPlaceResult.cs b/sdk/src/Services/GeoPlaces/Generated/Model/SuggestPlaceResult.cs index 7f03c8732e51..dac9c8e2d588 100644 --- a/sdk/src/Services/GeoPlaces/Generated/Model/SuggestPlaceResult.cs +++ b/sdk/src/Services/GeoPlaces/Generated/Model/SuggestPlaceResult.cs @@ -151,9 +151,9 @@ internal bool IsSetCategories() /// /// [AWSProperty(Min=0, Max=4294967295)] - public long Distance + public long? Distance { - get { return this._distance.GetValueOrDefault(); } + get { return this._distance; } set { this._distance = value; } } diff --git a/sdk/src/Services/GeoPlaces/Generated/Model/SuggestRequest.cs b/sdk/src/Services/GeoPlaces/Generated/Model/SuggestRequest.cs index eeac884d036f..3b30f1bb01c7 100644 --- a/sdk/src/Services/GeoPlaces/Generated/Model/SuggestRequest.cs +++ b/sdk/src/Services/GeoPlaces/Generated/Model/SuggestRequest.cs @@ -180,9 +180,9 @@ internal bool IsSetLanguage() /// /// [AWSProperty(Min=1, Max=10)] - public int MaxQueryRefinements + public int? MaxQueryRefinements { - get { return this._maxQueryRefinements.GetValueOrDefault(); } + get { return this._maxQueryRefinements; } set { this._maxQueryRefinements = value; } } @@ -199,9 +199,9 @@ internal bool IsSetMaxQueryRefinements() /// /// [AWSProperty(Min=1, Max=100)] - public int MaxResults + public int? MaxResults { - get { return this._maxResults.GetValueOrDefault(); } + get { return this._maxResults; } set { this._maxResults = value; } } diff --git a/sdk/src/Services/GeoPlaces/Generated/Model/ThrottlingException.cs b/sdk/src/Services/GeoPlaces/Generated/Model/ThrottlingException.cs index b2644b11b0c1..cf09a8343d24 100644 --- a/sdk/src/Services/GeoPlaces/Generated/Model/ThrottlingException.cs +++ b/sdk/src/Services/GeoPlaces/Generated/Model/ThrottlingException.cs @@ -108,11 +108,6 @@ protected ThrottlingException(System.Runtime.Serialization.SerializationInfo inf /// The that holds the serialized object data about the exception being thrown. /// The that contains contextual information about the source or destination. /// The parameter is a null reference (Nothing in Visual Basic). -#if BCL35 - [System.Security.Permissions.SecurityPermission( - System.Security.Permissions.SecurityAction.LinkDemand, - Flags = System.Security.Permissions.SecurityPermissionFlag.SerializationFormatter)] -#endif [System.Security.SecurityCritical] // These FxCop rules are giving false-positives for this method [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Security", "CA2123:OverrideLinkDemandsShouldBeIdenticalToBase")] diff --git a/sdk/src/Services/GeoPlaces/Generated/Model/TimeZone.cs b/sdk/src/Services/GeoPlaces/Generated/Model/TimeZone.cs index ba7a31fe5ebd..1f23bd544a53 100644 --- a/sdk/src/Services/GeoPlaces/Generated/Model/TimeZone.cs +++ b/sdk/src/Services/GeoPlaces/Generated/Model/TimeZone.cs @@ -83,9 +83,9 @@ internal bool IsSetOffset() /// /// [AWSProperty(Min=0)] - public long OffsetSeconds + public long? OffsetSeconds { - get { return this._offsetSeconds.GetValueOrDefault(); } + get { return this._offsetSeconds; } set { this._offsetSeconds = value; } } diff --git a/sdk/src/Services/GeoPlaces/Generated/Model/ValidationException.cs b/sdk/src/Services/GeoPlaces/Generated/Model/ValidationException.cs index 8fc055b5bb60..cc3ea19de68a 100644 --- a/sdk/src/Services/GeoPlaces/Generated/Model/ValidationException.cs +++ b/sdk/src/Services/GeoPlaces/Generated/Model/ValidationException.cs @@ -110,11 +110,6 @@ protected ValidationException(System.Runtime.Serialization.SerializationInfo inf /// The that holds the serialized object data about the exception being thrown. /// The that contains contextual information about the source or destination. /// The parameter is a null reference (Nothing in Visual Basic). -#if BCL35 - [System.Security.Permissions.SecurityPermission( - System.Security.Permissions.SecurityAction.LinkDemand, - Flags = System.Security.Permissions.SecurityPermissionFlag.SerializationFormatter)] -#endif [System.Security.SecurityCritical] // These FxCop rules are giving false-positives for this method [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Security", "CA2123:OverrideLinkDemandsShouldBeIdenticalToBase")] diff --git a/sdk/src/Services/GeoPlaces/Generated/_bcl45/AmazonGeoPlacesClient.cs b/sdk/src/Services/GeoPlaces/Generated/_bcl/AmazonGeoPlacesClient.cs similarity index 98% rename from sdk/src/Services/GeoPlaces/Generated/_bcl45/AmazonGeoPlacesClient.cs rename to sdk/src/Services/GeoPlaces/Generated/_bcl/AmazonGeoPlacesClient.cs index cddce0a3e906..ee6faafadb4a 100644 --- a/sdk/src/Services/GeoPlaces/Generated/_bcl45/AmazonGeoPlacesClient.cs +++ b/sdk/src/Services/GeoPlaces/Generated/_bcl/AmazonGeoPlacesClient.cs @@ -32,6 +32,7 @@ using Amazon.Runtime.Internal; using Amazon.Runtime.Internal.Auth; using Amazon.Runtime.Internal.Transform; +using Amazon.Runtime.Endpoints; #pragma warning disable CS1570 namespace Amazon.GeoPlaces @@ -774,16 +775,8 @@ public virtual SuggestResponse Suggest(SuggestRequest request) /// The resolved endpoint for the given request. public Amazon.Runtime.Endpoints.Endpoint DetermineServiceOperationEndpoint(AmazonWebServiceRequest request) { - var requestContext = new Amazon.Runtime.Internal.RequestContext(false, CreateSigner()) - { - ClientConfig = Config, - OriginalRequest = request, - Request = new Amazon.Runtime.Internal.DefaultRequest(request, ServiceMetadata.ServiceId) - }; - - var executionContext = new Amazon.Runtime.Internal.ExecutionContext(requestContext, null); - var resolver = new AmazonGeoPlacesEndpointResolver(); - return resolver.GetEndpoint(executionContext); + var parameters = new ServiceOperationEndpointParameters(request); + return Config.DetermineServiceOperationEndpoint(parameters); } #endregion diff --git a/sdk/src/Services/GeoPlaces/Generated/_bcl45/IAmazonGeoPlaces.cs b/sdk/src/Services/GeoPlaces/Generated/_bcl/IAmazonGeoPlaces.cs similarity index 100% rename from sdk/src/Services/GeoPlaces/Generated/_bcl45/IAmazonGeoPlaces.cs rename to sdk/src/Services/GeoPlaces/Generated/_bcl/IAmazonGeoPlaces.cs diff --git a/sdk/src/Services/GeoPlaces/Generated/_bcl35/AmazonGeoPlacesClient.cs b/sdk/src/Services/GeoPlaces/Generated/_bcl35/AmazonGeoPlacesClient.cs deleted file mode 100644 index 52b330dd27c0..000000000000 --- a/sdk/src/Services/GeoPlaces/Generated/_bcl35/AmazonGeoPlacesClient.cs +++ /dev/null @@ -1,788 +0,0 @@ -/* - * 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. - */ - -/* - * Do not modify this file. This file is generated from the geo-places-2020-11-19.normal.json service model. - */ - - -using System; -using System.Collections.Generic; -using System.Net; - -using Amazon.GeoPlaces.Model; -using Amazon.GeoPlaces.Model.Internal.MarshallTransformations; -using Amazon.GeoPlaces.Internal; -using Amazon.Runtime; -using Amazon.Runtime.Internal; -using Amazon.Runtime.Internal.Auth; -using Amazon.Runtime.Internal.Transform; - -#pragma warning disable CS1570 -namespace Amazon.GeoPlaces -{ - /// - /// Implementation for accessing GeoPlaces - /// - /// The Places API enables powerful location search and geocoding capabilities for your - /// applications, offering global coverage with rich, detailed information. Key features - /// include: - /// - ///
    • - /// - /// Forward and reverse geocoding for addresses and coordinates - /// - ///
    • - /// - /// Comprehensive place searches with detailed information, including: - /// - ///
      • - /// - /// Business names and addresses - /// - ///
      • - /// - /// Contact information - /// - ///
      • - /// - /// Hours of operation - /// - ///
      • - /// - /// POI (Points of Interest) categories - /// - ///
      • - /// - /// Food types for restaurants - /// - ///
      • - /// - /// Chain affiliation for relevant businesses - /// - ///
    • - /// - /// Global data coverage with a wide range of POI categories - /// - ///
    • - /// - /// Regular data updates to ensure accuracy and relevance - /// - ///
    - ///     - public partial class AmazonGeoPlacesClient : AmazonServiceClient, IAmazonGeoPlaces - { - private static IServiceMetadata serviceMetadata = new AmazonGeoPlacesMetadata(); - - #region Constructors - - /// - /// Constructs AmazonGeoPlacesClient with the credentials loaded from the application's - /// default configuration, and if unsuccessful from the Instance Profile service on an EC2 instance. - /// - /// Example App.config with credentials set. - /// - /// <?xml version="1.0" encoding="utf-8" ?> - /// <configuration> - /// <appSettings> - /// <add key="AWSProfileName" value="AWS Default"/> - /// </appSettings> - /// </configuration> - /// - /// - /// - public AmazonGeoPlacesClient() - : base(FallbackCredentialsFactory.GetCredentials(), new AmazonGeoPlacesConfig()) { } - - /// - /// Constructs AmazonGeoPlacesClient with the credentials loaded from the application's - /// default configuration, and if unsuccessful from the Instance Profile service on an EC2 instance. - /// - /// Example App.config with credentials set. - /// - /// <?xml version="1.0" encoding="utf-8" ?> - /// <configuration> - /// <appSettings> - /// <add key="AWSProfileName" value="AWS Default"/> - /// </appSettings> - /// </configuration> - /// - /// - /// - /// The region to connect. - public AmazonGeoPlacesClient(RegionEndpoint region) - : base(FallbackCredentialsFactory.GetCredentials(), new AmazonGeoPlacesConfig{RegionEndpoint = region}) { } - - /// - /// Constructs AmazonGeoPlacesClient with the credentials loaded from the application's - /// default configuration, and if unsuccessful from the Instance Profile service on an EC2 instance. - /// - /// Example App.config with credentials set. - /// - /// <?xml version="1.0" encoding="utf-8" ?> - /// <configuration> - /// <appSettings> - /// <add key="AWSProfileName" value="AWS Default"/> - /// </appSettings> - /// </configuration> - /// - /// - /// - /// The AmazonGeoPlacesClient Configuration Object - public AmazonGeoPlacesClient(AmazonGeoPlacesConfig config) - : base(FallbackCredentialsFactory.GetCredentials(config), config){} - /// - /// Constructs AmazonGeoPlacesClient with AWS Credentials - /// - /// AWS Credentials - public AmazonGeoPlacesClient(AWSCredentials credentials) - : this(credentials, new AmazonGeoPlacesConfig()) - { - } - - /// - /// Constructs AmazonGeoPlacesClient with AWS Credentials - /// - /// AWS Credentials - /// The region to connect. - public AmazonGeoPlacesClient(AWSCredentials credentials, RegionEndpoint region) - : this(credentials, new AmazonGeoPlacesConfig{RegionEndpoint = region}) - { - } - - /// - /// Constructs AmazonGeoPlacesClient with AWS Credentials and an - /// AmazonGeoPlacesClient Configuration object. - /// - /// AWS Credentials - /// The AmazonGeoPlacesClient Configuration Object - public AmazonGeoPlacesClient(AWSCredentials credentials, AmazonGeoPlacesConfig clientConfig) - : base(credentials, clientConfig) - { - } - - /// - /// Constructs AmazonGeoPlacesClient with AWS Access Key ID and AWS Secret Key - /// - /// AWS Access Key ID - /// AWS Secret Access Key - public AmazonGeoPlacesClient(string awsAccessKeyId, string awsSecretAccessKey) - : this(awsAccessKeyId, awsSecretAccessKey, new AmazonGeoPlacesConfig()) - { - } - - /// - /// Constructs AmazonGeoPlacesClient with AWS Access Key ID and AWS Secret Key - /// - /// AWS Access Key ID - /// AWS Secret Access Key - /// The region to connect. - public AmazonGeoPlacesClient(string awsAccessKeyId, string awsSecretAccessKey, RegionEndpoint region) - : this(awsAccessKeyId, awsSecretAccessKey, new AmazonGeoPlacesConfig() {RegionEndpoint=region}) - { - } - - /// - /// Constructs AmazonGeoPlacesClient with AWS Access Key ID, AWS Secret Key and an - /// AmazonGeoPlacesClient Configuration object. - /// - /// AWS Access Key ID - /// AWS Secret Access Key - /// The AmazonGeoPlacesClient Configuration Object - public AmazonGeoPlacesClient(string awsAccessKeyId, string awsSecretAccessKey, AmazonGeoPlacesConfig clientConfig) - : base(awsAccessKeyId, awsSecretAccessKey, clientConfig) - { - } - - /// - /// Constructs AmazonGeoPlacesClient with AWS Access Key ID and AWS Secret Key - /// - /// AWS Access Key ID - /// AWS Secret Access Key - /// AWS Session Token - public AmazonGeoPlacesClient(string awsAccessKeyId, string awsSecretAccessKey, string awsSessionToken) - : this(awsAccessKeyId, awsSecretAccessKey, awsSessionToken, new AmazonGeoPlacesConfig()) - { - } - - /// - /// Constructs AmazonGeoPlacesClient with AWS Access Key ID and AWS Secret Key - /// - /// AWS Access Key ID - /// AWS Secret Access Key - /// AWS Session Token - /// The region to connect. - public AmazonGeoPlacesClient(string awsAccessKeyId, string awsSecretAccessKey, string awsSessionToken, RegionEndpoint region) - : this(awsAccessKeyId, awsSecretAccessKey, awsSessionToken, new AmazonGeoPlacesConfig{RegionEndpoint = region}) - { - } - - /// - /// Constructs AmazonGeoPlacesClient with AWS Access Key ID, AWS Secret Key and an - /// AmazonGeoPlacesClient Configuration object. - /// - /// AWS Access Key ID - /// AWS Secret Access Key - /// AWS Session Token - /// The AmazonGeoPlacesClient Configuration Object - public AmazonGeoPlacesClient(string awsAccessKeyId, string awsSecretAccessKey, string awsSessionToken, AmazonGeoPlacesConfig clientConfig) - : base(awsAccessKeyId, awsSecretAccessKey, awsSessionToken, clientConfig) - { - } - - #endregion - - #region Overrides - - - /// - /// Creates the signer for the service. - /// - protected override AbstractAWSSigner CreateSigner() - { - return new AWS4Signer(); - } - - /// - /// Customize the pipeline - /// - /// - protected override void CustomizeRuntimePipeline(RuntimePipeline pipeline) - { - pipeline.RemoveHandler(); - pipeline.AddHandlerAfter(new AmazonGeoPlacesEndpointResolver()); - } - /// - /// Capture metadata for the service. - /// - protected override IServiceMetadata ServiceMetadata - { - get - { - return serviceMetadata; - } - } - - #endregion - - #region Dispose - - /// - /// Disposes the service client. - /// - protected override void Dispose(bool disposing) - { - base.Dispose(disposing); - } - - #endregion - - - #region Autocomplete - - /// - /// The autocomplete operation speeds up and increases the accuracy of entering addresses - /// by providing a list of address candidates matching a partially entered address. Results - /// are sorted from most to least matching. Filtering and biasing can be used to increase - /// the relevance of the results if additional search context is known - /// - /// Container for the necessary parameters to execute the Autocomplete service method. - /// - /// The response from the Autocomplete service method, as returned by GeoPlaces. - /// - /// You don't have sufficient access to perform this action. - /// - /// - /// The request processing has failed because of an unknown error, exception or failure. - /// - /// - /// The request was denied due to request throttling. - /// - /// - /// The input fails to satisfy the constraints specified by an AWS service. - /// - /// REST API Reference for Autocomplete Operation - public virtual AutocompleteResponse Autocomplete(AutocompleteRequest request) - { - var options = new InvokeOptions(); - options.RequestMarshaller = AutocompleteRequestMarshaller.Instance; - options.ResponseUnmarshaller = AutocompleteResponseUnmarshaller.Instance; - - return Invoke(request, options); - } - - /// - /// Initiates the asynchronous execution of the Autocomplete operation. - /// - /// - /// Container for the necessary parameters to execute the Autocomplete operation on AmazonGeoPlacesClient. - /// An AsyncCallback delegate that is invoked when the operation completes. - /// A user-defined state object that is passed to the callback procedure. Retrieve this object from within the callback - /// procedure using the AsyncState property. - /// - /// An IAsyncResult that can be used to poll or wait for results, or both; this value is also needed when invoking EndAutocomplete - /// operation. - /// REST API Reference for Autocomplete Operation - public virtual IAsyncResult BeginAutocomplete(AutocompleteRequest request, AsyncCallback callback, object state) - { - var options = new InvokeOptions(); - options.RequestMarshaller = AutocompleteRequestMarshaller.Instance; - options.ResponseUnmarshaller = AutocompleteResponseUnmarshaller.Instance; - - return BeginInvoke(request, options, callback, state); - } - - /// - /// Finishes the asynchronous execution of the Autocomplete operation. - /// - /// - /// The IAsyncResult returned by the call to BeginAutocomplete. - /// - /// Returns a AutocompleteResult from GeoPlaces. - /// REST API Reference for Autocomplete Operation - public virtual AutocompleteResponse EndAutocomplete(IAsyncResult asyncResult) - { - return EndInvoke(asyncResult); - } - - #endregion - - #region Geocode - - /// - /// The Geocode action allows you to obtain coordinates, addresses, and other information - /// about places. - /// - /// Container for the necessary parameters to execute the Geocode service method. - /// - /// The response from the Geocode service method, as returned by GeoPlaces. - /// - /// You don't have sufficient access to perform this action. - /// - /// - /// The request processing has failed because of an unknown error, exception or failure. - /// - /// - /// The request was denied due to request throttling. - /// - /// - /// The input fails to satisfy the constraints specified by an AWS service. - /// - /// REST API Reference for Geocode Operation - public virtual GeocodeResponse Geocode(GeocodeRequest request) - { - var options = new InvokeOptions(); - options.RequestMarshaller = GeocodeRequestMarshaller.Instance; - options.ResponseUnmarshaller = GeocodeResponseUnmarshaller.Instance; - - return Invoke(request, options); - } - - /// - /// Initiates the asynchronous execution of the Geocode operation. - /// - /// - /// Container for the necessary parameters to execute the Geocode operation on AmazonGeoPlacesClient. - /// An AsyncCallback delegate that is invoked when the operation completes. - /// A user-defined state object that is passed to the callback procedure. Retrieve this object from within the callback - /// procedure using the AsyncState property. - /// - /// An IAsyncResult that can be used to poll or wait for results, or both; this value is also needed when invoking EndGeocode - /// operation. - /// REST API Reference for Geocode Operation - public virtual IAsyncResult BeginGeocode(GeocodeRequest request, AsyncCallback callback, object state) - { - var options = new InvokeOptions(); - options.RequestMarshaller = GeocodeRequestMarshaller.Instance; - options.ResponseUnmarshaller = GeocodeResponseUnmarshaller.Instance; - - return BeginInvoke(request, options, callback, state); - } - - /// - /// Finishes the asynchronous execution of the Geocode operation. - /// - /// - /// The IAsyncResult returned by the call to BeginGeocode. - /// - /// Returns a GeocodeResult from GeoPlaces. - /// REST API Reference for Geocode Operation - public virtual GeocodeResponse EndGeocode(IAsyncResult asyncResult) - { - return EndInvoke(asyncResult); - } - - #endregion - - #region GetPlace - - /// - /// Finds a place by its unique ID. A PlaceId is returned by other place operations. - /// - /// Container for the necessary parameters to execute the GetPlace service method. - /// - /// The response from the GetPlace service method, as returned by GeoPlaces. - /// - /// You don't have sufficient access to perform this action. - /// - /// - /// The request processing has failed because of an unknown error, exception or failure. - /// - /// - /// The request was denied due to request throttling. - /// - /// - /// The input fails to satisfy the constraints specified by an AWS service. - /// - /// REST API Reference for GetPlace Operation - public virtual GetPlaceResponse GetPlace(GetPlaceRequest request) - { - var options = new InvokeOptions(); - options.RequestMarshaller = GetPlaceRequestMarshaller.Instance; - options.ResponseUnmarshaller = GetPlaceResponseUnmarshaller.Instance; - - return Invoke(request, options); - } - - /// - /// Initiates the asynchronous execution of the GetPlace operation. - /// - /// - /// Container for the necessary parameters to execute the GetPlace operation on AmazonGeoPlacesClient. - /// An AsyncCallback delegate that is invoked when the operation completes. - /// A user-defined state object that is passed to the callback procedure. Retrieve this object from within the callback - /// procedure using the AsyncState property. - /// - /// An IAsyncResult that can be used to poll or wait for results, or both; this value is also needed when invoking EndGetPlace - /// operation. - /// REST API Reference for GetPlace Operation - public virtual IAsyncResult BeginGetPlace(GetPlaceRequest request, AsyncCallback callback, object state) - { - var options = new InvokeOptions(); - options.RequestMarshaller = GetPlaceRequestMarshaller.Instance; - options.ResponseUnmarshaller = GetPlaceResponseUnmarshaller.Instance; - - return BeginInvoke(request, options, callback, state); - } - - /// - /// Finishes the asynchronous execution of the GetPlace operation. - /// - /// - /// The IAsyncResult returned by the call to BeginGetPlace. - /// - /// Returns a GetPlaceResult from GeoPlaces. - /// REST API Reference for GetPlace Operation - public virtual GetPlaceResponse EndGetPlace(IAsyncResult asyncResult) - { - return EndInvoke(asyncResult); - } - - #endregion - - #region ReverseGeocode - - /// - /// The ReverseGeocode operation allows you to retrieve addresses and place information - /// from coordinates. - /// - /// Container for the necessary parameters to execute the ReverseGeocode service method. - /// - /// The response from the ReverseGeocode service method, as returned by GeoPlaces. - /// - /// You don't have sufficient access to perform this action. - /// - /// - /// The request processing has failed because of an unknown error, exception or failure. - /// - /// - /// The request was denied due to request throttling. - /// - /// - /// The input fails to satisfy the constraints specified by an AWS service. - /// - /// REST API Reference for ReverseGeocode Operation - public virtual ReverseGeocodeResponse ReverseGeocode(ReverseGeocodeRequest request) - { - var options = new InvokeOptions(); - options.RequestMarshaller = ReverseGeocodeRequestMarshaller.Instance; - options.ResponseUnmarshaller = ReverseGeocodeResponseUnmarshaller.Instance; - - return Invoke(request, options); - } - - /// - /// Initiates the asynchronous execution of the ReverseGeocode operation. - /// - /// - /// Container for the necessary parameters to execute the ReverseGeocode operation on AmazonGeoPlacesClient. - /// An AsyncCallback delegate that is invoked when the operation completes. - /// A user-defined state object that is passed to the callback procedure. Retrieve this object from within the callback - /// procedure using the AsyncState property. - /// - /// An IAsyncResult that can be used to poll or wait for results, or both; this value is also needed when invoking EndReverseGeocode - /// operation. - /// REST API Reference for ReverseGeocode Operation - public virtual IAsyncResult BeginReverseGeocode(ReverseGeocodeRequest request, AsyncCallback callback, object state) - { - var options = new InvokeOptions(); - options.RequestMarshaller = ReverseGeocodeRequestMarshaller.Instance; - options.ResponseUnmarshaller = ReverseGeocodeResponseUnmarshaller.Instance; - - return BeginInvoke(request, options, callback, state); - } - - /// - /// Finishes the asynchronous execution of the ReverseGeocode operation. - /// - /// - /// The IAsyncResult returned by the call to BeginReverseGeocode. - /// - /// Returns a ReverseGeocodeResult from GeoPlaces. - /// REST API Reference for ReverseGeocode Operation - public virtual ReverseGeocodeResponse EndReverseGeocode(IAsyncResult asyncResult) - { - return EndInvoke(asyncResult); - } - - #endregion - - #region SearchNearby - - /// - /// Search nearby a specified location. - /// - /// Container for the necessary parameters to execute the SearchNearby service method. - /// - /// The response from the SearchNearby service method, as returned by GeoPlaces. - /// - /// You don't have sufficient access to perform this action. - /// - /// - /// The request processing has failed because of an unknown error, exception or failure. - /// - /// - /// The request was denied due to request throttling. - /// - /// - /// The input fails to satisfy the constraints specified by an AWS service. - /// - /// REST API Reference for SearchNearby Operation - public virtual SearchNearbyResponse SearchNearby(SearchNearbyRequest request) - { - var options = new InvokeOptions(); - options.RequestMarshaller = SearchNearbyRequestMarshaller.Instance; - options.ResponseUnmarshaller = SearchNearbyResponseUnmarshaller.Instance; - - return Invoke(request, options); - } - - /// - /// Initiates the asynchronous execution of the SearchNearby operation. - /// - /// - /// Container for the necessary parameters to execute the SearchNearby operation on AmazonGeoPlacesClient. - /// An AsyncCallback delegate that is invoked when the operation completes. - /// A user-defined state object that is passed to the callback procedure. Retrieve this object from within the callback - /// procedure using the AsyncState property. - /// - /// An IAsyncResult that can be used to poll or wait for results, or both; this value is also needed when invoking EndSearchNearby - /// operation. - /// REST API Reference for SearchNearby Operation - public virtual IAsyncResult BeginSearchNearby(SearchNearbyRequest request, AsyncCallback callback, object state) - { - var options = new InvokeOptions(); - options.RequestMarshaller = SearchNearbyRequestMarshaller.Instance; - options.ResponseUnmarshaller = SearchNearbyResponseUnmarshaller.Instance; - - return BeginInvoke(request, options, callback, state); - } - - /// - /// Finishes the asynchronous execution of the SearchNearby operation. - /// - /// - /// The IAsyncResult returned by the call to BeginSearchNearby. - /// - /// Returns a SearchNearbyResult from GeoPlaces. - /// REST API Reference for SearchNearby Operation - public virtual SearchNearbyResponse EndSearchNearby(IAsyncResult asyncResult) - { - return EndInvoke(asyncResult); - } - - #endregion - - #region SearchText - - /// - /// Use the SearchText operation to search for geocode and place information. You - /// can then complete a follow-up query suggested from the Suggest API via a query - /// id. - /// - /// Container for the necessary parameters to execute the SearchText service method. - /// - /// The response from the SearchText service method, as returned by GeoPlaces. - /// - /// You don't have sufficient access to perform this action. - /// - /// - /// The request processing has failed because of an unknown error, exception or failure. - /// - /// - /// The request was denied due to request throttling. - /// - /// - /// The input fails to satisfy the constraints specified by an AWS service. - /// - /// REST API Reference for SearchText Operation - public virtual SearchTextResponse SearchText(SearchTextRequest request) - { - var options = new InvokeOptions(); - options.RequestMarshaller = SearchTextRequestMarshaller.Instance; - options.ResponseUnmarshaller = SearchTextResponseUnmarshaller.Instance; - - return Invoke(request, options); - } - - /// - /// Initiates the asynchronous execution of the SearchText operation. - /// - /// - /// Container for the necessary parameters to execute the SearchText operation on AmazonGeoPlacesClient. - /// An AsyncCallback delegate that is invoked when the operation completes. - /// A user-defined state object that is passed to the callback procedure. Retrieve this object from within the callback - /// procedure using the AsyncState property. - /// - /// An IAsyncResult that can be used to poll or wait for results, or both; this value is also needed when invoking EndSearchText - /// operation. - /// REST API Reference for SearchText Operation - public virtual IAsyncResult BeginSearchText(SearchTextRequest request, AsyncCallback callback, object state) - { - var options = new InvokeOptions(); - options.RequestMarshaller = SearchTextRequestMarshaller.Instance; - options.ResponseUnmarshaller = SearchTextResponseUnmarshaller.Instance; - - return BeginInvoke(request, options, callback, state); - } - - /// - /// Finishes the asynchronous execution of the SearchText operation. - /// - /// - /// The IAsyncResult returned by the call to BeginSearchText. - /// - /// Returns a SearchTextResult from GeoPlaces. - /// REST API Reference for SearchText Operation - public virtual SearchTextResponse EndSearchText(IAsyncResult asyncResult) - { - return EndInvoke(asyncResult); - } - - #endregion - - #region Suggest - - /// - /// The Suggest operation finds addresses or place candidates based on incomplete - /// or misspelled queries. You then select the best query to submit based on the returned - /// results. - /// - /// Container for the necessary parameters to execute the Suggest service method. - /// - /// The response from the Suggest service method, as returned by GeoPlaces. - /// - /// You don't have sufficient access to perform this action. - /// - /// - /// The request processing has failed because of an unknown error, exception or failure. - /// - /// - /// The request was denied due to request throttling. - /// - /// - /// The input fails to satisfy the constraints specified by an AWS service. - /// - /// REST API Reference for Suggest Operation - public virtual SuggestResponse Suggest(SuggestRequest request) - { - var options = new InvokeOptions(); - options.RequestMarshaller = SuggestRequestMarshaller.Instance; - options.ResponseUnmarshaller = SuggestResponseUnmarshaller.Instance; - - return Invoke(request, options); - } - - /// - /// Initiates the asynchronous execution of the Suggest operation. - /// - /// - /// Container for the necessary parameters to execute the Suggest operation on AmazonGeoPlacesClient. - /// An AsyncCallback delegate that is invoked when the operation completes. - /// A user-defined state object that is passed to the callback procedure. Retrieve this object from within the callback - /// procedure using the AsyncState property. - /// - /// An IAsyncResult that can be used to poll or wait for results, or both; this value is also needed when invoking EndSuggest - /// operation. - /// REST API Reference for Suggest Operation - public virtual IAsyncResult BeginSuggest(SuggestRequest request, AsyncCallback callback, object state) - { - var options = new InvokeOptions(); - options.RequestMarshaller = SuggestRequestMarshaller.Instance; - options.ResponseUnmarshaller = SuggestResponseUnmarshaller.Instance; - - return BeginInvoke(request, options, callback, state); - } - - /// - /// Finishes the asynchronous execution of the Suggest operation. - /// - /// - /// The IAsyncResult returned by the call to BeginSuggest. - /// - /// Returns a SuggestResult from GeoPlaces. - /// REST API Reference for Suggest Operation - public virtual SuggestResponse EndSuggest(IAsyncResult asyncResult) - { - return EndInvoke(asyncResult); - } - - #endregion - - #region DetermineServiceOperationEndpoint - - /// - /// Returns the endpoint that will be used for a particular request. - /// - /// Request for the desired service operation. - /// The resolved endpoint for the given request. - public Amazon.Runtime.Endpoints.Endpoint DetermineServiceOperationEndpoint(AmazonWebServiceRequest request) - { - var requestContext = new Amazon.Runtime.Internal.RequestContext(false, CreateSigner()) - { - ClientConfig = Config, - OriginalRequest = request, - Request = new Amazon.Runtime.Internal.DefaultRequest(request, ServiceMetadata.ServiceId) - }; - - var executionContext = new Amazon.Runtime.Internal.ExecutionContext(requestContext, null); - var resolver = new AmazonGeoPlacesEndpointResolver(); - return resolver.GetEndpoint(executionContext); - } - - #endregion - - } -} \ No newline at end of file diff --git a/sdk/src/Services/GeoPlaces/Generated/_bcl35/IAmazonGeoPlaces.cs b/sdk/src/Services/GeoPlaces/Generated/_bcl35/IAmazonGeoPlaces.cs deleted file mode 100644 index bf42ee19f949..000000000000 --- a/sdk/src/Services/GeoPlaces/Generated/_bcl35/IAmazonGeoPlaces.cs +++ /dev/null @@ -1,471 +0,0 @@ -/* - * 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. - */ - -/* - * Do not modify this file. This file is generated from the geo-places-2020-11-19.normal.json service model. - */ - - -using System; -using System.Collections.Generic; - -using Amazon.Runtime; -using Amazon.GeoPlaces.Model; - -#pragma warning disable CS1570 -namespace Amazon.GeoPlaces -{ - /// - /// Interface for accessing GeoPlaces - /// - /// The Places API enables powerful location search and geocoding capabilities for your - /// applications, offering global coverage with rich, detailed information. Key features - /// include: - /// - ///
    • - /// - /// Forward and reverse geocoding for addresses and coordinates - /// - ///
    • - /// - /// Comprehensive place searches with detailed information, including: - /// - ///
      • - /// - /// Business names and addresses - /// - ///
      • - /// - /// Contact information - /// - ///
      • - /// - /// Hours of operation - /// - ///
      • - /// - /// POI (Points of Interest) categories - /// - ///
      • - /// - /// Food types for restaurants - /// - ///
      • - /// - /// Chain affiliation for relevant businesses - /// - ///
    • - /// - /// Global data coverage with a wide range of POI categories - /// - ///
    • - /// - /// Regular data updates to ensure accuracy and relevance - /// - ///
    - ///     - public partial interface IAmazonGeoPlaces : IAmazonService, IDisposable - { - - - - - - #region Autocomplete - - - /// - /// The autocomplete operation speeds up and increases the accuracy of entering addresses - /// by providing a list of address candidates matching a partially entered address. Results - /// are sorted from most to least matching. Filtering and biasing can be used to increase - /// the relevance of the results if additional search context is known - /// - /// Container for the necessary parameters to execute the Autocomplete service method. - /// - /// The response from the Autocomplete service method, as returned by GeoPlaces. - /// - /// You don't have sufficient access to perform this action. - /// - /// - /// The request processing has failed because of an unknown error, exception or failure. - /// - /// - /// The request was denied due to request throttling. - /// - /// - /// The input fails to satisfy the constraints specified by an AWS service. - /// - /// REST API Reference for Autocomplete Operation - AutocompleteResponse Autocomplete(AutocompleteRequest request); - - /// - /// Initiates the asynchronous execution of the Autocomplete operation. - /// - /// - /// Container for the necessary parameters to execute the Autocomplete operation on AmazonGeoPlacesClient. - /// An AsyncCallback delegate that is invoked when the operation completes. - /// A user-defined state object that is passed to the callback procedure. Retrieve this object from within the callback - /// procedure using the AsyncState property. - /// - /// An IAsyncResult that can be used to poll or wait for results, or both; this value is also needed when invoking EndAutocomplete - /// operation. - /// REST API Reference for Autocomplete Operation - IAsyncResult BeginAutocomplete(AutocompleteRequest request, AsyncCallback callback, object state); - - - - /// - /// Finishes the asynchronous execution of the Autocomplete operation. - /// - /// - /// The IAsyncResult returned by the call to BeginAutocomplete. - /// - /// Returns a AutocompleteResult from GeoPlaces. - /// REST API Reference for Autocomplete Operation - AutocompleteResponse EndAutocomplete(IAsyncResult asyncResult); - - #endregion - - #region Geocode - - - /// - /// The Geocode action allows you to obtain coordinates, addresses, and other information - /// about places. - /// - /// Container for the necessary parameters to execute the Geocode service method. - /// - /// The response from the Geocode service method, as returned by GeoPlaces. - /// - /// You don't have sufficient access to perform this action. - /// - /// - /// The request processing has failed because of an unknown error, exception or failure. - /// - /// - /// The request was denied due to request throttling. - /// - /// - /// The input fails to satisfy the constraints specified by an AWS service. - /// - /// REST API Reference for Geocode Operation - GeocodeResponse Geocode(GeocodeRequest request); - - /// - /// Initiates the asynchronous execution of the Geocode operation. - /// - /// - /// Container for the necessary parameters to execute the Geocode operation on AmazonGeoPlacesClient. - /// An AsyncCallback delegate that is invoked when the operation completes. - /// A user-defined state object that is passed to the callback procedure. Retrieve this object from within the callback - /// procedure using the AsyncState property. - /// - /// An IAsyncResult that can be used to poll or wait for results, or both; this value is also needed when invoking EndGeocode - /// operation. - /// REST API Reference for Geocode Operation - IAsyncResult BeginGeocode(GeocodeRequest request, AsyncCallback callback, object state); - - - - /// - /// Finishes the asynchronous execution of the Geocode operation. - /// - /// - /// The IAsyncResult returned by the call to BeginGeocode. - /// - /// Returns a GeocodeResult from GeoPlaces. - /// REST API Reference for Geocode Operation - GeocodeResponse EndGeocode(IAsyncResult asyncResult); - - #endregion - - #region GetPlace - - - /// - /// Finds a place by its unique ID. A PlaceId is returned by other place operations. - /// - /// Container for the necessary parameters to execute the GetPlace service method. - /// - /// The response from the GetPlace service method, as returned by GeoPlaces. - /// - /// You don't have sufficient access to perform this action. - /// - /// - /// The request processing has failed because of an unknown error, exception or failure. - /// - /// - /// The request was denied due to request throttling. - /// - /// - /// The input fails to satisfy the constraints specified by an AWS service. - /// - /// REST API Reference for GetPlace Operation - GetPlaceResponse GetPlace(GetPlaceRequest request); - - /// - /// Initiates the asynchronous execution of the GetPlace operation. - /// - /// - /// Container for the necessary parameters to execute the GetPlace operation on AmazonGeoPlacesClient. - /// An AsyncCallback delegate that is invoked when the operation completes. - /// A user-defined state object that is passed to the callback procedure. Retrieve this object from within the callback - /// procedure using the AsyncState property. - /// - /// An IAsyncResult that can be used to poll or wait for results, or both; this value is also needed when invoking EndGetPlace - /// operation. - /// REST API Reference for GetPlace Operation - IAsyncResult BeginGetPlace(GetPlaceRequest request, AsyncCallback callback, object state); - - - - /// - /// Finishes the asynchronous execution of the GetPlace operation. - /// - /// - /// The IAsyncResult returned by the call to BeginGetPlace. - /// - /// Returns a GetPlaceResult from GeoPlaces. - /// REST API Reference for GetPlace Operation - GetPlaceResponse EndGetPlace(IAsyncResult asyncResult); - - #endregion - - #region ReverseGeocode - - - /// - /// The ReverseGeocode operation allows you to retrieve addresses and place information - /// from coordinates. - /// - /// Container for the necessary parameters to execute the ReverseGeocode service method. - /// - /// The response from the ReverseGeocode service method, as returned by GeoPlaces. - /// - /// You don't have sufficient access to perform this action. - /// - /// - /// The request processing has failed because of an unknown error, exception or failure. - /// - /// - /// The request was denied due to request throttling. - /// - /// - /// The input fails to satisfy the constraints specified by an AWS service. - /// - /// REST API Reference for ReverseGeocode Operation - ReverseGeocodeResponse ReverseGeocode(ReverseGeocodeRequest request); - - /// - /// Initiates the asynchronous execution of the ReverseGeocode operation. - /// - /// - /// Container for the necessary parameters to execute the ReverseGeocode operation on AmazonGeoPlacesClient. - /// An AsyncCallback delegate that is invoked when the operation completes. - /// A user-defined state object that is passed to the callback procedure. Retrieve this object from within the callback - /// procedure using the AsyncState property. - /// - /// An IAsyncResult that can be used to poll or wait for results, or both; this value is also needed when invoking EndReverseGeocode - /// operation. - /// REST API Reference for ReverseGeocode Operation - IAsyncResult BeginReverseGeocode(ReverseGeocodeRequest request, AsyncCallback callback, object state); - - - - /// - /// Finishes the asynchronous execution of the ReverseGeocode operation. - /// - /// - /// The IAsyncResult returned by the call to BeginReverseGeocode. - /// - /// Returns a ReverseGeocodeResult from GeoPlaces. - /// REST API Reference for ReverseGeocode Operation - ReverseGeocodeResponse EndReverseGeocode(IAsyncResult asyncResult); - - #endregion - - #region SearchNearby - - - /// - /// Search nearby a specified location. - /// - /// Container for the necessary parameters to execute the SearchNearby service method. - /// - /// The response from the SearchNearby service method, as returned by GeoPlaces. - /// - /// You don't have sufficient access to perform this action. - /// - /// - /// The request processing has failed because of an unknown error, exception or failure. - /// - /// - /// The request was denied due to request throttling. - /// - /// - /// The input fails to satisfy the constraints specified by an AWS service. - /// - /// REST API Reference for SearchNearby Operation - SearchNearbyResponse SearchNearby(SearchNearbyRequest request); - - /// - /// Initiates the asynchronous execution of the SearchNearby operation. - /// - /// - /// Container for the necessary parameters to execute the SearchNearby operation on AmazonGeoPlacesClient. - /// An AsyncCallback delegate that is invoked when the operation completes. - /// A user-defined state object that is passed to the callback procedure. Retrieve this object from within the callback - /// procedure using the AsyncState property. - /// - /// An IAsyncResult that can be used to poll or wait for results, or both; this value is also needed when invoking EndSearchNearby - /// operation. - /// REST API Reference for SearchNearby Operation - IAsyncResult BeginSearchNearby(SearchNearbyRequest request, AsyncCallback callback, object state); - - - - /// - /// Finishes the asynchronous execution of the SearchNearby operation. - /// - /// - /// The IAsyncResult returned by the call to BeginSearchNearby. - /// - /// Returns a SearchNearbyResult from GeoPlaces. - /// REST API Reference for SearchNearby Operation - SearchNearbyResponse EndSearchNearby(IAsyncResult asyncResult); - - #endregion - - #region SearchText - - - /// - /// Use the SearchText operation to search for geocode and place information. You - /// can then complete a follow-up query suggested from the Suggest API via a query - /// id. - /// - /// Container for the necessary parameters to execute the SearchText service method. - /// - /// The response from the SearchText service method, as returned by GeoPlaces. - /// - /// You don't have sufficient access to perform this action. - /// - /// - /// The request processing has failed because of an unknown error, exception or failure. - /// - /// - /// The request was denied due to request throttling. - /// - /// - /// The input fails to satisfy the constraints specified by an AWS service. - /// - /// REST API Reference for SearchText Operation - SearchTextResponse SearchText(SearchTextRequest request); - - /// - /// Initiates the asynchronous execution of the SearchText operation. - /// - /// - /// Container for the necessary parameters to execute the SearchText operation on AmazonGeoPlacesClient. - /// An AsyncCallback delegate that is invoked when the operation completes. - /// A user-defined state object that is passed to the callback procedure. Retrieve this object from within the callback - /// procedure using the AsyncState property. - /// - /// An IAsyncResult that can be used to poll or wait for results, or both; this value is also needed when invoking EndSearchText - /// operation. - /// REST API Reference for SearchText Operation - IAsyncResult BeginSearchText(SearchTextRequest request, AsyncCallback callback, object state); - - - - /// - /// Finishes the asynchronous execution of the SearchText operation. - /// - /// - /// The IAsyncResult returned by the call to BeginSearchText. - /// - /// Returns a SearchTextResult from GeoPlaces. - /// REST API Reference for SearchText Operation - SearchTextResponse EndSearchText(IAsyncResult asyncResult); - - #endregion - - #region Suggest - - - /// - /// The Suggest operation finds addresses or place candidates based on incomplete - /// or misspelled queries. You then select the best query to submit based on the returned - /// results. - /// - /// Container for the necessary parameters to execute the Suggest service method. - /// - /// The response from the Suggest service method, as returned by GeoPlaces. - /// - /// You don't have sufficient access to perform this action. - /// - /// - /// The request processing has failed because of an unknown error, exception or failure. - /// - /// - /// The request was denied due to request throttling. - /// - /// - /// The input fails to satisfy the constraints specified by an AWS service. - /// - /// REST API Reference for Suggest Operation - SuggestResponse Suggest(SuggestRequest request); - - /// - /// Initiates the asynchronous execution of the Suggest operation. - /// - /// - /// Container for the necessary parameters to execute the Suggest operation on AmazonGeoPlacesClient. - /// An AsyncCallback delegate that is invoked when the operation completes. - /// A user-defined state object that is passed to the callback procedure. Retrieve this object from within the callback - /// procedure using the AsyncState property. - /// - /// An IAsyncResult that can be used to poll or wait for results, or both; this value is also needed when invoking EndSuggest - /// operation. - /// REST API Reference for Suggest Operation - IAsyncResult BeginSuggest(SuggestRequest request, AsyncCallback callback, object state); - - - - /// - /// Finishes the asynchronous execution of the Suggest operation. - /// - /// - /// The IAsyncResult returned by the call to BeginSuggest. - /// - /// Returns a SuggestResult from GeoPlaces. - /// REST API Reference for Suggest Operation - SuggestResponse EndSuggest(IAsyncResult asyncResult); - - #endregion - - #region DetermineServiceOperationEndpoint - - /// - /// Returns the endpoint that will be used for a particular request. - /// - /// Request for the desired service operation. - /// The resolved endpoint for the given request. - Amazon.Runtime.Endpoints.Endpoint DetermineServiceOperationEndpoint(AmazonWebServiceRequest request); - - #endregion - - } -} \ No newline at end of file diff --git a/sdk/src/Services/GeoPlaces/Generated/_netstandard/AmazonGeoPlacesClient.cs b/sdk/src/Services/GeoPlaces/Generated/_netstandard/AmazonGeoPlacesClient.cs index 5f6c85e741e5..05b0f2d2b686 100644 --- a/sdk/src/Services/GeoPlaces/Generated/_netstandard/AmazonGeoPlacesClient.cs +++ b/sdk/src/Services/GeoPlaces/Generated/_netstandard/AmazonGeoPlacesClient.cs @@ -32,6 +32,7 @@ using Amazon.Runtime.Internal; using Amazon.Runtime.Internal.Auth; using Amazon.Runtime.Internal.Transform; +using Amazon.Runtime.Endpoints; #pragma warning disable CS1570 namespace Amazon.GeoPlaces @@ -634,16 +635,8 @@ internal virtual SuggestResponse Suggest(SuggestRequest request) /// The resolved endpoint for the given request. public Amazon.Runtime.Endpoints.Endpoint DetermineServiceOperationEndpoint(AmazonWebServiceRequest request) { - var requestContext = new Amazon.Runtime.Internal.RequestContext(false, CreateSigner()) - { - ClientConfig = Config, - OriginalRequest = request, - Request = new Amazon.Runtime.Internal.DefaultRequest(request, ServiceMetadata.ServiceId) - }; - - var executionContext = new Amazon.Runtime.Internal.ExecutionContext(requestContext, null); - var resolver = new AmazonGeoPlacesEndpointResolver(); - return resolver.GetEndpoint(executionContext); + var parameters = new ServiceOperationEndpointParameters(request); + return Config.DetermineServiceOperationEndpoint(parameters); } #endregion diff --git a/sdk/src/Services/GeoPlaces/Generated/_netstandard/IAmazonGeoPlaces.cs b/sdk/src/Services/GeoPlaces/Generated/_netstandard/IAmazonGeoPlaces.cs index 14ee7bc37068..a6c5e771262a 100644 --- a/sdk/src/Services/GeoPlaces/Generated/_netstandard/IAmazonGeoPlaces.cs +++ b/sdk/src/Services/GeoPlaces/Generated/_netstandard/IAmazonGeoPlaces.cs @@ -311,5 +311,33 @@ public partial interface IAmazonGeoPlaces : IAmazonService, IDisposable #endregion + #region Static factory interface methods +#if NET8_0_OR_GREATER +// Warning CA1033 is issued when the child types can not call the method defined in parent types. +// In this use case the intended caller is only meant to be the interface as a factory +// method to create the child types. Given the SDK use case the warning can be ignored. +#pragma warning disable CA1033 + /// + [System.Diagnostics.CodeAnalysis.DynamicDependency(System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicProperties, typeof(AmazonGeoPlacesConfig))] + static ClientConfig IAmazonService.CreateDefaultClientConfig() => new AmazonGeoPlacesConfig(); + + /// + [System.Diagnostics.CodeAnalysis.UnconditionalSuppressMessage("AssemblyLoadTrimming", "IL2026:RequiresUnreferencedCode", + Justification = "This suppression is here to ignore the warnings caused by CognitoSync. See justification in IAmazonService.")] + static IAmazonService IAmazonService.CreateDefaultServiceClient(AWSCredentials awsCredentials, ClientConfig clientConfig) + { + var serviceClientConfig = clientConfig as AmazonGeoPlacesConfig; + if (serviceClientConfig == null) + { + throw new AmazonClientException("ClientConfig is not of type AmazonGeoPlacesConfig to create AmazonGeoPlacesClient"); + } + + return awsCredentials == null ? + new AmazonGeoPlacesClient(serviceClientConfig) : + new AmazonGeoPlacesClient(awsCredentials, serviceClientConfig); + } +#pragma warning restore CA1033 +#endif + #endregion } } \ No newline at end of file diff --git a/sdk/src/Services/GeoPlaces/GeoPlaces.sln b/sdk/src/Services/GeoPlaces/GeoPlaces.sln index 892f2e7db964..b525722930db 100644 --- a/sdk/src/Services/GeoPlaces/GeoPlaces.sln +++ b/sdk/src/Services/GeoPlaces/GeoPlaces.sln @@ -4,9 +4,7 @@ VisualStudioVersion = 15.0.26730.12 MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Core", "Core", "{9863FCB3-BFA4-4B9C-B8F6-302BA5F660B8}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.Core.Net35", "../../Core/AWSSDK.Core.Net35.csproj", "{1FACE5D0-97BF-4069-B4F7-0FE28BB160F8}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.Core.Net45", "../../Core/AWSSDK.Core.Net45.csproj", "{7DE3AFA0-1B2D-41B1-82BD-120B8B210B43}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.Core.NetFramework", "../../Core/AWSSDK.Core.NetFramework.csproj", "{7DE3AFA0-1B2D-41B1-82BD-120B8B210B43}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.Core.NetStandard", "../../Core/AWSSDK.Core.NetStandard.csproj", "{A855B58E-ED32-40AE-AE8F-054F448B9F2C}" EndProject @@ -14,27 +12,19 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Services", "Services", "{93 EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "GeoPlaces", "GeoPlaces", "{80DDA8BB-849A-4362-A8B3-E8A257007AC0}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.GeoPlaces.Net35", "AWSSDK.GeoPlaces.Net35.csproj", "{71C1785A-2EEA-45CE-928C-A1B6AB286C59}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.GeoPlaces.Net45", "AWSSDK.GeoPlaces.Net45.csproj", "{2A84C645-206C-4B33-ABEF-88DCD8C09CA5}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.GeoPlaces.NetFramework", "AWSSDK.GeoPlaces.NetFramework.csproj", "{20470E79-974E-4AE4-BC99-A9A3478FD10C}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.GeoPlaces.NetStandard", "AWSSDK.GeoPlaces.NetStandard.csproj", "{36431C52-CFCE-4D44-A55D-34852A19432F}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Test", "Test", "{12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.UnitTests.GeoPlaces.Net35", "../../../test/Services/GeoPlaces/UnitTests/AWSSDK.UnitTests.GeoPlaces.Net35.csproj", "{5FCE10D2-51F4-42C4-B532-D742EAE0A8BD}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.UnitTests.GeoPlaces.Net45", "../../../test/Services/GeoPlaces/UnitTests/AWSSDK.UnitTests.GeoPlaces.Net45.csproj", "{D8B6CAF2-AB1C-4AC7-9D46-196BC4539DEA}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.UnitTests.GeoPlaces.NetFramework", "../../../test/Services/GeoPlaces/UnitTests/AWSSDK.UnitTests.GeoPlaces.NetFramework.csproj", "{4E03492B-EF8B-4487-B734-526D46C1764E}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ServiceClientGeneratorLib", "../../../../generator/ServiceClientGeneratorLib/ServiceClientGeneratorLib.csproj", "{7BEE7C44-BE12-43CC-AFB9-B5852A1F43C8}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.UnitTestUtilities.Net35", "../../../test/UnitTests/Custom/AWSSDK.UnitTestUtilities.Net35.csproj", "{A23CE153-A4A3-4D3A-A6DC-0DD1B207118E}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.UnitTestUtilities.Net45", "../../../test/UnitTests/Custom/AWSSDK.UnitTestUtilities.Net45.csproj", "{002B183F-E568-49CD-9D06-CBCFF2C2921F}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.IntegrationTestUtilities.Net35", "../../../test/IntegrationTests/AWSSDK.IntegrationTestUtilities.Net35.csproj", "{924D2906-70D6-4D77-8603-816648B2CCA6}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.UnitTestUtilities.NetFramework", "../../../test/UnitTests/Custom/AWSSDK.UnitTestUtilities.NetFramework.csproj", "{002B183F-E568-49CD-9D06-CBCFF2C2921F}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.IntegrationTestUtilities.Net45", "../../../test/IntegrationTests/AWSSDK.IntegrationTestUtilities.Net45.csproj", "{7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.IntegrationTestUtilities.NetFramework", "../../../test/IntegrationTests/AWSSDK.IntegrationTestUtilities.NetFramework.csproj", "{7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.CommonTest", "../../../test/Common/AWSSDK.CommonTest.csproj", "{66F78F86-68D7-4538-8EA5-A669A08E1C19}" EndProject @@ -44,25 +34,15 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UnitTests.NetStandard.CoreO EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "IntegrationTestDependencies", "IntegrationTestDependencies", "{939EC5C2-8345-43E2-8F97-72EEEBEEA0AC}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.Extensions.CrtIntegration.Net35", "../../../../extensions/src/AWSSDK.Extensions.CrtIntegration/AWSSDK.Extensions.CrtIntegration.Net35.csproj", "{8DBE77B3-E7F4-4E3D-9EF9-D401ADE63FF5}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.Extensions.CrtIntegration.Net45", "../../../../extensions/src/AWSSDK.Extensions.CrtIntegration/AWSSDK.Extensions.CrtIntegration.Net45.csproj", "{90103B87-ABE3-4A61-A0C1-F02BF9E00EE7}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.IdentityManagement.Net35", "../IdentityManagement/AWSSDK.IdentityManagement.Net35.csproj", "{1EB9C1F1-1C26-487D-9989-428807FBB919}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.SecurityToken.Net35", "../SecurityToken/AWSSDK.SecurityToken.Net35.csproj", "{0F687AE7-38E8-4AFB-BB5E-B00192EE41AC}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.SimpleNotificationService.Net35", "../SimpleNotificationService/AWSSDK.SimpleNotificationService.Net35.csproj", "{7582CC65-0EE3-4C2E-9420-F7A2AB2BAE23}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.S3.Net35", "../S3/AWSSDK.S3.Net35.csproj", "{011E1507-9835-4F0F-8AE8-6668009CC459}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.Extensions.CrtIntegration.NetFramework", "../../../../extensions/src/AWSSDK.Extensions.CrtIntegration/AWSSDK.Extensions.CrtIntegration.NetFramework.csproj", "{6BD1B352-F322-45DF-A739-A36ABE461B01}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.IdentityManagement.Net45", "../IdentityManagement/AWSSDK.IdentityManagement.Net45.csproj", "{4EC91077-B78A-435D-AC98-C81CEA3433F1}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.IdentityManagement.NetFramework", "../IdentityManagement/AWSSDK.IdentityManagement.NetFramework.csproj", "{9B57B94D-991A-4B7B-B86C-66C4F2B5181C}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.S3.Net45", "../S3/AWSSDK.S3.Net45.csproj", "{76C5F9F9-CBBD-4D9F-8A12-6C00185613D0}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.S3.NetFramework", "../S3/AWSSDK.S3.NetFramework.csproj", "{DA4612E8-C6DA-4541-B55D-EF76917C0630}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.SecurityToken.Net45", "../SecurityToken/AWSSDK.SecurityToken.Net45.csproj", "{80785F37-5CB0-4B56-9DC8-5293C7CCD7DA}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.SecurityToken.NetFramework", "../SecurityToken/AWSSDK.SecurityToken.NetFramework.csproj", "{CDFFA4CA-9E01-418C-8408-D3498B25B7A8}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.SimpleNotificationService.Net45", "../SimpleNotificationService/AWSSDK.SimpleNotificationService.Net45.csproj", "{DD0E36AF-74CC-4818-A2E4-0C4606C00BBE}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.SimpleNotificationService.NetFramework", "../SimpleNotificationService/AWSSDK.SimpleNotificationService.NetFramework.csproj", "{D718D368-A762-4BE3-92E6-C75104183A4C}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -70,10 +50,6 @@ Global Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {1FACE5D0-97BF-4069-B4F7-0FE28BB160F8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1FACE5D0-97BF-4069-B4F7-0FE28BB160F8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1FACE5D0-97BF-4069-B4F7-0FE28BB160F8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1FACE5D0-97BF-4069-B4F7-0FE28BB160F8}.Release|Any CPU.Build.0 = Release|Any CPU {7DE3AFA0-1B2D-41B1-82BD-120B8B210B43}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {7DE3AFA0-1B2D-41B1-82BD-120B8B210B43}.Debug|Any CPU.Build.0 = Debug|Any CPU {7DE3AFA0-1B2D-41B1-82BD-120B8B210B43}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -82,42 +58,26 @@ Global {A855B58E-ED32-40AE-AE8F-054F448B9F2C}.Debug|Any CPU.Build.0 = Debug|Any CPU {A855B58E-ED32-40AE-AE8F-054F448B9F2C}.Release|Any CPU.ActiveCfg = Release|Any CPU {A855B58E-ED32-40AE-AE8F-054F448B9F2C}.Release|Any CPU.Build.0 = Release|Any CPU - {71C1785A-2EEA-45CE-928C-A1B6AB286C59}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {71C1785A-2EEA-45CE-928C-A1B6AB286C59}.Debug|Any CPU.Build.0 = Debug|Any CPU - {71C1785A-2EEA-45CE-928C-A1B6AB286C59}.Release|Any CPU.ActiveCfg = Release|Any CPU - {71C1785A-2EEA-45CE-928C-A1B6AB286C59}.Release|Any CPU.Build.0 = Release|Any CPU - {2A84C645-206C-4B33-ABEF-88DCD8C09CA5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2A84C645-206C-4B33-ABEF-88DCD8C09CA5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2A84C645-206C-4B33-ABEF-88DCD8C09CA5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2A84C645-206C-4B33-ABEF-88DCD8C09CA5}.Release|Any CPU.Build.0 = Release|Any CPU + {20470E79-974E-4AE4-BC99-A9A3478FD10C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {20470E79-974E-4AE4-BC99-A9A3478FD10C}.Debug|Any CPU.Build.0 = Debug|Any CPU + {20470E79-974E-4AE4-BC99-A9A3478FD10C}.Release|Any CPU.ActiveCfg = Release|Any CPU + {20470E79-974E-4AE4-BC99-A9A3478FD10C}.Release|Any CPU.Build.0 = Release|Any CPU {36431C52-CFCE-4D44-A55D-34852A19432F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {36431C52-CFCE-4D44-A55D-34852A19432F}.Debug|Any CPU.Build.0 = Debug|Any CPU {36431C52-CFCE-4D44-A55D-34852A19432F}.Release|Any CPU.ActiveCfg = Release|Any CPU {36431C52-CFCE-4D44-A55D-34852A19432F}.Release|Any CPU.Build.0 = Release|Any CPU - {5FCE10D2-51F4-42C4-B532-D742EAE0A8BD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5FCE10D2-51F4-42C4-B532-D742EAE0A8BD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5FCE10D2-51F4-42C4-B532-D742EAE0A8BD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5FCE10D2-51F4-42C4-B532-D742EAE0A8BD}.Release|Any CPU.Build.0 = Release|Any CPU - {D8B6CAF2-AB1C-4AC7-9D46-196BC4539DEA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D8B6CAF2-AB1C-4AC7-9D46-196BC4539DEA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D8B6CAF2-AB1C-4AC7-9D46-196BC4539DEA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D8B6CAF2-AB1C-4AC7-9D46-196BC4539DEA}.Release|Any CPU.Build.0 = Release|Any CPU + {4E03492B-EF8B-4487-B734-526D46C1764E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {4E03492B-EF8B-4487-B734-526D46C1764E}.Debug|Any CPU.Build.0 = Debug|Any CPU + {4E03492B-EF8B-4487-B734-526D46C1764E}.Release|Any CPU.ActiveCfg = Release|Any CPU + {4E03492B-EF8B-4487-B734-526D46C1764E}.Release|Any CPU.Build.0 = Release|Any CPU {7BEE7C44-BE12-43CC-AFB9-B5852A1F43C8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {7BEE7C44-BE12-43CC-AFB9-B5852A1F43C8}.Debug|Any CPU.Build.0 = Debug|Any CPU {7BEE7C44-BE12-43CC-AFB9-B5852A1F43C8}.Release|Any CPU.ActiveCfg = Release|Any CPU {7BEE7C44-BE12-43CC-AFB9-B5852A1F43C8}.Release|Any CPU.Build.0 = Release|Any CPU - {A23CE153-A4A3-4D3A-A6DC-0DD1B207118E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A23CE153-A4A3-4D3A-A6DC-0DD1B207118E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A23CE153-A4A3-4D3A-A6DC-0DD1B207118E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A23CE153-A4A3-4D3A-A6DC-0DD1B207118E}.Release|Any CPU.Build.0 = Release|Any CPU {002B183F-E568-49CD-9D06-CBCFF2C2921F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {002B183F-E568-49CD-9D06-CBCFF2C2921F}.Debug|Any CPU.Build.0 = Debug|Any CPU {002B183F-E568-49CD-9D06-CBCFF2C2921F}.Release|Any CPU.ActiveCfg = Release|Any CPU {002B183F-E568-49CD-9D06-CBCFF2C2921F}.Release|Any CPU.Build.0 = Release|Any CPU - {924D2906-70D6-4D77-8603-816648B2CCA6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {924D2906-70D6-4D77-8603-816648B2CCA6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {924D2906-70D6-4D77-8603-816648B2CCA6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {924D2906-70D6-4D77-8603-816648B2CCA6}.Release|Any CPU.Build.0 = Release|Any CPU {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7}.Debug|Any CPU.Build.0 = Debug|Any CPU {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -134,78 +94,48 @@ Global {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {8DBE77B3-E7F4-4E3D-9EF9-D401ADE63FF5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8DBE77B3-E7F4-4E3D-9EF9-D401ADE63FF5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8DBE77B3-E7F4-4E3D-9EF9-D401ADE63FF5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8DBE77B3-E7F4-4E3D-9EF9-D401ADE63FF5}.Release|Any CPU.Build.0 = Release|Any CPU - {90103B87-ABE3-4A61-A0C1-F02BF9E00EE7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {90103B87-ABE3-4A61-A0C1-F02BF9E00EE7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {90103B87-ABE3-4A61-A0C1-F02BF9E00EE7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {90103B87-ABE3-4A61-A0C1-F02BF9E00EE7}.Release|Any CPU.Build.0 = Release|Any CPU - {1EB9C1F1-1C26-487D-9989-428807FBB919}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1EB9C1F1-1C26-487D-9989-428807FBB919}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1EB9C1F1-1C26-487D-9989-428807FBB919}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1EB9C1F1-1C26-487D-9989-428807FBB919}.Release|Any CPU.Build.0 = Release|Any CPU - {0F687AE7-38E8-4AFB-BB5E-B00192EE41AC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0F687AE7-38E8-4AFB-BB5E-B00192EE41AC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0F687AE7-38E8-4AFB-BB5E-B00192EE41AC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0F687AE7-38E8-4AFB-BB5E-B00192EE41AC}.Release|Any CPU.Build.0 = Release|Any CPU - {7582CC65-0EE3-4C2E-9420-F7A2AB2BAE23}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7582CC65-0EE3-4C2E-9420-F7A2AB2BAE23}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7582CC65-0EE3-4C2E-9420-F7A2AB2BAE23}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7582CC65-0EE3-4C2E-9420-F7A2AB2BAE23}.Release|Any CPU.Build.0 = Release|Any CPU - {011E1507-9835-4F0F-8AE8-6668009CC459}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {011E1507-9835-4F0F-8AE8-6668009CC459}.Debug|Any CPU.Build.0 = Debug|Any CPU - {011E1507-9835-4F0F-8AE8-6668009CC459}.Release|Any CPU.ActiveCfg = Release|Any CPU - {011E1507-9835-4F0F-8AE8-6668009CC459}.Release|Any CPU.Build.0 = Release|Any CPU - {4EC91077-B78A-435D-AC98-C81CEA3433F1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4EC91077-B78A-435D-AC98-C81CEA3433F1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4EC91077-B78A-435D-AC98-C81CEA3433F1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4EC91077-B78A-435D-AC98-C81CEA3433F1}.Release|Any CPU.Build.0 = Release|Any CPU - {76C5F9F9-CBBD-4D9F-8A12-6C00185613D0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {76C5F9F9-CBBD-4D9F-8A12-6C00185613D0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {76C5F9F9-CBBD-4D9F-8A12-6C00185613D0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {76C5F9F9-CBBD-4D9F-8A12-6C00185613D0}.Release|Any CPU.Build.0 = Release|Any CPU - {80785F37-5CB0-4B56-9DC8-5293C7CCD7DA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {80785F37-5CB0-4B56-9DC8-5293C7CCD7DA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {80785F37-5CB0-4B56-9DC8-5293C7CCD7DA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {80785F37-5CB0-4B56-9DC8-5293C7CCD7DA}.Release|Any CPU.Build.0 = Release|Any CPU - {DD0E36AF-74CC-4818-A2E4-0C4606C00BBE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DD0E36AF-74CC-4818-A2E4-0C4606C00BBE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DD0E36AF-74CC-4818-A2E4-0C4606C00BBE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DD0E36AF-74CC-4818-A2E4-0C4606C00BBE}.Release|Any CPU.Build.0 = Release|Any CPU + {6BD1B352-F322-45DF-A739-A36ABE461B01}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {6BD1B352-F322-45DF-A739-A36ABE461B01}.Debug|Any CPU.Build.0 = Debug|Any CPU + {6BD1B352-F322-45DF-A739-A36ABE461B01}.Release|Any CPU.ActiveCfg = Release|Any CPU + {6BD1B352-F322-45DF-A739-A36ABE461B01}.Release|Any CPU.Build.0 = Release|Any CPU + {9B57B94D-991A-4B7B-B86C-66C4F2B5181C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {9B57B94D-991A-4B7B-B86C-66C4F2B5181C}.Debug|Any CPU.Build.0 = Debug|Any CPU + {9B57B94D-991A-4B7B-B86C-66C4F2B5181C}.Release|Any CPU.ActiveCfg = Release|Any CPU + {9B57B94D-991A-4B7B-B86C-66C4F2B5181C}.Release|Any CPU.Build.0 = Release|Any CPU + {DA4612E8-C6DA-4541-B55D-EF76917C0630}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {DA4612E8-C6DA-4541-B55D-EF76917C0630}.Debug|Any CPU.Build.0 = Debug|Any CPU + {DA4612E8-C6DA-4541-B55D-EF76917C0630}.Release|Any CPU.ActiveCfg = Release|Any CPU + {DA4612E8-C6DA-4541-B55D-EF76917C0630}.Release|Any CPU.Build.0 = Release|Any CPU + {CDFFA4CA-9E01-418C-8408-D3498B25B7A8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {CDFFA4CA-9E01-418C-8408-D3498B25B7A8}.Debug|Any CPU.Build.0 = Debug|Any CPU + {CDFFA4CA-9E01-418C-8408-D3498B25B7A8}.Release|Any CPU.ActiveCfg = Release|Any CPU + {CDFFA4CA-9E01-418C-8408-D3498B25B7A8}.Release|Any CPU.Build.0 = Release|Any CPU + {D718D368-A762-4BE3-92E6-C75104183A4C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {D718D368-A762-4BE3-92E6-C75104183A4C}.Debug|Any CPU.Build.0 = Debug|Any CPU + {D718D368-A762-4BE3-92E6-C75104183A4C}.Release|Any CPU.ActiveCfg = Release|Any CPU + {D718D368-A762-4BE3-92E6-C75104183A4C}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution - {1FACE5D0-97BF-4069-B4F7-0FE28BB160F8} = {9863FCB3-BFA4-4B9C-B8F6-302BA5F660B8} {7DE3AFA0-1B2D-41B1-82BD-120B8B210B43} = {9863FCB3-BFA4-4B9C-B8F6-302BA5F660B8} {A855B58E-ED32-40AE-AE8F-054F448B9F2C} = {9863FCB3-BFA4-4B9C-B8F6-302BA5F660B8} {80DDA8BB-849A-4362-A8B3-E8A257007AC0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AB} - {71C1785A-2EEA-45CE-928C-A1B6AB286C59} = {80DDA8BB-849A-4362-A8B3-E8A257007AC0} - {2A84C645-206C-4B33-ABEF-88DCD8C09CA5} = {80DDA8BB-849A-4362-A8B3-E8A257007AC0} + {20470E79-974E-4AE4-BC99-A9A3478FD10C} = {80DDA8BB-849A-4362-A8B3-E8A257007AC0} {36431C52-CFCE-4D44-A55D-34852A19432F} = {80DDA8BB-849A-4362-A8B3-E8A257007AC0} - {5FCE10D2-51F4-42C4-B532-D742EAE0A8BD} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {D8B6CAF2-AB1C-4AC7-9D46-196BC4539DEA} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {4E03492B-EF8B-4487-B734-526D46C1764E} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7BEE7C44-BE12-43CC-AFB9-B5852A1F43C8} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {A23CE153-A4A3-4D3A-A6DC-0DD1B207118E} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {924D2906-70D6-4D77-8603-816648B2CCA6} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {8DBE77B3-E7F4-4E3D-9EF9-D401ADE63FF5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {90103B87-ABE3-4A61-A0C1-F02BF9E00EE7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {1EB9C1F1-1C26-487D-9989-428807FBB919} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0F687AE7-38E8-4AFB-BB5E-B00192EE41AC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {7582CC65-0EE3-4C2E-9420-F7A2AB2BAE23} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {011E1507-9835-4F0F-8AE8-6668009CC459} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4EC91077-B78A-435D-AC98-C81CEA3433F1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {76C5F9F9-CBBD-4D9F-8A12-6C00185613D0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {80785F37-5CB0-4B56-9DC8-5293C7CCD7DA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {DD0E36AF-74CC-4818-A2E4-0C4606C00BBE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} + {6BD1B352-F322-45DF-A739-A36ABE461B01} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} + {9B57B94D-991A-4B7B-B86C-66C4F2B5181C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} + {DA4612E8-C6DA-4541-B55D-EF76917C0630} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} + {CDFFA4CA-9E01-418C-8408-D3498B25B7A8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} + {D718D368-A762-4BE3-92E6-C75104183A4C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {9D3709A5-C7F7-497A-8B1E-5388B5A01DA4} diff --git a/sdk/src/Services/GeoPlaces/Properties/AssemblyInfo.cs b/sdk/src/Services/GeoPlaces/Properties/AssemblyInfo.cs index b64000e36a1f..f3d0dc664ac4 100644 --- a/sdk/src/Services/GeoPlaces/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/GeoPlaces/Properties/AssemblyInfo.cs @@ -7,10 +7,8 @@ // set of attributes. Change these attribute values to modify the information // associated with an assembly. [assembly: AssemblyTitle("AWSSDK.GeoPlaces")] -#if BCL35 -[assembly: AssemblyDescription("The Amazon Web Services SDK for .NET (3.5) - Amazon Location Service Places V2. Release of Amazon Location Places API. Places enables you to quickly search, display, and filter places, businesses, and locations based on proximity, category, and name")] -#elif BCL45 -[assembly: AssemblyDescription("The Amazon Web Services SDK for .NET (4.5) - Amazon Location Service Places V2. Release of Amazon Location Places API. Places enables you to quickly search, display, and filter places, businesses, and locations based on proximity, category, and name")] +#if BCL +[assembly: AssemblyDescription("The Amazon Web Services SDK for .NET (4.7.2) - Amazon Location Service Places V2. Release of Amazon Location Places API. Places enables you to quickly search, display, and filter places, businesses, and locations based on proximity, category, and name")] #elif NETSTANDARD20 [assembly: AssemblyDescription("The Amazon Web Services SDK for .NET (NetStandard 2.0) - Amazon Location Service Places V2. Release of Amazon Location Places API. Places enables you to quickly search, display, and filter places, businesses, and locations based on proximity, category, and name")] #elif NETCOREAPP3_1 @@ -43,9 +41,9 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.10")] - #if BCL -[assembly: System.Security.AllowPartiallyTrustedCallers] -#endif \ No newline at end of file +[assembly: AssemblyVersion("4.0")] +#else +[assembly: AssemblyVersion("4.0.0.0")] +#endif +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/src/Services/GeoRoutes/AWSSDK.GeoRoutes.Net35.csproj b/sdk/src/Services/GeoRoutes/AWSSDK.GeoRoutes.Net35.csproj deleted file mode 100644 index 8d57fa0ffdb9..000000000000 --- a/sdk/src/Services/GeoRoutes/AWSSDK.GeoRoutes.Net35.csproj +++ /dev/null @@ -1,83 +0,0 @@ - - - true - net35 - $(DefineConstants);BCL;BCL35;AWS_APM_API;CODE_ANALYSIS - portable - true - AWSSDK.GeoRoutes - AWSSDK.GeoRoutes - - false - false - false - false - false - false - false - false - true - true - - - C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v3.5\Profile\Client - - false - CA1822 - - - ../../../AWSDotNetSDK.ruleset - - - ../../../AWSDotNetSDKForBuild.ruleset - - - - - - ../../../awssdk.dll.snk - - - - - $(AWSKeyFile) - - - - - - - - - - - - - - - - - - - - - - - all - - - all - - - - - - - - - C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\v3.5\System.Data.Entity.dll - - - - - \ No newline at end of file diff --git a/sdk/src/Services/GeoRoutes/AWSSDK.GeoRoutes.Net45.csproj b/sdk/src/Services/GeoRoutes/AWSSDK.GeoRoutes.NetFramework.csproj similarity index 80% rename from sdk/src/Services/GeoRoutes/AWSSDK.GeoRoutes.Net45.csproj rename to sdk/src/Services/GeoRoutes/AWSSDK.GeoRoutes.NetFramework.csproj index 90e10220ef88..748eb226edf2 100644 --- a/sdk/src/Services/GeoRoutes/AWSSDK.GeoRoutes.Net45.csproj +++ b/sdk/src/Services/GeoRoutes/AWSSDK.GeoRoutes.NetFramework.csproj @@ -1,8 +1,8 @@ true - net45 - $(DefineConstants);BCL;BCL45;AWS_ASYNC_API;CODE_ANALYSIS + net472 + $(DefineConstants);BCL;AWS_ASYNC_API;CODE_ANALYSIS portable true AWSSDK.GeoRoutes @@ -21,6 +21,16 @@ CA1822 + + + 11.0 + + + 9.0 + ../../../AWSDotNetSDK.ruleset @@ -45,14 +55,13 @@ - - + diff --git a/sdk/src/Services/GeoRoutes/AWSSDK.GeoRoutes.NetStandard.csproj b/sdk/src/Services/GeoRoutes/AWSSDK.GeoRoutes.NetStandard.csproj index 14ef4ae3f2d1..ff1ea97315f0 100644 --- a/sdk/src/Services/GeoRoutes/AWSSDK.GeoRoutes.NetStandard.csproj +++ b/sdk/src/Services/GeoRoutes/AWSSDK.GeoRoutes.NetStandard.csproj @@ -31,6 +31,16 @@ true + + + 11.0 + + + 9.0 + ../../../AWSDotNetSDK.ruleset @@ -55,8 +65,6 @@ - - diff --git a/sdk/src/Services/GeoRoutes/Generated/AmazonGeoRoutesConfig.cs b/sdk/src/Services/GeoRoutes/Generated/AmazonGeoRoutesConfig.cs index 6072c368b759..b27dc7ccc0b9 100644 --- a/sdk/src/Services/GeoRoutes/Generated/AmazonGeoRoutesConfig.cs +++ b/sdk/src/Services/GeoRoutes/Generated/AmazonGeoRoutesConfig.cs @@ -21,6 +21,8 @@ using Amazon.Runtime; using Amazon.Runtime.Internal; using Amazon.Util.Internal; +using Amazon.Runtime.Internal.Auth; +using Amazon.Runtime.Endpoints; using Amazon.GeoRoutes.Internal; namespace Amazon.GeoRoutes @@ -32,7 +34,10 @@ namespace Amazon.GeoRoutes public partial class AmazonGeoRoutesConfig : ClientConfig { private static readonly string UserAgentString = - InternalSDKUtils.BuildUserAgentString("Geo Routes", "3.7.400.10"); + InternalSDKUtils.BuildUserAgentString("Geo Routes", "4.0.0.0"); + + private static readonly AmazonGeoRoutesEndpointResolver EndpointResolver = + new AmazonGeoRoutesEndpointResolver(); private string _userAgent = UserAgentString; /// @@ -89,5 +94,24 @@ public override string UserAgent } } + /// + /// Returns the endpoint that will be used for a particular request. + /// + /// A Container class for parameters used for endpoint resolution. + /// The resolved endpoint for the given request. + public override Amazon.Runtime.Endpoints.Endpoint DetermineServiceOperationEndpoint(ServiceOperationEndpointParameters parameters) + { + var requestContext = new RequestContext(false, new AWS4Signer()) + { + ClientConfig = this, + OriginalRequest = parameters.Request, + Request = new DefaultRequest(parameters.Request, ServiceId) + }; + + var executionContext = new Amazon.Runtime.Internal.ExecutionContext(requestContext, null); + return EndpointResolver.GetEndpoint(executionContext); + } + + } } \ No newline at end of file diff --git a/sdk/src/Services/GeoRoutes/Generated/AmazonGeoRoutesDefaultConfiguration.cs b/sdk/src/Services/GeoRoutes/Generated/AmazonGeoRoutesDefaultConfiguration.cs index 1c70693e4898..21648e893e0d 100644 --- a/sdk/src/Services/GeoRoutes/Generated/AmazonGeoRoutesDefaultConfiguration.cs +++ b/sdk/src/Services/GeoRoutes/Generated/AmazonGeoRoutesDefaultConfiguration.cs @@ -43,8 +43,7 @@ public static ReadOnlyCollection GetAllConfigurations() InRegion, CrossRegion, Mobile, - Auto, - Legacy + Auto }); } @@ -55,7 +54,6 @@ public static ReadOnlyCollection GetAllConfigurations() { Name = DefaultConfigurationMode.Standard, RetryMode = RequestRetryMode.Standard, - StsRegionalEndpoints = StsRegionalEndpointsValue.Regional, S3UsEast1RegionalEndpoint = S3UsEast1RegionalEndpointValue.Regional, // 0:00:03.1 ConnectTimeout = TimeSpan.FromMilliseconds(3100L), @@ -71,7 +69,6 @@ public static ReadOnlyCollection GetAllConfigurations() { Name = DefaultConfigurationMode.InRegion, RetryMode = RequestRetryMode.Standard, - StsRegionalEndpoints = StsRegionalEndpointsValue.Regional, S3UsEast1RegionalEndpoint = S3UsEast1RegionalEndpointValue.Regional, // 0:00:01.1 ConnectTimeout = TimeSpan.FromMilliseconds(1100L), @@ -87,7 +84,6 @@ public static ReadOnlyCollection GetAllConfigurations() { Name = DefaultConfigurationMode.CrossRegion, RetryMode = RequestRetryMode.Standard, - StsRegionalEndpoints = StsRegionalEndpointsValue.Regional, S3UsEast1RegionalEndpoint = S3UsEast1RegionalEndpointValue.Regional, // 0:00:03.1 ConnectTimeout = TimeSpan.FromMilliseconds(3100L), @@ -103,7 +99,6 @@ public static ReadOnlyCollection GetAllConfigurations() { Name = DefaultConfigurationMode.Mobile, RetryMode = RequestRetryMode.Standard, - StsRegionalEndpoints = StsRegionalEndpointsValue.Regional, S3UsEast1RegionalEndpoint = S3UsEast1RegionalEndpointValue.Regional, // 0:00:30 ConnectTimeout = TimeSpan.FromMilliseconds(30000L), @@ -119,7 +114,6 @@ public static ReadOnlyCollection GetAllConfigurations() { Name = DefaultConfigurationMode.Auto, RetryMode = RequestRetryMode.Standard, - StsRegionalEndpoints = StsRegionalEndpointsValue.Regional, S3UsEast1RegionalEndpoint = S3UsEast1RegionalEndpointValue.Regional, // 0:00:01.1 ConnectTimeout = TimeSpan.FromMilliseconds(1100L), @@ -128,19 +122,5 @@ public static ReadOnlyCollection GetAllConfigurations() TimeToFirstByteTimeout = null, HttpRequestTimeout = null }; - /// - ///

    The LEGACY mode provides default settings that vary per SDK and were used prior to establishment of defaults_mode

    - ///     - public static IDefaultConfiguration Legacy {get;} = new DefaultConfiguration - { - Name = DefaultConfigurationMode.Legacy, - RetryMode = RequestRetryMode.Legacy, - StsRegionalEndpoints = StsRegionalEndpointsValue.Legacy, - S3UsEast1RegionalEndpoint = S3UsEast1RegionalEndpointValue.Legacy, - ConnectTimeout = null, - TlsNegotiationTimeout = null, - TimeToFirstByteTimeout = null, - HttpRequestTimeout = null - }; } } \ No newline at end of file diff --git a/sdk/src/Services/GeoRoutes/Generated/Model/AccessDeniedException.cs b/sdk/src/Services/GeoRoutes/Generated/Model/AccessDeniedException.cs index 502cdb605d17..a248a67577ba 100644 --- a/sdk/src/Services/GeoRoutes/Generated/Model/AccessDeniedException.cs +++ b/sdk/src/Services/GeoRoutes/Generated/Model/AccessDeniedException.cs @@ -106,11 +106,6 @@ protected AccessDeniedException(System.Runtime.Serialization.SerializationInfo i /// The that holds the serialized object data about the exception being thrown. /// The that contains contextual information about the source or destination. /// The parameter is a null reference (Nothing in Visual Basic). -#if BCL35 - [System.Security.Permissions.SecurityPermission( - System.Security.Permissions.SecurityAction.LinkDemand, - Flags = System.Security.Permissions.SecurityPermissionFlag.SerializationFormatter)] -#endif [System.Security.SecurityCritical] // These FxCop rules are giving false-positives for this method [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Security", "CA2123:OverrideLinkDemandsShouldBeIdenticalToBase")] diff --git a/sdk/src/Services/GeoRoutes/Generated/Model/CalculateIsolinesRequest.cs b/sdk/src/Services/GeoRoutes/Generated/Model/CalculateIsolinesRequest.cs index c8d383d5961d..c2760b24532c 100644 --- a/sdk/src/Services/GeoRoutes/Generated/Model/CalculateIsolinesRequest.cs +++ b/sdk/src/Services/GeoRoutes/Generated/Model/CalculateIsolinesRequest.cs @@ -133,9 +133,9 @@ internal bool IsSetAvoid() /// Uses the current time as the time of departure. /// ///     - public bool DepartNow + public bool? DepartNow { - get { return this._departNow.GetValueOrDefault(); } + get { return this._departNow; } set { this._departNow = value; } } diff --git a/sdk/src/Services/GeoRoutes/Generated/Model/CalculateRouteMatrixRequest.cs b/sdk/src/Services/GeoRoutes/Generated/Model/CalculateRouteMatrixRequest.cs index fc5466e17b29..6583d99ce7ac 100644 --- a/sdk/src/Services/GeoRoutes/Generated/Model/CalculateRouteMatrixRequest.cs +++ b/sdk/src/Services/GeoRoutes/Generated/Model/CalculateRouteMatrixRequest.cs @@ -95,9 +95,9 @@ internal bool IsSetAvoid() /// Uses the current time as the time of departure. /// /// - public bool DepartNow + public bool? DepartNow { - get { return this._departNow.GetValueOrDefault(); } + get { return this._departNow; } set { this._departNow = value; } } diff --git a/sdk/src/Services/GeoRoutes/Generated/Model/CalculateRouteMatrixResponse.cs b/sdk/src/Services/GeoRoutes/Generated/Model/CalculateRouteMatrixResponse.cs index 9bb80f314fb7..7a239603dd73 100644 --- a/sdk/src/Services/GeoRoutes/Generated/Model/CalculateRouteMatrixResponse.cs +++ b/sdk/src/Services/GeoRoutes/Generated/Model/CalculateRouteMatrixResponse.cs @@ -47,9 +47,9 @@ public partial class CalculateRouteMatrixResponse : AmazonWebServiceResponse /// /// [AWSProperty(Required=true, Min=0)] - public int ErrorCount + public int? ErrorCount { - get { return this._errorCount.GetValueOrDefault(); } + get { return this._errorCount; } set { this._errorCount = value; } } diff --git a/sdk/src/Services/GeoRoutes/Generated/Model/CalculateRoutesRequest.cs b/sdk/src/Services/GeoRoutes/Generated/Model/CalculateRoutesRequest.cs index c365da290e97..f50273b3a232 100644 --- a/sdk/src/Services/GeoRoutes/Generated/Model/CalculateRoutesRequest.cs +++ b/sdk/src/Services/GeoRoutes/Generated/Model/CalculateRoutesRequest.cs @@ -139,9 +139,9 @@ internal bool IsSetAvoid() /// Uses the current time as the time of departure. /// /// - public bool DepartNow + public bool? DepartNow { - get { return this._departNow.GetValueOrDefault(); } + get { return this._departNow; } set { this._departNow = value; } } @@ -417,9 +417,9 @@ internal bool IsSetLegGeometryFormat() /// /// [AWSProperty(Min=0, Max=5)] - public int MaxAlternatives + public int? MaxAlternatives { - get { return this._maxAlternatives.GetValueOrDefault(); } + get { return this._maxAlternatives; } set { this._maxAlternatives = value; } } diff --git a/sdk/src/Services/GeoRoutes/Generated/Model/Circle.cs b/sdk/src/Services/GeoRoutes/Generated/Model/Circle.cs index 045862eca6d0..c92f1f65e8d7 100644 --- a/sdk/src/Services/GeoRoutes/Generated/Model/Circle.cs +++ b/sdk/src/Services/GeoRoutes/Generated/Model/Circle.cs @@ -74,9 +74,9 @@ internal bool IsSetCenter() /// /// [AWSProperty(Required=true)] - public double Radius + public double? Radius { - get { return this._radius.GetValueOrDefault(); } + get { return this._radius; } set { this._radius = value; } } diff --git a/sdk/src/Services/GeoRoutes/Generated/Model/Corridor.cs b/sdk/src/Services/GeoRoutes/Generated/Model/Corridor.cs index f0f97a0cb1dd..655abd53570a 100644 --- a/sdk/src/Services/GeoRoutes/Generated/Model/Corridor.cs +++ b/sdk/src/Services/GeoRoutes/Generated/Model/Corridor.cs @@ -69,9 +69,9 @@ internal bool IsSetLineString() /// /// [AWSProperty(Required=true)] - public int Radius + public int? Radius { - get { return this._radius.GetValueOrDefault(); } + get { return this._radius; } set { this._radius = value; } } diff --git a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/CalculateIsolinesRequestMarshaller.cs b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/CalculateIsolinesRequestMarshaller.cs index 1b340da693ae..fb7093bf1ffd 100644 --- a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/CalculateIsolinesRequestMarshaller.cs +++ b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/CalculateIsolinesRequestMarshaller.cs @@ -64,167 +64,170 @@ public IRequest Marshall(CalculateIsolinesRequest publicRequest) if (publicRequest.IsSetKey()) request.Parameters.Add("key", StringUtils.FromString(publicRequest.Key)); request.ResourcePath = "/isolines"; - using (StringWriter stringWriter = new StringWriter(CultureInfo.InvariantCulture)) + using (MemoryStream memoryStream = new MemoryStream()) { - JsonWriter writer = new JsonWriter(stringWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetAllow()) + using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) { - context.Writer.WritePropertyName("Allow"); - context.Writer.WriteObjectStart(); + JsonWriter writer = new JsonWriter(streamWriter); + writer.Validate = false; + writer.WriteObjectStart(); + var context = new JsonMarshallerContext(request, writer); + if(publicRequest.IsSetAllow()) + { + context.Writer.WritePropertyName("Allow"); + context.Writer.WriteObjectStart(); - var marshaller = IsolineAllowOptionsMarshaller.Instance; - marshaller.Marshall(publicRequest.Allow, context); + var marshaller = IsolineAllowOptionsMarshaller.Instance; + marshaller.Marshall(publicRequest.Allow, context); - context.Writer.WriteObjectEnd(); - } + context.Writer.WriteObjectEnd(); + } - if(publicRequest.IsSetArrivalTime()) - { - context.Writer.WritePropertyName("ArrivalTime"); - context.Writer.Write(publicRequest.ArrivalTime); - } + if(publicRequest.IsSetArrivalTime()) + { + context.Writer.WritePropertyName("ArrivalTime"); + context.Writer.Write(publicRequest.ArrivalTime); + } - if(publicRequest.IsSetAvoid()) - { - context.Writer.WritePropertyName("Avoid"); - context.Writer.WriteObjectStart(); + if(publicRequest.IsSetAvoid()) + { + context.Writer.WritePropertyName("Avoid"); + context.Writer.WriteObjectStart(); - var marshaller = IsolineAvoidanceOptionsMarshaller.Instance; - marshaller.Marshall(publicRequest.Avoid, context); + var marshaller = IsolineAvoidanceOptionsMarshaller.Instance; + marshaller.Marshall(publicRequest.Avoid, context); - context.Writer.WriteObjectEnd(); - } + context.Writer.WriteObjectEnd(); + } - if(publicRequest.IsSetDepartNow()) - { - context.Writer.WritePropertyName("DepartNow"); - context.Writer.Write(publicRequest.DepartNow); - } + if(publicRequest.IsSetDepartNow()) + { + context.Writer.WritePropertyName("DepartNow"); + context.Writer.Write(publicRequest.DepartNow.Value); + } - if(publicRequest.IsSetDepartureTime()) - { - context.Writer.WritePropertyName("DepartureTime"); - context.Writer.Write(publicRequest.DepartureTime); - } + if(publicRequest.IsSetDepartureTime()) + { + context.Writer.WritePropertyName("DepartureTime"); + context.Writer.Write(publicRequest.DepartureTime); + } - if(publicRequest.IsSetDestination()) - { - context.Writer.WritePropertyName("Destination"); - context.Writer.WriteArrayStart(); - foreach(var publicRequestDestinationListValue in publicRequest.Destination) + if(publicRequest.IsSetDestination()) { - context.Writer.Write(publicRequestDestinationListValue); + context.Writer.WritePropertyName("Destination"); + context.Writer.WriteArrayStart(); + foreach(var publicRequestDestinationListValue in publicRequest.Destination) + { + context.Writer.Write(publicRequestDestinationListValue); + } + context.Writer.WriteArrayEnd(); } - context.Writer.WriteArrayEnd(); - } - if(publicRequest.IsSetDestinationOptions()) - { - context.Writer.WritePropertyName("DestinationOptions"); - context.Writer.WriteObjectStart(); + if(publicRequest.IsSetDestinationOptions()) + { + context.Writer.WritePropertyName("DestinationOptions"); + context.Writer.WriteObjectStart(); - var marshaller = IsolineDestinationOptionsMarshaller.Instance; - marshaller.Marshall(publicRequest.DestinationOptions, context); + var marshaller = IsolineDestinationOptionsMarshaller.Instance; + marshaller.Marshall(publicRequest.DestinationOptions, context); - context.Writer.WriteObjectEnd(); - } + context.Writer.WriteObjectEnd(); + } - if(publicRequest.IsSetIsolineGeometryFormat()) - { - context.Writer.WritePropertyName("IsolineGeometryFormat"); - context.Writer.Write(publicRequest.IsolineGeometryFormat); - } + if(publicRequest.IsSetIsolineGeometryFormat()) + { + context.Writer.WritePropertyName("IsolineGeometryFormat"); + context.Writer.Write(publicRequest.IsolineGeometryFormat); + } - if(publicRequest.IsSetIsolineGranularity()) - { - context.Writer.WritePropertyName("IsolineGranularity"); - context.Writer.WriteObjectStart(); + if(publicRequest.IsSetIsolineGranularity()) + { + context.Writer.WritePropertyName("IsolineGranularity"); + context.Writer.WriteObjectStart(); - var marshaller = IsolineGranularityOptionsMarshaller.Instance; - marshaller.Marshall(publicRequest.IsolineGranularity, context); + var marshaller = IsolineGranularityOptionsMarshaller.Instance; + marshaller.Marshall(publicRequest.IsolineGranularity, context); - context.Writer.WriteObjectEnd(); - } + context.Writer.WriteObjectEnd(); + } - if(publicRequest.IsSetOptimizeIsolineFor()) - { - context.Writer.WritePropertyName("OptimizeIsolineFor"); - context.Writer.Write(publicRequest.OptimizeIsolineFor); - } + if(publicRequest.IsSetOptimizeIsolineFor()) + { + context.Writer.WritePropertyName("OptimizeIsolineFor"); + context.Writer.Write(publicRequest.OptimizeIsolineFor); + } - if(publicRequest.IsSetOptimizeRoutingFor()) - { - context.Writer.WritePropertyName("OptimizeRoutingFor"); - context.Writer.Write(publicRequest.OptimizeRoutingFor); - } + if(publicRequest.IsSetOptimizeRoutingFor()) + { + context.Writer.WritePropertyName("OptimizeRoutingFor"); + context.Writer.Write(publicRequest.OptimizeRoutingFor); + } - if(publicRequest.IsSetOrigin()) - { - context.Writer.WritePropertyName("Origin"); - context.Writer.WriteArrayStart(); - foreach(var publicRequestOriginListValue in publicRequest.Origin) + if(publicRequest.IsSetOrigin()) { - context.Writer.Write(publicRequestOriginListValue); + context.Writer.WritePropertyName("Origin"); + context.Writer.WriteArrayStart(); + foreach(var publicRequestOriginListValue in publicRequest.Origin) + { + context.Writer.Write(publicRequestOriginListValue); + } + context.Writer.WriteArrayEnd(); } - context.Writer.WriteArrayEnd(); - } - if(publicRequest.IsSetOriginOptions()) - { - context.Writer.WritePropertyName("OriginOptions"); - context.Writer.WriteObjectStart(); + if(publicRequest.IsSetOriginOptions()) + { + context.Writer.WritePropertyName("OriginOptions"); + context.Writer.WriteObjectStart(); - var marshaller = IsolineOriginOptionsMarshaller.Instance; - marshaller.Marshall(publicRequest.OriginOptions, context); + var marshaller = IsolineOriginOptionsMarshaller.Instance; + marshaller.Marshall(publicRequest.OriginOptions, context); - context.Writer.WriteObjectEnd(); - } + context.Writer.WriteObjectEnd(); + } - if(publicRequest.IsSetThresholds()) - { - context.Writer.WritePropertyName("Thresholds"); - context.Writer.WriteObjectStart(); + if(publicRequest.IsSetThresholds()) + { + context.Writer.WritePropertyName("Thresholds"); + context.Writer.WriteObjectStart(); - var marshaller = IsolineThresholdsMarshaller.Instance; - marshaller.Marshall(publicRequest.Thresholds, context); + var marshaller = IsolineThresholdsMarshaller.Instance; + marshaller.Marshall(publicRequest.Thresholds, context); - context.Writer.WriteObjectEnd(); - } + context.Writer.WriteObjectEnd(); + } - if(publicRequest.IsSetTraffic()) - { - context.Writer.WritePropertyName("Traffic"); - context.Writer.WriteObjectStart(); + if(publicRequest.IsSetTraffic()) + { + context.Writer.WritePropertyName("Traffic"); + context.Writer.WriteObjectStart(); - var marshaller = IsolineTrafficOptionsMarshaller.Instance; - marshaller.Marshall(publicRequest.Traffic, context); + var marshaller = IsolineTrafficOptionsMarshaller.Instance; + marshaller.Marshall(publicRequest.Traffic, context); - context.Writer.WriteObjectEnd(); - } + context.Writer.WriteObjectEnd(); + } - if(publicRequest.IsSetTravelMode()) - { - context.Writer.WritePropertyName("TravelMode"); - context.Writer.Write(publicRequest.TravelMode); - } + if(publicRequest.IsSetTravelMode()) + { + context.Writer.WritePropertyName("TravelMode"); + context.Writer.Write(publicRequest.TravelMode); + } - if(publicRequest.IsSetTravelModeOptions()) - { - context.Writer.WritePropertyName("TravelModeOptions"); - context.Writer.WriteObjectStart(); + if(publicRequest.IsSetTravelModeOptions()) + { + context.Writer.WritePropertyName("TravelModeOptions"); + context.Writer.WriteObjectStart(); + + var marshaller = IsolineTravelModeOptionsMarshaller.Instance; + marshaller.Marshall(publicRequest.TravelModeOptions, context); - var marshaller = IsolineTravelModeOptionsMarshaller.Instance; - marshaller.Marshall(publicRequest.TravelModeOptions, context); + context.Writer.WriteObjectEnd(); + } - context.Writer.WriteObjectEnd(); + writer.WriteObjectEnd(); } - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); + request.Content = memoryStream.ToArray(); } request.UseQueryString = true; diff --git a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/CalculateRouteMatrixRequestMarshaller.cs b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/CalculateRouteMatrixRequestMarshaller.cs index 69609515446e..8f391b6303f3 100644 --- a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/CalculateRouteMatrixRequestMarshaller.cs +++ b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/CalculateRouteMatrixRequestMarshaller.cs @@ -64,137 +64,140 @@ public IRequest Marshall(CalculateRouteMatrixRequest publicRequest) if (publicRequest.IsSetKey()) request.Parameters.Add("key", StringUtils.FromString(publicRequest.Key)); request.ResourcePath = "/route-matrix"; - using (StringWriter stringWriter = new StringWriter(CultureInfo.InvariantCulture)) + using (MemoryStream memoryStream = new MemoryStream()) { - JsonWriter writer = new JsonWriter(stringWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetAllow()) + using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) { - context.Writer.WritePropertyName("Allow"); - context.Writer.WriteObjectStart(); + JsonWriter writer = new JsonWriter(streamWriter); + writer.Validate = false; + writer.WriteObjectStart(); + var context = new JsonMarshallerContext(request, writer); + if(publicRequest.IsSetAllow()) + { + context.Writer.WritePropertyName("Allow"); + context.Writer.WriteObjectStart(); - var marshaller = RouteMatrixAllowOptionsMarshaller.Instance; - marshaller.Marshall(publicRequest.Allow, context); + var marshaller = RouteMatrixAllowOptionsMarshaller.Instance; + marshaller.Marshall(publicRequest.Allow, context); - context.Writer.WriteObjectEnd(); - } + context.Writer.WriteObjectEnd(); + } - if(publicRequest.IsSetAvoid()) - { - context.Writer.WritePropertyName("Avoid"); - context.Writer.WriteObjectStart(); + if(publicRequest.IsSetAvoid()) + { + context.Writer.WritePropertyName("Avoid"); + context.Writer.WriteObjectStart(); - var marshaller = RouteMatrixAvoidanceOptionsMarshaller.Instance; - marshaller.Marshall(publicRequest.Avoid, context); + var marshaller = RouteMatrixAvoidanceOptionsMarshaller.Instance; + marshaller.Marshall(publicRequest.Avoid, context); - context.Writer.WriteObjectEnd(); - } + context.Writer.WriteObjectEnd(); + } - if(publicRequest.IsSetDepartNow()) - { - context.Writer.WritePropertyName("DepartNow"); - context.Writer.Write(publicRequest.DepartNow); - } + if(publicRequest.IsSetDepartNow()) + { + context.Writer.WritePropertyName("DepartNow"); + context.Writer.Write(publicRequest.DepartNow.Value); + } - if(publicRequest.IsSetDepartureTime()) - { - context.Writer.WritePropertyName("DepartureTime"); - context.Writer.Write(publicRequest.DepartureTime); - } + if(publicRequest.IsSetDepartureTime()) + { + context.Writer.WritePropertyName("DepartureTime"); + context.Writer.Write(publicRequest.DepartureTime); + } - if(publicRequest.IsSetDestinations()) - { - context.Writer.WritePropertyName("Destinations"); - context.Writer.WriteArrayStart(); - foreach(var publicRequestDestinationsListValue in publicRequest.Destinations) + if(publicRequest.IsSetDestinations()) + { + context.Writer.WritePropertyName("Destinations"); + context.Writer.WriteArrayStart(); + foreach(var publicRequestDestinationsListValue in publicRequest.Destinations) + { + context.Writer.WriteObjectStart(); + + var marshaller = RouteMatrixDestinationMarshaller.Instance; + marshaller.Marshall(publicRequestDestinationsListValue, context); + + context.Writer.WriteObjectEnd(); + } + context.Writer.WriteArrayEnd(); + } + + if(publicRequest.IsSetExclude()) { + context.Writer.WritePropertyName("Exclude"); context.Writer.WriteObjectStart(); - var marshaller = RouteMatrixDestinationMarshaller.Instance; - marshaller.Marshall(publicRequestDestinationsListValue, context); + var marshaller = RouteMatrixExclusionOptionsMarshaller.Instance; + marshaller.Marshall(publicRequest.Exclude, context); context.Writer.WriteObjectEnd(); } - context.Writer.WriteArrayEnd(); - } - if(publicRequest.IsSetExclude()) - { - context.Writer.WritePropertyName("Exclude"); - context.Writer.WriteObjectStart(); - - var marshaller = RouteMatrixExclusionOptionsMarshaller.Instance; - marshaller.Marshall(publicRequest.Exclude, context); - - context.Writer.WriteObjectEnd(); - } + if(publicRequest.IsSetOptimizeRoutingFor()) + { + context.Writer.WritePropertyName("OptimizeRoutingFor"); + context.Writer.Write(publicRequest.OptimizeRoutingFor); + } - if(publicRequest.IsSetOptimizeRoutingFor()) - { - context.Writer.WritePropertyName("OptimizeRoutingFor"); - context.Writer.Write(publicRequest.OptimizeRoutingFor); - } + if(publicRequest.IsSetOrigins()) + { + context.Writer.WritePropertyName("Origins"); + context.Writer.WriteArrayStart(); + foreach(var publicRequestOriginsListValue in publicRequest.Origins) + { + context.Writer.WriteObjectStart(); + + var marshaller = RouteMatrixOriginMarshaller.Instance; + marshaller.Marshall(publicRequestOriginsListValue, context); + + context.Writer.WriteObjectEnd(); + } + context.Writer.WriteArrayEnd(); + } - if(publicRequest.IsSetOrigins()) - { - context.Writer.WritePropertyName("Origins"); - context.Writer.WriteArrayStart(); - foreach(var publicRequestOriginsListValue in publicRequest.Origins) + if(publicRequest.IsSetRoutingBoundary()) { + context.Writer.WritePropertyName("RoutingBoundary"); context.Writer.WriteObjectStart(); - var marshaller = RouteMatrixOriginMarshaller.Instance; - marshaller.Marshall(publicRequestOriginsListValue, context); + var marshaller = RouteMatrixBoundaryMarshaller.Instance; + marshaller.Marshall(publicRequest.RoutingBoundary, context); context.Writer.WriteObjectEnd(); } - context.Writer.WriteArrayEnd(); - } - - if(publicRequest.IsSetRoutingBoundary()) - { - context.Writer.WritePropertyName("RoutingBoundary"); - context.Writer.WriteObjectStart(); - var marshaller = RouteMatrixBoundaryMarshaller.Instance; - marshaller.Marshall(publicRequest.RoutingBoundary, context); + if(publicRequest.IsSetTraffic()) + { + context.Writer.WritePropertyName("Traffic"); + context.Writer.WriteObjectStart(); - context.Writer.WriteObjectEnd(); - } + var marshaller = RouteMatrixTrafficOptionsMarshaller.Instance; + marshaller.Marshall(publicRequest.Traffic, context); - if(publicRequest.IsSetTraffic()) - { - context.Writer.WritePropertyName("Traffic"); - context.Writer.WriteObjectStart(); - - var marshaller = RouteMatrixTrafficOptionsMarshaller.Instance; - marshaller.Marshall(publicRequest.Traffic, context); + context.Writer.WriteObjectEnd(); + } - context.Writer.WriteObjectEnd(); - } + if(publicRequest.IsSetTravelMode()) + { + context.Writer.WritePropertyName("TravelMode"); + context.Writer.Write(publicRequest.TravelMode); + } - if(publicRequest.IsSetTravelMode()) - { - context.Writer.WritePropertyName("TravelMode"); - context.Writer.Write(publicRequest.TravelMode); - } + if(publicRequest.IsSetTravelModeOptions()) + { + context.Writer.WritePropertyName("TravelModeOptions"); + context.Writer.WriteObjectStart(); - if(publicRequest.IsSetTravelModeOptions()) - { - context.Writer.WritePropertyName("TravelModeOptions"); - context.Writer.WriteObjectStart(); + var marshaller = RouteMatrixTravelModeOptionsMarshaller.Instance; + marshaller.Marshall(publicRequest.TravelModeOptions, context); - var marshaller = RouteMatrixTravelModeOptionsMarshaller.Instance; - marshaller.Marshall(publicRequest.TravelModeOptions, context); + context.Writer.WriteObjectEnd(); + } - context.Writer.WriteObjectEnd(); + writer.WriteObjectEnd(); } - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); + request.Content = memoryStream.ToArray(); } request.UseQueryString = true; diff --git a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/CalculateRouteMatrixResponseUnmarshaller.cs b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/CalculateRouteMatrixResponseUnmarshaller.cs index 74f05c94d0a9..8a766705d40a 100644 --- a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/CalculateRouteMatrixResponseUnmarshaller.cs +++ b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/CalculateRouteMatrixResponseUnmarshaller.cs @@ -54,7 +54,7 @@ public override AmazonWebServiceResponse Unmarshall(JsonUnmarshallerContext cont { if (context.TestExpression("ErrorCount", targetDepth)) { - var unmarshaller = IntUnmarshaller.Instance; + var unmarshaller = NullableIntUnmarshaller.Instance; response.ErrorCount = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/CalculateRoutesRequestMarshaller.cs b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/CalculateRoutesRequestMarshaller.cs index c459610288ca..d209ba46755b 100644 --- a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/CalculateRoutesRequestMarshaller.cs +++ b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/CalculateRoutesRequestMarshaller.cs @@ -64,239 +64,242 @@ public IRequest Marshall(CalculateRoutesRequest publicRequest) if (publicRequest.IsSetKey()) request.Parameters.Add("key", StringUtils.FromString(publicRequest.Key)); request.ResourcePath = "/routes"; - using (StringWriter stringWriter = new StringWriter(CultureInfo.InvariantCulture)) + using (MemoryStream memoryStream = new MemoryStream()) { - JsonWriter writer = new JsonWriter(stringWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetAllow()) + using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) { - context.Writer.WritePropertyName("Allow"); - context.Writer.WriteObjectStart(); - - var marshaller = RouteAllowOptionsMarshaller.Instance; - marshaller.Marshall(publicRequest.Allow, context); + JsonWriter writer = new JsonWriter(streamWriter); + writer.Validate = false; + writer.WriteObjectStart(); + var context = new JsonMarshallerContext(request, writer); + if(publicRequest.IsSetAllow()) + { + context.Writer.WritePropertyName("Allow"); + context.Writer.WriteObjectStart(); - context.Writer.WriteObjectEnd(); - } + var marshaller = RouteAllowOptionsMarshaller.Instance; + marshaller.Marshall(publicRequest.Allow, context); - if(publicRequest.IsSetArrivalTime()) - { - context.Writer.WritePropertyName("ArrivalTime"); - context.Writer.Write(publicRequest.ArrivalTime); - } + context.Writer.WriteObjectEnd(); + } - if(publicRequest.IsSetAvoid()) - { - context.Writer.WritePropertyName("Avoid"); - context.Writer.WriteObjectStart(); + if(publicRequest.IsSetArrivalTime()) + { + context.Writer.WritePropertyName("ArrivalTime"); + context.Writer.Write(publicRequest.ArrivalTime); + } - var marshaller = RouteAvoidanceOptionsMarshaller.Instance; - marshaller.Marshall(publicRequest.Avoid, context); + if(publicRequest.IsSetAvoid()) + { + context.Writer.WritePropertyName("Avoid"); + context.Writer.WriteObjectStart(); - context.Writer.WriteObjectEnd(); - } + var marshaller = RouteAvoidanceOptionsMarshaller.Instance; + marshaller.Marshall(publicRequest.Avoid, context); - if(publicRequest.IsSetDepartNow()) - { - context.Writer.WritePropertyName("DepartNow"); - context.Writer.Write(publicRequest.DepartNow); - } + context.Writer.WriteObjectEnd(); + } - if(publicRequest.IsSetDepartureTime()) - { - context.Writer.WritePropertyName("DepartureTime"); - context.Writer.Write(publicRequest.DepartureTime); - } + if(publicRequest.IsSetDepartNow()) + { + context.Writer.WritePropertyName("DepartNow"); + context.Writer.Write(publicRequest.DepartNow.Value); + } - if(publicRequest.IsSetDestination()) - { - context.Writer.WritePropertyName("Destination"); - context.Writer.WriteArrayStart(); - foreach(var publicRequestDestinationListValue in publicRequest.Destination) + if(publicRequest.IsSetDepartureTime()) { - context.Writer.Write(publicRequestDestinationListValue); + context.Writer.WritePropertyName("DepartureTime"); + context.Writer.Write(publicRequest.DepartureTime); } - context.Writer.WriteArrayEnd(); - } - if(publicRequest.IsSetDestinationOptions()) - { - context.Writer.WritePropertyName("DestinationOptions"); - context.Writer.WriteObjectStart(); + if(publicRequest.IsSetDestination()) + { + context.Writer.WritePropertyName("Destination"); + context.Writer.WriteArrayStart(); + foreach(var publicRequestDestinationListValue in publicRequest.Destination) + { + context.Writer.Write(publicRequestDestinationListValue); + } + context.Writer.WriteArrayEnd(); + } - var marshaller = RouteDestinationOptionsMarshaller.Instance; - marshaller.Marshall(publicRequest.DestinationOptions, context); + if(publicRequest.IsSetDestinationOptions()) + { + context.Writer.WritePropertyName("DestinationOptions"); + context.Writer.WriteObjectStart(); - context.Writer.WriteObjectEnd(); - } + var marshaller = RouteDestinationOptionsMarshaller.Instance; + marshaller.Marshall(publicRequest.DestinationOptions, context); - if(publicRequest.IsSetDriver()) - { - context.Writer.WritePropertyName("Driver"); - context.Writer.WriteObjectStart(); + context.Writer.WriteObjectEnd(); + } - var marshaller = RouteDriverOptionsMarshaller.Instance; - marshaller.Marshall(publicRequest.Driver, context); + if(publicRequest.IsSetDriver()) + { + context.Writer.WritePropertyName("Driver"); + context.Writer.WriteObjectStart(); - context.Writer.WriteObjectEnd(); - } + var marshaller = RouteDriverOptionsMarshaller.Instance; + marshaller.Marshall(publicRequest.Driver, context); - if(publicRequest.IsSetExclude()) - { - context.Writer.WritePropertyName("Exclude"); - context.Writer.WriteObjectStart(); + context.Writer.WriteObjectEnd(); + } - var marshaller = RouteExclusionOptionsMarshaller.Instance; - marshaller.Marshall(publicRequest.Exclude, context); + if(publicRequest.IsSetExclude()) + { + context.Writer.WritePropertyName("Exclude"); + context.Writer.WriteObjectStart(); - context.Writer.WriteObjectEnd(); - } + var marshaller = RouteExclusionOptionsMarshaller.Instance; + marshaller.Marshall(publicRequest.Exclude, context); - if(publicRequest.IsSetInstructionsMeasurementSystem()) - { - context.Writer.WritePropertyName("InstructionsMeasurementSystem"); - context.Writer.Write(publicRequest.InstructionsMeasurementSystem); - } + context.Writer.WriteObjectEnd(); + } - if(publicRequest.IsSetLanguages()) - { - context.Writer.WritePropertyName("Languages"); - context.Writer.WriteArrayStart(); - foreach(var publicRequestLanguagesListValue in publicRequest.Languages) + if(publicRequest.IsSetInstructionsMeasurementSystem()) { - context.Writer.Write(publicRequestLanguagesListValue); + context.Writer.WritePropertyName("InstructionsMeasurementSystem"); + context.Writer.Write(publicRequest.InstructionsMeasurementSystem); } - context.Writer.WriteArrayEnd(); - } - if(publicRequest.IsSetLegAdditionalFeatures()) - { - context.Writer.WritePropertyName("LegAdditionalFeatures"); - context.Writer.WriteArrayStart(); - foreach(var publicRequestLegAdditionalFeaturesListValue in publicRequest.LegAdditionalFeatures) + if(publicRequest.IsSetLanguages()) { - context.Writer.Write(publicRequestLegAdditionalFeaturesListValue); + context.Writer.WritePropertyName("Languages"); + context.Writer.WriteArrayStart(); + foreach(var publicRequestLanguagesListValue in publicRequest.Languages) + { + context.Writer.Write(publicRequestLanguagesListValue); + } + context.Writer.WriteArrayEnd(); } - context.Writer.WriteArrayEnd(); - } - - if(publicRequest.IsSetLegGeometryFormat()) - { - context.Writer.WritePropertyName("LegGeometryFormat"); - context.Writer.Write(publicRequest.LegGeometryFormat); - } - if(publicRequest.IsSetMaxAlternatives()) - { - context.Writer.WritePropertyName("MaxAlternatives"); - context.Writer.Write(publicRequest.MaxAlternatives); - } - - if(publicRequest.IsSetOptimizeRoutingFor()) - { - context.Writer.WritePropertyName("OptimizeRoutingFor"); - context.Writer.Write(publicRequest.OptimizeRoutingFor); - } - - if(publicRequest.IsSetOrigin()) - { - context.Writer.WritePropertyName("Origin"); - context.Writer.WriteArrayStart(); - foreach(var publicRequestOriginListValue in publicRequest.Origin) + if(publicRequest.IsSetLegAdditionalFeatures()) { - context.Writer.Write(publicRequestOriginListValue); + context.Writer.WritePropertyName("LegAdditionalFeatures"); + context.Writer.WriteArrayStart(); + foreach(var publicRequestLegAdditionalFeaturesListValue in publicRequest.LegAdditionalFeatures) + { + context.Writer.Write(publicRequestLegAdditionalFeaturesListValue); + } + context.Writer.WriteArrayEnd(); } - context.Writer.WriteArrayEnd(); - } - if(publicRequest.IsSetOriginOptions()) - { - context.Writer.WritePropertyName("OriginOptions"); - context.Writer.WriteObjectStart(); + if(publicRequest.IsSetLegGeometryFormat()) + { + context.Writer.WritePropertyName("LegGeometryFormat"); + context.Writer.Write(publicRequest.LegGeometryFormat); + } - var marshaller = RouteOriginOptionsMarshaller.Instance; - marshaller.Marshall(publicRequest.OriginOptions, context); + if(publicRequest.IsSetMaxAlternatives()) + { + context.Writer.WritePropertyName("MaxAlternatives"); + context.Writer.Write(publicRequest.MaxAlternatives.Value); + } - context.Writer.WriteObjectEnd(); - } + if(publicRequest.IsSetOptimizeRoutingFor()) + { + context.Writer.WritePropertyName("OptimizeRoutingFor"); + context.Writer.Write(publicRequest.OptimizeRoutingFor); + } - if(publicRequest.IsSetSpanAdditionalFeatures()) - { - context.Writer.WritePropertyName("SpanAdditionalFeatures"); - context.Writer.WriteArrayStart(); - foreach(var publicRequestSpanAdditionalFeaturesListValue in publicRequest.SpanAdditionalFeatures) + if(publicRequest.IsSetOrigin()) { - context.Writer.Write(publicRequestSpanAdditionalFeaturesListValue); + context.Writer.WritePropertyName("Origin"); + context.Writer.WriteArrayStart(); + foreach(var publicRequestOriginListValue in publicRequest.Origin) + { + context.Writer.Write(publicRequestOriginListValue); + } + context.Writer.WriteArrayEnd(); } - context.Writer.WriteArrayEnd(); - } - if(publicRequest.IsSetTolls()) - { - context.Writer.WritePropertyName("Tolls"); - context.Writer.WriteObjectStart(); + if(publicRequest.IsSetOriginOptions()) + { + context.Writer.WritePropertyName("OriginOptions"); + context.Writer.WriteObjectStart(); - var marshaller = RouteTollOptionsMarshaller.Instance; - marshaller.Marshall(publicRequest.Tolls, context); + var marshaller = RouteOriginOptionsMarshaller.Instance; + marshaller.Marshall(publicRequest.OriginOptions, context); - context.Writer.WriteObjectEnd(); - } + context.Writer.WriteObjectEnd(); + } - if(publicRequest.IsSetTraffic()) - { - context.Writer.WritePropertyName("Traffic"); - context.Writer.WriteObjectStart(); + if(publicRequest.IsSetSpanAdditionalFeatures()) + { + context.Writer.WritePropertyName("SpanAdditionalFeatures"); + context.Writer.WriteArrayStart(); + foreach(var publicRequestSpanAdditionalFeaturesListValue in publicRequest.SpanAdditionalFeatures) + { + context.Writer.Write(publicRequestSpanAdditionalFeaturesListValue); + } + context.Writer.WriteArrayEnd(); + } - var marshaller = RouteTrafficOptionsMarshaller.Instance; - marshaller.Marshall(publicRequest.Traffic, context); + if(publicRequest.IsSetTolls()) + { + context.Writer.WritePropertyName("Tolls"); + context.Writer.WriteObjectStart(); - context.Writer.WriteObjectEnd(); - } + var marshaller = RouteTollOptionsMarshaller.Instance; + marshaller.Marshall(publicRequest.Tolls, context); - if(publicRequest.IsSetTravelMode()) - { - context.Writer.WritePropertyName("TravelMode"); - context.Writer.Write(publicRequest.TravelMode); - } + context.Writer.WriteObjectEnd(); + } - if(publicRequest.IsSetTravelModeOptions()) - { - context.Writer.WritePropertyName("TravelModeOptions"); - context.Writer.WriteObjectStart(); + if(publicRequest.IsSetTraffic()) + { + context.Writer.WritePropertyName("Traffic"); + context.Writer.WriteObjectStart(); - var marshaller = RouteTravelModeOptionsMarshaller.Instance; - marshaller.Marshall(publicRequest.TravelModeOptions, context); + var marshaller = RouteTrafficOptionsMarshaller.Instance; + marshaller.Marshall(publicRequest.Traffic, context); - context.Writer.WriteObjectEnd(); - } + context.Writer.WriteObjectEnd(); + } - if(publicRequest.IsSetTravelStepType()) - { - context.Writer.WritePropertyName("TravelStepType"); - context.Writer.Write(publicRequest.TravelStepType); - } + if(publicRequest.IsSetTravelMode()) + { + context.Writer.WritePropertyName("TravelMode"); + context.Writer.Write(publicRequest.TravelMode); + } - if(publicRequest.IsSetWaypoints()) - { - context.Writer.WritePropertyName("Waypoints"); - context.Writer.WriteArrayStart(); - foreach(var publicRequestWaypointsListValue in publicRequest.Waypoints) + if(publicRequest.IsSetTravelModeOptions()) { + context.Writer.WritePropertyName("TravelModeOptions"); context.Writer.WriteObjectStart(); - var marshaller = RouteWaypointMarshaller.Instance; - marshaller.Marshall(publicRequestWaypointsListValue, context); + var marshaller = RouteTravelModeOptionsMarshaller.Instance; + marshaller.Marshall(publicRequest.TravelModeOptions, context); context.Writer.WriteObjectEnd(); } - context.Writer.WriteArrayEnd(); + + if(publicRequest.IsSetTravelStepType()) + { + context.Writer.WritePropertyName("TravelStepType"); + context.Writer.Write(publicRequest.TravelStepType); + } + + if(publicRequest.IsSetWaypoints()) + { + context.Writer.WritePropertyName("Waypoints"); + context.Writer.WriteArrayStart(); + foreach(var publicRequestWaypointsListValue in publicRequest.Waypoints) + { + context.Writer.WriteObjectStart(); + + var marshaller = RouteWaypointMarshaller.Instance; + marshaller.Marshall(publicRequestWaypointsListValue, context); + + context.Writer.WriteObjectEnd(); + } + context.Writer.WriteArrayEnd(); + } + + writer.WriteObjectEnd(); } - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); + request.Content = memoryStream.ToArray(); } request.UseQueryString = true; diff --git a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/CircleMarshaller.cs b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/CircleMarshaller.cs index 3f8bbeed9a30..4e9be150e66d 100644 --- a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/CircleMarshaller.cs +++ b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/CircleMarshaller.cs @@ -62,13 +62,13 @@ public void Marshall(Circle requestObject, JsonMarshallerContext context) if(requestObject.IsSetRadius()) { context.Writer.WritePropertyName("Radius"); - if(StringUtils.IsSpecialDoubleValue(requestObject.Radius)) + if(StringUtils.IsSpecialDoubleValue(requestObject.Radius.Value)) { - context.Writer.Write(StringUtils.FromSpecialDoubleValue(requestObject.Radius)); + context.Writer.Write(StringUtils.FromSpecialDoubleValue(requestObject.Radius.Value)); } else { - context.Writer.Write(requestObject.Radius); + context.Writer.Write(requestObject.Radius.Value); } } diff --git a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/CircleUnmarshaller.cs b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/CircleUnmarshaller.cs index f22cafebeb41..21c602054883 100644 --- a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/CircleUnmarshaller.cs +++ b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/CircleUnmarshaller.cs @@ -74,7 +74,7 @@ public Circle Unmarshall(JsonUnmarshallerContext context) } if (context.TestExpression("Radius", targetDepth)) { - var unmarshaller = DoubleUnmarshaller.Instance; + var unmarshaller = NullableDoubleUnmarshaller.Instance; unmarshalledObject.Radius = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/CorridorMarshaller.cs b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/CorridorMarshaller.cs index 3b2cfb4a1a75..d5c720e6b36f 100644 --- a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/CorridorMarshaller.cs +++ b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/CorridorMarshaller.cs @@ -67,7 +67,7 @@ public void Marshall(Corridor requestObject, JsonMarshallerContext context) if(requestObject.IsSetRadius()) { context.Writer.WritePropertyName("Radius"); - context.Writer.Write(requestObject.Radius); + context.Writer.Write(requestObject.Radius.Value); } } diff --git a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/IsolineAllowOptionsMarshaller.cs b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/IsolineAllowOptionsMarshaller.cs index 6973aaae2722..f2893a3f71b6 100644 --- a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/IsolineAllowOptionsMarshaller.cs +++ b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/IsolineAllowOptionsMarshaller.cs @@ -51,13 +51,13 @@ public void Marshall(IsolineAllowOptions requestObject, JsonMarshallerContext co if(requestObject.IsSetHot()) { context.Writer.WritePropertyName("Hot"); - context.Writer.Write(requestObject.Hot); + context.Writer.Write(requestObject.Hot.Value); } if(requestObject.IsSetHov()) { context.Writer.WritePropertyName("Hov"); - context.Writer.Write(requestObject.Hov); + context.Writer.Write(requestObject.Hov.Value); } } diff --git a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/IsolineAvoidanceOptionsMarshaller.cs b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/IsolineAvoidanceOptionsMarshaller.cs index a8b6a75adbd2..2fa39ebe37f7 100644 --- a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/IsolineAvoidanceOptionsMarshaller.cs +++ b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/IsolineAvoidanceOptionsMarshaller.cs @@ -67,43 +67,43 @@ public void Marshall(IsolineAvoidanceOptions requestObject, JsonMarshallerContex if(requestObject.IsSetCarShuttleTrains()) { context.Writer.WritePropertyName("CarShuttleTrains"); - context.Writer.Write(requestObject.CarShuttleTrains); + context.Writer.Write(requestObject.CarShuttleTrains.Value); } if(requestObject.IsSetControlledAccessHighways()) { context.Writer.WritePropertyName("ControlledAccessHighways"); - context.Writer.Write(requestObject.ControlledAccessHighways); + context.Writer.Write(requestObject.ControlledAccessHighways.Value); } if(requestObject.IsSetDirtRoads()) { context.Writer.WritePropertyName("DirtRoads"); - context.Writer.Write(requestObject.DirtRoads); + context.Writer.Write(requestObject.DirtRoads.Value); } if(requestObject.IsSetFerries()) { context.Writer.WritePropertyName("Ferries"); - context.Writer.Write(requestObject.Ferries); + context.Writer.Write(requestObject.Ferries.Value); } if(requestObject.IsSetSeasonalClosure()) { context.Writer.WritePropertyName("SeasonalClosure"); - context.Writer.Write(requestObject.SeasonalClosure); + context.Writer.Write(requestObject.SeasonalClosure.Value); } if(requestObject.IsSetTollRoads()) { context.Writer.WritePropertyName("TollRoads"); - context.Writer.Write(requestObject.TollRoads); + context.Writer.Write(requestObject.TollRoads.Value); } if(requestObject.IsSetTollTransponders()) { context.Writer.WritePropertyName("TollTransponders"); - context.Writer.Write(requestObject.TollTransponders); + context.Writer.Write(requestObject.TollTransponders.Value); } if(requestObject.IsSetTruckRoadTypes()) @@ -120,13 +120,13 @@ public void Marshall(IsolineAvoidanceOptions requestObject, JsonMarshallerContex if(requestObject.IsSetTunnels()) { context.Writer.WritePropertyName("Tunnels"); - context.Writer.Write(requestObject.Tunnels); + context.Writer.Write(requestObject.Tunnels.Value); } if(requestObject.IsSetUTurns()) { context.Writer.WritePropertyName("UTurns"); - context.Writer.Write(requestObject.UTurns); + context.Writer.Write(requestObject.UTurns.Value); } if(requestObject.IsSetZoneCategories()) diff --git a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/IsolineCarOptionsMarshaller.cs b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/IsolineCarOptionsMarshaller.cs index 0ad7626a5e4f..ec3afb458dc2 100644 --- a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/IsolineCarOptionsMarshaller.cs +++ b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/IsolineCarOptionsMarshaller.cs @@ -68,20 +68,20 @@ public void Marshall(IsolineCarOptions requestObject, JsonMarshallerContext cont if(requestObject.IsSetMaxSpeed()) { context.Writer.WritePropertyName("MaxSpeed"); - if(StringUtils.IsSpecialDoubleValue(requestObject.MaxSpeed)) + if(StringUtils.IsSpecialDoubleValue(requestObject.MaxSpeed.Value)) { - context.Writer.Write(StringUtils.FromSpecialDoubleValue(requestObject.MaxSpeed)); + context.Writer.Write(StringUtils.FromSpecialDoubleValue(requestObject.MaxSpeed.Value)); } else { - context.Writer.Write(requestObject.MaxSpeed); + context.Writer.Write(requestObject.MaxSpeed.Value); } } if(requestObject.IsSetOccupancy()) { context.Writer.WritePropertyName("Occupancy"); - context.Writer.Write(requestObject.Occupancy); + context.Writer.Write(requestObject.Occupancy.Value); } } diff --git a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/IsolineConnectionUnmarshaller.cs b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/IsolineConnectionUnmarshaller.cs index 6a0964423fa7..a6366d840b83 100644 --- a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/IsolineConnectionUnmarshaller.cs +++ b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/IsolineConnectionUnmarshaller.cs @@ -68,7 +68,7 @@ public IsolineConnection Unmarshall(JsonUnmarshallerContext context) { if (context.TestExpression("FromPolygonIndex", targetDepth)) { - var unmarshaller = IntUnmarshaller.Instance; + var unmarshaller = NullableIntUnmarshaller.Instance; unmarshalledObject.FromPolygonIndex = unmarshaller.Unmarshall(context); continue; } @@ -80,7 +80,7 @@ public IsolineConnection Unmarshall(JsonUnmarshallerContext context) } if (context.TestExpression("ToPolygonIndex", targetDepth)) { - var unmarshaller = IntUnmarshaller.Instance; + var unmarshaller = NullableIntUnmarshaller.Instance; unmarshalledObject.ToPolygonIndex = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/IsolineDestinationOptionsMarshaller.cs b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/IsolineDestinationOptionsMarshaller.cs index 7b2f8993d224..ae97c7a9348f 100644 --- a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/IsolineDestinationOptionsMarshaller.cs +++ b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/IsolineDestinationOptionsMarshaller.cs @@ -51,19 +51,19 @@ public void Marshall(IsolineDestinationOptions requestObject, JsonMarshallerCont if(requestObject.IsSetAvoidActionsForDistance()) { context.Writer.WritePropertyName("AvoidActionsForDistance"); - context.Writer.Write(requestObject.AvoidActionsForDistance); + context.Writer.Write(requestObject.AvoidActionsForDistance.Value); } if(requestObject.IsSetHeading()) { context.Writer.WritePropertyName("Heading"); - if(StringUtils.IsSpecialDoubleValue(requestObject.Heading)) + if(StringUtils.IsSpecialDoubleValue(requestObject.Heading.Value)) { - context.Writer.Write(StringUtils.FromSpecialDoubleValue(requestObject.Heading)); + context.Writer.Write(StringUtils.FromSpecialDoubleValue(requestObject.Heading.Value)); } else { - context.Writer.Write(requestObject.Heading); + context.Writer.Write(requestObject.Heading.Value); } } diff --git a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/IsolineGranularityOptionsMarshaller.cs b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/IsolineGranularityOptionsMarshaller.cs index e3b797578cbc..87611f164265 100644 --- a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/IsolineGranularityOptionsMarshaller.cs +++ b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/IsolineGranularityOptionsMarshaller.cs @@ -51,13 +51,13 @@ public void Marshall(IsolineGranularityOptions requestObject, JsonMarshallerCont if(requestObject.IsSetMaxPoints()) { context.Writer.WritePropertyName("MaxPoints"); - context.Writer.Write(requestObject.MaxPoints); + context.Writer.Write(requestObject.MaxPoints.Value); } if(requestObject.IsSetMaxResolution()) { context.Writer.WritePropertyName("MaxResolution"); - context.Writer.Write(requestObject.MaxResolution); + context.Writer.Write(requestObject.MaxResolution.Value); } } diff --git a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/IsolineMatchingOptionsMarshaller.cs b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/IsolineMatchingOptionsMarshaller.cs index 64013b22f039..af7203a64125 100644 --- a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/IsolineMatchingOptionsMarshaller.cs +++ b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/IsolineMatchingOptionsMarshaller.cs @@ -57,13 +57,13 @@ public void Marshall(IsolineMatchingOptions requestObject, JsonMarshallerContext if(requestObject.IsSetOnRoadThreshold()) { context.Writer.WritePropertyName("OnRoadThreshold"); - context.Writer.Write(requestObject.OnRoadThreshold); + context.Writer.Write(requestObject.OnRoadThreshold.Value); } if(requestObject.IsSetRadius()) { context.Writer.WritePropertyName("Radius"); - context.Writer.Write(requestObject.Radius); + context.Writer.Write(requestObject.Radius.Value); } if(requestObject.IsSetStrategy()) diff --git a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/IsolineOriginOptionsMarshaller.cs b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/IsolineOriginOptionsMarshaller.cs index 34d0106ea791..546c626c5328 100644 --- a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/IsolineOriginOptionsMarshaller.cs +++ b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/IsolineOriginOptionsMarshaller.cs @@ -51,19 +51,19 @@ public void Marshall(IsolineOriginOptions requestObject, JsonMarshallerContext c if(requestObject.IsSetAvoidActionsForDistance()) { context.Writer.WritePropertyName("AvoidActionsForDistance"); - context.Writer.Write(requestObject.AvoidActionsForDistance); + context.Writer.Write(requestObject.AvoidActionsForDistance.Value); } if(requestObject.IsSetHeading()) { context.Writer.WritePropertyName("Heading"); - if(StringUtils.IsSpecialDoubleValue(requestObject.Heading)) + if(StringUtils.IsSpecialDoubleValue(requestObject.Heading.Value)) { - context.Writer.Write(StringUtils.FromSpecialDoubleValue(requestObject.Heading)); + context.Writer.Write(StringUtils.FromSpecialDoubleValue(requestObject.Heading.Value)); } else { - context.Writer.Write(requestObject.Heading); + context.Writer.Write(requestObject.Heading.Value); } } diff --git a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/IsolineScooterOptionsMarshaller.cs b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/IsolineScooterOptionsMarshaller.cs index 98b041c05a4a..e6cbbdb0cfe5 100644 --- a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/IsolineScooterOptionsMarshaller.cs +++ b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/IsolineScooterOptionsMarshaller.cs @@ -68,20 +68,20 @@ public void Marshall(IsolineScooterOptions requestObject, JsonMarshallerContext if(requestObject.IsSetMaxSpeed()) { context.Writer.WritePropertyName("MaxSpeed"); - if(StringUtils.IsSpecialDoubleValue(requestObject.MaxSpeed)) + if(StringUtils.IsSpecialDoubleValue(requestObject.MaxSpeed.Value)) { - context.Writer.Write(StringUtils.FromSpecialDoubleValue(requestObject.MaxSpeed)); + context.Writer.Write(StringUtils.FromSpecialDoubleValue(requestObject.MaxSpeed.Value)); } else { - context.Writer.Write(requestObject.MaxSpeed); + context.Writer.Write(requestObject.MaxSpeed.Value); } } if(requestObject.IsSetOccupancy()) { context.Writer.WritePropertyName("Occupancy"); - context.Writer.Write(requestObject.Occupancy); + context.Writer.Write(requestObject.Occupancy.Value); } } diff --git a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/IsolineTrafficOptionsMarshaller.cs b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/IsolineTrafficOptionsMarshaller.cs index fa0ba51723f4..a46d86732385 100644 --- a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/IsolineTrafficOptionsMarshaller.cs +++ b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/IsolineTrafficOptionsMarshaller.cs @@ -51,7 +51,7 @@ public void Marshall(IsolineTrafficOptions requestObject, JsonMarshallerContext if(requestObject.IsSetFlowEventThresholdOverride()) { context.Writer.WritePropertyName("FlowEventThresholdOverride"); - context.Writer.Write(requestObject.FlowEventThresholdOverride); + context.Writer.Write(requestObject.FlowEventThresholdOverride.Value); } if(requestObject.IsSetUsage()) diff --git a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/IsolineTrailerOptionsMarshaller.cs b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/IsolineTrailerOptionsMarshaller.cs index 2c2296b5ec7d..2c69364fe719 100644 --- a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/IsolineTrailerOptionsMarshaller.cs +++ b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/IsolineTrailerOptionsMarshaller.cs @@ -51,13 +51,13 @@ public void Marshall(IsolineTrailerOptions requestObject, JsonMarshallerContext if(requestObject.IsSetAxleCount()) { context.Writer.WritePropertyName("AxleCount"); - context.Writer.Write(requestObject.AxleCount); + context.Writer.Write(requestObject.AxleCount.Value); } if(requestObject.IsSetTrailerCount()) { context.Writer.WritePropertyName("TrailerCount"); - context.Writer.Write(requestObject.TrailerCount); + context.Writer.Write(requestObject.TrailerCount.Value); } } diff --git a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/IsolineTruckOptionsMarshaller.cs b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/IsolineTruckOptionsMarshaller.cs index e67c891c0956..683d610f6e53 100644 --- a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/IsolineTruckOptionsMarshaller.cs +++ b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/IsolineTruckOptionsMarshaller.cs @@ -51,7 +51,7 @@ public void Marshall(IsolineTruckOptions requestObject, JsonMarshallerContext co if(requestObject.IsSetAxleCount()) { context.Writer.WritePropertyName("AxleCount"); - context.Writer.Write(requestObject.AxleCount); + context.Writer.Write(requestObject.AxleCount.Value); } if(requestObject.IsSetEngineType()) @@ -63,7 +63,7 @@ public void Marshall(IsolineTruckOptions requestObject, JsonMarshallerContext co if(requestObject.IsSetGrossWeight()) { context.Writer.WritePropertyName("GrossWeight"); - context.Writer.Write(requestObject.GrossWeight); + context.Writer.Write(requestObject.GrossWeight.Value); } if(requestObject.IsSetHazardousCargos()) @@ -80,25 +80,25 @@ public void Marshall(IsolineTruckOptions requestObject, JsonMarshallerContext co if(requestObject.IsSetHeight()) { context.Writer.WritePropertyName("Height"); - context.Writer.Write(requestObject.Height); + context.Writer.Write(requestObject.Height.Value); } if(requestObject.IsSetHeightAboveFirstAxle()) { context.Writer.WritePropertyName("HeightAboveFirstAxle"); - context.Writer.Write(requestObject.HeightAboveFirstAxle); + context.Writer.Write(requestObject.HeightAboveFirstAxle.Value); } if(requestObject.IsSetKpraLength()) { context.Writer.WritePropertyName("KpraLength"); - context.Writer.Write(requestObject.KpraLength); + context.Writer.Write(requestObject.KpraLength.Value); } if(requestObject.IsSetLength()) { context.Writer.WritePropertyName("Length"); - context.Writer.Write(requestObject.Length); + context.Writer.Write(requestObject.Length.Value); } if(requestObject.IsSetLicensePlate()) @@ -115,32 +115,32 @@ public void Marshall(IsolineTruckOptions requestObject, JsonMarshallerContext co if(requestObject.IsSetMaxSpeed()) { context.Writer.WritePropertyName("MaxSpeed"); - if(StringUtils.IsSpecialDoubleValue(requestObject.MaxSpeed)) + if(StringUtils.IsSpecialDoubleValue(requestObject.MaxSpeed.Value)) { - context.Writer.Write(StringUtils.FromSpecialDoubleValue(requestObject.MaxSpeed)); + context.Writer.Write(StringUtils.FromSpecialDoubleValue(requestObject.MaxSpeed.Value)); } else { - context.Writer.Write(requestObject.MaxSpeed); + context.Writer.Write(requestObject.MaxSpeed.Value); } } if(requestObject.IsSetOccupancy()) { context.Writer.WritePropertyName("Occupancy"); - context.Writer.Write(requestObject.Occupancy); + context.Writer.Write(requestObject.Occupancy.Value); } if(requestObject.IsSetPayloadCapacity()) { context.Writer.WritePropertyName("PayloadCapacity"); - context.Writer.Write(requestObject.PayloadCapacity); + context.Writer.Write(requestObject.PayloadCapacity.Value); } if(requestObject.IsSetTireCount()) { context.Writer.WritePropertyName("TireCount"); - context.Writer.Write(requestObject.TireCount); + context.Writer.Write(requestObject.TireCount.Value); } if(requestObject.IsSetTrailer()) @@ -169,7 +169,7 @@ public void Marshall(IsolineTruckOptions requestObject, JsonMarshallerContext co if(requestObject.IsSetWeightPerAxle()) { context.Writer.WritePropertyName("WeightPerAxle"); - context.Writer.Write(requestObject.WeightPerAxle); + context.Writer.Write(requestObject.WeightPerAxle.Value); } if(requestObject.IsSetWeightPerAxleGroup()) @@ -186,7 +186,7 @@ public void Marshall(IsolineTruckOptions requestObject, JsonMarshallerContext co if(requestObject.IsSetWidth()) { context.Writer.WritePropertyName("Width"); - context.Writer.Write(requestObject.Width); + context.Writer.Write(requestObject.Width.Value); } } diff --git a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/IsolineUnmarshaller.cs b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/IsolineUnmarshaller.cs index 7ca3d5aa5ebb..4fb5b25ac3e7 100644 --- a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/IsolineUnmarshaller.cs +++ b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/IsolineUnmarshaller.cs @@ -74,7 +74,7 @@ public Isoline Unmarshall(JsonUnmarshallerContext context) } if (context.TestExpression("DistanceThreshold", targetDepth)) { - var unmarshaller = LongUnmarshaller.Instance; + var unmarshaller = NullableLongUnmarshaller.Instance; unmarshalledObject.DistanceThreshold = unmarshaller.Unmarshall(context); continue; } @@ -86,7 +86,7 @@ public Isoline Unmarshall(JsonUnmarshallerContext context) } if (context.TestExpression("TimeThreshold", targetDepth)) { - var unmarshaller = LongUnmarshaller.Instance; + var unmarshaller = NullableLongUnmarshaller.Instance; unmarshalledObject.TimeThreshold = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/OptimizeWaypointsRequestMarshaller.cs b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/OptimizeWaypointsRequestMarshaller.cs index bbe3b862d71a..a31a185e01b4 100644 --- a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/OptimizeWaypointsRequestMarshaller.cs +++ b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/OptimizeWaypointsRequestMarshaller.cs @@ -64,148 +64,151 @@ public IRequest Marshall(OptimizeWaypointsRequest publicRequest) if (publicRequest.IsSetKey()) request.Parameters.Add("key", StringUtils.FromString(publicRequest.Key)); request.ResourcePath = "/optimize-waypoints"; - using (StringWriter stringWriter = new StringWriter(CultureInfo.InvariantCulture)) + using (MemoryStream memoryStream = new MemoryStream()) { - JsonWriter writer = new JsonWriter(stringWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetAvoid()) + using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) { - context.Writer.WritePropertyName("Avoid"); - context.Writer.WriteObjectStart(); - - var marshaller = WaypointOptimizationAvoidanceOptionsMarshaller.Instance; - marshaller.Marshall(publicRequest.Avoid, context); + JsonWriter writer = new JsonWriter(streamWriter); + writer.Validate = false; + writer.WriteObjectStart(); + var context = new JsonMarshallerContext(request, writer); + if(publicRequest.IsSetAvoid()) + { + context.Writer.WritePropertyName("Avoid"); + context.Writer.WriteObjectStart(); - context.Writer.WriteObjectEnd(); - } + var marshaller = WaypointOptimizationAvoidanceOptionsMarshaller.Instance; + marshaller.Marshall(publicRequest.Avoid, context); - if(publicRequest.IsSetDepartureTime()) - { - context.Writer.WritePropertyName("DepartureTime"); - context.Writer.Write(publicRequest.DepartureTime); - } + context.Writer.WriteObjectEnd(); + } - if(publicRequest.IsSetDestination()) - { - context.Writer.WritePropertyName("Destination"); - context.Writer.WriteArrayStart(); - foreach(var publicRequestDestinationListValue in publicRequest.Destination) + if(publicRequest.IsSetDepartureTime()) { - context.Writer.Write(publicRequestDestinationListValue); + context.Writer.WritePropertyName("DepartureTime"); + context.Writer.Write(publicRequest.DepartureTime); } - context.Writer.WriteArrayEnd(); - } - if(publicRequest.IsSetDestinationOptions()) - { - context.Writer.WritePropertyName("DestinationOptions"); - context.Writer.WriteObjectStart(); + if(publicRequest.IsSetDestination()) + { + context.Writer.WritePropertyName("Destination"); + context.Writer.WriteArrayStart(); + foreach(var publicRequestDestinationListValue in publicRequest.Destination) + { + context.Writer.Write(publicRequestDestinationListValue); + } + context.Writer.WriteArrayEnd(); + } - var marshaller = WaypointOptimizationDestinationOptionsMarshaller.Instance; - marshaller.Marshall(publicRequest.DestinationOptions, context); + if(publicRequest.IsSetDestinationOptions()) + { + context.Writer.WritePropertyName("DestinationOptions"); + context.Writer.WriteObjectStart(); - context.Writer.WriteObjectEnd(); - } + var marshaller = WaypointOptimizationDestinationOptionsMarshaller.Instance; + marshaller.Marshall(publicRequest.DestinationOptions, context); - if(publicRequest.IsSetDriver()) - { - context.Writer.WritePropertyName("Driver"); - context.Writer.WriteObjectStart(); + context.Writer.WriteObjectEnd(); + } - var marshaller = WaypointOptimizationDriverOptionsMarshaller.Instance; - marshaller.Marshall(publicRequest.Driver, context); + if(publicRequest.IsSetDriver()) + { + context.Writer.WritePropertyName("Driver"); + context.Writer.WriteObjectStart(); - context.Writer.WriteObjectEnd(); - } + var marshaller = WaypointOptimizationDriverOptionsMarshaller.Instance; + marshaller.Marshall(publicRequest.Driver, context); - if(publicRequest.IsSetExclude()) - { - context.Writer.WritePropertyName("Exclude"); - context.Writer.WriteObjectStart(); + context.Writer.WriteObjectEnd(); + } - var marshaller = WaypointOptimizationExclusionOptionsMarshaller.Instance; - marshaller.Marshall(publicRequest.Exclude, context); + if(publicRequest.IsSetExclude()) + { + context.Writer.WritePropertyName("Exclude"); + context.Writer.WriteObjectStart(); - context.Writer.WriteObjectEnd(); - } + var marshaller = WaypointOptimizationExclusionOptionsMarshaller.Instance; + marshaller.Marshall(publicRequest.Exclude, context); - if(publicRequest.IsSetOptimizeSequencingFor()) - { - context.Writer.WritePropertyName("OptimizeSequencingFor"); - context.Writer.Write(publicRequest.OptimizeSequencingFor); - } + context.Writer.WriteObjectEnd(); + } - if(publicRequest.IsSetOrigin()) - { - context.Writer.WritePropertyName("Origin"); - context.Writer.WriteArrayStart(); - foreach(var publicRequestOriginListValue in publicRequest.Origin) + if(publicRequest.IsSetOptimizeSequencingFor()) { - context.Writer.Write(publicRequestOriginListValue); + context.Writer.WritePropertyName("OptimizeSequencingFor"); + context.Writer.Write(publicRequest.OptimizeSequencingFor); } - context.Writer.WriteArrayEnd(); - } - - if(publicRequest.IsSetOriginOptions()) - { - context.Writer.WritePropertyName("OriginOptions"); - context.Writer.WriteObjectStart(); - - var marshaller = WaypointOptimizationOriginOptionsMarshaller.Instance; - marshaller.Marshall(publicRequest.OriginOptions, context); - context.Writer.WriteObjectEnd(); - } + if(publicRequest.IsSetOrigin()) + { + context.Writer.WritePropertyName("Origin"); + context.Writer.WriteArrayStart(); + foreach(var publicRequestOriginListValue in publicRequest.Origin) + { + context.Writer.Write(publicRequestOriginListValue); + } + context.Writer.WriteArrayEnd(); + } - if(publicRequest.IsSetTraffic()) - { - context.Writer.WritePropertyName("Traffic"); - context.Writer.WriteObjectStart(); + if(publicRequest.IsSetOriginOptions()) + { + context.Writer.WritePropertyName("OriginOptions"); + context.Writer.WriteObjectStart(); - var marshaller = WaypointOptimizationTrafficOptionsMarshaller.Instance; - marshaller.Marshall(publicRequest.Traffic, context); + var marshaller = WaypointOptimizationOriginOptionsMarshaller.Instance; + marshaller.Marshall(publicRequest.OriginOptions, context); - context.Writer.WriteObjectEnd(); - } + context.Writer.WriteObjectEnd(); + } - if(publicRequest.IsSetTravelMode()) - { - context.Writer.WritePropertyName("TravelMode"); - context.Writer.Write(publicRequest.TravelMode); - } + if(publicRequest.IsSetTraffic()) + { + context.Writer.WritePropertyName("Traffic"); + context.Writer.WriteObjectStart(); - if(publicRequest.IsSetTravelModeOptions()) - { - context.Writer.WritePropertyName("TravelModeOptions"); - context.Writer.WriteObjectStart(); + var marshaller = WaypointOptimizationTrafficOptionsMarshaller.Instance; + marshaller.Marshall(publicRequest.Traffic, context); - var marshaller = WaypointOptimizationTravelModeOptionsMarshaller.Instance; - marshaller.Marshall(publicRequest.TravelModeOptions, context); + context.Writer.WriteObjectEnd(); + } - context.Writer.WriteObjectEnd(); - } + if(publicRequest.IsSetTravelMode()) + { + context.Writer.WritePropertyName("TravelMode"); + context.Writer.Write(publicRequest.TravelMode); + } - if(publicRequest.IsSetWaypoints()) - { - context.Writer.WritePropertyName("Waypoints"); - context.Writer.WriteArrayStart(); - foreach(var publicRequestWaypointsListValue in publicRequest.Waypoints) + if(publicRequest.IsSetTravelModeOptions()) { + context.Writer.WritePropertyName("TravelModeOptions"); context.Writer.WriteObjectStart(); - var marshaller = WaypointOptimizationWaypointMarshaller.Instance; - marshaller.Marshall(publicRequestWaypointsListValue, context); + var marshaller = WaypointOptimizationTravelModeOptionsMarshaller.Instance; + marshaller.Marshall(publicRequest.TravelModeOptions, context); context.Writer.WriteObjectEnd(); } - context.Writer.WriteArrayEnd(); + + if(publicRequest.IsSetWaypoints()) + { + context.Writer.WritePropertyName("Waypoints"); + context.Writer.WriteArrayStart(); + foreach(var publicRequestWaypointsListValue in publicRequest.Waypoints) + { + context.Writer.WriteObjectStart(); + + var marshaller = WaypointOptimizationWaypointMarshaller.Instance; + marshaller.Marshall(publicRequestWaypointsListValue, context); + + context.Writer.WriteObjectEnd(); + } + context.Writer.WriteArrayEnd(); + } + + writer.WriteObjectEnd(); } - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); + request.Content = memoryStream.ToArray(); } request.UseQueryString = true; diff --git a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/OptimizeWaypointsResponseUnmarshaller.cs b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/OptimizeWaypointsResponseUnmarshaller.cs index 1cc58301755b..43fd60a66ea1 100644 --- a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/OptimizeWaypointsResponseUnmarshaller.cs +++ b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/OptimizeWaypointsResponseUnmarshaller.cs @@ -60,13 +60,13 @@ public override AmazonWebServiceResponse Unmarshall(JsonUnmarshallerContext cont } if (context.TestExpression("Distance", targetDepth)) { - var unmarshaller = LongUnmarshaller.Instance; + var unmarshaller = NullableLongUnmarshaller.Instance; response.Distance = unmarshaller.Unmarshall(context); continue; } if (context.TestExpression("Duration", targetDepth)) { - var unmarshaller = LongUnmarshaller.Instance; + var unmarshaller = NullableLongUnmarshaller.Instance; response.Duration = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/PolylineCorridorMarshaller.cs b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/PolylineCorridorMarshaller.cs index 7916341edda5..d04c93d667da 100644 --- a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/PolylineCorridorMarshaller.cs +++ b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/PolylineCorridorMarshaller.cs @@ -57,7 +57,7 @@ public void Marshall(PolylineCorridor requestObject, JsonMarshallerContext conte if(requestObject.IsSetRadius()) { context.Writer.WritePropertyName("Radius"); - context.Writer.Write(requestObject.Radius); + context.Writer.Write(requestObject.Radius.Value); } } diff --git a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RoadSnapSnappedTracePointUnmarshaller.cs b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RoadSnapSnappedTracePointUnmarshaller.cs index 8f9a24d763f0..155c67ec7d69 100644 --- a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RoadSnapSnappedTracePointUnmarshaller.cs +++ b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RoadSnapSnappedTracePointUnmarshaller.cs @@ -68,7 +68,7 @@ public RoadSnapSnappedTracePoint Unmarshall(JsonUnmarshallerContext context) { if (context.TestExpression("Confidence", targetDepth)) { - var unmarshaller = DoubleUnmarshaller.Instance; + var unmarshaller = NullableDoubleUnmarshaller.Instance; unmarshalledObject.Confidence = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RoadSnapTracePointMarshaller.cs b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RoadSnapTracePointMarshaller.cs index adcfdb31ce25..178664347b19 100644 --- a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RoadSnapTracePointMarshaller.cs +++ b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RoadSnapTracePointMarshaller.cs @@ -51,13 +51,13 @@ public void Marshall(RoadSnapTracePoint requestObject, JsonMarshallerContext con if(requestObject.IsSetHeading()) { context.Writer.WritePropertyName("Heading"); - if(StringUtils.IsSpecialDoubleValue(requestObject.Heading)) + if(StringUtils.IsSpecialDoubleValue(requestObject.Heading.Value)) { - context.Writer.Write(StringUtils.FromSpecialDoubleValue(requestObject.Heading)); + context.Writer.Write(StringUtils.FromSpecialDoubleValue(requestObject.Heading.Value)); } else { - context.Writer.Write(requestObject.Heading); + context.Writer.Write(requestObject.Heading.Value); } } @@ -75,13 +75,13 @@ public void Marshall(RoadSnapTracePoint requestObject, JsonMarshallerContext con if(requestObject.IsSetSpeed()) { context.Writer.WritePropertyName("Speed"); - if(StringUtils.IsSpecialDoubleValue(requestObject.Speed)) + if(StringUtils.IsSpecialDoubleValue(requestObject.Speed.Value)) { - context.Writer.Write(StringUtils.FromSpecialDoubleValue(requestObject.Speed)); + context.Writer.Write(StringUtils.FromSpecialDoubleValue(requestObject.Speed.Value)); } else { - context.Writer.Write(requestObject.Speed); + context.Writer.Write(requestObject.Speed.Value); } } diff --git a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RoadSnapTrailerOptionsMarshaller.cs b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RoadSnapTrailerOptionsMarshaller.cs index 264ad4b6bc6a..cf85957041cb 100644 --- a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RoadSnapTrailerOptionsMarshaller.cs +++ b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RoadSnapTrailerOptionsMarshaller.cs @@ -51,7 +51,7 @@ public void Marshall(RoadSnapTrailerOptions requestObject, JsonMarshallerContext if(requestObject.IsSetTrailerCount()) { context.Writer.WritePropertyName("TrailerCount"); - context.Writer.Write(requestObject.TrailerCount); + context.Writer.Write(requestObject.TrailerCount.Value); } } diff --git a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RoadSnapTruckOptionsMarshaller.cs b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RoadSnapTruckOptionsMarshaller.cs index ebe57e61bb70..f1f0539432d1 100644 --- a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RoadSnapTruckOptionsMarshaller.cs +++ b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RoadSnapTruckOptionsMarshaller.cs @@ -51,7 +51,7 @@ public void Marshall(RoadSnapTruckOptions requestObject, JsonMarshallerContext c if(requestObject.IsSetGrossWeight()) { context.Writer.WritePropertyName("GrossWeight"); - context.Writer.Write(requestObject.GrossWeight); + context.Writer.Write(requestObject.GrossWeight.Value); } if(requestObject.IsSetHazardousCargos()) @@ -68,13 +68,13 @@ public void Marshall(RoadSnapTruckOptions requestObject, JsonMarshallerContext c if(requestObject.IsSetHeight()) { context.Writer.WritePropertyName("Height"); - context.Writer.Write(requestObject.Height); + context.Writer.Write(requestObject.Height.Value); } if(requestObject.IsSetLength()) { context.Writer.WritePropertyName("Length"); - context.Writer.Write(requestObject.Length); + context.Writer.Write(requestObject.Length.Value); } if(requestObject.IsSetTrailer()) @@ -97,7 +97,7 @@ public void Marshall(RoadSnapTruckOptions requestObject, JsonMarshallerContext c if(requestObject.IsSetWidth()) { context.Writer.WritePropertyName("Width"); - context.Writer.Write(requestObject.Width); + context.Writer.Write(requestObject.Width.Value); } } diff --git a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteAllowOptionsMarshaller.cs b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteAllowOptionsMarshaller.cs index d9376eda7157..a4226b027d9c 100644 --- a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteAllowOptionsMarshaller.cs +++ b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteAllowOptionsMarshaller.cs @@ -51,13 +51,13 @@ public void Marshall(RouteAllowOptions requestObject, JsonMarshallerContext cont if(requestObject.IsSetHot()) { context.Writer.WritePropertyName("Hot"); - context.Writer.Write(requestObject.Hot); + context.Writer.Write(requestObject.Hot.Value); } if(requestObject.IsSetHov()) { context.Writer.WritePropertyName("Hov"); - context.Writer.Write(requestObject.Hov); + context.Writer.Write(requestObject.Hov.Value); } } diff --git a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteAvoidanceOptionsMarshaller.cs b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteAvoidanceOptionsMarshaller.cs index 0df2d2544acf..d747dda57491 100644 --- a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteAvoidanceOptionsMarshaller.cs +++ b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteAvoidanceOptionsMarshaller.cs @@ -67,43 +67,43 @@ public void Marshall(RouteAvoidanceOptions requestObject, JsonMarshallerContext if(requestObject.IsSetCarShuttleTrains()) { context.Writer.WritePropertyName("CarShuttleTrains"); - context.Writer.Write(requestObject.CarShuttleTrains); + context.Writer.Write(requestObject.CarShuttleTrains.Value); } if(requestObject.IsSetControlledAccessHighways()) { context.Writer.WritePropertyName("ControlledAccessHighways"); - context.Writer.Write(requestObject.ControlledAccessHighways); + context.Writer.Write(requestObject.ControlledAccessHighways.Value); } if(requestObject.IsSetDirtRoads()) { context.Writer.WritePropertyName("DirtRoads"); - context.Writer.Write(requestObject.DirtRoads); + context.Writer.Write(requestObject.DirtRoads.Value); } if(requestObject.IsSetFerries()) { context.Writer.WritePropertyName("Ferries"); - context.Writer.Write(requestObject.Ferries); + context.Writer.Write(requestObject.Ferries.Value); } if(requestObject.IsSetSeasonalClosure()) { context.Writer.WritePropertyName("SeasonalClosure"); - context.Writer.Write(requestObject.SeasonalClosure); + context.Writer.Write(requestObject.SeasonalClosure.Value); } if(requestObject.IsSetTollRoads()) { context.Writer.WritePropertyName("TollRoads"); - context.Writer.Write(requestObject.TollRoads); + context.Writer.Write(requestObject.TollRoads.Value); } if(requestObject.IsSetTollTransponders()) { context.Writer.WritePropertyName("TollTransponders"); - context.Writer.Write(requestObject.TollTransponders); + context.Writer.Write(requestObject.TollTransponders.Value); } if(requestObject.IsSetTruckRoadTypes()) @@ -120,13 +120,13 @@ public void Marshall(RouteAvoidanceOptions requestObject, JsonMarshallerContext if(requestObject.IsSetTunnels()) { context.Writer.WritePropertyName("Tunnels"); - context.Writer.Write(requestObject.Tunnels); + context.Writer.Write(requestObject.Tunnels.Value); } if(requestObject.IsSetUTurns()) { context.Writer.WritePropertyName("UTurns"); - context.Writer.Write(requestObject.UTurns); + context.Writer.Write(requestObject.UTurns.Value); } if(requestObject.IsSetZoneCategories()) diff --git a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteCarOptionsMarshaller.cs b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteCarOptionsMarshaller.cs index 3075d5c61678..ada8510f7e22 100644 --- a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteCarOptionsMarshaller.cs +++ b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteCarOptionsMarshaller.cs @@ -68,20 +68,20 @@ public void Marshall(RouteCarOptions requestObject, JsonMarshallerContext contex if(requestObject.IsSetMaxSpeed()) { context.Writer.WritePropertyName("MaxSpeed"); - if(StringUtils.IsSpecialDoubleValue(requestObject.MaxSpeed)) + if(StringUtils.IsSpecialDoubleValue(requestObject.MaxSpeed.Value)) { - context.Writer.Write(StringUtils.FromSpecialDoubleValue(requestObject.MaxSpeed)); + context.Writer.Write(StringUtils.FromSpecialDoubleValue(requestObject.MaxSpeed.Value)); } else { - context.Writer.Write(requestObject.MaxSpeed); + context.Writer.Write(requestObject.MaxSpeed.Value); } } if(requestObject.IsSetOccupancy()) { context.Writer.WritePropertyName("Occupancy"); - context.Writer.Write(requestObject.Occupancy); + context.Writer.Write(requestObject.Occupancy.Value); } } diff --git a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteContinueHighwayStepDetailsUnmarshaller.cs b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteContinueHighwayStepDetailsUnmarshaller.cs index d6c9c0af6e6c..f66a459e59d3 100644 --- a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteContinueHighwayStepDetailsUnmarshaller.cs +++ b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteContinueHighwayStepDetailsUnmarshaller.cs @@ -80,7 +80,7 @@ public RouteContinueHighwayStepDetails Unmarshall(JsonUnmarshallerContext contex } if (context.TestExpression("TurnAngle", targetDepth)) { - var unmarshaller = DoubleUnmarshaller.Instance; + var unmarshaller = NullableDoubleUnmarshaller.Instance; unmarshalledObject.TurnAngle = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteDestinationOptionsMarshaller.cs b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteDestinationOptionsMarshaller.cs index 346ec117b1c2..73f5aec0fe21 100644 --- a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteDestinationOptionsMarshaller.cs +++ b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteDestinationOptionsMarshaller.cs @@ -51,25 +51,25 @@ public void Marshall(RouteDestinationOptions requestObject, JsonMarshallerContex if(requestObject.IsSetAvoidActionsForDistance()) { context.Writer.WritePropertyName("AvoidActionsForDistance"); - context.Writer.Write(requestObject.AvoidActionsForDistance); + context.Writer.Write(requestObject.AvoidActionsForDistance.Value); } if(requestObject.IsSetAvoidUTurns()) { context.Writer.WritePropertyName("AvoidUTurns"); - context.Writer.Write(requestObject.AvoidUTurns); + context.Writer.Write(requestObject.AvoidUTurns.Value); } if(requestObject.IsSetHeading()) { context.Writer.WritePropertyName("Heading"); - if(StringUtils.IsSpecialDoubleValue(requestObject.Heading)) + if(StringUtils.IsSpecialDoubleValue(requestObject.Heading.Value)) { - context.Writer.Write(StringUtils.FromSpecialDoubleValue(requestObject.Heading)); + context.Writer.Write(StringUtils.FromSpecialDoubleValue(requestObject.Heading.Value)); } else { - context.Writer.Write(requestObject.Heading); + context.Writer.Write(requestObject.Heading.Value); } } @@ -98,7 +98,7 @@ public void Marshall(RouteDestinationOptions requestObject, JsonMarshallerContex if(requestObject.IsSetStopDuration()) { context.Writer.WritePropertyName("StopDuration"); - context.Writer.Write(requestObject.StopDuration); + context.Writer.Write(requestObject.StopDuration.Value); } } diff --git a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteDriverScheduleIntervalMarshaller.cs b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteDriverScheduleIntervalMarshaller.cs index f385cd531adb..2d4e99ddf73e 100644 --- a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteDriverScheduleIntervalMarshaller.cs +++ b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteDriverScheduleIntervalMarshaller.cs @@ -51,13 +51,13 @@ public void Marshall(RouteDriverScheduleInterval requestObject, JsonMarshallerCo if(requestObject.IsSetDriveDuration()) { context.Writer.WritePropertyName("DriveDuration"); - context.Writer.Write(requestObject.DriveDuration); + context.Writer.Write(requestObject.DriveDuration.Value); } if(requestObject.IsSetRestDuration()) { context.Writer.WritePropertyName("RestDuration"); - context.Writer.Write(requestObject.RestDuration); + context.Writer.Write(requestObject.RestDuration.Value); } } diff --git a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteEnterHighwayStepDetailsUnmarshaller.cs b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteEnterHighwayStepDetailsUnmarshaller.cs index ab409f2e040d..3ffdc0460a27 100644 --- a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteEnterHighwayStepDetailsUnmarshaller.cs +++ b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteEnterHighwayStepDetailsUnmarshaller.cs @@ -80,7 +80,7 @@ public RouteEnterHighwayStepDetails Unmarshall(JsonUnmarshallerContext context) } if (context.TestExpression("TurnAngle", targetDepth)) { - var unmarshaller = DoubleUnmarshaller.Instance; + var unmarshaller = NullableDoubleUnmarshaller.Instance; unmarshalledObject.TurnAngle = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteExitStepDetailsUnmarshaller.cs b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteExitStepDetailsUnmarshaller.cs index a613fa2631f0..926dcc49e2ef 100644 --- a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteExitStepDetailsUnmarshaller.cs +++ b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteExitStepDetailsUnmarshaller.cs @@ -74,7 +74,7 @@ public RouteExitStepDetails Unmarshall(JsonUnmarshallerContext context) } if (context.TestExpression("RelativeExit", targetDepth)) { - var unmarshaller = IntUnmarshaller.Instance; + var unmarshaller = NullableIntUnmarshaller.Instance; unmarshalledObject.RelativeExit = unmarshaller.Unmarshall(context); continue; } @@ -86,7 +86,7 @@ public RouteExitStepDetails Unmarshall(JsonUnmarshallerContext context) } if (context.TestExpression("TurnAngle", targetDepth)) { - var unmarshaller = DoubleUnmarshaller.Instance; + var unmarshaller = NullableDoubleUnmarshaller.Instance; unmarshalledObject.TurnAngle = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteFerryAfterTravelStepUnmarshaller.cs b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteFerryAfterTravelStepUnmarshaller.cs index dd10274f63b3..9be65e1d18da 100644 --- a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteFerryAfterTravelStepUnmarshaller.cs +++ b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteFerryAfterTravelStepUnmarshaller.cs @@ -68,7 +68,7 @@ public RouteFerryAfterTravelStep Unmarshall(JsonUnmarshallerContext context) { if (context.TestExpression("Duration", targetDepth)) { - var unmarshaller = LongUnmarshaller.Instance; + var unmarshaller = NullableLongUnmarshaller.Instance; unmarshalledObject.Duration = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteFerryBeforeTravelStepUnmarshaller.cs b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteFerryBeforeTravelStepUnmarshaller.cs index 14a5ee9e32bb..51cd5ab40b48 100644 --- a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteFerryBeforeTravelStepUnmarshaller.cs +++ b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteFerryBeforeTravelStepUnmarshaller.cs @@ -68,7 +68,7 @@ public RouteFerryBeforeTravelStep Unmarshall(JsonUnmarshallerContext context) { if (context.TestExpression("Duration", targetDepth)) { - var unmarshaller = LongUnmarshaller.Instance; + var unmarshaller = NullableLongUnmarshaller.Instance; unmarshalledObject.Duration = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteFerryOverviewSummaryUnmarshaller.cs b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteFerryOverviewSummaryUnmarshaller.cs index 0edd295715eb..4ec9022bc485 100644 --- a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteFerryOverviewSummaryUnmarshaller.cs +++ b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteFerryOverviewSummaryUnmarshaller.cs @@ -68,13 +68,13 @@ public RouteFerryOverviewSummary Unmarshall(JsonUnmarshallerContext context) { if (context.TestExpression("Distance", targetDepth)) { - var unmarshaller = LongUnmarshaller.Instance; + var unmarshaller = NullableLongUnmarshaller.Instance; unmarshalledObject.Distance = unmarshaller.Unmarshall(context); continue; } if (context.TestExpression("Duration", targetDepth)) { - var unmarshaller = LongUnmarshaller.Instance; + var unmarshaller = NullableLongUnmarshaller.Instance; unmarshalledObject.Duration = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteFerryPlaceUnmarshaller.cs b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteFerryPlaceUnmarshaller.cs index 58da2fe4a2cc..240489a7334c 100644 --- a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteFerryPlaceUnmarshaller.cs +++ b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteFerryPlaceUnmarshaller.cs @@ -86,7 +86,7 @@ public RouteFerryPlace Unmarshall(JsonUnmarshallerContext context) } if (context.TestExpression("WaypointIndex", targetDepth)) { - var unmarshaller = IntUnmarshaller.Instance; + var unmarshaller = NullableIntUnmarshaller.Instance; unmarshalledObject.WaypointIndex = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteFerrySpanUnmarshaller.cs b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteFerrySpanUnmarshaller.cs index 6c365c29d85c..11d38e807721 100644 --- a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteFerrySpanUnmarshaller.cs +++ b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteFerrySpanUnmarshaller.cs @@ -74,19 +74,19 @@ public RouteFerrySpan Unmarshall(JsonUnmarshallerContext context) } if (context.TestExpression("Distance", targetDepth)) { - var unmarshaller = LongUnmarshaller.Instance; + var unmarshaller = NullableLongUnmarshaller.Instance; unmarshalledObject.Distance = unmarshaller.Unmarshall(context); continue; } if (context.TestExpression("Duration", targetDepth)) { - var unmarshaller = LongUnmarshaller.Instance; + var unmarshaller = NullableLongUnmarshaller.Instance; unmarshalledObject.Duration = unmarshaller.Unmarshall(context); continue; } if (context.TestExpression("GeometryOffset", targetDepth)) { - var unmarshaller = IntUnmarshaller.Instance; + var unmarshaller = NullableIntUnmarshaller.Instance; unmarshalledObject.GeometryOffset = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteFerryTravelOnlySummaryUnmarshaller.cs b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteFerryTravelOnlySummaryUnmarshaller.cs index 7a6d5b09b4c5..80f51e35c933 100644 --- a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteFerryTravelOnlySummaryUnmarshaller.cs +++ b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteFerryTravelOnlySummaryUnmarshaller.cs @@ -68,7 +68,7 @@ public RouteFerryTravelOnlySummary Unmarshall(JsonUnmarshallerContext context) { if (context.TestExpression("Duration", targetDepth)) { - var unmarshaller = LongUnmarshaller.Instance; + var unmarshaller = NullableLongUnmarshaller.Instance; unmarshalledObject.Duration = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteFerryTravelStepUnmarshaller.cs b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteFerryTravelStepUnmarshaller.cs index cd6a5d142991..a89033d1723e 100644 --- a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteFerryTravelStepUnmarshaller.cs +++ b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteFerryTravelStepUnmarshaller.cs @@ -68,19 +68,19 @@ public RouteFerryTravelStep Unmarshall(JsonUnmarshallerContext context) { if (context.TestExpression("Distance", targetDepth)) { - var unmarshaller = LongUnmarshaller.Instance; + var unmarshaller = NullableLongUnmarshaller.Instance; unmarshalledObject.Distance = unmarshaller.Unmarshall(context); continue; } if (context.TestExpression("Duration", targetDepth)) { - var unmarshaller = LongUnmarshaller.Instance; + var unmarshaller = NullableLongUnmarshaller.Instance; unmarshalledObject.Duration = unmarshaller.Unmarshall(context); continue; } if (context.TestExpression("GeometryOffset", targetDepth)) { - var unmarshaller = IntUnmarshaller.Instance; + var unmarshaller = NullableIntUnmarshaller.Instance; unmarshalledObject.GeometryOffset = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteKeepStepDetailsUnmarshaller.cs b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteKeepStepDetailsUnmarshaller.cs index 344073227af2..d74a225c2c1a 100644 --- a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteKeepStepDetailsUnmarshaller.cs +++ b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteKeepStepDetailsUnmarshaller.cs @@ -80,7 +80,7 @@ public RouteKeepStepDetails Unmarshall(JsonUnmarshallerContext context) } if (context.TestExpression("TurnAngle", targetDepth)) { - var unmarshaller = DoubleUnmarshaller.Instance; + var unmarshaller = NullableDoubleUnmarshaller.Instance; unmarshalledObject.TurnAngle = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteMatchingOptionsMarshaller.cs b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteMatchingOptionsMarshaller.cs index bc2bbc3e6ee5..2de69306521e 100644 --- a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteMatchingOptionsMarshaller.cs +++ b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteMatchingOptionsMarshaller.cs @@ -57,13 +57,13 @@ public void Marshall(RouteMatchingOptions requestObject, JsonMarshallerContext c if(requestObject.IsSetOnRoadThreshold()) { context.Writer.WritePropertyName("OnRoadThreshold"); - context.Writer.Write(requestObject.OnRoadThreshold); + context.Writer.Write(requestObject.OnRoadThreshold.Value); } if(requestObject.IsSetRadius()) { context.Writer.WritePropertyName("Radius"); - context.Writer.Write(requestObject.Radius); + context.Writer.Write(requestObject.Radius.Value); } if(requestObject.IsSetStrategy()) diff --git a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteMatrixAllowOptionsMarshaller.cs b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteMatrixAllowOptionsMarshaller.cs index c7a8855e8b74..446ad6ba778c 100644 --- a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteMatrixAllowOptionsMarshaller.cs +++ b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteMatrixAllowOptionsMarshaller.cs @@ -51,13 +51,13 @@ public void Marshall(RouteMatrixAllowOptions requestObject, JsonMarshallerContex if(requestObject.IsSetHot()) { context.Writer.WritePropertyName("Hot"); - context.Writer.Write(requestObject.Hot); + context.Writer.Write(requestObject.Hot.Value); } if(requestObject.IsSetHov()) { context.Writer.WritePropertyName("Hov"); - context.Writer.Write(requestObject.Hov); + context.Writer.Write(requestObject.Hov.Value); } } diff --git a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteMatrixAutoCircleMarshaller.cs b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteMatrixAutoCircleMarshaller.cs index ae4496ee6e63..2b09e8ce5f72 100644 --- a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteMatrixAutoCircleMarshaller.cs +++ b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteMatrixAutoCircleMarshaller.cs @@ -51,13 +51,13 @@ public void Marshall(RouteMatrixAutoCircle requestObject, JsonMarshallerContext if(requestObject.IsSetMargin()) { context.Writer.WritePropertyName("Margin"); - context.Writer.Write(requestObject.Margin); + context.Writer.Write(requestObject.Margin.Value); } if(requestObject.IsSetMaxRadius()) { context.Writer.WritePropertyName("MaxRadius"); - context.Writer.Write(requestObject.MaxRadius); + context.Writer.Write(requestObject.MaxRadius.Value); } } diff --git a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteMatrixAutoCircleUnmarshaller.cs b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteMatrixAutoCircleUnmarshaller.cs index 2d51d2440872..e67fa7c76882 100644 --- a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteMatrixAutoCircleUnmarshaller.cs +++ b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteMatrixAutoCircleUnmarshaller.cs @@ -68,13 +68,13 @@ public RouteMatrixAutoCircle Unmarshall(JsonUnmarshallerContext context) { if (context.TestExpression("Margin", targetDepth)) { - var unmarshaller = LongUnmarshaller.Instance; + var unmarshaller = NullableLongUnmarshaller.Instance; unmarshalledObject.Margin = unmarshaller.Unmarshall(context); continue; } if (context.TestExpression("MaxRadius", targetDepth)) { - var unmarshaller = LongUnmarshaller.Instance; + var unmarshaller = NullableLongUnmarshaller.Instance; unmarshalledObject.MaxRadius = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteMatrixAvoidanceOptionsMarshaller.cs b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteMatrixAvoidanceOptionsMarshaller.cs index dc879ec1811f..7e2ddb13d08b 100644 --- a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteMatrixAvoidanceOptionsMarshaller.cs +++ b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteMatrixAvoidanceOptionsMarshaller.cs @@ -67,37 +67,37 @@ public void Marshall(RouteMatrixAvoidanceOptions requestObject, JsonMarshallerCo if(requestObject.IsSetCarShuttleTrains()) { context.Writer.WritePropertyName("CarShuttleTrains"); - context.Writer.Write(requestObject.CarShuttleTrains); + context.Writer.Write(requestObject.CarShuttleTrains.Value); } if(requestObject.IsSetControlledAccessHighways()) { context.Writer.WritePropertyName("ControlledAccessHighways"); - context.Writer.Write(requestObject.ControlledAccessHighways); + context.Writer.Write(requestObject.ControlledAccessHighways.Value); } if(requestObject.IsSetDirtRoads()) { context.Writer.WritePropertyName("DirtRoads"); - context.Writer.Write(requestObject.DirtRoads); + context.Writer.Write(requestObject.DirtRoads.Value); } if(requestObject.IsSetFerries()) { context.Writer.WritePropertyName("Ferries"); - context.Writer.Write(requestObject.Ferries); + context.Writer.Write(requestObject.Ferries.Value); } if(requestObject.IsSetTollRoads()) { context.Writer.WritePropertyName("TollRoads"); - context.Writer.Write(requestObject.TollRoads); + context.Writer.Write(requestObject.TollRoads.Value); } if(requestObject.IsSetTollTransponders()) { context.Writer.WritePropertyName("TollTransponders"); - context.Writer.Write(requestObject.TollTransponders); + context.Writer.Write(requestObject.TollTransponders.Value); } if(requestObject.IsSetTruckRoadTypes()) @@ -114,13 +114,13 @@ public void Marshall(RouteMatrixAvoidanceOptions requestObject, JsonMarshallerCo if(requestObject.IsSetTunnels()) { context.Writer.WritePropertyName("Tunnels"); - context.Writer.Write(requestObject.Tunnels); + context.Writer.Write(requestObject.Tunnels.Value); } if(requestObject.IsSetUTurns()) { context.Writer.WritePropertyName("UTurns"); - context.Writer.Write(requestObject.UTurns); + context.Writer.Write(requestObject.UTurns.Value); } if(requestObject.IsSetZoneCategories()) diff --git a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteMatrixBoundaryMarshaller.cs b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteMatrixBoundaryMarshaller.cs index b85861f83645..441fd6ea9b35 100644 --- a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteMatrixBoundaryMarshaller.cs +++ b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteMatrixBoundaryMarshaller.cs @@ -62,7 +62,7 @@ public void Marshall(RouteMatrixBoundary requestObject, JsonMarshallerContext co if(requestObject.IsSetUnbounded()) { context.Writer.WritePropertyName("Unbounded"); - context.Writer.Write(requestObject.Unbounded); + context.Writer.Write(requestObject.Unbounded.Value); } } diff --git a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteMatrixBoundaryUnmarshaller.cs b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteMatrixBoundaryUnmarshaller.cs index e13e8d5b4919..2e1ab0f0e7e9 100644 --- a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteMatrixBoundaryUnmarshaller.cs +++ b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteMatrixBoundaryUnmarshaller.cs @@ -74,7 +74,7 @@ public RouteMatrixBoundary Unmarshall(JsonUnmarshallerContext context) } if (context.TestExpression("Unbounded", targetDepth)) { - var unmarshaller = BoolUnmarshaller.Instance; + var unmarshaller = NullableBoolUnmarshaller.Instance; unmarshalledObject.Unbounded = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteMatrixCarOptionsMarshaller.cs b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteMatrixCarOptionsMarshaller.cs index e15e1e7a89c2..53a661b9aa9a 100644 --- a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteMatrixCarOptionsMarshaller.cs +++ b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteMatrixCarOptionsMarshaller.cs @@ -62,20 +62,20 @@ public void Marshall(RouteMatrixCarOptions requestObject, JsonMarshallerContext if(requestObject.IsSetMaxSpeed()) { context.Writer.WritePropertyName("MaxSpeed"); - if(StringUtils.IsSpecialDoubleValue(requestObject.MaxSpeed)) + if(StringUtils.IsSpecialDoubleValue(requestObject.MaxSpeed.Value)) { - context.Writer.Write(StringUtils.FromSpecialDoubleValue(requestObject.MaxSpeed)); + context.Writer.Write(StringUtils.FromSpecialDoubleValue(requestObject.MaxSpeed.Value)); } else { - context.Writer.Write(requestObject.MaxSpeed); + context.Writer.Write(requestObject.MaxSpeed.Value); } } if(requestObject.IsSetOccupancy()) { context.Writer.WritePropertyName("Occupancy"); - context.Writer.Write(requestObject.Occupancy); + context.Writer.Write(requestObject.Occupancy.Value); } } diff --git a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteMatrixDestinationOptionsMarshaller.cs b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteMatrixDestinationOptionsMarshaller.cs index 62ca1a55483f..8bfed27f5bbe 100644 --- a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteMatrixDestinationOptionsMarshaller.cs +++ b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteMatrixDestinationOptionsMarshaller.cs @@ -51,19 +51,19 @@ public void Marshall(RouteMatrixDestinationOptions requestObject, JsonMarshaller if(requestObject.IsSetAvoidActionsForDistance()) { context.Writer.WritePropertyName("AvoidActionsForDistance"); - context.Writer.Write(requestObject.AvoidActionsForDistance); + context.Writer.Write(requestObject.AvoidActionsForDistance.Value); } if(requestObject.IsSetHeading()) { context.Writer.WritePropertyName("Heading"); - if(StringUtils.IsSpecialDoubleValue(requestObject.Heading)) + if(StringUtils.IsSpecialDoubleValue(requestObject.Heading.Value)) { - context.Writer.Write(StringUtils.FromSpecialDoubleValue(requestObject.Heading)); + context.Writer.Write(StringUtils.FromSpecialDoubleValue(requestObject.Heading.Value)); } else { - context.Writer.Write(requestObject.Heading); + context.Writer.Write(requestObject.Heading.Value); } } diff --git a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteMatrixEntryUnmarshaller.cs b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteMatrixEntryUnmarshaller.cs index a125881ca7f7..40bcc526aa09 100644 --- a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteMatrixEntryUnmarshaller.cs +++ b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteMatrixEntryUnmarshaller.cs @@ -68,13 +68,13 @@ public RouteMatrixEntry Unmarshall(JsonUnmarshallerContext context) { if (context.TestExpression("Distance", targetDepth)) { - var unmarshaller = LongUnmarshaller.Instance; + var unmarshaller = NullableLongUnmarshaller.Instance; unmarshalledObject.Distance = unmarshaller.Unmarshall(context); continue; } if (context.TestExpression("Duration", targetDepth)) { - var unmarshaller = LongUnmarshaller.Instance; + var unmarshaller = NullableLongUnmarshaller.Instance; unmarshalledObject.Duration = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteMatrixMatchingOptionsMarshaller.cs b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteMatrixMatchingOptionsMarshaller.cs index 9e19dc5abaf3..16f826d73521 100644 --- a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteMatrixMatchingOptionsMarshaller.cs +++ b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteMatrixMatchingOptionsMarshaller.cs @@ -57,13 +57,13 @@ public void Marshall(RouteMatrixMatchingOptions requestObject, JsonMarshallerCon if(requestObject.IsSetOnRoadThreshold()) { context.Writer.WritePropertyName("OnRoadThreshold"); - context.Writer.Write(requestObject.OnRoadThreshold); + context.Writer.Write(requestObject.OnRoadThreshold.Value); } if(requestObject.IsSetRadius()) { context.Writer.WritePropertyName("Radius"); - context.Writer.Write(requestObject.Radius); + context.Writer.Write(requestObject.Radius.Value); } if(requestObject.IsSetStrategy()) diff --git a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteMatrixOriginOptionsMarshaller.cs b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteMatrixOriginOptionsMarshaller.cs index 469454f76de2..9989e9da989d 100644 --- a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteMatrixOriginOptionsMarshaller.cs +++ b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteMatrixOriginOptionsMarshaller.cs @@ -51,19 +51,19 @@ public void Marshall(RouteMatrixOriginOptions requestObject, JsonMarshallerConte if(requestObject.IsSetAvoidActionsForDistance()) { context.Writer.WritePropertyName("AvoidActionsForDistance"); - context.Writer.Write(requestObject.AvoidActionsForDistance); + context.Writer.Write(requestObject.AvoidActionsForDistance.Value); } if(requestObject.IsSetHeading()) { context.Writer.WritePropertyName("Heading"); - if(StringUtils.IsSpecialDoubleValue(requestObject.Heading)) + if(StringUtils.IsSpecialDoubleValue(requestObject.Heading.Value)) { - context.Writer.Write(StringUtils.FromSpecialDoubleValue(requestObject.Heading)); + context.Writer.Write(StringUtils.FromSpecialDoubleValue(requestObject.Heading.Value)); } else { - context.Writer.Write(requestObject.Heading); + context.Writer.Write(requestObject.Heading.Value); } } diff --git a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteMatrixScooterOptionsMarshaller.cs b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteMatrixScooterOptionsMarshaller.cs index 17fbd77e22e8..669366ee33e8 100644 --- a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteMatrixScooterOptionsMarshaller.cs +++ b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteMatrixScooterOptionsMarshaller.cs @@ -62,20 +62,20 @@ public void Marshall(RouteMatrixScooterOptions requestObject, JsonMarshallerCont if(requestObject.IsSetMaxSpeed()) { context.Writer.WritePropertyName("MaxSpeed"); - if(StringUtils.IsSpecialDoubleValue(requestObject.MaxSpeed)) + if(StringUtils.IsSpecialDoubleValue(requestObject.MaxSpeed.Value)) { - context.Writer.Write(StringUtils.FromSpecialDoubleValue(requestObject.MaxSpeed)); + context.Writer.Write(StringUtils.FromSpecialDoubleValue(requestObject.MaxSpeed.Value)); } else { - context.Writer.Write(requestObject.MaxSpeed); + context.Writer.Write(requestObject.MaxSpeed.Value); } } if(requestObject.IsSetOccupancy()) { context.Writer.WritePropertyName("Occupancy"); - context.Writer.Write(requestObject.Occupancy); + context.Writer.Write(requestObject.Occupancy.Value); } } diff --git a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteMatrixTrafficOptionsMarshaller.cs b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteMatrixTrafficOptionsMarshaller.cs index c738991d651b..d4a19a209d0e 100644 --- a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteMatrixTrafficOptionsMarshaller.cs +++ b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteMatrixTrafficOptionsMarshaller.cs @@ -51,7 +51,7 @@ public void Marshall(RouteMatrixTrafficOptions requestObject, JsonMarshallerCont if(requestObject.IsSetFlowEventThresholdOverride()) { context.Writer.WritePropertyName("FlowEventThresholdOverride"); - context.Writer.Write(requestObject.FlowEventThresholdOverride); + context.Writer.Write(requestObject.FlowEventThresholdOverride.Value); } if(requestObject.IsSetUsage()) diff --git a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteMatrixTrailerOptionsMarshaller.cs b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteMatrixTrailerOptionsMarshaller.cs index 803bb9ee54c5..248a41a49ad0 100644 --- a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteMatrixTrailerOptionsMarshaller.cs +++ b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteMatrixTrailerOptionsMarshaller.cs @@ -51,7 +51,7 @@ public void Marshall(RouteMatrixTrailerOptions requestObject, JsonMarshallerCont if(requestObject.IsSetTrailerCount()) { context.Writer.WritePropertyName("TrailerCount"); - context.Writer.Write(requestObject.TrailerCount); + context.Writer.Write(requestObject.TrailerCount.Value); } } diff --git a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteMatrixTruckOptionsMarshaller.cs b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteMatrixTruckOptionsMarshaller.cs index f6444eb09fed..6efc5678c7a4 100644 --- a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteMatrixTruckOptionsMarshaller.cs +++ b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteMatrixTruckOptionsMarshaller.cs @@ -51,13 +51,13 @@ public void Marshall(RouteMatrixTruckOptions requestObject, JsonMarshallerContex if(requestObject.IsSetAxleCount()) { context.Writer.WritePropertyName("AxleCount"); - context.Writer.Write(requestObject.AxleCount); + context.Writer.Write(requestObject.AxleCount.Value); } if(requestObject.IsSetGrossWeight()) { context.Writer.WritePropertyName("GrossWeight"); - context.Writer.Write(requestObject.GrossWeight); + context.Writer.Write(requestObject.GrossWeight.Value); } if(requestObject.IsSetHazardousCargos()) @@ -74,19 +74,19 @@ public void Marshall(RouteMatrixTruckOptions requestObject, JsonMarshallerContex if(requestObject.IsSetHeight()) { context.Writer.WritePropertyName("Height"); - context.Writer.Write(requestObject.Height); + context.Writer.Write(requestObject.Height.Value); } if(requestObject.IsSetKpraLength()) { context.Writer.WritePropertyName("KpraLength"); - context.Writer.Write(requestObject.KpraLength); + context.Writer.Write(requestObject.KpraLength.Value); } if(requestObject.IsSetLength()) { context.Writer.WritePropertyName("Length"); - context.Writer.Write(requestObject.Length); + context.Writer.Write(requestObject.Length.Value); } if(requestObject.IsSetLicensePlate()) @@ -103,26 +103,26 @@ public void Marshall(RouteMatrixTruckOptions requestObject, JsonMarshallerContex if(requestObject.IsSetMaxSpeed()) { context.Writer.WritePropertyName("MaxSpeed"); - if(StringUtils.IsSpecialDoubleValue(requestObject.MaxSpeed)) + if(StringUtils.IsSpecialDoubleValue(requestObject.MaxSpeed.Value)) { - context.Writer.Write(StringUtils.FromSpecialDoubleValue(requestObject.MaxSpeed)); + context.Writer.Write(StringUtils.FromSpecialDoubleValue(requestObject.MaxSpeed.Value)); } else { - context.Writer.Write(requestObject.MaxSpeed); + context.Writer.Write(requestObject.MaxSpeed.Value); } } if(requestObject.IsSetOccupancy()) { context.Writer.WritePropertyName("Occupancy"); - context.Writer.Write(requestObject.Occupancy); + context.Writer.Write(requestObject.Occupancy.Value); } if(requestObject.IsSetPayloadCapacity()) { context.Writer.WritePropertyName("PayloadCapacity"); - context.Writer.Write(requestObject.PayloadCapacity); + context.Writer.Write(requestObject.PayloadCapacity.Value); } if(requestObject.IsSetTrailer()) @@ -151,7 +151,7 @@ public void Marshall(RouteMatrixTruckOptions requestObject, JsonMarshallerContex if(requestObject.IsSetWeightPerAxle()) { context.Writer.WritePropertyName("WeightPerAxle"); - context.Writer.Write(requestObject.WeightPerAxle); + context.Writer.Write(requestObject.WeightPerAxle.Value); } if(requestObject.IsSetWeightPerAxleGroup()) @@ -168,7 +168,7 @@ public void Marshall(RouteMatrixTruckOptions requestObject, JsonMarshallerContex if(requestObject.IsSetWidth()) { context.Writer.WritePropertyName("Width"); - context.Writer.Write(requestObject.Width); + context.Writer.Write(requestObject.Width.Value); } } diff --git a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteNoticeDetailRangeUnmarshaller.cs b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteNoticeDetailRangeUnmarshaller.cs index 1cef9f6798ac..c3346a33d0fd 100644 --- a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteNoticeDetailRangeUnmarshaller.cs +++ b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteNoticeDetailRangeUnmarshaller.cs @@ -68,13 +68,13 @@ public RouteNoticeDetailRange Unmarshall(JsonUnmarshallerContext context) { if (context.TestExpression("Max", targetDepth)) { - var unmarshaller = IntUnmarshaller.Instance; + var unmarshaller = NullableIntUnmarshaller.Instance; unmarshalledObject.Max = unmarshaller.Unmarshall(context); continue; } if (context.TestExpression("Min", targetDepth)) { - var unmarshaller = IntUnmarshaller.Instance; + var unmarshaller = NullableIntUnmarshaller.Instance; unmarshalledObject.Min = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteOriginOptionsMarshaller.cs b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteOriginOptionsMarshaller.cs index 1db7dfc8580d..4bf895f1039e 100644 --- a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteOriginOptionsMarshaller.cs +++ b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteOriginOptionsMarshaller.cs @@ -51,25 +51,25 @@ public void Marshall(RouteOriginOptions requestObject, JsonMarshallerContext con if(requestObject.IsSetAvoidActionsForDistance()) { context.Writer.WritePropertyName("AvoidActionsForDistance"); - context.Writer.Write(requestObject.AvoidActionsForDistance); + context.Writer.Write(requestObject.AvoidActionsForDistance.Value); } if(requestObject.IsSetAvoidUTurns()) { context.Writer.WritePropertyName("AvoidUTurns"); - context.Writer.Write(requestObject.AvoidUTurns); + context.Writer.Write(requestObject.AvoidUTurns.Value); } if(requestObject.IsSetHeading()) { context.Writer.WritePropertyName("Heading"); - if(StringUtils.IsSpecialDoubleValue(requestObject.Heading)) + if(StringUtils.IsSpecialDoubleValue(requestObject.Heading.Value)) { - context.Writer.Write(StringUtils.FromSpecialDoubleValue(requestObject.Heading)); + context.Writer.Write(StringUtils.FromSpecialDoubleValue(requestObject.Heading.Value)); } else { - context.Writer.Write(requestObject.Heading); + context.Writer.Write(requestObject.Heading.Value); } } diff --git a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RoutePassThroughPlaceUnmarshaller.cs b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RoutePassThroughPlaceUnmarshaller.cs index d910d5f14a08..348337cebe42 100644 --- a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RoutePassThroughPlaceUnmarshaller.cs +++ b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RoutePassThroughPlaceUnmarshaller.cs @@ -80,7 +80,7 @@ public RoutePassThroughPlace Unmarshall(JsonUnmarshallerContext context) } if (context.TestExpression("WaypointIndex", targetDepth)) { - var unmarshaller = IntUnmarshaller.Instance; + var unmarshaller = NullableIntUnmarshaller.Instance; unmarshalledObject.WaypointIndex = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RoutePassThroughWaypointUnmarshaller.cs b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RoutePassThroughWaypointUnmarshaller.cs index 08b2987c2b06..896ab0a47e7e 100644 --- a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RoutePassThroughWaypointUnmarshaller.cs +++ b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RoutePassThroughWaypointUnmarshaller.cs @@ -68,7 +68,7 @@ public RoutePassThroughWaypoint Unmarshall(JsonUnmarshallerContext context) { if (context.TestExpression("GeometryOffset", targetDepth)) { - var unmarshaller = IntUnmarshaller.Instance; + var unmarshaller = NullableIntUnmarshaller.Instance; unmarshalledObject.GeometryOffset = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RoutePedestrianOptionsMarshaller.cs b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RoutePedestrianOptionsMarshaller.cs index f23cf70c46fa..e5c1a67ce504 100644 --- a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RoutePedestrianOptionsMarshaller.cs +++ b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RoutePedestrianOptionsMarshaller.cs @@ -51,13 +51,13 @@ public void Marshall(RoutePedestrianOptions requestObject, JsonMarshallerContext if(requestObject.IsSetSpeed()) { context.Writer.WritePropertyName("Speed"); - if(StringUtils.IsSpecialDoubleValue(requestObject.Speed)) + if(StringUtils.IsSpecialDoubleValue(requestObject.Speed.Value)) { - context.Writer.Write(StringUtils.FromSpecialDoubleValue(requestObject.Speed)); + context.Writer.Write(StringUtils.FromSpecialDoubleValue(requestObject.Speed.Value)); } else { - context.Writer.Write(requestObject.Speed); + context.Writer.Write(requestObject.Speed.Value); } } diff --git a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RoutePedestrianOverviewSummaryUnmarshaller.cs b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RoutePedestrianOverviewSummaryUnmarshaller.cs index 04d322227193..1ab1c5946e63 100644 --- a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RoutePedestrianOverviewSummaryUnmarshaller.cs +++ b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RoutePedestrianOverviewSummaryUnmarshaller.cs @@ -68,13 +68,13 @@ public RoutePedestrianOverviewSummary Unmarshall(JsonUnmarshallerContext context { if (context.TestExpression("Distance", targetDepth)) { - var unmarshaller = LongUnmarshaller.Instance; + var unmarshaller = NullableLongUnmarshaller.Instance; unmarshalledObject.Distance = unmarshaller.Unmarshall(context); continue; } if (context.TestExpression("Duration", targetDepth)) { - var unmarshaller = LongUnmarshaller.Instance; + var unmarshaller = NullableLongUnmarshaller.Instance; unmarshalledObject.Duration = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RoutePedestrianPlaceUnmarshaller.cs b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RoutePedestrianPlaceUnmarshaller.cs index 45911fa6f72b..0445472d5fd0 100644 --- a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RoutePedestrianPlaceUnmarshaller.cs +++ b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RoutePedestrianPlaceUnmarshaller.cs @@ -92,7 +92,7 @@ public RoutePedestrianPlace Unmarshall(JsonUnmarshallerContext context) } if (context.TestExpression("WaypointIndex", targetDepth)) { - var unmarshaller = IntUnmarshaller.Instance; + var unmarshaller = NullableIntUnmarshaller.Instance; unmarshalledObject.WaypointIndex = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RoutePedestrianSpanUnmarshaller.cs b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RoutePedestrianSpanUnmarshaller.cs index b66f0f8cb1d0..4f67b985140a 100644 --- a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RoutePedestrianSpanUnmarshaller.cs +++ b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RoutePedestrianSpanUnmarshaller.cs @@ -68,7 +68,7 @@ public RoutePedestrianSpan Unmarshall(JsonUnmarshallerContext context) { if (context.TestExpression("BestCaseDuration", targetDepth)) { - var unmarshaller = LongUnmarshaller.Instance; + var unmarshaller = NullableLongUnmarshaller.Instance; unmarshalledObject.BestCaseDuration = unmarshaller.Unmarshall(context); continue; } @@ -80,13 +80,13 @@ public RoutePedestrianSpan Unmarshall(JsonUnmarshallerContext context) } if (context.TestExpression("Distance", targetDepth)) { - var unmarshaller = LongUnmarshaller.Instance; + var unmarshaller = NullableLongUnmarshaller.Instance; unmarshalledObject.Distance = unmarshaller.Unmarshall(context); continue; } if (context.TestExpression("Duration", targetDepth)) { - var unmarshaller = LongUnmarshaller.Instance; + var unmarshaller = NullableLongUnmarshaller.Instance; unmarshalledObject.Duration = unmarshaller.Unmarshall(context); continue; } @@ -98,13 +98,13 @@ public RoutePedestrianSpan Unmarshall(JsonUnmarshallerContext context) } if (context.TestExpression("FunctionalClassification", targetDepth)) { - var unmarshaller = IntUnmarshaller.Instance; + var unmarshaller = NullableIntUnmarshaller.Instance; unmarshalledObject.FunctionalClassification = unmarshaller.Unmarshall(context); continue; } if (context.TestExpression("GeometryOffset", targetDepth)) { - var unmarshaller = IntUnmarshaller.Instance; + var unmarshaller = NullableIntUnmarshaller.Instance; unmarshalledObject.GeometryOffset = unmarshaller.Unmarshall(context); continue; } @@ -152,7 +152,7 @@ public RoutePedestrianSpan Unmarshall(JsonUnmarshallerContext context) } if (context.TestExpression("TypicalDuration", targetDepth)) { - var unmarshaller = LongUnmarshaller.Instance; + var unmarshaller = NullableLongUnmarshaller.Instance; unmarshalledObject.TypicalDuration = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RoutePedestrianTravelOnlySummaryUnmarshaller.cs b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RoutePedestrianTravelOnlySummaryUnmarshaller.cs index 048468ada323..b9e386394671 100644 --- a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RoutePedestrianTravelOnlySummaryUnmarshaller.cs +++ b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RoutePedestrianTravelOnlySummaryUnmarshaller.cs @@ -68,7 +68,7 @@ public RoutePedestrianTravelOnlySummary Unmarshall(JsonUnmarshallerContext conte { if (context.TestExpression("Duration", targetDepth)) { - var unmarshaller = LongUnmarshaller.Instance; + var unmarshaller = NullableLongUnmarshaller.Instance; unmarshalledObject.Duration = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RoutePedestrianTravelStepUnmarshaller.cs b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RoutePedestrianTravelStepUnmarshaller.cs index 2813582e2acf..964a76686e8b 100644 --- a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RoutePedestrianTravelStepUnmarshaller.cs +++ b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RoutePedestrianTravelStepUnmarshaller.cs @@ -80,13 +80,13 @@ public RoutePedestrianTravelStep Unmarshall(JsonUnmarshallerContext context) } if (context.TestExpression("Distance", targetDepth)) { - var unmarshaller = LongUnmarshaller.Instance; + var unmarshaller = NullableLongUnmarshaller.Instance; unmarshalledObject.Distance = unmarshaller.Unmarshall(context); continue; } if (context.TestExpression("Duration", targetDepth)) { - var unmarshaller = LongUnmarshaller.Instance; + var unmarshaller = NullableLongUnmarshaller.Instance; unmarshalledObject.Duration = unmarshaller.Unmarshall(context); continue; } @@ -98,7 +98,7 @@ public RoutePedestrianTravelStep Unmarshall(JsonUnmarshallerContext context) } if (context.TestExpression("GeometryOffset", targetDepth)) { - var unmarshaller = IntUnmarshaller.Instance; + var unmarshaller = NullableIntUnmarshaller.Instance; unmarshalledObject.GeometryOffset = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteRampStepDetailsUnmarshaller.cs b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteRampStepDetailsUnmarshaller.cs index 683fbf618562..d798e353ebac 100644 --- a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteRampStepDetailsUnmarshaller.cs +++ b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteRampStepDetailsUnmarshaller.cs @@ -80,7 +80,7 @@ public RouteRampStepDetails Unmarshall(JsonUnmarshallerContext context) } if (context.TestExpression("TurnAngle", targetDepth)) { - var unmarshaller = DoubleUnmarshaller.Instance; + var unmarshaller = NullableDoubleUnmarshaller.Instance; unmarshalledObject.TurnAngle = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteRoundaboutEnterStepDetailsUnmarshaller.cs b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteRoundaboutEnterStepDetailsUnmarshaller.cs index c20519c379a2..d6e7820de55b 100644 --- a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteRoundaboutEnterStepDetailsUnmarshaller.cs +++ b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteRoundaboutEnterStepDetailsUnmarshaller.cs @@ -80,7 +80,7 @@ public RouteRoundaboutEnterStepDetails Unmarshall(JsonUnmarshallerContext contex } if (context.TestExpression("TurnAngle", targetDepth)) { - var unmarshaller = DoubleUnmarshaller.Instance; + var unmarshaller = NullableDoubleUnmarshaller.Instance; unmarshalledObject.TurnAngle = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteRoundaboutExitStepDetailsUnmarshaller.cs b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteRoundaboutExitStepDetailsUnmarshaller.cs index 2be3e7289a99..82fe5ed9c2b6 100644 --- a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteRoundaboutExitStepDetailsUnmarshaller.cs +++ b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteRoundaboutExitStepDetailsUnmarshaller.cs @@ -74,13 +74,13 @@ public RouteRoundaboutExitStepDetails Unmarshall(JsonUnmarshallerContext context } if (context.TestExpression("RelativeExit", targetDepth)) { - var unmarshaller = IntUnmarshaller.Instance; + var unmarshaller = NullableIntUnmarshaller.Instance; unmarshalledObject.RelativeExit = unmarshaller.Unmarshall(context); continue; } if (context.TestExpression("RoundaboutAngle", targetDepth)) { - var unmarshaller = DoubleUnmarshaller.Instance; + var unmarshaller = NullableDoubleUnmarshaller.Instance; unmarshalledObject.RoundaboutAngle = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteRoundaboutPassStepDetailsUnmarshaller.cs b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteRoundaboutPassStepDetailsUnmarshaller.cs index b0be437be5a8..98085e4178a3 100644 --- a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteRoundaboutPassStepDetailsUnmarshaller.cs +++ b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteRoundaboutPassStepDetailsUnmarshaller.cs @@ -80,7 +80,7 @@ public RouteRoundaboutPassStepDetails Unmarshall(JsonUnmarshallerContext context } if (context.TestExpression("TurnAngle", targetDepth)) { - var unmarshaller = DoubleUnmarshaller.Instance; + var unmarshaller = NullableDoubleUnmarshaller.Instance; unmarshalledObject.TurnAngle = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteScooterOptionsMarshaller.cs b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteScooterOptionsMarshaller.cs index 26b77965229d..ea0f51559ef2 100644 --- a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteScooterOptionsMarshaller.cs +++ b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteScooterOptionsMarshaller.cs @@ -68,20 +68,20 @@ public void Marshall(RouteScooterOptions requestObject, JsonMarshallerContext co if(requestObject.IsSetMaxSpeed()) { context.Writer.WritePropertyName("MaxSpeed"); - if(StringUtils.IsSpecialDoubleValue(requestObject.MaxSpeed)) + if(StringUtils.IsSpecialDoubleValue(requestObject.MaxSpeed.Value)) { - context.Writer.Write(StringUtils.FromSpecialDoubleValue(requestObject.MaxSpeed)); + context.Writer.Write(StringUtils.FromSpecialDoubleValue(requestObject.MaxSpeed.Value)); } else { - context.Writer.Write(requestObject.MaxSpeed); + context.Writer.Write(requestObject.MaxSpeed.Value); } } if(requestObject.IsSetOccupancy()) { context.Writer.WritePropertyName("Occupancy"); - context.Writer.Write(requestObject.Occupancy); + context.Writer.Write(requestObject.Occupancy.Value); } } diff --git a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteSpanDynamicSpeedDetailsUnmarshaller.cs b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteSpanDynamicSpeedDetailsUnmarshaller.cs index 0929136f26fe..4b66d8a6486f 100644 --- a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteSpanDynamicSpeedDetailsUnmarshaller.cs +++ b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteSpanDynamicSpeedDetailsUnmarshaller.cs @@ -68,19 +68,19 @@ public RouteSpanDynamicSpeedDetails Unmarshall(JsonUnmarshallerContext context) { if (context.TestExpression("BestCaseSpeed", targetDepth)) { - var unmarshaller = DoubleUnmarshaller.Instance; + var unmarshaller = NullableDoubleUnmarshaller.Instance; unmarshalledObject.BestCaseSpeed = unmarshaller.Unmarshall(context); continue; } if (context.TestExpression("TurnDuration", targetDepth)) { - var unmarshaller = LongUnmarshaller.Instance; + var unmarshaller = NullableLongUnmarshaller.Instance; unmarshalledObject.TurnDuration = unmarshaller.Unmarshall(context); continue; } if (context.TestExpression("TypicalSpeed", targetDepth)) { - var unmarshaller = DoubleUnmarshaller.Instance; + var unmarshaller = NullableDoubleUnmarshaller.Instance; unmarshalledObject.TypicalSpeed = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteSpanSpeedLimitDetailsUnmarshaller.cs b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteSpanSpeedLimitDetailsUnmarshaller.cs index 7138548e3e15..6c4d40b3f367 100644 --- a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteSpanSpeedLimitDetailsUnmarshaller.cs +++ b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteSpanSpeedLimitDetailsUnmarshaller.cs @@ -68,13 +68,13 @@ public RouteSpanSpeedLimitDetails Unmarshall(JsonUnmarshallerContext context) { if (context.TestExpression("MaxSpeed", targetDepth)) { - var unmarshaller = DoubleUnmarshaller.Instance; + var unmarshaller = NullableDoubleUnmarshaller.Instance; unmarshalledObject.MaxSpeed = unmarshaller.Unmarshall(context); continue; } if (context.TestExpression("Unlimited", targetDepth)) { - var unmarshaller = BoolUnmarshaller.Instance; + var unmarshaller = NullableBoolUnmarshaller.Instance; unmarshalledObject.Unlimited = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteSummaryUnmarshaller.cs b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteSummaryUnmarshaller.cs index dc69ad736643..dcdf4d6afd55 100644 --- a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteSummaryUnmarshaller.cs +++ b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteSummaryUnmarshaller.cs @@ -68,13 +68,13 @@ public RouteSummary Unmarshall(JsonUnmarshallerContext context) { if (context.TestExpression("Distance", targetDepth)) { - var unmarshaller = LongUnmarshaller.Instance; + var unmarshaller = NullableLongUnmarshaller.Instance; unmarshalledObject.Distance = unmarshaller.Unmarshall(context); continue; } if (context.TestExpression("Duration", targetDepth)) { - var unmarshaller = LongUnmarshaller.Instance; + var unmarshaller = NullableLongUnmarshaller.Instance; unmarshalledObject.Duration = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteTollOptionsMarshaller.cs b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteTollOptionsMarshaller.cs index bf74fd86e7f2..f932f9e0c147 100644 --- a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteTollOptionsMarshaller.cs +++ b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteTollOptionsMarshaller.cs @@ -51,13 +51,13 @@ public void Marshall(RouteTollOptions requestObject, JsonMarshallerContext conte if(requestObject.IsSetAllTransponders()) { context.Writer.WritePropertyName("AllTransponders"); - context.Writer.Write(requestObject.AllTransponders); + context.Writer.Write(requestObject.AllTransponders.Value); } if(requestObject.IsSetAllVignettes()) { context.Writer.WritePropertyName("AllVignettes"); - context.Writer.Write(requestObject.AllVignettes); + context.Writer.Write(requestObject.AllVignettes.Value); } if(requestObject.IsSetCurrency()) diff --git a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteTollPassUnmarshaller.cs b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteTollPassUnmarshaller.cs index abe542684cb3..1b513b6fb1d4 100644 --- a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteTollPassUnmarshaller.cs +++ b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteTollPassUnmarshaller.cs @@ -68,25 +68,25 @@ public RouteTollPass Unmarshall(JsonUnmarshallerContext context) { if (context.TestExpression("IncludesReturnTrip", targetDepth)) { - var unmarshaller = BoolUnmarshaller.Instance; + var unmarshaller = NullableBoolUnmarshaller.Instance; unmarshalledObject.IncludesReturnTrip = unmarshaller.Unmarshall(context); continue; } if (context.TestExpression("SeniorPass", targetDepth)) { - var unmarshaller = BoolUnmarshaller.Instance; + var unmarshaller = NullableBoolUnmarshaller.Instance; unmarshalledObject.SeniorPass = unmarshaller.Unmarshall(context); continue; } if (context.TestExpression("TransferCount", targetDepth)) { - var unmarshaller = IntUnmarshaller.Instance; + var unmarshaller = NullableIntUnmarshaller.Instance; unmarshalledObject.TransferCount = unmarshaller.Unmarshall(context); continue; } if (context.TestExpression("TripCount", targetDepth)) { - var unmarshaller = IntUnmarshaller.Instance; + var unmarshaller = NullableIntUnmarshaller.Instance; unmarshalledObject.TripCount = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteTollPassValidityPeriodUnmarshaller.cs b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteTollPassValidityPeriodUnmarshaller.cs index 4047d00ebf93..22ef9faf9c81 100644 --- a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteTollPassValidityPeriodUnmarshaller.cs +++ b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteTollPassValidityPeriodUnmarshaller.cs @@ -74,7 +74,7 @@ public RouteTollPassValidityPeriod Unmarshall(JsonUnmarshallerContext context) } if (context.TestExpression("PeriodCount", targetDepth)) { - var unmarshaller = IntUnmarshaller.Instance; + var unmarshaller = NullableIntUnmarshaller.Instance; unmarshalledObject.PeriodCount = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteTollPriceSummaryUnmarshaller.cs b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteTollPriceSummaryUnmarshaller.cs index 4c0837dd8ddc..c191401adc70 100644 --- a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteTollPriceSummaryUnmarshaller.cs +++ b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteTollPriceSummaryUnmarshaller.cs @@ -74,13 +74,13 @@ public RouteTollPriceSummary Unmarshall(JsonUnmarshallerContext context) } if (context.TestExpression("Estimate", targetDepth)) { - var unmarshaller = BoolUnmarshaller.Instance; + var unmarshaller = NullableBoolUnmarshaller.Instance; unmarshalledObject.Estimate = unmarshaller.Unmarshall(context); continue; } if (context.TestExpression("Range", targetDepth)) { - var unmarshaller = BoolUnmarshaller.Instance; + var unmarshaller = NullableBoolUnmarshaller.Instance; unmarshalledObject.Range = unmarshaller.Unmarshall(context); continue; } @@ -92,7 +92,7 @@ public RouteTollPriceSummary Unmarshall(JsonUnmarshallerContext context) } if (context.TestExpression("Value", targetDepth)) { - var unmarshaller = DoubleUnmarshaller.Instance; + var unmarshaller = NullableDoubleUnmarshaller.Instance; unmarshalledObject.Value = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteTollPriceUnmarshaller.cs b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteTollPriceUnmarshaller.cs index afaedce52de3..e67725cae333 100644 --- a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteTollPriceUnmarshaller.cs +++ b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteTollPriceUnmarshaller.cs @@ -74,19 +74,19 @@ public RouteTollPrice Unmarshall(JsonUnmarshallerContext context) } if (context.TestExpression("Estimate", targetDepth)) { - var unmarshaller = BoolUnmarshaller.Instance; + var unmarshaller = NullableBoolUnmarshaller.Instance; unmarshalledObject.Estimate = unmarshaller.Unmarshall(context); continue; } if (context.TestExpression("PerDuration", targetDepth)) { - var unmarshaller = LongUnmarshaller.Instance; + var unmarshaller = NullableLongUnmarshaller.Instance; unmarshalledObject.PerDuration = unmarshaller.Unmarshall(context); continue; } if (context.TestExpression("Range", targetDepth)) { - var unmarshaller = BoolUnmarshaller.Instance; + var unmarshaller = NullableBoolUnmarshaller.Instance; unmarshalledObject.Range = unmarshaller.Unmarshall(context); continue; } @@ -98,7 +98,7 @@ public RouteTollPrice Unmarshall(JsonUnmarshallerContext context) } if (context.TestExpression("Value", targetDepth)) { - var unmarshaller = DoubleUnmarshaller.Instance; + var unmarshaller = NullableDoubleUnmarshaller.Instance; unmarshalledObject.Value = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteTollPriceValueRangeUnmarshaller.cs b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteTollPriceValueRangeUnmarshaller.cs index e336e0796a82..988a9291fe4b 100644 --- a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteTollPriceValueRangeUnmarshaller.cs +++ b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteTollPriceValueRangeUnmarshaller.cs @@ -68,13 +68,13 @@ public RouteTollPriceValueRange Unmarshall(JsonUnmarshallerContext context) { if (context.TestExpression("Max", targetDepth)) { - var unmarshaller = DoubleUnmarshaller.Instance; + var unmarshaller = NullableDoubleUnmarshaller.Instance; unmarshalledObject.Max = unmarshaller.Unmarshall(context); continue; } if (context.TestExpression("Min", targetDepth)) { - var unmarshaller = DoubleUnmarshaller.Instance; + var unmarshaller = NullableDoubleUnmarshaller.Instance; unmarshalledObject.Min = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteTrafficOptionsMarshaller.cs b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteTrafficOptionsMarshaller.cs index ea85f40f5ef2..f098d0e83e1c 100644 --- a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteTrafficOptionsMarshaller.cs +++ b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteTrafficOptionsMarshaller.cs @@ -51,7 +51,7 @@ public void Marshall(RouteTrafficOptions requestObject, JsonMarshallerContext co if(requestObject.IsSetFlowEventThresholdOverride()) { context.Writer.WritePropertyName("FlowEventThresholdOverride"); - context.Writer.Write(requestObject.FlowEventThresholdOverride); + context.Writer.Write(requestObject.FlowEventThresholdOverride.Value); } if(requestObject.IsSetUsage()) diff --git a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteTrailerOptionsMarshaller.cs b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteTrailerOptionsMarshaller.cs index e9535574d86b..e5dbac41d2d8 100644 --- a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteTrailerOptionsMarshaller.cs +++ b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteTrailerOptionsMarshaller.cs @@ -51,13 +51,13 @@ public void Marshall(RouteTrailerOptions requestObject, JsonMarshallerContext co if(requestObject.IsSetAxleCount()) { context.Writer.WritePropertyName("AxleCount"); - context.Writer.Write(requestObject.AxleCount); + context.Writer.Write(requestObject.AxleCount.Value); } if(requestObject.IsSetTrailerCount()) { context.Writer.WritePropertyName("TrailerCount"); - context.Writer.Write(requestObject.TrailerCount); + context.Writer.Write(requestObject.TrailerCount.Value); } } diff --git a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteTruckOptionsMarshaller.cs b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteTruckOptionsMarshaller.cs index 4445430984ab..c61de62b6363 100644 --- a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteTruckOptionsMarshaller.cs +++ b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteTruckOptionsMarshaller.cs @@ -51,7 +51,7 @@ public void Marshall(RouteTruckOptions requestObject, JsonMarshallerContext cont if(requestObject.IsSetAxleCount()) { context.Writer.WritePropertyName("AxleCount"); - context.Writer.Write(requestObject.AxleCount); + context.Writer.Write(requestObject.AxleCount.Value); } if(requestObject.IsSetEngineType()) @@ -63,7 +63,7 @@ public void Marshall(RouteTruckOptions requestObject, JsonMarshallerContext cont if(requestObject.IsSetGrossWeight()) { context.Writer.WritePropertyName("GrossWeight"); - context.Writer.Write(requestObject.GrossWeight); + context.Writer.Write(requestObject.GrossWeight.Value); } if(requestObject.IsSetHazardousCargos()) @@ -80,25 +80,25 @@ public void Marshall(RouteTruckOptions requestObject, JsonMarshallerContext cont if(requestObject.IsSetHeight()) { context.Writer.WritePropertyName("Height"); - context.Writer.Write(requestObject.Height); + context.Writer.Write(requestObject.Height.Value); } if(requestObject.IsSetHeightAboveFirstAxle()) { context.Writer.WritePropertyName("HeightAboveFirstAxle"); - context.Writer.Write(requestObject.HeightAboveFirstAxle); + context.Writer.Write(requestObject.HeightAboveFirstAxle.Value); } if(requestObject.IsSetKpraLength()) { context.Writer.WritePropertyName("KpraLength"); - context.Writer.Write(requestObject.KpraLength); + context.Writer.Write(requestObject.KpraLength.Value); } if(requestObject.IsSetLength()) { context.Writer.WritePropertyName("Length"); - context.Writer.Write(requestObject.Length); + context.Writer.Write(requestObject.Length.Value); } if(requestObject.IsSetLicensePlate()) @@ -115,32 +115,32 @@ public void Marshall(RouteTruckOptions requestObject, JsonMarshallerContext cont if(requestObject.IsSetMaxSpeed()) { context.Writer.WritePropertyName("MaxSpeed"); - if(StringUtils.IsSpecialDoubleValue(requestObject.MaxSpeed)) + if(StringUtils.IsSpecialDoubleValue(requestObject.MaxSpeed.Value)) { - context.Writer.Write(StringUtils.FromSpecialDoubleValue(requestObject.MaxSpeed)); + context.Writer.Write(StringUtils.FromSpecialDoubleValue(requestObject.MaxSpeed.Value)); } else { - context.Writer.Write(requestObject.MaxSpeed); + context.Writer.Write(requestObject.MaxSpeed.Value); } } if(requestObject.IsSetOccupancy()) { context.Writer.WritePropertyName("Occupancy"); - context.Writer.Write(requestObject.Occupancy); + context.Writer.Write(requestObject.Occupancy.Value); } if(requestObject.IsSetPayloadCapacity()) { context.Writer.WritePropertyName("PayloadCapacity"); - context.Writer.Write(requestObject.PayloadCapacity); + context.Writer.Write(requestObject.PayloadCapacity.Value); } if(requestObject.IsSetTireCount()) { context.Writer.WritePropertyName("TireCount"); - context.Writer.Write(requestObject.TireCount); + context.Writer.Write(requestObject.TireCount.Value); } if(requestObject.IsSetTrailer()) @@ -169,7 +169,7 @@ public void Marshall(RouteTruckOptions requestObject, JsonMarshallerContext cont if(requestObject.IsSetWeightPerAxle()) { context.Writer.WritePropertyName("WeightPerAxle"); - context.Writer.Write(requestObject.WeightPerAxle); + context.Writer.Write(requestObject.WeightPerAxle.Value); } if(requestObject.IsSetWeightPerAxleGroup()) @@ -186,7 +186,7 @@ public void Marshall(RouteTruckOptions requestObject, JsonMarshallerContext cont if(requestObject.IsSetWidth()) { context.Writer.WritePropertyName("Width"); - context.Writer.Write(requestObject.Width); + context.Writer.Write(requestObject.Width.Value); } } diff --git a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteTurnStepDetailsUnmarshaller.cs b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteTurnStepDetailsUnmarshaller.cs index 48206bea5e90..c36a05aa16ae 100644 --- a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteTurnStepDetailsUnmarshaller.cs +++ b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteTurnStepDetailsUnmarshaller.cs @@ -80,7 +80,7 @@ public RouteTurnStepDetails Unmarshall(JsonUnmarshallerContext context) } if (context.TestExpression("TurnAngle", targetDepth)) { - var unmarshaller = DoubleUnmarshaller.Instance; + var unmarshaller = NullableDoubleUnmarshaller.Instance; unmarshalledObject.TurnAngle = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteUTurnStepDetailsUnmarshaller.cs b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteUTurnStepDetailsUnmarshaller.cs index 9d55bd486eef..86a135c2cb27 100644 --- a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteUTurnStepDetailsUnmarshaller.cs +++ b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteUTurnStepDetailsUnmarshaller.cs @@ -80,7 +80,7 @@ public RouteUTurnStepDetails Unmarshall(JsonUnmarshallerContext context) } if (context.TestExpression("TurnAngle", targetDepth)) { - var unmarshaller = DoubleUnmarshaller.Instance; + var unmarshaller = NullableDoubleUnmarshaller.Instance; unmarshalledObject.TurnAngle = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteVehicleOverviewSummaryUnmarshaller.cs b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteVehicleOverviewSummaryUnmarshaller.cs index 370e31d9dfc3..7b7977e7e083 100644 --- a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteVehicleOverviewSummaryUnmarshaller.cs +++ b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteVehicleOverviewSummaryUnmarshaller.cs @@ -68,25 +68,25 @@ public RouteVehicleOverviewSummary Unmarshall(JsonUnmarshallerContext context) { if (context.TestExpression("BestCaseDuration", targetDepth)) { - var unmarshaller = LongUnmarshaller.Instance; + var unmarshaller = NullableLongUnmarshaller.Instance; unmarshalledObject.BestCaseDuration = unmarshaller.Unmarshall(context); continue; } if (context.TestExpression("Distance", targetDepth)) { - var unmarshaller = LongUnmarshaller.Instance; + var unmarshaller = NullableLongUnmarshaller.Instance; unmarshalledObject.Distance = unmarshaller.Unmarshall(context); continue; } if (context.TestExpression("Duration", targetDepth)) { - var unmarshaller = LongUnmarshaller.Instance; + var unmarshaller = NullableLongUnmarshaller.Instance; unmarshalledObject.Duration = unmarshaller.Unmarshall(context); continue; } if (context.TestExpression("TypicalDuration", targetDepth)) { - var unmarshaller = LongUnmarshaller.Instance; + var unmarshaller = NullableLongUnmarshaller.Instance; unmarshalledObject.TypicalDuration = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteVehiclePlaceUnmarshaller.cs b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteVehiclePlaceUnmarshaller.cs index 0f0a28c98b75..4dcbbece89f6 100644 --- a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteVehiclePlaceUnmarshaller.cs +++ b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteVehiclePlaceUnmarshaller.cs @@ -92,7 +92,7 @@ public RouteVehiclePlace Unmarshall(JsonUnmarshallerContext context) } if (context.TestExpression("WaypointIndex", targetDepth)) { - var unmarshaller = IntUnmarshaller.Instance; + var unmarshaller = NullableIntUnmarshaller.Instance; unmarshalledObject.WaypointIndex = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteVehicleSpanUnmarshaller.cs b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteVehicleSpanUnmarshaller.cs index 2e4c063c2dfb..504b2b8a96c1 100644 --- a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteVehicleSpanUnmarshaller.cs +++ b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteVehicleSpanUnmarshaller.cs @@ -68,7 +68,7 @@ public RouteVehicleSpan Unmarshall(JsonUnmarshallerContext context) { if (context.TestExpression("BestCaseDuration", targetDepth)) { - var unmarshaller = LongUnmarshaller.Instance; + var unmarshaller = NullableLongUnmarshaller.Instance; unmarshalledObject.BestCaseDuration = unmarshaller.Unmarshall(context); continue; } @@ -86,13 +86,13 @@ public RouteVehicleSpan Unmarshall(JsonUnmarshallerContext context) } if (context.TestExpression("Distance", targetDepth)) { - var unmarshaller = LongUnmarshaller.Instance; + var unmarshaller = NullableLongUnmarshaller.Instance; unmarshalledObject.Distance = unmarshaller.Unmarshall(context); continue; } if (context.TestExpression("Duration", targetDepth)) { - var unmarshaller = LongUnmarshaller.Instance; + var unmarshaller = NullableLongUnmarshaller.Instance; unmarshalledObject.Duration = unmarshaller.Unmarshall(context); continue; } @@ -104,7 +104,7 @@ public RouteVehicleSpan Unmarshall(JsonUnmarshallerContext context) } if (context.TestExpression("FunctionalClassification", targetDepth)) { - var unmarshaller = IntUnmarshaller.Instance; + var unmarshaller = NullableIntUnmarshaller.Instance; unmarshalledObject.FunctionalClassification = unmarshaller.Unmarshall(context); continue; } @@ -116,7 +116,7 @@ public RouteVehicleSpan Unmarshall(JsonUnmarshallerContext context) } if (context.TestExpression("GeometryOffset", targetDepth)) { - var unmarshaller = IntUnmarshaller.Instance; + var unmarshaller = NullableIntUnmarshaller.Instance; unmarshalledObject.GeometryOffset = unmarshaller.Unmarshall(context); continue; } @@ -194,7 +194,7 @@ public RouteVehicleSpan Unmarshall(JsonUnmarshallerContext context) } if (context.TestExpression("TypicalDuration", targetDepth)) { - var unmarshaller = LongUnmarshaller.Instance; + var unmarshaller = NullableLongUnmarshaller.Instance; unmarshalledObject.TypicalDuration = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteVehicleTravelOnlySummaryUnmarshaller.cs b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteVehicleTravelOnlySummaryUnmarshaller.cs index e7e6c332bfb7..e980bbb7bc49 100644 --- a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteVehicleTravelOnlySummaryUnmarshaller.cs +++ b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteVehicleTravelOnlySummaryUnmarshaller.cs @@ -68,19 +68,19 @@ public RouteVehicleTravelOnlySummary Unmarshall(JsonUnmarshallerContext context) { if (context.TestExpression("BestCaseDuration", targetDepth)) { - var unmarshaller = LongUnmarshaller.Instance; + var unmarshaller = NullableLongUnmarshaller.Instance; unmarshalledObject.BestCaseDuration = unmarshaller.Unmarshall(context); continue; } if (context.TestExpression("Duration", targetDepth)) { - var unmarshaller = LongUnmarshaller.Instance; + var unmarshaller = NullableLongUnmarshaller.Instance; unmarshalledObject.Duration = unmarshaller.Unmarshall(context); continue; } if (context.TestExpression("TypicalDuration", targetDepth)) { - var unmarshaller = LongUnmarshaller.Instance; + var unmarshaller = NullableLongUnmarshaller.Instance; unmarshalledObject.TypicalDuration = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteVehicleTravelStepUnmarshaller.cs b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteVehicleTravelStepUnmarshaller.cs index ff9adce98029..5f8c80a7ab98 100644 --- a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteVehicleTravelStepUnmarshaller.cs +++ b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteVehicleTravelStepUnmarshaller.cs @@ -86,13 +86,13 @@ public RouteVehicleTravelStep Unmarshall(JsonUnmarshallerContext context) } if (context.TestExpression("Distance", targetDepth)) { - var unmarshaller = LongUnmarshaller.Instance; + var unmarshaller = NullableLongUnmarshaller.Instance; unmarshalledObject.Distance = unmarshaller.Unmarshall(context); continue; } if (context.TestExpression("Duration", targetDepth)) { - var unmarshaller = LongUnmarshaller.Instance; + var unmarshaller = NullableLongUnmarshaller.Instance; unmarshalledObject.Duration = unmarshaller.Unmarshall(context); continue; } @@ -116,7 +116,7 @@ public RouteVehicleTravelStep Unmarshall(JsonUnmarshallerContext context) } if (context.TestExpression("GeometryOffset", targetDepth)) { - var unmarshaller = IntUnmarshaller.Instance; + var unmarshaller = NullableIntUnmarshaller.Instance; unmarshalledObject.GeometryOffset = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteViolatedConstraintsUnmarshaller.cs b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteViolatedConstraintsUnmarshaller.cs index 6ba5c8daf4f4..933a9f0afd64 100644 --- a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteViolatedConstraintsUnmarshaller.cs +++ b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteViolatedConstraintsUnmarshaller.cs @@ -68,7 +68,7 @@ public RouteViolatedConstraints Unmarshall(JsonUnmarshallerContext context) { if (context.TestExpression("AllHazardsRestricted", targetDepth)) { - var unmarshaller = BoolUnmarshaller.Instance; + var unmarshaller = NullableBoolUnmarshaller.Instance; unmarshalledObject.AllHazardsRestricted = unmarshaller.Unmarshall(context); continue; } @@ -86,25 +86,25 @@ public RouteViolatedConstraints Unmarshall(JsonUnmarshallerContext context) } if (context.TestExpression("MaxHeight", targetDepth)) { - var unmarshaller = LongUnmarshaller.Instance; + var unmarshaller = NullableLongUnmarshaller.Instance; unmarshalledObject.MaxHeight = unmarshaller.Unmarshall(context); continue; } if (context.TestExpression("MaxKpraLength", targetDepth)) { - var unmarshaller = LongUnmarshaller.Instance; + var unmarshaller = NullableLongUnmarshaller.Instance; unmarshalledObject.MaxKpraLength = unmarshaller.Unmarshall(context); continue; } if (context.TestExpression("MaxLength", targetDepth)) { - var unmarshaller = LongUnmarshaller.Instance; + var unmarshaller = NullableLongUnmarshaller.Instance; unmarshalledObject.MaxLength = unmarshaller.Unmarshall(context); continue; } if (context.TestExpression("MaxPayloadCapacity", targetDepth)) { - var unmarshaller = LongUnmarshaller.Instance; + var unmarshaller = NullableLongUnmarshaller.Instance; unmarshalledObject.MaxPayloadCapacity = unmarshaller.Unmarshall(context); continue; } @@ -116,7 +116,7 @@ public RouteViolatedConstraints Unmarshall(JsonUnmarshallerContext context) } if (context.TestExpression("MaxWeightPerAxle", targetDepth)) { - var unmarshaller = LongUnmarshaller.Instance; + var unmarshaller = NullableLongUnmarshaller.Instance; unmarshalledObject.MaxWeightPerAxle = unmarshaller.Unmarshall(context); continue; } @@ -128,7 +128,7 @@ public RouteViolatedConstraints Unmarshall(JsonUnmarshallerContext context) } if (context.TestExpression("MaxWidth", targetDepth)) { - var unmarshaller = LongUnmarshaller.Instance; + var unmarshaller = NullableLongUnmarshaller.Instance; unmarshalledObject.MaxWidth = unmarshaller.Unmarshall(context); continue; } @@ -146,7 +146,7 @@ public RouteViolatedConstraints Unmarshall(JsonUnmarshallerContext context) } if (context.TestExpression("TimeDependent", targetDepth)) { - var unmarshaller = BoolUnmarshaller.Instance; + var unmarshaller = NullableBoolUnmarshaller.Instance; unmarshalledObject.TimeDependent = unmarshaller.Unmarshall(context); continue; } @@ -158,7 +158,7 @@ public RouteViolatedConstraints Unmarshall(JsonUnmarshallerContext context) } if (context.TestExpression("TravelMode", targetDepth)) { - var unmarshaller = BoolUnmarshaller.Instance; + var unmarshaller = NullableBoolUnmarshaller.Instance; unmarshalledObject.TravelMode = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteWaypointMarshaller.cs b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteWaypointMarshaller.cs index 481517a52d66..881bf4098366 100644 --- a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteWaypointMarshaller.cs +++ b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteWaypointMarshaller.cs @@ -51,25 +51,25 @@ public void Marshall(RouteWaypoint requestObject, JsonMarshallerContext context) if(requestObject.IsSetAvoidActionsForDistance()) { context.Writer.WritePropertyName("AvoidActionsForDistance"); - context.Writer.Write(requestObject.AvoidActionsForDistance); + context.Writer.Write(requestObject.AvoidActionsForDistance.Value); } if(requestObject.IsSetAvoidUTurns()) { context.Writer.WritePropertyName("AvoidUTurns"); - context.Writer.Write(requestObject.AvoidUTurns); + context.Writer.Write(requestObject.AvoidUTurns.Value); } if(requestObject.IsSetHeading()) { context.Writer.WritePropertyName("Heading"); - if(StringUtils.IsSpecialDoubleValue(requestObject.Heading)) + if(StringUtils.IsSpecialDoubleValue(requestObject.Heading.Value)) { - context.Writer.Write(StringUtils.FromSpecialDoubleValue(requestObject.Heading)); + context.Writer.Write(StringUtils.FromSpecialDoubleValue(requestObject.Heading.Value)); } else { - context.Writer.Write(requestObject.Heading); + context.Writer.Write(requestObject.Heading.Value); } } @@ -87,7 +87,7 @@ public void Marshall(RouteWaypoint requestObject, JsonMarshallerContext context) if(requestObject.IsSetPassThrough()) { context.Writer.WritePropertyName("PassThrough"); - context.Writer.Write(requestObject.PassThrough); + context.Writer.Write(requestObject.PassThrough.Value); } if(requestObject.IsSetPosition()) @@ -115,7 +115,7 @@ public void Marshall(RouteWaypoint requestObject, JsonMarshallerContext context) if(requestObject.IsSetStopDuration()) { context.Writer.WritePropertyName("StopDuration"); - context.Writer.Write(requestObject.StopDuration); + context.Writer.Write(requestObject.StopDuration.Value); } } diff --git a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteWeightConstraintUnmarshaller.cs b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteWeightConstraintUnmarshaller.cs index 4acdbe691c1c..10b24b89d4ea 100644 --- a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteWeightConstraintUnmarshaller.cs +++ b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/RouteWeightConstraintUnmarshaller.cs @@ -74,7 +74,7 @@ public RouteWeightConstraint Unmarshall(JsonUnmarshallerContext context) } if (context.TestExpression("Value", targetDepth)) { - var unmarshaller = LongUnmarshaller.Instance; + var unmarshaller = NullableLongUnmarshaller.Instance; unmarshalledObject.Value = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/SnapToRoadsRequestMarshaller.cs b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/SnapToRoadsRequestMarshaller.cs index 0b6320af5c7a..e2ff597df756 100644 --- a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/SnapToRoadsRequestMarshaller.cs +++ b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/SnapToRoadsRequestMarshaller.cs @@ -64,60 +64,63 @@ public IRequest Marshall(SnapToRoadsRequest publicRequest) if (publicRequest.IsSetKey()) request.Parameters.Add("key", StringUtils.FromString(publicRequest.Key)); request.ResourcePath = "/snap-to-roads"; - using (StringWriter stringWriter = new StringWriter(CultureInfo.InvariantCulture)) + using (MemoryStream memoryStream = new MemoryStream()) { - JsonWriter writer = new JsonWriter(stringWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetSnappedGeometryFormat()) + using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) { - context.Writer.WritePropertyName("SnappedGeometryFormat"); - context.Writer.Write(publicRequest.SnappedGeometryFormat); - } - - if(publicRequest.IsSetSnapRadius()) - { - context.Writer.WritePropertyName("SnapRadius"); - context.Writer.Write(publicRequest.SnapRadius); - } + JsonWriter writer = new JsonWriter(streamWriter); + writer.Validate = false; + writer.WriteObjectStart(); + var context = new JsonMarshallerContext(request, writer); + if(publicRequest.IsSetSnappedGeometryFormat()) + { + context.Writer.WritePropertyName("SnappedGeometryFormat"); + context.Writer.Write(publicRequest.SnappedGeometryFormat); + } - if(publicRequest.IsSetTracePoints()) - { - context.Writer.WritePropertyName("TracePoints"); - context.Writer.WriteArrayStart(); - foreach(var publicRequestTracePointsListValue in publicRequest.TracePoints) + if(publicRequest.IsSetSnapRadius()) { - context.Writer.WriteObjectStart(); + context.Writer.WritePropertyName("SnapRadius"); + context.Writer.Write(publicRequest.SnapRadius.Value); + } - var marshaller = RoadSnapTracePointMarshaller.Instance; - marshaller.Marshall(publicRequestTracePointsListValue, context); + if(publicRequest.IsSetTracePoints()) + { + context.Writer.WritePropertyName("TracePoints"); + context.Writer.WriteArrayStart(); + foreach(var publicRequestTracePointsListValue in publicRequest.TracePoints) + { + context.Writer.WriteObjectStart(); + + var marshaller = RoadSnapTracePointMarshaller.Instance; + marshaller.Marshall(publicRequestTracePointsListValue, context); + + context.Writer.WriteObjectEnd(); + } + context.Writer.WriteArrayEnd(); + } - context.Writer.WriteObjectEnd(); + if(publicRequest.IsSetTravelMode()) + { + context.Writer.WritePropertyName("TravelMode"); + context.Writer.Write(publicRequest.TravelMode); } - context.Writer.WriteArrayEnd(); - } - if(publicRequest.IsSetTravelMode()) - { - context.Writer.WritePropertyName("TravelMode"); - context.Writer.Write(publicRequest.TravelMode); - } + if(publicRequest.IsSetTravelModeOptions()) + { + context.Writer.WritePropertyName("TravelModeOptions"); + context.Writer.WriteObjectStart(); - if(publicRequest.IsSetTravelModeOptions()) - { - context.Writer.WritePropertyName("TravelModeOptions"); - context.Writer.WriteObjectStart(); + var marshaller = RoadSnapTravelModeOptionsMarshaller.Instance; + marshaller.Marshall(publicRequest.TravelModeOptions, context); - var marshaller = RoadSnapTravelModeOptionsMarshaller.Instance; - marshaller.Marshall(publicRequest.TravelModeOptions, context); + context.Writer.WriteObjectEnd(); + } - context.Writer.WriteObjectEnd(); + writer.WriteObjectEnd(); } - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); + request.Content = memoryStream.ToArray(); } request.UseQueryString = true; diff --git a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/WaypointOptimizationAvoidanceOptionsMarshaller.cs b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/WaypointOptimizationAvoidanceOptionsMarshaller.cs index 4d28d86dcf55..f5413e60957b 100644 --- a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/WaypointOptimizationAvoidanceOptionsMarshaller.cs +++ b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/WaypointOptimizationAvoidanceOptionsMarshaller.cs @@ -67,43 +67,43 @@ public void Marshall(WaypointOptimizationAvoidanceOptions requestObject, JsonMar if(requestObject.IsSetCarShuttleTrains()) { context.Writer.WritePropertyName("CarShuttleTrains"); - context.Writer.Write(requestObject.CarShuttleTrains); + context.Writer.Write(requestObject.CarShuttleTrains.Value); } if(requestObject.IsSetControlledAccessHighways()) { context.Writer.WritePropertyName("ControlledAccessHighways"); - context.Writer.Write(requestObject.ControlledAccessHighways); + context.Writer.Write(requestObject.ControlledAccessHighways.Value); } if(requestObject.IsSetDirtRoads()) { context.Writer.WritePropertyName("DirtRoads"); - context.Writer.Write(requestObject.DirtRoads); + context.Writer.Write(requestObject.DirtRoads.Value); } if(requestObject.IsSetFerries()) { context.Writer.WritePropertyName("Ferries"); - context.Writer.Write(requestObject.Ferries); + context.Writer.Write(requestObject.Ferries.Value); } if(requestObject.IsSetTollRoads()) { context.Writer.WritePropertyName("TollRoads"); - context.Writer.Write(requestObject.TollRoads); + context.Writer.Write(requestObject.TollRoads.Value); } if(requestObject.IsSetTunnels()) { context.Writer.WritePropertyName("Tunnels"); - context.Writer.Write(requestObject.Tunnels); + context.Writer.Write(requestObject.Tunnels.Value); } if(requestObject.IsSetUTurns()) { context.Writer.WritePropertyName("UTurns"); - context.Writer.Write(requestObject.UTurns); + context.Writer.Write(requestObject.UTurns.Value); } } diff --git a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/WaypointOptimizationConnectionUnmarshaller.cs b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/WaypointOptimizationConnectionUnmarshaller.cs index 36cf7ddac8a0..7664f94881c8 100644 --- a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/WaypointOptimizationConnectionUnmarshaller.cs +++ b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/WaypointOptimizationConnectionUnmarshaller.cs @@ -68,7 +68,7 @@ public WaypointOptimizationConnection Unmarshall(JsonUnmarshallerContext context { if (context.TestExpression("Distance", targetDepth)) { - var unmarshaller = LongUnmarshaller.Instance; + var unmarshaller = NullableLongUnmarshaller.Instance; unmarshalledObject.Distance = unmarshaller.Unmarshall(context); continue; } @@ -80,7 +80,7 @@ public WaypointOptimizationConnection Unmarshall(JsonUnmarshallerContext context } if (context.TestExpression("RestDuration", targetDepth)) { - var unmarshaller = LongUnmarshaller.Instance; + var unmarshaller = NullableLongUnmarshaller.Instance; unmarshalledObject.RestDuration = unmarshaller.Unmarshall(context); continue; } @@ -92,13 +92,13 @@ public WaypointOptimizationConnection Unmarshall(JsonUnmarshallerContext context } if (context.TestExpression("TravelDuration", targetDepth)) { - var unmarshaller = LongUnmarshaller.Instance; + var unmarshaller = NullableLongUnmarshaller.Instance; unmarshalledObject.TravelDuration = unmarshaller.Unmarshall(context); continue; } if (context.TestExpression("WaitDuration", targetDepth)) { - var unmarshaller = LongUnmarshaller.Instance; + var unmarshaller = NullableLongUnmarshaller.Instance; unmarshalledObject.WaitDuration = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/WaypointOptimizationDestinationOptionsMarshaller.cs b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/WaypointOptimizationDestinationOptionsMarshaller.cs index 339be5c1c4e1..f7691207b53c 100644 --- a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/WaypointOptimizationDestinationOptionsMarshaller.cs +++ b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/WaypointOptimizationDestinationOptionsMarshaller.cs @@ -68,13 +68,13 @@ public void Marshall(WaypointOptimizationDestinationOptions requestObject, JsonM if(requestObject.IsSetHeading()) { context.Writer.WritePropertyName("Heading"); - if(StringUtils.IsSpecialDoubleValue(requestObject.Heading)) + if(StringUtils.IsSpecialDoubleValue(requestObject.Heading.Value)) { - context.Writer.Write(StringUtils.FromSpecialDoubleValue(requestObject.Heading)); + context.Writer.Write(StringUtils.FromSpecialDoubleValue(requestObject.Heading.Value)); } else { - context.Writer.Write(requestObject.Heading); + context.Writer.Write(requestObject.Heading.Value); } } @@ -87,7 +87,7 @@ public void Marshall(WaypointOptimizationDestinationOptions requestObject, JsonM if(requestObject.IsSetServiceDuration()) { context.Writer.WritePropertyName("ServiceDuration"); - context.Writer.Write(requestObject.ServiceDuration); + context.Writer.Write(requestObject.ServiceDuration.Value); } if(requestObject.IsSetSideOfStreet()) diff --git a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/WaypointOptimizationPedestrianOptionsMarshaller.cs b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/WaypointOptimizationPedestrianOptionsMarshaller.cs index 57619c342e66..5a3dc7cec006 100644 --- a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/WaypointOptimizationPedestrianOptionsMarshaller.cs +++ b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/WaypointOptimizationPedestrianOptionsMarshaller.cs @@ -51,13 +51,13 @@ public void Marshall(WaypointOptimizationPedestrianOptions requestObject, JsonMa if(requestObject.IsSetSpeed()) { context.Writer.WritePropertyName("Speed"); - if(StringUtils.IsSpecialDoubleValue(requestObject.Speed)) + if(StringUtils.IsSpecialDoubleValue(requestObject.Speed.Value)) { - context.Writer.Write(StringUtils.FromSpecialDoubleValue(requestObject.Speed)); + context.Writer.Write(StringUtils.FromSpecialDoubleValue(requestObject.Speed.Value)); } else { - context.Writer.Write(requestObject.Speed); + context.Writer.Write(requestObject.Speed.Value); } } diff --git a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/WaypointOptimizationRestCycleDurationsMarshaller.cs b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/WaypointOptimizationRestCycleDurationsMarshaller.cs index 65dc00cbf179..39d05f8e7254 100644 --- a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/WaypointOptimizationRestCycleDurationsMarshaller.cs +++ b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/WaypointOptimizationRestCycleDurationsMarshaller.cs @@ -51,13 +51,13 @@ public void Marshall(WaypointOptimizationRestCycleDurations requestObject, JsonM if(requestObject.IsSetRestDuration()) { context.Writer.WritePropertyName("RestDuration"); - context.Writer.Write(requestObject.RestDuration); + context.Writer.Write(requestObject.RestDuration.Value); } if(requestObject.IsSetWorkDuration()) { context.Writer.WritePropertyName("WorkDuration"); - context.Writer.Write(requestObject.WorkDuration); + context.Writer.Write(requestObject.WorkDuration.Value); } } diff --git a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/WaypointOptimizationTimeBreakdownUnmarshaller.cs b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/WaypointOptimizationTimeBreakdownUnmarshaller.cs index d112edc9e5f5..6bbf74957956 100644 --- a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/WaypointOptimizationTimeBreakdownUnmarshaller.cs +++ b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/WaypointOptimizationTimeBreakdownUnmarshaller.cs @@ -68,25 +68,25 @@ public WaypointOptimizationTimeBreakdown Unmarshall(JsonUnmarshallerContext cont { if (context.TestExpression("RestDuration", targetDepth)) { - var unmarshaller = LongUnmarshaller.Instance; + var unmarshaller = NullableLongUnmarshaller.Instance; unmarshalledObject.RestDuration = unmarshaller.Unmarshall(context); continue; } if (context.TestExpression("ServiceDuration", targetDepth)) { - var unmarshaller = LongUnmarshaller.Instance; + var unmarshaller = NullableLongUnmarshaller.Instance; unmarshalledObject.ServiceDuration = unmarshaller.Unmarshall(context); continue; } if (context.TestExpression("TravelDuration", targetDepth)) { - var unmarshaller = LongUnmarshaller.Instance; + var unmarshaller = NullableLongUnmarshaller.Instance; unmarshalledObject.TravelDuration = unmarshaller.Unmarshall(context); continue; } if (context.TestExpression("WaitDuration", targetDepth)) { - var unmarshaller = LongUnmarshaller.Instance; + var unmarshaller = NullableLongUnmarshaller.Instance; unmarshalledObject.WaitDuration = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/WaypointOptimizationTrailerOptionsMarshaller.cs b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/WaypointOptimizationTrailerOptionsMarshaller.cs index 05af94d89945..22cec12aad06 100644 --- a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/WaypointOptimizationTrailerOptionsMarshaller.cs +++ b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/WaypointOptimizationTrailerOptionsMarshaller.cs @@ -51,7 +51,7 @@ public void Marshall(WaypointOptimizationTrailerOptions requestObject, JsonMarsh if(requestObject.IsSetTrailerCount()) { context.Writer.WritePropertyName("TrailerCount"); - context.Writer.Write(requestObject.TrailerCount); + context.Writer.Write(requestObject.TrailerCount.Value); } } diff --git a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/WaypointOptimizationTruckOptionsMarshaller.cs b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/WaypointOptimizationTruckOptionsMarshaller.cs index f3d33e37c197..03afa3fe17ba 100644 --- a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/WaypointOptimizationTruckOptionsMarshaller.cs +++ b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/WaypointOptimizationTruckOptionsMarshaller.cs @@ -51,7 +51,7 @@ public void Marshall(WaypointOptimizationTruckOptions requestObject, JsonMarshal if(requestObject.IsSetGrossWeight()) { context.Writer.WritePropertyName("GrossWeight"); - context.Writer.Write(requestObject.GrossWeight); + context.Writer.Write(requestObject.GrossWeight.Value); } if(requestObject.IsSetHazardousCargos()) @@ -68,13 +68,13 @@ public void Marshall(WaypointOptimizationTruckOptions requestObject, JsonMarshal if(requestObject.IsSetHeight()) { context.Writer.WritePropertyName("Height"); - context.Writer.Write(requestObject.Height); + context.Writer.Write(requestObject.Height.Value); } if(requestObject.IsSetLength()) { context.Writer.WritePropertyName("Length"); - context.Writer.Write(requestObject.Length); + context.Writer.Write(requestObject.Length.Value); } if(requestObject.IsSetTrailer()) @@ -103,13 +103,13 @@ public void Marshall(WaypointOptimizationTruckOptions requestObject, JsonMarshal if(requestObject.IsSetWeightPerAxle()) { context.Writer.WritePropertyName("WeightPerAxle"); - context.Writer.Write(requestObject.WeightPerAxle); + context.Writer.Write(requestObject.WeightPerAxle.Value); } if(requestObject.IsSetWidth()) { context.Writer.WritePropertyName("Width"); - context.Writer.Write(requestObject.Width); + context.Writer.Write(requestObject.Width.Value); } } diff --git a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/WaypointOptimizationWaypointMarshaller.cs b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/WaypointOptimizationWaypointMarshaller.cs index 389555e70eb0..2d8709decfeb 100644 --- a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/WaypointOptimizationWaypointMarshaller.cs +++ b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/WaypointOptimizationWaypointMarshaller.cs @@ -79,13 +79,13 @@ public void Marshall(WaypointOptimizationWaypoint requestObject, JsonMarshallerC if(requestObject.IsSetHeading()) { context.Writer.WritePropertyName("Heading"); - if(StringUtils.IsSpecialDoubleValue(requestObject.Heading)) + if(StringUtils.IsSpecialDoubleValue(requestObject.Heading.Value)) { - context.Writer.Write(StringUtils.FromSpecialDoubleValue(requestObject.Heading)); + context.Writer.Write(StringUtils.FromSpecialDoubleValue(requestObject.Heading.Value)); } else { - context.Writer.Write(requestObject.Heading); + context.Writer.Write(requestObject.Heading.Value); } } @@ -109,7 +109,7 @@ public void Marshall(WaypointOptimizationWaypoint requestObject, JsonMarshallerC if(requestObject.IsSetServiceDuration()) { context.Writer.WritePropertyName("ServiceDuration"); - context.Writer.Write(requestObject.ServiceDuration); + context.Writer.Write(requestObject.ServiceDuration.Value); } if(requestObject.IsSetSideOfStreet()) diff --git a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/WeightPerAxleGroupMarshaller.cs b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/WeightPerAxleGroupMarshaller.cs index 8d00a06e0630..e59a9b97a81c 100644 --- a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/WeightPerAxleGroupMarshaller.cs +++ b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/WeightPerAxleGroupMarshaller.cs @@ -51,31 +51,31 @@ public void Marshall(WeightPerAxleGroup requestObject, JsonMarshallerContext con if(requestObject.IsSetQuad()) { context.Writer.WritePropertyName("Quad"); - context.Writer.Write(requestObject.Quad); + context.Writer.Write(requestObject.Quad.Value); } if(requestObject.IsSetQuint()) { context.Writer.WritePropertyName("Quint"); - context.Writer.Write(requestObject.Quint); + context.Writer.Write(requestObject.Quint.Value); } if(requestObject.IsSetSingle()) { context.Writer.WritePropertyName("Single"); - context.Writer.Write(requestObject.Single); + context.Writer.Write(requestObject.Single.Value); } if(requestObject.IsSetTandem()) { context.Writer.WritePropertyName("Tandem"); - context.Writer.Write(requestObject.Tandem); + context.Writer.Write(requestObject.Tandem.Value); } if(requestObject.IsSetTriple()) { context.Writer.WritePropertyName("Triple"); - context.Writer.Write(requestObject.Triple); + context.Writer.Write(requestObject.Triple.Value); } } diff --git a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/WeightPerAxleGroupUnmarshaller.cs b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/WeightPerAxleGroupUnmarshaller.cs index 4e1bf6b83c2a..ce62f52ca0a5 100644 --- a/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/WeightPerAxleGroupUnmarshaller.cs +++ b/sdk/src/Services/GeoRoutes/Generated/Model/Internal/MarshallTransformations/WeightPerAxleGroupUnmarshaller.cs @@ -68,31 +68,31 @@ public WeightPerAxleGroup Unmarshall(JsonUnmarshallerContext context) { if (context.TestExpression("Quad", targetDepth)) { - var unmarshaller = LongUnmarshaller.Instance; + var unmarshaller = NullableLongUnmarshaller.Instance; unmarshalledObject.Quad = unmarshaller.Unmarshall(context); continue; } if (context.TestExpression("Quint", targetDepth)) { - var unmarshaller = LongUnmarshaller.Instance; + var unmarshaller = NullableLongUnmarshaller.Instance; unmarshalledObject.Quint = unmarshaller.Unmarshall(context); continue; } if (context.TestExpression("Single", targetDepth)) { - var unmarshaller = LongUnmarshaller.Instance; + var unmarshaller = NullableLongUnmarshaller.Instance; unmarshalledObject.Single = unmarshaller.Unmarshall(context); continue; } if (context.TestExpression("Tandem", targetDepth)) { - var unmarshaller = LongUnmarshaller.Instance; + var unmarshaller = NullableLongUnmarshaller.Instance; unmarshalledObject.Tandem = unmarshaller.Unmarshall(context); continue; } if (context.TestExpression("Triple", targetDepth)) { - var unmarshaller = LongUnmarshaller.Instance; + var unmarshaller = NullableLongUnmarshaller.Instance; unmarshalledObject.Triple = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/GeoRoutes/Generated/Model/InternalServerException.cs b/sdk/src/Services/GeoRoutes/Generated/Model/InternalServerException.cs index 6909654689b5..2e3f07f086dc 100644 --- a/sdk/src/Services/GeoRoutes/Generated/Model/InternalServerException.cs +++ b/sdk/src/Services/GeoRoutes/Generated/Model/InternalServerException.cs @@ -108,11 +108,6 @@ protected InternalServerException(System.Runtime.Serialization.SerializationInfo /// The that holds the serialized object data about the exception being thrown. /// The that contains contextual information about the source or destination. /// The parameter is a null reference (Nothing in Visual Basic). -#if BCL35 - [System.Security.Permissions.SecurityPermission( - System.Security.Permissions.SecurityAction.LinkDemand, - Flags = System.Security.Permissions.SecurityPermissionFlag.SerializationFormatter)] -#endif [System.Security.SecurityCritical] // These FxCop rules are giving false-positives for this method [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Security", "CA2123:OverrideLinkDemandsShouldBeIdenticalToBase")] diff --git a/sdk/src/Services/GeoRoutes/Generated/Model/Isoline.cs b/sdk/src/Services/GeoRoutes/Generated/Model/Isoline.cs index dd331d670886..82317dd8aa55 100644 --- a/sdk/src/Services/GeoRoutes/Generated/Model/Isoline.cs +++ b/sdk/src/Services/GeoRoutes/Generated/Model/Isoline.cs @@ -67,9 +67,9 @@ internal bool IsSetConnections() /// /// [AWSProperty(Min=0, Max=4294967295)] - public long DistanceThreshold + public long? DistanceThreshold { - get { return this._distanceThreshold.GetValueOrDefault(); } + get { return this._distanceThreshold; } set { this._distanceThreshold = value; } } @@ -105,9 +105,9 @@ internal bool IsSetGeometries() /// /// [AWSProperty(Min=0, Max=4294967295)] - public long TimeThreshold + public long? TimeThreshold { - get { return this._timeThreshold.GetValueOrDefault(); } + get { return this._timeThreshold; } set { this._timeThreshold = value; } } diff --git a/sdk/src/Services/GeoRoutes/Generated/Model/IsolineAllowOptions.cs b/sdk/src/Services/GeoRoutes/Generated/Model/IsolineAllowOptions.cs index 3dd94a391b90..ba74d049fb3a 100644 --- a/sdk/src/Services/GeoRoutes/Generated/Model/IsolineAllowOptions.cs +++ b/sdk/src/Services/GeoRoutes/Generated/Model/IsolineAllowOptions.cs @@ -43,9 +43,9 @@ public partial class IsolineAllowOptions /// Allow Hot (High Occupancy Toll) lanes while calculating the route. /// /// - public bool Hot + public bool? Hot { - get { return this._hot.GetValueOrDefault(); } + get { return this._hot; } set { this._hot = value; } } @@ -61,9 +61,9 @@ internal bool IsSetHot() /// Allow Hov (High Occupancy vehicle) lanes while calculating the route. /// /// - public bool Hov + public bool? Hov { - get { return this._hov.GetValueOrDefault(); } + get { return this._hov; } set { this._hov = value; } } diff --git a/sdk/src/Services/GeoRoutes/Generated/Model/IsolineAvoidanceOptions.cs b/sdk/src/Services/GeoRoutes/Generated/Model/IsolineAvoidanceOptions.cs index efcbb549e1bc..1c046cd771c0 100644 --- a/sdk/src/Services/GeoRoutes/Generated/Model/IsolineAvoidanceOptions.cs +++ b/sdk/src/Services/GeoRoutes/Generated/Model/IsolineAvoidanceOptions.cs @@ -73,9 +73,9 @@ internal bool IsSetAreas() /// Avoid car-shuttle-trains while calculating the route. /// /// - public bool CarShuttleTrains + public bool? CarShuttleTrains { - get { return this._carShuttleTrains.GetValueOrDefault(); } + get { return this._carShuttleTrains; } set { this._carShuttleTrains = value; } } @@ -91,9 +91,9 @@ internal bool IsSetCarShuttleTrains() /// Avoid controlled access highways while calculating the route. /// /// - public bool ControlledAccessHighways + public bool? ControlledAccessHighways { - get { return this._controlledAccessHighways.GetValueOrDefault(); } + get { return this._controlledAccessHighways; } set { this._controlledAccessHighways = value; } } @@ -109,9 +109,9 @@ internal bool IsSetControlledAccessHighways() /// Avoid dirt roads while calculating the route. /// /// - public bool DirtRoads + public bool? DirtRoads { - get { return this._dirtRoads.GetValueOrDefault(); } + get { return this._dirtRoads; } set { this._dirtRoads = value; } } @@ -127,9 +127,9 @@ internal bool IsSetDirtRoads() /// Avoid ferries while calculating the route. /// /// - public bool Ferries + public bool? Ferries { - get { return this._ferries.GetValueOrDefault(); } + get { return this._ferries; } set { this._ferries = value; } } @@ -145,9 +145,9 @@ internal bool IsSetFerries() /// Avoid roads that have seasonal closure while calculating the route. /// /// - public bool SeasonalClosure + public bool? SeasonalClosure { - get { return this._seasonalClosure.GetValueOrDefault(); } + get { return this._seasonalClosure; } set { this._seasonalClosure = value; } } @@ -163,9 +163,9 @@ internal bool IsSetSeasonalClosure() /// Avoids roads where the specified toll transponders are the only mode of payment. /// /// - public bool TollRoads + public bool? TollRoads { - get { return this._tollRoads.GetValueOrDefault(); } + get { return this._tollRoads; } set { this._tollRoads = value; } } @@ -181,9 +181,9 @@ internal bool IsSetTollRoads() /// Avoids roads where the specified toll transponders are the only mode of payment. /// /// - public bool TollTransponders + public bool? TollTransponders { - get { return this._tollTransponders.GetValueOrDefault(); } + get { return this._tollTransponders; } set { this._tollTransponders = value; } } @@ -224,9 +224,9 @@ internal bool IsSetTruckRoadTypes() /// Avoid tunnels while calculating the route. /// /// - public bool Tunnels + public bool? Tunnels { - get { return this._tunnels.GetValueOrDefault(); } + get { return this._tunnels; } set { this._tunnels = value; } } @@ -242,9 +242,9 @@ internal bool IsSetTunnels() /// Avoid U-turns for calculation on highways and motorways. /// /// - public bool UTurns + public bool? UTurns { - get { return this._uTurns.GetValueOrDefault(); } + get { return this._uTurns; } set { this._uTurns = value; } } diff --git a/sdk/src/Services/GeoRoutes/Generated/Model/IsolineCarOptions.cs b/sdk/src/Services/GeoRoutes/Generated/Model/IsolineCarOptions.cs index 3de05411e40a..a94a2978c6a7 100644 --- a/sdk/src/Services/GeoRoutes/Generated/Model/IsolineCarOptions.cs +++ b/sdk/src/Services/GeoRoutes/Generated/Model/IsolineCarOptions.cs @@ -86,9 +86,9 @@ internal bool IsSetLicensePlate() /// /// [AWSProperty(Max=252)] - public double MaxSpeed + public double? MaxSpeed { - get { return this._maxSpeed.GetValueOrDefault(); } + get { return this._maxSpeed; } set { this._maxSpeed = value; } } @@ -109,9 +109,9 @@ internal bool IsSetMaxSpeed() /// /// [AWSProperty(Min=1)] - public int Occupancy + public int? Occupancy { - get { return this._occupancy.GetValueOrDefault(); } + get { return this._occupancy; } set { this._occupancy = value; } } diff --git a/sdk/src/Services/GeoRoutes/Generated/Model/IsolineConnection.cs b/sdk/src/Services/GeoRoutes/Generated/Model/IsolineConnection.cs index f0400c3870ea..176a2b492562 100644 --- a/sdk/src/Services/GeoRoutes/Generated/Model/IsolineConnection.cs +++ b/sdk/src/Services/GeoRoutes/Generated/Model/IsolineConnection.cs @@ -48,9 +48,9 @@ public partial class IsolineConnection /// /// [AWSProperty(Required=true, Min=0)] - public int FromPolygonIndex + public int? FromPolygonIndex { - get { return this._fromPolygonIndex.GetValueOrDefault(); } + get { return this._fromPolygonIndex; } set { this._fromPolygonIndex = value; } } @@ -87,9 +87,9 @@ internal bool IsSetGeometry() /// /// [AWSProperty(Required=true, Min=0)] - public int ToPolygonIndex + public int? ToPolygonIndex { - get { return this._toPolygonIndex.GetValueOrDefault(); } + get { return this._toPolygonIndex; } set { this._toPolygonIndex = value; } } diff --git a/sdk/src/Services/GeoRoutes/Generated/Model/IsolineDestinationOptions.cs b/sdk/src/Services/GeoRoutes/Generated/Model/IsolineDestinationOptions.cs index b4fc626f355c..b747652763ea 100644 --- a/sdk/src/Services/GeoRoutes/Generated/Model/IsolineDestinationOptions.cs +++ b/sdk/src/Services/GeoRoutes/Generated/Model/IsolineDestinationOptions.cs @@ -48,9 +48,9 @@ public partial class IsolineDestinationOptions /// /// [AWSProperty(Min=0, Max=4294967295)] - public long AvoidActionsForDistance + public long? AvoidActionsForDistance { - get { return this._avoidActionsForDistance.GetValueOrDefault(); } + get { return this._avoidActionsForDistance; } set { this._avoidActionsForDistance = value; } } @@ -67,9 +67,9 @@ internal bool IsSetAvoidActionsForDistance() /// /// [AWSProperty(Min=0, Max=360)] - public double Heading + public double? Heading { - get { return this._heading.GetValueOrDefault(); } + get { return this._heading; } set { this._heading = value; } } diff --git a/sdk/src/Services/GeoRoutes/Generated/Model/IsolineGranularityOptions.cs b/sdk/src/Services/GeoRoutes/Generated/Model/IsolineGranularityOptions.cs index f13c05b7d1d8..bc4c7abc85e0 100644 --- a/sdk/src/Services/GeoRoutes/Generated/Model/IsolineGranularityOptions.cs +++ b/sdk/src/Services/GeoRoutes/Generated/Model/IsolineGranularityOptions.cs @@ -44,9 +44,9 @@ public partial class IsolineGranularityOptions /// /// [AWSProperty(Min=31)] - public int MaxPoints + public int? MaxPoints { - get { return this._maxPoints.GetValueOrDefault(); } + get { return this._maxPoints; } set { this._maxPoints = value; } } @@ -67,9 +67,9 @@ internal bool IsSetMaxPoints() /// /// [AWSProperty(Min=0, Max=4294967295)] - public long MaxResolution + public long? MaxResolution { - get { return this._maxResolution.GetValueOrDefault(); } + get { return this._maxResolution; } set { this._maxResolution = value; } } diff --git a/sdk/src/Services/GeoRoutes/Generated/Model/IsolineMatchingOptions.cs b/sdk/src/Services/GeoRoutes/Generated/Model/IsolineMatchingOptions.cs index 9d09a8e0ca9e..71793728b162 100644 --- a/sdk/src/Services/GeoRoutes/Generated/Model/IsolineMatchingOptions.cs +++ b/sdk/src/Services/GeoRoutes/Generated/Model/IsolineMatchingOptions.cs @@ -70,9 +70,9 @@ internal bool IsSetNameHint() /// /// [AWSProperty(Min=0, Max=4294967295)] - public long OnRoadThreshold + public long? OnRoadThreshold { - get { return this._onRoadThreshold.GetValueOrDefault(); } + get { return this._onRoadThreshold; } set { this._onRoadThreshold = value; } } @@ -94,9 +94,9 @@ internal bool IsSetOnRoadThreshold() /// /// [AWSProperty(Min=0, Max=4294967295)] - public long Radius + public long? Radius { - get { return this._radius.GetValueOrDefault(); } + get { return this._radius; } set { this._radius = value; } } diff --git a/sdk/src/Services/GeoRoutes/Generated/Model/IsolineOriginOptions.cs b/sdk/src/Services/GeoRoutes/Generated/Model/IsolineOriginOptions.cs index 7608a393c12a..2f745b1ec873 100644 --- a/sdk/src/Services/GeoRoutes/Generated/Model/IsolineOriginOptions.cs +++ b/sdk/src/Services/GeoRoutes/Generated/Model/IsolineOriginOptions.cs @@ -48,9 +48,9 @@ public partial class IsolineOriginOptions /// /// [AWSProperty(Min=0, Max=4294967295)] - public long AvoidActionsForDistance + public long? AvoidActionsForDistance { - get { return this._avoidActionsForDistance.GetValueOrDefault(); } + get { return this._avoidActionsForDistance; } set { this._avoidActionsForDistance = value; } } @@ -67,9 +67,9 @@ internal bool IsSetAvoidActionsForDistance() /// /// [AWSProperty(Min=0, Max=360)] - public double Heading + public double? Heading { - get { return this._heading.GetValueOrDefault(); } + get { return this._heading; } set { this._heading = value; } } diff --git a/sdk/src/Services/GeoRoutes/Generated/Model/IsolineScooterOptions.cs b/sdk/src/Services/GeoRoutes/Generated/Model/IsolineScooterOptions.cs index 8668b99d1ddb..25679c1f5f0c 100644 --- a/sdk/src/Services/GeoRoutes/Generated/Model/IsolineScooterOptions.cs +++ b/sdk/src/Services/GeoRoutes/Generated/Model/IsolineScooterOptions.cs @@ -86,9 +86,9 @@ internal bool IsSetLicensePlate() /// /// [AWSProperty(Max=252)] - public double MaxSpeed + public double? MaxSpeed { - get { return this._maxSpeed.GetValueOrDefault(); } + get { return this._maxSpeed; } set { this._maxSpeed = value; } } @@ -109,9 +109,9 @@ internal bool IsSetMaxSpeed() /// /// [AWSProperty(Min=1)] - public int Occupancy + public int? Occupancy { - get { return this._occupancy.GetValueOrDefault(); } + get { return this._occupancy; } set { this._occupancy = value; } } diff --git a/sdk/src/Services/GeoRoutes/Generated/Model/IsolineTrafficOptions.cs b/sdk/src/Services/GeoRoutes/Generated/Model/IsolineTrafficOptions.cs index fe4889d6bf20..1ea0fd88e9c2 100644 --- a/sdk/src/Services/GeoRoutes/Generated/Model/IsolineTrafficOptions.cs +++ b/sdk/src/Services/GeoRoutes/Generated/Model/IsolineTrafficOptions.cs @@ -52,9 +52,9 @@ public partial class IsolineTrafficOptions /// /// [AWSProperty(Min=0, Max=4294967295)] - public long FlowEventThresholdOverride + public long? FlowEventThresholdOverride { - get { return this._flowEventThresholdOverride.GetValueOrDefault(); } + get { return this._flowEventThresholdOverride; } set { this._flowEventThresholdOverride = value; } } diff --git a/sdk/src/Services/GeoRoutes/Generated/Model/IsolineTrailerOptions.cs b/sdk/src/Services/GeoRoutes/Generated/Model/IsolineTrailerOptions.cs index 3d334ae616f8..6f22d7010d95 100644 --- a/sdk/src/Services/GeoRoutes/Generated/Model/IsolineTrailerOptions.cs +++ b/sdk/src/Services/GeoRoutes/Generated/Model/IsolineTrailerOptions.cs @@ -44,9 +44,9 @@ public partial class IsolineTrailerOptions /// /// [AWSProperty(Min=1)] - public int AxleCount + public int? AxleCount { - get { return this._axleCount.GetValueOrDefault(); } + get { return this._axleCount; } set { this._axleCount = value; } } @@ -67,9 +67,9 @@ internal bool IsSetAxleCount() /// /// [AWSProperty(Min=1, Max=255)] - public int TrailerCount + public int? TrailerCount { - get { return this._trailerCount.GetValueOrDefault(); } + get { return this._trailerCount; } set { this._trailerCount = value; } } diff --git a/sdk/src/Services/GeoRoutes/Generated/Model/IsolineTruckOptions.cs b/sdk/src/Services/GeoRoutes/Generated/Model/IsolineTruckOptions.cs index e4e1ed512314..ebd058e4f36e 100644 --- a/sdk/src/Services/GeoRoutes/Generated/Model/IsolineTruckOptions.cs +++ b/sdk/src/Services/GeoRoutes/Generated/Model/IsolineTruckOptions.cs @@ -61,9 +61,9 @@ public partial class IsolineTruckOptions /// /// [AWSProperty(Min=2, Max=255)] - public int AxleCount + public int? AxleCount { - get { return this._axleCount.GetValueOrDefault(); } + get { return this._axleCount; } set { this._axleCount = value; } } @@ -102,9 +102,9 @@ internal bool IsSetEngineType() /// /// [AWSProperty(Min=0, Max=4294967295)] - public long GrossWeight + public long? GrossWeight { - get { return this._grossWeight.GetValueOrDefault(); } + get { return this._grossWeight; } set { this._grossWeight = value; } } @@ -144,9 +144,9 @@ internal bool IsSetHazardousCargos() /// /// [AWSProperty(Min=0, Max=5000)] - public long Height + public long? Height { - get { return this._height.GetValueOrDefault(); } + get { return this._height; } set { this._height = value; } } @@ -167,9 +167,9 @@ internal bool IsSetHeight() /// /// [AWSProperty(Min=0, Max=5000)] - public long HeightAboveFirstAxle + public long? HeightAboveFirstAxle { - get { return this._heightAboveFirstAxle.GetValueOrDefault(); } + get { return this._heightAboveFirstAxle; } set { this._heightAboveFirstAxle = value; } } @@ -190,9 +190,9 @@ internal bool IsSetHeightAboveFirstAxle() /// /// [AWSProperty(Min=0, Max=4294967295)] - public long KpraLength + public long? KpraLength { - get { return this._kpraLength.GetValueOrDefault(); } + get { return this._kpraLength; } set { this._kpraLength = value; } } @@ -213,9 +213,9 @@ internal bool IsSetKpraLength() /// /// [AWSProperty(Min=0, Max=30000)] - public long Length + public long? Length { - get { return this._length.GetValueOrDefault(); } + get { return this._length; } set { this._length = value; } } @@ -254,9 +254,9 @@ internal bool IsSetLicensePlate() /// /// [AWSProperty(Max=252)] - public double MaxSpeed + public double? MaxSpeed { - get { return this._maxSpeed.GetValueOrDefault(); } + get { return this._maxSpeed; } set { this._maxSpeed = value; } } @@ -277,9 +277,9 @@ internal bool IsSetMaxSpeed() /// /// [AWSProperty(Min=1)] - public int Occupancy + public int? Occupancy { - get { return this._occupancy.GetValueOrDefault(); } + get { return this._occupancy; } set { this._occupancy = value; } } @@ -300,9 +300,9 @@ internal bool IsSetOccupancy() /// /// [AWSProperty(Min=0, Max=4294967295)] - public long PayloadCapacity + public long? PayloadCapacity { - get { return this._payloadCapacity.GetValueOrDefault(); } + get { return this._payloadCapacity; } set { this._payloadCapacity = value; } } @@ -319,9 +319,9 @@ internal bool IsSetPayloadCapacity() /// /// [AWSProperty(Min=1, Max=255)] - public int TireCount + public int? TireCount { - get { return this._tireCount.GetValueOrDefault(); } + get { return this._tireCount; } set { this._tireCount = value; } } @@ -453,9 +453,9 @@ internal bool IsSetTunnelRestrictionCode() /// /// [AWSProperty(Min=0, Max=4294967295)] - public long WeightPerAxle + public long? WeightPerAxle { - get { return this._weightPerAxle.GetValueOrDefault(); } + get { return this._weightPerAxle; } set { this._weightPerAxle = value; } } @@ -499,9 +499,9 @@ internal bool IsSetWeightPerAxleGroup() /// /// [AWSProperty(Min=0, Max=5000)] - public long Width + public long? Width { - get { return this._width.GetValueOrDefault(); } + get { return this._width; } set { this._width = value; } } diff --git a/sdk/src/Services/GeoRoutes/Generated/Model/OptimizeWaypointsResponse.cs b/sdk/src/Services/GeoRoutes/Generated/Model/OptimizeWaypointsResponse.cs index d7478e9f48b0..e5e165783598 100644 --- a/sdk/src/Services/GeoRoutes/Generated/Model/OptimizeWaypointsResponse.cs +++ b/sdk/src/Services/GeoRoutes/Generated/Model/OptimizeWaypointsResponse.cs @@ -68,9 +68,9 @@ internal bool IsSetConnections() /// /// [AWSProperty(Required=true, Min=0, Max=4294967295)] - public long Distance + public long? Distance { - get { return this._distance.GetValueOrDefault(); } + get { return this._distance; } set { this._distance = value; } } @@ -91,9 +91,9 @@ internal bool IsSetDistance() /// /// [AWSProperty(Required=true, Min=0, Max=4294967295)] - public long Duration + public long? Duration { - get { return this._duration.GetValueOrDefault(); } + get { return this._duration; } set { this._duration = value; } } diff --git a/sdk/src/Services/GeoRoutes/Generated/Model/PolylineCorridor.cs b/sdk/src/Services/GeoRoutes/Generated/Model/PolylineCorridor.cs index 498f74c1c589..11d088d7829a 100644 --- a/sdk/src/Services/GeoRoutes/Generated/Model/PolylineCorridor.cs +++ b/sdk/src/Services/GeoRoutes/Generated/Model/PolylineCorridor.cs @@ -75,9 +75,9 @@ internal bool IsSetPolyline() /// /// [AWSProperty(Required=true)] - public int Radius + public int? Radius { - get { return this._radius.GetValueOrDefault(); } + get { return this._radius; } set { this._radius = value; } } diff --git a/sdk/src/Services/GeoRoutes/Generated/Model/RoadSnapSnappedTracePoint.cs b/sdk/src/Services/GeoRoutes/Generated/Model/RoadSnapSnappedTracePoint.cs index b81ef9e14019..65a279ea46b3 100644 --- a/sdk/src/Services/GeoRoutes/Generated/Model/RoadSnapSnappedTracePoint.cs +++ b/sdk/src/Services/GeoRoutes/Generated/Model/RoadSnapSnappedTracePoint.cs @@ -45,9 +45,9 @@ public partial class RoadSnapSnappedTracePoint /// /// [AWSProperty(Required=true, Min=0, Max=1)] - public double Confidence + public double? Confidence { - get { return this._confidence.GetValueOrDefault(); } + get { return this._confidence; } set { this._confidence = value; } } diff --git a/sdk/src/Services/GeoRoutes/Generated/Model/RoadSnapTracePoint.cs b/sdk/src/Services/GeoRoutes/Generated/Model/RoadSnapTracePoint.cs index d10be4c0a806..80b9461bf62b 100644 --- a/sdk/src/Services/GeoRoutes/Generated/Model/RoadSnapTracePoint.cs +++ b/sdk/src/Services/GeoRoutes/Generated/Model/RoadSnapTracePoint.cs @@ -46,9 +46,9 @@ public partial class RoadSnapTracePoint /// /// [AWSProperty(Min=0, Max=360)] - public double Heading + public double? Heading { - get { return this._heading.GetValueOrDefault(); } + get { return this._heading; } set { this._heading = value; } } @@ -88,9 +88,9 @@ internal bool IsSetPosition() /// /// [AWSProperty(Min=0)] - public double Speed + public double? Speed { - get { return this._speed.GetValueOrDefault(); } + get { return this._speed; } set { this._speed = value; } } diff --git a/sdk/src/Services/GeoRoutes/Generated/Model/RoadSnapTrailerOptions.cs b/sdk/src/Services/GeoRoutes/Generated/Model/RoadSnapTrailerOptions.cs index dbb636f88fc1..1ef49faab9ba 100644 --- a/sdk/src/Services/GeoRoutes/Generated/Model/RoadSnapTrailerOptions.cs +++ b/sdk/src/Services/GeoRoutes/Generated/Model/RoadSnapTrailerOptions.cs @@ -47,9 +47,9 @@ public partial class RoadSnapTrailerOptions /// /// [AWSProperty(Min=0, Max=255)] - public int TrailerCount + public int? TrailerCount { - get { return this._trailerCount.GetValueOrDefault(); } + get { return this._trailerCount; } set { this._trailerCount = value; } } diff --git a/sdk/src/Services/GeoRoutes/Generated/Model/RoadSnapTruckOptions.cs b/sdk/src/Services/GeoRoutes/Generated/Model/RoadSnapTruckOptions.cs index 70d9de3d829a..da68876fed25 100644 --- a/sdk/src/Services/GeoRoutes/Generated/Model/RoadSnapTruckOptions.cs +++ b/sdk/src/Services/GeoRoutes/Generated/Model/RoadSnapTruckOptions.cs @@ -53,9 +53,9 @@ public partial class RoadSnapTruckOptions /// /// [AWSProperty(Min=0, Max=4294967295)] - public long GrossWeight + public long? GrossWeight { - get { return this._grossWeight.GetValueOrDefault(); } + get { return this._grossWeight; } set { this._grossWeight = value; } } @@ -95,9 +95,9 @@ internal bool IsSetHazardousCargos() /// /// [AWSProperty(Min=0, Max=5000)] - public long Height + public long? Height { - get { return this._height.GetValueOrDefault(); } + get { return this._height; } set { this._height = value; } } @@ -118,9 +118,9 @@ internal bool IsSetHeight() /// /// [AWSProperty(Min=0, Max=30000)] - public long Length + public long? Length { - get { return this._length.GetValueOrDefault(); } + get { return this._length; } set { this._length = value; } } @@ -229,9 +229,9 @@ internal bool IsSetTunnelRestrictionCode() /// /// [AWSProperty(Min=0, Max=5000)] - public long Width + public long? Width { - get { return this._width.GetValueOrDefault(); } + get { return this._width; } set { this._width = value; } } diff --git a/sdk/src/Services/GeoRoutes/Generated/Model/RouteAllowOptions.cs b/sdk/src/Services/GeoRoutes/Generated/Model/RouteAllowOptions.cs index 0625dd969fa7..7bec35952295 100644 --- a/sdk/src/Services/GeoRoutes/Generated/Model/RouteAllowOptions.cs +++ b/sdk/src/Services/GeoRoutes/Generated/Model/RouteAllowOptions.cs @@ -43,9 +43,9 @@ public partial class RouteAllowOptions /// Allow Hot (High Occupancy Toll) lanes while calculating the route. /// /// - public bool Hot + public bool? Hot { - get { return this._hot.GetValueOrDefault(); } + get { return this._hot; } set { this._hot = value; } } @@ -61,9 +61,9 @@ internal bool IsSetHot() /// Allow Hov (High Occupancy vehicle) lanes while calculating the route. /// /// - public bool Hov + public bool? Hov { - get { return this._hov.GetValueOrDefault(); } + get { return this._hov; } set { this._hov = value; } } diff --git a/sdk/src/Services/GeoRoutes/Generated/Model/RouteAvoidanceOptions.cs b/sdk/src/Services/GeoRoutes/Generated/Model/RouteAvoidanceOptions.cs index a14cdfefb442..42cf3bb7f498 100644 --- a/sdk/src/Services/GeoRoutes/Generated/Model/RouteAvoidanceOptions.cs +++ b/sdk/src/Services/GeoRoutes/Generated/Model/RouteAvoidanceOptions.cs @@ -71,9 +71,9 @@ internal bool IsSetAreas() /// Avoid car-shuttle-trains while calculating the route. /// /// - public bool CarShuttleTrains + public bool? CarShuttleTrains { - get { return this._carShuttleTrains.GetValueOrDefault(); } + get { return this._carShuttleTrains; } set { this._carShuttleTrains = value; } } @@ -89,9 +89,9 @@ internal bool IsSetCarShuttleTrains() /// Avoid controlled access highways while calculating the route. /// /// - public bool ControlledAccessHighways + public bool? ControlledAccessHighways { - get { return this._controlledAccessHighways.GetValueOrDefault(); } + get { return this._controlledAccessHighways; } set { this._controlledAccessHighways = value; } } @@ -107,9 +107,9 @@ internal bool IsSetControlledAccessHighways() /// Avoid dirt roads while calculating the route. /// /// - public bool DirtRoads + public bool? DirtRoads { - get { return this._dirtRoads.GetValueOrDefault(); } + get { return this._dirtRoads; } set { this._dirtRoads = value; } } @@ -125,9 +125,9 @@ internal bool IsSetDirtRoads() /// Avoid ferries while calculating the route. /// /// - public bool Ferries + public bool? Ferries { - get { return this._ferries.GetValueOrDefault(); } + get { return this._ferries; } set { this._ferries = value; } } @@ -143,9 +143,9 @@ internal bool IsSetFerries() /// Avoid roads that have seasonal closure while calculating the route. /// /// - public bool SeasonalClosure + public bool? SeasonalClosure { - get { return this._seasonalClosure.GetValueOrDefault(); } + get { return this._seasonalClosure; } set { this._seasonalClosure = value; } } @@ -161,9 +161,9 @@ internal bool IsSetSeasonalClosure() /// Avoids roads where the specified toll transponders are the only mode of payment. /// /// - public bool TollRoads + public bool? TollRoads { - get { return this._tollRoads.GetValueOrDefault(); } + get { return this._tollRoads; } set { this._tollRoads = value; } } @@ -179,9 +179,9 @@ internal bool IsSetTollRoads() /// Avoids roads where the specified toll transponders are the only mode of payment. /// /// - public bool TollTransponders + public bool? TollTransponders { - get { return this._tollTransponders.GetValueOrDefault(); } + get { return this._tollTransponders; } set { this._tollTransponders = value; } } @@ -222,9 +222,9 @@ internal bool IsSetTruckRoadTypes() /// Avoid tunnels while calculating the route. /// /// - public bool Tunnels + public bool? Tunnels { - get { return this._tunnels.GetValueOrDefault(); } + get { return this._tunnels; } set { this._tunnels = value; } } @@ -240,9 +240,9 @@ internal bool IsSetTunnels() /// Avoid U-turns for calculation on highways and motorways. /// /// - public bool UTurns + public bool? UTurns { - get { return this._uTurns.GetValueOrDefault(); } + get { return this._uTurns; } set { this._uTurns = value; } } diff --git a/sdk/src/Services/GeoRoutes/Generated/Model/RouteCarOptions.cs b/sdk/src/Services/GeoRoutes/Generated/Model/RouteCarOptions.cs index ef64214da8c1..64293d947f2a 100644 --- a/sdk/src/Services/GeoRoutes/Generated/Model/RouteCarOptions.cs +++ b/sdk/src/Services/GeoRoutes/Generated/Model/RouteCarOptions.cs @@ -86,9 +86,9 @@ internal bool IsSetLicensePlate() /// /// [AWSProperty(Max=252)] - public double MaxSpeed + public double? MaxSpeed { - get { return this._maxSpeed.GetValueOrDefault(); } + get { return this._maxSpeed; } set { this._maxSpeed = value; } } @@ -109,9 +109,9 @@ internal bool IsSetMaxSpeed() /// /// [AWSProperty(Min=1)] - public int Occupancy + public int? Occupancy { - get { return this._occupancy.GetValueOrDefault(); } + get { return this._occupancy; } set { this._occupancy = value; } } diff --git a/sdk/src/Services/GeoRoutes/Generated/Model/RouteContinueHighwayStepDetails.cs b/sdk/src/Services/GeoRoutes/Generated/Model/RouteContinueHighwayStepDetails.cs index bef17790be32..6ed25c0b8618 100644 --- a/sdk/src/Services/GeoRoutes/Generated/Model/RouteContinueHighwayStepDetails.cs +++ b/sdk/src/Services/GeoRoutes/Generated/Model/RouteContinueHighwayStepDetails.cs @@ -83,9 +83,9 @@ internal bool IsSetSteeringDirection() /// /// [AWSProperty(Min=-180, Max=180)] - public double TurnAngle + public double? TurnAngle { - get { return this._turnAngle.GetValueOrDefault(); } + get { return this._turnAngle; } set { this._turnAngle = value; } } diff --git a/sdk/src/Services/GeoRoutes/Generated/Model/RouteDestinationOptions.cs b/sdk/src/Services/GeoRoutes/Generated/Model/RouteDestinationOptions.cs index 7800520c5dda..c190e376761d 100644 --- a/sdk/src/Services/GeoRoutes/Generated/Model/RouteDestinationOptions.cs +++ b/sdk/src/Services/GeoRoutes/Generated/Model/RouteDestinationOptions.cs @@ -50,9 +50,9 @@ public partial class RouteDestinationOptions /// /// [AWSProperty(Max=2000)] - public long AvoidActionsForDistance + public long? AvoidActionsForDistance { - get { return this._avoidActionsForDistance.GetValueOrDefault(); } + get { return this._avoidActionsForDistance; } set { this._avoidActionsForDistance = value; } } @@ -68,9 +68,9 @@ internal bool IsSetAvoidActionsForDistance() /// Avoid U-turns for calculation on highways and motorways. /// /// - public bool AvoidUTurns + public bool? AvoidUTurns { - get { return this._avoidUTurns.GetValueOrDefault(); } + get { return this._avoidUTurns; } set { this._avoidUTurns = value; } } @@ -87,9 +87,9 @@ internal bool IsSetAvoidUTurns() /// /// [AWSProperty(Min=0, Max=360)] - public double Heading + public double? Heading { - get { return this._heading.GetValueOrDefault(); } + get { return this._heading; } set { this._heading = value; } } @@ -146,9 +146,9 @@ internal bool IsSetSideOfStreet() /// /// [AWSProperty(Min=0, Max=4294967295)] - public long StopDuration + public long? StopDuration { - get { return this._stopDuration.GetValueOrDefault(); } + get { return this._stopDuration; } set { this._stopDuration = value; } } diff --git a/sdk/src/Services/GeoRoutes/Generated/Model/RouteDriverScheduleInterval.cs b/sdk/src/Services/GeoRoutes/Generated/Model/RouteDriverScheduleInterval.cs index 1c860a686ff0..5fd39e5a1052 100644 --- a/sdk/src/Services/GeoRoutes/Generated/Model/RouteDriverScheduleInterval.cs +++ b/sdk/src/Services/GeoRoutes/Generated/Model/RouteDriverScheduleInterval.cs @@ -49,9 +49,9 @@ public partial class RouteDriverScheduleInterval /// /// [AWSProperty(Required=true, Min=0, Max=4294967295)] - public long DriveDuration + public long? DriveDuration { - get { return this._driveDuration.GetValueOrDefault(); } + get { return this._driveDuration; } set { this._driveDuration = value; } } @@ -72,9 +72,9 @@ internal bool IsSetDriveDuration() /// /// [AWSProperty(Required=true, Min=0, Max=4294967295)] - public long RestDuration + public long? RestDuration { - get { return this._restDuration.GetValueOrDefault(); } + get { return this._restDuration; } set { this._restDuration = value; } } diff --git a/sdk/src/Services/GeoRoutes/Generated/Model/RouteEnterHighwayStepDetails.cs b/sdk/src/Services/GeoRoutes/Generated/Model/RouteEnterHighwayStepDetails.cs index 74c16028f4d6..ec7df875ec4c 100644 --- a/sdk/src/Services/GeoRoutes/Generated/Model/RouteEnterHighwayStepDetails.cs +++ b/sdk/src/Services/GeoRoutes/Generated/Model/RouteEnterHighwayStepDetails.cs @@ -83,9 +83,9 @@ internal bool IsSetSteeringDirection() /// /// [AWSProperty(Min=-180, Max=180)] - public double TurnAngle + public double? TurnAngle { - get { return this._turnAngle.GetValueOrDefault(); } + get { return this._turnAngle; } set { this._turnAngle = value; } } diff --git a/sdk/src/Services/GeoRoutes/Generated/Model/RouteExitStepDetails.cs b/sdk/src/Services/GeoRoutes/Generated/Model/RouteExitStepDetails.cs index 95e5f1587114..e960d646df17 100644 --- a/sdk/src/Services/GeoRoutes/Generated/Model/RouteExitStepDetails.cs +++ b/sdk/src/Services/GeoRoutes/Generated/Model/RouteExitStepDetails.cs @@ -66,9 +66,9 @@ internal bool IsSetIntersection() /// /// [AWSProperty(Min=1, Max=12)] - public int RelativeExit + public int? RelativeExit { - get { return this._relativeExit.GetValueOrDefault(); } + get { return this._relativeExit; } set { this._relativeExit = value; } } @@ -103,9 +103,9 @@ internal bool IsSetSteeringDirection() /// /// [AWSProperty(Min=-180, Max=180)] - public double TurnAngle + public double? TurnAngle { - get { return this._turnAngle.GetValueOrDefault(); } + get { return this._turnAngle; } set { this._turnAngle = value; } } diff --git a/sdk/src/Services/GeoRoutes/Generated/Model/RouteFerryAfterTravelStep.cs b/sdk/src/Services/GeoRoutes/Generated/Model/RouteFerryAfterTravelStep.cs index af59b611df39..78e3c6dd6a8d 100644 --- a/sdk/src/Services/GeoRoutes/Generated/Model/RouteFerryAfterTravelStep.cs +++ b/sdk/src/Services/GeoRoutes/Generated/Model/RouteFerryAfterTravelStep.cs @@ -49,9 +49,9 @@ public partial class RouteFerryAfterTravelStep /// /// [AWSProperty(Required=true, Min=0, Max=4294967295)] - public long Duration + public long? Duration { - get { return this._duration.GetValueOrDefault(); } + get { return this._duration; } set { this._duration = value; } } diff --git a/sdk/src/Services/GeoRoutes/Generated/Model/RouteFerryBeforeTravelStep.cs b/sdk/src/Services/GeoRoutes/Generated/Model/RouteFerryBeforeTravelStep.cs index 139d5a606d80..fe64b0f90cf1 100644 --- a/sdk/src/Services/GeoRoutes/Generated/Model/RouteFerryBeforeTravelStep.cs +++ b/sdk/src/Services/GeoRoutes/Generated/Model/RouteFerryBeforeTravelStep.cs @@ -49,9 +49,9 @@ public partial class RouteFerryBeforeTravelStep /// /// [AWSProperty(Required=true, Min=0, Max=4294967295)] - public long Duration + public long? Duration { - get { return this._duration.GetValueOrDefault(); } + get { return this._duration; } set { this._duration = value; } } diff --git a/sdk/src/Services/GeoRoutes/Generated/Model/RouteFerryOverviewSummary.cs b/sdk/src/Services/GeoRoutes/Generated/Model/RouteFerryOverviewSummary.cs index a02fd51d2b95..04fef38a5fb6 100644 --- a/sdk/src/Services/GeoRoutes/Generated/Model/RouteFerryOverviewSummary.cs +++ b/sdk/src/Services/GeoRoutes/Generated/Model/RouteFerryOverviewSummary.cs @@ -44,9 +44,9 @@ public partial class RouteFerryOverviewSummary /// /// [AWSProperty(Required=true, Min=0, Max=4294967295)] - public long Distance + public long? Distance { - get { return this._distance.GetValueOrDefault(); } + get { return this._distance; } set { this._distance = value; } } @@ -67,9 +67,9 @@ internal bool IsSetDistance() /// /// [AWSProperty(Required=true, Min=0, Max=4294967295)] - public long Duration + public long? Duration { - get { return this._duration.GetValueOrDefault(); } + get { return this._duration; } set { this._duration = value; } } diff --git a/sdk/src/Services/GeoRoutes/Generated/Model/RouteFerryPlace.cs b/sdk/src/Services/GeoRoutes/Generated/Model/RouteFerryPlace.cs index 47a30f2c271d..1058d85186b9 100644 --- a/sdk/src/Services/GeoRoutes/Generated/Model/RouteFerryPlace.cs +++ b/sdk/src/Services/GeoRoutes/Generated/Model/RouteFerryPlace.cs @@ -102,9 +102,9 @@ internal bool IsSetPosition() /// /// [AWSProperty(Min=0)] - public int WaypointIndex + public int? WaypointIndex { - get { return this._waypointIndex.GetValueOrDefault(); } + get { return this._waypointIndex; } set { this._waypointIndex = value; } } diff --git a/sdk/src/Services/GeoRoutes/Generated/Model/RouteFerrySpan.cs b/sdk/src/Services/GeoRoutes/Generated/Model/RouteFerrySpan.cs index 8d9a7f52f758..78579419037a 100644 --- a/sdk/src/Services/GeoRoutes/Generated/Model/RouteFerrySpan.cs +++ b/sdk/src/Services/GeoRoutes/Generated/Model/RouteFerrySpan.cs @@ -68,9 +68,9 @@ internal bool IsSetCountry() /// /// [AWSProperty(Min=0, Max=4294967295)] - public long Distance + public long? Distance { - get { return this._distance.GetValueOrDefault(); } + get { return this._distance; } set { this._distance = value; } } @@ -92,9 +92,9 @@ internal bool IsSetDistance() /// /// [AWSProperty(Min=0, Max=4294967295)] - public long Duration + public long? Duration { - get { return this._duration.GetValueOrDefault(); } + get { return this._duration; } set { this._duration = value; } } @@ -111,9 +111,9 @@ internal bool IsSetDuration() /// /// [AWSProperty(Min=0)] - public int GeometryOffset + public int? GeometryOffset { - get { return this._geometryOffset.GetValueOrDefault(); } + get { return this._geometryOffset; } set { this._geometryOffset = value; } } diff --git a/sdk/src/Services/GeoRoutes/Generated/Model/RouteFerryTravelOnlySummary.cs b/sdk/src/Services/GeoRoutes/Generated/Model/RouteFerryTravelOnlySummary.cs index 1e13987334a1..bcd44648a720 100644 --- a/sdk/src/Services/GeoRoutes/Generated/Model/RouteFerryTravelOnlySummary.cs +++ b/sdk/src/Services/GeoRoutes/Generated/Model/RouteFerryTravelOnlySummary.cs @@ -49,9 +49,9 @@ public partial class RouteFerryTravelOnlySummary /// /// [AWSProperty(Required=true, Min=0, Max=4294967295)] - public long Duration + public long? Duration { - get { return this._duration.GetValueOrDefault(); } + get { return this._duration; } set { this._duration = value; } } diff --git a/sdk/src/Services/GeoRoutes/Generated/Model/RouteFerryTravelStep.cs b/sdk/src/Services/GeoRoutes/Generated/Model/RouteFerryTravelStep.cs index 5ad9418f94a8..2c126624a674 100644 --- a/sdk/src/Services/GeoRoutes/Generated/Model/RouteFerryTravelStep.cs +++ b/sdk/src/Services/GeoRoutes/Generated/Model/RouteFerryTravelStep.cs @@ -47,9 +47,9 @@ public partial class RouteFerryTravelStep /// /// [AWSProperty(Min=0, Max=4294967295)] - public long Distance + public long? Distance { - get { return this._distance.GetValueOrDefault(); } + get { return this._distance; } set { this._distance = value; } } @@ -70,9 +70,9 @@ internal bool IsSetDistance() /// /// [AWSProperty(Required=true, Min=0, Max=4294967295)] - public long Duration + public long? Duration { - get { return this._duration.GetValueOrDefault(); } + get { return this._duration; } set { this._duration = value; } } @@ -89,9 +89,9 @@ internal bool IsSetDuration() /// /// [AWSProperty(Min=0)] - public int GeometryOffset + public int? GeometryOffset { - get { return this._geometryOffset.GetValueOrDefault(); } + get { return this._geometryOffset; } set { this._geometryOffset = value; } } diff --git a/sdk/src/Services/GeoRoutes/Generated/Model/RouteKeepStepDetails.cs b/sdk/src/Services/GeoRoutes/Generated/Model/RouteKeepStepDetails.cs index 2ad9fecf06b4..b408120f5f2e 100644 --- a/sdk/src/Services/GeoRoutes/Generated/Model/RouteKeepStepDetails.cs +++ b/sdk/src/Services/GeoRoutes/Generated/Model/RouteKeepStepDetails.cs @@ -83,9 +83,9 @@ internal bool IsSetSteeringDirection() /// /// [AWSProperty(Min=-180, Max=180)] - public double TurnAngle + public double? TurnAngle { - get { return this._turnAngle.GetValueOrDefault(); } + get { return this._turnAngle; } set { this._turnAngle = value; } } diff --git a/sdk/src/Services/GeoRoutes/Generated/Model/RouteMatchingOptions.cs b/sdk/src/Services/GeoRoutes/Generated/Model/RouteMatchingOptions.cs index a35cadd35736..87b8c56c0fef 100644 --- a/sdk/src/Services/GeoRoutes/Generated/Model/RouteMatchingOptions.cs +++ b/sdk/src/Services/GeoRoutes/Generated/Model/RouteMatchingOptions.cs @@ -70,9 +70,9 @@ internal bool IsSetNameHint() /// /// [AWSProperty(Min=0, Max=4294967295)] - public long OnRoadThreshold + public long? OnRoadThreshold { - get { return this._onRoadThreshold.GetValueOrDefault(); } + get { return this._onRoadThreshold; } set { this._onRoadThreshold = value; } } @@ -94,9 +94,9 @@ internal bool IsSetOnRoadThreshold() /// /// [AWSProperty(Min=0, Max=4294967295)] - public long Radius + public long? Radius { - get { return this._radius.GetValueOrDefault(); } + get { return this._radius; } set { this._radius = value; } } diff --git a/sdk/src/Services/GeoRoutes/Generated/Model/RouteMatrixAllowOptions.cs b/sdk/src/Services/GeoRoutes/Generated/Model/RouteMatrixAllowOptions.cs index 3d0312feefa2..3557d6143f1f 100644 --- a/sdk/src/Services/GeoRoutes/Generated/Model/RouteMatrixAllowOptions.cs +++ b/sdk/src/Services/GeoRoutes/Generated/Model/RouteMatrixAllowOptions.cs @@ -43,9 +43,9 @@ public partial class RouteMatrixAllowOptions /// Allow Hot (High Occupancy Toll) lanes while calculating the route. /// /// - public bool Hot + public bool? Hot { - get { return this._hot.GetValueOrDefault(); } + get { return this._hot; } set { this._hot = value; } } @@ -61,9 +61,9 @@ internal bool IsSetHot() /// Allow Hov (High Occupancy vehicle) lanes while calculating the route. /// /// - public bool Hov + public bool? Hov { - get { return this._hov.GetValueOrDefault(); } + get { return this._hov; } set { this._hov = value; } } diff --git a/sdk/src/Services/GeoRoutes/Generated/Model/RouteMatrixAutoCircle.cs b/sdk/src/Services/GeoRoutes/Generated/Model/RouteMatrixAutoCircle.cs index b1106ab0b102..53a50d2c8f94 100644 --- a/sdk/src/Services/GeoRoutes/Generated/Model/RouteMatrixAutoCircle.cs +++ b/sdk/src/Services/GeoRoutes/Generated/Model/RouteMatrixAutoCircle.cs @@ -44,9 +44,9 @@ public partial class RouteMatrixAutoCircle /// /// [AWSProperty(Min=0, Max=200000)] - public long Margin + public long? Margin { - get { return this._margin.GetValueOrDefault(); } + get { return this._margin; } set { this._margin = value; } } @@ -63,9 +63,9 @@ internal bool IsSetMargin() /// /// [AWSProperty(Min=0, Max=200000)] - public long MaxRadius + public long? MaxRadius { - get { return this._maxRadius.GetValueOrDefault(); } + get { return this._maxRadius; } set { this._maxRadius = value; } } diff --git a/sdk/src/Services/GeoRoutes/Generated/Model/RouteMatrixAvoidanceOptions.cs b/sdk/src/Services/GeoRoutes/Generated/Model/RouteMatrixAvoidanceOptions.cs index 0de9e3e15853..99c0b5f55b18 100644 --- a/sdk/src/Services/GeoRoutes/Generated/Model/RouteMatrixAvoidanceOptions.cs +++ b/sdk/src/Services/GeoRoutes/Generated/Model/RouteMatrixAvoidanceOptions.cs @@ -71,9 +71,9 @@ internal bool IsSetAreas() /// Avoid car-shuttle-trains while calculating the route. /// /// - public bool CarShuttleTrains + public bool? CarShuttleTrains { - get { return this._carShuttleTrains.GetValueOrDefault(); } + get { return this._carShuttleTrains; } set { this._carShuttleTrains = value; } } @@ -89,9 +89,9 @@ internal bool IsSetCarShuttleTrains() /// Avoid controlled access highways while calculating the route. /// /// - public bool ControlledAccessHighways + public bool? ControlledAccessHighways { - get { return this._controlledAccessHighways.GetValueOrDefault(); } + get { return this._controlledAccessHighways; } set { this._controlledAccessHighways = value; } } @@ -107,9 +107,9 @@ internal bool IsSetControlledAccessHighways() /// Avoid dirt roads while calculating the route. /// /// - public bool DirtRoads + public bool? DirtRoads { - get { return this._dirtRoads.GetValueOrDefault(); } + get { return this._dirtRoads; } set { this._dirtRoads = value; } } @@ -125,9 +125,9 @@ internal bool IsSetDirtRoads() /// Avoid ferries while calculating the route. /// /// - public bool Ferries + public bool? Ferries { - get { return this._ferries.GetValueOrDefault(); } + get { return this._ferries; } set { this._ferries = value; } } @@ -143,9 +143,9 @@ internal bool IsSetFerries() /// Avoids roads where the specified toll transponders are the only mode of payment. /// /// - public bool TollRoads + public bool? TollRoads { - get { return this._tollRoads.GetValueOrDefault(); } + get { return this._tollRoads; } set { this._tollRoads = value; } } @@ -161,9 +161,9 @@ internal bool IsSetTollRoads() /// Avoids roads where the specified toll transponders are the only mode of payment. /// /// - public bool TollTransponders + public bool? TollTransponders { - get { return this._tollTransponders.GetValueOrDefault(); } + get { return this._tollTransponders; } set { this._tollTransponders = value; } } @@ -204,9 +204,9 @@ internal bool IsSetTruckRoadTypes() /// Avoid tunnels while calculating the route. /// /// - public bool Tunnels + public bool? Tunnels { - get { return this._tunnels.GetValueOrDefault(); } + get { return this._tunnels; } set { this._tunnels = value; } } @@ -222,9 +222,9 @@ internal bool IsSetTunnels() /// Avoid U-turns for calculation on highways and motorways. /// /// - public bool UTurns + public bool? UTurns { - get { return this._uTurns.GetValueOrDefault(); } + get { return this._uTurns; } set { this._uTurns = value; } } diff --git a/sdk/src/Services/GeoRoutes/Generated/Model/RouteMatrixBoundary.cs b/sdk/src/Services/GeoRoutes/Generated/Model/RouteMatrixBoundary.cs index 371ea8dd67ab..478eecfc91fc 100644 --- a/sdk/src/Services/GeoRoutes/Generated/Model/RouteMatrixBoundary.cs +++ b/sdk/src/Services/GeoRoutes/Generated/Model/RouteMatrixBoundary.cs @@ -62,9 +62,9 @@ internal bool IsSetGeometry() /// No restrictions in terms of a routing boundary, and is typically used for longer routes. /// /// - public bool Unbounded + public bool? Unbounded { - get { return this._unbounded.GetValueOrDefault(); } + get { return this._unbounded; } set { this._unbounded = value; } } diff --git a/sdk/src/Services/GeoRoutes/Generated/Model/RouteMatrixCarOptions.cs b/sdk/src/Services/GeoRoutes/Generated/Model/RouteMatrixCarOptions.cs index b29f5b0962db..3f6e4f607905 100644 --- a/sdk/src/Services/GeoRoutes/Generated/Model/RouteMatrixCarOptions.cs +++ b/sdk/src/Services/GeoRoutes/Generated/Model/RouteMatrixCarOptions.cs @@ -67,9 +67,9 @@ internal bool IsSetLicensePlate() /// /// [AWSProperty(Max=252)] - public double MaxSpeed + public double? MaxSpeed { - get { return this._maxSpeed.GetValueOrDefault(); } + get { return this._maxSpeed; } set { this._maxSpeed = value; } } @@ -90,9 +90,9 @@ internal bool IsSetMaxSpeed() /// /// [AWSProperty(Min=1)] - public int Occupancy + public int? Occupancy { - get { return this._occupancy.GetValueOrDefault(); } + get { return this._occupancy; } set { this._occupancy = value; } } diff --git a/sdk/src/Services/GeoRoutes/Generated/Model/RouteMatrixDestinationOptions.cs b/sdk/src/Services/GeoRoutes/Generated/Model/RouteMatrixDestinationOptions.cs index d0a28f074ca7..f92125e3d499 100644 --- a/sdk/src/Services/GeoRoutes/Generated/Model/RouteMatrixDestinationOptions.cs +++ b/sdk/src/Services/GeoRoutes/Generated/Model/RouteMatrixDestinationOptions.cs @@ -48,9 +48,9 @@ public partial class RouteMatrixDestinationOptions /// /// [AWSProperty(Min=0)] - public long AvoidActionsForDistance + public long? AvoidActionsForDistance { - get { return this._avoidActionsForDistance.GetValueOrDefault(); } + get { return this._avoidActionsForDistance; } set { this._avoidActionsForDistance = value; } } @@ -67,9 +67,9 @@ internal bool IsSetAvoidActionsForDistance() /// /// [AWSProperty(Min=0, Max=360)] - public double Heading + public double? Heading { - get { return this._heading.GetValueOrDefault(); } + get { return this._heading; } set { this._heading = value; } } diff --git a/sdk/src/Services/GeoRoutes/Generated/Model/RouteMatrixEntry.cs b/sdk/src/Services/GeoRoutes/Generated/Model/RouteMatrixEntry.cs index b0a353e0251c..283af8614d4d 100644 --- a/sdk/src/Services/GeoRoutes/Generated/Model/RouteMatrixEntry.cs +++ b/sdk/src/Services/GeoRoutes/Generated/Model/RouteMatrixEntry.cs @@ -47,9 +47,9 @@ public partial class RouteMatrixEntry /// /// [AWSProperty(Required=true, Min=0, Max=4294967295)] - public long Distance + public long? Distance { - get { return this._distance.GetValueOrDefault(); } + get { return this._distance; } set { this._distance = value; } } @@ -70,9 +70,9 @@ internal bool IsSetDistance() /// /// [AWSProperty(Required=true, Min=0, Max=4294967295)] - public long Duration + public long? Duration { - get { return this._duration.GetValueOrDefault(); } + get { return this._duration; } set { this._duration = value; } } diff --git a/sdk/src/Services/GeoRoutes/Generated/Model/RouteMatrixMatchingOptions.cs b/sdk/src/Services/GeoRoutes/Generated/Model/RouteMatrixMatchingOptions.cs index 34ad1a7b9cdc..acd669f86f4f 100644 --- a/sdk/src/Services/GeoRoutes/Generated/Model/RouteMatrixMatchingOptions.cs +++ b/sdk/src/Services/GeoRoutes/Generated/Model/RouteMatrixMatchingOptions.cs @@ -70,9 +70,9 @@ internal bool IsSetNameHint() /// /// [AWSProperty(Min=0)] - public long OnRoadThreshold + public long? OnRoadThreshold { - get { return this._onRoadThreshold.GetValueOrDefault(); } + get { return this._onRoadThreshold; } set { this._onRoadThreshold = value; } } @@ -94,9 +94,9 @@ internal bool IsSetOnRoadThreshold() /// /// [AWSProperty(Min=0, Max=4294967295)] - public long Radius + public long? Radius { - get { return this._radius.GetValueOrDefault(); } + get { return this._radius; } set { this._radius = value; } } diff --git a/sdk/src/Services/GeoRoutes/Generated/Model/RouteMatrixOriginOptions.cs b/sdk/src/Services/GeoRoutes/Generated/Model/RouteMatrixOriginOptions.cs index 2b19ba375123..3ef1c48aa846 100644 --- a/sdk/src/Services/GeoRoutes/Generated/Model/RouteMatrixOriginOptions.cs +++ b/sdk/src/Services/GeoRoutes/Generated/Model/RouteMatrixOriginOptions.cs @@ -48,9 +48,9 @@ public partial class RouteMatrixOriginOptions /// /// [AWSProperty(Min=0)] - public long AvoidActionsForDistance + public long? AvoidActionsForDistance { - get { return this._avoidActionsForDistance.GetValueOrDefault(); } + get { return this._avoidActionsForDistance; } set { this._avoidActionsForDistance = value; } } @@ -67,9 +67,9 @@ internal bool IsSetAvoidActionsForDistance() /// /// [AWSProperty(Min=0, Max=360)] - public double Heading + public double? Heading { - get { return this._heading.GetValueOrDefault(); } + get { return this._heading; } set { this._heading = value; } } diff --git a/sdk/src/Services/GeoRoutes/Generated/Model/RouteMatrixScooterOptions.cs b/sdk/src/Services/GeoRoutes/Generated/Model/RouteMatrixScooterOptions.cs index cbb302755c4d..e5efde07fe56 100644 --- a/sdk/src/Services/GeoRoutes/Generated/Model/RouteMatrixScooterOptions.cs +++ b/sdk/src/Services/GeoRoutes/Generated/Model/RouteMatrixScooterOptions.cs @@ -67,9 +67,9 @@ internal bool IsSetLicensePlate() /// /// [AWSProperty(Max=252)] - public double MaxSpeed + public double? MaxSpeed { - get { return this._maxSpeed.GetValueOrDefault(); } + get { return this._maxSpeed; } set { this._maxSpeed = value; } } @@ -90,9 +90,9 @@ internal bool IsSetMaxSpeed() /// /// [AWSProperty(Min=1)] - public int Occupancy + public int? Occupancy { - get { return this._occupancy.GetValueOrDefault(); } + get { return this._occupancy; } set { this._occupancy = value; } } diff --git a/sdk/src/Services/GeoRoutes/Generated/Model/RouteMatrixTrafficOptions.cs b/sdk/src/Services/GeoRoutes/Generated/Model/RouteMatrixTrafficOptions.cs index bb4026e951b1..024c9fccbd24 100644 --- a/sdk/src/Services/GeoRoutes/Generated/Model/RouteMatrixTrafficOptions.cs +++ b/sdk/src/Services/GeoRoutes/Generated/Model/RouteMatrixTrafficOptions.cs @@ -48,9 +48,9 @@ public partial class RouteMatrixTrafficOptions /// /// [AWSProperty(Min=0, Max=4294967295)] - public long FlowEventThresholdOverride + public long? FlowEventThresholdOverride { - get { return this._flowEventThresholdOverride.GetValueOrDefault(); } + get { return this._flowEventThresholdOverride; } set { this._flowEventThresholdOverride = value; } } diff --git a/sdk/src/Services/GeoRoutes/Generated/Model/RouteMatrixTrailerOptions.cs b/sdk/src/Services/GeoRoutes/Generated/Model/RouteMatrixTrailerOptions.cs index 5c1168d8b30c..420506b3cf84 100644 --- a/sdk/src/Services/GeoRoutes/Generated/Model/RouteMatrixTrailerOptions.cs +++ b/sdk/src/Services/GeoRoutes/Generated/Model/RouteMatrixTrailerOptions.cs @@ -47,9 +47,9 @@ public partial class RouteMatrixTrailerOptions /// /// [AWSProperty(Min=0, Max=255)] - public int TrailerCount + public int? TrailerCount { - get { return this._trailerCount.GetValueOrDefault(); } + get { return this._trailerCount; } set { this._trailerCount = value; } } diff --git a/sdk/src/Services/GeoRoutes/Generated/Model/RouteMatrixTruckOptions.cs b/sdk/src/Services/GeoRoutes/Generated/Model/RouteMatrixTruckOptions.cs index e1e360440d7f..37cae8cf6617 100644 --- a/sdk/src/Services/GeoRoutes/Generated/Model/RouteMatrixTruckOptions.cs +++ b/sdk/src/Services/GeoRoutes/Generated/Model/RouteMatrixTruckOptions.cs @@ -58,9 +58,9 @@ public partial class RouteMatrixTruckOptions /// /// [AWSProperty(Min=2, Max=255)] - public int AxleCount + public int? AxleCount { - get { return this._axleCount.GetValueOrDefault(); } + get { return this._axleCount; } set { this._axleCount = value; } } @@ -81,9 +81,9 @@ internal bool IsSetAxleCount() /// /// [AWSProperty(Min=0, Max=4294967295)] - public long GrossWeight + public long? GrossWeight { - get { return this._grossWeight.GetValueOrDefault(); } + get { return this._grossWeight; } set { this._grossWeight = value; } } @@ -123,9 +123,9 @@ internal bool IsSetHazardousCargos() /// /// [AWSProperty(Min=0, Max=5000)] - public long Height + public long? Height { - get { return this._height.GetValueOrDefault(); } + get { return this._height; } set { this._height = value; } } @@ -146,9 +146,9 @@ internal bool IsSetHeight() /// /// [AWSProperty(Min=0, Max=4294967295)] - public long KpraLength + public long? KpraLength { - get { return this._kpraLength.GetValueOrDefault(); } + get { return this._kpraLength; } set { this._kpraLength = value; } } @@ -169,9 +169,9 @@ internal bool IsSetKpraLength() /// /// [AWSProperty(Min=0, Max=30000)] - public long Length + public long? Length { - get { return this._length.GetValueOrDefault(); } + get { return this._length; } set { this._length = value; } } @@ -210,9 +210,9 @@ internal bool IsSetLicensePlate() /// /// [AWSProperty(Max=252)] - public double MaxSpeed + public double? MaxSpeed { - get { return this._maxSpeed.GetValueOrDefault(); } + get { return this._maxSpeed; } set { this._maxSpeed = value; } } @@ -233,9 +233,9 @@ internal bool IsSetMaxSpeed() /// /// [AWSProperty(Min=1)] - public int Occupancy + public int? Occupancy { - get { return this._occupancy.GetValueOrDefault(); } + get { return this._occupancy; } set { this._occupancy = value; } } @@ -256,9 +256,9 @@ internal bool IsSetOccupancy() /// /// [AWSProperty(Min=0, Max=4294967295)] - public long PayloadCapacity + public long? PayloadCapacity { - get { return this._payloadCapacity.GetValueOrDefault(); } + get { return this._payloadCapacity; } set { this._payloadCapacity = value; } } @@ -390,9 +390,9 @@ internal bool IsSetTunnelRestrictionCode() /// /// [AWSProperty(Min=0, Max=4294967295)] - public long WeightPerAxle + public long? WeightPerAxle { - get { return this._weightPerAxle.GetValueOrDefault(); } + get { return this._weightPerAxle; } set { this._weightPerAxle = value; } } @@ -432,9 +432,9 @@ internal bool IsSetWeightPerAxleGroup() /// /// [AWSProperty(Min=0, Max=5000)] - public long Width + public long? Width { - get { return this._width.GetValueOrDefault(); } + get { return this._width; } set { this._width = value; } } diff --git a/sdk/src/Services/GeoRoutes/Generated/Model/RouteNoticeDetailRange.cs b/sdk/src/Services/GeoRoutes/Generated/Model/RouteNoticeDetailRange.cs index e9e17665b22f..e88a79e020fa 100644 --- a/sdk/src/Services/GeoRoutes/Generated/Model/RouteNoticeDetailRange.cs +++ b/sdk/src/Services/GeoRoutes/Generated/Model/RouteNoticeDetailRange.cs @@ -44,9 +44,9 @@ public partial class RouteNoticeDetailRange /// /// [AWSProperty(Min=0)] - public int Max + public int? Max { - get { return this._max.GetValueOrDefault(); } + get { return this._max; } set { this._max = value; } } @@ -63,9 +63,9 @@ internal bool IsSetMax() /// /// [AWSProperty(Min=0)] - public int Min + public int? Min { - get { return this._min.GetValueOrDefault(); } + get { return this._min; } set { this._min = value; } } diff --git a/sdk/src/Services/GeoRoutes/Generated/Model/RouteOriginOptions.cs b/sdk/src/Services/GeoRoutes/Generated/Model/RouteOriginOptions.cs index a833d45d1578..a9b8782df2c8 100644 --- a/sdk/src/Services/GeoRoutes/Generated/Model/RouteOriginOptions.cs +++ b/sdk/src/Services/GeoRoutes/Generated/Model/RouteOriginOptions.cs @@ -49,9 +49,9 @@ public partial class RouteOriginOptions /// /// [AWSProperty(Max=2000)] - public long AvoidActionsForDistance + public long? AvoidActionsForDistance { - get { return this._avoidActionsForDistance.GetValueOrDefault(); } + get { return this._avoidActionsForDistance; } set { this._avoidActionsForDistance = value; } } @@ -67,9 +67,9 @@ internal bool IsSetAvoidActionsForDistance() /// Avoid U-turns for calculation on highways and motorways. /// /// - public bool AvoidUTurns + public bool? AvoidUTurns { - get { return this._avoidUTurns.GetValueOrDefault(); } + get { return this._avoidUTurns; } set { this._avoidUTurns = value; } } @@ -86,9 +86,9 @@ internal bool IsSetAvoidUTurns() /// /// [AWSProperty(Min=0, Max=360)] - public double Heading + public double? Heading { - get { return this._heading.GetValueOrDefault(); } + get { return this._heading; } set { this._heading = value; } } diff --git a/sdk/src/Services/GeoRoutes/Generated/Model/RoutePassThroughPlace.cs b/sdk/src/Services/GeoRoutes/Generated/Model/RoutePassThroughPlace.cs index 3856b4d04c26..ec2de22befc7 100644 --- a/sdk/src/Services/GeoRoutes/Generated/Model/RoutePassThroughPlace.cs +++ b/sdk/src/Services/GeoRoutes/Generated/Model/RoutePassThroughPlace.cs @@ -83,9 +83,9 @@ internal bool IsSetPosition() /// /// [AWSProperty(Min=0)] - public int WaypointIndex + public int? WaypointIndex { - get { return this._waypointIndex.GetValueOrDefault(); } + get { return this._waypointIndex; } set { this._waypointIndex = value; } } diff --git a/sdk/src/Services/GeoRoutes/Generated/Model/RoutePassThroughWaypoint.cs b/sdk/src/Services/GeoRoutes/Generated/Model/RoutePassThroughWaypoint.cs index ae5e93f3ee88..aa873edf77dd 100644 --- a/sdk/src/Services/GeoRoutes/Generated/Model/RoutePassThroughWaypoint.cs +++ b/sdk/src/Services/GeoRoutes/Generated/Model/RoutePassThroughWaypoint.cs @@ -45,9 +45,9 @@ public partial class RoutePassThroughWaypoint /// /// [AWSProperty(Min=0)] - public int GeometryOffset + public int? GeometryOffset { - get { return this._geometryOffset.GetValueOrDefault(); } + get { return this._geometryOffset; } set { this._geometryOffset = value; } } diff --git a/sdk/src/Services/GeoRoutes/Generated/Model/RoutePedestrianOptions.cs b/sdk/src/Services/GeoRoutes/Generated/Model/RoutePedestrianOptions.cs index 9655e51f0487..2cf8cbdbf63d 100644 --- a/sdk/src/Services/GeoRoutes/Generated/Model/RoutePedestrianOptions.cs +++ b/sdk/src/Services/GeoRoutes/Generated/Model/RoutePedestrianOptions.cs @@ -42,9 +42,9 @@ public partial class RoutePedestrianOptions /// Walking speed in Kilometers per hour. /// /// - public double Speed + public double? Speed { - get { return this._speed.GetValueOrDefault(); } + get { return this._speed; } set { this._speed = value; } } diff --git a/sdk/src/Services/GeoRoutes/Generated/Model/RoutePedestrianOverviewSummary.cs b/sdk/src/Services/GeoRoutes/Generated/Model/RoutePedestrianOverviewSummary.cs index cc28277cfcb4..5fb2a6e7492f 100644 --- a/sdk/src/Services/GeoRoutes/Generated/Model/RoutePedestrianOverviewSummary.cs +++ b/sdk/src/Services/GeoRoutes/Generated/Model/RoutePedestrianOverviewSummary.cs @@ -44,9 +44,9 @@ public partial class RoutePedestrianOverviewSummary /// /// [AWSProperty(Required=true, Min=0, Max=4294967295)] - public long Distance + public long? Distance { - get { return this._distance.GetValueOrDefault(); } + get { return this._distance; } set { this._distance = value; } } @@ -63,9 +63,9 @@ internal bool IsSetDistance() /// /// [AWSProperty(Required=true, Min=0, Max=4294967295)] - public long Duration + public long? Duration { - get { return this._duration.GetValueOrDefault(); } + get { return this._duration; } set { this._duration = value; } } diff --git a/sdk/src/Services/GeoRoutes/Generated/Model/RoutePedestrianPlace.cs b/sdk/src/Services/GeoRoutes/Generated/Model/RoutePedestrianPlace.cs index f4c274d8a06c..c2b7a377f501 100644 --- a/sdk/src/Services/GeoRoutes/Generated/Model/RoutePedestrianPlace.cs +++ b/sdk/src/Services/GeoRoutes/Generated/Model/RoutePedestrianPlace.cs @@ -121,9 +121,9 @@ internal bool IsSetSideOfStreet() /// /// [AWSProperty(Min=0)] - public int WaypointIndex + public int? WaypointIndex { - get { return this._waypointIndex.GetValueOrDefault(); } + get { return this._waypointIndex; } set { this._waypointIndex = value; } } diff --git a/sdk/src/Services/GeoRoutes/Generated/Model/RoutePedestrianSpan.cs b/sdk/src/Services/GeoRoutes/Generated/Model/RoutePedestrianSpan.cs index 50ab05e2ba7b..20ad7fec9ff8 100644 --- a/sdk/src/Services/GeoRoutes/Generated/Model/RoutePedestrianSpan.cs +++ b/sdk/src/Services/GeoRoutes/Generated/Model/RoutePedestrianSpan.cs @@ -61,9 +61,9 @@ public partial class RoutePedestrianSpan /// /// [AWSProperty(Min=0, Max=4294967295)] - public long BestCaseDuration + public long? BestCaseDuration { - get { return this._bestCaseDuration.GetValueOrDefault(); } + get { return this._bestCaseDuration; } set { this._bestCaseDuration = value; } } @@ -100,9 +100,9 @@ internal bool IsSetCountry() /// /// [AWSProperty(Min=0, Max=4294967295)] - public long Distance + public long? Distance { - get { return this._distance.GetValueOrDefault(); } + get { return this._distance; } set { this._distance = value; } } @@ -124,9 +124,9 @@ internal bool IsSetDistance() /// /// [AWSProperty(Min=0, Max=4294967295)] - public long Duration + public long? Duration { - get { return this._duration.GetValueOrDefault(); } + get { return this._duration; } set { this._duration = value; } } @@ -165,9 +165,9 @@ internal bool IsSetDynamicSpeed() /// /// [AWSProperty(Min=1, Max=5)] - public int FunctionalClassification + public int? FunctionalClassification { - get { return this._functionalClassification.GetValueOrDefault(); } + get { return this._functionalClassification; } set { this._functionalClassification = value; } } @@ -184,9 +184,9 @@ internal bool IsSetFunctionalClassification() /// /// [AWSProperty(Min=0)] - public int GeometryOffset + public int? GeometryOffset { - get { return this._geometryOffset.GetValueOrDefault(); } + get { return this._geometryOffset; } set { this._geometryOffset = value; } } @@ -341,9 +341,9 @@ internal bool IsSetSpeedLimit() /// /// [AWSProperty(Min=0, Max=4294967295)] - public long TypicalDuration + public long? TypicalDuration { - get { return this._typicalDuration.GetValueOrDefault(); } + get { return this._typicalDuration; } set { this._typicalDuration = value; } } diff --git a/sdk/src/Services/GeoRoutes/Generated/Model/RoutePedestrianTravelOnlySummary.cs b/sdk/src/Services/GeoRoutes/Generated/Model/RoutePedestrianTravelOnlySummary.cs index 85f54632d0f7..7dabaca30e24 100644 --- a/sdk/src/Services/GeoRoutes/Generated/Model/RoutePedestrianTravelOnlySummary.cs +++ b/sdk/src/Services/GeoRoutes/Generated/Model/RoutePedestrianTravelOnlySummary.cs @@ -47,9 +47,9 @@ public partial class RoutePedestrianTravelOnlySummary /// /// [AWSProperty(Required=true, Min=0, Max=4294967295)] - public long Duration + public long? Duration { - get { return this._duration.GetValueOrDefault(); } + get { return this._duration; } set { this._duration = value; } } diff --git a/sdk/src/Services/GeoRoutes/Generated/Model/RoutePedestrianTravelStep.cs b/sdk/src/Services/GeoRoutes/Generated/Model/RoutePedestrianTravelStep.cs index 7bc8036f4d90..8ef04ed1809b 100644 --- a/sdk/src/Services/GeoRoutes/Generated/Model/RoutePedestrianTravelStep.cs +++ b/sdk/src/Services/GeoRoutes/Generated/Model/RoutePedestrianTravelStep.cs @@ -93,9 +93,9 @@ internal bool IsSetCurrentRoad() /// /// [AWSProperty(Min=0, Max=4294967295)] - public long Distance + public long? Distance { - get { return this._distance.GetValueOrDefault(); } + get { return this._distance; } set { this._distance = value; } } @@ -116,9 +116,9 @@ internal bool IsSetDistance() /// /// [AWSProperty(Required=true, Min=0, Max=4294967295)] - public long Duration + public long? Duration { - get { return this._duration.GetValueOrDefault(); } + get { return this._duration; } set { this._duration = value; } } @@ -153,9 +153,9 @@ internal bool IsSetExitNumber() /// /// [AWSProperty(Min=0)] - public int GeometryOffset + public int? GeometryOffset { - get { return this._geometryOffset.GetValueOrDefault(); } + get { return this._geometryOffset; } set { this._geometryOffset = value; } } diff --git a/sdk/src/Services/GeoRoutes/Generated/Model/RouteRampStepDetails.cs b/sdk/src/Services/GeoRoutes/Generated/Model/RouteRampStepDetails.cs index 300c1208c0e4..2a6b7323e2b5 100644 --- a/sdk/src/Services/GeoRoutes/Generated/Model/RouteRampStepDetails.cs +++ b/sdk/src/Services/GeoRoutes/Generated/Model/RouteRampStepDetails.cs @@ -83,9 +83,9 @@ internal bool IsSetSteeringDirection() /// /// [AWSProperty(Min=-180, Max=180)] - public double TurnAngle + public double? TurnAngle { - get { return this._turnAngle.GetValueOrDefault(); } + get { return this._turnAngle; } set { this._turnAngle = value; } } diff --git a/sdk/src/Services/GeoRoutes/Generated/Model/RouteRoundaboutEnterStepDetails.cs b/sdk/src/Services/GeoRoutes/Generated/Model/RouteRoundaboutEnterStepDetails.cs index 38ad140684eb..e5c6455b90d5 100644 --- a/sdk/src/Services/GeoRoutes/Generated/Model/RouteRoundaboutEnterStepDetails.cs +++ b/sdk/src/Services/GeoRoutes/Generated/Model/RouteRoundaboutEnterStepDetails.cs @@ -83,9 +83,9 @@ internal bool IsSetSteeringDirection() /// /// [AWSProperty(Min=-180, Max=180)] - public double TurnAngle + public double? TurnAngle { - get { return this._turnAngle.GetValueOrDefault(); } + get { return this._turnAngle; } set { this._turnAngle = value; } } diff --git a/sdk/src/Services/GeoRoutes/Generated/Model/RouteRoundaboutExitStepDetails.cs b/sdk/src/Services/GeoRoutes/Generated/Model/RouteRoundaboutExitStepDetails.cs index c259258db8ce..3cfe7964ec81 100644 --- a/sdk/src/Services/GeoRoutes/Generated/Model/RouteRoundaboutExitStepDetails.cs +++ b/sdk/src/Services/GeoRoutes/Generated/Model/RouteRoundaboutExitStepDetails.cs @@ -65,9 +65,9 @@ internal bool IsSetIntersection() /// /// [AWSProperty(Min=1, Max=12)] - public int RelativeExit + public int? RelativeExit { - get { return this._relativeExit.GetValueOrDefault(); } + get { return this._relativeExit; } set { this._relativeExit = value; } } @@ -84,9 +84,9 @@ internal bool IsSetRelativeExit() /// /// [AWSProperty(Min=-360, Max=360)] - public double RoundaboutAngle + public double? RoundaboutAngle { - get { return this._roundaboutAngle.GetValueOrDefault(); } + get { return this._roundaboutAngle; } set { this._roundaboutAngle = value; } } diff --git a/sdk/src/Services/GeoRoutes/Generated/Model/RouteRoundaboutPassStepDetails.cs b/sdk/src/Services/GeoRoutes/Generated/Model/RouteRoundaboutPassStepDetails.cs index a408fdf61fe1..d75d56124cdd 100644 --- a/sdk/src/Services/GeoRoutes/Generated/Model/RouteRoundaboutPassStepDetails.cs +++ b/sdk/src/Services/GeoRoutes/Generated/Model/RouteRoundaboutPassStepDetails.cs @@ -83,9 +83,9 @@ internal bool IsSetSteeringDirection() /// /// [AWSProperty(Min=-180, Max=180)] - public double TurnAngle + public double? TurnAngle { - get { return this._turnAngle.GetValueOrDefault(); } + get { return this._turnAngle; } set { this._turnAngle = value; } } diff --git a/sdk/src/Services/GeoRoutes/Generated/Model/RouteScooterOptions.cs b/sdk/src/Services/GeoRoutes/Generated/Model/RouteScooterOptions.cs index b1f7064cbdcb..c14174d15ba8 100644 --- a/sdk/src/Services/GeoRoutes/Generated/Model/RouteScooterOptions.cs +++ b/sdk/src/Services/GeoRoutes/Generated/Model/RouteScooterOptions.cs @@ -86,9 +86,9 @@ internal bool IsSetLicensePlate() /// /// [AWSProperty(Max=252)] - public double MaxSpeed + public double? MaxSpeed { - get { return this._maxSpeed.GetValueOrDefault(); } + get { return this._maxSpeed; } set { this._maxSpeed = value; } } @@ -109,9 +109,9 @@ internal bool IsSetMaxSpeed() /// /// [AWSProperty(Min=1)] - public int Occupancy + public int? Occupancy { - get { return this._occupancy.GetValueOrDefault(); } + get { return this._occupancy; } set { this._occupancy = value; } } diff --git a/sdk/src/Services/GeoRoutes/Generated/Model/RouteSpanDynamicSpeedDetails.cs b/sdk/src/Services/GeoRoutes/Generated/Model/RouteSpanDynamicSpeedDetails.cs index eb7cba69d291..7a3e1b9425ac 100644 --- a/sdk/src/Services/GeoRoutes/Generated/Model/RouteSpanDynamicSpeedDetails.cs +++ b/sdk/src/Services/GeoRoutes/Generated/Model/RouteSpanDynamicSpeedDetails.cs @@ -54,9 +54,9 @@ public partial class RouteSpanDynamicSpeedDetails /// /// [AWSProperty(Min=0)] - public double BestCaseSpeed + public double? BestCaseSpeed { - get { return this._bestCaseSpeed.GetValueOrDefault(); } + get { return this._bestCaseSpeed; } set { this._bestCaseSpeed = value; } } @@ -77,9 +77,9 @@ internal bool IsSetBestCaseSpeed() /// /// [AWSProperty(Min=0, Max=4294967295)] - public long TurnDuration + public long? TurnDuration { - get { return this._turnDuration.GetValueOrDefault(); } + get { return this._turnDuration; } set { this._turnDuration = value; } } @@ -100,9 +100,9 @@ internal bool IsSetTurnDuration() /// /// [AWSProperty(Min=0)] - public double TypicalSpeed + public double? TypicalSpeed { - get { return this._typicalSpeed.GetValueOrDefault(); } + get { return this._typicalSpeed; } set { this._typicalSpeed = value; } } diff --git a/sdk/src/Services/GeoRoutes/Generated/Model/RouteSpanSpeedLimitDetails.cs b/sdk/src/Services/GeoRoutes/Generated/Model/RouteSpanSpeedLimitDetails.cs index 5edfab2447f1..0b2f0091afc1 100644 --- a/sdk/src/Services/GeoRoutes/Generated/Model/RouteSpanSpeedLimitDetails.cs +++ b/sdk/src/Services/GeoRoutes/Generated/Model/RouteSpanSpeedLimitDetails.cs @@ -53,9 +53,9 @@ public partial class RouteSpanSpeedLimitDetails /// /// [AWSProperty(Min=0)] - public double MaxSpeed + public double? MaxSpeed { - get { return this._maxSpeed.GetValueOrDefault(); } + get { return this._maxSpeed; } set { this._maxSpeed = value; } } @@ -71,9 +71,9 @@ internal bool IsSetMaxSpeed() /// If the span doesn't have a speed limit like the Autobahn. /// /// - public bool Unlimited + public bool? Unlimited { - get { return this._unlimited.GetValueOrDefault(); } + get { return this._unlimited; } set { this._unlimited = value; } } diff --git a/sdk/src/Services/GeoRoutes/Generated/Model/RouteSummary.cs b/sdk/src/Services/GeoRoutes/Generated/Model/RouteSummary.cs index bce87c4917b7..d8ae11951d1f 100644 --- a/sdk/src/Services/GeoRoutes/Generated/Model/RouteSummary.cs +++ b/sdk/src/Services/GeoRoutes/Generated/Model/RouteSummary.cs @@ -46,9 +46,9 @@ public partial class RouteSummary /// /// [AWSProperty(Min=0, Max=4294967295)] - public long Distance + public long? Distance { - get { return this._distance.GetValueOrDefault(); } + get { return this._distance; } set { this._distance = value; } } @@ -69,9 +69,9 @@ internal bool IsSetDistance() /// /// [AWSProperty(Min=0, Max=4294967295)] - public long Duration + public long? Duration { - get { return this._duration.GetValueOrDefault(); } + get { return this._duration; } set { this._duration = value; } } diff --git a/sdk/src/Services/GeoRoutes/Generated/Model/RouteTollOptions.cs b/sdk/src/Services/GeoRoutes/Generated/Model/RouteTollOptions.cs index c24f2dfc966f..49fc23f680c3 100644 --- a/sdk/src/Services/GeoRoutes/Generated/Model/RouteTollOptions.cs +++ b/sdk/src/Services/GeoRoutes/Generated/Model/RouteTollOptions.cs @@ -47,9 +47,9 @@ public partial class RouteTollOptions /// impacts toll calculation, and if true the price with transponders is used. /// /// - public bool AllTransponders + public bool? AllTransponders { - get { return this._allTransponders.GetValueOrDefault(); } + get { return this._allTransponders; } set { this._allTransponders = value; } } @@ -67,9 +67,9 @@ internal bool IsSetAllTransponders() /// payment is necessary. /// /// - public bool AllVignettes + public bool? AllVignettes { - get { return this._allVignettes.GetValueOrDefault(); } + get { return this._allVignettes; } set { this._allVignettes = value; } } diff --git a/sdk/src/Services/GeoRoutes/Generated/Model/RouteTollPass.cs b/sdk/src/Services/GeoRoutes/Generated/Model/RouteTollPass.cs index 788bac9f59d6..bf58d9b584fd 100644 --- a/sdk/src/Services/GeoRoutes/Generated/Model/RouteTollPass.cs +++ b/sdk/src/Services/GeoRoutes/Generated/Model/RouteTollPass.cs @@ -46,9 +46,9 @@ public partial class RouteTollPass /// If the pass includes the rate for the return leg of the trip. /// /// - public bool IncludesReturnTrip + public bool? IncludesReturnTrip { - get { return this._includesReturnTrip.GetValueOrDefault(); } + get { return this._includesReturnTrip; } set { this._includesReturnTrip = value; } } @@ -64,9 +64,9 @@ internal bool IsSetIncludesReturnTrip() /// If the pass is only valid for senior persons. /// /// - public bool SeniorPass + public bool? SeniorPass { - get { return this._seniorPass.GetValueOrDefault(); } + get { return this._seniorPass; } set { this._seniorPass = value; } } @@ -83,9 +83,9 @@ internal bool IsSetSeniorPass() /// /// [AWSProperty(Min=0)] - public int TransferCount + public int? TransferCount { - get { return this._transferCount.GetValueOrDefault(); } + get { return this._transferCount; } set { this._transferCount = value; } } @@ -102,9 +102,9 @@ internal bool IsSetTransferCount() /// /// [AWSProperty(Min=0)] - public int TripCount + public int? TripCount { - get { return this._tripCount.GetValueOrDefault(); } + get { return this._tripCount; } set { this._tripCount = value; } } diff --git a/sdk/src/Services/GeoRoutes/Generated/Model/RouteTollPassValidityPeriod.cs b/sdk/src/Services/GeoRoutes/Generated/Model/RouteTollPassValidityPeriod.cs index c8f0cef20fb7..b1b216065bdb 100644 --- a/sdk/src/Services/GeoRoutes/Generated/Model/RouteTollPassValidityPeriod.cs +++ b/sdk/src/Services/GeoRoutes/Generated/Model/RouteTollPassValidityPeriod.cs @@ -63,9 +63,9 @@ internal bool IsSetPeriod() /// /// [AWSProperty(Min=0)] - public int PeriodCount + public int? PeriodCount { - get { return this._periodCount.GetValueOrDefault(); } + get { return this._periodCount; } set { this._periodCount = value; } } diff --git a/sdk/src/Services/GeoRoutes/Generated/Model/RouteTollPrice.cs b/sdk/src/Services/GeoRoutes/Generated/Model/RouteTollPrice.cs index e107f4630a18..caefc89eff57 100644 --- a/sdk/src/Services/GeoRoutes/Generated/Model/RouteTollPrice.cs +++ b/sdk/src/Services/GeoRoutes/Generated/Model/RouteTollPrice.cs @@ -68,9 +68,9 @@ internal bool IsSetCurrency() /// /// [AWSProperty(Required=true)] - public bool Estimate + public bool? Estimate { - get { return this._estimate.GetValueOrDefault(); } + get { return this._estimate; } set { this._estimate = value; } } @@ -91,9 +91,9 @@ internal bool IsSetEstimate() /// /// [AWSProperty(Min=0, Max=4294967295)] - public long PerDuration + public long? PerDuration { - get { return this._perDuration.GetValueOrDefault(); } + get { return this._perDuration; } set { this._perDuration = value; } } @@ -111,9 +111,9 @@ internal bool IsSetPerDuration() /// /// [AWSProperty(Required=true)] - public bool Range + public bool? Range { - get { return this._range.GetValueOrDefault(); } + get { return this._range; } set { this._range = value; } } @@ -148,9 +148,9 @@ internal bool IsSetRangeValue() /// /// [AWSProperty(Required=true, Min=0)] - public double Value + public double? Value { - get { return this._value.GetValueOrDefault(); } + get { return this._value; } set { this._value = value; } } diff --git a/sdk/src/Services/GeoRoutes/Generated/Model/RouteTollPriceSummary.cs b/sdk/src/Services/GeoRoutes/Generated/Model/RouteTollPriceSummary.cs index fcc2b37ab8df..8aa6c864a37b 100644 --- a/sdk/src/Services/GeoRoutes/Generated/Model/RouteTollPriceSummary.cs +++ b/sdk/src/Services/GeoRoutes/Generated/Model/RouteTollPriceSummary.cs @@ -67,9 +67,9 @@ internal bool IsSetCurrency() /// /// [AWSProperty(Required=true)] - public bool Estimate + public bool? Estimate { - get { return this._estimate.GetValueOrDefault(); } + get { return this._estimate; } set { this._estimate = value; } } @@ -87,9 +87,9 @@ internal bool IsSetEstimate() /// /// [AWSProperty(Required=true)] - public bool Range + public bool? Range { - get { return this._range.GetValueOrDefault(); } + get { return this._range; } set { this._range = value; } } @@ -124,9 +124,9 @@ internal bool IsSetRangeValue() /// /// [AWSProperty(Required=true, Min=0)] - public double Value + public double? Value { - get { return this._value.GetValueOrDefault(); } + get { return this._value; } set { this._value = value; } } diff --git a/sdk/src/Services/GeoRoutes/Generated/Model/RouteTollPriceValueRange.cs b/sdk/src/Services/GeoRoutes/Generated/Model/RouteTollPriceValueRange.cs index e37f03e8662e..6fa8e12dcb08 100644 --- a/sdk/src/Services/GeoRoutes/Generated/Model/RouteTollPriceValueRange.cs +++ b/sdk/src/Services/GeoRoutes/Generated/Model/RouteTollPriceValueRange.cs @@ -44,9 +44,9 @@ public partial class RouteTollPriceValueRange /// /// [AWSProperty(Required=true, Min=0)] - public double Max + public double? Max { - get { return this._max.GetValueOrDefault(); } + get { return this._max; } set { this._max = value; } } @@ -63,9 +63,9 @@ internal bool IsSetMax() /// /// [AWSProperty(Required=true, Min=0)] - public double Min + public double? Min { - get { return this._min.GetValueOrDefault(); } + get { return this._min; } set { this._min = value; } } diff --git a/sdk/src/Services/GeoRoutes/Generated/Model/RouteTrafficOptions.cs b/sdk/src/Services/GeoRoutes/Generated/Model/RouteTrafficOptions.cs index b329f6fa2e8c..ff3783884357 100644 --- a/sdk/src/Services/GeoRoutes/Generated/Model/RouteTrafficOptions.cs +++ b/sdk/src/Services/GeoRoutes/Generated/Model/RouteTrafficOptions.cs @@ -48,9 +48,9 @@ public partial class RouteTrafficOptions /// /// [AWSProperty(Min=0, Max=4294967295)] - public long FlowEventThresholdOverride + public long? FlowEventThresholdOverride { - get { return this._flowEventThresholdOverride.GetValueOrDefault(); } + get { return this._flowEventThresholdOverride; } set { this._flowEventThresholdOverride = value; } } diff --git a/sdk/src/Services/GeoRoutes/Generated/Model/RouteTrailerOptions.cs b/sdk/src/Services/GeoRoutes/Generated/Model/RouteTrailerOptions.cs index 8ea9047481f1..d13496ab4865 100644 --- a/sdk/src/Services/GeoRoutes/Generated/Model/RouteTrailerOptions.cs +++ b/sdk/src/Services/GeoRoutes/Generated/Model/RouteTrailerOptions.cs @@ -44,9 +44,9 @@ public partial class RouteTrailerOptions /// /// [AWSProperty(Min=1)] - public int AxleCount + public int? AxleCount { - get { return this._axleCount.GetValueOrDefault(); } + get { return this._axleCount; } set { this._axleCount = value; } } @@ -67,9 +67,9 @@ internal bool IsSetAxleCount() /// /// [AWSProperty(Min=1, Max=255)] - public int TrailerCount + public int? TrailerCount { - get { return this._trailerCount.GetValueOrDefault(); } + get { return this._trailerCount; } set { this._trailerCount = value; } } diff --git a/sdk/src/Services/GeoRoutes/Generated/Model/RouteTruckOptions.cs b/sdk/src/Services/GeoRoutes/Generated/Model/RouteTruckOptions.cs index 371c3bb63ac8..81f0d542aa39 100644 --- a/sdk/src/Services/GeoRoutes/Generated/Model/RouteTruckOptions.cs +++ b/sdk/src/Services/GeoRoutes/Generated/Model/RouteTruckOptions.cs @@ -61,9 +61,9 @@ public partial class RouteTruckOptions /// /// [AWSProperty(Min=2, Max=255)] - public int AxleCount + public int? AxleCount { - get { return this._axleCount.GetValueOrDefault(); } + get { return this._axleCount; } set { this._axleCount = value; } } @@ -102,9 +102,9 @@ internal bool IsSetEngineType() /// /// [AWSProperty(Min=0, Max=4294967295)] - public long GrossWeight + public long? GrossWeight { - get { return this._grossWeight.GetValueOrDefault(); } + get { return this._grossWeight; } set { this._grossWeight = value; } } @@ -144,9 +144,9 @@ internal bool IsSetHazardousCargos() /// /// [AWSProperty(Min=0, Max=5000)] - public long Height + public long? Height { - get { return this._height.GetValueOrDefault(); } + get { return this._height; } set { this._height = value; } } @@ -167,9 +167,9 @@ internal bool IsSetHeight() /// /// [AWSProperty(Min=0, Max=5000)] - public long HeightAboveFirstAxle + public long? HeightAboveFirstAxle { - get { return this._heightAboveFirstAxle.GetValueOrDefault(); } + get { return this._heightAboveFirstAxle; } set { this._heightAboveFirstAxle = value; } } @@ -190,9 +190,9 @@ internal bool IsSetHeightAboveFirstAxle() /// /// [AWSProperty(Min=0, Max=4294967295)] - public long KpraLength + public long? KpraLength { - get { return this._kpraLength.GetValueOrDefault(); } + get { return this._kpraLength; } set { this._kpraLength = value; } } @@ -213,9 +213,9 @@ internal bool IsSetKpraLength() /// /// [AWSProperty(Min=0, Max=30000)] - public long Length + public long? Length { - get { return this._length.GetValueOrDefault(); } + get { return this._length; } set { this._length = value; } } @@ -254,9 +254,9 @@ internal bool IsSetLicensePlate() /// /// [AWSProperty(Max=252)] - public double MaxSpeed + public double? MaxSpeed { - get { return this._maxSpeed.GetValueOrDefault(); } + get { return this._maxSpeed; } set { this._maxSpeed = value; } } @@ -277,9 +277,9 @@ internal bool IsSetMaxSpeed() /// /// [AWSProperty(Min=1)] - public int Occupancy + public int? Occupancy { - get { return this._occupancy.GetValueOrDefault(); } + get { return this._occupancy; } set { this._occupancy = value; } } @@ -300,9 +300,9 @@ internal bool IsSetOccupancy() /// /// [AWSProperty(Min=0, Max=4294967295)] - public long PayloadCapacity + public long? PayloadCapacity { - get { return this._payloadCapacity.GetValueOrDefault(); } + get { return this._payloadCapacity; } set { this._payloadCapacity = value; } } @@ -319,9 +319,9 @@ internal bool IsSetPayloadCapacity() /// /// [AWSProperty(Min=1, Max=255)] - public int TireCount + public int? TireCount { - get { return this._tireCount.GetValueOrDefault(); } + get { return this._tireCount; } set { this._tireCount = value; } } @@ -453,9 +453,9 @@ internal bool IsSetTunnelRestrictionCode() /// /// [AWSProperty(Min=0, Max=4294967295)] - public long WeightPerAxle + public long? WeightPerAxle { - get { return this._weightPerAxle.GetValueOrDefault(); } + get { return this._weightPerAxle; } set { this._weightPerAxle = value; } } @@ -499,9 +499,9 @@ internal bool IsSetWeightPerAxleGroup() /// /// [AWSProperty(Min=0, Max=5000)] - public long Width + public long? Width { - get { return this._width.GetValueOrDefault(); } + get { return this._width; } set { this._width = value; } } diff --git a/sdk/src/Services/GeoRoutes/Generated/Model/RouteTurnStepDetails.cs b/sdk/src/Services/GeoRoutes/Generated/Model/RouteTurnStepDetails.cs index fcab695f5dfb..a2f5fef4f285 100644 --- a/sdk/src/Services/GeoRoutes/Generated/Model/RouteTurnStepDetails.cs +++ b/sdk/src/Services/GeoRoutes/Generated/Model/RouteTurnStepDetails.cs @@ -83,9 +83,9 @@ internal bool IsSetSteeringDirection() /// /// [AWSProperty(Min=-180, Max=180)] - public double TurnAngle + public double? TurnAngle { - get { return this._turnAngle.GetValueOrDefault(); } + get { return this._turnAngle; } set { this._turnAngle = value; } } diff --git a/sdk/src/Services/GeoRoutes/Generated/Model/RouteUTurnStepDetails.cs b/sdk/src/Services/GeoRoutes/Generated/Model/RouteUTurnStepDetails.cs index f88969a3d693..dda4aa5c6f31 100644 --- a/sdk/src/Services/GeoRoutes/Generated/Model/RouteUTurnStepDetails.cs +++ b/sdk/src/Services/GeoRoutes/Generated/Model/RouteUTurnStepDetails.cs @@ -83,9 +83,9 @@ internal bool IsSetSteeringDirection() /// /// [AWSProperty(Min=-180, Max=180)] - public double TurnAngle + public double? TurnAngle { - get { return this._turnAngle.GetValueOrDefault(); } + get { return this._turnAngle; } set { this._turnAngle = value; } } diff --git a/sdk/src/Services/GeoRoutes/Generated/Model/RouteVehicleOverviewSummary.cs b/sdk/src/Services/GeoRoutes/Generated/Model/RouteVehicleOverviewSummary.cs index 76734cd46101..7b0a095a14c8 100644 --- a/sdk/src/Services/GeoRoutes/Generated/Model/RouteVehicleOverviewSummary.cs +++ b/sdk/src/Services/GeoRoutes/Generated/Model/RouteVehicleOverviewSummary.cs @@ -51,9 +51,9 @@ public partial class RouteVehicleOverviewSummary /// /// [AWSProperty(Min=0, Max=4294967295)] - public long BestCaseDuration + public long? BestCaseDuration { - get { return this._bestCaseDuration.GetValueOrDefault(); } + get { return this._bestCaseDuration; } set { this._bestCaseDuration = value; } } @@ -70,9 +70,9 @@ internal bool IsSetBestCaseDuration() /// /// [AWSProperty(Required=true, Min=0, Max=4294967295)] - public long Distance + public long? Distance { - get { return this._distance.GetValueOrDefault(); } + get { return this._distance; } set { this._distance = value; } } @@ -93,9 +93,9 @@ internal bool IsSetDistance() /// /// [AWSProperty(Required=true, Min=0, Max=4294967295)] - public long Duration + public long? Duration { - get { return this._duration.GetValueOrDefault(); } + get { return this._duration; } set { this._duration = value; } } @@ -116,9 +116,9 @@ internal bool IsSetDuration() /// /// [AWSProperty(Min=0, Max=4294967295)] - public long TypicalDuration + public long? TypicalDuration { - get { return this._typicalDuration.GetValueOrDefault(); } + get { return this._typicalDuration; } set { this._typicalDuration = value; } } diff --git a/sdk/src/Services/GeoRoutes/Generated/Model/RouteVehiclePlace.cs b/sdk/src/Services/GeoRoutes/Generated/Model/RouteVehiclePlace.cs index 4e48f5f8f14b..21cbb33fef29 100644 --- a/sdk/src/Services/GeoRoutes/Generated/Model/RouteVehiclePlace.cs +++ b/sdk/src/Services/GeoRoutes/Generated/Model/RouteVehiclePlace.cs @@ -121,9 +121,9 @@ internal bool IsSetSideOfStreet() /// /// [AWSProperty(Min=0)] - public int WaypointIndex + public int? WaypointIndex { - get { return this._waypointIndex.GetValueOrDefault(); } + get { return this._waypointIndex; } set { this._waypointIndex = value; } } diff --git a/sdk/src/Services/GeoRoutes/Generated/Model/RouteVehicleSpan.cs b/sdk/src/Services/GeoRoutes/Generated/Model/RouteVehicleSpan.cs index 66bebb218ca0..21e4635c5d4c 100644 --- a/sdk/src/Services/GeoRoutes/Generated/Model/RouteVehicleSpan.cs +++ b/sdk/src/Services/GeoRoutes/Generated/Model/RouteVehicleSpan.cs @@ -69,9 +69,9 @@ public partial class RouteVehicleSpan /// /// [AWSProperty(Min=0, Max=4294967295)] - public long BestCaseDuration + public long? BestCaseDuration { - get { return this._bestCaseDuration.GetValueOrDefault(); } + get { return this._bestCaseDuration; } set { this._bestCaseDuration = value; } } @@ -127,9 +127,9 @@ internal bool IsSetCountry() /// /// [AWSProperty(Min=0, Max=4294967295)] - public long Distance + public long? Distance { - get { return this._distance.GetValueOrDefault(); } + get { return this._distance; } set { this._distance = value; } } @@ -151,9 +151,9 @@ internal bool IsSetDistance() /// /// [AWSProperty(Min=0, Max=4294967295)] - public long Duration + public long? Duration { - get { return this._duration.GetValueOrDefault(); } + get { return this._duration; } set { this._duration = value; } } @@ -192,9 +192,9 @@ internal bool IsSetDynamicSpeed() /// /// [AWSProperty(Min=1, Max=5)] - public int FunctionalClassification + public int? FunctionalClassification { - get { return this._functionalClassification.GetValueOrDefault(); } + get { return this._functionalClassification; } set { this._functionalClassification = value; } } @@ -230,9 +230,9 @@ internal bool IsSetGate() /// /// [AWSProperty(Min=0)] - public int GeometryOffset + public int? GeometryOffset { - get { return this._geometryOffset.GetValueOrDefault(); } + get { return this._geometryOffset; } set { this._geometryOffset = value; } } @@ -486,9 +486,9 @@ internal bool IsSetTruckRoadTypes() /// /// [AWSProperty(Min=0, Max=4294967295)] - public long TypicalDuration + public long? TypicalDuration { - get { return this._typicalDuration.GetValueOrDefault(); } + get { return this._typicalDuration; } set { this._typicalDuration = value; } } diff --git a/sdk/src/Services/GeoRoutes/Generated/Model/RouteVehicleTravelOnlySummary.cs b/sdk/src/Services/GeoRoutes/Generated/Model/RouteVehicleTravelOnlySummary.cs index 67593f3ed4fd..afc0419cd7dd 100644 --- a/sdk/src/Services/GeoRoutes/Generated/Model/RouteVehicleTravelOnlySummary.cs +++ b/sdk/src/Services/GeoRoutes/Generated/Model/RouteVehicleTravelOnlySummary.cs @@ -50,9 +50,9 @@ public partial class RouteVehicleTravelOnlySummary /// /// [AWSProperty(Min=0, Max=4294967295)] - public long BestCaseDuration + public long? BestCaseDuration { - get { return this._bestCaseDuration.GetValueOrDefault(); } + get { return this._bestCaseDuration; } set { this._bestCaseDuration = value; } } @@ -73,9 +73,9 @@ internal bool IsSetBestCaseDuration() /// /// [AWSProperty(Required=true, Min=0, Max=4294967295)] - public long Duration + public long? Duration { - get { return this._duration.GetValueOrDefault(); } + get { return this._duration; } set { this._duration = value; } } @@ -96,9 +96,9 @@ internal bool IsSetDuration() /// /// [AWSProperty(Min=0, Max=4294967295)] - public long TypicalDuration + public long? TypicalDuration { - get { return this._typicalDuration.GetValueOrDefault(); } + get { return this._typicalDuration; } set { this._typicalDuration = value; } } diff --git a/sdk/src/Services/GeoRoutes/Generated/Model/RouteVehicleTravelStep.cs b/sdk/src/Services/GeoRoutes/Generated/Model/RouteVehicleTravelStep.cs index 53d534702504..1b99bf5e7421 100644 --- a/sdk/src/Services/GeoRoutes/Generated/Model/RouteVehicleTravelStep.cs +++ b/sdk/src/Services/GeoRoutes/Generated/Model/RouteVehicleTravelStep.cs @@ -116,9 +116,9 @@ internal bool IsSetCurrentRoad() /// /// [AWSProperty(Min=0, Max=4294967295)] - public long Distance + public long? Distance { - get { return this._distance.GetValueOrDefault(); } + get { return this._distance; } set { this._distance = value; } } @@ -139,9 +139,9 @@ internal bool IsSetDistance() /// /// [AWSProperty(Required=true, Min=0, Max=4294967295)] - public long Duration + public long? Duration { - get { return this._duration.GetValueOrDefault(); } + get { return this._duration; } set { this._duration = value; } } @@ -212,9 +212,9 @@ internal bool IsSetExitStepDetails() /// /// [AWSProperty(Min=0)] - public int GeometryOffset + public int? GeometryOffset { - get { return this._geometryOffset.GetValueOrDefault(); } + get { return this._geometryOffset; } set { this._geometryOffset = value; } } diff --git a/sdk/src/Services/GeoRoutes/Generated/Model/RouteViolatedConstraints.cs b/sdk/src/Services/GeoRoutes/Generated/Model/RouteViolatedConstraints.cs index 48c7410959ec..2691d5cd9c9f 100644 --- a/sdk/src/Services/GeoRoutes/Generated/Model/RouteViolatedConstraints.cs +++ b/sdk/src/Services/GeoRoutes/Generated/Model/RouteViolatedConstraints.cs @@ -61,9 +61,9 @@ public partial class RouteViolatedConstraints /// on which hazardous materials are prohibited from being transported. /// /// - public bool AllHazardsRestricted + public bool? AllHazardsRestricted { - get { return this._allHazardsRestricted.GetValueOrDefault(); } + get { return this._allHazardsRestricted; } set { this._allHazardsRestricted = value; } } @@ -117,9 +117,9 @@ internal bool IsSetHazardousCargos() /// /// [AWSProperty(Min=0, Max=4294967295)] - public long MaxHeight + public long? MaxHeight { - get { return this._maxHeight.GetValueOrDefault(); } + get { return this._maxHeight; } set { this._maxHeight = value; } } @@ -140,9 +140,9 @@ internal bool IsSetMaxHeight() /// /// [AWSProperty(Min=0, Max=4294967295)] - public long MaxKpraLength + public long? MaxKpraLength { - get { return this._maxKpraLength.GetValueOrDefault(); } + get { return this._maxKpraLength; } set { this._maxKpraLength = value; } } @@ -159,9 +159,9 @@ internal bool IsSetMaxKpraLength() /// /// [AWSProperty(Min=0, Max=4294967295)] - public long MaxLength + public long? MaxLength { - get { return this._maxLength.GetValueOrDefault(); } + get { return this._maxLength; } set { this._maxLength = value; } } @@ -182,9 +182,9 @@ internal bool IsSetMaxLength() /// /// [AWSProperty(Min=0, Max=4294967295)] - public long MaxPayloadCapacity + public long? MaxPayloadCapacity { - get { return this._maxPayloadCapacity.GetValueOrDefault(); } + get { return this._maxPayloadCapacity; } set { this._maxPayloadCapacity = value; } } @@ -227,9 +227,9 @@ internal bool IsSetMaxWeight() /// /// [AWSProperty(Min=0, Max=4294967295)] - public long MaxWeightPerAxle + public long? MaxWeightPerAxle { - get { return this._maxWeightPerAxle.GetValueOrDefault(); } + get { return this._maxWeightPerAxle; } set { this._maxWeightPerAxle = value; } } @@ -268,9 +268,9 @@ internal bool IsSetMaxWeightPerAxleGroup() /// /// [AWSProperty(Min=0, Max=4294967295)] - public long MaxWidth + public long? MaxWidth { - get { return this._maxWidth.GetValueOrDefault(); } + get { return this._maxWidth; } set { this._maxWidth = value; } } @@ -326,9 +326,9 @@ internal bool IsSetRestrictedTimes() /// The time dependent constraint. /// /// - public bool TimeDependent + public bool? TimeDependent { - get { return this._timeDependent.GetValueOrDefault(); } + get { return this._timeDependent; } set { this._timeDependent = value; } } @@ -366,9 +366,9 @@ internal bool IsSetTrailerCount() /// Travel mode corresponding to the leg. /// /// - public bool TravelMode + public bool? TravelMode { - get { return this._travelMode.GetValueOrDefault(); } + get { return this._travelMode; } set { this._travelMode = value; } } diff --git a/sdk/src/Services/GeoRoutes/Generated/Model/RouteWaypoint.cs b/sdk/src/Services/GeoRoutes/Generated/Model/RouteWaypoint.cs index 220c8438567b..4094359283eb 100644 --- a/sdk/src/Services/GeoRoutes/Generated/Model/RouteWaypoint.cs +++ b/sdk/src/Services/GeoRoutes/Generated/Model/RouteWaypoint.cs @@ -52,9 +52,9 @@ public partial class RouteWaypoint /// /// [AWSProperty(Max=2000)] - public long AvoidActionsForDistance + public long? AvoidActionsForDistance { - get { return this._avoidActionsForDistance.GetValueOrDefault(); } + get { return this._avoidActionsForDistance; } set { this._avoidActionsForDistance = value; } } @@ -70,9 +70,9 @@ internal bool IsSetAvoidActionsForDistance() /// Avoid U-turns for calculation on highways and motorways. /// /// - public bool AvoidUTurns + public bool? AvoidUTurns { - get { return this._avoidUTurns.GetValueOrDefault(); } + get { return this._avoidUTurns; } set { this._avoidUTurns = value; } } @@ -89,9 +89,9 @@ internal bool IsSetAvoidUTurns() /// /// [AWSProperty(Min=0, Max=360)] - public double Heading + public double? Heading { - get { return this._heading.GetValueOrDefault(); } + get { return this._heading; } set { this._heading = value; } } @@ -126,9 +126,9 @@ internal bool IsSetMatching() /// and doesn't split the route into different legs. /// /// - public bool PassThrough + public bool? PassThrough { - get { return this._passThrough.GetValueOrDefault(); } + get { return this._passThrough; } set { this._passThrough = value; } } @@ -186,9 +186,9 @@ internal bool IsSetSideOfStreet() /// /// [AWSProperty(Min=0, Max=4294967295)] - public long StopDuration + public long? StopDuration { - get { return this._stopDuration.GetValueOrDefault(); } + get { return this._stopDuration; } set { this._stopDuration = value; } } diff --git a/sdk/src/Services/GeoRoutes/Generated/Model/RouteWeightConstraint.cs b/sdk/src/Services/GeoRoutes/Generated/Model/RouteWeightConstraint.cs index 615c03f31404..d09d1350e2b9 100644 --- a/sdk/src/Services/GeoRoutes/Generated/Model/RouteWeightConstraint.cs +++ b/sdk/src/Services/GeoRoutes/Generated/Model/RouteWeightConstraint.cs @@ -72,9 +72,9 @@ internal bool IsSetType() /// /// [AWSProperty(Required=true, Min=0, Max=4294967295)] - public long Value + public long? Value { - get { return this._value.GetValueOrDefault(); } + get { return this._value; } set { this._value = value; } } diff --git a/sdk/src/Services/GeoRoutes/Generated/Model/SnapToRoadsRequest.cs b/sdk/src/Services/GeoRoutes/Generated/Model/SnapToRoadsRequest.cs index f000a91dfa68..982ee6f95895 100644 --- a/sdk/src/Services/GeoRoutes/Generated/Model/SnapToRoadsRequest.cs +++ b/sdk/src/Services/GeoRoutes/Generated/Model/SnapToRoadsRequest.cs @@ -99,9 +99,9 @@ internal bool IsSetSnappedGeometryFormat() /// /// [AWSProperty(Min=0, Max=10000)] - public long SnapRadius + public long? SnapRadius { - get { return this._snapRadius.GetValueOrDefault(); } + get { return this._snapRadius; } set { this._snapRadius = value; } } diff --git a/sdk/src/Services/GeoRoutes/Generated/Model/ThrottlingException.cs b/sdk/src/Services/GeoRoutes/Generated/Model/ThrottlingException.cs index 8b09d23d195e..33397bade2da 100644 --- a/sdk/src/Services/GeoRoutes/Generated/Model/ThrottlingException.cs +++ b/sdk/src/Services/GeoRoutes/Generated/Model/ThrottlingException.cs @@ -108,11 +108,6 @@ protected ThrottlingException(System.Runtime.Serialization.SerializationInfo inf /// The that holds the serialized object data about the exception being thrown. /// The that contains contextual information about the source or destination. /// The parameter is a null reference (Nothing in Visual Basic). -#if BCL35 - [System.Security.Permissions.SecurityPermission( - System.Security.Permissions.SecurityAction.LinkDemand, - Flags = System.Security.Permissions.SecurityPermissionFlag.SerializationFormatter)] -#endif [System.Security.SecurityCritical] // These FxCop rules are giving false-positives for this method [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Security", "CA2123:OverrideLinkDemandsShouldBeIdenticalToBase")] diff --git a/sdk/src/Services/GeoRoutes/Generated/Model/ValidationException.cs b/sdk/src/Services/GeoRoutes/Generated/Model/ValidationException.cs index f26eb669c6ba..ed538713adb9 100644 --- a/sdk/src/Services/GeoRoutes/Generated/Model/ValidationException.cs +++ b/sdk/src/Services/GeoRoutes/Generated/Model/ValidationException.cs @@ -110,11 +110,6 @@ protected ValidationException(System.Runtime.Serialization.SerializationInfo inf /// The that holds the serialized object data about the exception being thrown. /// The that contains contextual information about the source or destination. /// The parameter is a null reference (Nothing in Visual Basic). -#if BCL35 - [System.Security.Permissions.SecurityPermission( - System.Security.Permissions.SecurityAction.LinkDemand, - Flags = System.Security.Permissions.SecurityPermissionFlag.SerializationFormatter)] -#endif [System.Security.SecurityCritical] // These FxCop rules are giving false-positives for this method [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Security", "CA2123:OverrideLinkDemandsShouldBeIdenticalToBase")] diff --git a/sdk/src/Services/GeoRoutes/Generated/Model/WaypointOptimizationAvoidanceOptions.cs b/sdk/src/Services/GeoRoutes/Generated/Model/WaypointOptimizationAvoidanceOptions.cs index 8067c4a1bdc7..07a3474e1d05 100644 --- a/sdk/src/Services/GeoRoutes/Generated/Model/WaypointOptimizationAvoidanceOptions.cs +++ b/sdk/src/Services/GeoRoutes/Generated/Model/WaypointOptimizationAvoidanceOptions.cs @@ -68,9 +68,9 @@ internal bool IsSetAreas() /// Avoidance options for cars-shuttles-trains. /// /// - public bool CarShuttleTrains + public bool? CarShuttleTrains { - get { return this._carShuttleTrains.GetValueOrDefault(); } + get { return this._carShuttleTrains; } set { this._carShuttleTrains = value; } } @@ -86,9 +86,9 @@ internal bool IsSetCarShuttleTrains() /// Avoid controlled access highways while calculating the route. /// /// - public bool ControlledAccessHighways + public bool? ControlledAccessHighways { - get { return this._controlledAccessHighways.GetValueOrDefault(); } + get { return this._controlledAccessHighways; } set { this._controlledAccessHighways = value; } } @@ -104,9 +104,9 @@ internal bool IsSetControlledAccessHighways() /// Avoid dirt roads while calculating the route. /// /// - public bool DirtRoads + public bool? DirtRoads { - get { return this._dirtRoads.GetValueOrDefault(); } + get { return this._dirtRoads; } set { this._dirtRoads = value; } } @@ -122,9 +122,9 @@ internal bool IsSetDirtRoads() /// Avoidance options for ferries. /// /// - public bool Ferries + public bool? Ferries { - get { return this._ferries.GetValueOrDefault(); } + get { return this._ferries; } set { this._ferries = value; } } @@ -140,9 +140,9 @@ internal bool IsSetFerries() /// Avoids roads where the specified toll transponders are the only mode of payment. /// /// - public bool TollRoads + public bool? TollRoads { - get { return this._tollRoads.GetValueOrDefault(); } + get { return this._tollRoads; } set { this._tollRoads = value; } } @@ -158,9 +158,9 @@ internal bool IsSetTollRoads() /// Avoid tunnels while calculating the route. /// /// - public bool Tunnels + public bool? Tunnels { - get { return this._tunnels.GetValueOrDefault(); } + get { return this._tunnels; } set { this._tunnels = value; } } @@ -176,9 +176,9 @@ internal bool IsSetTunnels() /// Avoid U-turns for calculation on highways and motorways. /// /// - public bool UTurns + public bool? UTurns { - get { return this._uTurns.GetValueOrDefault(); } + get { return this._uTurns; } set { this._uTurns = value; } } diff --git a/sdk/src/Services/GeoRoutes/Generated/Model/WaypointOptimizationConnection.cs b/sdk/src/Services/GeoRoutes/Generated/Model/WaypointOptimizationConnection.cs index c4d2ebf077e1..5223282c659a 100644 --- a/sdk/src/Services/GeoRoutes/Generated/Model/WaypointOptimizationConnection.cs +++ b/sdk/src/Services/GeoRoutes/Generated/Model/WaypointOptimizationConnection.cs @@ -49,9 +49,9 @@ public partial class WaypointOptimizationConnection /// /// [AWSProperty(Required=true, Min=0, Max=4294967295)] - public long Distance + public long? Distance { - get { return this._distance.GetValueOrDefault(); } + get { return this._distance; } set { this._distance = value; } } @@ -87,9 +87,9 @@ internal bool IsSetFrom() /// /// [AWSProperty(Required=true, Min=0, Max=4294967295)] - public long RestDuration + public long? RestDuration { - get { return this._restDuration.GetValueOrDefault(); } + get { return this._restDuration; } set { this._restDuration = value; } } @@ -129,9 +129,9 @@ internal bool IsSetTo() /// /// [AWSProperty(Required=true, Min=0, Max=4294967295)] - public long TravelDuration + public long? TravelDuration { - get { return this._travelDuration.GetValueOrDefault(); } + get { return this._travelDuration; } set { this._travelDuration = value; } } @@ -152,9 +152,9 @@ internal bool IsSetTravelDuration() /// /// [AWSProperty(Required=true, Min=0, Max=4294967295)] - public long WaitDuration + public long? WaitDuration { - get { return this._waitDuration.GetValueOrDefault(); } + get { return this._waitDuration; } set { this._waitDuration = value; } } diff --git a/sdk/src/Services/GeoRoutes/Generated/Model/WaypointOptimizationDestinationOptions.cs b/sdk/src/Services/GeoRoutes/Generated/Model/WaypointOptimizationDestinationOptions.cs index 9bed3e0bb95c..f90d33c26c1f 100644 --- a/sdk/src/Services/GeoRoutes/Generated/Model/WaypointOptimizationDestinationOptions.cs +++ b/sdk/src/Services/GeoRoutes/Generated/Model/WaypointOptimizationDestinationOptions.cs @@ -84,9 +84,9 @@ internal bool IsSetAppointmentTime() /// /// [AWSProperty(Min=0, Max=360)] - public double Heading + public double? Heading { - get { return this._heading.GetValueOrDefault(); } + get { return this._heading; } set { this._heading = value; } } @@ -127,9 +127,9 @@ internal bool IsSetId() /// /// [AWSProperty(Min=0, Max=4294967295)] - public long ServiceDuration + public long? ServiceDuration { - get { return this._serviceDuration.GetValueOrDefault(); } + get { return this._serviceDuration; } set { this._serviceDuration = value; } } diff --git a/sdk/src/Services/GeoRoutes/Generated/Model/WaypointOptimizationPedestrianOptions.cs b/sdk/src/Services/GeoRoutes/Generated/Model/WaypointOptimizationPedestrianOptions.cs index bc7d5e18449f..f65bf0bb8b36 100644 --- a/sdk/src/Services/GeoRoutes/Generated/Model/WaypointOptimizationPedestrianOptions.cs +++ b/sdk/src/Services/GeoRoutes/Generated/Model/WaypointOptimizationPedestrianOptions.cs @@ -46,9 +46,9 @@ public partial class WaypointOptimizationPedestrianOptions /// Unit: KilometersPerHour /// /// - public double Speed + public double? Speed { - get { return this._speed.GetValueOrDefault(); } + get { return this._speed; } set { this._speed = value; } } diff --git a/sdk/src/Services/GeoRoutes/Generated/Model/WaypointOptimizationRestCycleDurations.cs b/sdk/src/Services/GeoRoutes/Generated/Model/WaypointOptimizationRestCycleDurations.cs index 3276b272ea0f..c7247a881fa4 100644 --- a/sdk/src/Services/GeoRoutes/Generated/Model/WaypointOptimizationRestCycleDurations.cs +++ b/sdk/src/Services/GeoRoutes/Generated/Model/WaypointOptimizationRestCycleDurations.cs @@ -55,9 +55,9 @@ public partial class WaypointOptimizationRestCycleDurations /// /// [AWSProperty(Required=true, Min=0, Max=4294967295)] - public long RestDuration + public long? RestDuration { - get { return this._restDuration.GetValueOrDefault(); } + get { return this._restDuration; } set { this._restDuration = value; } } @@ -78,9 +78,9 @@ internal bool IsSetRestDuration() /// /// [AWSProperty(Required=true, Min=0, Max=4294967295)] - public long WorkDuration + public long? WorkDuration { - get { return this._workDuration.GetValueOrDefault(); } + get { return this._workDuration; } set { this._workDuration = value; } } diff --git a/sdk/src/Services/GeoRoutes/Generated/Model/WaypointOptimizationTimeBreakdown.cs b/sdk/src/Services/GeoRoutes/Generated/Model/WaypointOptimizationTimeBreakdown.cs index 331527d7884a..e5160d1d4142 100644 --- a/sdk/src/Services/GeoRoutes/Generated/Model/WaypointOptimizationTimeBreakdown.cs +++ b/sdk/src/Services/GeoRoutes/Generated/Model/WaypointOptimizationTimeBreakdown.cs @@ -50,9 +50,9 @@ public partial class WaypointOptimizationTimeBreakdown /// /// [AWSProperty(Required=true, Min=0, Max=4294967295)] - public long RestDuration + public long? RestDuration { - get { return this._restDuration.GetValueOrDefault(); } + get { return this._restDuration; } set { this._restDuration = value; } } @@ -74,9 +74,9 @@ internal bool IsSetRestDuration() /// /// [AWSProperty(Required=true, Min=0, Max=4294967295)] - public long ServiceDuration + public long? ServiceDuration { - get { return this._serviceDuration.GetValueOrDefault(); } + get { return this._serviceDuration; } set { this._serviceDuration = value; } } @@ -97,9 +97,9 @@ internal bool IsSetServiceDuration() /// /// [AWSProperty(Required=true, Min=0, Max=4294967295)] - public long TravelDuration + public long? TravelDuration { - get { return this._travelDuration.GetValueOrDefault(); } + get { return this._travelDuration; } set { this._travelDuration = value; } } @@ -120,9 +120,9 @@ internal bool IsSetTravelDuration() /// /// [AWSProperty(Required=true, Min=0, Max=4294967295)] - public long WaitDuration + public long? WaitDuration { - get { return this._waitDuration.GetValueOrDefault(); } + get { return this._waitDuration; } set { this._waitDuration = value; } } diff --git a/sdk/src/Services/GeoRoutes/Generated/Model/WaypointOptimizationTrailerOptions.cs b/sdk/src/Services/GeoRoutes/Generated/Model/WaypointOptimizationTrailerOptions.cs index 212c980e6b03..468e335bac9b 100644 --- a/sdk/src/Services/GeoRoutes/Generated/Model/WaypointOptimizationTrailerOptions.cs +++ b/sdk/src/Services/GeoRoutes/Generated/Model/WaypointOptimizationTrailerOptions.cs @@ -47,9 +47,9 @@ public partial class WaypointOptimizationTrailerOptions /// /// [AWSProperty(Min=0, Max=255)] - public int TrailerCount + public int? TrailerCount { - get { return this._trailerCount.GetValueOrDefault(); } + get { return this._trailerCount; } set { this._trailerCount = value; } } diff --git a/sdk/src/Services/GeoRoutes/Generated/Model/WaypointOptimizationTruckOptions.cs b/sdk/src/Services/GeoRoutes/Generated/Model/WaypointOptimizationTruckOptions.cs index 92bb5c46dc39..4f1a28390670 100644 --- a/sdk/src/Services/GeoRoutes/Generated/Model/WaypointOptimizationTruckOptions.cs +++ b/sdk/src/Services/GeoRoutes/Generated/Model/WaypointOptimizationTruckOptions.cs @@ -55,9 +55,9 @@ public partial class WaypointOptimizationTruckOptions /// /// [AWSProperty(Min=0, Max=4294967295)] - public long GrossWeight + public long? GrossWeight { - get { return this._grossWeight.GetValueOrDefault(); } + get { return this._grossWeight; } set { this._grossWeight = value; } } @@ -96,9 +96,9 @@ internal bool IsSetHazardousCargos() /// /// [AWSProperty(Min=0, Max=5000)] - public long Height + public long? Height { - get { return this._height.GetValueOrDefault(); } + get { return this._height; } set { this._height = value; } } @@ -119,9 +119,9 @@ internal bool IsSetHeight() /// /// [AWSProperty(Min=0, Max=30000)] - public long Length + public long? Length { - get { return this._length.GetValueOrDefault(); } + get { return this._length; } set { this._length = value; } } @@ -253,9 +253,9 @@ internal bool IsSetTunnelRestrictionCode() /// /// [AWSProperty(Min=0, Max=4294967295)] - public long WeightPerAxle + public long? WeightPerAxle { - get { return this._weightPerAxle.GetValueOrDefault(); } + get { return this._weightPerAxle; } set { this._weightPerAxle = value; } } @@ -276,9 +276,9 @@ internal bool IsSetWeightPerAxle() /// /// [AWSProperty(Min=0, Max=5000)] - public long Width + public long? Width { - get { return this._width.GetValueOrDefault(); } + get { return this._width; } set { this._width = value; } } diff --git a/sdk/src/Services/GeoRoutes/Generated/Model/WaypointOptimizationWaypoint.cs b/sdk/src/Services/GeoRoutes/Generated/Model/WaypointOptimizationWaypoint.cs index 99433a8383d9..3b70e02145c1 100644 --- a/sdk/src/Services/GeoRoutes/Generated/Model/WaypointOptimizationWaypoint.cs +++ b/sdk/src/Services/GeoRoutes/Generated/Model/WaypointOptimizationWaypoint.cs @@ -104,9 +104,9 @@ internal bool IsSetBefore() /// /// [AWSProperty(Min=0, Max=360)] - public double Heading + public double? Heading { - get { return this._heading.GetValueOrDefault(); } + get { return this._heading; } set { this._heading = value; } } @@ -166,9 +166,9 @@ internal bool IsSetPosition() /// /// [AWSProperty(Min=0, Max=4294967295)] - public long ServiceDuration + public long? ServiceDuration { - get { return this._serviceDuration.GetValueOrDefault(); } + get { return this._serviceDuration; } set { this._serviceDuration = value; } } diff --git a/sdk/src/Services/GeoRoutes/Generated/Model/WeightPerAxleGroup.cs b/sdk/src/Services/GeoRoutes/Generated/Model/WeightPerAxleGroup.cs index 8d8361a363c4..70701a206e6f 100644 --- a/sdk/src/Services/GeoRoutes/Generated/Model/WeightPerAxleGroup.cs +++ b/sdk/src/Services/GeoRoutes/Generated/Model/WeightPerAxleGroup.cs @@ -57,9 +57,9 @@ public partial class WeightPerAxleGroup /// /// [AWSProperty(Min=0, Max=4294967295)] - public long Quad + public long? Quad { - get { return this._quad.GetValueOrDefault(); } + get { return this._quad; } set { this._quad = value; } } @@ -80,9 +80,9 @@ internal bool IsSetQuad() /// /// [AWSProperty(Min=0, Max=4294967295)] - public long Quint + public long? Quint { - get { return this._quint.GetValueOrDefault(); } + get { return this._quint; } set { this._quint = value; } } @@ -103,9 +103,9 @@ internal bool IsSetQuint() /// /// [AWSProperty(Min=0, Max=4294967295)] - public long Single + public long? Single { - get { return this._single.GetValueOrDefault(); } + get { return this._single; } set { this._single = value; } } @@ -126,9 +126,9 @@ internal bool IsSetSingle() /// /// [AWSProperty(Min=0, Max=4294967295)] - public long Tandem + public long? Tandem { - get { return this._tandem.GetValueOrDefault(); } + get { return this._tandem; } set { this._tandem = value; } } @@ -149,9 +149,9 @@ internal bool IsSetTandem() /// /// [AWSProperty(Min=0, Max=4294967295)] - public long Triple + public long? Triple { - get { return this._triple.GetValueOrDefault(); } + get { return this._triple; } set { this._triple = value; } } diff --git a/sdk/src/Services/GeoRoutes/Generated/_bcl45/AmazonGeoRoutesClient.cs b/sdk/src/Services/GeoRoutes/Generated/_bcl/AmazonGeoRoutesClient.cs similarity index 98% rename from sdk/src/Services/GeoRoutes/Generated/_bcl45/AmazonGeoRoutesClient.cs rename to sdk/src/Services/GeoRoutes/Generated/_bcl/AmazonGeoRoutesClient.cs index fcd37f3e4740..ac12d72686e4 100644 --- a/sdk/src/Services/GeoRoutes/Generated/_bcl45/AmazonGeoRoutesClient.cs +++ b/sdk/src/Services/GeoRoutes/Generated/_bcl/AmazonGeoRoutesClient.cs @@ -32,6 +32,7 @@ using Amazon.Runtime.Internal; using Amazon.Runtime.Internal.Auth; using Amazon.Runtime.Internal.Transform; +using Amazon.Runtime.Endpoints; #pragma warning disable CS1570 namespace Amazon.GeoRoutes @@ -621,16 +622,8 @@ public virtual SnapToRoadsResponse SnapToRoads(SnapToRoadsRequest request) /// The resolved endpoint for the given request. public Amazon.Runtime.Endpoints.Endpoint DetermineServiceOperationEndpoint(AmazonWebServiceRequest request) { - var requestContext = new Amazon.Runtime.Internal.RequestContext(false, CreateSigner()) - { - ClientConfig = Config, - OriginalRequest = request, - Request = new Amazon.Runtime.Internal.DefaultRequest(request, ServiceMetadata.ServiceId) - }; - - var executionContext = new Amazon.Runtime.Internal.ExecutionContext(requestContext, null); - var resolver = new AmazonGeoRoutesEndpointResolver(); - return resolver.GetEndpoint(executionContext); + var parameters = new ServiceOperationEndpointParameters(request); + return Config.DetermineServiceOperationEndpoint(parameters); } #endregion diff --git a/sdk/src/Services/GeoRoutes/Generated/_bcl45/IAmazonGeoRoutes.cs b/sdk/src/Services/GeoRoutes/Generated/_bcl/IAmazonGeoRoutes.cs similarity index 100% rename from sdk/src/Services/GeoRoutes/Generated/_bcl45/IAmazonGeoRoutes.cs rename to sdk/src/Services/GeoRoutes/Generated/_bcl/IAmazonGeoRoutes.cs diff --git a/sdk/src/Services/GeoRoutes/Generated/_bcl35/AmazonGeoRoutesClient.cs b/sdk/src/Services/GeoRoutes/Generated/_bcl35/AmazonGeoRoutesClient.cs deleted file mode 100644 index 4e9cbeef216e..000000000000 --- a/sdk/src/Services/GeoRoutes/Generated/_bcl35/AmazonGeoRoutesClient.cs +++ /dev/null @@ -1,637 +0,0 @@ -/* - * 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. - */ - -/* - * Do not modify this file. This file is generated from the geo-routes-2020-11-19.normal.json service model. - */ - - -using System; -using System.Collections.Generic; -using System.Net; - -using Amazon.GeoRoutes.Model; -using Amazon.GeoRoutes.Model.Internal.MarshallTransformations; -using Amazon.GeoRoutes.Internal; -using Amazon.Runtime; -using Amazon.Runtime.Internal; -using Amazon.Runtime.Internal.Auth; -using Amazon.Runtime.Internal.Transform; - -#pragma warning disable CS1570 -namespace Amazon.GeoRoutes -{ - /// - /// Implementation for accessing GeoRoutes - /// - /// With the Amazon Location Routes API you can calculate routes and estimate travel time - /// based on up-to-date road network and live traffic information. - /// - /// - /// - /// Calculate optimal travel routes and estimate travel times using up-to-date road network - /// and traffic data. Key features include: - /// - ///
    • - /// - /// Point-to-point routing with estimated travel time, distance, and turn-by-turn directions - /// - ///
    • - /// - /// Multi-point route optimization to minimize travel time or distance - /// - ///
    • - /// - /// Route matrices for efficient multi-destination planning - /// - ///
    • - /// - /// Isoline calculations to determine reachable areas within specified time or distance - /// thresholds - /// - ///
    • - /// - /// Map-matching to align GPS traces with the road network - /// - ///
    - ///     - public partial class AmazonGeoRoutesClient : AmazonServiceClient, IAmazonGeoRoutes - { - private static IServiceMetadata serviceMetadata = new AmazonGeoRoutesMetadata(); - - #region Constructors - - /// - /// Constructs AmazonGeoRoutesClient with the credentials loaded from the application's - /// default configuration, and if unsuccessful from the Instance Profile service on an EC2 instance. - /// - /// Example App.config with credentials set. - /// - /// <?xml version="1.0" encoding="utf-8" ?> - /// <configuration> - /// <appSettings> - /// <add key="AWSProfileName" value="AWS Default"/> - /// </appSettings> - /// </configuration> - /// - /// - /// - public AmazonGeoRoutesClient() - : base(FallbackCredentialsFactory.GetCredentials(), new AmazonGeoRoutesConfig()) { } - - /// - /// Constructs AmazonGeoRoutesClient with the credentials loaded from the application's - /// default configuration, and if unsuccessful from the Instance Profile service on an EC2 instance. - /// - /// Example App.config with credentials set. - /// - /// <?xml version="1.0" encoding="utf-8" ?> - /// <configuration> - /// <appSettings> - /// <add key="AWSProfileName" value="AWS Default"/> - /// </appSettings> - /// </configuration> - /// - /// - /// - /// The region to connect. - public AmazonGeoRoutesClient(RegionEndpoint region) - : base(FallbackCredentialsFactory.GetCredentials(), new AmazonGeoRoutesConfig{RegionEndpoint = region}) { } - - /// - /// Constructs AmazonGeoRoutesClient with the credentials loaded from the application's - /// default configuration, and if unsuccessful from the Instance Profile service on an EC2 instance. - /// - /// Example App.config with credentials set. - /// - /// <?xml version="1.0" encoding="utf-8" ?> - /// <configuration> - /// <appSettings> - /// <add key="AWSProfileName" value="AWS Default"/> - /// </appSettings> - /// </configuration> - /// - /// - /// - /// The AmazonGeoRoutesClient Configuration Object - public AmazonGeoRoutesClient(AmazonGeoRoutesConfig config) - : base(FallbackCredentialsFactory.GetCredentials(config), config){} - /// - /// Constructs AmazonGeoRoutesClient with AWS Credentials - /// - /// AWS Credentials - public AmazonGeoRoutesClient(AWSCredentials credentials) - : this(credentials, new AmazonGeoRoutesConfig()) - { - } - - /// - /// Constructs AmazonGeoRoutesClient with AWS Credentials - /// - /// AWS Credentials - /// The region to connect. - public AmazonGeoRoutesClient(AWSCredentials credentials, RegionEndpoint region) - : this(credentials, new AmazonGeoRoutesConfig{RegionEndpoint = region}) - { - } - - /// - /// Constructs AmazonGeoRoutesClient with AWS Credentials and an - /// AmazonGeoRoutesClient Configuration object. - /// - /// AWS Credentials - /// The AmazonGeoRoutesClient Configuration Object - public AmazonGeoRoutesClient(AWSCredentials credentials, AmazonGeoRoutesConfig clientConfig) - : base(credentials, clientConfig) - { - } - - /// - /// Constructs AmazonGeoRoutesClient with AWS Access Key ID and AWS Secret Key - /// - /// AWS Access Key ID - /// AWS Secret Access Key - public AmazonGeoRoutesClient(string awsAccessKeyId, string awsSecretAccessKey) - : this(awsAccessKeyId, awsSecretAccessKey, new AmazonGeoRoutesConfig()) - { - } - - /// - /// Constructs AmazonGeoRoutesClient with AWS Access Key ID and AWS Secret Key - /// - /// AWS Access Key ID - /// AWS Secret Access Key - /// The region to connect. - public AmazonGeoRoutesClient(string awsAccessKeyId, string awsSecretAccessKey, RegionEndpoint region) - : this(awsAccessKeyId, awsSecretAccessKey, new AmazonGeoRoutesConfig() {RegionEndpoint=region}) - { - } - - /// - /// Constructs AmazonGeoRoutesClient with AWS Access Key ID, AWS Secret Key and an - /// AmazonGeoRoutesClient Configuration object. - /// - /// AWS Access Key ID - /// AWS Secret Access Key - /// The AmazonGeoRoutesClient Configuration Object - public AmazonGeoRoutesClient(string awsAccessKeyId, string awsSecretAccessKey, AmazonGeoRoutesConfig clientConfig) - : base(awsAccessKeyId, awsSecretAccessKey, clientConfig) - { - } - - /// - /// Constructs AmazonGeoRoutesClient with AWS Access Key ID and AWS Secret Key - /// - /// AWS Access Key ID - /// AWS Secret Access Key - /// AWS Session Token - public AmazonGeoRoutesClient(string awsAccessKeyId, string awsSecretAccessKey, string awsSessionToken) - : this(awsAccessKeyId, awsSecretAccessKey, awsSessionToken, new AmazonGeoRoutesConfig()) - { - } - - /// - /// Constructs AmazonGeoRoutesClient with AWS Access Key ID and AWS Secret Key - /// - /// AWS Access Key ID - /// AWS Secret Access Key - /// AWS Session Token - /// The region to connect. - public AmazonGeoRoutesClient(string awsAccessKeyId, string awsSecretAccessKey, string awsSessionToken, RegionEndpoint region) - : this(awsAccessKeyId, awsSecretAccessKey, awsSessionToken, new AmazonGeoRoutesConfig{RegionEndpoint = region}) - { - } - - /// - /// Constructs AmazonGeoRoutesClient with AWS Access Key ID, AWS Secret Key and an - /// AmazonGeoRoutesClient Configuration object. - /// - /// AWS Access Key ID - /// AWS Secret Access Key - /// AWS Session Token - /// The AmazonGeoRoutesClient Configuration Object - public AmazonGeoRoutesClient(string awsAccessKeyId, string awsSecretAccessKey, string awsSessionToken, AmazonGeoRoutesConfig clientConfig) - : base(awsAccessKeyId, awsSecretAccessKey, awsSessionToken, clientConfig) - { - } - - #endregion - - #region Overrides - - - /// - /// Creates the signer for the service. - /// - protected override AbstractAWSSigner CreateSigner() - { - return new AWS4Signer(); - } - - /// - /// Customize the pipeline - /// - /// - protected override void CustomizeRuntimePipeline(RuntimePipeline pipeline) - { - pipeline.RemoveHandler(); - pipeline.AddHandlerAfter(new AmazonGeoRoutesEndpointResolver()); - } - /// - /// Capture metadata for the service. - /// - protected override IServiceMetadata ServiceMetadata - { - get - { - return serviceMetadata; - } - } - - #endregion - - #region Dispose - - /// - /// Disposes the service client. - /// - protected override void Dispose(bool disposing) - { - base.Dispose(disposing); - } - - #endregion - - - #region CalculateIsolines - - /// - /// Use the CalculateIsolines action to find service areas that can be reached - /// in a given threshold of time, distance. - /// - /// Container for the necessary parameters to execute the CalculateIsolines service method. - /// - /// The response from the CalculateIsolines service method, as returned by GeoRoutes. - /// - /// You don't have sufficient access to perform this action. - /// - /// - /// The request processing has failed because of an unknown error, exception or failure. - /// - /// - /// The request was denied due to request throttling. - /// - /// - /// The input fails to satisfy the constraints specified by an AWS service. - /// - /// REST API Reference for CalculateIsolines Operation - public virtual CalculateIsolinesResponse CalculateIsolines(CalculateIsolinesRequest request) - { - var options = new InvokeOptions(); - options.RequestMarshaller = CalculateIsolinesRequestMarshaller.Instance; - options.ResponseUnmarshaller = CalculateIsolinesResponseUnmarshaller.Instance; - - return Invoke(request, options); - } - - /// - /// Initiates the asynchronous execution of the CalculateIsolines operation. - /// - /// - /// Container for the necessary parameters to execute the CalculateIsolines operation on AmazonGeoRoutesClient. - /// An AsyncCallback delegate that is invoked when the operation completes. - /// A user-defined state object that is passed to the callback procedure. Retrieve this object from within the callback - /// procedure using the AsyncState property. - /// - /// An IAsyncResult that can be used to poll or wait for results, or both; this value is also needed when invoking EndCalculateIsolines - /// operation. - /// REST API Reference for CalculateIsolines Operation - public virtual IAsyncResult BeginCalculateIsolines(CalculateIsolinesRequest request, AsyncCallback callback, object state) - { - var options = new InvokeOptions(); - options.RequestMarshaller = CalculateIsolinesRequestMarshaller.Instance; - options.ResponseUnmarshaller = CalculateIsolinesResponseUnmarshaller.Instance; - - return BeginInvoke(request, options, callback, state); - } - - /// - /// Finishes the asynchronous execution of the CalculateIsolines operation. - /// - /// - /// The IAsyncResult returned by the call to BeginCalculateIsolines. - /// - /// Returns a CalculateIsolinesResult from GeoRoutes. - /// REST API Reference for CalculateIsolines Operation - public virtual CalculateIsolinesResponse EndCalculateIsolines(IAsyncResult asyncResult) - { - return EndInvoke(asyncResult); - } - - #endregion - - #region CalculateRouteMatrix - - /// - /// Calculates route matrix containing the results for all pairs of Origins to Destinations. - /// Each row corresponds to one entry in Origins. Each entry in the row corresponds to - /// the route from that entry in Origins to an entry in Destinations positions. - /// - /// Container for the necessary parameters to execute the CalculateRouteMatrix service method. - /// - /// The response from the CalculateRouteMatrix service method, as returned by GeoRoutes. - /// - /// You don't have sufficient access to perform this action. - /// - /// - /// The request processing has failed because of an unknown error, exception or failure. - /// - /// - /// The request was denied due to request throttling. - /// - /// - /// The input fails to satisfy the constraints specified by an AWS service. - /// - /// REST API Reference for CalculateRouteMatrix Operation - public virtual CalculateRouteMatrixResponse CalculateRouteMatrix(CalculateRouteMatrixRequest request) - { - var options = new InvokeOptions(); - options.RequestMarshaller = CalculateRouteMatrixRequestMarshaller.Instance; - options.ResponseUnmarshaller = CalculateRouteMatrixResponseUnmarshaller.Instance; - - return Invoke(request, options); - } - - /// - /// Initiates the asynchronous execution of the CalculateRouteMatrix operation. - /// - /// - /// Container for the necessary parameters to execute the CalculateRouteMatrix operation on AmazonGeoRoutesClient. - /// An AsyncCallback delegate that is invoked when the operation completes. - /// A user-defined state object that is passed to the callback procedure. Retrieve this object from within the callback - /// procedure using the AsyncState property. - /// - /// An IAsyncResult that can be used to poll or wait for results, or both; this value is also needed when invoking EndCalculateRouteMatrix - /// operation. - /// REST API Reference for CalculateRouteMatrix Operation - public virtual IAsyncResult BeginCalculateRouteMatrix(CalculateRouteMatrixRequest request, AsyncCallback callback, object state) - { - var options = new InvokeOptions(); - options.RequestMarshaller = CalculateRouteMatrixRequestMarshaller.Instance; - options.ResponseUnmarshaller = CalculateRouteMatrixResponseUnmarshaller.Instance; - - return BeginInvoke(request, options, callback, state); - } - - /// - /// Finishes the asynchronous execution of the CalculateRouteMatrix operation. - /// - /// - /// The IAsyncResult returned by the call to BeginCalculateRouteMatrix. - /// - /// Returns a CalculateRouteMatrixResult from GeoRoutes. - /// REST API Reference for CalculateRouteMatrix Operation - public virtual CalculateRouteMatrixResponse EndCalculateRouteMatrix(IAsyncResult asyncResult) - { - return EndInvoke(asyncResult); - } - - #endregion - - #region CalculateRoutes - - /// - /// Calculates a route given the following required parameters: Origin and Destination. - /// - /// Container for the necessary parameters to execute the CalculateRoutes service method. - /// - /// The response from the CalculateRoutes service method, as returned by GeoRoutes. - /// - /// You don't have sufficient access to perform this action. - /// - /// - /// The request processing has failed because of an unknown error, exception or failure. - /// - /// - /// The request was denied due to request throttling. - /// - /// - /// The input fails to satisfy the constraints specified by an AWS service. - /// - /// REST API Reference for CalculateRoutes Operation - public virtual CalculateRoutesResponse CalculateRoutes(CalculateRoutesRequest request) - { - var options = new InvokeOptions(); - options.RequestMarshaller = CalculateRoutesRequestMarshaller.Instance; - options.ResponseUnmarshaller = CalculateRoutesResponseUnmarshaller.Instance; - - return Invoke(request, options); - } - - /// - /// Initiates the asynchronous execution of the CalculateRoutes operation. - /// - /// - /// Container for the necessary parameters to execute the CalculateRoutes operation on AmazonGeoRoutesClient. - /// An AsyncCallback delegate that is invoked when the operation completes. - /// A user-defined state object that is passed to the callback procedure. Retrieve this object from within the callback - /// procedure using the AsyncState property. - /// - /// An IAsyncResult that can be used to poll or wait for results, or both; this value is also needed when invoking EndCalculateRoutes - /// operation. - /// REST API Reference for CalculateRoutes Operation - public virtual IAsyncResult BeginCalculateRoutes(CalculateRoutesRequest request, AsyncCallback callback, object state) - { - var options = new InvokeOptions(); - options.RequestMarshaller = CalculateRoutesRequestMarshaller.Instance; - options.ResponseUnmarshaller = CalculateRoutesResponseUnmarshaller.Instance; - - return BeginInvoke(request, options, callback, state); - } - - /// - /// Finishes the asynchronous execution of the CalculateRoutes operation. - /// - /// - /// The IAsyncResult returned by the call to BeginCalculateRoutes. - /// - /// Returns a CalculateRoutesResult from GeoRoutes. - /// REST API Reference for CalculateRoutes Operation - public virtual CalculateRoutesResponse EndCalculateRoutes(IAsyncResult asyncResult) - { - return EndInvoke(asyncResult); - } - - #endregion - - #region OptimizeWaypoints - - /// - /// Calculates the optimal order to travel between a set of waypoints to minimize either - /// the travel time or the distance travelled during the journey, based on road network - /// restrictions and the traffic pattern data. - /// - /// Container for the necessary parameters to execute the OptimizeWaypoints service method. - /// - /// The response from the OptimizeWaypoints service method, as returned by GeoRoutes. - /// - /// You don't have sufficient access to perform this action. - /// - /// - /// The request processing has failed because of an unknown error, exception or failure. - /// - /// - /// The request was denied due to request throttling. - /// - /// - /// The input fails to satisfy the constraints specified by an AWS service. - /// - /// REST API Reference for OptimizeWaypoints Operation - public virtual OptimizeWaypointsResponse OptimizeWaypoints(OptimizeWaypointsRequest request) - { - var options = new InvokeOptions(); - options.RequestMarshaller = OptimizeWaypointsRequestMarshaller.Instance; - options.ResponseUnmarshaller = OptimizeWaypointsResponseUnmarshaller.Instance; - - return Invoke(request, options); - } - - /// - /// Initiates the asynchronous execution of the OptimizeWaypoints operation. - /// - /// - /// Container for the necessary parameters to execute the OptimizeWaypoints operation on AmazonGeoRoutesClient. - /// An AsyncCallback delegate that is invoked when the operation completes. - /// A user-defined state object that is passed to the callback procedure. Retrieve this object from within the callback - /// procedure using the AsyncState property. - /// - /// An IAsyncResult that can be used to poll or wait for results, or both; this value is also needed when invoking EndOptimizeWaypoints - /// operation. - /// REST API Reference for OptimizeWaypoints Operation - public virtual IAsyncResult BeginOptimizeWaypoints(OptimizeWaypointsRequest request, AsyncCallback callback, object state) - { - var options = new InvokeOptions(); - options.RequestMarshaller = OptimizeWaypointsRequestMarshaller.Instance; - options.ResponseUnmarshaller = OptimizeWaypointsResponseUnmarshaller.Instance; - - return BeginInvoke(request, options, callback, state); - } - - /// - /// Finishes the asynchronous execution of the OptimizeWaypoints operation. - /// - /// - /// The IAsyncResult returned by the call to BeginOptimizeWaypoints. - /// - /// Returns a OptimizeWaypointsResult from GeoRoutes. - /// REST API Reference for OptimizeWaypoints Operation - public virtual OptimizeWaypointsResponse EndOptimizeWaypoints(IAsyncResult asyncResult) - { - return EndInvoke(asyncResult); - } - - #endregion - - #region SnapToRoads - - /// - /// The SnapToRoads action matches GPS trace to roads most likely traveled on. - /// - /// Container for the necessary parameters to execute the SnapToRoads service method. - /// - /// The response from the SnapToRoads service method, as returned by GeoRoutes. - /// - /// You don't have sufficient access to perform this action. - /// - /// - /// The request processing has failed because of an unknown error, exception or failure. - /// - /// - /// The request was denied due to request throttling. - /// - /// - /// The input fails to satisfy the constraints specified by an AWS service. - /// - /// REST API Reference for SnapToRoads Operation - public virtual SnapToRoadsResponse SnapToRoads(SnapToRoadsRequest request) - { - var options = new InvokeOptions(); - options.RequestMarshaller = SnapToRoadsRequestMarshaller.Instance; - options.ResponseUnmarshaller = SnapToRoadsResponseUnmarshaller.Instance; - - return Invoke(request, options); - } - - /// - /// Initiates the asynchronous execution of the SnapToRoads operation. - /// - /// - /// Container for the necessary parameters to execute the SnapToRoads operation on AmazonGeoRoutesClient. - /// An AsyncCallback delegate that is invoked when the operation completes. - /// A user-defined state object that is passed to the callback procedure. Retrieve this object from within the callback - /// procedure using the AsyncState property. - /// - /// An IAsyncResult that can be used to poll or wait for results, or both; this value is also needed when invoking EndSnapToRoads - /// operation. - /// REST API Reference for SnapToRoads Operation - public virtual IAsyncResult BeginSnapToRoads(SnapToRoadsRequest request, AsyncCallback callback, object state) - { - var options = new InvokeOptions(); - options.RequestMarshaller = SnapToRoadsRequestMarshaller.Instance; - options.ResponseUnmarshaller = SnapToRoadsResponseUnmarshaller.Instance; - - return BeginInvoke(request, options, callback, state); - } - - /// - /// Finishes the asynchronous execution of the SnapToRoads operation. - /// - /// - /// The IAsyncResult returned by the call to BeginSnapToRoads. - /// - /// Returns a SnapToRoadsResult from GeoRoutes. - /// REST API Reference for SnapToRoads Operation - public virtual SnapToRoadsResponse EndSnapToRoads(IAsyncResult asyncResult) - { - return EndInvoke(asyncResult); - } - - #endregion - - #region DetermineServiceOperationEndpoint - - /// - /// Returns the endpoint that will be used for a particular request. - /// - /// Request for the desired service operation. - /// The resolved endpoint for the given request. - public Amazon.Runtime.Endpoints.Endpoint DetermineServiceOperationEndpoint(AmazonWebServiceRequest request) - { - var requestContext = new Amazon.Runtime.Internal.RequestContext(false, CreateSigner()) - { - ClientConfig = Config, - OriginalRequest = request, - Request = new Amazon.Runtime.Internal.DefaultRequest(request, ServiceMetadata.ServiceId) - }; - - var executionContext = new Amazon.Runtime.Internal.ExecutionContext(requestContext, null); - var resolver = new AmazonGeoRoutesEndpointResolver(); - return resolver.GetEndpoint(executionContext); - } - - #endregion - - } -} \ No newline at end of file diff --git a/sdk/src/Services/GeoRoutes/Generated/_bcl35/IAmazonGeoRoutes.cs b/sdk/src/Services/GeoRoutes/Generated/_bcl35/IAmazonGeoRoutes.cs deleted file mode 100644 index 31612d7540d6..000000000000 --- a/sdk/src/Services/GeoRoutes/Generated/_bcl35/IAmazonGeoRoutes.cs +++ /dev/null @@ -1,348 +0,0 @@ -/* - * 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. - */ - -/* - * Do not modify this file. This file is generated from the geo-routes-2020-11-19.normal.json service model. - */ - - -using System; -using System.Collections.Generic; - -using Amazon.Runtime; -using Amazon.GeoRoutes.Model; - -#pragma warning disable CS1570 -namespace Amazon.GeoRoutes -{ - /// - /// Interface for accessing GeoRoutes - /// - /// With the Amazon Location Routes API you can calculate routes and estimate travel time - /// based on up-to-date road network and live traffic information. - /// - /// - /// - /// Calculate optimal travel routes and estimate travel times using up-to-date road network - /// and traffic data. Key features include: - /// - ///
    • - /// - /// Point-to-point routing with estimated travel time, distance, and turn-by-turn directions - /// - ///
    • - /// - /// Multi-point route optimization to minimize travel time or distance - /// - ///
    • - /// - /// Route matrices for efficient multi-destination planning - /// - ///
    • - /// - /// Isoline calculations to determine reachable areas within specified time or distance - /// thresholds - /// - ///
    • - /// - /// Map-matching to align GPS traces with the road network - /// - ///
    - ///     - public partial interface IAmazonGeoRoutes : IAmazonService, IDisposable - { - - - - - - #region CalculateIsolines - - - /// - /// Use the CalculateIsolines action to find service areas that can be reached - /// in a given threshold of time, distance. - /// - /// Container for the necessary parameters to execute the CalculateIsolines service method. - /// - /// The response from the CalculateIsolines service method, as returned by GeoRoutes. - /// - /// You don't have sufficient access to perform this action. - /// - /// - /// The request processing has failed because of an unknown error, exception or failure. - /// - /// - /// The request was denied due to request throttling. - /// - /// - /// The input fails to satisfy the constraints specified by an AWS service. - /// - /// REST API Reference for CalculateIsolines Operation - CalculateIsolinesResponse CalculateIsolines(CalculateIsolinesRequest request); - - /// - /// Initiates the asynchronous execution of the CalculateIsolines operation. - /// - /// - /// Container for the necessary parameters to execute the CalculateIsolines operation on AmazonGeoRoutesClient. - /// An AsyncCallback delegate that is invoked when the operation completes. - /// A user-defined state object that is passed to the callback procedure. Retrieve this object from within the callback - /// procedure using the AsyncState property. - /// - /// An IAsyncResult that can be used to poll or wait for results, or both; this value is also needed when invoking EndCalculateIsolines - /// operation. - /// REST API Reference for CalculateIsolines Operation - IAsyncResult BeginCalculateIsolines(CalculateIsolinesRequest request, AsyncCallback callback, object state); - - - - /// - /// Finishes the asynchronous execution of the CalculateIsolines operation. - /// - /// - /// The IAsyncResult returned by the call to BeginCalculateIsolines. - /// - /// Returns a CalculateIsolinesResult from GeoRoutes. - /// REST API Reference for CalculateIsolines Operation - CalculateIsolinesResponse EndCalculateIsolines(IAsyncResult asyncResult); - - #endregion - - #region CalculateRouteMatrix - - - /// - /// Calculates route matrix containing the results for all pairs of Origins to Destinations. - /// Each row corresponds to one entry in Origins. Each entry in the row corresponds to - /// the route from that entry in Origins to an entry in Destinations positions. - /// - /// Container for the necessary parameters to execute the CalculateRouteMatrix service method. - /// - /// The response from the CalculateRouteMatrix service method, as returned by GeoRoutes. - /// - /// You don't have sufficient access to perform this action. - /// - /// - /// The request processing has failed because of an unknown error, exception or failure. - /// - /// - /// The request was denied due to request throttling. - /// - /// - /// The input fails to satisfy the constraints specified by an AWS service. - /// - /// REST API Reference for CalculateRouteMatrix Operation - CalculateRouteMatrixResponse CalculateRouteMatrix(CalculateRouteMatrixRequest request); - - /// - /// Initiates the asynchronous execution of the CalculateRouteMatrix operation. - /// - /// - /// Container for the necessary parameters to execute the CalculateRouteMatrix operation on AmazonGeoRoutesClient. - /// An AsyncCallback delegate that is invoked when the operation completes. - /// A user-defined state object that is passed to the callback procedure. Retrieve this object from within the callback - /// procedure using the AsyncState property. - /// - /// An IAsyncResult that can be used to poll or wait for results, or both; this value is also needed when invoking EndCalculateRouteMatrix - /// operation. - /// REST API Reference for CalculateRouteMatrix Operation - IAsyncResult BeginCalculateRouteMatrix(CalculateRouteMatrixRequest request, AsyncCallback callback, object state); - - - - /// - /// Finishes the asynchronous execution of the CalculateRouteMatrix operation. - /// - /// - /// The IAsyncResult returned by the call to BeginCalculateRouteMatrix. - /// - /// Returns a CalculateRouteMatrixResult from GeoRoutes. - /// REST API Reference for CalculateRouteMatrix Operation - CalculateRouteMatrixResponse EndCalculateRouteMatrix(IAsyncResult asyncResult); - - #endregion - - #region CalculateRoutes - - - /// - /// Calculates a route given the following required parameters: Origin and Destination. - /// - /// Container for the necessary parameters to execute the CalculateRoutes service method. - /// - /// The response from the CalculateRoutes service method, as returned by GeoRoutes. - /// - /// You don't have sufficient access to perform this action. - /// - /// - /// The request processing has failed because of an unknown error, exception or failure. - /// - /// - /// The request was denied due to request throttling. - /// - /// - /// The input fails to satisfy the constraints specified by an AWS service. - /// - /// REST API Reference for CalculateRoutes Operation - CalculateRoutesResponse CalculateRoutes(CalculateRoutesRequest request); - - /// - /// Initiates the asynchronous execution of the CalculateRoutes operation. - /// - /// - /// Container for the necessary parameters to execute the CalculateRoutes operation on AmazonGeoRoutesClient. - /// An AsyncCallback delegate that is invoked when the operation completes. - /// A user-defined state object that is passed to the callback procedure. Retrieve this object from within the callback - /// procedure using the AsyncState property. - /// - /// An IAsyncResult that can be used to poll or wait for results, or both; this value is also needed when invoking EndCalculateRoutes - /// operation. - /// REST API Reference for CalculateRoutes Operation - IAsyncResult BeginCalculateRoutes(CalculateRoutesRequest request, AsyncCallback callback, object state); - - - - /// - /// Finishes the asynchronous execution of the CalculateRoutes operation. - /// - /// - /// The IAsyncResult returned by the call to BeginCalculateRoutes. - /// - /// Returns a CalculateRoutesResult from GeoRoutes. - /// REST API Reference for CalculateRoutes Operation - CalculateRoutesResponse EndCalculateRoutes(IAsyncResult asyncResult); - - #endregion - - #region OptimizeWaypoints - - - /// - /// Calculates the optimal order to travel between a set of waypoints to minimize either - /// the travel time or the distance travelled during the journey, based on road network - /// restrictions and the traffic pattern data. - /// - /// Container for the necessary parameters to execute the OptimizeWaypoints service method. - /// - /// The response from the OptimizeWaypoints service method, as returned by GeoRoutes. - /// - /// You don't have sufficient access to perform this action. - /// - /// - /// The request processing has failed because of an unknown error, exception or failure. - /// - /// - /// The request was denied due to request throttling. - /// - /// - /// The input fails to satisfy the constraints specified by an AWS service. - /// - /// REST API Reference for OptimizeWaypoints Operation - OptimizeWaypointsResponse OptimizeWaypoints(OptimizeWaypointsRequest request); - - /// - /// Initiates the asynchronous execution of the OptimizeWaypoints operation. - /// - /// - /// Container for the necessary parameters to execute the OptimizeWaypoints operation on AmazonGeoRoutesClient. - /// An AsyncCallback delegate that is invoked when the operation completes. - /// A user-defined state object that is passed to the callback procedure. Retrieve this object from within the callback - /// procedure using the AsyncState property. - /// - /// An IAsyncResult that can be used to poll or wait for results, or both; this value is also needed when invoking EndOptimizeWaypoints - /// operation. - /// REST API Reference for OptimizeWaypoints Operation - IAsyncResult BeginOptimizeWaypoints(OptimizeWaypointsRequest request, AsyncCallback callback, object state); - - - - /// - /// Finishes the asynchronous execution of the OptimizeWaypoints operation. - /// - /// - /// The IAsyncResult returned by the call to BeginOptimizeWaypoints. - /// - /// Returns a OptimizeWaypointsResult from GeoRoutes. - /// REST API Reference for OptimizeWaypoints Operation - OptimizeWaypointsResponse EndOptimizeWaypoints(IAsyncResult asyncResult); - - #endregion - - #region SnapToRoads - - - /// - /// The SnapToRoads action matches GPS trace to roads most likely traveled on. - /// - /// Container for the necessary parameters to execute the SnapToRoads service method. - /// - /// The response from the SnapToRoads service method, as returned by GeoRoutes. - /// - /// You don't have sufficient access to perform this action. - /// - /// - /// The request processing has failed because of an unknown error, exception or failure. - /// - /// - /// The request was denied due to request throttling. - /// - /// - /// The input fails to satisfy the constraints specified by an AWS service. - /// - /// REST API Reference for SnapToRoads Operation - SnapToRoadsResponse SnapToRoads(SnapToRoadsRequest request); - - /// - /// Initiates the asynchronous execution of the SnapToRoads operation. - /// - /// - /// Container for the necessary parameters to execute the SnapToRoads operation on AmazonGeoRoutesClient. - /// An AsyncCallback delegate that is invoked when the operation completes. - /// A user-defined state object that is passed to the callback procedure. Retrieve this object from within the callback - /// procedure using the AsyncState property. - /// - /// An IAsyncResult that can be used to poll or wait for results, or both; this value is also needed when invoking EndSnapToRoads - /// operation. - /// REST API Reference for SnapToRoads Operation - IAsyncResult BeginSnapToRoads(SnapToRoadsRequest request, AsyncCallback callback, object state); - - - - /// - /// Finishes the asynchronous execution of the SnapToRoads operation. - /// - /// - /// The IAsyncResult returned by the call to BeginSnapToRoads. - /// - /// Returns a SnapToRoadsResult from GeoRoutes. - /// REST API Reference for SnapToRoads Operation - SnapToRoadsResponse EndSnapToRoads(IAsyncResult asyncResult); - - #endregion - - #region DetermineServiceOperationEndpoint - - /// - /// Returns the endpoint that will be used for a particular request. - /// - /// Request for the desired service operation. - /// The resolved endpoint for the given request. - Amazon.Runtime.Endpoints.Endpoint DetermineServiceOperationEndpoint(AmazonWebServiceRequest request); - - #endregion - - } -} \ No newline at end of file diff --git a/sdk/src/Services/GeoRoutes/Generated/_netstandard/AmazonGeoRoutesClient.cs b/sdk/src/Services/GeoRoutes/Generated/_netstandard/AmazonGeoRoutesClient.cs index 3f8f0901d3df..728e8175bf1b 100644 --- a/sdk/src/Services/GeoRoutes/Generated/_netstandard/AmazonGeoRoutesClient.cs +++ b/sdk/src/Services/GeoRoutes/Generated/_netstandard/AmazonGeoRoutesClient.cs @@ -32,6 +32,7 @@ using Amazon.Runtime.Internal; using Amazon.Runtime.Internal.Auth; using Amazon.Runtime.Internal.Transform; +using Amazon.Runtime.Endpoints; #pragma warning disable CS1570 namespace Amazon.GeoRoutes @@ -523,16 +524,8 @@ internal virtual SnapToRoadsResponse SnapToRoads(SnapToRoadsRequest request) /// The resolved endpoint for the given request. public Amazon.Runtime.Endpoints.Endpoint DetermineServiceOperationEndpoint(AmazonWebServiceRequest request) { - var requestContext = new Amazon.Runtime.Internal.RequestContext(false, CreateSigner()) - { - ClientConfig = Config, - OriginalRequest = request, - Request = new Amazon.Runtime.Internal.DefaultRequest(request, ServiceMetadata.ServiceId) - }; - - var executionContext = new Amazon.Runtime.Internal.ExecutionContext(requestContext, null); - var resolver = new AmazonGeoRoutesEndpointResolver(); - return resolver.GetEndpoint(executionContext); + var parameters = new ServiceOperationEndpointParameters(request); + return Config.DetermineServiceOperationEndpoint(parameters); } #endregion diff --git a/sdk/src/Services/GeoRoutes/Generated/_netstandard/IAmazonGeoRoutes.cs b/sdk/src/Services/GeoRoutes/Generated/_netstandard/IAmazonGeoRoutes.cs index 3d7e165e3fde..d0b3b9e91143 100644 --- a/sdk/src/Services/GeoRoutes/Generated/_netstandard/IAmazonGeoRoutes.cs +++ b/sdk/src/Services/GeoRoutes/Generated/_netstandard/IAmazonGeoRoutes.cs @@ -232,5 +232,33 @@ public partial interface IAmazonGeoRoutes : IAmazonService, IDisposable #endregion + #region Static factory interface methods +#if NET8_0_OR_GREATER +// Warning CA1033 is issued when the child types can not call the method defined in parent types. +// In this use case the intended caller is only meant to be the interface as a factory +// method to create the child types. Given the SDK use case the warning can be ignored. +#pragma warning disable CA1033 + /// + [System.Diagnostics.CodeAnalysis.DynamicDependency(System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicProperties, typeof(AmazonGeoRoutesConfig))] + static ClientConfig IAmazonService.CreateDefaultClientConfig() => new AmazonGeoRoutesConfig(); + + /// + [System.Diagnostics.CodeAnalysis.UnconditionalSuppressMessage("AssemblyLoadTrimming", "IL2026:RequiresUnreferencedCode", + Justification = "This suppression is here to ignore the warnings caused by CognitoSync. See justification in IAmazonService.")] + static IAmazonService IAmazonService.CreateDefaultServiceClient(AWSCredentials awsCredentials, ClientConfig clientConfig) + { + var serviceClientConfig = clientConfig as AmazonGeoRoutesConfig; + if (serviceClientConfig == null) + { + throw new AmazonClientException("ClientConfig is not of type AmazonGeoRoutesConfig to create AmazonGeoRoutesClient"); + } + + return awsCredentials == null ? + new AmazonGeoRoutesClient(serviceClientConfig) : + new AmazonGeoRoutesClient(awsCredentials, serviceClientConfig); + } +#pragma warning restore CA1033 +#endif + #endregion } } \ No newline at end of file diff --git a/sdk/src/Services/GeoRoutes/GeoRoutes.sln b/sdk/src/Services/GeoRoutes/GeoRoutes.sln index 626032caa3bc..07a7e45e62ad 100644 --- a/sdk/src/Services/GeoRoutes/GeoRoutes.sln +++ b/sdk/src/Services/GeoRoutes/GeoRoutes.sln @@ -4,9 +4,7 @@ VisualStudioVersion = 15.0.26730.12 MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Core", "Core", "{9863FCB3-BFA4-4B9C-B8F6-302BA5F660B8}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.Core.Net35", "../../Core/AWSSDK.Core.Net35.csproj", "{1FACE5D0-97BF-4069-B4F7-0FE28BB160F8}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.Core.Net45", "../../Core/AWSSDK.Core.Net45.csproj", "{7DE3AFA0-1B2D-41B1-82BD-120B8B210B43}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.Core.NetFramework", "../../Core/AWSSDK.Core.NetFramework.csproj", "{7DE3AFA0-1B2D-41B1-82BD-120B8B210B43}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.Core.NetStandard", "../../Core/AWSSDK.Core.NetStandard.csproj", "{A855B58E-ED32-40AE-AE8F-054F448B9F2C}" EndProject @@ -14,27 +12,19 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Services", "Services", "{93 EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "GeoRoutes", "GeoRoutes", "{C86096F6-379A-48ED-8236-38AB30BF1FE2}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.GeoRoutes.Net35", "AWSSDK.GeoRoutes.Net35.csproj", "{BC97ED7F-B1E4-4500-AFC5-CB32520E75C1}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.GeoRoutes.Net45", "AWSSDK.GeoRoutes.Net45.csproj", "{C0779A0C-D23B-467D-8023-13CF6EDB9952}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.GeoRoutes.NetFramework", "AWSSDK.GeoRoutes.NetFramework.csproj", "{AB0D02E5-E717-48FF-A755-7063A8D5CB25}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.GeoRoutes.NetStandard", "AWSSDK.GeoRoutes.NetStandard.csproj", "{09EFC232-334E-4F85-B555-59E822AFCA1F}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Test", "Test", "{12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.UnitTests.GeoRoutes.Net35", "../../../test/Services/GeoRoutes/UnitTests/AWSSDK.UnitTests.GeoRoutes.Net35.csproj", "{39225000-A845-43F5-89A3-A127978DED18}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.UnitTests.GeoRoutes.Net45", "../../../test/Services/GeoRoutes/UnitTests/AWSSDK.UnitTests.GeoRoutes.Net45.csproj", "{592C6E19-A33B-4DA6-88F0-F64EB161B172}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.UnitTests.GeoRoutes.NetFramework", "../../../test/Services/GeoRoutes/UnitTests/AWSSDK.UnitTests.GeoRoutes.NetFramework.csproj", "{45956090-CB78-41E7-9467-0F3FBAC89547}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ServiceClientGeneratorLib", "../../../../generator/ServiceClientGeneratorLib/ServiceClientGeneratorLib.csproj", "{7BEE7C44-BE12-43CC-AFB9-B5852A1F43C8}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.UnitTestUtilities.Net35", "../../../test/UnitTests/Custom/AWSSDK.UnitTestUtilities.Net35.csproj", "{A23CE153-A4A3-4D3A-A6DC-0DD1B207118E}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.UnitTestUtilities.Net45", "../../../test/UnitTests/Custom/AWSSDK.UnitTestUtilities.Net45.csproj", "{002B183F-E568-49CD-9D06-CBCFF2C2921F}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.IntegrationTestUtilities.Net35", "../../../test/IntegrationTests/AWSSDK.IntegrationTestUtilities.Net35.csproj", "{924D2906-70D6-4D77-8603-816648B2CCA6}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.UnitTestUtilities.NetFramework", "../../../test/UnitTests/Custom/AWSSDK.UnitTestUtilities.NetFramework.csproj", "{002B183F-E568-49CD-9D06-CBCFF2C2921F}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.IntegrationTestUtilities.Net45", "../../../test/IntegrationTests/AWSSDK.IntegrationTestUtilities.Net45.csproj", "{7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.IntegrationTestUtilities.NetFramework", "../../../test/IntegrationTests/AWSSDK.IntegrationTestUtilities.NetFramework.csproj", "{7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.CommonTest", "../../../test/Common/AWSSDK.CommonTest.csproj", "{66F78F86-68D7-4538-8EA5-A669A08E1C19}" EndProject @@ -44,25 +34,15 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UnitTests.NetStandard.CoreO EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "IntegrationTestDependencies", "IntegrationTestDependencies", "{939EC5C2-8345-43E2-8F97-72EEEBEEA0AC}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.Extensions.CrtIntegration.Net35", "../../../../extensions/src/AWSSDK.Extensions.CrtIntegration/AWSSDK.Extensions.CrtIntegration.Net35.csproj", "{28734152-29CF-4520-9470-A3DDF33B0B16}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.Extensions.CrtIntegration.Net45", "../../../../extensions/src/AWSSDK.Extensions.CrtIntegration/AWSSDK.Extensions.CrtIntegration.Net45.csproj", "{0DBEC836-6EA4-4FFA-94A5-01FFAC51C6C8}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.IdentityManagement.Net35", "../IdentityManagement/AWSSDK.IdentityManagement.Net35.csproj", "{FA8F8393-895B-4386-95EC-1F6F34CFAD62}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.SecurityToken.Net35", "../SecurityToken/AWSSDK.SecurityToken.Net35.csproj", "{A95E0324-D068-4CFA-B61B-FC35EE06AC35}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.SimpleNotificationService.Net35", "../SimpleNotificationService/AWSSDK.SimpleNotificationService.Net35.csproj", "{9E91554D-AC71-40B1-A649-F77BBF79D3F5}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.S3.Net35", "../S3/AWSSDK.S3.Net35.csproj", "{A9E0EBD5-1070-489E-8EA9-7EC8D49E50EC}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.Extensions.CrtIntegration.NetFramework", "../../../../extensions/src/AWSSDK.Extensions.CrtIntegration/AWSSDK.Extensions.CrtIntegration.NetFramework.csproj", "{439BCFCA-6313-4708-864A-B218AC51B3A6}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.IdentityManagement.Net45", "../IdentityManagement/AWSSDK.IdentityManagement.Net45.csproj", "{7EFF4444-7A06-4BBD-B41B-46276B5C034B}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.IdentityManagement.NetFramework", "../IdentityManagement/AWSSDK.IdentityManagement.NetFramework.csproj", "{3B9D6BD3-045B-4368-A812-CCE1436C8A4C}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.S3.Net45", "../S3/AWSSDK.S3.Net45.csproj", "{DEBC9B78-C03A-4D74-950C-81881B21470F}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.S3.NetFramework", "../S3/AWSSDK.S3.NetFramework.csproj", "{C244E3D9-6B3A-4989-991E-5A681462D748}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.SecurityToken.Net45", "../SecurityToken/AWSSDK.SecurityToken.Net45.csproj", "{10BB31A2-69C0-4812-864E-D9C83828405A}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.SecurityToken.NetFramework", "../SecurityToken/AWSSDK.SecurityToken.NetFramework.csproj", "{09B15BAE-B124-4857-A0C1-93C0A81DBB55}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.SimpleNotificationService.Net45", "../SimpleNotificationService/AWSSDK.SimpleNotificationService.Net45.csproj", "{CC669266-3093-48FD-9ADC-BB38A8A5821A}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.SimpleNotificationService.NetFramework", "../SimpleNotificationService/AWSSDK.SimpleNotificationService.NetFramework.csproj", "{281F1C63-DC28-4021-B7B8-520EFEC38672}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -70,10 +50,6 @@ Global Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {1FACE5D0-97BF-4069-B4F7-0FE28BB160F8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1FACE5D0-97BF-4069-B4F7-0FE28BB160F8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1FACE5D0-97BF-4069-B4F7-0FE28BB160F8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1FACE5D0-97BF-4069-B4F7-0FE28BB160F8}.Release|Any CPU.Build.0 = Release|Any CPU {7DE3AFA0-1B2D-41B1-82BD-120B8B210B43}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {7DE3AFA0-1B2D-41B1-82BD-120B8B210B43}.Debug|Any CPU.Build.0 = Debug|Any CPU {7DE3AFA0-1B2D-41B1-82BD-120B8B210B43}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -82,42 +58,26 @@ Global {A855B58E-ED32-40AE-AE8F-054F448B9F2C}.Debug|Any CPU.Build.0 = Debug|Any CPU {A855B58E-ED32-40AE-AE8F-054F448B9F2C}.Release|Any CPU.ActiveCfg = Release|Any CPU {A855B58E-ED32-40AE-AE8F-054F448B9F2C}.Release|Any CPU.Build.0 = Release|Any CPU - {BC97ED7F-B1E4-4500-AFC5-CB32520E75C1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BC97ED7F-B1E4-4500-AFC5-CB32520E75C1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BC97ED7F-B1E4-4500-AFC5-CB32520E75C1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BC97ED7F-B1E4-4500-AFC5-CB32520E75C1}.Release|Any CPU.Build.0 = Release|Any CPU - {C0779A0C-D23B-467D-8023-13CF6EDB9952}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C0779A0C-D23B-467D-8023-13CF6EDB9952}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C0779A0C-D23B-467D-8023-13CF6EDB9952}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C0779A0C-D23B-467D-8023-13CF6EDB9952}.Release|Any CPU.Build.0 = Release|Any CPU + {AB0D02E5-E717-48FF-A755-7063A8D5CB25}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {AB0D02E5-E717-48FF-A755-7063A8D5CB25}.Debug|Any CPU.Build.0 = Debug|Any CPU + {AB0D02E5-E717-48FF-A755-7063A8D5CB25}.Release|Any CPU.ActiveCfg = Release|Any CPU + {AB0D02E5-E717-48FF-A755-7063A8D5CB25}.Release|Any CPU.Build.0 = Release|Any CPU {09EFC232-334E-4F85-B555-59E822AFCA1F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {09EFC232-334E-4F85-B555-59E822AFCA1F}.Debug|Any CPU.Build.0 = Debug|Any CPU {09EFC232-334E-4F85-B555-59E822AFCA1F}.Release|Any CPU.ActiveCfg = Release|Any CPU {09EFC232-334E-4F85-B555-59E822AFCA1F}.Release|Any CPU.Build.0 = Release|Any CPU - {39225000-A845-43F5-89A3-A127978DED18}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {39225000-A845-43F5-89A3-A127978DED18}.Debug|Any CPU.Build.0 = Debug|Any CPU - {39225000-A845-43F5-89A3-A127978DED18}.Release|Any CPU.ActiveCfg = Release|Any CPU - {39225000-A845-43F5-89A3-A127978DED18}.Release|Any CPU.Build.0 = Release|Any CPU - {592C6E19-A33B-4DA6-88F0-F64EB161B172}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {592C6E19-A33B-4DA6-88F0-F64EB161B172}.Debug|Any CPU.Build.0 = Debug|Any CPU - {592C6E19-A33B-4DA6-88F0-F64EB161B172}.Release|Any CPU.ActiveCfg = Release|Any CPU - {592C6E19-A33B-4DA6-88F0-F64EB161B172}.Release|Any CPU.Build.0 = Release|Any CPU + {45956090-CB78-41E7-9467-0F3FBAC89547}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {45956090-CB78-41E7-9467-0F3FBAC89547}.Debug|Any CPU.Build.0 = Debug|Any CPU + {45956090-CB78-41E7-9467-0F3FBAC89547}.Release|Any CPU.ActiveCfg = Release|Any CPU + {45956090-CB78-41E7-9467-0F3FBAC89547}.Release|Any CPU.Build.0 = Release|Any CPU {7BEE7C44-BE12-43CC-AFB9-B5852A1F43C8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {7BEE7C44-BE12-43CC-AFB9-B5852A1F43C8}.Debug|Any CPU.Build.0 = Debug|Any CPU {7BEE7C44-BE12-43CC-AFB9-B5852A1F43C8}.Release|Any CPU.ActiveCfg = Release|Any CPU {7BEE7C44-BE12-43CC-AFB9-B5852A1F43C8}.Release|Any CPU.Build.0 = Release|Any CPU - {A23CE153-A4A3-4D3A-A6DC-0DD1B207118E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A23CE153-A4A3-4D3A-A6DC-0DD1B207118E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A23CE153-A4A3-4D3A-A6DC-0DD1B207118E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A23CE153-A4A3-4D3A-A6DC-0DD1B207118E}.Release|Any CPU.Build.0 = Release|Any CPU {002B183F-E568-49CD-9D06-CBCFF2C2921F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {002B183F-E568-49CD-9D06-CBCFF2C2921F}.Debug|Any CPU.Build.0 = Debug|Any CPU {002B183F-E568-49CD-9D06-CBCFF2C2921F}.Release|Any CPU.ActiveCfg = Release|Any CPU {002B183F-E568-49CD-9D06-CBCFF2C2921F}.Release|Any CPU.Build.0 = Release|Any CPU - {924D2906-70D6-4D77-8603-816648B2CCA6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {924D2906-70D6-4D77-8603-816648B2CCA6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {924D2906-70D6-4D77-8603-816648B2CCA6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {924D2906-70D6-4D77-8603-816648B2CCA6}.Release|Any CPU.Build.0 = Release|Any CPU {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7}.Debug|Any CPU.Build.0 = Debug|Any CPU {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -134,78 +94,48 @@ Global {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {28734152-29CF-4520-9470-A3DDF33B0B16}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {28734152-29CF-4520-9470-A3DDF33B0B16}.Debug|Any CPU.Build.0 = Debug|Any CPU - {28734152-29CF-4520-9470-A3DDF33B0B16}.Release|Any CPU.ActiveCfg = Release|Any CPU - {28734152-29CF-4520-9470-A3DDF33B0B16}.Release|Any CPU.Build.0 = Release|Any CPU - {0DBEC836-6EA4-4FFA-94A5-01FFAC51C6C8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0DBEC836-6EA4-4FFA-94A5-01FFAC51C6C8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0DBEC836-6EA4-4FFA-94A5-01FFAC51C6C8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0DBEC836-6EA4-4FFA-94A5-01FFAC51C6C8}.Release|Any CPU.Build.0 = Release|Any CPU - {FA8F8393-895B-4386-95EC-1F6F34CFAD62}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FA8F8393-895B-4386-95EC-1F6F34CFAD62}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FA8F8393-895B-4386-95EC-1F6F34CFAD62}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FA8F8393-895B-4386-95EC-1F6F34CFAD62}.Release|Any CPU.Build.0 = Release|Any CPU - {A95E0324-D068-4CFA-B61B-FC35EE06AC35}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A95E0324-D068-4CFA-B61B-FC35EE06AC35}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A95E0324-D068-4CFA-B61B-FC35EE06AC35}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A95E0324-D068-4CFA-B61B-FC35EE06AC35}.Release|Any CPU.Build.0 = Release|Any CPU - {9E91554D-AC71-40B1-A649-F77BBF79D3F5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9E91554D-AC71-40B1-A649-F77BBF79D3F5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9E91554D-AC71-40B1-A649-F77BBF79D3F5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9E91554D-AC71-40B1-A649-F77BBF79D3F5}.Release|Any CPU.Build.0 = Release|Any CPU - {A9E0EBD5-1070-489E-8EA9-7EC8D49E50EC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A9E0EBD5-1070-489E-8EA9-7EC8D49E50EC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A9E0EBD5-1070-489E-8EA9-7EC8D49E50EC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A9E0EBD5-1070-489E-8EA9-7EC8D49E50EC}.Release|Any CPU.Build.0 = Release|Any CPU - {7EFF4444-7A06-4BBD-B41B-46276B5C034B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7EFF4444-7A06-4BBD-B41B-46276B5C034B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7EFF4444-7A06-4BBD-B41B-46276B5C034B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7EFF4444-7A06-4BBD-B41B-46276B5C034B}.Release|Any CPU.Build.0 = Release|Any CPU - {DEBC9B78-C03A-4D74-950C-81881B21470F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DEBC9B78-C03A-4D74-950C-81881B21470F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DEBC9B78-C03A-4D74-950C-81881B21470F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DEBC9B78-C03A-4D74-950C-81881B21470F}.Release|Any CPU.Build.0 = Release|Any CPU - {10BB31A2-69C0-4812-864E-D9C83828405A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {10BB31A2-69C0-4812-864E-D9C83828405A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {10BB31A2-69C0-4812-864E-D9C83828405A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {10BB31A2-69C0-4812-864E-D9C83828405A}.Release|Any CPU.Build.0 = Release|Any CPU - {CC669266-3093-48FD-9ADC-BB38A8A5821A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CC669266-3093-48FD-9ADC-BB38A8A5821A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CC669266-3093-48FD-9ADC-BB38A8A5821A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CC669266-3093-48FD-9ADC-BB38A8A5821A}.Release|Any CPU.Build.0 = Release|Any CPU + {439BCFCA-6313-4708-864A-B218AC51B3A6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {439BCFCA-6313-4708-864A-B218AC51B3A6}.Debug|Any CPU.Build.0 = Debug|Any CPU + {439BCFCA-6313-4708-864A-B218AC51B3A6}.Release|Any CPU.ActiveCfg = Release|Any CPU + {439BCFCA-6313-4708-864A-B218AC51B3A6}.Release|Any CPU.Build.0 = Release|Any CPU + {3B9D6BD3-045B-4368-A812-CCE1436C8A4C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {3B9D6BD3-045B-4368-A812-CCE1436C8A4C}.Debug|Any CPU.Build.0 = Debug|Any CPU + {3B9D6BD3-045B-4368-A812-CCE1436C8A4C}.Release|Any CPU.ActiveCfg = Release|Any CPU + {3B9D6BD3-045B-4368-A812-CCE1436C8A4C}.Release|Any CPU.Build.0 = Release|Any CPU + {C244E3D9-6B3A-4989-991E-5A681462D748}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {C244E3D9-6B3A-4989-991E-5A681462D748}.Debug|Any CPU.Build.0 = Debug|Any CPU + {C244E3D9-6B3A-4989-991E-5A681462D748}.Release|Any CPU.ActiveCfg = Release|Any CPU + {C244E3D9-6B3A-4989-991E-5A681462D748}.Release|Any CPU.Build.0 = Release|Any CPU + {09B15BAE-B124-4857-A0C1-93C0A81DBB55}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {09B15BAE-B124-4857-A0C1-93C0A81DBB55}.Debug|Any CPU.Build.0 = Debug|Any CPU + {09B15BAE-B124-4857-A0C1-93C0A81DBB55}.Release|Any CPU.ActiveCfg = Release|Any CPU + {09B15BAE-B124-4857-A0C1-93C0A81DBB55}.Release|Any CPU.Build.0 = Release|Any CPU + {281F1C63-DC28-4021-B7B8-520EFEC38672}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {281F1C63-DC28-4021-B7B8-520EFEC38672}.Debug|Any CPU.Build.0 = Debug|Any CPU + {281F1C63-DC28-4021-B7B8-520EFEC38672}.Release|Any CPU.ActiveCfg = Release|Any CPU + {281F1C63-DC28-4021-B7B8-520EFEC38672}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution - {1FACE5D0-97BF-4069-B4F7-0FE28BB160F8} = {9863FCB3-BFA4-4B9C-B8F6-302BA5F660B8} {7DE3AFA0-1B2D-41B1-82BD-120B8B210B43} = {9863FCB3-BFA4-4B9C-B8F6-302BA5F660B8} {A855B58E-ED32-40AE-AE8F-054F448B9F2C} = {9863FCB3-BFA4-4B9C-B8F6-302BA5F660B8} {C86096F6-379A-48ED-8236-38AB30BF1FE2} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AB} - {BC97ED7F-B1E4-4500-AFC5-CB32520E75C1} = {C86096F6-379A-48ED-8236-38AB30BF1FE2} - {C0779A0C-D23B-467D-8023-13CF6EDB9952} = {C86096F6-379A-48ED-8236-38AB30BF1FE2} + {AB0D02E5-E717-48FF-A755-7063A8D5CB25} = {C86096F6-379A-48ED-8236-38AB30BF1FE2} {09EFC232-334E-4F85-B555-59E822AFCA1F} = {C86096F6-379A-48ED-8236-38AB30BF1FE2} - {39225000-A845-43F5-89A3-A127978DED18} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {592C6E19-A33B-4DA6-88F0-F64EB161B172} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {45956090-CB78-41E7-9467-0F3FBAC89547} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7BEE7C44-BE12-43CC-AFB9-B5852A1F43C8} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {A23CE153-A4A3-4D3A-A6DC-0DD1B207118E} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {924D2906-70D6-4D77-8603-816648B2CCA6} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {28734152-29CF-4520-9470-A3DDF33B0B16} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0DBEC836-6EA4-4FFA-94A5-01FFAC51C6C8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {FA8F8393-895B-4386-95EC-1F6F34CFAD62} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A95E0324-D068-4CFA-B61B-FC35EE06AC35} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {9E91554D-AC71-40B1-A649-F77BBF79D3F5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A9E0EBD5-1070-489E-8EA9-7EC8D49E50EC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {7EFF4444-7A06-4BBD-B41B-46276B5C034B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {DEBC9B78-C03A-4D74-950C-81881B21470F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {10BB31A2-69C0-4812-864E-D9C83828405A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {CC669266-3093-48FD-9ADC-BB38A8A5821A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} + {439BCFCA-6313-4708-864A-B218AC51B3A6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} + {3B9D6BD3-045B-4368-A812-CCE1436C8A4C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} + {C244E3D9-6B3A-4989-991E-5A681462D748} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} + {09B15BAE-B124-4857-A0C1-93C0A81DBB55} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} + {281F1C63-DC28-4021-B7B8-520EFEC38672} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {9D155696-C166-4864-B32B-E4F08C1E90F4} diff --git a/sdk/src/Services/GeoRoutes/Properties/AssemblyInfo.cs b/sdk/src/Services/GeoRoutes/Properties/AssemblyInfo.cs index b6b284c264f8..8e926daa9bbe 100644 --- a/sdk/src/Services/GeoRoutes/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/GeoRoutes/Properties/AssemblyInfo.cs @@ -7,10 +7,8 @@ // set of attributes. Change these attribute values to modify the information // associated with an assembly. [assembly: AssemblyTitle("AWSSDK.GeoRoutes")] -#if BCL35 -[assembly: AssemblyDescription("The Amazon Web Services SDK for .NET (3.5) - Amazon Location Service Routes V2. Release of Amazon Location Routes API. Routes enables you to plan efficient routes and streamline deliveries by leveraging real-time traffic, vehicle restrictions, and turn-by-turn directions.")] -#elif BCL45 -[assembly: AssemblyDescription("The Amazon Web Services SDK for .NET (4.5) - Amazon Location Service Routes V2. Release of Amazon Location Routes API. Routes enables you to plan efficient routes and streamline deliveries by leveraging real-time traffic, vehicle restrictions, and turn-by-turn directions.")] +#if BCL +[assembly: AssemblyDescription("The Amazon Web Services SDK for .NET (4.7.2) - Amazon Location Service Routes V2. Release of Amazon Location Routes API. Routes enables you to plan efficient routes and streamline deliveries by leveraging real-time traffic, vehicle restrictions, and turn-by-turn directions.")] #elif NETSTANDARD20 [assembly: AssemblyDescription("The Amazon Web Services SDK for .NET (NetStandard 2.0) - Amazon Location Service Routes V2. Release of Amazon Location Routes API. Routes enables you to plan efficient routes and streamline deliveries by leveraging real-time traffic, vehicle restrictions, and turn-by-turn directions.")] #elif NETCOREAPP3_1 @@ -43,9 +41,9 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.10")] - #if BCL -[assembly: System.Security.AllowPartiallyTrustedCallers] -#endif \ No newline at end of file +[assembly: AssemblyVersion("4.0")] +#else +[assembly: AssemblyVersion("4.0.0.0")] +#endif +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/src/Services/Glacier/Generated/AmazonGlacierConfig.cs b/sdk/src/Services/Glacier/Generated/AmazonGlacierConfig.cs index a986ae048a50..cf5e2ad502b3 100644 --- a/sdk/src/Services/Glacier/Generated/AmazonGlacierConfig.cs +++ b/sdk/src/Services/Glacier/Generated/AmazonGlacierConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.Glacier public partial class AmazonGlacierConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("Glacier", "4.0.0.0"); private static readonly AmazonGlacierEndpointResolver EndpointResolver = new AmazonGlacierEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("Glacier", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("Glacier", "3.7.400.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/Glacier/Glacier.sln b/sdk/src/Services/Glacier/Glacier.sln index baa2a2546cbf..ad9f05919578 100644 --- a/sdk/src/Services/Glacier/Glacier.sln +++ b/sdk/src/Services/Glacier/Glacier.sln @@ -114,7 +114,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {2D308B49-8CFD-4C33-9B13-A6079F65F7C5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {2D308B49-8CFD-4C33-9B13-A6079F65F7C5}.Debug|Any CPU.Build.0 = Debug|Any CPU {2D308B49-8CFD-4C33-9B13-A6079F65F7C5}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -131,81 +138,6 @@ Global {2C4D9137-A568-4389-9D30-55B3B0E477BB}.Debug|Any CPU.Build.0 = Debug|Any CPU {2C4D9137-A568-4389-9D30-55B3B0E477BB}.Release|Any CPU.ActiveCfg = Release|Any CPU {2C4D9137-A568-4389-9D30-55B3B0E477BB}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {C7CFAB9D-4D25-4D69-9C9D-2D4B06741AAA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C7CFAB9D-4D25-4D69-9C9D-2D4B06741AAA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C7CFAB9D-4D25-4D69-9C9D-2D4B06741AAA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C7CFAB9D-4D25-4D69-9C9D-2D4B06741AAA}.Release|Any CPU.Build.0 = Release|Any CPU - {FDEFE573-78FC-40B7-86D7-9800337BA87C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FDEFE573-78FC-40B7-86D7-9800337BA87C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FDEFE573-78FC-40B7-86D7-9800337BA87C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FDEFE573-78FC-40B7-86D7-9800337BA87C}.Release|Any CPU.Build.0 = Release|Any CPU - {A9D2FE07-E4DD-46A8-83BE-02692174AC1B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A9D2FE07-E4DD-46A8-83BE-02692174AC1B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A9D2FE07-E4DD-46A8-83BE-02692174AC1B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A9D2FE07-E4DD-46A8-83BE-02692174AC1B}.Release|Any CPU.Build.0 = Release|Any CPU - {012DD2B2-E4A0-48CC-B07A-69566494E6D4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {012DD2B2-E4A0-48CC-B07A-69566494E6D4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {012DD2B2-E4A0-48CC-B07A-69566494E6D4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {012DD2B2-E4A0-48CC-B07A-69566494E6D4}.Release|Any CPU.Build.0 = Release|Any CPU - {B3972FBA-D9B1-430D-9039-11380B4E7B4A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B3972FBA-D9B1-430D-9039-11380B4E7B4A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B3972FBA-D9B1-430D-9039-11380B4E7B4A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B3972FBA-D9B1-430D-9039-11380B4E7B4A}.Release|Any CPU.Build.0 = Release|Any CPU - {29FFD84D-7FB8-496F-97D7-A75BB6A130F7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {29FFD84D-7FB8-496F-97D7-A75BB6A130F7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {29FFD84D-7FB8-496F-97D7-A75BB6A130F7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {29FFD84D-7FB8-496F-97D7-A75BB6A130F7}.Release|Any CPU.Build.0 = Release|Any CPU - {40EC6EBF-B46E-4AFF-9228-C8A9097E17A5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {40EC6EBF-B46E-4AFF-9228-C8A9097E17A5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {40EC6EBF-B46E-4AFF-9228-C8A9097E17A5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {40EC6EBF-B46E-4AFF-9228-C8A9097E17A5}.Release|Any CPU.Build.0 = Release|Any CPU - {42A1FEA8-5B33-40D3-A277-9B3CE8A563F5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {42A1FEA8-5B33-40D3-A277-9B3CE8A563F5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {42A1FEA8-5B33-40D3-A277-9B3CE8A563F5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {42A1FEA8-5B33-40D3-A277-9B3CE8A563F5}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {C7CFAB9D-4D25-4D69-9C9D-2D4B06741AAA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C7CFAB9D-4D25-4D69-9C9D-2D4B06741AAA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C7CFAB9D-4D25-4D69-9C9D-2D4B06741AAA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C7CFAB9D-4D25-4D69-9C9D-2D4B06741AAA}.Release|Any CPU.Build.0 = Release|Any CPU - {FDEFE573-78FC-40B7-86D7-9800337BA87C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FDEFE573-78FC-40B7-86D7-9800337BA87C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FDEFE573-78FC-40B7-86D7-9800337BA87C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FDEFE573-78FC-40B7-86D7-9800337BA87C}.Release|Any CPU.Build.0 = Release|Any CPU - {A9D2FE07-E4DD-46A8-83BE-02692174AC1B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A9D2FE07-E4DD-46A8-83BE-02692174AC1B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A9D2FE07-E4DD-46A8-83BE-02692174AC1B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A9D2FE07-E4DD-46A8-83BE-02692174AC1B}.Release|Any CPU.Build.0 = Release|Any CPU - {012DD2B2-E4A0-48CC-B07A-69566494E6D4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {012DD2B2-E4A0-48CC-B07A-69566494E6D4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {012DD2B2-E4A0-48CC-B07A-69566494E6D4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {012DD2B2-E4A0-48CC-B07A-69566494E6D4}.Release|Any CPU.Build.0 = Release|Any CPU - {B3972FBA-D9B1-430D-9039-11380B4E7B4A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B3972FBA-D9B1-430D-9039-11380B4E7B4A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B3972FBA-D9B1-430D-9039-11380B4E7B4A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B3972FBA-D9B1-430D-9039-11380B4E7B4A}.Release|Any CPU.Build.0 = Release|Any CPU - {29FFD84D-7FB8-496F-97D7-A75BB6A130F7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {29FFD84D-7FB8-496F-97D7-A75BB6A130F7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {29FFD84D-7FB8-496F-97D7-A75BB6A130F7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {29FFD84D-7FB8-496F-97D7-A75BB6A130F7}.Release|Any CPU.Build.0 = Release|Any CPU - {40EC6EBF-B46E-4AFF-9228-C8A9097E17A5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {40EC6EBF-B46E-4AFF-9228-C8A9097E17A5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {40EC6EBF-B46E-4AFF-9228-C8A9097E17A5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {40EC6EBF-B46E-4AFF-9228-C8A9097E17A5}.Release|Any CPU.Build.0 = Release|Any CPU - {42A1FEA8-5B33-40D3-A277-9B3CE8A563F5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {42A1FEA8-5B33-40D3-A277-9B3CE8A563F5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {42A1FEA8-5B33-40D3-A277-9B3CE8A563F5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {42A1FEA8-5B33-40D3-A277-9B3CE8A563F5}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -226,32 +158,12 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {2D308B49-8CFD-4C33-9B13-A6079F65F7C5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {6DA73146-420C-4BEC-A650-6DC6FE1F0853} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {383A6E9F-0CFD-45C3-B2D2-88E14AAE159D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {2C4D9137-A568-4389-9D30-55B3B0E477BB} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {C7CFAB9D-4D25-4D69-9C9D-2D4B06741AAA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {FDEFE573-78FC-40B7-86D7-9800337BA87C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A9D2FE07-E4DD-46A8-83BE-02692174AC1B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {012DD2B2-E4A0-48CC-B07A-69566494E6D4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B3972FBA-D9B1-430D-9039-11380B4E7B4A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {29FFD84D-7FB8-496F-97D7-A75BB6A130F7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {40EC6EBF-B46E-4AFF-9228-C8A9097E17A5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {42A1FEA8-5B33-40D3-A277-9B3CE8A563F5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {C7CFAB9D-4D25-4D69-9C9D-2D4B06741AAA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {FDEFE573-78FC-40B7-86D7-9800337BA87C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A9D2FE07-E4DD-46A8-83BE-02692174AC1B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {012DD2B2-E4A0-48CC-B07A-69566494E6D4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B3972FBA-D9B1-430D-9039-11380B4E7B4A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {29FFD84D-7FB8-496F-97D7-A75BB6A130F7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {40EC6EBF-B46E-4AFF-9228-C8A9097E17A5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {42A1FEA8-5B33-40D3-A277-9B3CE8A563F5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {AD9E102D-290B-433B-9B72-45744B1CDE70} diff --git a/sdk/src/Services/Glacier/Properties/AssemblyInfo.cs b/sdk/src/Services/Glacier/Properties/AssemblyInfo.cs index 604cf885e7d4..6a979d4f73ca 100644 --- a/sdk/src/Services/Glacier/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/Glacier/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/GlobalAccelerator/Generated/AmazonGlobalAcceleratorConfig.cs b/sdk/src/Services/GlobalAccelerator/Generated/AmazonGlobalAcceleratorConfig.cs index 8c7db217ae4d..f67be96cd90b 100644 --- a/sdk/src/Services/GlobalAccelerator/Generated/AmazonGlobalAcceleratorConfig.cs +++ b/sdk/src/Services/GlobalAccelerator/Generated/AmazonGlobalAcceleratorConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.GlobalAccelerator public partial class AmazonGlobalAcceleratorConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("Global Accelerator", "4.0.0.0"); private static readonly AmazonGlobalAcceleratorEndpointResolver EndpointResolver = new AmazonGlobalAcceleratorEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("Global Accelerator", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("Global Accelerator", "3.7.400.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/GlobalAccelerator/GlobalAccelerator.sln b/sdk/src/Services/GlobalAccelerator/GlobalAccelerator.sln index afd728b423dc..1c69fd06b4ea 100644 --- a/sdk/src/Services/GlobalAccelerator/GlobalAccelerator.sln +++ b/sdk/src/Services/GlobalAccelerator/GlobalAccelerator.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {F513986B-A7A6-4452-960B-0BA029393DF0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {F513986B-A7A6-4452-960B-0BA029393DF0}.Debug|Any CPU.Build.0 = Debug|Any CPU {F513986B-A7A6-4452-960B-0BA029393DF0}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {EB220E65-AFAB-4D4B-8C62-A1A0884E4F6D}.Debug|Any CPU.Build.0 = Debug|Any CPU {EB220E65-AFAB-4D4B-8C62-A1A0884E4F6D}.Release|Any CPU.ActiveCfg = Release|Any CPU {EB220E65-AFAB-4D4B-8C62-A1A0884E4F6D}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {81DCFF3A-831B-4ECF-8D9D-F45D9C93013C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {81DCFF3A-831B-4ECF-8D9D-F45D9C93013C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {81DCFF3A-831B-4ECF-8D9D-F45D9C93013C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {81DCFF3A-831B-4ECF-8D9D-F45D9C93013C}.Release|Any CPU.Build.0 = Release|Any CPU - {50E12465-3DE2-462C-9B92-96A3966E226C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {50E12465-3DE2-462C-9B92-96A3966E226C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {50E12465-3DE2-462C-9B92-96A3966E226C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {50E12465-3DE2-462C-9B92-96A3966E226C}.Release|Any CPU.Build.0 = Release|Any CPU - {472E275B-0E87-4835-A603-53E349AC6476}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {472E275B-0E87-4835-A603-53E349AC6476}.Debug|Any CPU.Build.0 = Debug|Any CPU - {472E275B-0E87-4835-A603-53E349AC6476}.Release|Any CPU.ActiveCfg = Release|Any CPU - {472E275B-0E87-4835-A603-53E349AC6476}.Release|Any CPU.Build.0 = Release|Any CPU - {74085F33-7AF6-48EC-8D4B-FF2220DDFA9B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {74085F33-7AF6-48EC-8D4B-FF2220DDFA9B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {74085F33-7AF6-48EC-8D4B-FF2220DDFA9B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {74085F33-7AF6-48EC-8D4B-FF2220DDFA9B}.Release|Any CPU.Build.0 = Release|Any CPU - {75B0CB18-9E9D-4FB2-8E30-BDD321EE5518}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {75B0CB18-9E9D-4FB2-8E30-BDD321EE5518}.Debug|Any CPU.Build.0 = Debug|Any CPU - {75B0CB18-9E9D-4FB2-8E30-BDD321EE5518}.Release|Any CPU.ActiveCfg = Release|Any CPU - {75B0CB18-9E9D-4FB2-8E30-BDD321EE5518}.Release|Any CPU.Build.0 = Release|Any CPU - {C78DD1AD-3454-4D62-B562-F769437E827A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C78DD1AD-3454-4D62-B562-F769437E827A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C78DD1AD-3454-4D62-B562-F769437E827A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C78DD1AD-3454-4D62-B562-F769437E827A}.Release|Any CPU.Build.0 = Release|Any CPU - {C3C19EDC-87A2-4D15-8AF6-6BC55C1A6A1E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C3C19EDC-87A2-4D15-8AF6-6BC55C1A6A1E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C3C19EDC-87A2-4D15-8AF6-6BC55C1A6A1E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C3C19EDC-87A2-4D15-8AF6-6BC55C1A6A1E}.Release|Any CPU.Build.0 = Release|Any CPU - {75726B0B-930E-4942-8C0F-79B2C41F39B7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {75726B0B-930E-4942-8C0F-79B2C41F39B7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {75726B0B-930E-4942-8C0F-79B2C41F39B7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {75726B0B-930E-4942-8C0F-79B2C41F39B7}.Release|Any CPU.Build.0 = Release|Any CPU - {7CA8A786-871B-48C7-83EB-F046DF27F35C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7CA8A786-871B-48C7-83EB-F046DF27F35C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7CA8A786-871B-48C7-83EB-F046DF27F35C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7CA8A786-871B-48C7-83EB-F046DF27F35C}.Release|Any CPU.Build.0 = Release|Any CPU - {ECE72F90-0A50-40C4-B52F-104258CEF9A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {ECE72F90-0A50-40C4-B52F-104258CEF9A2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {ECE72F90-0A50-40C4-B52F-104258CEF9A2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {ECE72F90-0A50-40C4-B52F-104258CEF9A2}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {81DCFF3A-831B-4ECF-8D9D-F45D9C93013C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {81DCFF3A-831B-4ECF-8D9D-F45D9C93013C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {81DCFF3A-831B-4ECF-8D9D-F45D9C93013C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {81DCFF3A-831B-4ECF-8D9D-F45D9C93013C}.Release|Any CPU.Build.0 = Release|Any CPU - {50E12465-3DE2-462C-9B92-96A3966E226C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {50E12465-3DE2-462C-9B92-96A3966E226C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {50E12465-3DE2-462C-9B92-96A3966E226C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {50E12465-3DE2-462C-9B92-96A3966E226C}.Release|Any CPU.Build.0 = Release|Any CPU - {472E275B-0E87-4835-A603-53E349AC6476}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {472E275B-0E87-4835-A603-53E349AC6476}.Debug|Any CPU.Build.0 = Debug|Any CPU - {472E275B-0E87-4835-A603-53E349AC6476}.Release|Any CPU.ActiveCfg = Release|Any CPU - {472E275B-0E87-4835-A603-53E349AC6476}.Release|Any CPU.Build.0 = Release|Any CPU - {74085F33-7AF6-48EC-8D4B-FF2220DDFA9B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {74085F33-7AF6-48EC-8D4B-FF2220DDFA9B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {74085F33-7AF6-48EC-8D4B-FF2220DDFA9B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {74085F33-7AF6-48EC-8D4B-FF2220DDFA9B}.Release|Any CPU.Build.0 = Release|Any CPU - {75B0CB18-9E9D-4FB2-8E30-BDD321EE5518}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {75B0CB18-9E9D-4FB2-8E30-BDD321EE5518}.Debug|Any CPU.Build.0 = Debug|Any CPU - {75B0CB18-9E9D-4FB2-8E30-BDD321EE5518}.Release|Any CPU.ActiveCfg = Release|Any CPU - {75B0CB18-9E9D-4FB2-8E30-BDD321EE5518}.Release|Any CPU.Build.0 = Release|Any CPU - {C78DD1AD-3454-4D62-B562-F769437E827A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C78DD1AD-3454-4D62-B562-F769437E827A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C78DD1AD-3454-4D62-B562-F769437E827A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C78DD1AD-3454-4D62-B562-F769437E827A}.Release|Any CPU.Build.0 = Release|Any CPU - {C3C19EDC-87A2-4D15-8AF6-6BC55C1A6A1E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C3C19EDC-87A2-4D15-8AF6-6BC55C1A6A1E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C3C19EDC-87A2-4D15-8AF6-6BC55C1A6A1E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C3C19EDC-87A2-4D15-8AF6-6BC55C1A6A1E}.Release|Any CPU.Build.0 = Release|Any CPU - {75726B0B-930E-4942-8C0F-79B2C41F39B7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {75726B0B-930E-4942-8C0F-79B2C41F39B7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {75726B0B-930E-4942-8C0F-79B2C41F39B7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {75726B0B-930E-4942-8C0F-79B2C41F39B7}.Release|Any CPU.Build.0 = Release|Any CPU - {7CA8A786-871B-48C7-83EB-F046DF27F35C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7CA8A786-871B-48C7-83EB-F046DF27F35C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7CA8A786-871B-48C7-83EB-F046DF27F35C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7CA8A786-871B-48C7-83EB-F046DF27F35C}.Release|Any CPU.Build.0 = Release|Any CPU - {ECE72F90-0A50-40C4-B52F-104258CEF9A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {ECE72F90-0A50-40C4-B52F-104258CEF9A2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {ECE72F90-0A50-40C4-B52F-104258CEF9A2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {ECE72F90-0A50-40C4-B52F-104258CEF9A2}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {F513986B-A7A6-4452-960B-0BA029393DF0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {D8BBA88B-F623-4D83-B19A-A500FCAD7171} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {3D054E61-BB2C-4A4D-BC48-60F229DADE70} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {D2C09C29-11F9-456C-8E5A-65E6AF73624D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {EB220E65-AFAB-4D4B-8C62-A1A0884E4F6D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {81DCFF3A-831B-4ECF-8D9D-F45D9C93013C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {50E12465-3DE2-462C-9B92-96A3966E226C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {472E275B-0E87-4835-A603-53E349AC6476} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {74085F33-7AF6-48EC-8D4B-FF2220DDFA9B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {75B0CB18-9E9D-4FB2-8E30-BDD321EE5518} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C78DD1AD-3454-4D62-B562-F769437E827A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C3C19EDC-87A2-4D15-8AF6-6BC55C1A6A1E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {75726B0B-930E-4942-8C0F-79B2C41F39B7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {7CA8A786-871B-48C7-83EB-F046DF27F35C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {ECE72F90-0A50-40C4-B52F-104258CEF9A2} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {81DCFF3A-831B-4ECF-8D9D-F45D9C93013C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {50E12465-3DE2-462C-9B92-96A3966E226C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {472E275B-0E87-4835-A603-53E349AC6476} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {74085F33-7AF6-48EC-8D4B-FF2220DDFA9B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {75B0CB18-9E9D-4FB2-8E30-BDD321EE5518} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C78DD1AD-3454-4D62-B562-F769437E827A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C3C19EDC-87A2-4D15-8AF6-6BC55C1A6A1E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {75726B0B-930E-4942-8C0F-79B2C41F39B7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {7CA8A786-871B-48C7-83EB-F046DF27F35C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {ECE72F90-0A50-40C4-B52F-104258CEF9A2} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {1840F64A-6694-48C9-97FE-AA93EE1E051C} diff --git a/sdk/src/Services/GlobalAccelerator/Properties/AssemblyInfo.cs b/sdk/src/Services/GlobalAccelerator/Properties/AssemblyInfo.cs index 7b568979978b..36cc255f5a40 100644 --- a/sdk/src/Services/GlobalAccelerator/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/GlobalAccelerator/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/Glue/Generated/AmazonGlueConfig.cs b/sdk/src/Services/Glue/Generated/AmazonGlueConfig.cs index fd2eef699337..4e689786d077 100644 --- a/sdk/src/Services/Glue/Generated/AmazonGlueConfig.cs +++ b/sdk/src/Services/Glue/Generated/AmazonGlueConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.Glue public partial class AmazonGlueConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("Glue", "4.0.0.0"); private static readonly AmazonGlueEndpointResolver EndpointResolver = new AmazonGlueEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("Glue", "3.7.408.4"); -======= - InternalSDKUtils.BuildUserAgentString("Glue", "3.7.409.9"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/Glue/Generated/Model/ColumnStatisticsTaskSettings.cs b/sdk/src/Services/Glue/Generated/Model/ColumnStatisticsTaskSettings.cs index b0ca950cc01a..630079e4c7af 100644 --- a/sdk/src/Services/Glue/Generated/Model/ColumnStatisticsTaskSettings.cs +++ b/sdk/src/Services/Glue/Generated/Model/ColumnStatisticsTaskSettings.cs @@ -123,9 +123,9 @@ internal bool IsSetRole() /// /// [AWSProperty(Min=0, Max=100)] - public double SampleSize + public double? SampleSize { - get { return this._sampleSize.GetValueOrDefault(); } + get { return this._sampleSize; } set { this._sampleSize = value; } } diff --git a/sdk/src/Services/Glue/Generated/Model/CreateColumnStatisticsTaskSettingsRequest.cs b/sdk/src/Services/Glue/Generated/Model/CreateColumnStatisticsTaskSettingsRequest.cs index 1708bd879c93..d159332b79af 100644 --- a/sdk/src/Services/Glue/Generated/Model/CreateColumnStatisticsTaskSettingsRequest.cs +++ b/sdk/src/Services/Glue/Generated/Model/CreateColumnStatisticsTaskSettingsRequest.cs @@ -127,9 +127,9 @@ internal bool IsSetRole() /// /// [AWSProperty(Min=0, Max=100)] - public double SampleSize + public double? SampleSize { - get { return this._sampleSize.GetValueOrDefault(); } + get { return this._sampleSize; } set { this._sampleSize = value; } } diff --git a/sdk/src/Services/Glue/Generated/Model/Internal/MarshallTransformations/ColumnStatisticsTaskSettingsUnmarshaller.cs b/sdk/src/Services/Glue/Generated/Model/Internal/MarshallTransformations/ColumnStatisticsTaskSettingsUnmarshaller.cs index 9f2fe0f2f79d..2951b6aef5f8 100644 --- a/sdk/src/Services/Glue/Generated/Model/Internal/MarshallTransformations/ColumnStatisticsTaskSettingsUnmarshaller.cs +++ b/sdk/src/Services/Glue/Generated/Model/Internal/MarshallTransformations/ColumnStatisticsTaskSettingsUnmarshaller.cs @@ -92,7 +92,7 @@ public ColumnStatisticsTaskSettings Unmarshall(JsonUnmarshallerContext context) } if (context.TestExpression("SampleSize", targetDepth)) { - var unmarshaller = DoubleUnmarshaller.Instance; + var unmarshaller = NullableDoubleUnmarshaller.Instance; unmarshalledObject.SampleSize = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/Glue/Generated/Model/Internal/MarshallTransformations/CreateColumnStatisticsTaskSettingsRequestMarshaller.cs b/sdk/src/Services/Glue/Generated/Model/Internal/MarshallTransformations/CreateColumnStatisticsTaskSettingsRequestMarshaller.cs index d3d4b67de930..99101c607409 100644 --- a/sdk/src/Services/Glue/Generated/Model/Internal/MarshallTransformations/CreateColumnStatisticsTaskSettingsRequestMarshaller.cs +++ b/sdk/src/Services/Glue/Generated/Model/Internal/MarshallTransformations/CreateColumnStatisticsTaskSettingsRequestMarshaller.cs @@ -63,89 +63,92 @@ public IRequest Marshall(CreateColumnStatisticsTaskSettingsRequest publicRequest request.HttpMethod = "POST"; request.ResourcePath = "/"; - using (StringWriter stringWriter = new StringWriter(CultureInfo.InvariantCulture)) + using (MemoryStream memoryStream = new MemoryStream()) { - JsonWriter writer = new JsonWriter(stringWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetCatalogID()) + using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) { - context.Writer.WritePropertyName("CatalogID"); - context.Writer.Write(publicRequest.CatalogID); - } - - if(publicRequest.IsSetColumnNameList()) - { - context.Writer.WritePropertyName("ColumnNameList"); - context.Writer.WriteArrayStart(); - foreach(var publicRequestColumnNameListListValue in publicRequest.ColumnNameList) + JsonWriter writer = new JsonWriter(streamWriter); + writer.Validate = false; + writer.WriteObjectStart(); + var context = new JsonMarshallerContext(request, writer); + if(publicRequest.IsSetCatalogID()) { - context.Writer.Write(publicRequestColumnNameListListValue); + context.Writer.WritePropertyName("CatalogID"); + context.Writer.Write(publicRequest.CatalogID); } - context.Writer.WriteArrayEnd(); - } - if(publicRequest.IsSetDatabaseName()) - { - context.Writer.WritePropertyName("DatabaseName"); - context.Writer.Write(publicRequest.DatabaseName); - } - - if(publicRequest.IsSetRole()) - { - context.Writer.WritePropertyName("Role"); - context.Writer.Write(publicRequest.Role); - } + if(publicRequest.IsSetColumnNameList()) + { + context.Writer.WritePropertyName("ColumnNameList"); + context.Writer.WriteArrayStart(); + foreach(var publicRequestColumnNameListListValue in publicRequest.ColumnNameList) + { + context.Writer.Write(publicRequestColumnNameListListValue); + } + context.Writer.WriteArrayEnd(); + } - if(publicRequest.IsSetSampleSize()) - { - context.Writer.WritePropertyName("SampleSize"); - if(StringUtils.IsSpecialDoubleValue(publicRequest.SampleSize)) + if(publicRequest.IsSetDatabaseName()) { - context.Writer.Write(StringUtils.FromSpecialDoubleValue(publicRequest.SampleSize)); + context.Writer.WritePropertyName("DatabaseName"); + context.Writer.Write(publicRequest.DatabaseName); } - else + + if(publicRequest.IsSetRole()) { - context.Writer.Write(publicRequest.SampleSize); + context.Writer.WritePropertyName("Role"); + context.Writer.Write(publicRequest.Role); } - } - if(publicRequest.IsSetSchedule()) - { - context.Writer.WritePropertyName("Schedule"); - context.Writer.Write(publicRequest.Schedule); - } + if(publicRequest.IsSetSampleSize()) + { + context.Writer.WritePropertyName("SampleSize"); + if(StringUtils.IsSpecialDoubleValue(publicRequest.SampleSize.Value)) + { + context.Writer.Write(StringUtils.FromSpecialDoubleValue(publicRequest.SampleSize.Value)); + } + else + { + context.Writer.Write(publicRequest.SampleSize.Value); + } + } - if(publicRequest.IsSetSecurityConfiguration()) - { - context.Writer.WritePropertyName("SecurityConfiguration"); - context.Writer.Write(publicRequest.SecurityConfiguration); - } + if(publicRequest.IsSetSchedule()) + { + context.Writer.WritePropertyName("Schedule"); + context.Writer.Write(publicRequest.Schedule); + } - if(publicRequest.IsSetTableName()) - { - context.Writer.WritePropertyName("TableName"); - context.Writer.Write(publicRequest.TableName); - } + if(publicRequest.IsSetSecurityConfiguration()) + { + context.Writer.WritePropertyName("SecurityConfiguration"); + context.Writer.Write(publicRequest.SecurityConfiguration); + } - if(publicRequest.IsSetTags()) - { - context.Writer.WritePropertyName("Tags"); - context.Writer.WriteObjectStart(); - foreach (var publicRequestTagsKvp in publicRequest.Tags) + if(publicRequest.IsSetTableName()) { - context.Writer.WritePropertyName(publicRequestTagsKvp.Key); - var publicRequestTagsValue = publicRequestTagsKvp.Value; + context.Writer.WritePropertyName("TableName"); + context.Writer.Write(publicRequest.TableName); + } - context.Writer.Write(publicRequestTagsValue); + if(publicRequest.IsSetTags()) + { + context.Writer.WritePropertyName("Tags"); + context.Writer.WriteObjectStart(); + foreach (var publicRequestTagsKvp in publicRequest.Tags) + { + context.Writer.WritePropertyName(publicRequestTagsKvp.Key); + var publicRequestTagsValue = publicRequestTagsKvp.Value; + + context.Writer.Write(publicRequestTagsValue); + } + context.Writer.WriteObjectEnd(); } - context.Writer.WriteObjectEnd(); + + writer.WriteObjectEnd(); } - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); + request.Content = memoryStream.ToArray(); } diff --git a/sdk/src/Services/Glue/Generated/Model/Internal/MarshallTransformations/DeleteColumnStatisticsTaskSettingsRequestMarshaller.cs b/sdk/src/Services/Glue/Generated/Model/Internal/MarshallTransformations/DeleteColumnStatisticsTaskSettingsRequestMarshaller.cs index 4a815bd909cb..f9e378f75388 100644 --- a/sdk/src/Services/Glue/Generated/Model/Internal/MarshallTransformations/DeleteColumnStatisticsTaskSettingsRequestMarshaller.cs +++ b/sdk/src/Services/Glue/Generated/Model/Internal/MarshallTransformations/DeleteColumnStatisticsTaskSettingsRequestMarshaller.cs @@ -63,27 +63,30 @@ public IRequest Marshall(DeleteColumnStatisticsTaskSettingsRequest publicRequest request.HttpMethod = "POST"; request.ResourcePath = "/"; - using (StringWriter stringWriter = new StringWriter(CultureInfo.InvariantCulture)) + using (MemoryStream memoryStream = new MemoryStream()) { - JsonWriter writer = new JsonWriter(stringWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetDatabaseName()) + using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) { - context.Writer.WritePropertyName("DatabaseName"); - context.Writer.Write(publicRequest.DatabaseName); - } + JsonWriter writer = new JsonWriter(streamWriter); + writer.Validate = false; + writer.WriteObjectStart(); + var context = new JsonMarshallerContext(request, writer); + if(publicRequest.IsSetDatabaseName()) + { + context.Writer.WritePropertyName("DatabaseName"); + context.Writer.Write(publicRequest.DatabaseName); + } - if(publicRequest.IsSetTableName()) - { - context.Writer.WritePropertyName("TableName"); - context.Writer.Write(publicRequest.TableName); + if(publicRequest.IsSetTableName()) + { + context.Writer.WritePropertyName("TableName"); + context.Writer.Write(publicRequest.TableName); + } + + writer.WriteObjectEnd(); } - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); + request.Content = memoryStream.ToArray(); } diff --git a/sdk/src/Services/Glue/Generated/Model/Internal/MarshallTransformations/GetColumnStatisticsTaskSettingsRequestMarshaller.cs b/sdk/src/Services/Glue/Generated/Model/Internal/MarshallTransformations/GetColumnStatisticsTaskSettingsRequestMarshaller.cs index cece7662b4e4..2ce04527cc05 100644 --- a/sdk/src/Services/Glue/Generated/Model/Internal/MarshallTransformations/GetColumnStatisticsTaskSettingsRequestMarshaller.cs +++ b/sdk/src/Services/Glue/Generated/Model/Internal/MarshallTransformations/GetColumnStatisticsTaskSettingsRequestMarshaller.cs @@ -63,27 +63,30 @@ public IRequest Marshall(GetColumnStatisticsTaskSettingsRequest publicRequest) request.HttpMethod = "POST"; request.ResourcePath = "/"; - using (StringWriter stringWriter = new StringWriter(CultureInfo.InvariantCulture)) + using (MemoryStream memoryStream = new MemoryStream()) { - JsonWriter writer = new JsonWriter(stringWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetDatabaseName()) + using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) { - context.Writer.WritePropertyName("DatabaseName"); - context.Writer.Write(publicRequest.DatabaseName); - } + JsonWriter writer = new JsonWriter(streamWriter); + writer.Validate = false; + writer.WriteObjectStart(); + var context = new JsonMarshallerContext(request, writer); + if(publicRequest.IsSetDatabaseName()) + { + context.Writer.WritePropertyName("DatabaseName"); + context.Writer.Write(publicRequest.DatabaseName); + } - if(publicRequest.IsSetTableName()) - { - context.Writer.WritePropertyName("TableName"); - context.Writer.Write(publicRequest.TableName); + if(publicRequest.IsSetTableName()) + { + context.Writer.WritePropertyName("TableName"); + context.Writer.Write(publicRequest.TableName); + } + + writer.WriteObjectEnd(); } - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); + request.Content = memoryStream.ToArray(); } diff --git a/sdk/src/Services/Glue/Generated/Model/Internal/MarshallTransformations/StartColumnStatisticsTaskRunScheduleRequestMarshaller.cs b/sdk/src/Services/Glue/Generated/Model/Internal/MarshallTransformations/StartColumnStatisticsTaskRunScheduleRequestMarshaller.cs index 25449667b637..be97d3431426 100644 --- a/sdk/src/Services/Glue/Generated/Model/Internal/MarshallTransformations/StartColumnStatisticsTaskRunScheduleRequestMarshaller.cs +++ b/sdk/src/Services/Glue/Generated/Model/Internal/MarshallTransformations/StartColumnStatisticsTaskRunScheduleRequestMarshaller.cs @@ -63,27 +63,30 @@ public IRequest Marshall(StartColumnStatisticsTaskRunScheduleRequest publicReque request.HttpMethod = "POST"; request.ResourcePath = "/"; - using (StringWriter stringWriter = new StringWriter(CultureInfo.InvariantCulture)) + using (MemoryStream memoryStream = new MemoryStream()) { - JsonWriter writer = new JsonWriter(stringWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetDatabaseName()) + using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) { - context.Writer.WritePropertyName("DatabaseName"); - context.Writer.Write(publicRequest.DatabaseName); - } + JsonWriter writer = new JsonWriter(streamWriter); + writer.Validate = false; + writer.WriteObjectStart(); + var context = new JsonMarshallerContext(request, writer); + if(publicRequest.IsSetDatabaseName()) + { + context.Writer.WritePropertyName("DatabaseName"); + context.Writer.Write(publicRequest.DatabaseName); + } - if(publicRequest.IsSetTableName()) - { - context.Writer.WritePropertyName("TableName"); - context.Writer.Write(publicRequest.TableName); + if(publicRequest.IsSetTableName()) + { + context.Writer.WritePropertyName("TableName"); + context.Writer.Write(publicRequest.TableName); + } + + writer.WriteObjectEnd(); } - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); + request.Content = memoryStream.ToArray(); } diff --git a/sdk/src/Services/Glue/Generated/Model/Internal/MarshallTransformations/StopColumnStatisticsTaskRunScheduleRequestMarshaller.cs b/sdk/src/Services/Glue/Generated/Model/Internal/MarshallTransformations/StopColumnStatisticsTaskRunScheduleRequestMarshaller.cs index 8ddb5c896836..1f9b4799deb0 100644 --- a/sdk/src/Services/Glue/Generated/Model/Internal/MarshallTransformations/StopColumnStatisticsTaskRunScheduleRequestMarshaller.cs +++ b/sdk/src/Services/Glue/Generated/Model/Internal/MarshallTransformations/StopColumnStatisticsTaskRunScheduleRequestMarshaller.cs @@ -63,27 +63,30 @@ public IRequest Marshall(StopColumnStatisticsTaskRunScheduleRequest publicReques request.HttpMethod = "POST"; request.ResourcePath = "/"; - using (StringWriter stringWriter = new StringWriter(CultureInfo.InvariantCulture)) + using (MemoryStream memoryStream = new MemoryStream()) { - JsonWriter writer = new JsonWriter(stringWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetDatabaseName()) + using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) { - context.Writer.WritePropertyName("DatabaseName"); - context.Writer.Write(publicRequest.DatabaseName); - } + JsonWriter writer = new JsonWriter(streamWriter); + writer.Validate = false; + writer.WriteObjectStart(); + var context = new JsonMarshallerContext(request, writer); + if(publicRequest.IsSetDatabaseName()) + { + context.Writer.WritePropertyName("DatabaseName"); + context.Writer.Write(publicRequest.DatabaseName); + } - if(publicRequest.IsSetTableName()) - { - context.Writer.WritePropertyName("TableName"); - context.Writer.Write(publicRequest.TableName); + if(publicRequest.IsSetTableName()) + { + context.Writer.WritePropertyName("TableName"); + context.Writer.Write(publicRequest.TableName); + } + + writer.WriteObjectEnd(); } - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); + request.Content = memoryStream.ToArray(); } diff --git a/sdk/src/Services/Glue/Generated/Model/Internal/MarshallTransformations/UpdateColumnStatisticsTaskSettingsRequestMarshaller.cs b/sdk/src/Services/Glue/Generated/Model/Internal/MarshallTransformations/UpdateColumnStatisticsTaskSettingsRequestMarshaller.cs index af38a9b16096..a831e7eb424c 100644 --- a/sdk/src/Services/Glue/Generated/Model/Internal/MarshallTransformations/UpdateColumnStatisticsTaskSettingsRequestMarshaller.cs +++ b/sdk/src/Services/Glue/Generated/Model/Internal/MarshallTransformations/UpdateColumnStatisticsTaskSettingsRequestMarshaller.cs @@ -63,75 +63,78 @@ public IRequest Marshall(UpdateColumnStatisticsTaskSettingsRequest publicRequest request.HttpMethod = "POST"; request.ResourcePath = "/"; - using (StringWriter stringWriter = new StringWriter(CultureInfo.InvariantCulture)) + using (MemoryStream memoryStream = new MemoryStream()) { - JsonWriter writer = new JsonWriter(stringWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetCatalogID()) + using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) { - context.Writer.WritePropertyName("CatalogID"); - context.Writer.Write(publicRequest.CatalogID); - } + JsonWriter writer = new JsonWriter(streamWriter); + writer.Validate = false; + writer.WriteObjectStart(); + var context = new JsonMarshallerContext(request, writer); + if(publicRequest.IsSetCatalogID()) + { + context.Writer.WritePropertyName("CatalogID"); + context.Writer.Write(publicRequest.CatalogID); + } - if(publicRequest.IsSetColumnNameList()) - { - context.Writer.WritePropertyName("ColumnNameList"); - context.Writer.WriteArrayStart(); - foreach(var publicRequestColumnNameListListValue in publicRequest.ColumnNameList) + if(publicRequest.IsSetColumnNameList()) { - context.Writer.Write(publicRequestColumnNameListListValue); + context.Writer.WritePropertyName("ColumnNameList"); + context.Writer.WriteArrayStart(); + foreach(var publicRequestColumnNameListListValue in publicRequest.ColumnNameList) + { + context.Writer.Write(publicRequestColumnNameListListValue); + } + context.Writer.WriteArrayEnd(); } - context.Writer.WriteArrayEnd(); - } - if(publicRequest.IsSetDatabaseName()) - { - context.Writer.WritePropertyName("DatabaseName"); - context.Writer.Write(publicRequest.DatabaseName); - } + if(publicRequest.IsSetDatabaseName()) + { + context.Writer.WritePropertyName("DatabaseName"); + context.Writer.Write(publicRequest.DatabaseName); + } - if(publicRequest.IsSetRole()) - { - context.Writer.WritePropertyName("Role"); - context.Writer.Write(publicRequest.Role); - } + if(publicRequest.IsSetRole()) + { + context.Writer.WritePropertyName("Role"); + context.Writer.Write(publicRequest.Role); + } - if(publicRequest.IsSetSampleSize()) - { - context.Writer.WritePropertyName("SampleSize"); - if(StringUtils.IsSpecialDoubleValue(publicRequest.SampleSize)) + if(publicRequest.IsSetSampleSize()) { - context.Writer.Write(StringUtils.FromSpecialDoubleValue(publicRequest.SampleSize)); + context.Writer.WritePropertyName("SampleSize"); + if(StringUtils.IsSpecialDoubleValue(publicRequest.SampleSize.Value)) + { + context.Writer.Write(StringUtils.FromSpecialDoubleValue(publicRequest.SampleSize.Value)); + } + else + { + context.Writer.Write(publicRequest.SampleSize.Value); + } } - else + + if(publicRequest.IsSetSchedule()) { - context.Writer.Write(publicRequest.SampleSize); + context.Writer.WritePropertyName("Schedule"); + context.Writer.Write(publicRequest.Schedule); } - } - if(publicRequest.IsSetSchedule()) - { - context.Writer.WritePropertyName("Schedule"); - context.Writer.Write(publicRequest.Schedule); - } + if(publicRequest.IsSetSecurityConfiguration()) + { + context.Writer.WritePropertyName("SecurityConfiguration"); + context.Writer.Write(publicRequest.SecurityConfiguration); + } - if(publicRequest.IsSetSecurityConfiguration()) - { - context.Writer.WritePropertyName("SecurityConfiguration"); - context.Writer.Write(publicRequest.SecurityConfiguration); - } + if(publicRequest.IsSetTableName()) + { + context.Writer.WritePropertyName("TableName"); + context.Writer.Write(publicRequest.TableName); + } - if(publicRequest.IsSetTableName()) - { - context.Writer.WritePropertyName("TableName"); - context.Writer.Write(publicRequest.TableName); + writer.WriteObjectEnd(); } - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); + request.Content = memoryStream.ToArray(); } diff --git a/sdk/src/Services/Glue/Generated/Model/UpdateColumnStatisticsTaskSettingsRequest.cs b/sdk/src/Services/Glue/Generated/Model/UpdateColumnStatisticsTaskSettingsRequest.cs index 61a66b3f22a2..939d0939ed64 100644 --- a/sdk/src/Services/Glue/Generated/Model/UpdateColumnStatisticsTaskSettingsRequest.cs +++ b/sdk/src/Services/Glue/Generated/Model/UpdateColumnStatisticsTaskSettingsRequest.cs @@ -126,9 +126,9 @@ internal bool IsSetRole() /// /// [AWSProperty(Min=0, Max=100)] - public double SampleSize + public double? SampleSize { - get { return this._sampleSize.GetValueOrDefault(); } + get { return this._sampleSize; } set { this._sampleSize = value; } } diff --git a/sdk/src/Services/Glue/Generated/_bcl/AmazonGlueClient.cs b/sdk/src/Services/Glue/Generated/_bcl/AmazonGlueClient.cs index d41063404ad1..9f50355f9e2c 100644 --- a/sdk/src/Services/Glue/Generated/_bcl/AmazonGlueClient.cs +++ b/sdk/src/Services/Glue/Generated/_bcl/AmazonGlueClient.cs @@ -1971,6 +1971,91 @@ public virtual CreateClassifierResponse CreateClassifier(CreateClassifierRequest #endregion + #region CreateColumnStatisticsTaskSettings + + + /// + /// Creates settings for a column statistics task. + /// + /// Container for the necessary parameters to execute the CreateColumnStatisticsTaskSettings service method. + /// + /// The response from the CreateColumnStatisticsTaskSettings service method, as returned by Glue. + /// + /// Access to a resource was denied. + /// + /// + /// A resource to be created or added already exists. + /// + /// + /// An exception thrown when you try to start another job while running a column stats + /// generation job. + /// + /// + /// A specified entity does not exist + /// + /// + /// The input provided was not valid. + /// + /// + /// The operation timed out. + /// + /// + /// A resource numerical limit was exceeded. + /// + /// REST API Reference for CreateColumnStatisticsTaskSettings Operation + public virtual CreateColumnStatisticsTaskSettingsResponse CreateColumnStatisticsTaskSettings(CreateColumnStatisticsTaskSettingsRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = CreateColumnStatisticsTaskSettingsRequestMarshaller.Instance; + options.ResponseUnmarshaller = CreateColumnStatisticsTaskSettingsResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// Creates settings for a column statistics task. + /// + /// Container for the necessary parameters to execute the CreateColumnStatisticsTaskSettings service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the CreateColumnStatisticsTaskSettings service method, as returned by Glue. + /// + /// Access to a resource was denied. + /// + /// + /// A resource to be created or added already exists. + /// + /// + /// An exception thrown when you try to start another job while running a column stats + /// generation job. + /// + /// + /// A specified entity does not exist + /// + /// + /// The input provided was not valid. + /// + /// + /// The operation timed out. + /// + /// + /// A resource numerical limit was exceeded. + /// + /// REST API Reference for CreateColumnStatisticsTaskSettings Operation + public virtual Task CreateColumnStatisticsTaskSettingsAsync(CreateColumnStatisticsTaskSettingsRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = CreateColumnStatisticsTaskSettingsRequestMarshaller.Instance; + options.ResponseUnmarshaller = CreateColumnStatisticsTaskSettingsResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + #region CreateConnection @@ -4046,6 +4131,65 @@ public virtual DeleteColumnStatisticsForTableResponse DeleteColumnStatisticsForT #endregion + #region DeleteColumnStatisticsTaskSettings + + + /// + /// Deletes settings for a column statistics task. + /// + /// Container for the necessary parameters to execute the DeleteColumnStatisticsTaskSettings service method. + /// + /// The response from the DeleteColumnStatisticsTaskSettings service method, as returned by Glue. + /// + /// A specified entity does not exist + /// + /// + /// The input provided was not valid. + /// + /// + /// The operation timed out. + /// + /// REST API Reference for DeleteColumnStatisticsTaskSettings Operation + public virtual DeleteColumnStatisticsTaskSettingsResponse DeleteColumnStatisticsTaskSettings(DeleteColumnStatisticsTaskSettingsRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = DeleteColumnStatisticsTaskSettingsRequestMarshaller.Instance; + options.ResponseUnmarshaller = DeleteColumnStatisticsTaskSettingsResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// Deletes settings for a column statistics task. + /// + /// Container for the necessary parameters to execute the DeleteColumnStatisticsTaskSettings service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the DeleteColumnStatisticsTaskSettings service method, as returned by Glue. + /// + /// A specified entity does not exist + /// + /// + /// The input provided was not valid. + /// + /// + /// The operation timed out. + /// + /// REST API Reference for DeleteColumnStatisticsTaskSettings Operation + public virtual Task DeleteColumnStatisticsTaskSettingsAsync(DeleteColumnStatisticsTaskSettingsRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = DeleteColumnStatisticsTaskSettingsRequestMarshaller.Instance; + options.ResponseUnmarshaller = DeleteColumnStatisticsTaskSettingsResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + #region DeleteConnection @@ -6333,6 +6477,65 @@ public virtual GetColumnStatisticsTaskRunsResponse GetColumnStatisticsTaskRuns(G #endregion + #region GetColumnStatisticsTaskSettings + + + /// + /// Gets settings for a column statistics task. + /// + /// Container for the necessary parameters to execute the GetColumnStatisticsTaskSettings service method. + /// + /// The response from the GetColumnStatisticsTaskSettings service method, as returned by Glue. + /// + /// A specified entity does not exist + /// + /// + /// The input provided was not valid. + /// + /// + /// The operation timed out. + /// + /// REST API Reference for GetColumnStatisticsTaskSettings Operation + public virtual GetColumnStatisticsTaskSettingsResponse GetColumnStatisticsTaskSettings(GetColumnStatisticsTaskSettingsRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = GetColumnStatisticsTaskSettingsRequestMarshaller.Instance; + options.ResponseUnmarshaller = GetColumnStatisticsTaskSettingsResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// Gets settings for a column statistics task. + /// + /// Container for the necessary parameters to execute the GetColumnStatisticsTaskSettings service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the GetColumnStatisticsTaskSettings service method, as returned by Glue. + /// + /// A specified entity does not exist + /// + /// + /// The input provided was not valid. + /// + /// + /// The operation timed out. + /// + /// REST API Reference for GetColumnStatisticsTaskSettings Operation + public virtual Task GetColumnStatisticsTaskSettingsAsync(GetColumnStatisticsTaskSettingsRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = GetColumnStatisticsTaskSettingsRequestMarshaller.Instance; + options.ResponseUnmarshaller = GetColumnStatisticsTaskSettingsResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + #region GetConnection @@ -13394,6 +13597,71 @@ public virtual StartColumnStatisticsTaskRunResponse StartColumnStatisticsTaskRun #endregion + #region StartColumnStatisticsTaskRunSchedule + + + /// + /// Starts a column statistics task run schedule. + /// + /// Container for the necessary parameters to execute the StartColumnStatisticsTaskRunSchedule service method. + /// + /// The response from the StartColumnStatisticsTaskRunSchedule service method, as returned by Glue. + /// + /// Access to a resource was denied. + /// + /// + /// A specified entity does not exist + /// + /// + /// The input provided was not valid. + /// + /// + /// The operation timed out. + /// + /// REST API Reference for StartColumnStatisticsTaskRunSchedule Operation + public virtual StartColumnStatisticsTaskRunScheduleResponse StartColumnStatisticsTaskRunSchedule(StartColumnStatisticsTaskRunScheduleRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = StartColumnStatisticsTaskRunScheduleRequestMarshaller.Instance; + options.ResponseUnmarshaller = StartColumnStatisticsTaskRunScheduleResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// Starts a column statistics task run schedule. + /// + /// Container for the necessary parameters to execute the StartColumnStatisticsTaskRunSchedule service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the StartColumnStatisticsTaskRunSchedule service method, as returned by Glue. + /// + /// Access to a resource was denied. + /// + /// + /// A specified entity does not exist + /// + /// + /// The input provided was not valid. + /// + /// + /// The operation timed out. + /// + /// REST API Reference for StartColumnStatisticsTaskRunSchedule Operation + public virtual Task StartColumnStatisticsTaskRunScheduleAsync(StartColumnStatisticsTaskRunScheduleRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = StartColumnStatisticsTaskRunScheduleRequestMarshaller.Instance; + options.ResponseUnmarshaller = StartColumnStatisticsTaskRunScheduleResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + #region StartCrawler @@ -14408,6 +14676,65 @@ public virtual StopColumnStatisticsTaskRunResponse StopColumnStatisticsTaskRun(S #endregion + #region StopColumnStatisticsTaskRunSchedule + + + /// + /// Stops a column statistics task run schedule. + /// + /// Container for the necessary parameters to execute the StopColumnStatisticsTaskRunSchedule service method. + /// + /// The response from the StopColumnStatisticsTaskRunSchedule service method, as returned by Glue. + /// + /// A specified entity does not exist + /// + /// + /// The input provided was not valid. + /// + /// + /// The operation timed out. + /// + /// REST API Reference for StopColumnStatisticsTaskRunSchedule Operation + public virtual StopColumnStatisticsTaskRunScheduleResponse StopColumnStatisticsTaskRunSchedule(StopColumnStatisticsTaskRunScheduleRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = StopColumnStatisticsTaskRunScheduleRequestMarshaller.Instance; + options.ResponseUnmarshaller = StopColumnStatisticsTaskRunScheduleResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// Stops a column statistics task run schedule. + /// + /// Container for the necessary parameters to execute the StopColumnStatisticsTaskRunSchedule service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the StopColumnStatisticsTaskRunSchedule service method, as returned by Glue. + /// + /// A specified entity does not exist + /// + /// + /// The input provided was not valid. + /// + /// + /// The operation timed out. + /// + /// REST API Reference for StopColumnStatisticsTaskRunSchedule Operation + public virtual Task StopColumnStatisticsTaskRunScheduleAsync(StopColumnStatisticsTaskRunScheduleRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = StopColumnStatisticsTaskRunScheduleRequestMarshaller.Instance; + options.ResponseUnmarshaller = StopColumnStatisticsTaskRunScheduleResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + #region StopCrawler @@ -15322,6 +15649,77 @@ public virtual UpdateColumnStatisticsForTableResponse UpdateColumnStatisticsForT #endregion + #region UpdateColumnStatisticsTaskSettings + + + /// + /// Updates settings for a column statistics task. + /// + /// Container for the necessary parameters to execute the UpdateColumnStatisticsTaskSettings service method. + /// + /// The response from the UpdateColumnStatisticsTaskSettings service method, as returned by Glue. + /// + /// Access to a resource was denied. + /// + /// + /// A specified entity does not exist + /// + /// + /// The input provided was not valid. + /// + /// + /// The operation timed out. + /// + /// + /// There was a version conflict. + /// + /// REST API Reference for UpdateColumnStatisticsTaskSettings Operation + public virtual UpdateColumnStatisticsTaskSettingsResponse UpdateColumnStatisticsTaskSettings(UpdateColumnStatisticsTaskSettingsRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = UpdateColumnStatisticsTaskSettingsRequestMarshaller.Instance; + options.ResponseUnmarshaller = UpdateColumnStatisticsTaskSettingsResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// Updates settings for a column statistics task. + /// + /// Container for the necessary parameters to execute the UpdateColumnStatisticsTaskSettings service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the UpdateColumnStatisticsTaskSettings service method, as returned by Glue. + /// + /// Access to a resource was denied. + /// + /// + /// A specified entity does not exist + /// + /// + /// The input provided was not valid. + /// + /// + /// The operation timed out. + /// + /// + /// There was a version conflict. + /// + /// REST API Reference for UpdateColumnStatisticsTaskSettings Operation + public virtual Task UpdateColumnStatisticsTaskSettingsAsync(UpdateColumnStatisticsTaskSettingsRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = UpdateColumnStatisticsTaskSettingsRequestMarshaller.Instance; + options.ResponseUnmarshaller = UpdateColumnStatisticsTaskSettingsResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + #region UpdateConnection diff --git a/sdk/src/Services/Glue/Glue.sln b/sdk/src/Services/Glue/Glue.sln index f27e3ae1451f..0567ec6d60f8 100644 --- a/sdk/src/Services/Glue/Glue.sln +++ b/sdk/src/Services/Glue/Glue.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {FAAC800F-D238-44A2-9565-505F5AFE7DEE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {FAAC800F-D238-44A2-9565-505F5AFE7DEE}.Debug|Any CPU.Build.0 = Debug|Any CPU {FAAC800F-D238-44A2-9565-505F5AFE7DEE}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {417E959E-0CD2-4710-8B2A-24A48232035E}.Debug|Any CPU.Build.0 = Debug|Any CPU {417E959E-0CD2-4710-8B2A-24A48232035E}.Release|Any CPU.ActiveCfg = Release|Any CPU {417E959E-0CD2-4710-8B2A-24A48232035E}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {088BBE54-28AB-42C4-9657-CB4ADFC646E9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {088BBE54-28AB-42C4-9657-CB4ADFC646E9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {088BBE54-28AB-42C4-9657-CB4ADFC646E9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {088BBE54-28AB-42C4-9657-CB4ADFC646E9}.Release|Any CPU.Build.0 = Release|Any CPU - {57278ACF-5453-4FD7-AC07-808438578BAE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {57278ACF-5453-4FD7-AC07-808438578BAE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {57278ACF-5453-4FD7-AC07-808438578BAE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {57278ACF-5453-4FD7-AC07-808438578BAE}.Release|Any CPU.Build.0 = Release|Any CPU - {B677E90B-E074-4D79-9380-47FF2843CAE1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B677E90B-E074-4D79-9380-47FF2843CAE1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B677E90B-E074-4D79-9380-47FF2843CAE1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B677E90B-E074-4D79-9380-47FF2843CAE1}.Release|Any CPU.Build.0 = Release|Any CPU - {D1603AD2-9F2D-4F14-A1F9-D6B9A2334C1E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D1603AD2-9F2D-4F14-A1F9-D6B9A2334C1E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D1603AD2-9F2D-4F14-A1F9-D6B9A2334C1E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D1603AD2-9F2D-4F14-A1F9-D6B9A2334C1E}.Release|Any CPU.Build.0 = Release|Any CPU - {18B8F833-A38B-41AC-9041-D02AE4411F36}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {18B8F833-A38B-41AC-9041-D02AE4411F36}.Debug|Any CPU.Build.0 = Debug|Any CPU - {18B8F833-A38B-41AC-9041-D02AE4411F36}.Release|Any CPU.ActiveCfg = Release|Any CPU - {18B8F833-A38B-41AC-9041-D02AE4411F36}.Release|Any CPU.Build.0 = Release|Any CPU - {6290113D-74BA-4463-86C9-E117DA1E3870}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6290113D-74BA-4463-86C9-E117DA1E3870}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6290113D-74BA-4463-86C9-E117DA1E3870}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6290113D-74BA-4463-86C9-E117DA1E3870}.Release|Any CPU.Build.0 = Release|Any CPU - {52C0F76D-FC77-41A8-BFDA-A3033B5DEC81}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {52C0F76D-FC77-41A8-BFDA-A3033B5DEC81}.Debug|Any CPU.Build.0 = Debug|Any CPU - {52C0F76D-FC77-41A8-BFDA-A3033B5DEC81}.Release|Any CPU.ActiveCfg = Release|Any CPU - {52C0F76D-FC77-41A8-BFDA-A3033B5DEC81}.Release|Any CPU.Build.0 = Release|Any CPU - {ACDDA90F-9D20-4632-8B19-658B11745EAE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {ACDDA90F-9D20-4632-8B19-658B11745EAE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {ACDDA90F-9D20-4632-8B19-658B11745EAE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {ACDDA90F-9D20-4632-8B19-658B11745EAE}.Release|Any CPU.Build.0 = Release|Any CPU - {55EAA40E-5BA5-4261-810A-EAAA0FE9A0AD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {55EAA40E-5BA5-4261-810A-EAAA0FE9A0AD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {55EAA40E-5BA5-4261-810A-EAAA0FE9A0AD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {55EAA40E-5BA5-4261-810A-EAAA0FE9A0AD}.Release|Any CPU.Build.0 = Release|Any CPU - {C7BF9C73-C4F9-4CCD-934B-362B3115051E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C7BF9C73-C4F9-4CCD-934B-362B3115051E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C7BF9C73-C4F9-4CCD-934B-362B3115051E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C7BF9C73-C4F9-4CCD-934B-362B3115051E}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {088BBE54-28AB-42C4-9657-CB4ADFC646E9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {088BBE54-28AB-42C4-9657-CB4ADFC646E9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {088BBE54-28AB-42C4-9657-CB4ADFC646E9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {088BBE54-28AB-42C4-9657-CB4ADFC646E9}.Release|Any CPU.Build.0 = Release|Any CPU - {57278ACF-5453-4FD7-AC07-808438578BAE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {57278ACF-5453-4FD7-AC07-808438578BAE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {57278ACF-5453-4FD7-AC07-808438578BAE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {57278ACF-5453-4FD7-AC07-808438578BAE}.Release|Any CPU.Build.0 = Release|Any CPU - {B677E90B-E074-4D79-9380-47FF2843CAE1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B677E90B-E074-4D79-9380-47FF2843CAE1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B677E90B-E074-4D79-9380-47FF2843CAE1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B677E90B-E074-4D79-9380-47FF2843CAE1}.Release|Any CPU.Build.0 = Release|Any CPU - {D1603AD2-9F2D-4F14-A1F9-D6B9A2334C1E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D1603AD2-9F2D-4F14-A1F9-D6B9A2334C1E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D1603AD2-9F2D-4F14-A1F9-D6B9A2334C1E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D1603AD2-9F2D-4F14-A1F9-D6B9A2334C1E}.Release|Any CPU.Build.0 = Release|Any CPU - {18B8F833-A38B-41AC-9041-D02AE4411F36}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {18B8F833-A38B-41AC-9041-D02AE4411F36}.Debug|Any CPU.Build.0 = Debug|Any CPU - {18B8F833-A38B-41AC-9041-D02AE4411F36}.Release|Any CPU.ActiveCfg = Release|Any CPU - {18B8F833-A38B-41AC-9041-D02AE4411F36}.Release|Any CPU.Build.0 = Release|Any CPU - {6290113D-74BA-4463-86C9-E117DA1E3870}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6290113D-74BA-4463-86C9-E117DA1E3870}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6290113D-74BA-4463-86C9-E117DA1E3870}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6290113D-74BA-4463-86C9-E117DA1E3870}.Release|Any CPU.Build.0 = Release|Any CPU - {52C0F76D-FC77-41A8-BFDA-A3033B5DEC81}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {52C0F76D-FC77-41A8-BFDA-A3033B5DEC81}.Debug|Any CPU.Build.0 = Debug|Any CPU - {52C0F76D-FC77-41A8-BFDA-A3033B5DEC81}.Release|Any CPU.ActiveCfg = Release|Any CPU - {52C0F76D-FC77-41A8-BFDA-A3033B5DEC81}.Release|Any CPU.Build.0 = Release|Any CPU - {ACDDA90F-9D20-4632-8B19-658B11745EAE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {ACDDA90F-9D20-4632-8B19-658B11745EAE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {ACDDA90F-9D20-4632-8B19-658B11745EAE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {ACDDA90F-9D20-4632-8B19-658B11745EAE}.Release|Any CPU.Build.0 = Release|Any CPU - {55EAA40E-5BA5-4261-810A-EAAA0FE9A0AD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {55EAA40E-5BA5-4261-810A-EAAA0FE9A0AD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {55EAA40E-5BA5-4261-810A-EAAA0FE9A0AD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {55EAA40E-5BA5-4261-810A-EAAA0FE9A0AD}.Release|Any CPU.Build.0 = Release|Any CPU - {C7BF9C73-C4F9-4CCD-934B-362B3115051E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C7BF9C73-C4F9-4CCD-934B-362B3115051E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C7BF9C73-C4F9-4CCD-934B-362B3115051E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C7BF9C73-C4F9-4CCD-934B-362B3115051E}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {FAAC800F-D238-44A2-9565-505F5AFE7DEE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {F1966140-E4A7-4D88-B916-B422AEDA415F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {EECB0FAC-B4CD-4A39-93FD-DD792DDDC692} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {B562A66F-17E7-4CA9-AD4E-A3B9DEE47C23} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {417E959E-0CD2-4710-8B2A-24A48232035E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {088BBE54-28AB-42C4-9657-CB4ADFC646E9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {57278ACF-5453-4FD7-AC07-808438578BAE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B677E90B-E074-4D79-9380-47FF2843CAE1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D1603AD2-9F2D-4F14-A1F9-D6B9A2334C1E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {18B8F833-A38B-41AC-9041-D02AE4411F36} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6290113D-74BA-4463-86C9-E117DA1E3870} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {52C0F76D-FC77-41A8-BFDA-A3033B5DEC81} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {ACDDA90F-9D20-4632-8B19-658B11745EAE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {55EAA40E-5BA5-4261-810A-EAAA0FE9A0AD} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C7BF9C73-C4F9-4CCD-934B-362B3115051E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {088BBE54-28AB-42C4-9657-CB4ADFC646E9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {57278ACF-5453-4FD7-AC07-808438578BAE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B677E90B-E074-4D79-9380-47FF2843CAE1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D1603AD2-9F2D-4F14-A1F9-D6B9A2334C1E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {18B8F833-A38B-41AC-9041-D02AE4411F36} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6290113D-74BA-4463-86C9-E117DA1E3870} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {52C0F76D-FC77-41A8-BFDA-A3033B5DEC81} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {ACDDA90F-9D20-4632-8B19-658B11745EAE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {55EAA40E-5BA5-4261-810A-EAAA0FE9A0AD} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C7BF9C73-C4F9-4CCD-934B-362B3115051E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {BE35AA08-21F5-4800-91F6-AEEAEFD98839} diff --git a/sdk/src/Services/Glue/Properties/AssemblyInfo.cs b/sdk/src/Services/Glue/Properties/AssemblyInfo.cs index e9b16df609e3..08859a739cdd 100644 --- a/sdk/src/Services/Glue/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/Glue/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.408.4")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.409.9")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/GlueDataBrew/Generated/AmazonGlueDataBrewConfig.cs b/sdk/src/Services/GlueDataBrew/Generated/AmazonGlueDataBrewConfig.cs index 125b140bbf95..86543b314150 100644 --- a/sdk/src/Services/GlueDataBrew/Generated/AmazonGlueDataBrewConfig.cs +++ b/sdk/src/Services/GlueDataBrew/Generated/AmazonGlueDataBrewConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.GlueDataBrew public partial class AmazonGlueDataBrewConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("DataBrew", "4.0.0.0"); private static readonly AmazonGlueDataBrewEndpointResolver EndpointResolver = new AmazonGlueDataBrewEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("DataBrew", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("DataBrew", "3.7.400.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/GlueDataBrew/GlueDataBrew.sln b/sdk/src/Services/GlueDataBrew/GlueDataBrew.sln index 7222ad076a58..8cf417fcdc65 100644 --- a/sdk/src/Services/GlueDataBrew/GlueDataBrew.sln +++ b/sdk/src/Services/GlueDataBrew/GlueDataBrew.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {CCAD08E2-F0FE-42D4-8EEC-F193AA366D0C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {CCAD08E2-F0FE-42D4-8EEC-F193AA366D0C}.Debug|Any CPU.Build.0 = Debug|Any CPU {CCAD08E2-F0FE-42D4-8EEC-F193AA366D0C}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {F9556889-C566-4AB9-9749-A1721DF50B8D}.Debug|Any CPU.Build.0 = Debug|Any CPU {F9556889-C566-4AB9-9749-A1721DF50B8D}.Release|Any CPU.ActiveCfg = Release|Any CPU {F9556889-C566-4AB9-9749-A1721DF50B8D}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {7A7CF007-7B95-4792-9FCE-04DC4D9BF5A0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7A7CF007-7B95-4792-9FCE-04DC4D9BF5A0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7A7CF007-7B95-4792-9FCE-04DC4D9BF5A0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7A7CF007-7B95-4792-9FCE-04DC4D9BF5A0}.Release|Any CPU.Build.0 = Release|Any CPU - {E4441261-6723-41FF-8E32-E13B43FFC93A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E4441261-6723-41FF-8E32-E13B43FFC93A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E4441261-6723-41FF-8E32-E13B43FFC93A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E4441261-6723-41FF-8E32-E13B43FFC93A}.Release|Any CPU.Build.0 = Release|Any CPU - {49B9BA80-2BF9-46BA-977C-B33319279A97}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {49B9BA80-2BF9-46BA-977C-B33319279A97}.Debug|Any CPU.Build.0 = Debug|Any CPU - {49B9BA80-2BF9-46BA-977C-B33319279A97}.Release|Any CPU.ActiveCfg = Release|Any CPU - {49B9BA80-2BF9-46BA-977C-B33319279A97}.Release|Any CPU.Build.0 = Release|Any CPU - {8118E73D-EEB5-4AF4-AB4D-01EA8CA95787}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8118E73D-EEB5-4AF4-AB4D-01EA8CA95787}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8118E73D-EEB5-4AF4-AB4D-01EA8CA95787}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8118E73D-EEB5-4AF4-AB4D-01EA8CA95787}.Release|Any CPU.Build.0 = Release|Any CPU - {77DABEDC-51E5-4145-A61A-C699F1F35ED1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {77DABEDC-51E5-4145-A61A-C699F1F35ED1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {77DABEDC-51E5-4145-A61A-C699F1F35ED1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {77DABEDC-51E5-4145-A61A-C699F1F35ED1}.Release|Any CPU.Build.0 = Release|Any CPU - {E8E38BC4-B02A-4F5D-A3F1-EEFA62D4CB9A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E8E38BC4-B02A-4F5D-A3F1-EEFA62D4CB9A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E8E38BC4-B02A-4F5D-A3F1-EEFA62D4CB9A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E8E38BC4-B02A-4F5D-A3F1-EEFA62D4CB9A}.Release|Any CPU.Build.0 = Release|Any CPU - {F7F0B790-B6E8-4AA7-8491-4CDF220EE43E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F7F0B790-B6E8-4AA7-8491-4CDF220EE43E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F7F0B790-B6E8-4AA7-8491-4CDF220EE43E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F7F0B790-B6E8-4AA7-8491-4CDF220EE43E}.Release|Any CPU.Build.0 = Release|Any CPU - {6A9D4323-3F10-4488-9E82-1147DEF073BE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6A9D4323-3F10-4488-9E82-1147DEF073BE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6A9D4323-3F10-4488-9E82-1147DEF073BE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6A9D4323-3F10-4488-9E82-1147DEF073BE}.Release|Any CPU.Build.0 = Release|Any CPU - {19F89CFE-0C89-4F40-9BB6-4ED89CCCB1F3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {19F89CFE-0C89-4F40-9BB6-4ED89CCCB1F3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {19F89CFE-0C89-4F40-9BB6-4ED89CCCB1F3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {19F89CFE-0C89-4F40-9BB6-4ED89CCCB1F3}.Release|Any CPU.Build.0 = Release|Any CPU - {17BE9529-DDCD-4D5F-99E0-162147C4AD31}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {17BE9529-DDCD-4D5F-99E0-162147C4AD31}.Debug|Any CPU.Build.0 = Debug|Any CPU - {17BE9529-DDCD-4D5F-99E0-162147C4AD31}.Release|Any CPU.ActiveCfg = Release|Any CPU - {17BE9529-DDCD-4D5F-99E0-162147C4AD31}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {7A7CF007-7B95-4792-9FCE-04DC4D9BF5A0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7A7CF007-7B95-4792-9FCE-04DC4D9BF5A0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7A7CF007-7B95-4792-9FCE-04DC4D9BF5A0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7A7CF007-7B95-4792-9FCE-04DC4D9BF5A0}.Release|Any CPU.Build.0 = Release|Any CPU - {E4441261-6723-41FF-8E32-E13B43FFC93A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E4441261-6723-41FF-8E32-E13B43FFC93A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E4441261-6723-41FF-8E32-E13B43FFC93A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E4441261-6723-41FF-8E32-E13B43FFC93A}.Release|Any CPU.Build.0 = Release|Any CPU - {49B9BA80-2BF9-46BA-977C-B33319279A97}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {49B9BA80-2BF9-46BA-977C-B33319279A97}.Debug|Any CPU.Build.0 = Debug|Any CPU - {49B9BA80-2BF9-46BA-977C-B33319279A97}.Release|Any CPU.ActiveCfg = Release|Any CPU - {49B9BA80-2BF9-46BA-977C-B33319279A97}.Release|Any CPU.Build.0 = Release|Any CPU - {8118E73D-EEB5-4AF4-AB4D-01EA8CA95787}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8118E73D-EEB5-4AF4-AB4D-01EA8CA95787}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8118E73D-EEB5-4AF4-AB4D-01EA8CA95787}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8118E73D-EEB5-4AF4-AB4D-01EA8CA95787}.Release|Any CPU.Build.0 = Release|Any CPU - {77DABEDC-51E5-4145-A61A-C699F1F35ED1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {77DABEDC-51E5-4145-A61A-C699F1F35ED1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {77DABEDC-51E5-4145-A61A-C699F1F35ED1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {77DABEDC-51E5-4145-A61A-C699F1F35ED1}.Release|Any CPU.Build.0 = Release|Any CPU - {E8E38BC4-B02A-4F5D-A3F1-EEFA62D4CB9A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E8E38BC4-B02A-4F5D-A3F1-EEFA62D4CB9A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E8E38BC4-B02A-4F5D-A3F1-EEFA62D4CB9A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E8E38BC4-B02A-4F5D-A3F1-EEFA62D4CB9A}.Release|Any CPU.Build.0 = Release|Any CPU - {F7F0B790-B6E8-4AA7-8491-4CDF220EE43E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F7F0B790-B6E8-4AA7-8491-4CDF220EE43E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F7F0B790-B6E8-4AA7-8491-4CDF220EE43E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F7F0B790-B6E8-4AA7-8491-4CDF220EE43E}.Release|Any CPU.Build.0 = Release|Any CPU - {6A9D4323-3F10-4488-9E82-1147DEF073BE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6A9D4323-3F10-4488-9E82-1147DEF073BE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6A9D4323-3F10-4488-9E82-1147DEF073BE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6A9D4323-3F10-4488-9E82-1147DEF073BE}.Release|Any CPU.Build.0 = Release|Any CPU - {19F89CFE-0C89-4F40-9BB6-4ED89CCCB1F3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {19F89CFE-0C89-4F40-9BB6-4ED89CCCB1F3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {19F89CFE-0C89-4F40-9BB6-4ED89CCCB1F3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {19F89CFE-0C89-4F40-9BB6-4ED89CCCB1F3}.Release|Any CPU.Build.0 = Release|Any CPU - {17BE9529-DDCD-4D5F-99E0-162147C4AD31}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {17BE9529-DDCD-4D5F-99E0-162147C4AD31}.Debug|Any CPU.Build.0 = Debug|Any CPU - {17BE9529-DDCD-4D5F-99E0-162147C4AD31}.Release|Any CPU.ActiveCfg = Release|Any CPU - {17BE9529-DDCD-4D5F-99E0-162147C4AD31}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {CCAD08E2-F0FE-42D4-8EEC-F193AA366D0C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {68FD2610-66DC-4280-9265-3D748F68D7AC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {E5AE23D7-17A8-4DD2-BCA1-898239C9E193} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {CE0015B7-C97A-4ED2-836F-7231B3F14D66} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {F9556889-C566-4AB9-9749-A1721DF50B8D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {7A7CF007-7B95-4792-9FCE-04DC4D9BF5A0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E4441261-6723-41FF-8E32-E13B43FFC93A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {49B9BA80-2BF9-46BA-977C-B33319279A97} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8118E73D-EEB5-4AF4-AB4D-01EA8CA95787} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {77DABEDC-51E5-4145-A61A-C699F1F35ED1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E8E38BC4-B02A-4F5D-A3F1-EEFA62D4CB9A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F7F0B790-B6E8-4AA7-8491-4CDF220EE43E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6A9D4323-3F10-4488-9E82-1147DEF073BE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {19F89CFE-0C89-4F40-9BB6-4ED89CCCB1F3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {17BE9529-DDCD-4D5F-99E0-162147C4AD31} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {7A7CF007-7B95-4792-9FCE-04DC4D9BF5A0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E4441261-6723-41FF-8E32-E13B43FFC93A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {49B9BA80-2BF9-46BA-977C-B33319279A97} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8118E73D-EEB5-4AF4-AB4D-01EA8CA95787} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {77DABEDC-51E5-4145-A61A-C699F1F35ED1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E8E38BC4-B02A-4F5D-A3F1-EEFA62D4CB9A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F7F0B790-B6E8-4AA7-8491-4CDF220EE43E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6A9D4323-3F10-4488-9E82-1147DEF073BE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {19F89CFE-0C89-4F40-9BB6-4ED89CCCB1F3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {17BE9529-DDCD-4D5F-99E0-162147C4AD31} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {BA8597FD-3B8C-4CA8-A96E-076DDEBB896E} diff --git a/sdk/src/Services/GlueDataBrew/Properties/AssemblyInfo.cs b/sdk/src/Services/GlueDataBrew/Properties/AssemblyInfo.cs index c3ebfd33bddc..4b26627e16a3 100644 --- a/sdk/src/Services/GlueDataBrew/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/GlueDataBrew/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/Greengrass/Generated/AmazonGreengrassConfig.cs b/sdk/src/Services/Greengrass/Generated/AmazonGreengrassConfig.cs index 6a6b660eb5b4..c126ab480010 100644 --- a/sdk/src/Services/Greengrass/Generated/AmazonGreengrassConfig.cs +++ b/sdk/src/Services/Greengrass/Generated/AmazonGreengrassConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.Greengrass public partial class AmazonGreengrassConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("Greengrass", "4.0.0.0"); private static readonly AmazonGreengrassEndpointResolver EndpointResolver = new AmazonGreengrassEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("Greengrass", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("Greengrass", "3.7.400.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/Greengrass/Greengrass.sln b/sdk/src/Services/Greengrass/Greengrass.sln index 596b2dd66ee7..de70ca07c44b 100644 --- a/sdk/src/Services/Greengrass/Greengrass.sln +++ b/sdk/src/Services/Greengrass/Greengrass.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {3C04FB92-629A-48C5-8099-039091A600EF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {3C04FB92-629A-48C5-8099-039091A600EF}.Debug|Any CPU.Build.0 = Debug|Any CPU {3C04FB92-629A-48C5-8099-039091A600EF}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {320B6153-2F58-4112-818F-A9E011F31D08}.Debug|Any CPU.Build.0 = Debug|Any CPU {320B6153-2F58-4112-818F-A9E011F31D08}.Release|Any CPU.ActiveCfg = Release|Any CPU {320B6153-2F58-4112-818F-A9E011F31D08}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {96687B1A-4AB4-4D90-A65E-3D90B0E3D70F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {96687B1A-4AB4-4D90-A65E-3D90B0E3D70F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {96687B1A-4AB4-4D90-A65E-3D90B0E3D70F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {96687B1A-4AB4-4D90-A65E-3D90B0E3D70F}.Release|Any CPU.Build.0 = Release|Any CPU - {E683017F-9E33-4C73-8EB6-6D629CB018C9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E683017F-9E33-4C73-8EB6-6D629CB018C9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E683017F-9E33-4C73-8EB6-6D629CB018C9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E683017F-9E33-4C73-8EB6-6D629CB018C9}.Release|Any CPU.Build.0 = Release|Any CPU - {AF33AA95-FE13-4474-8518-80DE67F678A6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AF33AA95-FE13-4474-8518-80DE67F678A6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AF33AA95-FE13-4474-8518-80DE67F678A6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AF33AA95-FE13-4474-8518-80DE67F678A6}.Release|Any CPU.Build.0 = Release|Any CPU - {382C6CC0-910D-4E35-A5D4-F1C14BE4585E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {382C6CC0-910D-4E35-A5D4-F1C14BE4585E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {382C6CC0-910D-4E35-A5D4-F1C14BE4585E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {382C6CC0-910D-4E35-A5D4-F1C14BE4585E}.Release|Any CPU.Build.0 = Release|Any CPU - {94B2318E-2020-400D-AF27-2B698B43F3A9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {94B2318E-2020-400D-AF27-2B698B43F3A9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {94B2318E-2020-400D-AF27-2B698B43F3A9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {94B2318E-2020-400D-AF27-2B698B43F3A9}.Release|Any CPU.Build.0 = Release|Any CPU - {595146BD-712E-4E76-B16C-A005CAAFB511}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {595146BD-712E-4E76-B16C-A005CAAFB511}.Debug|Any CPU.Build.0 = Debug|Any CPU - {595146BD-712E-4E76-B16C-A005CAAFB511}.Release|Any CPU.ActiveCfg = Release|Any CPU - {595146BD-712E-4E76-B16C-A005CAAFB511}.Release|Any CPU.Build.0 = Release|Any CPU - {9BCCE52B-AC0B-416D-A920-1141F98408D4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9BCCE52B-AC0B-416D-A920-1141F98408D4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9BCCE52B-AC0B-416D-A920-1141F98408D4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9BCCE52B-AC0B-416D-A920-1141F98408D4}.Release|Any CPU.Build.0 = Release|Any CPU - {0F50E1E7-1FCC-4561-A79C-4AB449CEED81}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0F50E1E7-1FCC-4561-A79C-4AB449CEED81}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0F50E1E7-1FCC-4561-A79C-4AB449CEED81}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0F50E1E7-1FCC-4561-A79C-4AB449CEED81}.Release|Any CPU.Build.0 = Release|Any CPU - {1D4029F6-8304-4359-8741-8718C0FCAF55}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1D4029F6-8304-4359-8741-8718C0FCAF55}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1D4029F6-8304-4359-8741-8718C0FCAF55}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1D4029F6-8304-4359-8741-8718C0FCAF55}.Release|Any CPU.Build.0 = Release|Any CPU - {27822E88-3A69-4298-8842-095F16F14CCF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {27822E88-3A69-4298-8842-095F16F14CCF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {27822E88-3A69-4298-8842-095F16F14CCF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {27822E88-3A69-4298-8842-095F16F14CCF}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {96687B1A-4AB4-4D90-A65E-3D90B0E3D70F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {96687B1A-4AB4-4D90-A65E-3D90B0E3D70F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {96687B1A-4AB4-4D90-A65E-3D90B0E3D70F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {96687B1A-4AB4-4D90-A65E-3D90B0E3D70F}.Release|Any CPU.Build.0 = Release|Any CPU - {E683017F-9E33-4C73-8EB6-6D629CB018C9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E683017F-9E33-4C73-8EB6-6D629CB018C9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E683017F-9E33-4C73-8EB6-6D629CB018C9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E683017F-9E33-4C73-8EB6-6D629CB018C9}.Release|Any CPU.Build.0 = Release|Any CPU - {AF33AA95-FE13-4474-8518-80DE67F678A6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AF33AA95-FE13-4474-8518-80DE67F678A6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AF33AA95-FE13-4474-8518-80DE67F678A6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AF33AA95-FE13-4474-8518-80DE67F678A6}.Release|Any CPU.Build.0 = Release|Any CPU - {382C6CC0-910D-4E35-A5D4-F1C14BE4585E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {382C6CC0-910D-4E35-A5D4-F1C14BE4585E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {382C6CC0-910D-4E35-A5D4-F1C14BE4585E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {382C6CC0-910D-4E35-A5D4-F1C14BE4585E}.Release|Any CPU.Build.0 = Release|Any CPU - {94B2318E-2020-400D-AF27-2B698B43F3A9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {94B2318E-2020-400D-AF27-2B698B43F3A9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {94B2318E-2020-400D-AF27-2B698B43F3A9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {94B2318E-2020-400D-AF27-2B698B43F3A9}.Release|Any CPU.Build.0 = Release|Any CPU - {595146BD-712E-4E76-B16C-A005CAAFB511}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {595146BD-712E-4E76-B16C-A005CAAFB511}.Debug|Any CPU.Build.0 = Debug|Any CPU - {595146BD-712E-4E76-B16C-A005CAAFB511}.Release|Any CPU.ActiveCfg = Release|Any CPU - {595146BD-712E-4E76-B16C-A005CAAFB511}.Release|Any CPU.Build.0 = Release|Any CPU - {9BCCE52B-AC0B-416D-A920-1141F98408D4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9BCCE52B-AC0B-416D-A920-1141F98408D4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9BCCE52B-AC0B-416D-A920-1141F98408D4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9BCCE52B-AC0B-416D-A920-1141F98408D4}.Release|Any CPU.Build.0 = Release|Any CPU - {0F50E1E7-1FCC-4561-A79C-4AB449CEED81}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0F50E1E7-1FCC-4561-A79C-4AB449CEED81}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0F50E1E7-1FCC-4561-A79C-4AB449CEED81}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0F50E1E7-1FCC-4561-A79C-4AB449CEED81}.Release|Any CPU.Build.0 = Release|Any CPU - {1D4029F6-8304-4359-8741-8718C0FCAF55}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1D4029F6-8304-4359-8741-8718C0FCAF55}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1D4029F6-8304-4359-8741-8718C0FCAF55}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1D4029F6-8304-4359-8741-8718C0FCAF55}.Release|Any CPU.Build.0 = Release|Any CPU - {27822E88-3A69-4298-8842-095F16F14CCF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {27822E88-3A69-4298-8842-095F16F14CCF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {27822E88-3A69-4298-8842-095F16F14CCF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {27822E88-3A69-4298-8842-095F16F14CCF}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {3C04FB92-629A-48C5-8099-039091A600EF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {07E2EA3B-F687-4547-A9E3-3FCFA2198EEB} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {D6CA1F2D-28C7-4CE4-B883-74D1E703E4B1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {CB55AD1B-2DF8-4AAB-B3ED-7E6D26CDDD1C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {320B6153-2F58-4112-818F-A9E011F31D08} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {96687B1A-4AB4-4D90-A65E-3D90B0E3D70F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E683017F-9E33-4C73-8EB6-6D629CB018C9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {AF33AA95-FE13-4474-8518-80DE67F678A6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {382C6CC0-910D-4E35-A5D4-F1C14BE4585E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {94B2318E-2020-400D-AF27-2B698B43F3A9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {595146BD-712E-4E76-B16C-A005CAAFB511} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {9BCCE52B-AC0B-416D-A920-1141F98408D4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0F50E1E7-1FCC-4561-A79C-4AB449CEED81} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {1D4029F6-8304-4359-8741-8718C0FCAF55} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {27822E88-3A69-4298-8842-095F16F14CCF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {96687B1A-4AB4-4D90-A65E-3D90B0E3D70F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E683017F-9E33-4C73-8EB6-6D629CB018C9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {AF33AA95-FE13-4474-8518-80DE67F678A6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {382C6CC0-910D-4E35-A5D4-F1C14BE4585E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {94B2318E-2020-400D-AF27-2B698B43F3A9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {595146BD-712E-4E76-B16C-A005CAAFB511} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {9BCCE52B-AC0B-416D-A920-1141F98408D4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0F50E1E7-1FCC-4561-A79C-4AB449CEED81} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {1D4029F6-8304-4359-8741-8718C0FCAF55} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {27822E88-3A69-4298-8842-095F16F14CCF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {11EB4D4E-8B15-4BDC-A223-CD9BB0DE2B83} diff --git a/sdk/src/Services/Greengrass/Properties/AssemblyInfo.cs b/sdk/src/Services/Greengrass/Properties/AssemblyInfo.cs index afa4ae526cb6..5bb585212729 100644 --- a/sdk/src/Services/Greengrass/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/Greengrass/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/GreengrassV2/Generated/AmazonGreengrassV2Config.cs b/sdk/src/Services/GreengrassV2/Generated/AmazonGreengrassV2Config.cs index 3e7c420b231d..bc81028caf4e 100644 --- a/sdk/src/Services/GreengrassV2/Generated/AmazonGreengrassV2Config.cs +++ b/sdk/src/Services/GreengrassV2/Generated/AmazonGreengrassV2Config.cs @@ -34,16 +34,10 @@ namespace Amazon.GreengrassV2 public partial class AmazonGreengrassV2Config : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("GreengrassV2", "4.0.0.0"); private static readonly AmazonGreengrassV2EndpointResolver EndpointResolver = new AmazonGreengrassV2EndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("GreengrassV2", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("GreengrassV2", "3.7.400.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/GreengrassV2/GreengrassV2.sln b/sdk/src/Services/GreengrassV2/GreengrassV2.sln index df3d2524f8a4..07919bf69dda 100644 --- a/sdk/src/Services/GreengrassV2/GreengrassV2.sln +++ b/sdk/src/Services/GreengrassV2/GreengrassV2.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {C144C51F-A64A-4A13-86FA-FD30C9A54A72}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {C144C51F-A64A-4A13-86FA-FD30C9A54A72}.Debug|Any CPU.Build.0 = Debug|Any CPU {C144C51F-A64A-4A13-86FA-FD30C9A54A72}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {BCA0342E-3BD1-437C-9C5E-6462B41ECFF3}.Debug|Any CPU.Build.0 = Debug|Any CPU {BCA0342E-3BD1-437C-9C5E-6462B41ECFF3}.Release|Any CPU.ActiveCfg = Release|Any CPU {BCA0342E-3BD1-437C-9C5E-6462B41ECFF3}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {7DECFE0C-CA66-451C-ABF2-5805691315C8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7DECFE0C-CA66-451C-ABF2-5805691315C8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7DECFE0C-CA66-451C-ABF2-5805691315C8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7DECFE0C-CA66-451C-ABF2-5805691315C8}.Release|Any CPU.Build.0 = Release|Any CPU - {27914DB3-27E0-42D1-9203-2D8F06519717}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {27914DB3-27E0-42D1-9203-2D8F06519717}.Debug|Any CPU.Build.0 = Debug|Any CPU - {27914DB3-27E0-42D1-9203-2D8F06519717}.Release|Any CPU.ActiveCfg = Release|Any CPU - {27914DB3-27E0-42D1-9203-2D8F06519717}.Release|Any CPU.Build.0 = Release|Any CPU - {F8402CF2-A123-4FA7-A27A-ECCB2061225D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F8402CF2-A123-4FA7-A27A-ECCB2061225D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F8402CF2-A123-4FA7-A27A-ECCB2061225D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F8402CF2-A123-4FA7-A27A-ECCB2061225D}.Release|Any CPU.Build.0 = Release|Any CPU - {DBFFC084-3F3F-47D7-8BE9-56D265BD4F58}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DBFFC084-3F3F-47D7-8BE9-56D265BD4F58}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DBFFC084-3F3F-47D7-8BE9-56D265BD4F58}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DBFFC084-3F3F-47D7-8BE9-56D265BD4F58}.Release|Any CPU.Build.0 = Release|Any CPU - {EE02EA17-0298-4FED-A35D-7725354241CD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EE02EA17-0298-4FED-A35D-7725354241CD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EE02EA17-0298-4FED-A35D-7725354241CD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EE02EA17-0298-4FED-A35D-7725354241CD}.Release|Any CPU.Build.0 = Release|Any CPU - {D183407E-9B82-4A87-98B4-8A68E1AD2BDD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D183407E-9B82-4A87-98B4-8A68E1AD2BDD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D183407E-9B82-4A87-98B4-8A68E1AD2BDD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D183407E-9B82-4A87-98B4-8A68E1AD2BDD}.Release|Any CPU.Build.0 = Release|Any CPU - {A35753FF-E260-4F7E-85F2-14066AFE5463}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A35753FF-E260-4F7E-85F2-14066AFE5463}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A35753FF-E260-4F7E-85F2-14066AFE5463}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A35753FF-E260-4F7E-85F2-14066AFE5463}.Release|Any CPU.Build.0 = Release|Any CPU - {1C727A2B-E6AE-45DC-BAF0-C91DAC1A25DE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1C727A2B-E6AE-45DC-BAF0-C91DAC1A25DE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1C727A2B-E6AE-45DC-BAF0-C91DAC1A25DE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1C727A2B-E6AE-45DC-BAF0-C91DAC1A25DE}.Release|Any CPU.Build.0 = Release|Any CPU - {057DDAD0-0F0F-413C-8625-42A124ACAEC3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {057DDAD0-0F0F-413C-8625-42A124ACAEC3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {057DDAD0-0F0F-413C-8625-42A124ACAEC3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {057DDAD0-0F0F-413C-8625-42A124ACAEC3}.Release|Any CPU.Build.0 = Release|Any CPU - {B39C8BED-0E09-4371-B213-4AD7D2FAF267}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B39C8BED-0E09-4371-B213-4AD7D2FAF267}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B39C8BED-0E09-4371-B213-4AD7D2FAF267}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B39C8BED-0E09-4371-B213-4AD7D2FAF267}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {7DECFE0C-CA66-451C-ABF2-5805691315C8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7DECFE0C-CA66-451C-ABF2-5805691315C8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7DECFE0C-CA66-451C-ABF2-5805691315C8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7DECFE0C-CA66-451C-ABF2-5805691315C8}.Release|Any CPU.Build.0 = Release|Any CPU - {27914DB3-27E0-42D1-9203-2D8F06519717}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {27914DB3-27E0-42D1-9203-2D8F06519717}.Debug|Any CPU.Build.0 = Debug|Any CPU - {27914DB3-27E0-42D1-9203-2D8F06519717}.Release|Any CPU.ActiveCfg = Release|Any CPU - {27914DB3-27E0-42D1-9203-2D8F06519717}.Release|Any CPU.Build.0 = Release|Any CPU - {F8402CF2-A123-4FA7-A27A-ECCB2061225D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F8402CF2-A123-4FA7-A27A-ECCB2061225D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F8402CF2-A123-4FA7-A27A-ECCB2061225D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F8402CF2-A123-4FA7-A27A-ECCB2061225D}.Release|Any CPU.Build.0 = Release|Any CPU - {DBFFC084-3F3F-47D7-8BE9-56D265BD4F58}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DBFFC084-3F3F-47D7-8BE9-56D265BD4F58}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DBFFC084-3F3F-47D7-8BE9-56D265BD4F58}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DBFFC084-3F3F-47D7-8BE9-56D265BD4F58}.Release|Any CPU.Build.0 = Release|Any CPU - {EE02EA17-0298-4FED-A35D-7725354241CD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EE02EA17-0298-4FED-A35D-7725354241CD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EE02EA17-0298-4FED-A35D-7725354241CD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EE02EA17-0298-4FED-A35D-7725354241CD}.Release|Any CPU.Build.0 = Release|Any CPU - {D183407E-9B82-4A87-98B4-8A68E1AD2BDD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D183407E-9B82-4A87-98B4-8A68E1AD2BDD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D183407E-9B82-4A87-98B4-8A68E1AD2BDD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D183407E-9B82-4A87-98B4-8A68E1AD2BDD}.Release|Any CPU.Build.0 = Release|Any CPU - {A35753FF-E260-4F7E-85F2-14066AFE5463}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A35753FF-E260-4F7E-85F2-14066AFE5463}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A35753FF-E260-4F7E-85F2-14066AFE5463}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A35753FF-E260-4F7E-85F2-14066AFE5463}.Release|Any CPU.Build.0 = Release|Any CPU - {1C727A2B-E6AE-45DC-BAF0-C91DAC1A25DE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1C727A2B-E6AE-45DC-BAF0-C91DAC1A25DE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1C727A2B-E6AE-45DC-BAF0-C91DAC1A25DE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1C727A2B-E6AE-45DC-BAF0-C91DAC1A25DE}.Release|Any CPU.Build.0 = Release|Any CPU - {057DDAD0-0F0F-413C-8625-42A124ACAEC3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {057DDAD0-0F0F-413C-8625-42A124ACAEC3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {057DDAD0-0F0F-413C-8625-42A124ACAEC3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {057DDAD0-0F0F-413C-8625-42A124ACAEC3}.Release|Any CPU.Build.0 = Release|Any CPU - {B39C8BED-0E09-4371-B213-4AD7D2FAF267}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B39C8BED-0E09-4371-B213-4AD7D2FAF267}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B39C8BED-0E09-4371-B213-4AD7D2FAF267}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B39C8BED-0E09-4371-B213-4AD7D2FAF267}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {C144C51F-A64A-4A13-86FA-FD30C9A54A72} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {807DE75E-F8F7-493D-93EF-5D51A434BC3A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {EE342539-34CC-4BDC-994D-B6C4B47EF62F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {2F63B62C-7723-426A-853C-7501886B3C6A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {BCA0342E-3BD1-437C-9C5E-6462B41ECFF3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {7DECFE0C-CA66-451C-ABF2-5805691315C8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {27914DB3-27E0-42D1-9203-2D8F06519717} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F8402CF2-A123-4FA7-A27A-ECCB2061225D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {DBFFC084-3F3F-47D7-8BE9-56D265BD4F58} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {EE02EA17-0298-4FED-A35D-7725354241CD} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D183407E-9B82-4A87-98B4-8A68E1AD2BDD} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A35753FF-E260-4F7E-85F2-14066AFE5463} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {1C727A2B-E6AE-45DC-BAF0-C91DAC1A25DE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {057DDAD0-0F0F-413C-8625-42A124ACAEC3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B39C8BED-0E09-4371-B213-4AD7D2FAF267} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {7DECFE0C-CA66-451C-ABF2-5805691315C8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {27914DB3-27E0-42D1-9203-2D8F06519717} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F8402CF2-A123-4FA7-A27A-ECCB2061225D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {DBFFC084-3F3F-47D7-8BE9-56D265BD4F58} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {EE02EA17-0298-4FED-A35D-7725354241CD} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D183407E-9B82-4A87-98B4-8A68E1AD2BDD} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A35753FF-E260-4F7E-85F2-14066AFE5463} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {1C727A2B-E6AE-45DC-BAF0-C91DAC1A25DE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {057DDAD0-0F0F-413C-8625-42A124ACAEC3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B39C8BED-0E09-4371-B213-4AD7D2FAF267} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {5F3AB5FB-B0E1-4A4E-A0FD-D8C764226258} diff --git a/sdk/src/Services/GreengrassV2/Properties/AssemblyInfo.cs b/sdk/src/Services/GreengrassV2/Properties/AssemblyInfo.cs index e6101038550e..121eb9bfa2cc 100644 --- a/sdk/src/Services/GreengrassV2/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/GreengrassV2/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/GroundStation/Generated/AmazonGroundStationConfig.cs b/sdk/src/Services/GroundStation/Generated/AmazonGroundStationConfig.cs index 5244bbf8abf4..379a7a359c39 100644 --- a/sdk/src/Services/GroundStation/Generated/AmazonGroundStationConfig.cs +++ b/sdk/src/Services/GroundStation/Generated/AmazonGroundStationConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.GroundStation public partial class AmazonGroundStationConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("GroundStation", "4.0.0.0"); private static readonly AmazonGroundStationEndpointResolver EndpointResolver = new AmazonGroundStationEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("GroundStation", "3.7.400.27"); -======= - InternalSDKUtils.BuildUserAgentString("GroundStation", "3.7.400.54"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/GroundStation/GroundStation.sln b/sdk/src/Services/GroundStation/GroundStation.sln index dce2bc8a73f5..928c2b02fcdc 100644 --- a/sdk/src/Services/GroundStation/GroundStation.sln +++ b/sdk/src/Services/GroundStation/GroundStation.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {D47C39C7-B7B5-4F1F-95EE-E12A164566DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {D47C39C7-B7B5-4F1F-95EE-E12A164566DC}.Debug|Any CPU.Build.0 = Debug|Any CPU {D47C39C7-B7B5-4F1F-95EE-E12A164566DC}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {84A47248-D148-4FE9-B802-99CAC5228B98}.Debug|Any CPU.Build.0 = Debug|Any CPU {84A47248-D148-4FE9-B802-99CAC5228B98}.Release|Any CPU.ActiveCfg = Release|Any CPU {84A47248-D148-4FE9-B802-99CAC5228B98}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {3EB7B224-5677-469D-98F1-5712474F310B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3EB7B224-5677-469D-98F1-5712474F310B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3EB7B224-5677-469D-98F1-5712474F310B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3EB7B224-5677-469D-98F1-5712474F310B}.Release|Any CPU.Build.0 = Release|Any CPU - {63E0D467-8B06-484A-B4F6-D129237CFDF7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {63E0D467-8B06-484A-B4F6-D129237CFDF7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {63E0D467-8B06-484A-B4F6-D129237CFDF7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {63E0D467-8B06-484A-B4F6-D129237CFDF7}.Release|Any CPU.Build.0 = Release|Any CPU - {182B4C6F-F104-4DA1-8317-5F1841DE6C7E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {182B4C6F-F104-4DA1-8317-5F1841DE6C7E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {182B4C6F-F104-4DA1-8317-5F1841DE6C7E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {182B4C6F-F104-4DA1-8317-5F1841DE6C7E}.Release|Any CPU.Build.0 = Release|Any CPU - {E3039E42-B94A-4A83-B71E-29AF3D7A515E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E3039E42-B94A-4A83-B71E-29AF3D7A515E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E3039E42-B94A-4A83-B71E-29AF3D7A515E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E3039E42-B94A-4A83-B71E-29AF3D7A515E}.Release|Any CPU.Build.0 = Release|Any CPU - {351ECA8B-5B96-4B8D-8F67-8EF45A099BCF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {351ECA8B-5B96-4B8D-8F67-8EF45A099BCF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {351ECA8B-5B96-4B8D-8F67-8EF45A099BCF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {351ECA8B-5B96-4B8D-8F67-8EF45A099BCF}.Release|Any CPU.Build.0 = Release|Any CPU - {CF0DC7C6-A01E-409D-86DB-613AE6E93841}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CF0DC7C6-A01E-409D-86DB-613AE6E93841}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CF0DC7C6-A01E-409D-86DB-613AE6E93841}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CF0DC7C6-A01E-409D-86DB-613AE6E93841}.Release|Any CPU.Build.0 = Release|Any CPU - {B7D67FCC-F23E-4E1B-9E2E-99620AD4CDE7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B7D67FCC-F23E-4E1B-9E2E-99620AD4CDE7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B7D67FCC-F23E-4E1B-9E2E-99620AD4CDE7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B7D67FCC-F23E-4E1B-9E2E-99620AD4CDE7}.Release|Any CPU.Build.0 = Release|Any CPU - {A0EC73E7-150A-4F5F-A583-DF1499C6B86B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A0EC73E7-150A-4F5F-A583-DF1499C6B86B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A0EC73E7-150A-4F5F-A583-DF1499C6B86B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A0EC73E7-150A-4F5F-A583-DF1499C6B86B}.Release|Any CPU.Build.0 = Release|Any CPU - {8DCDCCB7-FA77-431D-A732-CF8B48B60207}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8DCDCCB7-FA77-431D-A732-CF8B48B60207}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8DCDCCB7-FA77-431D-A732-CF8B48B60207}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8DCDCCB7-FA77-431D-A732-CF8B48B60207}.Release|Any CPU.Build.0 = Release|Any CPU - {DCCE9C1C-D346-4BD8-9EBF-C294525624DD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DCCE9C1C-D346-4BD8-9EBF-C294525624DD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DCCE9C1C-D346-4BD8-9EBF-C294525624DD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DCCE9C1C-D346-4BD8-9EBF-C294525624DD}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {3EB7B224-5677-469D-98F1-5712474F310B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3EB7B224-5677-469D-98F1-5712474F310B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3EB7B224-5677-469D-98F1-5712474F310B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3EB7B224-5677-469D-98F1-5712474F310B}.Release|Any CPU.Build.0 = Release|Any CPU - {63E0D467-8B06-484A-B4F6-D129237CFDF7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {63E0D467-8B06-484A-B4F6-D129237CFDF7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {63E0D467-8B06-484A-B4F6-D129237CFDF7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {63E0D467-8B06-484A-B4F6-D129237CFDF7}.Release|Any CPU.Build.0 = Release|Any CPU - {182B4C6F-F104-4DA1-8317-5F1841DE6C7E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {182B4C6F-F104-4DA1-8317-5F1841DE6C7E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {182B4C6F-F104-4DA1-8317-5F1841DE6C7E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {182B4C6F-F104-4DA1-8317-5F1841DE6C7E}.Release|Any CPU.Build.0 = Release|Any CPU - {E3039E42-B94A-4A83-B71E-29AF3D7A515E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E3039E42-B94A-4A83-B71E-29AF3D7A515E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E3039E42-B94A-4A83-B71E-29AF3D7A515E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E3039E42-B94A-4A83-B71E-29AF3D7A515E}.Release|Any CPU.Build.0 = Release|Any CPU - {351ECA8B-5B96-4B8D-8F67-8EF45A099BCF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {351ECA8B-5B96-4B8D-8F67-8EF45A099BCF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {351ECA8B-5B96-4B8D-8F67-8EF45A099BCF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {351ECA8B-5B96-4B8D-8F67-8EF45A099BCF}.Release|Any CPU.Build.0 = Release|Any CPU - {CF0DC7C6-A01E-409D-86DB-613AE6E93841}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CF0DC7C6-A01E-409D-86DB-613AE6E93841}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CF0DC7C6-A01E-409D-86DB-613AE6E93841}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CF0DC7C6-A01E-409D-86DB-613AE6E93841}.Release|Any CPU.Build.0 = Release|Any CPU - {B7D67FCC-F23E-4E1B-9E2E-99620AD4CDE7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B7D67FCC-F23E-4E1B-9E2E-99620AD4CDE7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B7D67FCC-F23E-4E1B-9E2E-99620AD4CDE7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B7D67FCC-F23E-4E1B-9E2E-99620AD4CDE7}.Release|Any CPU.Build.0 = Release|Any CPU - {A0EC73E7-150A-4F5F-A583-DF1499C6B86B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A0EC73E7-150A-4F5F-A583-DF1499C6B86B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A0EC73E7-150A-4F5F-A583-DF1499C6B86B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A0EC73E7-150A-4F5F-A583-DF1499C6B86B}.Release|Any CPU.Build.0 = Release|Any CPU - {8DCDCCB7-FA77-431D-A732-CF8B48B60207}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8DCDCCB7-FA77-431D-A732-CF8B48B60207}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8DCDCCB7-FA77-431D-A732-CF8B48B60207}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8DCDCCB7-FA77-431D-A732-CF8B48B60207}.Release|Any CPU.Build.0 = Release|Any CPU - {DCCE9C1C-D346-4BD8-9EBF-C294525624DD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DCCE9C1C-D346-4BD8-9EBF-C294525624DD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DCCE9C1C-D346-4BD8-9EBF-C294525624DD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DCCE9C1C-D346-4BD8-9EBF-C294525624DD}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {D47C39C7-B7B5-4F1F-95EE-E12A164566DC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {F5884F20-9366-41A9-BB88-17A6EC721C30} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {9BBC3FD5-35B9-4427-BC3E-86D3C84A378C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {D7A8F2FE-244F-4DB9-9BA0-64026311F82C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {84A47248-D148-4FE9-B802-99CAC5228B98} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {3EB7B224-5677-469D-98F1-5712474F310B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {63E0D467-8B06-484A-B4F6-D129237CFDF7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {182B4C6F-F104-4DA1-8317-5F1841DE6C7E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E3039E42-B94A-4A83-B71E-29AF3D7A515E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {351ECA8B-5B96-4B8D-8F67-8EF45A099BCF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {CF0DC7C6-A01E-409D-86DB-613AE6E93841} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B7D67FCC-F23E-4E1B-9E2E-99620AD4CDE7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A0EC73E7-150A-4F5F-A583-DF1499C6B86B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8DCDCCB7-FA77-431D-A732-CF8B48B60207} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {DCCE9C1C-D346-4BD8-9EBF-C294525624DD} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {3EB7B224-5677-469D-98F1-5712474F310B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {63E0D467-8B06-484A-B4F6-D129237CFDF7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {182B4C6F-F104-4DA1-8317-5F1841DE6C7E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E3039E42-B94A-4A83-B71E-29AF3D7A515E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {351ECA8B-5B96-4B8D-8F67-8EF45A099BCF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {CF0DC7C6-A01E-409D-86DB-613AE6E93841} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B7D67FCC-F23E-4E1B-9E2E-99620AD4CDE7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A0EC73E7-150A-4F5F-A583-DF1499C6B86B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8DCDCCB7-FA77-431D-A732-CF8B48B60207} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {DCCE9C1C-D346-4BD8-9EBF-C294525624DD} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {F78E1B23-994F-47BA-AC3E-09E4A9DC08DC} diff --git a/sdk/src/Services/GroundStation/Properties/AssemblyInfo.cs b/sdk/src/Services/GroundStation/Properties/AssemblyInfo.cs index ed7a91166122..840b4d2961db 100644 --- a/sdk/src/Services/GroundStation/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/GroundStation/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.27")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.54")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/GuardDuty/Generated/AmazonGuardDutyConfig.cs b/sdk/src/Services/GuardDuty/Generated/AmazonGuardDutyConfig.cs index 8e7edfbcdca9..79fec0a200f5 100644 --- a/sdk/src/Services/GuardDuty/Generated/AmazonGuardDutyConfig.cs +++ b/sdk/src/Services/GuardDuty/Generated/AmazonGuardDutyConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.GuardDuty public partial class AmazonGuardDutyConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("GuardDuty", "4.0.0.0"); private static readonly AmazonGuardDutyEndpointResolver EndpointResolver = new AmazonGuardDutyEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("GuardDuty", "3.7.402.5"); -======= - InternalSDKUtils.BuildUserAgentString("GuardDuty", "3.7.404.8"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/GuardDuty/GuardDuty.sln b/sdk/src/Services/GuardDuty/GuardDuty.sln index f143755258e5..fcd09b1fa01b 100644 --- a/sdk/src/Services/GuardDuty/GuardDuty.sln +++ b/sdk/src/Services/GuardDuty/GuardDuty.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {2ED115C7-D315-4A42-90FD-9210507C2F48}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {2ED115C7-D315-4A42-90FD-9210507C2F48}.Debug|Any CPU.Build.0 = Debug|Any CPU {2ED115C7-D315-4A42-90FD-9210507C2F48}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {25194361-7BD3-4932-867B-34B7FFAEC70C}.Debug|Any CPU.Build.0 = Debug|Any CPU {25194361-7BD3-4932-867B-34B7FFAEC70C}.Release|Any CPU.ActiveCfg = Release|Any CPU {25194361-7BD3-4932-867B-34B7FFAEC70C}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {38252BC6-6503-404C-98FF-FD6457DA2B7B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {38252BC6-6503-404C-98FF-FD6457DA2B7B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {38252BC6-6503-404C-98FF-FD6457DA2B7B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {38252BC6-6503-404C-98FF-FD6457DA2B7B}.Release|Any CPU.Build.0 = Release|Any CPU - {631C924E-7FB9-4DE1-9F15-7498F8E1A828}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {631C924E-7FB9-4DE1-9F15-7498F8E1A828}.Debug|Any CPU.Build.0 = Debug|Any CPU - {631C924E-7FB9-4DE1-9F15-7498F8E1A828}.Release|Any CPU.ActiveCfg = Release|Any CPU - {631C924E-7FB9-4DE1-9F15-7498F8E1A828}.Release|Any CPU.Build.0 = Release|Any CPU - {864496C1-6591-4262-A321-5C2213556098}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {864496C1-6591-4262-A321-5C2213556098}.Debug|Any CPU.Build.0 = Debug|Any CPU - {864496C1-6591-4262-A321-5C2213556098}.Release|Any CPU.ActiveCfg = Release|Any CPU - {864496C1-6591-4262-A321-5C2213556098}.Release|Any CPU.Build.0 = Release|Any CPU - {3EFFA335-5A42-48CE-8427-25BEBB2D6F1D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3EFFA335-5A42-48CE-8427-25BEBB2D6F1D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3EFFA335-5A42-48CE-8427-25BEBB2D6F1D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3EFFA335-5A42-48CE-8427-25BEBB2D6F1D}.Release|Any CPU.Build.0 = Release|Any CPU - {F949B6E2-9F37-4413-A1EC-042EB2E2C92E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F949B6E2-9F37-4413-A1EC-042EB2E2C92E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F949B6E2-9F37-4413-A1EC-042EB2E2C92E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F949B6E2-9F37-4413-A1EC-042EB2E2C92E}.Release|Any CPU.Build.0 = Release|Any CPU - {E28210AE-7B3F-441C-BF9A-A6E1C2D7070E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E28210AE-7B3F-441C-BF9A-A6E1C2D7070E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E28210AE-7B3F-441C-BF9A-A6E1C2D7070E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E28210AE-7B3F-441C-BF9A-A6E1C2D7070E}.Release|Any CPU.Build.0 = Release|Any CPU - {F6BC39DC-C3C2-4BCA-B9ED-8DBC02D1B3F8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F6BC39DC-C3C2-4BCA-B9ED-8DBC02D1B3F8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F6BC39DC-C3C2-4BCA-B9ED-8DBC02D1B3F8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F6BC39DC-C3C2-4BCA-B9ED-8DBC02D1B3F8}.Release|Any CPU.Build.0 = Release|Any CPU - {24CD8F83-1975-4609-ADB1-4A89BE881FBB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {24CD8F83-1975-4609-ADB1-4A89BE881FBB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {24CD8F83-1975-4609-ADB1-4A89BE881FBB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {24CD8F83-1975-4609-ADB1-4A89BE881FBB}.Release|Any CPU.Build.0 = Release|Any CPU - {F56BE3A3-5C5C-43B3-8755-B6D6E45E3F3C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F56BE3A3-5C5C-43B3-8755-B6D6E45E3F3C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F56BE3A3-5C5C-43B3-8755-B6D6E45E3F3C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F56BE3A3-5C5C-43B3-8755-B6D6E45E3F3C}.Release|Any CPU.Build.0 = Release|Any CPU - {E296C349-E9E7-4FE1-B6C6-6083016CD137}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E296C349-E9E7-4FE1-B6C6-6083016CD137}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E296C349-E9E7-4FE1-B6C6-6083016CD137}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E296C349-E9E7-4FE1-B6C6-6083016CD137}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {38252BC6-6503-404C-98FF-FD6457DA2B7B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {38252BC6-6503-404C-98FF-FD6457DA2B7B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {38252BC6-6503-404C-98FF-FD6457DA2B7B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {38252BC6-6503-404C-98FF-FD6457DA2B7B}.Release|Any CPU.Build.0 = Release|Any CPU - {631C924E-7FB9-4DE1-9F15-7498F8E1A828}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {631C924E-7FB9-4DE1-9F15-7498F8E1A828}.Debug|Any CPU.Build.0 = Debug|Any CPU - {631C924E-7FB9-4DE1-9F15-7498F8E1A828}.Release|Any CPU.ActiveCfg = Release|Any CPU - {631C924E-7FB9-4DE1-9F15-7498F8E1A828}.Release|Any CPU.Build.0 = Release|Any CPU - {864496C1-6591-4262-A321-5C2213556098}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {864496C1-6591-4262-A321-5C2213556098}.Debug|Any CPU.Build.0 = Debug|Any CPU - {864496C1-6591-4262-A321-5C2213556098}.Release|Any CPU.ActiveCfg = Release|Any CPU - {864496C1-6591-4262-A321-5C2213556098}.Release|Any CPU.Build.0 = Release|Any CPU - {3EFFA335-5A42-48CE-8427-25BEBB2D6F1D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3EFFA335-5A42-48CE-8427-25BEBB2D6F1D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3EFFA335-5A42-48CE-8427-25BEBB2D6F1D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3EFFA335-5A42-48CE-8427-25BEBB2D6F1D}.Release|Any CPU.Build.0 = Release|Any CPU - {F949B6E2-9F37-4413-A1EC-042EB2E2C92E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F949B6E2-9F37-4413-A1EC-042EB2E2C92E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F949B6E2-9F37-4413-A1EC-042EB2E2C92E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F949B6E2-9F37-4413-A1EC-042EB2E2C92E}.Release|Any CPU.Build.0 = Release|Any CPU - {E28210AE-7B3F-441C-BF9A-A6E1C2D7070E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E28210AE-7B3F-441C-BF9A-A6E1C2D7070E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E28210AE-7B3F-441C-BF9A-A6E1C2D7070E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E28210AE-7B3F-441C-BF9A-A6E1C2D7070E}.Release|Any CPU.Build.0 = Release|Any CPU - {F6BC39DC-C3C2-4BCA-B9ED-8DBC02D1B3F8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F6BC39DC-C3C2-4BCA-B9ED-8DBC02D1B3F8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F6BC39DC-C3C2-4BCA-B9ED-8DBC02D1B3F8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F6BC39DC-C3C2-4BCA-B9ED-8DBC02D1B3F8}.Release|Any CPU.Build.0 = Release|Any CPU - {24CD8F83-1975-4609-ADB1-4A89BE881FBB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {24CD8F83-1975-4609-ADB1-4A89BE881FBB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {24CD8F83-1975-4609-ADB1-4A89BE881FBB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {24CD8F83-1975-4609-ADB1-4A89BE881FBB}.Release|Any CPU.Build.0 = Release|Any CPU - {F56BE3A3-5C5C-43B3-8755-B6D6E45E3F3C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F56BE3A3-5C5C-43B3-8755-B6D6E45E3F3C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F56BE3A3-5C5C-43B3-8755-B6D6E45E3F3C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F56BE3A3-5C5C-43B3-8755-B6D6E45E3F3C}.Release|Any CPU.Build.0 = Release|Any CPU - {E296C349-E9E7-4FE1-B6C6-6083016CD137}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E296C349-E9E7-4FE1-B6C6-6083016CD137}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E296C349-E9E7-4FE1-B6C6-6083016CD137}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E296C349-E9E7-4FE1-B6C6-6083016CD137}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {2ED115C7-D315-4A42-90FD-9210507C2F48} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {F6DC79F1-5F54-4C06-B295-DF54FB496990} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {15041822-AD84-4CE1-8602-EEC040068258} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {101D20C9-1FA0-464C-9008-0E66FD33C953} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {25194361-7BD3-4932-867B-34B7FFAEC70C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {38252BC6-6503-404C-98FF-FD6457DA2B7B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {631C924E-7FB9-4DE1-9F15-7498F8E1A828} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {864496C1-6591-4262-A321-5C2213556098} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {3EFFA335-5A42-48CE-8427-25BEBB2D6F1D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F949B6E2-9F37-4413-A1EC-042EB2E2C92E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E28210AE-7B3F-441C-BF9A-A6E1C2D7070E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F6BC39DC-C3C2-4BCA-B9ED-8DBC02D1B3F8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {24CD8F83-1975-4609-ADB1-4A89BE881FBB} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F56BE3A3-5C5C-43B3-8755-B6D6E45E3F3C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E296C349-E9E7-4FE1-B6C6-6083016CD137} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {38252BC6-6503-404C-98FF-FD6457DA2B7B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {631C924E-7FB9-4DE1-9F15-7498F8E1A828} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {864496C1-6591-4262-A321-5C2213556098} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {3EFFA335-5A42-48CE-8427-25BEBB2D6F1D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F949B6E2-9F37-4413-A1EC-042EB2E2C92E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E28210AE-7B3F-441C-BF9A-A6E1C2D7070E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F6BC39DC-C3C2-4BCA-B9ED-8DBC02D1B3F8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {24CD8F83-1975-4609-ADB1-4A89BE881FBB} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F56BE3A3-5C5C-43B3-8755-B6D6E45E3F3C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E296C349-E9E7-4FE1-B6C6-6083016CD137} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {9A5D2804-4244-4962-A81E-9D9DA9B32094} diff --git a/sdk/src/Services/GuardDuty/Properties/AssemblyInfo.cs b/sdk/src/Services/GuardDuty/Properties/AssemblyInfo.cs index 0e816a9a2e8e..a32a56f8674c 100644 --- a/sdk/src/Services/GuardDuty/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/GuardDuty/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.402.5")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.404.8")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/HealthLake/Generated/AmazonHealthLakeConfig.cs b/sdk/src/Services/HealthLake/Generated/AmazonHealthLakeConfig.cs index c0c63b8b6e79..e05626fab893 100644 --- a/sdk/src/Services/HealthLake/Generated/AmazonHealthLakeConfig.cs +++ b/sdk/src/Services/HealthLake/Generated/AmazonHealthLakeConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.HealthLake public partial class AmazonHealthLakeConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("HealthLake", "4.0.0.0"); private static readonly AmazonHealthLakeEndpointResolver EndpointResolver = new AmazonHealthLakeEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("HealthLake", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("HealthLake", "3.7.400.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/HealthLake/HealthLake.sln b/sdk/src/Services/HealthLake/HealthLake.sln index 7060081cd6f2..c1f7973ada26 100644 --- a/sdk/src/Services/HealthLake/HealthLake.sln +++ b/sdk/src/Services/HealthLake/HealthLake.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {5180D2C7-41D4-474E-864B-A62B68E7CADE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {5180D2C7-41D4-474E-864B-A62B68E7CADE}.Debug|Any CPU.Build.0 = Debug|Any CPU {5180D2C7-41D4-474E-864B-A62B68E7CADE}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {DEC3BE7F-14D5-488C-AD9E-38B77D50C6B1}.Debug|Any CPU.Build.0 = Debug|Any CPU {DEC3BE7F-14D5-488C-AD9E-38B77D50C6B1}.Release|Any CPU.ActiveCfg = Release|Any CPU {DEC3BE7F-14D5-488C-AD9E-38B77D50C6B1}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {8F59242E-2868-4A9F-847E-E621AAD34077}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8F59242E-2868-4A9F-847E-E621AAD34077}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8F59242E-2868-4A9F-847E-E621AAD34077}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8F59242E-2868-4A9F-847E-E621AAD34077}.Release|Any CPU.Build.0 = Release|Any CPU - {358B5E5D-CC99-49B0-9B65-3A6E69DD17B5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {358B5E5D-CC99-49B0-9B65-3A6E69DD17B5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {358B5E5D-CC99-49B0-9B65-3A6E69DD17B5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {358B5E5D-CC99-49B0-9B65-3A6E69DD17B5}.Release|Any CPU.Build.0 = Release|Any CPU - {5739BCE4-D5F4-4DDD-8D80-69A20F325236}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5739BCE4-D5F4-4DDD-8D80-69A20F325236}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5739BCE4-D5F4-4DDD-8D80-69A20F325236}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5739BCE4-D5F4-4DDD-8D80-69A20F325236}.Release|Any CPU.Build.0 = Release|Any CPU - {DD1F84A3-B307-4018-9152-B446F85C7B48}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DD1F84A3-B307-4018-9152-B446F85C7B48}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DD1F84A3-B307-4018-9152-B446F85C7B48}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DD1F84A3-B307-4018-9152-B446F85C7B48}.Release|Any CPU.Build.0 = Release|Any CPU - {DB4BB8EB-62D1-4C6C-A051-C2A5637360AF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DB4BB8EB-62D1-4C6C-A051-C2A5637360AF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DB4BB8EB-62D1-4C6C-A051-C2A5637360AF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DB4BB8EB-62D1-4C6C-A051-C2A5637360AF}.Release|Any CPU.Build.0 = Release|Any CPU - {459A0900-377F-4C5C-88DA-76C85D77F51B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {459A0900-377F-4C5C-88DA-76C85D77F51B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {459A0900-377F-4C5C-88DA-76C85D77F51B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {459A0900-377F-4C5C-88DA-76C85D77F51B}.Release|Any CPU.Build.0 = Release|Any CPU - {7C4A20F0-6572-4580-9F0F-783E083EC423}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7C4A20F0-6572-4580-9F0F-783E083EC423}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7C4A20F0-6572-4580-9F0F-783E083EC423}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7C4A20F0-6572-4580-9F0F-783E083EC423}.Release|Any CPU.Build.0 = Release|Any CPU - {75B6FA99-8ED8-4CDF-AD0C-4F539922D440}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {75B6FA99-8ED8-4CDF-AD0C-4F539922D440}.Debug|Any CPU.Build.0 = Debug|Any CPU - {75B6FA99-8ED8-4CDF-AD0C-4F539922D440}.Release|Any CPU.ActiveCfg = Release|Any CPU - {75B6FA99-8ED8-4CDF-AD0C-4F539922D440}.Release|Any CPU.Build.0 = Release|Any CPU - {B8435CF2-1E64-4BB8-852A-CB401B784764}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B8435CF2-1E64-4BB8-852A-CB401B784764}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B8435CF2-1E64-4BB8-852A-CB401B784764}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B8435CF2-1E64-4BB8-852A-CB401B784764}.Release|Any CPU.Build.0 = Release|Any CPU - {EA17E571-1505-4920-9549-9DD6377186D1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EA17E571-1505-4920-9549-9DD6377186D1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EA17E571-1505-4920-9549-9DD6377186D1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EA17E571-1505-4920-9549-9DD6377186D1}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {8F59242E-2868-4A9F-847E-E621AAD34077}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8F59242E-2868-4A9F-847E-E621AAD34077}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8F59242E-2868-4A9F-847E-E621AAD34077}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8F59242E-2868-4A9F-847E-E621AAD34077}.Release|Any CPU.Build.0 = Release|Any CPU - {358B5E5D-CC99-49B0-9B65-3A6E69DD17B5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {358B5E5D-CC99-49B0-9B65-3A6E69DD17B5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {358B5E5D-CC99-49B0-9B65-3A6E69DD17B5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {358B5E5D-CC99-49B0-9B65-3A6E69DD17B5}.Release|Any CPU.Build.0 = Release|Any CPU - {5739BCE4-D5F4-4DDD-8D80-69A20F325236}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5739BCE4-D5F4-4DDD-8D80-69A20F325236}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5739BCE4-D5F4-4DDD-8D80-69A20F325236}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5739BCE4-D5F4-4DDD-8D80-69A20F325236}.Release|Any CPU.Build.0 = Release|Any CPU - {DD1F84A3-B307-4018-9152-B446F85C7B48}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DD1F84A3-B307-4018-9152-B446F85C7B48}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DD1F84A3-B307-4018-9152-B446F85C7B48}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DD1F84A3-B307-4018-9152-B446F85C7B48}.Release|Any CPU.Build.0 = Release|Any CPU - {DB4BB8EB-62D1-4C6C-A051-C2A5637360AF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DB4BB8EB-62D1-4C6C-A051-C2A5637360AF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DB4BB8EB-62D1-4C6C-A051-C2A5637360AF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DB4BB8EB-62D1-4C6C-A051-C2A5637360AF}.Release|Any CPU.Build.0 = Release|Any CPU - {459A0900-377F-4C5C-88DA-76C85D77F51B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {459A0900-377F-4C5C-88DA-76C85D77F51B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {459A0900-377F-4C5C-88DA-76C85D77F51B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {459A0900-377F-4C5C-88DA-76C85D77F51B}.Release|Any CPU.Build.0 = Release|Any CPU - {7C4A20F0-6572-4580-9F0F-783E083EC423}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7C4A20F0-6572-4580-9F0F-783E083EC423}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7C4A20F0-6572-4580-9F0F-783E083EC423}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7C4A20F0-6572-4580-9F0F-783E083EC423}.Release|Any CPU.Build.0 = Release|Any CPU - {75B6FA99-8ED8-4CDF-AD0C-4F539922D440}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {75B6FA99-8ED8-4CDF-AD0C-4F539922D440}.Debug|Any CPU.Build.0 = Debug|Any CPU - {75B6FA99-8ED8-4CDF-AD0C-4F539922D440}.Release|Any CPU.ActiveCfg = Release|Any CPU - {75B6FA99-8ED8-4CDF-AD0C-4F539922D440}.Release|Any CPU.Build.0 = Release|Any CPU - {B8435CF2-1E64-4BB8-852A-CB401B784764}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B8435CF2-1E64-4BB8-852A-CB401B784764}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B8435CF2-1E64-4BB8-852A-CB401B784764}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B8435CF2-1E64-4BB8-852A-CB401B784764}.Release|Any CPU.Build.0 = Release|Any CPU - {EA17E571-1505-4920-9549-9DD6377186D1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EA17E571-1505-4920-9549-9DD6377186D1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EA17E571-1505-4920-9549-9DD6377186D1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EA17E571-1505-4920-9549-9DD6377186D1}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {5180D2C7-41D4-474E-864B-A62B68E7CADE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {D304CF49-5B98-4DD7-88D2-215C247C81D0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {C7C3EC58-8E53-4510-A5DA-0BD451F0998A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {70E79BC4-C946-4175-9463-7F056230EF66} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {DEC3BE7F-14D5-488C-AD9E-38B77D50C6B1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {8F59242E-2868-4A9F-847E-E621AAD34077} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {358B5E5D-CC99-49B0-9B65-3A6E69DD17B5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {5739BCE4-D5F4-4DDD-8D80-69A20F325236} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {DD1F84A3-B307-4018-9152-B446F85C7B48} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {DB4BB8EB-62D1-4C6C-A051-C2A5637360AF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {459A0900-377F-4C5C-88DA-76C85D77F51B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {7C4A20F0-6572-4580-9F0F-783E083EC423} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {75B6FA99-8ED8-4CDF-AD0C-4F539922D440} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B8435CF2-1E64-4BB8-852A-CB401B784764} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {EA17E571-1505-4920-9549-9DD6377186D1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {8F59242E-2868-4A9F-847E-E621AAD34077} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {358B5E5D-CC99-49B0-9B65-3A6E69DD17B5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {5739BCE4-D5F4-4DDD-8D80-69A20F325236} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {DD1F84A3-B307-4018-9152-B446F85C7B48} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {DB4BB8EB-62D1-4C6C-A051-C2A5637360AF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {459A0900-377F-4C5C-88DA-76C85D77F51B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {7C4A20F0-6572-4580-9F0F-783E083EC423} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {75B6FA99-8ED8-4CDF-AD0C-4F539922D440} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B8435CF2-1E64-4BB8-852A-CB401B784764} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {EA17E571-1505-4920-9549-9DD6377186D1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {3795B67B-7440-436D-8F1D-634A583B7870} diff --git a/sdk/src/Services/HealthLake/Properties/AssemblyInfo.cs b/sdk/src/Services/HealthLake/Properties/AssemblyInfo.cs index d9b0a28040c1..8b0d39e4c9ce 100644 --- a/sdk/src/Services/HealthLake/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/HealthLake/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/IAMRolesAnywhere/Generated/AmazonIAMRolesAnywhereConfig.cs b/sdk/src/Services/IAMRolesAnywhere/Generated/AmazonIAMRolesAnywhereConfig.cs index 072ab1beca6c..c7e81538c345 100644 --- a/sdk/src/Services/IAMRolesAnywhere/Generated/AmazonIAMRolesAnywhereConfig.cs +++ b/sdk/src/Services/IAMRolesAnywhere/Generated/AmazonIAMRolesAnywhereConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.IAMRolesAnywhere public partial class AmazonIAMRolesAnywhereConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("RolesAnywhere", "4.0.0.0"); private static readonly AmazonIAMRolesAnywhereEndpointResolver EndpointResolver = new AmazonIAMRolesAnywhereEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("RolesAnywhere", "3.7.401.24"); -======= - InternalSDKUtils.BuildUserAgentString("RolesAnywhere", "3.7.401.51"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/IAMRolesAnywhere/IAMRolesAnywhere.sln b/sdk/src/Services/IAMRolesAnywhere/IAMRolesAnywhere.sln index d58733046260..a483b4523e6e 100644 --- a/sdk/src/Services/IAMRolesAnywhere/IAMRolesAnywhere.sln +++ b/sdk/src/Services/IAMRolesAnywhere/IAMRolesAnywhere.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {41EA40BA-04B1-47DE-BDE8-A4573EF2D1B3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {41EA40BA-04B1-47DE-BDE8-A4573EF2D1B3}.Debug|Any CPU.Build.0 = Debug|Any CPU {41EA40BA-04B1-47DE-BDE8-A4573EF2D1B3}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {2ED505CE-65E8-4F37-A6FA-8AD847585374}.Debug|Any CPU.Build.0 = Debug|Any CPU {2ED505CE-65E8-4F37-A6FA-8AD847585374}.Release|Any CPU.ActiveCfg = Release|Any CPU {2ED505CE-65E8-4F37-A6FA-8AD847585374}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {DFF5E785-0D64-4C32-AA1A-058FE46A2092}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DFF5E785-0D64-4C32-AA1A-058FE46A2092}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DFF5E785-0D64-4C32-AA1A-058FE46A2092}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DFF5E785-0D64-4C32-AA1A-058FE46A2092}.Release|Any CPU.Build.0 = Release|Any CPU - {6147B8AB-F6C0-4903-950F-6983DB746D42}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6147B8AB-F6C0-4903-950F-6983DB746D42}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6147B8AB-F6C0-4903-950F-6983DB746D42}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6147B8AB-F6C0-4903-950F-6983DB746D42}.Release|Any CPU.Build.0 = Release|Any CPU - {29974EA1-4A53-4281-B098-A15C4814FE64}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {29974EA1-4A53-4281-B098-A15C4814FE64}.Debug|Any CPU.Build.0 = Debug|Any CPU - {29974EA1-4A53-4281-B098-A15C4814FE64}.Release|Any CPU.ActiveCfg = Release|Any CPU - {29974EA1-4A53-4281-B098-A15C4814FE64}.Release|Any CPU.Build.0 = Release|Any CPU - {5EA75B18-6DE2-4D0F-8B2E-C164A229E401}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5EA75B18-6DE2-4D0F-8B2E-C164A229E401}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5EA75B18-6DE2-4D0F-8B2E-C164A229E401}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5EA75B18-6DE2-4D0F-8B2E-C164A229E401}.Release|Any CPU.Build.0 = Release|Any CPU - {F6E2F869-FB3B-4F0B-8354-3C42C614CA53}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F6E2F869-FB3B-4F0B-8354-3C42C614CA53}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F6E2F869-FB3B-4F0B-8354-3C42C614CA53}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F6E2F869-FB3B-4F0B-8354-3C42C614CA53}.Release|Any CPU.Build.0 = Release|Any CPU - {11F9DAB2-3B64-4384-B550-50538CE59B50}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {11F9DAB2-3B64-4384-B550-50538CE59B50}.Debug|Any CPU.Build.0 = Debug|Any CPU - {11F9DAB2-3B64-4384-B550-50538CE59B50}.Release|Any CPU.ActiveCfg = Release|Any CPU - {11F9DAB2-3B64-4384-B550-50538CE59B50}.Release|Any CPU.Build.0 = Release|Any CPU - {823838AC-4A18-48E9-96C8-FC0EA92E5D5A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {823838AC-4A18-48E9-96C8-FC0EA92E5D5A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {823838AC-4A18-48E9-96C8-FC0EA92E5D5A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {823838AC-4A18-48E9-96C8-FC0EA92E5D5A}.Release|Any CPU.Build.0 = Release|Any CPU - {D68527F7-019B-441D-8AAF-255020B0CDF5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D68527F7-019B-441D-8AAF-255020B0CDF5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D68527F7-019B-441D-8AAF-255020B0CDF5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D68527F7-019B-441D-8AAF-255020B0CDF5}.Release|Any CPU.Build.0 = Release|Any CPU - {06B33BD3-11BB-47FD-BFE6-A3CF39C52B9A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {06B33BD3-11BB-47FD-BFE6-A3CF39C52B9A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {06B33BD3-11BB-47FD-BFE6-A3CF39C52B9A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {06B33BD3-11BB-47FD-BFE6-A3CF39C52B9A}.Release|Any CPU.Build.0 = Release|Any CPU - {6942D5B1-1B1F-4611-A644-FA0149190782}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6942D5B1-1B1F-4611-A644-FA0149190782}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6942D5B1-1B1F-4611-A644-FA0149190782}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6942D5B1-1B1F-4611-A644-FA0149190782}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {DFF5E785-0D64-4C32-AA1A-058FE46A2092}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DFF5E785-0D64-4C32-AA1A-058FE46A2092}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DFF5E785-0D64-4C32-AA1A-058FE46A2092}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DFF5E785-0D64-4C32-AA1A-058FE46A2092}.Release|Any CPU.Build.0 = Release|Any CPU - {6147B8AB-F6C0-4903-950F-6983DB746D42}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6147B8AB-F6C0-4903-950F-6983DB746D42}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6147B8AB-F6C0-4903-950F-6983DB746D42}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6147B8AB-F6C0-4903-950F-6983DB746D42}.Release|Any CPU.Build.0 = Release|Any CPU - {29974EA1-4A53-4281-B098-A15C4814FE64}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {29974EA1-4A53-4281-B098-A15C4814FE64}.Debug|Any CPU.Build.0 = Debug|Any CPU - {29974EA1-4A53-4281-B098-A15C4814FE64}.Release|Any CPU.ActiveCfg = Release|Any CPU - {29974EA1-4A53-4281-B098-A15C4814FE64}.Release|Any CPU.Build.0 = Release|Any CPU - {5EA75B18-6DE2-4D0F-8B2E-C164A229E401}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5EA75B18-6DE2-4D0F-8B2E-C164A229E401}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5EA75B18-6DE2-4D0F-8B2E-C164A229E401}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5EA75B18-6DE2-4D0F-8B2E-C164A229E401}.Release|Any CPU.Build.0 = Release|Any CPU - {F6E2F869-FB3B-4F0B-8354-3C42C614CA53}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F6E2F869-FB3B-4F0B-8354-3C42C614CA53}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F6E2F869-FB3B-4F0B-8354-3C42C614CA53}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F6E2F869-FB3B-4F0B-8354-3C42C614CA53}.Release|Any CPU.Build.0 = Release|Any CPU - {11F9DAB2-3B64-4384-B550-50538CE59B50}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {11F9DAB2-3B64-4384-B550-50538CE59B50}.Debug|Any CPU.Build.0 = Debug|Any CPU - {11F9DAB2-3B64-4384-B550-50538CE59B50}.Release|Any CPU.ActiveCfg = Release|Any CPU - {11F9DAB2-3B64-4384-B550-50538CE59B50}.Release|Any CPU.Build.0 = Release|Any CPU - {823838AC-4A18-48E9-96C8-FC0EA92E5D5A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {823838AC-4A18-48E9-96C8-FC0EA92E5D5A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {823838AC-4A18-48E9-96C8-FC0EA92E5D5A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {823838AC-4A18-48E9-96C8-FC0EA92E5D5A}.Release|Any CPU.Build.0 = Release|Any CPU - {D68527F7-019B-441D-8AAF-255020B0CDF5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D68527F7-019B-441D-8AAF-255020B0CDF5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D68527F7-019B-441D-8AAF-255020B0CDF5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D68527F7-019B-441D-8AAF-255020B0CDF5}.Release|Any CPU.Build.0 = Release|Any CPU - {06B33BD3-11BB-47FD-BFE6-A3CF39C52B9A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {06B33BD3-11BB-47FD-BFE6-A3CF39C52B9A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {06B33BD3-11BB-47FD-BFE6-A3CF39C52B9A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {06B33BD3-11BB-47FD-BFE6-A3CF39C52B9A}.Release|Any CPU.Build.0 = Release|Any CPU - {6942D5B1-1B1F-4611-A644-FA0149190782}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6942D5B1-1B1F-4611-A644-FA0149190782}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6942D5B1-1B1F-4611-A644-FA0149190782}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6942D5B1-1B1F-4611-A644-FA0149190782}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {41EA40BA-04B1-47DE-BDE8-A4573EF2D1B3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {47776980-853D-4C20-8A70-5064725A532F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {C96BCEA2-6AD2-4FA9-AF99-067DF3E17B6B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {47937124-8956-4F9F-8D0E-5ADEECCF2DC0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {2ED505CE-65E8-4F37-A6FA-8AD847585374} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {DFF5E785-0D64-4C32-AA1A-058FE46A2092} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6147B8AB-F6C0-4903-950F-6983DB746D42} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {29974EA1-4A53-4281-B098-A15C4814FE64} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {5EA75B18-6DE2-4D0F-8B2E-C164A229E401} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F6E2F869-FB3B-4F0B-8354-3C42C614CA53} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {11F9DAB2-3B64-4384-B550-50538CE59B50} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {823838AC-4A18-48E9-96C8-FC0EA92E5D5A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D68527F7-019B-441D-8AAF-255020B0CDF5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {06B33BD3-11BB-47FD-BFE6-A3CF39C52B9A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6942D5B1-1B1F-4611-A644-FA0149190782} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {DFF5E785-0D64-4C32-AA1A-058FE46A2092} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6147B8AB-F6C0-4903-950F-6983DB746D42} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {29974EA1-4A53-4281-B098-A15C4814FE64} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {5EA75B18-6DE2-4D0F-8B2E-C164A229E401} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F6E2F869-FB3B-4F0B-8354-3C42C614CA53} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {11F9DAB2-3B64-4384-B550-50538CE59B50} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {823838AC-4A18-48E9-96C8-FC0EA92E5D5A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D68527F7-019B-441D-8AAF-255020B0CDF5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {06B33BD3-11BB-47FD-BFE6-A3CF39C52B9A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6942D5B1-1B1F-4611-A644-FA0149190782} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {4B86499F-6AD8-464A-B52B-94B193F213DB} diff --git a/sdk/src/Services/IAMRolesAnywhere/Properties/AssemblyInfo.cs b/sdk/src/Services/IAMRolesAnywhere/Properties/AssemblyInfo.cs index 5a67a83df163..33194803b334 100644 --- a/sdk/src/Services/IAMRolesAnywhere/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/IAMRolesAnywhere/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.24")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.51")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/IVS/Generated/AmazonIVSConfig.cs b/sdk/src/Services/IVS/Generated/AmazonIVSConfig.cs index 1465396f8bc5..af3513b75fca 100644 --- a/sdk/src/Services/IVS/Generated/AmazonIVSConfig.cs +++ b/sdk/src/Services/IVS/Generated/AmazonIVSConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.IVS public partial class AmazonIVSConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("ivs", "4.0.0.0"); private static readonly AmazonIVSEndpointResolver EndpointResolver = new AmazonIVSEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("ivs", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("ivs", "3.7.402.2"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/IVS/Generated/Model/Internal/MarshallTransformations/CreateChannelRequestMarshaller.cs b/sdk/src/Services/IVS/Generated/Model/Internal/MarshallTransformations/CreateChannelRequestMarshaller.cs index 2e1fae8bda93..24f0228e72b7 100644 --- a/sdk/src/Services/IVS/Generated/Model/Internal/MarshallTransformations/CreateChannelRequestMarshaller.cs +++ b/sdk/src/Services/IVS/Generated/Model/Internal/MarshallTransformations/CreateChannelRequestMarshaller.cs @@ -75,31 +75,17 @@ public IRequest Marshall(CreateChannelRequest publicRequest) context.Writer.Write(publicRequest.Authorized.Value); } -<<<<<<< HEAD + if(publicRequest.IsSetContainerFormat()) + { + context.Writer.WritePropertyName("containerFormat"); + context.Writer.Write(publicRequest.ContainerFormat); + } + if(publicRequest.IsSetInsecureIngest()) { context.Writer.WritePropertyName("insecureIngest"); context.Writer.Write(publicRequest.InsecureIngest.Value); } -||||||| Commit version number update changes - if(publicRequest.IsSetInsecureIngest()) - { - context.Writer.WritePropertyName("insecureIngest"); - context.Writer.Write(publicRequest.InsecureIngest); - } -======= - if(publicRequest.IsSetContainerFormat()) - { - context.Writer.WritePropertyName("containerFormat"); - context.Writer.Write(publicRequest.ContainerFormat); - } - - if(publicRequest.IsSetInsecureIngest()) - { - context.Writer.WritePropertyName("insecureIngest"); - context.Writer.Write(publicRequest.InsecureIngest); - } ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b if(publicRequest.IsSetLatencyMode()) { @@ -107,36 +93,22 @@ public IRequest Marshall(CreateChannelRequest publicRequest) context.Writer.Write(publicRequest.LatencyMode); } -<<<<<<< HEAD + if(publicRequest.IsSetMultitrackInputConfiguration()) + { + context.Writer.WritePropertyName("multitrackInputConfiguration"); + context.Writer.WriteObjectStart(); + + var marshaller = MultitrackInputConfigurationMarshaller.Instance; + marshaller.Marshall(publicRequest.MultitrackInputConfiguration, context); + + context.Writer.WriteObjectEnd(); + } + if(publicRequest.IsSetName()) { context.Writer.WritePropertyName("name"); context.Writer.Write(publicRequest.Name); } -||||||| Commit version number update changes - if(publicRequest.IsSetName()) - { - context.Writer.WritePropertyName("name"); - context.Writer.Write(publicRequest.Name); - } -======= - if(publicRequest.IsSetMultitrackInputConfiguration()) - { - context.Writer.WritePropertyName("multitrackInputConfiguration"); - context.Writer.WriteObjectStart(); - - var marshaller = MultitrackInputConfigurationMarshaller.Instance; - marshaller.Marshall(publicRequest.MultitrackInputConfiguration, context); - - context.Writer.WriteObjectEnd(); - } - - if(publicRequest.IsSetName()) - { - context.Writer.WritePropertyName("name"); - context.Writer.Write(publicRequest.Name); - } ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b if(publicRequest.IsSetPlaybackRestrictionPolicyArn()) { diff --git a/sdk/src/Services/IVS/Generated/Model/Internal/MarshallTransformations/MultitrackInputConfigurationMarshaller.cs b/sdk/src/Services/IVS/Generated/Model/Internal/MarshallTransformations/MultitrackInputConfigurationMarshaller.cs index e4f2daace562..1d09fc27550d 100644 --- a/sdk/src/Services/IVS/Generated/Model/Internal/MarshallTransformations/MultitrackInputConfigurationMarshaller.cs +++ b/sdk/src/Services/IVS/Generated/Model/Internal/MarshallTransformations/MultitrackInputConfigurationMarshaller.cs @@ -51,7 +51,7 @@ public void Marshall(MultitrackInputConfiguration requestObject, JsonMarshallerC if(requestObject.IsSetEnabled()) { context.Writer.WritePropertyName("enabled"); - context.Writer.Write(requestObject.Enabled); + context.Writer.Write(requestObject.Enabled.Value); } if(requestObject.IsSetMaximumResolution()) diff --git a/sdk/src/Services/IVS/Generated/Model/Internal/MarshallTransformations/MultitrackInputConfigurationUnmarshaller.cs b/sdk/src/Services/IVS/Generated/Model/Internal/MarshallTransformations/MultitrackInputConfigurationUnmarshaller.cs index b5907920e781..4a1559087db7 100644 --- a/sdk/src/Services/IVS/Generated/Model/Internal/MarshallTransformations/MultitrackInputConfigurationUnmarshaller.cs +++ b/sdk/src/Services/IVS/Generated/Model/Internal/MarshallTransformations/MultitrackInputConfigurationUnmarshaller.cs @@ -68,7 +68,7 @@ public MultitrackInputConfiguration Unmarshall(JsonUnmarshallerContext context) { if (context.TestExpression("enabled", targetDepth)) { - var unmarshaller = BoolUnmarshaller.Instance; + var unmarshaller = NullableBoolUnmarshaller.Instance; unmarshalledObject.Enabled = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/IVS/Generated/Model/Internal/MarshallTransformations/UpdateChannelRequestMarshaller.cs b/sdk/src/Services/IVS/Generated/Model/Internal/MarshallTransformations/UpdateChannelRequestMarshaller.cs index 625a01ea2627..88ae9c209e98 100644 --- a/sdk/src/Services/IVS/Generated/Model/Internal/MarshallTransformations/UpdateChannelRequestMarshaller.cs +++ b/sdk/src/Services/IVS/Generated/Model/Internal/MarshallTransformations/UpdateChannelRequestMarshaller.cs @@ -81,6 +81,12 @@ public IRequest Marshall(UpdateChannelRequest publicRequest) context.Writer.Write(publicRequest.Authorized.Value); } + if(publicRequest.IsSetContainerFormat()) + { + context.Writer.WritePropertyName("containerFormat"); + context.Writer.Write(publicRequest.ContainerFormat); + } + if(publicRequest.IsSetInsecureIngest()) { context.Writer.WritePropertyName("insecureIngest"); @@ -93,6 +99,17 @@ public IRequest Marshall(UpdateChannelRequest publicRequest) context.Writer.Write(publicRequest.LatencyMode); } + if(publicRequest.IsSetMultitrackInputConfiguration()) + { + context.Writer.WritePropertyName("multitrackInputConfiguration"); + context.Writer.WriteObjectStart(); + + var marshaller = MultitrackInputConfigurationMarshaller.Instance; + marshaller.Marshall(publicRequest.MultitrackInputConfiguration, context); + + context.Writer.WriteObjectEnd(); + } + if(publicRequest.IsSetName()) { context.Writer.WritePropertyName("name"); @@ -126,130 +143,7 @@ public IRequest Marshall(UpdateChannelRequest publicRequest) writer.WriteObjectEnd(); } -<<<<<<< HEAD request.Content = memoryStream.ToArray(); -||||||| Commit version number update changes - if(publicRequest.IsSetAuthorized()) - { - context.Writer.WritePropertyName("authorized"); - context.Writer.Write(publicRequest.Authorized); - } - - if(publicRequest.IsSetInsecureIngest()) - { - context.Writer.WritePropertyName("insecureIngest"); - context.Writer.Write(publicRequest.InsecureIngest); - } - - if(publicRequest.IsSetLatencyMode()) - { - context.Writer.WritePropertyName("latencyMode"); - context.Writer.Write(publicRequest.LatencyMode); - } - - if(publicRequest.IsSetName()) - { - context.Writer.WritePropertyName("name"); - context.Writer.Write(publicRequest.Name); - } - - if(publicRequest.IsSetPlaybackRestrictionPolicyArn()) - { - context.Writer.WritePropertyName("playbackRestrictionPolicyArn"); - context.Writer.Write(publicRequest.PlaybackRestrictionPolicyArn); - } - - if(publicRequest.IsSetPreset()) - { - context.Writer.WritePropertyName("preset"); - context.Writer.Write(publicRequest.Preset); - } - - if(publicRequest.IsSetRecordingConfigurationArn()) - { - context.Writer.WritePropertyName("recordingConfigurationArn"); - context.Writer.Write(publicRequest.RecordingConfigurationArn); - } - - if(publicRequest.IsSetType()) - { - context.Writer.WritePropertyName("type"); - context.Writer.Write(publicRequest.Type); - } - - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); -======= - if(publicRequest.IsSetAuthorized()) - { - context.Writer.WritePropertyName("authorized"); - context.Writer.Write(publicRequest.Authorized); - } - - if(publicRequest.IsSetContainerFormat()) - { - context.Writer.WritePropertyName("containerFormat"); - context.Writer.Write(publicRequest.ContainerFormat); - } - - if(publicRequest.IsSetInsecureIngest()) - { - context.Writer.WritePropertyName("insecureIngest"); - context.Writer.Write(publicRequest.InsecureIngest); - } - - if(publicRequest.IsSetLatencyMode()) - { - context.Writer.WritePropertyName("latencyMode"); - context.Writer.Write(publicRequest.LatencyMode); - } - - if(publicRequest.IsSetMultitrackInputConfiguration()) - { - context.Writer.WritePropertyName("multitrackInputConfiguration"); - context.Writer.WriteObjectStart(); - - var marshaller = MultitrackInputConfigurationMarshaller.Instance; - marshaller.Marshall(publicRequest.MultitrackInputConfiguration, context); - - context.Writer.WriteObjectEnd(); - } - - if(publicRequest.IsSetName()) - { - context.Writer.WritePropertyName("name"); - context.Writer.Write(publicRequest.Name); - } - - if(publicRequest.IsSetPlaybackRestrictionPolicyArn()) - { - context.Writer.WritePropertyName("playbackRestrictionPolicyArn"); - context.Writer.Write(publicRequest.PlaybackRestrictionPolicyArn); - } - - if(publicRequest.IsSetPreset()) - { - context.Writer.WritePropertyName("preset"); - context.Writer.Write(publicRequest.Preset); - } - - if(publicRequest.IsSetRecordingConfigurationArn()) - { - context.Writer.WritePropertyName("recordingConfigurationArn"); - context.Writer.Write(publicRequest.RecordingConfigurationArn); - } - - if(publicRequest.IsSetType()) - { - context.Writer.WritePropertyName("type"); - context.Writer.Write(publicRequest.Type); - } - - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b } diff --git a/sdk/src/Services/IVS/Generated/Model/MultitrackInputConfiguration.cs b/sdk/src/Services/IVS/Generated/Model/MultitrackInputConfiguration.cs index 61e0a4ecf3e1..c65696c903cc 100644 --- a/sdk/src/Services/IVS/Generated/Model/MultitrackInputConfiguration.cs +++ b/sdk/src/Services/IVS/Generated/Model/MultitrackInputConfiguration.cs @@ -48,9 +48,9 @@ public partial class MultitrackInputConfiguration /// FRAGMENTED_MP4. Default: false. /// /// - public bool Enabled + public bool? Enabled { - get { return this._enabled.GetValueOrDefault(); } + get { return this._enabled; } set { this._enabled = value; } } diff --git a/sdk/src/Services/IVS/IVS.sln b/sdk/src/Services/IVS/IVS.sln index 719ec1f550e2..852b4986daee 100644 --- a/sdk/src/Services/IVS/IVS.sln +++ b/sdk/src/Services/IVS/IVS.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {CB300920-4B98-47D5-A4D5-B1495EF37868}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {CB300920-4B98-47D5-A4D5-B1495EF37868}.Debug|Any CPU.Build.0 = Debug|Any CPU {CB300920-4B98-47D5-A4D5-B1495EF37868}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {EDEF0659-F8B4-4124-B93C-E88EC92C4E9F}.Debug|Any CPU.Build.0 = Debug|Any CPU {EDEF0659-F8B4-4124-B93C-E88EC92C4E9F}.Release|Any CPU.ActiveCfg = Release|Any CPU {EDEF0659-F8B4-4124-B93C-E88EC92C4E9F}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {1DF54381-5030-4C98-830F-430A2E54FFD0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1DF54381-5030-4C98-830F-430A2E54FFD0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1DF54381-5030-4C98-830F-430A2E54FFD0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1DF54381-5030-4C98-830F-430A2E54FFD0}.Release|Any CPU.Build.0 = Release|Any CPU - {B7A89F73-0C9C-47D5-B61C-39A989771FE9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B7A89F73-0C9C-47D5-B61C-39A989771FE9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B7A89F73-0C9C-47D5-B61C-39A989771FE9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B7A89F73-0C9C-47D5-B61C-39A989771FE9}.Release|Any CPU.Build.0 = Release|Any CPU - {78F60B5E-FCD7-4B53-9B0D-07A5377A67BD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {78F60B5E-FCD7-4B53-9B0D-07A5377A67BD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {78F60B5E-FCD7-4B53-9B0D-07A5377A67BD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {78F60B5E-FCD7-4B53-9B0D-07A5377A67BD}.Release|Any CPU.Build.0 = Release|Any CPU - {6BDD7B13-0B43-4A1A-953C-F8356D18AB97}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6BDD7B13-0B43-4A1A-953C-F8356D18AB97}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6BDD7B13-0B43-4A1A-953C-F8356D18AB97}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6BDD7B13-0B43-4A1A-953C-F8356D18AB97}.Release|Any CPU.Build.0 = Release|Any CPU - {B07E8F9F-C122-4A07-9EF3-B677BE2E21C8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B07E8F9F-C122-4A07-9EF3-B677BE2E21C8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B07E8F9F-C122-4A07-9EF3-B677BE2E21C8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B07E8F9F-C122-4A07-9EF3-B677BE2E21C8}.Release|Any CPU.Build.0 = Release|Any CPU - {037A1A07-A9FA-43CB-8056-7F725B7FF560}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {037A1A07-A9FA-43CB-8056-7F725B7FF560}.Debug|Any CPU.Build.0 = Debug|Any CPU - {037A1A07-A9FA-43CB-8056-7F725B7FF560}.Release|Any CPU.ActiveCfg = Release|Any CPU - {037A1A07-A9FA-43CB-8056-7F725B7FF560}.Release|Any CPU.Build.0 = Release|Any CPU - {5AD34643-76B3-4DD1-A1F3-84F957966F9A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5AD34643-76B3-4DD1-A1F3-84F957966F9A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5AD34643-76B3-4DD1-A1F3-84F957966F9A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5AD34643-76B3-4DD1-A1F3-84F957966F9A}.Release|Any CPU.Build.0 = Release|Any CPU - {D7F87970-4B90-464F-9B0A-0BCAC103CA24}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D7F87970-4B90-464F-9B0A-0BCAC103CA24}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D7F87970-4B90-464F-9B0A-0BCAC103CA24}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D7F87970-4B90-464F-9B0A-0BCAC103CA24}.Release|Any CPU.Build.0 = Release|Any CPU - {0F7BE4DC-B08D-4B3A-8958-A3E8460FA7C3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0F7BE4DC-B08D-4B3A-8958-A3E8460FA7C3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0F7BE4DC-B08D-4B3A-8958-A3E8460FA7C3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0F7BE4DC-B08D-4B3A-8958-A3E8460FA7C3}.Release|Any CPU.Build.0 = Release|Any CPU - {7B20D291-0F04-4A3F-A597-335FB423B940}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7B20D291-0F04-4A3F-A597-335FB423B940}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7B20D291-0F04-4A3F-A597-335FB423B940}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7B20D291-0F04-4A3F-A597-335FB423B940}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {1DF54381-5030-4C98-830F-430A2E54FFD0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1DF54381-5030-4C98-830F-430A2E54FFD0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1DF54381-5030-4C98-830F-430A2E54FFD0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1DF54381-5030-4C98-830F-430A2E54FFD0}.Release|Any CPU.Build.0 = Release|Any CPU - {B7A89F73-0C9C-47D5-B61C-39A989771FE9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B7A89F73-0C9C-47D5-B61C-39A989771FE9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B7A89F73-0C9C-47D5-B61C-39A989771FE9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B7A89F73-0C9C-47D5-B61C-39A989771FE9}.Release|Any CPU.Build.0 = Release|Any CPU - {78F60B5E-FCD7-4B53-9B0D-07A5377A67BD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {78F60B5E-FCD7-4B53-9B0D-07A5377A67BD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {78F60B5E-FCD7-4B53-9B0D-07A5377A67BD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {78F60B5E-FCD7-4B53-9B0D-07A5377A67BD}.Release|Any CPU.Build.0 = Release|Any CPU - {6BDD7B13-0B43-4A1A-953C-F8356D18AB97}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6BDD7B13-0B43-4A1A-953C-F8356D18AB97}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6BDD7B13-0B43-4A1A-953C-F8356D18AB97}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6BDD7B13-0B43-4A1A-953C-F8356D18AB97}.Release|Any CPU.Build.0 = Release|Any CPU - {B07E8F9F-C122-4A07-9EF3-B677BE2E21C8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B07E8F9F-C122-4A07-9EF3-B677BE2E21C8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B07E8F9F-C122-4A07-9EF3-B677BE2E21C8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B07E8F9F-C122-4A07-9EF3-B677BE2E21C8}.Release|Any CPU.Build.0 = Release|Any CPU - {037A1A07-A9FA-43CB-8056-7F725B7FF560}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {037A1A07-A9FA-43CB-8056-7F725B7FF560}.Debug|Any CPU.Build.0 = Debug|Any CPU - {037A1A07-A9FA-43CB-8056-7F725B7FF560}.Release|Any CPU.ActiveCfg = Release|Any CPU - {037A1A07-A9FA-43CB-8056-7F725B7FF560}.Release|Any CPU.Build.0 = Release|Any CPU - {5AD34643-76B3-4DD1-A1F3-84F957966F9A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5AD34643-76B3-4DD1-A1F3-84F957966F9A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5AD34643-76B3-4DD1-A1F3-84F957966F9A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5AD34643-76B3-4DD1-A1F3-84F957966F9A}.Release|Any CPU.Build.0 = Release|Any CPU - {D7F87970-4B90-464F-9B0A-0BCAC103CA24}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D7F87970-4B90-464F-9B0A-0BCAC103CA24}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D7F87970-4B90-464F-9B0A-0BCAC103CA24}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D7F87970-4B90-464F-9B0A-0BCAC103CA24}.Release|Any CPU.Build.0 = Release|Any CPU - {0F7BE4DC-B08D-4B3A-8958-A3E8460FA7C3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0F7BE4DC-B08D-4B3A-8958-A3E8460FA7C3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0F7BE4DC-B08D-4B3A-8958-A3E8460FA7C3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0F7BE4DC-B08D-4B3A-8958-A3E8460FA7C3}.Release|Any CPU.Build.0 = Release|Any CPU - {7B20D291-0F04-4A3F-A597-335FB423B940}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7B20D291-0F04-4A3F-A597-335FB423B940}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7B20D291-0F04-4A3F-A597-335FB423B940}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7B20D291-0F04-4A3F-A597-335FB423B940}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {CB300920-4B98-47D5-A4D5-B1495EF37868} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {29C5F337-0A68-4320-BE30-57DA79455106} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {7ADA988E-0748-4128-99C6-F778AB2A1991} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {8EE4BF55-BF26-40F4-A5F3-CE0C471D3091} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {EDEF0659-F8B4-4124-B93C-E88EC92C4E9F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {1DF54381-5030-4C98-830F-430A2E54FFD0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B7A89F73-0C9C-47D5-B61C-39A989771FE9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {78F60B5E-FCD7-4B53-9B0D-07A5377A67BD} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6BDD7B13-0B43-4A1A-953C-F8356D18AB97} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B07E8F9F-C122-4A07-9EF3-B677BE2E21C8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {037A1A07-A9FA-43CB-8056-7F725B7FF560} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {5AD34643-76B3-4DD1-A1F3-84F957966F9A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D7F87970-4B90-464F-9B0A-0BCAC103CA24} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0F7BE4DC-B08D-4B3A-8958-A3E8460FA7C3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {7B20D291-0F04-4A3F-A597-335FB423B940} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {1DF54381-5030-4C98-830F-430A2E54FFD0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B7A89F73-0C9C-47D5-B61C-39A989771FE9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {78F60B5E-FCD7-4B53-9B0D-07A5377A67BD} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6BDD7B13-0B43-4A1A-953C-F8356D18AB97} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B07E8F9F-C122-4A07-9EF3-B677BE2E21C8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {037A1A07-A9FA-43CB-8056-7F725B7FF560} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {5AD34643-76B3-4DD1-A1F3-84F957966F9A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D7F87970-4B90-464F-9B0A-0BCAC103CA24} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0F7BE4DC-B08D-4B3A-8958-A3E8460FA7C3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {7B20D291-0F04-4A3F-A597-335FB423B940} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {CD710248-58B9-40B7-9A39-523F9EA027C0} diff --git a/sdk/src/Services/IVS/Properties/AssemblyInfo.cs b/sdk/src/Services/IVS/Properties/AssemblyInfo.cs index a768a410b3fd..560de7992cb1 100644 --- a/sdk/src/Services/IVS/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/IVS/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.402.2")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/IVSRealTime/Generated/AmazonIVSRealTimeConfig.cs b/sdk/src/Services/IVSRealTime/Generated/AmazonIVSRealTimeConfig.cs index a65706f0c79c..d6ea60281db4 100644 --- a/sdk/src/Services/IVSRealTime/Generated/AmazonIVSRealTimeConfig.cs +++ b/sdk/src/Services/IVSRealTime/Generated/AmazonIVSRealTimeConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.IVSRealTime public partial class AmazonIVSRealTimeConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("IVS RealTime", "4.0.0.0"); private static readonly AmazonIVSRealTimeEndpointResolver EndpointResolver = new AmazonIVSRealTimeEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("IVS RealTime", "3.7.401.9"); -======= - InternalSDKUtils.BuildUserAgentString("IVS RealTime", "3.7.402.25"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/IVSRealTime/Generated/Model/Video.cs b/sdk/src/Services/IVSRealTime/Generated/Model/Video.cs index 347b8e6d4c58..1512bda53549 100644 --- a/sdk/src/Services/IVSRealTime/Generated/Model/Video.cs +++ b/sdk/src/Services/IVSRealTime/Generated/Model/Video.cs @@ -85,16 +85,8 @@ internal bool IsSetFramerate() /// is 2073600 (1920x1080 or 1080x1920). Default: 720. /// /// -<<<<<<< HEAD - [AWSProperty(Min=1, Max=1920)] - public int? Height -||||||| Commit version number update changes - [AWSProperty(Min=1, Max=1920)] - public int Height -======= [AWSProperty(Min=2, Max=1920)] - public int Height ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b + public int? Height { get { return this._height; } set { this._height = value; } @@ -114,16 +106,8 @@ internal bool IsSetHeight() /// is 2073600 (1920x1080 or 1080x1920). Default: 1280. /// /// -<<<<<<< HEAD - [AWSProperty(Min=1, Max=1920)] - public int? Width -||||||| Commit version number update changes - [AWSProperty(Min=1, Max=1920)] - public int Width -======= [AWSProperty(Min=2, Max=1920)] - public int Width ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b + public int? Width { get { return this._width; } set { this._width = value; } diff --git a/sdk/src/Services/IVSRealTime/IVSRealTime.sln b/sdk/src/Services/IVSRealTime/IVSRealTime.sln index c2a4ca5ab437..fcdc1df5fefa 100644 --- a/sdk/src/Services/IVSRealTime/IVSRealTime.sln +++ b/sdk/src/Services/IVSRealTime/IVSRealTime.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {4C0560A7-454A-43AF-ABD5-D1F05A28BC09}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {4C0560A7-454A-43AF-ABD5-D1F05A28BC09}.Debug|Any CPU.Build.0 = Debug|Any CPU {4C0560A7-454A-43AF-ABD5-D1F05A28BC09}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {CFD1C187-D5A9-41D8-8413-EE154D307BCF}.Debug|Any CPU.Build.0 = Debug|Any CPU {CFD1C187-D5A9-41D8-8413-EE154D307BCF}.Release|Any CPU.ActiveCfg = Release|Any CPU {CFD1C187-D5A9-41D8-8413-EE154D307BCF}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {257A0EA0-B93E-45EB-9BA5-4190401B78DE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {257A0EA0-B93E-45EB-9BA5-4190401B78DE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {257A0EA0-B93E-45EB-9BA5-4190401B78DE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {257A0EA0-B93E-45EB-9BA5-4190401B78DE}.Release|Any CPU.Build.0 = Release|Any CPU - {4FCF9BB2-19B3-4C7A-ABB3-B5A73C6E91F9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4FCF9BB2-19B3-4C7A-ABB3-B5A73C6E91F9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4FCF9BB2-19B3-4C7A-ABB3-B5A73C6E91F9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4FCF9BB2-19B3-4C7A-ABB3-B5A73C6E91F9}.Release|Any CPU.Build.0 = Release|Any CPU - {69DE650F-820D-4786-BE5B-FE4DFF140AA5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {69DE650F-820D-4786-BE5B-FE4DFF140AA5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {69DE650F-820D-4786-BE5B-FE4DFF140AA5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {69DE650F-820D-4786-BE5B-FE4DFF140AA5}.Release|Any CPU.Build.0 = Release|Any CPU - {AC388531-F800-4DB5-9593-2FD46ADD9367}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AC388531-F800-4DB5-9593-2FD46ADD9367}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AC388531-F800-4DB5-9593-2FD46ADD9367}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AC388531-F800-4DB5-9593-2FD46ADD9367}.Release|Any CPU.Build.0 = Release|Any CPU - {07AC09CB-A746-40E9-83B8-7203EF882C2D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {07AC09CB-A746-40E9-83B8-7203EF882C2D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {07AC09CB-A746-40E9-83B8-7203EF882C2D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {07AC09CB-A746-40E9-83B8-7203EF882C2D}.Release|Any CPU.Build.0 = Release|Any CPU - {02F74A3C-1FD5-45B2-A485-C462FC047425}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {02F74A3C-1FD5-45B2-A485-C462FC047425}.Debug|Any CPU.Build.0 = Debug|Any CPU - {02F74A3C-1FD5-45B2-A485-C462FC047425}.Release|Any CPU.ActiveCfg = Release|Any CPU - {02F74A3C-1FD5-45B2-A485-C462FC047425}.Release|Any CPU.Build.0 = Release|Any CPU - {010D3356-0626-4E37-8FDF-A6FF02C3A5FF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {010D3356-0626-4E37-8FDF-A6FF02C3A5FF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {010D3356-0626-4E37-8FDF-A6FF02C3A5FF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {010D3356-0626-4E37-8FDF-A6FF02C3A5FF}.Release|Any CPU.Build.0 = Release|Any CPU - {7B17D0DA-24A8-41A3-B0DB-3BAB2EA63051}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7B17D0DA-24A8-41A3-B0DB-3BAB2EA63051}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7B17D0DA-24A8-41A3-B0DB-3BAB2EA63051}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7B17D0DA-24A8-41A3-B0DB-3BAB2EA63051}.Release|Any CPU.Build.0 = Release|Any CPU - {6B68420C-2333-4000-BF5D-A80AFF8EC5B9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6B68420C-2333-4000-BF5D-A80AFF8EC5B9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6B68420C-2333-4000-BF5D-A80AFF8EC5B9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6B68420C-2333-4000-BF5D-A80AFF8EC5B9}.Release|Any CPU.Build.0 = Release|Any CPU - {7A145936-D4D3-41C2-A155-C40D448B900B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7A145936-D4D3-41C2-A155-C40D448B900B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7A145936-D4D3-41C2-A155-C40D448B900B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7A145936-D4D3-41C2-A155-C40D448B900B}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {257A0EA0-B93E-45EB-9BA5-4190401B78DE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {257A0EA0-B93E-45EB-9BA5-4190401B78DE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {257A0EA0-B93E-45EB-9BA5-4190401B78DE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {257A0EA0-B93E-45EB-9BA5-4190401B78DE}.Release|Any CPU.Build.0 = Release|Any CPU - {4FCF9BB2-19B3-4C7A-ABB3-B5A73C6E91F9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4FCF9BB2-19B3-4C7A-ABB3-B5A73C6E91F9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4FCF9BB2-19B3-4C7A-ABB3-B5A73C6E91F9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4FCF9BB2-19B3-4C7A-ABB3-B5A73C6E91F9}.Release|Any CPU.Build.0 = Release|Any CPU - {69DE650F-820D-4786-BE5B-FE4DFF140AA5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {69DE650F-820D-4786-BE5B-FE4DFF140AA5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {69DE650F-820D-4786-BE5B-FE4DFF140AA5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {69DE650F-820D-4786-BE5B-FE4DFF140AA5}.Release|Any CPU.Build.0 = Release|Any CPU - {AC388531-F800-4DB5-9593-2FD46ADD9367}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AC388531-F800-4DB5-9593-2FD46ADD9367}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AC388531-F800-4DB5-9593-2FD46ADD9367}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AC388531-F800-4DB5-9593-2FD46ADD9367}.Release|Any CPU.Build.0 = Release|Any CPU - {07AC09CB-A746-40E9-83B8-7203EF882C2D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {07AC09CB-A746-40E9-83B8-7203EF882C2D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {07AC09CB-A746-40E9-83B8-7203EF882C2D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {07AC09CB-A746-40E9-83B8-7203EF882C2D}.Release|Any CPU.Build.0 = Release|Any CPU - {02F74A3C-1FD5-45B2-A485-C462FC047425}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {02F74A3C-1FD5-45B2-A485-C462FC047425}.Debug|Any CPU.Build.0 = Debug|Any CPU - {02F74A3C-1FD5-45B2-A485-C462FC047425}.Release|Any CPU.ActiveCfg = Release|Any CPU - {02F74A3C-1FD5-45B2-A485-C462FC047425}.Release|Any CPU.Build.0 = Release|Any CPU - {010D3356-0626-4E37-8FDF-A6FF02C3A5FF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {010D3356-0626-4E37-8FDF-A6FF02C3A5FF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {010D3356-0626-4E37-8FDF-A6FF02C3A5FF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {010D3356-0626-4E37-8FDF-A6FF02C3A5FF}.Release|Any CPU.Build.0 = Release|Any CPU - {7B17D0DA-24A8-41A3-B0DB-3BAB2EA63051}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7B17D0DA-24A8-41A3-B0DB-3BAB2EA63051}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7B17D0DA-24A8-41A3-B0DB-3BAB2EA63051}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7B17D0DA-24A8-41A3-B0DB-3BAB2EA63051}.Release|Any CPU.Build.0 = Release|Any CPU - {6B68420C-2333-4000-BF5D-A80AFF8EC5B9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6B68420C-2333-4000-BF5D-A80AFF8EC5B9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6B68420C-2333-4000-BF5D-A80AFF8EC5B9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6B68420C-2333-4000-BF5D-A80AFF8EC5B9}.Release|Any CPU.Build.0 = Release|Any CPU - {7A145936-D4D3-41C2-A155-C40D448B900B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7A145936-D4D3-41C2-A155-C40D448B900B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7A145936-D4D3-41C2-A155-C40D448B900B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7A145936-D4D3-41C2-A155-C40D448B900B}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {4C0560A7-454A-43AF-ABD5-D1F05A28BC09} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {C9F7CB51-A3C8-4BA1-940C-49191C9B75CD} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {888340FE-F6CB-45B6-AB14-5E7B3BC697C8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {17B75A66-C841-4054-A1BE-1AA1E69B52DA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {CFD1C187-D5A9-41D8-8413-EE154D307BCF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {257A0EA0-B93E-45EB-9BA5-4190401B78DE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4FCF9BB2-19B3-4C7A-ABB3-B5A73C6E91F9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {69DE650F-820D-4786-BE5B-FE4DFF140AA5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {AC388531-F800-4DB5-9593-2FD46ADD9367} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {07AC09CB-A746-40E9-83B8-7203EF882C2D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {02F74A3C-1FD5-45B2-A485-C462FC047425} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {010D3356-0626-4E37-8FDF-A6FF02C3A5FF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {7B17D0DA-24A8-41A3-B0DB-3BAB2EA63051} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6B68420C-2333-4000-BF5D-A80AFF8EC5B9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {7A145936-D4D3-41C2-A155-C40D448B900B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {257A0EA0-B93E-45EB-9BA5-4190401B78DE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4FCF9BB2-19B3-4C7A-ABB3-B5A73C6E91F9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {69DE650F-820D-4786-BE5B-FE4DFF140AA5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {AC388531-F800-4DB5-9593-2FD46ADD9367} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {07AC09CB-A746-40E9-83B8-7203EF882C2D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {02F74A3C-1FD5-45B2-A485-C462FC047425} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {010D3356-0626-4E37-8FDF-A6FF02C3A5FF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {7B17D0DA-24A8-41A3-B0DB-3BAB2EA63051} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6B68420C-2333-4000-BF5D-A80AFF8EC5B9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {7A145936-D4D3-41C2-A155-C40D448B900B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {8401309D-0801-4ACF-A14B-C68142CA8E79} diff --git a/sdk/src/Services/IVSRealTime/Properties/AssemblyInfo.cs b/sdk/src/Services/IVSRealTime/Properties/AssemblyInfo.cs index a6af53c9cf6a..89d527a4bfc6 100644 --- a/sdk/src/Services/IVSRealTime/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/IVSRealTime/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.9")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.402.25")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/IdentityManagement/Generated/AmazonIdentityManagementServiceConfig.cs b/sdk/src/Services/IdentityManagement/Generated/AmazonIdentityManagementServiceConfig.cs index 9a51dbb07bc2..a3566f1e7ac5 100644 --- a/sdk/src/Services/IdentityManagement/Generated/AmazonIdentityManagementServiceConfig.cs +++ b/sdk/src/Services/IdentityManagement/Generated/AmazonIdentityManagementServiceConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.IdentityManagement public partial class AmazonIdentityManagementServiceConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("IAM", "4.0.0.0"); private static readonly AmazonIdentityManagementServiceEndpointResolver EndpointResolver = new AmazonIdentityManagementServiceEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("IAM", "3.7.402.20"); -======= - InternalSDKUtils.BuildUserAgentString("IAM", "3.7.403.2"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/IdentityManagement/Generated/Model/AccountNotManagementOrDelegatedAdministratorException.cs b/sdk/src/Services/IdentityManagement/Generated/Model/AccountNotManagementOrDelegatedAdministratorException.cs index 5a1f54d6b4d5..c2ef607eea9a 100644 --- a/sdk/src/Services/IdentityManagement/Generated/Model/AccountNotManagementOrDelegatedAdministratorException.cs +++ b/sdk/src/Services/IdentityManagement/Generated/Model/AccountNotManagementOrDelegatedAdministratorException.cs @@ -108,11 +108,6 @@ protected AccountNotManagementOrDelegatedAdministratorException(System.Runtime.S /// The that holds the serialized object data about the exception being thrown. /// The that contains contextual information about the source or destination. /// The parameter is a null reference (Nothing in Visual Basic). -#if BCL35 - [System.Security.Permissions.SecurityPermission( - System.Security.Permissions.SecurityAction.LinkDemand, - Flags = System.Security.Permissions.SecurityPermissionFlag.SerializationFormatter)] -#endif [System.Security.SecurityCritical] // These FxCop rules are giving false-positives for this method [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Security", "CA2123:OverrideLinkDemandsShouldBeIdenticalToBase")] diff --git a/sdk/src/Services/IdentityManagement/Generated/Model/CallerIsNotManagementAccountException.cs b/sdk/src/Services/IdentityManagement/Generated/Model/CallerIsNotManagementAccountException.cs index 777268f9ee0b..ae8ecccadae7 100644 --- a/sdk/src/Services/IdentityManagement/Generated/Model/CallerIsNotManagementAccountException.cs +++ b/sdk/src/Services/IdentityManagement/Generated/Model/CallerIsNotManagementAccountException.cs @@ -107,11 +107,6 @@ protected CallerIsNotManagementAccountException(System.Runtime.Serialization.Ser /// The that holds the serialized object data about the exception being thrown. /// The that contains contextual information about the source or destination. /// The parameter is a null reference (Nothing in Visual Basic). -#if BCL35 - [System.Security.Permissions.SecurityPermission( - System.Security.Permissions.SecurityAction.LinkDemand, - Flags = System.Security.Permissions.SecurityPermissionFlag.SerializationFormatter)] -#endif [System.Security.SecurityCritical] // These FxCop rules are giving false-positives for this method [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Security", "CA2123:OverrideLinkDemandsShouldBeIdenticalToBase")] diff --git a/sdk/src/Services/IdentityManagement/Generated/Model/OrganizationNotFoundException.cs b/sdk/src/Services/IdentityManagement/Generated/Model/OrganizationNotFoundException.cs index 1b60fdc1328d..f9558b0a3f9b 100644 --- a/sdk/src/Services/IdentityManagement/Generated/Model/OrganizationNotFoundException.cs +++ b/sdk/src/Services/IdentityManagement/Generated/Model/OrganizationNotFoundException.cs @@ -106,11 +106,6 @@ protected OrganizationNotFoundException(System.Runtime.Serialization.Serializati /// The that holds the serialized object data about the exception being thrown. /// The that contains contextual information about the source or destination. /// The parameter is a null reference (Nothing in Visual Basic). -#if BCL35 - [System.Security.Permissions.SecurityPermission( - System.Security.Permissions.SecurityAction.LinkDemand, - Flags = System.Security.Permissions.SecurityPermissionFlag.SerializationFormatter)] -#endif [System.Security.SecurityCritical] // These FxCop rules are giving false-positives for this method [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Security", "CA2123:OverrideLinkDemandsShouldBeIdenticalToBase")] diff --git a/sdk/src/Services/IdentityManagement/Generated/Model/OrganizationNotInAllFeaturesModeException.cs b/sdk/src/Services/IdentityManagement/Generated/Model/OrganizationNotInAllFeaturesModeException.cs index 6113b1cdaac6..abf8daa223be 100644 --- a/sdk/src/Services/IdentityManagement/Generated/Model/OrganizationNotInAllFeaturesModeException.cs +++ b/sdk/src/Services/IdentityManagement/Generated/Model/OrganizationNotInAllFeaturesModeException.cs @@ -108,11 +108,6 @@ protected OrganizationNotInAllFeaturesModeException(System.Runtime.Serialization /// The that holds the serialized object data about the exception being thrown. /// The that contains contextual information about the source or destination. /// The parameter is a null reference (Nothing in Visual Basic). -#if BCL35 - [System.Security.Permissions.SecurityPermission( - System.Security.Permissions.SecurityAction.LinkDemand, - Flags = System.Security.Permissions.SecurityPermissionFlag.SerializationFormatter)] -#endif [System.Security.SecurityCritical] // These FxCop rules are giving false-positives for this method [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Security", "CA2123:OverrideLinkDemandsShouldBeIdenticalToBase")] diff --git a/sdk/src/Services/IdentityManagement/Generated/Model/ServiceAccessNotEnabledException.cs b/sdk/src/Services/IdentityManagement/Generated/Model/ServiceAccessNotEnabledException.cs index ba6ccf79c8d3..8deb92825fbb 100644 --- a/sdk/src/Services/IdentityManagement/Generated/Model/ServiceAccessNotEnabledException.cs +++ b/sdk/src/Services/IdentityManagement/Generated/Model/ServiceAccessNotEnabledException.cs @@ -107,11 +107,6 @@ protected ServiceAccessNotEnabledException(System.Runtime.Serialization.Serializ /// The that holds the serialized object data about the exception being thrown. /// The that contains contextual information about the source or destination. /// The parameter is a null reference (Nothing in Visual Basic). -#if BCL35 - [System.Security.Permissions.SecurityPermission( - System.Security.Permissions.SecurityAction.LinkDemand, - Flags = System.Security.Permissions.SecurityPermissionFlag.SerializationFormatter)] -#endif [System.Security.SecurityCritical] // These FxCop rules are giving false-positives for this method [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Security", "CA2123:OverrideLinkDemandsShouldBeIdenticalToBase")] diff --git a/sdk/src/Services/IdentityManagement/Generated/_bcl/AmazonIdentityManagementServiceClient.cs b/sdk/src/Services/IdentityManagement/Generated/_bcl/AmazonIdentityManagementServiceClient.cs index b24258e8d352..da240f06ec27 100644 --- a/sdk/src/Services/IdentityManagement/Generated/_bcl/AmazonIdentityManagementServiceClient.cs +++ b/sdk/src/Services/IdentityManagement/Generated/_bcl/AmazonIdentityManagementServiceClient.cs @@ -5242,6 +5242,166 @@ public virtual DetachUserPolicyResponse DetachUserPolicy(DetachUserPolicyRequest #endregion + #region DisableOrganizationsRootCredentialsManagement + + + /// + /// Disables the management of privileged root user credentials across member accounts + /// in your organization. When you disable this feature, the management account and the + /// delegated admininstrator for IAM can no longer manage root user credentials for member + /// accounts in your organization. + /// + /// Container for the necessary parameters to execute the DisableOrganizationsRootCredentialsManagement service method. + /// + /// The response from the DisableOrganizationsRootCredentialsManagement service method, as returned by IdentityManagementService. + /// + /// The request was rejected because the account making the request is not the management + /// account or delegated administrator account for centralized + /// root access. + /// + /// + /// The request was rejected because no organization is associated with your account. + /// + /// + /// The request was rejected because your organization does not have All features enabled. + /// For more information, see Available + /// feature sets in the Organizations User Guide. + /// + /// + /// The request was rejected because trusted access is not enabled for IAM in Organizations. + /// For details, see IAM and Organizations in the Organizations User Guide. + /// + /// REST API Reference for DisableOrganizationsRootCredentialsManagement Operation + public virtual DisableOrganizationsRootCredentialsManagementResponse DisableOrganizationsRootCredentialsManagement(DisableOrganizationsRootCredentialsManagementRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = DisableOrganizationsRootCredentialsManagementRequestMarshaller.Instance; + options.ResponseUnmarshaller = DisableOrganizationsRootCredentialsManagementResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// Disables the management of privileged root user credentials across member accounts + /// in your organization. When you disable this feature, the management account and the + /// delegated admininstrator for IAM can no longer manage root user credentials for member + /// accounts in your organization. + /// + /// Container for the necessary parameters to execute the DisableOrganizationsRootCredentialsManagement service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the DisableOrganizationsRootCredentialsManagement service method, as returned by IdentityManagementService. + /// + /// The request was rejected because the account making the request is not the management + /// account or delegated administrator account for centralized + /// root access. + /// + /// + /// The request was rejected because no organization is associated with your account. + /// + /// + /// The request was rejected because your organization does not have All features enabled. + /// For more information, see Available + /// feature sets in the Organizations User Guide. + /// + /// + /// The request was rejected because trusted access is not enabled for IAM in Organizations. + /// For details, see IAM and Organizations in the Organizations User Guide. + /// + /// REST API Reference for DisableOrganizationsRootCredentialsManagement Operation + public virtual Task DisableOrganizationsRootCredentialsManagementAsync(DisableOrganizationsRootCredentialsManagementRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = DisableOrganizationsRootCredentialsManagementRequestMarshaller.Instance; + options.ResponseUnmarshaller = DisableOrganizationsRootCredentialsManagementResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + + #region DisableOrganizationsRootSessions + + + /// + /// Disables root user sessions for privileged tasks across member accounts in your organization. + /// When you disable this feature, the management account and the delegated admininstrator + /// for IAM can no longer perform privileged tasks on member accounts in your organization. + /// + /// Container for the necessary parameters to execute the DisableOrganizationsRootSessions service method. + /// + /// The response from the DisableOrganizationsRootSessions service method, as returned by IdentityManagementService. + /// + /// The request was rejected because the account making the request is not the management + /// account or delegated administrator account for centralized + /// root access. + /// + /// + /// The request was rejected because no organization is associated with your account. + /// + /// + /// The request was rejected because your organization does not have All features enabled. + /// For more information, see Available + /// feature sets in the Organizations User Guide. + /// + /// + /// The request was rejected because trusted access is not enabled for IAM in Organizations. + /// For details, see IAM and Organizations in the Organizations User Guide. + /// + /// REST API Reference for DisableOrganizationsRootSessions Operation + public virtual DisableOrganizationsRootSessionsResponse DisableOrganizationsRootSessions(DisableOrganizationsRootSessionsRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = DisableOrganizationsRootSessionsRequestMarshaller.Instance; + options.ResponseUnmarshaller = DisableOrganizationsRootSessionsResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// Disables root user sessions for privileged tasks across member accounts in your organization. + /// When you disable this feature, the management account and the delegated admininstrator + /// for IAM can no longer perform privileged tasks on member accounts in your organization. + /// + /// Container for the necessary parameters to execute the DisableOrganizationsRootSessions service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the DisableOrganizationsRootSessions service method, as returned by IdentityManagementService. + /// + /// The request was rejected because the account making the request is not the management + /// account or delegated administrator account for centralized + /// root access. + /// + /// + /// The request was rejected because no organization is associated with your account. + /// + /// + /// The request was rejected because your organization does not have All features enabled. + /// For more information, see Available + /// feature sets in the Organizations User Guide. + /// + /// + /// The request was rejected because trusted access is not enabled for IAM in Organizations. + /// For details, see IAM and Organizations in the Organizations User Guide. + /// + /// REST API Reference for DisableOrganizationsRootSessions Operation + public virtual Task DisableOrganizationsRootSessionsAsync(DisableOrganizationsRootSessionsRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = DisableOrganizationsRootSessionsRequestMarshaller.Instance; + options.ResponseUnmarshaller = DisableOrganizationsRootSessionsResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + #region EnableMFADevice @@ -5343,6 +5503,252 @@ public virtual EnableMFADeviceResponse EnableMFADevice(EnableMFADeviceRequest re #endregion + #region EnableOrganizationsRootCredentialsManagement + + + /// + /// Enables the management of privileged root user credentials across member accounts + /// in your organization. When you enable root credentials management for centralized + /// root access, the management account and the delegated admininstrator for IAM can + /// manage root user credentials for member accounts in your organization. + /// + /// + /// + /// Before you enable centralized root access, you must have an account configured with + /// the following settings: + /// + ///
    • + /// + /// You must manage your Amazon Web Services accounts in Organizations. + /// + ///
    • + /// + /// Enable trusted access for Identity and Access Management in Organizations. For details, + /// see IAM + /// and Organizations in the Organizations User Guide. + /// + ///
    + ///     + /// Container for the necessary parameters to execute the EnableOrganizationsRootCredentialsManagement service method. + /// + /// The response from the EnableOrganizationsRootCredentialsManagement service method, as returned by IdentityManagementService. + /// + /// The request was rejected because the account making the request is not the management + /// account or delegated administrator account for centralized + /// root access. + /// + /// + /// The request was rejected because the account making the request is not the management + /// account for the organization. + /// + /// + /// The request was rejected because no organization is associated with your account. + /// + /// + /// The request was rejected because your organization does not have All features enabled. + /// For more information, see Available + /// feature sets in the Organizations User Guide. + /// + /// + /// The request was rejected because trusted access is not enabled for IAM in Organizations. + /// For details, see IAM and Organizations in the Organizations User Guide. + /// + /// REST API Reference for EnableOrganizationsRootCredentialsManagement Operation + public virtual EnableOrganizationsRootCredentialsManagementResponse EnableOrganizationsRootCredentialsManagement(EnableOrganizationsRootCredentialsManagementRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = EnableOrganizationsRootCredentialsManagementRequestMarshaller.Instance; + options.ResponseUnmarshaller = EnableOrganizationsRootCredentialsManagementResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// Enables the management of privileged root user credentials across member accounts + /// in your organization. When you enable root credentials management for centralized + /// root access, the management account and the delegated admininstrator for IAM can + /// manage root user credentials for member accounts in your organization. + /// + /// + /// + /// Before you enable centralized root access, you must have an account configured with + /// the following settings: + /// + ///
    • + /// + /// You must manage your Amazon Web Services accounts in Organizations. + /// + ///
    • + /// + /// Enable trusted access for Identity and Access Management in Organizations. For details, + /// see IAM + /// and Organizations in the Organizations User Guide. + /// + ///
    + ///     + /// Container for the necessary parameters to execute the EnableOrganizationsRootCredentialsManagement service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the EnableOrganizationsRootCredentialsManagement service method, as returned by IdentityManagementService. + /// + /// The request was rejected because the account making the request is not the management + /// account or delegated administrator account for centralized + /// root access. + /// + /// + /// The request was rejected because the account making the request is not the management + /// account for the organization. + /// + /// + /// The request was rejected because no organization is associated with your account. + /// + /// + /// The request was rejected because your organization does not have All features enabled. + /// For more information, see Available + /// feature sets in the Organizations User Guide. + /// + /// + /// The request was rejected because trusted access is not enabled for IAM in Organizations. + /// For details, see IAM and Organizations in the Organizations User Guide. + /// + /// REST API Reference for EnableOrganizationsRootCredentialsManagement Operation + public virtual Task EnableOrganizationsRootCredentialsManagementAsync(EnableOrganizationsRootCredentialsManagementRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = EnableOrganizationsRootCredentialsManagementRequestMarshaller.Instance; + options.ResponseUnmarshaller = EnableOrganizationsRootCredentialsManagementResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + + #region EnableOrganizationsRootSessions + + + /// + /// Allows the management account or delegated administrator to perform privileged tasks + /// on member accounts in your organization. For more information, see Centrally + /// manage root access for member accounts in the Identity and Access Management + /// User Guide. + /// + /// + /// + /// Before you enable this feature, you must have an account configured with the following + /// settings: + /// + ///
    • + /// + /// You must manage your Amazon Web Services accounts in Organizations. + /// + ///
    • + /// + /// Enable trusted access for Identity and Access Management in Organizations. For details, + /// see IAM + /// and Organizations in the Organizations User Guide. + /// + ///
    + ///     + /// Container for the necessary parameters to execute the EnableOrganizationsRootSessions service method. + /// + /// The response from the EnableOrganizationsRootSessions service method, as returned by IdentityManagementService. + /// + /// The request was rejected because the account making the request is not the management + /// account or delegated administrator account for centralized + /// root access. + /// + /// + /// The request was rejected because the account making the request is not the management + /// account for the organization. + /// + /// + /// The request was rejected because no organization is associated with your account. + /// + /// + /// The request was rejected because your organization does not have All features enabled. + /// For more information, see Available + /// feature sets in the Organizations User Guide. + /// + /// + /// The request was rejected because trusted access is not enabled for IAM in Organizations. + /// For details, see IAM and Organizations in the Organizations User Guide. + /// + /// REST API Reference for EnableOrganizationsRootSessions Operation + public virtual EnableOrganizationsRootSessionsResponse EnableOrganizationsRootSessions(EnableOrganizationsRootSessionsRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = EnableOrganizationsRootSessionsRequestMarshaller.Instance; + options.ResponseUnmarshaller = EnableOrganizationsRootSessionsResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// Allows the management account or delegated administrator to perform privileged tasks + /// on member accounts in your organization. For more information, see Centrally + /// manage root access for member accounts in the Identity and Access Management + /// User Guide. + /// + /// + /// + /// Before you enable this feature, you must have an account configured with the following + /// settings: + /// + ///
    • + /// + /// You must manage your Amazon Web Services accounts in Organizations. + /// + ///
    • + /// + /// Enable trusted access for Identity and Access Management in Organizations. For details, + /// see IAM + /// and Organizations in the Organizations User Guide. + /// + ///
    + ///     + /// Container for the necessary parameters to execute the EnableOrganizationsRootSessions service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the EnableOrganizationsRootSessions service method, as returned by IdentityManagementService. + /// + /// The request was rejected because the account making the request is not the management + /// account or delegated administrator account for centralized + /// root access. + /// + /// + /// The request was rejected because the account making the request is not the management + /// account for the organization. + /// + /// + /// The request was rejected because no organization is associated with your account. + /// + /// + /// The request was rejected because your organization does not have All features enabled. + /// For more information, see Available + /// feature sets in the Organizations User Guide. + /// + /// + /// The request was rejected because trusted access is not enabled for IAM in Organizations. + /// For details, see IAM and Organizations in the Organizations User Guide. + /// + /// REST API Reference for EnableOrganizationsRootSessions Operation + public virtual Task EnableOrganizationsRootSessionsAsync(EnableOrganizationsRootSessionsRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = EnableOrganizationsRootSessionsRequestMarshaller.Instance; + options.ResponseUnmarshaller = EnableOrganizationsRootSessionsResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + #region GenerateCredentialReport @@ -8830,9 +9236,9 @@ public virtual ListAccessKeysResponse ListAccessKeys(ListAccessKeysRequest reque /// /// Lists the account alias associated with the Amazon Web Services account (Note: you /// can have only one). For information about using an Amazon Web Services account alias, - /// see Creating, - /// deleting, and listing an Amazon Web Services account alias in the IAM User - /// Guide. + /// see Creating, + /// deleting, and listing an Amazon Web Services account alias in the Amazon Web + /// Services Sign-In User Guide. /// /// /// The response from the ListAccountAliases service method, as returned by IdentityManagementService. @@ -8849,9 +9255,9 @@ public virtual ListAccountAliasesResponse ListAccountAliases() /// /// Lists the account alias associated with the Amazon Web Services account (Note: you /// can have only one). For information about using an Amazon Web Services account alias, - /// see Creating, - /// deleting, and listing an Amazon Web Services account alias in the IAM User - /// Guide. + /// see Creating, + /// deleting, and listing an Amazon Web Services account alias in the Amazon Web + /// Services Sign-In User Guide. /// /// Container for the necessary parameters to execute the ListAccountAliases service method. /// @@ -8873,9 +9279,9 @@ public virtual ListAccountAliasesResponse ListAccountAliases(ListAccountAliasesR /// /// Lists the account alias associated with the Amazon Web Services account (Note: you /// can have only one). For information about using an Amazon Web Services account alias, - /// see Creating, - /// deleting, and listing an Amazon Web Services account alias in the IAM User - /// Guide. + /// see Creating, + /// deleting, and listing an Amazon Web Services account alias in the Amazon Web + /// Services Sign-In User Guide. /// /// /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. @@ -8894,9 +9300,9 @@ public virtual ListAccountAliasesResponse ListAccountAliases(ListAccountAliasesR /// /// Lists the account alias associated with the Amazon Web Services account (Note: you /// can have only one). For information about using an Amazon Web Services account alias, - /// see Creating, - /// deleting, and listing an Amazon Web Services account alias in the IAM User - /// Guide. + /// see Creating, + /// deleting, and listing an Amazon Web Services account alias in the Amazon Web + /// Services Sign-In User Guide. /// /// Container for the necessary parameters to execute the ListAccountAliases service method. /// @@ -10147,6 +10553,85 @@ public virtual ListOpenIDConnectProviderTagsResponse ListOpenIDConnectProviderTa #endregion + #region ListOrganizationsFeatures + + + /// + /// Lists the centralized root access features enabled for your organization. For more + /// information, see Centrally + /// manage root access for member accounts. + /// + /// Container for the necessary parameters to execute the ListOrganizationsFeatures service method. + /// + /// The response from the ListOrganizationsFeatures service method, as returned by IdentityManagementService. + /// + /// The request was rejected because the account making the request is not the management + /// account or delegated administrator account for centralized + /// root access. + /// + /// + /// The request was rejected because no organization is associated with your account. + /// + /// + /// The request was rejected because your organization does not have All features enabled. + /// For more information, see Available + /// feature sets in the Organizations User Guide. + /// + /// + /// The request was rejected because trusted access is not enabled for IAM in Organizations. + /// For details, see IAM and Organizations in the Organizations User Guide. + /// + /// REST API Reference for ListOrganizationsFeatures Operation + public virtual ListOrganizationsFeaturesResponse ListOrganizationsFeatures(ListOrganizationsFeaturesRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = ListOrganizationsFeaturesRequestMarshaller.Instance; + options.ResponseUnmarshaller = ListOrganizationsFeaturesResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// Lists the centralized root access features enabled for your organization. For more + /// information, see Centrally + /// manage root access for member accounts. + /// + /// Container for the necessary parameters to execute the ListOrganizationsFeatures service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the ListOrganizationsFeatures service method, as returned by IdentityManagementService. + /// + /// The request was rejected because the account making the request is not the management + /// account or delegated administrator account for centralized + /// root access. + /// + /// + /// The request was rejected because no organization is associated with your account. + /// + /// + /// The request was rejected because your organization does not have All features enabled. + /// For more information, see Available + /// feature sets in the Organizations User Guide. + /// + /// + /// The request was rejected because trusted access is not enabled for IAM in Organizations. + /// For details, see IAM and Organizations in the Organizations User Guide. + /// + /// REST API Reference for ListOrganizationsFeatures Operation + public virtual Task ListOrganizationsFeaturesAsync(ListOrganizationsFeaturesRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = ListOrganizationsFeaturesRequestMarshaller.Instance; + options.ResponseUnmarshaller = ListOrganizationsFeaturesResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + #region ListPolicies diff --git a/sdk/src/Services/IdentityManagement/IdentityManagement.sln b/sdk/src/Services/IdentityManagement/IdentityManagement.sln index c54d8a755d7f..a0391f33ec65 100644 --- a/sdk/src/Services/IdentityManagement/IdentityManagement.sln +++ b/sdk/src/Services/IdentityManagement/IdentityManagement.sln @@ -90,7 +90,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {CD813760-A4D7-431A-8013-86A58674B288}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {CD813760-A4D7-431A-8013-86A58674B288}.Debug|Any CPU.Build.0 = Debug|Any CPU {CD813760-A4D7-431A-8013-86A58674B288}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,81 +114,6 @@ Global {70FCAF79-07D4-46A8-8ACA-D4D9406468EC}.Debug|Any CPU.Build.0 = Debug|Any CPU {70FCAF79-07D4-46A8-8ACA-D4D9406468EC}.Release|Any CPU.ActiveCfg = Release|Any CPU {70FCAF79-07D4-46A8-8ACA-D4D9406468EC}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {2E9DBE2C-3F47-4999-B2D5-36FF8C86DD1B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2E9DBE2C-3F47-4999-B2D5-36FF8C86DD1B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2E9DBE2C-3F47-4999-B2D5-36FF8C86DD1B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2E9DBE2C-3F47-4999-B2D5-36FF8C86DD1B}.Release|Any CPU.Build.0 = Release|Any CPU - {A8991233-BC4F-498F-8B01-4A007C3CB5B1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A8991233-BC4F-498F-8B01-4A007C3CB5B1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A8991233-BC4F-498F-8B01-4A007C3CB5B1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A8991233-BC4F-498F-8B01-4A007C3CB5B1}.Release|Any CPU.Build.0 = Release|Any CPU - {772424A7-89E7-4894-9DFB-268F59821C31}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {772424A7-89E7-4894-9DFB-268F59821C31}.Debug|Any CPU.Build.0 = Debug|Any CPU - {772424A7-89E7-4894-9DFB-268F59821C31}.Release|Any CPU.ActiveCfg = Release|Any CPU - {772424A7-89E7-4894-9DFB-268F59821C31}.Release|Any CPU.Build.0 = Release|Any CPU - {B3B59357-D382-49C2-82AF-72BA0B6877E3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B3B59357-D382-49C2-82AF-72BA0B6877E3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B3B59357-D382-49C2-82AF-72BA0B6877E3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B3B59357-D382-49C2-82AF-72BA0B6877E3}.Release|Any CPU.Build.0 = Release|Any CPU - {E7F43B8F-BE11-4D03-A68D-8DED8B6457CE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E7F43B8F-BE11-4D03-A68D-8DED8B6457CE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E7F43B8F-BE11-4D03-A68D-8DED8B6457CE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E7F43B8F-BE11-4D03-A68D-8DED8B6457CE}.Release|Any CPU.Build.0 = Release|Any CPU - {7A737F54-FDED-4A1C-A164-F7243B4E379D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7A737F54-FDED-4A1C-A164-F7243B4E379D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7A737F54-FDED-4A1C-A164-F7243B4E379D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7A737F54-FDED-4A1C-A164-F7243B4E379D}.Release|Any CPU.Build.0 = Release|Any CPU - {331E3F32-2DB2-446C-90B5-BB141E328EC4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {331E3F32-2DB2-446C-90B5-BB141E328EC4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {331E3F32-2DB2-446C-90B5-BB141E328EC4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {331E3F32-2DB2-446C-90B5-BB141E328EC4}.Release|Any CPU.Build.0 = Release|Any CPU - {4F5B9249-8425-4991-B493-73F90990A3F3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4F5B9249-8425-4991-B493-73F90990A3F3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4F5B9249-8425-4991-B493-73F90990A3F3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4F5B9249-8425-4991-B493-73F90990A3F3}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {2E9DBE2C-3F47-4999-B2D5-36FF8C86DD1B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2E9DBE2C-3F47-4999-B2D5-36FF8C86DD1B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2E9DBE2C-3F47-4999-B2D5-36FF8C86DD1B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2E9DBE2C-3F47-4999-B2D5-36FF8C86DD1B}.Release|Any CPU.Build.0 = Release|Any CPU - {A8991233-BC4F-498F-8B01-4A007C3CB5B1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A8991233-BC4F-498F-8B01-4A007C3CB5B1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A8991233-BC4F-498F-8B01-4A007C3CB5B1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A8991233-BC4F-498F-8B01-4A007C3CB5B1}.Release|Any CPU.Build.0 = Release|Any CPU - {772424A7-89E7-4894-9DFB-268F59821C31}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {772424A7-89E7-4894-9DFB-268F59821C31}.Debug|Any CPU.Build.0 = Debug|Any CPU - {772424A7-89E7-4894-9DFB-268F59821C31}.Release|Any CPU.ActiveCfg = Release|Any CPU - {772424A7-89E7-4894-9DFB-268F59821C31}.Release|Any CPU.Build.0 = Release|Any CPU - {B3B59357-D382-49C2-82AF-72BA0B6877E3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B3B59357-D382-49C2-82AF-72BA0B6877E3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B3B59357-D382-49C2-82AF-72BA0B6877E3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B3B59357-D382-49C2-82AF-72BA0B6877E3}.Release|Any CPU.Build.0 = Release|Any CPU - {E7F43B8F-BE11-4D03-A68D-8DED8B6457CE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E7F43B8F-BE11-4D03-A68D-8DED8B6457CE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E7F43B8F-BE11-4D03-A68D-8DED8B6457CE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E7F43B8F-BE11-4D03-A68D-8DED8B6457CE}.Release|Any CPU.Build.0 = Release|Any CPU - {7A737F54-FDED-4A1C-A164-F7243B4E379D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7A737F54-FDED-4A1C-A164-F7243B4E379D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7A737F54-FDED-4A1C-A164-F7243B4E379D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7A737F54-FDED-4A1C-A164-F7243B4E379D}.Release|Any CPU.Build.0 = Release|Any CPU - {331E3F32-2DB2-446C-90B5-BB141E328EC4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {331E3F32-2DB2-446C-90B5-BB141E328EC4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {331E3F32-2DB2-446C-90B5-BB141E328EC4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {331E3F32-2DB2-446C-90B5-BB141E328EC4}.Release|Any CPU.Build.0 = Release|Any CPU - {4F5B9249-8425-4991-B493-73F90990A3F3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4F5B9249-8425-4991-B493-73F90990A3F3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4F5B9249-8425-4991-B493-73F90990A3F3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4F5B9249-8425-4991-B493-73F90990A3F3}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -198,32 +130,12 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {CD813760-A4D7-431A-8013-86A58674B288} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {3E6A6EC2-1464-45AC-BB2A-3CBE74E8F0F4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {FDB84735-74D5-4735-A14B-E611EADE1D25} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {70FCAF79-07D4-46A8-8ACA-D4D9406468EC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {2E9DBE2C-3F47-4999-B2D5-36FF8C86DD1B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A8991233-BC4F-498F-8B01-4A007C3CB5B1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {772424A7-89E7-4894-9DFB-268F59821C31} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B3B59357-D382-49C2-82AF-72BA0B6877E3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E7F43B8F-BE11-4D03-A68D-8DED8B6457CE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {7A737F54-FDED-4A1C-A164-F7243B4E379D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {331E3F32-2DB2-446C-90B5-BB141E328EC4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4F5B9249-8425-4991-B493-73F90990A3F3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {2E9DBE2C-3F47-4999-B2D5-36FF8C86DD1B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A8991233-BC4F-498F-8B01-4A007C3CB5B1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {772424A7-89E7-4894-9DFB-268F59821C31} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B3B59357-D382-49C2-82AF-72BA0B6877E3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E7F43B8F-BE11-4D03-A68D-8DED8B6457CE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {7A737F54-FDED-4A1C-A164-F7243B4E379D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {331E3F32-2DB2-446C-90B5-BB141E328EC4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4F5B9249-8425-4991-B493-73F90990A3F3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {AF1AEF25-9BE5-4996-B06F-D37761CE17FB} diff --git a/sdk/src/Services/IdentityManagement/Properties/AssemblyInfo.cs b/sdk/src/Services/IdentityManagement/Properties/AssemblyInfo.cs index acf2a7c262e6..fdb5f945dd10 100644 --- a/sdk/src/Services/IdentityManagement/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/IdentityManagement/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.402.20")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.403.2")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/IdentityStore/Generated/AmazonIdentityStoreConfig.cs b/sdk/src/Services/IdentityStore/Generated/AmazonIdentityStoreConfig.cs index 1223c3966518..b7935ee19cec 100644 --- a/sdk/src/Services/IdentityStore/Generated/AmazonIdentityStoreConfig.cs +++ b/sdk/src/Services/IdentityStore/Generated/AmazonIdentityStoreConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.IdentityStore public partial class AmazonIdentityStoreConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("identitystore", "4.0.0.0"); private static readonly AmazonIdentityStoreEndpointResolver EndpointResolver = new AmazonIdentityStoreEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("identitystore", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("identitystore", "3.7.400.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/IdentityStore/IdentityStore.sln b/sdk/src/Services/IdentityStore/IdentityStore.sln index a442734c3953..aafdb56d7902 100644 --- a/sdk/src/Services/IdentityStore/IdentityStore.sln +++ b/sdk/src/Services/IdentityStore/IdentityStore.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {43239F64-5035-4BA3-9B75-A75B6E24D06E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {43239F64-5035-4BA3-9B75-A75B6E24D06E}.Debug|Any CPU.Build.0 = Debug|Any CPU {43239F64-5035-4BA3-9B75-A75B6E24D06E}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {0E592201-2DEE-4800-B717-F99C7B261F9E}.Debug|Any CPU.Build.0 = Debug|Any CPU {0E592201-2DEE-4800-B717-F99C7B261F9E}.Release|Any CPU.ActiveCfg = Release|Any CPU {0E592201-2DEE-4800-B717-F99C7B261F9E}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {DD708DAD-474F-4AD7-AEEA-74A2E7397BF2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DD708DAD-474F-4AD7-AEEA-74A2E7397BF2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DD708DAD-474F-4AD7-AEEA-74A2E7397BF2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DD708DAD-474F-4AD7-AEEA-74A2E7397BF2}.Release|Any CPU.Build.0 = Release|Any CPU - {71B414FC-DA70-47E0-ABF4-91FCCFAAB14A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {71B414FC-DA70-47E0-ABF4-91FCCFAAB14A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {71B414FC-DA70-47E0-ABF4-91FCCFAAB14A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {71B414FC-DA70-47E0-ABF4-91FCCFAAB14A}.Release|Any CPU.Build.0 = Release|Any CPU - {B273F1E3-DE07-481F-A8F1-D71CBA73C70B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B273F1E3-DE07-481F-A8F1-D71CBA73C70B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B273F1E3-DE07-481F-A8F1-D71CBA73C70B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B273F1E3-DE07-481F-A8F1-D71CBA73C70B}.Release|Any CPU.Build.0 = Release|Any CPU - {850B14F1-E2ED-45F3-9932-3C031DBC12CD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {850B14F1-E2ED-45F3-9932-3C031DBC12CD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {850B14F1-E2ED-45F3-9932-3C031DBC12CD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {850B14F1-E2ED-45F3-9932-3C031DBC12CD}.Release|Any CPU.Build.0 = Release|Any CPU - {AFA0A928-69DA-4C1F-B439-E8BC22E76636}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AFA0A928-69DA-4C1F-B439-E8BC22E76636}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AFA0A928-69DA-4C1F-B439-E8BC22E76636}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AFA0A928-69DA-4C1F-B439-E8BC22E76636}.Release|Any CPU.Build.0 = Release|Any CPU - {1BB8EC28-3B2F-4BC4-9C11-15F222C97321}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1BB8EC28-3B2F-4BC4-9C11-15F222C97321}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1BB8EC28-3B2F-4BC4-9C11-15F222C97321}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1BB8EC28-3B2F-4BC4-9C11-15F222C97321}.Release|Any CPU.Build.0 = Release|Any CPU - {D7145573-51FB-4624-8E0E-50EC0FC70A55}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D7145573-51FB-4624-8E0E-50EC0FC70A55}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D7145573-51FB-4624-8E0E-50EC0FC70A55}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D7145573-51FB-4624-8E0E-50EC0FC70A55}.Release|Any CPU.Build.0 = Release|Any CPU - {B745B3C6-D7F6-4E23-A205-24D98FA20C40}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B745B3C6-D7F6-4E23-A205-24D98FA20C40}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B745B3C6-D7F6-4E23-A205-24D98FA20C40}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B745B3C6-D7F6-4E23-A205-24D98FA20C40}.Release|Any CPU.Build.0 = Release|Any CPU - {9520A915-07D0-41A8-8315-A22E72047AD3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9520A915-07D0-41A8-8315-A22E72047AD3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9520A915-07D0-41A8-8315-A22E72047AD3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9520A915-07D0-41A8-8315-A22E72047AD3}.Release|Any CPU.Build.0 = Release|Any CPU - {4529F5E6-CD2B-40FB-9FA6-48B4122FB1E4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4529F5E6-CD2B-40FB-9FA6-48B4122FB1E4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4529F5E6-CD2B-40FB-9FA6-48B4122FB1E4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4529F5E6-CD2B-40FB-9FA6-48B4122FB1E4}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {DD708DAD-474F-4AD7-AEEA-74A2E7397BF2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DD708DAD-474F-4AD7-AEEA-74A2E7397BF2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DD708DAD-474F-4AD7-AEEA-74A2E7397BF2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DD708DAD-474F-4AD7-AEEA-74A2E7397BF2}.Release|Any CPU.Build.0 = Release|Any CPU - {71B414FC-DA70-47E0-ABF4-91FCCFAAB14A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {71B414FC-DA70-47E0-ABF4-91FCCFAAB14A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {71B414FC-DA70-47E0-ABF4-91FCCFAAB14A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {71B414FC-DA70-47E0-ABF4-91FCCFAAB14A}.Release|Any CPU.Build.0 = Release|Any CPU - {B273F1E3-DE07-481F-A8F1-D71CBA73C70B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B273F1E3-DE07-481F-A8F1-D71CBA73C70B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B273F1E3-DE07-481F-A8F1-D71CBA73C70B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B273F1E3-DE07-481F-A8F1-D71CBA73C70B}.Release|Any CPU.Build.0 = Release|Any CPU - {850B14F1-E2ED-45F3-9932-3C031DBC12CD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {850B14F1-E2ED-45F3-9932-3C031DBC12CD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {850B14F1-E2ED-45F3-9932-3C031DBC12CD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {850B14F1-E2ED-45F3-9932-3C031DBC12CD}.Release|Any CPU.Build.0 = Release|Any CPU - {AFA0A928-69DA-4C1F-B439-E8BC22E76636}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AFA0A928-69DA-4C1F-B439-E8BC22E76636}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AFA0A928-69DA-4C1F-B439-E8BC22E76636}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AFA0A928-69DA-4C1F-B439-E8BC22E76636}.Release|Any CPU.Build.0 = Release|Any CPU - {1BB8EC28-3B2F-4BC4-9C11-15F222C97321}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1BB8EC28-3B2F-4BC4-9C11-15F222C97321}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1BB8EC28-3B2F-4BC4-9C11-15F222C97321}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1BB8EC28-3B2F-4BC4-9C11-15F222C97321}.Release|Any CPU.Build.0 = Release|Any CPU - {D7145573-51FB-4624-8E0E-50EC0FC70A55}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D7145573-51FB-4624-8E0E-50EC0FC70A55}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D7145573-51FB-4624-8E0E-50EC0FC70A55}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D7145573-51FB-4624-8E0E-50EC0FC70A55}.Release|Any CPU.Build.0 = Release|Any CPU - {B745B3C6-D7F6-4E23-A205-24D98FA20C40}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B745B3C6-D7F6-4E23-A205-24D98FA20C40}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B745B3C6-D7F6-4E23-A205-24D98FA20C40}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B745B3C6-D7F6-4E23-A205-24D98FA20C40}.Release|Any CPU.Build.0 = Release|Any CPU - {9520A915-07D0-41A8-8315-A22E72047AD3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9520A915-07D0-41A8-8315-A22E72047AD3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9520A915-07D0-41A8-8315-A22E72047AD3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9520A915-07D0-41A8-8315-A22E72047AD3}.Release|Any CPU.Build.0 = Release|Any CPU - {4529F5E6-CD2B-40FB-9FA6-48B4122FB1E4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4529F5E6-CD2B-40FB-9FA6-48B4122FB1E4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4529F5E6-CD2B-40FB-9FA6-48B4122FB1E4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4529F5E6-CD2B-40FB-9FA6-48B4122FB1E4}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {43239F64-5035-4BA3-9B75-A75B6E24D06E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {3D4A89B9-8D7E-45CF-802B-9831F8479F0F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {5EEF8D95-9271-4B79-B7F6-B86FEE45FE29} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {F0FD53A0-64AA-41D3-B212-9EDCC151A000} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {0E592201-2DEE-4800-B717-F99C7B261F9E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {DD708DAD-474F-4AD7-AEEA-74A2E7397BF2} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {71B414FC-DA70-47E0-ABF4-91FCCFAAB14A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B273F1E3-DE07-481F-A8F1-D71CBA73C70B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {850B14F1-E2ED-45F3-9932-3C031DBC12CD} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {AFA0A928-69DA-4C1F-B439-E8BC22E76636} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {1BB8EC28-3B2F-4BC4-9C11-15F222C97321} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D7145573-51FB-4624-8E0E-50EC0FC70A55} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B745B3C6-D7F6-4E23-A205-24D98FA20C40} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {9520A915-07D0-41A8-8315-A22E72047AD3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4529F5E6-CD2B-40FB-9FA6-48B4122FB1E4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {DD708DAD-474F-4AD7-AEEA-74A2E7397BF2} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {71B414FC-DA70-47E0-ABF4-91FCCFAAB14A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B273F1E3-DE07-481F-A8F1-D71CBA73C70B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {850B14F1-E2ED-45F3-9932-3C031DBC12CD} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {AFA0A928-69DA-4C1F-B439-E8BC22E76636} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {1BB8EC28-3B2F-4BC4-9C11-15F222C97321} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D7145573-51FB-4624-8E0E-50EC0FC70A55} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B745B3C6-D7F6-4E23-A205-24D98FA20C40} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {9520A915-07D0-41A8-8315-A22E72047AD3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4529F5E6-CD2B-40FB-9FA6-48B4122FB1E4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {5C1AECC1-3FA1-4017-AC4B-65C1B93AE726} diff --git a/sdk/src/Services/IdentityStore/Properties/AssemblyInfo.cs b/sdk/src/Services/IdentityStore/Properties/AssemblyInfo.cs index 5cd427c06a17..db9a01e4f9ea 100644 --- a/sdk/src/Services/IdentityStore/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/IdentityStore/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/Imagebuilder/Generated/AmazonImagebuilderConfig.cs b/sdk/src/Services/Imagebuilder/Generated/AmazonImagebuilderConfig.cs index a77492fb1796..0b70e3d29d3d 100644 --- a/sdk/src/Services/Imagebuilder/Generated/AmazonImagebuilderConfig.cs +++ b/sdk/src/Services/Imagebuilder/Generated/AmazonImagebuilderConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.Imagebuilder public partial class AmazonImagebuilderConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("imagebuilder", "4.0.0.0"); private static readonly AmazonImagebuilderEndpointResolver EndpointResolver = new AmazonImagebuilderEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("imagebuilder", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("imagebuilder", "3.7.401.16"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/Imagebuilder/Generated/Model/Internal/MarshallTransformations/CreateInfrastructureConfigurationRequestMarshaller.cs b/sdk/src/Services/Imagebuilder/Generated/Model/Internal/MarshallTransformations/CreateInfrastructureConfigurationRequestMarshaller.cs index 0c77f2a9024d..77d362bcbfb7 100644 --- a/sdk/src/Services/Imagebuilder/Generated/Model/Internal/MarshallTransformations/CreateInfrastructureConfigurationRequestMarshaller.cs +++ b/sdk/src/Services/Imagebuilder/Generated/Model/Internal/MarshallTransformations/CreateInfrastructureConfigurationRequestMarshaller.cs @@ -131,37 +131,23 @@ public IRequest Marshall(CreateInfrastructureConfigurationRequest publicRequest) context.Writer.WriteObjectEnd(); } -<<<<<<< HEAD if(publicRequest.IsSetName()) -||||||| Commit version number update changes - if(publicRequest.IsSetResourceTags()) - { - context.Writer.WritePropertyName("resourceTags"); - context.Writer.WriteObjectStart(); - foreach (var publicRequestResourceTagsKvp in publicRequest.ResourceTags) -======= - if(publicRequest.IsSetPlacement()) - { - context.Writer.WritePropertyName("placement"); - context.Writer.WriteObjectStart(); - - var marshaller = PlacementMarshaller.Instance; - marshaller.Marshall(publicRequest.Placement, context); - - context.Writer.WriteObjectEnd(); - } - - if(publicRequest.IsSetResourceTags()) - { - context.Writer.WritePropertyName("resourceTags"); - context.Writer.WriteObjectStart(); - foreach (var publicRequestResourceTagsKvp in publicRequest.ResourceTags) ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b { context.Writer.WritePropertyName("name"); context.Writer.Write(publicRequest.Name); } + if(publicRequest.IsSetPlacement()) + { + context.Writer.WritePropertyName("placement"); + context.Writer.WriteObjectStart(); + + var marshaller = PlacementMarshaller.Instance; + marshaller.Marshall(publicRequest.Placement, context); + + context.Writer.WriteObjectEnd(); + } + if(publicRequest.IsSetResourceTags()) { context.Writer.WritePropertyName("resourceTags"); diff --git a/sdk/src/Services/Imagebuilder/Generated/Model/Internal/MarshallTransformations/UpdateInfrastructureConfigurationRequestMarshaller.cs b/sdk/src/Services/Imagebuilder/Generated/Model/Internal/MarshallTransformations/UpdateInfrastructureConfigurationRequestMarshaller.cs index ee4cfa5f3615..e9fb7374f23d 100644 --- a/sdk/src/Services/Imagebuilder/Generated/Model/Internal/MarshallTransformations/UpdateInfrastructureConfigurationRequestMarshaller.cs +++ b/sdk/src/Services/Imagebuilder/Generated/Model/Internal/MarshallTransformations/UpdateInfrastructureConfigurationRequestMarshaller.cs @@ -137,32 +137,18 @@ public IRequest Marshall(UpdateInfrastructureConfigurationRequest publicRequest) context.Writer.WriteObjectEnd(); } -<<<<<<< HEAD - if(publicRequest.IsSetResourceTags()) -||||||| Commit version number update changes - if(publicRequest.IsSetResourceTags()) - { - context.Writer.WritePropertyName("resourceTags"); - context.Writer.WriteObjectStart(); - foreach (var publicRequestResourceTagsKvp in publicRequest.ResourceTags) -======= - if(publicRequest.IsSetPlacement()) - { - context.Writer.WritePropertyName("placement"); - context.Writer.WriteObjectStart(); + if(publicRequest.IsSetPlacement()) + { + context.Writer.WritePropertyName("placement"); + context.Writer.WriteObjectStart(); - var marshaller = PlacementMarshaller.Instance; - marshaller.Marshall(publicRequest.Placement, context); + var marshaller = PlacementMarshaller.Instance; + marshaller.Marshall(publicRequest.Placement, context); - context.Writer.WriteObjectEnd(); - } + context.Writer.WriteObjectEnd(); + } - if(publicRequest.IsSetResourceTags()) - { - context.Writer.WritePropertyName("resourceTags"); - context.Writer.WriteObjectStart(); - foreach (var publicRequestResourceTagsKvp in publicRequest.ResourceTags) ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b + if(publicRequest.IsSetResourceTags()) { context.Writer.WritePropertyName("resourceTags"); context.Writer.WriteObjectStart(); diff --git a/sdk/src/Services/Imagebuilder/Generated/_bcl/AmazonImagebuilderClient.cs b/sdk/src/Services/Imagebuilder/Generated/_bcl/AmazonImagebuilderClient.cs index f9184bb14c25..ced20208beba 100644 --- a/sdk/src/Services/Imagebuilder/Generated/_bcl/AmazonImagebuilderClient.cs +++ b/sdk/src/Services/Imagebuilder/Generated/_bcl/AmazonImagebuilderClient.cs @@ -3878,21 +3878,8 @@ public virtual ImportVmImageResponse ImportVmImage(ImportVmImageRequest request) /// - /// Returns the list of component build versions for the specified semantic version. - /// - /// - /// - /// The semantic version has four nodes: <major>.<minor>.<patch>/<build>. - /// You can assign values for the first three, and can filter on all of them. - /// - /// - /// - /// Filtering: With semantic versioning, you have the flexibility to use wildcards - /// (x) to specify the most recent versions or nodes when selecting the base image or - /// components for your recipe. When you use a wildcard in any node, all nodes to the - /// right of the first wildcard must also be wildcards. - /// - /// + /// Returns the list of component build versions for the specified component version Amazon + /// Resource Name (ARN). /// /// Container for the necessary parameters to execute the ListComponentBuildVersions service method. /// @@ -3932,21 +3919,8 @@ public virtual ListComponentBuildVersionsResponse ListComponentBuildVersions(Lis /// - /// Returns the list of component build versions for the specified semantic version. - /// - /// - /// - /// The semantic version has four nodes: <major>.<minor>.<patch>/<build>. - /// You can assign values for the first three, and can filter on all of them. - /// - /// - /// - /// Filtering: With semantic versioning, you have the flexibility to use wildcards - /// (x) to specify the most recent versions or nodes when selecting the base image or - /// components for your recipe. When you use a wildcard in any node, all nodes to the - /// right of the first wildcard must also be wildcards. - /// - /// + /// Returns the list of component build versions for the specified component version Amazon + /// Resource Name (ARN). /// /// Container for the necessary parameters to execute the ListComponentBuildVersions service method. /// diff --git a/sdk/src/Services/Imagebuilder/Imagebuilder.sln b/sdk/src/Services/Imagebuilder/Imagebuilder.sln index 84fab7d32c38..74606f4999ac 100644 --- a/sdk/src/Services/Imagebuilder/Imagebuilder.sln +++ b/sdk/src/Services/Imagebuilder/Imagebuilder.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {1F016484-06D3-4552-979C-56BEFB2FF363}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {1F016484-06D3-4552-979C-56BEFB2FF363}.Debug|Any CPU.Build.0 = Debug|Any CPU {1F016484-06D3-4552-979C-56BEFB2FF363}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {192AFD39-FCC2-4CAA-A613-77E27B85A165}.Debug|Any CPU.Build.0 = Debug|Any CPU {192AFD39-FCC2-4CAA-A613-77E27B85A165}.Release|Any CPU.ActiveCfg = Release|Any CPU {192AFD39-FCC2-4CAA-A613-77E27B85A165}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {E449D58D-204B-4115-97E5-E7E5163865BB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E449D58D-204B-4115-97E5-E7E5163865BB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E449D58D-204B-4115-97E5-E7E5163865BB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E449D58D-204B-4115-97E5-E7E5163865BB}.Release|Any CPU.Build.0 = Release|Any CPU - {8906EC06-F029-4073-8E71-C3D665813337}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8906EC06-F029-4073-8E71-C3D665813337}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8906EC06-F029-4073-8E71-C3D665813337}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8906EC06-F029-4073-8E71-C3D665813337}.Release|Any CPU.Build.0 = Release|Any CPU - {0A32168D-EC52-46C5-B6A2-96F7BFA743B5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0A32168D-EC52-46C5-B6A2-96F7BFA743B5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0A32168D-EC52-46C5-B6A2-96F7BFA743B5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0A32168D-EC52-46C5-B6A2-96F7BFA743B5}.Release|Any CPU.Build.0 = Release|Any CPU - {FC8E8136-38D8-433A-AED1-85DEE83C5A07}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FC8E8136-38D8-433A-AED1-85DEE83C5A07}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FC8E8136-38D8-433A-AED1-85DEE83C5A07}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FC8E8136-38D8-433A-AED1-85DEE83C5A07}.Release|Any CPU.Build.0 = Release|Any CPU - {BA37C470-6DF1-4619-9B0C-52E22080794E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BA37C470-6DF1-4619-9B0C-52E22080794E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BA37C470-6DF1-4619-9B0C-52E22080794E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BA37C470-6DF1-4619-9B0C-52E22080794E}.Release|Any CPU.Build.0 = Release|Any CPU - {FA746832-AC29-4156-A7D3-86ADE94D94EA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FA746832-AC29-4156-A7D3-86ADE94D94EA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FA746832-AC29-4156-A7D3-86ADE94D94EA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FA746832-AC29-4156-A7D3-86ADE94D94EA}.Release|Any CPU.Build.0 = Release|Any CPU - {C1E32BDF-4838-473F-8D04-A9662E5A4731}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C1E32BDF-4838-473F-8D04-A9662E5A4731}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C1E32BDF-4838-473F-8D04-A9662E5A4731}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C1E32BDF-4838-473F-8D04-A9662E5A4731}.Release|Any CPU.Build.0 = Release|Any CPU - {72B2D0E7-3B7C-4AA1-B38B-FD3712081DD6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {72B2D0E7-3B7C-4AA1-B38B-FD3712081DD6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {72B2D0E7-3B7C-4AA1-B38B-FD3712081DD6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {72B2D0E7-3B7C-4AA1-B38B-FD3712081DD6}.Release|Any CPU.Build.0 = Release|Any CPU - {066AF9C7-DFB1-46B8-A958-52E8C02CE1E5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {066AF9C7-DFB1-46B8-A958-52E8C02CE1E5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {066AF9C7-DFB1-46B8-A958-52E8C02CE1E5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {066AF9C7-DFB1-46B8-A958-52E8C02CE1E5}.Release|Any CPU.Build.0 = Release|Any CPU - {91A986B3-B3F4-4674-8300-3F9897B34E6B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {91A986B3-B3F4-4674-8300-3F9897B34E6B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {91A986B3-B3F4-4674-8300-3F9897B34E6B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {91A986B3-B3F4-4674-8300-3F9897B34E6B}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {E449D58D-204B-4115-97E5-E7E5163865BB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E449D58D-204B-4115-97E5-E7E5163865BB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E449D58D-204B-4115-97E5-E7E5163865BB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E449D58D-204B-4115-97E5-E7E5163865BB}.Release|Any CPU.Build.0 = Release|Any CPU - {8906EC06-F029-4073-8E71-C3D665813337}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8906EC06-F029-4073-8E71-C3D665813337}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8906EC06-F029-4073-8E71-C3D665813337}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8906EC06-F029-4073-8E71-C3D665813337}.Release|Any CPU.Build.0 = Release|Any CPU - {0A32168D-EC52-46C5-B6A2-96F7BFA743B5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0A32168D-EC52-46C5-B6A2-96F7BFA743B5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0A32168D-EC52-46C5-B6A2-96F7BFA743B5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0A32168D-EC52-46C5-B6A2-96F7BFA743B5}.Release|Any CPU.Build.0 = Release|Any CPU - {FC8E8136-38D8-433A-AED1-85DEE83C5A07}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FC8E8136-38D8-433A-AED1-85DEE83C5A07}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FC8E8136-38D8-433A-AED1-85DEE83C5A07}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FC8E8136-38D8-433A-AED1-85DEE83C5A07}.Release|Any CPU.Build.0 = Release|Any CPU - {BA37C470-6DF1-4619-9B0C-52E22080794E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BA37C470-6DF1-4619-9B0C-52E22080794E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BA37C470-6DF1-4619-9B0C-52E22080794E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BA37C470-6DF1-4619-9B0C-52E22080794E}.Release|Any CPU.Build.0 = Release|Any CPU - {FA746832-AC29-4156-A7D3-86ADE94D94EA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FA746832-AC29-4156-A7D3-86ADE94D94EA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FA746832-AC29-4156-A7D3-86ADE94D94EA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FA746832-AC29-4156-A7D3-86ADE94D94EA}.Release|Any CPU.Build.0 = Release|Any CPU - {C1E32BDF-4838-473F-8D04-A9662E5A4731}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C1E32BDF-4838-473F-8D04-A9662E5A4731}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C1E32BDF-4838-473F-8D04-A9662E5A4731}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C1E32BDF-4838-473F-8D04-A9662E5A4731}.Release|Any CPU.Build.0 = Release|Any CPU - {72B2D0E7-3B7C-4AA1-B38B-FD3712081DD6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {72B2D0E7-3B7C-4AA1-B38B-FD3712081DD6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {72B2D0E7-3B7C-4AA1-B38B-FD3712081DD6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {72B2D0E7-3B7C-4AA1-B38B-FD3712081DD6}.Release|Any CPU.Build.0 = Release|Any CPU - {066AF9C7-DFB1-46B8-A958-52E8C02CE1E5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {066AF9C7-DFB1-46B8-A958-52E8C02CE1E5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {066AF9C7-DFB1-46B8-A958-52E8C02CE1E5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {066AF9C7-DFB1-46B8-A958-52E8C02CE1E5}.Release|Any CPU.Build.0 = Release|Any CPU - {91A986B3-B3F4-4674-8300-3F9897B34E6B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {91A986B3-B3F4-4674-8300-3F9897B34E6B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {91A986B3-B3F4-4674-8300-3F9897B34E6B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {91A986B3-B3F4-4674-8300-3F9897B34E6B}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {1F016484-06D3-4552-979C-56BEFB2FF363} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {EE7BCC40-E02F-4EAF-A8EC-AD12A483F87B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {4B16360B-EA02-4E43-8DD7-A652C4FD22D6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {4F28D8A1-52AA-403C-B553-A0C98DE14D09} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {192AFD39-FCC2-4CAA-A613-77E27B85A165} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {E449D58D-204B-4115-97E5-E7E5163865BB} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8906EC06-F029-4073-8E71-C3D665813337} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0A32168D-EC52-46C5-B6A2-96F7BFA743B5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {FC8E8136-38D8-433A-AED1-85DEE83C5A07} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {BA37C470-6DF1-4619-9B0C-52E22080794E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {FA746832-AC29-4156-A7D3-86ADE94D94EA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C1E32BDF-4838-473F-8D04-A9662E5A4731} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {72B2D0E7-3B7C-4AA1-B38B-FD3712081DD6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {066AF9C7-DFB1-46B8-A958-52E8C02CE1E5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {91A986B3-B3F4-4674-8300-3F9897B34E6B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {E449D58D-204B-4115-97E5-E7E5163865BB} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8906EC06-F029-4073-8E71-C3D665813337} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0A32168D-EC52-46C5-B6A2-96F7BFA743B5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {FC8E8136-38D8-433A-AED1-85DEE83C5A07} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {BA37C470-6DF1-4619-9B0C-52E22080794E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {FA746832-AC29-4156-A7D3-86ADE94D94EA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C1E32BDF-4838-473F-8D04-A9662E5A4731} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {72B2D0E7-3B7C-4AA1-B38B-FD3712081DD6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {066AF9C7-DFB1-46B8-A958-52E8C02CE1E5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {91A986B3-B3F4-4674-8300-3F9897B34E6B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {4FA05BBD-8EB5-4218-8434-B4819A4DC1DD} diff --git a/sdk/src/Services/Imagebuilder/Properties/AssemblyInfo.cs b/sdk/src/Services/Imagebuilder/Properties/AssemblyInfo.cs index a351b5d98f7e..25775e6050f4 100644 --- a/sdk/src/Services/Imagebuilder/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/Imagebuilder/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.16")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/ImportExport/Generated/AmazonImportExportConfig.cs b/sdk/src/Services/ImportExport/Generated/AmazonImportExportConfig.cs index 27faa9153e33..a91ee5d5910f 100644 --- a/sdk/src/Services/ImportExport/Generated/AmazonImportExportConfig.cs +++ b/sdk/src/Services/ImportExport/Generated/AmazonImportExportConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.ImportExport public partial class AmazonImportExportConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("ImportExport", "4.0.0.0"); private static readonly AmazonImportExportEndpointResolver EndpointResolver = new AmazonImportExportEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("ImportExport", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("ImportExport", "3.7.400.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/ImportExport/ImportExport.sln b/sdk/src/Services/ImportExport/ImportExport.sln index c36a62e881ba..dfaeffa2d68e 100644 --- a/sdk/src/Services/ImportExport/ImportExport.sln +++ b/sdk/src/Services/ImportExport/ImportExport.sln @@ -92,7 +92,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {10302691-F407-446D-BCD4-5840BC17CD83}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {10302691-F407-446D-BCD4-5840BC17CD83}.Debug|Any CPU.Build.0 = Debug|Any CPU {10302691-F407-446D-BCD4-5840BC17CD83}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -113,97 +120,6 @@ Global {B2E8FF33-460F-4AD5-B05E-4E7A3CAC3F43}.Debug|Any CPU.Build.0 = Debug|Any CPU {B2E8FF33-460F-4AD5-B05E-4E7A3CAC3F43}.Release|Any CPU.ActiveCfg = Release|Any CPU {B2E8FF33-460F-4AD5-B05E-4E7A3CAC3F43}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {F4DBB176-68CC-4347-A851-2ADB3A3DC48D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F4DBB176-68CC-4347-A851-2ADB3A3DC48D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F4DBB176-68CC-4347-A851-2ADB3A3DC48D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F4DBB176-68CC-4347-A851-2ADB3A3DC48D}.Release|Any CPU.Build.0 = Release|Any CPU - {CA3112BC-A244-42FD-A3F5-5665DAF49FC4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CA3112BC-A244-42FD-A3F5-5665DAF49FC4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CA3112BC-A244-42FD-A3F5-5665DAF49FC4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CA3112BC-A244-42FD-A3F5-5665DAF49FC4}.Release|Any CPU.Build.0 = Release|Any CPU - {70FB80E6-5199-4463-B5F5-4D39FBC9B3AE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {70FB80E6-5199-4463-B5F5-4D39FBC9B3AE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {70FB80E6-5199-4463-B5F5-4D39FBC9B3AE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {70FB80E6-5199-4463-B5F5-4D39FBC9B3AE}.Release|Any CPU.Build.0 = Release|Any CPU - {F7304158-445F-4CA3-87E6-83CC286DE656}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F7304158-445F-4CA3-87E6-83CC286DE656}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F7304158-445F-4CA3-87E6-83CC286DE656}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F7304158-445F-4CA3-87E6-83CC286DE656}.Release|Any CPU.Build.0 = Release|Any CPU - {9BD1B117-D7DF-4AAC-AAB5-F12272709D37}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9BD1B117-D7DF-4AAC-AAB5-F12272709D37}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9BD1B117-D7DF-4AAC-AAB5-F12272709D37}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9BD1B117-D7DF-4AAC-AAB5-F12272709D37}.Release|Any CPU.Build.0 = Release|Any CPU - {55A8F2CD-9BF7-440C-97C0-1D438908DD08}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {55A8F2CD-9BF7-440C-97C0-1D438908DD08}.Debug|Any CPU.Build.0 = Debug|Any CPU - {55A8F2CD-9BF7-440C-97C0-1D438908DD08}.Release|Any CPU.ActiveCfg = Release|Any CPU - {55A8F2CD-9BF7-440C-97C0-1D438908DD08}.Release|Any CPU.Build.0 = Release|Any CPU - {AF96F3ED-91F0-4462-A1BB-C8D1E8EC510B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AF96F3ED-91F0-4462-A1BB-C8D1E8EC510B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AF96F3ED-91F0-4462-A1BB-C8D1E8EC510B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AF96F3ED-91F0-4462-A1BB-C8D1E8EC510B}.Release|Any CPU.Build.0 = Release|Any CPU - {55908809-1CE8-4D08-A5CE-7475B873B1DD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {55908809-1CE8-4D08-A5CE-7475B873B1DD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {55908809-1CE8-4D08-A5CE-7475B873B1DD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {55908809-1CE8-4D08-A5CE-7475B873B1DD}.Release|Any CPU.Build.0 = Release|Any CPU - {E13F9058-D3A9-4388-877C-1420A40F2234}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E13F9058-D3A9-4388-877C-1420A40F2234}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E13F9058-D3A9-4388-877C-1420A40F2234}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E13F9058-D3A9-4388-877C-1420A40F2234}.Release|Any CPU.Build.0 = Release|Any CPU - {5D876944-2414-4E12-BA69-F041D8139BCB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5D876944-2414-4E12-BA69-F041D8139BCB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5D876944-2414-4E12-BA69-F041D8139BCB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5D876944-2414-4E12-BA69-F041D8139BCB}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {F4DBB176-68CC-4347-A851-2ADB3A3DC48D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F4DBB176-68CC-4347-A851-2ADB3A3DC48D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F4DBB176-68CC-4347-A851-2ADB3A3DC48D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F4DBB176-68CC-4347-A851-2ADB3A3DC48D}.Release|Any CPU.Build.0 = Release|Any CPU - {CA3112BC-A244-42FD-A3F5-5665DAF49FC4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CA3112BC-A244-42FD-A3F5-5665DAF49FC4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CA3112BC-A244-42FD-A3F5-5665DAF49FC4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CA3112BC-A244-42FD-A3F5-5665DAF49FC4}.Release|Any CPU.Build.0 = Release|Any CPU - {70FB80E6-5199-4463-B5F5-4D39FBC9B3AE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {70FB80E6-5199-4463-B5F5-4D39FBC9B3AE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {70FB80E6-5199-4463-B5F5-4D39FBC9B3AE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {70FB80E6-5199-4463-B5F5-4D39FBC9B3AE}.Release|Any CPU.Build.0 = Release|Any CPU - {F7304158-445F-4CA3-87E6-83CC286DE656}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F7304158-445F-4CA3-87E6-83CC286DE656}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F7304158-445F-4CA3-87E6-83CC286DE656}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F7304158-445F-4CA3-87E6-83CC286DE656}.Release|Any CPU.Build.0 = Release|Any CPU - {9BD1B117-D7DF-4AAC-AAB5-F12272709D37}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9BD1B117-D7DF-4AAC-AAB5-F12272709D37}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9BD1B117-D7DF-4AAC-AAB5-F12272709D37}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9BD1B117-D7DF-4AAC-AAB5-F12272709D37}.Release|Any CPU.Build.0 = Release|Any CPU - {55A8F2CD-9BF7-440C-97C0-1D438908DD08}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {55A8F2CD-9BF7-440C-97C0-1D438908DD08}.Debug|Any CPU.Build.0 = Debug|Any CPU - {55A8F2CD-9BF7-440C-97C0-1D438908DD08}.Release|Any CPU.ActiveCfg = Release|Any CPU - {55A8F2CD-9BF7-440C-97C0-1D438908DD08}.Release|Any CPU.Build.0 = Release|Any CPU - {AF96F3ED-91F0-4462-A1BB-C8D1E8EC510B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AF96F3ED-91F0-4462-A1BB-C8D1E8EC510B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AF96F3ED-91F0-4462-A1BB-C8D1E8EC510B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AF96F3ED-91F0-4462-A1BB-C8D1E8EC510B}.Release|Any CPU.Build.0 = Release|Any CPU - {55908809-1CE8-4D08-A5CE-7475B873B1DD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {55908809-1CE8-4D08-A5CE-7475B873B1DD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {55908809-1CE8-4D08-A5CE-7475B873B1DD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {55908809-1CE8-4D08-A5CE-7475B873B1DD}.Release|Any CPU.Build.0 = Release|Any CPU - {E13F9058-D3A9-4388-877C-1420A40F2234}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E13F9058-D3A9-4388-877C-1420A40F2234}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E13F9058-D3A9-4388-877C-1420A40F2234}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E13F9058-D3A9-4388-877C-1420A40F2234}.Release|Any CPU.Build.0 = Release|Any CPU - {5D876944-2414-4E12-BA69-F041D8139BCB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5D876944-2414-4E12-BA69-F041D8139BCB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5D876944-2414-4E12-BA69-F041D8139BCB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5D876944-2414-4E12-BA69-F041D8139BCB}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -220,37 +136,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {10302691-F407-446D-BCD4-5840BC17CD83} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {BE91C783-8B72-4F8B-98F3-135D5B72F7E1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {676D85B4-2FD7-4531-8300-F74C92FC9034} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {08FB632E-DBA2-48F8-A69B-F38504D0073D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {B2E8FF33-460F-4AD5-B05E-4E7A3CAC3F43} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {F4DBB176-68CC-4347-A851-2ADB3A3DC48D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {CA3112BC-A244-42FD-A3F5-5665DAF49FC4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {70FB80E6-5199-4463-B5F5-4D39FBC9B3AE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F7304158-445F-4CA3-87E6-83CC286DE656} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {9BD1B117-D7DF-4AAC-AAB5-F12272709D37} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {55A8F2CD-9BF7-440C-97C0-1D438908DD08} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {AF96F3ED-91F0-4462-A1BB-C8D1E8EC510B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {55908809-1CE8-4D08-A5CE-7475B873B1DD} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E13F9058-D3A9-4388-877C-1420A40F2234} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {5D876944-2414-4E12-BA69-F041D8139BCB} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {F4DBB176-68CC-4347-A851-2ADB3A3DC48D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {CA3112BC-A244-42FD-A3F5-5665DAF49FC4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {70FB80E6-5199-4463-B5F5-4D39FBC9B3AE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F7304158-445F-4CA3-87E6-83CC286DE656} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {9BD1B117-D7DF-4AAC-AAB5-F12272709D37} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {55A8F2CD-9BF7-440C-97C0-1D438908DD08} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {AF96F3ED-91F0-4462-A1BB-C8D1E8EC510B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {55908809-1CE8-4D08-A5CE-7475B873B1DD} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E13F9058-D3A9-4388-877C-1420A40F2234} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {5D876944-2414-4E12-BA69-F041D8139BCB} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {B3DF7E05-BB3D-4ED8-820A-5FF2809B33B4} diff --git a/sdk/src/Services/ImportExport/Properties/AssemblyInfo.cs b/sdk/src/Services/ImportExport/Properties/AssemblyInfo.cs index d0926b9a2f37..61e1602ac2ae 100644 --- a/sdk/src/Services/ImportExport/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/ImportExport/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/Inspector/Generated/AmazonInspectorConfig.cs b/sdk/src/Services/Inspector/Generated/AmazonInspectorConfig.cs index 6c3b03335ab1..0da4808765ef 100644 --- a/sdk/src/Services/Inspector/Generated/AmazonInspectorConfig.cs +++ b/sdk/src/Services/Inspector/Generated/AmazonInspectorConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.Inspector public partial class AmazonInspectorConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("Inspector", "4.0.0.0"); private static readonly AmazonInspectorEndpointResolver EndpointResolver = new AmazonInspectorEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("Inspector", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("Inspector", "3.7.400.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/Inspector/Inspector.sln b/sdk/src/Services/Inspector/Inspector.sln index 07a5f48b69de..ce2d66332061 100644 --- a/sdk/src/Services/Inspector/Inspector.sln +++ b/sdk/src/Services/Inspector/Inspector.sln @@ -92,7 +92,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {AE5B8EE6-ABBD-4B9A-9006-F732B7470931}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {AE5B8EE6-ABBD-4B9A-9006-F732B7470931}.Debug|Any CPU.Build.0 = Debug|Any CPU {AE5B8EE6-ABBD-4B9A-9006-F732B7470931}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -113,97 +120,6 @@ Global {D589DC66-9D6D-4ECC-B7BC-E9DED9199D3C}.Debug|Any CPU.Build.0 = Debug|Any CPU {D589DC66-9D6D-4ECC-B7BC-E9DED9199D3C}.Release|Any CPU.ActiveCfg = Release|Any CPU {D589DC66-9D6D-4ECC-B7BC-E9DED9199D3C}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {35CA04F7-70F2-4A07-88E9-4D60A1B3E099}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {35CA04F7-70F2-4A07-88E9-4D60A1B3E099}.Debug|Any CPU.Build.0 = Debug|Any CPU - {35CA04F7-70F2-4A07-88E9-4D60A1B3E099}.Release|Any CPU.ActiveCfg = Release|Any CPU - {35CA04F7-70F2-4A07-88E9-4D60A1B3E099}.Release|Any CPU.Build.0 = Release|Any CPU - {44E4602E-4508-489F-AC81-F2CBD5F22481}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {44E4602E-4508-489F-AC81-F2CBD5F22481}.Debug|Any CPU.Build.0 = Debug|Any CPU - {44E4602E-4508-489F-AC81-F2CBD5F22481}.Release|Any CPU.ActiveCfg = Release|Any CPU - {44E4602E-4508-489F-AC81-F2CBD5F22481}.Release|Any CPU.Build.0 = Release|Any CPU - {5ACCAC1B-82E0-4394-83AD-90AB7B49211D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5ACCAC1B-82E0-4394-83AD-90AB7B49211D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5ACCAC1B-82E0-4394-83AD-90AB7B49211D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5ACCAC1B-82E0-4394-83AD-90AB7B49211D}.Release|Any CPU.Build.0 = Release|Any CPU - {708550BE-2984-4019-ABAA-FC3C1496163F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {708550BE-2984-4019-ABAA-FC3C1496163F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {708550BE-2984-4019-ABAA-FC3C1496163F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {708550BE-2984-4019-ABAA-FC3C1496163F}.Release|Any CPU.Build.0 = Release|Any CPU - {CDEF59E9-D535-434C-AD82-51CCA493596B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CDEF59E9-D535-434C-AD82-51CCA493596B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CDEF59E9-D535-434C-AD82-51CCA493596B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CDEF59E9-D535-434C-AD82-51CCA493596B}.Release|Any CPU.Build.0 = Release|Any CPU - {92E957B1-81F6-40DE-9991-8D92AA8E64A5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {92E957B1-81F6-40DE-9991-8D92AA8E64A5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {92E957B1-81F6-40DE-9991-8D92AA8E64A5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {92E957B1-81F6-40DE-9991-8D92AA8E64A5}.Release|Any CPU.Build.0 = Release|Any CPU - {65A942D0-AE8C-4767-911C-764F1D2E76C5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {65A942D0-AE8C-4767-911C-764F1D2E76C5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {65A942D0-AE8C-4767-911C-764F1D2E76C5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {65A942D0-AE8C-4767-911C-764F1D2E76C5}.Release|Any CPU.Build.0 = Release|Any CPU - {8E74ED2B-1856-47AC-96F9-B953C820C83C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8E74ED2B-1856-47AC-96F9-B953C820C83C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8E74ED2B-1856-47AC-96F9-B953C820C83C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8E74ED2B-1856-47AC-96F9-B953C820C83C}.Release|Any CPU.Build.0 = Release|Any CPU - {466173A4-E42E-4BE2-A757-6833E73B7667}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {466173A4-E42E-4BE2-A757-6833E73B7667}.Debug|Any CPU.Build.0 = Debug|Any CPU - {466173A4-E42E-4BE2-A757-6833E73B7667}.Release|Any CPU.ActiveCfg = Release|Any CPU - {466173A4-E42E-4BE2-A757-6833E73B7667}.Release|Any CPU.Build.0 = Release|Any CPU - {EB84B881-5AB2-46A3-BCA1-26AD06374917}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EB84B881-5AB2-46A3-BCA1-26AD06374917}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EB84B881-5AB2-46A3-BCA1-26AD06374917}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EB84B881-5AB2-46A3-BCA1-26AD06374917}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {35CA04F7-70F2-4A07-88E9-4D60A1B3E099}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {35CA04F7-70F2-4A07-88E9-4D60A1B3E099}.Debug|Any CPU.Build.0 = Debug|Any CPU - {35CA04F7-70F2-4A07-88E9-4D60A1B3E099}.Release|Any CPU.ActiveCfg = Release|Any CPU - {35CA04F7-70F2-4A07-88E9-4D60A1B3E099}.Release|Any CPU.Build.0 = Release|Any CPU - {44E4602E-4508-489F-AC81-F2CBD5F22481}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {44E4602E-4508-489F-AC81-F2CBD5F22481}.Debug|Any CPU.Build.0 = Debug|Any CPU - {44E4602E-4508-489F-AC81-F2CBD5F22481}.Release|Any CPU.ActiveCfg = Release|Any CPU - {44E4602E-4508-489F-AC81-F2CBD5F22481}.Release|Any CPU.Build.0 = Release|Any CPU - {5ACCAC1B-82E0-4394-83AD-90AB7B49211D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5ACCAC1B-82E0-4394-83AD-90AB7B49211D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5ACCAC1B-82E0-4394-83AD-90AB7B49211D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5ACCAC1B-82E0-4394-83AD-90AB7B49211D}.Release|Any CPU.Build.0 = Release|Any CPU - {708550BE-2984-4019-ABAA-FC3C1496163F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {708550BE-2984-4019-ABAA-FC3C1496163F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {708550BE-2984-4019-ABAA-FC3C1496163F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {708550BE-2984-4019-ABAA-FC3C1496163F}.Release|Any CPU.Build.0 = Release|Any CPU - {CDEF59E9-D535-434C-AD82-51CCA493596B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CDEF59E9-D535-434C-AD82-51CCA493596B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CDEF59E9-D535-434C-AD82-51CCA493596B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CDEF59E9-D535-434C-AD82-51CCA493596B}.Release|Any CPU.Build.0 = Release|Any CPU - {92E957B1-81F6-40DE-9991-8D92AA8E64A5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {92E957B1-81F6-40DE-9991-8D92AA8E64A5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {92E957B1-81F6-40DE-9991-8D92AA8E64A5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {92E957B1-81F6-40DE-9991-8D92AA8E64A5}.Release|Any CPU.Build.0 = Release|Any CPU - {65A942D0-AE8C-4767-911C-764F1D2E76C5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {65A942D0-AE8C-4767-911C-764F1D2E76C5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {65A942D0-AE8C-4767-911C-764F1D2E76C5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {65A942D0-AE8C-4767-911C-764F1D2E76C5}.Release|Any CPU.Build.0 = Release|Any CPU - {8E74ED2B-1856-47AC-96F9-B953C820C83C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8E74ED2B-1856-47AC-96F9-B953C820C83C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8E74ED2B-1856-47AC-96F9-B953C820C83C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8E74ED2B-1856-47AC-96F9-B953C820C83C}.Release|Any CPU.Build.0 = Release|Any CPU - {466173A4-E42E-4BE2-A757-6833E73B7667}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {466173A4-E42E-4BE2-A757-6833E73B7667}.Debug|Any CPU.Build.0 = Debug|Any CPU - {466173A4-E42E-4BE2-A757-6833E73B7667}.Release|Any CPU.ActiveCfg = Release|Any CPU - {466173A4-E42E-4BE2-A757-6833E73B7667}.Release|Any CPU.Build.0 = Release|Any CPU - {EB84B881-5AB2-46A3-BCA1-26AD06374917}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EB84B881-5AB2-46A3-BCA1-26AD06374917}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EB84B881-5AB2-46A3-BCA1-26AD06374917}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EB84B881-5AB2-46A3-BCA1-26AD06374917}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -220,37 +136,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {AE5B8EE6-ABBD-4B9A-9006-F732B7470931} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {DB194FA2-2963-4F11-9F4B-23C4C1D8D93C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {DCF009A6-94CE-453F-9F9E-89FDA779DA40} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {88BF926E-C0DA-4EEC-A759-6C6C3319B4ED} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {D589DC66-9D6D-4ECC-B7BC-E9DED9199D3C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {35CA04F7-70F2-4A07-88E9-4D60A1B3E099} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {44E4602E-4508-489F-AC81-F2CBD5F22481} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {5ACCAC1B-82E0-4394-83AD-90AB7B49211D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {708550BE-2984-4019-ABAA-FC3C1496163F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {CDEF59E9-D535-434C-AD82-51CCA493596B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {92E957B1-81F6-40DE-9991-8D92AA8E64A5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {65A942D0-AE8C-4767-911C-764F1D2E76C5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8E74ED2B-1856-47AC-96F9-B953C820C83C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {466173A4-E42E-4BE2-A757-6833E73B7667} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {EB84B881-5AB2-46A3-BCA1-26AD06374917} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {35CA04F7-70F2-4A07-88E9-4D60A1B3E099} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {44E4602E-4508-489F-AC81-F2CBD5F22481} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {5ACCAC1B-82E0-4394-83AD-90AB7B49211D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {708550BE-2984-4019-ABAA-FC3C1496163F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {CDEF59E9-D535-434C-AD82-51CCA493596B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {92E957B1-81F6-40DE-9991-8D92AA8E64A5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {65A942D0-AE8C-4767-911C-764F1D2E76C5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8E74ED2B-1856-47AC-96F9-B953C820C83C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {466173A4-E42E-4BE2-A757-6833E73B7667} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {EB84B881-5AB2-46A3-BCA1-26AD06374917} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {7852F885-36BB-4E53-8653-82B495E11FA3} diff --git a/sdk/src/Services/Inspector/Properties/AssemblyInfo.cs b/sdk/src/Services/Inspector/Properties/AssemblyInfo.cs index 284954243903..a83ef6cf037b 100644 --- a/sdk/src/Services/Inspector/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/Inspector/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/Inspector2/Generated/AmazonInspector2Config.cs b/sdk/src/Services/Inspector2/Generated/AmazonInspector2Config.cs index 772eb1a78702..e548f6f090b8 100644 --- a/sdk/src/Services/Inspector2/Generated/AmazonInspector2Config.cs +++ b/sdk/src/Services/Inspector2/Generated/AmazonInspector2Config.cs @@ -34,16 +34,10 @@ namespace Amazon.Inspector2 public partial class AmazonInspector2Config : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("Inspector2", "4.0.0.0"); private static readonly AmazonInspector2EndpointResolver EndpointResolver = new AmazonInspector2EndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("Inspector2", "3.7.402.15"); -======= - InternalSDKUtils.BuildUserAgentString("Inspector2", "3.7.403.5"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/Inspector2/Generated/_bcl/AmazonInspector2Client.cs b/sdk/src/Services/Inspector2/Generated/_bcl/AmazonInspector2Client.cs index 2305bed70552..2a3eed967ce1 100644 --- a/sdk/src/Services/Inspector2/Generated/_bcl/AmazonInspector2Client.cs +++ b/sdk/src/Services/Inspector2/Generated/_bcl/AmazonInspector2Client.cs @@ -283,12 +283,6 @@ protected override void Dispose(bool disposing) /// The response from the AssociateMember service method, as returned by Inspector2. /// /// You do not have sufficient access to perform this action. - /// - /// - /// - /// For Enable, you receive this error if you attempt to use a feature in an unsupported - /// Amazon Web Services Region. - /// /// /// /// The request has failed due to an internal failure of the Amazon Inspector service. @@ -327,12 +321,6 @@ public virtual AssociateMemberResponse AssociateMember(AssociateMemberRequest re /// The response from the AssociateMember service method, as returned by Inspector2. /// /// You do not have sufficient access to perform this action. - /// - /// - /// - /// For Enable, you receive this error if you attempt to use a feature in an unsupported - /// Amazon Web Services Region. - /// /// /// /// The request has failed due to an internal failure of the Amazon Inspector service. @@ -368,12 +356,6 @@ public virtual AssociateMemberResponse AssociateMember(AssociateMemberRequest re /// The response from the BatchGetAccountStatus service method, as returned by Inspector2. /// /// You do not have sufficient access to perform this action. - /// - /// - /// - /// For Enable, you receive this error if you attempt to use a feature in an unsupported - /// Amazon Web Services Region. - /// /// /// /// The request has failed due to an internal failure of the Amazon Inspector service. @@ -412,12 +394,6 @@ public virtual BatchGetAccountStatusResponse BatchGetAccountStatus(BatchGetAccou /// The response from the BatchGetAccountStatus service method, as returned by Inspector2. /// /// You do not have sufficient access to perform this action. - /// - /// - /// - /// For Enable, you receive this error if you attempt to use a feature in an unsupported - /// Amazon Web Services Region. - /// /// /// /// The request has failed due to an internal failure of the Amazon Inspector service. @@ -457,12 +433,6 @@ public virtual BatchGetAccountStatusResponse BatchGetAccountStatus(BatchGetAccou /// The response from the BatchGetCodeSnippet service method, as returned by Inspector2. /// /// You do not have sufficient access to perform this action. - /// - /// - /// - /// For Enable, you receive this error if you attempt to use a feature in an unsupported - /// Amazon Web Services Region. - /// /// /// /// The request has failed due to an internal failure of the Amazon Inspector service. @@ -497,12 +467,6 @@ public virtual BatchGetCodeSnippetResponse BatchGetCodeSnippet(BatchGetCodeSnipp /// The response from the BatchGetCodeSnippet service method, as returned by Inspector2. /// /// You do not have sufficient access to perform this action. - /// - /// - /// - /// For Enable, you receive this error if you attempt to use a feature in an unsupported - /// Amazon Web Services Region. - /// /// /// /// The request has failed due to an internal failure of the Amazon Inspector service. @@ -537,12 +501,6 @@ public virtual BatchGetCodeSnippetResponse BatchGetCodeSnippet(BatchGetCodeSnipp /// The response from the BatchGetFindingDetails service method, as returned by Inspector2. /// /// You do not have sufficient access to perform this action. - /// - /// - /// - /// For Enable, you receive this error if you attempt to use a feature in an unsupported - /// Amazon Web Services Region. - /// /// /// /// The request has failed due to an internal failure of the Amazon Inspector service. @@ -576,12 +534,6 @@ public virtual BatchGetFindingDetailsResponse BatchGetFindingDetails(BatchGetFin /// The response from the BatchGetFindingDetails service method, as returned by Inspector2. /// /// You do not have sufficient access to perform this action. - /// - /// - /// - /// For Enable, you receive this error if you attempt to use a feature in an unsupported - /// Amazon Web Services Region. - /// /// /// /// The request has failed due to an internal failure of the Amazon Inspector service. @@ -616,12 +568,6 @@ public virtual BatchGetFindingDetailsResponse BatchGetFindingDetails(BatchGetFin /// The response from the BatchGetFreeTrialInfo service method, as returned by Inspector2. /// /// You do not have sufficient access to perform this action. - /// - /// - /// - /// For Enable, you receive this error if you attempt to use a feature in an unsupported - /// Amazon Web Services Region. - /// /// /// /// The request has failed due to an internal failure of the Amazon Inspector service. @@ -655,12 +601,6 @@ public virtual BatchGetFreeTrialInfoResponse BatchGetFreeTrialInfo(BatchGetFreeT /// The response from the BatchGetFreeTrialInfo service method, as returned by Inspector2. /// /// You do not have sufficient access to perform this action. - /// - /// - /// - /// For Enable, you receive this error if you attempt to use a feature in an unsupported - /// Amazon Web Services Region. - /// /// /// /// The request has failed due to an internal failure of the Amazon Inspector service. @@ -697,12 +637,6 @@ public virtual BatchGetFreeTrialInfoResponse BatchGetFreeTrialInfo(BatchGetFreeT /// The response from the BatchGetMemberEc2DeepInspectionStatus service method, as returned by Inspector2. /// /// You do not have sufficient access to perform this action. - /// - /// - /// - /// For Enable, you receive this error if you attempt to use a feature in an unsupported - /// Amazon Web Services Region. - /// /// /// /// The request has failed due to an internal failure of the Amazon Inspector service. @@ -738,12 +672,6 @@ public virtual BatchGetMemberEc2DeepInspectionStatusResponse BatchGetMemberEc2De /// The response from the BatchGetMemberEc2DeepInspectionStatus service method, as returned by Inspector2. /// /// You do not have sufficient access to perform this action. - /// - /// - /// - /// For Enable, you receive this error if you attempt to use a feature in an unsupported - /// Amazon Web Services Region. - /// /// /// /// The request has failed due to an internal failure of the Amazon Inspector service. @@ -780,12 +708,6 @@ public virtual BatchGetMemberEc2DeepInspectionStatusResponse BatchGetMemberEc2De /// The response from the BatchUpdateMemberEc2DeepInspectionStatus service method, as returned by Inspector2. /// /// You do not have sufficient access to perform this action. - /// - /// - /// - /// For Enable, you receive this error if you attempt to use a feature in an unsupported - /// Amazon Web Services Region. - /// /// /// /// The request has failed due to an internal failure of the Amazon Inspector service. @@ -821,12 +743,6 @@ public virtual BatchUpdateMemberEc2DeepInspectionStatusResponse BatchUpdateMembe /// The response from the BatchUpdateMemberEc2DeepInspectionStatus service method, as returned by Inspector2. /// /// You do not have sufficient access to perform this action. - /// - /// - /// - /// For Enable, you receive this error if you attempt to use a feature in an unsupported - /// Amazon Web Services Region. - /// /// /// /// The request has failed due to an internal failure of the Amazon Inspector service. @@ -861,12 +777,6 @@ public virtual BatchUpdateMemberEc2DeepInspectionStatusResponse BatchUpdateMembe /// The response from the CancelFindingsReport service method, as returned by Inspector2. /// /// You do not have sufficient access to perform this action. - /// - /// - /// - /// For Enable, you receive this error if you attempt to use a feature in an unsupported - /// Amazon Web Services Region. - /// /// /// /// The request has failed due to an internal failure of the Amazon Inspector service. @@ -904,12 +814,6 @@ public virtual CancelFindingsReportResponse CancelFindingsReport(CancelFindingsR /// The response from the CancelFindingsReport service method, as returned by Inspector2. /// /// You do not have sufficient access to perform this action. - /// - /// - /// - /// For Enable, you receive this error if you attempt to use a feature in an unsupported - /// Amazon Web Services Region. - /// /// /// /// The request has failed due to an internal failure of the Amazon Inspector service. @@ -948,12 +852,6 @@ public virtual CancelFindingsReportResponse CancelFindingsReport(CancelFindingsR /// The response from the CancelSbomExport service method, as returned by Inspector2. /// /// You do not have sufficient access to perform this action. - /// - /// - /// - /// For Enable, you receive this error if you attempt to use a feature in an unsupported - /// Amazon Web Services Region. - /// /// /// /// The request has failed due to an internal failure of the Amazon Inspector service. @@ -991,12 +889,6 @@ public virtual CancelSbomExportResponse CancelSbomExport(CancelSbomExportRequest /// The response from the CancelSbomExport service method, as returned by Inspector2. /// /// You do not have sufficient access to perform this action. - /// - /// - /// - /// For Enable, you receive this error if you attempt to use a feature in an unsupported - /// Amazon Web Services Region. - /// /// /// /// The request has failed due to an internal failure of the Amazon Inspector service. @@ -1035,12 +927,6 @@ public virtual CancelSbomExportResponse CancelSbomExport(CancelSbomExportRequest /// The response from the CreateCisScanConfiguration service method, as returned by Inspector2. /// /// You do not have sufficient access to perform this action. - /// - /// - /// - /// For Enable, you receive this error if you attempt to use a feature in an unsupported - /// Amazon Web Services Region. - /// /// /// /// The request has failed due to an internal failure of the Amazon Inspector service. @@ -1074,12 +960,6 @@ public virtual CreateCisScanConfigurationResponse CreateCisScanConfiguration(Cre /// The response from the CreateCisScanConfiguration service method, as returned by Inspector2. /// /// You do not have sufficient access to perform this action. - /// - /// - /// - /// For Enable, you receive this error if you attempt to use a feature in an unsupported - /// Amazon Web Services Region. - /// /// /// /// The request has failed due to an internal failure of the Amazon Inspector service. @@ -1115,12 +995,6 @@ public virtual CreateCisScanConfigurationResponse CreateCisScanConfiguration(Cre /// The response from the CreateFilter service method, as returned by Inspector2. /// /// You do not have sufficient access to perform this action. - /// - /// - /// - /// For Enable, you receive this error if you attempt to use a feature in an unsupported - /// Amazon Web Services Region. - /// /// /// /// One or more tags submitted as part of the request is not valid. @@ -1162,12 +1036,6 @@ public virtual CreateFilterResponse CreateFilter(CreateFilterRequest request) /// The response from the CreateFilter service method, as returned by Inspector2. /// /// You do not have sufficient access to perform this action. - /// - /// - /// - /// For Enable, you receive this error if you attempt to use a feature in an unsupported - /// Amazon Web Services Region. - /// /// /// /// One or more tags submitted as part of the request is not valid. @@ -1211,12 +1079,6 @@ public virtual CreateFilterResponse CreateFilter(CreateFilterRequest request) /// The response from the CreateFindingsReport service method, as returned by Inspector2. /// /// You do not have sufficient access to perform this action. - /// - /// - /// - /// For Enable, you receive this error if you attempt to use a feature in an unsupported - /// Amazon Web Services Region. - /// /// /// /// The request has failed due to an internal failure of the Amazon Inspector service. @@ -1256,12 +1118,6 @@ public virtual CreateFindingsReportResponse CreateFindingsReport(CreateFindingsR /// The response from the CreateFindingsReport service method, as returned by Inspector2. /// /// You do not have sufficient access to perform this action. - /// - /// - /// - /// For Enable, you receive this error if you attempt to use a feature in an unsupported - /// Amazon Web Services Region. - /// /// /// /// The request has failed due to an internal failure of the Amazon Inspector service. @@ -1300,12 +1156,6 @@ public virtual CreateFindingsReportResponse CreateFindingsReport(CreateFindingsR /// The response from the CreateSbomExport service method, as returned by Inspector2. /// /// You do not have sufficient access to perform this action. - /// - /// - /// - /// For Enable, you receive this error if you attempt to use a feature in an unsupported - /// Amazon Web Services Region. - /// /// /// /// The request has failed due to an internal failure of the Amazon Inspector service. @@ -1343,12 +1193,6 @@ public virtual CreateSbomExportResponse CreateSbomExport(CreateSbomExportRequest /// The response from the CreateSbomExport service method, as returned by Inspector2. /// /// You do not have sufficient access to perform this action. - /// - /// - /// - /// For Enable, you receive this error if you attempt to use a feature in an unsupported - /// Amazon Web Services Region. - /// /// /// /// The request has failed due to an internal failure of the Amazon Inspector service. @@ -1387,12 +1231,6 @@ public virtual CreateSbomExportResponse CreateSbomExport(CreateSbomExportRequest /// The response from the DeleteCisScanConfiguration service method, as returned by Inspector2. /// /// You do not have sufficient access to perform this action. - /// - /// - /// - /// For Enable, you receive this error if you attempt to use a feature in an unsupported - /// Amazon Web Services Region. - /// /// /// /// The request has failed due to an internal failure of the Amazon Inspector service. @@ -1430,12 +1268,6 @@ public virtual DeleteCisScanConfigurationResponse DeleteCisScanConfiguration(Del /// The response from the DeleteCisScanConfiguration service method, as returned by Inspector2. /// /// You do not have sufficient access to perform this action. - /// - /// - /// - /// For Enable, you receive this error if you attempt to use a feature in an unsupported - /// Amazon Web Services Region. - /// /// /// /// The request has failed due to an internal failure of the Amazon Inspector service. @@ -1474,12 +1306,6 @@ public virtual DeleteCisScanConfigurationResponse DeleteCisScanConfiguration(Del /// The response from the DeleteFilter service method, as returned by Inspector2. /// /// You do not have sufficient access to perform this action. - /// - /// - /// - /// For Enable, you receive this error if you attempt to use a feature in an unsupported - /// Amazon Web Services Region. - /// /// /// /// The request has failed due to an internal failure of the Amazon Inspector service. @@ -1517,12 +1343,6 @@ public virtual DeleteFilterResponse DeleteFilter(DeleteFilterRequest request) /// The response from the DeleteFilter service method, as returned by Inspector2. /// /// You do not have sufficient access to perform this action. - /// - /// - /// - /// For Enable, you receive this error if you attempt to use a feature in an unsupported - /// Amazon Web Services Region. - /// /// /// /// The request has failed due to an internal failure of the Amazon Inspector service. @@ -1561,12 +1381,6 @@ public virtual DeleteFilterResponse DeleteFilter(DeleteFilterRequest request) /// The response from the DescribeOrganizationConfiguration service method, as returned by Inspector2. /// /// You do not have sufficient access to perform this action. - /// - /// - /// - /// For Enable, you receive this error if you attempt to use a feature in an unsupported - /// Amazon Web Services Region. - /// /// /// /// The request has failed due to an internal failure of the Amazon Inspector service. @@ -1600,12 +1414,6 @@ public virtual DescribeOrganizationConfigurationResponse DescribeOrganizationCon /// The response from the DescribeOrganizationConfiguration service method, as returned by Inspector2. /// /// You do not have sufficient access to perform this action. - /// - /// - /// - /// For Enable, you receive this error if you attempt to use a feature in an unsupported - /// Amazon Web Services Region. - /// /// /// /// The request has failed due to an internal failure of the Amazon Inspector service. @@ -1641,12 +1449,6 @@ public virtual DescribeOrganizationConfigurationResponse DescribeOrganizationCon /// The response from the Disable service method, as returned by Inspector2. /// /// You do not have sufficient access to perform this action. - /// - /// - /// - /// For Enable, you receive this error if you attempt to use a feature in an unsupported - /// Amazon Web Services Region. - /// /// /// /// The request has failed due to an internal failure of the Amazon Inspector service. @@ -1685,12 +1487,6 @@ public virtual DisableResponse Disable(DisableRequest request) /// The response from the Disable service method, as returned by Inspector2. /// /// You do not have sufficient access to perform this action. - /// - /// - /// - /// For Enable, you receive this error if you attempt to use a feature in an unsupported - /// Amazon Web Services Region. - /// /// /// /// The request has failed due to an internal failure of the Amazon Inspector service. @@ -1729,12 +1525,6 @@ public virtual DisableResponse Disable(DisableRequest request) /// The response from the DisableDelegatedAdminAccount service method, as returned by Inspector2. /// /// You do not have sufficient access to perform this action. - /// - /// - /// - /// For Enable, you receive this error if you attempt to use a feature in an unsupported - /// Amazon Web Services Region. - /// /// /// /// A conflict occurred. @@ -1775,12 +1565,6 @@ public virtual DisableDelegatedAdminAccountResponse DisableDelegatedAdminAccount /// The response from the DisableDelegatedAdminAccount service method, as returned by Inspector2. /// /// You do not have sufficient access to perform this action. - /// - /// - /// - /// For Enable, you receive this error if you attempt to use a feature in an unsupported - /// Amazon Web Services Region. - /// /// /// /// A conflict occurred. @@ -1822,12 +1606,6 @@ public virtual DisableDelegatedAdminAccountResponse DisableDelegatedAdminAccount /// The response from the DisassociateMember service method, as returned by Inspector2. /// /// You do not have sufficient access to perform this action. - /// - /// - /// - /// For Enable, you receive this error if you attempt to use a feature in an unsupported - /// Amazon Web Services Region. - /// /// /// /// The request has failed due to an internal failure of the Amazon Inspector service. @@ -1861,12 +1639,6 @@ public virtual DisassociateMemberResponse DisassociateMember(DisassociateMemberR /// The response from the DisassociateMember service method, as returned by Inspector2. /// /// You do not have sufficient access to perform this action. - /// - /// - /// - /// For Enable, you receive this error if you attempt to use a feature in an unsupported - /// Amazon Web Services Region. - /// /// /// /// The request has failed due to an internal failure of the Amazon Inspector service. @@ -1901,12 +1673,6 @@ public virtual DisassociateMemberResponse DisassociateMember(DisassociateMemberR /// The response from the Enable service method, as returned by Inspector2. /// /// You do not have sufficient access to perform this action. - /// - /// - /// - /// For Enable, you receive this error if you attempt to use a feature in an unsupported - /// Amazon Web Services Region. - /// /// /// /// The request has failed due to an internal failure of the Amazon Inspector service. @@ -1944,12 +1710,6 @@ public virtual EnableResponse Enable(EnableRequest request) /// The response from the Enable service method, as returned by Inspector2. /// /// You do not have sufficient access to perform this action. - /// - /// - /// - /// For Enable, you receive this error if you attempt to use a feature in an unsupported - /// Amazon Web Services Region. - /// /// /// /// The request has failed due to an internal failure of the Amazon Inspector service. @@ -1988,12 +1748,6 @@ public virtual EnableResponse Enable(EnableRequest request) /// The response from the EnableDelegatedAdminAccount service method, as returned by Inspector2. /// /// You do not have sufficient access to perform this action. - /// - /// - /// - /// For Enable, you receive this error if you attempt to use a feature in an unsupported - /// Amazon Web Services Region. - /// /// /// /// A conflict occurred. @@ -2034,12 +1788,6 @@ public virtual EnableDelegatedAdminAccountResponse EnableDelegatedAdminAccount(E /// The response from the EnableDelegatedAdminAccount service method, as returned by Inspector2. /// /// You do not have sufficient access to perform this action. - /// - /// - /// - /// For Enable, you receive this error if you attempt to use a feature in an unsupported - /// Amazon Web Services Region. - /// /// /// /// A conflict occurred. @@ -2081,12 +1829,6 @@ public virtual EnableDelegatedAdminAccountResponse EnableDelegatedAdminAccount(E /// The response from the GetCisScanReport service method, as returned by Inspector2. /// /// You do not have sufficient access to perform this action. - /// - /// - /// - /// For Enable, you receive this error if you attempt to use a feature in an unsupported - /// Amazon Web Services Region. - /// /// /// /// The request has failed due to an internal failure of the Amazon Inspector service. @@ -2124,12 +1866,6 @@ public virtual GetCisScanReportResponse GetCisScanReport(GetCisScanReportRequest /// The response from the GetCisScanReport service method, as returned by Inspector2. /// /// You do not have sufficient access to perform this action. - /// - /// - /// - /// For Enable, you receive this error if you attempt to use a feature in an unsupported - /// Amazon Web Services Region. - /// /// /// /// The request has failed due to an internal failure of the Amazon Inspector service. @@ -2168,12 +1904,6 @@ public virtual GetCisScanReportResponse GetCisScanReport(GetCisScanReportRequest /// The response from the GetCisScanResultDetails service method, as returned by Inspector2. /// /// You do not have sufficient access to perform this action. - /// - /// - /// - /// For Enable, you receive this error if you attempt to use a feature in an unsupported - /// Amazon Web Services Region. - /// /// /// /// The request has failed due to an internal failure of the Amazon Inspector service. @@ -2207,12 +1937,6 @@ public virtual GetCisScanResultDetailsResponse GetCisScanResultDetails(GetCisSca /// The response from the GetCisScanResultDetails service method, as returned by Inspector2. /// /// You do not have sufficient access to perform this action. - /// - /// - /// - /// For Enable, you receive this error if you attempt to use a feature in an unsupported - /// Amazon Web Services Region. - /// /// /// /// The request has failed due to an internal failure of the Amazon Inspector service. @@ -2309,12 +2033,6 @@ public virtual GetConfigurationResponse GetConfiguration(GetConfigurationRequest /// The response from the GetDelegatedAdminAccount service method, as returned by Inspector2. /// /// You do not have sufficient access to perform this action. - /// - /// - /// - /// For Enable, you receive this error if you attempt to use a feature in an unsupported - /// Amazon Web Services Region. - /// /// /// /// The request has failed due to an internal failure of the Amazon Inspector service. @@ -2353,12 +2071,6 @@ public virtual GetDelegatedAdminAccountResponse GetDelegatedAdminAccount(GetDele /// The response from the GetDelegatedAdminAccount service method, as returned by Inspector2. /// /// You do not have sufficient access to perform this action. - /// - /// - /// - /// For Enable, you receive this error if you attempt to use a feature in an unsupported - /// Amazon Web Services Region. - /// /// /// /// The request has failed due to an internal failure of the Amazon Inspector service. @@ -2398,12 +2110,6 @@ public virtual GetDelegatedAdminAccountResponse GetDelegatedAdminAccount(GetDele /// The response from the GetEc2DeepInspectionConfiguration service method, as returned by Inspector2. /// /// You do not have sufficient access to perform this action. - /// - /// - /// - /// For Enable, you receive this error if you attempt to use a feature in an unsupported - /// Amazon Web Services Region. - /// /// /// /// The request has failed due to an internal failure of the Amazon Inspector service. @@ -2438,12 +2144,6 @@ public virtual GetEc2DeepInspectionConfigurationResponse GetEc2DeepInspectionCon /// The response from the GetEc2DeepInspectionConfiguration service method, as returned by Inspector2. /// /// You do not have sufficient access to perform this action. - /// - /// - /// - /// For Enable, you receive this error if you attempt to use a feature in an unsupported - /// Amazon Web Services Region. - /// /// /// /// The request has failed due to an internal failure of the Amazon Inspector service. @@ -2478,12 +2178,6 @@ public virtual GetEc2DeepInspectionConfigurationResponse GetEc2DeepInspectionCon /// The response from the GetEncryptionKey service method, as returned by Inspector2. /// /// You do not have sufficient access to perform this action. - /// - /// - /// - /// For Enable, you receive this error if you attempt to use a feature in an unsupported - /// Amazon Web Services Region. - /// /// /// /// The request has failed due to an internal failure of the Amazon Inspector service. @@ -2521,12 +2215,6 @@ public virtual GetEncryptionKeyResponse GetEncryptionKey(GetEncryptionKeyRequest /// The response from the GetEncryptionKey service method, as returned by Inspector2. /// /// You do not have sufficient access to perform this action. - /// - /// - /// - /// For Enable, you receive this error if you attempt to use a feature in an unsupported - /// Amazon Web Services Region. - /// /// /// /// The request has failed due to an internal failure of the Amazon Inspector service. @@ -2565,12 +2253,6 @@ public virtual GetEncryptionKeyResponse GetEncryptionKey(GetEncryptionKeyRequest /// The response from the GetFindingsReportStatus service method, as returned by Inspector2. /// /// You do not have sufficient access to perform this action. - /// - /// - /// - /// For Enable, you receive this error if you attempt to use a feature in an unsupported - /// Amazon Web Services Region. - /// /// /// /// The request has failed due to an internal failure of the Amazon Inspector service. @@ -2608,12 +2290,6 @@ public virtual GetFindingsReportStatusResponse GetFindingsReportStatus(GetFindin /// The response from the GetFindingsReportStatus service method, as returned by Inspector2. /// /// You do not have sufficient access to perform this action. - /// - /// - /// - /// For Enable, you receive this error if you attempt to use a feature in an unsupported - /// Amazon Web Services Region. - /// /// /// /// The request has failed due to an internal failure of the Amazon Inspector service. @@ -2652,12 +2328,6 @@ public virtual GetFindingsReportStatusResponse GetFindingsReportStatus(GetFindin /// The response from the GetMember service method, as returned by Inspector2. /// /// You do not have sufficient access to perform this action. - /// - /// - /// - /// For Enable, you receive this error if you attempt to use a feature in an unsupported - /// Amazon Web Services Region. - /// /// /// /// The request has failed due to an internal failure of the Amazon Inspector service. @@ -2695,12 +2365,6 @@ public virtual GetMemberResponse GetMember(GetMemberRequest request) /// The response from the GetMember service method, as returned by Inspector2. /// /// You do not have sufficient access to perform this action. - /// - /// - /// - /// For Enable, you receive this error if you attempt to use a feature in an unsupported - /// Amazon Web Services Region. - /// /// /// /// The request has failed due to an internal failure of the Amazon Inspector service. @@ -2739,12 +2403,6 @@ public virtual GetMemberResponse GetMember(GetMemberRequest request) /// The response from the GetSbomExport service method, as returned by Inspector2. /// /// You do not have sufficient access to perform this action. - /// - /// - /// - /// For Enable, you receive this error if you attempt to use a feature in an unsupported - /// Amazon Web Services Region. - /// /// /// /// The request has failed due to an internal failure of the Amazon Inspector service. @@ -2782,12 +2440,6 @@ public virtual GetSbomExportResponse GetSbomExport(GetSbomExportRequest request) /// The response from the GetSbomExport service method, as returned by Inspector2. /// /// You do not have sufficient access to perform this action. - /// - /// - /// - /// For Enable, you receive this error if you attempt to use a feature in an unsupported - /// Amazon Web Services Region. - /// /// /// /// The request has failed due to an internal failure of the Amazon Inspector service. @@ -2826,12 +2478,6 @@ public virtual GetSbomExportResponse GetSbomExport(GetSbomExportRequest request) /// The response from the ListAccountPermissions service method, as returned by Inspector2. /// /// You do not have sufficient access to perform this action. - /// - /// - /// - /// For Enable, you receive this error if you attempt to use a feature in an unsupported - /// Amazon Web Services Region. - /// /// /// /// The request has failed due to an internal failure of the Amazon Inspector service. @@ -2865,12 +2511,6 @@ public virtual ListAccountPermissionsResponse ListAccountPermissions(ListAccount /// The response from the ListAccountPermissions service method, as returned by Inspector2. /// /// You do not have sufficient access to perform this action. - /// - /// - /// - /// For Enable, you receive this error if you attempt to use a feature in an unsupported - /// Amazon Web Services Region. - /// /// /// /// The request has failed due to an internal failure of the Amazon Inspector service. @@ -2905,12 +2545,6 @@ public virtual ListAccountPermissionsResponse ListAccountPermissions(ListAccount /// The response from the ListCisScanConfigurations service method, as returned by Inspector2. /// /// You do not have sufficient access to perform this action. - /// - /// - /// - /// For Enable, you receive this error if you attempt to use a feature in an unsupported - /// Amazon Web Services Region. - /// /// /// /// The request has failed due to an internal failure of the Amazon Inspector service. @@ -2944,12 +2578,6 @@ public virtual ListCisScanConfigurationsResponse ListCisScanConfigurations(ListC /// The response from the ListCisScanConfigurations service method, as returned by Inspector2. /// /// You do not have sufficient access to perform this action. - /// - /// - /// - /// For Enable, you receive this error if you attempt to use a feature in an unsupported - /// Amazon Web Services Region. - /// /// /// /// The request has failed due to an internal failure of the Amazon Inspector service. @@ -2984,12 +2612,6 @@ public virtual ListCisScanConfigurationsResponse ListCisScanConfigurations(ListC /// The response from the ListCisScanResultsAggregatedByChecks service method, as returned by Inspector2. /// /// You do not have sufficient access to perform this action. - /// - /// - /// - /// For Enable, you receive this error if you attempt to use a feature in an unsupported - /// Amazon Web Services Region. - /// /// /// /// The request has failed due to an internal failure of the Amazon Inspector service. @@ -3023,12 +2645,6 @@ public virtual ListCisScanResultsAggregatedByChecksResponse ListCisScanResultsAg /// The response from the ListCisScanResultsAggregatedByChecks service method, as returned by Inspector2. /// /// You do not have sufficient access to perform this action. - /// - /// - /// - /// For Enable, you receive this error if you attempt to use a feature in an unsupported - /// Amazon Web Services Region. - /// /// /// /// The request has failed due to an internal failure of the Amazon Inspector service. @@ -3063,12 +2679,6 @@ public virtual ListCisScanResultsAggregatedByChecksResponse ListCisScanResultsAg /// The response from the ListCisScanResultsAggregatedByTargetResource service method, as returned by Inspector2. /// /// You do not have sufficient access to perform this action. - /// - /// - /// - /// For Enable, you receive this error if you attempt to use a feature in an unsupported - /// Amazon Web Services Region. - /// /// /// /// The request has failed due to an internal failure of the Amazon Inspector service. @@ -3102,12 +2712,6 @@ public virtual ListCisScanResultsAggregatedByTargetResourceResponse ListCisScanR /// The response from the ListCisScanResultsAggregatedByTargetResource service method, as returned by Inspector2. /// /// You do not have sufficient access to perform this action. - /// - /// - /// - /// For Enable, you receive this error if you attempt to use a feature in an unsupported - /// Amazon Web Services Region. - /// /// /// /// The request has failed due to an internal failure of the Amazon Inspector service. @@ -3142,12 +2746,6 @@ public virtual ListCisScanResultsAggregatedByTargetResourceResponse ListCisScanR /// The response from the ListCisScans service method, as returned by Inspector2. /// /// You do not have sufficient access to perform this action. - /// - /// - /// - /// For Enable, you receive this error if you attempt to use a feature in an unsupported - /// Amazon Web Services Region. - /// /// /// /// The request has failed due to an internal failure of the Amazon Inspector service. @@ -3181,12 +2779,6 @@ public virtual ListCisScansResponse ListCisScans(ListCisScansRequest request) /// The response from the ListCisScans service method, as returned by Inspector2. /// /// You do not have sufficient access to perform this action. - /// - /// - /// - /// For Enable, you receive this error if you attempt to use a feature in an unsupported - /// Amazon Web Services Region. - /// /// /// /// The request has failed due to an internal failure of the Amazon Inspector service. @@ -3214,7 +2806,7 @@ public virtual ListCisScansResponse ListCisScans(ListCisScansRequest request) /// - /// Lists coverage details for you environment. + /// Lists coverage details for your environment. /// /// Container for the necessary parameters to execute the ListCoverage service method. /// @@ -3241,7 +2833,7 @@ public virtual ListCoverageResponse ListCoverage(ListCoverageRequest request) /// - /// Lists coverage details for you environment. + /// Lists coverage details for your environment. /// /// Container for the necessary parameters to execute the ListCoverage service method. /// @@ -3343,12 +2935,6 @@ public virtual ListCoverageStatisticsResponse ListCoverageStatistics(ListCoverag /// The response from the ListDelegatedAdminAccounts service method, as returned by Inspector2. /// /// You do not have sufficient access to perform this action. - /// - /// - /// - /// For Enable, you receive this error if you attempt to use a feature in an unsupported - /// Amazon Web Services Region. - /// /// /// /// The request has failed due to an internal failure of the Amazon Inspector service. @@ -3382,12 +2968,6 @@ public virtual ListDelegatedAdminAccountsResponse ListDelegatedAdminAccounts(Lis /// The response from the ListDelegatedAdminAccounts service method, as returned by Inspector2. /// /// You do not have sufficient access to perform this action. - /// - /// - /// - /// For Enable, you receive this error if you attempt to use a feature in an unsupported - /// Amazon Web Services Region. - /// /// /// /// The request has failed due to an internal failure of the Amazon Inspector service. @@ -3422,12 +3002,6 @@ public virtual ListDelegatedAdminAccountsResponse ListDelegatedAdminAccounts(Lis /// The response from the ListFilters service method, as returned by Inspector2. /// /// You do not have sufficient access to perform this action. - /// - /// - /// - /// For Enable, you receive this error if you attempt to use a feature in an unsupported - /// Amazon Web Services Region. - /// /// /// /// The request has failed due to an internal failure of the Amazon Inspector service. @@ -3461,12 +3035,6 @@ public virtual ListFiltersResponse ListFilters(ListFiltersRequest request) /// The response from the ListFilters service method, as returned by Inspector2. /// /// You do not have sufficient access to perform this action. - /// - /// - /// - /// For Enable, you receive this error if you attempt to use a feature in an unsupported - /// Amazon Web Services Region. - /// /// /// /// The request has failed due to an internal failure of the Amazon Inspector service. @@ -3624,12 +3192,6 @@ public virtual ListFindingsResponse ListFindings(ListFindingsRequest request) /// The response from the ListMembers service method, as returned by Inspector2. /// /// You do not have sufficient access to perform this action. - /// - /// - /// - /// For Enable, you receive this error if you attempt to use a feature in an unsupported - /// Amazon Web Services Region. - /// /// /// /// The request has failed due to an internal failure of the Amazon Inspector service. @@ -3664,12 +3226,6 @@ public virtual ListMembersResponse ListMembers(ListMembersRequest request) /// The response from the ListMembers service method, as returned by Inspector2. /// /// You do not have sufficient access to perform this action. - /// - /// - /// - /// For Enable, you receive this error if you attempt to use a feature in an unsupported - /// Amazon Web Services Region. - /// /// /// /// The request has failed due to an internal failure of the Amazon Inspector service. @@ -3773,12 +3329,6 @@ public virtual ListTagsForResourceResponse ListTagsForResource(ListTagsForResour /// The response from the ListUsageTotals service method, as returned by Inspector2. /// /// You do not have sufficient access to perform this action. - /// - /// - /// - /// For Enable, you receive this error if you attempt to use a feature in an unsupported - /// Amazon Web Services Region. - /// /// /// /// The request has failed due to an internal failure of the Amazon Inspector service. @@ -3812,12 +3362,6 @@ public virtual ListUsageTotalsResponse ListUsageTotals(ListUsageTotalsRequest re /// The response from the ListUsageTotals service method, as returned by Inspector2. /// /// You do not have sufficient access to perform this action. - /// - /// - /// - /// For Enable, you receive this error if you attempt to use a feature in an unsupported - /// Amazon Web Services Region. - /// /// /// /// The request has failed due to an internal failure of the Amazon Inspector service. @@ -3853,12 +3397,6 @@ public virtual ListUsageTotalsResponse ListUsageTotals(ListUsageTotalsRequest re /// The response from the ResetEncryptionKey service method, as returned by Inspector2. /// /// You do not have sufficient access to perform this action. - /// - /// - /// - /// For Enable, you receive this error if you attempt to use a feature in an unsupported - /// Amazon Web Services Region. - /// /// /// /// The request has failed due to an internal failure of the Amazon Inspector service. @@ -3897,12 +3435,6 @@ public virtual ResetEncryptionKeyResponse ResetEncryptionKey(ResetEncryptionKeyR /// The response from the ResetEncryptionKey service method, as returned by Inspector2. /// /// You do not have sufficient access to perform this action. - /// - /// - /// - /// For Enable, you receive this error if you attempt to use a feature in an unsupported - /// Amazon Web Services Region. - /// /// /// /// The request has failed due to an internal failure of the Amazon Inspector service. @@ -3941,12 +3473,6 @@ public virtual ResetEncryptionKeyResponse ResetEncryptionKey(ResetEncryptionKeyR /// The response from the SearchVulnerabilities service method, as returned by Inspector2. /// /// You do not have sufficient access to perform this action. - /// - /// - /// - /// For Enable, you receive this error if you attempt to use a feature in an unsupported - /// Amazon Web Services Region. - /// /// /// /// The request has failed due to an internal failure of the Amazon Inspector service. @@ -3980,12 +3506,6 @@ public virtual SearchVulnerabilitiesResponse SearchVulnerabilities(SearchVulnera /// The response from the SearchVulnerabilities service method, as returned by Inspector2. /// /// You do not have sufficient access to perform this action. - /// - /// - /// - /// For Enable, you receive this error if you attempt to use a feature in an unsupported - /// Amazon Web Services Region. - /// /// /// /// The request has failed due to an internal failure of the Amazon Inspector service. @@ -4022,12 +3542,6 @@ public virtual SearchVulnerabilitiesResponse SearchVulnerabilities(SearchVulnera /// The response from the SendCisSessionHealth service method, as returned by Inspector2. /// /// You do not have sufficient access to perform this action. - /// - /// - /// - /// For Enable, you receive this error if you attempt to use a feature in an unsupported - /// Amazon Web Services Region. - /// /// /// /// A conflict occurred. @@ -4066,12 +3580,6 @@ public virtual SendCisSessionHealthResponse SendCisSessionHealth(SendCisSessionH /// The response from the SendCisSessionHealth service method, as returned by Inspector2. /// /// You do not have sufficient access to perform this action. - /// - /// - /// - /// For Enable, you receive this error if you attempt to use a feature in an unsupported - /// Amazon Web Services Region. - /// /// /// /// A conflict occurred. @@ -4111,12 +3619,6 @@ public virtual SendCisSessionHealthResponse SendCisSessionHealth(SendCisSessionH /// The response from the SendCisSessionTelemetry service method, as returned by Inspector2. /// /// You do not have sufficient access to perform this action. - /// - /// - /// - /// For Enable, you receive this error if you attempt to use a feature in an unsupported - /// Amazon Web Services Region. - /// /// /// /// A conflict occurred. @@ -4155,12 +3657,6 @@ public virtual SendCisSessionTelemetryResponse SendCisSessionTelemetry(SendCisSe /// The response from the SendCisSessionTelemetry service method, as returned by Inspector2. /// /// You do not have sufficient access to perform this action. - /// - /// - /// - /// For Enable, you receive this error if you attempt to use a feature in an unsupported - /// Amazon Web Services Region. - /// /// /// /// A conflict occurred. @@ -4200,12 +3696,6 @@ public virtual SendCisSessionTelemetryResponse SendCisSessionTelemetry(SendCisSe /// The response from the StartCisSession service method, as returned by Inspector2. /// /// You do not have sufficient access to perform this action. - /// - /// - /// - /// For Enable, you receive this error if you attempt to use a feature in an unsupported - /// Amazon Web Services Region. - /// /// /// /// A conflict occurred. @@ -4244,12 +3734,6 @@ public virtual StartCisSessionResponse StartCisSession(StartCisSessionRequest re /// The response from the StartCisSession service method, as returned by Inspector2. /// /// You do not have sufficient access to perform this action. - /// - /// - /// - /// For Enable, you receive this error if you attempt to use a feature in an unsupported - /// Amazon Web Services Region. - /// /// /// /// A conflict occurred. @@ -4282,19 +3766,13 @@ public virtual StartCisSessionResponse StartCisSession(StartCisSessionRequest re /// /// Stops a CIS session. This API is used by the Amazon Inspector SSM plugin to communicate /// with the Amazon Inspector service. The Amazon Inspector SSM plugin calls this API - /// to start a CIS scan session for the scan ID supplied by the service. + /// to stop a CIS scan session for the scan ID supplied by the service. /// /// Container for the necessary parameters to execute the StopCisSession service method. /// /// The response from the StopCisSession service method, as returned by Inspector2. /// /// You do not have sufficient access to perform this action. - /// - /// - /// - /// For Enable, you receive this error if you attempt to use a feature in an unsupported - /// Amazon Web Services Region. - /// /// /// /// A conflict occurred. @@ -4323,7 +3801,7 @@ public virtual StopCisSessionResponse StopCisSession(StopCisSessionRequest reque /// /// Stops a CIS session. This API is used by the Amazon Inspector SSM plugin to communicate /// with the Amazon Inspector service. The Amazon Inspector SSM plugin calls this API - /// to start a CIS scan session for the scan ID supplied by the service. + /// to stop a CIS scan session for the scan ID supplied by the service. /// /// Container for the necessary parameters to execute the StopCisSession service method. /// @@ -4333,12 +3811,6 @@ public virtual StopCisSessionResponse StopCisSession(StopCisSessionRequest reque /// The response from the StopCisSession service method, as returned by Inspector2. /// /// You do not have sufficient access to perform this action. - /// - /// - /// - /// For Enable, you receive this error if you attempt to use a feature in an unsupported - /// Amazon Web Services Region. - /// /// /// /// A conflict occurred. @@ -4520,12 +3992,6 @@ public virtual UntagResourceResponse UntagResource(UntagResourceRequest request) /// The response from the UpdateCisScanConfiguration service method, as returned by Inspector2. /// /// You do not have sufficient access to perform this action. - /// - /// - /// - /// For Enable, you receive this error if you attempt to use a feature in an unsupported - /// Amazon Web Services Region. - /// /// /// /// The request has failed due to an internal failure of the Amazon Inspector service. @@ -4563,12 +4029,6 @@ public virtual UpdateCisScanConfigurationResponse UpdateCisScanConfiguration(Upd /// The response from the UpdateCisScanConfiguration service method, as returned by Inspector2. /// /// You do not have sufficient access to perform this action. - /// - /// - /// - /// For Enable, you receive this error if you attempt to use a feature in an unsupported - /// Amazon Web Services Region. - /// /// /// /// The request has failed due to an internal failure of the Amazon Inspector service. @@ -4609,12 +4069,6 @@ public virtual UpdateCisScanConfigurationResponse UpdateCisScanConfiguration(Upd /// The response from the UpdateConfiguration service method, as returned by Inspector2. /// /// You do not have sufficient access to perform this action. - /// - /// - /// - /// For Enable, you receive this error if you attempt to use a feature in an unsupported - /// Amazon Web Services Region. - /// /// /// /// The request has failed due to an internal failure of the Amazon Inspector service. @@ -4650,12 +4104,6 @@ public virtual UpdateConfigurationResponse UpdateConfiguration(UpdateConfigurati /// The response from the UpdateConfiguration service method, as returned by Inspector2. /// /// You do not have sufficient access to perform this action. - /// - /// - /// - /// For Enable, you receive this error if you attempt to use a feature in an unsupported - /// Amazon Web Services Region. - /// /// /// /// The request has failed due to an internal failure of the Amazon Inspector service. @@ -4691,12 +4139,6 @@ public virtual UpdateConfigurationResponse UpdateConfiguration(UpdateConfigurati /// The response from the UpdateEc2DeepInspectionConfiguration service method, as returned by Inspector2. /// /// You do not have sufficient access to perform this action. - /// - /// - /// - /// For Enable, you receive this error if you attempt to use a feature in an unsupported - /// Amazon Web Services Region. - /// /// /// /// The request has failed due to an internal failure of the Amazon Inspector service. @@ -4731,12 +4173,6 @@ public virtual UpdateEc2DeepInspectionConfigurationResponse UpdateEc2DeepInspect /// The response from the UpdateEc2DeepInspectionConfiguration service method, as returned by Inspector2. /// /// You do not have sufficient access to perform this action. - /// - /// - /// - /// For Enable, you receive this error if you attempt to use a feature in an unsupported - /// Amazon Web Services Region. - /// /// /// /// The request has failed due to an internal failure of the Amazon Inspector service. @@ -4772,12 +4208,6 @@ public virtual UpdateEc2DeepInspectionConfigurationResponse UpdateEc2DeepInspect /// The response from the UpdateEncryptionKey service method, as returned by Inspector2. /// /// You do not have sufficient access to perform this action. - /// - /// - /// - /// For Enable, you receive this error if you attempt to use a feature in an unsupported - /// Amazon Web Services Region. - /// /// /// /// The request has failed due to an internal failure of the Amazon Inspector service. @@ -4816,12 +4246,6 @@ public virtual UpdateEncryptionKeyResponse UpdateEncryptionKey(UpdateEncryptionK /// The response from the UpdateEncryptionKey service method, as returned by Inspector2. /// /// You do not have sufficient access to perform this action. - /// - /// - /// - /// For Enable, you receive this error if you attempt to use a feature in an unsupported - /// Amazon Web Services Region. - /// /// /// /// The request has failed due to an internal failure of the Amazon Inspector service. @@ -4860,12 +4284,6 @@ public virtual UpdateEncryptionKeyResponse UpdateEncryptionKey(UpdateEncryptionK /// The response from the UpdateFilter service method, as returned by Inspector2. /// /// You do not have sufficient access to perform this action. - /// - /// - /// - /// For Enable, you receive this error if you attempt to use a feature in an unsupported - /// Amazon Web Services Region. - /// /// /// /// The request has failed due to an internal failure of the Amazon Inspector service. @@ -4903,12 +4321,6 @@ public virtual UpdateFilterResponse UpdateFilter(UpdateFilterRequest request) /// The response from the UpdateFilter service method, as returned by Inspector2. /// /// You do not have sufficient access to perform this action. - /// - /// - /// - /// For Enable, you receive this error if you attempt to use a feature in an unsupported - /// Amazon Web Services Region. - /// /// /// /// The request has failed due to an internal failure of the Amazon Inspector service. @@ -4947,12 +4359,6 @@ public virtual UpdateFilterResponse UpdateFilter(UpdateFilterRequest request) /// The response from the UpdateOrganizationConfiguration service method, as returned by Inspector2. /// /// You do not have sufficient access to perform this action. - /// - /// - /// - /// For Enable, you receive this error if you attempt to use a feature in an unsupported - /// Amazon Web Services Region. - /// /// /// /// The request has failed due to an internal failure of the Amazon Inspector service. @@ -4986,12 +4392,6 @@ public virtual UpdateOrganizationConfigurationResponse UpdateOrganizationConfigu /// The response from the UpdateOrganizationConfiguration service method, as returned by Inspector2. /// /// You do not have sufficient access to perform this action. - /// - /// - /// - /// For Enable, you receive this error if you attempt to use a feature in an unsupported - /// Amazon Web Services Region. - /// /// /// /// The request has failed due to an internal failure of the Amazon Inspector service. @@ -5027,12 +4427,6 @@ public virtual UpdateOrganizationConfigurationResponse UpdateOrganizationConfigu /// The response from the UpdateOrgEc2DeepInspectionConfiguration service method, as returned by Inspector2. /// /// You do not have sufficient access to perform this action. - /// - /// - /// - /// For Enable, you receive this error if you attempt to use a feature in an unsupported - /// Amazon Web Services Region. - /// /// /// /// The request has failed due to an internal failure of the Amazon Inspector service. @@ -5067,12 +4461,6 @@ public virtual UpdateOrgEc2DeepInspectionConfigurationResponse UpdateOrgEc2DeepI /// The response from the UpdateOrgEc2DeepInspectionConfiguration service method, as returned by Inspector2. /// /// You do not have sufficient access to perform this action. - /// - /// - /// - /// For Enable, you receive this error if you attempt to use a feature in an unsupported - /// Amazon Web Services Region. - /// /// /// /// The request has failed due to an internal failure of the Amazon Inspector service. diff --git a/sdk/src/Services/Inspector2/Inspector2.sln b/sdk/src/Services/Inspector2/Inspector2.sln index 8eeae1fc5a33..eb4f89f045c9 100644 --- a/sdk/src/Services/Inspector2/Inspector2.sln +++ b/sdk/src/Services/Inspector2/Inspector2.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {EFEC12AE-28BF-4C6B-A5AD-CDC1DE28776E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {EFEC12AE-28BF-4C6B-A5AD-CDC1DE28776E}.Debug|Any CPU.Build.0 = Debug|Any CPU {EFEC12AE-28BF-4C6B-A5AD-CDC1DE28776E}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {0C9C8F4B-9CF0-488A-A873-CA681CDC97A7}.Debug|Any CPU.Build.0 = Debug|Any CPU {0C9C8F4B-9CF0-488A-A873-CA681CDC97A7}.Release|Any CPU.ActiveCfg = Release|Any CPU {0C9C8F4B-9CF0-488A-A873-CA681CDC97A7}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {68B4D472-FB9E-4408-BF12-7968AD0A1A9D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {68B4D472-FB9E-4408-BF12-7968AD0A1A9D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {68B4D472-FB9E-4408-BF12-7968AD0A1A9D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {68B4D472-FB9E-4408-BF12-7968AD0A1A9D}.Release|Any CPU.Build.0 = Release|Any CPU - {E7CD8D65-2C81-41B8-A537-EE6577F69244}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E7CD8D65-2C81-41B8-A537-EE6577F69244}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E7CD8D65-2C81-41B8-A537-EE6577F69244}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E7CD8D65-2C81-41B8-A537-EE6577F69244}.Release|Any CPU.Build.0 = Release|Any CPU - {714561E4-8F85-414E-AFC6-BA33D5F95D14}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {714561E4-8F85-414E-AFC6-BA33D5F95D14}.Debug|Any CPU.Build.0 = Debug|Any CPU - {714561E4-8F85-414E-AFC6-BA33D5F95D14}.Release|Any CPU.ActiveCfg = Release|Any CPU - {714561E4-8F85-414E-AFC6-BA33D5F95D14}.Release|Any CPU.Build.0 = Release|Any CPU - {82F23FBF-3AD6-4204-9D18-806B16222FAB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {82F23FBF-3AD6-4204-9D18-806B16222FAB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {82F23FBF-3AD6-4204-9D18-806B16222FAB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {82F23FBF-3AD6-4204-9D18-806B16222FAB}.Release|Any CPU.Build.0 = Release|Any CPU - {8709562F-51CA-421C-B817-72FFE95399EC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8709562F-51CA-421C-B817-72FFE95399EC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8709562F-51CA-421C-B817-72FFE95399EC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8709562F-51CA-421C-B817-72FFE95399EC}.Release|Any CPU.Build.0 = Release|Any CPU - {B86AB14C-3F22-4C5D-B0D3-1F31A122C05B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B86AB14C-3F22-4C5D-B0D3-1F31A122C05B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B86AB14C-3F22-4C5D-B0D3-1F31A122C05B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B86AB14C-3F22-4C5D-B0D3-1F31A122C05B}.Release|Any CPU.Build.0 = Release|Any CPU - {C95B7532-A598-4B8A-ABDA-663C154830B9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C95B7532-A598-4B8A-ABDA-663C154830B9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C95B7532-A598-4B8A-ABDA-663C154830B9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C95B7532-A598-4B8A-ABDA-663C154830B9}.Release|Any CPU.Build.0 = Release|Any CPU - {D38A73D3-624C-40D5-A5DB-BE9490E26ED8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D38A73D3-624C-40D5-A5DB-BE9490E26ED8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D38A73D3-624C-40D5-A5DB-BE9490E26ED8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D38A73D3-624C-40D5-A5DB-BE9490E26ED8}.Release|Any CPU.Build.0 = Release|Any CPU - {AECFD44B-30EE-4522-9C30-2B6A8457DF55}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AECFD44B-30EE-4522-9C30-2B6A8457DF55}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AECFD44B-30EE-4522-9C30-2B6A8457DF55}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AECFD44B-30EE-4522-9C30-2B6A8457DF55}.Release|Any CPU.Build.0 = Release|Any CPU - {7C7FDACD-416D-41F4-B65B-C8FAAD5A9168}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7C7FDACD-416D-41F4-B65B-C8FAAD5A9168}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7C7FDACD-416D-41F4-B65B-C8FAAD5A9168}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7C7FDACD-416D-41F4-B65B-C8FAAD5A9168}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {68B4D472-FB9E-4408-BF12-7968AD0A1A9D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {68B4D472-FB9E-4408-BF12-7968AD0A1A9D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {68B4D472-FB9E-4408-BF12-7968AD0A1A9D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {68B4D472-FB9E-4408-BF12-7968AD0A1A9D}.Release|Any CPU.Build.0 = Release|Any CPU - {E7CD8D65-2C81-41B8-A537-EE6577F69244}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E7CD8D65-2C81-41B8-A537-EE6577F69244}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E7CD8D65-2C81-41B8-A537-EE6577F69244}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E7CD8D65-2C81-41B8-A537-EE6577F69244}.Release|Any CPU.Build.0 = Release|Any CPU - {714561E4-8F85-414E-AFC6-BA33D5F95D14}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {714561E4-8F85-414E-AFC6-BA33D5F95D14}.Debug|Any CPU.Build.0 = Debug|Any CPU - {714561E4-8F85-414E-AFC6-BA33D5F95D14}.Release|Any CPU.ActiveCfg = Release|Any CPU - {714561E4-8F85-414E-AFC6-BA33D5F95D14}.Release|Any CPU.Build.0 = Release|Any CPU - {82F23FBF-3AD6-4204-9D18-806B16222FAB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {82F23FBF-3AD6-4204-9D18-806B16222FAB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {82F23FBF-3AD6-4204-9D18-806B16222FAB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {82F23FBF-3AD6-4204-9D18-806B16222FAB}.Release|Any CPU.Build.0 = Release|Any CPU - {8709562F-51CA-421C-B817-72FFE95399EC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8709562F-51CA-421C-B817-72FFE95399EC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8709562F-51CA-421C-B817-72FFE95399EC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8709562F-51CA-421C-B817-72FFE95399EC}.Release|Any CPU.Build.0 = Release|Any CPU - {B86AB14C-3F22-4C5D-B0D3-1F31A122C05B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B86AB14C-3F22-4C5D-B0D3-1F31A122C05B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B86AB14C-3F22-4C5D-B0D3-1F31A122C05B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B86AB14C-3F22-4C5D-B0D3-1F31A122C05B}.Release|Any CPU.Build.0 = Release|Any CPU - {C95B7532-A598-4B8A-ABDA-663C154830B9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C95B7532-A598-4B8A-ABDA-663C154830B9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C95B7532-A598-4B8A-ABDA-663C154830B9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C95B7532-A598-4B8A-ABDA-663C154830B9}.Release|Any CPU.Build.0 = Release|Any CPU - {D38A73D3-624C-40D5-A5DB-BE9490E26ED8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D38A73D3-624C-40D5-A5DB-BE9490E26ED8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D38A73D3-624C-40D5-A5DB-BE9490E26ED8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D38A73D3-624C-40D5-A5DB-BE9490E26ED8}.Release|Any CPU.Build.0 = Release|Any CPU - {AECFD44B-30EE-4522-9C30-2B6A8457DF55}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AECFD44B-30EE-4522-9C30-2B6A8457DF55}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AECFD44B-30EE-4522-9C30-2B6A8457DF55}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AECFD44B-30EE-4522-9C30-2B6A8457DF55}.Release|Any CPU.Build.0 = Release|Any CPU - {7C7FDACD-416D-41F4-B65B-C8FAAD5A9168}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7C7FDACD-416D-41F4-B65B-C8FAAD5A9168}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7C7FDACD-416D-41F4-B65B-C8FAAD5A9168}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7C7FDACD-416D-41F4-B65B-C8FAAD5A9168}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {EFEC12AE-28BF-4C6B-A5AD-CDC1DE28776E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {01A49DED-481F-4B1A-912D-867A4616A2CF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {8BF813A6-4239-4C13-B4A6-E4A212655371} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {4F964040-1F28-4747-9E39-4E2F69295B0F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {0C9C8F4B-9CF0-488A-A873-CA681CDC97A7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {68B4D472-FB9E-4408-BF12-7968AD0A1A9D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E7CD8D65-2C81-41B8-A537-EE6577F69244} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {714561E4-8F85-414E-AFC6-BA33D5F95D14} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {82F23FBF-3AD6-4204-9D18-806B16222FAB} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8709562F-51CA-421C-B817-72FFE95399EC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B86AB14C-3F22-4C5D-B0D3-1F31A122C05B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C95B7532-A598-4B8A-ABDA-663C154830B9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D38A73D3-624C-40D5-A5DB-BE9490E26ED8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {AECFD44B-30EE-4522-9C30-2B6A8457DF55} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {7C7FDACD-416D-41F4-B65B-C8FAAD5A9168} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {68B4D472-FB9E-4408-BF12-7968AD0A1A9D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E7CD8D65-2C81-41B8-A537-EE6577F69244} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {714561E4-8F85-414E-AFC6-BA33D5F95D14} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {82F23FBF-3AD6-4204-9D18-806B16222FAB} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8709562F-51CA-421C-B817-72FFE95399EC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B86AB14C-3F22-4C5D-B0D3-1F31A122C05B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C95B7532-A598-4B8A-ABDA-663C154830B9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D38A73D3-624C-40D5-A5DB-BE9490E26ED8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {AECFD44B-30EE-4522-9C30-2B6A8457DF55} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {7C7FDACD-416D-41F4-B65B-C8FAAD5A9168} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {D965B20F-BB56-497E-B278-3FB5C7BBE3D3} diff --git a/sdk/src/Services/Inspector2/Properties/AssemblyInfo.cs b/sdk/src/Services/Inspector2/Properties/AssemblyInfo.cs index a7145fdf9221..b4890b29cf81 100644 --- a/sdk/src/Services/Inspector2/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/Inspector2/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.402.15")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.403.5")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/InspectorScan/Generated/AmazonInspectorScanConfig.cs b/sdk/src/Services/InspectorScan/Generated/AmazonInspectorScanConfig.cs index c6f1e3d6d4b3..27f140ef4a19 100644 --- a/sdk/src/Services/InspectorScan/Generated/AmazonInspectorScanConfig.cs +++ b/sdk/src/Services/InspectorScan/Generated/AmazonInspectorScanConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.InspectorScan public partial class AmazonInspectorScanConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("Inspector Scan", "4.0.0.0"); private static readonly AmazonInspectorScanEndpointResolver EndpointResolver = new AmazonInspectorScanEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("Inspector Scan", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("Inspector Scan", "3.7.400.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/InspectorScan/InspectorScan.sln b/sdk/src/Services/InspectorScan/InspectorScan.sln index 2dfb156ea0fb..941c2dda3e78 100644 --- a/sdk/src/Services/InspectorScan/InspectorScan.sln +++ b/sdk/src/Services/InspectorScan/InspectorScan.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {C01354ED-B332-4E86-BB84-921392C8F2CD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {C01354ED-B332-4E86-BB84-921392C8F2CD}.Debug|Any CPU.Build.0 = Debug|Any CPU {C01354ED-B332-4E86-BB84-921392C8F2CD}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {01E5E7A1-A956-4397-A019-49DDA87542CD}.Debug|Any CPU.Build.0 = Debug|Any CPU {01E5E7A1-A956-4397-A019-49DDA87542CD}.Release|Any CPU.ActiveCfg = Release|Any CPU {01E5E7A1-A956-4397-A019-49DDA87542CD}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {F3BC1A5F-3F4F-4EC2-A59C-80AF2CAAC964}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F3BC1A5F-3F4F-4EC2-A59C-80AF2CAAC964}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F3BC1A5F-3F4F-4EC2-A59C-80AF2CAAC964}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F3BC1A5F-3F4F-4EC2-A59C-80AF2CAAC964}.Release|Any CPU.Build.0 = Release|Any CPU - {A7EB15FD-8CDC-4EB3-9E84-EABE030DF400}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A7EB15FD-8CDC-4EB3-9E84-EABE030DF400}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A7EB15FD-8CDC-4EB3-9E84-EABE030DF400}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A7EB15FD-8CDC-4EB3-9E84-EABE030DF400}.Release|Any CPU.Build.0 = Release|Any CPU - {FCE83620-0F69-4574-9C63-6254982067A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FCE83620-0F69-4574-9C63-6254982067A2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FCE83620-0F69-4574-9C63-6254982067A2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FCE83620-0F69-4574-9C63-6254982067A2}.Release|Any CPU.Build.0 = Release|Any CPU - {7A7F8B5D-8C82-436C-88BA-73B27E9209B3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7A7F8B5D-8C82-436C-88BA-73B27E9209B3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7A7F8B5D-8C82-436C-88BA-73B27E9209B3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7A7F8B5D-8C82-436C-88BA-73B27E9209B3}.Release|Any CPU.Build.0 = Release|Any CPU - {B7508ED7-827B-4354-BF1E-E0233E8853E4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B7508ED7-827B-4354-BF1E-E0233E8853E4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B7508ED7-827B-4354-BF1E-E0233E8853E4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B7508ED7-827B-4354-BF1E-E0233E8853E4}.Release|Any CPU.Build.0 = Release|Any CPU - {9861A36F-2D2F-4C64-8415-825B5643FF47}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9861A36F-2D2F-4C64-8415-825B5643FF47}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9861A36F-2D2F-4C64-8415-825B5643FF47}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9861A36F-2D2F-4C64-8415-825B5643FF47}.Release|Any CPU.Build.0 = Release|Any CPU - {46F3B111-391C-4010-80B2-597A5021FF15}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {46F3B111-391C-4010-80B2-597A5021FF15}.Debug|Any CPU.Build.0 = Debug|Any CPU - {46F3B111-391C-4010-80B2-597A5021FF15}.Release|Any CPU.ActiveCfg = Release|Any CPU - {46F3B111-391C-4010-80B2-597A5021FF15}.Release|Any CPU.Build.0 = Release|Any CPU - {ECE6FF71-500B-45D0-AD25-62C28B970432}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {ECE6FF71-500B-45D0-AD25-62C28B970432}.Debug|Any CPU.Build.0 = Debug|Any CPU - {ECE6FF71-500B-45D0-AD25-62C28B970432}.Release|Any CPU.ActiveCfg = Release|Any CPU - {ECE6FF71-500B-45D0-AD25-62C28B970432}.Release|Any CPU.Build.0 = Release|Any CPU - {EF9D63D2-A1B8-4EEF-91E9-D968B033E761}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EF9D63D2-A1B8-4EEF-91E9-D968B033E761}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EF9D63D2-A1B8-4EEF-91E9-D968B033E761}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EF9D63D2-A1B8-4EEF-91E9-D968B033E761}.Release|Any CPU.Build.0 = Release|Any CPU - {FC0627CB-F291-4EB0-843B-6823896E232E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FC0627CB-F291-4EB0-843B-6823896E232E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FC0627CB-F291-4EB0-843B-6823896E232E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FC0627CB-F291-4EB0-843B-6823896E232E}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {F3BC1A5F-3F4F-4EC2-A59C-80AF2CAAC964}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F3BC1A5F-3F4F-4EC2-A59C-80AF2CAAC964}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F3BC1A5F-3F4F-4EC2-A59C-80AF2CAAC964}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F3BC1A5F-3F4F-4EC2-A59C-80AF2CAAC964}.Release|Any CPU.Build.0 = Release|Any CPU - {A7EB15FD-8CDC-4EB3-9E84-EABE030DF400}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A7EB15FD-8CDC-4EB3-9E84-EABE030DF400}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A7EB15FD-8CDC-4EB3-9E84-EABE030DF400}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A7EB15FD-8CDC-4EB3-9E84-EABE030DF400}.Release|Any CPU.Build.0 = Release|Any CPU - {FCE83620-0F69-4574-9C63-6254982067A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FCE83620-0F69-4574-9C63-6254982067A2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FCE83620-0F69-4574-9C63-6254982067A2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FCE83620-0F69-4574-9C63-6254982067A2}.Release|Any CPU.Build.0 = Release|Any CPU - {7A7F8B5D-8C82-436C-88BA-73B27E9209B3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7A7F8B5D-8C82-436C-88BA-73B27E9209B3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7A7F8B5D-8C82-436C-88BA-73B27E9209B3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7A7F8B5D-8C82-436C-88BA-73B27E9209B3}.Release|Any CPU.Build.0 = Release|Any CPU - {B7508ED7-827B-4354-BF1E-E0233E8853E4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B7508ED7-827B-4354-BF1E-E0233E8853E4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B7508ED7-827B-4354-BF1E-E0233E8853E4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B7508ED7-827B-4354-BF1E-E0233E8853E4}.Release|Any CPU.Build.0 = Release|Any CPU - {9861A36F-2D2F-4C64-8415-825B5643FF47}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9861A36F-2D2F-4C64-8415-825B5643FF47}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9861A36F-2D2F-4C64-8415-825B5643FF47}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9861A36F-2D2F-4C64-8415-825B5643FF47}.Release|Any CPU.Build.0 = Release|Any CPU - {46F3B111-391C-4010-80B2-597A5021FF15}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {46F3B111-391C-4010-80B2-597A5021FF15}.Debug|Any CPU.Build.0 = Debug|Any CPU - {46F3B111-391C-4010-80B2-597A5021FF15}.Release|Any CPU.ActiveCfg = Release|Any CPU - {46F3B111-391C-4010-80B2-597A5021FF15}.Release|Any CPU.Build.0 = Release|Any CPU - {ECE6FF71-500B-45D0-AD25-62C28B970432}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {ECE6FF71-500B-45D0-AD25-62C28B970432}.Debug|Any CPU.Build.0 = Debug|Any CPU - {ECE6FF71-500B-45D0-AD25-62C28B970432}.Release|Any CPU.ActiveCfg = Release|Any CPU - {ECE6FF71-500B-45D0-AD25-62C28B970432}.Release|Any CPU.Build.0 = Release|Any CPU - {EF9D63D2-A1B8-4EEF-91E9-D968B033E761}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EF9D63D2-A1B8-4EEF-91E9-D968B033E761}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EF9D63D2-A1B8-4EEF-91E9-D968B033E761}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EF9D63D2-A1B8-4EEF-91E9-D968B033E761}.Release|Any CPU.Build.0 = Release|Any CPU - {FC0627CB-F291-4EB0-843B-6823896E232E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FC0627CB-F291-4EB0-843B-6823896E232E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FC0627CB-F291-4EB0-843B-6823896E232E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FC0627CB-F291-4EB0-843B-6823896E232E}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {C01354ED-B332-4E86-BB84-921392C8F2CD} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {18306258-718F-4CAF-B78C-380671A56004} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {4BB05C4A-F1BE-434A-81F7-8BDA4197BAD9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {02EA5BCE-2D33-4280-BC85-E3D9F5420DFE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {01E5E7A1-A956-4397-A019-49DDA87542CD} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {F3BC1A5F-3F4F-4EC2-A59C-80AF2CAAC964} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A7EB15FD-8CDC-4EB3-9E84-EABE030DF400} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {FCE83620-0F69-4574-9C63-6254982067A2} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {7A7F8B5D-8C82-436C-88BA-73B27E9209B3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B7508ED7-827B-4354-BF1E-E0233E8853E4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {9861A36F-2D2F-4C64-8415-825B5643FF47} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {46F3B111-391C-4010-80B2-597A5021FF15} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {ECE6FF71-500B-45D0-AD25-62C28B970432} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {EF9D63D2-A1B8-4EEF-91E9-D968B033E761} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {FC0627CB-F291-4EB0-843B-6823896E232E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {F3BC1A5F-3F4F-4EC2-A59C-80AF2CAAC964} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A7EB15FD-8CDC-4EB3-9E84-EABE030DF400} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {FCE83620-0F69-4574-9C63-6254982067A2} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {7A7F8B5D-8C82-436C-88BA-73B27E9209B3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B7508ED7-827B-4354-BF1E-E0233E8853E4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {9861A36F-2D2F-4C64-8415-825B5643FF47} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {46F3B111-391C-4010-80B2-597A5021FF15} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {ECE6FF71-500B-45D0-AD25-62C28B970432} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {EF9D63D2-A1B8-4EEF-91E9-D968B033E761} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {FC0627CB-F291-4EB0-843B-6823896E232E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {67ACC331-3C24-4B21-8CCF-2CFC8BCBDC31} diff --git a/sdk/src/Services/InspectorScan/Properties/AssemblyInfo.cs b/sdk/src/Services/InspectorScan/Properties/AssemblyInfo.cs index 45c299f94179..83f4b4569884 100644 --- a/sdk/src/Services/InspectorScan/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/InspectorScan/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/InternetMonitor/Generated/AmazonInternetMonitorConfig.cs b/sdk/src/Services/InternetMonitor/Generated/AmazonInternetMonitorConfig.cs index 0396ef26c4d0..8593e128b841 100644 --- a/sdk/src/Services/InternetMonitor/Generated/AmazonInternetMonitorConfig.cs +++ b/sdk/src/Services/InternetMonitor/Generated/AmazonInternetMonitorConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.InternetMonitor public partial class AmazonInternetMonitorConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("InternetMonitor", "4.0.0.0"); private static readonly AmazonInternetMonitorEndpointResolver EndpointResolver = new AmazonInternetMonitorEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("InternetMonitor", "3.7.401.14"); -======= - InternalSDKUtils.BuildUserAgentString("InternetMonitor", "3.7.402.3"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/InternetMonitor/InternetMonitor.sln b/sdk/src/Services/InternetMonitor/InternetMonitor.sln index 063aebb91a61..a7d055e38b7e 100644 --- a/sdk/src/Services/InternetMonitor/InternetMonitor.sln +++ b/sdk/src/Services/InternetMonitor/InternetMonitor.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {061135C6-DC12-4335-BF6E-57F1715F23BE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {061135C6-DC12-4335-BF6E-57F1715F23BE}.Debug|Any CPU.Build.0 = Debug|Any CPU {061135C6-DC12-4335-BF6E-57F1715F23BE}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {2F50EC94-719F-4339-AD1D-59AF1F2B91AB}.Debug|Any CPU.Build.0 = Debug|Any CPU {2F50EC94-719F-4339-AD1D-59AF1F2B91AB}.Release|Any CPU.ActiveCfg = Release|Any CPU {2F50EC94-719F-4339-AD1D-59AF1F2B91AB}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {5814F39C-D4C0-49B6-A674-148EC6CC2718}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5814F39C-D4C0-49B6-A674-148EC6CC2718}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5814F39C-D4C0-49B6-A674-148EC6CC2718}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5814F39C-D4C0-49B6-A674-148EC6CC2718}.Release|Any CPU.Build.0 = Release|Any CPU - {91614872-EFFD-4EC4-B2D0-CFED5DB39BF5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {91614872-EFFD-4EC4-B2D0-CFED5DB39BF5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {91614872-EFFD-4EC4-B2D0-CFED5DB39BF5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {91614872-EFFD-4EC4-B2D0-CFED5DB39BF5}.Release|Any CPU.Build.0 = Release|Any CPU - {BD98D1E0-FF5A-4207-A218-FD351D2616EF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BD98D1E0-FF5A-4207-A218-FD351D2616EF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BD98D1E0-FF5A-4207-A218-FD351D2616EF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BD98D1E0-FF5A-4207-A218-FD351D2616EF}.Release|Any CPU.Build.0 = Release|Any CPU - {876C766A-EE81-4A01-82F6-BD4BFD60D662}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {876C766A-EE81-4A01-82F6-BD4BFD60D662}.Debug|Any CPU.Build.0 = Debug|Any CPU - {876C766A-EE81-4A01-82F6-BD4BFD60D662}.Release|Any CPU.ActiveCfg = Release|Any CPU - {876C766A-EE81-4A01-82F6-BD4BFD60D662}.Release|Any CPU.Build.0 = Release|Any CPU - {5A8BD02F-5621-4EFA-96B5-E8C180D86E9E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5A8BD02F-5621-4EFA-96B5-E8C180D86E9E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5A8BD02F-5621-4EFA-96B5-E8C180D86E9E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5A8BD02F-5621-4EFA-96B5-E8C180D86E9E}.Release|Any CPU.Build.0 = Release|Any CPU - {9C224E1C-B726-4AC8-925C-6448D8CE606A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9C224E1C-B726-4AC8-925C-6448D8CE606A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9C224E1C-B726-4AC8-925C-6448D8CE606A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9C224E1C-B726-4AC8-925C-6448D8CE606A}.Release|Any CPU.Build.0 = Release|Any CPU - {641E29A0-A669-4B70-9EBF-3D0873FF7F98}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {641E29A0-A669-4B70-9EBF-3D0873FF7F98}.Debug|Any CPU.Build.0 = Debug|Any CPU - {641E29A0-A669-4B70-9EBF-3D0873FF7F98}.Release|Any CPU.ActiveCfg = Release|Any CPU - {641E29A0-A669-4B70-9EBF-3D0873FF7F98}.Release|Any CPU.Build.0 = Release|Any CPU - {0B58ABB0-4BEB-481E-94AB-33876A0F3BD5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0B58ABB0-4BEB-481E-94AB-33876A0F3BD5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0B58ABB0-4BEB-481E-94AB-33876A0F3BD5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0B58ABB0-4BEB-481E-94AB-33876A0F3BD5}.Release|Any CPU.Build.0 = Release|Any CPU - {7EA5BA45-574C-4E08-BA0E-6548BF7812CB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7EA5BA45-574C-4E08-BA0E-6548BF7812CB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7EA5BA45-574C-4E08-BA0E-6548BF7812CB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7EA5BA45-574C-4E08-BA0E-6548BF7812CB}.Release|Any CPU.Build.0 = Release|Any CPU - {BEFA3BDC-D4EB-40EC-A98F-86703E44B559}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BEFA3BDC-D4EB-40EC-A98F-86703E44B559}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BEFA3BDC-D4EB-40EC-A98F-86703E44B559}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BEFA3BDC-D4EB-40EC-A98F-86703E44B559}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {5814F39C-D4C0-49B6-A674-148EC6CC2718}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5814F39C-D4C0-49B6-A674-148EC6CC2718}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5814F39C-D4C0-49B6-A674-148EC6CC2718}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5814F39C-D4C0-49B6-A674-148EC6CC2718}.Release|Any CPU.Build.0 = Release|Any CPU - {91614872-EFFD-4EC4-B2D0-CFED5DB39BF5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {91614872-EFFD-4EC4-B2D0-CFED5DB39BF5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {91614872-EFFD-4EC4-B2D0-CFED5DB39BF5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {91614872-EFFD-4EC4-B2D0-CFED5DB39BF5}.Release|Any CPU.Build.0 = Release|Any CPU - {BD98D1E0-FF5A-4207-A218-FD351D2616EF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BD98D1E0-FF5A-4207-A218-FD351D2616EF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BD98D1E0-FF5A-4207-A218-FD351D2616EF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BD98D1E0-FF5A-4207-A218-FD351D2616EF}.Release|Any CPU.Build.0 = Release|Any CPU - {876C766A-EE81-4A01-82F6-BD4BFD60D662}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {876C766A-EE81-4A01-82F6-BD4BFD60D662}.Debug|Any CPU.Build.0 = Debug|Any CPU - {876C766A-EE81-4A01-82F6-BD4BFD60D662}.Release|Any CPU.ActiveCfg = Release|Any CPU - {876C766A-EE81-4A01-82F6-BD4BFD60D662}.Release|Any CPU.Build.0 = Release|Any CPU - {5A8BD02F-5621-4EFA-96B5-E8C180D86E9E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5A8BD02F-5621-4EFA-96B5-E8C180D86E9E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5A8BD02F-5621-4EFA-96B5-E8C180D86E9E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5A8BD02F-5621-4EFA-96B5-E8C180D86E9E}.Release|Any CPU.Build.0 = Release|Any CPU - {9C224E1C-B726-4AC8-925C-6448D8CE606A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9C224E1C-B726-4AC8-925C-6448D8CE606A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9C224E1C-B726-4AC8-925C-6448D8CE606A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9C224E1C-B726-4AC8-925C-6448D8CE606A}.Release|Any CPU.Build.0 = Release|Any CPU - {641E29A0-A669-4B70-9EBF-3D0873FF7F98}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {641E29A0-A669-4B70-9EBF-3D0873FF7F98}.Debug|Any CPU.Build.0 = Debug|Any CPU - {641E29A0-A669-4B70-9EBF-3D0873FF7F98}.Release|Any CPU.ActiveCfg = Release|Any CPU - {641E29A0-A669-4B70-9EBF-3D0873FF7F98}.Release|Any CPU.Build.0 = Release|Any CPU - {0B58ABB0-4BEB-481E-94AB-33876A0F3BD5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0B58ABB0-4BEB-481E-94AB-33876A0F3BD5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0B58ABB0-4BEB-481E-94AB-33876A0F3BD5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0B58ABB0-4BEB-481E-94AB-33876A0F3BD5}.Release|Any CPU.Build.0 = Release|Any CPU - {7EA5BA45-574C-4E08-BA0E-6548BF7812CB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7EA5BA45-574C-4E08-BA0E-6548BF7812CB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7EA5BA45-574C-4E08-BA0E-6548BF7812CB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7EA5BA45-574C-4E08-BA0E-6548BF7812CB}.Release|Any CPU.Build.0 = Release|Any CPU - {BEFA3BDC-D4EB-40EC-A98F-86703E44B559}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BEFA3BDC-D4EB-40EC-A98F-86703E44B559}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BEFA3BDC-D4EB-40EC-A98F-86703E44B559}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BEFA3BDC-D4EB-40EC-A98F-86703E44B559}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {061135C6-DC12-4335-BF6E-57F1715F23BE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {58D5C770-0629-4FED-99AA-7AC3782B66A5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {FE8D1B41-4329-454E-8B19-D62E2A4E6EF5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {2E51D92D-E766-4273-8F23-ED39E6F5071A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {2F50EC94-719F-4339-AD1D-59AF1F2B91AB} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {5814F39C-D4C0-49B6-A674-148EC6CC2718} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {91614872-EFFD-4EC4-B2D0-CFED5DB39BF5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {BD98D1E0-FF5A-4207-A218-FD351D2616EF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {876C766A-EE81-4A01-82F6-BD4BFD60D662} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {5A8BD02F-5621-4EFA-96B5-E8C180D86E9E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {9C224E1C-B726-4AC8-925C-6448D8CE606A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {641E29A0-A669-4B70-9EBF-3D0873FF7F98} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0B58ABB0-4BEB-481E-94AB-33876A0F3BD5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {7EA5BA45-574C-4E08-BA0E-6548BF7812CB} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {BEFA3BDC-D4EB-40EC-A98F-86703E44B559} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {5814F39C-D4C0-49B6-A674-148EC6CC2718} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {91614872-EFFD-4EC4-B2D0-CFED5DB39BF5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {BD98D1E0-FF5A-4207-A218-FD351D2616EF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {876C766A-EE81-4A01-82F6-BD4BFD60D662} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {5A8BD02F-5621-4EFA-96B5-E8C180D86E9E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {9C224E1C-B726-4AC8-925C-6448D8CE606A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {641E29A0-A669-4B70-9EBF-3D0873FF7F98} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0B58ABB0-4BEB-481E-94AB-33876A0F3BD5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {7EA5BA45-574C-4E08-BA0E-6548BF7812CB} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {BEFA3BDC-D4EB-40EC-A98F-86703E44B559} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {2ACA4745-F904-49F1-ABD3-FF9544EAE866} diff --git a/sdk/src/Services/InternetMonitor/Properties/AssemblyInfo.cs b/sdk/src/Services/InternetMonitor/Properties/AssemblyInfo.cs index 18254e9b6660..8a94ad91b2bc 100644 --- a/sdk/src/Services/InternetMonitor/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/InternetMonitor/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.14")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.402.3")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/IoT/Generated/AmazonIoTConfig.cs b/sdk/src/Services/IoT/Generated/AmazonIoTConfig.cs index 470545af9a73..d43443b77cf2 100644 --- a/sdk/src/Services/IoT/Generated/AmazonIoTConfig.cs +++ b/sdk/src/Services/IoT/Generated/AmazonIoTConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.IoT public partial class AmazonIoTConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("IoT", "4.0.0.0"); private static readonly AmazonIoTEndpointResolver EndpointResolver = new AmazonIoTEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("IoT", "3.7.401.5"); -======= - InternalSDKUtils.BuildUserAgentString("IoT", "3.7.403.0"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/IoT/Generated/Model/Internal/MarshallTransformations/CreateDomainConfigurationRequestMarshaller.cs b/sdk/src/Services/IoT/Generated/Model/Internal/MarshallTransformations/CreateDomainConfigurationRequestMarshaller.cs index e5499bbd1929..4d3954a34295 100644 --- a/sdk/src/Services/IoT/Generated/Model/Internal/MarshallTransformations/CreateDomainConfigurationRequestMarshaller.cs +++ b/sdk/src/Services/IoT/Generated/Model/Internal/MarshallTransformations/CreateDomainConfigurationRequestMarshaller.cs @@ -66,38 +66,24 @@ public IRequest Marshall(CreateDomainConfigurationRequest publicRequest) request.ResourcePath = "/domainConfigurations/{domainConfigurationName}"; using (MemoryStream memoryStream = new MemoryStream()) { -<<<<<<< HEAD using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) -||||||| Commit version number update changes - JsonWriter writer = new JsonWriter(stringWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetAuthorizerConfig()) -======= - JsonWriter writer = new JsonWriter(stringWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetApplicationProtocol()) - { - context.Writer.WritePropertyName("applicationProtocol"); - context.Writer.Write(publicRequest.ApplicationProtocol); - } - - if(publicRequest.IsSetAuthenticationType()) - { - context.Writer.WritePropertyName("authenticationType"); - context.Writer.Write(publicRequest.AuthenticationType); - } - - if(publicRequest.IsSetAuthorizerConfig()) ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b { JsonWriter writer = new JsonWriter(streamWriter); writer.Validate = false; writer.WriteObjectStart(); var context = new JsonMarshallerContext(request, writer); + if(publicRequest.IsSetApplicationProtocol()) + { + context.Writer.WritePropertyName("applicationProtocol"); + context.Writer.Write(publicRequest.ApplicationProtocol); + } + + if(publicRequest.IsSetAuthenticationType()) + { + context.Writer.WritePropertyName("authenticationType"); + context.Writer.Write(publicRequest.AuthenticationType); + } + if(publicRequest.IsSetAuthorizerConfig()) { context.Writer.WritePropertyName("authorizerConfig"); @@ -109,36 +95,22 @@ public IRequest Marshall(CreateDomainConfigurationRequest publicRequest) context.Writer.WriteObjectEnd(); } -<<<<<<< HEAD + if(publicRequest.IsSetClientCertificateConfig()) + { + context.Writer.WritePropertyName("clientCertificateConfig"); + context.Writer.WriteObjectStart(); + + var marshaller = ClientCertificateConfigMarshaller.Instance; + marshaller.Marshall(publicRequest.ClientCertificateConfig, context); + + context.Writer.WriteObjectEnd(); + } + if(publicRequest.IsSetDomainName()) { context.Writer.WritePropertyName("domainName"); context.Writer.Write(publicRequest.DomainName); } -||||||| Commit version number update changes - if(publicRequest.IsSetDomainName()) - { - context.Writer.WritePropertyName("domainName"); - context.Writer.Write(publicRequest.DomainName); - } -======= - if(publicRequest.IsSetClientCertificateConfig()) - { - context.Writer.WritePropertyName("clientCertificateConfig"); - context.Writer.WriteObjectStart(); - - var marshaller = ClientCertificateConfigMarshaller.Instance; - marshaller.Marshall(publicRequest.ClientCertificateConfig, context); - - context.Writer.WriteObjectEnd(); - } - - if(publicRequest.IsSetDomainName()) - { - context.Writer.WritePropertyName("domainName"); - context.Writer.Write(publicRequest.DomainName); - } ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b if(publicRequest.IsSetServerCertificateArns()) { diff --git a/sdk/src/Services/IoT/Generated/Model/Internal/MarshallTransformations/UpdateDomainConfigurationRequestMarshaller.cs b/sdk/src/Services/IoT/Generated/Model/Internal/MarshallTransformations/UpdateDomainConfigurationRequestMarshaller.cs index c9ffb4e94e10..68bcb19cf74b 100644 --- a/sdk/src/Services/IoT/Generated/Model/Internal/MarshallTransformations/UpdateDomainConfigurationRequestMarshaller.cs +++ b/sdk/src/Services/IoT/Generated/Model/Internal/MarshallTransformations/UpdateDomainConfigurationRequestMarshaller.cs @@ -66,39 +66,24 @@ public IRequest Marshall(UpdateDomainConfigurationRequest publicRequest) request.ResourcePath = "/domainConfigurations/{domainConfigurationName}"; using (MemoryStream memoryStream = new MemoryStream()) { -<<<<<<< HEAD using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) -||||||| Commit version number update changes - JsonWriter writer = new JsonWriter(stringWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetAuthorizerConfig()) -======= - JsonWriter writer = new JsonWriter(stringWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetApplicationProtocol()) { - context.Writer.WritePropertyName("applicationProtocol"); - context.Writer.Write(publicRequest.ApplicationProtocol); - } - - if(publicRequest.IsSetAuthenticationType()) - { - context.Writer.WritePropertyName("authenticationType"); - context.Writer.Write(publicRequest.AuthenticationType); - } - - if(publicRequest.IsSetAuthorizerConfig()) ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b - { -<<<<<<< HEAD JsonWriter writer = new JsonWriter(streamWriter); writer.Validate = false; writer.WriteObjectStart(); var context = new JsonMarshallerContext(request, writer); + if(publicRequest.IsSetApplicationProtocol()) + { + context.Writer.WritePropertyName("applicationProtocol"); + context.Writer.Write(publicRequest.ApplicationProtocol); + } + + if(publicRequest.IsSetAuthenticationType()) + { + context.Writer.WritePropertyName("authenticationType"); + context.Writer.Write(publicRequest.AuthenticationType); + } + if(publicRequest.IsSetAuthorizerConfig()) { context.Writer.WritePropertyName("authorizerConfig"); @@ -110,6 +95,17 @@ public IRequest Marshall(UpdateDomainConfigurationRequest publicRequest) context.Writer.WriteObjectEnd(); } + if(publicRequest.IsSetClientCertificateConfig()) + { + context.Writer.WritePropertyName("clientCertificateConfig"); + context.Writer.WriteObjectStart(); + + var marshaller = ClientCertificateConfigMarshaller.Instance; + marshaller.Marshall(publicRequest.ClientCertificateConfig, context); + + context.Writer.WriteObjectEnd(); + } + if(publicRequest.IsSetDomainConfigurationStatus()) { context.Writer.WritePropertyName("domainConfigurationStatus"); @@ -145,102 +141,6 @@ public IRequest Marshall(UpdateDomainConfigurationRequest publicRequest) } writer.WriteObjectEnd(); -||||||| Commit version number update changes - context.Writer.WritePropertyName("authorizerConfig"); - context.Writer.WriteObjectStart(); - - var marshaller = AuthorizerConfigMarshaller.Instance; - marshaller.Marshall(publicRequest.AuthorizerConfig, context); - - context.Writer.WriteObjectEnd(); - } - - if(publicRequest.IsSetDomainConfigurationStatus()) - { - context.Writer.WritePropertyName("domainConfigurationStatus"); - context.Writer.Write(publicRequest.DomainConfigurationStatus); - } - - if(publicRequest.IsSetRemoveAuthorizerConfig()) - { - context.Writer.WritePropertyName("removeAuthorizerConfig"); - context.Writer.Write(publicRequest.RemoveAuthorizerConfig); - } - - if(publicRequest.IsSetServerCertificateConfig()) - { - context.Writer.WritePropertyName("serverCertificateConfig"); - context.Writer.WriteObjectStart(); - - var marshaller = ServerCertificateConfigMarshaller.Instance; - marshaller.Marshall(publicRequest.ServerCertificateConfig, context); - - context.Writer.WriteObjectEnd(); - } - - if(publicRequest.IsSetTlsConfig()) - { - context.Writer.WritePropertyName("tlsConfig"); - context.Writer.WriteObjectStart(); - - var marshaller = TlsConfigMarshaller.Instance; - marshaller.Marshall(publicRequest.TlsConfig, context); - - context.Writer.WriteObjectEnd(); -======= - context.Writer.WritePropertyName("authorizerConfig"); - context.Writer.WriteObjectStart(); - - var marshaller = AuthorizerConfigMarshaller.Instance; - marshaller.Marshall(publicRequest.AuthorizerConfig, context); - - context.Writer.WriteObjectEnd(); - } - - if(publicRequest.IsSetClientCertificateConfig()) - { - context.Writer.WritePropertyName("clientCertificateConfig"); - context.Writer.WriteObjectStart(); - - var marshaller = ClientCertificateConfigMarshaller.Instance; - marshaller.Marshall(publicRequest.ClientCertificateConfig, context); - - context.Writer.WriteObjectEnd(); - } - - if(publicRequest.IsSetDomainConfigurationStatus()) - { - context.Writer.WritePropertyName("domainConfigurationStatus"); - context.Writer.Write(publicRequest.DomainConfigurationStatus); - } - - if(publicRequest.IsSetRemoveAuthorizerConfig()) - { - context.Writer.WritePropertyName("removeAuthorizerConfig"); - context.Writer.Write(publicRequest.RemoveAuthorizerConfig); - } - - if(publicRequest.IsSetServerCertificateConfig()) - { - context.Writer.WritePropertyName("serverCertificateConfig"); - context.Writer.WriteObjectStart(); - - var marshaller = ServerCertificateConfigMarshaller.Instance; - marshaller.Marshall(publicRequest.ServerCertificateConfig, context); - - context.Writer.WriteObjectEnd(); - } - - if(publicRequest.IsSetTlsConfig()) - { - context.Writer.WritePropertyName("tlsConfig"); - context.Writer.WriteObjectStart(); - - var marshaller = TlsConfigMarshaller.Instance; - marshaller.Marshall(publicRequest.TlsConfig, context); - - context.Writer.WriteObjectEnd(); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b } request.Content = memoryStream.ToArray(); diff --git a/sdk/src/Services/IoT/Generated/Model/Internal/MarshallTransformations/UpdateThingTypeRequestMarshaller.cs b/sdk/src/Services/IoT/Generated/Model/Internal/MarshallTransformations/UpdateThingTypeRequestMarshaller.cs index f9810c3bbec1..44f45d91ac8a 100644 --- a/sdk/src/Services/IoT/Generated/Model/Internal/MarshallTransformations/UpdateThingTypeRequestMarshaller.cs +++ b/sdk/src/Services/IoT/Generated/Model/Internal/MarshallTransformations/UpdateThingTypeRequestMarshaller.cs @@ -64,26 +64,29 @@ public IRequest Marshall(UpdateThingTypeRequest publicRequest) throw new AmazonIoTException("Request object does not have required field ThingTypeName set"); request.AddPathResource("{thingTypeName}", StringUtils.FromString(publicRequest.ThingTypeName)); request.ResourcePath = "/thing-types/{thingTypeName}"; - using (StringWriter stringWriter = new StringWriter(CultureInfo.InvariantCulture)) + using (MemoryStream memoryStream = new MemoryStream()) { - JsonWriter writer = new JsonWriter(stringWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetThingTypeProperties()) + using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) { - context.Writer.WritePropertyName("thingTypeProperties"); - context.Writer.WriteObjectStart(); + JsonWriter writer = new JsonWriter(streamWriter); + writer.Validate = false; + writer.WriteObjectStart(); + var context = new JsonMarshallerContext(request, writer); + if(publicRequest.IsSetThingTypeProperties()) + { + context.Writer.WritePropertyName("thingTypeProperties"); + context.Writer.WriteObjectStart(); - var marshaller = ThingTypePropertiesMarshaller.Instance; - marshaller.Marshall(publicRequest.ThingTypeProperties, context); + var marshaller = ThingTypePropertiesMarshaller.Instance; + marshaller.Marshall(publicRequest.ThingTypeProperties, context); - context.Writer.WriteObjectEnd(); + context.Writer.WriteObjectEnd(); + } + + writer.WriteObjectEnd(); } - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); + request.Content = memoryStream.ToArray(); } diff --git a/sdk/src/Services/IoT/Generated/Model/ListPrincipalThingsV2Request.cs b/sdk/src/Services/IoT/Generated/Model/ListPrincipalThingsV2Request.cs index 27e8fd827d4c..1759ca010b22 100644 --- a/sdk/src/Services/IoT/Generated/Model/ListPrincipalThingsV2Request.cs +++ b/sdk/src/Services/IoT/Generated/Model/ListPrincipalThingsV2Request.cs @@ -54,9 +54,9 @@ public partial class ListPrincipalThingsV2Request : AmazonIoTRequest /// /// [AWSProperty(Min=1, Max=250)] - public int MaxResults + public int? MaxResults { - get { return this._maxResults.GetValueOrDefault(); } + get { return this._maxResults; } set { this._maxResults = value; } } diff --git a/sdk/src/Services/IoT/Generated/Model/ListThingPrincipalsV2Request.cs b/sdk/src/Services/IoT/Generated/Model/ListThingPrincipalsV2Request.cs index d1baeec13d75..2d6c0d995ce5 100644 --- a/sdk/src/Services/IoT/Generated/Model/ListThingPrincipalsV2Request.cs +++ b/sdk/src/Services/IoT/Generated/Model/ListThingPrincipalsV2Request.cs @@ -54,9 +54,9 @@ public partial class ListThingPrincipalsV2Request : AmazonIoTRequest /// /// [AWSProperty(Min=1, Max=250)] - public int MaxResults + public int? MaxResults { - get { return this._maxResults.GetValueOrDefault(); } + get { return this._maxResults; } set { this._maxResults = value; } } diff --git a/sdk/src/Services/IoT/Generated/Model/_bcl45+netstandard/IListPrincipalThingsV2Paginator.cs b/sdk/src/Services/IoT/Generated/Model/_bcl+netstandard/IListPrincipalThingsV2Paginator.cs similarity index 100% rename from sdk/src/Services/IoT/Generated/Model/_bcl45+netstandard/IListPrincipalThingsV2Paginator.cs rename to sdk/src/Services/IoT/Generated/Model/_bcl+netstandard/IListPrincipalThingsV2Paginator.cs diff --git a/sdk/src/Services/IoT/Generated/Model/_bcl45+netstandard/IListThingPrincipalsV2Paginator.cs b/sdk/src/Services/IoT/Generated/Model/_bcl+netstandard/IListThingPrincipalsV2Paginator.cs similarity index 100% rename from sdk/src/Services/IoT/Generated/Model/_bcl45+netstandard/IListThingPrincipalsV2Paginator.cs rename to sdk/src/Services/IoT/Generated/Model/_bcl+netstandard/IListThingPrincipalsV2Paginator.cs diff --git a/sdk/src/Services/IoT/Generated/Model/_bcl45+netstandard/ListPrincipalThingsV2Paginator.cs b/sdk/src/Services/IoT/Generated/Model/_bcl+netstandard/ListPrincipalThingsV2Paginator.cs similarity index 100% rename from sdk/src/Services/IoT/Generated/Model/_bcl45+netstandard/ListPrincipalThingsV2Paginator.cs rename to sdk/src/Services/IoT/Generated/Model/_bcl+netstandard/ListPrincipalThingsV2Paginator.cs diff --git a/sdk/src/Services/IoT/Generated/Model/_bcl45+netstandard/ListThingPrincipalsV2Paginator.cs b/sdk/src/Services/IoT/Generated/Model/_bcl+netstandard/ListThingPrincipalsV2Paginator.cs similarity index 100% rename from sdk/src/Services/IoT/Generated/Model/_bcl45+netstandard/ListThingPrincipalsV2Paginator.cs rename to sdk/src/Services/IoT/Generated/Model/_bcl+netstandard/ListThingPrincipalsV2Paginator.cs diff --git a/sdk/src/Services/IoT/Generated/_bcl/AmazonIoTClient.cs b/sdk/src/Services/IoT/Generated/_bcl/AmazonIoTClient.cs index 01a8e306b53c..cd7cc4b1fa0e 100644 --- a/sdk/src/Services/IoT/Generated/_bcl/AmazonIoTClient.cs +++ b/sdk/src/Services/IoT/Generated/_bcl/AmazonIoTClient.cs @@ -557,7 +557,8 @@ public virtual AddThingToThingGroupResponse AddThingToThingGroup(AddThingToThing /// - /// Associates a software bill of materials (SBOM) with a specific software package version. + /// Associates the selected software bill of materials (SBOM) with a specific software + /// package version. /// /// /// @@ -599,7 +600,8 @@ public virtual AssociateSbomWithPackageVersionResponse AssociateSbomWithPackageV /// - /// Associates a software bill of materials (SBOM) with a specific software package version. + /// Associates the selected software bill of materials (SBOM) with a specific software + /// package version. /// /// /// @@ -2332,7 +2334,10 @@ public virtual CreateAuthorizerResponse CreateAuthorizer(CreateAuthorizerRequest /// - /// Creates a billing group. + /// Creates a billing group. If this call is made multiple times using the same billing + /// group name and configuration, the call will succeed. If this call is made with the + /// same billing group name but different configuration a ResourceAlreadyExistsException + /// is thrown. /// /// /// @@ -2367,7 +2372,10 @@ public virtual CreateBillingGroupResponse CreateBillingGroup(CreateBillingGroupR /// - /// Creates a billing group. + /// Creates a billing group. If this call is made multiple times using the same billing + /// group name and configuration, the call will succeed. If this call is made with the + /// same billing group name but different configuration a ResourceAlreadyExistsException + /// is thrown. /// /// /// @@ -5304,6 +5312,16 @@ public virtual CreateProvisioningTemplateVersionResponse CreateProvisioningTempl /// Requires permission to access the CreateRoleAlias /// action. /// + /// + /// + /// The value of + /// credentialDurationSeconds must be less than or equal to the maximum session + /// duration of the IAM role that the role alias references. For more information, see + /// + /// Modifying a role maximum session duration (Amazon Web Services API) from the Amazon + /// Web Services Identity and Access Management User Guide. + /// + /// /// /// Container for the necessary parameters to execute the CreateRoleAlias service method. /// @@ -5348,6 +5366,16 @@ public virtual CreateRoleAliasResponse CreateRoleAlias(CreateRoleAliasRequest re /// Requires permission to access the CreateRoleAlias /// action. /// + /// + /// + /// The value of + /// credentialDurationSeconds must be less than or equal to the maximum session + /// duration of the IAM role that the role alias references. For more information, see + /// + /// Modifying a role maximum session duration (Amazon Web Services API) from the Amazon + /// Web Services Identity and Access Management User Guide. + /// + /// /// /// Container for the necessary parameters to execute the CreateRoleAlias service method. /// @@ -5865,7 +5893,10 @@ public virtual CreateThingGroupResponse CreateThingGroup(CreateThingGroupRequest /// - /// Creates a new thing type. + /// Creates a new thing type. If this call is made multiple times using the same thing + /// type name and configuration, the call will succeed. If this call is made with the + /// same thing type name but different configuration a ResourceAlreadyExistsException + /// is thrown. /// /// /// @@ -5906,7 +5937,10 @@ public virtual CreateThingTypeResponse CreateThingType(CreateThingTypeRequest re /// - /// Creates a new thing type. + /// Creates a new thing type. If this call is made multiple times using the same thing + /// type name and configuration, the call will succeed. If this call is made with the + /// same thing type name but different configuration a ResourceAlreadyExistsException + /// is thrown. /// /// /// @@ -13368,8 +13402,8 @@ public virtual DisableTopicRuleResponse DisableTopicRule(DisableTopicRuleRequest /// - /// Disassociates a software bill of materials (SBOM) from a specific software package - /// version. + /// Disassociates the selected software bill of materials (SBOM) from a specific software + /// package version. /// /// /// @@ -13408,8 +13442,8 @@ public virtual DisassociateSbomFromPackageVersionResponse DisassociateSbomFromPa /// - /// Disassociates a software bill of materials (SBOM) from a specific software package - /// version. + /// Disassociates the selected software bill of materials (SBOM) from a specific software + /// package version. /// /// /// @@ -18731,6 +18765,97 @@ public virtual ListPrincipalThingsResponse ListPrincipalThings(ListPrincipalThin #endregion + #region ListPrincipalThingsV2 + + + /// + /// Lists the things associated with the specified principal. A principal can be an X.509 + /// certificate or an Amazon Cognito ID. + /// + /// + /// + /// Requires permission to access the ListPrincipalThings + /// action. + /// + /// + /// Container for the necessary parameters to execute the ListPrincipalThingsV2 service method. + /// + /// The response from the ListPrincipalThingsV2 service method, as returned by IoT. + /// + /// An unexpected error has occurred. + /// + /// + /// The request is not valid. + /// + /// + /// The specified resource does not exist. + /// + /// + /// The service is temporarily unavailable. + /// + /// + /// The rate exceeds the limit. + /// + /// + /// You are not authorized to perform this operation. + /// + /// REST API Reference for ListPrincipalThingsV2 Operation + public virtual ListPrincipalThingsV2Response ListPrincipalThingsV2(ListPrincipalThingsV2Request request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = ListPrincipalThingsV2RequestMarshaller.Instance; + options.ResponseUnmarshaller = ListPrincipalThingsV2ResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// Lists the things associated with the specified principal. A principal can be an X.509 + /// certificate or an Amazon Cognito ID. + /// + /// + /// + /// Requires permission to access the ListPrincipalThings + /// action. + /// + /// + /// Container for the necessary parameters to execute the ListPrincipalThingsV2 service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the ListPrincipalThingsV2 service method, as returned by IoT. + /// + /// An unexpected error has occurred. + /// + /// + /// The request is not valid. + /// + /// + /// The specified resource does not exist. + /// + /// + /// The service is temporarily unavailable. + /// + /// + /// The rate exceeds the limit. + /// + /// + /// You are not authorized to perform this operation. + /// + /// REST API Reference for ListPrincipalThingsV2 Operation + public virtual Task ListPrincipalThingsV2Async(ListPrincipalThingsV2Request request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = ListPrincipalThingsV2RequestMarshaller.Instance; + options.ResponseUnmarshaller = ListPrincipalThingsV2ResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + #region ListProvisioningTemplates @@ -20117,6 +20242,97 @@ public virtual ListThingPrincipalsResponse ListThingPrincipals(ListThingPrincipa #endregion + #region ListThingPrincipalsV2 + + + /// + /// Lists the principals associated with the specified thing. A principal can be an X.509 + /// certificate or an Amazon Cognito ID. + /// + /// + /// + /// Requires permission to access the ListThingPrincipals + /// action. + /// + /// + /// Container for the necessary parameters to execute the ListThingPrincipalsV2 service method. + /// + /// The response from the ListThingPrincipalsV2 service method, as returned by IoT. + /// + /// An unexpected error has occurred. + /// + /// + /// The request is not valid. + /// + /// + /// The specified resource does not exist. + /// + /// + /// The service is temporarily unavailable. + /// + /// + /// The rate exceeds the limit. + /// + /// + /// You are not authorized to perform this operation. + /// + /// REST API Reference for ListThingPrincipalsV2 Operation + public virtual ListThingPrincipalsV2Response ListThingPrincipalsV2(ListThingPrincipalsV2Request request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = ListThingPrincipalsV2RequestMarshaller.Instance; + options.ResponseUnmarshaller = ListThingPrincipalsV2ResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// Lists the principals associated with the specified thing. A principal can be an X.509 + /// certificate or an Amazon Cognito ID. + /// + /// + /// + /// Requires permission to access the ListThingPrincipals + /// action. + /// + /// + /// Container for the necessary parameters to execute the ListThingPrincipalsV2 service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the ListThingPrincipalsV2 service method, as returned by IoT. + /// + /// An unexpected error has occurred. + /// + /// + /// The request is not valid. + /// + /// + /// The specified resource does not exist. + /// + /// + /// The service is temporarily unavailable. + /// + /// + /// The rate exceeds the limit. + /// + /// + /// You are not authorized to perform this operation. + /// + /// REST API Reference for ListThingPrincipalsV2 Operation + public virtual Task ListThingPrincipalsV2Async(ListThingPrincipalsV2Request request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = ListThingPrincipalsV2RequestMarshaller.Instance; + options.ResponseUnmarshaller = ListThingPrincipalsV2ResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + #region ListThingRegistrationTaskReports @@ -25549,6 +25765,16 @@ public virtual UpdateProvisioningTemplateResponse UpdateProvisioningTemplate(Upd /// Requires permission to access the UpdateRoleAlias /// action. /// + /// + /// + /// The value of + /// credentialDurationSeconds must be less than or equal to the maximum session + /// duration of the IAM role that the role alias references. For more information, see + /// + /// Modifying a role maximum session duration (Amazon Web Services API) from the Amazon + /// Web Services Identity and Access Management User Guide. + /// + /// /// /// Container for the necessary parameters to execute the UpdateRoleAlias service method. /// @@ -25590,6 +25816,16 @@ public virtual UpdateRoleAliasResponse UpdateRoleAlias(UpdateRoleAliasRequest re /// Requires permission to access the UpdateRoleAlias /// action. /// + /// + /// + /// The value of + /// credentialDurationSeconds must be less than or equal to the maximum session + /// duration of the IAM role that the role alias references. For more information, see + /// + /// Modifying a role maximum session duration (Amazon Web Services API) from the Amazon + /// Web Services Identity and Access Management User Guide. + /// + /// /// /// Container for the necessary parameters to execute the UpdateRoleAlias service method. /// @@ -26145,6 +26381,83 @@ public virtual UpdateThingGroupsForThingResponse UpdateThingGroupsForThing(Updat #endregion + #region UpdateThingType + + + /// + /// Updates a thing type. + /// + /// Container for the necessary parameters to execute the UpdateThingType service method. + /// + /// The response from the UpdateThingType service method, as returned by IoT. + /// + /// An unexpected error has occurred. + /// + /// + /// The request is not valid. + /// + /// + /// The specified resource does not exist. + /// + /// + /// The service is temporarily unavailable. + /// + /// + /// The rate exceeds the limit. + /// + /// + /// You are not authorized to perform this operation. + /// + /// REST API Reference for UpdateThingType Operation + public virtual UpdateThingTypeResponse UpdateThingType(UpdateThingTypeRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = UpdateThingTypeRequestMarshaller.Instance; + options.ResponseUnmarshaller = UpdateThingTypeResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// Updates a thing type. + /// + /// Container for the necessary parameters to execute the UpdateThingType service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the UpdateThingType service method, as returned by IoT. + /// + /// An unexpected error has occurred. + /// + /// + /// The request is not valid. + /// + /// + /// The specified resource does not exist. + /// + /// + /// The service is temporarily unavailable. + /// + /// + /// The rate exceeds the limit. + /// + /// + /// You are not authorized to perform this operation. + /// + /// REST API Reference for UpdateThingType Operation + public virtual Task UpdateThingTypeAsync(UpdateThingTypeRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = UpdateThingTypeRequestMarshaller.Instance; + options.ResponseUnmarshaller = UpdateThingTypeResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + #region UpdateTopicRuleDestination diff --git a/sdk/src/Services/IoT/Generated/_bcl/IAmazonIoT.cs b/sdk/src/Services/IoT/Generated/_bcl/IAmazonIoT.cs index a48873d768b2..505953cab72d 100644 --- a/sdk/src/Services/IoT/Generated/_bcl/IAmazonIoT.cs +++ b/sdk/src/Services/IoT/Generated/_bcl/IAmazonIoT.cs @@ -296,7 +296,8 @@ public partial interface IAmazonIoT : IAmazonService, IDisposable /// - /// Associates a software bill of materials (SBOM) with a specific software package version. + /// Associates the selected software bill of materials (SBOM) with a specific software + /// package version. /// /// /// @@ -332,7 +333,8 @@ public partial interface IAmazonIoT : IAmazonService, IDisposable /// - /// Associates a software bill of materials (SBOM) with a specific software package version. + /// Associates the selected software bill of materials (SBOM) with a specific software + /// package version. /// /// /// @@ -1823,7 +1825,10 @@ public partial interface IAmazonIoT : IAmazonService, IDisposable /// - /// Creates a billing group. + /// Creates a billing group. If this call is made multiple times using the same billing + /// group name and configuration, the call will succeed. If this call is made with the + /// same billing group name but different configuration a ResourceAlreadyExistsException + /// is thrown. /// /// /// @@ -1852,7 +1857,10 @@ public partial interface IAmazonIoT : IAmazonService, IDisposable /// - /// Creates a billing group. + /// Creates a billing group. If this call is made multiple times using the same billing + /// group name and configuration, the call will succeed. If this call is made with the + /// same billing group name but different configuration a ResourceAlreadyExistsException + /// is thrown. /// /// /// @@ -4443,6 +4451,16 @@ public partial interface IAmazonIoT : IAmazonService, IDisposable /// Requires permission to access the CreateRoleAlias /// action. /// + /// + /// + /// The value of + /// credentialDurationSeconds must be less than or equal to the maximum session + /// duration of the IAM role that the role alias references. For more information, see + /// + /// Modifying a role maximum session duration (Amazon Web Services API) from the Amazon + /// Web Services Identity and Access Management User Guide. + /// + /// /// /// Container for the necessary parameters to execute the CreateRoleAlias service method. /// @@ -4481,6 +4499,16 @@ public partial interface IAmazonIoT : IAmazonService, IDisposable /// Requires permission to access the CreateRoleAlias /// action. /// + /// + /// + /// The value of + /// credentialDurationSeconds must be less than or equal to the maximum session + /// duration of the IAM role that the role alias references. For more information, see + /// + /// Modifying a role maximum session duration (Amazon Web Services API) from the Amazon + /// Web Services Identity and Access Management User Guide. + /// + /// /// /// Container for the necessary parameters to execute the CreateRoleAlias service method. /// @@ -4926,7 +4954,10 @@ public partial interface IAmazonIoT : IAmazonService, IDisposable /// - /// Creates a new thing type. + /// Creates a new thing type. If this call is made multiple times using the same thing + /// type name and configuration, the call will succeed. If this call is made with the + /// same thing type name but different configuration a ResourceAlreadyExistsException + /// is thrown. /// /// /// @@ -4961,7 +4992,10 @@ public partial interface IAmazonIoT : IAmazonService, IDisposable /// - /// Creates a new thing type. + /// Creates a new thing type. If this call is made multiple times using the same thing + /// type name and configuration, the call will succeed. If this call is made with the + /// same thing type name but different configuration a ResourceAlreadyExistsException + /// is thrown. /// /// /// @@ -11304,8 +11338,8 @@ public partial interface IAmazonIoT : IAmazonService, IDisposable /// - /// Disassociates a software bill of materials (SBOM) from a specific software package - /// version. + /// Disassociates the selected software bill of materials (SBOM) from a specific software + /// package version. /// /// /// @@ -11338,8 +11372,8 @@ public partial interface IAmazonIoT : IAmazonService, IDisposable /// - /// Disassociates a software bill of materials (SBOM) from a specific software package - /// version. + /// Disassociates the selected software bill of materials (SBOM) from a specific software + /// package version. /// /// /// @@ -15832,6 +15866,84 @@ public partial interface IAmazonIoT : IAmazonService, IDisposable #endregion + #region ListPrincipalThingsV2 + + + /// + /// Lists the things associated with the specified principal. A principal can be an X.509 + /// certificate or an Amazon Cognito ID. + /// + /// + /// + /// Requires permission to access the ListPrincipalThings + /// action. + /// + /// + /// Container for the necessary parameters to execute the ListPrincipalThingsV2 service method. + /// + /// The response from the ListPrincipalThingsV2 service method, as returned by IoT. + /// + /// An unexpected error has occurred. + /// + /// + /// The request is not valid. + /// + /// + /// The specified resource does not exist. + /// + /// + /// The service is temporarily unavailable. + /// + /// + /// The rate exceeds the limit. + /// + /// + /// You are not authorized to perform this operation. + /// + /// REST API Reference for ListPrincipalThingsV2 Operation + ListPrincipalThingsV2Response ListPrincipalThingsV2(ListPrincipalThingsV2Request request); + + + + /// + /// Lists the things associated with the specified principal. A principal can be an X.509 + /// certificate or an Amazon Cognito ID. + /// + /// + /// + /// Requires permission to access the ListPrincipalThings + /// action. + /// + /// + /// Container for the necessary parameters to execute the ListPrincipalThingsV2 service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the ListPrincipalThingsV2 service method, as returned by IoT. + /// + /// An unexpected error has occurred. + /// + /// + /// The request is not valid. + /// + /// + /// The specified resource does not exist. + /// + /// + /// The service is temporarily unavailable. + /// + /// + /// The rate exceeds the limit. + /// + /// + /// You are not authorized to perform this operation. + /// + /// REST API Reference for ListPrincipalThingsV2 Operation + Task ListPrincipalThingsV2Async(ListPrincipalThingsV2Request request, CancellationToken cancellationToken = default(CancellationToken)); + + #endregion + #region ListProvisioningTemplates @@ -17011,6 +17123,84 @@ public partial interface IAmazonIoT : IAmazonService, IDisposable #endregion + #region ListThingPrincipalsV2 + + + /// + /// Lists the principals associated with the specified thing. A principal can be an X.509 + /// certificate or an Amazon Cognito ID. + /// + /// + /// + /// Requires permission to access the ListThingPrincipals + /// action. + /// + /// + /// Container for the necessary parameters to execute the ListThingPrincipalsV2 service method. + /// + /// The response from the ListThingPrincipalsV2 service method, as returned by IoT. + /// + /// An unexpected error has occurred. + /// + /// + /// The request is not valid. + /// + /// + /// The specified resource does not exist. + /// + /// + /// The service is temporarily unavailable. + /// + /// + /// The rate exceeds the limit. + /// + /// + /// You are not authorized to perform this operation. + /// + /// REST API Reference for ListThingPrincipalsV2 Operation + ListThingPrincipalsV2Response ListThingPrincipalsV2(ListThingPrincipalsV2Request request); + + + + /// + /// Lists the principals associated with the specified thing. A principal can be an X.509 + /// certificate or an Amazon Cognito ID. + /// + /// + /// + /// Requires permission to access the ListThingPrincipals + /// action. + /// + /// + /// Container for the necessary parameters to execute the ListThingPrincipalsV2 service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the ListThingPrincipalsV2 service method, as returned by IoT. + /// + /// An unexpected error has occurred. + /// + /// + /// The request is not valid. + /// + /// + /// The specified resource does not exist. + /// + /// + /// The service is temporarily unavailable. + /// + /// + /// The rate exceeds the limit. + /// + /// + /// You are not authorized to perform this operation. + /// + /// REST API Reference for ListThingPrincipalsV2 Operation + Task ListThingPrincipalsV2Async(ListThingPrincipalsV2Request request, CancellationToken cancellationToken = default(CancellationToken)); + + #endregion + #region ListThingRegistrationTaskReports @@ -21652,6 +21842,16 @@ public partial interface IAmazonIoT : IAmazonService, IDisposable /// Requires permission to access the UpdateRoleAlias /// action. /// + /// + /// + /// The value of + /// credentialDurationSeconds must be less than or equal to the maximum session + /// duration of the IAM role that the role alias references. For more information, see + /// + /// Modifying a role maximum session duration (Amazon Web Services API) from the Amazon + /// Web Services Identity and Access Management User Guide. + /// + /// /// /// Container for the necessary parameters to execute the UpdateRoleAlias service method. /// @@ -21687,6 +21887,16 @@ public partial interface IAmazonIoT : IAmazonService, IDisposable /// Requires permission to access the UpdateRoleAlias /// action. /// + /// + /// + /// The value of + /// credentialDurationSeconds must be less than or equal to the maximum session + /// duration of the IAM role that the role alias references. For more information, see + /// + /// Modifying a role maximum session duration (Amazon Web Services API) from the Amazon + /// Web Services Identity and Access Management User Guide. + /// + /// /// /// Container for the necessary parameters to execute the UpdateRoleAlias service method. /// @@ -22157,6 +22367,70 @@ public partial interface IAmazonIoT : IAmazonService, IDisposable #endregion + #region UpdateThingType + + + /// + /// Updates a thing type. + /// + /// Container for the necessary parameters to execute the UpdateThingType service method. + /// + /// The response from the UpdateThingType service method, as returned by IoT. + /// + /// An unexpected error has occurred. + /// + /// + /// The request is not valid. + /// + /// + /// The specified resource does not exist. + /// + /// + /// The service is temporarily unavailable. + /// + /// + /// The rate exceeds the limit. + /// + /// + /// You are not authorized to perform this operation. + /// + /// REST API Reference for UpdateThingType Operation + UpdateThingTypeResponse UpdateThingType(UpdateThingTypeRequest request); + + + + /// + /// Updates a thing type. + /// + /// Container for the necessary parameters to execute the UpdateThingType service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the UpdateThingType service method, as returned by IoT. + /// + /// An unexpected error has occurred. + /// + /// + /// The request is not valid. + /// + /// + /// The specified resource does not exist. + /// + /// + /// The service is temporarily unavailable. + /// + /// + /// The rate exceeds the limit. + /// + /// + /// You are not authorized to perform this operation. + /// + /// REST API Reference for UpdateThingType Operation + Task UpdateThingTypeAsync(UpdateThingTypeRequest request, CancellationToken cancellationToken = default(CancellationToken)); + + #endregion + #region UpdateTopicRuleDestination diff --git a/sdk/src/Services/IoT/IoT.sln b/sdk/src/Services/IoT/IoT.sln index dda63856d17e..690dec1355c2 100644 --- a/sdk/src/Services/IoT/IoT.sln +++ b/sdk/src/Services/IoT/IoT.sln @@ -92,7 +92,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {4D0BEEF0-9D25-4238-93CD-3EB0FDA409BD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {4D0BEEF0-9D25-4238-93CD-3EB0FDA409BD}.Debug|Any CPU.Build.0 = Debug|Any CPU {4D0BEEF0-9D25-4238-93CD-3EB0FDA409BD}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -113,97 +120,6 @@ Global {65E94B9A-2A23-4C09-8718-BD13AAFEB6E7}.Debug|Any CPU.Build.0 = Debug|Any CPU {65E94B9A-2A23-4C09-8718-BD13AAFEB6E7}.Release|Any CPU.ActiveCfg = Release|Any CPU {65E94B9A-2A23-4C09-8718-BD13AAFEB6E7}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {7F429CE3-8FF3-407B-93E6-EA0CB7D85A0E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7F429CE3-8FF3-407B-93E6-EA0CB7D85A0E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7F429CE3-8FF3-407B-93E6-EA0CB7D85A0E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7F429CE3-8FF3-407B-93E6-EA0CB7D85A0E}.Release|Any CPU.Build.0 = Release|Any CPU - {24ACFE5F-78D7-4D85-974A-CED205F9ED9E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {24ACFE5F-78D7-4D85-974A-CED205F9ED9E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {24ACFE5F-78D7-4D85-974A-CED205F9ED9E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {24ACFE5F-78D7-4D85-974A-CED205F9ED9E}.Release|Any CPU.Build.0 = Release|Any CPU - {020167B4-DF4E-469E-BD30-57B4172CB1B9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {020167B4-DF4E-469E-BD30-57B4172CB1B9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {020167B4-DF4E-469E-BD30-57B4172CB1B9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {020167B4-DF4E-469E-BD30-57B4172CB1B9}.Release|Any CPU.Build.0 = Release|Any CPU - {383F67C1-346C-4D17-B212-F686143EDAC9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {383F67C1-346C-4D17-B212-F686143EDAC9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {383F67C1-346C-4D17-B212-F686143EDAC9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {383F67C1-346C-4D17-B212-F686143EDAC9}.Release|Any CPU.Build.0 = Release|Any CPU - {4BD8A753-F1DB-46C8-8DD5-E570C4BC63B3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4BD8A753-F1DB-46C8-8DD5-E570C4BC63B3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4BD8A753-F1DB-46C8-8DD5-E570C4BC63B3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4BD8A753-F1DB-46C8-8DD5-E570C4BC63B3}.Release|Any CPU.Build.0 = Release|Any CPU - {FD7E80DC-97BA-4A2A-987A-D65662BF62D8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FD7E80DC-97BA-4A2A-987A-D65662BF62D8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FD7E80DC-97BA-4A2A-987A-D65662BF62D8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FD7E80DC-97BA-4A2A-987A-D65662BF62D8}.Release|Any CPU.Build.0 = Release|Any CPU - {26256DB7-AE36-456F-99DB-DB2B61FD4FE1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {26256DB7-AE36-456F-99DB-DB2B61FD4FE1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {26256DB7-AE36-456F-99DB-DB2B61FD4FE1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {26256DB7-AE36-456F-99DB-DB2B61FD4FE1}.Release|Any CPU.Build.0 = Release|Any CPU - {999473CF-951F-44E5-A0DF-9F399132F4AB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {999473CF-951F-44E5-A0DF-9F399132F4AB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {999473CF-951F-44E5-A0DF-9F399132F4AB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {999473CF-951F-44E5-A0DF-9F399132F4AB}.Release|Any CPU.Build.0 = Release|Any CPU - {2D8BEAD7-B414-4603-99D1-9BA2C447EEA1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2D8BEAD7-B414-4603-99D1-9BA2C447EEA1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2D8BEAD7-B414-4603-99D1-9BA2C447EEA1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2D8BEAD7-B414-4603-99D1-9BA2C447EEA1}.Release|Any CPU.Build.0 = Release|Any CPU - {65BA35E4-E1F0-4CEB-BE37-9DF6CB335082}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {65BA35E4-E1F0-4CEB-BE37-9DF6CB335082}.Debug|Any CPU.Build.0 = Debug|Any CPU - {65BA35E4-E1F0-4CEB-BE37-9DF6CB335082}.Release|Any CPU.ActiveCfg = Release|Any CPU - {65BA35E4-E1F0-4CEB-BE37-9DF6CB335082}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {7F429CE3-8FF3-407B-93E6-EA0CB7D85A0E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7F429CE3-8FF3-407B-93E6-EA0CB7D85A0E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7F429CE3-8FF3-407B-93E6-EA0CB7D85A0E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7F429CE3-8FF3-407B-93E6-EA0CB7D85A0E}.Release|Any CPU.Build.0 = Release|Any CPU - {24ACFE5F-78D7-4D85-974A-CED205F9ED9E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {24ACFE5F-78D7-4D85-974A-CED205F9ED9E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {24ACFE5F-78D7-4D85-974A-CED205F9ED9E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {24ACFE5F-78D7-4D85-974A-CED205F9ED9E}.Release|Any CPU.Build.0 = Release|Any CPU - {020167B4-DF4E-469E-BD30-57B4172CB1B9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {020167B4-DF4E-469E-BD30-57B4172CB1B9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {020167B4-DF4E-469E-BD30-57B4172CB1B9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {020167B4-DF4E-469E-BD30-57B4172CB1B9}.Release|Any CPU.Build.0 = Release|Any CPU - {383F67C1-346C-4D17-B212-F686143EDAC9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {383F67C1-346C-4D17-B212-F686143EDAC9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {383F67C1-346C-4D17-B212-F686143EDAC9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {383F67C1-346C-4D17-B212-F686143EDAC9}.Release|Any CPU.Build.0 = Release|Any CPU - {4BD8A753-F1DB-46C8-8DD5-E570C4BC63B3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4BD8A753-F1DB-46C8-8DD5-E570C4BC63B3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4BD8A753-F1DB-46C8-8DD5-E570C4BC63B3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4BD8A753-F1DB-46C8-8DD5-E570C4BC63B3}.Release|Any CPU.Build.0 = Release|Any CPU - {FD7E80DC-97BA-4A2A-987A-D65662BF62D8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FD7E80DC-97BA-4A2A-987A-D65662BF62D8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FD7E80DC-97BA-4A2A-987A-D65662BF62D8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FD7E80DC-97BA-4A2A-987A-D65662BF62D8}.Release|Any CPU.Build.0 = Release|Any CPU - {26256DB7-AE36-456F-99DB-DB2B61FD4FE1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {26256DB7-AE36-456F-99DB-DB2B61FD4FE1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {26256DB7-AE36-456F-99DB-DB2B61FD4FE1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {26256DB7-AE36-456F-99DB-DB2B61FD4FE1}.Release|Any CPU.Build.0 = Release|Any CPU - {999473CF-951F-44E5-A0DF-9F399132F4AB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {999473CF-951F-44E5-A0DF-9F399132F4AB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {999473CF-951F-44E5-A0DF-9F399132F4AB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {999473CF-951F-44E5-A0DF-9F399132F4AB}.Release|Any CPU.Build.0 = Release|Any CPU - {2D8BEAD7-B414-4603-99D1-9BA2C447EEA1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2D8BEAD7-B414-4603-99D1-9BA2C447EEA1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2D8BEAD7-B414-4603-99D1-9BA2C447EEA1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2D8BEAD7-B414-4603-99D1-9BA2C447EEA1}.Release|Any CPU.Build.0 = Release|Any CPU - {65BA35E4-E1F0-4CEB-BE37-9DF6CB335082}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {65BA35E4-E1F0-4CEB-BE37-9DF6CB335082}.Debug|Any CPU.Build.0 = Debug|Any CPU - {65BA35E4-E1F0-4CEB-BE37-9DF6CB335082}.Release|Any CPU.ActiveCfg = Release|Any CPU - {65BA35E4-E1F0-4CEB-BE37-9DF6CB335082}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -220,37 +136,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {4D0BEEF0-9D25-4238-93CD-3EB0FDA409BD} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {5EFD6392-FEAB-4763-8E83-A83E952271D3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {5962DB79-07D1-47EB-B9F8-3808CF564C7C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {EE41098D-666A-4010-ABE2-99757A32FD44} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {65E94B9A-2A23-4C09-8718-BD13AAFEB6E7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {7F429CE3-8FF3-407B-93E6-EA0CB7D85A0E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {24ACFE5F-78D7-4D85-974A-CED205F9ED9E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {020167B4-DF4E-469E-BD30-57B4172CB1B9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {383F67C1-346C-4D17-B212-F686143EDAC9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4BD8A753-F1DB-46C8-8DD5-E570C4BC63B3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {FD7E80DC-97BA-4A2A-987A-D65662BF62D8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {26256DB7-AE36-456F-99DB-DB2B61FD4FE1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {999473CF-951F-44E5-A0DF-9F399132F4AB} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {2D8BEAD7-B414-4603-99D1-9BA2C447EEA1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {65BA35E4-E1F0-4CEB-BE37-9DF6CB335082} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {7F429CE3-8FF3-407B-93E6-EA0CB7D85A0E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {24ACFE5F-78D7-4D85-974A-CED205F9ED9E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {020167B4-DF4E-469E-BD30-57B4172CB1B9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {383F67C1-346C-4D17-B212-F686143EDAC9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4BD8A753-F1DB-46C8-8DD5-E570C4BC63B3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {FD7E80DC-97BA-4A2A-987A-D65662BF62D8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {26256DB7-AE36-456F-99DB-DB2B61FD4FE1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {999473CF-951F-44E5-A0DF-9F399132F4AB} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {2D8BEAD7-B414-4603-99D1-9BA2C447EEA1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {65BA35E4-E1F0-4CEB-BE37-9DF6CB335082} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {F85CD577-993E-491D-BCB3-798A9AC8B4BC} diff --git a/sdk/src/Services/IoT/Properties/AssemblyInfo.cs b/sdk/src/Services/IoT/Properties/AssemblyInfo.cs index 3cc07ca4f767..b0db41d04ea2 100644 --- a/sdk/src/Services/IoT/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/IoT/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.5")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.403.0")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/IoT1ClickDevicesService/Generated/AmazonIoT1ClickDevicesServiceConfig.cs b/sdk/src/Services/IoT1ClickDevicesService/Generated/AmazonIoT1ClickDevicesServiceConfig.cs index f73b3289b96a..0839aacbeaf3 100644 --- a/sdk/src/Services/IoT1ClickDevicesService/Generated/AmazonIoT1ClickDevicesServiceConfig.cs +++ b/sdk/src/Services/IoT1ClickDevicesService/Generated/AmazonIoT1ClickDevicesServiceConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.IoT1ClickDevicesService public partial class AmazonIoT1ClickDevicesServiceConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("IoT 1Click Devices Service", "4.0.0.0"); private static readonly AmazonIoT1ClickDevicesServiceEndpointResolver EndpointResolver = new AmazonIoT1ClickDevicesServiceEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("IoT 1Click Devices Service", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("IoT 1Click Devices Service", "3.7.400.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/IoT1ClickDevicesService/IoT1ClickDevicesService.sln b/sdk/src/Services/IoT1ClickDevicesService/IoT1ClickDevicesService.sln index 746b2ac3e9b3..39e0eba1c299 100644 --- a/sdk/src/Services/IoT1ClickDevicesService/IoT1ClickDevicesService.sln +++ b/sdk/src/Services/IoT1ClickDevicesService/IoT1ClickDevicesService.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {F4B80627-03CB-40A9-800B-30442ED7A0B0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {F4B80627-03CB-40A9-800B-30442ED7A0B0}.Debug|Any CPU.Build.0 = Debug|Any CPU {F4B80627-03CB-40A9-800B-30442ED7A0B0}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {D667B34E-2ABC-40AB-A809-54C186D6A74C}.Debug|Any CPU.Build.0 = Debug|Any CPU {D667B34E-2ABC-40AB-A809-54C186D6A74C}.Release|Any CPU.ActiveCfg = Release|Any CPU {D667B34E-2ABC-40AB-A809-54C186D6A74C}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {4281E9C1-53F2-4D58-AE15-C84FFA693FE2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4281E9C1-53F2-4D58-AE15-C84FFA693FE2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4281E9C1-53F2-4D58-AE15-C84FFA693FE2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4281E9C1-53F2-4D58-AE15-C84FFA693FE2}.Release|Any CPU.Build.0 = Release|Any CPU - {AFBDDA2B-1DBD-4F30-9CF5-BE6BD7F3CF77}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AFBDDA2B-1DBD-4F30-9CF5-BE6BD7F3CF77}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AFBDDA2B-1DBD-4F30-9CF5-BE6BD7F3CF77}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AFBDDA2B-1DBD-4F30-9CF5-BE6BD7F3CF77}.Release|Any CPU.Build.0 = Release|Any CPU - {D01D33E8-D3DC-4D63-9AE4-DCBD24F7B599}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D01D33E8-D3DC-4D63-9AE4-DCBD24F7B599}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D01D33E8-D3DC-4D63-9AE4-DCBD24F7B599}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D01D33E8-D3DC-4D63-9AE4-DCBD24F7B599}.Release|Any CPU.Build.0 = Release|Any CPU - {CADC2C8E-58DD-4CD9-BA8A-B8F5DA97E2DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CADC2C8E-58DD-4CD9-BA8A-B8F5DA97E2DC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CADC2C8E-58DD-4CD9-BA8A-B8F5DA97E2DC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CADC2C8E-58DD-4CD9-BA8A-B8F5DA97E2DC}.Release|Any CPU.Build.0 = Release|Any CPU - {322E53DB-2E07-4AD6-8758-50E6EE8D5A8F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {322E53DB-2E07-4AD6-8758-50E6EE8D5A8F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {322E53DB-2E07-4AD6-8758-50E6EE8D5A8F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {322E53DB-2E07-4AD6-8758-50E6EE8D5A8F}.Release|Any CPU.Build.0 = Release|Any CPU - {867F7A5B-DAFF-4E40-935C-5CB4E6720808}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {867F7A5B-DAFF-4E40-935C-5CB4E6720808}.Debug|Any CPU.Build.0 = Debug|Any CPU - {867F7A5B-DAFF-4E40-935C-5CB4E6720808}.Release|Any CPU.ActiveCfg = Release|Any CPU - {867F7A5B-DAFF-4E40-935C-5CB4E6720808}.Release|Any CPU.Build.0 = Release|Any CPU - {D04B7A5C-3443-4D4A-8959-DC10785DC3B6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D04B7A5C-3443-4D4A-8959-DC10785DC3B6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D04B7A5C-3443-4D4A-8959-DC10785DC3B6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D04B7A5C-3443-4D4A-8959-DC10785DC3B6}.Release|Any CPU.Build.0 = Release|Any CPU - {87CE1443-1BA0-4CA6-B3A4-12C019E18AEB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87CE1443-1BA0-4CA6-B3A4-12C019E18AEB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87CE1443-1BA0-4CA6-B3A4-12C019E18AEB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87CE1443-1BA0-4CA6-B3A4-12C019E18AEB}.Release|Any CPU.Build.0 = Release|Any CPU - {D6920D2E-3EB7-4564-9CFD-9180FA53C8FA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D6920D2E-3EB7-4564-9CFD-9180FA53C8FA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D6920D2E-3EB7-4564-9CFD-9180FA53C8FA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D6920D2E-3EB7-4564-9CFD-9180FA53C8FA}.Release|Any CPU.Build.0 = Release|Any CPU - {5080AA7E-D6C5-432B-9185-B6DCB9521F76}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5080AA7E-D6C5-432B-9185-B6DCB9521F76}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5080AA7E-D6C5-432B-9185-B6DCB9521F76}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5080AA7E-D6C5-432B-9185-B6DCB9521F76}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {4281E9C1-53F2-4D58-AE15-C84FFA693FE2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4281E9C1-53F2-4D58-AE15-C84FFA693FE2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4281E9C1-53F2-4D58-AE15-C84FFA693FE2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4281E9C1-53F2-4D58-AE15-C84FFA693FE2}.Release|Any CPU.Build.0 = Release|Any CPU - {AFBDDA2B-1DBD-4F30-9CF5-BE6BD7F3CF77}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AFBDDA2B-1DBD-4F30-9CF5-BE6BD7F3CF77}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AFBDDA2B-1DBD-4F30-9CF5-BE6BD7F3CF77}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AFBDDA2B-1DBD-4F30-9CF5-BE6BD7F3CF77}.Release|Any CPU.Build.0 = Release|Any CPU - {D01D33E8-D3DC-4D63-9AE4-DCBD24F7B599}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D01D33E8-D3DC-4D63-9AE4-DCBD24F7B599}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D01D33E8-D3DC-4D63-9AE4-DCBD24F7B599}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D01D33E8-D3DC-4D63-9AE4-DCBD24F7B599}.Release|Any CPU.Build.0 = Release|Any CPU - {CADC2C8E-58DD-4CD9-BA8A-B8F5DA97E2DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CADC2C8E-58DD-4CD9-BA8A-B8F5DA97E2DC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CADC2C8E-58DD-4CD9-BA8A-B8F5DA97E2DC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CADC2C8E-58DD-4CD9-BA8A-B8F5DA97E2DC}.Release|Any CPU.Build.0 = Release|Any CPU - {322E53DB-2E07-4AD6-8758-50E6EE8D5A8F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {322E53DB-2E07-4AD6-8758-50E6EE8D5A8F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {322E53DB-2E07-4AD6-8758-50E6EE8D5A8F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {322E53DB-2E07-4AD6-8758-50E6EE8D5A8F}.Release|Any CPU.Build.0 = Release|Any CPU - {867F7A5B-DAFF-4E40-935C-5CB4E6720808}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {867F7A5B-DAFF-4E40-935C-5CB4E6720808}.Debug|Any CPU.Build.0 = Debug|Any CPU - {867F7A5B-DAFF-4E40-935C-5CB4E6720808}.Release|Any CPU.ActiveCfg = Release|Any CPU - {867F7A5B-DAFF-4E40-935C-5CB4E6720808}.Release|Any CPU.Build.0 = Release|Any CPU - {D04B7A5C-3443-4D4A-8959-DC10785DC3B6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D04B7A5C-3443-4D4A-8959-DC10785DC3B6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D04B7A5C-3443-4D4A-8959-DC10785DC3B6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D04B7A5C-3443-4D4A-8959-DC10785DC3B6}.Release|Any CPU.Build.0 = Release|Any CPU - {87CE1443-1BA0-4CA6-B3A4-12C019E18AEB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87CE1443-1BA0-4CA6-B3A4-12C019E18AEB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87CE1443-1BA0-4CA6-B3A4-12C019E18AEB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87CE1443-1BA0-4CA6-B3A4-12C019E18AEB}.Release|Any CPU.Build.0 = Release|Any CPU - {D6920D2E-3EB7-4564-9CFD-9180FA53C8FA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D6920D2E-3EB7-4564-9CFD-9180FA53C8FA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D6920D2E-3EB7-4564-9CFD-9180FA53C8FA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D6920D2E-3EB7-4564-9CFD-9180FA53C8FA}.Release|Any CPU.Build.0 = Release|Any CPU - {5080AA7E-D6C5-432B-9185-B6DCB9521F76}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5080AA7E-D6C5-432B-9185-B6DCB9521F76}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5080AA7E-D6C5-432B-9185-B6DCB9521F76}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5080AA7E-D6C5-432B-9185-B6DCB9521F76}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {F4B80627-03CB-40A9-800B-30442ED7A0B0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {90336709-0070-48B8-B4A2-EC6BEDA3D735} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {A66DBD13-3C09-4935-9159-F1C0E56DCCFA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {1C19717E-D1FF-473A-8468-C79B2287D4D4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {D667B34E-2ABC-40AB-A809-54C186D6A74C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {4281E9C1-53F2-4D58-AE15-C84FFA693FE2} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {AFBDDA2B-1DBD-4F30-9CF5-BE6BD7F3CF77} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D01D33E8-D3DC-4D63-9AE4-DCBD24F7B599} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {CADC2C8E-58DD-4CD9-BA8A-B8F5DA97E2DC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {322E53DB-2E07-4AD6-8758-50E6EE8D5A8F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {867F7A5B-DAFF-4E40-935C-5CB4E6720808} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D04B7A5C-3443-4D4A-8959-DC10785DC3B6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {87CE1443-1BA0-4CA6-B3A4-12C019E18AEB} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D6920D2E-3EB7-4564-9CFD-9180FA53C8FA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {5080AA7E-D6C5-432B-9185-B6DCB9521F76} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {4281E9C1-53F2-4D58-AE15-C84FFA693FE2} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {AFBDDA2B-1DBD-4F30-9CF5-BE6BD7F3CF77} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D01D33E8-D3DC-4D63-9AE4-DCBD24F7B599} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {CADC2C8E-58DD-4CD9-BA8A-B8F5DA97E2DC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {322E53DB-2E07-4AD6-8758-50E6EE8D5A8F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {867F7A5B-DAFF-4E40-935C-5CB4E6720808} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D04B7A5C-3443-4D4A-8959-DC10785DC3B6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {87CE1443-1BA0-4CA6-B3A4-12C019E18AEB} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D6920D2E-3EB7-4564-9CFD-9180FA53C8FA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {5080AA7E-D6C5-432B-9185-B6DCB9521F76} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {27D36B4F-4C4C-44A2-9BC8-25C6C1CC3CCD} diff --git a/sdk/src/Services/IoT1ClickDevicesService/Properties/AssemblyInfo.cs b/sdk/src/Services/IoT1ClickDevicesService/Properties/AssemblyInfo.cs index 89f65b84c594..1e4c0e1f8e9d 100644 --- a/sdk/src/Services/IoT1ClickDevicesService/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/IoT1ClickDevicesService/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/IoT1ClickProjects/Generated/AmazonIoT1ClickProjectsConfig.cs b/sdk/src/Services/IoT1ClickProjects/Generated/AmazonIoT1ClickProjectsConfig.cs index 21d4ba5f4240..65201cb00257 100644 --- a/sdk/src/Services/IoT1ClickProjects/Generated/AmazonIoT1ClickProjectsConfig.cs +++ b/sdk/src/Services/IoT1ClickProjects/Generated/AmazonIoT1ClickProjectsConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.IoT1ClickProjects public partial class AmazonIoT1ClickProjectsConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("IoT 1Click Projects", "4.0.0.0"); private static readonly AmazonIoT1ClickProjectsEndpointResolver EndpointResolver = new AmazonIoT1ClickProjectsEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("IoT 1Click Projects", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("IoT 1Click Projects", "3.7.400.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/IoT1ClickProjects/IoT1ClickProjects.sln b/sdk/src/Services/IoT1ClickProjects/IoT1ClickProjects.sln index e0374b50926a..797c962a8ac1 100644 --- a/sdk/src/Services/IoT1ClickProjects/IoT1ClickProjects.sln +++ b/sdk/src/Services/IoT1ClickProjects/IoT1ClickProjects.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {18D118DC-4194-4ADE-B3D1-867F2CF01851}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {18D118DC-4194-4ADE-B3D1-867F2CF01851}.Debug|Any CPU.Build.0 = Debug|Any CPU {18D118DC-4194-4ADE-B3D1-867F2CF01851}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {F2514DF6-05D3-4709-AF2F-ACCB8058430B}.Debug|Any CPU.Build.0 = Debug|Any CPU {F2514DF6-05D3-4709-AF2F-ACCB8058430B}.Release|Any CPU.ActiveCfg = Release|Any CPU {F2514DF6-05D3-4709-AF2F-ACCB8058430B}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {26CF0BE3-277F-4FBC-86BB-3A1B9F78C9AE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {26CF0BE3-277F-4FBC-86BB-3A1B9F78C9AE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {26CF0BE3-277F-4FBC-86BB-3A1B9F78C9AE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {26CF0BE3-277F-4FBC-86BB-3A1B9F78C9AE}.Release|Any CPU.Build.0 = Release|Any CPU - {51D289A6-24F5-4B2D-A2F0-B5D480263186}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {51D289A6-24F5-4B2D-A2F0-B5D480263186}.Debug|Any CPU.Build.0 = Debug|Any CPU - {51D289A6-24F5-4B2D-A2F0-B5D480263186}.Release|Any CPU.ActiveCfg = Release|Any CPU - {51D289A6-24F5-4B2D-A2F0-B5D480263186}.Release|Any CPU.Build.0 = Release|Any CPU - {9D7B2C0A-6DFE-4228-9EF5-0E6057DEEC4D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9D7B2C0A-6DFE-4228-9EF5-0E6057DEEC4D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9D7B2C0A-6DFE-4228-9EF5-0E6057DEEC4D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9D7B2C0A-6DFE-4228-9EF5-0E6057DEEC4D}.Release|Any CPU.Build.0 = Release|Any CPU - {16CD031B-38B0-424B-A241-E7D9A32DDFFF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {16CD031B-38B0-424B-A241-E7D9A32DDFFF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {16CD031B-38B0-424B-A241-E7D9A32DDFFF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {16CD031B-38B0-424B-A241-E7D9A32DDFFF}.Release|Any CPU.Build.0 = Release|Any CPU - {B2566E77-5EDA-4AD7-99F8-7D14A73715C0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B2566E77-5EDA-4AD7-99F8-7D14A73715C0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B2566E77-5EDA-4AD7-99F8-7D14A73715C0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B2566E77-5EDA-4AD7-99F8-7D14A73715C0}.Release|Any CPU.Build.0 = Release|Any CPU - {63DDA8D7-F7DA-41A5-BDB2-548A00C8D536}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {63DDA8D7-F7DA-41A5-BDB2-548A00C8D536}.Debug|Any CPU.Build.0 = Debug|Any CPU - {63DDA8D7-F7DA-41A5-BDB2-548A00C8D536}.Release|Any CPU.ActiveCfg = Release|Any CPU - {63DDA8D7-F7DA-41A5-BDB2-548A00C8D536}.Release|Any CPU.Build.0 = Release|Any CPU - {78A3B031-7D78-46AD-A1B2-8779BD0F7B0A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {78A3B031-7D78-46AD-A1B2-8779BD0F7B0A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {78A3B031-7D78-46AD-A1B2-8779BD0F7B0A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {78A3B031-7D78-46AD-A1B2-8779BD0F7B0A}.Release|Any CPU.Build.0 = Release|Any CPU - {32D6E9EA-D155-46A9-B291-BA6C2E213B5E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {32D6E9EA-D155-46A9-B291-BA6C2E213B5E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {32D6E9EA-D155-46A9-B291-BA6C2E213B5E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {32D6E9EA-D155-46A9-B291-BA6C2E213B5E}.Release|Any CPU.Build.0 = Release|Any CPU - {909B5A0A-CD6F-42D1-966F-6EACA1060186}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {909B5A0A-CD6F-42D1-966F-6EACA1060186}.Debug|Any CPU.Build.0 = Debug|Any CPU - {909B5A0A-CD6F-42D1-966F-6EACA1060186}.Release|Any CPU.ActiveCfg = Release|Any CPU - {909B5A0A-CD6F-42D1-966F-6EACA1060186}.Release|Any CPU.Build.0 = Release|Any CPU - {0C0DB1C5-DFF0-4D39-9B8A-E52E8AB499A8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0C0DB1C5-DFF0-4D39-9B8A-E52E8AB499A8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0C0DB1C5-DFF0-4D39-9B8A-E52E8AB499A8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0C0DB1C5-DFF0-4D39-9B8A-E52E8AB499A8}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {26CF0BE3-277F-4FBC-86BB-3A1B9F78C9AE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {26CF0BE3-277F-4FBC-86BB-3A1B9F78C9AE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {26CF0BE3-277F-4FBC-86BB-3A1B9F78C9AE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {26CF0BE3-277F-4FBC-86BB-3A1B9F78C9AE}.Release|Any CPU.Build.0 = Release|Any CPU - {51D289A6-24F5-4B2D-A2F0-B5D480263186}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {51D289A6-24F5-4B2D-A2F0-B5D480263186}.Debug|Any CPU.Build.0 = Debug|Any CPU - {51D289A6-24F5-4B2D-A2F0-B5D480263186}.Release|Any CPU.ActiveCfg = Release|Any CPU - {51D289A6-24F5-4B2D-A2F0-B5D480263186}.Release|Any CPU.Build.0 = Release|Any CPU - {9D7B2C0A-6DFE-4228-9EF5-0E6057DEEC4D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9D7B2C0A-6DFE-4228-9EF5-0E6057DEEC4D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9D7B2C0A-6DFE-4228-9EF5-0E6057DEEC4D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9D7B2C0A-6DFE-4228-9EF5-0E6057DEEC4D}.Release|Any CPU.Build.0 = Release|Any CPU - {16CD031B-38B0-424B-A241-E7D9A32DDFFF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {16CD031B-38B0-424B-A241-E7D9A32DDFFF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {16CD031B-38B0-424B-A241-E7D9A32DDFFF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {16CD031B-38B0-424B-A241-E7D9A32DDFFF}.Release|Any CPU.Build.0 = Release|Any CPU - {B2566E77-5EDA-4AD7-99F8-7D14A73715C0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B2566E77-5EDA-4AD7-99F8-7D14A73715C0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B2566E77-5EDA-4AD7-99F8-7D14A73715C0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B2566E77-5EDA-4AD7-99F8-7D14A73715C0}.Release|Any CPU.Build.0 = Release|Any CPU - {63DDA8D7-F7DA-41A5-BDB2-548A00C8D536}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {63DDA8D7-F7DA-41A5-BDB2-548A00C8D536}.Debug|Any CPU.Build.0 = Debug|Any CPU - {63DDA8D7-F7DA-41A5-BDB2-548A00C8D536}.Release|Any CPU.ActiveCfg = Release|Any CPU - {63DDA8D7-F7DA-41A5-BDB2-548A00C8D536}.Release|Any CPU.Build.0 = Release|Any CPU - {78A3B031-7D78-46AD-A1B2-8779BD0F7B0A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {78A3B031-7D78-46AD-A1B2-8779BD0F7B0A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {78A3B031-7D78-46AD-A1B2-8779BD0F7B0A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {78A3B031-7D78-46AD-A1B2-8779BD0F7B0A}.Release|Any CPU.Build.0 = Release|Any CPU - {32D6E9EA-D155-46A9-B291-BA6C2E213B5E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {32D6E9EA-D155-46A9-B291-BA6C2E213B5E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {32D6E9EA-D155-46A9-B291-BA6C2E213B5E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {32D6E9EA-D155-46A9-B291-BA6C2E213B5E}.Release|Any CPU.Build.0 = Release|Any CPU - {909B5A0A-CD6F-42D1-966F-6EACA1060186}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {909B5A0A-CD6F-42D1-966F-6EACA1060186}.Debug|Any CPU.Build.0 = Debug|Any CPU - {909B5A0A-CD6F-42D1-966F-6EACA1060186}.Release|Any CPU.ActiveCfg = Release|Any CPU - {909B5A0A-CD6F-42D1-966F-6EACA1060186}.Release|Any CPU.Build.0 = Release|Any CPU - {0C0DB1C5-DFF0-4D39-9B8A-E52E8AB499A8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0C0DB1C5-DFF0-4D39-9B8A-E52E8AB499A8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0C0DB1C5-DFF0-4D39-9B8A-E52E8AB499A8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0C0DB1C5-DFF0-4D39-9B8A-E52E8AB499A8}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {18D118DC-4194-4ADE-B3D1-867F2CF01851} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {DF93D1F0-D8CB-4239-A851-9172B8464CAD} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {9B6AB9DA-7724-43F2-8813-F7DF73AC38C8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {9AFA23E7-9FBD-4537-B52A-70C6289D2E60} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {F2514DF6-05D3-4709-AF2F-ACCB8058430B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {26CF0BE3-277F-4FBC-86BB-3A1B9F78C9AE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {51D289A6-24F5-4B2D-A2F0-B5D480263186} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {9D7B2C0A-6DFE-4228-9EF5-0E6057DEEC4D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {16CD031B-38B0-424B-A241-E7D9A32DDFFF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B2566E77-5EDA-4AD7-99F8-7D14A73715C0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {63DDA8D7-F7DA-41A5-BDB2-548A00C8D536} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {78A3B031-7D78-46AD-A1B2-8779BD0F7B0A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {32D6E9EA-D155-46A9-B291-BA6C2E213B5E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {909B5A0A-CD6F-42D1-966F-6EACA1060186} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0C0DB1C5-DFF0-4D39-9B8A-E52E8AB499A8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {26CF0BE3-277F-4FBC-86BB-3A1B9F78C9AE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {51D289A6-24F5-4B2D-A2F0-B5D480263186} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {9D7B2C0A-6DFE-4228-9EF5-0E6057DEEC4D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {16CD031B-38B0-424B-A241-E7D9A32DDFFF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B2566E77-5EDA-4AD7-99F8-7D14A73715C0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {63DDA8D7-F7DA-41A5-BDB2-548A00C8D536} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {78A3B031-7D78-46AD-A1B2-8779BD0F7B0A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {32D6E9EA-D155-46A9-B291-BA6C2E213B5E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {909B5A0A-CD6F-42D1-966F-6EACA1060186} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0C0DB1C5-DFF0-4D39-9B8A-E52E8AB499A8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {AFB51347-9E14-4A61-86D7-035BCB45E966} diff --git a/sdk/src/Services/IoT1ClickProjects/Properties/AssemblyInfo.cs b/sdk/src/Services/IoT1ClickProjects/Properties/AssemblyInfo.cs index eba0bc4aafd6..7fb80f304dd0 100644 --- a/sdk/src/Services/IoT1ClickProjects/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/IoT1ClickProjects/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/IoTAnalytics/Generated/AmazonIoTAnalyticsConfig.cs b/sdk/src/Services/IoTAnalytics/Generated/AmazonIoTAnalyticsConfig.cs index f5749c906008..e1f8a2da970a 100644 --- a/sdk/src/Services/IoTAnalytics/Generated/AmazonIoTAnalyticsConfig.cs +++ b/sdk/src/Services/IoTAnalytics/Generated/AmazonIoTAnalyticsConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.IoTAnalytics public partial class AmazonIoTAnalyticsConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("IoTAnalytics", "4.0.0.0"); private static readonly AmazonIoTAnalyticsEndpointResolver EndpointResolver = new AmazonIoTAnalyticsEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("IoTAnalytics", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("IoTAnalytics", "3.7.400.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/IoTAnalytics/IoTAnalytics.sln b/sdk/src/Services/IoTAnalytics/IoTAnalytics.sln index 87dd342ac5f5..3312509b9e41 100644 --- a/sdk/src/Services/IoTAnalytics/IoTAnalytics.sln +++ b/sdk/src/Services/IoTAnalytics/IoTAnalytics.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {955C23C9-FB46-49C6-96A4-99967662BAA3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {955C23C9-FB46-49C6-96A4-99967662BAA3}.Debug|Any CPU.Build.0 = Debug|Any CPU {955C23C9-FB46-49C6-96A4-99967662BAA3}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {38DDC03A-29B7-44F3-94BA-6BF67768AB6F}.Debug|Any CPU.Build.0 = Debug|Any CPU {38DDC03A-29B7-44F3-94BA-6BF67768AB6F}.Release|Any CPU.ActiveCfg = Release|Any CPU {38DDC03A-29B7-44F3-94BA-6BF67768AB6F}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {93F45F69-E6AA-4AC1-A6AF-1987A1EC0245}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {93F45F69-E6AA-4AC1-A6AF-1987A1EC0245}.Debug|Any CPU.Build.0 = Debug|Any CPU - {93F45F69-E6AA-4AC1-A6AF-1987A1EC0245}.Release|Any CPU.ActiveCfg = Release|Any CPU - {93F45F69-E6AA-4AC1-A6AF-1987A1EC0245}.Release|Any CPU.Build.0 = Release|Any CPU - {B2D562AC-CF13-4AA8-B5B5-6A08EEE6D677}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B2D562AC-CF13-4AA8-B5B5-6A08EEE6D677}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B2D562AC-CF13-4AA8-B5B5-6A08EEE6D677}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B2D562AC-CF13-4AA8-B5B5-6A08EEE6D677}.Release|Any CPU.Build.0 = Release|Any CPU - {DD236432-D129-4D2C-A002-8583F765570B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DD236432-D129-4D2C-A002-8583F765570B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DD236432-D129-4D2C-A002-8583F765570B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DD236432-D129-4D2C-A002-8583F765570B}.Release|Any CPU.Build.0 = Release|Any CPU - {1EF09B0B-341A-41FD-BD9E-4527F3A0CD6B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1EF09B0B-341A-41FD-BD9E-4527F3A0CD6B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1EF09B0B-341A-41FD-BD9E-4527F3A0CD6B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1EF09B0B-341A-41FD-BD9E-4527F3A0CD6B}.Release|Any CPU.Build.0 = Release|Any CPU - {C8C25812-0DEA-42B2-B48A-1B5EB7E719E5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C8C25812-0DEA-42B2-B48A-1B5EB7E719E5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C8C25812-0DEA-42B2-B48A-1B5EB7E719E5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C8C25812-0DEA-42B2-B48A-1B5EB7E719E5}.Release|Any CPU.Build.0 = Release|Any CPU - {6FD9886C-27A1-4E31-8EF2-9DDBA3D77BBF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6FD9886C-27A1-4E31-8EF2-9DDBA3D77BBF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6FD9886C-27A1-4E31-8EF2-9DDBA3D77BBF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6FD9886C-27A1-4E31-8EF2-9DDBA3D77BBF}.Release|Any CPU.Build.0 = Release|Any CPU - {85698446-8E3A-416C-8D6D-85B38A920B70}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {85698446-8E3A-416C-8D6D-85B38A920B70}.Debug|Any CPU.Build.0 = Debug|Any CPU - {85698446-8E3A-416C-8D6D-85B38A920B70}.Release|Any CPU.ActiveCfg = Release|Any CPU - {85698446-8E3A-416C-8D6D-85B38A920B70}.Release|Any CPU.Build.0 = Release|Any CPU - {A52E4D37-E374-44D2-BB19-08D01B905E51}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A52E4D37-E374-44D2-BB19-08D01B905E51}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A52E4D37-E374-44D2-BB19-08D01B905E51}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A52E4D37-E374-44D2-BB19-08D01B905E51}.Release|Any CPU.Build.0 = Release|Any CPU - {D3F2F98E-8882-4930-83B4-E130F98D00A1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D3F2F98E-8882-4930-83B4-E130F98D00A1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D3F2F98E-8882-4930-83B4-E130F98D00A1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D3F2F98E-8882-4930-83B4-E130F98D00A1}.Release|Any CPU.Build.0 = Release|Any CPU - {36C949B4-0DAE-4A90-8E7A-8969B8303B3B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {36C949B4-0DAE-4A90-8E7A-8969B8303B3B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {36C949B4-0DAE-4A90-8E7A-8969B8303B3B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {36C949B4-0DAE-4A90-8E7A-8969B8303B3B}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {93F45F69-E6AA-4AC1-A6AF-1987A1EC0245}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {93F45F69-E6AA-4AC1-A6AF-1987A1EC0245}.Debug|Any CPU.Build.0 = Debug|Any CPU - {93F45F69-E6AA-4AC1-A6AF-1987A1EC0245}.Release|Any CPU.ActiveCfg = Release|Any CPU - {93F45F69-E6AA-4AC1-A6AF-1987A1EC0245}.Release|Any CPU.Build.0 = Release|Any CPU - {B2D562AC-CF13-4AA8-B5B5-6A08EEE6D677}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B2D562AC-CF13-4AA8-B5B5-6A08EEE6D677}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B2D562AC-CF13-4AA8-B5B5-6A08EEE6D677}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B2D562AC-CF13-4AA8-B5B5-6A08EEE6D677}.Release|Any CPU.Build.0 = Release|Any CPU - {DD236432-D129-4D2C-A002-8583F765570B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DD236432-D129-4D2C-A002-8583F765570B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DD236432-D129-4D2C-A002-8583F765570B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DD236432-D129-4D2C-A002-8583F765570B}.Release|Any CPU.Build.0 = Release|Any CPU - {1EF09B0B-341A-41FD-BD9E-4527F3A0CD6B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1EF09B0B-341A-41FD-BD9E-4527F3A0CD6B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1EF09B0B-341A-41FD-BD9E-4527F3A0CD6B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1EF09B0B-341A-41FD-BD9E-4527F3A0CD6B}.Release|Any CPU.Build.0 = Release|Any CPU - {C8C25812-0DEA-42B2-B48A-1B5EB7E719E5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C8C25812-0DEA-42B2-B48A-1B5EB7E719E5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C8C25812-0DEA-42B2-B48A-1B5EB7E719E5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C8C25812-0DEA-42B2-B48A-1B5EB7E719E5}.Release|Any CPU.Build.0 = Release|Any CPU - {6FD9886C-27A1-4E31-8EF2-9DDBA3D77BBF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6FD9886C-27A1-4E31-8EF2-9DDBA3D77BBF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6FD9886C-27A1-4E31-8EF2-9DDBA3D77BBF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6FD9886C-27A1-4E31-8EF2-9DDBA3D77BBF}.Release|Any CPU.Build.0 = Release|Any CPU - {85698446-8E3A-416C-8D6D-85B38A920B70}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {85698446-8E3A-416C-8D6D-85B38A920B70}.Debug|Any CPU.Build.0 = Debug|Any CPU - {85698446-8E3A-416C-8D6D-85B38A920B70}.Release|Any CPU.ActiveCfg = Release|Any CPU - {85698446-8E3A-416C-8D6D-85B38A920B70}.Release|Any CPU.Build.0 = Release|Any CPU - {A52E4D37-E374-44D2-BB19-08D01B905E51}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A52E4D37-E374-44D2-BB19-08D01B905E51}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A52E4D37-E374-44D2-BB19-08D01B905E51}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A52E4D37-E374-44D2-BB19-08D01B905E51}.Release|Any CPU.Build.0 = Release|Any CPU - {D3F2F98E-8882-4930-83B4-E130F98D00A1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D3F2F98E-8882-4930-83B4-E130F98D00A1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D3F2F98E-8882-4930-83B4-E130F98D00A1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D3F2F98E-8882-4930-83B4-E130F98D00A1}.Release|Any CPU.Build.0 = Release|Any CPU - {36C949B4-0DAE-4A90-8E7A-8969B8303B3B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {36C949B4-0DAE-4A90-8E7A-8969B8303B3B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {36C949B4-0DAE-4A90-8E7A-8969B8303B3B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {36C949B4-0DAE-4A90-8E7A-8969B8303B3B}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {955C23C9-FB46-49C6-96A4-99967662BAA3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {7802248E-DF21-422A-B95B-B869EFFAB7A8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {2EE912D0-6089-4284-8437-D76CF1B5F25F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {9290CF49-6216-4AE9-80E4-93CC949F694A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {38DDC03A-29B7-44F3-94BA-6BF67768AB6F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {93F45F69-E6AA-4AC1-A6AF-1987A1EC0245} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B2D562AC-CF13-4AA8-B5B5-6A08EEE6D677} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {DD236432-D129-4D2C-A002-8583F765570B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {1EF09B0B-341A-41FD-BD9E-4527F3A0CD6B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C8C25812-0DEA-42B2-B48A-1B5EB7E719E5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6FD9886C-27A1-4E31-8EF2-9DDBA3D77BBF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {85698446-8E3A-416C-8D6D-85B38A920B70} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A52E4D37-E374-44D2-BB19-08D01B905E51} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D3F2F98E-8882-4930-83B4-E130F98D00A1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {36C949B4-0DAE-4A90-8E7A-8969B8303B3B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {93F45F69-E6AA-4AC1-A6AF-1987A1EC0245} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B2D562AC-CF13-4AA8-B5B5-6A08EEE6D677} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {DD236432-D129-4D2C-A002-8583F765570B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {1EF09B0B-341A-41FD-BD9E-4527F3A0CD6B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C8C25812-0DEA-42B2-B48A-1B5EB7E719E5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6FD9886C-27A1-4E31-8EF2-9DDBA3D77BBF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {85698446-8E3A-416C-8D6D-85B38A920B70} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A52E4D37-E374-44D2-BB19-08D01B905E51} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D3F2F98E-8882-4930-83B4-E130F98D00A1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {36C949B4-0DAE-4A90-8E7A-8969B8303B3B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {42C4E325-BCF3-474B-A5BD-CB692361DDC9} diff --git a/sdk/src/Services/IoTAnalytics/Properties/AssemblyInfo.cs b/sdk/src/Services/IoTAnalytics/Properties/AssemblyInfo.cs index 11a874f0eacf..ada274f255fd 100644 --- a/sdk/src/Services/IoTAnalytics/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/IoTAnalytics/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/IoTDeviceAdvisor/Generated/AmazonIoTDeviceAdvisorConfig.cs b/sdk/src/Services/IoTDeviceAdvisor/Generated/AmazonIoTDeviceAdvisorConfig.cs index 50601e04f297..5b7069837859 100644 --- a/sdk/src/Services/IoTDeviceAdvisor/Generated/AmazonIoTDeviceAdvisorConfig.cs +++ b/sdk/src/Services/IoTDeviceAdvisor/Generated/AmazonIoTDeviceAdvisorConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.IoTDeviceAdvisor public partial class AmazonIoTDeviceAdvisorConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("IotDeviceAdvisor", "4.0.0.0"); private static readonly AmazonIoTDeviceAdvisorEndpointResolver EndpointResolver = new AmazonIoTDeviceAdvisorEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("IotDeviceAdvisor", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("IotDeviceAdvisor", "3.7.401.25"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/IoTDeviceAdvisor/Generated/Model/Internal/MarshallTransformations/CreateSuiteDefinitionRequestMarshaller.cs b/sdk/src/Services/IoTDeviceAdvisor/Generated/Model/Internal/MarshallTransformations/CreateSuiteDefinitionRequestMarshaller.cs index f75db53dfa07..5b60a352f87d 100644 --- a/sdk/src/Services/IoTDeviceAdvisor/Generated/Model/Internal/MarshallTransformations/CreateSuiteDefinitionRequestMarshaller.cs +++ b/sdk/src/Services/IoTDeviceAdvisor/Generated/Model/Internal/MarshallTransformations/CreateSuiteDefinitionRequestMarshaller.cs @@ -63,37 +63,23 @@ public IRequest Marshall(CreateSuiteDefinitionRequest publicRequest) request.ResourcePath = "/suiteDefinitions"; using (MemoryStream memoryStream = new MemoryStream()) { -<<<<<<< HEAD using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) -||||||| Commit version number update changes - JsonWriter writer = new JsonWriter(stringWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetSuiteDefinitionConfiguration()) -======= - JsonWriter writer = new JsonWriter(stringWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetClientToken()) - { - context.Writer.WritePropertyName("clientToken"); - context.Writer.Write(publicRequest.ClientToken); - } - - else if(!(publicRequest.IsSetClientToken())) - { - context.Writer.WritePropertyName("clientToken"); - context.Writer.Write(Guid.NewGuid().ToString()); - } - if(publicRequest.IsSetSuiteDefinitionConfiguration()) ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b { JsonWriter writer = new JsonWriter(streamWriter); writer.Validate = false; writer.WriteObjectStart(); var context = new JsonMarshallerContext(request, writer); + if(publicRequest.IsSetClientToken()) + { + context.Writer.WritePropertyName("clientToken"); + context.Writer.Write(publicRequest.ClientToken); + } + + else if(!(publicRequest.IsSetClientToken())) + { + context.Writer.WritePropertyName("clientToken"); + context.Writer.Write(Guid.NewGuid().ToString()); + } if(publicRequest.IsSetSuiteDefinitionConfiguration()) { context.Writer.WritePropertyName("suiteDefinitionConfiguration"); diff --git a/sdk/src/Services/IoTDeviceAdvisor/IoTDeviceAdvisor.sln b/sdk/src/Services/IoTDeviceAdvisor/IoTDeviceAdvisor.sln index 2b54b429fb2d..6a09f32f9cf9 100644 --- a/sdk/src/Services/IoTDeviceAdvisor/IoTDeviceAdvisor.sln +++ b/sdk/src/Services/IoTDeviceAdvisor/IoTDeviceAdvisor.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {7F3A2C4C-7E60-4D22-AF51-E27FCD2831E6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {7F3A2C4C-7E60-4D22-AF51-E27FCD2831E6}.Debug|Any CPU.Build.0 = Debug|Any CPU {7F3A2C4C-7E60-4D22-AF51-E27FCD2831E6}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {F5553322-3D43-4502-A6A6-A59D8D0783E4}.Debug|Any CPU.Build.0 = Debug|Any CPU {F5553322-3D43-4502-A6A6-A59D8D0783E4}.Release|Any CPU.ActiveCfg = Release|Any CPU {F5553322-3D43-4502-A6A6-A59D8D0783E4}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {497EE67B-121E-4586-B6EA-A6C6EF9E6D58}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {497EE67B-121E-4586-B6EA-A6C6EF9E6D58}.Debug|Any CPU.Build.0 = Debug|Any CPU - {497EE67B-121E-4586-B6EA-A6C6EF9E6D58}.Release|Any CPU.ActiveCfg = Release|Any CPU - {497EE67B-121E-4586-B6EA-A6C6EF9E6D58}.Release|Any CPU.Build.0 = Release|Any CPU - {C4C9EAA4-4586-41EA-A560-EA08D839E152}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C4C9EAA4-4586-41EA-A560-EA08D839E152}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C4C9EAA4-4586-41EA-A560-EA08D839E152}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C4C9EAA4-4586-41EA-A560-EA08D839E152}.Release|Any CPU.Build.0 = Release|Any CPU - {64C294E2-A90D-4039-BF86-9B2846A8FA57}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {64C294E2-A90D-4039-BF86-9B2846A8FA57}.Debug|Any CPU.Build.0 = Debug|Any CPU - {64C294E2-A90D-4039-BF86-9B2846A8FA57}.Release|Any CPU.ActiveCfg = Release|Any CPU - {64C294E2-A90D-4039-BF86-9B2846A8FA57}.Release|Any CPU.Build.0 = Release|Any CPU - {76EF0B4D-F7A4-488B-9BB5-10D7F9AE6450}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {76EF0B4D-F7A4-488B-9BB5-10D7F9AE6450}.Debug|Any CPU.Build.0 = Debug|Any CPU - {76EF0B4D-F7A4-488B-9BB5-10D7F9AE6450}.Release|Any CPU.ActiveCfg = Release|Any CPU - {76EF0B4D-F7A4-488B-9BB5-10D7F9AE6450}.Release|Any CPU.Build.0 = Release|Any CPU - {58F3AE15-2E99-44FF-AE9D-2EB1AD3FD30E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {58F3AE15-2E99-44FF-AE9D-2EB1AD3FD30E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {58F3AE15-2E99-44FF-AE9D-2EB1AD3FD30E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {58F3AE15-2E99-44FF-AE9D-2EB1AD3FD30E}.Release|Any CPU.Build.0 = Release|Any CPU - {3064394C-AEBE-4CC0-8289-F58CAF3D1B82}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3064394C-AEBE-4CC0-8289-F58CAF3D1B82}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3064394C-AEBE-4CC0-8289-F58CAF3D1B82}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3064394C-AEBE-4CC0-8289-F58CAF3D1B82}.Release|Any CPU.Build.0 = Release|Any CPU - {AB4807D3-0EC5-45CA-AD2E-D259CB8D698E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AB4807D3-0EC5-45CA-AD2E-D259CB8D698E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AB4807D3-0EC5-45CA-AD2E-D259CB8D698E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AB4807D3-0EC5-45CA-AD2E-D259CB8D698E}.Release|Any CPU.Build.0 = Release|Any CPU - {8AB27685-812C-4D3A-9FC5-1D7C0184124E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8AB27685-812C-4D3A-9FC5-1D7C0184124E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8AB27685-812C-4D3A-9FC5-1D7C0184124E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8AB27685-812C-4D3A-9FC5-1D7C0184124E}.Release|Any CPU.Build.0 = Release|Any CPU - {8631A3B6-2F3C-489F-8005-C420E44A0703}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8631A3B6-2F3C-489F-8005-C420E44A0703}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8631A3B6-2F3C-489F-8005-C420E44A0703}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8631A3B6-2F3C-489F-8005-C420E44A0703}.Release|Any CPU.Build.0 = Release|Any CPU - {A7EB33D9-65F3-4877-8145-861A602C78DF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A7EB33D9-65F3-4877-8145-861A602C78DF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A7EB33D9-65F3-4877-8145-861A602C78DF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A7EB33D9-65F3-4877-8145-861A602C78DF}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {497EE67B-121E-4586-B6EA-A6C6EF9E6D58}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {497EE67B-121E-4586-B6EA-A6C6EF9E6D58}.Debug|Any CPU.Build.0 = Debug|Any CPU - {497EE67B-121E-4586-B6EA-A6C6EF9E6D58}.Release|Any CPU.ActiveCfg = Release|Any CPU - {497EE67B-121E-4586-B6EA-A6C6EF9E6D58}.Release|Any CPU.Build.0 = Release|Any CPU - {C4C9EAA4-4586-41EA-A560-EA08D839E152}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C4C9EAA4-4586-41EA-A560-EA08D839E152}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C4C9EAA4-4586-41EA-A560-EA08D839E152}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C4C9EAA4-4586-41EA-A560-EA08D839E152}.Release|Any CPU.Build.0 = Release|Any CPU - {64C294E2-A90D-4039-BF86-9B2846A8FA57}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {64C294E2-A90D-4039-BF86-9B2846A8FA57}.Debug|Any CPU.Build.0 = Debug|Any CPU - {64C294E2-A90D-4039-BF86-9B2846A8FA57}.Release|Any CPU.ActiveCfg = Release|Any CPU - {64C294E2-A90D-4039-BF86-9B2846A8FA57}.Release|Any CPU.Build.0 = Release|Any CPU - {76EF0B4D-F7A4-488B-9BB5-10D7F9AE6450}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {76EF0B4D-F7A4-488B-9BB5-10D7F9AE6450}.Debug|Any CPU.Build.0 = Debug|Any CPU - {76EF0B4D-F7A4-488B-9BB5-10D7F9AE6450}.Release|Any CPU.ActiveCfg = Release|Any CPU - {76EF0B4D-F7A4-488B-9BB5-10D7F9AE6450}.Release|Any CPU.Build.0 = Release|Any CPU - {58F3AE15-2E99-44FF-AE9D-2EB1AD3FD30E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {58F3AE15-2E99-44FF-AE9D-2EB1AD3FD30E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {58F3AE15-2E99-44FF-AE9D-2EB1AD3FD30E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {58F3AE15-2E99-44FF-AE9D-2EB1AD3FD30E}.Release|Any CPU.Build.0 = Release|Any CPU - {3064394C-AEBE-4CC0-8289-F58CAF3D1B82}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3064394C-AEBE-4CC0-8289-F58CAF3D1B82}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3064394C-AEBE-4CC0-8289-F58CAF3D1B82}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3064394C-AEBE-4CC0-8289-F58CAF3D1B82}.Release|Any CPU.Build.0 = Release|Any CPU - {AB4807D3-0EC5-45CA-AD2E-D259CB8D698E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AB4807D3-0EC5-45CA-AD2E-D259CB8D698E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AB4807D3-0EC5-45CA-AD2E-D259CB8D698E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AB4807D3-0EC5-45CA-AD2E-D259CB8D698E}.Release|Any CPU.Build.0 = Release|Any CPU - {8AB27685-812C-4D3A-9FC5-1D7C0184124E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8AB27685-812C-4D3A-9FC5-1D7C0184124E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8AB27685-812C-4D3A-9FC5-1D7C0184124E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8AB27685-812C-4D3A-9FC5-1D7C0184124E}.Release|Any CPU.Build.0 = Release|Any CPU - {8631A3B6-2F3C-489F-8005-C420E44A0703}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8631A3B6-2F3C-489F-8005-C420E44A0703}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8631A3B6-2F3C-489F-8005-C420E44A0703}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8631A3B6-2F3C-489F-8005-C420E44A0703}.Release|Any CPU.Build.0 = Release|Any CPU - {A7EB33D9-65F3-4877-8145-861A602C78DF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A7EB33D9-65F3-4877-8145-861A602C78DF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A7EB33D9-65F3-4877-8145-861A602C78DF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A7EB33D9-65F3-4877-8145-861A602C78DF}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7F3A2C4C-7E60-4D22-AF51-E27FCD2831E6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {C3F46D84-4FF5-4917-B81E-BACD65F80A7B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {BA1143DD-B7DB-40BC-B724-8E7801C49358} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {FA619A78-33B4-4822-B36B-EAE0E6C9CC6A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {F5553322-3D43-4502-A6A6-A59D8D0783E4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {497EE67B-121E-4586-B6EA-A6C6EF9E6D58} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C4C9EAA4-4586-41EA-A560-EA08D839E152} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {64C294E2-A90D-4039-BF86-9B2846A8FA57} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {76EF0B4D-F7A4-488B-9BB5-10D7F9AE6450} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {58F3AE15-2E99-44FF-AE9D-2EB1AD3FD30E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {3064394C-AEBE-4CC0-8289-F58CAF3D1B82} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {AB4807D3-0EC5-45CA-AD2E-D259CB8D698E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8AB27685-812C-4D3A-9FC5-1D7C0184124E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8631A3B6-2F3C-489F-8005-C420E44A0703} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A7EB33D9-65F3-4877-8145-861A602C78DF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {497EE67B-121E-4586-B6EA-A6C6EF9E6D58} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C4C9EAA4-4586-41EA-A560-EA08D839E152} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {64C294E2-A90D-4039-BF86-9B2846A8FA57} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {76EF0B4D-F7A4-488B-9BB5-10D7F9AE6450} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {58F3AE15-2E99-44FF-AE9D-2EB1AD3FD30E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {3064394C-AEBE-4CC0-8289-F58CAF3D1B82} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {AB4807D3-0EC5-45CA-AD2E-D259CB8D698E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8AB27685-812C-4D3A-9FC5-1D7C0184124E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8631A3B6-2F3C-489F-8005-C420E44A0703} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A7EB33D9-65F3-4877-8145-861A602C78DF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {69BB7913-9A2C-4DB3-9444-4A4BCEEB77E6} diff --git a/sdk/src/Services/IoTDeviceAdvisor/Properties/AssemblyInfo.cs b/sdk/src/Services/IoTDeviceAdvisor/Properties/AssemblyInfo.cs index 73bc19b99e35..b3dfc6621cbf 100644 --- a/sdk/src/Services/IoTDeviceAdvisor/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/IoTDeviceAdvisor/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.25")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/IoTEvents/Generated/AmazonIoTEventsConfig.cs b/sdk/src/Services/IoTEvents/Generated/AmazonIoTEventsConfig.cs index c7b1f4793df7..454ba6774c5c 100644 --- a/sdk/src/Services/IoTEvents/Generated/AmazonIoTEventsConfig.cs +++ b/sdk/src/Services/IoTEvents/Generated/AmazonIoTEventsConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.IoTEvents public partial class AmazonIoTEventsConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("IoT Events", "4.0.0.0"); private static readonly AmazonIoTEventsEndpointResolver EndpointResolver = new AmazonIoTEventsEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("IoT Events", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("IoT Events", "3.7.400.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/IoTEvents/IoTEvents.sln b/sdk/src/Services/IoTEvents/IoTEvents.sln index 938f7883933d..cca486cababb 100644 --- a/sdk/src/Services/IoTEvents/IoTEvents.sln +++ b/sdk/src/Services/IoTEvents/IoTEvents.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {2A6CBBAE-9652-45E1-9565-CB40ECFD56F0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {2A6CBBAE-9652-45E1-9565-CB40ECFD56F0}.Debug|Any CPU.Build.0 = Debug|Any CPU {2A6CBBAE-9652-45E1-9565-CB40ECFD56F0}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {086DC20B-CDE9-4AE1-B205-B8A8951DA051}.Debug|Any CPU.Build.0 = Debug|Any CPU {086DC20B-CDE9-4AE1-B205-B8A8951DA051}.Release|Any CPU.ActiveCfg = Release|Any CPU {086DC20B-CDE9-4AE1-B205-B8A8951DA051}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {16283E3A-8C8F-4921-9B37-4A2931E8D135}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {16283E3A-8C8F-4921-9B37-4A2931E8D135}.Debug|Any CPU.Build.0 = Debug|Any CPU - {16283E3A-8C8F-4921-9B37-4A2931E8D135}.Release|Any CPU.ActiveCfg = Release|Any CPU - {16283E3A-8C8F-4921-9B37-4A2931E8D135}.Release|Any CPU.Build.0 = Release|Any CPU - {8BF1417D-3648-4ABE-923D-A96ED04D42CF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8BF1417D-3648-4ABE-923D-A96ED04D42CF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8BF1417D-3648-4ABE-923D-A96ED04D42CF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8BF1417D-3648-4ABE-923D-A96ED04D42CF}.Release|Any CPU.Build.0 = Release|Any CPU - {5C9A2DAF-D6DB-4645-BED9-E171C4BBADC0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5C9A2DAF-D6DB-4645-BED9-E171C4BBADC0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5C9A2DAF-D6DB-4645-BED9-E171C4BBADC0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5C9A2DAF-D6DB-4645-BED9-E171C4BBADC0}.Release|Any CPU.Build.0 = Release|Any CPU - {2263BF11-2F6B-42FC-AB8D-75847241F532}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2263BF11-2F6B-42FC-AB8D-75847241F532}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2263BF11-2F6B-42FC-AB8D-75847241F532}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2263BF11-2F6B-42FC-AB8D-75847241F532}.Release|Any CPU.Build.0 = Release|Any CPU - {43AA6336-9121-4604-BFF1-623A9558BA13}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {43AA6336-9121-4604-BFF1-623A9558BA13}.Debug|Any CPU.Build.0 = Debug|Any CPU - {43AA6336-9121-4604-BFF1-623A9558BA13}.Release|Any CPU.ActiveCfg = Release|Any CPU - {43AA6336-9121-4604-BFF1-623A9558BA13}.Release|Any CPU.Build.0 = Release|Any CPU - {A8385125-F75F-40F8-BE80-029FBDF1466B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A8385125-F75F-40F8-BE80-029FBDF1466B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A8385125-F75F-40F8-BE80-029FBDF1466B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A8385125-F75F-40F8-BE80-029FBDF1466B}.Release|Any CPU.Build.0 = Release|Any CPU - {AE4CDF2F-7FE9-40E8-94D0-6F980BC57016}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AE4CDF2F-7FE9-40E8-94D0-6F980BC57016}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AE4CDF2F-7FE9-40E8-94D0-6F980BC57016}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AE4CDF2F-7FE9-40E8-94D0-6F980BC57016}.Release|Any CPU.Build.0 = Release|Any CPU - {599F5FBB-BEB3-4663-985F-C87DC71D6621}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {599F5FBB-BEB3-4663-985F-C87DC71D6621}.Debug|Any CPU.Build.0 = Debug|Any CPU - {599F5FBB-BEB3-4663-985F-C87DC71D6621}.Release|Any CPU.ActiveCfg = Release|Any CPU - {599F5FBB-BEB3-4663-985F-C87DC71D6621}.Release|Any CPU.Build.0 = Release|Any CPU - {234BCE25-62CB-44D9-97CE-A983828168F2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {234BCE25-62CB-44D9-97CE-A983828168F2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {234BCE25-62CB-44D9-97CE-A983828168F2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {234BCE25-62CB-44D9-97CE-A983828168F2}.Release|Any CPU.Build.0 = Release|Any CPU - {4D41D552-AA17-445B-A009-65E84C1CE23B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4D41D552-AA17-445B-A009-65E84C1CE23B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4D41D552-AA17-445B-A009-65E84C1CE23B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4D41D552-AA17-445B-A009-65E84C1CE23B}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {16283E3A-8C8F-4921-9B37-4A2931E8D135}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {16283E3A-8C8F-4921-9B37-4A2931E8D135}.Debug|Any CPU.Build.0 = Debug|Any CPU - {16283E3A-8C8F-4921-9B37-4A2931E8D135}.Release|Any CPU.ActiveCfg = Release|Any CPU - {16283E3A-8C8F-4921-9B37-4A2931E8D135}.Release|Any CPU.Build.0 = Release|Any CPU - {8BF1417D-3648-4ABE-923D-A96ED04D42CF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8BF1417D-3648-4ABE-923D-A96ED04D42CF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8BF1417D-3648-4ABE-923D-A96ED04D42CF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8BF1417D-3648-4ABE-923D-A96ED04D42CF}.Release|Any CPU.Build.0 = Release|Any CPU - {5C9A2DAF-D6DB-4645-BED9-E171C4BBADC0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5C9A2DAF-D6DB-4645-BED9-E171C4BBADC0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5C9A2DAF-D6DB-4645-BED9-E171C4BBADC0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5C9A2DAF-D6DB-4645-BED9-E171C4BBADC0}.Release|Any CPU.Build.0 = Release|Any CPU - {2263BF11-2F6B-42FC-AB8D-75847241F532}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2263BF11-2F6B-42FC-AB8D-75847241F532}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2263BF11-2F6B-42FC-AB8D-75847241F532}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2263BF11-2F6B-42FC-AB8D-75847241F532}.Release|Any CPU.Build.0 = Release|Any CPU - {43AA6336-9121-4604-BFF1-623A9558BA13}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {43AA6336-9121-4604-BFF1-623A9558BA13}.Debug|Any CPU.Build.0 = Debug|Any CPU - {43AA6336-9121-4604-BFF1-623A9558BA13}.Release|Any CPU.ActiveCfg = Release|Any CPU - {43AA6336-9121-4604-BFF1-623A9558BA13}.Release|Any CPU.Build.0 = Release|Any CPU - {A8385125-F75F-40F8-BE80-029FBDF1466B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A8385125-F75F-40F8-BE80-029FBDF1466B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A8385125-F75F-40F8-BE80-029FBDF1466B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A8385125-F75F-40F8-BE80-029FBDF1466B}.Release|Any CPU.Build.0 = Release|Any CPU - {AE4CDF2F-7FE9-40E8-94D0-6F980BC57016}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AE4CDF2F-7FE9-40E8-94D0-6F980BC57016}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AE4CDF2F-7FE9-40E8-94D0-6F980BC57016}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AE4CDF2F-7FE9-40E8-94D0-6F980BC57016}.Release|Any CPU.Build.0 = Release|Any CPU - {599F5FBB-BEB3-4663-985F-C87DC71D6621}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {599F5FBB-BEB3-4663-985F-C87DC71D6621}.Debug|Any CPU.Build.0 = Debug|Any CPU - {599F5FBB-BEB3-4663-985F-C87DC71D6621}.Release|Any CPU.ActiveCfg = Release|Any CPU - {599F5FBB-BEB3-4663-985F-C87DC71D6621}.Release|Any CPU.Build.0 = Release|Any CPU - {234BCE25-62CB-44D9-97CE-A983828168F2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {234BCE25-62CB-44D9-97CE-A983828168F2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {234BCE25-62CB-44D9-97CE-A983828168F2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {234BCE25-62CB-44D9-97CE-A983828168F2}.Release|Any CPU.Build.0 = Release|Any CPU - {4D41D552-AA17-445B-A009-65E84C1CE23B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4D41D552-AA17-445B-A009-65E84C1CE23B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4D41D552-AA17-445B-A009-65E84C1CE23B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4D41D552-AA17-445B-A009-65E84C1CE23B}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {2A6CBBAE-9652-45E1-9565-CB40ECFD56F0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {C5E0D97D-C964-4FC7-909E-2CA446C764DB} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {947D7914-E471-4ED3-B6F6-537582083F65} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {D61677F4-4705-43C8-9ACB-7CEBDF6B1861} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {086DC20B-CDE9-4AE1-B205-B8A8951DA051} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {16283E3A-8C8F-4921-9B37-4A2931E8D135} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8BF1417D-3648-4ABE-923D-A96ED04D42CF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {5C9A2DAF-D6DB-4645-BED9-E171C4BBADC0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {2263BF11-2F6B-42FC-AB8D-75847241F532} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {43AA6336-9121-4604-BFF1-623A9558BA13} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A8385125-F75F-40F8-BE80-029FBDF1466B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {AE4CDF2F-7FE9-40E8-94D0-6F980BC57016} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {599F5FBB-BEB3-4663-985F-C87DC71D6621} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {234BCE25-62CB-44D9-97CE-A983828168F2} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4D41D552-AA17-445B-A009-65E84C1CE23B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {16283E3A-8C8F-4921-9B37-4A2931E8D135} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8BF1417D-3648-4ABE-923D-A96ED04D42CF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {5C9A2DAF-D6DB-4645-BED9-E171C4BBADC0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {2263BF11-2F6B-42FC-AB8D-75847241F532} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {43AA6336-9121-4604-BFF1-623A9558BA13} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A8385125-F75F-40F8-BE80-029FBDF1466B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {AE4CDF2F-7FE9-40E8-94D0-6F980BC57016} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {599F5FBB-BEB3-4663-985F-C87DC71D6621} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {234BCE25-62CB-44D9-97CE-A983828168F2} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4D41D552-AA17-445B-A009-65E84C1CE23B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {AD5BB5F2-F2E6-411B-9CB1-47BC88EEAF55} diff --git a/sdk/src/Services/IoTEvents/Properties/AssemblyInfo.cs b/sdk/src/Services/IoTEvents/Properties/AssemblyInfo.cs index 3efcaa3f58de..aac585a93996 100644 --- a/sdk/src/Services/IoTEvents/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/IoTEvents/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/IoTEventsData/Generated/AmazonIoTEventsDataConfig.cs b/sdk/src/Services/IoTEventsData/Generated/AmazonIoTEventsDataConfig.cs index 758f885b9ab9..9ed5e4859a39 100644 --- a/sdk/src/Services/IoTEventsData/Generated/AmazonIoTEventsDataConfig.cs +++ b/sdk/src/Services/IoTEventsData/Generated/AmazonIoTEventsDataConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.IoTEventsData public partial class AmazonIoTEventsDataConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("IoT Events Data", "4.0.0.0"); private static readonly AmazonIoTEventsDataEndpointResolver EndpointResolver = new AmazonIoTEventsDataEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("IoT Events Data", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("IoT Events Data", "3.7.400.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/IoTEventsData/IoTEventsData.sln b/sdk/src/Services/IoTEventsData/IoTEventsData.sln index 04a9c2dd3372..3199c4018c4a 100644 --- a/sdk/src/Services/IoTEventsData/IoTEventsData.sln +++ b/sdk/src/Services/IoTEventsData/IoTEventsData.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {C55D0D61-FCC9-4B70-9B78-42B0803CA4F8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {C55D0D61-FCC9-4B70-9B78-42B0803CA4F8}.Debug|Any CPU.Build.0 = Debug|Any CPU {C55D0D61-FCC9-4B70-9B78-42B0803CA4F8}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {ACD1A6B2-4D9B-437E-A8A5-CDE25EE2A1D7}.Debug|Any CPU.Build.0 = Debug|Any CPU {ACD1A6B2-4D9B-437E-A8A5-CDE25EE2A1D7}.Release|Any CPU.ActiveCfg = Release|Any CPU {ACD1A6B2-4D9B-437E-A8A5-CDE25EE2A1D7}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {67300CBE-B716-403F-9C17-6EF37AB63BE8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {67300CBE-B716-403F-9C17-6EF37AB63BE8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {67300CBE-B716-403F-9C17-6EF37AB63BE8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {67300CBE-B716-403F-9C17-6EF37AB63BE8}.Release|Any CPU.Build.0 = Release|Any CPU - {C54EFAE3-7801-410E-A0BC-859C86B8904B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C54EFAE3-7801-410E-A0BC-859C86B8904B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C54EFAE3-7801-410E-A0BC-859C86B8904B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C54EFAE3-7801-410E-A0BC-859C86B8904B}.Release|Any CPU.Build.0 = Release|Any CPU - {D22CB84A-0A6D-4FE2-99EB-6BEC6DF9C926}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D22CB84A-0A6D-4FE2-99EB-6BEC6DF9C926}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D22CB84A-0A6D-4FE2-99EB-6BEC6DF9C926}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D22CB84A-0A6D-4FE2-99EB-6BEC6DF9C926}.Release|Any CPU.Build.0 = Release|Any CPU - {04224C99-F07F-4791-9BDE-7CF1DBD5067B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {04224C99-F07F-4791-9BDE-7CF1DBD5067B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {04224C99-F07F-4791-9BDE-7CF1DBD5067B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {04224C99-F07F-4791-9BDE-7CF1DBD5067B}.Release|Any CPU.Build.0 = Release|Any CPU - {832EEBD3-8E28-4E72-8819-78F9D2A9DB5F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {832EEBD3-8E28-4E72-8819-78F9D2A9DB5F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {832EEBD3-8E28-4E72-8819-78F9D2A9DB5F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {832EEBD3-8E28-4E72-8819-78F9D2A9DB5F}.Release|Any CPU.Build.0 = Release|Any CPU - {EBF398C2-600F-4BDD-BDA2-131D5DBC5135}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EBF398C2-600F-4BDD-BDA2-131D5DBC5135}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EBF398C2-600F-4BDD-BDA2-131D5DBC5135}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EBF398C2-600F-4BDD-BDA2-131D5DBC5135}.Release|Any CPU.Build.0 = Release|Any CPU - {1DAC8C86-674A-49E7-9621-6BC304E06F27}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1DAC8C86-674A-49E7-9621-6BC304E06F27}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1DAC8C86-674A-49E7-9621-6BC304E06F27}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1DAC8C86-674A-49E7-9621-6BC304E06F27}.Release|Any CPU.Build.0 = Release|Any CPU - {18D48E66-AA3F-4985-8C1C-861CEFF65294}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {18D48E66-AA3F-4985-8C1C-861CEFF65294}.Debug|Any CPU.Build.0 = Debug|Any CPU - {18D48E66-AA3F-4985-8C1C-861CEFF65294}.Release|Any CPU.ActiveCfg = Release|Any CPU - {18D48E66-AA3F-4985-8C1C-861CEFF65294}.Release|Any CPU.Build.0 = Release|Any CPU - {4E1994DD-63BE-4079-956E-8F22FCA8F0C3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4E1994DD-63BE-4079-956E-8F22FCA8F0C3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4E1994DD-63BE-4079-956E-8F22FCA8F0C3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4E1994DD-63BE-4079-956E-8F22FCA8F0C3}.Release|Any CPU.Build.0 = Release|Any CPU - {5652D9BC-DF5B-48B5-90EF-9CD8A7783817}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5652D9BC-DF5B-48B5-90EF-9CD8A7783817}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5652D9BC-DF5B-48B5-90EF-9CD8A7783817}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5652D9BC-DF5B-48B5-90EF-9CD8A7783817}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {67300CBE-B716-403F-9C17-6EF37AB63BE8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {67300CBE-B716-403F-9C17-6EF37AB63BE8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {67300CBE-B716-403F-9C17-6EF37AB63BE8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {67300CBE-B716-403F-9C17-6EF37AB63BE8}.Release|Any CPU.Build.0 = Release|Any CPU - {C54EFAE3-7801-410E-A0BC-859C86B8904B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C54EFAE3-7801-410E-A0BC-859C86B8904B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C54EFAE3-7801-410E-A0BC-859C86B8904B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C54EFAE3-7801-410E-A0BC-859C86B8904B}.Release|Any CPU.Build.0 = Release|Any CPU - {D22CB84A-0A6D-4FE2-99EB-6BEC6DF9C926}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D22CB84A-0A6D-4FE2-99EB-6BEC6DF9C926}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D22CB84A-0A6D-4FE2-99EB-6BEC6DF9C926}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D22CB84A-0A6D-4FE2-99EB-6BEC6DF9C926}.Release|Any CPU.Build.0 = Release|Any CPU - {04224C99-F07F-4791-9BDE-7CF1DBD5067B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {04224C99-F07F-4791-9BDE-7CF1DBD5067B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {04224C99-F07F-4791-9BDE-7CF1DBD5067B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {04224C99-F07F-4791-9BDE-7CF1DBD5067B}.Release|Any CPU.Build.0 = Release|Any CPU - {832EEBD3-8E28-4E72-8819-78F9D2A9DB5F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {832EEBD3-8E28-4E72-8819-78F9D2A9DB5F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {832EEBD3-8E28-4E72-8819-78F9D2A9DB5F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {832EEBD3-8E28-4E72-8819-78F9D2A9DB5F}.Release|Any CPU.Build.0 = Release|Any CPU - {EBF398C2-600F-4BDD-BDA2-131D5DBC5135}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EBF398C2-600F-4BDD-BDA2-131D5DBC5135}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EBF398C2-600F-4BDD-BDA2-131D5DBC5135}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EBF398C2-600F-4BDD-BDA2-131D5DBC5135}.Release|Any CPU.Build.0 = Release|Any CPU - {1DAC8C86-674A-49E7-9621-6BC304E06F27}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1DAC8C86-674A-49E7-9621-6BC304E06F27}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1DAC8C86-674A-49E7-9621-6BC304E06F27}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1DAC8C86-674A-49E7-9621-6BC304E06F27}.Release|Any CPU.Build.0 = Release|Any CPU - {18D48E66-AA3F-4985-8C1C-861CEFF65294}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {18D48E66-AA3F-4985-8C1C-861CEFF65294}.Debug|Any CPU.Build.0 = Debug|Any CPU - {18D48E66-AA3F-4985-8C1C-861CEFF65294}.Release|Any CPU.ActiveCfg = Release|Any CPU - {18D48E66-AA3F-4985-8C1C-861CEFF65294}.Release|Any CPU.Build.0 = Release|Any CPU - {4E1994DD-63BE-4079-956E-8F22FCA8F0C3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4E1994DD-63BE-4079-956E-8F22FCA8F0C3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4E1994DD-63BE-4079-956E-8F22FCA8F0C3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4E1994DD-63BE-4079-956E-8F22FCA8F0C3}.Release|Any CPU.Build.0 = Release|Any CPU - {5652D9BC-DF5B-48B5-90EF-9CD8A7783817}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5652D9BC-DF5B-48B5-90EF-9CD8A7783817}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5652D9BC-DF5B-48B5-90EF-9CD8A7783817}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5652D9BC-DF5B-48B5-90EF-9CD8A7783817}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {C55D0D61-FCC9-4B70-9B78-42B0803CA4F8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {B185CE18-590F-4450-90B3-5C607291A7D5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {854386E8-88FB-4C50-A4AA-E94FD467E494} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {4B3F4117-75B2-4B87-AC05-EFF5A9193129} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {ACD1A6B2-4D9B-437E-A8A5-CDE25EE2A1D7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {67300CBE-B716-403F-9C17-6EF37AB63BE8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C54EFAE3-7801-410E-A0BC-859C86B8904B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D22CB84A-0A6D-4FE2-99EB-6BEC6DF9C926} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {04224C99-F07F-4791-9BDE-7CF1DBD5067B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {832EEBD3-8E28-4E72-8819-78F9D2A9DB5F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {EBF398C2-600F-4BDD-BDA2-131D5DBC5135} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {1DAC8C86-674A-49E7-9621-6BC304E06F27} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {18D48E66-AA3F-4985-8C1C-861CEFF65294} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4E1994DD-63BE-4079-956E-8F22FCA8F0C3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {5652D9BC-DF5B-48B5-90EF-9CD8A7783817} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {67300CBE-B716-403F-9C17-6EF37AB63BE8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C54EFAE3-7801-410E-A0BC-859C86B8904B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D22CB84A-0A6D-4FE2-99EB-6BEC6DF9C926} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {04224C99-F07F-4791-9BDE-7CF1DBD5067B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {832EEBD3-8E28-4E72-8819-78F9D2A9DB5F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {EBF398C2-600F-4BDD-BDA2-131D5DBC5135} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {1DAC8C86-674A-49E7-9621-6BC304E06F27} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {18D48E66-AA3F-4985-8C1C-861CEFF65294} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4E1994DD-63BE-4079-956E-8F22FCA8F0C3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {5652D9BC-DF5B-48B5-90EF-9CD8A7783817} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {2D80323A-EFA7-4429-8D23-CC4B9E3F0941} diff --git a/sdk/src/Services/IoTEventsData/Properties/AssemblyInfo.cs b/sdk/src/Services/IoTEventsData/Properties/AssemblyInfo.cs index 39a03d653cca..9889399f54b0 100644 --- a/sdk/src/Services/IoTEventsData/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/IoTEventsData/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/IoTFleetHub/Generated/AmazonIoTFleetHubConfig.cs b/sdk/src/Services/IoTFleetHub/Generated/AmazonIoTFleetHubConfig.cs index 9984838f13df..4e3bad0471e9 100644 --- a/sdk/src/Services/IoTFleetHub/Generated/AmazonIoTFleetHubConfig.cs +++ b/sdk/src/Services/IoTFleetHub/Generated/AmazonIoTFleetHubConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.IoTFleetHub public partial class AmazonIoTFleetHubConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("IoTFleetHub", "4.0.0.0"); private static readonly AmazonIoTFleetHubEndpointResolver EndpointResolver = new AmazonIoTFleetHubEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("IoTFleetHub", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("IoTFleetHub", "3.7.400.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/IoTFleetHub/IoTFleetHub.sln b/sdk/src/Services/IoTFleetHub/IoTFleetHub.sln index 0b2a9ce78fee..3f83a1b8d66f 100644 --- a/sdk/src/Services/IoTFleetHub/IoTFleetHub.sln +++ b/sdk/src/Services/IoTFleetHub/IoTFleetHub.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {4992BF3F-AB43-45C9-BDBE-C8206B4C8C22}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {4992BF3F-AB43-45C9-BDBE-C8206B4C8C22}.Debug|Any CPU.Build.0 = Debug|Any CPU {4992BF3F-AB43-45C9-BDBE-C8206B4C8C22}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {BFED92DF-45A6-4524-B63A-C8E3776B4EF4}.Debug|Any CPU.Build.0 = Debug|Any CPU {BFED92DF-45A6-4524-B63A-C8E3776B4EF4}.Release|Any CPU.ActiveCfg = Release|Any CPU {BFED92DF-45A6-4524-B63A-C8E3776B4EF4}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {42109F32-39FE-4602-A81C-10216460A92F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {42109F32-39FE-4602-A81C-10216460A92F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {42109F32-39FE-4602-A81C-10216460A92F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {42109F32-39FE-4602-A81C-10216460A92F}.Release|Any CPU.Build.0 = Release|Any CPU - {14A8D2A9-24E3-45A6-8240-D92E007047C1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {14A8D2A9-24E3-45A6-8240-D92E007047C1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {14A8D2A9-24E3-45A6-8240-D92E007047C1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {14A8D2A9-24E3-45A6-8240-D92E007047C1}.Release|Any CPU.Build.0 = Release|Any CPU - {03C5082D-DE1B-4C9D-9168-50ADE0DF3636}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {03C5082D-DE1B-4C9D-9168-50ADE0DF3636}.Debug|Any CPU.Build.0 = Debug|Any CPU - {03C5082D-DE1B-4C9D-9168-50ADE0DF3636}.Release|Any CPU.ActiveCfg = Release|Any CPU - {03C5082D-DE1B-4C9D-9168-50ADE0DF3636}.Release|Any CPU.Build.0 = Release|Any CPU - {CDD956D2-157D-4D15-B64E-38C0F27E609F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CDD956D2-157D-4D15-B64E-38C0F27E609F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CDD956D2-157D-4D15-B64E-38C0F27E609F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CDD956D2-157D-4D15-B64E-38C0F27E609F}.Release|Any CPU.Build.0 = Release|Any CPU - {ED75027D-A498-4F7F-A11D-29B5EB0E361F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {ED75027D-A498-4F7F-A11D-29B5EB0E361F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {ED75027D-A498-4F7F-A11D-29B5EB0E361F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {ED75027D-A498-4F7F-A11D-29B5EB0E361F}.Release|Any CPU.Build.0 = Release|Any CPU - {B79FEBFE-019B-4A26-A5A6-97E6B1D22E04}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B79FEBFE-019B-4A26-A5A6-97E6B1D22E04}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B79FEBFE-019B-4A26-A5A6-97E6B1D22E04}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B79FEBFE-019B-4A26-A5A6-97E6B1D22E04}.Release|Any CPU.Build.0 = Release|Any CPU - {47DE4818-E8C5-4CBA-89D8-897D38434A1F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {47DE4818-E8C5-4CBA-89D8-897D38434A1F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {47DE4818-E8C5-4CBA-89D8-897D38434A1F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {47DE4818-E8C5-4CBA-89D8-897D38434A1F}.Release|Any CPU.Build.0 = Release|Any CPU - {F992750C-6443-48FF-8962-AE6752A242AD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F992750C-6443-48FF-8962-AE6752A242AD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F992750C-6443-48FF-8962-AE6752A242AD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F992750C-6443-48FF-8962-AE6752A242AD}.Release|Any CPU.Build.0 = Release|Any CPU - {81CD336D-6B7B-4E13-AD02-3300F2125AFE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {81CD336D-6B7B-4E13-AD02-3300F2125AFE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {81CD336D-6B7B-4E13-AD02-3300F2125AFE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {81CD336D-6B7B-4E13-AD02-3300F2125AFE}.Release|Any CPU.Build.0 = Release|Any CPU - {AF31490D-2524-4C29-82BD-0532C798EDB6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AF31490D-2524-4C29-82BD-0532C798EDB6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AF31490D-2524-4C29-82BD-0532C798EDB6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AF31490D-2524-4C29-82BD-0532C798EDB6}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {42109F32-39FE-4602-A81C-10216460A92F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {42109F32-39FE-4602-A81C-10216460A92F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {42109F32-39FE-4602-A81C-10216460A92F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {42109F32-39FE-4602-A81C-10216460A92F}.Release|Any CPU.Build.0 = Release|Any CPU - {14A8D2A9-24E3-45A6-8240-D92E007047C1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {14A8D2A9-24E3-45A6-8240-D92E007047C1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {14A8D2A9-24E3-45A6-8240-D92E007047C1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {14A8D2A9-24E3-45A6-8240-D92E007047C1}.Release|Any CPU.Build.0 = Release|Any CPU - {03C5082D-DE1B-4C9D-9168-50ADE0DF3636}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {03C5082D-DE1B-4C9D-9168-50ADE0DF3636}.Debug|Any CPU.Build.0 = Debug|Any CPU - {03C5082D-DE1B-4C9D-9168-50ADE0DF3636}.Release|Any CPU.ActiveCfg = Release|Any CPU - {03C5082D-DE1B-4C9D-9168-50ADE0DF3636}.Release|Any CPU.Build.0 = Release|Any CPU - {CDD956D2-157D-4D15-B64E-38C0F27E609F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CDD956D2-157D-4D15-B64E-38C0F27E609F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CDD956D2-157D-4D15-B64E-38C0F27E609F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CDD956D2-157D-4D15-B64E-38C0F27E609F}.Release|Any CPU.Build.0 = Release|Any CPU - {ED75027D-A498-4F7F-A11D-29B5EB0E361F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {ED75027D-A498-4F7F-A11D-29B5EB0E361F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {ED75027D-A498-4F7F-A11D-29B5EB0E361F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {ED75027D-A498-4F7F-A11D-29B5EB0E361F}.Release|Any CPU.Build.0 = Release|Any CPU - {B79FEBFE-019B-4A26-A5A6-97E6B1D22E04}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B79FEBFE-019B-4A26-A5A6-97E6B1D22E04}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B79FEBFE-019B-4A26-A5A6-97E6B1D22E04}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B79FEBFE-019B-4A26-A5A6-97E6B1D22E04}.Release|Any CPU.Build.0 = Release|Any CPU - {47DE4818-E8C5-4CBA-89D8-897D38434A1F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {47DE4818-E8C5-4CBA-89D8-897D38434A1F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {47DE4818-E8C5-4CBA-89D8-897D38434A1F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {47DE4818-E8C5-4CBA-89D8-897D38434A1F}.Release|Any CPU.Build.0 = Release|Any CPU - {F992750C-6443-48FF-8962-AE6752A242AD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F992750C-6443-48FF-8962-AE6752A242AD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F992750C-6443-48FF-8962-AE6752A242AD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F992750C-6443-48FF-8962-AE6752A242AD}.Release|Any CPU.Build.0 = Release|Any CPU - {81CD336D-6B7B-4E13-AD02-3300F2125AFE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {81CD336D-6B7B-4E13-AD02-3300F2125AFE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {81CD336D-6B7B-4E13-AD02-3300F2125AFE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {81CD336D-6B7B-4E13-AD02-3300F2125AFE}.Release|Any CPU.Build.0 = Release|Any CPU - {AF31490D-2524-4C29-82BD-0532C798EDB6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AF31490D-2524-4C29-82BD-0532C798EDB6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AF31490D-2524-4C29-82BD-0532C798EDB6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AF31490D-2524-4C29-82BD-0532C798EDB6}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {4992BF3F-AB43-45C9-BDBE-C8206B4C8C22} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {1E44BBB6-E457-44FF-A761-DFDA7C8E8CEA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {83F7D106-E0F3-4246-9EA6-A6494C781EFC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {66DD91CF-1157-405A-977B-D3EA682639F4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {BFED92DF-45A6-4524-B63A-C8E3776B4EF4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {42109F32-39FE-4602-A81C-10216460A92F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {14A8D2A9-24E3-45A6-8240-D92E007047C1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {03C5082D-DE1B-4C9D-9168-50ADE0DF3636} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {CDD956D2-157D-4D15-B64E-38C0F27E609F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {ED75027D-A498-4F7F-A11D-29B5EB0E361F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B79FEBFE-019B-4A26-A5A6-97E6B1D22E04} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {47DE4818-E8C5-4CBA-89D8-897D38434A1F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F992750C-6443-48FF-8962-AE6752A242AD} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {81CD336D-6B7B-4E13-AD02-3300F2125AFE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {AF31490D-2524-4C29-82BD-0532C798EDB6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {42109F32-39FE-4602-A81C-10216460A92F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {14A8D2A9-24E3-45A6-8240-D92E007047C1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {03C5082D-DE1B-4C9D-9168-50ADE0DF3636} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {CDD956D2-157D-4D15-B64E-38C0F27E609F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {ED75027D-A498-4F7F-A11D-29B5EB0E361F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B79FEBFE-019B-4A26-A5A6-97E6B1D22E04} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {47DE4818-E8C5-4CBA-89D8-897D38434A1F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F992750C-6443-48FF-8962-AE6752A242AD} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {81CD336D-6B7B-4E13-AD02-3300F2125AFE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {AF31490D-2524-4C29-82BD-0532C798EDB6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {C4F28FF4-D799-474D-BD91-122E3ABC8345} diff --git a/sdk/src/Services/IoTFleetHub/Properties/AssemblyInfo.cs b/sdk/src/Services/IoTFleetHub/Properties/AssemblyInfo.cs index 38110c7adc2d..c22318d5a2b1 100644 --- a/sdk/src/Services/IoTFleetHub/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/IoTFleetHub/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/IoTFleetWise/Generated/AmazonIoTFleetWiseConfig.cs b/sdk/src/Services/IoTFleetWise/Generated/AmazonIoTFleetWiseConfig.cs index aa0e8aa18e01..6aa60c07b0e8 100644 --- a/sdk/src/Services/IoTFleetWise/Generated/AmazonIoTFleetWiseConfig.cs +++ b/sdk/src/Services/IoTFleetWise/Generated/AmazonIoTFleetWiseConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.IoTFleetWise public partial class AmazonIoTFleetWiseConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("IoTFleetWise", "4.0.0.0"); private static readonly AmazonIoTFleetWiseEndpointResolver EndpointResolver = new AmazonIoTFleetWiseEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("IoTFleetWise", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("IoTFleetWise", "3.7.402.11"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/IoTFleetWise/Generated/Model/ConditionBasedCollectionScheme.cs b/sdk/src/Services/IoTFleetWise/Generated/Model/ConditionBasedCollectionScheme.cs index d42413af1fb2..6bc616680c2a 100644 --- a/sdk/src/Services/IoTFleetWise/Generated/Model/ConditionBasedCollectionScheme.cs +++ b/sdk/src/Services/IoTFleetWise/Generated/Model/ConditionBasedCollectionScheme.cs @@ -46,16 +46,8 @@ public partial class ConditionBasedCollectionScheme /// Specifies the version of the conditional expression language. /// /// -<<<<<<< HEAD - [AWSProperty(Min=1)] - public int? ConditionLanguageVersion -||||||| Commit version number update changes - [AWSProperty(Min=1)] - public int ConditionLanguageVersion -======= [AWSProperty(Min=1, Max=1)] - public int ConditionLanguageVersion ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b + public int? ConditionLanguageVersion { get { return this._conditionLanguageVersion; } set { this._conditionLanguageVersion = value; } diff --git a/sdk/src/Services/IoTFleetWise/Generated/Model/TimeBasedCollectionScheme.cs b/sdk/src/Services/IoTFleetWise/Generated/Model/TimeBasedCollectionScheme.cs index 8dfc281cc1d6..c4e21fc56c11 100644 --- a/sdk/src/Services/IoTFleetWise/Generated/Model/TimeBasedCollectionScheme.cs +++ b/sdk/src/Services/IoTFleetWise/Generated/Model/TimeBasedCollectionScheme.cs @@ -45,16 +45,8 @@ public partial class TimeBasedCollectionScheme /// minute. /// /// -<<<<<<< HEAD - [AWSProperty(Required=true, Min=10000, Max=60000)] - public long? PeriodMs -||||||| Commit version number update changes - [AWSProperty(Required=true, Min=10000, Max=60000)] - public long PeriodMs -======= [AWSProperty(Required=true, Min=10000, Max=86400000)] - public long PeriodMs ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b + public long? PeriodMs { get { return this._periodMs; } set { this._periodMs = value; } diff --git a/sdk/src/Services/IoTFleetWise/Generated/_bcl/AmazonIoTFleetWiseClient.cs b/sdk/src/Services/IoTFleetWise/Generated/_bcl/AmazonIoTFleetWiseClient.cs index c720e66193f9..fe6198bc4fab 100644 --- a/sdk/src/Services/IoTFleetWise/Generated/_bcl/AmazonIoTFleetWiseClient.cs +++ b/sdk/src/Services/IoTFleetWise/Generated/_bcl/AmazonIoTFleetWiseClient.cs @@ -475,6 +475,9 @@ public virtual BatchCreateVehicleResponse BatchCreateVehicle(BatchCreateVehicleR /// /// The request couldn't be completed because the server temporarily failed. /// + /// + /// A service quota was exceeded. + /// /// /// The request couldn't be completed due to throttling. /// @@ -519,6 +522,9 @@ public virtual BatchUpdateVehicleResponse BatchUpdateVehicle(BatchUpdateVehicleR /// /// The request couldn't be completed because the server temporarily failed. /// + /// + /// A service quota was exceeded. + /// /// /// The request couldn't be completed due to throttling. /// @@ -4716,6 +4722,9 @@ public virtual UpdateSignalCatalogResponse UpdateSignalCatalog(UpdateSignalCatal /// /// The request couldn't be completed because the server temporarily failed. /// + /// + /// A service quota was exceeded. + /// /// /// The resource wasn't found. /// @@ -4755,6 +4764,9 @@ public virtual UpdateVehicleResponse UpdateVehicle(UpdateVehicleRequest request) /// /// The request couldn't be completed because the server temporarily failed. /// + /// + /// A service quota was exceeded. + /// /// /// The resource wasn't found. /// diff --git a/sdk/src/Services/IoTFleetWise/IoTFleetWise.sln b/sdk/src/Services/IoTFleetWise/IoTFleetWise.sln index 9b60b33009b7..3251be3a8d57 100644 --- a/sdk/src/Services/IoTFleetWise/IoTFleetWise.sln +++ b/sdk/src/Services/IoTFleetWise/IoTFleetWise.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {B1712307-5CB0-4F7B-A078-416A8D6C4286}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {B1712307-5CB0-4F7B-A078-416A8D6C4286}.Debug|Any CPU.Build.0 = Debug|Any CPU {B1712307-5CB0-4F7B-A078-416A8D6C4286}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {C85BC27C-6BF1-4319-8923-88889EA069BB}.Debug|Any CPU.Build.0 = Debug|Any CPU {C85BC27C-6BF1-4319-8923-88889EA069BB}.Release|Any CPU.ActiveCfg = Release|Any CPU {C85BC27C-6BF1-4319-8923-88889EA069BB}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {FD7CE9F5-FDF9-42FB-8B3C-03EBA875804D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FD7CE9F5-FDF9-42FB-8B3C-03EBA875804D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FD7CE9F5-FDF9-42FB-8B3C-03EBA875804D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FD7CE9F5-FDF9-42FB-8B3C-03EBA875804D}.Release|Any CPU.Build.0 = Release|Any CPU - {9390580A-E888-4090-AFC3-0DF9CAF36135}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9390580A-E888-4090-AFC3-0DF9CAF36135}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9390580A-E888-4090-AFC3-0DF9CAF36135}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9390580A-E888-4090-AFC3-0DF9CAF36135}.Release|Any CPU.Build.0 = Release|Any CPU - {E1C239E0-2022-4309-8AE3-25A62DE199B0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E1C239E0-2022-4309-8AE3-25A62DE199B0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E1C239E0-2022-4309-8AE3-25A62DE199B0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E1C239E0-2022-4309-8AE3-25A62DE199B0}.Release|Any CPU.Build.0 = Release|Any CPU - {7C4AF8F6-FC3E-4E06-987C-B145690FC524}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7C4AF8F6-FC3E-4E06-987C-B145690FC524}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7C4AF8F6-FC3E-4E06-987C-B145690FC524}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7C4AF8F6-FC3E-4E06-987C-B145690FC524}.Release|Any CPU.Build.0 = Release|Any CPU - {ADB99281-1AA6-40C4-A82B-3640D4C004F4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {ADB99281-1AA6-40C4-A82B-3640D4C004F4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {ADB99281-1AA6-40C4-A82B-3640D4C004F4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {ADB99281-1AA6-40C4-A82B-3640D4C004F4}.Release|Any CPU.Build.0 = Release|Any CPU - {4A04AB3B-182E-4F6C-816C-3CCB7118F20A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4A04AB3B-182E-4F6C-816C-3CCB7118F20A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4A04AB3B-182E-4F6C-816C-3CCB7118F20A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4A04AB3B-182E-4F6C-816C-3CCB7118F20A}.Release|Any CPU.Build.0 = Release|Any CPU - {1A5DA058-E72A-4385-8569-E4F050997594}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1A5DA058-E72A-4385-8569-E4F050997594}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1A5DA058-E72A-4385-8569-E4F050997594}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1A5DA058-E72A-4385-8569-E4F050997594}.Release|Any CPU.Build.0 = Release|Any CPU - {836ACA3C-70D4-4FA0-AFDD-2A0EADB6C0C3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {836ACA3C-70D4-4FA0-AFDD-2A0EADB6C0C3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {836ACA3C-70D4-4FA0-AFDD-2A0EADB6C0C3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {836ACA3C-70D4-4FA0-AFDD-2A0EADB6C0C3}.Release|Any CPU.Build.0 = Release|Any CPU - {72279259-2722-4528-8F09-D38DE81A18C3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {72279259-2722-4528-8F09-D38DE81A18C3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {72279259-2722-4528-8F09-D38DE81A18C3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {72279259-2722-4528-8F09-D38DE81A18C3}.Release|Any CPU.Build.0 = Release|Any CPU - {1300D020-F76E-436C-9E08-728D6EA1BAC1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1300D020-F76E-436C-9E08-728D6EA1BAC1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1300D020-F76E-436C-9E08-728D6EA1BAC1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1300D020-F76E-436C-9E08-728D6EA1BAC1}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {FD7CE9F5-FDF9-42FB-8B3C-03EBA875804D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FD7CE9F5-FDF9-42FB-8B3C-03EBA875804D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FD7CE9F5-FDF9-42FB-8B3C-03EBA875804D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FD7CE9F5-FDF9-42FB-8B3C-03EBA875804D}.Release|Any CPU.Build.0 = Release|Any CPU - {9390580A-E888-4090-AFC3-0DF9CAF36135}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9390580A-E888-4090-AFC3-0DF9CAF36135}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9390580A-E888-4090-AFC3-0DF9CAF36135}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9390580A-E888-4090-AFC3-0DF9CAF36135}.Release|Any CPU.Build.0 = Release|Any CPU - {E1C239E0-2022-4309-8AE3-25A62DE199B0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E1C239E0-2022-4309-8AE3-25A62DE199B0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E1C239E0-2022-4309-8AE3-25A62DE199B0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E1C239E0-2022-4309-8AE3-25A62DE199B0}.Release|Any CPU.Build.0 = Release|Any CPU - {7C4AF8F6-FC3E-4E06-987C-B145690FC524}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7C4AF8F6-FC3E-4E06-987C-B145690FC524}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7C4AF8F6-FC3E-4E06-987C-B145690FC524}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7C4AF8F6-FC3E-4E06-987C-B145690FC524}.Release|Any CPU.Build.0 = Release|Any CPU - {ADB99281-1AA6-40C4-A82B-3640D4C004F4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {ADB99281-1AA6-40C4-A82B-3640D4C004F4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {ADB99281-1AA6-40C4-A82B-3640D4C004F4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {ADB99281-1AA6-40C4-A82B-3640D4C004F4}.Release|Any CPU.Build.0 = Release|Any CPU - {4A04AB3B-182E-4F6C-816C-3CCB7118F20A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4A04AB3B-182E-4F6C-816C-3CCB7118F20A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4A04AB3B-182E-4F6C-816C-3CCB7118F20A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4A04AB3B-182E-4F6C-816C-3CCB7118F20A}.Release|Any CPU.Build.0 = Release|Any CPU - {1A5DA058-E72A-4385-8569-E4F050997594}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1A5DA058-E72A-4385-8569-E4F050997594}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1A5DA058-E72A-4385-8569-E4F050997594}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1A5DA058-E72A-4385-8569-E4F050997594}.Release|Any CPU.Build.0 = Release|Any CPU - {836ACA3C-70D4-4FA0-AFDD-2A0EADB6C0C3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {836ACA3C-70D4-4FA0-AFDD-2A0EADB6C0C3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {836ACA3C-70D4-4FA0-AFDD-2A0EADB6C0C3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {836ACA3C-70D4-4FA0-AFDD-2A0EADB6C0C3}.Release|Any CPU.Build.0 = Release|Any CPU - {72279259-2722-4528-8F09-D38DE81A18C3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {72279259-2722-4528-8F09-D38DE81A18C3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {72279259-2722-4528-8F09-D38DE81A18C3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {72279259-2722-4528-8F09-D38DE81A18C3}.Release|Any CPU.Build.0 = Release|Any CPU - {1300D020-F76E-436C-9E08-728D6EA1BAC1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1300D020-F76E-436C-9E08-728D6EA1BAC1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1300D020-F76E-436C-9E08-728D6EA1BAC1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1300D020-F76E-436C-9E08-728D6EA1BAC1}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {B1712307-5CB0-4F7B-A078-416A8D6C4286} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {55A24ACE-36EA-40C2-ABAA-7457DF0FB62F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {4BE70359-53D4-463A-854B-B44A992664DF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {B124E221-8DEF-4320-B5B0-346521E67F65} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {C85BC27C-6BF1-4319-8923-88889EA069BB} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {FD7CE9F5-FDF9-42FB-8B3C-03EBA875804D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {9390580A-E888-4090-AFC3-0DF9CAF36135} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E1C239E0-2022-4309-8AE3-25A62DE199B0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {7C4AF8F6-FC3E-4E06-987C-B145690FC524} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {ADB99281-1AA6-40C4-A82B-3640D4C004F4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4A04AB3B-182E-4F6C-816C-3CCB7118F20A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {1A5DA058-E72A-4385-8569-E4F050997594} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {836ACA3C-70D4-4FA0-AFDD-2A0EADB6C0C3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {72279259-2722-4528-8F09-D38DE81A18C3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {1300D020-F76E-436C-9E08-728D6EA1BAC1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {FD7CE9F5-FDF9-42FB-8B3C-03EBA875804D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {9390580A-E888-4090-AFC3-0DF9CAF36135} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E1C239E0-2022-4309-8AE3-25A62DE199B0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {7C4AF8F6-FC3E-4E06-987C-B145690FC524} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {ADB99281-1AA6-40C4-A82B-3640D4C004F4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4A04AB3B-182E-4F6C-816C-3CCB7118F20A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {1A5DA058-E72A-4385-8569-E4F050997594} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {836ACA3C-70D4-4FA0-AFDD-2A0EADB6C0C3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {72279259-2722-4528-8F09-D38DE81A18C3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {1300D020-F76E-436C-9E08-728D6EA1BAC1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {08000FF8-7AD5-4C6A-B27F-804BC4E03855} diff --git a/sdk/src/Services/IoTFleetWise/Properties/AssemblyInfo.cs b/sdk/src/Services/IoTFleetWise/Properties/AssemblyInfo.cs index 5cfd635a1e79..2748f9eb091c 100644 --- a/sdk/src/Services/IoTFleetWise/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/IoTFleetWise/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.402.11")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/IoTJobsDataPlane/Generated/AmazonIoTJobsDataPlaneConfig.cs b/sdk/src/Services/IoTJobsDataPlane/Generated/AmazonIoTJobsDataPlaneConfig.cs index 2ba7cc114529..342f2ebf1574 100644 --- a/sdk/src/Services/IoTJobsDataPlane/Generated/AmazonIoTJobsDataPlaneConfig.cs +++ b/sdk/src/Services/IoTJobsDataPlane/Generated/AmazonIoTJobsDataPlaneConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.IoTJobsDataPlane public partial class AmazonIoTJobsDataPlaneConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("IoT Jobs Data Plane", "4.0.0.0"); private static readonly AmazonIoTJobsDataPlaneEndpointResolver EndpointResolver = new AmazonIoTJobsDataPlaneEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("IoT Jobs Data Plane", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("IoT Jobs Data Plane", "3.7.400.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/IoTJobsDataPlane/IoTJobsDataPlane.sln b/sdk/src/Services/IoTJobsDataPlane/IoTJobsDataPlane.sln index dd52a9049454..ae1b1e87b9f2 100644 --- a/sdk/src/Services/IoTJobsDataPlane/IoTJobsDataPlane.sln +++ b/sdk/src/Services/IoTJobsDataPlane/IoTJobsDataPlane.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {ED4CB0E7-A206-4D28-8F1F-6B725C52851E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {ED4CB0E7-A206-4D28-8F1F-6B725C52851E}.Debug|Any CPU.Build.0 = Debug|Any CPU {ED4CB0E7-A206-4D28-8F1F-6B725C52851E}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {31CC4FAC-0709-4DE0-BC87-91581541F7EA}.Debug|Any CPU.Build.0 = Debug|Any CPU {31CC4FAC-0709-4DE0-BC87-91581541F7EA}.Release|Any CPU.ActiveCfg = Release|Any CPU {31CC4FAC-0709-4DE0-BC87-91581541F7EA}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {034BF574-21C8-4D18-9F75-793AA23AB728}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {034BF574-21C8-4D18-9F75-793AA23AB728}.Debug|Any CPU.Build.0 = Debug|Any CPU - {034BF574-21C8-4D18-9F75-793AA23AB728}.Release|Any CPU.ActiveCfg = Release|Any CPU - {034BF574-21C8-4D18-9F75-793AA23AB728}.Release|Any CPU.Build.0 = Release|Any CPU - {E26AA925-1166-4EA8-B1AB-1768AAE7ACD0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E26AA925-1166-4EA8-B1AB-1768AAE7ACD0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E26AA925-1166-4EA8-B1AB-1768AAE7ACD0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E26AA925-1166-4EA8-B1AB-1768AAE7ACD0}.Release|Any CPU.Build.0 = Release|Any CPU - {34ABF834-D65D-4989-BEF3-473B46B3EBC2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {34ABF834-D65D-4989-BEF3-473B46B3EBC2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {34ABF834-D65D-4989-BEF3-473B46B3EBC2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {34ABF834-D65D-4989-BEF3-473B46B3EBC2}.Release|Any CPU.Build.0 = Release|Any CPU - {309A714A-7152-4275-9F56-F8A06517BE78}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {309A714A-7152-4275-9F56-F8A06517BE78}.Debug|Any CPU.Build.0 = Debug|Any CPU - {309A714A-7152-4275-9F56-F8A06517BE78}.Release|Any CPU.ActiveCfg = Release|Any CPU - {309A714A-7152-4275-9F56-F8A06517BE78}.Release|Any CPU.Build.0 = Release|Any CPU - {477AE9F6-A72E-4B26-9099-971758304877}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {477AE9F6-A72E-4B26-9099-971758304877}.Debug|Any CPU.Build.0 = Debug|Any CPU - {477AE9F6-A72E-4B26-9099-971758304877}.Release|Any CPU.ActiveCfg = Release|Any CPU - {477AE9F6-A72E-4B26-9099-971758304877}.Release|Any CPU.Build.0 = Release|Any CPU - {EA3A33E1-0E0C-48E2-9A77-2DA14D03987A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EA3A33E1-0E0C-48E2-9A77-2DA14D03987A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EA3A33E1-0E0C-48E2-9A77-2DA14D03987A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EA3A33E1-0E0C-48E2-9A77-2DA14D03987A}.Release|Any CPU.Build.0 = Release|Any CPU - {A68FC656-DE83-48C3-89D3-65F759CCF2FF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A68FC656-DE83-48C3-89D3-65F759CCF2FF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A68FC656-DE83-48C3-89D3-65F759CCF2FF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A68FC656-DE83-48C3-89D3-65F759CCF2FF}.Release|Any CPU.Build.0 = Release|Any CPU - {FBD69CF8-4F2A-4BF9-82D7-D9C11A2CA250}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FBD69CF8-4F2A-4BF9-82D7-D9C11A2CA250}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FBD69CF8-4F2A-4BF9-82D7-D9C11A2CA250}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FBD69CF8-4F2A-4BF9-82D7-D9C11A2CA250}.Release|Any CPU.Build.0 = Release|Any CPU - {18676A2C-C2AC-45C7-B1BE-C08FF0A9544F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {18676A2C-C2AC-45C7-B1BE-C08FF0A9544F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {18676A2C-C2AC-45C7-B1BE-C08FF0A9544F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {18676A2C-C2AC-45C7-B1BE-C08FF0A9544F}.Release|Any CPU.Build.0 = Release|Any CPU - {743CC582-EA92-46B9-AB8D-6559ACEDEDE8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {743CC582-EA92-46B9-AB8D-6559ACEDEDE8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {743CC582-EA92-46B9-AB8D-6559ACEDEDE8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {743CC582-EA92-46B9-AB8D-6559ACEDEDE8}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {034BF574-21C8-4D18-9F75-793AA23AB728}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {034BF574-21C8-4D18-9F75-793AA23AB728}.Debug|Any CPU.Build.0 = Debug|Any CPU - {034BF574-21C8-4D18-9F75-793AA23AB728}.Release|Any CPU.ActiveCfg = Release|Any CPU - {034BF574-21C8-4D18-9F75-793AA23AB728}.Release|Any CPU.Build.0 = Release|Any CPU - {E26AA925-1166-4EA8-B1AB-1768AAE7ACD0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E26AA925-1166-4EA8-B1AB-1768AAE7ACD0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E26AA925-1166-4EA8-B1AB-1768AAE7ACD0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E26AA925-1166-4EA8-B1AB-1768AAE7ACD0}.Release|Any CPU.Build.0 = Release|Any CPU - {34ABF834-D65D-4989-BEF3-473B46B3EBC2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {34ABF834-D65D-4989-BEF3-473B46B3EBC2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {34ABF834-D65D-4989-BEF3-473B46B3EBC2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {34ABF834-D65D-4989-BEF3-473B46B3EBC2}.Release|Any CPU.Build.0 = Release|Any CPU - {309A714A-7152-4275-9F56-F8A06517BE78}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {309A714A-7152-4275-9F56-F8A06517BE78}.Debug|Any CPU.Build.0 = Debug|Any CPU - {309A714A-7152-4275-9F56-F8A06517BE78}.Release|Any CPU.ActiveCfg = Release|Any CPU - {309A714A-7152-4275-9F56-F8A06517BE78}.Release|Any CPU.Build.0 = Release|Any CPU - {477AE9F6-A72E-4B26-9099-971758304877}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {477AE9F6-A72E-4B26-9099-971758304877}.Debug|Any CPU.Build.0 = Debug|Any CPU - {477AE9F6-A72E-4B26-9099-971758304877}.Release|Any CPU.ActiveCfg = Release|Any CPU - {477AE9F6-A72E-4B26-9099-971758304877}.Release|Any CPU.Build.0 = Release|Any CPU - {EA3A33E1-0E0C-48E2-9A77-2DA14D03987A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EA3A33E1-0E0C-48E2-9A77-2DA14D03987A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EA3A33E1-0E0C-48E2-9A77-2DA14D03987A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EA3A33E1-0E0C-48E2-9A77-2DA14D03987A}.Release|Any CPU.Build.0 = Release|Any CPU - {A68FC656-DE83-48C3-89D3-65F759CCF2FF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A68FC656-DE83-48C3-89D3-65F759CCF2FF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A68FC656-DE83-48C3-89D3-65F759CCF2FF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A68FC656-DE83-48C3-89D3-65F759CCF2FF}.Release|Any CPU.Build.0 = Release|Any CPU - {FBD69CF8-4F2A-4BF9-82D7-D9C11A2CA250}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FBD69CF8-4F2A-4BF9-82D7-D9C11A2CA250}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FBD69CF8-4F2A-4BF9-82D7-D9C11A2CA250}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FBD69CF8-4F2A-4BF9-82D7-D9C11A2CA250}.Release|Any CPU.Build.0 = Release|Any CPU - {18676A2C-C2AC-45C7-B1BE-C08FF0A9544F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {18676A2C-C2AC-45C7-B1BE-C08FF0A9544F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {18676A2C-C2AC-45C7-B1BE-C08FF0A9544F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {18676A2C-C2AC-45C7-B1BE-C08FF0A9544F}.Release|Any CPU.Build.0 = Release|Any CPU - {743CC582-EA92-46B9-AB8D-6559ACEDEDE8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {743CC582-EA92-46B9-AB8D-6559ACEDEDE8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {743CC582-EA92-46B9-AB8D-6559ACEDEDE8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {743CC582-EA92-46B9-AB8D-6559ACEDEDE8}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {ED4CB0E7-A206-4D28-8F1F-6B725C52851E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {B16BFBDC-B558-4764-AB60-1E197E578357} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {5B71A64E-B4DE-4AD6-ACAF-003F1FA7DB55} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {25CDDD84-C08B-454F-BFBB-927F922A2E24} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {31CC4FAC-0709-4DE0-BC87-91581541F7EA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {034BF574-21C8-4D18-9F75-793AA23AB728} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E26AA925-1166-4EA8-B1AB-1768AAE7ACD0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {34ABF834-D65D-4989-BEF3-473B46B3EBC2} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {309A714A-7152-4275-9F56-F8A06517BE78} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {477AE9F6-A72E-4B26-9099-971758304877} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {EA3A33E1-0E0C-48E2-9A77-2DA14D03987A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A68FC656-DE83-48C3-89D3-65F759CCF2FF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {FBD69CF8-4F2A-4BF9-82D7-D9C11A2CA250} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {18676A2C-C2AC-45C7-B1BE-C08FF0A9544F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {743CC582-EA92-46B9-AB8D-6559ACEDEDE8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {034BF574-21C8-4D18-9F75-793AA23AB728} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E26AA925-1166-4EA8-B1AB-1768AAE7ACD0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {34ABF834-D65D-4989-BEF3-473B46B3EBC2} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {309A714A-7152-4275-9F56-F8A06517BE78} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {477AE9F6-A72E-4B26-9099-971758304877} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {EA3A33E1-0E0C-48E2-9A77-2DA14D03987A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A68FC656-DE83-48C3-89D3-65F759CCF2FF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {FBD69CF8-4F2A-4BF9-82D7-D9C11A2CA250} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {18676A2C-C2AC-45C7-B1BE-C08FF0A9544F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {743CC582-EA92-46B9-AB8D-6559ACEDEDE8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {8C93C1E3-AD75-4ABA-A9D5-F4984F4C0728} diff --git a/sdk/src/Services/IoTJobsDataPlane/Properties/AssemblyInfo.cs b/sdk/src/Services/IoTJobsDataPlane/Properties/AssemblyInfo.cs index 512dfdb07309..1b37a3af91c0 100644 --- a/sdk/src/Services/IoTJobsDataPlane/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/IoTJobsDataPlane/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/IoTSecureTunneling/Generated/AmazonIoTSecureTunnelingConfig.cs b/sdk/src/Services/IoTSecureTunneling/Generated/AmazonIoTSecureTunnelingConfig.cs index cd09a3eba705..aa34c955243b 100644 --- a/sdk/src/Services/IoTSecureTunneling/Generated/AmazonIoTSecureTunnelingConfig.cs +++ b/sdk/src/Services/IoTSecureTunneling/Generated/AmazonIoTSecureTunnelingConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.IoTSecureTunneling public partial class AmazonIoTSecureTunnelingConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("IoTSecureTunneling", "4.0.0.0"); private static readonly AmazonIoTSecureTunnelingEndpointResolver EndpointResolver = new AmazonIoTSecureTunnelingEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("IoTSecureTunneling", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("IoTSecureTunneling", "3.7.400.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/IoTSecureTunneling/IoTSecureTunneling.sln b/sdk/src/Services/IoTSecureTunneling/IoTSecureTunneling.sln index a914dd767e1c..6b2a2395df44 100644 --- a/sdk/src/Services/IoTSecureTunneling/IoTSecureTunneling.sln +++ b/sdk/src/Services/IoTSecureTunneling/IoTSecureTunneling.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {FF09219B-6835-446E-B8BA-AEA68DA69749}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {FF09219B-6835-446E-B8BA-AEA68DA69749}.Debug|Any CPU.Build.0 = Debug|Any CPU {FF09219B-6835-446E-B8BA-AEA68DA69749}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {572A4C71-8A2C-4947-A146-A6C62E9197AE}.Debug|Any CPU.Build.0 = Debug|Any CPU {572A4C71-8A2C-4947-A146-A6C62E9197AE}.Release|Any CPU.ActiveCfg = Release|Any CPU {572A4C71-8A2C-4947-A146-A6C62E9197AE}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {964BEC49-3A01-4DEE-AE5E-5834A8BBD455}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {964BEC49-3A01-4DEE-AE5E-5834A8BBD455}.Debug|Any CPU.Build.0 = Debug|Any CPU - {964BEC49-3A01-4DEE-AE5E-5834A8BBD455}.Release|Any CPU.ActiveCfg = Release|Any CPU - {964BEC49-3A01-4DEE-AE5E-5834A8BBD455}.Release|Any CPU.Build.0 = Release|Any CPU - {755C293F-AE8A-4BFE-B348-E9B50CC1C214}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {755C293F-AE8A-4BFE-B348-E9B50CC1C214}.Debug|Any CPU.Build.0 = Debug|Any CPU - {755C293F-AE8A-4BFE-B348-E9B50CC1C214}.Release|Any CPU.ActiveCfg = Release|Any CPU - {755C293F-AE8A-4BFE-B348-E9B50CC1C214}.Release|Any CPU.Build.0 = Release|Any CPU - {2424CCD1-D0B0-4007-B85C-AD1CC4D92ED2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2424CCD1-D0B0-4007-B85C-AD1CC4D92ED2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2424CCD1-D0B0-4007-B85C-AD1CC4D92ED2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2424CCD1-D0B0-4007-B85C-AD1CC4D92ED2}.Release|Any CPU.Build.0 = Release|Any CPU - {60B7D683-879F-4166-A657-4A77246BBEDC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {60B7D683-879F-4166-A657-4A77246BBEDC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {60B7D683-879F-4166-A657-4A77246BBEDC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {60B7D683-879F-4166-A657-4A77246BBEDC}.Release|Any CPU.Build.0 = Release|Any CPU - {01F7619A-A26A-44EE-9DCD-638B7D969061}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {01F7619A-A26A-44EE-9DCD-638B7D969061}.Debug|Any CPU.Build.0 = Debug|Any CPU - {01F7619A-A26A-44EE-9DCD-638B7D969061}.Release|Any CPU.ActiveCfg = Release|Any CPU - {01F7619A-A26A-44EE-9DCD-638B7D969061}.Release|Any CPU.Build.0 = Release|Any CPU - {A5A7E9E1-DBD3-42A6-B668-0316BC5F860C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A5A7E9E1-DBD3-42A6-B668-0316BC5F860C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A5A7E9E1-DBD3-42A6-B668-0316BC5F860C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A5A7E9E1-DBD3-42A6-B668-0316BC5F860C}.Release|Any CPU.Build.0 = Release|Any CPU - {36064DA1-D16D-4FE1-8F5F-4BD97584B7DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {36064DA1-D16D-4FE1-8F5F-4BD97584B7DC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {36064DA1-D16D-4FE1-8F5F-4BD97584B7DC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {36064DA1-D16D-4FE1-8F5F-4BD97584B7DC}.Release|Any CPU.Build.0 = Release|Any CPU - {B848D9F3-0B89-42A4-A352-1477960D1C30}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B848D9F3-0B89-42A4-A352-1477960D1C30}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B848D9F3-0B89-42A4-A352-1477960D1C30}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B848D9F3-0B89-42A4-A352-1477960D1C30}.Release|Any CPU.Build.0 = Release|Any CPU - {5E58569A-D965-4D66-BE05-1F0420BCBB7D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5E58569A-D965-4D66-BE05-1F0420BCBB7D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5E58569A-D965-4D66-BE05-1F0420BCBB7D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5E58569A-D965-4D66-BE05-1F0420BCBB7D}.Release|Any CPU.Build.0 = Release|Any CPU - {2A535CE8-1AEF-4CE1-A410-E970C6716007}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2A535CE8-1AEF-4CE1-A410-E970C6716007}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2A535CE8-1AEF-4CE1-A410-E970C6716007}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2A535CE8-1AEF-4CE1-A410-E970C6716007}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {964BEC49-3A01-4DEE-AE5E-5834A8BBD455}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {964BEC49-3A01-4DEE-AE5E-5834A8BBD455}.Debug|Any CPU.Build.0 = Debug|Any CPU - {964BEC49-3A01-4DEE-AE5E-5834A8BBD455}.Release|Any CPU.ActiveCfg = Release|Any CPU - {964BEC49-3A01-4DEE-AE5E-5834A8BBD455}.Release|Any CPU.Build.0 = Release|Any CPU - {755C293F-AE8A-4BFE-B348-E9B50CC1C214}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {755C293F-AE8A-4BFE-B348-E9B50CC1C214}.Debug|Any CPU.Build.0 = Debug|Any CPU - {755C293F-AE8A-4BFE-B348-E9B50CC1C214}.Release|Any CPU.ActiveCfg = Release|Any CPU - {755C293F-AE8A-4BFE-B348-E9B50CC1C214}.Release|Any CPU.Build.0 = Release|Any CPU - {2424CCD1-D0B0-4007-B85C-AD1CC4D92ED2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2424CCD1-D0B0-4007-B85C-AD1CC4D92ED2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2424CCD1-D0B0-4007-B85C-AD1CC4D92ED2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2424CCD1-D0B0-4007-B85C-AD1CC4D92ED2}.Release|Any CPU.Build.0 = Release|Any CPU - {60B7D683-879F-4166-A657-4A77246BBEDC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {60B7D683-879F-4166-A657-4A77246BBEDC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {60B7D683-879F-4166-A657-4A77246BBEDC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {60B7D683-879F-4166-A657-4A77246BBEDC}.Release|Any CPU.Build.0 = Release|Any CPU - {01F7619A-A26A-44EE-9DCD-638B7D969061}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {01F7619A-A26A-44EE-9DCD-638B7D969061}.Debug|Any CPU.Build.0 = Debug|Any CPU - {01F7619A-A26A-44EE-9DCD-638B7D969061}.Release|Any CPU.ActiveCfg = Release|Any CPU - {01F7619A-A26A-44EE-9DCD-638B7D969061}.Release|Any CPU.Build.0 = Release|Any CPU - {A5A7E9E1-DBD3-42A6-B668-0316BC5F860C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A5A7E9E1-DBD3-42A6-B668-0316BC5F860C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A5A7E9E1-DBD3-42A6-B668-0316BC5F860C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A5A7E9E1-DBD3-42A6-B668-0316BC5F860C}.Release|Any CPU.Build.0 = Release|Any CPU - {36064DA1-D16D-4FE1-8F5F-4BD97584B7DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {36064DA1-D16D-4FE1-8F5F-4BD97584B7DC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {36064DA1-D16D-4FE1-8F5F-4BD97584B7DC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {36064DA1-D16D-4FE1-8F5F-4BD97584B7DC}.Release|Any CPU.Build.0 = Release|Any CPU - {B848D9F3-0B89-42A4-A352-1477960D1C30}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B848D9F3-0B89-42A4-A352-1477960D1C30}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B848D9F3-0B89-42A4-A352-1477960D1C30}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B848D9F3-0B89-42A4-A352-1477960D1C30}.Release|Any CPU.Build.0 = Release|Any CPU - {5E58569A-D965-4D66-BE05-1F0420BCBB7D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5E58569A-D965-4D66-BE05-1F0420BCBB7D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5E58569A-D965-4D66-BE05-1F0420BCBB7D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5E58569A-D965-4D66-BE05-1F0420BCBB7D}.Release|Any CPU.Build.0 = Release|Any CPU - {2A535CE8-1AEF-4CE1-A410-E970C6716007}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2A535CE8-1AEF-4CE1-A410-E970C6716007}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2A535CE8-1AEF-4CE1-A410-E970C6716007}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2A535CE8-1AEF-4CE1-A410-E970C6716007}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {FF09219B-6835-446E-B8BA-AEA68DA69749} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {58EDA805-6934-4DDC-B77F-6B21F984A85D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {E582CD36-30E4-4261-8C70-2E699EBC2CA4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {234FCDFA-581C-4C4A-94B0-2C1C1A829879} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {572A4C71-8A2C-4947-A146-A6C62E9197AE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {964BEC49-3A01-4DEE-AE5E-5834A8BBD455} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {755C293F-AE8A-4BFE-B348-E9B50CC1C214} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {2424CCD1-D0B0-4007-B85C-AD1CC4D92ED2} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {60B7D683-879F-4166-A657-4A77246BBEDC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {01F7619A-A26A-44EE-9DCD-638B7D969061} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A5A7E9E1-DBD3-42A6-B668-0316BC5F860C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {36064DA1-D16D-4FE1-8F5F-4BD97584B7DC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B848D9F3-0B89-42A4-A352-1477960D1C30} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {5E58569A-D965-4D66-BE05-1F0420BCBB7D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {2A535CE8-1AEF-4CE1-A410-E970C6716007} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {964BEC49-3A01-4DEE-AE5E-5834A8BBD455} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {755C293F-AE8A-4BFE-B348-E9B50CC1C214} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {2424CCD1-D0B0-4007-B85C-AD1CC4D92ED2} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {60B7D683-879F-4166-A657-4A77246BBEDC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {01F7619A-A26A-44EE-9DCD-638B7D969061} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A5A7E9E1-DBD3-42A6-B668-0316BC5F860C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {36064DA1-D16D-4FE1-8F5F-4BD97584B7DC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B848D9F3-0B89-42A4-A352-1477960D1C30} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {5E58569A-D965-4D66-BE05-1F0420BCBB7D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {2A535CE8-1AEF-4CE1-A410-E970C6716007} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {A3BBE185-1828-4B00-92E0-7BF65BD2E967} diff --git a/sdk/src/Services/IoTSecureTunneling/Properties/AssemblyInfo.cs b/sdk/src/Services/IoTSecureTunneling/Properties/AssemblyInfo.cs index 6c58b5757b31..2fcdd0460ac0 100644 --- a/sdk/src/Services/IoTSecureTunneling/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/IoTSecureTunneling/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/IoTSiteWise/Generated/AmazonIoTSiteWiseConfig.cs b/sdk/src/Services/IoTSiteWise/Generated/AmazonIoTSiteWiseConfig.cs index 09cc3c1dfda3..b53499322563 100644 --- a/sdk/src/Services/IoTSiteWise/Generated/AmazonIoTSiteWiseConfig.cs +++ b/sdk/src/Services/IoTSiteWise/Generated/AmazonIoTSiteWiseConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.IoTSiteWise public partial class AmazonIoTSiteWiseConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("IoTSiteWise", "4.0.0.0"); private static readonly AmazonIoTSiteWiseEndpointResolver EndpointResolver = new AmazonIoTSiteWiseEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("IoTSiteWise", "3.7.401.15"); -======= - InternalSDKUtils.BuildUserAgentString("IoTSiteWise", "3.7.401.42"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/IoTSiteWise/IoTSiteWise.sln b/sdk/src/Services/IoTSiteWise/IoTSiteWise.sln index bfcf2d5a8f0a..146729e3a5aa 100644 --- a/sdk/src/Services/IoTSiteWise/IoTSiteWise.sln +++ b/sdk/src/Services/IoTSiteWise/IoTSiteWise.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {30B36E52-FF1E-40B4-ADF5-FECFC319E44E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {30B36E52-FF1E-40B4-ADF5-FECFC319E44E}.Debug|Any CPU.Build.0 = Debug|Any CPU {30B36E52-FF1E-40B4-ADF5-FECFC319E44E}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {03EC4349-B4F0-4771-92AC-AF48D52AE6ED}.Debug|Any CPU.Build.0 = Debug|Any CPU {03EC4349-B4F0-4771-92AC-AF48D52AE6ED}.Release|Any CPU.ActiveCfg = Release|Any CPU {03EC4349-B4F0-4771-92AC-AF48D52AE6ED}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {2A65BBEC-0881-4CE0-A2B7-7652B05527AE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2A65BBEC-0881-4CE0-A2B7-7652B05527AE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2A65BBEC-0881-4CE0-A2B7-7652B05527AE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2A65BBEC-0881-4CE0-A2B7-7652B05527AE}.Release|Any CPU.Build.0 = Release|Any CPU - {DDB45738-5F99-4583-96DD-CFC5F758D2C9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DDB45738-5F99-4583-96DD-CFC5F758D2C9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DDB45738-5F99-4583-96DD-CFC5F758D2C9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DDB45738-5F99-4583-96DD-CFC5F758D2C9}.Release|Any CPU.Build.0 = Release|Any CPU - {04243D51-BF1F-45CF-8EF4-63DBF8112A48}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {04243D51-BF1F-45CF-8EF4-63DBF8112A48}.Debug|Any CPU.Build.0 = Debug|Any CPU - {04243D51-BF1F-45CF-8EF4-63DBF8112A48}.Release|Any CPU.ActiveCfg = Release|Any CPU - {04243D51-BF1F-45CF-8EF4-63DBF8112A48}.Release|Any CPU.Build.0 = Release|Any CPU - {5098E318-CCBF-471D-BFE7-9F88458447F8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5098E318-CCBF-471D-BFE7-9F88458447F8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5098E318-CCBF-471D-BFE7-9F88458447F8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5098E318-CCBF-471D-BFE7-9F88458447F8}.Release|Any CPU.Build.0 = Release|Any CPU - {DD4C7BAD-6A5C-4629-9896-0AE17C78194A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DD4C7BAD-6A5C-4629-9896-0AE17C78194A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DD4C7BAD-6A5C-4629-9896-0AE17C78194A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DD4C7BAD-6A5C-4629-9896-0AE17C78194A}.Release|Any CPU.Build.0 = Release|Any CPU - {98CD2EB8-C25B-46FC-AD64-9D27D58636FF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {98CD2EB8-C25B-46FC-AD64-9D27D58636FF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {98CD2EB8-C25B-46FC-AD64-9D27D58636FF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {98CD2EB8-C25B-46FC-AD64-9D27D58636FF}.Release|Any CPU.Build.0 = Release|Any CPU - {6B4BB9D7-FB36-4692-B4EE-71A234394259}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6B4BB9D7-FB36-4692-B4EE-71A234394259}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6B4BB9D7-FB36-4692-B4EE-71A234394259}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6B4BB9D7-FB36-4692-B4EE-71A234394259}.Release|Any CPU.Build.0 = Release|Any CPU - {BC213756-06D4-403E-9FA1-23C34E8D2076}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BC213756-06D4-403E-9FA1-23C34E8D2076}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BC213756-06D4-403E-9FA1-23C34E8D2076}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BC213756-06D4-403E-9FA1-23C34E8D2076}.Release|Any CPU.Build.0 = Release|Any CPU - {9056E1AC-FF37-4D54-B6B6-A36D1214CD1E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9056E1AC-FF37-4D54-B6B6-A36D1214CD1E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9056E1AC-FF37-4D54-B6B6-A36D1214CD1E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9056E1AC-FF37-4D54-B6B6-A36D1214CD1E}.Release|Any CPU.Build.0 = Release|Any CPU - {CF178745-2F75-4A4F-8DAC-784CFA7058FF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CF178745-2F75-4A4F-8DAC-784CFA7058FF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CF178745-2F75-4A4F-8DAC-784CFA7058FF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CF178745-2F75-4A4F-8DAC-784CFA7058FF}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {2A65BBEC-0881-4CE0-A2B7-7652B05527AE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2A65BBEC-0881-4CE0-A2B7-7652B05527AE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2A65BBEC-0881-4CE0-A2B7-7652B05527AE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2A65BBEC-0881-4CE0-A2B7-7652B05527AE}.Release|Any CPU.Build.0 = Release|Any CPU - {DDB45738-5F99-4583-96DD-CFC5F758D2C9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DDB45738-5F99-4583-96DD-CFC5F758D2C9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DDB45738-5F99-4583-96DD-CFC5F758D2C9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DDB45738-5F99-4583-96DD-CFC5F758D2C9}.Release|Any CPU.Build.0 = Release|Any CPU - {04243D51-BF1F-45CF-8EF4-63DBF8112A48}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {04243D51-BF1F-45CF-8EF4-63DBF8112A48}.Debug|Any CPU.Build.0 = Debug|Any CPU - {04243D51-BF1F-45CF-8EF4-63DBF8112A48}.Release|Any CPU.ActiveCfg = Release|Any CPU - {04243D51-BF1F-45CF-8EF4-63DBF8112A48}.Release|Any CPU.Build.0 = Release|Any CPU - {5098E318-CCBF-471D-BFE7-9F88458447F8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5098E318-CCBF-471D-BFE7-9F88458447F8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5098E318-CCBF-471D-BFE7-9F88458447F8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5098E318-CCBF-471D-BFE7-9F88458447F8}.Release|Any CPU.Build.0 = Release|Any CPU - {DD4C7BAD-6A5C-4629-9896-0AE17C78194A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DD4C7BAD-6A5C-4629-9896-0AE17C78194A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DD4C7BAD-6A5C-4629-9896-0AE17C78194A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DD4C7BAD-6A5C-4629-9896-0AE17C78194A}.Release|Any CPU.Build.0 = Release|Any CPU - {98CD2EB8-C25B-46FC-AD64-9D27D58636FF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {98CD2EB8-C25B-46FC-AD64-9D27D58636FF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {98CD2EB8-C25B-46FC-AD64-9D27D58636FF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {98CD2EB8-C25B-46FC-AD64-9D27D58636FF}.Release|Any CPU.Build.0 = Release|Any CPU - {6B4BB9D7-FB36-4692-B4EE-71A234394259}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6B4BB9D7-FB36-4692-B4EE-71A234394259}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6B4BB9D7-FB36-4692-B4EE-71A234394259}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6B4BB9D7-FB36-4692-B4EE-71A234394259}.Release|Any CPU.Build.0 = Release|Any CPU - {BC213756-06D4-403E-9FA1-23C34E8D2076}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BC213756-06D4-403E-9FA1-23C34E8D2076}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BC213756-06D4-403E-9FA1-23C34E8D2076}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BC213756-06D4-403E-9FA1-23C34E8D2076}.Release|Any CPU.Build.0 = Release|Any CPU - {9056E1AC-FF37-4D54-B6B6-A36D1214CD1E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9056E1AC-FF37-4D54-B6B6-A36D1214CD1E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9056E1AC-FF37-4D54-B6B6-A36D1214CD1E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9056E1AC-FF37-4D54-B6B6-A36D1214CD1E}.Release|Any CPU.Build.0 = Release|Any CPU - {CF178745-2F75-4A4F-8DAC-784CFA7058FF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CF178745-2F75-4A4F-8DAC-784CFA7058FF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CF178745-2F75-4A4F-8DAC-784CFA7058FF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CF178745-2F75-4A4F-8DAC-784CFA7058FF}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {30B36E52-FF1E-40B4-ADF5-FECFC319E44E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {6519C177-7348-49D0-B8D0-1D39D6D1796B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {0FC9DC0B-37B9-458E-B482-FC4D4838BEB1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {9164839C-863C-41A8-AF5A-29F1285FA160} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {03EC4349-B4F0-4771-92AC-AF48D52AE6ED} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {2A65BBEC-0881-4CE0-A2B7-7652B05527AE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {DDB45738-5F99-4583-96DD-CFC5F758D2C9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {04243D51-BF1F-45CF-8EF4-63DBF8112A48} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {5098E318-CCBF-471D-BFE7-9F88458447F8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {DD4C7BAD-6A5C-4629-9896-0AE17C78194A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {98CD2EB8-C25B-46FC-AD64-9D27D58636FF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6B4BB9D7-FB36-4692-B4EE-71A234394259} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {BC213756-06D4-403E-9FA1-23C34E8D2076} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {9056E1AC-FF37-4D54-B6B6-A36D1214CD1E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {CF178745-2F75-4A4F-8DAC-784CFA7058FF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {2A65BBEC-0881-4CE0-A2B7-7652B05527AE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {DDB45738-5F99-4583-96DD-CFC5F758D2C9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {04243D51-BF1F-45CF-8EF4-63DBF8112A48} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {5098E318-CCBF-471D-BFE7-9F88458447F8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {DD4C7BAD-6A5C-4629-9896-0AE17C78194A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {98CD2EB8-C25B-46FC-AD64-9D27D58636FF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6B4BB9D7-FB36-4692-B4EE-71A234394259} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {BC213756-06D4-403E-9FA1-23C34E8D2076} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {9056E1AC-FF37-4D54-B6B6-A36D1214CD1E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {CF178745-2F75-4A4F-8DAC-784CFA7058FF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {9985AFF2-60A2-4E8A-BAB1-B8D4DDFA5636} diff --git a/sdk/src/Services/IoTSiteWise/Properties/AssemblyInfo.cs b/sdk/src/Services/IoTSiteWise/Properties/AssemblyInfo.cs index 7d1da49cef31..3bec38eab01c 100644 --- a/sdk/src/Services/IoTSiteWise/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/IoTSiteWise/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.15")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.42")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/IoTThingsGraph/Generated/AmazonIoTThingsGraphConfig.cs b/sdk/src/Services/IoTThingsGraph/Generated/AmazonIoTThingsGraphConfig.cs index fd8b0d1a9ea7..970886423974 100644 --- a/sdk/src/Services/IoTThingsGraph/Generated/AmazonIoTThingsGraphConfig.cs +++ b/sdk/src/Services/IoTThingsGraph/Generated/AmazonIoTThingsGraphConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.IoTThingsGraph public partial class AmazonIoTThingsGraphConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("IoTThingsGraph", "4.0.0.0"); private static readonly AmazonIoTThingsGraphEndpointResolver EndpointResolver = new AmazonIoTThingsGraphEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("IoTThingsGraph", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("IoTThingsGraph", "3.7.400.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/IoTThingsGraph/IoTThingsGraph.sln b/sdk/src/Services/IoTThingsGraph/IoTThingsGraph.sln index 0a6f847fe7a0..f89499dcd580 100644 --- a/sdk/src/Services/IoTThingsGraph/IoTThingsGraph.sln +++ b/sdk/src/Services/IoTThingsGraph/IoTThingsGraph.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {84C96A91-4FB5-405C-AD3B-1B7BE27335B7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {84C96A91-4FB5-405C-AD3B-1B7BE27335B7}.Debug|Any CPU.Build.0 = Debug|Any CPU {84C96A91-4FB5-405C-AD3B-1B7BE27335B7}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {E39ECF22-CB57-422B-BA83-AB50BF1CD6DB}.Debug|Any CPU.Build.0 = Debug|Any CPU {E39ECF22-CB57-422B-BA83-AB50BF1CD6DB}.Release|Any CPU.ActiveCfg = Release|Any CPU {E39ECF22-CB57-422B-BA83-AB50BF1CD6DB}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {88BFDB13-ED49-4720-A423-D3521E7CCD30}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {88BFDB13-ED49-4720-A423-D3521E7CCD30}.Debug|Any CPU.Build.0 = Debug|Any CPU - {88BFDB13-ED49-4720-A423-D3521E7CCD30}.Release|Any CPU.ActiveCfg = Release|Any CPU - {88BFDB13-ED49-4720-A423-D3521E7CCD30}.Release|Any CPU.Build.0 = Release|Any CPU - {00AA0707-7980-420C-8F37-0DC461CDBE33}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {00AA0707-7980-420C-8F37-0DC461CDBE33}.Debug|Any CPU.Build.0 = Debug|Any CPU - {00AA0707-7980-420C-8F37-0DC461CDBE33}.Release|Any CPU.ActiveCfg = Release|Any CPU - {00AA0707-7980-420C-8F37-0DC461CDBE33}.Release|Any CPU.Build.0 = Release|Any CPU - {3A90E3B4-664B-4888-9C5D-ED9A454AC7EF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3A90E3B4-664B-4888-9C5D-ED9A454AC7EF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3A90E3B4-664B-4888-9C5D-ED9A454AC7EF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3A90E3B4-664B-4888-9C5D-ED9A454AC7EF}.Release|Any CPU.Build.0 = Release|Any CPU - {1AA7BB3E-705F-4D27-84E7-16503B125BD2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1AA7BB3E-705F-4D27-84E7-16503B125BD2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1AA7BB3E-705F-4D27-84E7-16503B125BD2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1AA7BB3E-705F-4D27-84E7-16503B125BD2}.Release|Any CPU.Build.0 = Release|Any CPU - {950B4B8B-C74C-4D1D-97C5-7E8582C5D02E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {950B4B8B-C74C-4D1D-97C5-7E8582C5D02E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {950B4B8B-C74C-4D1D-97C5-7E8582C5D02E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {950B4B8B-C74C-4D1D-97C5-7E8582C5D02E}.Release|Any CPU.Build.0 = Release|Any CPU - {9E7E4D39-F493-4037-AE66-C0FD7739F6DF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9E7E4D39-F493-4037-AE66-C0FD7739F6DF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9E7E4D39-F493-4037-AE66-C0FD7739F6DF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9E7E4D39-F493-4037-AE66-C0FD7739F6DF}.Release|Any CPU.Build.0 = Release|Any CPU - {A9962996-C908-4B74-8D8D-CAE1BA7327BD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A9962996-C908-4B74-8D8D-CAE1BA7327BD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A9962996-C908-4B74-8D8D-CAE1BA7327BD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A9962996-C908-4B74-8D8D-CAE1BA7327BD}.Release|Any CPU.Build.0 = Release|Any CPU - {07D6554A-F0CF-4138-BD2F-3613B3DF65C9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {07D6554A-F0CF-4138-BD2F-3613B3DF65C9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {07D6554A-F0CF-4138-BD2F-3613B3DF65C9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {07D6554A-F0CF-4138-BD2F-3613B3DF65C9}.Release|Any CPU.Build.0 = Release|Any CPU - {CEE8E89D-FC03-4B02-A5AE-C0A7243F74FD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CEE8E89D-FC03-4B02-A5AE-C0A7243F74FD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CEE8E89D-FC03-4B02-A5AE-C0A7243F74FD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CEE8E89D-FC03-4B02-A5AE-C0A7243F74FD}.Release|Any CPU.Build.0 = Release|Any CPU - {7CD9B0D8-3ECB-4FC4-9A93-21046DC0D9FF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7CD9B0D8-3ECB-4FC4-9A93-21046DC0D9FF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7CD9B0D8-3ECB-4FC4-9A93-21046DC0D9FF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7CD9B0D8-3ECB-4FC4-9A93-21046DC0D9FF}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {88BFDB13-ED49-4720-A423-D3521E7CCD30}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {88BFDB13-ED49-4720-A423-D3521E7CCD30}.Debug|Any CPU.Build.0 = Debug|Any CPU - {88BFDB13-ED49-4720-A423-D3521E7CCD30}.Release|Any CPU.ActiveCfg = Release|Any CPU - {88BFDB13-ED49-4720-A423-D3521E7CCD30}.Release|Any CPU.Build.0 = Release|Any CPU - {00AA0707-7980-420C-8F37-0DC461CDBE33}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {00AA0707-7980-420C-8F37-0DC461CDBE33}.Debug|Any CPU.Build.0 = Debug|Any CPU - {00AA0707-7980-420C-8F37-0DC461CDBE33}.Release|Any CPU.ActiveCfg = Release|Any CPU - {00AA0707-7980-420C-8F37-0DC461CDBE33}.Release|Any CPU.Build.0 = Release|Any CPU - {3A90E3B4-664B-4888-9C5D-ED9A454AC7EF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3A90E3B4-664B-4888-9C5D-ED9A454AC7EF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3A90E3B4-664B-4888-9C5D-ED9A454AC7EF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3A90E3B4-664B-4888-9C5D-ED9A454AC7EF}.Release|Any CPU.Build.0 = Release|Any CPU - {1AA7BB3E-705F-4D27-84E7-16503B125BD2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1AA7BB3E-705F-4D27-84E7-16503B125BD2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1AA7BB3E-705F-4D27-84E7-16503B125BD2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1AA7BB3E-705F-4D27-84E7-16503B125BD2}.Release|Any CPU.Build.0 = Release|Any CPU - {950B4B8B-C74C-4D1D-97C5-7E8582C5D02E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {950B4B8B-C74C-4D1D-97C5-7E8582C5D02E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {950B4B8B-C74C-4D1D-97C5-7E8582C5D02E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {950B4B8B-C74C-4D1D-97C5-7E8582C5D02E}.Release|Any CPU.Build.0 = Release|Any CPU - {9E7E4D39-F493-4037-AE66-C0FD7739F6DF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9E7E4D39-F493-4037-AE66-C0FD7739F6DF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9E7E4D39-F493-4037-AE66-C0FD7739F6DF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9E7E4D39-F493-4037-AE66-C0FD7739F6DF}.Release|Any CPU.Build.0 = Release|Any CPU - {A9962996-C908-4B74-8D8D-CAE1BA7327BD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A9962996-C908-4B74-8D8D-CAE1BA7327BD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A9962996-C908-4B74-8D8D-CAE1BA7327BD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A9962996-C908-4B74-8D8D-CAE1BA7327BD}.Release|Any CPU.Build.0 = Release|Any CPU - {07D6554A-F0CF-4138-BD2F-3613B3DF65C9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {07D6554A-F0CF-4138-BD2F-3613B3DF65C9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {07D6554A-F0CF-4138-BD2F-3613B3DF65C9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {07D6554A-F0CF-4138-BD2F-3613B3DF65C9}.Release|Any CPU.Build.0 = Release|Any CPU - {CEE8E89D-FC03-4B02-A5AE-C0A7243F74FD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CEE8E89D-FC03-4B02-A5AE-C0A7243F74FD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CEE8E89D-FC03-4B02-A5AE-C0A7243F74FD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CEE8E89D-FC03-4B02-A5AE-C0A7243F74FD}.Release|Any CPU.Build.0 = Release|Any CPU - {7CD9B0D8-3ECB-4FC4-9A93-21046DC0D9FF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7CD9B0D8-3ECB-4FC4-9A93-21046DC0D9FF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7CD9B0D8-3ECB-4FC4-9A93-21046DC0D9FF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7CD9B0D8-3ECB-4FC4-9A93-21046DC0D9FF}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {84C96A91-4FB5-405C-AD3B-1B7BE27335B7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {253575C7-D1A4-4884-9FC1-6A04A4D49324} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {84B7382F-A13A-4A9E-9C70-7A328BEA39D3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {05890671-D341-40B8-867B-184B13466CCF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {E39ECF22-CB57-422B-BA83-AB50BF1CD6DB} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {88BFDB13-ED49-4720-A423-D3521E7CCD30} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {00AA0707-7980-420C-8F37-0DC461CDBE33} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {3A90E3B4-664B-4888-9C5D-ED9A454AC7EF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {1AA7BB3E-705F-4D27-84E7-16503B125BD2} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {950B4B8B-C74C-4D1D-97C5-7E8582C5D02E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {9E7E4D39-F493-4037-AE66-C0FD7739F6DF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A9962996-C908-4B74-8D8D-CAE1BA7327BD} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {07D6554A-F0CF-4138-BD2F-3613B3DF65C9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {CEE8E89D-FC03-4B02-A5AE-C0A7243F74FD} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {7CD9B0D8-3ECB-4FC4-9A93-21046DC0D9FF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {88BFDB13-ED49-4720-A423-D3521E7CCD30} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {00AA0707-7980-420C-8F37-0DC461CDBE33} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {3A90E3B4-664B-4888-9C5D-ED9A454AC7EF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {1AA7BB3E-705F-4D27-84E7-16503B125BD2} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {950B4B8B-C74C-4D1D-97C5-7E8582C5D02E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {9E7E4D39-F493-4037-AE66-C0FD7739F6DF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A9962996-C908-4B74-8D8D-CAE1BA7327BD} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {07D6554A-F0CF-4138-BD2F-3613B3DF65C9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {CEE8E89D-FC03-4B02-A5AE-C0A7243F74FD} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {7CD9B0D8-3ECB-4FC4-9A93-21046DC0D9FF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {D1AD64D4-DD5E-4C51-AAC4-6C74B57159A7} diff --git a/sdk/src/Services/IoTThingsGraph/Properties/AssemblyInfo.cs b/sdk/src/Services/IoTThingsGraph/Properties/AssemblyInfo.cs index 654a6b75769a..f5c88a883369 100644 --- a/sdk/src/Services/IoTThingsGraph/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/IoTThingsGraph/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/IoTTwinMaker/Generated/AmazonIoTTwinMakerConfig.cs b/sdk/src/Services/IoTTwinMaker/Generated/AmazonIoTTwinMakerConfig.cs index 9b1e992e47df..e0bd079c71b3 100644 --- a/sdk/src/Services/IoTTwinMaker/Generated/AmazonIoTTwinMakerConfig.cs +++ b/sdk/src/Services/IoTTwinMaker/Generated/AmazonIoTTwinMakerConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.IoTTwinMaker public partial class AmazonIoTTwinMakerConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("IoTTwinMaker", "4.0.0.0"); private static readonly AmazonIoTTwinMakerEndpointResolver EndpointResolver = new AmazonIoTTwinMakerEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("IoTTwinMaker", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("IoTTwinMaker", "3.7.400.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/IoTTwinMaker/IoTTwinMaker.sln b/sdk/src/Services/IoTTwinMaker/IoTTwinMaker.sln index 766d9fd25936..a76db08fd511 100644 --- a/sdk/src/Services/IoTTwinMaker/IoTTwinMaker.sln +++ b/sdk/src/Services/IoTTwinMaker/IoTTwinMaker.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {43DBE420-0422-4A9B-B160-81A1E0A0BF5B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {43DBE420-0422-4A9B-B160-81A1E0A0BF5B}.Debug|Any CPU.Build.0 = Debug|Any CPU {43DBE420-0422-4A9B-B160-81A1E0A0BF5B}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {DFC0C35B-4FF5-46E1-BEBF-2E4DEAB5D830}.Debug|Any CPU.Build.0 = Debug|Any CPU {DFC0C35B-4FF5-46E1-BEBF-2E4DEAB5D830}.Release|Any CPU.ActiveCfg = Release|Any CPU {DFC0C35B-4FF5-46E1-BEBF-2E4DEAB5D830}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {BB42E5E0-F2F0-4689-9058-5D2D62031DE1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BB42E5E0-F2F0-4689-9058-5D2D62031DE1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BB42E5E0-F2F0-4689-9058-5D2D62031DE1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BB42E5E0-F2F0-4689-9058-5D2D62031DE1}.Release|Any CPU.Build.0 = Release|Any CPU - {B334E9F2-285D-4221-AEB0-C5E0FAAAB14F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B334E9F2-285D-4221-AEB0-C5E0FAAAB14F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B334E9F2-285D-4221-AEB0-C5E0FAAAB14F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B334E9F2-285D-4221-AEB0-C5E0FAAAB14F}.Release|Any CPU.Build.0 = Release|Any CPU - {92FABFAA-209D-456C-894D-BF9BD44B5AD3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {92FABFAA-209D-456C-894D-BF9BD44B5AD3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {92FABFAA-209D-456C-894D-BF9BD44B5AD3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {92FABFAA-209D-456C-894D-BF9BD44B5AD3}.Release|Any CPU.Build.0 = Release|Any CPU - {C881C1E9-D08D-412C-A1DB-F0F1B5AF826C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C881C1E9-D08D-412C-A1DB-F0F1B5AF826C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C881C1E9-D08D-412C-A1DB-F0F1B5AF826C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C881C1E9-D08D-412C-A1DB-F0F1B5AF826C}.Release|Any CPU.Build.0 = Release|Any CPU - {FD32020C-6E40-44B7-A969-4FD1CE4FE11F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FD32020C-6E40-44B7-A969-4FD1CE4FE11F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FD32020C-6E40-44B7-A969-4FD1CE4FE11F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FD32020C-6E40-44B7-A969-4FD1CE4FE11F}.Release|Any CPU.Build.0 = Release|Any CPU - {05012707-04BC-4C16-AB8D-AE57BFE62D8F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {05012707-04BC-4C16-AB8D-AE57BFE62D8F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {05012707-04BC-4C16-AB8D-AE57BFE62D8F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {05012707-04BC-4C16-AB8D-AE57BFE62D8F}.Release|Any CPU.Build.0 = Release|Any CPU - {3862516A-379A-4382-BCFE-E376CAD0F6A5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3862516A-379A-4382-BCFE-E376CAD0F6A5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3862516A-379A-4382-BCFE-E376CAD0F6A5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3862516A-379A-4382-BCFE-E376CAD0F6A5}.Release|Any CPU.Build.0 = Release|Any CPU - {C8279A99-E369-4733-BE47-97ABF0132FF7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C8279A99-E369-4733-BE47-97ABF0132FF7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C8279A99-E369-4733-BE47-97ABF0132FF7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C8279A99-E369-4733-BE47-97ABF0132FF7}.Release|Any CPU.Build.0 = Release|Any CPU - {0C2F69CF-F6DD-4676-ACDF-E20C965F4CA5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0C2F69CF-F6DD-4676-ACDF-E20C965F4CA5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0C2F69CF-F6DD-4676-ACDF-E20C965F4CA5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0C2F69CF-F6DD-4676-ACDF-E20C965F4CA5}.Release|Any CPU.Build.0 = Release|Any CPU - {C53100F3-BC09-407F-AFC9-945E72A6EC3D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C53100F3-BC09-407F-AFC9-945E72A6EC3D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C53100F3-BC09-407F-AFC9-945E72A6EC3D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C53100F3-BC09-407F-AFC9-945E72A6EC3D}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {BB42E5E0-F2F0-4689-9058-5D2D62031DE1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BB42E5E0-F2F0-4689-9058-5D2D62031DE1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BB42E5E0-F2F0-4689-9058-5D2D62031DE1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BB42E5E0-F2F0-4689-9058-5D2D62031DE1}.Release|Any CPU.Build.0 = Release|Any CPU - {B334E9F2-285D-4221-AEB0-C5E0FAAAB14F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B334E9F2-285D-4221-AEB0-C5E0FAAAB14F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B334E9F2-285D-4221-AEB0-C5E0FAAAB14F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B334E9F2-285D-4221-AEB0-C5E0FAAAB14F}.Release|Any CPU.Build.0 = Release|Any CPU - {92FABFAA-209D-456C-894D-BF9BD44B5AD3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {92FABFAA-209D-456C-894D-BF9BD44B5AD3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {92FABFAA-209D-456C-894D-BF9BD44B5AD3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {92FABFAA-209D-456C-894D-BF9BD44B5AD3}.Release|Any CPU.Build.0 = Release|Any CPU - {C881C1E9-D08D-412C-A1DB-F0F1B5AF826C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C881C1E9-D08D-412C-A1DB-F0F1B5AF826C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C881C1E9-D08D-412C-A1DB-F0F1B5AF826C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C881C1E9-D08D-412C-A1DB-F0F1B5AF826C}.Release|Any CPU.Build.0 = Release|Any CPU - {FD32020C-6E40-44B7-A969-4FD1CE4FE11F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FD32020C-6E40-44B7-A969-4FD1CE4FE11F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FD32020C-6E40-44B7-A969-4FD1CE4FE11F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FD32020C-6E40-44B7-A969-4FD1CE4FE11F}.Release|Any CPU.Build.0 = Release|Any CPU - {05012707-04BC-4C16-AB8D-AE57BFE62D8F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {05012707-04BC-4C16-AB8D-AE57BFE62D8F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {05012707-04BC-4C16-AB8D-AE57BFE62D8F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {05012707-04BC-4C16-AB8D-AE57BFE62D8F}.Release|Any CPU.Build.0 = Release|Any CPU - {3862516A-379A-4382-BCFE-E376CAD0F6A5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3862516A-379A-4382-BCFE-E376CAD0F6A5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3862516A-379A-4382-BCFE-E376CAD0F6A5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3862516A-379A-4382-BCFE-E376CAD0F6A5}.Release|Any CPU.Build.0 = Release|Any CPU - {C8279A99-E369-4733-BE47-97ABF0132FF7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C8279A99-E369-4733-BE47-97ABF0132FF7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C8279A99-E369-4733-BE47-97ABF0132FF7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C8279A99-E369-4733-BE47-97ABF0132FF7}.Release|Any CPU.Build.0 = Release|Any CPU - {0C2F69CF-F6DD-4676-ACDF-E20C965F4CA5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0C2F69CF-F6DD-4676-ACDF-E20C965F4CA5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0C2F69CF-F6DD-4676-ACDF-E20C965F4CA5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0C2F69CF-F6DD-4676-ACDF-E20C965F4CA5}.Release|Any CPU.Build.0 = Release|Any CPU - {C53100F3-BC09-407F-AFC9-945E72A6EC3D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C53100F3-BC09-407F-AFC9-945E72A6EC3D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C53100F3-BC09-407F-AFC9-945E72A6EC3D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C53100F3-BC09-407F-AFC9-945E72A6EC3D}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {43DBE420-0422-4A9B-B160-81A1E0A0BF5B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {0A6AC441-739A-4BE8-A38E-812BF4C653AE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {CA5E3EF1-0F2F-452E-B10E-EC6D64D7BA6F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {F33B69DE-BAF7-4E9F-A668-C2DC4896B894} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {DFC0C35B-4FF5-46E1-BEBF-2E4DEAB5D830} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {BB42E5E0-F2F0-4689-9058-5D2D62031DE1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B334E9F2-285D-4221-AEB0-C5E0FAAAB14F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {92FABFAA-209D-456C-894D-BF9BD44B5AD3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C881C1E9-D08D-412C-A1DB-F0F1B5AF826C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {FD32020C-6E40-44B7-A969-4FD1CE4FE11F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {05012707-04BC-4C16-AB8D-AE57BFE62D8F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {3862516A-379A-4382-BCFE-E376CAD0F6A5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C8279A99-E369-4733-BE47-97ABF0132FF7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0C2F69CF-F6DD-4676-ACDF-E20C965F4CA5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C53100F3-BC09-407F-AFC9-945E72A6EC3D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {BB42E5E0-F2F0-4689-9058-5D2D62031DE1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B334E9F2-285D-4221-AEB0-C5E0FAAAB14F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {92FABFAA-209D-456C-894D-BF9BD44B5AD3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C881C1E9-D08D-412C-A1DB-F0F1B5AF826C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {FD32020C-6E40-44B7-A969-4FD1CE4FE11F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {05012707-04BC-4C16-AB8D-AE57BFE62D8F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {3862516A-379A-4382-BCFE-E376CAD0F6A5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C8279A99-E369-4733-BE47-97ABF0132FF7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0C2F69CF-F6DD-4676-ACDF-E20C965F4CA5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C53100F3-BC09-407F-AFC9-945E72A6EC3D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {0A8A5085-8F8C-4BD8-9693-9BCEC2488A86} diff --git a/sdk/src/Services/IoTTwinMaker/Properties/AssemblyInfo.cs b/sdk/src/Services/IoTTwinMaker/Properties/AssemblyInfo.cs index 006d2890c554..ef66f0e84ccb 100644 --- a/sdk/src/Services/IoTTwinMaker/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/IoTTwinMaker/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/IoTWireless/Generated/AmazonIoTWirelessConfig.cs b/sdk/src/Services/IoTWireless/Generated/AmazonIoTWirelessConfig.cs index 805564e5a3be..73eb0772e8c9 100644 --- a/sdk/src/Services/IoTWireless/Generated/AmazonIoTWirelessConfig.cs +++ b/sdk/src/Services/IoTWireless/Generated/AmazonIoTWirelessConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.IoTWireless public partial class AmazonIoTWirelessConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("IoT Wireless", "4.0.0.0"); private static readonly AmazonIoTWirelessEndpointResolver EndpointResolver = new AmazonIoTWirelessEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("IoT Wireless", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("IoT Wireless", "3.7.401.2"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/IoTWireless/Generated/Model/Internal/MarshallTransformations/CreateFuotaTaskRequestMarshaller.cs b/sdk/src/Services/IoTWireless/Generated/Model/Internal/MarshallTransformations/CreateFuotaTaskRequestMarshaller.cs index 7d3831b05935..8eca3df8d14e 100644 --- a/sdk/src/Services/IoTWireless/Generated/Model/Internal/MarshallTransformations/CreateFuotaTaskRequestMarshaller.cs +++ b/sdk/src/Services/IoTWireless/Generated/Model/Internal/MarshallTransformations/CreateFuotaTaskRequestMarshaller.cs @@ -65,7 +65,6 @@ public IRequest Marshall(CreateFuotaTaskRequest publicRequest) { using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) { -<<<<<<< HEAD JsonWriter writer = new JsonWriter(streamWriter); writer.Validate = false; writer.WriteObjectStart(); @@ -75,55 +74,6 @@ public IRequest Marshall(CreateFuotaTaskRequest publicRequest) context.Writer.WritePropertyName("ClientRequestToken"); context.Writer.Write(publicRequest.ClientRequestToken); } -||||||| Commit version number update changes - context.Writer.WritePropertyName("ClientRequestToken"); - context.Writer.Write(publicRequest.ClientRequestToken); - } - - else if(!(publicRequest.IsSetClientRequestToken())) - { - context.Writer.WritePropertyName("ClientRequestToken"); - context.Writer.Write(Guid.NewGuid().ToString()); - } - if(publicRequest.IsSetDescription()) - { - context.Writer.WritePropertyName("Description"); - context.Writer.Write(publicRequest.Description); - } - - if(publicRequest.IsSetFirmwareUpdateImage()) - { - context.Writer.WritePropertyName("FirmwareUpdateImage"); - context.Writer.Write(publicRequest.FirmwareUpdateImage); - } -======= - context.Writer.WritePropertyName("ClientRequestToken"); - context.Writer.Write(publicRequest.ClientRequestToken); - } - - else if(!(publicRequest.IsSetClientRequestToken())) - { - context.Writer.WritePropertyName("ClientRequestToken"); - context.Writer.Write(Guid.NewGuid().ToString()); - } - if(publicRequest.IsSetDescription()) - { - context.Writer.WritePropertyName("Description"); - context.Writer.Write(publicRequest.Description); - } - - if(publicRequest.IsSetDescriptor()) - { - context.Writer.WritePropertyName("Descriptor"); - context.Writer.Write(publicRequest.Descriptor); - } - - if(publicRequest.IsSetFirmwareUpdateImage()) - { - context.Writer.WritePropertyName("FirmwareUpdateImage"); - context.Writer.Write(publicRequest.FirmwareUpdateImage); - } ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b else if(!(publicRequest.IsSetClientRequestToken())) { @@ -136,6 +86,12 @@ public IRequest Marshall(CreateFuotaTaskRequest publicRequest) context.Writer.Write(publicRequest.Description); } + if(publicRequest.IsSetDescriptor()) + { + context.Writer.WritePropertyName("Descriptor"); + context.Writer.Write(publicRequest.Descriptor); + } + if(publicRequest.IsSetFirmwareUpdateImage()) { context.Writer.WritePropertyName("FirmwareUpdateImage"); diff --git a/sdk/src/Services/IoTWireless/Generated/Model/Internal/MarshallTransformations/ParticipatingGatewaysMulticastMarshaller.cs b/sdk/src/Services/IoTWireless/Generated/Model/Internal/MarshallTransformations/ParticipatingGatewaysMulticastMarshaller.cs index 629b0eedfbbf..b750f27d4cdf 100644 --- a/sdk/src/Services/IoTWireless/Generated/Model/Internal/MarshallTransformations/ParticipatingGatewaysMulticastMarshaller.cs +++ b/sdk/src/Services/IoTWireless/Generated/Model/Internal/MarshallTransformations/ParticipatingGatewaysMulticastMarshaller.cs @@ -62,7 +62,7 @@ public void Marshall(ParticipatingGatewaysMulticast requestObject, JsonMarshalle if(requestObject.IsSetTransmissionInterval()) { context.Writer.WritePropertyName("TransmissionInterval"); - context.Writer.Write(requestObject.TransmissionInterval); + context.Writer.Write(requestObject.TransmissionInterval.Value); } } diff --git a/sdk/src/Services/IoTWireless/Generated/Model/Internal/MarshallTransformations/ParticipatingGatewaysMulticastUnmarshaller.cs b/sdk/src/Services/IoTWireless/Generated/Model/Internal/MarshallTransformations/ParticipatingGatewaysMulticastUnmarshaller.cs index 00a8d1013430..b38f187db032 100644 --- a/sdk/src/Services/IoTWireless/Generated/Model/Internal/MarshallTransformations/ParticipatingGatewaysMulticastUnmarshaller.cs +++ b/sdk/src/Services/IoTWireless/Generated/Model/Internal/MarshallTransformations/ParticipatingGatewaysMulticastUnmarshaller.cs @@ -74,7 +74,7 @@ public ParticipatingGatewaysMulticast Unmarshall(JsonUnmarshallerContext context } if (context.TestExpression("TransmissionInterval", targetDepth)) { - var unmarshaller = IntUnmarshaller.Instance; + var unmarshaller = NullableIntUnmarshaller.Instance; unmarshalledObject.TransmissionInterval = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/IoTWireless/Generated/Model/Internal/MarshallTransformations/UpdateFuotaTaskRequestMarshaller.cs b/sdk/src/Services/IoTWireless/Generated/Model/Internal/MarshallTransformations/UpdateFuotaTaskRequestMarshaller.cs index 3780d9b4c025..43160161c953 100644 --- a/sdk/src/Services/IoTWireless/Generated/Model/Internal/MarshallTransformations/UpdateFuotaTaskRequestMarshaller.cs +++ b/sdk/src/Services/IoTWireless/Generated/Model/Internal/MarshallTransformations/UpdateFuotaTaskRequestMarshaller.cs @@ -78,6 +78,12 @@ public IRequest Marshall(UpdateFuotaTaskRequest publicRequest) context.Writer.Write(publicRequest.Description); } + if(publicRequest.IsSetDescriptor()) + { + context.Writer.WritePropertyName("Descriptor"); + context.Writer.Write(publicRequest.Descriptor); + } + if(publicRequest.IsSetFirmwareUpdateImage()) { context.Writer.WritePropertyName("FirmwareUpdateImage"); @@ -128,117 +134,7 @@ public IRequest Marshall(UpdateFuotaTaskRequest publicRequest) writer.WriteObjectEnd(); } -<<<<<<< HEAD request.Content = memoryStream.ToArray(); -||||||| Commit version number update changes - if(publicRequest.IsSetFirmwareUpdateImage()) - { - context.Writer.WritePropertyName("FirmwareUpdateImage"); - context.Writer.Write(publicRequest.FirmwareUpdateImage); - } - - if(publicRequest.IsSetFirmwareUpdateRole()) - { - context.Writer.WritePropertyName("FirmwareUpdateRole"); - context.Writer.Write(publicRequest.FirmwareUpdateRole); - } - - if(publicRequest.IsSetFragmentIntervalMS()) - { - context.Writer.WritePropertyName("FragmentIntervalMS"); - context.Writer.Write(publicRequest.FragmentIntervalMS); - } - - if(publicRequest.IsSetFragmentSizeBytes()) - { - context.Writer.WritePropertyName("FragmentSizeBytes"); - context.Writer.Write(publicRequest.FragmentSizeBytes); - } - - if(publicRequest.IsSetLoRaWAN()) - { - context.Writer.WritePropertyName("LoRaWAN"); - context.Writer.WriteObjectStart(); - - var marshaller = LoRaWANFuotaTaskMarshaller.Instance; - marshaller.Marshall(publicRequest.LoRaWAN, context); - - context.Writer.WriteObjectEnd(); - } - - if(publicRequest.IsSetName()) - { - context.Writer.WritePropertyName("Name"); - context.Writer.Write(publicRequest.Name); - } - - if(publicRequest.IsSetRedundancyPercent()) - { - context.Writer.WritePropertyName("RedundancyPercent"); - context.Writer.Write(publicRequest.RedundancyPercent); - } - - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); -======= - if(publicRequest.IsSetDescriptor()) - { - context.Writer.WritePropertyName("Descriptor"); - context.Writer.Write(publicRequest.Descriptor); - } - - if(publicRequest.IsSetFirmwareUpdateImage()) - { - context.Writer.WritePropertyName("FirmwareUpdateImage"); - context.Writer.Write(publicRequest.FirmwareUpdateImage); - } - - if(publicRequest.IsSetFirmwareUpdateRole()) - { - context.Writer.WritePropertyName("FirmwareUpdateRole"); - context.Writer.Write(publicRequest.FirmwareUpdateRole); - } - - if(publicRequest.IsSetFragmentIntervalMS()) - { - context.Writer.WritePropertyName("FragmentIntervalMS"); - context.Writer.Write(publicRequest.FragmentIntervalMS); - } - - if(publicRequest.IsSetFragmentSizeBytes()) - { - context.Writer.WritePropertyName("FragmentSizeBytes"); - context.Writer.Write(publicRequest.FragmentSizeBytes); - } - - if(publicRequest.IsSetLoRaWAN()) - { - context.Writer.WritePropertyName("LoRaWAN"); - context.Writer.WriteObjectStart(); - - var marshaller = LoRaWANFuotaTaskMarshaller.Instance; - marshaller.Marshall(publicRequest.LoRaWAN, context); - - context.Writer.WriteObjectEnd(); - } - - if(publicRequest.IsSetName()) - { - context.Writer.WritePropertyName("Name"); - context.Writer.Write(publicRequest.Name); - } - - if(publicRequest.IsSetRedundancyPercent()) - { - context.Writer.WritePropertyName("RedundancyPercent"); - context.Writer.Write(publicRequest.RedundancyPercent); - } - - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b } diff --git a/sdk/src/Services/IoTWireless/Generated/Model/Internal/MarshallTransformations/UpdateLogLevelsByResourceTypesRequestMarshaller.cs b/sdk/src/Services/IoTWireless/Generated/Model/Internal/MarshallTransformations/UpdateLogLevelsByResourceTypesRequestMarshaller.cs index 0a117896d6f4..7e2e9a2c83ef 100644 --- a/sdk/src/Services/IoTWireless/Generated/Model/Internal/MarshallTransformations/UpdateLogLevelsByResourceTypesRequestMarshaller.cs +++ b/sdk/src/Services/IoTWireless/Generated/Model/Internal/MarshallTransformations/UpdateLogLevelsByResourceTypesRequestMarshaller.cs @@ -65,52 +65,30 @@ public IRequest Marshall(UpdateLogLevelsByResourceTypesRequest publicRequest) { using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) { -<<<<<<< HEAD JsonWriter writer = new JsonWriter(streamWriter); writer.Validate = false; writer.WriteObjectStart(); var context = new JsonMarshallerContext(request, writer); if(publicRequest.IsSetDefaultLogLevel()) -||||||| Commit version number update changes - context.Writer.WritePropertyName("DefaultLogLevel"); - context.Writer.Write(publicRequest.DefaultLogLevel); - } - - if(publicRequest.IsSetWirelessDeviceLogOptions()) - { - context.Writer.WritePropertyName("WirelessDeviceLogOptions"); - context.Writer.WriteArrayStart(); - foreach(var publicRequestWirelessDeviceLogOptionsListValue in publicRequest.WirelessDeviceLogOptions) -======= - context.Writer.WritePropertyName("DefaultLogLevel"); - context.Writer.Write(publicRequest.DefaultLogLevel); - } - - if(publicRequest.IsSetFuotaTaskLogOptions()) - { - context.Writer.WritePropertyName("FuotaTaskLogOptions"); - context.Writer.WriteArrayStart(); - foreach(var publicRequestFuotaTaskLogOptionsListValue in publicRequest.FuotaTaskLogOptions) { - context.Writer.WriteObjectStart(); - - var marshaller = FuotaTaskLogOptionMarshaller.Instance; - marshaller.Marshall(publicRequestFuotaTaskLogOptionsListValue, context); - - context.Writer.WriteObjectEnd(); + context.Writer.WritePropertyName("DefaultLogLevel"); + context.Writer.Write(publicRequest.DefaultLogLevel); } - context.Writer.WriteArrayEnd(); - } - if(publicRequest.IsSetWirelessDeviceLogOptions()) - { - context.Writer.WritePropertyName("WirelessDeviceLogOptions"); - context.Writer.WriteArrayStart(); - foreach(var publicRequestWirelessDeviceLogOptionsListValue in publicRequest.WirelessDeviceLogOptions) ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b + if(publicRequest.IsSetFuotaTaskLogOptions()) { - context.Writer.WritePropertyName("DefaultLogLevel"); - context.Writer.Write(publicRequest.DefaultLogLevel); + context.Writer.WritePropertyName("FuotaTaskLogOptions"); + context.Writer.WriteArrayStart(); + foreach(var publicRequestFuotaTaskLogOptionsListValue in publicRequest.FuotaTaskLogOptions) + { + context.Writer.WriteObjectStart(); + + var marshaller = FuotaTaskLogOptionMarshaller.Instance; + marshaller.Marshall(publicRequestFuotaTaskLogOptionsListValue, context); + + context.Writer.WriteObjectEnd(); + } + context.Writer.WriteArrayEnd(); } if(publicRequest.IsSetWirelessDeviceLogOptions()) diff --git a/sdk/src/Services/IoTWireless/Generated/Model/ParticipatingGatewaysMulticast.cs b/sdk/src/Services/IoTWireless/Generated/Model/ParticipatingGatewaysMulticast.cs index 7f8abcad79ee..953d1aea5466 100644 --- a/sdk/src/Services/IoTWireless/Generated/Model/ParticipatingGatewaysMulticast.cs +++ b/sdk/src/Services/IoTWireless/Generated/Model/ParticipatingGatewaysMulticast.cs @@ -69,9 +69,9 @@ internal bool IsSetGatewayList() /// /// [AWSProperty(Min=0, Max=60000)] - public int TransmissionInterval + public int? TransmissionInterval { - get { return this._transmissionInterval.GetValueOrDefault(); } + get { return this._transmissionInterval; } set { this._transmissionInterval = value; } } diff --git a/sdk/src/Services/IoTWireless/Generated/_bcl/AmazonIoTWirelessClient.cs b/sdk/src/Services/IoTWireless/Generated/_bcl/AmazonIoTWirelessClient.cs index 8f00cbfb6255..0a67b9a60610 100644 --- a/sdk/src/Services/IoTWireless/Generated/_bcl/AmazonIoTWirelessClient.cs +++ b/sdk/src/Services/IoTWireless/Generated/_bcl/AmazonIoTWirelessClient.cs @@ -4315,7 +4315,7 @@ public virtual GetResourceEventConfigurationResponse GetResourceEventConfigurati /// /// Fetches the log-level override, if any, for a given resource-ID and resource-type. - /// It can be used for a wireless device or a wireless gateway. + /// It can be used for a wireless device, wireless gateway or fuota task. /// /// Container for the necessary parameters to execute the GetResourceLogLevel service method. /// @@ -4348,7 +4348,7 @@ public virtual GetResourceLogLevelResponse GetResourceLogLevel(GetResourceLogLev /// /// Fetches the log-level override, if any, for a given resource-ID and resource-type. - /// It can be used for a wireless device or a wireless gateway. + /// It can be used for a wireless device, wireless gateway or fuota task. /// /// Container for the necessary parameters to execute the GetResourceLogLevel service method. /// @@ -6576,8 +6576,8 @@ public virtual PutResourceLogLevelResponse PutResourceLogLevel(PutResourceLogLev /// - /// Removes the log-level overrides for all resources; both wireless devices and wireless - /// gateways. + /// Removes the log-level overrides for all resources; wireless devices, wireless gateways, + /// and fuota tasks. /// /// Container for the necessary parameters to execute the ResetAllResourceLogLevels service method. /// @@ -6609,8 +6609,8 @@ public virtual ResetAllResourceLogLevelsResponse ResetAllResourceLogLevels(Reset /// - /// Removes the log-level overrides for all resources; both wireless devices and wireless - /// gateways. + /// Removes the log-level overrides for all resources; wireless devices, wireless gateways, + /// and fuota tasks. /// /// Container for the necessary parameters to execute the ResetAllResourceLogLevels service method. /// @@ -6650,7 +6650,7 @@ public virtual ResetAllResourceLogLevelsResponse ResetAllResourceLogLevels(Reset /// /// Removes the log-level override, if any, for a specific resource-ID and resource-type. - /// It can be used for a wireless device or a wireless gateway. + /// It can be used for a wireless device, a wireless gateway, or a fuota task. /// /// Container for the necessary parameters to execute the ResetResourceLogLevel service method. /// @@ -6683,7 +6683,7 @@ public virtual ResetResourceLogLevelResponse ResetResourceLogLevel(ResetResource /// /// Removes the log-level override, if any, for a specific resource-ID and resource-type. - /// It can be used for a wireless device or a wireless gateway. + /// It can be used for a wireless device, a wireless gateway, or a fuota task. /// /// Container for the necessary parameters to execute the ResetResourceLogLevel service method. /// diff --git a/sdk/src/Services/IoTWireless/IoTWireless.sln b/sdk/src/Services/IoTWireless/IoTWireless.sln index 54f3efde2ba7..d0c6b3d37267 100644 --- a/sdk/src/Services/IoTWireless/IoTWireless.sln +++ b/sdk/src/Services/IoTWireless/IoTWireless.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {FDABE62D-6ED5-42FF-A638-E786D6A6F13D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {FDABE62D-6ED5-42FF-A638-E786D6A6F13D}.Debug|Any CPU.Build.0 = Debug|Any CPU {FDABE62D-6ED5-42FF-A638-E786D6A6F13D}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {D6C7C29B-1C0F-46CC-AA3B-72CC2C866644}.Debug|Any CPU.Build.0 = Debug|Any CPU {D6C7C29B-1C0F-46CC-AA3B-72CC2C866644}.Release|Any CPU.ActiveCfg = Release|Any CPU {D6C7C29B-1C0F-46CC-AA3B-72CC2C866644}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {DA8DF7EC-5D34-4804-9EB4-A061B6A2F7CC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DA8DF7EC-5D34-4804-9EB4-A061B6A2F7CC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DA8DF7EC-5D34-4804-9EB4-A061B6A2F7CC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DA8DF7EC-5D34-4804-9EB4-A061B6A2F7CC}.Release|Any CPU.Build.0 = Release|Any CPU - {B4FB7129-2683-41CA-98FB-3BD712E14645}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B4FB7129-2683-41CA-98FB-3BD712E14645}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B4FB7129-2683-41CA-98FB-3BD712E14645}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B4FB7129-2683-41CA-98FB-3BD712E14645}.Release|Any CPU.Build.0 = Release|Any CPU - {1134A15B-9993-4F1F-9899-CE1E539E8677}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1134A15B-9993-4F1F-9899-CE1E539E8677}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1134A15B-9993-4F1F-9899-CE1E539E8677}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1134A15B-9993-4F1F-9899-CE1E539E8677}.Release|Any CPU.Build.0 = Release|Any CPU - {D07A349F-EFA1-460D-89F2-6468D9CB478F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D07A349F-EFA1-460D-89F2-6468D9CB478F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D07A349F-EFA1-460D-89F2-6468D9CB478F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D07A349F-EFA1-460D-89F2-6468D9CB478F}.Release|Any CPU.Build.0 = Release|Any CPU - {4AAACA96-647A-48A0-B277-7220FEA9C7E8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4AAACA96-647A-48A0-B277-7220FEA9C7E8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4AAACA96-647A-48A0-B277-7220FEA9C7E8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4AAACA96-647A-48A0-B277-7220FEA9C7E8}.Release|Any CPU.Build.0 = Release|Any CPU - {935934CF-505E-407C-8ACE-F4B5379283D0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {935934CF-505E-407C-8ACE-F4B5379283D0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {935934CF-505E-407C-8ACE-F4B5379283D0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {935934CF-505E-407C-8ACE-F4B5379283D0}.Release|Any CPU.Build.0 = Release|Any CPU - {4DE2EEE7-BDDF-41AC-A1D4-DF915EDBB83C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4DE2EEE7-BDDF-41AC-A1D4-DF915EDBB83C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4DE2EEE7-BDDF-41AC-A1D4-DF915EDBB83C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4DE2EEE7-BDDF-41AC-A1D4-DF915EDBB83C}.Release|Any CPU.Build.0 = Release|Any CPU - {45ECB63C-EFC6-469D-9241-86A28BA6B4EA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {45ECB63C-EFC6-469D-9241-86A28BA6B4EA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {45ECB63C-EFC6-469D-9241-86A28BA6B4EA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {45ECB63C-EFC6-469D-9241-86A28BA6B4EA}.Release|Any CPU.Build.0 = Release|Any CPU - {7CD18E0B-D0C7-4482-9A0B-CB968BCC06F6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7CD18E0B-D0C7-4482-9A0B-CB968BCC06F6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7CD18E0B-D0C7-4482-9A0B-CB968BCC06F6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7CD18E0B-D0C7-4482-9A0B-CB968BCC06F6}.Release|Any CPU.Build.0 = Release|Any CPU - {DACDFBA4-D65B-4764-BC54-FB43200831D0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DACDFBA4-D65B-4764-BC54-FB43200831D0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DACDFBA4-D65B-4764-BC54-FB43200831D0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DACDFBA4-D65B-4764-BC54-FB43200831D0}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {DA8DF7EC-5D34-4804-9EB4-A061B6A2F7CC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DA8DF7EC-5D34-4804-9EB4-A061B6A2F7CC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DA8DF7EC-5D34-4804-9EB4-A061B6A2F7CC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DA8DF7EC-5D34-4804-9EB4-A061B6A2F7CC}.Release|Any CPU.Build.0 = Release|Any CPU - {B4FB7129-2683-41CA-98FB-3BD712E14645}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B4FB7129-2683-41CA-98FB-3BD712E14645}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B4FB7129-2683-41CA-98FB-3BD712E14645}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B4FB7129-2683-41CA-98FB-3BD712E14645}.Release|Any CPU.Build.0 = Release|Any CPU - {1134A15B-9993-4F1F-9899-CE1E539E8677}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1134A15B-9993-4F1F-9899-CE1E539E8677}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1134A15B-9993-4F1F-9899-CE1E539E8677}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1134A15B-9993-4F1F-9899-CE1E539E8677}.Release|Any CPU.Build.0 = Release|Any CPU - {D07A349F-EFA1-460D-89F2-6468D9CB478F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D07A349F-EFA1-460D-89F2-6468D9CB478F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D07A349F-EFA1-460D-89F2-6468D9CB478F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D07A349F-EFA1-460D-89F2-6468D9CB478F}.Release|Any CPU.Build.0 = Release|Any CPU - {4AAACA96-647A-48A0-B277-7220FEA9C7E8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4AAACA96-647A-48A0-B277-7220FEA9C7E8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4AAACA96-647A-48A0-B277-7220FEA9C7E8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4AAACA96-647A-48A0-B277-7220FEA9C7E8}.Release|Any CPU.Build.0 = Release|Any CPU - {935934CF-505E-407C-8ACE-F4B5379283D0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {935934CF-505E-407C-8ACE-F4B5379283D0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {935934CF-505E-407C-8ACE-F4B5379283D0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {935934CF-505E-407C-8ACE-F4B5379283D0}.Release|Any CPU.Build.0 = Release|Any CPU - {4DE2EEE7-BDDF-41AC-A1D4-DF915EDBB83C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4DE2EEE7-BDDF-41AC-A1D4-DF915EDBB83C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4DE2EEE7-BDDF-41AC-A1D4-DF915EDBB83C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4DE2EEE7-BDDF-41AC-A1D4-DF915EDBB83C}.Release|Any CPU.Build.0 = Release|Any CPU - {45ECB63C-EFC6-469D-9241-86A28BA6B4EA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {45ECB63C-EFC6-469D-9241-86A28BA6B4EA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {45ECB63C-EFC6-469D-9241-86A28BA6B4EA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {45ECB63C-EFC6-469D-9241-86A28BA6B4EA}.Release|Any CPU.Build.0 = Release|Any CPU - {7CD18E0B-D0C7-4482-9A0B-CB968BCC06F6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7CD18E0B-D0C7-4482-9A0B-CB968BCC06F6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7CD18E0B-D0C7-4482-9A0B-CB968BCC06F6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7CD18E0B-D0C7-4482-9A0B-CB968BCC06F6}.Release|Any CPU.Build.0 = Release|Any CPU - {DACDFBA4-D65B-4764-BC54-FB43200831D0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DACDFBA4-D65B-4764-BC54-FB43200831D0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DACDFBA4-D65B-4764-BC54-FB43200831D0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DACDFBA4-D65B-4764-BC54-FB43200831D0}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {FDABE62D-6ED5-42FF-A638-E786D6A6F13D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {9996D3C6-849F-4427-AB22-CB47BF437FE4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {72F1E259-9EFB-4479-A44A-ECED383B52B2} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {882B3DD1-BA30-4A80-93D9-A1D1A9408652} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {D6C7C29B-1C0F-46CC-AA3B-72CC2C866644} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {DA8DF7EC-5D34-4804-9EB4-A061B6A2F7CC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B4FB7129-2683-41CA-98FB-3BD712E14645} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {1134A15B-9993-4F1F-9899-CE1E539E8677} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D07A349F-EFA1-460D-89F2-6468D9CB478F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4AAACA96-647A-48A0-B277-7220FEA9C7E8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {935934CF-505E-407C-8ACE-F4B5379283D0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4DE2EEE7-BDDF-41AC-A1D4-DF915EDBB83C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {45ECB63C-EFC6-469D-9241-86A28BA6B4EA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {7CD18E0B-D0C7-4482-9A0B-CB968BCC06F6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {DACDFBA4-D65B-4764-BC54-FB43200831D0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {DA8DF7EC-5D34-4804-9EB4-A061B6A2F7CC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B4FB7129-2683-41CA-98FB-3BD712E14645} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {1134A15B-9993-4F1F-9899-CE1E539E8677} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D07A349F-EFA1-460D-89F2-6468D9CB478F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4AAACA96-647A-48A0-B277-7220FEA9C7E8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {935934CF-505E-407C-8ACE-F4B5379283D0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4DE2EEE7-BDDF-41AC-A1D4-DF915EDBB83C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {45ECB63C-EFC6-469D-9241-86A28BA6B4EA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {7CD18E0B-D0C7-4482-9A0B-CB968BCC06F6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {DACDFBA4-D65B-4764-BC54-FB43200831D0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {FFFE4679-B284-42F4-B2CF-EEE6C1051F35} diff --git a/sdk/src/Services/IoTWireless/Properties/AssemblyInfo.cs b/sdk/src/Services/IoTWireless/Properties/AssemblyInfo.cs index fa2769e8d66f..ef738b70ac65 100644 --- a/sdk/src/Services/IoTWireless/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/IoTWireless/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.2")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/IotData/Generated/AmazonIotDataConfig.cs b/sdk/src/Services/IotData/Generated/AmazonIotDataConfig.cs index 5b06a9b90695..54ea27312e98 100644 --- a/sdk/src/Services/IotData/Generated/AmazonIotDataConfig.cs +++ b/sdk/src/Services/IotData/Generated/AmazonIotDataConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.IotData public partial class AmazonIotDataConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("IoT Data Plane", "4.0.0.0"); private static readonly AmazonIotDataEndpointResolver EndpointResolver = new AmazonIotDataEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("IoT Data Plane", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("IoT Data Plane", "3.7.401.23"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/IotData/IotData.sln b/sdk/src/Services/IotData/IotData.sln index feeded5a31bd..ce69fce8c8b3 100644 --- a/sdk/src/Services/IotData/IotData.sln +++ b/sdk/src/Services/IotData/IotData.sln @@ -94,7 +94,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {E7E07D9A-DDAE-4D80-A88B-58736C5C3FFA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {E7E07D9A-DDAE-4D80-A88B-58736C5C3FFA}.Debug|Any CPU.Build.0 = Debug|Any CPU {E7E07D9A-DDAE-4D80-A88B-58736C5C3FFA}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -119,113 +126,6 @@ Global {5F7C7409-648B-4748-930F-1377D2B68E82}.Debug|Any CPU.Build.0 = Debug|Any CPU {5F7C7409-648B-4748-930F-1377D2B68E82}.Release|Any CPU.ActiveCfg = Release|Any CPU {5F7C7409-648B-4748-930F-1377D2B68E82}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {B44FE5B1-73E1-4039-AC00-A2636757F78E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B44FE5B1-73E1-4039-AC00-A2636757F78E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B44FE5B1-73E1-4039-AC00-A2636757F78E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B44FE5B1-73E1-4039-AC00-A2636757F78E}.Release|Any CPU.Build.0 = Release|Any CPU - {512EB2E9-1F68-45C6-862E-F6DCC8C4380C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {512EB2E9-1F68-45C6-862E-F6DCC8C4380C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {512EB2E9-1F68-45C6-862E-F6DCC8C4380C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {512EB2E9-1F68-45C6-862E-F6DCC8C4380C}.Release|Any CPU.Build.0 = Release|Any CPU - {74B9D0B3-A4FE-498A-AC04-A0669D70831B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {74B9D0B3-A4FE-498A-AC04-A0669D70831B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {74B9D0B3-A4FE-498A-AC04-A0669D70831B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {74B9D0B3-A4FE-498A-AC04-A0669D70831B}.Release|Any CPU.Build.0 = Release|Any CPU - {2FFAC1FC-517C-42E2-80C6-DD992575A9B1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2FFAC1FC-517C-42E2-80C6-DD992575A9B1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2FFAC1FC-517C-42E2-80C6-DD992575A9B1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2FFAC1FC-517C-42E2-80C6-DD992575A9B1}.Release|Any CPU.Build.0 = Release|Any CPU - {BABC8083-C865-4D42-9AAE-0ACF2A7C56DB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BABC8083-C865-4D42-9AAE-0ACF2A7C56DB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BABC8083-C865-4D42-9AAE-0ACF2A7C56DB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BABC8083-C865-4D42-9AAE-0ACF2A7C56DB}.Release|Any CPU.Build.0 = Release|Any CPU - {98688CB8-D901-4204-A523-FB8EC754307F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {98688CB8-D901-4204-A523-FB8EC754307F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {98688CB8-D901-4204-A523-FB8EC754307F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {98688CB8-D901-4204-A523-FB8EC754307F}.Release|Any CPU.Build.0 = Release|Any CPU - {20070F7A-AA32-45C5-AB15-D22CD0BEF141}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {20070F7A-AA32-45C5-AB15-D22CD0BEF141}.Debug|Any CPU.Build.0 = Debug|Any CPU - {20070F7A-AA32-45C5-AB15-D22CD0BEF141}.Release|Any CPU.ActiveCfg = Release|Any CPU - {20070F7A-AA32-45C5-AB15-D22CD0BEF141}.Release|Any CPU.Build.0 = Release|Any CPU - {42270D5E-B576-4CE4-ABC1-52D70B6B9321}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {42270D5E-B576-4CE4-ABC1-52D70B6B9321}.Debug|Any CPU.Build.0 = Debug|Any CPU - {42270D5E-B576-4CE4-ABC1-52D70B6B9321}.Release|Any CPU.ActiveCfg = Release|Any CPU - {42270D5E-B576-4CE4-ABC1-52D70B6B9321}.Release|Any CPU.Build.0 = Release|Any CPU - {463171AE-628B-4379-9ADD-491ADCCEE232}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {463171AE-628B-4379-9ADD-491ADCCEE232}.Debug|Any CPU.Build.0 = Debug|Any CPU - {463171AE-628B-4379-9ADD-491ADCCEE232}.Release|Any CPU.ActiveCfg = Release|Any CPU - {463171AE-628B-4379-9ADD-491ADCCEE232}.Release|Any CPU.Build.0 = Release|Any CPU - {0ADFA578-B33B-40EB-ACD7-D50C3340476B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0ADFA578-B33B-40EB-ACD7-D50C3340476B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0ADFA578-B33B-40EB-ACD7-D50C3340476B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0ADFA578-B33B-40EB-ACD7-D50C3340476B}.Release|Any CPU.Build.0 = Release|Any CPU - {7500BAC1-10FD-4FBC-A815-5A04CC24AAA9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7500BAC1-10FD-4FBC-A815-5A04CC24AAA9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7500BAC1-10FD-4FBC-A815-5A04CC24AAA9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7500BAC1-10FD-4FBC-A815-5A04CC24AAA9}.Release|Any CPU.Build.0 = Release|Any CPU - {B82200A0-C4D5-497E-9363-349A6DFFD6E1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B82200A0-C4D5-497E-9363-349A6DFFD6E1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B82200A0-C4D5-497E-9363-349A6DFFD6E1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B82200A0-C4D5-497E-9363-349A6DFFD6E1}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {B44FE5B1-73E1-4039-AC00-A2636757F78E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B44FE5B1-73E1-4039-AC00-A2636757F78E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B44FE5B1-73E1-4039-AC00-A2636757F78E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B44FE5B1-73E1-4039-AC00-A2636757F78E}.Release|Any CPU.Build.0 = Release|Any CPU - {512EB2E9-1F68-45C6-862E-F6DCC8C4380C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {512EB2E9-1F68-45C6-862E-F6DCC8C4380C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {512EB2E9-1F68-45C6-862E-F6DCC8C4380C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {512EB2E9-1F68-45C6-862E-F6DCC8C4380C}.Release|Any CPU.Build.0 = Release|Any CPU - {74B9D0B3-A4FE-498A-AC04-A0669D70831B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {74B9D0B3-A4FE-498A-AC04-A0669D70831B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {74B9D0B3-A4FE-498A-AC04-A0669D70831B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {74B9D0B3-A4FE-498A-AC04-A0669D70831B}.Release|Any CPU.Build.0 = Release|Any CPU - {2FFAC1FC-517C-42E2-80C6-DD992575A9B1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2FFAC1FC-517C-42E2-80C6-DD992575A9B1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2FFAC1FC-517C-42E2-80C6-DD992575A9B1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2FFAC1FC-517C-42E2-80C6-DD992575A9B1}.Release|Any CPU.Build.0 = Release|Any CPU - {BABC8083-C865-4D42-9AAE-0ACF2A7C56DB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BABC8083-C865-4D42-9AAE-0ACF2A7C56DB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BABC8083-C865-4D42-9AAE-0ACF2A7C56DB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BABC8083-C865-4D42-9AAE-0ACF2A7C56DB}.Release|Any CPU.Build.0 = Release|Any CPU - {98688CB8-D901-4204-A523-FB8EC754307F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {98688CB8-D901-4204-A523-FB8EC754307F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {98688CB8-D901-4204-A523-FB8EC754307F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {98688CB8-D901-4204-A523-FB8EC754307F}.Release|Any CPU.Build.0 = Release|Any CPU - {20070F7A-AA32-45C5-AB15-D22CD0BEF141}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {20070F7A-AA32-45C5-AB15-D22CD0BEF141}.Debug|Any CPU.Build.0 = Debug|Any CPU - {20070F7A-AA32-45C5-AB15-D22CD0BEF141}.Release|Any CPU.ActiveCfg = Release|Any CPU - {20070F7A-AA32-45C5-AB15-D22CD0BEF141}.Release|Any CPU.Build.0 = Release|Any CPU - {42270D5E-B576-4CE4-ABC1-52D70B6B9321}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {42270D5E-B576-4CE4-ABC1-52D70B6B9321}.Debug|Any CPU.Build.0 = Debug|Any CPU - {42270D5E-B576-4CE4-ABC1-52D70B6B9321}.Release|Any CPU.ActiveCfg = Release|Any CPU - {42270D5E-B576-4CE4-ABC1-52D70B6B9321}.Release|Any CPU.Build.0 = Release|Any CPU - {463171AE-628B-4379-9ADD-491ADCCEE232}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {463171AE-628B-4379-9ADD-491ADCCEE232}.Debug|Any CPU.Build.0 = Debug|Any CPU - {463171AE-628B-4379-9ADD-491ADCCEE232}.Release|Any CPU.ActiveCfg = Release|Any CPU - {463171AE-628B-4379-9ADD-491ADCCEE232}.Release|Any CPU.Build.0 = Release|Any CPU - {0ADFA578-B33B-40EB-ACD7-D50C3340476B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0ADFA578-B33B-40EB-ACD7-D50C3340476B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0ADFA578-B33B-40EB-ACD7-D50C3340476B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0ADFA578-B33B-40EB-ACD7-D50C3340476B}.Release|Any CPU.Build.0 = Release|Any CPU - {7500BAC1-10FD-4FBC-A815-5A04CC24AAA9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7500BAC1-10FD-4FBC-A815-5A04CC24AAA9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7500BAC1-10FD-4FBC-A815-5A04CC24AAA9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7500BAC1-10FD-4FBC-A815-5A04CC24AAA9}.Release|Any CPU.Build.0 = Release|Any CPU - {B82200A0-C4D5-497E-9363-349A6DFFD6E1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B82200A0-C4D5-497E-9363-349A6DFFD6E1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B82200A0-C4D5-497E-9363-349A6DFFD6E1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B82200A0-C4D5-497E-9363-349A6DFFD6E1}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -242,42 +142,14 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {E7E07D9A-DDAE-4D80-A88B-58736C5C3FFA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {CF19A7CC-8158-48DD-8DDB-BDC6E9A24D29} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {D9BC1BAA-3EF2-44FE-94BC-B2480DB66297} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {022AF9A3-E781-4228-8932-7616CF39D685} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {9878FE79-4671-47D1-8E02-8C4C59BB410F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {5F7C7409-648B-4748-930F-1377D2B68E82} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {B44FE5B1-73E1-4039-AC00-A2636757F78E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {512EB2E9-1F68-45C6-862E-F6DCC8C4380C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {74B9D0B3-A4FE-498A-AC04-A0669D70831B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {2FFAC1FC-517C-42E2-80C6-DD992575A9B1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {BABC8083-C865-4D42-9AAE-0ACF2A7C56DB} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {98688CB8-D901-4204-A523-FB8EC754307F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {20070F7A-AA32-45C5-AB15-D22CD0BEF141} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {42270D5E-B576-4CE4-ABC1-52D70B6B9321} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {463171AE-628B-4379-9ADD-491ADCCEE232} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0ADFA578-B33B-40EB-ACD7-D50C3340476B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {7500BAC1-10FD-4FBC-A815-5A04CC24AAA9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B82200A0-C4D5-497E-9363-349A6DFFD6E1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B44FE5B1-73E1-4039-AC00-A2636757F78E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {512EB2E9-1F68-45C6-862E-F6DCC8C4380C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {74B9D0B3-A4FE-498A-AC04-A0669D70831B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {2FFAC1FC-517C-42E2-80C6-DD992575A9B1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {BABC8083-C865-4D42-9AAE-0ACF2A7C56DB} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {98688CB8-D901-4204-A523-FB8EC754307F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {20070F7A-AA32-45C5-AB15-D22CD0BEF141} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {42270D5E-B576-4CE4-ABC1-52D70B6B9321} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {463171AE-628B-4379-9ADD-491ADCCEE232} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0ADFA578-B33B-40EB-ACD7-D50C3340476B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {7500BAC1-10FD-4FBC-A815-5A04CC24AAA9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B82200A0-C4D5-497E-9363-349A6DFFD6E1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {1BBE5AB1-390B-42F4-B756-CEE5ED1E0C4A} diff --git a/sdk/src/Services/IotData/Properties/AssemblyInfo.cs b/sdk/src/Services/IotData/Properties/AssemblyInfo.cs index a3e58acb27fa..d755e97836aa 100644 --- a/sdk/src/Services/IotData/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/IotData/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.23")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/Ivschat/Generated/AmazonIvschatConfig.cs b/sdk/src/Services/Ivschat/Generated/AmazonIvschatConfig.cs index 4f77fb56cdb3..25dea19a5f73 100644 --- a/sdk/src/Services/Ivschat/Generated/AmazonIvschatConfig.cs +++ b/sdk/src/Services/Ivschat/Generated/AmazonIvschatConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.Ivschat public partial class AmazonIvschatConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("ivschat", "4.0.0.0"); private static readonly AmazonIvschatEndpointResolver EndpointResolver = new AmazonIvschatEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("ivschat", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("ivschat", "3.7.400.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/Ivschat/Ivschat.sln b/sdk/src/Services/Ivschat/Ivschat.sln index e9c4043166d8..e2359f2c446d 100644 --- a/sdk/src/Services/Ivschat/Ivschat.sln +++ b/sdk/src/Services/Ivschat/Ivschat.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {62A8C591-D679-49C7-9E79-F9AC5382CD11}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {62A8C591-D679-49C7-9E79-F9AC5382CD11}.Debug|Any CPU.Build.0 = Debug|Any CPU {62A8C591-D679-49C7-9E79-F9AC5382CD11}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {0B0D540E-8BFD-4817-8297-2065C542FEFF}.Debug|Any CPU.Build.0 = Debug|Any CPU {0B0D540E-8BFD-4817-8297-2065C542FEFF}.Release|Any CPU.ActiveCfg = Release|Any CPU {0B0D540E-8BFD-4817-8297-2065C542FEFF}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {72D1DD5A-6FC3-4D27-B5F9-669F5A90E539}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {72D1DD5A-6FC3-4D27-B5F9-669F5A90E539}.Debug|Any CPU.Build.0 = Debug|Any CPU - {72D1DD5A-6FC3-4D27-B5F9-669F5A90E539}.Release|Any CPU.ActiveCfg = Release|Any CPU - {72D1DD5A-6FC3-4D27-B5F9-669F5A90E539}.Release|Any CPU.Build.0 = Release|Any CPU - {A85E7810-20C2-41BD-957A-B3C070FA54DB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A85E7810-20C2-41BD-957A-B3C070FA54DB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A85E7810-20C2-41BD-957A-B3C070FA54DB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A85E7810-20C2-41BD-957A-B3C070FA54DB}.Release|Any CPU.Build.0 = Release|Any CPU - {52F4B44A-8412-43F0-AA1A-1034271BD36A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {52F4B44A-8412-43F0-AA1A-1034271BD36A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {52F4B44A-8412-43F0-AA1A-1034271BD36A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {52F4B44A-8412-43F0-AA1A-1034271BD36A}.Release|Any CPU.Build.0 = Release|Any CPU - {210CE691-9DED-4F29-94BF-770F9FDB9B6A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {210CE691-9DED-4F29-94BF-770F9FDB9B6A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {210CE691-9DED-4F29-94BF-770F9FDB9B6A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {210CE691-9DED-4F29-94BF-770F9FDB9B6A}.Release|Any CPU.Build.0 = Release|Any CPU - {88A86AFA-0D8A-4CE6-987B-F34B3D901372}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {88A86AFA-0D8A-4CE6-987B-F34B3D901372}.Debug|Any CPU.Build.0 = Debug|Any CPU - {88A86AFA-0D8A-4CE6-987B-F34B3D901372}.Release|Any CPU.ActiveCfg = Release|Any CPU - {88A86AFA-0D8A-4CE6-987B-F34B3D901372}.Release|Any CPU.Build.0 = Release|Any CPU - {90AD886B-D710-48A9-BBB7-689B816AEF0A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {90AD886B-D710-48A9-BBB7-689B816AEF0A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {90AD886B-D710-48A9-BBB7-689B816AEF0A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {90AD886B-D710-48A9-BBB7-689B816AEF0A}.Release|Any CPU.Build.0 = Release|Any CPU - {E06ECA40-D1CD-4AA6-8E1C-5734D75054AE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E06ECA40-D1CD-4AA6-8E1C-5734D75054AE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E06ECA40-D1CD-4AA6-8E1C-5734D75054AE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E06ECA40-D1CD-4AA6-8E1C-5734D75054AE}.Release|Any CPU.Build.0 = Release|Any CPU - {D05D37A6-97DF-450C-BA61-F6B1693423F8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D05D37A6-97DF-450C-BA61-F6B1693423F8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D05D37A6-97DF-450C-BA61-F6B1693423F8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D05D37A6-97DF-450C-BA61-F6B1693423F8}.Release|Any CPU.Build.0 = Release|Any CPU - {5802B6C0-AA13-499E-A74F-2FAF0D73543A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5802B6C0-AA13-499E-A74F-2FAF0D73543A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5802B6C0-AA13-499E-A74F-2FAF0D73543A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5802B6C0-AA13-499E-A74F-2FAF0D73543A}.Release|Any CPU.Build.0 = Release|Any CPU - {91F4EC28-41E5-4906-8523-E68002175E7B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {91F4EC28-41E5-4906-8523-E68002175E7B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {91F4EC28-41E5-4906-8523-E68002175E7B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {91F4EC28-41E5-4906-8523-E68002175E7B}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {72D1DD5A-6FC3-4D27-B5F9-669F5A90E539}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {72D1DD5A-6FC3-4D27-B5F9-669F5A90E539}.Debug|Any CPU.Build.0 = Debug|Any CPU - {72D1DD5A-6FC3-4D27-B5F9-669F5A90E539}.Release|Any CPU.ActiveCfg = Release|Any CPU - {72D1DD5A-6FC3-4D27-B5F9-669F5A90E539}.Release|Any CPU.Build.0 = Release|Any CPU - {A85E7810-20C2-41BD-957A-B3C070FA54DB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A85E7810-20C2-41BD-957A-B3C070FA54DB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A85E7810-20C2-41BD-957A-B3C070FA54DB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A85E7810-20C2-41BD-957A-B3C070FA54DB}.Release|Any CPU.Build.0 = Release|Any CPU - {52F4B44A-8412-43F0-AA1A-1034271BD36A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {52F4B44A-8412-43F0-AA1A-1034271BD36A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {52F4B44A-8412-43F0-AA1A-1034271BD36A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {52F4B44A-8412-43F0-AA1A-1034271BD36A}.Release|Any CPU.Build.0 = Release|Any CPU - {210CE691-9DED-4F29-94BF-770F9FDB9B6A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {210CE691-9DED-4F29-94BF-770F9FDB9B6A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {210CE691-9DED-4F29-94BF-770F9FDB9B6A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {210CE691-9DED-4F29-94BF-770F9FDB9B6A}.Release|Any CPU.Build.0 = Release|Any CPU - {88A86AFA-0D8A-4CE6-987B-F34B3D901372}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {88A86AFA-0D8A-4CE6-987B-F34B3D901372}.Debug|Any CPU.Build.0 = Debug|Any CPU - {88A86AFA-0D8A-4CE6-987B-F34B3D901372}.Release|Any CPU.ActiveCfg = Release|Any CPU - {88A86AFA-0D8A-4CE6-987B-F34B3D901372}.Release|Any CPU.Build.0 = Release|Any CPU - {90AD886B-D710-48A9-BBB7-689B816AEF0A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {90AD886B-D710-48A9-BBB7-689B816AEF0A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {90AD886B-D710-48A9-BBB7-689B816AEF0A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {90AD886B-D710-48A9-BBB7-689B816AEF0A}.Release|Any CPU.Build.0 = Release|Any CPU - {E06ECA40-D1CD-4AA6-8E1C-5734D75054AE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E06ECA40-D1CD-4AA6-8E1C-5734D75054AE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E06ECA40-D1CD-4AA6-8E1C-5734D75054AE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E06ECA40-D1CD-4AA6-8E1C-5734D75054AE}.Release|Any CPU.Build.0 = Release|Any CPU - {D05D37A6-97DF-450C-BA61-F6B1693423F8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D05D37A6-97DF-450C-BA61-F6B1693423F8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D05D37A6-97DF-450C-BA61-F6B1693423F8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D05D37A6-97DF-450C-BA61-F6B1693423F8}.Release|Any CPU.Build.0 = Release|Any CPU - {5802B6C0-AA13-499E-A74F-2FAF0D73543A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5802B6C0-AA13-499E-A74F-2FAF0D73543A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5802B6C0-AA13-499E-A74F-2FAF0D73543A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5802B6C0-AA13-499E-A74F-2FAF0D73543A}.Release|Any CPU.Build.0 = Release|Any CPU - {91F4EC28-41E5-4906-8523-E68002175E7B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {91F4EC28-41E5-4906-8523-E68002175E7B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {91F4EC28-41E5-4906-8523-E68002175E7B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {91F4EC28-41E5-4906-8523-E68002175E7B}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {62A8C591-D679-49C7-9E79-F9AC5382CD11} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {80CB4871-EA9F-4C0D-AB2A-486A7E8DCBF1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {929E2ED6-957E-4819-B965-5CF4084D57DD} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {88D19CB9-62AD-4E2A-A902-2E1FE9D0AD3E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {0B0D540E-8BFD-4817-8297-2065C542FEFF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {72D1DD5A-6FC3-4D27-B5F9-669F5A90E539} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A85E7810-20C2-41BD-957A-B3C070FA54DB} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {52F4B44A-8412-43F0-AA1A-1034271BD36A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {210CE691-9DED-4F29-94BF-770F9FDB9B6A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {88A86AFA-0D8A-4CE6-987B-F34B3D901372} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {90AD886B-D710-48A9-BBB7-689B816AEF0A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E06ECA40-D1CD-4AA6-8E1C-5734D75054AE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D05D37A6-97DF-450C-BA61-F6B1693423F8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {5802B6C0-AA13-499E-A74F-2FAF0D73543A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {91F4EC28-41E5-4906-8523-E68002175E7B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {72D1DD5A-6FC3-4D27-B5F9-669F5A90E539} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A85E7810-20C2-41BD-957A-B3C070FA54DB} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {52F4B44A-8412-43F0-AA1A-1034271BD36A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {210CE691-9DED-4F29-94BF-770F9FDB9B6A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {88A86AFA-0D8A-4CE6-987B-F34B3D901372} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {90AD886B-D710-48A9-BBB7-689B816AEF0A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E06ECA40-D1CD-4AA6-8E1C-5734D75054AE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D05D37A6-97DF-450C-BA61-F6B1693423F8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {5802B6C0-AA13-499E-A74F-2FAF0D73543A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {91F4EC28-41E5-4906-8523-E68002175E7B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {711E68F0-7B81-4322-A16D-BBDB39D6A5BE} diff --git a/sdk/src/Services/Ivschat/Properties/AssemblyInfo.cs b/sdk/src/Services/Ivschat/Properties/AssemblyInfo.cs index 839f0f1b49c3..bbddff1c17e8 100644 --- a/sdk/src/Services/Ivschat/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/Ivschat/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/Kafka/Generated/AmazonKafkaConfig.cs b/sdk/src/Services/Kafka/Generated/AmazonKafkaConfig.cs index e1eb0d0edf01..97e07cce7177 100644 --- a/sdk/src/Services/Kafka/Generated/AmazonKafkaConfig.cs +++ b/sdk/src/Services/Kafka/Generated/AmazonKafkaConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.Kafka public partial class AmazonKafkaConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("Kafka", "4.0.0.0"); private static readonly AmazonKafkaEndpointResolver EndpointResolver = new AmazonKafkaEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("Kafka", "3.7.401.9"); -======= - InternalSDKUtils.BuildUserAgentString("Kafka", "3.7.401.36"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/Kafka/Kafka.sln b/sdk/src/Services/Kafka/Kafka.sln index f2ecbab80fee..5da2e8a79419 100644 --- a/sdk/src/Services/Kafka/Kafka.sln +++ b/sdk/src/Services/Kafka/Kafka.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {A0822622-B34D-4F0B-B1B0-A6E81F104742}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {A0822622-B34D-4F0B-B1B0-A6E81F104742}.Debug|Any CPU.Build.0 = Debug|Any CPU {A0822622-B34D-4F0B-B1B0-A6E81F104742}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {7FFD5C3B-E17A-44E7-977F-510A390E1965}.Debug|Any CPU.Build.0 = Debug|Any CPU {7FFD5C3B-E17A-44E7-977F-510A390E1965}.Release|Any CPU.ActiveCfg = Release|Any CPU {7FFD5C3B-E17A-44E7-977F-510A390E1965}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {E4434D69-4190-4C0F-B2EB-96EABF7C874C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E4434D69-4190-4C0F-B2EB-96EABF7C874C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E4434D69-4190-4C0F-B2EB-96EABF7C874C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E4434D69-4190-4C0F-B2EB-96EABF7C874C}.Release|Any CPU.Build.0 = Release|Any CPU - {455161CF-03FD-495A-9374-A9CED75BDA16}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {455161CF-03FD-495A-9374-A9CED75BDA16}.Debug|Any CPU.Build.0 = Debug|Any CPU - {455161CF-03FD-495A-9374-A9CED75BDA16}.Release|Any CPU.ActiveCfg = Release|Any CPU - {455161CF-03FD-495A-9374-A9CED75BDA16}.Release|Any CPU.Build.0 = Release|Any CPU - {BB66754E-5B7E-42CD-B90B-4FCEA8067EFB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BB66754E-5B7E-42CD-B90B-4FCEA8067EFB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BB66754E-5B7E-42CD-B90B-4FCEA8067EFB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BB66754E-5B7E-42CD-B90B-4FCEA8067EFB}.Release|Any CPU.Build.0 = Release|Any CPU - {04BCBE07-FA28-413A-979B-C95DDD7ACD86}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {04BCBE07-FA28-413A-979B-C95DDD7ACD86}.Debug|Any CPU.Build.0 = Debug|Any CPU - {04BCBE07-FA28-413A-979B-C95DDD7ACD86}.Release|Any CPU.ActiveCfg = Release|Any CPU - {04BCBE07-FA28-413A-979B-C95DDD7ACD86}.Release|Any CPU.Build.0 = Release|Any CPU - {914D8EFD-F0BE-4221-BB2E-827149149592}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {914D8EFD-F0BE-4221-BB2E-827149149592}.Debug|Any CPU.Build.0 = Debug|Any CPU - {914D8EFD-F0BE-4221-BB2E-827149149592}.Release|Any CPU.ActiveCfg = Release|Any CPU - {914D8EFD-F0BE-4221-BB2E-827149149592}.Release|Any CPU.Build.0 = Release|Any CPU - {0FBEF111-315E-4D16-B26F-A06EE778F127}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0FBEF111-315E-4D16-B26F-A06EE778F127}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0FBEF111-315E-4D16-B26F-A06EE778F127}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0FBEF111-315E-4D16-B26F-A06EE778F127}.Release|Any CPU.Build.0 = Release|Any CPU - {1D14962D-653B-4F12-8C27-A977F6FE559F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1D14962D-653B-4F12-8C27-A977F6FE559F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1D14962D-653B-4F12-8C27-A977F6FE559F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1D14962D-653B-4F12-8C27-A977F6FE559F}.Release|Any CPU.Build.0 = Release|Any CPU - {F9E17F0F-E13E-4B12-9E4D-EDBBD39A1BEF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F9E17F0F-E13E-4B12-9E4D-EDBBD39A1BEF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F9E17F0F-E13E-4B12-9E4D-EDBBD39A1BEF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F9E17F0F-E13E-4B12-9E4D-EDBBD39A1BEF}.Release|Any CPU.Build.0 = Release|Any CPU - {8DBADBF2-0DCC-4F59-8E9E-DD56F220F5BB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8DBADBF2-0DCC-4F59-8E9E-DD56F220F5BB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8DBADBF2-0DCC-4F59-8E9E-DD56F220F5BB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8DBADBF2-0DCC-4F59-8E9E-DD56F220F5BB}.Release|Any CPU.Build.0 = Release|Any CPU - {E5CCBF6A-7C02-4D70-972E-CF6D34615169}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E5CCBF6A-7C02-4D70-972E-CF6D34615169}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E5CCBF6A-7C02-4D70-972E-CF6D34615169}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E5CCBF6A-7C02-4D70-972E-CF6D34615169}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {E4434D69-4190-4C0F-B2EB-96EABF7C874C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E4434D69-4190-4C0F-B2EB-96EABF7C874C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E4434D69-4190-4C0F-B2EB-96EABF7C874C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E4434D69-4190-4C0F-B2EB-96EABF7C874C}.Release|Any CPU.Build.0 = Release|Any CPU - {455161CF-03FD-495A-9374-A9CED75BDA16}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {455161CF-03FD-495A-9374-A9CED75BDA16}.Debug|Any CPU.Build.0 = Debug|Any CPU - {455161CF-03FD-495A-9374-A9CED75BDA16}.Release|Any CPU.ActiveCfg = Release|Any CPU - {455161CF-03FD-495A-9374-A9CED75BDA16}.Release|Any CPU.Build.0 = Release|Any CPU - {BB66754E-5B7E-42CD-B90B-4FCEA8067EFB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BB66754E-5B7E-42CD-B90B-4FCEA8067EFB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BB66754E-5B7E-42CD-B90B-4FCEA8067EFB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BB66754E-5B7E-42CD-B90B-4FCEA8067EFB}.Release|Any CPU.Build.0 = Release|Any CPU - {04BCBE07-FA28-413A-979B-C95DDD7ACD86}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {04BCBE07-FA28-413A-979B-C95DDD7ACD86}.Debug|Any CPU.Build.0 = Debug|Any CPU - {04BCBE07-FA28-413A-979B-C95DDD7ACD86}.Release|Any CPU.ActiveCfg = Release|Any CPU - {04BCBE07-FA28-413A-979B-C95DDD7ACD86}.Release|Any CPU.Build.0 = Release|Any CPU - {914D8EFD-F0BE-4221-BB2E-827149149592}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {914D8EFD-F0BE-4221-BB2E-827149149592}.Debug|Any CPU.Build.0 = Debug|Any CPU - {914D8EFD-F0BE-4221-BB2E-827149149592}.Release|Any CPU.ActiveCfg = Release|Any CPU - {914D8EFD-F0BE-4221-BB2E-827149149592}.Release|Any CPU.Build.0 = Release|Any CPU - {0FBEF111-315E-4D16-B26F-A06EE778F127}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0FBEF111-315E-4D16-B26F-A06EE778F127}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0FBEF111-315E-4D16-B26F-A06EE778F127}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0FBEF111-315E-4D16-B26F-A06EE778F127}.Release|Any CPU.Build.0 = Release|Any CPU - {1D14962D-653B-4F12-8C27-A977F6FE559F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1D14962D-653B-4F12-8C27-A977F6FE559F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1D14962D-653B-4F12-8C27-A977F6FE559F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1D14962D-653B-4F12-8C27-A977F6FE559F}.Release|Any CPU.Build.0 = Release|Any CPU - {F9E17F0F-E13E-4B12-9E4D-EDBBD39A1BEF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F9E17F0F-E13E-4B12-9E4D-EDBBD39A1BEF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F9E17F0F-E13E-4B12-9E4D-EDBBD39A1BEF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F9E17F0F-E13E-4B12-9E4D-EDBBD39A1BEF}.Release|Any CPU.Build.0 = Release|Any CPU - {8DBADBF2-0DCC-4F59-8E9E-DD56F220F5BB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8DBADBF2-0DCC-4F59-8E9E-DD56F220F5BB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8DBADBF2-0DCC-4F59-8E9E-DD56F220F5BB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8DBADBF2-0DCC-4F59-8E9E-DD56F220F5BB}.Release|Any CPU.Build.0 = Release|Any CPU - {E5CCBF6A-7C02-4D70-972E-CF6D34615169}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E5CCBF6A-7C02-4D70-972E-CF6D34615169}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E5CCBF6A-7C02-4D70-972E-CF6D34615169}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E5CCBF6A-7C02-4D70-972E-CF6D34615169}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {A0822622-B34D-4F0B-B1B0-A6E81F104742} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {E9FF03DB-295E-4D76-B925-69B4B1013961} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {73CF7340-966D-44C4-A131-24A91AFA8DEC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {3D0DB4FE-FBAF-457C-A768-E6B2CEA4E8F5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {7FFD5C3B-E17A-44E7-977F-510A390E1965} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {E4434D69-4190-4C0F-B2EB-96EABF7C874C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {455161CF-03FD-495A-9374-A9CED75BDA16} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {BB66754E-5B7E-42CD-B90B-4FCEA8067EFB} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {04BCBE07-FA28-413A-979B-C95DDD7ACD86} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {914D8EFD-F0BE-4221-BB2E-827149149592} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0FBEF111-315E-4D16-B26F-A06EE778F127} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {1D14962D-653B-4F12-8C27-A977F6FE559F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F9E17F0F-E13E-4B12-9E4D-EDBBD39A1BEF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8DBADBF2-0DCC-4F59-8E9E-DD56F220F5BB} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E5CCBF6A-7C02-4D70-972E-CF6D34615169} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {E4434D69-4190-4C0F-B2EB-96EABF7C874C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {455161CF-03FD-495A-9374-A9CED75BDA16} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {BB66754E-5B7E-42CD-B90B-4FCEA8067EFB} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {04BCBE07-FA28-413A-979B-C95DDD7ACD86} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {914D8EFD-F0BE-4221-BB2E-827149149592} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0FBEF111-315E-4D16-B26F-A06EE778F127} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {1D14962D-653B-4F12-8C27-A977F6FE559F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F9E17F0F-E13E-4B12-9E4D-EDBBD39A1BEF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8DBADBF2-0DCC-4F59-8E9E-DD56F220F5BB} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E5CCBF6A-7C02-4D70-972E-CF6D34615169} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {63AB77FA-3385-45AD-BA2C-022962845950} diff --git a/sdk/src/Services/Kafka/Properties/AssemblyInfo.cs b/sdk/src/Services/Kafka/Properties/AssemblyInfo.cs index 5a3cc1997778..c0434c2c820d 100644 --- a/sdk/src/Services/Kafka/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/Kafka/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.9")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.36")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/KafkaConnect/Generated/AmazonKafkaConnectConfig.cs b/sdk/src/Services/KafkaConnect/Generated/AmazonKafkaConnectConfig.cs index 191beafda444..a6568a474375 100644 --- a/sdk/src/Services/KafkaConnect/Generated/AmazonKafkaConnectConfig.cs +++ b/sdk/src/Services/KafkaConnect/Generated/AmazonKafkaConnectConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.KafkaConnect public partial class AmazonKafkaConnectConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("KafkaConnect", "4.0.0.0"); private static readonly AmazonKafkaConnectEndpointResolver EndpointResolver = new AmazonKafkaConnectEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("KafkaConnect", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("KafkaConnect", "3.7.400.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/KafkaConnect/KafkaConnect.sln b/sdk/src/Services/KafkaConnect/KafkaConnect.sln index 22ad3e995ab1..4373fafcccc6 100644 --- a/sdk/src/Services/KafkaConnect/KafkaConnect.sln +++ b/sdk/src/Services/KafkaConnect/KafkaConnect.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {E2A7062F-CEFD-4BDE-A297-32829931539F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {E2A7062F-CEFD-4BDE-A297-32829931539F}.Debug|Any CPU.Build.0 = Debug|Any CPU {E2A7062F-CEFD-4BDE-A297-32829931539F}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {8637BC6E-F1DA-407B-A56F-CA364C4AF2A2}.Debug|Any CPU.Build.0 = Debug|Any CPU {8637BC6E-F1DA-407B-A56F-CA364C4AF2A2}.Release|Any CPU.ActiveCfg = Release|Any CPU {8637BC6E-F1DA-407B-A56F-CA364C4AF2A2}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {40AEFEF0-C3A0-40D4-86EE-CD15A21F1E77}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {40AEFEF0-C3A0-40D4-86EE-CD15A21F1E77}.Debug|Any CPU.Build.0 = Debug|Any CPU - {40AEFEF0-C3A0-40D4-86EE-CD15A21F1E77}.Release|Any CPU.ActiveCfg = Release|Any CPU - {40AEFEF0-C3A0-40D4-86EE-CD15A21F1E77}.Release|Any CPU.Build.0 = Release|Any CPU - {72B37A12-01DD-42C9-B7BE-706B48A95966}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {72B37A12-01DD-42C9-B7BE-706B48A95966}.Debug|Any CPU.Build.0 = Debug|Any CPU - {72B37A12-01DD-42C9-B7BE-706B48A95966}.Release|Any CPU.ActiveCfg = Release|Any CPU - {72B37A12-01DD-42C9-B7BE-706B48A95966}.Release|Any CPU.Build.0 = Release|Any CPU - {59570697-3046-4213-874A-6599826A4C9F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {59570697-3046-4213-874A-6599826A4C9F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {59570697-3046-4213-874A-6599826A4C9F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {59570697-3046-4213-874A-6599826A4C9F}.Release|Any CPU.Build.0 = Release|Any CPU - {D9ADA719-1AE7-4B31-946C-C6D1C52825C3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D9ADA719-1AE7-4B31-946C-C6D1C52825C3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D9ADA719-1AE7-4B31-946C-C6D1C52825C3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D9ADA719-1AE7-4B31-946C-C6D1C52825C3}.Release|Any CPU.Build.0 = Release|Any CPU - {D561C796-AD40-48FA-833D-43639FB60F9D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D561C796-AD40-48FA-833D-43639FB60F9D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D561C796-AD40-48FA-833D-43639FB60F9D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D561C796-AD40-48FA-833D-43639FB60F9D}.Release|Any CPU.Build.0 = Release|Any CPU - {47EB7952-A851-4045-B35A-08DE71582C8D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {47EB7952-A851-4045-B35A-08DE71582C8D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {47EB7952-A851-4045-B35A-08DE71582C8D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {47EB7952-A851-4045-B35A-08DE71582C8D}.Release|Any CPU.Build.0 = Release|Any CPU - {65D81F2C-2AD5-49BB-B8AA-13B8E7CECCA4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {65D81F2C-2AD5-49BB-B8AA-13B8E7CECCA4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {65D81F2C-2AD5-49BB-B8AA-13B8E7CECCA4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {65D81F2C-2AD5-49BB-B8AA-13B8E7CECCA4}.Release|Any CPU.Build.0 = Release|Any CPU - {AA857670-5707-484A-8C38-71628ADEE968}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AA857670-5707-484A-8C38-71628ADEE968}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AA857670-5707-484A-8C38-71628ADEE968}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AA857670-5707-484A-8C38-71628ADEE968}.Release|Any CPU.Build.0 = Release|Any CPU - {FCD6BC97-F882-467B-A47B-1A7CD8968CEE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FCD6BC97-F882-467B-A47B-1A7CD8968CEE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FCD6BC97-F882-467B-A47B-1A7CD8968CEE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FCD6BC97-F882-467B-A47B-1A7CD8968CEE}.Release|Any CPU.Build.0 = Release|Any CPU - {E128C9DC-DB40-4568-A7B4-438AD6E70ADC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E128C9DC-DB40-4568-A7B4-438AD6E70ADC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E128C9DC-DB40-4568-A7B4-438AD6E70ADC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E128C9DC-DB40-4568-A7B4-438AD6E70ADC}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {40AEFEF0-C3A0-40D4-86EE-CD15A21F1E77}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {40AEFEF0-C3A0-40D4-86EE-CD15A21F1E77}.Debug|Any CPU.Build.0 = Debug|Any CPU - {40AEFEF0-C3A0-40D4-86EE-CD15A21F1E77}.Release|Any CPU.ActiveCfg = Release|Any CPU - {40AEFEF0-C3A0-40D4-86EE-CD15A21F1E77}.Release|Any CPU.Build.0 = Release|Any CPU - {72B37A12-01DD-42C9-B7BE-706B48A95966}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {72B37A12-01DD-42C9-B7BE-706B48A95966}.Debug|Any CPU.Build.0 = Debug|Any CPU - {72B37A12-01DD-42C9-B7BE-706B48A95966}.Release|Any CPU.ActiveCfg = Release|Any CPU - {72B37A12-01DD-42C9-B7BE-706B48A95966}.Release|Any CPU.Build.0 = Release|Any CPU - {59570697-3046-4213-874A-6599826A4C9F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {59570697-3046-4213-874A-6599826A4C9F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {59570697-3046-4213-874A-6599826A4C9F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {59570697-3046-4213-874A-6599826A4C9F}.Release|Any CPU.Build.0 = Release|Any CPU - {D9ADA719-1AE7-4B31-946C-C6D1C52825C3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D9ADA719-1AE7-4B31-946C-C6D1C52825C3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D9ADA719-1AE7-4B31-946C-C6D1C52825C3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D9ADA719-1AE7-4B31-946C-C6D1C52825C3}.Release|Any CPU.Build.0 = Release|Any CPU - {D561C796-AD40-48FA-833D-43639FB60F9D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D561C796-AD40-48FA-833D-43639FB60F9D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D561C796-AD40-48FA-833D-43639FB60F9D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D561C796-AD40-48FA-833D-43639FB60F9D}.Release|Any CPU.Build.0 = Release|Any CPU - {47EB7952-A851-4045-B35A-08DE71582C8D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {47EB7952-A851-4045-B35A-08DE71582C8D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {47EB7952-A851-4045-B35A-08DE71582C8D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {47EB7952-A851-4045-B35A-08DE71582C8D}.Release|Any CPU.Build.0 = Release|Any CPU - {65D81F2C-2AD5-49BB-B8AA-13B8E7CECCA4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {65D81F2C-2AD5-49BB-B8AA-13B8E7CECCA4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {65D81F2C-2AD5-49BB-B8AA-13B8E7CECCA4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {65D81F2C-2AD5-49BB-B8AA-13B8E7CECCA4}.Release|Any CPU.Build.0 = Release|Any CPU - {AA857670-5707-484A-8C38-71628ADEE968}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AA857670-5707-484A-8C38-71628ADEE968}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AA857670-5707-484A-8C38-71628ADEE968}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AA857670-5707-484A-8C38-71628ADEE968}.Release|Any CPU.Build.0 = Release|Any CPU - {FCD6BC97-F882-467B-A47B-1A7CD8968CEE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FCD6BC97-F882-467B-A47B-1A7CD8968CEE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FCD6BC97-F882-467B-A47B-1A7CD8968CEE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FCD6BC97-F882-467B-A47B-1A7CD8968CEE}.Release|Any CPU.Build.0 = Release|Any CPU - {E128C9DC-DB40-4568-A7B4-438AD6E70ADC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E128C9DC-DB40-4568-A7B4-438AD6E70ADC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E128C9DC-DB40-4568-A7B4-438AD6E70ADC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E128C9DC-DB40-4568-A7B4-438AD6E70ADC}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {E2A7062F-CEFD-4BDE-A297-32829931539F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {3DD20BC8-8300-4F43-86C9-76326149B085} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {2DE902CB-7B46-4B39-B191-5FD7AD237136} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {5DED9B67-40B1-4458-AB17-406FAA1B3E92} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {8637BC6E-F1DA-407B-A56F-CA364C4AF2A2} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {40AEFEF0-C3A0-40D4-86EE-CD15A21F1E77} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {72B37A12-01DD-42C9-B7BE-706B48A95966} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {59570697-3046-4213-874A-6599826A4C9F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D9ADA719-1AE7-4B31-946C-C6D1C52825C3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D561C796-AD40-48FA-833D-43639FB60F9D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {47EB7952-A851-4045-B35A-08DE71582C8D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {65D81F2C-2AD5-49BB-B8AA-13B8E7CECCA4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {AA857670-5707-484A-8C38-71628ADEE968} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {FCD6BC97-F882-467B-A47B-1A7CD8968CEE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E128C9DC-DB40-4568-A7B4-438AD6E70ADC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {40AEFEF0-C3A0-40D4-86EE-CD15A21F1E77} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {72B37A12-01DD-42C9-B7BE-706B48A95966} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {59570697-3046-4213-874A-6599826A4C9F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D9ADA719-1AE7-4B31-946C-C6D1C52825C3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D561C796-AD40-48FA-833D-43639FB60F9D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {47EB7952-A851-4045-B35A-08DE71582C8D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {65D81F2C-2AD5-49BB-B8AA-13B8E7CECCA4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {AA857670-5707-484A-8C38-71628ADEE968} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {FCD6BC97-F882-467B-A47B-1A7CD8968CEE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E128C9DC-DB40-4568-A7B4-438AD6E70ADC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {3F8AAE77-82A4-4085-9F50-9D9387702A0A} diff --git a/sdk/src/Services/KafkaConnect/Properties/AssemblyInfo.cs b/sdk/src/Services/KafkaConnect/Properties/AssemblyInfo.cs index d75bb2bce7b0..1ce9654541c9 100644 --- a/sdk/src/Services/KafkaConnect/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/KafkaConnect/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/Kendra/Generated/AmazonKendraConfig.cs b/sdk/src/Services/Kendra/Generated/AmazonKendraConfig.cs index 026d0666ac2a..fc16a48c9221 100644 --- a/sdk/src/Services/Kendra/Generated/AmazonKendraConfig.cs +++ b/sdk/src/Services/Kendra/Generated/AmazonKendraConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.Kendra public partial class AmazonKendraConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("kendra", "4.0.0.0"); private static readonly AmazonKendraEndpointResolver EndpointResolver = new AmazonKendraEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("kendra", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("kendra", "3.7.400.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/Kendra/Kendra.sln b/sdk/src/Services/Kendra/Kendra.sln index 8858d224d399..92844cc0b176 100644 --- a/sdk/src/Services/Kendra/Kendra.sln +++ b/sdk/src/Services/Kendra/Kendra.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {2C6EDB4A-D464-4DDB-9D15-C8E6D1902B84}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {2C6EDB4A-D464-4DDB-9D15-C8E6D1902B84}.Debug|Any CPU.Build.0 = Debug|Any CPU {2C6EDB4A-D464-4DDB-9D15-C8E6D1902B84}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {6EE55385-3591-44C2-977B-73BCFBDB86CE}.Debug|Any CPU.Build.0 = Debug|Any CPU {6EE55385-3591-44C2-977B-73BCFBDB86CE}.Release|Any CPU.ActiveCfg = Release|Any CPU {6EE55385-3591-44C2-977B-73BCFBDB86CE}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {9D182D39-B7E1-4776-8DA5-7175400CBB75}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9D182D39-B7E1-4776-8DA5-7175400CBB75}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9D182D39-B7E1-4776-8DA5-7175400CBB75}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9D182D39-B7E1-4776-8DA5-7175400CBB75}.Release|Any CPU.Build.0 = Release|Any CPU - {8EA10AE0-EB10-4065-9012-4046B7852EA0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8EA10AE0-EB10-4065-9012-4046B7852EA0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8EA10AE0-EB10-4065-9012-4046B7852EA0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8EA10AE0-EB10-4065-9012-4046B7852EA0}.Release|Any CPU.Build.0 = Release|Any CPU - {1D855248-A37E-4BD4-8628-1B7610F9F359}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1D855248-A37E-4BD4-8628-1B7610F9F359}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1D855248-A37E-4BD4-8628-1B7610F9F359}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1D855248-A37E-4BD4-8628-1B7610F9F359}.Release|Any CPU.Build.0 = Release|Any CPU - {CB71E77E-F07B-4333-A72A-83186C25AA65}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CB71E77E-F07B-4333-A72A-83186C25AA65}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CB71E77E-F07B-4333-A72A-83186C25AA65}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CB71E77E-F07B-4333-A72A-83186C25AA65}.Release|Any CPU.Build.0 = Release|Any CPU - {E8520D07-EF8F-420F-94F0-167A1F23E0D6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E8520D07-EF8F-420F-94F0-167A1F23E0D6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E8520D07-EF8F-420F-94F0-167A1F23E0D6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E8520D07-EF8F-420F-94F0-167A1F23E0D6}.Release|Any CPU.Build.0 = Release|Any CPU - {07FE309A-1555-4FAA-916B-B190E572AA7C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {07FE309A-1555-4FAA-916B-B190E572AA7C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {07FE309A-1555-4FAA-916B-B190E572AA7C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {07FE309A-1555-4FAA-916B-B190E572AA7C}.Release|Any CPU.Build.0 = Release|Any CPU - {9D8799D3-BCFD-47C7-93D6-19827A83C563}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9D8799D3-BCFD-47C7-93D6-19827A83C563}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9D8799D3-BCFD-47C7-93D6-19827A83C563}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9D8799D3-BCFD-47C7-93D6-19827A83C563}.Release|Any CPU.Build.0 = Release|Any CPU - {E33A7EAE-1F7D-4DD8-A10D-A4F6271D8F7D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E33A7EAE-1F7D-4DD8-A10D-A4F6271D8F7D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E33A7EAE-1F7D-4DD8-A10D-A4F6271D8F7D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E33A7EAE-1F7D-4DD8-A10D-A4F6271D8F7D}.Release|Any CPU.Build.0 = Release|Any CPU - {10D57845-0AE8-4D72-BBDE-7E50B731A5DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {10D57845-0AE8-4D72-BBDE-7E50B731A5DC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {10D57845-0AE8-4D72-BBDE-7E50B731A5DC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {10D57845-0AE8-4D72-BBDE-7E50B731A5DC}.Release|Any CPU.Build.0 = Release|Any CPU - {1FFC450A-5A65-4FF4-8BF5-BCF695B5027C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1FFC450A-5A65-4FF4-8BF5-BCF695B5027C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1FFC450A-5A65-4FF4-8BF5-BCF695B5027C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1FFC450A-5A65-4FF4-8BF5-BCF695B5027C}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {9D182D39-B7E1-4776-8DA5-7175400CBB75}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9D182D39-B7E1-4776-8DA5-7175400CBB75}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9D182D39-B7E1-4776-8DA5-7175400CBB75}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9D182D39-B7E1-4776-8DA5-7175400CBB75}.Release|Any CPU.Build.0 = Release|Any CPU - {8EA10AE0-EB10-4065-9012-4046B7852EA0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8EA10AE0-EB10-4065-9012-4046B7852EA0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8EA10AE0-EB10-4065-9012-4046B7852EA0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8EA10AE0-EB10-4065-9012-4046B7852EA0}.Release|Any CPU.Build.0 = Release|Any CPU - {1D855248-A37E-4BD4-8628-1B7610F9F359}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1D855248-A37E-4BD4-8628-1B7610F9F359}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1D855248-A37E-4BD4-8628-1B7610F9F359}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1D855248-A37E-4BD4-8628-1B7610F9F359}.Release|Any CPU.Build.0 = Release|Any CPU - {CB71E77E-F07B-4333-A72A-83186C25AA65}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CB71E77E-F07B-4333-A72A-83186C25AA65}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CB71E77E-F07B-4333-A72A-83186C25AA65}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CB71E77E-F07B-4333-A72A-83186C25AA65}.Release|Any CPU.Build.0 = Release|Any CPU - {E8520D07-EF8F-420F-94F0-167A1F23E0D6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E8520D07-EF8F-420F-94F0-167A1F23E0D6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E8520D07-EF8F-420F-94F0-167A1F23E0D6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E8520D07-EF8F-420F-94F0-167A1F23E0D6}.Release|Any CPU.Build.0 = Release|Any CPU - {07FE309A-1555-4FAA-916B-B190E572AA7C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {07FE309A-1555-4FAA-916B-B190E572AA7C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {07FE309A-1555-4FAA-916B-B190E572AA7C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {07FE309A-1555-4FAA-916B-B190E572AA7C}.Release|Any CPU.Build.0 = Release|Any CPU - {9D8799D3-BCFD-47C7-93D6-19827A83C563}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9D8799D3-BCFD-47C7-93D6-19827A83C563}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9D8799D3-BCFD-47C7-93D6-19827A83C563}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9D8799D3-BCFD-47C7-93D6-19827A83C563}.Release|Any CPU.Build.0 = Release|Any CPU - {E33A7EAE-1F7D-4DD8-A10D-A4F6271D8F7D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E33A7EAE-1F7D-4DD8-A10D-A4F6271D8F7D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E33A7EAE-1F7D-4DD8-A10D-A4F6271D8F7D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E33A7EAE-1F7D-4DD8-A10D-A4F6271D8F7D}.Release|Any CPU.Build.0 = Release|Any CPU - {10D57845-0AE8-4D72-BBDE-7E50B731A5DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {10D57845-0AE8-4D72-BBDE-7E50B731A5DC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {10D57845-0AE8-4D72-BBDE-7E50B731A5DC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {10D57845-0AE8-4D72-BBDE-7E50B731A5DC}.Release|Any CPU.Build.0 = Release|Any CPU - {1FFC450A-5A65-4FF4-8BF5-BCF695B5027C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1FFC450A-5A65-4FF4-8BF5-BCF695B5027C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1FFC450A-5A65-4FF4-8BF5-BCF695B5027C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1FFC450A-5A65-4FF4-8BF5-BCF695B5027C}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {2C6EDB4A-D464-4DDB-9D15-C8E6D1902B84} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {BA7B2196-A43E-433A-8A19-773E8B99ED3E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {DCCD7257-E760-40EF-B185-D64C270F4643} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {B50C72BA-D391-4810-9DAE-4A323FF98D2B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {6EE55385-3591-44C2-977B-73BCFBDB86CE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {9D182D39-B7E1-4776-8DA5-7175400CBB75} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8EA10AE0-EB10-4065-9012-4046B7852EA0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {1D855248-A37E-4BD4-8628-1B7610F9F359} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {CB71E77E-F07B-4333-A72A-83186C25AA65} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E8520D07-EF8F-420F-94F0-167A1F23E0D6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {07FE309A-1555-4FAA-916B-B190E572AA7C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {9D8799D3-BCFD-47C7-93D6-19827A83C563} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E33A7EAE-1F7D-4DD8-A10D-A4F6271D8F7D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {10D57845-0AE8-4D72-BBDE-7E50B731A5DC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {1FFC450A-5A65-4FF4-8BF5-BCF695B5027C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {9D182D39-B7E1-4776-8DA5-7175400CBB75} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8EA10AE0-EB10-4065-9012-4046B7852EA0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {1D855248-A37E-4BD4-8628-1B7610F9F359} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {CB71E77E-F07B-4333-A72A-83186C25AA65} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E8520D07-EF8F-420F-94F0-167A1F23E0D6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {07FE309A-1555-4FAA-916B-B190E572AA7C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {9D8799D3-BCFD-47C7-93D6-19827A83C563} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E33A7EAE-1F7D-4DD8-A10D-A4F6271D8F7D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {10D57845-0AE8-4D72-BBDE-7E50B731A5DC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {1FFC450A-5A65-4FF4-8BF5-BCF695B5027C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {78B67500-1F8C-418E-AB13-2B121D59AC13} diff --git a/sdk/src/Services/Kendra/Properties/AssemblyInfo.cs b/sdk/src/Services/Kendra/Properties/AssemblyInfo.cs index cf5986c95a85..13a97b183dac 100644 --- a/sdk/src/Services/Kendra/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/Kendra/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/KendraRanking/Generated/AmazonKendraRankingConfig.cs b/sdk/src/Services/KendraRanking/Generated/AmazonKendraRankingConfig.cs index 02a5972aabcf..f57a3d835077 100644 --- a/sdk/src/Services/KendraRanking/Generated/AmazonKendraRankingConfig.cs +++ b/sdk/src/Services/KendraRanking/Generated/AmazonKendraRankingConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.KendraRanking public partial class AmazonKendraRankingConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("Kendra Ranking", "4.0.0.0"); private static readonly AmazonKendraRankingEndpointResolver EndpointResolver = new AmazonKendraRankingEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("Kendra Ranking", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("Kendra Ranking", "3.7.400.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/KendraRanking/KendraRanking.sln b/sdk/src/Services/KendraRanking/KendraRanking.sln index 7f6e23b97e0b..5f74cfd0ea77 100644 --- a/sdk/src/Services/KendraRanking/KendraRanking.sln +++ b/sdk/src/Services/KendraRanking/KendraRanking.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {8E070B2D-2A89-4FA5-9B61-6AEA19C8E46F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {8E070B2D-2A89-4FA5-9B61-6AEA19C8E46F}.Debug|Any CPU.Build.0 = Debug|Any CPU {8E070B2D-2A89-4FA5-9B61-6AEA19C8E46F}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {21436398-698B-485D-9878-78184B652109}.Debug|Any CPU.Build.0 = Debug|Any CPU {21436398-698B-485D-9878-78184B652109}.Release|Any CPU.ActiveCfg = Release|Any CPU {21436398-698B-485D-9878-78184B652109}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {95D25952-A77A-4A31-82C0-3AE65CE50C37}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {95D25952-A77A-4A31-82C0-3AE65CE50C37}.Debug|Any CPU.Build.0 = Debug|Any CPU - {95D25952-A77A-4A31-82C0-3AE65CE50C37}.Release|Any CPU.ActiveCfg = Release|Any CPU - {95D25952-A77A-4A31-82C0-3AE65CE50C37}.Release|Any CPU.Build.0 = Release|Any CPU - {F0E3B954-6CF0-4B6D-975D-5CBE0CAC0392}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F0E3B954-6CF0-4B6D-975D-5CBE0CAC0392}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F0E3B954-6CF0-4B6D-975D-5CBE0CAC0392}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F0E3B954-6CF0-4B6D-975D-5CBE0CAC0392}.Release|Any CPU.Build.0 = Release|Any CPU - {8BFED919-8FED-4A9D-A6DF-47856D6E14A5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8BFED919-8FED-4A9D-A6DF-47856D6E14A5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8BFED919-8FED-4A9D-A6DF-47856D6E14A5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8BFED919-8FED-4A9D-A6DF-47856D6E14A5}.Release|Any CPU.Build.0 = Release|Any CPU - {3B284903-45D2-455D-82BE-FA59D28EE828}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3B284903-45D2-455D-82BE-FA59D28EE828}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3B284903-45D2-455D-82BE-FA59D28EE828}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3B284903-45D2-455D-82BE-FA59D28EE828}.Release|Any CPU.Build.0 = Release|Any CPU - {6ACD417E-DDFB-4B6D-8058-73C6736DA367}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6ACD417E-DDFB-4B6D-8058-73C6736DA367}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6ACD417E-DDFB-4B6D-8058-73C6736DA367}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6ACD417E-DDFB-4B6D-8058-73C6736DA367}.Release|Any CPU.Build.0 = Release|Any CPU - {FBEADB96-442B-4389-B952-B65EBDBF3BE2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FBEADB96-442B-4389-B952-B65EBDBF3BE2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FBEADB96-442B-4389-B952-B65EBDBF3BE2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FBEADB96-442B-4389-B952-B65EBDBF3BE2}.Release|Any CPU.Build.0 = Release|Any CPU - {A56770A9-4D6A-4373-918F-D1FDCC595285}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A56770A9-4D6A-4373-918F-D1FDCC595285}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A56770A9-4D6A-4373-918F-D1FDCC595285}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A56770A9-4D6A-4373-918F-D1FDCC595285}.Release|Any CPU.Build.0 = Release|Any CPU - {971A604E-D059-4BB0-8502-ADA8D0567923}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {971A604E-D059-4BB0-8502-ADA8D0567923}.Debug|Any CPU.Build.0 = Debug|Any CPU - {971A604E-D059-4BB0-8502-ADA8D0567923}.Release|Any CPU.ActiveCfg = Release|Any CPU - {971A604E-D059-4BB0-8502-ADA8D0567923}.Release|Any CPU.Build.0 = Release|Any CPU - {793D5A3D-EE79-4354-B5CB-240D2E307DE5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {793D5A3D-EE79-4354-B5CB-240D2E307DE5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {793D5A3D-EE79-4354-B5CB-240D2E307DE5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {793D5A3D-EE79-4354-B5CB-240D2E307DE5}.Release|Any CPU.Build.0 = Release|Any CPU - {BF5DAD70-D763-4F2B-935C-273988DEA94F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BF5DAD70-D763-4F2B-935C-273988DEA94F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BF5DAD70-D763-4F2B-935C-273988DEA94F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BF5DAD70-D763-4F2B-935C-273988DEA94F}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {95D25952-A77A-4A31-82C0-3AE65CE50C37}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {95D25952-A77A-4A31-82C0-3AE65CE50C37}.Debug|Any CPU.Build.0 = Debug|Any CPU - {95D25952-A77A-4A31-82C0-3AE65CE50C37}.Release|Any CPU.ActiveCfg = Release|Any CPU - {95D25952-A77A-4A31-82C0-3AE65CE50C37}.Release|Any CPU.Build.0 = Release|Any CPU - {F0E3B954-6CF0-4B6D-975D-5CBE0CAC0392}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F0E3B954-6CF0-4B6D-975D-5CBE0CAC0392}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F0E3B954-6CF0-4B6D-975D-5CBE0CAC0392}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F0E3B954-6CF0-4B6D-975D-5CBE0CAC0392}.Release|Any CPU.Build.0 = Release|Any CPU - {8BFED919-8FED-4A9D-A6DF-47856D6E14A5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8BFED919-8FED-4A9D-A6DF-47856D6E14A5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8BFED919-8FED-4A9D-A6DF-47856D6E14A5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8BFED919-8FED-4A9D-A6DF-47856D6E14A5}.Release|Any CPU.Build.0 = Release|Any CPU - {3B284903-45D2-455D-82BE-FA59D28EE828}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3B284903-45D2-455D-82BE-FA59D28EE828}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3B284903-45D2-455D-82BE-FA59D28EE828}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3B284903-45D2-455D-82BE-FA59D28EE828}.Release|Any CPU.Build.0 = Release|Any CPU - {6ACD417E-DDFB-4B6D-8058-73C6736DA367}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6ACD417E-DDFB-4B6D-8058-73C6736DA367}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6ACD417E-DDFB-4B6D-8058-73C6736DA367}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6ACD417E-DDFB-4B6D-8058-73C6736DA367}.Release|Any CPU.Build.0 = Release|Any CPU - {FBEADB96-442B-4389-B952-B65EBDBF3BE2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FBEADB96-442B-4389-B952-B65EBDBF3BE2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FBEADB96-442B-4389-B952-B65EBDBF3BE2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FBEADB96-442B-4389-B952-B65EBDBF3BE2}.Release|Any CPU.Build.0 = Release|Any CPU - {A56770A9-4D6A-4373-918F-D1FDCC595285}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A56770A9-4D6A-4373-918F-D1FDCC595285}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A56770A9-4D6A-4373-918F-D1FDCC595285}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A56770A9-4D6A-4373-918F-D1FDCC595285}.Release|Any CPU.Build.0 = Release|Any CPU - {971A604E-D059-4BB0-8502-ADA8D0567923}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {971A604E-D059-4BB0-8502-ADA8D0567923}.Debug|Any CPU.Build.0 = Debug|Any CPU - {971A604E-D059-4BB0-8502-ADA8D0567923}.Release|Any CPU.ActiveCfg = Release|Any CPU - {971A604E-D059-4BB0-8502-ADA8D0567923}.Release|Any CPU.Build.0 = Release|Any CPU - {793D5A3D-EE79-4354-B5CB-240D2E307DE5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {793D5A3D-EE79-4354-B5CB-240D2E307DE5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {793D5A3D-EE79-4354-B5CB-240D2E307DE5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {793D5A3D-EE79-4354-B5CB-240D2E307DE5}.Release|Any CPU.Build.0 = Release|Any CPU - {BF5DAD70-D763-4F2B-935C-273988DEA94F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BF5DAD70-D763-4F2B-935C-273988DEA94F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BF5DAD70-D763-4F2B-935C-273988DEA94F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BF5DAD70-D763-4F2B-935C-273988DEA94F}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {8E070B2D-2A89-4FA5-9B61-6AEA19C8E46F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {66B65FC2-0F77-488D-82F9-8DCFB2B8B3B5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {81B8E211-307F-4811-B080-EBB80DE109AB} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {4ADC43C6-FBBC-4CCA-A9DD-29FECBB4259D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {21436398-698B-485D-9878-78184B652109} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {95D25952-A77A-4A31-82C0-3AE65CE50C37} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F0E3B954-6CF0-4B6D-975D-5CBE0CAC0392} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8BFED919-8FED-4A9D-A6DF-47856D6E14A5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {3B284903-45D2-455D-82BE-FA59D28EE828} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6ACD417E-DDFB-4B6D-8058-73C6736DA367} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {FBEADB96-442B-4389-B952-B65EBDBF3BE2} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A56770A9-4D6A-4373-918F-D1FDCC595285} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {971A604E-D059-4BB0-8502-ADA8D0567923} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {793D5A3D-EE79-4354-B5CB-240D2E307DE5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {BF5DAD70-D763-4F2B-935C-273988DEA94F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {95D25952-A77A-4A31-82C0-3AE65CE50C37} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F0E3B954-6CF0-4B6D-975D-5CBE0CAC0392} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8BFED919-8FED-4A9D-A6DF-47856D6E14A5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {3B284903-45D2-455D-82BE-FA59D28EE828} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6ACD417E-DDFB-4B6D-8058-73C6736DA367} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {FBEADB96-442B-4389-B952-B65EBDBF3BE2} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A56770A9-4D6A-4373-918F-D1FDCC595285} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {971A604E-D059-4BB0-8502-ADA8D0567923} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {793D5A3D-EE79-4354-B5CB-240D2E307DE5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {BF5DAD70-D763-4F2B-935C-273988DEA94F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {1C6E1468-7922-4B45-A22E-168AF01B51BE} diff --git a/sdk/src/Services/KendraRanking/Properties/AssemblyInfo.cs b/sdk/src/Services/KendraRanking/Properties/AssemblyInfo.cs index 05efcd730cb3..c26714cb1fd6 100644 --- a/sdk/src/Services/KendraRanking/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/KendraRanking/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/KeyManagementService/Generated/AmazonKeyManagementServiceConfig.cs b/sdk/src/Services/KeyManagementService/Generated/AmazonKeyManagementServiceConfig.cs index f2956eb781c1..21fb01337109 100644 --- a/sdk/src/Services/KeyManagementService/Generated/AmazonKeyManagementServiceConfig.cs +++ b/sdk/src/Services/KeyManagementService/Generated/AmazonKeyManagementServiceConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.KeyManagementService public partial class AmazonKeyManagementServiceConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("KMS", "4.0.0.0"); private static readonly AmazonKeyManagementServiceEndpointResolver EndpointResolver = new AmazonKeyManagementServiceEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("KMS", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("KMS", "3.7.400.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/KeyManagementService/KeyManagementService.sln b/sdk/src/Services/KeyManagementService/KeyManagementService.sln index d6e34fa827e6..4f662161f5e8 100644 --- a/sdk/src/Services/KeyManagementService/KeyManagementService.sln +++ b/sdk/src/Services/KeyManagementService/KeyManagementService.sln @@ -92,7 +92,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {C3011E26-E23B-4682-B548-4F353EBAB94E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {C3011E26-E23B-4682-B548-4F353EBAB94E}.Debug|Any CPU.Build.0 = Debug|Any CPU {C3011E26-E23B-4682-B548-4F353EBAB94E}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -113,97 +120,6 @@ Global {1C08CADD-85CB-403B-B38A-5E68CD2D8116}.Debug|Any CPU.Build.0 = Debug|Any CPU {1C08CADD-85CB-403B-B38A-5E68CD2D8116}.Release|Any CPU.ActiveCfg = Release|Any CPU {1C08CADD-85CB-403B-B38A-5E68CD2D8116}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {9A472485-E4EC-44A6-9FC7-FA9E0D8B2D23}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9A472485-E4EC-44A6-9FC7-FA9E0D8B2D23}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9A472485-E4EC-44A6-9FC7-FA9E0D8B2D23}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9A472485-E4EC-44A6-9FC7-FA9E0D8B2D23}.Release|Any CPU.Build.0 = Release|Any CPU - {410AD883-F37D-4B07-99AC-5D0E2E24DED5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {410AD883-F37D-4B07-99AC-5D0E2E24DED5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {410AD883-F37D-4B07-99AC-5D0E2E24DED5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {410AD883-F37D-4B07-99AC-5D0E2E24DED5}.Release|Any CPU.Build.0 = Release|Any CPU - {EE025379-91C4-49EC-8B7F-AA23B793B318}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EE025379-91C4-49EC-8B7F-AA23B793B318}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EE025379-91C4-49EC-8B7F-AA23B793B318}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EE025379-91C4-49EC-8B7F-AA23B793B318}.Release|Any CPU.Build.0 = Release|Any CPU - {4EF1379E-F38F-47F1-B370-FC101C8F0749}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4EF1379E-F38F-47F1-B370-FC101C8F0749}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4EF1379E-F38F-47F1-B370-FC101C8F0749}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4EF1379E-F38F-47F1-B370-FC101C8F0749}.Release|Any CPU.Build.0 = Release|Any CPU - {A3A97F5D-0C3D-41AF-8D58-6884415C75E3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A3A97F5D-0C3D-41AF-8D58-6884415C75E3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A3A97F5D-0C3D-41AF-8D58-6884415C75E3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A3A97F5D-0C3D-41AF-8D58-6884415C75E3}.Release|Any CPU.Build.0 = Release|Any CPU - {FB05C4FF-8E9B-4E01-8999-E3CFF488338C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FB05C4FF-8E9B-4E01-8999-E3CFF488338C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FB05C4FF-8E9B-4E01-8999-E3CFF488338C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FB05C4FF-8E9B-4E01-8999-E3CFF488338C}.Release|Any CPU.Build.0 = Release|Any CPU - {B63FBAA6-4EAE-4372-B006-0113A51062B8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B63FBAA6-4EAE-4372-B006-0113A51062B8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B63FBAA6-4EAE-4372-B006-0113A51062B8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B63FBAA6-4EAE-4372-B006-0113A51062B8}.Release|Any CPU.Build.0 = Release|Any CPU - {BF4CD7D5-41A8-4303-A89A-914BBD3B352F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BF4CD7D5-41A8-4303-A89A-914BBD3B352F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BF4CD7D5-41A8-4303-A89A-914BBD3B352F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BF4CD7D5-41A8-4303-A89A-914BBD3B352F}.Release|Any CPU.Build.0 = Release|Any CPU - {6CF6E8D3-25F1-4D71-B416-CF5874837004}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6CF6E8D3-25F1-4D71-B416-CF5874837004}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6CF6E8D3-25F1-4D71-B416-CF5874837004}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6CF6E8D3-25F1-4D71-B416-CF5874837004}.Release|Any CPU.Build.0 = Release|Any CPU - {1212B0B0-8B66-4D37-B492-66F6E98FCEB9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1212B0B0-8B66-4D37-B492-66F6E98FCEB9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1212B0B0-8B66-4D37-B492-66F6E98FCEB9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1212B0B0-8B66-4D37-B492-66F6E98FCEB9}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {9A472485-E4EC-44A6-9FC7-FA9E0D8B2D23}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9A472485-E4EC-44A6-9FC7-FA9E0D8B2D23}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9A472485-E4EC-44A6-9FC7-FA9E0D8B2D23}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9A472485-E4EC-44A6-9FC7-FA9E0D8B2D23}.Release|Any CPU.Build.0 = Release|Any CPU - {410AD883-F37D-4B07-99AC-5D0E2E24DED5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {410AD883-F37D-4B07-99AC-5D0E2E24DED5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {410AD883-F37D-4B07-99AC-5D0E2E24DED5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {410AD883-F37D-4B07-99AC-5D0E2E24DED5}.Release|Any CPU.Build.0 = Release|Any CPU - {EE025379-91C4-49EC-8B7F-AA23B793B318}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EE025379-91C4-49EC-8B7F-AA23B793B318}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EE025379-91C4-49EC-8B7F-AA23B793B318}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EE025379-91C4-49EC-8B7F-AA23B793B318}.Release|Any CPU.Build.0 = Release|Any CPU - {4EF1379E-F38F-47F1-B370-FC101C8F0749}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4EF1379E-F38F-47F1-B370-FC101C8F0749}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4EF1379E-F38F-47F1-B370-FC101C8F0749}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4EF1379E-F38F-47F1-B370-FC101C8F0749}.Release|Any CPU.Build.0 = Release|Any CPU - {A3A97F5D-0C3D-41AF-8D58-6884415C75E3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A3A97F5D-0C3D-41AF-8D58-6884415C75E3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A3A97F5D-0C3D-41AF-8D58-6884415C75E3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A3A97F5D-0C3D-41AF-8D58-6884415C75E3}.Release|Any CPU.Build.0 = Release|Any CPU - {FB05C4FF-8E9B-4E01-8999-E3CFF488338C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FB05C4FF-8E9B-4E01-8999-E3CFF488338C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FB05C4FF-8E9B-4E01-8999-E3CFF488338C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FB05C4FF-8E9B-4E01-8999-E3CFF488338C}.Release|Any CPU.Build.0 = Release|Any CPU - {B63FBAA6-4EAE-4372-B006-0113A51062B8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B63FBAA6-4EAE-4372-B006-0113A51062B8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B63FBAA6-4EAE-4372-B006-0113A51062B8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B63FBAA6-4EAE-4372-B006-0113A51062B8}.Release|Any CPU.Build.0 = Release|Any CPU - {BF4CD7D5-41A8-4303-A89A-914BBD3B352F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BF4CD7D5-41A8-4303-A89A-914BBD3B352F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BF4CD7D5-41A8-4303-A89A-914BBD3B352F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BF4CD7D5-41A8-4303-A89A-914BBD3B352F}.Release|Any CPU.Build.0 = Release|Any CPU - {6CF6E8D3-25F1-4D71-B416-CF5874837004}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6CF6E8D3-25F1-4D71-B416-CF5874837004}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6CF6E8D3-25F1-4D71-B416-CF5874837004}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6CF6E8D3-25F1-4D71-B416-CF5874837004}.Release|Any CPU.Build.0 = Release|Any CPU - {1212B0B0-8B66-4D37-B492-66F6E98FCEB9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1212B0B0-8B66-4D37-B492-66F6E98FCEB9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1212B0B0-8B66-4D37-B492-66F6E98FCEB9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1212B0B0-8B66-4D37-B492-66F6E98FCEB9}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -220,37 +136,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {C3011E26-E23B-4682-B548-4F353EBAB94E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {ACA3C9B2-33C5-4889-878F-947872EA958E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {62383A9B-B766-45AB-9AF3-9BC923896DB5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {A5AF52CD-7D97-42E0-9269-245F828139D2} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {1C08CADD-85CB-403B-B38A-5E68CD2D8116} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {9A472485-E4EC-44A6-9FC7-FA9E0D8B2D23} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {410AD883-F37D-4B07-99AC-5D0E2E24DED5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {EE025379-91C4-49EC-8B7F-AA23B793B318} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4EF1379E-F38F-47F1-B370-FC101C8F0749} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A3A97F5D-0C3D-41AF-8D58-6884415C75E3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {FB05C4FF-8E9B-4E01-8999-E3CFF488338C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B63FBAA6-4EAE-4372-B006-0113A51062B8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {BF4CD7D5-41A8-4303-A89A-914BBD3B352F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6CF6E8D3-25F1-4D71-B416-CF5874837004} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {1212B0B0-8B66-4D37-B492-66F6E98FCEB9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {9A472485-E4EC-44A6-9FC7-FA9E0D8B2D23} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {410AD883-F37D-4B07-99AC-5D0E2E24DED5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {EE025379-91C4-49EC-8B7F-AA23B793B318} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4EF1379E-F38F-47F1-B370-FC101C8F0749} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A3A97F5D-0C3D-41AF-8D58-6884415C75E3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {FB05C4FF-8E9B-4E01-8999-E3CFF488338C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B63FBAA6-4EAE-4372-B006-0113A51062B8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {BF4CD7D5-41A8-4303-A89A-914BBD3B352F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6CF6E8D3-25F1-4D71-B416-CF5874837004} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {1212B0B0-8B66-4D37-B492-66F6E98FCEB9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {2C605A6D-41CB-4A1C-8CCC-D6219A93D4D6} diff --git a/sdk/src/Services/KeyManagementService/Properties/AssemblyInfo.cs b/sdk/src/Services/KeyManagementService/Properties/AssemblyInfo.cs index 5e652d88d19e..2fd45d13dc25 100644 --- a/sdk/src/Services/KeyManagementService/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/KeyManagementService/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/Keyspaces/Generated/AmazonKeyspacesConfig.cs b/sdk/src/Services/Keyspaces/Generated/AmazonKeyspacesConfig.cs index 0d18206665e0..16a3de48436e 100644 --- a/sdk/src/Services/Keyspaces/Generated/AmazonKeyspacesConfig.cs +++ b/sdk/src/Services/Keyspaces/Generated/AmazonKeyspacesConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.Keyspaces public partial class AmazonKeyspacesConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("Keyspaces", "4.0.0.0"); private static readonly AmazonKeyspacesEndpointResolver EndpointResolver = new AmazonKeyspacesEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("Keyspaces", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("Keyspaces", "3.7.401.10"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/Keyspaces/Generated/Model/GetTypeResponse.cs b/sdk/src/Services/Keyspaces/Generated/Model/GetTypeResponse.cs index 8c30c119b34f..316034adeb6e 100644 --- a/sdk/src/Services/Keyspaces/Generated/Model/GetTypeResponse.cs +++ b/sdk/src/Services/Keyspaces/Generated/Model/GetTypeResponse.cs @@ -144,9 +144,9 @@ internal bool IsSetKeyspaceName() /// The timestamp that shows when this type was last modified. /// /// - public DateTime LastModifiedTimestamp + public DateTime? LastModifiedTimestamp { - get { return this._lastModifiedTimestamp.GetValueOrDefault(); } + get { return this._lastModifiedTimestamp; } set { this._lastModifiedTimestamp = value; } } @@ -162,9 +162,9 @@ internal bool IsSetLastModifiedTimestamp() /// The level of nesting implemented for this type. /// /// - public int MaxNestingDepth + public int? MaxNestingDepth { - get { return this._maxNestingDepth.GetValueOrDefault(); } + get { return this._maxNestingDepth; } set { this._maxNestingDepth = value; } } diff --git a/sdk/src/Services/Keyspaces/Generated/Model/Internal/MarshallTransformations/CreateTypeRequestMarshaller.cs b/sdk/src/Services/Keyspaces/Generated/Model/Internal/MarshallTransformations/CreateTypeRequestMarshaller.cs index e19ad0871a55..e995ce1913f4 100644 --- a/sdk/src/Services/Keyspaces/Generated/Model/Internal/MarshallTransformations/CreateTypeRequestMarshaller.cs +++ b/sdk/src/Services/Keyspaces/Generated/Model/Internal/MarshallTransformations/CreateTypeRequestMarshaller.cs @@ -63,43 +63,46 @@ public IRequest Marshall(CreateTypeRequest publicRequest) request.HttpMethod = "POST"; request.ResourcePath = "/"; - using (StringWriter stringWriter = new StringWriter(CultureInfo.InvariantCulture)) + using (MemoryStream memoryStream = new MemoryStream()) { - JsonWriter writer = new JsonWriter(stringWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetFieldDefinitions()) + using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) { - context.Writer.WritePropertyName("fieldDefinitions"); - context.Writer.WriteArrayStart(); - foreach(var publicRequestFieldDefinitionsListValue in publicRequest.FieldDefinitions) + JsonWriter writer = new JsonWriter(streamWriter); + writer.Validate = false; + writer.WriteObjectStart(); + var context = new JsonMarshallerContext(request, writer); + if(publicRequest.IsSetFieldDefinitions()) { - context.Writer.WriteObjectStart(); + context.Writer.WritePropertyName("fieldDefinitions"); + context.Writer.WriteArrayStart(); + foreach(var publicRequestFieldDefinitionsListValue in publicRequest.FieldDefinitions) + { + context.Writer.WriteObjectStart(); - var marshaller = FieldDefinitionMarshaller.Instance; - marshaller.Marshall(publicRequestFieldDefinitionsListValue, context); + var marshaller = FieldDefinitionMarshaller.Instance; + marshaller.Marshall(publicRequestFieldDefinitionsListValue, context); - context.Writer.WriteObjectEnd(); + context.Writer.WriteObjectEnd(); + } + context.Writer.WriteArrayEnd(); } - context.Writer.WriteArrayEnd(); - } - if(publicRequest.IsSetKeyspaceName()) - { - context.Writer.WritePropertyName("keyspaceName"); - context.Writer.Write(publicRequest.KeyspaceName); - } + if(publicRequest.IsSetKeyspaceName()) + { + context.Writer.WritePropertyName("keyspaceName"); + context.Writer.Write(publicRequest.KeyspaceName); + } - if(publicRequest.IsSetTypeName()) - { - context.Writer.WritePropertyName("typeName"); - context.Writer.Write(publicRequest.TypeName); + if(publicRequest.IsSetTypeName()) + { + context.Writer.WritePropertyName("typeName"); + context.Writer.Write(publicRequest.TypeName); + } + + writer.WriteObjectEnd(); } - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); + request.Content = memoryStream.ToArray(); } diff --git a/sdk/src/Services/Keyspaces/Generated/Model/Internal/MarshallTransformations/DeleteTypeRequestMarshaller.cs b/sdk/src/Services/Keyspaces/Generated/Model/Internal/MarshallTransformations/DeleteTypeRequestMarshaller.cs index fd65c8df3d86..b68d368bdd15 100644 --- a/sdk/src/Services/Keyspaces/Generated/Model/Internal/MarshallTransformations/DeleteTypeRequestMarshaller.cs +++ b/sdk/src/Services/Keyspaces/Generated/Model/Internal/MarshallTransformations/DeleteTypeRequestMarshaller.cs @@ -63,27 +63,30 @@ public IRequest Marshall(DeleteTypeRequest publicRequest) request.HttpMethod = "POST"; request.ResourcePath = "/"; - using (StringWriter stringWriter = new StringWriter(CultureInfo.InvariantCulture)) + using (MemoryStream memoryStream = new MemoryStream()) { - JsonWriter writer = new JsonWriter(stringWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetKeyspaceName()) + using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) { - context.Writer.WritePropertyName("keyspaceName"); - context.Writer.Write(publicRequest.KeyspaceName); - } + JsonWriter writer = new JsonWriter(streamWriter); + writer.Validate = false; + writer.WriteObjectStart(); + var context = new JsonMarshallerContext(request, writer); + if(publicRequest.IsSetKeyspaceName()) + { + context.Writer.WritePropertyName("keyspaceName"); + context.Writer.Write(publicRequest.KeyspaceName); + } - if(publicRequest.IsSetTypeName()) - { - context.Writer.WritePropertyName("typeName"); - context.Writer.Write(publicRequest.TypeName); + if(publicRequest.IsSetTypeName()) + { + context.Writer.WritePropertyName("typeName"); + context.Writer.Write(publicRequest.TypeName); + } + + writer.WriteObjectEnd(); } - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); + request.Content = memoryStream.ToArray(); } diff --git a/sdk/src/Services/Keyspaces/Generated/Model/Internal/MarshallTransformations/GetTypeRequestMarshaller.cs b/sdk/src/Services/Keyspaces/Generated/Model/Internal/MarshallTransformations/GetTypeRequestMarshaller.cs index bb10010bdb7d..34e567510f60 100644 --- a/sdk/src/Services/Keyspaces/Generated/Model/Internal/MarshallTransformations/GetTypeRequestMarshaller.cs +++ b/sdk/src/Services/Keyspaces/Generated/Model/Internal/MarshallTransformations/GetTypeRequestMarshaller.cs @@ -63,27 +63,30 @@ public IRequest Marshall(GetTypeRequest publicRequest) request.HttpMethod = "POST"; request.ResourcePath = "/"; - using (StringWriter stringWriter = new StringWriter(CultureInfo.InvariantCulture)) + using (MemoryStream memoryStream = new MemoryStream()) { - JsonWriter writer = new JsonWriter(stringWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetKeyspaceName()) + using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) { - context.Writer.WritePropertyName("keyspaceName"); - context.Writer.Write(publicRequest.KeyspaceName); - } + JsonWriter writer = new JsonWriter(streamWriter); + writer.Validate = false; + writer.WriteObjectStart(); + var context = new JsonMarshallerContext(request, writer); + if(publicRequest.IsSetKeyspaceName()) + { + context.Writer.WritePropertyName("keyspaceName"); + context.Writer.Write(publicRequest.KeyspaceName); + } - if(publicRequest.IsSetTypeName()) - { - context.Writer.WritePropertyName("typeName"); - context.Writer.Write(publicRequest.TypeName); + if(publicRequest.IsSetTypeName()) + { + context.Writer.WritePropertyName("typeName"); + context.Writer.Write(publicRequest.TypeName); + } + + writer.WriteObjectEnd(); } - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); + request.Content = memoryStream.ToArray(); } diff --git a/sdk/src/Services/Keyspaces/Generated/Model/Internal/MarshallTransformations/GetTypeResponseUnmarshaller.cs b/sdk/src/Services/Keyspaces/Generated/Model/Internal/MarshallTransformations/GetTypeResponseUnmarshaller.cs index 6d6a82b86367..1d5cc4a3a11e 100644 --- a/sdk/src/Services/Keyspaces/Generated/Model/Internal/MarshallTransformations/GetTypeResponseUnmarshaller.cs +++ b/sdk/src/Services/Keyspaces/Generated/Model/Internal/MarshallTransformations/GetTypeResponseUnmarshaller.cs @@ -84,13 +84,13 @@ public override AmazonWebServiceResponse Unmarshall(JsonUnmarshallerContext cont } if (context.TestExpression("lastModifiedTimestamp", targetDepth)) { - var unmarshaller = DateTimeUnmarshaller.Instance; + var unmarshaller = NullableDateTimeUnmarshaller.Instance; response.LastModifiedTimestamp = unmarshaller.Unmarshall(context); continue; } if (context.TestExpression("maxNestingDepth", targetDepth)) { - var unmarshaller = IntUnmarshaller.Instance; + var unmarshaller = NullableIntUnmarshaller.Instance; response.MaxNestingDepth = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/Keyspaces/Generated/Model/Internal/MarshallTransformations/ListTypesRequestMarshaller.cs b/sdk/src/Services/Keyspaces/Generated/Model/Internal/MarshallTransformations/ListTypesRequestMarshaller.cs index 7e7912a0bcf9..b03aa704f4b0 100644 --- a/sdk/src/Services/Keyspaces/Generated/Model/Internal/MarshallTransformations/ListTypesRequestMarshaller.cs +++ b/sdk/src/Services/Keyspaces/Generated/Model/Internal/MarshallTransformations/ListTypesRequestMarshaller.cs @@ -63,33 +63,36 @@ public IRequest Marshall(ListTypesRequest publicRequest) request.HttpMethod = "POST"; request.ResourcePath = "/"; - using (StringWriter stringWriter = new StringWriter(CultureInfo.InvariantCulture)) + using (MemoryStream memoryStream = new MemoryStream()) { - JsonWriter writer = new JsonWriter(stringWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetKeyspaceName()) + using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) { - context.Writer.WritePropertyName("keyspaceName"); - context.Writer.Write(publicRequest.KeyspaceName); - } + JsonWriter writer = new JsonWriter(streamWriter); + writer.Validate = false; + writer.WriteObjectStart(); + var context = new JsonMarshallerContext(request, writer); + if(publicRequest.IsSetKeyspaceName()) + { + context.Writer.WritePropertyName("keyspaceName"); + context.Writer.Write(publicRequest.KeyspaceName); + } - if(publicRequest.IsSetMaxResults()) - { - context.Writer.WritePropertyName("maxResults"); - context.Writer.Write(publicRequest.MaxResults); - } + if(publicRequest.IsSetMaxResults()) + { + context.Writer.WritePropertyName("maxResults"); + context.Writer.Write(publicRequest.MaxResults.Value); + } - if(publicRequest.IsSetNextToken()) - { - context.Writer.WritePropertyName("nextToken"); - context.Writer.Write(publicRequest.NextToken); + if(publicRequest.IsSetNextToken()) + { + context.Writer.WritePropertyName("nextToken"); + context.Writer.Write(publicRequest.NextToken); + } + + writer.WriteObjectEnd(); } - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); + request.Content = memoryStream.ToArray(); } diff --git a/sdk/src/Services/Keyspaces/Generated/Model/ListTypesRequest.cs b/sdk/src/Services/Keyspaces/Generated/Model/ListTypesRequest.cs index d6c8b1667715..36d2631725b9 100644 --- a/sdk/src/Services/Keyspaces/Generated/Model/ListTypesRequest.cs +++ b/sdk/src/Services/Keyspaces/Generated/Model/ListTypesRequest.cs @@ -75,9 +75,9 @@ internal bool IsSetKeyspaceName() /// /// [AWSProperty(Min=1, Max=1000)] - public int MaxResults + public int? MaxResults { - get { return this._maxResults.GetValueOrDefault(); } + get { return this._maxResults; } set { this._maxResults = value; } } diff --git a/sdk/src/Services/Keyspaces/Generated/Model/_bcl45+netstandard/IListTypesPaginator.cs b/sdk/src/Services/Keyspaces/Generated/Model/_bcl+netstandard/IListTypesPaginator.cs similarity index 100% rename from sdk/src/Services/Keyspaces/Generated/Model/_bcl45+netstandard/IListTypesPaginator.cs rename to sdk/src/Services/Keyspaces/Generated/Model/_bcl+netstandard/IListTypesPaginator.cs diff --git a/sdk/src/Services/Keyspaces/Generated/Model/_bcl45+netstandard/ListTypesPaginator.cs b/sdk/src/Services/Keyspaces/Generated/Model/_bcl+netstandard/ListTypesPaginator.cs similarity index 100% rename from sdk/src/Services/Keyspaces/Generated/Model/_bcl45+netstandard/ListTypesPaginator.cs rename to sdk/src/Services/Keyspaces/Generated/Model/_bcl+netstandard/ListTypesPaginator.cs diff --git a/sdk/src/Services/Keyspaces/Generated/_bcl/AmazonKeyspacesClient.cs b/sdk/src/Services/Keyspaces/Generated/_bcl/AmazonKeyspacesClient.cs index 41e175c28b2e..b2cb192d4a14 100644 --- a/sdk/src/Services/Keyspaces/Generated/_bcl/AmazonKeyspacesClient.cs +++ b/sdk/src/Services/Keyspaces/Generated/_bcl/AmazonKeyspacesClient.cs @@ -310,8 +310,8 @@ protected override void Dispose(bool disposing) /// /// /// - /// For more information, see Creating - /// keyspaces in the Amazon Keyspaces Developer Guide. + /// For more information, see Create + /// a keyspace in the Amazon Keyspaces Developer Guide. /// /// /// Container for the necessary parameters to execute the CreateKeyspace service method. @@ -359,8 +359,8 @@ public virtual CreateKeyspaceResponse CreateKeyspace(CreateKeyspaceRequest reque /// /// /// - /// For more information, see Creating - /// keyspaces in the Amazon Keyspaces Developer Guide. + /// For more information, see Create + /// a keyspace in the Amazon Keyspaces Developer Guide. /// /// /// Container for the necessary parameters to execute the CreateKeyspace service method. @@ -417,8 +417,8 @@ public virtual CreateKeyspaceResponse CreateKeyspace(CreateKeyspaceRequest reque /// /// /// - /// For more information, see Creating - /// tables in the Amazon Keyspaces Developer Guide. + /// For more information, see Create + /// a table in the Amazon Keyspaces Developer Guide. /// /// /// Container for the necessary parameters to execute the CreateTable service method. @@ -437,7 +437,7 @@ public virtual CreateKeyspaceResponse CreateKeyspace(CreateKeyspaceRequest reque /// error. /// /// - /// The operation tried to access a keyspace or table that doesn't exist. The resource + /// The operation tried to access a keyspace, table, or type that doesn't exist. The resource /// might not be specified correctly, or its status might not be ACTIVE. /// /// @@ -472,8 +472,8 @@ public virtual CreateTableResponse CreateTable(CreateTableRequest request) /// /// /// - /// For more information, see Creating - /// tables in the Amazon Keyspaces Developer Guide. + /// For more information, see Create + /// a table in the Amazon Keyspaces Developer Guide. /// /// /// Container for the necessary parameters to execute the CreateTable service method. @@ -495,7 +495,7 @@ public virtual CreateTableResponse CreateTable(CreateTableRequest request) /// error. /// /// - /// The operation tried to access a keyspace or table that doesn't exist. The resource + /// The operation tried to access a keyspace, table, or type that doesn't exist. The resource /// might not be specified correctly, or its status might not be ACTIVE. /// /// @@ -518,6 +518,109 @@ public virtual CreateTableResponse CreateTable(CreateTableRequest request) #endregion + #region CreateType + + + /// + /// The CreateType operation creates a new user-defined type in the specified + /// keyspace. + /// + /// + /// + /// For more information, see User-defined + /// types (UDTs) in the Amazon Keyspaces Developer Guide. + /// + /// + /// Container for the necessary parameters to execute the CreateType service method. + /// + /// The response from the CreateType service method, as returned by Keyspaces. + /// + /// You don't have sufficient access permissions to perform this action. + /// + /// + /// Amazon Keyspaces couldn't complete the requested action. This error may occur if you + /// try to perform an action and the same or a different action is already in progress, + /// or if you try to create a resource that already exists. + /// + /// + /// Amazon Keyspaces was unable to fully process this request because of an internal server + /// error. + /// + /// + /// The operation tried to access a keyspace, table, or type that doesn't exist. The resource + /// might not be specified correctly, or its status might not be ACTIVE. + /// + /// + /// The operation exceeded the service quota for this resource. For more information on + /// service quotas, see Quotas + /// in the Amazon Keyspaces Developer Guide. + /// + /// + /// The operation failed due to an invalid or malformed request. + /// + /// REST API Reference for CreateType Operation + public virtual CreateTypeResponse CreateType(CreateTypeRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = CreateTypeRequestMarshaller.Instance; + options.ResponseUnmarshaller = CreateTypeResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// The CreateType operation creates a new user-defined type in the specified + /// keyspace. + /// + /// + /// + /// For more information, see User-defined + /// types (UDTs) in the Amazon Keyspaces Developer Guide. + /// + /// + /// Container for the necessary parameters to execute the CreateType service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the CreateType service method, as returned by Keyspaces. + /// + /// You don't have sufficient access permissions to perform this action. + /// + /// + /// Amazon Keyspaces couldn't complete the requested action. This error may occur if you + /// try to perform an action and the same or a different action is already in progress, + /// or if you try to create a resource that already exists. + /// + /// + /// Amazon Keyspaces was unable to fully process this request because of an internal server + /// error. + /// + /// + /// The operation tried to access a keyspace, table, or type that doesn't exist. The resource + /// might not be specified correctly, or its status might not be ACTIVE. + /// + /// + /// The operation exceeded the service quota for this resource. For more information on + /// service quotas, see Quotas + /// in the Amazon Keyspaces Developer Guide. + /// + /// + /// The operation failed due to an invalid or malformed request. + /// + /// REST API Reference for CreateType Operation + public virtual Task CreateTypeAsync(CreateTypeRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = CreateTypeRequestMarshaller.Instance; + options.ResponseUnmarshaller = CreateTypeResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + #region DeleteKeyspace @@ -540,7 +643,7 @@ public virtual CreateTableResponse CreateTable(CreateTableRequest request) /// error. /// /// - /// The operation tried to access a keyspace or table that doesn't exist. The resource + /// The operation tried to access a keyspace, table, or type that doesn't exist. The resource /// might not be specified correctly, or its status might not be ACTIVE. /// /// @@ -584,7 +687,7 @@ public virtual DeleteKeyspaceResponse DeleteKeyspace(DeleteKeyspaceRequest reque /// error. /// /// - /// The operation tried to access a keyspace or table that doesn't exist. The resource + /// The operation tried to access a keyspace, table, or type that doesn't exist. The resource /// might not be specified correctly, or its status might not be ACTIVE. /// /// @@ -635,7 +738,7 @@ public virtual DeleteKeyspaceResponse DeleteKeyspace(DeleteKeyspaceRequest reque /// error. /// /// - /// The operation tried to access a keyspace or table that doesn't exist. The resource + /// The operation tried to access a keyspace, table, or type that doesn't exist. The resource /// might not be specified correctly, or its status might not be ACTIVE. /// /// @@ -685,7 +788,7 @@ public virtual DeleteTableResponse DeleteTable(DeleteTableRequest request) /// error. /// /// - /// The operation tried to access a keyspace or table that doesn't exist. The resource + /// The operation tried to access a keyspace, table, or type that doesn't exist. The resource /// might not be specified correctly, or its status might not be ACTIVE. /// /// @@ -708,6 +811,97 @@ public virtual DeleteTableResponse DeleteTable(DeleteTableRequest request) #endregion + #region DeleteType + + + /// + /// The DeleteType operation deletes a user-defined type (UDT). You can only delete + /// a type that is not used in a table or another UDT. + /// + /// Container for the necessary parameters to execute the DeleteType service method. + /// + /// The response from the DeleteType service method, as returned by Keyspaces. + /// + /// You don't have sufficient access permissions to perform this action. + /// + /// + /// Amazon Keyspaces couldn't complete the requested action. This error may occur if you + /// try to perform an action and the same or a different action is already in progress, + /// or if you try to create a resource that already exists. + /// + /// + /// Amazon Keyspaces was unable to fully process this request because of an internal server + /// error. + /// + /// + /// The operation tried to access a keyspace, table, or type that doesn't exist. The resource + /// might not be specified correctly, or its status might not be ACTIVE. + /// + /// + /// The operation exceeded the service quota for this resource. For more information on + /// service quotas, see Quotas + /// in the Amazon Keyspaces Developer Guide. + /// + /// + /// The operation failed due to an invalid or malformed request. + /// + /// REST API Reference for DeleteType Operation + public virtual DeleteTypeResponse DeleteType(DeleteTypeRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = DeleteTypeRequestMarshaller.Instance; + options.ResponseUnmarshaller = DeleteTypeResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// The DeleteType operation deletes a user-defined type (UDT). You can only delete + /// a type that is not used in a table or another UDT. + /// + /// Container for the necessary parameters to execute the DeleteType service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the DeleteType service method, as returned by Keyspaces. + /// + /// You don't have sufficient access permissions to perform this action. + /// + /// + /// Amazon Keyspaces couldn't complete the requested action. This error may occur if you + /// try to perform an action and the same or a different action is already in progress, + /// or if you try to create a resource that already exists. + /// + /// + /// Amazon Keyspaces was unable to fully process this request because of an internal server + /// error. + /// + /// + /// The operation tried to access a keyspace, table, or type that doesn't exist. The resource + /// might not be specified correctly, or its status might not be ACTIVE. + /// + /// + /// The operation exceeded the service quota for this resource. For more information on + /// service quotas, see Quotas + /// in the Amazon Keyspaces Developer Guide. + /// + /// + /// The operation failed due to an invalid or malformed request. + /// + /// REST API Reference for DeleteType Operation + public virtual Task DeleteTypeAsync(DeleteTypeRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = DeleteTypeRequestMarshaller.Instance; + options.ResponseUnmarshaller = DeleteTypeResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + #region GetKeyspace @@ -725,7 +919,7 @@ public virtual DeleteTableResponse DeleteTable(DeleteTableRequest request) /// error. /// /// - /// The operation tried to access a keyspace or table that doesn't exist. The resource + /// The operation tried to access a keyspace, table, or type that doesn't exist. The resource /// might not be specified correctly, or its status might not be ACTIVE. /// /// @@ -764,7 +958,7 @@ public virtual GetKeyspaceResponse GetKeyspace(GetKeyspaceRequest request) /// error. /// /// - /// The operation tried to access a keyspace or table that doesn't exist. The resource + /// The operation tried to access a keyspace, table, or type that doesn't exist. The resource /// might not be specified correctly, or its status might not be ACTIVE. /// /// @@ -796,8 +990,8 @@ public virtual GetKeyspaceResponse GetKeyspace(GetKeyspaceRequest request) /// /// /// - /// To read table metadata using GetTable, Select action permissions for - /// the table and system tables are required to complete the operation. + /// To read table metadata using GetTable, the IAM principal needs Select + /// action permissions for the table and the system keyspace. /// /// /// Container for the necessary parameters to execute the GetTable service method. @@ -811,7 +1005,7 @@ public virtual GetKeyspaceResponse GetKeyspace(GetKeyspaceRequest request) /// error. /// /// - /// The operation tried to access a keyspace or table that doesn't exist. The resource + /// The operation tried to access a keyspace, table, or type that doesn't exist. The resource /// might not be specified correctly, or its status might not be ACTIVE. /// /// @@ -839,8 +1033,8 @@ public virtual GetTableResponse GetTable(GetTableRequest request) /// /// /// - /// To read table metadata using GetTable, Select action permissions for - /// the table and system tables are required to complete the operation. + /// To read table metadata using GetTable, the IAM principal needs Select + /// action permissions for the table and the system keyspace. /// /// /// Container for the necessary parameters to execute the GetTable service method. @@ -857,7 +1051,7 @@ public virtual GetTableResponse GetTable(GetTableRequest request) /// error. /// /// - /// The operation tried to access a keyspace or table that doesn't exist. The resource + /// The operation tried to access a keyspace, table, or type that doesn't exist. The resource /// might not be specified correctly, or its status might not be ACTIVE. /// /// @@ -926,7 +1120,7 @@ public virtual GetTableResponse GetTable(GetTableRequest request) /// error. /// /// - /// The operation tried to access a keyspace or table that doesn't exist. The resource + /// The operation tried to access a keyspace, table, or type that doesn't exist. The resource /// might not be specified correctly, or its status might not be ACTIVE. /// /// @@ -994,7 +1188,7 @@ public virtual GetTableAutoScalingSettingsResponse GetTableAutoScalingSettings(G /// error. /// /// - /// The operation tried to access a keyspace or table that doesn't exist. The resource + /// The operation tried to access a keyspace, table, or type that doesn't exist. The resource /// might not be specified correctly, or its status might not be ACTIVE. /// /// @@ -1017,11 +1211,106 @@ public virtual GetTableAutoScalingSettingsResponse GetTableAutoScalingSettings(G #endregion + #region GetType + + + /// + /// The GetType operation returns information about the type, for example the + /// field definitions, the timestamp when the type was last modified, the level of nesting, + /// the status, and details about if the type is used in other types and tables. + /// + /// + /// + /// To read keyspace metadata using GetType, the IAM principal needs Select + /// action permissions for the system keyspace. + /// + /// + /// Container for the necessary parameters to execute the GetType service method. + /// + /// The response from the GetType service method, as returned by Keyspaces. + /// + /// You don't have sufficient access permissions to perform this action. + /// + /// + /// Amazon Keyspaces was unable to fully process this request because of an internal server + /// error. + /// + /// + /// The operation tried to access a keyspace, table, or type that doesn't exist. The resource + /// might not be specified correctly, or its status might not be ACTIVE. + /// + /// + /// The operation exceeded the service quota for this resource. For more information on + /// service quotas, see Quotas + /// in the Amazon Keyspaces Developer Guide. + /// + /// + /// The operation failed due to an invalid or malformed request. + /// + /// REST API Reference for GetType Operation + public virtual GetTypeResponse GetType(GetTypeRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = GetTypeRequestMarshaller.Instance; + options.ResponseUnmarshaller = GetTypeResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// The GetType operation returns information about the type, for example the + /// field definitions, the timestamp when the type was last modified, the level of nesting, + /// the status, and details about if the type is used in other types and tables. + /// + /// + /// + /// To read keyspace metadata using GetType, the IAM principal needs Select + /// action permissions for the system keyspace. + /// + /// + /// Container for the necessary parameters to execute the GetType service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the GetType service method, as returned by Keyspaces. + /// + /// You don't have sufficient access permissions to perform this action. + /// + /// + /// Amazon Keyspaces was unable to fully process this request because of an internal server + /// error. + /// + /// + /// The operation tried to access a keyspace, table, or type that doesn't exist. The resource + /// might not be specified correctly, or its status might not be ACTIVE. + /// + /// + /// The operation exceeded the service quota for this resource. For more information on + /// service quotas, see Quotas + /// in the Amazon Keyspaces Developer Guide. + /// + /// + /// The operation failed due to an invalid or malformed request. + /// + /// REST API Reference for GetType Operation + public virtual Task GetTypeAsync(GetTypeRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = GetTypeRequestMarshaller.Instance; + options.ResponseUnmarshaller = GetTypeResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + #region ListKeyspaces /// - /// Returns a list of keyspaces. + /// The ListKeyspaces operation returns a list of keyspaces. /// /// Container for the necessary parameters to execute the ListKeyspaces service method. /// @@ -1034,7 +1323,7 @@ public virtual GetTableAutoScalingSettingsResponse GetTableAutoScalingSettings(G /// error. /// /// - /// The operation tried to access a keyspace or table that doesn't exist. The resource + /// The operation tried to access a keyspace, table, or type that doesn't exist. The resource /// might not be specified correctly, or its status might not be ACTIVE. /// /// @@ -1057,7 +1346,7 @@ public virtual ListKeyspacesResponse ListKeyspaces(ListKeyspacesRequest request) /// - /// Returns a list of keyspaces. + /// The ListKeyspaces operation returns a list of keyspaces. /// /// Container for the necessary parameters to execute the ListKeyspaces service method. /// @@ -1073,7 +1362,7 @@ public virtual ListKeyspacesResponse ListKeyspaces(ListKeyspacesRequest request) /// error. /// /// - /// The operation tried to access a keyspace or table that doesn't exist. The resource + /// The operation tried to access a keyspace, table, or type that doesn't exist. The resource /// might not be specified correctly, or its status might not be ACTIVE. /// /// @@ -1100,7 +1389,13 @@ public virtual ListKeyspacesResponse ListKeyspaces(ListKeyspacesRequest request) /// - /// Returns a list of tables for a specified keyspace. + /// The ListTables operation returns a list of tables for a specified keyspace. + /// + /// + /// + /// To read keyspace metadata using ListTables, the IAM principal needs Select + /// action permissions for the system keyspace. + /// /// /// Container for the necessary parameters to execute the ListTables service method. /// @@ -1113,7 +1408,7 @@ public virtual ListKeyspacesResponse ListKeyspaces(ListKeyspacesRequest request) /// error. /// /// - /// The operation tried to access a keyspace or table that doesn't exist. The resource + /// The operation tried to access a keyspace, table, or type that doesn't exist. The resource /// might not be specified correctly, or its status might not be ACTIVE. /// /// @@ -1136,7 +1431,13 @@ public virtual ListTablesResponse ListTables(ListTablesRequest request) /// - /// Returns a list of tables for a specified keyspace. + /// The ListTables operation returns a list of tables for a specified keyspace. + /// + /// + /// + /// To read keyspace metadata using ListTables, the IAM principal needs Select + /// action permissions for the system keyspace. + /// /// /// Container for the necessary parameters to execute the ListTables service method. /// @@ -1152,7 +1453,7 @@ public virtual ListTablesResponse ListTables(ListTablesRequest request) /// error. /// /// - /// The operation tried to access a keyspace or table that doesn't exist. The resource + /// The operation tried to access a keyspace, table, or type that doesn't exist. The resource /// might not be specified correctly, or its status might not be ACTIVE. /// /// @@ -1180,6 +1481,12 @@ public virtual ListTablesResponse ListTables(ListTablesRequest request) /// /// Returns a list of all tags associated with the specified Amazon Keyspaces resource. + /// + /// + /// + /// To read keyspace metadata using ListTagsForResource, the IAM principal needs + /// Select action permissions for the specified resource and the system keyspace. + /// /// /// Container for the necessary parameters to execute the ListTagsForResource service method. /// @@ -1192,7 +1499,7 @@ public virtual ListTablesResponse ListTables(ListTablesRequest request) /// error. /// /// - /// The operation tried to access a keyspace or table that doesn't exist. The resource + /// The operation tried to access a keyspace, table, or type that doesn't exist. The resource /// might not be specified correctly, or its status might not be ACTIVE. /// /// @@ -1216,6 +1523,12 @@ public virtual ListTagsForResourceResponse ListTagsForResource(ListTagsForResour /// /// Returns a list of all tags associated with the specified Amazon Keyspaces resource. + /// + /// + /// + /// To read keyspace metadata using ListTagsForResource, the IAM principal needs + /// Select action permissions for the specified resource and the system keyspace. + /// /// /// Container for the necessary parameters to execute the ListTagsForResource service method. /// @@ -1231,7 +1544,7 @@ public virtual ListTagsForResourceResponse ListTagsForResource(ListTagsForResour /// error. /// /// - /// The operation tried to access a keyspace or table that doesn't exist. The resource + /// The operation tried to access a keyspace, table, or type that doesn't exist. The resource /// might not be specified correctly, or its status might not be ACTIVE. /// /// @@ -1254,6 +1567,99 @@ public virtual ListTagsForResourceResponse ListTagsForResource(ListTagsForResour #endregion + #region ListTypes + + + /// + /// The ListTypes operation returns a list of types for a specified keyspace. + /// + /// + /// + /// + /// To read keyspace metadata using ListTypes, the IAM principal needs Select + /// action permissions for the system keyspace. + /// + /// + /// Container for the necessary parameters to execute the ListTypes service method. + /// + /// The response from the ListTypes service method, as returned by Keyspaces. + /// + /// You don't have sufficient access permissions to perform this action. + /// + /// + /// Amazon Keyspaces was unable to fully process this request because of an internal server + /// error. + /// + /// + /// The operation tried to access a keyspace, table, or type that doesn't exist. The resource + /// might not be specified correctly, or its status might not be ACTIVE. + /// + /// + /// The operation exceeded the service quota for this resource. For more information on + /// service quotas, see Quotas + /// in the Amazon Keyspaces Developer Guide. + /// + /// + /// The operation failed due to an invalid or malformed request. + /// + /// REST API Reference for ListTypes Operation + public virtual ListTypesResponse ListTypes(ListTypesRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = ListTypesRequestMarshaller.Instance; + options.ResponseUnmarshaller = ListTypesResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// The ListTypes operation returns a list of types for a specified keyspace. + /// + /// + /// + /// + /// To read keyspace metadata using ListTypes, the IAM principal needs Select + /// action permissions for the system keyspace. + /// + /// + /// Container for the necessary parameters to execute the ListTypes service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the ListTypes service method, as returned by Keyspaces. + /// + /// You don't have sufficient access permissions to perform this action. + /// + /// + /// Amazon Keyspaces was unable to fully process this request because of an internal server + /// error. + /// + /// + /// The operation tried to access a keyspace, table, or type that doesn't exist. The resource + /// might not be specified correctly, or its status might not be ACTIVE. + /// + /// + /// The operation exceeded the service quota for this resource. For more information on + /// service quotas, see Quotas + /// in the Amazon Keyspaces Developer Guide. + /// + /// + /// The operation failed due to an invalid or malformed request. + /// + /// REST API Reference for ListTypes Operation + public virtual Task ListTypesAsync(ListTypesRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = ListTypesRequestMarshaller.Instance; + options.ResponseUnmarshaller = ListTypesResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + #region RestoreTable @@ -1342,7 +1748,7 @@ public virtual ListTagsForResourceResponse ListTagsForResource(ListTagsForResour /// error. /// /// - /// The operation tried to access a keyspace or table that doesn't exist. The resource + /// The operation tried to access a keyspace, table, or type that doesn't exist. The resource /// might not be specified correctly, or its status might not be ACTIVE. /// /// @@ -1452,7 +1858,7 @@ public virtual RestoreTableResponse RestoreTable(RestoreTableRequest request) /// error. /// /// - /// The operation tried to access a keyspace or table that doesn't exist. The resource + /// The operation tried to access a keyspace, table, or type that doesn't exist. The resource /// might not be specified correctly, or its status might not be ACTIVE. /// /// @@ -1498,12 +1904,17 @@ public virtual RestoreTableResponse RestoreTable(RestoreTableRequest request) /// /// You don't have sufficient access permissions to perform this action. /// + /// + /// Amazon Keyspaces couldn't complete the requested action. This error may occur if you + /// try to perform an action and the same or a different action is already in progress, + /// or if you try to create a resource that already exists. + /// /// /// Amazon Keyspaces was unable to fully process this request because of an internal server /// error. /// /// - /// The operation tried to access a keyspace or table that doesn't exist. The resource + /// The operation tried to access a keyspace, table, or type that doesn't exist. The resource /// might not be specified correctly, or its status might not be ACTIVE. /// /// @@ -1548,12 +1959,17 @@ public virtual TagResourceResponse TagResource(TagResourceRequest request) /// /// You don't have sufficient access permissions to perform this action. /// + /// + /// Amazon Keyspaces couldn't complete the requested action. This error may occur if you + /// try to perform an action and the same or a different action is already in progress, + /// or if you try to create a resource that already exists. + /// /// /// Amazon Keyspaces was unable to fully process this request because of an internal server /// error. /// /// - /// The operation tried to access a keyspace or table that doesn't exist. The resource + /// The operation tried to access a keyspace, table, or type that doesn't exist. The resource /// might not be specified correctly, or its status might not be ACTIVE. /// /// @@ -1598,7 +2014,7 @@ public virtual TagResourceResponse TagResource(TagResourceRequest request) /// error. /// /// - /// The operation tried to access a keyspace or table that doesn't exist. The resource + /// The operation tried to access a keyspace, table, or type that doesn't exist. The resource /// might not be specified correctly, or its status might not be ACTIVE. /// /// @@ -1642,7 +2058,7 @@ public virtual UntagResourceResponse UntagResource(UntagResourceRequest request) /// error. /// /// - /// The operation tried to access a keyspace or table that doesn't exist. The resource + /// The operation tried to access a keyspace, table, or type that doesn't exist. The resource /// might not be specified correctly, or its status might not be ACTIVE. /// /// @@ -1689,7 +2105,7 @@ public virtual UntagResourceResponse UntagResource(UntagResourceRequest request) /// error. /// /// - /// The operation tried to access a keyspace or table that doesn't exist. The resource + /// The operation tried to access a keyspace, table, or type that doesn't exist. The resource /// might not be specified correctly, or its status might not be ACTIVE. /// /// @@ -1735,7 +2151,7 @@ public virtual UpdateTableResponse UpdateTable(UpdateTableRequest request) /// error. /// /// - /// The operation tried to access a keyspace or table that doesn't exist. The resource + /// The operation tried to access a keyspace, table, or type that doesn't exist. The resource /// might not be specified correctly, or its status might not be ACTIVE. /// /// diff --git a/sdk/src/Services/Keyspaces/Keyspaces.sln b/sdk/src/Services/Keyspaces/Keyspaces.sln index 39cecfbaf976..d60ed32b35c8 100644 --- a/sdk/src/Services/Keyspaces/Keyspaces.sln +++ b/sdk/src/Services/Keyspaces/Keyspaces.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {4EFDF128-83D6-4218-8443-6BDCC796E734}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {4EFDF128-83D6-4218-8443-6BDCC796E734}.Debug|Any CPU.Build.0 = Debug|Any CPU {4EFDF128-83D6-4218-8443-6BDCC796E734}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {8A047A7A-3F02-4524-A87A-23825A0F66FD}.Debug|Any CPU.Build.0 = Debug|Any CPU {8A047A7A-3F02-4524-A87A-23825A0F66FD}.Release|Any CPU.ActiveCfg = Release|Any CPU {8A047A7A-3F02-4524-A87A-23825A0F66FD}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {341ED7A3-85D4-4C45-9861-63D394142677}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {341ED7A3-85D4-4C45-9861-63D394142677}.Debug|Any CPU.Build.0 = Debug|Any CPU - {341ED7A3-85D4-4C45-9861-63D394142677}.Release|Any CPU.ActiveCfg = Release|Any CPU - {341ED7A3-85D4-4C45-9861-63D394142677}.Release|Any CPU.Build.0 = Release|Any CPU - {9E00A049-E3C0-4779-88D3-FA25A0CCC469}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9E00A049-E3C0-4779-88D3-FA25A0CCC469}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9E00A049-E3C0-4779-88D3-FA25A0CCC469}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9E00A049-E3C0-4779-88D3-FA25A0CCC469}.Release|Any CPU.Build.0 = Release|Any CPU - {28137974-D8BC-4AB6-94C3-753201D50D23}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {28137974-D8BC-4AB6-94C3-753201D50D23}.Debug|Any CPU.Build.0 = Debug|Any CPU - {28137974-D8BC-4AB6-94C3-753201D50D23}.Release|Any CPU.ActiveCfg = Release|Any CPU - {28137974-D8BC-4AB6-94C3-753201D50D23}.Release|Any CPU.Build.0 = Release|Any CPU - {F85F6999-4C9A-4B45-8A89-9AF8BF52527C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F85F6999-4C9A-4B45-8A89-9AF8BF52527C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F85F6999-4C9A-4B45-8A89-9AF8BF52527C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F85F6999-4C9A-4B45-8A89-9AF8BF52527C}.Release|Any CPU.Build.0 = Release|Any CPU - {719996BD-395C-4E78-8262-882ECEB1065C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {719996BD-395C-4E78-8262-882ECEB1065C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {719996BD-395C-4E78-8262-882ECEB1065C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {719996BD-395C-4E78-8262-882ECEB1065C}.Release|Any CPU.Build.0 = Release|Any CPU - {2DD688C6-6834-4807-AD7E-EC244F7DE4E4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2DD688C6-6834-4807-AD7E-EC244F7DE4E4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2DD688C6-6834-4807-AD7E-EC244F7DE4E4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2DD688C6-6834-4807-AD7E-EC244F7DE4E4}.Release|Any CPU.Build.0 = Release|Any CPU - {EF40F47B-3B4B-450A-AB50-E9A1317FCFE2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EF40F47B-3B4B-450A-AB50-E9A1317FCFE2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EF40F47B-3B4B-450A-AB50-E9A1317FCFE2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EF40F47B-3B4B-450A-AB50-E9A1317FCFE2}.Release|Any CPU.Build.0 = Release|Any CPU - {C9AAB91B-EF51-4CB2-848E-03DE9CB50396}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C9AAB91B-EF51-4CB2-848E-03DE9CB50396}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C9AAB91B-EF51-4CB2-848E-03DE9CB50396}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C9AAB91B-EF51-4CB2-848E-03DE9CB50396}.Release|Any CPU.Build.0 = Release|Any CPU - {94348BF6-2CFD-42CE-A8DC-2F498029FAA9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {94348BF6-2CFD-42CE-A8DC-2F498029FAA9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {94348BF6-2CFD-42CE-A8DC-2F498029FAA9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {94348BF6-2CFD-42CE-A8DC-2F498029FAA9}.Release|Any CPU.Build.0 = Release|Any CPU - {4CDF4EED-F672-4C75-89BE-8A4B25D6FA3E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4CDF4EED-F672-4C75-89BE-8A4B25D6FA3E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4CDF4EED-F672-4C75-89BE-8A4B25D6FA3E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4CDF4EED-F672-4C75-89BE-8A4B25D6FA3E}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {341ED7A3-85D4-4C45-9861-63D394142677}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {341ED7A3-85D4-4C45-9861-63D394142677}.Debug|Any CPU.Build.0 = Debug|Any CPU - {341ED7A3-85D4-4C45-9861-63D394142677}.Release|Any CPU.ActiveCfg = Release|Any CPU - {341ED7A3-85D4-4C45-9861-63D394142677}.Release|Any CPU.Build.0 = Release|Any CPU - {9E00A049-E3C0-4779-88D3-FA25A0CCC469}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9E00A049-E3C0-4779-88D3-FA25A0CCC469}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9E00A049-E3C0-4779-88D3-FA25A0CCC469}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9E00A049-E3C0-4779-88D3-FA25A0CCC469}.Release|Any CPU.Build.0 = Release|Any CPU - {28137974-D8BC-4AB6-94C3-753201D50D23}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {28137974-D8BC-4AB6-94C3-753201D50D23}.Debug|Any CPU.Build.0 = Debug|Any CPU - {28137974-D8BC-4AB6-94C3-753201D50D23}.Release|Any CPU.ActiveCfg = Release|Any CPU - {28137974-D8BC-4AB6-94C3-753201D50D23}.Release|Any CPU.Build.0 = Release|Any CPU - {F85F6999-4C9A-4B45-8A89-9AF8BF52527C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F85F6999-4C9A-4B45-8A89-9AF8BF52527C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F85F6999-4C9A-4B45-8A89-9AF8BF52527C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F85F6999-4C9A-4B45-8A89-9AF8BF52527C}.Release|Any CPU.Build.0 = Release|Any CPU - {719996BD-395C-4E78-8262-882ECEB1065C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {719996BD-395C-4E78-8262-882ECEB1065C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {719996BD-395C-4E78-8262-882ECEB1065C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {719996BD-395C-4E78-8262-882ECEB1065C}.Release|Any CPU.Build.0 = Release|Any CPU - {2DD688C6-6834-4807-AD7E-EC244F7DE4E4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2DD688C6-6834-4807-AD7E-EC244F7DE4E4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2DD688C6-6834-4807-AD7E-EC244F7DE4E4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2DD688C6-6834-4807-AD7E-EC244F7DE4E4}.Release|Any CPU.Build.0 = Release|Any CPU - {EF40F47B-3B4B-450A-AB50-E9A1317FCFE2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EF40F47B-3B4B-450A-AB50-E9A1317FCFE2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EF40F47B-3B4B-450A-AB50-E9A1317FCFE2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EF40F47B-3B4B-450A-AB50-E9A1317FCFE2}.Release|Any CPU.Build.0 = Release|Any CPU - {C9AAB91B-EF51-4CB2-848E-03DE9CB50396}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C9AAB91B-EF51-4CB2-848E-03DE9CB50396}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C9AAB91B-EF51-4CB2-848E-03DE9CB50396}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C9AAB91B-EF51-4CB2-848E-03DE9CB50396}.Release|Any CPU.Build.0 = Release|Any CPU - {94348BF6-2CFD-42CE-A8DC-2F498029FAA9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {94348BF6-2CFD-42CE-A8DC-2F498029FAA9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {94348BF6-2CFD-42CE-A8DC-2F498029FAA9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {94348BF6-2CFD-42CE-A8DC-2F498029FAA9}.Release|Any CPU.Build.0 = Release|Any CPU - {4CDF4EED-F672-4C75-89BE-8A4B25D6FA3E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4CDF4EED-F672-4C75-89BE-8A4B25D6FA3E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4CDF4EED-F672-4C75-89BE-8A4B25D6FA3E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4CDF4EED-F672-4C75-89BE-8A4B25D6FA3E}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {4EFDF128-83D6-4218-8443-6BDCC796E734} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {1365ABA2-EED9-4F27-8F06-BE78B8F162DB} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {34FC1C17-0BFA-43CD-BCEE-C6157BD17F28} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {90712A6D-6075-4736-8A50-73EF4AE5C707} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {8A047A7A-3F02-4524-A87A-23825A0F66FD} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {341ED7A3-85D4-4C45-9861-63D394142677} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {9E00A049-E3C0-4779-88D3-FA25A0CCC469} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {28137974-D8BC-4AB6-94C3-753201D50D23} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F85F6999-4C9A-4B45-8A89-9AF8BF52527C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {719996BD-395C-4E78-8262-882ECEB1065C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {2DD688C6-6834-4807-AD7E-EC244F7DE4E4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {EF40F47B-3B4B-450A-AB50-E9A1317FCFE2} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C9AAB91B-EF51-4CB2-848E-03DE9CB50396} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {94348BF6-2CFD-42CE-A8DC-2F498029FAA9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4CDF4EED-F672-4C75-89BE-8A4B25D6FA3E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {341ED7A3-85D4-4C45-9861-63D394142677} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {9E00A049-E3C0-4779-88D3-FA25A0CCC469} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {28137974-D8BC-4AB6-94C3-753201D50D23} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F85F6999-4C9A-4B45-8A89-9AF8BF52527C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {719996BD-395C-4E78-8262-882ECEB1065C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {2DD688C6-6834-4807-AD7E-EC244F7DE4E4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {EF40F47B-3B4B-450A-AB50-E9A1317FCFE2} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C9AAB91B-EF51-4CB2-848E-03DE9CB50396} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {94348BF6-2CFD-42CE-A8DC-2F498029FAA9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4CDF4EED-F672-4C75-89BE-8A4B25D6FA3E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {232CFF90-0CB1-4FE5-9FED-910857B0EDE8} diff --git a/sdk/src/Services/Keyspaces/Properties/AssemblyInfo.cs b/sdk/src/Services/Keyspaces/Properties/AssemblyInfo.cs index 934bc4602b19..cabfe7718f90 100644 --- a/sdk/src/Services/Keyspaces/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/Keyspaces/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.10")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/Kinesis/Generated/AmazonKinesisConfig.cs b/sdk/src/Services/Kinesis/Generated/AmazonKinesisConfig.cs index 56d5ac4c6eee..21af4206dd3d 100644 --- a/sdk/src/Services/Kinesis/Generated/AmazonKinesisConfig.cs +++ b/sdk/src/Services/Kinesis/Generated/AmazonKinesisConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.Kinesis public partial class AmazonKinesisConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("Kinesis", "4.0.0.0"); private static readonly AmazonKinesisEndpointResolver EndpointResolver = new AmazonKinesisEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("Kinesis", "3.7.402.3"); -======= - InternalSDKUtils.BuildUserAgentString("Kinesis", "3.7.402.30"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/Kinesis/Kinesis.sln b/sdk/src/Services/Kinesis/Kinesis.sln index f5dc1ed7ac2c..ad955f9b8479 100644 --- a/sdk/src/Services/Kinesis/Kinesis.sln +++ b/sdk/src/Services/Kinesis/Kinesis.sln @@ -94,7 +94,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {EC0D5342-B9AE-49F0-A91F-2274C464AD8C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {EC0D5342-B9AE-49F0-A91F-2274C464AD8C}.Debug|Any CPU.Build.0 = Debug|Any CPU {EC0D5342-B9AE-49F0-A91F-2274C464AD8C}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -119,113 +126,6 @@ Global {C83F3D56-E261-48BF-8063-1C0C57295EF5}.Debug|Any CPU.Build.0 = Debug|Any CPU {C83F3D56-E261-48BF-8063-1C0C57295EF5}.Release|Any CPU.ActiveCfg = Release|Any CPU {C83F3D56-E261-48BF-8063-1C0C57295EF5}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {9B3275A0-0C48-44CC-8204-09B339AB7ED3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9B3275A0-0C48-44CC-8204-09B339AB7ED3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9B3275A0-0C48-44CC-8204-09B339AB7ED3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9B3275A0-0C48-44CC-8204-09B339AB7ED3}.Release|Any CPU.Build.0 = Release|Any CPU - {0066AF11-FFBC-4D97-AEF2-DC12F8240CA7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0066AF11-FFBC-4D97-AEF2-DC12F8240CA7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0066AF11-FFBC-4D97-AEF2-DC12F8240CA7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0066AF11-FFBC-4D97-AEF2-DC12F8240CA7}.Release|Any CPU.Build.0 = Release|Any CPU - {40CED242-BF11-4F5C-B0E6-FAD139CA1221}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {40CED242-BF11-4F5C-B0E6-FAD139CA1221}.Debug|Any CPU.Build.0 = Debug|Any CPU - {40CED242-BF11-4F5C-B0E6-FAD139CA1221}.Release|Any CPU.ActiveCfg = Release|Any CPU - {40CED242-BF11-4F5C-B0E6-FAD139CA1221}.Release|Any CPU.Build.0 = Release|Any CPU - {A6D24CA1-B8B0-4C5E-840C-9BE29E8EBCED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A6D24CA1-B8B0-4C5E-840C-9BE29E8EBCED}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A6D24CA1-B8B0-4C5E-840C-9BE29E8EBCED}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A6D24CA1-B8B0-4C5E-840C-9BE29E8EBCED}.Release|Any CPU.Build.0 = Release|Any CPU - {E76A955F-BC0D-44F5-BD2D-6BBCFAAF08CB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E76A955F-BC0D-44F5-BD2D-6BBCFAAF08CB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E76A955F-BC0D-44F5-BD2D-6BBCFAAF08CB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E76A955F-BC0D-44F5-BD2D-6BBCFAAF08CB}.Release|Any CPU.Build.0 = Release|Any CPU - {2A684974-E953-4712-B338-C14B9DC0B63C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2A684974-E953-4712-B338-C14B9DC0B63C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2A684974-E953-4712-B338-C14B9DC0B63C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2A684974-E953-4712-B338-C14B9DC0B63C}.Release|Any CPU.Build.0 = Release|Any CPU - {040E47F3-01FF-4D1E-8841-BBD05163FB58}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {040E47F3-01FF-4D1E-8841-BBD05163FB58}.Debug|Any CPU.Build.0 = Debug|Any CPU - {040E47F3-01FF-4D1E-8841-BBD05163FB58}.Release|Any CPU.ActiveCfg = Release|Any CPU - {040E47F3-01FF-4D1E-8841-BBD05163FB58}.Release|Any CPU.Build.0 = Release|Any CPU - {1BDED581-E57F-4CB0-87F6-3CBC411E892E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1BDED581-E57F-4CB0-87F6-3CBC411E892E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1BDED581-E57F-4CB0-87F6-3CBC411E892E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1BDED581-E57F-4CB0-87F6-3CBC411E892E}.Release|Any CPU.Build.0 = Release|Any CPU - {AF8B4BA6-465A-48CD-A13C-B871904F3EE0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AF8B4BA6-465A-48CD-A13C-B871904F3EE0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AF8B4BA6-465A-48CD-A13C-B871904F3EE0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AF8B4BA6-465A-48CD-A13C-B871904F3EE0}.Release|Any CPU.Build.0 = Release|Any CPU - {576CED1F-02AF-4FB3-9C97-22703BE653DD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {576CED1F-02AF-4FB3-9C97-22703BE653DD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {576CED1F-02AF-4FB3-9C97-22703BE653DD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {576CED1F-02AF-4FB3-9C97-22703BE653DD}.Release|Any CPU.Build.0 = Release|Any CPU - {A335DCA9-4A5D-4E54-B9D0-CA7253EB892D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A335DCA9-4A5D-4E54-B9D0-CA7253EB892D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A335DCA9-4A5D-4E54-B9D0-CA7253EB892D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A335DCA9-4A5D-4E54-B9D0-CA7253EB892D}.Release|Any CPU.Build.0 = Release|Any CPU - {B010072D-AC54-4BE0-ADD6-ED954288DED5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B010072D-AC54-4BE0-ADD6-ED954288DED5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B010072D-AC54-4BE0-ADD6-ED954288DED5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B010072D-AC54-4BE0-ADD6-ED954288DED5}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {9B3275A0-0C48-44CC-8204-09B339AB7ED3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9B3275A0-0C48-44CC-8204-09B339AB7ED3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9B3275A0-0C48-44CC-8204-09B339AB7ED3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9B3275A0-0C48-44CC-8204-09B339AB7ED3}.Release|Any CPU.Build.0 = Release|Any CPU - {0066AF11-FFBC-4D97-AEF2-DC12F8240CA7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0066AF11-FFBC-4D97-AEF2-DC12F8240CA7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0066AF11-FFBC-4D97-AEF2-DC12F8240CA7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0066AF11-FFBC-4D97-AEF2-DC12F8240CA7}.Release|Any CPU.Build.0 = Release|Any CPU - {40CED242-BF11-4F5C-B0E6-FAD139CA1221}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {40CED242-BF11-4F5C-B0E6-FAD139CA1221}.Debug|Any CPU.Build.0 = Debug|Any CPU - {40CED242-BF11-4F5C-B0E6-FAD139CA1221}.Release|Any CPU.ActiveCfg = Release|Any CPU - {40CED242-BF11-4F5C-B0E6-FAD139CA1221}.Release|Any CPU.Build.0 = Release|Any CPU - {A6D24CA1-B8B0-4C5E-840C-9BE29E8EBCED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A6D24CA1-B8B0-4C5E-840C-9BE29E8EBCED}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A6D24CA1-B8B0-4C5E-840C-9BE29E8EBCED}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A6D24CA1-B8B0-4C5E-840C-9BE29E8EBCED}.Release|Any CPU.Build.0 = Release|Any CPU - {E76A955F-BC0D-44F5-BD2D-6BBCFAAF08CB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E76A955F-BC0D-44F5-BD2D-6BBCFAAF08CB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E76A955F-BC0D-44F5-BD2D-6BBCFAAF08CB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E76A955F-BC0D-44F5-BD2D-6BBCFAAF08CB}.Release|Any CPU.Build.0 = Release|Any CPU - {2A684974-E953-4712-B338-C14B9DC0B63C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2A684974-E953-4712-B338-C14B9DC0B63C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2A684974-E953-4712-B338-C14B9DC0B63C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2A684974-E953-4712-B338-C14B9DC0B63C}.Release|Any CPU.Build.0 = Release|Any CPU - {040E47F3-01FF-4D1E-8841-BBD05163FB58}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {040E47F3-01FF-4D1E-8841-BBD05163FB58}.Debug|Any CPU.Build.0 = Debug|Any CPU - {040E47F3-01FF-4D1E-8841-BBD05163FB58}.Release|Any CPU.ActiveCfg = Release|Any CPU - {040E47F3-01FF-4D1E-8841-BBD05163FB58}.Release|Any CPU.Build.0 = Release|Any CPU - {1BDED581-E57F-4CB0-87F6-3CBC411E892E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1BDED581-E57F-4CB0-87F6-3CBC411E892E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1BDED581-E57F-4CB0-87F6-3CBC411E892E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1BDED581-E57F-4CB0-87F6-3CBC411E892E}.Release|Any CPU.Build.0 = Release|Any CPU - {AF8B4BA6-465A-48CD-A13C-B871904F3EE0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AF8B4BA6-465A-48CD-A13C-B871904F3EE0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AF8B4BA6-465A-48CD-A13C-B871904F3EE0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AF8B4BA6-465A-48CD-A13C-B871904F3EE0}.Release|Any CPU.Build.0 = Release|Any CPU - {576CED1F-02AF-4FB3-9C97-22703BE653DD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {576CED1F-02AF-4FB3-9C97-22703BE653DD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {576CED1F-02AF-4FB3-9C97-22703BE653DD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {576CED1F-02AF-4FB3-9C97-22703BE653DD}.Release|Any CPU.Build.0 = Release|Any CPU - {A335DCA9-4A5D-4E54-B9D0-CA7253EB892D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A335DCA9-4A5D-4E54-B9D0-CA7253EB892D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A335DCA9-4A5D-4E54-B9D0-CA7253EB892D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A335DCA9-4A5D-4E54-B9D0-CA7253EB892D}.Release|Any CPU.Build.0 = Release|Any CPU - {B010072D-AC54-4BE0-ADD6-ED954288DED5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B010072D-AC54-4BE0-ADD6-ED954288DED5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B010072D-AC54-4BE0-ADD6-ED954288DED5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B010072D-AC54-4BE0-ADD6-ED954288DED5}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -242,42 +142,14 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {EC0D5342-B9AE-49F0-A91F-2274C464AD8C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {646BD448-1202-433C-BCC8-E5FF16BCB973} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {3E37CB2C-C732-4743-B7FA-53606AB8FBCD} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {1F1F0E3D-F435-4505-BFA0-631D816B9104} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {790798FD-EE74-4A86-B44B-17B636F08482} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {C83F3D56-E261-48BF-8063-1C0C57295EF5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {9B3275A0-0C48-44CC-8204-09B339AB7ED3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0066AF11-FFBC-4D97-AEF2-DC12F8240CA7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {40CED242-BF11-4F5C-B0E6-FAD139CA1221} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A6D24CA1-B8B0-4C5E-840C-9BE29E8EBCED} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E76A955F-BC0D-44F5-BD2D-6BBCFAAF08CB} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {2A684974-E953-4712-B338-C14B9DC0B63C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {040E47F3-01FF-4D1E-8841-BBD05163FB58} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {1BDED581-E57F-4CB0-87F6-3CBC411E892E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {AF8B4BA6-465A-48CD-A13C-B871904F3EE0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {576CED1F-02AF-4FB3-9C97-22703BE653DD} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A335DCA9-4A5D-4E54-B9D0-CA7253EB892D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B010072D-AC54-4BE0-ADD6-ED954288DED5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {9B3275A0-0C48-44CC-8204-09B339AB7ED3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0066AF11-FFBC-4D97-AEF2-DC12F8240CA7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {40CED242-BF11-4F5C-B0E6-FAD139CA1221} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A6D24CA1-B8B0-4C5E-840C-9BE29E8EBCED} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E76A955F-BC0D-44F5-BD2D-6BBCFAAF08CB} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {2A684974-E953-4712-B338-C14B9DC0B63C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {040E47F3-01FF-4D1E-8841-BBD05163FB58} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {1BDED581-E57F-4CB0-87F6-3CBC411E892E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {AF8B4BA6-465A-48CD-A13C-B871904F3EE0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {576CED1F-02AF-4FB3-9C97-22703BE653DD} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A335DCA9-4A5D-4E54-B9D0-CA7253EB892D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B010072D-AC54-4BE0-ADD6-ED954288DED5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {4573B470-AEC3-4742-9A6A-3B8B04281DA3} diff --git a/sdk/src/Services/Kinesis/Properties/AssemblyInfo.cs b/sdk/src/Services/Kinesis/Properties/AssemblyInfo.cs index d9593aa8c52e..407be52ab3a2 100644 --- a/sdk/src/Services/Kinesis/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/Kinesis/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.402.3")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.402.30")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/KinesisAnalytics/Generated/AmazonKinesisAnalyticsConfig.cs b/sdk/src/Services/KinesisAnalytics/Generated/AmazonKinesisAnalyticsConfig.cs index 1a66440cece0..dce7efeb4bd5 100644 --- a/sdk/src/Services/KinesisAnalytics/Generated/AmazonKinesisAnalyticsConfig.cs +++ b/sdk/src/Services/KinesisAnalytics/Generated/AmazonKinesisAnalyticsConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.KinesisAnalytics public partial class AmazonKinesisAnalyticsConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("Kinesis Analytics", "4.0.0.0"); private static readonly AmazonKinesisAnalyticsEndpointResolver EndpointResolver = new AmazonKinesisAnalyticsEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("Kinesis Analytics", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("Kinesis Analytics", "3.7.400.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/KinesisAnalytics/KinesisAnalytics.sln b/sdk/src/Services/KinesisAnalytics/KinesisAnalytics.sln index f6d0439c4a59..b4638650b40a 100644 --- a/sdk/src/Services/KinesisAnalytics/KinesisAnalytics.sln +++ b/sdk/src/Services/KinesisAnalytics/KinesisAnalytics.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {20EFB0F5-D9FC-47AB-A4BA-2D2238E46584}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {20EFB0F5-D9FC-47AB-A4BA-2D2238E46584}.Debug|Any CPU.Build.0 = Debug|Any CPU {20EFB0F5-D9FC-47AB-A4BA-2D2238E46584}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {D0CD717B-7F47-4322-9E9C-7736AE9ED070}.Debug|Any CPU.Build.0 = Debug|Any CPU {D0CD717B-7F47-4322-9E9C-7736AE9ED070}.Release|Any CPU.ActiveCfg = Release|Any CPU {D0CD717B-7F47-4322-9E9C-7736AE9ED070}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {898096E1-3B4F-4FC7-822B-658AE967301B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {898096E1-3B4F-4FC7-822B-658AE967301B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {898096E1-3B4F-4FC7-822B-658AE967301B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {898096E1-3B4F-4FC7-822B-658AE967301B}.Release|Any CPU.Build.0 = Release|Any CPU - {B85D2636-AF4D-4C02-90CB-20B0369BDBD8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B85D2636-AF4D-4C02-90CB-20B0369BDBD8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B85D2636-AF4D-4C02-90CB-20B0369BDBD8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B85D2636-AF4D-4C02-90CB-20B0369BDBD8}.Release|Any CPU.Build.0 = Release|Any CPU - {1E5A0086-364A-41A3-A2FB-FA905F7B4A1D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1E5A0086-364A-41A3-A2FB-FA905F7B4A1D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1E5A0086-364A-41A3-A2FB-FA905F7B4A1D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1E5A0086-364A-41A3-A2FB-FA905F7B4A1D}.Release|Any CPU.Build.0 = Release|Any CPU - {4A8A7CF6-5868-42F5-9D43-618F561509D1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4A8A7CF6-5868-42F5-9D43-618F561509D1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4A8A7CF6-5868-42F5-9D43-618F561509D1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4A8A7CF6-5868-42F5-9D43-618F561509D1}.Release|Any CPU.Build.0 = Release|Any CPU - {7E4EB59F-98ED-4978-8B18-E2F881F3EB6E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7E4EB59F-98ED-4978-8B18-E2F881F3EB6E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7E4EB59F-98ED-4978-8B18-E2F881F3EB6E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7E4EB59F-98ED-4978-8B18-E2F881F3EB6E}.Release|Any CPU.Build.0 = Release|Any CPU - {E72A541F-251E-4C33-83DE-A6ECD13F0DEE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E72A541F-251E-4C33-83DE-A6ECD13F0DEE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E72A541F-251E-4C33-83DE-A6ECD13F0DEE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E72A541F-251E-4C33-83DE-A6ECD13F0DEE}.Release|Any CPU.Build.0 = Release|Any CPU - {2F943013-757C-456D-B39C-025D42EB7719}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2F943013-757C-456D-B39C-025D42EB7719}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2F943013-757C-456D-B39C-025D42EB7719}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2F943013-757C-456D-B39C-025D42EB7719}.Release|Any CPU.Build.0 = Release|Any CPU - {D2B27217-378F-473B-8C52-CEFD916AD549}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D2B27217-378F-473B-8C52-CEFD916AD549}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D2B27217-378F-473B-8C52-CEFD916AD549}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D2B27217-378F-473B-8C52-CEFD916AD549}.Release|Any CPU.Build.0 = Release|Any CPU - {4778767F-1073-4B48-8B1E-F1B80349CBDD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4778767F-1073-4B48-8B1E-F1B80349CBDD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4778767F-1073-4B48-8B1E-F1B80349CBDD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4778767F-1073-4B48-8B1E-F1B80349CBDD}.Release|Any CPU.Build.0 = Release|Any CPU - {E42C90B1-FA83-4965-B5A8-4F992AFE3124}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E42C90B1-FA83-4965-B5A8-4F992AFE3124}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E42C90B1-FA83-4965-B5A8-4F992AFE3124}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E42C90B1-FA83-4965-B5A8-4F992AFE3124}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {898096E1-3B4F-4FC7-822B-658AE967301B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {898096E1-3B4F-4FC7-822B-658AE967301B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {898096E1-3B4F-4FC7-822B-658AE967301B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {898096E1-3B4F-4FC7-822B-658AE967301B}.Release|Any CPU.Build.0 = Release|Any CPU - {B85D2636-AF4D-4C02-90CB-20B0369BDBD8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B85D2636-AF4D-4C02-90CB-20B0369BDBD8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B85D2636-AF4D-4C02-90CB-20B0369BDBD8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B85D2636-AF4D-4C02-90CB-20B0369BDBD8}.Release|Any CPU.Build.0 = Release|Any CPU - {1E5A0086-364A-41A3-A2FB-FA905F7B4A1D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1E5A0086-364A-41A3-A2FB-FA905F7B4A1D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1E5A0086-364A-41A3-A2FB-FA905F7B4A1D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1E5A0086-364A-41A3-A2FB-FA905F7B4A1D}.Release|Any CPU.Build.0 = Release|Any CPU - {4A8A7CF6-5868-42F5-9D43-618F561509D1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4A8A7CF6-5868-42F5-9D43-618F561509D1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4A8A7CF6-5868-42F5-9D43-618F561509D1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4A8A7CF6-5868-42F5-9D43-618F561509D1}.Release|Any CPU.Build.0 = Release|Any CPU - {7E4EB59F-98ED-4978-8B18-E2F881F3EB6E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7E4EB59F-98ED-4978-8B18-E2F881F3EB6E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7E4EB59F-98ED-4978-8B18-E2F881F3EB6E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7E4EB59F-98ED-4978-8B18-E2F881F3EB6E}.Release|Any CPU.Build.0 = Release|Any CPU - {E72A541F-251E-4C33-83DE-A6ECD13F0DEE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E72A541F-251E-4C33-83DE-A6ECD13F0DEE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E72A541F-251E-4C33-83DE-A6ECD13F0DEE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E72A541F-251E-4C33-83DE-A6ECD13F0DEE}.Release|Any CPU.Build.0 = Release|Any CPU - {2F943013-757C-456D-B39C-025D42EB7719}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2F943013-757C-456D-B39C-025D42EB7719}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2F943013-757C-456D-B39C-025D42EB7719}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2F943013-757C-456D-B39C-025D42EB7719}.Release|Any CPU.Build.0 = Release|Any CPU - {D2B27217-378F-473B-8C52-CEFD916AD549}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D2B27217-378F-473B-8C52-CEFD916AD549}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D2B27217-378F-473B-8C52-CEFD916AD549}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D2B27217-378F-473B-8C52-CEFD916AD549}.Release|Any CPU.Build.0 = Release|Any CPU - {4778767F-1073-4B48-8B1E-F1B80349CBDD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4778767F-1073-4B48-8B1E-F1B80349CBDD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4778767F-1073-4B48-8B1E-F1B80349CBDD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4778767F-1073-4B48-8B1E-F1B80349CBDD}.Release|Any CPU.Build.0 = Release|Any CPU - {E42C90B1-FA83-4965-B5A8-4F992AFE3124}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E42C90B1-FA83-4965-B5A8-4F992AFE3124}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E42C90B1-FA83-4965-B5A8-4F992AFE3124}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E42C90B1-FA83-4965-B5A8-4F992AFE3124}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {20EFB0F5-D9FC-47AB-A4BA-2D2238E46584} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {D4C6D3D3-4E5C-49AF-862D-403ECAE8C58A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {7208928A-C542-4691-AA70-8500DF9BE313} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {224594AF-0222-4367-964B-CE0DB9655952} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {D0CD717B-7F47-4322-9E9C-7736AE9ED070} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {898096E1-3B4F-4FC7-822B-658AE967301B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B85D2636-AF4D-4C02-90CB-20B0369BDBD8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {1E5A0086-364A-41A3-A2FB-FA905F7B4A1D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4A8A7CF6-5868-42F5-9D43-618F561509D1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {7E4EB59F-98ED-4978-8B18-E2F881F3EB6E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E72A541F-251E-4C33-83DE-A6ECD13F0DEE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {2F943013-757C-456D-B39C-025D42EB7719} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D2B27217-378F-473B-8C52-CEFD916AD549} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4778767F-1073-4B48-8B1E-F1B80349CBDD} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E42C90B1-FA83-4965-B5A8-4F992AFE3124} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {898096E1-3B4F-4FC7-822B-658AE967301B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B85D2636-AF4D-4C02-90CB-20B0369BDBD8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {1E5A0086-364A-41A3-A2FB-FA905F7B4A1D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4A8A7CF6-5868-42F5-9D43-618F561509D1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {7E4EB59F-98ED-4978-8B18-E2F881F3EB6E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E72A541F-251E-4C33-83DE-A6ECD13F0DEE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {2F943013-757C-456D-B39C-025D42EB7719} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D2B27217-378F-473B-8C52-CEFD916AD549} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4778767F-1073-4B48-8B1E-F1B80349CBDD} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E42C90B1-FA83-4965-B5A8-4F992AFE3124} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {762F613C-BE34-41ED-B8D8-50C2D3745339} diff --git a/sdk/src/Services/KinesisAnalytics/Properties/AssemblyInfo.cs b/sdk/src/Services/KinesisAnalytics/Properties/AssemblyInfo.cs index 50e089b39ffb..caf19b76d49b 100644 --- a/sdk/src/Services/KinesisAnalytics/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/KinesisAnalytics/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/KinesisAnalyticsV2/Generated/AmazonKinesisAnalyticsV2Config.cs b/sdk/src/Services/KinesisAnalyticsV2/Generated/AmazonKinesisAnalyticsV2Config.cs index 2ed0cc9a084f..d1ee91bce454 100644 --- a/sdk/src/Services/KinesisAnalyticsV2/Generated/AmazonKinesisAnalyticsV2Config.cs +++ b/sdk/src/Services/KinesisAnalyticsV2/Generated/AmazonKinesisAnalyticsV2Config.cs @@ -34,16 +34,10 @@ namespace Amazon.KinesisAnalyticsV2 public partial class AmazonKinesisAnalyticsV2Config : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("Kinesis Analytics V2", "4.0.0.0"); private static readonly AmazonKinesisAnalyticsV2EndpointResolver EndpointResolver = new AmazonKinesisAnalyticsV2EndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("Kinesis Analytics V2", "3.7.401.11"); -======= - InternalSDKUtils.BuildUserAgentString("Kinesis Analytics V2", "3.7.401.38"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/KinesisAnalyticsV2/KinesisAnalyticsV2.sln b/sdk/src/Services/KinesisAnalyticsV2/KinesisAnalyticsV2.sln index 5c1b2411f1c9..16f2f64886cf 100644 --- a/sdk/src/Services/KinesisAnalyticsV2/KinesisAnalyticsV2.sln +++ b/sdk/src/Services/KinesisAnalyticsV2/KinesisAnalyticsV2.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {5070AD26-41C4-4DBC-8BA4-B0CAE65F1376}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {5070AD26-41C4-4DBC-8BA4-B0CAE65F1376}.Debug|Any CPU.Build.0 = Debug|Any CPU {5070AD26-41C4-4DBC-8BA4-B0CAE65F1376}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {02A66ABE-903B-4180-B8F1-13CAD59A0624}.Debug|Any CPU.Build.0 = Debug|Any CPU {02A66ABE-903B-4180-B8F1-13CAD59A0624}.Release|Any CPU.ActiveCfg = Release|Any CPU {02A66ABE-903B-4180-B8F1-13CAD59A0624}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {507F5606-73D0-4BBA-B83B-7061058B9882}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {507F5606-73D0-4BBA-B83B-7061058B9882}.Debug|Any CPU.Build.0 = Debug|Any CPU - {507F5606-73D0-4BBA-B83B-7061058B9882}.Release|Any CPU.ActiveCfg = Release|Any CPU - {507F5606-73D0-4BBA-B83B-7061058B9882}.Release|Any CPU.Build.0 = Release|Any CPU - {037B0ABF-3500-43CD-9F2A-E28DDBA3EA65}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {037B0ABF-3500-43CD-9F2A-E28DDBA3EA65}.Debug|Any CPU.Build.0 = Debug|Any CPU - {037B0ABF-3500-43CD-9F2A-E28DDBA3EA65}.Release|Any CPU.ActiveCfg = Release|Any CPU - {037B0ABF-3500-43CD-9F2A-E28DDBA3EA65}.Release|Any CPU.Build.0 = Release|Any CPU - {776CD4AE-3E0E-4764-A279-641A580CD89B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {776CD4AE-3E0E-4764-A279-641A580CD89B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {776CD4AE-3E0E-4764-A279-641A580CD89B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {776CD4AE-3E0E-4764-A279-641A580CD89B}.Release|Any CPU.Build.0 = Release|Any CPU - {8DCD661E-F96D-45B3-B845-A97E02D28B08}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8DCD661E-F96D-45B3-B845-A97E02D28B08}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8DCD661E-F96D-45B3-B845-A97E02D28B08}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8DCD661E-F96D-45B3-B845-A97E02D28B08}.Release|Any CPU.Build.0 = Release|Any CPU - {098F0BF1-8D6E-40E5-9CC8-4CF570A2D5AF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {098F0BF1-8D6E-40E5-9CC8-4CF570A2D5AF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {098F0BF1-8D6E-40E5-9CC8-4CF570A2D5AF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {098F0BF1-8D6E-40E5-9CC8-4CF570A2D5AF}.Release|Any CPU.Build.0 = Release|Any CPU - {0132B601-D6EC-43F0-84C9-C0DF22A75963}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0132B601-D6EC-43F0-84C9-C0DF22A75963}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0132B601-D6EC-43F0-84C9-C0DF22A75963}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0132B601-D6EC-43F0-84C9-C0DF22A75963}.Release|Any CPU.Build.0 = Release|Any CPU - {A268C15D-208C-439D-AE65-CE7D9DB4F8EA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A268C15D-208C-439D-AE65-CE7D9DB4F8EA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A268C15D-208C-439D-AE65-CE7D9DB4F8EA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A268C15D-208C-439D-AE65-CE7D9DB4F8EA}.Release|Any CPU.Build.0 = Release|Any CPU - {5A8E7698-520A-4220-8146-C7A4E4EFC313}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5A8E7698-520A-4220-8146-C7A4E4EFC313}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5A8E7698-520A-4220-8146-C7A4E4EFC313}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5A8E7698-520A-4220-8146-C7A4E4EFC313}.Release|Any CPU.Build.0 = Release|Any CPU - {7D5A45DE-0D45-4CE5-AFA7-C37AEF5C2AA5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7D5A45DE-0D45-4CE5-AFA7-C37AEF5C2AA5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7D5A45DE-0D45-4CE5-AFA7-C37AEF5C2AA5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7D5A45DE-0D45-4CE5-AFA7-C37AEF5C2AA5}.Release|Any CPU.Build.0 = Release|Any CPU - {6D965292-D276-44EE-89C8-0166136D068B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6D965292-D276-44EE-89C8-0166136D068B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6D965292-D276-44EE-89C8-0166136D068B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6D965292-D276-44EE-89C8-0166136D068B}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {507F5606-73D0-4BBA-B83B-7061058B9882}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {507F5606-73D0-4BBA-B83B-7061058B9882}.Debug|Any CPU.Build.0 = Debug|Any CPU - {507F5606-73D0-4BBA-B83B-7061058B9882}.Release|Any CPU.ActiveCfg = Release|Any CPU - {507F5606-73D0-4BBA-B83B-7061058B9882}.Release|Any CPU.Build.0 = Release|Any CPU - {037B0ABF-3500-43CD-9F2A-E28DDBA3EA65}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {037B0ABF-3500-43CD-9F2A-E28DDBA3EA65}.Debug|Any CPU.Build.0 = Debug|Any CPU - {037B0ABF-3500-43CD-9F2A-E28DDBA3EA65}.Release|Any CPU.ActiveCfg = Release|Any CPU - {037B0ABF-3500-43CD-9F2A-E28DDBA3EA65}.Release|Any CPU.Build.0 = Release|Any CPU - {776CD4AE-3E0E-4764-A279-641A580CD89B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {776CD4AE-3E0E-4764-A279-641A580CD89B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {776CD4AE-3E0E-4764-A279-641A580CD89B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {776CD4AE-3E0E-4764-A279-641A580CD89B}.Release|Any CPU.Build.0 = Release|Any CPU - {8DCD661E-F96D-45B3-B845-A97E02D28B08}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8DCD661E-F96D-45B3-B845-A97E02D28B08}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8DCD661E-F96D-45B3-B845-A97E02D28B08}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8DCD661E-F96D-45B3-B845-A97E02D28B08}.Release|Any CPU.Build.0 = Release|Any CPU - {098F0BF1-8D6E-40E5-9CC8-4CF570A2D5AF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {098F0BF1-8D6E-40E5-9CC8-4CF570A2D5AF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {098F0BF1-8D6E-40E5-9CC8-4CF570A2D5AF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {098F0BF1-8D6E-40E5-9CC8-4CF570A2D5AF}.Release|Any CPU.Build.0 = Release|Any CPU - {0132B601-D6EC-43F0-84C9-C0DF22A75963}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0132B601-D6EC-43F0-84C9-C0DF22A75963}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0132B601-D6EC-43F0-84C9-C0DF22A75963}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0132B601-D6EC-43F0-84C9-C0DF22A75963}.Release|Any CPU.Build.0 = Release|Any CPU - {A268C15D-208C-439D-AE65-CE7D9DB4F8EA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A268C15D-208C-439D-AE65-CE7D9DB4F8EA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A268C15D-208C-439D-AE65-CE7D9DB4F8EA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A268C15D-208C-439D-AE65-CE7D9DB4F8EA}.Release|Any CPU.Build.0 = Release|Any CPU - {5A8E7698-520A-4220-8146-C7A4E4EFC313}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5A8E7698-520A-4220-8146-C7A4E4EFC313}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5A8E7698-520A-4220-8146-C7A4E4EFC313}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5A8E7698-520A-4220-8146-C7A4E4EFC313}.Release|Any CPU.Build.0 = Release|Any CPU - {7D5A45DE-0D45-4CE5-AFA7-C37AEF5C2AA5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7D5A45DE-0D45-4CE5-AFA7-C37AEF5C2AA5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7D5A45DE-0D45-4CE5-AFA7-C37AEF5C2AA5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7D5A45DE-0D45-4CE5-AFA7-C37AEF5C2AA5}.Release|Any CPU.Build.0 = Release|Any CPU - {6D965292-D276-44EE-89C8-0166136D068B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6D965292-D276-44EE-89C8-0166136D068B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6D965292-D276-44EE-89C8-0166136D068B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6D965292-D276-44EE-89C8-0166136D068B}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {5070AD26-41C4-4DBC-8BA4-B0CAE65F1376} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {0AF35BD1-3F03-42D0-A25D-197D7233AE0D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {4ACF4A74-0B47-44A3-8878-49E938AEF71C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {1D012881-2F90-4AF3-B4B6-2A8D5B591D16} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {02A66ABE-903B-4180-B8F1-13CAD59A0624} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {507F5606-73D0-4BBA-B83B-7061058B9882} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {037B0ABF-3500-43CD-9F2A-E28DDBA3EA65} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {776CD4AE-3E0E-4764-A279-641A580CD89B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8DCD661E-F96D-45B3-B845-A97E02D28B08} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {098F0BF1-8D6E-40E5-9CC8-4CF570A2D5AF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0132B601-D6EC-43F0-84C9-C0DF22A75963} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A268C15D-208C-439D-AE65-CE7D9DB4F8EA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {5A8E7698-520A-4220-8146-C7A4E4EFC313} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {7D5A45DE-0D45-4CE5-AFA7-C37AEF5C2AA5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6D965292-D276-44EE-89C8-0166136D068B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {507F5606-73D0-4BBA-B83B-7061058B9882} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {037B0ABF-3500-43CD-9F2A-E28DDBA3EA65} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {776CD4AE-3E0E-4764-A279-641A580CD89B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8DCD661E-F96D-45B3-B845-A97E02D28B08} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {098F0BF1-8D6E-40E5-9CC8-4CF570A2D5AF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0132B601-D6EC-43F0-84C9-C0DF22A75963} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A268C15D-208C-439D-AE65-CE7D9DB4F8EA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {5A8E7698-520A-4220-8146-C7A4E4EFC313} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {7D5A45DE-0D45-4CE5-AFA7-C37AEF5C2AA5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6D965292-D276-44EE-89C8-0166136D068B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {E545DDB2-95DD-48A3-B530-B9E3E60E2B6D} diff --git a/sdk/src/Services/KinesisAnalyticsV2/Properties/AssemblyInfo.cs b/sdk/src/Services/KinesisAnalyticsV2/Properties/AssemblyInfo.cs index b3335c348537..fb505b918f94 100644 --- a/sdk/src/Services/KinesisAnalyticsV2/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/KinesisAnalyticsV2/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.11")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.38")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/KinesisFirehose/Generated/AmazonKinesisFirehoseConfig.cs b/sdk/src/Services/KinesisFirehose/Generated/AmazonKinesisFirehoseConfig.cs index a7da4eff8301..c442a9c224e5 100644 --- a/sdk/src/Services/KinesisFirehose/Generated/AmazonKinesisFirehoseConfig.cs +++ b/sdk/src/Services/KinesisFirehose/Generated/AmazonKinesisFirehoseConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.KinesisFirehose public partial class AmazonKinesisFirehoseConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("Firehose", "4.0.0.0"); private static readonly AmazonKinesisFirehoseEndpointResolver EndpointResolver = new AmazonKinesisFirehoseEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("Firehose", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("Firehose", "3.7.401.6"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/KinesisFirehose/Generated/Model/DatabaseSnapshotInfo.cs b/sdk/src/Services/KinesisFirehose/Generated/Model/DatabaseSnapshotInfo.cs index 9288e84c2380..ab3927e84104 100644 --- a/sdk/src/Services/KinesisFirehose/Generated/Model/DatabaseSnapshotInfo.cs +++ b/sdk/src/Services/KinesisFirehose/Generated/Model/DatabaseSnapshotInfo.cs @@ -115,9 +115,9 @@ internal bool IsSetRequestedBy() /// /// [AWSProperty(Required=true)] - public DateTime RequestTimestamp + public DateTime? RequestTimestamp { - get { return this._requestTimestamp.GetValueOrDefault(); } + get { return this._requestTimestamp; } set { this._requestTimestamp = value; } } diff --git a/sdk/src/Services/KinesisFirehose/Generated/Model/DatabaseSourceConfiguration.cs b/sdk/src/Services/KinesisFirehose/Generated/Model/DatabaseSourceConfiguration.cs index 02859e7a406f..89dcecf21adb 100644 --- a/sdk/src/Services/KinesisFirehose/Generated/Model/DatabaseSourceConfiguration.cs +++ b/sdk/src/Services/KinesisFirehose/Generated/Model/DatabaseSourceConfiguration.cs @@ -173,9 +173,9 @@ internal bool IsSetEndpoint() /// /// [AWSProperty(Required=true, Min=0, Max=65535)] - public int Port + public int? Port { - get { return this._port.GetValueOrDefault(); } + get { return this._port; } set { this._port = value; } } diff --git a/sdk/src/Services/KinesisFirehose/Generated/Model/DatabaseSourceDescription.cs b/sdk/src/Services/KinesisFirehose/Generated/Model/DatabaseSourceDescription.cs index a48ed5d0b062..b7e222b6a22f 100644 --- a/sdk/src/Services/KinesisFirehose/Generated/Model/DatabaseSourceDescription.cs +++ b/sdk/src/Services/KinesisFirehose/Generated/Model/DatabaseSourceDescription.cs @@ -171,9 +171,9 @@ internal bool IsSetEndpoint() /// /// [AWSProperty(Min=0, Max=65535)] - public int Port + public int? Port { - get { return this._port.GetValueOrDefault(); } + get { return this._port; } set { this._port = value; } } diff --git a/sdk/src/Services/KinesisFirehose/Generated/Model/Internal/MarshallTransformations/CreateDeliveryStreamRequestMarshaller.cs b/sdk/src/Services/KinesisFirehose/Generated/Model/Internal/MarshallTransformations/CreateDeliveryStreamRequestMarshaller.cs index d832e7db7337..0d76f0ad5934 100644 --- a/sdk/src/Services/KinesisFirehose/Generated/Model/Internal/MarshallTransformations/CreateDeliveryStreamRequestMarshaller.cs +++ b/sdk/src/Services/KinesisFirehose/Generated/Model/Internal/MarshallTransformations/CreateDeliveryStreamRequestMarshaller.cs @@ -82,36 +82,24 @@ public IRequest Marshall(CreateDeliveryStreamRequest publicRequest) context.Writer.WriteObjectEnd(); } -<<<<<<< HEAD if(publicRequest.IsSetAmazonopensearchserviceDestinationConfiguration()) { context.Writer.WritePropertyName("AmazonopensearchserviceDestinationConfiguration"); context.Writer.WriteObjectStart(); -||||||| Commit version number update changes - if(publicRequest.IsSetDeliveryStreamEncryptionConfigurationInput()) - { - context.Writer.WritePropertyName("DeliveryStreamEncryptionConfigurationInput"); - context.Writer.WriteObjectStart(); -======= - if(publicRequest.IsSetDatabaseSourceConfiguration()) - { - context.Writer.WritePropertyName("DatabaseSourceConfiguration"); - context.Writer.WriteObjectStart(); - var marshaller = DatabaseSourceConfigurationMarshaller.Instance; - marshaller.Marshall(publicRequest.DatabaseSourceConfiguration, context); + var marshaller = AmazonopensearchserviceDestinationConfigurationMarshaller.Instance; + marshaller.Marshall(publicRequest.AmazonopensearchserviceDestinationConfiguration, context); - context.Writer.WriteObjectEnd(); - } + context.Writer.WriteObjectEnd(); + } - if(publicRequest.IsSetDeliveryStreamEncryptionConfigurationInput()) - { - context.Writer.WritePropertyName("DeliveryStreamEncryptionConfigurationInput"); - context.Writer.WriteObjectStart(); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b + if(publicRequest.IsSetDatabaseSourceConfiguration()) + { + context.Writer.WritePropertyName("DatabaseSourceConfiguration"); + context.Writer.WriteObjectStart(); - var marshaller = AmazonopensearchserviceDestinationConfigurationMarshaller.Instance; - marshaller.Marshall(publicRequest.AmazonopensearchserviceDestinationConfiguration, context); + var marshaller = DatabaseSourceConfigurationMarshaller.Instance; + marshaller.Marshall(publicRequest.DatabaseSourceConfiguration, context); context.Writer.WriteObjectEnd(); } diff --git a/sdk/src/Services/KinesisFirehose/Generated/Model/Internal/MarshallTransformations/DatabaseSnapshotInfoUnmarshaller.cs b/sdk/src/Services/KinesisFirehose/Generated/Model/Internal/MarshallTransformations/DatabaseSnapshotInfoUnmarshaller.cs index 84a9e67dbd50..5cd9e80ff071 100644 --- a/sdk/src/Services/KinesisFirehose/Generated/Model/Internal/MarshallTransformations/DatabaseSnapshotInfoUnmarshaller.cs +++ b/sdk/src/Services/KinesisFirehose/Generated/Model/Internal/MarshallTransformations/DatabaseSnapshotInfoUnmarshaller.cs @@ -86,7 +86,7 @@ public DatabaseSnapshotInfo Unmarshall(JsonUnmarshallerContext context) } if (context.TestExpression("RequestTimestamp", targetDepth)) { - var unmarshaller = DateTimeUnmarshaller.Instance; + var unmarshaller = NullableDateTimeUnmarshaller.Instance; unmarshalledObject.RequestTimestamp = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/KinesisFirehose/Generated/Model/Internal/MarshallTransformations/DatabaseSourceConfigurationMarshaller.cs b/sdk/src/Services/KinesisFirehose/Generated/Model/Internal/MarshallTransformations/DatabaseSourceConfigurationMarshaller.cs index 4b9cd6757f0f..0d5a6e4d18dd 100644 --- a/sdk/src/Services/KinesisFirehose/Generated/Model/Internal/MarshallTransformations/DatabaseSourceConfigurationMarshaller.cs +++ b/sdk/src/Services/KinesisFirehose/Generated/Model/Internal/MarshallTransformations/DatabaseSourceConfigurationMarshaller.cs @@ -101,7 +101,7 @@ public void Marshall(DatabaseSourceConfiguration requestObject, JsonMarshallerCo if(requestObject.IsSetPort()) { context.Writer.WritePropertyName("Port"); - context.Writer.Write(requestObject.Port); + context.Writer.Write(requestObject.Port.Value); } if(requestObject.IsSetSnapshotWatermarkTable()) diff --git a/sdk/src/Services/KinesisFirehose/Generated/Model/Internal/MarshallTransformations/DatabaseSourceDescriptionUnmarshaller.cs b/sdk/src/Services/KinesisFirehose/Generated/Model/Internal/MarshallTransformations/DatabaseSourceDescriptionUnmarshaller.cs index 0a1d2b379763..e5309cec55ff 100644 --- a/sdk/src/Services/KinesisFirehose/Generated/Model/Internal/MarshallTransformations/DatabaseSourceDescriptionUnmarshaller.cs +++ b/sdk/src/Services/KinesisFirehose/Generated/Model/Internal/MarshallTransformations/DatabaseSourceDescriptionUnmarshaller.cs @@ -98,7 +98,7 @@ public DatabaseSourceDescription Unmarshall(JsonUnmarshallerContext context) } if (context.TestExpression("Port", targetDepth)) { - var unmarshaller = IntUnmarshaller.Instance; + var unmarshaller = NullableIntUnmarshaller.Instance; unmarshalledObject.Port = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/KinesisFirehose/Generated/Model/Internal/MarshallTransformations/SchemaEvolutionConfigurationMarshaller.cs b/sdk/src/Services/KinesisFirehose/Generated/Model/Internal/MarshallTransformations/SchemaEvolutionConfigurationMarshaller.cs index edf915493ddd..ed89386b8b7b 100644 --- a/sdk/src/Services/KinesisFirehose/Generated/Model/Internal/MarshallTransformations/SchemaEvolutionConfigurationMarshaller.cs +++ b/sdk/src/Services/KinesisFirehose/Generated/Model/Internal/MarshallTransformations/SchemaEvolutionConfigurationMarshaller.cs @@ -51,7 +51,7 @@ public void Marshall(SchemaEvolutionConfiguration requestObject, JsonMarshallerC if(requestObject.IsSetEnabled()) { context.Writer.WritePropertyName("Enabled"); - context.Writer.Write(requestObject.Enabled); + context.Writer.Write(requestObject.Enabled.Value); } } diff --git a/sdk/src/Services/KinesisFirehose/Generated/Model/Internal/MarshallTransformations/SchemaEvolutionConfigurationUnmarshaller.cs b/sdk/src/Services/KinesisFirehose/Generated/Model/Internal/MarshallTransformations/SchemaEvolutionConfigurationUnmarshaller.cs index 8a931883f23b..8d478045b011 100644 --- a/sdk/src/Services/KinesisFirehose/Generated/Model/Internal/MarshallTransformations/SchemaEvolutionConfigurationUnmarshaller.cs +++ b/sdk/src/Services/KinesisFirehose/Generated/Model/Internal/MarshallTransformations/SchemaEvolutionConfigurationUnmarshaller.cs @@ -68,7 +68,7 @@ public SchemaEvolutionConfiguration Unmarshall(JsonUnmarshallerContext context) { if (context.TestExpression("Enabled", targetDepth)) { - var unmarshaller = BoolUnmarshaller.Instance; + var unmarshaller = NullableBoolUnmarshaller.Instance; unmarshalledObject.Enabled = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/KinesisFirehose/Generated/Model/Internal/MarshallTransformations/TableCreationConfigurationMarshaller.cs b/sdk/src/Services/KinesisFirehose/Generated/Model/Internal/MarshallTransformations/TableCreationConfigurationMarshaller.cs index 71c6d389af51..d89febe23245 100644 --- a/sdk/src/Services/KinesisFirehose/Generated/Model/Internal/MarshallTransformations/TableCreationConfigurationMarshaller.cs +++ b/sdk/src/Services/KinesisFirehose/Generated/Model/Internal/MarshallTransformations/TableCreationConfigurationMarshaller.cs @@ -51,7 +51,7 @@ public void Marshall(TableCreationConfiguration requestObject, JsonMarshallerCon if(requestObject.IsSetEnabled()) { context.Writer.WritePropertyName("Enabled"); - context.Writer.Write(requestObject.Enabled); + context.Writer.Write(requestObject.Enabled.Value); } } diff --git a/sdk/src/Services/KinesisFirehose/Generated/Model/Internal/MarshallTransformations/TableCreationConfigurationUnmarshaller.cs b/sdk/src/Services/KinesisFirehose/Generated/Model/Internal/MarshallTransformations/TableCreationConfigurationUnmarshaller.cs index 936bf978555c..dfef9c2a4813 100644 --- a/sdk/src/Services/KinesisFirehose/Generated/Model/Internal/MarshallTransformations/TableCreationConfigurationUnmarshaller.cs +++ b/sdk/src/Services/KinesisFirehose/Generated/Model/Internal/MarshallTransformations/TableCreationConfigurationUnmarshaller.cs @@ -68,7 +68,7 @@ public TableCreationConfiguration Unmarshall(JsonUnmarshallerContext context) { if (context.TestExpression("Enabled", targetDepth)) { - var unmarshaller = BoolUnmarshaller.Instance; + var unmarshaller = NullableBoolUnmarshaller.Instance; unmarshalledObject.Enabled = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/KinesisFirehose/Generated/Model/SchemaEvolutionConfiguration.cs b/sdk/src/Services/KinesisFirehose/Generated/Model/SchemaEvolutionConfiguration.cs index ac7a4d92ea4d..ea9323052a9b 100644 --- a/sdk/src/Services/KinesisFirehose/Generated/Model/SchemaEvolutionConfiguration.cs +++ b/sdk/src/Services/KinesisFirehose/Generated/Model/SchemaEvolutionConfiguration.cs @@ -49,9 +49,9 @@ public partial class SchemaEvolutionConfiguration /// /// [AWSProperty(Required=true)] - public bool Enabled + public bool? Enabled { - get { return this._enabled.GetValueOrDefault(); } + get { return this._enabled; } set { this._enabled = value; } } diff --git a/sdk/src/Services/KinesisFirehose/Generated/Model/TableCreationConfiguration.cs b/sdk/src/Services/KinesisFirehose/Generated/Model/TableCreationConfiguration.cs index 62c972d315fc..9b95cf19facd 100644 --- a/sdk/src/Services/KinesisFirehose/Generated/Model/TableCreationConfiguration.cs +++ b/sdk/src/Services/KinesisFirehose/Generated/Model/TableCreationConfiguration.cs @@ -49,9 +49,9 @@ public partial class TableCreationConfiguration /// /// [AWSProperty(Required=true)] - public bool Enabled + public bool? Enabled { - get { return this._enabled.GetValueOrDefault(); } + get { return this._enabled; } set { this._enabled = value; } } diff --git a/sdk/src/Services/KinesisFirehose/Generated/_bcl/AmazonKinesisFirehoseClient.cs b/sdk/src/Services/KinesisFirehose/Generated/_bcl/AmazonKinesisFirehoseClient.cs index 183d2ec02719..1cc3f62704c5 100644 --- a/sdk/src/Services/KinesisFirehose/Generated/_bcl/AmazonKinesisFirehoseClient.cs +++ b/sdk/src/Services/KinesisFirehose/Generated/_bcl/AmazonKinesisFirehoseClient.cs @@ -262,45 +262,44 @@ protected override void Dispose(bool disposing) /// - /// Creates a Firehose delivery stream. + /// Creates a Firehose stream. /// /// /// - /// By default, you can create up to 50 delivery streams per Amazon Web Services Region. + /// By default, you can create up to 50 Firehose streams per Amazon Web Services Region. /// /// /// /// This is an asynchronous operation that immediately returns. The initial status of - /// the delivery stream is CREATING. After the delivery stream is created, its - /// status is ACTIVE and it now accepts data. If the delivery stream creation fails, + /// the Firehose stream is CREATING. After the Firehose stream is created, its + /// status is ACTIVE and it now accepts data. If the Firehose stream creation fails, /// the status transitions to CREATING_FAILED. Attempts to send data to a delivery /// stream that is not in the ACTIVE state cause an exception. To check the state - /// of a delivery stream, use DescribeDeliveryStream. + /// of a Firehose stream, use DescribeDeliveryStream. /// /// /// - /// If the status of a delivery stream is CREATING_FAILED, this status doesn't + /// If the status of a Firehose stream is CREATING_FAILED, this status doesn't /// change, and you can't invoke CreateDeliveryStream again on it. However, you /// can invoke the DeleteDeliveryStream operation to delete it. /// /// /// - /// A Firehose delivery stream can be configured to receive records directly from providers - /// using PutRecord or PutRecordBatch, or it can be configured to use an - /// existing Kinesis stream as its source. To specify a Kinesis data stream as input, - /// set the DeliveryStreamType parameter to KinesisStreamAsSource, and provide - /// the Kinesis stream Amazon Resource Name (ARN) and role ARN in the KinesisStreamSourceConfiguration - /// parameter. + /// A Firehose stream can be configured to receive records directly from providers using + /// PutRecord or PutRecordBatch, or it can be configured to use an existing + /// Kinesis stream as its source. To specify a Kinesis data stream as input, set the DeliveryStreamType + /// parameter to KinesisStreamAsSource, and provide the Kinesis stream Amazon Resource + /// Name (ARN) and role ARN in the KinesisStreamSourceConfiguration parameter. /// /// /// - /// To create a delivery stream with server-side encryption (SSE) enabled, include DeliveryStreamEncryptionConfigurationInput + /// To create a Firehose stream with server-side encryption (SSE) enabled, include DeliveryStreamEncryptionConfigurationInput /// in your request. This is optional. You can also invoke StartDeliveryStreamEncryption - /// to turn on SSE for an existing delivery stream that doesn't have SSE enabled. + /// to turn on SSE for an existing Firehose stream that doesn't have SSE enabled. /// /// /// - /// A delivery stream is configured with a single destination, such as Amazon Simple Storage + /// A Firehose stream is configured with a single destination, such as Amazon Simple Storage /// Service (Amazon S3), Amazon Redshift, Amazon OpenSearch Service, Amazon OpenSearch /// Serverless, Splunk, and any custom HTTP endpoint or HTTP endpoints owned by or supported /// by third-party service providers, including Datadog, Dynatrace, LogicMonitor, MongoDB, @@ -361,7 +360,7 @@ protected override void Dispose(bool disposing) /// /// /// Firehose throws this exception when an attempt to put records or to start or stop - /// delivery stream encryption fails. This happens when the KMS service throws one of + /// Firehose stream encryption fails. This happens when the KMS service throws one of /// the following exception types: AccessDeniedException, InvalidStateException, /// DisabledException, or NotFoundException. /// @@ -383,45 +382,44 @@ public virtual CreateDeliveryStreamResponse CreateDeliveryStream(CreateDeliveryS /// - /// Creates a Firehose delivery stream. + /// Creates a Firehose stream. /// /// /// - /// By default, you can create up to 50 delivery streams per Amazon Web Services Region. + /// By default, you can create up to 50 Firehose streams per Amazon Web Services Region. /// /// /// /// This is an asynchronous operation that immediately returns. The initial status of - /// the delivery stream is CREATING. After the delivery stream is created, its - /// status is ACTIVE and it now accepts data. If the delivery stream creation fails, + /// the Firehose stream is CREATING. After the Firehose stream is created, its + /// status is ACTIVE and it now accepts data. If the Firehose stream creation fails, /// the status transitions to CREATING_FAILED. Attempts to send data to a delivery /// stream that is not in the ACTIVE state cause an exception. To check the state - /// of a delivery stream, use DescribeDeliveryStream. + /// of a Firehose stream, use DescribeDeliveryStream. /// /// /// - /// If the status of a delivery stream is CREATING_FAILED, this status doesn't + /// If the status of a Firehose stream is CREATING_FAILED, this status doesn't /// change, and you can't invoke CreateDeliveryStream again on it. However, you /// can invoke the DeleteDeliveryStream operation to delete it. /// /// /// - /// A Firehose delivery stream can be configured to receive records directly from providers - /// using PutRecord or PutRecordBatch, or it can be configured to use an - /// existing Kinesis stream as its source. To specify a Kinesis data stream as input, - /// set the DeliveryStreamType parameter to KinesisStreamAsSource, and provide - /// the Kinesis stream Amazon Resource Name (ARN) and role ARN in the KinesisStreamSourceConfiguration - /// parameter. + /// A Firehose stream can be configured to receive records directly from providers using + /// PutRecord or PutRecordBatch, or it can be configured to use an existing + /// Kinesis stream as its source. To specify a Kinesis data stream as input, set the DeliveryStreamType + /// parameter to KinesisStreamAsSource, and provide the Kinesis stream Amazon Resource + /// Name (ARN) and role ARN in the KinesisStreamSourceConfiguration parameter. /// /// /// - /// To create a delivery stream with server-side encryption (SSE) enabled, include DeliveryStreamEncryptionConfigurationInput + /// To create a Firehose stream with server-side encryption (SSE) enabled, include DeliveryStreamEncryptionConfigurationInput /// in your request. This is optional. You can also invoke StartDeliveryStreamEncryption - /// to turn on SSE for an existing delivery stream that doesn't have SSE enabled. + /// to turn on SSE for an existing Firehose stream that doesn't have SSE enabled. /// /// /// - /// A delivery stream is configured with a single destination, such as Amazon Simple Storage + /// A Firehose stream is configured with a single destination, such as Amazon Simple Storage /// Service (Amazon S3), Amazon Redshift, Amazon OpenSearch Service, Amazon OpenSearch /// Serverless, Splunk, and any custom HTTP endpoint or HTTP endpoints owned by or supported /// by third-party service providers, including Datadog, Dynatrace, LogicMonitor, MongoDB, @@ -485,7 +483,7 @@ public virtual CreateDeliveryStreamResponse CreateDeliveryStream(CreateDeliveryS /// /// /// Firehose throws this exception when an attempt to put records or to start or stop - /// delivery stream encryption fails. This happens when the KMS service throws one of + /// Firehose stream encryption fails. This happens when the KMS service throws one of /// the following exception types: AccessDeniedException, InvalidStateException, /// DisabledException, or NotFoundException. /// @@ -511,33 +509,33 @@ public virtual CreateDeliveryStreamResponse CreateDeliveryStream(CreateDeliveryS /// - /// Deletes a delivery stream and its data. + /// Deletes a Firehose stream and its data. /// /// /// - /// You can delete a delivery stream only if it is in one of the following states: ACTIVE, + /// You can delete a Firehose stream only if it is in one of the following states: ACTIVE, /// DELETING, CREATING_FAILED, or DELETING_FAILED. You can't delete - /// a delivery stream that is in the CREATING state. To check the state of a delivery + /// a Firehose stream that is in the CREATING state. To check the state of a Firehose /// stream, use DescribeDeliveryStream. /// /// /// /// DeleteDeliveryStream is an asynchronous API. When an API request to DeleteDeliveryStream - /// succeeds, the delivery stream is marked for deletion, and it goes into the DELETING - /// state.While the delivery stream is in the DELETING state, the service might + /// succeeds, the Firehose stream is marked for deletion, and it goes into the DELETING + /// state.While the Firehose stream is in the DELETING state, the service might /// continue to accept records, but it doesn't make any guarantees with respect to delivering /// the data. Therefore, as a best practice, first stop any applications that are sending - /// records before you delete a delivery stream. + /// records before you delete a Firehose stream. /// /// /// - /// Removal of a delivery stream that is in the DELETING state is a low priority + /// Removal of a Firehose stream that is in the DELETING state is a low priority /// operation for the service. A stream may remain in the DELETING state for several /// minutes. Therefore, as a best practice, applications should not wait for streams in /// the DELETING state to be removed. /// /// - /// The name of the delivery stream. + /// The name of the Firehose stream. /// /// The response from the DeleteDeliveryStream service method, as returned by KinesisFirehose. /// @@ -556,27 +554,27 @@ public virtual DeleteDeliveryStreamResponse DeleteDeliveryStream(string delivery /// - /// Deletes a delivery stream and its data. + /// Deletes a Firehose stream and its data. /// /// /// - /// You can delete a delivery stream only if it is in one of the following states: ACTIVE, + /// You can delete a Firehose stream only if it is in one of the following states: ACTIVE, /// DELETING, CREATING_FAILED, or DELETING_FAILED. You can't delete - /// a delivery stream that is in the CREATING state. To check the state of a delivery + /// a Firehose stream that is in the CREATING state. To check the state of a Firehose /// stream, use DescribeDeliveryStream. /// /// /// /// DeleteDeliveryStream is an asynchronous API. When an API request to DeleteDeliveryStream - /// succeeds, the delivery stream is marked for deletion, and it goes into the DELETING - /// state.While the delivery stream is in the DELETING state, the service might + /// succeeds, the Firehose stream is marked for deletion, and it goes into the DELETING + /// state.While the Firehose stream is in the DELETING state, the service might /// continue to accept records, but it doesn't make any guarantees with respect to delivering /// the data. Therefore, as a best practice, first stop any applications that are sending - /// records before you delete a delivery stream. + /// records before you delete a Firehose stream. /// /// /// - /// Removal of a delivery stream that is in the DELETING state is a low priority + /// Removal of a Firehose stream that is in the DELETING state is a low priority /// operation for the service. A stream may remain in the DELETING state for several /// minutes. Therefore, as a best practice, applications should not wait for streams in /// the DELETING state to be removed. @@ -603,33 +601,33 @@ public virtual DeleteDeliveryStreamResponse DeleteDeliveryStream(DeleteDeliveryS /// - /// Deletes a delivery stream and its data. + /// Deletes a Firehose stream and its data. /// /// /// - /// You can delete a delivery stream only if it is in one of the following states: ACTIVE, + /// You can delete a Firehose stream only if it is in one of the following states: ACTIVE, /// DELETING, CREATING_FAILED, or DELETING_FAILED. You can't delete - /// a delivery stream that is in the CREATING state. To check the state of a delivery + /// a Firehose stream that is in the CREATING state. To check the state of a Firehose /// stream, use DescribeDeliveryStream. /// /// /// /// DeleteDeliveryStream is an asynchronous API. When an API request to DeleteDeliveryStream - /// succeeds, the delivery stream is marked for deletion, and it goes into the DELETING - /// state.While the delivery stream is in the DELETING state, the service might + /// succeeds, the Firehose stream is marked for deletion, and it goes into the DELETING + /// state.While the Firehose stream is in the DELETING state, the service might /// continue to accept records, but it doesn't make any guarantees with respect to delivering /// the data. Therefore, as a best practice, first stop any applications that are sending - /// records before you delete a delivery stream. + /// records before you delete a Firehose stream. /// /// /// - /// Removal of a delivery stream that is in the DELETING state is a low priority + /// Removal of a Firehose stream that is in the DELETING state is a low priority /// operation for the service. A stream may remain in the DELETING state for several /// minutes. Therefore, as a best practice, applications should not wait for streams in /// the DELETING state to be removed. /// /// - /// The name of the delivery stream. + /// The name of the Firehose stream. /// /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// @@ -651,27 +649,27 @@ public virtual DeleteDeliveryStreamResponse DeleteDeliveryStream(DeleteDeliveryS /// - /// Deletes a delivery stream and its data. + /// Deletes a Firehose stream and its data. /// /// /// - /// You can delete a delivery stream only if it is in one of the following states: ACTIVE, + /// You can delete a Firehose stream only if it is in one of the following states: ACTIVE, /// DELETING, CREATING_FAILED, or DELETING_FAILED. You can't delete - /// a delivery stream that is in the CREATING state. To check the state of a delivery + /// a Firehose stream that is in the CREATING state. To check the state of a Firehose /// stream, use DescribeDeliveryStream. /// /// /// /// DeleteDeliveryStream is an asynchronous API. When an API request to DeleteDeliveryStream - /// succeeds, the delivery stream is marked for deletion, and it goes into the DELETING - /// state.While the delivery stream is in the DELETING state, the service might + /// succeeds, the Firehose stream is marked for deletion, and it goes into the DELETING + /// state.While the Firehose stream is in the DELETING state, the service might /// continue to accept records, but it doesn't make any guarantees with respect to delivering /// the data. Therefore, as a best practice, first stop any applications that are sending - /// records before you delete a delivery stream. + /// records before you delete a Firehose stream. /// /// /// - /// Removal of a delivery stream that is in the DELETING state is a low priority + /// Removal of a Firehose stream that is in the DELETING state is a low priority /// operation for the service. A stream may remain in the DELETING state for several /// minutes. Therefore, as a best practice, applications should not wait for streams in /// the DELETING state to be removed. @@ -705,13 +703,13 @@ public virtual DeleteDeliveryStreamResponse DeleteDeliveryStream(DeleteDeliveryS /// - /// Describes the specified delivery stream and its status. For example, after your delivery - /// stream is created, call DescribeDeliveryStream to see whether the delivery + /// Describes the specified Firehose stream and its status. For example, after your Firehose + /// stream is created, call DescribeDeliveryStream to see whether the Firehose /// stream is ACTIVE and therefore ready for data to be sent to it. /// /// /// - /// If the status of a delivery stream is CREATING_FAILED, this status doesn't + /// If the status of a Firehose stream is CREATING_FAILED, this status doesn't /// change, and you can't invoke CreateDeliveryStream again on it. However, you /// can invoke the DeleteDeliveryStream operation to delete it. If the status is /// DELETING_FAILED, you can force deletion by invoking DeleteDeliveryStream @@ -736,13 +734,13 @@ public virtual DescribeDeliveryStreamResponse DescribeDeliveryStream(DescribeDel /// - /// Describes the specified delivery stream and its status. For example, after your delivery - /// stream is created, call DescribeDeliveryStream to see whether the delivery + /// Describes the specified Firehose stream and its status. For example, after your Firehose + /// stream is created, call DescribeDeliveryStream to see whether the Firehose /// stream is ACTIVE and therefore ready for data to be sent to it. /// /// /// - /// If the status of a delivery stream is CREATING_FAILED, this status doesn't + /// If the status of a Firehose stream is CREATING_FAILED, this status doesn't /// change, and you can't invoke CreateDeliveryStream again on it. However, you /// can invoke the DeleteDeliveryStream operation to delete it. If the status is /// DELETING_FAILED, you can force deletion by invoking DeleteDeliveryStream @@ -774,17 +772,17 @@ public virtual DescribeDeliveryStreamResponse DescribeDeliveryStream(DescribeDel /// - /// Lists your delivery streams in alphabetical order of their names. + /// Lists your Firehose streams in alphabetical order of their names. /// /// /// - /// The number of delivery streams might be too large to return using a single call to - /// ListDeliveryStreams. You can limit the number of delivery streams returned, + /// The number of Firehose streams might be too large to return using a single call to + /// ListDeliveryStreams. You can limit the number of Firehose streams returned, /// using the Limit parameter. To determine whether there are more delivery streams /// to list, check the value of HasMoreDeliveryStreams in the output. If there - /// are more delivery streams to list, you can request them by calling this operation + /// are more Firehose streams to list, you can request them by calling this operation /// again and setting the ExclusiveStartDeliveryStreamName parameter to the name - /// of the last delivery stream returned in the last call. + /// of the last Firehose stream returned in the last call. /// /// /// @@ -797,17 +795,17 @@ public virtual ListDeliveryStreamsResponse ListDeliveryStreams() /// - /// Lists your delivery streams in alphabetical order of their names. + /// Lists your Firehose streams in alphabetical order of their names. /// /// /// - /// The number of delivery streams might be too large to return using a single call to - /// ListDeliveryStreams. You can limit the number of delivery streams returned, + /// The number of Firehose streams might be too large to return using a single call to + /// ListDeliveryStreams. You can limit the number of Firehose streams returned, /// using the Limit parameter. To determine whether there are more delivery streams /// to list, check the value of HasMoreDeliveryStreams in the output. If there - /// are more delivery streams to list, you can request them by calling this operation + /// are more Firehose streams to list, you can request them by calling this operation /// again and setting the ExclusiveStartDeliveryStreamName parameter to the name - /// of the last delivery stream returned in the last call. + /// of the last Firehose stream returned in the last call. /// /// /// Container for the necessary parameters to execute the ListDeliveryStreams service method. @@ -825,17 +823,17 @@ public virtual ListDeliveryStreamsResponse ListDeliveryStreams(ListDeliveryStrea /// - /// Lists your delivery streams in alphabetical order of their names. + /// Lists your Firehose streams in alphabetical order of their names. /// /// /// - /// The number of delivery streams might be too large to return using a single call to - /// ListDeliveryStreams. You can limit the number of delivery streams returned, + /// The number of Firehose streams might be too large to return using a single call to + /// ListDeliveryStreams. You can limit the number of Firehose streams returned, /// using the Limit parameter. To determine whether there are more delivery streams /// to list, check the value of HasMoreDeliveryStreams in the output. If there - /// are more delivery streams to list, you can request them by calling this operation + /// are more Firehose streams to list, you can request them by calling this operation /// again and setting the ExclusiveStartDeliveryStreamName parameter to the name - /// of the last delivery stream returned in the last call. + /// of the last Firehose stream returned in the last call. /// /// /// @@ -850,17 +848,17 @@ public virtual ListDeliveryStreamsResponse ListDeliveryStreams(ListDeliveryStrea } /// - /// Lists your delivery streams in alphabetical order of their names. + /// Lists your Firehose streams in alphabetical order of their names. /// /// /// - /// The number of delivery streams might be too large to return using a single call to - /// ListDeliveryStreams. You can limit the number of delivery streams returned, + /// The number of Firehose streams might be too large to return using a single call to + /// ListDeliveryStreams. You can limit the number of Firehose streams returned, /// using the Limit parameter. To determine whether there are more delivery streams /// to list, check the value of HasMoreDeliveryStreams in the output. If there - /// are more delivery streams to list, you can request them by calling this operation + /// are more Firehose streams to list, you can request them by calling this operation /// again and setting the ExclusiveStartDeliveryStreamName parameter to the name - /// of the last delivery stream returned in the last call. + /// of the last Firehose stream returned in the last call. /// /// /// Container for the necessary parameters to execute the ListDeliveryStreams service method. @@ -885,7 +883,7 @@ public virtual ListDeliveryStreamsResponse ListDeliveryStreams(ListDeliveryStrea /// - /// Lists the tags for the specified delivery stream. This operation has a limit of five + /// Lists the tags for the specified Firehose stream. This operation has a limit of five /// transactions per second per account. /// /// Container for the necessary parameters to execute the ListTagsForDeliveryStream service method. @@ -912,7 +910,7 @@ public virtual ListTagsForDeliveryStreamResponse ListTagsForDeliveryStream(ListT /// - /// Lists the tags for the specified delivery stream. This operation has a limit of five + /// Lists the tags for the specified Firehose stream. This operation has a limit of five /// transactions per second per account. /// /// Container for the necessary parameters to execute the ListTagsForDeliveryStream service method. @@ -946,15 +944,15 @@ public virtual ListTagsForDeliveryStreamResponse ListTagsForDeliveryStream(ListT /// - /// Writes a single data record into an Amazon Firehose delivery stream. To write multiple - /// data records into a delivery stream, use PutRecordBatch. Applications using - /// these operations are referred to as producers. + /// Writes a single data record into an Firehose stream. To write multiple data records + /// into a Firehose stream, use PutRecordBatch. Applications using these operations + /// are referred to as producers. /// /// /// - /// By default, each delivery stream can take in up to 2,000 transactions per second, + /// By default, each Firehose stream can take in up to 2,000 transactions per second, /// 5,000 records per second, or 5 MB per second. If you use PutRecord and PutRecordBatch, - /// the limits are an aggregate across these two operations for each delivery stream. + /// the limits are an aggregate across these two operations for each Firehose stream. /// For more information about limits and how to request an increase, see Amazon /// Firehose Limits. /// @@ -962,18 +960,26 @@ public virtual ListTagsForDeliveryStreamResponse ListTagsForDeliveryStream(ListT /// /// Firehose accumulates and publishes a particular metric for a customer account in one /// minute intervals. It is possible that the bursts of incoming bytes/records ingested - /// to a delivery stream last only for a few seconds. Due to this, the actual spikes in + /// to a Firehose stream last only for a few seconds. Due to this, the actual spikes in /// the traffic might not be fully visible in the customer's 1 minute CloudWatch metrics. /// /// /// - /// You must specify the name of the delivery stream and the data record when using PutRecord. + /// You must specify the name of the Firehose stream and the data record when using PutRecord. /// The data record consists of a data blob that can be up to 1,000 KiB in size, and any /// kind of data. For example, it can be a segment from a log file, geographic location /// data, website clickstream data, and so on. /// /// /// + /// For multi record de-aggregation, you can not put more than 500 records even if the + /// data blob length is less than 1000 KiB. If you include more than 500 records, the + /// request succeeds but the record de-aggregation doesn't work as expected and transformation + /// lambda is invoked with the complete base64 encoded data blob instead of de-aggregated + /// base64 decoded records. + /// + /// + /// /// Firehose buffers records before delivering them to the destination. To disambiguate /// the data blobs at the destination, a common solution is to use delimiters in the data, /// such as a newline (\n) or some other character unique within the data. This @@ -990,7 +996,7 @@ public virtual ListTagsForDeliveryStreamResponse ListTagsForDeliveryStream(ListT /// /// If the PutRecord operation throws a ServiceUnavailableException, the /// API is automatically reinvoked (retried) 3 times. If the exception persists, it is - /// possible that the throughput limits have been exceeded for the delivery stream. + /// possible that the throughput limits have been exceeded for the Firehose stream. /// /// /// @@ -1001,7 +1007,7 @@ public virtual ListTagsForDeliveryStreamResponse ListTagsForDeliveryStream(ListT /// /// /// Data records sent to Firehose are stored for 24 hours from the time they are added - /// to a delivery stream as it tries to send the records to the destination. If the destination + /// to a Firehose stream as it tries to send the records to the destination. If the destination /// is unreachable for more than 24 hours, the data is no longer available. /// /// @@ -1011,7 +1017,7 @@ public virtual ListTagsForDeliveryStreamResponse ListTagsForDeliveryStream(ListT /// /// /// - /// The name of the delivery stream. + /// The name of the Firehose stream. /// The record. /// /// The response from the PutRecord service method, as returned by KinesisFirehose. @@ -1020,7 +1026,7 @@ public virtual ListTagsForDeliveryStreamResponse ListTagsForDeliveryStream(ListT /// /// /// Firehose throws this exception when an attempt to put records or to start or stop - /// delivery stream encryption fails. This happens when the KMS service throws one of + /// Firehose stream encryption fails. This happens when the KMS service throws one of /// the following exception types: AccessDeniedException, InvalidStateException, /// DisabledException, or NotFoundException. /// @@ -1033,7 +1039,7 @@ public virtual ListTagsForDeliveryStreamResponse ListTagsForDeliveryStream(ListT /// /// /// The service is unavailable. Back off and retry the operation. If you continue to see - /// the exception, throughput limits for the delivery stream may have been exceeded. For + /// the exception, throughput limits for the Firehose stream may have been exceeded. For /// more information about limits and how to request an increase, see Amazon /// Firehose Limits. /// @@ -1048,15 +1054,15 @@ public virtual PutRecordResponse PutRecord(string deliveryStreamName, Record rec /// - /// Writes a single data record into an Amazon Firehose delivery stream. To write multiple - /// data records into a delivery stream, use PutRecordBatch. Applications using - /// these operations are referred to as producers. + /// Writes a single data record into an Firehose stream. To write multiple data records + /// into a Firehose stream, use PutRecordBatch. Applications using these operations + /// are referred to as producers. /// /// /// - /// By default, each delivery stream can take in up to 2,000 transactions per second, + /// By default, each Firehose stream can take in up to 2,000 transactions per second, /// 5,000 records per second, or 5 MB per second. If you use PutRecord and PutRecordBatch, - /// the limits are an aggregate across these two operations for each delivery stream. + /// the limits are an aggregate across these two operations for each Firehose stream. /// For more information about limits and how to request an increase, see Amazon /// Firehose Limits. /// @@ -1064,18 +1070,26 @@ public virtual PutRecordResponse PutRecord(string deliveryStreamName, Record rec /// /// Firehose accumulates and publishes a particular metric for a customer account in one /// minute intervals. It is possible that the bursts of incoming bytes/records ingested - /// to a delivery stream last only for a few seconds. Due to this, the actual spikes in + /// to a Firehose stream last only for a few seconds. Due to this, the actual spikes in /// the traffic might not be fully visible in the customer's 1 minute CloudWatch metrics. /// /// /// - /// You must specify the name of the delivery stream and the data record when using PutRecord. + /// You must specify the name of the Firehose stream and the data record when using PutRecord. /// The data record consists of a data blob that can be up to 1,000 KiB in size, and any /// kind of data. For example, it can be a segment from a log file, geographic location /// data, website clickstream data, and so on. /// /// /// + /// For multi record de-aggregation, you can not put more than 500 records even if the + /// data blob length is less than 1000 KiB. If you include more than 500 records, the + /// request succeeds but the record de-aggregation doesn't work as expected and transformation + /// lambda is invoked with the complete base64 encoded data blob instead of de-aggregated + /// base64 decoded records. + /// + /// + /// /// Firehose buffers records before delivering them to the destination. To disambiguate /// the data blobs at the destination, a common solution is to use delimiters in the data, /// such as a newline (\n) or some other character unique within the data. This @@ -1092,7 +1106,7 @@ public virtual PutRecordResponse PutRecord(string deliveryStreamName, Record rec /// /// If the PutRecord operation throws a ServiceUnavailableException, the /// API is automatically reinvoked (retried) 3 times. If the exception persists, it is - /// possible that the throughput limits have been exceeded for the delivery stream. + /// possible that the throughput limits have been exceeded for the Firehose stream. /// /// /// @@ -1103,7 +1117,7 @@ public virtual PutRecordResponse PutRecord(string deliveryStreamName, Record rec /// /// /// Data records sent to Firehose are stored for 24 hours from the time they are added - /// to a delivery stream as it tries to send the records to the destination. If the destination + /// to a Firehose stream as it tries to send the records to the destination. If the destination /// is unreachable for more than 24 hours, the data is no longer available. /// /// @@ -1121,7 +1135,7 @@ public virtual PutRecordResponse PutRecord(string deliveryStreamName, Record rec /// /// /// Firehose throws this exception when an attempt to put records or to start or stop - /// delivery stream encryption fails. This happens when the KMS service throws one of + /// Firehose stream encryption fails. This happens when the KMS service throws one of /// the following exception types: AccessDeniedException, InvalidStateException, /// DisabledException, or NotFoundException. /// @@ -1134,7 +1148,7 @@ public virtual PutRecordResponse PutRecord(string deliveryStreamName, Record rec /// /// /// The service is unavailable. Back off and retry the operation. If you continue to see - /// the exception, throughput limits for the delivery stream may have been exceeded. For + /// the exception, throughput limits for the Firehose stream may have been exceeded. For /// more information about limits and how to request an increase, see Amazon /// Firehose Limits. /// @@ -1150,15 +1164,15 @@ public virtual PutRecordResponse PutRecord(PutRecordRequest request) /// - /// Writes a single data record into an Amazon Firehose delivery stream. To write multiple - /// data records into a delivery stream, use PutRecordBatch. Applications using - /// these operations are referred to as producers. + /// Writes a single data record into an Firehose stream. To write multiple data records + /// into a Firehose stream, use PutRecordBatch. Applications using these operations + /// are referred to as producers. /// /// /// - /// By default, each delivery stream can take in up to 2,000 transactions per second, + /// By default, each Firehose stream can take in up to 2,000 transactions per second, /// 5,000 records per second, or 5 MB per second. If you use PutRecord and PutRecordBatch, - /// the limits are an aggregate across these two operations for each delivery stream. + /// the limits are an aggregate across these two operations for each Firehose stream. /// For more information about limits and how to request an increase, see Amazon /// Firehose Limits. /// @@ -1166,18 +1180,26 @@ public virtual PutRecordResponse PutRecord(PutRecordRequest request) /// /// Firehose accumulates and publishes a particular metric for a customer account in one /// minute intervals. It is possible that the bursts of incoming bytes/records ingested - /// to a delivery stream last only for a few seconds. Due to this, the actual spikes in + /// to a Firehose stream last only for a few seconds. Due to this, the actual spikes in /// the traffic might not be fully visible in the customer's 1 minute CloudWatch metrics. /// /// /// - /// You must specify the name of the delivery stream and the data record when using PutRecord. + /// You must specify the name of the Firehose stream and the data record when using PutRecord. /// The data record consists of a data blob that can be up to 1,000 KiB in size, and any /// kind of data. For example, it can be a segment from a log file, geographic location /// data, website clickstream data, and so on. /// /// /// + /// For multi record de-aggregation, you can not put more than 500 records even if the + /// data blob length is less than 1000 KiB. If you include more than 500 records, the + /// request succeeds but the record de-aggregation doesn't work as expected and transformation + /// lambda is invoked with the complete base64 encoded data blob instead of de-aggregated + /// base64 decoded records. + /// + /// + /// /// Firehose buffers records before delivering them to the destination. To disambiguate /// the data blobs at the destination, a common solution is to use delimiters in the data, /// such as a newline (\n) or some other character unique within the data. This @@ -1194,7 +1216,7 @@ public virtual PutRecordResponse PutRecord(PutRecordRequest request) /// /// If the PutRecord operation throws a ServiceUnavailableException, the /// API is automatically reinvoked (retried) 3 times. If the exception persists, it is - /// possible that the throughput limits have been exceeded for the delivery stream. + /// possible that the throughput limits have been exceeded for the Firehose stream. /// /// /// @@ -1205,7 +1227,7 @@ public virtual PutRecordResponse PutRecord(PutRecordRequest request) /// /// /// Data records sent to Firehose are stored for 24 hours from the time they are added - /// to a delivery stream as it tries to send the records to the destination. If the destination + /// to a Firehose stream as it tries to send the records to the destination. If the destination /// is unreachable for more than 24 hours, the data is no longer available. /// /// @@ -1215,7 +1237,7 @@ public virtual PutRecordResponse PutRecord(PutRecordRequest request) /// /// /// - /// The name of the delivery stream. + /// The name of the Firehose stream. /// The record. /// /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. @@ -1227,7 +1249,7 @@ public virtual PutRecordResponse PutRecord(PutRecordRequest request) /// /// /// Firehose throws this exception when an attempt to put records or to start or stop - /// delivery stream encryption fails. This happens when the KMS service throws one of + /// Firehose stream encryption fails. This happens when the KMS service throws one of /// the following exception types: AccessDeniedException, InvalidStateException, /// DisabledException, or NotFoundException. /// @@ -1240,7 +1262,7 @@ public virtual PutRecordResponse PutRecord(PutRecordRequest request) /// /// /// The service is unavailable. Back off and retry the operation. If you continue to see - /// the exception, throughput limits for the delivery stream may have been exceeded. For + /// the exception, throughput limits for the Firehose stream may have been exceeded. For /// more information about limits and how to request an increase, see Amazon /// Firehose Limits. /// @@ -1255,15 +1277,15 @@ public virtual PutRecordResponse PutRecord(PutRecordRequest request) /// - /// Writes a single data record into an Amazon Firehose delivery stream. To write multiple - /// data records into a delivery stream, use PutRecordBatch. Applications using - /// these operations are referred to as producers. + /// Writes a single data record into an Firehose stream. To write multiple data records + /// into a Firehose stream, use PutRecordBatch. Applications using these operations + /// are referred to as producers. /// /// /// - /// By default, each delivery stream can take in up to 2,000 transactions per second, + /// By default, each Firehose stream can take in up to 2,000 transactions per second, /// 5,000 records per second, or 5 MB per second. If you use PutRecord and PutRecordBatch, - /// the limits are an aggregate across these two operations for each delivery stream. + /// the limits are an aggregate across these two operations for each Firehose stream. /// For more information about limits and how to request an increase, see Amazon /// Firehose Limits. /// @@ -1271,18 +1293,26 @@ public virtual PutRecordResponse PutRecord(PutRecordRequest request) /// /// Firehose accumulates and publishes a particular metric for a customer account in one /// minute intervals. It is possible that the bursts of incoming bytes/records ingested - /// to a delivery stream last only for a few seconds. Due to this, the actual spikes in + /// to a Firehose stream last only for a few seconds. Due to this, the actual spikes in /// the traffic might not be fully visible in the customer's 1 minute CloudWatch metrics. /// /// /// - /// You must specify the name of the delivery stream and the data record when using PutRecord. + /// You must specify the name of the Firehose stream and the data record when using PutRecord. /// The data record consists of a data blob that can be up to 1,000 KiB in size, and any /// kind of data. For example, it can be a segment from a log file, geographic location /// data, website clickstream data, and so on. /// /// /// + /// For multi record de-aggregation, you can not put more than 500 records even if the + /// data blob length is less than 1000 KiB. If you include more than 500 records, the + /// request succeeds but the record de-aggregation doesn't work as expected and transformation + /// lambda is invoked with the complete base64 encoded data blob instead of de-aggregated + /// base64 decoded records. + /// + /// + /// /// Firehose buffers records before delivering them to the destination. To disambiguate /// the data blobs at the destination, a common solution is to use delimiters in the data, /// such as a newline (\n) or some other character unique within the data. This @@ -1299,7 +1329,7 @@ public virtual PutRecordResponse PutRecord(PutRecordRequest request) /// /// If the PutRecord operation throws a ServiceUnavailableException, the /// API is automatically reinvoked (retried) 3 times. If the exception persists, it is - /// possible that the throughput limits have been exceeded for the delivery stream. + /// possible that the throughput limits have been exceeded for the Firehose stream. /// /// /// @@ -1310,7 +1340,7 @@ public virtual PutRecordResponse PutRecord(PutRecordRequest request) /// /// /// Data records sent to Firehose are stored for 24 hours from the time they are added - /// to a delivery stream as it tries to send the records to the destination. If the destination + /// to a Firehose stream as it tries to send the records to the destination. If the destination /// is unreachable for more than 24 hours, the data is no longer available. /// /// @@ -1331,7 +1361,7 @@ public virtual PutRecordResponse PutRecord(PutRecordRequest request) /// /// /// Firehose throws this exception when an attempt to put records or to start or stop - /// delivery stream encryption fails. This happens when the KMS service throws one of + /// Firehose stream encryption fails. This happens when the KMS service throws one of /// the following exception types: AccessDeniedException, InvalidStateException, /// DisabledException, or NotFoundException. /// @@ -1344,7 +1374,7 @@ public virtual PutRecordResponse PutRecord(PutRecordRequest request) /// /// /// The service is unavailable. Back off and retry the operation. If you continue to see - /// the exception, throughput limits for the delivery stream may have been exceeded. For + /// the exception, throughput limits for the Firehose stream may have been exceeded. For /// more information about limits and how to request an increase, see Amazon /// Firehose Limits. /// @@ -1364,16 +1394,16 @@ public virtual PutRecordResponse PutRecord(PutRecordRequest request) /// - /// Writes multiple data records into a delivery stream in a single call, which can achieve + /// Writes multiple data records into a Firehose stream in a single call, which can achieve /// higher throughput per producer than when writing single records. To write single data - /// records into a delivery stream, use PutRecord. Applications using these operations + /// records into a Firehose stream, use PutRecord. Applications using these operations /// are referred to as producers. /// /// /// /// Firehose accumulates and publishes a particular metric for a customer account in one /// minute intervals. It is possible that the bursts of incoming bytes/records ingested - /// to a delivery stream last only for a few seconds. Due to this, the actual spikes in + /// to a Firehose stream last only for a few seconds. Due to this, the actual spikes in /// the traffic might not be fully visible in the customer's 1 minute CloudWatch metrics. /// /// @@ -1389,13 +1419,21 @@ public virtual PutRecordResponse PutRecord(PutRecordRequest request) /// /// /// - /// You must specify the name of the delivery stream and the data record when using PutRecord. + /// You must specify the name of the Firehose stream and the data record when using PutRecord. /// The data record consists of a data blob that can be up to 1,000 KB in size, and any /// kind of data. For example, it could be a segment from a log file, geographic location /// data, website clickstream data, and so on. /// /// /// + /// For multi record de-aggregation, you can not put more than 500 records even if the + /// data blob length is less than 1000 KiB. If you include more than 500 records, the + /// request succeeds but the record de-aggregation doesn't work as expected and transformation + /// lambda is invoked with the complete base64 encoded data blob instead of de-aggregated + /// base64 decoded records. + /// + /// + /// /// Firehose buffers records before delivering them to the destination. To disambiguate /// the data blobs at the destination, a common solution is to use delimiters in the data, /// such as a newline (\n) or some other character unique within the data. This @@ -1435,7 +1473,7 @@ public virtual PutRecordResponse PutRecord(PutRecordRequest request) /// /// If PutRecordBatch throws ServiceUnavailableException, the API is automatically /// reinvoked (retried) 3 times. If the exception persists, it is possible that the throughput - /// limits have been exceeded for the delivery stream. + /// limits have been exceeded for the Firehose stream. /// /// /// @@ -1446,7 +1484,7 @@ public virtual PutRecordResponse PutRecord(PutRecordRequest request) /// /// /// Data records sent to Firehose are stored for 24 hours from the time they are added - /// to a delivery stream as it attempts to send the records to the destination. If the + /// to a Firehose stream as it attempts to send the records to the destination. If the /// destination is unreachable for more than 24 hours, the data is no longer available. /// /// @@ -1456,7 +1494,7 @@ public virtual PutRecordResponse PutRecord(PutRecordRequest request) /// /// /// - /// The name of the delivery stream. + /// The name of the Firehose stream. /// One or more records. /// /// The response from the PutRecordBatch service method, as returned by KinesisFirehose. @@ -1465,7 +1503,7 @@ public virtual PutRecordResponse PutRecord(PutRecordRequest request) /// /// /// Firehose throws this exception when an attempt to put records or to start or stop - /// delivery stream encryption fails. This happens when the KMS service throws one of + /// Firehose stream encryption fails. This happens when the KMS service throws one of /// the following exception types: AccessDeniedException, InvalidStateException, /// DisabledException, or NotFoundException. /// @@ -1478,7 +1516,7 @@ public virtual PutRecordResponse PutRecord(PutRecordRequest request) /// /// /// The service is unavailable. Back off and retry the operation. If you continue to see - /// the exception, throughput limits for the delivery stream may have been exceeded. For + /// the exception, throughput limits for the Firehose stream may have been exceeded. For /// more information about limits and how to request an increase, see Amazon /// Firehose Limits. /// @@ -1493,16 +1531,16 @@ public virtual PutRecordBatchResponse PutRecordBatch(string deliveryStreamName, /// - /// Writes multiple data records into a delivery stream in a single call, which can achieve + /// Writes multiple data records into a Firehose stream in a single call, which can achieve /// higher throughput per producer than when writing single records. To write single data - /// records into a delivery stream, use PutRecord. Applications using these operations + /// records into a Firehose stream, use PutRecord. Applications using these operations /// are referred to as producers. /// /// /// /// Firehose accumulates and publishes a particular metric for a customer account in one /// minute intervals. It is possible that the bursts of incoming bytes/records ingested - /// to a delivery stream last only for a few seconds. Due to this, the actual spikes in + /// to a Firehose stream last only for a few seconds. Due to this, the actual spikes in /// the traffic might not be fully visible in the customer's 1 minute CloudWatch metrics. /// /// @@ -1518,13 +1556,21 @@ public virtual PutRecordBatchResponse PutRecordBatch(string deliveryStreamName, /// /// /// - /// You must specify the name of the delivery stream and the data record when using PutRecord. + /// You must specify the name of the Firehose stream and the data record when using PutRecord. /// The data record consists of a data blob that can be up to 1,000 KB in size, and any /// kind of data. For example, it could be a segment from a log file, geographic location /// data, website clickstream data, and so on. /// /// /// + /// For multi record de-aggregation, you can not put more than 500 records even if the + /// data blob length is less than 1000 KiB. If you include more than 500 records, the + /// request succeeds but the record de-aggregation doesn't work as expected and transformation + /// lambda is invoked with the complete base64 encoded data blob instead of de-aggregated + /// base64 decoded records. + /// + /// + /// /// Firehose buffers records before delivering them to the destination. To disambiguate /// the data blobs at the destination, a common solution is to use delimiters in the data, /// such as a newline (\n) or some other character unique within the data. This @@ -1564,7 +1610,7 @@ public virtual PutRecordBatchResponse PutRecordBatch(string deliveryStreamName, /// /// If PutRecordBatch throws ServiceUnavailableException, the API is automatically /// reinvoked (retried) 3 times. If the exception persists, it is possible that the throughput - /// limits have been exceeded for the delivery stream. + /// limits have been exceeded for the Firehose stream. /// /// /// @@ -1575,7 +1621,7 @@ public virtual PutRecordBatchResponse PutRecordBatch(string deliveryStreamName, /// /// /// Data records sent to Firehose are stored for 24 hours from the time they are added - /// to a delivery stream as it attempts to send the records to the destination. If the + /// to a Firehose stream as it attempts to send the records to the destination. If the /// destination is unreachable for more than 24 hours, the data is no longer available. /// /// @@ -1593,7 +1639,7 @@ public virtual PutRecordBatchResponse PutRecordBatch(string deliveryStreamName, /// /// /// Firehose throws this exception when an attempt to put records or to start or stop - /// delivery stream encryption fails. This happens when the KMS service throws one of + /// Firehose stream encryption fails. This happens when the KMS service throws one of /// the following exception types: AccessDeniedException, InvalidStateException, /// DisabledException, or NotFoundException. /// @@ -1606,7 +1652,7 @@ public virtual PutRecordBatchResponse PutRecordBatch(string deliveryStreamName, /// /// /// The service is unavailable. Back off and retry the operation. If you continue to see - /// the exception, throughput limits for the delivery stream may have been exceeded. For + /// the exception, throughput limits for the Firehose stream may have been exceeded. For /// more information about limits and how to request an increase, see Amazon /// Firehose Limits. /// @@ -1622,16 +1668,16 @@ public virtual PutRecordBatchResponse PutRecordBatch(PutRecordBatchRequest reque /// - /// Writes multiple data records into a delivery stream in a single call, which can achieve + /// Writes multiple data records into a Firehose stream in a single call, which can achieve /// higher throughput per producer than when writing single records. To write single data - /// records into a delivery stream, use PutRecord. Applications using these operations + /// records into a Firehose stream, use PutRecord. Applications using these operations /// are referred to as producers. /// /// /// /// Firehose accumulates and publishes a particular metric for a customer account in one /// minute intervals. It is possible that the bursts of incoming bytes/records ingested - /// to a delivery stream last only for a few seconds. Due to this, the actual spikes in + /// to a Firehose stream last only for a few seconds. Due to this, the actual spikes in /// the traffic might not be fully visible in the customer's 1 minute CloudWatch metrics. /// /// @@ -1647,13 +1693,21 @@ public virtual PutRecordBatchResponse PutRecordBatch(PutRecordBatchRequest reque /// /// /// - /// You must specify the name of the delivery stream and the data record when using PutRecord. + /// You must specify the name of the Firehose stream and the data record when using PutRecord. /// The data record consists of a data blob that can be up to 1,000 KB in size, and any /// kind of data. For example, it could be a segment from a log file, geographic location /// data, website clickstream data, and so on. /// /// /// + /// For multi record de-aggregation, you can not put more than 500 records even if the + /// data blob length is less than 1000 KiB. If you include more than 500 records, the + /// request succeeds but the record de-aggregation doesn't work as expected and transformation + /// lambda is invoked with the complete base64 encoded data blob instead of de-aggregated + /// base64 decoded records. + /// + /// + /// /// Firehose buffers records before delivering them to the destination. To disambiguate /// the data blobs at the destination, a common solution is to use delimiters in the data, /// such as a newline (\n) or some other character unique within the data. This @@ -1693,7 +1747,7 @@ public virtual PutRecordBatchResponse PutRecordBatch(PutRecordBatchRequest reque /// /// If PutRecordBatch throws ServiceUnavailableException, the API is automatically /// reinvoked (retried) 3 times. If the exception persists, it is possible that the throughput - /// limits have been exceeded for the delivery stream. + /// limits have been exceeded for the Firehose stream. /// /// /// @@ -1704,7 +1758,7 @@ public virtual PutRecordBatchResponse PutRecordBatch(PutRecordBatchRequest reque /// /// /// Data records sent to Firehose are stored for 24 hours from the time they are added - /// to a delivery stream as it attempts to send the records to the destination. If the + /// to a Firehose stream as it attempts to send the records to the destination. If the /// destination is unreachable for more than 24 hours, the data is no longer available. /// /// @@ -1714,7 +1768,7 @@ public virtual PutRecordBatchResponse PutRecordBatch(PutRecordBatchRequest reque /// /// /// - /// The name of the delivery stream. + /// The name of the Firehose stream. /// One or more records. /// /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. @@ -1726,7 +1780,7 @@ public virtual PutRecordBatchResponse PutRecordBatch(PutRecordBatchRequest reque /// /// /// Firehose throws this exception when an attempt to put records or to start or stop - /// delivery stream encryption fails. This happens when the KMS service throws one of + /// Firehose stream encryption fails. This happens when the KMS service throws one of /// the following exception types: AccessDeniedException, InvalidStateException, /// DisabledException, or NotFoundException. /// @@ -1739,7 +1793,7 @@ public virtual PutRecordBatchResponse PutRecordBatch(PutRecordBatchRequest reque /// /// /// The service is unavailable. Back off and retry the operation. If you continue to see - /// the exception, throughput limits for the delivery stream may have been exceeded. For + /// the exception, throughput limits for the Firehose stream may have been exceeded. For /// more information about limits and how to request an increase, see Amazon /// Firehose Limits. /// @@ -1754,16 +1808,16 @@ public virtual PutRecordBatchResponse PutRecordBatch(PutRecordBatchRequest reque /// - /// Writes multiple data records into a delivery stream in a single call, which can achieve + /// Writes multiple data records into a Firehose stream in a single call, which can achieve /// higher throughput per producer than when writing single records. To write single data - /// records into a delivery stream, use PutRecord. Applications using these operations + /// records into a Firehose stream, use PutRecord. Applications using these operations /// are referred to as producers. /// /// /// /// Firehose accumulates and publishes a particular metric for a customer account in one /// minute intervals. It is possible that the bursts of incoming bytes/records ingested - /// to a delivery stream last only for a few seconds. Due to this, the actual spikes in + /// to a Firehose stream last only for a few seconds. Due to this, the actual spikes in /// the traffic might not be fully visible in the customer's 1 minute CloudWatch metrics. /// /// @@ -1779,13 +1833,21 @@ public virtual PutRecordBatchResponse PutRecordBatch(PutRecordBatchRequest reque /// /// /// - /// You must specify the name of the delivery stream and the data record when using PutRecord. + /// You must specify the name of the Firehose stream and the data record when using PutRecord. /// The data record consists of a data blob that can be up to 1,000 KB in size, and any /// kind of data. For example, it could be a segment from a log file, geographic location /// data, website clickstream data, and so on. /// /// /// + /// For multi record de-aggregation, you can not put more than 500 records even if the + /// data blob length is less than 1000 KiB. If you include more than 500 records, the + /// request succeeds but the record de-aggregation doesn't work as expected and transformation + /// lambda is invoked with the complete base64 encoded data blob instead of de-aggregated + /// base64 decoded records. + /// + /// + /// /// Firehose buffers records before delivering them to the destination. To disambiguate /// the data blobs at the destination, a common solution is to use delimiters in the data, /// such as a newline (\n) or some other character unique within the data. This @@ -1825,7 +1887,7 @@ public virtual PutRecordBatchResponse PutRecordBatch(PutRecordBatchRequest reque /// /// If PutRecordBatch throws ServiceUnavailableException, the API is automatically /// reinvoked (retried) 3 times. If the exception persists, it is possible that the throughput - /// limits have been exceeded for the delivery stream. + /// limits have been exceeded for the Firehose stream. /// /// /// @@ -1836,7 +1898,7 @@ public virtual PutRecordBatchResponse PutRecordBatch(PutRecordBatchRequest reque /// /// /// Data records sent to Firehose are stored for 24 hours from the time they are added - /// to a delivery stream as it attempts to send the records to the destination. If the + /// to a Firehose stream as it attempts to send the records to the destination. If the /// destination is unreachable for more than 24 hours, the data is no longer available. /// /// @@ -1857,7 +1919,7 @@ public virtual PutRecordBatchResponse PutRecordBatch(PutRecordBatchRequest reque /// /// /// Firehose throws this exception when an attempt to put records or to start or stop - /// delivery stream encryption fails. This happens when the KMS service throws one of + /// Firehose stream encryption fails. This happens when the KMS service throws one of /// the following exception types: AccessDeniedException, InvalidStateException, /// DisabledException, or NotFoundException. /// @@ -1870,7 +1932,7 @@ public virtual PutRecordBatchResponse PutRecordBatch(PutRecordBatchRequest reque /// /// /// The service is unavailable. Back off and retry the operation. If you continue to see - /// the exception, throughput limits for the delivery stream may have been exceeded. For + /// the exception, throughput limits for the Firehose stream may have been exceeded. For /// more information about limits and how to request an increase, see Amazon /// Firehose Limits. /// @@ -1890,28 +1952,28 @@ public virtual PutRecordBatchResponse PutRecordBatch(PutRecordBatchRequest reque /// - /// Enables server-side encryption (SSE) for the delivery stream. + /// Enables server-side encryption (SSE) for the Firehose stream. /// /// /// /// This operation is asynchronous. It returns immediately. When you invoke it, Firehose /// first sets the encryption status of the stream to ENABLING, and then to ENABLED. - /// The encryption status of a delivery stream is the Status property in DeliveryStreamEncryptionConfiguration. + /// The encryption status of a Firehose stream is the Status property in DeliveryStreamEncryptionConfiguration. /// If the operation fails, the encryption status changes to ENABLING_FAILED. You - /// can continue to read and write data to your delivery stream while the encryption status + /// can continue to read and write data to your Firehose stream while the encryption status /// is ENABLING, but the data is not encrypted. It can take up to 5 seconds after /// the encryption status changes to ENABLED before all records written to the - /// delivery stream are encrypted. To find out whether a record or a batch of records + /// Firehose stream are encrypted. To find out whether a record or a batch of records /// was encrypted, check the response elements PutRecordOutput$Encrypted and PutRecordBatchOutput$Encrypted, /// respectively. /// /// /// - /// To check the encryption status of a delivery stream, use DescribeDeliveryStream. + /// To check the encryption status of a Firehose stream, use DescribeDeliveryStream. /// /// /// - /// Even if encryption is currently enabled for a delivery stream, you can still invoke + /// Even if encryption is currently enabled for a Firehose stream, you can still invoke /// this operation on it to change the ARN of the CMK or both its type and ARN. If you /// invoke this method to change the CMK, and the old CMK is of type CUSTOMER_MANAGED_CMK, /// Firehose schedules the grant it had on the old CMK for retirement. If the new CMK @@ -1926,29 +1988,29 @@ public virtual PutRecordBatchResponse PutRecordBatch(PutRecordBatchRequest reque /// /// /// - /// If a delivery stream already has encryption enabled and then you invoke this operation + /// If a Firehose stream already has encryption enabled and then you invoke this operation /// to change the ARN of the CMK or both its type and ARN and you get ENABLING_FAILED, /// this only means that the attempt to change the CMK failed. In this case, encryption /// remains enabled with the old CMK. /// /// /// - /// If the encryption status of your delivery stream is ENABLING_FAILED, you can + /// If the encryption status of your Firehose stream is ENABLING_FAILED, you can /// invoke this operation again with a valid CMK. The CMK must be enabled and the key /// policy mustn't explicitly deny the permission for Firehose to invoke KMS encrypt and /// decrypt operations. /// /// /// - /// You can enable SSE for a delivery stream only if it's a delivery stream that uses + /// You can enable SSE for a Firehose stream only if it's a Firehose stream that uses /// DirectPut as its source. /// /// /// /// The StartDeliveryStreamEncryption and StopDeliveryStreamEncryption operations - /// have a combined limit of 25 calls per delivery stream per 24 hours. For example, you + /// have a combined limit of 25 calls per Firehose stream per 24 hours. For example, you /// reach the limit if you call StartDeliveryStreamEncryption 13 times and StopDeliveryStreamEncryption - /// 12 times for the same delivery stream in a 24-hour period. + /// 12 times for the same Firehose stream in a 24-hour period. /// /// /// Container for the necessary parameters to execute the StartDeliveryStreamEncryption service method. @@ -1959,7 +2021,7 @@ public virtual PutRecordBatchResponse PutRecordBatch(PutRecordBatchRequest reque /// /// /// Firehose throws this exception when an attempt to put records or to start or stop - /// delivery stream encryption fails. This happens when the KMS service throws one of + /// Firehose stream encryption fails. This happens when the KMS service throws one of /// the following exception types: AccessDeniedException, InvalidStateException, /// DisabledException, or NotFoundException. /// @@ -1984,28 +2046,28 @@ public virtual StartDeliveryStreamEncryptionResponse StartDeliveryStreamEncrypti /// - /// Enables server-side encryption (SSE) for the delivery stream. + /// Enables server-side encryption (SSE) for the Firehose stream. /// /// /// /// This operation is asynchronous. It returns immediately. When you invoke it, Firehose /// first sets the encryption status of the stream to ENABLING, and then to ENABLED. - /// The encryption status of a delivery stream is the Status property in DeliveryStreamEncryptionConfiguration. + /// The encryption status of a Firehose stream is the Status property in DeliveryStreamEncryptionConfiguration. /// If the operation fails, the encryption status changes to ENABLING_FAILED. You - /// can continue to read and write data to your delivery stream while the encryption status + /// can continue to read and write data to your Firehose stream while the encryption status /// is ENABLING, but the data is not encrypted. It can take up to 5 seconds after /// the encryption status changes to ENABLED before all records written to the - /// delivery stream are encrypted. To find out whether a record or a batch of records + /// Firehose stream are encrypted. To find out whether a record or a batch of records /// was encrypted, check the response elements PutRecordOutput$Encrypted and PutRecordBatchOutput$Encrypted, /// respectively. /// /// /// - /// To check the encryption status of a delivery stream, use DescribeDeliveryStream. + /// To check the encryption status of a Firehose stream, use DescribeDeliveryStream. /// /// /// - /// Even if encryption is currently enabled for a delivery stream, you can still invoke + /// Even if encryption is currently enabled for a Firehose stream, you can still invoke /// this operation on it to change the ARN of the CMK or both its type and ARN. If you /// invoke this method to change the CMK, and the old CMK is of type CUSTOMER_MANAGED_CMK, /// Firehose schedules the grant it had on the old CMK for retirement. If the new CMK @@ -2020,29 +2082,29 @@ public virtual StartDeliveryStreamEncryptionResponse StartDeliveryStreamEncrypti /// /// /// - /// If a delivery stream already has encryption enabled and then you invoke this operation + /// If a Firehose stream already has encryption enabled and then you invoke this operation /// to change the ARN of the CMK or both its type and ARN and you get ENABLING_FAILED, /// this only means that the attempt to change the CMK failed. In this case, encryption /// remains enabled with the old CMK. /// /// /// - /// If the encryption status of your delivery stream is ENABLING_FAILED, you can + /// If the encryption status of your Firehose stream is ENABLING_FAILED, you can /// invoke this operation again with a valid CMK. The CMK must be enabled and the key /// policy mustn't explicitly deny the permission for Firehose to invoke KMS encrypt and /// decrypt operations. /// /// /// - /// You can enable SSE for a delivery stream only if it's a delivery stream that uses + /// You can enable SSE for a Firehose stream only if it's a Firehose stream that uses /// DirectPut as its source. /// /// /// /// The StartDeliveryStreamEncryption and StopDeliveryStreamEncryption operations - /// have a combined limit of 25 calls per delivery stream per 24 hours. For example, you + /// have a combined limit of 25 calls per Firehose stream per 24 hours. For example, you /// reach the limit if you call StartDeliveryStreamEncryption 13 times and StopDeliveryStreamEncryption - /// 12 times for the same delivery stream in a 24-hour period. + /// 12 times for the same Firehose stream in a 24-hour period. /// /// /// Container for the necessary parameters to execute the StartDeliveryStreamEncryption service method. @@ -2056,7 +2118,7 @@ public virtual StartDeliveryStreamEncryptionResponse StartDeliveryStreamEncrypti /// /// /// Firehose throws this exception when an attempt to put records or to start or stop - /// delivery stream encryption fails. This happens when the KMS service throws one of + /// Firehose stream encryption fails. This happens when the KMS service throws one of /// the following exception types: AccessDeniedException, InvalidStateException, /// DisabledException, or NotFoundException. /// @@ -2085,7 +2147,7 @@ public virtual StartDeliveryStreamEncryptionResponse StartDeliveryStreamEncrypti /// - /// Disables server-side encryption (SSE) for the delivery stream. + /// Disables server-side encryption (SSE) for the Firehose stream. /// /// /// @@ -2093,14 +2155,14 @@ public virtual StartDeliveryStreamEncryptionResponse StartDeliveryStreamEncrypti /// first sets the encryption status of the stream to DISABLING, and then to DISABLED. /// You can continue to read and write data to your stream while its status is DISABLING. /// It can take up to 5 seconds after the encryption status changes to DISABLED - /// before all records written to the delivery stream are no longer subject to encryption. + /// before all records written to the Firehose stream are no longer subject to encryption. /// To find out whether a record or a batch of records was encrypted, check the response /// elements PutRecordOutput$Encrypted and PutRecordBatchOutput$Encrypted, /// respectively. /// /// /// - /// To check the encryption state of a delivery stream, use DescribeDeliveryStream. + /// To check the encryption state of a Firehose stream, use DescribeDeliveryStream. /// /// /// @@ -2112,9 +2174,9 @@ public virtual StartDeliveryStreamEncryptionResponse StartDeliveryStreamEncrypti /// /// /// The StartDeliveryStreamEncryption and StopDeliveryStreamEncryption operations - /// have a combined limit of 25 calls per delivery stream per 24 hours. For example, you + /// have a combined limit of 25 calls per Firehose stream per 24 hours. For example, you /// reach the limit if you call StartDeliveryStreamEncryption 13 times and StopDeliveryStreamEncryption - /// 12 times for the same delivery stream in a 24-hour period. + /// 12 times for the same Firehose stream in a 24-hour period. /// /// /// Container for the necessary parameters to execute the StopDeliveryStreamEncryption service method. @@ -2144,7 +2206,7 @@ public virtual StopDeliveryStreamEncryptionResponse StopDeliveryStreamEncryption /// - /// Disables server-side encryption (SSE) for the delivery stream. + /// Disables server-side encryption (SSE) for the Firehose stream. /// /// /// @@ -2152,14 +2214,14 @@ public virtual StopDeliveryStreamEncryptionResponse StopDeliveryStreamEncryption /// first sets the encryption status of the stream to DISABLING, and then to DISABLED. /// You can continue to read and write data to your stream while its status is DISABLING. /// It can take up to 5 seconds after the encryption status changes to DISABLED - /// before all records written to the delivery stream are no longer subject to encryption. + /// before all records written to the Firehose stream are no longer subject to encryption. /// To find out whether a record or a batch of records was encrypted, check the response /// elements PutRecordOutput$Encrypted and PutRecordBatchOutput$Encrypted, /// respectively. /// /// /// - /// To check the encryption state of a delivery stream, use DescribeDeliveryStream. + /// To check the encryption state of a Firehose stream, use DescribeDeliveryStream. /// /// /// @@ -2171,9 +2233,9 @@ public virtual StopDeliveryStreamEncryptionResponse StopDeliveryStreamEncryption /// /// /// The StartDeliveryStreamEncryption and StopDeliveryStreamEncryption operations - /// have a combined limit of 25 calls per delivery stream per 24 hours. For example, you + /// have a combined limit of 25 calls per Firehose stream per 24 hours. For example, you /// reach the limit if you call StartDeliveryStreamEncryption 13 times and StopDeliveryStreamEncryption - /// 12 times for the same delivery stream in a 24-hour period. + /// 12 times for the same Firehose stream in a 24-hour period. /// /// /// Container for the necessary parameters to execute the StopDeliveryStreamEncryption service method. @@ -2210,18 +2272,18 @@ public virtual StopDeliveryStreamEncryptionResponse StopDeliveryStreamEncryption /// - /// Adds or updates tags for the specified delivery stream. A tag is a key-value pair + /// Adds or updates tags for the specified Firehose stream. A tag is a key-value pair /// that you can define and assign to Amazon Web Services resources. If you specify a /// tag that already exists, the tag value is replaced with the value that you specify /// in the request. Tags are metadata. For example, you can add friendly names and descriptions - /// or other types of information that can help you distinguish the delivery stream. For + /// or other types of information that can help you distinguish the Firehose stream. For /// more information about tags, see Using /// Cost Allocation Tags in the Amazon Web Services Billing and Cost Management /// User Guide. /// /// /// - /// Each delivery stream can have up to 50 tags. + /// Each Firehose stream can have up to 50 tags. /// /// /// @@ -2255,18 +2317,18 @@ public virtual TagDeliveryStreamResponse TagDeliveryStream(TagDeliveryStreamRequ /// - /// Adds or updates tags for the specified delivery stream. A tag is a key-value pair + /// Adds or updates tags for the specified Firehose stream. A tag is a key-value pair /// that you can define and assign to Amazon Web Services resources. If you specify a /// tag that already exists, the tag value is replaced with the value that you specify /// in the request. Tags are metadata. For example, you can add friendly names and descriptions - /// or other types of information that can help you distinguish the delivery stream. For + /// or other types of information that can help you distinguish the Firehose stream. For /// more information about tags, see Using /// Cost Allocation Tags in the Amazon Web Services Billing and Cost Management /// User Guide. /// /// /// - /// Each delivery stream can have up to 50 tags. + /// Each Firehose stream can have up to 50 tags. /// /// /// @@ -2307,7 +2369,7 @@ public virtual TagDeliveryStreamResponse TagDeliveryStream(TagDeliveryStreamRequ /// - /// Removes tags from the specified delivery stream. Removed tags are deleted, and you + /// Removes tags from the specified Firehose stream. Removed tags are deleted, and you /// can't recover them after this operation successfully completes. /// /// @@ -2346,7 +2408,7 @@ public virtual UntagDeliveryStreamResponse UntagDeliveryStream(UntagDeliveryStre /// - /// Removes tags from the specified delivery stream. Removed tags are deleted, and you + /// Removes tags from the specified Firehose stream. Removed tags are deleted, and you /// can't recover them after this operation successfully completes. /// /// @@ -2392,15 +2454,15 @@ public virtual UntagDeliveryStreamResponse UntagDeliveryStream(UntagDeliveryStre /// - /// Updates the specified destination of the specified delivery stream. + /// Updates the specified destination of the specified Firehose stream. /// /// /// /// Use this operation to change the destination type (for example, to replace the Amazon /// S3 destination with Amazon Redshift) or change the parameters associated with a destination /// (for example, to change the bucket name of the Amazon S3 destination). The update - /// might not occur immediately. The target delivery stream remains active while the configurations - /// are updated, so data writes to the delivery stream can continue during this process. + /// might not occur immediately. The target Firehose stream remains active while the configurations + /// are updated, so data writes to the Firehose stream can continue during this process. /// The updated configurations are usually effective within a few minutes. /// /// @@ -2460,15 +2522,15 @@ public virtual UpdateDestinationResponse UpdateDestination(UpdateDestinationRequ /// - /// Updates the specified destination of the specified delivery stream. + /// Updates the specified destination of the specified Firehose stream. /// /// /// /// Use this operation to change the destination type (for example, to replace the Amazon /// S3 destination with Amazon Redshift) or change the parameters associated with a destination /// (for example, to change the bucket name of the Amazon S3 destination). The update - /// might not occur immediately. The target delivery stream remains active while the configurations - /// are updated, so data writes to the delivery stream can continue during this process. + /// might not occur immediately. The target Firehose stream remains active while the configurations + /// are updated, so data writes to the Firehose stream can continue during this process. /// The updated configurations are usually effective within a few minutes. /// /// diff --git a/sdk/src/Services/KinesisFirehose/KinesisFirehose.sln b/sdk/src/Services/KinesisFirehose/KinesisFirehose.sln index d7b44639153c..d5b53deb7118 100644 --- a/sdk/src/Services/KinesisFirehose/KinesisFirehose.sln +++ b/sdk/src/Services/KinesisFirehose/KinesisFirehose.sln @@ -92,7 +92,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {19CC49CE-34AB-44D1-AFE9-E3A4CE533747}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {19CC49CE-34AB-44D1-AFE9-E3A4CE533747}.Debug|Any CPU.Build.0 = Debug|Any CPU {19CC49CE-34AB-44D1-AFE9-E3A4CE533747}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -113,97 +120,6 @@ Global {0B9364E8-48A5-4C9E-917A-271C05E879F7}.Debug|Any CPU.Build.0 = Debug|Any CPU {0B9364E8-48A5-4C9E-917A-271C05E879F7}.Release|Any CPU.ActiveCfg = Release|Any CPU {0B9364E8-48A5-4C9E-917A-271C05E879F7}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {082B9FD9-7D69-4DBB-B181-27708D979685}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {082B9FD9-7D69-4DBB-B181-27708D979685}.Debug|Any CPU.Build.0 = Debug|Any CPU - {082B9FD9-7D69-4DBB-B181-27708D979685}.Release|Any CPU.ActiveCfg = Release|Any CPU - {082B9FD9-7D69-4DBB-B181-27708D979685}.Release|Any CPU.Build.0 = Release|Any CPU - {47E26379-1A6C-4035-A992-5E367DE0DFBC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {47E26379-1A6C-4035-A992-5E367DE0DFBC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {47E26379-1A6C-4035-A992-5E367DE0DFBC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {47E26379-1A6C-4035-A992-5E367DE0DFBC}.Release|Any CPU.Build.0 = Release|Any CPU - {3E60812B-865B-4CDD-A4FC-06698F296415}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3E60812B-865B-4CDD-A4FC-06698F296415}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3E60812B-865B-4CDD-A4FC-06698F296415}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3E60812B-865B-4CDD-A4FC-06698F296415}.Release|Any CPU.Build.0 = Release|Any CPU - {3FE101A7-D9A7-4D1B-B879-5050688BEDAB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3FE101A7-D9A7-4D1B-B879-5050688BEDAB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3FE101A7-D9A7-4D1B-B879-5050688BEDAB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3FE101A7-D9A7-4D1B-B879-5050688BEDAB}.Release|Any CPU.Build.0 = Release|Any CPU - {7FC8FBB7-F334-4174-AD08-3A9C9D5E9D84}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7FC8FBB7-F334-4174-AD08-3A9C9D5E9D84}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7FC8FBB7-F334-4174-AD08-3A9C9D5E9D84}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7FC8FBB7-F334-4174-AD08-3A9C9D5E9D84}.Release|Any CPU.Build.0 = Release|Any CPU - {130D77CA-0D72-4C02-B269-CB2D4F97C04B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {130D77CA-0D72-4C02-B269-CB2D4F97C04B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {130D77CA-0D72-4C02-B269-CB2D4F97C04B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {130D77CA-0D72-4C02-B269-CB2D4F97C04B}.Release|Any CPU.Build.0 = Release|Any CPU - {7D26B1DD-8AEA-4BE8-A0D0-45CDF362699B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7D26B1DD-8AEA-4BE8-A0D0-45CDF362699B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7D26B1DD-8AEA-4BE8-A0D0-45CDF362699B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7D26B1DD-8AEA-4BE8-A0D0-45CDF362699B}.Release|Any CPU.Build.0 = Release|Any CPU - {F002EC2A-EE0C-4CAB-90A2-7B914910EF3C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F002EC2A-EE0C-4CAB-90A2-7B914910EF3C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F002EC2A-EE0C-4CAB-90A2-7B914910EF3C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F002EC2A-EE0C-4CAB-90A2-7B914910EF3C}.Release|Any CPU.Build.0 = Release|Any CPU - {BA16E493-815F-4BFD-A20B-40E00B91A197}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BA16E493-815F-4BFD-A20B-40E00B91A197}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BA16E493-815F-4BFD-A20B-40E00B91A197}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BA16E493-815F-4BFD-A20B-40E00B91A197}.Release|Any CPU.Build.0 = Release|Any CPU - {5E2F6E0C-D2D8-4B9F-9532-5FE637C993AB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5E2F6E0C-D2D8-4B9F-9532-5FE637C993AB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5E2F6E0C-D2D8-4B9F-9532-5FE637C993AB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5E2F6E0C-D2D8-4B9F-9532-5FE637C993AB}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {082B9FD9-7D69-4DBB-B181-27708D979685}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {082B9FD9-7D69-4DBB-B181-27708D979685}.Debug|Any CPU.Build.0 = Debug|Any CPU - {082B9FD9-7D69-4DBB-B181-27708D979685}.Release|Any CPU.ActiveCfg = Release|Any CPU - {082B9FD9-7D69-4DBB-B181-27708D979685}.Release|Any CPU.Build.0 = Release|Any CPU - {47E26379-1A6C-4035-A992-5E367DE0DFBC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {47E26379-1A6C-4035-A992-5E367DE0DFBC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {47E26379-1A6C-4035-A992-5E367DE0DFBC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {47E26379-1A6C-4035-A992-5E367DE0DFBC}.Release|Any CPU.Build.0 = Release|Any CPU - {3E60812B-865B-4CDD-A4FC-06698F296415}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3E60812B-865B-4CDD-A4FC-06698F296415}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3E60812B-865B-4CDD-A4FC-06698F296415}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3E60812B-865B-4CDD-A4FC-06698F296415}.Release|Any CPU.Build.0 = Release|Any CPU - {3FE101A7-D9A7-4D1B-B879-5050688BEDAB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3FE101A7-D9A7-4D1B-B879-5050688BEDAB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3FE101A7-D9A7-4D1B-B879-5050688BEDAB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3FE101A7-D9A7-4D1B-B879-5050688BEDAB}.Release|Any CPU.Build.0 = Release|Any CPU - {7FC8FBB7-F334-4174-AD08-3A9C9D5E9D84}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7FC8FBB7-F334-4174-AD08-3A9C9D5E9D84}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7FC8FBB7-F334-4174-AD08-3A9C9D5E9D84}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7FC8FBB7-F334-4174-AD08-3A9C9D5E9D84}.Release|Any CPU.Build.0 = Release|Any CPU - {130D77CA-0D72-4C02-B269-CB2D4F97C04B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {130D77CA-0D72-4C02-B269-CB2D4F97C04B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {130D77CA-0D72-4C02-B269-CB2D4F97C04B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {130D77CA-0D72-4C02-B269-CB2D4F97C04B}.Release|Any CPU.Build.0 = Release|Any CPU - {7D26B1DD-8AEA-4BE8-A0D0-45CDF362699B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7D26B1DD-8AEA-4BE8-A0D0-45CDF362699B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7D26B1DD-8AEA-4BE8-A0D0-45CDF362699B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7D26B1DD-8AEA-4BE8-A0D0-45CDF362699B}.Release|Any CPU.Build.0 = Release|Any CPU - {F002EC2A-EE0C-4CAB-90A2-7B914910EF3C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F002EC2A-EE0C-4CAB-90A2-7B914910EF3C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F002EC2A-EE0C-4CAB-90A2-7B914910EF3C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F002EC2A-EE0C-4CAB-90A2-7B914910EF3C}.Release|Any CPU.Build.0 = Release|Any CPU - {BA16E493-815F-4BFD-A20B-40E00B91A197}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BA16E493-815F-4BFD-A20B-40E00B91A197}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BA16E493-815F-4BFD-A20B-40E00B91A197}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BA16E493-815F-4BFD-A20B-40E00B91A197}.Release|Any CPU.Build.0 = Release|Any CPU - {5E2F6E0C-D2D8-4B9F-9532-5FE637C993AB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5E2F6E0C-D2D8-4B9F-9532-5FE637C993AB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5E2F6E0C-D2D8-4B9F-9532-5FE637C993AB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5E2F6E0C-D2D8-4B9F-9532-5FE637C993AB}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -220,37 +136,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {19CC49CE-34AB-44D1-AFE9-E3A4CE533747} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {33F8A531-1431-442E-A66D-2E172D700019} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {5BD8B973-095F-407A-A82B-78EA2CBFA433} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {8E041C3D-8970-42FE-A538-6BC336F9792C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {0B9364E8-48A5-4C9E-917A-271C05E879F7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {082B9FD9-7D69-4DBB-B181-27708D979685} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {47E26379-1A6C-4035-A992-5E367DE0DFBC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {3E60812B-865B-4CDD-A4FC-06698F296415} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {3FE101A7-D9A7-4D1B-B879-5050688BEDAB} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {7FC8FBB7-F334-4174-AD08-3A9C9D5E9D84} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {130D77CA-0D72-4C02-B269-CB2D4F97C04B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {7D26B1DD-8AEA-4BE8-A0D0-45CDF362699B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F002EC2A-EE0C-4CAB-90A2-7B914910EF3C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {BA16E493-815F-4BFD-A20B-40E00B91A197} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {5E2F6E0C-D2D8-4B9F-9532-5FE637C993AB} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {082B9FD9-7D69-4DBB-B181-27708D979685} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {47E26379-1A6C-4035-A992-5E367DE0DFBC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {3E60812B-865B-4CDD-A4FC-06698F296415} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {3FE101A7-D9A7-4D1B-B879-5050688BEDAB} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {7FC8FBB7-F334-4174-AD08-3A9C9D5E9D84} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {130D77CA-0D72-4C02-B269-CB2D4F97C04B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {7D26B1DD-8AEA-4BE8-A0D0-45CDF362699B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F002EC2A-EE0C-4CAB-90A2-7B914910EF3C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {BA16E493-815F-4BFD-A20B-40E00B91A197} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {5E2F6E0C-D2D8-4B9F-9532-5FE637C993AB} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {4D423A92-D462-492E-B7CF-00E9509898E1} diff --git a/sdk/src/Services/KinesisFirehose/Properties/AssemblyInfo.cs b/sdk/src/Services/KinesisFirehose/Properties/AssemblyInfo.cs index e2cebca98ba1..268595564597 100644 --- a/sdk/src/Services/KinesisFirehose/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/KinesisFirehose/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.6")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/KinesisVideo/Generated/AmazonKinesisVideoConfig.cs b/sdk/src/Services/KinesisVideo/Generated/AmazonKinesisVideoConfig.cs index 1e219348458c..40f0ab272c86 100644 --- a/sdk/src/Services/KinesisVideo/Generated/AmazonKinesisVideoConfig.cs +++ b/sdk/src/Services/KinesisVideo/Generated/AmazonKinesisVideoConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.KinesisVideo public partial class AmazonKinesisVideoConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("Kinesis Video", "4.0.0.0"); private static readonly AmazonKinesisVideoEndpointResolver EndpointResolver = new AmazonKinesisVideoEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("Kinesis Video", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("Kinesis Video", "3.7.400.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/KinesisVideo/KinesisVideo.sln b/sdk/src/Services/KinesisVideo/KinesisVideo.sln index 11573cac834b..328c98d45064 100644 --- a/sdk/src/Services/KinesisVideo/KinesisVideo.sln +++ b/sdk/src/Services/KinesisVideo/KinesisVideo.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {4FE2AADD-78FD-4D09-9B71-02421BE8EF29}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {4FE2AADD-78FD-4D09-9B71-02421BE8EF29}.Debug|Any CPU.Build.0 = Debug|Any CPU {4FE2AADD-78FD-4D09-9B71-02421BE8EF29}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {61187E3C-C432-40B9-B5A9-7896A93120E3}.Debug|Any CPU.Build.0 = Debug|Any CPU {61187E3C-C432-40B9-B5A9-7896A93120E3}.Release|Any CPU.ActiveCfg = Release|Any CPU {61187E3C-C432-40B9-B5A9-7896A93120E3}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {C354A09D-06A9-49E1-B900-2EA9726E258D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C354A09D-06A9-49E1-B900-2EA9726E258D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C354A09D-06A9-49E1-B900-2EA9726E258D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C354A09D-06A9-49E1-B900-2EA9726E258D}.Release|Any CPU.Build.0 = Release|Any CPU - {DAA066CD-0029-49B1-880A-BAA02A80E103}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DAA066CD-0029-49B1-880A-BAA02A80E103}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DAA066CD-0029-49B1-880A-BAA02A80E103}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DAA066CD-0029-49B1-880A-BAA02A80E103}.Release|Any CPU.Build.0 = Release|Any CPU - {49462F78-23FF-455C-8488-D616D7495376}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {49462F78-23FF-455C-8488-D616D7495376}.Debug|Any CPU.Build.0 = Debug|Any CPU - {49462F78-23FF-455C-8488-D616D7495376}.Release|Any CPU.ActiveCfg = Release|Any CPU - {49462F78-23FF-455C-8488-D616D7495376}.Release|Any CPU.Build.0 = Release|Any CPU - {A3BD3CE5-F1AB-4DD1-8D37-E69468FFA718}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A3BD3CE5-F1AB-4DD1-8D37-E69468FFA718}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A3BD3CE5-F1AB-4DD1-8D37-E69468FFA718}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A3BD3CE5-F1AB-4DD1-8D37-E69468FFA718}.Release|Any CPU.Build.0 = Release|Any CPU - {2DF8E63B-9225-4B47-BE37-9074E00212B7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2DF8E63B-9225-4B47-BE37-9074E00212B7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2DF8E63B-9225-4B47-BE37-9074E00212B7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2DF8E63B-9225-4B47-BE37-9074E00212B7}.Release|Any CPU.Build.0 = Release|Any CPU - {1053C034-CC67-433A-B46F-FB60D8DF4F33}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1053C034-CC67-433A-B46F-FB60D8DF4F33}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1053C034-CC67-433A-B46F-FB60D8DF4F33}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1053C034-CC67-433A-B46F-FB60D8DF4F33}.Release|Any CPU.Build.0 = Release|Any CPU - {07754360-4658-44AA-A564-156BCC844A51}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {07754360-4658-44AA-A564-156BCC844A51}.Debug|Any CPU.Build.0 = Debug|Any CPU - {07754360-4658-44AA-A564-156BCC844A51}.Release|Any CPU.ActiveCfg = Release|Any CPU - {07754360-4658-44AA-A564-156BCC844A51}.Release|Any CPU.Build.0 = Release|Any CPU - {C8FC2869-6FC0-48C9-AF65-94C7716D7677}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C8FC2869-6FC0-48C9-AF65-94C7716D7677}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C8FC2869-6FC0-48C9-AF65-94C7716D7677}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C8FC2869-6FC0-48C9-AF65-94C7716D7677}.Release|Any CPU.Build.0 = Release|Any CPU - {E421461E-ADDC-44FD-973C-D6A7ADBB884D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E421461E-ADDC-44FD-973C-D6A7ADBB884D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E421461E-ADDC-44FD-973C-D6A7ADBB884D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E421461E-ADDC-44FD-973C-D6A7ADBB884D}.Release|Any CPU.Build.0 = Release|Any CPU - {9722B3D2-4FCF-4E88-A78D-E34125367C57}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9722B3D2-4FCF-4E88-A78D-E34125367C57}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9722B3D2-4FCF-4E88-A78D-E34125367C57}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9722B3D2-4FCF-4E88-A78D-E34125367C57}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {C354A09D-06A9-49E1-B900-2EA9726E258D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C354A09D-06A9-49E1-B900-2EA9726E258D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C354A09D-06A9-49E1-B900-2EA9726E258D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C354A09D-06A9-49E1-B900-2EA9726E258D}.Release|Any CPU.Build.0 = Release|Any CPU - {DAA066CD-0029-49B1-880A-BAA02A80E103}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DAA066CD-0029-49B1-880A-BAA02A80E103}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DAA066CD-0029-49B1-880A-BAA02A80E103}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DAA066CD-0029-49B1-880A-BAA02A80E103}.Release|Any CPU.Build.0 = Release|Any CPU - {49462F78-23FF-455C-8488-D616D7495376}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {49462F78-23FF-455C-8488-D616D7495376}.Debug|Any CPU.Build.0 = Debug|Any CPU - {49462F78-23FF-455C-8488-D616D7495376}.Release|Any CPU.ActiveCfg = Release|Any CPU - {49462F78-23FF-455C-8488-D616D7495376}.Release|Any CPU.Build.0 = Release|Any CPU - {A3BD3CE5-F1AB-4DD1-8D37-E69468FFA718}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A3BD3CE5-F1AB-4DD1-8D37-E69468FFA718}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A3BD3CE5-F1AB-4DD1-8D37-E69468FFA718}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A3BD3CE5-F1AB-4DD1-8D37-E69468FFA718}.Release|Any CPU.Build.0 = Release|Any CPU - {2DF8E63B-9225-4B47-BE37-9074E00212B7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2DF8E63B-9225-4B47-BE37-9074E00212B7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2DF8E63B-9225-4B47-BE37-9074E00212B7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2DF8E63B-9225-4B47-BE37-9074E00212B7}.Release|Any CPU.Build.0 = Release|Any CPU - {1053C034-CC67-433A-B46F-FB60D8DF4F33}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1053C034-CC67-433A-B46F-FB60D8DF4F33}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1053C034-CC67-433A-B46F-FB60D8DF4F33}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1053C034-CC67-433A-B46F-FB60D8DF4F33}.Release|Any CPU.Build.0 = Release|Any CPU - {07754360-4658-44AA-A564-156BCC844A51}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {07754360-4658-44AA-A564-156BCC844A51}.Debug|Any CPU.Build.0 = Debug|Any CPU - {07754360-4658-44AA-A564-156BCC844A51}.Release|Any CPU.ActiveCfg = Release|Any CPU - {07754360-4658-44AA-A564-156BCC844A51}.Release|Any CPU.Build.0 = Release|Any CPU - {C8FC2869-6FC0-48C9-AF65-94C7716D7677}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C8FC2869-6FC0-48C9-AF65-94C7716D7677}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C8FC2869-6FC0-48C9-AF65-94C7716D7677}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C8FC2869-6FC0-48C9-AF65-94C7716D7677}.Release|Any CPU.Build.0 = Release|Any CPU - {E421461E-ADDC-44FD-973C-D6A7ADBB884D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E421461E-ADDC-44FD-973C-D6A7ADBB884D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E421461E-ADDC-44FD-973C-D6A7ADBB884D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E421461E-ADDC-44FD-973C-D6A7ADBB884D}.Release|Any CPU.Build.0 = Release|Any CPU - {9722B3D2-4FCF-4E88-A78D-E34125367C57}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9722B3D2-4FCF-4E88-A78D-E34125367C57}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9722B3D2-4FCF-4E88-A78D-E34125367C57}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9722B3D2-4FCF-4E88-A78D-E34125367C57}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {4FE2AADD-78FD-4D09-9B71-02421BE8EF29} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {D5AB3179-213F-4731-8621-2E79BE651750} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {378B0392-95FF-4AE1-99AD-2EB34B6C6AE4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {47D214AC-86C8-4278-A511-94A119562722} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {61187E3C-C432-40B9-B5A9-7896A93120E3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {C354A09D-06A9-49E1-B900-2EA9726E258D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {DAA066CD-0029-49B1-880A-BAA02A80E103} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {49462F78-23FF-455C-8488-D616D7495376} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A3BD3CE5-F1AB-4DD1-8D37-E69468FFA718} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {2DF8E63B-9225-4B47-BE37-9074E00212B7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {1053C034-CC67-433A-B46F-FB60D8DF4F33} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {07754360-4658-44AA-A564-156BCC844A51} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C8FC2869-6FC0-48C9-AF65-94C7716D7677} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E421461E-ADDC-44FD-973C-D6A7ADBB884D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {9722B3D2-4FCF-4E88-A78D-E34125367C57} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {C354A09D-06A9-49E1-B900-2EA9726E258D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {DAA066CD-0029-49B1-880A-BAA02A80E103} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {49462F78-23FF-455C-8488-D616D7495376} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A3BD3CE5-F1AB-4DD1-8D37-E69468FFA718} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {2DF8E63B-9225-4B47-BE37-9074E00212B7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {1053C034-CC67-433A-B46F-FB60D8DF4F33} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {07754360-4658-44AA-A564-156BCC844A51} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C8FC2869-6FC0-48C9-AF65-94C7716D7677} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E421461E-ADDC-44FD-973C-D6A7ADBB884D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {9722B3D2-4FCF-4E88-A78D-E34125367C57} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {5FDEDFBD-7C3E-4D90-BCE1-90C34233D206} diff --git a/sdk/src/Services/KinesisVideo/Properties/AssemblyInfo.cs b/sdk/src/Services/KinesisVideo/Properties/AssemblyInfo.cs index aa17fc10ff55..8773eccb4046 100644 --- a/sdk/src/Services/KinesisVideo/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/KinesisVideo/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/KinesisVideoArchivedMedia/Generated/AmazonKinesisVideoArchivedMediaConfig.cs b/sdk/src/Services/KinesisVideoArchivedMedia/Generated/AmazonKinesisVideoArchivedMediaConfig.cs index 08934fc24a81..d15686170bdd 100644 --- a/sdk/src/Services/KinesisVideoArchivedMedia/Generated/AmazonKinesisVideoArchivedMediaConfig.cs +++ b/sdk/src/Services/KinesisVideoArchivedMedia/Generated/AmazonKinesisVideoArchivedMediaConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.KinesisVideoArchivedMedia public partial class AmazonKinesisVideoArchivedMediaConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("Kinesis Video Archived Media", "4.0.0.0"); private static readonly AmazonKinesisVideoArchivedMediaEndpointResolver EndpointResolver = new AmazonKinesisVideoArchivedMediaEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("Kinesis Video Archived Media", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("Kinesis Video Archived Media", "3.7.400.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/KinesisVideoArchivedMedia/KinesisVideoArchivedMedia.sln b/sdk/src/Services/KinesisVideoArchivedMedia/KinesisVideoArchivedMedia.sln index 078fb4802568..9fb13d67ac53 100644 --- a/sdk/src/Services/KinesisVideoArchivedMedia/KinesisVideoArchivedMedia.sln +++ b/sdk/src/Services/KinesisVideoArchivedMedia/KinesisVideoArchivedMedia.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {61CCA761-4CBC-4923-B400-2FDC469F8F9D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {61CCA761-4CBC-4923-B400-2FDC469F8F9D}.Debug|Any CPU.Build.0 = Debug|Any CPU {61CCA761-4CBC-4923-B400-2FDC469F8F9D}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {1837EFF8-64F8-48FF-A6BF-5C85239537FB}.Debug|Any CPU.Build.0 = Debug|Any CPU {1837EFF8-64F8-48FF-A6BF-5C85239537FB}.Release|Any CPU.ActiveCfg = Release|Any CPU {1837EFF8-64F8-48FF-A6BF-5C85239537FB}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {51D34418-1D31-4A7D-A610-90BF1CB1321D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {51D34418-1D31-4A7D-A610-90BF1CB1321D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {51D34418-1D31-4A7D-A610-90BF1CB1321D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {51D34418-1D31-4A7D-A610-90BF1CB1321D}.Release|Any CPU.Build.0 = Release|Any CPU - {16DEF975-03C0-4794-B1ED-306088522974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {16DEF975-03C0-4794-B1ED-306088522974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {16DEF975-03C0-4794-B1ED-306088522974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {16DEF975-03C0-4794-B1ED-306088522974}.Release|Any CPU.Build.0 = Release|Any CPU - {7E4BEF66-47F5-40C8-9CCD-3E6895A4324F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7E4BEF66-47F5-40C8-9CCD-3E6895A4324F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7E4BEF66-47F5-40C8-9CCD-3E6895A4324F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7E4BEF66-47F5-40C8-9CCD-3E6895A4324F}.Release|Any CPU.Build.0 = Release|Any CPU - {14CC90E3-E037-4764-A9AC-F8992A56A286}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {14CC90E3-E037-4764-A9AC-F8992A56A286}.Debug|Any CPU.Build.0 = Debug|Any CPU - {14CC90E3-E037-4764-A9AC-F8992A56A286}.Release|Any CPU.ActiveCfg = Release|Any CPU - {14CC90E3-E037-4764-A9AC-F8992A56A286}.Release|Any CPU.Build.0 = Release|Any CPU - {4DF4C89C-79EE-42C9-A097-23C5F7B4C8A5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4DF4C89C-79EE-42C9-A097-23C5F7B4C8A5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4DF4C89C-79EE-42C9-A097-23C5F7B4C8A5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4DF4C89C-79EE-42C9-A097-23C5F7B4C8A5}.Release|Any CPU.Build.0 = Release|Any CPU - {27B66234-DF78-4B6D-847C-1A97CC47D80A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {27B66234-DF78-4B6D-847C-1A97CC47D80A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {27B66234-DF78-4B6D-847C-1A97CC47D80A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {27B66234-DF78-4B6D-847C-1A97CC47D80A}.Release|Any CPU.Build.0 = Release|Any CPU - {10822D41-5A80-47EC-B2C0-A4A0BD0C5D63}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {10822D41-5A80-47EC-B2C0-A4A0BD0C5D63}.Debug|Any CPU.Build.0 = Debug|Any CPU - {10822D41-5A80-47EC-B2C0-A4A0BD0C5D63}.Release|Any CPU.ActiveCfg = Release|Any CPU - {10822D41-5A80-47EC-B2C0-A4A0BD0C5D63}.Release|Any CPU.Build.0 = Release|Any CPU - {964B56C6-FE56-43C6-A28A-64EA95C59BFE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {964B56C6-FE56-43C6-A28A-64EA95C59BFE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {964B56C6-FE56-43C6-A28A-64EA95C59BFE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {964B56C6-FE56-43C6-A28A-64EA95C59BFE}.Release|Any CPU.Build.0 = Release|Any CPU - {666C0468-1CF5-40A2-B1D5-7B976F233AAC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {666C0468-1CF5-40A2-B1D5-7B976F233AAC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {666C0468-1CF5-40A2-B1D5-7B976F233AAC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {666C0468-1CF5-40A2-B1D5-7B976F233AAC}.Release|Any CPU.Build.0 = Release|Any CPU - {52A4AB20-DBBD-486E-A93C-4D84C7FF001C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {52A4AB20-DBBD-486E-A93C-4D84C7FF001C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {52A4AB20-DBBD-486E-A93C-4D84C7FF001C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {52A4AB20-DBBD-486E-A93C-4D84C7FF001C}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {51D34418-1D31-4A7D-A610-90BF1CB1321D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {51D34418-1D31-4A7D-A610-90BF1CB1321D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {51D34418-1D31-4A7D-A610-90BF1CB1321D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {51D34418-1D31-4A7D-A610-90BF1CB1321D}.Release|Any CPU.Build.0 = Release|Any CPU - {16DEF975-03C0-4794-B1ED-306088522974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {16DEF975-03C0-4794-B1ED-306088522974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {16DEF975-03C0-4794-B1ED-306088522974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {16DEF975-03C0-4794-B1ED-306088522974}.Release|Any CPU.Build.0 = Release|Any CPU - {7E4BEF66-47F5-40C8-9CCD-3E6895A4324F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7E4BEF66-47F5-40C8-9CCD-3E6895A4324F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7E4BEF66-47F5-40C8-9CCD-3E6895A4324F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7E4BEF66-47F5-40C8-9CCD-3E6895A4324F}.Release|Any CPU.Build.0 = Release|Any CPU - {14CC90E3-E037-4764-A9AC-F8992A56A286}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {14CC90E3-E037-4764-A9AC-F8992A56A286}.Debug|Any CPU.Build.0 = Debug|Any CPU - {14CC90E3-E037-4764-A9AC-F8992A56A286}.Release|Any CPU.ActiveCfg = Release|Any CPU - {14CC90E3-E037-4764-A9AC-F8992A56A286}.Release|Any CPU.Build.0 = Release|Any CPU - {4DF4C89C-79EE-42C9-A097-23C5F7B4C8A5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4DF4C89C-79EE-42C9-A097-23C5F7B4C8A5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4DF4C89C-79EE-42C9-A097-23C5F7B4C8A5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4DF4C89C-79EE-42C9-A097-23C5F7B4C8A5}.Release|Any CPU.Build.0 = Release|Any CPU - {27B66234-DF78-4B6D-847C-1A97CC47D80A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {27B66234-DF78-4B6D-847C-1A97CC47D80A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {27B66234-DF78-4B6D-847C-1A97CC47D80A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {27B66234-DF78-4B6D-847C-1A97CC47D80A}.Release|Any CPU.Build.0 = Release|Any CPU - {10822D41-5A80-47EC-B2C0-A4A0BD0C5D63}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {10822D41-5A80-47EC-B2C0-A4A0BD0C5D63}.Debug|Any CPU.Build.0 = Debug|Any CPU - {10822D41-5A80-47EC-B2C0-A4A0BD0C5D63}.Release|Any CPU.ActiveCfg = Release|Any CPU - {10822D41-5A80-47EC-B2C0-A4A0BD0C5D63}.Release|Any CPU.Build.0 = Release|Any CPU - {964B56C6-FE56-43C6-A28A-64EA95C59BFE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {964B56C6-FE56-43C6-A28A-64EA95C59BFE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {964B56C6-FE56-43C6-A28A-64EA95C59BFE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {964B56C6-FE56-43C6-A28A-64EA95C59BFE}.Release|Any CPU.Build.0 = Release|Any CPU - {666C0468-1CF5-40A2-B1D5-7B976F233AAC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {666C0468-1CF5-40A2-B1D5-7B976F233AAC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {666C0468-1CF5-40A2-B1D5-7B976F233AAC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {666C0468-1CF5-40A2-B1D5-7B976F233AAC}.Release|Any CPU.Build.0 = Release|Any CPU - {52A4AB20-DBBD-486E-A93C-4D84C7FF001C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {52A4AB20-DBBD-486E-A93C-4D84C7FF001C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {52A4AB20-DBBD-486E-A93C-4D84C7FF001C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {52A4AB20-DBBD-486E-A93C-4D84C7FF001C}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {61CCA761-4CBC-4923-B400-2FDC469F8F9D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {84A3D9F0-6230-40CC-8E06-0A750F4CE2B2} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {91F1A90A-F3DA-40DC-8003-DECEA2C2FD0A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {4CAA21D5-5CF3-4355-8868-F2A93961A5D8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {1837EFF8-64F8-48FF-A6BF-5C85239537FB} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {51D34418-1D31-4A7D-A610-90BF1CB1321D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {16DEF975-03C0-4794-B1ED-306088522974} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {7E4BEF66-47F5-40C8-9CCD-3E6895A4324F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {14CC90E3-E037-4764-A9AC-F8992A56A286} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4DF4C89C-79EE-42C9-A097-23C5F7B4C8A5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {27B66234-DF78-4B6D-847C-1A97CC47D80A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {10822D41-5A80-47EC-B2C0-A4A0BD0C5D63} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {964B56C6-FE56-43C6-A28A-64EA95C59BFE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {666C0468-1CF5-40A2-B1D5-7B976F233AAC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {52A4AB20-DBBD-486E-A93C-4D84C7FF001C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {51D34418-1D31-4A7D-A610-90BF1CB1321D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {16DEF975-03C0-4794-B1ED-306088522974} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {7E4BEF66-47F5-40C8-9CCD-3E6895A4324F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {14CC90E3-E037-4764-A9AC-F8992A56A286} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4DF4C89C-79EE-42C9-A097-23C5F7B4C8A5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {27B66234-DF78-4B6D-847C-1A97CC47D80A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {10822D41-5A80-47EC-B2C0-A4A0BD0C5D63} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {964B56C6-FE56-43C6-A28A-64EA95C59BFE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {666C0468-1CF5-40A2-B1D5-7B976F233AAC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {52A4AB20-DBBD-486E-A93C-4D84C7FF001C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {28DC4173-B098-4038-8848-F13B40F64401} diff --git a/sdk/src/Services/KinesisVideoArchivedMedia/Properties/AssemblyInfo.cs b/sdk/src/Services/KinesisVideoArchivedMedia/Properties/AssemblyInfo.cs index 538803b9c957..b879761de986 100644 --- a/sdk/src/Services/KinesisVideoArchivedMedia/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/KinesisVideoArchivedMedia/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/KinesisVideoMedia/Generated/AmazonKinesisVideoMediaConfig.cs b/sdk/src/Services/KinesisVideoMedia/Generated/AmazonKinesisVideoMediaConfig.cs index d67bcaed97a1..97d453ee7ec9 100644 --- a/sdk/src/Services/KinesisVideoMedia/Generated/AmazonKinesisVideoMediaConfig.cs +++ b/sdk/src/Services/KinesisVideoMedia/Generated/AmazonKinesisVideoMediaConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.KinesisVideoMedia public partial class AmazonKinesisVideoMediaConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("Kinesis Video Media", "4.0.0.0"); private static readonly AmazonKinesisVideoMediaEndpointResolver EndpointResolver = new AmazonKinesisVideoMediaEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("Kinesis Video Media", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("Kinesis Video Media", "3.7.400.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/KinesisVideoMedia/KinesisVideoMedia.sln b/sdk/src/Services/KinesisVideoMedia/KinesisVideoMedia.sln index 595352e382e8..f7308e8ffa5d 100644 --- a/sdk/src/Services/KinesisVideoMedia/KinesisVideoMedia.sln +++ b/sdk/src/Services/KinesisVideoMedia/KinesisVideoMedia.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {DF19DB6F-B261-4C94-8551-DF6B58EEA7BA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {DF19DB6F-B261-4C94-8551-DF6B58EEA7BA}.Debug|Any CPU.Build.0 = Debug|Any CPU {DF19DB6F-B261-4C94-8551-DF6B58EEA7BA}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {7BA6F650-9DCE-4D1C-AC90-80423173DED4}.Debug|Any CPU.Build.0 = Debug|Any CPU {7BA6F650-9DCE-4D1C-AC90-80423173DED4}.Release|Any CPU.ActiveCfg = Release|Any CPU {7BA6F650-9DCE-4D1C-AC90-80423173DED4}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {8A0AE4C0-0F7B-4BE8-A50F-07703DCCA4FB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8A0AE4C0-0F7B-4BE8-A50F-07703DCCA4FB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8A0AE4C0-0F7B-4BE8-A50F-07703DCCA4FB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8A0AE4C0-0F7B-4BE8-A50F-07703DCCA4FB}.Release|Any CPU.Build.0 = Release|Any CPU - {9C4A4882-F694-4AF0-9B87-C6226452275E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9C4A4882-F694-4AF0-9B87-C6226452275E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9C4A4882-F694-4AF0-9B87-C6226452275E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9C4A4882-F694-4AF0-9B87-C6226452275E}.Release|Any CPU.Build.0 = Release|Any CPU - {4A29C11A-25C9-4E1F-98EB-4B97616806CD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4A29C11A-25C9-4E1F-98EB-4B97616806CD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4A29C11A-25C9-4E1F-98EB-4B97616806CD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4A29C11A-25C9-4E1F-98EB-4B97616806CD}.Release|Any CPU.Build.0 = Release|Any CPU - {B66D57F1-AF7A-401B-B27A-B081D8D06FAA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B66D57F1-AF7A-401B-B27A-B081D8D06FAA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B66D57F1-AF7A-401B-B27A-B081D8D06FAA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B66D57F1-AF7A-401B-B27A-B081D8D06FAA}.Release|Any CPU.Build.0 = Release|Any CPU - {B6951BF2-592D-4EC2-978D-9D6C90BA5BED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B6951BF2-592D-4EC2-978D-9D6C90BA5BED}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B6951BF2-592D-4EC2-978D-9D6C90BA5BED}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B6951BF2-592D-4EC2-978D-9D6C90BA5BED}.Release|Any CPU.Build.0 = Release|Any CPU - {66AB8844-2522-4C08-B97F-C615A482FE0D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {66AB8844-2522-4C08-B97F-C615A482FE0D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {66AB8844-2522-4C08-B97F-C615A482FE0D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {66AB8844-2522-4C08-B97F-C615A482FE0D}.Release|Any CPU.Build.0 = Release|Any CPU - {25F9BB4D-AB81-41AC-94E3-B9ABC3E81B8B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {25F9BB4D-AB81-41AC-94E3-B9ABC3E81B8B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {25F9BB4D-AB81-41AC-94E3-B9ABC3E81B8B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {25F9BB4D-AB81-41AC-94E3-B9ABC3E81B8B}.Release|Any CPU.Build.0 = Release|Any CPU - {4379B2CB-8414-48F6-A2EC-7A8F9C2C3008}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4379B2CB-8414-48F6-A2EC-7A8F9C2C3008}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4379B2CB-8414-48F6-A2EC-7A8F9C2C3008}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4379B2CB-8414-48F6-A2EC-7A8F9C2C3008}.Release|Any CPU.Build.0 = Release|Any CPU - {E64E100D-19C4-43BD-B598-6107B8A6901D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E64E100D-19C4-43BD-B598-6107B8A6901D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E64E100D-19C4-43BD-B598-6107B8A6901D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E64E100D-19C4-43BD-B598-6107B8A6901D}.Release|Any CPU.Build.0 = Release|Any CPU - {9C53AD9E-03F1-43ED-A08E-538014A8759F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9C53AD9E-03F1-43ED-A08E-538014A8759F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9C53AD9E-03F1-43ED-A08E-538014A8759F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9C53AD9E-03F1-43ED-A08E-538014A8759F}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {8A0AE4C0-0F7B-4BE8-A50F-07703DCCA4FB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8A0AE4C0-0F7B-4BE8-A50F-07703DCCA4FB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8A0AE4C0-0F7B-4BE8-A50F-07703DCCA4FB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8A0AE4C0-0F7B-4BE8-A50F-07703DCCA4FB}.Release|Any CPU.Build.0 = Release|Any CPU - {9C4A4882-F694-4AF0-9B87-C6226452275E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9C4A4882-F694-4AF0-9B87-C6226452275E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9C4A4882-F694-4AF0-9B87-C6226452275E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9C4A4882-F694-4AF0-9B87-C6226452275E}.Release|Any CPU.Build.0 = Release|Any CPU - {4A29C11A-25C9-4E1F-98EB-4B97616806CD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4A29C11A-25C9-4E1F-98EB-4B97616806CD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4A29C11A-25C9-4E1F-98EB-4B97616806CD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4A29C11A-25C9-4E1F-98EB-4B97616806CD}.Release|Any CPU.Build.0 = Release|Any CPU - {B66D57F1-AF7A-401B-B27A-B081D8D06FAA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B66D57F1-AF7A-401B-B27A-B081D8D06FAA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B66D57F1-AF7A-401B-B27A-B081D8D06FAA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B66D57F1-AF7A-401B-B27A-B081D8D06FAA}.Release|Any CPU.Build.0 = Release|Any CPU - {B6951BF2-592D-4EC2-978D-9D6C90BA5BED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B6951BF2-592D-4EC2-978D-9D6C90BA5BED}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B6951BF2-592D-4EC2-978D-9D6C90BA5BED}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B6951BF2-592D-4EC2-978D-9D6C90BA5BED}.Release|Any CPU.Build.0 = Release|Any CPU - {66AB8844-2522-4C08-B97F-C615A482FE0D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {66AB8844-2522-4C08-B97F-C615A482FE0D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {66AB8844-2522-4C08-B97F-C615A482FE0D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {66AB8844-2522-4C08-B97F-C615A482FE0D}.Release|Any CPU.Build.0 = Release|Any CPU - {25F9BB4D-AB81-41AC-94E3-B9ABC3E81B8B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {25F9BB4D-AB81-41AC-94E3-B9ABC3E81B8B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {25F9BB4D-AB81-41AC-94E3-B9ABC3E81B8B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {25F9BB4D-AB81-41AC-94E3-B9ABC3E81B8B}.Release|Any CPU.Build.0 = Release|Any CPU - {4379B2CB-8414-48F6-A2EC-7A8F9C2C3008}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4379B2CB-8414-48F6-A2EC-7A8F9C2C3008}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4379B2CB-8414-48F6-A2EC-7A8F9C2C3008}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4379B2CB-8414-48F6-A2EC-7A8F9C2C3008}.Release|Any CPU.Build.0 = Release|Any CPU - {E64E100D-19C4-43BD-B598-6107B8A6901D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E64E100D-19C4-43BD-B598-6107B8A6901D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E64E100D-19C4-43BD-B598-6107B8A6901D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E64E100D-19C4-43BD-B598-6107B8A6901D}.Release|Any CPU.Build.0 = Release|Any CPU - {9C53AD9E-03F1-43ED-A08E-538014A8759F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9C53AD9E-03F1-43ED-A08E-538014A8759F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9C53AD9E-03F1-43ED-A08E-538014A8759F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9C53AD9E-03F1-43ED-A08E-538014A8759F}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {DF19DB6F-B261-4C94-8551-DF6B58EEA7BA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {5AB486D5-9D93-41C5-855B-18660F4F1C79} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {6F58782F-688A-4AD1-8E3F-0B60814F8D6A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {C2CE098C-4185-4B5C-8886-FF735B599C99} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {7BA6F650-9DCE-4D1C-AC90-80423173DED4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {8A0AE4C0-0F7B-4BE8-A50F-07703DCCA4FB} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {9C4A4882-F694-4AF0-9B87-C6226452275E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4A29C11A-25C9-4E1F-98EB-4B97616806CD} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B66D57F1-AF7A-401B-B27A-B081D8D06FAA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B6951BF2-592D-4EC2-978D-9D6C90BA5BED} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {66AB8844-2522-4C08-B97F-C615A482FE0D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {25F9BB4D-AB81-41AC-94E3-B9ABC3E81B8B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4379B2CB-8414-48F6-A2EC-7A8F9C2C3008} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E64E100D-19C4-43BD-B598-6107B8A6901D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {9C53AD9E-03F1-43ED-A08E-538014A8759F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {8A0AE4C0-0F7B-4BE8-A50F-07703DCCA4FB} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {9C4A4882-F694-4AF0-9B87-C6226452275E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4A29C11A-25C9-4E1F-98EB-4B97616806CD} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B66D57F1-AF7A-401B-B27A-B081D8D06FAA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B6951BF2-592D-4EC2-978D-9D6C90BA5BED} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {66AB8844-2522-4C08-B97F-C615A482FE0D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {25F9BB4D-AB81-41AC-94E3-B9ABC3E81B8B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4379B2CB-8414-48F6-A2EC-7A8F9C2C3008} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E64E100D-19C4-43BD-B598-6107B8A6901D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {9C53AD9E-03F1-43ED-A08E-538014A8759F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {44105802-2ABC-4957-BAC7-DE37A70A91AA} diff --git a/sdk/src/Services/KinesisVideoMedia/Properties/AssemblyInfo.cs b/sdk/src/Services/KinesisVideoMedia/Properties/AssemblyInfo.cs index a874812c7d88..baac5c9fd5e3 100644 --- a/sdk/src/Services/KinesisVideoMedia/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/KinesisVideoMedia/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/KinesisVideoSignalingChannels/Generated/AmazonKinesisVideoSignalingChannelsConfig.cs b/sdk/src/Services/KinesisVideoSignalingChannels/Generated/AmazonKinesisVideoSignalingChannelsConfig.cs index 86c8a73fdc19..45bd7683763b 100644 --- a/sdk/src/Services/KinesisVideoSignalingChannels/Generated/AmazonKinesisVideoSignalingChannelsConfig.cs +++ b/sdk/src/Services/KinesisVideoSignalingChannels/Generated/AmazonKinesisVideoSignalingChannelsConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.KinesisVideoSignalingChannels public partial class AmazonKinesisVideoSignalingChannelsConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("Kinesis Video Signaling", "4.0.0.0"); private static readonly AmazonKinesisVideoSignalingChannelsEndpointResolver EndpointResolver = new AmazonKinesisVideoSignalingChannelsEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("Kinesis Video Signaling", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("Kinesis Video Signaling", "3.7.400.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/KinesisVideoSignalingChannels/KinesisVideoSignalingChannels.sln b/sdk/src/Services/KinesisVideoSignalingChannels/KinesisVideoSignalingChannels.sln index 83b1bb86406b..ebb9dac5880a 100644 --- a/sdk/src/Services/KinesisVideoSignalingChannels/KinesisVideoSignalingChannels.sln +++ b/sdk/src/Services/KinesisVideoSignalingChannels/KinesisVideoSignalingChannels.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {98AA5B2F-4738-4049-944F-B33B795C143C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {98AA5B2F-4738-4049-944F-B33B795C143C}.Debug|Any CPU.Build.0 = Debug|Any CPU {98AA5B2F-4738-4049-944F-B33B795C143C}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {B4709DAB-F385-4B57-98EB-35819050039A}.Debug|Any CPU.Build.0 = Debug|Any CPU {B4709DAB-F385-4B57-98EB-35819050039A}.Release|Any CPU.ActiveCfg = Release|Any CPU {B4709DAB-F385-4B57-98EB-35819050039A}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {FF8750C8-D92D-4DD6-908D-4078F9E6DCE2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FF8750C8-D92D-4DD6-908D-4078F9E6DCE2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FF8750C8-D92D-4DD6-908D-4078F9E6DCE2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FF8750C8-D92D-4DD6-908D-4078F9E6DCE2}.Release|Any CPU.Build.0 = Release|Any CPU - {161E4D02-FB94-45EC-AF81-C686DA3FBC33}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {161E4D02-FB94-45EC-AF81-C686DA3FBC33}.Debug|Any CPU.Build.0 = Debug|Any CPU - {161E4D02-FB94-45EC-AF81-C686DA3FBC33}.Release|Any CPU.ActiveCfg = Release|Any CPU - {161E4D02-FB94-45EC-AF81-C686DA3FBC33}.Release|Any CPU.Build.0 = Release|Any CPU - {894AA60C-7153-46CD-9BD0-7C5CF0341CBB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {894AA60C-7153-46CD-9BD0-7C5CF0341CBB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {894AA60C-7153-46CD-9BD0-7C5CF0341CBB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {894AA60C-7153-46CD-9BD0-7C5CF0341CBB}.Release|Any CPU.Build.0 = Release|Any CPU - {769D97A1-2F66-40A1-8C08-0262870E8579}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {769D97A1-2F66-40A1-8C08-0262870E8579}.Debug|Any CPU.Build.0 = Debug|Any CPU - {769D97A1-2F66-40A1-8C08-0262870E8579}.Release|Any CPU.ActiveCfg = Release|Any CPU - {769D97A1-2F66-40A1-8C08-0262870E8579}.Release|Any CPU.Build.0 = Release|Any CPU - {C19600A4-0641-4718-91B0-7A8AF5AEA20A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C19600A4-0641-4718-91B0-7A8AF5AEA20A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C19600A4-0641-4718-91B0-7A8AF5AEA20A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C19600A4-0641-4718-91B0-7A8AF5AEA20A}.Release|Any CPU.Build.0 = Release|Any CPU - {E00CE69F-6B93-42A5-8BCF-F2D73EB93E5C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E00CE69F-6B93-42A5-8BCF-F2D73EB93E5C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E00CE69F-6B93-42A5-8BCF-F2D73EB93E5C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E00CE69F-6B93-42A5-8BCF-F2D73EB93E5C}.Release|Any CPU.Build.0 = Release|Any CPU - {3D945D5D-ACD1-494E-8F4E-4F8A0B3897E3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3D945D5D-ACD1-494E-8F4E-4F8A0B3897E3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3D945D5D-ACD1-494E-8F4E-4F8A0B3897E3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3D945D5D-ACD1-494E-8F4E-4F8A0B3897E3}.Release|Any CPU.Build.0 = Release|Any CPU - {F96AABF4-A9AE-4963-8228-75FFF7DD331E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F96AABF4-A9AE-4963-8228-75FFF7DD331E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F96AABF4-A9AE-4963-8228-75FFF7DD331E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F96AABF4-A9AE-4963-8228-75FFF7DD331E}.Release|Any CPU.Build.0 = Release|Any CPU - {16E9EE40-467B-4C16-B71B-3766210F2368}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {16E9EE40-467B-4C16-B71B-3766210F2368}.Debug|Any CPU.Build.0 = Debug|Any CPU - {16E9EE40-467B-4C16-B71B-3766210F2368}.Release|Any CPU.ActiveCfg = Release|Any CPU - {16E9EE40-467B-4C16-B71B-3766210F2368}.Release|Any CPU.Build.0 = Release|Any CPU - {9A065842-7429-4E1F-913E-408C8400FDBB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9A065842-7429-4E1F-913E-408C8400FDBB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9A065842-7429-4E1F-913E-408C8400FDBB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9A065842-7429-4E1F-913E-408C8400FDBB}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {FF8750C8-D92D-4DD6-908D-4078F9E6DCE2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FF8750C8-D92D-4DD6-908D-4078F9E6DCE2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FF8750C8-D92D-4DD6-908D-4078F9E6DCE2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FF8750C8-D92D-4DD6-908D-4078F9E6DCE2}.Release|Any CPU.Build.0 = Release|Any CPU - {161E4D02-FB94-45EC-AF81-C686DA3FBC33}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {161E4D02-FB94-45EC-AF81-C686DA3FBC33}.Debug|Any CPU.Build.0 = Debug|Any CPU - {161E4D02-FB94-45EC-AF81-C686DA3FBC33}.Release|Any CPU.ActiveCfg = Release|Any CPU - {161E4D02-FB94-45EC-AF81-C686DA3FBC33}.Release|Any CPU.Build.0 = Release|Any CPU - {894AA60C-7153-46CD-9BD0-7C5CF0341CBB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {894AA60C-7153-46CD-9BD0-7C5CF0341CBB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {894AA60C-7153-46CD-9BD0-7C5CF0341CBB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {894AA60C-7153-46CD-9BD0-7C5CF0341CBB}.Release|Any CPU.Build.0 = Release|Any CPU - {769D97A1-2F66-40A1-8C08-0262870E8579}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {769D97A1-2F66-40A1-8C08-0262870E8579}.Debug|Any CPU.Build.0 = Debug|Any CPU - {769D97A1-2F66-40A1-8C08-0262870E8579}.Release|Any CPU.ActiveCfg = Release|Any CPU - {769D97A1-2F66-40A1-8C08-0262870E8579}.Release|Any CPU.Build.0 = Release|Any CPU - {C19600A4-0641-4718-91B0-7A8AF5AEA20A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C19600A4-0641-4718-91B0-7A8AF5AEA20A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C19600A4-0641-4718-91B0-7A8AF5AEA20A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C19600A4-0641-4718-91B0-7A8AF5AEA20A}.Release|Any CPU.Build.0 = Release|Any CPU - {E00CE69F-6B93-42A5-8BCF-F2D73EB93E5C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E00CE69F-6B93-42A5-8BCF-F2D73EB93E5C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E00CE69F-6B93-42A5-8BCF-F2D73EB93E5C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E00CE69F-6B93-42A5-8BCF-F2D73EB93E5C}.Release|Any CPU.Build.0 = Release|Any CPU - {3D945D5D-ACD1-494E-8F4E-4F8A0B3897E3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3D945D5D-ACD1-494E-8F4E-4F8A0B3897E3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3D945D5D-ACD1-494E-8F4E-4F8A0B3897E3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3D945D5D-ACD1-494E-8F4E-4F8A0B3897E3}.Release|Any CPU.Build.0 = Release|Any CPU - {F96AABF4-A9AE-4963-8228-75FFF7DD331E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F96AABF4-A9AE-4963-8228-75FFF7DD331E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F96AABF4-A9AE-4963-8228-75FFF7DD331E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F96AABF4-A9AE-4963-8228-75FFF7DD331E}.Release|Any CPU.Build.0 = Release|Any CPU - {16E9EE40-467B-4C16-B71B-3766210F2368}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {16E9EE40-467B-4C16-B71B-3766210F2368}.Debug|Any CPU.Build.0 = Debug|Any CPU - {16E9EE40-467B-4C16-B71B-3766210F2368}.Release|Any CPU.ActiveCfg = Release|Any CPU - {16E9EE40-467B-4C16-B71B-3766210F2368}.Release|Any CPU.Build.0 = Release|Any CPU - {9A065842-7429-4E1F-913E-408C8400FDBB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9A065842-7429-4E1F-913E-408C8400FDBB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9A065842-7429-4E1F-913E-408C8400FDBB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9A065842-7429-4E1F-913E-408C8400FDBB}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {98AA5B2F-4738-4049-944F-B33B795C143C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {F830AEE2-27F3-4A13-B92A-9C30EB4C724E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {6DF5F47E-C476-4F6D-B5BD-BC1F3A08FA46} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {B03E1923-E877-4F4A-8CA2-10C11E2479E2} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {B4709DAB-F385-4B57-98EB-35819050039A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {FF8750C8-D92D-4DD6-908D-4078F9E6DCE2} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {161E4D02-FB94-45EC-AF81-C686DA3FBC33} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {894AA60C-7153-46CD-9BD0-7C5CF0341CBB} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {769D97A1-2F66-40A1-8C08-0262870E8579} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C19600A4-0641-4718-91B0-7A8AF5AEA20A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E00CE69F-6B93-42A5-8BCF-F2D73EB93E5C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {3D945D5D-ACD1-494E-8F4E-4F8A0B3897E3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F96AABF4-A9AE-4963-8228-75FFF7DD331E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {16E9EE40-467B-4C16-B71B-3766210F2368} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {9A065842-7429-4E1F-913E-408C8400FDBB} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {FF8750C8-D92D-4DD6-908D-4078F9E6DCE2} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {161E4D02-FB94-45EC-AF81-C686DA3FBC33} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {894AA60C-7153-46CD-9BD0-7C5CF0341CBB} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {769D97A1-2F66-40A1-8C08-0262870E8579} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C19600A4-0641-4718-91B0-7A8AF5AEA20A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E00CE69F-6B93-42A5-8BCF-F2D73EB93E5C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {3D945D5D-ACD1-494E-8F4E-4F8A0B3897E3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F96AABF4-A9AE-4963-8228-75FFF7DD331E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {16E9EE40-467B-4C16-B71B-3766210F2368} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {9A065842-7429-4E1F-913E-408C8400FDBB} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {34BC2B81-97F7-4918-8754-C6D748779BAE} diff --git a/sdk/src/Services/KinesisVideoSignalingChannels/Properties/AssemblyInfo.cs b/sdk/src/Services/KinesisVideoSignalingChannels/Properties/AssemblyInfo.cs index d0f38302e28a..d3c615c65290 100644 --- a/sdk/src/Services/KinesisVideoSignalingChannels/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/KinesisVideoSignalingChannels/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/KinesisVideoWebRTCStorage/Generated/AmazonKinesisVideoWebRTCStorageConfig.cs b/sdk/src/Services/KinesisVideoWebRTCStorage/Generated/AmazonKinesisVideoWebRTCStorageConfig.cs index 02b98967f505..3f995ec32863 100644 --- a/sdk/src/Services/KinesisVideoWebRTCStorage/Generated/AmazonKinesisVideoWebRTCStorageConfig.cs +++ b/sdk/src/Services/KinesisVideoWebRTCStorage/Generated/AmazonKinesisVideoWebRTCStorageConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.KinesisVideoWebRTCStorage public partial class AmazonKinesisVideoWebRTCStorageConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("Kinesis Video WebRTC Storage", "4.0.0.0"); private static readonly AmazonKinesisVideoWebRTCStorageEndpointResolver EndpointResolver = new AmazonKinesisVideoWebRTCStorageEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("Kinesis Video WebRTC Storage", "3.7.401.23"); -======= - InternalSDKUtils.BuildUserAgentString("Kinesis Video WebRTC Storage", "3.7.401.50"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/KinesisVideoWebRTCStorage/KinesisVideoWebRTCStorage.sln b/sdk/src/Services/KinesisVideoWebRTCStorage/KinesisVideoWebRTCStorage.sln index 0f8297322d23..f5d8d38aa4a7 100644 --- a/sdk/src/Services/KinesisVideoWebRTCStorage/KinesisVideoWebRTCStorage.sln +++ b/sdk/src/Services/KinesisVideoWebRTCStorage/KinesisVideoWebRTCStorage.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {3758EEFB-25F2-4D81-859B-50CB9322976A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {3758EEFB-25F2-4D81-859B-50CB9322976A}.Debug|Any CPU.Build.0 = Debug|Any CPU {3758EEFB-25F2-4D81-859B-50CB9322976A}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {D911C285-ACDF-4133-98FE-51F030DBDE54}.Debug|Any CPU.Build.0 = Debug|Any CPU {D911C285-ACDF-4133-98FE-51F030DBDE54}.Release|Any CPU.ActiveCfg = Release|Any CPU {D911C285-ACDF-4133-98FE-51F030DBDE54}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {65D03D5E-2EBA-4F1B-BFB1-85FC67AAC4E4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {65D03D5E-2EBA-4F1B-BFB1-85FC67AAC4E4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {65D03D5E-2EBA-4F1B-BFB1-85FC67AAC4E4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {65D03D5E-2EBA-4F1B-BFB1-85FC67AAC4E4}.Release|Any CPU.Build.0 = Release|Any CPU - {4E054756-5313-47F3-8AD0-B5D2B9307416}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4E054756-5313-47F3-8AD0-B5D2B9307416}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4E054756-5313-47F3-8AD0-B5D2B9307416}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4E054756-5313-47F3-8AD0-B5D2B9307416}.Release|Any CPU.Build.0 = Release|Any CPU - {EEB13E8E-68BB-4E47-B1BC-637416A06280}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EEB13E8E-68BB-4E47-B1BC-637416A06280}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EEB13E8E-68BB-4E47-B1BC-637416A06280}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EEB13E8E-68BB-4E47-B1BC-637416A06280}.Release|Any CPU.Build.0 = Release|Any CPU - {BEF1AAF1-93AC-4425-8E93-0C71D3FCC426}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BEF1AAF1-93AC-4425-8E93-0C71D3FCC426}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BEF1AAF1-93AC-4425-8E93-0C71D3FCC426}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BEF1AAF1-93AC-4425-8E93-0C71D3FCC426}.Release|Any CPU.Build.0 = Release|Any CPU - {41CC3C6D-B71C-4A53-8ECF-844838807C49}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {41CC3C6D-B71C-4A53-8ECF-844838807C49}.Debug|Any CPU.Build.0 = Debug|Any CPU - {41CC3C6D-B71C-4A53-8ECF-844838807C49}.Release|Any CPU.ActiveCfg = Release|Any CPU - {41CC3C6D-B71C-4A53-8ECF-844838807C49}.Release|Any CPU.Build.0 = Release|Any CPU - {20720398-C2F3-47EE-B97F-E2BF11D5E9A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {20720398-C2F3-47EE-B97F-E2BF11D5E9A2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {20720398-C2F3-47EE-B97F-E2BF11D5E9A2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {20720398-C2F3-47EE-B97F-E2BF11D5E9A2}.Release|Any CPU.Build.0 = Release|Any CPU - {957FFC02-6B1C-44F2-8E59-E59AF31D9092}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {957FFC02-6B1C-44F2-8E59-E59AF31D9092}.Debug|Any CPU.Build.0 = Debug|Any CPU - {957FFC02-6B1C-44F2-8E59-E59AF31D9092}.Release|Any CPU.ActiveCfg = Release|Any CPU - {957FFC02-6B1C-44F2-8E59-E59AF31D9092}.Release|Any CPU.Build.0 = Release|Any CPU - {94A0C9DA-3D62-47A5-9DDC-B9E3652D6563}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {94A0C9DA-3D62-47A5-9DDC-B9E3652D6563}.Debug|Any CPU.Build.0 = Debug|Any CPU - {94A0C9DA-3D62-47A5-9DDC-B9E3652D6563}.Release|Any CPU.ActiveCfg = Release|Any CPU - {94A0C9DA-3D62-47A5-9DDC-B9E3652D6563}.Release|Any CPU.Build.0 = Release|Any CPU - {FF731EF4-B4E5-4026-B3C2-058B7538A33F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FF731EF4-B4E5-4026-B3C2-058B7538A33F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FF731EF4-B4E5-4026-B3C2-058B7538A33F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FF731EF4-B4E5-4026-B3C2-058B7538A33F}.Release|Any CPU.Build.0 = Release|Any CPU - {CB615987-319C-4789-BB3C-F5FA3B0C99AC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CB615987-319C-4789-BB3C-F5FA3B0C99AC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CB615987-319C-4789-BB3C-F5FA3B0C99AC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CB615987-319C-4789-BB3C-F5FA3B0C99AC}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {65D03D5E-2EBA-4F1B-BFB1-85FC67AAC4E4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {65D03D5E-2EBA-4F1B-BFB1-85FC67AAC4E4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {65D03D5E-2EBA-4F1B-BFB1-85FC67AAC4E4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {65D03D5E-2EBA-4F1B-BFB1-85FC67AAC4E4}.Release|Any CPU.Build.0 = Release|Any CPU - {4E054756-5313-47F3-8AD0-B5D2B9307416}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4E054756-5313-47F3-8AD0-B5D2B9307416}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4E054756-5313-47F3-8AD0-B5D2B9307416}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4E054756-5313-47F3-8AD0-B5D2B9307416}.Release|Any CPU.Build.0 = Release|Any CPU - {EEB13E8E-68BB-4E47-B1BC-637416A06280}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EEB13E8E-68BB-4E47-B1BC-637416A06280}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EEB13E8E-68BB-4E47-B1BC-637416A06280}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EEB13E8E-68BB-4E47-B1BC-637416A06280}.Release|Any CPU.Build.0 = Release|Any CPU - {BEF1AAF1-93AC-4425-8E93-0C71D3FCC426}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BEF1AAF1-93AC-4425-8E93-0C71D3FCC426}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BEF1AAF1-93AC-4425-8E93-0C71D3FCC426}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BEF1AAF1-93AC-4425-8E93-0C71D3FCC426}.Release|Any CPU.Build.0 = Release|Any CPU - {41CC3C6D-B71C-4A53-8ECF-844838807C49}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {41CC3C6D-B71C-4A53-8ECF-844838807C49}.Debug|Any CPU.Build.0 = Debug|Any CPU - {41CC3C6D-B71C-4A53-8ECF-844838807C49}.Release|Any CPU.ActiveCfg = Release|Any CPU - {41CC3C6D-B71C-4A53-8ECF-844838807C49}.Release|Any CPU.Build.0 = Release|Any CPU - {20720398-C2F3-47EE-B97F-E2BF11D5E9A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {20720398-C2F3-47EE-B97F-E2BF11D5E9A2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {20720398-C2F3-47EE-B97F-E2BF11D5E9A2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {20720398-C2F3-47EE-B97F-E2BF11D5E9A2}.Release|Any CPU.Build.0 = Release|Any CPU - {957FFC02-6B1C-44F2-8E59-E59AF31D9092}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {957FFC02-6B1C-44F2-8E59-E59AF31D9092}.Debug|Any CPU.Build.0 = Debug|Any CPU - {957FFC02-6B1C-44F2-8E59-E59AF31D9092}.Release|Any CPU.ActiveCfg = Release|Any CPU - {957FFC02-6B1C-44F2-8E59-E59AF31D9092}.Release|Any CPU.Build.0 = Release|Any CPU - {94A0C9DA-3D62-47A5-9DDC-B9E3652D6563}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {94A0C9DA-3D62-47A5-9DDC-B9E3652D6563}.Debug|Any CPU.Build.0 = Debug|Any CPU - {94A0C9DA-3D62-47A5-9DDC-B9E3652D6563}.Release|Any CPU.ActiveCfg = Release|Any CPU - {94A0C9DA-3D62-47A5-9DDC-B9E3652D6563}.Release|Any CPU.Build.0 = Release|Any CPU - {FF731EF4-B4E5-4026-B3C2-058B7538A33F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FF731EF4-B4E5-4026-B3C2-058B7538A33F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FF731EF4-B4E5-4026-B3C2-058B7538A33F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FF731EF4-B4E5-4026-B3C2-058B7538A33F}.Release|Any CPU.Build.0 = Release|Any CPU - {CB615987-319C-4789-BB3C-F5FA3B0C99AC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CB615987-319C-4789-BB3C-F5FA3B0C99AC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CB615987-319C-4789-BB3C-F5FA3B0C99AC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CB615987-319C-4789-BB3C-F5FA3B0C99AC}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {3758EEFB-25F2-4D81-859B-50CB9322976A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {A4A2BA33-4568-442E-90AC-299902B1268E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {30E44E28-DC11-4064-B2A9-DFE2AA9DB7BE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {56A6ACB7-5B59-4ABA-8FF3-D3A6DBC68128} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {D911C285-ACDF-4133-98FE-51F030DBDE54} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {65D03D5E-2EBA-4F1B-BFB1-85FC67AAC4E4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4E054756-5313-47F3-8AD0-B5D2B9307416} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {EEB13E8E-68BB-4E47-B1BC-637416A06280} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {BEF1AAF1-93AC-4425-8E93-0C71D3FCC426} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {41CC3C6D-B71C-4A53-8ECF-844838807C49} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {20720398-C2F3-47EE-B97F-E2BF11D5E9A2} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {957FFC02-6B1C-44F2-8E59-E59AF31D9092} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {94A0C9DA-3D62-47A5-9DDC-B9E3652D6563} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {FF731EF4-B4E5-4026-B3C2-058B7538A33F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {CB615987-319C-4789-BB3C-F5FA3B0C99AC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {65D03D5E-2EBA-4F1B-BFB1-85FC67AAC4E4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4E054756-5313-47F3-8AD0-B5D2B9307416} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {EEB13E8E-68BB-4E47-B1BC-637416A06280} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {BEF1AAF1-93AC-4425-8E93-0C71D3FCC426} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {41CC3C6D-B71C-4A53-8ECF-844838807C49} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {20720398-C2F3-47EE-B97F-E2BF11D5E9A2} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {957FFC02-6B1C-44F2-8E59-E59AF31D9092} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {94A0C9DA-3D62-47A5-9DDC-B9E3652D6563} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {FF731EF4-B4E5-4026-B3C2-058B7538A33F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {CB615987-319C-4789-BB3C-F5FA3B0C99AC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {2F107C3C-58E2-406F-8659-423CA78DC6D5} diff --git a/sdk/src/Services/KinesisVideoWebRTCStorage/Properties/AssemblyInfo.cs b/sdk/src/Services/KinesisVideoWebRTCStorage/Properties/AssemblyInfo.cs index 14769aff5095..48475fe64bab 100644 --- a/sdk/src/Services/KinesisVideoWebRTCStorage/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/KinesisVideoWebRTCStorage/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.23")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.50")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/LakeFormation/Generated/AmazonLakeFormationConfig.cs b/sdk/src/Services/LakeFormation/Generated/AmazonLakeFormationConfig.cs index 92d60d1dfb91..9ccc396dde30 100644 --- a/sdk/src/Services/LakeFormation/Generated/AmazonLakeFormationConfig.cs +++ b/sdk/src/Services/LakeFormation/Generated/AmazonLakeFormationConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.LakeFormation public partial class AmazonLakeFormationConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("LakeFormation", "4.0.0.0"); private static readonly AmazonLakeFormationEndpointResolver EndpointResolver = new AmazonLakeFormationEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("LakeFormation", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("LakeFormation", "3.7.401.8"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/LakeFormation/Generated/Model/Internal/MarshallTransformations/CreateLFTagExpressionRequestMarshaller.cs b/sdk/src/Services/LakeFormation/Generated/Model/Internal/MarshallTransformations/CreateLFTagExpressionRequestMarshaller.cs index 546e7cb83bb6..a5c535d44ac1 100644 --- a/sdk/src/Services/LakeFormation/Generated/Model/Internal/MarshallTransformations/CreateLFTagExpressionRequestMarshaller.cs +++ b/sdk/src/Services/LakeFormation/Generated/Model/Internal/MarshallTransformations/CreateLFTagExpressionRequestMarshaller.cs @@ -61,49 +61,52 @@ public IRequest Marshall(CreateLFTagExpressionRequest publicRequest) request.HttpMethod = "POST"; request.ResourcePath = "/CreateLFTagExpression"; - using (StringWriter stringWriter = new StringWriter(CultureInfo.InvariantCulture)) + using (MemoryStream memoryStream = new MemoryStream()) { - JsonWriter writer = new JsonWriter(stringWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetCatalogId()) + using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) { - context.Writer.WritePropertyName("CatalogId"); - context.Writer.Write(publicRequest.CatalogId); - } - - if(publicRequest.IsSetDescription()) - { - context.Writer.WritePropertyName("Description"); - context.Writer.Write(publicRequest.Description); - } + JsonWriter writer = new JsonWriter(streamWriter); + writer.Validate = false; + writer.WriteObjectStart(); + var context = new JsonMarshallerContext(request, writer); + if(publicRequest.IsSetCatalogId()) + { + context.Writer.WritePropertyName("CatalogId"); + context.Writer.Write(publicRequest.CatalogId); + } - if(publicRequest.IsSetExpression()) - { - context.Writer.WritePropertyName("Expression"); - context.Writer.WriteArrayStart(); - foreach(var publicRequestExpressionListValue in publicRequest.Expression) + if(publicRequest.IsSetDescription()) { - context.Writer.WriteObjectStart(); + context.Writer.WritePropertyName("Description"); + context.Writer.Write(publicRequest.Description); + } - var marshaller = LFTagMarshaller.Instance; - marshaller.Marshall(publicRequestExpressionListValue, context); + if(publicRequest.IsSetExpression()) + { + context.Writer.WritePropertyName("Expression"); + context.Writer.WriteArrayStart(); + foreach(var publicRequestExpressionListValue in publicRequest.Expression) + { + context.Writer.WriteObjectStart(); + + var marshaller = LFTagMarshaller.Instance; + marshaller.Marshall(publicRequestExpressionListValue, context); + + context.Writer.WriteObjectEnd(); + } + context.Writer.WriteArrayEnd(); + } - context.Writer.WriteObjectEnd(); + if(publicRequest.IsSetName()) + { + context.Writer.WritePropertyName("Name"); + context.Writer.Write(publicRequest.Name); } - context.Writer.WriteArrayEnd(); - } - if(publicRequest.IsSetName()) - { - context.Writer.WritePropertyName("Name"); - context.Writer.Write(publicRequest.Name); + writer.WriteObjectEnd(); } - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); + request.Content = memoryStream.ToArray(); } diff --git a/sdk/src/Services/LakeFormation/Generated/Model/Internal/MarshallTransformations/DeleteLFTagExpressionRequestMarshaller.cs b/sdk/src/Services/LakeFormation/Generated/Model/Internal/MarshallTransformations/DeleteLFTagExpressionRequestMarshaller.cs index a08563dd53a6..19ff01a230ca 100644 --- a/sdk/src/Services/LakeFormation/Generated/Model/Internal/MarshallTransformations/DeleteLFTagExpressionRequestMarshaller.cs +++ b/sdk/src/Services/LakeFormation/Generated/Model/Internal/MarshallTransformations/DeleteLFTagExpressionRequestMarshaller.cs @@ -61,27 +61,30 @@ public IRequest Marshall(DeleteLFTagExpressionRequest publicRequest) request.HttpMethod = "POST"; request.ResourcePath = "/DeleteLFTagExpression"; - using (StringWriter stringWriter = new StringWriter(CultureInfo.InvariantCulture)) + using (MemoryStream memoryStream = new MemoryStream()) { - JsonWriter writer = new JsonWriter(stringWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetCatalogId()) + using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) { - context.Writer.WritePropertyName("CatalogId"); - context.Writer.Write(publicRequest.CatalogId); - } + JsonWriter writer = new JsonWriter(streamWriter); + writer.Validate = false; + writer.WriteObjectStart(); + var context = new JsonMarshallerContext(request, writer); + if(publicRequest.IsSetCatalogId()) + { + context.Writer.WritePropertyName("CatalogId"); + context.Writer.Write(publicRequest.CatalogId); + } - if(publicRequest.IsSetName()) - { - context.Writer.WritePropertyName("Name"); - context.Writer.Write(publicRequest.Name); + if(publicRequest.IsSetName()) + { + context.Writer.WritePropertyName("Name"); + context.Writer.Write(publicRequest.Name); + } + + writer.WriteObjectEnd(); } - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); + request.Content = memoryStream.ToArray(); } diff --git a/sdk/src/Services/LakeFormation/Generated/Model/Internal/MarshallTransformations/GetLFTagExpressionRequestMarshaller.cs b/sdk/src/Services/LakeFormation/Generated/Model/Internal/MarshallTransformations/GetLFTagExpressionRequestMarshaller.cs index 92a7cf20ef5d..4cd5908ea91d 100644 --- a/sdk/src/Services/LakeFormation/Generated/Model/Internal/MarshallTransformations/GetLFTagExpressionRequestMarshaller.cs +++ b/sdk/src/Services/LakeFormation/Generated/Model/Internal/MarshallTransformations/GetLFTagExpressionRequestMarshaller.cs @@ -61,27 +61,30 @@ public IRequest Marshall(GetLFTagExpressionRequest publicRequest) request.HttpMethod = "POST"; request.ResourcePath = "/GetLFTagExpression"; - using (StringWriter stringWriter = new StringWriter(CultureInfo.InvariantCulture)) + using (MemoryStream memoryStream = new MemoryStream()) { - JsonWriter writer = new JsonWriter(stringWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetCatalogId()) + using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) { - context.Writer.WritePropertyName("CatalogId"); - context.Writer.Write(publicRequest.CatalogId); - } + JsonWriter writer = new JsonWriter(streamWriter); + writer.Validate = false; + writer.WriteObjectStart(); + var context = new JsonMarshallerContext(request, writer); + if(publicRequest.IsSetCatalogId()) + { + context.Writer.WritePropertyName("CatalogId"); + context.Writer.Write(publicRequest.CatalogId); + } - if(publicRequest.IsSetName()) - { - context.Writer.WritePropertyName("Name"); - context.Writer.Write(publicRequest.Name); + if(publicRequest.IsSetName()) + { + context.Writer.WritePropertyName("Name"); + context.Writer.Write(publicRequest.Name); + } + + writer.WriteObjectEnd(); } - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); + request.Content = memoryStream.ToArray(); } diff --git a/sdk/src/Services/LakeFormation/Generated/Model/Internal/MarshallTransformations/ListLFTagExpressionsRequestMarshaller.cs b/sdk/src/Services/LakeFormation/Generated/Model/Internal/MarshallTransformations/ListLFTagExpressionsRequestMarshaller.cs index eaa9fde10605..4a143c487ff4 100644 --- a/sdk/src/Services/LakeFormation/Generated/Model/Internal/MarshallTransformations/ListLFTagExpressionsRequestMarshaller.cs +++ b/sdk/src/Services/LakeFormation/Generated/Model/Internal/MarshallTransformations/ListLFTagExpressionsRequestMarshaller.cs @@ -61,33 +61,36 @@ public IRequest Marshall(ListLFTagExpressionsRequest publicRequest) request.HttpMethod = "POST"; request.ResourcePath = "/ListLFTagExpressions"; - using (StringWriter stringWriter = new StringWriter(CultureInfo.InvariantCulture)) + using (MemoryStream memoryStream = new MemoryStream()) { - JsonWriter writer = new JsonWriter(stringWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetCatalogId()) + using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) { - context.Writer.WritePropertyName("CatalogId"); - context.Writer.Write(publicRequest.CatalogId); - } + JsonWriter writer = new JsonWriter(streamWriter); + writer.Validate = false; + writer.WriteObjectStart(); + var context = new JsonMarshallerContext(request, writer); + if(publicRequest.IsSetCatalogId()) + { + context.Writer.WritePropertyName("CatalogId"); + context.Writer.Write(publicRequest.CatalogId); + } - if(publicRequest.IsSetMaxResults()) - { - context.Writer.WritePropertyName("MaxResults"); - context.Writer.Write(publicRequest.MaxResults); - } + if(publicRequest.IsSetMaxResults()) + { + context.Writer.WritePropertyName("MaxResults"); + context.Writer.Write(publicRequest.MaxResults.Value); + } - if(publicRequest.IsSetNextToken()) - { - context.Writer.WritePropertyName("NextToken"); - context.Writer.Write(publicRequest.NextToken); + if(publicRequest.IsSetNextToken()) + { + context.Writer.WritePropertyName("NextToken"); + context.Writer.Write(publicRequest.NextToken); + } + + writer.WriteObjectEnd(); } - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); + request.Content = memoryStream.ToArray(); } diff --git a/sdk/src/Services/LakeFormation/Generated/Model/Internal/MarshallTransformations/UpdateLFTagExpressionRequestMarshaller.cs b/sdk/src/Services/LakeFormation/Generated/Model/Internal/MarshallTransformations/UpdateLFTagExpressionRequestMarshaller.cs index 9a0eafe757b7..e092fcbd3ea6 100644 --- a/sdk/src/Services/LakeFormation/Generated/Model/Internal/MarshallTransformations/UpdateLFTagExpressionRequestMarshaller.cs +++ b/sdk/src/Services/LakeFormation/Generated/Model/Internal/MarshallTransformations/UpdateLFTagExpressionRequestMarshaller.cs @@ -61,49 +61,52 @@ public IRequest Marshall(UpdateLFTagExpressionRequest publicRequest) request.HttpMethod = "POST"; request.ResourcePath = "/UpdateLFTagExpression"; - using (StringWriter stringWriter = new StringWriter(CultureInfo.InvariantCulture)) + using (MemoryStream memoryStream = new MemoryStream()) { - JsonWriter writer = new JsonWriter(stringWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetCatalogId()) + using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) { - context.Writer.WritePropertyName("CatalogId"); - context.Writer.Write(publicRequest.CatalogId); - } - - if(publicRequest.IsSetDescription()) - { - context.Writer.WritePropertyName("Description"); - context.Writer.Write(publicRequest.Description); - } + JsonWriter writer = new JsonWriter(streamWriter); + writer.Validate = false; + writer.WriteObjectStart(); + var context = new JsonMarshallerContext(request, writer); + if(publicRequest.IsSetCatalogId()) + { + context.Writer.WritePropertyName("CatalogId"); + context.Writer.Write(publicRequest.CatalogId); + } - if(publicRequest.IsSetExpression()) - { - context.Writer.WritePropertyName("Expression"); - context.Writer.WriteArrayStart(); - foreach(var publicRequestExpressionListValue in publicRequest.Expression) + if(publicRequest.IsSetDescription()) { - context.Writer.WriteObjectStart(); + context.Writer.WritePropertyName("Description"); + context.Writer.Write(publicRequest.Description); + } - var marshaller = LFTagMarshaller.Instance; - marshaller.Marshall(publicRequestExpressionListValue, context); + if(publicRequest.IsSetExpression()) + { + context.Writer.WritePropertyName("Expression"); + context.Writer.WriteArrayStart(); + foreach(var publicRequestExpressionListValue in publicRequest.Expression) + { + context.Writer.WriteObjectStart(); + + var marshaller = LFTagMarshaller.Instance; + marshaller.Marshall(publicRequestExpressionListValue, context); + + context.Writer.WriteObjectEnd(); + } + context.Writer.WriteArrayEnd(); + } - context.Writer.WriteObjectEnd(); + if(publicRequest.IsSetName()) + { + context.Writer.WritePropertyName("Name"); + context.Writer.Write(publicRequest.Name); } - context.Writer.WriteArrayEnd(); - } - if(publicRequest.IsSetName()) - { - context.Writer.WritePropertyName("Name"); - context.Writer.Write(publicRequest.Name); + writer.WriteObjectEnd(); } - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); + request.Content = memoryStream.ToArray(); } diff --git a/sdk/src/Services/LakeFormation/Generated/Model/ListLFTagExpressionsRequest.cs b/sdk/src/Services/LakeFormation/Generated/Model/ListLFTagExpressionsRequest.cs index aebfc63ed16a..843921a5c392 100644 --- a/sdk/src/Services/LakeFormation/Generated/Model/ListLFTagExpressionsRequest.cs +++ b/sdk/src/Services/LakeFormation/Generated/Model/ListLFTagExpressionsRequest.cs @@ -67,9 +67,9 @@ internal bool IsSetCatalogId() /// /// [AWSProperty(Min=1, Max=1000)] - public int MaxResults + public int? MaxResults { - get { return this._maxResults.GetValueOrDefault(); } + get { return this._maxResults; } set { this._maxResults = value; } } diff --git a/sdk/src/Services/LakeFormation/Generated/Model/_bcl45+netstandard/IListLFTagExpressionsPaginator.cs b/sdk/src/Services/LakeFormation/Generated/Model/_bcl+netstandard/IListLFTagExpressionsPaginator.cs similarity index 100% rename from sdk/src/Services/LakeFormation/Generated/Model/_bcl45+netstandard/IListLFTagExpressionsPaginator.cs rename to sdk/src/Services/LakeFormation/Generated/Model/_bcl+netstandard/IListLFTagExpressionsPaginator.cs diff --git a/sdk/src/Services/LakeFormation/Generated/Model/_bcl45+netstandard/ListLFTagExpressionsPaginator.cs b/sdk/src/Services/LakeFormation/Generated/Model/_bcl+netstandard/ListLFTagExpressionsPaginator.cs similarity index 100% rename from sdk/src/Services/LakeFormation/Generated/Model/_bcl45+netstandard/ListLFTagExpressionsPaginator.cs rename to sdk/src/Services/LakeFormation/Generated/Model/_bcl+netstandard/ListLFTagExpressionsPaginator.cs diff --git a/sdk/src/Services/LakeFormation/Generated/_bcl/AmazonLakeFormationClient.cs b/sdk/src/Services/LakeFormation/Generated/_bcl/AmazonLakeFormationClient.cs index a7b3b580282a..4f1960fbe408 100644 --- a/sdk/src/Services/LakeFormation/Generated/_bcl/AmazonLakeFormationClient.cs +++ b/sdk/src/Services/LakeFormation/Generated/_bcl/AmazonLakeFormationClient.cs @@ -1038,6 +1038,109 @@ public virtual CreateLFTagResponse CreateLFTag(CreateLFTagRequest request) #endregion + #region CreateLFTagExpression + + + /// + /// Creates a new LF-Tag expression with the provided name, description, catalog ID, and + /// expression body. This call fails if a LF-Tag expression with the same name already + /// exists in the caller’s account or if the underlying LF-Tags don't exist. To call this + /// API operation, caller needs the following Lake Formation permissions: + /// + /// + /// + /// CREATE_LF_TAG_EXPRESSION on the root catalog resource. + /// + /// + /// + /// GRANT_WITH_LF_TAG_EXPRESSION on all underlying LF-Tag key:value pairs included + /// in the expression. + /// + /// + /// Container for the necessary parameters to execute the CreateLFTagExpression service method. + /// + /// The response from the CreateLFTagExpression service method, as returned by LakeFormation. + /// + /// Access to a resource was denied. + /// + /// + /// A specified entity does not exist. + /// + /// + /// An internal service error occurred. + /// + /// + /// The input provided was not valid. + /// + /// + /// The operation timed out. + /// + /// + /// A resource numerical limit was exceeded. + /// + /// REST API Reference for CreateLFTagExpression Operation + public virtual CreateLFTagExpressionResponse CreateLFTagExpression(CreateLFTagExpressionRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = CreateLFTagExpressionRequestMarshaller.Instance; + options.ResponseUnmarshaller = CreateLFTagExpressionResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// Creates a new LF-Tag expression with the provided name, description, catalog ID, and + /// expression body. This call fails if a LF-Tag expression with the same name already + /// exists in the caller’s account or if the underlying LF-Tags don't exist. To call this + /// API operation, caller needs the following Lake Formation permissions: + /// + /// + /// + /// CREATE_LF_TAG_EXPRESSION on the root catalog resource. + /// + /// + /// + /// GRANT_WITH_LF_TAG_EXPRESSION on all underlying LF-Tag key:value pairs included + /// in the expression. + /// + /// + /// Container for the necessary parameters to execute the CreateLFTagExpression service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the CreateLFTagExpression service method, as returned by LakeFormation. + /// + /// Access to a resource was denied. + /// + /// + /// A specified entity does not exist. + /// + /// + /// An internal service error occurred. + /// + /// + /// The input provided was not valid. + /// + /// + /// The operation timed out. + /// + /// + /// A resource numerical limit was exceeded. + /// + /// REST API Reference for CreateLFTagExpression Operation + public virtual Task CreateLFTagExpressionAsync(CreateLFTagExpressionRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = CreateLFTagExpressionRequestMarshaller.Instance; + options.ResponseUnmarshaller = CreateLFTagExpressionResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + #region DeleteDataCellsFilter @@ -1344,6 +1447,81 @@ public virtual DeleteLFTagResponse DeleteLFTag(DeleteLFTagRequest request) #endregion + #region DeleteLFTagExpression + + + /// + /// Deletes the LF-Tag expression. The caller must be a data lake admin or have DROP + /// permissions on the LF-Tag expression. Deleting a LF-Tag expression will also delete + /// all LFTagPolicy permissions referencing the LF-Tag expression. + /// + /// Container for the necessary parameters to execute the DeleteLFTagExpression service method. + /// + /// The response from the DeleteLFTagExpression service method, as returned by LakeFormation. + /// + /// Access to a resource was denied. + /// + /// + /// A specified entity does not exist. + /// + /// + /// An internal service error occurred. + /// + /// + /// The input provided was not valid. + /// + /// + /// The operation timed out. + /// + /// REST API Reference for DeleteLFTagExpression Operation + public virtual DeleteLFTagExpressionResponse DeleteLFTagExpression(DeleteLFTagExpressionRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = DeleteLFTagExpressionRequestMarshaller.Instance; + options.ResponseUnmarshaller = DeleteLFTagExpressionResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// Deletes the LF-Tag expression. The caller must be a data lake admin or have DROP + /// permissions on the LF-Tag expression. Deleting a LF-Tag expression will also delete + /// all LFTagPolicy permissions referencing the LF-Tag expression. + /// + /// Container for the necessary parameters to execute the DeleteLFTagExpression service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the DeleteLFTagExpression service method, as returned by LakeFormation. + /// + /// Access to a resource was denied. + /// + /// + /// A specified entity does not exist. + /// + /// + /// An internal service error occurred. + /// + /// + /// The input provided was not valid. + /// + /// + /// The operation timed out. + /// + /// REST API Reference for DeleteLFTagExpression Operation + public virtual Task DeleteLFTagExpressionAsync(DeleteLFTagExpressionRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = DeleteLFTagExpressionRequestMarshaller.Instance; + options.ResponseUnmarshaller = DeleteLFTagExpressionResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + #region DeleteObjectsOnCancel @@ -2165,6 +2343,79 @@ public virtual GetLFTagResponse GetLFTag(GetLFTagRequest request) #endregion + #region GetLFTagExpression + + + /// + /// Returns the details about the LF-Tag expression. The caller must be a data lake admin + /// or must have DESCRIBE permission on the LF-Tag expression resource. + /// + /// Container for the necessary parameters to execute the GetLFTagExpression service method. + /// + /// The response from the GetLFTagExpression service method, as returned by LakeFormation. + /// + /// Access to a resource was denied. + /// + /// + /// A specified entity does not exist. + /// + /// + /// An internal service error occurred. + /// + /// + /// The input provided was not valid. + /// + /// + /// The operation timed out. + /// + /// REST API Reference for GetLFTagExpression Operation + public virtual GetLFTagExpressionResponse GetLFTagExpression(GetLFTagExpressionRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = GetLFTagExpressionRequestMarshaller.Instance; + options.ResponseUnmarshaller = GetLFTagExpressionResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// Returns the details about the LF-Tag expression. The caller must be a data lake admin + /// or must have DESCRIBE permission on the LF-Tag expression resource. + /// + /// Container for the necessary parameters to execute the GetLFTagExpression service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the GetLFTagExpression service method, as returned by LakeFormation. + /// + /// Access to a resource was denied. + /// + /// + /// A specified entity does not exist. + /// + /// + /// An internal service error occurred. + /// + /// + /// The input provided was not valid. + /// + /// + /// The operation timed out. + /// + /// REST API Reference for GetLFTagExpression Operation + public virtual Task GetLFTagExpressionAsync(GetLFTagExpressionRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = GetLFTagExpressionRequestMarshaller.Instance; + options.ResponseUnmarshaller = GetLFTagExpressionResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + #region GetQueryState @@ -2566,6 +2817,12 @@ public virtual GetTemporaryGluePartitionCredentialsResponse GetTemporaryGluePart /// Amazon S3. In order to vend such credentials, Lake Formation assumes the role associated /// with a registered location, for example an Amazon S3 bucket, with a scope down policy /// which restricts the access to a single prefix. + /// + /// + /// + /// To call this API, the role that the service assumes must have lakeformation:GetDataAccess + /// permission on the resource. + /// /// /// Container for the necessary parameters to execute the GetTemporaryGlueTableCredentials service method. /// @@ -2607,6 +2864,12 @@ public virtual GetTemporaryGlueTableCredentialsResponse GetTemporaryGlueTableCre /// Amazon S3. In order to vend such credentials, Lake Formation assumes the role associated /// with a registered location, for example an Amazon S3 bucket, with a scope down policy /// which restricts the access to a single prefix. + /// + /// + /// + /// To call this API, the role that the service assumes must have lakeformation:GetDataAccess + /// permission on the resource. + /// /// /// Container for the necessary parameters to execute the GetTemporaryGlueTableCredentials service method. /// @@ -2996,6 +3259,81 @@ public virtual ListLakeFormationOptInsResponse ListLakeFormationOptIns(ListLakeF #endregion + #region ListLFTagExpressions + + + /// + /// Returns the LF-Tag expressions in caller’s account filtered based on caller's permissions. + /// Data Lake and read only admins implicitly can see all tag expressions in their account, + /// else caller needs DESCRIBE permissions on tag expression. + /// + /// Container for the necessary parameters to execute the ListLFTagExpressions service method. + /// + /// The response from the ListLFTagExpressions service method, as returned by LakeFormation. + /// + /// Access to a resource was denied. + /// + /// + /// A specified entity does not exist. + /// + /// + /// An internal service error occurred. + /// + /// + /// The input provided was not valid. + /// + /// + /// The operation timed out. + /// + /// REST API Reference for ListLFTagExpressions Operation + public virtual ListLFTagExpressionsResponse ListLFTagExpressions(ListLFTagExpressionsRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = ListLFTagExpressionsRequestMarshaller.Instance; + options.ResponseUnmarshaller = ListLFTagExpressionsResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// Returns the LF-Tag expressions in caller’s account filtered based on caller's permissions. + /// Data Lake and read only admins implicitly can see all tag expressions in their account, + /// else caller needs DESCRIBE permissions on tag expression. + /// + /// Container for the necessary parameters to execute the ListLFTagExpressions service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the ListLFTagExpressions service method, as returned by LakeFormation. + /// + /// Access to a resource was denied. + /// + /// + /// A specified entity does not exist. + /// + /// + /// An internal service error occurred. + /// + /// + /// The input provided was not valid. + /// + /// + /// The operation timed out. + /// + /// REST API Reference for ListLFTagExpressions Operation + public virtual Task ListLFTagExpressionsAsync(ListLFTagExpressionsRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = ListLFTagExpressionsRequestMarshaller.Instance; + options.ResponseUnmarshaller = ListLFTagExpressionsResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + #region ListLFTags @@ -3442,7 +3780,7 @@ public virtual PutDataLakeSettingsResponse PutDataLakeSettings(PutDataLakeSettin /// /// /// - /// ResourceArn = arn:aws:s3:::my-bucket UseServiceLinkedRole = true + /// ResourceArn = arn:aws:s3:::my-bucket/ UseServiceLinkedRole = true /// /// /// @@ -3507,7 +3845,7 @@ public virtual RegisterResourceResponse RegisterResource(RegisterResourceRequest /// /// /// - /// ResourceArn = arn:aws:s3:::my-bucket UseServiceLinkedRole = true + /// ResourceArn = arn:aws:s3:::my-bucket/ UseServiceLinkedRole = true /// /// /// @@ -4246,6 +4584,89 @@ public virtual UpdateLFTagResponse UpdateLFTag(UpdateLFTagRequest request) #endregion + #region UpdateLFTagExpression + + + /// + /// Updates the name of the LF-Tag expression to the new description and expression body + /// provided. Updating a LF-Tag expression immediately changes the permission boundaries + /// of all existing LFTagPolicy permission grants that reference the given LF-Tag + /// expression. + /// + /// Container for the necessary parameters to execute the UpdateLFTagExpression service method. + /// + /// The response from the UpdateLFTagExpression service method, as returned by LakeFormation. + /// + /// Access to a resource was denied. + /// + /// + /// A specified entity does not exist. + /// + /// + /// An internal service error occurred. + /// + /// + /// The input provided was not valid. + /// + /// + /// The operation timed out. + /// + /// + /// A resource numerical limit was exceeded. + /// + /// REST API Reference for UpdateLFTagExpression Operation + public virtual UpdateLFTagExpressionResponse UpdateLFTagExpression(UpdateLFTagExpressionRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = UpdateLFTagExpressionRequestMarshaller.Instance; + options.ResponseUnmarshaller = UpdateLFTagExpressionResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// Updates the name of the LF-Tag expression to the new description and expression body + /// provided. Updating a LF-Tag expression immediately changes the permission boundaries + /// of all existing LFTagPolicy permission grants that reference the given LF-Tag + /// expression. + /// + /// Container for the necessary parameters to execute the UpdateLFTagExpression service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the UpdateLFTagExpression service method, as returned by LakeFormation. + /// + /// Access to a resource was denied. + /// + /// + /// A specified entity does not exist. + /// + /// + /// An internal service error occurred. + /// + /// + /// The input provided was not valid. + /// + /// + /// The operation timed out. + /// + /// + /// A resource numerical limit was exceeded. + /// + /// REST API Reference for UpdateLFTagExpression Operation + public virtual Task UpdateLFTagExpressionAsync(UpdateLFTagExpressionRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = UpdateLFTagExpressionRequestMarshaller.Instance; + options.ResponseUnmarshaller = UpdateLFTagExpressionResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + #region UpdateResource diff --git a/sdk/src/Services/LakeFormation/LakeFormation.sln b/sdk/src/Services/LakeFormation/LakeFormation.sln index 3dc92e6c2a7f..2f8bdd4b866b 100644 --- a/sdk/src/Services/LakeFormation/LakeFormation.sln +++ b/sdk/src/Services/LakeFormation/LakeFormation.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {39302F2A-4018-4D3C-9117-644DA21E66AC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {39302F2A-4018-4D3C-9117-644DA21E66AC}.Debug|Any CPU.Build.0 = Debug|Any CPU {39302F2A-4018-4D3C-9117-644DA21E66AC}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {ACB0CE73-BFDE-40DF-8590-91BD01802E88}.Debug|Any CPU.Build.0 = Debug|Any CPU {ACB0CE73-BFDE-40DF-8590-91BD01802E88}.Release|Any CPU.ActiveCfg = Release|Any CPU {ACB0CE73-BFDE-40DF-8590-91BD01802E88}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {15CE31B4-5B41-4F40-A2A0-7E47CF56156D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {15CE31B4-5B41-4F40-A2A0-7E47CF56156D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {15CE31B4-5B41-4F40-A2A0-7E47CF56156D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {15CE31B4-5B41-4F40-A2A0-7E47CF56156D}.Release|Any CPU.Build.0 = Release|Any CPU - {1275CD28-9CB7-4C16-9787-54E67C852459}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1275CD28-9CB7-4C16-9787-54E67C852459}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1275CD28-9CB7-4C16-9787-54E67C852459}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1275CD28-9CB7-4C16-9787-54E67C852459}.Release|Any CPU.Build.0 = Release|Any CPU - {AC83D91F-E75B-4845-8811-66F3E7588CA3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AC83D91F-E75B-4845-8811-66F3E7588CA3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AC83D91F-E75B-4845-8811-66F3E7588CA3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AC83D91F-E75B-4845-8811-66F3E7588CA3}.Release|Any CPU.Build.0 = Release|Any CPU - {B6B7E524-FB18-401D-AD12-35A0ECE557F7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B6B7E524-FB18-401D-AD12-35A0ECE557F7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B6B7E524-FB18-401D-AD12-35A0ECE557F7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B6B7E524-FB18-401D-AD12-35A0ECE557F7}.Release|Any CPU.Build.0 = Release|Any CPU - {35D26C6D-FECA-4FC3-82BB-7924DB311F71}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {35D26C6D-FECA-4FC3-82BB-7924DB311F71}.Debug|Any CPU.Build.0 = Debug|Any CPU - {35D26C6D-FECA-4FC3-82BB-7924DB311F71}.Release|Any CPU.ActiveCfg = Release|Any CPU - {35D26C6D-FECA-4FC3-82BB-7924DB311F71}.Release|Any CPU.Build.0 = Release|Any CPU - {ABEF603A-EC83-4213-9423-BE82BB772646}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {ABEF603A-EC83-4213-9423-BE82BB772646}.Debug|Any CPU.Build.0 = Debug|Any CPU - {ABEF603A-EC83-4213-9423-BE82BB772646}.Release|Any CPU.ActiveCfg = Release|Any CPU - {ABEF603A-EC83-4213-9423-BE82BB772646}.Release|Any CPU.Build.0 = Release|Any CPU - {F8180BD9-F98B-445D-89BA-A2524BE688DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F8180BD9-F98B-445D-89BA-A2524BE688DC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F8180BD9-F98B-445D-89BA-A2524BE688DC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F8180BD9-F98B-445D-89BA-A2524BE688DC}.Release|Any CPU.Build.0 = Release|Any CPU - {3503FC4D-4EC5-4422-8A7C-62A945B6179B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3503FC4D-4EC5-4422-8A7C-62A945B6179B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3503FC4D-4EC5-4422-8A7C-62A945B6179B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3503FC4D-4EC5-4422-8A7C-62A945B6179B}.Release|Any CPU.Build.0 = Release|Any CPU - {71E031EF-499C-4E14-AB3B-000266C1CD35}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {71E031EF-499C-4E14-AB3B-000266C1CD35}.Debug|Any CPU.Build.0 = Debug|Any CPU - {71E031EF-499C-4E14-AB3B-000266C1CD35}.Release|Any CPU.ActiveCfg = Release|Any CPU - {71E031EF-499C-4E14-AB3B-000266C1CD35}.Release|Any CPU.Build.0 = Release|Any CPU - {2C39B3F8-46BC-4636-BA1B-161377E1B5C3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2C39B3F8-46BC-4636-BA1B-161377E1B5C3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2C39B3F8-46BC-4636-BA1B-161377E1B5C3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2C39B3F8-46BC-4636-BA1B-161377E1B5C3}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {15CE31B4-5B41-4F40-A2A0-7E47CF56156D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {15CE31B4-5B41-4F40-A2A0-7E47CF56156D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {15CE31B4-5B41-4F40-A2A0-7E47CF56156D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {15CE31B4-5B41-4F40-A2A0-7E47CF56156D}.Release|Any CPU.Build.0 = Release|Any CPU - {1275CD28-9CB7-4C16-9787-54E67C852459}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1275CD28-9CB7-4C16-9787-54E67C852459}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1275CD28-9CB7-4C16-9787-54E67C852459}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1275CD28-9CB7-4C16-9787-54E67C852459}.Release|Any CPU.Build.0 = Release|Any CPU - {AC83D91F-E75B-4845-8811-66F3E7588CA3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AC83D91F-E75B-4845-8811-66F3E7588CA3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AC83D91F-E75B-4845-8811-66F3E7588CA3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AC83D91F-E75B-4845-8811-66F3E7588CA3}.Release|Any CPU.Build.0 = Release|Any CPU - {B6B7E524-FB18-401D-AD12-35A0ECE557F7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B6B7E524-FB18-401D-AD12-35A0ECE557F7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B6B7E524-FB18-401D-AD12-35A0ECE557F7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B6B7E524-FB18-401D-AD12-35A0ECE557F7}.Release|Any CPU.Build.0 = Release|Any CPU - {35D26C6D-FECA-4FC3-82BB-7924DB311F71}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {35D26C6D-FECA-4FC3-82BB-7924DB311F71}.Debug|Any CPU.Build.0 = Debug|Any CPU - {35D26C6D-FECA-4FC3-82BB-7924DB311F71}.Release|Any CPU.ActiveCfg = Release|Any CPU - {35D26C6D-FECA-4FC3-82BB-7924DB311F71}.Release|Any CPU.Build.0 = Release|Any CPU - {ABEF603A-EC83-4213-9423-BE82BB772646}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {ABEF603A-EC83-4213-9423-BE82BB772646}.Debug|Any CPU.Build.0 = Debug|Any CPU - {ABEF603A-EC83-4213-9423-BE82BB772646}.Release|Any CPU.ActiveCfg = Release|Any CPU - {ABEF603A-EC83-4213-9423-BE82BB772646}.Release|Any CPU.Build.0 = Release|Any CPU - {F8180BD9-F98B-445D-89BA-A2524BE688DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F8180BD9-F98B-445D-89BA-A2524BE688DC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F8180BD9-F98B-445D-89BA-A2524BE688DC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F8180BD9-F98B-445D-89BA-A2524BE688DC}.Release|Any CPU.Build.0 = Release|Any CPU - {3503FC4D-4EC5-4422-8A7C-62A945B6179B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3503FC4D-4EC5-4422-8A7C-62A945B6179B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3503FC4D-4EC5-4422-8A7C-62A945B6179B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3503FC4D-4EC5-4422-8A7C-62A945B6179B}.Release|Any CPU.Build.0 = Release|Any CPU - {71E031EF-499C-4E14-AB3B-000266C1CD35}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {71E031EF-499C-4E14-AB3B-000266C1CD35}.Debug|Any CPU.Build.0 = Debug|Any CPU - {71E031EF-499C-4E14-AB3B-000266C1CD35}.Release|Any CPU.ActiveCfg = Release|Any CPU - {71E031EF-499C-4E14-AB3B-000266C1CD35}.Release|Any CPU.Build.0 = Release|Any CPU - {2C39B3F8-46BC-4636-BA1B-161377E1B5C3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2C39B3F8-46BC-4636-BA1B-161377E1B5C3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2C39B3F8-46BC-4636-BA1B-161377E1B5C3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2C39B3F8-46BC-4636-BA1B-161377E1B5C3}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {39302F2A-4018-4D3C-9117-644DA21E66AC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {BB86B325-BAF4-4973-8A76-2439FFCFA72A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {BBE6C424-CB47-4CD6-8341-D67FCF2DFB8D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {0687CC7E-C204-460B-BC05-51AB2347EAA0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {ACB0CE73-BFDE-40DF-8590-91BD01802E88} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {15CE31B4-5B41-4F40-A2A0-7E47CF56156D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {1275CD28-9CB7-4C16-9787-54E67C852459} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {AC83D91F-E75B-4845-8811-66F3E7588CA3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B6B7E524-FB18-401D-AD12-35A0ECE557F7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {35D26C6D-FECA-4FC3-82BB-7924DB311F71} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {ABEF603A-EC83-4213-9423-BE82BB772646} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F8180BD9-F98B-445D-89BA-A2524BE688DC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {3503FC4D-4EC5-4422-8A7C-62A945B6179B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {71E031EF-499C-4E14-AB3B-000266C1CD35} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {2C39B3F8-46BC-4636-BA1B-161377E1B5C3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {15CE31B4-5B41-4F40-A2A0-7E47CF56156D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {1275CD28-9CB7-4C16-9787-54E67C852459} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {AC83D91F-E75B-4845-8811-66F3E7588CA3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B6B7E524-FB18-401D-AD12-35A0ECE557F7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {35D26C6D-FECA-4FC3-82BB-7924DB311F71} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {ABEF603A-EC83-4213-9423-BE82BB772646} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F8180BD9-F98B-445D-89BA-A2524BE688DC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {3503FC4D-4EC5-4422-8A7C-62A945B6179B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {71E031EF-499C-4E14-AB3B-000266C1CD35} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {2C39B3F8-46BC-4636-BA1B-161377E1B5C3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {928F5917-7263-477F-9861-3BCFDADD558F} diff --git a/sdk/src/Services/LakeFormation/Properties/AssemblyInfo.cs b/sdk/src/Services/LakeFormation/Properties/AssemblyInfo.cs index 51da3e5cc801..3f5219df6e98 100644 --- a/sdk/src/Services/LakeFormation/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/LakeFormation/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.8")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/Lambda/Generated/AmazonLambdaConfig.cs b/sdk/src/Services/Lambda/Generated/AmazonLambdaConfig.cs index 1a36172242f3..3bc0c3b80fbb 100644 --- a/sdk/src/Services/Lambda/Generated/AmazonLambdaConfig.cs +++ b/sdk/src/Services/Lambda/Generated/AmazonLambdaConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.Lambda public partial class AmazonLambdaConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("Lambda", "4.0.0.0"); private static readonly AmazonLambdaEndpointResolver EndpointResolver = new AmazonLambdaEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("Lambda", "3.7.405.1"); -======= - InternalSDKUtils.BuildUserAgentString("Lambda", "3.7.408.5"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/Lambda/Generated/Model/Internal/MarshallTransformations/UpdateFunctionCodeRequestMarshaller.cs b/sdk/src/Services/Lambda/Generated/Model/Internal/MarshallTransformations/UpdateFunctionCodeRequestMarshaller.cs index 68301375fc75..810e952d9269 100644 --- a/sdk/src/Services/Lambda/Generated/Model/Internal/MarshallTransformations/UpdateFunctionCodeRequestMarshaller.cs +++ b/sdk/src/Services/Lambda/Generated/Model/Internal/MarshallTransformations/UpdateFunctionCodeRequestMarshaller.cs @@ -125,7 +125,12 @@ public IRequest Marshall(UpdateFunctionCodeRequest publicRequest) context.Writer.Write(publicRequest.S3ObjectVersion); } -<<<<<<< HEAD + if(publicRequest.IsSetSourceKMSKeyArn()) + { + context.Writer.WritePropertyName("SourceKMSKeyArn"); + context.Writer.Write(publicRequest.SourceKMSKeyArn); + } + if(publicRequest.IsSetZipFile()) { context.Writer.WritePropertyName("ZipFile"); @@ -133,23 +138,6 @@ public IRequest Marshall(UpdateFunctionCodeRequest publicRequest) } writer.WriteObjectEnd(); -||||||| Commit version number update changes - if(publicRequest.IsSetZipFile()) - { - context.Writer.WritePropertyName("ZipFile"); - context.Writer.Write(StringUtils.FromMemoryStream(publicRequest.ZipFile)); -======= - if(publicRequest.IsSetSourceKMSKeyArn()) - { - context.Writer.WritePropertyName("SourceKMSKeyArn"); - context.Writer.Write(publicRequest.SourceKMSKeyArn); - } - - if(publicRequest.IsSetZipFile()) - { - context.Writer.WritePropertyName("ZipFile"); - context.Writer.Write(StringUtils.FromMemoryStream(publicRequest.ZipFile)); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b } request.Content = memoryStream.ToArray(); diff --git a/sdk/src/Services/Lambda/Lambda.sln b/sdk/src/Services/Lambda/Lambda.sln index 33be9de515dc..a736a0906aa5 100644 --- a/sdk/src/Services/Lambda/Lambda.sln +++ b/sdk/src/Services/Lambda/Lambda.sln @@ -92,7 +92,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {8BA6D81C-2233-48AA-A053-432B8405831A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {8BA6D81C-2233-48AA-A053-432B8405831A}.Debug|Any CPU.Build.0 = Debug|Any CPU {8BA6D81C-2233-48AA-A053-432B8405831A}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -113,97 +120,6 @@ Global {CA8E6ABB-7A77-49BA-AA72-0CDF41331232}.Debug|Any CPU.Build.0 = Debug|Any CPU {CA8E6ABB-7A77-49BA-AA72-0CDF41331232}.Release|Any CPU.ActiveCfg = Release|Any CPU {CA8E6ABB-7A77-49BA-AA72-0CDF41331232}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {EB7167ED-8045-4046-8DED-D4EC8335B6AD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EB7167ED-8045-4046-8DED-D4EC8335B6AD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EB7167ED-8045-4046-8DED-D4EC8335B6AD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EB7167ED-8045-4046-8DED-D4EC8335B6AD}.Release|Any CPU.Build.0 = Release|Any CPU - {73D20A78-ADA0-4086-90D2-D8D574D939D5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {73D20A78-ADA0-4086-90D2-D8D574D939D5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {73D20A78-ADA0-4086-90D2-D8D574D939D5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {73D20A78-ADA0-4086-90D2-D8D574D939D5}.Release|Any CPU.Build.0 = Release|Any CPU - {FB706CFB-2598-43E3-A2E4-42C23BE34989}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FB706CFB-2598-43E3-A2E4-42C23BE34989}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FB706CFB-2598-43E3-A2E4-42C23BE34989}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FB706CFB-2598-43E3-A2E4-42C23BE34989}.Release|Any CPU.Build.0 = Release|Any CPU - {C09D9232-A3DB-4622-9480-0E6AE278749D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C09D9232-A3DB-4622-9480-0E6AE278749D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C09D9232-A3DB-4622-9480-0E6AE278749D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C09D9232-A3DB-4622-9480-0E6AE278749D}.Release|Any CPU.Build.0 = Release|Any CPU - {DEE24FBA-E725-4E2C-808F-9309710339F1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DEE24FBA-E725-4E2C-808F-9309710339F1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DEE24FBA-E725-4E2C-808F-9309710339F1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DEE24FBA-E725-4E2C-808F-9309710339F1}.Release|Any CPU.Build.0 = Release|Any CPU - {0272335D-1FE2-4D89-82A2-1DB7DF3DDD03}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0272335D-1FE2-4D89-82A2-1DB7DF3DDD03}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0272335D-1FE2-4D89-82A2-1DB7DF3DDD03}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0272335D-1FE2-4D89-82A2-1DB7DF3DDD03}.Release|Any CPU.Build.0 = Release|Any CPU - {7EC63EDC-C371-460A-BDDD-04B4E546DA57}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7EC63EDC-C371-460A-BDDD-04B4E546DA57}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7EC63EDC-C371-460A-BDDD-04B4E546DA57}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7EC63EDC-C371-460A-BDDD-04B4E546DA57}.Release|Any CPU.Build.0 = Release|Any CPU - {953C362C-A272-4BE8-994C-480415B40538}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {953C362C-A272-4BE8-994C-480415B40538}.Debug|Any CPU.Build.0 = Debug|Any CPU - {953C362C-A272-4BE8-994C-480415B40538}.Release|Any CPU.ActiveCfg = Release|Any CPU - {953C362C-A272-4BE8-994C-480415B40538}.Release|Any CPU.Build.0 = Release|Any CPU - {B4201442-8B20-4558-A85F-6E74587EDDB7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B4201442-8B20-4558-A85F-6E74587EDDB7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B4201442-8B20-4558-A85F-6E74587EDDB7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B4201442-8B20-4558-A85F-6E74587EDDB7}.Release|Any CPU.Build.0 = Release|Any CPU - {7E1A688C-295F-43C6-B887-FA62F1DC4632}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7E1A688C-295F-43C6-B887-FA62F1DC4632}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7E1A688C-295F-43C6-B887-FA62F1DC4632}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7E1A688C-295F-43C6-B887-FA62F1DC4632}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {EB7167ED-8045-4046-8DED-D4EC8335B6AD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EB7167ED-8045-4046-8DED-D4EC8335B6AD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EB7167ED-8045-4046-8DED-D4EC8335B6AD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EB7167ED-8045-4046-8DED-D4EC8335B6AD}.Release|Any CPU.Build.0 = Release|Any CPU - {73D20A78-ADA0-4086-90D2-D8D574D939D5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {73D20A78-ADA0-4086-90D2-D8D574D939D5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {73D20A78-ADA0-4086-90D2-D8D574D939D5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {73D20A78-ADA0-4086-90D2-D8D574D939D5}.Release|Any CPU.Build.0 = Release|Any CPU - {FB706CFB-2598-43E3-A2E4-42C23BE34989}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FB706CFB-2598-43E3-A2E4-42C23BE34989}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FB706CFB-2598-43E3-A2E4-42C23BE34989}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FB706CFB-2598-43E3-A2E4-42C23BE34989}.Release|Any CPU.Build.0 = Release|Any CPU - {C09D9232-A3DB-4622-9480-0E6AE278749D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C09D9232-A3DB-4622-9480-0E6AE278749D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C09D9232-A3DB-4622-9480-0E6AE278749D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C09D9232-A3DB-4622-9480-0E6AE278749D}.Release|Any CPU.Build.0 = Release|Any CPU - {DEE24FBA-E725-4E2C-808F-9309710339F1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DEE24FBA-E725-4E2C-808F-9309710339F1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DEE24FBA-E725-4E2C-808F-9309710339F1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DEE24FBA-E725-4E2C-808F-9309710339F1}.Release|Any CPU.Build.0 = Release|Any CPU - {0272335D-1FE2-4D89-82A2-1DB7DF3DDD03}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0272335D-1FE2-4D89-82A2-1DB7DF3DDD03}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0272335D-1FE2-4D89-82A2-1DB7DF3DDD03}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0272335D-1FE2-4D89-82A2-1DB7DF3DDD03}.Release|Any CPU.Build.0 = Release|Any CPU - {7EC63EDC-C371-460A-BDDD-04B4E546DA57}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7EC63EDC-C371-460A-BDDD-04B4E546DA57}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7EC63EDC-C371-460A-BDDD-04B4E546DA57}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7EC63EDC-C371-460A-BDDD-04B4E546DA57}.Release|Any CPU.Build.0 = Release|Any CPU - {953C362C-A272-4BE8-994C-480415B40538}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {953C362C-A272-4BE8-994C-480415B40538}.Debug|Any CPU.Build.0 = Debug|Any CPU - {953C362C-A272-4BE8-994C-480415B40538}.Release|Any CPU.ActiveCfg = Release|Any CPU - {953C362C-A272-4BE8-994C-480415B40538}.Release|Any CPU.Build.0 = Release|Any CPU - {B4201442-8B20-4558-A85F-6E74587EDDB7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B4201442-8B20-4558-A85F-6E74587EDDB7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B4201442-8B20-4558-A85F-6E74587EDDB7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B4201442-8B20-4558-A85F-6E74587EDDB7}.Release|Any CPU.Build.0 = Release|Any CPU - {7E1A688C-295F-43C6-B887-FA62F1DC4632}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7E1A688C-295F-43C6-B887-FA62F1DC4632}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7E1A688C-295F-43C6-B887-FA62F1DC4632}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7E1A688C-295F-43C6-B887-FA62F1DC4632}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -220,37 +136,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {8BA6D81C-2233-48AA-A053-432B8405831A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {63A9C3F8-E9D1-4A29-ACB3-2BB0A6E63AB9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {C18080C3-8D79-4898-8EC5-24B9F66932DD} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {8B133D60-7F51-4C68-A33B-E1E1F08C0139} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {CA8E6ABB-7A77-49BA-AA72-0CDF41331232} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {EB7167ED-8045-4046-8DED-D4EC8335B6AD} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {73D20A78-ADA0-4086-90D2-D8D574D939D5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {FB706CFB-2598-43E3-A2E4-42C23BE34989} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C09D9232-A3DB-4622-9480-0E6AE278749D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {DEE24FBA-E725-4E2C-808F-9309710339F1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0272335D-1FE2-4D89-82A2-1DB7DF3DDD03} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {7EC63EDC-C371-460A-BDDD-04B4E546DA57} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {953C362C-A272-4BE8-994C-480415B40538} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B4201442-8B20-4558-A85F-6E74587EDDB7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {7E1A688C-295F-43C6-B887-FA62F1DC4632} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {EB7167ED-8045-4046-8DED-D4EC8335B6AD} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {73D20A78-ADA0-4086-90D2-D8D574D939D5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {FB706CFB-2598-43E3-A2E4-42C23BE34989} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C09D9232-A3DB-4622-9480-0E6AE278749D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {DEE24FBA-E725-4E2C-808F-9309710339F1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0272335D-1FE2-4D89-82A2-1DB7DF3DDD03} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {7EC63EDC-C371-460A-BDDD-04B4E546DA57} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {953C362C-A272-4BE8-994C-480415B40538} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B4201442-8B20-4558-A85F-6E74587EDDB7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {7E1A688C-295F-43C6-B887-FA62F1DC4632} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {CF5AD23D-E332-4B58-B82F-3051126ADD12} diff --git a/sdk/src/Services/Lambda/Properties/AssemblyInfo.cs b/sdk/src/Services/Lambda/Properties/AssemblyInfo.cs index fc616957db1a..2ec3a4665adf 100644 --- a/sdk/src/Services/Lambda/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/Lambda/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.405.1")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.408.5")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/LaunchWizard/Generated/AmazonLaunchWizardConfig.cs b/sdk/src/Services/LaunchWizard/Generated/AmazonLaunchWizardConfig.cs index 484581078de2..f17c646a1582 100644 --- a/sdk/src/Services/LaunchWizard/Generated/AmazonLaunchWizardConfig.cs +++ b/sdk/src/Services/LaunchWizard/Generated/AmazonLaunchWizardConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.LaunchWizard public partial class AmazonLaunchWizardConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("Launch Wizard", "4.0.0.0"); private static readonly AmazonLaunchWizardEndpointResolver EndpointResolver = new AmazonLaunchWizardEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("Launch Wizard", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("Launch Wizard", "3.7.400.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/LaunchWizard/LaunchWizard.sln b/sdk/src/Services/LaunchWizard/LaunchWizard.sln index 84c78c2c90f2..08d5e6e6e276 100644 --- a/sdk/src/Services/LaunchWizard/LaunchWizard.sln +++ b/sdk/src/Services/LaunchWizard/LaunchWizard.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {FD03853F-5F07-4950-A934-DB00BEE809EE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {FD03853F-5F07-4950-A934-DB00BEE809EE}.Debug|Any CPU.Build.0 = Debug|Any CPU {FD03853F-5F07-4950-A934-DB00BEE809EE}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {38C96EDC-55CA-4786-9A3B-95E6F844CE41}.Debug|Any CPU.Build.0 = Debug|Any CPU {38C96EDC-55CA-4786-9A3B-95E6F844CE41}.Release|Any CPU.ActiveCfg = Release|Any CPU {38C96EDC-55CA-4786-9A3B-95E6F844CE41}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {2CDF8BFA-35FA-4018-B7FA-EA894BD0622B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2CDF8BFA-35FA-4018-B7FA-EA894BD0622B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2CDF8BFA-35FA-4018-B7FA-EA894BD0622B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2CDF8BFA-35FA-4018-B7FA-EA894BD0622B}.Release|Any CPU.Build.0 = Release|Any CPU - {D8859EC0-604F-4DBE-866B-655FF9179A98}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D8859EC0-604F-4DBE-866B-655FF9179A98}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D8859EC0-604F-4DBE-866B-655FF9179A98}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D8859EC0-604F-4DBE-866B-655FF9179A98}.Release|Any CPU.Build.0 = Release|Any CPU - {CC51CE76-8F0E-4106-B6A4-A2748473A7DA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CC51CE76-8F0E-4106-B6A4-A2748473A7DA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CC51CE76-8F0E-4106-B6A4-A2748473A7DA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CC51CE76-8F0E-4106-B6A4-A2748473A7DA}.Release|Any CPU.Build.0 = Release|Any CPU - {E829647A-B6D1-4E73-915A-DE9A1E0BD68A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E829647A-B6D1-4E73-915A-DE9A1E0BD68A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E829647A-B6D1-4E73-915A-DE9A1E0BD68A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E829647A-B6D1-4E73-915A-DE9A1E0BD68A}.Release|Any CPU.Build.0 = Release|Any CPU - {B2123667-472B-4652-AE37-FC8754D80378}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B2123667-472B-4652-AE37-FC8754D80378}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B2123667-472B-4652-AE37-FC8754D80378}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B2123667-472B-4652-AE37-FC8754D80378}.Release|Any CPU.Build.0 = Release|Any CPU - {A19C5891-8889-462C-B7ED-2E4204383794}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A19C5891-8889-462C-B7ED-2E4204383794}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A19C5891-8889-462C-B7ED-2E4204383794}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A19C5891-8889-462C-B7ED-2E4204383794}.Release|Any CPU.Build.0 = Release|Any CPU - {A1862F65-2B6B-4AA2-BCE9-37E92ACE0736}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A1862F65-2B6B-4AA2-BCE9-37E92ACE0736}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A1862F65-2B6B-4AA2-BCE9-37E92ACE0736}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A1862F65-2B6B-4AA2-BCE9-37E92ACE0736}.Release|Any CPU.Build.0 = Release|Any CPU - {7BA21B93-55F2-4365-B492-C49AD395B0BA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7BA21B93-55F2-4365-B492-C49AD395B0BA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7BA21B93-55F2-4365-B492-C49AD395B0BA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7BA21B93-55F2-4365-B492-C49AD395B0BA}.Release|Any CPU.Build.0 = Release|Any CPU - {5D63CF97-87A8-4D53-8654-89E6A790CB10}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5D63CF97-87A8-4D53-8654-89E6A790CB10}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5D63CF97-87A8-4D53-8654-89E6A790CB10}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5D63CF97-87A8-4D53-8654-89E6A790CB10}.Release|Any CPU.Build.0 = Release|Any CPU - {ACBAC0B2-25FE-4DDE-9E63-C700A19A8297}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {ACBAC0B2-25FE-4DDE-9E63-C700A19A8297}.Debug|Any CPU.Build.0 = Debug|Any CPU - {ACBAC0B2-25FE-4DDE-9E63-C700A19A8297}.Release|Any CPU.ActiveCfg = Release|Any CPU - {ACBAC0B2-25FE-4DDE-9E63-C700A19A8297}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {2CDF8BFA-35FA-4018-B7FA-EA894BD0622B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2CDF8BFA-35FA-4018-B7FA-EA894BD0622B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2CDF8BFA-35FA-4018-B7FA-EA894BD0622B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2CDF8BFA-35FA-4018-B7FA-EA894BD0622B}.Release|Any CPU.Build.0 = Release|Any CPU - {D8859EC0-604F-4DBE-866B-655FF9179A98}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D8859EC0-604F-4DBE-866B-655FF9179A98}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D8859EC0-604F-4DBE-866B-655FF9179A98}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D8859EC0-604F-4DBE-866B-655FF9179A98}.Release|Any CPU.Build.0 = Release|Any CPU - {CC51CE76-8F0E-4106-B6A4-A2748473A7DA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CC51CE76-8F0E-4106-B6A4-A2748473A7DA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CC51CE76-8F0E-4106-B6A4-A2748473A7DA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CC51CE76-8F0E-4106-B6A4-A2748473A7DA}.Release|Any CPU.Build.0 = Release|Any CPU - {E829647A-B6D1-4E73-915A-DE9A1E0BD68A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E829647A-B6D1-4E73-915A-DE9A1E0BD68A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E829647A-B6D1-4E73-915A-DE9A1E0BD68A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E829647A-B6D1-4E73-915A-DE9A1E0BD68A}.Release|Any CPU.Build.0 = Release|Any CPU - {B2123667-472B-4652-AE37-FC8754D80378}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B2123667-472B-4652-AE37-FC8754D80378}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B2123667-472B-4652-AE37-FC8754D80378}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B2123667-472B-4652-AE37-FC8754D80378}.Release|Any CPU.Build.0 = Release|Any CPU - {A19C5891-8889-462C-B7ED-2E4204383794}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A19C5891-8889-462C-B7ED-2E4204383794}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A19C5891-8889-462C-B7ED-2E4204383794}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A19C5891-8889-462C-B7ED-2E4204383794}.Release|Any CPU.Build.0 = Release|Any CPU - {A1862F65-2B6B-4AA2-BCE9-37E92ACE0736}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A1862F65-2B6B-4AA2-BCE9-37E92ACE0736}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A1862F65-2B6B-4AA2-BCE9-37E92ACE0736}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A1862F65-2B6B-4AA2-BCE9-37E92ACE0736}.Release|Any CPU.Build.0 = Release|Any CPU - {7BA21B93-55F2-4365-B492-C49AD395B0BA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7BA21B93-55F2-4365-B492-C49AD395B0BA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7BA21B93-55F2-4365-B492-C49AD395B0BA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7BA21B93-55F2-4365-B492-C49AD395B0BA}.Release|Any CPU.Build.0 = Release|Any CPU - {5D63CF97-87A8-4D53-8654-89E6A790CB10}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5D63CF97-87A8-4D53-8654-89E6A790CB10}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5D63CF97-87A8-4D53-8654-89E6A790CB10}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5D63CF97-87A8-4D53-8654-89E6A790CB10}.Release|Any CPU.Build.0 = Release|Any CPU - {ACBAC0B2-25FE-4DDE-9E63-C700A19A8297}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {ACBAC0B2-25FE-4DDE-9E63-C700A19A8297}.Debug|Any CPU.Build.0 = Debug|Any CPU - {ACBAC0B2-25FE-4DDE-9E63-C700A19A8297}.Release|Any CPU.ActiveCfg = Release|Any CPU - {ACBAC0B2-25FE-4DDE-9E63-C700A19A8297}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {FD03853F-5F07-4950-A934-DB00BEE809EE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {BB380B5E-B4CC-446A-BC62-CA52A185CF14} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {0355369A-8533-4215-BA09-130B1F00B641} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {91ED2981-5A51-42EE-9826-FA766242B99F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {38C96EDC-55CA-4786-9A3B-95E6F844CE41} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {2CDF8BFA-35FA-4018-B7FA-EA894BD0622B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D8859EC0-604F-4DBE-866B-655FF9179A98} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {CC51CE76-8F0E-4106-B6A4-A2748473A7DA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E829647A-B6D1-4E73-915A-DE9A1E0BD68A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B2123667-472B-4652-AE37-FC8754D80378} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A19C5891-8889-462C-B7ED-2E4204383794} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A1862F65-2B6B-4AA2-BCE9-37E92ACE0736} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {7BA21B93-55F2-4365-B492-C49AD395B0BA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {5D63CF97-87A8-4D53-8654-89E6A790CB10} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {ACBAC0B2-25FE-4DDE-9E63-C700A19A8297} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {2CDF8BFA-35FA-4018-B7FA-EA894BD0622B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D8859EC0-604F-4DBE-866B-655FF9179A98} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {CC51CE76-8F0E-4106-B6A4-A2748473A7DA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E829647A-B6D1-4E73-915A-DE9A1E0BD68A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B2123667-472B-4652-AE37-FC8754D80378} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A19C5891-8889-462C-B7ED-2E4204383794} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A1862F65-2B6B-4AA2-BCE9-37E92ACE0736} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {7BA21B93-55F2-4365-B492-C49AD395B0BA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {5D63CF97-87A8-4D53-8654-89E6A790CB10} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {ACBAC0B2-25FE-4DDE-9E63-C700A19A8297} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {E04F89CC-3881-463A-942F-51BC688B8E45} diff --git a/sdk/src/Services/LaunchWizard/Properties/AssemblyInfo.cs b/sdk/src/Services/LaunchWizard/Properties/AssemblyInfo.cs index 121d98c841b7..bbfaf3f9ae53 100644 --- a/sdk/src/Services/LaunchWizard/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/LaunchWizard/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/Lex/Generated/AmazonLexConfig.cs b/sdk/src/Services/Lex/Generated/AmazonLexConfig.cs index 6598151d3e65..13965547b951 100644 --- a/sdk/src/Services/Lex/Generated/AmazonLexConfig.cs +++ b/sdk/src/Services/Lex/Generated/AmazonLexConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.Lex public partial class AmazonLexConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("Lex Runtime Service", "4.0.0.0"); private static readonly AmazonLexEndpointResolver EndpointResolver = new AmazonLexEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("Lex Runtime Service", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("Lex Runtime Service", "3.7.400.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/Lex/Lex.sln b/sdk/src/Services/Lex/Lex.sln index 0f3d333e85c6..5043585ff038 100644 --- a/sdk/src/Services/Lex/Lex.sln +++ b/sdk/src/Services/Lex/Lex.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {9EA74BAD-B94D-42F0-AFFF-FE3FF55DC547}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {9EA74BAD-B94D-42F0-AFFF-FE3FF55DC547}.Debug|Any CPU.Build.0 = Debug|Any CPU {9EA74BAD-B94D-42F0-AFFF-FE3FF55DC547}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {DEA7AAFF-B627-4B70-9DDC-862E9C343C84}.Debug|Any CPU.Build.0 = Debug|Any CPU {DEA7AAFF-B627-4B70-9DDC-862E9C343C84}.Release|Any CPU.ActiveCfg = Release|Any CPU {DEA7AAFF-B627-4B70-9DDC-862E9C343C84}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {615BD843-2D57-4660-889B-DDF0C565A9FA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {615BD843-2D57-4660-889B-DDF0C565A9FA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {615BD843-2D57-4660-889B-DDF0C565A9FA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {615BD843-2D57-4660-889B-DDF0C565A9FA}.Release|Any CPU.Build.0 = Release|Any CPU - {771A7F45-CBEF-48DC-8037-9DCC2E4D6157}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {771A7F45-CBEF-48DC-8037-9DCC2E4D6157}.Debug|Any CPU.Build.0 = Debug|Any CPU - {771A7F45-CBEF-48DC-8037-9DCC2E4D6157}.Release|Any CPU.ActiveCfg = Release|Any CPU - {771A7F45-CBEF-48DC-8037-9DCC2E4D6157}.Release|Any CPU.Build.0 = Release|Any CPU - {446F40B0-1EA9-4AD9-AD93-257B3CC16C2D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {446F40B0-1EA9-4AD9-AD93-257B3CC16C2D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {446F40B0-1EA9-4AD9-AD93-257B3CC16C2D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {446F40B0-1EA9-4AD9-AD93-257B3CC16C2D}.Release|Any CPU.Build.0 = Release|Any CPU - {2168D5F7-BD3A-464B-A825-E4D6D048B2C2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2168D5F7-BD3A-464B-A825-E4D6D048B2C2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2168D5F7-BD3A-464B-A825-E4D6D048B2C2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2168D5F7-BD3A-464B-A825-E4D6D048B2C2}.Release|Any CPU.Build.0 = Release|Any CPU - {4ADBDF53-E550-409A-BEFC-28D82AAACE5E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4ADBDF53-E550-409A-BEFC-28D82AAACE5E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4ADBDF53-E550-409A-BEFC-28D82AAACE5E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4ADBDF53-E550-409A-BEFC-28D82AAACE5E}.Release|Any CPU.Build.0 = Release|Any CPU - {7A994D64-DEEA-4464-85A4-FA9F0E09956E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7A994D64-DEEA-4464-85A4-FA9F0E09956E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7A994D64-DEEA-4464-85A4-FA9F0E09956E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7A994D64-DEEA-4464-85A4-FA9F0E09956E}.Release|Any CPU.Build.0 = Release|Any CPU - {B67BE23D-80C7-4077-8632-DB454648B4A4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B67BE23D-80C7-4077-8632-DB454648B4A4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B67BE23D-80C7-4077-8632-DB454648B4A4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B67BE23D-80C7-4077-8632-DB454648B4A4}.Release|Any CPU.Build.0 = Release|Any CPU - {D699E836-58B2-4C34-91F0-CCBEC83C485D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D699E836-58B2-4C34-91F0-CCBEC83C485D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D699E836-58B2-4C34-91F0-CCBEC83C485D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D699E836-58B2-4C34-91F0-CCBEC83C485D}.Release|Any CPU.Build.0 = Release|Any CPU - {1716C099-CCD2-4BFF-A790-5097272A9F62}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1716C099-CCD2-4BFF-A790-5097272A9F62}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1716C099-CCD2-4BFF-A790-5097272A9F62}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1716C099-CCD2-4BFF-A790-5097272A9F62}.Release|Any CPU.Build.0 = Release|Any CPU - {BC10699F-C7C5-49B8-A741-C2D0F860D102}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BC10699F-C7C5-49B8-A741-C2D0F860D102}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BC10699F-C7C5-49B8-A741-C2D0F860D102}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BC10699F-C7C5-49B8-A741-C2D0F860D102}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {615BD843-2D57-4660-889B-DDF0C565A9FA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {615BD843-2D57-4660-889B-DDF0C565A9FA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {615BD843-2D57-4660-889B-DDF0C565A9FA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {615BD843-2D57-4660-889B-DDF0C565A9FA}.Release|Any CPU.Build.0 = Release|Any CPU - {771A7F45-CBEF-48DC-8037-9DCC2E4D6157}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {771A7F45-CBEF-48DC-8037-9DCC2E4D6157}.Debug|Any CPU.Build.0 = Debug|Any CPU - {771A7F45-CBEF-48DC-8037-9DCC2E4D6157}.Release|Any CPU.ActiveCfg = Release|Any CPU - {771A7F45-CBEF-48DC-8037-9DCC2E4D6157}.Release|Any CPU.Build.0 = Release|Any CPU - {446F40B0-1EA9-4AD9-AD93-257B3CC16C2D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {446F40B0-1EA9-4AD9-AD93-257B3CC16C2D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {446F40B0-1EA9-4AD9-AD93-257B3CC16C2D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {446F40B0-1EA9-4AD9-AD93-257B3CC16C2D}.Release|Any CPU.Build.0 = Release|Any CPU - {2168D5F7-BD3A-464B-A825-E4D6D048B2C2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2168D5F7-BD3A-464B-A825-E4D6D048B2C2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2168D5F7-BD3A-464B-A825-E4D6D048B2C2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2168D5F7-BD3A-464B-A825-E4D6D048B2C2}.Release|Any CPU.Build.0 = Release|Any CPU - {4ADBDF53-E550-409A-BEFC-28D82AAACE5E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4ADBDF53-E550-409A-BEFC-28D82AAACE5E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4ADBDF53-E550-409A-BEFC-28D82AAACE5E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4ADBDF53-E550-409A-BEFC-28D82AAACE5E}.Release|Any CPU.Build.0 = Release|Any CPU - {7A994D64-DEEA-4464-85A4-FA9F0E09956E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7A994D64-DEEA-4464-85A4-FA9F0E09956E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7A994D64-DEEA-4464-85A4-FA9F0E09956E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7A994D64-DEEA-4464-85A4-FA9F0E09956E}.Release|Any CPU.Build.0 = Release|Any CPU - {B67BE23D-80C7-4077-8632-DB454648B4A4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B67BE23D-80C7-4077-8632-DB454648B4A4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B67BE23D-80C7-4077-8632-DB454648B4A4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B67BE23D-80C7-4077-8632-DB454648B4A4}.Release|Any CPU.Build.0 = Release|Any CPU - {D699E836-58B2-4C34-91F0-CCBEC83C485D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D699E836-58B2-4C34-91F0-CCBEC83C485D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D699E836-58B2-4C34-91F0-CCBEC83C485D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D699E836-58B2-4C34-91F0-CCBEC83C485D}.Release|Any CPU.Build.0 = Release|Any CPU - {1716C099-CCD2-4BFF-A790-5097272A9F62}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1716C099-CCD2-4BFF-A790-5097272A9F62}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1716C099-CCD2-4BFF-A790-5097272A9F62}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1716C099-CCD2-4BFF-A790-5097272A9F62}.Release|Any CPU.Build.0 = Release|Any CPU - {BC10699F-C7C5-49B8-A741-C2D0F860D102}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BC10699F-C7C5-49B8-A741-C2D0F860D102}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BC10699F-C7C5-49B8-A741-C2D0F860D102}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BC10699F-C7C5-49B8-A741-C2D0F860D102}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {9EA74BAD-B94D-42F0-AFFF-FE3FF55DC547} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {19652132-DF69-4AC7-B3DE-D7E9FEDDFCC9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {FA4464EC-6318-4BA3-82D8-7F47737230BB} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {900EAFC5-B38F-47E5-A13C-2E66A30B4092} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {DEA7AAFF-B627-4B70-9DDC-862E9C343C84} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {615BD843-2D57-4660-889B-DDF0C565A9FA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {771A7F45-CBEF-48DC-8037-9DCC2E4D6157} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {446F40B0-1EA9-4AD9-AD93-257B3CC16C2D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {2168D5F7-BD3A-464B-A825-E4D6D048B2C2} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4ADBDF53-E550-409A-BEFC-28D82AAACE5E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {7A994D64-DEEA-4464-85A4-FA9F0E09956E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B67BE23D-80C7-4077-8632-DB454648B4A4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D699E836-58B2-4C34-91F0-CCBEC83C485D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {1716C099-CCD2-4BFF-A790-5097272A9F62} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {BC10699F-C7C5-49B8-A741-C2D0F860D102} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {615BD843-2D57-4660-889B-DDF0C565A9FA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {771A7F45-CBEF-48DC-8037-9DCC2E4D6157} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {446F40B0-1EA9-4AD9-AD93-257B3CC16C2D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {2168D5F7-BD3A-464B-A825-E4D6D048B2C2} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4ADBDF53-E550-409A-BEFC-28D82AAACE5E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {7A994D64-DEEA-4464-85A4-FA9F0E09956E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B67BE23D-80C7-4077-8632-DB454648B4A4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D699E836-58B2-4C34-91F0-CCBEC83C485D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {1716C099-CCD2-4BFF-A790-5097272A9F62} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {BC10699F-C7C5-49B8-A741-C2D0F860D102} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {4A76042A-6259-4FDF-BBF8-84E37508D368} diff --git a/sdk/src/Services/Lex/Properties/AssemblyInfo.cs b/sdk/src/Services/Lex/Properties/AssemblyInfo.cs index 0ef5dee276e8..92b9b6f6db8e 100644 --- a/sdk/src/Services/Lex/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/Lex/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/LexModelBuildingService/Generated/AmazonLexModelBuildingServiceConfig.cs b/sdk/src/Services/LexModelBuildingService/Generated/AmazonLexModelBuildingServiceConfig.cs index e7ceab00ca35..26e3a5180f5f 100644 --- a/sdk/src/Services/LexModelBuildingService/Generated/AmazonLexModelBuildingServiceConfig.cs +++ b/sdk/src/Services/LexModelBuildingService/Generated/AmazonLexModelBuildingServiceConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.LexModelBuildingService public partial class AmazonLexModelBuildingServiceConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("Lex Model Building Service", "4.0.0.0"); private static readonly AmazonLexModelBuildingServiceEndpointResolver EndpointResolver = new AmazonLexModelBuildingServiceEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("Lex Model Building Service", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("Lex Model Building Service", "3.7.400.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/LexModelBuildingService/LexModelBuildingService.sln b/sdk/src/Services/LexModelBuildingService/LexModelBuildingService.sln index 66ac2ad3004e..e9960ea679bd 100644 --- a/sdk/src/Services/LexModelBuildingService/LexModelBuildingService.sln +++ b/sdk/src/Services/LexModelBuildingService/LexModelBuildingService.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {A1D3B808-673D-4600-9BBF-EF656AABDD78}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {A1D3B808-673D-4600-9BBF-EF656AABDD78}.Debug|Any CPU.Build.0 = Debug|Any CPU {A1D3B808-673D-4600-9BBF-EF656AABDD78}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {BE8DB50B-720B-4625-ACC2-0E9E8AC9CBB9}.Debug|Any CPU.Build.0 = Debug|Any CPU {BE8DB50B-720B-4625-ACC2-0E9E8AC9CBB9}.Release|Any CPU.ActiveCfg = Release|Any CPU {BE8DB50B-720B-4625-ACC2-0E9E8AC9CBB9}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {316DC20E-4A80-4541-B096-5BF02B832242}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {316DC20E-4A80-4541-B096-5BF02B832242}.Debug|Any CPU.Build.0 = Debug|Any CPU - {316DC20E-4A80-4541-B096-5BF02B832242}.Release|Any CPU.ActiveCfg = Release|Any CPU - {316DC20E-4A80-4541-B096-5BF02B832242}.Release|Any CPU.Build.0 = Release|Any CPU - {997FAC6B-CA2E-4CBA-8520-6AB31D05CAD8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {997FAC6B-CA2E-4CBA-8520-6AB31D05CAD8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {997FAC6B-CA2E-4CBA-8520-6AB31D05CAD8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {997FAC6B-CA2E-4CBA-8520-6AB31D05CAD8}.Release|Any CPU.Build.0 = Release|Any CPU - {9B26ABE3-E64B-4BBE-986B-10D8E1B583D6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9B26ABE3-E64B-4BBE-986B-10D8E1B583D6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9B26ABE3-E64B-4BBE-986B-10D8E1B583D6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9B26ABE3-E64B-4BBE-986B-10D8E1B583D6}.Release|Any CPU.Build.0 = Release|Any CPU - {D9F349A7-4EA0-474C-9CFC-F1E3B59F524F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D9F349A7-4EA0-474C-9CFC-F1E3B59F524F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D9F349A7-4EA0-474C-9CFC-F1E3B59F524F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D9F349A7-4EA0-474C-9CFC-F1E3B59F524F}.Release|Any CPU.Build.0 = Release|Any CPU - {8699839A-9A5F-4541-AD9B-156A1426BCCA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8699839A-9A5F-4541-AD9B-156A1426BCCA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8699839A-9A5F-4541-AD9B-156A1426BCCA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8699839A-9A5F-4541-AD9B-156A1426BCCA}.Release|Any CPU.Build.0 = Release|Any CPU - {C3E164B2-45C5-47FC-B38B-FB1250C634D0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C3E164B2-45C5-47FC-B38B-FB1250C634D0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C3E164B2-45C5-47FC-B38B-FB1250C634D0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C3E164B2-45C5-47FC-B38B-FB1250C634D0}.Release|Any CPU.Build.0 = Release|Any CPU - {E902C9DE-492D-4EAB-BE0E-B6D55DC48D04}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E902C9DE-492D-4EAB-BE0E-B6D55DC48D04}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E902C9DE-492D-4EAB-BE0E-B6D55DC48D04}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E902C9DE-492D-4EAB-BE0E-B6D55DC48D04}.Release|Any CPU.Build.0 = Release|Any CPU - {6E2667DE-F398-4118-9C5A-A269BF1E8C09}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6E2667DE-F398-4118-9C5A-A269BF1E8C09}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6E2667DE-F398-4118-9C5A-A269BF1E8C09}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6E2667DE-F398-4118-9C5A-A269BF1E8C09}.Release|Any CPU.Build.0 = Release|Any CPU - {5FA0ACAD-54DF-434D-A004-12DB94CA92AB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5FA0ACAD-54DF-434D-A004-12DB94CA92AB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5FA0ACAD-54DF-434D-A004-12DB94CA92AB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5FA0ACAD-54DF-434D-A004-12DB94CA92AB}.Release|Any CPU.Build.0 = Release|Any CPU - {3F0A1AF9-7CAB-43BD-81C2-758C470093D4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3F0A1AF9-7CAB-43BD-81C2-758C470093D4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3F0A1AF9-7CAB-43BD-81C2-758C470093D4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3F0A1AF9-7CAB-43BD-81C2-758C470093D4}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {316DC20E-4A80-4541-B096-5BF02B832242}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {316DC20E-4A80-4541-B096-5BF02B832242}.Debug|Any CPU.Build.0 = Debug|Any CPU - {316DC20E-4A80-4541-B096-5BF02B832242}.Release|Any CPU.ActiveCfg = Release|Any CPU - {316DC20E-4A80-4541-B096-5BF02B832242}.Release|Any CPU.Build.0 = Release|Any CPU - {997FAC6B-CA2E-4CBA-8520-6AB31D05CAD8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {997FAC6B-CA2E-4CBA-8520-6AB31D05CAD8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {997FAC6B-CA2E-4CBA-8520-6AB31D05CAD8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {997FAC6B-CA2E-4CBA-8520-6AB31D05CAD8}.Release|Any CPU.Build.0 = Release|Any CPU - {9B26ABE3-E64B-4BBE-986B-10D8E1B583D6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9B26ABE3-E64B-4BBE-986B-10D8E1B583D6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9B26ABE3-E64B-4BBE-986B-10D8E1B583D6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9B26ABE3-E64B-4BBE-986B-10D8E1B583D6}.Release|Any CPU.Build.0 = Release|Any CPU - {D9F349A7-4EA0-474C-9CFC-F1E3B59F524F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D9F349A7-4EA0-474C-9CFC-F1E3B59F524F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D9F349A7-4EA0-474C-9CFC-F1E3B59F524F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D9F349A7-4EA0-474C-9CFC-F1E3B59F524F}.Release|Any CPU.Build.0 = Release|Any CPU - {8699839A-9A5F-4541-AD9B-156A1426BCCA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8699839A-9A5F-4541-AD9B-156A1426BCCA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8699839A-9A5F-4541-AD9B-156A1426BCCA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8699839A-9A5F-4541-AD9B-156A1426BCCA}.Release|Any CPU.Build.0 = Release|Any CPU - {C3E164B2-45C5-47FC-B38B-FB1250C634D0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C3E164B2-45C5-47FC-B38B-FB1250C634D0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C3E164B2-45C5-47FC-B38B-FB1250C634D0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C3E164B2-45C5-47FC-B38B-FB1250C634D0}.Release|Any CPU.Build.0 = Release|Any CPU - {E902C9DE-492D-4EAB-BE0E-B6D55DC48D04}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E902C9DE-492D-4EAB-BE0E-B6D55DC48D04}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E902C9DE-492D-4EAB-BE0E-B6D55DC48D04}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E902C9DE-492D-4EAB-BE0E-B6D55DC48D04}.Release|Any CPU.Build.0 = Release|Any CPU - {6E2667DE-F398-4118-9C5A-A269BF1E8C09}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6E2667DE-F398-4118-9C5A-A269BF1E8C09}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6E2667DE-F398-4118-9C5A-A269BF1E8C09}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6E2667DE-F398-4118-9C5A-A269BF1E8C09}.Release|Any CPU.Build.0 = Release|Any CPU - {5FA0ACAD-54DF-434D-A004-12DB94CA92AB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5FA0ACAD-54DF-434D-A004-12DB94CA92AB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5FA0ACAD-54DF-434D-A004-12DB94CA92AB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5FA0ACAD-54DF-434D-A004-12DB94CA92AB}.Release|Any CPU.Build.0 = Release|Any CPU - {3F0A1AF9-7CAB-43BD-81C2-758C470093D4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3F0A1AF9-7CAB-43BD-81C2-758C470093D4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3F0A1AF9-7CAB-43BD-81C2-758C470093D4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3F0A1AF9-7CAB-43BD-81C2-758C470093D4}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {A1D3B808-673D-4600-9BBF-EF656AABDD78} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {0A6B0BA0-3A95-411F-AE50-02C09D567A6E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {CE8287C5-939F-4EF4-90F9-FDB3A983DA0E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {7C0BB4FE-F7DA-41CB-A254-B7FF63C4C12F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {BE8DB50B-720B-4625-ACC2-0E9E8AC9CBB9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {316DC20E-4A80-4541-B096-5BF02B832242} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {997FAC6B-CA2E-4CBA-8520-6AB31D05CAD8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {9B26ABE3-E64B-4BBE-986B-10D8E1B583D6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D9F349A7-4EA0-474C-9CFC-F1E3B59F524F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8699839A-9A5F-4541-AD9B-156A1426BCCA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C3E164B2-45C5-47FC-B38B-FB1250C634D0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E902C9DE-492D-4EAB-BE0E-B6D55DC48D04} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6E2667DE-F398-4118-9C5A-A269BF1E8C09} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {5FA0ACAD-54DF-434D-A004-12DB94CA92AB} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {3F0A1AF9-7CAB-43BD-81C2-758C470093D4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {316DC20E-4A80-4541-B096-5BF02B832242} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {997FAC6B-CA2E-4CBA-8520-6AB31D05CAD8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {9B26ABE3-E64B-4BBE-986B-10D8E1B583D6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D9F349A7-4EA0-474C-9CFC-F1E3B59F524F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8699839A-9A5F-4541-AD9B-156A1426BCCA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C3E164B2-45C5-47FC-B38B-FB1250C634D0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E902C9DE-492D-4EAB-BE0E-B6D55DC48D04} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6E2667DE-F398-4118-9C5A-A269BF1E8C09} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {5FA0ACAD-54DF-434D-A004-12DB94CA92AB} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {3F0A1AF9-7CAB-43BD-81C2-758C470093D4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {4724DA52-2EB6-47D2-9C92-36A24101C829} diff --git a/sdk/src/Services/LexModelBuildingService/Properties/AssemblyInfo.cs b/sdk/src/Services/LexModelBuildingService/Properties/AssemblyInfo.cs index 0b0a3e876469..ed7f7a8efa48 100644 --- a/sdk/src/Services/LexModelBuildingService/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/LexModelBuildingService/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/LexModelsV2/Generated/AmazonLexModelsV2Config.cs b/sdk/src/Services/LexModelsV2/Generated/AmazonLexModelsV2Config.cs index 7bdb2d40fd93..06f4d9d289d6 100644 --- a/sdk/src/Services/LexModelsV2/Generated/AmazonLexModelsV2Config.cs +++ b/sdk/src/Services/LexModelsV2/Generated/AmazonLexModelsV2Config.cs @@ -34,16 +34,10 @@ namespace Amazon.LexModelsV2 public partial class AmazonLexModelsV2Config : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("Lex Models V2", "4.0.0.0"); private static readonly AmazonLexModelsV2EndpointResolver EndpointResolver = new AmazonLexModelsV2EndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("Lex Models V2", "3.7.402.7"); -======= - InternalSDKUtils.BuildUserAgentString("Lex Models V2", "3.7.402.34"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/LexModelsV2/LexModelsV2.sln b/sdk/src/Services/LexModelsV2/LexModelsV2.sln index 9e25e9cc84fb..50a2509665cb 100644 --- a/sdk/src/Services/LexModelsV2/LexModelsV2.sln +++ b/sdk/src/Services/LexModelsV2/LexModelsV2.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {31B2DEE3-62F6-4D82-B154-5F2EA5443CDF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {31B2DEE3-62F6-4D82-B154-5F2EA5443CDF}.Debug|Any CPU.Build.0 = Debug|Any CPU {31B2DEE3-62F6-4D82-B154-5F2EA5443CDF}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {D8BFA37A-CAF3-4F00-B4FA-015FF1CC106A}.Debug|Any CPU.Build.0 = Debug|Any CPU {D8BFA37A-CAF3-4F00-B4FA-015FF1CC106A}.Release|Any CPU.ActiveCfg = Release|Any CPU {D8BFA37A-CAF3-4F00-B4FA-015FF1CC106A}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {88D23CAC-0F80-4C4D-BE92-D05058B7CF95}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {88D23CAC-0F80-4C4D-BE92-D05058B7CF95}.Debug|Any CPU.Build.0 = Debug|Any CPU - {88D23CAC-0F80-4C4D-BE92-D05058B7CF95}.Release|Any CPU.ActiveCfg = Release|Any CPU - {88D23CAC-0F80-4C4D-BE92-D05058B7CF95}.Release|Any CPU.Build.0 = Release|Any CPU - {5943E22B-FE0B-453F-AA23-23CF7AF41235}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5943E22B-FE0B-453F-AA23-23CF7AF41235}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5943E22B-FE0B-453F-AA23-23CF7AF41235}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5943E22B-FE0B-453F-AA23-23CF7AF41235}.Release|Any CPU.Build.0 = Release|Any CPU - {DD4DDB21-937C-478A-B2A1-EFBFED9B8978}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DD4DDB21-937C-478A-B2A1-EFBFED9B8978}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DD4DDB21-937C-478A-B2A1-EFBFED9B8978}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DD4DDB21-937C-478A-B2A1-EFBFED9B8978}.Release|Any CPU.Build.0 = Release|Any CPU - {3963257A-F599-4AFC-A2B1-9BBE88A73D56}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3963257A-F599-4AFC-A2B1-9BBE88A73D56}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3963257A-F599-4AFC-A2B1-9BBE88A73D56}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3963257A-F599-4AFC-A2B1-9BBE88A73D56}.Release|Any CPU.Build.0 = Release|Any CPU - {2E515ACF-AAF8-48D4-A730-FBD724B11C25}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2E515ACF-AAF8-48D4-A730-FBD724B11C25}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2E515ACF-AAF8-48D4-A730-FBD724B11C25}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2E515ACF-AAF8-48D4-A730-FBD724B11C25}.Release|Any CPU.Build.0 = Release|Any CPU - {6DD76EA5-2988-499F-A6B3-F9737101AB89}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6DD76EA5-2988-499F-A6B3-F9737101AB89}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6DD76EA5-2988-499F-A6B3-F9737101AB89}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6DD76EA5-2988-499F-A6B3-F9737101AB89}.Release|Any CPU.Build.0 = Release|Any CPU - {3EA204B8-CA09-435D-ACAB-70CA6D39A122}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3EA204B8-CA09-435D-ACAB-70CA6D39A122}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3EA204B8-CA09-435D-ACAB-70CA6D39A122}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3EA204B8-CA09-435D-ACAB-70CA6D39A122}.Release|Any CPU.Build.0 = Release|Any CPU - {91B1056A-655D-429E-9E92-39BD406496EF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {91B1056A-655D-429E-9E92-39BD406496EF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {91B1056A-655D-429E-9E92-39BD406496EF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {91B1056A-655D-429E-9E92-39BD406496EF}.Release|Any CPU.Build.0 = Release|Any CPU - {DB1C5311-E012-4BA4-BF99-207E920A691B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DB1C5311-E012-4BA4-BF99-207E920A691B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DB1C5311-E012-4BA4-BF99-207E920A691B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DB1C5311-E012-4BA4-BF99-207E920A691B}.Release|Any CPU.Build.0 = Release|Any CPU - {C9DA876B-323B-45C9-BF94-254D6D5FF3AC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C9DA876B-323B-45C9-BF94-254D6D5FF3AC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C9DA876B-323B-45C9-BF94-254D6D5FF3AC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C9DA876B-323B-45C9-BF94-254D6D5FF3AC}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {88D23CAC-0F80-4C4D-BE92-D05058B7CF95}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {88D23CAC-0F80-4C4D-BE92-D05058B7CF95}.Debug|Any CPU.Build.0 = Debug|Any CPU - {88D23CAC-0F80-4C4D-BE92-D05058B7CF95}.Release|Any CPU.ActiveCfg = Release|Any CPU - {88D23CAC-0F80-4C4D-BE92-D05058B7CF95}.Release|Any CPU.Build.0 = Release|Any CPU - {5943E22B-FE0B-453F-AA23-23CF7AF41235}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5943E22B-FE0B-453F-AA23-23CF7AF41235}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5943E22B-FE0B-453F-AA23-23CF7AF41235}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5943E22B-FE0B-453F-AA23-23CF7AF41235}.Release|Any CPU.Build.0 = Release|Any CPU - {DD4DDB21-937C-478A-B2A1-EFBFED9B8978}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DD4DDB21-937C-478A-B2A1-EFBFED9B8978}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DD4DDB21-937C-478A-B2A1-EFBFED9B8978}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DD4DDB21-937C-478A-B2A1-EFBFED9B8978}.Release|Any CPU.Build.0 = Release|Any CPU - {3963257A-F599-4AFC-A2B1-9BBE88A73D56}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3963257A-F599-4AFC-A2B1-9BBE88A73D56}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3963257A-F599-4AFC-A2B1-9BBE88A73D56}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3963257A-F599-4AFC-A2B1-9BBE88A73D56}.Release|Any CPU.Build.0 = Release|Any CPU - {2E515ACF-AAF8-48D4-A730-FBD724B11C25}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2E515ACF-AAF8-48D4-A730-FBD724B11C25}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2E515ACF-AAF8-48D4-A730-FBD724B11C25}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2E515ACF-AAF8-48D4-A730-FBD724B11C25}.Release|Any CPU.Build.0 = Release|Any CPU - {6DD76EA5-2988-499F-A6B3-F9737101AB89}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6DD76EA5-2988-499F-A6B3-F9737101AB89}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6DD76EA5-2988-499F-A6B3-F9737101AB89}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6DD76EA5-2988-499F-A6B3-F9737101AB89}.Release|Any CPU.Build.0 = Release|Any CPU - {3EA204B8-CA09-435D-ACAB-70CA6D39A122}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3EA204B8-CA09-435D-ACAB-70CA6D39A122}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3EA204B8-CA09-435D-ACAB-70CA6D39A122}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3EA204B8-CA09-435D-ACAB-70CA6D39A122}.Release|Any CPU.Build.0 = Release|Any CPU - {91B1056A-655D-429E-9E92-39BD406496EF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {91B1056A-655D-429E-9E92-39BD406496EF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {91B1056A-655D-429E-9E92-39BD406496EF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {91B1056A-655D-429E-9E92-39BD406496EF}.Release|Any CPU.Build.0 = Release|Any CPU - {DB1C5311-E012-4BA4-BF99-207E920A691B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DB1C5311-E012-4BA4-BF99-207E920A691B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DB1C5311-E012-4BA4-BF99-207E920A691B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DB1C5311-E012-4BA4-BF99-207E920A691B}.Release|Any CPU.Build.0 = Release|Any CPU - {C9DA876B-323B-45C9-BF94-254D6D5FF3AC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C9DA876B-323B-45C9-BF94-254D6D5FF3AC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C9DA876B-323B-45C9-BF94-254D6D5FF3AC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C9DA876B-323B-45C9-BF94-254D6D5FF3AC}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {31B2DEE3-62F6-4D82-B154-5F2EA5443CDF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {3C91665D-E8D6-4F89-9CA0-E48A320ED9B2} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {7A224A21-7750-48FD-8E5A-476EF3A0E646} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {31875273-5458-4582-A0B5-FB15FC148795} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {D8BFA37A-CAF3-4F00-B4FA-015FF1CC106A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {88D23CAC-0F80-4C4D-BE92-D05058B7CF95} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {5943E22B-FE0B-453F-AA23-23CF7AF41235} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {DD4DDB21-937C-478A-B2A1-EFBFED9B8978} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {3963257A-F599-4AFC-A2B1-9BBE88A73D56} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {2E515ACF-AAF8-48D4-A730-FBD724B11C25} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6DD76EA5-2988-499F-A6B3-F9737101AB89} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {3EA204B8-CA09-435D-ACAB-70CA6D39A122} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {91B1056A-655D-429E-9E92-39BD406496EF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {DB1C5311-E012-4BA4-BF99-207E920A691B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C9DA876B-323B-45C9-BF94-254D6D5FF3AC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {88D23CAC-0F80-4C4D-BE92-D05058B7CF95} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {5943E22B-FE0B-453F-AA23-23CF7AF41235} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {DD4DDB21-937C-478A-B2A1-EFBFED9B8978} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {3963257A-F599-4AFC-A2B1-9BBE88A73D56} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {2E515ACF-AAF8-48D4-A730-FBD724B11C25} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6DD76EA5-2988-499F-A6B3-F9737101AB89} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {3EA204B8-CA09-435D-ACAB-70CA6D39A122} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {91B1056A-655D-429E-9E92-39BD406496EF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {DB1C5311-E012-4BA4-BF99-207E920A691B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C9DA876B-323B-45C9-BF94-254D6D5FF3AC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {03D3A6EC-4428-4748-9FA7-A8FBCD6BD8F0} diff --git a/sdk/src/Services/LexModelsV2/Properties/AssemblyInfo.cs b/sdk/src/Services/LexModelsV2/Properties/AssemblyInfo.cs index 852c57ee83cf..0522da8b99af 100644 --- a/sdk/src/Services/LexModelsV2/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/LexModelsV2/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.402.7")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.402.34")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/LexRuntimeV2/Generated/AmazonLexRuntimeV2Config.cs b/sdk/src/Services/LexRuntimeV2/Generated/AmazonLexRuntimeV2Config.cs index 93a373359201..e3ff3a6b94b8 100644 --- a/sdk/src/Services/LexRuntimeV2/Generated/AmazonLexRuntimeV2Config.cs +++ b/sdk/src/Services/LexRuntimeV2/Generated/AmazonLexRuntimeV2Config.cs @@ -34,16 +34,10 @@ namespace Amazon.LexRuntimeV2 public partial class AmazonLexRuntimeV2Config : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("Lex Runtime V2", "4.0.0.0"); private static readonly AmazonLexRuntimeV2EndpointResolver EndpointResolver = new AmazonLexRuntimeV2EndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("Lex Runtime V2", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("Lex Runtime V2", "3.7.400.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/LexRuntimeV2/LexRuntimeV2.sln b/sdk/src/Services/LexRuntimeV2/LexRuntimeV2.sln index 7bf20adc1f1b..cb2c704ac7e1 100644 --- a/sdk/src/Services/LexRuntimeV2/LexRuntimeV2.sln +++ b/sdk/src/Services/LexRuntimeV2/LexRuntimeV2.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {42B7588E-9742-4739-AA4E-33ECBBA20D8A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {42B7588E-9742-4739-AA4E-33ECBBA20D8A}.Debug|Any CPU.Build.0 = Debug|Any CPU {42B7588E-9742-4739-AA4E-33ECBBA20D8A}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {B94048E8-15AA-4943-81BE-F783981AC276}.Debug|Any CPU.Build.0 = Debug|Any CPU {B94048E8-15AA-4943-81BE-F783981AC276}.Release|Any CPU.ActiveCfg = Release|Any CPU {B94048E8-15AA-4943-81BE-F783981AC276}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {3455438A-226F-40F7-BE67-47194F4CD91E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3455438A-226F-40F7-BE67-47194F4CD91E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3455438A-226F-40F7-BE67-47194F4CD91E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3455438A-226F-40F7-BE67-47194F4CD91E}.Release|Any CPU.Build.0 = Release|Any CPU - {DD3A36B9-E061-42A6-B473-4A5F54F5A0A0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DD3A36B9-E061-42A6-B473-4A5F54F5A0A0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DD3A36B9-E061-42A6-B473-4A5F54F5A0A0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DD3A36B9-E061-42A6-B473-4A5F54F5A0A0}.Release|Any CPU.Build.0 = Release|Any CPU - {1344D486-D9B5-4858-A97D-41146977A722}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1344D486-D9B5-4858-A97D-41146977A722}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1344D486-D9B5-4858-A97D-41146977A722}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1344D486-D9B5-4858-A97D-41146977A722}.Release|Any CPU.Build.0 = Release|Any CPU - {40162E62-4CCF-413E-8972-FCDC9851FC61}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {40162E62-4CCF-413E-8972-FCDC9851FC61}.Debug|Any CPU.Build.0 = Debug|Any CPU - {40162E62-4CCF-413E-8972-FCDC9851FC61}.Release|Any CPU.ActiveCfg = Release|Any CPU - {40162E62-4CCF-413E-8972-FCDC9851FC61}.Release|Any CPU.Build.0 = Release|Any CPU - {D121D7EC-0186-43D7-A916-050A5D5AFE00}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D121D7EC-0186-43D7-A916-050A5D5AFE00}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D121D7EC-0186-43D7-A916-050A5D5AFE00}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D121D7EC-0186-43D7-A916-050A5D5AFE00}.Release|Any CPU.Build.0 = Release|Any CPU - {F0EA50DE-8A62-4916-9B85-DE7514181095}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F0EA50DE-8A62-4916-9B85-DE7514181095}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F0EA50DE-8A62-4916-9B85-DE7514181095}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F0EA50DE-8A62-4916-9B85-DE7514181095}.Release|Any CPU.Build.0 = Release|Any CPU - {9C35DEC3-8A13-4AD7-9025-02D04806D3C4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9C35DEC3-8A13-4AD7-9025-02D04806D3C4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9C35DEC3-8A13-4AD7-9025-02D04806D3C4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9C35DEC3-8A13-4AD7-9025-02D04806D3C4}.Release|Any CPU.Build.0 = Release|Any CPU - {EFA95F4D-956D-43E6-BFA2-FF102DF350FB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EFA95F4D-956D-43E6-BFA2-FF102DF350FB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EFA95F4D-956D-43E6-BFA2-FF102DF350FB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EFA95F4D-956D-43E6-BFA2-FF102DF350FB}.Release|Any CPU.Build.0 = Release|Any CPU - {71D8CE34-7D8E-4B92-BF7C-A67DFDE44D2B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {71D8CE34-7D8E-4B92-BF7C-A67DFDE44D2B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {71D8CE34-7D8E-4B92-BF7C-A67DFDE44D2B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {71D8CE34-7D8E-4B92-BF7C-A67DFDE44D2B}.Release|Any CPU.Build.0 = Release|Any CPU - {7BA2577C-AE9F-406B-A2F1-F98138F7C72A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7BA2577C-AE9F-406B-A2F1-F98138F7C72A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7BA2577C-AE9F-406B-A2F1-F98138F7C72A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7BA2577C-AE9F-406B-A2F1-F98138F7C72A}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {3455438A-226F-40F7-BE67-47194F4CD91E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3455438A-226F-40F7-BE67-47194F4CD91E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3455438A-226F-40F7-BE67-47194F4CD91E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3455438A-226F-40F7-BE67-47194F4CD91E}.Release|Any CPU.Build.0 = Release|Any CPU - {DD3A36B9-E061-42A6-B473-4A5F54F5A0A0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DD3A36B9-E061-42A6-B473-4A5F54F5A0A0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DD3A36B9-E061-42A6-B473-4A5F54F5A0A0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DD3A36B9-E061-42A6-B473-4A5F54F5A0A0}.Release|Any CPU.Build.0 = Release|Any CPU - {1344D486-D9B5-4858-A97D-41146977A722}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1344D486-D9B5-4858-A97D-41146977A722}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1344D486-D9B5-4858-A97D-41146977A722}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1344D486-D9B5-4858-A97D-41146977A722}.Release|Any CPU.Build.0 = Release|Any CPU - {40162E62-4CCF-413E-8972-FCDC9851FC61}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {40162E62-4CCF-413E-8972-FCDC9851FC61}.Debug|Any CPU.Build.0 = Debug|Any CPU - {40162E62-4CCF-413E-8972-FCDC9851FC61}.Release|Any CPU.ActiveCfg = Release|Any CPU - {40162E62-4CCF-413E-8972-FCDC9851FC61}.Release|Any CPU.Build.0 = Release|Any CPU - {D121D7EC-0186-43D7-A916-050A5D5AFE00}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D121D7EC-0186-43D7-A916-050A5D5AFE00}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D121D7EC-0186-43D7-A916-050A5D5AFE00}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D121D7EC-0186-43D7-A916-050A5D5AFE00}.Release|Any CPU.Build.0 = Release|Any CPU - {F0EA50DE-8A62-4916-9B85-DE7514181095}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F0EA50DE-8A62-4916-9B85-DE7514181095}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F0EA50DE-8A62-4916-9B85-DE7514181095}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F0EA50DE-8A62-4916-9B85-DE7514181095}.Release|Any CPU.Build.0 = Release|Any CPU - {9C35DEC3-8A13-4AD7-9025-02D04806D3C4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9C35DEC3-8A13-4AD7-9025-02D04806D3C4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9C35DEC3-8A13-4AD7-9025-02D04806D3C4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9C35DEC3-8A13-4AD7-9025-02D04806D3C4}.Release|Any CPU.Build.0 = Release|Any CPU - {EFA95F4D-956D-43E6-BFA2-FF102DF350FB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EFA95F4D-956D-43E6-BFA2-FF102DF350FB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EFA95F4D-956D-43E6-BFA2-FF102DF350FB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EFA95F4D-956D-43E6-BFA2-FF102DF350FB}.Release|Any CPU.Build.0 = Release|Any CPU - {71D8CE34-7D8E-4B92-BF7C-A67DFDE44D2B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {71D8CE34-7D8E-4B92-BF7C-A67DFDE44D2B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {71D8CE34-7D8E-4B92-BF7C-A67DFDE44D2B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {71D8CE34-7D8E-4B92-BF7C-A67DFDE44D2B}.Release|Any CPU.Build.0 = Release|Any CPU - {7BA2577C-AE9F-406B-A2F1-F98138F7C72A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7BA2577C-AE9F-406B-A2F1-F98138F7C72A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7BA2577C-AE9F-406B-A2F1-F98138F7C72A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7BA2577C-AE9F-406B-A2F1-F98138F7C72A}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {42B7588E-9742-4739-AA4E-33ECBBA20D8A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {06418FE6-ABFB-4DAE-8986-8E386B0AC7E9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {62F8131E-490D-4849-9AF9-4606C35B4812} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {89EA3430-CE0C-4248-A861-A08F39B9E98C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {B94048E8-15AA-4943-81BE-F783981AC276} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {3455438A-226F-40F7-BE67-47194F4CD91E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {DD3A36B9-E061-42A6-B473-4A5F54F5A0A0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {1344D486-D9B5-4858-A97D-41146977A722} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {40162E62-4CCF-413E-8972-FCDC9851FC61} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D121D7EC-0186-43D7-A916-050A5D5AFE00} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F0EA50DE-8A62-4916-9B85-DE7514181095} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {9C35DEC3-8A13-4AD7-9025-02D04806D3C4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {EFA95F4D-956D-43E6-BFA2-FF102DF350FB} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {71D8CE34-7D8E-4B92-BF7C-A67DFDE44D2B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {7BA2577C-AE9F-406B-A2F1-F98138F7C72A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {3455438A-226F-40F7-BE67-47194F4CD91E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {DD3A36B9-E061-42A6-B473-4A5F54F5A0A0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {1344D486-D9B5-4858-A97D-41146977A722} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {40162E62-4CCF-413E-8972-FCDC9851FC61} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D121D7EC-0186-43D7-A916-050A5D5AFE00} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F0EA50DE-8A62-4916-9B85-DE7514181095} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {9C35DEC3-8A13-4AD7-9025-02D04806D3C4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {EFA95F4D-956D-43E6-BFA2-FF102DF350FB} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {71D8CE34-7D8E-4B92-BF7C-A67DFDE44D2B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {7BA2577C-AE9F-406B-A2F1-F98138F7C72A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {9C3E7DBF-8BC2-4B28-BFE3-CB5C49A51AAB} diff --git a/sdk/src/Services/LexRuntimeV2/Properties/AssemblyInfo.cs b/sdk/src/Services/LexRuntimeV2/Properties/AssemblyInfo.cs index 6038ecafba1f..6e548a1e3762 100644 --- a/sdk/src/Services/LexRuntimeV2/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/LexRuntimeV2/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/LicenseManager/Generated/AmazonLicenseManagerConfig.cs b/sdk/src/Services/LicenseManager/Generated/AmazonLicenseManagerConfig.cs index 22f21ff0a24d..d5a8fd8b21db 100644 --- a/sdk/src/Services/LicenseManager/Generated/AmazonLicenseManagerConfig.cs +++ b/sdk/src/Services/LicenseManager/Generated/AmazonLicenseManagerConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.LicenseManager public partial class AmazonLicenseManagerConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("License Manager", "4.0.0.0"); private static readonly AmazonLicenseManagerEndpointResolver EndpointResolver = new AmazonLicenseManagerEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("License Manager", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("License Manager", "3.7.400.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/LicenseManager/LicenseManager.sln b/sdk/src/Services/LicenseManager/LicenseManager.sln index a057d288d51f..025cd50d0796 100644 --- a/sdk/src/Services/LicenseManager/LicenseManager.sln +++ b/sdk/src/Services/LicenseManager/LicenseManager.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {B9632420-E0CC-412E-8A82-5541191E1CFC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {B9632420-E0CC-412E-8A82-5541191E1CFC}.Debug|Any CPU.Build.0 = Debug|Any CPU {B9632420-E0CC-412E-8A82-5541191E1CFC}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {A6F087FD-8213-43A9-8CF9-4C4F0BDD3497}.Debug|Any CPU.Build.0 = Debug|Any CPU {A6F087FD-8213-43A9-8CF9-4C4F0BDD3497}.Release|Any CPU.ActiveCfg = Release|Any CPU {A6F087FD-8213-43A9-8CF9-4C4F0BDD3497}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {7BC5AEA6-6E30-431A-A691-5A4813FBA27E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7BC5AEA6-6E30-431A-A691-5A4813FBA27E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7BC5AEA6-6E30-431A-A691-5A4813FBA27E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7BC5AEA6-6E30-431A-A691-5A4813FBA27E}.Release|Any CPU.Build.0 = Release|Any CPU - {65CFA473-B9B0-449D-AED0-A9CD82B52710}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {65CFA473-B9B0-449D-AED0-A9CD82B52710}.Debug|Any CPU.Build.0 = Debug|Any CPU - {65CFA473-B9B0-449D-AED0-A9CD82B52710}.Release|Any CPU.ActiveCfg = Release|Any CPU - {65CFA473-B9B0-449D-AED0-A9CD82B52710}.Release|Any CPU.Build.0 = Release|Any CPU - {E7BC0F18-9567-45F8-9527-A1A09CBB1DFE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E7BC0F18-9567-45F8-9527-A1A09CBB1DFE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E7BC0F18-9567-45F8-9527-A1A09CBB1DFE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E7BC0F18-9567-45F8-9527-A1A09CBB1DFE}.Release|Any CPU.Build.0 = Release|Any CPU - {D8D0E48D-B1D9-45CA-92D4-D203E771E697}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D8D0E48D-B1D9-45CA-92D4-D203E771E697}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D8D0E48D-B1D9-45CA-92D4-D203E771E697}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D8D0E48D-B1D9-45CA-92D4-D203E771E697}.Release|Any CPU.Build.0 = Release|Any CPU - {905E2D82-D870-47FC-A38D-2E2D6C271C71}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {905E2D82-D870-47FC-A38D-2E2D6C271C71}.Debug|Any CPU.Build.0 = Debug|Any CPU - {905E2D82-D870-47FC-A38D-2E2D6C271C71}.Release|Any CPU.ActiveCfg = Release|Any CPU - {905E2D82-D870-47FC-A38D-2E2D6C271C71}.Release|Any CPU.Build.0 = Release|Any CPU - {D1AAF8F1-2672-4172-A5E7-0FDA5B748EAB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D1AAF8F1-2672-4172-A5E7-0FDA5B748EAB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D1AAF8F1-2672-4172-A5E7-0FDA5B748EAB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D1AAF8F1-2672-4172-A5E7-0FDA5B748EAB}.Release|Any CPU.Build.0 = Release|Any CPU - {6B2A7AF6-8232-475B-9229-F46C0324A558}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6B2A7AF6-8232-475B-9229-F46C0324A558}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6B2A7AF6-8232-475B-9229-F46C0324A558}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6B2A7AF6-8232-475B-9229-F46C0324A558}.Release|Any CPU.Build.0 = Release|Any CPU - {4702A411-C922-459A-A8C7-401DF33D25AD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4702A411-C922-459A-A8C7-401DF33D25AD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4702A411-C922-459A-A8C7-401DF33D25AD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4702A411-C922-459A-A8C7-401DF33D25AD}.Release|Any CPU.Build.0 = Release|Any CPU - {84E13E57-A8F7-45D6-86DA-A7E776FCDA8C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {84E13E57-A8F7-45D6-86DA-A7E776FCDA8C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {84E13E57-A8F7-45D6-86DA-A7E776FCDA8C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {84E13E57-A8F7-45D6-86DA-A7E776FCDA8C}.Release|Any CPU.Build.0 = Release|Any CPU - {2DF8A74B-1656-435D-9299-7E198A03DC4D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2DF8A74B-1656-435D-9299-7E198A03DC4D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2DF8A74B-1656-435D-9299-7E198A03DC4D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2DF8A74B-1656-435D-9299-7E198A03DC4D}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {7BC5AEA6-6E30-431A-A691-5A4813FBA27E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7BC5AEA6-6E30-431A-A691-5A4813FBA27E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7BC5AEA6-6E30-431A-A691-5A4813FBA27E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7BC5AEA6-6E30-431A-A691-5A4813FBA27E}.Release|Any CPU.Build.0 = Release|Any CPU - {65CFA473-B9B0-449D-AED0-A9CD82B52710}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {65CFA473-B9B0-449D-AED0-A9CD82B52710}.Debug|Any CPU.Build.0 = Debug|Any CPU - {65CFA473-B9B0-449D-AED0-A9CD82B52710}.Release|Any CPU.ActiveCfg = Release|Any CPU - {65CFA473-B9B0-449D-AED0-A9CD82B52710}.Release|Any CPU.Build.0 = Release|Any CPU - {E7BC0F18-9567-45F8-9527-A1A09CBB1DFE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E7BC0F18-9567-45F8-9527-A1A09CBB1DFE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E7BC0F18-9567-45F8-9527-A1A09CBB1DFE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E7BC0F18-9567-45F8-9527-A1A09CBB1DFE}.Release|Any CPU.Build.0 = Release|Any CPU - {D8D0E48D-B1D9-45CA-92D4-D203E771E697}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D8D0E48D-B1D9-45CA-92D4-D203E771E697}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D8D0E48D-B1D9-45CA-92D4-D203E771E697}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D8D0E48D-B1D9-45CA-92D4-D203E771E697}.Release|Any CPU.Build.0 = Release|Any CPU - {905E2D82-D870-47FC-A38D-2E2D6C271C71}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {905E2D82-D870-47FC-A38D-2E2D6C271C71}.Debug|Any CPU.Build.0 = Debug|Any CPU - {905E2D82-D870-47FC-A38D-2E2D6C271C71}.Release|Any CPU.ActiveCfg = Release|Any CPU - {905E2D82-D870-47FC-A38D-2E2D6C271C71}.Release|Any CPU.Build.0 = Release|Any CPU - {D1AAF8F1-2672-4172-A5E7-0FDA5B748EAB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D1AAF8F1-2672-4172-A5E7-0FDA5B748EAB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D1AAF8F1-2672-4172-A5E7-0FDA5B748EAB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D1AAF8F1-2672-4172-A5E7-0FDA5B748EAB}.Release|Any CPU.Build.0 = Release|Any CPU - {6B2A7AF6-8232-475B-9229-F46C0324A558}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6B2A7AF6-8232-475B-9229-F46C0324A558}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6B2A7AF6-8232-475B-9229-F46C0324A558}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6B2A7AF6-8232-475B-9229-F46C0324A558}.Release|Any CPU.Build.0 = Release|Any CPU - {4702A411-C922-459A-A8C7-401DF33D25AD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4702A411-C922-459A-A8C7-401DF33D25AD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4702A411-C922-459A-A8C7-401DF33D25AD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4702A411-C922-459A-A8C7-401DF33D25AD}.Release|Any CPU.Build.0 = Release|Any CPU - {84E13E57-A8F7-45D6-86DA-A7E776FCDA8C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {84E13E57-A8F7-45D6-86DA-A7E776FCDA8C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {84E13E57-A8F7-45D6-86DA-A7E776FCDA8C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {84E13E57-A8F7-45D6-86DA-A7E776FCDA8C}.Release|Any CPU.Build.0 = Release|Any CPU - {2DF8A74B-1656-435D-9299-7E198A03DC4D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2DF8A74B-1656-435D-9299-7E198A03DC4D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2DF8A74B-1656-435D-9299-7E198A03DC4D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2DF8A74B-1656-435D-9299-7E198A03DC4D}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {B9632420-E0CC-412E-8A82-5541191E1CFC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {C4552A91-E1B9-4858-ABD1-7A70FA93CBC9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {09510466-2E36-487C-BD2B-529C7A9FC246} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {29AE9C3D-3D98-4539-ADE0-A7880AA0AAE8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {A6F087FD-8213-43A9-8CF9-4C4F0BDD3497} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {7BC5AEA6-6E30-431A-A691-5A4813FBA27E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {65CFA473-B9B0-449D-AED0-A9CD82B52710} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E7BC0F18-9567-45F8-9527-A1A09CBB1DFE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D8D0E48D-B1D9-45CA-92D4-D203E771E697} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {905E2D82-D870-47FC-A38D-2E2D6C271C71} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D1AAF8F1-2672-4172-A5E7-0FDA5B748EAB} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6B2A7AF6-8232-475B-9229-F46C0324A558} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4702A411-C922-459A-A8C7-401DF33D25AD} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {84E13E57-A8F7-45D6-86DA-A7E776FCDA8C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {2DF8A74B-1656-435D-9299-7E198A03DC4D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {7BC5AEA6-6E30-431A-A691-5A4813FBA27E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {65CFA473-B9B0-449D-AED0-A9CD82B52710} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E7BC0F18-9567-45F8-9527-A1A09CBB1DFE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D8D0E48D-B1D9-45CA-92D4-D203E771E697} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {905E2D82-D870-47FC-A38D-2E2D6C271C71} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D1AAF8F1-2672-4172-A5E7-0FDA5B748EAB} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6B2A7AF6-8232-475B-9229-F46C0324A558} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4702A411-C922-459A-A8C7-401DF33D25AD} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {84E13E57-A8F7-45D6-86DA-A7E776FCDA8C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {2DF8A74B-1656-435D-9299-7E198A03DC4D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {4588A2B6-FF31-4E32-A585-2EBEC7538878} diff --git a/sdk/src/Services/LicenseManager/Properties/AssemblyInfo.cs b/sdk/src/Services/LicenseManager/Properties/AssemblyInfo.cs index e216c7d88a96..f5ed541d8e00 100644 --- a/sdk/src/Services/LicenseManager/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/LicenseManager/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/LicenseManagerLinuxSubscriptions/Generated/AmazonLicenseManagerLinuxSubscriptionsConfig.cs b/sdk/src/Services/LicenseManagerLinuxSubscriptions/Generated/AmazonLicenseManagerLinuxSubscriptionsConfig.cs index c2b2e4ce7db4..c625043d4a84 100644 --- a/sdk/src/Services/LicenseManagerLinuxSubscriptions/Generated/AmazonLicenseManagerLinuxSubscriptionsConfig.cs +++ b/sdk/src/Services/LicenseManagerLinuxSubscriptions/Generated/AmazonLicenseManagerLinuxSubscriptionsConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.LicenseManagerLinuxSubscriptions public partial class AmazonLicenseManagerLinuxSubscriptionsConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("License Manager Linux Subscriptions", "4.0.0.0"); private static readonly AmazonLicenseManagerLinuxSubscriptionsEndpointResolver EndpointResolver = new AmazonLicenseManagerLinuxSubscriptionsEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("License Manager Linux Subscriptions", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("License Manager Linux Subscriptions", "3.7.400.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/LicenseManagerLinuxSubscriptions/LicenseManagerLinuxSubscriptions.sln b/sdk/src/Services/LicenseManagerLinuxSubscriptions/LicenseManagerLinuxSubscriptions.sln index 88f350f363f6..298609c57ef8 100644 --- a/sdk/src/Services/LicenseManagerLinuxSubscriptions/LicenseManagerLinuxSubscriptions.sln +++ b/sdk/src/Services/LicenseManagerLinuxSubscriptions/LicenseManagerLinuxSubscriptions.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {132F12BC-E5C8-4385-BD4A-952AA91E13FD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {132F12BC-E5C8-4385-BD4A-952AA91E13FD}.Debug|Any CPU.Build.0 = Debug|Any CPU {132F12BC-E5C8-4385-BD4A-952AA91E13FD}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {85C4B706-7C72-42EF-9C3B-04963201547D}.Debug|Any CPU.Build.0 = Debug|Any CPU {85C4B706-7C72-42EF-9C3B-04963201547D}.Release|Any CPU.ActiveCfg = Release|Any CPU {85C4B706-7C72-42EF-9C3B-04963201547D}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {A3FE23BD-7F1A-4C3A-97B0-F0123B745B00}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A3FE23BD-7F1A-4C3A-97B0-F0123B745B00}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A3FE23BD-7F1A-4C3A-97B0-F0123B745B00}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A3FE23BD-7F1A-4C3A-97B0-F0123B745B00}.Release|Any CPU.Build.0 = Release|Any CPU - {44CEDA54-B12B-429C-83D5-7915179789C8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {44CEDA54-B12B-429C-83D5-7915179789C8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {44CEDA54-B12B-429C-83D5-7915179789C8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {44CEDA54-B12B-429C-83D5-7915179789C8}.Release|Any CPU.Build.0 = Release|Any CPU - {25D856E5-D6B6-4541-8B00-B08B76B10651}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {25D856E5-D6B6-4541-8B00-B08B76B10651}.Debug|Any CPU.Build.0 = Debug|Any CPU - {25D856E5-D6B6-4541-8B00-B08B76B10651}.Release|Any CPU.ActiveCfg = Release|Any CPU - {25D856E5-D6B6-4541-8B00-B08B76B10651}.Release|Any CPU.Build.0 = Release|Any CPU - {54EBC8DB-D18E-407A-B702-CAFF1A0004C4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {54EBC8DB-D18E-407A-B702-CAFF1A0004C4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {54EBC8DB-D18E-407A-B702-CAFF1A0004C4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {54EBC8DB-D18E-407A-B702-CAFF1A0004C4}.Release|Any CPU.Build.0 = Release|Any CPU - {C828C9E5-28E3-489B-981D-97C6641148F5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C828C9E5-28E3-489B-981D-97C6641148F5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C828C9E5-28E3-489B-981D-97C6641148F5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C828C9E5-28E3-489B-981D-97C6641148F5}.Release|Any CPU.Build.0 = Release|Any CPU - {8CF3709E-44B4-48C3-BCEC-29267F92983D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8CF3709E-44B4-48C3-BCEC-29267F92983D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8CF3709E-44B4-48C3-BCEC-29267F92983D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8CF3709E-44B4-48C3-BCEC-29267F92983D}.Release|Any CPU.Build.0 = Release|Any CPU - {6F9613DB-6C94-4667-946A-1E4E1C23FE62}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6F9613DB-6C94-4667-946A-1E4E1C23FE62}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6F9613DB-6C94-4667-946A-1E4E1C23FE62}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6F9613DB-6C94-4667-946A-1E4E1C23FE62}.Release|Any CPU.Build.0 = Release|Any CPU - {49EF2938-69D2-4218-9DC9-739B3BD86E97}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {49EF2938-69D2-4218-9DC9-739B3BD86E97}.Debug|Any CPU.Build.0 = Debug|Any CPU - {49EF2938-69D2-4218-9DC9-739B3BD86E97}.Release|Any CPU.ActiveCfg = Release|Any CPU - {49EF2938-69D2-4218-9DC9-739B3BD86E97}.Release|Any CPU.Build.0 = Release|Any CPU - {82311E24-4054-4047-9B2C-1DB3FC6EEBBB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {82311E24-4054-4047-9B2C-1DB3FC6EEBBB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {82311E24-4054-4047-9B2C-1DB3FC6EEBBB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {82311E24-4054-4047-9B2C-1DB3FC6EEBBB}.Release|Any CPU.Build.0 = Release|Any CPU - {EB791404-2617-4419-A2DD-9B8A31AB19EF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EB791404-2617-4419-A2DD-9B8A31AB19EF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EB791404-2617-4419-A2DD-9B8A31AB19EF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EB791404-2617-4419-A2DD-9B8A31AB19EF}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {A3FE23BD-7F1A-4C3A-97B0-F0123B745B00}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A3FE23BD-7F1A-4C3A-97B0-F0123B745B00}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A3FE23BD-7F1A-4C3A-97B0-F0123B745B00}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A3FE23BD-7F1A-4C3A-97B0-F0123B745B00}.Release|Any CPU.Build.0 = Release|Any CPU - {44CEDA54-B12B-429C-83D5-7915179789C8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {44CEDA54-B12B-429C-83D5-7915179789C8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {44CEDA54-B12B-429C-83D5-7915179789C8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {44CEDA54-B12B-429C-83D5-7915179789C8}.Release|Any CPU.Build.0 = Release|Any CPU - {25D856E5-D6B6-4541-8B00-B08B76B10651}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {25D856E5-D6B6-4541-8B00-B08B76B10651}.Debug|Any CPU.Build.0 = Debug|Any CPU - {25D856E5-D6B6-4541-8B00-B08B76B10651}.Release|Any CPU.ActiveCfg = Release|Any CPU - {25D856E5-D6B6-4541-8B00-B08B76B10651}.Release|Any CPU.Build.0 = Release|Any CPU - {54EBC8DB-D18E-407A-B702-CAFF1A0004C4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {54EBC8DB-D18E-407A-B702-CAFF1A0004C4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {54EBC8DB-D18E-407A-B702-CAFF1A0004C4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {54EBC8DB-D18E-407A-B702-CAFF1A0004C4}.Release|Any CPU.Build.0 = Release|Any CPU - {C828C9E5-28E3-489B-981D-97C6641148F5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C828C9E5-28E3-489B-981D-97C6641148F5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C828C9E5-28E3-489B-981D-97C6641148F5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C828C9E5-28E3-489B-981D-97C6641148F5}.Release|Any CPU.Build.0 = Release|Any CPU - {8CF3709E-44B4-48C3-BCEC-29267F92983D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8CF3709E-44B4-48C3-BCEC-29267F92983D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8CF3709E-44B4-48C3-BCEC-29267F92983D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8CF3709E-44B4-48C3-BCEC-29267F92983D}.Release|Any CPU.Build.0 = Release|Any CPU - {6F9613DB-6C94-4667-946A-1E4E1C23FE62}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6F9613DB-6C94-4667-946A-1E4E1C23FE62}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6F9613DB-6C94-4667-946A-1E4E1C23FE62}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6F9613DB-6C94-4667-946A-1E4E1C23FE62}.Release|Any CPU.Build.0 = Release|Any CPU - {49EF2938-69D2-4218-9DC9-739B3BD86E97}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {49EF2938-69D2-4218-9DC9-739B3BD86E97}.Debug|Any CPU.Build.0 = Debug|Any CPU - {49EF2938-69D2-4218-9DC9-739B3BD86E97}.Release|Any CPU.ActiveCfg = Release|Any CPU - {49EF2938-69D2-4218-9DC9-739B3BD86E97}.Release|Any CPU.Build.0 = Release|Any CPU - {82311E24-4054-4047-9B2C-1DB3FC6EEBBB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {82311E24-4054-4047-9B2C-1DB3FC6EEBBB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {82311E24-4054-4047-9B2C-1DB3FC6EEBBB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {82311E24-4054-4047-9B2C-1DB3FC6EEBBB}.Release|Any CPU.Build.0 = Release|Any CPU - {EB791404-2617-4419-A2DD-9B8A31AB19EF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EB791404-2617-4419-A2DD-9B8A31AB19EF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EB791404-2617-4419-A2DD-9B8A31AB19EF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EB791404-2617-4419-A2DD-9B8A31AB19EF}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {132F12BC-E5C8-4385-BD4A-952AA91E13FD} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {818F5283-7676-42C5-A7CD-7B520CD6C3D5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {3943F90F-19BA-4A4D-8CF4-FD5E5B57541D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {55351097-67A1-4C21-8B06-B24542E1EE86} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {85C4B706-7C72-42EF-9C3B-04963201547D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {A3FE23BD-7F1A-4C3A-97B0-F0123B745B00} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {44CEDA54-B12B-429C-83D5-7915179789C8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {25D856E5-D6B6-4541-8B00-B08B76B10651} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {54EBC8DB-D18E-407A-B702-CAFF1A0004C4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C828C9E5-28E3-489B-981D-97C6641148F5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8CF3709E-44B4-48C3-BCEC-29267F92983D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6F9613DB-6C94-4667-946A-1E4E1C23FE62} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {49EF2938-69D2-4218-9DC9-739B3BD86E97} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {82311E24-4054-4047-9B2C-1DB3FC6EEBBB} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {EB791404-2617-4419-A2DD-9B8A31AB19EF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {A3FE23BD-7F1A-4C3A-97B0-F0123B745B00} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {44CEDA54-B12B-429C-83D5-7915179789C8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {25D856E5-D6B6-4541-8B00-B08B76B10651} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {54EBC8DB-D18E-407A-B702-CAFF1A0004C4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C828C9E5-28E3-489B-981D-97C6641148F5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8CF3709E-44B4-48C3-BCEC-29267F92983D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6F9613DB-6C94-4667-946A-1E4E1C23FE62} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {49EF2938-69D2-4218-9DC9-739B3BD86E97} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {82311E24-4054-4047-9B2C-1DB3FC6EEBBB} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {EB791404-2617-4419-A2DD-9B8A31AB19EF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {61E5EED7-944D-412F-955D-9D16FCE729F1} diff --git a/sdk/src/Services/LicenseManagerLinuxSubscriptions/Properties/AssemblyInfo.cs b/sdk/src/Services/LicenseManagerLinuxSubscriptions/Properties/AssemblyInfo.cs index 41ad7c86fa99..ae8a079f2164 100644 --- a/sdk/src/Services/LicenseManagerLinuxSubscriptions/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/LicenseManagerLinuxSubscriptions/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/LicenseManagerUserSubscriptions/Generated/AmazonLicenseManagerUserSubscriptionsConfig.cs b/sdk/src/Services/LicenseManagerUserSubscriptions/Generated/AmazonLicenseManagerUserSubscriptionsConfig.cs index 49edcfc846b0..6899df0f4087 100644 --- a/sdk/src/Services/LicenseManagerUserSubscriptions/Generated/AmazonLicenseManagerUserSubscriptionsConfig.cs +++ b/sdk/src/Services/LicenseManagerUserSubscriptions/Generated/AmazonLicenseManagerUserSubscriptionsConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.LicenseManagerUserSubscriptions public partial class AmazonLicenseManagerUserSubscriptionsConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("License Manager User Subscriptions", "4.0.0.0"); private static readonly AmazonLicenseManagerUserSubscriptionsEndpointResolver EndpointResolver = new AmazonLicenseManagerUserSubscriptionsEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("License Manager User Subscriptions", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("License Manager User Subscriptions", "3.7.401.2"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/LicenseManagerUserSubscriptions/Generated/Model/Internal/MarshallTransformations/AssociateUserRequestMarshaller.cs b/sdk/src/Services/LicenseManagerUserSubscriptions/Generated/Model/Internal/MarshallTransformations/AssociateUserRequestMarshaller.cs index 63ba88e4f1f8..9c711abb3450 100644 --- a/sdk/src/Services/LicenseManagerUserSubscriptions/Generated/Model/Internal/MarshallTransformations/AssociateUserRequestMarshaller.cs +++ b/sdk/src/Services/LicenseManagerUserSubscriptions/Generated/Model/Internal/MarshallTransformations/AssociateUserRequestMarshaller.cs @@ -92,6 +92,20 @@ public IRequest Marshall(AssociateUserRequest publicRequest) context.Writer.Write(publicRequest.InstanceId); } + if(publicRequest.IsSetTags()) + { + context.Writer.WritePropertyName("Tags"); + context.Writer.WriteObjectStart(); + foreach (var publicRequestTagsKvp in publicRequest.Tags) + { + context.Writer.WritePropertyName(publicRequestTagsKvp.Key); + var publicRequestTagsValue = publicRequestTagsKvp.Value; + + context.Writer.Write(publicRequestTagsValue); + } + context.Writer.WriteObjectEnd(); + } + if(publicRequest.IsSetUsername()) { context.Writer.WritePropertyName("Username"); @@ -101,77 +115,7 @@ public IRequest Marshall(AssociateUserRequest publicRequest) writer.WriteObjectEnd(); } -<<<<<<< HEAD request.Content = memoryStream.ToArray(); -||||||| Commit version number update changes - if(publicRequest.IsSetIdentityProvider()) - { - context.Writer.WritePropertyName("IdentityProvider"); - context.Writer.WriteObjectStart(); - - var marshaller = IdentityProviderMarshaller.Instance; - marshaller.Marshall(publicRequest.IdentityProvider, context); - - context.Writer.WriteObjectEnd(); - } - - if(publicRequest.IsSetInstanceId()) - { - context.Writer.WritePropertyName("InstanceId"); - context.Writer.Write(publicRequest.InstanceId); - } - - if(publicRequest.IsSetUsername()) - { - context.Writer.WritePropertyName("Username"); - context.Writer.Write(publicRequest.Username); - } - - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); -======= - if(publicRequest.IsSetIdentityProvider()) - { - context.Writer.WritePropertyName("IdentityProvider"); - context.Writer.WriteObjectStart(); - - var marshaller = IdentityProviderMarshaller.Instance; - marshaller.Marshall(publicRequest.IdentityProvider, context); - - context.Writer.WriteObjectEnd(); - } - - if(publicRequest.IsSetInstanceId()) - { - context.Writer.WritePropertyName("InstanceId"); - context.Writer.Write(publicRequest.InstanceId); - } - - if(publicRequest.IsSetTags()) - { - context.Writer.WritePropertyName("Tags"); - context.Writer.WriteObjectStart(); - foreach (var publicRequestTagsKvp in publicRequest.Tags) - { - context.Writer.WritePropertyName(publicRequestTagsKvp.Key); - var publicRequestTagsValue = publicRequestTagsKvp.Value; - - context.Writer.Write(publicRequestTagsValue); - } - context.Writer.WriteObjectEnd(); - } - - if(publicRequest.IsSetUsername()) - { - context.Writer.WritePropertyName("Username"); - context.Writer.Write(publicRequest.Username); - } - - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b } diff --git a/sdk/src/Services/LicenseManagerUserSubscriptions/Generated/Model/Internal/MarshallTransformations/CreateLicenseServerEndpointRequestMarshaller.cs b/sdk/src/Services/LicenseManagerUserSubscriptions/Generated/Model/Internal/MarshallTransformations/CreateLicenseServerEndpointRequestMarshaller.cs index 9df1ae1eabdf..bba33fb4f8bb 100644 --- a/sdk/src/Services/LicenseManagerUserSubscriptions/Generated/Model/Internal/MarshallTransformations/CreateLicenseServerEndpointRequestMarshaller.cs +++ b/sdk/src/Services/LicenseManagerUserSubscriptions/Generated/Model/Internal/MarshallTransformations/CreateLicenseServerEndpointRequestMarshaller.cs @@ -61,46 +61,49 @@ public IRequest Marshall(CreateLicenseServerEndpointRequest publicRequest) request.HttpMethod = "POST"; request.ResourcePath = "/license-server/CreateLicenseServerEndpoint"; - using (StringWriter stringWriter = new StringWriter(CultureInfo.InvariantCulture)) + using (MemoryStream memoryStream = new MemoryStream()) { - JsonWriter writer = new JsonWriter(stringWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetIdentityProviderArn()) + using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) { - context.Writer.WritePropertyName("IdentityProviderArn"); - context.Writer.Write(publicRequest.IdentityProviderArn); - } + JsonWriter writer = new JsonWriter(streamWriter); + writer.Validate = false; + writer.WriteObjectStart(); + var context = new JsonMarshallerContext(request, writer); + if(publicRequest.IsSetIdentityProviderArn()) + { + context.Writer.WritePropertyName("IdentityProviderArn"); + context.Writer.Write(publicRequest.IdentityProviderArn); + } - if(publicRequest.IsSetLicenseServerSettings()) - { - context.Writer.WritePropertyName("LicenseServerSettings"); - context.Writer.WriteObjectStart(); + if(publicRequest.IsSetLicenseServerSettings()) + { + context.Writer.WritePropertyName("LicenseServerSettings"); + context.Writer.WriteObjectStart(); - var marshaller = LicenseServerSettingsMarshaller.Instance; - marshaller.Marshall(publicRequest.LicenseServerSettings, context); + var marshaller = LicenseServerSettingsMarshaller.Instance; + marshaller.Marshall(publicRequest.LicenseServerSettings, context); - context.Writer.WriteObjectEnd(); - } + context.Writer.WriteObjectEnd(); + } - if(publicRequest.IsSetTags()) - { - context.Writer.WritePropertyName("Tags"); - context.Writer.WriteObjectStart(); - foreach (var publicRequestTagsKvp in publicRequest.Tags) + if(publicRequest.IsSetTags()) { - context.Writer.WritePropertyName(publicRequestTagsKvp.Key); - var publicRequestTagsValue = publicRequestTagsKvp.Value; - - context.Writer.Write(publicRequestTagsValue); + context.Writer.WritePropertyName("Tags"); + context.Writer.WriteObjectStart(); + foreach (var publicRequestTagsKvp in publicRequest.Tags) + { + context.Writer.WritePropertyName(publicRequestTagsKvp.Key); + var publicRequestTagsValue = publicRequestTagsKvp.Value; + + context.Writer.Write(publicRequestTagsValue); + } + context.Writer.WriteObjectEnd(); } - context.Writer.WriteObjectEnd(); + + writer.WriteObjectEnd(); } - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); + request.Content = memoryStream.ToArray(); } diff --git a/sdk/src/Services/LicenseManagerUserSubscriptions/Generated/Model/Internal/MarshallTransformations/DeleteLicenseServerEndpointRequestMarshaller.cs b/sdk/src/Services/LicenseManagerUserSubscriptions/Generated/Model/Internal/MarshallTransformations/DeleteLicenseServerEndpointRequestMarshaller.cs index 769b54f1f48d..2df9a7c3baca 100644 --- a/sdk/src/Services/LicenseManagerUserSubscriptions/Generated/Model/Internal/MarshallTransformations/DeleteLicenseServerEndpointRequestMarshaller.cs +++ b/sdk/src/Services/LicenseManagerUserSubscriptions/Generated/Model/Internal/MarshallTransformations/DeleteLicenseServerEndpointRequestMarshaller.cs @@ -61,27 +61,30 @@ public IRequest Marshall(DeleteLicenseServerEndpointRequest publicRequest) request.HttpMethod = "POST"; request.ResourcePath = "/license-server/DeleteLicenseServerEndpoint"; - using (StringWriter stringWriter = new StringWriter(CultureInfo.InvariantCulture)) + using (MemoryStream memoryStream = new MemoryStream()) { - JsonWriter writer = new JsonWriter(stringWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetLicenseServerEndpointArn()) + using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) { - context.Writer.WritePropertyName("LicenseServerEndpointArn"); - context.Writer.Write(publicRequest.LicenseServerEndpointArn); - } + JsonWriter writer = new JsonWriter(streamWriter); + writer.Validate = false; + writer.WriteObjectStart(); + var context = new JsonMarshallerContext(request, writer); + if(publicRequest.IsSetLicenseServerEndpointArn()) + { + context.Writer.WritePropertyName("LicenseServerEndpointArn"); + context.Writer.Write(publicRequest.LicenseServerEndpointArn); + } - if(publicRequest.IsSetServerType()) - { - context.Writer.WritePropertyName("ServerType"); - context.Writer.Write(publicRequest.ServerType); + if(publicRequest.IsSetServerType()) + { + context.Writer.WritePropertyName("ServerType"); + context.Writer.Write(publicRequest.ServerType); + } + + writer.WriteObjectEnd(); } - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); + request.Content = memoryStream.ToArray(); } diff --git a/sdk/src/Services/LicenseManagerUserSubscriptions/Generated/Model/Internal/MarshallTransformations/DeregisterIdentityProviderRequestMarshaller.cs b/sdk/src/Services/LicenseManagerUserSubscriptions/Generated/Model/Internal/MarshallTransformations/DeregisterIdentityProviderRequestMarshaller.cs index 42743136fd84..77ed9998e023 100644 --- a/sdk/src/Services/LicenseManagerUserSubscriptions/Generated/Model/Internal/MarshallTransformations/DeregisterIdentityProviderRequestMarshaller.cs +++ b/sdk/src/Services/LicenseManagerUserSubscriptions/Generated/Model/Internal/MarshallTransformations/DeregisterIdentityProviderRequestMarshaller.cs @@ -80,7 +80,12 @@ public IRequest Marshall(DeregisterIdentityProviderRequest publicRequest) context.Writer.WriteObjectEnd(); } -<<<<<<< HEAD + if(publicRequest.IsSetIdentityProviderArn()) + { + context.Writer.WritePropertyName("IdentityProviderArn"); + context.Writer.Write(publicRequest.IdentityProviderArn); + } + if(publicRequest.IsSetProduct()) { context.Writer.WritePropertyName("Product"); @@ -88,23 +93,6 @@ public IRequest Marshall(DeregisterIdentityProviderRequest publicRequest) } writer.WriteObjectEnd(); -||||||| Commit version number update changes - if(publicRequest.IsSetProduct()) - { - context.Writer.WritePropertyName("Product"); - context.Writer.Write(publicRequest.Product); -======= - if(publicRequest.IsSetIdentityProviderArn()) - { - context.Writer.WritePropertyName("IdentityProviderArn"); - context.Writer.Write(publicRequest.IdentityProviderArn); - } - - if(publicRequest.IsSetProduct()) - { - context.Writer.WritePropertyName("Product"); - context.Writer.Write(publicRequest.Product); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b } request.Content = memoryStream.ToArray(); diff --git a/sdk/src/Services/LicenseManagerUserSubscriptions/Generated/Model/Internal/MarshallTransformations/DisassociateUserRequestMarshaller.cs b/sdk/src/Services/LicenseManagerUserSubscriptions/Generated/Model/Internal/MarshallTransformations/DisassociateUserRequestMarshaller.cs index 36c342fcff48..3ea3cccb4ed4 100644 --- a/sdk/src/Services/LicenseManagerUserSubscriptions/Generated/Model/Internal/MarshallTransformations/DisassociateUserRequestMarshaller.cs +++ b/sdk/src/Services/LicenseManagerUserSubscriptions/Generated/Model/Internal/MarshallTransformations/DisassociateUserRequestMarshaller.cs @@ -92,6 +92,12 @@ public IRequest Marshall(DisassociateUserRequest publicRequest) context.Writer.Write(publicRequest.InstanceId); } + if(publicRequest.IsSetInstanceUserArn()) + { + context.Writer.WritePropertyName("InstanceUserArn"); + context.Writer.Write(publicRequest.InstanceUserArn); + } + if(publicRequest.IsSetUsername()) { context.Writer.WritePropertyName("Username"); @@ -101,69 +107,7 @@ public IRequest Marshall(DisassociateUserRequest publicRequest) writer.WriteObjectEnd(); } -<<<<<<< HEAD request.Content = memoryStream.ToArray(); -||||||| Commit version number update changes - if(publicRequest.IsSetIdentityProvider()) - { - context.Writer.WritePropertyName("IdentityProvider"); - context.Writer.WriteObjectStart(); - - var marshaller = IdentityProviderMarshaller.Instance; - marshaller.Marshall(publicRequest.IdentityProvider, context); - - context.Writer.WriteObjectEnd(); - } - - if(publicRequest.IsSetInstanceId()) - { - context.Writer.WritePropertyName("InstanceId"); - context.Writer.Write(publicRequest.InstanceId); - } - - if(publicRequest.IsSetUsername()) - { - context.Writer.WritePropertyName("Username"); - context.Writer.Write(publicRequest.Username); - } - - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); -======= - if(publicRequest.IsSetIdentityProvider()) - { - context.Writer.WritePropertyName("IdentityProvider"); - context.Writer.WriteObjectStart(); - - var marshaller = IdentityProviderMarshaller.Instance; - marshaller.Marshall(publicRequest.IdentityProvider, context); - - context.Writer.WriteObjectEnd(); - } - - if(publicRequest.IsSetInstanceId()) - { - context.Writer.WritePropertyName("InstanceId"); - context.Writer.Write(publicRequest.InstanceId); - } - - if(publicRequest.IsSetInstanceUserArn()) - { - context.Writer.WritePropertyName("InstanceUserArn"); - context.Writer.Write(publicRequest.InstanceUserArn); - } - - if(publicRequest.IsSetUsername()) - { - context.Writer.WritePropertyName("Username"); - context.Writer.Write(publicRequest.Username); - } - - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b } diff --git a/sdk/src/Services/LicenseManagerUserSubscriptions/Generated/Model/Internal/MarshallTransformations/LicenseServerEndpointUnmarshaller.cs b/sdk/src/Services/LicenseManagerUserSubscriptions/Generated/Model/Internal/MarshallTransformations/LicenseServerEndpointUnmarshaller.cs index cc278f670479..3a2f2cf9dfe8 100644 --- a/sdk/src/Services/LicenseManagerUserSubscriptions/Generated/Model/Internal/MarshallTransformations/LicenseServerEndpointUnmarshaller.cs +++ b/sdk/src/Services/LicenseManagerUserSubscriptions/Generated/Model/Internal/MarshallTransformations/LicenseServerEndpointUnmarshaller.cs @@ -68,7 +68,7 @@ public LicenseServerEndpoint Unmarshall(JsonUnmarshallerContext context) { if (context.TestExpression("CreationTime", targetDepth)) { - var unmarshaller = DateTimeUnmarshaller.Instance; + var unmarshaller = NullableDateTimeUnmarshaller.Instance; unmarshalledObject.CreationTime = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/LicenseManagerUserSubscriptions/Generated/Model/Internal/MarshallTransformations/ListIdentityProvidersRequestMarshaller.cs b/sdk/src/Services/LicenseManagerUserSubscriptions/Generated/Model/Internal/MarshallTransformations/ListIdentityProvidersRequestMarshaller.cs index 634aac4206c4..8b7e97748437 100644 --- a/sdk/src/Services/LicenseManagerUserSubscriptions/Generated/Model/Internal/MarshallTransformations/ListIdentityProvidersRequestMarshaller.cs +++ b/sdk/src/Services/LicenseManagerUserSubscriptions/Generated/Model/Internal/MarshallTransformations/ListIdentityProvidersRequestMarshaller.cs @@ -63,42 +63,28 @@ public IRequest Marshall(ListIdentityProvidersRequest publicRequest) request.ResourcePath = "/identity-provider/ListIdentityProviders"; using (MemoryStream memoryStream = new MemoryStream()) { -<<<<<<< HEAD using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) -||||||| Commit version number update changes - JsonWriter writer = new JsonWriter(stringWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetMaxResults()) -======= - JsonWriter writer = new JsonWriter(stringWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetFilters()) - { - context.Writer.WritePropertyName("Filters"); - context.Writer.WriteArrayStart(); - foreach(var publicRequestFiltersListValue in publicRequest.Filters) - { - context.Writer.WriteObjectStart(); - - var marshaller = FilterMarshaller.Instance; - marshaller.Marshall(publicRequestFiltersListValue, context); - - context.Writer.WriteObjectEnd(); - } - context.Writer.WriteArrayEnd(); - } - - if(publicRequest.IsSetMaxResults()) ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b { JsonWriter writer = new JsonWriter(streamWriter); writer.Validate = false; writer.WriteObjectStart(); var context = new JsonMarshallerContext(request, writer); + if(publicRequest.IsSetFilters()) + { + context.Writer.WritePropertyName("Filters"); + context.Writer.WriteArrayStart(); + foreach(var publicRequestFiltersListValue in publicRequest.Filters) + { + context.Writer.WriteObjectStart(); + + var marshaller = FilterMarshaller.Instance; + marshaller.Marshall(publicRequestFiltersListValue, context); + + context.Writer.WriteObjectEnd(); + } + context.Writer.WriteArrayEnd(); + } + if(publicRequest.IsSetMaxResults()) { context.Writer.WritePropertyName("MaxResults"); diff --git a/sdk/src/Services/LicenseManagerUserSubscriptions/Generated/Model/Internal/MarshallTransformations/ListLicenseServerEndpointsRequestMarshaller.cs b/sdk/src/Services/LicenseManagerUserSubscriptions/Generated/Model/Internal/MarshallTransformations/ListLicenseServerEndpointsRequestMarshaller.cs index f3f08ca21f87..f3e9a88eaec7 100644 --- a/sdk/src/Services/LicenseManagerUserSubscriptions/Generated/Model/Internal/MarshallTransformations/ListLicenseServerEndpointsRequestMarshaller.cs +++ b/sdk/src/Services/LicenseManagerUserSubscriptions/Generated/Model/Internal/MarshallTransformations/ListLicenseServerEndpointsRequestMarshaller.cs @@ -61,43 +61,46 @@ public IRequest Marshall(ListLicenseServerEndpointsRequest publicRequest) request.HttpMethod = "POST"; request.ResourcePath = "/license-server/ListLicenseServerEndpoints"; - using (StringWriter stringWriter = new StringWriter(CultureInfo.InvariantCulture)) + using (MemoryStream memoryStream = new MemoryStream()) { - JsonWriter writer = new JsonWriter(stringWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetFilters()) + using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) { - context.Writer.WritePropertyName("Filters"); - context.Writer.WriteArrayStart(); - foreach(var publicRequestFiltersListValue in publicRequest.Filters) + JsonWriter writer = new JsonWriter(streamWriter); + writer.Validate = false; + writer.WriteObjectStart(); + var context = new JsonMarshallerContext(request, writer); + if(publicRequest.IsSetFilters()) { - context.Writer.WriteObjectStart(); + context.Writer.WritePropertyName("Filters"); + context.Writer.WriteArrayStart(); + foreach(var publicRequestFiltersListValue in publicRequest.Filters) + { + context.Writer.WriteObjectStart(); - var marshaller = FilterMarshaller.Instance; - marshaller.Marshall(publicRequestFiltersListValue, context); + var marshaller = FilterMarshaller.Instance; + marshaller.Marshall(publicRequestFiltersListValue, context); - context.Writer.WriteObjectEnd(); + context.Writer.WriteObjectEnd(); + } + context.Writer.WriteArrayEnd(); } - context.Writer.WriteArrayEnd(); - } - if(publicRequest.IsSetMaxResults()) - { - context.Writer.WritePropertyName("MaxResults"); - context.Writer.Write(publicRequest.MaxResults); - } + if(publicRequest.IsSetMaxResults()) + { + context.Writer.WritePropertyName("MaxResults"); + context.Writer.Write(publicRequest.MaxResults.Value); + } - if(publicRequest.IsSetNextToken()) - { - context.Writer.WritePropertyName("NextToken"); - context.Writer.Write(publicRequest.NextToken); + if(publicRequest.IsSetNextToken()) + { + context.Writer.WritePropertyName("NextToken"); + context.Writer.Write(publicRequest.NextToken); + } + + writer.WriteObjectEnd(); } - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); + request.Content = memoryStream.ToArray(); } diff --git a/sdk/src/Services/LicenseManagerUserSubscriptions/Generated/Model/Internal/MarshallTransformations/RegisterIdentityProviderRequestMarshaller.cs b/sdk/src/Services/LicenseManagerUserSubscriptions/Generated/Model/Internal/MarshallTransformations/RegisterIdentityProviderRequestMarshaller.cs index 63cbaa839f9f..9d6118d82a17 100644 --- a/sdk/src/Services/LicenseManagerUserSubscriptions/Generated/Model/Internal/MarshallTransformations/RegisterIdentityProviderRequestMarshaller.cs +++ b/sdk/src/Services/LicenseManagerUserSubscriptions/Generated/Model/Internal/MarshallTransformations/RegisterIdentityProviderRequestMarshaller.cs @@ -97,34 +97,24 @@ public IRequest Marshall(RegisterIdentityProviderRequest publicRequest) context.Writer.WriteObjectEnd(); } - writer.WriteObjectEnd(); - } - -<<<<<<< HEAD - request.Content = memoryStream.ToArray(); -||||||| Commit version number update changes - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); -======= - if(publicRequest.IsSetTags()) - { - context.Writer.WritePropertyName("Tags"); - context.Writer.WriteObjectStart(); - foreach (var publicRequestTagsKvp in publicRequest.Tags) + if(publicRequest.IsSetTags()) { - context.Writer.WritePropertyName(publicRequestTagsKvp.Key); - var publicRequestTagsValue = publicRequestTagsKvp.Value; + context.Writer.WritePropertyName("Tags"); + context.Writer.WriteObjectStart(); + foreach (var publicRequestTagsKvp in publicRequest.Tags) + { + context.Writer.WritePropertyName(publicRequestTagsKvp.Key); + var publicRequestTagsValue = publicRequestTagsKvp.Value; - context.Writer.Write(publicRequestTagsValue); + context.Writer.Write(publicRequestTagsValue); + } + context.Writer.WriteObjectEnd(); } - context.Writer.WriteObjectEnd(); + + writer.WriteObjectEnd(); } - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b + request.Content = memoryStream.ToArray(); } diff --git a/sdk/src/Services/LicenseManagerUserSubscriptions/Generated/Model/Internal/MarshallTransformations/StartProductSubscriptionRequestMarshaller.cs b/sdk/src/Services/LicenseManagerUserSubscriptions/Generated/Model/Internal/MarshallTransformations/StartProductSubscriptionRequestMarshaller.cs index 3988b27bed70..7719dda0dcf5 100644 --- a/sdk/src/Services/LicenseManagerUserSubscriptions/Generated/Model/Internal/MarshallTransformations/StartProductSubscriptionRequestMarshaller.cs +++ b/sdk/src/Services/LicenseManagerUserSubscriptions/Generated/Model/Internal/MarshallTransformations/StartProductSubscriptionRequestMarshaller.cs @@ -92,6 +92,20 @@ public IRequest Marshall(StartProductSubscriptionRequest publicRequest) context.Writer.Write(publicRequest.Product); } + if(publicRequest.IsSetTags()) + { + context.Writer.WritePropertyName("Tags"); + context.Writer.WriteObjectStart(); + foreach (var publicRequestTagsKvp in publicRequest.Tags) + { + context.Writer.WritePropertyName(publicRequestTagsKvp.Key); + var publicRequestTagsValue = publicRequestTagsKvp.Value; + + context.Writer.Write(publicRequestTagsValue); + } + context.Writer.WriteObjectEnd(); + } + if(publicRequest.IsSetUsername()) { context.Writer.WritePropertyName("Username"); @@ -101,77 +115,7 @@ public IRequest Marshall(StartProductSubscriptionRequest publicRequest) writer.WriteObjectEnd(); } -<<<<<<< HEAD request.Content = memoryStream.ToArray(); -||||||| Commit version number update changes - if(publicRequest.IsSetIdentityProvider()) - { - context.Writer.WritePropertyName("IdentityProvider"); - context.Writer.WriteObjectStart(); - - var marshaller = IdentityProviderMarshaller.Instance; - marshaller.Marshall(publicRequest.IdentityProvider, context); - - context.Writer.WriteObjectEnd(); - } - - if(publicRequest.IsSetProduct()) - { - context.Writer.WritePropertyName("Product"); - context.Writer.Write(publicRequest.Product); - } - - if(publicRequest.IsSetUsername()) - { - context.Writer.WritePropertyName("Username"); - context.Writer.Write(publicRequest.Username); - } - - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); -======= - if(publicRequest.IsSetIdentityProvider()) - { - context.Writer.WritePropertyName("IdentityProvider"); - context.Writer.WriteObjectStart(); - - var marshaller = IdentityProviderMarshaller.Instance; - marshaller.Marshall(publicRequest.IdentityProvider, context); - - context.Writer.WriteObjectEnd(); - } - - if(publicRequest.IsSetProduct()) - { - context.Writer.WritePropertyName("Product"); - context.Writer.Write(publicRequest.Product); - } - - if(publicRequest.IsSetTags()) - { - context.Writer.WritePropertyName("Tags"); - context.Writer.WriteObjectStart(); - foreach (var publicRequestTagsKvp in publicRequest.Tags) - { - context.Writer.WritePropertyName(publicRequestTagsKvp.Key); - var publicRequestTagsValue = publicRequestTagsKvp.Value; - - context.Writer.Write(publicRequestTagsValue); - } - context.Writer.WriteObjectEnd(); - } - - if(publicRequest.IsSetUsername()) - { - context.Writer.WritePropertyName("Username"); - context.Writer.Write(publicRequest.Username); - } - - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b } diff --git a/sdk/src/Services/LicenseManagerUserSubscriptions/Generated/Model/Internal/MarshallTransformations/StopProductSubscriptionRequestMarshaller.cs b/sdk/src/Services/LicenseManagerUserSubscriptions/Generated/Model/Internal/MarshallTransformations/StopProductSubscriptionRequestMarshaller.cs index 9cfa08c7fadf..3d59b06cc822 100644 --- a/sdk/src/Services/LicenseManagerUserSubscriptions/Generated/Model/Internal/MarshallTransformations/StopProductSubscriptionRequestMarshaller.cs +++ b/sdk/src/Services/LicenseManagerUserSubscriptions/Generated/Model/Internal/MarshallTransformations/StopProductSubscriptionRequestMarshaller.cs @@ -92,6 +92,12 @@ public IRequest Marshall(StopProductSubscriptionRequest publicRequest) context.Writer.Write(publicRequest.Product); } + if(publicRequest.IsSetProductUserArn()) + { + context.Writer.WritePropertyName("ProductUserArn"); + context.Writer.Write(publicRequest.ProductUserArn); + } + if(publicRequest.IsSetUsername()) { context.Writer.WritePropertyName("Username"); @@ -101,69 +107,7 @@ public IRequest Marshall(StopProductSubscriptionRequest publicRequest) writer.WriteObjectEnd(); } -<<<<<<< HEAD request.Content = memoryStream.ToArray(); -||||||| Commit version number update changes - if(publicRequest.IsSetIdentityProvider()) - { - context.Writer.WritePropertyName("IdentityProvider"); - context.Writer.WriteObjectStart(); - - var marshaller = IdentityProviderMarshaller.Instance; - marshaller.Marshall(publicRequest.IdentityProvider, context); - - context.Writer.WriteObjectEnd(); - } - - if(publicRequest.IsSetProduct()) - { - context.Writer.WritePropertyName("Product"); - context.Writer.Write(publicRequest.Product); - } - - if(publicRequest.IsSetUsername()) - { - context.Writer.WritePropertyName("Username"); - context.Writer.Write(publicRequest.Username); - } - - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); -======= - if(publicRequest.IsSetIdentityProvider()) - { - context.Writer.WritePropertyName("IdentityProvider"); - context.Writer.WriteObjectStart(); - - var marshaller = IdentityProviderMarshaller.Instance; - marshaller.Marshall(publicRequest.IdentityProvider, context); - - context.Writer.WriteObjectEnd(); - } - - if(publicRequest.IsSetProduct()) - { - context.Writer.WritePropertyName("Product"); - context.Writer.Write(publicRequest.Product); - } - - if(publicRequest.IsSetProductUserArn()) - { - context.Writer.WritePropertyName("ProductUserArn"); - context.Writer.Write(publicRequest.ProductUserArn); - } - - if(publicRequest.IsSetUsername()) - { - context.Writer.WritePropertyName("Username"); - context.Writer.Write(publicRequest.Username); - } - - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b } diff --git a/sdk/src/Services/LicenseManagerUserSubscriptions/Generated/Model/Internal/MarshallTransformations/TagResourceRequestMarshaller.cs b/sdk/src/Services/LicenseManagerUserSubscriptions/Generated/Model/Internal/MarshallTransformations/TagResourceRequestMarshaller.cs index d8491126da0e..093692871252 100644 --- a/sdk/src/Services/LicenseManagerUserSubscriptions/Generated/Model/Internal/MarshallTransformations/TagResourceRequestMarshaller.cs +++ b/sdk/src/Services/LicenseManagerUserSubscriptions/Generated/Model/Internal/MarshallTransformations/TagResourceRequestMarshaller.cs @@ -64,29 +64,32 @@ public IRequest Marshall(TagResourceRequest publicRequest) throw new AmazonLicenseManagerUserSubscriptionsException("Request object does not have required field ResourceArn set"); request.AddPathResource("{ResourceArn}", StringUtils.FromString(publicRequest.ResourceArn)); request.ResourcePath = "/tags/{ResourceArn}"; - using (StringWriter stringWriter = new StringWriter(CultureInfo.InvariantCulture)) + using (MemoryStream memoryStream = new MemoryStream()) { - JsonWriter writer = new JsonWriter(stringWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetTags()) + using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) { - context.Writer.WritePropertyName("Tags"); - context.Writer.WriteObjectStart(); - foreach (var publicRequestTagsKvp in publicRequest.Tags) + JsonWriter writer = new JsonWriter(streamWriter); + writer.Validate = false; + writer.WriteObjectStart(); + var context = new JsonMarshallerContext(request, writer); + if(publicRequest.IsSetTags()) { - context.Writer.WritePropertyName(publicRequestTagsKvp.Key); - var publicRequestTagsValue = publicRequestTagsKvp.Value; + context.Writer.WritePropertyName("Tags"); + context.Writer.WriteObjectStart(); + foreach (var publicRequestTagsKvp in publicRequest.Tags) + { + context.Writer.WritePropertyName(publicRequestTagsKvp.Key); + var publicRequestTagsValue = publicRequestTagsKvp.Value; - context.Writer.Write(publicRequestTagsValue); + context.Writer.Write(publicRequestTagsValue); + } + context.Writer.WriteObjectEnd(); } - context.Writer.WriteObjectEnd(); + + writer.WriteObjectEnd(); } - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); + request.Content = memoryStream.ToArray(); } diff --git a/sdk/src/Services/LicenseManagerUserSubscriptions/Generated/Model/Internal/MarshallTransformations/UpdateIdentityProviderSettingsRequestMarshaller.cs b/sdk/src/Services/LicenseManagerUserSubscriptions/Generated/Model/Internal/MarshallTransformations/UpdateIdentityProviderSettingsRequestMarshaller.cs index 6ded44949be6..e7f2e4508adf 100644 --- a/sdk/src/Services/LicenseManagerUserSubscriptions/Generated/Model/Internal/MarshallTransformations/UpdateIdentityProviderSettingsRequestMarshaller.cs +++ b/sdk/src/Services/LicenseManagerUserSubscriptions/Generated/Model/Internal/MarshallTransformations/UpdateIdentityProviderSettingsRequestMarshaller.cs @@ -65,7 +65,6 @@ public IRequest Marshall(UpdateIdentityProviderSettingsRequest publicRequest) { using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) { -<<<<<<< HEAD JsonWriter writer = new JsonWriter(streamWriter); writer.Validate = false; writer.WriteObjectStart(); @@ -81,6 +80,12 @@ public IRequest Marshall(UpdateIdentityProviderSettingsRequest publicRequest) context.Writer.WriteObjectEnd(); } + if(publicRequest.IsSetIdentityProviderArn()) + { + context.Writer.WritePropertyName("IdentityProviderArn"); + context.Writer.Write(publicRequest.IdentityProviderArn); + } + if(publicRequest.IsSetProduct()) { context.Writer.WritePropertyName("Product"); @@ -99,63 +104,6 @@ public IRequest Marshall(UpdateIdentityProviderSettingsRequest publicRequest) } writer.WriteObjectEnd(); -||||||| Commit version number update changes - context.Writer.WritePropertyName("IdentityProvider"); - context.Writer.WriteObjectStart(); - - var marshaller = IdentityProviderMarshaller.Instance; - marshaller.Marshall(publicRequest.IdentityProvider, context); - - context.Writer.WriteObjectEnd(); - } - - if(publicRequest.IsSetProduct()) - { - context.Writer.WritePropertyName("Product"); - context.Writer.Write(publicRequest.Product); - } - - if(publicRequest.IsSetUpdateSettings()) - { - context.Writer.WritePropertyName("UpdateSettings"); - context.Writer.WriteObjectStart(); - - var marshaller = UpdateSettingsMarshaller.Instance; - marshaller.Marshall(publicRequest.UpdateSettings, context); - - context.Writer.WriteObjectEnd(); -======= - context.Writer.WritePropertyName("IdentityProvider"); - context.Writer.WriteObjectStart(); - - var marshaller = IdentityProviderMarshaller.Instance; - marshaller.Marshall(publicRequest.IdentityProvider, context); - - context.Writer.WriteObjectEnd(); - } - - if(publicRequest.IsSetIdentityProviderArn()) - { - context.Writer.WritePropertyName("IdentityProviderArn"); - context.Writer.Write(publicRequest.IdentityProviderArn); - } - - if(publicRequest.IsSetProduct()) - { - context.Writer.WritePropertyName("Product"); - context.Writer.Write(publicRequest.Product); - } - - if(publicRequest.IsSetUpdateSettings()) - { - context.Writer.WritePropertyName("UpdateSettings"); - context.Writer.WriteObjectStart(); - - var marshaller = UpdateSettingsMarshaller.Instance; - marshaller.Marshall(publicRequest.UpdateSettings, context); - - context.Writer.WriteObjectEnd(); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b } request.Content = memoryStream.ToArray(); diff --git a/sdk/src/Services/LicenseManagerUserSubscriptions/Generated/Model/LicenseServerEndpoint.cs b/sdk/src/Services/LicenseManagerUserSubscriptions/Generated/Model/LicenseServerEndpoint.cs index a932da572fc7..ec1dc963661d 100644 --- a/sdk/src/Services/LicenseManagerUserSubscriptions/Generated/Model/LicenseServerEndpoint.cs +++ b/sdk/src/Services/LicenseManagerUserSubscriptions/Generated/Model/LicenseServerEndpoint.cs @@ -51,9 +51,9 @@ public partial class LicenseServerEndpoint /// The timestamp when License Manager created the license server endpoint. /// /// - public DateTime CreationTime + public DateTime? CreationTime { - get { return this._creationTime.GetValueOrDefault(); } + get { return this._creationTime; } set { this._creationTime = value; } } diff --git a/sdk/src/Services/LicenseManagerUserSubscriptions/Generated/Model/ListLicenseServerEndpointsRequest.cs b/sdk/src/Services/LicenseManagerUserSubscriptions/Generated/Model/ListLicenseServerEndpointsRequest.cs index db2193458214..dd88a03a086c 100644 --- a/sdk/src/Services/LicenseManagerUserSubscriptions/Generated/Model/ListLicenseServerEndpointsRequest.cs +++ b/sdk/src/Services/LicenseManagerUserSubscriptions/Generated/Model/ListLicenseServerEndpointsRequest.cs @@ -69,9 +69,9 @@ internal bool IsSetFilters() /// /// [AWSProperty(Min=1, Max=100)] - public int MaxResults + public int? MaxResults { - get { return this._maxResults.GetValueOrDefault(); } + get { return this._maxResults; } set { this._maxResults = value; } } diff --git a/sdk/src/Services/LicenseManagerUserSubscriptions/Generated/Model/_bcl45+netstandard/IListLicenseServerEndpointsPaginator.cs b/sdk/src/Services/LicenseManagerUserSubscriptions/Generated/Model/_bcl+netstandard/IListLicenseServerEndpointsPaginator.cs similarity index 100% rename from sdk/src/Services/LicenseManagerUserSubscriptions/Generated/Model/_bcl45+netstandard/IListLicenseServerEndpointsPaginator.cs rename to sdk/src/Services/LicenseManagerUserSubscriptions/Generated/Model/_bcl+netstandard/IListLicenseServerEndpointsPaginator.cs diff --git a/sdk/src/Services/LicenseManagerUserSubscriptions/Generated/Model/_bcl45+netstandard/ListLicenseServerEndpointsPaginator.cs b/sdk/src/Services/LicenseManagerUserSubscriptions/Generated/Model/_bcl+netstandard/ListLicenseServerEndpointsPaginator.cs similarity index 100% rename from sdk/src/Services/LicenseManagerUserSubscriptions/Generated/Model/_bcl45+netstandard/ListLicenseServerEndpointsPaginator.cs rename to sdk/src/Services/LicenseManagerUserSubscriptions/Generated/Model/_bcl+netstandard/ListLicenseServerEndpointsPaginator.cs diff --git a/sdk/src/Services/LicenseManagerUserSubscriptions/Generated/_bcl/AmazonLicenseManagerUserSubscriptionsClient.cs b/sdk/src/Services/LicenseManagerUserSubscriptions/Generated/_bcl/AmazonLicenseManagerUserSubscriptionsClient.cs index d2a517e43382..8615afa65336 100644 --- a/sdk/src/Services/LicenseManagerUserSubscriptions/Generated/_bcl/AmazonLicenseManagerUserSubscriptionsClient.cs +++ b/sdk/src/Services/LicenseManagerUserSubscriptions/Generated/_bcl/AmazonLicenseManagerUserSubscriptionsClient.cs @@ -369,11 +369,182 @@ public virtual AssociateUserResponse AssociateUser(AssociateUserRequest request) #endregion + #region CreateLicenseServerEndpoint + + + /// + /// Creates a network endpoint for the Remote Desktop Services (RDS) license server. + /// + /// Container for the necessary parameters to execute the CreateLicenseServerEndpoint service method. + /// + /// The response from the CreateLicenseServerEndpoint service method, as returned by LicenseManagerUserSubscriptions. + /// + /// You don't have sufficient access to perform this action. + /// + /// + /// The request couldn't be completed because it conflicted with the current state of + /// the resource. + /// + /// + /// An exception occurred with the service. + /// + /// + /// The resource couldn't be found. + /// + /// + /// The request failed because a service quota is exceeded. + /// + /// + /// The request was denied because of request throttling. Retry the request. + /// + /// + /// A parameter is not valid. + /// + /// REST API Reference for CreateLicenseServerEndpoint Operation + public virtual CreateLicenseServerEndpointResponse CreateLicenseServerEndpoint(CreateLicenseServerEndpointRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = CreateLicenseServerEndpointRequestMarshaller.Instance; + options.ResponseUnmarshaller = CreateLicenseServerEndpointResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// Creates a network endpoint for the Remote Desktop Services (RDS) license server. + /// + /// Container for the necessary parameters to execute the CreateLicenseServerEndpoint service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the CreateLicenseServerEndpoint service method, as returned by LicenseManagerUserSubscriptions. + /// + /// You don't have sufficient access to perform this action. + /// + /// + /// The request couldn't be completed because it conflicted with the current state of + /// the resource. + /// + /// + /// An exception occurred with the service. + /// + /// + /// The resource couldn't be found. + /// + /// + /// The request failed because a service quota is exceeded. + /// + /// + /// The request was denied because of request throttling. Retry the request. + /// + /// + /// A parameter is not valid. + /// + /// REST API Reference for CreateLicenseServerEndpoint Operation + public virtual Task CreateLicenseServerEndpointAsync(CreateLicenseServerEndpointRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = CreateLicenseServerEndpointRequestMarshaller.Instance; + options.ResponseUnmarshaller = CreateLicenseServerEndpointResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + + #region DeleteLicenseServerEndpoint + + + /// + /// Deletes a LicenseServerEndpoint resource. + /// + /// Container for the necessary parameters to execute the DeleteLicenseServerEndpoint service method. + /// + /// The response from the DeleteLicenseServerEndpoint service method, as returned by LicenseManagerUserSubscriptions. + /// + /// You don't have sufficient access to perform this action. + /// + /// + /// The request couldn't be completed because it conflicted with the current state of + /// the resource. + /// + /// + /// An exception occurred with the service. + /// + /// + /// The resource couldn't be found. + /// + /// + /// The request failed because a service quota is exceeded. + /// + /// + /// The request was denied because of request throttling. Retry the request. + /// + /// + /// A parameter is not valid. + /// + /// REST API Reference for DeleteLicenseServerEndpoint Operation + public virtual DeleteLicenseServerEndpointResponse DeleteLicenseServerEndpoint(DeleteLicenseServerEndpointRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = DeleteLicenseServerEndpointRequestMarshaller.Instance; + options.ResponseUnmarshaller = DeleteLicenseServerEndpointResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// Deletes a LicenseServerEndpoint resource. + /// + /// Container for the necessary parameters to execute the DeleteLicenseServerEndpoint service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the DeleteLicenseServerEndpoint service method, as returned by LicenseManagerUserSubscriptions. + /// + /// You don't have sufficient access to perform this action. + /// + /// + /// The request couldn't be completed because it conflicted with the current state of + /// the resource. + /// + /// + /// An exception occurred with the service. + /// + /// + /// The resource couldn't be found. + /// + /// + /// The request failed because a service quota is exceeded. + /// + /// + /// The request was denied because of request throttling. Retry the request. + /// + /// + /// A parameter is not valid. + /// + /// REST API Reference for DeleteLicenseServerEndpoint Operation + public virtual Task DeleteLicenseServerEndpointAsync(DeleteLicenseServerEndpointRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = DeleteLicenseServerEndpointRequestMarshaller.Instance; + options.ResponseUnmarshaller = DeleteLicenseServerEndpointResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + #region DeregisterIdentityProvider /// - /// Deregisters the identity provider from providing user-based subscriptions. + /// Deregisters the Active Directory identity provider from License Manager user-based + /// subscriptions. /// /// Container for the necessary parameters to execute the DeregisterIdentityProvider service method. /// @@ -412,7 +583,8 @@ public virtual DeregisterIdentityProviderResponse DeregisterIdentityProvider(Der /// - /// Deregisters the identity provider from providing user-based subscriptions. + /// Deregisters the Active Directory identity provider from License Manager user-based + /// subscriptions. /// /// Container for the necessary parameters to execute the DeregisterIdentityProvider service method. /// @@ -543,7 +715,7 @@ public virtual DisassociateUserResponse DisassociateUser(DisassociateUserRequest /// - /// Lists the identity providers for user-based subscriptions. + /// Lists the Active Directory identity providers for user-based subscriptions. /// /// Container for the necessary parameters to execute the ListIdentityProviders service method. /// @@ -582,7 +754,7 @@ public virtual ListIdentityProvidersResponse ListIdentityProviders(ListIdentityP /// - /// Lists the identity providers for user-based subscriptions. + /// Lists the Active Directory identity providers for user-based subscriptions. /// /// Container for the necessary parameters to execute the ListIdentityProviders service method. /// @@ -709,6 +881,85 @@ public virtual ListInstancesResponse ListInstances(ListInstancesRequest request) #endregion + #region ListLicenseServerEndpoints + + + /// + /// List the Remote Desktop Services (RDS) License Server endpoints + /// + /// Container for the necessary parameters to execute the ListLicenseServerEndpoints service method. + /// + /// The response from the ListLicenseServerEndpoints service method, as returned by LicenseManagerUserSubscriptions. + /// + /// You don't have sufficient access to perform this action. + /// + /// + /// The request couldn't be completed because it conflicted with the current state of + /// the resource. + /// + /// + /// An exception occurred with the service. + /// + /// + /// The request failed because a service quota is exceeded. + /// + /// + /// The request was denied because of request throttling. Retry the request. + /// + /// + /// A parameter is not valid. + /// + /// REST API Reference for ListLicenseServerEndpoints Operation + public virtual ListLicenseServerEndpointsResponse ListLicenseServerEndpoints(ListLicenseServerEndpointsRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = ListLicenseServerEndpointsRequestMarshaller.Instance; + options.ResponseUnmarshaller = ListLicenseServerEndpointsResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// List the Remote Desktop Services (RDS) License Server endpoints + /// + /// Container for the necessary parameters to execute the ListLicenseServerEndpoints service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the ListLicenseServerEndpoints service method, as returned by LicenseManagerUserSubscriptions. + /// + /// You don't have sufficient access to perform this action. + /// + /// + /// The request couldn't be completed because it conflicted with the current state of + /// the resource. + /// + /// + /// An exception occurred with the service. + /// + /// + /// The request failed because a service quota is exceeded. + /// + /// + /// The request was denied because of request throttling. Retry the request. + /// + /// + /// A parameter is not valid. + /// + /// REST API Reference for ListLicenseServerEndpoints Operation + public virtual Task ListLicenseServerEndpointsAsync(ListLicenseServerEndpointsRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = ListLicenseServerEndpointsRequestMarshaller.Instance; + options.ResponseUnmarshaller = ListLicenseServerEndpointsResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + #region ListProductSubscriptions @@ -794,6 +1045,65 @@ public virtual ListProductSubscriptionsResponse ListProductSubscriptions(ListPro #endregion + #region ListTagsForResource + + + /// + /// Returns the list of tags for the specified resource. + /// + /// Container for the necessary parameters to execute the ListTagsForResource service method. + /// + /// The response from the ListTagsForResource service method, as returned by LicenseManagerUserSubscriptions. + /// + /// An exception occurred with the service. + /// + /// + /// The resource couldn't be found. + /// + /// + /// A parameter is not valid. + /// + /// REST API Reference for ListTagsForResource Operation + public virtual ListTagsForResourceResponse ListTagsForResource(ListTagsForResourceRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = ListTagsForResourceRequestMarshaller.Instance; + options.ResponseUnmarshaller = ListTagsForResourceResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// Returns the list of tags for the specified resource. + /// + /// Container for the necessary parameters to execute the ListTagsForResource service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the ListTagsForResource service method, as returned by LicenseManagerUserSubscriptions. + /// + /// An exception occurred with the service. + /// + /// + /// The resource couldn't be found. + /// + /// + /// A parameter is not valid. + /// + /// REST API Reference for ListTagsForResource Operation + public virtual Task ListTagsForResourceAsync(ListTagsForResourceRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = ListTagsForResourceRequestMarshaller.Instance; + options.ResponseUnmarshaller = ListTagsForResourceResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + #region ListUserAssociations @@ -1152,6 +1462,118 @@ public virtual StopProductSubscriptionResponse StopProductSubscription(StopProdu #endregion + #region TagResource + + + /// + /// Adds tags to a resource. + /// + /// Container for the necessary parameters to execute the TagResource service method. + /// + /// The response from the TagResource service method, as returned by LicenseManagerUserSubscriptions. + /// + /// An exception occurred with the service. + /// + /// + /// The resource couldn't be found. + /// + /// + /// A parameter is not valid. + /// + /// REST API Reference for TagResource Operation + public virtual TagResourceResponse TagResource(TagResourceRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = TagResourceRequestMarshaller.Instance; + options.ResponseUnmarshaller = TagResourceResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// Adds tags to a resource. + /// + /// Container for the necessary parameters to execute the TagResource service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the TagResource service method, as returned by LicenseManagerUserSubscriptions. + /// + /// An exception occurred with the service. + /// + /// + /// The resource couldn't be found. + /// + /// + /// A parameter is not valid. + /// + /// REST API Reference for TagResource Operation + public virtual Task TagResourceAsync(TagResourceRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = TagResourceRequestMarshaller.Instance; + options.ResponseUnmarshaller = TagResourceResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + + #region UntagResource + + + /// + /// Removes tags from a resource. + /// + /// Container for the necessary parameters to execute the UntagResource service method. + /// + /// The response from the UntagResource service method, as returned by LicenseManagerUserSubscriptions. + /// + /// An exception occurred with the service. + /// + /// + /// The resource couldn't be found. + /// + /// REST API Reference for UntagResource Operation + public virtual UntagResourceResponse UntagResource(UntagResourceRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = UntagResourceRequestMarshaller.Instance; + options.ResponseUnmarshaller = UntagResourceResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// Removes tags from a resource. + /// + /// Container for the necessary parameters to execute the UntagResource service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the UntagResource service method, as returned by LicenseManagerUserSubscriptions. + /// + /// An exception occurred with the service. + /// + /// + /// The resource couldn't be found. + /// + /// REST API Reference for UntagResource Operation + public virtual Task UntagResourceAsync(UntagResourceRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = UntagResourceRequestMarshaller.Instance; + options.ResponseUnmarshaller = UntagResourceResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + #region UpdateIdentityProviderSettings diff --git a/sdk/src/Services/LicenseManagerUserSubscriptions/LicenseManagerUserSubscriptions.sln b/sdk/src/Services/LicenseManagerUserSubscriptions/LicenseManagerUserSubscriptions.sln index 8d7c23f13267..caeb932f01ac 100644 --- a/sdk/src/Services/LicenseManagerUserSubscriptions/LicenseManagerUserSubscriptions.sln +++ b/sdk/src/Services/LicenseManagerUserSubscriptions/LicenseManagerUserSubscriptions.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {82704CC5-7A75-4EA7-A5B5-23078F8EC308}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {82704CC5-7A75-4EA7-A5B5-23078F8EC308}.Debug|Any CPU.Build.0 = Debug|Any CPU {82704CC5-7A75-4EA7-A5B5-23078F8EC308}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {389C142D-8312-427E-BF6B-5C00AA316736}.Debug|Any CPU.Build.0 = Debug|Any CPU {389C142D-8312-427E-BF6B-5C00AA316736}.Release|Any CPU.ActiveCfg = Release|Any CPU {389C142D-8312-427E-BF6B-5C00AA316736}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {7CE98E70-1875-43A7-AEF5-6E1F7C832442}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7CE98E70-1875-43A7-AEF5-6E1F7C832442}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7CE98E70-1875-43A7-AEF5-6E1F7C832442}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7CE98E70-1875-43A7-AEF5-6E1F7C832442}.Release|Any CPU.Build.0 = Release|Any CPU - {A4DD6B9E-CACF-43DF-8AD7-855738D10945}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A4DD6B9E-CACF-43DF-8AD7-855738D10945}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A4DD6B9E-CACF-43DF-8AD7-855738D10945}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A4DD6B9E-CACF-43DF-8AD7-855738D10945}.Release|Any CPU.Build.0 = Release|Any CPU - {CF9FCF58-A43A-4DAE-820F-B5A21E1AAF68}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CF9FCF58-A43A-4DAE-820F-B5A21E1AAF68}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CF9FCF58-A43A-4DAE-820F-B5A21E1AAF68}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CF9FCF58-A43A-4DAE-820F-B5A21E1AAF68}.Release|Any CPU.Build.0 = Release|Any CPU - {322AAD45-95EA-4E95-B7BC-AA2CA2C41124}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {322AAD45-95EA-4E95-B7BC-AA2CA2C41124}.Debug|Any CPU.Build.0 = Debug|Any CPU - {322AAD45-95EA-4E95-B7BC-AA2CA2C41124}.Release|Any CPU.ActiveCfg = Release|Any CPU - {322AAD45-95EA-4E95-B7BC-AA2CA2C41124}.Release|Any CPU.Build.0 = Release|Any CPU - {D92545D9-463B-48D9-98E7-5361C075D945}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D92545D9-463B-48D9-98E7-5361C075D945}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D92545D9-463B-48D9-98E7-5361C075D945}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D92545D9-463B-48D9-98E7-5361C075D945}.Release|Any CPU.Build.0 = Release|Any CPU - {44992E24-3BA6-402D-ADDD-B56323B715F0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {44992E24-3BA6-402D-ADDD-B56323B715F0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {44992E24-3BA6-402D-ADDD-B56323B715F0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {44992E24-3BA6-402D-ADDD-B56323B715F0}.Release|Any CPU.Build.0 = Release|Any CPU - {B6984888-389E-421F-8BD4-0FB477892B15}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B6984888-389E-421F-8BD4-0FB477892B15}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B6984888-389E-421F-8BD4-0FB477892B15}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B6984888-389E-421F-8BD4-0FB477892B15}.Release|Any CPU.Build.0 = Release|Any CPU - {F5C96B01-6689-46B6-A91C-CF429DA981F2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F5C96B01-6689-46B6-A91C-CF429DA981F2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F5C96B01-6689-46B6-A91C-CF429DA981F2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F5C96B01-6689-46B6-A91C-CF429DA981F2}.Release|Any CPU.Build.0 = Release|Any CPU - {941499C5-E0BC-4C00-952F-E7810882B96C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {941499C5-E0BC-4C00-952F-E7810882B96C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {941499C5-E0BC-4C00-952F-E7810882B96C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {941499C5-E0BC-4C00-952F-E7810882B96C}.Release|Any CPU.Build.0 = Release|Any CPU - {097A39F0-9901-4AD8-902D-520A8C1637B7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {097A39F0-9901-4AD8-902D-520A8C1637B7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {097A39F0-9901-4AD8-902D-520A8C1637B7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {097A39F0-9901-4AD8-902D-520A8C1637B7}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {7CE98E70-1875-43A7-AEF5-6E1F7C832442}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7CE98E70-1875-43A7-AEF5-6E1F7C832442}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7CE98E70-1875-43A7-AEF5-6E1F7C832442}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7CE98E70-1875-43A7-AEF5-6E1F7C832442}.Release|Any CPU.Build.0 = Release|Any CPU - {A4DD6B9E-CACF-43DF-8AD7-855738D10945}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A4DD6B9E-CACF-43DF-8AD7-855738D10945}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A4DD6B9E-CACF-43DF-8AD7-855738D10945}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A4DD6B9E-CACF-43DF-8AD7-855738D10945}.Release|Any CPU.Build.0 = Release|Any CPU - {CF9FCF58-A43A-4DAE-820F-B5A21E1AAF68}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CF9FCF58-A43A-4DAE-820F-B5A21E1AAF68}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CF9FCF58-A43A-4DAE-820F-B5A21E1AAF68}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CF9FCF58-A43A-4DAE-820F-B5A21E1AAF68}.Release|Any CPU.Build.0 = Release|Any CPU - {322AAD45-95EA-4E95-B7BC-AA2CA2C41124}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {322AAD45-95EA-4E95-B7BC-AA2CA2C41124}.Debug|Any CPU.Build.0 = Debug|Any CPU - {322AAD45-95EA-4E95-B7BC-AA2CA2C41124}.Release|Any CPU.ActiveCfg = Release|Any CPU - {322AAD45-95EA-4E95-B7BC-AA2CA2C41124}.Release|Any CPU.Build.0 = Release|Any CPU - {D92545D9-463B-48D9-98E7-5361C075D945}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D92545D9-463B-48D9-98E7-5361C075D945}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D92545D9-463B-48D9-98E7-5361C075D945}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D92545D9-463B-48D9-98E7-5361C075D945}.Release|Any CPU.Build.0 = Release|Any CPU - {44992E24-3BA6-402D-ADDD-B56323B715F0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {44992E24-3BA6-402D-ADDD-B56323B715F0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {44992E24-3BA6-402D-ADDD-B56323B715F0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {44992E24-3BA6-402D-ADDD-B56323B715F0}.Release|Any CPU.Build.0 = Release|Any CPU - {B6984888-389E-421F-8BD4-0FB477892B15}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B6984888-389E-421F-8BD4-0FB477892B15}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B6984888-389E-421F-8BD4-0FB477892B15}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B6984888-389E-421F-8BD4-0FB477892B15}.Release|Any CPU.Build.0 = Release|Any CPU - {F5C96B01-6689-46B6-A91C-CF429DA981F2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F5C96B01-6689-46B6-A91C-CF429DA981F2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F5C96B01-6689-46B6-A91C-CF429DA981F2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F5C96B01-6689-46B6-A91C-CF429DA981F2}.Release|Any CPU.Build.0 = Release|Any CPU - {941499C5-E0BC-4C00-952F-E7810882B96C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {941499C5-E0BC-4C00-952F-E7810882B96C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {941499C5-E0BC-4C00-952F-E7810882B96C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {941499C5-E0BC-4C00-952F-E7810882B96C}.Release|Any CPU.Build.0 = Release|Any CPU - {097A39F0-9901-4AD8-902D-520A8C1637B7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {097A39F0-9901-4AD8-902D-520A8C1637B7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {097A39F0-9901-4AD8-902D-520A8C1637B7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {097A39F0-9901-4AD8-902D-520A8C1637B7}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {82704CC5-7A75-4EA7-A5B5-23078F8EC308} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {06AD065F-EBAC-4382-AAB3-DA75E5074F2F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {03CEF277-5526-4A87-AE6E-27A3C6D51B61} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {AB12BCB0-96EF-4E43-B007-536AA41BCE82} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {389C142D-8312-427E-BF6B-5C00AA316736} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {7CE98E70-1875-43A7-AEF5-6E1F7C832442} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A4DD6B9E-CACF-43DF-8AD7-855738D10945} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {CF9FCF58-A43A-4DAE-820F-B5A21E1AAF68} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {322AAD45-95EA-4E95-B7BC-AA2CA2C41124} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D92545D9-463B-48D9-98E7-5361C075D945} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {44992E24-3BA6-402D-ADDD-B56323B715F0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B6984888-389E-421F-8BD4-0FB477892B15} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F5C96B01-6689-46B6-A91C-CF429DA981F2} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {941499C5-E0BC-4C00-952F-E7810882B96C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {097A39F0-9901-4AD8-902D-520A8C1637B7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {7CE98E70-1875-43A7-AEF5-6E1F7C832442} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A4DD6B9E-CACF-43DF-8AD7-855738D10945} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {CF9FCF58-A43A-4DAE-820F-B5A21E1AAF68} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {322AAD45-95EA-4E95-B7BC-AA2CA2C41124} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D92545D9-463B-48D9-98E7-5361C075D945} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {44992E24-3BA6-402D-ADDD-B56323B715F0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B6984888-389E-421F-8BD4-0FB477892B15} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F5C96B01-6689-46B6-A91C-CF429DA981F2} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {941499C5-E0BC-4C00-952F-E7810882B96C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {097A39F0-9901-4AD8-902D-520A8C1637B7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {F22BA933-603E-46F1-8EB3-60AAF18531B1} diff --git a/sdk/src/Services/LicenseManagerUserSubscriptions/Properties/AssemblyInfo.cs b/sdk/src/Services/LicenseManagerUserSubscriptions/Properties/AssemblyInfo.cs index cdef4492baa3..253997ffc268 100644 --- a/sdk/src/Services/LicenseManagerUserSubscriptions/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/LicenseManagerUserSubscriptions/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.2")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/Lightsail/Generated/AmazonLightsailConfig.cs b/sdk/src/Services/Lightsail/Generated/AmazonLightsailConfig.cs index 00ebdda94093..be39d157b4a4 100644 --- a/sdk/src/Services/Lightsail/Generated/AmazonLightsailConfig.cs +++ b/sdk/src/Services/Lightsail/Generated/AmazonLightsailConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.Lightsail public partial class AmazonLightsailConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("Lightsail", "4.0.0.0"); private static readonly AmazonLightsailEndpointResolver EndpointResolver = new AmazonLightsailEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("Lightsail", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("Lightsail", "3.7.400.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/Lightsail/Lightsail.sln b/sdk/src/Services/Lightsail/Lightsail.sln index 1c3680d0208d..3d341774b0fc 100644 --- a/sdk/src/Services/Lightsail/Lightsail.sln +++ b/sdk/src/Services/Lightsail/Lightsail.sln @@ -92,7 +92,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {DE36087E-04BD-41EC-A044-9B404D6E2732}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {DE36087E-04BD-41EC-A044-9B404D6E2732}.Debug|Any CPU.Build.0 = Debug|Any CPU {DE36087E-04BD-41EC-A044-9B404D6E2732}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -113,97 +120,6 @@ Global {25880924-861F-4907-AB46-50A49A3357F2}.Debug|Any CPU.Build.0 = Debug|Any CPU {25880924-861F-4907-AB46-50A49A3357F2}.Release|Any CPU.ActiveCfg = Release|Any CPU {25880924-861F-4907-AB46-50A49A3357F2}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {A78D903D-A4CC-4D1D-973C-87BFD143362D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A78D903D-A4CC-4D1D-973C-87BFD143362D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A78D903D-A4CC-4D1D-973C-87BFD143362D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A78D903D-A4CC-4D1D-973C-87BFD143362D}.Release|Any CPU.Build.0 = Release|Any CPU - {1386F9F9-49F8-4907-B627-E68CAD9F8DFE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1386F9F9-49F8-4907-B627-E68CAD9F8DFE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1386F9F9-49F8-4907-B627-E68CAD9F8DFE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1386F9F9-49F8-4907-B627-E68CAD9F8DFE}.Release|Any CPU.Build.0 = Release|Any CPU - {6E63902F-0E9C-4ACA-AB65-6EA86C3C51ED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6E63902F-0E9C-4ACA-AB65-6EA86C3C51ED}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6E63902F-0E9C-4ACA-AB65-6EA86C3C51ED}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6E63902F-0E9C-4ACA-AB65-6EA86C3C51ED}.Release|Any CPU.Build.0 = Release|Any CPU - {7851C33A-FA9B-4A90-8DBC-786F11972544}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7851C33A-FA9B-4A90-8DBC-786F11972544}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7851C33A-FA9B-4A90-8DBC-786F11972544}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7851C33A-FA9B-4A90-8DBC-786F11972544}.Release|Any CPU.Build.0 = Release|Any CPU - {C643192E-7700-45BE-AB2C-D5E364246803}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C643192E-7700-45BE-AB2C-D5E364246803}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C643192E-7700-45BE-AB2C-D5E364246803}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C643192E-7700-45BE-AB2C-D5E364246803}.Release|Any CPU.Build.0 = Release|Any CPU - {5109FA00-8588-49B4-AC61-C0180A3394A4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5109FA00-8588-49B4-AC61-C0180A3394A4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5109FA00-8588-49B4-AC61-C0180A3394A4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5109FA00-8588-49B4-AC61-C0180A3394A4}.Release|Any CPU.Build.0 = Release|Any CPU - {2CF8D433-7219-400F-9F22-EFDEA7657A0C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2CF8D433-7219-400F-9F22-EFDEA7657A0C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2CF8D433-7219-400F-9F22-EFDEA7657A0C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2CF8D433-7219-400F-9F22-EFDEA7657A0C}.Release|Any CPU.Build.0 = Release|Any CPU - {6BF2A0A1-248C-4D18-9595-2EF2E59D2BEA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6BF2A0A1-248C-4D18-9595-2EF2E59D2BEA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6BF2A0A1-248C-4D18-9595-2EF2E59D2BEA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6BF2A0A1-248C-4D18-9595-2EF2E59D2BEA}.Release|Any CPU.Build.0 = Release|Any CPU - {9D2650E2-6664-498C-ADAD-236F3C0E082C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9D2650E2-6664-498C-ADAD-236F3C0E082C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9D2650E2-6664-498C-ADAD-236F3C0E082C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9D2650E2-6664-498C-ADAD-236F3C0E082C}.Release|Any CPU.Build.0 = Release|Any CPU - {8A94655C-B15F-4381-B415-8D45A091D51D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8A94655C-B15F-4381-B415-8D45A091D51D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8A94655C-B15F-4381-B415-8D45A091D51D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8A94655C-B15F-4381-B415-8D45A091D51D}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {A78D903D-A4CC-4D1D-973C-87BFD143362D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A78D903D-A4CC-4D1D-973C-87BFD143362D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A78D903D-A4CC-4D1D-973C-87BFD143362D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A78D903D-A4CC-4D1D-973C-87BFD143362D}.Release|Any CPU.Build.0 = Release|Any CPU - {1386F9F9-49F8-4907-B627-E68CAD9F8DFE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1386F9F9-49F8-4907-B627-E68CAD9F8DFE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1386F9F9-49F8-4907-B627-E68CAD9F8DFE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1386F9F9-49F8-4907-B627-E68CAD9F8DFE}.Release|Any CPU.Build.0 = Release|Any CPU - {6E63902F-0E9C-4ACA-AB65-6EA86C3C51ED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6E63902F-0E9C-4ACA-AB65-6EA86C3C51ED}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6E63902F-0E9C-4ACA-AB65-6EA86C3C51ED}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6E63902F-0E9C-4ACA-AB65-6EA86C3C51ED}.Release|Any CPU.Build.0 = Release|Any CPU - {7851C33A-FA9B-4A90-8DBC-786F11972544}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7851C33A-FA9B-4A90-8DBC-786F11972544}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7851C33A-FA9B-4A90-8DBC-786F11972544}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7851C33A-FA9B-4A90-8DBC-786F11972544}.Release|Any CPU.Build.0 = Release|Any CPU - {C643192E-7700-45BE-AB2C-D5E364246803}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C643192E-7700-45BE-AB2C-D5E364246803}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C643192E-7700-45BE-AB2C-D5E364246803}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C643192E-7700-45BE-AB2C-D5E364246803}.Release|Any CPU.Build.0 = Release|Any CPU - {5109FA00-8588-49B4-AC61-C0180A3394A4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5109FA00-8588-49B4-AC61-C0180A3394A4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5109FA00-8588-49B4-AC61-C0180A3394A4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5109FA00-8588-49B4-AC61-C0180A3394A4}.Release|Any CPU.Build.0 = Release|Any CPU - {2CF8D433-7219-400F-9F22-EFDEA7657A0C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2CF8D433-7219-400F-9F22-EFDEA7657A0C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2CF8D433-7219-400F-9F22-EFDEA7657A0C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2CF8D433-7219-400F-9F22-EFDEA7657A0C}.Release|Any CPU.Build.0 = Release|Any CPU - {6BF2A0A1-248C-4D18-9595-2EF2E59D2BEA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6BF2A0A1-248C-4D18-9595-2EF2E59D2BEA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6BF2A0A1-248C-4D18-9595-2EF2E59D2BEA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6BF2A0A1-248C-4D18-9595-2EF2E59D2BEA}.Release|Any CPU.Build.0 = Release|Any CPU - {9D2650E2-6664-498C-ADAD-236F3C0E082C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9D2650E2-6664-498C-ADAD-236F3C0E082C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9D2650E2-6664-498C-ADAD-236F3C0E082C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9D2650E2-6664-498C-ADAD-236F3C0E082C}.Release|Any CPU.Build.0 = Release|Any CPU - {8A94655C-B15F-4381-B415-8D45A091D51D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8A94655C-B15F-4381-B415-8D45A091D51D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8A94655C-B15F-4381-B415-8D45A091D51D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8A94655C-B15F-4381-B415-8D45A091D51D}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -220,37 +136,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {DE36087E-04BD-41EC-A044-9B404D6E2732} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {D19B49F9-0DB0-44D0-84AA-3354231E0D81} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {3594F206-99AA-44B7-A89D-E0232D951151} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {3B955DEF-A0D6-4AFE-8DE2-12C5C100A984} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {25880924-861F-4907-AB46-50A49A3357F2} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {A78D903D-A4CC-4D1D-973C-87BFD143362D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {1386F9F9-49F8-4907-B627-E68CAD9F8DFE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6E63902F-0E9C-4ACA-AB65-6EA86C3C51ED} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {7851C33A-FA9B-4A90-8DBC-786F11972544} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C643192E-7700-45BE-AB2C-D5E364246803} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {5109FA00-8588-49B4-AC61-C0180A3394A4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {2CF8D433-7219-400F-9F22-EFDEA7657A0C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6BF2A0A1-248C-4D18-9595-2EF2E59D2BEA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {9D2650E2-6664-498C-ADAD-236F3C0E082C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8A94655C-B15F-4381-B415-8D45A091D51D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {A78D903D-A4CC-4D1D-973C-87BFD143362D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {1386F9F9-49F8-4907-B627-E68CAD9F8DFE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6E63902F-0E9C-4ACA-AB65-6EA86C3C51ED} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {7851C33A-FA9B-4A90-8DBC-786F11972544} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C643192E-7700-45BE-AB2C-D5E364246803} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {5109FA00-8588-49B4-AC61-C0180A3394A4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {2CF8D433-7219-400F-9F22-EFDEA7657A0C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6BF2A0A1-248C-4D18-9595-2EF2E59D2BEA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {9D2650E2-6664-498C-ADAD-236F3C0E082C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8A94655C-B15F-4381-B415-8D45A091D51D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {290B2C00-142F-4072-9277-AA7F61E9B048} diff --git a/sdk/src/Services/Lightsail/Properties/AssemblyInfo.cs b/sdk/src/Services/Lightsail/Properties/AssemblyInfo.cs index 62a9bbc74c5f..0eff9de9b69d 100644 --- a/sdk/src/Services/Lightsail/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/Lightsail/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/LocationService/Generated/AmazonLocationServiceConfig.cs b/sdk/src/Services/LocationService/Generated/AmazonLocationServiceConfig.cs index d72f7bb820b2..60de70c54c70 100644 --- a/sdk/src/Services/LocationService/Generated/AmazonLocationServiceConfig.cs +++ b/sdk/src/Services/LocationService/Generated/AmazonLocationServiceConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.LocationService public partial class AmazonLocationServiceConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("Location", "4.0.0.0"); private static readonly AmazonLocationServiceEndpointResolver EndpointResolver = new AmazonLocationServiceEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("Location", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("Location", "3.7.400.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/LocationService/LocationService.sln b/sdk/src/Services/LocationService/LocationService.sln index 8cf135f55f8a..8ad80e4efd1c 100644 --- a/sdk/src/Services/LocationService/LocationService.sln +++ b/sdk/src/Services/LocationService/LocationService.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {35C2571F-2D52-42AB-A2D4-0D9C2EBFA7DF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {35C2571F-2D52-42AB-A2D4-0D9C2EBFA7DF}.Debug|Any CPU.Build.0 = Debug|Any CPU {35C2571F-2D52-42AB-A2D4-0D9C2EBFA7DF}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {041EAE3E-7F6B-43A1-837B-80773116BB39}.Debug|Any CPU.Build.0 = Debug|Any CPU {041EAE3E-7F6B-43A1-837B-80773116BB39}.Release|Any CPU.ActiveCfg = Release|Any CPU {041EAE3E-7F6B-43A1-837B-80773116BB39}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {D5927C46-8DC2-4D55-95E7-932C475AB661}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D5927C46-8DC2-4D55-95E7-932C475AB661}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D5927C46-8DC2-4D55-95E7-932C475AB661}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D5927C46-8DC2-4D55-95E7-932C475AB661}.Release|Any CPU.Build.0 = Release|Any CPU - {7B2AAF8E-16A9-4500-A70A-179AF3E94F10}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7B2AAF8E-16A9-4500-A70A-179AF3E94F10}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7B2AAF8E-16A9-4500-A70A-179AF3E94F10}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7B2AAF8E-16A9-4500-A70A-179AF3E94F10}.Release|Any CPU.Build.0 = Release|Any CPU - {432CCEC1-3AA3-4DC5-9EF9-47DE1BFB68D1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {432CCEC1-3AA3-4DC5-9EF9-47DE1BFB68D1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {432CCEC1-3AA3-4DC5-9EF9-47DE1BFB68D1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {432CCEC1-3AA3-4DC5-9EF9-47DE1BFB68D1}.Release|Any CPU.Build.0 = Release|Any CPU - {D9008DAC-2D72-4BD0-B142-2537AE52AA66}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D9008DAC-2D72-4BD0-B142-2537AE52AA66}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D9008DAC-2D72-4BD0-B142-2537AE52AA66}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D9008DAC-2D72-4BD0-B142-2537AE52AA66}.Release|Any CPU.Build.0 = Release|Any CPU - {126D0E98-9F38-44D3-9525-8B4EBA589949}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {126D0E98-9F38-44D3-9525-8B4EBA589949}.Debug|Any CPU.Build.0 = Debug|Any CPU - {126D0E98-9F38-44D3-9525-8B4EBA589949}.Release|Any CPU.ActiveCfg = Release|Any CPU - {126D0E98-9F38-44D3-9525-8B4EBA589949}.Release|Any CPU.Build.0 = Release|Any CPU - {D8D63AC7-952D-4ACA-A380-522DF0F87DDA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D8D63AC7-952D-4ACA-A380-522DF0F87DDA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D8D63AC7-952D-4ACA-A380-522DF0F87DDA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D8D63AC7-952D-4ACA-A380-522DF0F87DDA}.Release|Any CPU.Build.0 = Release|Any CPU - {193BD21B-DD77-4C6C-9308-51FA1CA15F30}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {193BD21B-DD77-4C6C-9308-51FA1CA15F30}.Debug|Any CPU.Build.0 = Debug|Any CPU - {193BD21B-DD77-4C6C-9308-51FA1CA15F30}.Release|Any CPU.ActiveCfg = Release|Any CPU - {193BD21B-DD77-4C6C-9308-51FA1CA15F30}.Release|Any CPU.Build.0 = Release|Any CPU - {D7E1B821-14E4-4AFA-8D88-B129E42DE88B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D7E1B821-14E4-4AFA-8D88-B129E42DE88B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D7E1B821-14E4-4AFA-8D88-B129E42DE88B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D7E1B821-14E4-4AFA-8D88-B129E42DE88B}.Release|Any CPU.Build.0 = Release|Any CPU - {36BDF8F2-4D6B-4AF2-BF08-EA249BB9A9DB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {36BDF8F2-4D6B-4AF2-BF08-EA249BB9A9DB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {36BDF8F2-4D6B-4AF2-BF08-EA249BB9A9DB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {36BDF8F2-4D6B-4AF2-BF08-EA249BB9A9DB}.Release|Any CPU.Build.0 = Release|Any CPU - {139B6BAD-5EA0-48E1-AB6C-BD88489EBD6B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {139B6BAD-5EA0-48E1-AB6C-BD88489EBD6B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {139B6BAD-5EA0-48E1-AB6C-BD88489EBD6B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {139B6BAD-5EA0-48E1-AB6C-BD88489EBD6B}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {D5927C46-8DC2-4D55-95E7-932C475AB661}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D5927C46-8DC2-4D55-95E7-932C475AB661}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D5927C46-8DC2-4D55-95E7-932C475AB661}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D5927C46-8DC2-4D55-95E7-932C475AB661}.Release|Any CPU.Build.0 = Release|Any CPU - {7B2AAF8E-16A9-4500-A70A-179AF3E94F10}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7B2AAF8E-16A9-4500-A70A-179AF3E94F10}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7B2AAF8E-16A9-4500-A70A-179AF3E94F10}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7B2AAF8E-16A9-4500-A70A-179AF3E94F10}.Release|Any CPU.Build.0 = Release|Any CPU - {432CCEC1-3AA3-4DC5-9EF9-47DE1BFB68D1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {432CCEC1-3AA3-4DC5-9EF9-47DE1BFB68D1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {432CCEC1-3AA3-4DC5-9EF9-47DE1BFB68D1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {432CCEC1-3AA3-4DC5-9EF9-47DE1BFB68D1}.Release|Any CPU.Build.0 = Release|Any CPU - {D9008DAC-2D72-4BD0-B142-2537AE52AA66}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D9008DAC-2D72-4BD0-B142-2537AE52AA66}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D9008DAC-2D72-4BD0-B142-2537AE52AA66}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D9008DAC-2D72-4BD0-B142-2537AE52AA66}.Release|Any CPU.Build.0 = Release|Any CPU - {126D0E98-9F38-44D3-9525-8B4EBA589949}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {126D0E98-9F38-44D3-9525-8B4EBA589949}.Debug|Any CPU.Build.0 = Debug|Any CPU - {126D0E98-9F38-44D3-9525-8B4EBA589949}.Release|Any CPU.ActiveCfg = Release|Any CPU - {126D0E98-9F38-44D3-9525-8B4EBA589949}.Release|Any CPU.Build.0 = Release|Any CPU - {D8D63AC7-952D-4ACA-A380-522DF0F87DDA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D8D63AC7-952D-4ACA-A380-522DF0F87DDA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D8D63AC7-952D-4ACA-A380-522DF0F87DDA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D8D63AC7-952D-4ACA-A380-522DF0F87DDA}.Release|Any CPU.Build.0 = Release|Any CPU - {193BD21B-DD77-4C6C-9308-51FA1CA15F30}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {193BD21B-DD77-4C6C-9308-51FA1CA15F30}.Debug|Any CPU.Build.0 = Debug|Any CPU - {193BD21B-DD77-4C6C-9308-51FA1CA15F30}.Release|Any CPU.ActiveCfg = Release|Any CPU - {193BD21B-DD77-4C6C-9308-51FA1CA15F30}.Release|Any CPU.Build.0 = Release|Any CPU - {D7E1B821-14E4-4AFA-8D88-B129E42DE88B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D7E1B821-14E4-4AFA-8D88-B129E42DE88B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D7E1B821-14E4-4AFA-8D88-B129E42DE88B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D7E1B821-14E4-4AFA-8D88-B129E42DE88B}.Release|Any CPU.Build.0 = Release|Any CPU - {36BDF8F2-4D6B-4AF2-BF08-EA249BB9A9DB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {36BDF8F2-4D6B-4AF2-BF08-EA249BB9A9DB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {36BDF8F2-4D6B-4AF2-BF08-EA249BB9A9DB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {36BDF8F2-4D6B-4AF2-BF08-EA249BB9A9DB}.Release|Any CPU.Build.0 = Release|Any CPU - {139B6BAD-5EA0-48E1-AB6C-BD88489EBD6B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {139B6BAD-5EA0-48E1-AB6C-BD88489EBD6B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {139B6BAD-5EA0-48E1-AB6C-BD88489EBD6B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {139B6BAD-5EA0-48E1-AB6C-BD88489EBD6B}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {35C2571F-2D52-42AB-A2D4-0D9C2EBFA7DF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {7347674F-6128-4C74-872D-3DAA2079AFFC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {F8A93916-2E86-4144-8923-AD59871AC3FB} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {7CFD25F1-53F7-44A4-96C1-1107FD18081F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {041EAE3E-7F6B-43A1-837B-80773116BB39} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {D5927C46-8DC2-4D55-95E7-932C475AB661} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {7B2AAF8E-16A9-4500-A70A-179AF3E94F10} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {432CCEC1-3AA3-4DC5-9EF9-47DE1BFB68D1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D9008DAC-2D72-4BD0-B142-2537AE52AA66} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {126D0E98-9F38-44D3-9525-8B4EBA589949} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D8D63AC7-952D-4ACA-A380-522DF0F87DDA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {193BD21B-DD77-4C6C-9308-51FA1CA15F30} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D7E1B821-14E4-4AFA-8D88-B129E42DE88B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {36BDF8F2-4D6B-4AF2-BF08-EA249BB9A9DB} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {139B6BAD-5EA0-48E1-AB6C-BD88489EBD6B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {D5927C46-8DC2-4D55-95E7-932C475AB661} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {7B2AAF8E-16A9-4500-A70A-179AF3E94F10} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {432CCEC1-3AA3-4DC5-9EF9-47DE1BFB68D1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D9008DAC-2D72-4BD0-B142-2537AE52AA66} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {126D0E98-9F38-44D3-9525-8B4EBA589949} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D8D63AC7-952D-4ACA-A380-522DF0F87DDA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {193BD21B-DD77-4C6C-9308-51FA1CA15F30} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D7E1B821-14E4-4AFA-8D88-B129E42DE88B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {36BDF8F2-4D6B-4AF2-BF08-EA249BB9A9DB} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {139B6BAD-5EA0-48E1-AB6C-BD88489EBD6B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {BDD0A6D4-1D9A-449D-8833-C00CDAEAB9D8} diff --git a/sdk/src/Services/LocationService/Properties/AssemblyInfo.cs b/sdk/src/Services/LocationService/Properties/AssemblyInfo.cs index b135623c534b..0298ce9c04ec 100644 --- a/sdk/src/Services/LocationService/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/LocationService/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/LookoutEquipment/Generated/AmazonLookoutEquipmentConfig.cs b/sdk/src/Services/LookoutEquipment/Generated/AmazonLookoutEquipmentConfig.cs index ddcd2b4af690..14b692e9277d 100644 --- a/sdk/src/Services/LookoutEquipment/Generated/AmazonLookoutEquipmentConfig.cs +++ b/sdk/src/Services/LookoutEquipment/Generated/AmazonLookoutEquipmentConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.LookoutEquipment public partial class AmazonLookoutEquipmentConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("LookoutEquipment", "4.0.0.0"); private static readonly AmazonLookoutEquipmentEndpointResolver EndpointResolver = new AmazonLookoutEquipmentEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("LookoutEquipment", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("LookoutEquipment", "3.7.400.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/LookoutEquipment/LookoutEquipment.sln b/sdk/src/Services/LookoutEquipment/LookoutEquipment.sln index 9ef02cdc820e..d4425c9e92d4 100644 --- a/sdk/src/Services/LookoutEquipment/LookoutEquipment.sln +++ b/sdk/src/Services/LookoutEquipment/LookoutEquipment.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {19518D07-A2BB-4265-B78E-0F0B19AE37F5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {19518D07-A2BB-4265-B78E-0F0B19AE37F5}.Debug|Any CPU.Build.0 = Debug|Any CPU {19518D07-A2BB-4265-B78E-0F0B19AE37F5}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {BD378AD8-25A6-44AB-822F-48B918EE53E3}.Debug|Any CPU.Build.0 = Debug|Any CPU {BD378AD8-25A6-44AB-822F-48B918EE53E3}.Release|Any CPU.ActiveCfg = Release|Any CPU {BD378AD8-25A6-44AB-822F-48B918EE53E3}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {2196C527-D1D3-48F6-B175-4DB238708EB1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2196C527-D1D3-48F6-B175-4DB238708EB1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2196C527-D1D3-48F6-B175-4DB238708EB1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2196C527-D1D3-48F6-B175-4DB238708EB1}.Release|Any CPU.Build.0 = Release|Any CPU - {014755F8-4444-4F3B-AFB5-AD0F18C69E17}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {014755F8-4444-4F3B-AFB5-AD0F18C69E17}.Debug|Any CPU.Build.0 = Debug|Any CPU - {014755F8-4444-4F3B-AFB5-AD0F18C69E17}.Release|Any CPU.ActiveCfg = Release|Any CPU - {014755F8-4444-4F3B-AFB5-AD0F18C69E17}.Release|Any CPU.Build.0 = Release|Any CPU - {19DD8D0B-BA0B-4279-B97F-4C8F21BC46C5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {19DD8D0B-BA0B-4279-B97F-4C8F21BC46C5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {19DD8D0B-BA0B-4279-B97F-4C8F21BC46C5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {19DD8D0B-BA0B-4279-B97F-4C8F21BC46C5}.Release|Any CPU.Build.0 = Release|Any CPU - {3242DD11-75EC-4705-AB3A-14C6794F3CBD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3242DD11-75EC-4705-AB3A-14C6794F3CBD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3242DD11-75EC-4705-AB3A-14C6794F3CBD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3242DD11-75EC-4705-AB3A-14C6794F3CBD}.Release|Any CPU.Build.0 = Release|Any CPU - {B6BBE6E4-763C-4F96-A837-A102340521DE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B6BBE6E4-763C-4F96-A837-A102340521DE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B6BBE6E4-763C-4F96-A837-A102340521DE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B6BBE6E4-763C-4F96-A837-A102340521DE}.Release|Any CPU.Build.0 = Release|Any CPU - {7B64B1BC-DBAC-45FA-91BD-0DC1535D84D8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7B64B1BC-DBAC-45FA-91BD-0DC1535D84D8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7B64B1BC-DBAC-45FA-91BD-0DC1535D84D8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7B64B1BC-DBAC-45FA-91BD-0DC1535D84D8}.Release|Any CPU.Build.0 = Release|Any CPU - {D89C3B5B-B297-4E1E-BB9D-19558EC9667A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D89C3B5B-B297-4E1E-BB9D-19558EC9667A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D89C3B5B-B297-4E1E-BB9D-19558EC9667A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D89C3B5B-B297-4E1E-BB9D-19558EC9667A}.Release|Any CPU.Build.0 = Release|Any CPU - {BABF8E9B-632D-4083-A9D1-224BC6C46CDF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BABF8E9B-632D-4083-A9D1-224BC6C46CDF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BABF8E9B-632D-4083-A9D1-224BC6C46CDF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BABF8E9B-632D-4083-A9D1-224BC6C46CDF}.Release|Any CPU.Build.0 = Release|Any CPU - {57E7B2CE-FB98-43BF-A8E9-7AB524AF3360}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {57E7B2CE-FB98-43BF-A8E9-7AB524AF3360}.Debug|Any CPU.Build.0 = Debug|Any CPU - {57E7B2CE-FB98-43BF-A8E9-7AB524AF3360}.Release|Any CPU.ActiveCfg = Release|Any CPU - {57E7B2CE-FB98-43BF-A8E9-7AB524AF3360}.Release|Any CPU.Build.0 = Release|Any CPU - {BB806C1E-3E26-42C9-85FF-1AEF5ABD75F6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BB806C1E-3E26-42C9-85FF-1AEF5ABD75F6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BB806C1E-3E26-42C9-85FF-1AEF5ABD75F6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BB806C1E-3E26-42C9-85FF-1AEF5ABD75F6}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {2196C527-D1D3-48F6-B175-4DB238708EB1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2196C527-D1D3-48F6-B175-4DB238708EB1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2196C527-D1D3-48F6-B175-4DB238708EB1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2196C527-D1D3-48F6-B175-4DB238708EB1}.Release|Any CPU.Build.0 = Release|Any CPU - {014755F8-4444-4F3B-AFB5-AD0F18C69E17}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {014755F8-4444-4F3B-AFB5-AD0F18C69E17}.Debug|Any CPU.Build.0 = Debug|Any CPU - {014755F8-4444-4F3B-AFB5-AD0F18C69E17}.Release|Any CPU.ActiveCfg = Release|Any CPU - {014755F8-4444-4F3B-AFB5-AD0F18C69E17}.Release|Any CPU.Build.0 = Release|Any CPU - {19DD8D0B-BA0B-4279-B97F-4C8F21BC46C5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {19DD8D0B-BA0B-4279-B97F-4C8F21BC46C5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {19DD8D0B-BA0B-4279-B97F-4C8F21BC46C5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {19DD8D0B-BA0B-4279-B97F-4C8F21BC46C5}.Release|Any CPU.Build.0 = Release|Any CPU - {3242DD11-75EC-4705-AB3A-14C6794F3CBD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3242DD11-75EC-4705-AB3A-14C6794F3CBD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3242DD11-75EC-4705-AB3A-14C6794F3CBD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3242DD11-75EC-4705-AB3A-14C6794F3CBD}.Release|Any CPU.Build.0 = Release|Any CPU - {B6BBE6E4-763C-4F96-A837-A102340521DE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B6BBE6E4-763C-4F96-A837-A102340521DE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B6BBE6E4-763C-4F96-A837-A102340521DE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B6BBE6E4-763C-4F96-A837-A102340521DE}.Release|Any CPU.Build.0 = Release|Any CPU - {7B64B1BC-DBAC-45FA-91BD-0DC1535D84D8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7B64B1BC-DBAC-45FA-91BD-0DC1535D84D8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7B64B1BC-DBAC-45FA-91BD-0DC1535D84D8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7B64B1BC-DBAC-45FA-91BD-0DC1535D84D8}.Release|Any CPU.Build.0 = Release|Any CPU - {D89C3B5B-B297-4E1E-BB9D-19558EC9667A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D89C3B5B-B297-4E1E-BB9D-19558EC9667A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D89C3B5B-B297-4E1E-BB9D-19558EC9667A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D89C3B5B-B297-4E1E-BB9D-19558EC9667A}.Release|Any CPU.Build.0 = Release|Any CPU - {BABF8E9B-632D-4083-A9D1-224BC6C46CDF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BABF8E9B-632D-4083-A9D1-224BC6C46CDF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BABF8E9B-632D-4083-A9D1-224BC6C46CDF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BABF8E9B-632D-4083-A9D1-224BC6C46CDF}.Release|Any CPU.Build.0 = Release|Any CPU - {57E7B2CE-FB98-43BF-A8E9-7AB524AF3360}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {57E7B2CE-FB98-43BF-A8E9-7AB524AF3360}.Debug|Any CPU.Build.0 = Debug|Any CPU - {57E7B2CE-FB98-43BF-A8E9-7AB524AF3360}.Release|Any CPU.ActiveCfg = Release|Any CPU - {57E7B2CE-FB98-43BF-A8E9-7AB524AF3360}.Release|Any CPU.Build.0 = Release|Any CPU - {BB806C1E-3E26-42C9-85FF-1AEF5ABD75F6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BB806C1E-3E26-42C9-85FF-1AEF5ABD75F6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BB806C1E-3E26-42C9-85FF-1AEF5ABD75F6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BB806C1E-3E26-42C9-85FF-1AEF5ABD75F6}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {19518D07-A2BB-4265-B78E-0F0B19AE37F5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {50D8EAAF-1E87-4C8D-9A14-3FA038480093} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {24F97292-48E9-44FB-B334-89E6FBFDDB44} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {F1EA7569-D82B-4FD9-97F5-92984F9DDDFB} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {BD378AD8-25A6-44AB-822F-48B918EE53E3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {2196C527-D1D3-48F6-B175-4DB238708EB1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {014755F8-4444-4F3B-AFB5-AD0F18C69E17} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {19DD8D0B-BA0B-4279-B97F-4C8F21BC46C5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {3242DD11-75EC-4705-AB3A-14C6794F3CBD} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B6BBE6E4-763C-4F96-A837-A102340521DE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {7B64B1BC-DBAC-45FA-91BD-0DC1535D84D8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D89C3B5B-B297-4E1E-BB9D-19558EC9667A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {BABF8E9B-632D-4083-A9D1-224BC6C46CDF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {57E7B2CE-FB98-43BF-A8E9-7AB524AF3360} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {BB806C1E-3E26-42C9-85FF-1AEF5ABD75F6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {2196C527-D1D3-48F6-B175-4DB238708EB1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {014755F8-4444-4F3B-AFB5-AD0F18C69E17} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {19DD8D0B-BA0B-4279-B97F-4C8F21BC46C5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {3242DD11-75EC-4705-AB3A-14C6794F3CBD} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B6BBE6E4-763C-4F96-A837-A102340521DE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {7B64B1BC-DBAC-45FA-91BD-0DC1535D84D8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D89C3B5B-B297-4E1E-BB9D-19558EC9667A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {BABF8E9B-632D-4083-A9D1-224BC6C46CDF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {57E7B2CE-FB98-43BF-A8E9-7AB524AF3360} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {BB806C1E-3E26-42C9-85FF-1AEF5ABD75F6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {6D49848F-3B22-486D-9137-2CA11E36FED3} diff --git a/sdk/src/Services/LookoutEquipment/Properties/AssemblyInfo.cs b/sdk/src/Services/LookoutEquipment/Properties/AssemblyInfo.cs index 99d62d0a19d7..8b456718a28d 100644 --- a/sdk/src/Services/LookoutEquipment/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/LookoutEquipment/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/LookoutMetrics/Generated/AmazonLookoutMetricsConfig.cs b/sdk/src/Services/LookoutMetrics/Generated/AmazonLookoutMetricsConfig.cs index ab0e95259c25..dfc2bc445079 100644 --- a/sdk/src/Services/LookoutMetrics/Generated/AmazonLookoutMetricsConfig.cs +++ b/sdk/src/Services/LookoutMetrics/Generated/AmazonLookoutMetricsConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.LookoutMetrics public partial class AmazonLookoutMetricsConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("LookoutMetrics", "4.0.0.0"); private static readonly AmazonLookoutMetricsEndpointResolver EndpointResolver = new AmazonLookoutMetricsEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("LookoutMetrics", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("LookoutMetrics", "3.7.400.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/LookoutMetrics/LookoutMetrics.sln b/sdk/src/Services/LookoutMetrics/LookoutMetrics.sln index 5f8c66c42902..8d33902467c2 100644 --- a/sdk/src/Services/LookoutMetrics/LookoutMetrics.sln +++ b/sdk/src/Services/LookoutMetrics/LookoutMetrics.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {B51E2B00-42C8-4C82-945A-C1CD67489E85}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {B51E2B00-42C8-4C82-945A-C1CD67489E85}.Debug|Any CPU.Build.0 = Debug|Any CPU {B51E2B00-42C8-4C82-945A-C1CD67489E85}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {6D4F1E32-B2BB-4986-95D5-973073CA3E90}.Debug|Any CPU.Build.0 = Debug|Any CPU {6D4F1E32-B2BB-4986-95D5-973073CA3E90}.Release|Any CPU.ActiveCfg = Release|Any CPU {6D4F1E32-B2BB-4986-95D5-973073CA3E90}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {3A0EC543-0B6C-44FA-8F16-25FCF188D658}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3A0EC543-0B6C-44FA-8F16-25FCF188D658}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3A0EC543-0B6C-44FA-8F16-25FCF188D658}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3A0EC543-0B6C-44FA-8F16-25FCF188D658}.Release|Any CPU.Build.0 = Release|Any CPU - {0A75F1BF-6BC2-4099-A9E4-4EFB8EA16C71}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0A75F1BF-6BC2-4099-A9E4-4EFB8EA16C71}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0A75F1BF-6BC2-4099-A9E4-4EFB8EA16C71}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0A75F1BF-6BC2-4099-A9E4-4EFB8EA16C71}.Release|Any CPU.Build.0 = Release|Any CPU - {62F93871-B6D1-49B7-98C1-C8CAF8FE3A62}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {62F93871-B6D1-49B7-98C1-C8CAF8FE3A62}.Debug|Any CPU.Build.0 = Debug|Any CPU - {62F93871-B6D1-49B7-98C1-C8CAF8FE3A62}.Release|Any CPU.ActiveCfg = Release|Any CPU - {62F93871-B6D1-49B7-98C1-C8CAF8FE3A62}.Release|Any CPU.Build.0 = Release|Any CPU - {76ED557D-6597-4DCF-A9B9-392370614937}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {76ED557D-6597-4DCF-A9B9-392370614937}.Debug|Any CPU.Build.0 = Debug|Any CPU - {76ED557D-6597-4DCF-A9B9-392370614937}.Release|Any CPU.ActiveCfg = Release|Any CPU - {76ED557D-6597-4DCF-A9B9-392370614937}.Release|Any CPU.Build.0 = Release|Any CPU - {417CB36D-A9D2-4D19-B204-66C56D61D8E1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {417CB36D-A9D2-4D19-B204-66C56D61D8E1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {417CB36D-A9D2-4D19-B204-66C56D61D8E1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {417CB36D-A9D2-4D19-B204-66C56D61D8E1}.Release|Any CPU.Build.0 = Release|Any CPU - {53F7979F-369D-4E0A-A3A8-69CE927398AD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {53F7979F-369D-4E0A-A3A8-69CE927398AD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {53F7979F-369D-4E0A-A3A8-69CE927398AD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {53F7979F-369D-4E0A-A3A8-69CE927398AD}.Release|Any CPU.Build.0 = Release|Any CPU - {49631C9A-23ED-452C-9328-AFC14741F0F1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {49631C9A-23ED-452C-9328-AFC14741F0F1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {49631C9A-23ED-452C-9328-AFC14741F0F1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {49631C9A-23ED-452C-9328-AFC14741F0F1}.Release|Any CPU.Build.0 = Release|Any CPU - {CF0C5C2B-7960-4ABB-B27A-75CB35CBEAB9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CF0C5C2B-7960-4ABB-B27A-75CB35CBEAB9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CF0C5C2B-7960-4ABB-B27A-75CB35CBEAB9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CF0C5C2B-7960-4ABB-B27A-75CB35CBEAB9}.Release|Any CPU.Build.0 = Release|Any CPU - {AF15F105-C804-4E85-A7E2-BA30D18C54DF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AF15F105-C804-4E85-A7E2-BA30D18C54DF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AF15F105-C804-4E85-A7E2-BA30D18C54DF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AF15F105-C804-4E85-A7E2-BA30D18C54DF}.Release|Any CPU.Build.0 = Release|Any CPU - {BCCAA02E-5EC4-47E3-89C5-EB108C108BD6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BCCAA02E-5EC4-47E3-89C5-EB108C108BD6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BCCAA02E-5EC4-47E3-89C5-EB108C108BD6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BCCAA02E-5EC4-47E3-89C5-EB108C108BD6}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {3A0EC543-0B6C-44FA-8F16-25FCF188D658}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3A0EC543-0B6C-44FA-8F16-25FCF188D658}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3A0EC543-0B6C-44FA-8F16-25FCF188D658}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3A0EC543-0B6C-44FA-8F16-25FCF188D658}.Release|Any CPU.Build.0 = Release|Any CPU - {0A75F1BF-6BC2-4099-A9E4-4EFB8EA16C71}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0A75F1BF-6BC2-4099-A9E4-4EFB8EA16C71}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0A75F1BF-6BC2-4099-A9E4-4EFB8EA16C71}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0A75F1BF-6BC2-4099-A9E4-4EFB8EA16C71}.Release|Any CPU.Build.0 = Release|Any CPU - {62F93871-B6D1-49B7-98C1-C8CAF8FE3A62}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {62F93871-B6D1-49B7-98C1-C8CAF8FE3A62}.Debug|Any CPU.Build.0 = Debug|Any CPU - {62F93871-B6D1-49B7-98C1-C8CAF8FE3A62}.Release|Any CPU.ActiveCfg = Release|Any CPU - {62F93871-B6D1-49B7-98C1-C8CAF8FE3A62}.Release|Any CPU.Build.0 = Release|Any CPU - {76ED557D-6597-4DCF-A9B9-392370614937}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {76ED557D-6597-4DCF-A9B9-392370614937}.Debug|Any CPU.Build.0 = Debug|Any CPU - {76ED557D-6597-4DCF-A9B9-392370614937}.Release|Any CPU.ActiveCfg = Release|Any CPU - {76ED557D-6597-4DCF-A9B9-392370614937}.Release|Any CPU.Build.0 = Release|Any CPU - {417CB36D-A9D2-4D19-B204-66C56D61D8E1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {417CB36D-A9D2-4D19-B204-66C56D61D8E1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {417CB36D-A9D2-4D19-B204-66C56D61D8E1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {417CB36D-A9D2-4D19-B204-66C56D61D8E1}.Release|Any CPU.Build.0 = Release|Any CPU - {53F7979F-369D-4E0A-A3A8-69CE927398AD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {53F7979F-369D-4E0A-A3A8-69CE927398AD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {53F7979F-369D-4E0A-A3A8-69CE927398AD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {53F7979F-369D-4E0A-A3A8-69CE927398AD}.Release|Any CPU.Build.0 = Release|Any CPU - {49631C9A-23ED-452C-9328-AFC14741F0F1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {49631C9A-23ED-452C-9328-AFC14741F0F1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {49631C9A-23ED-452C-9328-AFC14741F0F1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {49631C9A-23ED-452C-9328-AFC14741F0F1}.Release|Any CPU.Build.0 = Release|Any CPU - {CF0C5C2B-7960-4ABB-B27A-75CB35CBEAB9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CF0C5C2B-7960-4ABB-B27A-75CB35CBEAB9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CF0C5C2B-7960-4ABB-B27A-75CB35CBEAB9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CF0C5C2B-7960-4ABB-B27A-75CB35CBEAB9}.Release|Any CPU.Build.0 = Release|Any CPU - {AF15F105-C804-4E85-A7E2-BA30D18C54DF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AF15F105-C804-4E85-A7E2-BA30D18C54DF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AF15F105-C804-4E85-A7E2-BA30D18C54DF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AF15F105-C804-4E85-A7E2-BA30D18C54DF}.Release|Any CPU.Build.0 = Release|Any CPU - {BCCAA02E-5EC4-47E3-89C5-EB108C108BD6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BCCAA02E-5EC4-47E3-89C5-EB108C108BD6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BCCAA02E-5EC4-47E3-89C5-EB108C108BD6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BCCAA02E-5EC4-47E3-89C5-EB108C108BD6}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {B51E2B00-42C8-4C82-945A-C1CD67489E85} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {8F87198B-3CF0-4BDD-B4D1-9BC5C6968518} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {095D5381-BB9F-4916-A88C-1FC5D803D4DA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {01FD32F0-0DA0-48EE-9082-F00593EF0480} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {6D4F1E32-B2BB-4986-95D5-973073CA3E90} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {3A0EC543-0B6C-44FA-8F16-25FCF188D658} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0A75F1BF-6BC2-4099-A9E4-4EFB8EA16C71} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {62F93871-B6D1-49B7-98C1-C8CAF8FE3A62} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {76ED557D-6597-4DCF-A9B9-392370614937} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {417CB36D-A9D2-4D19-B204-66C56D61D8E1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {53F7979F-369D-4E0A-A3A8-69CE927398AD} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {49631C9A-23ED-452C-9328-AFC14741F0F1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {CF0C5C2B-7960-4ABB-B27A-75CB35CBEAB9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {AF15F105-C804-4E85-A7E2-BA30D18C54DF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {BCCAA02E-5EC4-47E3-89C5-EB108C108BD6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {3A0EC543-0B6C-44FA-8F16-25FCF188D658} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0A75F1BF-6BC2-4099-A9E4-4EFB8EA16C71} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {62F93871-B6D1-49B7-98C1-C8CAF8FE3A62} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {76ED557D-6597-4DCF-A9B9-392370614937} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {417CB36D-A9D2-4D19-B204-66C56D61D8E1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {53F7979F-369D-4E0A-A3A8-69CE927398AD} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {49631C9A-23ED-452C-9328-AFC14741F0F1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {CF0C5C2B-7960-4ABB-B27A-75CB35CBEAB9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {AF15F105-C804-4E85-A7E2-BA30D18C54DF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {BCCAA02E-5EC4-47E3-89C5-EB108C108BD6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {2F24D51B-024C-44DF-87B0-634EE1764367} diff --git a/sdk/src/Services/LookoutMetrics/Properties/AssemblyInfo.cs b/sdk/src/Services/LookoutMetrics/Properties/AssemblyInfo.cs index 43d4a9b337b2..412b48dcaed8 100644 --- a/sdk/src/Services/LookoutMetrics/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/LookoutMetrics/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/LookoutforVision/Generated/AmazonLookoutforVisionConfig.cs b/sdk/src/Services/LookoutforVision/Generated/AmazonLookoutforVisionConfig.cs index da769a98edd5..bd1494489533 100644 --- a/sdk/src/Services/LookoutforVision/Generated/AmazonLookoutforVisionConfig.cs +++ b/sdk/src/Services/LookoutforVision/Generated/AmazonLookoutforVisionConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.LookoutforVision public partial class AmazonLookoutforVisionConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("LookoutVision", "4.0.0.0"); private static readonly AmazonLookoutforVisionEndpointResolver EndpointResolver = new AmazonLookoutforVisionEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("LookoutVision", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("LookoutVision", "3.7.400.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/LookoutforVision/LookoutforVision.sln b/sdk/src/Services/LookoutforVision/LookoutforVision.sln index 8dec493bef5f..e8eea87b68c5 100644 --- a/sdk/src/Services/LookoutforVision/LookoutforVision.sln +++ b/sdk/src/Services/LookoutforVision/LookoutforVision.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {B5AF14CF-30AA-4F68-AEC2-A3EFC3AC842A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {B5AF14CF-30AA-4F68-AEC2-A3EFC3AC842A}.Debug|Any CPU.Build.0 = Debug|Any CPU {B5AF14CF-30AA-4F68-AEC2-A3EFC3AC842A}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {CCCAA571-239E-4C36-B762-EB45803AF235}.Debug|Any CPU.Build.0 = Debug|Any CPU {CCCAA571-239E-4C36-B762-EB45803AF235}.Release|Any CPU.ActiveCfg = Release|Any CPU {CCCAA571-239E-4C36-B762-EB45803AF235}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {466BF8AB-2D2C-4F7A-B268-CB9C7BDD26D2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {466BF8AB-2D2C-4F7A-B268-CB9C7BDD26D2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {466BF8AB-2D2C-4F7A-B268-CB9C7BDD26D2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {466BF8AB-2D2C-4F7A-B268-CB9C7BDD26D2}.Release|Any CPU.Build.0 = Release|Any CPU - {6F7C742A-6CFE-47AD-963B-B2E95BB789AB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6F7C742A-6CFE-47AD-963B-B2E95BB789AB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6F7C742A-6CFE-47AD-963B-B2E95BB789AB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6F7C742A-6CFE-47AD-963B-B2E95BB789AB}.Release|Any CPU.Build.0 = Release|Any CPU - {89DBA733-F422-413D-9505-51B1D2AC19A9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {89DBA733-F422-413D-9505-51B1D2AC19A9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {89DBA733-F422-413D-9505-51B1D2AC19A9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {89DBA733-F422-413D-9505-51B1D2AC19A9}.Release|Any CPU.Build.0 = Release|Any CPU - {EB68FCAF-6671-48D4-AA26-7F88D358990D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EB68FCAF-6671-48D4-AA26-7F88D358990D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EB68FCAF-6671-48D4-AA26-7F88D358990D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EB68FCAF-6671-48D4-AA26-7F88D358990D}.Release|Any CPU.Build.0 = Release|Any CPU - {3EC5AFB9-AA3E-4B4E-B7F5-89841CD4C021}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3EC5AFB9-AA3E-4B4E-B7F5-89841CD4C021}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3EC5AFB9-AA3E-4B4E-B7F5-89841CD4C021}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3EC5AFB9-AA3E-4B4E-B7F5-89841CD4C021}.Release|Any CPU.Build.0 = Release|Any CPU - {BF6B4DE0-7C86-433A-8996-45D751146D04}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BF6B4DE0-7C86-433A-8996-45D751146D04}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BF6B4DE0-7C86-433A-8996-45D751146D04}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BF6B4DE0-7C86-433A-8996-45D751146D04}.Release|Any CPU.Build.0 = Release|Any CPU - {A879284C-8113-42D6-AF17-3315DE4A0923}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A879284C-8113-42D6-AF17-3315DE4A0923}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A879284C-8113-42D6-AF17-3315DE4A0923}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A879284C-8113-42D6-AF17-3315DE4A0923}.Release|Any CPU.Build.0 = Release|Any CPU - {DA312F23-A429-47DD-8336-15B35C49D296}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DA312F23-A429-47DD-8336-15B35C49D296}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DA312F23-A429-47DD-8336-15B35C49D296}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DA312F23-A429-47DD-8336-15B35C49D296}.Release|Any CPU.Build.0 = Release|Any CPU - {54335567-99C3-4743-9B9D-AEABFA341BFC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {54335567-99C3-4743-9B9D-AEABFA341BFC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {54335567-99C3-4743-9B9D-AEABFA341BFC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {54335567-99C3-4743-9B9D-AEABFA341BFC}.Release|Any CPU.Build.0 = Release|Any CPU - {1B96DB07-613B-477E-A33E-DCE0CDCB36CE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1B96DB07-613B-477E-A33E-DCE0CDCB36CE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1B96DB07-613B-477E-A33E-DCE0CDCB36CE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1B96DB07-613B-477E-A33E-DCE0CDCB36CE}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {466BF8AB-2D2C-4F7A-B268-CB9C7BDD26D2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {466BF8AB-2D2C-4F7A-B268-CB9C7BDD26D2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {466BF8AB-2D2C-4F7A-B268-CB9C7BDD26D2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {466BF8AB-2D2C-4F7A-B268-CB9C7BDD26D2}.Release|Any CPU.Build.0 = Release|Any CPU - {6F7C742A-6CFE-47AD-963B-B2E95BB789AB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6F7C742A-6CFE-47AD-963B-B2E95BB789AB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6F7C742A-6CFE-47AD-963B-B2E95BB789AB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6F7C742A-6CFE-47AD-963B-B2E95BB789AB}.Release|Any CPU.Build.0 = Release|Any CPU - {89DBA733-F422-413D-9505-51B1D2AC19A9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {89DBA733-F422-413D-9505-51B1D2AC19A9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {89DBA733-F422-413D-9505-51B1D2AC19A9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {89DBA733-F422-413D-9505-51B1D2AC19A9}.Release|Any CPU.Build.0 = Release|Any CPU - {EB68FCAF-6671-48D4-AA26-7F88D358990D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EB68FCAF-6671-48D4-AA26-7F88D358990D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EB68FCAF-6671-48D4-AA26-7F88D358990D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EB68FCAF-6671-48D4-AA26-7F88D358990D}.Release|Any CPU.Build.0 = Release|Any CPU - {3EC5AFB9-AA3E-4B4E-B7F5-89841CD4C021}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3EC5AFB9-AA3E-4B4E-B7F5-89841CD4C021}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3EC5AFB9-AA3E-4B4E-B7F5-89841CD4C021}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3EC5AFB9-AA3E-4B4E-B7F5-89841CD4C021}.Release|Any CPU.Build.0 = Release|Any CPU - {BF6B4DE0-7C86-433A-8996-45D751146D04}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BF6B4DE0-7C86-433A-8996-45D751146D04}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BF6B4DE0-7C86-433A-8996-45D751146D04}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BF6B4DE0-7C86-433A-8996-45D751146D04}.Release|Any CPU.Build.0 = Release|Any CPU - {A879284C-8113-42D6-AF17-3315DE4A0923}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A879284C-8113-42D6-AF17-3315DE4A0923}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A879284C-8113-42D6-AF17-3315DE4A0923}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A879284C-8113-42D6-AF17-3315DE4A0923}.Release|Any CPU.Build.0 = Release|Any CPU - {DA312F23-A429-47DD-8336-15B35C49D296}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DA312F23-A429-47DD-8336-15B35C49D296}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DA312F23-A429-47DD-8336-15B35C49D296}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DA312F23-A429-47DD-8336-15B35C49D296}.Release|Any CPU.Build.0 = Release|Any CPU - {54335567-99C3-4743-9B9D-AEABFA341BFC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {54335567-99C3-4743-9B9D-AEABFA341BFC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {54335567-99C3-4743-9B9D-AEABFA341BFC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {54335567-99C3-4743-9B9D-AEABFA341BFC}.Release|Any CPU.Build.0 = Release|Any CPU - {1B96DB07-613B-477E-A33E-DCE0CDCB36CE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1B96DB07-613B-477E-A33E-DCE0CDCB36CE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1B96DB07-613B-477E-A33E-DCE0CDCB36CE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1B96DB07-613B-477E-A33E-DCE0CDCB36CE}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {B5AF14CF-30AA-4F68-AEC2-A3EFC3AC842A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {9266C5D3-B17F-4A85-9A0D-B5E93584FF67} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {0470B917-3377-446F-9E40-2FFC42CF08AE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {234E8F41-1255-46CE-B9AA-C354A38A96C7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {CCCAA571-239E-4C36-B762-EB45803AF235} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {466BF8AB-2D2C-4F7A-B268-CB9C7BDD26D2} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6F7C742A-6CFE-47AD-963B-B2E95BB789AB} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {89DBA733-F422-413D-9505-51B1D2AC19A9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {EB68FCAF-6671-48D4-AA26-7F88D358990D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {3EC5AFB9-AA3E-4B4E-B7F5-89841CD4C021} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {BF6B4DE0-7C86-433A-8996-45D751146D04} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A879284C-8113-42D6-AF17-3315DE4A0923} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {DA312F23-A429-47DD-8336-15B35C49D296} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {54335567-99C3-4743-9B9D-AEABFA341BFC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {1B96DB07-613B-477E-A33E-DCE0CDCB36CE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {466BF8AB-2D2C-4F7A-B268-CB9C7BDD26D2} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6F7C742A-6CFE-47AD-963B-B2E95BB789AB} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {89DBA733-F422-413D-9505-51B1D2AC19A9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {EB68FCAF-6671-48D4-AA26-7F88D358990D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {3EC5AFB9-AA3E-4B4E-B7F5-89841CD4C021} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {BF6B4DE0-7C86-433A-8996-45D751146D04} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A879284C-8113-42D6-AF17-3315DE4A0923} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {DA312F23-A429-47DD-8336-15B35C49D296} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {54335567-99C3-4743-9B9D-AEABFA341BFC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {1B96DB07-613B-477E-A33E-DCE0CDCB36CE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {00A1B81E-B1C2-49E0-9DE0-0B52FB544609} diff --git a/sdk/src/Services/LookoutforVision/Properties/AssemblyInfo.cs b/sdk/src/Services/LookoutforVision/Properties/AssemblyInfo.cs index 474afdc09662..d57a11c8742e 100644 --- a/sdk/src/Services/LookoutforVision/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/LookoutforVision/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/MQ/Generated/AmazonMQConfig.cs b/sdk/src/Services/MQ/Generated/AmazonMQConfig.cs index 209945a55442..ff37b77bdd10 100644 --- a/sdk/src/Services/MQ/Generated/AmazonMQConfig.cs +++ b/sdk/src/Services/MQ/Generated/AmazonMQConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.MQ public partial class AmazonMQConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("mq", "4.0.0.0"); private static readonly AmazonMQEndpointResolver EndpointResolver = new AmazonMQEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("mq", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("mq", "3.7.400.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/MQ/MQ.sln b/sdk/src/Services/MQ/MQ.sln index cecafcbd99ef..78e5c983b730 100644 --- a/sdk/src/Services/MQ/MQ.sln +++ b/sdk/src/Services/MQ/MQ.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {2C430199-BCB0-4CD1-8740-1BA790069569}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {2C430199-BCB0-4CD1-8740-1BA790069569}.Debug|Any CPU.Build.0 = Debug|Any CPU {2C430199-BCB0-4CD1-8740-1BA790069569}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {25EB0A56-EE16-4861-9D83-747E4585BFBC}.Debug|Any CPU.Build.0 = Debug|Any CPU {25EB0A56-EE16-4861-9D83-747E4585BFBC}.Release|Any CPU.ActiveCfg = Release|Any CPU {25EB0A56-EE16-4861-9D83-747E4585BFBC}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {0D6E86A1-8AFE-47AC-BA3A-B13F76DE870E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0D6E86A1-8AFE-47AC-BA3A-B13F76DE870E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0D6E86A1-8AFE-47AC-BA3A-B13F76DE870E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0D6E86A1-8AFE-47AC-BA3A-B13F76DE870E}.Release|Any CPU.Build.0 = Release|Any CPU - {EE43CF0B-1753-4136-B614-A71643F8481D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EE43CF0B-1753-4136-B614-A71643F8481D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EE43CF0B-1753-4136-B614-A71643F8481D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EE43CF0B-1753-4136-B614-A71643F8481D}.Release|Any CPU.Build.0 = Release|Any CPU - {98B57CAC-4D92-48C5-A709-7B162C5C0ECC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {98B57CAC-4D92-48C5-A709-7B162C5C0ECC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {98B57CAC-4D92-48C5-A709-7B162C5C0ECC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {98B57CAC-4D92-48C5-A709-7B162C5C0ECC}.Release|Any CPU.Build.0 = Release|Any CPU - {58B9F9D2-88E7-459B-8C2E-8DC4EA3994F9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {58B9F9D2-88E7-459B-8C2E-8DC4EA3994F9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {58B9F9D2-88E7-459B-8C2E-8DC4EA3994F9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {58B9F9D2-88E7-459B-8C2E-8DC4EA3994F9}.Release|Any CPU.Build.0 = Release|Any CPU - {90FF7F06-12CC-4832-B32D-4ADEEB035C45}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {90FF7F06-12CC-4832-B32D-4ADEEB035C45}.Debug|Any CPU.Build.0 = Debug|Any CPU - {90FF7F06-12CC-4832-B32D-4ADEEB035C45}.Release|Any CPU.ActiveCfg = Release|Any CPU - {90FF7F06-12CC-4832-B32D-4ADEEB035C45}.Release|Any CPU.Build.0 = Release|Any CPU - {186B8A49-4CDB-4752-ABF6-408A6F560964}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {186B8A49-4CDB-4752-ABF6-408A6F560964}.Debug|Any CPU.Build.0 = Debug|Any CPU - {186B8A49-4CDB-4752-ABF6-408A6F560964}.Release|Any CPU.ActiveCfg = Release|Any CPU - {186B8A49-4CDB-4752-ABF6-408A6F560964}.Release|Any CPU.Build.0 = Release|Any CPU - {B29BB117-18A4-4561-A3DE-43860330AAA3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B29BB117-18A4-4561-A3DE-43860330AAA3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B29BB117-18A4-4561-A3DE-43860330AAA3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B29BB117-18A4-4561-A3DE-43860330AAA3}.Release|Any CPU.Build.0 = Release|Any CPU - {CC25B421-4B57-49B9-ACA0-1D14D6446FC8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CC25B421-4B57-49B9-ACA0-1D14D6446FC8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CC25B421-4B57-49B9-ACA0-1D14D6446FC8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CC25B421-4B57-49B9-ACA0-1D14D6446FC8}.Release|Any CPU.Build.0 = Release|Any CPU - {8F919A38-4AB2-477C-9F07-7BB6DA984B90}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8F919A38-4AB2-477C-9F07-7BB6DA984B90}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8F919A38-4AB2-477C-9F07-7BB6DA984B90}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8F919A38-4AB2-477C-9F07-7BB6DA984B90}.Release|Any CPU.Build.0 = Release|Any CPU - {38C9D9C1-9D90-4157-BB2D-B2D020686787}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {38C9D9C1-9D90-4157-BB2D-B2D020686787}.Debug|Any CPU.Build.0 = Debug|Any CPU - {38C9D9C1-9D90-4157-BB2D-B2D020686787}.Release|Any CPU.ActiveCfg = Release|Any CPU - {38C9D9C1-9D90-4157-BB2D-B2D020686787}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {0D6E86A1-8AFE-47AC-BA3A-B13F76DE870E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0D6E86A1-8AFE-47AC-BA3A-B13F76DE870E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0D6E86A1-8AFE-47AC-BA3A-B13F76DE870E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0D6E86A1-8AFE-47AC-BA3A-B13F76DE870E}.Release|Any CPU.Build.0 = Release|Any CPU - {EE43CF0B-1753-4136-B614-A71643F8481D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EE43CF0B-1753-4136-B614-A71643F8481D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EE43CF0B-1753-4136-B614-A71643F8481D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EE43CF0B-1753-4136-B614-A71643F8481D}.Release|Any CPU.Build.0 = Release|Any CPU - {98B57CAC-4D92-48C5-A709-7B162C5C0ECC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {98B57CAC-4D92-48C5-A709-7B162C5C0ECC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {98B57CAC-4D92-48C5-A709-7B162C5C0ECC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {98B57CAC-4D92-48C5-A709-7B162C5C0ECC}.Release|Any CPU.Build.0 = Release|Any CPU - {58B9F9D2-88E7-459B-8C2E-8DC4EA3994F9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {58B9F9D2-88E7-459B-8C2E-8DC4EA3994F9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {58B9F9D2-88E7-459B-8C2E-8DC4EA3994F9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {58B9F9D2-88E7-459B-8C2E-8DC4EA3994F9}.Release|Any CPU.Build.0 = Release|Any CPU - {90FF7F06-12CC-4832-B32D-4ADEEB035C45}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {90FF7F06-12CC-4832-B32D-4ADEEB035C45}.Debug|Any CPU.Build.0 = Debug|Any CPU - {90FF7F06-12CC-4832-B32D-4ADEEB035C45}.Release|Any CPU.ActiveCfg = Release|Any CPU - {90FF7F06-12CC-4832-B32D-4ADEEB035C45}.Release|Any CPU.Build.0 = Release|Any CPU - {186B8A49-4CDB-4752-ABF6-408A6F560964}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {186B8A49-4CDB-4752-ABF6-408A6F560964}.Debug|Any CPU.Build.0 = Debug|Any CPU - {186B8A49-4CDB-4752-ABF6-408A6F560964}.Release|Any CPU.ActiveCfg = Release|Any CPU - {186B8A49-4CDB-4752-ABF6-408A6F560964}.Release|Any CPU.Build.0 = Release|Any CPU - {B29BB117-18A4-4561-A3DE-43860330AAA3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B29BB117-18A4-4561-A3DE-43860330AAA3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B29BB117-18A4-4561-A3DE-43860330AAA3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B29BB117-18A4-4561-A3DE-43860330AAA3}.Release|Any CPU.Build.0 = Release|Any CPU - {CC25B421-4B57-49B9-ACA0-1D14D6446FC8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CC25B421-4B57-49B9-ACA0-1D14D6446FC8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CC25B421-4B57-49B9-ACA0-1D14D6446FC8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CC25B421-4B57-49B9-ACA0-1D14D6446FC8}.Release|Any CPU.Build.0 = Release|Any CPU - {8F919A38-4AB2-477C-9F07-7BB6DA984B90}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8F919A38-4AB2-477C-9F07-7BB6DA984B90}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8F919A38-4AB2-477C-9F07-7BB6DA984B90}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8F919A38-4AB2-477C-9F07-7BB6DA984B90}.Release|Any CPU.Build.0 = Release|Any CPU - {38C9D9C1-9D90-4157-BB2D-B2D020686787}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {38C9D9C1-9D90-4157-BB2D-B2D020686787}.Debug|Any CPU.Build.0 = Debug|Any CPU - {38C9D9C1-9D90-4157-BB2D-B2D020686787}.Release|Any CPU.ActiveCfg = Release|Any CPU - {38C9D9C1-9D90-4157-BB2D-B2D020686787}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {2C430199-BCB0-4CD1-8740-1BA790069569} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {DE641642-3442-4EDD-9452-5CA0AFF70E9F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {B0A90791-2005-4A4B-98B3-5B26E593AACE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {B5ADC02F-84E2-4C9C-957B-F53FDB3F179F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {25EB0A56-EE16-4861-9D83-747E4585BFBC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {0D6E86A1-8AFE-47AC-BA3A-B13F76DE870E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {EE43CF0B-1753-4136-B614-A71643F8481D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {98B57CAC-4D92-48C5-A709-7B162C5C0ECC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {58B9F9D2-88E7-459B-8C2E-8DC4EA3994F9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {90FF7F06-12CC-4832-B32D-4ADEEB035C45} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {186B8A49-4CDB-4752-ABF6-408A6F560964} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B29BB117-18A4-4561-A3DE-43860330AAA3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {CC25B421-4B57-49B9-ACA0-1D14D6446FC8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8F919A38-4AB2-477C-9F07-7BB6DA984B90} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {38C9D9C1-9D90-4157-BB2D-B2D020686787} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {0D6E86A1-8AFE-47AC-BA3A-B13F76DE870E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {EE43CF0B-1753-4136-B614-A71643F8481D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {98B57CAC-4D92-48C5-A709-7B162C5C0ECC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {58B9F9D2-88E7-459B-8C2E-8DC4EA3994F9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {90FF7F06-12CC-4832-B32D-4ADEEB035C45} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {186B8A49-4CDB-4752-ABF6-408A6F560964} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B29BB117-18A4-4561-A3DE-43860330AAA3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {CC25B421-4B57-49B9-ACA0-1D14D6446FC8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8F919A38-4AB2-477C-9F07-7BB6DA984B90} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {38C9D9C1-9D90-4157-BB2D-B2D020686787} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {9D68C2C2-3553-49D7-9484-DBAA96D5C723} diff --git a/sdk/src/Services/MQ/Properties/AssemblyInfo.cs b/sdk/src/Services/MQ/Properties/AssemblyInfo.cs index eaa4a497fb18..89498c82aca1 100644 --- a/sdk/src/Services/MQ/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/MQ/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/MTurk/Generated/AmazonMTurkConfig.cs b/sdk/src/Services/MTurk/Generated/AmazonMTurkConfig.cs index 0a24e8cd6995..ca2d423b1be8 100644 --- a/sdk/src/Services/MTurk/Generated/AmazonMTurkConfig.cs +++ b/sdk/src/Services/MTurk/Generated/AmazonMTurkConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.MTurk public partial class AmazonMTurkConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("MTurk", "4.0.0.0"); private static readonly AmazonMTurkEndpointResolver EndpointResolver = new AmazonMTurkEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("MTurk", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("MTurk", "3.7.400.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/MTurk/MTurk.sln b/sdk/src/Services/MTurk/MTurk.sln index c6d7ed421045..d7b145692529 100644 --- a/sdk/src/Services/MTurk/MTurk.sln +++ b/sdk/src/Services/MTurk/MTurk.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {ED906CD6-2110-42EE-B59C-D97508A03D1F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {ED906CD6-2110-42EE-B59C-D97508A03D1F}.Debug|Any CPU.Build.0 = Debug|Any CPU {ED906CD6-2110-42EE-B59C-D97508A03D1F}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {BCFEBFA4-E505-4488-B95D-A5D97E4C4F67}.Debug|Any CPU.Build.0 = Debug|Any CPU {BCFEBFA4-E505-4488-B95D-A5D97E4C4F67}.Release|Any CPU.ActiveCfg = Release|Any CPU {BCFEBFA4-E505-4488-B95D-A5D97E4C4F67}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {7A7A1E8A-7730-4085-AEFA-BFD13A869643}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7A7A1E8A-7730-4085-AEFA-BFD13A869643}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7A7A1E8A-7730-4085-AEFA-BFD13A869643}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7A7A1E8A-7730-4085-AEFA-BFD13A869643}.Release|Any CPU.Build.0 = Release|Any CPU - {2BAEC6C3-2D63-4E6B-8722-ACC740BEA2B2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2BAEC6C3-2D63-4E6B-8722-ACC740BEA2B2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2BAEC6C3-2D63-4E6B-8722-ACC740BEA2B2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2BAEC6C3-2D63-4E6B-8722-ACC740BEA2B2}.Release|Any CPU.Build.0 = Release|Any CPU - {A1024432-AE9B-4322-8324-1C9D678828EE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A1024432-AE9B-4322-8324-1C9D678828EE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A1024432-AE9B-4322-8324-1C9D678828EE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A1024432-AE9B-4322-8324-1C9D678828EE}.Release|Any CPU.Build.0 = Release|Any CPU - {505FF783-A92E-4CEF-AF1A-C4316CD16FFC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {505FF783-A92E-4CEF-AF1A-C4316CD16FFC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {505FF783-A92E-4CEF-AF1A-C4316CD16FFC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {505FF783-A92E-4CEF-AF1A-C4316CD16FFC}.Release|Any CPU.Build.0 = Release|Any CPU - {080977A1-08FD-4918-B0E9-8531C6AD97B0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {080977A1-08FD-4918-B0E9-8531C6AD97B0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {080977A1-08FD-4918-B0E9-8531C6AD97B0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {080977A1-08FD-4918-B0E9-8531C6AD97B0}.Release|Any CPU.Build.0 = Release|Any CPU - {B8F6613D-95DC-499F-92BA-1AAC14D61C59}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B8F6613D-95DC-499F-92BA-1AAC14D61C59}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B8F6613D-95DC-499F-92BA-1AAC14D61C59}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B8F6613D-95DC-499F-92BA-1AAC14D61C59}.Release|Any CPU.Build.0 = Release|Any CPU - {21C2974E-6C35-4A66-ACA4-3D86D9C08613}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {21C2974E-6C35-4A66-ACA4-3D86D9C08613}.Debug|Any CPU.Build.0 = Debug|Any CPU - {21C2974E-6C35-4A66-ACA4-3D86D9C08613}.Release|Any CPU.ActiveCfg = Release|Any CPU - {21C2974E-6C35-4A66-ACA4-3D86D9C08613}.Release|Any CPU.Build.0 = Release|Any CPU - {A1490A54-24BB-48E2-8A83-32FE2BD14686}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A1490A54-24BB-48E2-8A83-32FE2BD14686}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A1490A54-24BB-48E2-8A83-32FE2BD14686}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A1490A54-24BB-48E2-8A83-32FE2BD14686}.Release|Any CPU.Build.0 = Release|Any CPU - {6B315910-4099-4694-975C-5A4A4ED659F3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6B315910-4099-4694-975C-5A4A4ED659F3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6B315910-4099-4694-975C-5A4A4ED659F3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6B315910-4099-4694-975C-5A4A4ED659F3}.Release|Any CPU.Build.0 = Release|Any CPU - {3F04FEB4-9F31-4CD4-9DA6-0E2B1BBD3344}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3F04FEB4-9F31-4CD4-9DA6-0E2B1BBD3344}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3F04FEB4-9F31-4CD4-9DA6-0E2B1BBD3344}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3F04FEB4-9F31-4CD4-9DA6-0E2B1BBD3344}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {7A7A1E8A-7730-4085-AEFA-BFD13A869643}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7A7A1E8A-7730-4085-AEFA-BFD13A869643}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7A7A1E8A-7730-4085-AEFA-BFD13A869643}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7A7A1E8A-7730-4085-AEFA-BFD13A869643}.Release|Any CPU.Build.0 = Release|Any CPU - {2BAEC6C3-2D63-4E6B-8722-ACC740BEA2B2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2BAEC6C3-2D63-4E6B-8722-ACC740BEA2B2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2BAEC6C3-2D63-4E6B-8722-ACC740BEA2B2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2BAEC6C3-2D63-4E6B-8722-ACC740BEA2B2}.Release|Any CPU.Build.0 = Release|Any CPU - {A1024432-AE9B-4322-8324-1C9D678828EE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A1024432-AE9B-4322-8324-1C9D678828EE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A1024432-AE9B-4322-8324-1C9D678828EE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A1024432-AE9B-4322-8324-1C9D678828EE}.Release|Any CPU.Build.0 = Release|Any CPU - {505FF783-A92E-4CEF-AF1A-C4316CD16FFC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {505FF783-A92E-4CEF-AF1A-C4316CD16FFC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {505FF783-A92E-4CEF-AF1A-C4316CD16FFC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {505FF783-A92E-4CEF-AF1A-C4316CD16FFC}.Release|Any CPU.Build.0 = Release|Any CPU - {080977A1-08FD-4918-B0E9-8531C6AD97B0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {080977A1-08FD-4918-B0E9-8531C6AD97B0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {080977A1-08FD-4918-B0E9-8531C6AD97B0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {080977A1-08FD-4918-B0E9-8531C6AD97B0}.Release|Any CPU.Build.0 = Release|Any CPU - {B8F6613D-95DC-499F-92BA-1AAC14D61C59}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B8F6613D-95DC-499F-92BA-1AAC14D61C59}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B8F6613D-95DC-499F-92BA-1AAC14D61C59}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B8F6613D-95DC-499F-92BA-1AAC14D61C59}.Release|Any CPU.Build.0 = Release|Any CPU - {21C2974E-6C35-4A66-ACA4-3D86D9C08613}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {21C2974E-6C35-4A66-ACA4-3D86D9C08613}.Debug|Any CPU.Build.0 = Debug|Any CPU - {21C2974E-6C35-4A66-ACA4-3D86D9C08613}.Release|Any CPU.ActiveCfg = Release|Any CPU - {21C2974E-6C35-4A66-ACA4-3D86D9C08613}.Release|Any CPU.Build.0 = Release|Any CPU - {A1490A54-24BB-48E2-8A83-32FE2BD14686}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A1490A54-24BB-48E2-8A83-32FE2BD14686}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A1490A54-24BB-48E2-8A83-32FE2BD14686}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A1490A54-24BB-48E2-8A83-32FE2BD14686}.Release|Any CPU.Build.0 = Release|Any CPU - {6B315910-4099-4694-975C-5A4A4ED659F3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6B315910-4099-4694-975C-5A4A4ED659F3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6B315910-4099-4694-975C-5A4A4ED659F3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6B315910-4099-4694-975C-5A4A4ED659F3}.Release|Any CPU.Build.0 = Release|Any CPU - {3F04FEB4-9F31-4CD4-9DA6-0E2B1BBD3344}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3F04FEB4-9F31-4CD4-9DA6-0E2B1BBD3344}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3F04FEB4-9F31-4CD4-9DA6-0E2B1BBD3344}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3F04FEB4-9F31-4CD4-9DA6-0E2B1BBD3344}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {ED906CD6-2110-42EE-B59C-D97508A03D1F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {490F5BB3-CB5D-4AE0-92F1-34F4C3ADF6AB} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {39DFDC86-DCFD-4CAD-9D09-FB46B502A4B3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {85A4E129-3402-44FD-AABA-4D9ACD827A9A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {BCFEBFA4-E505-4488-B95D-A5D97E4C4F67} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {7A7A1E8A-7730-4085-AEFA-BFD13A869643} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {2BAEC6C3-2D63-4E6B-8722-ACC740BEA2B2} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A1024432-AE9B-4322-8324-1C9D678828EE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {505FF783-A92E-4CEF-AF1A-C4316CD16FFC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {080977A1-08FD-4918-B0E9-8531C6AD97B0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B8F6613D-95DC-499F-92BA-1AAC14D61C59} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {21C2974E-6C35-4A66-ACA4-3D86D9C08613} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A1490A54-24BB-48E2-8A83-32FE2BD14686} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6B315910-4099-4694-975C-5A4A4ED659F3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {3F04FEB4-9F31-4CD4-9DA6-0E2B1BBD3344} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {7A7A1E8A-7730-4085-AEFA-BFD13A869643} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {2BAEC6C3-2D63-4E6B-8722-ACC740BEA2B2} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A1024432-AE9B-4322-8324-1C9D678828EE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {505FF783-A92E-4CEF-AF1A-C4316CD16FFC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {080977A1-08FD-4918-B0E9-8531C6AD97B0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B8F6613D-95DC-499F-92BA-1AAC14D61C59} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {21C2974E-6C35-4A66-ACA4-3D86D9C08613} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A1490A54-24BB-48E2-8A83-32FE2BD14686} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6B315910-4099-4694-975C-5A4A4ED659F3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {3F04FEB4-9F31-4CD4-9DA6-0E2B1BBD3344} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {2BA3DDFA-A4F9-4A55-B282-20B4E9271D66} diff --git a/sdk/src/Services/MTurk/Properties/AssemblyInfo.cs b/sdk/src/Services/MTurk/Properties/AssemblyInfo.cs index 246b46b15606..9774d1f6334f 100644 --- a/sdk/src/Services/MTurk/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/MTurk/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/MWAA/Generated/AmazonMWAAConfig.cs b/sdk/src/Services/MWAA/Generated/AmazonMWAAConfig.cs index c823ae314042..571b37583d11 100644 --- a/sdk/src/Services/MWAA/Generated/AmazonMWAAConfig.cs +++ b/sdk/src/Services/MWAA/Generated/AmazonMWAAConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.MWAA public partial class AmazonMWAAConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("MWAA", "4.0.0.0"); private static readonly AmazonMWAAEndpointResolver EndpointResolver = new AmazonMWAAEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("MWAA", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("MWAA", "3.7.401.15"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/MWAA/Generated/Model/Internal/MarshallTransformations/InvokeRestApiRequestMarshaller.cs b/sdk/src/Services/MWAA/Generated/Model/Internal/MarshallTransformations/InvokeRestApiRequestMarshaller.cs index 4feb3083642e..ec63004d9871 100644 --- a/sdk/src/Services/MWAA/Generated/Model/Internal/MarshallTransformations/InvokeRestApiRequestMarshaller.cs +++ b/sdk/src/Services/MWAA/Generated/Model/Internal/MarshallTransformations/InvokeRestApiRequestMarshaller.cs @@ -64,39 +64,42 @@ public IRequest Marshall(InvokeRestApiRequest publicRequest) throw new AmazonMWAAException("Request object does not have required field Name set"); request.AddPathResource("{Name}", StringUtils.FromString(publicRequest.Name)); request.ResourcePath = "/restapi/{Name}"; - using (StringWriter stringWriter = new StringWriter(CultureInfo.InvariantCulture)) + using (MemoryStream memoryStream = new MemoryStream()) { - JsonWriter writer = new JsonWriter(stringWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetBody()) + using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) { - context.Writer.WritePropertyName("Body"); - Amazon.Runtime.Documents.Internal.Transform.DocumentMarshaller.Instance.Write(context.Writer, publicRequest.Body); - } + JsonWriter writer = new JsonWriter(streamWriter); + writer.Validate = false; + writer.WriteObjectStart(); + var context = new JsonMarshallerContext(request, writer); + if(publicRequest.IsSetBody()) + { + context.Writer.WritePropertyName("Body"); + Amazon.Runtime.Documents.Internal.Transform.DocumentMarshaller.Instance.Write(context.Writer, publicRequest.Body); + } - if(publicRequest.IsSetMethod()) - { - context.Writer.WritePropertyName("Method"); - context.Writer.Write(publicRequest.Method); - } + if(publicRequest.IsSetMethod()) + { + context.Writer.WritePropertyName("Method"); + context.Writer.Write(publicRequest.Method); + } - if(publicRequest.IsSetPath()) - { - context.Writer.WritePropertyName("Path"); - context.Writer.Write(publicRequest.Path); - } + if(publicRequest.IsSetPath()) + { + context.Writer.WritePropertyName("Path"); + context.Writer.Write(publicRequest.Path); + } - if(publicRequest.IsSetQueryParameters()) - { - context.Writer.WritePropertyName("QueryParameters"); - Amazon.Runtime.Documents.Internal.Transform.DocumentMarshaller.Instance.Write(context.Writer, publicRequest.QueryParameters); + if(publicRequest.IsSetQueryParameters()) + { + context.Writer.WritePropertyName("QueryParameters"); + Amazon.Runtime.Documents.Internal.Transform.DocumentMarshaller.Instance.Write(context.Writer, publicRequest.QueryParameters); + } + + writer.WriteObjectEnd(); } - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); + request.Content = memoryStream.ToArray(); } diff --git a/sdk/src/Services/MWAA/Generated/Model/Internal/MarshallTransformations/InvokeRestApiResponseUnmarshaller.cs b/sdk/src/Services/MWAA/Generated/Model/Internal/MarshallTransformations/InvokeRestApiResponseUnmarshaller.cs index c3764b4fb376..47527d3b21a0 100644 --- a/sdk/src/Services/MWAA/Generated/Model/Internal/MarshallTransformations/InvokeRestApiResponseUnmarshaller.cs +++ b/sdk/src/Services/MWAA/Generated/Model/Internal/MarshallTransformations/InvokeRestApiResponseUnmarshaller.cs @@ -60,7 +60,7 @@ public override AmazonWebServiceResponse Unmarshall(JsonUnmarshallerContext cont } if (context.TestExpression("RestApiStatusCode", targetDepth)) { - var unmarshaller = IntUnmarshaller.Instance; + var unmarshaller = NullableIntUnmarshaller.Instance; response.RestApiStatusCode = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/MWAA/Generated/Model/Internal/MarshallTransformations/RestApiClientExceptionUnmarshaller.cs b/sdk/src/Services/MWAA/Generated/Model/Internal/MarshallTransformations/RestApiClientExceptionUnmarshaller.cs index 84e9783d8b31..db92c392ac3f 100644 --- a/sdk/src/Services/MWAA/Generated/Model/Internal/MarshallTransformations/RestApiClientExceptionUnmarshaller.cs +++ b/sdk/src/Services/MWAA/Generated/Model/Internal/MarshallTransformations/RestApiClientExceptionUnmarshaller.cs @@ -73,7 +73,7 @@ public RestApiClientException Unmarshall(JsonUnmarshallerContext context, Amazon } if (context.TestExpression("RestApiStatusCode", targetDepth)) { - var unmarshaller = IntUnmarshaller.Instance; + var unmarshaller = NullableIntUnmarshaller.Instance; unmarshalledObject.RestApiStatusCode = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/MWAA/Generated/Model/Internal/MarshallTransformations/RestApiServerExceptionUnmarshaller.cs b/sdk/src/Services/MWAA/Generated/Model/Internal/MarshallTransformations/RestApiServerExceptionUnmarshaller.cs index 703b4ffd23b8..6b26a286ec29 100644 --- a/sdk/src/Services/MWAA/Generated/Model/Internal/MarshallTransformations/RestApiServerExceptionUnmarshaller.cs +++ b/sdk/src/Services/MWAA/Generated/Model/Internal/MarshallTransformations/RestApiServerExceptionUnmarshaller.cs @@ -73,7 +73,7 @@ public RestApiServerException Unmarshall(JsonUnmarshallerContext context, Amazon } if (context.TestExpression("RestApiStatusCode", targetDepth)) { - var unmarshaller = IntUnmarshaller.Instance; + var unmarshaller = NullableIntUnmarshaller.Instance; unmarshalledObject.RestApiStatusCode = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/MWAA/Generated/Model/InvokeRestApiResponse.cs b/sdk/src/Services/MWAA/Generated/Model/InvokeRestApiResponse.cs index 90e40c10682a..e8aaf5e2c5c4 100644 --- a/sdk/src/Services/MWAA/Generated/Model/InvokeRestApiResponse.cs +++ b/sdk/src/Services/MWAA/Generated/Model/InvokeRestApiResponse.cs @@ -62,9 +62,9 @@ internal bool IsSetRestApiResponse() /// The HTTP status code returned by the Apache Airflow REST API call. /// /// - public int RestApiStatusCode + public int? RestApiStatusCode { - get { return this._restApiStatusCode.GetValueOrDefault(); } + get { return this._restApiStatusCode; } set { this._restApiStatusCode = value; } } diff --git a/sdk/src/Services/MWAA/Generated/Model/RestApiClientException.cs b/sdk/src/Services/MWAA/Generated/Model/RestApiClientException.cs index 207298f9b898..6f5f04b98e53 100644 --- a/sdk/src/Services/MWAA/Generated/Model/RestApiClientException.cs +++ b/sdk/src/Services/MWAA/Generated/Model/RestApiClientException.cs @@ -102,7 +102,7 @@ protected RestApiClientException(System.Runtime.Serialization.SerializationInfo : base(info, context) { this.RestApiResponse = (Amazon.Runtime.Documents.Document)info.GetValue("RestApiResponse", typeof(Amazon.Runtime.Documents.Document)); - this.RestApiStatusCode = (int)info.GetValue("RestApiStatusCode", typeof(int)); + this.RestApiStatusCode = (int?)info.GetValue("RestApiStatusCode", typeof(int?)); } /// @@ -111,11 +111,6 @@ protected RestApiClientException(System.Runtime.Serialization.SerializationInfo /// The that holds the serialized object data about the exception being thrown. /// The that contains contextual information about the source or destination. /// The parameter is a null reference (Nothing in Visual Basic). -#if BCL35 - [System.Security.Permissions.SecurityPermission( - System.Security.Permissions.SecurityAction.LinkDemand, - Flags = System.Security.Permissions.SecurityPermissionFlag.SerializationFormatter)] -#endif [System.Security.SecurityCritical] // These FxCop rules are giving false-positives for this method [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Security", "CA2123:OverrideLinkDemandsShouldBeIdenticalToBase")] @@ -154,9 +149,9 @@ internal bool IsSetRestApiResponse() /// The HTTP status code returned by the Apache Airflow REST API call. /// /// - public int RestApiStatusCode + public int? RestApiStatusCode { - get { return this._restApiStatusCode.GetValueOrDefault(); } + get { return this._restApiStatusCode; } set { this._restApiStatusCode = value; } } diff --git a/sdk/src/Services/MWAA/Generated/Model/RestApiServerException.cs b/sdk/src/Services/MWAA/Generated/Model/RestApiServerException.cs index 8c15757fa30d..353f102a6ed2 100644 --- a/sdk/src/Services/MWAA/Generated/Model/RestApiServerException.cs +++ b/sdk/src/Services/MWAA/Generated/Model/RestApiServerException.cs @@ -102,7 +102,7 @@ protected RestApiServerException(System.Runtime.Serialization.SerializationInfo : base(info, context) { this.RestApiResponse = (Amazon.Runtime.Documents.Document)info.GetValue("RestApiResponse", typeof(Amazon.Runtime.Documents.Document)); - this.RestApiStatusCode = (int)info.GetValue("RestApiStatusCode", typeof(int)); + this.RestApiStatusCode = (int?)info.GetValue("RestApiStatusCode", typeof(int?)); } /// @@ -111,11 +111,6 @@ protected RestApiServerException(System.Runtime.Serialization.SerializationInfo /// The that holds the serialized object data about the exception being thrown. /// The that contains contextual information about the source or destination. /// The parameter is a null reference (Nothing in Visual Basic). -#if BCL35 - [System.Security.Permissions.SecurityPermission( - System.Security.Permissions.SecurityAction.LinkDemand, - Flags = System.Security.Permissions.SecurityPermissionFlag.SerializationFormatter)] -#endif [System.Security.SecurityCritical] // These FxCop rules are giving false-positives for this method [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Security", "CA2123:OverrideLinkDemandsShouldBeIdenticalToBase")] @@ -154,9 +149,9 @@ internal bool IsSetRestApiResponse() /// The HTTP status code returned by the Apache Airflow REST API call. /// /// - public int RestApiStatusCode + public int? RestApiStatusCode { - get { return this._restApiStatusCode.GetValueOrDefault(); } + get { return this._restApiStatusCode; } set { this._restApiStatusCode = value; } } diff --git a/sdk/src/Services/MWAA/Generated/_bcl/AmazonMWAAClient.cs b/sdk/src/Services/MWAA/Generated/_bcl/AmazonMWAAClient.cs index 87151d0a4330..7b236297c861 100644 --- a/sdk/src/Services/MWAA/Generated/_bcl/AmazonMWAAClient.cs +++ b/sdk/src/Services/MWAA/Generated/_bcl/AmazonMWAAClient.cs @@ -110,6 +110,11 @@ namespace Amazon.MWAA /// CreateWebLoginToken /// /// + ///
  • + /// + /// InvokeRestApi + /// + /// ///
    • /// /// Regions @@ -398,7 +403,7 @@ public virtual CreateCliTokenResponse CreateCliToken(CreateCliTokenRequest reque /// - /// Creates an Amazon Managed Workflows for Apache Airflow (MWAA) environment. + /// Creates an Amazon Managed Workflows for Apache Airflow (Amazon MWAA) environment. /// /// Container for the necessary parameters to execute the CreateEnvironment service method. /// @@ -421,7 +426,7 @@ public virtual CreateEnvironmentResponse CreateEnvironment(CreateEnvironmentRequ /// - /// Creates an Amazon Managed Workflows for Apache Airflow (MWAA) environment. + /// Creates an Amazon Managed Workflows for Apache Airflow (Amazon MWAA) environment. /// /// Container for the necessary parameters to execute the CreateEnvironment service method. /// @@ -522,7 +527,7 @@ public virtual CreateWebLoginTokenResponse CreateWebLoginToken(CreateWebLoginTok /// - /// Deletes an Amazon Managed Workflows for Apache Airflow (MWAA) environment. + /// Deletes an Amazon Managed Workflows for Apache Airflow (Amazon MWAA) environment. /// /// Container for the necessary parameters to execute the DeleteEnvironment service method. /// @@ -548,7 +553,7 @@ public virtual DeleteEnvironmentResponse DeleteEnvironment(DeleteEnvironmentRequ /// - /// Deletes an Amazon Managed Workflows for Apache Airflow (MWAA) environment. + /// Deletes an Amazon Managed Workflows for Apache Airflow (Amazon MWAA) environment. /// /// Container for the necessary parameters to execute the DeleteEnvironment service method. /// @@ -636,6 +641,95 @@ public virtual GetEnvironmentResponse GetEnvironment(GetEnvironmentRequest reque #endregion + #region InvokeRestApi + + + /// + /// Invokes the Apache Airflow REST API on the webserver with the specified inputs. To + /// learn more, see Using + /// the Apache Airflow REST API + /// + /// Container for the necessary parameters to execute the InvokeRestApi service method. + /// + /// The response from the InvokeRestApi service method, as returned by MWAA. + /// + /// Access to the Apache Airflow Web UI or CLI has been denied due to insufficient permissions. + /// To learn more, see Accessing + /// an Amazon MWAA environment. + /// + /// + /// InternalServerException: An internal error has occurred. + /// + /// + /// ResourceNotFoundException: The resource is not available. + /// + /// + /// An exception indicating that a client-side error occurred during the Apache Airflow + /// REST API call. + /// + /// + /// An exception indicating that a server-side error occurred during the Apache Airflow + /// REST API call. + /// + /// + /// ValidationException: The provided input is not valid. + /// + /// REST API Reference for InvokeRestApi Operation + public virtual InvokeRestApiResponse InvokeRestApi(InvokeRestApiRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = InvokeRestApiRequestMarshaller.Instance; + options.ResponseUnmarshaller = InvokeRestApiResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// Invokes the Apache Airflow REST API on the webserver with the specified inputs. To + /// learn more, see Using + /// the Apache Airflow REST API + /// + /// Container for the necessary parameters to execute the InvokeRestApi service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the InvokeRestApi service method, as returned by MWAA. + /// + /// Access to the Apache Airflow Web UI or CLI has been denied due to insufficient permissions. + /// To learn more, see Accessing + /// an Amazon MWAA environment. + /// + /// + /// InternalServerException: An internal error has occurred. + /// + /// + /// ResourceNotFoundException: The resource is not available. + /// + /// + /// An exception indicating that a client-side error occurred during the Apache Airflow + /// REST API call. + /// + /// + /// An exception indicating that a server-side error occurred during the Apache Airflow + /// REST API call. + /// + /// + /// ValidationException: The provided input is not valid. + /// + /// REST API Reference for InvokeRestApi Operation + public virtual Task InvokeRestApiAsync(InvokeRestApiRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = InvokeRestApiRequestMarshaller.Instance; + options.ResponseUnmarshaller = InvokeRestApiResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + #region ListEnvironments diff --git a/sdk/src/Services/MWAA/MWAA.sln b/sdk/src/Services/MWAA/MWAA.sln index bddec88ec86d..2d8599243862 100644 --- a/sdk/src/Services/MWAA/MWAA.sln +++ b/sdk/src/Services/MWAA/MWAA.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {05CD341A-2D9A-4E27-9E64-E12B2FC127D0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {05CD341A-2D9A-4E27-9E64-E12B2FC127D0}.Debug|Any CPU.Build.0 = Debug|Any CPU {05CD341A-2D9A-4E27-9E64-E12B2FC127D0}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {6A7E6965-6AD5-491E-99E4-84A69F44A696}.Debug|Any CPU.Build.0 = Debug|Any CPU {6A7E6965-6AD5-491E-99E4-84A69F44A696}.Release|Any CPU.ActiveCfg = Release|Any CPU {6A7E6965-6AD5-491E-99E4-84A69F44A696}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {BFE3EEDB-381C-44A9-BB98-C31AB1C30851}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BFE3EEDB-381C-44A9-BB98-C31AB1C30851}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BFE3EEDB-381C-44A9-BB98-C31AB1C30851}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BFE3EEDB-381C-44A9-BB98-C31AB1C30851}.Release|Any CPU.Build.0 = Release|Any CPU - {62519298-FC0F-414F-846B-B3D4AC728A4C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {62519298-FC0F-414F-846B-B3D4AC728A4C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {62519298-FC0F-414F-846B-B3D4AC728A4C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {62519298-FC0F-414F-846B-B3D4AC728A4C}.Release|Any CPU.Build.0 = Release|Any CPU - {1C3118BF-0DD5-419A-9FBD-8BB3B9EE6B37}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1C3118BF-0DD5-419A-9FBD-8BB3B9EE6B37}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1C3118BF-0DD5-419A-9FBD-8BB3B9EE6B37}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1C3118BF-0DD5-419A-9FBD-8BB3B9EE6B37}.Release|Any CPU.Build.0 = Release|Any CPU - {1DD4EEE3-89A8-4EE4-AD81-2FC60F4DE7B2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1DD4EEE3-89A8-4EE4-AD81-2FC60F4DE7B2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1DD4EEE3-89A8-4EE4-AD81-2FC60F4DE7B2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1DD4EEE3-89A8-4EE4-AD81-2FC60F4DE7B2}.Release|Any CPU.Build.0 = Release|Any CPU - {D2D3AF57-B281-4E3D-9DDF-47D360E5BE18}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D2D3AF57-B281-4E3D-9DDF-47D360E5BE18}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D2D3AF57-B281-4E3D-9DDF-47D360E5BE18}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D2D3AF57-B281-4E3D-9DDF-47D360E5BE18}.Release|Any CPU.Build.0 = Release|Any CPU - {8AB35290-4D49-4537-B870-E90B0E0D2330}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8AB35290-4D49-4537-B870-E90B0E0D2330}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8AB35290-4D49-4537-B870-E90B0E0D2330}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8AB35290-4D49-4537-B870-E90B0E0D2330}.Release|Any CPU.Build.0 = Release|Any CPU - {C5E5A48F-8ADF-4DB7-A0E6-FE85CE3DE607}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C5E5A48F-8ADF-4DB7-A0E6-FE85CE3DE607}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C5E5A48F-8ADF-4DB7-A0E6-FE85CE3DE607}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C5E5A48F-8ADF-4DB7-A0E6-FE85CE3DE607}.Release|Any CPU.Build.0 = Release|Any CPU - {4796BAE0-BA94-4A73-AA37-B724F633687C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4796BAE0-BA94-4A73-AA37-B724F633687C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4796BAE0-BA94-4A73-AA37-B724F633687C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4796BAE0-BA94-4A73-AA37-B724F633687C}.Release|Any CPU.Build.0 = Release|Any CPU - {EBA99A04-52D2-4B2E-B69D-29ABA0AF0B5D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EBA99A04-52D2-4B2E-B69D-29ABA0AF0B5D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EBA99A04-52D2-4B2E-B69D-29ABA0AF0B5D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EBA99A04-52D2-4B2E-B69D-29ABA0AF0B5D}.Release|Any CPU.Build.0 = Release|Any CPU - {7869FC50-E56B-4083-B375-33BE32F47BEF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7869FC50-E56B-4083-B375-33BE32F47BEF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7869FC50-E56B-4083-B375-33BE32F47BEF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7869FC50-E56B-4083-B375-33BE32F47BEF}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {BFE3EEDB-381C-44A9-BB98-C31AB1C30851}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BFE3EEDB-381C-44A9-BB98-C31AB1C30851}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BFE3EEDB-381C-44A9-BB98-C31AB1C30851}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BFE3EEDB-381C-44A9-BB98-C31AB1C30851}.Release|Any CPU.Build.0 = Release|Any CPU - {62519298-FC0F-414F-846B-B3D4AC728A4C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {62519298-FC0F-414F-846B-B3D4AC728A4C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {62519298-FC0F-414F-846B-B3D4AC728A4C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {62519298-FC0F-414F-846B-B3D4AC728A4C}.Release|Any CPU.Build.0 = Release|Any CPU - {1C3118BF-0DD5-419A-9FBD-8BB3B9EE6B37}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1C3118BF-0DD5-419A-9FBD-8BB3B9EE6B37}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1C3118BF-0DD5-419A-9FBD-8BB3B9EE6B37}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1C3118BF-0DD5-419A-9FBD-8BB3B9EE6B37}.Release|Any CPU.Build.0 = Release|Any CPU - {1DD4EEE3-89A8-4EE4-AD81-2FC60F4DE7B2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1DD4EEE3-89A8-4EE4-AD81-2FC60F4DE7B2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1DD4EEE3-89A8-4EE4-AD81-2FC60F4DE7B2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1DD4EEE3-89A8-4EE4-AD81-2FC60F4DE7B2}.Release|Any CPU.Build.0 = Release|Any CPU - {D2D3AF57-B281-4E3D-9DDF-47D360E5BE18}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D2D3AF57-B281-4E3D-9DDF-47D360E5BE18}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D2D3AF57-B281-4E3D-9DDF-47D360E5BE18}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D2D3AF57-B281-4E3D-9DDF-47D360E5BE18}.Release|Any CPU.Build.0 = Release|Any CPU - {8AB35290-4D49-4537-B870-E90B0E0D2330}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8AB35290-4D49-4537-B870-E90B0E0D2330}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8AB35290-4D49-4537-B870-E90B0E0D2330}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8AB35290-4D49-4537-B870-E90B0E0D2330}.Release|Any CPU.Build.0 = Release|Any CPU - {C5E5A48F-8ADF-4DB7-A0E6-FE85CE3DE607}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C5E5A48F-8ADF-4DB7-A0E6-FE85CE3DE607}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C5E5A48F-8ADF-4DB7-A0E6-FE85CE3DE607}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C5E5A48F-8ADF-4DB7-A0E6-FE85CE3DE607}.Release|Any CPU.Build.0 = Release|Any CPU - {4796BAE0-BA94-4A73-AA37-B724F633687C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4796BAE0-BA94-4A73-AA37-B724F633687C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4796BAE0-BA94-4A73-AA37-B724F633687C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4796BAE0-BA94-4A73-AA37-B724F633687C}.Release|Any CPU.Build.0 = Release|Any CPU - {EBA99A04-52D2-4B2E-B69D-29ABA0AF0B5D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EBA99A04-52D2-4B2E-B69D-29ABA0AF0B5D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EBA99A04-52D2-4B2E-B69D-29ABA0AF0B5D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EBA99A04-52D2-4B2E-B69D-29ABA0AF0B5D}.Release|Any CPU.Build.0 = Release|Any CPU - {7869FC50-E56B-4083-B375-33BE32F47BEF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7869FC50-E56B-4083-B375-33BE32F47BEF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7869FC50-E56B-4083-B375-33BE32F47BEF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7869FC50-E56B-4083-B375-33BE32F47BEF}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {05CD341A-2D9A-4E27-9E64-E12B2FC127D0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {B6517160-1D22-4CE2-BD63-E18931FBB0CB} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {B821160D-6C1C-422C-B3DA-F7982F216A69} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {B9D81E5B-66DF-42F3-A34C-B472F3E0C08C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {6A7E6965-6AD5-491E-99E4-84A69F44A696} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {BFE3EEDB-381C-44A9-BB98-C31AB1C30851} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {62519298-FC0F-414F-846B-B3D4AC728A4C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {1C3118BF-0DD5-419A-9FBD-8BB3B9EE6B37} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {1DD4EEE3-89A8-4EE4-AD81-2FC60F4DE7B2} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D2D3AF57-B281-4E3D-9DDF-47D360E5BE18} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8AB35290-4D49-4537-B870-E90B0E0D2330} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C5E5A48F-8ADF-4DB7-A0E6-FE85CE3DE607} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4796BAE0-BA94-4A73-AA37-B724F633687C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {EBA99A04-52D2-4B2E-B69D-29ABA0AF0B5D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {7869FC50-E56B-4083-B375-33BE32F47BEF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {BFE3EEDB-381C-44A9-BB98-C31AB1C30851} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {62519298-FC0F-414F-846B-B3D4AC728A4C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {1C3118BF-0DD5-419A-9FBD-8BB3B9EE6B37} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {1DD4EEE3-89A8-4EE4-AD81-2FC60F4DE7B2} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D2D3AF57-B281-4E3D-9DDF-47D360E5BE18} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8AB35290-4D49-4537-B870-E90B0E0D2330} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C5E5A48F-8ADF-4DB7-A0E6-FE85CE3DE607} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4796BAE0-BA94-4A73-AA37-B724F633687C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {EBA99A04-52D2-4B2E-B69D-29ABA0AF0B5D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {7869FC50-E56B-4083-B375-33BE32F47BEF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {7AF48046-ADDE-4C48-9168-89925521C5F2} diff --git a/sdk/src/Services/MWAA/Properties/AssemblyInfo.cs b/sdk/src/Services/MWAA/Properties/AssemblyInfo.cs index 446e6afaeeb9..245125b04f05 100644 --- a/sdk/src/Services/MWAA/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/MWAA/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.15")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/MachineLearning/Generated/AmazonMachineLearningConfig.cs b/sdk/src/Services/MachineLearning/Generated/AmazonMachineLearningConfig.cs index 0d4b9f7f0bdf..1b85badc2f81 100644 --- a/sdk/src/Services/MachineLearning/Generated/AmazonMachineLearningConfig.cs +++ b/sdk/src/Services/MachineLearning/Generated/AmazonMachineLearningConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.MachineLearning public partial class AmazonMachineLearningConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("Machine Learning", "4.0.0.0"); private static readonly AmazonMachineLearningEndpointResolver EndpointResolver = new AmazonMachineLearningEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("Machine Learning", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("Machine Learning", "3.7.400.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/MachineLearning/MachineLearning.sln b/sdk/src/Services/MachineLearning/MachineLearning.sln index 52582c77391c..9e68e8a29916 100644 --- a/sdk/src/Services/MachineLearning/MachineLearning.sln +++ b/sdk/src/Services/MachineLearning/MachineLearning.sln @@ -92,7 +92,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {11962B96-75E2-444B-829C-BA47168589B6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {11962B96-75E2-444B-829C-BA47168589B6}.Debug|Any CPU.Build.0 = Debug|Any CPU {11962B96-75E2-444B-829C-BA47168589B6}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -113,97 +120,6 @@ Global {664E2555-24EB-4D87-A2C6-0ADB0927C0C3}.Debug|Any CPU.Build.0 = Debug|Any CPU {664E2555-24EB-4D87-A2C6-0ADB0927C0C3}.Release|Any CPU.ActiveCfg = Release|Any CPU {664E2555-24EB-4D87-A2C6-0ADB0927C0C3}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {5BA1D222-ADAC-401C-B9A5-00EDBE5801B9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5BA1D222-ADAC-401C-B9A5-00EDBE5801B9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5BA1D222-ADAC-401C-B9A5-00EDBE5801B9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5BA1D222-ADAC-401C-B9A5-00EDBE5801B9}.Release|Any CPU.Build.0 = Release|Any CPU - {D0C1B92F-C6A0-4312-BC48-71BB0A037E58}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D0C1B92F-C6A0-4312-BC48-71BB0A037E58}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D0C1B92F-C6A0-4312-BC48-71BB0A037E58}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D0C1B92F-C6A0-4312-BC48-71BB0A037E58}.Release|Any CPU.Build.0 = Release|Any CPU - {457A60D8-C6BE-4424-9CCE-CFC386F10F0D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {457A60D8-C6BE-4424-9CCE-CFC386F10F0D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {457A60D8-C6BE-4424-9CCE-CFC386F10F0D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {457A60D8-C6BE-4424-9CCE-CFC386F10F0D}.Release|Any CPU.Build.0 = Release|Any CPU - {2E3997FE-34E0-4FA1-B96C-65178250860E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2E3997FE-34E0-4FA1-B96C-65178250860E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2E3997FE-34E0-4FA1-B96C-65178250860E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2E3997FE-34E0-4FA1-B96C-65178250860E}.Release|Any CPU.Build.0 = Release|Any CPU - {35A8BB3E-CE06-4707-BFCC-04629B85AE60}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {35A8BB3E-CE06-4707-BFCC-04629B85AE60}.Debug|Any CPU.Build.0 = Debug|Any CPU - {35A8BB3E-CE06-4707-BFCC-04629B85AE60}.Release|Any CPU.ActiveCfg = Release|Any CPU - {35A8BB3E-CE06-4707-BFCC-04629B85AE60}.Release|Any CPU.Build.0 = Release|Any CPU - {66DF600D-FF6E-4EFC-BB76-6B02AED793DA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {66DF600D-FF6E-4EFC-BB76-6B02AED793DA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {66DF600D-FF6E-4EFC-BB76-6B02AED793DA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {66DF600D-FF6E-4EFC-BB76-6B02AED793DA}.Release|Any CPU.Build.0 = Release|Any CPU - {72BC9D46-71A8-40CE-B57B-3575DBB5B426}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {72BC9D46-71A8-40CE-B57B-3575DBB5B426}.Debug|Any CPU.Build.0 = Debug|Any CPU - {72BC9D46-71A8-40CE-B57B-3575DBB5B426}.Release|Any CPU.ActiveCfg = Release|Any CPU - {72BC9D46-71A8-40CE-B57B-3575DBB5B426}.Release|Any CPU.Build.0 = Release|Any CPU - {77787E9A-9995-4330-AF1C-AABAAAE7F775}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {77787E9A-9995-4330-AF1C-AABAAAE7F775}.Debug|Any CPU.Build.0 = Debug|Any CPU - {77787E9A-9995-4330-AF1C-AABAAAE7F775}.Release|Any CPU.ActiveCfg = Release|Any CPU - {77787E9A-9995-4330-AF1C-AABAAAE7F775}.Release|Any CPU.Build.0 = Release|Any CPU - {A6F7553B-BB60-4357-A72E-165884649CF6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A6F7553B-BB60-4357-A72E-165884649CF6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A6F7553B-BB60-4357-A72E-165884649CF6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A6F7553B-BB60-4357-A72E-165884649CF6}.Release|Any CPU.Build.0 = Release|Any CPU - {5131BB28-419C-4C04-B006-E556A225B2C1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5131BB28-419C-4C04-B006-E556A225B2C1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5131BB28-419C-4C04-B006-E556A225B2C1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5131BB28-419C-4C04-B006-E556A225B2C1}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {5BA1D222-ADAC-401C-B9A5-00EDBE5801B9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5BA1D222-ADAC-401C-B9A5-00EDBE5801B9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5BA1D222-ADAC-401C-B9A5-00EDBE5801B9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5BA1D222-ADAC-401C-B9A5-00EDBE5801B9}.Release|Any CPU.Build.0 = Release|Any CPU - {D0C1B92F-C6A0-4312-BC48-71BB0A037E58}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D0C1B92F-C6A0-4312-BC48-71BB0A037E58}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D0C1B92F-C6A0-4312-BC48-71BB0A037E58}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D0C1B92F-C6A0-4312-BC48-71BB0A037E58}.Release|Any CPU.Build.0 = Release|Any CPU - {457A60D8-C6BE-4424-9CCE-CFC386F10F0D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {457A60D8-C6BE-4424-9CCE-CFC386F10F0D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {457A60D8-C6BE-4424-9CCE-CFC386F10F0D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {457A60D8-C6BE-4424-9CCE-CFC386F10F0D}.Release|Any CPU.Build.0 = Release|Any CPU - {2E3997FE-34E0-4FA1-B96C-65178250860E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2E3997FE-34E0-4FA1-B96C-65178250860E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2E3997FE-34E0-4FA1-B96C-65178250860E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2E3997FE-34E0-4FA1-B96C-65178250860E}.Release|Any CPU.Build.0 = Release|Any CPU - {35A8BB3E-CE06-4707-BFCC-04629B85AE60}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {35A8BB3E-CE06-4707-BFCC-04629B85AE60}.Debug|Any CPU.Build.0 = Debug|Any CPU - {35A8BB3E-CE06-4707-BFCC-04629B85AE60}.Release|Any CPU.ActiveCfg = Release|Any CPU - {35A8BB3E-CE06-4707-BFCC-04629B85AE60}.Release|Any CPU.Build.0 = Release|Any CPU - {66DF600D-FF6E-4EFC-BB76-6B02AED793DA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {66DF600D-FF6E-4EFC-BB76-6B02AED793DA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {66DF600D-FF6E-4EFC-BB76-6B02AED793DA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {66DF600D-FF6E-4EFC-BB76-6B02AED793DA}.Release|Any CPU.Build.0 = Release|Any CPU - {72BC9D46-71A8-40CE-B57B-3575DBB5B426}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {72BC9D46-71A8-40CE-B57B-3575DBB5B426}.Debug|Any CPU.Build.0 = Debug|Any CPU - {72BC9D46-71A8-40CE-B57B-3575DBB5B426}.Release|Any CPU.ActiveCfg = Release|Any CPU - {72BC9D46-71A8-40CE-B57B-3575DBB5B426}.Release|Any CPU.Build.0 = Release|Any CPU - {77787E9A-9995-4330-AF1C-AABAAAE7F775}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {77787E9A-9995-4330-AF1C-AABAAAE7F775}.Debug|Any CPU.Build.0 = Debug|Any CPU - {77787E9A-9995-4330-AF1C-AABAAAE7F775}.Release|Any CPU.ActiveCfg = Release|Any CPU - {77787E9A-9995-4330-AF1C-AABAAAE7F775}.Release|Any CPU.Build.0 = Release|Any CPU - {A6F7553B-BB60-4357-A72E-165884649CF6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A6F7553B-BB60-4357-A72E-165884649CF6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A6F7553B-BB60-4357-A72E-165884649CF6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A6F7553B-BB60-4357-A72E-165884649CF6}.Release|Any CPU.Build.0 = Release|Any CPU - {5131BB28-419C-4C04-B006-E556A225B2C1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5131BB28-419C-4C04-B006-E556A225B2C1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5131BB28-419C-4C04-B006-E556A225B2C1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5131BB28-419C-4C04-B006-E556A225B2C1}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -220,37 +136,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {11962B96-75E2-444B-829C-BA47168589B6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {04661DF9-8691-437E-BFAE-CAFEC9AF803D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {4CEACBC7-6082-4B92-8383-9DB07885A4FF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {3CD93B06-67D5-4AE4-B090-4BBCE0891BF3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {664E2555-24EB-4D87-A2C6-0ADB0927C0C3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {5BA1D222-ADAC-401C-B9A5-00EDBE5801B9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D0C1B92F-C6A0-4312-BC48-71BB0A037E58} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {457A60D8-C6BE-4424-9CCE-CFC386F10F0D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {2E3997FE-34E0-4FA1-B96C-65178250860E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {35A8BB3E-CE06-4707-BFCC-04629B85AE60} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {66DF600D-FF6E-4EFC-BB76-6B02AED793DA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {72BC9D46-71A8-40CE-B57B-3575DBB5B426} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {77787E9A-9995-4330-AF1C-AABAAAE7F775} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A6F7553B-BB60-4357-A72E-165884649CF6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {5131BB28-419C-4C04-B006-E556A225B2C1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {5BA1D222-ADAC-401C-B9A5-00EDBE5801B9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D0C1B92F-C6A0-4312-BC48-71BB0A037E58} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {457A60D8-C6BE-4424-9CCE-CFC386F10F0D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {2E3997FE-34E0-4FA1-B96C-65178250860E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {35A8BB3E-CE06-4707-BFCC-04629B85AE60} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {66DF600D-FF6E-4EFC-BB76-6B02AED793DA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {72BC9D46-71A8-40CE-B57B-3575DBB5B426} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {77787E9A-9995-4330-AF1C-AABAAAE7F775} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A6F7553B-BB60-4357-A72E-165884649CF6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {5131BB28-419C-4C04-B006-E556A225B2C1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {33D92B4F-78B3-48C1-9AE2-36F495E20658} diff --git a/sdk/src/Services/MachineLearning/Properties/AssemblyInfo.cs b/sdk/src/Services/MachineLearning/Properties/AssemblyInfo.cs index 9c4bb2e39e2a..9f76da14a333 100644 --- a/sdk/src/Services/MachineLearning/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/MachineLearning/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/Macie2/Generated/AmazonMacie2Config.cs b/sdk/src/Services/Macie2/Generated/AmazonMacie2Config.cs index 0164ef98150c..fb88870ab14c 100644 --- a/sdk/src/Services/Macie2/Generated/AmazonMacie2Config.cs +++ b/sdk/src/Services/Macie2/Generated/AmazonMacie2Config.cs @@ -34,16 +34,10 @@ namespace Amazon.Macie2 public partial class AmazonMacie2Config : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("Macie2", "4.0.0.0"); private static readonly AmazonMacie2EndpointResolver EndpointResolver = new AmazonMacie2EndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("Macie2", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("Macie2", "3.7.400.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/Macie2/Macie2.sln b/sdk/src/Services/Macie2/Macie2.sln index 5c5266476ad4..784fbf7a5dd9 100644 --- a/sdk/src/Services/Macie2/Macie2.sln +++ b/sdk/src/Services/Macie2/Macie2.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {0B139FA9-5FEE-4E9F-AC32-8F15C98C8F03}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {0B139FA9-5FEE-4E9F-AC32-8F15C98C8F03}.Debug|Any CPU.Build.0 = Debug|Any CPU {0B139FA9-5FEE-4E9F-AC32-8F15C98C8F03}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {3826A6B7-5541-4978-98E6-570229DA0A9A}.Debug|Any CPU.Build.0 = Debug|Any CPU {3826A6B7-5541-4978-98E6-570229DA0A9A}.Release|Any CPU.ActiveCfg = Release|Any CPU {3826A6B7-5541-4978-98E6-570229DA0A9A}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {91602F73-47EA-457A-B720-C1007F5B1029}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {91602F73-47EA-457A-B720-C1007F5B1029}.Debug|Any CPU.Build.0 = Debug|Any CPU - {91602F73-47EA-457A-B720-C1007F5B1029}.Release|Any CPU.ActiveCfg = Release|Any CPU - {91602F73-47EA-457A-B720-C1007F5B1029}.Release|Any CPU.Build.0 = Release|Any CPU - {2C7E9F86-50BC-4471-B915-AB7DFD6061D0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2C7E9F86-50BC-4471-B915-AB7DFD6061D0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2C7E9F86-50BC-4471-B915-AB7DFD6061D0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2C7E9F86-50BC-4471-B915-AB7DFD6061D0}.Release|Any CPU.Build.0 = Release|Any CPU - {6BDECF27-D26D-445F-AA4B-D02714758744}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6BDECF27-D26D-445F-AA4B-D02714758744}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6BDECF27-D26D-445F-AA4B-D02714758744}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6BDECF27-D26D-445F-AA4B-D02714758744}.Release|Any CPU.Build.0 = Release|Any CPU - {73384C43-D4B5-4EA1-ADF0-B3ED35D0C404}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {73384C43-D4B5-4EA1-ADF0-B3ED35D0C404}.Debug|Any CPU.Build.0 = Debug|Any CPU - {73384C43-D4B5-4EA1-ADF0-B3ED35D0C404}.Release|Any CPU.ActiveCfg = Release|Any CPU - {73384C43-D4B5-4EA1-ADF0-B3ED35D0C404}.Release|Any CPU.Build.0 = Release|Any CPU - {D3ED936D-5908-4BF0-A5A4-7A7D5310D8D9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D3ED936D-5908-4BF0-A5A4-7A7D5310D8D9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D3ED936D-5908-4BF0-A5A4-7A7D5310D8D9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D3ED936D-5908-4BF0-A5A4-7A7D5310D8D9}.Release|Any CPU.Build.0 = Release|Any CPU - {088DF724-8BB2-4593-AAC1-731A114FA17A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {088DF724-8BB2-4593-AAC1-731A114FA17A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {088DF724-8BB2-4593-AAC1-731A114FA17A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {088DF724-8BB2-4593-AAC1-731A114FA17A}.Release|Any CPU.Build.0 = Release|Any CPU - {57C34992-B0E5-4596-A8E5-22C97F72B8C6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {57C34992-B0E5-4596-A8E5-22C97F72B8C6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {57C34992-B0E5-4596-A8E5-22C97F72B8C6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {57C34992-B0E5-4596-A8E5-22C97F72B8C6}.Release|Any CPU.Build.0 = Release|Any CPU - {884799D1-A1E0-478F-805A-CDEEBFC7D7C0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {884799D1-A1E0-478F-805A-CDEEBFC7D7C0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {884799D1-A1E0-478F-805A-CDEEBFC7D7C0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {884799D1-A1E0-478F-805A-CDEEBFC7D7C0}.Release|Any CPU.Build.0 = Release|Any CPU - {C75ABC04-C7D7-46EE-A0B9-24DC5CDFB05E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C75ABC04-C7D7-46EE-A0B9-24DC5CDFB05E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C75ABC04-C7D7-46EE-A0B9-24DC5CDFB05E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C75ABC04-C7D7-46EE-A0B9-24DC5CDFB05E}.Release|Any CPU.Build.0 = Release|Any CPU - {6864D534-4C4C-4F24-A0C5-4153F963C12D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6864D534-4C4C-4F24-A0C5-4153F963C12D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6864D534-4C4C-4F24-A0C5-4153F963C12D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6864D534-4C4C-4F24-A0C5-4153F963C12D}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {91602F73-47EA-457A-B720-C1007F5B1029}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {91602F73-47EA-457A-B720-C1007F5B1029}.Debug|Any CPU.Build.0 = Debug|Any CPU - {91602F73-47EA-457A-B720-C1007F5B1029}.Release|Any CPU.ActiveCfg = Release|Any CPU - {91602F73-47EA-457A-B720-C1007F5B1029}.Release|Any CPU.Build.0 = Release|Any CPU - {2C7E9F86-50BC-4471-B915-AB7DFD6061D0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2C7E9F86-50BC-4471-B915-AB7DFD6061D0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2C7E9F86-50BC-4471-B915-AB7DFD6061D0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2C7E9F86-50BC-4471-B915-AB7DFD6061D0}.Release|Any CPU.Build.0 = Release|Any CPU - {6BDECF27-D26D-445F-AA4B-D02714758744}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6BDECF27-D26D-445F-AA4B-D02714758744}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6BDECF27-D26D-445F-AA4B-D02714758744}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6BDECF27-D26D-445F-AA4B-D02714758744}.Release|Any CPU.Build.0 = Release|Any CPU - {73384C43-D4B5-4EA1-ADF0-B3ED35D0C404}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {73384C43-D4B5-4EA1-ADF0-B3ED35D0C404}.Debug|Any CPU.Build.0 = Debug|Any CPU - {73384C43-D4B5-4EA1-ADF0-B3ED35D0C404}.Release|Any CPU.ActiveCfg = Release|Any CPU - {73384C43-D4B5-4EA1-ADF0-B3ED35D0C404}.Release|Any CPU.Build.0 = Release|Any CPU - {D3ED936D-5908-4BF0-A5A4-7A7D5310D8D9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D3ED936D-5908-4BF0-A5A4-7A7D5310D8D9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D3ED936D-5908-4BF0-A5A4-7A7D5310D8D9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D3ED936D-5908-4BF0-A5A4-7A7D5310D8D9}.Release|Any CPU.Build.0 = Release|Any CPU - {088DF724-8BB2-4593-AAC1-731A114FA17A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {088DF724-8BB2-4593-AAC1-731A114FA17A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {088DF724-8BB2-4593-AAC1-731A114FA17A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {088DF724-8BB2-4593-AAC1-731A114FA17A}.Release|Any CPU.Build.0 = Release|Any CPU - {57C34992-B0E5-4596-A8E5-22C97F72B8C6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {57C34992-B0E5-4596-A8E5-22C97F72B8C6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {57C34992-B0E5-4596-A8E5-22C97F72B8C6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {57C34992-B0E5-4596-A8E5-22C97F72B8C6}.Release|Any CPU.Build.0 = Release|Any CPU - {884799D1-A1E0-478F-805A-CDEEBFC7D7C0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {884799D1-A1E0-478F-805A-CDEEBFC7D7C0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {884799D1-A1E0-478F-805A-CDEEBFC7D7C0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {884799D1-A1E0-478F-805A-CDEEBFC7D7C0}.Release|Any CPU.Build.0 = Release|Any CPU - {C75ABC04-C7D7-46EE-A0B9-24DC5CDFB05E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C75ABC04-C7D7-46EE-A0B9-24DC5CDFB05E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C75ABC04-C7D7-46EE-A0B9-24DC5CDFB05E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C75ABC04-C7D7-46EE-A0B9-24DC5CDFB05E}.Release|Any CPU.Build.0 = Release|Any CPU - {6864D534-4C4C-4F24-A0C5-4153F963C12D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6864D534-4C4C-4F24-A0C5-4153F963C12D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6864D534-4C4C-4F24-A0C5-4153F963C12D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6864D534-4C4C-4F24-A0C5-4153F963C12D}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {0B139FA9-5FEE-4E9F-AC32-8F15C98C8F03} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {F69D82FC-F4FB-4AF0-AC47-110C2E21272A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {3CBFDEA2-CC30-4B07-8DE0-1D1EB0F3F01D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {68E2758E-0D74-43C3-9740-290E6F3AE6DE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {3826A6B7-5541-4978-98E6-570229DA0A9A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {91602F73-47EA-457A-B720-C1007F5B1029} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {2C7E9F86-50BC-4471-B915-AB7DFD6061D0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6BDECF27-D26D-445F-AA4B-D02714758744} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {73384C43-D4B5-4EA1-ADF0-B3ED35D0C404} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D3ED936D-5908-4BF0-A5A4-7A7D5310D8D9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {088DF724-8BB2-4593-AAC1-731A114FA17A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {57C34992-B0E5-4596-A8E5-22C97F72B8C6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {884799D1-A1E0-478F-805A-CDEEBFC7D7C0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C75ABC04-C7D7-46EE-A0B9-24DC5CDFB05E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6864D534-4C4C-4F24-A0C5-4153F963C12D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {91602F73-47EA-457A-B720-C1007F5B1029} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {2C7E9F86-50BC-4471-B915-AB7DFD6061D0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6BDECF27-D26D-445F-AA4B-D02714758744} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {73384C43-D4B5-4EA1-ADF0-B3ED35D0C404} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D3ED936D-5908-4BF0-A5A4-7A7D5310D8D9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {088DF724-8BB2-4593-AAC1-731A114FA17A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {57C34992-B0E5-4596-A8E5-22C97F72B8C6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {884799D1-A1E0-478F-805A-CDEEBFC7D7C0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C75ABC04-C7D7-46EE-A0B9-24DC5CDFB05E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6864D534-4C4C-4F24-A0C5-4153F963C12D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {A484F4B6-A09B-4AE6-90F1-5652C897F22B} diff --git a/sdk/src/Services/Macie2/Properties/AssemblyInfo.cs b/sdk/src/Services/Macie2/Properties/AssemblyInfo.cs index 0d68f8d704e6..3402e91cf7aa 100644 --- a/sdk/src/Services/Macie2/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/Macie2/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/MailManager/Generated/AmazonMailManagerConfig.cs b/sdk/src/Services/MailManager/Generated/AmazonMailManagerConfig.cs index a2ef85564780..f457377284df 100644 --- a/sdk/src/Services/MailManager/Generated/AmazonMailManagerConfig.cs +++ b/sdk/src/Services/MailManager/Generated/AmazonMailManagerConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.MailManager public partial class AmazonMailManagerConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("MailManager", "4.0.0.0"); private static readonly AmazonMailManagerEndpointResolver EndpointResolver = new AmazonMailManagerEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("MailManager", "3.7.401.5"); -======= - InternalSDKUtils.BuildUserAgentString("MailManager", "3.7.402.19"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/MailManager/Generated/Model/Internal/MarshallTransformations/MetadataUnmarshaller.cs b/sdk/src/Services/MailManager/Generated/Model/Internal/MarshallTransformations/MetadataUnmarshaller.cs index 3643c273b9b0..9cc0197ff916 100644 --- a/sdk/src/Services/MailManager/Generated/Model/Internal/MarshallTransformations/MetadataUnmarshaller.cs +++ b/sdk/src/Services/MailManager/Generated/Model/Internal/MarshallTransformations/MetadataUnmarshaller.cs @@ -92,7 +92,7 @@ public Metadata Unmarshall(JsonUnmarshallerContext context) } if (context.TestExpression("Timestamp", targetDepth)) { - var unmarshaller = DateTimeUnmarshaller.Instance; + var unmarshaller = NullableDateTimeUnmarshaller.Instance; unmarshalledObject.Timestamp = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/MailManager/Generated/Model/Internal/MarshallTransformations/StartArchiveExportRequestMarshaller.cs b/sdk/src/Services/MailManager/Generated/Model/Internal/MarshallTransformations/StartArchiveExportRequestMarshaller.cs index a0d3ca066260..c69a1ada2658 100644 --- a/sdk/src/Services/MailManager/Generated/Model/Internal/MarshallTransformations/StartArchiveExportRequestMarshaller.cs +++ b/sdk/src/Services/MailManager/Generated/Model/Internal/MarshallTransformations/StartArchiveExportRequestMarshaller.cs @@ -105,6 +105,12 @@ public IRequest Marshall(StartArchiveExportRequest publicRequest) context.Writer.Write(publicRequest.FromTimestamp.Value); } + if(publicRequest.IsSetIncludeMetadata()) + { + context.Writer.WritePropertyName("IncludeMetadata"); + context.Writer.Write(publicRequest.IncludeMetadata.Value); + } + if(publicRequest.IsSetMaxResults()) { context.Writer.WritePropertyName("MaxResults"); @@ -120,103 +126,7 @@ public IRequest Marshall(StartArchiveExportRequest publicRequest) writer.WriteObjectEnd(); } -<<<<<<< HEAD request.Content = memoryStream.ToArray(); -||||||| Commit version number update changes - if(publicRequest.IsSetExportDestinationConfiguration()) - { - context.Writer.WritePropertyName("ExportDestinationConfiguration"); - context.Writer.WriteObjectStart(); - - var marshaller = ExportDestinationConfigurationMarshaller.Instance; - marshaller.Marshall(publicRequest.ExportDestinationConfiguration, context); - - context.Writer.WriteObjectEnd(); - } - - if(publicRequest.IsSetFilters()) - { - context.Writer.WritePropertyName("Filters"); - context.Writer.WriteObjectStart(); - - var marshaller = ArchiveFiltersMarshaller.Instance; - marshaller.Marshall(publicRequest.Filters, context); - - context.Writer.WriteObjectEnd(); - } - - if(publicRequest.IsSetFromTimestamp()) - { - context.Writer.WritePropertyName("FromTimestamp"); - context.Writer.Write(publicRequest.FromTimestamp); - } - - if(publicRequest.IsSetMaxResults()) - { - context.Writer.WritePropertyName("MaxResults"); - context.Writer.Write(publicRequest.MaxResults); - } - - if(publicRequest.IsSetToTimestamp()) - { - context.Writer.WritePropertyName("ToTimestamp"); - context.Writer.Write(publicRequest.ToTimestamp); - } - - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); -======= - if(publicRequest.IsSetExportDestinationConfiguration()) - { - context.Writer.WritePropertyName("ExportDestinationConfiguration"); - context.Writer.WriteObjectStart(); - - var marshaller = ExportDestinationConfigurationMarshaller.Instance; - marshaller.Marshall(publicRequest.ExportDestinationConfiguration, context); - - context.Writer.WriteObjectEnd(); - } - - if(publicRequest.IsSetFilters()) - { - context.Writer.WritePropertyName("Filters"); - context.Writer.WriteObjectStart(); - - var marshaller = ArchiveFiltersMarshaller.Instance; - marshaller.Marshall(publicRequest.Filters, context); - - context.Writer.WriteObjectEnd(); - } - - if(publicRequest.IsSetFromTimestamp()) - { - context.Writer.WritePropertyName("FromTimestamp"); - context.Writer.Write(publicRequest.FromTimestamp); - } - - if(publicRequest.IsSetIncludeMetadata()) - { - context.Writer.WritePropertyName("IncludeMetadata"); - context.Writer.Write(publicRequest.IncludeMetadata); - } - - if(publicRequest.IsSetMaxResults()) - { - context.Writer.WritePropertyName("MaxResults"); - context.Writer.Write(publicRequest.MaxResults); - } - - if(publicRequest.IsSetToTimestamp()) - { - context.Writer.WritePropertyName("ToTimestamp"); - context.Writer.Write(publicRequest.ToTimestamp); - } - - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b } diff --git a/sdk/src/Services/MailManager/Generated/Model/Metadata.cs b/sdk/src/Services/MailManager/Generated/Model/Metadata.cs index c81794ae2062..3c669f7baa4a 100644 --- a/sdk/src/Services/MailManager/Generated/Model/Metadata.cs +++ b/sdk/src/Services/MailManager/Generated/Model/Metadata.cs @@ -124,9 +124,9 @@ internal bool IsSetSenderIpAddress() /// The timestamp of when the email was received. /// /// - public DateTime Timestamp + public DateTime? Timestamp { - get { return this._timestamp.GetValueOrDefault(); } + get { return this._timestamp; } set { this._timestamp = value; } } diff --git a/sdk/src/Services/MailManager/Generated/Model/StartArchiveExportRequest.cs b/sdk/src/Services/MailManager/Generated/Model/StartArchiveExportRequest.cs index 73686958a2a2..82e125ae6ca9 100644 --- a/sdk/src/Services/MailManager/Generated/Model/StartArchiveExportRequest.cs +++ b/sdk/src/Services/MailManager/Generated/Model/StartArchiveExportRequest.cs @@ -124,9 +124,9 @@ internal bool IsSetFromTimestamp() /// Whether to include message metadata as JSON files in the export. /// /// - public bool IncludeMetadata + public bool? IncludeMetadata { - get { return this._includeMetadata.GetValueOrDefault(); } + get { return this._includeMetadata; } set { this._includeMetadata = value; } } diff --git a/sdk/src/Services/MailManager/MailManager.sln b/sdk/src/Services/MailManager/MailManager.sln index 56a80cfacd99..0fb8f61f7668 100644 --- a/sdk/src/Services/MailManager/MailManager.sln +++ b/sdk/src/Services/MailManager/MailManager.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {C2E0F526-7042-4BDF-B0D0-B3161EB42B7C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {C2E0F526-7042-4BDF-B0D0-B3161EB42B7C}.Debug|Any CPU.Build.0 = Debug|Any CPU {C2E0F526-7042-4BDF-B0D0-B3161EB42B7C}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {EB7B572C-A00B-48D6-A9C9-FAFF57E02424}.Debug|Any CPU.Build.0 = Debug|Any CPU {EB7B572C-A00B-48D6-A9C9-FAFF57E02424}.Release|Any CPU.ActiveCfg = Release|Any CPU {EB7B572C-A00B-48D6-A9C9-FAFF57E02424}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {FEC50F06-A8DA-4912-B987-C6DE6F091337}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FEC50F06-A8DA-4912-B987-C6DE6F091337}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FEC50F06-A8DA-4912-B987-C6DE6F091337}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FEC50F06-A8DA-4912-B987-C6DE6F091337}.Release|Any CPU.Build.0 = Release|Any CPU - {3FB14595-BD16-4895-A5D2-CC86E3D470E0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3FB14595-BD16-4895-A5D2-CC86E3D470E0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3FB14595-BD16-4895-A5D2-CC86E3D470E0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3FB14595-BD16-4895-A5D2-CC86E3D470E0}.Release|Any CPU.Build.0 = Release|Any CPU - {D1765C1C-0621-4618-948D-0571E6C35602}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D1765C1C-0621-4618-948D-0571E6C35602}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D1765C1C-0621-4618-948D-0571E6C35602}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D1765C1C-0621-4618-948D-0571E6C35602}.Release|Any CPU.Build.0 = Release|Any CPU - {D03DF3BD-8AB8-49D0-87A0-2985814929E3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D03DF3BD-8AB8-49D0-87A0-2985814929E3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D03DF3BD-8AB8-49D0-87A0-2985814929E3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D03DF3BD-8AB8-49D0-87A0-2985814929E3}.Release|Any CPU.Build.0 = Release|Any CPU - {B9CDB000-B6B5-45E5-AF18-A0320E445839}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B9CDB000-B6B5-45E5-AF18-A0320E445839}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B9CDB000-B6B5-45E5-AF18-A0320E445839}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B9CDB000-B6B5-45E5-AF18-A0320E445839}.Release|Any CPU.Build.0 = Release|Any CPU - {0078B84D-B1DA-4615-8A31-C97B9FAA39D0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0078B84D-B1DA-4615-8A31-C97B9FAA39D0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0078B84D-B1DA-4615-8A31-C97B9FAA39D0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0078B84D-B1DA-4615-8A31-C97B9FAA39D0}.Release|Any CPU.Build.0 = Release|Any CPU - {B2A44291-54EA-4832-AE7B-EE5C26229BEF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B2A44291-54EA-4832-AE7B-EE5C26229BEF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B2A44291-54EA-4832-AE7B-EE5C26229BEF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B2A44291-54EA-4832-AE7B-EE5C26229BEF}.Release|Any CPU.Build.0 = Release|Any CPU - {85703209-BC21-456D-820E-90ECAE35FFD1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {85703209-BC21-456D-820E-90ECAE35FFD1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {85703209-BC21-456D-820E-90ECAE35FFD1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {85703209-BC21-456D-820E-90ECAE35FFD1}.Release|Any CPU.Build.0 = Release|Any CPU - {A8CE7E3F-3F31-4438-B6F1-62527459BD20}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A8CE7E3F-3F31-4438-B6F1-62527459BD20}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A8CE7E3F-3F31-4438-B6F1-62527459BD20}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A8CE7E3F-3F31-4438-B6F1-62527459BD20}.Release|Any CPU.Build.0 = Release|Any CPU - {A0F77B92-8239-48C6-A978-AB84C2C55483}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A0F77B92-8239-48C6-A978-AB84C2C55483}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A0F77B92-8239-48C6-A978-AB84C2C55483}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A0F77B92-8239-48C6-A978-AB84C2C55483}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {FEC50F06-A8DA-4912-B987-C6DE6F091337}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FEC50F06-A8DA-4912-B987-C6DE6F091337}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FEC50F06-A8DA-4912-B987-C6DE6F091337}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FEC50F06-A8DA-4912-B987-C6DE6F091337}.Release|Any CPU.Build.0 = Release|Any CPU - {3FB14595-BD16-4895-A5D2-CC86E3D470E0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3FB14595-BD16-4895-A5D2-CC86E3D470E0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3FB14595-BD16-4895-A5D2-CC86E3D470E0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3FB14595-BD16-4895-A5D2-CC86E3D470E0}.Release|Any CPU.Build.0 = Release|Any CPU - {D1765C1C-0621-4618-948D-0571E6C35602}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D1765C1C-0621-4618-948D-0571E6C35602}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D1765C1C-0621-4618-948D-0571E6C35602}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D1765C1C-0621-4618-948D-0571E6C35602}.Release|Any CPU.Build.0 = Release|Any CPU - {D03DF3BD-8AB8-49D0-87A0-2985814929E3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D03DF3BD-8AB8-49D0-87A0-2985814929E3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D03DF3BD-8AB8-49D0-87A0-2985814929E3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D03DF3BD-8AB8-49D0-87A0-2985814929E3}.Release|Any CPU.Build.0 = Release|Any CPU - {B9CDB000-B6B5-45E5-AF18-A0320E445839}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B9CDB000-B6B5-45E5-AF18-A0320E445839}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B9CDB000-B6B5-45E5-AF18-A0320E445839}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B9CDB000-B6B5-45E5-AF18-A0320E445839}.Release|Any CPU.Build.0 = Release|Any CPU - {0078B84D-B1DA-4615-8A31-C97B9FAA39D0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0078B84D-B1DA-4615-8A31-C97B9FAA39D0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0078B84D-B1DA-4615-8A31-C97B9FAA39D0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0078B84D-B1DA-4615-8A31-C97B9FAA39D0}.Release|Any CPU.Build.0 = Release|Any CPU - {B2A44291-54EA-4832-AE7B-EE5C26229BEF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B2A44291-54EA-4832-AE7B-EE5C26229BEF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B2A44291-54EA-4832-AE7B-EE5C26229BEF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B2A44291-54EA-4832-AE7B-EE5C26229BEF}.Release|Any CPU.Build.0 = Release|Any CPU - {85703209-BC21-456D-820E-90ECAE35FFD1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {85703209-BC21-456D-820E-90ECAE35FFD1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {85703209-BC21-456D-820E-90ECAE35FFD1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {85703209-BC21-456D-820E-90ECAE35FFD1}.Release|Any CPU.Build.0 = Release|Any CPU - {A8CE7E3F-3F31-4438-B6F1-62527459BD20}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A8CE7E3F-3F31-4438-B6F1-62527459BD20}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A8CE7E3F-3F31-4438-B6F1-62527459BD20}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A8CE7E3F-3F31-4438-B6F1-62527459BD20}.Release|Any CPU.Build.0 = Release|Any CPU - {A0F77B92-8239-48C6-A978-AB84C2C55483}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A0F77B92-8239-48C6-A978-AB84C2C55483}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A0F77B92-8239-48C6-A978-AB84C2C55483}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A0F77B92-8239-48C6-A978-AB84C2C55483}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {C2E0F526-7042-4BDF-B0D0-B3161EB42B7C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {0EC354C5-5902-4DDE-8EFD-D1DF39396F9B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {5F8AE252-385B-43B0-B82D-D9CEA0FAAFB7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {F6506F16-DD74-44A5-84CF-795EA3D982AD} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {EB7B572C-A00B-48D6-A9C9-FAFF57E02424} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {FEC50F06-A8DA-4912-B987-C6DE6F091337} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {3FB14595-BD16-4895-A5D2-CC86E3D470E0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D1765C1C-0621-4618-948D-0571E6C35602} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D03DF3BD-8AB8-49D0-87A0-2985814929E3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B9CDB000-B6B5-45E5-AF18-A0320E445839} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0078B84D-B1DA-4615-8A31-C97B9FAA39D0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B2A44291-54EA-4832-AE7B-EE5C26229BEF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {85703209-BC21-456D-820E-90ECAE35FFD1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A8CE7E3F-3F31-4438-B6F1-62527459BD20} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A0F77B92-8239-48C6-A978-AB84C2C55483} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {FEC50F06-A8DA-4912-B987-C6DE6F091337} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {3FB14595-BD16-4895-A5D2-CC86E3D470E0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D1765C1C-0621-4618-948D-0571E6C35602} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D03DF3BD-8AB8-49D0-87A0-2985814929E3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B9CDB000-B6B5-45E5-AF18-A0320E445839} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0078B84D-B1DA-4615-8A31-C97B9FAA39D0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B2A44291-54EA-4832-AE7B-EE5C26229BEF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {85703209-BC21-456D-820E-90ECAE35FFD1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A8CE7E3F-3F31-4438-B6F1-62527459BD20} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A0F77B92-8239-48C6-A978-AB84C2C55483} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {6D8EF57D-60F1-4050-AD9C-766F451D2BE3} diff --git a/sdk/src/Services/MailManager/Properties/AssemblyInfo.cs b/sdk/src/Services/MailManager/Properties/AssemblyInfo.cs index 1b313505fc13..f76800abed0b 100644 --- a/sdk/src/Services/MailManager/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/MailManager/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.5")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.402.19")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/MainframeModernization/Generated/AmazonMainframeModernizationConfig.cs b/sdk/src/Services/MainframeModernization/Generated/AmazonMainframeModernizationConfig.cs index bc2f2a955b98..f12c1aa29a46 100644 --- a/sdk/src/Services/MainframeModernization/Generated/AmazonMainframeModernizationConfig.cs +++ b/sdk/src/Services/MainframeModernization/Generated/AmazonMainframeModernizationConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.MainframeModernization public partial class AmazonMainframeModernizationConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("m2", "4.0.0.0"); private static readonly AmazonMainframeModernizationEndpointResolver EndpointResolver = new AmazonMainframeModernizationEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("m2", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("m2", "3.7.401.16"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/MainframeModernization/Generated/Model/Internal/MarshallTransformations/CancelBatchJobExecutionRequestMarshaller.cs b/sdk/src/Services/MainframeModernization/Generated/Model/Internal/MarshallTransformations/CancelBatchJobExecutionRequestMarshaller.cs index bd6a8260e61c..0ef37c6f9962 100644 --- a/sdk/src/Services/MainframeModernization/Generated/Model/Internal/MarshallTransformations/CancelBatchJobExecutionRequestMarshaller.cs +++ b/sdk/src/Services/MainframeModernization/Generated/Model/Internal/MarshallTransformations/CancelBatchJobExecutionRequestMarshaller.cs @@ -67,21 +67,24 @@ public IRequest Marshall(CancelBatchJobExecutionRequest publicRequest) throw new AmazonMainframeModernizationException("Request object does not have required field ExecutionId set"); request.AddPathResource("{executionId}", StringUtils.FromString(publicRequest.ExecutionId)); request.ResourcePath = "/applications/{applicationId}/batch-job-executions/{executionId}/cancel"; - using (StringWriter stringWriter = new StringWriter(CultureInfo.InvariantCulture)) + using (MemoryStream memoryStream = new MemoryStream()) { - JsonWriter writer = new JsonWriter(stringWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetAuthSecretsManagerArn()) + using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) { - context.Writer.WritePropertyName("authSecretsManagerArn"); - context.Writer.Write(publicRequest.AuthSecretsManagerArn); + JsonWriter writer = new JsonWriter(streamWriter); + writer.Validate = false; + writer.WriteObjectStart(); + var context = new JsonMarshallerContext(request, writer); + if(publicRequest.IsSetAuthSecretsManagerArn()) + { + context.Writer.WritePropertyName("authSecretsManagerArn"); + context.Writer.Write(publicRequest.AuthSecretsManagerArn); + } + + writer.WriteObjectEnd(); } - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); + request.Content = memoryStream.ToArray(); } diff --git a/sdk/src/Services/MainframeModernization/Generated/Model/Internal/MarshallTransformations/StartBatchJobRequestMarshaller.cs b/sdk/src/Services/MainframeModernization/Generated/Model/Internal/MarshallTransformations/StartBatchJobRequestMarshaller.cs index 25124859f2bc..e90d1541b826 100644 --- a/sdk/src/Services/MainframeModernization/Generated/Model/Internal/MarshallTransformations/StartBatchJobRequestMarshaller.cs +++ b/sdk/src/Services/MainframeModernization/Generated/Model/Internal/MarshallTransformations/StartBatchJobRequestMarshaller.cs @@ -66,32 +66,18 @@ public IRequest Marshall(StartBatchJobRequest publicRequest) request.ResourcePath = "/applications/{applicationId}/batch-job"; using (MemoryStream memoryStream = new MemoryStream()) { -<<<<<<< HEAD using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) -||||||| Commit version number update changes - JsonWriter writer = new JsonWriter(stringWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetBatchJobIdentifier()) -======= - JsonWriter writer = new JsonWriter(stringWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetAuthSecretsManagerArn()) - { - context.Writer.WritePropertyName("authSecretsManagerArn"); - context.Writer.Write(publicRequest.AuthSecretsManagerArn); - } - - if(publicRequest.IsSetBatchJobIdentifier()) ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b { JsonWriter writer = new JsonWriter(streamWriter); writer.Validate = false; writer.WriteObjectStart(); var context = new JsonMarshallerContext(request, writer); + if(publicRequest.IsSetAuthSecretsManagerArn()) + { + context.Writer.WritePropertyName("authSecretsManagerArn"); + context.Writer.Write(publicRequest.AuthSecretsManagerArn); + } + if(publicRequest.IsSetBatchJobIdentifier()) { context.Writer.WritePropertyName("batchJobIdentifier"); diff --git a/sdk/src/Services/MainframeModernization/Generated/_bcl/AmazonMainframeModernizationClient.cs b/sdk/src/Services/MainframeModernization/Generated/_bcl/AmazonMainframeModernizationClient.cs index b235ae34c060..4c80d8d460cb 100644 --- a/sdk/src/Services/MainframeModernization/Generated/_bcl/AmazonMainframeModernizationClient.cs +++ b/sdk/src/Services/MainframeModernization/Generated/_bcl/AmazonMainframeModernizationClient.cs @@ -1764,7 +1764,7 @@ public virtual ListBatchJobExecutionsResponse ListBatchJobExecutions(ListBatchJo /// - /// Lists all the job steps for JCL files to restart a batch job. This is only applicable + /// Lists all the job steps for a JCL file to restart a batch job. This is only applicable /// for Micro Focus engine with versions 8.0.6 and above. /// /// Container for the necessary parameters to execute the ListBatchJobRestartPoints service method. @@ -1800,7 +1800,7 @@ public virtual ListBatchJobRestartPointsResponse ListBatchJobRestartPoints(ListB /// - /// Lists all the job steps for JCL files to restart a batch job. This is only applicable + /// Lists all the job steps for a JCL file to restart a batch job. This is only applicable /// for Micro Focus engine with versions 8.0.6 and above. /// /// Container for the necessary parameters to execute the ListBatchJobRestartPoints service method. diff --git a/sdk/src/Services/MainframeModernization/MainframeModernization.sln b/sdk/src/Services/MainframeModernization/MainframeModernization.sln index e402ef69fe44..994c5b834db0 100644 --- a/sdk/src/Services/MainframeModernization/MainframeModernization.sln +++ b/sdk/src/Services/MainframeModernization/MainframeModernization.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {2FF16FDD-AFAA-4F52-BD79-ACCC48C9D0D6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {2FF16FDD-AFAA-4F52-BD79-ACCC48C9D0D6}.Debug|Any CPU.Build.0 = Debug|Any CPU {2FF16FDD-AFAA-4F52-BD79-ACCC48C9D0D6}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {1F9CB079-AAE4-4D65-A1CF-E70BB3BD06C0}.Debug|Any CPU.Build.0 = Debug|Any CPU {1F9CB079-AAE4-4D65-A1CF-E70BB3BD06C0}.Release|Any CPU.ActiveCfg = Release|Any CPU {1F9CB079-AAE4-4D65-A1CF-E70BB3BD06C0}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {20B1C929-D78A-472D-9EAD-6EA230573214}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {20B1C929-D78A-472D-9EAD-6EA230573214}.Debug|Any CPU.Build.0 = Debug|Any CPU - {20B1C929-D78A-472D-9EAD-6EA230573214}.Release|Any CPU.ActiveCfg = Release|Any CPU - {20B1C929-D78A-472D-9EAD-6EA230573214}.Release|Any CPU.Build.0 = Release|Any CPU - {DA5862A8-AEDB-4B16-814A-0D5B6CA9C777}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DA5862A8-AEDB-4B16-814A-0D5B6CA9C777}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DA5862A8-AEDB-4B16-814A-0D5B6CA9C777}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DA5862A8-AEDB-4B16-814A-0D5B6CA9C777}.Release|Any CPU.Build.0 = Release|Any CPU - {C0D980CC-D087-4804-A502-86D78B533F78}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C0D980CC-D087-4804-A502-86D78B533F78}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C0D980CC-D087-4804-A502-86D78B533F78}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C0D980CC-D087-4804-A502-86D78B533F78}.Release|Any CPU.Build.0 = Release|Any CPU - {EBEB8034-8FE6-42C9-92F2-5F8C11CDB202}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EBEB8034-8FE6-42C9-92F2-5F8C11CDB202}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EBEB8034-8FE6-42C9-92F2-5F8C11CDB202}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EBEB8034-8FE6-42C9-92F2-5F8C11CDB202}.Release|Any CPU.Build.0 = Release|Any CPU - {CA09366E-5CD6-4B19-BBA8-C24F2BBD6CBC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CA09366E-5CD6-4B19-BBA8-C24F2BBD6CBC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CA09366E-5CD6-4B19-BBA8-C24F2BBD6CBC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CA09366E-5CD6-4B19-BBA8-C24F2BBD6CBC}.Release|Any CPU.Build.0 = Release|Any CPU - {F260F9B7-D556-4FED-B21E-0D6DC260749F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F260F9B7-D556-4FED-B21E-0D6DC260749F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F260F9B7-D556-4FED-B21E-0D6DC260749F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F260F9B7-D556-4FED-B21E-0D6DC260749F}.Release|Any CPU.Build.0 = Release|Any CPU - {66799A03-2D24-45C6-9EFD-AB09A37796BB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {66799A03-2D24-45C6-9EFD-AB09A37796BB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {66799A03-2D24-45C6-9EFD-AB09A37796BB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {66799A03-2D24-45C6-9EFD-AB09A37796BB}.Release|Any CPU.Build.0 = Release|Any CPU - {6421C9B4-66CD-4BA0-ADE7-B5BE480F61ED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6421C9B4-66CD-4BA0-ADE7-B5BE480F61ED}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6421C9B4-66CD-4BA0-ADE7-B5BE480F61ED}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6421C9B4-66CD-4BA0-ADE7-B5BE480F61ED}.Release|Any CPU.Build.0 = Release|Any CPU - {D2393337-F9A2-49F7-9EE1-20DE3B0483F9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D2393337-F9A2-49F7-9EE1-20DE3B0483F9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D2393337-F9A2-49F7-9EE1-20DE3B0483F9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D2393337-F9A2-49F7-9EE1-20DE3B0483F9}.Release|Any CPU.Build.0 = Release|Any CPU - {166724F2-82E8-4499-86E4-FB1084E3A325}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {166724F2-82E8-4499-86E4-FB1084E3A325}.Debug|Any CPU.Build.0 = Debug|Any CPU - {166724F2-82E8-4499-86E4-FB1084E3A325}.Release|Any CPU.ActiveCfg = Release|Any CPU - {166724F2-82E8-4499-86E4-FB1084E3A325}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {20B1C929-D78A-472D-9EAD-6EA230573214}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {20B1C929-D78A-472D-9EAD-6EA230573214}.Debug|Any CPU.Build.0 = Debug|Any CPU - {20B1C929-D78A-472D-9EAD-6EA230573214}.Release|Any CPU.ActiveCfg = Release|Any CPU - {20B1C929-D78A-472D-9EAD-6EA230573214}.Release|Any CPU.Build.0 = Release|Any CPU - {DA5862A8-AEDB-4B16-814A-0D5B6CA9C777}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DA5862A8-AEDB-4B16-814A-0D5B6CA9C777}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DA5862A8-AEDB-4B16-814A-0D5B6CA9C777}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DA5862A8-AEDB-4B16-814A-0D5B6CA9C777}.Release|Any CPU.Build.0 = Release|Any CPU - {C0D980CC-D087-4804-A502-86D78B533F78}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C0D980CC-D087-4804-A502-86D78B533F78}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C0D980CC-D087-4804-A502-86D78B533F78}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C0D980CC-D087-4804-A502-86D78B533F78}.Release|Any CPU.Build.0 = Release|Any CPU - {EBEB8034-8FE6-42C9-92F2-5F8C11CDB202}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EBEB8034-8FE6-42C9-92F2-5F8C11CDB202}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EBEB8034-8FE6-42C9-92F2-5F8C11CDB202}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EBEB8034-8FE6-42C9-92F2-5F8C11CDB202}.Release|Any CPU.Build.0 = Release|Any CPU - {CA09366E-5CD6-4B19-BBA8-C24F2BBD6CBC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CA09366E-5CD6-4B19-BBA8-C24F2BBD6CBC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CA09366E-5CD6-4B19-BBA8-C24F2BBD6CBC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CA09366E-5CD6-4B19-BBA8-C24F2BBD6CBC}.Release|Any CPU.Build.0 = Release|Any CPU - {F260F9B7-D556-4FED-B21E-0D6DC260749F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F260F9B7-D556-4FED-B21E-0D6DC260749F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F260F9B7-D556-4FED-B21E-0D6DC260749F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F260F9B7-D556-4FED-B21E-0D6DC260749F}.Release|Any CPU.Build.0 = Release|Any CPU - {66799A03-2D24-45C6-9EFD-AB09A37796BB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {66799A03-2D24-45C6-9EFD-AB09A37796BB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {66799A03-2D24-45C6-9EFD-AB09A37796BB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {66799A03-2D24-45C6-9EFD-AB09A37796BB}.Release|Any CPU.Build.0 = Release|Any CPU - {6421C9B4-66CD-4BA0-ADE7-B5BE480F61ED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6421C9B4-66CD-4BA0-ADE7-B5BE480F61ED}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6421C9B4-66CD-4BA0-ADE7-B5BE480F61ED}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6421C9B4-66CD-4BA0-ADE7-B5BE480F61ED}.Release|Any CPU.Build.0 = Release|Any CPU - {D2393337-F9A2-49F7-9EE1-20DE3B0483F9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D2393337-F9A2-49F7-9EE1-20DE3B0483F9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D2393337-F9A2-49F7-9EE1-20DE3B0483F9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D2393337-F9A2-49F7-9EE1-20DE3B0483F9}.Release|Any CPU.Build.0 = Release|Any CPU - {166724F2-82E8-4499-86E4-FB1084E3A325}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {166724F2-82E8-4499-86E4-FB1084E3A325}.Debug|Any CPU.Build.0 = Debug|Any CPU - {166724F2-82E8-4499-86E4-FB1084E3A325}.Release|Any CPU.ActiveCfg = Release|Any CPU - {166724F2-82E8-4499-86E4-FB1084E3A325}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {2FF16FDD-AFAA-4F52-BD79-ACCC48C9D0D6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {BEDAC3B4-C11A-47C5-A5E8-FF85A4549D5D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {BDC08961-29CE-4350-A639-D476FB223DA4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {CF366F73-05A5-4862-8087-F0D0B6D4C95E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {1F9CB079-AAE4-4D65-A1CF-E70BB3BD06C0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {20B1C929-D78A-472D-9EAD-6EA230573214} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {DA5862A8-AEDB-4B16-814A-0D5B6CA9C777} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C0D980CC-D087-4804-A502-86D78B533F78} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {EBEB8034-8FE6-42C9-92F2-5F8C11CDB202} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {CA09366E-5CD6-4B19-BBA8-C24F2BBD6CBC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F260F9B7-D556-4FED-B21E-0D6DC260749F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {66799A03-2D24-45C6-9EFD-AB09A37796BB} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6421C9B4-66CD-4BA0-ADE7-B5BE480F61ED} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D2393337-F9A2-49F7-9EE1-20DE3B0483F9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {166724F2-82E8-4499-86E4-FB1084E3A325} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {20B1C929-D78A-472D-9EAD-6EA230573214} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {DA5862A8-AEDB-4B16-814A-0D5B6CA9C777} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C0D980CC-D087-4804-A502-86D78B533F78} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {EBEB8034-8FE6-42C9-92F2-5F8C11CDB202} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {CA09366E-5CD6-4B19-BBA8-C24F2BBD6CBC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F260F9B7-D556-4FED-B21E-0D6DC260749F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {66799A03-2D24-45C6-9EFD-AB09A37796BB} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6421C9B4-66CD-4BA0-ADE7-B5BE480F61ED} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D2393337-F9A2-49F7-9EE1-20DE3B0483F9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {166724F2-82E8-4499-86E4-FB1084E3A325} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {423875B7-99D4-4DB9-A6C2-96AA120B7BD0} diff --git a/sdk/src/Services/MainframeModernization/Properties/AssemblyInfo.cs b/sdk/src/Services/MainframeModernization/Properties/AssemblyInfo.cs index 4d0e58be7f3d..6a1921aa1322 100644 --- a/sdk/src/Services/MainframeModernization/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/MainframeModernization/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.16")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/ManagedBlockchain/Generated/AmazonManagedBlockchainConfig.cs b/sdk/src/Services/ManagedBlockchain/Generated/AmazonManagedBlockchainConfig.cs index b6a281a7d041..3832c6757eb9 100644 --- a/sdk/src/Services/ManagedBlockchain/Generated/AmazonManagedBlockchainConfig.cs +++ b/sdk/src/Services/ManagedBlockchain/Generated/AmazonManagedBlockchainConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.ManagedBlockchain public partial class AmazonManagedBlockchainConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("ManagedBlockchain", "4.0.0.0"); private static readonly AmazonManagedBlockchainEndpointResolver EndpointResolver = new AmazonManagedBlockchainEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("ManagedBlockchain", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("ManagedBlockchain", "3.7.400.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/ManagedBlockchain/ManagedBlockchain.sln b/sdk/src/Services/ManagedBlockchain/ManagedBlockchain.sln index 36a64c142014..29862957df28 100644 --- a/sdk/src/Services/ManagedBlockchain/ManagedBlockchain.sln +++ b/sdk/src/Services/ManagedBlockchain/ManagedBlockchain.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {BDE294BD-33F1-468E-84C2-8D5211971C31}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {BDE294BD-33F1-468E-84C2-8D5211971C31}.Debug|Any CPU.Build.0 = Debug|Any CPU {BDE294BD-33F1-468E-84C2-8D5211971C31}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {9774E5C6-35D9-480B-B497-2408153F6ECC}.Debug|Any CPU.Build.0 = Debug|Any CPU {9774E5C6-35D9-480B-B497-2408153F6ECC}.Release|Any CPU.ActiveCfg = Release|Any CPU {9774E5C6-35D9-480B-B497-2408153F6ECC}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {F657E9E2-CABF-4A5A-A853-BE1053D2CFE6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F657E9E2-CABF-4A5A-A853-BE1053D2CFE6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F657E9E2-CABF-4A5A-A853-BE1053D2CFE6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F657E9E2-CABF-4A5A-A853-BE1053D2CFE6}.Release|Any CPU.Build.0 = Release|Any CPU - {806F3408-2EE6-4B22-99CF-A7F92FA24EBC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {806F3408-2EE6-4B22-99CF-A7F92FA24EBC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {806F3408-2EE6-4B22-99CF-A7F92FA24EBC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {806F3408-2EE6-4B22-99CF-A7F92FA24EBC}.Release|Any CPU.Build.0 = Release|Any CPU - {B04A5965-8DAA-40F0-BF07-DD7B1DB395AF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B04A5965-8DAA-40F0-BF07-DD7B1DB395AF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B04A5965-8DAA-40F0-BF07-DD7B1DB395AF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B04A5965-8DAA-40F0-BF07-DD7B1DB395AF}.Release|Any CPU.Build.0 = Release|Any CPU - {1ECDF505-1FC4-4D86-A13A-F80E061BA67E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1ECDF505-1FC4-4D86-A13A-F80E061BA67E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1ECDF505-1FC4-4D86-A13A-F80E061BA67E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1ECDF505-1FC4-4D86-A13A-F80E061BA67E}.Release|Any CPU.Build.0 = Release|Any CPU - {49DC5BCB-9F51-4A55-B59C-D4AAE91CF9E4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {49DC5BCB-9F51-4A55-B59C-D4AAE91CF9E4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {49DC5BCB-9F51-4A55-B59C-D4AAE91CF9E4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {49DC5BCB-9F51-4A55-B59C-D4AAE91CF9E4}.Release|Any CPU.Build.0 = Release|Any CPU - {246091BF-D568-40F0-B02B-B513E91C66F8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {246091BF-D568-40F0-B02B-B513E91C66F8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {246091BF-D568-40F0-B02B-B513E91C66F8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {246091BF-D568-40F0-B02B-B513E91C66F8}.Release|Any CPU.Build.0 = Release|Any CPU - {D2A4C63E-A464-40D1-BA92-4FDAEA8B0229}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D2A4C63E-A464-40D1-BA92-4FDAEA8B0229}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D2A4C63E-A464-40D1-BA92-4FDAEA8B0229}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D2A4C63E-A464-40D1-BA92-4FDAEA8B0229}.Release|Any CPU.Build.0 = Release|Any CPU - {C0CA4BF6-9DC3-4914-862A-F3AC2DC7F778}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C0CA4BF6-9DC3-4914-862A-F3AC2DC7F778}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C0CA4BF6-9DC3-4914-862A-F3AC2DC7F778}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C0CA4BF6-9DC3-4914-862A-F3AC2DC7F778}.Release|Any CPU.Build.0 = Release|Any CPU - {8E7B2B4A-A97C-4920-AA02-A02599B475AC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8E7B2B4A-A97C-4920-AA02-A02599B475AC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8E7B2B4A-A97C-4920-AA02-A02599B475AC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8E7B2B4A-A97C-4920-AA02-A02599B475AC}.Release|Any CPU.Build.0 = Release|Any CPU - {B0D41D5C-91E4-4AA9-8271-6EA307ACE1D5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B0D41D5C-91E4-4AA9-8271-6EA307ACE1D5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B0D41D5C-91E4-4AA9-8271-6EA307ACE1D5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B0D41D5C-91E4-4AA9-8271-6EA307ACE1D5}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {F657E9E2-CABF-4A5A-A853-BE1053D2CFE6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F657E9E2-CABF-4A5A-A853-BE1053D2CFE6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F657E9E2-CABF-4A5A-A853-BE1053D2CFE6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F657E9E2-CABF-4A5A-A853-BE1053D2CFE6}.Release|Any CPU.Build.0 = Release|Any CPU - {806F3408-2EE6-4B22-99CF-A7F92FA24EBC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {806F3408-2EE6-4B22-99CF-A7F92FA24EBC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {806F3408-2EE6-4B22-99CF-A7F92FA24EBC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {806F3408-2EE6-4B22-99CF-A7F92FA24EBC}.Release|Any CPU.Build.0 = Release|Any CPU - {B04A5965-8DAA-40F0-BF07-DD7B1DB395AF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B04A5965-8DAA-40F0-BF07-DD7B1DB395AF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B04A5965-8DAA-40F0-BF07-DD7B1DB395AF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B04A5965-8DAA-40F0-BF07-DD7B1DB395AF}.Release|Any CPU.Build.0 = Release|Any CPU - {1ECDF505-1FC4-4D86-A13A-F80E061BA67E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1ECDF505-1FC4-4D86-A13A-F80E061BA67E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1ECDF505-1FC4-4D86-A13A-F80E061BA67E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1ECDF505-1FC4-4D86-A13A-F80E061BA67E}.Release|Any CPU.Build.0 = Release|Any CPU - {49DC5BCB-9F51-4A55-B59C-D4AAE91CF9E4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {49DC5BCB-9F51-4A55-B59C-D4AAE91CF9E4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {49DC5BCB-9F51-4A55-B59C-D4AAE91CF9E4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {49DC5BCB-9F51-4A55-B59C-D4AAE91CF9E4}.Release|Any CPU.Build.0 = Release|Any CPU - {246091BF-D568-40F0-B02B-B513E91C66F8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {246091BF-D568-40F0-B02B-B513E91C66F8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {246091BF-D568-40F0-B02B-B513E91C66F8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {246091BF-D568-40F0-B02B-B513E91C66F8}.Release|Any CPU.Build.0 = Release|Any CPU - {D2A4C63E-A464-40D1-BA92-4FDAEA8B0229}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D2A4C63E-A464-40D1-BA92-4FDAEA8B0229}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D2A4C63E-A464-40D1-BA92-4FDAEA8B0229}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D2A4C63E-A464-40D1-BA92-4FDAEA8B0229}.Release|Any CPU.Build.0 = Release|Any CPU - {C0CA4BF6-9DC3-4914-862A-F3AC2DC7F778}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C0CA4BF6-9DC3-4914-862A-F3AC2DC7F778}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C0CA4BF6-9DC3-4914-862A-F3AC2DC7F778}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C0CA4BF6-9DC3-4914-862A-F3AC2DC7F778}.Release|Any CPU.Build.0 = Release|Any CPU - {8E7B2B4A-A97C-4920-AA02-A02599B475AC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8E7B2B4A-A97C-4920-AA02-A02599B475AC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8E7B2B4A-A97C-4920-AA02-A02599B475AC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8E7B2B4A-A97C-4920-AA02-A02599B475AC}.Release|Any CPU.Build.0 = Release|Any CPU - {B0D41D5C-91E4-4AA9-8271-6EA307ACE1D5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B0D41D5C-91E4-4AA9-8271-6EA307ACE1D5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B0D41D5C-91E4-4AA9-8271-6EA307ACE1D5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B0D41D5C-91E4-4AA9-8271-6EA307ACE1D5}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {BDE294BD-33F1-468E-84C2-8D5211971C31} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {1C943811-A002-40D1-8192-C6058E421DAC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {0F70EA6A-ECE6-47CD-B3EA-A2119A135383} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {6D343FBC-E557-4526-B684-B3B5A6100394} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {9774E5C6-35D9-480B-B497-2408153F6ECC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {F657E9E2-CABF-4A5A-A853-BE1053D2CFE6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {806F3408-2EE6-4B22-99CF-A7F92FA24EBC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B04A5965-8DAA-40F0-BF07-DD7B1DB395AF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {1ECDF505-1FC4-4D86-A13A-F80E061BA67E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {49DC5BCB-9F51-4A55-B59C-D4AAE91CF9E4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {246091BF-D568-40F0-B02B-B513E91C66F8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D2A4C63E-A464-40D1-BA92-4FDAEA8B0229} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C0CA4BF6-9DC3-4914-862A-F3AC2DC7F778} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8E7B2B4A-A97C-4920-AA02-A02599B475AC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B0D41D5C-91E4-4AA9-8271-6EA307ACE1D5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {F657E9E2-CABF-4A5A-A853-BE1053D2CFE6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {806F3408-2EE6-4B22-99CF-A7F92FA24EBC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B04A5965-8DAA-40F0-BF07-DD7B1DB395AF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {1ECDF505-1FC4-4D86-A13A-F80E061BA67E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {49DC5BCB-9F51-4A55-B59C-D4AAE91CF9E4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {246091BF-D568-40F0-B02B-B513E91C66F8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D2A4C63E-A464-40D1-BA92-4FDAEA8B0229} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C0CA4BF6-9DC3-4914-862A-F3AC2DC7F778} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8E7B2B4A-A97C-4920-AA02-A02599B475AC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B0D41D5C-91E4-4AA9-8271-6EA307ACE1D5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {A9A92FF5-C21B-4B18-911D-ECBE0EBDF6B7} diff --git a/sdk/src/Services/ManagedBlockchain/Properties/AssemblyInfo.cs b/sdk/src/Services/ManagedBlockchain/Properties/AssemblyInfo.cs index 49959edd66dc..d3565ea12bbc 100644 --- a/sdk/src/Services/ManagedBlockchain/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/ManagedBlockchain/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/ManagedBlockchainQuery/Generated/AmazonManagedBlockchainQueryConfig.cs b/sdk/src/Services/ManagedBlockchainQuery/Generated/AmazonManagedBlockchainQueryConfig.cs index 2bd0b3166735..4df2d5d58422 100644 --- a/sdk/src/Services/ManagedBlockchainQuery/Generated/AmazonManagedBlockchainQueryConfig.cs +++ b/sdk/src/Services/ManagedBlockchainQuery/Generated/AmazonManagedBlockchainQueryConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.ManagedBlockchainQuery public partial class AmazonManagedBlockchainQueryConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("ManagedBlockchain Query", "4.0.0.0"); private static readonly AmazonManagedBlockchainQueryEndpointResolver EndpointResolver = new AmazonManagedBlockchainQueryEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("ManagedBlockchain Query", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("ManagedBlockchain Query", "3.7.400.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/ManagedBlockchainQuery/ManagedBlockchainQuery.sln b/sdk/src/Services/ManagedBlockchainQuery/ManagedBlockchainQuery.sln index d19bac2102c3..896be9e446fb 100644 --- a/sdk/src/Services/ManagedBlockchainQuery/ManagedBlockchainQuery.sln +++ b/sdk/src/Services/ManagedBlockchainQuery/ManagedBlockchainQuery.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {F5F1349E-5A41-4B0A-A30B-BF9A1350ACCA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {F5F1349E-5A41-4B0A-A30B-BF9A1350ACCA}.Debug|Any CPU.Build.0 = Debug|Any CPU {F5F1349E-5A41-4B0A-A30B-BF9A1350ACCA}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {7A8251F3-4705-4657-8ACF-176F496CDFC5}.Debug|Any CPU.Build.0 = Debug|Any CPU {7A8251F3-4705-4657-8ACF-176F496CDFC5}.Release|Any CPU.ActiveCfg = Release|Any CPU {7A8251F3-4705-4657-8ACF-176F496CDFC5}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {630DB868-1215-4744-A069-C4ED702898A5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {630DB868-1215-4744-A069-C4ED702898A5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {630DB868-1215-4744-A069-C4ED702898A5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {630DB868-1215-4744-A069-C4ED702898A5}.Release|Any CPU.Build.0 = Release|Any CPU - {F8A7E624-48E3-4DD6-A71D-FC05A8C3299F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F8A7E624-48E3-4DD6-A71D-FC05A8C3299F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F8A7E624-48E3-4DD6-A71D-FC05A8C3299F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F8A7E624-48E3-4DD6-A71D-FC05A8C3299F}.Release|Any CPU.Build.0 = Release|Any CPU - {9D24423C-A349-46BD-AAED-0F6B51CD5C5A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9D24423C-A349-46BD-AAED-0F6B51CD5C5A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9D24423C-A349-46BD-AAED-0F6B51CD5C5A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9D24423C-A349-46BD-AAED-0F6B51CD5C5A}.Release|Any CPU.Build.0 = Release|Any CPU - {C0A81BBD-19DA-4CB9-8F3B-91F00CDCD0F4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C0A81BBD-19DA-4CB9-8F3B-91F00CDCD0F4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C0A81BBD-19DA-4CB9-8F3B-91F00CDCD0F4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C0A81BBD-19DA-4CB9-8F3B-91F00CDCD0F4}.Release|Any CPU.Build.0 = Release|Any CPU - {D8C2B2A4-1EFC-42AA-BA38-575C73ED16BE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D8C2B2A4-1EFC-42AA-BA38-575C73ED16BE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D8C2B2A4-1EFC-42AA-BA38-575C73ED16BE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D8C2B2A4-1EFC-42AA-BA38-575C73ED16BE}.Release|Any CPU.Build.0 = Release|Any CPU - {48DB42B6-17B7-440B-B0C1-097C50123B36}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {48DB42B6-17B7-440B-B0C1-097C50123B36}.Debug|Any CPU.Build.0 = Debug|Any CPU - {48DB42B6-17B7-440B-B0C1-097C50123B36}.Release|Any CPU.ActiveCfg = Release|Any CPU - {48DB42B6-17B7-440B-B0C1-097C50123B36}.Release|Any CPU.Build.0 = Release|Any CPU - {E3C31032-5FDE-433C-9186-800EB075DD37}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E3C31032-5FDE-433C-9186-800EB075DD37}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E3C31032-5FDE-433C-9186-800EB075DD37}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E3C31032-5FDE-433C-9186-800EB075DD37}.Release|Any CPU.Build.0 = Release|Any CPU - {2CD13351-F686-41B5-ADE8-8A1D21D33CFC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2CD13351-F686-41B5-ADE8-8A1D21D33CFC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2CD13351-F686-41B5-ADE8-8A1D21D33CFC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2CD13351-F686-41B5-ADE8-8A1D21D33CFC}.Release|Any CPU.Build.0 = Release|Any CPU - {BAB3FA28-19EF-4C29-89A2-147E268832D1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BAB3FA28-19EF-4C29-89A2-147E268832D1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BAB3FA28-19EF-4C29-89A2-147E268832D1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BAB3FA28-19EF-4C29-89A2-147E268832D1}.Release|Any CPU.Build.0 = Release|Any CPU - {73DC03B1-B8AB-4293-8EBD-B34E254F77C8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {73DC03B1-B8AB-4293-8EBD-B34E254F77C8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {73DC03B1-B8AB-4293-8EBD-B34E254F77C8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {73DC03B1-B8AB-4293-8EBD-B34E254F77C8}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {630DB868-1215-4744-A069-C4ED702898A5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {630DB868-1215-4744-A069-C4ED702898A5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {630DB868-1215-4744-A069-C4ED702898A5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {630DB868-1215-4744-A069-C4ED702898A5}.Release|Any CPU.Build.0 = Release|Any CPU - {F8A7E624-48E3-4DD6-A71D-FC05A8C3299F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F8A7E624-48E3-4DD6-A71D-FC05A8C3299F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F8A7E624-48E3-4DD6-A71D-FC05A8C3299F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F8A7E624-48E3-4DD6-A71D-FC05A8C3299F}.Release|Any CPU.Build.0 = Release|Any CPU - {9D24423C-A349-46BD-AAED-0F6B51CD5C5A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9D24423C-A349-46BD-AAED-0F6B51CD5C5A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9D24423C-A349-46BD-AAED-0F6B51CD5C5A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9D24423C-A349-46BD-AAED-0F6B51CD5C5A}.Release|Any CPU.Build.0 = Release|Any CPU - {C0A81BBD-19DA-4CB9-8F3B-91F00CDCD0F4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C0A81BBD-19DA-4CB9-8F3B-91F00CDCD0F4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C0A81BBD-19DA-4CB9-8F3B-91F00CDCD0F4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C0A81BBD-19DA-4CB9-8F3B-91F00CDCD0F4}.Release|Any CPU.Build.0 = Release|Any CPU - {D8C2B2A4-1EFC-42AA-BA38-575C73ED16BE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D8C2B2A4-1EFC-42AA-BA38-575C73ED16BE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D8C2B2A4-1EFC-42AA-BA38-575C73ED16BE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D8C2B2A4-1EFC-42AA-BA38-575C73ED16BE}.Release|Any CPU.Build.0 = Release|Any CPU - {48DB42B6-17B7-440B-B0C1-097C50123B36}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {48DB42B6-17B7-440B-B0C1-097C50123B36}.Debug|Any CPU.Build.0 = Debug|Any CPU - {48DB42B6-17B7-440B-B0C1-097C50123B36}.Release|Any CPU.ActiveCfg = Release|Any CPU - {48DB42B6-17B7-440B-B0C1-097C50123B36}.Release|Any CPU.Build.0 = Release|Any CPU - {E3C31032-5FDE-433C-9186-800EB075DD37}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E3C31032-5FDE-433C-9186-800EB075DD37}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E3C31032-5FDE-433C-9186-800EB075DD37}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E3C31032-5FDE-433C-9186-800EB075DD37}.Release|Any CPU.Build.0 = Release|Any CPU - {2CD13351-F686-41B5-ADE8-8A1D21D33CFC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2CD13351-F686-41B5-ADE8-8A1D21D33CFC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2CD13351-F686-41B5-ADE8-8A1D21D33CFC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2CD13351-F686-41B5-ADE8-8A1D21D33CFC}.Release|Any CPU.Build.0 = Release|Any CPU - {BAB3FA28-19EF-4C29-89A2-147E268832D1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BAB3FA28-19EF-4C29-89A2-147E268832D1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BAB3FA28-19EF-4C29-89A2-147E268832D1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BAB3FA28-19EF-4C29-89A2-147E268832D1}.Release|Any CPU.Build.0 = Release|Any CPU - {73DC03B1-B8AB-4293-8EBD-B34E254F77C8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {73DC03B1-B8AB-4293-8EBD-B34E254F77C8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {73DC03B1-B8AB-4293-8EBD-B34E254F77C8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {73DC03B1-B8AB-4293-8EBD-B34E254F77C8}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {F5F1349E-5A41-4B0A-A30B-BF9A1350ACCA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {F1585A19-4E04-4D10-8DBE-56EA45757DDB} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {77D1F3F9-5DAF-42FF-B5BC-8249EDD5CE57} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {1DD76649-9B34-492E-B600-CB6241463D3E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {7A8251F3-4705-4657-8ACF-176F496CDFC5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {630DB868-1215-4744-A069-C4ED702898A5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F8A7E624-48E3-4DD6-A71D-FC05A8C3299F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {9D24423C-A349-46BD-AAED-0F6B51CD5C5A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C0A81BBD-19DA-4CB9-8F3B-91F00CDCD0F4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D8C2B2A4-1EFC-42AA-BA38-575C73ED16BE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {48DB42B6-17B7-440B-B0C1-097C50123B36} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E3C31032-5FDE-433C-9186-800EB075DD37} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {2CD13351-F686-41B5-ADE8-8A1D21D33CFC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {BAB3FA28-19EF-4C29-89A2-147E268832D1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {73DC03B1-B8AB-4293-8EBD-B34E254F77C8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {630DB868-1215-4744-A069-C4ED702898A5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F8A7E624-48E3-4DD6-A71D-FC05A8C3299F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {9D24423C-A349-46BD-AAED-0F6B51CD5C5A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C0A81BBD-19DA-4CB9-8F3B-91F00CDCD0F4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D8C2B2A4-1EFC-42AA-BA38-575C73ED16BE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {48DB42B6-17B7-440B-B0C1-097C50123B36} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E3C31032-5FDE-433C-9186-800EB075DD37} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {2CD13351-F686-41B5-ADE8-8A1D21D33CFC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {BAB3FA28-19EF-4C29-89A2-147E268832D1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {73DC03B1-B8AB-4293-8EBD-B34E254F77C8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {03173BB3-571A-4FEB-8CB7-089FEAA0BCC9} diff --git a/sdk/src/Services/ManagedBlockchainQuery/Properties/AssemblyInfo.cs b/sdk/src/Services/ManagedBlockchainQuery/Properties/AssemblyInfo.cs index a04c8cf220ce..3c97a8d5cd16 100644 --- a/sdk/src/Services/ManagedBlockchainQuery/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/ManagedBlockchainQuery/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/ManagedGrafana/Generated/AmazonManagedGrafanaConfig.cs b/sdk/src/Services/ManagedGrafana/Generated/AmazonManagedGrafanaConfig.cs index 582651943b06..121d59ed98c5 100644 --- a/sdk/src/Services/ManagedGrafana/Generated/AmazonManagedGrafanaConfig.cs +++ b/sdk/src/Services/ManagedGrafana/Generated/AmazonManagedGrafanaConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.ManagedGrafana public partial class AmazonManagedGrafanaConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("grafana", "4.0.0.0"); private static readonly AmazonManagedGrafanaEndpointResolver EndpointResolver = new AmazonManagedGrafanaEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("grafana", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("grafana", "3.7.400.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/ManagedGrafana/ManagedGrafana.sln b/sdk/src/Services/ManagedGrafana/ManagedGrafana.sln index d0d68acc30c0..cf1c29731e3c 100644 --- a/sdk/src/Services/ManagedGrafana/ManagedGrafana.sln +++ b/sdk/src/Services/ManagedGrafana/ManagedGrafana.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {2A3634E4-C013-4CF5-9E34-EA492A88CC62}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {2A3634E4-C013-4CF5-9E34-EA492A88CC62}.Debug|Any CPU.Build.0 = Debug|Any CPU {2A3634E4-C013-4CF5-9E34-EA492A88CC62}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {953D01D3-09C8-4A7D-81AA-700305C3C7D7}.Debug|Any CPU.Build.0 = Debug|Any CPU {953D01D3-09C8-4A7D-81AA-700305C3C7D7}.Release|Any CPU.ActiveCfg = Release|Any CPU {953D01D3-09C8-4A7D-81AA-700305C3C7D7}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {98946596-128B-4E0A-8FC7-57971C15E2F8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {98946596-128B-4E0A-8FC7-57971C15E2F8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {98946596-128B-4E0A-8FC7-57971C15E2F8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {98946596-128B-4E0A-8FC7-57971C15E2F8}.Release|Any CPU.Build.0 = Release|Any CPU - {29F15BE7-4C29-44E0-89E5-D1FBF4E7F818}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {29F15BE7-4C29-44E0-89E5-D1FBF4E7F818}.Debug|Any CPU.Build.0 = Debug|Any CPU - {29F15BE7-4C29-44E0-89E5-D1FBF4E7F818}.Release|Any CPU.ActiveCfg = Release|Any CPU - {29F15BE7-4C29-44E0-89E5-D1FBF4E7F818}.Release|Any CPU.Build.0 = Release|Any CPU - {6217E8DA-4B63-426E-8B56-499D9538854E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6217E8DA-4B63-426E-8B56-499D9538854E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6217E8DA-4B63-426E-8B56-499D9538854E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6217E8DA-4B63-426E-8B56-499D9538854E}.Release|Any CPU.Build.0 = Release|Any CPU - {92967C35-94DF-473C-BBBC-8D614BA46EEC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {92967C35-94DF-473C-BBBC-8D614BA46EEC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {92967C35-94DF-473C-BBBC-8D614BA46EEC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {92967C35-94DF-473C-BBBC-8D614BA46EEC}.Release|Any CPU.Build.0 = Release|Any CPU - {FE3AC3EE-1AFA-4645-8851-3808A7F20565}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FE3AC3EE-1AFA-4645-8851-3808A7F20565}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FE3AC3EE-1AFA-4645-8851-3808A7F20565}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FE3AC3EE-1AFA-4645-8851-3808A7F20565}.Release|Any CPU.Build.0 = Release|Any CPU - {F029B3B0-C821-4D98-92BE-01D618FBCCBB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F029B3B0-C821-4D98-92BE-01D618FBCCBB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F029B3B0-C821-4D98-92BE-01D618FBCCBB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F029B3B0-C821-4D98-92BE-01D618FBCCBB}.Release|Any CPU.Build.0 = Release|Any CPU - {0C37A28B-407D-4845-88F0-138E1CE484DD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0C37A28B-407D-4845-88F0-138E1CE484DD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0C37A28B-407D-4845-88F0-138E1CE484DD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0C37A28B-407D-4845-88F0-138E1CE484DD}.Release|Any CPU.Build.0 = Release|Any CPU - {CDCF5540-861B-4889-AF27-5AF2CE7B4806}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CDCF5540-861B-4889-AF27-5AF2CE7B4806}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CDCF5540-861B-4889-AF27-5AF2CE7B4806}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CDCF5540-861B-4889-AF27-5AF2CE7B4806}.Release|Any CPU.Build.0 = Release|Any CPU - {9F4C0C61-837A-4CE8-936A-A24092FC1F74}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9F4C0C61-837A-4CE8-936A-A24092FC1F74}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9F4C0C61-837A-4CE8-936A-A24092FC1F74}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9F4C0C61-837A-4CE8-936A-A24092FC1F74}.Release|Any CPU.Build.0 = Release|Any CPU - {AF86DCF6-A7D1-4356-B2B0-0F36D7C799FA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AF86DCF6-A7D1-4356-B2B0-0F36D7C799FA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AF86DCF6-A7D1-4356-B2B0-0F36D7C799FA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AF86DCF6-A7D1-4356-B2B0-0F36D7C799FA}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {98946596-128B-4E0A-8FC7-57971C15E2F8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {98946596-128B-4E0A-8FC7-57971C15E2F8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {98946596-128B-4E0A-8FC7-57971C15E2F8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {98946596-128B-4E0A-8FC7-57971C15E2F8}.Release|Any CPU.Build.0 = Release|Any CPU - {29F15BE7-4C29-44E0-89E5-D1FBF4E7F818}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {29F15BE7-4C29-44E0-89E5-D1FBF4E7F818}.Debug|Any CPU.Build.0 = Debug|Any CPU - {29F15BE7-4C29-44E0-89E5-D1FBF4E7F818}.Release|Any CPU.ActiveCfg = Release|Any CPU - {29F15BE7-4C29-44E0-89E5-D1FBF4E7F818}.Release|Any CPU.Build.0 = Release|Any CPU - {6217E8DA-4B63-426E-8B56-499D9538854E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6217E8DA-4B63-426E-8B56-499D9538854E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6217E8DA-4B63-426E-8B56-499D9538854E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6217E8DA-4B63-426E-8B56-499D9538854E}.Release|Any CPU.Build.0 = Release|Any CPU - {92967C35-94DF-473C-BBBC-8D614BA46EEC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {92967C35-94DF-473C-BBBC-8D614BA46EEC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {92967C35-94DF-473C-BBBC-8D614BA46EEC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {92967C35-94DF-473C-BBBC-8D614BA46EEC}.Release|Any CPU.Build.0 = Release|Any CPU - {FE3AC3EE-1AFA-4645-8851-3808A7F20565}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FE3AC3EE-1AFA-4645-8851-3808A7F20565}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FE3AC3EE-1AFA-4645-8851-3808A7F20565}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FE3AC3EE-1AFA-4645-8851-3808A7F20565}.Release|Any CPU.Build.0 = Release|Any CPU - {F029B3B0-C821-4D98-92BE-01D618FBCCBB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F029B3B0-C821-4D98-92BE-01D618FBCCBB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F029B3B0-C821-4D98-92BE-01D618FBCCBB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F029B3B0-C821-4D98-92BE-01D618FBCCBB}.Release|Any CPU.Build.0 = Release|Any CPU - {0C37A28B-407D-4845-88F0-138E1CE484DD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0C37A28B-407D-4845-88F0-138E1CE484DD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0C37A28B-407D-4845-88F0-138E1CE484DD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0C37A28B-407D-4845-88F0-138E1CE484DD}.Release|Any CPU.Build.0 = Release|Any CPU - {CDCF5540-861B-4889-AF27-5AF2CE7B4806}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CDCF5540-861B-4889-AF27-5AF2CE7B4806}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CDCF5540-861B-4889-AF27-5AF2CE7B4806}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CDCF5540-861B-4889-AF27-5AF2CE7B4806}.Release|Any CPU.Build.0 = Release|Any CPU - {9F4C0C61-837A-4CE8-936A-A24092FC1F74}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9F4C0C61-837A-4CE8-936A-A24092FC1F74}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9F4C0C61-837A-4CE8-936A-A24092FC1F74}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9F4C0C61-837A-4CE8-936A-A24092FC1F74}.Release|Any CPU.Build.0 = Release|Any CPU - {AF86DCF6-A7D1-4356-B2B0-0F36D7C799FA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AF86DCF6-A7D1-4356-B2B0-0F36D7C799FA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AF86DCF6-A7D1-4356-B2B0-0F36D7C799FA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AF86DCF6-A7D1-4356-B2B0-0F36D7C799FA}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {2A3634E4-C013-4CF5-9E34-EA492A88CC62} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {1BE97758-9D35-4C68-A4D1-443C6E3FDCD1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {1B468793-D954-459B-B200-B713B23B5FAD} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {FE803873-CD9D-44DC-A63B-A71275765F68} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {953D01D3-09C8-4A7D-81AA-700305C3C7D7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {98946596-128B-4E0A-8FC7-57971C15E2F8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {29F15BE7-4C29-44E0-89E5-D1FBF4E7F818} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6217E8DA-4B63-426E-8B56-499D9538854E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {92967C35-94DF-473C-BBBC-8D614BA46EEC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {FE3AC3EE-1AFA-4645-8851-3808A7F20565} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F029B3B0-C821-4D98-92BE-01D618FBCCBB} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0C37A28B-407D-4845-88F0-138E1CE484DD} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {CDCF5540-861B-4889-AF27-5AF2CE7B4806} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {9F4C0C61-837A-4CE8-936A-A24092FC1F74} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {AF86DCF6-A7D1-4356-B2B0-0F36D7C799FA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {98946596-128B-4E0A-8FC7-57971C15E2F8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {29F15BE7-4C29-44E0-89E5-D1FBF4E7F818} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6217E8DA-4B63-426E-8B56-499D9538854E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {92967C35-94DF-473C-BBBC-8D614BA46EEC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {FE3AC3EE-1AFA-4645-8851-3808A7F20565} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F029B3B0-C821-4D98-92BE-01D618FBCCBB} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0C37A28B-407D-4845-88F0-138E1CE484DD} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {CDCF5540-861B-4889-AF27-5AF2CE7B4806} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {9F4C0C61-837A-4CE8-936A-A24092FC1F74} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {AF86DCF6-A7D1-4356-B2B0-0F36D7C799FA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {ABE371E5-589C-49EB-9F02-BDF384E9B3B4} diff --git a/sdk/src/Services/ManagedGrafana/Properties/AssemblyInfo.cs b/sdk/src/Services/ManagedGrafana/Properties/AssemblyInfo.cs index 7f5cbd2a28df..5dd0f5c8531d 100644 --- a/sdk/src/Services/ManagedGrafana/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/ManagedGrafana/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/MarketplaceAgreement/Generated/AmazonMarketplaceAgreementConfig.cs b/sdk/src/Services/MarketplaceAgreement/Generated/AmazonMarketplaceAgreementConfig.cs index a4e348214493..b625cdd6cb21 100644 --- a/sdk/src/Services/MarketplaceAgreement/Generated/AmazonMarketplaceAgreementConfig.cs +++ b/sdk/src/Services/MarketplaceAgreement/Generated/AmazonMarketplaceAgreementConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.MarketplaceAgreement public partial class AmazonMarketplaceAgreementConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("Marketplace Agreement", "4.0.0.0"); private static readonly AmazonMarketplaceAgreementEndpointResolver EndpointResolver = new AmazonMarketplaceAgreementEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("Marketplace Agreement", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("Marketplace Agreement", "3.7.400.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/MarketplaceAgreement/MarketplaceAgreement.sln b/sdk/src/Services/MarketplaceAgreement/MarketplaceAgreement.sln index 3beb1fc3ae82..2676fd8e5a49 100644 --- a/sdk/src/Services/MarketplaceAgreement/MarketplaceAgreement.sln +++ b/sdk/src/Services/MarketplaceAgreement/MarketplaceAgreement.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {1A33CE2C-D918-412A-B798-C5B0FD448F83}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {1A33CE2C-D918-412A-B798-C5B0FD448F83}.Debug|Any CPU.Build.0 = Debug|Any CPU {1A33CE2C-D918-412A-B798-C5B0FD448F83}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {C9DDAADC-58F0-42B2-82C4-C023CBFAC7AC}.Debug|Any CPU.Build.0 = Debug|Any CPU {C9DDAADC-58F0-42B2-82C4-C023CBFAC7AC}.Release|Any CPU.ActiveCfg = Release|Any CPU {C9DDAADC-58F0-42B2-82C4-C023CBFAC7AC}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {2A966070-44A4-4B74-8DD7-A0DBBE5FA211}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2A966070-44A4-4B74-8DD7-A0DBBE5FA211}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2A966070-44A4-4B74-8DD7-A0DBBE5FA211}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2A966070-44A4-4B74-8DD7-A0DBBE5FA211}.Release|Any CPU.Build.0 = Release|Any CPU - {08150364-243D-4634-B974-E7A4CD1D741D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {08150364-243D-4634-B974-E7A4CD1D741D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {08150364-243D-4634-B974-E7A4CD1D741D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {08150364-243D-4634-B974-E7A4CD1D741D}.Release|Any CPU.Build.0 = Release|Any CPU - {477E1A52-C5AC-4F85-9AC2-05D37BC058E3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {477E1A52-C5AC-4F85-9AC2-05D37BC058E3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {477E1A52-C5AC-4F85-9AC2-05D37BC058E3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {477E1A52-C5AC-4F85-9AC2-05D37BC058E3}.Release|Any CPU.Build.0 = Release|Any CPU - {FAB56F63-3D5B-488E-9BD7-B5359EBC21F2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FAB56F63-3D5B-488E-9BD7-B5359EBC21F2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FAB56F63-3D5B-488E-9BD7-B5359EBC21F2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FAB56F63-3D5B-488E-9BD7-B5359EBC21F2}.Release|Any CPU.Build.0 = Release|Any CPU - {F74094D3-3519-48B2-8451-63D0DECE993B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F74094D3-3519-48B2-8451-63D0DECE993B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F74094D3-3519-48B2-8451-63D0DECE993B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F74094D3-3519-48B2-8451-63D0DECE993B}.Release|Any CPU.Build.0 = Release|Any CPU - {EFB5EDF0-FE9B-4E9D-86FC-BF8478F2B5E3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EFB5EDF0-FE9B-4E9D-86FC-BF8478F2B5E3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EFB5EDF0-FE9B-4E9D-86FC-BF8478F2B5E3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EFB5EDF0-FE9B-4E9D-86FC-BF8478F2B5E3}.Release|Any CPU.Build.0 = Release|Any CPU - {21C8EA25-928E-4DE1-9456-B411CE475014}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {21C8EA25-928E-4DE1-9456-B411CE475014}.Debug|Any CPU.Build.0 = Debug|Any CPU - {21C8EA25-928E-4DE1-9456-B411CE475014}.Release|Any CPU.ActiveCfg = Release|Any CPU - {21C8EA25-928E-4DE1-9456-B411CE475014}.Release|Any CPU.Build.0 = Release|Any CPU - {965B02A0-A96E-46FB-97FE-1AA028B897C8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {965B02A0-A96E-46FB-97FE-1AA028B897C8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {965B02A0-A96E-46FB-97FE-1AA028B897C8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {965B02A0-A96E-46FB-97FE-1AA028B897C8}.Release|Any CPU.Build.0 = Release|Any CPU - {B3E4C8C8-6F26-4A62-A07A-1AAAC6882E65}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B3E4C8C8-6F26-4A62-A07A-1AAAC6882E65}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B3E4C8C8-6F26-4A62-A07A-1AAAC6882E65}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B3E4C8C8-6F26-4A62-A07A-1AAAC6882E65}.Release|Any CPU.Build.0 = Release|Any CPU - {B53CF6F9-E892-4A26-B797-75A10F726DFD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B53CF6F9-E892-4A26-B797-75A10F726DFD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B53CF6F9-E892-4A26-B797-75A10F726DFD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B53CF6F9-E892-4A26-B797-75A10F726DFD}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {2A966070-44A4-4B74-8DD7-A0DBBE5FA211}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2A966070-44A4-4B74-8DD7-A0DBBE5FA211}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2A966070-44A4-4B74-8DD7-A0DBBE5FA211}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2A966070-44A4-4B74-8DD7-A0DBBE5FA211}.Release|Any CPU.Build.0 = Release|Any CPU - {08150364-243D-4634-B974-E7A4CD1D741D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {08150364-243D-4634-B974-E7A4CD1D741D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {08150364-243D-4634-B974-E7A4CD1D741D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {08150364-243D-4634-B974-E7A4CD1D741D}.Release|Any CPU.Build.0 = Release|Any CPU - {477E1A52-C5AC-4F85-9AC2-05D37BC058E3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {477E1A52-C5AC-4F85-9AC2-05D37BC058E3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {477E1A52-C5AC-4F85-9AC2-05D37BC058E3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {477E1A52-C5AC-4F85-9AC2-05D37BC058E3}.Release|Any CPU.Build.0 = Release|Any CPU - {FAB56F63-3D5B-488E-9BD7-B5359EBC21F2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FAB56F63-3D5B-488E-9BD7-B5359EBC21F2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FAB56F63-3D5B-488E-9BD7-B5359EBC21F2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FAB56F63-3D5B-488E-9BD7-B5359EBC21F2}.Release|Any CPU.Build.0 = Release|Any CPU - {F74094D3-3519-48B2-8451-63D0DECE993B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F74094D3-3519-48B2-8451-63D0DECE993B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F74094D3-3519-48B2-8451-63D0DECE993B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F74094D3-3519-48B2-8451-63D0DECE993B}.Release|Any CPU.Build.0 = Release|Any CPU - {EFB5EDF0-FE9B-4E9D-86FC-BF8478F2B5E3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EFB5EDF0-FE9B-4E9D-86FC-BF8478F2B5E3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EFB5EDF0-FE9B-4E9D-86FC-BF8478F2B5E3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EFB5EDF0-FE9B-4E9D-86FC-BF8478F2B5E3}.Release|Any CPU.Build.0 = Release|Any CPU - {21C8EA25-928E-4DE1-9456-B411CE475014}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {21C8EA25-928E-4DE1-9456-B411CE475014}.Debug|Any CPU.Build.0 = Debug|Any CPU - {21C8EA25-928E-4DE1-9456-B411CE475014}.Release|Any CPU.ActiveCfg = Release|Any CPU - {21C8EA25-928E-4DE1-9456-B411CE475014}.Release|Any CPU.Build.0 = Release|Any CPU - {965B02A0-A96E-46FB-97FE-1AA028B897C8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {965B02A0-A96E-46FB-97FE-1AA028B897C8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {965B02A0-A96E-46FB-97FE-1AA028B897C8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {965B02A0-A96E-46FB-97FE-1AA028B897C8}.Release|Any CPU.Build.0 = Release|Any CPU - {B3E4C8C8-6F26-4A62-A07A-1AAAC6882E65}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B3E4C8C8-6F26-4A62-A07A-1AAAC6882E65}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B3E4C8C8-6F26-4A62-A07A-1AAAC6882E65}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B3E4C8C8-6F26-4A62-A07A-1AAAC6882E65}.Release|Any CPU.Build.0 = Release|Any CPU - {B53CF6F9-E892-4A26-B797-75A10F726DFD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B53CF6F9-E892-4A26-B797-75A10F726DFD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B53CF6F9-E892-4A26-B797-75A10F726DFD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B53CF6F9-E892-4A26-B797-75A10F726DFD}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {1A33CE2C-D918-412A-B798-C5B0FD448F83} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {FAE81BEE-7A31-4EE1-A6DD-A111CB461488} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {B4081FBD-32B7-49DC-BB26-8DAEE099A18C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {E9181451-72B9-4329-9312-07107DDC734F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {C9DDAADC-58F0-42B2-82C4-C023CBFAC7AC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {2A966070-44A4-4B74-8DD7-A0DBBE5FA211} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {08150364-243D-4634-B974-E7A4CD1D741D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {477E1A52-C5AC-4F85-9AC2-05D37BC058E3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {FAB56F63-3D5B-488E-9BD7-B5359EBC21F2} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F74094D3-3519-48B2-8451-63D0DECE993B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {EFB5EDF0-FE9B-4E9D-86FC-BF8478F2B5E3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {21C8EA25-928E-4DE1-9456-B411CE475014} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {965B02A0-A96E-46FB-97FE-1AA028B897C8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B3E4C8C8-6F26-4A62-A07A-1AAAC6882E65} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B53CF6F9-E892-4A26-B797-75A10F726DFD} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {2A966070-44A4-4B74-8DD7-A0DBBE5FA211} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {08150364-243D-4634-B974-E7A4CD1D741D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {477E1A52-C5AC-4F85-9AC2-05D37BC058E3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {FAB56F63-3D5B-488E-9BD7-B5359EBC21F2} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F74094D3-3519-48B2-8451-63D0DECE993B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {EFB5EDF0-FE9B-4E9D-86FC-BF8478F2B5E3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {21C8EA25-928E-4DE1-9456-B411CE475014} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {965B02A0-A96E-46FB-97FE-1AA028B897C8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B3E4C8C8-6F26-4A62-A07A-1AAAC6882E65} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B53CF6F9-E892-4A26-B797-75A10F726DFD} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {B790399A-4AB4-4C46-9C68-0F5AB0CFAE3A} diff --git a/sdk/src/Services/MarketplaceAgreement/Properties/AssemblyInfo.cs b/sdk/src/Services/MarketplaceAgreement/Properties/AssemblyInfo.cs index e28abddedf3e..c9968f65b612 100644 --- a/sdk/src/Services/MarketplaceAgreement/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/MarketplaceAgreement/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/MarketplaceCatalog/Generated/AmazonMarketplaceCatalogConfig.cs b/sdk/src/Services/MarketplaceCatalog/Generated/AmazonMarketplaceCatalogConfig.cs index 9c5a30629f2f..652659837324 100644 --- a/sdk/src/Services/MarketplaceCatalog/Generated/AmazonMarketplaceCatalogConfig.cs +++ b/sdk/src/Services/MarketplaceCatalog/Generated/AmazonMarketplaceCatalogConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.MarketplaceCatalog public partial class AmazonMarketplaceCatalogConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("Marketplace Catalog", "4.0.0.0"); private static readonly AmazonMarketplaceCatalogEndpointResolver EndpointResolver = new AmazonMarketplaceCatalogEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("Marketplace Catalog", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("Marketplace Catalog", "3.7.400.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/MarketplaceCatalog/MarketplaceCatalog.sln b/sdk/src/Services/MarketplaceCatalog/MarketplaceCatalog.sln index 3ac3cab9319b..c5e9f337501b 100644 --- a/sdk/src/Services/MarketplaceCatalog/MarketplaceCatalog.sln +++ b/sdk/src/Services/MarketplaceCatalog/MarketplaceCatalog.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {78B4A063-1548-4EA7-89A7-3331780F1228}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {78B4A063-1548-4EA7-89A7-3331780F1228}.Debug|Any CPU.Build.0 = Debug|Any CPU {78B4A063-1548-4EA7-89A7-3331780F1228}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {56E32798-EB6C-4237-A2F6-65A900D21CBB}.Debug|Any CPU.Build.0 = Debug|Any CPU {56E32798-EB6C-4237-A2F6-65A900D21CBB}.Release|Any CPU.ActiveCfg = Release|Any CPU {56E32798-EB6C-4237-A2F6-65A900D21CBB}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {13E8C860-6B65-4EBC-A388-D1E89071F989}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {13E8C860-6B65-4EBC-A388-D1E89071F989}.Debug|Any CPU.Build.0 = Debug|Any CPU - {13E8C860-6B65-4EBC-A388-D1E89071F989}.Release|Any CPU.ActiveCfg = Release|Any CPU - {13E8C860-6B65-4EBC-A388-D1E89071F989}.Release|Any CPU.Build.0 = Release|Any CPU - {31C2217A-A03E-4F33-90E6-E822A70A9470}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {31C2217A-A03E-4F33-90E6-E822A70A9470}.Debug|Any CPU.Build.0 = Debug|Any CPU - {31C2217A-A03E-4F33-90E6-E822A70A9470}.Release|Any CPU.ActiveCfg = Release|Any CPU - {31C2217A-A03E-4F33-90E6-E822A70A9470}.Release|Any CPU.Build.0 = Release|Any CPU - {DFF3D921-0017-4D04-BE48-03AE367B3CFA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DFF3D921-0017-4D04-BE48-03AE367B3CFA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DFF3D921-0017-4D04-BE48-03AE367B3CFA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DFF3D921-0017-4D04-BE48-03AE367B3CFA}.Release|Any CPU.Build.0 = Release|Any CPU - {CC33BEAB-D8A4-47A5-9A45-0070C14F01ED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CC33BEAB-D8A4-47A5-9A45-0070C14F01ED}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CC33BEAB-D8A4-47A5-9A45-0070C14F01ED}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CC33BEAB-D8A4-47A5-9A45-0070C14F01ED}.Release|Any CPU.Build.0 = Release|Any CPU - {CC116042-5AEC-426A-80EA-A0D72326B9E0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CC116042-5AEC-426A-80EA-A0D72326B9E0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CC116042-5AEC-426A-80EA-A0D72326B9E0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CC116042-5AEC-426A-80EA-A0D72326B9E0}.Release|Any CPU.Build.0 = Release|Any CPU - {0E711456-407F-48C4-B9B8-2A92B72813BA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0E711456-407F-48C4-B9B8-2A92B72813BA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0E711456-407F-48C4-B9B8-2A92B72813BA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0E711456-407F-48C4-B9B8-2A92B72813BA}.Release|Any CPU.Build.0 = Release|Any CPU - {3C92E759-3D0B-4C8E-A8ED-5485FB634F0C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3C92E759-3D0B-4C8E-A8ED-5485FB634F0C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3C92E759-3D0B-4C8E-A8ED-5485FB634F0C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3C92E759-3D0B-4C8E-A8ED-5485FB634F0C}.Release|Any CPU.Build.0 = Release|Any CPU - {0519BEA5-942E-4E9A-96A3-2B72B476BBF2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0519BEA5-942E-4E9A-96A3-2B72B476BBF2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0519BEA5-942E-4E9A-96A3-2B72B476BBF2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0519BEA5-942E-4E9A-96A3-2B72B476BBF2}.Release|Any CPU.Build.0 = Release|Any CPU - {CFBE404C-4DF6-44B7-998B-E3B19F5F8424}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CFBE404C-4DF6-44B7-998B-E3B19F5F8424}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CFBE404C-4DF6-44B7-998B-E3B19F5F8424}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CFBE404C-4DF6-44B7-998B-E3B19F5F8424}.Release|Any CPU.Build.0 = Release|Any CPU - {57A3FBE9-64EA-4EE1-BBEC-9691FF6F8129}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {57A3FBE9-64EA-4EE1-BBEC-9691FF6F8129}.Debug|Any CPU.Build.0 = Debug|Any CPU - {57A3FBE9-64EA-4EE1-BBEC-9691FF6F8129}.Release|Any CPU.ActiveCfg = Release|Any CPU - {57A3FBE9-64EA-4EE1-BBEC-9691FF6F8129}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {13E8C860-6B65-4EBC-A388-D1E89071F989}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {13E8C860-6B65-4EBC-A388-D1E89071F989}.Debug|Any CPU.Build.0 = Debug|Any CPU - {13E8C860-6B65-4EBC-A388-D1E89071F989}.Release|Any CPU.ActiveCfg = Release|Any CPU - {13E8C860-6B65-4EBC-A388-D1E89071F989}.Release|Any CPU.Build.0 = Release|Any CPU - {31C2217A-A03E-4F33-90E6-E822A70A9470}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {31C2217A-A03E-4F33-90E6-E822A70A9470}.Debug|Any CPU.Build.0 = Debug|Any CPU - {31C2217A-A03E-4F33-90E6-E822A70A9470}.Release|Any CPU.ActiveCfg = Release|Any CPU - {31C2217A-A03E-4F33-90E6-E822A70A9470}.Release|Any CPU.Build.0 = Release|Any CPU - {DFF3D921-0017-4D04-BE48-03AE367B3CFA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DFF3D921-0017-4D04-BE48-03AE367B3CFA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DFF3D921-0017-4D04-BE48-03AE367B3CFA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DFF3D921-0017-4D04-BE48-03AE367B3CFA}.Release|Any CPU.Build.0 = Release|Any CPU - {CC33BEAB-D8A4-47A5-9A45-0070C14F01ED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CC33BEAB-D8A4-47A5-9A45-0070C14F01ED}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CC33BEAB-D8A4-47A5-9A45-0070C14F01ED}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CC33BEAB-D8A4-47A5-9A45-0070C14F01ED}.Release|Any CPU.Build.0 = Release|Any CPU - {CC116042-5AEC-426A-80EA-A0D72326B9E0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CC116042-5AEC-426A-80EA-A0D72326B9E0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CC116042-5AEC-426A-80EA-A0D72326B9E0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CC116042-5AEC-426A-80EA-A0D72326B9E0}.Release|Any CPU.Build.0 = Release|Any CPU - {0E711456-407F-48C4-B9B8-2A92B72813BA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0E711456-407F-48C4-B9B8-2A92B72813BA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0E711456-407F-48C4-B9B8-2A92B72813BA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0E711456-407F-48C4-B9B8-2A92B72813BA}.Release|Any CPU.Build.0 = Release|Any CPU - {3C92E759-3D0B-4C8E-A8ED-5485FB634F0C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3C92E759-3D0B-4C8E-A8ED-5485FB634F0C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3C92E759-3D0B-4C8E-A8ED-5485FB634F0C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3C92E759-3D0B-4C8E-A8ED-5485FB634F0C}.Release|Any CPU.Build.0 = Release|Any CPU - {0519BEA5-942E-4E9A-96A3-2B72B476BBF2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0519BEA5-942E-4E9A-96A3-2B72B476BBF2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0519BEA5-942E-4E9A-96A3-2B72B476BBF2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0519BEA5-942E-4E9A-96A3-2B72B476BBF2}.Release|Any CPU.Build.0 = Release|Any CPU - {CFBE404C-4DF6-44B7-998B-E3B19F5F8424}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CFBE404C-4DF6-44B7-998B-E3B19F5F8424}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CFBE404C-4DF6-44B7-998B-E3B19F5F8424}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CFBE404C-4DF6-44B7-998B-E3B19F5F8424}.Release|Any CPU.Build.0 = Release|Any CPU - {57A3FBE9-64EA-4EE1-BBEC-9691FF6F8129}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {57A3FBE9-64EA-4EE1-BBEC-9691FF6F8129}.Debug|Any CPU.Build.0 = Debug|Any CPU - {57A3FBE9-64EA-4EE1-BBEC-9691FF6F8129}.Release|Any CPU.ActiveCfg = Release|Any CPU - {57A3FBE9-64EA-4EE1-BBEC-9691FF6F8129}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {78B4A063-1548-4EA7-89A7-3331780F1228} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {92421D70-77D6-4A43-9624-FCB42E5BBB9C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {0957A55F-2AC3-4F60-82E4-3A244F95A0FF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {7B967267-0E3C-4D6B-BE33-EF9D617944BF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {56E32798-EB6C-4237-A2F6-65A900D21CBB} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {13E8C860-6B65-4EBC-A388-D1E89071F989} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {31C2217A-A03E-4F33-90E6-E822A70A9470} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {DFF3D921-0017-4D04-BE48-03AE367B3CFA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {CC33BEAB-D8A4-47A5-9A45-0070C14F01ED} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {CC116042-5AEC-426A-80EA-A0D72326B9E0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0E711456-407F-48C4-B9B8-2A92B72813BA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {3C92E759-3D0B-4C8E-A8ED-5485FB634F0C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0519BEA5-942E-4E9A-96A3-2B72B476BBF2} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {CFBE404C-4DF6-44B7-998B-E3B19F5F8424} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {57A3FBE9-64EA-4EE1-BBEC-9691FF6F8129} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {13E8C860-6B65-4EBC-A388-D1E89071F989} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {31C2217A-A03E-4F33-90E6-E822A70A9470} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {DFF3D921-0017-4D04-BE48-03AE367B3CFA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {CC33BEAB-D8A4-47A5-9A45-0070C14F01ED} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {CC116042-5AEC-426A-80EA-A0D72326B9E0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0E711456-407F-48C4-B9B8-2A92B72813BA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {3C92E759-3D0B-4C8E-A8ED-5485FB634F0C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0519BEA5-942E-4E9A-96A3-2B72B476BBF2} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {CFBE404C-4DF6-44B7-998B-E3B19F5F8424} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {57A3FBE9-64EA-4EE1-BBEC-9691FF6F8129} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {826E1EAB-7373-4C8A-B597-9B3D42391EB9} diff --git a/sdk/src/Services/MarketplaceCatalog/Properties/AssemblyInfo.cs b/sdk/src/Services/MarketplaceCatalog/Properties/AssemblyInfo.cs index 3b22760f1f6a..309fb1b55720 100644 --- a/sdk/src/Services/MarketplaceCatalog/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/MarketplaceCatalog/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/MarketplaceDeployment/Generated/AmazonMarketplaceDeploymentConfig.cs b/sdk/src/Services/MarketplaceDeployment/Generated/AmazonMarketplaceDeploymentConfig.cs index 9d9407e536b8..2478a639ceaf 100644 --- a/sdk/src/Services/MarketplaceDeployment/Generated/AmazonMarketplaceDeploymentConfig.cs +++ b/sdk/src/Services/MarketplaceDeployment/Generated/AmazonMarketplaceDeploymentConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.MarketplaceDeployment public partial class AmazonMarketplaceDeploymentConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("Marketplace Deployment", "4.0.0.0"); private static readonly AmazonMarketplaceDeploymentEndpointResolver EndpointResolver = new AmazonMarketplaceDeploymentEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("Marketplace Deployment", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("Marketplace Deployment", "3.7.400.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/MarketplaceDeployment/MarketplaceDeployment.sln b/sdk/src/Services/MarketplaceDeployment/MarketplaceDeployment.sln index e3221ccc6987..149773fbd5d3 100644 --- a/sdk/src/Services/MarketplaceDeployment/MarketplaceDeployment.sln +++ b/sdk/src/Services/MarketplaceDeployment/MarketplaceDeployment.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {AE065965-7D4D-4CC9-8FBF-074F95C50F5D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {AE065965-7D4D-4CC9-8FBF-074F95C50F5D}.Debug|Any CPU.Build.0 = Debug|Any CPU {AE065965-7D4D-4CC9-8FBF-074F95C50F5D}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {487CED8A-A6B2-4D5A-BFE1-F93576CBBD94}.Debug|Any CPU.Build.0 = Debug|Any CPU {487CED8A-A6B2-4D5A-BFE1-F93576CBBD94}.Release|Any CPU.ActiveCfg = Release|Any CPU {487CED8A-A6B2-4D5A-BFE1-F93576CBBD94}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {0BCE5CBF-BB40-4624-8A44-783EADEF925C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0BCE5CBF-BB40-4624-8A44-783EADEF925C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0BCE5CBF-BB40-4624-8A44-783EADEF925C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0BCE5CBF-BB40-4624-8A44-783EADEF925C}.Release|Any CPU.Build.0 = Release|Any CPU - {1926138B-1F97-43DF-BC64-E8C8EA6E7AA3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1926138B-1F97-43DF-BC64-E8C8EA6E7AA3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1926138B-1F97-43DF-BC64-E8C8EA6E7AA3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1926138B-1F97-43DF-BC64-E8C8EA6E7AA3}.Release|Any CPU.Build.0 = Release|Any CPU - {99DC9D67-FE1E-4D60-B8D4-81DD60FA2872}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {99DC9D67-FE1E-4D60-B8D4-81DD60FA2872}.Debug|Any CPU.Build.0 = Debug|Any CPU - {99DC9D67-FE1E-4D60-B8D4-81DD60FA2872}.Release|Any CPU.ActiveCfg = Release|Any CPU - {99DC9D67-FE1E-4D60-B8D4-81DD60FA2872}.Release|Any CPU.Build.0 = Release|Any CPU - {9670E8AD-9507-453A-AB1F-3BED826E3A14}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9670E8AD-9507-453A-AB1F-3BED826E3A14}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9670E8AD-9507-453A-AB1F-3BED826E3A14}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9670E8AD-9507-453A-AB1F-3BED826E3A14}.Release|Any CPU.Build.0 = Release|Any CPU - {9F115376-AC56-407F-8FE0-D1B26F60D530}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9F115376-AC56-407F-8FE0-D1B26F60D530}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9F115376-AC56-407F-8FE0-D1B26F60D530}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9F115376-AC56-407F-8FE0-D1B26F60D530}.Release|Any CPU.Build.0 = Release|Any CPU - {2B102213-DFD9-4D96-AF2F-2E7AFB2329BA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2B102213-DFD9-4D96-AF2F-2E7AFB2329BA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2B102213-DFD9-4D96-AF2F-2E7AFB2329BA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2B102213-DFD9-4D96-AF2F-2E7AFB2329BA}.Release|Any CPU.Build.0 = Release|Any CPU - {EA82791A-551E-4967-A7E3-E85F9C4EF008}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EA82791A-551E-4967-A7E3-E85F9C4EF008}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EA82791A-551E-4967-A7E3-E85F9C4EF008}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EA82791A-551E-4967-A7E3-E85F9C4EF008}.Release|Any CPU.Build.0 = Release|Any CPU - {ED55D3DC-7518-4A7F-9CF9-501482B23E0A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {ED55D3DC-7518-4A7F-9CF9-501482B23E0A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {ED55D3DC-7518-4A7F-9CF9-501482B23E0A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {ED55D3DC-7518-4A7F-9CF9-501482B23E0A}.Release|Any CPU.Build.0 = Release|Any CPU - {B1552B62-13D7-4F23-AE2F-0D1642C07699}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B1552B62-13D7-4F23-AE2F-0D1642C07699}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B1552B62-13D7-4F23-AE2F-0D1642C07699}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B1552B62-13D7-4F23-AE2F-0D1642C07699}.Release|Any CPU.Build.0 = Release|Any CPU - {488C399F-A931-4C56-A84D-1D619B6EF1AA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {488C399F-A931-4C56-A84D-1D619B6EF1AA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {488C399F-A931-4C56-A84D-1D619B6EF1AA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {488C399F-A931-4C56-A84D-1D619B6EF1AA}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {0BCE5CBF-BB40-4624-8A44-783EADEF925C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0BCE5CBF-BB40-4624-8A44-783EADEF925C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0BCE5CBF-BB40-4624-8A44-783EADEF925C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0BCE5CBF-BB40-4624-8A44-783EADEF925C}.Release|Any CPU.Build.0 = Release|Any CPU - {1926138B-1F97-43DF-BC64-E8C8EA6E7AA3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1926138B-1F97-43DF-BC64-E8C8EA6E7AA3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1926138B-1F97-43DF-BC64-E8C8EA6E7AA3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1926138B-1F97-43DF-BC64-E8C8EA6E7AA3}.Release|Any CPU.Build.0 = Release|Any CPU - {99DC9D67-FE1E-4D60-B8D4-81DD60FA2872}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {99DC9D67-FE1E-4D60-B8D4-81DD60FA2872}.Debug|Any CPU.Build.0 = Debug|Any CPU - {99DC9D67-FE1E-4D60-B8D4-81DD60FA2872}.Release|Any CPU.ActiveCfg = Release|Any CPU - {99DC9D67-FE1E-4D60-B8D4-81DD60FA2872}.Release|Any CPU.Build.0 = Release|Any CPU - {9670E8AD-9507-453A-AB1F-3BED826E3A14}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9670E8AD-9507-453A-AB1F-3BED826E3A14}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9670E8AD-9507-453A-AB1F-3BED826E3A14}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9670E8AD-9507-453A-AB1F-3BED826E3A14}.Release|Any CPU.Build.0 = Release|Any CPU - {9F115376-AC56-407F-8FE0-D1B26F60D530}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9F115376-AC56-407F-8FE0-D1B26F60D530}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9F115376-AC56-407F-8FE0-D1B26F60D530}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9F115376-AC56-407F-8FE0-D1B26F60D530}.Release|Any CPU.Build.0 = Release|Any CPU - {2B102213-DFD9-4D96-AF2F-2E7AFB2329BA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2B102213-DFD9-4D96-AF2F-2E7AFB2329BA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2B102213-DFD9-4D96-AF2F-2E7AFB2329BA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2B102213-DFD9-4D96-AF2F-2E7AFB2329BA}.Release|Any CPU.Build.0 = Release|Any CPU - {EA82791A-551E-4967-A7E3-E85F9C4EF008}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EA82791A-551E-4967-A7E3-E85F9C4EF008}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EA82791A-551E-4967-A7E3-E85F9C4EF008}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EA82791A-551E-4967-A7E3-E85F9C4EF008}.Release|Any CPU.Build.0 = Release|Any CPU - {ED55D3DC-7518-4A7F-9CF9-501482B23E0A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {ED55D3DC-7518-4A7F-9CF9-501482B23E0A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {ED55D3DC-7518-4A7F-9CF9-501482B23E0A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {ED55D3DC-7518-4A7F-9CF9-501482B23E0A}.Release|Any CPU.Build.0 = Release|Any CPU - {B1552B62-13D7-4F23-AE2F-0D1642C07699}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B1552B62-13D7-4F23-AE2F-0D1642C07699}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B1552B62-13D7-4F23-AE2F-0D1642C07699}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B1552B62-13D7-4F23-AE2F-0D1642C07699}.Release|Any CPU.Build.0 = Release|Any CPU - {488C399F-A931-4C56-A84D-1D619B6EF1AA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {488C399F-A931-4C56-A84D-1D619B6EF1AA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {488C399F-A931-4C56-A84D-1D619B6EF1AA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {488C399F-A931-4C56-A84D-1D619B6EF1AA}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {AE065965-7D4D-4CC9-8FBF-074F95C50F5D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {0B782854-27F4-4AE8-BB9E-424DCE8A57F3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {1D923561-D7AF-4205-9D06-3A56E602914B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {64298401-DE11-4D2F-AEC1-90A8063974D5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {487CED8A-A6B2-4D5A-BFE1-F93576CBBD94} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {0BCE5CBF-BB40-4624-8A44-783EADEF925C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {1926138B-1F97-43DF-BC64-E8C8EA6E7AA3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {99DC9D67-FE1E-4D60-B8D4-81DD60FA2872} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {9670E8AD-9507-453A-AB1F-3BED826E3A14} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {9F115376-AC56-407F-8FE0-D1B26F60D530} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {2B102213-DFD9-4D96-AF2F-2E7AFB2329BA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {EA82791A-551E-4967-A7E3-E85F9C4EF008} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {ED55D3DC-7518-4A7F-9CF9-501482B23E0A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B1552B62-13D7-4F23-AE2F-0D1642C07699} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {488C399F-A931-4C56-A84D-1D619B6EF1AA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {0BCE5CBF-BB40-4624-8A44-783EADEF925C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {1926138B-1F97-43DF-BC64-E8C8EA6E7AA3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {99DC9D67-FE1E-4D60-B8D4-81DD60FA2872} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {9670E8AD-9507-453A-AB1F-3BED826E3A14} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {9F115376-AC56-407F-8FE0-D1B26F60D530} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {2B102213-DFD9-4D96-AF2F-2E7AFB2329BA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {EA82791A-551E-4967-A7E3-E85F9C4EF008} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {ED55D3DC-7518-4A7F-9CF9-501482B23E0A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B1552B62-13D7-4F23-AE2F-0D1642C07699} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {488C399F-A931-4C56-A84D-1D619B6EF1AA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {B9A2FADF-D90A-4D52-ACB2-04D4577F843B} diff --git a/sdk/src/Services/MarketplaceDeployment/Properties/AssemblyInfo.cs b/sdk/src/Services/MarketplaceDeployment/Properties/AssemblyInfo.cs index 45d2752d6362..7aec51e55f20 100644 --- a/sdk/src/Services/MarketplaceDeployment/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/MarketplaceDeployment/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/MarketplaceEntitlementService/Generated/AmazonMarketplaceEntitlementServiceConfig.cs b/sdk/src/Services/MarketplaceEntitlementService/Generated/AmazonMarketplaceEntitlementServiceConfig.cs index 7e4300183673..d9f03ea1a0cf 100644 --- a/sdk/src/Services/MarketplaceEntitlementService/Generated/AmazonMarketplaceEntitlementServiceConfig.cs +++ b/sdk/src/Services/MarketplaceEntitlementService/Generated/AmazonMarketplaceEntitlementServiceConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.MarketplaceEntitlementService public partial class AmazonMarketplaceEntitlementServiceConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("Marketplace Entitlement Service", "4.0.0.0"); private static readonly AmazonMarketplaceEntitlementServiceEndpointResolver EndpointResolver = new AmazonMarketplaceEntitlementServiceEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("Marketplace Entitlement Service", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("Marketplace Entitlement Service", "3.7.400.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/MarketplaceEntitlementService/MarketplaceEntitlementService.sln b/sdk/src/Services/MarketplaceEntitlementService/MarketplaceEntitlementService.sln index a0d3de1151e2..911665312e99 100644 --- a/sdk/src/Services/MarketplaceEntitlementService/MarketplaceEntitlementService.sln +++ b/sdk/src/Services/MarketplaceEntitlementService/MarketplaceEntitlementService.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {BEEDD367-B580-4520-891A-3B035BD68352}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {BEEDD367-B580-4520-891A-3B035BD68352}.Debug|Any CPU.Build.0 = Debug|Any CPU {BEEDD367-B580-4520-891A-3B035BD68352}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {2AA830C7-F061-49F2-B909-431DB9D43A4C}.Debug|Any CPU.Build.0 = Debug|Any CPU {2AA830C7-F061-49F2-B909-431DB9D43A4C}.Release|Any CPU.ActiveCfg = Release|Any CPU {2AA830C7-F061-49F2-B909-431DB9D43A4C}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {1524AC82-ECC0-4DCD-BDA9-EAC3669B5E34}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1524AC82-ECC0-4DCD-BDA9-EAC3669B5E34}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1524AC82-ECC0-4DCD-BDA9-EAC3669B5E34}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1524AC82-ECC0-4DCD-BDA9-EAC3669B5E34}.Release|Any CPU.Build.0 = Release|Any CPU - {24F5F5FD-ECE7-46BD-9454-CDD455C6D3CF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {24F5F5FD-ECE7-46BD-9454-CDD455C6D3CF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {24F5F5FD-ECE7-46BD-9454-CDD455C6D3CF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {24F5F5FD-ECE7-46BD-9454-CDD455C6D3CF}.Release|Any CPU.Build.0 = Release|Any CPU - {D20E3E7C-C8BE-446C-9DDC-9B650B713BA5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D20E3E7C-C8BE-446C-9DDC-9B650B713BA5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D20E3E7C-C8BE-446C-9DDC-9B650B713BA5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D20E3E7C-C8BE-446C-9DDC-9B650B713BA5}.Release|Any CPU.Build.0 = Release|Any CPU - {BD5B17C6-11FC-4FF8-999C-03F65747F455}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BD5B17C6-11FC-4FF8-999C-03F65747F455}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BD5B17C6-11FC-4FF8-999C-03F65747F455}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BD5B17C6-11FC-4FF8-999C-03F65747F455}.Release|Any CPU.Build.0 = Release|Any CPU - {53160B59-8212-4825-B2AF-615673B8A6C9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {53160B59-8212-4825-B2AF-615673B8A6C9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {53160B59-8212-4825-B2AF-615673B8A6C9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {53160B59-8212-4825-B2AF-615673B8A6C9}.Release|Any CPU.Build.0 = Release|Any CPU - {6116678C-8748-4DAC-B629-5A422A417B64}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6116678C-8748-4DAC-B629-5A422A417B64}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6116678C-8748-4DAC-B629-5A422A417B64}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6116678C-8748-4DAC-B629-5A422A417B64}.Release|Any CPU.Build.0 = Release|Any CPU - {C23E233C-82E8-478B-8019-F317B2B12C93}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C23E233C-82E8-478B-8019-F317B2B12C93}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C23E233C-82E8-478B-8019-F317B2B12C93}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C23E233C-82E8-478B-8019-F317B2B12C93}.Release|Any CPU.Build.0 = Release|Any CPU - {AB8FF578-558E-442F-9F29-C2F5D838FFB0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AB8FF578-558E-442F-9F29-C2F5D838FFB0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AB8FF578-558E-442F-9F29-C2F5D838FFB0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AB8FF578-558E-442F-9F29-C2F5D838FFB0}.Release|Any CPU.Build.0 = Release|Any CPU - {10BEFEC2-CD22-4CB3-B9B9-D3E082ADFFBA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {10BEFEC2-CD22-4CB3-B9B9-D3E082ADFFBA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {10BEFEC2-CD22-4CB3-B9B9-D3E082ADFFBA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {10BEFEC2-CD22-4CB3-B9B9-D3E082ADFFBA}.Release|Any CPU.Build.0 = Release|Any CPU - {E99E3423-A441-4689-A97D-F4C0423F13C6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E99E3423-A441-4689-A97D-F4C0423F13C6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E99E3423-A441-4689-A97D-F4C0423F13C6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E99E3423-A441-4689-A97D-F4C0423F13C6}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {1524AC82-ECC0-4DCD-BDA9-EAC3669B5E34}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1524AC82-ECC0-4DCD-BDA9-EAC3669B5E34}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1524AC82-ECC0-4DCD-BDA9-EAC3669B5E34}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1524AC82-ECC0-4DCD-BDA9-EAC3669B5E34}.Release|Any CPU.Build.0 = Release|Any CPU - {24F5F5FD-ECE7-46BD-9454-CDD455C6D3CF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {24F5F5FD-ECE7-46BD-9454-CDD455C6D3CF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {24F5F5FD-ECE7-46BD-9454-CDD455C6D3CF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {24F5F5FD-ECE7-46BD-9454-CDD455C6D3CF}.Release|Any CPU.Build.0 = Release|Any CPU - {D20E3E7C-C8BE-446C-9DDC-9B650B713BA5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D20E3E7C-C8BE-446C-9DDC-9B650B713BA5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D20E3E7C-C8BE-446C-9DDC-9B650B713BA5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D20E3E7C-C8BE-446C-9DDC-9B650B713BA5}.Release|Any CPU.Build.0 = Release|Any CPU - {BD5B17C6-11FC-4FF8-999C-03F65747F455}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BD5B17C6-11FC-4FF8-999C-03F65747F455}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BD5B17C6-11FC-4FF8-999C-03F65747F455}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BD5B17C6-11FC-4FF8-999C-03F65747F455}.Release|Any CPU.Build.0 = Release|Any CPU - {53160B59-8212-4825-B2AF-615673B8A6C9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {53160B59-8212-4825-B2AF-615673B8A6C9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {53160B59-8212-4825-B2AF-615673B8A6C9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {53160B59-8212-4825-B2AF-615673B8A6C9}.Release|Any CPU.Build.0 = Release|Any CPU - {6116678C-8748-4DAC-B629-5A422A417B64}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6116678C-8748-4DAC-B629-5A422A417B64}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6116678C-8748-4DAC-B629-5A422A417B64}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6116678C-8748-4DAC-B629-5A422A417B64}.Release|Any CPU.Build.0 = Release|Any CPU - {C23E233C-82E8-478B-8019-F317B2B12C93}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C23E233C-82E8-478B-8019-F317B2B12C93}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C23E233C-82E8-478B-8019-F317B2B12C93}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C23E233C-82E8-478B-8019-F317B2B12C93}.Release|Any CPU.Build.0 = Release|Any CPU - {AB8FF578-558E-442F-9F29-C2F5D838FFB0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AB8FF578-558E-442F-9F29-C2F5D838FFB0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AB8FF578-558E-442F-9F29-C2F5D838FFB0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AB8FF578-558E-442F-9F29-C2F5D838FFB0}.Release|Any CPU.Build.0 = Release|Any CPU - {10BEFEC2-CD22-4CB3-B9B9-D3E082ADFFBA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {10BEFEC2-CD22-4CB3-B9B9-D3E082ADFFBA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {10BEFEC2-CD22-4CB3-B9B9-D3E082ADFFBA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {10BEFEC2-CD22-4CB3-B9B9-D3E082ADFFBA}.Release|Any CPU.Build.0 = Release|Any CPU - {E99E3423-A441-4689-A97D-F4C0423F13C6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E99E3423-A441-4689-A97D-F4C0423F13C6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E99E3423-A441-4689-A97D-F4C0423F13C6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E99E3423-A441-4689-A97D-F4C0423F13C6}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {BEEDD367-B580-4520-891A-3B035BD68352} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {C829D9D2-4C8B-479D-A30B-F280F0AE3D32} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {0B6C25DC-1D1D-4092-A94F-726EC3FE3D5E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {F9156205-EFB0-4C72-B7C7-4FC1B8FF055B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {2AA830C7-F061-49F2-B909-431DB9D43A4C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {1524AC82-ECC0-4DCD-BDA9-EAC3669B5E34} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {24F5F5FD-ECE7-46BD-9454-CDD455C6D3CF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D20E3E7C-C8BE-446C-9DDC-9B650B713BA5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {BD5B17C6-11FC-4FF8-999C-03F65747F455} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {53160B59-8212-4825-B2AF-615673B8A6C9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6116678C-8748-4DAC-B629-5A422A417B64} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C23E233C-82E8-478B-8019-F317B2B12C93} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {AB8FF578-558E-442F-9F29-C2F5D838FFB0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {10BEFEC2-CD22-4CB3-B9B9-D3E082ADFFBA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E99E3423-A441-4689-A97D-F4C0423F13C6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {1524AC82-ECC0-4DCD-BDA9-EAC3669B5E34} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {24F5F5FD-ECE7-46BD-9454-CDD455C6D3CF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D20E3E7C-C8BE-446C-9DDC-9B650B713BA5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {BD5B17C6-11FC-4FF8-999C-03F65747F455} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {53160B59-8212-4825-B2AF-615673B8A6C9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6116678C-8748-4DAC-B629-5A422A417B64} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C23E233C-82E8-478B-8019-F317B2B12C93} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {AB8FF578-558E-442F-9F29-C2F5D838FFB0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {10BEFEC2-CD22-4CB3-B9B9-D3E082ADFFBA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E99E3423-A441-4689-A97D-F4C0423F13C6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {B84CADD3-7ECA-46A3-8317-B05B31810425} diff --git a/sdk/src/Services/MarketplaceEntitlementService/Properties/AssemblyInfo.cs b/sdk/src/Services/MarketplaceEntitlementService/Properties/AssemblyInfo.cs index bbf2db338efa..159a3acab80e 100644 --- a/sdk/src/Services/MarketplaceEntitlementService/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/MarketplaceEntitlementService/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/MarketplaceReporting/AWSSDK.MarketplaceReporting.Net35.csproj b/sdk/src/Services/MarketplaceReporting/AWSSDK.MarketplaceReporting.Net35.csproj deleted file mode 100644 index 74b7f9df3a04..000000000000 --- a/sdk/src/Services/MarketplaceReporting/AWSSDK.MarketplaceReporting.Net35.csproj +++ /dev/null @@ -1,83 +0,0 @@ - - - true - net35 - $(DefineConstants);BCL;BCL35;AWS_APM_API;CODE_ANALYSIS - portable - true - AWSSDK.MarketplaceReporting - AWSSDK.MarketplaceReporting - - false - false - false - false - false - false - false - false - true - true - - - C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v3.5\Profile\Client - - false - CA1822 - - - ../../../AWSDotNetSDK.ruleset - - - ../../../AWSDotNetSDKForBuild.ruleset - - - - - - ../../../awssdk.dll.snk - - - - - $(AWSKeyFile) - - - - - - - - - - - - - - - - - - - - - - - all - - - all - - - - - - - - - C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\v3.5\System.Data.Entity.dll - - - - - \ No newline at end of file diff --git a/sdk/src/Services/MarketplaceReporting/AWSSDK.MarketplaceReporting.Net45.csproj b/sdk/src/Services/MarketplaceReporting/AWSSDK.MarketplaceReporting.NetFramework.csproj similarity index 80% rename from sdk/src/Services/MarketplaceReporting/AWSSDK.MarketplaceReporting.Net45.csproj rename to sdk/src/Services/MarketplaceReporting/AWSSDK.MarketplaceReporting.NetFramework.csproj index 92723206ab02..76c7d524d54b 100644 --- a/sdk/src/Services/MarketplaceReporting/AWSSDK.MarketplaceReporting.Net45.csproj +++ b/sdk/src/Services/MarketplaceReporting/AWSSDK.MarketplaceReporting.NetFramework.csproj @@ -1,8 +1,8 @@ true - net45 - $(DefineConstants);BCL;BCL45;AWS_ASYNC_API;CODE_ANALYSIS + net472 + $(DefineConstants);BCL;AWS_ASYNC_API;CODE_ANALYSIS portable true AWSSDK.MarketplaceReporting @@ -21,6 +21,16 @@ CA1822 + + + 11.0 + + + 9.0 + ../../../AWSDotNetSDK.ruleset @@ -45,14 +55,13 @@ - - + diff --git a/sdk/src/Services/MarketplaceReporting/AWSSDK.MarketplaceReporting.NetStandard.csproj b/sdk/src/Services/MarketplaceReporting/AWSSDK.MarketplaceReporting.NetStandard.csproj index dec02b97a050..47feb793d7d0 100644 --- a/sdk/src/Services/MarketplaceReporting/AWSSDK.MarketplaceReporting.NetStandard.csproj +++ b/sdk/src/Services/MarketplaceReporting/AWSSDK.MarketplaceReporting.NetStandard.csproj @@ -31,6 +31,16 @@ true + + + 11.0 + + + 9.0 + ../../../AWSDotNetSDK.ruleset @@ -55,8 +65,6 @@ - - diff --git a/sdk/src/Services/MarketplaceReporting/Generated/AmazonMarketplaceReportingConfig.cs b/sdk/src/Services/MarketplaceReporting/Generated/AmazonMarketplaceReportingConfig.cs index b2bf646752c0..d2e4a9b1ba68 100644 --- a/sdk/src/Services/MarketplaceReporting/Generated/AmazonMarketplaceReportingConfig.cs +++ b/sdk/src/Services/MarketplaceReporting/Generated/AmazonMarketplaceReportingConfig.cs @@ -21,6 +21,8 @@ using Amazon.Runtime; using Amazon.Runtime.Internal; using Amazon.Util.Internal; +using Amazon.Runtime.Internal.Auth; +using Amazon.Runtime.Endpoints; using Amazon.MarketplaceReporting.Internal; namespace Amazon.MarketplaceReporting @@ -32,7 +34,10 @@ namespace Amazon.MarketplaceReporting public partial class AmazonMarketplaceReportingConfig : ClientConfig { private static readonly string UserAgentString = - InternalSDKUtils.BuildUserAgentString("Marketplace Reporting", "3.7.400.24"); + InternalSDKUtils.BuildUserAgentString("Marketplace Reporting", "4.0.0.0"); + + private static readonly AmazonMarketplaceReportingEndpointResolver EndpointResolver = + new AmazonMarketplaceReportingEndpointResolver(); private string _userAgent = UserAgentString; /// @@ -89,5 +94,24 @@ public override string UserAgent } } + /// + /// Returns the endpoint that will be used for a particular request. + /// + /// A Container class for parameters used for endpoint resolution. + /// The resolved endpoint for the given request. + public override Amazon.Runtime.Endpoints.Endpoint DetermineServiceOperationEndpoint(ServiceOperationEndpointParameters parameters) + { + var requestContext = new RequestContext(false, new AWS4Signer()) + { + ClientConfig = this, + OriginalRequest = parameters.Request, + Request = new DefaultRequest(parameters.Request, ServiceId) + }; + + var executionContext = new Amazon.Runtime.Internal.ExecutionContext(requestContext, null); + return EndpointResolver.GetEndpoint(executionContext); + } + + } } \ No newline at end of file diff --git a/sdk/src/Services/MarketplaceReporting/Generated/AmazonMarketplaceReportingDefaultConfiguration.cs b/sdk/src/Services/MarketplaceReporting/Generated/AmazonMarketplaceReportingDefaultConfiguration.cs index 6f0e91a80c12..ccb8a2fba08c 100644 --- a/sdk/src/Services/MarketplaceReporting/Generated/AmazonMarketplaceReportingDefaultConfiguration.cs +++ b/sdk/src/Services/MarketplaceReporting/Generated/AmazonMarketplaceReportingDefaultConfiguration.cs @@ -43,8 +43,7 @@ public static ReadOnlyCollection GetAllConfigurations() InRegion, CrossRegion, Mobile, - Auto, - Legacy + Auto }); } @@ -55,7 +54,6 @@ public static ReadOnlyCollection GetAllConfigurations() { Name = DefaultConfigurationMode.Standard, RetryMode = RequestRetryMode.Standard, - StsRegionalEndpoints = StsRegionalEndpointsValue.Regional, S3UsEast1RegionalEndpoint = S3UsEast1RegionalEndpointValue.Regional, // 0:00:03.1 ConnectTimeout = TimeSpan.FromMilliseconds(3100L), @@ -71,7 +69,6 @@ public static ReadOnlyCollection GetAllConfigurations() { Name = DefaultConfigurationMode.InRegion, RetryMode = RequestRetryMode.Standard, - StsRegionalEndpoints = StsRegionalEndpointsValue.Regional, S3UsEast1RegionalEndpoint = S3UsEast1RegionalEndpointValue.Regional, // 0:00:01.1 ConnectTimeout = TimeSpan.FromMilliseconds(1100L), @@ -87,7 +84,6 @@ public static ReadOnlyCollection GetAllConfigurations() { Name = DefaultConfigurationMode.CrossRegion, RetryMode = RequestRetryMode.Standard, - StsRegionalEndpoints = StsRegionalEndpointsValue.Regional, S3UsEast1RegionalEndpoint = S3UsEast1RegionalEndpointValue.Regional, // 0:00:03.1 ConnectTimeout = TimeSpan.FromMilliseconds(3100L), @@ -103,7 +99,6 @@ public static ReadOnlyCollection GetAllConfigurations() { Name = DefaultConfigurationMode.Mobile, RetryMode = RequestRetryMode.Standard, - StsRegionalEndpoints = StsRegionalEndpointsValue.Regional, S3UsEast1RegionalEndpoint = S3UsEast1RegionalEndpointValue.Regional, // 0:00:30 ConnectTimeout = TimeSpan.FromMilliseconds(30000L), @@ -119,7 +114,6 @@ public static ReadOnlyCollection GetAllConfigurations() { Name = DefaultConfigurationMode.Auto, RetryMode = RequestRetryMode.Standard, - StsRegionalEndpoints = StsRegionalEndpointsValue.Regional, S3UsEast1RegionalEndpoint = S3UsEast1RegionalEndpointValue.Regional, // 0:00:01.1 ConnectTimeout = TimeSpan.FromMilliseconds(1100L), @@ -128,19 +122,5 @@ public static ReadOnlyCollection GetAllConfigurations() TimeToFirstByteTimeout = null, HttpRequestTimeout = null }; - /// - ///

    The LEGACY mode provides default settings that vary per SDK and were used prior to establishment of defaults_mode

    - ///     - public static IDefaultConfiguration Legacy {get;} = new DefaultConfiguration - { - Name = DefaultConfigurationMode.Legacy, - RetryMode = RequestRetryMode.Legacy, - StsRegionalEndpoints = StsRegionalEndpointsValue.Legacy, - S3UsEast1RegionalEndpoint = S3UsEast1RegionalEndpointValue.Legacy, - ConnectTimeout = null, - TlsNegotiationTimeout = null, - TimeToFirstByteTimeout = null, - HttpRequestTimeout = null - }; } } \ No newline at end of file diff --git a/sdk/src/Services/MarketplaceReporting/Generated/Model/AccessDeniedException.cs b/sdk/src/Services/MarketplaceReporting/Generated/Model/AccessDeniedException.cs index e7ab7cad45e6..f28430c9eada 100644 --- a/sdk/src/Services/MarketplaceReporting/Generated/Model/AccessDeniedException.cs +++ b/sdk/src/Services/MarketplaceReporting/Generated/Model/AccessDeniedException.cs @@ -106,11 +106,6 @@ protected AccessDeniedException(System.Runtime.Serialization.SerializationInfo i /// The that holds the serialized object data about the exception being thrown. /// The that contains contextual information about the source or destination. /// The parameter is a null reference (Nothing in Visual Basic). -#if BCL35 - [System.Security.Permissions.SecurityPermission( - System.Security.Permissions.SecurityAction.LinkDemand, - Flags = System.Security.Permissions.SecurityPermissionFlag.SerializationFormatter)] -#endif [System.Security.SecurityCritical] // These FxCop rules are giving false-positives for this method [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Security", "CA2123:OverrideLinkDemandsShouldBeIdenticalToBase")] diff --git a/sdk/src/Services/MarketplaceReporting/Generated/Model/BadRequestException.cs b/sdk/src/Services/MarketplaceReporting/Generated/Model/BadRequestException.cs index 020c8135723a..214153044e9a 100644 --- a/sdk/src/Services/MarketplaceReporting/Generated/Model/BadRequestException.cs +++ b/sdk/src/Services/MarketplaceReporting/Generated/Model/BadRequestException.cs @@ -107,11 +107,6 @@ protected BadRequestException(System.Runtime.Serialization.SerializationInfo inf /// The that holds the serialized object data about the exception being thrown. /// The that contains contextual information about the source or destination. /// The parameter is a null reference (Nothing in Visual Basic). -#if BCL35 - [System.Security.Permissions.SecurityPermission( - System.Security.Permissions.SecurityAction.LinkDemand, - Flags = System.Security.Permissions.SecurityPermissionFlag.SerializationFormatter)] -#endif [System.Security.SecurityCritical] // These FxCop rules are giving false-positives for this method [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Security", "CA2123:OverrideLinkDemandsShouldBeIdenticalToBase")] diff --git a/sdk/src/Services/MarketplaceReporting/Generated/Model/Internal/MarshallTransformations/GetBuyerDashboardRequestMarshaller.cs b/sdk/src/Services/MarketplaceReporting/Generated/Model/Internal/MarshallTransformations/GetBuyerDashboardRequestMarshaller.cs index 41e29603d234..c87de60ea111 100644 --- a/sdk/src/Services/MarketplaceReporting/Generated/Model/Internal/MarshallTransformations/GetBuyerDashboardRequestMarshaller.cs +++ b/sdk/src/Services/MarketplaceReporting/Generated/Model/Internal/MarshallTransformations/GetBuyerDashboardRequestMarshaller.cs @@ -61,32 +61,35 @@ public IRequest Marshall(GetBuyerDashboardRequest publicRequest) request.HttpMethod = "POST"; request.ResourcePath = "/getBuyerDashboard"; - using (StringWriter stringWriter = new StringWriter(CultureInfo.InvariantCulture)) + using (MemoryStream memoryStream = new MemoryStream()) { - JsonWriter writer = new JsonWriter(stringWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetDashboardIdentifier()) + using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) { - context.Writer.WritePropertyName("dashboardIdentifier"); - context.Writer.Write(publicRequest.DashboardIdentifier); - } + JsonWriter writer = new JsonWriter(streamWriter); + writer.Validate = false; + writer.WriteObjectStart(); + var context = new JsonMarshallerContext(request, writer); + if(publicRequest.IsSetDashboardIdentifier()) + { + context.Writer.WritePropertyName("dashboardIdentifier"); + context.Writer.Write(publicRequest.DashboardIdentifier); + } - if(publicRequest.IsSetEmbeddingDomains()) - { - context.Writer.WritePropertyName("embeddingDomains"); - context.Writer.WriteArrayStart(); - foreach(var publicRequestEmbeddingDomainsListValue in publicRequest.EmbeddingDomains) + if(publicRequest.IsSetEmbeddingDomains()) { - context.Writer.Write(publicRequestEmbeddingDomainsListValue); + context.Writer.WritePropertyName("embeddingDomains"); + context.Writer.WriteArrayStart(); + foreach(var publicRequestEmbeddingDomainsListValue in publicRequest.EmbeddingDomains) + { + context.Writer.Write(publicRequestEmbeddingDomainsListValue); + } + context.Writer.WriteArrayEnd(); } - context.Writer.WriteArrayEnd(); + + writer.WriteObjectEnd(); } - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); + request.Content = memoryStream.ToArray(); } diff --git a/sdk/src/Services/MarketplaceReporting/Generated/Model/InternalServerException.cs b/sdk/src/Services/MarketplaceReporting/Generated/Model/InternalServerException.cs index 3ab5cc80ddea..08cabf238d73 100644 --- a/sdk/src/Services/MarketplaceReporting/Generated/Model/InternalServerException.cs +++ b/sdk/src/Services/MarketplaceReporting/Generated/Model/InternalServerException.cs @@ -106,11 +106,6 @@ protected InternalServerException(System.Runtime.Serialization.SerializationInfo /// The that holds the serialized object data about the exception being thrown. /// The that contains contextual information about the source or destination. /// The parameter is a null reference (Nothing in Visual Basic). -#if BCL35 - [System.Security.Permissions.SecurityPermission( - System.Security.Permissions.SecurityAction.LinkDemand, - Flags = System.Security.Permissions.SecurityPermissionFlag.SerializationFormatter)] -#endif [System.Security.SecurityCritical] // These FxCop rules are giving false-positives for this method [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Security", "CA2123:OverrideLinkDemandsShouldBeIdenticalToBase")] diff --git a/sdk/src/Services/MarketplaceReporting/Generated/Model/UnauthorizedException.cs b/sdk/src/Services/MarketplaceReporting/Generated/Model/UnauthorizedException.cs index a506911612ad..f7cd0d99f38d 100644 --- a/sdk/src/Services/MarketplaceReporting/Generated/Model/UnauthorizedException.cs +++ b/sdk/src/Services/MarketplaceReporting/Generated/Model/UnauthorizedException.cs @@ -106,11 +106,6 @@ protected UnauthorizedException(System.Runtime.Serialization.SerializationInfo i /// The that holds the serialized object data about the exception being thrown. /// The that contains contextual information about the source or destination. /// The parameter is a null reference (Nothing in Visual Basic). -#if BCL35 - [System.Security.Permissions.SecurityPermission( - System.Security.Permissions.SecurityAction.LinkDemand, - Flags = System.Security.Permissions.SecurityPermissionFlag.SerializationFormatter)] -#endif [System.Security.SecurityCritical] // These FxCop rules are giving false-positives for this method [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Security", "CA2123:OverrideLinkDemandsShouldBeIdenticalToBase")] diff --git a/sdk/src/Services/MarketplaceReporting/Generated/_bcl45/AmazonMarketplaceReportingClient.cs b/sdk/src/Services/MarketplaceReporting/Generated/_bcl/AmazonMarketplaceReportingClient.cs similarity index 97% rename from sdk/src/Services/MarketplaceReporting/Generated/_bcl45/AmazonMarketplaceReportingClient.cs rename to sdk/src/Services/MarketplaceReporting/Generated/_bcl/AmazonMarketplaceReportingClient.cs index ab3d467f44e7..f719e12ae995 100644 --- a/sdk/src/Services/MarketplaceReporting/Generated/_bcl45/AmazonMarketplaceReportingClient.cs +++ b/sdk/src/Services/MarketplaceReporting/Generated/_bcl/AmazonMarketplaceReportingClient.cs @@ -32,6 +32,7 @@ using Amazon.Runtime.Internal; using Amazon.Runtime.Internal.Auth; using Amazon.Runtime.Internal.Transform; +using Amazon.Runtime.Endpoints; #pragma warning disable CS1570 namespace Amazon.MarketplaceReporting @@ -432,16 +433,8 @@ public virtual GetBuyerDashboardResponse GetBuyerDashboard(GetBuyerDashboardRequ /// The resolved endpoint for the given request. public Amazon.Runtime.Endpoints.Endpoint DetermineServiceOperationEndpoint(AmazonWebServiceRequest request) { - var requestContext = new Amazon.Runtime.Internal.RequestContext(false, CreateSigner()) - { - ClientConfig = Config, - OriginalRequest = request, - Request = new Amazon.Runtime.Internal.DefaultRequest(request, ServiceMetadata.ServiceId) - }; - - var executionContext = new Amazon.Runtime.Internal.ExecutionContext(requestContext, null); - var resolver = new AmazonMarketplaceReportingEndpointResolver(); - return resolver.GetEndpoint(executionContext); + var parameters = new ServiceOperationEndpointParameters(request); + return Config.DetermineServiceOperationEndpoint(parameters); } #endregion diff --git a/sdk/src/Services/MarketplaceReporting/Generated/_bcl45/IAmazonMarketplaceReporting.cs b/sdk/src/Services/MarketplaceReporting/Generated/_bcl/IAmazonMarketplaceReporting.cs similarity index 100% rename from sdk/src/Services/MarketplaceReporting/Generated/_bcl45/IAmazonMarketplaceReporting.cs rename to sdk/src/Services/MarketplaceReporting/Generated/_bcl/IAmazonMarketplaceReporting.cs diff --git a/sdk/src/Services/MarketplaceReporting/Generated/_bcl35/AmazonMarketplaceReportingClient.cs b/sdk/src/Services/MarketplaceReporting/Generated/_bcl35/AmazonMarketplaceReportingClient.cs deleted file mode 100644 index fc657700fe2e..000000000000 --- a/sdk/src/Services/MarketplaceReporting/Generated/_bcl35/AmazonMarketplaceReportingClient.cs +++ /dev/null @@ -1,426 +0,0 @@ -/* - * 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. - */ - -/* - * Do not modify this file. This file is generated from the marketplace-reporting-2018-05-10.normal.json service model. - */ - - -using System; -using System.Collections.Generic; -using System.Net; - -using Amazon.MarketplaceReporting.Model; -using Amazon.MarketplaceReporting.Model.Internal.MarshallTransformations; -using Amazon.MarketplaceReporting.Internal; -using Amazon.Runtime; -using Amazon.Runtime.Internal; -using Amazon.Runtime.Internal.Auth; -using Amazon.Runtime.Internal.Transform; - -#pragma warning disable CS1570 -namespace Amazon.MarketplaceReporting -{ - /// - /// Implementation for accessing MarketplaceReporting - /// - /// The Amazon Web Services Marketplace GetBuyerDashboard API enables you to get - /// a procurement insights dashboard programmatically. The API gets the agreement and - /// cost analysis dashboards with data for all of the Amazon Web Services accounts in - /// your Amazon Web Services Organization. - /// - /// - /// - /// To use the Amazon Web Services Marketplace Reporting API, you must complete the following - /// prerequisites: - /// - ///
    • - /// - /// Enable all features for your organization. For more information, see Enabling - /// all features for an organization with Organizations, in the Organizations User - /// Guide. - /// - ///
    • - /// - /// Call the service as the Organizations management account or an account registered - /// as a delegated administrator for the procurement insights service. - /// - /// - /// - /// For more information about management accounts, see Tutorial: - /// Creating and configuring an organization and Managing - /// the management account with Organizations, both in the Organizations User Guide. - /// - /// - /// - /// For more information about delegated administrators, see Using - /// delegated administrators, in the Amazon Web Services Marketplace Buyer Guide. - /// - ///
    • - /// - /// Create an IAM policy that enables the aws-marketplace:GetBuyerDashboard and - /// organizations:DescribeOrganization permissions. In addition, the management - /// account requires the organizations:EnableAWSServiceAccess and iam:CreateServiceLinkedRole - /// permissions to create. For more information about creating the policy, see Policies - /// and permissions in Identity and Access Management, in the IAM User Guide. - /// - /// - /// - /// Access can be shared only by registering the desired linked account as a delegated - /// administrator. That requires organizations:RegisterDelegatedAdministrator organizations:ListDelegatedAdministrators - /// and organizations:DeregisterDelegatedAdministrator permissions. - /// - ///
    • - /// - /// Use the Amazon Web Services Marketplace console to create the AWSServiceRoleForProcurementInsightsPolicy - /// service-linked role. The role enables Amazon Web Services Marketplace procurement - /// visibility integration. The management account requires an IAM policy with the organizations:EnableAWSServiceAccess - /// and iam:CreateServiceLinkedRole permissions to create the service-linked role - /// and enable the service access. For more information, see Granting - /// access to Organizations and Service-linked - /// role to share procurement data in the Amazon Web Services Marketplace Buyer - /// Guide. - /// - ///
    • - /// - /// After creating the service-linked role, you must enable trusted access that grants - /// Amazon Web Services Marketplace permission to access data from your Organizations. - /// For more information, see Granting - /// access to Organizations in the Amazon Web Services Marketplace Buyer Guide. - /// - ///
    - ///     - public partial class AmazonMarketplaceReportingClient : AmazonServiceClient, IAmazonMarketplaceReporting - { - private static IServiceMetadata serviceMetadata = new AmazonMarketplaceReportingMetadata(); - - #region Constructors - - /// - /// Constructs AmazonMarketplaceReportingClient with the credentials loaded from the application's - /// default configuration, and if unsuccessful from the Instance Profile service on an EC2 instance. - /// - /// Example App.config with credentials set. - /// - /// <?xml version="1.0" encoding="utf-8" ?> - /// <configuration> - /// <appSettings> - /// <add key="AWSProfileName" value="AWS Default"/> - /// </appSettings> - /// </configuration> - /// - /// - /// - public AmazonMarketplaceReportingClient() - : base(FallbackCredentialsFactory.GetCredentials(), new AmazonMarketplaceReportingConfig()) { } - - /// - /// Constructs AmazonMarketplaceReportingClient with the credentials loaded from the application's - /// default configuration, and if unsuccessful from the Instance Profile service on an EC2 instance. - /// - /// Example App.config with credentials set. - /// - /// <?xml version="1.0" encoding="utf-8" ?> - /// <configuration> - /// <appSettings> - /// <add key="AWSProfileName" value="AWS Default"/> - /// </appSettings> - /// </configuration> - /// - /// - /// - /// The region to connect. - public AmazonMarketplaceReportingClient(RegionEndpoint region) - : base(FallbackCredentialsFactory.GetCredentials(), new AmazonMarketplaceReportingConfig{RegionEndpoint = region}) { } - - /// - /// Constructs AmazonMarketplaceReportingClient with the credentials loaded from the application's - /// default configuration, and if unsuccessful from the Instance Profile service on an EC2 instance. - /// - /// Example App.config with credentials set. - /// - /// <?xml version="1.0" encoding="utf-8" ?> - /// <configuration> - /// <appSettings> - /// <add key="AWSProfileName" value="AWS Default"/> - /// </appSettings> - /// </configuration> - /// - /// - /// - /// The AmazonMarketplaceReportingClient Configuration Object - public AmazonMarketplaceReportingClient(AmazonMarketplaceReportingConfig config) - : base(FallbackCredentialsFactory.GetCredentials(config), config){} - /// - /// Constructs AmazonMarketplaceReportingClient with AWS Credentials - /// - /// AWS Credentials - public AmazonMarketplaceReportingClient(AWSCredentials credentials) - : this(credentials, new AmazonMarketplaceReportingConfig()) - { - } - - /// - /// Constructs AmazonMarketplaceReportingClient with AWS Credentials - /// - /// AWS Credentials - /// The region to connect. - public AmazonMarketplaceReportingClient(AWSCredentials credentials, RegionEndpoint region) - : this(credentials, new AmazonMarketplaceReportingConfig{RegionEndpoint = region}) - { - } - - /// - /// Constructs AmazonMarketplaceReportingClient with AWS Credentials and an - /// AmazonMarketplaceReportingClient Configuration object. - /// - /// AWS Credentials - /// The AmazonMarketplaceReportingClient Configuration Object - public AmazonMarketplaceReportingClient(AWSCredentials credentials, AmazonMarketplaceReportingConfig clientConfig) - : base(credentials, clientConfig) - { - } - - /// - /// Constructs AmazonMarketplaceReportingClient with AWS Access Key ID and AWS Secret Key - /// - /// AWS Access Key ID - /// AWS Secret Access Key - public AmazonMarketplaceReportingClient(string awsAccessKeyId, string awsSecretAccessKey) - : this(awsAccessKeyId, awsSecretAccessKey, new AmazonMarketplaceReportingConfig()) - { - } - - /// - /// Constructs AmazonMarketplaceReportingClient with AWS Access Key ID and AWS Secret Key - /// - /// AWS Access Key ID - /// AWS Secret Access Key - /// The region to connect. - public AmazonMarketplaceReportingClient(string awsAccessKeyId, string awsSecretAccessKey, RegionEndpoint region) - : this(awsAccessKeyId, awsSecretAccessKey, new AmazonMarketplaceReportingConfig() {RegionEndpoint=region}) - { - } - - /// - /// Constructs AmazonMarketplaceReportingClient with AWS Access Key ID, AWS Secret Key and an - /// AmazonMarketplaceReportingClient Configuration object. - /// - /// AWS Access Key ID - /// AWS Secret Access Key - /// The AmazonMarketplaceReportingClient Configuration Object - public AmazonMarketplaceReportingClient(string awsAccessKeyId, string awsSecretAccessKey, AmazonMarketplaceReportingConfig clientConfig) - : base(awsAccessKeyId, awsSecretAccessKey, clientConfig) - { - } - - /// - /// Constructs AmazonMarketplaceReportingClient with AWS Access Key ID and AWS Secret Key - /// - /// AWS Access Key ID - /// AWS Secret Access Key - /// AWS Session Token - public AmazonMarketplaceReportingClient(string awsAccessKeyId, string awsSecretAccessKey, string awsSessionToken) - : this(awsAccessKeyId, awsSecretAccessKey, awsSessionToken, new AmazonMarketplaceReportingConfig()) - { - } - - /// - /// Constructs AmazonMarketplaceReportingClient with AWS Access Key ID and AWS Secret Key - /// - /// AWS Access Key ID - /// AWS Secret Access Key - /// AWS Session Token - /// The region to connect. - public AmazonMarketplaceReportingClient(string awsAccessKeyId, string awsSecretAccessKey, string awsSessionToken, RegionEndpoint region) - : this(awsAccessKeyId, awsSecretAccessKey, awsSessionToken, new AmazonMarketplaceReportingConfig{RegionEndpoint = region}) - { - } - - /// - /// Constructs AmazonMarketplaceReportingClient with AWS Access Key ID, AWS Secret Key and an - /// AmazonMarketplaceReportingClient Configuration object. - /// - /// AWS Access Key ID - /// AWS Secret Access Key - /// AWS Session Token - /// The AmazonMarketplaceReportingClient Configuration Object - public AmazonMarketplaceReportingClient(string awsAccessKeyId, string awsSecretAccessKey, string awsSessionToken, AmazonMarketplaceReportingConfig clientConfig) - : base(awsAccessKeyId, awsSecretAccessKey, awsSessionToken, clientConfig) - { - } - - #endregion - - #region Overrides - - - /// - /// Creates the signer for the service. - /// - protected override AbstractAWSSigner CreateSigner() - { - return new AWS4Signer(); - } - - /// - /// Customize the pipeline - /// - /// - protected override void CustomizeRuntimePipeline(RuntimePipeline pipeline) - { - pipeline.RemoveHandler(); - pipeline.AddHandlerAfter(new AmazonMarketplaceReportingEndpointResolver()); - } - /// - /// Capture metadata for the service. - /// - protected override IServiceMetadata ServiceMetadata - { - get - { - return serviceMetadata; - } - } - - #endregion - - #region Dispose - - /// - /// Disposes the service client. - /// - protected override void Dispose(bool disposing) - { - base.Dispose(disposing); - } - - #endregion - - - #region GetBuyerDashboard - - /// - /// Generates an embedding URL for an Amazon QuickSight dashboard for an anonymous user. - /// - /// - /// - /// This API is available only to Amazon Web Services Organization management accounts - /// or delegated administrators registered for the procurement insights (procurement-insights.marketplace.amazonaws.com) - /// feature. - /// - /// - /// - /// The following rules apply to a generated URL: - /// - ///
    • - /// - /// It contains a temporary bearer token, valid for 5 minutes after it is generated. Once - /// redeemed within that period, it cannot be re-used again. - /// - ///
    • - /// - /// It has a session lifetime of one hour. The 5-minute validity period runs separately - /// from the session lifetime. - /// - ///
    - ///     - /// Container for the necessary parameters to execute the GetBuyerDashboard service method. - /// - /// The response from the GetBuyerDashboard service method, as returned by MarketplaceReporting. - /// - /// You do not have sufficient access to perform this action. - /// - /// - /// The request is malformed, or it contains an error such as an invalid parameter. Ensure - /// the request has all required parameters. - /// - /// - /// The operation failed due to a server error. - /// - /// - /// You do not have permission to perform this action. - /// - /// REST API Reference for GetBuyerDashboard Operation - public virtual GetBuyerDashboardResponse GetBuyerDashboard(GetBuyerDashboardRequest request) - { - var options = new InvokeOptions(); - options.RequestMarshaller = GetBuyerDashboardRequestMarshaller.Instance; - options.ResponseUnmarshaller = GetBuyerDashboardResponseUnmarshaller.Instance; - - return Invoke(request, options); - } - - /// - /// Initiates the asynchronous execution of the GetBuyerDashboard operation. - /// - /// - /// Container for the necessary parameters to execute the GetBuyerDashboard operation on AmazonMarketplaceReportingClient. - /// An AsyncCallback delegate that is invoked when the operation completes. - /// A user-defined state object that is passed to the callback procedure. Retrieve this object from within the callback - /// procedure using the AsyncState property. - /// - /// An IAsyncResult that can be used to poll or wait for results, or both; this value is also needed when invoking EndGetBuyerDashboard - /// operation. - /// REST API Reference for GetBuyerDashboard Operation - public virtual IAsyncResult BeginGetBuyerDashboard(GetBuyerDashboardRequest request, AsyncCallback callback, object state) - { - var options = new InvokeOptions(); - options.RequestMarshaller = GetBuyerDashboardRequestMarshaller.Instance; - options.ResponseUnmarshaller = GetBuyerDashboardResponseUnmarshaller.Instance; - - return BeginInvoke(request, options, callback, state); - } - - /// - /// Finishes the asynchronous execution of the GetBuyerDashboard operation. - /// - /// - /// The IAsyncResult returned by the call to BeginGetBuyerDashboard. - /// - /// Returns a GetBuyerDashboardResult from MarketplaceReporting. - /// REST API Reference for GetBuyerDashboard Operation - public virtual GetBuyerDashboardResponse EndGetBuyerDashboard(IAsyncResult asyncResult) - { - return EndInvoke(asyncResult); - } - - #endregion - - #region DetermineServiceOperationEndpoint - - /// - /// Returns the endpoint that will be used for a particular request. - /// - /// Request for the desired service operation. - /// The resolved endpoint for the given request. - public Amazon.Runtime.Endpoints.Endpoint DetermineServiceOperationEndpoint(AmazonWebServiceRequest request) - { - var requestContext = new Amazon.Runtime.Internal.RequestContext(false, CreateSigner()) - { - ClientConfig = Config, - OriginalRequest = request, - Request = new Amazon.Runtime.Internal.DefaultRequest(request, ServiceMetadata.ServiceId) - }; - - var executionContext = new Amazon.Runtime.Internal.ExecutionContext(requestContext, null); - var resolver = new AmazonMarketplaceReportingEndpointResolver(); - return resolver.GetEndpoint(executionContext); - } - - #endregion - - } -} \ No newline at end of file diff --git a/sdk/src/Services/MarketplaceReporting/Generated/_bcl35/IAmazonMarketplaceReporting.cs b/sdk/src/Services/MarketplaceReporting/Generated/_bcl35/IAmazonMarketplaceReporting.cs deleted file mode 100644 index e9fb02c33161..000000000000 --- a/sdk/src/Services/MarketplaceReporting/Generated/_bcl35/IAmazonMarketplaceReporting.cs +++ /dev/null @@ -1,193 +0,0 @@ -/* - * 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. - */ - -/* - * Do not modify this file. This file is generated from the marketplace-reporting-2018-05-10.normal.json service model. - */ - - -using System; -using System.Collections.Generic; - -using Amazon.Runtime; -using Amazon.MarketplaceReporting.Model; - -#pragma warning disable CS1570 -namespace Amazon.MarketplaceReporting -{ - /// - /// Interface for accessing MarketplaceReporting - /// - /// The Amazon Web Services Marketplace GetBuyerDashboard API enables you to get - /// a procurement insights dashboard programmatically. The API gets the agreement and - /// cost analysis dashboards with data for all of the Amazon Web Services accounts in - /// your Amazon Web Services Organization. - /// - /// - /// - /// To use the Amazon Web Services Marketplace Reporting API, you must complete the following - /// prerequisites: - /// - ///
    • - /// - /// Enable all features for your organization. For more information, see Enabling - /// all features for an organization with Organizations, in the Organizations User - /// Guide. - /// - ///
    • - /// - /// Call the service as the Organizations management account or an account registered - /// as a delegated administrator for the procurement insights service. - /// - /// - /// - /// For more information about management accounts, see Tutorial: - /// Creating and configuring an organization and Managing - /// the management account with Organizations, both in the Organizations User Guide. - /// - /// - /// - /// For more information about delegated administrators, see Using - /// delegated administrators, in the Amazon Web Services Marketplace Buyer Guide. - /// - ///
    • - /// - /// Create an IAM policy that enables the aws-marketplace:GetBuyerDashboard and - /// organizations:DescribeOrganization permissions. In addition, the management - /// account requires the organizations:EnableAWSServiceAccess and iam:CreateServiceLinkedRole - /// permissions to create. For more information about creating the policy, see Policies - /// and permissions in Identity and Access Management, in the IAM User Guide. - /// - /// - /// - /// Access can be shared only by registering the desired linked account as a delegated - /// administrator. That requires organizations:RegisterDelegatedAdministrator organizations:ListDelegatedAdministrators - /// and organizations:DeregisterDelegatedAdministrator permissions. - /// - ///
    • - /// - /// Use the Amazon Web Services Marketplace console to create the AWSServiceRoleForProcurementInsightsPolicy - /// service-linked role. The role enables Amazon Web Services Marketplace procurement - /// visibility integration. The management account requires an IAM policy with the organizations:EnableAWSServiceAccess - /// and iam:CreateServiceLinkedRole permissions to create the service-linked role - /// and enable the service access. For more information, see Granting - /// access to Organizations and Service-linked - /// role to share procurement data in the Amazon Web Services Marketplace Buyer - /// Guide. - /// - ///
    • - /// - /// After creating the service-linked role, you must enable trusted access that grants - /// Amazon Web Services Marketplace permission to access data from your Organizations. - /// For more information, see Granting - /// access to Organizations in the Amazon Web Services Marketplace Buyer Guide. - /// - ///
    - ///     - public partial interface IAmazonMarketplaceReporting : IAmazonService, IDisposable - { - - - - - - #region GetBuyerDashboard - - - /// - /// Generates an embedding URL for an Amazon QuickSight dashboard for an anonymous user. - /// - /// - /// - /// This API is available only to Amazon Web Services Organization management accounts - /// or delegated administrators registered for the procurement insights (procurement-insights.marketplace.amazonaws.com) - /// feature. - /// - /// - /// - /// The following rules apply to a generated URL: - /// - ///
    • - /// - /// It contains a temporary bearer token, valid for 5 minutes after it is generated. Once - /// redeemed within that period, it cannot be re-used again. - /// - ///
    • - /// - /// It has a session lifetime of one hour. The 5-minute validity period runs separately - /// from the session lifetime. - /// - ///
    - ///     - /// Container for the necessary parameters to execute the GetBuyerDashboard service method. - /// - /// The response from the GetBuyerDashboard service method, as returned by MarketplaceReporting. - /// - /// You do not have sufficient access to perform this action. - /// - /// - /// The request is malformed, or it contains an error such as an invalid parameter. Ensure - /// the request has all required parameters. - /// - /// - /// The operation failed due to a server error. - /// - /// - /// You do not have permission to perform this action. - /// - /// REST API Reference for GetBuyerDashboard Operation - GetBuyerDashboardResponse GetBuyerDashboard(GetBuyerDashboardRequest request); - - /// - /// Initiates the asynchronous execution of the GetBuyerDashboard operation. - /// - /// - /// Container for the necessary parameters to execute the GetBuyerDashboard operation on AmazonMarketplaceReportingClient. - /// An AsyncCallback delegate that is invoked when the operation completes. - /// A user-defined state object that is passed to the callback procedure. Retrieve this object from within the callback - /// procedure using the AsyncState property. - /// - /// An IAsyncResult that can be used to poll or wait for results, or both; this value is also needed when invoking EndGetBuyerDashboard - /// operation. - /// REST API Reference for GetBuyerDashboard Operation - IAsyncResult BeginGetBuyerDashboard(GetBuyerDashboardRequest request, AsyncCallback callback, object state); - - - - /// - /// Finishes the asynchronous execution of the GetBuyerDashboard operation. - /// - /// - /// The IAsyncResult returned by the call to BeginGetBuyerDashboard. - /// - /// Returns a GetBuyerDashboardResult from MarketplaceReporting. - /// REST API Reference for GetBuyerDashboard Operation - GetBuyerDashboardResponse EndGetBuyerDashboard(IAsyncResult asyncResult); - - #endregion - - #region DetermineServiceOperationEndpoint - - /// - /// Returns the endpoint that will be used for a particular request. - /// - /// Request for the desired service operation. - /// The resolved endpoint for the given request. - Amazon.Runtime.Endpoints.Endpoint DetermineServiceOperationEndpoint(AmazonWebServiceRequest request); - - #endregion - - } -} \ No newline at end of file diff --git a/sdk/src/Services/MarketplaceReporting/Generated/_netstandard/AmazonMarketplaceReportingClient.cs b/sdk/src/Services/MarketplaceReporting/Generated/_netstandard/AmazonMarketplaceReportingClient.cs index c1b7cf29341b..dacb15b1fb87 100644 --- a/sdk/src/Services/MarketplaceReporting/Generated/_netstandard/AmazonMarketplaceReportingClient.cs +++ b/sdk/src/Services/MarketplaceReporting/Generated/_netstandard/AmazonMarketplaceReportingClient.cs @@ -32,6 +32,7 @@ using Amazon.Runtime.Internal; using Amazon.Runtime.Internal.Auth; using Amazon.Runtime.Internal.Transform; +using Amazon.Runtime.Endpoints; #pragma warning disable CS1570 namespace Amazon.MarketplaceReporting @@ -392,16 +393,8 @@ internal virtual GetBuyerDashboardResponse GetBuyerDashboard(GetBuyerDashboardRe /// The resolved endpoint for the given request. public Amazon.Runtime.Endpoints.Endpoint DetermineServiceOperationEndpoint(AmazonWebServiceRequest request) { - var requestContext = new Amazon.Runtime.Internal.RequestContext(false, CreateSigner()) - { - ClientConfig = Config, - OriginalRequest = request, - Request = new Amazon.Runtime.Internal.DefaultRequest(request, ServiceMetadata.ServiceId) - }; - - var executionContext = new Amazon.Runtime.Internal.ExecutionContext(requestContext, null); - var resolver = new AmazonMarketplaceReportingEndpointResolver(); - return resolver.GetEndpoint(executionContext); + var parameters = new ServiceOperationEndpointParameters(request); + return Config.DetermineServiceOperationEndpoint(parameters); } #endregion diff --git a/sdk/src/Services/MarketplaceReporting/Generated/_netstandard/IAmazonMarketplaceReporting.cs b/sdk/src/Services/MarketplaceReporting/Generated/_netstandard/IAmazonMarketplaceReporting.cs index d6166559d771..dead7a67f0c2 100644 --- a/sdk/src/Services/MarketplaceReporting/Generated/_netstandard/IAmazonMarketplaceReporting.cs +++ b/sdk/src/Services/MarketplaceReporting/Generated/_netstandard/IAmazonMarketplaceReporting.cs @@ -165,5 +165,33 @@ public partial interface IAmazonMarketplaceReporting : IAmazonService, IDisposab #endregion + #region Static factory interface methods +#if NET8_0_OR_GREATER +// Warning CA1033 is issued when the child types can not call the method defined in parent types. +// In this use case the intended caller is only meant to be the interface as a factory +// method to create the child types. Given the SDK use case the warning can be ignored. +#pragma warning disable CA1033 + /// + [System.Diagnostics.CodeAnalysis.DynamicDependency(System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicProperties, typeof(AmazonMarketplaceReportingConfig))] + static ClientConfig IAmazonService.CreateDefaultClientConfig() => new AmazonMarketplaceReportingConfig(); + + /// + [System.Diagnostics.CodeAnalysis.UnconditionalSuppressMessage("AssemblyLoadTrimming", "IL2026:RequiresUnreferencedCode", + Justification = "This suppression is here to ignore the warnings caused by CognitoSync. See justification in IAmazonService.")] + static IAmazonService IAmazonService.CreateDefaultServiceClient(AWSCredentials awsCredentials, ClientConfig clientConfig) + { + var serviceClientConfig = clientConfig as AmazonMarketplaceReportingConfig; + if (serviceClientConfig == null) + { + throw new AmazonClientException("ClientConfig is not of type AmazonMarketplaceReportingConfig to create AmazonMarketplaceReportingClient"); + } + + return awsCredentials == null ? + new AmazonMarketplaceReportingClient(serviceClientConfig) : + new AmazonMarketplaceReportingClient(awsCredentials, serviceClientConfig); + } +#pragma warning restore CA1033 +#endif + #endregion } } \ No newline at end of file diff --git a/sdk/src/Services/MarketplaceReporting/MarketplaceReporting.sln b/sdk/src/Services/MarketplaceReporting/MarketplaceReporting.sln index 3c5e8a267a6c..db3c8599c435 100644 --- a/sdk/src/Services/MarketplaceReporting/MarketplaceReporting.sln +++ b/sdk/src/Services/MarketplaceReporting/MarketplaceReporting.sln @@ -4,9 +4,7 @@ VisualStudioVersion = 15.0.26730.12 MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Core", "Core", "{9863FCB3-BFA4-4B9C-B8F6-302BA5F660B8}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.Core.Net35", "../../Core/AWSSDK.Core.Net35.csproj", "{1FACE5D0-97BF-4069-B4F7-0FE28BB160F8}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.Core.Net45", "../../Core/AWSSDK.Core.Net45.csproj", "{7DE3AFA0-1B2D-41B1-82BD-120B8B210B43}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.Core.NetFramework", "../../Core/AWSSDK.Core.NetFramework.csproj", "{7DE3AFA0-1B2D-41B1-82BD-120B8B210B43}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.Core.NetStandard", "../../Core/AWSSDK.Core.NetStandard.csproj", "{A855B58E-ED32-40AE-AE8F-054F448B9F2C}" EndProject @@ -14,27 +12,19 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Services", "Services", "{93 EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "MarketplaceReporting", "MarketplaceReporting", "{16F17670-98BC-498F-8B83-77BEFCDE7E2F}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.MarketplaceReporting.Net35", "AWSSDK.MarketplaceReporting.Net35.csproj", "{B44FBE7B-44F4-412F-9247-6748235B4B64}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.MarketplaceReporting.Net45", "AWSSDK.MarketplaceReporting.Net45.csproj", "{CFBF058D-1FAE-435C-9DD1-03B40A76C796}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.MarketplaceReporting.NetFramework", "AWSSDK.MarketplaceReporting.NetFramework.csproj", "{91C41066-70D9-409A-AE10-8714325E4F43}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.MarketplaceReporting.NetStandard", "AWSSDK.MarketplaceReporting.NetStandard.csproj", "{B2995476-8D73-4DCF-8B95-6F352B088531}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Test", "Test", "{12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.UnitTests.MarketplaceReporting.Net35", "../../../test/Services/MarketplaceReporting/UnitTests/AWSSDK.UnitTests.MarketplaceReporting.Net35.csproj", "{13F71D8A-C3FF-47E5-ACF4-FB8671582897}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.UnitTests.MarketplaceReporting.Net45", "../../../test/Services/MarketplaceReporting/UnitTests/AWSSDK.UnitTests.MarketplaceReporting.Net45.csproj", "{DE767BBA-9CEE-4FD6-8B18-E5D4814346B1}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.UnitTests.MarketplaceReporting.NetFramework", "../../../test/Services/MarketplaceReporting/UnitTests/AWSSDK.UnitTests.MarketplaceReporting.NetFramework.csproj", "{F4C3C948-B996-46D3-9ED2-690E4DB1E93B}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ServiceClientGeneratorLib", "../../../../generator/ServiceClientGeneratorLib/ServiceClientGeneratorLib.csproj", "{7BEE7C44-BE12-43CC-AFB9-B5852A1F43C8}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.UnitTestUtilities.Net35", "../../../test/UnitTests/Custom/AWSSDK.UnitTestUtilities.Net35.csproj", "{A23CE153-A4A3-4D3A-A6DC-0DD1B207118E}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.UnitTestUtilities.Net45", "../../../test/UnitTests/Custom/AWSSDK.UnitTestUtilities.Net45.csproj", "{002B183F-E568-49CD-9D06-CBCFF2C2921F}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.IntegrationTestUtilities.Net35", "../../../test/IntegrationTests/AWSSDK.IntegrationTestUtilities.Net35.csproj", "{924D2906-70D6-4D77-8603-816648B2CCA6}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.UnitTestUtilities.NetFramework", "../../../test/UnitTests/Custom/AWSSDK.UnitTestUtilities.NetFramework.csproj", "{002B183F-E568-49CD-9D06-CBCFF2C2921F}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.IntegrationTestUtilities.Net45", "../../../test/IntegrationTests/AWSSDK.IntegrationTestUtilities.Net45.csproj", "{7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.IntegrationTestUtilities.NetFramework", "../../../test/IntegrationTests/AWSSDK.IntegrationTestUtilities.NetFramework.csproj", "{7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.CommonTest", "../../../test/Common/AWSSDK.CommonTest.csproj", "{66F78F86-68D7-4538-8EA5-A669A08E1C19}" EndProject @@ -44,25 +34,15 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UnitTests.NetStandard.CoreO EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "IntegrationTestDependencies", "IntegrationTestDependencies", "{939EC5C2-8345-43E2-8F97-72EEEBEEA0AC}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.Extensions.CrtIntegration.Net35", "../../../../extensions/src/AWSSDK.Extensions.CrtIntegration/AWSSDK.Extensions.CrtIntegration.Net35.csproj", "{4419F795-A18A-4841-8FEA-766ACAEBE18C}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.Extensions.CrtIntegration.Net45", "../../../../extensions/src/AWSSDK.Extensions.CrtIntegration/AWSSDK.Extensions.CrtIntegration.Net45.csproj", "{F45E2A15-77F2-4DAD-A7CD-C8C514868A58}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.IdentityManagement.Net35", "../IdentityManagement/AWSSDK.IdentityManagement.Net35.csproj", "{6A4555D0-227E-44CD-AA2E-D53238D5FE2E}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.SecurityToken.Net35", "../SecurityToken/AWSSDK.SecurityToken.Net35.csproj", "{A3B89B35-5F6D-4528-9041-44BEC3CE2223}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.SimpleNotificationService.Net35", "../SimpleNotificationService/AWSSDK.SimpleNotificationService.Net35.csproj", "{4F4DCC7D-214C-401E-BCD8-78C24474DE74}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.S3.Net35", "../S3/AWSSDK.S3.Net35.csproj", "{75B773DE-3E76-48FC-9E52-1CCC8833A2F9}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.Extensions.CrtIntegration.NetFramework", "../../../../extensions/src/AWSSDK.Extensions.CrtIntegration/AWSSDK.Extensions.CrtIntegration.NetFramework.csproj", "{27C31D0D-EC00-46AB-9183-E61055626428}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.IdentityManagement.Net45", "../IdentityManagement/AWSSDK.IdentityManagement.Net45.csproj", "{3B672867-B68D-406C-ABD1-EB4AEE9B6C9B}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.IdentityManagement.NetFramework", "../IdentityManagement/AWSSDK.IdentityManagement.NetFramework.csproj", "{9BF2A1EE-1F6E-472D-AB31-ECE60006EDA3}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.S3.Net45", "../S3/AWSSDK.S3.Net45.csproj", "{873FC23D-081C-4F45-A93B-272420BA2522}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.S3.NetFramework", "../S3/AWSSDK.S3.NetFramework.csproj", "{D992D6E4-6B17-4CB4-82D5-DFBAC457D4A8}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.SecurityToken.Net45", "../SecurityToken/AWSSDK.SecurityToken.Net45.csproj", "{757385DF-C26A-443D-942A-A0CDAD3FD4B8}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.SecurityToken.NetFramework", "../SecurityToken/AWSSDK.SecurityToken.NetFramework.csproj", "{45798121-8E0C-4D8A-BCCA-6986EFE8C215}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.SimpleNotificationService.Net45", "../SimpleNotificationService/AWSSDK.SimpleNotificationService.Net45.csproj", "{13638A87-BF5D-42F6-B3FB-B06D75DEE1CF}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.SimpleNotificationService.NetFramework", "../SimpleNotificationService/AWSSDK.SimpleNotificationService.NetFramework.csproj", "{B8E55AF7-3B6B-44A9-9241-479008C3CFED}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -70,10 +50,6 @@ Global Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {1FACE5D0-97BF-4069-B4F7-0FE28BB160F8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1FACE5D0-97BF-4069-B4F7-0FE28BB160F8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1FACE5D0-97BF-4069-B4F7-0FE28BB160F8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1FACE5D0-97BF-4069-B4F7-0FE28BB160F8}.Release|Any CPU.Build.0 = Release|Any CPU {7DE3AFA0-1B2D-41B1-82BD-120B8B210B43}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {7DE3AFA0-1B2D-41B1-82BD-120B8B210B43}.Debug|Any CPU.Build.0 = Debug|Any CPU {7DE3AFA0-1B2D-41B1-82BD-120B8B210B43}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -82,42 +58,26 @@ Global {A855B58E-ED32-40AE-AE8F-054F448B9F2C}.Debug|Any CPU.Build.0 = Debug|Any CPU {A855B58E-ED32-40AE-AE8F-054F448B9F2C}.Release|Any CPU.ActiveCfg = Release|Any CPU {A855B58E-ED32-40AE-AE8F-054F448B9F2C}.Release|Any CPU.Build.0 = Release|Any CPU - {B44FBE7B-44F4-412F-9247-6748235B4B64}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B44FBE7B-44F4-412F-9247-6748235B4B64}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B44FBE7B-44F4-412F-9247-6748235B4B64}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B44FBE7B-44F4-412F-9247-6748235B4B64}.Release|Any CPU.Build.0 = Release|Any CPU - {CFBF058D-1FAE-435C-9DD1-03B40A76C796}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CFBF058D-1FAE-435C-9DD1-03B40A76C796}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CFBF058D-1FAE-435C-9DD1-03B40A76C796}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CFBF058D-1FAE-435C-9DD1-03B40A76C796}.Release|Any CPU.Build.0 = Release|Any CPU + {91C41066-70D9-409A-AE10-8714325E4F43}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {91C41066-70D9-409A-AE10-8714325E4F43}.Debug|Any CPU.Build.0 = Debug|Any CPU + {91C41066-70D9-409A-AE10-8714325E4F43}.Release|Any CPU.ActiveCfg = Release|Any CPU + {91C41066-70D9-409A-AE10-8714325E4F43}.Release|Any CPU.Build.0 = Release|Any CPU {B2995476-8D73-4DCF-8B95-6F352B088531}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {B2995476-8D73-4DCF-8B95-6F352B088531}.Debug|Any CPU.Build.0 = Debug|Any CPU {B2995476-8D73-4DCF-8B95-6F352B088531}.Release|Any CPU.ActiveCfg = Release|Any CPU {B2995476-8D73-4DCF-8B95-6F352B088531}.Release|Any CPU.Build.0 = Release|Any CPU - {13F71D8A-C3FF-47E5-ACF4-FB8671582897}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {13F71D8A-C3FF-47E5-ACF4-FB8671582897}.Debug|Any CPU.Build.0 = Debug|Any CPU - {13F71D8A-C3FF-47E5-ACF4-FB8671582897}.Release|Any CPU.ActiveCfg = Release|Any CPU - {13F71D8A-C3FF-47E5-ACF4-FB8671582897}.Release|Any CPU.Build.0 = Release|Any CPU - {DE767BBA-9CEE-4FD6-8B18-E5D4814346B1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DE767BBA-9CEE-4FD6-8B18-E5D4814346B1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DE767BBA-9CEE-4FD6-8B18-E5D4814346B1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DE767BBA-9CEE-4FD6-8B18-E5D4814346B1}.Release|Any CPU.Build.0 = Release|Any CPU + {F4C3C948-B996-46D3-9ED2-690E4DB1E93B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {F4C3C948-B996-46D3-9ED2-690E4DB1E93B}.Debug|Any CPU.Build.0 = Debug|Any CPU + {F4C3C948-B996-46D3-9ED2-690E4DB1E93B}.Release|Any CPU.ActiveCfg = Release|Any CPU + {F4C3C948-B996-46D3-9ED2-690E4DB1E93B}.Release|Any CPU.Build.0 = Release|Any CPU {7BEE7C44-BE12-43CC-AFB9-B5852A1F43C8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {7BEE7C44-BE12-43CC-AFB9-B5852A1F43C8}.Debug|Any CPU.Build.0 = Debug|Any CPU {7BEE7C44-BE12-43CC-AFB9-B5852A1F43C8}.Release|Any CPU.ActiveCfg = Release|Any CPU {7BEE7C44-BE12-43CC-AFB9-B5852A1F43C8}.Release|Any CPU.Build.0 = Release|Any CPU - {A23CE153-A4A3-4D3A-A6DC-0DD1B207118E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A23CE153-A4A3-4D3A-A6DC-0DD1B207118E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A23CE153-A4A3-4D3A-A6DC-0DD1B207118E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A23CE153-A4A3-4D3A-A6DC-0DD1B207118E}.Release|Any CPU.Build.0 = Release|Any CPU {002B183F-E568-49CD-9D06-CBCFF2C2921F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {002B183F-E568-49CD-9D06-CBCFF2C2921F}.Debug|Any CPU.Build.0 = Debug|Any CPU {002B183F-E568-49CD-9D06-CBCFF2C2921F}.Release|Any CPU.ActiveCfg = Release|Any CPU {002B183F-E568-49CD-9D06-CBCFF2C2921F}.Release|Any CPU.Build.0 = Release|Any CPU - {924D2906-70D6-4D77-8603-816648B2CCA6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {924D2906-70D6-4D77-8603-816648B2CCA6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {924D2906-70D6-4D77-8603-816648B2CCA6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {924D2906-70D6-4D77-8603-816648B2CCA6}.Release|Any CPU.Build.0 = Release|Any CPU {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7}.Debug|Any CPU.Build.0 = Debug|Any CPU {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -134,78 +94,48 @@ Global {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {4419F795-A18A-4841-8FEA-766ACAEBE18C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4419F795-A18A-4841-8FEA-766ACAEBE18C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4419F795-A18A-4841-8FEA-766ACAEBE18C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4419F795-A18A-4841-8FEA-766ACAEBE18C}.Release|Any CPU.Build.0 = Release|Any CPU - {F45E2A15-77F2-4DAD-A7CD-C8C514868A58}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F45E2A15-77F2-4DAD-A7CD-C8C514868A58}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F45E2A15-77F2-4DAD-A7CD-C8C514868A58}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F45E2A15-77F2-4DAD-A7CD-C8C514868A58}.Release|Any CPU.Build.0 = Release|Any CPU - {6A4555D0-227E-44CD-AA2E-D53238D5FE2E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6A4555D0-227E-44CD-AA2E-D53238D5FE2E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6A4555D0-227E-44CD-AA2E-D53238D5FE2E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6A4555D0-227E-44CD-AA2E-D53238D5FE2E}.Release|Any CPU.Build.0 = Release|Any CPU - {A3B89B35-5F6D-4528-9041-44BEC3CE2223}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A3B89B35-5F6D-4528-9041-44BEC3CE2223}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A3B89B35-5F6D-4528-9041-44BEC3CE2223}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A3B89B35-5F6D-4528-9041-44BEC3CE2223}.Release|Any CPU.Build.0 = Release|Any CPU - {4F4DCC7D-214C-401E-BCD8-78C24474DE74}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4F4DCC7D-214C-401E-BCD8-78C24474DE74}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4F4DCC7D-214C-401E-BCD8-78C24474DE74}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4F4DCC7D-214C-401E-BCD8-78C24474DE74}.Release|Any CPU.Build.0 = Release|Any CPU - {75B773DE-3E76-48FC-9E52-1CCC8833A2F9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {75B773DE-3E76-48FC-9E52-1CCC8833A2F9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {75B773DE-3E76-48FC-9E52-1CCC8833A2F9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {75B773DE-3E76-48FC-9E52-1CCC8833A2F9}.Release|Any CPU.Build.0 = Release|Any CPU - {3B672867-B68D-406C-ABD1-EB4AEE9B6C9B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3B672867-B68D-406C-ABD1-EB4AEE9B6C9B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3B672867-B68D-406C-ABD1-EB4AEE9B6C9B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3B672867-B68D-406C-ABD1-EB4AEE9B6C9B}.Release|Any CPU.Build.0 = Release|Any CPU - {873FC23D-081C-4F45-A93B-272420BA2522}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {873FC23D-081C-4F45-A93B-272420BA2522}.Debug|Any CPU.Build.0 = Debug|Any CPU - {873FC23D-081C-4F45-A93B-272420BA2522}.Release|Any CPU.ActiveCfg = Release|Any CPU - {873FC23D-081C-4F45-A93B-272420BA2522}.Release|Any CPU.Build.0 = Release|Any CPU - {757385DF-C26A-443D-942A-A0CDAD3FD4B8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {757385DF-C26A-443D-942A-A0CDAD3FD4B8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {757385DF-C26A-443D-942A-A0CDAD3FD4B8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {757385DF-C26A-443D-942A-A0CDAD3FD4B8}.Release|Any CPU.Build.0 = Release|Any CPU - {13638A87-BF5D-42F6-B3FB-B06D75DEE1CF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {13638A87-BF5D-42F6-B3FB-B06D75DEE1CF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {13638A87-BF5D-42F6-B3FB-B06D75DEE1CF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {13638A87-BF5D-42F6-B3FB-B06D75DEE1CF}.Release|Any CPU.Build.0 = Release|Any CPU + {27C31D0D-EC00-46AB-9183-E61055626428}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {27C31D0D-EC00-46AB-9183-E61055626428}.Debug|Any CPU.Build.0 = Debug|Any CPU + {27C31D0D-EC00-46AB-9183-E61055626428}.Release|Any CPU.ActiveCfg = Release|Any CPU + {27C31D0D-EC00-46AB-9183-E61055626428}.Release|Any CPU.Build.0 = Release|Any CPU + {9BF2A1EE-1F6E-472D-AB31-ECE60006EDA3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {9BF2A1EE-1F6E-472D-AB31-ECE60006EDA3}.Debug|Any CPU.Build.0 = Debug|Any CPU + {9BF2A1EE-1F6E-472D-AB31-ECE60006EDA3}.Release|Any CPU.ActiveCfg = Release|Any CPU + {9BF2A1EE-1F6E-472D-AB31-ECE60006EDA3}.Release|Any CPU.Build.0 = Release|Any CPU + {D992D6E4-6B17-4CB4-82D5-DFBAC457D4A8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {D992D6E4-6B17-4CB4-82D5-DFBAC457D4A8}.Debug|Any CPU.Build.0 = Debug|Any CPU + {D992D6E4-6B17-4CB4-82D5-DFBAC457D4A8}.Release|Any CPU.ActiveCfg = Release|Any CPU + {D992D6E4-6B17-4CB4-82D5-DFBAC457D4A8}.Release|Any CPU.Build.0 = Release|Any CPU + {45798121-8E0C-4D8A-BCCA-6986EFE8C215}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {45798121-8E0C-4D8A-BCCA-6986EFE8C215}.Debug|Any CPU.Build.0 = Debug|Any CPU + {45798121-8E0C-4D8A-BCCA-6986EFE8C215}.Release|Any CPU.ActiveCfg = Release|Any CPU + {45798121-8E0C-4D8A-BCCA-6986EFE8C215}.Release|Any CPU.Build.0 = Release|Any CPU + {B8E55AF7-3B6B-44A9-9241-479008C3CFED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B8E55AF7-3B6B-44A9-9241-479008C3CFED}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B8E55AF7-3B6B-44A9-9241-479008C3CFED}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B8E55AF7-3B6B-44A9-9241-479008C3CFED}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution - {1FACE5D0-97BF-4069-B4F7-0FE28BB160F8} = {9863FCB3-BFA4-4B9C-B8F6-302BA5F660B8} {7DE3AFA0-1B2D-41B1-82BD-120B8B210B43} = {9863FCB3-BFA4-4B9C-B8F6-302BA5F660B8} {A855B58E-ED32-40AE-AE8F-054F448B9F2C} = {9863FCB3-BFA4-4B9C-B8F6-302BA5F660B8} {16F17670-98BC-498F-8B83-77BEFCDE7E2F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AB} - {B44FBE7B-44F4-412F-9247-6748235B4B64} = {16F17670-98BC-498F-8B83-77BEFCDE7E2F} - {CFBF058D-1FAE-435C-9DD1-03B40A76C796} = {16F17670-98BC-498F-8B83-77BEFCDE7E2F} + {91C41066-70D9-409A-AE10-8714325E4F43} = {16F17670-98BC-498F-8B83-77BEFCDE7E2F} {B2995476-8D73-4DCF-8B95-6F352B088531} = {16F17670-98BC-498F-8B83-77BEFCDE7E2F} - {13F71D8A-C3FF-47E5-ACF4-FB8671582897} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {DE767BBA-9CEE-4FD6-8B18-E5D4814346B1} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {F4C3C948-B996-46D3-9ED2-690E4DB1E93B} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7BEE7C44-BE12-43CC-AFB9-B5852A1F43C8} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {A23CE153-A4A3-4D3A-A6DC-0DD1B207118E} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {924D2906-70D6-4D77-8603-816648B2CCA6} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {4419F795-A18A-4841-8FEA-766ACAEBE18C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F45E2A15-77F2-4DAD-A7CD-C8C514868A58} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6A4555D0-227E-44CD-AA2E-D53238D5FE2E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A3B89B35-5F6D-4528-9041-44BEC3CE2223} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4F4DCC7D-214C-401E-BCD8-78C24474DE74} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {75B773DE-3E76-48FC-9E52-1CCC8833A2F9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {3B672867-B68D-406C-ABD1-EB4AEE9B6C9B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {873FC23D-081C-4F45-A93B-272420BA2522} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {757385DF-C26A-443D-942A-A0CDAD3FD4B8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {13638A87-BF5D-42F6-B3FB-B06D75DEE1CF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} + {27C31D0D-EC00-46AB-9183-E61055626428} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} + {9BF2A1EE-1F6E-472D-AB31-ECE60006EDA3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} + {D992D6E4-6B17-4CB4-82D5-DFBAC457D4A8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} + {45798121-8E0C-4D8A-BCCA-6986EFE8C215} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} + {B8E55AF7-3B6B-44A9-9241-479008C3CFED} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {9C182908-D38F-4E31-B3AE-3FE23F2BB743} diff --git a/sdk/src/Services/MarketplaceReporting/Properties/AssemblyInfo.cs b/sdk/src/Services/MarketplaceReporting/Properties/AssemblyInfo.cs index d92065e0e7ad..6df133c28de6 100644 --- a/sdk/src/Services/MarketplaceReporting/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/MarketplaceReporting/Properties/AssemblyInfo.cs @@ -7,10 +7,8 @@ // set of attributes. Change these attribute values to modify the information // associated with an assembly. [assembly: AssemblyTitle("AWSSDK.MarketplaceReporting")] -#if BCL35 -[assembly: AssemblyDescription("The Amazon Web Services SDK for .NET (3.5) - AWS Marketplace Reporting Service. The AWS Marketplace Reporting service introduces the GetBuyerDashboard API. This API returns a dashboard that provides visibility into your organization's AWS Marketplace agreements and associated spend across the AWS accounts in your organization.")] -#elif BCL45 -[assembly: AssemblyDescription("The Amazon Web Services SDK for .NET (4.5) - AWS Marketplace Reporting Service. The AWS Marketplace Reporting service introduces the GetBuyerDashboard API. This API returns a dashboard that provides visibility into your organization's AWS Marketplace agreements and associated spend across the AWS accounts in your organization.")] +#if BCL +[assembly: AssemblyDescription("The Amazon Web Services SDK for .NET (4.7.2) - AWS Marketplace Reporting Service. The AWS Marketplace Reporting service introduces the GetBuyerDashboard API. This API returns a dashboard that provides visibility into your organization's AWS Marketplace agreements and associated spend across the AWS accounts in your organization.")] #elif NETSTANDARD20 [assembly: AssemblyDescription("The Amazon Web Services SDK for .NET (NetStandard 2.0) - AWS Marketplace Reporting Service. The AWS Marketplace Reporting service introduces the GetBuyerDashboard API. This API returns a dashboard that provides visibility into your organization's AWS Marketplace agreements and associated spend across the AWS accounts in your organization.")] #elif NETCOREAPP3_1 @@ -43,9 +41,9 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.24")] - #if BCL -[assembly: System.Security.AllowPartiallyTrustedCallers] -#endif \ No newline at end of file +[assembly: AssemblyVersion("4.0")] +#else +[assembly: AssemblyVersion("4.0.0.0")] +#endif +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/src/Services/MediaConnect/Generated/AmazonMediaConnectConfig.cs b/sdk/src/Services/MediaConnect/Generated/AmazonMediaConnectConfig.cs index e065ce62c9c6..dae2cfec3723 100644 --- a/sdk/src/Services/MediaConnect/Generated/AmazonMediaConnectConfig.cs +++ b/sdk/src/Services/MediaConnect/Generated/AmazonMediaConnectConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.MediaConnect public partial class AmazonMediaConnectConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("MediaConnect", "4.0.0.0"); private static readonly AmazonMediaConnectEndpointResolver EndpointResolver = new AmazonMediaConnectEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("MediaConnect", "3.7.401.13"); -======= - InternalSDKUtils.BuildUserAgentString("MediaConnect", "3.7.401.40"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/MediaConnect/MediaConnect.sln b/sdk/src/Services/MediaConnect/MediaConnect.sln index 894d485eb290..d3bfda782745 100644 --- a/sdk/src/Services/MediaConnect/MediaConnect.sln +++ b/sdk/src/Services/MediaConnect/MediaConnect.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {AA0308C2-9390-4B8F-B976-CB168704A8DB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {AA0308C2-9390-4B8F-B976-CB168704A8DB}.Debug|Any CPU.Build.0 = Debug|Any CPU {AA0308C2-9390-4B8F-B976-CB168704A8DB}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {6FAE84EB-0319-4540-85D5-C15112D10A62}.Debug|Any CPU.Build.0 = Debug|Any CPU {6FAE84EB-0319-4540-85D5-C15112D10A62}.Release|Any CPU.ActiveCfg = Release|Any CPU {6FAE84EB-0319-4540-85D5-C15112D10A62}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {B2EDB454-3A3F-44C4-A5CF-7CD88D7D1F31}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B2EDB454-3A3F-44C4-A5CF-7CD88D7D1F31}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B2EDB454-3A3F-44C4-A5CF-7CD88D7D1F31}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B2EDB454-3A3F-44C4-A5CF-7CD88D7D1F31}.Release|Any CPU.Build.0 = Release|Any CPU - {293013B6-EFEE-43EA-9B81-4208B1243471}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {293013B6-EFEE-43EA-9B81-4208B1243471}.Debug|Any CPU.Build.0 = Debug|Any CPU - {293013B6-EFEE-43EA-9B81-4208B1243471}.Release|Any CPU.ActiveCfg = Release|Any CPU - {293013B6-EFEE-43EA-9B81-4208B1243471}.Release|Any CPU.Build.0 = Release|Any CPU - {96F011D5-073D-4CA7-90E6-6DD30CD54311}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {96F011D5-073D-4CA7-90E6-6DD30CD54311}.Debug|Any CPU.Build.0 = Debug|Any CPU - {96F011D5-073D-4CA7-90E6-6DD30CD54311}.Release|Any CPU.ActiveCfg = Release|Any CPU - {96F011D5-073D-4CA7-90E6-6DD30CD54311}.Release|Any CPU.Build.0 = Release|Any CPU - {AEF4737B-E383-47C4-B9D5-E537DF9D175C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AEF4737B-E383-47C4-B9D5-E537DF9D175C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AEF4737B-E383-47C4-B9D5-E537DF9D175C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AEF4737B-E383-47C4-B9D5-E537DF9D175C}.Release|Any CPU.Build.0 = Release|Any CPU - {AE9CAC37-C9AA-4105-A084-F2C1B6063562}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AE9CAC37-C9AA-4105-A084-F2C1B6063562}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AE9CAC37-C9AA-4105-A084-F2C1B6063562}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AE9CAC37-C9AA-4105-A084-F2C1B6063562}.Release|Any CPU.Build.0 = Release|Any CPU - {6C21F918-BEAD-4AB6-8379-28C8C35B4DA5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6C21F918-BEAD-4AB6-8379-28C8C35B4DA5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6C21F918-BEAD-4AB6-8379-28C8C35B4DA5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6C21F918-BEAD-4AB6-8379-28C8C35B4DA5}.Release|Any CPU.Build.0 = Release|Any CPU - {99DD0A3C-BB41-44B2-8C93-BD06F8482BE7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {99DD0A3C-BB41-44B2-8C93-BD06F8482BE7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {99DD0A3C-BB41-44B2-8C93-BD06F8482BE7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {99DD0A3C-BB41-44B2-8C93-BD06F8482BE7}.Release|Any CPU.Build.0 = Release|Any CPU - {554FF972-B692-4F86-8430-F8D30C65A41C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {554FF972-B692-4F86-8430-F8D30C65A41C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {554FF972-B692-4F86-8430-F8D30C65A41C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {554FF972-B692-4F86-8430-F8D30C65A41C}.Release|Any CPU.Build.0 = Release|Any CPU - {81695331-7A4E-452B-9ACD-1B55ED29946F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {81695331-7A4E-452B-9ACD-1B55ED29946F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {81695331-7A4E-452B-9ACD-1B55ED29946F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {81695331-7A4E-452B-9ACD-1B55ED29946F}.Release|Any CPU.Build.0 = Release|Any CPU - {AF3EB206-8C9A-4D4C-8A5C-9E3FBE41DF25}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AF3EB206-8C9A-4D4C-8A5C-9E3FBE41DF25}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AF3EB206-8C9A-4D4C-8A5C-9E3FBE41DF25}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AF3EB206-8C9A-4D4C-8A5C-9E3FBE41DF25}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {B2EDB454-3A3F-44C4-A5CF-7CD88D7D1F31}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B2EDB454-3A3F-44C4-A5CF-7CD88D7D1F31}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B2EDB454-3A3F-44C4-A5CF-7CD88D7D1F31}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B2EDB454-3A3F-44C4-A5CF-7CD88D7D1F31}.Release|Any CPU.Build.0 = Release|Any CPU - {293013B6-EFEE-43EA-9B81-4208B1243471}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {293013B6-EFEE-43EA-9B81-4208B1243471}.Debug|Any CPU.Build.0 = Debug|Any CPU - {293013B6-EFEE-43EA-9B81-4208B1243471}.Release|Any CPU.ActiveCfg = Release|Any CPU - {293013B6-EFEE-43EA-9B81-4208B1243471}.Release|Any CPU.Build.0 = Release|Any CPU - {96F011D5-073D-4CA7-90E6-6DD30CD54311}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {96F011D5-073D-4CA7-90E6-6DD30CD54311}.Debug|Any CPU.Build.0 = Debug|Any CPU - {96F011D5-073D-4CA7-90E6-6DD30CD54311}.Release|Any CPU.ActiveCfg = Release|Any CPU - {96F011D5-073D-4CA7-90E6-6DD30CD54311}.Release|Any CPU.Build.0 = Release|Any CPU - {AEF4737B-E383-47C4-B9D5-E537DF9D175C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AEF4737B-E383-47C4-B9D5-E537DF9D175C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AEF4737B-E383-47C4-B9D5-E537DF9D175C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AEF4737B-E383-47C4-B9D5-E537DF9D175C}.Release|Any CPU.Build.0 = Release|Any CPU - {AE9CAC37-C9AA-4105-A084-F2C1B6063562}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AE9CAC37-C9AA-4105-A084-F2C1B6063562}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AE9CAC37-C9AA-4105-A084-F2C1B6063562}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AE9CAC37-C9AA-4105-A084-F2C1B6063562}.Release|Any CPU.Build.0 = Release|Any CPU - {6C21F918-BEAD-4AB6-8379-28C8C35B4DA5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6C21F918-BEAD-4AB6-8379-28C8C35B4DA5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6C21F918-BEAD-4AB6-8379-28C8C35B4DA5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6C21F918-BEAD-4AB6-8379-28C8C35B4DA5}.Release|Any CPU.Build.0 = Release|Any CPU - {99DD0A3C-BB41-44B2-8C93-BD06F8482BE7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {99DD0A3C-BB41-44B2-8C93-BD06F8482BE7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {99DD0A3C-BB41-44B2-8C93-BD06F8482BE7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {99DD0A3C-BB41-44B2-8C93-BD06F8482BE7}.Release|Any CPU.Build.0 = Release|Any CPU - {554FF972-B692-4F86-8430-F8D30C65A41C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {554FF972-B692-4F86-8430-F8D30C65A41C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {554FF972-B692-4F86-8430-F8D30C65A41C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {554FF972-B692-4F86-8430-F8D30C65A41C}.Release|Any CPU.Build.0 = Release|Any CPU - {81695331-7A4E-452B-9ACD-1B55ED29946F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {81695331-7A4E-452B-9ACD-1B55ED29946F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {81695331-7A4E-452B-9ACD-1B55ED29946F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {81695331-7A4E-452B-9ACD-1B55ED29946F}.Release|Any CPU.Build.0 = Release|Any CPU - {AF3EB206-8C9A-4D4C-8A5C-9E3FBE41DF25}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AF3EB206-8C9A-4D4C-8A5C-9E3FBE41DF25}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AF3EB206-8C9A-4D4C-8A5C-9E3FBE41DF25}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AF3EB206-8C9A-4D4C-8A5C-9E3FBE41DF25}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {AA0308C2-9390-4B8F-B976-CB168704A8DB} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {72D60803-0D6B-4F73-A58F-924AD4B79E83} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {C861CD31-50EA-4DC2-8401-2476C9EC721C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {03CFAD77-C063-4F2D-A7FE-4C20C3321039} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {6FAE84EB-0319-4540-85D5-C15112D10A62} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {B2EDB454-3A3F-44C4-A5CF-7CD88D7D1F31} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {293013B6-EFEE-43EA-9B81-4208B1243471} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {96F011D5-073D-4CA7-90E6-6DD30CD54311} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {AEF4737B-E383-47C4-B9D5-E537DF9D175C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {AE9CAC37-C9AA-4105-A084-F2C1B6063562} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6C21F918-BEAD-4AB6-8379-28C8C35B4DA5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {99DD0A3C-BB41-44B2-8C93-BD06F8482BE7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {554FF972-B692-4F86-8430-F8D30C65A41C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {81695331-7A4E-452B-9ACD-1B55ED29946F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {AF3EB206-8C9A-4D4C-8A5C-9E3FBE41DF25} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B2EDB454-3A3F-44C4-A5CF-7CD88D7D1F31} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {293013B6-EFEE-43EA-9B81-4208B1243471} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {96F011D5-073D-4CA7-90E6-6DD30CD54311} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {AEF4737B-E383-47C4-B9D5-E537DF9D175C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {AE9CAC37-C9AA-4105-A084-F2C1B6063562} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6C21F918-BEAD-4AB6-8379-28C8C35B4DA5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {99DD0A3C-BB41-44B2-8C93-BD06F8482BE7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {554FF972-B692-4F86-8430-F8D30C65A41C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {81695331-7A4E-452B-9ACD-1B55ED29946F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {AF3EB206-8C9A-4D4C-8A5C-9E3FBE41DF25} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {FBF3ED4A-A68B-4193-A061-C7C3C75BEDB4} diff --git a/sdk/src/Services/MediaConnect/Properties/AssemblyInfo.cs b/sdk/src/Services/MediaConnect/Properties/AssemblyInfo.cs index fff1aad2f240..1535525cc940 100644 --- a/sdk/src/Services/MediaConnect/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/MediaConnect/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.13")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.40")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/MediaConvert/Generated/AmazonMediaConvertConfig.cs b/sdk/src/Services/MediaConvert/Generated/AmazonMediaConvertConfig.cs index df2ab0e80506..a5786e3d51b6 100644 --- a/sdk/src/Services/MediaConvert/Generated/AmazonMediaConvertConfig.cs +++ b/sdk/src/Services/MediaConvert/Generated/AmazonMediaConvertConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.MediaConvert public partial class AmazonMediaConvertConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("MediaConvert", "4.0.0.0"); private static readonly AmazonMediaConvertEndpointResolver EndpointResolver = new AmazonMediaConvertEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("MediaConvert", "3.7.402.5"); -======= - InternalSDKUtils.BuildUserAgentString("MediaConvert", "3.7.403.3"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/MediaConvert/MediaConvert.sln b/sdk/src/Services/MediaConvert/MediaConvert.sln index 970c4f469a96..789044d7f454 100644 --- a/sdk/src/Services/MediaConvert/MediaConvert.sln +++ b/sdk/src/Services/MediaConvert/MediaConvert.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {AA2F701C-8401-4B2C-888C-3C7D7AB085F2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {AA2F701C-8401-4B2C-888C-3C7D7AB085F2}.Debug|Any CPU.Build.0 = Debug|Any CPU {AA2F701C-8401-4B2C-888C-3C7D7AB085F2}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {A3BC3B8B-9851-4167-882F-AEE8DA725ABC}.Debug|Any CPU.Build.0 = Debug|Any CPU {A3BC3B8B-9851-4167-882F-AEE8DA725ABC}.Release|Any CPU.ActiveCfg = Release|Any CPU {A3BC3B8B-9851-4167-882F-AEE8DA725ABC}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {CFEBBD45-35C4-4E8A-82D9-05C29B10B4B1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CFEBBD45-35C4-4E8A-82D9-05C29B10B4B1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CFEBBD45-35C4-4E8A-82D9-05C29B10B4B1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CFEBBD45-35C4-4E8A-82D9-05C29B10B4B1}.Release|Any CPU.Build.0 = Release|Any CPU - {3C6915C8-0A05-4179-9BFB-9CCD6C49457F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3C6915C8-0A05-4179-9BFB-9CCD6C49457F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3C6915C8-0A05-4179-9BFB-9CCD6C49457F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3C6915C8-0A05-4179-9BFB-9CCD6C49457F}.Release|Any CPU.Build.0 = Release|Any CPU - {117196CB-F12F-4DBC-825C-777755CF8BF6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {117196CB-F12F-4DBC-825C-777755CF8BF6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {117196CB-F12F-4DBC-825C-777755CF8BF6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {117196CB-F12F-4DBC-825C-777755CF8BF6}.Release|Any CPU.Build.0 = Release|Any CPU - {A94D7CB5-19B0-4016-AB7E-A4D19C996E89}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A94D7CB5-19B0-4016-AB7E-A4D19C996E89}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A94D7CB5-19B0-4016-AB7E-A4D19C996E89}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A94D7CB5-19B0-4016-AB7E-A4D19C996E89}.Release|Any CPU.Build.0 = Release|Any CPU - {4300C498-616E-4D13-B007-886480FCE145}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4300C498-616E-4D13-B007-886480FCE145}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4300C498-616E-4D13-B007-886480FCE145}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4300C498-616E-4D13-B007-886480FCE145}.Release|Any CPU.Build.0 = Release|Any CPU - {A9ED75D5-7CF9-43AC-A059-AC7D917D0995}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A9ED75D5-7CF9-43AC-A059-AC7D917D0995}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A9ED75D5-7CF9-43AC-A059-AC7D917D0995}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A9ED75D5-7CF9-43AC-A059-AC7D917D0995}.Release|Any CPU.Build.0 = Release|Any CPU - {23CB5A40-1536-4FFC-9458-3504A5FF433F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {23CB5A40-1536-4FFC-9458-3504A5FF433F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {23CB5A40-1536-4FFC-9458-3504A5FF433F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {23CB5A40-1536-4FFC-9458-3504A5FF433F}.Release|Any CPU.Build.0 = Release|Any CPU - {2A51EB7E-CD0B-4E8E-9E9B-07DA11F8FCB0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2A51EB7E-CD0B-4E8E-9E9B-07DA11F8FCB0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2A51EB7E-CD0B-4E8E-9E9B-07DA11F8FCB0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2A51EB7E-CD0B-4E8E-9E9B-07DA11F8FCB0}.Release|Any CPU.Build.0 = Release|Any CPU - {A18601D7-E712-4013-A2D3-F6DCBDFFD83B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A18601D7-E712-4013-A2D3-F6DCBDFFD83B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A18601D7-E712-4013-A2D3-F6DCBDFFD83B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A18601D7-E712-4013-A2D3-F6DCBDFFD83B}.Release|Any CPU.Build.0 = Release|Any CPU - {5B9E3D67-91BD-4208-84E7-F7D3EDCB688B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5B9E3D67-91BD-4208-84E7-F7D3EDCB688B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5B9E3D67-91BD-4208-84E7-F7D3EDCB688B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5B9E3D67-91BD-4208-84E7-F7D3EDCB688B}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {CFEBBD45-35C4-4E8A-82D9-05C29B10B4B1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CFEBBD45-35C4-4E8A-82D9-05C29B10B4B1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CFEBBD45-35C4-4E8A-82D9-05C29B10B4B1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CFEBBD45-35C4-4E8A-82D9-05C29B10B4B1}.Release|Any CPU.Build.0 = Release|Any CPU - {3C6915C8-0A05-4179-9BFB-9CCD6C49457F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3C6915C8-0A05-4179-9BFB-9CCD6C49457F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3C6915C8-0A05-4179-9BFB-9CCD6C49457F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3C6915C8-0A05-4179-9BFB-9CCD6C49457F}.Release|Any CPU.Build.0 = Release|Any CPU - {117196CB-F12F-4DBC-825C-777755CF8BF6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {117196CB-F12F-4DBC-825C-777755CF8BF6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {117196CB-F12F-4DBC-825C-777755CF8BF6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {117196CB-F12F-4DBC-825C-777755CF8BF6}.Release|Any CPU.Build.0 = Release|Any CPU - {A94D7CB5-19B0-4016-AB7E-A4D19C996E89}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A94D7CB5-19B0-4016-AB7E-A4D19C996E89}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A94D7CB5-19B0-4016-AB7E-A4D19C996E89}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A94D7CB5-19B0-4016-AB7E-A4D19C996E89}.Release|Any CPU.Build.0 = Release|Any CPU - {4300C498-616E-4D13-B007-886480FCE145}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4300C498-616E-4D13-B007-886480FCE145}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4300C498-616E-4D13-B007-886480FCE145}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4300C498-616E-4D13-B007-886480FCE145}.Release|Any CPU.Build.0 = Release|Any CPU - {A9ED75D5-7CF9-43AC-A059-AC7D917D0995}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A9ED75D5-7CF9-43AC-A059-AC7D917D0995}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A9ED75D5-7CF9-43AC-A059-AC7D917D0995}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A9ED75D5-7CF9-43AC-A059-AC7D917D0995}.Release|Any CPU.Build.0 = Release|Any CPU - {23CB5A40-1536-4FFC-9458-3504A5FF433F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {23CB5A40-1536-4FFC-9458-3504A5FF433F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {23CB5A40-1536-4FFC-9458-3504A5FF433F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {23CB5A40-1536-4FFC-9458-3504A5FF433F}.Release|Any CPU.Build.0 = Release|Any CPU - {2A51EB7E-CD0B-4E8E-9E9B-07DA11F8FCB0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2A51EB7E-CD0B-4E8E-9E9B-07DA11F8FCB0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2A51EB7E-CD0B-4E8E-9E9B-07DA11F8FCB0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2A51EB7E-CD0B-4E8E-9E9B-07DA11F8FCB0}.Release|Any CPU.Build.0 = Release|Any CPU - {A18601D7-E712-4013-A2D3-F6DCBDFFD83B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A18601D7-E712-4013-A2D3-F6DCBDFFD83B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A18601D7-E712-4013-A2D3-F6DCBDFFD83B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A18601D7-E712-4013-A2D3-F6DCBDFFD83B}.Release|Any CPU.Build.0 = Release|Any CPU - {5B9E3D67-91BD-4208-84E7-F7D3EDCB688B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5B9E3D67-91BD-4208-84E7-F7D3EDCB688B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5B9E3D67-91BD-4208-84E7-F7D3EDCB688B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5B9E3D67-91BD-4208-84E7-F7D3EDCB688B}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {AA2F701C-8401-4B2C-888C-3C7D7AB085F2} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {A9DCA31E-115A-4DB5-BD7F-4E29E4D0F205} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {B81D7065-2E5E-4F8E-8E35-D9702F6333C2} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {26C2EA69-F148-4FD3-AF2C-970F17230E79} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {A3BC3B8B-9851-4167-882F-AEE8DA725ABC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {CFEBBD45-35C4-4E8A-82D9-05C29B10B4B1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {3C6915C8-0A05-4179-9BFB-9CCD6C49457F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {117196CB-F12F-4DBC-825C-777755CF8BF6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A94D7CB5-19B0-4016-AB7E-A4D19C996E89} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4300C498-616E-4D13-B007-886480FCE145} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A9ED75D5-7CF9-43AC-A059-AC7D917D0995} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {23CB5A40-1536-4FFC-9458-3504A5FF433F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {2A51EB7E-CD0B-4E8E-9E9B-07DA11F8FCB0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A18601D7-E712-4013-A2D3-F6DCBDFFD83B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {5B9E3D67-91BD-4208-84E7-F7D3EDCB688B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {CFEBBD45-35C4-4E8A-82D9-05C29B10B4B1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {3C6915C8-0A05-4179-9BFB-9CCD6C49457F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {117196CB-F12F-4DBC-825C-777755CF8BF6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A94D7CB5-19B0-4016-AB7E-A4D19C996E89} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4300C498-616E-4D13-B007-886480FCE145} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A9ED75D5-7CF9-43AC-A059-AC7D917D0995} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {23CB5A40-1536-4FFC-9458-3504A5FF433F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {2A51EB7E-CD0B-4E8E-9E9B-07DA11F8FCB0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A18601D7-E712-4013-A2D3-F6DCBDFFD83B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {5B9E3D67-91BD-4208-84E7-F7D3EDCB688B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {79555FB3-9E2E-4012-A2A3-EB58277CEA56} diff --git a/sdk/src/Services/MediaConvert/Properties/AssemblyInfo.cs b/sdk/src/Services/MediaConvert/Properties/AssemblyInfo.cs index 9fee4c0f43e5..2158fc7b75d0 100644 --- a/sdk/src/Services/MediaConvert/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/MediaConvert/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.402.5")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.403.3")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/MediaLive/Generated/AmazonMediaLiveConfig.cs b/sdk/src/Services/MediaLive/Generated/AmazonMediaLiveConfig.cs index c06d2654daa3..92f69508befe 100644 --- a/sdk/src/Services/MediaLive/Generated/AmazonMediaLiveConfig.cs +++ b/sdk/src/Services/MediaLive/Generated/AmazonMediaLiveConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.MediaLive public partial class AmazonMediaLiveConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("MediaLive", "4.0.0.0"); private static readonly AmazonMediaLiveEndpointResolver EndpointResolver = new AmazonMediaLiveEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("MediaLive", "3.7.405.5"); -======= - InternalSDKUtils.BuildUserAgentString("MediaLive", "3.7.405.32"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/MediaLive/MediaLive.sln b/sdk/src/Services/MediaLive/MediaLive.sln index a8805c5c6129..7f758b240d94 100644 --- a/sdk/src/Services/MediaLive/MediaLive.sln +++ b/sdk/src/Services/MediaLive/MediaLive.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {55480C22-19F0-4883-80A8-E11690C56E80}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {55480C22-19F0-4883-80A8-E11690C56E80}.Debug|Any CPU.Build.0 = Debug|Any CPU {55480C22-19F0-4883-80A8-E11690C56E80}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {49938D0E-EFD9-4A41-9699-0F910AD7D1AD}.Debug|Any CPU.Build.0 = Debug|Any CPU {49938D0E-EFD9-4A41-9699-0F910AD7D1AD}.Release|Any CPU.ActiveCfg = Release|Any CPU {49938D0E-EFD9-4A41-9699-0F910AD7D1AD}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {F0368C7F-817A-46EB-9CDB-B28D215436E4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F0368C7F-817A-46EB-9CDB-B28D215436E4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F0368C7F-817A-46EB-9CDB-B28D215436E4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F0368C7F-817A-46EB-9CDB-B28D215436E4}.Release|Any CPU.Build.0 = Release|Any CPU - {23E7577B-9206-4E3E-8E8F-32302C960C00}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {23E7577B-9206-4E3E-8E8F-32302C960C00}.Debug|Any CPU.Build.0 = Debug|Any CPU - {23E7577B-9206-4E3E-8E8F-32302C960C00}.Release|Any CPU.ActiveCfg = Release|Any CPU - {23E7577B-9206-4E3E-8E8F-32302C960C00}.Release|Any CPU.Build.0 = Release|Any CPU - {CEE3E20C-ACAA-4492-9FCE-FFD0D6B2DA5B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CEE3E20C-ACAA-4492-9FCE-FFD0D6B2DA5B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CEE3E20C-ACAA-4492-9FCE-FFD0D6B2DA5B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CEE3E20C-ACAA-4492-9FCE-FFD0D6B2DA5B}.Release|Any CPU.Build.0 = Release|Any CPU - {1AAB062F-868D-4A5E-9271-40302DBF7EC6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1AAB062F-868D-4A5E-9271-40302DBF7EC6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1AAB062F-868D-4A5E-9271-40302DBF7EC6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1AAB062F-868D-4A5E-9271-40302DBF7EC6}.Release|Any CPU.Build.0 = Release|Any CPU - {AF09F8D1-F660-43DE-A18A-0863838EB90D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AF09F8D1-F660-43DE-A18A-0863838EB90D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AF09F8D1-F660-43DE-A18A-0863838EB90D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AF09F8D1-F660-43DE-A18A-0863838EB90D}.Release|Any CPU.Build.0 = Release|Any CPU - {F4EA7B1B-342F-4CB3-AD61-6D54F73CD2A5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F4EA7B1B-342F-4CB3-AD61-6D54F73CD2A5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F4EA7B1B-342F-4CB3-AD61-6D54F73CD2A5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F4EA7B1B-342F-4CB3-AD61-6D54F73CD2A5}.Release|Any CPU.Build.0 = Release|Any CPU - {340D9FED-D387-4B53-B76B-C6CB2A90C438}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {340D9FED-D387-4B53-B76B-C6CB2A90C438}.Debug|Any CPU.Build.0 = Debug|Any CPU - {340D9FED-D387-4B53-B76B-C6CB2A90C438}.Release|Any CPU.ActiveCfg = Release|Any CPU - {340D9FED-D387-4B53-B76B-C6CB2A90C438}.Release|Any CPU.Build.0 = Release|Any CPU - {6D289E1F-D093-4A85-B16A-E94065F72142}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6D289E1F-D093-4A85-B16A-E94065F72142}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6D289E1F-D093-4A85-B16A-E94065F72142}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6D289E1F-D093-4A85-B16A-E94065F72142}.Release|Any CPU.Build.0 = Release|Any CPU - {05BAD7D1-2976-465D-8A97-508F0AEEC25D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {05BAD7D1-2976-465D-8A97-508F0AEEC25D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {05BAD7D1-2976-465D-8A97-508F0AEEC25D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {05BAD7D1-2976-465D-8A97-508F0AEEC25D}.Release|Any CPU.Build.0 = Release|Any CPU - {8F39CB2C-3F3A-4AB7-89FA-2C6A5BA12EE0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8F39CB2C-3F3A-4AB7-89FA-2C6A5BA12EE0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8F39CB2C-3F3A-4AB7-89FA-2C6A5BA12EE0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8F39CB2C-3F3A-4AB7-89FA-2C6A5BA12EE0}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {F0368C7F-817A-46EB-9CDB-B28D215436E4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F0368C7F-817A-46EB-9CDB-B28D215436E4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F0368C7F-817A-46EB-9CDB-B28D215436E4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F0368C7F-817A-46EB-9CDB-B28D215436E4}.Release|Any CPU.Build.0 = Release|Any CPU - {23E7577B-9206-4E3E-8E8F-32302C960C00}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {23E7577B-9206-4E3E-8E8F-32302C960C00}.Debug|Any CPU.Build.0 = Debug|Any CPU - {23E7577B-9206-4E3E-8E8F-32302C960C00}.Release|Any CPU.ActiveCfg = Release|Any CPU - {23E7577B-9206-4E3E-8E8F-32302C960C00}.Release|Any CPU.Build.0 = Release|Any CPU - {CEE3E20C-ACAA-4492-9FCE-FFD0D6B2DA5B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CEE3E20C-ACAA-4492-9FCE-FFD0D6B2DA5B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CEE3E20C-ACAA-4492-9FCE-FFD0D6B2DA5B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CEE3E20C-ACAA-4492-9FCE-FFD0D6B2DA5B}.Release|Any CPU.Build.0 = Release|Any CPU - {1AAB062F-868D-4A5E-9271-40302DBF7EC6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1AAB062F-868D-4A5E-9271-40302DBF7EC6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1AAB062F-868D-4A5E-9271-40302DBF7EC6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1AAB062F-868D-4A5E-9271-40302DBF7EC6}.Release|Any CPU.Build.0 = Release|Any CPU - {AF09F8D1-F660-43DE-A18A-0863838EB90D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AF09F8D1-F660-43DE-A18A-0863838EB90D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AF09F8D1-F660-43DE-A18A-0863838EB90D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AF09F8D1-F660-43DE-A18A-0863838EB90D}.Release|Any CPU.Build.0 = Release|Any CPU - {F4EA7B1B-342F-4CB3-AD61-6D54F73CD2A5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F4EA7B1B-342F-4CB3-AD61-6D54F73CD2A5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F4EA7B1B-342F-4CB3-AD61-6D54F73CD2A5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F4EA7B1B-342F-4CB3-AD61-6D54F73CD2A5}.Release|Any CPU.Build.0 = Release|Any CPU - {340D9FED-D387-4B53-B76B-C6CB2A90C438}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {340D9FED-D387-4B53-B76B-C6CB2A90C438}.Debug|Any CPU.Build.0 = Debug|Any CPU - {340D9FED-D387-4B53-B76B-C6CB2A90C438}.Release|Any CPU.ActiveCfg = Release|Any CPU - {340D9FED-D387-4B53-B76B-C6CB2A90C438}.Release|Any CPU.Build.0 = Release|Any CPU - {6D289E1F-D093-4A85-B16A-E94065F72142}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6D289E1F-D093-4A85-B16A-E94065F72142}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6D289E1F-D093-4A85-B16A-E94065F72142}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6D289E1F-D093-4A85-B16A-E94065F72142}.Release|Any CPU.Build.0 = Release|Any CPU - {05BAD7D1-2976-465D-8A97-508F0AEEC25D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {05BAD7D1-2976-465D-8A97-508F0AEEC25D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {05BAD7D1-2976-465D-8A97-508F0AEEC25D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {05BAD7D1-2976-465D-8A97-508F0AEEC25D}.Release|Any CPU.Build.0 = Release|Any CPU - {8F39CB2C-3F3A-4AB7-89FA-2C6A5BA12EE0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8F39CB2C-3F3A-4AB7-89FA-2C6A5BA12EE0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8F39CB2C-3F3A-4AB7-89FA-2C6A5BA12EE0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8F39CB2C-3F3A-4AB7-89FA-2C6A5BA12EE0}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {55480C22-19F0-4883-80A8-E11690C56E80} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {8389A72A-3A07-43D6-95A0-FA3DD82CF1F6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {F5FFC6C2-F41C-40AC-8A63-2053A4BAB096} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {87FB6465-4CB0-4BCD-A51A-4288D39BBF96} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {49938D0E-EFD9-4A41-9699-0F910AD7D1AD} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {F0368C7F-817A-46EB-9CDB-B28D215436E4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {23E7577B-9206-4E3E-8E8F-32302C960C00} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {CEE3E20C-ACAA-4492-9FCE-FFD0D6B2DA5B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {1AAB062F-868D-4A5E-9271-40302DBF7EC6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {AF09F8D1-F660-43DE-A18A-0863838EB90D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F4EA7B1B-342F-4CB3-AD61-6D54F73CD2A5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {340D9FED-D387-4B53-B76B-C6CB2A90C438} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6D289E1F-D093-4A85-B16A-E94065F72142} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {05BAD7D1-2976-465D-8A97-508F0AEEC25D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8F39CB2C-3F3A-4AB7-89FA-2C6A5BA12EE0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {F0368C7F-817A-46EB-9CDB-B28D215436E4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {23E7577B-9206-4E3E-8E8F-32302C960C00} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {CEE3E20C-ACAA-4492-9FCE-FFD0D6B2DA5B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {1AAB062F-868D-4A5E-9271-40302DBF7EC6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {AF09F8D1-F660-43DE-A18A-0863838EB90D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F4EA7B1B-342F-4CB3-AD61-6D54F73CD2A5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {340D9FED-D387-4B53-B76B-C6CB2A90C438} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6D289E1F-D093-4A85-B16A-E94065F72142} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {05BAD7D1-2976-465D-8A97-508F0AEEC25D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8F39CB2C-3F3A-4AB7-89FA-2C6A5BA12EE0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {A2286EFA-3B5E-4B4C-A531-A71BECFDAA6C} diff --git a/sdk/src/Services/MediaLive/Properties/AssemblyInfo.cs b/sdk/src/Services/MediaLive/Properties/AssemblyInfo.cs index 4956d44a0441..583bf8c318f0 100644 --- a/sdk/src/Services/MediaLive/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/MediaLive/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.405.5")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.405.32")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/MediaPackage/Generated/AmazonMediaPackageConfig.cs b/sdk/src/Services/MediaPackage/Generated/AmazonMediaPackageConfig.cs index e8e910754957..98b8ca9c45cd 100644 --- a/sdk/src/Services/MediaPackage/Generated/AmazonMediaPackageConfig.cs +++ b/sdk/src/Services/MediaPackage/Generated/AmazonMediaPackageConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.MediaPackage public partial class AmazonMediaPackageConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("MediaPackage", "4.0.0.0"); private static readonly AmazonMediaPackageEndpointResolver EndpointResolver = new AmazonMediaPackageEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("MediaPackage", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("MediaPackage", "3.7.400.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/MediaPackage/MediaPackage.sln b/sdk/src/Services/MediaPackage/MediaPackage.sln index 8cde5ca484dc..4e1584bc3bb0 100644 --- a/sdk/src/Services/MediaPackage/MediaPackage.sln +++ b/sdk/src/Services/MediaPackage/MediaPackage.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {D9C66F5A-40E5-4351-BE84-50F6D006850A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {D9C66F5A-40E5-4351-BE84-50F6D006850A}.Debug|Any CPU.Build.0 = Debug|Any CPU {D9C66F5A-40E5-4351-BE84-50F6D006850A}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {E6C5947D-E297-4E5C-896F-6A134074BD4D}.Debug|Any CPU.Build.0 = Debug|Any CPU {E6C5947D-E297-4E5C-896F-6A134074BD4D}.Release|Any CPU.ActiveCfg = Release|Any CPU {E6C5947D-E297-4E5C-896F-6A134074BD4D}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {A2A84B7B-4DF0-4D98-A7A0-958C948603AC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A2A84B7B-4DF0-4D98-A7A0-958C948603AC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A2A84B7B-4DF0-4D98-A7A0-958C948603AC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A2A84B7B-4DF0-4D98-A7A0-958C948603AC}.Release|Any CPU.Build.0 = Release|Any CPU - {5D1E493A-D084-4E45-A494-A053AE3B460A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5D1E493A-D084-4E45-A494-A053AE3B460A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5D1E493A-D084-4E45-A494-A053AE3B460A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5D1E493A-D084-4E45-A494-A053AE3B460A}.Release|Any CPU.Build.0 = Release|Any CPU - {652A6ADD-FD4D-4026-9DB4-41F094DBD23C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {652A6ADD-FD4D-4026-9DB4-41F094DBD23C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {652A6ADD-FD4D-4026-9DB4-41F094DBD23C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {652A6ADD-FD4D-4026-9DB4-41F094DBD23C}.Release|Any CPU.Build.0 = Release|Any CPU - {33109A1B-1190-4187-9A99-B39D7131E12D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {33109A1B-1190-4187-9A99-B39D7131E12D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {33109A1B-1190-4187-9A99-B39D7131E12D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {33109A1B-1190-4187-9A99-B39D7131E12D}.Release|Any CPU.Build.0 = Release|Any CPU - {AC4F6A2C-DE12-4320-9E68-31B78323574B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AC4F6A2C-DE12-4320-9E68-31B78323574B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AC4F6A2C-DE12-4320-9E68-31B78323574B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AC4F6A2C-DE12-4320-9E68-31B78323574B}.Release|Any CPU.Build.0 = Release|Any CPU - {3E940354-2392-417C-A071-35701A2FCD68}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3E940354-2392-417C-A071-35701A2FCD68}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3E940354-2392-417C-A071-35701A2FCD68}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3E940354-2392-417C-A071-35701A2FCD68}.Release|Any CPU.Build.0 = Release|Any CPU - {66C517D7-2BB4-4012-A64B-CD626F092967}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {66C517D7-2BB4-4012-A64B-CD626F092967}.Debug|Any CPU.Build.0 = Debug|Any CPU - {66C517D7-2BB4-4012-A64B-CD626F092967}.Release|Any CPU.ActiveCfg = Release|Any CPU - {66C517D7-2BB4-4012-A64B-CD626F092967}.Release|Any CPU.Build.0 = Release|Any CPU - {480E6377-C9ED-41C8-98B8-06E24C4FBF8B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {480E6377-C9ED-41C8-98B8-06E24C4FBF8B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {480E6377-C9ED-41C8-98B8-06E24C4FBF8B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {480E6377-C9ED-41C8-98B8-06E24C4FBF8B}.Release|Any CPU.Build.0 = Release|Any CPU - {35D686F4-979C-4D26-9FA5-4EC80AF7C48A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {35D686F4-979C-4D26-9FA5-4EC80AF7C48A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {35D686F4-979C-4D26-9FA5-4EC80AF7C48A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {35D686F4-979C-4D26-9FA5-4EC80AF7C48A}.Release|Any CPU.Build.0 = Release|Any CPU - {EB22A86D-4F6B-4230-AF2D-29D157EE219D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EB22A86D-4F6B-4230-AF2D-29D157EE219D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EB22A86D-4F6B-4230-AF2D-29D157EE219D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EB22A86D-4F6B-4230-AF2D-29D157EE219D}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {A2A84B7B-4DF0-4D98-A7A0-958C948603AC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A2A84B7B-4DF0-4D98-A7A0-958C948603AC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A2A84B7B-4DF0-4D98-A7A0-958C948603AC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A2A84B7B-4DF0-4D98-A7A0-958C948603AC}.Release|Any CPU.Build.0 = Release|Any CPU - {5D1E493A-D084-4E45-A494-A053AE3B460A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5D1E493A-D084-4E45-A494-A053AE3B460A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5D1E493A-D084-4E45-A494-A053AE3B460A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5D1E493A-D084-4E45-A494-A053AE3B460A}.Release|Any CPU.Build.0 = Release|Any CPU - {652A6ADD-FD4D-4026-9DB4-41F094DBD23C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {652A6ADD-FD4D-4026-9DB4-41F094DBD23C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {652A6ADD-FD4D-4026-9DB4-41F094DBD23C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {652A6ADD-FD4D-4026-9DB4-41F094DBD23C}.Release|Any CPU.Build.0 = Release|Any CPU - {33109A1B-1190-4187-9A99-B39D7131E12D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {33109A1B-1190-4187-9A99-B39D7131E12D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {33109A1B-1190-4187-9A99-B39D7131E12D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {33109A1B-1190-4187-9A99-B39D7131E12D}.Release|Any CPU.Build.0 = Release|Any CPU - {AC4F6A2C-DE12-4320-9E68-31B78323574B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AC4F6A2C-DE12-4320-9E68-31B78323574B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AC4F6A2C-DE12-4320-9E68-31B78323574B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AC4F6A2C-DE12-4320-9E68-31B78323574B}.Release|Any CPU.Build.0 = Release|Any CPU - {3E940354-2392-417C-A071-35701A2FCD68}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3E940354-2392-417C-A071-35701A2FCD68}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3E940354-2392-417C-A071-35701A2FCD68}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3E940354-2392-417C-A071-35701A2FCD68}.Release|Any CPU.Build.0 = Release|Any CPU - {66C517D7-2BB4-4012-A64B-CD626F092967}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {66C517D7-2BB4-4012-A64B-CD626F092967}.Debug|Any CPU.Build.0 = Debug|Any CPU - {66C517D7-2BB4-4012-A64B-CD626F092967}.Release|Any CPU.ActiveCfg = Release|Any CPU - {66C517D7-2BB4-4012-A64B-CD626F092967}.Release|Any CPU.Build.0 = Release|Any CPU - {480E6377-C9ED-41C8-98B8-06E24C4FBF8B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {480E6377-C9ED-41C8-98B8-06E24C4FBF8B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {480E6377-C9ED-41C8-98B8-06E24C4FBF8B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {480E6377-C9ED-41C8-98B8-06E24C4FBF8B}.Release|Any CPU.Build.0 = Release|Any CPU - {35D686F4-979C-4D26-9FA5-4EC80AF7C48A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {35D686F4-979C-4D26-9FA5-4EC80AF7C48A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {35D686F4-979C-4D26-9FA5-4EC80AF7C48A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {35D686F4-979C-4D26-9FA5-4EC80AF7C48A}.Release|Any CPU.Build.0 = Release|Any CPU - {EB22A86D-4F6B-4230-AF2D-29D157EE219D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EB22A86D-4F6B-4230-AF2D-29D157EE219D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EB22A86D-4F6B-4230-AF2D-29D157EE219D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EB22A86D-4F6B-4230-AF2D-29D157EE219D}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {D9C66F5A-40E5-4351-BE84-50F6D006850A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {1E9A0B49-243F-49FA-B682-843022391A4F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {D51FCF4D-20DD-4A14-9822-BDC05DA51B11} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {3698DFA8-02AA-4375-8880-A3383811A268} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {E6C5947D-E297-4E5C-896F-6A134074BD4D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {A2A84B7B-4DF0-4D98-A7A0-958C948603AC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {5D1E493A-D084-4E45-A494-A053AE3B460A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {652A6ADD-FD4D-4026-9DB4-41F094DBD23C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {33109A1B-1190-4187-9A99-B39D7131E12D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {AC4F6A2C-DE12-4320-9E68-31B78323574B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {3E940354-2392-417C-A071-35701A2FCD68} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {66C517D7-2BB4-4012-A64B-CD626F092967} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {480E6377-C9ED-41C8-98B8-06E24C4FBF8B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {35D686F4-979C-4D26-9FA5-4EC80AF7C48A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {EB22A86D-4F6B-4230-AF2D-29D157EE219D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {A2A84B7B-4DF0-4D98-A7A0-958C948603AC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {5D1E493A-D084-4E45-A494-A053AE3B460A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {652A6ADD-FD4D-4026-9DB4-41F094DBD23C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {33109A1B-1190-4187-9A99-B39D7131E12D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {AC4F6A2C-DE12-4320-9E68-31B78323574B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {3E940354-2392-417C-A071-35701A2FCD68} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {66C517D7-2BB4-4012-A64B-CD626F092967} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {480E6377-C9ED-41C8-98B8-06E24C4FBF8B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {35D686F4-979C-4D26-9FA5-4EC80AF7C48A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {EB22A86D-4F6B-4230-AF2D-29D157EE219D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {82A0138B-1D00-4DCE-8C39-ED3052480FDE} diff --git a/sdk/src/Services/MediaPackage/Properties/AssemblyInfo.cs b/sdk/src/Services/MediaPackage/Properties/AssemblyInfo.cs index 01f4329a5f25..f784135590af 100644 --- a/sdk/src/Services/MediaPackage/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/MediaPackage/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/MediaPackageV2/Generated/AmazonMediaPackageV2Config.cs b/sdk/src/Services/MediaPackageV2/Generated/AmazonMediaPackageV2Config.cs index da9280cdbf5e..ee82cfd1f00c 100644 --- a/sdk/src/Services/MediaPackageV2/Generated/AmazonMediaPackageV2Config.cs +++ b/sdk/src/Services/MediaPackageV2/Generated/AmazonMediaPackageV2Config.cs @@ -34,16 +34,10 @@ namespace Amazon.MediaPackageV2 public partial class AmazonMediaPackageV2Config : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("MediaPackageV2", "4.0.0.0"); private static readonly AmazonMediaPackageV2EndpointResolver EndpointResolver = new AmazonMediaPackageV2EndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("MediaPackageV2", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("MediaPackageV2", "3.7.402.12"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/MediaPackageV2/Generated/Model/CreateHarvestJobResponse.cs b/sdk/src/Services/MediaPackageV2/Generated/Model/CreateHarvestJobResponse.cs index 04d6c5f9d535..4c721e5fdc14 100644 --- a/sdk/src/Services/MediaPackageV2/Generated/Model/CreateHarvestJobResponse.cs +++ b/sdk/src/Services/MediaPackageV2/Generated/Model/CreateHarvestJobResponse.cs @@ -114,9 +114,9 @@ internal bool IsSetChannelName() /// /// [AWSProperty(Required=true)] - public DateTime CreatedAt + public DateTime? CreatedAt { - get { return this._createdAt.GetValueOrDefault(); } + get { return this._createdAt; } set { this._createdAt = value; } } @@ -246,9 +246,9 @@ internal bool IsSetHarvestJobName() /// /// [AWSProperty(Required=true)] - public DateTime ModifiedAt + public DateTime? ModifiedAt { - get { return this._modifiedAt.GetValueOrDefault(); } + get { return this._modifiedAt; } set { this._modifiedAt = value; } } diff --git a/sdk/src/Services/MediaPackageV2/Generated/Model/FilterConfiguration.cs b/sdk/src/Services/MediaPackageV2/Generated/Model/FilterConfiguration.cs index 70a56036cebf..45dbb941aa5d 100644 --- a/sdk/src/Services/MediaPackageV2/Generated/Model/FilterConfiguration.cs +++ b/sdk/src/Services/MediaPackageV2/Generated/Model/FilterConfiguration.cs @@ -49,9 +49,9 @@ public partial class FilterConfiguration /// for this manifest's endpoint URL. /// /// - public DateTime ClipStartTime + public DateTime? ClipStartTime { - get { return this._clipStartTime.GetValueOrDefault(); } + get { return this._clipStartTime; } set { this._clipStartTime = value; } } diff --git a/sdk/src/Services/MediaPackageV2/Generated/Model/GetHarvestJobResponse.cs b/sdk/src/Services/MediaPackageV2/Generated/Model/GetHarvestJobResponse.cs index 7a8ee5c5a43a..e81b8a543b39 100644 --- a/sdk/src/Services/MediaPackageV2/Generated/Model/GetHarvestJobResponse.cs +++ b/sdk/src/Services/MediaPackageV2/Generated/Model/GetHarvestJobResponse.cs @@ -114,9 +114,9 @@ internal bool IsSetChannelName() /// /// [AWSProperty(Required=true)] - public DateTime CreatedAt + public DateTime? CreatedAt { - get { return this._createdAt.GetValueOrDefault(); } + get { return this._createdAt; } set { this._createdAt = value; } } @@ -246,9 +246,9 @@ internal bool IsSetHarvestJobName() /// /// [AWSProperty(Required=true)] - public DateTime ModifiedAt + public DateTime? ModifiedAt { - get { return this._modifiedAt.GetValueOrDefault(); } + get { return this._modifiedAt; } set { this._modifiedAt = value; } } diff --git a/sdk/src/Services/MediaPackageV2/Generated/Model/HarvestJob.cs b/sdk/src/Services/MediaPackageV2/Generated/Model/HarvestJob.cs index e4c15a99747e..8a7b71c716ba 100644 --- a/sdk/src/Services/MediaPackageV2/Generated/Model/HarvestJob.cs +++ b/sdk/src/Services/MediaPackageV2/Generated/Model/HarvestJob.cs @@ -115,9 +115,9 @@ internal bool IsSetChannelName() /// ///     [AWSProperty(Required=true)] - public DateTime CreatedAt + public DateTime? CreatedAt { - get { return this._createdAt.GetValueOrDefault(); } + get { return this._createdAt; } set { this._createdAt = value; } } @@ -247,9 +247,9 @@ internal bool IsSetHarvestJobName() /// ///     [AWSProperty(Required=true)] - public DateTime ModifiedAt + public DateTime? ModifiedAt { - get { return this._modifiedAt.GetValueOrDefault(); } + get { return this._modifiedAt; } set { this._modifiedAt = value; } } diff --git a/sdk/src/Services/MediaPackageV2/Generated/Model/HarvesterScheduleConfiguration.cs b/sdk/src/Services/MediaPackageV2/Generated/Model/HarvesterScheduleConfiguration.cs index d8b369dfaa94..638f95a164ce 100644 --- a/sdk/src/Services/MediaPackageV2/Generated/Model/HarvesterScheduleConfiguration.cs +++ b/sdk/src/Services/MediaPackageV2/Generated/Model/HarvesterScheduleConfiguration.cs @@ -44,9 +44,9 @@ public partial class HarvesterScheduleConfiguration /// ///     [AWSProperty(Required=true)] - public DateTime EndTime + public DateTime? EndTime { - get { return this._endTime.GetValueOrDefault(); } + get { return this._endTime; } set { this._endTime = value; } } @@ -63,9 +63,9 @@ internal bool IsSetEndTime() /// ///     [AWSProperty(Required=true)] - public DateTime StartTime + public DateTime? StartTime { - get { return this._startTime.GetValueOrDefault(); } + get { return this._startTime; } set { this._startTime = value; } } diff --git a/sdk/src/Services/MediaPackageV2/Generated/Model/Internal/MarshallTransformations/CreateHarvestJobRequestMarshaller.cs b/sdk/src/Services/MediaPackageV2/Generated/Model/Internal/MarshallTransformations/CreateHarvestJobRequestMarshaller.cs index 9179f229db29..a74674b12176 100644 --- a/sdk/src/Services/MediaPackageV2/Generated/Model/Internal/MarshallTransformations/CreateHarvestJobRequestMarshaller.cs +++ b/sdk/src/Services/MediaPackageV2/Generated/Model/Internal/MarshallTransformations/CreateHarvestJobRequestMarshaller.cs @@ -70,74 +70,77 @@ public IRequest Marshall(CreateHarvestJobRequest publicRequest) throw new AmazonMediaPackageV2Exception("Request object does not have required field OriginEndpointName set"); request.AddPathResource("{OriginEndpointName}", StringUtils.FromString(publicRequest.OriginEndpointName)); request.ResourcePath = "/channelGroup/{ChannelGroupName}/channel/{ChannelName}/originEndpoint/{OriginEndpointName}/harvestJob"; - using (StringWriter stringWriter = new StringWriter(CultureInfo.InvariantCulture)) + using (MemoryStream memoryStream = new MemoryStream()) { - JsonWriter writer = new JsonWriter(stringWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetDescription()) + using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) { - context.Writer.WritePropertyName("Description"); - context.Writer.Write(publicRequest.Description); - } + JsonWriter writer = new JsonWriter(streamWriter); + writer.Validate = false; + writer.WriteObjectStart(); + var context = new JsonMarshallerContext(request, writer); + if(publicRequest.IsSetDescription()) + { + context.Writer.WritePropertyName("Description"); + context.Writer.Write(publicRequest.Description); + } - if(publicRequest.IsSetDestination()) - { - context.Writer.WritePropertyName("Destination"); - context.Writer.WriteObjectStart(); + if(publicRequest.IsSetDestination()) + { + context.Writer.WritePropertyName("Destination"); + context.Writer.WriteObjectStart(); - var marshaller = DestinationMarshaller.Instance; - marshaller.Marshall(publicRequest.Destination, context); + var marshaller = DestinationMarshaller.Instance; + marshaller.Marshall(publicRequest.Destination, context); - context.Writer.WriteObjectEnd(); - } + context.Writer.WriteObjectEnd(); + } - if(publicRequest.IsSetHarvestedManifests()) - { - context.Writer.WritePropertyName("HarvestedManifests"); - context.Writer.WriteObjectStart(); + if(publicRequest.IsSetHarvestedManifests()) + { + context.Writer.WritePropertyName("HarvestedManifests"); + context.Writer.WriteObjectStart(); - var marshaller = HarvestedManifestsMarshaller.Instance; - marshaller.Marshall(publicRequest.HarvestedManifests, context); + var marshaller = HarvestedManifestsMarshaller.Instance; + marshaller.Marshall(publicRequest.HarvestedManifests, context); - context.Writer.WriteObjectEnd(); - } + context.Writer.WriteObjectEnd(); + } - if(publicRequest.IsSetHarvestJobName()) - { - context.Writer.WritePropertyName("HarvestJobName"); - context.Writer.Write(publicRequest.HarvestJobName); - } + if(publicRequest.IsSetHarvestJobName()) + { + context.Writer.WritePropertyName("HarvestJobName"); + context.Writer.Write(publicRequest.HarvestJobName); + } - if(publicRequest.IsSetScheduleConfiguration()) - { - context.Writer.WritePropertyName("ScheduleConfiguration"); - context.Writer.WriteObjectStart(); + if(publicRequest.IsSetScheduleConfiguration()) + { + context.Writer.WritePropertyName("ScheduleConfiguration"); + context.Writer.WriteObjectStart(); - var marshaller = HarvesterScheduleConfigurationMarshaller.Instance; - marshaller.Marshall(publicRequest.ScheduleConfiguration, context); + var marshaller = HarvesterScheduleConfigurationMarshaller.Instance; + marshaller.Marshall(publicRequest.ScheduleConfiguration, context); - context.Writer.WriteObjectEnd(); - } + context.Writer.WriteObjectEnd(); + } - if(publicRequest.IsSetTags()) - { - context.Writer.WritePropertyName("Tags"); - context.Writer.WriteObjectStart(); - foreach (var publicRequestTagsKvp in publicRequest.Tags) + if(publicRequest.IsSetTags()) { - context.Writer.WritePropertyName(publicRequestTagsKvp.Key); - var publicRequestTagsValue = publicRequestTagsKvp.Value; - - context.Writer.Write(publicRequestTagsValue); + context.Writer.WritePropertyName("Tags"); + context.Writer.WriteObjectStart(); + foreach (var publicRequestTagsKvp in publicRequest.Tags) + { + context.Writer.WritePropertyName(publicRequestTagsKvp.Key); + var publicRequestTagsValue = publicRequestTagsKvp.Value; + + context.Writer.Write(publicRequestTagsValue); + } + context.Writer.WriteObjectEnd(); } - context.Writer.WriteObjectEnd(); + + writer.WriteObjectEnd(); } - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); + request.Content = memoryStream.ToArray(); } diff --git a/sdk/src/Services/MediaPackageV2/Generated/Model/Internal/MarshallTransformations/CreateHarvestJobResponseUnmarshaller.cs b/sdk/src/Services/MediaPackageV2/Generated/Model/Internal/MarshallTransformations/CreateHarvestJobResponseUnmarshaller.cs index 7de5d90acc70..964de9d5b0f2 100644 --- a/sdk/src/Services/MediaPackageV2/Generated/Model/Internal/MarshallTransformations/CreateHarvestJobResponseUnmarshaller.cs +++ b/sdk/src/Services/MediaPackageV2/Generated/Model/Internal/MarshallTransformations/CreateHarvestJobResponseUnmarshaller.cs @@ -72,7 +72,7 @@ public override AmazonWebServiceResponse Unmarshall(JsonUnmarshallerContext cont } if (context.TestExpression("CreatedAt", targetDepth)) { - var unmarshaller = DateTimeUnmarshaller.Instance; + var unmarshaller = NullableDateTimeUnmarshaller.Instance; response.CreatedAt = unmarshaller.Unmarshall(context); continue; } @@ -114,7 +114,7 @@ public override AmazonWebServiceResponse Unmarshall(JsonUnmarshallerContext cont } if (context.TestExpression("ModifiedAt", targetDepth)) { - var unmarshaller = DateTimeUnmarshaller.Instance; + var unmarshaller = NullableDateTimeUnmarshaller.Instance; response.ModifiedAt = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/MediaPackageV2/Generated/Model/Internal/MarshallTransformations/FilterConfigurationMarshaller.cs b/sdk/src/Services/MediaPackageV2/Generated/Model/Internal/MarshallTransformations/FilterConfigurationMarshaller.cs index 961d522405fb..43ce7fb852fc 100644 --- a/sdk/src/Services/MediaPackageV2/Generated/Model/Internal/MarshallTransformations/FilterConfigurationMarshaller.cs +++ b/sdk/src/Services/MediaPackageV2/Generated/Model/Internal/MarshallTransformations/FilterConfigurationMarshaller.cs @@ -51,7 +51,7 @@ public void Marshall(FilterConfiguration requestObject, JsonMarshallerContext co if(requestObject.IsSetClipStartTime()) { context.Writer.WritePropertyName("ClipStartTime"); - context.Writer.Write(requestObject.ClipStartTime); + context.Writer.Write(requestObject.ClipStartTime.Value); } if(requestObject.IsSetEnd()) diff --git a/sdk/src/Services/MediaPackageV2/Generated/Model/Internal/MarshallTransformations/FilterConfigurationUnmarshaller.cs b/sdk/src/Services/MediaPackageV2/Generated/Model/Internal/MarshallTransformations/FilterConfigurationUnmarshaller.cs index f7eb3f9361a2..153aad6e7f02 100644 --- a/sdk/src/Services/MediaPackageV2/Generated/Model/Internal/MarshallTransformations/FilterConfigurationUnmarshaller.cs +++ b/sdk/src/Services/MediaPackageV2/Generated/Model/Internal/MarshallTransformations/FilterConfigurationUnmarshaller.cs @@ -68,7 +68,7 @@ public FilterConfiguration Unmarshall(JsonUnmarshallerContext context) { if (context.TestExpression("ClipStartTime", targetDepth)) { - var unmarshaller = DateTimeUnmarshaller.Instance; + var unmarshaller = NullableDateTimeUnmarshaller.Instance; unmarshalledObject.ClipStartTime = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/MediaPackageV2/Generated/Model/Internal/MarshallTransformations/GetHarvestJobResponseUnmarshaller.cs b/sdk/src/Services/MediaPackageV2/Generated/Model/Internal/MarshallTransformations/GetHarvestJobResponseUnmarshaller.cs index a70120491a35..deeb86731c02 100644 --- a/sdk/src/Services/MediaPackageV2/Generated/Model/Internal/MarshallTransformations/GetHarvestJobResponseUnmarshaller.cs +++ b/sdk/src/Services/MediaPackageV2/Generated/Model/Internal/MarshallTransformations/GetHarvestJobResponseUnmarshaller.cs @@ -72,7 +72,7 @@ public override AmazonWebServiceResponse Unmarshall(JsonUnmarshallerContext cont } if (context.TestExpression("CreatedAt", targetDepth)) { - var unmarshaller = DateTimeUnmarshaller.Instance; + var unmarshaller = NullableDateTimeUnmarshaller.Instance; response.CreatedAt = unmarshaller.Unmarshall(context); continue; } @@ -114,7 +114,7 @@ public override AmazonWebServiceResponse Unmarshall(JsonUnmarshallerContext cont } if (context.TestExpression("ModifiedAt", targetDepth)) { - var unmarshaller = DateTimeUnmarshaller.Instance; + var unmarshaller = NullableDateTimeUnmarshaller.Instance; response.ModifiedAt = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/MediaPackageV2/Generated/Model/Internal/MarshallTransformations/HarvestJobUnmarshaller.cs b/sdk/src/Services/MediaPackageV2/Generated/Model/Internal/MarshallTransformations/HarvestJobUnmarshaller.cs index 710194d780c2..23bdeeda89f0 100644 --- a/sdk/src/Services/MediaPackageV2/Generated/Model/Internal/MarshallTransformations/HarvestJobUnmarshaller.cs +++ b/sdk/src/Services/MediaPackageV2/Generated/Model/Internal/MarshallTransformations/HarvestJobUnmarshaller.cs @@ -86,7 +86,7 @@ public HarvestJob Unmarshall(JsonUnmarshallerContext context) } if (context.TestExpression("CreatedAt", targetDepth)) { - var unmarshaller = DateTimeUnmarshaller.Instance; + var unmarshaller = NullableDateTimeUnmarshaller.Instance; unmarshalledObject.CreatedAt = unmarshaller.Unmarshall(context); continue; } @@ -128,7 +128,7 @@ public HarvestJob Unmarshall(JsonUnmarshallerContext context) } if (context.TestExpression("ModifiedAt", targetDepth)) { - var unmarshaller = DateTimeUnmarshaller.Instance; + var unmarshaller = NullableDateTimeUnmarshaller.Instance; unmarshalledObject.ModifiedAt = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/MediaPackageV2/Generated/Model/Internal/MarshallTransformations/HarvesterScheduleConfigurationMarshaller.cs b/sdk/src/Services/MediaPackageV2/Generated/Model/Internal/MarshallTransformations/HarvesterScheduleConfigurationMarshaller.cs index f4078cc3b292..5eeacfa6365e 100644 --- a/sdk/src/Services/MediaPackageV2/Generated/Model/Internal/MarshallTransformations/HarvesterScheduleConfigurationMarshaller.cs +++ b/sdk/src/Services/MediaPackageV2/Generated/Model/Internal/MarshallTransformations/HarvesterScheduleConfigurationMarshaller.cs @@ -51,13 +51,13 @@ public void Marshall(HarvesterScheduleConfiguration requestObject, JsonMarshalle if(requestObject.IsSetEndTime()) { context.Writer.WritePropertyName("EndTime"); - context.Writer.Write(requestObject.EndTime); + context.Writer.Write(requestObject.EndTime.Value); } if(requestObject.IsSetStartTime()) { context.Writer.WritePropertyName("StartTime"); - context.Writer.Write(requestObject.StartTime); + context.Writer.Write(requestObject.StartTime.Value); } } diff --git a/sdk/src/Services/MediaPackageV2/Generated/Model/Internal/MarshallTransformations/HarvesterScheduleConfigurationUnmarshaller.cs b/sdk/src/Services/MediaPackageV2/Generated/Model/Internal/MarshallTransformations/HarvesterScheduleConfigurationUnmarshaller.cs index 6039fce64a37..9024520f741a 100644 --- a/sdk/src/Services/MediaPackageV2/Generated/Model/Internal/MarshallTransformations/HarvesterScheduleConfigurationUnmarshaller.cs +++ b/sdk/src/Services/MediaPackageV2/Generated/Model/Internal/MarshallTransformations/HarvesterScheduleConfigurationUnmarshaller.cs @@ -68,13 +68,13 @@ public HarvesterScheduleConfiguration Unmarshall(JsonUnmarshallerContext context { if (context.TestExpression("EndTime", targetDepth)) { - var unmarshaller = DateTimeUnmarshaller.Instance; + var unmarshaller = NullableDateTimeUnmarshaller.Instance; unmarshalledObject.EndTime = unmarshaller.Unmarshall(context); continue; } if (context.TestExpression("StartTime", targetDepth)) { - var unmarshaller = DateTimeUnmarshaller.Instance; + var unmarshaller = NullableDateTimeUnmarshaller.Instance; unmarshalledObject.StartTime = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/MediaPackageV2/Generated/Model/Internal/MarshallTransformations/StartTagMarshaller.cs b/sdk/src/Services/MediaPackageV2/Generated/Model/Internal/MarshallTransformations/StartTagMarshaller.cs index ccdbbd9e46ad..6d3fa9342437 100644 --- a/sdk/src/Services/MediaPackageV2/Generated/Model/Internal/MarshallTransformations/StartTagMarshaller.cs +++ b/sdk/src/Services/MediaPackageV2/Generated/Model/Internal/MarshallTransformations/StartTagMarshaller.cs @@ -51,19 +51,19 @@ public void Marshall(StartTag requestObject, JsonMarshallerContext context) if(requestObject.IsSetPrecise()) { context.Writer.WritePropertyName("Precise"); - context.Writer.Write(requestObject.Precise); + context.Writer.Write(requestObject.Precise.Value); } if(requestObject.IsSetTimeOffset()) { context.Writer.WritePropertyName("TimeOffset"); - if(StringUtils.IsSpecialFloatValue(requestObject.TimeOffset)) + if(StringUtils.IsSpecialFloatValue(requestObject.TimeOffset.Value)) { - context.Writer.Write(StringUtils.FromSpecialFloatValue(requestObject.TimeOffset)); + context.Writer.Write(StringUtils.FromSpecialFloatValue(requestObject.TimeOffset.Value)); } else { - context.Writer.Write(requestObject.TimeOffset); + context.Writer.Write(requestObject.TimeOffset.Value); } } diff --git a/sdk/src/Services/MediaPackageV2/Generated/Model/Internal/MarshallTransformations/StartTagUnmarshaller.cs b/sdk/src/Services/MediaPackageV2/Generated/Model/Internal/MarshallTransformations/StartTagUnmarshaller.cs index 78adc573debf..a80f0cddee3c 100644 --- a/sdk/src/Services/MediaPackageV2/Generated/Model/Internal/MarshallTransformations/StartTagUnmarshaller.cs +++ b/sdk/src/Services/MediaPackageV2/Generated/Model/Internal/MarshallTransformations/StartTagUnmarshaller.cs @@ -68,13 +68,13 @@ public StartTag Unmarshall(JsonUnmarshallerContext context) { if (context.TestExpression("Precise", targetDepth)) { - var unmarshaller = BoolUnmarshaller.Instance; + var unmarshaller = NullableBoolUnmarshaller.Instance; unmarshalledObject.Precise = unmarshaller.Unmarshall(context); continue; } if (context.TestExpression("TimeOffset", targetDepth)) { - var unmarshaller = FloatUnmarshaller.Instance; + var unmarshaller = NullableFloatUnmarshaller.Instance; unmarshalledObject.TimeOffset = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/MediaPackageV2/Generated/Model/ListHarvestJobsRequest.cs b/sdk/src/Services/MediaPackageV2/Generated/Model/ListHarvestJobsRequest.cs index 316a68a8896a..829da2c86c14 100644 --- a/sdk/src/Services/MediaPackageV2/Generated/Model/ListHarvestJobsRequest.cs +++ b/sdk/src/Services/MediaPackageV2/Generated/Model/ListHarvestJobsRequest.cs @@ -90,9 +90,9 @@ internal bool IsSetChannelName() /// ///     [AWSProperty(Min=1, Max=100)] - public int MaxResults + public int? MaxResults { - get { return this._maxResults.GetValueOrDefault(); } + get { return this._maxResults; } set { this._maxResults = value; } } diff --git a/sdk/src/Services/MediaPackageV2/Generated/Model/StartTag.cs b/sdk/src/Services/MediaPackageV2/Generated/Model/StartTag.cs index ed2bfa29d779..c7a35ae78f26 100644 --- a/sdk/src/Services/MediaPackageV2/Generated/Model/StartTag.cs +++ b/sdk/src/Services/MediaPackageV2/Generated/Model/StartTag.cs @@ -46,9 +46,9 @@ public partial class StartTag /// false, to use the default value NO. Choose yes to use the value YES. /// ///     - public bool Precise + public bool? Precise { - get { return this._precise.GetValueOrDefault(); } + get { return this._precise; } set { this._precise = value; } } @@ -69,9 +69,9 @@ internal bool IsSetPrecise() /// ///     [AWSProperty(Required=true)] - public float TimeOffset + public float? TimeOffset { - get { return this._timeOffset.GetValueOrDefault(); } + get { return this._timeOffset; } set { this._timeOffset = value; } } diff --git a/sdk/src/Services/MediaPackageV2/Generated/Model/_bcl45+netstandard/IListHarvestJobsPaginator.cs b/sdk/src/Services/MediaPackageV2/Generated/Model/_bcl+netstandard/IListHarvestJobsPaginator.cs similarity index 100% rename from sdk/src/Services/MediaPackageV2/Generated/Model/_bcl45+netstandard/IListHarvestJobsPaginator.cs rename to sdk/src/Services/MediaPackageV2/Generated/Model/_bcl+netstandard/IListHarvestJobsPaginator.cs diff --git a/sdk/src/Services/MediaPackageV2/Generated/Model/_bcl45+netstandard/ListHarvestJobsPaginator.cs b/sdk/src/Services/MediaPackageV2/Generated/Model/_bcl+netstandard/ListHarvestJobsPaginator.cs similarity index 100% rename from sdk/src/Services/MediaPackageV2/Generated/Model/_bcl45+netstandard/ListHarvestJobsPaginator.cs rename to sdk/src/Services/MediaPackageV2/Generated/Model/_bcl+netstandard/ListHarvestJobsPaginator.cs diff --git a/sdk/src/Services/MediaPackageV2/Generated/_bcl/AmazonMediaPackageV2Client.cs b/sdk/src/Services/MediaPackageV2/Generated/_bcl/AmazonMediaPackageV2Client.cs index ba822417fe43..7dc2e0fffe5e 100644 --- a/sdk/src/Services/MediaPackageV2/Generated/_bcl/AmazonMediaPackageV2Client.cs +++ b/sdk/src/Services/MediaPackageV2/Generated/_bcl/AmazonMediaPackageV2Client.cs @@ -296,6 +296,89 @@ protected override void Dispose(bool disposing) #endregion + #region CancelHarvestJob + + + /// + /// Cancels an in-progress harvest job. + /// + /// Container for the necessary parameters to execute the CancelHarvestJob service method. + /// + /// The response from the CancelHarvestJob service method, as returned by MediaPackageV2. + /// + /// You don't have permissions to perform the requested operation. The user or role that + /// is making the request must have at least one IAM permissions policy attached that + /// grants the required permissions. For more information, see Access Management in the + /// IAM User Guide. + /// + /// + /// Updating or deleting this resource can cause an inconsistent state. + /// + /// + /// Indicates that an error from the service occurred while trying to process a request. + /// + /// + /// The specified resource doesn't exist. + /// + /// + /// The request throughput limit was exceeded. + /// + /// + /// The input failed to meet the constraints specified by the AWS service. + /// + /// REST API Reference for CancelHarvestJob Operation + public virtual CancelHarvestJobResponse CancelHarvestJob(CancelHarvestJobRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = CancelHarvestJobRequestMarshaller.Instance; + options.ResponseUnmarshaller = CancelHarvestJobResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// Cancels an in-progress harvest job. + /// + /// Container for the necessary parameters to execute the CancelHarvestJob service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the CancelHarvestJob service method, as returned by MediaPackageV2. + /// + /// You don't have permissions to perform the requested operation. The user or role that + /// is making the request must have at least one IAM permissions policy attached that + /// grants the required permissions. For more information, see Access Management in the + /// IAM User Guide. + /// + /// + /// Updating or deleting this resource can cause an inconsistent state. + /// + /// + /// Indicates that an error from the service occurred while trying to process a request. + /// + /// + /// The specified resource doesn't exist. + /// + /// + /// The request throughput limit was exceeded. + /// + /// + /// The input failed to meet the constraints specified by the AWS service. + /// + /// REST API Reference for CancelHarvestJob Operation + public virtual Task CancelHarvestJobAsync(CancelHarvestJobRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = CancelHarvestJobRequestMarshaller.Instance; + options.ResponseUnmarshaller = CancelHarvestJobResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + #region CreateChannel @@ -494,6 +577,97 @@ public virtual CreateChannelGroupResponse CreateChannelGroup(CreateChannelGroupR #endregion + #region CreateHarvestJob + + + /// + /// Creates a new harvest job to export content from a MediaPackage v2 channel to an S3 + /// bucket. + /// + /// Container for the necessary parameters to execute the CreateHarvestJob service method. + /// + /// The response from the CreateHarvestJob service method, as returned by MediaPackageV2. + /// + /// You don't have permissions to perform the requested operation. The user or role that + /// is making the request must have at least one IAM permissions policy attached that + /// grants the required permissions. For more information, see Access Management in the + /// IAM User Guide. + /// + /// + /// Updating or deleting this resource can cause an inconsistent state. + /// + /// + /// Indicates that an error from the service occurred while trying to process a request. + /// + /// + /// The specified resource doesn't exist. + /// + /// + /// The request would cause a service quota to be exceeded. + /// + /// + /// The request throughput limit was exceeded. + /// + /// + /// The input failed to meet the constraints specified by the AWS service. + /// + /// REST API Reference for CreateHarvestJob Operation + public virtual CreateHarvestJobResponse CreateHarvestJob(CreateHarvestJobRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = CreateHarvestJobRequestMarshaller.Instance; + options.ResponseUnmarshaller = CreateHarvestJobResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// Creates a new harvest job to export content from a MediaPackage v2 channel to an S3 + /// bucket. + /// + /// Container for the necessary parameters to execute the CreateHarvestJob service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the CreateHarvestJob service method, as returned by MediaPackageV2. + /// + /// You don't have permissions to perform the requested operation. The user or role that + /// is making the request must have at least one IAM permissions policy attached that + /// grants the required permissions. For more information, see Access Management in the + /// IAM User Guide. + /// + /// + /// Updating or deleting this resource can cause an inconsistent state. + /// + /// + /// Indicates that an error from the service occurred while trying to process a request. + /// + /// + /// The specified resource doesn't exist. + /// + /// + /// The request would cause a service quota to be exceeded. + /// + /// + /// The request throughput limit was exceeded. + /// + /// + /// The input failed to meet the constraints specified by the AWS service. + /// + /// REST API Reference for CreateHarvestJob Operation + public virtual Task CreateHarvestJobAsync(CreateHarvestJobRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = CreateHarvestJobRequestMarshaller.Instance; + options.ResponseUnmarshaller = CreateHarvestJobResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + #region CreateOriginEndpoint @@ -1221,6 +1395,83 @@ public virtual GetChannelPolicyResponse GetChannelPolicy(GetChannelPolicyRequest #endregion + #region GetHarvestJob + + + /// + /// Retrieves the details of a specific harvest job. + /// + /// Container for the necessary parameters to execute the GetHarvestJob service method. + /// + /// The response from the GetHarvestJob service method, as returned by MediaPackageV2. + /// + /// You don't have permissions to perform the requested operation. The user or role that + /// is making the request must have at least one IAM permissions policy attached that + /// grants the required permissions. For more information, see Access Management in the + /// IAM User Guide. + /// + /// + /// Indicates that an error from the service occurred while trying to process a request. + /// + /// + /// The specified resource doesn't exist. + /// + /// + /// The request throughput limit was exceeded. + /// + /// + /// The input failed to meet the constraints specified by the AWS service. + /// + /// REST API Reference for GetHarvestJob Operation + public virtual GetHarvestJobResponse GetHarvestJob(GetHarvestJobRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = GetHarvestJobRequestMarshaller.Instance; + options.ResponseUnmarshaller = GetHarvestJobResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// Retrieves the details of a specific harvest job. + /// + /// Container for the necessary parameters to execute the GetHarvestJob service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the GetHarvestJob service method, as returned by MediaPackageV2. + /// + /// You don't have permissions to perform the requested operation. The user or role that + /// is making the request must have at least one IAM permissions policy attached that + /// grants the required permissions. For more information, see Access Management in the + /// IAM User Guide. + /// + /// + /// Indicates that an error from the service occurred while trying to process a request. + /// + /// + /// The specified resource doesn't exist. + /// + /// + /// The request throughput limit was exceeded. + /// + /// + /// The input failed to meet the constraints specified by the AWS service. + /// + /// REST API Reference for GetHarvestJob Operation + public virtual Task GetHarvestJobAsync(GetHarvestJobRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = GetHarvestJobRequestMarshaller.Instance; + options.ResponseUnmarshaller = GetHarvestJobResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + #region GetOriginEndpoint @@ -1533,6 +1784,83 @@ public virtual ListChannelsResponse ListChannels(ListChannelsRequest request) #endregion + #region ListHarvestJobs + + + /// + /// Retrieves a list of harvest jobs that match the specified criteria. + /// + /// Container for the necessary parameters to execute the ListHarvestJobs service method. + /// + /// The response from the ListHarvestJobs service method, as returned by MediaPackageV2. + /// + /// You don't have permissions to perform the requested operation. The user or role that + /// is making the request must have at least one IAM permissions policy attached that + /// grants the required permissions. For more information, see Access Management in the + /// IAM User Guide. + /// + /// + /// Indicates that an error from the service occurred while trying to process a request. + /// + /// + /// The specified resource doesn't exist. + /// + /// + /// The request throughput limit was exceeded. + /// + /// + /// The input failed to meet the constraints specified by the AWS service. + /// + /// REST API Reference for ListHarvestJobs Operation + public virtual ListHarvestJobsResponse ListHarvestJobs(ListHarvestJobsRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = ListHarvestJobsRequestMarshaller.Instance; + options.ResponseUnmarshaller = ListHarvestJobsResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// Retrieves a list of harvest jobs that match the specified criteria. + /// + /// Container for the necessary parameters to execute the ListHarvestJobs service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the ListHarvestJobs service method, as returned by MediaPackageV2. + /// + /// You don't have permissions to perform the requested operation. The user or role that + /// is making the request must have at least one IAM permissions policy attached that + /// grants the required permissions. For more information, see Access Management in the + /// IAM User Guide. + /// + /// + /// Indicates that an error from the service occurred while trying to process a request. + /// + /// + /// The specified resource doesn't exist. + /// + /// + /// The request throughput limit was exceeded. + /// + /// + /// The input failed to meet the constraints specified by the AWS service. + /// + /// REST API Reference for ListHarvestJobs Operation + public virtual Task ListHarvestJobsAsync(ListHarvestJobsRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = ListHarvestJobsRequestMarshaller.Instance; + options.ResponseUnmarshaller = ListHarvestJobsResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + #region ListOriginEndpoints diff --git a/sdk/src/Services/MediaPackageV2/MediaPackageV2.sln b/sdk/src/Services/MediaPackageV2/MediaPackageV2.sln index a62a9f8921c0..3aa414fd0722 100644 --- a/sdk/src/Services/MediaPackageV2/MediaPackageV2.sln +++ b/sdk/src/Services/MediaPackageV2/MediaPackageV2.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {C7A1EFD6-922E-4ED1-8FB3-D78BF32675AC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {C7A1EFD6-922E-4ED1-8FB3-D78BF32675AC}.Debug|Any CPU.Build.0 = Debug|Any CPU {C7A1EFD6-922E-4ED1-8FB3-D78BF32675AC}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {CCBE5EF6-910F-45C9-A0EB-9FA4BEB56C07}.Debug|Any CPU.Build.0 = Debug|Any CPU {CCBE5EF6-910F-45C9-A0EB-9FA4BEB56C07}.Release|Any CPU.ActiveCfg = Release|Any CPU {CCBE5EF6-910F-45C9-A0EB-9FA4BEB56C07}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {64E0E54E-52A8-451C-BA32-85A38F9F59B1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {64E0E54E-52A8-451C-BA32-85A38F9F59B1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {64E0E54E-52A8-451C-BA32-85A38F9F59B1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {64E0E54E-52A8-451C-BA32-85A38F9F59B1}.Release|Any CPU.Build.0 = Release|Any CPU - {A57F144C-165F-4C87-97D1-CCD396EB742A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A57F144C-165F-4C87-97D1-CCD396EB742A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A57F144C-165F-4C87-97D1-CCD396EB742A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A57F144C-165F-4C87-97D1-CCD396EB742A}.Release|Any CPU.Build.0 = Release|Any CPU - {57290D9C-8319-48E4-AD59-B1C1B5C3231E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {57290D9C-8319-48E4-AD59-B1C1B5C3231E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {57290D9C-8319-48E4-AD59-B1C1B5C3231E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {57290D9C-8319-48E4-AD59-B1C1B5C3231E}.Release|Any CPU.Build.0 = Release|Any CPU - {5F7D2406-E4CF-4DE3-B174-F3D498B787EE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5F7D2406-E4CF-4DE3-B174-F3D498B787EE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5F7D2406-E4CF-4DE3-B174-F3D498B787EE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5F7D2406-E4CF-4DE3-B174-F3D498B787EE}.Release|Any CPU.Build.0 = Release|Any CPU - {EAB7A1A0-DDA4-4D20-965B-213B5B8B5B66}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EAB7A1A0-DDA4-4D20-965B-213B5B8B5B66}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EAB7A1A0-DDA4-4D20-965B-213B5B8B5B66}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EAB7A1A0-DDA4-4D20-965B-213B5B8B5B66}.Release|Any CPU.Build.0 = Release|Any CPU - {BCFFE43F-4E7C-4FF8-A0B1-BD2DF43AE041}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BCFFE43F-4E7C-4FF8-A0B1-BD2DF43AE041}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BCFFE43F-4E7C-4FF8-A0B1-BD2DF43AE041}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BCFFE43F-4E7C-4FF8-A0B1-BD2DF43AE041}.Release|Any CPU.Build.0 = Release|Any CPU - {0354E73C-3C63-442B-BBE4-4437117AE86D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0354E73C-3C63-442B-BBE4-4437117AE86D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0354E73C-3C63-442B-BBE4-4437117AE86D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0354E73C-3C63-442B-BBE4-4437117AE86D}.Release|Any CPU.Build.0 = Release|Any CPU - {9C466F8E-FF86-4C8F-9D1C-59762BBA2C22}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9C466F8E-FF86-4C8F-9D1C-59762BBA2C22}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9C466F8E-FF86-4C8F-9D1C-59762BBA2C22}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9C466F8E-FF86-4C8F-9D1C-59762BBA2C22}.Release|Any CPU.Build.0 = Release|Any CPU - {225EB39A-FC5B-4C6C-A3C5-CF9F7E3E3963}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {225EB39A-FC5B-4C6C-A3C5-CF9F7E3E3963}.Debug|Any CPU.Build.0 = Debug|Any CPU - {225EB39A-FC5B-4C6C-A3C5-CF9F7E3E3963}.Release|Any CPU.ActiveCfg = Release|Any CPU - {225EB39A-FC5B-4C6C-A3C5-CF9F7E3E3963}.Release|Any CPU.Build.0 = Release|Any CPU - {08AB3198-46F7-4291-BE17-C16CB15F4AF9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {08AB3198-46F7-4291-BE17-C16CB15F4AF9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {08AB3198-46F7-4291-BE17-C16CB15F4AF9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {08AB3198-46F7-4291-BE17-C16CB15F4AF9}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {64E0E54E-52A8-451C-BA32-85A38F9F59B1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {64E0E54E-52A8-451C-BA32-85A38F9F59B1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {64E0E54E-52A8-451C-BA32-85A38F9F59B1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {64E0E54E-52A8-451C-BA32-85A38F9F59B1}.Release|Any CPU.Build.0 = Release|Any CPU - {A57F144C-165F-4C87-97D1-CCD396EB742A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A57F144C-165F-4C87-97D1-CCD396EB742A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A57F144C-165F-4C87-97D1-CCD396EB742A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A57F144C-165F-4C87-97D1-CCD396EB742A}.Release|Any CPU.Build.0 = Release|Any CPU - {57290D9C-8319-48E4-AD59-B1C1B5C3231E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {57290D9C-8319-48E4-AD59-B1C1B5C3231E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {57290D9C-8319-48E4-AD59-B1C1B5C3231E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {57290D9C-8319-48E4-AD59-B1C1B5C3231E}.Release|Any CPU.Build.0 = Release|Any CPU - {5F7D2406-E4CF-4DE3-B174-F3D498B787EE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5F7D2406-E4CF-4DE3-B174-F3D498B787EE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5F7D2406-E4CF-4DE3-B174-F3D498B787EE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5F7D2406-E4CF-4DE3-B174-F3D498B787EE}.Release|Any CPU.Build.0 = Release|Any CPU - {EAB7A1A0-DDA4-4D20-965B-213B5B8B5B66}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EAB7A1A0-DDA4-4D20-965B-213B5B8B5B66}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EAB7A1A0-DDA4-4D20-965B-213B5B8B5B66}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EAB7A1A0-DDA4-4D20-965B-213B5B8B5B66}.Release|Any CPU.Build.0 = Release|Any CPU - {BCFFE43F-4E7C-4FF8-A0B1-BD2DF43AE041}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BCFFE43F-4E7C-4FF8-A0B1-BD2DF43AE041}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BCFFE43F-4E7C-4FF8-A0B1-BD2DF43AE041}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BCFFE43F-4E7C-4FF8-A0B1-BD2DF43AE041}.Release|Any CPU.Build.0 = Release|Any CPU - {0354E73C-3C63-442B-BBE4-4437117AE86D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0354E73C-3C63-442B-BBE4-4437117AE86D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0354E73C-3C63-442B-BBE4-4437117AE86D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0354E73C-3C63-442B-BBE4-4437117AE86D}.Release|Any CPU.Build.0 = Release|Any CPU - {9C466F8E-FF86-4C8F-9D1C-59762BBA2C22}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9C466F8E-FF86-4C8F-9D1C-59762BBA2C22}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9C466F8E-FF86-4C8F-9D1C-59762BBA2C22}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9C466F8E-FF86-4C8F-9D1C-59762BBA2C22}.Release|Any CPU.Build.0 = Release|Any CPU - {225EB39A-FC5B-4C6C-A3C5-CF9F7E3E3963}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {225EB39A-FC5B-4C6C-A3C5-CF9F7E3E3963}.Debug|Any CPU.Build.0 = Debug|Any CPU - {225EB39A-FC5B-4C6C-A3C5-CF9F7E3E3963}.Release|Any CPU.ActiveCfg = Release|Any CPU - {225EB39A-FC5B-4C6C-A3C5-CF9F7E3E3963}.Release|Any CPU.Build.0 = Release|Any CPU - {08AB3198-46F7-4291-BE17-C16CB15F4AF9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {08AB3198-46F7-4291-BE17-C16CB15F4AF9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {08AB3198-46F7-4291-BE17-C16CB15F4AF9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {08AB3198-46F7-4291-BE17-C16CB15F4AF9}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {C7A1EFD6-922E-4ED1-8FB3-D78BF32675AC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {FAFF2BC8-DD29-443B-AE7B-4DB24F2F85F6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {63516CF8-D903-42C9-A65E-CCC969184AD0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {9533D1A1-E773-4BFE-81B8-09EBC7A5A2BC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {CCBE5EF6-910F-45C9-A0EB-9FA4BEB56C07} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {64E0E54E-52A8-451C-BA32-85A38F9F59B1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A57F144C-165F-4C87-97D1-CCD396EB742A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {57290D9C-8319-48E4-AD59-B1C1B5C3231E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {5F7D2406-E4CF-4DE3-B174-F3D498B787EE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {EAB7A1A0-DDA4-4D20-965B-213B5B8B5B66} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {BCFFE43F-4E7C-4FF8-A0B1-BD2DF43AE041} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0354E73C-3C63-442B-BBE4-4437117AE86D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {9C466F8E-FF86-4C8F-9D1C-59762BBA2C22} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {225EB39A-FC5B-4C6C-A3C5-CF9F7E3E3963} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {08AB3198-46F7-4291-BE17-C16CB15F4AF9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {64E0E54E-52A8-451C-BA32-85A38F9F59B1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A57F144C-165F-4C87-97D1-CCD396EB742A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {57290D9C-8319-48E4-AD59-B1C1B5C3231E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {5F7D2406-E4CF-4DE3-B174-F3D498B787EE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {EAB7A1A0-DDA4-4D20-965B-213B5B8B5B66} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {BCFFE43F-4E7C-4FF8-A0B1-BD2DF43AE041} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0354E73C-3C63-442B-BBE4-4437117AE86D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {9C466F8E-FF86-4C8F-9D1C-59762BBA2C22} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {225EB39A-FC5B-4C6C-A3C5-CF9F7E3E3963} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {08AB3198-46F7-4291-BE17-C16CB15F4AF9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {9F878D3D-E966-413A-A450-9C4C47523B55} diff --git a/sdk/src/Services/MediaPackageV2/Properties/AssemblyInfo.cs b/sdk/src/Services/MediaPackageV2/Properties/AssemblyInfo.cs index 56e7e4b663d3..02affba1102e 100644 --- a/sdk/src/Services/MediaPackageV2/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/MediaPackageV2/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.402.12")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/MediaPackageVod/Generated/AmazonMediaPackageVodConfig.cs b/sdk/src/Services/MediaPackageVod/Generated/AmazonMediaPackageVodConfig.cs index 7c3cad3411a3..38f780cb58b8 100644 --- a/sdk/src/Services/MediaPackageVod/Generated/AmazonMediaPackageVodConfig.cs +++ b/sdk/src/Services/MediaPackageVod/Generated/AmazonMediaPackageVodConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.MediaPackageVod public partial class AmazonMediaPackageVodConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("MediaPackage Vod", "4.0.0.0"); private static readonly AmazonMediaPackageVodEndpointResolver EndpointResolver = new AmazonMediaPackageVodEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("MediaPackage Vod", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("MediaPackage Vod", "3.7.400.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/MediaPackageVod/MediaPackageVod.sln b/sdk/src/Services/MediaPackageVod/MediaPackageVod.sln index 11a90da3d93b..6e5e0ba1ef98 100644 --- a/sdk/src/Services/MediaPackageVod/MediaPackageVod.sln +++ b/sdk/src/Services/MediaPackageVod/MediaPackageVod.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {750B27B4-CFFA-4BBB-8E4E-B0BC7E245993}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {750B27B4-CFFA-4BBB-8E4E-B0BC7E245993}.Debug|Any CPU.Build.0 = Debug|Any CPU {750B27B4-CFFA-4BBB-8E4E-B0BC7E245993}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {A0BFB05C-3643-4614-81B4-5017BC3AE3C7}.Debug|Any CPU.Build.0 = Debug|Any CPU {A0BFB05C-3643-4614-81B4-5017BC3AE3C7}.Release|Any CPU.ActiveCfg = Release|Any CPU {A0BFB05C-3643-4614-81B4-5017BC3AE3C7}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {54B900EE-EE3E-4EE4-AF68-7B0A0EB3B738}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {54B900EE-EE3E-4EE4-AF68-7B0A0EB3B738}.Debug|Any CPU.Build.0 = Debug|Any CPU - {54B900EE-EE3E-4EE4-AF68-7B0A0EB3B738}.Release|Any CPU.ActiveCfg = Release|Any CPU - {54B900EE-EE3E-4EE4-AF68-7B0A0EB3B738}.Release|Any CPU.Build.0 = Release|Any CPU - {AE383DA8-6A87-4086-9F51-BA2852D4FFD3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AE383DA8-6A87-4086-9F51-BA2852D4FFD3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AE383DA8-6A87-4086-9F51-BA2852D4FFD3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AE383DA8-6A87-4086-9F51-BA2852D4FFD3}.Release|Any CPU.Build.0 = Release|Any CPU - {32B96F7D-C73F-4BEA-B0DC-A74C9714DEB3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {32B96F7D-C73F-4BEA-B0DC-A74C9714DEB3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {32B96F7D-C73F-4BEA-B0DC-A74C9714DEB3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {32B96F7D-C73F-4BEA-B0DC-A74C9714DEB3}.Release|Any CPU.Build.0 = Release|Any CPU - {F5223620-7522-450B-8A37-13E80E462104}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F5223620-7522-450B-8A37-13E80E462104}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F5223620-7522-450B-8A37-13E80E462104}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F5223620-7522-450B-8A37-13E80E462104}.Release|Any CPU.Build.0 = Release|Any CPU - {288FAF69-42A7-4008-82CA-CF7969260965}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {288FAF69-42A7-4008-82CA-CF7969260965}.Debug|Any CPU.Build.0 = Debug|Any CPU - {288FAF69-42A7-4008-82CA-CF7969260965}.Release|Any CPU.ActiveCfg = Release|Any CPU - {288FAF69-42A7-4008-82CA-CF7969260965}.Release|Any CPU.Build.0 = Release|Any CPU - {2D2BC39A-C751-48F1-84E4-8ECB3EE24EC4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2D2BC39A-C751-48F1-84E4-8ECB3EE24EC4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2D2BC39A-C751-48F1-84E4-8ECB3EE24EC4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2D2BC39A-C751-48F1-84E4-8ECB3EE24EC4}.Release|Any CPU.Build.0 = Release|Any CPU - {8E5FDE8B-076C-4B11-8223-363EEAEB22B2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8E5FDE8B-076C-4B11-8223-363EEAEB22B2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8E5FDE8B-076C-4B11-8223-363EEAEB22B2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8E5FDE8B-076C-4B11-8223-363EEAEB22B2}.Release|Any CPU.Build.0 = Release|Any CPU - {42D753D0-850D-419C-BC69-4C39E861E406}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {42D753D0-850D-419C-BC69-4C39E861E406}.Debug|Any CPU.Build.0 = Debug|Any CPU - {42D753D0-850D-419C-BC69-4C39E861E406}.Release|Any CPU.ActiveCfg = Release|Any CPU - {42D753D0-850D-419C-BC69-4C39E861E406}.Release|Any CPU.Build.0 = Release|Any CPU - {DE2286E3-C715-4210-98FA-1C178737153E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DE2286E3-C715-4210-98FA-1C178737153E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DE2286E3-C715-4210-98FA-1C178737153E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DE2286E3-C715-4210-98FA-1C178737153E}.Release|Any CPU.Build.0 = Release|Any CPU - {886EB3DB-16B7-4328-B58B-6335111AAB0D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {886EB3DB-16B7-4328-B58B-6335111AAB0D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {886EB3DB-16B7-4328-B58B-6335111AAB0D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {886EB3DB-16B7-4328-B58B-6335111AAB0D}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {54B900EE-EE3E-4EE4-AF68-7B0A0EB3B738}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {54B900EE-EE3E-4EE4-AF68-7B0A0EB3B738}.Debug|Any CPU.Build.0 = Debug|Any CPU - {54B900EE-EE3E-4EE4-AF68-7B0A0EB3B738}.Release|Any CPU.ActiveCfg = Release|Any CPU - {54B900EE-EE3E-4EE4-AF68-7B0A0EB3B738}.Release|Any CPU.Build.0 = Release|Any CPU - {AE383DA8-6A87-4086-9F51-BA2852D4FFD3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AE383DA8-6A87-4086-9F51-BA2852D4FFD3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AE383DA8-6A87-4086-9F51-BA2852D4FFD3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AE383DA8-6A87-4086-9F51-BA2852D4FFD3}.Release|Any CPU.Build.0 = Release|Any CPU - {32B96F7D-C73F-4BEA-B0DC-A74C9714DEB3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {32B96F7D-C73F-4BEA-B0DC-A74C9714DEB3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {32B96F7D-C73F-4BEA-B0DC-A74C9714DEB3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {32B96F7D-C73F-4BEA-B0DC-A74C9714DEB3}.Release|Any CPU.Build.0 = Release|Any CPU - {F5223620-7522-450B-8A37-13E80E462104}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F5223620-7522-450B-8A37-13E80E462104}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F5223620-7522-450B-8A37-13E80E462104}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F5223620-7522-450B-8A37-13E80E462104}.Release|Any CPU.Build.0 = Release|Any CPU - {288FAF69-42A7-4008-82CA-CF7969260965}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {288FAF69-42A7-4008-82CA-CF7969260965}.Debug|Any CPU.Build.0 = Debug|Any CPU - {288FAF69-42A7-4008-82CA-CF7969260965}.Release|Any CPU.ActiveCfg = Release|Any CPU - {288FAF69-42A7-4008-82CA-CF7969260965}.Release|Any CPU.Build.0 = Release|Any CPU - {2D2BC39A-C751-48F1-84E4-8ECB3EE24EC4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2D2BC39A-C751-48F1-84E4-8ECB3EE24EC4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2D2BC39A-C751-48F1-84E4-8ECB3EE24EC4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2D2BC39A-C751-48F1-84E4-8ECB3EE24EC4}.Release|Any CPU.Build.0 = Release|Any CPU - {8E5FDE8B-076C-4B11-8223-363EEAEB22B2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8E5FDE8B-076C-4B11-8223-363EEAEB22B2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8E5FDE8B-076C-4B11-8223-363EEAEB22B2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8E5FDE8B-076C-4B11-8223-363EEAEB22B2}.Release|Any CPU.Build.0 = Release|Any CPU - {42D753D0-850D-419C-BC69-4C39E861E406}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {42D753D0-850D-419C-BC69-4C39E861E406}.Debug|Any CPU.Build.0 = Debug|Any CPU - {42D753D0-850D-419C-BC69-4C39E861E406}.Release|Any CPU.ActiveCfg = Release|Any CPU - {42D753D0-850D-419C-BC69-4C39E861E406}.Release|Any CPU.Build.0 = Release|Any CPU - {DE2286E3-C715-4210-98FA-1C178737153E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DE2286E3-C715-4210-98FA-1C178737153E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DE2286E3-C715-4210-98FA-1C178737153E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DE2286E3-C715-4210-98FA-1C178737153E}.Release|Any CPU.Build.0 = Release|Any CPU - {886EB3DB-16B7-4328-B58B-6335111AAB0D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {886EB3DB-16B7-4328-B58B-6335111AAB0D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {886EB3DB-16B7-4328-B58B-6335111AAB0D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {886EB3DB-16B7-4328-B58B-6335111AAB0D}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {750B27B4-CFFA-4BBB-8E4E-B0BC7E245993} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {6CC0A567-9BDA-4D3D-A27B-48B3032EDBA1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {216B88CB-28F5-47DD-A62D-404222C31B91} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {F6F2DE57-5563-4DDC-BFAA-0B92D3C1F451} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {A0BFB05C-3643-4614-81B4-5017BC3AE3C7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {54B900EE-EE3E-4EE4-AF68-7B0A0EB3B738} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {AE383DA8-6A87-4086-9F51-BA2852D4FFD3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {32B96F7D-C73F-4BEA-B0DC-A74C9714DEB3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F5223620-7522-450B-8A37-13E80E462104} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {288FAF69-42A7-4008-82CA-CF7969260965} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {2D2BC39A-C751-48F1-84E4-8ECB3EE24EC4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8E5FDE8B-076C-4B11-8223-363EEAEB22B2} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {42D753D0-850D-419C-BC69-4C39E861E406} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {DE2286E3-C715-4210-98FA-1C178737153E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {886EB3DB-16B7-4328-B58B-6335111AAB0D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {54B900EE-EE3E-4EE4-AF68-7B0A0EB3B738} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {AE383DA8-6A87-4086-9F51-BA2852D4FFD3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {32B96F7D-C73F-4BEA-B0DC-A74C9714DEB3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F5223620-7522-450B-8A37-13E80E462104} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {288FAF69-42A7-4008-82CA-CF7969260965} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {2D2BC39A-C751-48F1-84E4-8ECB3EE24EC4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8E5FDE8B-076C-4B11-8223-363EEAEB22B2} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {42D753D0-850D-419C-BC69-4C39E861E406} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {DE2286E3-C715-4210-98FA-1C178737153E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {886EB3DB-16B7-4328-B58B-6335111AAB0D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {9B182F36-9DFB-49B4-946D-9006DF635278} diff --git a/sdk/src/Services/MediaPackageVod/Properties/AssemblyInfo.cs b/sdk/src/Services/MediaPackageVod/Properties/AssemblyInfo.cs index 2b6a07eb0398..0c22cdd1e9b3 100644 --- a/sdk/src/Services/MediaPackageVod/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/MediaPackageVod/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/MediaStore/Generated/AmazonMediaStoreConfig.cs b/sdk/src/Services/MediaStore/Generated/AmazonMediaStoreConfig.cs index 4c3d4c877d52..2e44725fc69e 100644 --- a/sdk/src/Services/MediaStore/Generated/AmazonMediaStoreConfig.cs +++ b/sdk/src/Services/MediaStore/Generated/AmazonMediaStoreConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.MediaStore public partial class AmazonMediaStoreConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("MediaStore", "4.0.0.0"); private static readonly AmazonMediaStoreEndpointResolver EndpointResolver = new AmazonMediaStoreEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("MediaStore", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("MediaStore", "3.7.400.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/MediaStore/MediaStore.sln b/sdk/src/Services/MediaStore/MediaStore.sln index a27766905621..44c29c952ecb 100644 --- a/sdk/src/Services/MediaStore/MediaStore.sln +++ b/sdk/src/Services/MediaStore/MediaStore.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {751099F4-0725-4EB8-A947-EE99F618A733}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {751099F4-0725-4EB8-A947-EE99F618A733}.Debug|Any CPU.Build.0 = Debug|Any CPU {751099F4-0725-4EB8-A947-EE99F618A733}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {578D7562-80AE-484F-B69A-41DBCCCDDAFC}.Debug|Any CPU.Build.0 = Debug|Any CPU {578D7562-80AE-484F-B69A-41DBCCCDDAFC}.Release|Any CPU.ActiveCfg = Release|Any CPU {578D7562-80AE-484F-B69A-41DBCCCDDAFC}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {10280C13-8F11-4FB9-8CCF-FE4014ABA2E6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {10280C13-8F11-4FB9-8CCF-FE4014ABA2E6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {10280C13-8F11-4FB9-8CCF-FE4014ABA2E6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {10280C13-8F11-4FB9-8CCF-FE4014ABA2E6}.Release|Any CPU.Build.0 = Release|Any CPU - {70784B7F-3035-4CEB-BD14-099E166632AE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {70784B7F-3035-4CEB-BD14-099E166632AE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {70784B7F-3035-4CEB-BD14-099E166632AE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {70784B7F-3035-4CEB-BD14-099E166632AE}.Release|Any CPU.Build.0 = Release|Any CPU - {A7EA248A-6610-454D-9BDE-4143204BD5AE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A7EA248A-6610-454D-9BDE-4143204BD5AE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A7EA248A-6610-454D-9BDE-4143204BD5AE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A7EA248A-6610-454D-9BDE-4143204BD5AE}.Release|Any CPU.Build.0 = Release|Any CPU - {AEC3E334-8920-422E-9BC1-4DA21DE1570E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AEC3E334-8920-422E-9BC1-4DA21DE1570E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AEC3E334-8920-422E-9BC1-4DA21DE1570E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AEC3E334-8920-422E-9BC1-4DA21DE1570E}.Release|Any CPU.Build.0 = Release|Any CPU - {0CAC5EB4-432A-47D5-917E-9B667D0EC03C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0CAC5EB4-432A-47D5-917E-9B667D0EC03C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0CAC5EB4-432A-47D5-917E-9B667D0EC03C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0CAC5EB4-432A-47D5-917E-9B667D0EC03C}.Release|Any CPU.Build.0 = Release|Any CPU - {BF00B34B-7632-4909-99C1-9AEE5422268B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BF00B34B-7632-4909-99C1-9AEE5422268B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BF00B34B-7632-4909-99C1-9AEE5422268B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BF00B34B-7632-4909-99C1-9AEE5422268B}.Release|Any CPU.Build.0 = Release|Any CPU - {32A988B7-2C6C-48AA-B43E-BC344ADE0DA9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {32A988B7-2C6C-48AA-B43E-BC344ADE0DA9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {32A988B7-2C6C-48AA-B43E-BC344ADE0DA9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {32A988B7-2C6C-48AA-B43E-BC344ADE0DA9}.Release|Any CPU.Build.0 = Release|Any CPU - {AF0A2573-0DD2-46DB-97F0-7C4B0A7E3B29}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AF0A2573-0DD2-46DB-97F0-7C4B0A7E3B29}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AF0A2573-0DD2-46DB-97F0-7C4B0A7E3B29}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AF0A2573-0DD2-46DB-97F0-7C4B0A7E3B29}.Release|Any CPU.Build.0 = Release|Any CPU - {92B86D76-4D50-4684-809A-CEEC2BA9D5B2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {92B86D76-4D50-4684-809A-CEEC2BA9D5B2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {92B86D76-4D50-4684-809A-CEEC2BA9D5B2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {92B86D76-4D50-4684-809A-CEEC2BA9D5B2}.Release|Any CPU.Build.0 = Release|Any CPU - {3B4214F8-7BFC-4FC4-AE7F-2EBF2ADE2847}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3B4214F8-7BFC-4FC4-AE7F-2EBF2ADE2847}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3B4214F8-7BFC-4FC4-AE7F-2EBF2ADE2847}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3B4214F8-7BFC-4FC4-AE7F-2EBF2ADE2847}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {10280C13-8F11-4FB9-8CCF-FE4014ABA2E6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {10280C13-8F11-4FB9-8CCF-FE4014ABA2E6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {10280C13-8F11-4FB9-8CCF-FE4014ABA2E6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {10280C13-8F11-4FB9-8CCF-FE4014ABA2E6}.Release|Any CPU.Build.0 = Release|Any CPU - {70784B7F-3035-4CEB-BD14-099E166632AE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {70784B7F-3035-4CEB-BD14-099E166632AE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {70784B7F-3035-4CEB-BD14-099E166632AE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {70784B7F-3035-4CEB-BD14-099E166632AE}.Release|Any CPU.Build.0 = Release|Any CPU - {A7EA248A-6610-454D-9BDE-4143204BD5AE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A7EA248A-6610-454D-9BDE-4143204BD5AE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A7EA248A-6610-454D-9BDE-4143204BD5AE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A7EA248A-6610-454D-9BDE-4143204BD5AE}.Release|Any CPU.Build.0 = Release|Any CPU - {AEC3E334-8920-422E-9BC1-4DA21DE1570E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AEC3E334-8920-422E-9BC1-4DA21DE1570E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AEC3E334-8920-422E-9BC1-4DA21DE1570E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AEC3E334-8920-422E-9BC1-4DA21DE1570E}.Release|Any CPU.Build.0 = Release|Any CPU - {0CAC5EB4-432A-47D5-917E-9B667D0EC03C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0CAC5EB4-432A-47D5-917E-9B667D0EC03C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0CAC5EB4-432A-47D5-917E-9B667D0EC03C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0CAC5EB4-432A-47D5-917E-9B667D0EC03C}.Release|Any CPU.Build.0 = Release|Any CPU - {BF00B34B-7632-4909-99C1-9AEE5422268B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BF00B34B-7632-4909-99C1-9AEE5422268B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BF00B34B-7632-4909-99C1-9AEE5422268B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BF00B34B-7632-4909-99C1-9AEE5422268B}.Release|Any CPU.Build.0 = Release|Any CPU - {32A988B7-2C6C-48AA-B43E-BC344ADE0DA9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {32A988B7-2C6C-48AA-B43E-BC344ADE0DA9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {32A988B7-2C6C-48AA-B43E-BC344ADE0DA9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {32A988B7-2C6C-48AA-B43E-BC344ADE0DA9}.Release|Any CPU.Build.0 = Release|Any CPU - {AF0A2573-0DD2-46DB-97F0-7C4B0A7E3B29}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AF0A2573-0DD2-46DB-97F0-7C4B0A7E3B29}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AF0A2573-0DD2-46DB-97F0-7C4B0A7E3B29}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AF0A2573-0DD2-46DB-97F0-7C4B0A7E3B29}.Release|Any CPU.Build.0 = Release|Any CPU - {92B86D76-4D50-4684-809A-CEEC2BA9D5B2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {92B86D76-4D50-4684-809A-CEEC2BA9D5B2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {92B86D76-4D50-4684-809A-CEEC2BA9D5B2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {92B86D76-4D50-4684-809A-CEEC2BA9D5B2}.Release|Any CPU.Build.0 = Release|Any CPU - {3B4214F8-7BFC-4FC4-AE7F-2EBF2ADE2847}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3B4214F8-7BFC-4FC4-AE7F-2EBF2ADE2847}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3B4214F8-7BFC-4FC4-AE7F-2EBF2ADE2847}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3B4214F8-7BFC-4FC4-AE7F-2EBF2ADE2847}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {751099F4-0725-4EB8-A947-EE99F618A733} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {85BFD1EC-6E3B-45CB-BDF1-7D358362A2E9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {D41BAA2C-984E-44ED-B2D8-B91022F6AF40} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {4C0452F8-24F9-43C7-8C2B-4D0CA3CCB4FC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {578D7562-80AE-484F-B69A-41DBCCCDDAFC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {10280C13-8F11-4FB9-8CCF-FE4014ABA2E6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {70784B7F-3035-4CEB-BD14-099E166632AE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A7EA248A-6610-454D-9BDE-4143204BD5AE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {AEC3E334-8920-422E-9BC1-4DA21DE1570E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0CAC5EB4-432A-47D5-917E-9B667D0EC03C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {BF00B34B-7632-4909-99C1-9AEE5422268B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {32A988B7-2C6C-48AA-B43E-BC344ADE0DA9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {AF0A2573-0DD2-46DB-97F0-7C4B0A7E3B29} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {92B86D76-4D50-4684-809A-CEEC2BA9D5B2} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {3B4214F8-7BFC-4FC4-AE7F-2EBF2ADE2847} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {10280C13-8F11-4FB9-8CCF-FE4014ABA2E6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {70784B7F-3035-4CEB-BD14-099E166632AE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A7EA248A-6610-454D-9BDE-4143204BD5AE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {AEC3E334-8920-422E-9BC1-4DA21DE1570E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0CAC5EB4-432A-47D5-917E-9B667D0EC03C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {BF00B34B-7632-4909-99C1-9AEE5422268B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {32A988B7-2C6C-48AA-B43E-BC344ADE0DA9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {AF0A2573-0DD2-46DB-97F0-7C4B0A7E3B29} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {92B86D76-4D50-4684-809A-CEEC2BA9D5B2} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {3B4214F8-7BFC-4FC4-AE7F-2EBF2ADE2847} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {3DB47D01-7F7A-4997-9618-A41A11C6DCE9} diff --git a/sdk/src/Services/MediaStore/Properties/AssemblyInfo.cs b/sdk/src/Services/MediaStore/Properties/AssemblyInfo.cs index 5fbd27cec06f..05e3aeb3eb20 100644 --- a/sdk/src/Services/MediaStore/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/MediaStore/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/MediaStoreData/Generated/AmazonMediaStoreDataConfig.cs b/sdk/src/Services/MediaStoreData/Generated/AmazonMediaStoreDataConfig.cs index daebf92ceeeb..8c7db250f62a 100644 --- a/sdk/src/Services/MediaStoreData/Generated/AmazonMediaStoreDataConfig.cs +++ b/sdk/src/Services/MediaStoreData/Generated/AmazonMediaStoreDataConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.MediaStoreData public partial class AmazonMediaStoreDataConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("MediaStore Data", "4.0.0.0"); private static readonly AmazonMediaStoreDataEndpointResolver EndpointResolver = new AmazonMediaStoreDataEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("MediaStore Data", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("MediaStore Data", "3.7.400.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/MediaStoreData/MediaStoreData.sln b/sdk/src/Services/MediaStoreData/MediaStoreData.sln index 8a04170f434d..25255e873358 100644 --- a/sdk/src/Services/MediaStoreData/MediaStoreData.sln +++ b/sdk/src/Services/MediaStoreData/MediaStoreData.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {D1766D47-0D60-4883-A480-31190F4433DA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {D1766D47-0D60-4883-A480-31190F4433DA}.Debug|Any CPU.Build.0 = Debug|Any CPU {D1766D47-0D60-4883-A480-31190F4433DA}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {99500257-813B-405F-AE3B-3A3CEB13C18C}.Debug|Any CPU.Build.0 = Debug|Any CPU {99500257-813B-405F-AE3B-3A3CEB13C18C}.Release|Any CPU.ActiveCfg = Release|Any CPU {99500257-813B-405F-AE3B-3A3CEB13C18C}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {ABE753A1-3639-4195-AA98-746B6EB1AB79}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {ABE753A1-3639-4195-AA98-746B6EB1AB79}.Debug|Any CPU.Build.0 = Debug|Any CPU - {ABE753A1-3639-4195-AA98-746B6EB1AB79}.Release|Any CPU.ActiveCfg = Release|Any CPU - {ABE753A1-3639-4195-AA98-746B6EB1AB79}.Release|Any CPU.Build.0 = Release|Any CPU - {7D4AB620-1563-4251-B184-7D98DF9EBF46}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7D4AB620-1563-4251-B184-7D98DF9EBF46}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7D4AB620-1563-4251-B184-7D98DF9EBF46}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7D4AB620-1563-4251-B184-7D98DF9EBF46}.Release|Any CPU.Build.0 = Release|Any CPU - {CDB2C652-4B60-4225-8F40-3613E05FEAB5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CDB2C652-4B60-4225-8F40-3613E05FEAB5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CDB2C652-4B60-4225-8F40-3613E05FEAB5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CDB2C652-4B60-4225-8F40-3613E05FEAB5}.Release|Any CPU.Build.0 = Release|Any CPU - {57A096EB-71D0-4A73-B94C-FEDF906EF8F7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {57A096EB-71D0-4A73-B94C-FEDF906EF8F7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {57A096EB-71D0-4A73-B94C-FEDF906EF8F7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {57A096EB-71D0-4A73-B94C-FEDF906EF8F7}.Release|Any CPU.Build.0 = Release|Any CPU - {CD266CFF-07EE-4554-82A4-7493BD268D21}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CD266CFF-07EE-4554-82A4-7493BD268D21}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CD266CFF-07EE-4554-82A4-7493BD268D21}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CD266CFF-07EE-4554-82A4-7493BD268D21}.Release|Any CPU.Build.0 = Release|Any CPU - {45E8430E-DAD5-4E21-8087-069E20085C63}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {45E8430E-DAD5-4E21-8087-069E20085C63}.Debug|Any CPU.Build.0 = Debug|Any CPU - {45E8430E-DAD5-4E21-8087-069E20085C63}.Release|Any CPU.ActiveCfg = Release|Any CPU - {45E8430E-DAD5-4E21-8087-069E20085C63}.Release|Any CPU.Build.0 = Release|Any CPU - {BA32A75F-A34C-4BAF-B3EB-19BCD83ACA8D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BA32A75F-A34C-4BAF-B3EB-19BCD83ACA8D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BA32A75F-A34C-4BAF-B3EB-19BCD83ACA8D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BA32A75F-A34C-4BAF-B3EB-19BCD83ACA8D}.Release|Any CPU.Build.0 = Release|Any CPU - {10074D8B-378A-4D75-92F9-A5CF2D9B5BB7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {10074D8B-378A-4D75-92F9-A5CF2D9B5BB7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {10074D8B-378A-4D75-92F9-A5CF2D9B5BB7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {10074D8B-378A-4D75-92F9-A5CF2D9B5BB7}.Release|Any CPU.Build.0 = Release|Any CPU - {3DF4B48B-E92C-4345-97F5-1FC25197862A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3DF4B48B-E92C-4345-97F5-1FC25197862A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3DF4B48B-E92C-4345-97F5-1FC25197862A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3DF4B48B-E92C-4345-97F5-1FC25197862A}.Release|Any CPU.Build.0 = Release|Any CPU - {5F88DA26-179E-4D27-8180-11DD006210C7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5F88DA26-179E-4D27-8180-11DD006210C7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5F88DA26-179E-4D27-8180-11DD006210C7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5F88DA26-179E-4D27-8180-11DD006210C7}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {ABE753A1-3639-4195-AA98-746B6EB1AB79}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {ABE753A1-3639-4195-AA98-746B6EB1AB79}.Debug|Any CPU.Build.0 = Debug|Any CPU - {ABE753A1-3639-4195-AA98-746B6EB1AB79}.Release|Any CPU.ActiveCfg = Release|Any CPU - {ABE753A1-3639-4195-AA98-746B6EB1AB79}.Release|Any CPU.Build.0 = Release|Any CPU - {7D4AB620-1563-4251-B184-7D98DF9EBF46}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7D4AB620-1563-4251-B184-7D98DF9EBF46}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7D4AB620-1563-4251-B184-7D98DF9EBF46}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7D4AB620-1563-4251-B184-7D98DF9EBF46}.Release|Any CPU.Build.0 = Release|Any CPU - {CDB2C652-4B60-4225-8F40-3613E05FEAB5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CDB2C652-4B60-4225-8F40-3613E05FEAB5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CDB2C652-4B60-4225-8F40-3613E05FEAB5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CDB2C652-4B60-4225-8F40-3613E05FEAB5}.Release|Any CPU.Build.0 = Release|Any CPU - {57A096EB-71D0-4A73-B94C-FEDF906EF8F7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {57A096EB-71D0-4A73-B94C-FEDF906EF8F7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {57A096EB-71D0-4A73-B94C-FEDF906EF8F7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {57A096EB-71D0-4A73-B94C-FEDF906EF8F7}.Release|Any CPU.Build.0 = Release|Any CPU - {CD266CFF-07EE-4554-82A4-7493BD268D21}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CD266CFF-07EE-4554-82A4-7493BD268D21}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CD266CFF-07EE-4554-82A4-7493BD268D21}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CD266CFF-07EE-4554-82A4-7493BD268D21}.Release|Any CPU.Build.0 = Release|Any CPU - {45E8430E-DAD5-4E21-8087-069E20085C63}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {45E8430E-DAD5-4E21-8087-069E20085C63}.Debug|Any CPU.Build.0 = Debug|Any CPU - {45E8430E-DAD5-4E21-8087-069E20085C63}.Release|Any CPU.ActiveCfg = Release|Any CPU - {45E8430E-DAD5-4E21-8087-069E20085C63}.Release|Any CPU.Build.0 = Release|Any CPU - {BA32A75F-A34C-4BAF-B3EB-19BCD83ACA8D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BA32A75F-A34C-4BAF-B3EB-19BCD83ACA8D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BA32A75F-A34C-4BAF-B3EB-19BCD83ACA8D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BA32A75F-A34C-4BAF-B3EB-19BCD83ACA8D}.Release|Any CPU.Build.0 = Release|Any CPU - {10074D8B-378A-4D75-92F9-A5CF2D9B5BB7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {10074D8B-378A-4D75-92F9-A5CF2D9B5BB7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {10074D8B-378A-4D75-92F9-A5CF2D9B5BB7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {10074D8B-378A-4D75-92F9-A5CF2D9B5BB7}.Release|Any CPU.Build.0 = Release|Any CPU - {3DF4B48B-E92C-4345-97F5-1FC25197862A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3DF4B48B-E92C-4345-97F5-1FC25197862A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3DF4B48B-E92C-4345-97F5-1FC25197862A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3DF4B48B-E92C-4345-97F5-1FC25197862A}.Release|Any CPU.Build.0 = Release|Any CPU - {5F88DA26-179E-4D27-8180-11DD006210C7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5F88DA26-179E-4D27-8180-11DD006210C7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5F88DA26-179E-4D27-8180-11DD006210C7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5F88DA26-179E-4D27-8180-11DD006210C7}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {D1766D47-0D60-4883-A480-31190F4433DA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {C70906F8-52AA-477F-8454-B10B61E62CA6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {4629E340-EF01-4AAF-A464-728D1B1C07E9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {0D90B460-281B-4D22-91B8-F435BD412425} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {99500257-813B-405F-AE3B-3A3CEB13C18C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {ABE753A1-3639-4195-AA98-746B6EB1AB79} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {7D4AB620-1563-4251-B184-7D98DF9EBF46} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {CDB2C652-4B60-4225-8F40-3613E05FEAB5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {57A096EB-71D0-4A73-B94C-FEDF906EF8F7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {CD266CFF-07EE-4554-82A4-7493BD268D21} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {45E8430E-DAD5-4E21-8087-069E20085C63} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {BA32A75F-A34C-4BAF-B3EB-19BCD83ACA8D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {10074D8B-378A-4D75-92F9-A5CF2D9B5BB7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {3DF4B48B-E92C-4345-97F5-1FC25197862A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {5F88DA26-179E-4D27-8180-11DD006210C7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {ABE753A1-3639-4195-AA98-746B6EB1AB79} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {7D4AB620-1563-4251-B184-7D98DF9EBF46} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {CDB2C652-4B60-4225-8F40-3613E05FEAB5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {57A096EB-71D0-4A73-B94C-FEDF906EF8F7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {CD266CFF-07EE-4554-82A4-7493BD268D21} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {45E8430E-DAD5-4E21-8087-069E20085C63} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {BA32A75F-A34C-4BAF-B3EB-19BCD83ACA8D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {10074D8B-378A-4D75-92F9-A5CF2D9B5BB7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {3DF4B48B-E92C-4345-97F5-1FC25197862A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {5F88DA26-179E-4D27-8180-11DD006210C7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {AACA5C87-3887-4EC9-9B9F-08C2C9949EF4} diff --git a/sdk/src/Services/MediaStoreData/Properties/AssemblyInfo.cs b/sdk/src/Services/MediaStoreData/Properties/AssemblyInfo.cs index da714415a911..ef675ad06fa9 100644 --- a/sdk/src/Services/MediaStoreData/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/MediaStoreData/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/MediaTailor/Generated/AmazonMediaTailorConfig.cs b/sdk/src/Services/MediaTailor/Generated/AmazonMediaTailorConfig.cs index 7f9f600d81f7..303743e001b1 100644 --- a/sdk/src/Services/MediaTailor/Generated/AmazonMediaTailorConfig.cs +++ b/sdk/src/Services/MediaTailor/Generated/AmazonMediaTailorConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.MediaTailor public partial class AmazonMediaTailorConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("MediaTailor", "4.0.0.0"); private static readonly AmazonMediaTailorEndpointResolver EndpointResolver = new AmazonMediaTailorEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("MediaTailor", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("MediaTailor", "3.7.400.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/MediaTailor/MediaTailor.sln b/sdk/src/Services/MediaTailor/MediaTailor.sln index 1950887daa50..b3658c771cf5 100644 --- a/sdk/src/Services/MediaTailor/MediaTailor.sln +++ b/sdk/src/Services/MediaTailor/MediaTailor.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {4E0C6C40-A133-4C49-8C6F-B6241B34F8A6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {4E0C6C40-A133-4C49-8C6F-B6241B34F8A6}.Debug|Any CPU.Build.0 = Debug|Any CPU {4E0C6C40-A133-4C49-8C6F-B6241B34F8A6}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {24D27170-1E3B-4D7F-B9DE-D02C77315F2F}.Debug|Any CPU.Build.0 = Debug|Any CPU {24D27170-1E3B-4D7F-B9DE-D02C77315F2F}.Release|Any CPU.ActiveCfg = Release|Any CPU {24D27170-1E3B-4D7F-B9DE-D02C77315F2F}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {164E199F-FE50-4254-94A3-2DF949F50651}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {164E199F-FE50-4254-94A3-2DF949F50651}.Debug|Any CPU.Build.0 = Debug|Any CPU - {164E199F-FE50-4254-94A3-2DF949F50651}.Release|Any CPU.ActiveCfg = Release|Any CPU - {164E199F-FE50-4254-94A3-2DF949F50651}.Release|Any CPU.Build.0 = Release|Any CPU - {0EFD7B65-3942-4774-A3BD-42A35C38A5AC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0EFD7B65-3942-4774-A3BD-42A35C38A5AC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0EFD7B65-3942-4774-A3BD-42A35C38A5AC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0EFD7B65-3942-4774-A3BD-42A35C38A5AC}.Release|Any CPU.Build.0 = Release|Any CPU - {45ED1548-5ACD-4DB0-9CDE-4174D48FCA8F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {45ED1548-5ACD-4DB0-9CDE-4174D48FCA8F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {45ED1548-5ACD-4DB0-9CDE-4174D48FCA8F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {45ED1548-5ACD-4DB0-9CDE-4174D48FCA8F}.Release|Any CPU.Build.0 = Release|Any CPU - {77483F23-F478-40F0-B5B7-43D8E9B267A6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {77483F23-F478-40F0-B5B7-43D8E9B267A6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {77483F23-F478-40F0-B5B7-43D8E9B267A6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {77483F23-F478-40F0-B5B7-43D8E9B267A6}.Release|Any CPU.Build.0 = Release|Any CPU - {18283B3F-ECC0-4B8F-A10F-1680DD72A847}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {18283B3F-ECC0-4B8F-A10F-1680DD72A847}.Debug|Any CPU.Build.0 = Debug|Any CPU - {18283B3F-ECC0-4B8F-A10F-1680DD72A847}.Release|Any CPU.ActiveCfg = Release|Any CPU - {18283B3F-ECC0-4B8F-A10F-1680DD72A847}.Release|Any CPU.Build.0 = Release|Any CPU - {EE232503-A47E-4AE7-BACB-6691447AE448}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EE232503-A47E-4AE7-BACB-6691447AE448}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EE232503-A47E-4AE7-BACB-6691447AE448}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EE232503-A47E-4AE7-BACB-6691447AE448}.Release|Any CPU.Build.0 = Release|Any CPU - {E652D62A-B8E1-468C-A999-2CFC398253CC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E652D62A-B8E1-468C-A999-2CFC398253CC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E652D62A-B8E1-468C-A999-2CFC398253CC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E652D62A-B8E1-468C-A999-2CFC398253CC}.Release|Any CPU.Build.0 = Release|Any CPU - {C4FEA08E-B828-4DFF-B34C-828BF59FE766}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C4FEA08E-B828-4DFF-B34C-828BF59FE766}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C4FEA08E-B828-4DFF-B34C-828BF59FE766}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C4FEA08E-B828-4DFF-B34C-828BF59FE766}.Release|Any CPU.Build.0 = Release|Any CPU - {7B6C5C42-D00E-41B4-9FA5-1B112B6E11F9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7B6C5C42-D00E-41B4-9FA5-1B112B6E11F9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7B6C5C42-D00E-41B4-9FA5-1B112B6E11F9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7B6C5C42-D00E-41B4-9FA5-1B112B6E11F9}.Release|Any CPU.Build.0 = Release|Any CPU - {12939E85-4D3C-4538-BFEE-659E69894E43}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {12939E85-4D3C-4538-BFEE-659E69894E43}.Debug|Any CPU.Build.0 = Debug|Any CPU - {12939E85-4D3C-4538-BFEE-659E69894E43}.Release|Any CPU.ActiveCfg = Release|Any CPU - {12939E85-4D3C-4538-BFEE-659E69894E43}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {164E199F-FE50-4254-94A3-2DF949F50651}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {164E199F-FE50-4254-94A3-2DF949F50651}.Debug|Any CPU.Build.0 = Debug|Any CPU - {164E199F-FE50-4254-94A3-2DF949F50651}.Release|Any CPU.ActiveCfg = Release|Any CPU - {164E199F-FE50-4254-94A3-2DF949F50651}.Release|Any CPU.Build.0 = Release|Any CPU - {0EFD7B65-3942-4774-A3BD-42A35C38A5AC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0EFD7B65-3942-4774-A3BD-42A35C38A5AC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0EFD7B65-3942-4774-A3BD-42A35C38A5AC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0EFD7B65-3942-4774-A3BD-42A35C38A5AC}.Release|Any CPU.Build.0 = Release|Any CPU - {45ED1548-5ACD-4DB0-9CDE-4174D48FCA8F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {45ED1548-5ACD-4DB0-9CDE-4174D48FCA8F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {45ED1548-5ACD-4DB0-9CDE-4174D48FCA8F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {45ED1548-5ACD-4DB0-9CDE-4174D48FCA8F}.Release|Any CPU.Build.0 = Release|Any CPU - {77483F23-F478-40F0-B5B7-43D8E9B267A6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {77483F23-F478-40F0-B5B7-43D8E9B267A6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {77483F23-F478-40F0-B5B7-43D8E9B267A6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {77483F23-F478-40F0-B5B7-43D8E9B267A6}.Release|Any CPU.Build.0 = Release|Any CPU - {18283B3F-ECC0-4B8F-A10F-1680DD72A847}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {18283B3F-ECC0-4B8F-A10F-1680DD72A847}.Debug|Any CPU.Build.0 = Debug|Any CPU - {18283B3F-ECC0-4B8F-A10F-1680DD72A847}.Release|Any CPU.ActiveCfg = Release|Any CPU - {18283B3F-ECC0-4B8F-A10F-1680DD72A847}.Release|Any CPU.Build.0 = Release|Any CPU - {EE232503-A47E-4AE7-BACB-6691447AE448}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EE232503-A47E-4AE7-BACB-6691447AE448}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EE232503-A47E-4AE7-BACB-6691447AE448}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EE232503-A47E-4AE7-BACB-6691447AE448}.Release|Any CPU.Build.0 = Release|Any CPU - {E652D62A-B8E1-468C-A999-2CFC398253CC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E652D62A-B8E1-468C-A999-2CFC398253CC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E652D62A-B8E1-468C-A999-2CFC398253CC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E652D62A-B8E1-468C-A999-2CFC398253CC}.Release|Any CPU.Build.0 = Release|Any CPU - {C4FEA08E-B828-4DFF-B34C-828BF59FE766}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C4FEA08E-B828-4DFF-B34C-828BF59FE766}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C4FEA08E-B828-4DFF-B34C-828BF59FE766}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C4FEA08E-B828-4DFF-B34C-828BF59FE766}.Release|Any CPU.Build.0 = Release|Any CPU - {7B6C5C42-D00E-41B4-9FA5-1B112B6E11F9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7B6C5C42-D00E-41B4-9FA5-1B112B6E11F9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7B6C5C42-D00E-41B4-9FA5-1B112B6E11F9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7B6C5C42-D00E-41B4-9FA5-1B112B6E11F9}.Release|Any CPU.Build.0 = Release|Any CPU - {12939E85-4D3C-4538-BFEE-659E69894E43}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {12939E85-4D3C-4538-BFEE-659E69894E43}.Debug|Any CPU.Build.0 = Debug|Any CPU - {12939E85-4D3C-4538-BFEE-659E69894E43}.Release|Any CPU.ActiveCfg = Release|Any CPU - {12939E85-4D3C-4538-BFEE-659E69894E43}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {4E0C6C40-A133-4C49-8C6F-B6241B34F8A6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {77697E8C-4896-41FA-80B5-00531380BDF3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {9120CFCB-72C6-4C55-B10F-C876D4487DFC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {11109B36-6945-4D2E-BF5C-BB2CEA7E013A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {24D27170-1E3B-4D7F-B9DE-D02C77315F2F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {164E199F-FE50-4254-94A3-2DF949F50651} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0EFD7B65-3942-4774-A3BD-42A35C38A5AC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {45ED1548-5ACD-4DB0-9CDE-4174D48FCA8F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {77483F23-F478-40F0-B5B7-43D8E9B267A6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {18283B3F-ECC0-4B8F-A10F-1680DD72A847} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {EE232503-A47E-4AE7-BACB-6691447AE448} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E652D62A-B8E1-468C-A999-2CFC398253CC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C4FEA08E-B828-4DFF-B34C-828BF59FE766} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {7B6C5C42-D00E-41B4-9FA5-1B112B6E11F9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {12939E85-4D3C-4538-BFEE-659E69894E43} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {164E199F-FE50-4254-94A3-2DF949F50651} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0EFD7B65-3942-4774-A3BD-42A35C38A5AC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {45ED1548-5ACD-4DB0-9CDE-4174D48FCA8F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {77483F23-F478-40F0-B5B7-43D8E9B267A6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {18283B3F-ECC0-4B8F-A10F-1680DD72A847} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {EE232503-A47E-4AE7-BACB-6691447AE448} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E652D62A-B8E1-468C-A999-2CFC398253CC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C4FEA08E-B828-4DFF-B34C-828BF59FE766} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {7B6C5C42-D00E-41B4-9FA5-1B112B6E11F9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {12939E85-4D3C-4538-BFEE-659E69894E43} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {D9B33AA8-EE55-4CC2-ABA6-91C4758032B3} diff --git a/sdk/src/Services/MediaTailor/Properties/AssemblyInfo.cs b/sdk/src/Services/MediaTailor/Properties/AssemblyInfo.cs index 6b627d8822bf..635dbc175be5 100644 --- a/sdk/src/Services/MediaTailor/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/MediaTailor/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/MedicalImaging/Generated/AmazonMedicalImagingConfig.cs b/sdk/src/Services/MedicalImaging/Generated/AmazonMedicalImagingConfig.cs index 955e8eca74c4..b31e53d6d3be 100644 --- a/sdk/src/Services/MedicalImaging/Generated/AmazonMedicalImagingConfig.cs +++ b/sdk/src/Services/MedicalImaging/Generated/AmazonMedicalImagingConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.MedicalImaging public partial class AmazonMedicalImagingConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("Medical Imaging", "4.0.0.0"); private static readonly AmazonMedicalImagingEndpointResolver EndpointResolver = new AmazonMedicalImagingEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("Medical Imaging", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("Medical Imaging", "3.7.400.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/MedicalImaging/MedicalImaging.sln b/sdk/src/Services/MedicalImaging/MedicalImaging.sln index 255f10bcf9df..3189ab74c185 100644 --- a/sdk/src/Services/MedicalImaging/MedicalImaging.sln +++ b/sdk/src/Services/MedicalImaging/MedicalImaging.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {16890F6A-45E0-4267-A70C-DC626DE1C8E6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {16890F6A-45E0-4267-A70C-DC626DE1C8E6}.Debug|Any CPU.Build.0 = Debug|Any CPU {16890F6A-45E0-4267-A70C-DC626DE1C8E6}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {2CC93322-0014-47A1-838C-33F18E446F64}.Debug|Any CPU.Build.0 = Debug|Any CPU {2CC93322-0014-47A1-838C-33F18E446F64}.Release|Any CPU.ActiveCfg = Release|Any CPU {2CC93322-0014-47A1-838C-33F18E446F64}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {6D8FAABE-519F-4AC8-95EC-819FE8D5337A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6D8FAABE-519F-4AC8-95EC-819FE8D5337A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6D8FAABE-519F-4AC8-95EC-819FE8D5337A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6D8FAABE-519F-4AC8-95EC-819FE8D5337A}.Release|Any CPU.Build.0 = Release|Any CPU - {EA0B4695-E981-4BA2-813E-F342BF6C2252}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EA0B4695-E981-4BA2-813E-F342BF6C2252}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EA0B4695-E981-4BA2-813E-F342BF6C2252}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EA0B4695-E981-4BA2-813E-F342BF6C2252}.Release|Any CPU.Build.0 = Release|Any CPU - {41DDE7C0-CCD0-4E50-B9BB-62B4A0721C3E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {41DDE7C0-CCD0-4E50-B9BB-62B4A0721C3E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {41DDE7C0-CCD0-4E50-B9BB-62B4A0721C3E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {41DDE7C0-CCD0-4E50-B9BB-62B4A0721C3E}.Release|Any CPU.Build.0 = Release|Any CPU - {49B2059C-675D-482F-9497-655BAAB1DA44}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {49B2059C-675D-482F-9497-655BAAB1DA44}.Debug|Any CPU.Build.0 = Debug|Any CPU - {49B2059C-675D-482F-9497-655BAAB1DA44}.Release|Any CPU.ActiveCfg = Release|Any CPU - {49B2059C-675D-482F-9497-655BAAB1DA44}.Release|Any CPU.Build.0 = Release|Any CPU - {21CAB3AC-C58E-4188-AF5B-088C348D0822}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {21CAB3AC-C58E-4188-AF5B-088C348D0822}.Debug|Any CPU.Build.0 = Debug|Any CPU - {21CAB3AC-C58E-4188-AF5B-088C348D0822}.Release|Any CPU.ActiveCfg = Release|Any CPU - {21CAB3AC-C58E-4188-AF5B-088C348D0822}.Release|Any CPU.Build.0 = Release|Any CPU - {28AA306C-6F3B-4529-B741-7545327CCC1A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {28AA306C-6F3B-4529-B741-7545327CCC1A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {28AA306C-6F3B-4529-B741-7545327CCC1A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {28AA306C-6F3B-4529-B741-7545327CCC1A}.Release|Any CPU.Build.0 = Release|Any CPU - {7B7A94CF-92AD-49D0-B4E5-FBD5E926E667}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7B7A94CF-92AD-49D0-B4E5-FBD5E926E667}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7B7A94CF-92AD-49D0-B4E5-FBD5E926E667}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7B7A94CF-92AD-49D0-B4E5-FBD5E926E667}.Release|Any CPU.Build.0 = Release|Any CPU - {748CB0ED-AD0A-4358-B13D-0CDFEC8A54AC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {748CB0ED-AD0A-4358-B13D-0CDFEC8A54AC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {748CB0ED-AD0A-4358-B13D-0CDFEC8A54AC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {748CB0ED-AD0A-4358-B13D-0CDFEC8A54AC}.Release|Any CPU.Build.0 = Release|Any CPU - {FCA795A3-87BF-40C8-999E-1EFFEFE5F6B2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FCA795A3-87BF-40C8-999E-1EFFEFE5F6B2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FCA795A3-87BF-40C8-999E-1EFFEFE5F6B2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FCA795A3-87BF-40C8-999E-1EFFEFE5F6B2}.Release|Any CPU.Build.0 = Release|Any CPU - {EBFB465C-F13E-4D80-A9B0-67E278416839}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EBFB465C-F13E-4D80-A9B0-67E278416839}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EBFB465C-F13E-4D80-A9B0-67E278416839}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EBFB465C-F13E-4D80-A9B0-67E278416839}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {6D8FAABE-519F-4AC8-95EC-819FE8D5337A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6D8FAABE-519F-4AC8-95EC-819FE8D5337A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6D8FAABE-519F-4AC8-95EC-819FE8D5337A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6D8FAABE-519F-4AC8-95EC-819FE8D5337A}.Release|Any CPU.Build.0 = Release|Any CPU - {EA0B4695-E981-4BA2-813E-F342BF6C2252}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EA0B4695-E981-4BA2-813E-F342BF6C2252}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EA0B4695-E981-4BA2-813E-F342BF6C2252}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EA0B4695-E981-4BA2-813E-F342BF6C2252}.Release|Any CPU.Build.0 = Release|Any CPU - {41DDE7C0-CCD0-4E50-B9BB-62B4A0721C3E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {41DDE7C0-CCD0-4E50-B9BB-62B4A0721C3E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {41DDE7C0-CCD0-4E50-B9BB-62B4A0721C3E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {41DDE7C0-CCD0-4E50-B9BB-62B4A0721C3E}.Release|Any CPU.Build.0 = Release|Any CPU - {49B2059C-675D-482F-9497-655BAAB1DA44}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {49B2059C-675D-482F-9497-655BAAB1DA44}.Debug|Any CPU.Build.0 = Debug|Any CPU - {49B2059C-675D-482F-9497-655BAAB1DA44}.Release|Any CPU.ActiveCfg = Release|Any CPU - {49B2059C-675D-482F-9497-655BAAB1DA44}.Release|Any CPU.Build.0 = Release|Any CPU - {21CAB3AC-C58E-4188-AF5B-088C348D0822}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {21CAB3AC-C58E-4188-AF5B-088C348D0822}.Debug|Any CPU.Build.0 = Debug|Any CPU - {21CAB3AC-C58E-4188-AF5B-088C348D0822}.Release|Any CPU.ActiveCfg = Release|Any CPU - {21CAB3AC-C58E-4188-AF5B-088C348D0822}.Release|Any CPU.Build.0 = Release|Any CPU - {28AA306C-6F3B-4529-B741-7545327CCC1A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {28AA306C-6F3B-4529-B741-7545327CCC1A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {28AA306C-6F3B-4529-B741-7545327CCC1A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {28AA306C-6F3B-4529-B741-7545327CCC1A}.Release|Any CPU.Build.0 = Release|Any CPU - {7B7A94CF-92AD-49D0-B4E5-FBD5E926E667}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7B7A94CF-92AD-49D0-B4E5-FBD5E926E667}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7B7A94CF-92AD-49D0-B4E5-FBD5E926E667}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7B7A94CF-92AD-49D0-B4E5-FBD5E926E667}.Release|Any CPU.Build.0 = Release|Any CPU - {748CB0ED-AD0A-4358-B13D-0CDFEC8A54AC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {748CB0ED-AD0A-4358-B13D-0CDFEC8A54AC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {748CB0ED-AD0A-4358-B13D-0CDFEC8A54AC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {748CB0ED-AD0A-4358-B13D-0CDFEC8A54AC}.Release|Any CPU.Build.0 = Release|Any CPU - {FCA795A3-87BF-40C8-999E-1EFFEFE5F6B2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FCA795A3-87BF-40C8-999E-1EFFEFE5F6B2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FCA795A3-87BF-40C8-999E-1EFFEFE5F6B2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FCA795A3-87BF-40C8-999E-1EFFEFE5F6B2}.Release|Any CPU.Build.0 = Release|Any CPU - {EBFB465C-F13E-4D80-A9B0-67E278416839}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EBFB465C-F13E-4D80-A9B0-67E278416839}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EBFB465C-F13E-4D80-A9B0-67E278416839}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EBFB465C-F13E-4D80-A9B0-67E278416839}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {16890F6A-45E0-4267-A70C-DC626DE1C8E6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {0D8E9EAF-27D3-4CB5-8A21-8D8ED4F0242D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {CBCF6829-A4D9-48D6-8D3D-538754DAA14C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {CF3BC705-5AB2-461E-8B0D-82DB322792D3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {2CC93322-0014-47A1-838C-33F18E446F64} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {6D8FAABE-519F-4AC8-95EC-819FE8D5337A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {EA0B4695-E981-4BA2-813E-F342BF6C2252} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {41DDE7C0-CCD0-4E50-B9BB-62B4A0721C3E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {49B2059C-675D-482F-9497-655BAAB1DA44} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {21CAB3AC-C58E-4188-AF5B-088C348D0822} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {28AA306C-6F3B-4529-B741-7545327CCC1A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {7B7A94CF-92AD-49D0-B4E5-FBD5E926E667} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {748CB0ED-AD0A-4358-B13D-0CDFEC8A54AC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {FCA795A3-87BF-40C8-999E-1EFFEFE5F6B2} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {EBFB465C-F13E-4D80-A9B0-67E278416839} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {6D8FAABE-519F-4AC8-95EC-819FE8D5337A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {EA0B4695-E981-4BA2-813E-F342BF6C2252} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {41DDE7C0-CCD0-4E50-B9BB-62B4A0721C3E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {49B2059C-675D-482F-9497-655BAAB1DA44} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {21CAB3AC-C58E-4188-AF5B-088C348D0822} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {28AA306C-6F3B-4529-B741-7545327CCC1A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {7B7A94CF-92AD-49D0-B4E5-FBD5E926E667} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {748CB0ED-AD0A-4358-B13D-0CDFEC8A54AC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {FCA795A3-87BF-40C8-999E-1EFFEFE5F6B2} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {EBFB465C-F13E-4D80-A9B0-67E278416839} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {8D23B736-FF72-4004-A96E-92ED361C232E} diff --git a/sdk/src/Services/MedicalImaging/Properties/AssemblyInfo.cs b/sdk/src/Services/MedicalImaging/Properties/AssemblyInfo.cs index 3899af61a4b8..ff5ea31860c9 100644 --- a/sdk/src/Services/MedicalImaging/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/MedicalImaging/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/MemoryDB/Generated/AmazonMemoryDBConfig.cs b/sdk/src/Services/MemoryDB/Generated/AmazonMemoryDBConfig.cs index fada9bd806f4..b31d53fd7d43 100644 --- a/sdk/src/Services/MemoryDB/Generated/AmazonMemoryDBConfig.cs +++ b/sdk/src/Services/MemoryDB/Generated/AmazonMemoryDBConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.MemoryDB public partial class AmazonMemoryDBConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("MemoryDB", "4.0.0.0"); private static readonly AmazonMemoryDBEndpointResolver EndpointResolver = new AmazonMemoryDBEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("MemoryDB", "3.7.400.27"); -======= - InternalSDKUtils.BuildUserAgentString("MemoryDB", "3.7.401.21"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/MemoryDB/Generated/Model/Internal/MarshallTransformations/CreateClusterRequestMarshaller.cs b/sdk/src/Services/MemoryDB/Generated/Model/Internal/MarshallTransformations/CreateClusterRequestMarshaller.cs index b3863ec5cea3..9dc122ec351e 100644 --- a/sdk/src/Services/MemoryDB/Generated/Model/Internal/MarshallTransformations/CreateClusterRequestMarshaller.cs +++ b/sdk/src/Services/MemoryDB/Generated/Model/Internal/MarshallTransformations/CreateClusterRequestMarshaller.cs @@ -95,31 +95,17 @@ public IRequest Marshall(CreateClusterRequest publicRequest) context.Writer.Write(publicRequest.DataTiering.Value); } -<<<<<<< HEAD if(publicRequest.IsSetDescription()) { context.Writer.WritePropertyName("Description"); context.Writer.Write(publicRequest.Description); } -||||||| Commit version number update changes - if(publicRequest.IsSetEngineVersion()) - { - context.Writer.WritePropertyName("EngineVersion"); - context.Writer.Write(publicRequest.EngineVersion); - } -======= - if(publicRequest.IsSetEngine()) - { - context.Writer.WritePropertyName("Engine"); - context.Writer.Write(publicRequest.Engine); - } - if(publicRequest.IsSetEngineVersion()) - { - context.Writer.WritePropertyName("EngineVersion"); - context.Writer.Write(publicRequest.EngineVersion); - } ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b + if(publicRequest.IsSetEngine()) + { + context.Writer.WritePropertyName("Engine"); + context.Writer.Write(publicRequest.Engine); + } if(publicRequest.IsSetEngineVersion()) { diff --git a/sdk/src/Services/MemoryDB/Generated/Model/Internal/MarshallTransformations/DescribeEngineVersionsRequestMarshaller.cs b/sdk/src/Services/MemoryDB/Generated/Model/Internal/MarshallTransformations/DescribeEngineVersionsRequestMarshaller.cs index ce98a083252c..b0fec29fa0b5 100644 --- a/sdk/src/Services/MemoryDB/Generated/Model/Internal/MarshallTransformations/DescribeEngineVersionsRequestMarshaller.cs +++ b/sdk/src/Services/MemoryDB/Generated/Model/Internal/MarshallTransformations/DescribeEngineVersionsRequestMarshaller.cs @@ -77,31 +77,17 @@ public IRequest Marshall(DescribeEngineVersionsRequest publicRequest) context.Writer.Write(publicRequest.DefaultOnly.Value); } -<<<<<<< HEAD + if(publicRequest.IsSetEngine()) + { + context.Writer.WritePropertyName("Engine"); + context.Writer.Write(publicRequest.Engine); + } + if(publicRequest.IsSetEngineVersion()) { context.Writer.WritePropertyName("EngineVersion"); context.Writer.Write(publicRequest.EngineVersion); } -||||||| Commit version number update changes - if(publicRequest.IsSetEngineVersion()) - { - context.Writer.WritePropertyName("EngineVersion"); - context.Writer.Write(publicRequest.EngineVersion); - } -======= - if(publicRequest.IsSetEngine()) - { - context.Writer.WritePropertyName("Engine"); - context.Writer.Write(publicRequest.Engine); - } - - if(publicRequest.IsSetEngineVersion()) - { - context.Writer.WritePropertyName("EngineVersion"); - context.Writer.Write(publicRequest.EngineVersion); - } ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b if(publicRequest.IsSetMaxResults()) { diff --git a/sdk/src/Services/MemoryDB/Generated/Model/Internal/MarshallTransformations/UpdateClusterRequestMarshaller.cs b/sdk/src/Services/MemoryDB/Generated/Model/Internal/MarshallTransformations/UpdateClusterRequestMarshaller.cs index 305197bfe2d6..18ec21e70045 100644 --- a/sdk/src/Services/MemoryDB/Generated/Model/Internal/MarshallTransformations/UpdateClusterRequestMarshaller.cs +++ b/sdk/src/Services/MemoryDB/Generated/Model/Internal/MarshallTransformations/UpdateClusterRequestMarshaller.cs @@ -89,31 +89,17 @@ public IRequest Marshall(UpdateClusterRequest publicRequest) context.Writer.Write(publicRequest.Description); } -<<<<<<< HEAD + if(publicRequest.IsSetEngine()) + { + context.Writer.WritePropertyName("Engine"); + context.Writer.Write(publicRequest.Engine); + } + if(publicRequest.IsSetEngineVersion()) { context.Writer.WritePropertyName("EngineVersion"); context.Writer.Write(publicRequest.EngineVersion); } -||||||| Commit version number update changes - if(publicRequest.IsSetEngineVersion()) - { - context.Writer.WritePropertyName("EngineVersion"); - context.Writer.Write(publicRequest.EngineVersion); - } -======= - if(publicRequest.IsSetEngine()) - { - context.Writer.WritePropertyName("Engine"); - context.Writer.Write(publicRequest.Engine); - } - - if(publicRequest.IsSetEngineVersion()) - { - context.Writer.WritePropertyName("EngineVersion"); - context.Writer.Write(publicRequest.EngineVersion); - } ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b if(publicRequest.IsSetMaintenanceWindow()) { diff --git a/sdk/src/Services/MemoryDB/Generated/_bcl/AmazonMemoryDBClient.cs b/sdk/src/Services/MemoryDB/Generated/_bcl/AmazonMemoryDBClient.cs index 078bd52ff04e..25a63928f324 100644 --- a/sdk/src/Services/MemoryDB/Generated/_bcl/AmazonMemoryDBClient.cs +++ b/sdk/src/Services/MemoryDB/Generated/_bcl/AmazonMemoryDBClient.cs @@ -40,12 +40,12 @@ namespace Amazon.MemoryDB /// /// Implementation for accessing MemoryDB /// - /// MemoryDB is a fully managed, Redis OSS-compatible, in-memory database that delivers + /// MemoryDB for Redis is a fully managed, Redis-compatible, in-memory database that delivers /// ultra-fast performance and Multi-AZ durability for modern applications built using /// microservices architectures. MemoryDB stores the entire database in-memory, enabling - /// low latency and high throughput data access. It is compatible with Redis OSS, a popular - /// open source data store, enabling you to leverage Redis OSS’ flexible and friendly - /// data structures, APIs, and commands. + /// low latency and high throughput data access. It is compatible with Redis, a popular + /// open source data store, enabling you to leverage Redis’ flexible and friendly data + /// structures, APIs, and commands. /// public partial class AmazonMemoryDBClient : AmazonServiceClient, IAmazonMemoryDB { @@ -1058,13 +1058,6 @@ public virtual DeleteACLResponse DeleteACL(DeleteACLRequest request) /// /// Deletes a cluster. It also deletes all associated nodes and node endpoints - /// - /// - /// - /// CreateSnapshot permission is required to create a final snapshot. Without - /// this permission, the API call will fail with an Access Denied exception. - /// - /// /// /// Container for the necessary parameters to execute the DeleteCluster service method. /// @@ -1100,13 +1093,6 @@ public virtual DeleteClusterResponse DeleteCluster(DeleteClusterRequest request) /// /// Deletes a cluster. It also deletes all associated nodes and node endpoints - /// - /// - /// - /// CreateSnapshot permission is required to create a final snapshot. Without - /// this permission, the API call will fail with an Access Denied exception. - /// - /// /// /// Container for the necessary parameters to execute the DeleteCluster service method. /// @@ -1540,7 +1526,7 @@ public virtual DescribeClustersResponse DescribeClusters(DescribeClustersRequest /// - /// Returns a list of the available Redis OSS engine versions. + /// Returns a list of the available engine versions. /// /// Container for the necessary parameters to execute the DescribeEngineVersions service method. /// @@ -1566,7 +1552,7 @@ public virtual DescribeEngineVersionsResponse DescribeEngineVersions(DescribeEng /// - /// Returns a list of the available Redis OSS engine versions. + /// Returns a list of the available engine versions. /// /// Container for the necessary parameters to execute the DescribeEngineVersions service method. /// diff --git a/sdk/src/Services/MemoryDB/MemoryDB.sln b/sdk/src/Services/MemoryDB/MemoryDB.sln index db3f67904952..75058e72480a 100644 --- a/sdk/src/Services/MemoryDB/MemoryDB.sln +++ b/sdk/src/Services/MemoryDB/MemoryDB.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {14782E4A-CD22-4EB5-A969-36E674622A5E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {14782E4A-CD22-4EB5-A969-36E674622A5E}.Debug|Any CPU.Build.0 = Debug|Any CPU {14782E4A-CD22-4EB5-A969-36E674622A5E}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {B9E73DB5-B5ED-4E89-BE7B-BC795F594F20}.Debug|Any CPU.Build.0 = Debug|Any CPU {B9E73DB5-B5ED-4E89-BE7B-BC795F594F20}.Release|Any CPU.ActiveCfg = Release|Any CPU {B9E73DB5-B5ED-4E89-BE7B-BC795F594F20}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {347E0E81-DA5F-427C-A8F8-115D6D8A37DA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {347E0E81-DA5F-427C-A8F8-115D6D8A37DA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {347E0E81-DA5F-427C-A8F8-115D6D8A37DA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {347E0E81-DA5F-427C-A8F8-115D6D8A37DA}.Release|Any CPU.Build.0 = Release|Any CPU - {A0D9CA5E-8A4F-4CCD-BE54-6D33214193E1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A0D9CA5E-8A4F-4CCD-BE54-6D33214193E1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A0D9CA5E-8A4F-4CCD-BE54-6D33214193E1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A0D9CA5E-8A4F-4CCD-BE54-6D33214193E1}.Release|Any CPU.Build.0 = Release|Any CPU - {D79AD71D-719E-4692-8AE4-A03849245701}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D79AD71D-719E-4692-8AE4-A03849245701}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D79AD71D-719E-4692-8AE4-A03849245701}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D79AD71D-719E-4692-8AE4-A03849245701}.Release|Any CPU.Build.0 = Release|Any CPU - {0868FA62-22B0-4C97-990A-C10CCC8BE6D9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0868FA62-22B0-4C97-990A-C10CCC8BE6D9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0868FA62-22B0-4C97-990A-C10CCC8BE6D9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0868FA62-22B0-4C97-990A-C10CCC8BE6D9}.Release|Any CPU.Build.0 = Release|Any CPU - {07CDF5FE-518E-4244-9638-E13FBD67BB86}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {07CDF5FE-518E-4244-9638-E13FBD67BB86}.Debug|Any CPU.Build.0 = Debug|Any CPU - {07CDF5FE-518E-4244-9638-E13FBD67BB86}.Release|Any CPU.ActiveCfg = Release|Any CPU - {07CDF5FE-518E-4244-9638-E13FBD67BB86}.Release|Any CPU.Build.0 = Release|Any CPU - {AB9A40B3-67F7-4270-856C-AA1D04145116}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AB9A40B3-67F7-4270-856C-AA1D04145116}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AB9A40B3-67F7-4270-856C-AA1D04145116}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AB9A40B3-67F7-4270-856C-AA1D04145116}.Release|Any CPU.Build.0 = Release|Any CPU - {30EE382B-F0DF-4A25-92CC-A42715F8F295}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {30EE382B-F0DF-4A25-92CC-A42715F8F295}.Debug|Any CPU.Build.0 = Debug|Any CPU - {30EE382B-F0DF-4A25-92CC-A42715F8F295}.Release|Any CPU.ActiveCfg = Release|Any CPU - {30EE382B-F0DF-4A25-92CC-A42715F8F295}.Release|Any CPU.Build.0 = Release|Any CPU - {DA1A54C8-A4C3-4082-91C1-5A7A0100E390}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DA1A54C8-A4C3-4082-91C1-5A7A0100E390}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DA1A54C8-A4C3-4082-91C1-5A7A0100E390}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DA1A54C8-A4C3-4082-91C1-5A7A0100E390}.Release|Any CPU.Build.0 = Release|Any CPU - {FB3CDD9F-6C8E-4256-A511-07BCEF085B7C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FB3CDD9F-6C8E-4256-A511-07BCEF085B7C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FB3CDD9F-6C8E-4256-A511-07BCEF085B7C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FB3CDD9F-6C8E-4256-A511-07BCEF085B7C}.Release|Any CPU.Build.0 = Release|Any CPU - {C8491836-5DAA-4EC2-AE73-4C49CA43ADE5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C8491836-5DAA-4EC2-AE73-4C49CA43ADE5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C8491836-5DAA-4EC2-AE73-4C49CA43ADE5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C8491836-5DAA-4EC2-AE73-4C49CA43ADE5}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {347E0E81-DA5F-427C-A8F8-115D6D8A37DA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {347E0E81-DA5F-427C-A8F8-115D6D8A37DA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {347E0E81-DA5F-427C-A8F8-115D6D8A37DA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {347E0E81-DA5F-427C-A8F8-115D6D8A37DA}.Release|Any CPU.Build.0 = Release|Any CPU - {A0D9CA5E-8A4F-4CCD-BE54-6D33214193E1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A0D9CA5E-8A4F-4CCD-BE54-6D33214193E1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A0D9CA5E-8A4F-4CCD-BE54-6D33214193E1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A0D9CA5E-8A4F-4CCD-BE54-6D33214193E1}.Release|Any CPU.Build.0 = Release|Any CPU - {D79AD71D-719E-4692-8AE4-A03849245701}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D79AD71D-719E-4692-8AE4-A03849245701}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D79AD71D-719E-4692-8AE4-A03849245701}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D79AD71D-719E-4692-8AE4-A03849245701}.Release|Any CPU.Build.0 = Release|Any CPU - {0868FA62-22B0-4C97-990A-C10CCC8BE6D9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0868FA62-22B0-4C97-990A-C10CCC8BE6D9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0868FA62-22B0-4C97-990A-C10CCC8BE6D9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0868FA62-22B0-4C97-990A-C10CCC8BE6D9}.Release|Any CPU.Build.0 = Release|Any CPU - {07CDF5FE-518E-4244-9638-E13FBD67BB86}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {07CDF5FE-518E-4244-9638-E13FBD67BB86}.Debug|Any CPU.Build.0 = Debug|Any CPU - {07CDF5FE-518E-4244-9638-E13FBD67BB86}.Release|Any CPU.ActiveCfg = Release|Any CPU - {07CDF5FE-518E-4244-9638-E13FBD67BB86}.Release|Any CPU.Build.0 = Release|Any CPU - {AB9A40B3-67F7-4270-856C-AA1D04145116}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AB9A40B3-67F7-4270-856C-AA1D04145116}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AB9A40B3-67F7-4270-856C-AA1D04145116}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AB9A40B3-67F7-4270-856C-AA1D04145116}.Release|Any CPU.Build.0 = Release|Any CPU - {30EE382B-F0DF-4A25-92CC-A42715F8F295}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {30EE382B-F0DF-4A25-92CC-A42715F8F295}.Debug|Any CPU.Build.0 = Debug|Any CPU - {30EE382B-F0DF-4A25-92CC-A42715F8F295}.Release|Any CPU.ActiveCfg = Release|Any CPU - {30EE382B-F0DF-4A25-92CC-A42715F8F295}.Release|Any CPU.Build.0 = Release|Any CPU - {DA1A54C8-A4C3-4082-91C1-5A7A0100E390}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DA1A54C8-A4C3-4082-91C1-5A7A0100E390}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DA1A54C8-A4C3-4082-91C1-5A7A0100E390}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DA1A54C8-A4C3-4082-91C1-5A7A0100E390}.Release|Any CPU.Build.0 = Release|Any CPU - {FB3CDD9F-6C8E-4256-A511-07BCEF085B7C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FB3CDD9F-6C8E-4256-A511-07BCEF085B7C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FB3CDD9F-6C8E-4256-A511-07BCEF085B7C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FB3CDD9F-6C8E-4256-A511-07BCEF085B7C}.Release|Any CPU.Build.0 = Release|Any CPU - {C8491836-5DAA-4EC2-AE73-4C49CA43ADE5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C8491836-5DAA-4EC2-AE73-4C49CA43ADE5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C8491836-5DAA-4EC2-AE73-4C49CA43ADE5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C8491836-5DAA-4EC2-AE73-4C49CA43ADE5}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {14782E4A-CD22-4EB5-A969-36E674622A5E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {3A5AD4F3-BC04-4F12-8FCA-702325EE01D4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {ADADB903-07F8-4C0D-8A09-582D626B8AEA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {D0121082-DA26-4376-AE05-D3E2D17CE905} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {B9E73DB5-B5ED-4E89-BE7B-BC795F594F20} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {347E0E81-DA5F-427C-A8F8-115D6D8A37DA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A0D9CA5E-8A4F-4CCD-BE54-6D33214193E1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D79AD71D-719E-4692-8AE4-A03849245701} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0868FA62-22B0-4C97-990A-C10CCC8BE6D9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {07CDF5FE-518E-4244-9638-E13FBD67BB86} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {AB9A40B3-67F7-4270-856C-AA1D04145116} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {30EE382B-F0DF-4A25-92CC-A42715F8F295} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {DA1A54C8-A4C3-4082-91C1-5A7A0100E390} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {FB3CDD9F-6C8E-4256-A511-07BCEF085B7C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C8491836-5DAA-4EC2-AE73-4C49CA43ADE5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {347E0E81-DA5F-427C-A8F8-115D6D8A37DA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A0D9CA5E-8A4F-4CCD-BE54-6D33214193E1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D79AD71D-719E-4692-8AE4-A03849245701} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0868FA62-22B0-4C97-990A-C10CCC8BE6D9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {07CDF5FE-518E-4244-9638-E13FBD67BB86} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {AB9A40B3-67F7-4270-856C-AA1D04145116} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {30EE382B-F0DF-4A25-92CC-A42715F8F295} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {DA1A54C8-A4C3-4082-91C1-5A7A0100E390} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {FB3CDD9F-6C8E-4256-A511-07BCEF085B7C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C8491836-5DAA-4EC2-AE73-4C49CA43ADE5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {6496809E-35DC-423C-A3BF-4D1BF75A1B8B} diff --git a/sdk/src/Services/MemoryDB/Properties/AssemblyInfo.cs b/sdk/src/Services/MemoryDB/Properties/AssemblyInfo.cs index 40b4a9e26de5..634d6ed7a3ea 100644 --- a/sdk/src/Services/MemoryDB/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/MemoryDB/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.27")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.21")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/Mgn/Generated/AmazonMgnConfig.cs b/sdk/src/Services/Mgn/Generated/AmazonMgnConfig.cs index 3f4beeb02610..55f2c363f2a5 100644 --- a/sdk/src/Services/Mgn/Generated/AmazonMgnConfig.cs +++ b/sdk/src/Services/Mgn/Generated/AmazonMgnConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.Mgn public partial class AmazonMgnConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("mgn", "4.0.0.0"); private static readonly AmazonMgnEndpointResolver EndpointResolver = new AmazonMgnEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("mgn", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("mgn", "3.7.400.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/Mgn/Mgn.sln b/sdk/src/Services/Mgn/Mgn.sln index 9abc26c88c67..ea2ff1926461 100644 --- a/sdk/src/Services/Mgn/Mgn.sln +++ b/sdk/src/Services/Mgn/Mgn.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {C980A0D7-8CC0-405F-A802-EAD4B9954BF9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {C980A0D7-8CC0-405F-A802-EAD4B9954BF9}.Debug|Any CPU.Build.0 = Debug|Any CPU {C980A0D7-8CC0-405F-A802-EAD4B9954BF9}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {19A0EAFB-D569-4F72-BE42-0BA5246372FA}.Debug|Any CPU.Build.0 = Debug|Any CPU {19A0EAFB-D569-4F72-BE42-0BA5246372FA}.Release|Any CPU.ActiveCfg = Release|Any CPU {19A0EAFB-D569-4F72-BE42-0BA5246372FA}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {EF25286E-EC6B-45D6-BCB5-E2DD74A65C53}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EF25286E-EC6B-45D6-BCB5-E2DD74A65C53}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EF25286E-EC6B-45D6-BCB5-E2DD74A65C53}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EF25286E-EC6B-45D6-BCB5-E2DD74A65C53}.Release|Any CPU.Build.0 = Release|Any CPU - {DAA35EBD-05AB-4343-ACD4-B72164259FE4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DAA35EBD-05AB-4343-ACD4-B72164259FE4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DAA35EBD-05AB-4343-ACD4-B72164259FE4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DAA35EBD-05AB-4343-ACD4-B72164259FE4}.Release|Any CPU.Build.0 = Release|Any CPU - {5B4A3329-E5DC-4C43-A6CF-B9C6C6D22D15}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5B4A3329-E5DC-4C43-A6CF-B9C6C6D22D15}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5B4A3329-E5DC-4C43-A6CF-B9C6C6D22D15}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5B4A3329-E5DC-4C43-A6CF-B9C6C6D22D15}.Release|Any CPU.Build.0 = Release|Any CPU - {FADB0348-1301-4C57-A4C6-1F99570E946A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FADB0348-1301-4C57-A4C6-1F99570E946A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FADB0348-1301-4C57-A4C6-1F99570E946A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FADB0348-1301-4C57-A4C6-1F99570E946A}.Release|Any CPU.Build.0 = Release|Any CPU - {A3E0705C-6538-4D1E-8FBE-5CC8D7D46F6F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A3E0705C-6538-4D1E-8FBE-5CC8D7D46F6F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A3E0705C-6538-4D1E-8FBE-5CC8D7D46F6F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A3E0705C-6538-4D1E-8FBE-5CC8D7D46F6F}.Release|Any CPU.Build.0 = Release|Any CPU - {8132D249-3E69-4411-B861-095350CEF675}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8132D249-3E69-4411-B861-095350CEF675}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8132D249-3E69-4411-B861-095350CEF675}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8132D249-3E69-4411-B861-095350CEF675}.Release|Any CPU.Build.0 = Release|Any CPU - {72E20A81-02E2-4238-896A-48133E97DB93}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {72E20A81-02E2-4238-896A-48133E97DB93}.Debug|Any CPU.Build.0 = Debug|Any CPU - {72E20A81-02E2-4238-896A-48133E97DB93}.Release|Any CPU.ActiveCfg = Release|Any CPU - {72E20A81-02E2-4238-896A-48133E97DB93}.Release|Any CPU.Build.0 = Release|Any CPU - {20C0CC2C-972C-4407-94FB-4766C7A778FA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {20C0CC2C-972C-4407-94FB-4766C7A778FA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {20C0CC2C-972C-4407-94FB-4766C7A778FA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {20C0CC2C-972C-4407-94FB-4766C7A778FA}.Release|Any CPU.Build.0 = Release|Any CPU - {6A116CD1-B2AA-457A-9D7F-6ACB26290208}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6A116CD1-B2AA-457A-9D7F-6ACB26290208}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6A116CD1-B2AA-457A-9D7F-6ACB26290208}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6A116CD1-B2AA-457A-9D7F-6ACB26290208}.Release|Any CPU.Build.0 = Release|Any CPU - {20A81AD3-9F66-4963-9567-50E5264D016E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {20A81AD3-9F66-4963-9567-50E5264D016E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {20A81AD3-9F66-4963-9567-50E5264D016E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {20A81AD3-9F66-4963-9567-50E5264D016E}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {EF25286E-EC6B-45D6-BCB5-E2DD74A65C53}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EF25286E-EC6B-45D6-BCB5-E2DD74A65C53}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EF25286E-EC6B-45D6-BCB5-E2DD74A65C53}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EF25286E-EC6B-45D6-BCB5-E2DD74A65C53}.Release|Any CPU.Build.0 = Release|Any CPU - {DAA35EBD-05AB-4343-ACD4-B72164259FE4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DAA35EBD-05AB-4343-ACD4-B72164259FE4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DAA35EBD-05AB-4343-ACD4-B72164259FE4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DAA35EBD-05AB-4343-ACD4-B72164259FE4}.Release|Any CPU.Build.0 = Release|Any CPU - {5B4A3329-E5DC-4C43-A6CF-B9C6C6D22D15}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5B4A3329-E5DC-4C43-A6CF-B9C6C6D22D15}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5B4A3329-E5DC-4C43-A6CF-B9C6C6D22D15}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5B4A3329-E5DC-4C43-A6CF-B9C6C6D22D15}.Release|Any CPU.Build.0 = Release|Any CPU - {FADB0348-1301-4C57-A4C6-1F99570E946A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FADB0348-1301-4C57-A4C6-1F99570E946A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FADB0348-1301-4C57-A4C6-1F99570E946A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FADB0348-1301-4C57-A4C6-1F99570E946A}.Release|Any CPU.Build.0 = Release|Any CPU - {A3E0705C-6538-4D1E-8FBE-5CC8D7D46F6F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A3E0705C-6538-4D1E-8FBE-5CC8D7D46F6F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A3E0705C-6538-4D1E-8FBE-5CC8D7D46F6F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A3E0705C-6538-4D1E-8FBE-5CC8D7D46F6F}.Release|Any CPU.Build.0 = Release|Any CPU - {8132D249-3E69-4411-B861-095350CEF675}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8132D249-3E69-4411-B861-095350CEF675}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8132D249-3E69-4411-B861-095350CEF675}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8132D249-3E69-4411-B861-095350CEF675}.Release|Any CPU.Build.0 = Release|Any CPU - {72E20A81-02E2-4238-896A-48133E97DB93}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {72E20A81-02E2-4238-896A-48133E97DB93}.Debug|Any CPU.Build.0 = Debug|Any CPU - {72E20A81-02E2-4238-896A-48133E97DB93}.Release|Any CPU.ActiveCfg = Release|Any CPU - {72E20A81-02E2-4238-896A-48133E97DB93}.Release|Any CPU.Build.0 = Release|Any CPU - {20C0CC2C-972C-4407-94FB-4766C7A778FA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {20C0CC2C-972C-4407-94FB-4766C7A778FA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {20C0CC2C-972C-4407-94FB-4766C7A778FA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {20C0CC2C-972C-4407-94FB-4766C7A778FA}.Release|Any CPU.Build.0 = Release|Any CPU - {6A116CD1-B2AA-457A-9D7F-6ACB26290208}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6A116CD1-B2AA-457A-9D7F-6ACB26290208}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6A116CD1-B2AA-457A-9D7F-6ACB26290208}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6A116CD1-B2AA-457A-9D7F-6ACB26290208}.Release|Any CPU.Build.0 = Release|Any CPU - {20A81AD3-9F66-4963-9567-50E5264D016E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {20A81AD3-9F66-4963-9567-50E5264D016E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {20A81AD3-9F66-4963-9567-50E5264D016E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {20A81AD3-9F66-4963-9567-50E5264D016E}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {C980A0D7-8CC0-405F-A802-EAD4B9954BF9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {68BAACB2-CFCC-4E6C-B0D9-E52B9B745FF3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {8D57E467-1D47-4B02-A3B6-4725E2BE83DA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {0DC3781D-EC2C-4002-B9A3-E454ABFCDE32} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {19A0EAFB-D569-4F72-BE42-0BA5246372FA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {EF25286E-EC6B-45D6-BCB5-E2DD74A65C53} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {DAA35EBD-05AB-4343-ACD4-B72164259FE4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {5B4A3329-E5DC-4C43-A6CF-B9C6C6D22D15} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {FADB0348-1301-4C57-A4C6-1F99570E946A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A3E0705C-6538-4D1E-8FBE-5CC8D7D46F6F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8132D249-3E69-4411-B861-095350CEF675} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {72E20A81-02E2-4238-896A-48133E97DB93} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {20C0CC2C-972C-4407-94FB-4766C7A778FA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6A116CD1-B2AA-457A-9D7F-6ACB26290208} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {20A81AD3-9F66-4963-9567-50E5264D016E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {EF25286E-EC6B-45D6-BCB5-E2DD74A65C53} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {DAA35EBD-05AB-4343-ACD4-B72164259FE4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {5B4A3329-E5DC-4C43-A6CF-B9C6C6D22D15} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {FADB0348-1301-4C57-A4C6-1F99570E946A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A3E0705C-6538-4D1E-8FBE-5CC8D7D46F6F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8132D249-3E69-4411-B861-095350CEF675} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {72E20A81-02E2-4238-896A-48133E97DB93} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {20C0CC2C-972C-4407-94FB-4766C7A778FA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6A116CD1-B2AA-457A-9D7F-6ACB26290208} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {20A81AD3-9F66-4963-9567-50E5264D016E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {DCD1C79E-0341-4715-97FD-0D9D25E10699} diff --git a/sdk/src/Services/Mgn/Properties/AssemblyInfo.cs b/sdk/src/Services/Mgn/Properties/AssemblyInfo.cs index 0679d7c02be1..e9cbe1e52cfd 100644 --- a/sdk/src/Services/Mgn/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/Mgn/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/MigrationHub/Generated/AmazonMigrationHubConfig.cs b/sdk/src/Services/MigrationHub/Generated/AmazonMigrationHubConfig.cs index 61d845b4a788..865ce7855812 100644 --- a/sdk/src/Services/MigrationHub/Generated/AmazonMigrationHubConfig.cs +++ b/sdk/src/Services/MigrationHub/Generated/AmazonMigrationHubConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.MigrationHub public partial class AmazonMigrationHubConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("Migration Hub", "4.0.0.0"); private static readonly AmazonMigrationHubEndpointResolver EndpointResolver = new AmazonMigrationHubEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("Migration Hub", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("Migration Hub", "3.7.400.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/MigrationHub/MigrationHub.sln b/sdk/src/Services/MigrationHub/MigrationHub.sln index 2cc5a3d7af9b..087f358c09d6 100644 --- a/sdk/src/Services/MigrationHub/MigrationHub.sln +++ b/sdk/src/Services/MigrationHub/MigrationHub.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {E4489CB8-ADC3-40E0-B6A9-4EFD4A67A750}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {E4489CB8-ADC3-40E0-B6A9-4EFD4A67A750}.Debug|Any CPU.Build.0 = Debug|Any CPU {E4489CB8-ADC3-40E0-B6A9-4EFD4A67A750}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {84A42391-F3EB-4BAE-9946-41AC46C4FBC7}.Debug|Any CPU.Build.0 = Debug|Any CPU {84A42391-F3EB-4BAE-9946-41AC46C4FBC7}.Release|Any CPU.ActiveCfg = Release|Any CPU {84A42391-F3EB-4BAE-9946-41AC46C4FBC7}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {BA9C25CB-B6DC-4E87-A9F9-DC3E21FF7FF6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BA9C25CB-B6DC-4E87-A9F9-DC3E21FF7FF6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BA9C25CB-B6DC-4E87-A9F9-DC3E21FF7FF6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BA9C25CB-B6DC-4E87-A9F9-DC3E21FF7FF6}.Release|Any CPU.Build.0 = Release|Any CPU - {603FFC6E-19FE-48E5-ADA8-14BFC139E9EA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {603FFC6E-19FE-48E5-ADA8-14BFC139E9EA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {603FFC6E-19FE-48E5-ADA8-14BFC139E9EA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {603FFC6E-19FE-48E5-ADA8-14BFC139E9EA}.Release|Any CPU.Build.0 = Release|Any CPU - {2A61D5D0-7519-401F-8185-8434C73E8CD5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2A61D5D0-7519-401F-8185-8434C73E8CD5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2A61D5D0-7519-401F-8185-8434C73E8CD5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2A61D5D0-7519-401F-8185-8434C73E8CD5}.Release|Any CPU.Build.0 = Release|Any CPU - {50C53A33-8A67-41B5-BA97-DA8AE2CC75D7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {50C53A33-8A67-41B5-BA97-DA8AE2CC75D7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {50C53A33-8A67-41B5-BA97-DA8AE2CC75D7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {50C53A33-8A67-41B5-BA97-DA8AE2CC75D7}.Release|Any CPU.Build.0 = Release|Any CPU - {A20D2F94-D13A-4580-AF65-A496A9EA803C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A20D2F94-D13A-4580-AF65-A496A9EA803C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A20D2F94-D13A-4580-AF65-A496A9EA803C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A20D2F94-D13A-4580-AF65-A496A9EA803C}.Release|Any CPU.Build.0 = Release|Any CPU - {DDF3E29A-B45E-402A-A04D-93984455C869}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DDF3E29A-B45E-402A-A04D-93984455C869}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DDF3E29A-B45E-402A-A04D-93984455C869}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DDF3E29A-B45E-402A-A04D-93984455C869}.Release|Any CPU.Build.0 = Release|Any CPU - {E4EC21A6-4F41-425A-AF9C-751553B0DAD6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E4EC21A6-4F41-425A-AF9C-751553B0DAD6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E4EC21A6-4F41-425A-AF9C-751553B0DAD6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E4EC21A6-4F41-425A-AF9C-751553B0DAD6}.Release|Any CPU.Build.0 = Release|Any CPU - {81F3818E-C816-4F53-8836-F1C496A6721D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {81F3818E-C816-4F53-8836-F1C496A6721D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {81F3818E-C816-4F53-8836-F1C496A6721D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {81F3818E-C816-4F53-8836-F1C496A6721D}.Release|Any CPU.Build.0 = Release|Any CPU - {8A73149D-C3EE-4947-B119-2CF9E8AFFFD0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8A73149D-C3EE-4947-B119-2CF9E8AFFFD0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8A73149D-C3EE-4947-B119-2CF9E8AFFFD0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8A73149D-C3EE-4947-B119-2CF9E8AFFFD0}.Release|Any CPU.Build.0 = Release|Any CPU - {E9628D51-B747-4C70-898C-445FDCD627B3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E9628D51-B747-4C70-898C-445FDCD627B3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E9628D51-B747-4C70-898C-445FDCD627B3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E9628D51-B747-4C70-898C-445FDCD627B3}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {BA9C25CB-B6DC-4E87-A9F9-DC3E21FF7FF6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BA9C25CB-B6DC-4E87-A9F9-DC3E21FF7FF6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BA9C25CB-B6DC-4E87-A9F9-DC3E21FF7FF6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BA9C25CB-B6DC-4E87-A9F9-DC3E21FF7FF6}.Release|Any CPU.Build.0 = Release|Any CPU - {603FFC6E-19FE-48E5-ADA8-14BFC139E9EA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {603FFC6E-19FE-48E5-ADA8-14BFC139E9EA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {603FFC6E-19FE-48E5-ADA8-14BFC139E9EA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {603FFC6E-19FE-48E5-ADA8-14BFC139E9EA}.Release|Any CPU.Build.0 = Release|Any CPU - {2A61D5D0-7519-401F-8185-8434C73E8CD5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2A61D5D0-7519-401F-8185-8434C73E8CD5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2A61D5D0-7519-401F-8185-8434C73E8CD5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2A61D5D0-7519-401F-8185-8434C73E8CD5}.Release|Any CPU.Build.0 = Release|Any CPU - {50C53A33-8A67-41B5-BA97-DA8AE2CC75D7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {50C53A33-8A67-41B5-BA97-DA8AE2CC75D7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {50C53A33-8A67-41B5-BA97-DA8AE2CC75D7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {50C53A33-8A67-41B5-BA97-DA8AE2CC75D7}.Release|Any CPU.Build.0 = Release|Any CPU - {A20D2F94-D13A-4580-AF65-A496A9EA803C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A20D2F94-D13A-4580-AF65-A496A9EA803C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A20D2F94-D13A-4580-AF65-A496A9EA803C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A20D2F94-D13A-4580-AF65-A496A9EA803C}.Release|Any CPU.Build.0 = Release|Any CPU - {DDF3E29A-B45E-402A-A04D-93984455C869}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DDF3E29A-B45E-402A-A04D-93984455C869}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DDF3E29A-B45E-402A-A04D-93984455C869}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DDF3E29A-B45E-402A-A04D-93984455C869}.Release|Any CPU.Build.0 = Release|Any CPU - {E4EC21A6-4F41-425A-AF9C-751553B0DAD6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E4EC21A6-4F41-425A-AF9C-751553B0DAD6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E4EC21A6-4F41-425A-AF9C-751553B0DAD6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E4EC21A6-4F41-425A-AF9C-751553B0DAD6}.Release|Any CPU.Build.0 = Release|Any CPU - {81F3818E-C816-4F53-8836-F1C496A6721D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {81F3818E-C816-4F53-8836-F1C496A6721D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {81F3818E-C816-4F53-8836-F1C496A6721D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {81F3818E-C816-4F53-8836-F1C496A6721D}.Release|Any CPU.Build.0 = Release|Any CPU - {8A73149D-C3EE-4947-B119-2CF9E8AFFFD0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8A73149D-C3EE-4947-B119-2CF9E8AFFFD0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8A73149D-C3EE-4947-B119-2CF9E8AFFFD0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8A73149D-C3EE-4947-B119-2CF9E8AFFFD0}.Release|Any CPU.Build.0 = Release|Any CPU - {E9628D51-B747-4C70-898C-445FDCD627B3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E9628D51-B747-4C70-898C-445FDCD627B3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E9628D51-B747-4C70-898C-445FDCD627B3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E9628D51-B747-4C70-898C-445FDCD627B3}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {E4489CB8-ADC3-40E0-B6A9-4EFD4A67A750} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {2D36137E-9FD0-4D1E-A9E0-727DA53D2689} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {2C7A5BC9-28EA-4819-929E-DE54243BBEB6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {9F4A897B-C1FE-4EDC-931E-9B5A256CAEF5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {84A42391-F3EB-4BAE-9946-41AC46C4FBC7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {BA9C25CB-B6DC-4E87-A9F9-DC3E21FF7FF6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {603FFC6E-19FE-48E5-ADA8-14BFC139E9EA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {2A61D5D0-7519-401F-8185-8434C73E8CD5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {50C53A33-8A67-41B5-BA97-DA8AE2CC75D7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A20D2F94-D13A-4580-AF65-A496A9EA803C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {DDF3E29A-B45E-402A-A04D-93984455C869} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E4EC21A6-4F41-425A-AF9C-751553B0DAD6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {81F3818E-C816-4F53-8836-F1C496A6721D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8A73149D-C3EE-4947-B119-2CF9E8AFFFD0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E9628D51-B747-4C70-898C-445FDCD627B3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {BA9C25CB-B6DC-4E87-A9F9-DC3E21FF7FF6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {603FFC6E-19FE-48E5-ADA8-14BFC139E9EA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {2A61D5D0-7519-401F-8185-8434C73E8CD5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {50C53A33-8A67-41B5-BA97-DA8AE2CC75D7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A20D2F94-D13A-4580-AF65-A496A9EA803C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {DDF3E29A-B45E-402A-A04D-93984455C869} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E4EC21A6-4F41-425A-AF9C-751553B0DAD6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {81F3818E-C816-4F53-8836-F1C496A6721D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8A73149D-C3EE-4947-B119-2CF9E8AFFFD0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E9628D51-B747-4C70-898C-445FDCD627B3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {087B60EE-9862-4C0B-AB4B-7F0B8B744D3E} diff --git a/sdk/src/Services/MigrationHub/Properties/AssemblyInfo.cs b/sdk/src/Services/MigrationHub/Properties/AssemblyInfo.cs index c33ba137a39b..df53b7b9a449 100644 --- a/sdk/src/Services/MigrationHub/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/MigrationHub/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/MigrationHubConfig/Generated/AmazonMigrationHubConfigConfig.cs b/sdk/src/Services/MigrationHubConfig/Generated/AmazonMigrationHubConfigConfig.cs index 5b25f14d5397..dccad28361f1 100644 --- a/sdk/src/Services/MigrationHubConfig/Generated/AmazonMigrationHubConfigConfig.cs +++ b/sdk/src/Services/MigrationHubConfig/Generated/AmazonMigrationHubConfigConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.MigrationHubConfig public partial class AmazonMigrationHubConfigConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("MigrationHub Config", "4.0.0.0"); private static readonly AmazonMigrationHubConfigEndpointResolver EndpointResolver = new AmazonMigrationHubConfigEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("MigrationHub Config", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("MigrationHub Config", "3.7.400.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/MigrationHubConfig/MigrationHubConfig.sln b/sdk/src/Services/MigrationHubConfig/MigrationHubConfig.sln index 4c59beafd626..3dafdb4b17fc 100644 --- a/sdk/src/Services/MigrationHubConfig/MigrationHubConfig.sln +++ b/sdk/src/Services/MigrationHubConfig/MigrationHubConfig.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {7B718883-FDC2-476E-9502-F17EE82E8BB6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {7B718883-FDC2-476E-9502-F17EE82E8BB6}.Debug|Any CPU.Build.0 = Debug|Any CPU {7B718883-FDC2-476E-9502-F17EE82E8BB6}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {964AEA7A-5D54-4607-BE40-1E10DD60671E}.Debug|Any CPU.Build.0 = Debug|Any CPU {964AEA7A-5D54-4607-BE40-1E10DD60671E}.Release|Any CPU.ActiveCfg = Release|Any CPU {964AEA7A-5D54-4607-BE40-1E10DD60671E}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {70D823D9-F9FD-4F1A-84F4-4A105216884F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {70D823D9-F9FD-4F1A-84F4-4A105216884F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {70D823D9-F9FD-4F1A-84F4-4A105216884F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {70D823D9-F9FD-4F1A-84F4-4A105216884F}.Release|Any CPU.Build.0 = Release|Any CPU - {2864DD2C-C8F5-489A-B28B-CBED730F143A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2864DD2C-C8F5-489A-B28B-CBED730F143A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2864DD2C-C8F5-489A-B28B-CBED730F143A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2864DD2C-C8F5-489A-B28B-CBED730F143A}.Release|Any CPU.Build.0 = Release|Any CPU - {204B3FE3-7835-4A6B-BC66-9B99756FFB5A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {204B3FE3-7835-4A6B-BC66-9B99756FFB5A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {204B3FE3-7835-4A6B-BC66-9B99756FFB5A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {204B3FE3-7835-4A6B-BC66-9B99756FFB5A}.Release|Any CPU.Build.0 = Release|Any CPU - {E90D0A40-9128-4191-951A-975615A6202A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E90D0A40-9128-4191-951A-975615A6202A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E90D0A40-9128-4191-951A-975615A6202A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E90D0A40-9128-4191-951A-975615A6202A}.Release|Any CPU.Build.0 = Release|Any CPU - {973370B2-8872-40B5-A9B1-99C1D712F14B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {973370B2-8872-40B5-A9B1-99C1D712F14B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {973370B2-8872-40B5-A9B1-99C1D712F14B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {973370B2-8872-40B5-A9B1-99C1D712F14B}.Release|Any CPU.Build.0 = Release|Any CPU - {5C560AD3-9A84-4EA1-846E-CAB9FBCD05E1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5C560AD3-9A84-4EA1-846E-CAB9FBCD05E1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5C560AD3-9A84-4EA1-846E-CAB9FBCD05E1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5C560AD3-9A84-4EA1-846E-CAB9FBCD05E1}.Release|Any CPU.Build.0 = Release|Any CPU - {9FF6E2C6-76F1-4D82-9BB1-E4425BFDFFB9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9FF6E2C6-76F1-4D82-9BB1-E4425BFDFFB9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9FF6E2C6-76F1-4D82-9BB1-E4425BFDFFB9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9FF6E2C6-76F1-4D82-9BB1-E4425BFDFFB9}.Release|Any CPU.Build.0 = Release|Any CPU - {2B554694-1C8B-4497-87D1-D78397E90BA3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2B554694-1C8B-4497-87D1-D78397E90BA3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2B554694-1C8B-4497-87D1-D78397E90BA3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2B554694-1C8B-4497-87D1-D78397E90BA3}.Release|Any CPU.Build.0 = Release|Any CPU - {1BA1F05B-4064-4B2B-81B5-DAA939763E77}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1BA1F05B-4064-4B2B-81B5-DAA939763E77}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1BA1F05B-4064-4B2B-81B5-DAA939763E77}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1BA1F05B-4064-4B2B-81B5-DAA939763E77}.Release|Any CPU.Build.0 = Release|Any CPU - {7FF33989-B309-4CA7-9D95-EDE7C45645A3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7FF33989-B309-4CA7-9D95-EDE7C45645A3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7FF33989-B309-4CA7-9D95-EDE7C45645A3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7FF33989-B309-4CA7-9D95-EDE7C45645A3}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {70D823D9-F9FD-4F1A-84F4-4A105216884F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {70D823D9-F9FD-4F1A-84F4-4A105216884F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {70D823D9-F9FD-4F1A-84F4-4A105216884F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {70D823D9-F9FD-4F1A-84F4-4A105216884F}.Release|Any CPU.Build.0 = Release|Any CPU - {2864DD2C-C8F5-489A-B28B-CBED730F143A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2864DD2C-C8F5-489A-B28B-CBED730F143A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2864DD2C-C8F5-489A-B28B-CBED730F143A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2864DD2C-C8F5-489A-B28B-CBED730F143A}.Release|Any CPU.Build.0 = Release|Any CPU - {204B3FE3-7835-4A6B-BC66-9B99756FFB5A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {204B3FE3-7835-4A6B-BC66-9B99756FFB5A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {204B3FE3-7835-4A6B-BC66-9B99756FFB5A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {204B3FE3-7835-4A6B-BC66-9B99756FFB5A}.Release|Any CPU.Build.0 = Release|Any CPU - {E90D0A40-9128-4191-951A-975615A6202A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E90D0A40-9128-4191-951A-975615A6202A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E90D0A40-9128-4191-951A-975615A6202A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E90D0A40-9128-4191-951A-975615A6202A}.Release|Any CPU.Build.0 = Release|Any CPU - {973370B2-8872-40B5-A9B1-99C1D712F14B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {973370B2-8872-40B5-A9B1-99C1D712F14B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {973370B2-8872-40B5-A9B1-99C1D712F14B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {973370B2-8872-40B5-A9B1-99C1D712F14B}.Release|Any CPU.Build.0 = Release|Any CPU - {5C560AD3-9A84-4EA1-846E-CAB9FBCD05E1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5C560AD3-9A84-4EA1-846E-CAB9FBCD05E1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5C560AD3-9A84-4EA1-846E-CAB9FBCD05E1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5C560AD3-9A84-4EA1-846E-CAB9FBCD05E1}.Release|Any CPU.Build.0 = Release|Any CPU - {9FF6E2C6-76F1-4D82-9BB1-E4425BFDFFB9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9FF6E2C6-76F1-4D82-9BB1-E4425BFDFFB9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9FF6E2C6-76F1-4D82-9BB1-E4425BFDFFB9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9FF6E2C6-76F1-4D82-9BB1-E4425BFDFFB9}.Release|Any CPU.Build.0 = Release|Any CPU - {2B554694-1C8B-4497-87D1-D78397E90BA3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2B554694-1C8B-4497-87D1-D78397E90BA3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2B554694-1C8B-4497-87D1-D78397E90BA3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2B554694-1C8B-4497-87D1-D78397E90BA3}.Release|Any CPU.Build.0 = Release|Any CPU - {1BA1F05B-4064-4B2B-81B5-DAA939763E77}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1BA1F05B-4064-4B2B-81B5-DAA939763E77}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1BA1F05B-4064-4B2B-81B5-DAA939763E77}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1BA1F05B-4064-4B2B-81B5-DAA939763E77}.Release|Any CPU.Build.0 = Release|Any CPU - {7FF33989-B309-4CA7-9D95-EDE7C45645A3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7FF33989-B309-4CA7-9D95-EDE7C45645A3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7FF33989-B309-4CA7-9D95-EDE7C45645A3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7FF33989-B309-4CA7-9D95-EDE7C45645A3}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7B718883-FDC2-476E-9502-F17EE82E8BB6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {763DBCD8-0EFB-42A7-BDB7-648504B73C03} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {5CA6F547-98FD-4CA8-9720-F22D7721A38B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {335AA918-C478-435A-A835-4619D30AC57E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {964AEA7A-5D54-4607-BE40-1E10DD60671E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {70D823D9-F9FD-4F1A-84F4-4A105216884F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {2864DD2C-C8F5-489A-B28B-CBED730F143A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {204B3FE3-7835-4A6B-BC66-9B99756FFB5A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E90D0A40-9128-4191-951A-975615A6202A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {973370B2-8872-40B5-A9B1-99C1D712F14B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {5C560AD3-9A84-4EA1-846E-CAB9FBCD05E1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {9FF6E2C6-76F1-4D82-9BB1-E4425BFDFFB9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {2B554694-1C8B-4497-87D1-D78397E90BA3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {1BA1F05B-4064-4B2B-81B5-DAA939763E77} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {7FF33989-B309-4CA7-9D95-EDE7C45645A3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {70D823D9-F9FD-4F1A-84F4-4A105216884F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {2864DD2C-C8F5-489A-B28B-CBED730F143A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {204B3FE3-7835-4A6B-BC66-9B99756FFB5A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E90D0A40-9128-4191-951A-975615A6202A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {973370B2-8872-40B5-A9B1-99C1D712F14B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {5C560AD3-9A84-4EA1-846E-CAB9FBCD05E1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {9FF6E2C6-76F1-4D82-9BB1-E4425BFDFFB9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {2B554694-1C8B-4497-87D1-D78397E90BA3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {1BA1F05B-4064-4B2B-81B5-DAA939763E77} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {7FF33989-B309-4CA7-9D95-EDE7C45645A3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {4E774934-AE7B-4F0A-8AFC-ECA3B344AD3B} diff --git a/sdk/src/Services/MigrationHubConfig/Properties/AssemblyInfo.cs b/sdk/src/Services/MigrationHubConfig/Properties/AssemblyInfo.cs index cda6bc5f029d..d3c0bcad6ef3 100644 --- a/sdk/src/Services/MigrationHubConfig/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/MigrationHubConfig/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/MigrationHubOrchestrator/Generated/AmazonMigrationHubOrchestratorConfig.cs b/sdk/src/Services/MigrationHubOrchestrator/Generated/AmazonMigrationHubOrchestratorConfig.cs index d76887294cca..84565c8869bb 100644 --- a/sdk/src/Services/MigrationHubOrchestrator/Generated/AmazonMigrationHubOrchestratorConfig.cs +++ b/sdk/src/Services/MigrationHubOrchestrator/Generated/AmazonMigrationHubOrchestratorConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.MigrationHubOrchestrator public partial class AmazonMigrationHubOrchestratorConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("MigrationHubOrchestrator", "4.0.0.0"); private static readonly AmazonMigrationHubOrchestratorEndpointResolver EndpointResolver = new AmazonMigrationHubOrchestratorEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("MigrationHubOrchestrator", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("MigrationHubOrchestrator", "3.7.400.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/MigrationHubOrchestrator/MigrationHubOrchestrator.sln b/sdk/src/Services/MigrationHubOrchestrator/MigrationHubOrchestrator.sln index 94e8f8ccd569..ef1e88bec67d 100644 --- a/sdk/src/Services/MigrationHubOrchestrator/MigrationHubOrchestrator.sln +++ b/sdk/src/Services/MigrationHubOrchestrator/MigrationHubOrchestrator.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {14C6D97B-9588-4C95-8D0E-F272DA7AAFF9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {14C6D97B-9588-4C95-8D0E-F272DA7AAFF9}.Debug|Any CPU.Build.0 = Debug|Any CPU {14C6D97B-9588-4C95-8D0E-F272DA7AAFF9}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {BFF27F20-EBF9-4314-BB62-865F7D022E2D}.Debug|Any CPU.Build.0 = Debug|Any CPU {BFF27F20-EBF9-4314-BB62-865F7D022E2D}.Release|Any CPU.ActiveCfg = Release|Any CPU {BFF27F20-EBF9-4314-BB62-865F7D022E2D}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {726E5CD6-E783-49CB-A9EB-93FC09D91DAA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {726E5CD6-E783-49CB-A9EB-93FC09D91DAA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {726E5CD6-E783-49CB-A9EB-93FC09D91DAA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {726E5CD6-E783-49CB-A9EB-93FC09D91DAA}.Release|Any CPU.Build.0 = Release|Any CPU - {C09BDFC5-B23A-4AC3-AD2C-66F264BB5ECA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C09BDFC5-B23A-4AC3-AD2C-66F264BB5ECA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C09BDFC5-B23A-4AC3-AD2C-66F264BB5ECA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C09BDFC5-B23A-4AC3-AD2C-66F264BB5ECA}.Release|Any CPU.Build.0 = Release|Any CPU - {1A564E70-B15A-4BD7-B120-E8FBC0DC119A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1A564E70-B15A-4BD7-B120-E8FBC0DC119A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1A564E70-B15A-4BD7-B120-E8FBC0DC119A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1A564E70-B15A-4BD7-B120-E8FBC0DC119A}.Release|Any CPU.Build.0 = Release|Any CPU - {5A6D26DB-1839-4CF7-82A4-EF8359E7DD31}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5A6D26DB-1839-4CF7-82A4-EF8359E7DD31}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5A6D26DB-1839-4CF7-82A4-EF8359E7DD31}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5A6D26DB-1839-4CF7-82A4-EF8359E7DD31}.Release|Any CPU.Build.0 = Release|Any CPU - {DC18C173-F188-4BC8-8F9E-F1B24293A103}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DC18C173-F188-4BC8-8F9E-F1B24293A103}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DC18C173-F188-4BC8-8F9E-F1B24293A103}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DC18C173-F188-4BC8-8F9E-F1B24293A103}.Release|Any CPU.Build.0 = Release|Any CPU - {956E73CA-F270-4689-87EC-0ABFBF5DB2DE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {956E73CA-F270-4689-87EC-0ABFBF5DB2DE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {956E73CA-F270-4689-87EC-0ABFBF5DB2DE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {956E73CA-F270-4689-87EC-0ABFBF5DB2DE}.Release|Any CPU.Build.0 = Release|Any CPU - {ADAC1F7D-0F68-440E-8D0B-D2D70740DE78}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {ADAC1F7D-0F68-440E-8D0B-D2D70740DE78}.Debug|Any CPU.Build.0 = Debug|Any CPU - {ADAC1F7D-0F68-440E-8D0B-D2D70740DE78}.Release|Any CPU.ActiveCfg = Release|Any CPU - {ADAC1F7D-0F68-440E-8D0B-D2D70740DE78}.Release|Any CPU.Build.0 = Release|Any CPU - {BD469A95-48DB-45D5-8B34-EB38ABD3636B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BD469A95-48DB-45D5-8B34-EB38ABD3636B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BD469A95-48DB-45D5-8B34-EB38ABD3636B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BD469A95-48DB-45D5-8B34-EB38ABD3636B}.Release|Any CPU.Build.0 = Release|Any CPU - {61EC0A18-594F-4E3B-B16A-2C4CDCE4C02F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {61EC0A18-594F-4E3B-B16A-2C4CDCE4C02F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {61EC0A18-594F-4E3B-B16A-2C4CDCE4C02F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {61EC0A18-594F-4E3B-B16A-2C4CDCE4C02F}.Release|Any CPU.Build.0 = Release|Any CPU - {CA1356B6-1519-464A-81B0-96EBC3173064}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CA1356B6-1519-464A-81B0-96EBC3173064}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CA1356B6-1519-464A-81B0-96EBC3173064}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CA1356B6-1519-464A-81B0-96EBC3173064}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {726E5CD6-E783-49CB-A9EB-93FC09D91DAA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {726E5CD6-E783-49CB-A9EB-93FC09D91DAA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {726E5CD6-E783-49CB-A9EB-93FC09D91DAA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {726E5CD6-E783-49CB-A9EB-93FC09D91DAA}.Release|Any CPU.Build.0 = Release|Any CPU - {C09BDFC5-B23A-4AC3-AD2C-66F264BB5ECA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C09BDFC5-B23A-4AC3-AD2C-66F264BB5ECA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C09BDFC5-B23A-4AC3-AD2C-66F264BB5ECA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C09BDFC5-B23A-4AC3-AD2C-66F264BB5ECA}.Release|Any CPU.Build.0 = Release|Any CPU - {1A564E70-B15A-4BD7-B120-E8FBC0DC119A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1A564E70-B15A-4BD7-B120-E8FBC0DC119A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1A564E70-B15A-4BD7-B120-E8FBC0DC119A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1A564E70-B15A-4BD7-B120-E8FBC0DC119A}.Release|Any CPU.Build.0 = Release|Any CPU - {5A6D26DB-1839-4CF7-82A4-EF8359E7DD31}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5A6D26DB-1839-4CF7-82A4-EF8359E7DD31}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5A6D26DB-1839-4CF7-82A4-EF8359E7DD31}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5A6D26DB-1839-4CF7-82A4-EF8359E7DD31}.Release|Any CPU.Build.0 = Release|Any CPU - {DC18C173-F188-4BC8-8F9E-F1B24293A103}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DC18C173-F188-4BC8-8F9E-F1B24293A103}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DC18C173-F188-4BC8-8F9E-F1B24293A103}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DC18C173-F188-4BC8-8F9E-F1B24293A103}.Release|Any CPU.Build.0 = Release|Any CPU - {956E73CA-F270-4689-87EC-0ABFBF5DB2DE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {956E73CA-F270-4689-87EC-0ABFBF5DB2DE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {956E73CA-F270-4689-87EC-0ABFBF5DB2DE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {956E73CA-F270-4689-87EC-0ABFBF5DB2DE}.Release|Any CPU.Build.0 = Release|Any CPU - {ADAC1F7D-0F68-440E-8D0B-D2D70740DE78}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {ADAC1F7D-0F68-440E-8D0B-D2D70740DE78}.Debug|Any CPU.Build.0 = Debug|Any CPU - {ADAC1F7D-0F68-440E-8D0B-D2D70740DE78}.Release|Any CPU.ActiveCfg = Release|Any CPU - {ADAC1F7D-0F68-440E-8D0B-D2D70740DE78}.Release|Any CPU.Build.0 = Release|Any CPU - {BD469A95-48DB-45D5-8B34-EB38ABD3636B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BD469A95-48DB-45D5-8B34-EB38ABD3636B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BD469A95-48DB-45D5-8B34-EB38ABD3636B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BD469A95-48DB-45D5-8B34-EB38ABD3636B}.Release|Any CPU.Build.0 = Release|Any CPU - {61EC0A18-594F-4E3B-B16A-2C4CDCE4C02F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {61EC0A18-594F-4E3B-B16A-2C4CDCE4C02F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {61EC0A18-594F-4E3B-B16A-2C4CDCE4C02F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {61EC0A18-594F-4E3B-B16A-2C4CDCE4C02F}.Release|Any CPU.Build.0 = Release|Any CPU - {CA1356B6-1519-464A-81B0-96EBC3173064}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CA1356B6-1519-464A-81B0-96EBC3173064}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CA1356B6-1519-464A-81B0-96EBC3173064}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CA1356B6-1519-464A-81B0-96EBC3173064}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {14C6D97B-9588-4C95-8D0E-F272DA7AAFF9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {8CBD60A6-07A7-449B-8917-ED2655883560} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {40AAF99A-82DB-402E-98BE-FAEC71E41BA6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {00FF7CC0-729E-4A5C-BAE1-5475A5923B8E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {BFF27F20-EBF9-4314-BB62-865F7D022E2D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {726E5CD6-E783-49CB-A9EB-93FC09D91DAA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C09BDFC5-B23A-4AC3-AD2C-66F264BB5ECA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {1A564E70-B15A-4BD7-B120-E8FBC0DC119A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {5A6D26DB-1839-4CF7-82A4-EF8359E7DD31} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {DC18C173-F188-4BC8-8F9E-F1B24293A103} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {956E73CA-F270-4689-87EC-0ABFBF5DB2DE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {ADAC1F7D-0F68-440E-8D0B-D2D70740DE78} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {BD469A95-48DB-45D5-8B34-EB38ABD3636B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {61EC0A18-594F-4E3B-B16A-2C4CDCE4C02F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {CA1356B6-1519-464A-81B0-96EBC3173064} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {726E5CD6-E783-49CB-A9EB-93FC09D91DAA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C09BDFC5-B23A-4AC3-AD2C-66F264BB5ECA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {1A564E70-B15A-4BD7-B120-E8FBC0DC119A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {5A6D26DB-1839-4CF7-82A4-EF8359E7DD31} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {DC18C173-F188-4BC8-8F9E-F1B24293A103} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {956E73CA-F270-4689-87EC-0ABFBF5DB2DE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {ADAC1F7D-0F68-440E-8D0B-D2D70740DE78} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {BD469A95-48DB-45D5-8B34-EB38ABD3636B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {61EC0A18-594F-4E3B-B16A-2C4CDCE4C02F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {CA1356B6-1519-464A-81B0-96EBC3173064} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {016C2EA6-4100-4FE6-9AEA-13C3DAD551DC} diff --git a/sdk/src/Services/MigrationHubOrchestrator/Properties/AssemblyInfo.cs b/sdk/src/Services/MigrationHubOrchestrator/Properties/AssemblyInfo.cs index 8553111be908..a851b7419999 100644 --- a/sdk/src/Services/MigrationHubOrchestrator/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/MigrationHubOrchestrator/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/MigrationHubRefactorSpaces/Generated/AmazonMigrationHubRefactorSpacesConfig.cs b/sdk/src/Services/MigrationHubRefactorSpaces/Generated/AmazonMigrationHubRefactorSpacesConfig.cs index 9057b1d068ea..906da1246f2a 100644 --- a/sdk/src/Services/MigrationHubRefactorSpaces/Generated/AmazonMigrationHubRefactorSpacesConfig.cs +++ b/sdk/src/Services/MigrationHubRefactorSpaces/Generated/AmazonMigrationHubRefactorSpacesConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.MigrationHubRefactorSpaces public partial class AmazonMigrationHubRefactorSpacesConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("Migration Hub Refactor Spaces", "4.0.0.0"); private static readonly AmazonMigrationHubRefactorSpacesEndpointResolver EndpointResolver = new AmazonMigrationHubRefactorSpacesEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("Migration Hub Refactor Spaces", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("Migration Hub Refactor Spaces", "3.7.400.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/MigrationHubRefactorSpaces/MigrationHubRefactorSpaces.sln b/sdk/src/Services/MigrationHubRefactorSpaces/MigrationHubRefactorSpaces.sln index 82650459acf2..24ed634c5105 100644 --- a/sdk/src/Services/MigrationHubRefactorSpaces/MigrationHubRefactorSpaces.sln +++ b/sdk/src/Services/MigrationHubRefactorSpaces/MigrationHubRefactorSpaces.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {469151AE-EF99-493B-BBBF-3DF9E45A9F2A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {469151AE-EF99-493B-BBBF-3DF9E45A9F2A}.Debug|Any CPU.Build.0 = Debug|Any CPU {469151AE-EF99-493B-BBBF-3DF9E45A9F2A}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {52FFAC9F-55D8-48C5-95CC-2A8A21B31636}.Debug|Any CPU.Build.0 = Debug|Any CPU {52FFAC9F-55D8-48C5-95CC-2A8A21B31636}.Release|Any CPU.ActiveCfg = Release|Any CPU {52FFAC9F-55D8-48C5-95CC-2A8A21B31636}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {7EF47AC5-BD4A-4DC2-8892-E19866EF6C09}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7EF47AC5-BD4A-4DC2-8892-E19866EF6C09}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7EF47AC5-BD4A-4DC2-8892-E19866EF6C09}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7EF47AC5-BD4A-4DC2-8892-E19866EF6C09}.Release|Any CPU.Build.0 = Release|Any CPU - {B965F30D-7CC8-43A1-B79D-34F4232A34B0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B965F30D-7CC8-43A1-B79D-34F4232A34B0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B965F30D-7CC8-43A1-B79D-34F4232A34B0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B965F30D-7CC8-43A1-B79D-34F4232A34B0}.Release|Any CPU.Build.0 = Release|Any CPU - {58860DA8-FE29-4785-8678-08582C553579}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {58860DA8-FE29-4785-8678-08582C553579}.Debug|Any CPU.Build.0 = Debug|Any CPU - {58860DA8-FE29-4785-8678-08582C553579}.Release|Any CPU.ActiveCfg = Release|Any CPU - {58860DA8-FE29-4785-8678-08582C553579}.Release|Any CPU.Build.0 = Release|Any CPU - {61CCE61C-FFF9-4B15-966B-F0FF262FCA04}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {61CCE61C-FFF9-4B15-966B-F0FF262FCA04}.Debug|Any CPU.Build.0 = Debug|Any CPU - {61CCE61C-FFF9-4B15-966B-F0FF262FCA04}.Release|Any CPU.ActiveCfg = Release|Any CPU - {61CCE61C-FFF9-4B15-966B-F0FF262FCA04}.Release|Any CPU.Build.0 = Release|Any CPU - {A05039E8-FE91-4E57-8260-235964FDFEAE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A05039E8-FE91-4E57-8260-235964FDFEAE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A05039E8-FE91-4E57-8260-235964FDFEAE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A05039E8-FE91-4E57-8260-235964FDFEAE}.Release|Any CPU.Build.0 = Release|Any CPU - {21FDECE7-97E5-4CF2-ADB5-2381E7EC23DB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {21FDECE7-97E5-4CF2-ADB5-2381E7EC23DB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {21FDECE7-97E5-4CF2-ADB5-2381E7EC23DB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {21FDECE7-97E5-4CF2-ADB5-2381E7EC23DB}.Release|Any CPU.Build.0 = Release|Any CPU - {92F13B23-DF97-4860-8A39-D2C80CBC57FD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {92F13B23-DF97-4860-8A39-D2C80CBC57FD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {92F13B23-DF97-4860-8A39-D2C80CBC57FD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {92F13B23-DF97-4860-8A39-D2C80CBC57FD}.Release|Any CPU.Build.0 = Release|Any CPU - {05D844F2-B034-4F5B-9AF2-0881BA16457E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {05D844F2-B034-4F5B-9AF2-0881BA16457E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {05D844F2-B034-4F5B-9AF2-0881BA16457E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {05D844F2-B034-4F5B-9AF2-0881BA16457E}.Release|Any CPU.Build.0 = Release|Any CPU - {8CD4DE99-861A-4115-A37E-09D807CA2545}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8CD4DE99-861A-4115-A37E-09D807CA2545}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8CD4DE99-861A-4115-A37E-09D807CA2545}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8CD4DE99-861A-4115-A37E-09D807CA2545}.Release|Any CPU.Build.0 = Release|Any CPU - {EB11A3AD-090C-483B-88D3-FC422F345BE5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EB11A3AD-090C-483B-88D3-FC422F345BE5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EB11A3AD-090C-483B-88D3-FC422F345BE5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EB11A3AD-090C-483B-88D3-FC422F345BE5}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {7EF47AC5-BD4A-4DC2-8892-E19866EF6C09}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7EF47AC5-BD4A-4DC2-8892-E19866EF6C09}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7EF47AC5-BD4A-4DC2-8892-E19866EF6C09}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7EF47AC5-BD4A-4DC2-8892-E19866EF6C09}.Release|Any CPU.Build.0 = Release|Any CPU - {B965F30D-7CC8-43A1-B79D-34F4232A34B0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B965F30D-7CC8-43A1-B79D-34F4232A34B0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B965F30D-7CC8-43A1-B79D-34F4232A34B0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B965F30D-7CC8-43A1-B79D-34F4232A34B0}.Release|Any CPU.Build.0 = Release|Any CPU - {58860DA8-FE29-4785-8678-08582C553579}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {58860DA8-FE29-4785-8678-08582C553579}.Debug|Any CPU.Build.0 = Debug|Any CPU - {58860DA8-FE29-4785-8678-08582C553579}.Release|Any CPU.ActiveCfg = Release|Any CPU - {58860DA8-FE29-4785-8678-08582C553579}.Release|Any CPU.Build.0 = Release|Any CPU - {61CCE61C-FFF9-4B15-966B-F0FF262FCA04}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {61CCE61C-FFF9-4B15-966B-F0FF262FCA04}.Debug|Any CPU.Build.0 = Debug|Any CPU - {61CCE61C-FFF9-4B15-966B-F0FF262FCA04}.Release|Any CPU.ActiveCfg = Release|Any CPU - {61CCE61C-FFF9-4B15-966B-F0FF262FCA04}.Release|Any CPU.Build.0 = Release|Any CPU - {A05039E8-FE91-4E57-8260-235964FDFEAE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A05039E8-FE91-4E57-8260-235964FDFEAE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A05039E8-FE91-4E57-8260-235964FDFEAE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A05039E8-FE91-4E57-8260-235964FDFEAE}.Release|Any CPU.Build.0 = Release|Any CPU - {21FDECE7-97E5-4CF2-ADB5-2381E7EC23DB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {21FDECE7-97E5-4CF2-ADB5-2381E7EC23DB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {21FDECE7-97E5-4CF2-ADB5-2381E7EC23DB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {21FDECE7-97E5-4CF2-ADB5-2381E7EC23DB}.Release|Any CPU.Build.0 = Release|Any CPU - {92F13B23-DF97-4860-8A39-D2C80CBC57FD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {92F13B23-DF97-4860-8A39-D2C80CBC57FD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {92F13B23-DF97-4860-8A39-D2C80CBC57FD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {92F13B23-DF97-4860-8A39-D2C80CBC57FD}.Release|Any CPU.Build.0 = Release|Any CPU - {05D844F2-B034-4F5B-9AF2-0881BA16457E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {05D844F2-B034-4F5B-9AF2-0881BA16457E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {05D844F2-B034-4F5B-9AF2-0881BA16457E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {05D844F2-B034-4F5B-9AF2-0881BA16457E}.Release|Any CPU.Build.0 = Release|Any CPU - {8CD4DE99-861A-4115-A37E-09D807CA2545}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8CD4DE99-861A-4115-A37E-09D807CA2545}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8CD4DE99-861A-4115-A37E-09D807CA2545}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8CD4DE99-861A-4115-A37E-09D807CA2545}.Release|Any CPU.Build.0 = Release|Any CPU - {EB11A3AD-090C-483B-88D3-FC422F345BE5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EB11A3AD-090C-483B-88D3-FC422F345BE5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EB11A3AD-090C-483B-88D3-FC422F345BE5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EB11A3AD-090C-483B-88D3-FC422F345BE5}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {469151AE-EF99-493B-BBBF-3DF9E45A9F2A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {9C49F57D-76E2-4F7C-A863-650E23D5282D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {057E0A76-2E60-4728-B52B-6638C9C146BD} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {882A88DF-A237-49DD-8220-074304D27495} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {52FFAC9F-55D8-48C5-95CC-2A8A21B31636} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {7EF47AC5-BD4A-4DC2-8892-E19866EF6C09} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B965F30D-7CC8-43A1-B79D-34F4232A34B0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {58860DA8-FE29-4785-8678-08582C553579} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {61CCE61C-FFF9-4B15-966B-F0FF262FCA04} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A05039E8-FE91-4E57-8260-235964FDFEAE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {21FDECE7-97E5-4CF2-ADB5-2381E7EC23DB} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {92F13B23-DF97-4860-8A39-D2C80CBC57FD} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {05D844F2-B034-4F5B-9AF2-0881BA16457E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8CD4DE99-861A-4115-A37E-09D807CA2545} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {EB11A3AD-090C-483B-88D3-FC422F345BE5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {7EF47AC5-BD4A-4DC2-8892-E19866EF6C09} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B965F30D-7CC8-43A1-B79D-34F4232A34B0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {58860DA8-FE29-4785-8678-08582C553579} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {61CCE61C-FFF9-4B15-966B-F0FF262FCA04} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A05039E8-FE91-4E57-8260-235964FDFEAE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {21FDECE7-97E5-4CF2-ADB5-2381E7EC23DB} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {92F13B23-DF97-4860-8A39-D2C80CBC57FD} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {05D844F2-B034-4F5B-9AF2-0881BA16457E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8CD4DE99-861A-4115-A37E-09D807CA2545} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {EB11A3AD-090C-483B-88D3-FC422F345BE5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {44EDF3C6-25B8-4059-9014-8B31E9DC537E} diff --git a/sdk/src/Services/MigrationHubRefactorSpaces/Properties/AssemblyInfo.cs b/sdk/src/Services/MigrationHubRefactorSpaces/Properties/AssemblyInfo.cs index 0de3912ecc53..df8f1032c91e 100644 --- a/sdk/src/Services/MigrationHubRefactorSpaces/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/MigrationHubRefactorSpaces/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/MigrationHubStrategyRecommendations/Generated/AmazonMigrationHubStrategyRecommendationsConfig.cs b/sdk/src/Services/MigrationHubStrategyRecommendations/Generated/AmazonMigrationHubStrategyRecommendationsConfig.cs index 5a87f8f49085..026c7edd19c7 100644 --- a/sdk/src/Services/MigrationHubStrategyRecommendations/Generated/AmazonMigrationHubStrategyRecommendationsConfig.cs +++ b/sdk/src/Services/MigrationHubStrategyRecommendations/Generated/AmazonMigrationHubStrategyRecommendationsConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.MigrationHubStrategyRecommendations public partial class AmazonMigrationHubStrategyRecommendationsConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("MigrationHubStrategy", "4.0.0.0"); private static readonly AmazonMigrationHubStrategyRecommendationsEndpointResolver EndpointResolver = new AmazonMigrationHubStrategyRecommendationsEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("MigrationHubStrategy", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("MigrationHubStrategy", "3.7.400.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/MigrationHubStrategyRecommendations/MigrationHubStrategyRecommendations.sln b/sdk/src/Services/MigrationHubStrategyRecommendations/MigrationHubStrategyRecommendations.sln index 9e938ee0276b..e84bc4cd84ca 100644 --- a/sdk/src/Services/MigrationHubStrategyRecommendations/MigrationHubStrategyRecommendations.sln +++ b/sdk/src/Services/MigrationHubStrategyRecommendations/MigrationHubStrategyRecommendations.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {FCD44E11-83B3-4529-8E0D-7351E07B464D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {FCD44E11-83B3-4529-8E0D-7351E07B464D}.Debug|Any CPU.Build.0 = Debug|Any CPU {FCD44E11-83B3-4529-8E0D-7351E07B464D}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {3AC6BFCC-B6CF-4D84-88AA-690FDC84DC25}.Debug|Any CPU.Build.0 = Debug|Any CPU {3AC6BFCC-B6CF-4D84-88AA-690FDC84DC25}.Release|Any CPU.ActiveCfg = Release|Any CPU {3AC6BFCC-B6CF-4D84-88AA-690FDC84DC25}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {6F8A52B4-D7DF-48C0-AA26-AC5D4EC1BF15}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6F8A52B4-D7DF-48C0-AA26-AC5D4EC1BF15}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6F8A52B4-D7DF-48C0-AA26-AC5D4EC1BF15}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6F8A52B4-D7DF-48C0-AA26-AC5D4EC1BF15}.Release|Any CPU.Build.0 = Release|Any CPU - {6FBA64FC-30F9-4FD6-BE10-53A322C3416D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6FBA64FC-30F9-4FD6-BE10-53A322C3416D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6FBA64FC-30F9-4FD6-BE10-53A322C3416D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6FBA64FC-30F9-4FD6-BE10-53A322C3416D}.Release|Any CPU.Build.0 = Release|Any CPU - {EEE3EB4B-A3E3-41AF-B954-858A6B040E8B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EEE3EB4B-A3E3-41AF-B954-858A6B040E8B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EEE3EB4B-A3E3-41AF-B954-858A6B040E8B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EEE3EB4B-A3E3-41AF-B954-858A6B040E8B}.Release|Any CPU.Build.0 = Release|Any CPU - {D593C764-8CDA-4F9E-9836-8B52C4122A7B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D593C764-8CDA-4F9E-9836-8B52C4122A7B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D593C764-8CDA-4F9E-9836-8B52C4122A7B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D593C764-8CDA-4F9E-9836-8B52C4122A7B}.Release|Any CPU.Build.0 = Release|Any CPU - {0E58A66A-74D6-43DB-8BEA-2D17D317507F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0E58A66A-74D6-43DB-8BEA-2D17D317507F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0E58A66A-74D6-43DB-8BEA-2D17D317507F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0E58A66A-74D6-43DB-8BEA-2D17D317507F}.Release|Any CPU.Build.0 = Release|Any CPU - {30E5A920-C753-4A7D-BDAE-4DA53D567AFD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {30E5A920-C753-4A7D-BDAE-4DA53D567AFD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {30E5A920-C753-4A7D-BDAE-4DA53D567AFD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {30E5A920-C753-4A7D-BDAE-4DA53D567AFD}.Release|Any CPU.Build.0 = Release|Any CPU - {FD4CB266-FCE7-4231-8BFE-8DC81653E979}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FD4CB266-FCE7-4231-8BFE-8DC81653E979}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FD4CB266-FCE7-4231-8BFE-8DC81653E979}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FD4CB266-FCE7-4231-8BFE-8DC81653E979}.Release|Any CPU.Build.0 = Release|Any CPU - {13B69C78-865F-40ED-AA2E-2627D48693CC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {13B69C78-865F-40ED-AA2E-2627D48693CC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {13B69C78-865F-40ED-AA2E-2627D48693CC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {13B69C78-865F-40ED-AA2E-2627D48693CC}.Release|Any CPU.Build.0 = Release|Any CPU - {EB7A68F4-266C-4020-A6ED-4474E24FFFAA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EB7A68F4-266C-4020-A6ED-4474E24FFFAA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EB7A68F4-266C-4020-A6ED-4474E24FFFAA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EB7A68F4-266C-4020-A6ED-4474E24FFFAA}.Release|Any CPU.Build.0 = Release|Any CPU - {D620925E-6217-489A-9D8F-7FB512817E20}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D620925E-6217-489A-9D8F-7FB512817E20}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D620925E-6217-489A-9D8F-7FB512817E20}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D620925E-6217-489A-9D8F-7FB512817E20}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {6F8A52B4-D7DF-48C0-AA26-AC5D4EC1BF15}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6F8A52B4-D7DF-48C0-AA26-AC5D4EC1BF15}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6F8A52B4-D7DF-48C0-AA26-AC5D4EC1BF15}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6F8A52B4-D7DF-48C0-AA26-AC5D4EC1BF15}.Release|Any CPU.Build.0 = Release|Any CPU - {6FBA64FC-30F9-4FD6-BE10-53A322C3416D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6FBA64FC-30F9-4FD6-BE10-53A322C3416D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6FBA64FC-30F9-4FD6-BE10-53A322C3416D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6FBA64FC-30F9-4FD6-BE10-53A322C3416D}.Release|Any CPU.Build.0 = Release|Any CPU - {EEE3EB4B-A3E3-41AF-B954-858A6B040E8B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EEE3EB4B-A3E3-41AF-B954-858A6B040E8B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EEE3EB4B-A3E3-41AF-B954-858A6B040E8B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EEE3EB4B-A3E3-41AF-B954-858A6B040E8B}.Release|Any CPU.Build.0 = Release|Any CPU - {D593C764-8CDA-4F9E-9836-8B52C4122A7B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D593C764-8CDA-4F9E-9836-8B52C4122A7B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D593C764-8CDA-4F9E-9836-8B52C4122A7B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D593C764-8CDA-4F9E-9836-8B52C4122A7B}.Release|Any CPU.Build.0 = Release|Any CPU - {0E58A66A-74D6-43DB-8BEA-2D17D317507F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0E58A66A-74D6-43DB-8BEA-2D17D317507F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0E58A66A-74D6-43DB-8BEA-2D17D317507F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0E58A66A-74D6-43DB-8BEA-2D17D317507F}.Release|Any CPU.Build.0 = Release|Any CPU - {30E5A920-C753-4A7D-BDAE-4DA53D567AFD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {30E5A920-C753-4A7D-BDAE-4DA53D567AFD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {30E5A920-C753-4A7D-BDAE-4DA53D567AFD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {30E5A920-C753-4A7D-BDAE-4DA53D567AFD}.Release|Any CPU.Build.0 = Release|Any CPU - {FD4CB266-FCE7-4231-8BFE-8DC81653E979}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FD4CB266-FCE7-4231-8BFE-8DC81653E979}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FD4CB266-FCE7-4231-8BFE-8DC81653E979}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FD4CB266-FCE7-4231-8BFE-8DC81653E979}.Release|Any CPU.Build.0 = Release|Any CPU - {13B69C78-865F-40ED-AA2E-2627D48693CC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {13B69C78-865F-40ED-AA2E-2627D48693CC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {13B69C78-865F-40ED-AA2E-2627D48693CC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {13B69C78-865F-40ED-AA2E-2627D48693CC}.Release|Any CPU.Build.0 = Release|Any CPU - {EB7A68F4-266C-4020-A6ED-4474E24FFFAA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EB7A68F4-266C-4020-A6ED-4474E24FFFAA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EB7A68F4-266C-4020-A6ED-4474E24FFFAA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EB7A68F4-266C-4020-A6ED-4474E24FFFAA}.Release|Any CPU.Build.0 = Release|Any CPU - {D620925E-6217-489A-9D8F-7FB512817E20}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D620925E-6217-489A-9D8F-7FB512817E20}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D620925E-6217-489A-9D8F-7FB512817E20}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D620925E-6217-489A-9D8F-7FB512817E20}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {FCD44E11-83B3-4529-8E0D-7351E07B464D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {4F2E4742-E087-4432-B12A-5713DAB5F9CB} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {54359F2C-E5F3-435F-A77D-2AB10AE5E82A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {5D3C7CBF-7D57-4ACE-B2EE-9E8CD8DCAA32} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {3AC6BFCC-B6CF-4D84-88AA-690FDC84DC25} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {6F8A52B4-D7DF-48C0-AA26-AC5D4EC1BF15} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6FBA64FC-30F9-4FD6-BE10-53A322C3416D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {EEE3EB4B-A3E3-41AF-B954-858A6B040E8B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D593C764-8CDA-4F9E-9836-8B52C4122A7B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0E58A66A-74D6-43DB-8BEA-2D17D317507F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {30E5A920-C753-4A7D-BDAE-4DA53D567AFD} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {FD4CB266-FCE7-4231-8BFE-8DC81653E979} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {13B69C78-865F-40ED-AA2E-2627D48693CC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {EB7A68F4-266C-4020-A6ED-4474E24FFFAA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D620925E-6217-489A-9D8F-7FB512817E20} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {6F8A52B4-D7DF-48C0-AA26-AC5D4EC1BF15} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6FBA64FC-30F9-4FD6-BE10-53A322C3416D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {EEE3EB4B-A3E3-41AF-B954-858A6B040E8B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D593C764-8CDA-4F9E-9836-8B52C4122A7B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0E58A66A-74D6-43DB-8BEA-2D17D317507F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {30E5A920-C753-4A7D-BDAE-4DA53D567AFD} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {FD4CB266-FCE7-4231-8BFE-8DC81653E979} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {13B69C78-865F-40ED-AA2E-2627D48693CC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {EB7A68F4-266C-4020-A6ED-4474E24FFFAA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D620925E-6217-489A-9D8F-7FB512817E20} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {F34E5C4C-E535-4EA4-A981-4FB50C57CFA5} diff --git a/sdk/src/Services/MigrationHubStrategyRecommendations/Properties/AssemblyInfo.cs b/sdk/src/Services/MigrationHubStrategyRecommendations/Properties/AssemblyInfo.cs index a975afb861dc..8aca23103c59 100644 --- a/sdk/src/Services/MigrationHubStrategyRecommendations/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/MigrationHubStrategyRecommendations/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/MobileAnalytics/Generated/AmazonMobileAnalyticsConfig.cs b/sdk/src/Services/MobileAnalytics/Generated/AmazonMobileAnalyticsConfig.cs index f200f51f775e..f5c28af019e7 100644 --- a/sdk/src/Services/MobileAnalytics/Generated/AmazonMobileAnalyticsConfig.cs +++ b/sdk/src/Services/MobileAnalytics/Generated/AmazonMobileAnalyticsConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.MobileAnalytics public partial class AmazonMobileAnalyticsConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("Mobile Analytics", "4.0.0.0"); private static readonly AmazonMobileAnalyticsEndpointResolver EndpointResolver = new AmazonMobileAnalyticsEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("Mobile Analytics", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("Mobile Analytics", "3.7.400.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/MobileAnalytics/MobileAnalytics.sln b/sdk/src/Services/MobileAnalytics/MobileAnalytics.sln index a601eef65f08..9662e9674e14 100644 --- a/sdk/src/Services/MobileAnalytics/MobileAnalytics.sln +++ b/sdk/src/Services/MobileAnalytics/MobileAnalytics.sln @@ -80,7 +80,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {B823D80C-8DDC-418C-B0B2-63966EDCE07E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {B823D80C-8DDC-418C-B0B2-63966EDCE07E}.Debug|Any CPU.Build.0 = Debug|Any CPU {B823D80C-8DDC-418C-B0B2-63966EDCE07E}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -101,97 +108,6 @@ Global {3F20E63F-4443-4D55-8509-4F7DE62DFFDE}.Debug|Any CPU.Build.0 = Debug|Any CPU {3F20E63F-4443-4D55-8509-4F7DE62DFFDE}.Release|Any CPU.ActiveCfg = Release|Any CPU {3F20E63F-4443-4D55-8509-4F7DE62DFFDE}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {950231BE-6E7A-4607-A189-C3A4CD896C8E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {950231BE-6E7A-4607-A189-C3A4CD896C8E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {950231BE-6E7A-4607-A189-C3A4CD896C8E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {950231BE-6E7A-4607-A189-C3A4CD896C8E}.Release|Any CPU.Build.0 = Release|Any CPU - {EE577769-164D-457C-83A5-292F33A66894}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EE577769-164D-457C-83A5-292F33A66894}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EE577769-164D-457C-83A5-292F33A66894}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EE577769-164D-457C-83A5-292F33A66894}.Release|Any CPU.Build.0 = Release|Any CPU - {FA9FA437-960A-4BDD-A083-1748A8340756}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FA9FA437-960A-4BDD-A083-1748A8340756}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FA9FA437-960A-4BDD-A083-1748A8340756}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FA9FA437-960A-4BDD-A083-1748A8340756}.Release|Any CPU.Build.0 = Release|Any CPU - {E7CE3025-7655-41FF-889C-3EB816276AE9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E7CE3025-7655-41FF-889C-3EB816276AE9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E7CE3025-7655-41FF-889C-3EB816276AE9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E7CE3025-7655-41FF-889C-3EB816276AE9}.Release|Any CPU.Build.0 = Release|Any CPU - {854F2B44-3E58-4570-A05D-318A9FE16BC1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {854F2B44-3E58-4570-A05D-318A9FE16BC1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {854F2B44-3E58-4570-A05D-318A9FE16BC1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {854F2B44-3E58-4570-A05D-318A9FE16BC1}.Release|Any CPU.Build.0 = Release|Any CPU - {74004863-828D-4609-B26C-C871639A10B4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {74004863-828D-4609-B26C-C871639A10B4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {74004863-828D-4609-B26C-C871639A10B4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {74004863-828D-4609-B26C-C871639A10B4}.Release|Any CPU.Build.0 = Release|Any CPU - {EEA7A61F-5E0C-453B-BBC6-2B51929500C5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EEA7A61F-5E0C-453B-BBC6-2B51929500C5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EEA7A61F-5E0C-453B-BBC6-2B51929500C5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EEA7A61F-5E0C-453B-BBC6-2B51929500C5}.Release|Any CPU.Build.0 = Release|Any CPU - {E562783B-C84A-4FBF-A428-513CAB29D3F5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E562783B-C84A-4FBF-A428-513CAB29D3F5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E562783B-C84A-4FBF-A428-513CAB29D3F5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E562783B-C84A-4FBF-A428-513CAB29D3F5}.Release|Any CPU.Build.0 = Release|Any CPU - {ACBEFE09-E63B-42CE-A748-93FE1C809476}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {ACBEFE09-E63B-42CE-A748-93FE1C809476}.Debug|Any CPU.Build.0 = Debug|Any CPU - {ACBEFE09-E63B-42CE-A748-93FE1C809476}.Release|Any CPU.ActiveCfg = Release|Any CPU - {ACBEFE09-E63B-42CE-A748-93FE1C809476}.Release|Any CPU.Build.0 = Release|Any CPU - {D545CE39-61F3-49C7-8C98-87D207B1872F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D545CE39-61F3-49C7-8C98-87D207B1872F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D545CE39-61F3-49C7-8C98-87D207B1872F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D545CE39-61F3-49C7-8C98-87D207B1872F}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {950231BE-6E7A-4607-A189-C3A4CD896C8E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {950231BE-6E7A-4607-A189-C3A4CD896C8E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {950231BE-6E7A-4607-A189-C3A4CD896C8E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {950231BE-6E7A-4607-A189-C3A4CD896C8E}.Release|Any CPU.Build.0 = Release|Any CPU - {EE577769-164D-457C-83A5-292F33A66894}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EE577769-164D-457C-83A5-292F33A66894}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EE577769-164D-457C-83A5-292F33A66894}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EE577769-164D-457C-83A5-292F33A66894}.Release|Any CPU.Build.0 = Release|Any CPU - {FA9FA437-960A-4BDD-A083-1748A8340756}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FA9FA437-960A-4BDD-A083-1748A8340756}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FA9FA437-960A-4BDD-A083-1748A8340756}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FA9FA437-960A-4BDD-A083-1748A8340756}.Release|Any CPU.Build.0 = Release|Any CPU - {E7CE3025-7655-41FF-889C-3EB816276AE9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E7CE3025-7655-41FF-889C-3EB816276AE9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E7CE3025-7655-41FF-889C-3EB816276AE9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E7CE3025-7655-41FF-889C-3EB816276AE9}.Release|Any CPU.Build.0 = Release|Any CPU - {854F2B44-3E58-4570-A05D-318A9FE16BC1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {854F2B44-3E58-4570-A05D-318A9FE16BC1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {854F2B44-3E58-4570-A05D-318A9FE16BC1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {854F2B44-3E58-4570-A05D-318A9FE16BC1}.Release|Any CPU.Build.0 = Release|Any CPU - {74004863-828D-4609-B26C-C871639A10B4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {74004863-828D-4609-B26C-C871639A10B4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {74004863-828D-4609-B26C-C871639A10B4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {74004863-828D-4609-B26C-C871639A10B4}.Release|Any CPU.Build.0 = Release|Any CPU - {EEA7A61F-5E0C-453B-BBC6-2B51929500C5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EEA7A61F-5E0C-453B-BBC6-2B51929500C5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EEA7A61F-5E0C-453B-BBC6-2B51929500C5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EEA7A61F-5E0C-453B-BBC6-2B51929500C5}.Release|Any CPU.Build.0 = Release|Any CPU - {E562783B-C84A-4FBF-A428-513CAB29D3F5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E562783B-C84A-4FBF-A428-513CAB29D3F5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E562783B-C84A-4FBF-A428-513CAB29D3F5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E562783B-C84A-4FBF-A428-513CAB29D3F5}.Release|Any CPU.Build.0 = Release|Any CPU - {ACBEFE09-E63B-42CE-A748-93FE1C809476}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {ACBEFE09-E63B-42CE-A748-93FE1C809476}.Debug|Any CPU.Build.0 = Debug|Any CPU - {ACBEFE09-E63B-42CE-A748-93FE1C809476}.Release|Any CPU.ActiveCfg = Release|Any CPU - {ACBEFE09-E63B-42CE-A748-93FE1C809476}.Release|Any CPU.Build.0 = Release|Any CPU - {D545CE39-61F3-49C7-8C98-87D207B1872F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D545CE39-61F3-49C7-8C98-87D207B1872F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D545CE39-61F3-49C7-8C98-87D207B1872F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D545CE39-61F3-49C7-8C98-87D207B1872F}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -206,37 +122,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {B823D80C-8DDC-418C-B0B2-63966EDCE07E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {FFAEBD0D-7E59-46D6-B380-D6167C108102} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {4F6F2655-9FD2-4BC7-A386-3B64EDF42703} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {90A3A8C0-AD5D-4F52-8237-5B51E73EFF4A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {3F20E63F-4443-4D55-8509-4F7DE62DFFDE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {950231BE-6E7A-4607-A189-C3A4CD896C8E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {EE577769-164D-457C-83A5-292F33A66894} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {FA9FA437-960A-4BDD-A083-1748A8340756} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E7CE3025-7655-41FF-889C-3EB816276AE9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {854F2B44-3E58-4570-A05D-318A9FE16BC1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {74004863-828D-4609-B26C-C871639A10B4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {EEA7A61F-5E0C-453B-BBC6-2B51929500C5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E562783B-C84A-4FBF-A428-513CAB29D3F5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {ACBEFE09-E63B-42CE-A748-93FE1C809476} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D545CE39-61F3-49C7-8C98-87D207B1872F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {950231BE-6E7A-4607-A189-C3A4CD896C8E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {EE577769-164D-457C-83A5-292F33A66894} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {FA9FA437-960A-4BDD-A083-1748A8340756} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E7CE3025-7655-41FF-889C-3EB816276AE9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {854F2B44-3E58-4570-A05D-318A9FE16BC1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {74004863-828D-4609-B26C-C871639A10B4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {EEA7A61F-5E0C-453B-BBC6-2B51929500C5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E562783B-C84A-4FBF-A428-513CAB29D3F5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {ACBEFE09-E63B-42CE-A748-93FE1C809476} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D545CE39-61F3-49C7-8C98-87D207B1872F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {4F852527-9465-41C9-B4D5-B7377087520C} diff --git a/sdk/src/Services/MobileAnalytics/Properties/AssemblyInfo.cs b/sdk/src/Services/MobileAnalytics/Properties/AssemblyInfo.cs index dd1326d4f1a9..7c973f40007e 100644 --- a/sdk/src/Services/MobileAnalytics/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/MobileAnalytics/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/Neptune/Generated/AmazonNeptuneConfig.cs b/sdk/src/Services/Neptune/Generated/AmazonNeptuneConfig.cs index e027ee7e1399..03341b7bc72f 100644 --- a/sdk/src/Services/Neptune/Generated/AmazonNeptuneConfig.cs +++ b/sdk/src/Services/Neptune/Generated/AmazonNeptuneConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.Neptune public partial class AmazonNeptuneConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("Neptune", "4.0.0.0"); private static readonly AmazonNeptuneEndpointResolver EndpointResolver = new AmazonNeptuneEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("Neptune", "3.7.401.4"); -======= - InternalSDKUtils.BuildUserAgentString("Neptune", "3.7.401.31"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/Neptune/Neptune.sln b/sdk/src/Services/Neptune/Neptune.sln index 04c9c635dc2b..56d50576c448 100644 --- a/sdk/src/Services/Neptune/Neptune.sln +++ b/sdk/src/Services/Neptune/Neptune.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {585A44B8-8833-4612-9344-5780A10DEBCE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {585A44B8-8833-4612-9344-5780A10DEBCE}.Debug|Any CPU.Build.0 = Debug|Any CPU {585A44B8-8833-4612-9344-5780A10DEBCE}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {1377A7D5-FCA5-4277-8DD4-E4A12F113FF8}.Debug|Any CPU.Build.0 = Debug|Any CPU {1377A7D5-FCA5-4277-8DD4-E4A12F113FF8}.Release|Any CPU.ActiveCfg = Release|Any CPU {1377A7D5-FCA5-4277-8DD4-E4A12F113FF8}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {9ED504FB-5DC6-48C6-B6E0-9C2C7230602A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9ED504FB-5DC6-48C6-B6E0-9C2C7230602A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9ED504FB-5DC6-48C6-B6E0-9C2C7230602A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9ED504FB-5DC6-48C6-B6E0-9C2C7230602A}.Release|Any CPU.Build.0 = Release|Any CPU - {8F6AF4A8-B5C7-4805-B1AB-7D0AD30B7544}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8F6AF4A8-B5C7-4805-B1AB-7D0AD30B7544}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8F6AF4A8-B5C7-4805-B1AB-7D0AD30B7544}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8F6AF4A8-B5C7-4805-B1AB-7D0AD30B7544}.Release|Any CPU.Build.0 = Release|Any CPU - {DB117CC2-1351-43AB-83FF-E7719164CC0F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DB117CC2-1351-43AB-83FF-E7719164CC0F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DB117CC2-1351-43AB-83FF-E7719164CC0F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DB117CC2-1351-43AB-83FF-E7719164CC0F}.Release|Any CPU.Build.0 = Release|Any CPU - {1E2643DF-F537-4F2B-9D92-227919A7EE40}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1E2643DF-F537-4F2B-9D92-227919A7EE40}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1E2643DF-F537-4F2B-9D92-227919A7EE40}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1E2643DF-F537-4F2B-9D92-227919A7EE40}.Release|Any CPU.Build.0 = Release|Any CPU - {0454E4BF-720E-4051-BA1A-6981690969CD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0454E4BF-720E-4051-BA1A-6981690969CD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0454E4BF-720E-4051-BA1A-6981690969CD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0454E4BF-720E-4051-BA1A-6981690969CD}.Release|Any CPU.Build.0 = Release|Any CPU - {CC6CBEEF-B561-41AE-8ED3-9CC8EE168AAB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CC6CBEEF-B561-41AE-8ED3-9CC8EE168AAB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CC6CBEEF-B561-41AE-8ED3-9CC8EE168AAB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CC6CBEEF-B561-41AE-8ED3-9CC8EE168AAB}.Release|Any CPU.Build.0 = Release|Any CPU - {BB1C184C-398F-4131-A115-61DC95F6367A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BB1C184C-398F-4131-A115-61DC95F6367A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BB1C184C-398F-4131-A115-61DC95F6367A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BB1C184C-398F-4131-A115-61DC95F6367A}.Release|Any CPU.Build.0 = Release|Any CPU - {897FAF46-48C2-4F59-B3BC-C5B5D9C33782}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {897FAF46-48C2-4F59-B3BC-C5B5D9C33782}.Debug|Any CPU.Build.0 = Debug|Any CPU - {897FAF46-48C2-4F59-B3BC-C5B5D9C33782}.Release|Any CPU.ActiveCfg = Release|Any CPU - {897FAF46-48C2-4F59-B3BC-C5B5D9C33782}.Release|Any CPU.Build.0 = Release|Any CPU - {54FB6D14-551C-43E2-8F02-045BB6C049E2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {54FB6D14-551C-43E2-8F02-045BB6C049E2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {54FB6D14-551C-43E2-8F02-045BB6C049E2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {54FB6D14-551C-43E2-8F02-045BB6C049E2}.Release|Any CPU.Build.0 = Release|Any CPU - {9BCC286F-B9B0-433E-8483-CC03B10FF151}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9BCC286F-B9B0-433E-8483-CC03B10FF151}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9BCC286F-B9B0-433E-8483-CC03B10FF151}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9BCC286F-B9B0-433E-8483-CC03B10FF151}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {9ED504FB-5DC6-48C6-B6E0-9C2C7230602A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9ED504FB-5DC6-48C6-B6E0-9C2C7230602A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9ED504FB-5DC6-48C6-B6E0-9C2C7230602A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9ED504FB-5DC6-48C6-B6E0-9C2C7230602A}.Release|Any CPU.Build.0 = Release|Any CPU - {8F6AF4A8-B5C7-4805-B1AB-7D0AD30B7544}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8F6AF4A8-B5C7-4805-B1AB-7D0AD30B7544}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8F6AF4A8-B5C7-4805-B1AB-7D0AD30B7544}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8F6AF4A8-B5C7-4805-B1AB-7D0AD30B7544}.Release|Any CPU.Build.0 = Release|Any CPU - {DB117CC2-1351-43AB-83FF-E7719164CC0F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DB117CC2-1351-43AB-83FF-E7719164CC0F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DB117CC2-1351-43AB-83FF-E7719164CC0F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DB117CC2-1351-43AB-83FF-E7719164CC0F}.Release|Any CPU.Build.0 = Release|Any CPU - {1E2643DF-F537-4F2B-9D92-227919A7EE40}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1E2643DF-F537-4F2B-9D92-227919A7EE40}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1E2643DF-F537-4F2B-9D92-227919A7EE40}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1E2643DF-F537-4F2B-9D92-227919A7EE40}.Release|Any CPU.Build.0 = Release|Any CPU - {0454E4BF-720E-4051-BA1A-6981690969CD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0454E4BF-720E-4051-BA1A-6981690969CD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0454E4BF-720E-4051-BA1A-6981690969CD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0454E4BF-720E-4051-BA1A-6981690969CD}.Release|Any CPU.Build.0 = Release|Any CPU - {CC6CBEEF-B561-41AE-8ED3-9CC8EE168AAB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CC6CBEEF-B561-41AE-8ED3-9CC8EE168AAB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CC6CBEEF-B561-41AE-8ED3-9CC8EE168AAB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CC6CBEEF-B561-41AE-8ED3-9CC8EE168AAB}.Release|Any CPU.Build.0 = Release|Any CPU - {BB1C184C-398F-4131-A115-61DC95F6367A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BB1C184C-398F-4131-A115-61DC95F6367A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BB1C184C-398F-4131-A115-61DC95F6367A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BB1C184C-398F-4131-A115-61DC95F6367A}.Release|Any CPU.Build.0 = Release|Any CPU - {897FAF46-48C2-4F59-B3BC-C5B5D9C33782}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {897FAF46-48C2-4F59-B3BC-C5B5D9C33782}.Debug|Any CPU.Build.0 = Debug|Any CPU - {897FAF46-48C2-4F59-B3BC-C5B5D9C33782}.Release|Any CPU.ActiveCfg = Release|Any CPU - {897FAF46-48C2-4F59-B3BC-C5B5D9C33782}.Release|Any CPU.Build.0 = Release|Any CPU - {54FB6D14-551C-43E2-8F02-045BB6C049E2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {54FB6D14-551C-43E2-8F02-045BB6C049E2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {54FB6D14-551C-43E2-8F02-045BB6C049E2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {54FB6D14-551C-43E2-8F02-045BB6C049E2}.Release|Any CPU.Build.0 = Release|Any CPU - {9BCC286F-B9B0-433E-8483-CC03B10FF151}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9BCC286F-B9B0-433E-8483-CC03B10FF151}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9BCC286F-B9B0-433E-8483-CC03B10FF151}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9BCC286F-B9B0-433E-8483-CC03B10FF151}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {585A44B8-8833-4612-9344-5780A10DEBCE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {AADDBBF6-7E06-454C-AC3F-7CCE858A6E63} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {1AF4C4E3-3154-4AF0-93E6-1635338117E8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {7CB7CDC1-DDEF-4E08-8CE9-D385BD60F77D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {1377A7D5-FCA5-4277-8DD4-E4A12F113FF8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {9ED504FB-5DC6-48C6-B6E0-9C2C7230602A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8F6AF4A8-B5C7-4805-B1AB-7D0AD30B7544} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {DB117CC2-1351-43AB-83FF-E7719164CC0F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {1E2643DF-F537-4F2B-9D92-227919A7EE40} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0454E4BF-720E-4051-BA1A-6981690969CD} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {CC6CBEEF-B561-41AE-8ED3-9CC8EE168AAB} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {BB1C184C-398F-4131-A115-61DC95F6367A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {897FAF46-48C2-4F59-B3BC-C5B5D9C33782} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {54FB6D14-551C-43E2-8F02-045BB6C049E2} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {9BCC286F-B9B0-433E-8483-CC03B10FF151} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {9ED504FB-5DC6-48C6-B6E0-9C2C7230602A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8F6AF4A8-B5C7-4805-B1AB-7D0AD30B7544} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {DB117CC2-1351-43AB-83FF-E7719164CC0F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {1E2643DF-F537-4F2B-9D92-227919A7EE40} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0454E4BF-720E-4051-BA1A-6981690969CD} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {CC6CBEEF-B561-41AE-8ED3-9CC8EE168AAB} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {BB1C184C-398F-4131-A115-61DC95F6367A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {897FAF46-48C2-4F59-B3BC-C5B5D9C33782} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {54FB6D14-551C-43E2-8F02-045BB6C049E2} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {9BCC286F-B9B0-433E-8483-CC03B10FF151} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {85B05408-0461-47B3-B486-1160A540B46D} diff --git a/sdk/src/Services/Neptune/Properties/AssemblyInfo.cs b/sdk/src/Services/Neptune/Properties/AssemblyInfo.cs index c14d5fa11b44..aaf43416bdd2 100644 --- a/sdk/src/Services/Neptune/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/Neptune/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.4")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.31")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/NeptuneGraph/Generated/AmazonNeptuneGraphConfig.cs b/sdk/src/Services/NeptuneGraph/Generated/AmazonNeptuneGraphConfig.cs index 25ec25a74058..25d79391f108 100644 --- a/sdk/src/Services/NeptuneGraph/Generated/AmazonNeptuneGraphConfig.cs +++ b/sdk/src/Services/NeptuneGraph/Generated/AmazonNeptuneGraphConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.NeptuneGraph public partial class AmazonNeptuneGraphConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("Neptune Graph", "4.0.0.0"); private static readonly AmazonNeptuneGraphEndpointResolver EndpointResolver = new AmazonNeptuneGraphEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("Neptune Graph", "3.7.401.21"); -======= - InternalSDKUtils.BuildUserAgentString("Neptune Graph", "3.7.402.20"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/NeptuneGraph/Generated/Model/CreateGraphRequest.cs b/sdk/src/Services/NeptuneGraph/Generated/Model/CreateGraphRequest.cs index ad8c6e632859..97e8d1994aba 100644 --- a/sdk/src/Services/NeptuneGraph/Generated/Model/CreateGraphRequest.cs +++ b/sdk/src/Services/NeptuneGraph/Generated/Model/CreateGraphRequest.cs @@ -114,16 +114,8 @@ internal bool IsSetKmsKeyIdentifier() /// Min = 128 /// /// -<<<<<<< HEAD - [AWSProperty(Required=true, Min=32, Max=24576)] - public int? ProvisionedMemory -||||||| Commit version number update changes - [AWSProperty(Required=true, Min=32, Max=24576)] - public int ProvisionedMemory -======= [AWSProperty(Required=true, Min=16, Max=24576)] - public int ProvisionedMemory ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b + public int? ProvisionedMemory { get { return this._provisionedMemory; } set { this._provisionedMemory = value; } diff --git a/sdk/src/Services/NeptuneGraph/Generated/Model/CreateGraphResponse.cs b/sdk/src/Services/NeptuneGraph/Generated/Model/CreateGraphResponse.cs index df6c00796c2b..1cf6a646931b 100644 --- a/sdk/src/Services/NeptuneGraph/Generated/Model/CreateGraphResponse.cs +++ b/sdk/src/Services/NeptuneGraph/Generated/Model/CreateGraphResponse.cs @@ -215,16 +215,8 @@ internal bool IsSetName() /// Min = 128 /// /// -<<<<<<< HEAD - [AWSProperty(Min=32, Max=24576)] - public int? ProvisionedMemory -||||||| Commit version number update changes - [AWSProperty(Min=32, Max=24576)] - public int ProvisionedMemory -======= [AWSProperty(Min=16, Max=24576)] - public int ProvisionedMemory ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b + public int? ProvisionedMemory { get { return this._provisionedMemory; } set { this._provisionedMemory = value; } diff --git a/sdk/src/Services/NeptuneGraph/Generated/Model/CreateGraphUsingImportTaskRequest.cs b/sdk/src/Services/NeptuneGraph/Generated/Model/CreateGraphUsingImportTaskRequest.cs index 4d82c5212792..84ff0f1ad287 100644 --- a/sdk/src/Services/NeptuneGraph/Generated/Model/CreateGraphUsingImportTaskRequest.cs +++ b/sdk/src/Services/NeptuneGraph/Generated/Model/CreateGraphUsingImportTaskRequest.cs @@ -218,16 +218,8 @@ internal bool IsSetKmsKeyIdentifier() /// specified 128 m-NCUs are used. /// /// -<<<<<<< HEAD - [AWSProperty(Min=32, Max=24576)] - public int? MaxProvisionedMemory -||||||| Commit version number update changes - [AWSProperty(Min=32, Max=24576)] - public int MaxProvisionedMemory -======= [AWSProperty(Min=16, Max=24576)] - public int MaxProvisionedMemory ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b + public int? MaxProvisionedMemory { get { return this._maxProvisionedMemory; } set { this._maxProvisionedMemory = value; } @@ -246,16 +238,8 @@ internal bool IsSetMaxProvisionedMemory() /// the graph. Default: 128 /// /// -<<<<<<< HEAD - [AWSProperty(Min=32, Max=24576)] - public int? MinProvisionedMemory -||||||| Commit version number update changes - [AWSProperty(Min=32, Max=24576)] - public int MinProvisionedMemory -======= [AWSProperty(Min=16, Max=24576)] - public int MinProvisionedMemory ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b + public int? MinProvisionedMemory { get { return this._minProvisionedMemory; } set { this._minProvisionedMemory = value; } diff --git a/sdk/src/Services/NeptuneGraph/Generated/Model/DeleteGraphResponse.cs b/sdk/src/Services/NeptuneGraph/Generated/Model/DeleteGraphResponse.cs index 0cf45a12698f..afc3725c6427 100644 --- a/sdk/src/Services/NeptuneGraph/Generated/Model/DeleteGraphResponse.cs +++ b/sdk/src/Services/NeptuneGraph/Generated/Model/DeleteGraphResponse.cs @@ -204,16 +204,8 @@ internal bool IsSetName() /// The number of memory-optimized Neptune Capacity Units (m-NCUs) allocated to the graph. /// /// -<<<<<<< HEAD - [AWSProperty(Min=32, Max=24576)] - public int? ProvisionedMemory -||||||| Commit version number update changes - [AWSProperty(Min=32, Max=24576)] - public int ProvisionedMemory -======= [AWSProperty(Min=16, Max=24576)] - public int ProvisionedMemory ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b + public int? ProvisionedMemory { get { return this._provisionedMemory; } set { this._provisionedMemory = value; } diff --git a/sdk/src/Services/NeptuneGraph/Generated/Model/GetGraphResponse.cs b/sdk/src/Services/NeptuneGraph/Generated/Model/GetGraphResponse.cs index 5ea3ed90260e..03955555cd47 100644 --- a/sdk/src/Services/NeptuneGraph/Generated/Model/GetGraphResponse.cs +++ b/sdk/src/Services/NeptuneGraph/Generated/Model/GetGraphResponse.cs @@ -204,16 +204,8 @@ internal bool IsSetName() /// The number of memory-optimized Neptune Capacity Units (m-NCUs) allocated to the graph. /// /// -<<<<<<< HEAD - [AWSProperty(Min=32, Max=24576)] - public int? ProvisionedMemory -||||||| Commit version number update changes - [AWSProperty(Min=32, Max=24576)] - public int ProvisionedMemory -======= [AWSProperty(Min=16, Max=24576)] - public int ProvisionedMemory ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b + public int? ProvisionedMemory { get { return this._provisionedMemory; } set { this._provisionedMemory = value; } diff --git a/sdk/src/Services/NeptuneGraph/Generated/Model/GraphSummary.cs b/sdk/src/Services/NeptuneGraph/Generated/Model/GraphSummary.cs index fe1783f3bc4a..6afeb4adaba0 100644 --- a/sdk/src/Services/NeptuneGraph/Generated/Model/GraphSummary.cs +++ b/sdk/src/Services/NeptuneGraph/Generated/Model/GraphSummary.cs @@ -162,16 +162,8 @@ internal bool IsSetName() /// The number of memory-optimized Neptune Capacity Units (m-NCUs) allocated to the graph. /// /// -<<<<<<< HEAD - [AWSProperty(Min=32, Max=24576)] - public int? ProvisionedMemory -||||||| Commit version number update changes - [AWSProperty(Min=32, Max=24576)] - public int ProvisionedMemory -======= [AWSProperty(Min=16, Max=24576)] - public int ProvisionedMemory ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b + public int? ProvisionedMemory { get { return this._provisionedMemory; } set { this._provisionedMemory = value; } diff --git a/sdk/src/Services/NeptuneGraph/Generated/Model/ResetGraphResponse.cs b/sdk/src/Services/NeptuneGraph/Generated/Model/ResetGraphResponse.cs index f78051e1f830..9d37693eb6ea 100644 --- a/sdk/src/Services/NeptuneGraph/Generated/Model/ResetGraphResponse.cs +++ b/sdk/src/Services/NeptuneGraph/Generated/Model/ResetGraphResponse.cs @@ -204,16 +204,8 @@ internal bool IsSetName() /// The number of memory-optimized Neptune Capacity Units (m-NCUs) allocated to the graph. /// /// -<<<<<<< HEAD - [AWSProperty(Min=32, Max=24576)] - public int? ProvisionedMemory -||||||| Commit version number update changes - [AWSProperty(Min=32, Max=24576)] - public int ProvisionedMemory -======= [AWSProperty(Min=16, Max=24576)] - public int ProvisionedMemory ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b + public int? ProvisionedMemory { get { return this._provisionedMemory; } set { this._provisionedMemory = value; } diff --git a/sdk/src/Services/NeptuneGraph/Generated/Model/RestoreGraphFromSnapshotRequest.cs b/sdk/src/Services/NeptuneGraph/Generated/Model/RestoreGraphFromSnapshotRequest.cs index 207cc1cd989b..009258842588 100644 --- a/sdk/src/Services/NeptuneGraph/Generated/Model/RestoreGraphFromSnapshotRequest.cs +++ b/sdk/src/Services/NeptuneGraph/Generated/Model/RestoreGraphFromSnapshotRequest.cs @@ -97,16 +97,8 @@ internal bool IsSetGraphName() /// Min = 128 /// /// -<<<<<<< HEAD - [AWSProperty(Min=32, Max=24576)] - public int? ProvisionedMemory -||||||| Commit version number update changes - [AWSProperty(Min=32, Max=24576)] - public int ProvisionedMemory -======= [AWSProperty(Min=16, Max=24576)] - public int ProvisionedMemory ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b + public int? ProvisionedMemory { get { return this._provisionedMemory; } set { this._provisionedMemory = value; } diff --git a/sdk/src/Services/NeptuneGraph/Generated/Model/RestoreGraphFromSnapshotResponse.cs b/sdk/src/Services/NeptuneGraph/Generated/Model/RestoreGraphFromSnapshotResponse.cs index 641ff707de8f..780c3111149d 100644 --- a/sdk/src/Services/NeptuneGraph/Generated/Model/RestoreGraphFromSnapshotResponse.cs +++ b/sdk/src/Services/NeptuneGraph/Generated/Model/RestoreGraphFromSnapshotResponse.cs @@ -204,16 +204,8 @@ internal bool IsSetName() /// The number of memory-optimized Neptune Capacity Units (m-NCUs) allocated to the graph. /// /// -<<<<<<< HEAD - [AWSProperty(Min=32, Max=24576)] - public int? ProvisionedMemory -||||||| Commit version number update changes - [AWSProperty(Min=32, Max=24576)] - public int ProvisionedMemory -======= [AWSProperty(Min=16, Max=24576)] - public int ProvisionedMemory ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b + public int? ProvisionedMemory { get { return this._provisionedMemory; } set { this._provisionedMemory = value; } diff --git a/sdk/src/Services/NeptuneGraph/Generated/Model/UpdateGraphRequest.cs b/sdk/src/Services/NeptuneGraph/Generated/Model/UpdateGraphRequest.cs index b26d7c343230..f1c132d8a860 100644 --- a/sdk/src/Services/NeptuneGraph/Generated/Model/UpdateGraphRequest.cs +++ b/sdk/src/Services/NeptuneGraph/Generated/Model/UpdateGraphRequest.cs @@ -88,16 +88,8 @@ internal bool IsSetGraphIdentifier() /// Min = 128 /// /// -<<<<<<< HEAD - [AWSProperty(Min=32, Max=24576)] - public int? ProvisionedMemory -||||||| Commit version number update changes - [AWSProperty(Min=32, Max=24576)] - public int ProvisionedMemory -======= [AWSProperty(Min=16, Max=24576)] - public int ProvisionedMemory ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b + public int? ProvisionedMemory { get { return this._provisionedMemory; } set { this._provisionedMemory = value; } diff --git a/sdk/src/Services/NeptuneGraph/Generated/Model/UpdateGraphResponse.cs b/sdk/src/Services/NeptuneGraph/Generated/Model/UpdateGraphResponse.cs index c4747cf8616d..eba27328415e 100644 --- a/sdk/src/Services/NeptuneGraph/Generated/Model/UpdateGraphResponse.cs +++ b/sdk/src/Services/NeptuneGraph/Generated/Model/UpdateGraphResponse.cs @@ -204,16 +204,8 @@ internal bool IsSetName() /// The number of memory-optimized Neptune Capacity Units (m-NCUs) allocated to the graph. /// /// -<<<<<<< HEAD - [AWSProperty(Min=32, Max=24576)] - public int? ProvisionedMemory -||||||| Commit version number update changes - [AWSProperty(Min=32, Max=24576)] - public int ProvisionedMemory -======= [AWSProperty(Min=16, Max=24576)] - public int ProvisionedMemory ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b + public int? ProvisionedMemory { get { return this._provisionedMemory; } set { this._provisionedMemory = value; } diff --git a/sdk/src/Services/NeptuneGraph/NeptuneGraph.sln b/sdk/src/Services/NeptuneGraph/NeptuneGraph.sln index 213179993ca4..d8937d8f82c7 100644 --- a/sdk/src/Services/NeptuneGraph/NeptuneGraph.sln +++ b/sdk/src/Services/NeptuneGraph/NeptuneGraph.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {1764C9EB-8203-4413-8514-83F6E25D3D26}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {1764C9EB-8203-4413-8514-83F6E25D3D26}.Debug|Any CPU.Build.0 = Debug|Any CPU {1764C9EB-8203-4413-8514-83F6E25D3D26}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {6F220292-0A5F-4CFC-A3A5-E0EF099E7919}.Debug|Any CPU.Build.0 = Debug|Any CPU {6F220292-0A5F-4CFC-A3A5-E0EF099E7919}.Release|Any CPU.ActiveCfg = Release|Any CPU {6F220292-0A5F-4CFC-A3A5-E0EF099E7919}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {0F480104-ADFC-4047-853C-16659BD82093}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0F480104-ADFC-4047-853C-16659BD82093}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0F480104-ADFC-4047-853C-16659BD82093}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0F480104-ADFC-4047-853C-16659BD82093}.Release|Any CPU.Build.0 = Release|Any CPU - {19388501-F5EE-477F-8AB2-51F68D51A55C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {19388501-F5EE-477F-8AB2-51F68D51A55C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {19388501-F5EE-477F-8AB2-51F68D51A55C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {19388501-F5EE-477F-8AB2-51F68D51A55C}.Release|Any CPU.Build.0 = Release|Any CPU - {46F0DB1F-2FCA-44A3-A078-4A0D8E13C566}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {46F0DB1F-2FCA-44A3-A078-4A0D8E13C566}.Debug|Any CPU.Build.0 = Debug|Any CPU - {46F0DB1F-2FCA-44A3-A078-4A0D8E13C566}.Release|Any CPU.ActiveCfg = Release|Any CPU - {46F0DB1F-2FCA-44A3-A078-4A0D8E13C566}.Release|Any CPU.Build.0 = Release|Any CPU - {ED1A5142-67EF-4FE4-960A-3E5B50A0FCB0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {ED1A5142-67EF-4FE4-960A-3E5B50A0FCB0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {ED1A5142-67EF-4FE4-960A-3E5B50A0FCB0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {ED1A5142-67EF-4FE4-960A-3E5B50A0FCB0}.Release|Any CPU.Build.0 = Release|Any CPU - {B0BDBB5F-BD0F-436B-8667-598F8CCF2C00}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B0BDBB5F-BD0F-436B-8667-598F8CCF2C00}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B0BDBB5F-BD0F-436B-8667-598F8CCF2C00}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B0BDBB5F-BD0F-436B-8667-598F8CCF2C00}.Release|Any CPU.Build.0 = Release|Any CPU - {86B3BE69-E9D6-4E11-9076-94F567FE9682}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {86B3BE69-E9D6-4E11-9076-94F567FE9682}.Debug|Any CPU.Build.0 = Debug|Any CPU - {86B3BE69-E9D6-4E11-9076-94F567FE9682}.Release|Any CPU.ActiveCfg = Release|Any CPU - {86B3BE69-E9D6-4E11-9076-94F567FE9682}.Release|Any CPU.Build.0 = Release|Any CPU - {CC4E3449-726B-4FDD-ABB9-4EF1EC5A0D6D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CC4E3449-726B-4FDD-ABB9-4EF1EC5A0D6D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CC4E3449-726B-4FDD-ABB9-4EF1EC5A0D6D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CC4E3449-726B-4FDD-ABB9-4EF1EC5A0D6D}.Release|Any CPU.Build.0 = Release|Any CPU - {3CF01B6B-1A35-4B1D-87B2-1B82EBFBBA40}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3CF01B6B-1A35-4B1D-87B2-1B82EBFBBA40}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3CF01B6B-1A35-4B1D-87B2-1B82EBFBBA40}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3CF01B6B-1A35-4B1D-87B2-1B82EBFBBA40}.Release|Any CPU.Build.0 = Release|Any CPU - {32B05611-E273-49C7-9B8C-FC6A7367D1E2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {32B05611-E273-49C7-9B8C-FC6A7367D1E2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {32B05611-E273-49C7-9B8C-FC6A7367D1E2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {32B05611-E273-49C7-9B8C-FC6A7367D1E2}.Release|Any CPU.Build.0 = Release|Any CPU - {F46224D9-DDBA-4F81-8EBD-5F62AC7B0D22}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F46224D9-DDBA-4F81-8EBD-5F62AC7B0D22}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F46224D9-DDBA-4F81-8EBD-5F62AC7B0D22}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F46224D9-DDBA-4F81-8EBD-5F62AC7B0D22}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {0F480104-ADFC-4047-853C-16659BD82093}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0F480104-ADFC-4047-853C-16659BD82093}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0F480104-ADFC-4047-853C-16659BD82093}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0F480104-ADFC-4047-853C-16659BD82093}.Release|Any CPU.Build.0 = Release|Any CPU - {19388501-F5EE-477F-8AB2-51F68D51A55C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {19388501-F5EE-477F-8AB2-51F68D51A55C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {19388501-F5EE-477F-8AB2-51F68D51A55C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {19388501-F5EE-477F-8AB2-51F68D51A55C}.Release|Any CPU.Build.0 = Release|Any CPU - {46F0DB1F-2FCA-44A3-A078-4A0D8E13C566}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {46F0DB1F-2FCA-44A3-A078-4A0D8E13C566}.Debug|Any CPU.Build.0 = Debug|Any CPU - {46F0DB1F-2FCA-44A3-A078-4A0D8E13C566}.Release|Any CPU.ActiveCfg = Release|Any CPU - {46F0DB1F-2FCA-44A3-A078-4A0D8E13C566}.Release|Any CPU.Build.0 = Release|Any CPU - {ED1A5142-67EF-4FE4-960A-3E5B50A0FCB0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {ED1A5142-67EF-4FE4-960A-3E5B50A0FCB0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {ED1A5142-67EF-4FE4-960A-3E5B50A0FCB0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {ED1A5142-67EF-4FE4-960A-3E5B50A0FCB0}.Release|Any CPU.Build.0 = Release|Any CPU - {B0BDBB5F-BD0F-436B-8667-598F8CCF2C00}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B0BDBB5F-BD0F-436B-8667-598F8CCF2C00}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B0BDBB5F-BD0F-436B-8667-598F8CCF2C00}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B0BDBB5F-BD0F-436B-8667-598F8CCF2C00}.Release|Any CPU.Build.0 = Release|Any CPU - {86B3BE69-E9D6-4E11-9076-94F567FE9682}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {86B3BE69-E9D6-4E11-9076-94F567FE9682}.Debug|Any CPU.Build.0 = Debug|Any CPU - {86B3BE69-E9D6-4E11-9076-94F567FE9682}.Release|Any CPU.ActiveCfg = Release|Any CPU - {86B3BE69-E9D6-4E11-9076-94F567FE9682}.Release|Any CPU.Build.0 = Release|Any CPU - {CC4E3449-726B-4FDD-ABB9-4EF1EC5A0D6D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CC4E3449-726B-4FDD-ABB9-4EF1EC5A0D6D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CC4E3449-726B-4FDD-ABB9-4EF1EC5A0D6D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CC4E3449-726B-4FDD-ABB9-4EF1EC5A0D6D}.Release|Any CPU.Build.0 = Release|Any CPU - {3CF01B6B-1A35-4B1D-87B2-1B82EBFBBA40}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3CF01B6B-1A35-4B1D-87B2-1B82EBFBBA40}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3CF01B6B-1A35-4B1D-87B2-1B82EBFBBA40}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3CF01B6B-1A35-4B1D-87B2-1B82EBFBBA40}.Release|Any CPU.Build.0 = Release|Any CPU - {32B05611-E273-49C7-9B8C-FC6A7367D1E2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {32B05611-E273-49C7-9B8C-FC6A7367D1E2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {32B05611-E273-49C7-9B8C-FC6A7367D1E2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {32B05611-E273-49C7-9B8C-FC6A7367D1E2}.Release|Any CPU.Build.0 = Release|Any CPU - {F46224D9-DDBA-4F81-8EBD-5F62AC7B0D22}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F46224D9-DDBA-4F81-8EBD-5F62AC7B0D22}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F46224D9-DDBA-4F81-8EBD-5F62AC7B0D22}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F46224D9-DDBA-4F81-8EBD-5F62AC7B0D22}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {1764C9EB-8203-4413-8514-83F6E25D3D26} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {58E3DB5D-972C-4A97-AC4E-622464EAFAA1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {402F7C97-16BD-4424-90A7-5FC48FCE21E7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {B6DDEFC9-0651-4C96-ADD9-866642335711} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {6F220292-0A5F-4CFC-A3A5-E0EF099E7919} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {0F480104-ADFC-4047-853C-16659BD82093} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {19388501-F5EE-477F-8AB2-51F68D51A55C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {46F0DB1F-2FCA-44A3-A078-4A0D8E13C566} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {ED1A5142-67EF-4FE4-960A-3E5B50A0FCB0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B0BDBB5F-BD0F-436B-8667-598F8CCF2C00} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {86B3BE69-E9D6-4E11-9076-94F567FE9682} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {CC4E3449-726B-4FDD-ABB9-4EF1EC5A0D6D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {3CF01B6B-1A35-4B1D-87B2-1B82EBFBBA40} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {32B05611-E273-49C7-9B8C-FC6A7367D1E2} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F46224D9-DDBA-4F81-8EBD-5F62AC7B0D22} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {0F480104-ADFC-4047-853C-16659BD82093} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {19388501-F5EE-477F-8AB2-51F68D51A55C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {46F0DB1F-2FCA-44A3-A078-4A0D8E13C566} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {ED1A5142-67EF-4FE4-960A-3E5B50A0FCB0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B0BDBB5F-BD0F-436B-8667-598F8CCF2C00} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {86B3BE69-E9D6-4E11-9076-94F567FE9682} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {CC4E3449-726B-4FDD-ABB9-4EF1EC5A0D6D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {3CF01B6B-1A35-4B1D-87B2-1B82EBFBBA40} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {32B05611-E273-49C7-9B8C-FC6A7367D1E2} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F46224D9-DDBA-4F81-8EBD-5F62AC7B0D22} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {EAB230B1-BDC0-4D42-8B19-C12DDAB4B81A} diff --git a/sdk/src/Services/NeptuneGraph/Properties/AssemblyInfo.cs b/sdk/src/Services/NeptuneGraph/Properties/AssemblyInfo.cs index 05e81dc3fd1f..0dc1eab17ea0 100644 --- a/sdk/src/Services/NeptuneGraph/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/NeptuneGraph/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.21")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.402.20")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/Neptunedata/Generated/AmazonNeptunedataConfig.cs b/sdk/src/Services/Neptunedata/Generated/AmazonNeptunedataConfig.cs index 217370ffab44..b822bb9ce9cd 100644 --- a/sdk/src/Services/Neptunedata/Generated/AmazonNeptunedataConfig.cs +++ b/sdk/src/Services/Neptunedata/Generated/AmazonNeptunedataConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.Neptunedata public partial class AmazonNeptunedataConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("neptunedata", "4.0.0.0"); private static readonly AmazonNeptunedataEndpointResolver EndpointResolver = new AmazonNeptunedataEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("neptunedata", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("neptunedata", "3.7.400.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/Neptunedata/Neptunedata.sln b/sdk/src/Services/Neptunedata/Neptunedata.sln index 2e19fe13b810..ce1d90cc39d3 100644 --- a/sdk/src/Services/Neptunedata/Neptunedata.sln +++ b/sdk/src/Services/Neptunedata/Neptunedata.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {34F921FF-86B3-4709-87B5-C98C314568B4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {34F921FF-86B3-4709-87B5-C98C314568B4}.Debug|Any CPU.Build.0 = Debug|Any CPU {34F921FF-86B3-4709-87B5-C98C314568B4}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {E421FEBC-D3F4-4689-9E9D-19439C7E2933}.Debug|Any CPU.Build.0 = Debug|Any CPU {E421FEBC-D3F4-4689-9E9D-19439C7E2933}.Release|Any CPU.ActiveCfg = Release|Any CPU {E421FEBC-D3F4-4689-9E9D-19439C7E2933}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {8246ADC2-C5A8-488F-AB9F-2B8691A481F6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8246ADC2-C5A8-488F-AB9F-2B8691A481F6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8246ADC2-C5A8-488F-AB9F-2B8691A481F6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8246ADC2-C5A8-488F-AB9F-2B8691A481F6}.Release|Any CPU.Build.0 = Release|Any CPU - {22A78CBB-9794-401A-BC07-6A4877E6DC87}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {22A78CBB-9794-401A-BC07-6A4877E6DC87}.Debug|Any CPU.Build.0 = Debug|Any CPU - {22A78CBB-9794-401A-BC07-6A4877E6DC87}.Release|Any CPU.ActiveCfg = Release|Any CPU - {22A78CBB-9794-401A-BC07-6A4877E6DC87}.Release|Any CPU.Build.0 = Release|Any CPU - {F7ABE71E-0E12-46D8-8CBC-642101B07389}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F7ABE71E-0E12-46D8-8CBC-642101B07389}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F7ABE71E-0E12-46D8-8CBC-642101B07389}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F7ABE71E-0E12-46D8-8CBC-642101B07389}.Release|Any CPU.Build.0 = Release|Any CPU - {1F57CEFB-ED3A-42A8-9BC0-55A3BF2E06BB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1F57CEFB-ED3A-42A8-9BC0-55A3BF2E06BB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1F57CEFB-ED3A-42A8-9BC0-55A3BF2E06BB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1F57CEFB-ED3A-42A8-9BC0-55A3BF2E06BB}.Release|Any CPU.Build.0 = Release|Any CPU - {35AD698E-FBCD-43AE-81B8-684102D516FA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {35AD698E-FBCD-43AE-81B8-684102D516FA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {35AD698E-FBCD-43AE-81B8-684102D516FA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {35AD698E-FBCD-43AE-81B8-684102D516FA}.Release|Any CPU.Build.0 = Release|Any CPU - {BFDCD266-6C48-497D-BB66-56B5FDE96FAC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BFDCD266-6C48-497D-BB66-56B5FDE96FAC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BFDCD266-6C48-497D-BB66-56B5FDE96FAC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BFDCD266-6C48-497D-BB66-56B5FDE96FAC}.Release|Any CPU.Build.0 = Release|Any CPU - {0063B7B7-15D6-490A-89A0-9922B674DCF2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0063B7B7-15D6-490A-89A0-9922B674DCF2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0063B7B7-15D6-490A-89A0-9922B674DCF2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0063B7B7-15D6-490A-89A0-9922B674DCF2}.Release|Any CPU.Build.0 = Release|Any CPU - {DC36F14B-2900-400E-BE84-085285D7F53A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DC36F14B-2900-400E-BE84-085285D7F53A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DC36F14B-2900-400E-BE84-085285D7F53A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DC36F14B-2900-400E-BE84-085285D7F53A}.Release|Any CPU.Build.0 = Release|Any CPU - {94AFA8A3-0CEF-47B9-820E-C366DE49FBFF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {94AFA8A3-0CEF-47B9-820E-C366DE49FBFF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {94AFA8A3-0CEF-47B9-820E-C366DE49FBFF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {94AFA8A3-0CEF-47B9-820E-C366DE49FBFF}.Release|Any CPU.Build.0 = Release|Any CPU - {D3DA25B9-AF63-4EB6-A5F2-832B420F9BC9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D3DA25B9-AF63-4EB6-A5F2-832B420F9BC9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D3DA25B9-AF63-4EB6-A5F2-832B420F9BC9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D3DA25B9-AF63-4EB6-A5F2-832B420F9BC9}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {8246ADC2-C5A8-488F-AB9F-2B8691A481F6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8246ADC2-C5A8-488F-AB9F-2B8691A481F6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8246ADC2-C5A8-488F-AB9F-2B8691A481F6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8246ADC2-C5A8-488F-AB9F-2B8691A481F6}.Release|Any CPU.Build.0 = Release|Any CPU - {22A78CBB-9794-401A-BC07-6A4877E6DC87}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {22A78CBB-9794-401A-BC07-6A4877E6DC87}.Debug|Any CPU.Build.0 = Debug|Any CPU - {22A78CBB-9794-401A-BC07-6A4877E6DC87}.Release|Any CPU.ActiveCfg = Release|Any CPU - {22A78CBB-9794-401A-BC07-6A4877E6DC87}.Release|Any CPU.Build.0 = Release|Any CPU - {F7ABE71E-0E12-46D8-8CBC-642101B07389}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F7ABE71E-0E12-46D8-8CBC-642101B07389}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F7ABE71E-0E12-46D8-8CBC-642101B07389}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F7ABE71E-0E12-46D8-8CBC-642101B07389}.Release|Any CPU.Build.0 = Release|Any CPU - {1F57CEFB-ED3A-42A8-9BC0-55A3BF2E06BB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1F57CEFB-ED3A-42A8-9BC0-55A3BF2E06BB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1F57CEFB-ED3A-42A8-9BC0-55A3BF2E06BB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1F57CEFB-ED3A-42A8-9BC0-55A3BF2E06BB}.Release|Any CPU.Build.0 = Release|Any CPU - {35AD698E-FBCD-43AE-81B8-684102D516FA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {35AD698E-FBCD-43AE-81B8-684102D516FA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {35AD698E-FBCD-43AE-81B8-684102D516FA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {35AD698E-FBCD-43AE-81B8-684102D516FA}.Release|Any CPU.Build.0 = Release|Any CPU - {BFDCD266-6C48-497D-BB66-56B5FDE96FAC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BFDCD266-6C48-497D-BB66-56B5FDE96FAC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BFDCD266-6C48-497D-BB66-56B5FDE96FAC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BFDCD266-6C48-497D-BB66-56B5FDE96FAC}.Release|Any CPU.Build.0 = Release|Any CPU - {0063B7B7-15D6-490A-89A0-9922B674DCF2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0063B7B7-15D6-490A-89A0-9922B674DCF2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0063B7B7-15D6-490A-89A0-9922B674DCF2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0063B7B7-15D6-490A-89A0-9922B674DCF2}.Release|Any CPU.Build.0 = Release|Any CPU - {DC36F14B-2900-400E-BE84-085285D7F53A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DC36F14B-2900-400E-BE84-085285D7F53A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DC36F14B-2900-400E-BE84-085285D7F53A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DC36F14B-2900-400E-BE84-085285D7F53A}.Release|Any CPU.Build.0 = Release|Any CPU - {94AFA8A3-0CEF-47B9-820E-C366DE49FBFF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {94AFA8A3-0CEF-47B9-820E-C366DE49FBFF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {94AFA8A3-0CEF-47B9-820E-C366DE49FBFF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {94AFA8A3-0CEF-47B9-820E-C366DE49FBFF}.Release|Any CPU.Build.0 = Release|Any CPU - {D3DA25B9-AF63-4EB6-A5F2-832B420F9BC9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D3DA25B9-AF63-4EB6-A5F2-832B420F9BC9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D3DA25B9-AF63-4EB6-A5F2-832B420F9BC9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D3DA25B9-AF63-4EB6-A5F2-832B420F9BC9}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {34F921FF-86B3-4709-87B5-C98C314568B4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {2DE7E055-2F39-4097-91D3-9066341166D9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {DF6979B8-F6E2-45DE-91CB-4F4D53E72B4A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {88ED5695-298E-4332-870B-429176B77EB6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {E421FEBC-D3F4-4689-9E9D-19439C7E2933} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {8246ADC2-C5A8-488F-AB9F-2B8691A481F6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {22A78CBB-9794-401A-BC07-6A4877E6DC87} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F7ABE71E-0E12-46D8-8CBC-642101B07389} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {1F57CEFB-ED3A-42A8-9BC0-55A3BF2E06BB} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {35AD698E-FBCD-43AE-81B8-684102D516FA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {BFDCD266-6C48-497D-BB66-56B5FDE96FAC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0063B7B7-15D6-490A-89A0-9922B674DCF2} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {DC36F14B-2900-400E-BE84-085285D7F53A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {94AFA8A3-0CEF-47B9-820E-C366DE49FBFF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D3DA25B9-AF63-4EB6-A5F2-832B420F9BC9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {8246ADC2-C5A8-488F-AB9F-2B8691A481F6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {22A78CBB-9794-401A-BC07-6A4877E6DC87} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F7ABE71E-0E12-46D8-8CBC-642101B07389} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {1F57CEFB-ED3A-42A8-9BC0-55A3BF2E06BB} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {35AD698E-FBCD-43AE-81B8-684102D516FA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {BFDCD266-6C48-497D-BB66-56B5FDE96FAC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0063B7B7-15D6-490A-89A0-9922B674DCF2} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {DC36F14B-2900-400E-BE84-085285D7F53A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {94AFA8A3-0CEF-47B9-820E-C366DE49FBFF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D3DA25B9-AF63-4EB6-A5F2-832B420F9BC9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {9DA97BBC-A664-42F0-907F-75415EB2B4EC} diff --git a/sdk/src/Services/Neptunedata/Properties/AssemblyInfo.cs b/sdk/src/Services/Neptunedata/Properties/AssemblyInfo.cs index 0d25898c41a2..d761c8ac399a 100644 --- a/sdk/src/Services/Neptunedata/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/Neptunedata/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/NetworkFirewall/Generated/AmazonNetworkFirewallConfig.cs b/sdk/src/Services/NetworkFirewall/Generated/AmazonNetworkFirewallConfig.cs index ef9b16c4248b..7ac2b8d6b022 100644 --- a/sdk/src/Services/NetworkFirewall/Generated/AmazonNetworkFirewallConfig.cs +++ b/sdk/src/Services/NetworkFirewall/Generated/AmazonNetworkFirewallConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.NetworkFirewall public partial class AmazonNetworkFirewallConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("Network Firewall", "4.0.0.0"); private static readonly AmazonNetworkFirewallEndpointResolver EndpointResolver = new AmazonNetworkFirewallEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("Network Firewall", "3.7.401.26"); -======= - InternalSDKUtils.BuildUserAgentString("Network Firewall", "3.7.402.10"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/NetworkFirewall/Generated/Model/FlowTimeouts.cs b/sdk/src/Services/NetworkFirewall/Generated/Model/FlowTimeouts.cs index be1b1ee7bf08..6dc5a50eb2f9 100644 --- a/sdk/src/Services/NetworkFirewall/Generated/Model/FlowTimeouts.cs +++ b/sdk/src/Services/NetworkFirewall/Generated/Model/FlowTimeouts.cs @@ -54,9 +54,9 @@ public partial class FlowTimeouts /// If no value is provided, it defaults to 350 seconds. /// /// - public int TcpIdleTimeoutSeconds + public int? TcpIdleTimeoutSeconds { - get { return this._tcpIdleTimeoutSeconds.GetValueOrDefault(); } + get { return this._tcpIdleTimeoutSeconds; } set { this._tcpIdleTimeoutSeconds = value; } } diff --git a/sdk/src/Services/NetworkFirewall/Generated/Model/Internal/MarshallTransformations/FlowTimeoutsMarshaller.cs b/sdk/src/Services/NetworkFirewall/Generated/Model/Internal/MarshallTransformations/FlowTimeoutsMarshaller.cs index 7623281c22c7..cc9029aa2d28 100644 --- a/sdk/src/Services/NetworkFirewall/Generated/Model/Internal/MarshallTransformations/FlowTimeoutsMarshaller.cs +++ b/sdk/src/Services/NetworkFirewall/Generated/Model/Internal/MarshallTransformations/FlowTimeoutsMarshaller.cs @@ -51,7 +51,7 @@ public void Marshall(FlowTimeouts requestObject, JsonMarshallerContext context) if(requestObject.IsSetTcpIdleTimeoutSeconds()) { context.Writer.WritePropertyName("TcpIdleTimeoutSeconds"); - context.Writer.Write(requestObject.TcpIdleTimeoutSeconds); + context.Writer.Write(requestObject.TcpIdleTimeoutSeconds.Value); } } diff --git a/sdk/src/Services/NetworkFirewall/Generated/Model/Internal/MarshallTransformations/FlowTimeoutsUnmarshaller.cs b/sdk/src/Services/NetworkFirewall/Generated/Model/Internal/MarshallTransformations/FlowTimeoutsUnmarshaller.cs index 8a7ea4eb0068..85ff6cf3a91b 100644 --- a/sdk/src/Services/NetworkFirewall/Generated/Model/Internal/MarshallTransformations/FlowTimeoutsUnmarshaller.cs +++ b/sdk/src/Services/NetworkFirewall/Generated/Model/Internal/MarshallTransformations/FlowTimeoutsUnmarshaller.cs @@ -68,7 +68,7 @@ public FlowTimeouts Unmarshall(JsonUnmarshallerContext context) { if (context.TestExpression("TcpIdleTimeoutSeconds", targetDepth)) { - var unmarshaller = IntUnmarshaller.Instance; + var unmarshaller = NullableIntUnmarshaller.Instance; unmarshalledObject.TcpIdleTimeoutSeconds = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/NetworkFirewall/Generated/_bcl/AmazonNetworkFirewallClient.cs b/sdk/src/Services/NetworkFirewall/Generated/_bcl/AmazonNetworkFirewallClient.cs index 4b296fb8dc9d..2e1c14330955 100644 --- a/sdk/src/Services/NetworkFirewall/Generated/_bcl/AmazonNetworkFirewallClient.cs +++ b/sdk/src/Services/NetworkFirewall/Generated/_bcl/AmazonNetworkFirewallClient.cs @@ -75,9 +75,7 @@ namespace Amazon.NetworkFirewall /// Firewall, you can filter traffic at the perimeter of your VPC. This includes filtering /// traffic going to and coming from an internet gateway, NAT gateway, or over VPN or /// Direct Connect. Network Firewall uses rules that are compatible with Suricata, a free, - /// open source network analysis and threat detection engine. Network Firewall supports - /// Suricata version 6.0.9. For information about Suricata, see the Suricata - /// website. + /// open source network analysis and threat detection engine. /// /// /// diff --git a/sdk/src/Services/NetworkFirewall/NetworkFirewall.sln b/sdk/src/Services/NetworkFirewall/NetworkFirewall.sln index 19d58e044694..6cab0b1e35f4 100644 --- a/sdk/src/Services/NetworkFirewall/NetworkFirewall.sln +++ b/sdk/src/Services/NetworkFirewall/NetworkFirewall.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {13403DB0-D154-411F-9EF9-0629DD6336BA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {13403DB0-D154-411F-9EF9-0629DD6336BA}.Debug|Any CPU.Build.0 = Debug|Any CPU {13403DB0-D154-411F-9EF9-0629DD6336BA}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {6B4328C2-D6B4-41FA-886A-4768C9E739BD}.Debug|Any CPU.Build.0 = Debug|Any CPU {6B4328C2-D6B4-41FA-886A-4768C9E739BD}.Release|Any CPU.ActiveCfg = Release|Any CPU {6B4328C2-D6B4-41FA-886A-4768C9E739BD}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {A454A575-C565-4BD7-AE8B-CBCB7A24D1E7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A454A575-C565-4BD7-AE8B-CBCB7A24D1E7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A454A575-C565-4BD7-AE8B-CBCB7A24D1E7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A454A575-C565-4BD7-AE8B-CBCB7A24D1E7}.Release|Any CPU.Build.0 = Release|Any CPU - {E3A47557-77FC-4F64-9044-9FD3C8B9140D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E3A47557-77FC-4F64-9044-9FD3C8B9140D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E3A47557-77FC-4F64-9044-9FD3C8B9140D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E3A47557-77FC-4F64-9044-9FD3C8B9140D}.Release|Any CPU.Build.0 = Release|Any CPU - {B21F2A5E-BFFA-4CFB-AA37-D10B213B627F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B21F2A5E-BFFA-4CFB-AA37-D10B213B627F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B21F2A5E-BFFA-4CFB-AA37-D10B213B627F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B21F2A5E-BFFA-4CFB-AA37-D10B213B627F}.Release|Any CPU.Build.0 = Release|Any CPU - {1A1F42FB-3694-48F8-8EEA-11206E5EF015}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1A1F42FB-3694-48F8-8EEA-11206E5EF015}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1A1F42FB-3694-48F8-8EEA-11206E5EF015}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1A1F42FB-3694-48F8-8EEA-11206E5EF015}.Release|Any CPU.Build.0 = Release|Any CPU - {6AD6ECCF-AA5A-4817-BB85-ED6E25348568}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6AD6ECCF-AA5A-4817-BB85-ED6E25348568}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6AD6ECCF-AA5A-4817-BB85-ED6E25348568}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6AD6ECCF-AA5A-4817-BB85-ED6E25348568}.Release|Any CPU.Build.0 = Release|Any CPU - {FA411D81-3F0C-4F49-BBE5-701E959B5A7B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FA411D81-3F0C-4F49-BBE5-701E959B5A7B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FA411D81-3F0C-4F49-BBE5-701E959B5A7B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FA411D81-3F0C-4F49-BBE5-701E959B5A7B}.Release|Any CPU.Build.0 = Release|Any CPU - {56084A1F-9682-48B2-B6E8-AFF7B32F7E82}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {56084A1F-9682-48B2-B6E8-AFF7B32F7E82}.Debug|Any CPU.Build.0 = Debug|Any CPU - {56084A1F-9682-48B2-B6E8-AFF7B32F7E82}.Release|Any CPU.ActiveCfg = Release|Any CPU - {56084A1F-9682-48B2-B6E8-AFF7B32F7E82}.Release|Any CPU.Build.0 = Release|Any CPU - {F334CD26-C6B7-40CA-BC10-E7DEA669B024}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F334CD26-C6B7-40CA-BC10-E7DEA669B024}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F334CD26-C6B7-40CA-BC10-E7DEA669B024}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F334CD26-C6B7-40CA-BC10-E7DEA669B024}.Release|Any CPU.Build.0 = Release|Any CPU - {C5A11F53-D6FA-4240-826F-0BFF514B2AB0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C5A11F53-D6FA-4240-826F-0BFF514B2AB0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C5A11F53-D6FA-4240-826F-0BFF514B2AB0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C5A11F53-D6FA-4240-826F-0BFF514B2AB0}.Release|Any CPU.Build.0 = Release|Any CPU - {EA190F5A-876C-4F75-819B-A32AF9F94411}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EA190F5A-876C-4F75-819B-A32AF9F94411}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EA190F5A-876C-4F75-819B-A32AF9F94411}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EA190F5A-876C-4F75-819B-A32AF9F94411}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {A454A575-C565-4BD7-AE8B-CBCB7A24D1E7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A454A575-C565-4BD7-AE8B-CBCB7A24D1E7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A454A575-C565-4BD7-AE8B-CBCB7A24D1E7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A454A575-C565-4BD7-AE8B-CBCB7A24D1E7}.Release|Any CPU.Build.0 = Release|Any CPU - {E3A47557-77FC-4F64-9044-9FD3C8B9140D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E3A47557-77FC-4F64-9044-9FD3C8B9140D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E3A47557-77FC-4F64-9044-9FD3C8B9140D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E3A47557-77FC-4F64-9044-9FD3C8B9140D}.Release|Any CPU.Build.0 = Release|Any CPU - {B21F2A5E-BFFA-4CFB-AA37-D10B213B627F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B21F2A5E-BFFA-4CFB-AA37-D10B213B627F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B21F2A5E-BFFA-4CFB-AA37-D10B213B627F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B21F2A5E-BFFA-4CFB-AA37-D10B213B627F}.Release|Any CPU.Build.0 = Release|Any CPU - {1A1F42FB-3694-48F8-8EEA-11206E5EF015}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1A1F42FB-3694-48F8-8EEA-11206E5EF015}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1A1F42FB-3694-48F8-8EEA-11206E5EF015}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1A1F42FB-3694-48F8-8EEA-11206E5EF015}.Release|Any CPU.Build.0 = Release|Any CPU - {6AD6ECCF-AA5A-4817-BB85-ED6E25348568}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6AD6ECCF-AA5A-4817-BB85-ED6E25348568}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6AD6ECCF-AA5A-4817-BB85-ED6E25348568}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6AD6ECCF-AA5A-4817-BB85-ED6E25348568}.Release|Any CPU.Build.0 = Release|Any CPU - {FA411D81-3F0C-4F49-BBE5-701E959B5A7B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FA411D81-3F0C-4F49-BBE5-701E959B5A7B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FA411D81-3F0C-4F49-BBE5-701E959B5A7B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FA411D81-3F0C-4F49-BBE5-701E959B5A7B}.Release|Any CPU.Build.0 = Release|Any CPU - {56084A1F-9682-48B2-B6E8-AFF7B32F7E82}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {56084A1F-9682-48B2-B6E8-AFF7B32F7E82}.Debug|Any CPU.Build.0 = Debug|Any CPU - {56084A1F-9682-48B2-B6E8-AFF7B32F7E82}.Release|Any CPU.ActiveCfg = Release|Any CPU - {56084A1F-9682-48B2-B6E8-AFF7B32F7E82}.Release|Any CPU.Build.0 = Release|Any CPU - {F334CD26-C6B7-40CA-BC10-E7DEA669B024}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F334CD26-C6B7-40CA-BC10-E7DEA669B024}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F334CD26-C6B7-40CA-BC10-E7DEA669B024}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F334CD26-C6B7-40CA-BC10-E7DEA669B024}.Release|Any CPU.Build.0 = Release|Any CPU - {C5A11F53-D6FA-4240-826F-0BFF514B2AB0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C5A11F53-D6FA-4240-826F-0BFF514B2AB0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C5A11F53-D6FA-4240-826F-0BFF514B2AB0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C5A11F53-D6FA-4240-826F-0BFF514B2AB0}.Release|Any CPU.Build.0 = Release|Any CPU - {EA190F5A-876C-4F75-819B-A32AF9F94411}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EA190F5A-876C-4F75-819B-A32AF9F94411}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EA190F5A-876C-4F75-819B-A32AF9F94411}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EA190F5A-876C-4F75-819B-A32AF9F94411}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {13403DB0-D154-411F-9EF9-0629DD6336BA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {744D8B00-A9E5-41AA-9AEA-77B692BBAA30} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {098203D1-D9F3-4908-8C66-C4B232CC5F67} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {45BD67F9-B0E0-4129-A15C-9EFADA69AA3A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {6B4328C2-D6B4-41FA-886A-4768C9E739BD} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {A454A575-C565-4BD7-AE8B-CBCB7A24D1E7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E3A47557-77FC-4F64-9044-9FD3C8B9140D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B21F2A5E-BFFA-4CFB-AA37-D10B213B627F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {1A1F42FB-3694-48F8-8EEA-11206E5EF015} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6AD6ECCF-AA5A-4817-BB85-ED6E25348568} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {FA411D81-3F0C-4F49-BBE5-701E959B5A7B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {56084A1F-9682-48B2-B6E8-AFF7B32F7E82} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F334CD26-C6B7-40CA-BC10-E7DEA669B024} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C5A11F53-D6FA-4240-826F-0BFF514B2AB0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {EA190F5A-876C-4F75-819B-A32AF9F94411} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {A454A575-C565-4BD7-AE8B-CBCB7A24D1E7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E3A47557-77FC-4F64-9044-9FD3C8B9140D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B21F2A5E-BFFA-4CFB-AA37-D10B213B627F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {1A1F42FB-3694-48F8-8EEA-11206E5EF015} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6AD6ECCF-AA5A-4817-BB85-ED6E25348568} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {FA411D81-3F0C-4F49-BBE5-701E959B5A7B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {56084A1F-9682-48B2-B6E8-AFF7B32F7E82} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F334CD26-C6B7-40CA-BC10-E7DEA669B024} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C5A11F53-D6FA-4240-826F-0BFF514B2AB0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {EA190F5A-876C-4F75-819B-A32AF9F94411} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {05556269-500C-40C6-807B-3A8DD5DD6607} diff --git a/sdk/src/Services/NetworkFirewall/Properties/AssemblyInfo.cs b/sdk/src/Services/NetworkFirewall/Properties/AssemblyInfo.cs index 9eacb9b0a2a8..5b51915c98e2 100644 --- a/sdk/src/Services/NetworkFirewall/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/NetworkFirewall/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.402.10")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/NetworkManager/Generated/AmazonNetworkManagerConfig.cs b/sdk/src/Services/NetworkManager/Generated/AmazonNetworkManagerConfig.cs index 1bea80a97132..827fe5c79baf 100644 --- a/sdk/src/Services/NetworkManager/Generated/AmazonNetworkManagerConfig.cs +++ b/sdk/src/Services/NetworkManager/Generated/AmazonNetworkManagerConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.NetworkManager public partial class AmazonNetworkManagerConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("NetworkManager", "4.0.0.0"); private static readonly AmazonNetworkManagerEndpointResolver EndpointResolver = new AmazonNetworkManagerEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("NetworkManager", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("NetworkManager", "3.7.400.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/NetworkManager/NetworkManager.sln b/sdk/src/Services/NetworkManager/NetworkManager.sln index 6853428ee9c9..0922c8558578 100644 --- a/sdk/src/Services/NetworkManager/NetworkManager.sln +++ b/sdk/src/Services/NetworkManager/NetworkManager.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {75323294-8A19-4BE7-8AE5-D669CD390D96}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {75323294-8A19-4BE7-8AE5-D669CD390D96}.Debug|Any CPU.Build.0 = Debug|Any CPU {75323294-8A19-4BE7-8AE5-D669CD390D96}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {7256AAD9-773F-4C94-99D5-854D3A82694F}.Debug|Any CPU.Build.0 = Debug|Any CPU {7256AAD9-773F-4C94-99D5-854D3A82694F}.Release|Any CPU.ActiveCfg = Release|Any CPU {7256AAD9-773F-4C94-99D5-854D3A82694F}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {5A59316B-59D1-4325-8625-9F511899E8CF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5A59316B-59D1-4325-8625-9F511899E8CF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5A59316B-59D1-4325-8625-9F511899E8CF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5A59316B-59D1-4325-8625-9F511899E8CF}.Release|Any CPU.Build.0 = Release|Any CPU - {1C667053-80F3-4247-8851-E24D9971C15D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1C667053-80F3-4247-8851-E24D9971C15D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1C667053-80F3-4247-8851-E24D9971C15D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1C667053-80F3-4247-8851-E24D9971C15D}.Release|Any CPU.Build.0 = Release|Any CPU - {305B5CB5-E5BA-4968-9DB1-CF5BC73AEABB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {305B5CB5-E5BA-4968-9DB1-CF5BC73AEABB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {305B5CB5-E5BA-4968-9DB1-CF5BC73AEABB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {305B5CB5-E5BA-4968-9DB1-CF5BC73AEABB}.Release|Any CPU.Build.0 = Release|Any CPU - {8A6CEE4A-8113-4DF0-AF59-53E7F778CEF8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8A6CEE4A-8113-4DF0-AF59-53E7F778CEF8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8A6CEE4A-8113-4DF0-AF59-53E7F778CEF8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8A6CEE4A-8113-4DF0-AF59-53E7F778CEF8}.Release|Any CPU.Build.0 = Release|Any CPU - {0BC18E44-6BF6-4DC7-8B86-1B63C1526A94}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0BC18E44-6BF6-4DC7-8B86-1B63C1526A94}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0BC18E44-6BF6-4DC7-8B86-1B63C1526A94}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0BC18E44-6BF6-4DC7-8B86-1B63C1526A94}.Release|Any CPU.Build.0 = Release|Any CPU - {318DB7BB-418D-4A3A-975E-5E51DF4F5F5A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {318DB7BB-418D-4A3A-975E-5E51DF4F5F5A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {318DB7BB-418D-4A3A-975E-5E51DF4F5F5A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {318DB7BB-418D-4A3A-975E-5E51DF4F5F5A}.Release|Any CPU.Build.0 = Release|Any CPU - {80FAB322-D8E8-49B1-8C10-E16B9C76E4F3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {80FAB322-D8E8-49B1-8C10-E16B9C76E4F3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {80FAB322-D8E8-49B1-8C10-E16B9C76E4F3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {80FAB322-D8E8-49B1-8C10-E16B9C76E4F3}.Release|Any CPU.Build.0 = Release|Any CPU - {F0C2E6BC-40E9-4750-B4B3-9B9D009DA889}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F0C2E6BC-40E9-4750-B4B3-9B9D009DA889}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F0C2E6BC-40E9-4750-B4B3-9B9D009DA889}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F0C2E6BC-40E9-4750-B4B3-9B9D009DA889}.Release|Any CPU.Build.0 = Release|Any CPU - {610DD667-B588-4991-9576-A8A5442BF8F1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {610DD667-B588-4991-9576-A8A5442BF8F1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {610DD667-B588-4991-9576-A8A5442BF8F1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {610DD667-B588-4991-9576-A8A5442BF8F1}.Release|Any CPU.Build.0 = Release|Any CPU - {D912C31B-CE99-498D-B5F2-C84D0C738F37}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D912C31B-CE99-498D-B5F2-C84D0C738F37}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D912C31B-CE99-498D-B5F2-C84D0C738F37}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D912C31B-CE99-498D-B5F2-C84D0C738F37}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {5A59316B-59D1-4325-8625-9F511899E8CF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5A59316B-59D1-4325-8625-9F511899E8CF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5A59316B-59D1-4325-8625-9F511899E8CF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5A59316B-59D1-4325-8625-9F511899E8CF}.Release|Any CPU.Build.0 = Release|Any CPU - {1C667053-80F3-4247-8851-E24D9971C15D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1C667053-80F3-4247-8851-E24D9971C15D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1C667053-80F3-4247-8851-E24D9971C15D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1C667053-80F3-4247-8851-E24D9971C15D}.Release|Any CPU.Build.0 = Release|Any CPU - {305B5CB5-E5BA-4968-9DB1-CF5BC73AEABB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {305B5CB5-E5BA-4968-9DB1-CF5BC73AEABB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {305B5CB5-E5BA-4968-9DB1-CF5BC73AEABB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {305B5CB5-E5BA-4968-9DB1-CF5BC73AEABB}.Release|Any CPU.Build.0 = Release|Any CPU - {8A6CEE4A-8113-4DF0-AF59-53E7F778CEF8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8A6CEE4A-8113-4DF0-AF59-53E7F778CEF8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8A6CEE4A-8113-4DF0-AF59-53E7F778CEF8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8A6CEE4A-8113-4DF0-AF59-53E7F778CEF8}.Release|Any CPU.Build.0 = Release|Any CPU - {0BC18E44-6BF6-4DC7-8B86-1B63C1526A94}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0BC18E44-6BF6-4DC7-8B86-1B63C1526A94}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0BC18E44-6BF6-4DC7-8B86-1B63C1526A94}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0BC18E44-6BF6-4DC7-8B86-1B63C1526A94}.Release|Any CPU.Build.0 = Release|Any CPU - {318DB7BB-418D-4A3A-975E-5E51DF4F5F5A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {318DB7BB-418D-4A3A-975E-5E51DF4F5F5A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {318DB7BB-418D-4A3A-975E-5E51DF4F5F5A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {318DB7BB-418D-4A3A-975E-5E51DF4F5F5A}.Release|Any CPU.Build.0 = Release|Any CPU - {80FAB322-D8E8-49B1-8C10-E16B9C76E4F3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {80FAB322-D8E8-49B1-8C10-E16B9C76E4F3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {80FAB322-D8E8-49B1-8C10-E16B9C76E4F3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {80FAB322-D8E8-49B1-8C10-E16B9C76E4F3}.Release|Any CPU.Build.0 = Release|Any CPU - {F0C2E6BC-40E9-4750-B4B3-9B9D009DA889}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F0C2E6BC-40E9-4750-B4B3-9B9D009DA889}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F0C2E6BC-40E9-4750-B4B3-9B9D009DA889}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F0C2E6BC-40E9-4750-B4B3-9B9D009DA889}.Release|Any CPU.Build.0 = Release|Any CPU - {610DD667-B588-4991-9576-A8A5442BF8F1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {610DD667-B588-4991-9576-A8A5442BF8F1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {610DD667-B588-4991-9576-A8A5442BF8F1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {610DD667-B588-4991-9576-A8A5442BF8F1}.Release|Any CPU.Build.0 = Release|Any CPU - {D912C31B-CE99-498D-B5F2-C84D0C738F37}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D912C31B-CE99-498D-B5F2-C84D0C738F37}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D912C31B-CE99-498D-B5F2-C84D0C738F37}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D912C31B-CE99-498D-B5F2-C84D0C738F37}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {75323294-8A19-4BE7-8AE5-D669CD390D96} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {BFB7E4FD-0515-46FA-8889-C920DA2F500A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {729275B2-1888-413F-8656-3031132424BF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {AB419109-ED3E-49D6-9798-EAD82B41D983} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {7256AAD9-773F-4C94-99D5-854D3A82694F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {5A59316B-59D1-4325-8625-9F511899E8CF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {1C667053-80F3-4247-8851-E24D9971C15D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {305B5CB5-E5BA-4968-9DB1-CF5BC73AEABB} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8A6CEE4A-8113-4DF0-AF59-53E7F778CEF8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0BC18E44-6BF6-4DC7-8B86-1B63C1526A94} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {318DB7BB-418D-4A3A-975E-5E51DF4F5F5A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {80FAB322-D8E8-49B1-8C10-E16B9C76E4F3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F0C2E6BC-40E9-4750-B4B3-9B9D009DA889} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {610DD667-B588-4991-9576-A8A5442BF8F1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D912C31B-CE99-498D-B5F2-C84D0C738F37} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {5A59316B-59D1-4325-8625-9F511899E8CF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {1C667053-80F3-4247-8851-E24D9971C15D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {305B5CB5-E5BA-4968-9DB1-CF5BC73AEABB} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8A6CEE4A-8113-4DF0-AF59-53E7F778CEF8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0BC18E44-6BF6-4DC7-8B86-1B63C1526A94} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {318DB7BB-418D-4A3A-975E-5E51DF4F5F5A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {80FAB322-D8E8-49B1-8C10-E16B9C76E4F3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F0C2E6BC-40E9-4750-B4B3-9B9D009DA889} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {610DD667-B588-4991-9576-A8A5442BF8F1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D912C31B-CE99-498D-B5F2-C84D0C738F37} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {2CA46EB0-E4E3-46F4-892B-879577370F5A} diff --git a/sdk/src/Services/NetworkManager/Properties/AssemblyInfo.cs b/sdk/src/Services/NetworkManager/Properties/AssemblyInfo.cs index fd4449044605..9f89ede676fe 100644 --- a/sdk/src/Services/NetworkManager/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/NetworkManager/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/NetworkMonitor/Generated/AmazonNetworkMonitorConfig.cs b/sdk/src/Services/NetworkMonitor/Generated/AmazonNetworkMonitorConfig.cs index a22c735b13b0..8e318d71b184 100644 --- a/sdk/src/Services/NetworkMonitor/Generated/AmazonNetworkMonitorConfig.cs +++ b/sdk/src/Services/NetworkMonitor/Generated/AmazonNetworkMonitorConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.NetworkMonitor public partial class AmazonNetworkMonitorConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("NetworkMonitor", "4.0.0.0"); private static readonly AmazonNetworkMonitorEndpointResolver EndpointResolver = new AmazonNetworkMonitorEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("NetworkMonitor", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("NetworkMonitor", "3.7.400.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/NetworkMonitor/NetworkMonitor.sln b/sdk/src/Services/NetworkMonitor/NetworkMonitor.sln index 7eea15b5a792..32d6927787af 100644 --- a/sdk/src/Services/NetworkMonitor/NetworkMonitor.sln +++ b/sdk/src/Services/NetworkMonitor/NetworkMonitor.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {BBC034D2-E2EC-4FC1-A240-6D9C9A4ED680}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {BBC034D2-E2EC-4FC1-A240-6D9C9A4ED680}.Debug|Any CPU.Build.0 = Debug|Any CPU {BBC034D2-E2EC-4FC1-A240-6D9C9A4ED680}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {5E6B5E53-FE83-4FBD-A516-308DE7D4CC4D}.Debug|Any CPU.Build.0 = Debug|Any CPU {5E6B5E53-FE83-4FBD-A516-308DE7D4CC4D}.Release|Any CPU.ActiveCfg = Release|Any CPU {5E6B5E53-FE83-4FBD-A516-308DE7D4CC4D}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {A61E09D6-EA28-420A-BCC6-CD8F815C0D04}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A61E09D6-EA28-420A-BCC6-CD8F815C0D04}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A61E09D6-EA28-420A-BCC6-CD8F815C0D04}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A61E09D6-EA28-420A-BCC6-CD8F815C0D04}.Release|Any CPU.Build.0 = Release|Any CPU - {325C26A9-2EEB-4504-9BC4-AC929A54EA30}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {325C26A9-2EEB-4504-9BC4-AC929A54EA30}.Debug|Any CPU.Build.0 = Debug|Any CPU - {325C26A9-2EEB-4504-9BC4-AC929A54EA30}.Release|Any CPU.ActiveCfg = Release|Any CPU - {325C26A9-2EEB-4504-9BC4-AC929A54EA30}.Release|Any CPU.Build.0 = Release|Any CPU - {E9FDEFCF-DC6D-49A4-BE15-4834E8DC81D2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E9FDEFCF-DC6D-49A4-BE15-4834E8DC81D2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E9FDEFCF-DC6D-49A4-BE15-4834E8DC81D2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E9FDEFCF-DC6D-49A4-BE15-4834E8DC81D2}.Release|Any CPU.Build.0 = Release|Any CPU - {C0320EF7-7230-431D-BE87-BAFC3C2F26A8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C0320EF7-7230-431D-BE87-BAFC3C2F26A8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C0320EF7-7230-431D-BE87-BAFC3C2F26A8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C0320EF7-7230-431D-BE87-BAFC3C2F26A8}.Release|Any CPU.Build.0 = Release|Any CPU - {BD78A96F-62BD-415C-A645-3C79942B5300}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BD78A96F-62BD-415C-A645-3C79942B5300}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BD78A96F-62BD-415C-A645-3C79942B5300}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BD78A96F-62BD-415C-A645-3C79942B5300}.Release|Any CPU.Build.0 = Release|Any CPU - {8ED593BD-DF1C-4BD0-B95B-B2DA797971BB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8ED593BD-DF1C-4BD0-B95B-B2DA797971BB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8ED593BD-DF1C-4BD0-B95B-B2DA797971BB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8ED593BD-DF1C-4BD0-B95B-B2DA797971BB}.Release|Any CPU.Build.0 = Release|Any CPU - {5BA8E870-270C-463D-88DE-5BDDFA52285C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5BA8E870-270C-463D-88DE-5BDDFA52285C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5BA8E870-270C-463D-88DE-5BDDFA52285C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5BA8E870-270C-463D-88DE-5BDDFA52285C}.Release|Any CPU.Build.0 = Release|Any CPU - {9716575D-69BA-4EE1-B5F2-F7B68FE2D939}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9716575D-69BA-4EE1-B5F2-F7B68FE2D939}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9716575D-69BA-4EE1-B5F2-F7B68FE2D939}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9716575D-69BA-4EE1-B5F2-F7B68FE2D939}.Release|Any CPU.Build.0 = Release|Any CPU - {07A1F58E-9AEE-4EF1-B7A2-48909C9E4320}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {07A1F58E-9AEE-4EF1-B7A2-48909C9E4320}.Debug|Any CPU.Build.0 = Debug|Any CPU - {07A1F58E-9AEE-4EF1-B7A2-48909C9E4320}.Release|Any CPU.ActiveCfg = Release|Any CPU - {07A1F58E-9AEE-4EF1-B7A2-48909C9E4320}.Release|Any CPU.Build.0 = Release|Any CPU - {55ACFC03-222C-41E4-ABB6-BF5320521FBF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {55ACFC03-222C-41E4-ABB6-BF5320521FBF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {55ACFC03-222C-41E4-ABB6-BF5320521FBF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {55ACFC03-222C-41E4-ABB6-BF5320521FBF}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {A61E09D6-EA28-420A-BCC6-CD8F815C0D04}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A61E09D6-EA28-420A-BCC6-CD8F815C0D04}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A61E09D6-EA28-420A-BCC6-CD8F815C0D04}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A61E09D6-EA28-420A-BCC6-CD8F815C0D04}.Release|Any CPU.Build.0 = Release|Any CPU - {325C26A9-2EEB-4504-9BC4-AC929A54EA30}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {325C26A9-2EEB-4504-9BC4-AC929A54EA30}.Debug|Any CPU.Build.0 = Debug|Any CPU - {325C26A9-2EEB-4504-9BC4-AC929A54EA30}.Release|Any CPU.ActiveCfg = Release|Any CPU - {325C26A9-2EEB-4504-9BC4-AC929A54EA30}.Release|Any CPU.Build.0 = Release|Any CPU - {E9FDEFCF-DC6D-49A4-BE15-4834E8DC81D2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E9FDEFCF-DC6D-49A4-BE15-4834E8DC81D2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E9FDEFCF-DC6D-49A4-BE15-4834E8DC81D2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E9FDEFCF-DC6D-49A4-BE15-4834E8DC81D2}.Release|Any CPU.Build.0 = Release|Any CPU - {C0320EF7-7230-431D-BE87-BAFC3C2F26A8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C0320EF7-7230-431D-BE87-BAFC3C2F26A8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C0320EF7-7230-431D-BE87-BAFC3C2F26A8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C0320EF7-7230-431D-BE87-BAFC3C2F26A8}.Release|Any CPU.Build.0 = Release|Any CPU - {BD78A96F-62BD-415C-A645-3C79942B5300}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BD78A96F-62BD-415C-A645-3C79942B5300}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BD78A96F-62BD-415C-A645-3C79942B5300}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BD78A96F-62BD-415C-A645-3C79942B5300}.Release|Any CPU.Build.0 = Release|Any CPU - {8ED593BD-DF1C-4BD0-B95B-B2DA797971BB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8ED593BD-DF1C-4BD0-B95B-B2DA797971BB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8ED593BD-DF1C-4BD0-B95B-B2DA797971BB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8ED593BD-DF1C-4BD0-B95B-B2DA797971BB}.Release|Any CPU.Build.0 = Release|Any CPU - {5BA8E870-270C-463D-88DE-5BDDFA52285C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5BA8E870-270C-463D-88DE-5BDDFA52285C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5BA8E870-270C-463D-88DE-5BDDFA52285C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5BA8E870-270C-463D-88DE-5BDDFA52285C}.Release|Any CPU.Build.0 = Release|Any CPU - {9716575D-69BA-4EE1-B5F2-F7B68FE2D939}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9716575D-69BA-4EE1-B5F2-F7B68FE2D939}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9716575D-69BA-4EE1-B5F2-F7B68FE2D939}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9716575D-69BA-4EE1-B5F2-F7B68FE2D939}.Release|Any CPU.Build.0 = Release|Any CPU - {07A1F58E-9AEE-4EF1-B7A2-48909C9E4320}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {07A1F58E-9AEE-4EF1-B7A2-48909C9E4320}.Debug|Any CPU.Build.0 = Debug|Any CPU - {07A1F58E-9AEE-4EF1-B7A2-48909C9E4320}.Release|Any CPU.ActiveCfg = Release|Any CPU - {07A1F58E-9AEE-4EF1-B7A2-48909C9E4320}.Release|Any CPU.Build.0 = Release|Any CPU - {55ACFC03-222C-41E4-ABB6-BF5320521FBF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {55ACFC03-222C-41E4-ABB6-BF5320521FBF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {55ACFC03-222C-41E4-ABB6-BF5320521FBF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {55ACFC03-222C-41E4-ABB6-BF5320521FBF}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {BBC034D2-E2EC-4FC1-A240-6D9C9A4ED680} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {D22DD930-32D7-4886-AE4C-EA8A359ACC8A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {6F5B5F73-A75F-4DB3-84FA-4FB6850DA83F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {CF32A988-2629-4411-8C4B-B1006248704B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {5E6B5E53-FE83-4FBD-A516-308DE7D4CC4D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {A61E09D6-EA28-420A-BCC6-CD8F815C0D04} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {325C26A9-2EEB-4504-9BC4-AC929A54EA30} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E9FDEFCF-DC6D-49A4-BE15-4834E8DC81D2} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C0320EF7-7230-431D-BE87-BAFC3C2F26A8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {BD78A96F-62BD-415C-A645-3C79942B5300} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8ED593BD-DF1C-4BD0-B95B-B2DA797971BB} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {5BA8E870-270C-463D-88DE-5BDDFA52285C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {9716575D-69BA-4EE1-B5F2-F7B68FE2D939} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {07A1F58E-9AEE-4EF1-B7A2-48909C9E4320} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {55ACFC03-222C-41E4-ABB6-BF5320521FBF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {A61E09D6-EA28-420A-BCC6-CD8F815C0D04} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {325C26A9-2EEB-4504-9BC4-AC929A54EA30} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E9FDEFCF-DC6D-49A4-BE15-4834E8DC81D2} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C0320EF7-7230-431D-BE87-BAFC3C2F26A8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {BD78A96F-62BD-415C-A645-3C79942B5300} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8ED593BD-DF1C-4BD0-B95B-B2DA797971BB} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {5BA8E870-270C-463D-88DE-5BDDFA52285C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {9716575D-69BA-4EE1-B5F2-F7B68FE2D939} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {07A1F58E-9AEE-4EF1-B7A2-48909C9E4320} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {55ACFC03-222C-41E4-ABB6-BF5320521FBF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {1A63E34D-B4DB-4CE8-915C-198305EBDEEB} diff --git a/sdk/src/Services/NetworkMonitor/Properties/AssemblyInfo.cs b/sdk/src/Services/NetworkMonitor/Properties/AssemblyInfo.cs index e06765ef3a65..9de01c4d29c9 100644 --- a/sdk/src/Services/NetworkMonitor/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/NetworkMonitor/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/NimbleStudio/Generated/AmazonNimbleStudioConfig.cs b/sdk/src/Services/NimbleStudio/Generated/AmazonNimbleStudioConfig.cs deleted file mode 100644 index 52a9ef8d1066..000000000000 --- a/sdk/src/Services/NimbleStudio/Generated/AmazonNimbleStudioConfig.cs +++ /dev/null @@ -1,117 +0,0 @@ -/* - * 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. - */ - -/* - * Do not modify this file. This file is generated from the nimble-2020-08-01.normal.json service model. - */ - -using System; -using Amazon.Runtime; -using Amazon.Runtime.Internal; -using Amazon.Util.Internal; -using Amazon.Runtime.Internal.Auth; -using Amazon.Runtime.Endpoints; -using Amazon.NimbleStudio.Internal; - -namespace Amazon.NimbleStudio -{ - /// - /// Configuration for accessing Amazon NimbleStudio service - /// - [AWSSignerType("v4")] - public partial class AmazonNimbleStudioConfig : ClientConfig - { - private static readonly string UserAgentString = - InternalSDKUtils.BuildUserAgentString("nimble", "4.0.0.0"); - - private static readonly AmazonNimbleStudioEndpointResolver EndpointResolver = - new AmazonNimbleStudioEndpointResolver(); - - private string _userAgent = UserAgentString; - /// - /// The ServiceId, which is the unique identifier for a service. - /// - public static new string ServiceId - { - get - { - return "nimble"; - } - } - /// - /// Default constructor - /// - public AmazonNimbleStudioConfig() - : base(new Amazon.Runtime.Internal.DefaultConfigurationProvider(AmazonNimbleStudioDefaultConfiguration.GetAllConfigurations())) - { - base.ServiceId = "nimble"; - this.AuthenticationServiceName = "nimble"; - this.EndpointProvider = new AmazonNimbleStudioEndpointProvider(); - } - - /// - /// The constant used to lookup in the region hash the endpoint. - /// - public override string RegionEndpointServiceName - { - get - { - return "nimble"; - } - } - - /// - /// Gets the ServiceVersion property. - /// - public override string ServiceVersion - { - get - { - return "2020-08-01"; - } - } - - /// - /// Gets the value of UserAgent property. - /// - public override string UserAgent - { - get - { - return _userAgent; - } - } - - /// - /// Returns the endpoint that will be used for a particular request. - /// - /// A Container class for parameters used for endpoint resolution. - /// The resolved endpoint for the given request. - public override Amazon.Runtime.Endpoints.Endpoint DetermineServiceOperationEndpoint(ServiceOperationEndpointParameters parameters) - { - var requestContext = new RequestContext(false, new AWS4Signer()) - { - ClientConfig = this, - OriginalRequest = parameters.Request, - Request = new DefaultRequest(parameters.Request, ServiceId) - }; - - var executionContext = new Amazon.Runtime.Internal.ExecutionContext(requestContext, null); - return EndpointResolver.GetEndpoint(executionContext); - } - - - } -} \ No newline at end of file diff --git a/sdk/src/Services/NimbleStudio/Generated/AmazonNimbleStudioDefaultConfiguration.cs b/sdk/src/Services/NimbleStudio/Generated/AmazonNimbleStudioDefaultConfiguration.cs deleted file mode 100644 index bd196536e0e8..000000000000 --- a/sdk/src/Services/NimbleStudio/Generated/AmazonNimbleStudioDefaultConfiguration.cs +++ /dev/null @@ -1,126 +0,0 @@ -/* - * 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. - */ - -/* - * Do not modify this file. This file is generated from the nimble-2020-08-01.normal.json service model. - */ - - -using System; -using System.Collections.Generic; -using System.Collections.ObjectModel; - -using Amazon.Runtime; - -namespace Amazon.NimbleStudio -{ - /// - /// Configuration for accessing Amazon NimbleStudio service - /// - public static class AmazonNimbleStudioDefaultConfiguration - { - /// - /// Collection of all s supported by - /// NimbleStudio - /// - public static ReadOnlyCollection GetAllConfigurations() - { - return new ReadOnlyCollection(new List - { - Standard, - InRegion, - CrossRegion, - Mobile, - Auto - }); - } - - /// - ///

    The STANDARD mode provides the latest recommended default values that should be safe to run in most scenarios

    Note that the default values vended from this mode might change as best practices may evolve. As a result, it is encouraged to perform tests when upgrading the SDK

    - ///     - public static IDefaultConfiguration Standard {get;} = new DefaultConfiguration - { - Name = DefaultConfigurationMode.Standard, - RetryMode = RequestRetryMode.Standard, - S3UsEast1RegionalEndpoint = S3UsEast1RegionalEndpointValue.Regional, - // 0:00:03.1 - ConnectTimeout = TimeSpan.FromMilliseconds(3100L), - // 0:00:03.1 - TlsNegotiationTimeout = TimeSpan.FromMilliseconds(3100L), - TimeToFirstByteTimeout = null, - HttpRequestTimeout = null - }; - /// - ///

    The IN_REGION mode builds on the standard mode and includes optimization tailored for applications which call AWS services from within the same AWS region

    Note that the default values vended from this mode might change as best practices may evolve. As a result, it is encouraged to perform tests when upgrading the SDK

    - ///     - public static IDefaultConfiguration InRegion {get;} = new DefaultConfiguration - { - Name = DefaultConfigurationMode.InRegion, - RetryMode = RequestRetryMode.Standard, - S3UsEast1RegionalEndpoint = S3UsEast1RegionalEndpointValue.Regional, - // 0:00:01.1 - ConnectTimeout = TimeSpan.FromMilliseconds(1100L), - // 0:00:01.1 - TlsNegotiationTimeout = TimeSpan.FromMilliseconds(1100L), - TimeToFirstByteTimeout = null, - HttpRequestTimeout = null - }; - /// - ///

    The CROSS_REGION mode builds on the standard mode and includes optimization tailored for applications which call AWS services in a different region

    Note that the default values vended from this mode might change as best practices may evolve. As a result, it is encouraged to perform tests when upgrading the SDK

    - ///     - public static IDefaultConfiguration CrossRegion {get;} = new DefaultConfiguration - { - Name = DefaultConfigurationMode.CrossRegion, - RetryMode = RequestRetryMode.Standard, - S3UsEast1RegionalEndpoint = S3UsEast1RegionalEndpointValue.Regional, - // 0:00:03.1 - ConnectTimeout = TimeSpan.FromMilliseconds(3100L), - // 0:00:03.1 - TlsNegotiationTimeout = TimeSpan.FromMilliseconds(3100L), - TimeToFirstByteTimeout = null, - HttpRequestTimeout = null - }; - /// - ///

    The MOBILE mode builds on the standard mode and includes optimization tailored for mobile applications

    Note that the default values vended from this mode might change as best practices may evolve. As a result, it is encouraged to perform tests when upgrading the SDK

    - ///     - public static IDefaultConfiguration Mobile {get;} = new DefaultConfiguration - { - Name = DefaultConfigurationMode.Mobile, - RetryMode = RequestRetryMode.Standard, - S3UsEast1RegionalEndpoint = S3UsEast1RegionalEndpointValue.Regional, - // 0:00:30 - ConnectTimeout = TimeSpan.FromMilliseconds(30000L), - // 0:00:30 - TlsNegotiationTimeout = TimeSpan.FromMilliseconds(30000L), - TimeToFirstByteTimeout = null, - HttpRequestTimeout = null - }; - /// - ///

    The AUTO mode is an experimental mode that builds on the standard mode. The SDK will attempt to discover the execution environment to determine the appropriate settings automatically.

    Note that the auto detection is heuristics-based and does not guarantee 100% accuracy. STANDARD mode will be used if the execution environment cannot be determined. The auto detection might query EC2 Instance Metadata service, which might introduce latency. Therefore we recommend choosing an explicit defaults_mode instead if startup latency is critical to your application

    - ///     - public static IDefaultConfiguration Auto {get;} = new DefaultConfiguration - { - Name = DefaultConfigurationMode.Auto, - RetryMode = RequestRetryMode.Standard, - S3UsEast1RegionalEndpoint = S3UsEast1RegionalEndpointValue.Regional, - // 0:00:01.1 - ConnectTimeout = TimeSpan.FromMilliseconds(1100L), - // 0:00:01.1 - TlsNegotiationTimeout = TimeSpan.FromMilliseconds(1100L), - TimeToFirstByteTimeout = null, - HttpRequestTimeout = null - }; - } -} \ No newline at end of file diff --git a/sdk/src/Services/NimbleStudio/Generated/Model/AccessDeniedException.cs b/sdk/src/Services/NimbleStudio/Generated/Model/AccessDeniedException.cs deleted file mode 100644 index 38704f887f5e..000000000000 --- a/sdk/src/Services/NimbleStudio/Generated/Model/AccessDeniedException.cs +++ /dev/null @@ -1,163 +0,0 @@ -/* - * 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. - */ - -/* - * Do not modify this file. This file is generated from the nimble-2020-08-01.normal.json service model. - */ -using System; -using System.Collections.Generic; -using System.Xml.Serialization; -using System.Text; -using System.IO; -using System.Net; - -using Amazon.Runtime; -using Amazon.Runtime.Internal; - -#pragma warning disable CS0612,CS0618,CS1570 -namespace Amazon.NimbleStudio.Model -{ - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - #if !NETSTANDARD - [Serializable] - #endif - public partial class AccessDeniedException : AmazonNimbleStudioException - { - private string _code; - private Dictionary _context = AWSConfigs.InitializeCollections ? new Dictionary() : null; - - /// - /// Constructs a new AccessDeniedException with the specified error - /// message. - /// - /// - /// Describes the error encountered. - /// - public AccessDeniedException(string message) - : base(message) {} - - /// - /// Construct instance of AccessDeniedException - /// - /// - /// - public AccessDeniedException(string message, Exception innerException) - : base(message, innerException) {} - - /// - /// Construct instance of AccessDeniedException - /// - /// - public AccessDeniedException(Exception innerException) - : base(innerException) {} - - /// - /// Construct instance of AccessDeniedException - /// - /// - /// - /// - /// - /// - /// - public AccessDeniedException(string message, Exception innerException, Amazon.Runtime.ErrorType errorType, string errorCode, string requestId, HttpStatusCode statusCode) - : base(message, innerException, errorType, errorCode, requestId, statusCode) {} - - /// - /// Construct instance of AccessDeniedException - /// - /// - /// - /// - /// - /// - public AccessDeniedException(string message, Amazon.Runtime.ErrorType errorType, string errorCode, string requestId, HttpStatusCode statusCode) - : base(message, errorType, errorCode, requestId, statusCode) {} - - -#if !NETSTANDARD - /// - /// Constructs a new instance of the AccessDeniedException class with serialized data. - /// - /// The that holds the serialized object data about the exception being thrown. - /// The that contains contextual information about the source or destination. - /// The parameter is null. - /// The class name is null or is zero (0). - protected AccessDeniedException(System.Runtime.Serialization.SerializationInfo info, System.Runtime.Serialization.StreamingContext context) - : base(info, context) - { - this.Code = (string)info.GetValue("Code", typeof(string)); - this.Context = (Dictionary)info.GetValue("Context", typeof(Dictionary)); - } - - /// - /// Sets the with information about the exception. - /// - /// The that holds the serialized object data about the exception being thrown. - /// The that contains contextual information about the source or destination. - /// The parameter is a null reference (Nothing in Visual Basic). - [System.Security.SecurityCritical] - // These FxCop rules are giving false-positives for this method - [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Security", "CA2123:OverrideLinkDemandsShouldBeIdenticalToBase")] - [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Security", "CA2134:MethodsMustOverrideWithConsistentTransparencyFxCopRule")] - public override void GetObjectData(System.Runtime.Serialization.SerializationInfo info, System.Runtime.Serialization.StreamingContext context) - { - base.GetObjectData(info, context); - info.AddValue("Code", this.Code); - info.AddValue("Context", this.Context); - } -#endif - - /// - /// Gets and sets the property Code. - /// - /// A more specific error code. - /// - /// - public string Code - { - get { return this._code; } - set { this._code = value; } - } - - // Check to see if Code property is set - internal bool IsSetCode() - { - return this._code != null; - } - - /// - /// Gets and sets the property Context. - /// - /// The exception context. - /// - /// - public Dictionary Context - { - get { return this._context; } - set { this._context = value; } - } - - // Check to see if Context property is set - internal bool IsSetContext() - { - return this._context != null && (this._context.Count > 0 || !AWSConfigs.InitializeCollections); - } - - } -} \ No newline at end of file diff --git a/sdk/src/Services/NimbleStudio/Generated/Model/ConflictException.cs b/sdk/src/Services/NimbleStudio/Generated/Model/ConflictException.cs deleted file mode 100644 index b5c03424c853..000000000000 --- a/sdk/src/Services/NimbleStudio/Generated/Model/ConflictException.cs +++ /dev/null @@ -1,162 +0,0 @@ -/* - * 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. - */ - -/* - * Do not modify this file. This file is generated from the nimble-2020-08-01.normal.json service model. - */ -using System; -using System.Collections.Generic; -using System.Xml.Serialization; -using System.Text; -using System.IO; -using System.Net; - -using Amazon.Runtime; -using Amazon.Runtime.Internal; - -#pragma warning disable CS0612,CS0618,CS1570 -namespace Amazon.NimbleStudio.Model -{ - /// - /// Another operation is in progress. - /// - #if !NETSTANDARD - [Serializable] - #endif - public partial class ConflictException : AmazonNimbleStudioException - { - private string _code; - private Dictionary _context = AWSConfigs.InitializeCollections ? new Dictionary() : null; - - /// - /// Constructs a new ConflictException with the specified error - /// message. - /// - /// - /// Describes the error encountered. - /// - public ConflictException(string message) - : base(message) {} - - /// - /// Construct instance of ConflictException - /// - /// - /// - public ConflictException(string message, Exception innerException) - : base(message, innerException) {} - - /// - /// Construct instance of ConflictException - /// - /// - public ConflictException(Exception innerException) - : base(innerException) {} - - /// - /// Construct instance of ConflictException - /// - /// - /// - /// - /// - /// - /// - public ConflictException(string message, Exception innerException, Amazon.Runtime.ErrorType errorType, string errorCode, string requestId, HttpStatusCode statusCode) - : base(message, innerException, errorType, errorCode, requestId, statusCode) {} - - /// - /// Construct instance of ConflictException - /// - /// - /// - /// - /// - /// - public ConflictException(string message, Amazon.Runtime.ErrorType errorType, string errorCode, string requestId, HttpStatusCode statusCode) - : base(message, errorType, errorCode, requestId, statusCode) {} - - -#if !NETSTANDARD - /// - /// Constructs a new instance of the ConflictException class with serialized data. - /// - /// The that holds the serialized object data about the exception being thrown. - /// The that contains contextual information about the source or destination. - /// The parameter is null. - /// The class name is null or is zero (0). - protected ConflictException(System.Runtime.Serialization.SerializationInfo info, System.Runtime.Serialization.StreamingContext context) - : base(info, context) - { - this.Code = (string)info.GetValue("Code", typeof(string)); - this.Context = (Dictionary)info.GetValue("Context", typeof(Dictionary)); - } - - /// - /// Sets the with information about the exception. - /// - /// The that holds the serialized object data about the exception being thrown. - /// The that contains contextual information about the source or destination. - /// The parameter is a null reference (Nothing in Visual Basic). - [System.Security.SecurityCritical] - // These FxCop rules are giving false-positives for this method - [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Security", "CA2123:OverrideLinkDemandsShouldBeIdenticalToBase")] - [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Security", "CA2134:MethodsMustOverrideWithConsistentTransparencyFxCopRule")] - public override void GetObjectData(System.Runtime.Serialization.SerializationInfo info, System.Runtime.Serialization.StreamingContext context) - { - base.GetObjectData(info, context); - info.AddValue("Code", this.Code); - info.AddValue("Context", this.Context); - } -#endif - - /// - /// Gets and sets the property Code. - /// - /// A more specific error code. - /// - /// - public string Code - { - get { return this._code; } - set { this._code = value; } - } - - // Check to see if Code property is set - internal bool IsSetCode() - { - return this._code != null; - } - - /// - /// Gets and sets the property Context. - /// - /// The exception context. - /// - /// - public Dictionary Context - { - get { return this._context; } - set { this._context = value; } - } - - // Check to see if Context property is set - internal bool IsSetContext() - { - return this._context != null && (this._context.Count > 0 || !AWSConfigs.InitializeCollections); - } - - } -} \ No newline at end of file diff --git a/sdk/src/Services/NimbleStudio/Generated/Model/CreateStreamingSessionStreamRequest.cs b/sdk/src/Services/NimbleStudio/Generated/Model/CreateStreamingSessionStreamRequest.cs deleted file mode 100644 index 2d5e51b525f3..000000000000 --- a/sdk/src/Services/NimbleStudio/Generated/Model/CreateStreamingSessionStreamRequest.cs +++ /dev/null @@ -1,128 +0,0 @@ -/* - * 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. - */ - -/* - * Do not modify this file. This file is generated from the nimble-2020-08-01.normal.json service model. - */ -using System; -using System.Collections.Generic; -using System.Xml.Serialization; -using System.Text; -using System.IO; -using System.Net; - -using Amazon.Runtime; -using Amazon.Runtime.Internal; - -#pragma warning disable CS0612,CS0618,CS1570 -namespace Amazon.NimbleStudio.Model -{ - /// - /// Container for the parameters to the CreateStreamingSessionStream operation. - /// Creates a streaming session stream for a streaming session. - /// - /// - /// - /// After invoking this API, invoke GetStreamingSessionStream with the returned streamId - /// to poll the resource until it is in the READY state. - /// - /// - public partial class CreateStreamingSessionStreamRequest : AmazonNimbleStudioRequest - { - private string _clientToken; - private int? _expirationInSeconds; - private string _sessionId; - private string _studioId; - - /// - /// Gets and sets the property ClientToken. - /// - /// Unique, case-sensitive identifier that you provide to ensure the idempotency of the - /// request. If you don’t specify a client token, the Amazon Web Services SDK automatically - /// generates a client token and uses it for the request to ensure idempotency. - /// - /// - [AWSProperty(Min=1, Max=64)] - public string ClientToken - { - get { return this._clientToken; } - set { this._clientToken = value; } - } - - // Check to see if ClientToken property is set - internal bool IsSetClientToken() - { - return !string.IsNullOrEmpty(this._clientToken); - } - - /// - /// Gets and sets the property ExpirationInSeconds. - /// - /// The expiration time in seconds. - /// - /// - [AWSProperty(Min=60, Max=3600)] - public int? ExpirationInSeconds - { - get { return this._expirationInSeconds; } - set { this._expirationInSeconds = value; } - } - - // Check to see if ExpirationInSeconds property is set - internal bool IsSetExpirationInSeconds() - { - return this._expirationInSeconds.HasValue; - } - - /// - /// Gets and sets the property SessionId. - /// - /// The streaming session ID. - /// - /// - [AWSProperty(Required=true)] - public string SessionId - { - get { return this._sessionId; } - set { this._sessionId = value; } - } - - // Check to see if SessionId property is set - internal bool IsSetSessionId() - { - return this._sessionId != null; - } - - /// - /// Gets and sets the property StudioId. - /// - /// The studio ID. - /// - /// - [AWSProperty(Required=true)] - public string StudioId - { - get { return this._studioId; } - set { this._studioId = value; } - } - - // Check to see if StudioId property is set - internal bool IsSetStudioId() - { - return this._studioId != null; - } - - } -} \ No newline at end of file diff --git a/sdk/src/Services/NimbleStudio/Generated/Model/Eula.cs b/sdk/src/Services/NimbleStudio/Generated/Model/Eula.cs deleted file mode 100644 index 8d97b4ef67ee..000000000000 --- a/sdk/src/Services/NimbleStudio/Generated/Model/Eula.cs +++ /dev/null @@ -1,136 +0,0 @@ -/* - * 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. - */ - -/* - * Do not modify this file. This file is generated from the nimble-2020-08-01.normal.json service model. - */ -using System; -using System.Collections.Generic; -using System.Xml.Serialization; -using System.Text; -using System.IO; -using System.Net; - -using Amazon.Runtime; -using Amazon.Runtime.Internal; - -#pragma warning disable CS0612,CS0618,CS1570 -namespace Amazon.NimbleStudio.Model -{ - /// - /// Represents a EULA resource. - /// - public partial class Eula - { - private string _content; - private DateTime? _createdAt; - private string _eulaId; - private string _name; - private DateTime? _updatedAt; - - /// - /// Gets and sets the property Content. - /// - /// The EULA content. - /// - /// - public string Content - { - get { return this._content; } - set { this._content = value; } - } - - // Check to see if Content property is set - internal bool IsSetContent() - { - return this._content != null; - } - - /// - /// Gets and sets the property CreatedAt. - /// - /// The ISO timestamp in seconds for when the resource was created. - /// - /// - public DateTime? CreatedAt - { - get { return this._createdAt; } - set { this._createdAt = value; } - } - - // Check to see if CreatedAt property is set - internal bool IsSetCreatedAt() - { - return this._createdAt.HasValue; - } - - /// - /// Gets and sets the property EulaId. - /// - /// The EULA ID. - /// - /// - [AWSProperty(Min=0, Max=22)] - public string EulaId - { - get { return this._eulaId; } - set { this._eulaId = value; } - } - - // Check to see if EulaId property is set - internal bool IsSetEulaId() - { - return this._eulaId != null; - } - - /// - /// Gets and sets the property Name. - /// - /// The name for the EULA. - /// - /// - [AWSProperty(Min=0, Max=64)] - public string Name - { - get { return this._name; } - set { this._name = value; } - } - - // Check to see if Name property is set - internal bool IsSetName() - { - return this._name != null; - } - - /// - /// Gets and sets the property UpdatedAt. - /// - /// The ISO timestamp in seconds for when the resource was updated. - /// - /// - public DateTime? UpdatedAt - { - get { return this._updatedAt; } - set { this._updatedAt = value; } - } - - // Check to see if UpdatedAt property is set - internal bool IsSetUpdatedAt() - { - return this._updatedAt.HasValue; - } - - } -} \ No newline at end of file diff --git a/sdk/src/Services/NimbleStudio/Generated/Model/EulaAcceptance.cs b/sdk/src/Services/NimbleStudio/Generated/Model/EulaAcceptance.cs deleted file mode 100644 index c8852703b19a..000000000000 --- a/sdk/src/Services/NimbleStudio/Generated/Model/EulaAcceptance.cs +++ /dev/null @@ -1,136 +0,0 @@ -/* - * 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. - */ - -/* - * Do not modify this file. This file is generated from the nimble-2020-08-01.normal.json service model. - */ -using System; -using System.Collections.Generic; -using System.Xml.Serialization; -using System.Text; -using System.IO; -using System.Net; - -using Amazon.Runtime; -using Amazon.Runtime.Internal; - -#pragma warning disable CS0612,CS0618,CS1570 -namespace Amazon.NimbleStudio.Model -{ - /// - /// The acceptance of a EULA, required to use Amazon-provided streaming images. - /// - public partial class EulaAcceptance - { - private DateTime? _acceptedAt; - private string _acceptedBy; - private string _accepteeId; - private string _eulaAcceptanceId; - private string _eulaId; - - /// - /// Gets and sets the property AcceptedAt. - /// - /// The ISO timestamp in seconds for when the EULA was accepted. - /// - /// - public DateTime? AcceptedAt - { - get { return this._acceptedAt; } - set { this._acceptedAt = value; } - } - - // Check to see if AcceptedAt property is set - internal bool IsSetAcceptedAt() - { - return this._acceptedAt.HasValue; - } - - /// - /// Gets and sets the property AcceptedBy. - /// - /// The ID of the person who accepted the EULA. - /// - /// - public string AcceptedBy - { - get { return this._acceptedBy; } - set { this._acceptedBy = value; } - } - - // Check to see if AcceptedBy property is set - internal bool IsSetAcceptedBy() - { - return this._acceptedBy != null; - } - - /// - /// Gets and sets the property AccepteeId. - /// - /// The ID of the acceptee. - /// - /// - public string AccepteeId - { - get { return this._accepteeId; } - set { this._accepteeId = value; } - } - - // Check to see if AccepteeId property is set - internal bool IsSetAccepteeId() - { - return this._accepteeId != null; - } - - /// - /// Gets and sets the property EulaAcceptanceId. - /// - /// The EULA acceptance ID. - /// - /// - [AWSProperty(Min=0, Max=22)] - public string EulaAcceptanceId - { - get { return this._eulaAcceptanceId; } - set { this._eulaAcceptanceId = value; } - } - - // Check to see if EulaAcceptanceId property is set - internal bool IsSetEulaAcceptanceId() - { - return this._eulaAcceptanceId != null; - } - - /// - /// Gets and sets the property EulaId. - /// - /// The EULA ID. - /// - /// - [AWSProperty(Min=0, Max=22)] - public string EulaId - { - get { return this._eulaId; } - set { this._eulaId = value; } - } - - // Check to see if EulaId property is set - internal bool IsSetEulaId() - { - return this._eulaId != null; - } - - } -} \ No newline at end of file diff --git a/sdk/src/Services/NimbleStudio/Generated/Model/Internal/MarshallTransformations/AcceptEulasRequestMarshaller.cs b/sdk/src/Services/NimbleStudio/Generated/Model/Internal/MarshallTransformations/AcceptEulasRequestMarshaller.cs deleted file mode 100644 index bf24139c9125..000000000000 --- a/sdk/src/Services/NimbleStudio/Generated/Model/Internal/MarshallTransformations/AcceptEulasRequestMarshaller.cs +++ /dev/null @@ -1,119 +0,0 @@ -/* - * 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. - */ - -/* - * Do not modify this file. This file is generated from the nimble-2020-08-01.normal.json service model. - */ -using System; -using System.Collections.Generic; -using System.Globalization; -using System.IO; -using System.Text; -using System.Xml.Serialization; - -using Amazon.NimbleStudio.Model; -using Amazon.Runtime; -using Amazon.Runtime.Internal; -using Amazon.Runtime.Internal.Transform; -using Amazon.Runtime.Internal.Util; -using ThirdParty.Json.LitJson; - -#pragma warning disable CS0612,CS0618 -namespace Amazon.NimbleStudio.Model.Internal.MarshallTransformations -{ - /// - /// AcceptEulas Request Marshaller - /// - public class AcceptEulasRequestMarshaller : IMarshaller , IMarshaller - { - /// - /// Marshaller the request object to the HTTP request. - /// - /// - /// - public IRequest Marshall(AmazonWebServiceRequest input) - { - return this.Marshall((AcceptEulasRequest)input); - } - - /// - /// Marshaller the request object to the HTTP request. - /// - /// - /// - public IRequest Marshall(AcceptEulasRequest publicRequest) - { - IRequest request = new DefaultRequest(publicRequest, "Amazon.NimbleStudio"); - request.Headers["Content-Type"] = "application/json"; - request.Headers[Amazon.Util.HeaderKeys.XAmzApiVersion] = "2020-08-01"; - request.HttpMethod = "POST"; - - if (!publicRequest.IsSetStudioId()) - throw new AmazonNimbleStudioException("Request object does not have required field StudioId set"); - request.AddPathResource("{studioId}", StringUtils.FromString(publicRequest.StudioId)); - request.ResourcePath = "/2020-08-01/studios/{studioId}/eula-acceptances"; - using (MemoryStream memoryStream = new MemoryStream()) - { - using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) - { - JsonWriter writer = new JsonWriter(streamWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetEulaIds()) - { - context.Writer.WritePropertyName("eulaIds"); - context.Writer.WriteArrayStart(); - foreach(var publicRequestEulaIdsListValue in publicRequest.EulaIds) - { - context.Writer.Write(publicRequestEulaIdsListValue); - } - context.Writer.WriteArrayEnd(); - } - - writer.WriteObjectEnd(); - } - - request.Content = memoryStream.ToArray(); - } - - - if (publicRequest.IsSetClientToken()) - { - request.Headers["X-Amz-Client-Token"] = publicRequest.ClientToken; - } - - return request; - } - private static AcceptEulasRequestMarshaller _instance = new AcceptEulasRequestMarshaller(); - - internal static AcceptEulasRequestMarshaller GetInstance() - { - return _instance; - } - - /// - /// Gets the singleton. - /// - public static AcceptEulasRequestMarshaller Instance - { - get - { - return _instance; - } - } - - } -} \ No newline at end of file diff --git a/sdk/src/Services/NimbleStudio/Generated/Model/Internal/MarshallTransformations/CreateLaunchProfileRequestMarshaller.cs b/sdk/src/Services/NimbleStudio/Generated/Model/Internal/MarshallTransformations/CreateLaunchProfileRequestMarshaller.cs deleted file mode 100644 index 438065cec917..000000000000 --- a/sdk/src/Services/NimbleStudio/Generated/Model/Internal/MarshallTransformations/CreateLaunchProfileRequestMarshaller.cs +++ /dev/null @@ -1,178 +0,0 @@ -/* - * 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. - */ - -/* - * Do not modify this file. This file is generated from the nimble-2020-08-01.normal.json service model. - */ -using System; -using System.Collections.Generic; -using System.Globalization; -using System.IO; -using System.Text; -using System.Xml.Serialization; - -using Amazon.NimbleStudio.Model; -using Amazon.Runtime; -using Amazon.Runtime.Internal; -using Amazon.Runtime.Internal.Transform; -using Amazon.Runtime.Internal.Util; -using ThirdParty.Json.LitJson; - -#pragma warning disable CS0612,CS0618 -namespace Amazon.NimbleStudio.Model.Internal.MarshallTransformations -{ - /// - /// CreateLaunchProfile Request Marshaller - /// - public class CreateLaunchProfileRequestMarshaller : IMarshaller , IMarshaller - { - /// - /// Marshaller the request object to the HTTP request. - /// - /// - /// - public IRequest Marshall(AmazonWebServiceRequest input) - { - return this.Marshall((CreateLaunchProfileRequest)input); - } - - /// - /// Marshaller the request object to the HTTP request. - /// - /// - /// - public IRequest Marshall(CreateLaunchProfileRequest publicRequest) - { - IRequest request = new DefaultRequest(publicRequest, "Amazon.NimbleStudio"); - request.Headers["Content-Type"] = "application/json"; - request.Headers[Amazon.Util.HeaderKeys.XAmzApiVersion] = "2020-08-01"; - request.HttpMethod = "POST"; - - if (!publicRequest.IsSetStudioId()) - throw new AmazonNimbleStudioException("Request object does not have required field StudioId set"); - request.AddPathResource("{studioId}", StringUtils.FromString(publicRequest.StudioId)); - request.ResourcePath = "/2020-08-01/studios/{studioId}/launch-profiles"; - using (MemoryStream memoryStream = new MemoryStream()) - { - using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) - { - JsonWriter writer = new JsonWriter(streamWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetDescription()) - { - context.Writer.WritePropertyName("description"); - context.Writer.Write(publicRequest.Description); - } - - if(publicRequest.IsSetEc2SubnetIds()) - { - context.Writer.WritePropertyName("ec2SubnetIds"); - context.Writer.WriteArrayStart(); - foreach(var publicRequestEc2SubnetIdsListValue in publicRequest.Ec2SubnetIds) - { - context.Writer.Write(publicRequestEc2SubnetIdsListValue); - } - context.Writer.WriteArrayEnd(); - } - - if(publicRequest.IsSetLaunchProfileProtocolVersions()) - { - context.Writer.WritePropertyName("launchProfileProtocolVersions"); - context.Writer.WriteArrayStart(); - foreach(var publicRequestLaunchProfileProtocolVersionsListValue in publicRequest.LaunchProfileProtocolVersions) - { - context.Writer.Write(publicRequestLaunchProfileProtocolVersionsListValue); - } - context.Writer.WriteArrayEnd(); - } - - if(publicRequest.IsSetName()) - { - context.Writer.WritePropertyName("name"); - context.Writer.Write(publicRequest.Name); - } - - if(publicRequest.IsSetStreamConfiguration()) - { - context.Writer.WritePropertyName("streamConfiguration"); - context.Writer.WriteObjectStart(); - - var marshaller = StreamConfigurationCreateMarshaller.Instance; - marshaller.Marshall(publicRequest.StreamConfiguration, context); - - context.Writer.WriteObjectEnd(); - } - - if(publicRequest.IsSetStudioComponentIds()) - { - context.Writer.WritePropertyName("studioComponentIds"); - context.Writer.WriteArrayStart(); - foreach(var publicRequestStudioComponentIdsListValue in publicRequest.StudioComponentIds) - { - context.Writer.Write(publicRequestStudioComponentIdsListValue); - } - context.Writer.WriteArrayEnd(); - } - - if(publicRequest.IsSetTags()) - { - context.Writer.WritePropertyName("tags"); - context.Writer.WriteObjectStart(); - foreach (var publicRequestTagsKvp in publicRequest.Tags) - { - context.Writer.WritePropertyName(publicRequestTagsKvp.Key); - var publicRequestTagsValue = publicRequestTagsKvp.Value; - - context.Writer.Write(publicRequestTagsValue); - } - context.Writer.WriteObjectEnd(); - } - - writer.WriteObjectEnd(); - } - - request.Content = memoryStream.ToArray(); - } - - - if (publicRequest.IsSetClientToken()) - { - request.Headers["X-Amz-Client-Token"] = publicRequest.ClientToken; - } - - return request; - } - private static CreateLaunchProfileRequestMarshaller _instance = new CreateLaunchProfileRequestMarshaller(); - - internal static CreateLaunchProfileRequestMarshaller GetInstance() - { - return _instance; - } - - /// - /// Gets the singleton. - /// - public static CreateLaunchProfileRequestMarshaller Instance - { - get - { - return _instance; - } - } - - } -} \ No newline at end of file diff --git a/sdk/src/Services/NimbleStudio/Generated/Model/Internal/MarshallTransformations/CreateStreamingImageRequestMarshaller.cs b/sdk/src/Services/NimbleStudio/Generated/Model/Internal/MarshallTransformations/CreateStreamingImageRequestMarshaller.cs deleted file mode 100644 index 770d208bdfb3..000000000000 --- a/sdk/src/Services/NimbleStudio/Generated/Model/Internal/MarshallTransformations/CreateStreamingImageRequestMarshaller.cs +++ /dev/null @@ -1,140 +0,0 @@ -/* - * 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. - */ - -/* - * Do not modify this file. This file is generated from the nimble-2020-08-01.normal.json service model. - */ -using System; -using System.Collections.Generic; -using System.Globalization; -using System.IO; -using System.Text; -using System.Xml.Serialization; - -using Amazon.NimbleStudio.Model; -using Amazon.Runtime; -using Amazon.Runtime.Internal; -using Amazon.Runtime.Internal.Transform; -using Amazon.Runtime.Internal.Util; -using ThirdParty.Json.LitJson; - -#pragma warning disable CS0612,CS0618 -namespace Amazon.NimbleStudio.Model.Internal.MarshallTransformations -{ - /// - /// CreateStreamingImage Request Marshaller - /// - public class CreateStreamingImageRequestMarshaller : IMarshaller , IMarshaller - { - /// - /// Marshaller the request object to the HTTP request. - /// - /// - /// - public IRequest Marshall(AmazonWebServiceRequest input) - { - return this.Marshall((CreateStreamingImageRequest)input); - } - - /// - /// Marshaller the request object to the HTTP request. - /// - /// - /// - public IRequest Marshall(CreateStreamingImageRequest publicRequest) - { - IRequest request = new DefaultRequest(publicRequest, "Amazon.NimbleStudio"); - request.Headers["Content-Type"] = "application/json"; - request.Headers[Amazon.Util.HeaderKeys.XAmzApiVersion] = "2020-08-01"; - request.HttpMethod = "POST"; - - if (!publicRequest.IsSetStudioId()) - throw new AmazonNimbleStudioException("Request object does not have required field StudioId set"); - request.AddPathResource("{studioId}", StringUtils.FromString(publicRequest.StudioId)); - request.ResourcePath = "/2020-08-01/studios/{studioId}/streaming-images"; - using (MemoryStream memoryStream = new MemoryStream()) - { - using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) - { - JsonWriter writer = new JsonWriter(streamWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetDescription()) - { - context.Writer.WritePropertyName("description"); - context.Writer.Write(publicRequest.Description); - } - - if(publicRequest.IsSetEc2ImageId()) - { - context.Writer.WritePropertyName("ec2ImageId"); - context.Writer.Write(publicRequest.Ec2ImageId); - } - - if(publicRequest.IsSetName()) - { - context.Writer.WritePropertyName("name"); - context.Writer.Write(publicRequest.Name); - } - - if(publicRequest.IsSetTags()) - { - context.Writer.WritePropertyName("tags"); - context.Writer.WriteObjectStart(); - foreach (var publicRequestTagsKvp in publicRequest.Tags) - { - context.Writer.WritePropertyName(publicRequestTagsKvp.Key); - var publicRequestTagsValue = publicRequestTagsKvp.Value; - - context.Writer.Write(publicRequestTagsValue); - } - context.Writer.WriteObjectEnd(); - } - - writer.WriteObjectEnd(); - } - - request.Content = memoryStream.ToArray(); - } - - - if (publicRequest.IsSetClientToken()) - { - request.Headers["X-Amz-Client-Token"] = publicRequest.ClientToken; - } - - return request; - } - private static CreateStreamingImageRequestMarshaller _instance = new CreateStreamingImageRequestMarshaller(); - - internal static CreateStreamingImageRequestMarshaller GetInstance() - { - return _instance; - } - - /// - /// Gets the singleton. - /// - public static CreateStreamingImageRequestMarshaller Instance - { - get - { - return _instance; - } - } - - } -} \ No newline at end of file diff --git a/sdk/src/Services/NimbleStudio/Generated/Model/Internal/MarshallTransformations/CreateStreamingSessionRequestMarshaller.cs b/sdk/src/Services/NimbleStudio/Generated/Model/Internal/MarshallTransformations/CreateStreamingSessionRequestMarshaller.cs deleted file mode 100644 index 78f0363fb5ba..000000000000 --- a/sdk/src/Services/NimbleStudio/Generated/Model/Internal/MarshallTransformations/CreateStreamingSessionRequestMarshaller.cs +++ /dev/null @@ -1,146 +0,0 @@ -/* - * 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. - */ - -/* - * Do not modify this file. This file is generated from the nimble-2020-08-01.normal.json service model. - */ -using System; -using System.Collections.Generic; -using System.Globalization; -using System.IO; -using System.Text; -using System.Xml.Serialization; - -using Amazon.NimbleStudio.Model; -using Amazon.Runtime; -using Amazon.Runtime.Internal; -using Amazon.Runtime.Internal.Transform; -using Amazon.Runtime.Internal.Util; -using ThirdParty.Json.LitJson; - -#pragma warning disable CS0612,CS0618 -namespace Amazon.NimbleStudio.Model.Internal.MarshallTransformations -{ - /// - /// CreateStreamingSession Request Marshaller - /// - public class CreateStreamingSessionRequestMarshaller : IMarshaller , IMarshaller - { - /// - /// Marshaller the request object to the HTTP request. - /// - /// - /// - public IRequest Marshall(AmazonWebServiceRequest input) - { - return this.Marshall((CreateStreamingSessionRequest)input); - } - - /// - /// Marshaller the request object to the HTTP request. - /// - /// - /// - public IRequest Marshall(CreateStreamingSessionRequest publicRequest) - { - IRequest request = new DefaultRequest(publicRequest, "Amazon.NimbleStudio"); - request.Headers["Content-Type"] = "application/json"; - request.Headers[Amazon.Util.HeaderKeys.XAmzApiVersion] = "2020-08-01"; - request.HttpMethod = "POST"; - - if (!publicRequest.IsSetStudioId()) - throw new AmazonNimbleStudioException("Request object does not have required field StudioId set"); - request.AddPathResource("{studioId}", StringUtils.FromString(publicRequest.StudioId)); - request.ResourcePath = "/2020-08-01/studios/{studioId}/streaming-sessions"; - using (MemoryStream memoryStream = new MemoryStream()) - { - using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) - { - JsonWriter writer = new JsonWriter(streamWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetEc2InstanceType()) - { - context.Writer.WritePropertyName("ec2InstanceType"); - context.Writer.Write(publicRequest.Ec2InstanceType); - } - - if(publicRequest.IsSetLaunchProfileId()) - { - context.Writer.WritePropertyName("launchProfileId"); - context.Writer.Write(publicRequest.LaunchProfileId); - } - - if(publicRequest.IsSetOwnedBy()) - { - context.Writer.WritePropertyName("ownedBy"); - context.Writer.Write(publicRequest.OwnedBy); - } - - if(publicRequest.IsSetStreamingImageId()) - { - context.Writer.WritePropertyName("streamingImageId"); - context.Writer.Write(publicRequest.StreamingImageId); - } - - if(publicRequest.IsSetTags()) - { - context.Writer.WritePropertyName("tags"); - context.Writer.WriteObjectStart(); - foreach (var publicRequestTagsKvp in publicRequest.Tags) - { - context.Writer.WritePropertyName(publicRequestTagsKvp.Key); - var publicRequestTagsValue = publicRequestTagsKvp.Value; - - context.Writer.Write(publicRequestTagsValue); - } - context.Writer.WriteObjectEnd(); - } - - writer.WriteObjectEnd(); - } - - request.Content = memoryStream.ToArray(); - } - - - if (publicRequest.IsSetClientToken()) - { - request.Headers["X-Amz-Client-Token"] = publicRequest.ClientToken; - } - - return request; - } - private static CreateStreamingSessionRequestMarshaller _instance = new CreateStreamingSessionRequestMarshaller(); - - internal static CreateStreamingSessionRequestMarshaller GetInstance() - { - return _instance; - } - - /// - /// Gets the singleton. - /// - public static CreateStreamingSessionRequestMarshaller Instance - { - get - { - return _instance; - } - } - - } -} \ No newline at end of file diff --git a/sdk/src/Services/NimbleStudio/Generated/Model/Internal/MarshallTransformations/CreateStreamingSessionStreamRequestMarshaller.cs b/sdk/src/Services/NimbleStudio/Generated/Model/Internal/MarshallTransformations/CreateStreamingSessionStreamRequestMarshaller.cs deleted file mode 100644 index 5633c7e6ae6c..000000000000 --- a/sdk/src/Services/NimbleStudio/Generated/Model/Internal/MarshallTransformations/CreateStreamingSessionStreamRequestMarshaller.cs +++ /dev/null @@ -1,117 +0,0 @@ -/* - * 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. - */ - -/* - * Do not modify this file. This file is generated from the nimble-2020-08-01.normal.json service model. - */ -using System; -using System.Collections.Generic; -using System.Globalization; -using System.IO; -using System.Text; -using System.Xml.Serialization; - -using Amazon.NimbleStudio.Model; -using Amazon.Runtime; -using Amazon.Runtime.Internal; -using Amazon.Runtime.Internal.Transform; -using Amazon.Runtime.Internal.Util; -using ThirdParty.Json.LitJson; - -#pragma warning disable CS0612,CS0618 -namespace Amazon.NimbleStudio.Model.Internal.MarshallTransformations -{ - /// - /// CreateStreamingSessionStream Request Marshaller - /// - public class CreateStreamingSessionStreamRequestMarshaller : IMarshaller , IMarshaller - { - /// - /// Marshaller the request object to the HTTP request. - /// - /// - /// - public IRequest Marshall(AmazonWebServiceRequest input) - { - return this.Marshall((CreateStreamingSessionStreamRequest)input); - } - - /// - /// Marshaller the request object to the HTTP request. - /// - /// - /// - public IRequest Marshall(CreateStreamingSessionStreamRequest publicRequest) - { - IRequest request = new DefaultRequest(publicRequest, "Amazon.NimbleStudio"); - request.Headers["Content-Type"] = "application/json"; - request.Headers[Amazon.Util.HeaderKeys.XAmzApiVersion] = "2020-08-01"; - request.HttpMethod = "POST"; - - if (!publicRequest.IsSetSessionId()) - throw new AmazonNimbleStudioException("Request object does not have required field SessionId set"); - request.AddPathResource("{sessionId}", StringUtils.FromString(publicRequest.SessionId)); - if (!publicRequest.IsSetStudioId()) - throw new AmazonNimbleStudioException("Request object does not have required field StudioId set"); - request.AddPathResource("{studioId}", StringUtils.FromString(publicRequest.StudioId)); - request.ResourcePath = "/2020-08-01/studios/{studioId}/streaming-sessions/{sessionId}/streams"; - using (MemoryStream memoryStream = new MemoryStream()) - { - using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) - { - JsonWriter writer = new JsonWriter(streamWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetExpirationInSeconds()) - { - context.Writer.WritePropertyName("expirationInSeconds"); - context.Writer.Write(publicRequest.ExpirationInSeconds.Value); - } - - writer.WriteObjectEnd(); - } - - request.Content = memoryStream.ToArray(); - } - - - if (publicRequest.IsSetClientToken()) - { - request.Headers["X-Amz-Client-Token"] = publicRequest.ClientToken; - } - - return request; - } - private static CreateStreamingSessionStreamRequestMarshaller _instance = new CreateStreamingSessionStreamRequestMarshaller(); - - internal static CreateStreamingSessionStreamRequestMarshaller GetInstance() - { - return _instance; - } - - /// - /// Gets the singleton. - /// - public static CreateStreamingSessionStreamRequestMarshaller Instance - { - get - { - return _instance; - } - } - - } -} \ No newline at end of file diff --git a/sdk/src/Services/NimbleStudio/Generated/Model/Internal/MarshallTransformations/CreateStudioComponentRequestMarshaller.cs b/sdk/src/Services/NimbleStudio/Generated/Model/Internal/MarshallTransformations/CreateStudioComponentRequestMarshaller.cs deleted file mode 100644 index f139fd62ce61..000000000000 --- a/sdk/src/Services/NimbleStudio/Generated/Model/Internal/MarshallTransformations/CreateStudioComponentRequestMarshaller.cs +++ /dev/null @@ -1,212 +0,0 @@ -/* - * 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. - */ - -/* - * Do not modify this file. This file is generated from the nimble-2020-08-01.normal.json service model. - */ -using System; -using System.Collections.Generic; -using System.Globalization; -using System.IO; -using System.Text; -using System.Xml.Serialization; - -using Amazon.NimbleStudio.Model; -using Amazon.Runtime; -using Amazon.Runtime.Internal; -using Amazon.Runtime.Internal.Transform; -using Amazon.Runtime.Internal.Util; -using ThirdParty.Json.LitJson; - -#pragma warning disable CS0612,CS0618 -namespace Amazon.NimbleStudio.Model.Internal.MarshallTransformations -{ - /// - /// CreateStudioComponent Request Marshaller - /// - public class CreateStudioComponentRequestMarshaller : IMarshaller , IMarshaller - { - /// - /// Marshaller the request object to the HTTP request. - /// - /// - /// - public IRequest Marshall(AmazonWebServiceRequest input) - { - return this.Marshall((CreateStudioComponentRequest)input); - } - - /// - /// Marshaller the request object to the HTTP request. - /// - /// - /// - public IRequest Marshall(CreateStudioComponentRequest publicRequest) - { - IRequest request = new DefaultRequest(publicRequest, "Amazon.NimbleStudio"); - request.Headers["Content-Type"] = "application/json"; - request.Headers[Amazon.Util.HeaderKeys.XAmzApiVersion] = "2020-08-01"; - request.HttpMethod = "POST"; - - if (!publicRequest.IsSetStudioId()) - throw new AmazonNimbleStudioException("Request object does not have required field StudioId set"); - request.AddPathResource("{studioId}", StringUtils.FromString(publicRequest.StudioId)); - request.ResourcePath = "/2020-08-01/studios/{studioId}/studio-components"; - using (MemoryStream memoryStream = new MemoryStream()) - { - using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) - { - JsonWriter writer = new JsonWriter(streamWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetConfiguration()) - { - context.Writer.WritePropertyName("configuration"); - context.Writer.WriteObjectStart(); - - var marshaller = StudioComponentConfigurationMarshaller.Instance; - marshaller.Marshall(publicRequest.Configuration, context); - - context.Writer.WriteObjectEnd(); - } - - if(publicRequest.IsSetDescription()) - { - context.Writer.WritePropertyName("description"); - context.Writer.Write(publicRequest.Description); - } - - if(publicRequest.IsSetEc2SecurityGroupIds()) - { - context.Writer.WritePropertyName("ec2SecurityGroupIds"); - context.Writer.WriteArrayStart(); - foreach(var publicRequestEc2SecurityGroupIdsListValue in publicRequest.Ec2SecurityGroupIds) - { - context.Writer.Write(publicRequestEc2SecurityGroupIdsListValue); - } - context.Writer.WriteArrayEnd(); - } - - if(publicRequest.IsSetInitializationScripts()) - { - context.Writer.WritePropertyName("initializationScripts"); - context.Writer.WriteArrayStart(); - foreach(var publicRequestInitializationScriptsListValue in publicRequest.InitializationScripts) - { - context.Writer.WriteObjectStart(); - - var marshaller = StudioComponentInitializationScriptMarshaller.Instance; - marshaller.Marshall(publicRequestInitializationScriptsListValue, context); - - context.Writer.WriteObjectEnd(); - } - context.Writer.WriteArrayEnd(); - } - - if(publicRequest.IsSetName()) - { - context.Writer.WritePropertyName("name"); - context.Writer.Write(publicRequest.Name); - } - - if(publicRequest.IsSetRuntimeRoleArn()) - { - context.Writer.WritePropertyName("runtimeRoleArn"); - context.Writer.Write(publicRequest.RuntimeRoleArn); - } - - if(publicRequest.IsSetScriptParameters()) - { - context.Writer.WritePropertyName("scriptParameters"); - context.Writer.WriteArrayStart(); - foreach(var publicRequestScriptParametersListValue in publicRequest.ScriptParameters) - { - context.Writer.WriteObjectStart(); - - var marshaller = ScriptParameterKeyValueMarshaller.Instance; - marshaller.Marshall(publicRequestScriptParametersListValue, context); - - context.Writer.WriteObjectEnd(); - } - context.Writer.WriteArrayEnd(); - } - - if(publicRequest.IsSetSecureInitializationRoleArn()) - { - context.Writer.WritePropertyName("secureInitializationRoleArn"); - context.Writer.Write(publicRequest.SecureInitializationRoleArn); - } - - if(publicRequest.IsSetSubtype()) - { - context.Writer.WritePropertyName("subtype"); - context.Writer.Write(publicRequest.Subtype); - } - - if(publicRequest.IsSetTags()) - { - context.Writer.WritePropertyName("tags"); - context.Writer.WriteObjectStart(); - foreach (var publicRequestTagsKvp in publicRequest.Tags) - { - context.Writer.WritePropertyName(publicRequestTagsKvp.Key); - var publicRequestTagsValue = publicRequestTagsKvp.Value; - - context.Writer.Write(publicRequestTagsValue); - } - context.Writer.WriteObjectEnd(); - } - - if(publicRequest.IsSetType()) - { - context.Writer.WritePropertyName("type"); - context.Writer.Write(publicRequest.Type); - } - - writer.WriteObjectEnd(); - } - - request.Content = memoryStream.ToArray(); - } - - - if (publicRequest.IsSetClientToken()) - { - request.Headers["X-Amz-Client-Token"] = publicRequest.ClientToken; - } - - return request; - } - private static CreateStudioComponentRequestMarshaller _instance = new CreateStudioComponentRequestMarshaller(); - - internal static CreateStudioComponentRequestMarshaller GetInstance() - { - return _instance; - } - - /// - /// Gets the singleton. - /// - public static CreateStudioComponentRequestMarshaller Instance - { - get - { - return _instance; - } - } - - } -} \ No newline at end of file diff --git a/sdk/src/Services/NimbleStudio/Generated/Model/Internal/MarshallTransformations/CreateStudioRequestMarshaller.cs b/sdk/src/Services/NimbleStudio/Generated/Model/Internal/MarshallTransformations/CreateStudioRequestMarshaller.cs deleted file mode 100644 index 790329d27019..000000000000 --- a/sdk/src/Services/NimbleStudio/Generated/Model/Internal/MarshallTransformations/CreateStudioRequestMarshaller.cs +++ /dev/null @@ -1,154 +0,0 @@ -/* - * 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. - */ - -/* - * Do not modify this file. This file is generated from the nimble-2020-08-01.normal.json service model. - */ -using System; -using System.Collections.Generic; -using System.Globalization; -using System.IO; -using System.Text; -using System.Xml.Serialization; - -using Amazon.NimbleStudio.Model; -using Amazon.Runtime; -using Amazon.Runtime.Internal; -using Amazon.Runtime.Internal.Transform; -using Amazon.Runtime.Internal.Util; -using ThirdParty.Json.LitJson; - -#pragma warning disable CS0612,CS0618 -namespace Amazon.NimbleStudio.Model.Internal.MarshallTransformations -{ - /// - /// CreateStudio Request Marshaller - /// - public class CreateStudioRequestMarshaller : IMarshaller , IMarshaller - { - /// - /// Marshaller the request object to the HTTP request. - /// - /// - /// - public IRequest Marshall(AmazonWebServiceRequest input) - { - return this.Marshall((CreateStudioRequest)input); - } - - /// - /// Marshaller the request object to the HTTP request. - /// - /// - /// - public IRequest Marshall(CreateStudioRequest publicRequest) - { - IRequest request = new DefaultRequest(publicRequest, "Amazon.NimbleStudio"); - request.Headers["Content-Type"] = "application/json"; - request.Headers[Amazon.Util.HeaderKeys.XAmzApiVersion] = "2020-08-01"; - request.HttpMethod = "POST"; - - request.ResourcePath = "/2020-08-01/studios"; - using (MemoryStream memoryStream = new MemoryStream()) - { - using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) - { - JsonWriter writer = new JsonWriter(streamWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetAdminRoleArn()) - { - context.Writer.WritePropertyName("adminRoleArn"); - context.Writer.Write(publicRequest.AdminRoleArn); - } - - if(publicRequest.IsSetDisplayName()) - { - context.Writer.WritePropertyName("displayName"); - context.Writer.Write(publicRequest.DisplayName); - } - - if(publicRequest.IsSetStudioEncryptionConfiguration()) - { - context.Writer.WritePropertyName("studioEncryptionConfiguration"); - context.Writer.WriteObjectStart(); - - var marshaller = StudioEncryptionConfigurationMarshaller.Instance; - marshaller.Marshall(publicRequest.StudioEncryptionConfiguration, context); - - context.Writer.WriteObjectEnd(); - } - - if(publicRequest.IsSetStudioName()) - { - context.Writer.WritePropertyName("studioName"); - context.Writer.Write(publicRequest.StudioName); - } - - if(publicRequest.IsSetTags()) - { - context.Writer.WritePropertyName("tags"); - context.Writer.WriteObjectStart(); - foreach (var publicRequestTagsKvp in publicRequest.Tags) - { - context.Writer.WritePropertyName(publicRequestTagsKvp.Key); - var publicRequestTagsValue = publicRequestTagsKvp.Value; - - context.Writer.Write(publicRequestTagsValue); - } - context.Writer.WriteObjectEnd(); - } - - if(publicRequest.IsSetUserRoleArn()) - { - context.Writer.WritePropertyName("userRoleArn"); - context.Writer.Write(publicRequest.UserRoleArn); - } - - writer.WriteObjectEnd(); - } - - request.Content = memoryStream.ToArray(); - } - - - if (publicRequest.IsSetClientToken()) - { - request.Headers["X-Amz-Client-Token"] = publicRequest.ClientToken; - } - - return request; - } - private static CreateStudioRequestMarshaller _instance = new CreateStudioRequestMarshaller(); - - internal static CreateStudioRequestMarshaller GetInstance() - { - return _instance; - } - - /// - /// Gets the singleton. - /// - public static CreateStudioRequestMarshaller Instance - { - get - { - return _instance; - } - } - - } -} \ No newline at end of file diff --git a/sdk/src/Services/NimbleStudio/Generated/Model/Internal/MarshallTransformations/EulaAcceptanceUnmarshaller.cs b/sdk/src/Services/NimbleStudio/Generated/Model/Internal/MarshallTransformations/EulaAcceptanceUnmarshaller.cs deleted file mode 100644 index cadfc6550356..000000000000 --- a/sdk/src/Services/NimbleStudio/Generated/Model/Internal/MarshallTransformations/EulaAcceptanceUnmarshaller.cs +++ /dev/null @@ -1,117 +0,0 @@ -/* - * 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. - */ - -/* - * Do not modify this file. This file is generated from the nimble-2020-08-01.normal.json service model. - */ -using System; -using System.Collections.Generic; -using System.Globalization; -using System.IO; -using System.Net; -using System.Text; -using System.Xml.Serialization; - -using Amazon.NimbleStudio.Model; -using Amazon.Runtime; -using Amazon.Runtime.Internal; -using Amazon.Runtime.Internal.Transform; -using Amazon.Runtime.Internal.Util; -using ThirdParty.Json.LitJson; - -#pragma warning disable CS0612,CS0618 -namespace Amazon.NimbleStudio.Model.Internal.MarshallTransformations -{ - /// - /// Response Unmarshaller for EulaAcceptance Object - /// - public class EulaAcceptanceUnmarshaller : IUnmarshaller, IUnmarshaller - { - /// - /// Unmarshaller the response from the service to the response class. - /// - /// - /// - EulaAcceptance IUnmarshaller.Unmarshall(XmlUnmarshallerContext context) - { - throw new NotImplementedException(); - } - - /// - /// Unmarshaller the response from the service to the response class. - /// - /// - /// The unmarshalled object - public EulaAcceptance Unmarshall(JsonUnmarshallerContext context) - { - EulaAcceptance unmarshalledObject = new EulaAcceptance(); - if (context.IsEmptyResponse) - return null; - context.Read(); - if (context.CurrentTokenType == JsonToken.Null) - return null; - - int targetDepth = context.CurrentDepth; - while (context.ReadAtDepth(targetDepth)) - { - if (context.TestExpression("acceptedAt", targetDepth)) - { - var unmarshaller = NullableDateTimeUnmarshaller.Instance; - unmarshalledObject.AcceptedAt = unmarshaller.Unmarshall(context); - continue; - } - if (context.TestExpression("acceptedBy", targetDepth)) - { - var unmarshaller = StringUnmarshaller.Instance; - unmarshalledObject.AcceptedBy = unmarshaller.Unmarshall(context); - continue; - } - if (context.TestExpression("accepteeId", targetDepth)) - { - var unmarshaller = StringUnmarshaller.Instance; - unmarshalledObject.AccepteeId = unmarshaller.Unmarshall(context); - continue; - } - if (context.TestExpression("eulaAcceptanceId", targetDepth)) - { - var unmarshaller = StringUnmarshaller.Instance; - unmarshalledObject.EulaAcceptanceId = unmarshaller.Unmarshall(context); - continue; - } - if (context.TestExpression("eulaId", targetDepth)) - { - var unmarshaller = StringUnmarshaller.Instance; - unmarshalledObject.EulaId = unmarshaller.Unmarshall(context); - continue; - } - } - return unmarshalledObject; - } - - - private static EulaAcceptanceUnmarshaller _instance = new EulaAcceptanceUnmarshaller(); - - /// - /// Gets the singleton. - /// - public static EulaAcceptanceUnmarshaller Instance - { - get - { - return _instance; - } - } - } -} \ No newline at end of file diff --git a/sdk/src/Services/NimbleStudio/Generated/Model/Internal/MarshallTransformations/EulaUnmarshaller.cs b/sdk/src/Services/NimbleStudio/Generated/Model/Internal/MarshallTransformations/EulaUnmarshaller.cs deleted file mode 100644 index 42da745a7c22..000000000000 --- a/sdk/src/Services/NimbleStudio/Generated/Model/Internal/MarshallTransformations/EulaUnmarshaller.cs +++ /dev/null @@ -1,117 +0,0 @@ -/* - * 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. - */ - -/* - * Do not modify this file. This file is generated from the nimble-2020-08-01.normal.json service model. - */ -using System; -using System.Collections.Generic; -using System.Globalization; -using System.IO; -using System.Net; -using System.Text; -using System.Xml.Serialization; - -using Amazon.NimbleStudio.Model; -using Amazon.Runtime; -using Amazon.Runtime.Internal; -using Amazon.Runtime.Internal.Transform; -using Amazon.Runtime.Internal.Util; -using ThirdParty.Json.LitJson; - -#pragma warning disable CS0612,CS0618 -namespace Amazon.NimbleStudio.Model.Internal.MarshallTransformations -{ - /// - /// Response Unmarshaller for Eula Object - /// - public class EulaUnmarshaller : IUnmarshaller, IUnmarshaller - { - /// - /// Unmarshaller the response from the service to the response class. - /// - /// - /// - Eula IUnmarshaller.Unmarshall(XmlUnmarshallerContext context) - { - throw new NotImplementedException(); - } - - /// - /// Unmarshaller the response from the service to the response class. - /// - /// - /// The unmarshalled object - public Eula Unmarshall(JsonUnmarshallerContext context) - { - Eula unmarshalledObject = new Eula(); - if (context.IsEmptyResponse) - return null; - context.Read(); - if (context.CurrentTokenType == JsonToken.Null) - return null; - - int targetDepth = context.CurrentDepth; - while (context.ReadAtDepth(targetDepth)) - { - if (context.TestExpression("content", targetDepth)) - { - var unmarshaller = StringUnmarshaller.Instance; - unmarshalledObject.Content = unmarshaller.Unmarshall(context); - continue; - } - if (context.TestExpression("createdAt", targetDepth)) - { - var unmarshaller = NullableDateTimeUnmarshaller.Instance; - unmarshalledObject.CreatedAt = unmarshaller.Unmarshall(context); - continue; - } - if (context.TestExpression("eulaId", targetDepth)) - { - var unmarshaller = StringUnmarshaller.Instance; - unmarshalledObject.EulaId = unmarshaller.Unmarshall(context); - continue; - } - if (context.TestExpression("name", targetDepth)) - { - var unmarshaller = StringUnmarshaller.Instance; - unmarshalledObject.Name = unmarshaller.Unmarshall(context); - continue; - } - if (context.TestExpression("updatedAt", targetDepth)) - { - var unmarshaller = NullableDateTimeUnmarshaller.Instance; - unmarshalledObject.UpdatedAt = unmarshaller.Unmarshall(context); - continue; - } - } - return unmarshalledObject; - } - - - private static EulaUnmarshaller _instance = new EulaUnmarshaller(); - - /// - /// Gets the singleton. - /// - public static EulaUnmarshaller Instance - { - get - { - return _instance; - } - } - } -} \ No newline at end of file diff --git a/sdk/src/Services/NimbleStudio/Generated/Model/Internal/MarshallTransformations/LaunchProfileUnmarshaller.cs b/sdk/src/Services/NimbleStudio/Generated/Model/Internal/MarshallTransformations/LaunchProfileUnmarshaller.cs deleted file mode 100644 index ed8947cd7c11..000000000000 --- a/sdk/src/Services/NimbleStudio/Generated/Model/Internal/MarshallTransformations/LaunchProfileUnmarshaller.cs +++ /dev/null @@ -1,189 +0,0 @@ -/* - * 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. - */ - -/* - * Do not modify this file. This file is generated from the nimble-2020-08-01.normal.json service model. - */ -using System; -using System.Collections.Generic; -using System.Globalization; -using System.IO; -using System.Net; -using System.Text; -using System.Xml.Serialization; - -using Amazon.NimbleStudio.Model; -using Amazon.Runtime; -using Amazon.Runtime.Internal; -using Amazon.Runtime.Internal.Transform; -using Amazon.Runtime.Internal.Util; -using ThirdParty.Json.LitJson; - -#pragma warning disable CS0612,CS0618 -namespace Amazon.NimbleStudio.Model.Internal.MarshallTransformations -{ - /// - /// Response Unmarshaller for LaunchProfile Object - /// - public class LaunchProfileUnmarshaller : IUnmarshaller, IUnmarshaller - { - /// - /// Unmarshaller the response from the service to the response class. - /// - /// - /// - LaunchProfile IUnmarshaller.Unmarshall(XmlUnmarshallerContext context) - { - throw new NotImplementedException(); - } - - /// - /// Unmarshaller the response from the service to the response class. - /// - /// - /// The unmarshalled object - public LaunchProfile Unmarshall(JsonUnmarshallerContext context) - { - LaunchProfile unmarshalledObject = new LaunchProfile(); - if (context.IsEmptyResponse) - return null; - context.Read(); - if (context.CurrentTokenType == JsonToken.Null) - return null; - - int targetDepth = context.CurrentDepth; - while (context.ReadAtDepth(targetDepth)) - { - if (context.TestExpression("arn", targetDepth)) - { - var unmarshaller = StringUnmarshaller.Instance; - unmarshalledObject.Arn = unmarshaller.Unmarshall(context); - continue; - } - if (context.TestExpression("createdAt", targetDepth)) - { - var unmarshaller = NullableDateTimeUnmarshaller.Instance; - unmarshalledObject.CreatedAt = unmarshaller.Unmarshall(context); - continue; - } - if (context.TestExpression("createdBy", targetDepth)) - { - var unmarshaller = StringUnmarshaller.Instance; - unmarshalledObject.CreatedBy = unmarshaller.Unmarshall(context); - continue; - } - if (context.TestExpression("description", targetDepth)) - { - var unmarshaller = StringUnmarshaller.Instance; - unmarshalledObject.Description = unmarshaller.Unmarshall(context); - continue; - } - if (context.TestExpression("ec2SubnetIds", targetDepth)) - { - var unmarshaller = new ListUnmarshaller(StringUnmarshaller.Instance); - unmarshalledObject.Ec2SubnetIds = unmarshaller.Unmarshall(context); - continue; - } - if (context.TestExpression("launchProfileId", targetDepth)) - { - var unmarshaller = StringUnmarshaller.Instance; - unmarshalledObject.LaunchProfileId = unmarshaller.Unmarshall(context); - continue; - } - if (context.TestExpression("launchProfileProtocolVersions", targetDepth)) - { - var unmarshaller = new ListUnmarshaller(StringUnmarshaller.Instance); - unmarshalledObject.LaunchProfileProtocolVersions = unmarshaller.Unmarshall(context); - continue; - } - if (context.TestExpression("name", targetDepth)) - { - var unmarshaller = StringUnmarshaller.Instance; - unmarshalledObject.Name = unmarshaller.Unmarshall(context); - continue; - } - if (context.TestExpression("state", targetDepth)) - { - var unmarshaller = StringUnmarshaller.Instance; - unmarshalledObject.State = unmarshaller.Unmarshall(context); - continue; - } - if (context.TestExpression("statusCode", targetDepth)) - { - var unmarshaller = StringUnmarshaller.Instance; - unmarshalledObject.StatusCode = unmarshaller.Unmarshall(context); - continue; - } - if (context.TestExpression("statusMessage", targetDepth)) - { - var unmarshaller = StringUnmarshaller.Instance; - unmarshalledObject.StatusMessage = unmarshaller.Unmarshall(context); - continue; - } - if (context.TestExpression("streamConfiguration", targetDepth)) - { - var unmarshaller = StreamConfigurationUnmarshaller.Instance; - unmarshalledObject.StreamConfiguration = unmarshaller.Unmarshall(context); - continue; - } - if (context.TestExpression("studioComponentIds", targetDepth)) - { - var unmarshaller = new ListUnmarshaller(StringUnmarshaller.Instance); - unmarshalledObject.StudioComponentIds = unmarshaller.Unmarshall(context); - continue; - } - if (context.TestExpression("tags", targetDepth)) - { - var unmarshaller = new DictionaryUnmarshaller(StringUnmarshaller.Instance, StringUnmarshaller.Instance); - unmarshalledObject.Tags = unmarshaller.Unmarshall(context); - continue; - } - if (context.TestExpression("updatedAt", targetDepth)) - { - var unmarshaller = NullableDateTimeUnmarshaller.Instance; - unmarshalledObject.UpdatedAt = unmarshaller.Unmarshall(context); - continue; - } - if (context.TestExpression("updatedBy", targetDepth)) - { - var unmarshaller = StringUnmarshaller.Instance; - unmarshalledObject.UpdatedBy = unmarshaller.Unmarshall(context); - continue; - } - if (context.TestExpression("validationResults", targetDepth)) - { - var unmarshaller = new ListUnmarshaller(ValidationResultUnmarshaller.Instance); - unmarshalledObject.ValidationResults = unmarshaller.Unmarshall(context); - continue; - } - } - return unmarshalledObject; - } - - - private static LaunchProfileUnmarshaller _instance = new LaunchProfileUnmarshaller(); - - /// - /// Gets the singleton. - /// - public static LaunchProfileUnmarshaller Instance - { - get - { - return _instance; - } - } - } -} \ No newline at end of file diff --git a/sdk/src/Services/NimbleStudio/Generated/Model/Internal/MarshallTransformations/PutLaunchProfileMembersRequestMarshaller.cs b/sdk/src/Services/NimbleStudio/Generated/Model/Internal/MarshallTransformations/PutLaunchProfileMembersRequestMarshaller.cs deleted file mode 100644 index 675fbb3ea8d1..000000000000 --- a/sdk/src/Services/NimbleStudio/Generated/Model/Internal/MarshallTransformations/PutLaunchProfileMembersRequestMarshaller.cs +++ /dev/null @@ -1,133 +0,0 @@ -/* - * 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. - */ - -/* - * Do not modify this file. This file is generated from the nimble-2020-08-01.normal.json service model. - */ -using System; -using System.Collections.Generic; -using System.Globalization; -using System.IO; -using System.Text; -using System.Xml.Serialization; - -using Amazon.NimbleStudio.Model; -using Amazon.Runtime; -using Amazon.Runtime.Internal; -using Amazon.Runtime.Internal.Transform; -using Amazon.Runtime.Internal.Util; -using ThirdParty.Json.LitJson; - -#pragma warning disable CS0612,CS0618 -namespace Amazon.NimbleStudio.Model.Internal.MarshallTransformations -{ - /// - /// PutLaunchProfileMembers Request Marshaller - /// - public class PutLaunchProfileMembersRequestMarshaller : IMarshaller , IMarshaller - { - /// - /// Marshaller the request object to the HTTP request. - /// - /// - /// - public IRequest Marshall(AmazonWebServiceRequest input) - { - return this.Marshall((PutLaunchProfileMembersRequest)input); - } - - /// - /// Marshaller the request object to the HTTP request. - /// - /// - /// - public IRequest Marshall(PutLaunchProfileMembersRequest publicRequest) - { - IRequest request = new DefaultRequest(publicRequest, "Amazon.NimbleStudio"); - request.Headers["Content-Type"] = "application/json"; - request.Headers[Amazon.Util.HeaderKeys.XAmzApiVersion] = "2020-08-01"; - request.HttpMethod = "POST"; - - if (!publicRequest.IsSetLaunchProfileId()) - throw new AmazonNimbleStudioException("Request object does not have required field LaunchProfileId set"); - request.AddPathResource("{launchProfileId}", StringUtils.FromString(publicRequest.LaunchProfileId)); - if (!publicRequest.IsSetStudioId()) - throw new AmazonNimbleStudioException("Request object does not have required field StudioId set"); - request.AddPathResource("{studioId}", StringUtils.FromString(publicRequest.StudioId)); - request.ResourcePath = "/2020-08-01/studios/{studioId}/launch-profiles/{launchProfileId}/membership"; - using (MemoryStream memoryStream = new MemoryStream()) - { - using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) - { - JsonWriter writer = new JsonWriter(streamWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetIdentityStoreId()) - { - context.Writer.WritePropertyName("identityStoreId"); - context.Writer.Write(publicRequest.IdentityStoreId); - } - - if(publicRequest.IsSetMembers()) - { - context.Writer.WritePropertyName("members"); - context.Writer.WriteArrayStart(); - foreach(var publicRequestMembersListValue in publicRequest.Members) - { - context.Writer.WriteObjectStart(); - - var marshaller = NewLaunchProfileMemberMarshaller.Instance; - marshaller.Marshall(publicRequestMembersListValue, context); - - context.Writer.WriteObjectEnd(); - } - context.Writer.WriteArrayEnd(); - } - - writer.WriteObjectEnd(); - } - - request.Content = memoryStream.ToArray(); - } - - - if (publicRequest.IsSetClientToken()) - { - request.Headers["X-Amz-Client-Token"] = publicRequest.ClientToken; - } - - return request; - } - private static PutLaunchProfileMembersRequestMarshaller _instance = new PutLaunchProfileMembersRequestMarshaller(); - - internal static PutLaunchProfileMembersRequestMarshaller GetInstance() - { - return _instance; - } - - /// - /// Gets the singleton. - /// - public static PutLaunchProfileMembersRequestMarshaller Instance - { - get - { - return _instance; - } - } - - } -} \ No newline at end of file diff --git a/sdk/src/Services/NimbleStudio/Generated/Model/Internal/MarshallTransformations/PutStudioMembersRequestMarshaller.cs b/sdk/src/Services/NimbleStudio/Generated/Model/Internal/MarshallTransformations/PutStudioMembersRequestMarshaller.cs deleted file mode 100644 index 013959ed03bd..000000000000 --- a/sdk/src/Services/NimbleStudio/Generated/Model/Internal/MarshallTransformations/PutStudioMembersRequestMarshaller.cs +++ /dev/null @@ -1,130 +0,0 @@ -/* - * 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. - */ - -/* - * Do not modify this file. This file is generated from the nimble-2020-08-01.normal.json service model. - */ -using System; -using System.Collections.Generic; -using System.Globalization; -using System.IO; -using System.Text; -using System.Xml.Serialization; - -using Amazon.NimbleStudio.Model; -using Amazon.Runtime; -using Amazon.Runtime.Internal; -using Amazon.Runtime.Internal.Transform; -using Amazon.Runtime.Internal.Util; -using ThirdParty.Json.LitJson; - -#pragma warning disable CS0612,CS0618 -namespace Amazon.NimbleStudio.Model.Internal.MarshallTransformations -{ - /// - /// PutStudioMembers Request Marshaller - /// - public class PutStudioMembersRequestMarshaller : IMarshaller , IMarshaller - { - /// - /// Marshaller the request object to the HTTP request. - /// - /// - /// - public IRequest Marshall(AmazonWebServiceRequest input) - { - return this.Marshall((PutStudioMembersRequest)input); - } - - /// - /// Marshaller the request object to the HTTP request. - /// - /// - /// - public IRequest Marshall(PutStudioMembersRequest publicRequest) - { - IRequest request = new DefaultRequest(publicRequest, "Amazon.NimbleStudio"); - request.Headers["Content-Type"] = "application/json"; - request.Headers[Amazon.Util.HeaderKeys.XAmzApiVersion] = "2020-08-01"; - request.HttpMethod = "POST"; - - if (!publicRequest.IsSetStudioId()) - throw new AmazonNimbleStudioException("Request object does not have required field StudioId set"); - request.AddPathResource("{studioId}", StringUtils.FromString(publicRequest.StudioId)); - request.ResourcePath = "/2020-08-01/studios/{studioId}/membership"; - using (MemoryStream memoryStream = new MemoryStream()) - { - using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) - { - JsonWriter writer = new JsonWriter(streamWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetIdentityStoreId()) - { - context.Writer.WritePropertyName("identityStoreId"); - context.Writer.Write(publicRequest.IdentityStoreId); - } - - if(publicRequest.IsSetMembers()) - { - context.Writer.WritePropertyName("members"); - context.Writer.WriteArrayStart(); - foreach(var publicRequestMembersListValue in publicRequest.Members) - { - context.Writer.WriteObjectStart(); - - var marshaller = NewStudioMemberMarshaller.Instance; - marshaller.Marshall(publicRequestMembersListValue, context); - - context.Writer.WriteObjectEnd(); - } - context.Writer.WriteArrayEnd(); - } - - writer.WriteObjectEnd(); - } - - request.Content = memoryStream.ToArray(); - } - - - if (publicRequest.IsSetClientToken()) - { - request.Headers["X-Amz-Client-Token"] = publicRequest.ClientToken; - } - - return request; - } - private static PutStudioMembersRequestMarshaller _instance = new PutStudioMembersRequestMarshaller(); - - internal static PutStudioMembersRequestMarshaller GetInstance() - { - return _instance; - } - - /// - /// Gets the singleton. - /// - public static PutStudioMembersRequestMarshaller Instance - { - get - { - return _instance; - } - } - - } -} \ No newline at end of file diff --git a/sdk/src/Services/NimbleStudio/Generated/Model/Internal/MarshallTransformations/StartStreamingSessionRequestMarshaller.cs b/sdk/src/Services/NimbleStudio/Generated/Model/Internal/MarshallTransformations/StartStreamingSessionRequestMarshaller.cs deleted file mode 100644 index eab6cb4c8b4d..000000000000 --- a/sdk/src/Services/NimbleStudio/Generated/Model/Internal/MarshallTransformations/StartStreamingSessionRequestMarshaller.cs +++ /dev/null @@ -1,117 +0,0 @@ -/* - * 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. - */ - -/* - * Do not modify this file. This file is generated from the nimble-2020-08-01.normal.json service model. - */ -using System; -using System.Collections.Generic; -using System.Globalization; -using System.IO; -using System.Text; -using System.Xml.Serialization; - -using Amazon.NimbleStudio.Model; -using Amazon.Runtime; -using Amazon.Runtime.Internal; -using Amazon.Runtime.Internal.Transform; -using Amazon.Runtime.Internal.Util; -using ThirdParty.Json.LitJson; - -#pragma warning disable CS0612,CS0618 -namespace Amazon.NimbleStudio.Model.Internal.MarshallTransformations -{ - /// - /// StartStreamingSession Request Marshaller - /// - public class StartStreamingSessionRequestMarshaller : IMarshaller , IMarshaller - { - /// - /// Marshaller the request object to the HTTP request. - /// - /// - /// - public IRequest Marshall(AmazonWebServiceRequest input) - { - return this.Marshall((StartStreamingSessionRequest)input); - } - - /// - /// Marshaller the request object to the HTTP request. - /// - /// - /// - public IRequest Marshall(StartStreamingSessionRequest publicRequest) - { - IRequest request = new DefaultRequest(publicRequest, "Amazon.NimbleStudio"); - request.Headers["Content-Type"] = "application/json"; - request.Headers[Amazon.Util.HeaderKeys.XAmzApiVersion] = "2020-08-01"; - request.HttpMethod = "POST"; - - if (!publicRequest.IsSetSessionId()) - throw new AmazonNimbleStudioException("Request object does not have required field SessionId set"); - request.AddPathResource("{sessionId}", StringUtils.FromString(publicRequest.SessionId)); - if (!publicRequest.IsSetStudioId()) - throw new AmazonNimbleStudioException("Request object does not have required field StudioId set"); - request.AddPathResource("{studioId}", StringUtils.FromString(publicRequest.StudioId)); - request.ResourcePath = "/2020-08-01/studios/{studioId}/streaming-sessions/{sessionId}/start"; - using (MemoryStream memoryStream = new MemoryStream()) - { - using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) - { - JsonWriter writer = new JsonWriter(streamWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetBackupId()) - { - context.Writer.WritePropertyName("backupId"); - context.Writer.Write(publicRequest.BackupId); - } - - writer.WriteObjectEnd(); - } - - request.Content = memoryStream.ToArray(); - } - - - if (publicRequest.IsSetClientToken()) - { - request.Headers["X-Amz-Client-Token"] = publicRequest.ClientToken; - } - - return request; - } - private static StartStreamingSessionRequestMarshaller _instance = new StartStreamingSessionRequestMarshaller(); - - internal static StartStreamingSessionRequestMarshaller GetInstance() - { - return _instance; - } - - /// - /// Gets the singleton. - /// - public static StartStreamingSessionRequestMarshaller Instance - { - get - { - return _instance; - } - } - - } -} \ No newline at end of file diff --git a/sdk/src/Services/NimbleStudio/Generated/Model/Internal/MarshallTransformations/StopStreamingSessionRequestMarshaller.cs b/sdk/src/Services/NimbleStudio/Generated/Model/Internal/MarshallTransformations/StopStreamingSessionRequestMarshaller.cs deleted file mode 100644 index d04a5e21aada..000000000000 --- a/sdk/src/Services/NimbleStudio/Generated/Model/Internal/MarshallTransformations/StopStreamingSessionRequestMarshaller.cs +++ /dev/null @@ -1,117 +0,0 @@ -/* - * 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. - */ - -/* - * Do not modify this file. This file is generated from the nimble-2020-08-01.normal.json service model. - */ -using System; -using System.Collections.Generic; -using System.Globalization; -using System.IO; -using System.Text; -using System.Xml.Serialization; - -using Amazon.NimbleStudio.Model; -using Amazon.Runtime; -using Amazon.Runtime.Internal; -using Amazon.Runtime.Internal.Transform; -using Amazon.Runtime.Internal.Util; -using ThirdParty.Json.LitJson; - -#pragma warning disable CS0612,CS0618 -namespace Amazon.NimbleStudio.Model.Internal.MarshallTransformations -{ - /// - /// StopStreamingSession Request Marshaller - /// - public class StopStreamingSessionRequestMarshaller : IMarshaller , IMarshaller - { - /// - /// Marshaller the request object to the HTTP request. - /// - /// - /// - public IRequest Marshall(AmazonWebServiceRequest input) - { - return this.Marshall((StopStreamingSessionRequest)input); - } - - /// - /// Marshaller the request object to the HTTP request. - /// - /// - /// - public IRequest Marshall(StopStreamingSessionRequest publicRequest) - { - IRequest request = new DefaultRequest(publicRequest, "Amazon.NimbleStudio"); - request.Headers["Content-Type"] = "application/json"; - request.Headers[Amazon.Util.HeaderKeys.XAmzApiVersion] = "2020-08-01"; - request.HttpMethod = "POST"; - - if (!publicRequest.IsSetSessionId()) - throw new AmazonNimbleStudioException("Request object does not have required field SessionId set"); - request.AddPathResource("{sessionId}", StringUtils.FromString(publicRequest.SessionId)); - if (!publicRequest.IsSetStudioId()) - throw new AmazonNimbleStudioException("Request object does not have required field StudioId set"); - request.AddPathResource("{studioId}", StringUtils.FromString(publicRequest.StudioId)); - request.ResourcePath = "/2020-08-01/studios/{studioId}/streaming-sessions/{sessionId}/stop"; - using (MemoryStream memoryStream = new MemoryStream()) - { - using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) - { - JsonWriter writer = new JsonWriter(streamWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetVolumeRetentionMode()) - { - context.Writer.WritePropertyName("volumeRetentionMode"); - context.Writer.Write(publicRequest.VolumeRetentionMode); - } - - writer.WriteObjectEnd(); - } - - request.Content = memoryStream.ToArray(); - } - - - if (publicRequest.IsSetClientToken()) - { - request.Headers["X-Amz-Client-Token"] = publicRequest.ClientToken; - } - - return request; - } - private static StopStreamingSessionRequestMarshaller _instance = new StopStreamingSessionRequestMarshaller(); - - internal static StopStreamingSessionRequestMarshaller GetInstance() - { - return _instance; - } - - /// - /// Gets the singleton. - /// - public static StopStreamingSessionRequestMarshaller Instance - { - get - { - return _instance; - } - } - - } -} \ No newline at end of file diff --git a/sdk/src/Services/NimbleStudio/Generated/Model/Internal/MarshallTransformations/StreamConfigurationCreateMarshaller.cs b/sdk/src/Services/NimbleStudio/Generated/Model/Internal/MarshallTransformations/StreamConfigurationCreateMarshaller.cs deleted file mode 100644 index 2dd51609b051..000000000000 --- a/sdk/src/Services/NimbleStudio/Generated/Model/Internal/MarshallTransformations/StreamConfigurationCreateMarshaller.cs +++ /dev/null @@ -1,144 +0,0 @@ -/* - * 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. - */ - -/* - * Do not modify this file. This file is generated from the nimble-2020-08-01.normal.json service model. - */ -using System; -using System.Collections.Generic; -using System.Globalization; -using System.IO; -using System.Text; -using System.Xml.Serialization; - -using Amazon.NimbleStudio.Model; -using Amazon.Runtime; -using Amazon.Runtime.Internal; -using Amazon.Runtime.Internal.Transform; -using Amazon.Runtime.Internal.Util; -using ThirdParty.Json.LitJson; - -#pragma warning disable CS0612,CS0618 -namespace Amazon.NimbleStudio.Model.Internal.MarshallTransformations -{ - /// - /// StreamConfigurationCreate Marshaller - /// - public class StreamConfigurationCreateMarshaller : IRequestMarshaller - { - /// - /// Unmarshaller the response from the service to the response class. - /// - /// - /// - /// - public void Marshall(StreamConfigurationCreate requestObject, JsonMarshallerContext context) - { - if(requestObject == null) - return; - if(requestObject.IsSetAutomaticTerminationMode()) - { - context.Writer.WritePropertyName("automaticTerminationMode"); - context.Writer.Write(requestObject.AutomaticTerminationMode); - } - - if(requestObject.IsSetClipboardMode()) - { - context.Writer.WritePropertyName("clipboardMode"); - context.Writer.Write(requestObject.ClipboardMode); - } - - if(requestObject.IsSetEc2InstanceTypes()) - { - context.Writer.WritePropertyName("ec2InstanceTypes"); - context.Writer.WriteArrayStart(); - foreach(var requestObjectEc2InstanceTypesListValue in requestObject.Ec2InstanceTypes) - { - context.Writer.Write(requestObjectEc2InstanceTypesListValue); - } - context.Writer.WriteArrayEnd(); - } - - if(requestObject.IsSetMaxSessionLengthInMinutes()) - { - context.Writer.WritePropertyName("maxSessionLengthInMinutes"); - context.Writer.Write(requestObject.MaxSessionLengthInMinutes.Value); - } - - if(requestObject.IsSetMaxStoppedSessionLengthInMinutes()) - { - context.Writer.WritePropertyName("maxStoppedSessionLengthInMinutes"); - context.Writer.Write(requestObject.MaxStoppedSessionLengthInMinutes.Value); - } - - if(requestObject.IsSetSessionBackup()) - { - context.Writer.WritePropertyName("sessionBackup"); - context.Writer.WriteObjectStart(); - - var marshaller = StreamConfigurationSessionBackupMarshaller.Instance; - marshaller.Marshall(requestObject.SessionBackup, context); - - context.Writer.WriteObjectEnd(); - } - - if(requestObject.IsSetSessionPersistenceMode()) - { - context.Writer.WritePropertyName("sessionPersistenceMode"); - context.Writer.Write(requestObject.SessionPersistenceMode); - } - - if(requestObject.IsSetSessionStorage()) - { - context.Writer.WritePropertyName("sessionStorage"); - context.Writer.WriteObjectStart(); - - var marshaller = StreamConfigurationSessionStorageMarshaller.Instance; - marshaller.Marshall(requestObject.SessionStorage, context); - - context.Writer.WriteObjectEnd(); - } - - if(requestObject.IsSetStreamingImageIds()) - { - context.Writer.WritePropertyName("streamingImageIds"); - context.Writer.WriteArrayStart(); - foreach(var requestObjectStreamingImageIdsListValue in requestObject.StreamingImageIds) - { - context.Writer.Write(requestObjectStreamingImageIdsListValue); - } - context.Writer.WriteArrayEnd(); - } - - if(requestObject.IsSetVolumeConfiguration()) - { - context.Writer.WritePropertyName("volumeConfiguration"); - context.Writer.WriteObjectStart(); - - var marshaller = VolumeConfigurationMarshaller.Instance; - marshaller.Marshall(requestObject.VolumeConfiguration, context); - - context.Writer.WriteObjectEnd(); - } - - } - - /// - /// Singleton Marshaller. - /// - public readonly static StreamConfigurationCreateMarshaller Instance = new StreamConfigurationCreateMarshaller(); - - } -} \ No newline at end of file diff --git a/sdk/src/Services/NimbleStudio/Generated/Model/Internal/MarshallTransformations/StreamConfigurationSessionBackupMarshaller.cs b/sdk/src/Services/NimbleStudio/Generated/Model/Internal/MarshallTransformations/StreamConfigurationSessionBackupMarshaller.cs deleted file mode 100644 index 1dab7ac3b164..000000000000 --- a/sdk/src/Services/NimbleStudio/Generated/Model/Internal/MarshallTransformations/StreamConfigurationSessionBackupMarshaller.cs +++ /dev/null @@ -1,71 +0,0 @@ -/* - * 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. - */ - -/* - * Do not modify this file. This file is generated from the nimble-2020-08-01.normal.json service model. - */ -using System; -using System.Collections.Generic; -using System.Globalization; -using System.IO; -using System.Text; -using System.Xml.Serialization; - -using Amazon.NimbleStudio.Model; -using Amazon.Runtime; -using Amazon.Runtime.Internal; -using Amazon.Runtime.Internal.Transform; -using Amazon.Runtime.Internal.Util; -using ThirdParty.Json.LitJson; - -#pragma warning disable CS0612,CS0618 -namespace Amazon.NimbleStudio.Model.Internal.MarshallTransformations -{ - /// - /// StreamConfigurationSessionBackup Marshaller - /// - public class StreamConfigurationSessionBackupMarshaller : IRequestMarshaller - { - /// - /// Unmarshaller the response from the service to the response class. - /// - /// - /// - /// - public void Marshall(StreamConfigurationSessionBackup requestObject, JsonMarshallerContext context) - { - if(requestObject == null) - return; - if(requestObject.IsSetMaxBackupsToRetain()) - { - context.Writer.WritePropertyName("maxBackupsToRetain"); - context.Writer.Write(requestObject.MaxBackupsToRetain.Value); - } - - if(requestObject.IsSetMode()) - { - context.Writer.WritePropertyName("mode"); - context.Writer.Write(requestObject.Mode); - } - - } - - /// - /// Singleton Marshaller. - /// - public readonly static StreamConfigurationSessionBackupMarshaller Instance = new StreamConfigurationSessionBackupMarshaller(); - - } -} \ No newline at end of file diff --git a/sdk/src/Services/NimbleStudio/Generated/Model/Internal/MarshallTransformations/StreamConfigurationSessionBackupUnmarshaller.cs b/sdk/src/Services/NimbleStudio/Generated/Model/Internal/MarshallTransformations/StreamConfigurationSessionBackupUnmarshaller.cs deleted file mode 100644 index 7d8bc6384281..000000000000 --- a/sdk/src/Services/NimbleStudio/Generated/Model/Internal/MarshallTransformations/StreamConfigurationSessionBackupUnmarshaller.cs +++ /dev/null @@ -1,99 +0,0 @@ -/* - * 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. - */ - -/* - * Do not modify this file. This file is generated from the nimble-2020-08-01.normal.json service model. - */ -using System; -using System.Collections.Generic; -using System.Globalization; -using System.IO; -using System.Net; -using System.Text; -using System.Xml.Serialization; - -using Amazon.NimbleStudio.Model; -using Amazon.Runtime; -using Amazon.Runtime.Internal; -using Amazon.Runtime.Internal.Transform; -using Amazon.Runtime.Internal.Util; -using ThirdParty.Json.LitJson; - -#pragma warning disable CS0612,CS0618 -namespace Amazon.NimbleStudio.Model.Internal.MarshallTransformations -{ - /// - /// Response Unmarshaller for StreamConfigurationSessionBackup Object - /// - public class StreamConfigurationSessionBackupUnmarshaller : IUnmarshaller, IUnmarshaller - { - /// - /// Unmarshaller the response from the service to the response class. - /// - /// - /// - StreamConfigurationSessionBackup IUnmarshaller.Unmarshall(XmlUnmarshallerContext context) - { - throw new NotImplementedException(); - } - - /// - /// Unmarshaller the response from the service to the response class. - /// - /// - /// The unmarshalled object - public StreamConfigurationSessionBackup Unmarshall(JsonUnmarshallerContext context) - { - StreamConfigurationSessionBackup unmarshalledObject = new StreamConfigurationSessionBackup(); - if (context.IsEmptyResponse) - return null; - context.Read(); - if (context.CurrentTokenType == JsonToken.Null) - return null; - - int targetDepth = context.CurrentDepth; - while (context.ReadAtDepth(targetDepth)) - { - if (context.TestExpression("maxBackupsToRetain", targetDepth)) - { - var unmarshaller = NullableIntUnmarshaller.Instance; - unmarshalledObject.MaxBackupsToRetain = unmarshaller.Unmarshall(context); - continue; - } - if (context.TestExpression("mode", targetDepth)) - { - var unmarshaller = StringUnmarshaller.Instance; - unmarshalledObject.Mode = unmarshaller.Unmarshall(context); - continue; - } - } - return unmarshalledObject; - } - - - private static StreamConfigurationSessionBackupUnmarshaller _instance = new StreamConfigurationSessionBackupUnmarshaller(); - - /// - /// Gets the singleton. - /// - public static StreamConfigurationSessionBackupUnmarshaller Instance - { - get - { - return _instance; - } - } - } -} \ No newline at end of file diff --git a/sdk/src/Services/NimbleStudio/Generated/Model/Internal/MarshallTransformations/StreamConfigurationUnmarshaller.cs b/sdk/src/Services/NimbleStudio/Generated/Model/Internal/MarshallTransformations/StreamConfigurationUnmarshaller.cs deleted file mode 100644 index 467592aeefb5..000000000000 --- a/sdk/src/Services/NimbleStudio/Generated/Model/Internal/MarshallTransformations/StreamConfigurationUnmarshaller.cs +++ /dev/null @@ -1,147 +0,0 @@ -/* - * 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. - */ - -/* - * Do not modify this file. This file is generated from the nimble-2020-08-01.normal.json service model. - */ -using System; -using System.Collections.Generic; -using System.Globalization; -using System.IO; -using System.Net; -using System.Text; -using System.Xml.Serialization; - -using Amazon.NimbleStudio.Model; -using Amazon.Runtime; -using Amazon.Runtime.Internal; -using Amazon.Runtime.Internal.Transform; -using Amazon.Runtime.Internal.Util; -using ThirdParty.Json.LitJson; - -#pragma warning disable CS0612,CS0618 -namespace Amazon.NimbleStudio.Model.Internal.MarshallTransformations -{ - /// - /// Response Unmarshaller for StreamConfiguration Object - /// - public class StreamConfigurationUnmarshaller : IUnmarshaller, IUnmarshaller - { - /// - /// Unmarshaller the response from the service to the response class. - /// - /// - /// - StreamConfiguration IUnmarshaller.Unmarshall(XmlUnmarshallerContext context) - { - throw new NotImplementedException(); - } - - /// - /// Unmarshaller the response from the service to the response class. - /// - /// - /// The unmarshalled object - public StreamConfiguration Unmarshall(JsonUnmarshallerContext context) - { - StreamConfiguration unmarshalledObject = new StreamConfiguration(); - if (context.IsEmptyResponse) - return null; - context.Read(); - if (context.CurrentTokenType == JsonToken.Null) - return null; - - int targetDepth = context.CurrentDepth; - while (context.ReadAtDepth(targetDepth)) - { - if (context.TestExpression("automaticTerminationMode", targetDepth)) - { - var unmarshaller = StringUnmarshaller.Instance; - unmarshalledObject.AutomaticTerminationMode = unmarshaller.Unmarshall(context); - continue; - } - if (context.TestExpression("clipboardMode", targetDepth)) - { - var unmarshaller = StringUnmarshaller.Instance; - unmarshalledObject.ClipboardMode = unmarshaller.Unmarshall(context); - continue; - } - if (context.TestExpression("ec2InstanceTypes", targetDepth)) - { - var unmarshaller = new ListUnmarshaller(StringUnmarshaller.Instance); - unmarshalledObject.Ec2InstanceTypes = unmarshaller.Unmarshall(context); - continue; - } - if (context.TestExpression("maxSessionLengthInMinutes", targetDepth)) - { - var unmarshaller = NullableIntUnmarshaller.Instance; - unmarshalledObject.MaxSessionLengthInMinutes = unmarshaller.Unmarshall(context); - continue; - } - if (context.TestExpression("maxStoppedSessionLengthInMinutes", targetDepth)) - { - var unmarshaller = NullableIntUnmarshaller.Instance; - unmarshalledObject.MaxStoppedSessionLengthInMinutes = unmarshaller.Unmarshall(context); - continue; - } - if (context.TestExpression("sessionBackup", targetDepth)) - { - var unmarshaller = StreamConfigurationSessionBackupUnmarshaller.Instance; - unmarshalledObject.SessionBackup = unmarshaller.Unmarshall(context); - continue; - } - if (context.TestExpression("sessionPersistenceMode", targetDepth)) - { - var unmarshaller = StringUnmarshaller.Instance; - unmarshalledObject.SessionPersistenceMode = unmarshaller.Unmarshall(context); - continue; - } - if (context.TestExpression("sessionStorage", targetDepth)) - { - var unmarshaller = StreamConfigurationSessionStorageUnmarshaller.Instance; - unmarshalledObject.SessionStorage = unmarshaller.Unmarshall(context); - continue; - } - if (context.TestExpression("streamingImageIds", targetDepth)) - { - var unmarshaller = new ListUnmarshaller(StringUnmarshaller.Instance); - unmarshalledObject.StreamingImageIds = unmarshaller.Unmarshall(context); - continue; - } - if (context.TestExpression("volumeConfiguration", targetDepth)) - { - var unmarshaller = VolumeConfigurationUnmarshaller.Instance; - unmarshalledObject.VolumeConfiguration = unmarshaller.Unmarshall(context); - continue; - } - } - return unmarshalledObject; - } - - - private static StreamConfigurationUnmarshaller _instance = new StreamConfigurationUnmarshaller(); - - /// - /// Gets the singleton. - /// - public static StreamConfigurationUnmarshaller Instance - { - get - { - return _instance; - } - } - } -} \ No newline at end of file diff --git a/sdk/src/Services/NimbleStudio/Generated/Model/Internal/MarshallTransformations/StreamingSessionBackupUnmarshaller.cs b/sdk/src/Services/NimbleStudio/Generated/Model/Internal/MarshallTransformations/StreamingSessionBackupUnmarshaller.cs deleted file mode 100644 index ee5bbeb28416..000000000000 --- a/sdk/src/Services/NimbleStudio/Generated/Model/Internal/MarshallTransformations/StreamingSessionBackupUnmarshaller.cs +++ /dev/null @@ -1,147 +0,0 @@ -/* - * 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. - */ - -/* - * Do not modify this file. This file is generated from the nimble-2020-08-01.normal.json service model. - */ -using System; -using System.Collections.Generic; -using System.Globalization; -using System.IO; -using System.Net; -using System.Text; -using System.Xml.Serialization; - -using Amazon.NimbleStudio.Model; -using Amazon.Runtime; -using Amazon.Runtime.Internal; -using Amazon.Runtime.Internal.Transform; -using Amazon.Runtime.Internal.Util; -using ThirdParty.Json.LitJson; - -#pragma warning disable CS0612,CS0618 -namespace Amazon.NimbleStudio.Model.Internal.MarshallTransformations -{ - /// - /// Response Unmarshaller for StreamingSessionBackup Object - /// - public class StreamingSessionBackupUnmarshaller : IUnmarshaller, IUnmarshaller - { - /// - /// Unmarshaller the response from the service to the response class. - /// - /// - /// - StreamingSessionBackup IUnmarshaller.Unmarshall(XmlUnmarshallerContext context) - { - throw new NotImplementedException(); - } - - /// - /// Unmarshaller the response from the service to the response class. - /// - /// - /// The unmarshalled object - public StreamingSessionBackup Unmarshall(JsonUnmarshallerContext context) - { - StreamingSessionBackup unmarshalledObject = new StreamingSessionBackup(); - if (context.IsEmptyResponse) - return null; - context.Read(); - if (context.CurrentTokenType == JsonToken.Null) - return null; - - int targetDepth = context.CurrentDepth; - while (context.ReadAtDepth(targetDepth)) - { - if (context.TestExpression("arn", targetDepth)) - { - var unmarshaller = StringUnmarshaller.Instance; - unmarshalledObject.Arn = unmarshaller.Unmarshall(context); - continue; - } - if (context.TestExpression("backupId", targetDepth)) - { - var unmarshaller = StringUnmarshaller.Instance; - unmarshalledObject.BackupId = unmarshaller.Unmarshall(context); - continue; - } - if (context.TestExpression("createdAt", targetDepth)) - { - var unmarshaller = NullableDateTimeUnmarshaller.Instance; - unmarshalledObject.CreatedAt = unmarshaller.Unmarshall(context); - continue; - } - if (context.TestExpression("launchProfileId", targetDepth)) - { - var unmarshaller = StringUnmarshaller.Instance; - unmarshalledObject.LaunchProfileId = unmarshaller.Unmarshall(context); - continue; - } - if (context.TestExpression("ownedBy", targetDepth)) - { - var unmarshaller = StringUnmarshaller.Instance; - unmarshalledObject.OwnedBy = unmarshaller.Unmarshall(context); - continue; - } - if (context.TestExpression("sessionId", targetDepth)) - { - var unmarshaller = StringUnmarshaller.Instance; - unmarshalledObject.SessionId = unmarshaller.Unmarshall(context); - continue; - } - if (context.TestExpression("state", targetDepth)) - { - var unmarshaller = StringUnmarshaller.Instance; - unmarshalledObject.State = unmarshaller.Unmarshall(context); - continue; - } - if (context.TestExpression("statusCode", targetDepth)) - { - var unmarshaller = StringUnmarshaller.Instance; - unmarshalledObject.StatusCode = unmarshaller.Unmarshall(context); - continue; - } - if (context.TestExpression("statusMessage", targetDepth)) - { - var unmarshaller = StringUnmarshaller.Instance; - unmarshalledObject.StatusMessage = unmarshaller.Unmarshall(context); - continue; - } - if (context.TestExpression("tags", targetDepth)) - { - var unmarshaller = new DictionaryUnmarshaller(StringUnmarshaller.Instance, StringUnmarshaller.Instance); - unmarshalledObject.Tags = unmarshaller.Unmarshall(context); - continue; - } - } - return unmarshalledObject; - } - - - private static StreamingSessionBackupUnmarshaller _instance = new StreamingSessionBackupUnmarshaller(); - - /// - /// Gets the singleton. - /// - public static StreamingSessionBackupUnmarshaller Instance - { - get - { - return _instance; - } - } - } -} \ No newline at end of file diff --git a/sdk/src/Services/NimbleStudio/Generated/Model/Internal/MarshallTransformations/StreamingSessionStreamUnmarshaller.cs b/sdk/src/Services/NimbleStudio/Generated/Model/Internal/MarshallTransformations/StreamingSessionStreamUnmarshaller.cs deleted file mode 100644 index def4a6d854ae..000000000000 --- a/sdk/src/Services/NimbleStudio/Generated/Model/Internal/MarshallTransformations/StreamingSessionStreamUnmarshaller.cs +++ /dev/null @@ -1,135 +0,0 @@ -/* - * 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. - */ - -/* - * Do not modify this file. This file is generated from the nimble-2020-08-01.normal.json service model. - */ -using System; -using System.Collections.Generic; -using System.Globalization; -using System.IO; -using System.Net; -using System.Text; -using System.Xml.Serialization; - -using Amazon.NimbleStudio.Model; -using Amazon.Runtime; -using Amazon.Runtime.Internal; -using Amazon.Runtime.Internal.Transform; -using Amazon.Runtime.Internal.Util; -using ThirdParty.Json.LitJson; - -#pragma warning disable CS0612,CS0618 -namespace Amazon.NimbleStudio.Model.Internal.MarshallTransformations -{ - /// - /// Response Unmarshaller for StreamingSessionStream Object - /// - public class StreamingSessionStreamUnmarshaller : IUnmarshaller, IUnmarshaller - { - /// - /// Unmarshaller the response from the service to the response class. - /// - /// - /// - StreamingSessionStream IUnmarshaller.Unmarshall(XmlUnmarshallerContext context) - { - throw new NotImplementedException(); - } - - /// - /// Unmarshaller the response from the service to the response class. - /// - /// - /// The unmarshalled object - public StreamingSessionStream Unmarshall(JsonUnmarshallerContext context) - { - StreamingSessionStream unmarshalledObject = new StreamingSessionStream(); - if (context.IsEmptyResponse) - return null; - context.Read(); - if (context.CurrentTokenType == JsonToken.Null) - return null; - - int targetDepth = context.CurrentDepth; - while (context.ReadAtDepth(targetDepth)) - { - if (context.TestExpression("createdAt", targetDepth)) - { - var unmarshaller = NullableDateTimeUnmarshaller.Instance; - unmarshalledObject.CreatedAt = unmarshaller.Unmarshall(context); - continue; - } - if (context.TestExpression("createdBy", targetDepth)) - { - var unmarshaller = StringUnmarshaller.Instance; - unmarshalledObject.CreatedBy = unmarshaller.Unmarshall(context); - continue; - } - if (context.TestExpression("expiresAt", targetDepth)) - { - var unmarshaller = NullableDateTimeUnmarshaller.Instance; - unmarshalledObject.ExpiresAt = unmarshaller.Unmarshall(context); - continue; - } - if (context.TestExpression("ownedBy", targetDepth)) - { - var unmarshaller = StringUnmarshaller.Instance; - unmarshalledObject.OwnedBy = unmarshaller.Unmarshall(context); - continue; - } - if (context.TestExpression("state", targetDepth)) - { - var unmarshaller = StringUnmarshaller.Instance; - unmarshalledObject.State = unmarshaller.Unmarshall(context); - continue; - } - if (context.TestExpression("statusCode", targetDepth)) - { - var unmarshaller = StringUnmarshaller.Instance; - unmarshalledObject.StatusCode = unmarshaller.Unmarshall(context); - continue; - } - if (context.TestExpression("streamId", targetDepth)) - { - var unmarshaller = StringUnmarshaller.Instance; - unmarshalledObject.StreamId = unmarshaller.Unmarshall(context); - continue; - } - if (context.TestExpression("url", targetDepth)) - { - var unmarshaller = StringUnmarshaller.Instance; - unmarshalledObject.Url = unmarshaller.Unmarshall(context); - continue; - } - } - return unmarshalledObject; - } - - - private static StreamingSessionStreamUnmarshaller _instance = new StreamingSessionStreamUnmarshaller(); - - /// - /// Gets the singleton. - /// - public static StreamingSessionStreamUnmarshaller Instance - { - get - { - return _instance; - } - } - } -} \ No newline at end of file diff --git a/sdk/src/Services/NimbleStudio/Generated/Model/Internal/MarshallTransformations/StreamingSessionUnmarshaller.cs b/sdk/src/Services/NimbleStudio/Generated/Model/Internal/MarshallTransformations/StreamingSessionUnmarshaller.cs deleted file mode 100644 index 1c2d91689813..000000000000 --- a/sdk/src/Services/NimbleStudio/Generated/Model/Internal/MarshallTransformations/StreamingSessionUnmarshaller.cs +++ /dev/null @@ -1,249 +0,0 @@ -/* - * 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. - */ - -/* - * Do not modify this file. This file is generated from the nimble-2020-08-01.normal.json service model. - */ -using System; -using System.Collections.Generic; -using System.Globalization; -using System.IO; -using System.Net; -using System.Text; -using System.Xml.Serialization; - -using Amazon.NimbleStudio.Model; -using Amazon.Runtime; -using Amazon.Runtime.Internal; -using Amazon.Runtime.Internal.Transform; -using Amazon.Runtime.Internal.Util; -using ThirdParty.Json.LitJson; - -#pragma warning disable CS0612,CS0618 -namespace Amazon.NimbleStudio.Model.Internal.MarshallTransformations -{ - /// - /// Response Unmarshaller for StreamingSession Object - /// - public class StreamingSessionUnmarshaller : IUnmarshaller, IUnmarshaller - { - /// - /// Unmarshaller the response from the service to the response class. - /// - /// - /// - StreamingSession IUnmarshaller.Unmarshall(XmlUnmarshallerContext context) - { - throw new NotImplementedException(); - } - - /// - /// Unmarshaller the response from the service to the response class. - /// - /// - /// The unmarshalled object - public StreamingSession Unmarshall(JsonUnmarshallerContext context) - { - StreamingSession unmarshalledObject = new StreamingSession(); - if (context.IsEmptyResponse) - return null; - context.Read(); - if (context.CurrentTokenType == JsonToken.Null) - return null; - - int targetDepth = context.CurrentDepth; - while (context.ReadAtDepth(targetDepth)) - { - if (context.TestExpression("arn", targetDepth)) - { - var unmarshaller = StringUnmarshaller.Instance; - unmarshalledObject.Arn = unmarshaller.Unmarshall(context); - continue; - } - if (context.TestExpression("automaticTerminationMode", targetDepth)) - { - var unmarshaller = StringUnmarshaller.Instance; - unmarshalledObject.AutomaticTerminationMode = unmarshaller.Unmarshall(context); - continue; - } - if (context.TestExpression("backupMode", targetDepth)) - { - var unmarshaller = StringUnmarshaller.Instance; - unmarshalledObject.BackupMode = unmarshaller.Unmarshall(context); - continue; - } - if (context.TestExpression("createdAt", targetDepth)) - { - var unmarshaller = NullableDateTimeUnmarshaller.Instance; - unmarshalledObject.CreatedAt = unmarshaller.Unmarshall(context); - continue; - } - if (context.TestExpression("createdBy", targetDepth)) - { - var unmarshaller = StringUnmarshaller.Instance; - unmarshalledObject.CreatedBy = unmarshaller.Unmarshall(context); - continue; - } - if (context.TestExpression("ec2InstanceType", targetDepth)) - { - var unmarshaller = StringUnmarshaller.Instance; - unmarshalledObject.Ec2InstanceType = unmarshaller.Unmarshall(context); - continue; - } - if (context.TestExpression("launchProfileId", targetDepth)) - { - var unmarshaller = StringUnmarshaller.Instance; - unmarshalledObject.LaunchProfileId = unmarshaller.Unmarshall(context); - continue; - } - if (context.TestExpression("maxBackupsToRetain", targetDepth)) - { - var unmarshaller = NullableIntUnmarshaller.Instance; - unmarshalledObject.MaxBackupsToRetain = unmarshaller.Unmarshall(context); - continue; - } - if (context.TestExpression("ownedBy", targetDepth)) - { - var unmarshaller = StringUnmarshaller.Instance; - unmarshalledObject.OwnedBy = unmarshaller.Unmarshall(context); - continue; - } - if (context.TestExpression("sessionId", targetDepth)) - { - var unmarshaller = StringUnmarshaller.Instance; - unmarshalledObject.SessionId = unmarshaller.Unmarshall(context); - continue; - } - if (context.TestExpression("sessionPersistenceMode", targetDepth)) - { - var unmarshaller = StringUnmarshaller.Instance; - unmarshalledObject.SessionPersistenceMode = unmarshaller.Unmarshall(context); - continue; - } - if (context.TestExpression("startedAt", targetDepth)) - { - var unmarshaller = NullableDateTimeUnmarshaller.Instance; - unmarshalledObject.StartedAt = unmarshaller.Unmarshall(context); - continue; - } - if (context.TestExpression("startedBy", targetDepth)) - { - var unmarshaller = StringUnmarshaller.Instance; - unmarshalledObject.StartedBy = unmarshaller.Unmarshall(context); - continue; - } - if (context.TestExpression("startedFromBackupId", targetDepth)) - { - var unmarshaller = StringUnmarshaller.Instance; - unmarshalledObject.StartedFromBackupId = unmarshaller.Unmarshall(context); - continue; - } - if (context.TestExpression("state", targetDepth)) - { - var unmarshaller = StringUnmarshaller.Instance; - unmarshalledObject.State = unmarshaller.Unmarshall(context); - continue; - } - if (context.TestExpression("statusCode", targetDepth)) - { - var unmarshaller = StringUnmarshaller.Instance; - unmarshalledObject.StatusCode = unmarshaller.Unmarshall(context); - continue; - } - if (context.TestExpression("statusMessage", targetDepth)) - { - var unmarshaller = StringUnmarshaller.Instance; - unmarshalledObject.StatusMessage = unmarshaller.Unmarshall(context); - continue; - } - if (context.TestExpression("stopAt", targetDepth)) - { - var unmarshaller = NullableDateTimeUnmarshaller.Instance; - unmarshalledObject.StopAt = unmarshaller.Unmarshall(context); - continue; - } - if (context.TestExpression("stoppedAt", targetDepth)) - { - var unmarshaller = NullableDateTimeUnmarshaller.Instance; - unmarshalledObject.StoppedAt = unmarshaller.Unmarshall(context); - continue; - } - if (context.TestExpression("stoppedBy", targetDepth)) - { - var unmarshaller = StringUnmarshaller.Instance; - unmarshalledObject.StoppedBy = unmarshaller.Unmarshall(context); - continue; - } - if (context.TestExpression("streamingImageId", targetDepth)) - { - var unmarshaller = StringUnmarshaller.Instance; - unmarshalledObject.StreamingImageId = unmarshaller.Unmarshall(context); - continue; - } - if (context.TestExpression("tags", targetDepth)) - { - var unmarshaller = new DictionaryUnmarshaller(StringUnmarshaller.Instance, StringUnmarshaller.Instance); - unmarshalledObject.Tags = unmarshaller.Unmarshall(context); - continue; - } - if (context.TestExpression("terminateAt", targetDepth)) - { - var unmarshaller = NullableDateTimeUnmarshaller.Instance; - unmarshalledObject.TerminateAt = unmarshaller.Unmarshall(context); - continue; - } - if (context.TestExpression("updatedAt", targetDepth)) - { - var unmarshaller = NullableDateTimeUnmarshaller.Instance; - unmarshalledObject.UpdatedAt = unmarshaller.Unmarshall(context); - continue; - } - if (context.TestExpression("updatedBy", targetDepth)) - { - var unmarshaller = StringUnmarshaller.Instance; - unmarshalledObject.UpdatedBy = unmarshaller.Unmarshall(context); - continue; - } - if (context.TestExpression("volumeConfiguration", targetDepth)) - { - var unmarshaller = VolumeConfigurationUnmarshaller.Instance; - unmarshalledObject.VolumeConfiguration = unmarshaller.Unmarshall(context); - continue; - } - if (context.TestExpression("volumeRetentionMode", targetDepth)) - { - var unmarshaller = StringUnmarshaller.Instance; - unmarshalledObject.VolumeRetentionMode = unmarshaller.Unmarshall(context); - continue; - } - } - return unmarshalledObject; - } - - - private static StreamingSessionUnmarshaller _instance = new StreamingSessionUnmarshaller(); - - /// - /// Gets the singleton. - /// - public static StreamingSessionUnmarshaller Instance - { - get - { - return _instance; - } - } - } -} \ No newline at end of file diff --git a/sdk/src/Services/NimbleStudio/Generated/Model/Internal/MarshallTransformations/StudioComponentSummaryUnmarshaller.cs b/sdk/src/Services/NimbleStudio/Generated/Model/Internal/MarshallTransformations/StudioComponentSummaryUnmarshaller.cs deleted file mode 100644 index be088b30442f..000000000000 --- a/sdk/src/Services/NimbleStudio/Generated/Model/Internal/MarshallTransformations/StudioComponentSummaryUnmarshaller.cs +++ /dev/null @@ -1,141 +0,0 @@ -/* - * 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. - */ - -/* - * Do not modify this file. This file is generated from the nimble-2020-08-01.normal.json service model. - */ -using System; -using System.Collections.Generic; -using System.Globalization; -using System.IO; -using System.Net; -using System.Text; -using System.Xml.Serialization; - -using Amazon.NimbleStudio.Model; -using Amazon.Runtime; -using Amazon.Runtime.Internal; -using Amazon.Runtime.Internal.Transform; -using Amazon.Runtime.Internal.Util; -using ThirdParty.Json.LitJson; - -#pragma warning disable CS0612,CS0618 -namespace Amazon.NimbleStudio.Model.Internal.MarshallTransformations -{ - /// - /// Response Unmarshaller for StudioComponentSummary Object - /// - public class StudioComponentSummaryUnmarshaller : IUnmarshaller, IUnmarshaller - { - /// - /// Unmarshaller the response from the service to the response class. - /// - /// - /// - StudioComponentSummary IUnmarshaller.Unmarshall(XmlUnmarshallerContext context) - { - throw new NotImplementedException(); - } - - /// - /// Unmarshaller the response from the service to the response class. - /// - /// - /// The unmarshalled object - public StudioComponentSummary Unmarshall(JsonUnmarshallerContext context) - { - StudioComponentSummary unmarshalledObject = new StudioComponentSummary(); - if (context.IsEmptyResponse) - return null; - context.Read(); - if (context.CurrentTokenType == JsonToken.Null) - return null; - - int targetDepth = context.CurrentDepth; - while (context.ReadAtDepth(targetDepth)) - { - if (context.TestExpression("createdAt", targetDepth)) - { - var unmarshaller = NullableDateTimeUnmarshaller.Instance; - unmarshalledObject.CreatedAt = unmarshaller.Unmarshall(context); - continue; - } - if (context.TestExpression("createdBy", targetDepth)) - { - var unmarshaller = StringUnmarshaller.Instance; - unmarshalledObject.CreatedBy = unmarshaller.Unmarshall(context); - continue; - } - if (context.TestExpression("description", targetDepth)) - { - var unmarshaller = StringUnmarshaller.Instance; - unmarshalledObject.Description = unmarshaller.Unmarshall(context); - continue; - } - if (context.TestExpression("name", targetDepth)) - { - var unmarshaller = StringUnmarshaller.Instance; - unmarshalledObject.Name = unmarshaller.Unmarshall(context); - continue; - } - if (context.TestExpression("studioComponentId", targetDepth)) - { - var unmarshaller = StringUnmarshaller.Instance; - unmarshalledObject.StudioComponentId = unmarshaller.Unmarshall(context); - continue; - } - if (context.TestExpression("subtype", targetDepth)) - { - var unmarshaller = StringUnmarshaller.Instance; - unmarshalledObject.Subtype = unmarshaller.Unmarshall(context); - continue; - } - if (context.TestExpression("type", targetDepth)) - { - var unmarshaller = StringUnmarshaller.Instance; - unmarshalledObject.Type = unmarshaller.Unmarshall(context); - continue; - } - if (context.TestExpression("updatedAt", targetDepth)) - { - var unmarshaller = NullableDateTimeUnmarshaller.Instance; - unmarshalledObject.UpdatedAt = unmarshaller.Unmarshall(context); - continue; - } - if (context.TestExpression("updatedBy", targetDepth)) - { - var unmarshaller = StringUnmarshaller.Instance; - unmarshalledObject.UpdatedBy = unmarshaller.Unmarshall(context); - continue; - } - } - return unmarshalledObject; - } - - - private static StudioComponentSummaryUnmarshaller _instance = new StudioComponentSummaryUnmarshaller(); - - /// - /// Gets the singleton. - /// - public static StudioComponentSummaryUnmarshaller Instance - { - get - { - return _instance; - } - } - } -} \ No newline at end of file diff --git a/sdk/src/Services/NimbleStudio/Generated/Model/Internal/MarshallTransformations/StudioComponentUnmarshaller.cs b/sdk/src/Services/NimbleStudio/Generated/Model/Internal/MarshallTransformations/StudioComponentUnmarshaller.cs deleted file mode 100644 index 8304e7486870..000000000000 --- a/sdk/src/Services/NimbleStudio/Generated/Model/Internal/MarshallTransformations/StudioComponentUnmarshaller.cs +++ /dev/null @@ -1,207 +0,0 @@ -/* - * 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. - */ - -/* - * Do not modify this file. This file is generated from the nimble-2020-08-01.normal.json service model. - */ -using System; -using System.Collections.Generic; -using System.Globalization; -using System.IO; -using System.Net; -using System.Text; -using System.Xml.Serialization; - -using Amazon.NimbleStudio.Model; -using Amazon.Runtime; -using Amazon.Runtime.Internal; -using Amazon.Runtime.Internal.Transform; -using Amazon.Runtime.Internal.Util; -using ThirdParty.Json.LitJson; - -#pragma warning disable CS0612,CS0618 -namespace Amazon.NimbleStudio.Model.Internal.MarshallTransformations -{ - /// - /// Response Unmarshaller for StudioComponent Object - /// - public class StudioComponentUnmarshaller : IUnmarshaller, IUnmarshaller - { - /// - /// Unmarshaller the response from the service to the response class. - /// - /// - /// - StudioComponent IUnmarshaller.Unmarshall(XmlUnmarshallerContext context) - { - throw new NotImplementedException(); - } - - /// - /// Unmarshaller the response from the service to the response class. - /// - /// - /// The unmarshalled object - public StudioComponent Unmarshall(JsonUnmarshallerContext context) - { - StudioComponent unmarshalledObject = new StudioComponent(); - if (context.IsEmptyResponse) - return null; - context.Read(); - if (context.CurrentTokenType == JsonToken.Null) - return null; - - int targetDepth = context.CurrentDepth; - while (context.ReadAtDepth(targetDepth)) - { - if (context.TestExpression("arn", targetDepth)) - { - var unmarshaller = StringUnmarshaller.Instance; - unmarshalledObject.Arn = unmarshaller.Unmarshall(context); - continue; - } - if (context.TestExpression("configuration", targetDepth)) - { - var unmarshaller = StudioComponentConfigurationUnmarshaller.Instance; - unmarshalledObject.Configuration = unmarshaller.Unmarshall(context); - continue; - } - if (context.TestExpression("createdAt", targetDepth)) - { - var unmarshaller = NullableDateTimeUnmarshaller.Instance; - unmarshalledObject.CreatedAt = unmarshaller.Unmarshall(context); - continue; - } - if (context.TestExpression("createdBy", targetDepth)) - { - var unmarshaller = StringUnmarshaller.Instance; - unmarshalledObject.CreatedBy = unmarshaller.Unmarshall(context); - continue; - } - if (context.TestExpression("description", targetDepth)) - { - var unmarshaller = StringUnmarshaller.Instance; - unmarshalledObject.Description = unmarshaller.Unmarshall(context); - continue; - } - if (context.TestExpression("ec2SecurityGroupIds", targetDepth)) - { - var unmarshaller = new ListUnmarshaller(StringUnmarshaller.Instance); - unmarshalledObject.Ec2SecurityGroupIds = unmarshaller.Unmarshall(context); - continue; - } - if (context.TestExpression("initializationScripts", targetDepth)) - { - var unmarshaller = new ListUnmarshaller(StudioComponentInitializationScriptUnmarshaller.Instance); - unmarshalledObject.InitializationScripts = unmarshaller.Unmarshall(context); - continue; - } - if (context.TestExpression("name", targetDepth)) - { - var unmarshaller = StringUnmarshaller.Instance; - unmarshalledObject.Name = unmarshaller.Unmarshall(context); - continue; - } - if (context.TestExpression("runtimeRoleArn", targetDepth)) - { - var unmarshaller = StringUnmarshaller.Instance; - unmarshalledObject.RuntimeRoleArn = unmarshaller.Unmarshall(context); - continue; - } - if (context.TestExpression("scriptParameters", targetDepth)) - { - var unmarshaller = new ListUnmarshaller(ScriptParameterKeyValueUnmarshaller.Instance); - unmarshalledObject.ScriptParameters = unmarshaller.Unmarshall(context); - continue; - } - if (context.TestExpression("secureInitializationRoleArn", targetDepth)) - { - var unmarshaller = StringUnmarshaller.Instance; - unmarshalledObject.SecureInitializationRoleArn = unmarshaller.Unmarshall(context); - continue; - } - if (context.TestExpression("state", targetDepth)) - { - var unmarshaller = StringUnmarshaller.Instance; - unmarshalledObject.State = unmarshaller.Unmarshall(context); - continue; - } - if (context.TestExpression("statusCode", targetDepth)) - { - var unmarshaller = StringUnmarshaller.Instance; - unmarshalledObject.StatusCode = unmarshaller.Unmarshall(context); - continue; - } - if (context.TestExpression("statusMessage", targetDepth)) - { - var unmarshaller = StringUnmarshaller.Instance; - unmarshalledObject.StatusMessage = unmarshaller.Unmarshall(context); - continue; - } - if (context.TestExpression("studioComponentId", targetDepth)) - { - var unmarshaller = StringUnmarshaller.Instance; - unmarshalledObject.StudioComponentId = unmarshaller.Unmarshall(context); - continue; - } - if (context.TestExpression("subtype", targetDepth)) - { - var unmarshaller = StringUnmarshaller.Instance; - unmarshalledObject.Subtype = unmarshaller.Unmarshall(context); - continue; - } - if (context.TestExpression("tags", targetDepth)) - { - var unmarshaller = new DictionaryUnmarshaller(StringUnmarshaller.Instance, StringUnmarshaller.Instance); - unmarshalledObject.Tags = unmarshaller.Unmarshall(context); - continue; - } - if (context.TestExpression("type", targetDepth)) - { - var unmarshaller = StringUnmarshaller.Instance; - unmarshalledObject.Type = unmarshaller.Unmarshall(context); - continue; - } - if (context.TestExpression("updatedAt", targetDepth)) - { - var unmarshaller = NullableDateTimeUnmarshaller.Instance; - unmarshalledObject.UpdatedAt = unmarshaller.Unmarshall(context); - continue; - } - if (context.TestExpression("updatedBy", targetDepth)) - { - var unmarshaller = StringUnmarshaller.Instance; - unmarshalledObject.UpdatedBy = unmarshaller.Unmarshall(context); - continue; - } - } - return unmarshalledObject; - } - - - private static StudioComponentUnmarshaller _instance = new StudioComponentUnmarshaller(); - - /// - /// Gets the singleton. - /// - public static StudioComponentUnmarshaller Instance - { - get - { - return _instance; - } - } - } -} \ No newline at end of file diff --git a/sdk/src/Services/NimbleStudio/Generated/Model/Internal/MarshallTransformations/StudioUnmarshaller.cs b/sdk/src/Services/NimbleStudio/Generated/Model/Internal/MarshallTransformations/StudioUnmarshaller.cs deleted file mode 100644 index 17e16dba1fdc..000000000000 --- a/sdk/src/Services/NimbleStudio/Generated/Model/Internal/MarshallTransformations/StudioUnmarshaller.cs +++ /dev/null @@ -1,183 +0,0 @@ -/* - * 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. - */ - -/* - * Do not modify this file. This file is generated from the nimble-2020-08-01.normal.json service model. - */ -using System; -using System.Collections.Generic; -using System.Globalization; -using System.IO; -using System.Net; -using System.Text; -using System.Xml.Serialization; - -using Amazon.NimbleStudio.Model; -using Amazon.Runtime; -using Amazon.Runtime.Internal; -using Amazon.Runtime.Internal.Transform; -using Amazon.Runtime.Internal.Util; -using ThirdParty.Json.LitJson; - -#pragma warning disable CS0612,CS0618 -namespace Amazon.NimbleStudio.Model.Internal.MarshallTransformations -{ - /// - /// Response Unmarshaller for Studio Object - /// - public class StudioUnmarshaller : IUnmarshaller, IUnmarshaller - { - /// - /// Unmarshaller the response from the service to the response class. - /// - /// - /// - Studio IUnmarshaller.Unmarshall(XmlUnmarshallerContext context) - { - throw new NotImplementedException(); - } - - /// - /// Unmarshaller the response from the service to the response class. - /// - /// - /// The unmarshalled object - public Studio Unmarshall(JsonUnmarshallerContext context) - { - Studio unmarshalledObject = new Studio(); - if (context.IsEmptyResponse) - return null; - context.Read(); - if (context.CurrentTokenType == JsonToken.Null) - return null; - - int targetDepth = context.CurrentDepth; - while (context.ReadAtDepth(targetDepth)) - { - if (context.TestExpression("adminRoleArn", targetDepth)) - { - var unmarshaller = StringUnmarshaller.Instance; - unmarshalledObject.AdminRoleArn = unmarshaller.Unmarshall(context); - continue; - } - if (context.TestExpression("arn", targetDepth)) - { - var unmarshaller = StringUnmarshaller.Instance; - unmarshalledObject.Arn = unmarshaller.Unmarshall(context); - continue; - } - if (context.TestExpression("createdAt", targetDepth)) - { - var unmarshaller = NullableDateTimeUnmarshaller.Instance; - unmarshalledObject.CreatedAt = unmarshaller.Unmarshall(context); - continue; - } - if (context.TestExpression("displayName", targetDepth)) - { - var unmarshaller = StringUnmarshaller.Instance; - unmarshalledObject.DisplayName = unmarshaller.Unmarshall(context); - continue; - } - if (context.TestExpression("homeRegion", targetDepth)) - { - var unmarshaller = StringUnmarshaller.Instance; - unmarshalledObject.HomeRegion = unmarshaller.Unmarshall(context); - continue; - } - if (context.TestExpression("ssoClientId", targetDepth)) - { - var unmarshaller = StringUnmarshaller.Instance; - unmarshalledObject.SsoClientId = unmarshaller.Unmarshall(context); - continue; - } - if (context.TestExpression("state", targetDepth)) - { - var unmarshaller = StringUnmarshaller.Instance; - unmarshalledObject.State = unmarshaller.Unmarshall(context); - continue; - } - if (context.TestExpression("statusCode", targetDepth)) - { - var unmarshaller = StringUnmarshaller.Instance; - unmarshalledObject.StatusCode = unmarshaller.Unmarshall(context); - continue; - } - if (context.TestExpression("statusMessage", targetDepth)) - { - var unmarshaller = StringUnmarshaller.Instance; - unmarshalledObject.StatusMessage = unmarshaller.Unmarshall(context); - continue; - } - if (context.TestExpression("studioEncryptionConfiguration", targetDepth)) - { - var unmarshaller = StudioEncryptionConfigurationUnmarshaller.Instance; - unmarshalledObject.StudioEncryptionConfiguration = unmarshaller.Unmarshall(context); - continue; - } - if (context.TestExpression("studioId", targetDepth)) - { - var unmarshaller = StringUnmarshaller.Instance; - unmarshalledObject.StudioId = unmarshaller.Unmarshall(context); - continue; - } - if (context.TestExpression("studioName", targetDepth)) - { - var unmarshaller = StringUnmarshaller.Instance; - unmarshalledObject.StudioName = unmarshaller.Unmarshall(context); - continue; - } - if (context.TestExpression("studioUrl", targetDepth)) - { - var unmarshaller = StringUnmarshaller.Instance; - unmarshalledObject.StudioUrl = unmarshaller.Unmarshall(context); - continue; - } - if (context.TestExpression("tags", targetDepth)) - { - var unmarshaller = new DictionaryUnmarshaller(StringUnmarshaller.Instance, StringUnmarshaller.Instance); - unmarshalledObject.Tags = unmarshaller.Unmarshall(context); - continue; - } - if (context.TestExpression("updatedAt", targetDepth)) - { - var unmarshaller = NullableDateTimeUnmarshaller.Instance; - unmarshalledObject.UpdatedAt = unmarshaller.Unmarshall(context); - continue; - } - if (context.TestExpression("userRoleArn", targetDepth)) - { - var unmarshaller = StringUnmarshaller.Instance; - unmarshalledObject.UserRoleArn = unmarshaller.Unmarshall(context); - continue; - } - } - return unmarshalledObject; - } - - - private static StudioUnmarshaller _instance = new StudioUnmarshaller(); - - /// - /// Gets the singleton. - /// - public static StudioUnmarshaller Instance - { - get - { - return _instance; - } - } - } -} \ No newline at end of file diff --git a/sdk/src/Services/NimbleStudio/Generated/Model/Internal/MarshallTransformations/TagResourceRequestMarshaller.cs b/sdk/src/Services/NimbleStudio/Generated/Model/Internal/MarshallTransformations/TagResourceRequestMarshaller.cs deleted file mode 100644 index bd94e3df4fc8..000000000000 --- a/sdk/src/Services/NimbleStudio/Generated/Model/Internal/MarshallTransformations/TagResourceRequestMarshaller.cs +++ /dev/null @@ -1,117 +0,0 @@ -/* - * 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. - */ - -/* - * Do not modify this file. This file is generated from the nimble-2020-08-01.normal.json service model. - */ -using System; -using System.Collections.Generic; -using System.Globalization; -using System.IO; -using System.Text; -using System.Xml.Serialization; - -using Amazon.NimbleStudio.Model; -using Amazon.Runtime; -using Amazon.Runtime.Internal; -using Amazon.Runtime.Internal.Transform; -using Amazon.Runtime.Internal.Util; -using ThirdParty.Json.LitJson; - -#pragma warning disable CS0612,CS0618 -namespace Amazon.NimbleStudio.Model.Internal.MarshallTransformations -{ - /// - /// TagResource Request Marshaller - /// - public class TagResourceRequestMarshaller : IMarshaller , IMarshaller - { - /// - /// Marshaller the request object to the HTTP request. - /// - /// - /// - public IRequest Marshall(AmazonWebServiceRequest input) - { - return this.Marshall((TagResourceRequest)input); - } - - /// - /// Marshaller the request object to the HTTP request. - /// - /// - /// - public IRequest Marshall(TagResourceRequest publicRequest) - { - IRequest request = new DefaultRequest(publicRequest, "Amazon.NimbleStudio"); - request.Headers["Content-Type"] = "application/json"; - request.Headers[Amazon.Util.HeaderKeys.XAmzApiVersion] = "2020-08-01"; - request.HttpMethod = "POST"; - - if (!publicRequest.IsSetResourceArn()) - throw new AmazonNimbleStudioException("Request object does not have required field ResourceArn set"); - request.AddPathResource("{resourceArn}", StringUtils.FromString(publicRequest.ResourceArn)); - request.ResourcePath = "/2020-08-01/tags/{resourceArn}"; - using (MemoryStream memoryStream = new MemoryStream()) - { - using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) - { - JsonWriter writer = new JsonWriter(streamWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetTags()) - { - context.Writer.WritePropertyName("tags"); - context.Writer.WriteObjectStart(); - foreach (var publicRequestTagsKvp in publicRequest.Tags) - { - context.Writer.WritePropertyName(publicRequestTagsKvp.Key); - var publicRequestTagsValue = publicRequestTagsKvp.Value; - - context.Writer.Write(publicRequestTagsValue); - } - context.Writer.WriteObjectEnd(); - } - - writer.WriteObjectEnd(); - } - - request.Content = memoryStream.ToArray(); - } - - - return request; - } - private static TagResourceRequestMarshaller _instance = new TagResourceRequestMarshaller(); - - internal static TagResourceRequestMarshaller GetInstance() - { - return _instance; - } - - /// - /// Gets the singleton. - /// - public static TagResourceRequestMarshaller Instance - { - get - { - return _instance; - } - } - - } -} \ No newline at end of file diff --git a/sdk/src/Services/NimbleStudio/Generated/Model/Internal/MarshallTransformations/UpdateLaunchProfileMemberRequestMarshaller.cs b/sdk/src/Services/NimbleStudio/Generated/Model/Internal/MarshallTransformations/UpdateLaunchProfileMemberRequestMarshaller.cs deleted file mode 100644 index f42a2a6f03e0..000000000000 --- a/sdk/src/Services/NimbleStudio/Generated/Model/Internal/MarshallTransformations/UpdateLaunchProfileMemberRequestMarshaller.cs +++ /dev/null @@ -1,120 +0,0 @@ -/* - * 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. - */ - -/* - * Do not modify this file. This file is generated from the nimble-2020-08-01.normal.json service model. - */ -using System; -using System.Collections.Generic; -using System.Globalization; -using System.IO; -using System.Text; -using System.Xml.Serialization; - -using Amazon.NimbleStudio.Model; -using Amazon.Runtime; -using Amazon.Runtime.Internal; -using Amazon.Runtime.Internal.Transform; -using Amazon.Runtime.Internal.Util; -using ThirdParty.Json.LitJson; - -#pragma warning disable CS0612,CS0618 -namespace Amazon.NimbleStudio.Model.Internal.MarshallTransformations -{ - /// - /// UpdateLaunchProfileMember Request Marshaller - /// - public class UpdateLaunchProfileMemberRequestMarshaller : IMarshaller , IMarshaller - { - /// - /// Marshaller the request object to the HTTP request. - /// - /// - /// - public IRequest Marshall(AmazonWebServiceRequest input) - { - return this.Marshall((UpdateLaunchProfileMemberRequest)input); - } - - /// - /// Marshaller the request object to the HTTP request. - /// - /// - /// - public IRequest Marshall(UpdateLaunchProfileMemberRequest publicRequest) - { - IRequest request = new DefaultRequest(publicRequest, "Amazon.NimbleStudio"); - request.Headers["Content-Type"] = "application/json"; - request.Headers[Amazon.Util.HeaderKeys.XAmzApiVersion] = "2020-08-01"; - request.HttpMethod = "PATCH"; - - if (!publicRequest.IsSetLaunchProfileId()) - throw new AmazonNimbleStudioException("Request object does not have required field LaunchProfileId set"); - request.AddPathResource("{launchProfileId}", StringUtils.FromString(publicRequest.LaunchProfileId)); - if (!publicRequest.IsSetPrincipalId()) - throw new AmazonNimbleStudioException("Request object does not have required field PrincipalId set"); - request.AddPathResource("{principalId}", StringUtils.FromString(publicRequest.PrincipalId)); - if (!publicRequest.IsSetStudioId()) - throw new AmazonNimbleStudioException("Request object does not have required field StudioId set"); - request.AddPathResource("{studioId}", StringUtils.FromString(publicRequest.StudioId)); - request.ResourcePath = "/2020-08-01/studios/{studioId}/launch-profiles/{launchProfileId}/membership/{principalId}"; - using (MemoryStream memoryStream = new MemoryStream()) - { - using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) - { - JsonWriter writer = new JsonWriter(streamWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetPersona()) - { - context.Writer.WritePropertyName("persona"); - context.Writer.Write(publicRequest.Persona); - } - - writer.WriteObjectEnd(); - } - - request.Content = memoryStream.ToArray(); - } - - - if (publicRequest.IsSetClientToken()) - { - request.Headers["X-Amz-Client-Token"] = publicRequest.ClientToken; - } - - return request; - } - private static UpdateLaunchProfileMemberRequestMarshaller _instance = new UpdateLaunchProfileMemberRequestMarshaller(); - - internal static UpdateLaunchProfileMemberRequestMarshaller GetInstance() - { - return _instance; - } - - /// - /// Gets the singleton. - /// - public static UpdateLaunchProfileMemberRequestMarshaller Instance - { - get - { - return _instance; - } - } - - } -} \ No newline at end of file diff --git a/sdk/src/Services/NimbleStudio/Generated/Model/Internal/MarshallTransformations/UpdateLaunchProfileRequestMarshaller.cs b/sdk/src/Services/NimbleStudio/Generated/Model/Internal/MarshallTransformations/UpdateLaunchProfileRequestMarshaller.cs deleted file mode 100644 index 7bc17d7899fd..000000000000 --- a/sdk/src/Services/NimbleStudio/Generated/Model/Internal/MarshallTransformations/UpdateLaunchProfileRequestMarshaller.cs +++ /dev/null @@ -1,156 +0,0 @@ -/* - * 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. - */ - -/* - * Do not modify this file. This file is generated from the nimble-2020-08-01.normal.json service model. - */ -using System; -using System.Collections.Generic; -using System.Globalization; -using System.IO; -using System.Text; -using System.Xml.Serialization; - -using Amazon.NimbleStudio.Model; -using Amazon.Runtime; -using Amazon.Runtime.Internal; -using Amazon.Runtime.Internal.Transform; -using Amazon.Runtime.Internal.Util; -using ThirdParty.Json.LitJson; - -#pragma warning disable CS0612,CS0618 -namespace Amazon.NimbleStudio.Model.Internal.MarshallTransformations -{ - /// - /// UpdateLaunchProfile Request Marshaller - /// - public class UpdateLaunchProfileRequestMarshaller : IMarshaller , IMarshaller - { - /// - /// Marshaller the request object to the HTTP request. - /// - /// - /// - public IRequest Marshall(AmazonWebServiceRequest input) - { - return this.Marshall((UpdateLaunchProfileRequest)input); - } - - /// - /// Marshaller the request object to the HTTP request. - /// - /// - /// - public IRequest Marshall(UpdateLaunchProfileRequest publicRequest) - { - IRequest request = new DefaultRequest(publicRequest, "Amazon.NimbleStudio"); - request.Headers["Content-Type"] = "application/json"; - request.Headers[Amazon.Util.HeaderKeys.XAmzApiVersion] = "2020-08-01"; - request.HttpMethod = "PATCH"; - - if (!publicRequest.IsSetLaunchProfileId()) - throw new AmazonNimbleStudioException("Request object does not have required field LaunchProfileId set"); - request.AddPathResource("{launchProfileId}", StringUtils.FromString(publicRequest.LaunchProfileId)); - if (!publicRequest.IsSetStudioId()) - throw new AmazonNimbleStudioException("Request object does not have required field StudioId set"); - request.AddPathResource("{studioId}", StringUtils.FromString(publicRequest.StudioId)); - request.ResourcePath = "/2020-08-01/studios/{studioId}/launch-profiles/{launchProfileId}"; - using (MemoryStream memoryStream = new MemoryStream()) - { - using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) - { - JsonWriter writer = new JsonWriter(streamWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetDescription()) - { - context.Writer.WritePropertyName("description"); - context.Writer.Write(publicRequest.Description); - } - - if(publicRequest.IsSetLaunchProfileProtocolVersions()) - { - context.Writer.WritePropertyName("launchProfileProtocolVersions"); - context.Writer.WriteArrayStart(); - foreach(var publicRequestLaunchProfileProtocolVersionsListValue in publicRequest.LaunchProfileProtocolVersions) - { - context.Writer.Write(publicRequestLaunchProfileProtocolVersionsListValue); - } - context.Writer.WriteArrayEnd(); - } - - if(publicRequest.IsSetName()) - { - context.Writer.WritePropertyName("name"); - context.Writer.Write(publicRequest.Name); - } - - if(publicRequest.IsSetStreamConfiguration()) - { - context.Writer.WritePropertyName("streamConfiguration"); - context.Writer.WriteObjectStart(); - - var marshaller = StreamConfigurationCreateMarshaller.Instance; - marshaller.Marshall(publicRequest.StreamConfiguration, context); - - context.Writer.WriteObjectEnd(); - } - - if(publicRequest.IsSetStudioComponentIds()) - { - context.Writer.WritePropertyName("studioComponentIds"); - context.Writer.WriteArrayStart(); - foreach(var publicRequestStudioComponentIdsListValue in publicRequest.StudioComponentIds) - { - context.Writer.Write(publicRequestStudioComponentIdsListValue); - } - context.Writer.WriteArrayEnd(); - } - - writer.WriteObjectEnd(); - } - - request.Content = memoryStream.ToArray(); - } - - - if (publicRequest.IsSetClientToken()) - { - request.Headers["X-Amz-Client-Token"] = publicRequest.ClientToken; - } - - return request; - } - private static UpdateLaunchProfileRequestMarshaller _instance = new UpdateLaunchProfileRequestMarshaller(); - - internal static UpdateLaunchProfileRequestMarshaller GetInstance() - { - return _instance; - } - - /// - /// Gets the singleton. - /// - public static UpdateLaunchProfileRequestMarshaller Instance - { - get - { - return _instance; - } - } - - } -} \ No newline at end of file diff --git a/sdk/src/Services/NimbleStudio/Generated/Model/Internal/MarshallTransformations/UpdateStreamingImageRequestMarshaller.cs b/sdk/src/Services/NimbleStudio/Generated/Model/Internal/MarshallTransformations/UpdateStreamingImageRequestMarshaller.cs deleted file mode 100644 index d8a41166a6a2..000000000000 --- a/sdk/src/Services/NimbleStudio/Generated/Model/Internal/MarshallTransformations/UpdateStreamingImageRequestMarshaller.cs +++ /dev/null @@ -1,123 +0,0 @@ -/* - * 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. - */ - -/* - * Do not modify this file. This file is generated from the nimble-2020-08-01.normal.json service model. - */ -using System; -using System.Collections.Generic; -using System.Globalization; -using System.IO; -using System.Text; -using System.Xml.Serialization; - -using Amazon.NimbleStudio.Model; -using Amazon.Runtime; -using Amazon.Runtime.Internal; -using Amazon.Runtime.Internal.Transform; -using Amazon.Runtime.Internal.Util; -using ThirdParty.Json.LitJson; - -#pragma warning disable CS0612,CS0618 -namespace Amazon.NimbleStudio.Model.Internal.MarshallTransformations -{ - /// - /// UpdateStreamingImage Request Marshaller - /// - public class UpdateStreamingImageRequestMarshaller : IMarshaller , IMarshaller - { - /// - /// Marshaller the request object to the HTTP request. - /// - /// - /// - public IRequest Marshall(AmazonWebServiceRequest input) - { - return this.Marshall((UpdateStreamingImageRequest)input); - } - - /// - /// Marshaller the request object to the HTTP request. - /// - /// - /// - public IRequest Marshall(UpdateStreamingImageRequest publicRequest) - { - IRequest request = new DefaultRequest(publicRequest, "Amazon.NimbleStudio"); - request.Headers["Content-Type"] = "application/json"; - request.Headers[Amazon.Util.HeaderKeys.XAmzApiVersion] = "2020-08-01"; - request.HttpMethod = "PATCH"; - - if (!publicRequest.IsSetStreamingImageId()) - throw new AmazonNimbleStudioException("Request object does not have required field StreamingImageId set"); - request.AddPathResource("{streamingImageId}", StringUtils.FromString(publicRequest.StreamingImageId)); - if (!publicRequest.IsSetStudioId()) - throw new AmazonNimbleStudioException("Request object does not have required field StudioId set"); - request.AddPathResource("{studioId}", StringUtils.FromString(publicRequest.StudioId)); - request.ResourcePath = "/2020-08-01/studios/{studioId}/streaming-images/{streamingImageId}"; - using (MemoryStream memoryStream = new MemoryStream()) - { - using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) - { - JsonWriter writer = new JsonWriter(streamWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetDescription()) - { - context.Writer.WritePropertyName("description"); - context.Writer.Write(publicRequest.Description); - } - - if(publicRequest.IsSetName()) - { - context.Writer.WritePropertyName("name"); - context.Writer.Write(publicRequest.Name); - } - - writer.WriteObjectEnd(); - } - - request.Content = memoryStream.ToArray(); - } - - - if (publicRequest.IsSetClientToken()) - { - request.Headers["X-Amz-Client-Token"] = publicRequest.ClientToken; - } - - return request; - } - private static UpdateStreamingImageRequestMarshaller _instance = new UpdateStreamingImageRequestMarshaller(); - - internal static UpdateStreamingImageRequestMarshaller GetInstance() - { - return _instance; - } - - /// - /// Gets the singleton. - /// - public static UpdateStreamingImageRequestMarshaller Instance - { - get - { - return _instance; - } - } - - } -} \ No newline at end of file diff --git a/sdk/src/Services/NimbleStudio/Generated/Model/Internal/MarshallTransformations/UpdateStudioComponentRequestMarshaller.cs b/sdk/src/Services/NimbleStudio/Generated/Model/Internal/MarshallTransformations/UpdateStudioComponentRequestMarshaller.cs deleted file mode 100644 index 45de9e3a4f8a..000000000000 --- a/sdk/src/Services/NimbleStudio/Generated/Model/Internal/MarshallTransformations/UpdateStudioComponentRequestMarshaller.cs +++ /dev/null @@ -1,201 +0,0 @@ -/* - * 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. - */ - -/* - * Do not modify this file. This file is generated from the nimble-2020-08-01.normal.json service model. - */ -using System; -using System.Collections.Generic; -using System.Globalization; -using System.IO; -using System.Text; -using System.Xml.Serialization; - -using Amazon.NimbleStudio.Model; -using Amazon.Runtime; -using Amazon.Runtime.Internal; -using Amazon.Runtime.Internal.Transform; -using Amazon.Runtime.Internal.Util; -using ThirdParty.Json.LitJson; - -#pragma warning disable CS0612,CS0618 -namespace Amazon.NimbleStudio.Model.Internal.MarshallTransformations -{ - /// - /// UpdateStudioComponent Request Marshaller - /// - public class UpdateStudioComponentRequestMarshaller : IMarshaller , IMarshaller - { - /// - /// Marshaller the request object to the HTTP request. - /// - /// - /// - public IRequest Marshall(AmazonWebServiceRequest input) - { - return this.Marshall((UpdateStudioComponentRequest)input); - } - - /// - /// Marshaller the request object to the HTTP request. - /// - /// - /// - public IRequest Marshall(UpdateStudioComponentRequest publicRequest) - { - IRequest request = new DefaultRequest(publicRequest, "Amazon.NimbleStudio"); - request.Headers["Content-Type"] = "application/json"; - request.Headers[Amazon.Util.HeaderKeys.XAmzApiVersion] = "2020-08-01"; - request.HttpMethod = "PATCH"; - - if (!publicRequest.IsSetStudioComponentId()) - throw new AmazonNimbleStudioException("Request object does not have required field StudioComponentId set"); - request.AddPathResource("{studioComponentId}", StringUtils.FromString(publicRequest.StudioComponentId)); - if (!publicRequest.IsSetStudioId()) - throw new AmazonNimbleStudioException("Request object does not have required field StudioId set"); - request.AddPathResource("{studioId}", StringUtils.FromString(publicRequest.StudioId)); - request.ResourcePath = "/2020-08-01/studios/{studioId}/studio-components/{studioComponentId}"; - using (MemoryStream memoryStream = new MemoryStream()) - { - using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) - { - JsonWriter writer = new JsonWriter(streamWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetConfiguration()) - { - context.Writer.WritePropertyName("configuration"); - context.Writer.WriteObjectStart(); - - var marshaller = StudioComponentConfigurationMarshaller.Instance; - marshaller.Marshall(publicRequest.Configuration, context); - - context.Writer.WriteObjectEnd(); - } - - if(publicRequest.IsSetDescription()) - { - context.Writer.WritePropertyName("description"); - context.Writer.Write(publicRequest.Description); - } - - if(publicRequest.IsSetEc2SecurityGroupIds()) - { - context.Writer.WritePropertyName("ec2SecurityGroupIds"); - context.Writer.WriteArrayStart(); - foreach(var publicRequestEc2SecurityGroupIdsListValue in publicRequest.Ec2SecurityGroupIds) - { - context.Writer.Write(publicRequestEc2SecurityGroupIdsListValue); - } - context.Writer.WriteArrayEnd(); - } - - if(publicRequest.IsSetInitializationScripts()) - { - context.Writer.WritePropertyName("initializationScripts"); - context.Writer.WriteArrayStart(); - foreach(var publicRequestInitializationScriptsListValue in publicRequest.InitializationScripts) - { - context.Writer.WriteObjectStart(); - - var marshaller = StudioComponentInitializationScriptMarshaller.Instance; - marshaller.Marshall(publicRequestInitializationScriptsListValue, context); - - context.Writer.WriteObjectEnd(); - } - context.Writer.WriteArrayEnd(); - } - - if(publicRequest.IsSetName()) - { - context.Writer.WritePropertyName("name"); - context.Writer.Write(publicRequest.Name); - } - - if(publicRequest.IsSetRuntimeRoleArn()) - { - context.Writer.WritePropertyName("runtimeRoleArn"); - context.Writer.Write(publicRequest.RuntimeRoleArn); - } - - if(publicRequest.IsSetScriptParameters()) - { - context.Writer.WritePropertyName("scriptParameters"); - context.Writer.WriteArrayStart(); - foreach(var publicRequestScriptParametersListValue in publicRequest.ScriptParameters) - { - context.Writer.WriteObjectStart(); - - var marshaller = ScriptParameterKeyValueMarshaller.Instance; - marshaller.Marshall(publicRequestScriptParametersListValue, context); - - context.Writer.WriteObjectEnd(); - } - context.Writer.WriteArrayEnd(); - } - - if(publicRequest.IsSetSecureInitializationRoleArn()) - { - context.Writer.WritePropertyName("secureInitializationRoleArn"); - context.Writer.Write(publicRequest.SecureInitializationRoleArn); - } - - if(publicRequest.IsSetSubtype()) - { - context.Writer.WritePropertyName("subtype"); - context.Writer.Write(publicRequest.Subtype); - } - - if(publicRequest.IsSetType()) - { - context.Writer.WritePropertyName("type"); - context.Writer.Write(publicRequest.Type); - } - - writer.WriteObjectEnd(); - } - - request.Content = memoryStream.ToArray(); - } - - - if (publicRequest.IsSetClientToken()) - { - request.Headers["X-Amz-Client-Token"] = publicRequest.ClientToken; - } - - return request; - } - private static UpdateStudioComponentRequestMarshaller _instance = new UpdateStudioComponentRequestMarshaller(); - - internal static UpdateStudioComponentRequestMarshaller GetInstance() - { - return _instance; - } - - /// - /// Gets the singleton. - /// - public static UpdateStudioComponentRequestMarshaller Instance - { - get - { - return _instance; - } - } - - } -} \ No newline at end of file diff --git a/sdk/src/Services/NimbleStudio/Generated/Model/Internal/MarshallTransformations/UpdateStudioRequestMarshaller.cs b/sdk/src/Services/NimbleStudio/Generated/Model/Internal/MarshallTransformations/UpdateStudioRequestMarshaller.cs deleted file mode 100644 index 035190faf142..000000000000 --- a/sdk/src/Services/NimbleStudio/Generated/Model/Internal/MarshallTransformations/UpdateStudioRequestMarshaller.cs +++ /dev/null @@ -1,126 +0,0 @@ -/* - * 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. - */ - -/* - * Do not modify this file. This file is generated from the nimble-2020-08-01.normal.json service model. - */ -using System; -using System.Collections.Generic; -using System.Globalization; -using System.IO; -using System.Text; -using System.Xml.Serialization; - -using Amazon.NimbleStudio.Model; -using Amazon.Runtime; -using Amazon.Runtime.Internal; -using Amazon.Runtime.Internal.Transform; -using Amazon.Runtime.Internal.Util; -using ThirdParty.Json.LitJson; - -#pragma warning disable CS0612,CS0618 -namespace Amazon.NimbleStudio.Model.Internal.MarshallTransformations -{ - /// - /// UpdateStudio Request Marshaller - /// - public class UpdateStudioRequestMarshaller : IMarshaller , IMarshaller - { - /// - /// Marshaller the request object to the HTTP request. - /// - /// - /// - public IRequest Marshall(AmazonWebServiceRequest input) - { - return this.Marshall((UpdateStudioRequest)input); - } - - /// - /// Marshaller the request object to the HTTP request. - /// - /// - /// - public IRequest Marshall(UpdateStudioRequest publicRequest) - { - IRequest request = new DefaultRequest(publicRequest, "Amazon.NimbleStudio"); - request.Headers["Content-Type"] = "application/json"; - request.Headers[Amazon.Util.HeaderKeys.XAmzApiVersion] = "2020-08-01"; - request.HttpMethod = "PATCH"; - - if (!publicRequest.IsSetStudioId()) - throw new AmazonNimbleStudioException("Request object does not have required field StudioId set"); - request.AddPathResource("{studioId}", StringUtils.FromString(publicRequest.StudioId)); - request.ResourcePath = "/2020-08-01/studios/{studioId}"; - using (MemoryStream memoryStream = new MemoryStream()) - { - using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) - { - JsonWriter writer = new JsonWriter(streamWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetAdminRoleArn()) - { - context.Writer.WritePropertyName("adminRoleArn"); - context.Writer.Write(publicRequest.AdminRoleArn); - } - - if(publicRequest.IsSetDisplayName()) - { - context.Writer.WritePropertyName("displayName"); - context.Writer.Write(publicRequest.DisplayName); - } - - if(publicRequest.IsSetUserRoleArn()) - { - context.Writer.WritePropertyName("userRoleArn"); - context.Writer.Write(publicRequest.UserRoleArn); - } - - writer.WriteObjectEnd(); - } - - request.Content = memoryStream.ToArray(); - } - - - if (publicRequest.IsSetClientToken()) - { - request.Headers["X-Amz-Client-Token"] = publicRequest.ClientToken; - } - - return request; - } - private static UpdateStudioRequestMarshaller _instance = new UpdateStudioRequestMarshaller(); - - internal static UpdateStudioRequestMarshaller GetInstance() - { - return _instance; - } - - /// - /// Gets the singleton. - /// - public static UpdateStudioRequestMarshaller Instance - { - get - { - return _instance; - } - } - - } -} \ No newline at end of file diff --git a/sdk/src/Services/NimbleStudio/Generated/Model/Internal/MarshallTransformations/VolumeConfigurationMarshaller.cs b/sdk/src/Services/NimbleStudio/Generated/Model/Internal/MarshallTransformations/VolumeConfigurationMarshaller.cs deleted file mode 100644 index 97b879c92d77..000000000000 --- a/sdk/src/Services/NimbleStudio/Generated/Model/Internal/MarshallTransformations/VolumeConfigurationMarshaller.cs +++ /dev/null @@ -1,77 +0,0 @@ -/* - * 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. - */ - -/* - * Do not modify this file. This file is generated from the nimble-2020-08-01.normal.json service model. - */ -using System; -using System.Collections.Generic; -using System.Globalization; -using System.IO; -using System.Text; -using System.Xml.Serialization; - -using Amazon.NimbleStudio.Model; -using Amazon.Runtime; -using Amazon.Runtime.Internal; -using Amazon.Runtime.Internal.Transform; -using Amazon.Runtime.Internal.Util; -using ThirdParty.Json.LitJson; - -#pragma warning disable CS0612,CS0618 -namespace Amazon.NimbleStudio.Model.Internal.MarshallTransformations -{ - /// - /// VolumeConfiguration Marshaller - /// - public class VolumeConfigurationMarshaller : IRequestMarshaller - { - /// - /// Unmarshaller the response from the service to the response class. - /// - /// - /// - /// - public void Marshall(VolumeConfiguration requestObject, JsonMarshallerContext context) - { - if(requestObject == null) - return; - if(requestObject.IsSetIops()) - { - context.Writer.WritePropertyName("iops"); - context.Writer.Write(requestObject.Iops.Value); - } - - if(requestObject.IsSetSize()) - { - context.Writer.WritePropertyName("size"); - context.Writer.Write(requestObject.Size.Value); - } - - if(requestObject.IsSetThroughput()) - { - context.Writer.WritePropertyName("throughput"); - context.Writer.Write(requestObject.Throughput.Value); - } - - } - - /// - /// Singleton Marshaller. - /// - public readonly static VolumeConfigurationMarshaller Instance = new VolumeConfigurationMarshaller(); - - } -} \ No newline at end of file diff --git a/sdk/src/Services/NimbleStudio/Generated/Model/Internal/MarshallTransformations/VolumeConfigurationUnmarshaller.cs b/sdk/src/Services/NimbleStudio/Generated/Model/Internal/MarshallTransformations/VolumeConfigurationUnmarshaller.cs deleted file mode 100644 index ff7e813d88a5..000000000000 --- a/sdk/src/Services/NimbleStudio/Generated/Model/Internal/MarshallTransformations/VolumeConfigurationUnmarshaller.cs +++ /dev/null @@ -1,105 +0,0 @@ -/* - * 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. - */ - -/* - * Do not modify this file. This file is generated from the nimble-2020-08-01.normal.json service model. - */ -using System; -using System.Collections.Generic; -using System.Globalization; -using System.IO; -using System.Net; -using System.Text; -using System.Xml.Serialization; - -using Amazon.NimbleStudio.Model; -using Amazon.Runtime; -using Amazon.Runtime.Internal; -using Amazon.Runtime.Internal.Transform; -using Amazon.Runtime.Internal.Util; -using ThirdParty.Json.LitJson; - -#pragma warning disable CS0612,CS0618 -namespace Amazon.NimbleStudio.Model.Internal.MarshallTransformations -{ - /// - /// Response Unmarshaller for VolumeConfiguration Object - /// - public class VolumeConfigurationUnmarshaller : IUnmarshaller, IUnmarshaller - { - /// - /// Unmarshaller the response from the service to the response class. - /// - /// - /// - VolumeConfiguration IUnmarshaller.Unmarshall(XmlUnmarshallerContext context) - { - throw new NotImplementedException(); - } - - /// - /// Unmarshaller the response from the service to the response class. - /// - /// - /// The unmarshalled object - public VolumeConfiguration Unmarshall(JsonUnmarshallerContext context) - { - VolumeConfiguration unmarshalledObject = new VolumeConfiguration(); - if (context.IsEmptyResponse) - return null; - context.Read(); - if (context.CurrentTokenType == JsonToken.Null) - return null; - - int targetDepth = context.CurrentDepth; - while (context.ReadAtDepth(targetDepth)) - { - if (context.TestExpression("iops", targetDepth)) - { - var unmarshaller = NullableIntUnmarshaller.Instance; - unmarshalledObject.Iops = unmarshaller.Unmarshall(context); - continue; - } - if (context.TestExpression("size", targetDepth)) - { - var unmarshaller = NullableIntUnmarshaller.Instance; - unmarshalledObject.Size = unmarshaller.Unmarshall(context); - continue; - } - if (context.TestExpression("throughput", targetDepth)) - { - var unmarshaller = NullableIntUnmarshaller.Instance; - unmarshalledObject.Throughput = unmarshaller.Unmarshall(context); - continue; - } - } - return unmarshalledObject; - } - - - private static VolumeConfigurationUnmarshaller _instance = new VolumeConfigurationUnmarshaller(); - - /// - /// Gets the singleton. - /// - public static VolumeConfigurationUnmarshaller Instance - { - get - { - return _instance; - } - } - } -} \ No newline at end of file diff --git a/sdk/src/Services/NimbleStudio/Generated/Model/InternalServerErrorException.cs b/sdk/src/Services/NimbleStudio/Generated/Model/InternalServerErrorException.cs deleted file mode 100644 index 6b174a284414..000000000000 --- a/sdk/src/Services/NimbleStudio/Generated/Model/InternalServerErrorException.cs +++ /dev/null @@ -1,175 +0,0 @@ -/* - * 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. - */ - -/* - * Do not modify this file. This file is generated from the nimble-2020-08-01.normal.json service model. - */ -using System; -using System.Collections.Generic; -using System.Xml.Serialization; -using System.Text; -using System.IO; -using System.Net; - -using Amazon.Runtime; -using Amazon.Runtime.Internal; - -#pragma warning disable CS0612,CS0618,CS1570 -namespace Amazon.NimbleStudio.Model -{ - /// - /// An internal error has occurred. Please retry your request. - /// - #if !NETSTANDARD - [Serializable] - #endif - public partial class InternalServerErrorException : AmazonNimbleStudioException - { - private string _code; - private Dictionary _context = AWSConfigs.InitializeCollections ? new Dictionary() : null; - - private RetryableDetails _retryableDetails = new RetryableDetails(false); - - /// - /// Constructs a new InternalServerErrorException with the specified error - /// message. - /// - /// - /// Describes the error encountered. - /// - public InternalServerErrorException(string message) - : base(message) {} - - /// - /// Construct instance of InternalServerErrorException - /// - /// - /// - public InternalServerErrorException(string message, Exception innerException) - : base(message, innerException) {} - - /// - /// Construct instance of InternalServerErrorException - /// - /// - public InternalServerErrorException(Exception innerException) - : base(innerException) {} - - /// - /// Construct instance of InternalServerErrorException - /// - /// - /// - /// - /// - /// - /// - public InternalServerErrorException(string message, Exception innerException, Amazon.Runtime.ErrorType errorType, string errorCode, string requestId, HttpStatusCode statusCode) - : base(message, innerException, errorType, errorCode, requestId, statusCode) {} - - /// - /// Construct instance of InternalServerErrorException - /// - /// - /// - /// - /// - /// - public InternalServerErrorException(string message, Amazon.Runtime.ErrorType errorType, string errorCode, string requestId, HttpStatusCode statusCode) - : base(message, errorType, errorCode, requestId, statusCode) {} - - -#if !NETSTANDARD - /// - /// Constructs a new instance of the InternalServerErrorException class with serialized data. - /// - /// The that holds the serialized object data about the exception being thrown. - /// The that contains contextual information about the source or destination. - /// The parameter is null. - /// The class name is null or is zero (0). - protected InternalServerErrorException(System.Runtime.Serialization.SerializationInfo info, System.Runtime.Serialization.StreamingContext context) - : base(info, context) - { - this.Code = (string)info.GetValue("Code", typeof(string)); - this.Context = (Dictionary)info.GetValue("Context", typeof(Dictionary)); - } - - /// - /// Sets the with information about the exception. - /// - /// The that holds the serialized object data about the exception being thrown. - /// The that contains contextual information about the source or destination. - /// The parameter is a null reference (Nothing in Visual Basic). - [System.Security.SecurityCritical] - // These FxCop rules are giving false-positives for this method - [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Security", "CA2123:OverrideLinkDemandsShouldBeIdenticalToBase")] - [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Security", "CA2134:MethodsMustOverrideWithConsistentTransparencyFxCopRule")] - public override void GetObjectData(System.Runtime.Serialization.SerializationInfo info, System.Runtime.Serialization.StreamingContext context) - { - base.GetObjectData(info, context); - info.AddValue("Code", this.Code); - info.AddValue("Context", this.Context); - } -#endif - - /// - /// Gets and sets the property Code. - /// - /// A more specific error code. - /// - /// - public string Code - { - get { return this._code; } - set { this._code = value; } - } - - // Check to see if Code property is set - internal bool IsSetCode() - { - return this._code != null; - } - - /// - /// Gets and sets the property Context. - /// - /// The exception context. - /// - /// - public Dictionary Context - { - get { return this._context; } - set { this._context = value; } - } - - // Check to see if Context property is set - internal bool IsSetContext() - { - return this._context != null && (this._context.Count > 0 || !AWSConfigs.InitializeCollections); - } - - /// - /// Flag indicating if the exception is retryable and the associated retry - /// details. A null value indicates that the exception is not retryable. - /// - public override RetryableDetails Retryable - { - get - { - return _retryableDetails; - } - } - } -} \ No newline at end of file diff --git a/sdk/src/Services/NimbleStudio/Generated/Model/LaunchProfile.cs b/sdk/src/Services/NimbleStudio/Generated/Model/LaunchProfile.cs deleted file mode 100644 index 013c55608f2a..000000000000 --- a/sdk/src/Services/NimbleStudio/Generated/Model/LaunchProfile.cs +++ /dev/null @@ -1,380 +0,0 @@ -/* - * 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. - */ - -/* - * Do not modify this file. This file is generated from the nimble-2020-08-01.normal.json service model. - */ -using System; -using System.Collections.Generic; -using System.Xml.Serialization; -using System.Text; -using System.IO; -using System.Net; - -using Amazon.Runtime; -using Amazon.Runtime.Internal; - -#pragma warning disable CS0612,CS0618,CS1570 -namespace Amazon.NimbleStudio.Model -{ - /// - /// A launch profile controls your artist workforce’s access to studio components, like - /// compute farms, shared file systems, managed file systems, and license server configurations, - /// as well as instance types and Amazon Machine Images (AMIs). - /// - /// - /// - /// Studio administrators create launch profiles in the Nimble Studio console. Artists - /// can use their launch profiles to launch an instance from the Nimble Studio portal. - /// Each user’s launch profile defines how they can launch a streaming session. By default, - /// studio admins can use all launch profiles. - /// - /// - public partial class LaunchProfile - { - private string _arn; - private DateTime? _createdAt; - private string _createdBy; - private string _description; - private List _ec2SubnetIds = AWSConfigs.InitializeCollections ? new List() : null; - private string _launchProfileId; - private List _launchProfileProtocolVersions = AWSConfigs.InitializeCollections ? new List() : null; - private string _name; - private LaunchProfileState _state; - private LaunchProfileStatusCode _statusCode; - private string _statusMessage; - private StreamConfiguration _streamConfiguration; - private List _studioComponentIds = AWSConfigs.InitializeCollections ? new List() : null; - private Dictionary _tags = AWSConfigs.InitializeCollections ? new Dictionary() : null; - private DateTime? _updatedAt; - private string _updatedBy; - private List _validationResults = AWSConfigs.InitializeCollections ? new List() : null; - - /// - /// Gets and sets the property Arn. - /// - /// The Amazon Resource Name (ARN) that is assigned to a studio resource and uniquely - /// identifies it. ARNs are unique across all Regions. - /// - /// - public string Arn - { - get { return this._arn; } - set { this._arn = value; } - } - - // Check to see if Arn property is set - internal bool IsSetArn() - { - return this._arn != null; - } - - /// - /// Gets and sets the property CreatedAt. - /// - /// The ISO timestamp in seconds for when the resource was created. - /// - /// - public DateTime? CreatedAt - { - get { return this._createdAt; } - set { this._createdAt = value; } - } - - // Check to see if CreatedAt property is set - internal bool IsSetCreatedAt() - { - return this._createdAt.HasValue; - } - - /// - /// Gets and sets the property CreatedBy. - /// - /// The user ID of the user that created the launch profile. - /// - /// - public string CreatedBy - { - get { return this._createdBy; } - set { this._createdBy = value; } - } - - // Check to see if CreatedBy property is set - internal bool IsSetCreatedBy() - { - return this._createdBy != null; - } - - /// - /// Gets and sets the property Description. - /// - /// A human-readable description of the launch profile. - /// - /// - [AWSProperty(Sensitive=true, Min=0, Max=256)] - public string Description - { - get { return this._description; } - set { this._description = value; } - } - - // Check to see if Description property is set - internal bool IsSetDescription() - { - return this._description != null; - } - - /// - /// Gets and sets the property Ec2SubnetIds. - /// - /// Unique identifiers for a collection of EC2 subnets. - /// - /// - [AWSProperty(Min=0, Max=6)] - public List Ec2SubnetIds - { - get { return this._ec2SubnetIds; } - set { this._ec2SubnetIds = value; } - } - - // Check to see if Ec2SubnetIds property is set - internal bool IsSetEc2SubnetIds() - { - return this._ec2SubnetIds != null && (this._ec2SubnetIds.Count > 0 || !AWSConfigs.InitializeCollections); - } - - /// - /// Gets and sets the property LaunchProfileId. - /// - /// The ID of the launch profile used to control access from the streaming session. - /// - /// - [AWSProperty(Min=0, Max=22)] - public string LaunchProfileId - { - get { return this._launchProfileId; } - set { this._launchProfileId = value; } - } - - // Check to see if LaunchProfileId property is set - internal bool IsSetLaunchProfileId() - { - return this._launchProfileId != null; - } - - /// - /// Gets and sets the property LaunchProfileProtocolVersions. - /// - /// The version number of the protocol that is used by the launch profile. The only valid - /// version is "2021-03-31". - /// - /// - public List LaunchProfileProtocolVersions - { - get { return this._launchProfileProtocolVersions; } - set { this._launchProfileProtocolVersions = value; } - } - - // Check to see if LaunchProfileProtocolVersions property is set - internal bool IsSetLaunchProfileProtocolVersions() - { - return this._launchProfileProtocolVersions != null && (this._launchProfileProtocolVersions.Count > 0 || !AWSConfigs.InitializeCollections); - } - - /// - /// Gets and sets the property Name. - /// - /// A friendly name for the launch profile. - /// - /// - [AWSProperty(Sensitive=true, Min=1, Max=64)] - public string Name - { - get { return this._name; } - set { this._name = value; } - } - - // Check to see if Name property is set - internal bool IsSetName() - { - return this._name != null; - } - - /// - /// Gets and sets the property State. - /// - /// The current state. - /// - /// - public LaunchProfileState State - { - get { return this._state; } - set { this._state = value; } - } - - // Check to see if State property is set - internal bool IsSetState() - { - return this._state != null; - } - - /// - /// Gets and sets the property StatusCode. - /// - /// The status code. - /// - /// - public LaunchProfileStatusCode StatusCode - { - get { return this._statusCode; } - set { this._statusCode = value; } - } - - // Check to see if StatusCode property is set - internal bool IsSetStatusCode() - { - return this._statusCode != null; - } - - /// - /// Gets and sets the property StatusMessage. - /// - /// The status message for the launch profile. - /// - /// - public string StatusMessage - { - get { return this._statusMessage; } - set { this._statusMessage = value; } - } - - // Check to see if StatusMessage property is set - internal bool IsSetStatusMessage() - { - return this._statusMessage != null; - } - - /// - /// Gets and sets the property StreamConfiguration. - /// - /// A configuration for a streaming session. - /// - /// - public StreamConfiguration StreamConfiguration - { - get { return this._streamConfiguration; } - set { this._streamConfiguration = value; } - } - - // Check to see if StreamConfiguration property is set - internal bool IsSetStreamConfiguration() - { - return this._streamConfiguration != null; - } - - /// - /// Gets and sets the property StudioComponentIds. - /// - /// Unique identifiers for a collection of studio components that can be used with this - /// launch profile. - /// - /// - [AWSProperty(Min=1, Max=100)] - public List StudioComponentIds - { - get { return this._studioComponentIds; } - set { this._studioComponentIds = value; } - } - - // Check to see if StudioComponentIds property is set - internal bool IsSetStudioComponentIds() - { - return this._studioComponentIds != null && (this._studioComponentIds.Count > 0 || !AWSConfigs.InitializeCollections); - } - - /// - /// Gets and sets the property Tags. - /// - /// A collection of labels, in the form of key-value pairs, that apply to this resource. - /// - /// - public Dictionary Tags - { - get { return this._tags; } - set { this._tags = value; } - } - - // Check to see if Tags property is set - internal bool IsSetTags() - { - return this._tags != null && (this._tags.Count > 0 || !AWSConfigs.InitializeCollections); - } - - /// - /// Gets and sets the property UpdatedAt. - /// - /// The ISO timestamp in seconds for when the resource was updated. - /// - /// - public DateTime? UpdatedAt - { - get { return this._updatedAt; } - set { this._updatedAt = value; } - } - - // Check to see if UpdatedAt property is set - internal bool IsSetUpdatedAt() - { - return this._updatedAt.HasValue; - } - - /// - /// Gets and sets the property UpdatedBy. - /// - /// The user ID of the user that most recently updated the resource. - /// - /// - public string UpdatedBy - { - get { return this._updatedBy; } - set { this._updatedBy = value; } - } - - // Check to see if UpdatedBy property is set - internal bool IsSetUpdatedBy() - { - return this._updatedBy != null; - } - - /// - /// Gets and sets the property ValidationResults. - /// - /// The list of the latest validation results. - /// - /// - public List ValidationResults - { - get { return this._validationResults; } - set { this._validationResults = value; } - } - - // Check to see if ValidationResults property is set - internal bool IsSetValidationResults() - { - return this._validationResults != null && (this._validationResults.Count > 0 || !AWSConfigs.InitializeCollections); - } - - } -} \ No newline at end of file diff --git a/sdk/src/Services/NimbleStudio/Generated/Model/ListLaunchProfileMembersRequest.cs b/sdk/src/Services/NimbleStudio/Generated/Model/ListLaunchProfileMembersRequest.cs deleted file mode 100644 index 4ee704bdeb30..000000000000 --- a/sdk/src/Services/NimbleStudio/Generated/Model/ListLaunchProfileMembersRequest.cs +++ /dev/null @@ -1,119 +0,0 @@ -/* - * 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. - */ - -/* - * Do not modify this file. This file is generated from the nimble-2020-08-01.normal.json service model. - */ -using System; -using System.Collections.Generic; -using System.Xml.Serialization; -using System.Text; -using System.IO; -using System.Net; - -using Amazon.Runtime; -using Amazon.Runtime.Internal; - -#pragma warning disable CS0612,CS0618,CS1570 -namespace Amazon.NimbleStudio.Model -{ - /// - /// Container for the parameters to the ListLaunchProfileMembers operation. - /// Get all users in a given launch profile membership. - /// - public partial class ListLaunchProfileMembersRequest : AmazonNimbleStudioRequest - { - private string _launchProfileId; - private int? _maxResults; - private string _nextToken; - private string _studioId; - - /// - /// Gets and sets the property LaunchProfileId. - /// - /// The ID of the launch profile used to control access from the streaming session. - /// - /// - [AWSProperty(Required=true)] - public string LaunchProfileId - { - get { return this._launchProfileId; } - set { this._launchProfileId = value; } - } - - // Check to see if LaunchProfileId property is set - internal bool IsSetLaunchProfileId() - { - return this._launchProfileId != null; - } - - /// - /// Gets and sets the property MaxResults. - /// - /// The max number of results to return in the response. - /// - /// - [AWSProperty(Min=1, Max=100)] - public int? MaxResults - { - get { return this._maxResults; } - set { this._maxResults = value; } - } - - // Check to see if MaxResults property is set - internal bool IsSetMaxResults() - { - return this._maxResults.HasValue; - } - - /// - /// Gets and sets the property NextToken. - /// - /// The token for the next set of results, or null if there are no more results. - /// - /// - public string NextToken - { - get { return this._nextToken; } - set { this._nextToken = value; } - } - - // Check to see if NextToken property is set - internal bool IsSetNextToken() - { - return this._nextToken != null; - } - - /// - /// Gets and sets the property StudioId. - /// - /// The studio ID. - /// - /// - [AWSProperty(Required=true)] - public string StudioId - { - get { return this._studioId; } - set { this._studioId = value; } - } - - // Check to see if StudioId property is set - internal bool IsSetStudioId() - { - return this._studioId != null; - } - - } -} \ No newline at end of file diff --git a/sdk/src/Services/NimbleStudio/Generated/Model/ListLaunchProfilesRequest.cs b/sdk/src/Services/NimbleStudio/Generated/Model/ListLaunchProfilesRequest.cs deleted file mode 100644 index a80f09ab2f31..000000000000 --- a/sdk/src/Services/NimbleStudio/Generated/Model/ListLaunchProfilesRequest.cs +++ /dev/null @@ -1,137 +0,0 @@ -/* - * 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. - */ - -/* - * Do not modify this file. This file is generated from the nimble-2020-08-01.normal.json service model. - */ -using System; -using System.Collections.Generic; -using System.Xml.Serialization; -using System.Text; -using System.IO; -using System.Net; - -using Amazon.Runtime; -using Amazon.Runtime.Internal; - -#pragma warning disable CS0612,CS0618,CS1570 -namespace Amazon.NimbleStudio.Model -{ - /// - /// Container for the parameters to the ListLaunchProfiles operation. - /// List all the launch profiles a studio. - /// - public partial class ListLaunchProfilesRequest : AmazonNimbleStudioRequest - { - private int? _maxResults; - private string _nextToken; - private string _principalId; - private List _states = AWSConfigs.InitializeCollections ? new List() : null; - private string _studioId; - - /// - /// Gets and sets the property MaxResults. - /// - /// The max number of results to return in the response. - /// - /// - [AWSProperty(Min=1, Max=100)] - public int? MaxResults - { - get { return this._maxResults; } - set { this._maxResults = value; } - } - - // Check to see if MaxResults property is set - internal bool IsSetMaxResults() - { - return this._maxResults.HasValue; - } - - /// - /// Gets and sets the property NextToken. - /// - /// The token for the next set of results, or null if there are no more results. - /// - /// - public string NextToken - { - get { return this._nextToken; } - set { this._nextToken = value; } - } - - // Check to see if NextToken property is set - internal bool IsSetNextToken() - { - return this._nextToken != null; - } - - /// - /// Gets and sets the property PrincipalId. - /// - /// The principal ID. This currently supports a IAM Identity Center UserId. - /// - /// - public string PrincipalId - { - get { return this._principalId; } - set { this._principalId = value; } - } - - // Check to see if PrincipalId property is set - internal bool IsSetPrincipalId() - { - return this._principalId != null; - } - - /// - /// Gets and sets the property States. - /// - /// Filter this request to launch profiles in any of the given states. - /// - /// - public List States - { - get { return this._states; } - set { this._states = value; } - } - - // Check to see if States property is set - internal bool IsSetStates() - { - return this._states != null && (this._states.Count > 0 || !AWSConfigs.InitializeCollections); - } - - /// - /// Gets and sets the property StudioId. - /// - /// The studio ID. - /// - /// - [AWSProperty(Required=true)] - public string StudioId - { - get { return this._studioId; } - set { this._studioId = value; } - } - - // Check to see if StudioId property is set - internal bool IsSetStudioId() - { - return this._studioId != null; - } - - } -} \ No newline at end of file diff --git a/sdk/src/Services/NimbleStudio/Generated/Model/ListStudioComponentsRequest.cs b/sdk/src/Services/NimbleStudio/Generated/Model/ListStudioComponentsRequest.cs deleted file mode 100644 index b477bcfc8b66..000000000000 --- a/sdk/src/Services/NimbleStudio/Generated/Model/ListStudioComponentsRequest.cs +++ /dev/null @@ -1,137 +0,0 @@ -/* - * 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. - */ - -/* - * Do not modify this file. This file is generated from the nimble-2020-08-01.normal.json service model. - */ -using System; -using System.Collections.Generic; -using System.Xml.Serialization; -using System.Text; -using System.IO; -using System.Net; - -using Amazon.Runtime; -using Amazon.Runtime.Internal; - -#pragma warning disable CS0612,CS0618,CS1570 -namespace Amazon.NimbleStudio.Model -{ - /// - /// Container for the parameters to the ListStudioComponents operation. - /// Lists the StudioComponents in a studio. - /// - public partial class ListStudioComponentsRequest : AmazonNimbleStudioRequest - { - private int? _maxResults; - private string _nextToken; - private List _states = AWSConfigs.InitializeCollections ? new List() : null; - private string _studioId; - private List _types = AWSConfigs.InitializeCollections ? new List() : null; - - /// - /// Gets and sets the property MaxResults. - /// - /// The max number of results to return in the response. - /// - /// - [AWSProperty(Min=1, Max=100)] - public int? MaxResults - { - get { return this._maxResults; } - set { this._maxResults = value; } - } - - // Check to see if MaxResults property is set - internal bool IsSetMaxResults() - { - return this._maxResults.HasValue; - } - - /// - /// Gets and sets the property NextToken. - /// - /// The token for the next set of results, or null if there are no more results. - /// - /// - public string NextToken - { - get { return this._nextToken; } - set { this._nextToken = value; } - } - - // Check to see if NextToken property is set - internal bool IsSetNextToken() - { - return this._nextToken != null; - } - - /// - /// Gets and sets the property States. - /// - /// Filters the request to studio components that are in one of the given states. - /// - /// - public List States - { - get { return this._states; } - set { this._states = value; } - } - - // Check to see if States property is set - internal bool IsSetStates() - { - return this._states != null && (this._states.Count > 0 || !AWSConfigs.InitializeCollections); - } - - /// - /// Gets and sets the property StudioId. - /// - /// The studio ID. - /// - /// - [AWSProperty(Required=true)] - public string StudioId - { - get { return this._studioId; } - set { this._studioId = value; } - } - - // Check to see if StudioId property is set - internal bool IsSetStudioId() - { - return this._studioId != null; - } - - /// - /// Gets and sets the property Types. - /// - /// Filters the request to studio components that are of one of the given types. - /// - /// - public List Types - { - get { return this._types; } - set { this._types = value; } - } - - // Check to see if Types property is set - internal bool IsSetTypes() - { - return this._types != null && (this._types.Count > 0 || !AWSConfigs.InitializeCollections); - } - - } -} \ No newline at end of file diff --git a/sdk/src/Services/NimbleStudio/Generated/Model/ListStudioMembersRequest.cs b/sdk/src/Services/NimbleStudio/Generated/Model/ListStudioMembersRequest.cs deleted file mode 100644 index 57441cf6345c..000000000000 --- a/sdk/src/Services/NimbleStudio/Generated/Model/ListStudioMembersRequest.cs +++ /dev/null @@ -1,105 +0,0 @@ -/* - * 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. - */ - -/* - * Do not modify this file. This file is generated from the nimble-2020-08-01.normal.json service model. - */ -using System; -using System.Collections.Generic; -using System.Xml.Serialization; -using System.Text; -using System.IO; -using System.Net; - -using Amazon.Runtime; -using Amazon.Runtime.Internal; - -#pragma warning disable CS0612,CS0618,CS1570 -namespace Amazon.NimbleStudio.Model -{ - /// - /// Container for the parameters to the ListStudioMembers operation. - /// Get all users in a given studio membership. - /// - /// - /// - /// ListStudioMembers only returns admin members. - /// - /// - /// - public partial class ListStudioMembersRequest : AmazonNimbleStudioRequest - { - private int? _maxResults; - private string _nextToken; - private string _studioId; - - /// - /// Gets and sets the property MaxResults. - /// - /// The max number of results to return in the response. - /// - /// - [AWSProperty(Min=1, Max=100)] - public int? MaxResults - { - get { return this._maxResults; } - set { this._maxResults = value; } - } - - // Check to see if MaxResults property is set - internal bool IsSetMaxResults() - { - return this._maxResults.HasValue; - } - - /// - /// Gets and sets the property NextToken. - /// - /// The token for the next set of results, or null if there are no more results. - /// - /// - public string NextToken - { - get { return this._nextToken; } - set { this._nextToken = value; } - } - - // Check to see if NextToken property is set - internal bool IsSetNextToken() - { - return this._nextToken != null; - } - - /// - /// Gets and sets the property StudioId. - /// - /// The studio ID. - /// - /// - [AWSProperty(Required=true)] - public string StudioId - { - get { return this._studioId; } - set { this._studioId = value; } - } - - // Check to see if StudioId property is set - internal bool IsSetStudioId() - { - return this._studioId != null; - } - - } -} \ No newline at end of file diff --git a/sdk/src/Services/NimbleStudio/Generated/Model/ResourceNotFoundException.cs b/sdk/src/Services/NimbleStudio/Generated/Model/ResourceNotFoundException.cs deleted file mode 100644 index 6a234df475db..000000000000 --- a/sdk/src/Services/NimbleStudio/Generated/Model/ResourceNotFoundException.cs +++ /dev/null @@ -1,162 +0,0 @@ -/* - * 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. - */ - -/* - * Do not modify this file. This file is generated from the nimble-2020-08-01.normal.json service model. - */ -using System; -using System.Collections.Generic; -using System.Xml.Serialization; -using System.Text; -using System.IO; -using System.Net; - -using Amazon.Runtime; -using Amazon.Runtime.Internal; - -#pragma warning disable CS0612,CS0618,CS1570 -namespace Amazon.NimbleStudio.Model -{ - /// - /// The specified resource could not be found. - /// - #if !NETSTANDARD - [Serializable] - #endif - public partial class ResourceNotFoundException : AmazonNimbleStudioException - { - private string _code; - private Dictionary _context = AWSConfigs.InitializeCollections ? new Dictionary() : null; - - /// - /// Constructs a new ResourceNotFoundException with the specified error - /// message. - /// - /// - /// Describes the error encountered. - /// - public ResourceNotFoundException(string message) - : base(message) {} - - /// - /// Construct instance of ResourceNotFoundException - /// - /// - /// - public ResourceNotFoundException(string message, Exception innerException) - : base(message, innerException) {} - - /// - /// Construct instance of ResourceNotFoundException - /// - /// - public ResourceNotFoundException(Exception innerException) - : base(innerException) {} - - /// - /// Construct instance of ResourceNotFoundException - /// - /// - /// - /// - /// - /// - /// - public ResourceNotFoundException(string message, Exception innerException, Amazon.Runtime.ErrorType errorType, string errorCode, string requestId, HttpStatusCode statusCode) - : base(message, innerException, errorType, errorCode, requestId, statusCode) {} - - /// - /// Construct instance of ResourceNotFoundException - /// - /// - /// - /// - /// - /// - public ResourceNotFoundException(string message, Amazon.Runtime.ErrorType errorType, string errorCode, string requestId, HttpStatusCode statusCode) - : base(message, errorType, errorCode, requestId, statusCode) {} - - -#if !NETSTANDARD - /// - /// Constructs a new instance of the ResourceNotFoundException class with serialized data. - /// - /// The that holds the serialized object data about the exception being thrown. - /// The that contains contextual information about the source or destination. - /// The parameter is null. - /// The class name is null or is zero (0). - protected ResourceNotFoundException(System.Runtime.Serialization.SerializationInfo info, System.Runtime.Serialization.StreamingContext context) - : base(info, context) - { - this.Code = (string)info.GetValue("Code", typeof(string)); - this.Context = (Dictionary)info.GetValue("Context", typeof(Dictionary)); - } - - /// - /// Sets the with information about the exception. - /// - /// The that holds the serialized object data about the exception being thrown. - /// The that contains contextual information about the source or destination. - /// The parameter is a null reference (Nothing in Visual Basic). - [System.Security.SecurityCritical] - // These FxCop rules are giving false-positives for this method - [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Security", "CA2123:OverrideLinkDemandsShouldBeIdenticalToBase")] - [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Security", "CA2134:MethodsMustOverrideWithConsistentTransparencyFxCopRule")] - public override void GetObjectData(System.Runtime.Serialization.SerializationInfo info, System.Runtime.Serialization.StreamingContext context) - { - base.GetObjectData(info, context); - info.AddValue("Code", this.Code); - info.AddValue("Context", this.Context); - } -#endif - - /// - /// Gets and sets the property Code. - /// - /// A more specific error code. - /// - /// - public string Code - { - get { return this._code; } - set { this._code = value; } - } - - // Check to see if Code property is set - internal bool IsSetCode() - { - return this._code != null; - } - - /// - /// Gets and sets the property Context. - /// - /// The exception context. - /// - /// - public Dictionary Context - { - get { return this._context; } - set { this._context = value; } - } - - // Check to see if Context property is set - internal bool IsSetContext() - { - return this._context != null && (this._context.Count > 0 || !AWSConfigs.InitializeCollections); - } - - } -} \ No newline at end of file diff --git a/sdk/src/Services/NimbleStudio/Generated/Model/ServiceQuotaExceededException.cs b/sdk/src/Services/NimbleStudio/Generated/Model/ServiceQuotaExceededException.cs deleted file mode 100644 index 22ee64783b16..000000000000 --- a/sdk/src/Services/NimbleStudio/Generated/Model/ServiceQuotaExceededException.cs +++ /dev/null @@ -1,168 +0,0 @@ -/* - * 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. - */ - -/* - * Do not modify this file. This file is generated from the nimble-2020-08-01.normal.json service model. - */ -using System; -using System.Collections.Generic; -using System.Xml.Serialization; -using System.Text; -using System.IO; -using System.Net; - -using Amazon.Runtime; -using Amazon.Runtime.Internal; - -#pragma warning disable CS0612,CS0618,CS1570 -namespace Amazon.NimbleStudio.Model -{ - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - #if !NETSTANDARD - [Serializable] - #endif - public partial class ServiceQuotaExceededException : AmazonNimbleStudioException - { - private string _code; - private Dictionary _context = AWSConfigs.InitializeCollections ? new Dictionary() : null; - - /// - /// Constructs a new ServiceQuotaExceededException with the specified error - /// message. - /// - /// - /// Describes the error encountered. - /// - public ServiceQuotaExceededException(string message) - : base(message) {} - - /// - /// Construct instance of ServiceQuotaExceededException - /// - /// - /// - public ServiceQuotaExceededException(string message, Exception innerException) - : base(message, innerException) {} - - /// - /// Construct instance of ServiceQuotaExceededException - /// - /// - public ServiceQuotaExceededException(Exception innerException) - : base(innerException) {} - - /// - /// Construct instance of ServiceQuotaExceededException - /// - /// - /// - /// - /// - /// - /// - public ServiceQuotaExceededException(string message, Exception innerException, Amazon.Runtime.ErrorType errorType, string errorCode, string requestId, HttpStatusCode statusCode) - : base(message, innerException, errorType, errorCode, requestId, statusCode) {} - - /// - /// Construct instance of ServiceQuotaExceededException - /// - /// - /// - /// - /// - /// - public ServiceQuotaExceededException(string message, Amazon.Runtime.ErrorType errorType, string errorCode, string requestId, HttpStatusCode statusCode) - : base(message, errorType, errorCode, requestId, statusCode) {} - - -#if !NETSTANDARD - /// - /// Constructs a new instance of the ServiceQuotaExceededException class with serialized data. - /// - /// The that holds the serialized object data about the exception being thrown. - /// The that contains contextual information about the source or destination. - /// The parameter is null. - /// The class name is null or is zero (0). - protected ServiceQuotaExceededException(System.Runtime.Serialization.SerializationInfo info, System.Runtime.Serialization.StreamingContext context) - : base(info, context) - { - this.Code = (string)info.GetValue("Code", typeof(string)); - this.Context = (Dictionary)info.GetValue("Context", typeof(Dictionary)); - } - - /// - /// Sets the with information about the exception. - /// - /// The that holds the serialized object data about the exception being thrown. - /// The that contains contextual information about the source or destination. - /// The parameter is a null reference (Nothing in Visual Basic). - [System.Security.SecurityCritical] - // These FxCop rules are giving false-positives for this method - [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Security", "CA2123:OverrideLinkDemandsShouldBeIdenticalToBase")] - [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Security", "CA2134:MethodsMustOverrideWithConsistentTransparencyFxCopRule")] - public override void GetObjectData(System.Runtime.Serialization.SerializationInfo info, System.Runtime.Serialization.StreamingContext context) - { - base.GetObjectData(info, context); - info.AddValue("Code", this.Code); - info.AddValue("Context", this.Context); - } -#endif - - /// - /// Gets and sets the property Code. - /// - /// A more specific error code. - /// - /// - public string Code - { - get { return this._code; } - set { this._code = value; } - } - - // Check to see if Code property is set - internal bool IsSetCode() - { - return this._code != null; - } - - /// - /// Gets and sets the property Context. - /// - /// The exception context. - /// - /// - public Dictionary Context - { - get { return this._context; } - set { this._context = value; } - } - - // Check to see if Context property is set - internal bool IsSetContext() - { - return this._context != null && (this._context.Count > 0 || !AWSConfigs.InitializeCollections); - } - - } -} \ No newline at end of file diff --git a/sdk/src/Services/NimbleStudio/Generated/Model/StreamConfiguration.cs b/sdk/src/Services/NimbleStudio/Generated/Model/StreamConfiguration.cs deleted file mode 100644 index 92c0ca40993f..000000000000 --- a/sdk/src/Services/NimbleStudio/Generated/Model/StreamConfiguration.cs +++ /dev/null @@ -1,283 +0,0 @@ -/* - * 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. - */ - -/* - * Do not modify this file. This file is generated from the nimble-2020-08-01.normal.json service model. - */ -using System; -using System.Collections.Generic; -using System.Xml.Serialization; -using System.Text; -using System.IO; -using System.Net; - -using Amazon.Runtime; -using Amazon.Runtime.Internal; - -#pragma warning disable CS0612,CS0618,CS1570 -namespace Amazon.NimbleStudio.Model -{ - /// - /// A configuration for a streaming session. - /// - public partial class StreamConfiguration - { - private AutomaticTerminationMode _automaticTerminationMode; - private StreamingClipboardMode _clipboardMode; - private List _ec2InstanceTypes = AWSConfigs.InitializeCollections ? new List() : null; - private int? _maxSessionLengthInMinutes; - private int? _maxStoppedSessionLengthInMinutes; - private StreamConfigurationSessionBackup _sessionBackup; - private SessionPersistenceMode _sessionPersistenceMode; - private StreamConfigurationSessionStorage _sessionStorage; - private List _streamingImageIds = AWSConfigs.InitializeCollections ? new List() : null; - private VolumeConfiguration _volumeConfiguration; - - /// - /// Gets and sets the property AutomaticTerminationMode. - /// - /// Indicates if a streaming session created from this launch profile should be terminated - /// automatically or retained without termination after being in a STOPPED state. - /// - ///
    • - /// - /// When ACTIVATED, the streaming session is scheduled for termination after being - /// in the STOPPED state for the time specified in maxStoppedSessionLengthInMinutes. - /// - ///
    • - /// - /// When DEACTIVATED, the streaming session can remain in the STOPPED state - /// indefinitely. - /// - ///
    - /// - /// This parameter is only allowed when sessionPersistenceMode is ACTIVATED. - /// When allowed, the default value for this parameter is DEACTIVATED. - /// - ///     - public AutomaticTerminationMode AutomaticTerminationMode - { - get { return this._automaticTerminationMode; } - set { this._automaticTerminationMode = value; } - } - - // Check to see if AutomaticTerminationMode property is set - internal bool IsSetAutomaticTerminationMode() - { - return this._automaticTerminationMode != null; - } - - /// - /// Gets and sets the property ClipboardMode. - /// - /// Allows or deactivates the use of the system clipboard to copy and paste between the - /// streaming session and streaming client. - /// - /// - [AWSProperty(Required=true)] - public StreamingClipboardMode ClipboardMode - { - get { return this._clipboardMode; } - set { this._clipboardMode = value; } - } - - // Check to see if ClipboardMode property is set - internal bool IsSetClipboardMode() - { - return this._clipboardMode != null; - } - - /// - /// Gets and sets the property Ec2InstanceTypes. - /// - /// The EC2 instance types that users can select from when launching a streaming session - /// with this launch profile. - /// - /// - [AWSProperty(Required=true, Min=1, Max=30)] - public List Ec2InstanceTypes - { - get { return this._ec2InstanceTypes; } - set { this._ec2InstanceTypes = value; } - } - - // Check to see if Ec2InstanceTypes property is set - internal bool IsSetEc2InstanceTypes() - { - return this._ec2InstanceTypes != null && (this._ec2InstanceTypes.Count > 0 || !AWSConfigs.InitializeCollections); - } - - /// - /// Gets and sets the property MaxSessionLengthInMinutes. - /// - /// The length of time, in minutes, that a streaming session can be active before it is - /// stopped or terminated. After this point, Nimble Studio automatically terminates or - /// stops the session. The default length of time is 690 minutes, and the maximum length - /// of time is 30 days. - /// - /// - [AWSProperty(Min=1, Max=43200)] - public int? MaxSessionLengthInMinutes - { - get { return this._maxSessionLengthInMinutes; } - set { this._maxSessionLengthInMinutes = value; } - } - - // Check to see if MaxSessionLengthInMinutes property is set - internal bool IsSetMaxSessionLengthInMinutes() - { - return this._maxSessionLengthInMinutes.HasValue; - } - - /// - /// Gets and sets the property MaxStoppedSessionLengthInMinutes. - /// - /// Integer that determines if you can start and stop your sessions and how long a session - /// can stay in the STOPPED state. The default value is 0. The maximum value is - /// 5760. - /// - /// - /// - /// This field is allowed only when sessionPersistenceMode is ACTIVATED - /// and automaticTerminationMode is ACTIVATED. - /// - /// - /// - /// If the value is set to 0, your sessions can’t be STOPPED. If you then call - /// StopStreamingSession, the session fails. If the time that a session stays in - /// the READY state exceeds the maxSessionLengthInMinutes value, the session - /// will automatically be terminated (instead of STOPPED). - /// - /// - /// - /// If the value is set to a positive number, the session can be stopped. You can call - /// StopStreamingSession to stop sessions in the READY state. If the time - /// that a session stays in the READY state exceeds the maxSessionLengthInMinutes - /// value, the session will automatically be stopped (instead of terminated). - /// - /// - [AWSProperty(Min=0, Max=5760)] - public int? MaxStoppedSessionLengthInMinutes - { - get { return this._maxStoppedSessionLengthInMinutes; } - set { this._maxStoppedSessionLengthInMinutes = value; } - } - - // Check to see if MaxStoppedSessionLengthInMinutes property is set - internal bool IsSetMaxStoppedSessionLengthInMinutes() - { - return this._maxStoppedSessionLengthInMinutes.HasValue; - } - - /// - /// Gets and sets the property SessionBackup. - /// - /// Information about the streaming session backup. - /// - /// - public StreamConfigurationSessionBackup SessionBackup - { - get { return this._sessionBackup; } - set { this._sessionBackup = value; } - } - - // Check to see if SessionBackup property is set - internal bool IsSetSessionBackup() - { - return this._sessionBackup != null; - } - - /// - /// Gets and sets the property SessionPersistenceMode. - /// - /// Determine if a streaming session created from this launch profile can configure persistent - /// storage. This means that volumeConfiguration and automaticTerminationMode - /// are configured. - /// - /// - public SessionPersistenceMode SessionPersistenceMode - { - get { return this._sessionPersistenceMode; } - set { this._sessionPersistenceMode = value; } - } - - // Check to see if SessionPersistenceMode property is set - internal bool IsSetSessionPersistenceMode() - { - return this._sessionPersistenceMode != null; - } - - /// - /// Gets and sets the property SessionStorage. - /// - /// The upload storage for a streaming session. - /// - /// - public StreamConfigurationSessionStorage SessionStorage - { - get { return this._sessionStorage; } - set { this._sessionStorage = value; } - } - - // Check to see if SessionStorage property is set - internal bool IsSetSessionStorage() - { - return this._sessionStorage != null; - } - - /// - /// Gets and sets the property StreamingImageIds. - /// - /// The streaming images that users can select from when launching a streaming session - /// with this launch profile. - /// - /// - [AWSProperty(Required=true, Min=1, Max=20)] - public List StreamingImageIds - { - get { return this._streamingImageIds; } - set { this._streamingImageIds = value; } - } - - // Check to see if StreamingImageIds property is set - internal bool IsSetStreamingImageIds() - { - return this._streamingImageIds != null && (this._streamingImageIds.Count > 0 || !AWSConfigs.InitializeCollections); - } - - /// - /// Gets and sets the property VolumeConfiguration. - /// - /// Custom volume configuration for the root volumes that are attached to streaming sessions. - /// - /// - /// - /// This parameter is only allowed when sessionPersistenceMode is ACTIVATED. - /// - /// - public VolumeConfiguration VolumeConfiguration - { - get { return this._volumeConfiguration; } - set { this._volumeConfiguration = value; } - } - - // Check to see if VolumeConfiguration property is set - internal bool IsSetVolumeConfiguration() - { - return this._volumeConfiguration != null; - } - - } -} \ No newline at end of file diff --git a/sdk/src/Services/NimbleStudio/Generated/Model/StreamConfigurationCreate.cs b/sdk/src/Services/NimbleStudio/Generated/Model/StreamConfigurationCreate.cs deleted file mode 100644 index 2ef5aed67acc..000000000000 --- a/sdk/src/Services/NimbleStudio/Generated/Model/StreamConfigurationCreate.cs +++ /dev/null @@ -1,283 +0,0 @@ -/* - * 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. - */ - -/* - * Do not modify this file. This file is generated from the nimble-2020-08-01.normal.json service model. - */ -using System; -using System.Collections.Generic; -using System.Xml.Serialization; -using System.Text; -using System.IO; -using System.Net; - -using Amazon.Runtime; -using Amazon.Runtime.Internal; - -#pragma warning disable CS0612,CS0618,CS1570 -namespace Amazon.NimbleStudio.Model -{ - /// - /// Configuration for streaming workstations created using this launch profile. - /// - public partial class StreamConfigurationCreate - { - private AutomaticTerminationMode _automaticTerminationMode; - private StreamingClipboardMode _clipboardMode; - private List _ec2InstanceTypes = AWSConfigs.InitializeCollections ? new List() : null; - private int? _maxSessionLengthInMinutes; - private int? _maxStoppedSessionLengthInMinutes; - private StreamConfigurationSessionBackup _sessionBackup; - private SessionPersistenceMode _sessionPersistenceMode; - private StreamConfigurationSessionStorage _sessionStorage; - private List _streamingImageIds = AWSConfigs.InitializeCollections ? new List() : null; - private VolumeConfiguration _volumeConfiguration; - - /// - /// Gets and sets the property AutomaticTerminationMode. - /// - /// Indicates if a streaming session created from this launch profile should be terminated - /// automatically or retained without termination after being in a STOPPED state. - /// - ///
    • - /// - /// When ACTIVATED, the streaming session is scheduled for termination after being - /// in the STOPPED state for the time specified in maxStoppedSessionLengthInMinutes. - /// - ///
    • - /// - /// When DEACTIVATED, the streaming session can remain in the STOPPED state - /// indefinitely. - /// - ///
    - /// - /// This parameter is only allowed when sessionPersistenceMode is ACTIVATED. - /// When allowed, the default value for this parameter is DEACTIVATED. - /// - ///     - public AutomaticTerminationMode AutomaticTerminationMode - { - get { return this._automaticTerminationMode; } - set { this._automaticTerminationMode = value; } - } - - // Check to see if AutomaticTerminationMode property is set - internal bool IsSetAutomaticTerminationMode() - { - return this._automaticTerminationMode != null; - } - - /// - /// Gets and sets the property ClipboardMode. - /// - /// Allows or deactivates the use of the system clipboard to copy and paste between the - /// streaming session and streaming client. - /// - /// - [AWSProperty(Required=true)] - public StreamingClipboardMode ClipboardMode - { - get { return this._clipboardMode; } - set { this._clipboardMode = value; } - } - - // Check to see if ClipboardMode property is set - internal bool IsSetClipboardMode() - { - return this._clipboardMode != null; - } - - /// - /// Gets and sets the property Ec2InstanceTypes. - /// - /// The EC2 instance types that users can select from when launching a streaming session - /// with this launch profile. - /// - /// - [AWSProperty(Required=true, Min=1, Max=30)] - public List Ec2InstanceTypes - { - get { return this._ec2InstanceTypes; } - set { this._ec2InstanceTypes = value; } - } - - // Check to see if Ec2InstanceTypes property is set - internal bool IsSetEc2InstanceTypes() - { - return this._ec2InstanceTypes != null && (this._ec2InstanceTypes.Count > 0 || !AWSConfigs.InitializeCollections); - } - - /// - /// Gets and sets the property MaxSessionLengthInMinutes. - /// - /// The length of time, in minutes, that a streaming session can be active before it is - /// stopped or terminated. After this point, Nimble Studio automatically terminates or - /// stops the session. The default length of time is 690 minutes, and the maximum length - /// of time is 30 days. - /// - /// - [AWSProperty(Min=1, Max=43200)] - public int? MaxSessionLengthInMinutes - { - get { return this._maxSessionLengthInMinutes; } - set { this._maxSessionLengthInMinutes = value; } - } - - // Check to see if MaxSessionLengthInMinutes property is set - internal bool IsSetMaxSessionLengthInMinutes() - { - return this._maxSessionLengthInMinutes.HasValue; - } - - /// - /// Gets and sets the property MaxStoppedSessionLengthInMinutes. - /// - /// Integer that determines if you can start and stop your sessions and how long a session - /// can stay in the STOPPED state. The default value is 0. The maximum value is - /// 5760. - /// - /// - /// - /// This field is allowed only when sessionPersistenceMode is ACTIVATED - /// and automaticTerminationMode is ACTIVATED. - /// - /// - /// - /// If the value is set to 0, your sessions can’t be STOPPED. If you then call - /// StopStreamingSession, the session fails. If the time that a session stays in - /// the READY state exceeds the maxSessionLengthInMinutes value, the session - /// will automatically be terminated (instead of STOPPED). - /// - /// - /// - /// If the value is set to a positive number, the session can be stopped. You can call - /// StopStreamingSession to stop sessions in the READY state. If the time - /// that a session stays in the READY state exceeds the maxSessionLengthInMinutes - /// value, the session will automatically be stopped (instead of terminated). - /// - /// - [AWSProperty(Min=0, Max=5760)] - public int? MaxStoppedSessionLengthInMinutes - { - get { return this._maxStoppedSessionLengthInMinutes; } - set { this._maxStoppedSessionLengthInMinutes = value; } - } - - // Check to see if MaxStoppedSessionLengthInMinutes property is set - internal bool IsSetMaxStoppedSessionLengthInMinutes() - { - return this._maxStoppedSessionLengthInMinutes.HasValue; - } - - /// - /// Gets and sets the property SessionBackup. - /// - /// Configures how streaming sessions are backed up when launched from this launch profile. - /// - /// - public StreamConfigurationSessionBackup SessionBackup - { - get { return this._sessionBackup; } - set { this._sessionBackup = value; } - } - - // Check to see if SessionBackup property is set - internal bool IsSetSessionBackup() - { - return this._sessionBackup != null; - } - - /// - /// Gets and sets the property SessionPersistenceMode. - /// - /// Determine if a streaming session created from this launch profile can configure persistent - /// storage. This means that volumeConfiguration and automaticTerminationMode - /// are configured. - /// - /// - public SessionPersistenceMode SessionPersistenceMode - { - get { return this._sessionPersistenceMode; } - set { this._sessionPersistenceMode = value; } - } - - // Check to see if SessionPersistenceMode property is set - internal bool IsSetSessionPersistenceMode() - { - return this._sessionPersistenceMode != null; - } - - /// - /// Gets and sets the property SessionStorage. - /// - /// The upload storage for a streaming workstation that is created using this launch profile. - /// - /// - public StreamConfigurationSessionStorage SessionStorage - { - get { return this._sessionStorage; } - set { this._sessionStorage = value; } - } - - // Check to see if SessionStorage property is set - internal bool IsSetSessionStorage() - { - return this._sessionStorage != null; - } - - /// - /// Gets and sets the property StreamingImageIds. - /// - /// The streaming images that users can select from when launching a streaming session - /// with this launch profile. - /// - /// - [AWSProperty(Required=true, Min=1, Max=20)] - public List StreamingImageIds - { - get { return this._streamingImageIds; } - set { this._streamingImageIds = value; } - } - - // Check to see if StreamingImageIds property is set - internal bool IsSetStreamingImageIds() - { - return this._streamingImageIds != null && (this._streamingImageIds.Count > 0 || !AWSConfigs.InitializeCollections); - } - - /// - /// Gets and sets the property VolumeConfiguration. - /// - /// Custom volume configuration for the root volumes that are attached to streaming sessions. - /// - /// - /// - /// This parameter is only allowed when sessionPersistenceMode is ACTIVATED. - /// - /// - public VolumeConfiguration VolumeConfiguration - { - get { return this._volumeConfiguration; } - set { this._volumeConfiguration = value; } - } - - // Check to see if VolumeConfiguration property is set - internal bool IsSetVolumeConfiguration() - { - return this._volumeConfiguration != null; - } - - } -} \ No newline at end of file diff --git a/sdk/src/Services/NimbleStudio/Generated/Model/StreamConfigurationSessionBackup.cs b/sdk/src/Services/NimbleStudio/Generated/Model/StreamConfigurationSessionBackup.cs deleted file mode 100644 index 272dcac32da4..000000000000 --- a/sdk/src/Services/NimbleStudio/Generated/Model/StreamConfigurationSessionBackup.cs +++ /dev/null @@ -1,85 +0,0 @@ -/* - * 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. - */ - -/* - * Do not modify this file. This file is generated from the nimble-2020-08-01.normal.json service model. - */ -using System; -using System.Collections.Generic; -using System.Xml.Serialization; -using System.Text; -using System.IO; -using System.Net; - -using Amazon.Runtime; -using Amazon.Runtime.Internal; - -#pragma warning disable CS0612,CS0618,CS1570 -namespace Amazon.NimbleStudio.Model -{ - /// - /// Configures how streaming sessions are backed up when launched from this launch profile. - /// - public partial class StreamConfigurationSessionBackup - { - private int? _maxBackupsToRetain; - private SessionBackupMode _mode; - - /// - /// Gets and sets the property MaxBackupsToRetain. - /// - /// The maximum number of backups that each streaming session created from this launch - /// profile can have. - /// - /// - [AWSProperty(Min=0, Max=10)] - public int? MaxBackupsToRetain - { - get { return this._maxBackupsToRetain; } - set { this._maxBackupsToRetain = value; } - } - - // Check to see if MaxBackupsToRetain property is set - internal bool IsSetMaxBackupsToRetain() - { - return this._maxBackupsToRetain.HasValue; - } - - /// - /// Gets and sets the property Mode. - /// - /// Specifies how artists sessions are backed up. - /// - /// - /// - /// Configures backups for streaming sessions launched with this launch profile. The default - /// value is DEACTIVATED, which means that backups are deactivated. To allow backups, - /// set this value to AUTOMATIC. - /// - /// - public SessionBackupMode Mode - { - get { return this._mode; } - set { this._mode = value; } - } - - // Check to see if Mode property is set - internal bool IsSetMode() - { - return this._mode != null; - } - - } -} \ No newline at end of file diff --git a/sdk/src/Services/NimbleStudio/Generated/Model/StreamingSession.cs b/sdk/src/Services/NimbleStudio/Generated/Model/StreamingSession.cs deleted file mode 100644 index c890106f6a0a..000000000000 --- a/sdk/src/Services/NimbleStudio/Generated/Model/StreamingSession.cs +++ /dev/null @@ -1,581 +0,0 @@ -/* - * 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. - */ - -/* - * Do not modify this file. This file is generated from the nimble-2020-08-01.normal.json service model. - */ -using System; -using System.Collections.Generic; -using System.Xml.Serialization; -using System.Text; -using System.IO; -using System.Net; - -using Amazon.Runtime; -using Amazon.Runtime.Internal; - -#pragma warning disable CS0612,CS0618,CS1570 -namespace Amazon.NimbleStudio.Model -{ - /// - /// A streaming session is a virtual workstation created using a particular launch profile. - /// - public partial class StreamingSession - { - private string _arn; - private AutomaticTerminationMode _automaticTerminationMode; - private SessionBackupMode _backupMode; - private DateTime? _createdAt; - private string _createdBy; - private string _ec2InstanceType; - private string _launchProfileId; - private int? _maxBackupsToRetain; - private string _ownedBy; - private string _sessionId; - private SessionPersistenceMode _sessionPersistenceMode; - private DateTime? _startedAt; - private string _startedBy; - private string _startedFromBackupId; - private StreamingSessionState _state; - private StreamingSessionStatusCode _statusCode; - private string _statusMessage; - private DateTime? _stopAt; - private DateTime? _stoppedAt; - private string _stoppedBy; - private string _streamingImageId; - private Dictionary _tags = AWSConfigs.InitializeCollections ? new Dictionary() : null; - private DateTime? _terminateAt; - private DateTime? _updatedAt; - private string _updatedBy; - private VolumeConfiguration _volumeConfiguration; - private VolumeRetentionMode _volumeRetentionMode; - - /// - /// Gets and sets the property Arn. - /// - /// The Amazon Resource Name (ARN) that is assigned to a studio resource and uniquely - /// identifies it. ARNs are unique across all Regions. - /// - /// - public string Arn - { - get { return this._arn; } - set { this._arn = value; } - } - - // Check to see if Arn property is set - internal bool IsSetArn() - { - return this._arn != null; - } - - /// - /// Gets and sets the property AutomaticTerminationMode. - /// - /// Indicates if a streaming session created from this launch profile should be terminated - /// automatically or retained without termination after being in a STOPPED state. - /// - ///
    • - /// - /// When ACTIVATED, the streaming session is scheduled for termination after being - /// in the STOPPED state for the time specified in maxStoppedSessionLengthInMinutes. - /// - ///
    • - /// - /// When DEACTIVATED, the streaming session can remain in the STOPPED state - /// indefinitely. - /// - ///
    - /// - /// This parameter is only allowed when sessionPersistenceMode is ACTIVATED. - /// When allowed, the default value for this parameter is DEACTIVATED. - /// - ///     - public AutomaticTerminationMode AutomaticTerminationMode - { - get { return this._automaticTerminationMode; } - set { this._automaticTerminationMode = value; } - } - - // Check to see if AutomaticTerminationMode property is set - internal bool IsSetAutomaticTerminationMode() - { - return this._automaticTerminationMode != null; - } - - /// - /// Gets and sets the property BackupMode. - /// - /// Shows the current backup setting of the session. - /// - /// - public SessionBackupMode BackupMode - { - get { return this._backupMode; } - set { this._backupMode = value; } - } - - // Check to see if BackupMode property is set - internal bool IsSetBackupMode() - { - return this._backupMode != null; - } - - /// - /// Gets and sets the property CreatedAt. - /// - /// The ISO timestamp in seconds for when the resource was created. - /// - /// - public DateTime? CreatedAt - { - get { return this._createdAt; } - set { this._createdAt = value; } - } - - // Check to see if CreatedAt property is set - internal bool IsSetCreatedAt() - { - return this._createdAt.HasValue; - } - - /// - /// Gets and sets the property CreatedBy. - /// - /// The user ID of the user that created the streaming session. - /// - /// - public string CreatedBy - { - get { return this._createdBy; } - set { this._createdBy = value; } - } - - // Check to see if CreatedBy property is set - internal bool IsSetCreatedBy() - { - return this._createdBy != null; - } - - /// - /// Gets and sets the property Ec2InstanceType. - /// - /// The EC2 Instance type used for the streaming session. - /// - /// - public string Ec2InstanceType - { - get { return this._ec2InstanceType; } - set { this._ec2InstanceType = value; } - } - - // Check to see if Ec2InstanceType property is set - internal bool IsSetEc2InstanceType() - { - return this._ec2InstanceType != null; - } - - /// - /// Gets and sets the property LaunchProfileId. - /// - /// The ID of the launch profile used to control access from the streaming session. - /// - /// - public string LaunchProfileId - { - get { return this._launchProfileId; } - set { this._launchProfileId = value; } - } - - // Check to see if LaunchProfileId property is set - internal bool IsSetLaunchProfileId() - { - return this._launchProfileId != null; - } - - /// - /// Gets and sets the property MaxBackupsToRetain. - /// - /// The maximum number of backups of a streaming session that you can have. When the maximum - /// number of backups is reached, the oldest backup is deleted. - /// - /// - [AWSProperty(Min=0, Max=10)] - public int? MaxBackupsToRetain - { - get { return this._maxBackupsToRetain; } - set { this._maxBackupsToRetain = value; } - } - - // Check to see if MaxBackupsToRetain property is set - internal bool IsSetMaxBackupsToRetain() - { - return this._maxBackupsToRetain.HasValue; - } - - /// - /// Gets and sets the property OwnedBy. - /// - /// The user ID of the user that owns the streaming session. The user that owns the session - /// will be logging into the session and interacting with the virtual workstation. - /// - /// - public string OwnedBy - { - get { return this._ownedBy; } - set { this._ownedBy = value; } - } - - // Check to see if OwnedBy property is set - internal bool IsSetOwnedBy() - { - return this._ownedBy != null; - } - - /// - /// Gets and sets the property SessionId. - /// - /// The session ID. - /// - /// - public string SessionId - { - get { return this._sessionId; } - set { this._sessionId = value; } - } - - // Check to see if SessionId property is set - internal bool IsSetSessionId() - { - return this._sessionId != null; - } - - /// - /// Gets and sets the property SessionPersistenceMode. - /// - /// Determine if a streaming session created from this launch profile can configure persistent - /// storage. This means that volumeConfiguration and automaticTerminationMode - /// are configured. - /// - /// - public SessionPersistenceMode SessionPersistenceMode - { - get { return this._sessionPersistenceMode; } - set { this._sessionPersistenceMode = value; } - } - - // Check to see if SessionPersistenceMode property is set - internal bool IsSetSessionPersistenceMode() - { - return this._sessionPersistenceMode != null; - } - - /// - /// Gets and sets the property StartedAt. - /// - /// The time the session entered START_IN_PROGRESS state. - /// - /// - public DateTime? StartedAt - { - get { return this._startedAt; } - set { this._startedAt = value; } - } - - // Check to see if StartedAt property is set - internal bool IsSetStartedAt() - { - return this._startedAt.HasValue; - } - - /// - /// Gets and sets the property StartedBy. - /// - /// The user ID of the user that started the streaming session. - /// - /// - public string StartedBy - { - get { return this._startedBy; } - set { this._startedBy = value; } - } - - // Check to see if StartedBy property is set - internal bool IsSetStartedBy() - { - return this._startedBy != null; - } - - /// - /// Gets and sets the property StartedFromBackupId. - /// - /// The backup ID used to restore a streaming session. - /// - /// - public string StartedFromBackupId - { - get { return this._startedFromBackupId; } - set { this._startedFromBackupId = value; } - } - - // Check to see if StartedFromBackupId property is set - internal bool IsSetStartedFromBackupId() - { - return this._startedFromBackupId != null; - } - - /// - /// Gets and sets the property State. - /// - /// The current state. - /// - /// - public StreamingSessionState State - { - get { return this._state; } - set { this._state = value; } - } - - // Check to see if State property is set - internal bool IsSetState() - { - return this._state != null; - } - - /// - /// Gets and sets the property StatusCode. - /// - /// The status code. - /// - /// - public StreamingSessionStatusCode StatusCode - { - get { return this._statusCode; } - set { this._statusCode = value; } - } - - // Check to see if StatusCode property is set - internal bool IsSetStatusCode() - { - return this._statusCode != null; - } - - /// - /// Gets and sets the property StatusMessage. - /// - /// The status message for the streaming session. - /// - /// - public string StatusMessage - { - get { return this._statusMessage; } - set { this._statusMessage = value; } - } - - // Check to see if StatusMessage property is set - internal bool IsSetStatusMessage() - { - return this._statusMessage != null; - } - - /// - /// Gets and sets the property StopAt. - /// - /// The time the streaming session will automatically be stopped if the user doesn’t stop - /// the session themselves. - /// - /// - public DateTime? StopAt - { - get { return this._stopAt; } - set { this._stopAt = value; } - } - - // Check to see if StopAt property is set - internal bool IsSetStopAt() - { - return this._stopAt.HasValue; - } - - /// - /// Gets and sets the property StoppedAt. - /// - /// The time the session entered STOP_IN_PROGRESS state. - /// - /// - public DateTime? StoppedAt - { - get { return this._stoppedAt; } - set { this._stoppedAt = value; } - } - - // Check to see if StoppedAt property is set - internal bool IsSetStoppedAt() - { - return this._stoppedAt.HasValue; - } - - /// - /// Gets and sets the property StoppedBy. - /// - /// The user ID of the user that stopped the streaming session. - /// - /// - public string StoppedBy - { - get { return this._stoppedBy; } - set { this._stoppedBy = value; } - } - - // Check to see if StoppedBy property is set - internal bool IsSetStoppedBy() - { - return this._stoppedBy != null; - } - - /// - /// Gets and sets the property StreamingImageId. - /// - /// The ID of the streaming image. - /// - /// - [AWSProperty(Min=0, Max=22)] - public string StreamingImageId - { - get { return this._streamingImageId; } - set { this._streamingImageId = value; } - } - - // Check to see if StreamingImageId property is set - internal bool IsSetStreamingImageId() - { - return this._streamingImageId != null; - } - - /// - /// Gets and sets the property Tags. - /// - /// A collection of labels, in the form of key-value pairs, that apply to this resource. - /// - /// - public Dictionary Tags - { - get { return this._tags; } - set { this._tags = value; } - } - - // Check to see if Tags property is set - internal bool IsSetTags() - { - return this._tags != null && (this._tags.Count > 0 || !AWSConfigs.InitializeCollections); - } - - /// - /// Gets and sets the property TerminateAt. - /// - /// The time the streaming session will automatically terminate if not terminated by the - /// user. - /// - /// - public DateTime? TerminateAt - { - get { return this._terminateAt; } - set { this._terminateAt = value; } - } - - // Check to see if TerminateAt property is set - internal bool IsSetTerminateAt() - { - return this._terminateAt.HasValue; - } - - /// - /// Gets and sets the property UpdatedAt. - /// - /// The ISO timestamp in seconds for when the resource was updated. - /// - /// - public DateTime? UpdatedAt - { - get { return this._updatedAt; } - set { this._updatedAt = value; } - } - - // Check to see if UpdatedAt property is set - internal bool IsSetUpdatedAt() - { - return this._updatedAt.HasValue; - } - - /// - /// Gets and sets the property UpdatedBy. - /// - /// The user ID of the user that most recently updated the resource. - /// - /// - public string UpdatedBy - { - get { return this._updatedBy; } - set { this._updatedBy = value; } - } - - // Check to see if UpdatedBy property is set - internal bool IsSetUpdatedBy() - { - return this._updatedBy != null; - } - - /// - /// Gets and sets the property VolumeConfiguration. - /// - /// Custom volume configuration for the root volumes that are attached to streaming sessions. - /// - /// - /// - /// This parameter is only allowed when sessionPersistenceMode is ACTIVATED. - /// - /// - public VolumeConfiguration VolumeConfiguration - { - get { return this._volumeConfiguration; } - set { this._volumeConfiguration = value; } - } - - // Check to see if VolumeConfiguration property is set - internal bool IsSetVolumeConfiguration() - { - return this._volumeConfiguration != null; - } - - /// - /// Gets and sets the property VolumeRetentionMode. - /// - /// Determine if an EBS volume created from this streaming session will be backed up. - /// - /// - public VolumeRetentionMode VolumeRetentionMode - { - get { return this._volumeRetentionMode; } - set { this._volumeRetentionMode = value; } - } - - // Check to see if VolumeRetentionMode property is set - internal bool IsSetVolumeRetentionMode() - { - return this._volumeRetentionMode != null; - } - - } -} \ No newline at end of file diff --git a/sdk/src/Services/NimbleStudio/Generated/Model/StreamingSessionBackup.cs b/sdk/src/Services/NimbleStudio/Generated/Model/StreamingSessionBackup.cs deleted file mode 100644 index 9804cbbd0132..000000000000 --- a/sdk/src/Services/NimbleStudio/Generated/Model/StreamingSessionBackup.cs +++ /dev/null @@ -1,227 +0,0 @@ -/* - * 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. - */ - -/* - * Do not modify this file. This file is generated from the nimble-2020-08-01.normal.json service model. - */ -using System; -using System.Collections.Generic; -using System.Xml.Serialization; -using System.Text; -using System.IO; -using System.Net; - -using Amazon.Runtime; -using Amazon.Runtime.Internal; - -#pragma warning disable CS0612,CS0618,CS1570 -namespace Amazon.NimbleStudio.Model -{ - /// - /// Information about the streaming session backup. - /// - public partial class StreamingSessionBackup - { - private string _arn; - private string _backupId; - private DateTime? _createdAt; - private string _launchProfileId; - private string _ownedBy; - private string _sessionId; - private StreamingSessionState _state; - private StreamingSessionStatusCode _statusCode; - private string _statusMessage; - private Dictionary _tags = AWSConfigs.InitializeCollections ? new Dictionary() : null; - - /// - /// Gets and sets the property Arn. - /// - /// The Amazon Resource Name (ARN) that is assigned to a studio resource and uniquely - /// identifies it. ARNs are unique across all Regions. - /// - /// - public string Arn - { - get { return this._arn; } - set { this._arn = value; } - } - - // Check to see if Arn property is set - internal bool IsSetArn() - { - return this._arn != null; - } - - /// - /// Gets and sets the property BackupId. - /// - /// The ID of the backup. - /// - /// - public string BackupId - { - get { return this._backupId; } - set { this._backupId = value; } - } - - // Check to see if BackupId property is set - internal bool IsSetBackupId() - { - return this._backupId != null; - } - - /// - /// Gets and sets the property CreatedAt. - /// - /// The ISO timestamp in for when the resource was created. - /// - /// - public DateTime? CreatedAt - { - get { return this._createdAt; } - set { this._createdAt = value; } - } - - // Check to see if CreatedAt property is set - internal bool IsSetCreatedAt() - { - return this._createdAt.HasValue; - } - - /// - /// Gets and sets the property LaunchProfileId. - /// - /// The ID of the launch profile which allowed the backups for the streaming session. - /// - /// - public string LaunchProfileId - { - get { return this._launchProfileId; } - set { this._launchProfileId = value; } - } - - // Check to see if LaunchProfileId property is set - internal bool IsSetLaunchProfileId() - { - return this._launchProfileId != null; - } - - /// - /// Gets and sets the property OwnedBy. - /// - /// The user ID of the user that owns the streaming session. - /// - /// - public string OwnedBy - { - get { return this._ownedBy; } - set { this._ownedBy = value; } - } - - // Check to see if OwnedBy property is set - internal bool IsSetOwnedBy() - { - return this._ownedBy != null; - } - - /// - /// Gets and sets the property SessionId. - /// - /// The streaming session ID for the StreamingSessionBackup. - /// - /// - public string SessionId - { - get { return this._sessionId; } - set { this._sessionId = value; } - } - - // Check to see if SessionId property is set - internal bool IsSetSessionId() - { - return this._sessionId != null; - } - - /// - /// Gets and sets the property State. - /// - public StreamingSessionState State - { - get { return this._state; } - set { this._state = value; } - } - - // Check to see if State property is set - internal bool IsSetState() - { - return this._state != null; - } - - /// - /// Gets and sets the property StatusCode. - /// - /// The status code. - /// - /// - public StreamingSessionStatusCode StatusCode - { - get { return this._statusCode; } - set { this._statusCode = value; } - } - - // Check to see if StatusCode property is set - internal bool IsSetStatusCode() - { - return this._statusCode != null; - } - - /// - /// Gets and sets the property StatusMessage. - /// - /// The status message for the streaming session backup. - /// - /// - public string StatusMessage - { - get { return this._statusMessage; } - set { this._statusMessage = value; } - } - - // Check to see if StatusMessage property is set - internal bool IsSetStatusMessage() - { - return this._statusMessage != null; - } - - /// - /// Gets and sets the property Tags. - /// - /// A collection of labels, in the form of key-value pairs, that apply to this resource. - /// - /// - public Dictionary Tags - { - get { return this._tags; } - set { this._tags = value; } - } - - // Check to see if Tags property is set - internal bool IsSetTags() - { - return this._tags != null && (this._tags.Count > 0 || !AWSConfigs.InitializeCollections); - } - - } -} \ No newline at end of file diff --git a/sdk/src/Services/NimbleStudio/Generated/Model/StreamingSessionStream.cs b/sdk/src/Services/NimbleStudio/Generated/Model/StreamingSessionStream.cs deleted file mode 100644 index 6120050a2ca3..000000000000 --- a/sdk/src/Services/NimbleStudio/Generated/Model/StreamingSessionStream.cs +++ /dev/null @@ -1,196 +0,0 @@ -/* - * 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. - */ - -/* - * Do not modify this file. This file is generated from the nimble-2020-08-01.normal.json service model. - */ -using System; -using System.Collections.Generic; -using System.Xml.Serialization; -using System.Text; -using System.IO; -using System.Net; - -using Amazon.Runtime; -using Amazon.Runtime.Internal; - -#pragma warning disable CS0612,CS0618,CS1570 -namespace Amazon.NimbleStudio.Model -{ - /// - /// A stream is an active connection to a streaming session, enabling a studio user to - /// control the streaming session using a compatible client. Streaming session streams - /// are compatible with the NICE DCV web client, included in the Nimble Studio portal, - /// or the NICE DCV desktop client. - /// - public partial class StreamingSessionStream - { - private DateTime? _createdAt; - private string _createdBy; - private DateTime? _expiresAt; - private string _ownedBy; - private StreamingSessionStreamState _state; - private StreamingSessionStreamStatusCode _statusCode; - private string _streamId; - private string _url; - - /// - /// Gets and sets the property CreatedAt. - /// - /// The ISO timestamp in seconds for when the resource was created. - /// - /// - public DateTime? CreatedAt - { - get { return this._createdAt; } - set { this._createdAt = value; } - } - - // Check to see if CreatedAt property is set - internal bool IsSetCreatedAt() - { - return this._createdAt.HasValue; - } - - /// - /// Gets and sets the property CreatedBy. - /// - /// The user ID of the user that created the streaming session stream. - /// - /// - public string CreatedBy - { - get { return this._createdBy; } - set { this._createdBy = value; } - } - - // Check to see if CreatedBy property is set - internal bool IsSetCreatedBy() - { - return this._createdBy != null; - } - - /// - /// Gets and sets the property ExpiresAt. - /// - /// The ISO timestamp in seconds for when the resource expires. - /// - /// - public DateTime? ExpiresAt - { - get { return this._expiresAt; } - set { this._expiresAt = value; } - } - - // Check to see if ExpiresAt property is set - internal bool IsSetExpiresAt() - { - return this._expiresAt.HasValue; - } - - /// - /// Gets and sets the property OwnedBy. - /// - /// The user ID of the user that owns the streaming session. The user that owns the session - /// will be logging into the session and interacting with the virtual workstation. - /// - /// - public string OwnedBy - { - get { return this._ownedBy; } - set { this._ownedBy = value; } - } - - // Check to see if OwnedBy property is set - internal bool IsSetOwnedBy() - { - return this._ownedBy != null; - } - - /// - /// Gets and sets the property State. - /// - /// The current state. - /// - /// - public StreamingSessionStreamState State - { - get { return this._state; } - set { this._state = value; } - } - - // Check to see if State property is set - internal bool IsSetState() - { - return this._state != null; - } - - /// - /// Gets and sets the property StatusCode. - /// - /// The streaming session stream status code. - /// - /// - public StreamingSessionStreamStatusCode StatusCode - { - get { return this._statusCode; } - set { this._statusCode = value; } - } - - // Check to see if StatusCode property is set - internal bool IsSetStatusCode() - { - return this._statusCode != null; - } - - /// - /// Gets and sets the property StreamId. - /// - /// The stream ID. - /// - /// - public string StreamId - { - get { return this._streamId; } - set { this._streamId = value; } - } - - // Check to see if StreamId property is set - internal bool IsSetStreamId() - { - return this._streamId != null; - } - - /// - /// Gets and sets the property Url. - /// - /// The URL to connect to this stream using the DCV client. - /// - /// - [AWSProperty(Sensitive=true)] - public string Url - { - get { return this._url; } - set { this._url = value; } - } - - // Check to see if Url property is set - internal bool IsSetUrl() - { - return this._url != null; - } - - } -} \ No newline at end of file diff --git a/sdk/src/Services/NimbleStudio/Generated/Model/Studio.cs b/sdk/src/Services/NimbleStudio/Generated/Model/Studio.cs deleted file mode 100644 index 99f8c7bce49c..000000000000 --- a/sdk/src/Services/NimbleStudio/Generated/Model/Studio.cs +++ /dev/null @@ -1,380 +0,0 @@ -/* - * 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. - */ - -/* - * Do not modify this file. This file is generated from the nimble-2020-08-01.normal.json service model. - */ -using System; -using System.Collections.Generic; -using System.Xml.Serialization; -using System.Text; -using System.IO; -using System.Net; - -using Amazon.Runtime; -using Amazon.Runtime.Internal; - -#pragma warning disable CS0612,CS0618,CS1570 -namespace Amazon.NimbleStudio.Model -{ - /// - /// Represents a studio resource. - /// - /// - /// - /// A studio is the core resource used with Nimble Studio. You must create a studio first, - /// before any other resource type can be created. All other resources you create and - /// manage in Nimble Studio are contained within a studio. - /// - /// - /// - /// When creating a studio, you must provides two IAM roles for use with the Nimble Studio - /// portal. These roles are assumed by your users when they log in to the Nimble Studio - /// portal via IAM Identity Center and your identity source. - /// - /// - /// - /// The user role must have the AmazonNimbleStudio-StudioUser managed policy attached - /// for the portal to function properly. - /// - /// - /// - /// The admin role must have the AmazonNimbleStudio-StudioAdmin managed policy - /// attached for the portal to function properly. - /// - /// - /// - /// Your studio roles must trust the identity.nimble.amazonaws.com service principal - /// to function properly. - /// - /// - public partial class Studio - { - private string _adminRoleArn; - private string _arn; - private DateTime? _createdAt; - private string _displayName; - private string _homeRegion; - private string _ssoClientId; - private StudioState _state; - private StudioStatusCode _statusCode; - private string _statusMessage; - private StudioEncryptionConfiguration _studioEncryptionConfiguration; - private string _studioId; - private string _studioName; - private string _studioUrl; - private Dictionary _tags = AWSConfigs.InitializeCollections ? new Dictionary() : null; - private DateTime? _updatedAt; - private string _userRoleArn; - - /// - /// Gets and sets the property AdminRoleArn. - /// - /// The IAM role that studio admins assume when logging in to the Nimble Studio portal. - /// - /// - [AWSProperty(Min=0, Max=2048)] - public string AdminRoleArn - { - get { return this._adminRoleArn; } - set { this._adminRoleArn = value; } - } - - // Check to see if AdminRoleArn property is set - internal bool IsSetAdminRoleArn() - { - return this._adminRoleArn != null; - } - - /// - /// Gets and sets the property Arn. - /// - /// The Amazon Resource Name (ARN) that is assigned to a studio resource and uniquely - /// identifies it. ARNs are unique across all Regions. - /// - /// - public string Arn - { - get { return this._arn; } - set { this._arn = value; } - } - - // Check to see if Arn property is set - internal bool IsSetArn() - { - return this._arn != null; - } - - /// - /// Gets and sets the property CreatedAt. - /// - /// The ISO timestamp in seconds for when the resource was created. - /// - /// - public DateTime? CreatedAt - { - get { return this._createdAt; } - set { this._createdAt = value; } - } - - // Check to see if CreatedAt property is set - internal bool IsSetCreatedAt() - { - return this._createdAt.HasValue; - } - - /// - /// Gets and sets the property DisplayName. - /// - /// A friendly name for the studio. - /// - /// - [AWSProperty(Sensitive=true, Min=0, Max=64)] - public string DisplayName - { - get { return this._displayName; } - set { this._displayName = value; } - } - - // Check to see if DisplayName property is set - internal bool IsSetDisplayName() - { - return this._displayName != null; - } - - /// - /// Gets and sets the property HomeRegion. - /// - /// The Amazon Web Services Region where the studio resource is located. - /// - /// - [AWSProperty(Min=0, Max=50)] - public string HomeRegion - { - get { return this._homeRegion; } - set { this._homeRegion = value; } - } - - // Check to see if HomeRegion property is set - internal bool IsSetHomeRegion() - { - return this._homeRegion != null; - } - - /// - /// Gets and sets the property SsoClientId. - /// - /// The IAM Identity Center application client ID used to integrate with IAM Identity - /// Center. This ID allows IAM Identity Center users to log in to Nimble Studio portal. - /// - /// - public string SsoClientId - { - get { return this._ssoClientId; } - set { this._ssoClientId = value; } - } - - // Check to see if SsoClientId property is set - internal bool IsSetSsoClientId() - { - return this._ssoClientId != null; - } - - /// - /// Gets and sets the property State. - /// - /// The current state of the studio resource. - /// - /// - public StudioState State - { - get { return this._state; } - set { this._state = value; } - } - - // Check to see if State property is set - internal bool IsSetState() - { - return this._state != null; - } - - /// - /// Gets and sets the property StatusCode. - /// - /// Status codes that provide additional detail on the studio state. - /// - /// - public StudioStatusCode StatusCode - { - get { return this._statusCode; } - set { this._statusCode = value; } - } - - // Check to see if StatusCode property is set - internal bool IsSetStatusCode() - { - return this._statusCode != null; - } - - /// - /// Gets and sets the property StatusMessage. - /// - /// Additional detail on the studio state. - /// - /// - public string StatusMessage - { - get { return this._statusMessage; } - set { this._statusMessage = value; } - } - - // Check to see if StatusMessage property is set - internal bool IsSetStatusMessage() - { - return this._statusMessage != null; - } - - /// - /// Gets and sets the property StudioEncryptionConfiguration. - /// - /// Configuration of the encryption method that is used for the studio. - /// - /// - public StudioEncryptionConfiguration StudioEncryptionConfiguration - { - get { return this._studioEncryptionConfiguration; } - set { this._studioEncryptionConfiguration = value; } - } - - // Check to see if StudioEncryptionConfiguration property is set - internal bool IsSetStudioEncryptionConfiguration() - { - return this._studioEncryptionConfiguration != null; - } - - /// - /// Gets and sets the property StudioId. - /// - /// The unique identifier for a studio resource. In Nimble Studio, all other resources - /// are contained in a studio resource. - /// - /// - public string StudioId - { - get { return this._studioId; } - set { this._studioId = value; } - } - - // Check to see if StudioId property is set - internal bool IsSetStudioId() - { - return this._studioId != null; - } - - /// - /// Gets and sets the property StudioName. - /// - /// The name of the studio, as included in the URL when accessing it in the Nimble Studio - /// portal. - /// - /// - [AWSProperty(Min=3, Max=64)] - public string StudioName - { - get { return this._studioName; } - set { this._studioName = value; } - } - - // Check to see if StudioName property is set - internal bool IsSetStudioName() - { - return this._studioName != null; - } - - /// - /// Gets and sets the property StudioUrl. - /// - /// The address of the web page for the studio. - /// - /// - public string StudioUrl - { - get { return this._studioUrl; } - set { this._studioUrl = value; } - } - - // Check to see if StudioUrl property is set - internal bool IsSetStudioUrl() - { - return this._studioUrl != null; - } - - /// - /// Gets and sets the property Tags. - /// - /// A collection of labels, in the form of key-value pairs, that apply to this resource. - /// - /// - public Dictionary Tags - { - get { return this._tags; } - set { this._tags = value; } - } - - // Check to see if Tags property is set - internal bool IsSetTags() - { - return this._tags != null && (this._tags.Count > 0 || !AWSConfigs.InitializeCollections); - } - - /// - /// Gets and sets the property UpdatedAt. - /// - /// The ISO timestamp in seconds for when the resource was updated. - /// - /// - public DateTime? UpdatedAt - { - get { return this._updatedAt; } - set { this._updatedAt = value; } - } - - // Check to see if UpdatedAt property is set - internal bool IsSetUpdatedAt() - { - return this._updatedAt.HasValue; - } - - /// - /// Gets and sets the property UserRoleArn. - /// - /// The IAM role that studio users assume when logging in to the Nimble Studio portal. - /// - /// - [AWSProperty(Min=0, Max=2048)] - public string UserRoleArn - { - get { return this._userRoleArn; } - set { this._userRoleArn = value; } - } - - // Check to see if UserRoleArn property is set - internal bool IsSetUserRoleArn() - { - return this._userRoleArn != null; - } - - } -} \ No newline at end of file diff --git a/sdk/src/Services/NimbleStudio/Generated/Model/StudioComponent.cs b/sdk/src/Services/NimbleStudio/Generated/Model/StudioComponent.cs deleted file mode 100644 index 6dad5bbef76a..000000000000 --- a/sdk/src/Services/NimbleStudio/Generated/Model/StudioComponent.cs +++ /dev/null @@ -1,445 +0,0 @@ -/* - * 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. - */ - -/* - * Do not modify this file. This file is generated from the nimble-2020-08-01.normal.json service model. - */ -using System; -using System.Collections.Generic; -using System.Xml.Serialization; -using System.Text; -using System.IO; -using System.Net; - -using Amazon.Runtime; -using Amazon.Runtime.Internal; - -#pragma warning disable CS0612,CS0618,CS1570 -namespace Amazon.NimbleStudio.Model -{ - /// - /// A studio component represents a network resource to be used by a studio's users and - /// workflows. A typical studio contains studio components for each of the following: - /// render farm, Active Directory, licensing, and file system. - /// - /// - /// - /// Access to a studio component is managed by specifying security groups for the resource, - /// as well as its endpoint. - /// - /// - /// - /// A studio component also has a set of initialization scripts that are returned by GetLaunchProfileInitialization. - /// These initialization scripts run on streaming sessions when they start. They provide - /// users with flexibility in controlling how the studio resources are configured on a - /// streaming session. - /// - /// - public partial class StudioComponent - { - private string _arn; - private StudioComponentConfiguration _configuration; - private DateTime? _createdAt; - private string _createdBy; - private string _description; - private List _ec2SecurityGroupIds = AWSConfigs.InitializeCollections ? new List() : null; - private List _initializationScripts = AWSConfigs.InitializeCollections ? new List() : null; - private string _name; - private string _runtimeRoleArn; - private List _scriptParameters = AWSConfigs.InitializeCollections ? new List() : null; - private string _secureInitializationRoleArn; - private StudioComponentState _state; - private StudioComponentStatusCode _statusCode; - private string _statusMessage; - private string _studioComponentId; - private StudioComponentSubtype _subtype; - private Dictionary _tags = AWSConfigs.InitializeCollections ? new Dictionary() : null; - private StudioComponentType _type; - private DateTime? _updatedAt; - private string _updatedBy; - - /// - /// Gets and sets the property Arn. - /// - /// The Amazon Resource Name (ARN) that is assigned to a studio resource and uniquely - /// identifies it. ARNs are unique across all Regions. - /// - /// - public string Arn - { - get { return this._arn; } - set { this._arn = value; } - } - - // Check to see if Arn property is set - internal bool IsSetArn() - { - return this._arn != null; - } - - /// - /// Gets and sets the property Configuration. - /// - /// The configuration of the studio component, based on component type. - /// - /// - public StudioComponentConfiguration Configuration - { - get { return this._configuration; } - set { this._configuration = value; } - } - - // Check to see if Configuration property is set - internal bool IsSetConfiguration() - { - return this._configuration != null; - } - - /// - /// Gets and sets the property CreatedAt. - /// - /// The ISO timestamp in seconds for when the resource was created. - /// - /// - public DateTime? CreatedAt - { - get { return this._createdAt; } - set { this._createdAt = value; } - } - - // Check to see if CreatedAt property is set - internal bool IsSetCreatedAt() - { - return this._createdAt.HasValue; - } - - /// - /// Gets and sets the property CreatedBy. - /// - /// The user ID of the user that created the studio component. - /// - /// - public string CreatedBy - { - get { return this._createdBy; } - set { this._createdBy = value; } - } - - // Check to see if CreatedBy property is set - internal bool IsSetCreatedBy() - { - return this._createdBy != null; - } - - /// - /// Gets and sets the property Description. - /// - /// A human-readable description for the studio component resource. - /// - /// - [AWSProperty(Sensitive=true, Min=0, Max=256)] - public string Description - { - get { return this._description; } - set { this._description = value; } - } - - // Check to see if Description property is set - internal bool IsSetDescription() - { - return this._description != null; - } - - /// - /// Gets and sets the property Ec2SecurityGroupIds. - /// - /// The EC2 security groups that control access to the studio component. - /// - /// - [AWSProperty(Min=0, Max=30)] - public List Ec2SecurityGroupIds - { - get { return this._ec2SecurityGroupIds; } - set { this._ec2SecurityGroupIds = value; } - } - - // Check to see if Ec2SecurityGroupIds property is set - internal bool IsSetEc2SecurityGroupIds() - { - return this._ec2SecurityGroupIds != null && (this._ec2SecurityGroupIds.Count > 0 || !AWSConfigs.InitializeCollections); - } - - /// - /// Gets and sets the property InitializationScripts. - /// - /// Initialization scripts for studio components. - /// - /// - public List InitializationScripts - { - get { return this._initializationScripts; } - set { this._initializationScripts = value; } - } - - // Check to see if InitializationScripts property is set - internal bool IsSetInitializationScripts() - { - return this._initializationScripts != null && (this._initializationScripts.Count > 0 || !AWSConfigs.InitializeCollections); - } - - /// - /// Gets and sets the property Name. - /// - /// A friendly name for the studio component resource. - /// - /// - [AWSProperty(Sensitive=true, Min=0, Max=64)] - public string Name - { - get { return this._name; } - set { this._name = value; } - } - - // Check to see if Name property is set - internal bool IsSetName() - { - return this._name != null; - } - - /// - /// Gets and sets the property RuntimeRoleArn. - /// - /// An IAM role attached to a Studio Component that gives the studio component access - /// to Amazon Web Services resources at anytime while the instance is running. - /// - /// - [AWSProperty(Min=0, Max=2048)] - public string RuntimeRoleArn - { - get { return this._runtimeRoleArn; } - set { this._runtimeRoleArn = value; } - } - - // Check to see if RuntimeRoleArn property is set - internal bool IsSetRuntimeRoleArn() - { - return this._runtimeRoleArn != null; - } - - /// - /// Gets and sets the property ScriptParameters. - /// - /// Parameters for the studio component scripts. - /// - /// - [AWSProperty(Sensitive=true, Min=0, Max=30)] - public List ScriptParameters - { - get { return this._scriptParameters; } - set { this._scriptParameters = value; } - } - - // Check to see if ScriptParameters property is set - internal bool IsSetScriptParameters() - { - return this._scriptParameters != null && (this._scriptParameters.Count > 0 || !AWSConfigs.InitializeCollections); - } - - /// - /// Gets and sets the property SecureInitializationRoleArn. - /// - /// An IAM role attached to Studio Component when the system initialization script runs - /// which give the studio component access to Amazon Web Services resources when the system - /// initialization script runs. - /// - /// - [AWSProperty(Min=0, Max=2048)] - public string SecureInitializationRoleArn - { - get { return this._secureInitializationRoleArn; } - set { this._secureInitializationRoleArn = value; } - } - - // Check to see if SecureInitializationRoleArn property is set - internal bool IsSetSecureInitializationRoleArn() - { - return this._secureInitializationRoleArn != null; - } - - /// - /// Gets and sets the property State. - /// - /// The current state. - /// - /// - public StudioComponentState State - { - get { return this._state; } - set { this._state = value; } - } - - // Check to see if State property is set - internal bool IsSetState() - { - return this._state != null; - } - - /// - /// Gets and sets the property StatusCode. - /// - /// The status code. - /// - /// - public StudioComponentStatusCode StatusCode - { - get { return this._statusCode; } - set { this._statusCode = value; } - } - - // Check to see if StatusCode property is set - internal bool IsSetStatusCode() - { - return this._statusCode != null; - } - - /// - /// Gets and sets the property StatusMessage. - /// - /// The status message for the studio component. - /// - /// - public string StatusMessage - { - get { return this._statusMessage; } - set { this._statusMessage = value; } - } - - // Check to see if StatusMessage property is set - internal bool IsSetStatusMessage() - { - return this._statusMessage != null; - } - - /// - /// Gets and sets the property StudioComponentId. - /// - /// The unique identifier for a studio component resource. - /// - /// - [AWSProperty(Min=0, Max=22)] - public string StudioComponentId - { - get { return this._studioComponentId; } - set { this._studioComponentId = value; } - } - - // Check to see if StudioComponentId property is set - internal bool IsSetStudioComponentId() - { - return this._studioComponentId != null; - } - - /// - /// Gets and sets the property Subtype. - /// - /// The specific subtype of a studio component. - /// - /// - public StudioComponentSubtype Subtype - { - get { return this._subtype; } - set { this._subtype = value; } - } - - // Check to see if Subtype property is set - internal bool IsSetSubtype() - { - return this._subtype != null; - } - - /// - /// Gets and sets the property Tags. - /// - /// A collection of labels, in the form of key-value pairs, that apply to this resource. - /// - /// - public Dictionary Tags - { - get { return this._tags; } - set { this._tags = value; } - } - - // Check to see if Tags property is set - internal bool IsSetTags() - { - return this._tags != null && (this._tags.Count > 0 || !AWSConfigs.InitializeCollections); - } - - /// - /// Gets and sets the property Type. - /// - /// The type of the studio component. - /// - /// - public StudioComponentType Type - { - get { return this._type; } - set { this._type = value; } - } - - // Check to see if Type property is set - internal bool IsSetType() - { - return this._type != null; - } - - /// - /// Gets and sets the property UpdatedAt. - /// - /// The ISO timestamp in seconds for when the resource was updated. - /// - /// - public DateTime? UpdatedAt - { - get { return this._updatedAt; } - set { this._updatedAt = value; } - } - - // Check to see if UpdatedAt property is set - internal bool IsSetUpdatedAt() - { - return this._updatedAt.HasValue; - } - - /// - /// Gets and sets the property UpdatedBy. - /// - /// The user ID of the user that most recently updated the resource. - /// - /// - public string UpdatedBy - { - get { return this._updatedBy; } - set { this._updatedBy = value; } - } - - // Check to see if UpdatedBy property is set - internal bool IsSetUpdatedBy() - { - return this._updatedBy != null; - } - - } -} \ No newline at end of file diff --git a/sdk/src/Services/NimbleStudio/Generated/Model/StudioComponentSummary.cs b/sdk/src/Services/NimbleStudio/Generated/Model/StudioComponentSummary.cs deleted file mode 100644 index 0589202b6c9e..000000000000 --- a/sdk/src/Services/NimbleStudio/Generated/Model/StudioComponentSummary.cs +++ /dev/null @@ -1,213 +0,0 @@ -/* - * 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. - */ - -/* - * Do not modify this file. This file is generated from the nimble-2020-08-01.normal.json service model. - */ -using System; -using System.Collections.Generic; -using System.Xml.Serialization; -using System.Text; -using System.IO; -using System.Net; - -using Amazon.Runtime; -using Amazon.Runtime.Internal; - -#pragma warning disable CS0612,CS0618,CS1570 -namespace Amazon.NimbleStudio.Model -{ - /// - /// The studio component's summary. - /// - public partial class StudioComponentSummary - { - private DateTime? _createdAt; - private string _createdBy; - private string _description; - private string _name; - private string _studioComponentId; - private StudioComponentSubtype _subtype; - private StudioComponentType _type; - private DateTime? _updatedAt; - private string _updatedBy; - - /// - /// Gets and sets the property CreatedAt. - /// - /// The ISO timestamp in seconds for when the resource was created. - /// - /// - public DateTime? CreatedAt - { - get { return this._createdAt; } - set { this._createdAt = value; } - } - - // Check to see if CreatedAt property is set - internal bool IsSetCreatedAt() - { - return this._createdAt.HasValue; - } - - /// - /// Gets and sets the property CreatedBy. - /// - /// The user ID of the user that created the studio component. - /// - /// - public string CreatedBy - { - get { return this._createdBy; } - set { this._createdBy = value; } - } - - // Check to see if CreatedBy property is set - internal bool IsSetCreatedBy() - { - return this._createdBy != null; - } - - /// - /// Gets and sets the property Description. - /// - /// The description. - /// - /// - [AWSProperty(Sensitive=true, Min=0, Max=256)] - public string Description - { - get { return this._description; } - set { this._description = value; } - } - - // Check to see if Description property is set - internal bool IsSetDescription() - { - return this._description != null; - } - - /// - /// Gets and sets the property Name. - /// - /// The name for the studio component. - /// - /// - [AWSProperty(Sensitive=true, Min=0, Max=64)] - public string Name - { - get { return this._name; } - set { this._name = value; } - } - - // Check to see if Name property is set - internal bool IsSetName() - { - return this._name != null; - } - - /// - /// Gets and sets the property StudioComponentId. - /// - /// The unique identifier for a studio component resource. - /// - /// - [AWSProperty(Min=0, Max=22)] - public string StudioComponentId - { - get { return this._studioComponentId; } - set { this._studioComponentId = value; } - } - - // Check to see if StudioComponentId property is set - internal bool IsSetStudioComponentId() - { - return this._studioComponentId != null; - } - - /// - /// Gets and sets the property Subtype. - /// - /// The specific subtype of a studio component. - /// - /// - public StudioComponentSubtype Subtype - { - get { return this._subtype; } - set { this._subtype = value; } - } - - // Check to see if Subtype property is set - internal bool IsSetSubtype() - { - return this._subtype != null; - } - - /// - /// Gets and sets the property Type. - /// - /// The type of the studio component. - /// - /// - public StudioComponentType Type - { - get { return this._type; } - set { this._type = value; } - } - - // Check to see if Type property is set - internal bool IsSetType() - { - return this._type != null; - } - - /// - /// Gets and sets the property UpdatedAt. - /// - /// The ISO timestamp in seconds for when the resource was updated. - /// - /// - public DateTime? UpdatedAt - { - get { return this._updatedAt; } - set { this._updatedAt = value; } - } - - // Check to see if UpdatedAt property is set - internal bool IsSetUpdatedAt() - { - return this._updatedAt.HasValue; - } - - /// - /// Gets and sets the property UpdatedBy. - /// - /// The user ID of the user that most recently updated the resource. - /// - /// - public string UpdatedBy - { - get { return this._updatedBy; } - set { this._updatedBy = value; } - } - - // Check to see if UpdatedBy property is set - internal bool IsSetUpdatedBy() - { - return this._updatedBy != null; - } - - } -} \ No newline at end of file diff --git a/sdk/src/Services/NimbleStudio/Generated/Model/ThrottlingException.cs b/sdk/src/Services/NimbleStudio/Generated/Model/ThrottlingException.cs deleted file mode 100644 index cf486f9faa46..000000000000 --- a/sdk/src/Services/NimbleStudio/Generated/Model/ThrottlingException.cs +++ /dev/null @@ -1,175 +0,0 @@ -/* - * 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. - */ - -/* - * Do not modify this file. This file is generated from the nimble-2020-08-01.normal.json service model. - */ -using System; -using System.Collections.Generic; -using System.Xml.Serialization; -using System.Text; -using System.IO; -using System.Net; - -using Amazon.Runtime; -using Amazon.Runtime.Internal; - -#pragma warning disable CS0612,CS0618,CS1570 -namespace Amazon.NimbleStudio.Model -{ - /// - /// The request throughput limit was exceeded. - /// - #if !NETSTANDARD - [Serializable] - #endif - public partial class ThrottlingException : AmazonNimbleStudioException - { - private string _code; - private Dictionary _context = AWSConfigs.InitializeCollections ? new Dictionary() : null; - - private RetryableDetails _retryableDetails = new RetryableDetails(false); - - /// - /// Constructs a new ThrottlingException with the specified error - /// message. - /// - /// - /// Describes the error encountered. - /// - public ThrottlingException(string message) - : base(message) {} - - /// - /// Construct instance of ThrottlingException - /// - /// - /// - public ThrottlingException(string message, Exception innerException) - : base(message, innerException) {} - - /// - /// Construct instance of ThrottlingException - /// - /// - public ThrottlingException(Exception innerException) - : base(innerException) {} - - /// - /// Construct instance of ThrottlingException - /// - /// - /// - /// - /// - /// - /// - public ThrottlingException(string message, Exception innerException, Amazon.Runtime.ErrorType errorType, string errorCode, string requestId, HttpStatusCode statusCode) - : base(message, innerException, errorType, errorCode, requestId, statusCode) {} - - /// - /// Construct instance of ThrottlingException - /// - /// - /// - /// - /// - /// - public ThrottlingException(string message, Amazon.Runtime.ErrorType errorType, string errorCode, string requestId, HttpStatusCode statusCode) - : base(message, errorType, errorCode, requestId, statusCode) {} - - -#if !NETSTANDARD - /// - /// Constructs a new instance of the ThrottlingException class with serialized data. - /// - /// The that holds the serialized object data about the exception being thrown. - /// The that contains contextual information about the source or destination. - /// The parameter is null. - /// The class name is null or is zero (0). - protected ThrottlingException(System.Runtime.Serialization.SerializationInfo info, System.Runtime.Serialization.StreamingContext context) - : base(info, context) - { - this.Code = (string)info.GetValue("Code", typeof(string)); - this.Context = (Dictionary)info.GetValue("Context", typeof(Dictionary)); - } - - /// - /// Sets the with information about the exception. - /// - /// The that holds the serialized object data about the exception being thrown. - /// The that contains contextual information about the source or destination. - /// The parameter is a null reference (Nothing in Visual Basic). - [System.Security.SecurityCritical] - // These FxCop rules are giving false-positives for this method - [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Security", "CA2123:OverrideLinkDemandsShouldBeIdenticalToBase")] - [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Security", "CA2134:MethodsMustOverrideWithConsistentTransparencyFxCopRule")] - public override void GetObjectData(System.Runtime.Serialization.SerializationInfo info, System.Runtime.Serialization.StreamingContext context) - { - base.GetObjectData(info, context); - info.AddValue("Code", this.Code); - info.AddValue("Context", this.Context); - } -#endif - - /// - /// Gets and sets the property Code. - /// - /// A more specific error code. - /// - /// - public string Code - { - get { return this._code; } - set { this._code = value; } - } - - // Check to see if Code property is set - internal bool IsSetCode() - { - return this._code != null; - } - - /// - /// Gets and sets the property Context. - /// - /// The exception context. - /// - /// - public Dictionary Context - { - get { return this._context; } - set { this._context = value; } - } - - // Check to see if Context property is set - internal bool IsSetContext() - { - return this._context != null && (this._context.Count > 0 || !AWSConfigs.InitializeCollections); - } - - /// - /// Flag indicating if the exception is retryable and the associated retry - /// details. A null value indicates that the exception is not retryable. - /// - public override RetryableDetails Retryable - { - get - { - return _retryableDetails; - } - } - } -} \ No newline at end of file diff --git a/sdk/src/Services/NimbleStudio/Generated/Model/ValidationException.cs b/sdk/src/Services/NimbleStudio/Generated/Model/ValidationException.cs deleted file mode 100644 index d43ba743510f..000000000000 --- a/sdk/src/Services/NimbleStudio/Generated/Model/ValidationException.cs +++ /dev/null @@ -1,162 +0,0 @@ -/* - * 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. - */ - -/* - * Do not modify this file. This file is generated from the nimble-2020-08-01.normal.json service model. - */ -using System; -using System.Collections.Generic; -using System.Xml.Serialization; -using System.Text; -using System.IO; -using System.Net; - -using Amazon.Runtime; -using Amazon.Runtime.Internal; - -#pragma warning disable CS0612,CS0618,CS1570 -namespace Amazon.NimbleStudio.Model -{ - /// - /// One of the parameters in the request is invalid. - /// - #if !NETSTANDARD - [Serializable] - #endif - public partial class ValidationException : AmazonNimbleStudioException - { - private string _code; - private Dictionary _context = AWSConfigs.InitializeCollections ? new Dictionary() : null; - - /// - /// Constructs a new ValidationException with the specified error - /// message. - /// - /// - /// Describes the error encountered. - /// - public ValidationException(string message) - : base(message) {} - - /// - /// Construct instance of ValidationException - /// - /// - /// - public ValidationException(string message, Exception innerException) - : base(message, innerException) {} - - /// - /// Construct instance of ValidationException - /// - /// - public ValidationException(Exception innerException) - : base(innerException) {} - - /// - /// Construct instance of ValidationException - /// - /// - /// - /// - /// - /// - /// - public ValidationException(string message, Exception innerException, Amazon.Runtime.ErrorType errorType, string errorCode, string requestId, HttpStatusCode statusCode) - : base(message, innerException, errorType, errorCode, requestId, statusCode) {} - - /// - /// Construct instance of ValidationException - /// - /// - /// - /// - /// - /// - public ValidationException(string message, Amazon.Runtime.ErrorType errorType, string errorCode, string requestId, HttpStatusCode statusCode) - : base(message, errorType, errorCode, requestId, statusCode) {} - - -#if !NETSTANDARD - /// - /// Constructs a new instance of the ValidationException class with serialized data. - /// - /// The that holds the serialized object data about the exception being thrown. - /// The that contains contextual information about the source or destination. - /// The parameter is null. - /// The class name is null or is zero (0). - protected ValidationException(System.Runtime.Serialization.SerializationInfo info, System.Runtime.Serialization.StreamingContext context) - : base(info, context) - { - this.Code = (string)info.GetValue("Code", typeof(string)); - this.Context = (Dictionary)info.GetValue("Context", typeof(Dictionary)); - } - - /// - /// Sets the with information about the exception. - /// - /// The that holds the serialized object data about the exception being thrown. - /// The that contains contextual information about the source or destination. - /// The parameter is a null reference (Nothing in Visual Basic). - [System.Security.SecurityCritical] - // These FxCop rules are giving false-positives for this method - [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Security", "CA2123:OverrideLinkDemandsShouldBeIdenticalToBase")] - [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Security", "CA2134:MethodsMustOverrideWithConsistentTransparencyFxCopRule")] - public override void GetObjectData(System.Runtime.Serialization.SerializationInfo info, System.Runtime.Serialization.StreamingContext context) - { - base.GetObjectData(info, context); - info.AddValue("Code", this.Code); - info.AddValue("Context", this.Context); - } -#endif - - /// - /// Gets and sets the property Code. - /// - /// A more specific error code. - /// - /// - public string Code - { - get { return this._code; } - set { this._code = value; } - } - - // Check to see if Code property is set - internal bool IsSetCode() - { - return this._code != null; - } - - /// - /// Gets and sets the property Context. - /// - /// The exception context. - /// - /// - public Dictionary Context - { - get { return this._context; } - set { this._context = value; } - } - - // Check to see if Context property is set - internal bool IsSetContext() - { - return this._context != null && (this._context.Count > 0 || !AWSConfigs.InitializeCollections); - } - - } -} \ No newline at end of file diff --git a/sdk/src/Services/NimbleStudio/Generated/Model/VolumeConfiguration.cs b/sdk/src/Services/NimbleStudio/Generated/Model/VolumeConfiguration.cs deleted file mode 100644 index 5ddfe3bd8606..000000000000 --- a/sdk/src/Services/NimbleStudio/Generated/Model/VolumeConfiguration.cs +++ /dev/null @@ -1,107 +0,0 @@ -/* - * 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. - */ - -/* - * Do not modify this file. This file is generated from the nimble-2020-08-01.normal.json service model. - */ -using System; -using System.Collections.Generic; -using System.Xml.Serialization; -using System.Text; -using System.IO; -using System.Net; - -using Amazon.Runtime; -using Amazon.Runtime.Internal; - -#pragma warning disable CS0612,CS0618,CS1570 -namespace Amazon.NimbleStudio.Model -{ - /// - /// Custom volume configuration for the root volumes that are attached to streaming sessions. - /// - /// - /// - /// This parameter is only allowed when sessionPersistenceMode is ACTIVATED. - /// - /// - public partial class VolumeConfiguration - { - private int? _iops; - private int? _size; - private int? _throughput; - - /// - /// Gets and sets the property Iops. - /// - /// The number of I/O operations per second for the root volume that is attached to streaming - /// session. - /// - /// - [AWSProperty(Min=3000, Max=16000)] - public int? Iops - { - get { return this._iops; } - set { this._iops = value; } - } - - // Check to see if Iops property is set - internal bool IsSetIops() - { - return this._iops.HasValue; - } - - /// - /// Gets and sets the property Size. - /// - /// The size of the root volume that is attached to the streaming session. The root volume - /// size is measured in GiBs. - /// - /// - [AWSProperty(Min=100, Max=16000)] - public int? Size - { - get { return this._size; } - set { this._size = value; } - } - - // Check to see if Size property is set - internal bool IsSetSize() - { - return this._size.HasValue; - } - - /// - /// Gets and sets the property Throughput. - /// - /// The throughput to provision for the root volume that is attached to the streaming - /// session. The throughput is measured in MiB/s. - /// - /// - [AWSProperty(Min=125, Max=1000)] - public int? Throughput - { - get { return this._throughput; } - set { this._throughput = value; } - } - - // Check to see if Throughput property is set - internal bool IsSetThroughput() - { - return this._throughput.HasValue; - } - - } -} \ No newline at end of file diff --git a/sdk/src/Services/NimbleStudio/Generated/Model/_bcl+netstandard/IListEulaAcceptancesPaginator.cs b/sdk/src/Services/NimbleStudio/Generated/Model/_bcl+netstandard/IListEulaAcceptancesPaginator.cs deleted file mode 100644 index 0acc799bb808..000000000000 --- a/sdk/src/Services/NimbleStudio/Generated/Model/_bcl+netstandard/IListEulaAcceptancesPaginator.cs +++ /dev/null @@ -1,39 +0,0 @@ -/* - * 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. - */ - -/* - * Do not modify this file. This file is generated from the nimble-2020-08-01.normal.json service model. - */ -using Amazon.Runtime; - -#pragma warning disable CS0612,CS0618 -namespace Amazon.NimbleStudio.Model -{ - /// - /// Paginator for the ListEulaAcceptances operation - /// - public interface IListEulaAcceptancesPaginator - { - /// - /// Enumerable containing all full responses for the operation - /// - IPaginatedEnumerable Responses { get; } - - /// - /// Enumerable containing all of the EulaAcceptances - /// - IPaginatedEnumerable EulaAcceptances { get; } - } -} \ No newline at end of file diff --git a/sdk/src/Services/NimbleStudio/Generated/Model/_bcl+netstandard/IListEulasPaginator.cs b/sdk/src/Services/NimbleStudio/Generated/Model/_bcl+netstandard/IListEulasPaginator.cs deleted file mode 100644 index 653c74eeaec8..000000000000 --- a/sdk/src/Services/NimbleStudio/Generated/Model/_bcl+netstandard/IListEulasPaginator.cs +++ /dev/null @@ -1,39 +0,0 @@ -/* - * 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. - */ - -/* - * Do not modify this file. This file is generated from the nimble-2020-08-01.normal.json service model. - */ -using Amazon.Runtime; - -#pragma warning disable CS0612,CS0618 -namespace Amazon.NimbleStudio.Model -{ - /// - /// Paginator for the ListEulas operation - /// - public interface IListEulasPaginator - { - /// - /// Enumerable containing all full responses for the operation - /// - IPaginatedEnumerable Responses { get; } - - /// - /// Enumerable containing all of the Eulas - /// - IPaginatedEnumerable Eulas { get; } - } -} \ No newline at end of file diff --git a/sdk/src/Services/NimbleStudio/Generated/Model/_bcl+netstandard/IListLaunchProfileMembersPaginator.cs b/sdk/src/Services/NimbleStudio/Generated/Model/_bcl+netstandard/IListLaunchProfileMembersPaginator.cs deleted file mode 100644 index d30ce2911551..000000000000 --- a/sdk/src/Services/NimbleStudio/Generated/Model/_bcl+netstandard/IListLaunchProfileMembersPaginator.cs +++ /dev/null @@ -1,39 +0,0 @@ -/* - * 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. - */ - -/* - * Do not modify this file. This file is generated from the nimble-2020-08-01.normal.json service model. - */ -using Amazon.Runtime; - -#pragma warning disable CS0612,CS0618 -namespace Amazon.NimbleStudio.Model -{ - /// - /// Paginator for the ListLaunchProfileMembers operation - /// - public interface IListLaunchProfileMembersPaginator - { - /// - /// Enumerable containing all full responses for the operation - /// - IPaginatedEnumerable Responses { get; } - - /// - /// Enumerable containing all of the Members - /// - IPaginatedEnumerable Members { get; } - } -} \ No newline at end of file diff --git a/sdk/src/Services/NimbleStudio/Generated/Model/_bcl+netstandard/IListLaunchProfilesPaginator.cs b/sdk/src/Services/NimbleStudio/Generated/Model/_bcl+netstandard/IListLaunchProfilesPaginator.cs deleted file mode 100644 index 29e7d307ed74..000000000000 --- a/sdk/src/Services/NimbleStudio/Generated/Model/_bcl+netstandard/IListLaunchProfilesPaginator.cs +++ /dev/null @@ -1,39 +0,0 @@ -/* - * 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. - */ - -/* - * Do not modify this file. This file is generated from the nimble-2020-08-01.normal.json service model. - */ -using Amazon.Runtime; - -#pragma warning disable CS0612,CS0618 -namespace Amazon.NimbleStudio.Model -{ - /// - /// Paginator for the ListLaunchProfiles operation - /// - public interface IListLaunchProfilesPaginator - { - /// - /// Enumerable containing all full responses for the operation - /// - IPaginatedEnumerable Responses { get; } - - /// - /// Enumerable containing all of the LaunchProfiles - /// - IPaginatedEnumerable LaunchProfiles { get; } - } -} \ No newline at end of file diff --git a/sdk/src/Services/NimbleStudio/Generated/Model/_bcl+netstandard/IListStreamingImagesPaginator.cs b/sdk/src/Services/NimbleStudio/Generated/Model/_bcl+netstandard/IListStreamingImagesPaginator.cs deleted file mode 100644 index 9bdde12e366f..000000000000 --- a/sdk/src/Services/NimbleStudio/Generated/Model/_bcl+netstandard/IListStreamingImagesPaginator.cs +++ /dev/null @@ -1,39 +0,0 @@ -/* - * 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. - */ - -/* - * Do not modify this file. This file is generated from the nimble-2020-08-01.normal.json service model. - */ -using Amazon.Runtime; - -#pragma warning disable CS0612,CS0618 -namespace Amazon.NimbleStudio.Model -{ - /// - /// Paginator for the ListStreamingImages operation - /// - public interface IListStreamingImagesPaginator - { - /// - /// Enumerable containing all full responses for the operation - /// - IPaginatedEnumerable Responses { get; } - - /// - /// Enumerable containing all of the StreamingImages - /// - IPaginatedEnumerable StreamingImages { get; } - } -} \ No newline at end of file diff --git a/sdk/src/Services/NimbleStudio/Generated/Model/_bcl+netstandard/IListStreamingSessionBackupsPaginator.cs b/sdk/src/Services/NimbleStudio/Generated/Model/_bcl+netstandard/IListStreamingSessionBackupsPaginator.cs deleted file mode 100644 index 82fb80f2d3ac..000000000000 --- a/sdk/src/Services/NimbleStudio/Generated/Model/_bcl+netstandard/IListStreamingSessionBackupsPaginator.cs +++ /dev/null @@ -1,39 +0,0 @@ -/* - * 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. - */ - -/* - * Do not modify this file. This file is generated from the nimble-2020-08-01.normal.json service model. - */ -using Amazon.Runtime; - -#pragma warning disable CS0612,CS0618 -namespace Amazon.NimbleStudio.Model -{ - /// - /// Paginator for the ListStreamingSessionBackups operation - /// - public interface IListStreamingSessionBackupsPaginator - { - /// - /// Enumerable containing all full responses for the operation - /// - IPaginatedEnumerable Responses { get; } - - /// - /// Enumerable containing all of the StreamingSessionBackups - /// - IPaginatedEnumerable StreamingSessionBackups { get; } - } -} \ No newline at end of file diff --git a/sdk/src/Services/NimbleStudio/Generated/Model/_bcl+netstandard/IListStreamingSessionsPaginator.cs b/sdk/src/Services/NimbleStudio/Generated/Model/_bcl+netstandard/IListStreamingSessionsPaginator.cs deleted file mode 100644 index e4a50f53cffd..000000000000 --- a/sdk/src/Services/NimbleStudio/Generated/Model/_bcl+netstandard/IListStreamingSessionsPaginator.cs +++ /dev/null @@ -1,39 +0,0 @@ -/* - * 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. - */ - -/* - * Do not modify this file. This file is generated from the nimble-2020-08-01.normal.json service model. - */ -using Amazon.Runtime; - -#pragma warning disable CS0612,CS0618 -namespace Amazon.NimbleStudio.Model -{ - /// - /// Paginator for the ListStreamingSessions operation - /// - public interface IListStreamingSessionsPaginator - { - /// - /// Enumerable containing all full responses for the operation - /// - IPaginatedEnumerable Responses { get; } - - /// - /// Enumerable containing all of the Sessions - /// - IPaginatedEnumerable Sessions { get; } - } -} \ No newline at end of file diff --git a/sdk/src/Services/NimbleStudio/Generated/Model/_bcl+netstandard/IListStudioComponentsPaginator.cs b/sdk/src/Services/NimbleStudio/Generated/Model/_bcl+netstandard/IListStudioComponentsPaginator.cs deleted file mode 100644 index 8a2b1dd7c2dc..000000000000 --- a/sdk/src/Services/NimbleStudio/Generated/Model/_bcl+netstandard/IListStudioComponentsPaginator.cs +++ /dev/null @@ -1,39 +0,0 @@ -/* - * 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. - */ - -/* - * Do not modify this file. This file is generated from the nimble-2020-08-01.normal.json service model. - */ -using Amazon.Runtime; - -#pragma warning disable CS0612,CS0618 -namespace Amazon.NimbleStudio.Model -{ - /// - /// Paginator for the ListStudioComponents operation - /// - public interface IListStudioComponentsPaginator - { - /// - /// Enumerable containing all full responses for the operation - /// - IPaginatedEnumerable Responses { get; } - - /// - /// Enumerable containing all of the StudioComponents - /// - IPaginatedEnumerable StudioComponents { get; } - } -} \ No newline at end of file diff --git a/sdk/src/Services/NimbleStudio/Generated/Model/_bcl+netstandard/IListStudioMembersPaginator.cs b/sdk/src/Services/NimbleStudio/Generated/Model/_bcl+netstandard/IListStudioMembersPaginator.cs deleted file mode 100644 index aaf5a0d4685b..000000000000 --- a/sdk/src/Services/NimbleStudio/Generated/Model/_bcl+netstandard/IListStudioMembersPaginator.cs +++ /dev/null @@ -1,39 +0,0 @@ -/* - * 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. - */ - -/* - * Do not modify this file. This file is generated from the nimble-2020-08-01.normal.json service model. - */ -using Amazon.Runtime; - -#pragma warning disable CS0612,CS0618 -namespace Amazon.NimbleStudio.Model -{ - /// - /// Paginator for the ListStudioMembers operation - /// - public interface IListStudioMembersPaginator - { - /// - /// Enumerable containing all full responses for the operation - /// - IPaginatedEnumerable Responses { get; } - - /// - /// Enumerable containing all of the Members - /// - IPaginatedEnumerable Members { get; } - } -} \ No newline at end of file diff --git a/sdk/src/Services/NimbleStudio/Generated/Model/_bcl+netstandard/IListStudiosPaginator.cs b/sdk/src/Services/NimbleStudio/Generated/Model/_bcl+netstandard/IListStudiosPaginator.cs deleted file mode 100644 index 0438ea2f0fe3..000000000000 --- a/sdk/src/Services/NimbleStudio/Generated/Model/_bcl+netstandard/IListStudiosPaginator.cs +++ /dev/null @@ -1,39 +0,0 @@ -/* - * 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. - */ - -/* - * Do not modify this file. This file is generated from the nimble-2020-08-01.normal.json service model. - */ -using Amazon.Runtime; - -#pragma warning disable CS0612,CS0618 -namespace Amazon.NimbleStudio.Model -{ - /// - /// Paginator for the ListStudios operation - /// - public interface IListStudiosPaginator - { - /// - /// Enumerable containing all full responses for the operation - /// - IPaginatedEnumerable Responses { get; } - - /// - /// Enumerable containing all of the Studios - /// - IPaginatedEnumerable Studios { get; } - } -} \ No newline at end of file diff --git a/sdk/src/Services/NimbleStudio/Generated/Model/_bcl+netstandard/INimbleStudioPaginatorFactory.cs b/sdk/src/Services/NimbleStudio/Generated/Model/_bcl+netstandard/INimbleStudioPaginatorFactory.cs deleted file mode 100644 index dcc1077bff8f..000000000000 --- a/sdk/src/Services/NimbleStudio/Generated/Model/_bcl+netstandard/INimbleStudioPaginatorFactory.cs +++ /dev/null @@ -1,79 +0,0 @@ -/* - * 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. - */ - -/* - * Do not modify this file. This file is generated from the nimble-2020-08-01.normal.json service model. - */ - -#pragma warning disable CS0612,CS0618 -namespace Amazon.NimbleStudio.Model -{ - /// - /// Paginators for the NimbleStudio service - /// - public interface INimbleStudioPaginatorFactory - { - - /// - /// Paginator for ListEulaAcceptances operation - /// - IListEulaAcceptancesPaginator ListEulaAcceptances(ListEulaAcceptancesRequest request); - - /// - /// Paginator for ListEulas operation - /// - IListEulasPaginator ListEulas(ListEulasRequest request); - - /// - /// Paginator for ListLaunchProfileMembers operation - /// - IListLaunchProfileMembersPaginator ListLaunchProfileMembers(ListLaunchProfileMembersRequest request); - - /// - /// Paginator for ListLaunchProfiles operation - /// - IListLaunchProfilesPaginator ListLaunchProfiles(ListLaunchProfilesRequest request); - - /// - /// Paginator for ListStreamingImages operation - /// - IListStreamingImagesPaginator ListStreamingImages(ListStreamingImagesRequest request); - - /// - /// Paginator for ListStreamingSessionBackups operation - /// - IListStreamingSessionBackupsPaginator ListStreamingSessionBackups(ListStreamingSessionBackupsRequest request); - - /// - /// Paginator for ListStreamingSessions operation - /// - IListStreamingSessionsPaginator ListStreamingSessions(ListStreamingSessionsRequest request); - - /// - /// Paginator for ListStudioComponents operation - /// - IListStudioComponentsPaginator ListStudioComponents(ListStudioComponentsRequest request); - - /// - /// Paginator for ListStudioMembers operation - /// - IListStudioMembersPaginator ListStudioMembers(ListStudioMembersRequest request); - - /// - /// Paginator for ListStudios operation - /// - IListStudiosPaginator ListStudios(ListStudiosRequest request); - } -} \ No newline at end of file diff --git a/sdk/src/Services/NimbleStudio/Generated/Model/_bcl+netstandard/ListEulaAcceptancesPaginator.cs b/sdk/src/Services/NimbleStudio/Generated/Model/_bcl+netstandard/ListEulaAcceptancesPaginator.cs deleted file mode 100644 index 36450539a056..000000000000 --- a/sdk/src/Services/NimbleStudio/Generated/Model/_bcl+netstandard/ListEulaAcceptancesPaginator.cs +++ /dev/null @@ -1,98 +0,0 @@ -/* - * 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. - */ - -/* - * Do not modify this file. This file is generated from the nimble-2020-08-01.normal.json service model. - */ - -using System; -using System.Collections.Generic; -using System.Text; -using System.Collections; -using System.Threading; -using System.Threading.Tasks; -using Amazon.Runtime; - -#pragma warning disable CS0612,CS0618 -namespace Amazon.NimbleStudio.Model -{ - /// - /// Base class for ListEulaAcceptances paginators. - /// - internal sealed partial class ListEulaAcceptancesPaginator : IPaginator, IListEulaAcceptancesPaginator - { - private readonly IAmazonNimbleStudio _client; - private readonly ListEulaAcceptancesRequest _request; - private int _isPaginatorInUse = 0; - - /// - /// Enumerable containing all full responses for the operation - /// - public IPaginatedEnumerable Responses => new PaginatedResponse(this); - - /// - /// Enumerable containing all of the EulaAcceptances - /// - public IPaginatedEnumerable EulaAcceptances => - new PaginatedResultKeyResponse(this, (i) => i.EulaAcceptances ?? new List()); - - internal ListEulaAcceptancesPaginator(IAmazonNimbleStudio client, ListEulaAcceptancesRequest request) - { - this._client = client; - this._request = request; - } -#if BCL - IEnumerable IPaginator.Paginate() - { - if (Interlocked.Exchange(ref _isPaginatorInUse, 1) != 0) - { - throw new System.InvalidOperationException("Paginator has already been consumed and cannot be reused. Please create a new instance."); - } - PaginatorUtils.SetUserAgentAdditionOnRequest(_request); - var nextToken = _request.NextToken; - ListEulaAcceptancesResponse response; - do - { - _request.NextToken = nextToken; - response = _client.ListEulaAcceptances(_request); - nextToken = response.NextToken; - yield return response; - } - while (!string.IsNullOrEmpty(nextToken)); - } -#endif -#if AWS_ASYNC_ENUMERABLES_API - async IAsyncEnumerable IPaginator.PaginateAsync([System.Runtime.CompilerServices.EnumeratorCancellation] CancellationToken cancellationToken) - { - if (Interlocked.Exchange(ref _isPaginatorInUse, 1) != 0) - { - throw new System.InvalidOperationException("Paginator has already been consumed and cannot be reused. Please create a new instance."); - } - PaginatorUtils.SetUserAgentAdditionOnRequest(_request); - var nextToken = _request.NextToken; - ListEulaAcceptancesResponse response; - do - { - _request.NextToken = nextToken; - response = await _client.ListEulaAcceptancesAsync(_request, cancellationToken).ConfigureAwait(false); - nextToken = response.NextToken; - cancellationToken.ThrowIfCancellationRequested(); - yield return response; - } - while (!string.IsNullOrEmpty(nextToken)); - } -#endif - } -} \ No newline at end of file diff --git a/sdk/src/Services/NimbleStudio/Generated/Model/_bcl+netstandard/ListEulasPaginator.cs b/sdk/src/Services/NimbleStudio/Generated/Model/_bcl+netstandard/ListEulasPaginator.cs deleted file mode 100644 index 679961be9e92..000000000000 --- a/sdk/src/Services/NimbleStudio/Generated/Model/_bcl+netstandard/ListEulasPaginator.cs +++ /dev/null @@ -1,98 +0,0 @@ -/* - * 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. - */ - -/* - * Do not modify this file. This file is generated from the nimble-2020-08-01.normal.json service model. - */ - -using System; -using System.Collections.Generic; -using System.Text; -using System.Collections; -using System.Threading; -using System.Threading.Tasks; -using Amazon.Runtime; - -#pragma warning disable CS0612,CS0618 -namespace Amazon.NimbleStudio.Model -{ - /// - /// Base class for ListEulas paginators. - /// - internal sealed partial class ListEulasPaginator : IPaginator, IListEulasPaginator - { - private readonly IAmazonNimbleStudio _client; - private readonly ListEulasRequest _request; - private int _isPaginatorInUse = 0; - - /// - /// Enumerable containing all full responses for the operation - /// - public IPaginatedEnumerable Responses => new PaginatedResponse(this); - - /// - /// Enumerable containing all of the Eulas - /// - public IPaginatedEnumerable Eulas => - new PaginatedResultKeyResponse(this, (i) => i.Eulas ?? new List()); - - internal ListEulasPaginator(IAmazonNimbleStudio client, ListEulasRequest request) - { - this._client = client; - this._request = request; - } -#if BCL - IEnumerable IPaginator.Paginate() - { - if (Interlocked.Exchange(ref _isPaginatorInUse, 1) != 0) - { - throw new System.InvalidOperationException("Paginator has already been consumed and cannot be reused. Please create a new instance."); - } - PaginatorUtils.SetUserAgentAdditionOnRequest(_request); - var nextToken = _request.NextToken; - ListEulasResponse response; - do - { - _request.NextToken = nextToken; - response = _client.ListEulas(_request); - nextToken = response.NextToken; - yield return response; - } - while (!string.IsNullOrEmpty(nextToken)); - } -#endif -#if AWS_ASYNC_ENUMERABLES_API - async IAsyncEnumerable IPaginator.PaginateAsync([System.Runtime.CompilerServices.EnumeratorCancellation] CancellationToken cancellationToken) - { - if (Interlocked.Exchange(ref _isPaginatorInUse, 1) != 0) - { - throw new System.InvalidOperationException("Paginator has already been consumed and cannot be reused. Please create a new instance."); - } - PaginatorUtils.SetUserAgentAdditionOnRequest(_request); - var nextToken = _request.NextToken; - ListEulasResponse response; - do - { - _request.NextToken = nextToken; - response = await _client.ListEulasAsync(_request, cancellationToken).ConfigureAwait(false); - nextToken = response.NextToken; - cancellationToken.ThrowIfCancellationRequested(); - yield return response; - } - while (!string.IsNullOrEmpty(nextToken)); - } -#endif - } -} \ No newline at end of file diff --git a/sdk/src/Services/NimbleStudio/Generated/Model/_bcl+netstandard/ListLaunchProfileMembersPaginator.cs b/sdk/src/Services/NimbleStudio/Generated/Model/_bcl+netstandard/ListLaunchProfileMembersPaginator.cs deleted file mode 100644 index 63e46c98d1a0..000000000000 --- a/sdk/src/Services/NimbleStudio/Generated/Model/_bcl+netstandard/ListLaunchProfileMembersPaginator.cs +++ /dev/null @@ -1,98 +0,0 @@ -/* - * 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. - */ - -/* - * Do not modify this file. This file is generated from the nimble-2020-08-01.normal.json service model. - */ - -using System; -using System.Collections.Generic; -using System.Text; -using System.Collections; -using System.Threading; -using System.Threading.Tasks; -using Amazon.Runtime; - -#pragma warning disable CS0612,CS0618 -namespace Amazon.NimbleStudio.Model -{ - /// - /// Base class for ListLaunchProfileMembers paginators. - /// - internal sealed partial class ListLaunchProfileMembersPaginator : IPaginator, IListLaunchProfileMembersPaginator - { - private readonly IAmazonNimbleStudio _client; - private readonly ListLaunchProfileMembersRequest _request; - private int _isPaginatorInUse = 0; - - /// - /// Enumerable containing all full responses for the operation - /// - public IPaginatedEnumerable Responses => new PaginatedResponse(this); - - /// - /// Enumerable containing all of the Members - /// - public IPaginatedEnumerable Members => - new PaginatedResultKeyResponse(this, (i) => i.Members ?? new List()); - - internal ListLaunchProfileMembersPaginator(IAmazonNimbleStudio client, ListLaunchProfileMembersRequest request) - { - this._client = client; - this._request = request; - } -#if BCL - IEnumerable IPaginator.Paginate() - { - if (Interlocked.Exchange(ref _isPaginatorInUse, 1) != 0) - { - throw new System.InvalidOperationException("Paginator has already been consumed and cannot be reused. Please create a new instance."); - } - PaginatorUtils.SetUserAgentAdditionOnRequest(_request); - var nextToken = _request.NextToken; - ListLaunchProfileMembersResponse response; - do - { - _request.NextToken = nextToken; - response = _client.ListLaunchProfileMembers(_request); - nextToken = response.NextToken; - yield return response; - } - while (!string.IsNullOrEmpty(nextToken)); - } -#endif -#if AWS_ASYNC_ENUMERABLES_API - async IAsyncEnumerable IPaginator.PaginateAsync([System.Runtime.CompilerServices.EnumeratorCancellation] CancellationToken cancellationToken) - { - if (Interlocked.Exchange(ref _isPaginatorInUse, 1) != 0) - { - throw new System.InvalidOperationException("Paginator has already been consumed and cannot be reused. Please create a new instance."); - } - PaginatorUtils.SetUserAgentAdditionOnRequest(_request); - var nextToken = _request.NextToken; - ListLaunchProfileMembersResponse response; - do - { - _request.NextToken = nextToken; - response = await _client.ListLaunchProfileMembersAsync(_request, cancellationToken).ConfigureAwait(false); - nextToken = response.NextToken; - cancellationToken.ThrowIfCancellationRequested(); - yield return response; - } - while (!string.IsNullOrEmpty(nextToken)); - } -#endif - } -} \ No newline at end of file diff --git a/sdk/src/Services/NimbleStudio/Generated/Model/_bcl+netstandard/ListLaunchProfilesPaginator.cs b/sdk/src/Services/NimbleStudio/Generated/Model/_bcl+netstandard/ListLaunchProfilesPaginator.cs deleted file mode 100644 index 69227dad5094..000000000000 --- a/sdk/src/Services/NimbleStudio/Generated/Model/_bcl+netstandard/ListLaunchProfilesPaginator.cs +++ /dev/null @@ -1,98 +0,0 @@ -/* - * 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. - */ - -/* - * Do not modify this file. This file is generated from the nimble-2020-08-01.normal.json service model. - */ - -using System; -using System.Collections.Generic; -using System.Text; -using System.Collections; -using System.Threading; -using System.Threading.Tasks; -using Amazon.Runtime; - -#pragma warning disable CS0612,CS0618 -namespace Amazon.NimbleStudio.Model -{ - /// - /// Base class for ListLaunchProfiles paginators. - /// - internal sealed partial class ListLaunchProfilesPaginator : IPaginator, IListLaunchProfilesPaginator - { - private readonly IAmazonNimbleStudio _client; - private readonly ListLaunchProfilesRequest _request; - private int _isPaginatorInUse = 0; - - /// - /// Enumerable containing all full responses for the operation - /// - public IPaginatedEnumerable Responses => new PaginatedResponse(this); - - /// - /// Enumerable containing all of the LaunchProfiles - /// - public IPaginatedEnumerable LaunchProfiles => - new PaginatedResultKeyResponse(this, (i) => i.LaunchProfiles ?? new List()); - - internal ListLaunchProfilesPaginator(IAmazonNimbleStudio client, ListLaunchProfilesRequest request) - { - this._client = client; - this._request = request; - } -#if BCL - IEnumerable IPaginator.Paginate() - { - if (Interlocked.Exchange(ref _isPaginatorInUse, 1) != 0) - { - throw new System.InvalidOperationException("Paginator has already been consumed and cannot be reused. Please create a new instance."); - } - PaginatorUtils.SetUserAgentAdditionOnRequest(_request); - var nextToken = _request.NextToken; - ListLaunchProfilesResponse response; - do - { - _request.NextToken = nextToken; - response = _client.ListLaunchProfiles(_request); - nextToken = response.NextToken; - yield return response; - } - while (!string.IsNullOrEmpty(nextToken)); - } -#endif -#if AWS_ASYNC_ENUMERABLES_API - async IAsyncEnumerable IPaginator.PaginateAsync([System.Runtime.CompilerServices.EnumeratorCancellation] CancellationToken cancellationToken) - { - if (Interlocked.Exchange(ref _isPaginatorInUse, 1) != 0) - { - throw new System.InvalidOperationException("Paginator has already been consumed and cannot be reused. Please create a new instance."); - } - PaginatorUtils.SetUserAgentAdditionOnRequest(_request); - var nextToken = _request.NextToken; - ListLaunchProfilesResponse response; - do - { - _request.NextToken = nextToken; - response = await _client.ListLaunchProfilesAsync(_request, cancellationToken).ConfigureAwait(false); - nextToken = response.NextToken; - cancellationToken.ThrowIfCancellationRequested(); - yield return response; - } - while (!string.IsNullOrEmpty(nextToken)); - } -#endif - } -} \ No newline at end of file diff --git a/sdk/src/Services/NimbleStudio/Generated/Model/_bcl+netstandard/ListStreamingImagesPaginator.cs b/sdk/src/Services/NimbleStudio/Generated/Model/_bcl+netstandard/ListStreamingImagesPaginator.cs deleted file mode 100644 index e31e12c2f088..000000000000 --- a/sdk/src/Services/NimbleStudio/Generated/Model/_bcl+netstandard/ListStreamingImagesPaginator.cs +++ /dev/null @@ -1,98 +0,0 @@ -/* - * 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. - */ - -/* - * Do not modify this file. This file is generated from the nimble-2020-08-01.normal.json service model. - */ - -using System; -using System.Collections.Generic; -using System.Text; -using System.Collections; -using System.Threading; -using System.Threading.Tasks; -using Amazon.Runtime; - -#pragma warning disable CS0612,CS0618 -namespace Amazon.NimbleStudio.Model -{ - /// - /// Base class for ListStreamingImages paginators. - /// - internal sealed partial class ListStreamingImagesPaginator : IPaginator, IListStreamingImagesPaginator - { - private readonly IAmazonNimbleStudio _client; - private readonly ListStreamingImagesRequest _request; - private int _isPaginatorInUse = 0; - - /// - /// Enumerable containing all full responses for the operation - /// - public IPaginatedEnumerable Responses => new PaginatedResponse(this); - - /// - /// Enumerable containing all of the StreamingImages - /// - public IPaginatedEnumerable StreamingImages => - new PaginatedResultKeyResponse(this, (i) => i.StreamingImages ?? new List()); - - internal ListStreamingImagesPaginator(IAmazonNimbleStudio client, ListStreamingImagesRequest request) - { - this._client = client; - this._request = request; - } -#if BCL - IEnumerable IPaginator.Paginate() - { - if (Interlocked.Exchange(ref _isPaginatorInUse, 1) != 0) - { - throw new System.InvalidOperationException("Paginator has already been consumed and cannot be reused. Please create a new instance."); - } - PaginatorUtils.SetUserAgentAdditionOnRequest(_request); - var nextToken = _request.NextToken; - ListStreamingImagesResponse response; - do - { - _request.NextToken = nextToken; - response = _client.ListStreamingImages(_request); - nextToken = response.NextToken; - yield return response; - } - while (!string.IsNullOrEmpty(nextToken)); - } -#endif -#if AWS_ASYNC_ENUMERABLES_API - async IAsyncEnumerable IPaginator.PaginateAsync([System.Runtime.CompilerServices.EnumeratorCancellation] CancellationToken cancellationToken) - { - if (Interlocked.Exchange(ref _isPaginatorInUse, 1) != 0) - { - throw new System.InvalidOperationException("Paginator has already been consumed and cannot be reused. Please create a new instance."); - } - PaginatorUtils.SetUserAgentAdditionOnRequest(_request); - var nextToken = _request.NextToken; - ListStreamingImagesResponse response; - do - { - _request.NextToken = nextToken; - response = await _client.ListStreamingImagesAsync(_request, cancellationToken).ConfigureAwait(false); - nextToken = response.NextToken; - cancellationToken.ThrowIfCancellationRequested(); - yield return response; - } - while (!string.IsNullOrEmpty(nextToken)); - } -#endif - } -} \ No newline at end of file diff --git a/sdk/src/Services/NimbleStudio/Generated/Model/_bcl+netstandard/ListStreamingSessionBackupsPaginator.cs b/sdk/src/Services/NimbleStudio/Generated/Model/_bcl+netstandard/ListStreamingSessionBackupsPaginator.cs deleted file mode 100644 index cc62a7f2d1d0..000000000000 --- a/sdk/src/Services/NimbleStudio/Generated/Model/_bcl+netstandard/ListStreamingSessionBackupsPaginator.cs +++ /dev/null @@ -1,98 +0,0 @@ -/* - * 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. - */ - -/* - * Do not modify this file. This file is generated from the nimble-2020-08-01.normal.json service model. - */ - -using System; -using System.Collections.Generic; -using System.Text; -using System.Collections; -using System.Threading; -using System.Threading.Tasks; -using Amazon.Runtime; - -#pragma warning disable CS0612,CS0618 -namespace Amazon.NimbleStudio.Model -{ - /// - /// Base class for ListStreamingSessionBackups paginators. - /// - internal sealed partial class ListStreamingSessionBackupsPaginator : IPaginator, IListStreamingSessionBackupsPaginator - { - private readonly IAmazonNimbleStudio _client; - private readonly ListStreamingSessionBackupsRequest _request; - private int _isPaginatorInUse = 0; - - /// - /// Enumerable containing all full responses for the operation - /// - public IPaginatedEnumerable Responses => new PaginatedResponse(this); - - /// - /// Enumerable containing all of the StreamingSessionBackups - /// - public IPaginatedEnumerable StreamingSessionBackups => - new PaginatedResultKeyResponse(this, (i) => i.StreamingSessionBackups ?? new List()); - - internal ListStreamingSessionBackupsPaginator(IAmazonNimbleStudio client, ListStreamingSessionBackupsRequest request) - { - this._client = client; - this._request = request; - } -#if BCL - IEnumerable IPaginator.Paginate() - { - if (Interlocked.Exchange(ref _isPaginatorInUse, 1) != 0) - { - throw new System.InvalidOperationException("Paginator has already been consumed and cannot be reused. Please create a new instance."); - } - PaginatorUtils.SetUserAgentAdditionOnRequest(_request); - var nextToken = _request.NextToken; - ListStreamingSessionBackupsResponse response; - do - { - _request.NextToken = nextToken; - response = _client.ListStreamingSessionBackups(_request); - nextToken = response.NextToken; - yield return response; - } - while (!string.IsNullOrEmpty(nextToken)); - } -#endif -#if AWS_ASYNC_ENUMERABLES_API - async IAsyncEnumerable IPaginator.PaginateAsync([System.Runtime.CompilerServices.EnumeratorCancellation] CancellationToken cancellationToken) - { - if (Interlocked.Exchange(ref _isPaginatorInUse, 1) != 0) - { - throw new System.InvalidOperationException("Paginator has already been consumed and cannot be reused. Please create a new instance."); - } - PaginatorUtils.SetUserAgentAdditionOnRequest(_request); - var nextToken = _request.NextToken; - ListStreamingSessionBackupsResponse response; - do - { - _request.NextToken = nextToken; - response = await _client.ListStreamingSessionBackupsAsync(_request, cancellationToken).ConfigureAwait(false); - nextToken = response.NextToken; - cancellationToken.ThrowIfCancellationRequested(); - yield return response; - } - while (!string.IsNullOrEmpty(nextToken)); - } -#endif - } -} \ No newline at end of file diff --git a/sdk/src/Services/NimbleStudio/Generated/Model/_bcl+netstandard/ListStreamingSessionsPaginator.cs b/sdk/src/Services/NimbleStudio/Generated/Model/_bcl+netstandard/ListStreamingSessionsPaginator.cs deleted file mode 100644 index 0ad325a507f8..000000000000 --- a/sdk/src/Services/NimbleStudio/Generated/Model/_bcl+netstandard/ListStreamingSessionsPaginator.cs +++ /dev/null @@ -1,98 +0,0 @@ -/* - * 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. - */ - -/* - * Do not modify this file. This file is generated from the nimble-2020-08-01.normal.json service model. - */ - -using System; -using System.Collections.Generic; -using System.Text; -using System.Collections; -using System.Threading; -using System.Threading.Tasks; -using Amazon.Runtime; - -#pragma warning disable CS0612,CS0618 -namespace Amazon.NimbleStudio.Model -{ - /// - /// Base class for ListStreamingSessions paginators. - /// - internal sealed partial class ListStreamingSessionsPaginator : IPaginator, IListStreamingSessionsPaginator - { - private readonly IAmazonNimbleStudio _client; - private readonly ListStreamingSessionsRequest _request; - private int _isPaginatorInUse = 0; - - /// - /// Enumerable containing all full responses for the operation - /// - public IPaginatedEnumerable Responses => new PaginatedResponse(this); - - /// - /// Enumerable containing all of the Sessions - /// - public IPaginatedEnumerable Sessions => - new PaginatedResultKeyResponse(this, (i) => i.Sessions ?? new List()); - - internal ListStreamingSessionsPaginator(IAmazonNimbleStudio client, ListStreamingSessionsRequest request) - { - this._client = client; - this._request = request; - } -#if BCL - IEnumerable IPaginator.Paginate() - { - if (Interlocked.Exchange(ref _isPaginatorInUse, 1) != 0) - { - throw new System.InvalidOperationException("Paginator has already been consumed and cannot be reused. Please create a new instance."); - } - PaginatorUtils.SetUserAgentAdditionOnRequest(_request); - var nextToken = _request.NextToken; - ListStreamingSessionsResponse response; - do - { - _request.NextToken = nextToken; - response = _client.ListStreamingSessions(_request); - nextToken = response.NextToken; - yield return response; - } - while (!string.IsNullOrEmpty(nextToken)); - } -#endif -#if AWS_ASYNC_ENUMERABLES_API - async IAsyncEnumerable IPaginator.PaginateAsync([System.Runtime.CompilerServices.EnumeratorCancellation] CancellationToken cancellationToken) - { - if (Interlocked.Exchange(ref _isPaginatorInUse, 1) != 0) - { - throw new System.InvalidOperationException("Paginator has already been consumed and cannot be reused. Please create a new instance."); - } - PaginatorUtils.SetUserAgentAdditionOnRequest(_request); - var nextToken = _request.NextToken; - ListStreamingSessionsResponse response; - do - { - _request.NextToken = nextToken; - response = await _client.ListStreamingSessionsAsync(_request, cancellationToken).ConfigureAwait(false); - nextToken = response.NextToken; - cancellationToken.ThrowIfCancellationRequested(); - yield return response; - } - while (!string.IsNullOrEmpty(nextToken)); - } -#endif - } -} \ No newline at end of file diff --git a/sdk/src/Services/NimbleStudio/Generated/Model/_bcl+netstandard/ListStudioComponentsPaginator.cs b/sdk/src/Services/NimbleStudio/Generated/Model/_bcl+netstandard/ListStudioComponentsPaginator.cs deleted file mode 100644 index 1147e1931ced..000000000000 --- a/sdk/src/Services/NimbleStudio/Generated/Model/_bcl+netstandard/ListStudioComponentsPaginator.cs +++ /dev/null @@ -1,98 +0,0 @@ -/* - * 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. - */ - -/* - * Do not modify this file. This file is generated from the nimble-2020-08-01.normal.json service model. - */ - -using System; -using System.Collections.Generic; -using System.Text; -using System.Collections; -using System.Threading; -using System.Threading.Tasks; -using Amazon.Runtime; - -#pragma warning disable CS0612,CS0618 -namespace Amazon.NimbleStudio.Model -{ - /// - /// Base class for ListStudioComponents paginators. - /// - internal sealed partial class ListStudioComponentsPaginator : IPaginator, IListStudioComponentsPaginator - { - private readonly IAmazonNimbleStudio _client; - private readonly ListStudioComponentsRequest _request; - private int _isPaginatorInUse = 0; - - /// - /// Enumerable containing all full responses for the operation - /// - public IPaginatedEnumerable Responses => new PaginatedResponse(this); - - /// - /// Enumerable containing all of the StudioComponents - /// - public IPaginatedEnumerable StudioComponents => - new PaginatedResultKeyResponse(this, (i) => i.StudioComponents ?? new List()); - - internal ListStudioComponentsPaginator(IAmazonNimbleStudio client, ListStudioComponentsRequest request) - { - this._client = client; - this._request = request; - } -#if BCL - IEnumerable IPaginator.Paginate() - { - if (Interlocked.Exchange(ref _isPaginatorInUse, 1) != 0) - { - throw new System.InvalidOperationException("Paginator has already been consumed and cannot be reused. Please create a new instance."); - } - PaginatorUtils.SetUserAgentAdditionOnRequest(_request); - var nextToken = _request.NextToken; - ListStudioComponentsResponse response; - do - { - _request.NextToken = nextToken; - response = _client.ListStudioComponents(_request); - nextToken = response.NextToken; - yield return response; - } - while (!string.IsNullOrEmpty(nextToken)); - } -#endif -#if AWS_ASYNC_ENUMERABLES_API - async IAsyncEnumerable IPaginator.PaginateAsync([System.Runtime.CompilerServices.EnumeratorCancellation] CancellationToken cancellationToken) - { - if (Interlocked.Exchange(ref _isPaginatorInUse, 1) != 0) - { - throw new System.InvalidOperationException("Paginator has already been consumed and cannot be reused. Please create a new instance."); - } - PaginatorUtils.SetUserAgentAdditionOnRequest(_request); - var nextToken = _request.NextToken; - ListStudioComponentsResponse response; - do - { - _request.NextToken = nextToken; - response = await _client.ListStudioComponentsAsync(_request, cancellationToken).ConfigureAwait(false); - nextToken = response.NextToken; - cancellationToken.ThrowIfCancellationRequested(); - yield return response; - } - while (!string.IsNullOrEmpty(nextToken)); - } -#endif - } -} \ No newline at end of file diff --git a/sdk/src/Services/NimbleStudio/Generated/Model/_bcl+netstandard/ListStudioMembersPaginator.cs b/sdk/src/Services/NimbleStudio/Generated/Model/_bcl+netstandard/ListStudioMembersPaginator.cs deleted file mode 100644 index 243df4fbd581..000000000000 --- a/sdk/src/Services/NimbleStudio/Generated/Model/_bcl+netstandard/ListStudioMembersPaginator.cs +++ /dev/null @@ -1,98 +0,0 @@ -/* - * 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. - */ - -/* - * Do not modify this file. This file is generated from the nimble-2020-08-01.normal.json service model. - */ - -using System; -using System.Collections.Generic; -using System.Text; -using System.Collections; -using System.Threading; -using System.Threading.Tasks; -using Amazon.Runtime; - -#pragma warning disable CS0612,CS0618 -namespace Amazon.NimbleStudio.Model -{ - /// - /// Base class for ListStudioMembers paginators. - /// - internal sealed partial class ListStudioMembersPaginator : IPaginator, IListStudioMembersPaginator - { - private readonly IAmazonNimbleStudio _client; - private readonly ListStudioMembersRequest _request; - private int _isPaginatorInUse = 0; - - /// - /// Enumerable containing all full responses for the operation - /// - public IPaginatedEnumerable Responses => new PaginatedResponse(this); - - /// - /// Enumerable containing all of the Members - /// - public IPaginatedEnumerable Members => - new PaginatedResultKeyResponse(this, (i) => i.Members ?? new List()); - - internal ListStudioMembersPaginator(IAmazonNimbleStudio client, ListStudioMembersRequest request) - { - this._client = client; - this._request = request; - } -#if BCL - IEnumerable IPaginator.Paginate() - { - if (Interlocked.Exchange(ref _isPaginatorInUse, 1) != 0) - { - throw new System.InvalidOperationException("Paginator has already been consumed and cannot be reused. Please create a new instance."); - } - PaginatorUtils.SetUserAgentAdditionOnRequest(_request); - var nextToken = _request.NextToken; - ListStudioMembersResponse response; - do - { - _request.NextToken = nextToken; - response = _client.ListStudioMembers(_request); - nextToken = response.NextToken; - yield return response; - } - while (!string.IsNullOrEmpty(nextToken)); - } -#endif -#if AWS_ASYNC_ENUMERABLES_API - async IAsyncEnumerable IPaginator.PaginateAsync([System.Runtime.CompilerServices.EnumeratorCancellation] CancellationToken cancellationToken) - { - if (Interlocked.Exchange(ref _isPaginatorInUse, 1) != 0) - { - throw new System.InvalidOperationException("Paginator has already been consumed and cannot be reused. Please create a new instance."); - } - PaginatorUtils.SetUserAgentAdditionOnRequest(_request); - var nextToken = _request.NextToken; - ListStudioMembersResponse response; - do - { - _request.NextToken = nextToken; - response = await _client.ListStudioMembersAsync(_request, cancellationToken).ConfigureAwait(false); - nextToken = response.NextToken; - cancellationToken.ThrowIfCancellationRequested(); - yield return response; - } - while (!string.IsNullOrEmpty(nextToken)); - } -#endif - } -} \ No newline at end of file diff --git a/sdk/src/Services/NimbleStudio/Generated/Model/_bcl+netstandard/ListStudiosPaginator.cs b/sdk/src/Services/NimbleStudio/Generated/Model/_bcl+netstandard/ListStudiosPaginator.cs deleted file mode 100644 index bff1469d69bf..000000000000 --- a/sdk/src/Services/NimbleStudio/Generated/Model/_bcl+netstandard/ListStudiosPaginator.cs +++ /dev/null @@ -1,98 +0,0 @@ -/* - * 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. - */ - -/* - * Do not modify this file. This file is generated from the nimble-2020-08-01.normal.json service model. - */ - -using System; -using System.Collections.Generic; -using System.Text; -using System.Collections; -using System.Threading; -using System.Threading.Tasks; -using Amazon.Runtime; - -#pragma warning disable CS0612,CS0618 -namespace Amazon.NimbleStudio.Model -{ - /// - /// Base class for ListStudios paginators. - /// - internal sealed partial class ListStudiosPaginator : IPaginator, IListStudiosPaginator - { - private readonly IAmazonNimbleStudio _client; - private readonly ListStudiosRequest _request; - private int _isPaginatorInUse = 0; - - /// - /// Enumerable containing all full responses for the operation - /// - public IPaginatedEnumerable Responses => new PaginatedResponse(this); - - /// - /// Enumerable containing all of the Studios - /// - public IPaginatedEnumerable Studios => - new PaginatedResultKeyResponse(this, (i) => i.Studios ?? new List()); - - internal ListStudiosPaginator(IAmazonNimbleStudio client, ListStudiosRequest request) - { - this._client = client; - this._request = request; - } -#if BCL - IEnumerable IPaginator.Paginate() - { - if (Interlocked.Exchange(ref _isPaginatorInUse, 1) != 0) - { - throw new System.InvalidOperationException("Paginator has already been consumed and cannot be reused. Please create a new instance."); - } - PaginatorUtils.SetUserAgentAdditionOnRequest(_request); - var nextToken = _request.NextToken; - ListStudiosResponse response; - do - { - _request.NextToken = nextToken; - response = _client.ListStudios(_request); - nextToken = response.NextToken; - yield return response; - } - while (!string.IsNullOrEmpty(nextToken)); - } -#endif -#if AWS_ASYNC_ENUMERABLES_API - async IAsyncEnumerable IPaginator.PaginateAsync([System.Runtime.CompilerServices.EnumeratorCancellation] CancellationToken cancellationToken) - { - if (Interlocked.Exchange(ref _isPaginatorInUse, 1) != 0) - { - throw new System.InvalidOperationException("Paginator has already been consumed and cannot be reused. Please create a new instance."); - } - PaginatorUtils.SetUserAgentAdditionOnRequest(_request); - var nextToken = _request.NextToken; - ListStudiosResponse response; - do - { - _request.NextToken = nextToken; - response = await _client.ListStudiosAsync(_request, cancellationToken).ConfigureAwait(false); - nextToken = response.NextToken; - cancellationToken.ThrowIfCancellationRequested(); - yield return response; - } - while (!string.IsNullOrEmpty(nextToken)); - } -#endif - } -} \ No newline at end of file diff --git a/sdk/src/Services/NimbleStudio/Generated/Model/_bcl+netstandard/NimbleStudioPaginatorFactory.cs b/sdk/src/Services/NimbleStudio/Generated/Model/_bcl+netstandard/NimbleStudioPaginatorFactory.cs deleted file mode 100644 index 6efe6dfe0f63..000000000000 --- a/sdk/src/Services/NimbleStudio/Generated/Model/_bcl+netstandard/NimbleStudioPaginatorFactory.cs +++ /dev/null @@ -1,119 +0,0 @@ -/* - * 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. - */ - -/* - * Do not modify this file. This file is generated from the nimble-2020-08-01.normal.json service model. - */ - -using System; -using System.Collections.Generic; -using System.Text; - -#pragma warning disable CS0612,CS0618 -namespace Amazon.NimbleStudio.Model -{ - /// - /// Paginators for the NimbleStudio service - /// - public class NimbleStudioPaginatorFactory : INimbleStudioPaginatorFactory - { - private readonly IAmazonNimbleStudio client; - - internal NimbleStudioPaginatorFactory(IAmazonNimbleStudio client) - { - this.client = client; - } - - /// - /// Paginator for ListEulaAcceptances operation - /// - public IListEulaAcceptancesPaginator ListEulaAcceptances(ListEulaAcceptancesRequest request) - { - return new ListEulaAcceptancesPaginator(this.client, request); - } - - /// - /// Paginator for ListEulas operation - /// - public IListEulasPaginator ListEulas(ListEulasRequest request) - { - return new ListEulasPaginator(this.client, request); - } - - /// - /// Paginator for ListLaunchProfileMembers operation - /// - public IListLaunchProfileMembersPaginator ListLaunchProfileMembers(ListLaunchProfileMembersRequest request) - { - return new ListLaunchProfileMembersPaginator(this.client, request); - } - - /// - /// Paginator for ListLaunchProfiles operation - /// - public IListLaunchProfilesPaginator ListLaunchProfiles(ListLaunchProfilesRequest request) - { - return new ListLaunchProfilesPaginator(this.client, request); - } - - /// - /// Paginator for ListStreamingImages operation - /// - public IListStreamingImagesPaginator ListStreamingImages(ListStreamingImagesRequest request) - { - return new ListStreamingImagesPaginator(this.client, request); - } - - /// - /// Paginator for ListStreamingSessionBackups operation - /// - public IListStreamingSessionBackupsPaginator ListStreamingSessionBackups(ListStreamingSessionBackupsRequest request) - { - return new ListStreamingSessionBackupsPaginator(this.client, request); - } - - /// - /// Paginator for ListStreamingSessions operation - /// - public IListStreamingSessionsPaginator ListStreamingSessions(ListStreamingSessionsRequest request) - { - return new ListStreamingSessionsPaginator(this.client, request); - } - - /// - /// Paginator for ListStudioComponents operation - /// - public IListStudioComponentsPaginator ListStudioComponents(ListStudioComponentsRequest request) - { - return new ListStudioComponentsPaginator(this.client, request); - } - - /// - /// Paginator for ListStudioMembers operation - /// - public IListStudioMembersPaginator ListStudioMembers(ListStudioMembersRequest request) - { - return new ListStudioMembersPaginator(this.client, request); - } - - /// - /// Paginator for ListStudios operation - /// - public IListStudiosPaginator ListStudios(ListStudiosRequest request) - { - return new ListStudiosPaginator(this.client, request); - } - } -} \ No newline at end of file diff --git a/sdk/src/Services/NimbleStudio/Generated/_bcl/AmazonNimbleStudioClient.cs b/sdk/src/Services/NimbleStudio/Generated/_bcl/AmazonNimbleStudioClient.cs deleted file mode 100644 index 1ba6e1d09414..000000000000 --- a/sdk/src/Services/NimbleStudio/Generated/_bcl/AmazonNimbleStudioClient.cs +++ /dev/null @@ -1,5282 +0,0 @@ -/* - * 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. - */ - -/* - * Do not modify this file. This file is generated from the nimble-2020-08-01.normal.json service model. - */ - - -using System; -using System.Runtime.ExceptionServices; -using System.Threading; -using System.Threading.Tasks; -using System.Collections.Generic; -using System.Net; - -using Amazon.NimbleStudio.Model; -using Amazon.NimbleStudio.Model.Internal.MarshallTransformations; -using Amazon.NimbleStudio.Internal; -using Amazon.Runtime; -using Amazon.Runtime.Internal; -using Amazon.Runtime.Internal.Auth; -using Amazon.Runtime.Internal.Transform; -using Amazon.Runtime.Endpoints; - -#pragma warning disable CS1570 -namespace Amazon.NimbleStudio -{ - /// - /// Implementation for accessing NimbleStudio - /// - /// Welcome to the Amazon Nimble Studio API reference. This API reference provides methods, - /// schema, resources, parameters, and more to help you get the most out of Nimble Studio. - /// - /// - /// - /// Nimble Studio is a virtual studio that empowers visual effects, animation, and interactive - /// content teams to create content securely within a scalable, private cloud service. - /// - /// - public partial class AmazonNimbleStudioClient : AmazonServiceClient, IAmazonNimbleStudio - { - private static IServiceMetadata serviceMetadata = new AmazonNimbleStudioMetadata(); - private INimbleStudioPaginatorFactory _paginators; - - /// - /// Paginators for the service - /// - public INimbleStudioPaginatorFactory Paginators - { - get - { - if (this._paginators == null) - { - this._paginators = new NimbleStudioPaginatorFactory(this); - } - return this._paginators; - } - } - #region Constructors - - /// - /// Constructs AmazonNimbleStudioClient with the credentials loaded from the application's - /// default configuration, and if unsuccessful from the Instance Profile service on an EC2 instance. - /// - /// Example App.config with credentials set. - /// - /// <?xml version="1.0" encoding="utf-8" ?> - /// <configuration> - /// <appSettings> - /// <add key="AWSProfileName" value="AWS Default"/> - /// </appSettings> - /// </configuration> - /// - /// - /// - public AmazonNimbleStudioClient() - : base(FallbackCredentialsFactory.GetCredentials(), new AmazonNimbleStudioConfig()) { } - - /// - /// Constructs AmazonNimbleStudioClient with the credentials loaded from the application's - /// default configuration, and if unsuccessful from the Instance Profile service on an EC2 instance. - /// - /// Example App.config with credentials set. - /// - /// <?xml version="1.0" encoding="utf-8" ?> - /// <configuration> - /// <appSettings> - /// <add key="AWSProfileName" value="AWS Default"/> - /// </appSettings> - /// </configuration> - /// - /// - /// - /// The region to connect. - public AmazonNimbleStudioClient(RegionEndpoint region) - : base(FallbackCredentialsFactory.GetCredentials(), new AmazonNimbleStudioConfig{RegionEndpoint = region}) { } - - /// - /// Constructs AmazonNimbleStudioClient with the credentials loaded from the application's - /// default configuration, and if unsuccessful from the Instance Profile service on an EC2 instance. - /// - /// Example App.config with credentials set. - /// - /// <?xml version="1.0" encoding="utf-8" ?> - /// <configuration> - /// <appSettings> - /// <add key="AWSProfileName" value="AWS Default"/> - /// </appSettings> - /// </configuration> - /// - /// - /// - /// The AmazonNimbleStudioClient Configuration Object - public AmazonNimbleStudioClient(AmazonNimbleStudioConfig config) - : base(FallbackCredentialsFactory.GetCredentials(config), config){} - - /// - /// Constructs AmazonNimbleStudioClient with AWS Credentials - /// - /// AWS Credentials - public AmazonNimbleStudioClient(AWSCredentials credentials) - : this(credentials, new AmazonNimbleStudioConfig()) - { - } - - /// - /// Constructs AmazonNimbleStudioClient with AWS Credentials - /// - /// AWS Credentials - /// The region to connect. - public AmazonNimbleStudioClient(AWSCredentials credentials, RegionEndpoint region) - : this(credentials, new AmazonNimbleStudioConfig{RegionEndpoint = region}) - { - } - - /// - /// Constructs AmazonNimbleStudioClient with AWS Credentials and an - /// AmazonNimbleStudioClient Configuration object. - /// - /// AWS Credentials - /// The AmazonNimbleStudioClient Configuration Object - public AmazonNimbleStudioClient(AWSCredentials credentials, AmazonNimbleStudioConfig clientConfig) - : base(credentials, clientConfig) - { - } - - /// - /// Constructs AmazonNimbleStudioClient with AWS Access Key ID and AWS Secret Key - /// - /// AWS Access Key ID - /// AWS Secret Access Key - public AmazonNimbleStudioClient(string awsAccessKeyId, string awsSecretAccessKey) - : this(awsAccessKeyId, awsSecretAccessKey, new AmazonNimbleStudioConfig()) - { - } - - /// - /// Constructs AmazonNimbleStudioClient with AWS Access Key ID and AWS Secret Key - /// - /// AWS Access Key ID - /// AWS Secret Access Key - /// The region to connect. - public AmazonNimbleStudioClient(string awsAccessKeyId, string awsSecretAccessKey, RegionEndpoint region) - : this(awsAccessKeyId, awsSecretAccessKey, new AmazonNimbleStudioConfig() {RegionEndpoint=region}) - { - } - - /// - /// Constructs AmazonNimbleStudioClient with AWS Access Key ID, AWS Secret Key and an - /// AmazonNimbleStudioClient Configuration object. - /// - /// AWS Access Key ID - /// AWS Secret Access Key - /// The AmazonNimbleStudioClient Configuration Object - public AmazonNimbleStudioClient(string awsAccessKeyId, string awsSecretAccessKey, AmazonNimbleStudioConfig clientConfig) - : base(awsAccessKeyId, awsSecretAccessKey, clientConfig) - { - } - - /// - /// Constructs AmazonNimbleStudioClient with AWS Access Key ID and AWS Secret Key - /// - /// AWS Access Key ID - /// AWS Secret Access Key - /// AWS Session Token - public AmazonNimbleStudioClient(string awsAccessKeyId, string awsSecretAccessKey, string awsSessionToken) - : this(awsAccessKeyId, awsSecretAccessKey, awsSessionToken, new AmazonNimbleStudioConfig()) - { - } - - /// - /// Constructs AmazonNimbleStudioClient with AWS Access Key ID and AWS Secret Key - /// - /// AWS Access Key ID - /// AWS Secret Access Key - /// AWS Session Token - /// The region to connect. - public AmazonNimbleStudioClient(string awsAccessKeyId, string awsSecretAccessKey, string awsSessionToken, RegionEndpoint region) - : this(awsAccessKeyId, awsSecretAccessKey, awsSessionToken, new AmazonNimbleStudioConfig{RegionEndpoint = region}) - { - } - - /// - /// Constructs AmazonNimbleStudioClient with AWS Access Key ID, AWS Secret Key and an - /// AmazonNimbleStudioClient Configuration object. - /// - /// AWS Access Key ID - /// AWS Secret Access Key - /// AWS Session Token - /// The AmazonNimbleStudioClient Configuration Object - public AmazonNimbleStudioClient(string awsAccessKeyId, string awsSecretAccessKey, string awsSessionToken, AmazonNimbleStudioConfig clientConfig) - : base(awsAccessKeyId, awsSecretAccessKey, awsSessionToken, clientConfig) - { - } - - #endregion - - #region Overrides - - /// - /// Creates the signer for the service. - /// - protected override AbstractAWSSigner CreateSigner() - { - return new AWS4Signer(); - } - - /// - /// Customize the pipeline - /// - /// - protected override void CustomizeRuntimePipeline(RuntimePipeline pipeline) - { - pipeline.RemoveHandler(); - pipeline.AddHandlerAfter(new AmazonNimbleStudioEndpointResolver()); - } - /// - /// Capture metadata for the service. - /// - protected override IServiceMetadata ServiceMetadata - { - get - { - return serviceMetadata; - } - } - - #endregion - - #region Dispose - - /// - /// Disposes the service client. - /// - protected override void Dispose(bool disposing) - { - base.Dispose(disposing); - } - - #endregion - - - #region AcceptEulas - - - /// - /// Accept EULAs. - /// - /// Container for the necessary parameters to execute the AcceptEulas service method. - /// - /// The response from the AcceptEulas service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for AcceptEulas Operation - public virtual AcceptEulasResponse AcceptEulas(AcceptEulasRequest request) - { - var options = new InvokeOptions(); - options.RequestMarshaller = AcceptEulasRequestMarshaller.Instance; - options.ResponseUnmarshaller = AcceptEulasResponseUnmarshaller.Instance; - - return Invoke(request, options); - } - - - /// - /// Accept EULAs. - /// - /// Container for the necessary parameters to execute the AcceptEulas service method. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// - /// - /// The response from the AcceptEulas service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for AcceptEulas Operation - public virtual Task AcceptEulasAsync(AcceptEulasRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) - { - var options = new InvokeOptions(); - options.RequestMarshaller = AcceptEulasRequestMarshaller.Instance; - options.ResponseUnmarshaller = AcceptEulasResponseUnmarshaller.Instance; - - return InvokeAsync(request, options, cancellationToken); - } - - #endregion - - #region CreateLaunchProfile - - - /// - /// Create a launch profile. - /// - /// Container for the necessary parameters to execute the CreateLaunchProfile service method. - /// - /// The response from the CreateLaunchProfile service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for CreateLaunchProfile Operation - public virtual CreateLaunchProfileResponse CreateLaunchProfile(CreateLaunchProfileRequest request) - { - var options = new InvokeOptions(); - options.RequestMarshaller = CreateLaunchProfileRequestMarshaller.Instance; - options.ResponseUnmarshaller = CreateLaunchProfileResponseUnmarshaller.Instance; - - return Invoke(request, options); - } - - - /// - /// Create a launch profile. - /// - /// Container for the necessary parameters to execute the CreateLaunchProfile service method. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// - /// - /// The response from the CreateLaunchProfile service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for CreateLaunchProfile Operation - public virtual Task CreateLaunchProfileAsync(CreateLaunchProfileRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) - { - var options = new InvokeOptions(); - options.RequestMarshaller = CreateLaunchProfileRequestMarshaller.Instance; - options.ResponseUnmarshaller = CreateLaunchProfileResponseUnmarshaller.Instance; - - return InvokeAsync(request, options, cancellationToken); - } - - #endregion - - #region CreateStreamingImage - - - /// - /// Creates a streaming image resource in a studio. - /// - /// Container for the necessary parameters to execute the CreateStreamingImage service method. - /// - /// The response from the CreateStreamingImage service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for CreateStreamingImage Operation - public virtual CreateStreamingImageResponse CreateStreamingImage(CreateStreamingImageRequest request) - { - var options = new InvokeOptions(); - options.RequestMarshaller = CreateStreamingImageRequestMarshaller.Instance; - options.ResponseUnmarshaller = CreateStreamingImageResponseUnmarshaller.Instance; - - return Invoke(request, options); - } - - - /// - /// Creates a streaming image resource in a studio. - /// - /// Container for the necessary parameters to execute the CreateStreamingImage service method. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// - /// - /// The response from the CreateStreamingImage service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for CreateStreamingImage Operation - public virtual Task CreateStreamingImageAsync(CreateStreamingImageRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) - { - var options = new InvokeOptions(); - options.RequestMarshaller = CreateStreamingImageRequestMarshaller.Instance; - options.ResponseUnmarshaller = CreateStreamingImageResponseUnmarshaller.Instance; - - return InvokeAsync(request, options, cancellationToken); - } - - #endregion - - #region CreateStreamingSession - - - /// - /// Creates a streaming session in a studio. - /// - /// - /// - /// After invoking this operation, you must poll GetStreamingSession until the streaming - /// session is in the READY state. - /// - /// - /// Container for the necessary parameters to execute the CreateStreamingSession service method. - /// - /// The response from the CreateStreamingSession service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for CreateStreamingSession Operation - public virtual CreateStreamingSessionResponse CreateStreamingSession(CreateStreamingSessionRequest request) - { - var options = new InvokeOptions(); - options.RequestMarshaller = CreateStreamingSessionRequestMarshaller.Instance; - options.ResponseUnmarshaller = CreateStreamingSessionResponseUnmarshaller.Instance; - - return Invoke(request, options); - } - - - /// - /// Creates a streaming session in a studio. - /// - /// - /// - /// After invoking this operation, you must poll GetStreamingSession until the streaming - /// session is in the READY state. - /// - /// - /// Container for the necessary parameters to execute the CreateStreamingSession service method. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// - /// - /// The response from the CreateStreamingSession service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for CreateStreamingSession Operation - public virtual Task CreateStreamingSessionAsync(CreateStreamingSessionRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) - { - var options = new InvokeOptions(); - options.RequestMarshaller = CreateStreamingSessionRequestMarshaller.Instance; - options.ResponseUnmarshaller = CreateStreamingSessionResponseUnmarshaller.Instance; - - return InvokeAsync(request, options, cancellationToken); - } - - #endregion - - #region CreateStreamingSessionStream - - - /// - /// Creates a streaming session stream for a streaming session. - /// - /// - /// - /// After invoking this API, invoke GetStreamingSessionStream with the returned streamId - /// to poll the resource until it is in the READY state. - /// - /// - /// Container for the necessary parameters to execute the CreateStreamingSessionStream service method. - /// - /// The response from the CreateStreamingSessionStream service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for CreateStreamingSessionStream Operation - public virtual CreateStreamingSessionStreamResponse CreateStreamingSessionStream(CreateStreamingSessionStreamRequest request) - { - var options = new InvokeOptions(); - options.RequestMarshaller = CreateStreamingSessionStreamRequestMarshaller.Instance; - options.ResponseUnmarshaller = CreateStreamingSessionStreamResponseUnmarshaller.Instance; - - return Invoke(request, options); - } - - - /// - /// Creates a streaming session stream for a streaming session. - /// - /// - /// - /// After invoking this API, invoke GetStreamingSessionStream with the returned streamId - /// to poll the resource until it is in the READY state. - /// - /// - /// Container for the necessary parameters to execute the CreateStreamingSessionStream service method. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// - /// - /// The response from the CreateStreamingSessionStream service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for CreateStreamingSessionStream Operation - public virtual Task CreateStreamingSessionStreamAsync(CreateStreamingSessionStreamRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) - { - var options = new InvokeOptions(); - options.RequestMarshaller = CreateStreamingSessionStreamRequestMarshaller.Instance; - options.ResponseUnmarshaller = CreateStreamingSessionStreamResponseUnmarshaller.Instance; - - return InvokeAsync(request, options, cancellationToken); - } - - #endregion - - #region CreateStudio - - - /// - /// Create a new studio. - /// - /// - /// - /// When creating a studio, two IAM roles must be provided: the admin role and the user - /// role. These roles are assumed by your users when they log in to the Nimble Studio - /// portal. - /// - /// - /// - /// The user role must have the AmazonNimbleStudio-StudioUser managed policy attached - /// for the portal to function properly. - /// - /// - /// - /// The admin role must have the AmazonNimbleStudio-StudioAdmin managed policy - /// attached for the portal to function properly. - /// - /// - /// - /// You may optionally specify a KMS key in the StudioEncryptionConfiguration. - /// - /// - /// - /// In Nimble Studio, resource names, descriptions, initialization scripts, and other - /// data you provide are always encrypted at rest using an KMS key. By default, this key - /// is owned by Amazon Web Services and managed on your behalf. You may provide your own - /// KMS key when calling CreateStudio to encrypt this data using a key you own - /// and manage. - /// - /// - /// - /// When providing an KMS key during studio creation, Nimble Studio creates KMS grants - /// in your account to provide your studio user and admin roles access to these KMS keys. - /// - /// - /// - /// If you delete this grant, the studio will no longer be accessible to your portal users. - /// - /// - /// - /// If you delete the studio KMS key, your studio will no longer be accessible. - /// - /// - /// Container for the necessary parameters to execute the CreateStudio service method. - /// - /// The response from the CreateStudio service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for CreateStudio Operation - public virtual CreateStudioResponse CreateStudio(CreateStudioRequest request) - { - var options = new InvokeOptions(); - options.RequestMarshaller = CreateStudioRequestMarshaller.Instance; - options.ResponseUnmarshaller = CreateStudioResponseUnmarshaller.Instance; - - return Invoke(request, options); - } - - - /// - /// Create a new studio. - /// - /// - /// - /// When creating a studio, two IAM roles must be provided: the admin role and the user - /// role. These roles are assumed by your users when they log in to the Nimble Studio - /// portal. - /// - /// - /// - /// The user role must have the AmazonNimbleStudio-StudioUser managed policy attached - /// for the portal to function properly. - /// - /// - /// - /// The admin role must have the AmazonNimbleStudio-StudioAdmin managed policy - /// attached for the portal to function properly. - /// - /// - /// - /// You may optionally specify a KMS key in the StudioEncryptionConfiguration. - /// - /// - /// - /// In Nimble Studio, resource names, descriptions, initialization scripts, and other - /// data you provide are always encrypted at rest using an KMS key. By default, this key - /// is owned by Amazon Web Services and managed on your behalf. You may provide your own - /// KMS key when calling CreateStudio to encrypt this data using a key you own - /// and manage. - /// - /// - /// - /// When providing an KMS key during studio creation, Nimble Studio creates KMS grants - /// in your account to provide your studio user and admin roles access to these KMS keys. - /// - /// - /// - /// If you delete this grant, the studio will no longer be accessible to your portal users. - /// - /// - /// - /// If you delete the studio KMS key, your studio will no longer be accessible. - /// - /// - /// Container for the necessary parameters to execute the CreateStudio service method. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// - /// - /// The response from the CreateStudio service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for CreateStudio Operation - public virtual Task CreateStudioAsync(CreateStudioRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) - { - var options = new InvokeOptions(); - options.RequestMarshaller = CreateStudioRequestMarshaller.Instance; - options.ResponseUnmarshaller = CreateStudioResponseUnmarshaller.Instance; - - return InvokeAsync(request, options, cancellationToken); - } - - #endregion - - #region CreateStudioComponent - - - /// - /// Creates a studio component resource. - /// - /// Container for the necessary parameters to execute the CreateStudioComponent service method. - /// - /// The response from the CreateStudioComponent service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for CreateStudioComponent Operation - public virtual CreateStudioComponentResponse CreateStudioComponent(CreateStudioComponentRequest request) - { - var options = new InvokeOptions(); - options.RequestMarshaller = CreateStudioComponentRequestMarshaller.Instance; - options.ResponseUnmarshaller = CreateStudioComponentResponseUnmarshaller.Instance; - - return Invoke(request, options); - } - - - /// - /// Creates a studio component resource. - /// - /// Container for the necessary parameters to execute the CreateStudioComponent service method. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// - /// - /// The response from the CreateStudioComponent service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for CreateStudioComponent Operation - public virtual Task CreateStudioComponentAsync(CreateStudioComponentRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) - { - var options = new InvokeOptions(); - options.RequestMarshaller = CreateStudioComponentRequestMarshaller.Instance; - options.ResponseUnmarshaller = CreateStudioComponentResponseUnmarshaller.Instance; - - return InvokeAsync(request, options, cancellationToken); - } - - #endregion - - #region DeleteLaunchProfile - - - /// - /// Permanently delete a launch profile. - /// - /// Container for the necessary parameters to execute the DeleteLaunchProfile service method. - /// - /// The response from the DeleteLaunchProfile service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for DeleteLaunchProfile Operation - public virtual DeleteLaunchProfileResponse DeleteLaunchProfile(DeleteLaunchProfileRequest request) - { - var options = new InvokeOptions(); - options.RequestMarshaller = DeleteLaunchProfileRequestMarshaller.Instance; - options.ResponseUnmarshaller = DeleteLaunchProfileResponseUnmarshaller.Instance; - - return Invoke(request, options); - } - - - /// - /// Permanently delete a launch profile. - /// - /// Container for the necessary parameters to execute the DeleteLaunchProfile service method. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// - /// - /// The response from the DeleteLaunchProfile service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for DeleteLaunchProfile Operation - public virtual Task DeleteLaunchProfileAsync(DeleteLaunchProfileRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) - { - var options = new InvokeOptions(); - options.RequestMarshaller = DeleteLaunchProfileRequestMarshaller.Instance; - options.ResponseUnmarshaller = DeleteLaunchProfileResponseUnmarshaller.Instance; - - return InvokeAsync(request, options, cancellationToken); - } - - #endregion - - #region DeleteLaunchProfileMember - - - /// - /// Delete a user from launch profile membership. - /// - /// Container for the necessary parameters to execute the DeleteLaunchProfileMember service method. - /// - /// The response from the DeleteLaunchProfileMember service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for DeleteLaunchProfileMember Operation - public virtual DeleteLaunchProfileMemberResponse DeleteLaunchProfileMember(DeleteLaunchProfileMemberRequest request) - { - var options = new InvokeOptions(); - options.RequestMarshaller = DeleteLaunchProfileMemberRequestMarshaller.Instance; - options.ResponseUnmarshaller = DeleteLaunchProfileMemberResponseUnmarshaller.Instance; - - return Invoke(request, options); - } - - - /// - /// Delete a user from launch profile membership. - /// - /// Container for the necessary parameters to execute the DeleteLaunchProfileMember service method. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// - /// - /// The response from the DeleteLaunchProfileMember service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for DeleteLaunchProfileMember Operation - public virtual Task DeleteLaunchProfileMemberAsync(DeleteLaunchProfileMemberRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) - { - var options = new InvokeOptions(); - options.RequestMarshaller = DeleteLaunchProfileMemberRequestMarshaller.Instance; - options.ResponseUnmarshaller = DeleteLaunchProfileMemberResponseUnmarshaller.Instance; - - return InvokeAsync(request, options, cancellationToken); - } - - #endregion - - #region DeleteStreamingImage - - - /// - /// Delete streaming image. - /// - /// Container for the necessary parameters to execute the DeleteStreamingImage service method. - /// - /// The response from the DeleteStreamingImage service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for DeleteStreamingImage Operation - public virtual DeleteStreamingImageResponse DeleteStreamingImage(DeleteStreamingImageRequest request) - { - var options = new InvokeOptions(); - options.RequestMarshaller = DeleteStreamingImageRequestMarshaller.Instance; - options.ResponseUnmarshaller = DeleteStreamingImageResponseUnmarshaller.Instance; - - return Invoke(request, options); - } - - - /// - /// Delete streaming image. - /// - /// Container for the necessary parameters to execute the DeleteStreamingImage service method. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// - /// - /// The response from the DeleteStreamingImage service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for DeleteStreamingImage Operation - public virtual Task DeleteStreamingImageAsync(DeleteStreamingImageRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) - { - var options = new InvokeOptions(); - options.RequestMarshaller = DeleteStreamingImageRequestMarshaller.Instance; - options.ResponseUnmarshaller = DeleteStreamingImageResponseUnmarshaller.Instance; - - return InvokeAsync(request, options, cancellationToken); - } - - #endregion - - #region DeleteStreamingSession - - - /// - /// Deletes streaming session resource. - /// - /// - /// - /// After invoking this operation, use GetStreamingSession to poll the resource until - /// it transitions to a DELETED state. - /// - /// - /// - /// A streaming session will count against your streaming session quota until it is marked - /// DELETED. - /// - /// - /// Container for the necessary parameters to execute the DeleteStreamingSession service method. - /// - /// The response from the DeleteStreamingSession service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for DeleteStreamingSession Operation - public virtual DeleteStreamingSessionResponse DeleteStreamingSession(DeleteStreamingSessionRequest request) - { - var options = new InvokeOptions(); - options.RequestMarshaller = DeleteStreamingSessionRequestMarshaller.Instance; - options.ResponseUnmarshaller = DeleteStreamingSessionResponseUnmarshaller.Instance; - - return Invoke(request, options); - } - - - /// - /// Deletes streaming session resource. - /// - /// - /// - /// After invoking this operation, use GetStreamingSession to poll the resource until - /// it transitions to a DELETED state. - /// - /// - /// - /// A streaming session will count against your streaming session quota until it is marked - /// DELETED. - /// - /// - /// Container for the necessary parameters to execute the DeleteStreamingSession service method. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// - /// - /// The response from the DeleteStreamingSession service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for DeleteStreamingSession Operation - public virtual Task DeleteStreamingSessionAsync(DeleteStreamingSessionRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) - { - var options = new InvokeOptions(); - options.RequestMarshaller = DeleteStreamingSessionRequestMarshaller.Instance; - options.ResponseUnmarshaller = DeleteStreamingSessionResponseUnmarshaller.Instance; - - return InvokeAsync(request, options, cancellationToken); - } - - #endregion - - #region DeleteStudio - - - /// - /// Delete a studio resource. - /// - /// Container for the necessary parameters to execute the DeleteStudio service method. - /// - /// The response from the DeleteStudio service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for DeleteStudio Operation - public virtual DeleteStudioResponse DeleteStudio(DeleteStudioRequest request) - { - var options = new InvokeOptions(); - options.RequestMarshaller = DeleteStudioRequestMarshaller.Instance; - options.ResponseUnmarshaller = DeleteStudioResponseUnmarshaller.Instance; - - return Invoke(request, options); - } - - - /// - /// Delete a studio resource. - /// - /// Container for the necessary parameters to execute the DeleteStudio service method. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// - /// - /// The response from the DeleteStudio service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for DeleteStudio Operation - public virtual Task DeleteStudioAsync(DeleteStudioRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) - { - var options = new InvokeOptions(); - options.RequestMarshaller = DeleteStudioRequestMarshaller.Instance; - options.ResponseUnmarshaller = DeleteStudioResponseUnmarshaller.Instance; - - return InvokeAsync(request, options, cancellationToken); - } - - #endregion - - #region DeleteStudioComponent - - - /// - /// Deletes a studio component resource. - /// - /// Container for the necessary parameters to execute the DeleteStudioComponent service method. - /// - /// The response from the DeleteStudioComponent service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for DeleteStudioComponent Operation - public virtual DeleteStudioComponentResponse DeleteStudioComponent(DeleteStudioComponentRequest request) - { - var options = new InvokeOptions(); - options.RequestMarshaller = DeleteStudioComponentRequestMarshaller.Instance; - options.ResponseUnmarshaller = DeleteStudioComponentResponseUnmarshaller.Instance; - - return Invoke(request, options); - } - - - /// - /// Deletes a studio component resource. - /// - /// Container for the necessary parameters to execute the DeleteStudioComponent service method. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// - /// - /// The response from the DeleteStudioComponent service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for DeleteStudioComponent Operation - public virtual Task DeleteStudioComponentAsync(DeleteStudioComponentRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) - { - var options = new InvokeOptions(); - options.RequestMarshaller = DeleteStudioComponentRequestMarshaller.Instance; - options.ResponseUnmarshaller = DeleteStudioComponentResponseUnmarshaller.Instance; - - return InvokeAsync(request, options, cancellationToken); - } - - #endregion - - #region DeleteStudioMember - - - /// - /// Delete a user from studio membership. - /// - /// Container for the necessary parameters to execute the DeleteStudioMember service method. - /// - /// The response from the DeleteStudioMember service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for DeleteStudioMember Operation - public virtual DeleteStudioMemberResponse DeleteStudioMember(DeleteStudioMemberRequest request) - { - var options = new InvokeOptions(); - options.RequestMarshaller = DeleteStudioMemberRequestMarshaller.Instance; - options.ResponseUnmarshaller = DeleteStudioMemberResponseUnmarshaller.Instance; - - return Invoke(request, options); - } - - - /// - /// Delete a user from studio membership. - /// - /// Container for the necessary parameters to execute the DeleteStudioMember service method. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// - /// - /// The response from the DeleteStudioMember service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for DeleteStudioMember Operation - public virtual Task DeleteStudioMemberAsync(DeleteStudioMemberRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) - { - var options = new InvokeOptions(); - options.RequestMarshaller = DeleteStudioMemberRequestMarshaller.Instance; - options.ResponseUnmarshaller = DeleteStudioMemberResponseUnmarshaller.Instance; - - return InvokeAsync(request, options, cancellationToken); - } - - #endregion - - #region GetEula - - - /// - /// Get EULA. - /// - /// Container for the necessary parameters to execute the GetEula service method. - /// - /// The response from the GetEula service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for GetEula Operation - public virtual GetEulaResponse GetEula(GetEulaRequest request) - { - var options = new InvokeOptions(); - options.RequestMarshaller = GetEulaRequestMarshaller.Instance; - options.ResponseUnmarshaller = GetEulaResponseUnmarshaller.Instance; - - return Invoke(request, options); - } - - - /// - /// Get EULA. - /// - /// Container for the necessary parameters to execute the GetEula service method. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// - /// - /// The response from the GetEula service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for GetEula Operation - public virtual Task GetEulaAsync(GetEulaRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) - { - var options = new InvokeOptions(); - options.RequestMarshaller = GetEulaRequestMarshaller.Instance; - options.ResponseUnmarshaller = GetEulaResponseUnmarshaller.Instance; - - return InvokeAsync(request, options, cancellationToken); - } - - #endregion - - #region GetLaunchProfile - - - /// - /// Get a launch profile. - /// - /// Container for the necessary parameters to execute the GetLaunchProfile service method. - /// - /// The response from the GetLaunchProfile service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for GetLaunchProfile Operation - public virtual GetLaunchProfileResponse GetLaunchProfile(GetLaunchProfileRequest request) - { - var options = new InvokeOptions(); - options.RequestMarshaller = GetLaunchProfileRequestMarshaller.Instance; - options.ResponseUnmarshaller = GetLaunchProfileResponseUnmarshaller.Instance; - - return Invoke(request, options); - } - - - /// - /// Get a launch profile. - /// - /// Container for the necessary parameters to execute the GetLaunchProfile service method. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// - /// - /// The response from the GetLaunchProfile service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for GetLaunchProfile Operation - public virtual Task GetLaunchProfileAsync(GetLaunchProfileRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) - { - var options = new InvokeOptions(); - options.RequestMarshaller = GetLaunchProfileRequestMarshaller.Instance; - options.ResponseUnmarshaller = GetLaunchProfileResponseUnmarshaller.Instance; - - return InvokeAsync(request, options, cancellationToken); - } - - #endregion - - #region GetLaunchProfileDetails - - - /// - /// Launch profile details include the launch profile resource and summary information - /// of resources that are used by, or available to, the launch profile. This includes - /// the name and description of all studio components used by the launch profiles, and - /// the name and description of streaming images that can be used with this launch profile. - /// - /// Container for the necessary parameters to execute the GetLaunchProfileDetails service method. - /// - /// The response from the GetLaunchProfileDetails service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for GetLaunchProfileDetails Operation - public virtual GetLaunchProfileDetailsResponse GetLaunchProfileDetails(GetLaunchProfileDetailsRequest request) - { - var options = new InvokeOptions(); - options.RequestMarshaller = GetLaunchProfileDetailsRequestMarshaller.Instance; - options.ResponseUnmarshaller = GetLaunchProfileDetailsResponseUnmarshaller.Instance; - - return Invoke(request, options); - } - - - /// - /// Launch profile details include the launch profile resource and summary information - /// of resources that are used by, or available to, the launch profile. This includes - /// the name and description of all studio components used by the launch profiles, and - /// the name and description of streaming images that can be used with this launch profile. - /// - /// Container for the necessary parameters to execute the GetLaunchProfileDetails service method. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// - /// - /// The response from the GetLaunchProfileDetails service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for GetLaunchProfileDetails Operation - public virtual Task GetLaunchProfileDetailsAsync(GetLaunchProfileDetailsRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) - { - var options = new InvokeOptions(); - options.RequestMarshaller = GetLaunchProfileDetailsRequestMarshaller.Instance; - options.ResponseUnmarshaller = GetLaunchProfileDetailsResponseUnmarshaller.Instance; - - return InvokeAsync(request, options, cancellationToken); - } - - #endregion - - #region GetLaunchProfileInitialization - - - /// - /// Get a launch profile initialization. - /// - /// Container for the necessary parameters to execute the GetLaunchProfileInitialization service method. - /// - /// The response from the GetLaunchProfileInitialization service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for GetLaunchProfileInitialization Operation - public virtual GetLaunchProfileInitializationResponse GetLaunchProfileInitialization(GetLaunchProfileInitializationRequest request) - { - var options = new InvokeOptions(); - options.RequestMarshaller = GetLaunchProfileInitializationRequestMarshaller.Instance; - options.ResponseUnmarshaller = GetLaunchProfileInitializationResponseUnmarshaller.Instance; - - return Invoke(request, options); - } - - - /// - /// Get a launch profile initialization. - /// - /// Container for the necessary parameters to execute the GetLaunchProfileInitialization service method. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// - /// - /// The response from the GetLaunchProfileInitialization service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for GetLaunchProfileInitialization Operation - public virtual Task GetLaunchProfileInitializationAsync(GetLaunchProfileInitializationRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) - { - var options = new InvokeOptions(); - options.RequestMarshaller = GetLaunchProfileInitializationRequestMarshaller.Instance; - options.ResponseUnmarshaller = GetLaunchProfileInitializationResponseUnmarshaller.Instance; - - return InvokeAsync(request, options, cancellationToken); - } - - #endregion - - #region GetLaunchProfileMember - - - /// - /// Get a user persona in launch profile membership. - /// - /// Container for the necessary parameters to execute the GetLaunchProfileMember service method. - /// - /// The response from the GetLaunchProfileMember service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for GetLaunchProfileMember Operation - public virtual GetLaunchProfileMemberResponse GetLaunchProfileMember(GetLaunchProfileMemberRequest request) - { - var options = new InvokeOptions(); - options.RequestMarshaller = GetLaunchProfileMemberRequestMarshaller.Instance; - options.ResponseUnmarshaller = GetLaunchProfileMemberResponseUnmarshaller.Instance; - - return Invoke(request, options); - } - - - /// - /// Get a user persona in launch profile membership. - /// - /// Container for the necessary parameters to execute the GetLaunchProfileMember service method. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// - /// - /// The response from the GetLaunchProfileMember service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for GetLaunchProfileMember Operation - public virtual Task GetLaunchProfileMemberAsync(GetLaunchProfileMemberRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) - { - var options = new InvokeOptions(); - options.RequestMarshaller = GetLaunchProfileMemberRequestMarshaller.Instance; - options.ResponseUnmarshaller = GetLaunchProfileMemberResponseUnmarshaller.Instance; - - return InvokeAsync(request, options, cancellationToken); - } - - #endregion - - #region GetStreamingImage - - - /// - /// Get streaming image. - /// - /// Container for the necessary parameters to execute the GetStreamingImage service method. - /// - /// The response from the GetStreamingImage service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for GetStreamingImage Operation - public virtual GetStreamingImageResponse GetStreamingImage(GetStreamingImageRequest request) - { - var options = new InvokeOptions(); - options.RequestMarshaller = GetStreamingImageRequestMarshaller.Instance; - options.ResponseUnmarshaller = GetStreamingImageResponseUnmarshaller.Instance; - - return Invoke(request, options); - } - - - /// - /// Get streaming image. - /// - /// Container for the necessary parameters to execute the GetStreamingImage service method. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// - /// - /// The response from the GetStreamingImage service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for GetStreamingImage Operation - public virtual Task GetStreamingImageAsync(GetStreamingImageRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) - { - var options = new InvokeOptions(); - options.RequestMarshaller = GetStreamingImageRequestMarshaller.Instance; - options.ResponseUnmarshaller = GetStreamingImageResponseUnmarshaller.Instance; - - return InvokeAsync(request, options, cancellationToken); - } - - #endregion - - #region GetStreamingSession - - - /// - /// Gets StreamingSession resource. - /// - /// - /// - /// Invoke this operation to poll for a streaming session state while creating or deleting - /// a session. - /// - /// - /// Container for the necessary parameters to execute the GetStreamingSession service method. - /// - /// The response from the GetStreamingSession service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for GetStreamingSession Operation - public virtual GetStreamingSessionResponse GetStreamingSession(GetStreamingSessionRequest request) - { - var options = new InvokeOptions(); - options.RequestMarshaller = GetStreamingSessionRequestMarshaller.Instance; - options.ResponseUnmarshaller = GetStreamingSessionResponseUnmarshaller.Instance; - - return Invoke(request, options); - } - - - /// - /// Gets StreamingSession resource. - /// - /// - /// - /// Invoke this operation to poll for a streaming session state while creating or deleting - /// a session. - /// - /// - /// Container for the necessary parameters to execute the GetStreamingSession service method. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// - /// - /// The response from the GetStreamingSession service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for GetStreamingSession Operation - public virtual Task GetStreamingSessionAsync(GetStreamingSessionRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) - { - var options = new InvokeOptions(); - options.RequestMarshaller = GetStreamingSessionRequestMarshaller.Instance; - options.ResponseUnmarshaller = GetStreamingSessionResponseUnmarshaller.Instance; - - return InvokeAsync(request, options, cancellationToken); - } - - #endregion - - #region GetStreamingSessionBackup - - - /// - /// Gets StreamingSessionBackup resource. - /// - /// - /// - /// Invoke this operation to poll for a streaming session backup while stopping a streaming - /// session. - /// - /// - /// Container for the necessary parameters to execute the GetStreamingSessionBackup service method. - /// - /// The response from the GetStreamingSessionBackup service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for GetStreamingSessionBackup Operation - public virtual GetStreamingSessionBackupResponse GetStreamingSessionBackup(GetStreamingSessionBackupRequest request) - { - var options = new InvokeOptions(); - options.RequestMarshaller = GetStreamingSessionBackupRequestMarshaller.Instance; - options.ResponseUnmarshaller = GetStreamingSessionBackupResponseUnmarshaller.Instance; - - return Invoke(request, options); - } - - - /// - /// Gets StreamingSessionBackup resource. - /// - /// - /// - /// Invoke this operation to poll for a streaming session backup while stopping a streaming - /// session. - /// - /// - /// Container for the necessary parameters to execute the GetStreamingSessionBackup service method. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// - /// - /// The response from the GetStreamingSessionBackup service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for GetStreamingSessionBackup Operation - public virtual Task GetStreamingSessionBackupAsync(GetStreamingSessionBackupRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) - { - var options = new InvokeOptions(); - options.RequestMarshaller = GetStreamingSessionBackupRequestMarshaller.Instance; - options.ResponseUnmarshaller = GetStreamingSessionBackupResponseUnmarshaller.Instance; - - return InvokeAsync(request, options, cancellationToken); - } - - #endregion - - #region GetStreamingSessionStream - - - /// - /// Gets a StreamingSessionStream for a streaming session. - /// - /// - /// - /// Invoke this operation to poll the resource after invoking CreateStreamingSessionStream. - /// - /// - /// - /// After the StreamingSessionStream changes to the READY state, the url - /// property will contain a stream to be used with the DCV streaming client. - /// - /// - /// Container for the necessary parameters to execute the GetStreamingSessionStream service method. - /// - /// The response from the GetStreamingSessionStream service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for GetStreamingSessionStream Operation - public virtual GetStreamingSessionStreamResponse GetStreamingSessionStream(GetStreamingSessionStreamRequest request) - { - var options = new InvokeOptions(); - options.RequestMarshaller = GetStreamingSessionStreamRequestMarshaller.Instance; - options.ResponseUnmarshaller = GetStreamingSessionStreamResponseUnmarshaller.Instance; - - return Invoke(request, options); - } - - - /// - /// Gets a StreamingSessionStream for a streaming session. - /// - /// - /// - /// Invoke this operation to poll the resource after invoking CreateStreamingSessionStream. - /// - /// - /// - /// After the StreamingSessionStream changes to the READY state, the url - /// property will contain a stream to be used with the DCV streaming client. - /// - /// - /// Container for the necessary parameters to execute the GetStreamingSessionStream service method. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// - /// - /// The response from the GetStreamingSessionStream service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for GetStreamingSessionStream Operation - public virtual Task GetStreamingSessionStreamAsync(GetStreamingSessionStreamRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) - { - var options = new InvokeOptions(); - options.RequestMarshaller = GetStreamingSessionStreamRequestMarshaller.Instance; - options.ResponseUnmarshaller = GetStreamingSessionStreamResponseUnmarshaller.Instance; - - return InvokeAsync(request, options, cancellationToken); - } - - #endregion - - #region GetStudio - - - /// - /// Get a studio resource. - /// - /// Container for the necessary parameters to execute the GetStudio service method. - /// - /// The response from the GetStudio service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for GetStudio Operation - public virtual GetStudioResponse GetStudio(GetStudioRequest request) - { - var options = new InvokeOptions(); - options.RequestMarshaller = GetStudioRequestMarshaller.Instance; - options.ResponseUnmarshaller = GetStudioResponseUnmarshaller.Instance; - - return Invoke(request, options); - } - - - /// - /// Get a studio resource. - /// - /// Container for the necessary parameters to execute the GetStudio service method. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// - /// - /// The response from the GetStudio service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for GetStudio Operation - public virtual Task GetStudioAsync(GetStudioRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) - { - var options = new InvokeOptions(); - options.RequestMarshaller = GetStudioRequestMarshaller.Instance; - options.ResponseUnmarshaller = GetStudioResponseUnmarshaller.Instance; - - return InvokeAsync(request, options, cancellationToken); - } - - #endregion - - #region GetStudioComponent - - - /// - /// Gets a studio component resource. - /// - /// Container for the necessary parameters to execute the GetStudioComponent service method. - /// - /// The response from the GetStudioComponent service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for GetStudioComponent Operation - public virtual GetStudioComponentResponse GetStudioComponent(GetStudioComponentRequest request) - { - var options = new InvokeOptions(); - options.RequestMarshaller = GetStudioComponentRequestMarshaller.Instance; - options.ResponseUnmarshaller = GetStudioComponentResponseUnmarshaller.Instance; - - return Invoke(request, options); - } - - - /// - /// Gets a studio component resource. - /// - /// Container for the necessary parameters to execute the GetStudioComponent service method. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// - /// - /// The response from the GetStudioComponent service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for GetStudioComponent Operation - public virtual Task GetStudioComponentAsync(GetStudioComponentRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) - { - var options = new InvokeOptions(); - options.RequestMarshaller = GetStudioComponentRequestMarshaller.Instance; - options.ResponseUnmarshaller = GetStudioComponentResponseUnmarshaller.Instance; - - return InvokeAsync(request, options, cancellationToken); - } - - #endregion - - #region GetStudioMember - - - /// - /// Get a user's membership in a studio. - /// - /// Container for the necessary parameters to execute the GetStudioMember service method. - /// - /// The response from the GetStudioMember service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for GetStudioMember Operation - public virtual GetStudioMemberResponse GetStudioMember(GetStudioMemberRequest request) - { - var options = new InvokeOptions(); - options.RequestMarshaller = GetStudioMemberRequestMarshaller.Instance; - options.ResponseUnmarshaller = GetStudioMemberResponseUnmarshaller.Instance; - - return Invoke(request, options); - } - - - /// - /// Get a user's membership in a studio. - /// - /// Container for the necessary parameters to execute the GetStudioMember service method. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// - /// - /// The response from the GetStudioMember service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for GetStudioMember Operation - public virtual Task GetStudioMemberAsync(GetStudioMemberRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) - { - var options = new InvokeOptions(); - options.RequestMarshaller = GetStudioMemberRequestMarshaller.Instance; - options.ResponseUnmarshaller = GetStudioMemberResponseUnmarshaller.Instance; - - return InvokeAsync(request, options, cancellationToken); - } - - #endregion - - #region ListEulaAcceptances - - - /// - /// List EULA acceptances. - /// - /// Container for the necessary parameters to execute the ListEulaAcceptances service method. - /// - /// The response from the ListEulaAcceptances service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for ListEulaAcceptances Operation - public virtual ListEulaAcceptancesResponse ListEulaAcceptances(ListEulaAcceptancesRequest request) - { - var options = new InvokeOptions(); - options.RequestMarshaller = ListEulaAcceptancesRequestMarshaller.Instance; - options.ResponseUnmarshaller = ListEulaAcceptancesResponseUnmarshaller.Instance; - - return Invoke(request, options); - } - - - /// - /// List EULA acceptances. - /// - /// Container for the necessary parameters to execute the ListEulaAcceptances service method. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// - /// - /// The response from the ListEulaAcceptances service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for ListEulaAcceptances Operation - public virtual Task ListEulaAcceptancesAsync(ListEulaAcceptancesRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) - { - var options = new InvokeOptions(); - options.RequestMarshaller = ListEulaAcceptancesRequestMarshaller.Instance; - options.ResponseUnmarshaller = ListEulaAcceptancesResponseUnmarshaller.Instance; - - return InvokeAsync(request, options, cancellationToken); - } - - #endregion - - #region ListEulas - - - /// - /// List EULAs. - /// - /// Container for the necessary parameters to execute the ListEulas service method. - /// - /// The response from the ListEulas service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for ListEulas Operation - public virtual ListEulasResponse ListEulas(ListEulasRequest request) - { - var options = new InvokeOptions(); - options.RequestMarshaller = ListEulasRequestMarshaller.Instance; - options.ResponseUnmarshaller = ListEulasResponseUnmarshaller.Instance; - - return Invoke(request, options); - } - - - /// - /// List EULAs. - /// - /// Container for the necessary parameters to execute the ListEulas service method. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// - /// - /// The response from the ListEulas service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for ListEulas Operation - public virtual Task ListEulasAsync(ListEulasRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) - { - var options = new InvokeOptions(); - options.RequestMarshaller = ListEulasRequestMarshaller.Instance; - options.ResponseUnmarshaller = ListEulasResponseUnmarshaller.Instance; - - return InvokeAsync(request, options, cancellationToken); - } - - #endregion - - #region ListLaunchProfileMembers - - - /// - /// Get all users in a given launch profile membership. - /// - /// Container for the necessary parameters to execute the ListLaunchProfileMembers service method. - /// - /// The response from the ListLaunchProfileMembers service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for ListLaunchProfileMembers Operation - public virtual ListLaunchProfileMembersResponse ListLaunchProfileMembers(ListLaunchProfileMembersRequest request) - { - var options = new InvokeOptions(); - options.RequestMarshaller = ListLaunchProfileMembersRequestMarshaller.Instance; - options.ResponseUnmarshaller = ListLaunchProfileMembersResponseUnmarshaller.Instance; - - return Invoke(request, options); - } - - - /// - /// Get all users in a given launch profile membership. - /// - /// Container for the necessary parameters to execute the ListLaunchProfileMembers service method. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// - /// - /// The response from the ListLaunchProfileMembers service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for ListLaunchProfileMembers Operation - public virtual Task ListLaunchProfileMembersAsync(ListLaunchProfileMembersRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) - { - var options = new InvokeOptions(); - options.RequestMarshaller = ListLaunchProfileMembersRequestMarshaller.Instance; - options.ResponseUnmarshaller = ListLaunchProfileMembersResponseUnmarshaller.Instance; - - return InvokeAsync(request, options, cancellationToken); - } - - #endregion - - #region ListLaunchProfiles - - - /// - /// List all the launch profiles a studio. - /// - /// Container for the necessary parameters to execute the ListLaunchProfiles service method. - /// - /// The response from the ListLaunchProfiles service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for ListLaunchProfiles Operation - public virtual ListLaunchProfilesResponse ListLaunchProfiles(ListLaunchProfilesRequest request) - { - var options = new InvokeOptions(); - options.RequestMarshaller = ListLaunchProfilesRequestMarshaller.Instance; - options.ResponseUnmarshaller = ListLaunchProfilesResponseUnmarshaller.Instance; - - return Invoke(request, options); - } - - - /// - /// List all the launch profiles a studio. - /// - /// Container for the necessary parameters to execute the ListLaunchProfiles service method. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// - /// - /// The response from the ListLaunchProfiles service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for ListLaunchProfiles Operation - public virtual Task ListLaunchProfilesAsync(ListLaunchProfilesRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) - { - var options = new InvokeOptions(); - options.RequestMarshaller = ListLaunchProfilesRequestMarshaller.Instance; - options.ResponseUnmarshaller = ListLaunchProfilesResponseUnmarshaller.Instance; - - return InvokeAsync(request, options, cancellationToken); - } - - #endregion - - #region ListStreamingImages - - - /// - /// List the streaming image resources available to this studio. - /// - /// - /// - /// This list will contain both images provided by Amazon Web Services, as well as streaming - /// images that you have created in your studio. - /// - /// - /// Container for the necessary parameters to execute the ListStreamingImages service method. - /// - /// The response from the ListStreamingImages service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for ListStreamingImages Operation - public virtual ListStreamingImagesResponse ListStreamingImages(ListStreamingImagesRequest request) - { - var options = new InvokeOptions(); - options.RequestMarshaller = ListStreamingImagesRequestMarshaller.Instance; - options.ResponseUnmarshaller = ListStreamingImagesResponseUnmarshaller.Instance; - - return Invoke(request, options); - } - - - /// - /// List the streaming image resources available to this studio. - /// - /// - /// - /// This list will contain both images provided by Amazon Web Services, as well as streaming - /// images that you have created in your studio. - /// - /// - /// Container for the necessary parameters to execute the ListStreamingImages service method. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// - /// - /// The response from the ListStreamingImages service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for ListStreamingImages Operation - public virtual Task ListStreamingImagesAsync(ListStreamingImagesRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) - { - var options = new InvokeOptions(); - options.RequestMarshaller = ListStreamingImagesRequestMarshaller.Instance; - options.ResponseUnmarshaller = ListStreamingImagesResponseUnmarshaller.Instance; - - return InvokeAsync(request, options, cancellationToken); - } - - #endregion - - #region ListStreamingSessionBackups - - - /// - /// Lists the backups of a streaming session in a studio. - /// - /// Container for the necessary parameters to execute the ListStreamingSessionBackups service method. - /// - /// The response from the ListStreamingSessionBackups service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for ListStreamingSessionBackups Operation - public virtual ListStreamingSessionBackupsResponse ListStreamingSessionBackups(ListStreamingSessionBackupsRequest request) - { - var options = new InvokeOptions(); - options.RequestMarshaller = ListStreamingSessionBackupsRequestMarshaller.Instance; - options.ResponseUnmarshaller = ListStreamingSessionBackupsResponseUnmarshaller.Instance; - - return Invoke(request, options); - } - - - /// - /// Lists the backups of a streaming session in a studio. - /// - /// Container for the necessary parameters to execute the ListStreamingSessionBackups service method. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// - /// - /// The response from the ListStreamingSessionBackups service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for ListStreamingSessionBackups Operation - public virtual Task ListStreamingSessionBackupsAsync(ListStreamingSessionBackupsRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) - { - var options = new InvokeOptions(); - options.RequestMarshaller = ListStreamingSessionBackupsRequestMarshaller.Instance; - options.ResponseUnmarshaller = ListStreamingSessionBackupsResponseUnmarshaller.Instance; - - return InvokeAsync(request, options, cancellationToken); - } - - #endregion - - #region ListStreamingSessions - - - /// - /// Lists the streaming sessions in a studio. - /// - /// Container for the necessary parameters to execute the ListStreamingSessions service method. - /// - /// The response from the ListStreamingSessions service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for ListStreamingSessions Operation - public virtual ListStreamingSessionsResponse ListStreamingSessions(ListStreamingSessionsRequest request) - { - var options = new InvokeOptions(); - options.RequestMarshaller = ListStreamingSessionsRequestMarshaller.Instance; - options.ResponseUnmarshaller = ListStreamingSessionsResponseUnmarshaller.Instance; - - return Invoke(request, options); - } - - - /// - /// Lists the streaming sessions in a studio. - /// - /// Container for the necessary parameters to execute the ListStreamingSessions service method. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// - /// - /// The response from the ListStreamingSessions service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for ListStreamingSessions Operation - public virtual Task ListStreamingSessionsAsync(ListStreamingSessionsRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) - { - var options = new InvokeOptions(); - options.RequestMarshaller = ListStreamingSessionsRequestMarshaller.Instance; - options.ResponseUnmarshaller = ListStreamingSessionsResponseUnmarshaller.Instance; - - return InvokeAsync(request, options, cancellationToken); - } - - #endregion - - #region ListStudioComponents - - - /// - /// Lists the StudioComponents in a studio. - /// - /// Container for the necessary parameters to execute the ListStudioComponents service method. - /// - /// The response from the ListStudioComponents service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for ListStudioComponents Operation - public virtual ListStudioComponentsResponse ListStudioComponents(ListStudioComponentsRequest request) - { - var options = new InvokeOptions(); - options.RequestMarshaller = ListStudioComponentsRequestMarshaller.Instance; - options.ResponseUnmarshaller = ListStudioComponentsResponseUnmarshaller.Instance; - - return Invoke(request, options); - } - - - /// - /// Lists the StudioComponents in a studio. - /// - /// Container for the necessary parameters to execute the ListStudioComponents service method. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// - /// - /// The response from the ListStudioComponents service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for ListStudioComponents Operation - public virtual Task ListStudioComponentsAsync(ListStudioComponentsRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) - { - var options = new InvokeOptions(); - options.RequestMarshaller = ListStudioComponentsRequestMarshaller.Instance; - options.ResponseUnmarshaller = ListStudioComponentsResponseUnmarshaller.Instance; - - return InvokeAsync(request, options, cancellationToken); - } - - #endregion - - #region ListStudioMembers - - - /// - /// Get all users in a given studio membership. - /// - /// - /// - /// ListStudioMembers only returns admin members. - /// - /// - /// - /// Container for the necessary parameters to execute the ListStudioMembers service method. - /// - /// The response from the ListStudioMembers service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for ListStudioMembers Operation - public virtual ListStudioMembersResponse ListStudioMembers(ListStudioMembersRequest request) - { - var options = new InvokeOptions(); - options.RequestMarshaller = ListStudioMembersRequestMarshaller.Instance; - options.ResponseUnmarshaller = ListStudioMembersResponseUnmarshaller.Instance; - - return Invoke(request, options); - } - - - /// - /// Get all users in a given studio membership. - /// - /// - /// - /// ListStudioMembers only returns admin members. - /// - /// - /// - /// Container for the necessary parameters to execute the ListStudioMembers service method. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// - /// - /// The response from the ListStudioMembers service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for ListStudioMembers Operation - public virtual Task ListStudioMembersAsync(ListStudioMembersRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) - { - var options = new InvokeOptions(); - options.RequestMarshaller = ListStudioMembersRequestMarshaller.Instance; - options.ResponseUnmarshaller = ListStudioMembersResponseUnmarshaller.Instance; - - return InvokeAsync(request, options, cancellationToken); - } - - #endregion - - #region ListStudios - - - /// - /// List studios in your Amazon Web Services accounts in the requested Amazon Web Services - /// Region. - /// - /// Container for the necessary parameters to execute the ListStudios service method. - /// - /// The response from the ListStudios service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for ListStudios Operation - public virtual ListStudiosResponse ListStudios(ListStudiosRequest request) - { - var options = new InvokeOptions(); - options.RequestMarshaller = ListStudiosRequestMarshaller.Instance; - options.ResponseUnmarshaller = ListStudiosResponseUnmarshaller.Instance; - - return Invoke(request, options); - } - - - /// - /// List studios in your Amazon Web Services accounts in the requested Amazon Web Services - /// Region. - /// - /// Container for the necessary parameters to execute the ListStudios service method. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// - /// - /// The response from the ListStudios service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for ListStudios Operation - public virtual Task ListStudiosAsync(ListStudiosRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) - { - var options = new InvokeOptions(); - options.RequestMarshaller = ListStudiosRequestMarshaller.Instance; - options.ResponseUnmarshaller = ListStudiosResponseUnmarshaller.Instance; - - return InvokeAsync(request, options, cancellationToken); - } - - #endregion - - #region ListTagsForResource - - - /// - /// Gets the tags for a resource, given its Amazon Resource Names (ARN). - /// - /// - /// - /// This operation supports ARNs for all resource types in Nimble Studio that support - /// tags, including studio, studio component, launch profile, streaming image, and streaming - /// session. All resources that can be tagged will contain an ARN property, so you do - /// not have to create this ARN yourself. - /// - /// - /// Container for the necessary parameters to execute the ListTagsForResource service method. - /// - /// The response from the ListTagsForResource service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for ListTagsForResource Operation - public virtual ListTagsForResourceResponse ListTagsForResource(ListTagsForResourceRequest request) - { - var options = new InvokeOptions(); - options.RequestMarshaller = ListTagsForResourceRequestMarshaller.Instance; - options.ResponseUnmarshaller = ListTagsForResourceResponseUnmarshaller.Instance; - - return Invoke(request, options); - } - - - /// - /// Gets the tags for a resource, given its Amazon Resource Names (ARN). - /// - /// - /// - /// This operation supports ARNs for all resource types in Nimble Studio that support - /// tags, including studio, studio component, launch profile, streaming image, and streaming - /// session. All resources that can be tagged will contain an ARN property, so you do - /// not have to create this ARN yourself. - /// - /// - /// Container for the necessary parameters to execute the ListTagsForResource service method. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// - /// - /// The response from the ListTagsForResource service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for ListTagsForResource Operation - public virtual Task ListTagsForResourceAsync(ListTagsForResourceRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) - { - var options = new InvokeOptions(); - options.RequestMarshaller = ListTagsForResourceRequestMarshaller.Instance; - options.ResponseUnmarshaller = ListTagsForResourceResponseUnmarshaller.Instance; - - return InvokeAsync(request, options, cancellationToken); - } - - #endregion - - #region PutLaunchProfileMembers - - - /// - /// Add/update users with given persona to launch profile membership. - /// - /// Container for the necessary parameters to execute the PutLaunchProfileMembers service method. - /// - /// The response from the PutLaunchProfileMembers service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for PutLaunchProfileMembers Operation - public virtual PutLaunchProfileMembersResponse PutLaunchProfileMembers(PutLaunchProfileMembersRequest request) - { - var options = new InvokeOptions(); - options.RequestMarshaller = PutLaunchProfileMembersRequestMarshaller.Instance; - options.ResponseUnmarshaller = PutLaunchProfileMembersResponseUnmarshaller.Instance; - - return Invoke(request, options); - } - - - /// - /// Add/update users with given persona to launch profile membership. - /// - /// Container for the necessary parameters to execute the PutLaunchProfileMembers service method. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// - /// - /// The response from the PutLaunchProfileMembers service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for PutLaunchProfileMembers Operation - public virtual Task PutLaunchProfileMembersAsync(PutLaunchProfileMembersRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) - { - var options = new InvokeOptions(); - options.RequestMarshaller = PutLaunchProfileMembersRequestMarshaller.Instance; - options.ResponseUnmarshaller = PutLaunchProfileMembersResponseUnmarshaller.Instance; - - return InvokeAsync(request, options, cancellationToken); - } - - #endregion - - #region PutStudioMembers - - - /// - /// Add/update users with given persona to studio membership. - /// - /// Container for the necessary parameters to execute the PutStudioMembers service method. - /// - /// The response from the PutStudioMembers service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for PutStudioMembers Operation - public virtual PutStudioMembersResponse PutStudioMembers(PutStudioMembersRequest request) - { - var options = new InvokeOptions(); - options.RequestMarshaller = PutStudioMembersRequestMarshaller.Instance; - options.ResponseUnmarshaller = PutStudioMembersResponseUnmarshaller.Instance; - - return Invoke(request, options); - } - - - /// - /// Add/update users with given persona to studio membership. - /// - /// Container for the necessary parameters to execute the PutStudioMembers service method. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// - /// - /// The response from the PutStudioMembers service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for PutStudioMembers Operation - public virtual Task PutStudioMembersAsync(PutStudioMembersRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) - { - var options = new InvokeOptions(); - options.RequestMarshaller = PutStudioMembersRequestMarshaller.Instance; - options.ResponseUnmarshaller = PutStudioMembersResponseUnmarshaller.Instance; - - return InvokeAsync(request, options, cancellationToken); - } - - #endregion - - #region StartStreamingSession - - - /// - /// Transitions sessions from the STOPPED state into the READY state. The - /// START_IN_PROGRESS state is the intermediate state between the STOPPED - /// and READY states. - /// - /// Container for the necessary parameters to execute the StartStreamingSession service method. - /// - /// The response from the StartStreamingSession service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for StartStreamingSession Operation - public virtual StartStreamingSessionResponse StartStreamingSession(StartStreamingSessionRequest request) - { - var options = new InvokeOptions(); - options.RequestMarshaller = StartStreamingSessionRequestMarshaller.Instance; - options.ResponseUnmarshaller = StartStreamingSessionResponseUnmarshaller.Instance; - - return Invoke(request, options); - } - - - /// - /// Transitions sessions from the STOPPED state into the READY state. The - /// START_IN_PROGRESS state is the intermediate state between the STOPPED - /// and READY states. - /// - /// Container for the necessary parameters to execute the StartStreamingSession service method. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// - /// - /// The response from the StartStreamingSession service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for StartStreamingSession Operation - public virtual Task StartStreamingSessionAsync(StartStreamingSessionRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) - { - var options = new InvokeOptions(); - options.RequestMarshaller = StartStreamingSessionRequestMarshaller.Instance; - options.ResponseUnmarshaller = StartStreamingSessionResponseUnmarshaller.Instance; - - return InvokeAsync(request, options, cancellationToken); - } - - #endregion - - #region StartStudioSSOConfigurationRepair - - - /// - /// Repairs the IAM Identity Center configuration for a given studio. - /// - /// - /// - /// If the studio has a valid IAM Identity Center configuration currently associated with - /// it, this operation will fail with a validation error. - /// - /// - /// - /// If the studio does not have a valid IAM Identity Center configuration currently associated - /// with it, then a new IAM Identity Center application is created for the studio and - /// the studio is changed to the READY state. - /// - /// - /// - /// After the IAM Identity Center application is repaired, you must use the Amazon Nimble - /// Studio console to add administrators and users to your studio. - /// - /// - /// Container for the necessary parameters to execute the StartStudioSSOConfigurationRepair service method. - /// - /// The response from the StartStudioSSOConfigurationRepair service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for StartStudioSSOConfigurationRepair Operation - public virtual StartStudioSSOConfigurationRepairResponse StartStudioSSOConfigurationRepair(StartStudioSSOConfigurationRepairRequest request) - { - var options = new InvokeOptions(); - options.RequestMarshaller = StartStudioSSOConfigurationRepairRequestMarshaller.Instance; - options.ResponseUnmarshaller = StartStudioSSOConfigurationRepairResponseUnmarshaller.Instance; - - return Invoke(request, options); - } - - - /// - /// Repairs the IAM Identity Center configuration for a given studio. - /// - /// - /// - /// If the studio has a valid IAM Identity Center configuration currently associated with - /// it, this operation will fail with a validation error. - /// - /// - /// - /// If the studio does not have a valid IAM Identity Center configuration currently associated - /// with it, then a new IAM Identity Center application is created for the studio and - /// the studio is changed to the READY state. - /// - /// - /// - /// After the IAM Identity Center application is repaired, you must use the Amazon Nimble - /// Studio console to add administrators and users to your studio. - /// - /// - /// Container for the necessary parameters to execute the StartStudioSSOConfigurationRepair service method. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// - /// - /// The response from the StartStudioSSOConfigurationRepair service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for StartStudioSSOConfigurationRepair Operation - public virtual Task StartStudioSSOConfigurationRepairAsync(StartStudioSSOConfigurationRepairRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) - { - var options = new InvokeOptions(); - options.RequestMarshaller = StartStudioSSOConfigurationRepairRequestMarshaller.Instance; - options.ResponseUnmarshaller = StartStudioSSOConfigurationRepairResponseUnmarshaller.Instance; - - return InvokeAsync(request, options, cancellationToken); - } - - #endregion - - #region StopStreamingSession - - - /// - /// Transitions sessions from the READY state into the STOPPED state. The - /// STOP_IN_PROGRESS state is the intermediate state between the READY and - /// STOPPED states. - /// - /// Container for the necessary parameters to execute the StopStreamingSession service method. - /// - /// The response from the StopStreamingSession service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for StopStreamingSession Operation - public virtual StopStreamingSessionResponse StopStreamingSession(StopStreamingSessionRequest request) - { - var options = new InvokeOptions(); - options.RequestMarshaller = StopStreamingSessionRequestMarshaller.Instance; - options.ResponseUnmarshaller = StopStreamingSessionResponseUnmarshaller.Instance; - - return Invoke(request, options); - } - - - /// - /// Transitions sessions from the READY state into the STOPPED state. The - /// STOP_IN_PROGRESS state is the intermediate state between the READY and - /// STOPPED states. - /// - /// Container for the necessary parameters to execute the StopStreamingSession service method. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// - /// - /// The response from the StopStreamingSession service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for StopStreamingSession Operation - public virtual Task StopStreamingSessionAsync(StopStreamingSessionRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) - { - var options = new InvokeOptions(); - options.RequestMarshaller = StopStreamingSessionRequestMarshaller.Instance; - options.ResponseUnmarshaller = StopStreamingSessionResponseUnmarshaller.Instance; - - return InvokeAsync(request, options, cancellationToken); - } - - #endregion - - #region TagResource - - - /// - /// Creates tags for a resource, given its ARN. - /// - /// Container for the necessary parameters to execute the TagResource service method. - /// - /// The response from the TagResource service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for TagResource Operation - public virtual TagResourceResponse TagResource(TagResourceRequest request) - { - var options = new InvokeOptions(); - options.RequestMarshaller = TagResourceRequestMarshaller.Instance; - options.ResponseUnmarshaller = TagResourceResponseUnmarshaller.Instance; - - return Invoke(request, options); - } - - - /// - /// Creates tags for a resource, given its ARN. - /// - /// Container for the necessary parameters to execute the TagResource service method. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// - /// - /// The response from the TagResource service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for TagResource Operation - public virtual Task TagResourceAsync(TagResourceRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) - { - var options = new InvokeOptions(); - options.RequestMarshaller = TagResourceRequestMarshaller.Instance; - options.ResponseUnmarshaller = TagResourceResponseUnmarshaller.Instance; - - return InvokeAsync(request, options, cancellationToken); - } - - #endregion - - #region UntagResource - - - /// - /// Deletes the tags for a resource. - /// - /// Container for the necessary parameters to execute the UntagResource service method. - /// - /// The response from the UntagResource service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for UntagResource Operation - public virtual UntagResourceResponse UntagResource(UntagResourceRequest request) - { - var options = new InvokeOptions(); - options.RequestMarshaller = UntagResourceRequestMarshaller.Instance; - options.ResponseUnmarshaller = UntagResourceResponseUnmarshaller.Instance; - - return Invoke(request, options); - } - - - /// - /// Deletes the tags for a resource. - /// - /// Container for the necessary parameters to execute the UntagResource service method. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// - /// - /// The response from the UntagResource service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for UntagResource Operation - public virtual Task UntagResourceAsync(UntagResourceRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) - { - var options = new InvokeOptions(); - options.RequestMarshaller = UntagResourceRequestMarshaller.Instance; - options.ResponseUnmarshaller = UntagResourceResponseUnmarshaller.Instance; - - return InvokeAsync(request, options, cancellationToken); - } - - #endregion - - #region UpdateLaunchProfile - - - /// - /// Update a launch profile. - /// - /// Container for the necessary parameters to execute the UpdateLaunchProfile service method. - /// - /// The response from the UpdateLaunchProfile service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for UpdateLaunchProfile Operation - public virtual UpdateLaunchProfileResponse UpdateLaunchProfile(UpdateLaunchProfileRequest request) - { - var options = new InvokeOptions(); - options.RequestMarshaller = UpdateLaunchProfileRequestMarshaller.Instance; - options.ResponseUnmarshaller = UpdateLaunchProfileResponseUnmarshaller.Instance; - - return Invoke(request, options); - } - - - /// - /// Update a launch profile. - /// - /// Container for the necessary parameters to execute the UpdateLaunchProfile service method. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// - /// - /// The response from the UpdateLaunchProfile service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for UpdateLaunchProfile Operation - public virtual Task UpdateLaunchProfileAsync(UpdateLaunchProfileRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) - { - var options = new InvokeOptions(); - options.RequestMarshaller = UpdateLaunchProfileRequestMarshaller.Instance; - options.ResponseUnmarshaller = UpdateLaunchProfileResponseUnmarshaller.Instance; - - return InvokeAsync(request, options, cancellationToken); - } - - #endregion - - #region UpdateLaunchProfileMember - - - /// - /// Update a user persona in launch profile membership. - /// - /// Container for the necessary parameters to execute the UpdateLaunchProfileMember service method. - /// - /// The response from the UpdateLaunchProfileMember service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for UpdateLaunchProfileMember Operation - public virtual UpdateLaunchProfileMemberResponse UpdateLaunchProfileMember(UpdateLaunchProfileMemberRequest request) - { - var options = new InvokeOptions(); - options.RequestMarshaller = UpdateLaunchProfileMemberRequestMarshaller.Instance; - options.ResponseUnmarshaller = UpdateLaunchProfileMemberResponseUnmarshaller.Instance; - - return Invoke(request, options); - } - - - /// - /// Update a user persona in launch profile membership. - /// - /// Container for the necessary parameters to execute the UpdateLaunchProfileMember service method. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// - /// - /// The response from the UpdateLaunchProfileMember service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for UpdateLaunchProfileMember Operation - public virtual Task UpdateLaunchProfileMemberAsync(UpdateLaunchProfileMemberRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) - { - var options = new InvokeOptions(); - options.RequestMarshaller = UpdateLaunchProfileMemberRequestMarshaller.Instance; - options.ResponseUnmarshaller = UpdateLaunchProfileMemberResponseUnmarshaller.Instance; - - return InvokeAsync(request, options, cancellationToken); - } - - #endregion - - #region UpdateStreamingImage - - - /// - /// Update streaming image. - /// - /// Container for the necessary parameters to execute the UpdateStreamingImage service method. - /// - /// The response from the UpdateStreamingImage service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for UpdateStreamingImage Operation - public virtual UpdateStreamingImageResponse UpdateStreamingImage(UpdateStreamingImageRequest request) - { - var options = new InvokeOptions(); - options.RequestMarshaller = UpdateStreamingImageRequestMarshaller.Instance; - options.ResponseUnmarshaller = UpdateStreamingImageResponseUnmarshaller.Instance; - - return Invoke(request, options); - } - - - /// - /// Update streaming image. - /// - /// Container for the necessary parameters to execute the UpdateStreamingImage service method. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// - /// - /// The response from the UpdateStreamingImage service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for UpdateStreamingImage Operation - public virtual Task UpdateStreamingImageAsync(UpdateStreamingImageRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) - { - var options = new InvokeOptions(); - options.RequestMarshaller = UpdateStreamingImageRequestMarshaller.Instance; - options.ResponseUnmarshaller = UpdateStreamingImageResponseUnmarshaller.Instance; - - return InvokeAsync(request, options, cancellationToken); - } - - #endregion - - #region UpdateStudio - - - /// - /// Update a Studio resource. - /// - /// - /// - /// Currently, this operation only supports updating the displayName of your studio. - /// - /// - /// Container for the necessary parameters to execute the UpdateStudio service method. - /// - /// The response from the UpdateStudio service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for UpdateStudio Operation - public virtual UpdateStudioResponse UpdateStudio(UpdateStudioRequest request) - { - var options = new InvokeOptions(); - options.RequestMarshaller = UpdateStudioRequestMarshaller.Instance; - options.ResponseUnmarshaller = UpdateStudioResponseUnmarshaller.Instance; - - return Invoke(request, options); - } - - - /// - /// Update a Studio resource. - /// - /// - /// - /// Currently, this operation only supports updating the displayName of your studio. - /// - /// - /// Container for the necessary parameters to execute the UpdateStudio service method. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// - /// - /// The response from the UpdateStudio service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for UpdateStudio Operation - public virtual Task UpdateStudioAsync(UpdateStudioRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) - { - var options = new InvokeOptions(); - options.RequestMarshaller = UpdateStudioRequestMarshaller.Instance; - options.ResponseUnmarshaller = UpdateStudioResponseUnmarshaller.Instance; - - return InvokeAsync(request, options, cancellationToken); - } - - #endregion - - #region UpdateStudioComponent - - - /// - /// Updates a studio component resource. - /// - /// Container for the necessary parameters to execute the UpdateStudioComponent service method. - /// - /// The response from the UpdateStudioComponent service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for UpdateStudioComponent Operation - public virtual UpdateStudioComponentResponse UpdateStudioComponent(UpdateStudioComponentRequest request) - { - var options = new InvokeOptions(); - options.RequestMarshaller = UpdateStudioComponentRequestMarshaller.Instance; - options.ResponseUnmarshaller = UpdateStudioComponentResponseUnmarshaller.Instance; - - return Invoke(request, options); - } - - - /// - /// Updates a studio component resource. - /// - /// Container for the necessary parameters to execute the UpdateStudioComponent service method. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// - /// - /// The response from the UpdateStudioComponent service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for UpdateStudioComponent Operation - public virtual Task UpdateStudioComponentAsync(UpdateStudioComponentRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) - { - var options = new InvokeOptions(); - options.RequestMarshaller = UpdateStudioComponentRequestMarshaller.Instance; - options.ResponseUnmarshaller = UpdateStudioComponentResponseUnmarshaller.Instance; - - return InvokeAsync(request, options, cancellationToken); - } - - #endregion - - #region DetermineServiceOperationEndpoint - - /// - /// Returns the endpoint that will be used for a particular request. - /// - /// Request for the desired service operation. - /// The resolved endpoint for the given request. - public Amazon.Runtime.Endpoints.Endpoint DetermineServiceOperationEndpoint(AmazonWebServiceRequest request) - { - var parameters = new ServiceOperationEndpointParameters(request); - return Config.DetermineServiceOperationEndpoint(parameters); - } - - #endregion - - } -} \ No newline at end of file diff --git a/sdk/src/Services/NimbleStudio/Generated/_bcl/IAmazonNimbleStudio.cs b/sdk/src/Services/NimbleStudio/Generated/_bcl/IAmazonNimbleStudio.cs deleted file mode 100644 index ada52db6f6c5..000000000000 --- a/sdk/src/Services/NimbleStudio/Generated/_bcl/IAmazonNimbleStudio.cs +++ /dev/null @@ -1,4419 +0,0 @@ -/* - * 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. - */ - -/* - * Do not modify this file. This file is generated from the nimble-2020-08-01.normal.json service model. - */ - - -using System; -using System.Threading; -using System.Threading.Tasks; -using System.Collections.Generic; - -using Amazon.Runtime; -using Amazon.NimbleStudio.Model; - -#pragma warning disable CS1570 -namespace Amazon.NimbleStudio -{ - /// - /// Interface for accessing NimbleStudio - /// - /// Welcome to the Amazon Nimble Studio API reference. This API reference provides methods, - /// schema, resources, parameters, and more to help you get the most out of Nimble Studio. - /// - /// - /// - /// Nimble Studio is a virtual studio that empowers visual effects, animation, and interactive - /// content teams to create content securely within a scalable, private cloud service. - /// - /// - public partial interface IAmazonNimbleStudio : IAmazonService, IDisposable - { - - /// - /// Paginators for the service - /// - INimbleStudioPaginatorFactory Paginators { get; } - - - #region AcceptEulas - - - /// - /// Accept EULAs. - /// - /// Container for the necessary parameters to execute the AcceptEulas service method. - /// - /// The response from the AcceptEulas service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for AcceptEulas Operation - AcceptEulasResponse AcceptEulas(AcceptEulasRequest request); - - - - /// - /// Accept EULAs. - /// - /// Container for the necessary parameters to execute the AcceptEulas service method. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// - /// - /// The response from the AcceptEulas service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for AcceptEulas Operation - Task AcceptEulasAsync(AcceptEulasRequest request, CancellationToken cancellationToken = default(CancellationToken)); - - #endregion - - #region CreateLaunchProfile - - - /// - /// Create a launch profile. - /// - /// Container for the necessary parameters to execute the CreateLaunchProfile service method. - /// - /// The response from the CreateLaunchProfile service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for CreateLaunchProfile Operation - CreateLaunchProfileResponse CreateLaunchProfile(CreateLaunchProfileRequest request); - - - - /// - /// Create a launch profile. - /// - /// Container for the necessary parameters to execute the CreateLaunchProfile service method. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// - /// - /// The response from the CreateLaunchProfile service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for CreateLaunchProfile Operation - Task CreateLaunchProfileAsync(CreateLaunchProfileRequest request, CancellationToken cancellationToken = default(CancellationToken)); - - #endregion - - #region CreateStreamingImage - - - /// - /// Creates a streaming image resource in a studio. - /// - /// Container for the necessary parameters to execute the CreateStreamingImage service method. - /// - /// The response from the CreateStreamingImage service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for CreateStreamingImage Operation - CreateStreamingImageResponse CreateStreamingImage(CreateStreamingImageRequest request); - - - - /// - /// Creates a streaming image resource in a studio. - /// - /// Container for the necessary parameters to execute the CreateStreamingImage service method. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// - /// - /// The response from the CreateStreamingImage service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for CreateStreamingImage Operation - Task CreateStreamingImageAsync(CreateStreamingImageRequest request, CancellationToken cancellationToken = default(CancellationToken)); - - #endregion - - #region CreateStreamingSession - - - /// - /// Creates a streaming session in a studio. - /// - /// - /// - /// After invoking this operation, you must poll GetStreamingSession until the streaming - /// session is in the READY state. - /// - /// - /// Container for the necessary parameters to execute the CreateStreamingSession service method. - /// - /// The response from the CreateStreamingSession service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for CreateStreamingSession Operation - CreateStreamingSessionResponse CreateStreamingSession(CreateStreamingSessionRequest request); - - - - /// - /// Creates a streaming session in a studio. - /// - /// - /// - /// After invoking this operation, you must poll GetStreamingSession until the streaming - /// session is in the READY state. - /// - /// - /// Container for the necessary parameters to execute the CreateStreamingSession service method. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// - /// - /// The response from the CreateStreamingSession service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for CreateStreamingSession Operation - Task CreateStreamingSessionAsync(CreateStreamingSessionRequest request, CancellationToken cancellationToken = default(CancellationToken)); - - #endregion - - #region CreateStreamingSessionStream - - - /// - /// Creates a streaming session stream for a streaming session. - /// - /// - /// - /// After invoking this API, invoke GetStreamingSessionStream with the returned streamId - /// to poll the resource until it is in the READY state. - /// - /// - /// Container for the necessary parameters to execute the CreateStreamingSessionStream service method. - /// - /// The response from the CreateStreamingSessionStream service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for CreateStreamingSessionStream Operation - CreateStreamingSessionStreamResponse CreateStreamingSessionStream(CreateStreamingSessionStreamRequest request); - - - - /// - /// Creates a streaming session stream for a streaming session. - /// - /// - /// - /// After invoking this API, invoke GetStreamingSessionStream with the returned streamId - /// to poll the resource until it is in the READY state. - /// - /// - /// Container for the necessary parameters to execute the CreateStreamingSessionStream service method. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// - /// - /// The response from the CreateStreamingSessionStream service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for CreateStreamingSessionStream Operation - Task CreateStreamingSessionStreamAsync(CreateStreamingSessionStreamRequest request, CancellationToken cancellationToken = default(CancellationToken)); - - #endregion - - #region CreateStudio - - - /// - /// Create a new studio. - /// - /// - /// - /// When creating a studio, two IAM roles must be provided: the admin role and the user - /// role. These roles are assumed by your users when they log in to the Nimble Studio - /// portal. - /// - /// - /// - /// The user role must have the AmazonNimbleStudio-StudioUser managed policy attached - /// for the portal to function properly. - /// - /// - /// - /// The admin role must have the AmazonNimbleStudio-StudioAdmin managed policy - /// attached for the portal to function properly. - /// - /// - /// - /// You may optionally specify a KMS key in the StudioEncryptionConfiguration. - /// - /// - /// - /// In Nimble Studio, resource names, descriptions, initialization scripts, and other - /// data you provide are always encrypted at rest using an KMS key. By default, this key - /// is owned by Amazon Web Services and managed on your behalf. You may provide your own - /// KMS key when calling CreateStudio to encrypt this data using a key you own - /// and manage. - /// - /// - /// - /// When providing an KMS key during studio creation, Nimble Studio creates KMS grants - /// in your account to provide your studio user and admin roles access to these KMS keys. - /// - /// - /// - /// If you delete this grant, the studio will no longer be accessible to your portal users. - /// - /// - /// - /// If you delete the studio KMS key, your studio will no longer be accessible. - /// - /// - /// Container for the necessary parameters to execute the CreateStudio service method. - /// - /// The response from the CreateStudio service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for CreateStudio Operation - CreateStudioResponse CreateStudio(CreateStudioRequest request); - - - - /// - /// Create a new studio. - /// - /// - /// - /// When creating a studio, two IAM roles must be provided: the admin role and the user - /// role. These roles are assumed by your users when they log in to the Nimble Studio - /// portal. - /// - /// - /// - /// The user role must have the AmazonNimbleStudio-StudioUser managed policy attached - /// for the portal to function properly. - /// - /// - /// - /// The admin role must have the AmazonNimbleStudio-StudioAdmin managed policy - /// attached for the portal to function properly. - /// - /// - /// - /// You may optionally specify a KMS key in the StudioEncryptionConfiguration. - /// - /// - /// - /// In Nimble Studio, resource names, descriptions, initialization scripts, and other - /// data you provide are always encrypted at rest using an KMS key. By default, this key - /// is owned by Amazon Web Services and managed on your behalf. You may provide your own - /// KMS key when calling CreateStudio to encrypt this data using a key you own - /// and manage. - /// - /// - /// - /// When providing an KMS key during studio creation, Nimble Studio creates KMS grants - /// in your account to provide your studio user and admin roles access to these KMS keys. - /// - /// - /// - /// If you delete this grant, the studio will no longer be accessible to your portal users. - /// - /// - /// - /// If you delete the studio KMS key, your studio will no longer be accessible. - /// - /// - /// Container for the necessary parameters to execute the CreateStudio service method. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// - /// - /// The response from the CreateStudio service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for CreateStudio Operation - Task CreateStudioAsync(CreateStudioRequest request, CancellationToken cancellationToken = default(CancellationToken)); - - #endregion - - #region CreateStudioComponent - - - /// - /// Creates a studio component resource. - /// - /// Container for the necessary parameters to execute the CreateStudioComponent service method. - /// - /// The response from the CreateStudioComponent service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for CreateStudioComponent Operation - CreateStudioComponentResponse CreateStudioComponent(CreateStudioComponentRequest request); - - - - /// - /// Creates a studio component resource. - /// - /// Container for the necessary parameters to execute the CreateStudioComponent service method. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// - /// - /// The response from the CreateStudioComponent service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for CreateStudioComponent Operation - Task CreateStudioComponentAsync(CreateStudioComponentRequest request, CancellationToken cancellationToken = default(CancellationToken)); - - #endregion - - #region DeleteLaunchProfile - - - /// - /// Permanently delete a launch profile. - /// - /// Container for the necessary parameters to execute the DeleteLaunchProfile service method. - /// - /// The response from the DeleteLaunchProfile service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for DeleteLaunchProfile Operation - DeleteLaunchProfileResponse DeleteLaunchProfile(DeleteLaunchProfileRequest request); - - - - /// - /// Permanently delete a launch profile. - /// - /// Container for the necessary parameters to execute the DeleteLaunchProfile service method. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// - /// - /// The response from the DeleteLaunchProfile service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for DeleteLaunchProfile Operation - Task DeleteLaunchProfileAsync(DeleteLaunchProfileRequest request, CancellationToken cancellationToken = default(CancellationToken)); - - #endregion - - #region DeleteLaunchProfileMember - - - /// - /// Delete a user from launch profile membership. - /// - /// Container for the necessary parameters to execute the DeleteLaunchProfileMember service method. - /// - /// The response from the DeleteLaunchProfileMember service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for DeleteLaunchProfileMember Operation - DeleteLaunchProfileMemberResponse DeleteLaunchProfileMember(DeleteLaunchProfileMemberRequest request); - - - - /// - /// Delete a user from launch profile membership. - /// - /// Container for the necessary parameters to execute the DeleteLaunchProfileMember service method. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// - /// - /// The response from the DeleteLaunchProfileMember service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for DeleteLaunchProfileMember Operation - Task DeleteLaunchProfileMemberAsync(DeleteLaunchProfileMemberRequest request, CancellationToken cancellationToken = default(CancellationToken)); - - #endregion - - #region DeleteStreamingImage - - - /// - /// Delete streaming image. - /// - /// Container for the necessary parameters to execute the DeleteStreamingImage service method. - /// - /// The response from the DeleteStreamingImage service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for DeleteStreamingImage Operation - DeleteStreamingImageResponse DeleteStreamingImage(DeleteStreamingImageRequest request); - - - - /// - /// Delete streaming image. - /// - /// Container for the necessary parameters to execute the DeleteStreamingImage service method. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// - /// - /// The response from the DeleteStreamingImage service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for DeleteStreamingImage Operation - Task DeleteStreamingImageAsync(DeleteStreamingImageRequest request, CancellationToken cancellationToken = default(CancellationToken)); - - #endregion - - #region DeleteStreamingSession - - - /// - /// Deletes streaming session resource. - /// - /// - /// - /// After invoking this operation, use GetStreamingSession to poll the resource until - /// it transitions to a DELETED state. - /// - /// - /// - /// A streaming session will count against your streaming session quota until it is marked - /// DELETED. - /// - /// - /// Container for the necessary parameters to execute the DeleteStreamingSession service method. - /// - /// The response from the DeleteStreamingSession service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for DeleteStreamingSession Operation - DeleteStreamingSessionResponse DeleteStreamingSession(DeleteStreamingSessionRequest request); - - - - /// - /// Deletes streaming session resource. - /// - /// - /// - /// After invoking this operation, use GetStreamingSession to poll the resource until - /// it transitions to a DELETED state. - /// - /// - /// - /// A streaming session will count against your streaming session quota until it is marked - /// DELETED. - /// - /// - /// Container for the necessary parameters to execute the DeleteStreamingSession service method. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// - /// - /// The response from the DeleteStreamingSession service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for DeleteStreamingSession Operation - Task DeleteStreamingSessionAsync(DeleteStreamingSessionRequest request, CancellationToken cancellationToken = default(CancellationToken)); - - #endregion - - #region DeleteStudio - - - /// - /// Delete a studio resource. - /// - /// Container for the necessary parameters to execute the DeleteStudio service method. - /// - /// The response from the DeleteStudio service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for DeleteStudio Operation - DeleteStudioResponse DeleteStudio(DeleteStudioRequest request); - - - - /// - /// Delete a studio resource. - /// - /// Container for the necessary parameters to execute the DeleteStudio service method. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// - /// - /// The response from the DeleteStudio service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for DeleteStudio Operation - Task DeleteStudioAsync(DeleteStudioRequest request, CancellationToken cancellationToken = default(CancellationToken)); - - #endregion - - #region DeleteStudioComponent - - - /// - /// Deletes a studio component resource. - /// - /// Container for the necessary parameters to execute the DeleteStudioComponent service method. - /// - /// The response from the DeleteStudioComponent service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for DeleteStudioComponent Operation - DeleteStudioComponentResponse DeleteStudioComponent(DeleteStudioComponentRequest request); - - - - /// - /// Deletes a studio component resource. - /// - /// Container for the necessary parameters to execute the DeleteStudioComponent service method. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// - /// - /// The response from the DeleteStudioComponent service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for DeleteStudioComponent Operation - Task DeleteStudioComponentAsync(DeleteStudioComponentRequest request, CancellationToken cancellationToken = default(CancellationToken)); - - #endregion - - #region DeleteStudioMember - - - /// - /// Delete a user from studio membership. - /// - /// Container for the necessary parameters to execute the DeleteStudioMember service method. - /// - /// The response from the DeleteStudioMember service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for DeleteStudioMember Operation - DeleteStudioMemberResponse DeleteStudioMember(DeleteStudioMemberRequest request); - - - - /// - /// Delete a user from studio membership. - /// - /// Container for the necessary parameters to execute the DeleteStudioMember service method. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// - /// - /// The response from the DeleteStudioMember service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for DeleteStudioMember Operation - Task DeleteStudioMemberAsync(DeleteStudioMemberRequest request, CancellationToken cancellationToken = default(CancellationToken)); - - #endregion - - #region GetEula - - - /// - /// Get EULA. - /// - /// Container for the necessary parameters to execute the GetEula service method. - /// - /// The response from the GetEula service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for GetEula Operation - GetEulaResponse GetEula(GetEulaRequest request); - - - - /// - /// Get EULA. - /// - /// Container for the necessary parameters to execute the GetEula service method. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// - /// - /// The response from the GetEula service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for GetEula Operation - Task GetEulaAsync(GetEulaRequest request, CancellationToken cancellationToken = default(CancellationToken)); - - #endregion - - #region GetLaunchProfile - - - /// - /// Get a launch profile. - /// - /// Container for the necessary parameters to execute the GetLaunchProfile service method. - /// - /// The response from the GetLaunchProfile service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for GetLaunchProfile Operation - GetLaunchProfileResponse GetLaunchProfile(GetLaunchProfileRequest request); - - - - /// - /// Get a launch profile. - /// - /// Container for the necessary parameters to execute the GetLaunchProfile service method. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// - /// - /// The response from the GetLaunchProfile service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for GetLaunchProfile Operation - Task GetLaunchProfileAsync(GetLaunchProfileRequest request, CancellationToken cancellationToken = default(CancellationToken)); - - #endregion - - #region GetLaunchProfileDetails - - - /// - /// Launch profile details include the launch profile resource and summary information - /// of resources that are used by, or available to, the launch profile. This includes - /// the name and description of all studio components used by the launch profiles, and - /// the name and description of streaming images that can be used with this launch profile. - /// - /// Container for the necessary parameters to execute the GetLaunchProfileDetails service method. - /// - /// The response from the GetLaunchProfileDetails service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for GetLaunchProfileDetails Operation - GetLaunchProfileDetailsResponse GetLaunchProfileDetails(GetLaunchProfileDetailsRequest request); - - - - /// - /// Launch profile details include the launch profile resource and summary information - /// of resources that are used by, or available to, the launch profile. This includes - /// the name and description of all studio components used by the launch profiles, and - /// the name and description of streaming images that can be used with this launch profile. - /// - /// Container for the necessary parameters to execute the GetLaunchProfileDetails service method. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// - /// - /// The response from the GetLaunchProfileDetails service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for GetLaunchProfileDetails Operation - Task GetLaunchProfileDetailsAsync(GetLaunchProfileDetailsRequest request, CancellationToken cancellationToken = default(CancellationToken)); - - #endregion - - #region GetLaunchProfileInitialization - - - /// - /// Get a launch profile initialization. - /// - /// Container for the necessary parameters to execute the GetLaunchProfileInitialization service method. - /// - /// The response from the GetLaunchProfileInitialization service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for GetLaunchProfileInitialization Operation - GetLaunchProfileInitializationResponse GetLaunchProfileInitialization(GetLaunchProfileInitializationRequest request); - - - - /// - /// Get a launch profile initialization. - /// - /// Container for the necessary parameters to execute the GetLaunchProfileInitialization service method. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// - /// - /// The response from the GetLaunchProfileInitialization service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for GetLaunchProfileInitialization Operation - Task GetLaunchProfileInitializationAsync(GetLaunchProfileInitializationRequest request, CancellationToken cancellationToken = default(CancellationToken)); - - #endregion - - #region GetLaunchProfileMember - - - /// - /// Get a user persona in launch profile membership. - /// - /// Container for the necessary parameters to execute the GetLaunchProfileMember service method. - /// - /// The response from the GetLaunchProfileMember service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for GetLaunchProfileMember Operation - GetLaunchProfileMemberResponse GetLaunchProfileMember(GetLaunchProfileMemberRequest request); - - - - /// - /// Get a user persona in launch profile membership. - /// - /// Container for the necessary parameters to execute the GetLaunchProfileMember service method. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// - /// - /// The response from the GetLaunchProfileMember service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for GetLaunchProfileMember Operation - Task GetLaunchProfileMemberAsync(GetLaunchProfileMemberRequest request, CancellationToken cancellationToken = default(CancellationToken)); - - #endregion - - #region GetStreamingImage - - - /// - /// Get streaming image. - /// - /// Container for the necessary parameters to execute the GetStreamingImage service method. - /// - /// The response from the GetStreamingImage service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for GetStreamingImage Operation - GetStreamingImageResponse GetStreamingImage(GetStreamingImageRequest request); - - - - /// - /// Get streaming image. - /// - /// Container for the necessary parameters to execute the GetStreamingImage service method. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// - /// - /// The response from the GetStreamingImage service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for GetStreamingImage Operation - Task GetStreamingImageAsync(GetStreamingImageRequest request, CancellationToken cancellationToken = default(CancellationToken)); - - #endregion - - #region GetStreamingSession - - - /// - /// Gets StreamingSession resource. - /// - /// - /// - /// Invoke this operation to poll for a streaming session state while creating or deleting - /// a session. - /// - /// - /// Container for the necessary parameters to execute the GetStreamingSession service method. - /// - /// The response from the GetStreamingSession service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for GetStreamingSession Operation - GetStreamingSessionResponse GetStreamingSession(GetStreamingSessionRequest request); - - - - /// - /// Gets StreamingSession resource. - /// - /// - /// - /// Invoke this operation to poll for a streaming session state while creating or deleting - /// a session. - /// - /// - /// Container for the necessary parameters to execute the GetStreamingSession service method. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// - /// - /// The response from the GetStreamingSession service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for GetStreamingSession Operation - Task GetStreamingSessionAsync(GetStreamingSessionRequest request, CancellationToken cancellationToken = default(CancellationToken)); - - #endregion - - #region GetStreamingSessionBackup - - - /// - /// Gets StreamingSessionBackup resource. - /// - /// - /// - /// Invoke this operation to poll for a streaming session backup while stopping a streaming - /// session. - /// - /// - /// Container for the necessary parameters to execute the GetStreamingSessionBackup service method. - /// - /// The response from the GetStreamingSessionBackup service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for GetStreamingSessionBackup Operation - GetStreamingSessionBackupResponse GetStreamingSessionBackup(GetStreamingSessionBackupRequest request); - - - - /// - /// Gets StreamingSessionBackup resource. - /// - /// - /// - /// Invoke this operation to poll for a streaming session backup while stopping a streaming - /// session. - /// - /// - /// Container for the necessary parameters to execute the GetStreamingSessionBackup service method. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// - /// - /// The response from the GetStreamingSessionBackup service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for GetStreamingSessionBackup Operation - Task GetStreamingSessionBackupAsync(GetStreamingSessionBackupRequest request, CancellationToken cancellationToken = default(CancellationToken)); - - #endregion - - #region GetStreamingSessionStream - - - /// - /// Gets a StreamingSessionStream for a streaming session. - /// - /// - /// - /// Invoke this operation to poll the resource after invoking CreateStreamingSessionStream. - /// - /// - /// - /// After the StreamingSessionStream changes to the READY state, the url - /// property will contain a stream to be used with the DCV streaming client. - /// - /// - /// Container for the necessary parameters to execute the GetStreamingSessionStream service method. - /// - /// The response from the GetStreamingSessionStream service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for GetStreamingSessionStream Operation - GetStreamingSessionStreamResponse GetStreamingSessionStream(GetStreamingSessionStreamRequest request); - - - - /// - /// Gets a StreamingSessionStream for a streaming session. - /// - /// - /// - /// Invoke this operation to poll the resource after invoking CreateStreamingSessionStream. - /// - /// - /// - /// After the StreamingSessionStream changes to the READY state, the url - /// property will contain a stream to be used with the DCV streaming client. - /// - /// - /// Container for the necessary parameters to execute the GetStreamingSessionStream service method. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// - /// - /// The response from the GetStreamingSessionStream service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for GetStreamingSessionStream Operation - Task GetStreamingSessionStreamAsync(GetStreamingSessionStreamRequest request, CancellationToken cancellationToken = default(CancellationToken)); - - #endregion - - #region GetStudio - - - /// - /// Get a studio resource. - /// - /// Container for the necessary parameters to execute the GetStudio service method. - /// - /// The response from the GetStudio service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for GetStudio Operation - GetStudioResponse GetStudio(GetStudioRequest request); - - - - /// - /// Get a studio resource. - /// - /// Container for the necessary parameters to execute the GetStudio service method. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// - /// - /// The response from the GetStudio service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for GetStudio Operation - Task GetStudioAsync(GetStudioRequest request, CancellationToken cancellationToken = default(CancellationToken)); - - #endregion - - #region GetStudioComponent - - - /// - /// Gets a studio component resource. - /// - /// Container for the necessary parameters to execute the GetStudioComponent service method. - /// - /// The response from the GetStudioComponent service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for GetStudioComponent Operation - GetStudioComponentResponse GetStudioComponent(GetStudioComponentRequest request); - - - - /// - /// Gets a studio component resource. - /// - /// Container for the necessary parameters to execute the GetStudioComponent service method. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// - /// - /// The response from the GetStudioComponent service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for GetStudioComponent Operation - Task GetStudioComponentAsync(GetStudioComponentRequest request, CancellationToken cancellationToken = default(CancellationToken)); - - #endregion - - #region GetStudioMember - - - /// - /// Get a user's membership in a studio. - /// - /// Container for the necessary parameters to execute the GetStudioMember service method. - /// - /// The response from the GetStudioMember service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for GetStudioMember Operation - GetStudioMemberResponse GetStudioMember(GetStudioMemberRequest request); - - - - /// - /// Get a user's membership in a studio. - /// - /// Container for the necessary parameters to execute the GetStudioMember service method. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// - /// - /// The response from the GetStudioMember service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for GetStudioMember Operation - Task GetStudioMemberAsync(GetStudioMemberRequest request, CancellationToken cancellationToken = default(CancellationToken)); - - #endregion - - #region ListEulaAcceptances - - - /// - /// List EULA acceptances. - /// - /// Container for the necessary parameters to execute the ListEulaAcceptances service method. - /// - /// The response from the ListEulaAcceptances service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for ListEulaAcceptances Operation - ListEulaAcceptancesResponse ListEulaAcceptances(ListEulaAcceptancesRequest request); - - - - /// - /// List EULA acceptances. - /// - /// Container for the necessary parameters to execute the ListEulaAcceptances service method. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// - /// - /// The response from the ListEulaAcceptances service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for ListEulaAcceptances Operation - Task ListEulaAcceptancesAsync(ListEulaAcceptancesRequest request, CancellationToken cancellationToken = default(CancellationToken)); - - #endregion - - #region ListEulas - - - /// - /// List EULAs. - /// - /// Container for the necessary parameters to execute the ListEulas service method. - /// - /// The response from the ListEulas service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for ListEulas Operation - ListEulasResponse ListEulas(ListEulasRequest request); - - - - /// - /// List EULAs. - /// - /// Container for the necessary parameters to execute the ListEulas service method. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// - /// - /// The response from the ListEulas service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for ListEulas Operation - Task ListEulasAsync(ListEulasRequest request, CancellationToken cancellationToken = default(CancellationToken)); - - #endregion - - #region ListLaunchProfileMembers - - - /// - /// Get all users in a given launch profile membership. - /// - /// Container for the necessary parameters to execute the ListLaunchProfileMembers service method. - /// - /// The response from the ListLaunchProfileMembers service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for ListLaunchProfileMembers Operation - ListLaunchProfileMembersResponse ListLaunchProfileMembers(ListLaunchProfileMembersRequest request); - - - - /// - /// Get all users in a given launch profile membership. - /// - /// Container for the necessary parameters to execute the ListLaunchProfileMembers service method. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// - /// - /// The response from the ListLaunchProfileMembers service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for ListLaunchProfileMembers Operation - Task ListLaunchProfileMembersAsync(ListLaunchProfileMembersRequest request, CancellationToken cancellationToken = default(CancellationToken)); - - #endregion - - #region ListLaunchProfiles - - - /// - /// List all the launch profiles a studio. - /// - /// Container for the necessary parameters to execute the ListLaunchProfiles service method. - /// - /// The response from the ListLaunchProfiles service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for ListLaunchProfiles Operation - ListLaunchProfilesResponse ListLaunchProfiles(ListLaunchProfilesRequest request); - - - - /// - /// List all the launch profiles a studio. - /// - /// Container for the necessary parameters to execute the ListLaunchProfiles service method. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// - /// - /// The response from the ListLaunchProfiles service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for ListLaunchProfiles Operation - Task ListLaunchProfilesAsync(ListLaunchProfilesRequest request, CancellationToken cancellationToken = default(CancellationToken)); - - #endregion - - #region ListStreamingImages - - - /// - /// List the streaming image resources available to this studio. - /// - /// - /// - /// This list will contain both images provided by Amazon Web Services, as well as streaming - /// images that you have created in your studio. - /// - /// - /// Container for the necessary parameters to execute the ListStreamingImages service method. - /// - /// The response from the ListStreamingImages service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for ListStreamingImages Operation - ListStreamingImagesResponse ListStreamingImages(ListStreamingImagesRequest request); - - - - /// - /// List the streaming image resources available to this studio. - /// - /// - /// - /// This list will contain both images provided by Amazon Web Services, as well as streaming - /// images that you have created in your studio. - /// - /// - /// Container for the necessary parameters to execute the ListStreamingImages service method. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// - /// - /// The response from the ListStreamingImages service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for ListStreamingImages Operation - Task ListStreamingImagesAsync(ListStreamingImagesRequest request, CancellationToken cancellationToken = default(CancellationToken)); - - #endregion - - #region ListStreamingSessionBackups - - - /// - /// Lists the backups of a streaming session in a studio. - /// - /// Container for the necessary parameters to execute the ListStreamingSessionBackups service method. - /// - /// The response from the ListStreamingSessionBackups service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for ListStreamingSessionBackups Operation - ListStreamingSessionBackupsResponse ListStreamingSessionBackups(ListStreamingSessionBackupsRequest request); - - - - /// - /// Lists the backups of a streaming session in a studio. - /// - /// Container for the necessary parameters to execute the ListStreamingSessionBackups service method. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// - /// - /// The response from the ListStreamingSessionBackups service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for ListStreamingSessionBackups Operation - Task ListStreamingSessionBackupsAsync(ListStreamingSessionBackupsRequest request, CancellationToken cancellationToken = default(CancellationToken)); - - #endregion - - #region ListStreamingSessions - - - /// - /// Lists the streaming sessions in a studio. - /// - /// Container for the necessary parameters to execute the ListStreamingSessions service method. - /// - /// The response from the ListStreamingSessions service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for ListStreamingSessions Operation - ListStreamingSessionsResponse ListStreamingSessions(ListStreamingSessionsRequest request); - - - - /// - /// Lists the streaming sessions in a studio. - /// - /// Container for the necessary parameters to execute the ListStreamingSessions service method. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// - /// - /// The response from the ListStreamingSessions service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for ListStreamingSessions Operation - Task ListStreamingSessionsAsync(ListStreamingSessionsRequest request, CancellationToken cancellationToken = default(CancellationToken)); - - #endregion - - #region ListStudioComponents - - - /// - /// Lists the StudioComponents in a studio. - /// - /// Container for the necessary parameters to execute the ListStudioComponents service method. - /// - /// The response from the ListStudioComponents service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for ListStudioComponents Operation - ListStudioComponentsResponse ListStudioComponents(ListStudioComponentsRequest request); - - - - /// - /// Lists the StudioComponents in a studio. - /// - /// Container for the necessary parameters to execute the ListStudioComponents service method. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// - /// - /// The response from the ListStudioComponents service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for ListStudioComponents Operation - Task ListStudioComponentsAsync(ListStudioComponentsRequest request, CancellationToken cancellationToken = default(CancellationToken)); - - #endregion - - #region ListStudioMembers - - - /// - /// Get all users in a given studio membership. - /// - /// - /// - /// ListStudioMembers only returns admin members. - /// - /// - /// - /// Container for the necessary parameters to execute the ListStudioMembers service method. - /// - /// The response from the ListStudioMembers service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for ListStudioMembers Operation - ListStudioMembersResponse ListStudioMembers(ListStudioMembersRequest request); - - - - /// - /// Get all users in a given studio membership. - /// - /// - /// - /// ListStudioMembers only returns admin members. - /// - /// - /// - /// Container for the necessary parameters to execute the ListStudioMembers service method. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// - /// - /// The response from the ListStudioMembers service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for ListStudioMembers Operation - Task ListStudioMembersAsync(ListStudioMembersRequest request, CancellationToken cancellationToken = default(CancellationToken)); - - #endregion - - #region ListStudios - - - /// - /// List studios in your Amazon Web Services accounts in the requested Amazon Web Services - /// Region. - /// - /// Container for the necessary parameters to execute the ListStudios service method. - /// - /// The response from the ListStudios service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for ListStudios Operation - ListStudiosResponse ListStudios(ListStudiosRequest request); - - - - /// - /// List studios in your Amazon Web Services accounts in the requested Amazon Web Services - /// Region. - /// - /// Container for the necessary parameters to execute the ListStudios service method. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// - /// - /// The response from the ListStudios service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for ListStudios Operation - Task ListStudiosAsync(ListStudiosRequest request, CancellationToken cancellationToken = default(CancellationToken)); - - #endregion - - #region ListTagsForResource - - - /// - /// Gets the tags for a resource, given its Amazon Resource Names (ARN). - /// - /// - /// - /// This operation supports ARNs for all resource types in Nimble Studio that support - /// tags, including studio, studio component, launch profile, streaming image, and streaming - /// session. All resources that can be tagged will contain an ARN property, so you do - /// not have to create this ARN yourself. - /// - /// - /// Container for the necessary parameters to execute the ListTagsForResource service method. - /// - /// The response from the ListTagsForResource service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for ListTagsForResource Operation - ListTagsForResourceResponse ListTagsForResource(ListTagsForResourceRequest request); - - - - /// - /// Gets the tags for a resource, given its Amazon Resource Names (ARN). - /// - /// - /// - /// This operation supports ARNs for all resource types in Nimble Studio that support - /// tags, including studio, studio component, launch profile, streaming image, and streaming - /// session. All resources that can be tagged will contain an ARN property, so you do - /// not have to create this ARN yourself. - /// - /// - /// Container for the necessary parameters to execute the ListTagsForResource service method. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// - /// - /// The response from the ListTagsForResource service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for ListTagsForResource Operation - Task ListTagsForResourceAsync(ListTagsForResourceRequest request, CancellationToken cancellationToken = default(CancellationToken)); - - #endregion - - #region PutLaunchProfileMembers - - - /// - /// Add/update users with given persona to launch profile membership. - /// - /// Container for the necessary parameters to execute the PutLaunchProfileMembers service method. - /// - /// The response from the PutLaunchProfileMembers service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for PutLaunchProfileMembers Operation - PutLaunchProfileMembersResponse PutLaunchProfileMembers(PutLaunchProfileMembersRequest request); - - - - /// - /// Add/update users with given persona to launch profile membership. - /// - /// Container for the necessary parameters to execute the PutLaunchProfileMembers service method. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// - /// - /// The response from the PutLaunchProfileMembers service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for PutLaunchProfileMembers Operation - Task PutLaunchProfileMembersAsync(PutLaunchProfileMembersRequest request, CancellationToken cancellationToken = default(CancellationToken)); - - #endregion - - #region PutStudioMembers - - - /// - /// Add/update users with given persona to studio membership. - /// - /// Container for the necessary parameters to execute the PutStudioMembers service method. - /// - /// The response from the PutStudioMembers service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for PutStudioMembers Operation - PutStudioMembersResponse PutStudioMembers(PutStudioMembersRequest request); - - - - /// - /// Add/update users with given persona to studio membership. - /// - /// Container for the necessary parameters to execute the PutStudioMembers service method. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// - /// - /// The response from the PutStudioMembers service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for PutStudioMembers Operation - Task PutStudioMembersAsync(PutStudioMembersRequest request, CancellationToken cancellationToken = default(CancellationToken)); - - #endregion - - #region StartStreamingSession - - - /// - /// Transitions sessions from the STOPPED state into the READY state. The - /// START_IN_PROGRESS state is the intermediate state between the STOPPED - /// and READY states. - /// - /// Container for the necessary parameters to execute the StartStreamingSession service method. - /// - /// The response from the StartStreamingSession service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for StartStreamingSession Operation - StartStreamingSessionResponse StartStreamingSession(StartStreamingSessionRequest request); - - - - /// - /// Transitions sessions from the STOPPED state into the READY state. The - /// START_IN_PROGRESS state is the intermediate state between the STOPPED - /// and READY states. - /// - /// Container for the necessary parameters to execute the StartStreamingSession service method. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// - /// - /// The response from the StartStreamingSession service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for StartStreamingSession Operation - Task StartStreamingSessionAsync(StartStreamingSessionRequest request, CancellationToken cancellationToken = default(CancellationToken)); - - #endregion - - #region StartStudioSSOConfigurationRepair - - - /// - /// Repairs the IAM Identity Center configuration for a given studio. - /// - /// - /// - /// If the studio has a valid IAM Identity Center configuration currently associated with - /// it, this operation will fail with a validation error. - /// - /// - /// - /// If the studio does not have a valid IAM Identity Center configuration currently associated - /// with it, then a new IAM Identity Center application is created for the studio and - /// the studio is changed to the READY state. - /// - /// - /// - /// After the IAM Identity Center application is repaired, you must use the Amazon Nimble - /// Studio console to add administrators and users to your studio. - /// - /// - /// Container for the necessary parameters to execute the StartStudioSSOConfigurationRepair service method. - /// - /// The response from the StartStudioSSOConfigurationRepair service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for StartStudioSSOConfigurationRepair Operation - StartStudioSSOConfigurationRepairResponse StartStudioSSOConfigurationRepair(StartStudioSSOConfigurationRepairRequest request); - - - - /// - /// Repairs the IAM Identity Center configuration for a given studio. - /// - /// - /// - /// If the studio has a valid IAM Identity Center configuration currently associated with - /// it, this operation will fail with a validation error. - /// - /// - /// - /// If the studio does not have a valid IAM Identity Center configuration currently associated - /// with it, then a new IAM Identity Center application is created for the studio and - /// the studio is changed to the READY state. - /// - /// - /// - /// After the IAM Identity Center application is repaired, you must use the Amazon Nimble - /// Studio console to add administrators and users to your studio. - /// - /// - /// Container for the necessary parameters to execute the StartStudioSSOConfigurationRepair service method. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// - /// - /// The response from the StartStudioSSOConfigurationRepair service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for StartStudioSSOConfigurationRepair Operation - Task StartStudioSSOConfigurationRepairAsync(StartStudioSSOConfigurationRepairRequest request, CancellationToken cancellationToken = default(CancellationToken)); - - #endregion - - #region StopStreamingSession - - - /// - /// Transitions sessions from the READY state into the STOPPED state. The - /// STOP_IN_PROGRESS state is the intermediate state between the READY and - /// STOPPED states. - /// - /// Container for the necessary parameters to execute the StopStreamingSession service method. - /// - /// The response from the StopStreamingSession service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for StopStreamingSession Operation - StopStreamingSessionResponse StopStreamingSession(StopStreamingSessionRequest request); - - - - /// - /// Transitions sessions from the READY state into the STOPPED state. The - /// STOP_IN_PROGRESS state is the intermediate state between the READY and - /// STOPPED states. - /// - /// Container for the necessary parameters to execute the StopStreamingSession service method. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// - /// - /// The response from the StopStreamingSession service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for StopStreamingSession Operation - Task StopStreamingSessionAsync(StopStreamingSessionRequest request, CancellationToken cancellationToken = default(CancellationToken)); - - #endregion - - #region TagResource - - - /// - /// Creates tags for a resource, given its ARN. - /// - /// Container for the necessary parameters to execute the TagResource service method. - /// - /// The response from the TagResource service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for TagResource Operation - TagResourceResponse TagResource(TagResourceRequest request); - - - - /// - /// Creates tags for a resource, given its ARN. - /// - /// Container for the necessary parameters to execute the TagResource service method. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// - /// - /// The response from the TagResource service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for TagResource Operation - Task TagResourceAsync(TagResourceRequest request, CancellationToken cancellationToken = default(CancellationToken)); - - #endregion - - #region UntagResource - - - /// - /// Deletes the tags for a resource. - /// - /// Container for the necessary parameters to execute the UntagResource service method. - /// - /// The response from the UntagResource service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for UntagResource Operation - UntagResourceResponse UntagResource(UntagResourceRequest request); - - - - /// - /// Deletes the tags for a resource. - /// - /// Container for the necessary parameters to execute the UntagResource service method. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// - /// - /// The response from the UntagResource service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for UntagResource Operation - Task UntagResourceAsync(UntagResourceRequest request, CancellationToken cancellationToken = default(CancellationToken)); - - #endregion - - #region UpdateLaunchProfile - - - /// - /// Update a launch profile. - /// - /// Container for the necessary parameters to execute the UpdateLaunchProfile service method. - /// - /// The response from the UpdateLaunchProfile service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for UpdateLaunchProfile Operation - UpdateLaunchProfileResponse UpdateLaunchProfile(UpdateLaunchProfileRequest request); - - - - /// - /// Update a launch profile. - /// - /// Container for the necessary parameters to execute the UpdateLaunchProfile service method. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// - /// - /// The response from the UpdateLaunchProfile service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for UpdateLaunchProfile Operation - Task UpdateLaunchProfileAsync(UpdateLaunchProfileRequest request, CancellationToken cancellationToken = default(CancellationToken)); - - #endregion - - #region UpdateLaunchProfileMember - - - /// - /// Update a user persona in launch profile membership. - /// - /// Container for the necessary parameters to execute the UpdateLaunchProfileMember service method. - /// - /// The response from the UpdateLaunchProfileMember service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for UpdateLaunchProfileMember Operation - UpdateLaunchProfileMemberResponse UpdateLaunchProfileMember(UpdateLaunchProfileMemberRequest request); - - - - /// - /// Update a user persona in launch profile membership. - /// - /// Container for the necessary parameters to execute the UpdateLaunchProfileMember service method. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// - /// - /// The response from the UpdateLaunchProfileMember service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for UpdateLaunchProfileMember Operation - Task UpdateLaunchProfileMemberAsync(UpdateLaunchProfileMemberRequest request, CancellationToken cancellationToken = default(CancellationToken)); - - #endregion - - #region UpdateStreamingImage - - - /// - /// Update streaming image. - /// - /// Container for the necessary parameters to execute the UpdateStreamingImage service method. - /// - /// The response from the UpdateStreamingImage service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for UpdateStreamingImage Operation - UpdateStreamingImageResponse UpdateStreamingImage(UpdateStreamingImageRequest request); - - - - /// - /// Update streaming image. - /// - /// Container for the necessary parameters to execute the UpdateStreamingImage service method. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// - /// - /// The response from the UpdateStreamingImage service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for UpdateStreamingImage Operation - Task UpdateStreamingImageAsync(UpdateStreamingImageRequest request, CancellationToken cancellationToken = default(CancellationToken)); - - #endregion - - #region UpdateStudio - - - /// - /// Update a Studio resource. - /// - /// - /// - /// Currently, this operation only supports updating the displayName of your studio. - /// - /// - /// Container for the necessary parameters to execute the UpdateStudio service method. - /// - /// The response from the UpdateStudio service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for UpdateStudio Operation - UpdateStudioResponse UpdateStudio(UpdateStudioRequest request); - - - - /// - /// Update a Studio resource. - /// - /// - /// - /// Currently, this operation only supports updating the displayName of your studio. - /// - /// - /// Container for the necessary parameters to execute the UpdateStudio service method. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// - /// - /// The response from the UpdateStudio service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for UpdateStudio Operation - Task UpdateStudioAsync(UpdateStudioRequest request, CancellationToken cancellationToken = default(CancellationToken)); - - #endregion - - #region UpdateStudioComponent - - - /// - /// Updates a studio component resource. - /// - /// Container for the necessary parameters to execute the UpdateStudioComponent service method. - /// - /// The response from the UpdateStudioComponent service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for UpdateStudioComponent Operation - UpdateStudioComponentResponse UpdateStudioComponent(UpdateStudioComponentRequest request); - - - - /// - /// Updates a studio component resource. - /// - /// Container for the necessary parameters to execute the UpdateStudioComponent service method. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// - /// - /// The response from the UpdateStudioComponent service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for UpdateStudioComponent Operation - Task UpdateStudioComponentAsync(UpdateStudioComponentRequest request, CancellationToken cancellationToken = default(CancellationToken)); - - #endregion - - #region DetermineServiceOperationEndpoint - - /// - /// Returns the endpoint that will be used for a particular request. - /// - /// Request for the desired service operation. - /// The resolved endpoint for the given request. - Amazon.Runtime.Endpoints.Endpoint DetermineServiceOperationEndpoint(AmazonWebServiceRequest request); - - #endregion - - } -} \ No newline at end of file diff --git a/sdk/src/Services/NimbleStudio/Generated/_netstandard/AmazonNimbleStudioClient.cs b/sdk/src/Services/NimbleStudio/Generated/_netstandard/AmazonNimbleStudioClient.cs deleted file mode 100644 index d0748d6f9ed6..000000000000 --- a/sdk/src/Services/NimbleStudio/Generated/_netstandard/AmazonNimbleStudioClient.cs +++ /dev/null @@ -1,3452 +0,0 @@ -/* - * 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. - */ - -/* - * Do not modify this file. This file is generated from the nimble-2020-08-01.normal.json service model. - */ - - -using System; -using System.Runtime.ExceptionServices; -using System.Threading; -using System.Threading.Tasks; -using System.Collections.Generic; -using System.Net; - -using Amazon.NimbleStudio.Model; -using Amazon.NimbleStudio.Model.Internal.MarshallTransformations; -using Amazon.NimbleStudio.Internal; -using Amazon.Runtime; -using Amazon.Runtime.Internal; -using Amazon.Runtime.Internal.Auth; -using Amazon.Runtime.Internal.Transform; -using Amazon.Runtime.Endpoints; - -#pragma warning disable CS1570 -namespace Amazon.NimbleStudio -{ - /// - /// Implementation for accessing NimbleStudio - /// - /// Welcome to the Amazon Nimble Studio API reference. This API reference provides methods, - /// schema, resources, parameters, and more to help you get the most out of Nimble Studio. - /// - /// - /// - /// Nimble Studio is a virtual studio that empowers visual effects, animation, and interactive - /// content teams to create content securely within a scalable, private cloud service. - /// - /// - public partial class AmazonNimbleStudioClient : AmazonServiceClient, IAmazonNimbleStudio - { - private static IServiceMetadata serviceMetadata = new AmazonNimbleStudioMetadata(); - - #region Constructors - - /// - /// Constructs AmazonNimbleStudioClient with the credentials loaded from the application's - /// default configuration, and if unsuccessful from the Instance Profile service on an EC2 instance. - /// - /// Example App.config with credentials set. - /// - /// <?xml version="1.0" encoding="utf-8" ?> - /// <configuration> - /// <appSettings> - /// <add key="AWSProfileName" value="AWS Default"/> - /// </appSettings> - /// </configuration> - /// - /// - /// - public AmazonNimbleStudioClient() - : base(FallbackCredentialsFactory.GetCredentials(), new AmazonNimbleStudioConfig()) { } - - /// - /// Constructs AmazonNimbleStudioClient with the credentials loaded from the application's - /// default configuration, and if unsuccessful from the Instance Profile service on an EC2 instance. - /// - /// Example App.config with credentials set. - /// - /// <?xml version="1.0" encoding="utf-8" ?> - /// <configuration> - /// <appSettings> - /// <add key="AWSProfileName" value="AWS Default"/> - /// </appSettings> - /// </configuration> - /// - /// - /// - /// The region to connect. - public AmazonNimbleStudioClient(RegionEndpoint region) - : base(FallbackCredentialsFactory.GetCredentials(), new AmazonNimbleStudioConfig{RegionEndpoint = region}) { } - - /// - /// Constructs AmazonNimbleStudioClient with the credentials loaded from the application's - /// default configuration, and if unsuccessful from the Instance Profile service on an EC2 instance. - /// - /// Example App.config with credentials set. - /// - /// <?xml version="1.0" encoding="utf-8" ?> - /// <configuration> - /// <appSettings> - /// <add key="AWSProfileName" value="AWS Default"/> - /// </appSettings> - /// </configuration> - /// - /// - /// - /// The AmazonNimbleStudioClient Configuration Object - public AmazonNimbleStudioClient(AmazonNimbleStudioConfig config) - : base(FallbackCredentialsFactory.GetCredentials(config), config){} - - - /// - /// Constructs AmazonNimbleStudioClient with AWS Credentials - /// - /// AWS Credentials - public AmazonNimbleStudioClient(AWSCredentials credentials) - : this(credentials, new AmazonNimbleStudioConfig()) - { - } - - /// - /// Constructs AmazonNimbleStudioClient with AWS Credentials - /// - /// AWS Credentials - /// The region to connect. - public AmazonNimbleStudioClient(AWSCredentials credentials, RegionEndpoint region) - : this(credentials, new AmazonNimbleStudioConfig{RegionEndpoint = region}) - { - } - - /// - /// Constructs AmazonNimbleStudioClient with AWS Credentials and an - /// AmazonNimbleStudioClient Configuration object. - /// - /// AWS Credentials - /// The AmazonNimbleStudioClient Configuration Object - public AmazonNimbleStudioClient(AWSCredentials credentials, AmazonNimbleStudioConfig clientConfig) - : base(credentials, clientConfig) - { - } - - /// - /// Constructs AmazonNimbleStudioClient with AWS Access Key ID and AWS Secret Key - /// - /// AWS Access Key ID - /// AWS Secret Access Key - public AmazonNimbleStudioClient(string awsAccessKeyId, string awsSecretAccessKey) - : this(awsAccessKeyId, awsSecretAccessKey, new AmazonNimbleStudioConfig()) - { - } - - /// - /// Constructs AmazonNimbleStudioClient with AWS Access Key ID and AWS Secret Key - /// - /// AWS Access Key ID - /// AWS Secret Access Key - /// The region to connect. - public AmazonNimbleStudioClient(string awsAccessKeyId, string awsSecretAccessKey, RegionEndpoint region) - : this(awsAccessKeyId, awsSecretAccessKey, new AmazonNimbleStudioConfig() {RegionEndpoint=region}) - { - } - - /// - /// Constructs AmazonNimbleStudioClient with AWS Access Key ID, AWS Secret Key and an - /// AmazonNimbleStudioClient Configuration object. - /// - /// AWS Access Key ID - /// AWS Secret Access Key - /// The AmazonNimbleStudioClient Configuration Object - public AmazonNimbleStudioClient(string awsAccessKeyId, string awsSecretAccessKey, AmazonNimbleStudioConfig clientConfig) - : base(awsAccessKeyId, awsSecretAccessKey, clientConfig) - { - } - - /// - /// Constructs AmazonNimbleStudioClient with AWS Access Key ID and AWS Secret Key - /// - /// AWS Access Key ID - /// AWS Secret Access Key - /// AWS Session Token - public AmazonNimbleStudioClient(string awsAccessKeyId, string awsSecretAccessKey, string awsSessionToken) - : this(awsAccessKeyId, awsSecretAccessKey, awsSessionToken, new AmazonNimbleStudioConfig()) - { - } - - /// - /// Constructs AmazonNimbleStudioClient with AWS Access Key ID and AWS Secret Key - /// - /// AWS Access Key ID - /// AWS Secret Access Key - /// AWS Session Token - /// The region to connect. - public AmazonNimbleStudioClient(string awsAccessKeyId, string awsSecretAccessKey, string awsSessionToken, RegionEndpoint region) - : this(awsAccessKeyId, awsSecretAccessKey, awsSessionToken, new AmazonNimbleStudioConfig{RegionEndpoint = region}) - { - } - - /// - /// Constructs AmazonNimbleStudioClient with AWS Access Key ID, AWS Secret Key and an - /// AmazonNimbleStudioClient Configuration object. - /// - /// AWS Access Key ID - /// AWS Secret Access Key - /// AWS Session Token - /// The AmazonNimbleStudioClient Configuration Object - public AmazonNimbleStudioClient(string awsAccessKeyId, string awsSecretAccessKey, string awsSessionToken, AmazonNimbleStudioConfig clientConfig) - : base(awsAccessKeyId, awsSecretAccessKey, awsSessionToken, clientConfig) - { - } - - #endregion -#if AWS_ASYNC_ENUMERABLES_API - private INimbleStudioPaginatorFactory _paginators; - - /// - /// Paginators for the service - /// - public INimbleStudioPaginatorFactory Paginators - { - get - { - if (this._paginators == null) - { - this._paginators = new NimbleStudioPaginatorFactory(this); - } - return this._paginators; - } - } -#endif - - #region Overrides - - /// - /// Creates the signer for the service. - /// - protected override AbstractAWSSigner CreateSigner() - { - return new AWS4Signer(); - } - - /// - /// Customizes the runtime pipeline. - /// - /// Runtime pipeline for the current client. - protected override void CustomizeRuntimePipeline(RuntimePipeline pipeline) - { - pipeline.RemoveHandler(); - pipeline.AddHandlerAfter(new AmazonNimbleStudioEndpointResolver()); - } - /// - /// Capture metadata for the service. - /// - protected override IServiceMetadata ServiceMetadata - { - get - { - return serviceMetadata; - } - } - - #endregion - - #region Dispose - - /// - /// Disposes the service client. - /// - protected override void Dispose(bool disposing) - { - base.Dispose(disposing); - } - - #endregion - - - #region AcceptEulas - - internal virtual AcceptEulasResponse AcceptEulas(AcceptEulasRequest request) - { - var options = new InvokeOptions(); - options.RequestMarshaller = AcceptEulasRequestMarshaller.Instance; - options.ResponseUnmarshaller = AcceptEulasResponseUnmarshaller.Instance; - - return Invoke(request, options); - } - - - - /// - /// Accept EULAs. - /// - /// Container for the necessary parameters to execute the AcceptEulas service method. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// - /// - /// The response from the AcceptEulas service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for AcceptEulas Operation - public virtual Task AcceptEulasAsync(AcceptEulasRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) - { - var options = new InvokeOptions(); - options.RequestMarshaller = AcceptEulasRequestMarshaller.Instance; - options.ResponseUnmarshaller = AcceptEulasResponseUnmarshaller.Instance; - - return InvokeAsync(request, options, cancellationToken); - } - - #endregion - - #region CreateLaunchProfile - - internal virtual CreateLaunchProfileResponse CreateLaunchProfile(CreateLaunchProfileRequest request) - { - var options = new InvokeOptions(); - options.RequestMarshaller = CreateLaunchProfileRequestMarshaller.Instance; - options.ResponseUnmarshaller = CreateLaunchProfileResponseUnmarshaller.Instance; - - return Invoke(request, options); - } - - - - /// - /// Create a launch profile. - /// - /// Container for the necessary parameters to execute the CreateLaunchProfile service method. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// - /// - /// The response from the CreateLaunchProfile service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for CreateLaunchProfile Operation - public virtual Task CreateLaunchProfileAsync(CreateLaunchProfileRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) - { - var options = new InvokeOptions(); - options.RequestMarshaller = CreateLaunchProfileRequestMarshaller.Instance; - options.ResponseUnmarshaller = CreateLaunchProfileResponseUnmarshaller.Instance; - - return InvokeAsync(request, options, cancellationToken); - } - - #endregion - - #region CreateStreamingImage - - internal virtual CreateStreamingImageResponse CreateStreamingImage(CreateStreamingImageRequest request) - { - var options = new InvokeOptions(); - options.RequestMarshaller = CreateStreamingImageRequestMarshaller.Instance; - options.ResponseUnmarshaller = CreateStreamingImageResponseUnmarshaller.Instance; - - return Invoke(request, options); - } - - - - /// - /// Creates a streaming image resource in a studio. - /// - /// Container for the necessary parameters to execute the CreateStreamingImage service method. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// - /// - /// The response from the CreateStreamingImage service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for CreateStreamingImage Operation - public virtual Task CreateStreamingImageAsync(CreateStreamingImageRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) - { - var options = new InvokeOptions(); - options.RequestMarshaller = CreateStreamingImageRequestMarshaller.Instance; - options.ResponseUnmarshaller = CreateStreamingImageResponseUnmarshaller.Instance; - - return InvokeAsync(request, options, cancellationToken); - } - - #endregion - - #region CreateStreamingSession - - internal virtual CreateStreamingSessionResponse CreateStreamingSession(CreateStreamingSessionRequest request) - { - var options = new InvokeOptions(); - options.RequestMarshaller = CreateStreamingSessionRequestMarshaller.Instance; - options.ResponseUnmarshaller = CreateStreamingSessionResponseUnmarshaller.Instance; - - return Invoke(request, options); - } - - - - /// - /// Creates a streaming session in a studio. - /// - /// - /// - /// After invoking this operation, you must poll GetStreamingSession until the streaming - /// session is in the READY state. - /// - /// - /// Container for the necessary parameters to execute the CreateStreamingSession service method. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// - /// - /// The response from the CreateStreamingSession service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for CreateStreamingSession Operation - public virtual Task CreateStreamingSessionAsync(CreateStreamingSessionRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) - { - var options = new InvokeOptions(); - options.RequestMarshaller = CreateStreamingSessionRequestMarshaller.Instance; - options.ResponseUnmarshaller = CreateStreamingSessionResponseUnmarshaller.Instance; - - return InvokeAsync(request, options, cancellationToken); - } - - #endregion - - #region CreateStreamingSessionStream - - internal virtual CreateStreamingSessionStreamResponse CreateStreamingSessionStream(CreateStreamingSessionStreamRequest request) - { - var options = new InvokeOptions(); - options.RequestMarshaller = CreateStreamingSessionStreamRequestMarshaller.Instance; - options.ResponseUnmarshaller = CreateStreamingSessionStreamResponseUnmarshaller.Instance; - - return Invoke(request, options); - } - - - - /// - /// Creates a streaming session stream for a streaming session. - /// - /// - /// - /// After invoking this API, invoke GetStreamingSessionStream with the returned streamId - /// to poll the resource until it is in the READY state. - /// - /// - /// Container for the necessary parameters to execute the CreateStreamingSessionStream service method. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// - /// - /// The response from the CreateStreamingSessionStream service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for CreateStreamingSessionStream Operation - public virtual Task CreateStreamingSessionStreamAsync(CreateStreamingSessionStreamRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) - { - var options = new InvokeOptions(); - options.RequestMarshaller = CreateStreamingSessionStreamRequestMarshaller.Instance; - options.ResponseUnmarshaller = CreateStreamingSessionStreamResponseUnmarshaller.Instance; - - return InvokeAsync(request, options, cancellationToken); - } - - #endregion - - #region CreateStudio - - internal virtual CreateStudioResponse CreateStudio(CreateStudioRequest request) - { - var options = new InvokeOptions(); - options.RequestMarshaller = CreateStudioRequestMarshaller.Instance; - options.ResponseUnmarshaller = CreateStudioResponseUnmarshaller.Instance; - - return Invoke(request, options); - } - - - - /// - /// Create a new studio. - /// - /// - /// - /// When creating a studio, two IAM roles must be provided: the admin role and the user - /// role. These roles are assumed by your users when they log in to the Nimble Studio - /// portal. - /// - /// - /// - /// The user role must have the AmazonNimbleStudio-StudioUser managed policy attached - /// for the portal to function properly. - /// - /// - /// - /// The admin role must have the AmazonNimbleStudio-StudioAdmin managed policy - /// attached for the portal to function properly. - /// - /// - /// - /// You may optionally specify a KMS key in the StudioEncryptionConfiguration. - /// - /// - /// - /// In Nimble Studio, resource names, descriptions, initialization scripts, and other - /// data you provide are always encrypted at rest using an KMS key. By default, this key - /// is owned by Amazon Web Services and managed on your behalf. You may provide your own - /// KMS key when calling CreateStudio to encrypt this data using a key you own - /// and manage. - /// - /// - /// - /// When providing an KMS key during studio creation, Nimble Studio creates KMS grants - /// in your account to provide your studio user and admin roles access to these KMS keys. - /// - /// - /// - /// If you delete this grant, the studio will no longer be accessible to your portal users. - /// - /// - /// - /// If you delete the studio KMS key, your studio will no longer be accessible. - /// - /// - /// Container for the necessary parameters to execute the CreateStudio service method. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// - /// - /// The response from the CreateStudio service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for CreateStudio Operation - public virtual Task CreateStudioAsync(CreateStudioRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) - { - var options = new InvokeOptions(); - options.RequestMarshaller = CreateStudioRequestMarshaller.Instance; - options.ResponseUnmarshaller = CreateStudioResponseUnmarshaller.Instance; - - return InvokeAsync(request, options, cancellationToken); - } - - #endregion - - #region CreateStudioComponent - - internal virtual CreateStudioComponentResponse CreateStudioComponent(CreateStudioComponentRequest request) - { - var options = new InvokeOptions(); - options.RequestMarshaller = CreateStudioComponentRequestMarshaller.Instance; - options.ResponseUnmarshaller = CreateStudioComponentResponseUnmarshaller.Instance; - - return Invoke(request, options); - } - - - - /// - /// Creates a studio component resource. - /// - /// Container for the necessary parameters to execute the CreateStudioComponent service method. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// - /// - /// The response from the CreateStudioComponent service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for CreateStudioComponent Operation - public virtual Task CreateStudioComponentAsync(CreateStudioComponentRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) - { - var options = new InvokeOptions(); - options.RequestMarshaller = CreateStudioComponentRequestMarshaller.Instance; - options.ResponseUnmarshaller = CreateStudioComponentResponseUnmarshaller.Instance; - - return InvokeAsync(request, options, cancellationToken); - } - - #endregion - - #region DeleteLaunchProfile - - internal virtual DeleteLaunchProfileResponse DeleteLaunchProfile(DeleteLaunchProfileRequest request) - { - var options = new InvokeOptions(); - options.RequestMarshaller = DeleteLaunchProfileRequestMarshaller.Instance; - options.ResponseUnmarshaller = DeleteLaunchProfileResponseUnmarshaller.Instance; - - return Invoke(request, options); - } - - - - /// - /// Permanently delete a launch profile. - /// - /// Container for the necessary parameters to execute the DeleteLaunchProfile service method. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// - /// - /// The response from the DeleteLaunchProfile service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for DeleteLaunchProfile Operation - public virtual Task DeleteLaunchProfileAsync(DeleteLaunchProfileRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) - { - var options = new InvokeOptions(); - options.RequestMarshaller = DeleteLaunchProfileRequestMarshaller.Instance; - options.ResponseUnmarshaller = DeleteLaunchProfileResponseUnmarshaller.Instance; - - return InvokeAsync(request, options, cancellationToken); - } - - #endregion - - #region DeleteLaunchProfileMember - - internal virtual DeleteLaunchProfileMemberResponse DeleteLaunchProfileMember(DeleteLaunchProfileMemberRequest request) - { - var options = new InvokeOptions(); - options.RequestMarshaller = DeleteLaunchProfileMemberRequestMarshaller.Instance; - options.ResponseUnmarshaller = DeleteLaunchProfileMemberResponseUnmarshaller.Instance; - - return Invoke(request, options); - } - - - - /// - /// Delete a user from launch profile membership. - /// - /// Container for the necessary parameters to execute the DeleteLaunchProfileMember service method. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// - /// - /// The response from the DeleteLaunchProfileMember service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for DeleteLaunchProfileMember Operation - public virtual Task DeleteLaunchProfileMemberAsync(DeleteLaunchProfileMemberRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) - { - var options = new InvokeOptions(); - options.RequestMarshaller = DeleteLaunchProfileMemberRequestMarshaller.Instance; - options.ResponseUnmarshaller = DeleteLaunchProfileMemberResponseUnmarshaller.Instance; - - return InvokeAsync(request, options, cancellationToken); - } - - #endregion - - #region DeleteStreamingImage - - internal virtual DeleteStreamingImageResponse DeleteStreamingImage(DeleteStreamingImageRequest request) - { - var options = new InvokeOptions(); - options.RequestMarshaller = DeleteStreamingImageRequestMarshaller.Instance; - options.ResponseUnmarshaller = DeleteStreamingImageResponseUnmarshaller.Instance; - - return Invoke(request, options); - } - - - - /// - /// Delete streaming image. - /// - /// Container for the necessary parameters to execute the DeleteStreamingImage service method. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// - /// - /// The response from the DeleteStreamingImage service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for DeleteStreamingImage Operation - public virtual Task DeleteStreamingImageAsync(DeleteStreamingImageRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) - { - var options = new InvokeOptions(); - options.RequestMarshaller = DeleteStreamingImageRequestMarshaller.Instance; - options.ResponseUnmarshaller = DeleteStreamingImageResponseUnmarshaller.Instance; - - return InvokeAsync(request, options, cancellationToken); - } - - #endregion - - #region DeleteStreamingSession - - internal virtual DeleteStreamingSessionResponse DeleteStreamingSession(DeleteStreamingSessionRequest request) - { - var options = new InvokeOptions(); - options.RequestMarshaller = DeleteStreamingSessionRequestMarshaller.Instance; - options.ResponseUnmarshaller = DeleteStreamingSessionResponseUnmarshaller.Instance; - - return Invoke(request, options); - } - - - - /// - /// Deletes streaming session resource. - /// - /// - /// - /// After invoking this operation, use GetStreamingSession to poll the resource until - /// it transitions to a DELETED state. - /// - /// - /// - /// A streaming session will count against your streaming session quota until it is marked - /// DELETED. - /// - /// - /// Container for the necessary parameters to execute the DeleteStreamingSession service method. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// - /// - /// The response from the DeleteStreamingSession service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for DeleteStreamingSession Operation - public virtual Task DeleteStreamingSessionAsync(DeleteStreamingSessionRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) - { - var options = new InvokeOptions(); - options.RequestMarshaller = DeleteStreamingSessionRequestMarshaller.Instance; - options.ResponseUnmarshaller = DeleteStreamingSessionResponseUnmarshaller.Instance; - - return InvokeAsync(request, options, cancellationToken); - } - - #endregion - - #region DeleteStudio - - internal virtual DeleteStudioResponse DeleteStudio(DeleteStudioRequest request) - { - var options = new InvokeOptions(); - options.RequestMarshaller = DeleteStudioRequestMarshaller.Instance; - options.ResponseUnmarshaller = DeleteStudioResponseUnmarshaller.Instance; - - return Invoke(request, options); - } - - - - /// - /// Delete a studio resource. - /// - /// Container for the necessary parameters to execute the DeleteStudio service method. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// - /// - /// The response from the DeleteStudio service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for DeleteStudio Operation - public virtual Task DeleteStudioAsync(DeleteStudioRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) - { - var options = new InvokeOptions(); - options.RequestMarshaller = DeleteStudioRequestMarshaller.Instance; - options.ResponseUnmarshaller = DeleteStudioResponseUnmarshaller.Instance; - - return InvokeAsync(request, options, cancellationToken); - } - - #endregion - - #region DeleteStudioComponent - - internal virtual DeleteStudioComponentResponse DeleteStudioComponent(DeleteStudioComponentRequest request) - { - var options = new InvokeOptions(); - options.RequestMarshaller = DeleteStudioComponentRequestMarshaller.Instance; - options.ResponseUnmarshaller = DeleteStudioComponentResponseUnmarshaller.Instance; - - return Invoke(request, options); - } - - - - /// - /// Deletes a studio component resource. - /// - /// Container for the necessary parameters to execute the DeleteStudioComponent service method. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// - /// - /// The response from the DeleteStudioComponent service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for DeleteStudioComponent Operation - public virtual Task DeleteStudioComponentAsync(DeleteStudioComponentRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) - { - var options = new InvokeOptions(); - options.RequestMarshaller = DeleteStudioComponentRequestMarshaller.Instance; - options.ResponseUnmarshaller = DeleteStudioComponentResponseUnmarshaller.Instance; - - return InvokeAsync(request, options, cancellationToken); - } - - #endregion - - #region DeleteStudioMember - - internal virtual DeleteStudioMemberResponse DeleteStudioMember(DeleteStudioMemberRequest request) - { - var options = new InvokeOptions(); - options.RequestMarshaller = DeleteStudioMemberRequestMarshaller.Instance; - options.ResponseUnmarshaller = DeleteStudioMemberResponseUnmarshaller.Instance; - - return Invoke(request, options); - } - - - - /// - /// Delete a user from studio membership. - /// - /// Container for the necessary parameters to execute the DeleteStudioMember service method. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// - /// - /// The response from the DeleteStudioMember service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for DeleteStudioMember Operation - public virtual Task DeleteStudioMemberAsync(DeleteStudioMemberRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) - { - var options = new InvokeOptions(); - options.RequestMarshaller = DeleteStudioMemberRequestMarshaller.Instance; - options.ResponseUnmarshaller = DeleteStudioMemberResponseUnmarshaller.Instance; - - return InvokeAsync(request, options, cancellationToken); - } - - #endregion - - #region GetEula - - internal virtual GetEulaResponse GetEula(GetEulaRequest request) - { - var options = new InvokeOptions(); - options.RequestMarshaller = GetEulaRequestMarshaller.Instance; - options.ResponseUnmarshaller = GetEulaResponseUnmarshaller.Instance; - - return Invoke(request, options); - } - - - - /// - /// Get EULA. - /// - /// Container for the necessary parameters to execute the GetEula service method. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// - /// - /// The response from the GetEula service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for GetEula Operation - public virtual Task GetEulaAsync(GetEulaRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) - { - var options = new InvokeOptions(); - options.RequestMarshaller = GetEulaRequestMarshaller.Instance; - options.ResponseUnmarshaller = GetEulaResponseUnmarshaller.Instance; - - return InvokeAsync(request, options, cancellationToken); - } - - #endregion - - #region GetLaunchProfile - - internal virtual GetLaunchProfileResponse GetLaunchProfile(GetLaunchProfileRequest request) - { - var options = new InvokeOptions(); - options.RequestMarshaller = GetLaunchProfileRequestMarshaller.Instance; - options.ResponseUnmarshaller = GetLaunchProfileResponseUnmarshaller.Instance; - - return Invoke(request, options); - } - - - - /// - /// Get a launch profile. - /// - /// Container for the necessary parameters to execute the GetLaunchProfile service method. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// - /// - /// The response from the GetLaunchProfile service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for GetLaunchProfile Operation - public virtual Task GetLaunchProfileAsync(GetLaunchProfileRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) - { - var options = new InvokeOptions(); - options.RequestMarshaller = GetLaunchProfileRequestMarshaller.Instance; - options.ResponseUnmarshaller = GetLaunchProfileResponseUnmarshaller.Instance; - - return InvokeAsync(request, options, cancellationToken); - } - - #endregion - - #region GetLaunchProfileDetails - - internal virtual GetLaunchProfileDetailsResponse GetLaunchProfileDetails(GetLaunchProfileDetailsRequest request) - { - var options = new InvokeOptions(); - options.RequestMarshaller = GetLaunchProfileDetailsRequestMarshaller.Instance; - options.ResponseUnmarshaller = GetLaunchProfileDetailsResponseUnmarshaller.Instance; - - return Invoke(request, options); - } - - - - /// - /// Launch profile details include the launch profile resource and summary information - /// of resources that are used by, or available to, the launch profile. This includes - /// the name and description of all studio components used by the launch profiles, and - /// the name and description of streaming images that can be used with this launch profile. - /// - /// Container for the necessary parameters to execute the GetLaunchProfileDetails service method. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// - /// - /// The response from the GetLaunchProfileDetails service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for GetLaunchProfileDetails Operation - public virtual Task GetLaunchProfileDetailsAsync(GetLaunchProfileDetailsRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) - { - var options = new InvokeOptions(); - options.RequestMarshaller = GetLaunchProfileDetailsRequestMarshaller.Instance; - options.ResponseUnmarshaller = GetLaunchProfileDetailsResponseUnmarshaller.Instance; - - return InvokeAsync(request, options, cancellationToken); - } - - #endregion - - #region GetLaunchProfileInitialization - - internal virtual GetLaunchProfileInitializationResponse GetLaunchProfileInitialization(GetLaunchProfileInitializationRequest request) - { - var options = new InvokeOptions(); - options.RequestMarshaller = GetLaunchProfileInitializationRequestMarshaller.Instance; - options.ResponseUnmarshaller = GetLaunchProfileInitializationResponseUnmarshaller.Instance; - - return Invoke(request, options); - } - - - - /// - /// Get a launch profile initialization. - /// - /// Container for the necessary parameters to execute the GetLaunchProfileInitialization service method. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// - /// - /// The response from the GetLaunchProfileInitialization service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for GetLaunchProfileInitialization Operation - public virtual Task GetLaunchProfileInitializationAsync(GetLaunchProfileInitializationRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) - { - var options = new InvokeOptions(); - options.RequestMarshaller = GetLaunchProfileInitializationRequestMarshaller.Instance; - options.ResponseUnmarshaller = GetLaunchProfileInitializationResponseUnmarshaller.Instance; - - return InvokeAsync(request, options, cancellationToken); - } - - #endregion - - #region GetLaunchProfileMember - - internal virtual GetLaunchProfileMemberResponse GetLaunchProfileMember(GetLaunchProfileMemberRequest request) - { - var options = new InvokeOptions(); - options.RequestMarshaller = GetLaunchProfileMemberRequestMarshaller.Instance; - options.ResponseUnmarshaller = GetLaunchProfileMemberResponseUnmarshaller.Instance; - - return Invoke(request, options); - } - - - - /// - /// Get a user persona in launch profile membership. - /// - /// Container for the necessary parameters to execute the GetLaunchProfileMember service method. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// - /// - /// The response from the GetLaunchProfileMember service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for GetLaunchProfileMember Operation - public virtual Task GetLaunchProfileMemberAsync(GetLaunchProfileMemberRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) - { - var options = new InvokeOptions(); - options.RequestMarshaller = GetLaunchProfileMemberRequestMarshaller.Instance; - options.ResponseUnmarshaller = GetLaunchProfileMemberResponseUnmarshaller.Instance; - - return InvokeAsync(request, options, cancellationToken); - } - - #endregion - - #region GetStreamingImage - - internal virtual GetStreamingImageResponse GetStreamingImage(GetStreamingImageRequest request) - { - var options = new InvokeOptions(); - options.RequestMarshaller = GetStreamingImageRequestMarshaller.Instance; - options.ResponseUnmarshaller = GetStreamingImageResponseUnmarshaller.Instance; - - return Invoke(request, options); - } - - - - /// - /// Get streaming image. - /// - /// Container for the necessary parameters to execute the GetStreamingImage service method. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// - /// - /// The response from the GetStreamingImage service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for GetStreamingImage Operation - public virtual Task GetStreamingImageAsync(GetStreamingImageRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) - { - var options = new InvokeOptions(); - options.RequestMarshaller = GetStreamingImageRequestMarshaller.Instance; - options.ResponseUnmarshaller = GetStreamingImageResponseUnmarshaller.Instance; - - return InvokeAsync(request, options, cancellationToken); - } - - #endregion - - #region GetStreamingSession - - internal virtual GetStreamingSessionResponse GetStreamingSession(GetStreamingSessionRequest request) - { - var options = new InvokeOptions(); - options.RequestMarshaller = GetStreamingSessionRequestMarshaller.Instance; - options.ResponseUnmarshaller = GetStreamingSessionResponseUnmarshaller.Instance; - - return Invoke(request, options); - } - - - - /// - /// Gets StreamingSession resource. - /// - /// - /// - /// Invoke this operation to poll for a streaming session state while creating or deleting - /// a session. - /// - /// - /// Container for the necessary parameters to execute the GetStreamingSession service method. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// - /// - /// The response from the GetStreamingSession service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for GetStreamingSession Operation - public virtual Task GetStreamingSessionAsync(GetStreamingSessionRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) - { - var options = new InvokeOptions(); - options.RequestMarshaller = GetStreamingSessionRequestMarshaller.Instance; - options.ResponseUnmarshaller = GetStreamingSessionResponseUnmarshaller.Instance; - - return InvokeAsync(request, options, cancellationToken); - } - - #endregion - - #region GetStreamingSessionBackup - - internal virtual GetStreamingSessionBackupResponse GetStreamingSessionBackup(GetStreamingSessionBackupRequest request) - { - var options = new InvokeOptions(); - options.RequestMarshaller = GetStreamingSessionBackupRequestMarshaller.Instance; - options.ResponseUnmarshaller = GetStreamingSessionBackupResponseUnmarshaller.Instance; - - return Invoke(request, options); - } - - - - /// - /// Gets StreamingSessionBackup resource. - /// - /// - /// - /// Invoke this operation to poll for a streaming session backup while stopping a streaming - /// session. - /// - /// - /// Container for the necessary parameters to execute the GetStreamingSessionBackup service method. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// - /// - /// The response from the GetStreamingSessionBackup service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for GetStreamingSessionBackup Operation - public virtual Task GetStreamingSessionBackupAsync(GetStreamingSessionBackupRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) - { - var options = new InvokeOptions(); - options.RequestMarshaller = GetStreamingSessionBackupRequestMarshaller.Instance; - options.ResponseUnmarshaller = GetStreamingSessionBackupResponseUnmarshaller.Instance; - - return InvokeAsync(request, options, cancellationToken); - } - - #endregion - - #region GetStreamingSessionStream - - internal virtual GetStreamingSessionStreamResponse GetStreamingSessionStream(GetStreamingSessionStreamRequest request) - { - var options = new InvokeOptions(); - options.RequestMarshaller = GetStreamingSessionStreamRequestMarshaller.Instance; - options.ResponseUnmarshaller = GetStreamingSessionStreamResponseUnmarshaller.Instance; - - return Invoke(request, options); - } - - - - /// - /// Gets a StreamingSessionStream for a streaming session. - /// - /// - /// - /// Invoke this operation to poll the resource after invoking CreateStreamingSessionStream. - /// - /// - /// - /// After the StreamingSessionStream changes to the READY state, the url - /// property will contain a stream to be used with the DCV streaming client. - /// - /// - /// Container for the necessary parameters to execute the GetStreamingSessionStream service method. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// - /// - /// The response from the GetStreamingSessionStream service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for GetStreamingSessionStream Operation - public virtual Task GetStreamingSessionStreamAsync(GetStreamingSessionStreamRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) - { - var options = new InvokeOptions(); - options.RequestMarshaller = GetStreamingSessionStreamRequestMarshaller.Instance; - options.ResponseUnmarshaller = GetStreamingSessionStreamResponseUnmarshaller.Instance; - - return InvokeAsync(request, options, cancellationToken); - } - - #endregion - - #region GetStudio - - internal virtual GetStudioResponse GetStudio(GetStudioRequest request) - { - var options = new InvokeOptions(); - options.RequestMarshaller = GetStudioRequestMarshaller.Instance; - options.ResponseUnmarshaller = GetStudioResponseUnmarshaller.Instance; - - return Invoke(request, options); - } - - - - /// - /// Get a studio resource. - /// - /// Container for the necessary parameters to execute the GetStudio service method. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// - /// - /// The response from the GetStudio service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for GetStudio Operation - public virtual Task GetStudioAsync(GetStudioRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) - { - var options = new InvokeOptions(); - options.RequestMarshaller = GetStudioRequestMarshaller.Instance; - options.ResponseUnmarshaller = GetStudioResponseUnmarshaller.Instance; - - return InvokeAsync(request, options, cancellationToken); - } - - #endregion - - #region GetStudioComponent - - internal virtual GetStudioComponentResponse GetStudioComponent(GetStudioComponentRequest request) - { - var options = new InvokeOptions(); - options.RequestMarshaller = GetStudioComponentRequestMarshaller.Instance; - options.ResponseUnmarshaller = GetStudioComponentResponseUnmarshaller.Instance; - - return Invoke(request, options); - } - - - - /// - /// Gets a studio component resource. - /// - /// Container for the necessary parameters to execute the GetStudioComponent service method. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// - /// - /// The response from the GetStudioComponent service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for GetStudioComponent Operation - public virtual Task GetStudioComponentAsync(GetStudioComponentRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) - { - var options = new InvokeOptions(); - options.RequestMarshaller = GetStudioComponentRequestMarshaller.Instance; - options.ResponseUnmarshaller = GetStudioComponentResponseUnmarshaller.Instance; - - return InvokeAsync(request, options, cancellationToken); - } - - #endregion - - #region GetStudioMember - - internal virtual GetStudioMemberResponse GetStudioMember(GetStudioMemberRequest request) - { - var options = new InvokeOptions(); - options.RequestMarshaller = GetStudioMemberRequestMarshaller.Instance; - options.ResponseUnmarshaller = GetStudioMemberResponseUnmarshaller.Instance; - - return Invoke(request, options); - } - - - - /// - /// Get a user's membership in a studio. - /// - /// Container for the necessary parameters to execute the GetStudioMember service method. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// - /// - /// The response from the GetStudioMember service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for GetStudioMember Operation - public virtual Task GetStudioMemberAsync(GetStudioMemberRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) - { - var options = new InvokeOptions(); - options.RequestMarshaller = GetStudioMemberRequestMarshaller.Instance; - options.ResponseUnmarshaller = GetStudioMemberResponseUnmarshaller.Instance; - - return InvokeAsync(request, options, cancellationToken); - } - - #endregion - - #region ListEulaAcceptances - - internal virtual ListEulaAcceptancesResponse ListEulaAcceptances(ListEulaAcceptancesRequest request) - { - var options = new InvokeOptions(); - options.RequestMarshaller = ListEulaAcceptancesRequestMarshaller.Instance; - options.ResponseUnmarshaller = ListEulaAcceptancesResponseUnmarshaller.Instance; - - return Invoke(request, options); - } - - - - /// - /// List EULA acceptances. - /// - /// Container for the necessary parameters to execute the ListEulaAcceptances service method. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// - /// - /// The response from the ListEulaAcceptances service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for ListEulaAcceptances Operation - public virtual Task ListEulaAcceptancesAsync(ListEulaAcceptancesRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) - { - var options = new InvokeOptions(); - options.RequestMarshaller = ListEulaAcceptancesRequestMarshaller.Instance; - options.ResponseUnmarshaller = ListEulaAcceptancesResponseUnmarshaller.Instance; - - return InvokeAsync(request, options, cancellationToken); - } - - #endregion - - #region ListEulas - - internal virtual ListEulasResponse ListEulas(ListEulasRequest request) - { - var options = new InvokeOptions(); - options.RequestMarshaller = ListEulasRequestMarshaller.Instance; - options.ResponseUnmarshaller = ListEulasResponseUnmarshaller.Instance; - - return Invoke(request, options); - } - - - - /// - /// List EULAs. - /// - /// Container for the necessary parameters to execute the ListEulas service method. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// - /// - /// The response from the ListEulas service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for ListEulas Operation - public virtual Task ListEulasAsync(ListEulasRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) - { - var options = new InvokeOptions(); - options.RequestMarshaller = ListEulasRequestMarshaller.Instance; - options.ResponseUnmarshaller = ListEulasResponseUnmarshaller.Instance; - - return InvokeAsync(request, options, cancellationToken); - } - - #endregion - - #region ListLaunchProfileMembers - - internal virtual ListLaunchProfileMembersResponse ListLaunchProfileMembers(ListLaunchProfileMembersRequest request) - { - var options = new InvokeOptions(); - options.RequestMarshaller = ListLaunchProfileMembersRequestMarshaller.Instance; - options.ResponseUnmarshaller = ListLaunchProfileMembersResponseUnmarshaller.Instance; - - return Invoke(request, options); - } - - - - /// - /// Get all users in a given launch profile membership. - /// - /// Container for the necessary parameters to execute the ListLaunchProfileMembers service method. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// - /// - /// The response from the ListLaunchProfileMembers service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for ListLaunchProfileMembers Operation - public virtual Task ListLaunchProfileMembersAsync(ListLaunchProfileMembersRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) - { - var options = new InvokeOptions(); - options.RequestMarshaller = ListLaunchProfileMembersRequestMarshaller.Instance; - options.ResponseUnmarshaller = ListLaunchProfileMembersResponseUnmarshaller.Instance; - - return InvokeAsync(request, options, cancellationToken); - } - - #endregion - - #region ListLaunchProfiles - - internal virtual ListLaunchProfilesResponse ListLaunchProfiles(ListLaunchProfilesRequest request) - { - var options = new InvokeOptions(); - options.RequestMarshaller = ListLaunchProfilesRequestMarshaller.Instance; - options.ResponseUnmarshaller = ListLaunchProfilesResponseUnmarshaller.Instance; - - return Invoke(request, options); - } - - - - /// - /// List all the launch profiles a studio. - /// - /// Container for the necessary parameters to execute the ListLaunchProfiles service method. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// - /// - /// The response from the ListLaunchProfiles service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for ListLaunchProfiles Operation - public virtual Task ListLaunchProfilesAsync(ListLaunchProfilesRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) - { - var options = new InvokeOptions(); - options.RequestMarshaller = ListLaunchProfilesRequestMarshaller.Instance; - options.ResponseUnmarshaller = ListLaunchProfilesResponseUnmarshaller.Instance; - - return InvokeAsync(request, options, cancellationToken); - } - - #endregion - - #region ListStreamingImages - - internal virtual ListStreamingImagesResponse ListStreamingImages(ListStreamingImagesRequest request) - { - var options = new InvokeOptions(); - options.RequestMarshaller = ListStreamingImagesRequestMarshaller.Instance; - options.ResponseUnmarshaller = ListStreamingImagesResponseUnmarshaller.Instance; - - return Invoke(request, options); - } - - - - /// - /// List the streaming image resources available to this studio. - /// - /// - /// - /// This list will contain both images provided by Amazon Web Services, as well as streaming - /// images that you have created in your studio. - /// - /// - /// Container for the necessary parameters to execute the ListStreamingImages service method. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// - /// - /// The response from the ListStreamingImages service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for ListStreamingImages Operation - public virtual Task ListStreamingImagesAsync(ListStreamingImagesRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) - { - var options = new InvokeOptions(); - options.RequestMarshaller = ListStreamingImagesRequestMarshaller.Instance; - options.ResponseUnmarshaller = ListStreamingImagesResponseUnmarshaller.Instance; - - return InvokeAsync(request, options, cancellationToken); - } - - #endregion - - #region ListStreamingSessionBackups - - internal virtual ListStreamingSessionBackupsResponse ListStreamingSessionBackups(ListStreamingSessionBackupsRequest request) - { - var options = new InvokeOptions(); - options.RequestMarshaller = ListStreamingSessionBackupsRequestMarshaller.Instance; - options.ResponseUnmarshaller = ListStreamingSessionBackupsResponseUnmarshaller.Instance; - - return Invoke(request, options); - } - - - - /// - /// Lists the backups of a streaming session in a studio. - /// - /// Container for the necessary parameters to execute the ListStreamingSessionBackups service method. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// - /// - /// The response from the ListStreamingSessionBackups service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for ListStreamingSessionBackups Operation - public virtual Task ListStreamingSessionBackupsAsync(ListStreamingSessionBackupsRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) - { - var options = new InvokeOptions(); - options.RequestMarshaller = ListStreamingSessionBackupsRequestMarshaller.Instance; - options.ResponseUnmarshaller = ListStreamingSessionBackupsResponseUnmarshaller.Instance; - - return InvokeAsync(request, options, cancellationToken); - } - - #endregion - - #region ListStreamingSessions - - internal virtual ListStreamingSessionsResponse ListStreamingSessions(ListStreamingSessionsRequest request) - { - var options = new InvokeOptions(); - options.RequestMarshaller = ListStreamingSessionsRequestMarshaller.Instance; - options.ResponseUnmarshaller = ListStreamingSessionsResponseUnmarshaller.Instance; - - return Invoke(request, options); - } - - - - /// - /// Lists the streaming sessions in a studio. - /// - /// Container for the necessary parameters to execute the ListStreamingSessions service method. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// - /// - /// The response from the ListStreamingSessions service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for ListStreamingSessions Operation - public virtual Task ListStreamingSessionsAsync(ListStreamingSessionsRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) - { - var options = new InvokeOptions(); - options.RequestMarshaller = ListStreamingSessionsRequestMarshaller.Instance; - options.ResponseUnmarshaller = ListStreamingSessionsResponseUnmarshaller.Instance; - - return InvokeAsync(request, options, cancellationToken); - } - - #endregion - - #region ListStudioComponents - - internal virtual ListStudioComponentsResponse ListStudioComponents(ListStudioComponentsRequest request) - { - var options = new InvokeOptions(); - options.RequestMarshaller = ListStudioComponentsRequestMarshaller.Instance; - options.ResponseUnmarshaller = ListStudioComponentsResponseUnmarshaller.Instance; - - return Invoke(request, options); - } - - - - /// - /// Lists the StudioComponents in a studio. - /// - /// Container for the necessary parameters to execute the ListStudioComponents service method. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// - /// - /// The response from the ListStudioComponents service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for ListStudioComponents Operation - public virtual Task ListStudioComponentsAsync(ListStudioComponentsRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) - { - var options = new InvokeOptions(); - options.RequestMarshaller = ListStudioComponentsRequestMarshaller.Instance; - options.ResponseUnmarshaller = ListStudioComponentsResponseUnmarshaller.Instance; - - return InvokeAsync(request, options, cancellationToken); - } - - #endregion - - #region ListStudioMembers - - internal virtual ListStudioMembersResponse ListStudioMembers(ListStudioMembersRequest request) - { - var options = new InvokeOptions(); - options.RequestMarshaller = ListStudioMembersRequestMarshaller.Instance; - options.ResponseUnmarshaller = ListStudioMembersResponseUnmarshaller.Instance; - - return Invoke(request, options); - } - - - - /// - /// Get all users in a given studio membership. - /// - /// - /// - /// ListStudioMembers only returns admin members. - /// - /// - /// - /// Container for the necessary parameters to execute the ListStudioMembers service method. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// - /// - /// The response from the ListStudioMembers service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for ListStudioMembers Operation - public virtual Task ListStudioMembersAsync(ListStudioMembersRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) - { - var options = new InvokeOptions(); - options.RequestMarshaller = ListStudioMembersRequestMarshaller.Instance; - options.ResponseUnmarshaller = ListStudioMembersResponseUnmarshaller.Instance; - - return InvokeAsync(request, options, cancellationToken); - } - - #endregion - - #region ListStudios - - internal virtual ListStudiosResponse ListStudios(ListStudiosRequest request) - { - var options = new InvokeOptions(); - options.RequestMarshaller = ListStudiosRequestMarshaller.Instance; - options.ResponseUnmarshaller = ListStudiosResponseUnmarshaller.Instance; - - return Invoke(request, options); - } - - - - /// - /// List studios in your Amazon Web Services accounts in the requested Amazon Web Services - /// Region. - /// - /// Container for the necessary parameters to execute the ListStudios service method. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// - /// - /// The response from the ListStudios service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for ListStudios Operation - public virtual Task ListStudiosAsync(ListStudiosRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) - { - var options = new InvokeOptions(); - options.RequestMarshaller = ListStudiosRequestMarshaller.Instance; - options.ResponseUnmarshaller = ListStudiosResponseUnmarshaller.Instance; - - return InvokeAsync(request, options, cancellationToken); - } - - #endregion - - #region ListTagsForResource - - internal virtual ListTagsForResourceResponse ListTagsForResource(ListTagsForResourceRequest request) - { - var options = new InvokeOptions(); - options.RequestMarshaller = ListTagsForResourceRequestMarshaller.Instance; - options.ResponseUnmarshaller = ListTagsForResourceResponseUnmarshaller.Instance; - - return Invoke(request, options); - } - - - - /// - /// Gets the tags for a resource, given its Amazon Resource Names (ARN). - /// - /// - /// - /// This operation supports ARNs for all resource types in Nimble Studio that support - /// tags, including studio, studio component, launch profile, streaming image, and streaming - /// session. All resources that can be tagged will contain an ARN property, so you do - /// not have to create this ARN yourself. - /// - /// - /// Container for the necessary parameters to execute the ListTagsForResource service method. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// - /// - /// The response from the ListTagsForResource service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for ListTagsForResource Operation - public virtual Task ListTagsForResourceAsync(ListTagsForResourceRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) - { - var options = new InvokeOptions(); - options.RequestMarshaller = ListTagsForResourceRequestMarshaller.Instance; - options.ResponseUnmarshaller = ListTagsForResourceResponseUnmarshaller.Instance; - - return InvokeAsync(request, options, cancellationToken); - } - - #endregion - - #region PutLaunchProfileMembers - - internal virtual PutLaunchProfileMembersResponse PutLaunchProfileMembers(PutLaunchProfileMembersRequest request) - { - var options = new InvokeOptions(); - options.RequestMarshaller = PutLaunchProfileMembersRequestMarshaller.Instance; - options.ResponseUnmarshaller = PutLaunchProfileMembersResponseUnmarshaller.Instance; - - return Invoke(request, options); - } - - - - /// - /// Add/update users with given persona to launch profile membership. - /// - /// Container for the necessary parameters to execute the PutLaunchProfileMembers service method. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// - /// - /// The response from the PutLaunchProfileMembers service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for PutLaunchProfileMembers Operation - public virtual Task PutLaunchProfileMembersAsync(PutLaunchProfileMembersRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) - { - var options = new InvokeOptions(); - options.RequestMarshaller = PutLaunchProfileMembersRequestMarshaller.Instance; - options.ResponseUnmarshaller = PutLaunchProfileMembersResponseUnmarshaller.Instance; - - return InvokeAsync(request, options, cancellationToken); - } - - #endregion - - #region PutStudioMembers - - internal virtual PutStudioMembersResponse PutStudioMembers(PutStudioMembersRequest request) - { - var options = new InvokeOptions(); - options.RequestMarshaller = PutStudioMembersRequestMarshaller.Instance; - options.ResponseUnmarshaller = PutStudioMembersResponseUnmarshaller.Instance; - - return Invoke(request, options); - } - - - - /// - /// Add/update users with given persona to studio membership. - /// - /// Container for the necessary parameters to execute the PutStudioMembers service method. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// - /// - /// The response from the PutStudioMembers service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for PutStudioMembers Operation - public virtual Task PutStudioMembersAsync(PutStudioMembersRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) - { - var options = new InvokeOptions(); - options.RequestMarshaller = PutStudioMembersRequestMarshaller.Instance; - options.ResponseUnmarshaller = PutStudioMembersResponseUnmarshaller.Instance; - - return InvokeAsync(request, options, cancellationToken); - } - - #endregion - - #region StartStreamingSession - - internal virtual StartStreamingSessionResponse StartStreamingSession(StartStreamingSessionRequest request) - { - var options = new InvokeOptions(); - options.RequestMarshaller = StartStreamingSessionRequestMarshaller.Instance; - options.ResponseUnmarshaller = StartStreamingSessionResponseUnmarshaller.Instance; - - return Invoke(request, options); - } - - - - /// - /// Transitions sessions from the STOPPED state into the READY state. The - /// START_IN_PROGRESS state is the intermediate state between the STOPPED - /// and READY states. - /// - /// Container for the necessary parameters to execute the StartStreamingSession service method. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// - /// - /// The response from the StartStreamingSession service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for StartStreamingSession Operation - public virtual Task StartStreamingSessionAsync(StartStreamingSessionRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) - { - var options = new InvokeOptions(); - options.RequestMarshaller = StartStreamingSessionRequestMarshaller.Instance; - options.ResponseUnmarshaller = StartStreamingSessionResponseUnmarshaller.Instance; - - return InvokeAsync(request, options, cancellationToken); - } - - #endregion - - #region StartStudioSSOConfigurationRepair - - internal virtual StartStudioSSOConfigurationRepairResponse StartStudioSSOConfigurationRepair(StartStudioSSOConfigurationRepairRequest request) - { - var options = new InvokeOptions(); - options.RequestMarshaller = StartStudioSSOConfigurationRepairRequestMarshaller.Instance; - options.ResponseUnmarshaller = StartStudioSSOConfigurationRepairResponseUnmarshaller.Instance; - - return Invoke(request, options); - } - - - - /// - /// Repairs the IAM Identity Center configuration for a given studio. - /// - /// - /// - /// If the studio has a valid IAM Identity Center configuration currently associated with - /// it, this operation will fail with a validation error. - /// - /// - /// - /// If the studio does not have a valid IAM Identity Center configuration currently associated - /// with it, then a new IAM Identity Center application is created for the studio and - /// the studio is changed to the READY state. - /// - /// - /// - /// After the IAM Identity Center application is repaired, you must use the Amazon Nimble - /// Studio console to add administrators and users to your studio. - /// - /// - /// Container for the necessary parameters to execute the StartStudioSSOConfigurationRepair service method. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// - /// - /// The response from the StartStudioSSOConfigurationRepair service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for StartStudioSSOConfigurationRepair Operation - public virtual Task StartStudioSSOConfigurationRepairAsync(StartStudioSSOConfigurationRepairRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) - { - var options = new InvokeOptions(); - options.RequestMarshaller = StartStudioSSOConfigurationRepairRequestMarshaller.Instance; - options.ResponseUnmarshaller = StartStudioSSOConfigurationRepairResponseUnmarshaller.Instance; - - return InvokeAsync(request, options, cancellationToken); - } - - #endregion - - #region StopStreamingSession - - internal virtual StopStreamingSessionResponse StopStreamingSession(StopStreamingSessionRequest request) - { - var options = new InvokeOptions(); - options.RequestMarshaller = StopStreamingSessionRequestMarshaller.Instance; - options.ResponseUnmarshaller = StopStreamingSessionResponseUnmarshaller.Instance; - - return Invoke(request, options); - } - - - - /// - /// Transitions sessions from the READY state into the STOPPED state. The - /// STOP_IN_PROGRESS state is the intermediate state between the READY and - /// STOPPED states. - /// - /// Container for the necessary parameters to execute the StopStreamingSession service method. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// - /// - /// The response from the StopStreamingSession service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for StopStreamingSession Operation - public virtual Task StopStreamingSessionAsync(StopStreamingSessionRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) - { - var options = new InvokeOptions(); - options.RequestMarshaller = StopStreamingSessionRequestMarshaller.Instance; - options.ResponseUnmarshaller = StopStreamingSessionResponseUnmarshaller.Instance; - - return InvokeAsync(request, options, cancellationToken); - } - - #endregion - - #region TagResource - - internal virtual TagResourceResponse TagResource(TagResourceRequest request) - { - var options = new InvokeOptions(); - options.RequestMarshaller = TagResourceRequestMarshaller.Instance; - options.ResponseUnmarshaller = TagResourceResponseUnmarshaller.Instance; - - return Invoke(request, options); - } - - - - /// - /// Creates tags for a resource, given its ARN. - /// - /// Container for the necessary parameters to execute the TagResource service method. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// - /// - /// The response from the TagResource service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for TagResource Operation - public virtual Task TagResourceAsync(TagResourceRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) - { - var options = new InvokeOptions(); - options.RequestMarshaller = TagResourceRequestMarshaller.Instance; - options.ResponseUnmarshaller = TagResourceResponseUnmarshaller.Instance; - - return InvokeAsync(request, options, cancellationToken); - } - - #endregion - - #region UntagResource - - internal virtual UntagResourceResponse UntagResource(UntagResourceRequest request) - { - var options = new InvokeOptions(); - options.RequestMarshaller = UntagResourceRequestMarshaller.Instance; - options.ResponseUnmarshaller = UntagResourceResponseUnmarshaller.Instance; - - return Invoke(request, options); - } - - - - /// - /// Deletes the tags for a resource. - /// - /// Container for the necessary parameters to execute the UntagResource service method. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// - /// - /// The response from the UntagResource service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for UntagResource Operation - public virtual Task UntagResourceAsync(UntagResourceRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) - { - var options = new InvokeOptions(); - options.RequestMarshaller = UntagResourceRequestMarshaller.Instance; - options.ResponseUnmarshaller = UntagResourceResponseUnmarshaller.Instance; - - return InvokeAsync(request, options, cancellationToken); - } - - #endregion - - #region UpdateLaunchProfile - - internal virtual UpdateLaunchProfileResponse UpdateLaunchProfile(UpdateLaunchProfileRequest request) - { - var options = new InvokeOptions(); - options.RequestMarshaller = UpdateLaunchProfileRequestMarshaller.Instance; - options.ResponseUnmarshaller = UpdateLaunchProfileResponseUnmarshaller.Instance; - - return Invoke(request, options); - } - - - - /// - /// Update a launch profile. - /// - /// Container for the necessary parameters to execute the UpdateLaunchProfile service method. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// - /// - /// The response from the UpdateLaunchProfile service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for UpdateLaunchProfile Operation - public virtual Task UpdateLaunchProfileAsync(UpdateLaunchProfileRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) - { - var options = new InvokeOptions(); - options.RequestMarshaller = UpdateLaunchProfileRequestMarshaller.Instance; - options.ResponseUnmarshaller = UpdateLaunchProfileResponseUnmarshaller.Instance; - - return InvokeAsync(request, options, cancellationToken); - } - - #endregion - - #region UpdateLaunchProfileMember - - internal virtual UpdateLaunchProfileMemberResponse UpdateLaunchProfileMember(UpdateLaunchProfileMemberRequest request) - { - var options = new InvokeOptions(); - options.RequestMarshaller = UpdateLaunchProfileMemberRequestMarshaller.Instance; - options.ResponseUnmarshaller = UpdateLaunchProfileMemberResponseUnmarshaller.Instance; - - return Invoke(request, options); - } - - - - /// - /// Update a user persona in launch profile membership. - /// - /// Container for the necessary parameters to execute the UpdateLaunchProfileMember service method. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// - /// - /// The response from the UpdateLaunchProfileMember service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for UpdateLaunchProfileMember Operation - public virtual Task UpdateLaunchProfileMemberAsync(UpdateLaunchProfileMemberRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) - { - var options = new InvokeOptions(); - options.RequestMarshaller = UpdateLaunchProfileMemberRequestMarshaller.Instance; - options.ResponseUnmarshaller = UpdateLaunchProfileMemberResponseUnmarshaller.Instance; - - return InvokeAsync(request, options, cancellationToken); - } - - #endregion - - #region UpdateStreamingImage - - internal virtual UpdateStreamingImageResponse UpdateStreamingImage(UpdateStreamingImageRequest request) - { - var options = new InvokeOptions(); - options.RequestMarshaller = UpdateStreamingImageRequestMarshaller.Instance; - options.ResponseUnmarshaller = UpdateStreamingImageResponseUnmarshaller.Instance; - - return Invoke(request, options); - } - - - - /// - /// Update streaming image. - /// - /// Container for the necessary parameters to execute the UpdateStreamingImage service method. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// - /// - /// The response from the UpdateStreamingImage service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for UpdateStreamingImage Operation - public virtual Task UpdateStreamingImageAsync(UpdateStreamingImageRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) - { - var options = new InvokeOptions(); - options.RequestMarshaller = UpdateStreamingImageRequestMarshaller.Instance; - options.ResponseUnmarshaller = UpdateStreamingImageResponseUnmarshaller.Instance; - - return InvokeAsync(request, options, cancellationToken); - } - - #endregion - - #region UpdateStudio - - internal virtual UpdateStudioResponse UpdateStudio(UpdateStudioRequest request) - { - var options = new InvokeOptions(); - options.RequestMarshaller = UpdateStudioRequestMarshaller.Instance; - options.ResponseUnmarshaller = UpdateStudioResponseUnmarshaller.Instance; - - return Invoke(request, options); - } - - - - /// - /// Update a Studio resource. - /// - /// - /// - /// Currently, this operation only supports updating the displayName of your studio. - /// - /// - /// Container for the necessary parameters to execute the UpdateStudio service method. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// - /// - /// The response from the UpdateStudio service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for UpdateStudio Operation - public virtual Task UpdateStudioAsync(UpdateStudioRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) - { - var options = new InvokeOptions(); - options.RequestMarshaller = UpdateStudioRequestMarshaller.Instance; - options.ResponseUnmarshaller = UpdateStudioResponseUnmarshaller.Instance; - - return InvokeAsync(request, options, cancellationToken); - } - - #endregion - - #region UpdateStudioComponent - - internal virtual UpdateStudioComponentResponse UpdateStudioComponent(UpdateStudioComponentRequest request) - { - var options = new InvokeOptions(); - options.RequestMarshaller = UpdateStudioComponentRequestMarshaller.Instance; - options.ResponseUnmarshaller = UpdateStudioComponentResponseUnmarshaller.Instance; - - return Invoke(request, options); - } - - - - /// - /// Updates a studio component resource. - /// - /// Container for the necessary parameters to execute the UpdateStudioComponent service method. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// - /// - /// The response from the UpdateStudioComponent service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for UpdateStudioComponent Operation - public virtual Task UpdateStudioComponentAsync(UpdateStudioComponentRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) - { - var options = new InvokeOptions(); - options.RequestMarshaller = UpdateStudioComponentRequestMarshaller.Instance; - options.ResponseUnmarshaller = UpdateStudioComponentResponseUnmarshaller.Instance; - - return InvokeAsync(request, options, cancellationToken); - } - - #endregion - - #region DetermineServiceOperationEndpoint - - /// - /// Returns the endpoint that will be used for a particular request. - /// - /// Request for the desired service operation. - /// The resolved endpoint for the given request. - public Amazon.Runtime.Endpoints.Endpoint DetermineServiceOperationEndpoint(AmazonWebServiceRequest request) - { - var parameters = new ServiceOperationEndpointParameters(request); - return Config.DetermineServiceOperationEndpoint(parameters); - } - - #endregion - - } -} \ No newline at end of file diff --git a/sdk/src/Services/NimbleStudio/Generated/_netstandard/IAmazonNimbleStudio.cs b/sdk/src/Services/NimbleStudio/Generated/_netstandard/IAmazonNimbleStudio.cs deleted file mode 100644 index 251e8f43c0c2..000000000000 --- a/sdk/src/Services/NimbleStudio/Generated/_netstandard/IAmazonNimbleStudio.cs +++ /dev/null @@ -1,2466 +0,0 @@ -/* - * 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. - */ - -/* - * Do not modify this file. This file is generated from the nimble-2020-08-01.normal.json service model. - */ - - -using System; -using System.Threading; -using System.Threading.Tasks; -using System.Collections.Generic; - -using Amazon.Runtime; -using Amazon.NimbleStudio.Model; - -#pragma warning disable CS1570 -namespace Amazon.NimbleStudio -{ - /// - /// Interface for accessing NimbleStudio - /// - /// Welcome to the Amazon Nimble Studio API reference. This API reference provides methods, - /// schema, resources, parameters, and more to help you get the most out of Nimble Studio. - /// - /// - /// - /// Nimble Studio is a virtual studio that empowers visual effects, animation, and interactive - /// content teams to create content securely within a scalable, private cloud service. - /// - /// - public partial interface IAmazonNimbleStudio : IAmazonService, IDisposable - { -#if AWS_ASYNC_ENUMERABLES_API - /// - /// Paginators for the service - /// - INimbleStudioPaginatorFactory Paginators { get; } -#endif - - #region AcceptEulas - - - - /// - /// Accept EULAs. - /// - /// Container for the necessary parameters to execute the AcceptEulas service method. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// - /// - /// The response from the AcceptEulas service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for AcceptEulas Operation - Task AcceptEulasAsync(AcceptEulasRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)); - - #endregion - - #region CreateLaunchProfile - - - - /// - /// Create a launch profile. - /// - /// Container for the necessary parameters to execute the CreateLaunchProfile service method. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// - /// - /// The response from the CreateLaunchProfile service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for CreateLaunchProfile Operation - Task CreateLaunchProfileAsync(CreateLaunchProfileRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)); - - #endregion - - #region CreateStreamingImage - - - - /// - /// Creates a streaming image resource in a studio. - /// - /// Container for the necessary parameters to execute the CreateStreamingImage service method. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// - /// - /// The response from the CreateStreamingImage service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for CreateStreamingImage Operation - Task CreateStreamingImageAsync(CreateStreamingImageRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)); - - #endregion - - #region CreateStreamingSession - - - - /// - /// Creates a streaming session in a studio. - /// - /// - /// - /// After invoking this operation, you must poll GetStreamingSession until the streaming - /// session is in the READY state. - /// - /// - /// Container for the necessary parameters to execute the CreateStreamingSession service method. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// - /// - /// The response from the CreateStreamingSession service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for CreateStreamingSession Operation - Task CreateStreamingSessionAsync(CreateStreamingSessionRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)); - - #endregion - - #region CreateStreamingSessionStream - - - - /// - /// Creates a streaming session stream for a streaming session. - /// - /// - /// - /// After invoking this API, invoke GetStreamingSessionStream with the returned streamId - /// to poll the resource until it is in the READY state. - /// - /// - /// Container for the necessary parameters to execute the CreateStreamingSessionStream service method. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// - /// - /// The response from the CreateStreamingSessionStream service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for CreateStreamingSessionStream Operation - Task CreateStreamingSessionStreamAsync(CreateStreamingSessionStreamRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)); - - #endregion - - #region CreateStudio - - - - /// - /// Create a new studio. - /// - /// - /// - /// When creating a studio, two IAM roles must be provided: the admin role and the user - /// role. These roles are assumed by your users when they log in to the Nimble Studio - /// portal. - /// - /// - /// - /// The user role must have the AmazonNimbleStudio-StudioUser managed policy attached - /// for the portal to function properly. - /// - /// - /// - /// The admin role must have the AmazonNimbleStudio-StudioAdmin managed policy - /// attached for the portal to function properly. - /// - /// - /// - /// You may optionally specify a KMS key in the StudioEncryptionConfiguration. - /// - /// - /// - /// In Nimble Studio, resource names, descriptions, initialization scripts, and other - /// data you provide are always encrypted at rest using an KMS key. By default, this key - /// is owned by Amazon Web Services and managed on your behalf. You may provide your own - /// KMS key when calling CreateStudio to encrypt this data using a key you own - /// and manage. - /// - /// - /// - /// When providing an KMS key during studio creation, Nimble Studio creates KMS grants - /// in your account to provide your studio user and admin roles access to these KMS keys. - /// - /// - /// - /// If you delete this grant, the studio will no longer be accessible to your portal users. - /// - /// - /// - /// If you delete the studio KMS key, your studio will no longer be accessible. - /// - /// - /// Container for the necessary parameters to execute the CreateStudio service method. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// - /// - /// The response from the CreateStudio service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for CreateStudio Operation - Task CreateStudioAsync(CreateStudioRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)); - - #endregion - - #region CreateStudioComponent - - - - /// - /// Creates a studio component resource. - /// - /// Container for the necessary parameters to execute the CreateStudioComponent service method. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// - /// - /// The response from the CreateStudioComponent service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for CreateStudioComponent Operation - Task CreateStudioComponentAsync(CreateStudioComponentRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)); - - #endregion - - #region DeleteLaunchProfile - - - - /// - /// Permanently delete a launch profile. - /// - /// Container for the necessary parameters to execute the DeleteLaunchProfile service method. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// - /// - /// The response from the DeleteLaunchProfile service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for DeleteLaunchProfile Operation - Task DeleteLaunchProfileAsync(DeleteLaunchProfileRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)); - - #endregion - - #region DeleteLaunchProfileMember - - - - /// - /// Delete a user from launch profile membership. - /// - /// Container for the necessary parameters to execute the DeleteLaunchProfileMember service method. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// - /// - /// The response from the DeleteLaunchProfileMember service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for DeleteLaunchProfileMember Operation - Task DeleteLaunchProfileMemberAsync(DeleteLaunchProfileMemberRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)); - - #endregion - - #region DeleteStreamingImage - - - - /// - /// Delete streaming image. - /// - /// Container for the necessary parameters to execute the DeleteStreamingImage service method. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// - /// - /// The response from the DeleteStreamingImage service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for DeleteStreamingImage Operation - Task DeleteStreamingImageAsync(DeleteStreamingImageRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)); - - #endregion - - #region DeleteStreamingSession - - - - /// - /// Deletes streaming session resource. - /// - /// - /// - /// After invoking this operation, use GetStreamingSession to poll the resource until - /// it transitions to a DELETED state. - /// - /// - /// - /// A streaming session will count against your streaming session quota until it is marked - /// DELETED. - /// - /// - /// Container for the necessary parameters to execute the DeleteStreamingSession service method. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// - /// - /// The response from the DeleteStreamingSession service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for DeleteStreamingSession Operation - Task DeleteStreamingSessionAsync(DeleteStreamingSessionRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)); - - #endregion - - #region DeleteStudio - - - - /// - /// Delete a studio resource. - /// - /// Container for the necessary parameters to execute the DeleteStudio service method. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// - /// - /// The response from the DeleteStudio service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for DeleteStudio Operation - Task DeleteStudioAsync(DeleteStudioRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)); - - #endregion - - #region DeleteStudioComponent - - - - /// - /// Deletes a studio component resource. - /// - /// Container for the necessary parameters to execute the DeleteStudioComponent service method. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// - /// - /// The response from the DeleteStudioComponent service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for DeleteStudioComponent Operation - Task DeleteStudioComponentAsync(DeleteStudioComponentRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)); - - #endregion - - #region DeleteStudioMember - - - - /// - /// Delete a user from studio membership. - /// - /// Container for the necessary parameters to execute the DeleteStudioMember service method. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// - /// - /// The response from the DeleteStudioMember service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for DeleteStudioMember Operation - Task DeleteStudioMemberAsync(DeleteStudioMemberRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)); - - #endregion - - #region GetEula - - - - /// - /// Get EULA. - /// - /// Container for the necessary parameters to execute the GetEula service method. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// - /// - /// The response from the GetEula service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for GetEula Operation - Task GetEulaAsync(GetEulaRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)); - - #endregion - - #region GetLaunchProfile - - - - /// - /// Get a launch profile. - /// - /// Container for the necessary parameters to execute the GetLaunchProfile service method. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// - /// - /// The response from the GetLaunchProfile service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for GetLaunchProfile Operation - Task GetLaunchProfileAsync(GetLaunchProfileRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)); - - #endregion - - #region GetLaunchProfileDetails - - - - /// - /// Launch profile details include the launch profile resource and summary information - /// of resources that are used by, or available to, the launch profile. This includes - /// the name and description of all studio components used by the launch profiles, and - /// the name and description of streaming images that can be used with this launch profile. - /// - /// Container for the necessary parameters to execute the GetLaunchProfileDetails service method. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// - /// - /// The response from the GetLaunchProfileDetails service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for GetLaunchProfileDetails Operation - Task GetLaunchProfileDetailsAsync(GetLaunchProfileDetailsRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)); - - #endregion - - #region GetLaunchProfileInitialization - - - - /// - /// Get a launch profile initialization. - /// - /// Container for the necessary parameters to execute the GetLaunchProfileInitialization service method. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// - /// - /// The response from the GetLaunchProfileInitialization service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for GetLaunchProfileInitialization Operation - Task GetLaunchProfileInitializationAsync(GetLaunchProfileInitializationRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)); - - #endregion - - #region GetLaunchProfileMember - - - - /// - /// Get a user persona in launch profile membership. - /// - /// Container for the necessary parameters to execute the GetLaunchProfileMember service method. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// - /// - /// The response from the GetLaunchProfileMember service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for GetLaunchProfileMember Operation - Task GetLaunchProfileMemberAsync(GetLaunchProfileMemberRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)); - - #endregion - - #region GetStreamingImage - - - - /// - /// Get streaming image. - /// - /// Container for the necessary parameters to execute the GetStreamingImage service method. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// - /// - /// The response from the GetStreamingImage service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for GetStreamingImage Operation - Task GetStreamingImageAsync(GetStreamingImageRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)); - - #endregion - - #region GetStreamingSession - - - - /// - /// Gets StreamingSession resource. - /// - /// - /// - /// Invoke this operation to poll for a streaming session state while creating or deleting - /// a session. - /// - /// - /// Container for the necessary parameters to execute the GetStreamingSession service method. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// - /// - /// The response from the GetStreamingSession service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for GetStreamingSession Operation - Task GetStreamingSessionAsync(GetStreamingSessionRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)); - - #endregion - - #region GetStreamingSessionBackup - - - - /// - /// Gets StreamingSessionBackup resource. - /// - /// - /// - /// Invoke this operation to poll for a streaming session backup while stopping a streaming - /// session. - /// - /// - /// Container for the necessary parameters to execute the GetStreamingSessionBackup service method. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// - /// - /// The response from the GetStreamingSessionBackup service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for GetStreamingSessionBackup Operation - Task GetStreamingSessionBackupAsync(GetStreamingSessionBackupRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)); - - #endregion - - #region GetStreamingSessionStream - - - - /// - /// Gets a StreamingSessionStream for a streaming session. - /// - /// - /// - /// Invoke this operation to poll the resource after invoking CreateStreamingSessionStream. - /// - /// - /// - /// After the StreamingSessionStream changes to the READY state, the url - /// property will contain a stream to be used with the DCV streaming client. - /// - /// - /// Container for the necessary parameters to execute the GetStreamingSessionStream service method. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// - /// - /// The response from the GetStreamingSessionStream service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for GetStreamingSessionStream Operation - Task GetStreamingSessionStreamAsync(GetStreamingSessionStreamRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)); - - #endregion - - #region GetStudio - - - - /// - /// Get a studio resource. - /// - /// Container for the necessary parameters to execute the GetStudio service method. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// - /// - /// The response from the GetStudio service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for GetStudio Operation - Task GetStudioAsync(GetStudioRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)); - - #endregion - - #region GetStudioComponent - - - - /// - /// Gets a studio component resource. - /// - /// Container for the necessary parameters to execute the GetStudioComponent service method. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// - /// - /// The response from the GetStudioComponent service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for GetStudioComponent Operation - Task GetStudioComponentAsync(GetStudioComponentRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)); - - #endregion - - #region GetStudioMember - - - - /// - /// Get a user's membership in a studio. - /// - /// Container for the necessary parameters to execute the GetStudioMember service method. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// - /// - /// The response from the GetStudioMember service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for GetStudioMember Operation - Task GetStudioMemberAsync(GetStudioMemberRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)); - - #endregion - - #region ListEulaAcceptances - - - - /// - /// List EULA acceptances. - /// - /// Container for the necessary parameters to execute the ListEulaAcceptances service method. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// - /// - /// The response from the ListEulaAcceptances service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for ListEulaAcceptances Operation - Task ListEulaAcceptancesAsync(ListEulaAcceptancesRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)); - - #endregion - - #region ListEulas - - - - /// - /// List EULAs. - /// - /// Container for the necessary parameters to execute the ListEulas service method. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// - /// - /// The response from the ListEulas service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for ListEulas Operation - Task ListEulasAsync(ListEulasRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)); - - #endregion - - #region ListLaunchProfileMembers - - - - /// - /// Get all users in a given launch profile membership. - /// - /// Container for the necessary parameters to execute the ListLaunchProfileMembers service method. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// - /// - /// The response from the ListLaunchProfileMembers service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for ListLaunchProfileMembers Operation - Task ListLaunchProfileMembersAsync(ListLaunchProfileMembersRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)); - - #endregion - - #region ListLaunchProfiles - - - - /// - /// List all the launch profiles a studio. - /// - /// Container for the necessary parameters to execute the ListLaunchProfiles service method. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// - /// - /// The response from the ListLaunchProfiles service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for ListLaunchProfiles Operation - Task ListLaunchProfilesAsync(ListLaunchProfilesRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)); - - #endregion - - #region ListStreamingImages - - - - /// - /// List the streaming image resources available to this studio. - /// - /// - /// - /// This list will contain both images provided by Amazon Web Services, as well as streaming - /// images that you have created in your studio. - /// - /// - /// Container for the necessary parameters to execute the ListStreamingImages service method. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// - /// - /// The response from the ListStreamingImages service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for ListStreamingImages Operation - Task ListStreamingImagesAsync(ListStreamingImagesRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)); - - #endregion - - #region ListStreamingSessionBackups - - - - /// - /// Lists the backups of a streaming session in a studio. - /// - /// Container for the necessary parameters to execute the ListStreamingSessionBackups service method. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// - /// - /// The response from the ListStreamingSessionBackups service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for ListStreamingSessionBackups Operation - Task ListStreamingSessionBackupsAsync(ListStreamingSessionBackupsRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)); - - #endregion - - #region ListStreamingSessions - - - - /// - /// Lists the streaming sessions in a studio. - /// - /// Container for the necessary parameters to execute the ListStreamingSessions service method. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// - /// - /// The response from the ListStreamingSessions service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for ListStreamingSessions Operation - Task ListStreamingSessionsAsync(ListStreamingSessionsRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)); - - #endregion - - #region ListStudioComponents - - - - /// - /// Lists the StudioComponents in a studio. - /// - /// Container for the necessary parameters to execute the ListStudioComponents service method. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// - /// - /// The response from the ListStudioComponents service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for ListStudioComponents Operation - Task ListStudioComponentsAsync(ListStudioComponentsRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)); - - #endregion - - #region ListStudioMembers - - - - /// - /// Get all users in a given studio membership. - /// - /// - /// - /// ListStudioMembers only returns admin members. - /// - /// - /// - /// Container for the necessary parameters to execute the ListStudioMembers service method. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// - /// - /// The response from the ListStudioMembers service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for ListStudioMembers Operation - Task ListStudioMembersAsync(ListStudioMembersRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)); - - #endregion - - #region ListStudios - - - - /// - /// List studios in your Amazon Web Services accounts in the requested Amazon Web Services - /// Region. - /// - /// Container for the necessary parameters to execute the ListStudios service method. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// - /// - /// The response from the ListStudios service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for ListStudios Operation - Task ListStudiosAsync(ListStudiosRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)); - - #endregion - - #region ListTagsForResource - - - - /// - /// Gets the tags for a resource, given its Amazon Resource Names (ARN). - /// - /// - /// - /// This operation supports ARNs for all resource types in Nimble Studio that support - /// tags, including studio, studio component, launch profile, streaming image, and streaming - /// session. All resources that can be tagged will contain an ARN property, so you do - /// not have to create this ARN yourself. - /// - /// - /// Container for the necessary parameters to execute the ListTagsForResource service method. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// - /// - /// The response from the ListTagsForResource service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for ListTagsForResource Operation - Task ListTagsForResourceAsync(ListTagsForResourceRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)); - - #endregion - - #region PutLaunchProfileMembers - - - - /// - /// Add/update users with given persona to launch profile membership. - /// - /// Container for the necessary parameters to execute the PutLaunchProfileMembers service method. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// - /// - /// The response from the PutLaunchProfileMembers service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for PutLaunchProfileMembers Operation - Task PutLaunchProfileMembersAsync(PutLaunchProfileMembersRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)); - - #endregion - - #region PutStudioMembers - - - - /// - /// Add/update users with given persona to studio membership. - /// - /// Container for the necessary parameters to execute the PutStudioMembers service method. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// - /// - /// The response from the PutStudioMembers service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for PutStudioMembers Operation - Task PutStudioMembersAsync(PutStudioMembersRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)); - - #endregion - - #region StartStreamingSession - - - - /// - /// Transitions sessions from the STOPPED state into the READY state. The - /// START_IN_PROGRESS state is the intermediate state between the STOPPED - /// and READY states. - /// - /// Container for the necessary parameters to execute the StartStreamingSession service method. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// - /// - /// The response from the StartStreamingSession service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for StartStreamingSession Operation - Task StartStreamingSessionAsync(StartStreamingSessionRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)); - - #endregion - - #region StartStudioSSOConfigurationRepair - - - - /// - /// Repairs the IAM Identity Center configuration for a given studio. - /// - /// - /// - /// If the studio has a valid IAM Identity Center configuration currently associated with - /// it, this operation will fail with a validation error. - /// - /// - /// - /// If the studio does not have a valid IAM Identity Center configuration currently associated - /// with it, then a new IAM Identity Center application is created for the studio and - /// the studio is changed to the READY state. - /// - /// - /// - /// After the IAM Identity Center application is repaired, you must use the Amazon Nimble - /// Studio console to add administrators and users to your studio. - /// - /// - /// Container for the necessary parameters to execute the StartStudioSSOConfigurationRepair service method. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// - /// - /// The response from the StartStudioSSOConfigurationRepair service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for StartStudioSSOConfigurationRepair Operation - Task StartStudioSSOConfigurationRepairAsync(StartStudioSSOConfigurationRepairRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)); - - #endregion - - #region StopStreamingSession - - - - /// - /// Transitions sessions from the READY state into the STOPPED state. The - /// STOP_IN_PROGRESS state is the intermediate state between the READY and - /// STOPPED states. - /// - /// Container for the necessary parameters to execute the StopStreamingSession service method. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// - /// - /// The response from the StopStreamingSession service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for StopStreamingSession Operation - Task StopStreamingSessionAsync(StopStreamingSessionRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)); - - #endregion - - #region TagResource - - - - /// - /// Creates tags for a resource, given its ARN. - /// - /// Container for the necessary parameters to execute the TagResource service method. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// - /// - /// The response from the TagResource service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for TagResource Operation - Task TagResourceAsync(TagResourceRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)); - - #endregion - - #region UntagResource - - - - /// - /// Deletes the tags for a resource. - /// - /// Container for the necessary parameters to execute the UntagResource service method. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// - /// - /// The response from the UntagResource service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for UntagResource Operation - Task UntagResourceAsync(UntagResourceRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)); - - #endregion - - #region UpdateLaunchProfile - - - - /// - /// Update a launch profile. - /// - /// Container for the necessary parameters to execute the UpdateLaunchProfile service method. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// - /// - /// The response from the UpdateLaunchProfile service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for UpdateLaunchProfile Operation - Task UpdateLaunchProfileAsync(UpdateLaunchProfileRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)); - - #endregion - - #region UpdateLaunchProfileMember - - - - /// - /// Update a user persona in launch profile membership. - /// - /// Container for the necessary parameters to execute the UpdateLaunchProfileMember service method. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// - /// - /// The response from the UpdateLaunchProfileMember service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for UpdateLaunchProfileMember Operation - Task UpdateLaunchProfileMemberAsync(UpdateLaunchProfileMemberRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)); - - #endregion - - #region UpdateStreamingImage - - - - /// - /// Update streaming image. - /// - /// Container for the necessary parameters to execute the UpdateStreamingImage service method. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// - /// - /// The response from the UpdateStreamingImage service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for UpdateStreamingImage Operation - Task UpdateStreamingImageAsync(UpdateStreamingImageRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)); - - #endregion - - #region UpdateStudio - - - - /// - /// Update a Studio resource. - /// - /// - /// - /// Currently, this operation only supports updating the displayName of your studio. - /// - /// - /// Container for the necessary parameters to execute the UpdateStudio service method. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// - /// - /// The response from the UpdateStudio service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for UpdateStudio Operation - Task UpdateStudioAsync(UpdateStudioRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)); - - #endregion - - #region UpdateStudioComponent - - - - /// - /// Updates a studio component resource. - /// - /// Container for the necessary parameters to execute the UpdateStudioComponent service method. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// - /// - /// The response from the UpdateStudioComponent service method, as returned by NimbleStudio. - /// - /// You are not authorized to perform this operation. Check your IAM policies, and ensure - /// that you are using the correct access keys. - /// - /// - /// Another operation is in progress. - /// - /// - /// An internal error has occurred. Please retry your request. - /// - /// - /// The specified resource could not be found. - /// - /// - /// Your current quota does not allow you to perform the request action. You can request - /// increases for some quotas, and other quotas cannot be increased. - /// - /// - /// - /// Please use Amazon Web Services Service Quotas to request an increase. - /// - /// - /// - /// The request throughput limit was exceeded. - /// - /// - /// One of the parameters in the request is invalid. - /// - /// REST API Reference for UpdateStudioComponent Operation - Task UpdateStudioComponentAsync(UpdateStudioComponentRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)); - - #endregion - - #region DetermineServiceOperationEndpoint - - /// - /// Returns the endpoint that will be used for a particular request. - /// - /// Request for the desired service operation. - /// The resolved endpoint for the given request. - Amazon.Runtime.Endpoints.Endpoint DetermineServiceOperationEndpoint(AmazonWebServiceRequest request); - - #endregion - - #region Static factory interface methods -#if NET8_0_OR_GREATER -// Warning CA1033 is issued when the child types can not call the method defined in parent types. -// In this use case the intended caller is only meant to be the interface as a factory -// method to create the child types. Given the SDK use case the warning can be ignored. -#pragma warning disable CA1033 - /// - [System.Diagnostics.CodeAnalysis.DynamicDependency(System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicProperties, typeof(AmazonNimbleStudioConfig))] - static ClientConfig IAmazonService.CreateDefaultClientConfig() => new AmazonNimbleStudioConfig(); - - /// - [System.Diagnostics.CodeAnalysis.UnconditionalSuppressMessage("AssemblyLoadTrimming", "IL2026:RequiresUnreferencedCode", - Justification = "This suppression is here to ignore the warnings caused by CognitoSync. See justification in IAmazonService.")] - static IAmazonService IAmazonService.CreateDefaultServiceClient(AWSCredentials awsCredentials, ClientConfig clientConfig) - { - var serviceClientConfig = clientConfig as AmazonNimbleStudioConfig; - if (serviceClientConfig == null) - { - throw new AmazonClientException("ClientConfig is not of type AmazonNimbleStudioConfig to create AmazonNimbleStudioClient"); - } - - return awsCredentials == null ? - new AmazonNimbleStudioClient(serviceClientConfig) : - new AmazonNimbleStudioClient(awsCredentials, serviceClientConfig); - } -#pragma warning restore CA1033 -#endif - #endregion - } -} \ No newline at end of file diff --git a/sdk/src/Services/NimbleStudio/Properties/AssemblyInfo.cs b/sdk/src/Services/NimbleStudio/Properties/AssemblyInfo.cs deleted file mode 100644 index ec9f5def385d..000000000000 --- a/sdk/src/Services/NimbleStudio/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,49 +0,0 @@ -using System; -using System.Reflection; -using System.Runtime.InteropServices; -using System.Runtime.CompilerServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("AWSSDK.NimbleStudio")] -#if BCL -[assembly: AssemblyDescription("The Amazon Web Services SDK for .NET (4.7.2) - AmazonNimbleStudio. Amazon Nimble Studio is a virtual studio service that empowers visual effects, animation, and interactive content teams to create content securely within a scalable, private cloud service.")] -#elif NETSTANDARD20 -[assembly: AssemblyDescription("The Amazon Web Services SDK for .NET (NetStandard 2.0) - AmazonNimbleStudio. Amazon Nimble Studio is a virtual studio service that empowers visual effects, animation, and interactive content teams to create content securely within a scalable, private cloud service.")] -#elif NETCOREAPP3_1 -[assembly: AssemblyDescription("The Amazon Web Services SDK for .NET (.NET Core 3.1) - AmazonNimbleStudio. Amazon Nimble Studio is a virtual studio service that empowers visual effects, animation, and interactive content teams to create content securely within a scalable, private cloud service.")] -#elif NET8_0 -[assembly: AssemblyDescription("The Amazon Web Services SDK for .NET (.NET 8.0) - AmazonNimbleStudio. Amazon Nimble Studio is a virtual studio service that empowers visual effects, animation, and interactive content teams to create content securely within a scalable, private cloud service.")] -#else -#error Unknown platform constant - unable to set correct AssemblyDescription -#endif - -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyProduct("Amazon Web Services SDK for .NET")] -[assembly: AssemblyCompany("Amazon.com, Inc")] -[assembly: AssemblyCopyright("Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -#if BCL -[assembly: AssemblyVersion("4.0")] -#else -[assembly: AssemblyVersion("4.0.0.0")] -#endif -[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/src/Services/OAM/Generated/AmazonOAMConfig.cs b/sdk/src/Services/OAM/Generated/AmazonOAMConfig.cs index a8f4cdd3fb1e..3ded1f8a1950 100644 --- a/sdk/src/Services/OAM/Generated/AmazonOAMConfig.cs +++ b/sdk/src/Services/OAM/Generated/AmazonOAMConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.OAM public partial class AmazonOAMConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("OAM", "4.0.0.0"); private static readonly AmazonOAMEndpointResolver EndpointResolver = new AmazonOAMEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("OAM", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("OAM", "3.7.400.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/OAM/OAM.sln b/sdk/src/Services/OAM/OAM.sln index 60a2c7b9ddf5..d436af49dc31 100644 --- a/sdk/src/Services/OAM/OAM.sln +++ b/sdk/src/Services/OAM/OAM.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {203DAEBD-CA6C-4E89-89BC-A6FA391C4973}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {203DAEBD-CA6C-4E89-89BC-A6FA391C4973}.Debug|Any CPU.Build.0 = Debug|Any CPU {203DAEBD-CA6C-4E89-89BC-A6FA391C4973}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {3945F176-3ADE-4C5B-BD32-AFB9736041DD}.Debug|Any CPU.Build.0 = Debug|Any CPU {3945F176-3ADE-4C5B-BD32-AFB9736041DD}.Release|Any CPU.ActiveCfg = Release|Any CPU {3945F176-3ADE-4C5B-BD32-AFB9736041DD}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {871B20B8-7E99-41E8-A994-BF4FF0503647}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {871B20B8-7E99-41E8-A994-BF4FF0503647}.Debug|Any CPU.Build.0 = Debug|Any CPU - {871B20B8-7E99-41E8-A994-BF4FF0503647}.Release|Any CPU.ActiveCfg = Release|Any CPU - {871B20B8-7E99-41E8-A994-BF4FF0503647}.Release|Any CPU.Build.0 = Release|Any CPU - {FDD60F5A-36CC-43BA-BB49-089E4BCCA4BE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FDD60F5A-36CC-43BA-BB49-089E4BCCA4BE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FDD60F5A-36CC-43BA-BB49-089E4BCCA4BE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FDD60F5A-36CC-43BA-BB49-089E4BCCA4BE}.Release|Any CPU.Build.0 = Release|Any CPU - {EF851213-0C77-478F-886E-97466D09A5EC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EF851213-0C77-478F-886E-97466D09A5EC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EF851213-0C77-478F-886E-97466D09A5EC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EF851213-0C77-478F-886E-97466D09A5EC}.Release|Any CPU.Build.0 = Release|Any CPU - {8F18A47E-E620-4132-AF34-FD44A9A57F2A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8F18A47E-E620-4132-AF34-FD44A9A57F2A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8F18A47E-E620-4132-AF34-FD44A9A57F2A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8F18A47E-E620-4132-AF34-FD44A9A57F2A}.Release|Any CPU.Build.0 = Release|Any CPU - {9AECE28A-1D5B-459B-A80C-B82CC445E3B2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9AECE28A-1D5B-459B-A80C-B82CC445E3B2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9AECE28A-1D5B-459B-A80C-B82CC445E3B2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9AECE28A-1D5B-459B-A80C-B82CC445E3B2}.Release|Any CPU.Build.0 = Release|Any CPU - {FECA2109-4466-4549-99EA-8246C4974119}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FECA2109-4466-4549-99EA-8246C4974119}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FECA2109-4466-4549-99EA-8246C4974119}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FECA2109-4466-4549-99EA-8246C4974119}.Release|Any CPU.Build.0 = Release|Any CPU - {9DAE4201-CDA9-4464-B6A1-F318E6C1AA28}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9DAE4201-CDA9-4464-B6A1-F318E6C1AA28}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9DAE4201-CDA9-4464-B6A1-F318E6C1AA28}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9DAE4201-CDA9-4464-B6A1-F318E6C1AA28}.Release|Any CPU.Build.0 = Release|Any CPU - {647E2971-EEA7-460B-A983-620EE7E5D1EA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {647E2971-EEA7-460B-A983-620EE7E5D1EA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {647E2971-EEA7-460B-A983-620EE7E5D1EA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {647E2971-EEA7-460B-A983-620EE7E5D1EA}.Release|Any CPU.Build.0 = Release|Any CPU - {421BB561-014A-4C3C-A340-D6EACD3C62EC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {421BB561-014A-4C3C-A340-D6EACD3C62EC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {421BB561-014A-4C3C-A340-D6EACD3C62EC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {421BB561-014A-4C3C-A340-D6EACD3C62EC}.Release|Any CPU.Build.0 = Release|Any CPU - {4B865AE8-60A7-45D1-B2EA-8A376B02E4B5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4B865AE8-60A7-45D1-B2EA-8A376B02E4B5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4B865AE8-60A7-45D1-B2EA-8A376B02E4B5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4B865AE8-60A7-45D1-B2EA-8A376B02E4B5}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {871B20B8-7E99-41E8-A994-BF4FF0503647}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {871B20B8-7E99-41E8-A994-BF4FF0503647}.Debug|Any CPU.Build.0 = Debug|Any CPU - {871B20B8-7E99-41E8-A994-BF4FF0503647}.Release|Any CPU.ActiveCfg = Release|Any CPU - {871B20B8-7E99-41E8-A994-BF4FF0503647}.Release|Any CPU.Build.0 = Release|Any CPU - {FDD60F5A-36CC-43BA-BB49-089E4BCCA4BE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FDD60F5A-36CC-43BA-BB49-089E4BCCA4BE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FDD60F5A-36CC-43BA-BB49-089E4BCCA4BE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FDD60F5A-36CC-43BA-BB49-089E4BCCA4BE}.Release|Any CPU.Build.0 = Release|Any CPU - {EF851213-0C77-478F-886E-97466D09A5EC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EF851213-0C77-478F-886E-97466D09A5EC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EF851213-0C77-478F-886E-97466D09A5EC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EF851213-0C77-478F-886E-97466D09A5EC}.Release|Any CPU.Build.0 = Release|Any CPU - {8F18A47E-E620-4132-AF34-FD44A9A57F2A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8F18A47E-E620-4132-AF34-FD44A9A57F2A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8F18A47E-E620-4132-AF34-FD44A9A57F2A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8F18A47E-E620-4132-AF34-FD44A9A57F2A}.Release|Any CPU.Build.0 = Release|Any CPU - {9AECE28A-1D5B-459B-A80C-B82CC445E3B2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9AECE28A-1D5B-459B-A80C-B82CC445E3B2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9AECE28A-1D5B-459B-A80C-B82CC445E3B2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9AECE28A-1D5B-459B-A80C-B82CC445E3B2}.Release|Any CPU.Build.0 = Release|Any CPU - {FECA2109-4466-4549-99EA-8246C4974119}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FECA2109-4466-4549-99EA-8246C4974119}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FECA2109-4466-4549-99EA-8246C4974119}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FECA2109-4466-4549-99EA-8246C4974119}.Release|Any CPU.Build.0 = Release|Any CPU - {9DAE4201-CDA9-4464-B6A1-F318E6C1AA28}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9DAE4201-CDA9-4464-B6A1-F318E6C1AA28}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9DAE4201-CDA9-4464-B6A1-F318E6C1AA28}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9DAE4201-CDA9-4464-B6A1-F318E6C1AA28}.Release|Any CPU.Build.0 = Release|Any CPU - {647E2971-EEA7-460B-A983-620EE7E5D1EA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {647E2971-EEA7-460B-A983-620EE7E5D1EA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {647E2971-EEA7-460B-A983-620EE7E5D1EA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {647E2971-EEA7-460B-A983-620EE7E5D1EA}.Release|Any CPU.Build.0 = Release|Any CPU - {421BB561-014A-4C3C-A340-D6EACD3C62EC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {421BB561-014A-4C3C-A340-D6EACD3C62EC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {421BB561-014A-4C3C-A340-D6EACD3C62EC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {421BB561-014A-4C3C-A340-D6EACD3C62EC}.Release|Any CPU.Build.0 = Release|Any CPU - {4B865AE8-60A7-45D1-B2EA-8A376B02E4B5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4B865AE8-60A7-45D1-B2EA-8A376B02E4B5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4B865AE8-60A7-45D1-B2EA-8A376B02E4B5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4B865AE8-60A7-45D1-B2EA-8A376B02E4B5}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {203DAEBD-CA6C-4E89-89BC-A6FA391C4973} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {50EF6CCC-3BDC-4495-A0AD-AA0B7622701C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {71D509DE-4290-477C-B646-87FCC064D59A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {5B4BA392-CF20-41A8-82FC-B2E843831DBC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {3945F176-3ADE-4C5B-BD32-AFB9736041DD} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {871B20B8-7E99-41E8-A994-BF4FF0503647} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {FDD60F5A-36CC-43BA-BB49-089E4BCCA4BE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {EF851213-0C77-478F-886E-97466D09A5EC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8F18A47E-E620-4132-AF34-FD44A9A57F2A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {9AECE28A-1D5B-459B-A80C-B82CC445E3B2} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {FECA2109-4466-4549-99EA-8246C4974119} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {9DAE4201-CDA9-4464-B6A1-F318E6C1AA28} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {647E2971-EEA7-460B-A983-620EE7E5D1EA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {421BB561-014A-4C3C-A340-D6EACD3C62EC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4B865AE8-60A7-45D1-B2EA-8A376B02E4B5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {871B20B8-7E99-41E8-A994-BF4FF0503647} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {FDD60F5A-36CC-43BA-BB49-089E4BCCA4BE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {EF851213-0C77-478F-886E-97466D09A5EC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8F18A47E-E620-4132-AF34-FD44A9A57F2A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {9AECE28A-1D5B-459B-A80C-B82CC445E3B2} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {FECA2109-4466-4549-99EA-8246C4974119} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {9DAE4201-CDA9-4464-B6A1-F318E6C1AA28} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {647E2971-EEA7-460B-A983-620EE7E5D1EA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {421BB561-014A-4C3C-A340-D6EACD3C62EC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4B865AE8-60A7-45D1-B2EA-8A376B02E4B5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {7D24BE96-CEE3-4AD5-85F3-FE5949CB02D1} diff --git a/sdk/src/Services/OAM/Properties/AssemblyInfo.cs b/sdk/src/Services/OAM/Properties/AssemblyInfo.cs index e81b559b7e24..1fd1c5577ace 100644 --- a/sdk/src/Services/OAM/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/OAM/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/OSIS/Generated/AmazonOSISConfig.cs b/sdk/src/Services/OSIS/Generated/AmazonOSISConfig.cs index f30b8a712a1a..bdb0d1aa5675 100644 --- a/sdk/src/Services/OSIS/Generated/AmazonOSISConfig.cs +++ b/sdk/src/Services/OSIS/Generated/AmazonOSISConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.OSIS public partial class AmazonOSISConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("OSIS", "4.0.0.0"); private static readonly AmazonOSISEndpointResolver EndpointResolver = new AmazonOSISEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("OSIS", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("OSIS", "3.7.400.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/OSIS/OSIS.sln b/sdk/src/Services/OSIS/OSIS.sln index 1d766a764fac..dc65a1841ddc 100644 --- a/sdk/src/Services/OSIS/OSIS.sln +++ b/sdk/src/Services/OSIS/OSIS.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {2CC87339-4E2A-4CCE-9856-86DE3B5869A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {2CC87339-4E2A-4CCE-9856-86DE3B5869A2}.Debug|Any CPU.Build.0 = Debug|Any CPU {2CC87339-4E2A-4CCE-9856-86DE3B5869A2}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {39859E7A-D57F-4941-8F7C-B46746A8EC3A}.Debug|Any CPU.Build.0 = Debug|Any CPU {39859E7A-D57F-4941-8F7C-B46746A8EC3A}.Release|Any CPU.ActiveCfg = Release|Any CPU {39859E7A-D57F-4941-8F7C-B46746A8EC3A}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {211E2AD9-26DC-4D85-802F-B43C5C2A84E5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {211E2AD9-26DC-4D85-802F-B43C5C2A84E5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {211E2AD9-26DC-4D85-802F-B43C5C2A84E5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {211E2AD9-26DC-4D85-802F-B43C5C2A84E5}.Release|Any CPU.Build.0 = Release|Any CPU - {9BA3DA91-96F3-4DA2-A0C7-F191496DA7C4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9BA3DA91-96F3-4DA2-A0C7-F191496DA7C4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9BA3DA91-96F3-4DA2-A0C7-F191496DA7C4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9BA3DA91-96F3-4DA2-A0C7-F191496DA7C4}.Release|Any CPU.Build.0 = Release|Any CPU - {A1DC9B45-6B4C-4105-9363-436E17112B31}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A1DC9B45-6B4C-4105-9363-436E17112B31}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A1DC9B45-6B4C-4105-9363-436E17112B31}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A1DC9B45-6B4C-4105-9363-436E17112B31}.Release|Any CPU.Build.0 = Release|Any CPU - {9FD51D9F-A862-4275-8BA9-51B1759E82F2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9FD51D9F-A862-4275-8BA9-51B1759E82F2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9FD51D9F-A862-4275-8BA9-51B1759E82F2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9FD51D9F-A862-4275-8BA9-51B1759E82F2}.Release|Any CPU.Build.0 = Release|Any CPU - {B37175FB-C071-4A8D-B19E-7BB6AA4B2F70}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B37175FB-C071-4A8D-B19E-7BB6AA4B2F70}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B37175FB-C071-4A8D-B19E-7BB6AA4B2F70}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B37175FB-C071-4A8D-B19E-7BB6AA4B2F70}.Release|Any CPU.Build.0 = Release|Any CPU - {FC18CF71-BEF2-4C58-B028-59ACC952FB3A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FC18CF71-BEF2-4C58-B028-59ACC952FB3A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FC18CF71-BEF2-4C58-B028-59ACC952FB3A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FC18CF71-BEF2-4C58-B028-59ACC952FB3A}.Release|Any CPU.Build.0 = Release|Any CPU - {1CFF88F1-375F-44D4-A9D2-EB14AD1C3095}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1CFF88F1-375F-44D4-A9D2-EB14AD1C3095}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1CFF88F1-375F-44D4-A9D2-EB14AD1C3095}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1CFF88F1-375F-44D4-A9D2-EB14AD1C3095}.Release|Any CPU.Build.0 = Release|Any CPU - {F4618BE8-C344-4E3E-8C31-47FAAA96E5BF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F4618BE8-C344-4E3E-8C31-47FAAA96E5BF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F4618BE8-C344-4E3E-8C31-47FAAA96E5BF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F4618BE8-C344-4E3E-8C31-47FAAA96E5BF}.Release|Any CPU.Build.0 = Release|Any CPU - {730D533A-0A89-4F77-9964-51DF733197AC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {730D533A-0A89-4F77-9964-51DF733197AC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {730D533A-0A89-4F77-9964-51DF733197AC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {730D533A-0A89-4F77-9964-51DF733197AC}.Release|Any CPU.Build.0 = Release|Any CPU - {602640BB-3D44-4681-AA03-6A016EDF1E42}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {602640BB-3D44-4681-AA03-6A016EDF1E42}.Debug|Any CPU.Build.0 = Debug|Any CPU - {602640BB-3D44-4681-AA03-6A016EDF1E42}.Release|Any CPU.ActiveCfg = Release|Any CPU - {602640BB-3D44-4681-AA03-6A016EDF1E42}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {211E2AD9-26DC-4D85-802F-B43C5C2A84E5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {211E2AD9-26DC-4D85-802F-B43C5C2A84E5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {211E2AD9-26DC-4D85-802F-B43C5C2A84E5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {211E2AD9-26DC-4D85-802F-B43C5C2A84E5}.Release|Any CPU.Build.0 = Release|Any CPU - {9BA3DA91-96F3-4DA2-A0C7-F191496DA7C4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9BA3DA91-96F3-4DA2-A0C7-F191496DA7C4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9BA3DA91-96F3-4DA2-A0C7-F191496DA7C4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9BA3DA91-96F3-4DA2-A0C7-F191496DA7C4}.Release|Any CPU.Build.0 = Release|Any CPU - {A1DC9B45-6B4C-4105-9363-436E17112B31}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A1DC9B45-6B4C-4105-9363-436E17112B31}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A1DC9B45-6B4C-4105-9363-436E17112B31}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A1DC9B45-6B4C-4105-9363-436E17112B31}.Release|Any CPU.Build.0 = Release|Any CPU - {9FD51D9F-A862-4275-8BA9-51B1759E82F2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9FD51D9F-A862-4275-8BA9-51B1759E82F2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9FD51D9F-A862-4275-8BA9-51B1759E82F2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9FD51D9F-A862-4275-8BA9-51B1759E82F2}.Release|Any CPU.Build.0 = Release|Any CPU - {B37175FB-C071-4A8D-B19E-7BB6AA4B2F70}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B37175FB-C071-4A8D-B19E-7BB6AA4B2F70}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B37175FB-C071-4A8D-B19E-7BB6AA4B2F70}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B37175FB-C071-4A8D-B19E-7BB6AA4B2F70}.Release|Any CPU.Build.0 = Release|Any CPU - {FC18CF71-BEF2-4C58-B028-59ACC952FB3A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FC18CF71-BEF2-4C58-B028-59ACC952FB3A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FC18CF71-BEF2-4C58-B028-59ACC952FB3A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FC18CF71-BEF2-4C58-B028-59ACC952FB3A}.Release|Any CPU.Build.0 = Release|Any CPU - {1CFF88F1-375F-44D4-A9D2-EB14AD1C3095}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1CFF88F1-375F-44D4-A9D2-EB14AD1C3095}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1CFF88F1-375F-44D4-A9D2-EB14AD1C3095}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1CFF88F1-375F-44D4-A9D2-EB14AD1C3095}.Release|Any CPU.Build.0 = Release|Any CPU - {F4618BE8-C344-4E3E-8C31-47FAAA96E5BF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F4618BE8-C344-4E3E-8C31-47FAAA96E5BF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F4618BE8-C344-4E3E-8C31-47FAAA96E5BF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F4618BE8-C344-4E3E-8C31-47FAAA96E5BF}.Release|Any CPU.Build.0 = Release|Any CPU - {730D533A-0A89-4F77-9964-51DF733197AC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {730D533A-0A89-4F77-9964-51DF733197AC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {730D533A-0A89-4F77-9964-51DF733197AC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {730D533A-0A89-4F77-9964-51DF733197AC}.Release|Any CPU.Build.0 = Release|Any CPU - {602640BB-3D44-4681-AA03-6A016EDF1E42}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {602640BB-3D44-4681-AA03-6A016EDF1E42}.Debug|Any CPU.Build.0 = Debug|Any CPU - {602640BB-3D44-4681-AA03-6A016EDF1E42}.Release|Any CPU.ActiveCfg = Release|Any CPU - {602640BB-3D44-4681-AA03-6A016EDF1E42}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {2CC87339-4E2A-4CCE-9856-86DE3B5869A2} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {EE276F1C-5C78-49DD-BDCE-D26DF923A6B4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {B30FC8A6-A044-4E72-BDBD-AE581D12A8FA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {9CC22C19-6E17-436F-B6EE-CE247FF8DBF4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {39859E7A-D57F-4941-8F7C-B46746A8EC3A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {211E2AD9-26DC-4D85-802F-B43C5C2A84E5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {9BA3DA91-96F3-4DA2-A0C7-F191496DA7C4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A1DC9B45-6B4C-4105-9363-436E17112B31} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {9FD51D9F-A862-4275-8BA9-51B1759E82F2} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B37175FB-C071-4A8D-B19E-7BB6AA4B2F70} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {FC18CF71-BEF2-4C58-B028-59ACC952FB3A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {1CFF88F1-375F-44D4-A9D2-EB14AD1C3095} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F4618BE8-C344-4E3E-8C31-47FAAA96E5BF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {730D533A-0A89-4F77-9964-51DF733197AC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {602640BB-3D44-4681-AA03-6A016EDF1E42} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {211E2AD9-26DC-4D85-802F-B43C5C2A84E5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {9BA3DA91-96F3-4DA2-A0C7-F191496DA7C4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A1DC9B45-6B4C-4105-9363-436E17112B31} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {9FD51D9F-A862-4275-8BA9-51B1759E82F2} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B37175FB-C071-4A8D-B19E-7BB6AA4B2F70} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {FC18CF71-BEF2-4C58-B028-59ACC952FB3A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {1CFF88F1-375F-44D4-A9D2-EB14AD1C3095} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F4618BE8-C344-4E3E-8C31-47FAAA96E5BF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {730D533A-0A89-4F77-9964-51DF733197AC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {602640BB-3D44-4681-AA03-6A016EDF1E42} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {1B6D4D5E-9207-4DAC-A2F9-60FE1A6BFF1B} diff --git a/sdk/src/Services/OSIS/Properties/AssemblyInfo.cs b/sdk/src/Services/OSIS/Properties/AssemblyInfo.cs index 4e2a1ceca187..ebbc874b251f 100644 --- a/sdk/src/Services/OSIS/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/OSIS/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/Omics/Generated/AmazonOmicsConfig.cs b/sdk/src/Services/Omics/Generated/AmazonOmicsConfig.cs index 6347f731e046..22adc0a4e2bd 100644 --- a/sdk/src/Services/Omics/Generated/AmazonOmicsConfig.cs +++ b/sdk/src/Services/Omics/Generated/AmazonOmicsConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.Omics public partial class AmazonOmicsConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("Omics", "4.0.0.0"); private static readonly AmazonOmicsEndpointResolver EndpointResolver = new AmazonOmicsEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("Omics", "3.7.401.15"); -======= - InternalSDKUtils.BuildUserAgentString("Omics", "3.7.401.42"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/Omics/Omics.sln b/sdk/src/Services/Omics/Omics.sln index 2c20c9719300..31f3ddf7541b 100644 --- a/sdk/src/Services/Omics/Omics.sln +++ b/sdk/src/Services/Omics/Omics.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {25FA62A7-00BD-4C75-B0A1-249E8236F924}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {25FA62A7-00BD-4C75-B0A1-249E8236F924}.Debug|Any CPU.Build.0 = Debug|Any CPU {25FA62A7-00BD-4C75-B0A1-249E8236F924}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {90179817-DB46-4E64-9CEC-3C85D567F652}.Debug|Any CPU.Build.0 = Debug|Any CPU {90179817-DB46-4E64-9CEC-3C85D567F652}.Release|Any CPU.ActiveCfg = Release|Any CPU {90179817-DB46-4E64-9CEC-3C85D567F652}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {1418BE13-E4F1-4500-AA5D-9E8B4E173D47}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1418BE13-E4F1-4500-AA5D-9E8B4E173D47}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1418BE13-E4F1-4500-AA5D-9E8B4E173D47}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1418BE13-E4F1-4500-AA5D-9E8B4E173D47}.Release|Any CPU.Build.0 = Release|Any CPU - {958314FB-C316-44ED-B3E8-8B74E7337822}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {958314FB-C316-44ED-B3E8-8B74E7337822}.Debug|Any CPU.Build.0 = Debug|Any CPU - {958314FB-C316-44ED-B3E8-8B74E7337822}.Release|Any CPU.ActiveCfg = Release|Any CPU - {958314FB-C316-44ED-B3E8-8B74E7337822}.Release|Any CPU.Build.0 = Release|Any CPU - {92F77FD5-5B92-48E7-9CCE-74AD4F5BA9F5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {92F77FD5-5B92-48E7-9CCE-74AD4F5BA9F5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {92F77FD5-5B92-48E7-9CCE-74AD4F5BA9F5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {92F77FD5-5B92-48E7-9CCE-74AD4F5BA9F5}.Release|Any CPU.Build.0 = Release|Any CPU - {052CDBDA-8901-4D68-8B45-A1FED40EF3FA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {052CDBDA-8901-4D68-8B45-A1FED40EF3FA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {052CDBDA-8901-4D68-8B45-A1FED40EF3FA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {052CDBDA-8901-4D68-8B45-A1FED40EF3FA}.Release|Any CPU.Build.0 = Release|Any CPU - {3051D817-3CC0-4837-AD70-702D251F9C60}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3051D817-3CC0-4837-AD70-702D251F9C60}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3051D817-3CC0-4837-AD70-702D251F9C60}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3051D817-3CC0-4837-AD70-702D251F9C60}.Release|Any CPU.Build.0 = Release|Any CPU - {276251CF-01AF-4FC4-AE79-E90B52E694DF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {276251CF-01AF-4FC4-AE79-E90B52E694DF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {276251CF-01AF-4FC4-AE79-E90B52E694DF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {276251CF-01AF-4FC4-AE79-E90B52E694DF}.Release|Any CPU.Build.0 = Release|Any CPU - {59EDCE96-FB4A-495B-8219-B6917EE833B0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {59EDCE96-FB4A-495B-8219-B6917EE833B0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {59EDCE96-FB4A-495B-8219-B6917EE833B0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {59EDCE96-FB4A-495B-8219-B6917EE833B0}.Release|Any CPU.Build.0 = Release|Any CPU - {8204C1DB-5344-4F93-BF92-374E070C1341}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8204C1DB-5344-4F93-BF92-374E070C1341}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8204C1DB-5344-4F93-BF92-374E070C1341}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8204C1DB-5344-4F93-BF92-374E070C1341}.Release|Any CPU.Build.0 = Release|Any CPU - {8088B7E5-04DD-4F0C-8750-190D0FAEB307}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8088B7E5-04DD-4F0C-8750-190D0FAEB307}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8088B7E5-04DD-4F0C-8750-190D0FAEB307}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8088B7E5-04DD-4F0C-8750-190D0FAEB307}.Release|Any CPU.Build.0 = Release|Any CPU - {D5E88417-BA5F-4679-8062-668805D44978}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D5E88417-BA5F-4679-8062-668805D44978}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D5E88417-BA5F-4679-8062-668805D44978}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D5E88417-BA5F-4679-8062-668805D44978}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {1418BE13-E4F1-4500-AA5D-9E8B4E173D47}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1418BE13-E4F1-4500-AA5D-9E8B4E173D47}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1418BE13-E4F1-4500-AA5D-9E8B4E173D47}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1418BE13-E4F1-4500-AA5D-9E8B4E173D47}.Release|Any CPU.Build.0 = Release|Any CPU - {958314FB-C316-44ED-B3E8-8B74E7337822}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {958314FB-C316-44ED-B3E8-8B74E7337822}.Debug|Any CPU.Build.0 = Debug|Any CPU - {958314FB-C316-44ED-B3E8-8B74E7337822}.Release|Any CPU.ActiveCfg = Release|Any CPU - {958314FB-C316-44ED-B3E8-8B74E7337822}.Release|Any CPU.Build.0 = Release|Any CPU - {92F77FD5-5B92-48E7-9CCE-74AD4F5BA9F5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {92F77FD5-5B92-48E7-9CCE-74AD4F5BA9F5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {92F77FD5-5B92-48E7-9CCE-74AD4F5BA9F5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {92F77FD5-5B92-48E7-9CCE-74AD4F5BA9F5}.Release|Any CPU.Build.0 = Release|Any CPU - {052CDBDA-8901-4D68-8B45-A1FED40EF3FA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {052CDBDA-8901-4D68-8B45-A1FED40EF3FA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {052CDBDA-8901-4D68-8B45-A1FED40EF3FA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {052CDBDA-8901-4D68-8B45-A1FED40EF3FA}.Release|Any CPU.Build.0 = Release|Any CPU - {3051D817-3CC0-4837-AD70-702D251F9C60}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3051D817-3CC0-4837-AD70-702D251F9C60}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3051D817-3CC0-4837-AD70-702D251F9C60}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3051D817-3CC0-4837-AD70-702D251F9C60}.Release|Any CPU.Build.0 = Release|Any CPU - {276251CF-01AF-4FC4-AE79-E90B52E694DF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {276251CF-01AF-4FC4-AE79-E90B52E694DF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {276251CF-01AF-4FC4-AE79-E90B52E694DF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {276251CF-01AF-4FC4-AE79-E90B52E694DF}.Release|Any CPU.Build.0 = Release|Any CPU - {59EDCE96-FB4A-495B-8219-B6917EE833B0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {59EDCE96-FB4A-495B-8219-B6917EE833B0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {59EDCE96-FB4A-495B-8219-B6917EE833B0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {59EDCE96-FB4A-495B-8219-B6917EE833B0}.Release|Any CPU.Build.0 = Release|Any CPU - {8204C1DB-5344-4F93-BF92-374E070C1341}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8204C1DB-5344-4F93-BF92-374E070C1341}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8204C1DB-5344-4F93-BF92-374E070C1341}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8204C1DB-5344-4F93-BF92-374E070C1341}.Release|Any CPU.Build.0 = Release|Any CPU - {8088B7E5-04DD-4F0C-8750-190D0FAEB307}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8088B7E5-04DD-4F0C-8750-190D0FAEB307}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8088B7E5-04DD-4F0C-8750-190D0FAEB307}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8088B7E5-04DD-4F0C-8750-190D0FAEB307}.Release|Any CPU.Build.0 = Release|Any CPU - {D5E88417-BA5F-4679-8062-668805D44978}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D5E88417-BA5F-4679-8062-668805D44978}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D5E88417-BA5F-4679-8062-668805D44978}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D5E88417-BA5F-4679-8062-668805D44978}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {25FA62A7-00BD-4C75-B0A1-249E8236F924} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {B07CA366-7C2A-4CA6-A7D5-2611CA55361D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {0FA8363C-5750-4AB4-966B-6039124416D1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {DB9AA561-D8F9-460C-9B81-BD0F471CC0C2} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {90179817-DB46-4E64-9CEC-3C85D567F652} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {1418BE13-E4F1-4500-AA5D-9E8B4E173D47} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {958314FB-C316-44ED-B3E8-8B74E7337822} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {92F77FD5-5B92-48E7-9CCE-74AD4F5BA9F5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {052CDBDA-8901-4D68-8B45-A1FED40EF3FA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {3051D817-3CC0-4837-AD70-702D251F9C60} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {276251CF-01AF-4FC4-AE79-E90B52E694DF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {59EDCE96-FB4A-495B-8219-B6917EE833B0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8204C1DB-5344-4F93-BF92-374E070C1341} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8088B7E5-04DD-4F0C-8750-190D0FAEB307} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D5E88417-BA5F-4679-8062-668805D44978} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {1418BE13-E4F1-4500-AA5D-9E8B4E173D47} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {958314FB-C316-44ED-B3E8-8B74E7337822} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {92F77FD5-5B92-48E7-9CCE-74AD4F5BA9F5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {052CDBDA-8901-4D68-8B45-A1FED40EF3FA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {3051D817-3CC0-4837-AD70-702D251F9C60} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {276251CF-01AF-4FC4-AE79-E90B52E694DF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {59EDCE96-FB4A-495B-8219-B6917EE833B0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8204C1DB-5344-4F93-BF92-374E070C1341} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8088B7E5-04DD-4F0C-8750-190D0FAEB307} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D5E88417-BA5F-4679-8062-668805D44978} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {D7F332FC-B009-4270-9380-0C58A64A01D3} diff --git a/sdk/src/Services/Omics/Properties/AssemblyInfo.cs b/sdk/src/Services/Omics/Properties/AssemblyInfo.cs index d1ac62fadb41..9858c2a9be2d 100644 --- a/sdk/src/Services/Omics/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/Omics/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.15")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.42")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/OpenSearchServerless/Generated/AmazonOpenSearchServerlessConfig.cs b/sdk/src/Services/OpenSearchServerless/Generated/AmazonOpenSearchServerlessConfig.cs index b692ec8e2eaa..7badded0aeb7 100644 --- a/sdk/src/Services/OpenSearchServerless/Generated/AmazonOpenSearchServerlessConfig.cs +++ b/sdk/src/Services/OpenSearchServerless/Generated/AmazonOpenSearchServerlessConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.OpenSearchServerless public partial class AmazonOpenSearchServerlessConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("OpenSearchServerless", "4.0.0.0"); private static readonly AmazonOpenSearchServerlessEndpointResolver EndpointResolver = new AmazonOpenSearchServerlessEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("OpenSearchServerless", "3.7.401.17"); -======= - InternalSDKUtils.BuildUserAgentString("OpenSearchServerless", "3.7.402.10"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/OpenSearchServerless/Generated/Model/Internal/MarshallTransformations/CreateSecurityConfigRequestMarshaller.cs b/sdk/src/Services/OpenSearchServerless/Generated/Model/Internal/MarshallTransformations/CreateSecurityConfigRequestMarshaller.cs index 7eddf19125a3..7ea4901073e0 100644 --- a/sdk/src/Services/OpenSearchServerless/Generated/Model/Internal/MarshallTransformations/CreateSecurityConfigRequestMarshaller.cs +++ b/sdk/src/Services/OpenSearchServerless/Generated/Model/Internal/MarshallTransformations/CreateSecurityConfigRequestMarshaller.cs @@ -88,6 +88,17 @@ public IRequest Marshall(CreateSecurityConfigRequest publicRequest) context.Writer.Write(publicRequest.Description); } + if(publicRequest.IsSetIamIdentityCenterOptions()) + { + context.Writer.WritePropertyName("iamIdentityCenterOptions"); + context.Writer.WriteObjectStart(); + + var marshaller = CreateIamIdentityCenterConfigOptionsMarshaller.Instance; + marshaller.Marshall(publicRequest.IamIdentityCenterOptions, context); + + context.Writer.WriteObjectEnd(); + } + if(publicRequest.IsSetName()) { context.Writer.WritePropertyName("name"); @@ -114,96 +125,7 @@ public IRequest Marshall(CreateSecurityConfigRequest publicRequest) writer.WriteObjectEnd(); } -<<<<<<< HEAD request.Content = memoryStream.ToArray(); -||||||| Commit version number update changes - else if(!(publicRequest.IsSetClientToken())) - { - context.Writer.WritePropertyName("clientToken"); - context.Writer.Write(Guid.NewGuid().ToString()); - } - if(publicRequest.IsSetDescription()) - { - context.Writer.WritePropertyName("description"); - context.Writer.Write(publicRequest.Description); - } - - if(publicRequest.IsSetName()) - { - context.Writer.WritePropertyName("name"); - context.Writer.Write(publicRequest.Name); - } - - if(publicRequest.IsSetSamlOptions()) - { - context.Writer.WritePropertyName("samlOptions"); - context.Writer.WriteObjectStart(); - - var marshaller = SamlConfigOptionsMarshaller.Instance; - marshaller.Marshall(publicRequest.SamlOptions, context); - - context.Writer.WriteObjectEnd(); - } - - if(publicRequest.IsSetType()) - { - context.Writer.WritePropertyName("type"); - context.Writer.Write(publicRequest.Type); - } - - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); -======= - else if(!(publicRequest.IsSetClientToken())) - { - context.Writer.WritePropertyName("clientToken"); - context.Writer.Write(Guid.NewGuid().ToString()); - } - if(publicRequest.IsSetDescription()) - { - context.Writer.WritePropertyName("description"); - context.Writer.Write(publicRequest.Description); - } - - if(publicRequest.IsSetIamIdentityCenterOptions()) - { - context.Writer.WritePropertyName("iamIdentityCenterOptions"); - context.Writer.WriteObjectStart(); - - var marshaller = CreateIamIdentityCenterConfigOptionsMarshaller.Instance; - marshaller.Marshall(publicRequest.IamIdentityCenterOptions, context); - - context.Writer.WriteObjectEnd(); - } - - if(publicRequest.IsSetName()) - { - context.Writer.WritePropertyName("name"); - context.Writer.Write(publicRequest.Name); - } - - if(publicRequest.IsSetSamlOptions()) - { - context.Writer.WritePropertyName("samlOptions"); - context.Writer.WriteObjectStart(); - - var marshaller = SamlConfigOptionsMarshaller.Instance; - marshaller.Marshall(publicRequest.SamlOptions, context); - - context.Writer.WriteObjectEnd(); - } - - if(publicRequest.IsSetType()) - { - context.Writer.WritePropertyName("type"); - context.Writer.Write(publicRequest.Type); - } - - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b } diff --git a/sdk/src/Services/OpenSearchServerless/Generated/Model/Internal/MarshallTransformations/UpdateSecurityConfigRequestMarshaller.cs b/sdk/src/Services/OpenSearchServerless/Generated/Model/Internal/MarshallTransformations/UpdateSecurityConfigRequestMarshaller.cs index 39587b721ae5..0fc248a02da9 100644 --- a/sdk/src/Services/OpenSearchServerless/Generated/Model/Internal/MarshallTransformations/UpdateSecurityConfigRequestMarshaller.cs +++ b/sdk/src/Services/OpenSearchServerless/Generated/Model/Internal/MarshallTransformations/UpdateSecurityConfigRequestMarshaller.cs @@ -94,6 +94,17 @@ public IRequest Marshall(UpdateSecurityConfigRequest publicRequest) context.Writer.Write(publicRequest.Description); } + if(publicRequest.IsSetIamIdentityCenterOptionsUpdates()) + { + context.Writer.WritePropertyName("iamIdentityCenterOptionsUpdates"); + context.Writer.WriteObjectStart(); + + var marshaller = UpdateIamIdentityCenterConfigOptionsMarshaller.Instance; + marshaller.Marshall(publicRequest.IamIdentityCenterOptionsUpdates, context); + + context.Writer.WriteObjectEnd(); + } + if(publicRequest.IsSetId()) { context.Writer.WritePropertyName("id"); @@ -114,96 +125,7 @@ public IRequest Marshall(UpdateSecurityConfigRequest publicRequest) writer.WriteObjectEnd(); } -<<<<<<< HEAD request.Content = memoryStream.ToArray(); -||||||| Commit version number update changes - else if(!(publicRequest.IsSetClientToken())) - { - context.Writer.WritePropertyName("clientToken"); - context.Writer.Write(Guid.NewGuid().ToString()); - } - if(publicRequest.IsSetConfigVersion()) - { - context.Writer.WritePropertyName("configVersion"); - context.Writer.Write(publicRequest.ConfigVersion); - } - - if(publicRequest.IsSetDescription()) - { - context.Writer.WritePropertyName("description"); - context.Writer.Write(publicRequest.Description); - } - - if(publicRequest.IsSetId()) - { - context.Writer.WritePropertyName("id"); - context.Writer.Write(publicRequest.Id); - } - - if(publicRequest.IsSetSamlOptions()) - { - context.Writer.WritePropertyName("samlOptions"); - context.Writer.WriteObjectStart(); - - var marshaller = SamlConfigOptionsMarshaller.Instance; - marshaller.Marshall(publicRequest.SamlOptions, context); - - context.Writer.WriteObjectEnd(); - } - - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); -======= - else if(!(publicRequest.IsSetClientToken())) - { - context.Writer.WritePropertyName("clientToken"); - context.Writer.Write(Guid.NewGuid().ToString()); - } - if(publicRequest.IsSetConfigVersion()) - { - context.Writer.WritePropertyName("configVersion"); - context.Writer.Write(publicRequest.ConfigVersion); - } - - if(publicRequest.IsSetDescription()) - { - context.Writer.WritePropertyName("description"); - context.Writer.Write(publicRequest.Description); - } - - if(publicRequest.IsSetIamIdentityCenterOptionsUpdates()) - { - context.Writer.WritePropertyName("iamIdentityCenterOptionsUpdates"); - context.Writer.WriteObjectStart(); - - var marshaller = UpdateIamIdentityCenterConfigOptionsMarshaller.Instance; - marshaller.Marshall(publicRequest.IamIdentityCenterOptionsUpdates, context); - - context.Writer.WriteObjectEnd(); - } - - if(publicRequest.IsSetId()) - { - context.Writer.WritePropertyName("id"); - context.Writer.Write(publicRequest.Id); - } - - if(publicRequest.IsSetSamlOptions()) - { - context.Writer.WritePropertyName("samlOptions"); - context.Writer.WriteObjectStart(); - - var marshaller = SamlConfigOptionsMarshaller.Instance; - marshaller.Marshall(publicRequest.SamlOptions, context); - - context.Writer.WriteObjectEnd(); - } - - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b } diff --git a/sdk/src/Services/OpenSearchServerless/OpenSearchServerless.sln b/sdk/src/Services/OpenSearchServerless/OpenSearchServerless.sln index 0306c338b4dc..eae11f47cadd 100644 --- a/sdk/src/Services/OpenSearchServerless/OpenSearchServerless.sln +++ b/sdk/src/Services/OpenSearchServerless/OpenSearchServerless.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {6B71F2BE-C087-4625-B594-6126A2B0866E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {6B71F2BE-C087-4625-B594-6126A2B0866E}.Debug|Any CPU.Build.0 = Debug|Any CPU {6B71F2BE-C087-4625-B594-6126A2B0866E}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {311EA975-2A40-43D9-B05F-1878B115CE21}.Debug|Any CPU.Build.0 = Debug|Any CPU {311EA975-2A40-43D9-B05F-1878B115CE21}.Release|Any CPU.ActiveCfg = Release|Any CPU {311EA975-2A40-43D9-B05F-1878B115CE21}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {3AC6C508-DF63-457E-9739-82B2846FE4ED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3AC6C508-DF63-457E-9739-82B2846FE4ED}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3AC6C508-DF63-457E-9739-82B2846FE4ED}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3AC6C508-DF63-457E-9739-82B2846FE4ED}.Release|Any CPU.Build.0 = Release|Any CPU - {251E7BE1-F811-442A-A6B7-1783CD2F842D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {251E7BE1-F811-442A-A6B7-1783CD2F842D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {251E7BE1-F811-442A-A6B7-1783CD2F842D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {251E7BE1-F811-442A-A6B7-1783CD2F842D}.Release|Any CPU.Build.0 = Release|Any CPU - {17245839-C094-43A2-A384-D8A770347B29}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {17245839-C094-43A2-A384-D8A770347B29}.Debug|Any CPU.Build.0 = Debug|Any CPU - {17245839-C094-43A2-A384-D8A770347B29}.Release|Any CPU.ActiveCfg = Release|Any CPU - {17245839-C094-43A2-A384-D8A770347B29}.Release|Any CPU.Build.0 = Release|Any CPU - {4E48FE93-EB71-4E91-B525-F6FE527898CF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4E48FE93-EB71-4E91-B525-F6FE527898CF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4E48FE93-EB71-4E91-B525-F6FE527898CF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4E48FE93-EB71-4E91-B525-F6FE527898CF}.Release|Any CPU.Build.0 = Release|Any CPU - {CC4B13A5-480B-41FA-A3C5-1F7E1962FF52}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CC4B13A5-480B-41FA-A3C5-1F7E1962FF52}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CC4B13A5-480B-41FA-A3C5-1F7E1962FF52}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CC4B13A5-480B-41FA-A3C5-1F7E1962FF52}.Release|Any CPU.Build.0 = Release|Any CPU - {5F890B2B-6134-4E57-A79E-C1C0D93836E3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5F890B2B-6134-4E57-A79E-C1C0D93836E3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5F890B2B-6134-4E57-A79E-C1C0D93836E3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5F890B2B-6134-4E57-A79E-C1C0D93836E3}.Release|Any CPU.Build.0 = Release|Any CPU - {278EB72E-903C-4009-997A-A5DDF1C7CCDA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {278EB72E-903C-4009-997A-A5DDF1C7CCDA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {278EB72E-903C-4009-997A-A5DDF1C7CCDA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {278EB72E-903C-4009-997A-A5DDF1C7CCDA}.Release|Any CPU.Build.0 = Release|Any CPU - {6100F41C-BB64-4979-A3E7-544DC1777210}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6100F41C-BB64-4979-A3E7-544DC1777210}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6100F41C-BB64-4979-A3E7-544DC1777210}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6100F41C-BB64-4979-A3E7-544DC1777210}.Release|Any CPU.Build.0 = Release|Any CPU - {630A7FD2-B22A-4275-8034-E3CBC2883424}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {630A7FD2-B22A-4275-8034-E3CBC2883424}.Debug|Any CPU.Build.0 = Debug|Any CPU - {630A7FD2-B22A-4275-8034-E3CBC2883424}.Release|Any CPU.ActiveCfg = Release|Any CPU - {630A7FD2-B22A-4275-8034-E3CBC2883424}.Release|Any CPU.Build.0 = Release|Any CPU - {E2E4265B-581F-493C-8F68-9AFE1178949E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E2E4265B-581F-493C-8F68-9AFE1178949E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E2E4265B-581F-493C-8F68-9AFE1178949E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E2E4265B-581F-493C-8F68-9AFE1178949E}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {3AC6C508-DF63-457E-9739-82B2846FE4ED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3AC6C508-DF63-457E-9739-82B2846FE4ED}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3AC6C508-DF63-457E-9739-82B2846FE4ED}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3AC6C508-DF63-457E-9739-82B2846FE4ED}.Release|Any CPU.Build.0 = Release|Any CPU - {251E7BE1-F811-442A-A6B7-1783CD2F842D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {251E7BE1-F811-442A-A6B7-1783CD2F842D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {251E7BE1-F811-442A-A6B7-1783CD2F842D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {251E7BE1-F811-442A-A6B7-1783CD2F842D}.Release|Any CPU.Build.0 = Release|Any CPU - {17245839-C094-43A2-A384-D8A770347B29}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {17245839-C094-43A2-A384-D8A770347B29}.Debug|Any CPU.Build.0 = Debug|Any CPU - {17245839-C094-43A2-A384-D8A770347B29}.Release|Any CPU.ActiveCfg = Release|Any CPU - {17245839-C094-43A2-A384-D8A770347B29}.Release|Any CPU.Build.0 = Release|Any CPU - {4E48FE93-EB71-4E91-B525-F6FE527898CF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4E48FE93-EB71-4E91-B525-F6FE527898CF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4E48FE93-EB71-4E91-B525-F6FE527898CF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4E48FE93-EB71-4E91-B525-F6FE527898CF}.Release|Any CPU.Build.0 = Release|Any CPU - {CC4B13A5-480B-41FA-A3C5-1F7E1962FF52}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CC4B13A5-480B-41FA-A3C5-1F7E1962FF52}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CC4B13A5-480B-41FA-A3C5-1F7E1962FF52}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CC4B13A5-480B-41FA-A3C5-1F7E1962FF52}.Release|Any CPU.Build.0 = Release|Any CPU - {5F890B2B-6134-4E57-A79E-C1C0D93836E3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5F890B2B-6134-4E57-A79E-C1C0D93836E3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5F890B2B-6134-4E57-A79E-C1C0D93836E3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5F890B2B-6134-4E57-A79E-C1C0D93836E3}.Release|Any CPU.Build.0 = Release|Any CPU - {278EB72E-903C-4009-997A-A5DDF1C7CCDA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {278EB72E-903C-4009-997A-A5DDF1C7CCDA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {278EB72E-903C-4009-997A-A5DDF1C7CCDA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {278EB72E-903C-4009-997A-A5DDF1C7CCDA}.Release|Any CPU.Build.0 = Release|Any CPU - {6100F41C-BB64-4979-A3E7-544DC1777210}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6100F41C-BB64-4979-A3E7-544DC1777210}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6100F41C-BB64-4979-A3E7-544DC1777210}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6100F41C-BB64-4979-A3E7-544DC1777210}.Release|Any CPU.Build.0 = Release|Any CPU - {630A7FD2-B22A-4275-8034-E3CBC2883424}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {630A7FD2-B22A-4275-8034-E3CBC2883424}.Debug|Any CPU.Build.0 = Debug|Any CPU - {630A7FD2-B22A-4275-8034-E3CBC2883424}.Release|Any CPU.ActiveCfg = Release|Any CPU - {630A7FD2-B22A-4275-8034-E3CBC2883424}.Release|Any CPU.Build.0 = Release|Any CPU - {E2E4265B-581F-493C-8F68-9AFE1178949E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E2E4265B-581F-493C-8F68-9AFE1178949E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E2E4265B-581F-493C-8F68-9AFE1178949E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E2E4265B-581F-493C-8F68-9AFE1178949E}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {6B71F2BE-C087-4625-B594-6126A2B0866E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {EE3902B9-878E-479B-AE7A-902B324DB90A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {306C61C6-A27B-439A-A47B-AECD9531CFAB} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {4189A289-1EBE-4599-A2E7-27B7CF823F39} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {311EA975-2A40-43D9-B05F-1878B115CE21} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {3AC6C508-DF63-457E-9739-82B2846FE4ED} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {251E7BE1-F811-442A-A6B7-1783CD2F842D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {17245839-C094-43A2-A384-D8A770347B29} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4E48FE93-EB71-4E91-B525-F6FE527898CF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {CC4B13A5-480B-41FA-A3C5-1F7E1962FF52} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {5F890B2B-6134-4E57-A79E-C1C0D93836E3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {278EB72E-903C-4009-997A-A5DDF1C7CCDA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6100F41C-BB64-4979-A3E7-544DC1777210} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {630A7FD2-B22A-4275-8034-E3CBC2883424} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E2E4265B-581F-493C-8F68-9AFE1178949E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {3AC6C508-DF63-457E-9739-82B2846FE4ED} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {251E7BE1-F811-442A-A6B7-1783CD2F842D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {17245839-C094-43A2-A384-D8A770347B29} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4E48FE93-EB71-4E91-B525-F6FE527898CF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {CC4B13A5-480B-41FA-A3C5-1F7E1962FF52} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {5F890B2B-6134-4E57-A79E-C1C0D93836E3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {278EB72E-903C-4009-997A-A5DDF1C7CCDA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6100F41C-BB64-4979-A3E7-544DC1777210} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {630A7FD2-B22A-4275-8034-E3CBC2883424} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E2E4265B-581F-493C-8F68-9AFE1178949E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {596765B6-E13F-46C3-B870-7484034B61FD} diff --git a/sdk/src/Services/OpenSearchServerless/Properties/AssemblyInfo.cs b/sdk/src/Services/OpenSearchServerless/Properties/AssemblyInfo.cs index 492e0f7533cc..420c930e92fd 100644 --- a/sdk/src/Services/OpenSearchServerless/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/OpenSearchServerless/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.17")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.402.10")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/OpenSearchService/Generated/AmazonOpenSearchServiceConfig.cs b/sdk/src/Services/OpenSearchService/Generated/AmazonOpenSearchServiceConfig.cs index 77176a2eb90e..6627502e6c35 100644 --- a/sdk/src/Services/OpenSearchService/Generated/AmazonOpenSearchServiceConfig.cs +++ b/sdk/src/Services/OpenSearchService/Generated/AmazonOpenSearchServiceConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.OpenSearchService public partial class AmazonOpenSearchServiceConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("OpenSearch", "4.0.0.0"); private static readonly AmazonOpenSearchServiceEndpointResolver EndpointResolver = new AmazonOpenSearchServiceEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("OpenSearch", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("OpenSearch", "3.7.403.5"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/OpenSearchService/Generated/Model/ApplicationSummary.cs b/sdk/src/Services/OpenSearchService/Generated/Model/ApplicationSummary.cs index d6a8688be1fb..f2cefca7d5d3 100644 --- a/sdk/src/Services/OpenSearchService/Generated/Model/ApplicationSummary.cs +++ b/sdk/src/Services/OpenSearchService/Generated/Model/ApplicationSummary.cs @@ -64,9 +64,9 @@ internal bool IsSetArn() /// Timestamp at which an OpenSearch Application was created. /// /// - public DateTime CreatedAt + public DateTime? CreatedAt { - get { return this._createdAt.GetValueOrDefault(); } + get { return this._createdAt; } set { this._createdAt = value; } } @@ -118,9 +118,9 @@ internal bool IsSetId() /// Timestamp at which an OpenSearch Application was last updated. /// /// - public DateTime LastUpdatedAt + public DateTime? LastUpdatedAt { - get { return this._lastUpdatedAt.GetValueOrDefault(); } + get { return this._lastUpdatedAt; } set { this._lastUpdatedAt = value; } } diff --git a/sdk/src/Services/OpenSearchService/Generated/Model/CreateApplicationResponse.cs b/sdk/src/Services/OpenSearchService/Generated/Model/CreateApplicationResponse.cs index 6e71e3200620..27f79f82e481 100644 --- a/sdk/src/Services/OpenSearchService/Generated/Model/CreateApplicationResponse.cs +++ b/sdk/src/Services/OpenSearchService/Generated/Model/CreateApplicationResponse.cs @@ -84,9 +84,9 @@ internal bool IsSetArn() /// Timestamp when the OpenSearch Application was created. /// /// - public DateTime CreatedAt + public DateTime? CreatedAt { - get { return this._createdAt.GetValueOrDefault(); } + get { return this._createdAt; } set { this._createdAt = value; } } diff --git a/sdk/src/Services/OpenSearchService/Generated/Model/GetApplicationResponse.cs b/sdk/src/Services/OpenSearchService/Generated/Model/GetApplicationResponse.cs index c8519c814a24..b31b5114f92f 100644 --- a/sdk/src/Services/OpenSearchService/Generated/Model/GetApplicationResponse.cs +++ b/sdk/src/Services/OpenSearchService/Generated/Model/GetApplicationResponse.cs @@ -86,9 +86,9 @@ internal bool IsSetArn() /// Timestamp at which the checked OpenSearch Application was created. /// /// - public DateTime CreatedAt + public DateTime? CreatedAt { - get { return this._createdAt.GetValueOrDefault(); } + get { return this._createdAt; } set { this._createdAt = value; } } @@ -176,9 +176,9 @@ internal bool IsSetId() /// Timestamp at which the checked OpenSearch Application was last updated. /// /// - public DateTime LastUpdatedAt + public DateTime? LastUpdatedAt { - get { return this._lastUpdatedAt.GetValueOrDefault(); } + get { return this._lastUpdatedAt; } set { this._lastUpdatedAt = value; } } diff --git a/sdk/src/Services/OpenSearchService/Generated/Model/IamIdentityCenterOptions.cs b/sdk/src/Services/OpenSearchService/Generated/Model/IamIdentityCenterOptions.cs index ad404730d0f1..f6794e476f6d 100644 --- a/sdk/src/Services/OpenSearchService/Generated/Model/IamIdentityCenterOptions.cs +++ b/sdk/src/Services/OpenSearchService/Generated/Model/IamIdentityCenterOptions.cs @@ -45,9 +45,9 @@ public partial class IamIdentityCenterOptions /// IAM Identity Center is enabled for the OpenSearch Application. /// ///     - public bool Enabled + public bool? Enabled { - get { return this._enabled.GetValueOrDefault(); } + get { return this._enabled; } set { this._enabled = value; } } diff --git a/sdk/src/Services/OpenSearchService/Generated/Model/IamIdentityCenterOptionsInput.cs b/sdk/src/Services/OpenSearchService/Generated/Model/IamIdentityCenterOptionsInput.cs index 31888d89047d..609d2a4af9e1 100644 --- a/sdk/src/Services/OpenSearchService/Generated/Model/IamIdentityCenterOptionsInput.cs +++ b/sdk/src/Services/OpenSearchService/Generated/Model/IamIdentityCenterOptionsInput.cs @@ -44,9 +44,9 @@ public partial class IamIdentityCenterOptionsInput /// Enable/disable settings for IAM Identity Center. /// ///     - public bool Enabled + public bool? Enabled { - get { return this._enabled.GetValueOrDefault(); } + get { return this._enabled; } set { this._enabled = value; } } diff --git a/sdk/src/Services/OpenSearchService/Generated/Model/IdentityCenterOptions.cs b/sdk/src/Services/OpenSearchService/Generated/Model/IdentityCenterOptions.cs index 92a3132b01cc..46dfce7fdcea 100644 --- a/sdk/src/Services/OpenSearchService/Generated/Model/IdentityCenterOptions.cs +++ b/sdk/src/Services/OpenSearchService/Generated/Model/IdentityCenterOptions.cs @@ -47,9 +47,9 @@ public partial class IdentityCenterOptions /// True to enable IAM Identity Center for API access in Amazon OpenSearch Service. ///     ///     - public bool EnabledAPIAccess + public bool? EnabledAPIAccess { - get { return this._enabledAPIAccess.GetValueOrDefault(); } + get { return this._enabledAPIAccess; } set { this._enabledAPIAccess = value; } } diff --git a/sdk/src/Services/OpenSearchService/Generated/Model/IdentityCenterOptionsInput.cs b/sdk/src/Services/OpenSearchService/Generated/Model/IdentityCenterOptionsInput.cs index ba6ec4872a40..a07a6a3100a4 100644 --- a/sdk/src/Services/OpenSearchService/Generated/Model/IdentityCenterOptionsInput.cs +++ b/sdk/src/Services/OpenSearchService/Generated/Model/IdentityCenterOptionsInput.cs @@ -45,9 +45,9 @@ public partial class IdentityCenterOptionsInput /// True to enable IAM Identity Center for API access in Amazon OpenSearch Service. /// ///     - public bool EnabledAPIAccess + public bool? EnabledAPIAccess { - get { return this._enabledAPIAccess.GetValueOrDefault(); } + get { return this._enabledAPIAccess; } set { this._enabledAPIAccess = value; } } diff --git a/sdk/src/Services/OpenSearchService/Generated/Model/Internal/MarshallTransformations/ApplicationSummaryUnmarshaller.cs b/sdk/src/Services/OpenSearchService/Generated/Model/Internal/MarshallTransformations/ApplicationSummaryUnmarshaller.cs index 715455f93d0a..07a7b47002d0 100644 --- a/sdk/src/Services/OpenSearchService/Generated/Model/Internal/MarshallTransformations/ApplicationSummaryUnmarshaller.cs +++ b/sdk/src/Services/OpenSearchService/Generated/Model/Internal/MarshallTransformations/ApplicationSummaryUnmarshaller.cs @@ -74,7 +74,7 @@ public ApplicationSummary Unmarshall(JsonUnmarshallerContext context) } if (context.TestExpression("createdAt", targetDepth)) { - var unmarshaller = DateTimeUnmarshaller.Instance; + var unmarshaller = NullableDateTimeUnmarshaller.Instance; unmarshalledObject.CreatedAt = unmarshaller.Unmarshall(context); continue; } @@ -92,7 +92,7 @@ public ApplicationSummary Unmarshall(JsonUnmarshallerContext context) } if (context.TestExpression("lastUpdatedAt", targetDepth)) { - var unmarshaller = DateTimeUnmarshaller.Instance; + var unmarshaller = NullableDateTimeUnmarshaller.Instance; unmarshalledObject.LastUpdatedAt = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/OpenSearchService/Generated/Model/Internal/MarshallTransformations/AssociatePackageRequestMarshaller.cs b/sdk/src/Services/OpenSearchService/Generated/Model/Internal/MarshallTransformations/AssociatePackageRequestMarshaller.cs index d317bffc2767..bb53c9b1995d 100644 --- a/sdk/src/Services/OpenSearchService/Generated/Model/Internal/MarshallTransformations/AssociatePackageRequestMarshaller.cs +++ b/sdk/src/Services/OpenSearchService/Generated/Model/Internal/MarshallTransformations/AssociatePackageRequestMarshaller.cs @@ -67,37 +67,40 @@ public IRequest Marshall(AssociatePackageRequest publicRequest) throw new AmazonOpenSearchServiceException("Request object does not have required field PackageID set"); request.AddPathResource("{PackageID}", StringUtils.FromString(publicRequest.PackageID)); request.ResourcePath = "/2021-01-01/packages/associate/{PackageID}/{DomainName}"; - using (StringWriter stringWriter = new StringWriter(CultureInfo.InvariantCulture)) + using (MemoryStream memoryStream = new MemoryStream()) { - JsonWriter writer = new JsonWriter(stringWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetAssociationConfiguration()) + using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) { - context.Writer.WritePropertyName("AssociationConfiguration"); - context.Writer.WriteObjectStart(); + JsonWriter writer = new JsonWriter(streamWriter); + writer.Validate = false; + writer.WriteObjectStart(); + var context = new JsonMarshallerContext(request, writer); + if(publicRequest.IsSetAssociationConfiguration()) + { + context.Writer.WritePropertyName("AssociationConfiguration"); + context.Writer.WriteObjectStart(); - var marshaller = PackageAssociationConfigurationMarshaller.Instance; - marshaller.Marshall(publicRequest.AssociationConfiguration, context); + var marshaller = PackageAssociationConfigurationMarshaller.Instance; + marshaller.Marshall(publicRequest.AssociationConfiguration, context); - context.Writer.WriteObjectEnd(); - } + context.Writer.WriteObjectEnd(); + } - if(publicRequest.IsSetPrerequisitePackageIDList()) - { - context.Writer.WritePropertyName("PrerequisitePackageIDList"); - context.Writer.WriteArrayStart(); - foreach(var publicRequestPrerequisitePackageIDListListValue in publicRequest.PrerequisitePackageIDList) + if(publicRequest.IsSetPrerequisitePackageIDList()) { - context.Writer.Write(publicRequestPrerequisitePackageIDListListValue); + context.Writer.WritePropertyName("PrerequisitePackageIDList"); + context.Writer.WriteArrayStart(); + foreach(var publicRequestPrerequisitePackageIDListListValue in publicRequest.PrerequisitePackageIDList) + { + context.Writer.Write(publicRequestPrerequisitePackageIDListListValue); + } + context.Writer.WriteArrayEnd(); } - context.Writer.WriteArrayEnd(); + + writer.WriteObjectEnd(); } - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); + request.Content = memoryStream.ToArray(); } diff --git a/sdk/src/Services/OpenSearchService/Generated/Model/Internal/MarshallTransformations/AssociatePackagesRequestMarshaller.cs b/sdk/src/Services/OpenSearchService/Generated/Model/Internal/MarshallTransformations/AssociatePackagesRequestMarshaller.cs index f66790aa099f..f78eaa7a8ca3 100644 --- a/sdk/src/Services/OpenSearchService/Generated/Model/Internal/MarshallTransformations/AssociatePackagesRequestMarshaller.cs +++ b/sdk/src/Services/OpenSearchService/Generated/Model/Internal/MarshallTransformations/AssociatePackagesRequestMarshaller.cs @@ -61,37 +61,40 @@ public IRequest Marshall(AssociatePackagesRequest publicRequest) request.HttpMethod = "POST"; request.ResourcePath = "/2021-01-01/packages/associateMultiple"; - using (StringWriter stringWriter = new StringWriter(CultureInfo.InvariantCulture)) + using (MemoryStream memoryStream = new MemoryStream()) { - JsonWriter writer = new JsonWriter(stringWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetDomainName()) + using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) { - context.Writer.WritePropertyName("DomainName"); - context.Writer.Write(publicRequest.DomainName); - } + JsonWriter writer = new JsonWriter(streamWriter); + writer.Validate = false; + writer.WriteObjectStart(); + var context = new JsonMarshallerContext(request, writer); + if(publicRequest.IsSetDomainName()) + { + context.Writer.WritePropertyName("DomainName"); + context.Writer.Write(publicRequest.DomainName); + } - if(publicRequest.IsSetPackageList()) - { - context.Writer.WritePropertyName("PackageList"); - context.Writer.WriteArrayStart(); - foreach(var publicRequestPackageListListValue in publicRequest.PackageList) + if(publicRequest.IsSetPackageList()) { - context.Writer.WriteObjectStart(); + context.Writer.WritePropertyName("PackageList"); + context.Writer.WriteArrayStart(); + foreach(var publicRequestPackageListListValue in publicRequest.PackageList) + { + context.Writer.WriteObjectStart(); - var marshaller = PackageDetailsForAssociationMarshaller.Instance; - marshaller.Marshall(publicRequestPackageListListValue, context); + var marshaller = PackageDetailsForAssociationMarshaller.Instance; + marshaller.Marshall(publicRequestPackageListListValue, context); - context.Writer.WriteObjectEnd(); + context.Writer.WriteObjectEnd(); + } + context.Writer.WriteArrayEnd(); } - context.Writer.WriteArrayEnd(); + + writer.WriteObjectEnd(); } - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); + request.Content = memoryStream.ToArray(); } diff --git a/sdk/src/Services/OpenSearchService/Generated/Model/Internal/MarshallTransformations/AuthorizeVpcEndpointAccessRequestMarshaller.cs b/sdk/src/Services/OpenSearchService/Generated/Model/Internal/MarshallTransformations/AuthorizeVpcEndpointAccessRequestMarshaller.cs index df916df00cd2..bdf9a90298b5 100644 --- a/sdk/src/Services/OpenSearchService/Generated/Model/Internal/MarshallTransformations/AuthorizeVpcEndpointAccessRequestMarshaller.cs +++ b/sdk/src/Services/OpenSearchService/Generated/Model/Internal/MarshallTransformations/AuthorizeVpcEndpointAccessRequestMarshaller.cs @@ -78,26 +78,16 @@ public IRequest Marshall(AuthorizeVpcEndpointAccessRequest publicRequest) context.Writer.Write(publicRequest.Account); } + if(publicRequest.IsSetService()) + { + context.Writer.WritePropertyName("Service"); + context.Writer.Write(publicRequest.Service); + } + writer.WriteObjectEnd(); } -<<<<<<< HEAD request.Content = memoryStream.ToArray(); -||||||| Commit version number update changes - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); -======= - if(publicRequest.IsSetService()) - { - context.Writer.WritePropertyName("Service"); - context.Writer.Write(publicRequest.Service); - } - - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b } diff --git a/sdk/src/Services/OpenSearchService/Generated/Model/Internal/MarshallTransformations/CreateApplicationRequestMarshaller.cs b/sdk/src/Services/OpenSearchService/Generated/Model/Internal/MarshallTransformations/CreateApplicationRequestMarshaller.cs index cff430e99763..8671979b4c61 100644 --- a/sdk/src/Services/OpenSearchService/Generated/Model/Internal/MarshallTransformations/CreateApplicationRequestMarshaller.cs +++ b/sdk/src/Services/OpenSearchService/Generated/Model/Internal/MarshallTransformations/CreateApplicationRequestMarshaller.cs @@ -61,91 +61,94 @@ public IRequest Marshall(CreateApplicationRequest publicRequest) request.HttpMethod = "POST"; request.ResourcePath = "/2021-01-01/opensearch/application"; - using (StringWriter stringWriter = new StringWriter(CultureInfo.InvariantCulture)) + using (MemoryStream memoryStream = new MemoryStream()) { - JsonWriter writer = new JsonWriter(stringWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetAppConfigs()) + using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) { - context.Writer.WritePropertyName("appConfigs"); - context.Writer.WriteArrayStart(); - foreach(var publicRequestAppConfigsListValue in publicRequest.AppConfigs) + JsonWriter writer = new JsonWriter(streamWriter); + writer.Validate = false; + writer.WriteObjectStart(); + var context = new JsonMarshallerContext(request, writer); + if(publicRequest.IsSetAppConfigs()) { - context.Writer.WriteObjectStart(); - - var marshaller = AppConfigMarshaller.Instance; - marshaller.Marshall(publicRequestAppConfigsListValue, context); + context.Writer.WritePropertyName("appConfigs"); + context.Writer.WriteArrayStart(); + foreach(var publicRequestAppConfigsListValue in publicRequest.AppConfigs) + { + context.Writer.WriteObjectStart(); + + var marshaller = AppConfigMarshaller.Instance; + marshaller.Marshall(publicRequestAppConfigsListValue, context); + + context.Writer.WriteObjectEnd(); + } + context.Writer.WriteArrayEnd(); + } - context.Writer.WriteObjectEnd(); + if(publicRequest.IsSetClientToken()) + { + context.Writer.WritePropertyName("clientToken"); + context.Writer.Write(publicRequest.ClientToken); } - context.Writer.WriteArrayEnd(); - } - if(publicRequest.IsSetClientToken()) - { - context.Writer.WritePropertyName("clientToken"); - context.Writer.Write(publicRequest.ClientToken); - } + else if(!(publicRequest.IsSetClientToken())) + { + context.Writer.WritePropertyName("clientToken"); + context.Writer.Write(Guid.NewGuid().ToString()); + } + if(publicRequest.IsSetDataSources()) + { + context.Writer.WritePropertyName("dataSources"); + context.Writer.WriteArrayStart(); + foreach(var publicRequestDataSourcesListValue in publicRequest.DataSources) + { + context.Writer.WriteObjectStart(); + + var marshaller = DataSourceMarshaller.Instance; + marshaller.Marshall(publicRequestDataSourcesListValue, context); + + context.Writer.WriteObjectEnd(); + } + context.Writer.WriteArrayEnd(); + } - else if(!(publicRequest.IsSetClientToken())) - { - context.Writer.WritePropertyName("clientToken"); - context.Writer.Write(Guid.NewGuid().ToString()); - } - if(publicRequest.IsSetDataSources()) - { - context.Writer.WritePropertyName("dataSources"); - context.Writer.WriteArrayStart(); - foreach(var publicRequestDataSourcesListValue in publicRequest.DataSources) + if(publicRequest.IsSetIamIdentityCenterOptions()) { + context.Writer.WritePropertyName("iamIdentityCenterOptions"); context.Writer.WriteObjectStart(); - var marshaller = DataSourceMarshaller.Instance; - marshaller.Marshall(publicRequestDataSourcesListValue, context); + var marshaller = IamIdentityCenterOptionsInputMarshaller.Instance; + marshaller.Marshall(publicRequest.IamIdentityCenterOptions, context); context.Writer.WriteObjectEnd(); } - context.Writer.WriteArrayEnd(); - } - if(publicRequest.IsSetIamIdentityCenterOptions()) - { - context.Writer.WritePropertyName("iamIdentityCenterOptions"); - context.Writer.WriteObjectStart(); - - var marshaller = IamIdentityCenterOptionsInputMarshaller.Instance; - marshaller.Marshall(publicRequest.IamIdentityCenterOptions, context); - - context.Writer.WriteObjectEnd(); - } - - if(publicRequest.IsSetName()) - { - context.Writer.WritePropertyName("name"); - context.Writer.Write(publicRequest.Name); - } - - if(publicRequest.IsSetTagList()) - { - context.Writer.WritePropertyName("tagList"); - context.Writer.WriteArrayStart(); - foreach(var publicRequestTagListListValue in publicRequest.TagList) + if(publicRequest.IsSetName()) { - context.Writer.WriteObjectStart(); - - var marshaller = TagMarshaller.Instance; - marshaller.Marshall(publicRequestTagListListValue, context); + context.Writer.WritePropertyName("name"); + context.Writer.Write(publicRequest.Name); + } - context.Writer.WriteObjectEnd(); + if(publicRequest.IsSetTagList()) + { + context.Writer.WritePropertyName("tagList"); + context.Writer.WriteArrayStart(); + foreach(var publicRequestTagListListValue in publicRequest.TagList) + { + context.Writer.WriteObjectStart(); + + var marshaller = TagMarshaller.Instance; + marshaller.Marshall(publicRequestTagListListValue, context); + + context.Writer.WriteObjectEnd(); + } + context.Writer.WriteArrayEnd(); } - context.Writer.WriteArrayEnd(); + + writer.WriteObjectEnd(); } - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); + request.Content = memoryStream.ToArray(); } diff --git a/sdk/src/Services/OpenSearchService/Generated/Model/Internal/MarshallTransformations/CreateApplicationResponseUnmarshaller.cs b/sdk/src/Services/OpenSearchService/Generated/Model/Internal/MarshallTransformations/CreateApplicationResponseUnmarshaller.cs index 90773c0b2ed0..715fdffcbb6e 100644 --- a/sdk/src/Services/OpenSearchService/Generated/Model/Internal/MarshallTransformations/CreateApplicationResponseUnmarshaller.cs +++ b/sdk/src/Services/OpenSearchService/Generated/Model/Internal/MarshallTransformations/CreateApplicationResponseUnmarshaller.cs @@ -66,7 +66,7 @@ public override AmazonWebServiceResponse Unmarshall(JsonUnmarshallerContext cont } if (context.TestExpression("createdAt", targetDepth)) { - var unmarshaller = DateTimeUnmarshaller.Instance; + var unmarshaller = NullableDateTimeUnmarshaller.Instance; response.CreatedAt = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/OpenSearchService/Generated/Model/Internal/MarshallTransformations/CreateDomainRequestMarshaller.cs b/sdk/src/Services/OpenSearchService/Generated/Model/Internal/MarshallTransformations/CreateDomainRequestMarshaller.cs index fa63b3f6daec..56785dad7fcb 100644 --- a/sdk/src/Services/OpenSearchService/Generated/Model/Internal/MarshallTransformations/CreateDomainRequestMarshaller.cs +++ b/sdk/src/Services/OpenSearchService/Generated/Model/Internal/MarshallTransformations/CreateDomainRequestMarshaller.cs @@ -183,36 +183,22 @@ public IRequest Marshall(CreateDomainRequest publicRequest) context.Writer.WriteObjectEnd(); } -<<<<<<< HEAD if(publicRequest.IsSetEngineVersion()) { context.Writer.WritePropertyName("EngineVersion"); context.Writer.Write(publicRequest.EngineVersion); } -||||||| Commit version number update changes - if(publicRequest.IsSetIPAddressType()) - { - context.Writer.WritePropertyName("IPAddressType"); - context.Writer.Write(publicRequest.IPAddressType); - } -======= - if(publicRequest.IsSetIdentityCenterOptions()) - { - context.Writer.WritePropertyName("IdentityCenterOptions"); - context.Writer.WriteObjectStart(); - var marshaller = IdentityCenterOptionsInputMarshaller.Instance; - marshaller.Marshall(publicRequest.IdentityCenterOptions, context); + if(publicRequest.IsSetIdentityCenterOptions()) + { + context.Writer.WritePropertyName("IdentityCenterOptions"); + context.Writer.WriteObjectStart(); - context.Writer.WriteObjectEnd(); - } + var marshaller = IdentityCenterOptionsInputMarshaller.Instance; + marshaller.Marshall(publicRequest.IdentityCenterOptions, context); - if(publicRequest.IsSetIPAddressType()) - { - context.Writer.WritePropertyName("IPAddressType"); - context.Writer.Write(publicRequest.IPAddressType); - } ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b + context.Writer.WriteObjectEnd(); + } if(publicRequest.IsSetIPAddressType()) { diff --git a/sdk/src/Services/OpenSearchService/Generated/Model/Internal/MarshallTransformations/CreatePackageRequestMarshaller.cs b/sdk/src/Services/OpenSearchService/Generated/Model/Internal/MarshallTransformations/CreatePackageRequestMarshaller.cs index 0c2b47bf749e..ae0b136ce0e7 100644 --- a/sdk/src/Services/OpenSearchService/Generated/Model/Internal/MarshallTransformations/CreatePackageRequestMarshaller.cs +++ b/sdk/src/Services/OpenSearchService/Generated/Model/Internal/MarshallTransformations/CreatePackageRequestMarshaller.cs @@ -63,49 +63,46 @@ public IRequest Marshall(CreatePackageRequest publicRequest) request.ResourcePath = "/2021-01-01/packages"; using (MemoryStream memoryStream = new MemoryStream()) { -<<<<<<< HEAD using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) -||||||| Commit version number update changes - JsonWriter writer = new JsonWriter(stringWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetPackageDescription()) -======= - JsonWriter writer = new JsonWriter(stringWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetEngineVersion()) - { - context.Writer.WritePropertyName("EngineVersion"); - context.Writer.Write(publicRequest.EngineVersion); - } - - if(publicRequest.IsSetPackageConfiguration()) - { - context.Writer.WritePropertyName("PackageConfiguration"); - context.Writer.WriteObjectStart(); - - var marshaller = PackageConfigurationMarshaller.Instance; - marshaller.Marshall(publicRequest.PackageConfiguration, context); - - context.Writer.WriteObjectEnd(); - } - - if(publicRequest.IsSetPackageDescription()) ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b { JsonWriter writer = new JsonWriter(streamWriter); writer.Validate = false; writer.WriteObjectStart(); var context = new JsonMarshallerContext(request, writer); + if(publicRequest.IsSetEngineVersion()) + { + context.Writer.WritePropertyName("EngineVersion"); + context.Writer.Write(publicRequest.EngineVersion); + } + + if(publicRequest.IsSetPackageConfiguration()) + { + context.Writer.WritePropertyName("PackageConfiguration"); + context.Writer.WriteObjectStart(); + + var marshaller = PackageConfigurationMarshaller.Instance; + marshaller.Marshall(publicRequest.PackageConfiguration, context); + + context.Writer.WriteObjectEnd(); + } + if(publicRequest.IsSetPackageDescription()) { context.Writer.WritePropertyName("PackageDescription"); context.Writer.Write(publicRequest.PackageDescription); } + if(publicRequest.IsSetPackageEncryptionOptions()) + { + context.Writer.WritePropertyName("PackageEncryptionOptions"); + context.Writer.WriteObjectStart(); + + var marshaller = PackageEncryptionOptionsMarshaller.Instance; + marshaller.Marshall(publicRequest.PackageEncryptionOptions, context); + + context.Writer.WriteObjectEnd(); + } + if(publicRequest.IsSetPackageName()) { context.Writer.WritePropertyName("PackageName"); @@ -129,88 +126,21 @@ public IRequest Marshall(CreatePackageRequest publicRequest) context.Writer.Write(publicRequest.PackageType); } - writer.WriteObjectEnd(); - } - -<<<<<<< HEAD - request.Content = memoryStream.ToArray(); -||||||| Commit version number update changes - if(publicRequest.IsSetPackageName()) - { - context.Writer.WritePropertyName("PackageName"); - context.Writer.Write(publicRequest.PackageName); - } - - if(publicRequest.IsSetPackageSource()) - { - context.Writer.WritePropertyName("PackageSource"); - context.Writer.WriteObjectStart(); - - var marshaller = PackageSourceMarshaller.Instance; - marshaller.Marshall(publicRequest.PackageSource, context); - - context.Writer.WriteObjectEnd(); - } - - if(publicRequest.IsSetPackageType()) - { - context.Writer.WritePropertyName("PackageType"); - context.Writer.Write(publicRequest.PackageType); - } - - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); -======= - if(publicRequest.IsSetPackageEncryptionOptions()) - { - context.Writer.WritePropertyName("PackageEncryptionOptions"); - context.Writer.WriteObjectStart(); - - var marshaller = PackageEncryptionOptionsMarshaller.Instance; - marshaller.Marshall(publicRequest.PackageEncryptionOptions, context); - - context.Writer.WriteObjectEnd(); - } - - if(publicRequest.IsSetPackageName()) - { - context.Writer.WritePropertyName("PackageName"); - context.Writer.Write(publicRequest.PackageName); - } - - if(publicRequest.IsSetPackageSource()) - { - context.Writer.WritePropertyName("PackageSource"); - context.Writer.WriteObjectStart(); - - var marshaller = PackageSourceMarshaller.Instance; - marshaller.Marshall(publicRequest.PackageSource, context); - - context.Writer.WriteObjectEnd(); - } - - if(publicRequest.IsSetPackageType()) - { - context.Writer.WritePropertyName("PackageType"); - context.Writer.Write(publicRequest.PackageType); - } + if(publicRequest.IsSetPackageVendingOptions()) + { + context.Writer.WritePropertyName("PackageVendingOptions"); + context.Writer.WriteObjectStart(); - if(publicRequest.IsSetPackageVendingOptions()) - { - context.Writer.WritePropertyName("PackageVendingOptions"); - context.Writer.WriteObjectStart(); + var marshaller = PackageVendingOptionsMarshaller.Instance; + marshaller.Marshall(publicRequest.PackageVendingOptions, context); - var marshaller = PackageVendingOptionsMarshaller.Instance; - marshaller.Marshall(publicRequest.PackageVendingOptions, context); + context.Writer.WriteObjectEnd(); + } - context.Writer.WriteObjectEnd(); + writer.WriteObjectEnd(); } - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b + request.Content = memoryStream.ToArray(); } diff --git a/sdk/src/Services/OpenSearchService/Generated/Model/Internal/MarshallTransformations/DissociatePackagesRequestMarshaller.cs b/sdk/src/Services/OpenSearchService/Generated/Model/Internal/MarshallTransformations/DissociatePackagesRequestMarshaller.cs index c94e9438664e..51161cc89a7d 100644 --- a/sdk/src/Services/OpenSearchService/Generated/Model/Internal/MarshallTransformations/DissociatePackagesRequestMarshaller.cs +++ b/sdk/src/Services/OpenSearchService/Generated/Model/Internal/MarshallTransformations/DissociatePackagesRequestMarshaller.cs @@ -61,32 +61,35 @@ public IRequest Marshall(DissociatePackagesRequest publicRequest) request.HttpMethod = "POST"; request.ResourcePath = "/2021-01-01/packages/dissociateMultiple"; - using (StringWriter stringWriter = new StringWriter(CultureInfo.InvariantCulture)) + using (MemoryStream memoryStream = new MemoryStream()) { - JsonWriter writer = new JsonWriter(stringWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetDomainName()) + using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) { - context.Writer.WritePropertyName("DomainName"); - context.Writer.Write(publicRequest.DomainName); - } + JsonWriter writer = new JsonWriter(streamWriter); + writer.Validate = false; + writer.WriteObjectStart(); + var context = new JsonMarshallerContext(request, writer); + if(publicRequest.IsSetDomainName()) + { + context.Writer.WritePropertyName("DomainName"); + context.Writer.Write(publicRequest.DomainName); + } - if(publicRequest.IsSetPackageList()) - { - context.Writer.WritePropertyName("PackageList"); - context.Writer.WriteArrayStart(); - foreach(var publicRequestPackageListListValue in publicRequest.PackageList) + if(publicRequest.IsSetPackageList()) { - context.Writer.Write(publicRequestPackageListListValue); + context.Writer.WritePropertyName("PackageList"); + context.Writer.WriteArrayStart(); + foreach(var publicRequestPackageListListValue in publicRequest.PackageList) + { + context.Writer.Write(publicRequestPackageListListValue); + } + context.Writer.WriteArrayEnd(); } - context.Writer.WriteArrayEnd(); + + writer.WriteObjectEnd(); } - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); + request.Content = memoryStream.ToArray(); } diff --git a/sdk/src/Services/OpenSearchService/Generated/Model/Internal/MarshallTransformations/GetApplicationResponseUnmarshaller.cs b/sdk/src/Services/OpenSearchService/Generated/Model/Internal/MarshallTransformations/GetApplicationResponseUnmarshaller.cs index 4c9e5835f1c9..604f00dd2e5e 100644 --- a/sdk/src/Services/OpenSearchService/Generated/Model/Internal/MarshallTransformations/GetApplicationResponseUnmarshaller.cs +++ b/sdk/src/Services/OpenSearchService/Generated/Model/Internal/MarshallTransformations/GetApplicationResponseUnmarshaller.cs @@ -66,7 +66,7 @@ public override AmazonWebServiceResponse Unmarshall(JsonUnmarshallerContext cont } if (context.TestExpression("createdAt", targetDepth)) { - var unmarshaller = DateTimeUnmarshaller.Instance; + var unmarshaller = NullableDateTimeUnmarshaller.Instance; response.CreatedAt = unmarshaller.Unmarshall(context); continue; } @@ -96,7 +96,7 @@ public override AmazonWebServiceResponse Unmarshall(JsonUnmarshallerContext cont } if (context.TestExpression("lastUpdatedAt", targetDepth)) { - var unmarshaller = DateTimeUnmarshaller.Instance; + var unmarshaller = NullableDateTimeUnmarshaller.Instance; response.LastUpdatedAt = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/OpenSearchService/Generated/Model/Internal/MarshallTransformations/IamIdentityCenterOptionsInputMarshaller.cs b/sdk/src/Services/OpenSearchService/Generated/Model/Internal/MarshallTransformations/IamIdentityCenterOptionsInputMarshaller.cs index 25885425b486..b62c78541a8b 100644 --- a/sdk/src/Services/OpenSearchService/Generated/Model/Internal/MarshallTransformations/IamIdentityCenterOptionsInputMarshaller.cs +++ b/sdk/src/Services/OpenSearchService/Generated/Model/Internal/MarshallTransformations/IamIdentityCenterOptionsInputMarshaller.cs @@ -51,7 +51,7 @@ public void Marshall(IamIdentityCenterOptionsInput requestObject, JsonMarshaller if(requestObject.IsSetEnabled()) { context.Writer.WritePropertyName("enabled"); - context.Writer.Write(requestObject.Enabled); + context.Writer.Write(requestObject.Enabled.Value); } if(requestObject.IsSetIamIdentityCenterInstanceArn()) diff --git a/sdk/src/Services/OpenSearchService/Generated/Model/Internal/MarshallTransformations/IamIdentityCenterOptionsUnmarshaller.cs b/sdk/src/Services/OpenSearchService/Generated/Model/Internal/MarshallTransformations/IamIdentityCenterOptionsUnmarshaller.cs index a3207f410565..38a28bd4ec89 100644 --- a/sdk/src/Services/OpenSearchService/Generated/Model/Internal/MarshallTransformations/IamIdentityCenterOptionsUnmarshaller.cs +++ b/sdk/src/Services/OpenSearchService/Generated/Model/Internal/MarshallTransformations/IamIdentityCenterOptionsUnmarshaller.cs @@ -68,7 +68,7 @@ public IamIdentityCenterOptions Unmarshall(JsonUnmarshallerContext context) { if (context.TestExpression("enabled", targetDepth)) { - var unmarshaller = BoolUnmarshaller.Instance; + var unmarshaller = NullableBoolUnmarshaller.Instance; unmarshalledObject.Enabled = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/OpenSearchService/Generated/Model/Internal/MarshallTransformations/IdentityCenterOptionsInputMarshaller.cs b/sdk/src/Services/OpenSearchService/Generated/Model/Internal/MarshallTransformations/IdentityCenterOptionsInputMarshaller.cs index 7cf9d2d1f894..2411468de6bd 100644 --- a/sdk/src/Services/OpenSearchService/Generated/Model/Internal/MarshallTransformations/IdentityCenterOptionsInputMarshaller.cs +++ b/sdk/src/Services/OpenSearchService/Generated/Model/Internal/MarshallTransformations/IdentityCenterOptionsInputMarshaller.cs @@ -51,7 +51,7 @@ public void Marshall(IdentityCenterOptionsInput requestObject, JsonMarshallerCon if(requestObject.IsSetEnabledAPIAccess()) { context.Writer.WritePropertyName("EnabledAPIAccess"); - context.Writer.Write(requestObject.EnabledAPIAccess); + context.Writer.Write(requestObject.EnabledAPIAccess.Value); } if(requestObject.IsSetIdentityCenterInstanceARN()) diff --git a/sdk/src/Services/OpenSearchService/Generated/Model/Internal/MarshallTransformations/IdentityCenterOptionsUnmarshaller.cs b/sdk/src/Services/OpenSearchService/Generated/Model/Internal/MarshallTransformations/IdentityCenterOptionsUnmarshaller.cs index 4c8617968d1d..00ef41cd91bc 100644 --- a/sdk/src/Services/OpenSearchService/Generated/Model/Internal/MarshallTransformations/IdentityCenterOptionsUnmarshaller.cs +++ b/sdk/src/Services/OpenSearchService/Generated/Model/Internal/MarshallTransformations/IdentityCenterOptionsUnmarshaller.cs @@ -68,7 +68,7 @@ public IdentityCenterOptions Unmarshall(JsonUnmarshallerContext context) { if (context.TestExpression("EnabledAPIAccess", targetDepth)) { - var unmarshaller = BoolUnmarshaller.Instance; + var unmarshaller = NullableBoolUnmarshaller.Instance; unmarshalledObject.EnabledAPIAccess = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/OpenSearchService/Generated/Model/Internal/MarshallTransformations/KeyStoreAccessOptionMarshaller.cs b/sdk/src/Services/OpenSearchService/Generated/Model/Internal/MarshallTransformations/KeyStoreAccessOptionMarshaller.cs index ca9c1928236b..c08ab764740d 100644 --- a/sdk/src/Services/OpenSearchService/Generated/Model/Internal/MarshallTransformations/KeyStoreAccessOptionMarshaller.cs +++ b/sdk/src/Services/OpenSearchService/Generated/Model/Internal/MarshallTransformations/KeyStoreAccessOptionMarshaller.cs @@ -57,7 +57,7 @@ public void Marshall(KeyStoreAccessOption requestObject, JsonMarshallerContext c if(requestObject.IsSetKeyStoreAccessEnabled()) { context.Writer.WritePropertyName("KeyStoreAccessEnabled"); - context.Writer.Write(requestObject.KeyStoreAccessEnabled); + context.Writer.Write(requestObject.KeyStoreAccessEnabled.Value); } } diff --git a/sdk/src/Services/OpenSearchService/Generated/Model/Internal/MarshallTransformations/KeyStoreAccessOptionUnmarshaller.cs b/sdk/src/Services/OpenSearchService/Generated/Model/Internal/MarshallTransformations/KeyStoreAccessOptionUnmarshaller.cs index 4acb1ee23f20..07866f5080f3 100644 --- a/sdk/src/Services/OpenSearchService/Generated/Model/Internal/MarshallTransformations/KeyStoreAccessOptionUnmarshaller.cs +++ b/sdk/src/Services/OpenSearchService/Generated/Model/Internal/MarshallTransformations/KeyStoreAccessOptionUnmarshaller.cs @@ -74,7 +74,7 @@ public KeyStoreAccessOption Unmarshall(JsonUnmarshallerContext context) } if (context.TestExpression("KeyStoreAccessEnabled", targetDepth)) { - var unmarshaller = BoolUnmarshaller.Instance; + var unmarshaller = NullableBoolUnmarshaller.Instance; unmarshalledObject.KeyStoreAccessEnabled = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/OpenSearchService/Generated/Model/Internal/MarshallTransformations/NodeConfigMarshaller.cs b/sdk/src/Services/OpenSearchService/Generated/Model/Internal/MarshallTransformations/NodeConfigMarshaller.cs index 4ce926cdd2d9..a4a5fb6863f2 100644 --- a/sdk/src/Services/OpenSearchService/Generated/Model/Internal/MarshallTransformations/NodeConfigMarshaller.cs +++ b/sdk/src/Services/OpenSearchService/Generated/Model/Internal/MarshallTransformations/NodeConfigMarshaller.cs @@ -51,13 +51,13 @@ public void Marshall(NodeConfig requestObject, JsonMarshallerContext context) if(requestObject.IsSetCount()) { context.Writer.WritePropertyName("Count"); - context.Writer.Write(requestObject.Count); + context.Writer.Write(requestObject.Count.Value); } if(requestObject.IsSetEnabled()) { context.Writer.WritePropertyName("Enabled"); - context.Writer.Write(requestObject.Enabled); + context.Writer.Write(requestObject.Enabled.Value); } if(requestObject.IsSetType()) diff --git a/sdk/src/Services/OpenSearchService/Generated/Model/Internal/MarshallTransformations/NodeConfigUnmarshaller.cs b/sdk/src/Services/OpenSearchService/Generated/Model/Internal/MarshallTransformations/NodeConfigUnmarshaller.cs index 35f914c6bf09..ae23ee7b4502 100644 --- a/sdk/src/Services/OpenSearchService/Generated/Model/Internal/MarshallTransformations/NodeConfigUnmarshaller.cs +++ b/sdk/src/Services/OpenSearchService/Generated/Model/Internal/MarshallTransformations/NodeConfigUnmarshaller.cs @@ -68,13 +68,13 @@ public NodeConfig Unmarshall(JsonUnmarshallerContext context) { if (context.TestExpression("Count", targetDepth)) { - var unmarshaller = IntUnmarshaller.Instance; + var unmarshaller = NullableIntUnmarshaller.Instance; unmarshalledObject.Count = unmarshaller.Unmarshall(context); continue; } if (context.TestExpression("Enabled", targetDepth)) { - var unmarshaller = BoolUnmarshaller.Instance; + var unmarshaller = NullableBoolUnmarshaller.Instance; unmarshalledObject.Enabled = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/OpenSearchService/Generated/Model/Internal/MarshallTransformations/PackageConfigurationMarshaller.cs b/sdk/src/Services/OpenSearchService/Generated/Model/Internal/MarshallTransformations/PackageConfigurationMarshaller.cs index d394e5433fed..594f1e963d6e 100644 --- a/sdk/src/Services/OpenSearchService/Generated/Model/Internal/MarshallTransformations/PackageConfigurationMarshaller.cs +++ b/sdk/src/Services/OpenSearchService/Generated/Model/Internal/MarshallTransformations/PackageConfigurationMarshaller.cs @@ -69,7 +69,7 @@ public void Marshall(PackageConfiguration requestObject, JsonMarshallerContext c if(requestObject.IsSetRequiresRestartForConfigurationUpdate()) { context.Writer.WritePropertyName("RequiresRestartForConfigurationUpdate"); - context.Writer.Write(requestObject.RequiresRestartForConfigurationUpdate); + context.Writer.Write(requestObject.RequiresRestartForConfigurationUpdate.Value); } } diff --git a/sdk/src/Services/OpenSearchService/Generated/Model/Internal/MarshallTransformations/PackageConfigurationUnmarshaller.cs b/sdk/src/Services/OpenSearchService/Generated/Model/Internal/MarshallTransformations/PackageConfigurationUnmarshaller.cs index bdbcf28ed585..3c710c2a905c 100644 --- a/sdk/src/Services/OpenSearchService/Generated/Model/Internal/MarshallTransformations/PackageConfigurationUnmarshaller.cs +++ b/sdk/src/Services/OpenSearchService/Generated/Model/Internal/MarshallTransformations/PackageConfigurationUnmarshaller.cs @@ -86,7 +86,7 @@ public PackageConfiguration Unmarshall(JsonUnmarshallerContext context) } if (context.TestExpression("RequiresRestartForConfigurationUpdate", targetDepth)) { - var unmarshaller = BoolUnmarshaller.Instance; + var unmarshaller = NullableBoolUnmarshaller.Instance; unmarshalledObject.RequiresRestartForConfigurationUpdate = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/OpenSearchService/Generated/Model/Internal/MarshallTransformations/PackageEncryptionOptionsMarshaller.cs b/sdk/src/Services/OpenSearchService/Generated/Model/Internal/MarshallTransformations/PackageEncryptionOptionsMarshaller.cs index bef22a175f3b..a7629b36c648 100644 --- a/sdk/src/Services/OpenSearchService/Generated/Model/Internal/MarshallTransformations/PackageEncryptionOptionsMarshaller.cs +++ b/sdk/src/Services/OpenSearchService/Generated/Model/Internal/MarshallTransformations/PackageEncryptionOptionsMarshaller.cs @@ -51,7 +51,7 @@ public void Marshall(PackageEncryptionOptions requestObject, JsonMarshallerConte if(requestObject.IsSetEncryptionEnabled()) { context.Writer.WritePropertyName("EncryptionEnabled"); - context.Writer.Write(requestObject.EncryptionEnabled); + context.Writer.Write(requestObject.EncryptionEnabled.Value); } if(requestObject.IsSetKmsKeyIdentifier()) diff --git a/sdk/src/Services/OpenSearchService/Generated/Model/Internal/MarshallTransformations/PackageEncryptionOptionsUnmarshaller.cs b/sdk/src/Services/OpenSearchService/Generated/Model/Internal/MarshallTransformations/PackageEncryptionOptionsUnmarshaller.cs index 57e3ae1104df..89681381da90 100644 --- a/sdk/src/Services/OpenSearchService/Generated/Model/Internal/MarshallTransformations/PackageEncryptionOptionsUnmarshaller.cs +++ b/sdk/src/Services/OpenSearchService/Generated/Model/Internal/MarshallTransformations/PackageEncryptionOptionsUnmarshaller.cs @@ -68,7 +68,7 @@ public PackageEncryptionOptions Unmarshall(JsonUnmarshallerContext context) { if (context.TestExpression("EncryptionEnabled", targetDepth)) { - var unmarshaller = BoolUnmarshaller.Instance; + var unmarshaller = NullableBoolUnmarshaller.Instance; unmarshalledObject.EncryptionEnabled = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/OpenSearchService/Generated/Model/Internal/MarshallTransformations/PackageVendingOptionsMarshaller.cs b/sdk/src/Services/OpenSearchService/Generated/Model/Internal/MarshallTransformations/PackageVendingOptionsMarshaller.cs index 6cb562c6949d..0ef402c5aaf6 100644 --- a/sdk/src/Services/OpenSearchService/Generated/Model/Internal/MarshallTransformations/PackageVendingOptionsMarshaller.cs +++ b/sdk/src/Services/OpenSearchService/Generated/Model/Internal/MarshallTransformations/PackageVendingOptionsMarshaller.cs @@ -51,7 +51,7 @@ public void Marshall(PackageVendingOptions requestObject, JsonMarshallerContext if(requestObject.IsSetVendingEnabled()) { context.Writer.WritePropertyName("VendingEnabled"); - context.Writer.Write(requestObject.VendingEnabled); + context.Writer.Write(requestObject.VendingEnabled.Value); } } diff --git a/sdk/src/Services/OpenSearchService/Generated/Model/Internal/MarshallTransformations/PackageVendingOptionsUnmarshaller.cs b/sdk/src/Services/OpenSearchService/Generated/Model/Internal/MarshallTransformations/PackageVendingOptionsUnmarshaller.cs index f9db0b97377e..0bccbf640509 100644 --- a/sdk/src/Services/OpenSearchService/Generated/Model/Internal/MarshallTransformations/PackageVendingOptionsUnmarshaller.cs +++ b/sdk/src/Services/OpenSearchService/Generated/Model/Internal/MarshallTransformations/PackageVendingOptionsUnmarshaller.cs @@ -68,7 +68,7 @@ public PackageVendingOptions Unmarshall(JsonUnmarshallerContext context) { if (context.TestExpression("VendingEnabled", targetDepth)) { - var unmarshaller = BoolUnmarshaller.Instance; + var unmarshaller = NullableBoolUnmarshaller.Instance; unmarshalledObject.VendingEnabled = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/OpenSearchService/Generated/Model/Internal/MarshallTransformations/RevokeVpcEndpointAccessRequestMarshaller.cs b/sdk/src/Services/OpenSearchService/Generated/Model/Internal/MarshallTransformations/RevokeVpcEndpointAccessRequestMarshaller.cs index 2ee51cae6627..02ab02ed99d1 100644 --- a/sdk/src/Services/OpenSearchService/Generated/Model/Internal/MarshallTransformations/RevokeVpcEndpointAccessRequestMarshaller.cs +++ b/sdk/src/Services/OpenSearchService/Generated/Model/Internal/MarshallTransformations/RevokeVpcEndpointAccessRequestMarshaller.cs @@ -78,26 +78,16 @@ public IRequest Marshall(RevokeVpcEndpointAccessRequest publicRequest) context.Writer.Write(publicRequest.Account); } + if(publicRequest.IsSetService()) + { + context.Writer.WritePropertyName("Service"); + context.Writer.Write(publicRequest.Service); + } + writer.WriteObjectEnd(); } -<<<<<<< HEAD request.Content = memoryStream.ToArray(); -||||||| Commit version number update changes - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); -======= - if(publicRequest.IsSetService()) - { - context.Writer.WritePropertyName("Service"); - context.Writer.Write(publicRequest.Service); - } - - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b } diff --git a/sdk/src/Services/OpenSearchService/Generated/Model/Internal/MarshallTransformations/UpdateApplicationRequestMarshaller.cs b/sdk/src/Services/OpenSearchService/Generated/Model/Internal/MarshallTransformations/UpdateApplicationRequestMarshaller.cs index eef039c95af1..01b8711257a4 100644 --- a/sdk/src/Services/OpenSearchService/Generated/Model/Internal/MarshallTransformations/UpdateApplicationRequestMarshaller.cs +++ b/sdk/src/Services/OpenSearchService/Generated/Model/Internal/MarshallTransformations/UpdateApplicationRequestMarshaller.cs @@ -64,47 +64,50 @@ public IRequest Marshall(UpdateApplicationRequest publicRequest) throw new AmazonOpenSearchServiceException("Request object does not have required field Id set"); request.AddPathResource("{id}", StringUtils.FromString(publicRequest.Id)); request.ResourcePath = "/2021-01-01/opensearch/application/{id}"; - using (StringWriter stringWriter = new StringWriter(CultureInfo.InvariantCulture)) + using (MemoryStream memoryStream = new MemoryStream()) { - JsonWriter writer = new JsonWriter(stringWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetAppConfigs()) + using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) { - context.Writer.WritePropertyName("appConfigs"); - context.Writer.WriteArrayStart(); - foreach(var publicRequestAppConfigsListValue in publicRequest.AppConfigs) + JsonWriter writer = new JsonWriter(streamWriter); + writer.Validate = false; + writer.WriteObjectStart(); + var context = new JsonMarshallerContext(request, writer); + if(publicRequest.IsSetAppConfigs()) { - context.Writer.WriteObjectStart(); - - var marshaller = AppConfigMarshaller.Instance; - marshaller.Marshall(publicRequestAppConfigsListValue, context); - - context.Writer.WriteObjectEnd(); + context.Writer.WritePropertyName("appConfigs"); + context.Writer.WriteArrayStart(); + foreach(var publicRequestAppConfigsListValue in publicRequest.AppConfigs) + { + context.Writer.WriteObjectStart(); + + var marshaller = AppConfigMarshaller.Instance; + marshaller.Marshall(publicRequestAppConfigsListValue, context); + + context.Writer.WriteObjectEnd(); + } + context.Writer.WriteArrayEnd(); } - context.Writer.WriteArrayEnd(); - } - if(publicRequest.IsSetDataSources()) - { - context.Writer.WritePropertyName("dataSources"); - context.Writer.WriteArrayStart(); - foreach(var publicRequestDataSourcesListValue in publicRequest.DataSources) + if(publicRequest.IsSetDataSources()) { - context.Writer.WriteObjectStart(); - - var marshaller = DataSourceMarshaller.Instance; - marshaller.Marshall(publicRequestDataSourcesListValue, context); - - context.Writer.WriteObjectEnd(); + context.Writer.WritePropertyName("dataSources"); + context.Writer.WriteArrayStart(); + foreach(var publicRequestDataSourcesListValue in publicRequest.DataSources) + { + context.Writer.WriteObjectStart(); + + var marshaller = DataSourceMarshaller.Instance; + marshaller.Marshall(publicRequestDataSourcesListValue, context); + + context.Writer.WriteObjectEnd(); + } + context.Writer.WriteArrayEnd(); } - context.Writer.WriteArrayEnd(); + + writer.WriteObjectEnd(); } - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); + request.Content = memoryStream.ToArray(); } diff --git a/sdk/src/Services/OpenSearchService/Generated/Model/Internal/MarshallTransformations/UpdateApplicationResponseUnmarshaller.cs b/sdk/src/Services/OpenSearchService/Generated/Model/Internal/MarshallTransformations/UpdateApplicationResponseUnmarshaller.cs index 57984720b117..1e78b0226a0c 100644 --- a/sdk/src/Services/OpenSearchService/Generated/Model/Internal/MarshallTransformations/UpdateApplicationResponseUnmarshaller.cs +++ b/sdk/src/Services/OpenSearchService/Generated/Model/Internal/MarshallTransformations/UpdateApplicationResponseUnmarshaller.cs @@ -66,7 +66,7 @@ public override AmazonWebServiceResponse Unmarshall(JsonUnmarshallerContext cont } if (context.TestExpression("createdAt", targetDepth)) { - var unmarshaller = DateTimeUnmarshaller.Instance; + var unmarshaller = NullableDateTimeUnmarshaller.Instance; response.CreatedAt = unmarshaller.Unmarshall(context); continue; } @@ -90,7 +90,7 @@ public override AmazonWebServiceResponse Unmarshall(JsonUnmarshallerContext cont } if (context.TestExpression("lastUpdatedAt", targetDepth)) { - var unmarshaller = DateTimeUnmarshaller.Instance; + var unmarshaller = NullableDateTimeUnmarshaller.Instance; response.LastUpdatedAt = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/OpenSearchService/Generated/Model/Internal/MarshallTransformations/UpdateDomainConfigRequestMarshaller.cs b/sdk/src/Services/OpenSearchService/Generated/Model/Internal/MarshallTransformations/UpdateDomainConfigRequestMarshaller.cs index 2e0d525684bf..f24df06922cf 100644 --- a/sdk/src/Services/OpenSearchService/Generated/Model/Internal/MarshallTransformations/UpdateDomainConfigRequestMarshaller.cs +++ b/sdk/src/Services/OpenSearchService/Generated/Model/Internal/MarshallTransformations/UpdateDomainConfigRequestMarshaller.cs @@ -189,33 +189,19 @@ public IRequest Marshall(UpdateDomainConfigRequest publicRequest) var marshaller = EncryptionAtRestOptionsMarshaller.Instance; marshaller.Marshall(publicRequest.EncryptionAtRestOptions, context); -<<<<<<< HEAD context.Writer.WriteObjectEnd(); } -||||||| Commit version number update changes - if(publicRequest.IsSetIPAddressType()) - { - context.Writer.WritePropertyName("IPAddressType"); - context.Writer.Write(publicRequest.IPAddressType); - } -======= - if(publicRequest.IsSetIdentityCenterOptions()) - { - context.Writer.WritePropertyName("IdentityCenterOptions"); - context.Writer.WriteObjectStart(); - var marshaller = IdentityCenterOptionsInputMarshaller.Instance; - marshaller.Marshall(publicRequest.IdentityCenterOptions, context); + if(publicRequest.IsSetIdentityCenterOptions()) + { + context.Writer.WritePropertyName("IdentityCenterOptions"); + context.Writer.WriteObjectStart(); - context.Writer.WriteObjectEnd(); - } + var marshaller = IdentityCenterOptionsInputMarshaller.Instance; + marshaller.Marshall(publicRequest.IdentityCenterOptions, context); - if(publicRequest.IsSetIPAddressType()) - { - context.Writer.WritePropertyName("IPAddressType"); - context.Writer.Write(publicRequest.IPAddressType); - } ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b + context.Writer.WriteObjectEnd(); + } if(publicRequest.IsSetIPAddressType()) { diff --git a/sdk/src/Services/OpenSearchService/Generated/Model/Internal/MarshallTransformations/UpdatePackageRequestMarshaller.cs b/sdk/src/Services/OpenSearchService/Generated/Model/Internal/MarshallTransformations/UpdatePackageRequestMarshaller.cs index e0e54dd0795d..a2dc580393e9 100644 --- a/sdk/src/Services/OpenSearchService/Generated/Model/Internal/MarshallTransformations/UpdatePackageRequestMarshaller.cs +++ b/sdk/src/Services/OpenSearchService/Generated/Model/Internal/MarshallTransformations/UpdatePackageRequestMarshaller.cs @@ -75,12 +75,34 @@ public IRequest Marshall(UpdatePackageRequest publicRequest) context.Writer.Write(publicRequest.CommitMessage); } + if(publicRequest.IsSetPackageConfiguration()) + { + context.Writer.WritePropertyName("PackageConfiguration"); + context.Writer.WriteObjectStart(); + + var marshaller = PackageConfigurationMarshaller.Instance; + marshaller.Marshall(publicRequest.PackageConfiguration, context); + + context.Writer.WriteObjectEnd(); + } + if(publicRequest.IsSetPackageDescription()) { context.Writer.WritePropertyName("PackageDescription"); context.Writer.Write(publicRequest.PackageDescription); } + if(publicRequest.IsSetPackageEncryptionOptions()) + { + context.Writer.WritePropertyName("PackageEncryptionOptions"); + context.Writer.WriteObjectStart(); + + var marshaller = PackageEncryptionOptionsMarshaller.Instance; + marshaller.Marshall(publicRequest.PackageEncryptionOptions, context); + + context.Writer.WriteObjectEnd(); + } + if(publicRequest.IsSetPackageID()) { context.Writer.WritePropertyName("PackageID"); @@ -101,85 +123,7 @@ public IRequest Marshall(UpdatePackageRequest publicRequest) writer.WriteObjectEnd(); } -<<<<<<< HEAD request.Content = memoryStream.ToArray(); -||||||| Commit version number update changes - if(publicRequest.IsSetPackageDescription()) - { - context.Writer.WritePropertyName("PackageDescription"); - context.Writer.Write(publicRequest.PackageDescription); - } - - if(publicRequest.IsSetPackageID()) - { - context.Writer.WritePropertyName("PackageID"); - context.Writer.Write(publicRequest.PackageID); - } - - if(publicRequest.IsSetPackageSource()) - { - context.Writer.WritePropertyName("PackageSource"); - context.Writer.WriteObjectStart(); - - var marshaller = PackageSourceMarshaller.Instance; - marshaller.Marshall(publicRequest.PackageSource, context); - - context.Writer.WriteObjectEnd(); - } - - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); -======= - if(publicRequest.IsSetPackageConfiguration()) - { - context.Writer.WritePropertyName("PackageConfiguration"); - context.Writer.WriteObjectStart(); - - var marshaller = PackageConfigurationMarshaller.Instance; - marshaller.Marshall(publicRequest.PackageConfiguration, context); - - context.Writer.WriteObjectEnd(); - } - - if(publicRequest.IsSetPackageDescription()) - { - context.Writer.WritePropertyName("PackageDescription"); - context.Writer.Write(publicRequest.PackageDescription); - } - - if(publicRequest.IsSetPackageEncryptionOptions()) - { - context.Writer.WritePropertyName("PackageEncryptionOptions"); - context.Writer.WriteObjectStart(); - - var marshaller = PackageEncryptionOptionsMarshaller.Instance; - marshaller.Marshall(publicRequest.PackageEncryptionOptions, context); - - context.Writer.WriteObjectEnd(); - } - - if(publicRequest.IsSetPackageID()) - { - context.Writer.WritePropertyName("PackageID"); - context.Writer.Write(publicRequest.PackageID); - } - - if(publicRequest.IsSetPackageSource()) - { - context.Writer.WritePropertyName("PackageSource"); - context.Writer.WriteObjectStart(); - - var marshaller = PackageSourceMarshaller.Instance; - marshaller.Marshall(publicRequest.PackageSource, context); - - context.Writer.WriteObjectEnd(); - } - - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b } diff --git a/sdk/src/Services/OpenSearchService/Generated/Model/Internal/MarshallTransformations/UpdatePackageScopeRequestMarshaller.cs b/sdk/src/Services/OpenSearchService/Generated/Model/Internal/MarshallTransformations/UpdatePackageScopeRequestMarshaller.cs index e4545a16caec..2c5813d9ba7b 100644 --- a/sdk/src/Services/OpenSearchService/Generated/Model/Internal/MarshallTransformations/UpdatePackageScopeRequestMarshaller.cs +++ b/sdk/src/Services/OpenSearchService/Generated/Model/Internal/MarshallTransformations/UpdatePackageScopeRequestMarshaller.cs @@ -61,38 +61,41 @@ public IRequest Marshall(UpdatePackageScopeRequest publicRequest) request.HttpMethod = "POST"; request.ResourcePath = "/2021-01-01/packages/updateScope"; - using (StringWriter stringWriter = new StringWriter(CultureInfo.InvariantCulture)) + using (MemoryStream memoryStream = new MemoryStream()) { - JsonWriter writer = new JsonWriter(stringWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetOperation()) + using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) { - context.Writer.WritePropertyName("Operation"); - context.Writer.Write(publicRequest.Operation); - } + JsonWriter writer = new JsonWriter(streamWriter); + writer.Validate = false; + writer.WriteObjectStart(); + var context = new JsonMarshallerContext(request, writer); + if(publicRequest.IsSetOperation()) + { + context.Writer.WritePropertyName("Operation"); + context.Writer.Write(publicRequest.Operation); + } - if(publicRequest.IsSetPackageID()) - { - context.Writer.WritePropertyName("PackageID"); - context.Writer.Write(publicRequest.PackageID); - } + if(publicRequest.IsSetPackageID()) + { + context.Writer.WritePropertyName("PackageID"); + context.Writer.Write(publicRequest.PackageID); + } - if(publicRequest.IsSetPackageUserList()) - { - context.Writer.WritePropertyName("PackageUserList"); - context.Writer.WriteArrayStart(); - foreach(var publicRequestPackageUserListListValue in publicRequest.PackageUserList) + if(publicRequest.IsSetPackageUserList()) { - context.Writer.Write(publicRequestPackageUserListListValue); + context.Writer.WritePropertyName("PackageUserList"); + context.Writer.WriteArrayStart(); + foreach(var publicRequestPackageUserListListValue in publicRequest.PackageUserList) + { + context.Writer.Write(publicRequestPackageUserListListValue); + } + context.Writer.WriteArrayEnd(); } - context.Writer.WriteArrayEnd(); + + writer.WriteObjectEnd(); } - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); + request.Content = memoryStream.ToArray(); } diff --git a/sdk/src/Services/OpenSearchService/Generated/Model/KeyStoreAccessOption.cs b/sdk/src/Services/OpenSearchService/Generated/Model/KeyStoreAccessOption.cs index 970b558d4bb9..0b525f9c678b 100644 --- a/sdk/src/Services/OpenSearchService/Generated/Model/KeyStoreAccessOption.cs +++ b/sdk/src/Services/OpenSearchService/Generated/Model/KeyStoreAccessOption.cs @@ -63,9 +63,9 @@ internal bool IsSetKeyAccessRoleArn() /// ///     [AWSProperty(Required=true)] - public bool KeyStoreAccessEnabled + public bool? KeyStoreAccessEnabled { - get { return this._keyStoreAccessEnabled.GetValueOrDefault(); } + get { return this._keyStoreAccessEnabled; } set { this._keyStoreAccessEnabled = value; } } diff --git a/sdk/src/Services/OpenSearchService/Generated/Model/ListApplicationsRequest.cs b/sdk/src/Services/OpenSearchService/Generated/Model/ListApplicationsRequest.cs index d0875f1be411..b872dd79c928 100644 --- a/sdk/src/Services/OpenSearchService/Generated/Model/ListApplicationsRequest.cs +++ b/sdk/src/Services/OpenSearchService/Generated/Model/ListApplicationsRequest.cs @@ -43,9 +43,9 @@ public partial class ListApplicationsRequest : AmazonOpenSearchServiceRequest /// Gets and sets the property MaxResults. ///     [AWSProperty(Max=100)] - public int MaxResults + public int? MaxResults { - get { return this._maxResults.GetValueOrDefault(); } + get { return this._maxResults; } set { this._maxResults = value; } } diff --git a/sdk/src/Services/OpenSearchService/Generated/Model/NodeConfig.cs b/sdk/src/Services/OpenSearchService/Generated/Model/NodeConfig.cs index 3c5fad38ecf7..67726b9b5101 100644 --- a/sdk/src/Services/OpenSearchService/Generated/Model/NodeConfig.cs +++ b/sdk/src/Services/OpenSearchService/Generated/Model/NodeConfig.cs @@ -44,9 +44,9 @@ public partial class NodeConfig /// The number of nodes of a particular node type in the cluster. /// ///     - public int Count + public int? Count { - get { return this._count.GetValueOrDefault(); } + get { return this._count; } set { this._count = value; } } @@ -62,9 +62,9 @@ internal bool IsSetCount() /// A boolean that indicates whether a particular node type is enabled or not. /// ///     - public bool Enabled + public bool? Enabled { - get { return this._enabled.GetValueOrDefault(); } + get { return this._enabled; } set { this._enabled = value; } } diff --git a/sdk/src/Services/OpenSearchService/Generated/Model/PackageConfiguration.cs b/sdk/src/Services/OpenSearchService/Generated/Model/PackageConfiguration.cs index a600f5bafaec..2149a472d7cf 100644 --- a/sdk/src/Services/OpenSearchService/Generated/Model/PackageConfiguration.cs +++ b/sdk/src/Services/OpenSearchService/Generated/Model/PackageConfiguration.cs @@ -103,9 +103,9 @@ internal bool IsSetLicenseRequirement() /// that the plugin is prerequisite for. /// ///     - public bool RequiresRestartForConfigurationUpdate + public bool? RequiresRestartForConfigurationUpdate { - get { return this._requiresRestartForConfigurationUpdate.GetValueOrDefault(); } + get { return this._requiresRestartForConfigurationUpdate; } set { this._requiresRestartForConfigurationUpdate = value; } } diff --git a/sdk/src/Services/OpenSearchService/Generated/Model/PackageEncryptionOptions.cs b/sdk/src/Services/OpenSearchService/Generated/Model/PackageEncryptionOptions.cs index c6ee20ba1cdc..19b54feee196 100644 --- a/sdk/src/Services/OpenSearchService/Generated/Model/PackageEncryptionOptions.cs +++ b/sdk/src/Services/OpenSearchService/Generated/Model/PackageEncryptionOptions.cs @@ -44,9 +44,9 @@ public partial class PackageEncryptionOptions ///     ///     [AWSProperty(Required=true)] - public bool EncryptionEnabled + public bool? EncryptionEnabled { - get { return this._encryptionEnabled.GetValueOrDefault(); } + get { return this._encryptionEnabled; } set { this._encryptionEnabled = value; } } diff --git a/sdk/src/Services/OpenSearchService/Generated/Model/PackageVendingOptions.cs b/sdk/src/Services/OpenSearchService/Generated/Model/PackageVendingOptions.cs index d5368ee4c088..6dbde92f6301 100644 --- a/sdk/src/Services/OpenSearchService/Generated/Model/PackageVendingOptions.cs +++ b/sdk/src/Services/OpenSearchService/Generated/Model/PackageVendingOptions.cs @@ -45,9 +45,9 @@ public partial class PackageVendingOptions /// ///     [AWSProperty(Required=true)] - public bool VendingEnabled + public bool? VendingEnabled { - get { return this._vendingEnabled.GetValueOrDefault(); } + get { return this._vendingEnabled; } set { this._vendingEnabled = value; } } diff --git a/sdk/src/Services/OpenSearchService/Generated/Model/UpdateApplicationResponse.cs b/sdk/src/Services/OpenSearchService/Generated/Model/UpdateApplicationResponse.cs index 3c30992c465b..e40fd4aa4dcf 100644 --- a/sdk/src/Services/OpenSearchService/Generated/Model/UpdateApplicationResponse.cs +++ b/sdk/src/Services/OpenSearchService/Generated/Model/UpdateApplicationResponse.cs @@ -84,9 +84,9 @@ internal bool IsSetArn() /// Timestamp at which the OpenSearch Application was created. /// ///     - public DateTime CreatedAt + public DateTime? CreatedAt { - get { return this._createdAt.GetValueOrDefault(); } + get { return this._createdAt; } set { this._createdAt = value; } } @@ -156,9 +156,9 @@ internal bool IsSetId() /// Timestamp at which the OpenSearch Application was last updated. /// ///     - public DateTime LastUpdatedAt + public DateTime? LastUpdatedAt { - get { return this._lastUpdatedAt.GetValueOrDefault(); } + get { return this._lastUpdatedAt; } set { this._lastUpdatedAt = value; } } diff --git a/sdk/src/Services/OpenSearchService/Generated/Model/_bcl45+netstandard/IListApplicationsPaginator.cs b/sdk/src/Services/OpenSearchService/Generated/Model/_bcl+netstandard/IListApplicationsPaginator.cs similarity index 100% rename from sdk/src/Services/OpenSearchService/Generated/Model/_bcl45+netstandard/IListApplicationsPaginator.cs rename to sdk/src/Services/OpenSearchService/Generated/Model/_bcl+netstandard/IListApplicationsPaginator.cs diff --git a/sdk/src/Services/OpenSearchService/Generated/Model/_bcl45+netstandard/ListApplicationsPaginator.cs b/sdk/src/Services/OpenSearchService/Generated/Model/_bcl+netstandard/ListApplicationsPaginator.cs similarity index 100% rename from sdk/src/Services/OpenSearchService/Generated/Model/_bcl45+netstandard/ListApplicationsPaginator.cs rename to sdk/src/Services/OpenSearchService/Generated/Model/_bcl+netstandard/ListApplicationsPaginator.cs diff --git a/sdk/src/Services/OpenSearchService/Generated/_bcl/AmazonOpenSearchServiceClient.cs b/sdk/src/Services/OpenSearchService/Generated/_bcl/AmazonOpenSearchServiceClient.cs index 854237075dee..62eb968564df 100644 --- a/sdk/src/Services/OpenSearchService/Generated/_bcl/AmazonOpenSearchServiceClient.cs +++ b/sdk/src/Services/OpenSearchService/Generated/_bcl/AmazonOpenSearchServiceClient.cs @@ -573,6 +573,87 @@ public virtual AssociatePackageResponse AssociatePackage(AssociatePackageRequest #endregion + #region AssociatePackages + + + /// + /// Operation in the Amazon OpenSearch Service API for associating multiple packages with + /// a domain simultaneously. + /// + /// Container for the necessary parameters to execute the AssociatePackages service method. + /// + /// The response from the AssociatePackages service method, as returned by OpenSearchService. + /// + /// An error occurred while processing the request. + /// + /// + /// An error occurred because the client attempts to remove a resource that is currently + /// in use. + /// + /// + /// An error occured because the client wanted to access an unsupported operation. + /// + /// + /// Request processing failed because of an unknown error, exception, or internal failure. + /// + /// + /// An exception for accessing or deleting a resource that doesn't exist. + /// + /// + /// An exception for accessing or deleting a resource that doesn't exist. + /// + /// REST API Reference for AssociatePackages Operation + public virtual AssociatePackagesResponse AssociatePackages(AssociatePackagesRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = AssociatePackagesRequestMarshaller.Instance; + options.ResponseUnmarshaller = AssociatePackagesResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// Operation in the Amazon OpenSearch Service API for associating multiple packages with + /// a domain simultaneously. + /// + /// Container for the necessary parameters to execute the AssociatePackages service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the AssociatePackages service method, as returned by OpenSearchService. + /// + /// An error occurred while processing the request. + /// + /// + /// An error occurred because the client attempts to remove a resource that is currently + /// in use. + /// + /// + /// An error occured because the client wanted to access an unsupported operation. + /// + /// + /// Request processing failed because of an unknown error, exception, or internal failure. + /// + /// + /// An exception for accessing or deleting a resource that doesn't exist. + /// + /// + /// An exception for accessing or deleting a resource that doesn't exist. + /// + /// REST API Reference for AssociatePackages Operation + public virtual Task AssociatePackagesAsync(AssociatePackagesRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = AssociatePackagesRequestMarshaller.Instance; + options.ResponseUnmarshaller = AssociatePackagesResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + #region AuthorizeVpcEndpointAccess @@ -796,6 +877,85 @@ public virtual CancelServiceSoftwareUpdateResponse CancelServiceSoftwareUpdate(C #endregion + #region CreateApplication + + + /// + /// Creates an OpenSearch Application. + /// + /// Container for the necessary parameters to execute the CreateApplication service method. + /// + /// The response from the CreateApplication service method, as returned by OpenSearchService. + /// + /// An error occurred because you don't have permissions to access the resource. + /// + /// + /// An error occurred while processing the request. + /// + /// + /// An error occurred because the client attempts to remove a resource that is currently + /// in use. + /// + /// + /// An error occured because the client wanted to access an unsupported operation. + /// + /// + /// Request processing failed because of an unknown error, exception, or internal failure. + /// + /// + /// An exception for accessing or deleting a resource that doesn't exist. + /// + /// REST API Reference for CreateApplication Operation + public virtual CreateApplicationResponse CreateApplication(CreateApplicationRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = CreateApplicationRequestMarshaller.Instance; + options.ResponseUnmarshaller = CreateApplicationResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// Creates an OpenSearch Application. + /// + /// Container for the necessary parameters to execute the CreateApplication service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the CreateApplication service method, as returned by OpenSearchService. + /// + /// An error occurred because you don't have permissions to access the resource. + /// + /// + /// An error occurred while processing the request. + /// + /// + /// An error occurred because the client attempts to remove a resource that is currently + /// in use. + /// + /// + /// An error occured because the client wanted to access an unsupported operation. + /// + /// + /// Request processing failed because of an unknown error, exception, or internal failure. + /// + /// + /// An exception for accessing or deleting a resource that doesn't exist. + /// + /// REST API Reference for CreateApplication Operation + public virtual Task CreateApplicationAsync(CreateApplicationRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = CreateApplicationRequestMarshaller.Instance; + options.ResponseUnmarshaller = CreateApplicationResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + #region CreateDomain @@ -1120,6 +1280,91 @@ public virtual CreateVpcEndpointResponse CreateVpcEndpoint(CreateVpcEndpointRequ #endregion + #region DeleteApplication + + + /// + /// Deletes an existing OpenSearch Application. + /// + /// Container for the necessary parameters to execute the DeleteApplication service method. + /// + /// The response from the DeleteApplication service method, as returned by OpenSearchService. + /// + /// An error occurred because you don't have permissions to access the resource. + /// + /// + /// An error occurred while processing the request. + /// + /// + /// An error occurred because the client attempts to remove a resource that is currently + /// in use. + /// + /// + /// An error occured because the client wanted to access an unsupported operation. + /// + /// + /// Request processing failed because of an unknown error, exception, or internal failure. + /// + /// + /// An exception for accessing or deleting a resource that doesn't exist. + /// + /// + /// An exception for accessing or deleting a resource that doesn't exist. + /// + /// REST API Reference for DeleteApplication Operation + public virtual DeleteApplicationResponse DeleteApplication(DeleteApplicationRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = DeleteApplicationRequestMarshaller.Instance; + options.ResponseUnmarshaller = DeleteApplicationResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// Deletes an existing OpenSearch Application. + /// + /// Container for the necessary parameters to execute the DeleteApplication service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the DeleteApplication service method, as returned by OpenSearchService. + /// + /// An error occurred because you don't have permissions to access the resource. + /// + /// + /// An error occurred while processing the request. + /// + /// + /// An error occurred because the client attempts to remove a resource that is currently + /// in use. + /// + /// + /// An error occured because the client wanted to access an unsupported operation. + /// + /// + /// Request processing failed because of an unknown error, exception, or internal failure. + /// + /// + /// An exception for accessing or deleting a resource that doesn't exist. + /// + /// + /// An exception for accessing or deleting a resource that doesn't exist. + /// + /// REST API Reference for DeleteApplication Operation + public virtual Task DeleteApplicationAsync(DeleteApplicationRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = DeleteApplicationRequestMarshaller.Instance; + options.ResponseUnmarshaller = DeleteApplicationResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + #region DeleteDataSource @@ -2648,6 +2893,162 @@ public virtual DissociatePackageResponse DissociatePackage(DissociatePackageRequ #endregion + #region DissociatePackages + + + /// + /// Dissociates multiple packages from a domain simulatneously. + /// + /// Container for the necessary parameters to execute the DissociatePackages service method. + /// + /// The response from the DissociatePackages service method, as returned by OpenSearchService. + /// + /// An error occurred while processing the request. + /// + /// + /// An error occurred because the client attempts to remove a resource that is currently + /// in use. + /// + /// + /// An error occured because the client wanted to access an unsupported operation. + /// + /// + /// Request processing failed because of an unknown error, exception, or internal failure. + /// + /// + /// An exception for accessing or deleting a resource that doesn't exist. + /// + /// + /// An exception for accessing or deleting a resource that doesn't exist. + /// + /// REST API Reference for DissociatePackages Operation + public virtual DissociatePackagesResponse DissociatePackages(DissociatePackagesRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = DissociatePackagesRequestMarshaller.Instance; + options.ResponseUnmarshaller = DissociatePackagesResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// Dissociates multiple packages from a domain simulatneously. + /// + /// Container for the necessary parameters to execute the DissociatePackages service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the DissociatePackages service method, as returned by OpenSearchService. + /// + /// An error occurred while processing the request. + /// + /// + /// An error occurred because the client attempts to remove a resource that is currently + /// in use. + /// + /// + /// An error occured because the client wanted to access an unsupported operation. + /// + /// + /// Request processing failed because of an unknown error, exception, or internal failure. + /// + /// + /// An exception for accessing or deleting a resource that doesn't exist. + /// + /// + /// An exception for accessing or deleting a resource that doesn't exist. + /// + /// REST API Reference for DissociatePackages Operation + public virtual Task DissociatePackagesAsync(DissociatePackagesRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = DissociatePackagesRequestMarshaller.Instance; + options.ResponseUnmarshaller = DissociatePackagesResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + + #region GetApplication + + + /// + /// Check the configuration and status of an existing OpenSearch Application. + /// + /// Container for the necessary parameters to execute the GetApplication service method. + /// + /// The response from the GetApplication service method, as returned by OpenSearchService. + /// + /// An error occurred because you don't have permissions to access the resource. + /// + /// + /// An error occurred while processing the request. + /// + /// + /// An error occured because the client wanted to access an unsupported operation. + /// + /// + /// Request processing failed because of an unknown error, exception, or internal failure. + /// + /// + /// An exception for accessing or deleting a resource that doesn't exist. + /// + /// + /// An exception for accessing or deleting a resource that doesn't exist. + /// + /// REST API Reference for GetApplication Operation + public virtual GetApplicationResponse GetApplication(GetApplicationRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = GetApplicationRequestMarshaller.Instance; + options.ResponseUnmarshaller = GetApplicationResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// Check the configuration and status of an existing OpenSearch Application. + /// + /// Container for the necessary parameters to execute the GetApplication service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the GetApplication service method, as returned by OpenSearchService. + /// + /// An error occurred because you don't have permissions to access the resource. + /// + /// + /// An error occurred while processing the request. + /// + /// + /// An error occured because the client wanted to access an unsupported operation. + /// + /// + /// Request processing failed because of an unknown error, exception, or internal failure. + /// + /// + /// An exception for accessing or deleting a resource that doesn't exist. + /// + /// + /// An exception for accessing or deleting a resource that doesn't exist. + /// + /// REST API Reference for GetApplication Operation + public virtual Task GetApplicationAsync(GetApplicationRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = GetApplicationRequestMarshaller.Instance; + options.ResponseUnmarshaller = GetApplicationResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + #region GetCompatibleVersions @@ -3094,6 +3495,83 @@ public virtual GetUpgradeStatusResponse GetUpgradeStatus(GetUpgradeStatusRequest #endregion + #region ListApplications + + + /// + /// List all OpenSearch Applications under your account. + /// + /// Container for the necessary parameters to execute the ListApplications service method. + /// + /// The response from the ListApplications service method, as returned by OpenSearchService. + /// + /// An error occurred because you don't have permissions to access the resource. + /// + /// + /// An error occurred while processing the request. + /// + /// + /// An error occured because the client wanted to access an unsupported operation. + /// + /// + /// Request processing failed because of an unknown error, exception, or internal failure. + /// + /// + /// An exception for accessing or deleting a resource that doesn't exist. + /// + /// + /// An exception for accessing or deleting a resource that doesn't exist. + /// + /// REST API Reference for ListApplications Operation + public virtual ListApplicationsResponse ListApplications(ListApplicationsRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = ListApplicationsRequestMarshaller.Instance; + options.ResponseUnmarshaller = ListApplicationsResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// List all OpenSearch Applications under your account. + /// + /// Container for the necessary parameters to execute the ListApplications service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the ListApplications service method, as returned by OpenSearchService. + /// + /// An error occurred because you don't have permissions to access the resource. + /// + /// + /// An error occurred while processing the request. + /// + /// + /// An error occured because the client wanted to access an unsupported operation. + /// + /// + /// Request processing failed because of an unknown error, exception, or internal failure. + /// + /// + /// An exception for accessing or deleting a resource that doesn't exist. + /// + /// + /// An exception for accessing or deleting a resource that doesn't exist. + /// + /// REST API Reference for ListApplications Operation + public virtual Task ListApplicationsAsync(ListApplicationsRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = ListApplicationsRequestMarshaller.Instance; + options.ResponseUnmarshaller = ListApplicationsResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + #region ListDataSources @@ -4342,6 +4820,91 @@ public virtual StartServiceSoftwareUpdateResponse StartServiceSoftwareUpdate(Sta #endregion + #region UpdateApplication + + + /// + /// Update the OpenSearch Application. + /// + /// Container for the necessary parameters to execute the UpdateApplication service method. + /// + /// The response from the UpdateApplication service method, as returned by OpenSearchService. + /// + /// An error occurred because you don't have permissions to access the resource. + /// + /// + /// An error occurred while processing the request. + /// + /// + /// An error occurred because the client attempts to remove a resource that is currently + /// in use. + /// + /// + /// An error occured because the client wanted to access an unsupported operation. + /// + /// + /// Request processing failed because of an unknown error, exception, or internal failure. + /// + /// + /// An exception for accessing or deleting a resource that doesn't exist. + /// + /// + /// An exception for accessing or deleting a resource that doesn't exist. + /// + /// REST API Reference for UpdateApplication Operation + public virtual UpdateApplicationResponse UpdateApplication(UpdateApplicationRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = UpdateApplicationRequestMarshaller.Instance; + options.ResponseUnmarshaller = UpdateApplicationResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// Update the OpenSearch Application. + /// + /// Container for the necessary parameters to execute the UpdateApplication service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the UpdateApplication service method, as returned by OpenSearchService. + /// + /// An error occurred because you don't have permissions to access the resource. + /// + /// + /// An error occurred while processing the request. + /// + /// + /// An error occurred because the client attempts to remove a resource that is currently + /// in use. + /// + /// + /// An error occured because the client wanted to access an unsupported operation. + /// + /// + /// Request processing failed because of an unknown error, exception, or internal failure. + /// + /// + /// An exception for accessing or deleting a resource that doesn't exist. + /// + /// + /// An exception for accessing or deleting a resource that doesn't exist. + /// + /// REST API Reference for UpdateApplication Operation + public virtual Task UpdateApplicationAsync(UpdateApplicationRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = UpdateApplicationRequestMarshaller.Instance; + options.ResponseUnmarshaller = UpdateApplicationResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + #region UpdateDataSource @@ -4583,6 +5146,79 @@ public virtual UpdatePackageResponse UpdatePackage(UpdatePackageRequest request) #endregion + #region UpdatePackageScope + + + /// + /// Updates the scope of a package. Scope of the package defines users who can view and + /// associate a package. + /// + /// Container for the necessary parameters to execute the UpdatePackageScope service method. + /// + /// The response from the UpdatePackageScope service method, as returned by OpenSearchService. + /// + /// An error occurred while processing the request. + /// + /// + /// An error occured because the client wanted to access an unsupported operation. + /// + /// + /// Request processing failed because of an unknown error, exception, or internal failure. + /// + /// + /// An exception for accessing or deleting a resource that doesn't exist. + /// + /// + /// An exception for accessing or deleting a resource that doesn't exist. + /// + /// REST API Reference for UpdatePackageScope Operation + public virtual UpdatePackageScopeResponse UpdatePackageScope(UpdatePackageScopeRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = UpdatePackageScopeRequestMarshaller.Instance; + options.ResponseUnmarshaller = UpdatePackageScopeResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// Updates the scope of a package. Scope of the package defines users who can view and + /// associate a package. + /// + /// Container for the necessary parameters to execute the UpdatePackageScope service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the UpdatePackageScope service method, as returned by OpenSearchService. + /// + /// An error occurred while processing the request. + /// + /// + /// An error occured because the client wanted to access an unsupported operation. + /// + /// + /// Request processing failed because of an unknown error, exception, or internal failure. + /// + /// + /// An exception for accessing or deleting a resource that doesn't exist. + /// + /// + /// An exception for accessing or deleting a resource that doesn't exist. + /// + /// REST API Reference for UpdatePackageScope Operation + public virtual Task UpdatePackageScopeAsync(UpdatePackageScopeRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = UpdatePackageScopeRequestMarshaller.Instance; + options.ResponseUnmarshaller = UpdatePackageScopeResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + #region UpdateScheduledAction diff --git a/sdk/src/Services/OpenSearchService/OpenSearchService.sln b/sdk/src/Services/OpenSearchService/OpenSearchService.sln index 07155c90d773..de2b56f87684 100644 --- a/sdk/src/Services/OpenSearchService/OpenSearchService.sln +++ b/sdk/src/Services/OpenSearchService/OpenSearchService.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {6ADD38A0-82F7-420F-A1C1-8705BD28A36B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {6ADD38A0-82F7-420F-A1C1-8705BD28A36B}.Debug|Any CPU.Build.0 = Debug|Any CPU {6ADD38A0-82F7-420F-A1C1-8705BD28A36B}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {022B85CC-8EBE-40DC-BB17-4E8B6C932497}.Debug|Any CPU.Build.0 = Debug|Any CPU {022B85CC-8EBE-40DC-BB17-4E8B6C932497}.Release|Any CPU.ActiveCfg = Release|Any CPU {022B85CC-8EBE-40DC-BB17-4E8B6C932497}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {21DE36D1-4ADA-401C-BE39-FDC0B23FD8C9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {21DE36D1-4ADA-401C-BE39-FDC0B23FD8C9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {21DE36D1-4ADA-401C-BE39-FDC0B23FD8C9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {21DE36D1-4ADA-401C-BE39-FDC0B23FD8C9}.Release|Any CPU.Build.0 = Release|Any CPU - {53CD9298-95A8-4375-A6F0-02C1D0DD161C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {53CD9298-95A8-4375-A6F0-02C1D0DD161C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {53CD9298-95A8-4375-A6F0-02C1D0DD161C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {53CD9298-95A8-4375-A6F0-02C1D0DD161C}.Release|Any CPU.Build.0 = Release|Any CPU - {DA534A0E-FF96-44E6-8C28-628607BB26D1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DA534A0E-FF96-44E6-8C28-628607BB26D1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DA534A0E-FF96-44E6-8C28-628607BB26D1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DA534A0E-FF96-44E6-8C28-628607BB26D1}.Release|Any CPU.Build.0 = Release|Any CPU - {76911658-2996-41E8-A55B-362F667ED6AB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {76911658-2996-41E8-A55B-362F667ED6AB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {76911658-2996-41E8-A55B-362F667ED6AB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {76911658-2996-41E8-A55B-362F667ED6AB}.Release|Any CPU.Build.0 = Release|Any CPU - {D0FD89A1-FE31-476C-839B-772537E5A6C2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D0FD89A1-FE31-476C-839B-772537E5A6C2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D0FD89A1-FE31-476C-839B-772537E5A6C2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D0FD89A1-FE31-476C-839B-772537E5A6C2}.Release|Any CPU.Build.0 = Release|Any CPU - {89AFC1D0-EBCC-4492-998C-9159CDF9978D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {89AFC1D0-EBCC-4492-998C-9159CDF9978D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {89AFC1D0-EBCC-4492-998C-9159CDF9978D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {89AFC1D0-EBCC-4492-998C-9159CDF9978D}.Release|Any CPU.Build.0 = Release|Any CPU - {0A9003C7-1A4D-4422-BE65-7E53903E2BCF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0A9003C7-1A4D-4422-BE65-7E53903E2BCF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0A9003C7-1A4D-4422-BE65-7E53903E2BCF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0A9003C7-1A4D-4422-BE65-7E53903E2BCF}.Release|Any CPU.Build.0 = Release|Any CPU - {77CFB59B-12D3-4757-9D3D-8F3A3026CD36}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {77CFB59B-12D3-4757-9D3D-8F3A3026CD36}.Debug|Any CPU.Build.0 = Debug|Any CPU - {77CFB59B-12D3-4757-9D3D-8F3A3026CD36}.Release|Any CPU.ActiveCfg = Release|Any CPU - {77CFB59B-12D3-4757-9D3D-8F3A3026CD36}.Release|Any CPU.Build.0 = Release|Any CPU - {E027727B-B7BD-4155-99CB-448F9C83E2DE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E027727B-B7BD-4155-99CB-448F9C83E2DE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E027727B-B7BD-4155-99CB-448F9C83E2DE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E027727B-B7BD-4155-99CB-448F9C83E2DE}.Release|Any CPU.Build.0 = Release|Any CPU - {595F5EAF-ACFC-4EE9-A5D6-C576386C41CA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {595F5EAF-ACFC-4EE9-A5D6-C576386C41CA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {595F5EAF-ACFC-4EE9-A5D6-C576386C41CA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {595F5EAF-ACFC-4EE9-A5D6-C576386C41CA}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {21DE36D1-4ADA-401C-BE39-FDC0B23FD8C9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {21DE36D1-4ADA-401C-BE39-FDC0B23FD8C9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {21DE36D1-4ADA-401C-BE39-FDC0B23FD8C9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {21DE36D1-4ADA-401C-BE39-FDC0B23FD8C9}.Release|Any CPU.Build.0 = Release|Any CPU - {53CD9298-95A8-4375-A6F0-02C1D0DD161C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {53CD9298-95A8-4375-A6F0-02C1D0DD161C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {53CD9298-95A8-4375-A6F0-02C1D0DD161C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {53CD9298-95A8-4375-A6F0-02C1D0DD161C}.Release|Any CPU.Build.0 = Release|Any CPU - {DA534A0E-FF96-44E6-8C28-628607BB26D1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DA534A0E-FF96-44E6-8C28-628607BB26D1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DA534A0E-FF96-44E6-8C28-628607BB26D1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DA534A0E-FF96-44E6-8C28-628607BB26D1}.Release|Any CPU.Build.0 = Release|Any CPU - {76911658-2996-41E8-A55B-362F667ED6AB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {76911658-2996-41E8-A55B-362F667ED6AB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {76911658-2996-41E8-A55B-362F667ED6AB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {76911658-2996-41E8-A55B-362F667ED6AB}.Release|Any CPU.Build.0 = Release|Any CPU - {D0FD89A1-FE31-476C-839B-772537E5A6C2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D0FD89A1-FE31-476C-839B-772537E5A6C2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D0FD89A1-FE31-476C-839B-772537E5A6C2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D0FD89A1-FE31-476C-839B-772537E5A6C2}.Release|Any CPU.Build.0 = Release|Any CPU - {89AFC1D0-EBCC-4492-998C-9159CDF9978D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {89AFC1D0-EBCC-4492-998C-9159CDF9978D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {89AFC1D0-EBCC-4492-998C-9159CDF9978D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {89AFC1D0-EBCC-4492-998C-9159CDF9978D}.Release|Any CPU.Build.0 = Release|Any CPU - {0A9003C7-1A4D-4422-BE65-7E53903E2BCF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0A9003C7-1A4D-4422-BE65-7E53903E2BCF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0A9003C7-1A4D-4422-BE65-7E53903E2BCF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0A9003C7-1A4D-4422-BE65-7E53903E2BCF}.Release|Any CPU.Build.0 = Release|Any CPU - {77CFB59B-12D3-4757-9D3D-8F3A3026CD36}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {77CFB59B-12D3-4757-9D3D-8F3A3026CD36}.Debug|Any CPU.Build.0 = Debug|Any CPU - {77CFB59B-12D3-4757-9D3D-8F3A3026CD36}.Release|Any CPU.ActiveCfg = Release|Any CPU - {77CFB59B-12D3-4757-9D3D-8F3A3026CD36}.Release|Any CPU.Build.0 = Release|Any CPU - {E027727B-B7BD-4155-99CB-448F9C83E2DE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E027727B-B7BD-4155-99CB-448F9C83E2DE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E027727B-B7BD-4155-99CB-448F9C83E2DE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E027727B-B7BD-4155-99CB-448F9C83E2DE}.Release|Any CPU.Build.0 = Release|Any CPU - {595F5EAF-ACFC-4EE9-A5D6-C576386C41CA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {595F5EAF-ACFC-4EE9-A5D6-C576386C41CA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {595F5EAF-ACFC-4EE9-A5D6-C576386C41CA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {595F5EAF-ACFC-4EE9-A5D6-C576386C41CA}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {6ADD38A0-82F7-420F-A1C1-8705BD28A36B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {ECD43D37-1339-4CA9-AC2B-E8FD0A9BFAA7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {2C7C15C0-D6B8-4A9C-AD77-82DAE0E153A8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {2FC00B24-2E96-4A6E-8AD1-A77488616D05} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {022B85CC-8EBE-40DC-BB17-4E8B6C932497} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {21DE36D1-4ADA-401C-BE39-FDC0B23FD8C9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {53CD9298-95A8-4375-A6F0-02C1D0DD161C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {DA534A0E-FF96-44E6-8C28-628607BB26D1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {76911658-2996-41E8-A55B-362F667ED6AB} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D0FD89A1-FE31-476C-839B-772537E5A6C2} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {89AFC1D0-EBCC-4492-998C-9159CDF9978D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0A9003C7-1A4D-4422-BE65-7E53903E2BCF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {77CFB59B-12D3-4757-9D3D-8F3A3026CD36} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E027727B-B7BD-4155-99CB-448F9C83E2DE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {595F5EAF-ACFC-4EE9-A5D6-C576386C41CA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {21DE36D1-4ADA-401C-BE39-FDC0B23FD8C9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {53CD9298-95A8-4375-A6F0-02C1D0DD161C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {DA534A0E-FF96-44E6-8C28-628607BB26D1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {76911658-2996-41E8-A55B-362F667ED6AB} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D0FD89A1-FE31-476C-839B-772537E5A6C2} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {89AFC1D0-EBCC-4492-998C-9159CDF9978D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0A9003C7-1A4D-4422-BE65-7E53903E2BCF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {77CFB59B-12D3-4757-9D3D-8F3A3026CD36} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E027727B-B7BD-4155-99CB-448F9C83E2DE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {595F5EAF-ACFC-4EE9-A5D6-C576386C41CA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {33055593-0BEB-406A-9757-7E430BE7FC83} diff --git a/sdk/src/Services/OpenSearchService/Properties/AssemblyInfo.cs b/sdk/src/Services/OpenSearchService/Properties/AssemblyInfo.cs index bdebf7c22976..f137b8ac3c5b 100644 --- a/sdk/src/Services/OpenSearchService/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/OpenSearchService/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.403.5")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/OpsWorks/Generated/AmazonOpsWorksConfig.cs b/sdk/src/Services/OpsWorks/Generated/AmazonOpsWorksConfig.cs index bad6db02bd86..c4462f8b37dc 100644 --- a/sdk/src/Services/OpsWorks/Generated/AmazonOpsWorksConfig.cs +++ b/sdk/src/Services/OpsWorks/Generated/AmazonOpsWorksConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.OpsWorks public partial class AmazonOpsWorksConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("OpsWorks", "4.0.0.0"); private static readonly AmazonOpsWorksEndpointResolver EndpointResolver = new AmazonOpsWorksEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("OpsWorks", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("OpsWorks", "3.7.400.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/OpsWorks/OpsWorks.sln b/sdk/src/Services/OpsWorks/OpsWorks.sln index 1e236b47a54e..c4494fc9c974 100644 --- a/sdk/src/Services/OpsWorks/OpsWorks.sln +++ b/sdk/src/Services/OpsWorks/OpsWorks.sln @@ -92,7 +92,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {3C7E5890-28DA-4514-A0FB-3F2725E66241}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {3C7E5890-28DA-4514-A0FB-3F2725E66241}.Debug|Any CPU.Build.0 = Debug|Any CPU {3C7E5890-28DA-4514-A0FB-3F2725E66241}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -113,97 +120,6 @@ Global {A6E0C536-1173-4325-A746-837B637D6EFA}.Debug|Any CPU.Build.0 = Debug|Any CPU {A6E0C536-1173-4325-A746-837B637D6EFA}.Release|Any CPU.ActiveCfg = Release|Any CPU {A6E0C536-1173-4325-A746-837B637D6EFA}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {BE03C018-93D0-4515-A71E-8A19C1F30A60}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BE03C018-93D0-4515-A71E-8A19C1F30A60}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BE03C018-93D0-4515-A71E-8A19C1F30A60}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BE03C018-93D0-4515-A71E-8A19C1F30A60}.Release|Any CPU.Build.0 = Release|Any CPU - {418358BF-0071-4647-A9CE-FAB5564CBF13}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {418358BF-0071-4647-A9CE-FAB5564CBF13}.Debug|Any CPU.Build.0 = Debug|Any CPU - {418358BF-0071-4647-A9CE-FAB5564CBF13}.Release|Any CPU.ActiveCfg = Release|Any CPU - {418358BF-0071-4647-A9CE-FAB5564CBF13}.Release|Any CPU.Build.0 = Release|Any CPU - {58C41D51-D151-4382-BBF2-4991A903C6DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {58C41D51-D151-4382-BBF2-4991A903C6DC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {58C41D51-D151-4382-BBF2-4991A903C6DC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {58C41D51-D151-4382-BBF2-4991A903C6DC}.Release|Any CPU.Build.0 = Release|Any CPU - {ECF81E1F-C3EC-469C-80BF-9221DC7F450D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {ECF81E1F-C3EC-469C-80BF-9221DC7F450D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {ECF81E1F-C3EC-469C-80BF-9221DC7F450D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {ECF81E1F-C3EC-469C-80BF-9221DC7F450D}.Release|Any CPU.Build.0 = Release|Any CPU - {9828F2C5-DBAE-49D4-BCD8-C849890029EF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9828F2C5-DBAE-49D4-BCD8-C849890029EF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9828F2C5-DBAE-49D4-BCD8-C849890029EF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9828F2C5-DBAE-49D4-BCD8-C849890029EF}.Release|Any CPU.Build.0 = Release|Any CPU - {8B54E7C4-ECE9-4EB3-8DC6-6E6141111894}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8B54E7C4-ECE9-4EB3-8DC6-6E6141111894}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8B54E7C4-ECE9-4EB3-8DC6-6E6141111894}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8B54E7C4-ECE9-4EB3-8DC6-6E6141111894}.Release|Any CPU.Build.0 = Release|Any CPU - {21424A85-66A9-480C-9424-35F3D4B701E0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {21424A85-66A9-480C-9424-35F3D4B701E0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {21424A85-66A9-480C-9424-35F3D4B701E0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {21424A85-66A9-480C-9424-35F3D4B701E0}.Release|Any CPU.Build.0 = Release|Any CPU - {7961ECAC-C6CE-474E-8246-2953B5385B78}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7961ECAC-C6CE-474E-8246-2953B5385B78}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7961ECAC-C6CE-474E-8246-2953B5385B78}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7961ECAC-C6CE-474E-8246-2953B5385B78}.Release|Any CPU.Build.0 = Release|Any CPU - {6661DA8E-5EA5-4B09-B732-1442048E8F6B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6661DA8E-5EA5-4B09-B732-1442048E8F6B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6661DA8E-5EA5-4B09-B732-1442048E8F6B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6661DA8E-5EA5-4B09-B732-1442048E8F6B}.Release|Any CPU.Build.0 = Release|Any CPU - {308292C2-DBD2-4E7E-A126-5A73A53014DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {308292C2-DBD2-4E7E-A126-5A73A53014DC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {308292C2-DBD2-4E7E-A126-5A73A53014DC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {308292C2-DBD2-4E7E-A126-5A73A53014DC}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {BE03C018-93D0-4515-A71E-8A19C1F30A60}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BE03C018-93D0-4515-A71E-8A19C1F30A60}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BE03C018-93D0-4515-A71E-8A19C1F30A60}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BE03C018-93D0-4515-A71E-8A19C1F30A60}.Release|Any CPU.Build.0 = Release|Any CPU - {418358BF-0071-4647-A9CE-FAB5564CBF13}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {418358BF-0071-4647-A9CE-FAB5564CBF13}.Debug|Any CPU.Build.0 = Debug|Any CPU - {418358BF-0071-4647-A9CE-FAB5564CBF13}.Release|Any CPU.ActiveCfg = Release|Any CPU - {418358BF-0071-4647-A9CE-FAB5564CBF13}.Release|Any CPU.Build.0 = Release|Any CPU - {58C41D51-D151-4382-BBF2-4991A903C6DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {58C41D51-D151-4382-BBF2-4991A903C6DC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {58C41D51-D151-4382-BBF2-4991A903C6DC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {58C41D51-D151-4382-BBF2-4991A903C6DC}.Release|Any CPU.Build.0 = Release|Any CPU - {ECF81E1F-C3EC-469C-80BF-9221DC7F450D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {ECF81E1F-C3EC-469C-80BF-9221DC7F450D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {ECF81E1F-C3EC-469C-80BF-9221DC7F450D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {ECF81E1F-C3EC-469C-80BF-9221DC7F450D}.Release|Any CPU.Build.0 = Release|Any CPU - {9828F2C5-DBAE-49D4-BCD8-C849890029EF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9828F2C5-DBAE-49D4-BCD8-C849890029EF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9828F2C5-DBAE-49D4-BCD8-C849890029EF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9828F2C5-DBAE-49D4-BCD8-C849890029EF}.Release|Any CPU.Build.0 = Release|Any CPU - {8B54E7C4-ECE9-4EB3-8DC6-6E6141111894}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8B54E7C4-ECE9-4EB3-8DC6-6E6141111894}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8B54E7C4-ECE9-4EB3-8DC6-6E6141111894}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8B54E7C4-ECE9-4EB3-8DC6-6E6141111894}.Release|Any CPU.Build.0 = Release|Any CPU - {21424A85-66A9-480C-9424-35F3D4B701E0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {21424A85-66A9-480C-9424-35F3D4B701E0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {21424A85-66A9-480C-9424-35F3D4B701E0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {21424A85-66A9-480C-9424-35F3D4B701E0}.Release|Any CPU.Build.0 = Release|Any CPU - {7961ECAC-C6CE-474E-8246-2953B5385B78}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7961ECAC-C6CE-474E-8246-2953B5385B78}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7961ECAC-C6CE-474E-8246-2953B5385B78}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7961ECAC-C6CE-474E-8246-2953B5385B78}.Release|Any CPU.Build.0 = Release|Any CPU - {6661DA8E-5EA5-4B09-B732-1442048E8F6B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6661DA8E-5EA5-4B09-B732-1442048E8F6B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6661DA8E-5EA5-4B09-B732-1442048E8F6B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6661DA8E-5EA5-4B09-B732-1442048E8F6B}.Release|Any CPU.Build.0 = Release|Any CPU - {308292C2-DBD2-4E7E-A126-5A73A53014DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {308292C2-DBD2-4E7E-A126-5A73A53014DC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {308292C2-DBD2-4E7E-A126-5A73A53014DC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {308292C2-DBD2-4E7E-A126-5A73A53014DC}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -220,37 +136,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {3C7E5890-28DA-4514-A0FB-3F2725E66241} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {9C17A420-345A-4FC4-843C-E5B279BD7321} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {E98701A4-9B3B-44B0-A46D-105DF7792B1B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {E7763CF5-9FF7-4AAB-85A8-5D319F4E7466} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {A6E0C536-1173-4325-A746-837B637D6EFA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {BE03C018-93D0-4515-A71E-8A19C1F30A60} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {418358BF-0071-4647-A9CE-FAB5564CBF13} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {58C41D51-D151-4382-BBF2-4991A903C6DC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {ECF81E1F-C3EC-469C-80BF-9221DC7F450D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {9828F2C5-DBAE-49D4-BCD8-C849890029EF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8B54E7C4-ECE9-4EB3-8DC6-6E6141111894} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {21424A85-66A9-480C-9424-35F3D4B701E0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {7961ECAC-C6CE-474E-8246-2953B5385B78} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6661DA8E-5EA5-4B09-B732-1442048E8F6B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {308292C2-DBD2-4E7E-A126-5A73A53014DC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {BE03C018-93D0-4515-A71E-8A19C1F30A60} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {418358BF-0071-4647-A9CE-FAB5564CBF13} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {58C41D51-D151-4382-BBF2-4991A903C6DC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {ECF81E1F-C3EC-469C-80BF-9221DC7F450D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {9828F2C5-DBAE-49D4-BCD8-C849890029EF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8B54E7C4-ECE9-4EB3-8DC6-6E6141111894} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {21424A85-66A9-480C-9424-35F3D4B701E0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {7961ECAC-C6CE-474E-8246-2953B5385B78} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6661DA8E-5EA5-4B09-B732-1442048E8F6B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {308292C2-DBD2-4E7E-A126-5A73A53014DC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {7C621797-543B-4D46-B2D1-137F7CF9325B} diff --git a/sdk/src/Services/OpsWorks/Properties/AssemblyInfo.cs b/sdk/src/Services/OpsWorks/Properties/AssemblyInfo.cs index 727203ad9c7d..eac338250bd7 100644 --- a/sdk/src/Services/OpsWorks/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/OpsWorks/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/OpsWorksCM/Generated/AmazonOpsWorksCMConfig.cs b/sdk/src/Services/OpsWorksCM/Generated/AmazonOpsWorksCMConfig.cs index fb43e7c38893..5b7a4d818ab3 100644 --- a/sdk/src/Services/OpsWorksCM/Generated/AmazonOpsWorksCMConfig.cs +++ b/sdk/src/Services/OpsWorksCM/Generated/AmazonOpsWorksCMConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.OpsWorksCM public partial class AmazonOpsWorksCMConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("OpsWorksCM", "4.0.0.0"); private static readonly AmazonOpsWorksCMEndpointResolver EndpointResolver = new AmazonOpsWorksCMEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("OpsWorksCM", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("OpsWorksCM", "3.7.400.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/OpsWorksCM/OpsWorksCM.sln b/sdk/src/Services/OpsWorksCM/OpsWorksCM.sln index 5b048d8bf127..590792ab109d 100644 --- a/sdk/src/Services/OpsWorksCM/OpsWorksCM.sln +++ b/sdk/src/Services/OpsWorksCM/OpsWorksCM.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {B2509CDF-1636-4442-B3B2-C61548335615}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {B2509CDF-1636-4442-B3B2-C61548335615}.Debug|Any CPU.Build.0 = Debug|Any CPU {B2509CDF-1636-4442-B3B2-C61548335615}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {9504785C-BF41-4EE2-8F1F-EBC264A9CAAF}.Debug|Any CPU.Build.0 = Debug|Any CPU {9504785C-BF41-4EE2-8F1F-EBC264A9CAAF}.Release|Any CPU.ActiveCfg = Release|Any CPU {9504785C-BF41-4EE2-8F1F-EBC264A9CAAF}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {CB64AAC4-EA3D-47A3-9334-21080F935459}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CB64AAC4-EA3D-47A3-9334-21080F935459}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CB64AAC4-EA3D-47A3-9334-21080F935459}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CB64AAC4-EA3D-47A3-9334-21080F935459}.Release|Any CPU.Build.0 = Release|Any CPU - {F933788E-6874-44D6-88FE-3673BA9DF926}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F933788E-6874-44D6-88FE-3673BA9DF926}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F933788E-6874-44D6-88FE-3673BA9DF926}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F933788E-6874-44D6-88FE-3673BA9DF926}.Release|Any CPU.Build.0 = Release|Any CPU - {42ACB749-60C8-4969-884F-F36EE6408EB6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {42ACB749-60C8-4969-884F-F36EE6408EB6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {42ACB749-60C8-4969-884F-F36EE6408EB6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {42ACB749-60C8-4969-884F-F36EE6408EB6}.Release|Any CPU.Build.0 = Release|Any CPU - {8E6688A9-DB72-4BFE-BF24-80B4413F4F3D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8E6688A9-DB72-4BFE-BF24-80B4413F4F3D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8E6688A9-DB72-4BFE-BF24-80B4413F4F3D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8E6688A9-DB72-4BFE-BF24-80B4413F4F3D}.Release|Any CPU.Build.0 = Release|Any CPU - {5D7EC0B4-EC25-4193-9CCC-1F9EC50ABC40}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5D7EC0B4-EC25-4193-9CCC-1F9EC50ABC40}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5D7EC0B4-EC25-4193-9CCC-1F9EC50ABC40}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5D7EC0B4-EC25-4193-9CCC-1F9EC50ABC40}.Release|Any CPU.Build.0 = Release|Any CPU - {8C669333-D086-48B5-B24A-58D15D166870}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8C669333-D086-48B5-B24A-58D15D166870}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8C669333-D086-48B5-B24A-58D15D166870}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8C669333-D086-48B5-B24A-58D15D166870}.Release|Any CPU.Build.0 = Release|Any CPU - {1F0CFD95-467E-4478-A62D-32C014D51B59}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1F0CFD95-467E-4478-A62D-32C014D51B59}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1F0CFD95-467E-4478-A62D-32C014D51B59}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1F0CFD95-467E-4478-A62D-32C014D51B59}.Release|Any CPU.Build.0 = Release|Any CPU - {18A959D8-987F-42EB-A40E-7D74B1A77CD6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {18A959D8-987F-42EB-A40E-7D74B1A77CD6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {18A959D8-987F-42EB-A40E-7D74B1A77CD6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {18A959D8-987F-42EB-A40E-7D74B1A77CD6}.Release|Any CPU.Build.0 = Release|Any CPU - {6086D33D-1EB7-42CD-B709-6308EC129EE7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6086D33D-1EB7-42CD-B709-6308EC129EE7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6086D33D-1EB7-42CD-B709-6308EC129EE7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6086D33D-1EB7-42CD-B709-6308EC129EE7}.Release|Any CPU.Build.0 = Release|Any CPU - {ABCC69AE-3DD4-4984-87F2-C12806BEBE00}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {ABCC69AE-3DD4-4984-87F2-C12806BEBE00}.Debug|Any CPU.Build.0 = Debug|Any CPU - {ABCC69AE-3DD4-4984-87F2-C12806BEBE00}.Release|Any CPU.ActiveCfg = Release|Any CPU - {ABCC69AE-3DD4-4984-87F2-C12806BEBE00}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {CB64AAC4-EA3D-47A3-9334-21080F935459}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CB64AAC4-EA3D-47A3-9334-21080F935459}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CB64AAC4-EA3D-47A3-9334-21080F935459}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CB64AAC4-EA3D-47A3-9334-21080F935459}.Release|Any CPU.Build.0 = Release|Any CPU - {F933788E-6874-44D6-88FE-3673BA9DF926}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F933788E-6874-44D6-88FE-3673BA9DF926}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F933788E-6874-44D6-88FE-3673BA9DF926}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F933788E-6874-44D6-88FE-3673BA9DF926}.Release|Any CPU.Build.0 = Release|Any CPU - {42ACB749-60C8-4969-884F-F36EE6408EB6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {42ACB749-60C8-4969-884F-F36EE6408EB6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {42ACB749-60C8-4969-884F-F36EE6408EB6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {42ACB749-60C8-4969-884F-F36EE6408EB6}.Release|Any CPU.Build.0 = Release|Any CPU - {8E6688A9-DB72-4BFE-BF24-80B4413F4F3D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8E6688A9-DB72-4BFE-BF24-80B4413F4F3D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8E6688A9-DB72-4BFE-BF24-80B4413F4F3D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8E6688A9-DB72-4BFE-BF24-80B4413F4F3D}.Release|Any CPU.Build.0 = Release|Any CPU - {5D7EC0B4-EC25-4193-9CCC-1F9EC50ABC40}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5D7EC0B4-EC25-4193-9CCC-1F9EC50ABC40}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5D7EC0B4-EC25-4193-9CCC-1F9EC50ABC40}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5D7EC0B4-EC25-4193-9CCC-1F9EC50ABC40}.Release|Any CPU.Build.0 = Release|Any CPU - {8C669333-D086-48B5-B24A-58D15D166870}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8C669333-D086-48B5-B24A-58D15D166870}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8C669333-D086-48B5-B24A-58D15D166870}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8C669333-D086-48B5-B24A-58D15D166870}.Release|Any CPU.Build.0 = Release|Any CPU - {1F0CFD95-467E-4478-A62D-32C014D51B59}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1F0CFD95-467E-4478-A62D-32C014D51B59}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1F0CFD95-467E-4478-A62D-32C014D51B59}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1F0CFD95-467E-4478-A62D-32C014D51B59}.Release|Any CPU.Build.0 = Release|Any CPU - {18A959D8-987F-42EB-A40E-7D74B1A77CD6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {18A959D8-987F-42EB-A40E-7D74B1A77CD6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {18A959D8-987F-42EB-A40E-7D74B1A77CD6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {18A959D8-987F-42EB-A40E-7D74B1A77CD6}.Release|Any CPU.Build.0 = Release|Any CPU - {6086D33D-1EB7-42CD-B709-6308EC129EE7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6086D33D-1EB7-42CD-B709-6308EC129EE7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6086D33D-1EB7-42CD-B709-6308EC129EE7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6086D33D-1EB7-42CD-B709-6308EC129EE7}.Release|Any CPU.Build.0 = Release|Any CPU - {ABCC69AE-3DD4-4984-87F2-C12806BEBE00}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {ABCC69AE-3DD4-4984-87F2-C12806BEBE00}.Debug|Any CPU.Build.0 = Debug|Any CPU - {ABCC69AE-3DD4-4984-87F2-C12806BEBE00}.Release|Any CPU.ActiveCfg = Release|Any CPU - {ABCC69AE-3DD4-4984-87F2-C12806BEBE00}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {B2509CDF-1636-4442-B3B2-C61548335615} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {82FD2EA3-C3B2-4F52-B05C-177C1A13431C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {7A05B7B9-63D6-49F2-A5E8-21C02DA5A40A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {0392B623-A470-4413-89CD-39BA35A83C1B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {9504785C-BF41-4EE2-8F1F-EBC264A9CAAF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {CB64AAC4-EA3D-47A3-9334-21080F935459} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F933788E-6874-44D6-88FE-3673BA9DF926} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {42ACB749-60C8-4969-884F-F36EE6408EB6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8E6688A9-DB72-4BFE-BF24-80B4413F4F3D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {5D7EC0B4-EC25-4193-9CCC-1F9EC50ABC40} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8C669333-D086-48B5-B24A-58D15D166870} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {1F0CFD95-467E-4478-A62D-32C014D51B59} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {18A959D8-987F-42EB-A40E-7D74B1A77CD6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6086D33D-1EB7-42CD-B709-6308EC129EE7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {ABCC69AE-3DD4-4984-87F2-C12806BEBE00} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {CB64AAC4-EA3D-47A3-9334-21080F935459} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F933788E-6874-44D6-88FE-3673BA9DF926} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {42ACB749-60C8-4969-884F-F36EE6408EB6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8E6688A9-DB72-4BFE-BF24-80B4413F4F3D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {5D7EC0B4-EC25-4193-9CCC-1F9EC50ABC40} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8C669333-D086-48B5-B24A-58D15D166870} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {1F0CFD95-467E-4478-A62D-32C014D51B59} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {18A959D8-987F-42EB-A40E-7D74B1A77CD6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6086D33D-1EB7-42CD-B709-6308EC129EE7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {ABCC69AE-3DD4-4984-87F2-C12806BEBE00} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {73EDB01B-56B2-4614-A310-0FFA3F2D045A} diff --git a/sdk/src/Services/OpsWorksCM/Properties/AssemblyInfo.cs b/sdk/src/Services/OpsWorksCM/Properties/AssemblyInfo.cs index 38c0ad4b93b5..9177ba565f7d 100644 --- a/sdk/src/Services/OpsWorksCM/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/OpsWorksCM/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/Organizations/Generated/AmazonOrganizationsConfig.cs b/sdk/src/Services/Organizations/Generated/AmazonOrganizationsConfig.cs index 91d123a92ccd..581b2857d13d 100644 --- a/sdk/src/Services/Organizations/Generated/AmazonOrganizationsConfig.cs +++ b/sdk/src/Services/Organizations/Generated/AmazonOrganizationsConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.Organizations public partial class AmazonOrganizationsConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("Organizations", "4.0.0.0"); private static readonly AmazonOrganizationsEndpointResolver EndpointResolver = new AmazonOrganizationsEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("Organizations", "3.7.402.1"); -======= - InternalSDKUtils.BuildUserAgentString("Organizations", "3.7.403.3"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/Organizations/Generated/_bcl/AmazonOrganizationsClient.cs b/sdk/src/Services/Organizations/Generated/_bcl/AmazonOrganizationsClient.cs index 2b369cff3e5f..4309a0f10ef7 100644 --- a/sdk/src/Services/Organizations/Generated/_bcl/AmazonOrganizationsClient.cs +++ b/sdk/src/Services/Organizations/Generated/_bcl/AmazonOrganizationsClient.cs @@ -579,6 +579,10 @@ protected override void Dispose(bool disposing) /// ///
  • /// + /// INVALID_PRINCIPAL: You specified an invalid principal element in the policy. + /// + ///
  • + /// /// INVALID_ROLE_NAME: You provided a role name that isn't valid. A role name can't begin /// with the reserved prefix AWSServiceRoleFor. /// @@ -626,6 +630,10 @@ protected override void Dispose(bool disposing) /// ///
  • /// + /// NON_DETACHABLE_POLICY: You can't detach this Amazon Web Services Managed Policy. + /// + ///
  • + /// /// TARGET_NOT_SUPPORTED: You can't perform the specified operation on that target entity. /// ///
  • @@ -870,6 +878,10 @@ public virtual AcceptHandshakeResponse AcceptHandshake(AcceptHandshakeRequest re /// ///
  • /// + /// INVALID_PRINCIPAL: You specified an invalid principal element in the policy. + /// + ///
  • + /// /// INVALID_ROLE_NAME: You provided a role name that isn't valid. A role name can't begin /// with the reserved prefix AWSServiceRoleFor. /// @@ -917,6 +929,10 @@ public virtual AcceptHandshakeResponse AcceptHandshake(AcceptHandshakeRequest re /// ///
  • /// + /// NON_DETACHABLE_POLICY: You can't detach this Amazon Web Services Managed Policy. + /// + ///
  • + /// /// TARGET_NOT_SUPPORTED: You can't perform the specified operation on that target entity. /// ///
  • @@ -966,6 +982,11 @@ public virtual AcceptHandshakeResponse AcceptHandshake(AcceptHandshakeRequest re /// ///
  • /// + /// RESOURCE_CONTROL_POLICY + /// + /// + ///
  • + /// /// BACKUP_POLICY /// /// @@ -1306,6 +1327,10 @@ public virtual AcceptHandshakeResponse AcceptHandshake(AcceptHandshakeRequest re /// ///
  • /// + /// INVALID_PRINCIPAL: You specified an invalid principal element in the policy. + /// + ///
  • + /// /// INVALID_ROLE_NAME: You provided a role name that isn't valid. A role name can't begin /// with the reserved prefix AWSServiceRoleFor. /// @@ -1353,6 +1378,10 @@ public virtual AcceptHandshakeResponse AcceptHandshake(AcceptHandshakeRequest re /// ///
  • /// + /// NON_DETACHABLE_POLICY: You can't detach this Amazon Web Services Managed Policy. + /// + ///
  • + /// /// TARGET_NOT_SUPPORTED: You can't perform the specified operation on that target entity. /// ///
  • @@ -1417,6 +1446,11 @@ public virtual AttachPolicyResponse AttachPolicy(AttachPolicyRequest request) /// ///
  • /// + /// RESOURCE_CONTROL_POLICY + /// + /// + ///
  • + /// /// BACKUP_POLICY /// /// @@ -1760,6 +1794,10 @@ public virtual AttachPolicyResponse AttachPolicy(AttachPolicyRequest request) /// ///
  • /// + /// INVALID_PRINCIPAL: You specified an invalid principal element in the policy. + /// + ///
  • + /// /// INVALID_ROLE_NAME: You provided a role name that isn't valid. A role name can't begin /// with the reserved prefix AWSServiceRoleFor. /// @@ -1807,6 +1845,10 @@ public virtual AttachPolicyResponse AttachPolicy(AttachPolicyRequest request) /// ///
  • /// + /// NON_DETACHABLE_POLICY: You can't detach this Amazon Web Services Managed Policy. + /// + ///
  • + /// /// TARGET_NOT_SUPPORTED: You can't perform the specified operation on that target entity. /// ///
  • @@ -1970,6 +2012,10 @@ public virtual AttachPolicyResponse AttachPolicy(AttachPolicyRequest request) /// ///
  • /// + /// INVALID_PRINCIPAL: You specified an invalid principal element in the policy. + /// + ///
  • + /// /// INVALID_ROLE_NAME: You provided a role name that isn't valid. A role name can't begin /// with the reserved prefix AWSServiceRoleFor. /// @@ -2017,6 +2063,10 @@ public virtual AttachPolicyResponse AttachPolicy(AttachPolicyRequest request) /// ///
  • /// + /// NON_DETACHABLE_POLICY: You can't detach this Amazon Web Services Managed Policy. + /// + ///
  • + /// /// TARGET_NOT_SUPPORTED: You can't perform the specified operation on that target entity. /// ///
  • @@ -2160,6 +2210,10 @@ public virtual CancelHandshakeResponse CancelHandshake(CancelHandshakeRequest re /// ///
  • /// + /// INVALID_PRINCIPAL: You specified an invalid principal element in the policy. + /// + ///
  • + /// /// INVALID_ROLE_NAME: You provided a role name that isn't valid. A role name can't begin /// with the reserved prefix AWSServiceRoleFor. /// @@ -2207,6 +2261,10 @@ public virtual CancelHandshakeResponse CancelHandshake(CancelHandshakeRequest re /// ///
  • /// + /// NON_DETACHABLE_POLICY: You can't detach this Amazon Web Services Managed Policy. + /// + ///
  • + /// /// TARGET_NOT_SUPPORTED: You can't perform the specified operation on that target entity. /// ///
  • @@ -2619,6 +2677,10 @@ public virtual CancelHandshakeResponse CancelHandshake(CancelHandshakeRequest re /// ///
  • /// + /// INVALID_PRINCIPAL: You specified an invalid principal element in the policy. + /// + ///
  • + /// /// INVALID_ROLE_NAME: You provided a role name that isn't valid. A role name can't begin /// with the reserved prefix AWSServiceRoleFor. /// @@ -2666,6 +2728,10 @@ public virtual CancelHandshakeResponse CancelHandshake(CancelHandshakeRequest re /// ///
  • /// + /// NON_DETACHABLE_POLICY: You can't detach this Amazon Web Services Managed Policy. + /// + ///
  • + /// /// TARGET_NOT_SUPPORTED: You can't perform the specified operation on that target entity. /// ///
  • @@ -3080,6 +3146,10 @@ public virtual CloseAccountResponse CloseAccount(CloseAccountRequest request) /// ///
  • /// + /// INVALID_PRINCIPAL: You specified an invalid principal element in the policy. + /// + ///
  • + /// /// INVALID_ROLE_NAME: You provided a role name that isn't valid. A role name can't begin /// with the reserved prefix AWSServiceRoleFor. /// @@ -3127,6 +3197,10 @@ public virtual CloseAccountResponse CloseAccount(CloseAccountRequest request) /// ///
  • /// + /// NON_DETACHABLE_POLICY: You can't detach this Amazon Web Services Managed Policy. + /// + ///
  • + /// /// TARGET_NOT_SUPPORTED: You can't perform the specified operation on that target entity. /// ///
  • @@ -3576,6 +3650,10 @@ public virtual CloseAccountResponse CloseAccount(CloseAccountRequest request) /// ///
  • /// + /// INVALID_PRINCIPAL: You specified an invalid principal element in the policy. + /// + ///
  • + /// /// INVALID_ROLE_NAME: You provided a role name that isn't valid. A role name can't begin /// with the reserved prefix AWSServiceRoleFor. /// @@ -3623,6 +3701,10 @@ public virtual CloseAccountResponse CloseAccount(CloseAccountRequest request) /// ///
  • /// + /// NON_DETACHABLE_POLICY: You can't detach this Amazon Web Services Managed Policy. + /// + ///
  • + /// /// TARGET_NOT_SUPPORTED: You can't perform the specified operation on that target entity. /// ///
  • @@ -4071,6 +4153,10 @@ public virtual CreateAccountResponse CreateAccount(CreateAccountRequest request) /// ///
  • /// + /// INVALID_PRINCIPAL: You specified an invalid principal element in the policy. + /// + ///
  • + /// /// INVALID_ROLE_NAME: You provided a role name that isn't valid. A role name can't begin /// with the reserved prefix AWSServiceRoleFor. /// @@ -4118,6 +4204,10 @@ public virtual CreateAccountResponse CreateAccount(CreateAccountRequest request) /// ///
  • /// + /// NON_DETACHABLE_POLICY: You can't detach this Amazon Web Services Managed Policy. + /// + ///
  • + /// /// TARGET_NOT_SUPPORTED: You can't perform the specified operation on that target entity. /// ///
  • @@ -4627,6 +4717,10 @@ public virtual CreateAccountResponse CreateAccount(CreateAccountRequest request) /// ///
  • /// + /// INVALID_PRINCIPAL: You specified an invalid principal element in the policy. + /// + ///
  • + /// /// INVALID_ROLE_NAME: You provided a role name that isn't valid. A role name can't begin /// with the reserved prefix AWSServiceRoleFor. /// @@ -4674,6 +4768,10 @@ public virtual CreateAccountResponse CreateAccount(CreateAccountRequest request) /// ///
  • /// + /// NON_DETACHABLE_POLICY: You can't detach this Amazon Web Services Managed Policy. + /// + ///
  • + /// /// TARGET_NOT_SUPPORTED: You can't perform the specified operation on that target entity. /// ///
  • @@ -5182,6 +5280,10 @@ public virtual CreateGovCloudAccountResponse CreateGovCloudAccount(CreateGovClou /// ///
  • /// + /// INVALID_PRINCIPAL: You specified an invalid principal element in the policy. + /// + ///
  • + /// /// INVALID_ROLE_NAME: You provided a role name that isn't valid. A role name can't begin /// with the reserved prefix AWSServiceRoleFor. /// @@ -5229,6 +5331,10 @@ public virtual CreateGovCloudAccountResponse CreateGovCloudAccount(CreateGovClou /// ///
  • /// + /// NON_DETACHABLE_POLICY: You can't detach this Amazon Web Services Managed Policy. + /// + ///
  • + /// /// TARGET_NOT_SUPPORTED: You can't perform the specified operation on that target entity. /// ///
  • @@ -5607,6 +5713,10 @@ public virtual CreateGovCloudAccountResponse CreateGovCloudAccount(CreateGovClou /// ///
  • /// + /// INVALID_PRINCIPAL: You specified an invalid principal element in the policy. + /// + ///
  • + /// /// INVALID_ROLE_NAME: You provided a role name that isn't valid. A role name can't begin /// with the reserved prefix AWSServiceRoleFor. /// @@ -5654,6 +5764,10 @@ public virtual CreateGovCloudAccountResponse CreateGovCloudAccount(CreateGovClou /// ///
  • /// + /// NON_DETACHABLE_POLICY: You can't detach this Amazon Web Services Managed Policy. + /// + ///
  • + /// /// TARGET_NOT_SUPPORTED: You can't perform the specified operation on that target entity. /// ///
  • @@ -6028,6 +6142,10 @@ public virtual CreateOrganizationResponse CreateOrganization(CreateOrganizationR /// ///
  • /// + /// INVALID_PRINCIPAL: You specified an invalid principal element in the policy. + /// + ///
  • + /// /// INVALID_ROLE_NAME: You provided a role name that isn't valid. A role name can't begin /// with the reserved prefix AWSServiceRoleFor. /// @@ -6075,6 +6193,10 @@ public virtual CreateOrganizationResponse CreateOrganization(CreateOrganizationR /// ///
  • /// + /// NON_DETACHABLE_POLICY: You can't detach this Amazon Web Services Managed Policy. + /// + ///
  • + /// /// TARGET_NOT_SUPPORTED: You can't perform the specified operation on that target entity. /// ///
  • @@ -6450,6 +6572,10 @@ public virtual CreateOrganizationResponse CreateOrganization(CreateOrganizationR /// ///
  • /// + /// INVALID_PRINCIPAL: You specified an invalid principal element in the policy. + /// + ///
  • + /// /// INVALID_ROLE_NAME: You provided a role name that isn't valid. A role name can't begin /// with the reserved prefix AWSServiceRoleFor. /// @@ -6497,6 +6623,10 @@ public virtual CreateOrganizationResponse CreateOrganization(CreateOrganizationR /// ///
  • /// + /// NON_DETACHABLE_POLICY: You can't detach this Amazon Web Services Managed Policy. + /// + ///
  • + /// /// TARGET_NOT_SUPPORTED: You can't perform the specified operation on that target entity. /// ///
  • @@ -6874,6 +7004,10 @@ public virtual CreateOrganizationalUnitResponse CreateOrganizationalUnit(CreateO /// ///
  • /// + /// INVALID_PRINCIPAL: You specified an invalid principal element in the policy. + /// + ///
  • + /// /// INVALID_ROLE_NAME: You provided a role name that isn't valid. A role name can't begin /// with the reserved prefix AWSServiceRoleFor. /// @@ -6921,6 +7055,10 @@ public virtual CreateOrganizationalUnitResponse CreateOrganizationalUnit(CreateO /// ///
  • /// + /// NON_DETACHABLE_POLICY: You can't detach this Amazon Web Services Managed Policy. + /// + ///
  • + /// /// TARGET_NOT_SUPPORTED: You can't perform the specified operation on that target entity. /// ///
  • @@ -7297,6 +7435,10 @@ public virtual CreateOrganizationalUnitResponse CreateOrganizationalUnit(CreateO /// ///
  • /// + /// INVALID_PRINCIPAL: You specified an invalid principal element in the policy. + /// + ///
  • + /// /// INVALID_ROLE_NAME: You provided a role name that isn't valid. A role name can't begin /// with the reserved prefix AWSServiceRoleFor. /// @@ -7344,6 +7486,10 @@ public virtual CreateOrganizationalUnitResponse CreateOrganizationalUnit(CreateO /// ///
  • /// + /// NON_DETACHABLE_POLICY: You can't detach this Amazon Web Services Managed Policy. + /// + ///
  • + /// /// TARGET_NOT_SUPPORTED: You can't perform the specified operation on that target entity. /// ///
  • @@ -7731,6 +7877,10 @@ public virtual CreatePolicyResponse CreatePolicy(CreatePolicyRequest request) /// ///
  • /// + /// INVALID_PRINCIPAL: You specified an invalid principal element in the policy. + /// + ///
  • + /// /// INVALID_ROLE_NAME: You provided a role name that isn't valid. A role name can't begin /// with the reserved prefix AWSServiceRoleFor. /// @@ -7778,6 +7928,10 @@ public virtual CreatePolicyResponse CreatePolicy(CreatePolicyRequest request) /// ///
  • /// + /// NON_DETACHABLE_POLICY: You can't detach this Amazon Web Services Managed Policy. + /// + ///
  • + /// /// TARGET_NOT_SUPPORTED: You can't perform the specified operation on that target entity. /// ///
  • @@ -7938,6 +8092,10 @@ public virtual CreatePolicyResponse CreatePolicy(CreatePolicyRequest request) /// ///
  • /// + /// INVALID_PRINCIPAL: You specified an invalid principal element in the policy. + /// + ///
  • + /// /// INVALID_ROLE_NAME: You provided a role name that isn't valid. A role name can't begin /// with the reserved prefix AWSServiceRoleFor. /// @@ -7985,6 +8143,10 @@ public virtual CreatePolicyResponse CreatePolicy(CreatePolicyRequest request) /// ///
  • /// + /// NON_DETACHABLE_POLICY: You can't detach this Amazon Web Services Managed Policy. + /// + ///
  • + /// /// TARGET_NOT_SUPPORTED: You can't perform the specified operation on that target entity. /// ///
  • @@ -8129,6 +8291,10 @@ public virtual DeclineHandshakeResponse DeclineHandshake(DeclineHandshakeRequest /// ///
  • /// + /// INVALID_PRINCIPAL: You specified an invalid principal element in the policy. + /// + ///
  • + /// /// INVALID_ROLE_NAME: You provided a role name that isn't valid. A role name can't begin /// with the reserved prefix AWSServiceRoleFor. /// @@ -8176,6 +8342,10 @@ public virtual DeclineHandshakeResponse DeclineHandshake(DeclineHandshakeRequest /// ///
  • /// + /// NON_DETACHABLE_POLICY: You can't detach this Amazon Web Services Managed Policy. + /// + ///
  • + /// /// TARGET_NOT_SUPPORTED: You can't perform the specified operation on that target entity. /// ///
  • @@ -8300,6 +8470,10 @@ public virtual DeclineHandshakeResponse DeclineHandshake(DeclineHandshakeRequest /// ///
  • /// + /// INVALID_PRINCIPAL: You specified an invalid principal element in the policy. + /// + ///
  • + /// /// INVALID_ROLE_NAME: You provided a role name that isn't valid. A role name can't begin /// with the reserved prefix AWSServiceRoleFor. /// @@ -8347,6 +8521,10 @@ public virtual DeclineHandshakeResponse DeclineHandshake(DeclineHandshakeRequest /// ///
  • /// + /// NON_DETACHABLE_POLICY: You can't detach this Amazon Web Services Managed Policy. + /// + ///
  • + /// /// TARGET_NOT_SUPPORTED: You can't perform the specified operation on that target entity. /// ///
  • @@ -8474,6 +8652,10 @@ public virtual DeleteOrganizationResponse DeleteOrganization(DeleteOrganizationR /// ///
  • /// + /// INVALID_PRINCIPAL: You specified an invalid principal element in the policy. + /// + ///
  • + /// /// INVALID_ROLE_NAME: You provided a role name that isn't valid. A role name can't begin /// with the reserved prefix AWSServiceRoleFor. /// @@ -8521,6 +8703,10 @@ public virtual DeleteOrganizationResponse DeleteOrganization(DeleteOrganizationR /// ///
  • /// + /// NON_DETACHABLE_POLICY: You can't detach this Amazon Web Services Managed Policy. + /// + ///
  • + /// /// TARGET_NOT_SUPPORTED: You can't perform the specified operation on that target entity. /// ///
  • @@ -8654,6 +8840,10 @@ public virtual DeleteOrganizationResponse DeleteOrganization(DeleteOrganizationR /// ///
  • /// + /// INVALID_PRINCIPAL: You specified an invalid principal element in the policy. + /// + ///
  • + /// /// INVALID_ROLE_NAME: You provided a role name that isn't valid. A role name can't begin /// with the reserved prefix AWSServiceRoleFor. /// @@ -8701,6 +8891,10 @@ public virtual DeleteOrganizationResponse DeleteOrganization(DeleteOrganizationR /// ///
  • /// + /// NON_DETACHABLE_POLICY: You can't detach this Amazon Web Services Managed Policy. + /// + ///
  • + /// /// TARGET_NOT_SUPPORTED: You can't perform the specified operation on that target entity. /// ///
  • @@ -8836,6 +9030,10 @@ public virtual DeleteOrganizationalUnitResponse DeleteOrganizationalUnit(DeleteO /// ///
  • /// + /// INVALID_PRINCIPAL: You specified an invalid principal element in the policy. + /// + ///
  • + /// /// INVALID_ROLE_NAME: You provided a role name that isn't valid. A role name can't begin /// with the reserved prefix AWSServiceRoleFor. /// @@ -8883,6 +9081,10 @@ public virtual DeleteOrganizationalUnitResponse DeleteOrganizationalUnit(DeleteO /// ///
  • /// + /// NON_DETACHABLE_POLICY: You can't detach this Amazon Web Services Managed Policy. + /// + ///
  • + /// /// TARGET_NOT_SUPPORTED: You can't perform the specified operation on that target entity. /// ///
  • @@ -9020,6 +9222,10 @@ public virtual DeleteOrganizationalUnitResponse DeleteOrganizationalUnit(DeleteO /// ///
  • /// + /// INVALID_PRINCIPAL: You specified an invalid principal element in the policy. + /// + ///
  • + /// /// INVALID_ROLE_NAME: You provided a role name that isn't valid. A role name can't begin /// with the reserved prefix AWSServiceRoleFor. /// @@ -9067,6 +9273,10 @@ public virtual DeleteOrganizationalUnitResponse DeleteOrganizationalUnit(DeleteO /// ///
  • /// + /// NON_DETACHABLE_POLICY: You can't detach this Amazon Web Services Managed Policy. + /// + ///
  • + /// /// TARGET_NOT_SUPPORTED: You can't perform the specified operation on that target entity. /// ///
  • @@ -9206,6 +9416,10 @@ public virtual DeletePolicyResponse DeletePolicy(DeletePolicyRequest request) /// ///
  • /// + /// INVALID_PRINCIPAL: You specified an invalid principal element in the policy. + /// + ///
  • + /// /// INVALID_ROLE_NAME: You provided a role name that isn't valid. A role name can't begin /// with the reserved prefix AWSServiceRoleFor. /// @@ -9253,6 +9467,10 @@ public virtual DeletePolicyResponse DeletePolicy(DeletePolicyRequest request) /// ///
  • /// + /// NON_DETACHABLE_POLICY: You can't detach this Amazon Web Services Managed Policy. + /// + ///
  • + /// /// TARGET_NOT_SUPPORTED: You can't perform the specified operation on that target entity. /// ///
  • @@ -10225,6 +10443,10 @@ public virtual DeleteResourcePolicyResponse DeleteResourcePolicy(DeleteResourceP /// ///
  • /// + /// INVALID_PRINCIPAL: You specified an invalid principal element in the policy. + /// + ///
  • + /// /// INVALID_ROLE_NAME: You provided a role name that isn't valid. A role name can't begin /// with the reserved prefix AWSServiceRoleFor. /// @@ -10272,6 +10494,10 @@ public virtual DeleteResourcePolicyResponse DeleteResourcePolicy(DeleteResourceP /// ///
  • /// + /// NON_DETACHABLE_POLICY: You can't detach this Amazon Web Services Managed Policy. + /// + ///
  • + /// /// TARGET_NOT_SUPPORTED: You can't perform the specified operation on that target entity. /// ///
  • @@ -10657,6 +10883,10 @@ public virtual DeregisterDelegatedAdministratorResponse DeregisterDelegatedAdmin /// ///
  • /// + /// INVALID_PRINCIPAL: You specified an invalid principal element in the policy. + /// + ///
  • + /// /// INVALID_ROLE_NAME: You provided a role name that isn't valid. A role name can't begin /// with the reserved prefix AWSServiceRoleFor. /// @@ -10704,6 +10934,10 @@ public virtual DeregisterDelegatedAdministratorResponse DeregisterDelegatedAdmin /// ///
  • /// + /// NON_DETACHABLE_POLICY: You can't detach this Amazon Web Services Managed Policy. + /// + ///
  • + /// /// TARGET_NOT_SUPPORTED: You can't perform the specified operation on that target entity. /// ///
  • @@ -10837,6 +11071,10 @@ public virtual DeregisterDelegatedAdministratorResponse DeregisterDelegatedAdmin /// ///
  • /// + /// INVALID_PRINCIPAL: You specified an invalid principal element in the policy. + /// + ///
  • + /// /// INVALID_ROLE_NAME: You provided a role name that isn't valid. A role name can't begin /// with the reserved prefix AWSServiceRoleFor. /// @@ -10884,6 +11122,10 @@ public virtual DeregisterDelegatedAdministratorResponse DeregisterDelegatedAdmin /// ///
  • /// + /// NON_DETACHABLE_POLICY: You can't detach this Amazon Web Services Managed Policy. + /// + ///
  • + /// /// TARGET_NOT_SUPPORTED: You can't perform the specified operation on that target entity. /// ///
  • @@ -11013,6 +11255,10 @@ public virtual DescribeAccountResponse DescribeAccount(DescribeAccountRequest re /// ///
  • /// + /// INVALID_PRINCIPAL: You specified an invalid principal element in the policy. + /// + ///
  • + /// /// INVALID_ROLE_NAME: You provided a role name that isn't valid. A role name can't begin /// with the reserved prefix AWSServiceRoleFor. /// @@ -11060,6 +11306,10 @@ public virtual DescribeAccountResponse DescribeAccount(DescribeAccountRequest re /// ///
  • /// + /// NON_DETACHABLE_POLICY: You can't detach this Amazon Web Services Managed Policy. + /// + ///
  • + /// /// TARGET_NOT_SUPPORTED: You can't perform the specified operation on that target entity. /// ///
  • @@ -11189,6 +11439,10 @@ public virtual DescribeAccountResponse DescribeAccount(DescribeAccountRequest re /// ///
  • /// + /// INVALID_PRINCIPAL: You specified an invalid principal element in the policy. + /// + ///
  • + /// /// INVALID_ROLE_NAME: You provided a role name that isn't valid. A role name can't begin /// with the reserved prefix AWSServiceRoleFor. /// @@ -11236,6 +11490,10 @@ public virtual DescribeAccountResponse DescribeAccount(DescribeAccountRequest re /// ///
  • /// + /// NON_DETACHABLE_POLICY: You can't detach this Amazon Web Services Managed Policy. + /// + ///
  • + /// /// TARGET_NOT_SUPPORTED: You can't perform the specified operation on that target entity. /// ///
  • @@ -11367,6 +11625,10 @@ public virtual DescribeCreateAccountStatusResponse DescribeCreateAccountStatus(D /// ///
  • /// + /// INVALID_PRINCIPAL: You specified an invalid principal element in the policy. + /// + ///
  • + /// /// INVALID_ROLE_NAME: You provided a role name that isn't valid. A role name can't begin /// with the reserved prefix AWSServiceRoleFor. /// @@ -11414,6 +11676,10 @@ public virtual DescribeCreateAccountStatusResponse DescribeCreateAccountStatus(D /// ///
  • /// + /// NON_DETACHABLE_POLICY: You can't detach this Amazon Web Services Managed Policy. + /// + ///
  • + /// /// TARGET_NOT_SUPPORTED: You can't perform the specified operation on that target entity. /// ///
  • @@ -11790,6 +12056,10 @@ public virtual DescribeCreateAccountStatusResponse DescribeCreateAccountStatus(D /// ///
  • /// + /// INVALID_PRINCIPAL: You specified an invalid principal element in the policy. + /// + ///
  • + /// /// INVALID_ROLE_NAME: You provided a role name that isn't valid. A role name can't begin /// with the reserved prefix AWSServiceRoleFor. /// @@ -11837,6 +12107,10 @@ public virtual DescribeCreateAccountStatusResponse DescribeCreateAccountStatus(D /// ///
  • /// + /// NON_DETACHABLE_POLICY: You can't detach this Amazon Web Services Managed Policy. + /// + ///
  • + /// /// TARGET_NOT_SUPPORTED: You can't perform the specified operation on that target entity. /// ///
  • @@ -12215,6 +12489,10 @@ public virtual DescribeEffectivePolicyResponse DescribeEffectivePolicy(DescribeE /// ///
  • /// + /// INVALID_PRINCIPAL: You specified an invalid principal element in the policy. + /// + ///
  • + /// /// INVALID_ROLE_NAME: You provided a role name that isn't valid. A role name can't begin /// with the reserved prefix AWSServiceRoleFor. /// @@ -12262,6 +12540,10 @@ public virtual DescribeEffectivePolicyResponse DescribeEffectivePolicy(DescribeE /// ///
  • /// + /// NON_DETACHABLE_POLICY: You can't detach this Amazon Web Services Managed Policy. + /// + ///
  • + /// /// TARGET_NOT_SUPPORTED: You can't perform the specified operation on that target entity. /// ///
  • @@ -12403,6 +12685,10 @@ public virtual DescribeEffectivePolicyResponse DescribeEffectivePolicy(DescribeE /// ///
  • /// + /// INVALID_PRINCIPAL: You specified an invalid principal element in the policy. + /// + ///
  • + /// /// INVALID_ROLE_NAME: You provided a role name that isn't valid. A role name can't begin /// with the reserved prefix AWSServiceRoleFor. /// @@ -12450,6 +12736,10 @@ public virtual DescribeEffectivePolicyResponse DescribeEffectivePolicy(DescribeE /// ///
  • /// + /// NON_DETACHABLE_POLICY: You can't detach this Amazon Web Services Managed Policy. + /// + ///
  • + /// /// TARGET_NOT_SUPPORTED: You can't perform the specified operation on that target entity. /// ///
  • @@ -12584,6 +12874,10 @@ public virtual DescribeHandshakeResponse DescribeHandshake(DescribeHandshakeRequ /// ///
  • /// + /// INVALID_PRINCIPAL: You specified an invalid principal element in the policy. + /// + ///
  • + /// /// INVALID_ROLE_NAME: You provided a role name that isn't valid. A role name can't begin /// with the reserved prefix AWSServiceRoleFor. /// @@ -12631,6 +12925,10 @@ public virtual DescribeHandshakeResponse DescribeHandshake(DescribeHandshakeRequ /// ///
  • /// + /// NON_DETACHABLE_POLICY: You can't detach this Amazon Web Services Managed Policy. + /// + ///
  • + /// /// TARGET_NOT_SUPPORTED: You can't perform the specified operation on that target entity. /// ///
  • @@ -12877,6 +13175,10 @@ public virtual DescribeOrganizationResponse DescribeOrganization(DescribeOrganiz /// ///
  • /// + /// INVALID_PRINCIPAL: You specified an invalid principal element in the policy. + /// + ///
  • + /// /// INVALID_ROLE_NAME: You provided a role name that isn't valid. A role name can't begin /// with the reserved prefix AWSServiceRoleFor. /// @@ -12924,6 +13226,10 @@ public virtual DescribeOrganizationResponse DescribeOrganization(DescribeOrganiz /// ///
  • /// + /// NON_DETACHABLE_POLICY: You can't detach this Amazon Web Services Managed Policy. + /// + ///
  • + /// /// TARGET_NOT_SUPPORTED: You can't perform the specified operation on that target entity. /// ///
  • @@ -13051,6 +13357,10 @@ public virtual DescribeOrganizationalUnitResponse DescribeOrganizationalUnit(Des /// ///
  • /// + /// INVALID_PRINCIPAL: You specified an invalid principal element in the policy. + /// + ///
  • + /// /// INVALID_ROLE_NAME: You provided a role name that isn't valid. A role name can't begin /// with the reserved prefix AWSServiceRoleFor. /// @@ -13098,6 +13408,10 @@ public virtual DescribeOrganizationalUnitResponse DescribeOrganizationalUnit(Des /// ///
  • /// + /// NON_DETACHABLE_POLICY: You can't detach this Amazon Web Services Managed Policy. + /// + ///
  • + /// /// TARGET_NOT_SUPPORTED: You can't perform the specified operation on that target entity. /// ///
  • @@ -13226,6 +13540,10 @@ public virtual DescribeOrganizationalUnitResponse DescribeOrganizationalUnit(Des /// ///
  • /// + /// INVALID_PRINCIPAL: You specified an invalid principal element in the policy. + /// + ///
  • + /// /// INVALID_ROLE_NAME: You provided a role name that isn't valid. A role name can't begin /// with the reserved prefix AWSServiceRoleFor. /// @@ -13273,6 +13591,10 @@ public virtual DescribeOrganizationalUnitResponse DescribeOrganizationalUnit(Des /// ///
  • /// + /// NON_DETACHABLE_POLICY: You can't detach this Amazon Web Services Managed Policy. + /// + ///
  • + /// /// TARGET_NOT_SUPPORTED: You can't perform the specified operation on that target entity. /// ///
  • @@ -13403,6 +13725,10 @@ public virtual DescribePolicyResponse DescribePolicy(DescribePolicyRequest reque /// ///
  • /// + /// INVALID_PRINCIPAL: You specified an invalid principal element in the policy. + /// + ///
  • + /// /// INVALID_ROLE_NAME: You provided a role name that isn't valid. A role name can't begin /// with the reserved prefix AWSServiceRoleFor. /// @@ -13450,6 +13776,10 @@ public virtual DescribePolicyResponse DescribePolicy(DescribePolicyRequest reque /// ///
  • /// + /// NON_DETACHABLE_POLICY: You can't detach this Amazon Web Services Managed Policy. + /// + ///
  • + /// /// TARGET_NOT_SUPPORTED: You can't perform the specified operation on that target entity. /// ///
  • @@ -14406,6 +14736,10 @@ public virtual DescribeResourcePolicyResponse DescribeResourcePolicy(DescribeRes /// ///
  • /// + /// INVALID_PRINCIPAL: You specified an invalid principal element in the policy. + /// + ///
  • + /// /// INVALID_ROLE_NAME: You provided a role name that isn't valid. A role name can't begin /// with the reserved prefix AWSServiceRoleFor. /// @@ -14453,6 +14787,10 @@ public virtual DescribeResourcePolicyResponse DescribeResourcePolicy(DescribeRes /// ///
  • /// + /// NON_DETACHABLE_POLICY: You can't detach this Amazon Web Services Managed Policy. + /// + ///
  • + /// /// TARGET_NOT_SUPPORTED: You can't perform the specified operation on that target entity. /// ///
  • @@ -14845,6 +15183,10 @@ public virtual DetachPolicyResponse DetachPolicy(DetachPolicyRequest request) /// ///
  • /// + /// INVALID_PRINCIPAL: You specified an invalid principal element in the policy. + /// + ///
  • + /// /// INVALID_ROLE_NAME: You provided a role name that isn't valid. A role name can't begin /// with the reserved prefix AWSServiceRoleFor. /// @@ -14892,6 +15234,10 @@ public virtual DetachPolicyResponse DetachPolicy(DetachPolicyRequest request) /// ///
  • /// + /// NON_DETACHABLE_POLICY: You can't detach this Amazon Web Services Managed Policy. + /// + ///
  • + /// /// TARGET_NOT_SUPPORTED: You can't perform the specified operation on that target entity. /// ///
  • @@ -15333,6 +15679,10 @@ public virtual DetachPolicyResponse DetachPolicy(DetachPolicyRequest request) /// ///
  • /// + /// INVALID_PRINCIPAL: You specified an invalid principal element in the policy. + /// + ///
  • + /// /// INVALID_ROLE_NAME: You provided a role name that isn't valid. A role name can't begin /// with the reserved prefix AWSServiceRoleFor. /// @@ -15380,6 +15730,10 @@ public virtual DetachPolicyResponse DetachPolicy(DetachPolicyRequest request) /// ///
  • /// + /// NON_DETACHABLE_POLICY: You can't detach this Amazon Web Services Managed Policy. + /// + ///
  • + /// /// TARGET_NOT_SUPPORTED: You can't perform the specified operation on that target entity. /// ///
  • @@ -15807,6 +16161,10 @@ public virtual DisableAWSServiceAccessResponse DisableAWSServiceAccess(DisableAW /// ///
  • /// + /// INVALID_PRINCIPAL: You specified an invalid principal element in the policy. + /// + ///
  • + /// /// INVALID_ROLE_NAME: You provided a role name that isn't valid. A role name can't begin /// with the reserved prefix AWSServiceRoleFor. /// @@ -15854,6 +16212,10 @@ public virtual DisableAWSServiceAccessResponse DisableAWSServiceAccess(DisableAW /// ///
  • /// + /// NON_DETACHABLE_POLICY: You can't detach this Amazon Web Services Managed Policy. + /// + ///
  • + /// /// TARGET_NOT_SUPPORTED: You can't perform the specified operation on that target entity. /// ///
  • @@ -16233,6 +16595,10 @@ public virtual DisableAWSServiceAccessResponse DisableAWSServiceAccess(DisableAW /// ///
  • /// + /// INVALID_PRINCIPAL: You specified an invalid principal element in the policy. + /// + ///
  • + /// /// INVALID_ROLE_NAME: You provided a role name that isn't valid. A role name can't begin /// with the reserved prefix AWSServiceRoleFor. /// @@ -16280,6 +16646,10 @@ public virtual DisableAWSServiceAccessResponse DisableAWSServiceAccess(DisableAW /// ///
  • /// + /// NON_DETACHABLE_POLICY: You can't detach this Amazon Web Services Managed Policy. + /// + ///
  • + /// /// TARGET_NOT_SUPPORTED: You can't perform the specified operation on that target entity. /// ///
  • @@ -16671,6 +17041,10 @@ public virtual DisablePolicyTypeResponse DisablePolicyType(DisablePolicyTypeRequ /// ///
  • /// + /// INVALID_PRINCIPAL: You specified an invalid principal element in the policy. + /// + ///
  • + /// /// INVALID_ROLE_NAME: You provided a role name that isn't valid. A role name can't begin /// with the reserved prefix AWSServiceRoleFor. /// @@ -16718,6 +17092,10 @@ public virtual DisablePolicyTypeResponse DisablePolicyType(DisablePolicyTypeRequ /// ///
  • /// + /// NON_DETACHABLE_POLICY: You can't detach this Amazon Web Services Managed Policy. + /// + ///
  • + /// /// TARGET_NOT_SUPPORTED: You can't perform the specified operation on that target entity. /// ///
  • @@ -16961,6 +17339,10 @@ public virtual DisablePolicyTypeResponse DisablePolicyType(DisablePolicyTypeRequ /// ///
  • /// + /// INVALID_PRINCIPAL: You specified an invalid principal element in the policy. + /// + ///
  • + /// /// INVALID_ROLE_NAME: You provided a role name that isn't valid. A role name can't begin /// with the reserved prefix AWSServiceRoleFor. /// @@ -17008,6 +17390,10 @@ public virtual DisablePolicyTypeResponse DisablePolicyType(DisablePolicyTypeRequ /// ///
  • /// + /// NON_DETACHABLE_POLICY: You can't detach this Amazon Web Services Managed Policy. + /// + ///
  • + /// /// TARGET_NOT_SUPPORTED: You can't perform the specified operation on that target entity. /// ///
  • @@ -17234,6 +17620,10 @@ public virtual EnableAllFeaturesResponse EnableAllFeatures(EnableAllFeaturesRequ /// ///
  • /// + /// INVALID_PRINCIPAL: You specified an invalid principal element in the policy. + /// + ///
  • + /// /// INVALID_ROLE_NAME: You provided a role name that isn't valid. A role name can't begin /// with the reserved prefix AWSServiceRoleFor. /// @@ -17281,6 +17671,10 @@ public virtual EnableAllFeaturesResponse EnableAllFeatures(EnableAllFeaturesRequ /// ///
  • /// + /// NON_DETACHABLE_POLICY: You can't detach this Amazon Web Services Managed Policy. + /// + ///
  • + /// /// TARGET_NOT_SUPPORTED: You can't perform the specified operation on that target entity. /// ///
  • @@ -17662,6 +18056,10 @@ public virtual EnableAllFeaturesResponse EnableAllFeatures(EnableAllFeaturesRequ /// ///
  • /// + /// INVALID_PRINCIPAL: You specified an invalid principal element in the policy. + /// + ///
  • + /// /// INVALID_ROLE_NAME: You provided a role name that isn't valid. A role name can't begin /// with the reserved prefix AWSServiceRoleFor. /// @@ -17709,6 +18107,10 @@ public virtual EnableAllFeaturesResponse EnableAllFeatures(EnableAllFeaturesRequ /// ///
  • /// + /// NON_DETACHABLE_POLICY: You can't detach this Amazon Web Services Managed Policy. + /// + ///
  • + /// /// TARGET_NOT_SUPPORTED: You can't perform the specified operation on that target entity. /// ///
  • @@ -18092,6 +18494,10 @@ public virtual EnableAWSServiceAccessResponse EnableAWSServiceAccess(EnableAWSSe /// ///
  • /// + /// INVALID_PRINCIPAL: You specified an invalid principal element in the policy. + /// + ///
  • + /// /// INVALID_ROLE_NAME: You provided a role name that isn't valid. A role name can't begin /// with the reserved prefix AWSServiceRoleFor. /// @@ -18139,6 +18545,10 @@ public virtual EnableAWSServiceAccessResponse EnableAWSServiceAccess(EnableAWSSe /// ///
  • /// + /// NON_DETACHABLE_POLICY: You can't detach this Amazon Web Services Managed Policy. + /// + ///
  • + /// /// TARGET_NOT_SUPPORTED: You can't perform the specified operation on that target entity. /// ///
  • @@ -18515,6 +18925,10 @@ public virtual EnableAWSServiceAccessResponse EnableAWSServiceAccess(EnableAWSSe /// ///
  • /// + /// INVALID_PRINCIPAL: You specified an invalid principal element in the policy. + /// + ///
  • + /// /// INVALID_ROLE_NAME: You provided a role name that isn't valid. A role name can't begin /// with the reserved prefix AWSServiceRoleFor. /// @@ -18562,6 +18976,10 @@ public virtual EnableAWSServiceAccessResponse EnableAWSServiceAccess(EnableAWSSe /// ///
  • /// + /// NON_DETACHABLE_POLICY: You can't detach this Amazon Web Services Managed Policy. + /// + ///
  • + /// /// TARGET_NOT_SUPPORTED: You can't perform the specified operation on that target entity. /// ///
  • @@ -18953,6 +19371,10 @@ public virtual EnablePolicyTypeResponse EnablePolicyType(EnablePolicyTypeRequest /// ///
  • /// + /// INVALID_PRINCIPAL: You specified an invalid principal element in the policy. + /// + ///
  • + /// /// INVALID_ROLE_NAME: You provided a role name that isn't valid. A role name can't begin /// with the reserved prefix AWSServiceRoleFor. /// @@ -19000,6 +19422,10 @@ public virtual EnablePolicyTypeResponse EnablePolicyType(EnablePolicyTypeRequest /// ///
  • /// + /// NON_DETACHABLE_POLICY: You can't detach this Amazon Web Services Managed Policy. + /// + ///
  • + /// /// TARGET_NOT_SUPPORTED: You can't perform the specified operation on that target entity. /// ///
  • @@ -19487,6 +19913,10 @@ public virtual EnablePolicyTypeResponse EnablePolicyType(EnablePolicyTypeRequest /// ///
  • /// + /// INVALID_PRINCIPAL: You specified an invalid principal element in the policy. + /// + ///
  • + /// /// INVALID_ROLE_NAME: You provided a role name that isn't valid. A role name can't begin /// with the reserved prefix AWSServiceRoleFor. /// @@ -19534,6 +19964,10 @@ public virtual EnablePolicyTypeResponse EnablePolicyType(EnablePolicyTypeRequest /// ///
  • /// + /// NON_DETACHABLE_POLICY: You can't detach this Amazon Web Services Managed Policy. + /// + ///
  • + /// /// TARGET_NOT_SUPPORTED: You can't perform the specified operation on that target entity. /// ///
  • @@ -20001,6 +20435,10 @@ public virtual InviteAccountToOrganizationResponse InviteAccountToOrganization(I /// ///
  • /// + /// INVALID_PRINCIPAL: You specified an invalid principal element in the policy. + /// + ///
  • + /// /// INVALID_ROLE_NAME: You provided a role name that isn't valid. A role name can't begin /// with the reserved prefix AWSServiceRoleFor. /// @@ -20048,6 +20486,10 @@ public virtual InviteAccountToOrganizationResponse InviteAccountToOrganization(I /// ///
  • /// + /// NON_DETACHABLE_POLICY: You can't detach this Amazon Web Services Managed Policy. + /// + ///
  • + /// /// TARGET_NOT_SUPPORTED: You can't perform the specified operation on that target entity. /// ///
  • @@ -20481,6 +20923,10 @@ public virtual InviteAccountToOrganizationResponse InviteAccountToOrganization(I /// ///
  • /// + /// INVALID_PRINCIPAL: You specified an invalid principal element in the policy. + /// + ///
  • + /// /// INVALID_ROLE_NAME: You provided a role name that isn't valid. A role name can't begin /// with the reserved prefix AWSServiceRoleFor. /// @@ -20528,6 +20974,10 @@ public virtual InviteAccountToOrganizationResponse InviteAccountToOrganization(I /// ///
  • /// + /// NON_DETACHABLE_POLICY: You can't detach this Amazon Web Services Managed Policy. + /// + ///
  • + /// /// TARGET_NOT_SUPPORTED: You can't perform the specified operation on that target entity. /// ///
  • @@ -20965,6 +21415,10 @@ public virtual LeaveOrganizationResponse LeaveOrganization(LeaveOrganizationRequ /// ///
  • /// + /// INVALID_PRINCIPAL: You specified an invalid principal element in the policy. + /// + ///
  • + /// /// INVALID_ROLE_NAME: You provided a role name that isn't valid. A role name can't begin /// with the reserved prefix AWSServiceRoleFor. /// @@ -21012,6 +21466,10 @@ public virtual LeaveOrganizationResponse LeaveOrganization(LeaveOrganizationRequ /// ///
  • /// + /// NON_DETACHABLE_POLICY: You can't detach this Amazon Web Services Managed Policy. + /// + ///
  • + /// /// TARGET_NOT_SUPPORTED: You can't perform the specified operation on that target entity. /// ///
  • @@ -21150,6 +21608,10 @@ public virtual LeaveOrganizationResponse LeaveOrganization(LeaveOrganizationRequ /// ///
  • /// + /// INVALID_PRINCIPAL: You specified an invalid principal element in the policy. + /// + ///
  • + /// /// INVALID_ROLE_NAME: You provided a role name that isn't valid. A role name can't begin /// with the reserved prefix AWSServiceRoleFor. /// @@ -21197,6 +21659,10 @@ public virtual LeaveOrganizationResponse LeaveOrganization(LeaveOrganizationRequ /// ///
  • /// + /// NON_DETACHABLE_POLICY: You can't detach this Amazon Web Services Managed Policy. + /// + ///
  • + /// /// TARGET_NOT_SUPPORTED: You can't perform the specified operation on that target entity. /// ///
  • @@ -21329,6 +21795,10 @@ public virtual ListAccountsResponse ListAccounts(ListAccountsRequest request) /// ///
  • /// + /// INVALID_PRINCIPAL: You specified an invalid principal element in the policy. + /// + ///
  • + /// /// INVALID_ROLE_NAME: You provided a role name that isn't valid. A role name can't begin /// with the reserved prefix AWSServiceRoleFor. /// @@ -21376,6 +21846,10 @@ public virtual ListAccountsResponse ListAccounts(ListAccountsRequest request) /// ///
  • /// + /// NON_DETACHABLE_POLICY: You can't detach this Amazon Web Services Managed Policy. + /// + ///
  • + /// /// TARGET_NOT_SUPPORTED: You can't perform the specified operation on that target entity. /// ///
  • @@ -21512,6 +21986,10 @@ public virtual ListAccountsResponse ListAccounts(ListAccountsRequest request) /// ///
  • /// + /// INVALID_PRINCIPAL: You specified an invalid principal element in the policy. + /// + ///
  • + /// /// INVALID_ROLE_NAME: You provided a role name that isn't valid. A role name can't begin /// with the reserved prefix AWSServiceRoleFor. /// @@ -21559,6 +22037,10 @@ public virtual ListAccountsResponse ListAccounts(ListAccountsRequest request) /// ///
  • /// + /// NON_DETACHABLE_POLICY: You can't detach this Amazon Web Services Managed Policy. + /// + ///
  • + /// /// TARGET_NOT_SUPPORTED: You can't perform the specified operation on that target entity. /// ///
  • @@ -21697,6 +22179,10 @@ public virtual ListAccountsForParentResponse ListAccountsForParent(ListAccountsF /// ///
  • /// + /// INVALID_PRINCIPAL: You specified an invalid principal element in the policy. + /// + ///
  • + /// /// INVALID_ROLE_NAME: You provided a role name that isn't valid. A role name can't begin /// with the reserved prefix AWSServiceRoleFor. /// @@ -21744,6 +22230,10 @@ public virtual ListAccountsForParentResponse ListAccountsForParent(ListAccountsF /// ///
  • /// + /// NON_DETACHABLE_POLICY: You can't detach this Amazon Web Services Managed Policy. + /// + ///
  • + /// /// TARGET_NOT_SUPPORTED: You can't perform the specified operation on that target entity. /// ///
  • @@ -22111,6 +22601,10 @@ public virtual ListAccountsForParentResponse ListAccountsForParent(ListAccountsF /// ///
  • /// + /// INVALID_PRINCIPAL: You specified an invalid principal element in the policy. + /// + ///
  • + /// /// INVALID_ROLE_NAME: You provided a role name that isn't valid. A role name can't begin /// with the reserved prefix AWSServiceRoleFor. /// @@ -22158,6 +22652,10 @@ public virtual ListAccountsForParentResponse ListAccountsForParent(ListAccountsF /// ///
  • /// + /// NON_DETACHABLE_POLICY: You can't detach this Amazon Web Services Managed Policy. + /// + ///
  • + /// /// TARGET_NOT_SUPPORTED: You can't perform the specified operation on that target entity. /// ///
  • @@ -22524,6 +23022,10 @@ public virtual ListAWSServiceAccessForOrganizationResponse ListAWSServiceAccessF /// ///
  • /// + /// INVALID_PRINCIPAL: You specified an invalid principal element in the policy. + /// + ///
  • + /// /// INVALID_ROLE_NAME: You provided a role name that isn't valid. A role name can't begin /// with the reserved prefix AWSServiceRoleFor. /// @@ -22571,6 +23073,10 @@ public virtual ListAWSServiceAccessForOrganizationResponse ListAWSServiceAccessF /// ///
  • /// + /// NON_DETACHABLE_POLICY: You can't detach this Amazon Web Services Managed Policy. + /// + ///
  • + /// /// TARGET_NOT_SUPPORTED: You can't perform the specified operation on that target entity. /// ///
  • @@ -22708,6 +23214,10 @@ public virtual ListAWSServiceAccessForOrganizationResponse ListAWSServiceAccessF /// ///
  • /// + /// INVALID_PRINCIPAL: You specified an invalid principal element in the policy. + /// + ///
  • + /// /// INVALID_ROLE_NAME: You provided a role name that isn't valid. A role name can't begin /// with the reserved prefix AWSServiceRoleFor. /// @@ -22755,6 +23265,10 @@ public virtual ListAWSServiceAccessForOrganizationResponse ListAWSServiceAccessF /// ///
  • /// + /// NON_DETACHABLE_POLICY: You can't detach this Amazon Web Services Managed Policy. + /// + ///
  • + /// /// TARGET_NOT_SUPPORTED: You can't perform the specified operation on that target entity. /// ///
  • @@ -22891,6 +23405,10 @@ public virtual ListChildrenResponse ListChildren(ListChildrenRequest request) /// ///
  • /// + /// INVALID_PRINCIPAL: You specified an invalid principal element in the policy. + /// + ///
  • + /// /// INVALID_ROLE_NAME: You provided a role name that isn't valid. A role name can't begin /// with the reserved prefix AWSServiceRoleFor. /// @@ -22938,6 +23456,10 @@ public virtual ListChildrenResponse ListChildren(ListChildrenRequest request) /// ///
  • /// + /// NON_DETACHABLE_POLICY: You can't detach this Amazon Web Services Managed Policy. + /// + ///
  • + /// /// TARGET_NOT_SUPPORTED: You can't perform the specified operation on that target entity. /// ///
  • @@ -23074,6 +23596,10 @@ public virtual ListChildrenResponse ListChildren(ListChildrenRequest request) /// ///
  • /// + /// INVALID_PRINCIPAL: You specified an invalid principal element in the policy. + /// + ///
  • + /// /// INVALID_ROLE_NAME: You provided a role name that isn't valid. A role name can't begin /// with the reserved prefix AWSServiceRoleFor. /// @@ -23121,6 +23647,10 @@ public virtual ListChildrenResponse ListChildren(ListChildrenRequest request) /// ///
  • /// + /// NON_DETACHABLE_POLICY: You can't detach this Amazon Web Services Managed Policy. + /// + ///
  • + /// /// TARGET_NOT_SUPPORTED: You can't perform the specified operation on that target entity. /// ///
  • @@ -23256,6 +23786,10 @@ public virtual ListCreateAccountStatusResponse ListCreateAccountStatus(ListCreat /// ///
  • /// + /// INVALID_PRINCIPAL: You specified an invalid principal element in the policy. + /// + ///
  • + /// /// INVALID_ROLE_NAME: You provided a role name that isn't valid. A role name can't begin /// with the reserved prefix AWSServiceRoleFor. /// @@ -23303,6 +23837,10 @@ public virtual ListCreateAccountStatusResponse ListCreateAccountStatus(ListCreat /// ///
  • /// + /// NON_DETACHABLE_POLICY: You can't detach this Amazon Web Services Managed Policy. + /// + ///
  • + /// /// TARGET_NOT_SUPPORTED: You can't perform the specified operation on that target entity. /// ///
  • @@ -23662,6 +24200,10 @@ public virtual ListCreateAccountStatusResponse ListCreateAccountStatus(ListCreat /// ///
  • /// + /// INVALID_PRINCIPAL: You specified an invalid principal element in the policy. + /// + ///
  • + /// /// INVALID_ROLE_NAME: You provided a role name that isn't valid. A role name can't begin /// with the reserved prefix AWSServiceRoleFor. /// @@ -23709,6 +24251,10 @@ public virtual ListCreateAccountStatusResponse ListCreateAccountStatus(ListCreat /// ///
  • /// + /// NON_DETACHABLE_POLICY: You can't detach this Amazon Web Services Managed Policy. + /// + ///
  • + /// /// TARGET_NOT_SUPPORTED: You can't perform the specified operation on that target entity. /// ///
  • @@ -24067,6 +24613,10 @@ public virtual ListDelegatedAdministratorsResponse ListDelegatedAdministrators(L /// ///
  • /// + /// INVALID_PRINCIPAL: You specified an invalid principal element in the policy. + /// + ///
  • + /// /// INVALID_ROLE_NAME: You provided a role name that isn't valid. A role name can't begin /// with the reserved prefix AWSServiceRoleFor. /// @@ -24114,6 +24664,10 @@ public virtual ListDelegatedAdministratorsResponse ListDelegatedAdministrators(L /// ///
  • /// + /// NON_DETACHABLE_POLICY: You can't detach this Amazon Web Services Managed Policy. + /// + ///
  • + /// /// TARGET_NOT_SUPPORTED: You can't perform the specified operation on that target entity. /// ///
  • @@ -24482,6 +25036,10 @@ public virtual ListDelegatedAdministratorsResponse ListDelegatedAdministrators(L /// ///
  • /// + /// INVALID_PRINCIPAL: You specified an invalid principal element in the policy. + /// + ///
  • + /// /// INVALID_ROLE_NAME: You provided a role name that isn't valid. A role name can't begin /// with the reserved prefix AWSServiceRoleFor. /// @@ -24529,6 +25087,10 @@ public virtual ListDelegatedAdministratorsResponse ListDelegatedAdministrators(L /// ///
  • /// + /// NON_DETACHABLE_POLICY: You can't detach this Amazon Web Services Managed Policy. + /// + ///
  • + /// /// TARGET_NOT_SUPPORTED: You can't perform the specified operation on that target entity. /// ///
  • @@ -24896,6 +25458,10 @@ public virtual ListDelegatedServicesForAccountResponse ListDelegatedServicesForA /// ///
  • /// + /// INVALID_PRINCIPAL: You specified an invalid principal element in the policy. + /// + ///
  • + /// /// INVALID_ROLE_NAME: You provided a role name that isn't valid. A role name can't begin /// with the reserved prefix AWSServiceRoleFor. /// @@ -24943,6 +25509,10 @@ public virtual ListDelegatedServicesForAccountResponse ListDelegatedServicesForA /// ///
  • /// + /// NON_DETACHABLE_POLICY: You can't detach this Amazon Web Services Managed Policy. + /// + ///
  • + /// /// TARGET_NOT_SUPPORTED: You can't perform the specified operation on that target entity. /// ///
  • @@ -25084,6 +25654,10 @@ public virtual ListDelegatedServicesForAccountResponse ListDelegatedServicesForA /// ///
  • /// + /// INVALID_PRINCIPAL: You specified an invalid principal element in the policy. + /// + ///
  • + /// /// INVALID_ROLE_NAME: You provided a role name that isn't valid. A role name can't begin /// with the reserved prefix AWSServiceRoleFor. /// @@ -25131,6 +25705,10 @@ public virtual ListDelegatedServicesForAccountResponse ListDelegatedServicesForA /// ///
  • /// + /// NON_DETACHABLE_POLICY: You can't detach this Amazon Web Services Managed Policy. + /// + ///
  • + /// /// TARGET_NOT_SUPPORTED: You can't perform the specified operation on that target entity. /// ///
  • @@ -25268,6 +25846,10 @@ public virtual ListHandshakesForAccountResponse ListHandshakesForAccount(ListHan /// ///
  • /// + /// INVALID_PRINCIPAL: You specified an invalid principal element in the policy. + /// + ///
  • + /// /// INVALID_ROLE_NAME: You provided a role name that isn't valid. A role name can't begin /// with the reserved prefix AWSServiceRoleFor. /// @@ -25315,6 +25897,10 @@ public virtual ListHandshakesForAccountResponse ListHandshakesForAccount(ListHan /// ///
  • /// + /// NON_DETACHABLE_POLICY: You can't detach this Amazon Web Services Managed Policy. + /// + ///
  • + /// /// TARGET_NOT_SUPPORTED: You can't perform the specified operation on that target entity. /// ///
  • @@ -25459,6 +26045,10 @@ public virtual ListHandshakesForAccountResponse ListHandshakesForAccount(ListHan /// ///
  • /// + /// INVALID_PRINCIPAL: You specified an invalid principal element in the policy. + /// + ///
  • + /// /// INVALID_ROLE_NAME: You provided a role name that isn't valid. A role name can't begin /// with the reserved prefix AWSServiceRoleFor. /// @@ -25506,6 +26096,10 @@ public virtual ListHandshakesForAccountResponse ListHandshakesForAccount(ListHan /// ///
  • /// + /// NON_DETACHABLE_POLICY: You can't detach this Amazon Web Services Managed Policy. + /// + ///
  • + /// /// TARGET_NOT_SUPPORTED: You can't perform the specified operation on that target entity. /// ///
  • @@ -25649,6 +26243,10 @@ public virtual ListHandshakesForOrganizationResponse ListHandshakesForOrganizati /// ///
  • /// + /// INVALID_PRINCIPAL: You specified an invalid principal element in the policy. + /// + ///
  • + /// /// INVALID_ROLE_NAME: You provided a role name that isn't valid. A role name can't begin /// with the reserved prefix AWSServiceRoleFor. /// @@ -25696,6 +26294,10 @@ public virtual ListHandshakesForOrganizationResponse ListHandshakesForOrganizati /// ///
  • /// + /// NON_DETACHABLE_POLICY: You can't detach this Amazon Web Services Managed Policy. + /// + ///
  • + /// /// TARGET_NOT_SUPPORTED: You can't perform the specified operation on that target entity. /// ///
  • @@ -25828,6 +26430,10 @@ public virtual ListHandshakesForOrganizationResponse ListHandshakesForOrganizati /// ///
  • /// + /// INVALID_PRINCIPAL: You specified an invalid principal element in the policy. + /// + ///
  • + /// /// INVALID_ROLE_NAME: You provided a role name that isn't valid. A role name can't begin /// with the reserved prefix AWSServiceRoleFor. /// @@ -25875,6 +26481,10 @@ public virtual ListHandshakesForOrganizationResponse ListHandshakesForOrganizati /// ///
  • /// + /// NON_DETACHABLE_POLICY: You can't detach this Amazon Web Services Managed Policy. + /// + ///
  • + /// /// TARGET_NOT_SUPPORTED: You can't perform the specified operation on that target entity. /// ///
  • @@ -26009,6 +26619,10 @@ public virtual ListOrganizationalUnitsForParentResponse ListOrganizationalUnitsF /// ///
  • /// + /// INVALID_PRINCIPAL: You specified an invalid principal element in the policy. + /// + ///
  • + /// /// INVALID_ROLE_NAME: You provided a role name that isn't valid. A role name can't begin /// with the reserved prefix AWSServiceRoleFor. /// @@ -26056,6 +26670,10 @@ public virtual ListOrganizationalUnitsForParentResponse ListOrganizationalUnitsF /// ///
  • /// + /// NON_DETACHABLE_POLICY: You can't detach this Amazon Web Services Managed Policy. + /// + ///
  • + /// /// TARGET_NOT_SUPPORTED: You can't perform the specified operation on that target entity. /// ///
  • @@ -26202,6 +26820,10 @@ public virtual ListOrganizationalUnitsForParentResponse ListOrganizationalUnitsF /// ///
  • /// + /// INVALID_PRINCIPAL: You specified an invalid principal element in the policy. + /// + ///
  • + /// /// INVALID_ROLE_NAME: You provided a role name that isn't valid. A role name can't begin /// with the reserved prefix AWSServiceRoleFor. /// @@ -26249,6 +26871,10 @@ public virtual ListOrganizationalUnitsForParentResponse ListOrganizationalUnitsF /// ///
  • /// + /// NON_DETACHABLE_POLICY: You can't detach this Amazon Web Services Managed Policy. + /// + ///
  • + /// /// TARGET_NOT_SUPPORTED: You can't perform the specified operation on that target entity. /// ///
  • @@ -26391,6 +27017,10 @@ public virtual ListParentsResponse ListParents(ListParentsRequest request) /// ///
  • /// + /// INVALID_PRINCIPAL: You specified an invalid principal element in the policy. + /// + ///
  • + /// /// INVALID_ROLE_NAME: You provided a role name that isn't valid. A role name can't begin /// with the reserved prefix AWSServiceRoleFor. /// @@ -26438,6 +27068,10 @@ public virtual ListParentsResponse ListParents(ListParentsRequest request) /// ///
  • /// + /// NON_DETACHABLE_POLICY: You can't detach this Amazon Web Services Managed Policy. + /// + ///
  • + /// /// TARGET_NOT_SUPPORTED: You can't perform the specified operation on that target entity. /// ///
  • @@ -26570,6 +27204,10 @@ public virtual ListParentsResponse ListParents(ListParentsRequest request) /// ///
  • /// + /// INVALID_PRINCIPAL: You specified an invalid principal element in the policy. + /// + ///
  • + /// /// INVALID_ROLE_NAME: You provided a role name that isn't valid. A role name can't begin /// with the reserved prefix AWSServiceRoleFor. /// @@ -26617,6 +27255,10 @@ public virtual ListParentsResponse ListParents(ListParentsRequest request) /// ///
  • /// + /// NON_DETACHABLE_POLICY: You can't detach this Amazon Web Services Managed Policy. + /// + ///
  • + /// /// TARGET_NOT_SUPPORTED: You can't perform the specified operation on that target entity. /// ///
  • @@ -26751,6 +27393,10 @@ public virtual ListPoliciesResponse ListPolicies(ListPoliciesRequest request) /// ///
  • /// + /// INVALID_PRINCIPAL: You specified an invalid principal element in the policy. + /// + ///
  • + /// /// INVALID_ROLE_NAME: You provided a role name that isn't valid. A role name can't begin /// with the reserved prefix AWSServiceRoleFor. /// @@ -26798,6 +27444,10 @@ public virtual ListPoliciesResponse ListPolicies(ListPoliciesRequest request) /// ///
  • /// + /// NON_DETACHABLE_POLICY: You can't detach this Amazon Web Services Managed Policy. + /// + ///
  • + /// /// TARGET_NOT_SUPPORTED: You can't perform the specified operation on that target entity. /// ///
  • @@ -26935,6 +27585,10 @@ public virtual ListPoliciesResponse ListPolicies(ListPoliciesRequest request) /// ///
  • /// + /// INVALID_PRINCIPAL: You specified an invalid principal element in the policy. + /// + ///
  • + /// /// INVALID_ROLE_NAME: You provided a role name that isn't valid. A role name can't begin /// with the reserved prefix AWSServiceRoleFor. /// @@ -26982,6 +27636,10 @@ public virtual ListPoliciesResponse ListPolicies(ListPoliciesRequest request) /// ///
  • /// + /// NON_DETACHABLE_POLICY: You can't detach this Amazon Web Services Managed Policy. + /// + ///
  • + /// /// TARGET_NOT_SUPPORTED: You can't perform the specified operation on that target entity. /// ///
  • @@ -27121,6 +27779,10 @@ public virtual ListPoliciesForTargetResponse ListPoliciesForTarget(ListPoliciesF /// ///
  • /// + /// INVALID_PRINCIPAL: You specified an invalid principal element in the policy. + /// + ///
  • + /// /// INVALID_ROLE_NAME: You provided a role name that isn't valid. A role name can't begin /// with the reserved prefix AWSServiceRoleFor. /// @@ -27168,6 +27830,10 @@ public virtual ListPoliciesForTargetResponse ListPoliciesForTarget(ListPoliciesF /// ///
  • /// + /// NON_DETACHABLE_POLICY: You can't detach this Amazon Web Services Managed Policy. + /// + ///
  • + /// /// TARGET_NOT_SUPPORTED: You can't perform the specified operation on that target entity. /// ///
  • @@ -27315,6 +27981,10 @@ public virtual ListPoliciesForTargetResponse ListPoliciesForTarget(ListPoliciesF /// ///
  • /// + /// INVALID_PRINCIPAL: You specified an invalid principal element in the policy. + /// + ///
  • + /// /// INVALID_ROLE_NAME: You provided a role name that isn't valid. A role name can't begin /// with the reserved prefix AWSServiceRoleFor. /// @@ -27362,6 +28032,10 @@ public virtual ListPoliciesForTargetResponse ListPoliciesForTarget(ListPoliciesF /// ///
  • /// + /// NON_DETACHABLE_POLICY: You can't detach this Amazon Web Services Managed Policy. + /// + ///
  • + /// /// TARGET_NOT_SUPPORTED: You can't perform the specified operation on that target entity. /// ///
  • @@ -27502,6 +28176,10 @@ public virtual ListRootsResponse ListRoots(ListRootsRequest request) /// ///
  • /// + /// INVALID_PRINCIPAL: You specified an invalid principal element in the policy. + /// + ///
  • + /// /// INVALID_ROLE_NAME: You provided a role name that isn't valid. A role name can't begin /// with the reserved prefix AWSServiceRoleFor. /// @@ -27549,6 +28227,10 @@ public virtual ListRootsResponse ListRoots(ListRootsRequest request) /// ///
  • /// + /// NON_DETACHABLE_POLICY: You can't detach this Amazon Web Services Managed Policy. + /// + ///
  • + /// /// TARGET_NOT_SUPPORTED: You can't perform the specified operation on that target entity. /// ///
  • @@ -27694,6 +28376,10 @@ public virtual ListRootsResponse ListRoots(ListRootsRequest request) /// ///
  • /// + /// INVALID_PRINCIPAL: You specified an invalid principal element in the policy. + /// + ///
  • + /// /// INVALID_ROLE_NAME: You provided a role name that isn't valid. A role name can't begin /// with the reserved prefix AWSServiceRoleFor. /// @@ -27741,6 +28427,10 @@ public virtual ListRootsResponse ListRoots(ListRootsRequest request) /// ///
  • /// + /// NON_DETACHABLE_POLICY: You can't detach this Amazon Web Services Managed Policy. + /// + ///
  • + /// /// TARGET_NOT_SUPPORTED: You can't perform the specified operation on that target entity. /// ///
  • @@ -27888,6 +28578,10 @@ public virtual ListTagsForResourceResponse ListTagsForResource(ListTagsForResour /// ///
  • /// + /// INVALID_PRINCIPAL: You specified an invalid principal element in the policy. + /// + ///
  • + /// /// INVALID_ROLE_NAME: You provided a role name that isn't valid. A role name can't begin /// with the reserved prefix AWSServiceRoleFor. /// @@ -27935,6 +28629,10 @@ public virtual ListTagsForResourceResponse ListTagsForResource(ListTagsForResour /// ///
  • /// + /// NON_DETACHABLE_POLICY: You can't detach this Amazon Web Services Managed Policy. + /// + ///
  • + /// /// TARGET_NOT_SUPPORTED: You can't perform the specified operation on that target entity. /// ///
  • @@ -28071,6 +28769,10 @@ public virtual ListTagsForResourceResponse ListTagsForResource(ListTagsForResour /// ///
  • /// + /// INVALID_PRINCIPAL: You specified an invalid principal element in the policy. + /// + ///
  • + /// /// INVALID_ROLE_NAME: You provided a role name that isn't valid. A role name can't begin /// with the reserved prefix AWSServiceRoleFor. /// @@ -28118,6 +28820,10 @@ public virtual ListTagsForResourceResponse ListTagsForResource(ListTagsForResour /// ///
  • /// + /// NON_DETACHABLE_POLICY: You can't detach this Amazon Web Services Managed Policy. + /// + ///
  • + /// /// TARGET_NOT_SUPPORTED: You can't perform the specified operation on that target entity. /// ///
  • @@ -28256,6 +28962,10 @@ public virtual ListTargetsForPolicyResponse ListTargetsForPolicy(ListTargetsForP /// ///
  • /// + /// INVALID_PRINCIPAL: You specified an invalid principal element in the policy. + /// + ///
  • + /// /// INVALID_ROLE_NAME: You provided a role name that isn't valid. A role name can't begin /// with the reserved prefix AWSServiceRoleFor. /// @@ -28303,6 +29013,10 @@ public virtual ListTargetsForPolicyResponse ListTargetsForPolicy(ListTargetsForP /// ///
  • /// + /// NON_DETACHABLE_POLICY: You can't detach this Amazon Web Services Managed Policy. + /// + ///
  • + /// /// TARGET_NOT_SUPPORTED: You can't perform the specified operation on that target entity. /// ///
  • @@ -28450,6 +29164,10 @@ public virtual ListTargetsForPolicyResponse ListTargetsForPolicy(ListTargetsForP /// ///
  • /// + /// INVALID_PRINCIPAL: You specified an invalid principal element in the policy. + /// + ///
  • + /// /// INVALID_ROLE_NAME: You provided a role name that isn't valid. A role name can't begin /// with the reserved prefix AWSServiceRoleFor. /// @@ -28497,6 +29215,10 @@ public virtual ListTargetsForPolicyResponse ListTargetsForPolicy(ListTargetsForP /// ///
  • /// + /// NON_DETACHABLE_POLICY: You can't detach this Amazon Web Services Managed Policy. + /// + ///
  • + /// /// TARGET_NOT_SUPPORTED: You can't perform the specified operation on that target entity. /// ///
  • @@ -28640,6 +29362,10 @@ public virtual MoveAccountResponse MoveAccount(MoveAccountRequest request) /// ///
  • /// + /// INVALID_PRINCIPAL: You specified an invalid principal element in the policy. + /// + ///
  • + /// /// INVALID_ROLE_NAME: You provided a role name that isn't valid. A role name can't begin /// with the reserved prefix AWSServiceRoleFor. /// @@ -28687,6 +29413,10 @@ public virtual MoveAccountResponse MoveAccount(MoveAccountRequest request) /// ///
  • /// + /// NON_DETACHABLE_POLICY: You can't detach this Amazon Web Services Managed Policy. + /// + ///
  • + /// /// TARGET_NOT_SUPPORTED: You can't perform the specified operation on that target entity. /// ///
  • @@ -29048,6 +29778,10 @@ public virtual MoveAccountResponse MoveAccount(MoveAccountRequest request) /// ///
  • /// + /// INVALID_PRINCIPAL: You specified an invalid principal element in the policy. + /// + ///
  • + /// /// INVALID_ROLE_NAME: You provided a role name that isn't valid. A role name can't begin /// with the reserved prefix AWSServiceRoleFor. /// @@ -29095,6 +29829,10 @@ public virtual MoveAccountResponse MoveAccount(MoveAccountRequest request) /// ///
  • /// + /// NON_DETACHABLE_POLICY: You can't detach this Amazon Web Services Managed Policy. + /// + ///
  • + /// /// TARGET_NOT_SUPPORTED: You can't perform the specified operation on that target entity. /// ///
  • @@ -29455,6 +30193,10 @@ public virtual PutResourcePolicyResponse PutResourcePolicy(PutResourcePolicyRequ /// ///
  • /// + /// INVALID_PRINCIPAL: You specified an invalid principal element in the policy. + /// + ///
  • + /// /// INVALID_ROLE_NAME: You provided a role name that isn't valid. A role name can't begin /// with the reserved prefix AWSServiceRoleFor. /// @@ -29502,6 +30244,10 @@ public virtual PutResourcePolicyResponse PutResourcePolicy(PutResourcePolicyRequ /// ///
  • /// + /// NON_DETACHABLE_POLICY: You can't detach this Amazon Web Services Managed Policy. + /// + ///
  • + /// /// TARGET_NOT_SUPPORTED: You can't perform the specified operation on that target entity. /// ///
  • @@ -29883,6 +30629,10 @@ public virtual PutResourcePolicyResponse PutResourcePolicy(PutResourcePolicyRequ /// ///
  • /// + /// INVALID_PRINCIPAL: You specified an invalid principal element in the policy. + /// + ///
  • + /// /// INVALID_ROLE_NAME: You provided a role name that isn't valid. A role name can't begin /// with the reserved prefix AWSServiceRoleFor. /// @@ -29930,6 +30680,10 @@ public virtual PutResourcePolicyResponse PutResourcePolicy(PutResourcePolicyRequ /// ///
  • /// + /// NON_DETACHABLE_POLICY: You can't detach this Amazon Web Services Managed Policy. + /// + ///
  • + /// /// TARGET_NOT_SUPPORTED: You can't perform the specified operation on that target entity. /// ///
  • @@ -30310,6 +31064,10 @@ public virtual RegisterDelegatedAdministratorResponse RegisterDelegatedAdministr /// ///
  • /// + /// INVALID_PRINCIPAL: You specified an invalid principal element in the policy. + /// + ///
  • + /// /// INVALID_ROLE_NAME: You provided a role name that isn't valid. A role name can't begin /// with the reserved prefix AWSServiceRoleFor. /// @@ -30357,6 +31115,10 @@ public virtual RegisterDelegatedAdministratorResponse RegisterDelegatedAdministr /// ///
  • /// + /// NON_DETACHABLE_POLICY: You can't detach this Amazon Web Services Managed Policy. + /// + ///
  • + /// /// TARGET_NOT_SUPPORTED: You can't perform the specified operation on that target entity. /// ///
  • @@ -30754,6 +31516,10 @@ public virtual RegisterDelegatedAdministratorResponse RegisterDelegatedAdministr /// ///
  • /// + /// INVALID_PRINCIPAL: You specified an invalid principal element in the policy. + /// + ///
  • + /// /// INVALID_ROLE_NAME: You provided a role name that isn't valid. A role name can't begin /// with the reserved prefix AWSServiceRoleFor. /// @@ -30801,6 +31567,10 @@ public virtual RegisterDelegatedAdministratorResponse RegisterDelegatedAdministr /// ///
  • /// + /// NON_DETACHABLE_POLICY: You can't detach this Amazon Web Services Managed Policy. + /// + ///
  • + /// /// TARGET_NOT_SUPPORTED: You can't perform the specified operation on that target entity. /// ///
  • @@ -31199,6 +31969,10 @@ public virtual RemoveAccountFromOrganizationResponse RemoveAccountFromOrganizati /// ///
  • /// + /// INVALID_PRINCIPAL: You specified an invalid principal element in the policy. + /// + ///
  • + /// /// INVALID_ROLE_NAME: You provided a role name that isn't valid. A role name can't begin /// with the reserved prefix AWSServiceRoleFor. /// @@ -31246,6 +32020,10 @@ public virtual RemoveAccountFromOrganizationResponse RemoveAccountFromOrganizati /// ///
  • /// + /// NON_DETACHABLE_POLICY: You can't detach this Amazon Web Services Managed Policy. + /// + ///
  • + /// /// TARGET_NOT_SUPPORTED: You can't perform the specified operation on that target entity. /// ///
  • @@ -31630,6 +32408,10 @@ public virtual RemoveAccountFromOrganizationResponse RemoveAccountFromOrganizati /// ///
  • /// + /// INVALID_PRINCIPAL: You specified an invalid principal element in the policy. + /// + ///
  • + /// /// INVALID_ROLE_NAME: You provided a role name that isn't valid. A role name can't begin /// with the reserved prefix AWSServiceRoleFor. /// @@ -31677,6 +32459,10 @@ public virtual RemoveAccountFromOrganizationResponse RemoveAccountFromOrganizati /// ///
  • /// + /// NON_DETACHABLE_POLICY: You can't detach this Amazon Web Services Managed Policy. + /// + ///
  • + /// /// TARGET_NOT_SUPPORTED: You can't perform the specified operation on that target entity. /// ///
  • @@ -32058,6 +32844,10 @@ public virtual TagResourceResponse TagResource(TagResourceRequest request) /// ///
  • /// + /// INVALID_PRINCIPAL: You specified an invalid principal element in the policy. + /// + ///
  • + /// /// INVALID_ROLE_NAME: You provided a role name that isn't valid. A role name can't begin /// with the reserved prefix AWSServiceRoleFor. /// @@ -32105,6 +32895,10 @@ public virtual TagResourceResponse TagResource(TagResourceRequest request) /// ///
  • /// + /// NON_DETACHABLE_POLICY: You can't detach this Amazon Web Services Managed Policy. + /// + ///
  • + /// /// TARGET_NOT_SUPPORTED: You can't perform the specified operation on that target entity. /// ///
  • @@ -32487,6 +33281,10 @@ public virtual TagResourceResponse TagResource(TagResourceRequest request) /// ///
  • /// + /// INVALID_PRINCIPAL: You specified an invalid principal element in the policy. + /// + ///
  • + /// /// INVALID_ROLE_NAME: You provided a role name that isn't valid. A role name can't begin /// with the reserved prefix AWSServiceRoleFor. /// @@ -32534,6 +33332,10 @@ public virtual TagResourceResponse TagResource(TagResourceRequest request) /// ///
  • /// + /// NON_DETACHABLE_POLICY: You can't detach this Amazon Web Services Managed Policy. + /// + ///
  • + /// /// TARGET_NOT_SUPPORTED: You can't perform the specified operation on that target entity. /// ///
  • @@ -32915,6 +33717,10 @@ public virtual UntagResourceResponse UntagResource(UntagResourceRequest request) /// ///
  • /// + /// INVALID_PRINCIPAL: You specified an invalid principal element in the policy. + /// + ///
  • + /// /// INVALID_ROLE_NAME: You provided a role name that isn't valid. A role name can't begin /// with the reserved prefix AWSServiceRoleFor. /// @@ -32962,6 +33768,10 @@ public virtual UntagResourceResponse UntagResource(UntagResourceRequest request) /// ///
  • /// + /// NON_DETACHABLE_POLICY: You can't detach this Amazon Web Services Managed Policy. + /// + ///
  • + /// /// TARGET_NOT_SUPPORTED: You can't perform the specified operation on that target entity. /// ///
  • @@ -33097,6 +33907,10 @@ public virtual UntagResourceResponse UntagResource(UntagResourceRequest request) /// ///
  • /// + /// INVALID_PRINCIPAL: You specified an invalid principal element in the policy. + /// + ///
  • + /// /// INVALID_ROLE_NAME: You provided a role name that isn't valid. A role name can't begin /// with the reserved prefix AWSServiceRoleFor. /// @@ -33144,6 +33958,10 @@ public virtual UntagResourceResponse UntagResource(UntagResourceRequest request) /// ///
  • /// + /// NON_DETACHABLE_POLICY: You can't detach this Amazon Web Services Managed Policy. + /// + ///
  • + /// /// TARGET_NOT_SUPPORTED: You can't perform the specified operation on that target entity. /// ///
  • @@ -33278,6 +34096,10 @@ public virtual UpdateOrganizationalUnitResponse UpdateOrganizationalUnit(UpdateO /// ///
  • /// + /// INVALID_PRINCIPAL: You specified an invalid principal element in the policy. + /// + ///
  • + /// /// INVALID_ROLE_NAME: You provided a role name that isn't valid. A role name can't begin /// with the reserved prefix AWSServiceRoleFor. /// @@ -33325,6 +34147,10 @@ public virtual UpdateOrganizationalUnitResponse UpdateOrganizationalUnit(UpdateO /// ///
  • /// + /// NON_DETACHABLE_POLICY: You can't detach this Amazon Web Services Managed Policy. + /// + ///
  • + /// /// TARGET_NOT_SUPPORTED: You can't perform the specified operation on that target entity. /// ///
  • @@ -33691,6 +34517,10 @@ public virtual UpdateOrganizationalUnitResponse UpdateOrganizationalUnit(UpdateO /// ///
  • /// + /// INVALID_PRINCIPAL: You specified an invalid principal element in the policy. + /// + ///
  • + /// /// INVALID_ROLE_NAME: You provided a role name that isn't valid. A role name can't begin /// with the reserved prefix AWSServiceRoleFor. /// @@ -33738,6 +34568,10 @@ public virtual UpdateOrganizationalUnitResponse UpdateOrganizationalUnit(UpdateO /// ///
  • /// + /// NON_DETACHABLE_POLICY: You can't detach this Amazon Web Services Managed Policy. + /// + ///
  • + /// /// TARGET_NOT_SUPPORTED: You can't perform the specified operation on that target entity. /// ///
  • @@ -34116,6 +34950,10 @@ public virtual UpdatePolicyResponse UpdatePolicy(UpdatePolicyRequest request) /// ///
  • /// + /// INVALID_PRINCIPAL: You specified an invalid principal element in the policy. + /// + ///
  • + /// /// INVALID_ROLE_NAME: You provided a role name that isn't valid. A role name can't begin /// with the reserved prefix AWSServiceRoleFor. /// @@ -34163,6 +35001,10 @@ public virtual UpdatePolicyResponse UpdatePolicy(UpdatePolicyRequest request) /// ///
  • /// + /// NON_DETACHABLE_POLICY: You can't detach this Amazon Web Services Managed Policy. + /// + ///
  • + /// /// TARGET_NOT_SUPPORTED: You can't perform the specified operation on that target entity. /// ///
  • diff --git a/sdk/src/Services/Organizations/Organizations.sln b/sdk/src/Services/Organizations/Organizations.sln index fb2224691866..32030ad47d82 100644 --- a/sdk/src/Services/Organizations/Organizations.sln +++ b/sdk/src/Services/Organizations/Organizations.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {5613150A-6777-4B9D-B517-A1EFB065C55C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {5613150A-6777-4B9D-B517-A1EFB065C55C}.Debug|Any CPU.Build.0 = Debug|Any CPU {5613150A-6777-4B9D-B517-A1EFB065C55C}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {E138139C-4BCA-4862-B993-335368ADA803}.Debug|Any CPU.Build.0 = Debug|Any CPU {E138139C-4BCA-4862-B993-335368ADA803}.Release|Any CPU.ActiveCfg = Release|Any CPU {E138139C-4BCA-4862-B993-335368ADA803}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {D2469C19-3DB3-4455-B4CC-A0D3D968005E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D2469C19-3DB3-4455-B4CC-A0D3D968005E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D2469C19-3DB3-4455-B4CC-A0D3D968005E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D2469C19-3DB3-4455-B4CC-A0D3D968005E}.Release|Any CPU.Build.0 = Release|Any CPU - {DA4827FD-4CF8-4470-A5E4-0E97CE1D690F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DA4827FD-4CF8-4470-A5E4-0E97CE1D690F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DA4827FD-4CF8-4470-A5E4-0E97CE1D690F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DA4827FD-4CF8-4470-A5E4-0E97CE1D690F}.Release|Any CPU.Build.0 = Release|Any CPU - {8DF4DA13-FFDA-4ADC-BB91-EDE28451A242}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8DF4DA13-FFDA-4ADC-BB91-EDE28451A242}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8DF4DA13-FFDA-4ADC-BB91-EDE28451A242}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8DF4DA13-FFDA-4ADC-BB91-EDE28451A242}.Release|Any CPU.Build.0 = Release|Any CPU - {9AA38627-CCA8-421C-86FE-2DD44F9B0B51}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9AA38627-CCA8-421C-86FE-2DD44F9B0B51}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9AA38627-CCA8-421C-86FE-2DD44F9B0B51}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9AA38627-CCA8-421C-86FE-2DD44F9B0B51}.Release|Any CPU.Build.0 = Release|Any CPU - {9A6D9EFC-6E78-4E34-A873-8A7EB5D41383}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9A6D9EFC-6E78-4E34-A873-8A7EB5D41383}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9A6D9EFC-6E78-4E34-A873-8A7EB5D41383}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9A6D9EFC-6E78-4E34-A873-8A7EB5D41383}.Release|Any CPU.Build.0 = Release|Any CPU - {7199B0D2-C5F8-4836-9901-041E6612222C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7199B0D2-C5F8-4836-9901-041E6612222C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7199B0D2-C5F8-4836-9901-041E6612222C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7199B0D2-C5F8-4836-9901-041E6612222C}.Release|Any CPU.Build.0 = Release|Any CPU - {021A48F4-2B15-4210-8B8D-C159795AD364}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {021A48F4-2B15-4210-8B8D-C159795AD364}.Debug|Any CPU.Build.0 = Debug|Any CPU - {021A48F4-2B15-4210-8B8D-C159795AD364}.Release|Any CPU.ActiveCfg = Release|Any CPU - {021A48F4-2B15-4210-8B8D-C159795AD364}.Release|Any CPU.Build.0 = Release|Any CPU - {E2B6E875-5A8A-4083-BA7E-E8194AA907E9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E2B6E875-5A8A-4083-BA7E-E8194AA907E9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E2B6E875-5A8A-4083-BA7E-E8194AA907E9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E2B6E875-5A8A-4083-BA7E-E8194AA907E9}.Release|Any CPU.Build.0 = Release|Any CPU - {281C4AAE-8749-49AD-BE6B-7D9C94DFE3EE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {281C4AAE-8749-49AD-BE6B-7D9C94DFE3EE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {281C4AAE-8749-49AD-BE6B-7D9C94DFE3EE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {281C4AAE-8749-49AD-BE6B-7D9C94DFE3EE}.Release|Any CPU.Build.0 = Release|Any CPU - {6FF15B70-F450-48AF-AF40-1D0E341054A4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6FF15B70-F450-48AF-AF40-1D0E341054A4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6FF15B70-F450-48AF-AF40-1D0E341054A4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6FF15B70-F450-48AF-AF40-1D0E341054A4}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {D2469C19-3DB3-4455-B4CC-A0D3D968005E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D2469C19-3DB3-4455-B4CC-A0D3D968005E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D2469C19-3DB3-4455-B4CC-A0D3D968005E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D2469C19-3DB3-4455-B4CC-A0D3D968005E}.Release|Any CPU.Build.0 = Release|Any CPU - {DA4827FD-4CF8-4470-A5E4-0E97CE1D690F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DA4827FD-4CF8-4470-A5E4-0E97CE1D690F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DA4827FD-4CF8-4470-A5E4-0E97CE1D690F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DA4827FD-4CF8-4470-A5E4-0E97CE1D690F}.Release|Any CPU.Build.0 = Release|Any CPU - {8DF4DA13-FFDA-4ADC-BB91-EDE28451A242}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8DF4DA13-FFDA-4ADC-BB91-EDE28451A242}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8DF4DA13-FFDA-4ADC-BB91-EDE28451A242}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8DF4DA13-FFDA-4ADC-BB91-EDE28451A242}.Release|Any CPU.Build.0 = Release|Any CPU - {9AA38627-CCA8-421C-86FE-2DD44F9B0B51}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9AA38627-CCA8-421C-86FE-2DD44F9B0B51}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9AA38627-CCA8-421C-86FE-2DD44F9B0B51}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9AA38627-CCA8-421C-86FE-2DD44F9B0B51}.Release|Any CPU.Build.0 = Release|Any CPU - {9A6D9EFC-6E78-4E34-A873-8A7EB5D41383}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9A6D9EFC-6E78-4E34-A873-8A7EB5D41383}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9A6D9EFC-6E78-4E34-A873-8A7EB5D41383}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9A6D9EFC-6E78-4E34-A873-8A7EB5D41383}.Release|Any CPU.Build.0 = Release|Any CPU - {7199B0D2-C5F8-4836-9901-041E6612222C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7199B0D2-C5F8-4836-9901-041E6612222C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7199B0D2-C5F8-4836-9901-041E6612222C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7199B0D2-C5F8-4836-9901-041E6612222C}.Release|Any CPU.Build.0 = Release|Any CPU - {021A48F4-2B15-4210-8B8D-C159795AD364}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {021A48F4-2B15-4210-8B8D-C159795AD364}.Debug|Any CPU.Build.0 = Debug|Any CPU - {021A48F4-2B15-4210-8B8D-C159795AD364}.Release|Any CPU.ActiveCfg = Release|Any CPU - {021A48F4-2B15-4210-8B8D-C159795AD364}.Release|Any CPU.Build.0 = Release|Any CPU - {E2B6E875-5A8A-4083-BA7E-E8194AA907E9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E2B6E875-5A8A-4083-BA7E-E8194AA907E9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E2B6E875-5A8A-4083-BA7E-E8194AA907E9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E2B6E875-5A8A-4083-BA7E-E8194AA907E9}.Release|Any CPU.Build.0 = Release|Any CPU - {281C4AAE-8749-49AD-BE6B-7D9C94DFE3EE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {281C4AAE-8749-49AD-BE6B-7D9C94DFE3EE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {281C4AAE-8749-49AD-BE6B-7D9C94DFE3EE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {281C4AAE-8749-49AD-BE6B-7D9C94DFE3EE}.Release|Any CPU.Build.0 = Release|Any CPU - {6FF15B70-F450-48AF-AF40-1D0E341054A4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6FF15B70-F450-48AF-AF40-1D0E341054A4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6FF15B70-F450-48AF-AF40-1D0E341054A4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6FF15B70-F450-48AF-AF40-1D0E341054A4}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {5613150A-6777-4B9D-B517-A1EFB065C55C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {7DDE7A82-B63B-4EE4-B4C5-4BAFDB15C9E2} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {C86E5BC0-374D-4DFF-9D3D-FE6784A6FF40} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {7B72C4A4-B693-4166-9C08-F09157CD27AE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {E138139C-4BCA-4862-B993-335368ADA803} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {D2469C19-3DB3-4455-B4CC-A0D3D968005E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {DA4827FD-4CF8-4470-A5E4-0E97CE1D690F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8DF4DA13-FFDA-4ADC-BB91-EDE28451A242} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {9AA38627-CCA8-421C-86FE-2DD44F9B0B51} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {9A6D9EFC-6E78-4E34-A873-8A7EB5D41383} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {7199B0D2-C5F8-4836-9901-041E6612222C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {021A48F4-2B15-4210-8B8D-C159795AD364} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E2B6E875-5A8A-4083-BA7E-E8194AA907E9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {281C4AAE-8749-49AD-BE6B-7D9C94DFE3EE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6FF15B70-F450-48AF-AF40-1D0E341054A4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {D2469C19-3DB3-4455-B4CC-A0D3D968005E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {DA4827FD-4CF8-4470-A5E4-0E97CE1D690F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8DF4DA13-FFDA-4ADC-BB91-EDE28451A242} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {9AA38627-CCA8-421C-86FE-2DD44F9B0B51} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {9A6D9EFC-6E78-4E34-A873-8A7EB5D41383} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {7199B0D2-C5F8-4836-9901-041E6612222C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {021A48F4-2B15-4210-8B8D-C159795AD364} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E2B6E875-5A8A-4083-BA7E-E8194AA907E9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {281C4AAE-8749-49AD-BE6B-7D9C94DFE3EE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6FF15B70-F450-48AF-AF40-1D0E341054A4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {3392B639-96DB-4BFC-90EA-BB063EBF4653} diff --git a/sdk/src/Services/Organizations/Properties/AssemblyInfo.cs b/sdk/src/Services/Organizations/Properties/AssemblyInfo.cs index f0d87157d202..8544f616fe3d 100644 --- a/sdk/src/Services/Organizations/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/Organizations/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.402.1")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.403.3")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/Outposts/Generated/AmazonOutpostsConfig.cs b/sdk/src/Services/Outposts/Generated/AmazonOutpostsConfig.cs index 00d6da56ec2e..bad6f8278ab7 100644 --- a/sdk/src/Services/Outposts/Generated/AmazonOutpostsConfig.cs +++ b/sdk/src/Services/Outposts/Generated/AmazonOutpostsConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.Outposts public partial class AmazonOutpostsConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("Outposts", "4.0.0.0"); private static readonly AmazonOutpostsEndpointResolver EndpointResolver = new AmazonOutpostsEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("Outposts", "3.7.401.26"); -======= - InternalSDKUtils.BuildUserAgentString("Outposts", "3.7.404.0"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/Outposts/Generated/Model/AssetInstanceTypeCapacity.cs b/sdk/src/Services/Outposts/Generated/Model/AssetInstanceTypeCapacity.cs index 9a22e79a6b51..2059e6554db3 100644 --- a/sdk/src/Services/Outposts/Generated/Model/AssetInstanceTypeCapacity.cs +++ b/sdk/src/Services/Outposts/Generated/Model/AssetInstanceTypeCapacity.cs @@ -44,9 +44,9 @@ public partial class AssetInstanceTypeCapacity /// /// [AWSProperty(Required=true, Min=0, Max=9999)] - public int Count + public int? Count { - get { return this._count.GetValueOrDefault(); } + get { return this._count; } set { this._count = value; } } diff --git a/sdk/src/Services/Outposts/Generated/Model/ComputeAttributes.cs b/sdk/src/Services/Outposts/Generated/Model/ComputeAttributes.cs index 92db7f9ad297..9a3a1c6f0e60 100644 --- a/sdk/src/Services/Outposts/Generated/Model/ComputeAttributes.cs +++ b/sdk/src/Services/Outposts/Generated/Model/ComputeAttributes.cs @@ -103,9 +103,9 @@ internal bool IsSetInstanceTypeCapacities() /// The maximum number of vCPUs possible for the specified asset. /// ///
    • - public int MaxVcpus + public int? MaxVcpus { - get { return this._maxVcpus.GetValueOrDefault(); } + get { return this._maxVcpus; } set { this._maxVcpus = value; } } diff --git a/sdk/src/Services/Outposts/Generated/Model/Internal/MarshallTransformations/AssetInstanceTypeCapacityUnmarshaller.cs b/sdk/src/Services/Outposts/Generated/Model/Internal/MarshallTransformations/AssetInstanceTypeCapacityUnmarshaller.cs index 528ed49d4106..cd6e8e6b96e9 100644 --- a/sdk/src/Services/Outposts/Generated/Model/Internal/MarshallTransformations/AssetInstanceTypeCapacityUnmarshaller.cs +++ b/sdk/src/Services/Outposts/Generated/Model/Internal/MarshallTransformations/AssetInstanceTypeCapacityUnmarshaller.cs @@ -68,7 +68,7 @@ public AssetInstanceTypeCapacity Unmarshall(JsonUnmarshallerContext context) { if (context.TestExpression("Count", targetDepth)) { - var unmarshaller = IntUnmarshaller.Instance; + var unmarshaller = NullableIntUnmarshaller.Instance; unmarshalledObject.Count = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/Outposts/Generated/Model/Internal/MarshallTransformations/ComputeAttributesUnmarshaller.cs b/sdk/src/Services/Outposts/Generated/Model/Internal/MarshallTransformations/ComputeAttributesUnmarshaller.cs index b3fd6a69bfff..523a20be7060 100644 --- a/sdk/src/Services/Outposts/Generated/Model/Internal/MarshallTransformations/ComputeAttributesUnmarshaller.cs +++ b/sdk/src/Services/Outposts/Generated/Model/Internal/MarshallTransformations/ComputeAttributesUnmarshaller.cs @@ -86,7 +86,7 @@ public ComputeAttributes Unmarshall(JsonUnmarshallerContext context) } if (context.TestExpression("MaxVcpus", targetDepth)) { - var unmarshaller = IntUnmarshaller.Instance; + var unmarshaller = NullableIntUnmarshaller.Instance; unmarshalledObject.MaxVcpus = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/Outposts/Generated/Model/Internal/MarshallTransformations/StartCapacityTaskRequestMarshaller.cs b/sdk/src/Services/Outposts/Generated/Model/Internal/MarshallTransformations/StartCapacityTaskRequestMarshaller.cs index a0feac94385d..1c78cbf64e4d 100644 --- a/sdk/src/Services/Outposts/Generated/Model/Internal/MarshallTransformations/StartCapacityTaskRequestMarshaller.cs +++ b/sdk/src/Services/Outposts/Generated/Model/Internal/MarshallTransformations/StartCapacityTaskRequestMarshaller.cs @@ -94,55 +94,33 @@ public IRequest Marshall(StartCapacityTaskRequest publicRequest) context.Writer.WriteArrayEnd(); } -<<<<<<< HEAD + if(publicRequest.IsSetInstancesToExclude()) + { + context.Writer.WritePropertyName("InstancesToExclude"); + context.Writer.WriteObjectStart(); + + var marshaller = InstancesToExcludeMarshaller.Instance; + marshaller.Marshall(publicRequest.InstancesToExclude, context); + + context.Writer.WriteObjectEnd(); + } + if(publicRequest.IsSetOrderId()) { context.Writer.WritePropertyName("OrderId"); context.Writer.Write(publicRequest.OrderId); } - writer.WriteObjectEnd(); -||||||| Commit version number update changes - if(publicRequest.IsSetOrderId()) - { - context.Writer.WritePropertyName("OrderId"); - context.Writer.Write(publicRequest.OrderId); -======= - if(publicRequest.IsSetInstancesToExclude()) - { - context.Writer.WritePropertyName("InstancesToExclude"); - context.Writer.WriteObjectStart(); - - var marshaller = InstancesToExcludeMarshaller.Instance; - marshaller.Marshall(publicRequest.InstancesToExclude, context); - - context.Writer.WriteObjectEnd(); - } + if(publicRequest.IsSetTaskActionOnBlockingInstances()) + { + context.Writer.WritePropertyName("TaskActionOnBlockingInstances"); + context.Writer.Write(publicRequest.TaskActionOnBlockingInstances); + } - if(publicRequest.IsSetOrderId()) - { - context.Writer.WritePropertyName("OrderId"); - context.Writer.Write(publicRequest.OrderId); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b + writer.WriteObjectEnd(); } -<<<<<<< HEAD request.Content = memoryStream.ToArray(); -||||||| Commit version number update changes - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); -======= - if(publicRequest.IsSetTaskActionOnBlockingInstances()) - { - context.Writer.WritePropertyName("TaskActionOnBlockingInstances"); - context.Writer.Write(publicRequest.TaskActionOnBlockingInstances); - } - - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b } diff --git a/sdk/src/Services/Outposts/Generated/Model/ListAssetInstancesRequest.cs b/sdk/src/Services/Outposts/Generated/Model/ListAssetInstancesRequest.cs index 15dfdb65ed53..60b58dc51f9d 100644 --- a/sdk/src/Services/Outposts/Generated/Model/ListAssetInstancesRequest.cs +++ b/sdk/src/Services/Outposts/Generated/Model/ListAssetInstancesRequest.cs @@ -120,9 +120,9 @@ internal bool IsSetInstanceTypeFilter() /// Gets and sets the property MaxResults. ///     [AWSProperty(Min=1, Max=1000)] - public int MaxResults + public int? MaxResults { - get { return this._maxResults.GetValueOrDefault(); } + get { return this._maxResults; } set { this._maxResults = value; } } diff --git a/sdk/src/Services/Outposts/Generated/Model/ListBlockingInstancesForCapacityTaskRequest.cs b/sdk/src/Services/Outposts/Generated/Model/ListBlockingInstancesForCapacityTaskRequest.cs index 791c26d05cd3..d59af3c9c6a8 100644 --- a/sdk/src/Services/Outposts/Generated/Model/ListBlockingInstancesForCapacityTaskRequest.cs +++ b/sdk/src/Services/Outposts/Generated/Model/ListBlockingInstancesForCapacityTaskRequest.cs @@ -65,9 +65,9 @@ internal bool IsSetCapacityTaskId() /// Gets and sets the property MaxResults. ///     [AWSProperty(Min=1, Max=1000)] - public int MaxResults + public int? MaxResults { - get { return this._maxResults.GetValueOrDefault(); } + get { return this._maxResults; } set { this._maxResults = value; } } diff --git a/sdk/src/Services/Outposts/Generated/Model/_bcl45+netstandard/IListAssetInstancesPaginator.cs b/sdk/src/Services/Outposts/Generated/Model/_bcl+netstandard/IListAssetInstancesPaginator.cs similarity index 100% rename from sdk/src/Services/Outposts/Generated/Model/_bcl45+netstandard/IListAssetInstancesPaginator.cs rename to sdk/src/Services/Outposts/Generated/Model/_bcl+netstandard/IListAssetInstancesPaginator.cs diff --git a/sdk/src/Services/Outposts/Generated/Model/_bcl45+netstandard/IListBlockingInstancesForCapacityTaskPaginator.cs b/sdk/src/Services/Outposts/Generated/Model/_bcl+netstandard/IListBlockingInstancesForCapacityTaskPaginator.cs similarity index 100% rename from sdk/src/Services/Outposts/Generated/Model/_bcl45+netstandard/IListBlockingInstancesForCapacityTaskPaginator.cs rename to sdk/src/Services/Outposts/Generated/Model/_bcl+netstandard/IListBlockingInstancesForCapacityTaskPaginator.cs diff --git a/sdk/src/Services/Outposts/Generated/Model/_bcl45+netstandard/ListAssetInstancesPaginator.cs b/sdk/src/Services/Outposts/Generated/Model/_bcl+netstandard/ListAssetInstancesPaginator.cs similarity index 100% rename from sdk/src/Services/Outposts/Generated/Model/_bcl45+netstandard/ListAssetInstancesPaginator.cs rename to sdk/src/Services/Outposts/Generated/Model/_bcl+netstandard/ListAssetInstancesPaginator.cs diff --git a/sdk/src/Services/Outposts/Generated/Model/_bcl45+netstandard/ListBlockingInstancesForCapacityTaskPaginator.cs b/sdk/src/Services/Outposts/Generated/Model/_bcl+netstandard/ListBlockingInstancesForCapacityTaskPaginator.cs similarity index 100% rename from sdk/src/Services/Outposts/Generated/Model/_bcl45+netstandard/ListBlockingInstancesForCapacityTaskPaginator.cs rename to sdk/src/Services/Outposts/Generated/Model/_bcl+netstandard/ListBlockingInstancesForCapacityTaskPaginator.cs diff --git a/sdk/src/Services/Outposts/Generated/_bcl/AmazonOutpostsClient.cs b/sdk/src/Services/Outposts/Generated/_bcl/AmazonOutpostsClient.cs index 701d88a51450..8c45b02d07e5 100644 --- a/sdk/src/Services/Outposts/Generated/_bcl/AmazonOutpostsClient.cs +++ b/sdk/src/Services/Outposts/Generated/_bcl/AmazonOutpostsClient.cs @@ -1396,6 +1396,73 @@ public virtual GetSiteAddressResponse GetSiteAddress(GetSiteAddressRequest reque #endregion + #region ListAssetInstances + + + /// + /// A list of Amazon EC2 instances, belonging to all accounts, running on the specified + /// Outpost. Does not include Amazon EBS or Amazon S3 instances. + /// + /// Container for the necessary parameters to execute the ListAssetInstances service method. + /// + /// The response from the ListAssetInstances service method, as returned by Outposts. + /// + /// You do not have permission to perform this operation. + /// + /// + /// An internal error has occurred. + /// + /// + /// The specified request is not valid. + /// + /// + /// A parameter is not valid. + /// + /// REST API Reference for ListAssetInstances Operation + public virtual ListAssetInstancesResponse ListAssetInstances(ListAssetInstancesRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = ListAssetInstancesRequestMarshaller.Instance; + options.ResponseUnmarshaller = ListAssetInstancesResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// A list of Amazon EC2 instances, belonging to all accounts, running on the specified + /// Outpost. Does not include Amazon EBS or Amazon S3 instances. + /// + /// Container for the necessary parameters to execute the ListAssetInstances service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the ListAssetInstances service method, as returned by Outposts. + /// + /// You do not have permission to perform this operation. + /// + /// + /// An internal error has occurred. + /// + /// + /// The specified request is not valid. + /// + /// + /// A parameter is not valid. + /// + /// REST API Reference for ListAssetInstances Operation + public virtual Task ListAssetInstancesAsync(ListAssetInstancesRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = ListAssetInstancesRequestMarshaller.Instance; + options.ResponseUnmarshaller = ListAssetInstancesResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + #region ListAssets @@ -1477,6 +1544,75 @@ public virtual ListAssetsResponse ListAssets(ListAssetsRequest request) #endregion + #region ListBlockingInstancesForCapacityTask + + + /// + /// A list of Amazon EC2 instances running on the Outpost and belonging to the account + /// that initiated the capacity task. Use this list to specify the instances you cannot + /// stop to free up capacity to run the capacity task. + /// + /// Container for the necessary parameters to execute the ListBlockingInstancesForCapacityTask service method. + /// + /// The response from the ListBlockingInstancesForCapacityTask service method, as returned by Outposts. + /// + /// You do not have permission to perform this operation. + /// + /// + /// An internal error has occurred. + /// + /// + /// The specified request is not valid. + /// + /// + /// A parameter is not valid. + /// + /// REST API Reference for ListBlockingInstancesForCapacityTask Operation + public virtual ListBlockingInstancesForCapacityTaskResponse ListBlockingInstancesForCapacityTask(ListBlockingInstancesForCapacityTaskRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = ListBlockingInstancesForCapacityTaskRequestMarshaller.Instance; + options.ResponseUnmarshaller = ListBlockingInstancesForCapacityTaskResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// A list of Amazon EC2 instances running on the Outpost and belonging to the account + /// that initiated the capacity task. Use this list to specify the instances you cannot + /// stop to free up capacity to run the capacity task. + /// + /// Container for the necessary parameters to execute the ListBlockingInstancesForCapacityTask service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the ListBlockingInstancesForCapacityTask service method, as returned by Outposts. + /// + /// You do not have permission to perform this operation. + /// + /// + /// An internal error has occurred. + /// + /// + /// The specified request is not valid. + /// + /// + /// A parameter is not valid. + /// + /// REST API Reference for ListBlockingInstancesForCapacityTask Operation + public virtual Task ListBlockingInstancesForCapacityTaskAsync(ListBlockingInstancesForCapacityTaskRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = ListBlockingInstancesForCapacityTaskRequestMarshaller.Instance; + options.ResponseUnmarshaller = ListBlockingInstancesForCapacityTaskResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + #region ListCapacityTasks @@ -1913,7 +2049,8 @@ public virtual ListTagsForResourceResponse ListTagsForResource(ListTagsForResour /// - /// Starts the specified capacity task. You can have one active capacity task for an order. + /// Starts the specified capacity task. You can have one active capacity task per order + /// or Outpost. /// /// Container for the necessary parameters to execute the StartCapacityTask service method. /// @@ -1945,7 +2082,8 @@ public virtual StartCapacityTaskResponse StartCapacityTask(StartCapacityTaskRequ /// - /// Starts the specified capacity task. You can have one active capacity task for an order. + /// Starts the specified capacity task. You can have one active capacity task per order + /// or Outpost. /// /// Container for the necessary parameters to execute the StartCapacityTask service method. /// diff --git a/sdk/src/Services/Outposts/Outposts.sln b/sdk/src/Services/Outposts/Outposts.sln index 2a7466b9c0ae..f489028219f4 100644 --- a/sdk/src/Services/Outposts/Outposts.sln +++ b/sdk/src/Services/Outposts/Outposts.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {5178E0AE-1976-4656-B927-7C06FDA1445F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {5178E0AE-1976-4656-B927-7C06FDA1445F}.Debug|Any CPU.Build.0 = Debug|Any CPU {5178E0AE-1976-4656-B927-7C06FDA1445F}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {B888E5FE-DDCF-4ED1-937B-9E23FF3F6915}.Debug|Any CPU.Build.0 = Debug|Any CPU {B888E5FE-DDCF-4ED1-937B-9E23FF3F6915}.Release|Any CPU.ActiveCfg = Release|Any CPU {B888E5FE-DDCF-4ED1-937B-9E23FF3F6915}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {D0DEA739-339D-4DD3-9B08-0E156D4DA333}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D0DEA739-339D-4DD3-9B08-0E156D4DA333}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D0DEA739-339D-4DD3-9B08-0E156D4DA333}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D0DEA739-339D-4DD3-9B08-0E156D4DA333}.Release|Any CPU.Build.0 = Release|Any CPU - {0FE2450D-8C66-4AA5-8BF7-DABA8A532817}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0FE2450D-8C66-4AA5-8BF7-DABA8A532817}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0FE2450D-8C66-4AA5-8BF7-DABA8A532817}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0FE2450D-8C66-4AA5-8BF7-DABA8A532817}.Release|Any CPU.Build.0 = Release|Any CPU - {A16B3F91-9739-4940-855F-065EB481ACA6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A16B3F91-9739-4940-855F-065EB481ACA6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A16B3F91-9739-4940-855F-065EB481ACA6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A16B3F91-9739-4940-855F-065EB481ACA6}.Release|Any CPU.Build.0 = Release|Any CPU - {A13428C5-CFB3-4F8B-9638-461F99038722}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A13428C5-CFB3-4F8B-9638-461F99038722}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A13428C5-CFB3-4F8B-9638-461F99038722}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A13428C5-CFB3-4F8B-9638-461F99038722}.Release|Any CPU.Build.0 = Release|Any CPU - {34875E40-E404-44DD-8818-8C4CD8F34F0B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {34875E40-E404-44DD-8818-8C4CD8F34F0B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {34875E40-E404-44DD-8818-8C4CD8F34F0B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {34875E40-E404-44DD-8818-8C4CD8F34F0B}.Release|Any CPU.Build.0 = Release|Any CPU - {91EAE921-94F0-4AC2-840C-0F730A173229}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {91EAE921-94F0-4AC2-840C-0F730A173229}.Debug|Any CPU.Build.0 = Debug|Any CPU - {91EAE921-94F0-4AC2-840C-0F730A173229}.Release|Any CPU.ActiveCfg = Release|Any CPU - {91EAE921-94F0-4AC2-840C-0F730A173229}.Release|Any CPU.Build.0 = Release|Any CPU - {C7576EF7-1951-4FB2-B9DE-B00A2A5E9691}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C7576EF7-1951-4FB2-B9DE-B00A2A5E9691}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C7576EF7-1951-4FB2-B9DE-B00A2A5E9691}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C7576EF7-1951-4FB2-B9DE-B00A2A5E9691}.Release|Any CPU.Build.0 = Release|Any CPU - {0948E1FB-79A3-416D-90C7-AA7F802DF3DB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0948E1FB-79A3-416D-90C7-AA7F802DF3DB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0948E1FB-79A3-416D-90C7-AA7F802DF3DB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0948E1FB-79A3-416D-90C7-AA7F802DF3DB}.Release|Any CPU.Build.0 = Release|Any CPU - {333930B2-87C5-48C7-A25C-621BA79BE569}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {333930B2-87C5-48C7-A25C-621BA79BE569}.Debug|Any CPU.Build.0 = Debug|Any CPU - {333930B2-87C5-48C7-A25C-621BA79BE569}.Release|Any CPU.ActiveCfg = Release|Any CPU - {333930B2-87C5-48C7-A25C-621BA79BE569}.Release|Any CPU.Build.0 = Release|Any CPU - {72085EE7-F0A3-47B2-95C5-415C8A10651A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {72085EE7-F0A3-47B2-95C5-415C8A10651A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {72085EE7-F0A3-47B2-95C5-415C8A10651A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {72085EE7-F0A3-47B2-95C5-415C8A10651A}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {D0DEA739-339D-4DD3-9B08-0E156D4DA333}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D0DEA739-339D-4DD3-9B08-0E156D4DA333}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D0DEA739-339D-4DD3-9B08-0E156D4DA333}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D0DEA739-339D-4DD3-9B08-0E156D4DA333}.Release|Any CPU.Build.0 = Release|Any CPU - {0FE2450D-8C66-4AA5-8BF7-DABA8A532817}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0FE2450D-8C66-4AA5-8BF7-DABA8A532817}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0FE2450D-8C66-4AA5-8BF7-DABA8A532817}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0FE2450D-8C66-4AA5-8BF7-DABA8A532817}.Release|Any CPU.Build.0 = Release|Any CPU - {A16B3F91-9739-4940-855F-065EB481ACA6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A16B3F91-9739-4940-855F-065EB481ACA6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A16B3F91-9739-4940-855F-065EB481ACA6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A16B3F91-9739-4940-855F-065EB481ACA6}.Release|Any CPU.Build.0 = Release|Any CPU - {A13428C5-CFB3-4F8B-9638-461F99038722}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A13428C5-CFB3-4F8B-9638-461F99038722}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A13428C5-CFB3-4F8B-9638-461F99038722}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A13428C5-CFB3-4F8B-9638-461F99038722}.Release|Any CPU.Build.0 = Release|Any CPU - {34875E40-E404-44DD-8818-8C4CD8F34F0B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {34875E40-E404-44DD-8818-8C4CD8F34F0B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {34875E40-E404-44DD-8818-8C4CD8F34F0B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {34875E40-E404-44DD-8818-8C4CD8F34F0B}.Release|Any CPU.Build.0 = Release|Any CPU - {91EAE921-94F0-4AC2-840C-0F730A173229}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {91EAE921-94F0-4AC2-840C-0F730A173229}.Debug|Any CPU.Build.0 = Debug|Any CPU - {91EAE921-94F0-4AC2-840C-0F730A173229}.Release|Any CPU.ActiveCfg = Release|Any CPU - {91EAE921-94F0-4AC2-840C-0F730A173229}.Release|Any CPU.Build.0 = Release|Any CPU - {C7576EF7-1951-4FB2-B9DE-B00A2A5E9691}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C7576EF7-1951-4FB2-B9DE-B00A2A5E9691}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C7576EF7-1951-4FB2-B9DE-B00A2A5E9691}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C7576EF7-1951-4FB2-B9DE-B00A2A5E9691}.Release|Any CPU.Build.0 = Release|Any CPU - {0948E1FB-79A3-416D-90C7-AA7F802DF3DB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0948E1FB-79A3-416D-90C7-AA7F802DF3DB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0948E1FB-79A3-416D-90C7-AA7F802DF3DB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0948E1FB-79A3-416D-90C7-AA7F802DF3DB}.Release|Any CPU.Build.0 = Release|Any CPU - {333930B2-87C5-48C7-A25C-621BA79BE569}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {333930B2-87C5-48C7-A25C-621BA79BE569}.Debug|Any CPU.Build.0 = Debug|Any CPU - {333930B2-87C5-48C7-A25C-621BA79BE569}.Release|Any CPU.ActiveCfg = Release|Any CPU - {333930B2-87C5-48C7-A25C-621BA79BE569}.Release|Any CPU.Build.0 = Release|Any CPU - {72085EE7-F0A3-47B2-95C5-415C8A10651A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {72085EE7-F0A3-47B2-95C5-415C8A10651A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {72085EE7-F0A3-47B2-95C5-415C8A10651A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {72085EE7-F0A3-47B2-95C5-415C8A10651A}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {5178E0AE-1976-4656-B927-7C06FDA1445F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {276F130B-FFA0-4F8D-938C-FE45F90268D0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {00682DD2-923B-44BC-AB87-6C8E46A4FC35} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {A590551F-D0DB-482C-B767-C9068BD763AF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {B888E5FE-DDCF-4ED1-937B-9E23FF3F6915} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {D0DEA739-339D-4DD3-9B08-0E156D4DA333} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0FE2450D-8C66-4AA5-8BF7-DABA8A532817} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A16B3F91-9739-4940-855F-065EB481ACA6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A13428C5-CFB3-4F8B-9638-461F99038722} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {34875E40-E404-44DD-8818-8C4CD8F34F0B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {91EAE921-94F0-4AC2-840C-0F730A173229} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C7576EF7-1951-4FB2-B9DE-B00A2A5E9691} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0948E1FB-79A3-416D-90C7-AA7F802DF3DB} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {333930B2-87C5-48C7-A25C-621BA79BE569} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {72085EE7-F0A3-47B2-95C5-415C8A10651A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {D0DEA739-339D-4DD3-9B08-0E156D4DA333} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0FE2450D-8C66-4AA5-8BF7-DABA8A532817} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A16B3F91-9739-4940-855F-065EB481ACA6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A13428C5-CFB3-4F8B-9638-461F99038722} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {34875E40-E404-44DD-8818-8C4CD8F34F0B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {91EAE921-94F0-4AC2-840C-0F730A173229} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C7576EF7-1951-4FB2-B9DE-B00A2A5E9691} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0948E1FB-79A3-416D-90C7-AA7F802DF3DB} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {333930B2-87C5-48C7-A25C-621BA79BE569} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {72085EE7-F0A3-47B2-95C5-415C8A10651A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {8C16E691-7F28-4E90-B3B8-FD1626054FEC} diff --git a/sdk/src/Services/Outposts/Properties/AssemblyInfo.cs b/sdk/src/Services/Outposts/Properties/AssemblyInfo.cs index af1794ad15a6..c98d6d5d0a9f 100644 --- a/sdk/src/Services/Outposts/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/Outposts/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.404.0")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/PCS/Generated/AmazonPCSConfig.cs b/sdk/src/Services/PCS/Generated/AmazonPCSConfig.cs index 43d2c46080b1..65dc50d48b3c 100644 --- a/sdk/src/Services/PCS/Generated/AmazonPCSConfig.cs +++ b/sdk/src/Services/PCS/Generated/AmazonPCSConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.PCS public partial class AmazonPCSConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("PCS", "4.0.0.0"); private static readonly AmazonPCSEndpointResolver EndpointResolver = new AmazonPCSEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("PCS", "3.7.400.14"); -======= - InternalSDKUtils.BuildUserAgentString("PCS", "3.7.400.41"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/PCS/PCS.sln b/sdk/src/Services/PCS/PCS.sln index f4c576597152..a497c3b44fb4 100644 --- a/sdk/src/Services/PCS/PCS.sln +++ b/sdk/src/Services/PCS/PCS.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {25EA8E6A-DB44-4C7F-8C10-6669B76A9624}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {25EA8E6A-DB44-4C7F-8C10-6669B76A9624}.Debug|Any CPU.Build.0 = Debug|Any CPU {25EA8E6A-DB44-4C7F-8C10-6669B76A9624}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {DFD75207-4DC6-4CB5-AF94-15AE21617277}.Debug|Any CPU.Build.0 = Debug|Any CPU {DFD75207-4DC6-4CB5-AF94-15AE21617277}.Release|Any CPU.ActiveCfg = Release|Any CPU {DFD75207-4DC6-4CB5-AF94-15AE21617277}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {CFA11D79-DF94-4BE3-87E6-502C5CE6E289}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CFA11D79-DF94-4BE3-87E6-502C5CE6E289}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CFA11D79-DF94-4BE3-87E6-502C5CE6E289}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CFA11D79-DF94-4BE3-87E6-502C5CE6E289}.Release|Any CPU.Build.0 = Release|Any CPU - {279DD1E8-A2CA-4C33-BA2B-122BBDB6CA8A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {279DD1E8-A2CA-4C33-BA2B-122BBDB6CA8A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {279DD1E8-A2CA-4C33-BA2B-122BBDB6CA8A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {279DD1E8-A2CA-4C33-BA2B-122BBDB6CA8A}.Release|Any CPU.Build.0 = Release|Any CPU - {E299A580-73FE-457D-A619-F0F3106C7F1F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E299A580-73FE-457D-A619-F0F3106C7F1F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E299A580-73FE-457D-A619-F0F3106C7F1F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E299A580-73FE-457D-A619-F0F3106C7F1F}.Release|Any CPU.Build.0 = Release|Any CPU - {5D04522C-7C0E-434F-AB44-C779DB949CB8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5D04522C-7C0E-434F-AB44-C779DB949CB8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5D04522C-7C0E-434F-AB44-C779DB949CB8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5D04522C-7C0E-434F-AB44-C779DB949CB8}.Release|Any CPU.Build.0 = Release|Any CPU - {1194B334-914C-4460-8B23-8A8F927CD165}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1194B334-914C-4460-8B23-8A8F927CD165}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1194B334-914C-4460-8B23-8A8F927CD165}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1194B334-914C-4460-8B23-8A8F927CD165}.Release|Any CPU.Build.0 = Release|Any CPU - {D0434454-61D3-4D43-9DE3-EC570F31F320}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D0434454-61D3-4D43-9DE3-EC570F31F320}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D0434454-61D3-4D43-9DE3-EC570F31F320}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D0434454-61D3-4D43-9DE3-EC570F31F320}.Release|Any CPU.Build.0 = Release|Any CPU - {0F7B5C83-B65B-4DED-8153-A6B5A54442E6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0F7B5C83-B65B-4DED-8153-A6B5A54442E6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0F7B5C83-B65B-4DED-8153-A6B5A54442E6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0F7B5C83-B65B-4DED-8153-A6B5A54442E6}.Release|Any CPU.Build.0 = Release|Any CPU - {48CD65FC-265A-4D4E-BB08-094758C669A3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {48CD65FC-265A-4D4E-BB08-094758C669A3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {48CD65FC-265A-4D4E-BB08-094758C669A3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {48CD65FC-265A-4D4E-BB08-094758C669A3}.Release|Any CPU.Build.0 = Release|Any CPU - {55D64AC4-1DEC-4CFC-9AF4-C90CC6F9B0A7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {55D64AC4-1DEC-4CFC-9AF4-C90CC6F9B0A7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {55D64AC4-1DEC-4CFC-9AF4-C90CC6F9B0A7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {55D64AC4-1DEC-4CFC-9AF4-C90CC6F9B0A7}.Release|Any CPU.Build.0 = Release|Any CPU - {B1199361-473E-4BE9-8201-9C428B44FB6C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B1199361-473E-4BE9-8201-9C428B44FB6C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B1199361-473E-4BE9-8201-9C428B44FB6C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B1199361-473E-4BE9-8201-9C428B44FB6C}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {CFA11D79-DF94-4BE3-87E6-502C5CE6E289}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CFA11D79-DF94-4BE3-87E6-502C5CE6E289}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CFA11D79-DF94-4BE3-87E6-502C5CE6E289}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CFA11D79-DF94-4BE3-87E6-502C5CE6E289}.Release|Any CPU.Build.0 = Release|Any CPU - {279DD1E8-A2CA-4C33-BA2B-122BBDB6CA8A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {279DD1E8-A2CA-4C33-BA2B-122BBDB6CA8A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {279DD1E8-A2CA-4C33-BA2B-122BBDB6CA8A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {279DD1E8-A2CA-4C33-BA2B-122BBDB6CA8A}.Release|Any CPU.Build.0 = Release|Any CPU - {E299A580-73FE-457D-A619-F0F3106C7F1F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E299A580-73FE-457D-A619-F0F3106C7F1F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E299A580-73FE-457D-A619-F0F3106C7F1F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E299A580-73FE-457D-A619-F0F3106C7F1F}.Release|Any CPU.Build.0 = Release|Any CPU - {5D04522C-7C0E-434F-AB44-C779DB949CB8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5D04522C-7C0E-434F-AB44-C779DB949CB8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5D04522C-7C0E-434F-AB44-C779DB949CB8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5D04522C-7C0E-434F-AB44-C779DB949CB8}.Release|Any CPU.Build.0 = Release|Any CPU - {1194B334-914C-4460-8B23-8A8F927CD165}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1194B334-914C-4460-8B23-8A8F927CD165}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1194B334-914C-4460-8B23-8A8F927CD165}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1194B334-914C-4460-8B23-8A8F927CD165}.Release|Any CPU.Build.0 = Release|Any CPU - {D0434454-61D3-4D43-9DE3-EC570F31F320}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D0434454-61D3-4D43-9DE3-EC570F31F320}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D0434454-61D3-4D43-9DE3-EC570F31F320}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D0434454-61D3-4D43-9DE3-EC570F31F320}.Release|Any CPU.Build.0 = Release|Any CPU - {0F7B5C83-B65B-4DED-8153-A6B5A54442E6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0F7B5C83-B65B-4DED-8153-A6B5A54442E6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0F7B5C83-B65B-4DED-8153-A6B5A54442E6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0F7B5C83-B65B-4DED-8153-A6B5A54442E6}.Release|Any CPU.Build.0 = Release|Any CPU - {48CD65FC-265A-4D4E-BB08-094758C669A3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {48CD65FC-265A-4D4E-BB08-094758C669A3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {48CD65FC-265A-4D4E-BB08-094758C669A3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {48CD65FC-265A-4D4E-BB08-094758C669A3}.Release|Any CPU.Build.0 = Release|Any CPU - {55D64AC4-1DEC-4CFC-9AF4-C90CC6F9B0A7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {55D64AC4-1DEC-4CFC-9AF4-C90CC6F9B0A7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {55D64AC4-1DEC-4CFC-9AF4-C90CC6F9B0A7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {55D64AC4-1DEC-4CFC-9AF4-C90CC6F9B0A7}.Release|Any CPU.Build.0 = Release|Any CPU - {B1199361-473E-4BE9-8201-9C428B44FB6C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B1199361-473E-4BE9-8201-9C428B44FB6C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B1199361-473E-4BE9-8201-9C428B44FB6C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B1199361-473E-4BE9-8201-9C428B44FB6C}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {25EA8E6A-DB44-4C7F-8C10-6669B76A9624} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {7811469E-C7A3-4382-9EDD-81BC93FE23DC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {18395E85-6DFC-46A9-996C-E9690B99417F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {0CF9E13A-0B00-41AC-B1E9-855F19A96BAE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {DFD75207-4DC6-4CB5-AF94-15AE21617277} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {CFA11D79-DF94-4BE3-87E6-502C5CE6E289} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {279DD1E8-A2CA-4C33-BA2B-122BBDB6CA8A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E299A580-73FE-457D-A619-F0F3106C7F1F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {5D04522C-7C0E-434F-AB44-C779DB949CB8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {1194B334-914C-4460-8B23-8A8F927CD165} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D0434454-61D3-4D43-9DE3-EC570F31F320} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0F7B5C83-B65B-4DED-8153-A6B5A54442E6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {48CD65FC-265A-4D4E-BB08-094758C669A3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {55D64AC4-1DEC-4CFC-9AF4-C90CC6F9B0A7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B1199361-473E-4BE9-8201-9C428B44FB6C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {CFA11D79-DF94-4BE3-87E6-502C5CE6E289} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {279DD1E8-A2CA-4C33-BA2B-122BBDB6CA8A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E299A580-73FE-457D-A619-F0F3106C7F1F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {5D04522C-7C0E-434F-AB44-C779DB949CB8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {1194B334-914C-4460-8B23-8A8F927CD165} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D0434454-61D3-4D43-9DE3-EC570F31F320} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0F7B5C83-B65B-4DED-8153-A6B5A54442E6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {48CD65FC-265A-4D4E-BB08-094758C669A3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {55D64AC4-1DEC-4CFC-9AF4-C90CC6F9B0A7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B1199361-473E-4BE9-8201-9C428B44FB6C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {ACB36149-B14A-4A3E-9B18-FE15977D2A16} diff --git a/sdk/src/Services/PCS/Properties/AssemblyInfo.cs b/sdk/src/Services/PCS/Properties/AssemblyInfo.cs index 14cbadcee3ce..7c52d09a61ba 100644 --- a/sdk/src/Services/PCS/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/PCS/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.14")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.41")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/PI/Generated/AmazonPIConfig.cs b/sdk/src/Services/PI/Generated/AmazonPIConfig.cs index 7beff077d4fe..cf8d338bdd99 100644 --- a/sdk/src/Services/PI/Generated/AmazonPIConfig.cs +++ b/sdk/src/Services/PI/Generated/AmazonPIConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.PI public partial class AmazonPIConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("PI", "4.0.0.0"); private static readonly AmazonPIEndpointResolver EndpointResolver = new AmazonPIEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("PI", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("PI", "3.7.400.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/PI/PI.sln b/sdk/src/Services/PI/PI.sln index 5cf83cc76256..bde14e7b5722 100644 --- a/sdk/src/Services/PI/PI.sln +++ b/sdk/src/Services/PI/PI.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {245D9D59-D399-4B40-A314-38461E46A5BA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {245D9D59-D399-4B40-A314-38461E46A5BA}.Debug|Any CPU.Build.0 = Debug|Any CPU {245D9D59-D399-4B40-A314-38461E46A5BA}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {92B58191-2501-468E-8735-49CEB0D4CAF3}.Debug|Any CPU.Build.0 = Debug|Any CPU {92B58191-2501-468E-8735-49CEB0D4CAF3}.Release|Any CPU.ActiveCfg = Release|Any CPU {92B58191-2501-468E-8735-49CEB0D4CAF3}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {C8C4AAF8-2130-4438-B03B-0A3A5515494F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C8C4AAF8-2130-4438-B03B-0A3A5515494F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C8C4AAF8-2130-4438-B03B-0A3A5515494F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C8C4AAF8-2130-4438-B03B-0A3A5515494F}.Release|Any CPU.Build.0 = Release|Any CPU - {FD75399D-6E9F-45E1-93D2-9FE4579A4D5E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FD75399D-6E9F-45E1-93D2-9FE4579A4D5E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FD75399D-6E9F-45E1-93D2-9FE4579A4D5E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FD75399D-6E9F-45E1-93D2-9FE4579A4D5E}.Release|Any CPU.Build.0 = Release|Any CPU - {B1D86B88-5C7F-4D23-B45D-E58271F808BF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B1D86B88-5C7F-4D23-B45D-E58271F808BF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B1D86B88-5C7F-4D23-B45D-E58271F808BF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B1D86B88-5C7F-4D23-B45D-E58271F808BF}.Release|Any CPU.Build.0 = Release|Any CPU - {DC3B0361-A9B0-47FF-BC70-776823F66C57}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DC3B0361-A9B0-47FF-BC70-776823F66C57}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DC3B0361-A9B0-47FF-BC70-776823F66C57}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DC3B0361-A9B0-47FF-BC70-776823F66C57}.Release|Any CPU.Build.0 = Release|Any CPU - {D8F3FF26-F0CF-48EC-A863-748F64F5E4EC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D8F3FF26-F0CF-48EC-A863-748F64F5E4EC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D8F3FF26-F0CF-48EC-A863-748F64F5E4EC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D8F3FF26-F0CF-48EC-A863-748F64F5E4EC}.Release|Any CPU.Build.0 = Release|Any CPU - {71F296E7-A990-48D0-A42E-C1E6099627D1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {71F296E7-A990-48D0-A42E-C1E6099627D1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {71F296E7-A990-48D0-A42E-C1E6099627D1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {71F296E7-A990-48D0-A42E-C1E6099627D1}.Release|Any CPU.Build.0 = Release|Any CPU - {860ED86F-9EA4-49D4-88D4-22919E0951F1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {860ED86F-9EA4-49D4-88D4-22919E0951F1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {860ED86F-9EA4-49D4-88D4-22919E0951F1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {860ED86F-9EA4-49D4-88D4-22919E0951F1}.Release|Any CPU.Build.0 = Release|Any CPU - {0EE8D42A-272E-43F9-ADFD-7AFC1B726D3C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0EE8D42A-272E-43F9-ADFD-7AFC1B726D3C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0EE8D42A-272E-43F9-ADFD-7AFC1B726D3C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0EE8D42A-272E-43F9-ADFD-7AFC1B726D3C}.Release|Any CPU.Build.0 = Release|Any CPU - {4C0D9471-5248-4836-AC27-1813B04C4547}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4C0D9471-5248-4836-AC27-1813B04C4547}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4C0D9471-5248-4836-AC27-1813B04C4547}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4C0D9471-5248-4836-AC27-1813B04C4547}.Release|Any CPU.Build.0 = Release|Any CPU - {904D0BD9-C82F-48EF-AB19-913A23A59CF9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {904D0BD9-C82F-48EF-AB19-913A23A59CF9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {904D0BD9-C82F-48EF-AB19-913A23A59CF9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {904D0BD9-C82F-48EF-AB19-913A23A59CF9}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {C8C4AAF8-2130-4438-B03B-0A3A5515494F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C8C4AAF8-2130-4438-B03B-0A3A5515494F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C8C4AAF8-2130-4438-B03B-0A3A5515494F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C8C4AAF8-2130-4438-B03B-0A3A5515494F}.Release|Any CPU.Build.0 = Release|Any CPU - {FD75399D-6E9F-45E1-93D2-9FE4579A4D5E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FD75399D-6E9F-45E1-93D2-9FE4579A4D5E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FD75399D-6E9F-45E1-93D2-9FE4579A4D5E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FD75399D-6E9F-45E1-93D2-9FE4579A4D5E}.Release|Any CPU.Build.0 = Release|Any CPU - {B1D86B88-5C7F-4D23-B45D-E58271F808BF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B1D86B88-5C7F-4D23-B45D-E58271F808BF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B1D86B88-5C7F-4D23-B45D-E58271F808BF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B1D86B88-5C7F-4D23-B45D-E58271F808BF}.Release|Any CPU.Build.0 = Release|Any CPU - {DC3B0361-A9B0-47FF-BC70-776823F66C57}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DC3B0361-A9B0-47FF-BC70-776823F66C57}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DC3B0361-A9B0-47FF-BC70-776823F66C57}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DC3B0361-A9B0-47FF-BC70-776823F66C57}.Release|Any CPU.Build.0 = Release|Any CPU - {D8F3FF26-F0CF-48EC-A863-748F64F5E4EC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D8F3FF26-F0CF-48EC-A863-748F64F5E4EC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D8F3FF26-F0CF-48EC-A863-748F64F5E4EC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D8F3FF26-F0CF-48EC-A863-748F64F5E4EC}.Release|Any CPU.Build.0 = Release|Any CPU - {71F296E7-A990-48D0-A42E-C1E6099627D1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {71F296E7-A990-48D0-A42E-C1E6099627D1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {71F296E7-A990-48D0-A42E-C1E6099627D1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {71F296E7-A990-48D0-A42E-C1E6099627D1}.Release|Any CPU.Build.0 = Release|Any CPU - {860ED86F-9EA4-49D4-88D4-22919E0951F1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {860ED86F-9EA4-49D4-88D4-22919E0951F1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {860ED86F-9EA4-49D4-88D4-22919E0951F1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {860ED86F-9EA4-49D4-88D4-22919E0951F1}.Release|Any CPU.Build.0 = Release|Any CPU - {0EE8D42A-272E-43F9-ADFD-7AFC1B726D3C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0EE8D42A-272E-43F9-ADFD-7AFC1B726D3C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0EE8D42A-272E-43F9-ADFD-7AFC1B726D3C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0EE8D42A-272E-43F9-ADFD-7AFC1B726D3C}.Release|Any CPU.Build.0 = Release|Any CPU - {4C0D9471-5248-4836-AC27-1813B04C4547}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4C0D9471-5248-4836-AC27-1813B04C4547}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4C0D9471-5248-4836-AC27-1813B04C4547}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4C0D9471-5248-4836-AC27-1813B04C4547}.Release|Any CPU.Build.0 = Release|Any CPU - {904D0BD9-C82F-48EF-AB19-913A23A59CF9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {904D0BD9-C82F-48EF-AB19-913A23A59CF9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {904D0BD9-C82F-48EF-AB19-913A23A59CF9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {904D0BD9-C82F-48EF-AB19-913A23A59CF9}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {245D9D59-D399-4B40-A314-38461E46A5BA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {F267A8D2-E8F5-434E-9187-1344D0F2FA73} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {2D12F94F-CC74-478B-9A5E-A4B83D00559F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {96A7246E-9013-4C5C-AB5F-7832C61F9030} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {92B58191-2501-468E-8735-49CEB0D4CAF3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {C8C4AAF8-2130-4438-B03B-0A3A5515494F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {FD75399D-6E9F-45E1-93D2-9FE4579A4D5E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B1D86B88-5C7F-4D23-B45D-E58271F808BF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {DC3B0361-A9B0-47FF-BC70-776823F66C57} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D8F3FF26-F0CF-48EC-A863-748F64F5E4EC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {71F296E7-A990-48D0-A42E-C1E6099627D1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {860ED86F-9EA4-49D4-88D4-22919E0951F1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0EE8D42A-272E-43F9-ADFD-7AFC1B726D3C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4C0D9471-5248-4836-AC27-1813B04C4547} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {904D0BD9-C82F-48EF-AB19-913A23A59CF9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {C8C4AAF8-2130-4438-B03B-0A3A5515494F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {FD75399D-6E9F-45E1-93D2-9FE4579A4D5E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B1D86B88-5C7F-4D23-B45D-E58271F808BF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {DC3B0361-A9B0-47FF-BC70-776823F66C57} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D8F3FF26-F0CF-48EC-A863-748F64F5E4EC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {71F296E7-A990-48D0-A42E-C1E6099627D1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {860ED86F-9EA4-49D4-88D4-22919E0951F1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0EE8D42A-272E-43F9-ADFD-7AFC1B726D3C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4C0D9471-5248-4836-AC27-1813B04C4547} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {904D0BD9-C82F-48EF-AB19-913A23A59CF9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {D9E41BD8-7DF1-4FE9-93F9-86E204332B58} diff --git a/sdk/src/Services/PI/Properties/AssemblyInfo.cs b/sdk/src/Services/PI/Properties/AssemblyInfo.cs index 41207b5ed793..73869f259238 100644 --- a/sdk/src/Services/PI/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/PI/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/Panorama/Generated/AmazonPanoramaConfig.cs b/sdk/src/Services/Panorama/Generated/AmazonPanoramaConfig.cs index 3eee8250b12a..e2227cb67886 100644 --- a/sdk/src/Services/Panorama/Generated/AmazonPanoramaConfig.cs +++ b/sdk/src/Services/Panorama/Generated/AmazonPanoramaConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.Panorama public partial class AmazonPanoramaConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("Panorama", "4.0.0.0"); private static readonly AmazonPanoramaEndpointResolver EndpointResolver = new AmazonPanoramaEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("Panorama", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("Panorama", "3.7.400.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/Panorama/Panorama.sln b/sdk/src/Services/Panorama/Panorama.sln index 44b2ef62011a..1190f5aad4ad 100644 --- a/sdk/src/Services/Panorama/Panorama.sln +++ b/sdk/src/Services/Panorama/Panorama.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {723FBE85-B9B0-4F08-A28A-1BB5D2EB3FFF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {723FBE85-B9B0-4F08-A28A-1BB5D2EB3FFF}.Debug|Any CPU.Build.0 = Debug|Any CPU {723FBE85-B9B0-4F08-A28A-1BB5D2EB3FFF}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {146C4E24-7755-494F-B7F2-153D3B46AED9}.Debug|Any CPU.Build.0 = Debug|Any CPU {146C4E24-7755-494F-B7F2-153D3B46AED9}.Release|Any CPU.ActiveCfg = Release|Any CPU {146C4E24-7755-494F-B7F2-153D3B46AED9}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {0D47D701-2C43-4A91-B754-E08C71DCF4B0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0D47D701-2C43-4A91-B754-E08C71DCF4B0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0D47D701-2C43-4A91-B754-E08C71DCF4B0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0D47D701-2C43-4A91-B754-E08C71DCF4B0}.Release|Any CPU.Build.0 = Release|Any CPU - {84B09D15-BC30-45E4-9BFB-FC080D2DF6C4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {84B09D15-BC30-45E4-9BFB-FC080D2DF6C4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {84B09D15-BC30-45E4-9BFB-FC080D2DF6C4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {84B09D15-BC30-45E4-9BFB-FC080D2DF6C4}.Release|Any CPU.Build.0 = Release|Any CPU - {BFAB04FD-E8C3-46F0-86FF-A38A972726CE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BFAB04FD-E8C3-46F0-86FF-A38A972726CE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BFAB04FD-E8C3-46F0-86FF-A38A972726CE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BFAB04FD-E8C3-46F0-86FF-A38A972726CE}.Release|Any CPU.Build.0 = Release|Any CPU - {18DFC72D-F922-45D2-9160-891B3D5E5436}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {18DFC72D-F922-45D2-9160-891B3D5E5436}.Debug|Any CPU.Build.0 = Debug|Any CPU - {18DFC72D-F922-45D2-9160-891B3D5E5436}.Release|Any CPU.ActiveCfg = Release|Any CPU - {18DFC72D-F922-45D2-9160-891B3D5E5436}.Release|Any CPU.Build.0 = Release|Any CPU - {A2B35245-D3C3-4875-8F01-670BA3CC4065}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A2B35245-D3C3-4875-8F01-670BA3CC4065}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A2B35245-D3C3-4875-8F01-670BA3CC4065}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A2B35245-D3C3-4875-8F01-670BA3CC4065}.Release|Any CPU.Build.0 = Release|Any CPU - {765600CD-2286-4337-A0EF-E1C7B1656D0A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {765600CD-2286-4337-A0EF-E1C7B1656D0A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {765600CD-2286-4337-A0EF-E1C7B1656D0A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {765600CD-2286-4337-A0EF-E1C7B1656D0A}.Release|Any CPU.Build.0 = Release|Any CPU - {8D24A7D9-ACFD-4E7B-BCD9-BAC957706814}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8D24A7D9-ACFD-4E7B-BCD9-BAC957706814}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8D24A7D9-ACFD-4E7B-BCD9-BAC957706814}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8D24A7D9-ACFD-4E7B-BCD9-BAC957706814}.Release|Any CPU.Build.0 = Release|Any CPU - {2040761A-9DDC-4818-99B8-7F7484007A88}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2040761A-9DDC-4818-99B8-7F7484007A88}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2040761A-9DDC-4818-99B8-7F7484007A88}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2040761A-9DDC-4818-99B8-7F7484007A88}.Release|Any CPU.Build.0 = Release|Any CPU - {4CC2014E-0C2C-41AA-9869-D8310B2457BF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4CC2014E-0C2C-41AA-9869-D8310B2457BF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4CC2014E-0C2C-41AA-9869-D8310B2457BF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4CC2014E-0C2C-41AA-9869-D8310B2457BF}.Release|Any CPU.Build.0 = Release|Any CPU - {90840FB8-D48D-49B0-BCEB-95A494D99322}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {90840FB8-D48D-49B0-BCEB-95A494D99322}.Debug|Any CPU.Build.0 = Debug|Any CPU - {90840FB8-D48D-49B0-BCEB-95A494D99322}.Release|Any CPU.ActiveCfg = Release|Any CPU - {90840FB8-D48D-49B0-BCEB-95A494D99322}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {0D47D701-2C43-4A91-B754-E08C71DCF4B0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0D47D701-2C43-4A91-B754-E08C71DCF4B0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0D47D701-2C43-4A91-B754-E08C71DCF4B0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0D47D701-2C43-4A91-B754-E08C71DCF4B0}.Release|Any CPU.Build.0 = Release|Any CPU - {84B09D15-BC30-45E4-9BFB-FC080D2DF6C4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {84B09D15-BC30-45E4-9BFB-FC080D2DF6C4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {84B09D15-BC30-45E4-9BFB-FC080D2DF6C4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {84B09D15-BC30-45E4-9BFB-FC080D2DF6C4}.Release|Any CPU.Build.0 = Release|Any CPU - {BFAB04FD-E8C3-46F0-86FF-A38A972726CE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BFAB04FD-E8C3-46F0-86FF-A38A972726CE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BFAB04FD-E8C3-46F0-86FF-A38A972726CE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BFAB04FD-E8C3-46F0-86FF-A38A972726CE}.Release|Any CPU.Build.0 = Release|Any CPU - {18DFC72D-F922-45D2-9160-891B3D5E5436}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {18DFC72D-F922-45D2-9160-891B3D5E5436}.Debug|Any CPU.Build.0 = Debug|Any CPU - {18DFC72D-F922-45D2-9160-891B3D5E5436}.Release|Any CPU.ActiveCfg = Release|Any CPU - {18DFC72D-F922-45D2-9160-891B3D5E5436}.Release|Any CPU.Build.0 = Release|Any CPU - {A2B35245-D3C3-4875-8F01-670BA3CC4065}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A2B35245-D3C3-4875-8F01-670BA3CC4065}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A2B35245-D3C3-4875-8F01-670BA3CC4065}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A2B35245-D3C3-4875-8F01-670BA3CC4065}.Release|Any CPU.Build.0 = Release|Any CPU - {765600CD-2286-4337-A0EF-E1C7B1656D0A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {765600CD-2286-4337-A0EF-E1C7B1656D0A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {765600CD-2286-4337-A0EF-E1C7B1656D0A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {765600CD-2286-4337-A0EF-E1C7B1656D0A}.Release|Any CPU.Build.0 = Release|Any CPU - {8D24A7D9-ACFD-4E7B-BCD9-BAC957706814}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8D24A7D9-ACFD-4E7B-BCD9-BAC957706814}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8D24A7D9-ACFD-4E7B-BCD9-BAC957706814}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8D24A7D9-ACFD-4E7B-BCD9-BAC957706814}.Release|Any CPU.Build.0 = Release|Any CPU - {2040761A-9DDC-4818-99B8-7F7484007A88}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2040761A-9DDC-4818-99B8-7F7484007A88}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2040761A-9DDC-4818-99B8-7F7484007A88}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2040761A-9DDC-4818-99B8-7F7484007A88}.Release|Any CPU.Build.0 = Release|Any CPU - {4CC2014E-0C2C-41AA-9869-D8310B2457BF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4CC2014E-0C2C-41AA-9869-D8310B2457BF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4CC2014E-0C2C-41AA-9869-D8310B2457BF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4CC2014E-0C2C-41AA-9869-D8310B2457BF}.Release|Any CPU.Build.0 = Release|Any CPU - {90840FB8-D48D-49B0-BCEB-95A494D99322}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {90840FB8-D48D-49B0-BCEB-95A494D99322}.Debug|Any CPU.Build.0 = Debug|Any CPU - {90840FB8-D48D-49B0-BCEB-95A494D99322}.Release|Any CPU.ActiveCfg = Release|Any CPU - {90840FB8-D48D-49B0-BCEB-95A494D99322}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {723FBE85-B9B0-4F08-A28A-1BB5D2EB3FFF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {37D8B310-9B16-464F-8036-F257EFBF78AF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {18854C68-B1D0-4A49-9BAB-C7B7565E2C8B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {7F77D4BA-E997-4398-85A8-7844B1EED797} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {146C4E24-7755-494F-B7F2-153D3B46AED9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {0D47D701-2C43-4A91-B754-E08C71DCF4B0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {84B09D15-BC30-45E4-9BFB-FC080D2DF6C4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {BFAB04FD-E8C3-46F0-86FF-A38A972726CE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {18DFC72D-F922-45D2-9160-891B3D5E5436} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A2B35245-D3C3-4875-8F01-670BA3CC4065} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {765600CD-2286-4337-A0EF-E1C7B1656D0A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8D24A7D9-ACFD-4E7B-BCD9-BAC957706814} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {2040761A-9DDC-4818-99B8-7F7484007A88} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4CC2014E-0C2C-41AA-9869-D8310B2457BF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {90840FB8-D48D-49B0-BCEB-95A494D99322} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {0D47D701-2C43-4A91-B754-E08C71DCF4B0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {84B09D15-BC30-45E4-9BFB-FC080D2DF6C4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {BFAB04FD-E8C3-46F0-86FF-A38A972726CE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {18DFC72D-F922-45D2-9160-891B3D5E5436} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A2B35245-D3C3-4875-8F01-670BA3CC4065} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {765600CD-2286-4337-A0EF-E1C7B1656D0A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8D24A7D9-ACFD-4E7B-BCD9-BAC957706814} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {2040761A-9DDC-4818-99B8-7F7484007A88} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4CC2014E-0C2C-41AA-9869-D8310B2457BF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {90840FB8-D48D-49B0-BCEB-95A494D99322} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {B1443B41-EB8B-45DE-BB25-CFBC5F8263B0} diff --git a/sdk/src/Services/Panorama/Properties/AssemblyInfo.cs b/sdk/src/Services/Panorama/Properties/AssemblyInfo.cs index c43e5aef7a87..df200aec4925 100644 --- a/sdk/src/Services/Panorama/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/Panorama/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/PartnerCentralSelling/AWSSDK.PartnerCentralSelling.Net35.csproj b/sdk/src/Services/PartnerCentralSelling/AWSSDK.PartnerCentralSelling.Net35.csproj deleted file mode 100644 index ca05d250ed4d..000000000000 --- a/sdk/src/Services/PartnerCentralSelling/AWSSDK.PartnerCentralSelling.Net35.csproj +++ /dev/null @@ -1,83 +0,0 @@ - - - true - net35 - $(DefineConstants);BCL;BCL35;AWS_APM_API;CODE_ANALYSIS - portable - true - AWSSDK.PartnerCentralSelling - AWSSDK.PartnerCentralSelling - - false - false - false - false - false - false - false - false - true - true - - - C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v3.5\Profile\Client - - false - CA1822 - - - ../../../AWSDotNetSDK.ruleset - - - ../../../AWSDotNetSDKForBuild.ruleset - - - - - - ../../../awssdk.dll.snk - - - - - $(AWSKeyFile) - - - - - - - - - - - - - - - - - - - - - - - all - - - all - - - - - - - - - C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\v3.5\System.Data.Entity.dll - - - - - \ No newline at end of file diff --git a/sdk/src/Services/PartnerCentralSelling/AWSSDK.PartnerCentralSelling.Net45.csproj b/sdk/src/Services/PartnerCentralSelling/AWSSDK.PartnerCentralSelling.NetFramework.csproj similarity index 81% rename from sdk/src/Services/PartnerCentralSelling/AWSSDK.PartnerCentralSelling.Net45.csproj rename to sdk/src/Services/PartnerCentralSelling/AWSSDK.PartnerCentralSelling.NetFramework.csproj index 94fa00b4c8f9..164407763297 100644 --- a/sdk/src/Services/PartnerCentralSelling/AWSSDK.PartnerCentralSelling.Net45.csproj +++ b/sdk/src/Services/PartnerCentralSelling/AWSSDK.PartnerCentralSelling.NetFramework.csproj @@ -1,8 +1,8 @@ true - net45 - $(DefineConstants);BCL;BCL45;AWS_ASYNC_API;CODE_ANALYSIS + net472 + $(DefineConstants);BCL;AWS_ASYNC_API;CODE_ANALYSIS portable true AWSSDK.PartnerCentralSelling @@ -21,6 +21,16 @@ CA1822 + + + 11.0 + + + 9.0 + ../../../AWSDotNetSDK.ruleset @@ -45,14 +55,13 @@ - - + diff --git a/sdk/src/Services/PartnerCentralSelling/AWSSDK.PartnerCentralSelling.NetStandard.csproj b/sdk/src/Services/PartnerCentralSelling/AWSSDK.PartnerCentralSelling.NetStandard.csproj index 45f9ce26c1f3..2f2eb9cf46e2 100644 --- a/sdk/src/Services/PartnerCentralSelling/AWSSDK.PartnerCentralSelling.NetStandard.csproj +++ b/sdk/src/Services/PartnerCentralSelling/AWSSDK.PartnerCentralSelling.NetStandard.csproj @@ -31,6 +31,16 @@ true + + + 11.0 + + + 9.0 + ../../../AWSDotNetSDK.ruleset @@ -55,8 +65,6 @@ - - diff --git a/sdk/src/Services/PartnerCentralSelling/Generated/AmazonPartnerCentralSellingConfig.cs b/sdk/src/Services/PartnerCentralSelling/Generated/AmazonPartnerCentralSellingConfig.cs index f34af515270e..b07c06ce7ee4 100644 --- a/sdk/src/Services/PartnerCentralSelling/Generated/AmazonPartnerCentralSellingConfig.cs +++ b/sdk/src/Services/PartnerCentralSelling/Generated/AmazonPartnerCentralSellingConfig.cs @@ -21,6 +21,8 @@ using Amazon.Runtime; using Amazon.Runtime.Internal; using Amazon.Util.Internal; +using Amazon.Runtime.Internal.Auth; +using Amazon.Runtime.Endpoints; using Amazon.PartnerCentralSelling.Internal; namespace Amazon.PartnerCentralSelling @@ -32,7 +34,10 @@ namespace Amazon.PartnerCentralSelling public partial class AmazonPartnerCentralSellingConfig : ClientConfig { private static readonly string UserAgentString = - InternalSDKUtils.BuildUserAgentString("PartnerCentral Selling", "3.7.401.1"); + InternalSDKUtils.BuildUserAgentString("PartnerCentral Selling", "4.0.0.0"); + + private static readonly AmazonPartnerCentralSellingEndpointResolver EndpointResolver = + new AmazonPartnerCentralSellingEndpointResolver(); private string _userAgent = UserAgentString; /// @@ -89,5 +94,24 @@ public override string UserAgent } } + /// + /// Returns the endpoint that will be used for a particular request. + /// + /// A Container class for parameters used for endpoint resolution. + /// The resolved endpoint for the given request. + public override Amazon.Runtime.Endpoints.Endpoint DetermineServiceOperationEndpoint(ServiceOperationEndpointParameters parameters) + { + var requestContext = new RequestContext(false, new AWS4Signer()) + { + ClientConfig = this, + OriginalRequest = parameters.Request, + Request = new DefaultRequest(parameters.Request, ServiceId) + }; + + var executionContext = new Amazon.Runtime.Internal.ExecutionContext(requestContext, null); + return EndpointResolver.GetEndpoint(executionContext); + } + + } } \ No newline at end of file diff --git a/sdk/src/Services/PartnerCentralSelling/Generated/AmazonPartnerCentralSellingDefaultConfiguration.cs b/sdk/src/Services/PartnerCentralSelling/Generated/AmazonPartnerCentralSellingDefaultConfiguration.cs index 27ddee565b07..9b0fb1eb7675 100644 --- a/sdk/src/Services/PartnerCentralSelling/Generated/AmazonPartnerCentralSellingDefaultConfiguration.cs +++ b/sdk/src/Services/PartnerCentralSelling/Generated/AmazonPartnerCentralSellingDefaultConfiguration.cs @@ -43,8 +43,7 @@ public static ReadOnlyCollection GetAllConfigurations() InRegion, CrossRegion, Mobile, - Auto, - Legacy + Auto }); } @@ -55,7 +54,6 @@ public static ReadOnlyCollection GetAllConfigurations() { Name = DefaultConfigurationMode.Standard, RetryMode = RequestRetryMode.Standard, - StsRegionalEndpoints = StsRegionalEndpointsValue.Regional, S3UsEast1RegionalEndpoint = S3UsEast1RegionalEndpointValue.Regional, // 0:00:03.1 ConnectTimeout = TimeSpan.FromMilliseconds(3100L), @@ -71,7 +69,6 @@ public static ReadOnlyCollection GetAllConfigurations() { Name = DefaultConfigurationMode.InRegion, RetryMode = RequestRetryMode.Standard, - StsRegionalEndpoints = StsRegionalEndpointsValue.Regional, S3UsEast1RegionalEndpoint = S3UsEast1RegionalEndpointValue.Regional, // 0:00:01.1 ConnectTimeout = TimeSpan.FromMilliseconds(1100L), @@ -87,7 +84,6 @@ public static ReadOnlyCollection GetAllConfigurations() { Name = DefaultConfigurationMode.CrossRegion, RetryMode = RequestRetryMode.Standard, - StsRegionalEndpoints = StsRegionalEndpointsValue.Regional, S3UsEast1RegionalEndpoint = S3UsEast1RegionalEndpointValue.Regional, // 0:00:03.1 ConnectTimeout = TimeSpan.FromMilliseconds(3100L), @@ -103,7 +99,6 @@ public static ReadOnlyCollection GetAllConfigurations() { Name = DefaultConfigurationMode.Mobile, RetryMode = RequestRetryMode.Standard, - StsRegionalEndpoints = StsRegionalEndpointsValue.Regional, S3UsEast1RegionalEndpoint = S3UsEast1RegionalEndpointValue.Regional, // 0:00:30 ConnectTimeout = TimeSpan.FromMilliseconds(30000L), @@ -119,7 +114,6 @@ public static ReadOnlyCollection GetAllConfigurations() { Name = DefaultConfigurationMode.Auto, RetryMode = RequestRetryMode.Standard, - StsRegionalEndpoints = StsRegionalEndpointsValue.Regional, S3UsEast1RegionalEndpoint = S3UsEast1RegionalEndpointValue.Regional, // 0:00:01.1 ConnectTimeout = TimeSpan.FromMilliseconds(1100L), @@ -128,19 +122,5 @@ public static ReadOnlyCollection GetAllConfigurations() TimeToFirstByteTimeout = null, HttpRequestTimeout = null }; - /// - ///

    The LEGACY mode provides default settings that vary per SDK and were used prior to establishment of defaults_mode

    - ///     - public static IDefaultConfiguration Legacy {get;} = new DefaultConfiguration - { - Name = DefaultConfigurationMode.Legacy, - RetryMode = RequestRetryMode.Legacy, - StsRegionalEndpoints = StsRegionalEndpointsValue.Legacy, - S3UsEast1RegionalEndpoint = S3UsEast1RegionalEndpointValue.Legacy, - ConnectTimeout = null, - TlsNegotiationTimeout = null, - TimeToFirstByteTimeout = null, - HttpRequestTimeout = null - }; } } \ No newline at end of file diff --git a/sdk/src/Services/PartnerCentralSelling/Generated/Model/AccessDeniedException.cs b/sdk/src/Services/PartnerCentralSelling/Generated/Model/AccessDeniedException.cs index d08aef878880..7078a13a72f7 100644 --- a/sdk/src/Services/PartnerCentralSelling/Generated/Model/AccessDeniedException.cs +++ b/sdk/src/Services/PartnerCentralSelling/Generated/Model/AccessDeniedException.cs @@ -113,11 +113,6 @@ protected AccessDeniedException(System.Runtime.Serialization.SerializationInfo i /// The that holds the serialized object data about the exception being thrown. /// The that contains contextual information about the source or destination. /// The parameter is a null reference (Nothing in Visual Basic). -#if BCL35 - [System.Security.Permissions.SecurityPermission( - System.Security.Permissions.SecurityAction.LinkDemand, - Flags = System.Security.Permissions.SecurityPermissionFlag.SerializationFormatter)] -#endif [System.Security.SecurityCritical] // These FxCop rules are giving false-positives for this method [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Security", "CA2123:OverrideLinkDemandsShouldBeIdenticalToBase")] diff --git a/sdk/src/Services/PartnerCentralSelling/Generated/Model/ConflictException.cs b/sdk/src/Services/PartnerCentralSelling/Generated/Model/ConflictException.cs index 8423d7b041fb..316dbd148f15 100644 --- a/sdk/src/Services/PartnerCentralSelling/Generated/Model/ConflictException.cs +++ b/sdk/src/Services/PartnerCentralSelling/Generated/Model/ConflictException.cs @@ -114,11 +114,6 @@ protected ConflictException(System.Runtime.Serialization.SerializationInfo info, /// The that holds the serialized object data about the exception being thrown. /// The that contains contextual information about the source or destination. /// The parameter is a null reference (Nothing in Visual Basic). -#if BCL35 - [System.Security.Permissions.SecurityPermission( - System.Security.Permissions.SecurityAction.LinkDemand, - Flags = System.Security.Permissions.SecurityPermissionFlag.SerializationFormatter)] -#endif [System.Security.SecurityCritical] // These FxCop rules are giving false-positives for this method [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Security", "CA2123:OverrideLinkDemandsShouldBeIdenticalToBase")] diff --git a/sdk/src/Services/PartnerCentralSelling/Generated/Model/CreateOpportunityResponse.cs b/sdk/src/Services/PartnerCentralSelling/Generated/Model/CreateOpportunityResponse.cs index a3f8cb073644..f5fb7ebf4eb1 100644 --- a/sdk/src/Services/PartnerCentralSelling/Generated/Model/CreateOpportunityResponse.cs +++ b/sdk/src/Services/PartnerCentralSelling/Generated/Model/CreateOpportunityResponse.cs @@ -67,9 +67,9 @@ internal bool IsSetId() /// is created, its value is CreatedDate. /// ///     - public DateTime LastModifiedDate + public DateTime? LastModifiedDate { - get { return this._lastModifiedDate.GetValueOrDefault(); } + get { return this._lastModifiedDate; } set { this._lastModifiedDate = value; } } diff --git a/sdk/src/Services/PartnerCentralSelling/Generated/Model/EngagementInvitationSummary.cs b/sdk/src/Services/PartnerCentralSelling/Generated/Model/EngagementInvitationSummary.cs index febbc09fbde6..f2868fb91793 100644 --- a/sdk/src/Services/PartnerCentralSelling/Generated/Model/EngagementInvitationSummary.cs +++ b/sdk/src/Services/PartnerCentralSelling/Generated/Model/EngagementInvitationSummary.cs @@ -116,9 +116,9 @@ internal bool IsSetEngagementTitle() /// to the partner. /// ///     - public DateTime ExpirationDate + public DateTime? ExpirationDate { - get { return this._expirationDate.GetValueOrDefault(); } + get { return this._expirationDate; } set { this._expirationDate = value; } } @@ -156,9 +156,9 @@ internal bool IsSetId() /// engagement. /// ///     - public DateTime InvitationDate + public DateTime? InvitationDate { - get { return this._invitationDate.GetValueOrDefault(); } + get { return this._invitationDate; } set { this._invitationDate = value; } } diff --git a/sdk/src/Services/PartnerCentralSelling/Generated/Model/GetEngagementInvitationResponse.cs b/sdk/src/Services/PartnerCentralSelling/Generated/Model/GetEngagementInvitationResponse.cs index 8f1d24826f3f..95bdbe248003 100644 --- a/sdk/src/Services/PartnerCentralSelling/Generated/Model/GetEngagementInvitationResponse.cs +++ b/sdk/src/Services/PartnerCentralSelling/Generated/Model/GetEngagementInvitationResponse.cs @@ -114,9 +114,9 @@ internal bool IsSetEngagementTitle() /// by the partner. /// ///     - public DateTime ExpirationDate + public DateTime? ExpirationDate { - get { return this._expirationDate.GetValueOrDefault(); } + get { return this._expirationDate; } set { this._expirationDate = value; } } @@ -151,9 +151,9 @@ internal bool IsSetId() /// The date when the engagement invitation was sent to the partner. /// ///     - public DateTime InvitationDate + public DateTime? InvitationDate { - get { return this._invitationDate.GetValueOrDefault(); } + get { return this._invitationDate; } set { this._invitationDate = value; } } diff --git a/sdk/src/Services/PartnerCentralSelling/Generated/Model/GetOpportunityResponse.cs b/sdk/src/Services/PartnerCentralSelling/Generated/Model/GetOpportunityResponse.cs index b21133dc14e0..eefa9e4665ec 100644 --- a/sdk/src/Services/PartnerCentralSelling/Generated/Model/GetOpportunityResponse.cs +++ b/sdk/src/Services/PartnerCentralSelling/Generated/Model/GetOpportunityResponse.cs @@ -80,9 +80,9 @@ internal bool IsSetCatalog() /// ///     [AWSProperty(Required=true)] - public DateTime CreatedDate + public DateTime? CreatedDate { - get { return this._createdDate.GetValueOrDefault(); } + get { return this._createdDate; } set { this._createdDate = value; } } @@ -136,9 +136,9 @@ internal bool IsSetId() /// ///     [AWSProperty(Required=true)] - public DateTime LastModifiedDate + public DateTime? LastModifiedDate { - get { return this._lastModifiedDate.GetValueOrDefault(); } + get { return this._lastModifiedDate; } set { this._lastModifiedDate = value; } } diff --git a/sdk/src/Services/PartnerCentralSelling/Generated/Model/Internal/MarshallTransformations/AssignOpportunityRequestMarshaller.cs b/sdk/src/Services/PartnerCentralSelling/Generated/Model/Internal/MarshallTransformations/AssignOpportunityRequestMarshaller.cs index 0c501aebdadc..99c86ea5fb2a 100644 --- a/sdk/src/Services/PartnerCentralSelling/Generated/Model/Internal/MarshallTransformations/AssignOpportunityRequestMarshaller.cs +++ b/sdk/src/Services/PartnerCentralSelling/Generated/Model/Internal/MarshallTransformations/AssignOpportunityRequestMarshaller.cs @@ -63,38 +63,41 @@ public IRequest Marshall(AssignOpportunityRequest publicRequest) request.HttpMethod = "POST"; request.ResourcePath = "/"; - using (StringWriter stringWriter = new StringWriter(CultureInfo.InvariantCulture)) + using (MemoryStream memoryStream = new MemoryStream()) { - JsonWriter writer = new JsonWriter(stringWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetAssignee()) + using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) { - context.Writer.WritePropertyName("Assignee"); - context.Writer.WriteObjectStart(); + JsonWriter writer = new JsonWriter(streamWriter); + writer.Validate = false; + writer.WriteObjectStart(); + var context = new JsonMarshallerContext(request, writer); + if(publicRequest.IsSetAssignee()) + { + context.Writer.WritePropertyName("Assignee"); + context.Writer.WriteObjectStart(); - var marshaller = AssigneeContactMarshaller.Instance; - marshaller.Marshall(publicRequest.Assignee, context); + var marshaller = AssigneeContactMarshaller.Instance; + marshaller.Marshall(publicRequest.Assignee, context); - context.Writer.WriteObjectEnd(); - } + context.Writer.WriteObjectEnd(); + } - if(publicRequest.IsSetCatalog()) - { - context.Writer.WritePropertyName("Catalog"); - context.Writer.Write(publicRequest.Catalog); - } + if(publicRequest.IsSetCatalog()) + { + context.Writer.WritePropertyName("Catalog"); + context.Writer.Write(publicRequest.Catalog); + } - if(publicRequest.IsSetIdentifier()) - { - context.Writer.WritePropertyName("Identifier"); - context.Writer.Write(publicRequest.Identifier); + if(publicRequest.IsSetIdentifier()) + { + context.Writer.WritePropertyName("Identifier"); + context.Writer.Write(publicRequest.Identifier); + } + + writer.WriteObjectEnd(); } - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); + request.Content = memoryStream.ToArray(); } diff --git a/sdk/src/Services/PartnerCentralSelling/Generated/Model/Internal/MarshallTransformations/AssociateOpportunityRequestMarshaller.cs b/sdk/src/Services/PartnerCentralSelling/Generated/Model/Internal/MarshallTransformations/AssociateOpportunityRequestMarshaller.cs index 3440d5a4b5e9..56e77d14143c 100644 --- a/sdk/src/Services/PartnerCentralSelling/Generated/Model/Internal/MarshallTransformations/AssociateOpportunityRequestMarshaller.cs +++ b/sdk/src/Services/PartnerCentralSelling/Generated/Model/Internal/MarshallTransformations/AssociateOpportunityRequestMarshaller.cs @@ -63,39 +63,42 @@ public IRequest Marshall(AssociateOpportunityRequest publicRequest) request.HttpMethod = "POST"; request.ResourcePath = "/"; - using (StringWriter stringWriter = new StringWriter(CultureInfo.InvariantCulture)) + using (MemoryStream memoryStream = new MemoryStream()) { - JsonWriter writer = new JsonWriter(stringWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetCatalog()) + using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) { - context.Writer.WritePropertyName("Catalog"); - context.Writer.Write(publicRequest.Catalog); - } + JsonWriter writer = new JsonWriter(streamWriter); + writer.Validate = false; + writer.WriteObjectStart(); + var context = new JsonMarshallerContext(request, writer); + if(publicRequest.IsSetCatalog()) + { + context.Writer.WritePropertyName("Catalog"); + context.Writer.Write(publicRequest.Catalog); + } - if(publicRequest.IsSetOpportunityIdentifier()) - { - context.Writer.WritePropertyName("OpportunityIdentifier"); - context.Writer.Write(publicRequest.OpportunityIdentifier); - } + if(publicRequest.IsSetOpportunityIdentifier()) + { + context.Writer.WritePropertyName("OpportunityIdentifier"); + context.Writer.Write(publicRequest.OpportunityIdentifier); + } - if(publicRequest.IsSetRelatedEntityIdentifier()) - { - context.Writer.WritePropertyName("RelatedEntityIdentifier"); - context.Writer.Write(publicRequest.RelatedEntityIdentifier); - } + if(publicRequest.IsSetRelatedEntityIdentifier()) + { + context.Writer.WritePropertyName("RelatedEntityIdentifier"); + context.Writer.Write(publicRequest.RelatedEntityIdentifier); + } - if(publicRequest.IsSetRelatedEntityType()) - { - context.Writer.WritePropertyName("RelatedEntityType"); - context.Writer.Write(publicRequest.RelatedEntityType); + if(publicRequest.IsSetRelatedEntityType()) + { + context.Writer.WritePropertyName("RelatedEntityType"); + context.Writer.Write(publicRequest.RelatedEntityType); + } + + writer.WriteObjectEnd(); } - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); + request.Content = memoryStream.ToArray(); } diff --git a/sdk/src/Services/PartnerCentralSelling/Generated/Model/Internal/MarshallTransformations/CreateOpportunityRequestMarshaller.cs b/sdk/src/Services/PartnerCentralSelling/Generated/Model/Internal/MarshallTransformations/CreateOpportunityRequestMarshaller.cs index 443c20a7d3b6..e3c8a3bc4c9f 100644 --- a/sdk/src/Services/PartnerCentralSelling/Generated/Model/Internal/MarshallTransformations/CreateOpportunityRequestMarshaller.cs +++ b/sdk/src/Services/PartnerCentralSelling/Generated/Model/Internal/MarshallTransformations/CreateOpportunityRequestMarshaller.cs @@ -63,138 +63,141 @@ public IRequest Marshall(CreateOpportunityRequest publicRequest) request.HttpMethod = "POST"; request.ResourcePath = "/"; - using (StringWriter stringWriter = new StringWriter(CultureInfo.InvariantCulture)) + using (MemoryStream memoryStream = new MemoryStream()) { - JsonWriter writer = new JsonWriter(stringWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetCatalog()) + using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) { - context.Writer.WritePropertyName("Catalog"); - context.Writer.Write(publicRequest.Catalog); - } - - if(publicRequest.IsSetClientToken()) - { - context.Writer.WritePropertyName("ClientToken"); - context.Writer.Write(publicRequest.ClientToken); - } - - else if(!(publicRequest.IsSetClientToken())) - { - context.Writer.WritePropertyName("ClientToken"); - context.Writer.Write(Guid.NewGuid().ToString()); - } - if(publicRequest.IsSetCustomer()) - { - context.Writer.WritePropertyName("Customer"); - context.Writer.WriteObjectStart(); - - var marshaller = CustomerMarshaller.Instance; - marshaller.Marshall(publicRequest.Customer, context); - - context.Writer.WriteObjectEnd(); - } + JsonWriter writer = new JsonWriter(streamWriter); + writer.Validate = false; + writer.WriteObjectStart(); + var context = new JsonMarshallerContext(request, writer); + if(publicRequest.IsSetCatalog()) + { + context.Writer.WritePropertyName("Catalog"); + context.Writer.Write(publicRequest.Catalog); + } - if(publicRequest.IsSetLifeCycle()) - { - context.Writer.WritePropertyName("LifeCycle"); - context.Writer.WriteObjectStart(); + if(publicRequest.IsSetClientToken()) + { + context.Writer.WritePropertyName("ClientToken"); + context.Writer.Write(publicRequest.ClientToken); + } - var marshaller = LifeCycleMarshaller.Instance; - marshaller.Marshall(publicRequest.LifeCycle, context); + else if(!(publicRequest.IsSetClientToken())) + { + context.Writer.WritePropertyName("ClientToken"); + context.Writer.Write(Guid.NewGuid().ToString()); + } + if(publicRequest.IsSetCustomer()) + { + context.Writer.WritePropertyName("Customer"); + context.Writer.WriteObjectStart(); - context.Writer.WriteObjectEnd(); - } + var marshaller = CustomerMarshaller.Instance; + marshaller.Marshall(publicRequest.Customer, context); - if(publicRequest.IsSetMarketing()) - { - context.Writer.WritePropertyName("Marketing"); - context.Writer.WriteObjectStart(); + context.Writer.WriteObjectEnd(); + } - var marshaller = MarketingMarshaller.Instance; - marshaller.Marshall(publicRequest.Marketing, context); + if(publicRequest.IsSetLifeCycle()) + { + context.Writer.WritePropertyName("LifeCycle"); + context.Writer.WriteObjectStart(); - context.Writer.WriteObjectEnd(); - } + var marshaller = LifeCycleMarshaller.Instance; + marshaller.Marshall(publicRequest.LifeCycle, context); - if(publicRequest.IsSetNationalSecurity()) - { - context.Writer.WritePropertyName("NationalSecurity"); - context.Writer.Write(publicRequest.NationalSecurity); - } + context.Writer.WriteObjectEnd(); + } - if(publicRequest.IsSetOpportunityTeam()) - { - context.Writer.WritePropertyName("OpportunityTeam"); - context.Writer.WriteArrayStart(); - foreach(var publicRequestOpportunityTeamListValue in publicRequest.OpportunityTeam) + if(publicRequest.IsSetMarketing()) { + context.Writer.WritePropertyName("Marketing"); context.Writer.WriteObjectStart(); - var marshaller = ContactMarshaller.Instance; - marshaller.Marshall(publicRequestOpportunityTeamListValue, context); + var marshaller = MarketingMarshaller.Instance; + marshaller.Marshall(publicRequest.Marketing, context); context.Writer.WriteObjectEnd(); } - context.Writer.WriteArrayEnd(); - } - if(publicRequest.IsSetOpportunityType()) - { - context.Writer.WritePropertyName("OpportunityType"); - context.Writer.Write(publicRequest.OpportunityType); - } + if(publicRequest.IsSetNationalSecurity()) + { + context.Writer.WritePropertyName("NationalSecurity"); + context.Writer.Write(publicRequest.NationalSecurity); + } - if(publicRequest.IsSetOrigin()) - { - context.Writer.WritePropertyName("Origin"); - context.Writer.Write(publicRequest.Origin); - } + if(publicRequest.IsSetOpportunityTeam()) + { + context.Writer.WritePropertyName("OpportunityTeam"); + context.Writer.WriteArrayStart(); + foreach(var publicRequestOpportunityTeamListValue in publicRequest.OpportunityTeam) + { + context.Writer.WriteObjectStart(); + + var marshaller = ContactMarshaller.Instance; + marshaller.Marshall(publicRequestOpportunityTeamListValue, context); + + context.Writer.WriteObjectEnd(); + } + context.Writer.WriteArrayEnd(); + } - if(publicRequest.IsSetPartnerOpportunityIdentifier()) - { - context.Writer.WritePropertyName("PartnerOpportunityIdentifier"); - context.Writer.Write(publicRequest.PartnerOpportunityIdentifier); - } + if(publicRequest.IsSetOpportunityType()) + { + context.Writer.WritePropertyName("OpportunityType"); + context.Writer.Write(publicRequest.OpportunityType); + } - if(publicRequest.IsSetPrimaryNeedsFromAws()) - { - context.Writer.WritePropertyName("PrimaryNeedsFromAws"); - context.Writer.WriteArrayStart(); - foreach(var publicRequestPrimaryNeedsFromAwsListValue in publicRequest.PrimaryNeedsFromAws) + if(publicRequest.IsSetOrigin()) { - context.Writer.Write(publicRequestPrimaryNeedsFromAwsListValue); + context.Writer.WritePropertyName("Origin"); + context.Writer.Write(publicRequest.Origin); } - context.Writer.WriteArrayEnd(); - } - if(publicRequest.IsSetProject()) - { - context.Writer.WritePropertyName("Project"); - context.Writer.WriteObjectStart(); + if(publicRequest.IsSetPartnerOpportunityIdentifier()) + { + context.Writer.WritePropertyName("PartnerOpportunityIdentifier"); + context.Writer.Write(publicRequest.PartnerOpportunityIdentifier); + } - var marshaller = ProjectMarshaller.Instance; - marshaller.Marshall(publicRequest.Project, context); + if(publicRequest.IsSetPrimaryNeedsFromAws()) + { + context.Writer.WritePropertyName("PrimaryNeedsFromAws"); + context.Writer.WriteArrayStart(); + foreach(var publicRequestPrimaryNeedsFromAwsListValue in publicRequest.PrimaryNeedsFromAws) + { + context.Writer.Write(publicRequestPrimaryNeedsFromAwsListValue); + } + context.Writer.WriteArrayEnd(); + } - context.Writer.WriteObjectEnd(); - } + if(publicRequest.IsSetProject()) + { + context.Writer.WritePropertyName("Project"); + context.Writer.WriteObjectStart(); - if(publicRequest.IsSetSoftwareRevenue()) - { - context.Writer.WritePropertyName("SoftwareRevenue"); - context.Writer.WriteObjectStart(); + var marshaller = ProjectMarshaller.Instance; + marshaller.Marshall(publicRequest.Project, context); + + context.Writer.WriteObjectEnd(); + } + + if(publicRequest.IsSetSoftwareRevenue()) + { + context.Writer.WritePropertyName("SoftwareRevenue"); + context.Writer.WriteObjectStart(); + + var marshaller = SoftwareRevenueMarshaller.Instance; + marshaller.Marshall(publicRequest.SoftwareRevenue, context); - var marshaller = SoftwareRevenueMarshaller.Instance; - marshaller.Marshall(publicRequest.SoftwareRevenue, context); + context.Writer.WriteObjectEnd(); + } - context.Writer.WriteObjectEnd(); + writer.WriteObjectEnd(); } - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); + request.Content = memoryStream.ToArray(); } diff --git a/sdk/src/Services/PartnerCentralSelling/Generated/Model/Internal/MarshallTransformations/CreateOpportunityResponseUnmarshaller.cs b/sdk/src/Services/PartnerCentralSelling/Generated/Model/Internal/MarshallTransformations/CreateOpportunityResponseUnmarshaller.cs index 02e81a6f1f6f..ceda86743f2a 100644 --- a/sdk/src/Services/PartnerCentralSelling/Generated/Model/Internal/MarshallTransformations/CreateOpportunityResponseUnmarshaller.cs +++ b/sdk/src/Services/PartnerCentralSelling/Generated/Model/Internal/MarshallTransformations/CreateOpportunityResponseUnmarshaller.cs @@ -60,7 +60,7 @@ public override AmazonWebServiceResponse Unmarshall(JsonUnmarshallerContext cont } if (context.TestExpression("LastModifiedDate", targetDepth)) { - var unmarshaller = DateTimeUnmarshaller.Instance; + var unmarshaller = NullableDateTimeUnmarshaller.Instance; response.LastModifiedDate = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/PartnerCentralSelling/Generated/Model/Internal/MarshallTransformations/DisassociateOpportunityRequestMarshaller.cs b/sdk/src/Services/PartnerCentralSelling/Generated/Model/Internal/MarshallTransformations/DisassociateOpportunityRequestMarshaller.cs index a7965667a937..2f161fba2417 100644 --- a/sdk/src/Services/PartnerCentralSelling/Generated/Model/Internal/MarshallTransformations/DisassociateOpportunityRequestMarshaller.cs +++ b/sdk/src/Services/PartnerCentralSelling/Generated/Model/Internal/MarshallTransformations/DisassociateOpportunityRequestMarshaller.cs @@ -63,39 +63,42 @@ public IRequest Marshall(DisassociateOpportunityRequest publicRequest) request.HttpMethod = "POST"; request.ResourcePath = "/"; - using (StringWriter stringWriter = new StringWriter(CultureInfo.InvariantCulture)) + using (MemoryStream memoryStream = new MemoryStream()) { - JsonWriter writer = new JsonWriter(stringWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetCatalog()) + using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) { - context.Writer.WritePropertyName("Catalog"); - context.Writer.Write(publicRequest.Catalog); - } + JsonWriter writer = new JsonWriter(streamWriter); + writer.Validate = false; + writer.WriteObjectStart(); + var context = new JsonMarshallerContext(request, writer); + if(publicRequest.IsSetCatalog()) + { + context.Writer.WritePropertyName("Catalog"); + context.Writer.Write(publicRequest.Catalog); + } - if(publicRequest.IsSetOpportunityIdentifier()) - { - context.Writer.WritePropertyName("OpportunityIdentifier"); - context.Writer.Write(publicRequest.OpportunityIdentifier); - } + if(publicRequest.IsSetOpportunityIdentifier()) + { + context.Writer.WritePropertyName("OpportunityIdentifier"); + context.Writer.Write(publicRequest.OpportunityIdentifier); + } - if(publicRequest.IsSetRelatedEntityIdentifier()) - { - context.Writer.WritePropertyName("RelatedEntityIdentifier"); - context.Writer.Write(publicRequest.RelatedEntityIdentifier); - } + if(publicRequest.IsSetRelatedEntityIdentifier()) + { + context.Writer.WritePropertyName("RelatedEntityIdentifier"); + context.Writer.Write(publicRequest.RelatedEntityIdentifier); + } - if(publicRequest.IsSetRelatedEntityType()) - { - context.Writer.WritePropertyName("RelatedEntityType"); - context.Writer.Write(publicRequest.RelatedEntityType); + if(publicRequest.IsSetRelatedEntityType()) + { + context.Writer.WritePropertyName("RelatedEntityType"); + context.Writer.Write(publicRequest.RelatedEntityType); + } + + writer.WriteObjectEnd(); } - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); + request.Content = memoryStream.ToArray(); } diff --git a/sdk/src/Services/PartnerCentralSelling/Generated/Model/Internal/MarshallTransformations/EngagementInvitationSummaryUnmarshaller.cs b/sdk/src/Services/PartnerCentralSelling/Generated/Model/Internal/MarshallTransformations/EngagementInvitationSummaryUnmarshaller.cs index b3f1086ed51d..e16259e43f02 100644 --- a/sdk/src/Services/PartnerCentralSelling/Generated/Model/Internal/MarshallTransformations/EngagementInvitationSummaryUnmarshaller.cs +++ b/sdk/src/Services/PartnerCentralSelling/Generated/Model/Internal/MarshallTransformations/EngagementInvitationSummaryUnmarshaller.cs @@ -86,7 +86,7 @@ public EngagementInvitationSummary Unmarshall(JsonUnmarshallerContext context) } if (context.TestExpression("ExpirationDate", targetDepth)) { - var unmarshaller = DateTimeUnmarshaller.Instance; + var unmarshaller = NullableDateTimeUnmarshaller.Instance; unmarshalledObject.ExpirationDate = unmarshaller.Unmarshall(context); continue; } @@ -98,7 +98,7 @@ public EngagementInvitationSummary Unmarshall(JsonUnmarshallerContext context) } if (context.TestExpression("InvitationDate", targetDepth)) { - var unmarshaller = DateTimeUnmarshaller.Instance; + var unmarshaller = NullableDateTimeUnmarshaller.Instance; unmarshalledObject.InvitationDate = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/PartnerCentralSelling/Generated/Model/Internal/MarshallTransformations/GetAwsOpportunitySummaryRequestMarshaller.cs b/sdk/src/Services/PartnerCentralSelling/Generated/Model/Internal/MarshallTransformations/GetAwsOpportunitySummaryRequestMarshaller.cs index 9133dc625fc3..a22c61702ba1 100644 --- a/sdk/src/Services/PartnerCentralSelling/Generated/Model/Internal/MarshallTransformations/GetAwsOpportunitySummaryRequestMarshaller.cs +++ b/sdk/src/Services/PartnerCentralSelling/Generated/Model/Internal/MarshallTransformations/GetAwsOpportunitySummaryRequestMarshaller.cs @@ -63,27 +63,30 @@ public IRequest Marshall(GetAwsOpportunitySummaryRequest publicRequest) request.HttpMethod = "POST"; request.ResourcePath = "/"; - using (StringWriter stringWriter = new StringWriter(CultureInfo.InvariantCulture)) + using (MemoryStream memoryStream = new MemoryStream()) { - JsonWriter writer = new JsonWriter(stringWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetCatalog()) + using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) { - context.Writer.WritePropertyName("Catalog"); - context.Writer.Write(publicRequest.Catalog); - } + JsonWriter writer = new JsonWriter(streamWriter); + writer.Validate = false; + writer.WriteObjectStart(); + var context = new JsonMarshallerContext(request, writer); + if(publicRequest.IsSetCatalog()) + { + context.Writer.WritePropertyName("Catalog"); + context.Writer.Write(publicRequest.Catalog); + } - if(publicRequest.IsSetRelatedOpportunityIdentifier()) - { - context.Writer.WritePropertyName("RelatedOpportunityIdentifier"); - context.Writer.Write(publicRequest.RelatedOpportunityIdentifier); + if(publicRequest.IsSetRelatedOpportunityIdentifier()) + { + context.Writer.WritePropertyName("RelatedOpportunityIdentifier"); + context.Writer.Write(publicRequest.RelatedOpportunityIdentifier); + } + + writer.WriteObjectEnd(); } - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); + request.Content = memoryStream.ToArray(); } diff --git a/sdk/src/Services/PartnerCentralSelling/Generated/Model/Internal/MarshallTransformations/GetEngagementInvitationRequestMarshaller.cs b/sdk/src/Services/PartnerCentralSelling/Generated/Model/Internal/MarshallTransformations/GetEngagementInvitationRequestMarshaller.cs index a29e978266e7..873052642661 100644 --- a/sdk/src/Services/PartnerCentralSelling/Generated/Model/Internal/MarshallTransformations/GetEngagementInvitationRequestMarshaller.cs +++ b/sdk/src/Services/PartnerCentralSelling/Generated/Model/Internal/MarshallTransformations/GetEngagementInvitationRequestMarshaller.cs @@ -63,27 +63,30 @@ public IRequest Marshall(GetEngagementInvitationRequest publicRequest) request.HttpMethod = "POST"; request.ResourcePath = "/"; - using (StringWriter stringWriter = new StringWriter(CultureInfo.InvariantCulture)) + using (MemoryStream memoryStream = new MemoryStream()) { - JsonWriter writer = new JsonWriter(stringWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetCatalog()) + using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) { - context.Writer.WritePropertyName("Catalog"); - context.Writer.Write(publicRequest.Catalog); - } + JsonWriter writer = new JsonWriter(streamWriter); + writer.Validate = false; + writer.WriteObjectStart(); + var context = new JsonMarshallerContext(request, writer); + if(publicRequest.IsSetCatalog()) + { + context.Writer.WritePropertyName("Catalog"); + context.Writer.Write(publicRequest.Catalog); + } - if(publicRequest.IsSetIdentifier()) - { - context.Writer.WritePropertyName("Identifier"); - context.Writer.Write(publicRequest.Identifier); + if(publicRequest.IsSetIdentifier()) + { + context.Writer.WritePropertyName("Identifier"); + context.Writer.Write(publicRequest.Identifier); + } + + writer.WriteObjectEnd(); } - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); + request.Content = memoryStream.ToArray(); } diff --git a/sdk/src/Services/PartnerCentralSelling/Generated/Model/Internal/MarshallTransformations/GetEngagementInvitationResponseUnmarshaller.cs b/sdk/src/Services/PartnerCentralSelling/Generated/Model/Internal/MarshallTransformations/GetEngagementInvitationResponseUnmarshaller.cs index a10aeb0361cd..5081fce860ed 100644 --- a/sdk/src/Services/PartnerCentralSelling/Generated/Model/Internal/MarshallTransformations/GetEngagementInvitationResponseUnmarshaller.cs +++ b/sdk/src/Services/PartnerCentralSelling/Generated/Model/Internal/MarshallTransformations/GetEngagementInvitationResponseUnmarshaller.cs @@ -72,7 +72,7 @@ public override AmazonWebServiceResponse Unmarshall(JsonUnmarshallerContext cont } if (context.TestExpression("ExpirationDate", targetDepth)) { - var unmarshaller = DateTimeUnmarshaller.Instance; + var unmarshaller = NullableDateTimeUnmarshaller.Instance; response.ExpirationDate = unmarshaller.Unmarshall(context); continue; } @@ -84,7 +84,7 @@ public override AmazonWebServiceResponse Unmarshall(JsonUnmarshallerContext cont } if (context.TestExpression("InvitationDate", targetDepth)) { - var unmarshaller = DateTimeUnmarshaller.Instance; + var unmarshaller = NullableDateTimeUnmarshaller.Instance; response.InvitationDate = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/PartnerCentralSelling/Generated/Model/Internal/MarshallTransformations/GetOpportunityRequestMarshaller.cs b/sdk/src/Services/PartnerCentralSelling/Generated/Model/Internal/MarshallTransformations/GetOpportunityRequestMarshaller.cs index 85f4eb47d11b..dbdf839de2ba 100644 --- a/sdk/src/Services/PartnerCentralSelling/Generated/Model/Internal/MarshallTransformations/GetOpportunityRequestMarshaller.cs +++ b/sdk/src/Services/PartnerCentralSelling/Generated/Model/Internal/MarshallTransformations/GetOpportunityRequestMarshaller.cs @@ -63,27 +63,30 @@ public IRequest Marshall(GetOpportunityRequest publicRequest) request.HttpMethod = "POST"; request.ResourcePath = "/"; - using (StringWriter stringWriter = new StringWriter(CultureInfo.InvariantCulture)) + using (MemoryStream memoryStream = new MemoryStream()) { - JsonWriter writer = new JsonWriter(stringWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetCatalog()) + using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) { - context.Writer.WritePropertyName("Catalog"); - context.Writer.Write(publicRequest.Catalog); - } + JsonWriter writer = new JsonWriter(streamWriter); + writer.Validate = false; + writer.WriteObjectStart(); + var context = new JsonMarshallerContext(request, writer); + if(publicRequest.IsSetCatalog()) + { + context.Writer.WritePropertyName("Catalog"); + context.Writer.Write(publicRequest.Catalog); + } - if(publicRequest.IsSetIdentifier()) - { - context.Writer.WritePropertyName("Identifier"); - context.Writer.Write(publicRequest.Identifier); + if(publicRequest.IsSetIdentifier()) + { + context.Writer.WritePropertyName("Identifier"); + context.Writer.Write(publicRequest.Identifier); + } + + writer.WriteObjectEnd(); } - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); + request.Content = memoryStream.ToArray(); } diff --git a/sdk/src/Services/PartnerCentralSelling/Generated/Model/Internal/MarshallTransformations/GetOpportunityResponseUnmarshaller.cs b/sdk/src/Services/PartnerCentralSelling/Generated/Model/Internal/MarshallTransformations/GetOpportunityResponseUnmarshaller.cs index 56071af0eb57..0b415057854e 100644 --- a/sdk/src/Services/PartnerCentralSelling/Generated/Model/Internal/MarshallTransformations/GetOpportunityResponseUnmarshaller.cs +++ b/sdk/src/Services/PartnerCentralSelling/Generated/Model/Internal/MarshallTransformations/GetOpportunityResponseUnmarshaller.cs @@ -60,7 +60,7 @@ public override AmazonWebServiceResponse Unmarshall(JsonUnmarshallerContext cont } if (context.TestExpression("CreatedDate", targetDepth)) { - var unmarshaller = DateTimeUnmarshaller.Instance; + var unmarshaller = NullableDateTimeUnmarshaller.Instance; response.CreatedDate = unmarshaller.Unmarshall(context); continue; } @@ -78,7 +78,7 @@ public override AmazonWebServiceResponse Unmarshall(JsonUnmarshallerContext cont } if (context.TestExpression("LastModifiedDate", targetDepth)) { - var unmarshaller = DateTimeUnmarshaller.Instance; + var unmarshaller = NullableDateTimeUnmarshaller.Instance; response.LastModifiedDate = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/PartnerCentralSelling/Generated/Model/Internal/MarshallTransformations/ListEngagementInvitationsRequestMarshaller.cs b/sdk/src/Services/PartnerCentralSelling/Generated/Model/Internal/MarshallTransformations/ListEngagementInvitationsRequestMarshaller.cs index bf660dcd9b38..54911eda414a 100644 --- a/sdk/src/Services/PartnerCentralSelling/Generated/Model/Internal/MarshallTransformations/ListEngagementInvitationsRequestMarshaller.cs +++ b/sdk/src/Services/PartnerCentralSelling/Generated/Model/Internal/MarshallTransformations/ListEngagementInvitationsRequestMarshaller.cs @@ -63,61 +63,64 @@ public IRequest Marshall(ListEngagementInvitationsRequest publicRequest) request.HttpMethod = "POST"; request.ResourcePath = "/"; - using (StringWriter stringWriter = new StringWriter(CultureInfo.InvariantCulture)) + using (MemoryStream memoryStream = new MemoryStream()) { - JsonWriter writer = new JsonWriter(stringWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetCatalog()) + using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) { - context.Writer.WritePropertyName("Catalog"); - context.Writer.Write(publicRequest.Catalog); - } + JsonWriter writer = new JsonWriter(streamWriter); + writer.Validate = false; + writer.WriteObjectStart(); + var context = new JsonMarshallerContext(request, writer); + if(publicRequest.IsSetCatalog()) + { + context.Writer.WritePropertyName("Catalog"); + context.Writer.Write(publicRequest.Catalog); + } - if(publicRequest.IsSetMaxResults()) - { - context.Writer.WritePropertyName("MaxResults"); - context.Writer.Write(publicRequest.MaxResults); - } + if(publicRequest.IsSetMaxResults()) + { + context.Writer.WritePropertyName("MaxResults"); + context.Writer.Write(publicRequest.MaxResults.Value); + } - if(publicRequest.IsSetNextToken()) - { - context.Writer.WritePropertyName("NextToken"); - context.Writer.Write(publicRequest.NextToken); - } + if(publicRequest.IsSetNextToken()) + { + context.Writer.WritePropertyName("NextToken"); + context.Writer.Write(publicRequest.NextToken); + } - if(publicRequest.IsSetParticipantType()) - { - context.Writer.WritePropertyName("ParticipantType"); - context.Writer.Write(publicRequest.ParticipantType); - } + if(publicRequest.IsSetParticipantType()) + { + context.Writer.WritePropertyName("ParticipantType"); + context.Writer.Write(publicRequest.ParticipantType); + } - if(publicRequest.IsSetPayloadType()) - { - context.Writer.WritePropertyName("PayloadType"); - context.Writer.WriteArrayStart(); - foreach(var publicRequestPayloadTypeListValue in publicRequest.PayloadType) + if(publicRequest.IsSetPayloadType()) { - context.Writer.Write(publicRequestPayloadTypeListValue); + context.Writer.WritePropertyName("PayloadType"); + context.Writer.WriteArrayStart(); + foreach(var publicRequestPayloadTypeListValue in publicRequest.PayloadType) + { + context.Writer.Write(publicRequestPayloadTypeListValue); + } + context.Writer.WriteArrayEnd(); } - context.Writer.WriteArrayEnd(); - } - if(publicRequest.IsSetSort()) - { - context.Writer.WritePropertyName("Sort"); - context.Writer.WriteObjectStart(); + if(publicRequest.IsSetSort()) + { + context.Writer.WritePropertyName("Sort"); + context.Writer.WriteObjectStart(); - var marshaller = OpportunityEngagementInvitationSortMarshaller.Instance; - marshaller.Marshall(publicRequest.Sort, context); + var marshaller = OpportunityEngagementInvitationSortMarshaller.Instance; + marshaller.Marshall(publicRequest.Sort, context); + + context.Writer.WriteObjectEnd(); + } - context.Writer.WriteObjectEnd(); + writer.WriteObjectEnd(); } - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); + request.Content = memoryStream.ToArray(); } diff --git a/sdk/src/Services/PartnerCentralSelling/Generated/Model/Internal/MarshallTransformations/ListOpportunitiesRequestMarshaller.cs b/sdk/src/Services/PartnerCentralSelling/Generated/Model/Internal/MarshallTransformations/ListOpportunitiesRequestMarshaller.cs index ec616431f76c..41836b0faf03 100644 --- a/sdk/src/Services/PartnerCentralSelling/Generated/Model/Internal/MarshallTransformations/ListOpportunitiesRequestMarshaller.cs +++ b/sdk/src/Services/PartnerCentralSelling/Generated/Model/Internal/MarshallTransformations/ListOpportunitiesRequestMarshaller.cs @@ -63,99 +63,102 @@ public IRequest Marshall(ListOpportunitiesRequest publicRequest) request.HttpMethod = "POST"; request.ResourcePath = "/"; - using (StringWriter stringWriter = new StringWriter(CultureInfo.InvariantCulture)) + using (MemoryStream memoryStream = new MemoryStream()) { - JsonWriter writer = new JsonWriter(stringWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetCatalog()) + using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) { - context.Writer.WritePropertyName("Catalog"); - context.Writer.Write(publicRequest.Catalog); - } + JsonWriter writer = new JsonWriter(streamWriter); + writer.Validate = false; + writer.WriteObjectStart(); + var context = new JsonMarshallerContext(request, writer); + if(publicRequest.IsSetCatalog()) + { + context.Writer.WritePropertyName("Catalog"); + context.Writer.Write(publicRequest.Catalog); + } - if(publicRequest.IsSetCustomerCompanyName()) - { - context.Writer.WritePropertyName("CustomerCompanyName"); - context.Writer.WriteArrayStart(); - foreach(var publicRequestCustomerCompanyNameListValue in publicRequest.CustomerCompanyName) + if(publicRequest.IsSetCustomerCompanyName()) { - context.Writer.Write(publicRequestCustomerCompanyNameListValue); + context.Writer.WritePropertyName("CustomerCompanyName"); + context.Writer.WriteArrayStart(); + foreach(var publicRequestCustomerCompanyNameListValue in publicRequest.CustomerCompanyName) + { + context.Writer.Write(publicRequestCustomerCompanyNameListValue); + } + context.Writer.WriteArrayEnd(); } - context.Writer.WriteArrayEnd(); - } - if(publicRequest.IsSetIdentifier()) - { - context.Writer.WritePropertyName("Identifier"); - context.Writer.WriteArrayStart(); - foreach(var publicRequestIdentifierListValue in publicRequest.Identifier) + if(publicRequest.IsSetIdentifier()) { - context.Writer.Write(publicRequestIdentifierListValue); + context.Writer.WritePropertyName("Identifier"); + context.Writer.WriteArrayStart(); + foreach(var publicRequestIdentifierListValue in publicRequest.Identifier) + { + context.Writer.Write(publicRequestIdentifierListValue); + } + context.Writer.WriteArrayEnd(); } - context.Writer.WriteArrayEnd(); - } - if(publicRequest.IsSetLastModifiedDate()) - { - context.Writer.WritePropertyName("LastModifiedDate"); - context.Writer.WriteObjectStart(); + if(publicRequest.IsSetLastModifiedDate()) + { + context.Writer.WritePropertyName("LastModifiedDate"); + context.Writer.WriteObjectStart(); - var marshaller = LastModifiedDateMarshaller.Instance; - marshaller.Marshall(publicRequest.LastModifiedDate, context); + var marshaller = LastModifiedDateMarshaller.Instance; + marshaller.Marshall(publicRequest.LastModifiedDate, context); - context.Writer.WriteObjectEnd(); - } + context.Writer.WriteObjectEnd(); + } - if(publicRequest.IsSetLifeCycleReviewStatus()) - { - context.Writer.WritePropertyName("LifeCycleReviewStatus"); - context.Writer.WriteArrayStart(); - foreach(var publicRequestLifeCycleReviewStatusListValue in publicRequest.LifeCycleReviewStatus) + if(publicRequest.IsSetLifeCycleReviewStatus()) { - context.Writer.Write(publicRequestLifeCycleReviewStatusListValue); + context.Writer.WritePropertyName("LifeCycleReviewStatus"); + context.Writer.WriteArrayStart(); + foreach(var publicRequestLifeCycleReviewStatusListValue in publicRequest.LifeCycleReviewStatus) + { + context.Writer.Write(publicRequestLifeCycleReviewStatusListValue); + } + context.Writer.WriteArrayEnd(); } - context.Writer.WriteArrayEnd(); - } - if(publicRequest.IsSetLifeCycleStage()) - { - context.Writer.WritePropertyName("LifeCycleStage"); - context.Writer.WriteArrayStart(); - foreach(var publicRequestLifeCycleStageListValue in publicRequest.LifeCycleStage) + if(publicRequest.IsSetLifeCycleStage()) { - context.Writer.Write(publicRequestLifeCycleStageListValue); + context.Writer.WritePropertyName("LifeCycleStage"); + context.Writer.WriteArrayStart(); + foreach(var publicRequestLifeCycleStageListValue in publicRequest.LifeCycleStage) + { + context.Writer.Write(publicRequestLifeCycleStageListValue); + } + context.Writer.WriteArrayEnd(); } - context.Writer.WriteArrayEnd(); - } - if(publicRequest.IsSetMaxResults()) - { - context.Writer.WritePropertyName("MaxResults"); - context.Writer.Write(publicRequest.MaxResults); - } + if(publicRequest.IsSetMaxResults()) + { + context.Writer.WritePropertyName("MaxResults"); + context.Writer.Write(publicRequest.MaxResults.Value); + } - if(publicRequest.IsSetNextToken()) - { - context.Writer.WritePropertyName("NextToken"); - context.Writer.Write(publicRequest.NextToken); - } + if(publicRequest.IsSetNextToken()) + { + context.Writer.WritePropertyName("NextToken"); + context.Writer.Write(publicRequest.NextToken); + } - if(publicRequest.IsSetSort()) - { - context.Writer.WritePropertyName("Sort"); - context.Writer.WriteObjectStart(); + if(publicRequest.IsSetSort()) + { + context.Writer.WritePropertyName("Sort"); + context.Writer.WriteObjectStart(); + + var marshaller = OpportunitySortMarshaller.Instance; + marshaller.Marshall(publicRequest.Sort, context); - var marshaller = OpportunitySortMarshaller.Instance; - marshaller.Marshall(publicRequest.Sort, context); + context.Writer.WriteObjectEnd(); + } - context.Writer.WriteObjectEnd(); + writer.WriteObjectEnd(); } - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); + request.Content = memoryStream.ToArray(); } diff --git a/sdk/src/Services/PartnerCentralSelling/Generated/Model/Internal/MarshallTransformations/ListSolutionsRequestMarshaller.cs b/sdk/src/Services/PartnerCentralSelling/Generated/Model/Internal/MarshallTransformations/ListSolutionsRequestMarshaller.cs index 59d1b6b6bec0..b0fdb1982278 100644 --- a/sdk/src/Services/PartnerCentralSelling/Generated/Model/Internal/MarshallTransformations/ListSolutionsRequestMarshaller.cs +++ b/sdk/src/Services/PartnerCentralSelling/Generated/Model/Internal/MarshallTransformations/ListSolutionsRequestMarshaller.cs @@ -63,77 +63,80 @@ public IRequest Marshall(ListSolutionsRequest publicRequest) request.HttpMethod = "POST"; request.ResourcePath = "/"; - using (StringWriter stringWriter = new StringWriter(CultureInfo.InvariantCulture)) + using (MemoryStream memoryStream = new MemoryStream()) { - JsonWriter writer = new JsonWriter(stringWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetCatalog()) + using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) { - context.Writer.WritePropertyName("Catalog"); - context.Writer.Write(publicRequest.Catalog); - } + JsonWriter writer = new JsonWriter(streamWriter); + writer.Validate = false; + writer.WriteObjectStart(); + var context = new JsonMarshallerContext(request, writer); + if(publicRequest.IsSetCatalog()) + { + context.Writer.WritePropertyName("Catalog"); + context.Writer.Write(publicRequest.Catalog); + } - if(publicRequest.IsSetCategory()) - { - context.Writer.WritePropertyName("Category"); - context.Writer.WriteArrayStart(); - foreach(var publicRequestCategoryListValue in publicRequest.Category) + if(publicRequest.IsSetCategory()) { - context.Writer.Write(publicRequestCategoryListValue); + context.Writer.WritePropertyName("Category"); + context.Writer.WriteArrayStart(); + foreach(var publicRequestCategoryListValue in publicRequest.Category) + { + context.Writer.Write(publicRequestCategoryListValue); + } + context.Writer.WriteArrayEnd(); } - context.Writer.WriteArrayEnd(); - } - if(publicRequest.IsSetIdentifier()) - { - context.Writer.WritePropertyName("Identifier"); - context.Writer.WriteArrayStart(); - foreach(var publicRequestIdentifierListValue in publicRequest.Identifier) + if(publicRequest.IsSetIdentifier()) { - context.Writer.Write(publicRequestIdentifierListValue); + context.Writer.WritePropertyName("Identifier"); + context.Writer.WriteArrayStart(); + foreach(var publicRequestIdentifierListValue in publicRequest.Identifier) + { + context.Writer.Write(publicRequestIdentifierListValue); + } + context.Writer.WriteArrayEnd(); } - context.Writer.WriteArrayEnd(); - } - if(publicRequest.IsSetMaxResults()) - { - context.Writer.WritePropertyName("MaxResults"); - context.Writer.Write(publicRequest.MaxResults); - } + if(publicRequest.IsSetMaxResults()) + { + context.Writer.WritePropertyName("MaxResults"); + context.Writer.Write(publicRequest.MaxResults.Value); + } - if(publicRequest.IsSetNextToken()) - { - context.Writer.WritePropertyName("NextToken"); - context.Writer.Write(publicRequest.NextToken); - } + if(publicRequest.IsSetNextToken()) + { + context.Writer.WritePropertyName("NextToken"); + context.Writer.Write(publicRequest.NextToken); + } - if(publicRequest.IsSetSort()) - { - context.Writer.WritePropertyName("Sort"); - context.Writer.WriteObjectStart(); + if(publicRequest.IsSetSort()) + { + context.Writer.WritePropertyName("Sort"); + context.Writer.WriteObjectStart(); - var marshaller = SolutionSortMarshaller.Instance; - marshaller.Marshall(publicRequest.Sort, context); + var marshaller = SolutionSortMarshaller.Instance; + marshaller.Marshall(publicRequest.Sort, context); - context.Writer.WriteObjectEnd(); - } + context.Writer.WriteObjectEnd(); + } - if(publicRequest.IsSetStatus()) - { - context.Writer.WritePropertyName("Status"); - context.Writer.WriteArrayStart(); - foreach(var publicRequestStatusListValue in publicRequest.Status) + if(publicRequest.IsSetStatus()) { - context.Writer.Write(publicRequestStatusListValue); + context.Writer.WritePropertyName("Status"); + context.Writer.WriteArrayStart(); + foreach(var publicRequestStatusListValue in publicRequest.Status) + { + context.Writer.Write(publicRequestStatusListValue); + } + context.Writer.WriteArrayEnd(); } - context.Writer.WriteArrayEnd(); + + writer.WriteObjectEnd(); } - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); + request.Content = memoryStream.ToArray(); } diff --git a/sdk/src/Services/PartnerCentralSelling/Generated/Model/Internal/MarshallTransformations/NextStepsHistoryUnmarshaller.cs b/sdk/src/Services/PartnerCentralSelling/Generated/Model/Internal/MarshallTransformations/NextStepsHistoryUnmarshaller.cs index 318f90fe0c80..5460a047afd4 100644 --- a/sdk/src/Services/PartnerCentralSelling/Generated/Model/Internal/MarshallTransformations/NextStepsHistoryUnmarshaller.cs +++ b/sdk/src/Services/PartnerCentralSelling/Generated/Model/Internal/MarshallTransformations/NextStepsHistoryUnmarshaller.cs @@ -68,7 +68,7 @@ public NextStepsHistory Unmarshall(JsonUnmarshallerContext context) { if (context.TestExpression("Time", targetDepth)) { - var unmarshaller = DateTimeUnmarshaller.Instance; + var unmarshaller = NullableDateTimeUnmarshaller.Instance; unmarshalledObject.Time = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/PartnerCentralSelling/Generated/Model/Internal/MarshallTransformations/OpportunitySummaryUnmarshaller.cs b/sdk/src/Services/PartnerCentralSelling/Generated/Model/Internal/MarshallTransformations/OpportunitySummaryUnmarshaller.cs index daab0003a3a4..d86d89661cd8 100644 --- a/sdk/src/Services/PartnerCentralSelling/Generated/Model/Internal/MarshallTransformations/OpportunitySummaryUnmarshaller.cs +++ b/sdk/src/Services/PartnerCentralSelling/Generated/Model/Internal/MarshallTransformations/OpportunitySummaryUnmarshaller.cs @@ -74,7 +74,7 @@ public OpportunitySummary Unmarshall(JsonUnmarshallerContext context) } if (context.TestExpression("CreatedDate", targetDepth)) { - var unmarshaller = DateTimeUnmarshaller.Instance; + var unmarshaller = NullableDateTimeUnmarshaller.Instance; unmarshalledObject.CreatedDate = unmarshaller.Unmarshall(context); continue; } @@ -92,7 +92,7 @@ public OpportunitySummary Unmarshall(JsonUnmarshallerContext context) } if (context.TestExpression("LastModifiedDate", targetDepth)) { - var unmarshaller = DateTimeUnmarshaller.Instance; + var unmarshaller = NullableDateTimeUnmarshaller.Instance; unmarshalledObject.LastModifiedDate = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/PartnerCentralSelling/Generated/Model/Internal/MarshallTransformations/ProfileNextStepsHistoryUnmarshaller.cs b/sdk/src/Services/PartnerCentralSelling/Generated/Model/Internal/MarshallTransformations/ProfileNextStepsHistoryUnmarshaller.cs index 2258c770588b..c5703ff2a3f0 100644 --- a/sdk/src/Services/PartnerCentralSelling/Generated/Model/Internal/MarshallTransformations/ProfileNextStepsHistoryUnmarshaller.cs +++ b/sdk/src/Services/PartnerCentralSelling/Generated/Model/Internal/MarshallTransformations/ProfileNextStepsHistoryUnmarshaller.cs @@ -68,7 +68,7 @@ public ProfileNextStepsHistory Unmarshall(JsonUnmarshallerContext context) { if (context.TestExpression("Time", targetDepth)) { - var unmarshaller = DateTimeUnmarshaller.Instance; + var unmarshaller = NullableDateTimeUnmarshaller.Instance; unmarshalledObject.Time = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/PartnerCentralSelling/Generated/Model/Internal/MarshallTransformations/RejectEngagementInvitationRequestMarshaller.cs b/sdk/src/Services/PartnerCentralSelling/Generated/Model/Internal/MarshallTransformations/RejectEngagementInvitationRequestMarshaller.cs index 91659d548f72..bff3ab371fe7 100644 --- a/sdk/src/Services/PartnerCentralSelling/Generated/Model/Internal/MarshallTransformations/RejectEngagementInvitationRequestMarshaller.cs +++ b/sdk/src/Services/PartnerCentralSelling/Generated/Model/Internal/MarshallTransformations/RejectEngagementInvitationRequestMarshaller.cs @@ -63,33 +63,36 @@ public IRequest Marshall(RejectEngagementInvitationRequest publicRequest) request.HttpMethod = "POST"; request.ResourcePath = "/"; - using (StringWriter stringWriter = new StringWriter(CultureInfo.InvariantCulture)) + using (MemoryStream memoryStream = new MemoryStream()) { - JsonWriter writer = new JsonWriter(stringWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetCatalog()) + using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) { - context.Writer.WritePropertyName("Catalog"); - context.Writer.Write(publicRequest.Catalog); - } + JsonWriter writer = new JsonWriter(streamWriter); + writer.Validate = false; + writer.WriteObjectStart(); + var context = new JsonMarshallerContext(request, writer); + if(publicRequest.IsSetCatalog()) + { + context.Writer.WritePropertyName("Catalog"); + context.Writer.Write(publicRequest.Catalog); + } - if(publicRequest.IsSetIdentifier()) - { - context.Writer.WritePropertyName("Identifier"); - context.Writer.Write(publicRequest.Identifier); - } + if(publicRequest.IsSetIdentifier()) + { + context.Writer.WritePropertyName("Identifier"); + context.Writer.Write(publicRequest.Identifier); + } - if(publicRequest.IsSetRejectionReason()) - { - context.Writer.WritePropertyName("RejectionReason"); - context.Writer.Write(publicRequest.RejectionReason); + if(publicRequest.IsSetRejectionReason()) + { + context.Writer.WritePropertyName("RejectionReason"); + context.Writer.Write(publicRequest.RejectionReason); + } + + writer.WriteObjectEnd(); } - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); + request.Content = memoryStream.ToArray(); } diff --git a/sdk/src/Services/PartnerCentralSelling/Generated/Model/Internal/MarshallTransformations/SolutionBaseUnmarshaller.cs b/sdk/src/Services/PartnerCentralSelling/Generated/Model/Internal/MarshallTransformations/SolutionBaseUnmarshaller.cs index e7719dcd473d..df4b2a03210d 100644 --- a/sdk/src/Services/PartnerCentralSelling/Generated/Model/Internal/MarshallTransformations/SolutionBaseUnmarshaller.cs +++ b/sdk/src/Services/PartnerCentralSelling/Generated/Model/Internal/MarshallTransformations/SolutionBaseUnmarshaller.cs @@ -80,7 +80,7 @@ public SolutionBase Unmarshall(JsonUnmarshallerContext context) } if (context.TestExpression("CreatedDate", targetDepth)) { - var unmarshaller = DateTimeUnmarshaller.Instance; + var unmarshaller = NullableDateTimeUnmarshaller.Instance; unmarshalledObject.CreatedDate = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/PartnerCentralSelling/Generated/Model/Internal/MarshallTransformations/StartEngagementByAcceptingInvitationTaskRequestMarshaller.cs b/sdk/src/Services/PartnerCentralSelling/Generated/Model/Internal/MarshallTransformations/StartEngagementByAcceptingInvitationTaskRequestMarshaller.cs index 00d99d7a9687..2655b6db2cfe 100644 --- a/sdk/src/Services/PartnerCentralSelling/Generated/Model/Internal/MarshallTransformations/StartEngagementByAcceptingInvitationTaskRequestMarshaller.cs +++ b/sdk/src/Services/PartnerCentralSelling/Generated/Model/Internal/MarshallTransformations/StartEngagementByAcceptingInvitationTaskRequestMarshaller.cs @@ -63,38 +63,41 @@ public IRequest Marshall(StartEngagementByAcceptingInvitationTaskRequest publicR request.HttpMethod = "POST"; request.ResourcePath = "/"; - using (StringWriter stringWriter = new StringWriter(CultureInfo.InvariantCulture)) + using (MemoryStream memoryStream = new MemoryStream()) { - JsonWriter writer = new JsonWriter(stringWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetCatalog()) + using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) { - context.Writer.WritePropertyName("Catalog"); - context.Writer.Write(publicRequest.Catalog); - } + JsonWriter writer = new JsonWriter(streamWriter); + writer.Validate = false; + writer.WriteObjectStart(); + var context = new JsonMarshallerContext(request, writer); + if(publicRequest.IsSetCatalog()) + { + context.Writer.WritePropertyName("Catalog"); + context.Writer.Write(publicRequest.Catalog); + } - if(publicRequest.IsSetClientToken()) - { - context.Writer.WritePropertyName("ClientToken"); - context.Writer.Write(publicRequest.ClientToken); - } + if(publicRequest.IsSetClientToken()) + { + context.Writer.WritePropertyName("ClientToken"); + context.Writer.Write(publicRequest.ClientToken); + } - else if(!(publicRequest.IsSetClientToken())) - { - context.Writer.WritePropertyName("ClientToken"); - context.Writer.Write(Guid.NewGuid().ToString()); - } - if(publicRequest.IsSetIdentifier()) - { - context.Writer.WritePropertyName("Identifier"); - context.Writer.Write(publicRequest.Identifier); + else if(!(publicRequest.IsSetClientToken())) + { + context.Writer.WritePropertyName("ClientToken"); + context.Writer.Write(Guid.NewGuid().ToString()); + } + if(publicRequest.IsSetIdentifier()) + { + context.Writer.WritePropertyName("Identifier"); + context.Writer.Write(publicRequest.Identifier); + } + + writer.WriteObjectEnd(); } - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); + request.Content = memoryStream.ToArray(); } diff --git a/sdk/src/Services/PartnerCentralSelling/Generated/Model/Internal/MarshallTransformations/StartEngagementByAcceptingInvitationTaskResponseUnmarshaller.cs b/sdk/src/Services/PartnerCentralSelling/Generated/Model/Internal/MarshallTransformations/StartEngagementByAcceptingInvitationTaskResponseUnmarshaller.cs index 51fe7f601eb5..55015790569c 100644 --- a/sdk/src/Services/PartnerCentralSelling/Generated/Model/Internal/MarshallTransformations/StartEngagementByAcceptingInvitationTaskResponseUnmarshaller.cs +++ b/sdk/src/Services/PartnerCentralSelling/Generated/Model/Internal/MarshallTransformations/StartEngagementByAcceptingInvitationTaskResponseUnmarshaller.cs @@ -78,7 +78,7 @@ public override AmazonWebServiceResponse Unmarshall(JsonUnmarshallerContext cont } if (context.TestExpression("StartTime", targetDepth)) { - var unmarshaller = DateTimeUnmarshaller.Instance; + var unmarshaller = NullableDateTimeUnmarshaller.Instance; response.StartTime = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/PartnerCentralSelling/Generated/Model/Internal/MarshallTransformations/StartEngagementFromOpportunityTaskRequestMarshaller.cs b/sdk/src/Services/PartnerCentralSelling/Generated/Model/Internal/MarshallTransformations/StartEngagementFromOpportunityTaskRequestMarshaller.cs index 61e16197e624..9c03db8760c4 100644 --- a/sdk/src/Services/PartnerCentralSelling/Generated/Model/Internal/MarshallTransformations/StartEngagementFromOpportunityTaskRequestMarshaller.cs +++ b/sdk/src/Services/PartnerCentralSelling/Generated/Model/Internal/MarshallTransformations/StartEngagementFromOpportunityTaskRequestMarshaller.cs @@ -63,49 +63,52 @@ public IRequest Marshall(StartEngagementFromOpportunityTaskRequest publicRequest request.HttpMethod = "POST"; request.ResourcePath = "/"; - using (StringWriter stringWriter = new StringWriter(CultureInfo.InvariantCulture)) + using (MemoryStream memoryStream = new MemoryStream()) { - JsonWriter writer = new JsonWriter(stringWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetAwsSubmission()) + using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) { - context.Writer.WritePropertyName("AwsSubmission"); - context.Writer.WriteObjectStart(); - - var marshaller = AwsSubmissionMarshaller.Instance; - marshaller.Marshall(publicRequest.AwsSubmission, context); - - context.Writer.WriteObjectEnd(); - } - - if(publicRequest.IsSetCatalog()) - { - context.Writer.WritePropertyName("Catalog"); - context.Writer.Write(publicRequest.Catalog); - } - - if(publicRequest.IsSetClientToken()) - { - context.Writer.WritePropertyName("ClientToken"); - context.Writer.Write(publicRequest.ClientToken); - } - - else if(!(publicRequest.IsSetClientToken())) - { - context.Writer.WritePropertyName("ClientToken"); - context.Writer.Write(Guid.NewGuid().ToString()); - } - if(publicRequest.IsSetIdentifier()) - { - context.Writer.WritePropertyName("Identifier"); - context.Writer.Write(publicRequest.Identifier); + JsonWriter writer = new JsonWriter(streamWriter); + writer.Validate = false; + writer.WriteObjectStart(); + var context = new JsonMarshallerContext(request, writer); + if(publicRequest.IsSetAwsSubmission()) + { + context.Writer.WritePropertyName("AwsSubmission"); + context.Writer.WriteObjectStart(); + + var marshaller = AwsSubmissionMarshaller.Instance; + marshaller.Marshall(publicRequest.AwsSubmission, context); + + context.Writer.WriteObjectEnd(); + } + + if(publicRequest.IsSetCatalog()) + { + context.Writer.WritePropertyName("Catalog"); + context.Writer.Write(publicRequest.Catalog); + } + + if(publicRequest.IsSetClientToken()) + { + context.Writer.WritePropertyName("ClientToken"); + context.Writer.Write(publicRequest.ClientToken); + } + + else if(!(publicRequest.IsSetClientToken())) + { + context.Writer.WritePropertyName("ClientToken"); + context.Writer.Write(Guid.NewGuid().ToString()); + } + if(publicRequest.IsSetIdentifier()) + { + context.Writer.WritePropertyName("Identifier"); + context.Writer.Write(publicRequest.Identifier); + } + + writer.WriteObjectEnd(); } - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); + request.Content = memoryStream.ToArray(); } diff --git a/sdk/src/Services/PartnerCentralSelling/Generated/Model/Internal/MarshallTransformations/StartEngagementFromOpportunityTaskResponseUnmarshaller.cs b/sdk/src/Services/PartnerCentralSelling/Generated/Model/Internal/MarshallTransformations/StartEngagementFromOpportunityTaskResponseUnmarshaller.cs index 43d377bf82ee..1abe15bdb3d6 100644 --- a/sdk/src/Services/PartnerCentralSelling/Generated/Model/Internal/MarshallTransformations/StartEngagementFromOpportunityTaskResponseUnmarshaller.cs +++ b/sdk/src/Services/PartnerCentralSelling/Generated/Model/Internal/MarshallTransformations/StartEngagementFromOpportunityTaskResponseUnmarshaller.cs @@ -72,7 +72,7 @@ public override AmazonWebServiceResponse Unmarshall(JsonUnmarshallerContext cont } if (context.TestExpression("StartTime", targetDepth)) { - var unmarshaller = DateTimeUnmarshaller.Instance; + var unmarshaller = NullableDateTimeUnmarshaller.Instance; response.StartTime = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/PartnerCentralSelling/Generated/Model/Internal/MarshallTransformations/UpdateOpportunityRequestMarshaller.cs b/sdk/src/Services/PartnerCentralSelling/Generated/Model/Internal/MarshallTransformations/UpdateOpportunityRequestMarshaller.cs index 507eb66634b6..9d9ae0ac22f3 100644 --- a/sdk/src/Services/PartnerCentralSelling/Generated/Model/Internal/MarshallTransformations/UpdateOpportunityRequestMarshaller.cs +++ b/sdk/src/Services/PartnerCentralSelling/Generated/Model/Internal/MarshallTransformations/UpdateOpportunityRequestMarshaller.cs @@ -63,117 +63,120 @@ public IRequest Marshall(UpdateOpportunityRequest publicRequest) request.HttpMethod = "POST"; request.ResourcePath = "/"; - using (StringWriter stringWriter = new StringWriter(CultureInfo.InvariantCulture)) + using (MemoryStream memoryStream = new MemoryStream()) { - JsonWriter writer = new JsonWriter(stringWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetCatalog()) + using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) { - context.Writer.WritePropertyName("Catalog"); - context.Writer.Write(publicRequest.Catalog); - } + JsonWriter writer = new JsonWriter(streamWriter); + writer.Validate = false; + writer.WriteObjectStart(); + var context = new JsonMarshallerContext(request, writer); + if(publicRequest.IsSetCatalog()) + { + context.Writer.WritePropertyName("Catalog"); + context.Writer.Write(publicRequest.Catalog); + } - if(publicRequest.IsSetCustomer()) - { - context.Writer.WritePropertyName("Customer"); - context.Writer.WriteObjectStart(); + if(publicRequest.IsSetCustomer()) + { + context.Writer.WritePropertyName("Customer"); + context.Writer.WriteObjectStart(); - var marshaller = CustomerMarshaller.Instance; - marshaller.Marshall(publicRequest.Customer, context); + var marshaller = CustomerMarshaller.Instance; + marshaller.Marshall(publicRequest.Customer, context); - context.Writer.WriteObjectEnd(); - } + context.Writer.WriteObjectEnd(); + } - if(publicRequest.IsSetIdentifier()) - { - context.Writer.WritePropertyName("Identifier"); - context.Writer.Write(publicRequest.Identifier); - } + if(publicRequest.IsSetIdentifier()) + { + context.Writer.WritePropertyName("Identifier"); + context.Writer.Write(publicRequest.Identifier); + } - if(publicRequest.IsSetLastModifiedDate()) - { - context.Writer.WritePropertyName("LastModifiedDate"); - context.Writer.Write(StringUtils.FromDateTimeToISO8601WithOptionalMs(publicRequest.LastModifiedDate)); - } + if(publicRequest.IsSetLastModifiedDate()) + { + context.Writer.WritePropertyName("LastModifiedDate"); + context.Writer.Write(StringUtils.FromDateTimeToISO8601WithOptionalMs(publicRequest.LastModifiedDate)); + } - if(publicRequest.IsSetLifeCycle()) - { - context.Writer.WritePropertyName("LifeCycle"); - context.Writer.WriteObjectStart(); + if(publicRequest.IsSetLifeCycle()) + { + context.Writer.WritePropertyName("LifeCycle"); + context.Writer.WriteObjectStart(); - var marshaller = LifeCycleMarshaller.Instance; - marshaller.Marshall(publicRequest.LifeCycle, context); + var marshaller = LifeCycleMarshaller.Instance; + marshaller.Marshall(publicRequest.LifeCycle, context); - context.Writer.WriteObjectEnd(); - } + context.Writer.WriteObjectEnd(); + } - if(publicRequest.IsSetMarketing()) - { - context.Writer.WritePropertyName("Marketing"); - context.Writer.WriteObjectStart(); + if(publicRequest.IsSetMarketing()) + { + context.Writer.WritePropertyName("Marketing"); + context.Writer.WriteObjectStart(); - var marshaller = MarketingMarshaller.Instance; - marshaller.Marshall(publicRequest.Marketing, context); + var marshaller = MarketingMarshaller.Instance; + marshaller.Marshall(publicRequest.Marketing, context); - context.Writer.WriteObjectEnd(); - } + context.Writer.WriteObjectEnd(); + } - if(publicRequest.IsSetNationalSecurity()) - { - context.Writer.WritePropertyName("NationalSecurity"); - context.Writer.Write(publicRequest.NationalSecurity); - } + if(publicRequest.IsSetNationalSecurity()) + { + context.Writer.WritePropertyName("NationalSecurity"); + context.Writer.Write(publicRequest.NationalSecurity); + } - if(publicRequest.IsSetOpportunityType()) - { - context.Writer.WritePropertyName("OpportunityType"); - context.Writer.Write(publicRequest.OpportunityType); - } + if(publicRequest.IsSetOpportunityType()) + { + context.Writer.WritePropertyName("OpportunityType"); + context.Writer.Write(publicRequest.OpportunityType); + } - if(publicRequest.IsSetPartnerOpportunityIdentifier()) - { - context.Writer.WritePropertyName("PartnerOpportunityIdentifier"); - context.Writer.Write(publicRequest.PartnerOpportunityIdentifier); - } + if(publicRequest.IsSetPartnerOpportunityIdentifier()) + { + context.Writer.WritePropertyName("PartnerOpportunityIdentifier"); + context.Writer.Write(publicRequest.PartnerOpportunityIdentifier); + } - if(publicRequest.IsSetPrimaryNeedsFromAws()) - { - context.Writer.WritePropertyName("PrimaryNeedsFromAws"); - context.Writer.WriteArrayStart(); - foreach(var publicRequestPrimaryNeedsFromAwsListValue in publicRequest.PrimaryNeedsFromAws) + if(publicRequest.IsSetPrimaryNeedsFromAws()) { - context.Writer.Write(publicRequestPrimaryNeedsFromAwsListValue); + context.Writer.WritePropertyName("PrimaryNeedsFromAws"); + context.Writer.WriteArrayStart(); + foreach(var publicRequestPrimaryNeedsFromAwsListValue in publicRequest.PrimaryNeedsFromAws) + { + context.Writer.Write(publicRequestPrimaryNeedsFromAwsListValue); + } + context.Writer.WriteArrayEnd(); } - context.Writer.WriteArrayEnd(); - } - if(publicRequest.IsSetProject()) - { - context.Writer.WritePropertyName("Project"); - context.Writer.WriteObjectStart(); + if(publicRequest.IsSetProject()) + { + context.Writer.WritePropertyName("Project"); + context.Writer.WriteObjectStart(); - var marshaller = ProjectMarshaller.Instance; - marshaller.Marshall(publicRequest.Project, context); + var marshaller = ProjectMarshaller.Instance; + marshaller.Marshall(publicRequest.Project, context); - context.Writer.WriteObjectEnd(); - } + context.Writer.WriteObjectEnd(); + } - if(publicRequest.IsSetSoftwareRevenue()) - { - context.Writer.WritePropertyName("SoftwareRevenue"); - context.Writer.WriteObjectStart(); + if(publicRequest.IsSetSoftwareRevenue()) + { + context.Writer.WritePropertyName("SoftwareRevenue"); + context.Writer.WriteObjectStart(); - var marshaller = SoftwareRevenueMarshaller.Instance; - marshaller.Marshall(publicRequest.SoftwareRevenue, context); + var marshaller = SoftwareRevenueMarshaller.Instance; + marshaller.Marshall(publicRequest.SoftwareRevenue, context); + + context.Writer.WriteObjectEnd(); + } - context.Writer.WriteObjectEnd(); + writer.WriteObjectEnd(); } - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); + request.Content = memoryStream.ToArray(); } diff --git a/sdk/src/Services/PartnerCentralSelling/Generated/Model/Internal/MarshallTransformations/UpdateOpportunityResponseUnmarshaller.cs b/sdk/src/Services/PartnerCentralSelling/Generated/Model/Internal/MarshallTransformations/UpdateOpportunityResponseUnmarshaller.cs index 90368607d6b7..57f87b6c011f 100644 --- a/sdk/src/Services/PartnerCentralSelling/Generated/Model/Internal/MarshallTransformations/UpdateOpportunityResponseUnmarshaller.cs +++ b/sdk/src/Services/PartnerCentralSelling/Generated/Model/Internal/MarshallTransformations/UpdateOpportunityResponseUnmarshaller.cs @@ -60,7 +60,7 @@ public override AmazonWebServiceResponse Unmarshall(JsonUnmarshallerContext cont } if (context.TestExpression("LastModifiedDate", targetDepth)) { - var unmarshaller = DateTimeUnmarshaller.Instance; + var unmarshaller = NullableDateTimeUnmarshaller.Instance; response.LastModifiedDate = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/PartnerCentralSelling/Generated/Model/InternalServerException.cs b/sdk/src/Services/PartnerCentralSelling/Generated/Model/InternalServerException.cs index 4d7fd529911e..8b94db38f7b7 100644 --- a/sdk/src/Services/PartnerCentralSelling/Generated/Model/InternalServerException.cs +++ b/sdk/src/Services/PartnerCentralSelling/Generated/Model/InternalServerException.cs @@ -113,11 +113,6 @@ protected InternalServerException(System.Runtime.Serialization.SerializationInfo /// The that holds the serialized object data about the exception being thrown. /// The that contains contextual information about the source or destination. /// The parameter is a null reference (Nothing in Visual Basic). -#if BCL35 - [System.Security.Permissions.SecurityPermission( - System.Security.Permissions.SecurityAction.LinkDemand, - Flags = System.Security.Permissions.SecurityPermissionFlag.SerializationFormatter)] -#endif [System.Security.SecurityCritical] // These FxCop rules are giving false-positives for this method [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Security", "CA2123:OverrideLinkDemandsShouldBeIdenticalToBase")] diff --git a/sdk/src/Services/PartnerCentralSelling/Generated/Model/LastModifiedDate.cs b/sdk/src/Services/PartnerCentralSelling/Generated/Model/LastModifiedDate.cs index 42ad68c1d2e3..69d898e25253 100644 --- a/sdk/src/Services/PartnerCentralSelling/Generated/Model/LastModifiedDate.cs +++ b/sdk/src/Services/PartnerCentralSelling/Generated/Model/LastModifiedDate.cs @@ -45,9 +45,9 @@ public partial class LastModifiedDate /// retrieve only those opportunities that were modified after a given timestamp. /// ///     - public DateTime AfterLastModifiedDate + public DateTime? AfterLastModifiedDate { - get { return this._afterLastModifiedDate.GetValueOrDefault(); } + get { return this._afterLastModifiedDate; } set { this._afterLastModifiedDate = value; } } @@ -64,9 +64,9 @@ internal bool IsSetAfterLastModifiedDate() /// retrieve only those opportunities that were modified before a given timestamp. /// ///     - public DateTime BeforeLastModifiedDate + public DateTime? BeforeLastModifiedDate { - get { return this._beforeLastModifiedDate.GetValueOrDefault(); } + get { return this._beforeLastModifiedDate; } set { this._beforeLastModifiedDate = value; } } diff --git a/sdk/src/Services/PartnerCentralSelling/Generated/Model/ListEngagementInvitationsRequest.cs b/sdk/src/Services/PartnerCentralSelling/Generated/Model/ListEngagementInvitationsRequest.cs index cf79d92393c8..bb571a6d3954 100644 --- a/sdk/src/Services/PartnerCentralSelling/Generated/Model/ListEngagementInvitationsRequest.cs +++ b/sdk/src/Services/PartnerCentralSelling/Generated/Model/ListEngagementInvitationsRequest.cs @@ -72,9 +72,9 @@ internal bool IsSetCatalog() /// ///     [AWSProperty(Min=1, Max=100)] - public int MaxResults + public int? MaxResults { - get { return this._maxResults.GetValueOrDefault(); } + get { return this._maxResults; } set { this._maxResults = value; } } diff --git a/sdk/src/Services/PartnerCentralSelling/Generated/Model/ListOpportunitiesRequest.cs b/sdk/src/Services/PartnerCentralSelling/Generated/Model/ListOpportunitiesRequest.cs index ccd200348147..edb5e6fccd17 100644 --- a/sdk/src/Services/PartnerCentralSelling/Generated/Model/ListOpportunitiesRequest.cs +++ b/sdk/src/Services/PartnerCentralSelling/Generated/Model/ListOpportunitiesRequest.cs @@ -215,9 +215,9 @@ internal bool IsSetLifeCycleStage() /// ///     [AWSProperty(Min=1, Max=100)] - public int MaxResults + public int? MaxResults { - get { return this._maxResults.GetValueOrDefault(); } + get { return this._maxResults; } set { this._maxResults = value; } } diff --git a/sdk/src/Services/PartnerCentralSelling/Generated/Model/ListSolutionsRequest.cs b/sdk/src/Services/PartnerCentralSelling/Generated/Model/ListSolutionsRequest.cs index 9196c5101c4d..1ddaa9bad0c9 100644 --- a/sdk/src/Services/PartnerCentralSelling/Generated/Model/ListSolutionsRequest.cs +++ b/sdk/src/Services/PartnerCentralSelling/Generated/Model/ListSolutionsRequest.cs @@ -121,9 +121,9 @@ internal bool IsSetIdentifier() /// ///     [AWSProperty(Min=1, Max=100)] - public int MaxResults + public int? MaxResults { - get { return this._maxResults.GetValueOrDefault(); } + get { return this._maxResults; } set { this._maxResults = value; } } diff --git a/sdk/src/Services/PartnerCentralSelling/Generated/Model/NextStepsHistory.cs b/sdk/src/Services/PartnerCentralSelling/Generated/Model/NextStepsHistory.cs index abfaa820cead..805f240a9ac2 100644 --- a/sdk/src/Services/PartnerCentralSelling/Generated/Model/NextStepsHistory.cs +++ b/sdk/src/Services/PartnerCentralSelling/Generated/Model/NextStepsHistory.cs @@ -44,9 +44,9 @@ public partial class NextStepsHistory /// ///     [AWSProperty(Required=true)] - public DateTime Time + public DateTime? Time { - get { return this._time.GetValueOrDefault(); } + get { return this._time; } set { this._time = value; } } diff --git a/sdk/src/Services/PartnerCentralSelling/Generated/Model/OpportunitySummary.cs b/sdk/src/Services/PartnerCentralSelling/Generated/Model/OpportunitySummary.cs index 1a6afbc677f1..ae98cc9dc762 100644 --- a/sdk/src/Services/PartnerCentralSelling/Generated/Model/OpportunitySummary.cs +++ b/sdk/src/Services/PartnerCentralSelling/Generated/Model/OpportunitySummary.cs @@ -70,9 +70,9 @@ internal bool IsSetCatalog() /// DateTime when the Opportunity was last created. /// ///     - public DateTime CreatedDate + public DateTime? CreatedDate { - get { return this._createdDate.GetValueOrDefault(); } + get { return this._createdDate; } set { this._createdDate = value; } } @@ -124,9 +124,9 @@ internal bool IsSetId() /// DateTime when the Opportunity was last modified. ///     ///     - public DateTime LastModifiedDate + public DateTime? LastModifiedDate { - get { return this._lastModifiedDate.GetValueOrDefault(); } + get { return this._lastModifiedDate; } set { this._lastModifiedDate = value; } } diff --git a/sdk/src/Services/PartnerCentralSelling/Generated/Model/ProfileNextStepsHistory.cs b/sdk/src/Services/PartnerCentralSelling/Generated/Model/ProfileNextStepsHistory.cs index 7725838c7676..018991696411 100644 --- a/sdk/src/Services/PartnerCentralSelling/Generated/Model/ProfileNextStepsHistory.cs +++ b/sdk/src/Services/PartnerCentralSelling/Generated/Model/ProfileNextStepsHistory.cs @@ -46,9 +46,9 @@ public partial class ProfileNextStepsHistory /// ///     [AWSProperty(Required=true)] - public DateTime Time + public DateTime? Time { - get { return this._time.GetValueOrDefault(); } + get { return this._time; } set { this._time = value; } } diff --git a/sdk/src/Services/PartnerCentralSelling/Generated/Model/ResourceNotFoundException.cs b/sdk/src/Services/PartnerCentralSelling/Generated/Model/ResourceNotFoundException.cs index c296288789b4..d8c30f683f80 100644 --- a/sdk/src/Services/PartnerCentralSelling/Generated/Model/ResourceNotFoundException.cs +++ b/sdk/src/Services/PartnerCentralSelling/Generated/Model/ResourceNotFoundException.cs @@ -113,11 +113,6 @@ protected ResourceNotFoundException(System.Runtime.Serialization.SerializationIn /// The that holds the serialized object data about the exception being thrown. /// The that contains contextual information about the source or destination. /// The parameter is a null reference (Nothing in Visual Basic). -#if BCL35 - [System.Security.Permissions.SecurityPermission( - System.Security.Permissions.SecurityAction.LinkDemand, - Flags = System.Security.Permissions.SecurityPermissionFlag.SerializationFormatter)] -#endif [System.Security.SecurityCritical] // These FxCop rules are giving false-positives for this method [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Security", "CA2123:OverrideLinkDemandsShouldBeIdenticalToBase")] diff --git a/sdk/src/Services/PartnerCentralSelling/Generated/Model/ServiceQuotaExceededException.cs b/sdk/src/Services/PartnerCentralSelling/Generated/Model/ServiceQuotaExceededException.cs index 5cbd39bd03f5..89c37a10a35f 100644 --- a/sdk/src/Services/PartnerCentralSelling/Generated/Model/ServiceQuotaExceededException.cs +++ b/sdk/src/Services/PartnerCentralSelling/Generated/Model/ServiceQuotaExceededException.cs @@ -114,11 +114,6 @@ protected ServiceQuotaExceededException(System.Runtime.Serialization.Serializati /// The that holds the serialized object data about the exception being thrown. /// The that contains contextual information about the source or destination. /// The parameter is a null reference (Nothing in Visual Basic). -#if BCL35 - [System.Security.Permissions.SecurityPermission( - System.Security.Permissions.SecurityAction.LinkDemand, - Flags = System.Security.Permissions.SecurityPermissionFlag.SerializationFormatter)] -#endif [System.Security.SecurityCritical] // These FxCop rules are giving false-positives for this method [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Security", "CA2123:OverrideLinkDemandsShouldBeIdenticalToBase")] diff --git a/sdk/src/Services/PartnerCentralSelling/Generated/Model/SolutionBase.cs b/sdk/src/Services/PartnerCentralSelling/Generated/Model/SolutionBase.cs index 89a26b5b176c..7067a455ad4a 100644 --- a/sdk/src/Services/PartnerCentralSelling/Generated/Model/SolutionBase.cs +++ b/sdk/src/Services/PartnerCentralSelling/Generated/Model/SolutionBase.cs @@ -93,9 +93,9 @@ internal bool IsSetCategory() /// ///     [AWSProperty(Required=true)] - public DateTime CreatedDate + public DateTime? CreatedDate { - get { return this._createdDate.GetValueOrDefault(); } + get { return this._createdDate; } set { this._createdDate = value; } } diff --git a/sdk/src/Services/PartnerCentralSelling/Generated/Model/StartEngagementByAcceptingInvitationTaskResponse.cs b/sdk/src/Services/PartnerCentralSelling/Generated/Model/StartEngagementByAcceptingInvitationTaskResponse.cs index f0df1855bb8d..1fd9be07029c 100644 --- a/sdk/src/Services/PartnerCentralSelling/Generated/Model/StartEngagementByAcceptingInvitationTaskResponse.cs +++ b/sdk/src/Services/PartnerCentralSelling/Generated/Model/StartEngagementByAcceptingInvitationTaskResponse.cs @@ -125,9 +125,9 @@ internal bool IsSetReasonCode() /// section 5.6. /// ///     - public DateTime StartTime + public DateTime? StartTime { - get { return this._startTime.GetValueOrDefault(); } + get { return this._startTime; } set { this._startTime = value; } } diff --git a/sdk/src/Services/PartnerCentralSelling/Generated/Model/StartEngagementFromOpportunityTaskResponse.cs b/sdk/src/Services/PartnerCentralSelling/Generated/Model/StartEngagementFromOpportunityTaskResponse.cs index 865950bed74e..3f3889475255 100644 --- a/sdk/src/Services/PartnerCentralSelling/Generated/Model/StartEngagementFromOpportunityTaskResponse.cs +++ b/sdk/src/Services/PartnerCentralSelling/Generated/Model/StartEngagementFromOpportunityTaskResponse.cs @@ -105,9 +105,9 @@ internal bool IsSetReasonCode() /// section 5.6. /// ///     - public DateTime StartTime + public DateTime? StartTime { - get { return this._startTime.GetValueOrDefault(); } + get { return this._startTime; } set { this._startTime = value; } } diff --git a/sdk/src/Services/PartnerCentralSelling/Generated/Model/ThrottlingException.cs b/sdk/src/Services/PartnerCentralSelling/Generated/Model/ThrottlingException.cs index b227433df2d9..6818b9a00bef 100644 --- a/sdk/src/Services/PartnerCentralSelling/Generated/Model/ThrottlingException.cs +++ b/sdk/src/Services/PartnerCentralSelling/Generated/Model/ThrottlingException.cs @@ -113,11 +113,6 @@ protected ThrottlingException(System.Runtime.Serialization.SerializationInfo inf /// The that holds the serialized object data about the exception being thrown. /// The that contains contextual information about the source or destination. /// The parameter is a null reference (Nothing in Visual Basic). -#if BCL35 - [System.Security.Permissions.SecurityPermission( - System.Security.Permissions.SecurityAction.LinkDemand, - Flags = System.Security.Permissions.SecurityPermissionFlag.SerializationFormatter)] -#endif [System.Security.SecurityCritical] // These FxCop rules are giving false-positives for this method [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Security", "CA2123:OverrideLinkDemandsShouldBeIdenticalToBase")] diff --git a/sdk/src/Services/PartnerCentralSelling/Generated/Model/UpdateOpportunityRequest.cs b/sdk/src/Services/PartnerCentralSelling/Generated/Model/UpdateOpportunityRequest.cs index bd59b67c5609..4beb061b102b 100644 --- a/sdk/src/Services/PartnerCentralSelling/Generated/Model/UpdateOpportunityRequest.cs +++ b/sdk/src/Services/PartnerCentralSelling/Generated/Model/UpdateOpportunityRequest.cs @@ -128,9 +128,9 @@ internal bool IsSetIdentifier() /// ///     [AWSProperty(Required=true)] - public DateTime LastModifiedDate + public DateTime? LastModifiedDate { - get { return this._lastModifiedDate.GetValueOrDefault(); } + get { return this._lastModifiedDate; } set { this._lastModifiedDate = value; } } diff --git a/sdk/src/Services/PartnerCentralSelling/Generated/Model/UpdateOpportunityResponse.cs b/sdk/src/Services/PartnerCentralSelling/Generated/Model/UpdateOpportunityResponse.cs index ac8d1684166b..17654192227f 100644 --- a/sdk/src/Services/PartnerCentralSelling/Generated/Model/UpdateOpportunityResponse.cs +++ b/sdk/src/Services/PartnerCentralSelling/Generated/Model/UpdateOpportunityResponse.cs @@ -63,9 +63,9 @@ internal bool IsSetId() /// ///     [AWSProperty(Required=true)] - public DateTime LastModifiedDate + public DateTime? LastModifiedDate { - get { return this._lastModifiedDate.GetValueOrDefault(); } + get { return this._lastModifiedDate; } set { this._lastModifiedDate = value; } } diff --git a/sdk/src/Services/PartnerCentralSelling/Generated/Model/ValidationException.cs b/sdk/src/Services/PartnerCentralSelling/Generated/Model/ValidationException.cs index 27a00899e18d..21ff34e74312 100644 --- a/sdk/src/Services/PartnerCentralSelling/Generated/Model/ValidationException.cs +++ b/sdk/src/Services/PartnerCentralSelling/Generated/Model/ValidationException.cs @@ -117,11 +117,6 @@ protected ValidationException(System.Runtime.Serialization.SerializationInfo inf /// The that holds the serialized object data about the exception being thrown. /// The that contains contextual information about the source or destination. /// The parameter is a null reference (Nothing in Visual Basic). -#if BCL35 - [System.Security.Permissions.SecurityPermission( - System.Security.Permissions.SecurityAction.LinkDemand, - Flags = System.Security.Permissions.SecurityPermissionFlag.SerializationFormatter)] -#endif [System.Security.SecurityCritical] // These FxCop rules are giving false-positives for this method [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Security", "CA2123:OverrideLinkDemandsShouldBeIdenticalToBase")] diff --git a/sdk/src/Services/PartnerCentralSelling/Generated/Model/_bcl45+netstandard/IListEngagementInvitationsPaginator.cs b/sdk/src/Services/PartnerCentralSelling/Generated/Model/_bcl+netstandard/IListEngagementInvitationsPaginator.cs similarity index 100% rename from sdk/src/Services/PartnerCentralSelling/Generated/Model/_bcl45+netstandard/IListEngagementInvitationsPaginator.cs rename to sdk/src/Services/PartnerCentralSelling/Generated/Model/_bcl+netstandard/IListEngagementInvitationsPaginator.cs diff --git a/sdk/src/Services/PartnerCentralSelling/Generated/Model/_bcl45+netstandard/IListOpportunitiesPaginator.cs b/sdk/src/Services/PartnerCentralSelling/Generated/Model/_bcl+netstandard/IListOpportunitiesPaginator.cs similarity index 100% rename from sdk/src/Services/PartnerCentralSelling/Generated/Model/_bcl45+netstandard/IListOpportunitiesPaginator.cs rename to sdk/src/Services/PartnerCentralSelling/Generated/Model/_bcl+netstandard/IListOpportunitiesPaginator.cs diff --git a/sdk/src/Services/PartnerCentralSelling/Generated/Model/_bcl45+netstandard/IListSolutionsPaginator.cs b/sdk/src/Services/PartnerCentralSelling/Generated/Model/_bcl+netstandard/IListSolutionsPaginator.cs similarity index 100% rename from sdk/src/Services/PartnerCentralSelling/Generated/Model/_bcl45+netstandard/IListSolutionsPaginator.cs rename to sdk/src/Services/PartnerCentralSelling/Generated/Model/_bcl+netstandard/IListSolutionsPaginator.cs diff --git a/sdk/src/Services/PartnerCentralSelling/Generated/Model/_bcl45+netstandard/IPartnerCentralSellingPaginatorFactory.cs b/sdk/src/Services/PartnerCentralSelling/Generated/Model/_bcl+netstandard/IPartnerCentralSellingPaginatorFactory.cs similarity index 100% rename from sdk/src/Services/PartnerCentralSelling/Generated/Model/_bcl45+netstandard/IPartnerCentralSellingPaginatorFactory.cs rename to sdk/src/Services/PartnerCentralSelling/Generated/Model/_bcl+netstandard/IPartnerCentralSellingPaginatorFactory.cs diff --git a/sdk/src/Services/PartnerCentralSelling/Generated/Model/_bcl45+netstandard/ListEngagementInvitationsPaginator.cs b/sdk/src/Services/PartnerCentralSelling/Generated/Model/_bcl+netstandard/ListEngagementInvitationsPaginator.cs similarity index 100% rename from sdk/src/Services/PartnerCentralSelling/Generated/Model/_bcl45+netstandard/ListEngagementInvitationsPaginator.cs rename to sdk/src/Services/PartnerCentralSelling/Generated/Model/_bcl+netstandard/ListEngagementInvitationsPaginator.cs diff --git a/sdk/src/Services/PartnerCentralSelling/Generated/Model/_bcl45+netstandard/ListOpportunitiesPaginator.cs b/sdk/src/Services/PartnerCentralSelling/Generated/Model/_bcl+netstandard/ListOpportunitiesPaginator.cs similarity index 100% rename from sdk/src/Services/PartnerCentralSelling/Generated/Model/_bcl45+netstandard/ListOpportunitiesPaginator.cs rename to sdk/src/Services/PartnerCentralSelling/Generated/Model/_bcl+netstandard/ListOpportunitiesPaginator.cs diff --git a/sdk/src/Services/PartnerCentralSelling/Generated/Model/_bcl45+netstandard/ListSolutionsPaginator.cs b/sdk/src/Services/PartnerCentralSelling/Generated/Model/_bcl+netstandard/ListSolutionsPaginator.cs similarity index 100% rename from sdk/src/Services/PartnerCentralSelling/Generated/Model/_bcl45+netstandard/ListSolutionsPaginator.cs rename to sdk/src/Services/PartnerCentralSelling/Generated/Model/_bcl+netstandard/ListSolutionsPaginator.cs diff --git a/sdk/src/Services/PartnerCentralSelling/Generated/Model/_bcl45+netstandard/PartnerCentralSellingPaginatorFactory.cs b/sdk/src/Services/PartnerCentralSelling/Generated/Model/_bcl+netstandard/PartnerCentralSellingPaginatorFactory.cs similarity index 100% rename from sdk/src/Services/PartnerCentralSelling/Generated/Model/_bcl45+netstandard/PartnerCentralSellingPaginatorFactory.cs rename to sdk/src/Services/PartnerCentralSelling/Generated/Model/_bcl+netstandard/PartnerCentralSellingPaginatorFactory.cs diff --git a/sdk/src/Services/PartnerCentralSelling/Generated/_bcl45/AmazonPartnerCentralSellingClient.cs b/sdk/src/Services/PartnerCentralSelling/Generated/_bcl/AmazonPartnerCentralSellingClient.cs similarity index 99% rename from sdk/src/Services/PartnerCentralSelling/Generated/_bcl45/AmazonPartnerCentralSellingClient.cs rename to sdk/src/Services/PartnerCentralSelling/Generated/_bcl/AmazonPartnerCentralSellingClient.cs index da6864a85679..aa2a743b4898 100644 --- a/sdk/src/Services/PartnerCentralSelling/Generated/_bcl45/AmazonPartnerCentralSellingClient.cs +++ b/sdk/src/Services/PartnerCentralSelling/Generated/_bcl/AmazonPartnerCentralSellingClient.cs @@ -32,6 +32,7 @@ using Amazon.Runtime.Internal; using Amazon.Runtime.Internal.Auth; using Amazon.Runtime.Internal.Transform; +using Amazon.Runtime.Endpoints; #pragma warning disable CS1570 namespace Amazon.PartnerCentralSelling @@ -2755,16 +2756,8 @@ public virtual UpdateOpportunityResponse UpdateOpportunity(UpdateOpportunityRequ /// The resolved endpoint for the given request. public Amazon.Runtime.Endpoints.Endpoint DetermineServiceOperationEndpoint(AmazonWebServiceRequest request) { - var requestContext = new Amazon.Runtime.Internal.RequestContext(false, CreateSigner()) - { - ClientConfig = Config, - OriginalRequest = request, - Request = new Amazon.Runtime.Internal.DefaultRequest(request, ServiceMetadata.ServiceId) - }; - - var executionContext = new Amazon.Runtime.Internal.ExecutionContext(requestContext, null); - var resolver = new AmazonPartnerCentralSellingEndpointResolver(); - return resolver.GetEndpoint(executionContext); + var parameters = new ServiceOperationEndpointParameters(request); + return Config.DetermineServiceOperationEndpoint(parameters); } #endregion diff --git a/sdk/src/Services/PartnerCentralSelling/Generated/_bcl45/IAmazonPartnerCentralSelling.cs b/sdk/src/Services/PartnerCentralSelling/Generated/_bcl/IAmazonPartnerCentralSelling.cs similarity index 100% rename from sdk/src/Services/PartnerCentralSelling/Generated/_bcl45/IAmazonPartnerCentralSelling.cs rename to sdk/src/Services/PartnerCentralSelling/Generated/_bcl/IAmazonPartnerCentralSelling.cs diff --git a/sdk/src/Services/PartnerCentralSelling/Generated/_bcl35/AmazonPartnerCentralSellingClient.cs b/sdk/src/Services/PartnerCentralSelling/Generated/_bcl35/AmazonPartnerCentralSellingClient.cs deleted file mode 100644 index b593d6f9583f..000000000000 --- a/sdk/src/Services/PartnerCentralSelling/Generated/_bcl35/AmazonPartnerCentralSellingClient.cs +++ /dev/null @@ -1,2031 +0,0 @@ -/* - * 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. - */ - -/* - * Do not modify this file. This file is generated from the partnercentral-selling-2022-07-26.normal.json service model. - */ - - -using System; -using System.Collections.Generic; -using System.Net; - -using Amazon.PartnerCentralSelling.Model; -using Amazon.PartnerCentralSelling.Model.Internal.MarshallTransformations; -using Amazon.PartnerCentralSelling.Internal; -using Amazon.Runtime; -using Amazon.Runtime.Internal; -using Amazon.Runtime.Internal.Auth; -using Amazon.Runtime.Internal.Transform; - -#pragma warning disable CS1570 -namespace Amazon.PartnerCentralSelling -{ - /// - /// Implementation for accessing PartnerCentralSelling - /// - /// AWS Partner Central API for Selling - /// - /// AWS Partner Central API for Selling Reference Guide - /// - /// - /// - /// This Amazon Web Services (AWS) Partner Central API reference is designed to help AWS Partners integrate Customer - /// Relationship Management (CRM) systems with AWS Partner Central. Partners can automate - /// interactions with AWS Partner Central, which helps to ensure effective engagements - /// in joint business activities. - /// - /// - /// - /// The API provides standard AWS API functionality. Access it by either using API Actions - /// or by using an AWS SDK that's tailored to your programming language or platform. For - /// more information, see Getting Started - /// with AWS and Tools to Build on - /// AWS. - /// - /// - /// - /// Features offered by AWS Partner Central API - /// - ///
    1. - /// - /// Opportunity management: Manages coselling opportunities through API actions - /// such as CreateOpportunity, UpdateOpportunity, ListOpportunities, - /// GetOpportunity, and AssignOpportunity. - /// - ///
    2. - /// - /// AWS referral management: Manages referrals shared by AWS using actions such - /// as ListEngagementInvitations, GetEngagementInvitation, StartEngagementByAcceptingInvitation, - /// and RejectEngagementInvitation. - /// - ///
    3. - /// - /// Entity association: Associates related entities such as AWS Products, - /// Partner Solutions, and AWS Marketplace Private Offers with opportunities - /// using the actions AssociateOpportunity, and DisassociateOpportunity. - /// - ///
    4. - /// - /// View AWS opportunity details: Retrieves real-time summaries of AWS opportunities - /// using the GetAWSOpportunitySummary action. - /// - ///
    5. - /// - /// List solutions: Provides list APIs for listing partner offers using ListSolutions. - /// - ///
    6. - /// - /// Event subscription: Subscribe to real-time opportunity updates through AWS - /// EventBridge by using actions such as Opportunity Created, Opportunity Updated, - /// Engagement Invitation Accepted, Engagement Invitation Rejected, and - /// Engagement Invitation Created. - /// - ///
    - ///     - ///     - public partial class AmazonPartnerCentralSellingClient : AmazonServiceClient, IAmazonPartnerCentralSelling - { - private static IServiceMetadata serviceMetadata = new AmazonPartnerCentralSellingMetadata(); - -#if BCL45 || AWS_ASYNC_ENUMERABLES_API - private IPartnerCentralSellingPaginatorFactory _paginators; - - /// - /// Paginators for the service - /// - public IPartnerCentralSellingPaginatorFactory Paginators - { - get - { - if (this._paginators == null) - { - this._paginators = new PartnerCentralSellingPaginatorFactory(this); - } - return this._paginators; - } - } -#endif - #region Constructors - - /// - /// Constructs AmazonPartnerCentralSellingClient with the credentials loaded from the application's - /// default configuration, and if unsuccessful from the Instance Profile service on an EC2 instance. - /// - /// Example App.config with credentials set. - /// - /// <?xml version="1.0" encoding="utf-8" ?> - /// <configuration> - /// <appSettings> - /// <add key="AWSProfileName" value="AWS Default"/> - /// </appSettings> - /// </configuration> - /// - /// - /// - public AmazonPartnerCentralSellingClient() - : base(FallbackCredentialsFactory.GetCredentials(), new AmazonPartnerCentralSellingConfig()) { } - - /// - /// Constructs AmazonPartnerCentralSellingClient with the credentials loaded from the application's - /// default configuration, and if unsuccessful from the Instance Profile service on an EC2 instance. - /// - /// Example App.config with credentials set. - /// - /// <?xml version="1.0" encoding="utf-8" ?> - /// <configuration> - /// <appSettings> - /// <add key="AWSProfileName" value="AWS Default"/> - /// </appSettings> - /// </configuration> - /// - /// - /// - /// The region to connect. - public AmazonPartnerCentralSellingClient(RegionEndpoint region) - : base(FallbackCredentialsFactory.GetCredentials(), new AmazonPartnerCentralSellingConfig{RegionEndpoint = region}) { } - - /// - /// Constructs AmazonPartnerCentralSellingClient with the credentials loaded from the application's - /// default configuration, and if unsuccessful from the Instance Profile service on an EC2 instance. - /// - /// Example App.config with credentials set. - /// - /// <?xml version="1.0" encoding="utf-8" ?> - /// <configuration> - /// <appSettings> - /// <add key="AWSProfileName" value="AWS Default"/> - /// </appSettings> - /// </configuration> - /// - /// - /// - /// The AmazonPartnerCentralSellingClient Configuration Object - public AmazonPartnerCentralSellingClient(AmazonPartnerCentralSellingConfig config) - : base(FallbackCredentialsFactory.GetCredentials(config), config){} - /// - /// Constructs AmazonPartnerCentralSellingClient with AWS Credentials - /// - /// AWS Credentials - public AmazonPartnerCentralSellingClient(AWSCredentials credentials) - : this(credentials, new AmazonPartnerCentralSellingConfig()) - { - } - - /// - /// Constructs AmazonPartnerCentralSellingClient with AWS Credentials - /// - /// AWS Credentials - /// The region to connect. - public AmazonPartnerCentralSellingClient(AWSCredentials credentials, RegionEndpoint region) - : this(credentials, new AmazonPartnerCentralSellingConfig{RegionEndpoint = region}) - { - } - - /// - /// Constructs AmazonPartnerCentralSellingClient with AWS Credentials and an - /// AmazonPartnerCentralSellingClient Configuration object. - /// - /// AWS Credentials - /// The AmazonPartnerCentralSellingClient Configuration Object - public AmazonPartnerCentralSellingClient(AWSCredentials credentials, AmazonPartnerCentralSellingConfig clientConfig) - : base(credentials, clientConfig) - { - } - - /// - /// Constructs AmazonPartnerCentralSellingClient with AWS Access Key ID and AWS Secret Key - /// - /// AWS Access Key ID - /// AWS Secret Access Key - public AmazonPartnerCentralSellingClient(string awsAccessKeyId, string awsSecretAccessKey) - : this(awsAccessKeyId, awsSecretAccessKey, new AmazonPartnerCentralSellingConfig()) - { - } - - /// - /// Constructs AmazonPartnerCentralSellingClient with AWS Access Key ID and AWS Secret Key - /// - /// AWS Access Key ID - /// AWS Secret Access Key - /// The region to connect. - public AmazonPartnerCentralSellingClient(string awsAccessKeyId, string awsSecretAccessKey, RegionEndpoint region) - : this(awsAccessKeyId, awsSecretAccessKey, new AmazonPartnerCentralSellingConfig() {RegionEndpoint=region}) - { - } - - /// - /// Constructs AmazonPartnerCentralSellingClient with AWS Access Key ID, AWS Secret Key and an - /// AmazonPartnerCentralSellingClient Configuration object. - /// - /// AWS Access Key ID - /// AWS Secret Access Key - /// The AmazonPartnerCentralSellingClient Configuration Object - public AmazonPartnerCentralSellingClient(string awsAccessKeyId, string awsSecretAccessKey, AmazonPartnerCentralSellingConfig clientConfig) - : base(awsAccessKeyId, awsSecretAccessKey, clientConfig) - { - } - - /// - /// Constructs AmazonPartnerCentralSellingClient with AWS Access Key ID and AWS Secret Key - /// - /// AWS Access Key ID - /// AWS Secret Access Key - /// AWS Session Token - public AmazonPartnerCentralSellingClient(string awsAccessKeyId, string awsSecretAccessKey, string awsSessionToken) - : this(awsAccessKeyId, awsSecretAccessKey, awsSessionToken, new AmazonPartnerCentralSellingConfig()) - { - } - - /// - /// Constructs AmazonPartnerCentralSellingClient with AWS Access Key ID and AWS Secret Key - /// - /// AWS Access Key ID - /// AWS Secret Access Key - /// AWS Session Token - /// The region to connect. - public AmazonPartnerCentralSellingClient(string awsAccessKeyId, string awsSecretAccessKey, string awsSessionToken, RegionEndpoint region) - : this(awsAccessKeyId, awsSecretAccessKey, awsSessionToken, new AmazonPartnerCentralSellingConfig{RegionEndpoint = region}) - { - } - - /// - /// Constructs AmazonPartnerCentralSellingClient with AWS Access Key ID, AWS Secret Key and an - /// AmazonPartnerCentralSellingClient Configuration object. - /// - /// AWS Access Key ID - /// AWS Secret Access Key - /// AWS Session Token - /// The AmazonPartnerCentralSellingClient Configuration Object - public AmazonPartnerCentralSellingClient(string awsAccessKeyId, string awsSecretAccessKey, string awsSessionToken, AmazonPartnerCentralSellingConfig clientConfig) - : base(awsAccessKeyId, awsSecretAccessKey, awsSessionToken, clientConfig) - { - } - - #endregion - - #region Overrides - - - /// - /// Creates the signer for the service. - /// - protected override AbstractAWSSigner CreateSigner() - { - return new AWS4Signer(); - } - - /// - /// Customize the pipeline - /// - /// - protected override void CustomizeRuntimePipeline(RuntimePipeline pipeline) - { - pipeline.RemoveHandler(); - pipeline.AddHandlerAfter(new AmazonPartnerCentralSellingEndpointResolver()); - } - /// - /// Capture metadata for the service. - /// - protected override IServiceMetadata ServiceMetadata - { - get - { - return serviceMetadata; - } - } - - #endregion - - #region Dispose - - /// - /// Disposes the service client. - /// - protected override void Dispose(bool disposing) - { - base.Dispose(disposing); - } - - #endregion - - - #region AssignOpportunity - - /// - /// Enables you to reassign an existing Opportunity to another user within your - /// Partner Central account. The specified user receives the opportunity, and it appears - /// on their Partner Central dashboard, allowing them to take necessary actions or proceed - /// with the opportunity. - /// - /// - /// - /// This is useful for distributing opportunities to the appropriate team members or - /// departments within your organization, ensuring that each opportunity is handled by - /// the right person. By default, the opportunity owner is the one who creates it. Currently, - /// there's no API to enumerate the list of available users. - /// - /// - /// Container for the necessary parameters to execute the AssignOpportunity service method. - /// - /// The response from the AssignOpportunity service method, as returned by PartnerCentralSelling. - /// - /// This error occurs when you don't have permission to perform the requested action. - /// - /// - /// - /// - /// You don’t have access to this action or resource. Review IAM policies or contact your - /// AWS administrator for assistance. - /// - /// - /// - /// This error occurs when the specified resource can’t be found or doesn't exist. Resource - /// ID and type might be incorrect. - /// - /// - /// - /// Suggested action: This is usually a transient error. Retry after the provided retry - /// delay or a short interval. If the problem persists, contact AWS support. - /// - /// - /// - /// This error occurs when the specified resource can't be found. The resource might not - /// exist, or isn't visible with the current credentials. - /// - /// - /// - /// Suggested action: Verify that the resource ID is correct and the resource is in the - /// expected AWS region. Check IAM permissions for accessing the resource. - /// - /// - /// - /// This error occurs when there are too many requests sent. Review the provided quotas - /// and adapt your usage to avoid throttling. - /// - /// - /// - /// This error occurs when there are too many requests sent. Review the provided Quotas - /// and retry after the provided delay. - /// - /// - /// - /// The input fails to satisfy the constraints specified by the service or business validation - /// rules. - /// - /// - /// - /// Suggested action: Review the error message, including the failed fields and reasons, - /// to correct the request payload. - /// - /// - /// REST API Reference for AssignOpportunity Operation - public virtual AssignOpportunityResponse AssignOpportunity(AssignOpportunityRequest request) - { - var options = new InvokeOptions(); - options.RequestMarshaller = AssignOpportunityRequestMarshaller.Instance; - options.ResponseUnmarshaller = AssignOpportunityResponseUnmarshaller.Instance; - - return Invoke(request, options); - } - - /// - /// Initiates the asynchronous execution of the AssignOpportunity operation. - /// - /// - /// Container for the necessary parameters to execute the AssignOpportunity operation on AmazonPartnerCentralSellingClient. - /// An AsyncCallback delegate that is invoked when the operation completes. - /// A user-defined state object that is passed to the callback procedure. Retrieve this object from within the callback - /// procedure using the AsyncState property. - /// - /// An IAsyncResult that can be used to poll or wait for results, or both; this value is also needed when invoking EndAssignOpportunity - /// operation. - /// REST API Reference for AssignOpportunity Operation - public virtual IAsyncResult BeginAssignOpportunity(AssignOpportunityRequest request, AsyncCallback callback, object state) - { - var options = new InvokeOptions(); - options.RequestMarshaller = AssignOpportunityRequestMarshaller.Instance; - options.ResponseUnmarshaller = AssignOpportunityResponseUnmarshaller.Instance; - - return BeginInvoke(request, options, callback, state); - } - - /// - /// Finishes the asynchronous execution of the AssignOpportunity operation. - /// - /// - /// The IAsyncResult returned by the call to BeginAssignOpportunity. - /// - /// Returns a AssignOpportunityResult from PartnerCentralSelling. - /// REST API Reference for AssignOpportunity Operation - public virtual AssignOpportunityResponse EndAssignOpportunity(IAsyncResult asyncResult) - { - return EndInvoke(asyncResult); - } - - #endregion - - #region AssociateOpportunity - - /// - /// Enables you to create a formal association between an Opportunity and various - /// related entities, enriching the context and details of the opportunity for better - /// collaboration and decision making. You can associate an opportunity with the following - /// entity types: - /// - ///
    • - /// - /// Partner Solution: A software product or consulting practice created and delivered - /// by Partners. Partner Solutions help customers address business challenges using Amazon - /// Web Services services. - /// - ///
    • - /// - /// Amazon Web Services Products: Amazon Web Services offers many products and services - /// that provide scalable, reliable, and cost-effective infrastructure solutions. For - /// the latest list of Amazon Web Services products, see Amazon - /// Web Services products. - /// - ///
    • - /// - /// Amazon Web Services Marketplace private offer: Allows Amazon Web Services Marketplace - /// sellers to extend custom pricing and terms to individual Amazon Web Services customers. - /// Sellers can negotiate custom prices, payment schedules, and end user license terms - /// through private offers, enabling Amazon Web Services customers to acquire software - /// solutions tailored to their specific needs. For more information, see Private - /// offers in Amazon Web Services Marketplace. - /// - ///
    - /// - /// To obtain identifiers for these entities, use the following methods: - /// - ///
    • - /// - /// Solution: Use the ListSolutions operation. - /// - ///
    • - /// - /// AWS Products: For the latest list of Amazon Web Services products, see Amazon - /// Web Services products. - /// - ///
    • - /// - /// Amazon Web Services Marketplace private offer: Use the Using - /// the Amazon Web Services Marketplace Catalog API to list entities. Specifically, - /// use the ListEntities operation to retrieve a list of private offers. The request - /// returns the details of available private offers. For more information, see ListEntities. - /// - /// - ///
    - ///     - /// Container for the necessary parameters to execute the AssociateOpportunity service method. - /// - /// The response from the AssociateOpportunity service method, as returned by PartnerCentralSelling. - /// - /// This error occurs when you don't have permission to perform the requested action. - /// - /// - /// - /// - /// You don’t have access to this action or resource. Review IAM policies or contact your - /// AWS administrator for assistance. - /// - /// - /// - /// This error occurs when the specified resource can’t be found or doesn't exist. Resource - /// ID and type might be incorrect. - /// - /// - /// - /// Suggested action: This is usually a transient error. Retry after the provided retry - /// delay or a short interval. If the problem persists, contact AWS support. - /// - /// - /// - /// This error occurs when the specified resource can't be found. The resource might not - /// exist, or isn't visible with the current credentials. - /// - /// - /// - /// Suggested action: Verify that the resource ID is correct and the resource is in the - /// expected AWS region. Check IAM permissions for accessing the resource. - /// - /// - /// - /// This error occurs when there are too many requests sent. Review the provided quotas - /// and adapt your usage to avoid throttling. - /// - /// - /// - /// This error occurs when there are too many requests sent. Review the provided Quotas - /// and retry after the provided delay. - /// - /// - /// - /// The input fails to satisfy the constraints specified by the service or business validation - /// rules. - /// - /// - /// - /// Suggested action: Review the error message, including the failed fields and reasons, - /// to correct the request payload. - /// - /// - /// REST API Reference for AssociateOpportunity Operation - public virtual AssociateOpportunityResponse AssociateOpportunity(AssociateOpportunityRequest request) - { - var options = new InvokeOptions(); - options.RequestMarshaller = AssociateOpportunityRequestMarshaller.Instance; - options.ResponseUnmarshaller = AssociateOpportunityResponseUnmarshaller.Instance; - - return Invoke(request, options); - } - - /// - /// Initiates the asynchronous execution of the AssociateOpportunity operation. - /// - /// - /// Container for the necessary parameters to execute the AssociateOpportunity operation on AmazonPartnerCentralSellingClient. - /// An AsyncCallback delegate that is invoked when the operation completes. - /// A user-defined state object that is passed to the callback procedure. Retrieve this object from within the callback - /// procedure using the AsyncState property. - /// - /// An IAsyncResult that can be used to poll or wait for results, or both; this value is also needed when invoking EndAssociateOpportunity - /// operation. - /// REST API Reference for AssociateOpportunity Operation - public virtual IAsyncResult BeginAssociateOpportunity(AssociateOpportunityRequest request, AsyncCallback callback, object state) - { - var options = new InvokeOptions(); - options.RequestMarshaller = AssociateOpportunityRequestMarshaller.Instance; - options.ResponseUnmarshaller = AssociateOpportunityResponseUnmarshaller.Instance; - - return BeginInvoke(request, options, callback, state); - } - - /// - /// Finishes the asynchronous execution of the AssociateOpportunity operation. - /// - /// - /// The IAsyncResult returned by the call to BeginAssociateOpportunity. - /// - /// Returns a AssociateOpportunityResult from PartnerCentralSelling. - /// REST API Reference for AssociateOpportunity Operation - public virtual AssociateOpportunityResponse EndAssociateOpportunity(IAsyncResult asyncResult) - { - return EndInvoke(asyncResult); - } - - #endregion - - #region CreateOpportunity - - /// - /// Creates an Opportunity record in Partner Central. Use this operation to create - /// a potential business opportunity for submission to Amazon Web Services. Creating an - /// opportunity sets Lifecycle.ReviewStatus to Pending Submission. - /// - /// - /// - /// To submit an opportunity, follow these steps: - /// - ///
    1. - /// - /// To create the opportunity, use CreateOpportunity. - /// - ///
    2. - /// - /// To associate a solution with the opportunity, use AssociateOpportunity. - /// - ///
    3. - /// - /// To submit the opportunity, use StartEngagementFromOpportunityTask. - /// - ///
    - /// - /// After submission, you can't edit the opportunity until the review is complete. But - /// opportunities in the Pending Submission state must have complete details. You - /// can update the opportunity while it's in the Pending Submission state. - /// - /// - /// - /// There's a set of mandatory fields to create opportunities, but consider providing - /// optional fields to enrich the opportunity record. - /// - ///     - /// Container for the necessary parameters to execute the CreateOpportunity service method. - /// - /// The response from the CreateOpportunity service method, as returned by PartnerCentralSelling. - /// - /// This error occurs when you don't have permission to perform the requested action. - /// - /// - /// - /// - /// You don’t have access to this action or resource. Review IAM policies or contact your - /// AWS administrator for assistance. - /// - /// - /// - /// This error occurs when the request can’t be processed due to a conflict with the target - /// resource's current state, which could result from updating or deleting the resource. - /// - /// - /// - /// - /// Suggested action: Fetch the latest state of the resource, verify the state, and retry - /// the request. - /// - /// - /// - /// This error occurs when the specified resource can’t be found or doesn't exist. Resource - /// ID and type might be incorrect. - /// - /// - /// - /// Suggested action: This is usually a transient error. Retry after the provided retry - /// delay or a short interval. If the problem persists, contact AWS support. - /// - /// - /// - /// This error occurs when the specified resource can't be found. The resource might not - /// exist, or isn't visible with the current credentials. - /// - /// - /// - /// Suggested action: Verify that the resource ID is correct and the resource is in the - /// expected AWS region. Check IAM permissions for accessing the resource. - /// - /// - /// - /// This error occurs when there are too many requests sent. Review the provided quotas - /// and adapt your usage to avoid throttling. - /// - /// - /// - /// This error occurs when there are too many requests sent. Review the provided Quotas - /// and retry after the provided delay. - /// - /// - /// - /// The input fails to satisfy the constraints specified by the service or business validation - /// rules. - /// - /// - /// - /// Suggested action: Review the error message, including the failed fields and reasons, - /// to correct the request payload. - /// - /// - /// REST API Reference for CreateOpportunity Operation - public virtual CreateOpportunityResponse CreateOpportunity(CreateOpportunityRequest request) - { - var options = new InvokeOptions(); - options.RequestMarshaller = CreateOpportunityRequestMarshaller.Instance; - options.ResponseUnmarshaller = CreateOpportunityResponseUnmarshaller.Instance; - - return Invoke(request, options); - } - - /// - /// Initiates the asynchronous execution of the CreateOpportunity operation. - /// - /// - /// Container for the necessary parameters to execute the CreateOpportunity operation on AmazonPartnerCentralSellingClient. - /// An AsyncCallback delegate that is invoked when the operation completes. - /// A user-defined state object that is passed to the callback procedure. Retrieve this object from within the callback - /// procedure using the AsyncState property. - /// - /// An IAsyncResult that can be used to poll or wait for results, or both; this value is also needed when invoking EndCreateOpportunity - /// operation. - /// REST API Reference for CreateOpportunity Operation - public virtual IAsyncResult BeginCreateOpportunity(CreateOpportunityRequest request, AsyncCallback callback, object state) - { - var options = new InvokeOptions(); - options.RequestMarshaller = CreateOpportunityRequestMarshaller.Instance; - options.ResponseUnmarshaller = CreateOpportunityResponseUnmarshaller.Instance; - - return BeginInvoke(request, options, callback, state); - } - - /// - /// Finishes the asynchronous execution of the CreateOpportunity operation. - /// - /// - /// The IAsyncResult returned by the call to BeginCreateOpportunity. - /// - /// Returns a CreateOpportunityResult from PartnerCentralSelling. - /// REST API Reference for CreateOpportunity Operation - public virtual CreateOpportunityResponse EndCreateOpportunity(IAsyncResult asyncResult) - { - return EndInvoke(asyncResult); - } - - #endregion - - #region DisassociateOpportunity - - /// - /// Allows you to remove an existing association between an Opportunity and related - /// entities, such as a Partner Solution, Amazon Web Services product, or an Amazon Web - /// Services Marketplace offer. This operation is the counterpart to AssociateOpportunity, - /// and it provides flexibility to manage associations as business needs change. - /// - /// - /// - /// Use this operation to update the associations of an Opportunity due to changes - /// in the related entities, or if an association was made in error. Ensuring accurate - /// associations helps maintain clarity and accuracy to track and manage business opportunities. - /// When you replace an entity, first attach the new entity and then disassociate the - /// one to be removed, especially if it's the last remaining entity that's required. - /// - /// - /// Container for the necessary parameters to execute the DisassociateOpportunity service method. - /// - /// The response from the DisassociateOpportunity service method, as returned by PartnerCentralSelling. - /// - /// This error occurs when you don't have permission to perform the requested action. - /// - /// - /// - /// - /// You don’t have access to this action or resource. Review IAM policies or contact your - /// AWS administrator for assistance. - /// - /// - /// - /// This error occurs when the specified resource can’t be found or doesn't exist. Resource - /// ID and type might be incorrect. - /// - /// - /// - /// Suggested action: This is usually a transient error. Retry after the provided retry - /// delay or a short interval. If the problem persists, contact AWS support. - /// - /// - /// - /// This error occurs when the specified resource can't be found. The resource might not - /// exist, or isn't visible with the current credentials. - /// - /// - /// - /// Suggested action: Verify that the resource ID is correct and the resource is in the - /// expected AWS region. Check IAM permissions for accessing the resource. - /// - /// - /// - /// This error occurs when there are too many requests sent. Review the provided quotas - /// and adapt your usage to avoid throttling. - /// - /// - /// - /// This error occurs when there are too many requests sent. Review the provided Quotas - /// and retry after the provided delay. - /// - /// - /// - /// The input fails to satisfy the constraints specified by the service or business validation - /// rules. - /// - /// - /// - /// Suggested action: Review the error message, including the failed fields and reasons, - /// to correct the request payload. - /// - /// - /// REST API Reference for DisassociateOpportunity Operation - public virtual DisassociateOpportunityResponse DisassociateOpportunity(DisassociateOpportunityRequest request) - { - var options = new InvokeOptions(); - options.RequestMarshaller = DisassociateOpportunityRequestMarshaller.Instance; - options.ResponseUnmarshaller = DisassociateOpportunityResponseUnmarshaller.Instance; - - return Invoke(request, options); - } - - /// - /// Initiates the asynchronous execution of the DisassociateOpportunity operation. - /// - /// - /// Container for the necessary parameters to execute the DisassociateOpportunity operation on AmazonPartnerCentralSellingClient. - /// An AsyncCallback delegate that is invoked when the operation completes. - /// A user-defined state object that is passed to the callback procedure. Retrieve this object from within the callback - /// procedure using the AsyncState property. - /// - /// An IAsyncResult that can be used to poll or wait for results, or both; this value is also needed when invoking EndDisassociateOpportunity - /// operation. - /// REST API Reference for DisassociateOpportunity Operation - public virtual IAsyncResult BeginDisassociateOpportunity(DisassociateOpportunityRequest request, AsyncCallback callback, object state) - { - var options = new InvokeOptions(); - options.RequestMarshaller = DisassociateOpportunityRequestMarshaller.Instance; - options.ResponseUnmarshaller = DisassociateOpportunityResponseUnmarshaller.Instance; - - return BeginInvoke(request, options, callback, state); - } - - /// - /// Finishes the asynchronous execution of the DisassociateOpportunity operation. - /// - /// - /// The IAsyncResult returned by the call to BeginDisassociateOpportunity. - /// - /// Returns a DisassociateOpportunityResult from PartnerCentralSelling. - /// REST API Reference for DisassociateOpportunity Operation - public virtual DisassociateOpportunityResponse EndDisassociateOpportunity(IAsyncResult asyncResult) - { - return EndInvoke(asyncResult); - } - - #endregion - - #region GetAwsOpportunitySummary - - /// - /// Retrieves a summary of an AWS Opportunity. This summary includes high-level details - /// about the opportunity sourced from AWS, such as lifecycle information, customer details, - /// and involvement type. It is useful for tracking updates on the AWS opportunity corresponding - /// to an opportunity in the partner's account. - /// - /// Container for the necessary parameters to execute the GetAwsOpportunitySummary service method. - /// - /// The response from the GetAwsOpportunitySummary service method, as returned by PartnerCentralSelling. - /// - /// This error occurs when you don't have permission to perform the requested action. - /// - /// - /// - /// - /// You don’t have access to this action or resource. Review IAM policies or contact your - /// AWS administrator for assistance. - /// - /// - /// - /// This error occurs when the specified resource can’t be found or doesn't exist. Resource - /// ID and type might be incorrect. - /// - /// - /// - /// Suggested action: This is usually a transient error. Retry after the provided retry - /// delay or a short interval. If the problem persists, contact AWS support. - /// - /// - /// - /// This error occurs when the specified resource can't be found. The resource might not - /// exist, or isn't visible with the current credentials. - /// - /// - /// - /// Suggested action: Verify that the resource ID is correct and the resource is in the - /// expected AWS region. Check IAM permissions for accessing the resource. - /// - /// - /// - /// This error occurs when there are too many requests sent. Review the provided quotas - /// and adapt your usage to avoid throttling. - /// - /// - /// - /// This error occurs when there are too many requests sent. Review the provided Quotas - /// and retry after the provided delay. - /// - /// - /// - /// The input fails to satisfy the constraints specified by the service or business validation - /// rules. - /// - /// - /// - /// Suggested action: Review the error message, including the failed fields and reasons, - /// to correct the request payload. - /// - /// - /// REST API Reference for GetAwsOpportunitySummary Operation - public virtual GetAwsOpportunitySummaryResponse GetAwsOpportunitySummary(GetAwsOpportunitySummaryRequest request) - { - var options = new InvokeOptions(); - options.RequestMarshaller = GetAwsOpportunitySummaryRequestMarshaller.Instance; - options.ResponseUnmarshaller = GetAwsOpportunitySummaryResponseUnmarshaller.Instance; - - return Invoke(request, options); - } - - /// - /// Initiates the asynchronous execution of the GetAwsOpportunitySummary operation. - /// - /// - /// Container for the necessary parameters to execute the GetAwsOpportunitySummary operation on AmazonPartnerCentralSellingClient. - /// An AsyncCallback delegate that is invoked when the operation completes. - /// A user-defined state object that is passed to the callback procedure. Retrieve this object from within the callback - /// procedure using the AsyncState property. - /// - /// An IAsyncResult that can be used to poll or wait for results, or both; this value is also needed when invoking EndGetAwsOpportunitySummary - /// operation. - /// REST API Reference for GetAwsOpportunitySummary Operation - public virtual IAsyncResult BeginGetAwsOpportunitySummary(GetAwsOpportunitySummaryRequest request, AsyncCallback callback, object state) - { - var options = new InvokeOptions(); - options.RequestMarshaller = GetAwsOpportunitySummaryRequestMarshaller.Instance; - options.ResponseUnmarshaller = GetAwsOpportunitySummaryResponseUnmarshaller.Instance; - - return BeginInvoke(request, options, callback, state); - } - - /// - /// Finishes the asynchronous execution of the GetAwsOpportunitySummary operation. - /// - /// - /// The IAsyncResult returned by the call to BeginGetAwsOpportunitySummary. - /// - /// Returns a GetAwsOpportunitySummaryResult from PartnerCentralSelling. - /// REST API Reference for GetAwsOpportunitySummary Operation - public virtual GetAwsOpportunitySummaryResponse EndGetAwsOpportunitySummary(IAsyncResult asyncResult) - { - return EndInvoke(asyncResult); - } - - #endregion - - #region GetEngagementInvitation - - /// - /// Retrieves the details of an engagement invitation shared by AWS with a partner. The - /// information includes aspects such as customer, project details, and lifecycle information. - /// To connect an engagement invitation with an opportunity, match the invitation’s Payload.Project.Title - /// with opportunity Project.Title. - /// - /// Container for the necessary parameters to execute the GetEngagementInvitation service method. - /// - /// The response from the GetEngagementInvitation service method, as returned by PartnerCentralSelling. - /// - /// This error occurs when you don't have permission to perform the requested action. - /// - /// - /// - /// - /// You don’t have access to this action or resource. Review IAM policies or contact your - /// AWS administrator for assistance. - /// - /// - /// - /// This error occurs when the specified resource can’t be found or doesn't exist. Resource - /// ID and type might be incorrect. - /// - /// - /// - /// Suggested action: This is usually a transient error. Retry after the provided retry - /// delay or a short interval. If the problem persists, contact AWS support. - /// - /// - /// - /// This error occurs when the specified resource can't be found. The resource might not - /// exist, or isn't visible with the current credentials. - /// - /// - /// - /// Suggested action: Verify that the resource ID is correct and the resource is in the - /// expected AWS region. Check IAM permissions for accessing the resource. - /// - /// - /// - /// This error occurs when there are too many requests sent. Review the provided quotas - /// and adapt your usage to avoid throttling. - /// - /// - /// - /// This error occurs when there are too many requests sent. Review the provided Quotas - /// and retry after the provided delay. - /// - /// - /// - /// The input fails to satisfy the constraints specified by the service or business validation - /// rules. - /// - /// - /// - /// Suggested action: Review the error message, including the failed fields and reasons, - /// to correct the request payload. - /// - /// - /// REST API Reference for GetEngagementInvitation Operation - public virtual GetEngagementInvitationResponse GetEngagementInvitation(GetEngagementInvitationRequest request) - { - var options = new InvokeOptions(); - options.RequestMarshaller = GetEngagementInvitationRequestMarshaller.Instance; - options.ResponseUnmarshaller = GetEngagementInvitationResponseUnmarshaller.Instance; - - return Invoke(request, options); - } - - /// - /// Initiates the asynchronous execution of the GetEngagementInvitation operation. - /// - /// - /// Container for the necessary parameters to execute the GetEngagementInvitation operation on AmazonPartnerCentralSellingClient. - /// An AsyncCallback delegate that is invoked when the operation completes. - /// A user-defined state object that is passed to the callback procedure. Retrieve this object from within the callback - /// procedure using the AsyncState property. - /// - /// An IAsyncResult that can be used to poll or wait for results, or both; this value is also needed when invoking EndGetEngagementInvitation - /// operation. - /// REST API Reference for GetEngagementInvitation Operation - public virtual IAsyncResult BeginGetEngagementInvitation(GetEngagementInvitationRequest request, AsyncCallback callback, object state) - { - var options = new InvokeOptions(); - options.RequestMarshaller = GetEngagementInvitationRequestMarshaller.Instance; - options.ResponseUnmarshaller = GetEngagementInvitationResponseUnmarshaller.Instance; - - return BeginInvoke(request, options, callback, state); - } - - /// - /// Finishes the asynchronous execution of the GetEngagementInvitation operation. - /// - /// - /// The IAsyncResult returned by the call to BeginGetEngagementInvitation. - /// - /// Returns a GetEngagementInvitationResult from PartnerCentralSelling. - /// REST API Reference for GetEngagementInvitation Operation - public virtual GetEngagementInvitationResponse EndGetEngagementInvitation(IAsyncResult asyncResult) - { - return EndInvoke(asyncResult); - } - - #endregion - - #region GetOpportunity - - /// - /// Fetches the Opportunity record from Partner Central by a given Identifier. - /// - /// - /// - /// - /// Use the ListOpportunities action or the event notification (from Amazon EventBridge) - /// to obtain this identifier. - /// - /// - /// Container for the necessary parameters to execute the GetOpportunity service method. - /// - /// The response from the GetOpportunity service method, as returned by PartnerCentralSelling. - /// - /// This error occurs when you don't have permission to perform the requested action. - /// - /// - /// - /// - /// You don’t have access to this action or resource. Review IAM policies or contact your - /// AWS administrator for assistance. - /// - /// - /// - /// This error occurs when the specified resource can’t be found or doesn't exist. Resource - /// ID and type might be incorrect. - /// - /// - /// - /// Suggested action: This is usually a transient error. Retry after the provided retry - /// delay or a short interval. If the problem persists, contact AWS support. - /// - /// - /// - /// This error occurs when the specified resource can't be found. The resource might not - /// exist, or isn't visible with the current credentials. - /// - /// - /// - /// Suggested action: Verify that the resource ID is correct and the resource is in the - /// expected AWS region. Check IAM permissions for accessing the resource. - /// - /// - /// - /// This error occurs when there are too many requests sent. Review the provided quotas - /// and adapt your usage to avoid throttling. - /// - /// - /// - /// This error occurs when there are too many requests sent. Review the provided Quotas - /// and retry after the provided delay. - /// - /// - /// - /// The input fails to satisfy the constraints specified by the service or business validation - /// rules. - /// - /// - /// - /// Suggested action: Review the error message, including the failed fields and reasons, - /// to correct the request payload. - /// - /// - /// REST API Reference for GetOpportunity Operation - public virtual GetOpportunityResponse GetOpportunity(GetOpportunityRequest request) - { - var options = new InvokeOptions(); - options.RequestMarshaller = GetOpportunityRequestMarshaller.Instance; - options.ResponseUnmarshaller = GetOpportunityResponseUnmarshaller.Instance; - - return Invoke(request, options); - } - - /// - /// Initiates the asynchronous execution of the GetOpportunity operation. - /// - /// - /// Container for the necessary parameters to execute the GetOpportunity operation on AmazonPartnerCentralSellingClient. - /// An AsyncCallback delegate that is invoked when the operation completes. - /// A user-defined state object that is passed to the callback procedure. Retrieve this object from within the callback - /// procedure using the AsyncState property. - /// - /// An IAsyncResult that can be used to poll or wait for results, or both; this value is also needed when invoking EndGetOpportunity - /// operation. - /// REST API Reference for GetOpportunity Operation - public virtual IAsyncResult BeginGetOpportunity(GetOpportunityRequest request, AsyncCallback callback, object state) - { - var options = new InvokeOptions(); - options.RequestMarshaller = GetOpportunityRequestMarshaller.Instance; - options.ResponseUnmarshaller = GetOpportunityResponseUnmarshaller.Instance; - - return BeginInvoke(request, options, callback, state); - } - - /// - /// Finishes the asynchronous execution of the GetOpportunity operation. - /// - /// - /// The IAsyncResult returned by the call to BeginGetOpportunity. - /// - /// Returns a GetOpportunityResult from PartnerCentralSelling. - /// REST API Reference for GetOpportunity Operation - public virtual GetOpportunityResponse EndGetOpportunity(IAsyncResult asyncResult) - { - return EndInvoke(asyncResult); - } - - #endregion - - #region ListEngagementInvitations - - /// - /// Retrieves a list of engagement invitations sent to the partner. This allows partners - /// to view all pending or past engagement invitations, helping them track opportunities - /// shared by AWS. - /// - /// Container for the necessary parameters to execute the ListEngagementInvitations service method. - /// - /// The response from the ListEngagementInvitations service method, as returned by PartnerCentralSelling. - /// - /// This error occurs when you don't have permission to perform the requested action. - /// - /// - /// - /// - /// You don’t have access to this action or resource. Review IAM policies or contact your - /// AWS administrator for assistance. - /// - /// - /// - /// This error occurs when the specified resource can’t be found or doesn't exist. Resource - /// ID and type might be incorrect. - /// - /// - /// - /// Suggested action: This is usually a transient error. Retry after the provided retry - /// delay or a short interval. If the problem persists, contact AWS support. - /// - /// - /// - /// This error occurs when the specified resource can't be found. The resource might not - /// exist, or isn't visible with the current credentials. - /// - /// - /// - /// Suggested action: Verify that the resource ID is correct and the resource is in the - /// expected AWS region. Check IAM permissions for accessing the resource. - /// - /// - /// - /// This error occurs when there are too many requests sent. Review the provided quotas - /// and adapt your usage to avoid throttling. - /// - /// - /// - /// This error occurs when there are too many requests sent. Review the provided Quotas - /// and retry after the provided delay. - /// - /// - /// - /// The input fails to satisfy the constraints specified by the service or business validation - /// rules. - /// - /// - /// - /// Suggested action: Review the error message, including the failed fields and reasons, - /// to correct the request payload. - /// - /// - /// REST API Reference for ListEngagementInvitations Operation - public virtual ListEngagementInvitationsResponse ListEngagementInvitations(ListEngagementInvitationsRequest request) - { - var options = new InvokeOptions(); - options.RequestMarshaller = ListEngagementInvitationsRequestMarshaller.Instance; - options.ResponseUnmarshaller = ListEngagementInvitationsResponseUnmarshaller.Instance; - - return Invoke(request, options); - } - - /// - /// Initiates the asynchronous execution of the ListEngagementInvitations operation. - /// - /// - /// Container for the necessary parameters to execute the ListEngagementInvitations operation on AmazonPartnerCentralSellingClient. - /// An AsyncCallback delegate that is invoked when the operation completes. - /// A user-defined state object that is passed to the callback procedure. Retrieve this object from within the callback - /// procedure using the AsyncState property. - /// - /// An IAsyncResult that can be used to poll or wait for results, or both; this value is also needed when invoking EndListEngagementInvitations - /// operation. - /// REST API Reference for ListEngagementInvitations Operation - public virtual IAsyncResult BeginListEngagementInvitations(ListEngagementInvitationsRequest request, AsyncCallback callback, object state) - { - var options = new InvokeOptions(); - options.RequestMarshaller = ListEngagementInvitationsRequestMarshaller.Instance; - options.ResponseUnmarshaller = ListEngagementInvitationsResponseUnmarshaller.Instance; - - return BeginInvoke(request, options, callback, state); - } - - /// - /// Finishes the asynchronous execution of the ListEngagementInvitations operation. - /// - /// - /// The IAsyncResult returned by the call to BeginListEngagementInvitations. - /// - /// Returns a ListEngagementInvitationsResult from PartnerCentralSelling. - /// REST API Reference for ListEngagementInvitations Operation - public virtual ListEngagementInvitationsResponse EndListEngagementInvitations(IAsyncResult asyncResult) - { - return EndInvoke(asyncResult); - } - - #endregion - - #region ListOpportunities - - /// - /// This request accepts a list of filters that retrieve opportunity subsets as well as - /// sort options. This feature is available to partners from Partner - /// Central using the ListOpportunities API action. - /// - /// - /// - /// To synchronize your system with Amazon Web Services, only list the opportunities that - /// were newly created or updated. We recommend you rely on events emitted by the service - /// into your Amazon Web Services account’s Amazon EventBridge default event bus, you - /// can also use the ListOpportunities action. - /// - /// - /// - /// We recommend the following approach: - /// - ///
    1. - /// - /// Find the latest LastModifiedDate that you stored, and only use the values that - /// came from Amazon Web Services. Don’t use values generated by your system. - /// - ///
    2. - /// - /// When you send a ListOpportunities request, submit the date in ISO 8601 format - /// in the AfterLastModifiedDate filter. - /// - ///
    3. - /// - /// Amazon Web Services only returns opportunities created or updated on or after that - /// date and time. Use NextToken to iterate over all pages. - /// - ///
    - ///     - /// Container for the necessary parameters to execute the ListOpportunities service method. - /// - /// The response from the ListOpportunities service method, as returned by PartnerCentralSelling. - /// - /// This error occurs when you don't have permission to perform the requested action. - /// - /// - /// - /// - /// You don’t have access to this action or resource. Review IAM policies or contact your - /// AWS administrator for assistance. - /// - /// - /// - /// This error occurs when the specified resource can’t be found or doesn't exist. Resource - /// ID and type might be incorrect. - /// - /// - /// - /// Suggested action: This is usually a transient error. Retry after the provided retry - /// delay or a short interval. If the problem persists, contact AWS support. - /// - /// - /// - /// This error occurs when the specified resource can't be found. The resource might not - /// exist, or isn't visible with the current credentials. - /// - /// - /// - /// Suggested action: Verify that the resource ID is correct and the resource is in the - /// expected AWS region. Check IAM permissions for accessing the resource. - /// - /// - /// - /// This error occurs when there are too many requests sent. Review the provided quotas - /// and adapt your usage to avoid throttling. - /// - /// - /// - /// This error occurs when there are too many requests sent. Review the provided Quotas - /// and retry after the provided delay. - /// - /// - /// - /// The input fails to satisfy the constraints specified by the service or business validation - /// rules. - /// - /// - /// - /// Suggested action: Review the error message, including the failed fields and reasons, - /// to correct the request payload. - /// - /// - /// REST API Reference for ListOpportunities Operation - public virtual ListOpportunitiesResponse ListOpportunities(ListOpportunitiesRequest request) - { - var options = new InvokeOptions(); - options.RequestMarshaller = ListOpportunitiesRequestMarshaller.Instance; - options.ResponseUnmarshaller = ListOpportunitiesResponseUnmarshaller.Instance; - - return Invoke(request, options); - } - - /// - /// Initiates the asynchronous execution of the ListOpportunities operation. - /// - /// - /// Container for the necessary parameters to execute the ListOpportunities operation on AmazonPartnerCentralSellingClient. - /// An AsyncCallback delegate that is invoked when the operation completes. - /// A user-defined state object that is passed to the callback procedure. Retrieve this object from within the callback - /// procedure using the AsyncState property. - /// - /// An IAsyncResult that can be used to poll or wait for results, or both; this value is also needed when invoking EndListOpportunities - /// operation. - /// REST API Reference for ListOpportunities Operation - public virtual IAsyncResult BeginListOpportunities(ListOpportunitiesRequest request, AsyncCallback callback, object state) - { - var options = new InvokeOptions(); - options.RequestMarshaller = ListOpportunitiesRequestMarshaller.Instance; - options.ResponseUnmarshaller = ListOpportunitiesResponseUnmarshaller.Instance; - - return BeginInvoke(request, options, callback, state); - } - - /// - /// Finishes the asynchronous execution of the ListOpportunities operation. - /// - /// - /// The IAsyncResult returned by the call to BeginListOpportunities. - /// - /// Returns a ListOpportunitiesResult from PartnerCentralSelling. - /// REST API Reference for ListOpportunities Operation - public virtual ListOpportunitiesResponse EndListOpportunities(IAsyncResult asyncResult) - { - return EndInvoke(asyncResult); - } - - #endregion - - #region ListSolutions - - /// - /// Retrieves a list of Partner Solutions that the partner registered on Partner Central. - /// This API is used to generate a list of solutions that an end user selects from for - /// association with an opportunity. - /// - /// Container for the necessary parameters to execute the ListSolutions service method. - /// - /// The response from the ListSolutions service method, as returned by PartnerCentralSelling. - /// - /// This error occurs when you don't have permission to perform the requested action. - /// - /// - /// - /// - /// You don’t have access to this action or resource. Review IAM policies or contact your - /// AWS administrator for assistance. - /// - /// - /// - /// This error occurs when the specified resource can’t be found or doesn't exist. Resource - /// ID and type might be incorrect. - /// - /// - /// - /// Suggested action: This is usually a transient error. Retry after the provided retry - /// delay or a short interval. If the problem persists, contact AWS support. - /// - /// - /// - /// This error occurs when the specified resource can't be found. The resource might not - /// exist, or isn't visible with the current credentials. - /// - /// - /// - /// Suggested action: Verify that the resource ID is correct and the resource is in the - /// expected AWS region. Check IAM permissions for accessing the resource. - /// - /// - /// - /// The input fails to satisfy the constraints specified by the service or business validation - /// rules. - /// - /// - /// - /// Suggested action: Review the error message, including the failed fields and reasons, - /// to correct the request payload. - /// - /// - /// REST API Reference for ListSolutions Operation - public virtual ListSolutionsResponse ListSolutions(ListSolutionsRequest request) - { - var options = new InvokeOptions(); - options.RequestMarshaller = ListSolutionsRequestMarshaller.Instance; - options.ResponseUnmarshaller = ListSolutionsResponseUnmarshaller.Instance; - - return Invoke(request, options); - } - - /// - /// Initiates the asynchronous execution of the ListSolutions operation. - /// - /// - /// Container for the necessary parameters to execute the ListSolutions operation on AmazonPartnerCentralSellingClient. - /// An AsyncCallback delegate that is invoked when the operation completes. - /// A user-defined state object that is passed to the callback procedure. Retrieve this object from within the callback - /// procedure using the AsyncState property. - /// - /// An IAsyncResult that can be used to poll or wait for results, or both; this value is also needed when invoking EndListSolutions - /// operation. - /// REST API Reference for ListSolutions Operation - public virtual IAsyncResult BeginListSolutions(ListSolutionsRequest request, AsyncCallback callback, object state) - { - var options = new InvokeOptions(); - options.RequestMarshaller = ListSolutionsRequestMarshaller.Instance; - options.ResponseUnmarshaller = ListSolutionsResponseUnmarshaller.Instance; - - return BeginInvoke(request, options, callback, state); - } - - /// - /// Finishes the asynchronous execution of the ListSolutions operation. - /// - /// - /// The IAsyncResult returned by the call to BeginListSolutions. - /// - /// Returns a ListSolutionsResult from PartnerCentralSelling. - /// REST API Reference for ListSolutions Operation - public virtual ListSolutionsResponse EndListSolutions(IAsyncResult asyncResult) - { - return EndInvoke(asyncResult); - } - - #endregion - - #region RejectEngagementInvitation - - /// - /// This action rejects an EngagementInvitation that AWS shared. Rejecting an invitation - /// indicates that the partner doesn't want to pursue the opportunity, and all related - /// data will become inaccessible thereafter. - /// - /// Container for the necessary parameters to execute the RejectEngagementInvitation service method. - /// - /// The response from the RejectEngagementInvitation service method, as returned by PartnerCentralSelling. - /// - /// This error occurs when you don't have permission to perform the requested action. - /// - /// - /// - /// - /// You don’t have access to this action or resource. Review IAM policies or contact your - /// AWS administrator for assistance. - /// - /// - /// - /// This error occurs when the specified resource can’t be found or doesn't exist. Resource - /// ID and type might be incorrect. - /// - /// - /// - /// Suggested action: This is usually a transient error. Retry after the provided retry - /// delay or a short interval. If the problem persists, contact AWS support. - /// - /// - /// - /// This error occurs when the specified resource can't be found. The resource might not - /// exist, or isn't visible with the current credentials. - /// - /// - /// - /// Suggested action: Verify that the resource ID is correct and the resource is in the - /// expected AWS region. Check IAM permissions for accessing the resource. - /// - /// - /// - /// This error occurs when there are too many requests sent. Review the provided quotas - /// and adapt your usage to avoid throttling. - /// - /// - /// - /// This error occurs when there are too many requests sent. Review the provided Quotas - /// and retry after the provided delay. - /// - /// - /// - /// The input fails to satisfy the constraints specified by the service or business validation - /// rules. - /// - /// - /// - /// Suggested action: Review the error message, including the failed fields and reasons, - /// to correct the request payload. - /// - /// - /// REST API Reference for RejectEngagementInvitation Operation - public virtual RejectEngagementInvitationResponse RejectEngagementInvitation(RejectEngagementInvitationRequest request) - { - var options = new InvokeOptions(); - options.RequestMarshaller = RejectEngagementInvitationRequestMarshaller.Instance; - options.ResponseUnmarshaller = RejectEngagementInvitationResponseUnmarshaller.Instance; - - return Invoke(request, options); - } - - /// - /// Initiates the asynchronous execution of the RejectEngagementInvitation operation. - /// - /// - /// Container for the necessary parameters to execute the RejectEngagementInvitation operation on AmazonPartnerCentralSellingClient. - /// An AsyncCallback delegate that is invoked when the operation completes. - /// A user-defined state object that is passed to the callback procedure. Retrieve this object from within the callback - /// procedure using the AsyncState property. - /// - /// An IAsyncResult that can be used to poll or wait for results, or both; this value is also needed when invoking EndRejectEngagementInvitation - /// operation. - /// REST API Reference for RejectEngagementInvitation Operation - public virtual IAsyncResult BeginRejectEngagementInvitation(RejectEngagementInvitationRequest request, AsyncCallback callback, object state) - { - var options = new InvokeOptions(); - options.RequestMarshaller = RejectEngagementInvitationRequestMarshaller.Instance; - options.ResponseUnmarshaller = RejectEngagementInvitationResponseUnmarshaller.Instance; - - return BeginInvoke(request, options, callback, state); - } - - /// - /// Finishes the asynchronous execution of the RejectEngagementInvitation operation. - /// - /// - /// The IAsyncResult returned by the call to BeginRejectEngagementInvitation. - /// - /// Returns a RejectEngagementInvitationResult from PartnerCentralSelling. - /// REST API Reference for RejectEngagementInvitation Operation - public virtual RejectEngagementInvitationResponse EndRejectEngagementInvitation(IAsyncResult asyncResult) - { - return EndInvoke(asyncResult); - } - - #endregion - - #region StartEngagementByAcceptingInvitationTask - - /// - /// This action starts the engagement by accepting an EngagementInvitation. The - /// task is asynchronous and involves the following steps: accepting the invitation, creating - /// an opportunity in the partner’s account from the AWS opportunity, and copying details - /// for tracking. When completed, an Opportunity Created event is generated, indicating - /// that the opportunity has been successfully created in the partner's account. - /// - /// Container for the necessary parameters to execute the StartEngagementByAcceptingInvitationTask service method. - /// - /// The response from the StartEngagementByAcceptingInvitationTask service method, as returned by PartnerCentralSelling. - /// - /// This error occurs when you don't have permission to perform the requested action. - /// - /// - /// - /// - /// You don’t have access to this action or resource. Review IAM policies or contact your - /// AWS administrator for assistance. - /// - /// - /// - /// This error occurs when the request can’t be processed due to a conflict with the target - /// resource's current state, which could result from updating or deleting the resource. - /// - /// - /// - /// - /// Suggested action: Fetch the latest state of the resource, verify the state, and retry - /// the request. - /// - /// - /// - /// This error occurs when the specified resource can’t be found or doesn't exist. Resource - /// ID and type might be incorrect. - /// - /// - /// - /// Suggested action: This is usually a transient error. Retry after the provided retry - /// delay or a short interval. If the problem persists, contact AWS support. - /// - /// - /// - /// This error occurs when the specified resource can't be found. The resource might not - /// exist, or isn't visible with the current credentials. - /// - /// - /// - /// Suggested action: Verify that the resource ID is correct and the resource is in the - /// expected AWS region. Check IAM permissions for accessing the resource. - /// - /// - /// - /// This error occurs when the request would cause a service quota to be exceeded. Service - /// quotas represent the maximum allowed use of a specific resource, and this error indicates - /// that the request would surpass that limit. - /// - /// - /// - /// Suggested action: Review the Quotas - /// for the resource, and either reduce usage or request a quota increase. - /// - /// - /// - /// This error occurs when there are too many requests sent. Review the provided quotas - /// and adapt your usage to avoid throttling. - /// - /// - /// - /// This error occurs when there are too many requests sent. Review the provided Quotas - /// and retry after the provided delay. - /// - /// - /// - /// The input fails to satisfy the constraints specified by the service or business validation - /// rules. - /// - /// - /// - /// Suggested action: Review the error message, including the failed fields and reasons, - /// to correct the request payload. - /// - /// - /// REST API Reference for StartEngagementByAcceptingInvitationTask Operation - public virtual StartEngagementByAcceptingInvitationTaskResponse StartEngagementByAcceptingInvitationTask(StartEngagementByAcceptingInvitationTaskRequest request) - { - var options = new InvokeOptions(); - options.RequestMarshaller = StartEngagementByAcceptingInvitationTaskRequestMarshaller.Instance; - options.ResponseUnmarshaller = StartEngagementByAcceptingInvitationTaskResponseUnmarshaller.Instance; - - return Invoke(request, options); - } - - /// - /// Initiates the asynchronous execution of the StartEngagementByAcceptingInvitationTask operation. - /// - /// - /// Container for the necessary parameters to execute the StartEngagementByAcceptingInvitationTask operation on AmazonPartnerCentralSellingClient. - /// An AsyncCallback delegate that is invoked when the operation completes. - /// A user-defined state object that is passed to the callback procedure. Retrieve this object from within the callback - /// procedure using the AsyncState property. - /// - /// An IAsyncResult that can be used to poll or wait for results, or both; this value is also needed when invoking EndStartEngagementByAcceptingInvitationTask - /// operation. - /// REST API Reference for StartEngagementByAcceptingInvitationTask Operation - public virtual IAsyncResult BeginStartEngagementByAcceptingInvitationTask(StartEngagementByAcceptingInvitationTaskRequest request, AsyncCallback callback, object state) - { - var options = new InvokeOptions(); - options.RequestMarshaller = StartEngagementByAcceptingInvitationTaskRequestMarshaller.Instance; - options.ResponseUnmarshaller = StartEngagementByAcceptingInvitationTaskResponseUnmarshaller.Instance; - - return BeginInvoke(request, options, callback, state); - } - - /// - /// Finishes the asynchronous execution of the StartEngagementByAcceptingInvitationTask operation. - /// - /// - /// The IAsyncResult returned by the call to BeginStartEngagementByAcceptingInvitationTask. - /// - /// Returns a StartEngagementByAcceptingInvitationTaskResult from PartnerCentralSelling. - /// REST API Reference for StartEngagementByAcceptingInvitationTask Operation - public virtual StartEngagementByAcceptingInvitationTaskResponse EndStartEngagementByAcceptingInvitationTask(IAsyncResult asyncResult) - { - return EndInvoke(asyncResult); - } - - #endregion - - #region StartEngagementFromOpportunityTask - - /// - /// This action initiates the engagement process from an existing opportunity by accepting - /// the engagement invitation and creating a corresponding opportunity in the partner’s - /// system. Similar to StartEngagementByAcceptingInvitationTask, this action is - /// asynchronous and performs multiple steps before completion. - /// - /// Container for the necessary parameters to execute the StartEngagementFromOpportunityTask service method. - /// - /// The response from the StartEngagementFromOpportunityTask service method, as returned by PartnerCentralSelling. - /// - /// This error occurs when you don't have permission to perform the requested action. - /// - /// - /// - /// - /// You don’t have access to this action or resource. Review IAM policies or contact your - /// AWS administrator for assistance. - /// - /// - /// - /// This error occurs when the request can’t be processed due to a conflict with the target - /// resource's current state, which could result from updating or deleting the resource. - /// - /// - /// - /// - /// Suggested action: Fetch the latest state of the resource, verify the state, and retry - /// the request. - /// - /// - /// - /// This error occurs when the specified resource can’t be found or doesn't exist. Resource - /// ID and type might be incorrect. - /// - /// - /// - /// Suggested action: This is usually a transient error. Retry after the provided retry - /// delay or a short interval. If the problem persists, contact AWS support. - /// - /// - /// - /// This error occurs when the specified resource can't be found. The resource might not - /// exist, or isn't visible with the current credentials. - /// - /// - /// - /// Suggested action: Verify that the resource ID is correct and the resource is in the - /// expected AWS region. Check IAM permissions for accessing the resource. - /// - /// - /// - /// This error occurs when the request would cause a service quota to be exceeded. Service - /// quotas represent the maximum allowed use of a specific resource, and this error indicates - /// that the request would surpass that limit. - /// - /// - /// - /// Suggested action: Review the Quotas - /// for the resource, and either reduce usage or request a quota increase. - /// - /// - /// - /// This error occurs when there are too many requests sent. Review the provided quotas - /// and adapt your usage to avoid throttling. - /// - /// - /// - /// This error occurs when there are too many requests sent. Review the provided Quotas - /// and retry after the provided delay. - /// - /// - /// - /// The input fails to satisfy the constraints specified by the service or business validation - /// rules. - /// - /// - /// - /// Suggested action: Review the error message, including the failed fields and reasons, - /// to correct the request payload. - /// - /// - /// REST API Reference for StartEngagementFromOpportunityTask Operation - public virtual StartEngagementFromOpportunityTaskResponse StartEngagementFromOpportunityTask(StartEngagementFromOpportunityTaskRequest request) - { - var options = new InvokeOptions(); - options.RequestMarshaller = StartEngagementFromOpportunityTaskRequestMarshaller.Instance; - options.ResponseUnmarshaller = StartEngagementFromOpportunityTaskResponseUnmarshaller.Instance; - - return Invoke(request, options); - } - - /// - /// Initiates the asynchronous execution of the StartEngagementFromOpportunityTask operation. - /// - /// - /// Container for the necessary parameters to execute the StartEngagementFromOpportunityTask operation on AmazonPartnerCentralSellingClient. - /// An AsyncCallback delegate that is invoked when the operation completes. - /// A user-defined state object that is passed to the callback procedure. Retrieve this object from within the callback - /// procedure using the AsyncState property. - /// - /// An IAsyncResult that can be used to poll or wait for results, or both; this value is also needed when invoking EndStartEngagementFromOpportunityTask - /// operation. - /// REST API Reference for StartEngagementFromOpportunityTask Operation - public virtual IAsyncResult BeginStartEngagementFromOpportunityTask(StartEngagementFromOpportunityTaskRequest request, AsyncCallback callback, object state) - { - var options = new InvokeOptions(); - options.RequestMarshaller = StartEngagementFromOpportunityTaskRequestMarshaller.Instance; - options.ResponseUnmarshaller = StartEngagementFromOpportunityTaskResponseUnmarshaller.Instance; - - return BeginInvoke(request, options, callback, state); - } - - /// - /// Finishes the asynchronous execution of the StartEngagementFromOpportunityTask operation. - /// - /// - /// The IAsyncResult returned by the call to BeginStartEngagementFromOpportunityTask. - /// - /// Returns a StartEngagementFromOpportunityTaskResult from PartnerCentralSelling. - /// REST API Reference for StartEngagementFromOpportunityTask Operation - public virtual StartEngagementFromOpportunityTaskResponse EndStartEngagementFromOpportunityTask(IAsyncResult asyncResult) - { - return EndInvoke(asyncResult); - } - - #endregion - - #region UpdateOpportunity - - /// - /// Updates the Opportunity record identified by a given Identifier. This - /// operation allows you to modify the details of an existing opportunity to reflect the - /// latest information and progress. Use this action to keep the opportunity record up-to-date - /// and accurate. - /// - /// - /// - /// When you perform updates, include the entire payload with each request. If any field - /// is omitted, the API assumes that the field is set to null. The best practice - /// is to always perform a GetOpportunity to retrieve the latest values, then send - /// the complete payload with the updated values to be changed. - /// - /// - /// Container for the necessary parameters to execute the UpdateOpportunity service method. - /// - /// The response from the UpdateOpportunity service method, as returned by PartnerCentralSelling. - /// - /// This error occurs when you don't have permission to perform the requested action. - /// - /// - /// - /// - /// You don’t have access to this action or resource. Review IAM policies or contact your - /// AWS administrator for assistance. - /// - /// - /// - /// This error occurs when the request can’t be processed due to a conflict with the target - /// resource's current state, which could result from updating or deleting the resource. - /// - /// - /// - /// - /// Suggested action: Fetch the latest state of the resource, verify the state, and retry - /// the request. - /// - /// - /// - /// This error occurs when the specified resource can’t be found or doesn't exist. Resource - /// ID and type might be incorrect. - /// - /// - /// - /// Suggested action: This is usually a transient error. Retry after the provided retry - /// delay or a short interval. If the problem persists, contact AWS support. - /// - /// - /// - /// This error occurs when the specified resource can't be found. The resource might not - /// exist, or isn't visible with the current credentials. - /// - /// - /// - /// Suggested action: Verify that the resource ID is correct and the resource is in the - /// expected AWS region. Check IAM permissions for accessing the resource. - /// - /// - /// - /// This error occurs when there are too many requests sent. Review the provided quotas - /// and adapt your usage to avoid throttling. - /// - /// - /// - /// This error occurs when there are too many requests sent. Review the provided Quotas - /// and retry after the provided delay. - /// - /// - /// - /// The input fails to satisfy the constraints specified by the service or business validation - /// rules. - /// - /// - /// - /// Suggested action: Review the error message, including the failed fields and reasons, - /// to correct the request payload. - /// - /// - /// REST API Reference for UpdateOpportunity Operation - public virtual UpdateOpportunityResponse UpdateOpportunity(UpdateOpportunityRequest request) - { - var options = new InvokeOptions(); - options.RequestMarshaller = UpdateOpportunityRequestMarshaller.Instance; - options.ResponseUnmarshaller = UpdateOpportunityResponseUnmarshaller.Instance; - - return Invoke(request, options); - } - - /// - /// Initiates the asynchronous execution of the UpdateOpportunity operation. - /// - /// - /// Container for the necessary parameters to execute the UpdateOpportunity operation on AmazonPartnerCentralSellingClient. - /// An AsyncCallback delegate that is invoked when the operation completes. - /// A user-defined state object that is passed to the callback procedure. Retrieve this object from within the callback - /// procedure using the AsyncState property. - /// - /// An IAsyncResult that can be used to poll or wait for results, or both; this value is also needed when invoking EndUpdateOpportunity - /// operation. - /// REST API Reference for UpdateOpportunity Operation - public virtual IAsyncResult BeginUpdateOpportunity(UpdateOpportunityRequest request, AsyncCallback callback, object state) - { - var options = new InvokeOptions(); - options.RequestMarshaller = UpdateOpportunityRequestMarshaller.Instance; - options.ResponseUnmarshaller = UpdateOpportunityResponseUnmarshaller.Instance; - - return BeginInvoke(request, options, callback, state); - } - - /// - /// Finishes the asynchronous execution of the UpdateOpportunity operation. - /// - /// - /// The IAsyncResult returned by the call to BeginUpdateOpportunity. - /// - /// Returns a UpdateOpportunityResult from PartnerCentralSelling. - /// REST API Reference for UpdateOpportunity Operation - public virtual UpdateOpportunityResponse EndUpdateOpportunity(IAsyncResult asyncResult) - { - return EndInvoke(asyncResult); - } - - #endregion - - #region DetermineServiceOperationEndpoint - - /// - /// Returns the endpoint that will be used for a particular request. - /// - /// Request for the desired service operation. - /// The resolved endpoint for the given request. - public Amazon.Runtime.Endpoints.Endpoint DetermineServiceOperationEndpoint(AmazonWebServiceRequest request) - { - var requestContext = new Amazon.Runtime.Internal.RequestContext(false, CreateSigner()) - { - ClientConfig = Config, - OriginalRequest = request, - Request = new Amazon.Runtime.Internal.DefaultRequest(request, ServiceMetadata.ServiceId) - }; - - var executionContext = new Amazon.Runtime.Internal.ExecutionContext(requestContext, null); - var resolver = new AmazonPartnerCentralSellingEndpointResolver(); - return resolver.GetEndpoint(executionContext); - } - - #endregion - - } -} \ No newline at end of file diff --git a/sdk/src/Services/PartnerCentralSelling/Generated/_bcl35/IAmazonPartnerCentralSelling.cs b/sdk/src/Services/PartnerCentralSelling/Generated/_bcl35/IAmazonPartnerCentralSelling.cs deleted file mode 100644 index 3bb99862eb22..000000000000 --- a/sdk/src/Services/PartnerCentralSelling/Generated/_bcl35/IAmazonPartnerCentralSelling.cs +++ /dev/null @@ -1,1604 +0,0 @@ -/* - * 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. - */ - -/* - * Do not modify this file. This file is generated from the partnercentral-selling-2022-07-26.normal.json service model. - */ - - -using System; -using System.Collections.Generic; - -using Amazon.Runtime; -using Amazon.PartnerCentralSelling.Model; - -#pragma warning disable CS1570 -namespace Amazon.PartnerCentralSelling -{ - /// - /// Interface for accessing PartnerCentralSelling - /// - /// AWS Partner Central API for Selling - /// - /// AWS Partner Central API for Selling Reference Guide - /// - /// - /// - /// This Amazon Web Services (AWS) Partner Central API reference is designed to help AWS Partners integrate Customer - /// Relationship Management (CRM) systems with AWS Partner Central. Partners can automate - /// interactions with AWS Partner Central, which helps to ensure effective engagements - /// in joint business activities. - /// - /// - /// - /// The API provides standard AWS API functionality. Access it by either using API Actions - /// or by using an AWS SDK that's tailored to your programming language or platform. For - /// more information, see Getting Started - /// with AWS and Tools to Build on - /// AWS. - /// - /// - /// - /// Features offered by AWS Partner Central API - /// - ///
    1. - /// - /// Opportunity management: Manages coselling opportunities through API actions - /// such as CreateOpportunity, UpdateOpportunity, ListOpportunities, - /// GetOpportunity, and AssignOpportunity. - /// - ///
    2. - /// - /// AWS referral management: Manages referrals shared by AWS using actions such - /// as ListEngagementInvitations, GetEngagementInvitation, StartEngagementByAcceptingInvitation, - /// and RejectEngagementInvitation. - /// - ///
    3. - /// - /// Entity association: Associates related entities such as AWS Products, - /// Partner Solutions, and AWS Marketplace Private Offers with opportunities - /// using the actions AssociateOpportunity, and DisassociateOpportunity. - /// - ///
    4. - /// - /// View AWS opportunity details: Retrieves real-time summaries of AWS opportunities - /// using the GetAWSOpportunitySummary action. - /// - ///
    5. - /// - /// List solutions: Provides list APIs for listing partner offers using ListSolutions. - /// - ///
    6. - /// - /// Event subscription: Subscribe to real-time opportunity updates through AWS - /// EventBridge by using actions such as Opportunity Created, Opportunity Updated, - /// Engagement Invitation Accepted, Engagement Invitation Rejected, and - /// Engagement Invitation Created. - /// - ///
    - ///     - ///     - public partial interface IAmazonPartnerCentralSelling : IAmazonService, IDisposable - { - - -#if BCL45 || AWS_ASYNC_ENUMERABLES_API - /// - /// Paginators for the service - /// - IPartnerCentralSellingPaginatorFactory Paginators { get; } -#endif - - - - #region AssignOpportunity - - - /// - /// Enables you to reassign an existing Opportunity to another user within your - /// Partner Central account. The specified user receives the opportunity, and it appears - /// on their Partner Central dashboard, allowing them to take necessary actions or proceed - /// with the opportunity. - /// - /// - /// - /// This is useful for distributing opportunities to the appropriate team members or - /// departments within your organization, ensuring that each opportunity is handled by - /// the right person. By default, the opportunity owner is the one who creates it. Currently, - /// there's no API to enumerate the list of available users. - /// - /// - /// Container for the necessary parameters to execute the AssignOpportunity service method. - /// - /// The response from the AssignOpportunity service method, as returned by PartnerCentralSelling. - /// - /// This error occurs when you don't have permission to perform the requested action. - /// - /// - /// - /// - /// You don’t have access to this action or resource. Review IAM policies or contact your - /// AWS administrator for assistance. - /// - /// - /// - /// This error occurs when the specified resource can’t be found or doesn't exist. Resource - /// ID and type might be incorrect. - /// - /// - /// - /// Suggested action: This is usually a transient error. Retry after the provided retry - /// delay or a short interval. If the problem persists, contact AWS support. - /// - /// - /// - /// This error occurs when the specified resource can't be found. The resource might not - /// exist, or isn't visible with the current credentials. - /// - /// - /// - /// Suggested action: Verify that the resource ID is correct and the resource is in the - /// expected AWS region. Check IAM permissions for accessing the resource. - /// - /// - /// - /// This error occurs when there are too many requests sent. Review the provided quotas - /// and adapt your usage to avoid throttling. - /// - /// - /// - /// This error occurs when there are too many requests sent. Review the provided Quotas - /// and retry after the provided delay. - /// - /// - /// - /// The input fails to satisfy the constraints specified by the service or business validation - /// rules. - /// - /// - /// - /// Suggested action: Review the error message, including the failed fields and reasons, - /// to correct the request payload. - /// - /// - /// REST API Reference for AssignOpportunity Operation - AssignOpportunityResponse AssignOpportunity(AssignOpportunityRequest request); - - /// - /// Initiates the asynchronous execution of the AssignOpportunity operation. - /// - /// - /// Container for the necessary parameters to execute the AssignOpportunity operation on AmazonPartnerCentralSellingClient. - /// An AsyncCallback delegate that is invoked when the operation completes. - /// A user-defined state object that is passed to the callback procedure. Retrieve this object from within the callback - /// procedure using the AsyncState property. - /// - /// An IAsyncResult that can be used to poll or wait for results, or both; this value is also needed when invoking EndAssignOpportunity - /// operation. - /// REST API Reference for AssignOpportunity Operation - IAsyncResult BeginAssignOpportunity(AssignOpportunityRequest request, AsyncCallback callback, object state); - - - - /// - /// Finishes the asynchronous execution of the AssignOpportunity operation. - /// - /// - /// The IAsyncResult returned by the call to BeginAssignOpportunity. - /// - /// Returns a AssignOpportunityResult from PartnerCentralSelling. - /// REST API Reference for AssignOpportunity Operation - AssignOpportunityResponse EndAssignOpportunity(IAsyncResult asyncResult); - - #endregion - - #region AssociateOpportunity - - - /// - /// Enables you to create a formal association between an Opportunity and various - /// related entities, enriching the context and details of the opportunity for better - /// collaboration and decision making. You can associate an opportunity with the following - /// entity types: - /// - ///
    • - /// - /// Partner Solution: A software product or consulting practice created and delivered - /// by Partners. Partner Solutions help customers address business challenges using Amazon - /// Web Services services. - /// - ///
    • - /// - /// Amazon Web Services Products: Amazon Web Services offers many products and services - /// that provide scalable, reliable, and cost-effective infrastructure solutions. For - /// the latest list of Amazon Web Services products, see Amazon - /// Web Services products. - /// - ///
    • - /// - /// Amazon Web Services Marketplace private offer: Allows Amazon Web Services Marketplace - /// sellers to extend custom pricing and terms to individual Amazon Web Services customers. - /// Sellers can negotiate custom prices, payment schedules, and end user license terms - /// through private offers, enabling Amazon Web Services customers to acquire software - /// solutions tailored to their specific needs. For more information, see Private - /// offers in Amazon Web Services Marketplace. - /// - ///
    - /// - /// To obtain identifiers for these entities, use the following methods: - /// - ///
    • - /// - /// Solution: Use the ListSolutions operation. - /// - ///
    • - /// - /// AWS Products: For the latest list of Amazon Web Services products, see Amazon - /// Web Services products. - /// - ///
    • - /// - /// Amazon Web Services Marketplace private offer: Use the Using - /// the Amazon Web Services Marketplace Catalog API to list entities. Specifically, - /// use the ListEntities operation to retrieve a list of private offers. The request - /// returns the details of available private offers. For more information, see ListEntities. - /// - /// - ///
    - ///     - /// Container for the necessary parameters to execute the AssociateOpportunity service method. - /// - /// The response from the AssociateOpportunity service method, as returned by PartnerCentralSelling. - /// - /// This error occurs when you don't have permission to perform the requested action. - /// - /// - /// - /// - /// You don’t have access to this action or resource. Review IAM policies or contact your - /// AWS administrator for assistance. - /// - /// - /// - /// This error occurs when the specified resource can’t be found or doesn't exist. Resource - /// ID and type might be incorrect. - /// - /// - /// - /// Suggested action: This is usually a transient error. Retry after the provided retry - /// delay or a short interval. If the problem persists, contact AWS support. - /// - /// - /// - /// This error occurs when the specified resource can't be found. The resource might not - /// exist, or isn't visible with the current credentials. - /// - /// - /// - /// Suggested action: Verify that the resource ID is correct and the resource is in the - /// expected AWS region. Check IAM permissions for accessing the resource. - /// - /// - /// - /// This error occurs when there are too many requests sent. Review the provided quotas - /// and adapt your usage to avoid throttling. - /// - /// - /// - /// This error occurs when there are too many requests sent. Review the provided Quotas - /// and retry after the provided delay. - /// - /// - /// - /// The input fails to satisfy the constraints specified by the service or business validation - /// rules. - /// - /// - /// - /// Suggested action: Review the error message, including the failed fields and reasons, - /// to correct the request payload. - /// - /// - /// REST API Reference for AssociateOpportunity Operation - AssociateOpportunityResponse AssociateOpportunity(AssociateOpportunityRequest request); - - /// - /// Initiates the asynchronous execution of the AssociateOpportunity operation. - /// - /// - /// Container for the necessary parameters to execute the AssociateOpportunity operation on AmazonPartnerCentralSellingClient. - /// An AsyncCallback delegate that is invoked when the operation completes. - /// A user-defined state object that is passed to the callback procedure. Retrieve this object from within the callback - /// procedure using the AsyncState property. - /// - /// An IAsyncResult that can be used to poll or wait for results, or both; this value is also needed when invoking EndAssociateOpportunity - /// operation. - /// REST API Reference for AssociateOpportunity Operation - IAsyncResult BeginAssociateOpportunity(AssociateOpportunityRequest request, AsyncCallback callback, object state); - - - - /// - /// Finishes the asynchronous execution of the AssociateOpportunity operation. - /// - /// - /// The IAsyncResult returned by the call to BeginAssociateOpportunity. - /// - /// Returns a AssociateOpportunityResult from PartnerCentralSelling. - /// REST API Reference for AssociateOpportunity Operation - AssociateOpportunityResponse EndAssociateOpportunity(IAsyncResult asyncResult); - - #endregion - - #region CreateOpportunity - - - /// - /// Creates an Opportunity record in Partner Central. Use this operation to create - /// a potential business opportunity for submission to Amazon Web Services. Creating an - /// opportunity sets Lifecycle.ReviewStatus to Pending Submission. - /// - /// - /// - /// To submit an opportunity, follow these steps: - /// - ///
    1. - /// - /// To create the opportunity, use CreateOpportunity. - /// - ///
    2. - /// - /// To associate a solution with the opportunity, use AssociateOpportunity. - /// - ///
    3. - /// - /// To submit the opportunity, use StartEngagementFromOpportunityTask. - /// - ///
    - /// - /// After submission, you can't edit the opportunity until the review is complete. But - /// opportunities in the Pending Submission state must have complete details. You - /// can update the opportunity while it's in the Pending Submission state. - /// - /// - /// - /// There's a set of mandatory fields to create opportunities, but consider providing - /// optional fields to enrich the opportunity record. - /// - ///     - /// Container for the necessary parameters to execute the CreateOpportunity service method. - /// - /// The response from the CreateOpportunity service method, as returned by PartnerCentralSelling. - /// - /// This error occurs when you don't have permission to perform the requested action. - /// - /// - /// - /// - /// You don’t have access to this action or resource. Review IAM policies or contact your - /// AWS administrator for assistance. - /// - /// - /// - /// This error occurs when the request can’t be processed due to a conflict with the target - /// resource's current state, which could result from updating or deleting the resource. - /// - /// - /// - /// - /// Suggested action: Fetch the latest state of the resource, verify the state, and retry - /// the request. - /// - /// - /// - /// This error occurs when the specified resource can’t be found or doesn't exist. Resource - /// ID and type might be incorrect. - /// - /// - /// - /// Suggested action: This is usually a transient error. Retry after the provided retry - /// delay or a short interval. If the problem persists, contact AWS support. - /// - /// - /// - /// This error occurs when the specified resource can't be found. The resource might not - /// exist, or isn't visible with the current credentials. - /// - /// - /// - /// Suggested action: Verify that the resource ID is correct and the resource is in the - /// expected AWS region. Check IAM permissions for accessing the resource. - /// - /// - /// - /// This error occurs when there are too many requests sent. Review the provided quotas - /// and adapt your usage to avoid throttling. - /// - /// - /// - /// This error occurs when there are too many requests sent. Review the provided Quotas - /// and retry after the provided delay. - /// - /// - /// - /// The input fails to satisfy the constraints specified by the service or business validation - /// rules. - /// - /// - /// - /// Suggested action: Review the error message, including the failed fields and reasons, - /// to correct the request payload. - /// - /// - /// REST API Reference for CreateOpportunity Operation - CreateOpportunityResponse CreateOpportunity(CreateOpportunityRequest request); - - /// - /// Initiates the asynchronous execution of the CreateOpportunity operation. - /// - /// - /// Container for the necessary parameters to execute the CreateOpportunity operation on AmazonPartnerCentralSellingClient. - /// An AsyncCallback delegate that is invoked when the operation completes. - /// A user-defined state object that is passed to the callback procedure. Retrieve this object from within the callback - /// procedure using the AsyncState property. - /// - /// An IAsyncResult that can be used to poll or wait for results, or both; this value is also needed when invoking EndCreateOpportunity - /// operation. - /// REST API Reference for CreateOpportunity Operation - IAsyncResult BeginCreateOpportunity(CreateOpportunityRequest request, AsyncCallback callback, object state); - - - - /// - /// Finishes the asynchronous execution of the CreateOpportunity operation. - /// - /// - /// The IAsyncResult returned by the call to BeginCreateOpportunity. - /// - /// Returns a CreateOpportunityResult from PartnerCentralSelling. - /// REST API Reference for CreateOpportunity Operation - CreateOpportunityResponse EndCreateOpportunity(IAsyncResult asyncResult); - - #endregion - - #region DisassociateOpportunity - - - /// - /// Allows you to remove an existing association between an Opportunity and related - /// entities, such as a Partner Solution, Amazon Web Services product, or an Amazon Web - /// Services Marketplace offer. This operation is the counterpart to AssociateOpportunity, - /// and it provides flexibility to manage associations as business needs change. - /// - /// - /// - /// Use this operation to update the associations of an Opportunity due to changes - /// in the related entities, or if an association was made in error. Ensuring accurate - /// associations helps maintain clarity and accuracy to track and manage business opportunities. - /// When you replace an entity, first attach the new entity and then disassociate the - /// one to be removed, especially if it's the last remaining entity that's required. - /// - /// - /// Container for the necessary parameters to execute the DisassociateOpportunity service method. - /// - /// The response from the DisassociateOpportunity service method, as returned by PartnerCentralSelling. - /// - /// This error occurs when you don't have permission to perform the requested action. - /// - /// - /// - /// - /// You don’t have access to this action or resource. Review IAM policies or contact your - /// AWS administrator for assistance. - /// - /// - /// - /// This error occurs when the specified resource can’t be found or doesn't exist. Resource - /// ID and type might be incorrect. - /// - /// - /// - /// Suggested action: This is usually a transient error. Retry after the provided retry - /// delay or a short interval. If the problem persists, contact AWS support. - /// - /// - /// - /// This error occurs when the specified resource can't be found. The resource might not - /// exist, or isn't visible with the current credentials. - /// - /// - /// - /// Suggested action: Verify that the resource ID is correct and the resource is in the - /// expected AWS region. Check IAM permissions for accessing the resource. - /// - /// - /// - /// This error occurs when there are too many requests sent. Review the provided quotas - /// and adapt your usage to avoid throttling. - /// - /// - /// - /// This error occurs when there are too many requests sent. Review the provided Quotas - /// and retry after the provided delay. - /// - /// - /// - /// The input fails to satisfy the constraints specified by the service or business validation - /// rules. - /// - /// - /// - /// Suggested action: Review the error message, including the failed fields and reasons, - /// to correct the request payload. - /// - /// - /// REST API Reference for DisassociateOpportunity Operation - DisassociateOpportunityResponse DisassociateOpportunity(DisassociateOpportunityRequest request); - - /// - /// Initiates the asynchronous execution of the DisassociateOpportunity operation. - /// - /// - /// Container for the necessary parameters to execute the DisassociateOpportunity operation on AmazonPartnerCentralSellingClient. - /// An AsyncCallback delegate that is invoked when the operation completes. - /// A user-defined state object that is passed to the callback procedure. Retrieve this object from within the callback - /// procedure using the AsyncState property. - /// - /// An IAsyncResult that can be used to poll or wait for results, or both; this value is also needed when invoking EndDisassociateOpportunity - /// operation. - /// REST API Reference for DisassociateOpportunity Operation - IAsyncResult BeginDisassociateOpportunity(DisassociateOpportunityRequest request, AsyncCallback callback, object state); - - - - /// - /// Finishes the asynchronous execution of the DisassociateOpportunity operation. - /// - /// - /// The IAsyncResult returned by the call to BeginDisassociateOpportunity. - /// - /// Returns a DisassociateOpportunityResult from PartnerCentralSelling. - /// REST API Reference for DisassociateOpportunity Operation - DisassociateOpportunityResponse EndDisassociateOpportunity(IAsyncResult asyncResult); - - #endregion - - #region GetAwsOpportunitySummary - - - /// - /// Retrieves a summary of an AWS Opportunity. This summary includes high-level details - /// about the opportunity sourced from AWS, such as lifecycle information, customer details, - /// and involvement type. It is useful for tracking updates on the AWS opportunity corresponding - /// to an opportunity in the partner's account. - /// - /// Container for the necessary parameters to execute the GetAwsOpportunitySummary service method. - /// - /// The response from the GetAwsOpportunitySummary service method, as returned by PartnerCentralSelling. - /// - /// This error occurs when you don't have permission to perform the requested action. - /// - /// - /// - /// - /// You don’t have access to this action or resource. Review IAM policies or contact your - /// AWS administrator for assistance. - /// - /// - /// - /// This error occurs when the specified resource can’t be found or doesn't exist. Resource - /// ID and type might be incorrect. - /// - /// - /// - /// Suggested action: This is usually a transient error. Retry after the provided retry - /// delay or a short interval. If the problem persists, contact AWS support. - /// - /// - /// - /// This error occurs when the specified resource can't be found. The resource might not - /// exist, or isn't visible with the current credentials. - /// - /// - /// - /// Suggested action: Verify that the resource ID is correct and the resource is in the - /// expected AWS region. Check IAM permissions for accessing the resource. - /// - /// - /// - /// This error occurs when there are too many requests sent. Review the provided quotas - /// and adapt your usage to avoid throttling. - /// - /// - /// - /// This error occurs when there are too many requests sent. Review the provided Quotas - /// and retry after the provided delay. - /// - /// - /// - /// The input fails to satisfy the constraints specified by the service or business validation - /// rules. - /// - /// - /// - /// Suggested action: Review the error message, including the failed fields and reasons, - /// to correct the request payload. - /// - /// - /// REST API Reference for GetAwsOpportunitySummary Operation - GetAwsOpportunitySummaryResponse GetAwsOpportunitySummary(GetAwsOpportunitySummaryRequest request); - - /// - /// Initiates the asynchronous execution of the GetAwsOpportunitySummary operation. - /// - /// - /// Container for the necessary parameters to execute the GetAwsOpportunitySummary operation on AmazonPartnerCentralSellingClient. - /// An AsyncCallback delegate that is invoked when the operation completes. - /// A user-defined state object that is passed to the callback procedure. Retrieve this object from within the callback - /// procedure using the AsyncState property. - /// - /// An IAsyncResult that can be used to poll or wait for results, or both; this value is also needed when invoking EndGetAwsOpportunitySummary - /// operation. - /// REST API Reference for GetAwsOpportunitySummary Operation - IAsyncResult BeginGetAwsOpportunitySummary(GetAwsOpportunitySummaryRequest request, AsyncCallback callback, object state); - - - - /// - /// Finishes the asynchronous execution of the GetAwsOpportunitySummary operation. - /// - /// - /// The IAsyncResult returned by the call to BeginGetAwsOpportunitySummary. - /// - /// Returns a GetAwsOpportunitySummaryResult from PartnerCentralSelling. - /// REST API Reference for GetAwsOpportunitySummary Operation - GetAwsOpportunitySummaryResponse EndGetAwsOpportunitySummary(IAsyncResult asyncResult); - - #endregion - - #region GetEngagementInvitation - - - /// - /// Retrieves the details of an engagement invitation shared by AWS with a partner. The - /// information includes aspects such as customer, project details, and lifecycle information. - /// To connect an engagement invitation with an opportunity, match the invitation’s Payload.Project.Title - /// with opportunity Project.Title. - /// - /// Container for the necessary parameters to execute the GetEngagementInvitation service method. - /// - /// The response from the GetEngagementInvitation service method, as returned by PartnerCentralSelling. - /// - /// This error occurs when you don't have permission to perform the requested action. - /// - /// - /// - /// - /// You don’t have access to this action or resource. Review IAM policies or contact your - /// AWS administrator for assistance. - /// - /// - /// - /// This error occurs when the specified resource can’t be found or doesn't exist. Resource - /// ID and type might be incorrect. - /// - /// - /// - /// Suggested action: This is usually a transient error. Retry after the provided retry - /// delay or a short interval. If the problem persists, contact AWS support. - /// - /// - /// - /// This error occurs when the specified resource can't be found. The resource might not - /// exist, or isn't visible with the current credentials. - /// - /// - /// - /// Suggested action: Verify that the resource ID is correct and the resource is in the - /// expected AWS region. Check IAM permissions for accessing the resource. - /// - /// - /// - /// This error occurs when there are too many requests sent. Review the provided quotas - /// and adapt your usage to avoid throttling. - /// - /// - /// - /// This error occurs when there are too many requests sent. Review the provided Quotas - /// and retry after the provided delay. - /// - /// - /// - /// The input fails to satisfy the constraints specified by the service or business validation - /// rules. - /// - /// - /// - /// Suggested action: Review the error message, including the failed fields and reasons, - /// to correct the request payload. - /// - /// - /// REST API Reference for GetEngagementInvitation Operation - GetEngagementInvitationResponse GetEngagementInvitation(GetEngagementInvitationRequest request); - - /// - /// Initiates the asynchronous execution of the GetEngagementInvitation operation. - /// - /// - /// Container for the necessary parameters to execute the GetEngagementInvitation operation on AmazonPartnerCentralSellingClient. - /// An AsyncCallback delegate that is invoked when the operation completes. - /// A user-defined state object that is passed to the callback procedure. Retrieve this object from within the callback - /// procedure using the AsyncState property. - /// - /// An IAsyncResult that can be used to poll or wait for results, or both; this value is also needed when invoking EndGetEngagementInvitation - /// operation. - /// REST API Reference for GetEngagementInvitation Operation - IAsyncResult BeginGetEngagementInvitation(GetEngagementInvitationRequest request, AsyncCallback callback, object state); - - - - /// - /// Finishes the asynchronous execution of the GetEngagementInvitation operation. - /// - /// - /// The IAsyncResult returned by the call to BeginGetEngagementInvitation. - /// - /// Returns a GetEngagementInvitationResult from PartnerCentralSelling. - /// REST API Reference for GetEngagementInvitation Operation - GetEngagementInvitationResponse EndGetEngagementInvitation(IAsyncResult asyncResult); - - #endregion - - #region GetOpportunity - - - /// - /// Fetches the Opportunity record from Partner Central by a given Identifier. - /// - /// - /// - /// - /// Use the ListOpportunities action or the event notification (from Amazon EventBridge) - /// to obtain this identifier. - /// - /// - /// Container for the necessary parameters to execute the GetOpportunity service method. - /// - /// The response from the GetOpportunity service method, as returned by PartnerCentralSelling. - /// - /// This error occurs when you don't have permission to perform the requested action. - /// - /// - /// - /// - /// You don’t have access to this action or resource. Review IAM policies or contact your - /// AWS administrator for assistance. - /// - /// - /// - /// This error occurs when the specified resource can’t be found or doesn't exist. Resource - /// ID and type might be incorrect. - /// - /// - /// - /// Suggested action: This is usually a transient error. Retry after the provided retry - /// delay or a short interval. If the problem persists, contact AWS support. - /// - /// - /// - /// This error occurs when the specified resource can't be found. The resource might not - /// exist, or isn't visible with the current credentials. - /// - /// - /// - /// Suggested action: Verify that the resource ID is correct and the resource is in the - /// expected AWS region. Check IAM permissions for accessing the resource. - /// - /// - /// - /// This error occurs when there are too many requests sent. Review the provided quotas - /// and adapt your usage to avoid throttling. - /// - /// - /// - /// This error occurs when there are too many requests sent. Review the provided Quotas - /// and retry after the provided delay. - /// - /// - /// - /// The input fails to satisfy the constraints specified by the service or business validation - /// rules. - /// - /// - /// - /// Suggested action: Review the error message, including the failed fields and reasons, - /// to correct the request payload. - /// - /// - /// REST API Reference for GetOpportunity Operation - GetOpportunityResponse GetOpportunity(GetOpportunityRequest request); - - /// - /// Initiates the asynchronous execution of the GetOpportunity operation. - /// - /// - /// Container for the necessary parameters to execute the GetOpportunity operation on AmazonPartnerCentralSellingClient. - /// An AsyncCallback delegate that is invoked when the operation completes. - /// A user-defined state object that is passed to the callback procedure. Retrieve this object from within the callback - /// procedure using the AsyncState property. - /// - /// An IAsyncResult that can be used to poll or wait for results, or both; this value is also needed when invoking EndGetOpportunity - /// operation. - /// REST API Reference for GetOpportunity Operation - IAsyncResult BeginGetOpportunity(GetOpportunityRequest request, AsyncCallback callback, object state); - - - - /// - /// Finishes the asynchronous execution of the GetOpportunity operation. - /// - /// - /// The IAsyncResult returned by the call to BeginGetOpportunity. - /// - /// Returns a GetOpportunityResult from PartnerCentralSelling. - /// REST API Reference for GetOpportunity Operation - GetOpportunityResponse EndGetOpportunity(IAsyncResult asyncResult); - - #endregion - - #region ListEngagementInvitations - - - /// - /// Retrieves a list of engagement invitations sent to the partner. This allows partners - /// to view all pending or past engagement invitations, helping them track opportunities - /// shared by AWS. - /// - /// Container for the necessary parameters to execute the ListEngagementInvitations service method. - /// - /// The response from the ListEngagementInvitations service method, as returned by PartnerCentralSelling. - /// - /// This error occurs when you don't have permission to perform the requested action. - /// - /// - /// - /// - /// You don’t have access to this action or resource. Review IAM policies or contact your - /// AWS administrator for assistance. - /// - /// - /// - /// This error occurs when the specified resource can’t be found or doesn't exist. Resource - /// ID and type might be incorrect. - /// - /// - /// - /// Suggested action: This is usually a transient error. Retry after the provided retry - /// delay or a short interval. If the problem persists, contact AWS support. - /// - /// - /// - /// This error occurs when the specified resource can't be found. The resource might not - /// exist, or isn't visible with the current credentials. - /// - /// - /// - /// Suggested action: Verify that the resource ID is correct and the resource is in the - /// expected AWS region. Check IAM permissions for accessing the resource. - /// - /// - /// - /// This error occurs when there are too many requests sent. Review the provided quotas - /// and adapt your usage to avoid throttling. - /// - /// - /// - /// This error occurs when there are too many requests sent. Review the provided Quotas - /// and retry after the provided delay. - /// - /// - /// - /// The input fails to satisfy the constraints specified by the service or business validation - /// rules. - /// - /// - /// - /// Suggested action: Review the error message, including the failed fields and reasons, - /// to correct the request payload. - /// - /// - /// REST API Reference for ListEngagementInvitations Operation - ListEngagementInvitationsResponse ListEngagementInvitations(ListEngagementInvitationsRequest request); - - /// - /// Initiates the asynchronous execution of the ListEngagementInvitations operation. - /// - /// - /// Container for the necessary parameters to execute the ListEngagementInvitations operation on AmazonPartnerCentralSellingClient. - /// An AsyncCallback delegate that is invoked when the operation completes. - /// A user-defined state object that is passed to the callback procedure. Retrieve this object from within the callback - /// procedure using the AsyncState property. - /// - /// An IAsyncResult that can be used to poll or wait for results, or both; this value is also needed when invoking EndListEngagementInvitations - /// operation. - /// REST API Reference for ListEngagementInvitations Operation - IAsyncResult BeginListEngagementInvitations(ListEngagementInvitationsRequest request, AsyncCallback callback, object state); - - - - /// - /// Finishes the asynchronous execution of the ListEngagementInvitations operation. - /// - /// - /// The IAsyncResult returned by the call to BeginListEngagementInvitations. - /// - /// Returns a ListEngagementInvitationsResult from PartnerCentralSelling. - /// REST API Reference for ListEngagementInvitations Operation - ListEngagementInvitationsResponse EndListEngagementInvitations(IAsyncResult asyncResult); - - #endregion - - #region ListOpportunities - - - /// - /// This request accepts a list of filters that retrieve opportunity subsets as well as - /// sort options. This feature is available to partners from Partner - /// Central using the ListOpportunities API action. - /// - /// - /// - /// To synchronize your system with Amazon Web Services, only list the opportunities that - /// were newly created or updated. We recommend you rely on events emitted by the service - /// into your Amazon Web Services account’s Amazon EventBridge default event bus, you - /// can also use the ListOpportunities action. - /// - /// - /// - /// We recommend the following approach: - /// - ///
    1. - /// - /// Find the latest LastModifiedDate that you stored, and only use the values that - /// came from Amazon Web Services. Don’t use values generated by your system. - /// - ///
    2. - /// - /// When you send a ListOpportunities request, submit the date in ISO 8601 format - /// in the AfterLastModifiedDate filter. - /// - ///
    3. - /// - /// Amazon Web Services only returns opportunities created or updated on or after that - /// date and time. Use NextToken to iterate over all pages. - /// - ///
    - ///     - /// Container for the necessary parameters to execute the ListOpportunities service method. - /// - /// The response from the ListOpportunities service method, as returned by PartnerCentralSelling. - /// - /// This error occurs when you don't have permission to perform the requested action. - /// - /// - /// - /// - /// You don’t have access to this action or resource. Review IAM policies or contact your - /// AWS administrator for assistance. - /// - /// - /// - /// This error occurs when the specified resource can’t be found or doesn't exist. Resource - /// ID and type might be incorrect. - /// - /// - /// - /// Suggested action: This is usually a transient error. Retry after the provided retry - /// delay or a short interval. If the problem persists, contact AWS support. - /// - /// - /// - /// This error occurs when the specified resource can't be found. The resource might not - /// exist, or isn't visible with the current credentials. - /// - /// - /// - /// Suggested action: Verify that the resource ID is correct and the resource is in the - /// expected AWS region. Check IAM permissions for accessing the resource. - /// - /// - /// - /// This error occurs when there are too many requests sent. Review the provided quotas - /// and adapt your usage to avoid throttling. - /// - /// - /// - /// This error occurs when there are too many requests sent. Review the provided Quotas - /// and retry after the provided delay. - /// - /// - /// - /// The input fails to satisfy the constraints specified by the service or business validation - /// rules. - /// - /// - /// - /// Suggested action: Review the error message, including the failed fields and reasons, - /// to correct the request payload. - /// - /// - /// REST API Reference for ListOpportunities Operation - ListOpportunitiesResponse ListOpportunities(ListOpportunitiesRequest request); - - /// - /// Initiates the asynchronous execution of the ListOpportunities operation. - /// - /// - /// Container for the necessary parameters to execute the ListOpportunities operation on AmazonPartnerCentralSellingClient. - /// An AsyncCallback delegate that is invoked when the operation completes. - /// A user-defined state object that is passed to the callback procedure. Retrieve this object from within the callback - /// procedure using the AsyncState property. - /// - /// An IAsyncResult that can be used to poll or wait for results, or both; this value is also needed when invoking EndListOpportunities - /// operation. - /// REST API Reference for ListOpportunities Operation - IAsyncResult BeginListOpportunities(ListOpportunitiesRequest request, AsyncCallback callback, object state); - - - - /// - /// Finishes the asynchronous execution of the ListOpportunities operation. - /// - /// - /// The IAsyncResult returned by the call to BeginListOpportunities. - /// - /// Returns a ListOpportunitiesResult from PartnerCentralSelling. - /// REST API Reference for ListOpportunities Operation - ListOpportunitiesResponse EndListOpportunities(IAsyncResult asyncResult); - - #endregion - - #region ListSolutions - - - /// - /// Retrieves a list of Partner Solutions that the partner registered on Partner Central. - /// This API is used to generate a list of solutions that an end user selects from for - /// association with an opportunity. - /// - /// Container for the necessary parameters to execute the ListSolutions service method. - /// - /// The response from the ListSolutions service method, as returned by PartnerCentralSelling. - /// - /// This error occurs when you don't have permission to perform the requested action. - /// - /// - /// - /// - /// You don’t have access to this action or resource. Review IAM policies or contact your - /// AWS administrator for assistance. - /// - /// - /// - /// This error occurs when the specified resource can’t be found or doesn't exist. Resource - /// ID and type might be incorrect. - /// - /// - /// - /// Suggested action: This is usually a transient error. Retry after the provided retry - /// delay or a short interval. If the problem persists, contact AWS support. - /// - /// - /// - /// This error occurs when the specified resource can't be found. The resource might not - /// exist, or isn't visible with the current credentials. - /// - /// - /// - /// Suggested action: Verify that the resource ID is correct and the resource is in the - /// expected AWS region. Check IAM permissions for accessing the resource. - /// - /// - /// - /// The input fails to satisfy the constraints specified by the service or business validation - /// rules. - /// - /// - /// - /// Suggested action: Review the error message, including the failed fields and reasons, - /// to correct the request payload. - /// - /// - /// REST API Reference for ListSolutions Operation - ListSolutionsResponse ListSolutions(ListSolutionsRequest request); - - /// - /// Initiates the asynchronous execution of the ListSolutions operation. - /// - /// - /// Container for the necessary parameters to execute the ListSolutions operation on AmazonPartnerCentralSellingClient. - /// An AsyncCallback delegate that is invoked when the operation completes. - /// A user-defined state object that is passed to the callback procedure. Retrieve this object from within the callback - /// procedure using the AsyncState property. - /// - /// An IAsyncResult that can be used to poll or wait for results, or both; this value is also needed when invoking EndListSolutions - /// operation. - /// REST API Reference for ListSolutions Operation - IAsyncResult BeginListSolutions(ListSolutionsRequest request, AsyncCallback callback, object state); - - - - /// - /// Finishes the asynchronous execution of the ListSolutions operation. - /// - /// - /// The IAsyncResult returned by the call to BeginListSolutions. - /// - /// Returns a ListSolutionsResult from PartnerCentralSelling. - /// REST API Reference for ListSolutions Operation - ListSolutionsResponse EndListSolutions(IAsyncResult asyncResult); - - #endregion - - #region RejectEngagementInvitation - - - /// - /// This action rejects an EngagementInvitation that AWS shared. Rejecting an invitation - /// indicates that the partner doesn't want to pursue the opportunity, and all related - /// data will become inaccessible thereafter. - /// - /// Container for the necessary parameters to execute the RejectEngagementInvitation service method. - /// - /// The response from the RejectEngagementInvitation service method, as returned by PartnerCentralSelling. - /// - /// This error occurs when you don't have permission to perform the requested action. - /// - /// - /// - /// - /// You don’t have access to this action or resource. Review IAM policies or contact your - /// AWS administrator for assistance. - /// - /// - /// - /// This error occurs when the specified resource can’t be found or doesn't exist. Resource - /// ID and type might be incorrect. - /// - /// - /// - /// Suggested action: This is usually a transient error. Retry after the provided retry - /// delay or a short interval. If the problem persists, contact AWS support. - /// - /// - /// - /// This error occurs when the specified resource can't be found. The resource might not - /// exist, or isn't visible with the current credentials. - /// - /// - /// - /// Suggested action: Verify that the resource ID is correct and the resource is in the - /// expected AWS region. Check IAM permissions for accessing the resource. - /// - /// - /// - /// This error occurs when there are too many requests sent. Review the provided quotas - /// and adapt your usage to avoid throttling. - /// - /// - /// - /// This error occurs when there are too many requests sent. Review the provided Quotas - /// and retry after the provided delay. - /// - /// - /// - /// The input fails to satisfy the constraints specified by the service or business validation - /// rules. - /// - /// - /// - /// Suggested action: Review the error message, including the failed fields and reasons, - /// to correct the request payload. - /// - /// - /// REST API Reference for RejectEngagementInvitation Operation - RejectEngagementInvitationResponse RejectEngagementInvitation(RejectEngagementInvitationRequest request); - - /// - /// Initiates the asynchronous execution of the RejectEngagementInvitation operation. - /// - /// - /// Container for the necessary parameters to execute the RejectEngagementInvitation operation on AmazonPartnerCentralSellingClient. - /// An AsyncCallback delegate that is invoked when the operation completes. - /// A user-defined state object that is passed to the callback procedure. Retrieve this object from within the callback - /// procedure using the AsyncState property. - /// - /// An IAsyncResult that can be used to poll or wait for results, or both; this value is also needed when invoking EndRejectEngagementInvitation - /// operation. - /// REST API Reference for RejectEngagementInvitation Operation - IAsyncResult BeginRejectEngagementInvitation(RejectEngagementInvitationRequest request, AsyncCallback callback, object state); - - - - /// - /// Finishes the asynchronous execution of the RejectEngagementInvitation operation. - /// - /// - /// The IAsyncResult returned by the call to BeginRejectEngagementInvitation. - /// - /// Returns a RejectEngagementInvitationResult from PartnerCentralSelling. - /// REST API Reference for RejectEngagementInvitation Operation - RejectEngagementInvitationResponse EndRejectEngagementInvitation(IAsyncResult asyncResult); - - #endregion - - #region StartEngagementByAcceptingInvitationTask - - - /// - /// This action starts the engagement by accepting an EngagementInvitation. The - /// task is asynchronous and involves the following steps: accepting the invitation, creating - /// an opportunity in the partner’s account from the AWS opportunity, and copying details - /// for tracking. When completed, an Opportunity Created event is generated, indicating - /// that the opportunity has been successfully created in the partner's account. - /// - /// Container for the necessary parameters to execute the StartEngagementByAcceptingInvitationTask service method. - /// - /// The response from the StartEngagementByAcceptingInvitationTask service method, as returned by PartnerCentralSelling. - /// - /// This error occurs when you don't have permission to perform the requested action. - /// - /// - /// - /// - /// You don’t have access to this action or resource. Review IAM policies or contact your - /// AWS administrator for assistance. - /// - /// - /// - /// This error occurs when the request can’t be processed due to a conflict with the target - /// resource's current state, which could result from updating or deleting the resource. - /// - /// - /// - /// - /// Suggested action: Fetch the latest state of the resource, verify the state, and retry - /// the request. - /// - /// - /// - /// This error occurs when the specified resource can’t be found or doesn't exist. Resource - /// ID and type might be incorrect. - /// - /// - /// - /// Suggested action: This is usually a transient error. Retry after the provided retry - /// delay or a short interval. If the problem persists, contact AWS support. - /// - /// - /// - /// This error occurs when the specified resource can't be found. The resource might not - /// exist, or isn't visible with the current credentials. - /// - /// - /// - /// Suggested action: Verify that the resource ID is correct and the resource is in the - /// expected AWS region. Check IAM permissions for accessing the resource. - /// - /// - /// - /// This error occurs when the request would cause a service quota to be exceeded. Service - /// quotas represent the maximum allowed use of a specific resource, and this error indicates - /// that the request would surpass that limit. - /// - /// - /// - /// Suggested action: Review the Quotas - /// for the resource, and either reduce usage or request a quota increase. - /// - /// - /// - /// This error occurs when there are too many requests sent. Review the provided quotas - /// and adapt your usage to avoid throttling. - /// - /// - /// - /// This error occurs when there are too many requests sent. Review the provided Quotas - /// and retry after the provided delay. - /// - /// - /// - /// The input fails to satisfy the constraints specified by the service or business validation - /// rules. - /// - /// - /// - /// Suggested action: Review the error message, including the failed fields and reasons, - /// to correct the request payload. - /// - /// - /// REST API Reference for StartEngagementByAcceptingInvitationTask Operation - StartEngagementByAcceptingInvitationTaskResponse StartEngagementByAcceptingInvitationTask(StartEngagementByAcceptingInvitationTaskRequest request); - - /// - /// Initiates the asynchronous execution of the StartEngagementByAcceptingInvitationTask operation. - /// - /// - /// Container for the necessary parameters to execute the StartEngagementByAcceptingInvitationTask operation on AmazonPartnerCentralSellingClient. - /// An AsyncCallback delegate that is invoked when the operation completes. - /// A user-defined state object that is passed to the callback procedure. Retrieve this object from within the callback - /// procedure using the AsyncState property. - /// - /// An IAsyncResult that can be used to poll or wait for results, or both; this value is also needed when invoking EndStartEngagementByAcceptingInvitationTask - /// operation. - /// REST API Reference for StartEngagementByAcceptingInvitationTask Operation - IAsyncResult BeginStartEngagementByAcceptingInvitationTask(StartEngagementByAcceptingInvitationTaskRequest request, AsyncCallback callback, object state); - - - - /// - /// Finishes the asynchronous execution of the StartEngagementByAcceptingInvitationTask operation. - /// - /// - /// The IAsyncResult returned by the call to BeginStartEngagementByAcceptingInvitationTask. - /// - /// Returns a StartEngagementByAcceptingInvitationTaskResult from PartnerCentralSelling. - /// REST API Reference for StartEngagementByAcceptingInvitationTask Operation - StartEngagementByAcceptingInvitationTaskResponse EndStartEngagementByAcceptingInvitationTask(IAsyncResult asyncResult); - - #endregion - - #region StartEngagementFromOpportunityTask - - - /// - /// This action initiates the engagement process from an existing opportunity by accepting - /// the engagement invitation and creating a corresponding opportunity in the partner’s - /// system. Similar to StartEngagementByAcceptingInvitationTask, this action is - /// asynchronous and performs multiple steps before completion. - /// - /// Container for the necessary parameters to execute the StartEngagementFromOpportunityTask service method. - /// - /// The response from the StartEngagementFromOpportunityTask service method, as returned by PartnerCentralSelling. - /// - /// This error occurs when you don't have permission to perform the requested action. - /// - /// - /// - /// - /// You don’t have access to this action or resource. Review IAM policies or contact your - /// AWS administrator for assistance. - /// - /// - /// - /// This error occurs when the request can’t be processed due to a conflict with the target - /// resource's current state, which could result from updating or deleting the resource. - /// - /// - /// - /// - /// Suggested action: Fetch the latest state of the resource, verify the state, and retry - /// the request. - /// - /// - /// - /// This error occurs when the specified resource can’t be found or doesn't exist. Resource - /// ID and type might be incorrect. - /// - /// - /// - /// Suggested action: This is usually a transient error. Retry after the provided retry - /// delay or a short interval. If the problem persists, contact AWS support. - /// - /// - /// - /// This error occurs when the specified resource can't be found. The resource might not - /// exist, or isn't visible with the current credentials. - /// - /// - /// - /// Suggested action: Verify that the resource ID is correct and the resource is in the - /// expected AWS region. Check IAM permissions for accessing the resource. - /// - /// - /// - /// This error occurs when the request would cause a service quota to be exceeded. Service - /// quotas represent the maximum allowed use of a specific resource, and this error indicates - /// that the request would surpass that limit. - /// - /// - /// - /// Suggested action: Review the Quotas - /// for the resource, and either reduce usage or request a quota increase. - /// - /// - /// - /// This error occurs when there are too many requests sent. Review the provided quotas - /// and adapt your usage to avoid throttling. - /// - /// - /// - /// This error occurs when there are too many requests sent. Review the provided Quotas - /// and retry after the provided delay. - /// - /// - /// - /// The input fails to satisfy the constraints specified by the service or business validation - /// rules. - /// - /// - /// - /// Suggested action: Review the error message, including the failed fields and reasons, - /// to correct the request payload. - /// - /// - /// REST API Reference for StartEngagementFromOpportunityTask Operation - StartEngagementFromOpportunityTaskResponse StartEngagementFromOpportunityTask(StartEngagementFromOpportunityTaskRequest request); - - /// - /// Initiates the asynchronous execution of the StartEngagementFromOpportunityTask operation. - /// - /// - /// Container for the necessary parameters to execute the StartEngagementFromOpportunityTask operation on AmazonPartnerCentralSellingClient. - /// An AsyncCallback delegate that is invoked when the operation completes. - /// A user-defined state object that is passed to the callback procedure. Retrieve this object from within the callback - /// procedure using the AsyncState property. - /// - /// An IAsyncResult that can be used to poll or wait for results, or both; this value is also needed when invoking EndStartEngagementFromOpportunityTask - /// operation. - /// REST API Reference for StartEngagementFromOpportunityTask Operation - IAsyncResult BeginStartEngagementFromOpportunityTask(StartEngagementFromOpportunityTaskRequest request, AsyncCallback callback, object state); - - - - /// - /// Finishes the asynchronous execution of the StartEngagementFromOpportunityTask operation. - /// - /// - /// The IAsyncResult returned by the call to BeginStartEngagementFromOpportunityTask. - /// - /// Returns a StartEngagementFromOpportunityTaskResult from PartnerCentralSelling. - /// REST API Reference for StartEngagementFromOpportunityTask Operation - StartEngagementFromOpportunityTaskResponse EndStartEngagementFromOpportunityTask(IAsyncResult asyncResult); - - #endregion - - #region UpdateOpportunity - - - /// - /// Updates the Opportunity record identified by a given Identifier. This - /// operation allows you to modify the details of an existing opportunity to reflect the - /// latest information and progress. Use this action to keep the opportunity record up-to-date - /// and accurate. - /// - /// - /// - /// When you perform updates, include the entire payload with each request. If any field - /// is omitted, the API assumes that the field is set to null. The best practice - /// is to always perform a GetOpportunity to retrieve the latest values, then send - /// the complete payload with the updated values to be changed. - /// - /// - /// Container for the necessary parameters to execute the UpdateOpportunity service method. - /// - /// The response from the UpdateOpportunity service method, as returned by PartnerCentralSelling. - /// - /// This error occurs when you don't have permission to perform the requested action. - /// - /// - /// - /// - /// You don’t have access to this action or resource. Review IAM policies or contact your - /// AWS administrator for assistance. - /// - /// - /// - /// This error occurs when the request can’t be processed due to a conflict with the target - /// resource's current state, which could result from updating or deleting the resource. - /// - /// - /// - /// - /// Suggested action: Fetch the latest state of the resource, verify the state, and retry - /// the request. - /// - /// - /// - /// This error occurs when the specified resource can’t be found or doesn't exist. Resource - /// ID and type might be incorrect. - /// - /// - /// - /// Suggested action: This is usually a transient error. Retry after the provided retry - /// delay or a short interval. If the problem persists, contact AWS support. - /// - /// - /// - /// This error occurs when the specified resource can't be found. The resource might not - /// exist, or isn't visible with the current credentials. - /// - /// - /// - /// Suggested action: Verify that the resource ID is correct and the resource is in the - /// expected AWS region. Check IAM permissions for accessing the resource. - /// - /// - /// - /// This error occurs when there are too many requests sent. Review the provided quotas - /// and adapt your usage to avoid throttling. - /// - /// - /// - /// This error occurs when there are too many requests sent. Review the provided Quotas - /// and retry after the provided delay. - /// - /// - /// - /// The input fails to satisfy the constraints specified by the service or business validation - /// rules. - /// - /// - /// - /// Suggested action: Review the error message, including the failed fields and reasons, - /// to correct the request payload. - /// - /// - /// REST API Reference for UpdateOpportunity Operation - UpdateOpportunityResponse UpdateOpportunity(UpdateOpportunityRequest request); - - /// - /// Initiates the asynchronous execution of the UpdateOpportunity operation. - /// - /// - /// Container for the necessary parameters to execute the UpdateOpportunity operation on AmazonPartnerCentralSellingClient. - /// An AsyncCallback delegate that is invoked when the operation completes. - /// A user-defined state object that is passed to the callback procedure. Retrieve this object from within the callback - /// procedure using the AsyncState property. - /// - /// An IAsyncResult that can be used to poll or wait for results, or both; this value is also needed when invoking EndUpdateOpportunity - /// operation. - /// REST API Reference for UpdateOpportunity Operation - IAsyncResult BeginUpdateOpportunity(UpdateOpportunityRequest request, AsyncCallback callback, object state); - - - - /// - /// Finishes the asynchronous execution of the UpdateOpportunity operation. - /// - /// - /// The IAsyncResult returned by the call to BeginUpdateOpportunity. - /// - /// Returns a UpdateOpportunityResult from PartnerCentralSelling. - /// REST API Reference for UpdateOpportunity Operation - UpdateOpportunityResponse EndUpdateOpportunity(IAsyncResult asyncResult); - - #endregion - - #region DetermineServiceOperationEndpoint - - /// - /// Returns the endpoint that will be used for a particular request. - /// - /// Request for the desired service operation. - /// The resolved endpoint for the given request. - Amazon.Runtime.Endpoints.Endpoint DetermineServiceOperationEndpoint(AmazonWebServiceRequest request); - - #endregion - - } -} \ No newline at end of file diff --git a/sdk/src/Services/PartnerCentralSelling/Generated/_netstandard/AmazonPartnerCentralSellingClient.cs b/sdk/src/Services/PartnerCentralSelling/Generated/_netstandard/AmazonPartnerCentralSellingClient.cs index 15d99b0b27f0..4297a2f431ca 100644 --- a/sdk/src/Services/PartnerCentralSelling/Generated/_netstandard/AmazonPartnerCentralSellingClient.cs +++ b/sdk/src/Services/PartnerCentralSelling/Generated/_netstandard/AmazonPartnerCentralSellingClient.cs @@ -32,6 +32,7 @@ using Amazon.Runtime.Internal; using Amazon.Runtime.Internal.Auth; using Amazon.Runtime.Internal.Transform; +using Amazon.Runtime.Endpoints; #pragma warning disable CS1570 namespace Amazon.PartnerCentralSelling @@ -1737,16 +1738,8 @@ internal virtual UpdateOpportunityResponse UpdateOpportunity(UpdateOpportunityRe /// The resolved endpoint for the given request. public Amazon.Runtime.Endpoints.Endpoint DetermineServiceOperationEndpoint(AmazonWebServiceRequest request) { - var requestContext = new Amazon.Runtime.Internal.RequestContext(false, CreateSigner()) - { - ClientConfig = Config, - OriginalRequest = request, - Request = new Amazon.Runtime.Internal.DefaultRequest(request, ServiceMetadata.ServiceId) - }; - - var executionContext = new Amazon.Runtime.Internal.ExecutionContext(requestContext, null); - var resolver = new AmazonPartnerCentralSellingEndpointResolver(); - return resolver.GetEndpoint(executionContext); + var parameters = new ServiceOperationEndpointParameters(request); + return Config.DetermineServiceOperationEndpoint(parameters); } #endregion diff --git a/sdk/src/Services/PartnerCentralSelling/Generated/_netstandard/IAmazonPartnerCentralSelling.cs b/sdk/src/Services/PartnerCentralSelling/Generated/_netstandard/IAmazonPartnerCentralSelling.cs index 308a351f9570..b7745621e3c0 100644 --- a/sdk/src/Services/PartnerCentralSelling/Generated/_netstandard/IAmazonPartnerCentralSelling.cs +++ b/sdk/src/Services/PartnerCentralSelling/Generated/_netstandard/IAmazonPartnerCentralSelling.cs @@ -1290,5 +1290,33 @@ public partial interface IAmazonPartnerCentralSelling : IAmazonService, IDisposa #endregion + #region Static factory interface methods +#if NET8_0_OR_GREATER +// Warning CA1033 is issued when the child types can not call the method defined in parent types. +// In this use case the intended caller is only meant to be the interface as a factory +// method to create the child types. Given the SDK use case the warning can be ignored. +#pragma warning disable CA1033 + /// + [System.Diagnostics.CodeAnalysis.DynamicDependency(System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicProperties, typeof(AmazonPartnerCentralSellingConfig))] + static ClientConfig IAmazonService.CreateDefaultClientConfig() => new AmazonPartnerCentralSellingConfig(); + + /// + [System.Diagnostics.CodeAnalysis.UnconditionalSuppressMessage("AssemblyLoadTrimming", "IL2026:RequiresUnreferencedCode", + Justification = "This suppression is here to ignore the warnings caused by CognitoSync. See justification in IAmazonService.")] + static IAmazonService IAmazonService.CreateDefaultServiceClient(AWSCredentials awsCredentials, ClientConfig clientConfig) + { + var serviceClientConfig = clientConfig as AmazonPartnerCentralSellingConfig; + if (serviceClientConfig == null) + { + throw new AmazonClientException("ClientConfig is not of type AmazonPartnerCentralSellingConfig to create AmazonPartnerCentralSellingClient"); + } + + return awsCredentials == null ? + new AmazonPartnerCentralSellingClient(serviceClientConfig) : + new AmazonPartnerCentralSellingClient(awsCredentials, serviceClientConfig); + } +#pragma warning restore CA1033 +#endif + #endregion } } \ No newline at end of file diff --git a/sdk/src/Services/PartnerCentralSelling/PartnerCentralSelling.sln b/sdk/src/Services/PartnerCentralSelling/PartnerCentralSelling.sln index 77c91446afcc..95acf939bfb3 100644 --- a/sdk/src/Services/PartnerCentralSelling/PartnerCentralSelling.sln +++ b/sdk/src/Services/PartnerCentralSelling/PartnerCentralSelling.sln @@ -4,9 +4,7 @@ VisualStudioVersion = 15.0.26730.12 MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Core", "Core", "{9863FCB3-BFA4-4B9C-B8F6-302BA5F660B8}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.Core.Net35", "../../Core/AWSSDK.Core.Net35.csproj", "{1FACE5D0-97BF-4069-B4F7-0FE28BB160F8}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.Core.Net45", "../../Core/AWSSDK.Core.Net45.csproj", "{7DE3AFA0-1B2D-41B1-82BD-120B8B210B43}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.Core.NetFramework", "../../Core/AWSSDK.Core.NetFramework.csproj", "{7DE3AFA0-1B2D-41B1-82BD-120B8B210B43}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.Core.NetStandard", "../../Core/AWSSDK.Core.NetStandard.csproj", "{A855B58E-ED32-40AE-AE8F-054F448B9F2C}" EndProject @@ -14,27 +12,19 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Services", "Services", "{93 EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "PartnerCentralSelling", "PartnerCentralSelling", "{EF78C0E8-68BE-4901-BC1B-F636AD8FE21B}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.PartnerCentralSelling.Net35", "AWSSDK.PartnerCentralSelling.Net35.csproj", "{A1B32381-581C-4066-80C8-B36E291FC0BC}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.PartnerCentralSelling.Net45", "AWSSDK.PartnerCentralSelling.Net45.csproj", "{C60A38B9-1349-4926-9153-350810868AB3}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.PartnerCentralSelling.NetFramework", "AWSSDK.PartnerCentralSelling.NetFramework.csproj", "{646A840C-54A6-48E5-81BC-70F8CB98E5C1}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.PartnerCentralSelling.NetStandard", "AWSSDK.PartnerCentralSelling.NetStandard.csproj", "{E90BC271-12E0-4C88-8900-D61E8B642E8C}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Test", "Test", "{12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.UnitTests.PartnerCentralSelling.Net35", "../../../test/Services/PartnerCentralSelling/UnitTests/AWSSDK.UnitTests.PartnerCentralSelling.Net35.csproj", "{8285361C-2352-4F4A-B418-1844164B03A3}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.UnitTests.PartnerCentralSelling.Net45", "../../../test/Services/PartnerCentralSelling/UnitTests/AWSSDK.UnitTests.PartnerCentralSelling.Net45.csproj", "{41CE69A4-683C-469C-AE02-9FBA42AF6A7E}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.UnitTests.PartnerCentralSelling.NetFramework", "../../../test/Services/PartnerCentralSelling/UnitTests/AWSSDK.UnitTests.PartnerCentralSelling.NetFramework.csproj", "{F85DE672-5643-43B6-BC0E-7999E80780FE}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ServiceClientGeneratorLib", "../../../../generator/ServiceClientGeneratorLib/ServiceClientGeneratorLib.csproj", "{7BEE7C44-BE12-43CC-AFB9-B5852A1F43C8}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.UnitTestUtilities.Net35", "../../../test/UnitTests/Custom/AWSSDK.UnitTestUtilities.Net35.csproj", "{A23CE153-A4A3-4D3A-A6DC-0DD1B207118E}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.UnitTestUtilities.Net45", "../../../test/UnitTests/Custom/AWSSDK.UnitTestUtilities.Net45.csproj", "{002B183F-E568-49CD-9D06-CBCFF2C2921F}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.IntegrationTestUtilities.Net35", "../../../test/IntegrationTests/AWSSDK.IntegrationTestUtilities.Net35.csproj", "{924D2906-70D6-4D77-8603-816648B2CCA6}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.UnitTestUtilities.NetFramework", "../../../test/UnitTests/Custom/AWSSDK.UnitTestUtilities.NetFramework.csproj", "{002B183F-E568-49CD-9D06-CBCFF2C2921F}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.IntegrationTestUtilities.Net45", "../../../test/IntegrationTests/AWSSDK.IntegrationTestUtilities.Net45.csproj", "{7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.IntegrationTestUtilities.NetFramework", "../../../test/IntegrationTests/AWSSDK.IntegrationTestUtilities.NetFramework.csproj", "{7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.CommonTest", "../../../test/Common/AWSSDK.CommonTest.csproj", "{66F78F86-68D7-4538-8EA5-A669A08E1C19}" EndProject @@ -44,25 +34,15 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UnitTests.NetStandard.CoreO EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "IntegrationTestDependencies", "IntegrationTestDependencies", "{939EC5C2-8345-43E2-8F97-72EEEBEEA0AC}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.Extensions.CrtIntegration.Net35", "../../../../extensions/src/AWSSDK.Extensions.CrtIntegration/AWSSDK.Extensions.CrtIntegration.Net35.csproj", "{913E21DF-D595-4D17-BD35-C823FB7AE7AC}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.Extensions.CrtIntegration.Net45", "../../../../extensions/src/AWSSDK.Extensions.CrtIntegration/AWSSDK.Extensions.CrtIntegration.Net45.csproj", "{67BDE19A-63F4-4BBC-9086-0E874F66750C}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.IdentityManagement.Net35", "../IdentityManagement/AWSSDK.IdentityManagement.Net35.csproj", "{701DFB2B-9679-4108-A9B7-E57DDFD0B82D}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.SecurityToken.Net35", "../SecurityToken/AWSSDK.SecurityToken.Net35.csproj", "{5EDB34A7-FDBF-4480-AF5E-8E4A89D6C5AD}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.SimpleNotificationService.Net35", "../SimpleNotificationService/AWSSDK.SimpleNotificationService.Net35.csproj", "{DB71CDD4-C527-4444-940B-3A617DDD0DA6}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.S3.Net35", "../S3/AWSSDK.S3.Net35.csproj", "{6F05EEDA-81CA-4EB1-86B9-3E9189E17FF8}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.Extensions.CrtIntegration.NetFramework", "../../../../extensions/src/AWSSDK.Extensions.CrtIntegration/AWSSDK.Extensions.CrtIntegration.NetFramework.csproj", "{E86664F7-3A44-498D-BFFB-B747E98B7229}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.IdentityManagement.Net45", "../IdentityManagement/AWSSDK.IdentityManagement.Net45.csproj", "{F0D27F5D-2820-4B54-9EEE-768F76C28513}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.IdentityManagement.NetFramework", "../IdentityManagement/AWSSDK.IdentityManagement.NetFramework.csproj", "{049C776B-81F7-4762-98D8-57DD2A7D001C}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.S3.Net45", "../S3/AWSSDK.S3.Net45.csproj", "{E99A9A87-D7C0-4164-AFA8-12BD27D77A05}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.S3.NetFramework", "../S3/AWSSDK.S3.NetFramework.csproj", "{B86AE79E-4024-48CD-AAC1-F84EEB312494}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.SecurityToken.Net45", "../SecurityToken/AWSSDK.SecurityToken.Net45.csproj", "{174D6065-A38A-48A8-AAE4-97FB412A7C5E}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.SecurityToken.NetFramework", "../SecurityToken/AWSSDK.SecurityToken.NetFramework.csproj", "{F678A955-FC99-4094-92BD-9D94B2C6CC76}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.SimpleNotificationService.Net45", "../SimpleNotificationService/AWSSDK.SimpleNotificationService.Net45.csproj", "{57105056-3EFE-487D-B41F-69037890431B}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.SimpleNotificationService.NetFramework", "../SimpleNotificationService/AWSSDK.SimpleNotificationService.NetFramework.csproj", "{9762A1CC-1315-4B2B-9566-3A915CA62BA4}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -70,10 +50,6 @@ Global Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {1FACE5D0-97BF-4069-B4F7-0FE28BB160F8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1FACE5D0-97BF-4069-B4F7-0FE28BB160F8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1FACE5D0-97BF-4069-B4F7-0FE28BB160F8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1FACE5D0-97BF-4069-B4F7-0FE28BB160F8}.Release|Any CPU.Build.0 = Release|Any CPU {7DE3AFA0-1B2D-41B1-82BD-120B8B210B43}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {7DE3AFA0-1B2D-41B1-82BD-120B8B210B43}.Debug|Any CPU.Build.0 = Debug|Any CPU {7DE3AFA0-1B2D-41B1-82BD-120B8B210B43}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -82,42 +58,26 @@ Global {A855B58E-ED32-40AE-AE8F-054F448B9F2C}.Debug|Any CPU.Build.0 = Debug|Any CPU {A855B58E-ED32-40AE-AE8F-054F448B9F2C}.Release|Any CPU.ActiveCfg = Release|Any CPU {A855B58E-ED32-40AE-AE8F-054F448B9F2C}.Release|Any CPU.Build.0 = Release|Any CPU - {A1B32381-581C-4066-80C8-B36E291FC0BC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A1B32381-581C-4066-80C8-B36E291FC0BC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A1B32381-581C-4066-80C8-B36E291FC0BC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A1B32381-581C-4066-80C8-B36E291FC0BC}.Release|Any CPU.Build.0 = Release|Any CPU - {C60A38B9-1349-4926-9153-350810868AB3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C60A38B9-1349-4926-9153-350810868AB3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C60A38B9-1349-4926-9153-350810868AB3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C60A38B9-1349-4926-9153-350810868AB3}.Release|Any CPU.Build.0 = Release|Any CPU + {646A840C-54A6-48E5-81BC-70F8CB98E5C1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {646A840C-54A6-48E5-81BC-70F8CB98E5C1}.Debug|Any CPU.Build.0 = Debug|Any CPU + {646A840C-54A6-48E5-81BC-70F8CB98E5C1}.Release|Any CPU.ActiveCfg = Release|Any CPU + {646A840C-54A6-48E5-81BC-70F8CB98E5C1}.Release|Any CPU.Build.0 = Release|Any CPU {E90BC271-12E0-4C88-8900-D61E8B642E8C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {E90BC271-12E0-4C88-8900-D61E8B642E8C}.Debug|Any CPU.Build.0 = Debug|Any CPU {E90BC271-12E0-4C88-8900-D61E8B642E8C}.Release|Any CPU.ActiveCfg = Release|Any CPU {E90BC271-12E0-4C88-8900-D61E8B642E8C}.Release|Any CPU.Build.0 = Release|Any CPU - {8285361C-2352-4F4A-B418-1844164B03A3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8285361C-2352-4F4A-B418-1844164B03A3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8285361C-2352-4F4A-B418-1844164B03A3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8285361C-2352-4F4A-B418-1844164B03A3}.Release|Any CPU.Build.0 = Release|Any CPU - {41CE69A4-683C-469C-AE02-9FBA42AF6A7E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {41CE69A4-683C-469C-AE02-9FBA42AF6A7E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {41CE69A4-683C-469C-AE02-9FBA42AF6A7E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {41CE69A4-683C-469C-AE02-9FBA42AF6A7E}.Release|Any CPU.Build.0 = Release|Any CPU + {F85DE672-5643-43B6-BC0E-7999E80780FE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {F85DE672-5643-43B6-BC0E-7999E80780FE}.Debug|Any CPU.Build.0 = Debug|Any CPU + {F85DE672-5643-43B6-BC0E-7999E80780FE}.Release|Any CPU.ActiveCfg = Release|Any CPU + {F85DE672-5643-43B6-BC0E-7999E80780FE}.Release|Any CPU.Build.0 = Release|Any CPU {7BEE7C44-BE12-43CC-AFB9-B5852A1F43C8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {7BEE7C44-BE12-43CC-AFB9-B5852A1F43C8}.Debug|Any CPU.Build.0 = Debug|Any CPU {7BEE7C44-BE12-43CC-AFB9-B5852A1F43C8}.Release|Any CPU.ActiveCfg = Release|Any CPU {7BEE7C44-BE12-43CC-AFB9-B5852A1F43C8}.Release|Any CPU.Build.0 = Release|Any CPU - {A23CE153-A4A3-4D3A-A6DC-0DD1B207118E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A23CE153-A4A3-4D3A-A6DC-0DD1B207118E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A23CE153-A4A3-4D3A-A6DC-0DD1B207118E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A23CE153-A4A3-4D3A-A6DC-0DD1B207118E}.Release|Any CPU.Build.0 = Release|Any CPU {002B183F-E568-49CD-9D06-CBCFF2C2921F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {002B183F-E568-49CD-9D06-CBCFF2C2921F}.Debug|Any CPU.Build.0 = Debug|Any CPU {002B183F-E568-49CD-9D06-CBCFF2C2921F}.Release|Any CPU.ActiveCfg = Release|Any CPU {002B183F-E568-49CD-9D06-CBCFF2C2921F}.Release|Any CPU.Build.0 = Release|Any CPU - {924D2906-70D6-4D77-8603-816648B2CCA6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {924D2906-70D6-4D77-8603-816648B2CCA6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {924D2906-70D6-4D77-8603-816648B2CCA6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {924D2906-70D6-4D77-8603-816648B2CCA6}.Release|Any CPU.Build.0 = Release|Any CPU {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7}.Debug|Any CPU.Build.0 = Debug|Any CPU {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -134,78 +94,48 @@ Global {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {913E21DF-D595-4D17-BD35-C823FB7AE7AC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {913E21DF-D595-4D17-BD35-C823FB7AE7AC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {913E21DF-D595-4D17-BD35-C823FB7AE7AC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {913E21DF-D595-4D17-BD35-C823FB7AE7AC}.Release|Any CPU.Build.0 = Release|Any CPU - {67BDE19A-63F4-4BBC-9086-0E874F66750C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {67BDE19A-63F4-4BBC-9086-0E874F66750C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {67BDE19A-63F4-4BBC-9086-0E874F66750C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {67BDE19A-63F4-4BBC-9086-0E874F66750C}.Release|Any CPU.Build.0 = Release|Any CPU - {701DFB2B-9679-4108-A9B7-E57DDFD0B82D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {701DFB2B-9679-4108-A9B7-E57DDFD0B82D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {701DFB2B-9679-4108-A9B7-E57DDFD0B82D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {701DFB2B-9679-4108-A9B7-E57DDFD0B82D}.Release|Any CPU.Build.0 = Release|Any CPU - {5EDB34A7-FDBF-4480-AF5E-8E4A89D6C5AD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5EDB34A7-FDBF-4480-AF5E-8E4A89D6C5AD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5EDB34A7-FDBF-4480-AF5E-8E4A89D6C5AD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5EDB34A7-FDBF-4480-AF5E-8E4A89D6C5AD}.Release|Any CPU.Build.0 = Release|Any CPU - {DB71CDD4-C527-4444-940B-3A617DDD0DA6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DB71CDD4-C527-4444-940B-3A617DDD0DA6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DB71CDD4-C527-4444-940B-3A617DDD0DA6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DB71CDD4-C527-4444-940B-3A617DDD0DA6}.Release|Any CPU.Build.0 = Release|Any CPU - {6F05EEDA-81CA-4EB1-86B9-3E9189E17FF8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6F05EEDA-81CA-4EB1-86B9-3E9189E17FF8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6F05EEDA-81CA-4EB1-86B9-3E9189E17FF8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6F05EEDA-81CA-4EB1-86B9-3E9189E17FF8}.Release|Any CPU.Build.0 = Release|Any CPU - {F0D27F5D-2820-4B54-9EEE-768F76C28513}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F0D27F5D-2820-4B54-9EEE-768F76C28513}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F0D27F5D-2820-4B54-9EEE-768F76C28513}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F0D27F5D-2820-4B54-9EEE-768F76C28513}.Release|Any CPU.Build.0 = Release|Any CPU - {E99A9A87-D7C0-4164-AFA8-12BD27D77A05}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E99A9A87-D7C0-4164-AFA8-12BD27D77A05}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E99A9A87-D7C0-4164-AFA8-12BD27D77A05}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E99A9A87-D7C0-4164-AFA8-12BD27D77A05}.Release|Any CPU.Build.0 = Release|Any CPU - {174D6065-A38A-48A8-AAE4-97FB412A7C5E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {174D6065-A38A-48A8-AAE4-97FB412A7C5E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {174D6065-A38A-48A8-AAE4-97FB412A7C5E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {174D6065-A38A-48A8-AAE4-97FB412A7C5E}.Release|Any CPU.Build.0 = Release|Any CPU - {57105056-3EFE-487D-B41F-69037890431B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {57105056-3EFE-487D-B41F-69037890431B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {57105056-3EFE-487D-B41F-69037890431B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {57105056-3EFE-487D-B41F-69037890431B}.Release|Any CPU.Build.0 = Release|Any CPU + {E86664F7-3A44-498D-BFFB-B747E98B7229}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {E86664F7-3A44-498D-BFFB-B747E98B7229}.Debug|Any CPU.Build.0 = Debug|Any CPU + {E86664F7-3A44-498D-BFFB-B747E98B7229}.Release|Any CPU.ActiveCfg = Release|Any CPU + {E86664F7-3A44-498D-BFFB-B747E98B7229}.Release|Any CPU.Build.0 = Release|Any CPU + {049C776B-81F7-4762-98D8-57DD2A7D001C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {049C776B-81F7-4762-98D8-57DD2A7D001C}.Debug|Any CPU.Build.0 = Debug|Any CPU + {049C776B-81F7-4762-98D8-57DD2A7D001C}.Release|Any CPU.ActiveCfg = Release|Any CPU + {049C776B-81F7-4762-98D8-57DD2A7D001C}.Release|Any CPU.Build.0 = Release|Any CPU + {B86AE79E-4024-48CD-AAC1-F84EEB312494}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B86AE79E-4024-48CD-AAC1-F84EEB312494}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B86AE79E-4024-48CD-AAC1-F84EEB312494}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B86AE79E-4024-48CD-AAC1-F84EEB312494}.Release|Any CPU.Build.0 = Release|Any CPU + {F678A955-FC99-4094-92BD-9D94B2C6CC76}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {F678A955-FC99-4094-92BD-9D94B2C6CC76}.Debug|Any CPU.Build.0 = Debug|Any CPU + {F678A955-FC99-4094-92BD-9D94B2C6CC76}.Release|Any CPU.ActiveCfg = Release|Any CPU + {F678A955-FC99-4094-92BD-9D94B2C6CC76}.Release|Any CPU.Build.0 = Release|Any CPU + {9762A1CC-1315-4B2B-9566-3A915CA62BA4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {9762A1CC-1315-4B2B-9566-3A915CA62BA4}.Debug|Any CPU.Build.0 = Debug|Any CPU + {9762A1CC-1315-4B2B-9566-3A915CA62BA4}.Release|Any CPU.ActiveCfg = Release|Any CPU + {9762A1CC-1315-4B2B-9566-3A915CA62BA4}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution - {1FACE5D0-97BF-4069-B4F7-0FE28BB160F8} = {9863FCB3-BFA4-4B9C-B8F6-302BA5F660B8} {7DE3AFA0-1B2D-41B1-82BD-120B8B210B43} = {9863FCB3-BFA4-4B9C-B8F6-302BA5F660B8} {A855B58E-ED32-40AE-AE8F-054F448B9F2C} = {9863FCB3-BFA4-4B9C-B8F6-302BA5F660B8} {EF78C0E8-68BE-4901-BC1B-F636AD8FE21B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AB} - {A1B32381-581C-4066-80C8-B36E291FC0BC} = {EF78C0E8-68BE-4901-BC1B-F636AD8FE21B} - {C60A38B9-1349-4926-9153-350810868AB3} = {EF78C0E8-68BE-4901-BC1B-F636AD8FE21B} + {646A840C-54A6-48E5-81BC-70F8CB98E5C1} = {EF78C0E8-68BE-4901-BC1B-F636AD8FE21B} {E90BC271-12E0-4C88-8900-D61E8B642E8C} = {EF78C0E8-68BE-4901-BC1B-F636AD8FE21B} - {8285361C-2352-4F4A-B418-1844164B03A3} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {41CE69A4-683C-469C-AE02-9FBA42AF6A7E} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {F85DE672-5643-43B6-BC0E-7999E80780FE} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7BEE7C44-BE12-43CC-AFB9-B5852A1F43C8} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {A23CE153-A4A3-4D3A-A6DC-0DD1B207118E} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {924D2906-70D6-4D77-8603-816648B2CCA6} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {913E21DF-D595-4D17-BD35-C823FB7AE7AC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {67BDE19A-63F4-4BBC-9086-0E874F66750C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {701DFB2B-9679-4108-A9B7-E57DDFD0B82D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {5EDB34A7-FDBF-4480-AF5E-8E4A89D6C5AD} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {DB71CDD4-C527-4444-940B-3A617DDD0DA6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6F05EEDA-81CA-4EB1-86B9-3E9189E17FF8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F0D27F5D-2820-4B54-9EEE-768F76C28513} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E99A9A87-D7C0-4164-AFA8-12BD27D77A05} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {174D6065-A38A-48A8-AAE4-97FB412A7C5E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {57105056-3EFE-487D-B41F-69037890431B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} + {E86664F7-3A44-498D-BFFB-B747E98B7229} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} + {049C776B-81F7-4762-98D8-57DD2A7D001C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} + {B86AE79E-4024-48CD-AAC1-F84EEB312494} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} + {F678A955-FC99-4094-92BD-9D94B2C6CC76} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} + {9762A1CC-1315-4B2B-9566-3A915CA62BA4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {801D34DA-CCE8-4D02-BB40-A62A2DECF1B9} diff --git a/sdk/src/Services/PartnerCentralSelling/Properties/AssemblyInfo.cs b/sdk/src/Services/PartnerCentralSelling/Properties/AssemblyInfo.cs index 1ad6cbab3b26..1ad0d1cb5086 100644 --- a/sdk/src/Services/PartnerCentralSelling/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/PartnerCentralSelling/Properties/AssemblyInfo.cs @@ -7,10 +7,8 @@ // set of attributes. Change these attribute values to modify the information // associated with an assembly. [assembly: AssemblyTitle("AWSSDK.PartnerCentralSelling")] -#if BCL35 -[assembly: AssemblyDescription("The Amazon Web Services SDK for .NET (3.5) - Partner Central Selling API. Announcing AWS Partner Central API for Selling: This service launch Introduces new APIs for co-selling opportunity management and related functions. Key features include notifications, a dynamic sandbox for testing, and streamlined validations.")] -#elif BCL45 -[assembly: AssemblyDescription("The Amazon Web Services SDK for .NET (4.5) - Partner Central Selling API. Announcing AWS Partner Central API for Selling: This service launch Introduces new APIs for co-selling opportunity management and related functions. Key features include notifications, a dynamic sandbox for testing, and streamlined validations.")] +#if BCL +[assembly: AssemblyDescription("The Amazon Web Services SDK for .NET (4.7.2) - Partner Central Selling API. Announcing AWS Partner Central API for Selling: This service launch Introduces new APIs for co-selling opportunity management and related functions. Key features include notifications, a dynamic sandbox for testing, and streamlined validations.")] #elif NETSTANDARD20 [assembly: AssemblyDescription("The Amazon Web Services SDK for .NET (NetStandard 2.0) - Partner Central Selling API. Announcing AWS Partner Central API for Selling: This service launch Introduces new APIs for co-selling opportunity management and related functions. Key features include notifications, a dynamic sandbox for testing, and streamlined validations.")] #elif NETCOREAPP3_1 @@ -43,9 +41,9 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.1")] - #if BCL -[assembly: System.Security.AllowPartiallyTrustedCallers] -#endif \ No newline at end of file +[assembly: AssemblyVersion("4.0")] +#else +[assembly: AssemblyVersion("4.0.0.0")] +#endif +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/src/Services/PaymentCryptography/Generated/AmazonPaymentCryptographyConfig.cs b/sdk/src/Services/PaymentCryptography/Generated/AmazonPaymentCryptographyConfig.cs index 98a6945a4681..d56621b8c37f 100644 --- a/sdk/src/Services/PaymentCryptography/Generated/AmazonPaymentCryptographyConfig.cs +++ b/sdk/src/Services/PaymentCryptography/Generated/AmazonPaymentCryptographyConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.PaymentCryptography public partial class AmazonPaymentCryptographyConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("Payment Cryptography", "4.0.0.0"); private static readonly AmazonPaymentCryptographyEndpointResolver EndpointResolver = new AmazonPaymentCryptographyEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("Payment Cryptography", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("Payment Cryptography", "3.7.402.4"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/PaymentCryptography/Generated/Model/Internal/MarshallTransformations/ListAliasesRequestMarshaller.cs b/sdk/src/Services/PaymentCryptography/Generated/Model/Internal/MarshallTransformations/ListAliasesRequestMarshaller.cs index 29d59cea341c..2cc67c92518e 100644 --- a/sdk/src/Services/PaymentCryptography/Generated/Model/Internal/MarshallTransformations/ListAliasesRequestMarshaller.cs +++ b/sdk/src/Services/PaymentCryptography/Generated/Model/Internal/MarshallTransformations/ListAliasesRequestMarshaller.cs @@ -65,32 +65,18 @@ public IRequest Marshall(ListAliasesRequest publicRequest) request.ResourcePath = "/"; using (MemoryStream memoryStream = new MemoryStream()) { -<<<<<<< HEAD using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) -||||||| Commit version number update changes - JsonWriter writer = new JsonWriter(stringWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetMaxResults()) -======= - JsonWriter writer = new JsonWriter(stringWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetKeyArn()) - { - context.Writer.WritePropertyName("KeyArn"); - context.Writer.Write(publicRequest.KeyArn); - } - - if(publicRequest.IsSetMaxResults()) ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b { JsonWriter writer = new JsonWriter(streamWriter); writer.Validate = false; writer.WriteObjectStart(); var context = new JsonMarshallerContext(request, writer); + if(publicRequest.IsSetKeyArn()) + { + context.Writer.WritePropertyName("KeyArn"); + context.Writer.Write(publicRequest.KeyArn); + } + if(publicRequest.IsSetMaxResults()) { context.Writer.WritePropertyName("MaxResults"); diff --git a/sdk/src/Services/PaymentCryptography/Generated/_bcl/AmazonPaymentCryptographyClient.cs b/sdk/src/Services/PaymentCryptography/Generated/_bcl/AmazonPaymentCryptographyClient.cs index 0450f83c85eb..b0ccff40cee5 100644 --- a/sdk/src/Services/PaymentCryptography/Generated/_bcl/AmazonPaymentCryptographyClient.cs +++ b/sdk/src/Services/PaymentCryptography/Generated/_bcl/AmazonPaymentCryptographyClient.cs @@ -2789,8 +2789,8 @@ public virtual ImportKeyResponse ImportKey(ImportKeyRequest request) /// /// Lists the aliases for all keys in the caller's Amazon Web Services account and Amazon - /// Web Services Region. You can filter the list of aliases. For more information, see - /// Using + /// Web Services Region. You can filter the aliases by keyARN. For more information, + /// see Using /// aliases in the Amazon Web Services Payment Cryptography User Guide. /// /// @@ -2866,8 +2866,8 @@ public virtual ListAliasesResponse ListAliases(ListAliasesRequest request) /// /// Lists the aliases for all keys in the caller's Amazon Web Services account and Amazon - /// Web Services Region. You can filter the list of aliases. For more information, see - /// Using + /// Web Services Region. You can filter the aliases by keyARN. For more information, + /// see Using /// aliases in the Amazon Web Services Payment Cryptography User Guide. /// /// diff --git a/sdk/src/Services/PaymentCryptography/PaymentCryptography.sln b/sdk/src/Services/PaymentCryptography/PaymentCryptography.sln index ba1c9469a539..1a005837d1c2 100644 --- a/sdk/src/Services/PaymentCryptography/PaymentCryptography.sln +++ b/sdk/src/Services/PaymentCryptography/PaymentCryptography.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {0365B0D8-5653-49DD-813E-C2644A93B1B6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {0365B0D8-5653-49DD-813E-C2644A93B1B6}.Debug|Any CPU.Build.0 = Debug|Any CPU {0365B0D8-5653-49DD-813E-C2644A93B1B6}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {CED0D84F-526E-46DB-9637-C54953DB4134}.Debug|Any CPU.Build.0 = Debug|Any CPU {CED0D84F-526E-46DB-9637-C54953DB4134}.Release|Any CPU.ActiveCfg = Release|Any CPU {CED0D84F-526E-46DB-9637-C54953DB4134}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {494A9745-AB28-41B1-B098-7BF5AA244E87}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {494A9745-AB28-41B1-B098-7BF5AA244E87}.Debug|Any CPU.Build.0 = Debug|Any CPU - {494A9745-AB28-41B1-B098-7BF5AA244E87}.Release|Any CPU.ActiveCfg = Release|Any CPU - {494A9745-AB28-41B1-B098-7BF5AA244E87}.Release|Any CPU.Build.0 = Release|Any CPU - {47583B3D-2650-4921-83F2-2F9204C352A3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {47583B3D-2650-4921-83F2-2F9204C352A3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {47583B3D-2650-4921-83F2-2F9204C352A3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {47583B3D-2650-4921-83F2-2F9204C352A3}.Release|Any CPU.Build.0 = Release|Any CPU - {09ADB969-8006-4896-81F6-BCE1DF640558}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {09ADB969-8006-4896-81F6-BCE1DF640558}.Debug|Any CPU.Build.0 = Debug|Any CPU - {09ADB969-8006-4896-81F6-BCE1DF640558}.Release|Any CPU.ActiveCfg = Release|Any CPU - {09ADB969-8006-4896-81F6-BCE1DF640558}.Release|Any CPU.Build.0 = Release|Any CPU - {74888924-F7DB-4706-A58F-1D1F76DC144F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {74888924-F7DB-4706-A58F-1D1F76DC144F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {74888924-F7DB-4706-A58F-1D1F76DC144F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {74888924-F7DB-4706-A58F-1D1F76DC144F}.Release|Any CPU.Build.0 = Release|Any CPU - {FEFEDB6A-1F10-4A60-B07F-7E70114D4535}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FEFEDB6A-1F10-4A60-B07F-7E70114D4535}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FEFEDB6A-1F10-4A60-B07F-7E70114D4535}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FEFEDB6A-1F10-4A60-B07F-7E70114D4535}.Release|Any CPU.Build.0 = Release|Any CPU - {BF843AA1-BFF1-46BE-8DAE-898E56952220}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BF843AA1-BFF1-46BE-8DAE-898E56952220}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BF843AA1-BFF1-46BE-8DAE-898E56952220}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BF843AA1-BFF1-46BE-8DAE-898E56952220}.Release|Any CPU.Build.0 = Release|Any CPU - {682C2695-BB62-4D80-9F42-1A8C7BF2B920}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {682C2695-BB62-4D80-9F42-1A8C7BF2B920}.Debug|Any CPU.Build.0 = Debug|Any CPU - {682C2695-BB62-4D80-9F42-1A8C7BF2B920}.Release|Any CPU.ActiveCfg = Release|Any CPU - {682C2695-BB62-4D80-9F42-1A8C7BF2B920}.Release|Any CPU.Build.0 = Release|Any CPU - {DC92A0C1-F226-4C42-AE35-24D24DD4DF83}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DC92A0C1-F226-4C42-AE35-24D24DD4DF83}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DC92A0C1-F226-4C42-AE35-24D24DD4DF83}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DC92A0C1-F226-4C42-AE35-24D24DD4DF83}.Release|Any CPU.Build.0 = Release|Any CPU - {CF82407C-1B8E-4163-96E1-C42312F05811}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CF82407C-1B8E-4163-96E1-C42312F05811}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CF82407C-1B8E-4163-96E1-C42312F05811}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CF82407C-1B8E-4163-96E1-C42312F05811}.Release|Any CPU.Build.0 = Release|Any CPU - {E42B60C6-B9E3-4C03-B496-ED579360CBEA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E42B60C6-B9E3-4C03-B496-ED579360CBEA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E42B60C6-B9E3-4C03-B496-ED579360CBEA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E42B60C6-B9E3-4C03-B496-ED579360CBEA}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {494A9745-AB28-41B1-B098-7BF5AA244E87}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {494A9745-AB28-41B1-B098-7BF5AA244E87}.Debug|Any CPU.Build.0 = Debug|Any CPU - {494A9745-AB28-41B1-B098-7BF5AA244E87}.Release|Any CPU.ActiveCfg = Release|Any CPU - {494A9745-AB28-41B1-B098-7BF5AA244E87}.Release|Any CPU.Build.0 = Release|Any CPU - {47583B3D-2650-4921-83F2-2F9204C352A3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {47583B3D-2650-4921-83F2-2F9204C352A3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {47583B3D-2650-4921-83F2-2F9204C352A3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {47583B3D-2650-4921-83F2-2F9204C352A3}.Release|Any CPU.Build.0 = Release|Any CPU - {09ADB969-8006-4896-81F6-BCE1DF640558}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {09ADB969-8006-4896-81F6-BCE1DF640558}.Debug|Any CPU.Build.0 = Debug|Any CPU - {09ADB969-8006-4896-81F6-BCE1DF640558}.Release|Any CPU.ActiveCfg = Release|Any CPU - {09ADB969-8006-4896-81F6-BCE1DF640558}.Release|Any CPU.Build.0 = Release|Any CPU - {74888924-F7DB-4706-A58F-1D1F76DC144F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {74888924-F7DB-4706-A58F-1D1F76DC144F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {74888924-F7DB-4706-A58F-1D1F76DC144F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {74888924-F7DB-4706-A58F-1D1F76DC144F}.Release|Any CPU.Build.0 = Release|Any CPU - {FEFEDB6A-1F10-4A60-B07F-7E70114D4535}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FEFEDB6A-1F10-4A60-B07F-7E70114D4535}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FEFEDB6A-1F10-4A60-B07F-7E70114D4535}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FEFEDB6A-1F10-4A60-B07F-7E70114D4535}.Release|Any CPU.Build.0 = Release|Any CPU - {BF843AA1-BFF1-46BE-8DAE-898E56952220}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BF843AA1-BFF1-46BE-8DAE-898E56952220}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BF843AA1-BFF1-46BE-8DAE-898E56952220}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BF843AA1-BFF1-46BE-8DAE-898E56952220}.Release|Any CPU.Build.0 = Release|Any CPU - {682C2695-BB62-4D80-9F42-1A8C7BF2B920}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {682C2695-BB62-4D80-9F42-1A8C7BF2B920}.Debug|Any CPU.Build.0 = Debug|Any CPU - {682C2695-BB62-4D80-9F42-1A8C7BF2B920}.Release|Any CPU.ActiveCfg = Release|Any CPU - {682C2695-BB62-4D80-9F42-1A8C7BF2B920}.Release|Any CPU.Build.0 = Release|Any CPU - {DC92A0C1-F226-4C42-AE35-24D24DD4DF83}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DC92A0C1-F226-4C42-AE35-24D24DD4DF83}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DC92A0C1-F226-4C42-AE35-24D24DD4DF83}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DC92A0C1-F226-4C42-AE35-24D24DD4DF83}.Release|Any CPU.Build.0 = Release|Any CPU - {CF82407C-1B8E-4163-96E1-C42312F05811}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CF82407C-1B8E-4163-96E1-C42312F05811}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CF82407C-1B8E-4163-96E1-C42312F05811}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CF82407C-1B8E-4163-96E1-C42312F05811}.Release|Any CPU.Build.0 = Release|Any CPU - {E42B60C6-B9E3-4C03-B496-ED579360CBEA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E42B60C6-B9E3-4C03-B496-ED579360CBEA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E42B60C6-B9E3-4C03-B496-ED579360CBEA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E42B60C6-B9E3-4C03-B496-ED579360CBEA}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {0365B0D8-5653-49DD-813E-C2644A93B1B6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {F8935508-B3E4-4D5D-9D5A-30581B314C87} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {5154537E-0B31-4900-9C14-A3F992DED37B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {8DDD6644-3949-4CC1-AF84-79DA06D5C4A4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {CED0D84F-526E-46DB-9637-C54953DB4134} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {494A9745-AB28-41B1-B098-7BF5AA244E87} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {47583B3D-2650-4921-83F2-2F9204C352A3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {09ADB969-8006-4896-81F6-BCE1DF640558} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {74888924-F7DB-4706-A58F-1D1F76DC144F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {FEFEDB6A-1F10-4A60-B07F-7E70114D4535} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {BF843AA1-BFF1-46BE-8DAE-898E56952220} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {682C2695-BB62-4D80-9F42-1A8C7BF2B920} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {DC92A0C1-F226-4C42-AE35-24D24DD4DF83} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {CF82407C-1B8E-4163-96E1-C42312F05811} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E42B60C6-B9E3-4C03-B496-ED579360CBEA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {494A9745-AB28-41B1-B098-7BF5AA244E87} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {47583B3D-2650-4921-83F2-2F9204C352A3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {09ADB969-8006-4896-81F6-BCE1DF640558} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {74888924-F7DB-4706-A58F-1D1F76DC144F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {FEFEDB6A-1F10-4A60-B07F-7E70114D4535} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {BF843AA1-BFF1-46BE-8DAE-898E56952220} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {682C2695-BB62-4D80-9F42-1A8C7BF2B920} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {DC92A0C1-F226-4C42-AE35-24D24DD4DF83} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {CF82407C-1B8E-4163-96E1-C42312F05811} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E42B60C6-B9E3-4C03-B496-ED579360CBEA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {17E25BD0-4504-499C-853E-3718C5525FFD} diff --git a/sdk/src/Services/PaymentCryptography/Properties/AssemblyInfo.cs b/sdk/src/Services/PaymentCryptography/Properties/AssemblyInfo.cs index cf5db6014441..4a24d1fde725 100644 --- a/sdk/src/Services/PaymentCryptography/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/PaymentCryptography/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.402.4")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/PaymentCryptographyData/Generated/AmazonPaymentCryptographyDataConfig.cs b/sdk/src/Services/PaymentCryptographyData/Generated/AmazonPaymentCryptographyDataConfig.cs index 17902b4267ac..d1b33295ad3c 100644 --- a/sdk/src/Services/PaymentCryptographyData/Generated/AmazonPaymentCryptographyDataConfig.cs +++ b/sdk/src/Services/PaymentCryptographyData/Generated/AmazonPaymentCryptographyDataConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.PaymentCryptographyData public partial class AmazonPaymentCryptographyDataConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("Payment Cryptography Data", "4.0.0.0"); private static readonly AmazonPaymentCryptographyDataEndpointResolver EndpointResolver = new AmazonPaymentCryptographyDataEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("Payment Cryptography Data", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("Payment Cryptography Data", "3.7.402.15"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/PaymentCryptographyData/Generated/Model/Internal/MarshallTransformations/GenerateMacEmvPinChangeRequestMarshaller.cs b/sdk/src/Services/PaymentCryptographyData/Generated/Model/Internal/MarshallTransformations/GenerateMacEmvPinChangeRequestMarshaller.cs index 9d6c11100c7a..9b8600a6093e 100644 --- a/sdk/src/Services/PaymentCryptographyData/Generated/Model/Internal/MarshallTransformations/GenerateMacEmvPinChangeRequestMarshaller.cs +++ b/sdk/src/Services/PaymentCryptographyData/Generated/Model/Internal/MarshallTransformations/GenerateMacEmvPinChangeRequestMarshaller.cs @@ -61,62 +61,65 @@ public IRequest Marshall(GenerateMacEmvPinChangeRequest publicRequest) request.HttpMethod = "POST"; request.ResourcePath = "/macemvpinchange/generate"; - using (StringWriter stringWriter = new StringWriter(CultureInfo.InvariantCulture)) + using (MemoryStream memoryStream = new MemoryStream()) { - JsonWriter writer = new JsonWriter(stringWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetDerivationMethodAttributes()) + using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) { - context.Writer.WritePropertyName("DerivationMethodAttributes"); - context.Writer.WriteObjectStart(); - - var marshaller = DerivationMethodAttributesMarshaller.Instance; - marshaller.Marshall(publicRequest.DerivationMethodAttributes, context); - - context.Writer.WriteObjectEnd(); - } - - if(publicRequest.IsSetMessageData()) - { - context.Writer.WritePropertyName("MessageData"); - context.Writer.Write(publicRequest.MessageData); - } - - if(publicRequest.IsSetNewEncryptedPinBlock()) - { - context.Writer.WritePropertyName("NewEncryptedPinBlock"); - context.Writer.Write(publicRequest.NewEncryptedPinBlock); - } - - if(publicRequest.IsSetNewPinPekIdentifier()) - { - context.Writer.WritePropertyName("NewPinPekIdentifier"); - context.Writer.Write(publicRequest.NewPinPekIdentifier); - } - - if(publicRequest.IsSetPinBlockFormat()) - { - context.Writer.WritePropertyName("PinBlockFormat"); - context.Writer.Write(publicRequest.PinBlockFormat); - } - - if(publicRequest.IsSetSecureMessagingConfidentialityKeyIdentifier()) - { - context.Writer.WritePropertyName("SecureMessagingConfidentialityKeyIdentifier"); - context.Writer.Write(publicRequest.SecureMessagingConfidentialityKeyIdentifier); - } - - if(publicRequest.IsSetSecureMessagingIntegrityKeyIdentifier()) - { - context.Writer.WritePropertyName("SecureMessagingIntegrityKeyIdentifier"); - context.Writer.Write(publicRequest.SecureMessagingIntegrityKeyIdentifier); + JsonWriter writer = new JsonWriter(streamWriter); + writer.Validate = false; + writer.WriteObjectStart(); + var context = new JsonMarshallerContext(request, writer); + if(publicRequest.IsSetDerivationMethodAttributes()) + { + context.Writer.WritePropertyName("DerivationMethodAttributes"); + context.Writer.WriteObjectStart(); + + var marshaller = DerivationMethodAttributesMarshaller.Instance; + marshaller.Marshall(publicRequest.DerivationMethodAttributes, context); + + context.Writer.WriteObjectEnd(); + } + + if(publicRequest.IsSetMessageData()) + { + context.Writer.WritePropertyName("MessageData"); + context.Writer.Write(publicRequest.MessageData); + } + + if(publicRequest.IsSetNewEncryptedPinBlock()) + { + context.Writer.WritePropertyName("NewEncryptedPinBlock"); + context.Writer.Write(publicRequest.NewEncryptedPinBlock); + } + + if(publicRequest.IsSetNewPinPekIdentifier()) + { + context.Writer.WritePropertyName("NewPinPekIdentifier"); + context.Writer.Write(publicRequest.NewPinPekIdentifier); + } + + if(publicRequest.IsSetPinBlockFormat()) + { + context.Writer.WritePropertyName("PinBlockFormat"); + context.Writer.Write(publicRequest.PinBlockFormat); + } + + if(publicRequest.IsSetSecureMessagingConfidentialityKeyIdentifier()) + { + context.Writer.WritePropertyName("SecureMessagingConfidentialityKeyIdentifier"); + context.Writer.Write(publicRequest.SecureMessagingConfidentialityKeyIdentifier); + } + + if(publicRequest.IsSetSecureMessagingIntegrityKeyIdentifier()) + { + context.Writer.WritePropertyName("SecureMessagingIntegrityKeyIdentifier"); + context.Writer.Write(publicRequest.SecureMessagingIntegrityKeyIdentifier); + } + + writer.WriteObjectEnd(); } - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); + request.Content = memoryStream.ToArray(); } diff --git a/sdk/src/Services/PaymentCryptographyData/Generated/Model/Internal/MarshallTransformations/GeneratePinDataRequestMarshaller.cs b/sdk/src/Services/PaymentCryptographyData/Generated/Model/Internal/MarshallTransformations/GeneratePinDataRequestMarshaller.cs index e2cd36c0a636..154476975420 100644 --- a/sdk/src/Services/PaymentCryptographyData/Generated/Model/Internal/MarshallTransformations/GeneratePinDataRequestMarshaller.cs +++ b/sdk/src/Services/PaymentCryptographyData/Generated/Model/Internal/MarshallTransformations/GeneratePinDataRequestMarshaller.cs @@ -75,6 +75,17 @@ public IRequest Marshall(GeneratePinDataRequest publicRequest) context.Writer.Write(publicRequest.EncryptionKeyIdentifier); } + if(publicRequest.IsSetEncryptionWrappedKey()) + { + context.Writer.WritePropertyName("EncryptionWrappedKey"); + context.Writer.WriteObjectStart(); + + var marshaller = WrappedKeyMarshaller.Instance; + marshaller.Marshall(publicRequest.EncryptionWrappedKey, context); + + context.Writer.WriteObjectEnd(); + } + if(publicRequest.IsSetGenerationAttributes()) { context.Writer.WritePropertyName("GenerationAttributes"); @@ -113,98 +124,7 @@ public IRequest Marshall(GeneratePinDataRequest publicRequest) writer.WriteObjectEnd(); } -<<<<<<< HEAD request.Content = memoryStream.ToArray(); -||||||| Commit version number update changes - if(publicRequest.IsSetGenerationAttributes()) - { - context.Writer.WritePropertyName("GenerationAttributes"); - context.Writer.WriteObjectStart(); - - var marshaller = PinGenerationAttributesMarshaller.Instance; - marshaller.Marshall(publicRequest.GenerationAttributes, context); - - context.Writer.WriteObjectEnd(); - } - - if(publicRequest.IsSetGenerationKeyIdentifier()) - { - context.Writer.WritePropertyName("GenerationKeyIdentifier"); - context.Writer.Write(publicRequest.GenerationKeyIdentifier); - } - - if(publicRequest.IsSetPinBlockFormat()) - { - context.Writer.WritePropertyName("PinBlockFormat"); - context.Writer.Write(publicRequest.PinBlockFormat); - } - - if(publicRequest.IsSetPinDataLength()) - { - context.Writer.WritePropertyName("PinDataLength"); - context.Writer.Write(publicRequest.PinDataLength); - } - - if(publicRequest.IsSetPrimaryAccountNumber()) - { - context.Writer.WritePropertyName("PrimaryAccountNumber"); - context.Writer.Write(publicRequest.PrimaryAccountNumber); - } - - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); -======= - if(publicRequest.IsSetEncryptionWrappedKey()) - { - context.Writer.WritePropertyName("EncryptionWrappedKey"); - context.Writer.WriteObjectStart(); - - var marshaller = WrappedKeyMarshaller.Instance; - marshaller.Marshall(publicRequest.EncryptionWrappedKey, context); - - context.Writer.WriteObjectEnd(); - } - - if(publicRequest.IsSetGenerationAttributes()) - { - context.Writer.WritePropertyName("GenerationAttributes"); - context.Writer.WriteObjectStart(); - - var marshaller = PinGenerationAttributesMarshaller.Instance; - marshaller.Marshall(publicRequest.GenerationAttributes, context); - - context.Writer.WriteObjectEnd(); - } - - if(publicRequest.IsSetGenerationKeyIdentifier()) - { - context.Writer.WritePropertyName("GenerationKeyIdentifier"); - context.Writer.Write(publicRequest.GenerationKeyIdentifier); - } - - if(publicRequest.IsSetPinBlockFormat()) - { - context.Writer.WritePropertyName("PinBlockFormat"); - context.Writer.Write(publicRequest.PinBlockFormat); - } - - if(publicRequest.IsSetPinDataLength()) - { - context.Writer.WritePropertyName("PinDataLength"); - context.Writer.Write(publicRequest.PinDataLength); - } - - if(publicRequest.IsSetPrimaryAccountNumber()) - { - context.Writer.WritePropertyName("PrimaryAccountNumber"); - context.Writer.Write(publicRequest.PrimaryAccountNumber); - } - - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b } diff --git a/sdk/src/Services/PaymentCryptographyData/Generated/Model/Internal/MarshallTransformations/VerifyPinDataRequestMarshaller.cs b/sdk/src/Services/PaymentCryptographyData/Generated/Model/Internal/MarshallTransformations/VerifyPinDataRequestMarshaller.cs index 34bceda534d4..4bc1120b1b15 100644 --- a/sdk/src/Services/PaymentCryptographyData/Generated/Model/Internal/MarshallTransformations/VerifyPinDataRequestMarshaller.cs +++ b/sdk/src/Services/PaymentCryptographyData/Generated/Model/Internal/MarshallTransformations/VerifyPinDataRequestMarshaller.cs @@ -65,7 +65,6 @@ public IRequest Marshall(VerifyPinDataRequest publicRequest) { using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) { -<<<<<<< HEAD JsonWriter writer = new JsonWriter(streamWriter); writer.Validate = false; writer.WriteObjectStart(); @@ -93,6 +92,17 @@ public IRequest Marshall(VerifyPinDataRequest publicRequest) context.Writer.Write(publicRequest.EncryptionKeyIdentifier); } + if(publicRequest.IsSetEncryptionWrappedKey()) + { + context.Writer.WritePropertyName("EncryptionWrappedKey"); + context.Writer.WriteObjectStart(); + + var marshaller = WrappedKeyMarshaller.Instance; + marshaller.Marshall(publicRequest.EncryptionWrappedKey, context); + + context.Writer.WriteObjectEnd(); + } + if(publicRequest.IsSetPinBlockFormat()) { context.Writer.WritePropertyName("PinBlockFormat"); @@ -129,128 +139,6 @@ public IRequest Marshall(VerifyPinDataRequest publicRequest) } writer.WriteObjectEnd(); -||||||| Commit version number update changes - context.Writer.WritePropertyName("DukptAttributes"); - context.Writer.WriteObjectStart(); - - var marshaller = DukptAttributesMarshaller.Instance; - marshaller.Marshall(publicRequest.DukptAttributes, context); - - context.Writer.WriteObjectEnd(); - } - - if(publicRequest.IsSetEncryptedPinBlock()) - { - context.Writer.WritePropertyName("EncryptedPinBlock"); - context.Writer.Write(publicRequest.EncryptedPinBlock); - } - - if(publicRequest.IsSetEncryptionKeyIdentifier()) - { - context.Writer.WritePropertyName("EncryptionKeyIdentifier"); - context.Writer.Write(publicRequest.EncryptionKeyIdentifier); - } - - if(publicRequest.IsSetPinBlockFormat()) - { - context.Writer.WritePropertyName("PinBlockFormat"); - context.Writer.Write(publicRequest.PinBlockFormat); - } - - if(publicRequest.IsSetPinDataLength()) - { - context.Writer.WritePropertyName("PinDataLength"); - context.Writer.Write(publicRequest.PinDataLength); - } - - if(publicRequest.IsSetPrimaryAccountNumber()) - { - context.Writer.WritePropertyName("PrimaryAccountNumber"); - context.Writer.Write(publicRequest.PrimaryAccountNumber); - } - - if(publicRequest.IsSetVerificationAttributes()) - { - context.Writer.WritePropertyName("VerificationAttributes"); - context.Writer.WriteObjectStart(); - - var marshaller = PinVerificationAttributesMarshaller.Instance; - marshaller.Marshall(publicRequest.VerificationAttributes, context); - - context.Writer.WriteObjectEnd(); - } - - if(publicRequest.IsSetVerificationKeyIdentifier()) - { - context.Writer.WritePropertyName("VerificationKeyIdentifier"); - context.Writer.Write(publicRequest.VerificationKeyIdentifier); -======= - context.Writer.WritePropertyName("DukptAttributes"); - context.Writer.WriteObjectStart(); - - var marshaller = DukptAttributesMarshaller.Instance; - marshaller.Marshall(publicRequest.DukptAttributes, context); - - context.Writer.WriteObjectEnd(); - } - - if(publicRequest.IsSetEncryptedPinBlock()) - { - context.Writer.WritePropertyName("EncryptedPinBlock"); - context.Writer.Write(publicRequest.EncryptedPinBlock); - } - - if(publicRequest.IsSetEncryptionKeyIdentifier()) - { - context.Writer.WritePropertyName("EncryptionKeyIdentifier"); - context.Writer.Write(publicRequest.EncryptionKeyIdentifier); - } - - if(publicRequest.IsSetEncryptionWrappedKey()) - { - context.Writer.WritePropertyName("EncryptionWrappedKey"); - context.Writer.WriteObjectStart(); - - var marshaller = WrappedKeyMarshaller.Instance; - marshaller.Marshall(publicRequest.EncryptionWrappedKey, context); - - context.Writer.WriteObjectEnd(); - } - - if(publicRequest.IsSetPinBlockFormat()) - { - context.Writer.WritePropertyName("PinBlockFormat"); - context.Writer.Write(publicRequest.PinBlockFormat); - } - - if(publicRequest.IsSetPinDataLength()) - { - context.Writer.WritePropertyName("PinDataLength"); - context.Writer.Write(publicRequest.PinDataLength); - } - - if(publicRequest.IsSetPrimaryAccountNumber()) - { - context.Writer.WritePropertyName("PrimaryAccountNumber"); - context.Writer.Write(publicRequest.PrimaryAccountNumber); - } - - if(publicRequest.IsSetVerificationAttributes()) - { - context.Writer.WritePropertyName("VerificationAttributes"); - context.Writer.WriteObjectStart(); - - var marshaller = PinVerificationAttributesMarshaller.Instance; - marshaller.Marshall(publicRequest.VerificationAttributes, context); - - context.Writer.WriteObjectEnd(); - } - - if(publicRequest.IsSetVerificationKeyIdentifier()) - { - context.Writer.WritePropertyName("VerificationKeyIdentifier"); - context.Writer.Write(publicRequest.VerificationKeyIdentifier); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b } request.Content = memoryStream.ToArray(); diff --git a/sdk/src/Services/PaymentCryptographyData/Generated/_bcl/AmazonPaymentCryptographyDataClient.cs b/sdk/src/Services/PaymentCryptographyData/Generated/_bcl/AmazonPaymentCryptographyDataClient.cs index e9568acd3e7c..d1b601729eb7 100644 --- a/sdk/src/Services/PaymentCryptographyData/Generated/_bcl/AmazonPaymentCryptographyDataClient.cs +++ b/sdk/src/Services/PaymentCryptographyData/Generated/_bcl/AmazonPaymentCryptographyDataClient.cs @@ -272,8 +272,8 @@ protected override void Dispose(bool disposing) /// /// /// - /// You can use an encryption key generated within Amazon Web Services Payment Cryptography, - /// or you can import your own encryption key by calling ImportKey. + /// You can use an decryption key generated within Amazon Web Services Payment Cryptography, + /// or you can import your own decryption key by calling ImportKey. /// For this operation, the key must have KeyModesOfUse set to Decrypt. /// In asymmetric decryption, Amazon Web Services Payment Cryptography decrypts the ciphertext /// using the private component of the asymmetric encryption key pair. For data encryption @@ -282,6 +282,17 @@ protected override void Dispose(bool disposing) /// /// /// + /// This operation also supports dynamic keys, allowing you to pass a dynamic decryption + /// key as a TR-31 WrappedKeyBlock. This can be used when key material is frequently rotated, + /// such as during every card transaction, and there is need to avoid importing short-lived + /// keys into Amazon Web Services Payment Cryptography. To decrypt using dynamic keys, + /// the keyARN is the Key Encryption Key (KEK) of the TR-31 wrapped decryption + /// key material. The incoming wrapped key shall have a key purpose of D0 with a mode + /// of use of B or D. For more information, see Using + /// Dynamic Keys in the Amazon Web Services Payment Cryptography User Guide. + /// + /// + /// /// For symmetric and DUKPT decryption, Amazon Web Services Payment Cryptography supports /// TDES and AES algorithms. For EMV decryption, Amazon Web Services Payment /// Cryptography supports TDES algorithms. For asymmetric decryption, Amazon Web @@ -361,8 +372,8 @@ public virtual DecryptDataResponse DecryptData(DecryptDataRequest request) /// /// /// - /// You can use an encryption key generated within Amazon Web Services Payment Cryptography, - /// or you can import your own encryption key by calling ImportKey. + /// You can use an decryption key generated within Amazon Web Services Payment Cryptography, + /// or you can import your own decryption key by calling ImportKey. /// For this operation, the key must have KeyModesOfUse set to Decrypt. /// In asymmetric decryption, Amazon Web Services Payment Cryptography decrypts the ciphertext /// using the private component of the asymmetric encryption key pair. For data encryption @@ -371,6 +382,17 @@ public virtual DecryptDataResponse DecryptData(DecryptDataRequest request) /// /// /// + /// This operation also supports dynamic keys, allowing you to pass a dynamic decryption + /// key as a TR-31 WrappedKeyBlock. This can be used when key material is frequently rotated, + /// such as during every card transaction, and there is need to avoid importing short-lived + /// keys into Amazon Web Services Payment Cryptography. To decrypt using dynamic keys, + /// the keyARN is the Key Encryption Key (KEK) of the TR-31 wrapped decryption + /// key material. The incoming wrapped key shall have a key purpose of D0 with a mode + /// of use of B or D. For more information, see Using + /// Dynamic Keys in the Amazon Web Services Payment Cryptography User Guide. + /// + /// + /// /// For symmetric and DUKPT decryption, Amazon Web Services Payment Cryptography supports /// TDES and AES algorithms. For EMV decryption, Amazon Web Services Payment /// Cryptography supports TDES algorithms. For asymmetric decryption, Amazon Web @@ -460,6 +482,9 @@ public virtual DecryptDataResponse DecryptData(DecryptDataRequest request) /// You can generate an encryption key within Amazon Web Services Payment Cryptography /// by calling CreateKey. /// You can import your own encryption key by calling ImportKey. + /// + /// + /// /// For this operation, the key must have KeyModesOfUse set to Encrypt. /// In asymmetric encryption, plaintext is encrypted using public component. You can import /// the public component of an asymmetric key pair created outside Amazon Web Services @@ -468,6 +493,17 @@ public virtual DecryptDataResponse DecryptData(DecryptDataRequest request) /// /// /// + /// This operation also supports dynamic keys, allowing you to pass a dynamic encryption + /// key as a TR-31 WrappedKeyBlock. This can be used when key material is frequently rotated, + /// such as during every card transaction, and there is need to avoid importing short-lived + /// keys into Amazon Web Services Payment Cryptography. To encrypt using dynamic keys, + /// the keyARN is the Key Encryption Key (KEK) of the TR-31 wrapped encryption + /// key material. The incoming wrapped key shall have a key purpose of D0 with a mode + /// of use of B or D. For more information, see Using + /// Dynamic Keys in the Amazon Web Services Payment Cryptography User Guide. + /// + /// + /// /// For symmetric and DUKPT encryption, Amazon Web Services Payment Cryptography supports /// TDES and AES algorithms. For EMV encryption, Amazon Web Services Payment /// Cryptography supports TDES algorithms.For asymmetric encryption, Amazon Web @@ -562,6 +598,9 @@ public virtual EncryptDataResponse EncryptData(EncryptDataRequest request) /// You can generate an encryption key within Amazon Web Services Payment Cryptography /// by calling CreateKey. /// You can import your own encryption key by calling ImportKey. + /// + /// + /// /// For this operation, the key must have KeyModesOfUse set to Encrypt. /// In asymmetric encryption, plaintext is encrypted using public component. You can import /// the public component of an asymmetric key pair created outside Amazon Web Services @@ -570,6 +609,17 @@ public virtual EncryptDataResponse EncryptData(EncryptDataRequest request) /// /// /// + /// This operation also supports dynamic keys, allowing you to pass a dynamic encryption + /// key as a TR-31 WrappedKeyBlock. This can be used when key material is frequently rotated, + /// such as during every card transaction, and there is need to avoid importing short-lived + /// keys into Amazon Web Services Payment Cryptography. To encrypt using dynamic keys, + /// the keyARN is the Key Encryption Key (KEK) of the TR-31 wrapped encryption + /// key material. The incoming wrapped key shall have a key purpose of D0 with a mode + /// of use of B or D. For more information, see Using + /// Dynamic Keys in the Amazon Web Services Payment Cryptography User Guide. + /// + /// + /// /// For symmetric and DUKPT encryption, Amazon Web Services Payment Cryptography supports /// TDES and AES algorithms. For EMV encryption, Amazon Web Services Payment /// Cryptography supports TDES algorithms.For asymmetric encryption, Amazon Web @@ -962,6 +1012,187 @@ public virtual GenerateMacResponse GenerateMac(GenerateMacRequest request) #endregion + #region GenerateMacEmvPinChange + + + /// + /// Generates an issuer script mac for EMV payment cards that use offline PINs as the + /// cardholder verification method (CVM). + /// + /// + /// + /// This operation generates an authenticated issuer script response by appending the + /// incoming message data (APDU command) with the target encrypted PIN block in ISO2 format. + /// The command structure and method to send the issuer script update to the card is not + /// defined by this operation and is typically determined by the applicable payment card + /// scheme. + /// + /// + /// + /// The primary inputs to this operation include the incoming new encrypted pinblock, + /// PIN encryption key (PEK), issuer master key (IMK), primary account number (PAN), and + /// the payment card derivation method. + /// + /// + /// + /// The operation uses two issuer master keys - secure messaging for confidentiality (IMK-SMC) + /// and secure messaging for integrity (IMK-SMI). The SMC key is used to internally derive + /// a key to secure the pin, while SMI key is used to internally derive a key to authenticate + /// the script reponse as per the EMV + /// 4.4 - Book 2 - Security and Key Management specification. + /// + /// + /// + /// This operation supports Amex, EMV2000, EMVCommon, Mastercard and Visa derivation methods, + /// each requiring specific input parameters. Users must follow the specific derivation + /// method and input parameters defined by the respective payment card scheme. + /// + /// + /// + /// Use GenerateMac operation when sending a script update to an EMV card that + /// does not involve PIN change. When assigning IAM permissions, it is important to understand + /// that EncryptData using EMV keys and GenerateMac perform similar functions + /// to this command. + /// + /// + /// + /// Cross-account use: This operation can't be used across different Amazon Web + /// Services accounts. + /// + /// + /// + /// Related operations: + /// + /// + /// + /// Container for the necessary parameters to execute the GenerateMacEmvPinChange service method. + /// + /// The response from the GenerateMacEmvPinChange service method, as returned by PaymentCryptographyData. + /// + /// You do not have sufficient access to perform this action. + /// + /// + /// The request processing has failed because of an unknown error, exception, or failure. + /// + /// + /// The request was denied due to an invalid resource error. + /// + /// + /// The request was denied due to request throttling. + /// + /// + /// The request was denied due to an invalid request error. + /// + /// REST API Reference for GenerateMacEmvPinChange Operation + public virtual GenerateMacEmvPinChangeResponse GenerateMacEmvPinChange(GenerateMacEmvPinChangeRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = GenerateMacEmvPinChangeRequestMarshaller.Instance; + options.ResponseUnmarshaller = GenerateMacEmvPinChangeResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// Generates an issuer script mac for EMV payment cards that use offline PINs as the + /// cardholder verification method (CVM). + /// + /// + /// + /// This operation generates an authenticated issuer script response by appending the + /// incoming message data (APDU command) with the target encrypted PIN block in ISO2 format. + /// The command structure and method to send the issuer script update to the card is not + /// defined by this operation and is typically determined by the applicable payment card + /// scheme. + /// + /// + /// + /// The primary inputs to this operation include the incoming new encrypted pinblock, + /// PIN encryption key (PEK), issuer master key (IMK), primary account number (PAN), and + /// the payment card derivation method. + /// + /// + /// + /// The operation uses two issuer master keys - secure messaging for confidentiality (IMK-SMC) + /// and secure messaging for integrity (IMK-SMI). The SMC key is used to internally derive + /// a key to secure the pin, while SMI key is used to internally derive a key to authenticate + /// the script reponse as per the EMV + /// 4.4 - Book 2 - Security and Key Management specification. + /// + /// + /// + /// This operation supports Amex, EMV2000, EMVCommon, Mastercard and Visa derivation methods, + /// each requiring specific input parameters. Users must follow the specific derivation + /// method and input parameters defined by the respective payment card scheme. + /// + /// + /// + /// Use GenerateMac operation when sending a script update to an EMV card that + /// does not involve PIN change. When assigning IAM permissions, it is important to understand + /// that EncryptData using EMV keys and GenerateMac perform similar functions + /// to this command. + /// + /// + /// + /// Cross-account use: This operation can't be used across different Amazon Web + /// Services accounts. + /// + /// + /// + /// Related operations: + /// + /// + /// + /// Container for the necessary parameters to execute the GenerateMacEmvPinChange service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the GenerateMacEmvPinChange service method, as returned by PaymentCryptographyData. + /// + /// You do not have sufficient access to perform this action. + /// + /// + /// The request processing has failed because of an unknown error, exception, or failure. + /// + /// + /// The request was denied due to an invalid resource error. + /// + /// + /// The request was denied due to request throttling. + /// + /// + /// The request was denied due to an invalid request error. + /// + /// REST API Reference for GenerateMacEmvPinChange Operation + public virtual Task GenerateMacEmvPinChangeAsync(GenerateMacEmvPinChangeRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = GenerateMacEmvPinChangeRequestMarshaller.Instance; + options.ResponseUnmarshaller = GenerateMacEmvPinChangeResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + #region GeneratePinData @@ -980,6 +1211,15 @@ public virtual GenerateMacResponse GenerateMac(GenerateMacRequest request) /// /// /// + /// Using ECDH key exchange, you can receive cardholder selectable PINs into Amazon Web + /// Services Payment Cryptography. The ECDH derived key protects the incoming PIN block. + /// You can also use it for reveal PIN, wherein the generated PIN block is protected by + /// the ECDH derived key before transmission from Amazon Web Services Payment Cryptography. + /// For more information on establishing ECDH derived keys, see the Generating + /// keys in the Amazon Web Services Payment Cryptography User Guide. + /// + /// + /// /// For information about valid keys for this operation, see Understanding /// key attributes and Key /// types for specific data operations in the Amazon Web Services Payment Cryptography @@ -1052,6 +1292,15 @@ public virtual GeneratePinDataResponse GeneratePinData(GeneratePinDataRequest re /// /// /// + /// Using ECDH key exchange, you can receive cardholder selectable PINs into Amazon Web + /// Services Payment Cryptography. The ECDH derived key protects the incoming PIN block. + /// You can also use it for reveal PIN, wherein the generated PIN block is protected by + /// the ECDH derived key before transmission from Amazon Web Services Payment Cryptography. + /// For more information on establishing ECDH derived keys, see the Generating + /// keys in the Amazon Web Services Payment Cryptography User Guide. + /// + /// + /// /// For information about valid keys for this operation, see Understanding /// key attributes and Key /// types for specific data operations in the Amazon Web Services Payment Cryptography @@ -1129,6 +1378,17 @@ public virtual GeneratePinDataResponse GeneratePinData(GeneratePinDataRequest re /// /// /// + /// This operation also supports dynamic keys, allowing you to pass a dynamic encryption + /// key as a TR-31 WrappedKeyBlock. This can be used when key material is frequently rotated, + /// such as during every card transaction, and there is need to avoid importing short-lived + /// keys into Amazon Web Services Payment Cryptography. To re-encrypt using dynamic keys, + /// the keyARN is the Key Encryption Key (KEK) of the TR-31 wrapped encryption + /// key material. The incoming wrapped key shall have a key purpose of D0 with a mode + /// of use of B or D. For more information, see Using + /// Dynamic Keys in the Amazon Web Services Payment Cryptography User Guide. + /// + /// + /// /// For symmetric and DUKPT encryption, Amazon Web Services Payment Cryptography supports /// TDES and AES algorithms. To encrypt using DUKPT, a DUKPT key must already /// exist within your account with KeyModesOfUse set to DeriveKey or a new @@ -1212,6 +1472,17 @@ public virtual ReEncryptDataResponse ReEncryptData(ReEncryptDataRequest request) /// /// /// + /// This operation also supports dynamic keys, allowing you to pass a dynamic encryption + /// key as a TR-31 WrappedKeyBlock. This can be used when key material is frequently rotated, + /// such as during every card transaction, and there is need to avoid importing short-lived + /// keys into Amazon Web Services Payment Cryptography. To re-encrypt using dynamic keys, + /// the keyARN is the Key Encryption Key (KEK) of the TR-31 wrapped encryption + /// key material. The incoming wrapped key shall have a key purpose of D0 with a mode + /// of use of B or D. For more information, see Using + /// Dynamic Keys in the Amazon Web Services Payment Cryptography User Guide. + /// + /// + /// /// For symmetric and DUKPT encryption, Amazon Web Services Payment Cryptography supports /// TDES and AES algorithms. To encrypt using DUKPT, a DUKPT key must already /// exist within your account with KeyModesOfUse set to DeriveKey or a new @@ -1296,12 +1567,37 @@ public virtual ReEncryptDataResponse ReEncryptData(ReEncryptDataRequest request) /// /// /// - /// PIN block translation involves changing the encrytion of PIN block from one encryption - /// key to another encryption key and changing PIN block format from one to another without - /// PIN block data leaving Amazon Web Services Payment Cryptography. The encryption key - /// transformation can be from PEK (Pin Encryption Key) to BDK (Base Derivation Key) for - /// DUKPT or from BDK for DUKPT to PEK. Amazon Web Services Payment Cryptography supports - /// TDES and AES key derivation type for DUKPT translations. + /// PIN block translation involves changing a PIN block from one encryption key to another + /// and optionally change its format. PIN block translation occurs entirely within the + /// HSM boundary and PIN data never enters or leaves Amazon Web Services Payment Cryptography + /// in clear text. The encryption key transformation can be from PEK (Pin Encryption Key) + /// to BDK (Base Derivation Key) for DUKPT or from BDK for DUKPT to PEK. + /// + /// + /// + /// Amazon Web Services Payment Cryptography also supports use of dynamic keys and ECDH + /// (Elliptic Curve Diffie-Hellman) based key exchange for this operation. + /// + /// + /// + /// Dynamic keys allow you to pass a PEK as a TR-31 WrappedKeyBlock. They can be used + /// when key material is frequently rotated, such as during every card transaction, and + /// there is need to avoid importing short-lived keys into Amazon Web Services Payment + /// Cryptography. To translate PIN block using dynamic keys, the keyARN is the + /// Key Encryption Key (KEK) of the TR-31 wrapped PEK. The incoming wrapped key shall + /// have a key purpose of P0 with a mode of use of B or D. For more information, see Using + /// Dynamic Keys in the Amazon Web Services Payment Cryptography User Guide. + /// + /// + /// + /// Using ECDH key exchange, you can receive cardholder selectable PINs into Amazon Web + /// Services Payment Cryptography. The ECDH derived key protects the incoming PIN block, + /// which is translated to a PEK encrypted PIN block for use within the service. You can + /// also use ECDH for reveal PIN, wherein the service translates the PIN block from PEK + /// to a ECDH derived encryption key. For more information on establishing ECDH derived + /// keys, see the Generating + /// keys in the Amazon Web Services Payment Cryptography User Guide. /// /// /// @@ -1379,12 +1675,37 @@ public virtual TranslatePinDataResponse TranslatePinData(TranslatePinDataRequest /// /// /// - /// PIN block translation involves changing the encrytion of PIN block from one encryption - /// key to another encryption key and changing PIN block format from one to another without - /// PIN block data leaving Amazon Web Services Payment Cryptography. The encryption key - /// transformation can be from PEK (Pin Encryption Key) to BDK (Base Derivation Key) for - /// DUKPT or from BDK for DUKPT to PEK. Amazon Web Services Payment Cryptography supports - /// TDES and AES key derivation type for DUKPT translations. + /// PIN block translation involves changing a PIN block from one encryption key to another + /// and optionally change its format. PIN block translation occurs entirely within the + /// HSM boundary and PIN data never enters or leaves Amazon Web Services Payment Cryptography + /// in clear text. The encryption key transformation can be from PEK (Pin Encryption Key) + /// to BDK (Base Derivation Key) for DUKPT or from BDK for DUKPT to PEK. + /// + /// + /// + /// Amazon Web Services Payment Cryptography also supports use of dynamic keys and ECDH + /// (Elliptic Curve Diffie-Hellman) based key exchange for this operation. + /// + /// + /// + /// Dynamic keys allow you to pass a PEK as a TR-31 WrappedKeyBlock. They can be used + /// when key material is frequently rotated, such as during every card transaction, and + /// there is need to avoid importing short-lived keys into Amazon Web Services Payment + /// Cryptography. To translate PIN block using dynamic keys, the keyARN is the + /// Key Encryption Key (KEK) of the TR-31 wrapped PEK. The incoming wrapped key shall + /// have a key purpose of P0 with a mode of use of B or D. For more information, see Using + /// Dynamic Keys in the Amazon Web Services Payment Cryptography User Guide. + /// + /// + /// + /// Using ECDH key exchange, you can receive cardholder selectable PINs into Amazon Web + /// Services Payment Cryptography. The ECDH derived key protects the incoming PIN block, + /// which is translated to a PEK encrypted PIN block for use within the service. You can + /// also use ECDH for reveal PIN, wherein the service translates the PIN block from PEK + /// to a ECDH derived encryption key. For more information on establishing ECDH derived + /// keys, see the Generating + /// keys in the Amazon Web Services Payment Cryptography User Guide. /// /// /// diff --git a/sdk/src/Services/PaymentCryptographyData/PaymentCryptographyData.sln b/sdk/src/Services/PaymentCryptographyData/PaymentCryptographyData.sln index 1c54c21dad7a..70dbdac927d5 100644 --- a/sdk/src/Services/PaymentCryptographyData/PaymentCryptographyData.sln +++ b/sdk/src/Services/PaymentCryptographyData/PaymentCryptographyData.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {435CFB69-5254-49EB-91C4-943D6979345D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {435CFB69-5254-49EB-91C4-943D6979345D}.Debug|Any CPU.Build.0 = Debug|Any CPU {435CFB69-5254-49EB-91C4-943D6979345D}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {9D7E51FA-6EBD-43C8-970D-B0914C012938}.Debug|Any CPU.Build.0 = Debug|Any CPU {9D7E51FA-6EBD-43C8-970D-B0914C012938}.Release|Any CPU.ActiveCfg = Release|Any CPU {9D7E51FA-6EBD-43C8-970D-B0914C012938}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {FE28A050-A33B-4A6F-8223-B999D13A0432}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FE28A050-A33B-4A6F-8223-B999D13A0432}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FE28A050-A33B-4A6F-8223-B999D13A0432}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FE28A050-A33B-4A6F-8223-B999D13A0432}.Release|Any CPU.Build.0 = Release|Any CPU - {13708149-6FE7-42DF-8FFA-0F6E4CB9DE17}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {13708149-6FE7-42DF-8FFA-0F6E4CB9DE17}.Debug|Any CPU.Build.0 = Debug|Any CPU - {13708149-6FE7-42DF-8FFA-0F6E4CB9DE17}.Release|Any CPU.ActiveCfg = Release|Any CPU - {13708149-6FE7-42DF-8FFA-0F6E4CB9DE17}.Release|Any CPU.Build.0 = Release|Any CPU - {E39BF423-3FD0-4D42-8D42-698FE0CF4D41}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E39BF423-3FD0-4D42-8D42-698FE0CF4D41}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E39BF423-3FD0-4D42-8D42-698FE0CF4D41}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E39BF423-3FD0-4D42-8D42-698FE0CF4D41}.Release|Any CPU.Build.0 = Release|Any CPU - {54AA61F2-12FC-4EAC-A984-48C0FD2072FB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {54AA61F2-12FC-4EAC-A984-48C0FD2072FB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {54AA61F2-12FC-4EAC-A984-48C0FD2072FB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {54AA61F2-12FC-4EAC-A984-48C0FD2072FB}.Release|Any CPU.Build.0 = Release|Any CPU - {742C21F2-C15C-4043-8569-27227358BA5C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {742C21F2-C15C-4043-8569-27227358BA5C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {742C21F2-C15C-4043-8569-27227358BA5C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {742C21F2-C15C-4043-8569-27227358BA5C}.Release|Any CPU.Build.0 = Release|Any CPU - {E59F2722-2356-4F9C-9176-D2F36734EC03}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E59F2722-2356-4F9C-9176-D2F36734EC03}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E59F2722-2356-4F9C-9176-D2F36734EC03}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E59F2722-2356-4F9C-9176-D2F36734EC03}.Release|Any CPU.Build.0 = Release|Any CPU - {1C0B7AB4-D5CE-4B21-92FE-69E1A3C6DF20}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1C0B7AB4-D5CE-4B21-92FE-69E1A3C6DF20}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1C0B7AB4-D5CE-4B21-92FE-69E1A3C6DF20}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1C0B7AB4-D5CE-4B21-92FE-69E1A3C6DF20}.Release|Any CPU.Build.0 = Release|Any CPU - {578C2521-A736-41D6-A485-9B14DD504CE9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {578C2521-A736-41D6-A485-9B14DD504CE9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {578C2521-A736-41D6-A485-9B14DD504CE9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {578C2521-A736-41D6-A485-9B14DD504CE9}.Release|Any CPU.Build.0 = Release|Any CPU - {9A1DF2BE-0380-44AB-ACE7-E69218FF9B32}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9A1DF2BE-0380-44AB-ACE7-E69218FF9B32}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9A1DF2BE-0380-44AB-ACE7-E69218FF9B32}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9A1DF2BE-0380-44AB-ACE7-E69218FF9B32}.Release|Any CPU.Build.0 = Release|Any CPU - {CB1B32D3-0B61-4222-A9AC-DD1F6DE64D92}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CB1B32D3-0B61-4222-A9AC-DD1F6DE64D92}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CB1B32D3-0B61-4222-A9AC-DD1F6DE64D92}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CB1B32D3-0B61-4222-A9AC-DD1F6DE64D92}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {FE28A050-A33B-4A6F-8223-B999D13A0432}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FE28A050-A33B-4A6F-8223-B999D13A0432}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FE28A050-A33B-4A6F-8223-B999D13A0432}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FE28A050-A33B-4A6F-8223-B999D13A0432}.Release|Any CPU.Build.0 = Release|Any CPU - {13708149-6FE7-42DF-8FFA-0F6E4CB9DE17}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {13708149-6FE7-42DF-8FFA-0F6E4CB9DE17}.Debug|Any CPU.Build.0 = Debug|Any CPU - {13708149-6FE7-42DF-8FFA-0F6E4CB9DE17}.Release|Any CPU.ActiveCfg = Release|Any CPU - {13708149-6FE7-42DF-8FFA-0F6E4CB9DE17}.Release|Any CPU.Build.0 = Release|Any CPU - {E39BF423-3FD0-4D42-8D42-698FE0CF4D41}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E39BF423-3FD0-4D42-8D42-698FE0CF4D41}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E39BF423-3FD0-4D42-8D42-698FE0CF4D41}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E39BF423-3FD0-4D42-8D42-698FE0CF4D41}.Release|Any CPU.Build.0 = Release|Any CPU - {54AA61F2-12FC-4EAC-A984-48C0FD2072FB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {54AA61F2-12FC-4EAC-A984-48C0FD2072FB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {54AA61F2-12FC-4EAC-A984-48C0FD2072FB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {54AA61F2-12FC-4EAC-A984-48C0FD2072FB}.Release|Any CPU.Build.0 = Release|Any CPU - {742C21F2-C15C-4043-8569-27227358BA5C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {742C21F2-C15C-4043-8569-27227358BA5C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {742C21F2-C15C-4043-8569-27227358BA5C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {742C21F2-C15C-4043-8569-27227358BA5C}.Release|Any CPU.Build.0 = Release|Any CPU - {E59F2722-2356-4F9C-9176-D2F36734EC03}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E59F2722-2356-4F9C-9176-D2F36734EC03}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E59F2722-2356-4F9C-9176-D2F36734EC03}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E59F2722-2356-4F9C-9176-D2F36734EC03}.Release|Any CPU.Build.0 = Release|Any CPU - {1C0B7AB4-D5CE-4B21-92FE-69E1A3C6DF20}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1C0B7AB4-D5CE-4B21-92FE-69E1A3C6DF20}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1C0B7AB4-D5CE-4B21-92FE-69E1A3C6DF20}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1C0B7AB4-D5CE-4B21-92FE-69E1A3C6DF20}.Release|Any CPU.Build.0 = Release|Any CPU - {578C2521-A736-41D6-A485-9B14DD504CE9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {578C2521-A736-41D6-A485-9B14DD504CE9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {578C2521-A736-41D6-A485-9B14DD504CE9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {578C2521-A736-41D6-A485-9B14DD504CE9}.Release|Any CPU.Build.0 = Release|Any CPU - {9A1DF2BE-0380-44AB-ACE7-E69218FF9B32}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9A1DF2BE-0380-44AB-ACE7-E69218FF9B32}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9A1DF2BE-0380-44AB-ACE7-E69218FF9B32}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9A1DF2BE-0380-44AB-ACE7-E69218FF9B32}.Release|Any CPU.Build.0 = Release|Any CPU - {CB1B32D3-0B61-4222-A9AC-DD1F6DE64D92}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CB1B32D3-0B61-4222-A9AC-DD1F6DE64D92}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CB1B32D3-0B61-4222-A9AC-DD1F6DE64D92}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CB1B32D3-0B61-4222-A9AC-DD1F6DE64D92}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {435CFB69-5254-49EB-91C4-943D6979345D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {BC791225-9893-43EF-8169-7FA3AB871359} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {218F6A47-9879-4683-9A55-424020A30BC5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {0AE0FE74-924F-4DA1-AEDF-C4670A2211A3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {9D7E51FA-6EBD-43C8-970D-B0914C012938} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {FE28A050-A33B-4A6F-8223-B999D13A0432} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {13708149-6FE7-42DF-8FFA-0F6E4CB9DE17} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E39BF423-3FD0-4D42-8D42-698FE0CF4D41} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {54AA61F2-12FC-4EAC-A984-48C0FD2072FB} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {742C21F2-C15C-4043-8569-27227358BA5C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E59F2722-2356-4F9C-9176-D2F36734EC03} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {1C0B7AB4-D5CE-4B21-92FE-69E1A3C6DF20} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {578C2521-A736-41D6-A485-9B14DD504CE9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {9A1DF2BE-0380-44AB-ACE7-E69218FF9B32} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {CB1B32D3-0B61-4222-A9AC-DD1F6DE64D92} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {FE28A050-A33B-4A6F-8223-B999D13A0432} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {13708149-6FE7-42DF-8FFA-0F6E4CB9DE17} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E39BF423-3FD0-4D42-8D42-698FE0CF4D41} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {54AA61F2-12FC-4EAC-A984-48C0FD2072FB} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {742C21F2-C15C-4043-8569-27227358BA5C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E59F2722-2356-4F9C-9176-D2F36734EC03} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {1C0B7AB4-D5CE-4B21-92FE-69E1A3C6DF20} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {578C2521-A736-41D6-A485-9B14DD504CE9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {9A1DF2BE-0380-44AB-ACE7-E69218FF9B32} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {CB1B32D3-0B61-4222-A9AC-DD1F6DE64D92} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {0F00C640-2C84-4128-AF8A-14D71A44D163} diff --git a/sdk/src/Services/PaymentCryptographyData/Properties/AssemblyInfo.cs b/sdk/src/Services/PaymentCryptographyData/Properties/AssemblyInfo.cs index 34bdb90b92ca..06867bc0aa1f 100644 --- a/sdk/src/Services/PaymentCryptographyData/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/PaymentCryptographyData/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.402.15")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/PcaConnectorAd/Generated/AmazonPcaConnectorAdConfig.cs b/sdk/src/Services/PcaConnectorAd/Generated/AmazonPcaConnectorAdConfig.cs index f7312438cfe1..fd734e13a25d 100644 --- a/sdk/src/Services/PcaConnectorAd/Generated/AmazonPcaConnectorAdConfig.cs +++ b/sdk/src/Services/PcaConnectorAd/Generated/AmazonPcaConnectorAdConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.PcaConnectorAd public partial class AmazonPcaConnectorAdConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("Pca Connector Ad", "4.0.0.0"); private static readonly AmazonPcaConnectorAdEndpointResolver EndpointResolver = new AmazonPcaConnectorAdEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("Pca Connector Ad", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("Pca Connector Ad", "3.7.400.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/PcaConnectorAd/PcaConnectorAd.sln b/sdk/src/Services/PcaConnectorAd/PcaConnectorAd.sln index 0187c3b45ac9..46a718a13e36 100644 --- a/sdk/src/Services/PcaConnectorAd/PcaConnectorAd.sln +++ b/sdk/src/Services/PcaConnectorAd/PcaConnectorAd.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {88D123F2-97E5-44B3-B79A-49262638ECC8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {88D123F2-97E5-44B3-B79A-49262638ECC8}.Debug|Any CPU.Build.0 = Debug|Any CPU {88D123F2-97E5-44B3-B79A-49262638ECC8}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {CFE76B67-7CB4-4F74-88D5-A1FBA694F6E5}.Debug|Any CPU.Build.0 = Debug|Any CPU {CFE76B67-7CB4-4F74-88D5-A1FBA694F6E5}.Release|Any CPU.ActiveCfg = Release|Any CPU {CFE76B67-7CB4-4F74-88D5-A1FBA694F6E5}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {AAAEC0F5-AA88-4983-909C-62ED8D9027C9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AAAEC0F5-AA88-4983-909C-62ED8D9027C9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AAAEC0F5-AA88-4983-909C-62ED8D9027C9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AAAEC0F5-AA88-4983-909C-62ED8D9027C9}.Release|Any CPU.Build.0 = Release|Any CPU - {9E48E7AD-5879-4643-B4CF-77AB454E661C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9E48E7AD-5879-4643-B4CF-77AB454E661C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9E48E7AD-5879-4643-B4CF-77AB454E661C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9E48E7AD-5879-4643-B4CF-77AB454E661C}.Release|Any CPU.Build.0 = Release|Any CPU - {91D1607B-8A0B-4036-B938-DA8C7BBA4726}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {91D1607B-8A0B-4036-B938-DA8C7BBA4726}.Debug|Any CPU.Build.0 = Debug|Any CPU - {91D1607B-8A0B-4036-B938-DA8C7BBA4726}.Release|Any CPU.ActiveCfg = Release|Any CPU - {91D1607B-8A0B-4036-B938-DA8C7BBA4726}.Release|Any CPU.Build.0 = Release|Any CPU - {A7EA592A-33D3-48F7-8712-BF7E79CE38C5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A7EA592A-33D3-48F7-8712-BF7E79CE38C5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A7EA592A-33D3-48F7-8712-BF7E79CE38C5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A7EA592A-33D3-48F7-8712-BF7E79CE38C5}.Release|Any CPU.Build.0 = Release|Any CPU - {EB2A58C8-F59E-4871-AA5B-0EF73F103963}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EB2A58C8-F59E-4871-AA5B-0EF73F103963}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EB2A58C8-F59E-4871-AA5B-0EF73F103963}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EB2A58C8-F59E-4871-AA5B-0EF73F103963}.Release|Any CPU.Build.0 = Release|Any CPU - {4F042DC4-BD15-48AA-9AA3-265B1C5D0990}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4F042DC4-BD15-48AA-9AA3-265B1C5D0990}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4F042DC4-BD15-48AA-9AA3-265B1C5D0990}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4F042DC4-BD15-48AA-9AA3-265B1C5D0990}.Release|Any CPU.Build.0 = Release|Any CPU - {500F4801-E881-45ED-8E45-786A69A93CCD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {500F4801-E881-45ED-8E45-786A69A93CCD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {500F4801-E881-45ED-8E45-786A69A93CCD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {500F4801-E881-45ED-8E45-786A69A93CCD}.Release|Any CPU.Build.0 = Release|Any CPU - {4994180C-0C88-46C1-B660-E1C671F01626}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4994180C-0C88-46C1-B660-E1C671F01626}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4994180C-0C88-46C1-B660-E1C671F01626}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4994180C-0C88-46C1-B660-E1C671F01626}.Release|Any CPU.Build.0 = Release|Any CPU - {C96A120C-A8F4-4C9B-9183-1B97F147E5F6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C96A120C-A8F4-4C9B-9183-1B97F147E5F6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C96A120C-A8F4-4C9B-9183-1B97F147E5F6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C96A120C-A8F4-4C9B-9183-1B97F147E5F6}.Release|Any CPU.Build.0 = Release|Any CPU - {1C053655-9CD0-4A45-B44F-58602EFE5798}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1C053655-9CD0-4A45-B44F-58602EFE5798}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1C053655-9CD0-4A45-B44F-58602EFE5798}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1C053655-9CD0-4A45-B44F-58602EFE5798}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {AAAEC0F5-AA88-4983-909C-62ED8D9027C9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AAAEC0F5-AA88-4983-909C-62ED8D9027C9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AAAEC0F5-AA88-4983-909C-62ED8D9027C9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AAAEC0F5-AA88-4983-909C-62ED8D9027C9}.Release|Any CPU.Build.0 = Release|Any CPU - {9E48E7AD-5879-4643-B4CF-77AB454E661C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9E48E7AD-5879-4643-B4CF-77AB454E661C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9E48E7AD-5879-4643-B4CF-77AB454E661C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9E48E7AD-5879-4643-B4CF-77AB454E661C}.Release|Any CPU.Build.0 = Release|Any CPU - {91D1607B-8A0B-4036-B938-DA8C7BBA4726}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {91D1607B-8A0B-4036-B938-DA8C7BBA4726}.Debug|Any CPU.Build.0 = Debug|Any CPU - {91D1607B-8A0B-4036-B938-DA8C7BBA4726}.Release|Any CPU.ActiveCfg = Release|Any CPU - {91D1607B-8A0B-4036-B938-DA8C7BBA4726}.Release|Any CPU.Build.0 = Release|Any CPU - {A7EA592A-33D3-48F7-8712-BF7E79CE38C5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A7EA592A-33D3-48F7-8712-BF7E79CE38C5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A7EA592A-33D3-48F7-8712-BF7E79CE38C5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A7EA592A-33D3-48F7-8712-BF7E79CE38C5}.Release|Any CPU.Build.0 = Release|Any CPU - {EB2A58C8-F59E-4871-AA5B-0EF73F103963}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EB2A58C8-F59E-4871-AA5B-0EF73F103963}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EB2A58C8-F59E-4871-AA5B-0EF73F103963}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EB2A58C8-F59E-4871-AA5B-0EF73F103963}.Release|Any CPU.Build.0 = Release|Any CPU - {4F042DC4-BD15-48AA-9AA3-265B1C5D0990}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4F042DC4-BD15-48AA-9AA3-265B1C5D0990}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4F042DC4-BD15-48AA-9AA3-265B1C5D0990}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4F042DC4-BD15-48AA-9AA3-265B1C5D0990}.Release|Any CPU.Build.0 = Release|Any CPU - {500F4801-E881-45ED-8E45-786A69A93CCD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {500F4801-E881-45ED-8E45-786A69A93CCD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {500F4801-E881-45ED-8E45-786A69A93CCD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {500F4801-E881-45ED-8E45-786A69A93CCD}.Release|Any CPU.Build.0 = Release|Any CPU - {4994180C-0C88-46C1-B660-E1C671F01626}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4994180C-0C88-46C1-B660-E1C671F01626}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4994180C-0C88-46C1-B660-E1C671F01626}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4994180C-0C88-46C1-B660-E1C671F01626}.Release|Any CPU.Build.0 = Release|Any CPU - {C96A120C-A8F4-4C9B-9183-1B97F147E5F6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C96A120C-A8F4-4C9B-9183-1B97F147E5F6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C96A120C-A8F4-4C9B-9183-1B97F147E5F6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C96A120C-A8F4-4C9B-9183-1B97F147E5F6}.Release|Any CPU.Build.0 = Release|Any CPU - {1C053655-9CD0-4A45-B44F-58602EFE5798}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1C053655-9CD0-4A45-B44F-58602EFE5798}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1C053655-9CD0-4A45-B44F-58602EFE5798}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1C053655-9CD0-4A45-B44F-58602EFE5798}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {88D123F2-97E5-44B3-B79A-49262638ECC8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {B657FA50-79F3-46A4-9911-DA69394EC6A7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {E37FD35F-72DF-4276-8272-8B8350AA0C5D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {6E8B91CF-F720-4E94-B248-90C0067500B5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {CFE76B67-7CB4-4F74-88D5-A1FBA694F6E5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {AAAEC0F5-AA88-4983-909C-62ED8D9027C9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {9E48E7AD-5879-4643-B4CF-77AB454E661C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {91D1607B-8A0B-4036-B938-DA8C7BBA4726} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A7EA592A-33D3-48F7-8712-BF7E79CE38C5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {EB2A58C8-F59E-4871-AA5B-0EF73F103963} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4F042DC4-BD15-48AA-9AA3-265B1C5D0990} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {500F4801-E881-45ED-8E45-786A69A93CCD} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4994180C-0C88-46C1-B660-E1C671F01626} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C96A120C-A8F4-4C9B-9183-1B97F147E5F6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {1C053655-9CD0-4A45-B44F-58602EFE5798} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {AAAEC0F5-AA88-4983-909C-62ED8D9027C9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {9E48E7AD-5879-4643-B4CF-77AB454E661C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {91D1607B-8A0B-4036-B938-DA8C7BBA4726} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A7EA592A-33D3-48F7-8712-BF7E79CE38C5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {EB2A58C8-F59E-4871-AA5B-0EF73F103963} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4F042DC4-BD15-48AA-9AA3-265B1C5D0990} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {500F4801-E881-45ED-8E45-786A69A93CCD} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4994180C-0C88-46C1-B660-E1C671F01626} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C96A120C-A8F4-4C9B-9183-1B97F147E5F6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {1C053655-9CD0-4A45-B44F-58602EFE5798} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {22884844-F8F7-4C03-86DD-57824E9C0676} diff --git a/sdk/src/Services/PcaConnectorAd/Properties/AssemblyInfo.cs b/sdk/src/Services/PcaConnectorAd/Properties/AssemblyInfo.cs index a2bde3416b7b..0acc058663d7 100644 --- a/sdk/src/Services/PcaConnectorAd/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/PcaConnectorAd/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/PcaConnectorScep/Generated/AmazonPcaConnectorScepConfig.cs b/sdk/src/Services/PcaConnectorScep/Generated/AmazonPcaConnectorScepConfig.cs index c7a3acd5f39f..95417ba3bfde 100644 --- a/sdk/src/Services/PcaConnectorScep/Generated/AmazonPcaConnectorScepConfig.cs +++ b/sdk/src/Services/PcaConnectorScep/Generated/AmazonPcaConnectorScepConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.PcaConnectorScep public partial class AmazonPcaConnectorScepConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("Pca Connector Scep", "4.0.0.0"); private static readonly AmazonPcaConnectorScepEndpointResolver EndpointResolver = new AmazonPcaConnectorScepEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("Pca Connector Scep", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("Pca Connector Scep", "3.7.400.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/PcaConnectorScep/PcaConnectorScep.sln b/sdk/src/Services/PcaConnectorScep/PcaConnectorScep.sln index a3818c6b19b5..e3277b2c6db1 100644 --- a/sdk/src/Services/PcaConnectorScep/PcaConnectorScep.sln +++ b/sdk/src/Services/PcaConnectorScep/PcaConnectorScep.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {A2A3CD0F-32E6-4426-BE79-3FD2056B0AE1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {A2A3CD0F-32E6-4426-BE79-3FD2056B0AE1}.Debug|Any CPU.Build.0 = Debug|Any CPU {A2A3CD0F-32E6-4426-BE79-3FD2056B0AE1}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {67D7F676-CDA6-40A8-A1E3-57AB259C421D}.Debug|Any CPU.Build.0 = Debug|Any CPU {67D7F676-CDA6-40A8-A1E3-57AB259C421D}.Release|Any CPU.ActiveCfg = Release|Any CPU {67D7F676-CDA6-40A8-A1E3-57AB259C421D}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {A07B3F8C-EE8E-4808-8106-01B9F5C5B3A4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A07B3F8C-EE8E-4808-8106-01B9F5C5B3A4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A07B3F8C-EE8E-4808-8106-01B9F5C5B3A4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A07B3F8C-EE8E-4808-8106-01B9F5C5B3A4}.Release|Any CPU.Build.0 = Release|Any CPU - {DB1C1051-BE5D-41C5-BE33-D9466779C48C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DB1C1051-BE5D-41C5-BE33-D9466779C48C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DB1C1051-BE5D-41C5-BE33-D9466779C48C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DB1C1051-BE5D-41C5-BE33-D9466779C48C}.Release|Any CPU.Build.0 = Release|Any CPU - {3BE7DF8F-8D66-440E-A6DA-6ACACFA79EAB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3BE7DF8F-8D66-440E-A6DA-6ACACFA79EAB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3BE7DF8F-8D66-440E-A6DA-6ACACFA79EAB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3BE7DF8F-8D66-440E-A6DA-6ACACFA79EAB}.Release|Any CPU.Build.0 = Release|Any CPU - {9E6DDB5C-E4EC-4D86-A1C1-36602D1A2342}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9E6DDB5C-E4EC-4D86-A1C1-36602D1A2342}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9E6DDB5C-E4EC-4D86-A1C1-36602D1A2342}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9E6DDB5C-E4EC-4D86-A1C1-36602D1A2342}.Release|Any CPU.Build.0 = Release|Any CPU - {19DCA3AF-F603-400A-A4D4-42878AC3C336}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {19DCA3AF-F603-400A-A4D4-42878AC3C336}.Debug|Any CPU.Build.0 = Debug|Any CPU - {19DCA3AF-F603-400A-A4D4-42878AC3C336}.Release|Any CPU.ActiveCfg = Release|Any CPU - {19DCA3AF-F603-400A-A4D4-42878AC3C336}.Release|Any CPU.Build.0 = Release|Any CPU - {C38BF92B-BBA4-4C77-B7FC-D4EE2037BCCF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C38BF92B-BBA4-4C77-B7FC-D4EE2037BCCF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C38BF92B-BBA4-4C77-B7FC-D4EE2037BCCF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C38BF92B-BBA4-4C77-B7FC-D4EE2037BCCF}.Release|Any CPU.Build.0 = Release|Any CPU - {05C75D72-3A0C-49A3-9822-50F424BD450E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {05C75D72-3A0C-49A3-9822-50F424BD450E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {05C75D72-3A0C-49A3-9822-50F424BD450E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {05C75D72-3A0C-49A3-9822-50F424BD450E}.Release|Any CPU.Build.0 = Release|Any CPU - {4B520517-6FC3-4EBE-BC28-0AED5A421C16}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4B520517-6FC3-4EBE-BC28-0AED5A421C16}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4B520517-6FC3-4EBE-BC28-0AED5A421C16}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4B520517-6FC3-4EBE-BC28-0AED5A421C16}.Release|Any CPU.Build.0 = Release|Any CPU - {CDD33ED2-1685-4899-922B-370C9026D7FA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CDD33ED2-1685-4899-922B-370C9026D7FA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CDD33ED2-1685-4899-922B-370C9026D7FA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CDD33ED2-1685-4899-922B-370C9026D7FA}.Release|Any CPU.Build.0 = Release|Any CPU - {2AC3D0D0-D1EF-4810-8B77-0CAB06FE717E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2AC3D0D0-D1EF-4810-8B77-0CAB06FE717E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2AC3D0D0-D1EF-4810-8B77-0CAB06FE717E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2AC3D0D0-D1EF-4810-8B77-0CAB06FE717E}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {A07B3F8C-EE8E-4808-8106-01B9F5C5B3A4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A07B3F8C-EE8E-4808-8106-01B9F5C5B3A4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A07B3F8C-EE8E-4808-8106-01B9F5C5B3A4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A07B3F8C-EE8E-4808-8106-01B9F5C5B3A4}.Release|Any CPU.Build.0 = Release|Any CPU - {DB1C1051-BE5D-41C5-BE33-D9466779C48C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DB1C1051-BE5D-41C5-BE33-D9466779C48C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DB1C1051-BE5D-41C5-BE33-D9466779C48C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DB1C1051-BE5D-41C5-BE33-D9466779C48C}.Release|Any CPU.Build.0 = Release|Any CPU - {3BE7DF8F-8D66-440E-A6DA-6ACACFA79EAB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3BE7DF8F-8D66-440E-A6DA-6ACACFA79EAB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3BE7DF8F-8D66-440E-A6DA-6ACACFA79EAB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3BE7DF8F-8D66-440E-A6DA-6ACACFA79EAB}.Release|Any CPU.Build.0 = Release|Any CPU - {9E6DDB5C-E4EC-4D86-A1C1-36602D1A2342}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9E6DDB5C-E4EC-4D86-A1C1-36602D1A2342}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9E6DDB5C-E4EC-4D86-A1C1-36602D1A2342}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9E6DDB5C-E4EC-4D86-A1C1-36602D1A2342}.Release|Any CPU.Build.0 = Release|Any CPU - {19DCA3AF-F603-400A-A4D4-42878AC3C336}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {19DCA3AF-F603-400A-A4D4-42878AC3C336}.Debug|Any CPU.Build.0 = Debug|Any CPU - {19DCA3AF-F603-400A-A4D4-42878AC3C336}.Release|Any CPU.ActiveCfg = Release|Any CPU - {19DCA3AF-F603-400A-A4D4-42878AC3C336}.Release|Any CPU.Build.0 = Release|Any CPU - {C38BF92B-BBA4-4C77-B7FC-D4EE2037BCCF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C38BF92B-BBA4-4C77-B7FC-D4EE2037BCCF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C38BF92B-BBA4-4C77-B7FC-D4EE2037BCCF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C38BF92B-BBA4-4C77-B7FC-D4EE2037BCCF}.Release|Any CPU.Build.0 = Release|Any CPU - {05C75D72-3A0C-49A3-9822-50F424BD450E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {05C75D72-3A0C-49A3-9822-50F424BD450E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {05C75D72-3A0C-49A3-9822-50F424BD450E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {05C75D72-3A0C-49A3-9822-50F424BD450E}.Release|Any CPU.Build.0 = Release|Any CPU - {4B520517-6FC3-4EBE-BC28-0AED5A421C16}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4B520517-6FC3-4EBE-BC28-0AED5A421C16}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4B520517-6FC3-4EBE-BC28-0AED5A421C16}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4B520517-6FC3-4EBE-BC28-0AED5A421C16}.Release|Any CPU.Build.0 = Release|Any CPU - {CDD33ED2-1685-4899-922B-370C9026D7FA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CDD33ED2-1685-4899-922B-370C9026D7FA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CDD33ED2-1685-4899-922B-370C9026D7FA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CDD33ED2-1685-4899-922B-370C9026D7FA}.Release|Any CPU.Build.0 = Release|Any CPU - {2AC3D0D0-D1EF-4810-8B77-0CAB06FE717E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2AC3D0D0-D1EF-4810-8B77-0CAB06FE717E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2AC3D0D0-D1EF-4810-8B77-0CAB06FE717E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2AC3D0D0-D1EF-4810-8B77-0CAB06FE717E}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {A2A3CD0F-32E6-4426-BE79-3FD2056B0AE1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {A3934DEE-1FA5-4A45-AEA2-4461F209B187} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {02FA186A-DD71-49C2-B1A9-6AE58E9B5B76} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {6355F5D6-3556-4938-B1DB-089C407FB47E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {67D7F676-CDA6-40A8-A1E3-57AB259C421D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {A07B3F8C-EE8E-4808-8106-01B9F5C5B3A4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {DB1C1051-BE5D-41C5-BE33-D9466779C48C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {3BE7DF8F-8D66-440E-A6DA-6ACACFA79EAB} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {9E6DDB5C-E4EC-4D86-A1C1-36602D1A2342} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {19DCA3AF-F603-400A-A4D4-42878AC3C336} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C38BF92B-BBA4-4C77-B7FC-D4EE2037BCCF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {05C75D72-3A0C-49A3-9822-50F424BD450E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4B520517-6FC3-4EBE-BC28-0AED5A421C16} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {CDD33ED2-1685-4899-922B-370C9026D7FA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {2AC3D0D0-D1EF-4810-8B77-0CAB06FE717E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {A07B3F8C-EE8E-4808-8106-01B9F5C5B3A4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {DB1C1051-BE5D-41C5-BE33-D9466779C48C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {3BE7DF8F-8D66-440E-A6DA-6ACACFA79EAB} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {9E6DDB5C-E4EC-4D86-A1C1-36602D1A2342} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {19DCA3AF-F603-400A-A4D4-42878AC3C336} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C38BF92B-BBA4-4C77-B7FC-D4EE2037BCCF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {05C75D72-3A0C-49A3-9822-50F424BD450E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4B520517-6FC3-4EBE-BC28-0AED5A421C16} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {CDD33ED2-1685-4899-922B-370C9026D7FA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {2AC3D0D0-D1EF-4810-8B77-0CAB06FE717E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {DF32FF36-ECF6-4935-90A1-75165614697C} diff --git a/sdk/src/Services/PcaConnectorScep/Properties/AssemblyInfo.cs b/sdk/src/Services/PcaConnectorScep/Properties/AssemblyInfo.cs index 17139f9b57b6..9f4ded33955f 100644 --- a/sdk/src/Services/PcaConnectorScep/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/PcaConnectorScep/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/Personalize/Generated/AmazonPersonalizeConfig.cs b/sdk/src/Services/Personalize/Generated/AmazonPersonalizeConfig.cs index 940646e6d7c8..d0d7c088236c 100644 --- a/sdk/src/Services/Personalize/Generated/AmazonPersonalizeConfig.cs +++ b/sdk/src/Services/Personalize/Generated/AmazonPersonalizeConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.Personalize public partial class AmazonPersonalizeConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("Personalize", "4.0.0.0"); private static readonly AmazonPersonalizeEndpointResolver EndpointResolver = new AmazonPersonalizeEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("Personalize", "3.7.401.14"); -======= - InternalSDKUtils.BuildUserAgentString("Personalize", "3.7.401.41"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/Personalize/Personalize.sln b/sdk/src/Services/Personalize/Personalize.sln index 0d770d94fa57..0f8b16963ff4 100644 --- a/sdk/src/Services/Personalize/Personalize.sln +++ b/sdk/src/Services/Personalize/Personalize.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {92307E0C-2075-4450-988A-CB5911D26580}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {92307E0C-2075-4450-988A-CB5911D26580}.Debug|Any CPU.Build.0 = Debug|Any CPU {92307E0C-2075-4450-988A-CB5911D26580}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {8119528B-F580-4F9D-8101-4E574B76DB45}.Debug|Any CPU.Build.0 = Debug|Any CPU {8119528B-F580-4F9D-8101-4E574B76DB45}.Release|Any CPU.ActiveCfg = Release|Any CPU {8119528B-F580-4F9D-8101-4E574B76DB45}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {EAFEADCC-6B7E-4C70-B091-9860B7BA3EF6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EAFEADCC-6B7E-4C70-B091-9860B7BA3EF6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EAFEADCC-6B7E-4C70-B091-9860B7BA3EF6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EAFEADCC-6B7E-4C70-B091-9860B7BA3EF6}.Release|Any CPU.Build.0 = Release|Any CPU - {7492F012-F317-40CC-B4E8-7D65FB462E16}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7492F012-F317-40CC-B4E8-7D65FB462E16}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7492F012-F317-40CC-B4E8-7D65FB462E16}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7492F012-F317-40CC-B4E8-7D65FB462E16}.Release|Any CPU.Build.0 = Release|Any CPU - {BA061D18-B9A7-4902-BE1E-DCC3E4D801F1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BA061D18-B9A7-4902-BE1E-DCC3E4D801F1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BA061D18-B9A7-4902-BE1E-DCC3E4D801F1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BA061D18-B9A7-4902-BE1E-DCC3E4D801F1}.Release|Any CPU.Build.0 = Release|Any CPU - {07D67BC4-80A6-4703-A4F4-23D93AE962F5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {07D67BC4-80A6-4703-A4F4-23D93AE962F5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {07D67BC4-80A6-4703-A4F4-23D93AE962F5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {07D67BC4-80A6-4703-A4F4-23D93AE962F5}.Release|Any CPU.Build.0 = Release|Any CPU - {9934B6D0-FEE6-4220-B3BF-D50501414413}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9934B6D0-FEE6-4220-B3BF-D50501414413}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9934B6D0-FEE6-4220-B3BF-D50501414413}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9934B6D0-FEE6-4220-B3BF-D50501414413}.Release|Any CPU.Build.0 = Release|Any CPU - {4A4E6A55-17E5-4739-8949-F2F24735B77C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4A4E6A55-17E5-4739-8949-F2F24735B77C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4A4E6A55-17E5-4739-8949-F2F24735B77C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4A4E6A55-17E5-4739-8949-F2F24735B77C}.Release|Any CPU.Build.0 = Release|Any CPU - {3850AAC3-8BEF-4718-A9BA-B8CEABF0D76B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3850AAC3-8BEF-4718-A9BA-B8CEABF0D76B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3850AAC3-8BEF-4718-A9BA-B8CEABF0D76B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3850AAC3-8BEF-4718-A9BA-B8CEABF0D76B}.Release|Any CPU.Build.0 = Release|Any CPU - {5D77CF27-0E0E-4E32-99EB-1428484B498B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5D77CF27-0E0E-4E32-99EB-1428484B498B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5D77CF27-0E0E-4E32-99EB-1428484B498B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5D77CF27-0E0E-4E32-99EB-1428484B498B}.Release|Any CPU.Build.0 = Release|Any CPU - {4FD81B0B-3AE6-487E-A37D-9E6243A1CD8A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4FD81B0B-3AE6-487E-A37D-9E6243A1CD8A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4FD81B0B-3AE6-487E-A37D-9E6243A1CD8A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4FD81B0B-3AE6-487E-A37D-9E6243A1CD8A}.Release|Any CPU.Build.0 = Release|Any CPU - {A2CE87B7-ACB5-4E62-AF2C-986D5EA5D1D1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A2CE87B7-ACB5-4E62-AF2C-986D5EA5D1D1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A2CE87B7-ACB5-4E62-AF2C-986D5EA5D1D1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A2CE87B7-ACB5-4E62-AF2C-986D5EA5D1D1}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {EAFEADCC-6B7E-4C70-B091-9860B7BA3EF6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EAFEADCC-6B7E-4C70-B091-9860B7BA3EF6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EAFEADCC-6B7E-4C70-B091-9860B7BA3EF6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EAFEADCC-6B7E-4C70-B091-9860B7BA3EF6}.Release|Any CPU.Build.0 = Release|Any CPU - {7492F012-F317-40CC-B4E8-7D65FB462E16}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7492F012-F317-40CC-B4E8-7D65FB462E16}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7492F012-F317-40CC-B4E8-7D65FB462E16}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7492F012-F317-40CC-B4E8-7D65FB462E16}.Release|Any CPU.Build.0 = Release|Any CPU - {BA061D18-B9A7-4902-BE1E-DCC3E4D801F1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BA061D18-B9A7-4902-BE1E-DCC3E4D801F1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BA061D18-B9A7-4902-BE1E-DCC3E4D801F1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BA061D18-B9A7-4902-BE1E-DCC3E4D801F1}.Release|Any CPU.Build.0 = Release|Any CPU - {07D67BC4-80A6-4703-A4F4-23D93AE962F5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {07D67BC4-80A6-4703-A4F4-23D93AE962F5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {07D67BC4-80A6-4703-A4F4-23D93AE962F5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {07D67BC4-80A6-4703-A4F4-23D93AE962F5}.Release|Any CPU.Build.0 = Release|Any CPU - {9934B6D0-FEE6-4220-B3BF-D50501414413}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9934B6D0-FEE6-4220-B3BF-D50501414413}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9934B6D0-FEE6-4220-B3BF-D50501414413}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9934B6D0-FEE6-4220-B3BF-D50501414413}.Release|Any CPU.Build.0 = Release|Any CPU - {4A4E6A55-17E5-4739-8949-F2F24735B77C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4A4E6A55-17E5-4739-8949-F2F24735B77C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4A4E6A55-17E5-4739-8949-F2F24735B77C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4A4E6A55-17E5-4739-8949-F2F24735B77C}.Release|Any CPU.Build.0 = Release|Any CPU - {3850AAC3-8BEF-4718-A9BA-B8CEABF0D76B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3850AAC3-8BEF-4718-A9BA-B8CEABF0D76B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3850AAC3-8BEF-4718-A9BA-B8CEABF0D76B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3850AAC3-8BEF-4718-A9BA-B8CEABF0D76B}.Release|Any CPU.Build.0 = Release|Any CPU - {5D77CF27-0E0E-4E32-99EB-1428484B498B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5D77CF27-0E0E-4E32-99EB-1428484B498B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5D77CF27-0E0E-4E32-99EB-1428484B498B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5D77CF27-0E0E-4E32-99EB-1428484B498B}.Release|Any CPU.Build.0 = Release|Any CPU - {4FD81B0B-3AE6-487E-A37D-9E6243A1CD8A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4FD81B0B-3AE6-487E-A37D-9E6243A1CD8A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4FD81B0B-3AE6-487E-A37D-9E6243A1CD8A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4FD81B0B-3AE6-487E-A37D-9E6243A1CD8A}.Release|Any CPU.Build.0 = Release|Any CPU - {A2CE87B7-ACB5-4E62-AF2C-986D5EA5D1D1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A2CE87B7-ACB5-4E62-AF2C-986D5EA5D1D1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A2CE87B7-ACB5-4E62-AF2C-986D5EA5D1D1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A2CE87B7-ACB5-4E62-AF2C-986D5EA5D1D1}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {92307E0C-2075-4450-988A-CB5911D26580} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {DAA11722-FEDA-4632-8AFF-695A658AA573} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {77B49482-877D-4A32-BDDB-8CA3CF413EFB} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {C2B53D4B-42DA-492E-9A4B-2130CC942CB9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {8119528B-F580-4F9D-8101-4E574B76DB45} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {EAFEADCC-6B7E-4C70-B091-9860B7BA3EF6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {7492F012-F317-40CC-B4E8-7D65FB462E16} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {BA061D18-B9A7-4902-BE1E-DCC3E4D801F1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {07D67BC4-80A6-4703-A4F4-23D93AE962F5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {9934B6D0-FEE6-4220-B3BF-D50501414413} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4A4E6A55-17E5-4739-8949-F2F24735B77C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {3850AAC3-8BEF-4718-A9BA-B8CEABF0D76B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {5D77CF27-0E0E-4E32-99EB-1428484B498B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4FD81B0B-3AE6-487E-A37D-9E6243A1CD8A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A2CE87B7-ACB5-4E62-AF2C-986D5EA5D1D1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {EAFEADCC-6B7E-4C70-B091-9860B7BA3EF6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {7492F012-F317-40CC-B4E8-7D65FB462E16} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {BA061D18-B9A7-4902-BE1E-DCC3E4D801F1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {07D67BC4-80A6-4703-A4F4-23D93AE962F5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {9934B6D0-FEE6-4220-B3BF-D50501414413} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4A4E6A55-17E5-4739-8949-F2F24735B77C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {3850AAC3-8BEF-4718-A9BA-B8CEABF0D76B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {5D77CF27-0E0E-4E32-99EB-1428484B498B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4FD81B0B-3AE6-487E-A37D-9E6243A1CD8A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A2CE87B7-ACB5-4E62-AF2C-986D5EA5D1D1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {3028DA4B-0CFA-4D38-859A-53523AB512C4} diff --git a/sdk/src/Services/Personalize/Properties/AssemblyInfo.cs b/sdk/src/Services/Personalize/Properties/AssemblyInfo.cs index 76b25d974568..336fa7363c91 100644 --- a/sdk/src/Services/Personalize/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/Personalize/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.14")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.41")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/PersonalizeEvents/Generated/AmazonPersonalizeEventsConfig.cs b/sdk/src/Services/PersonalizeEvents/Generated/AmazonPersonalizeEventsConfig.cs index 8c7676bf0e1c..7e1f5f8e1b60 100644 --- a/sdk/src/Services/PersonalizeEvents/Generated/AmazonPersonalizeEventsConfig.cs +++ b/sdk/src/Services/PersonalizeEvents/Generated/AmazonPersonalizeEventsConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.PersonalizeEvents public partial class AmazonPersonalizeEventsConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("Personalize Events", "4.0.0.0"); private static readonly AmazonPersonalizeEventsEndpointResolver EndpointResolver = new AmazonPersonalizeEventsEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("Personalize Events", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("Personalize Events", "3.7.400.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/PersonalizeEvents/PersonalizeEvents.sln b/sdk/src/Services/PersonalizeEvents/PersonalizeEvents.sln index be1ff8388d25..640f00bf7600 100644 --- a/sdk/src/Services/PersonalizeEvents/PersonalizeEvents.sln +++ b/sdk/src/Services/PersonalizeEvents/PersonalizeEvents.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {B908AF29-C29E-4268-9FF2-21A867F7D775}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {B908AF29-C29E-4268-9FF2-21A867F7D775}.Debug|Any CPU.Build.0 = Debug|Any CPU {B908AF29-C29E-4268-9FF2-21A867F7D775}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {B0568C95-BF6A-4344-858D-C305ECFB7333}.Debug|Any CPU.Build.0 = Debug|Any CPU {B0568C95-BF6A-4344-858D-C305ECFB7333}.Release|Any CPU.ActiveCfg = Release|Any CPU {B0568C95-BF6A-4344-858D-C305ECFB7333}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {95B96B93-683C-4AC0-ACA6-51CB2053BF2A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {95B96B93-683C-4AC0-ACA6-51CB2053BF2A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {95B96B93-683C-4AC0-ACA6-51CB2053BF2A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {95B96B93-683C-4AC0-ACA6-51CB2053BF2A}.Release|Any CPU.Build.0 = Release|Any CPU - {DA062365-9099-44E3-926E-C9ACBD364ECC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DA062365-9099-44E3-926E-C9ACBD364ECC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DA062365-9099-44E3-926E-C9ACBD364ECC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DA062365-9099-44E3-926E-C9ACBD364ECC}.Release|Any CPU.Build.0 = Release|Any CPU - {166A3978-C9A5-4A64-BB35-3DBDEAE9D9B8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {166A3978-C9A5-4A64-BB35-3DBDEAE9D9B8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {166A3978-C9A5-4A64-BB35-3DBDEAE9D9B8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {166A3978-C9A5-4A64-BB35-3DBDEAE9D9B8}.Release|Any CPU.Build.0 = Release|Any CPU - {53D82C7B-0A82-401A-81E1-422B34FA85B2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {53D82C7B-0A82-401A-81E1-422B34FA85B2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {53D82C7B-0A82-401A-81E1-422B34FA85B2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {53D82C7B-0A82-401A-81E1-422B34FA85B2}.Release|Any CPU.Build.0 = Release|Any CPU - {C7014475-8744-4882-BE8B-5084B222D949}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C7014475-8744-4882-BE8B-5084B222D949}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C7014475-8744-4882-BE8B-5084B222D949}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C7014475-8744-4882-BE8B-5084B222D949}.Release|Any CPU.Build.0 = Release|Any CPU - {D8880CBD-413A-4135-AA25-5ABEAAFD59A3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D8880CBD-413A-4135-AA25-5ABEAAFD59A3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D8880CBD-413A-4135-AA25-5ABEAAFD59A3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D8880CBD-413A-4135-AA25-5ABEAAFD59A3}.Release|Any CPU.Build.0 = Release|Any CPU - {E169D568-D6DE-46AC-8A3B-7CDC0CBE77BA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E169D568-D6DE-46AC-8A3B-7CDC0CBE77BA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E169D568-D6DE-46AC-8A3B-7CDC0CBE77BA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E169D568-D6DE-46AC-8A3B-7CDC0CBE77BA}.Release|Any CPU.Build.0 = Release|Any CPU - {D663649B-04DE-441C-BEEC-AA3FB2F38DA2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D663649B-04DE-441C-BEEC-AA3FB2F38DA2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D663649B-04DE-441C-BEEC-AA3FB2F38DA2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D663649B-04DE-441C-BEEC-AA3FB2F38DA2}.Release|Any CPU.Build.0 = Release|Any CPU - {FBEF1F65-0061-4EDF-8653-BCD897C2FF2A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FBEF1F65-0061-4EDF-8653-BCD897C2FF2A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FBEF1F65-0061-4EDF-8653-BCD897C2FF2A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FBEF1F65-0061-4EDF-8653-BCD897C2FF2A}.Release|Any CPU.Build.0 = Release|Any CPU - {D4585FBE-908E-4FDF-918E-F3935E78D0B2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D4585FBE-908E-4FDF-918E-F3935E78D0B2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D4585FBE-908E-4FDF-918E-F3935E78D0B2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D4585FBE-908E-4FDF-918E-F3935E78D0B2}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {95B96B93-683C-4AC0-ACA6-51CB2053BF2A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {95B96B93-683C-4AC0-ACA6-51CB2053BF2A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {95B96B93-683C-4AC0-ACA6-51CB2053BF2A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {95B96B93-683C-4AC0-ACA6-51CB2053BF2A}.Release|Any CPU.Build.0 = Release|Any CPU - {DA062365-9099-44E3-926E-C9ACBD364ECC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DA062365-9099-44E3-926E-C9ACBD364ECC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DA062365-9099-44E3-926E-C9ACBD364ECC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DA062365-9099-44E3-926E-C9ACBD364ECC}.Release|Any CPU.Build.0 = Release|Any CPU - {166A3978-C9A5-4A64-BB35-3DBDEAE9D9B8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {166A3978-C9A5-4A64-BB35-3DBDEAE9D9B8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {166A3978-C9A5-4A64-BB35-3DBDEAE9D9B8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {166A3978-C9A5-4A64-BB35-3DBDEAE9D9B8}.Release|Any CPU.Build.0 = Release|Any CPU - {53D82C7B-0A82-401A-81E1-422B34FA85B2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {53D82C7B-0A82-401A-81E1-422B34FA85B2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {53D82C7B-0A82-401A-81E1-422B34FA85B2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {53D82C7B-0A82-401A-81E1-422B34FA85B2}.Release|Any CPU.Build.0 = Release|Any CPU - {C7014475-8744-4882-BE8B-5084B222D949}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C7014475-8744-4882-BE8B-5084B222D949}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C7014475-8744-4882-BE8B-5084B222D949}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C7014475-8744-4882-BE8B-5084B222D949}.Release|Any CPU.Build.0 = Release|Any CPU - {D8880CBD-413A-4135-AA25-5ABEAAFD59A3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D8880CBD-413A-4135-AA25-5ABEAAFD59A3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D8880CBD-413A-4135-AA25-5ABEAAFD59A3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D8880CBD-413A-4135-AA25-5ABEAAFD59A3}.Release|Any CPU.Build.0 = Release|Any CPU - {E169D568-D6DE-46AC-8A3B-7CDC0CBE77BA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E169D568-D6DE-46AC-8A3B-7CDC0CBE77BA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E169D568-D6DE-46AC-8A3B-7CDC0CBE77BA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E169D568-D6DE-46AC-8A3B-7CDC0CBE77BA}.Release|Any CPU.Build.0 = Release|Any CPU - {D663649B-04DE-441C-BEEC-AA3FB2F38DA2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D663649B-04DE-441C-BEEC-AA3FB2F38DA2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D663649B-04DE-441C-BEEC-AA3FB2F38DA2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D663649B-04DE-441C-BEEC-AA3FB2F38DA2}.Release|Any CPU.Build.0 = Release|Any CPU - {FBEF1F65-0061-4EDF-8653-BCD897C2FF2A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FBEF1F65-0061-4EDF-8653-BCD897C2FF2A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FBEF1F65-0061-4EDF-8653-BCD897C2FF2A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FBEF1F65-0061-4EDF-8653-BCD897C2FF2A}.Release|Any CPU.Build.0 = Release|Any CPU - {D4585FBE-908E-4FDF-918E-F3935E78D0B2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D4585FBE-908E-4FDF-918E-F3935E78D0B2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D4585FBE-908E-4FDF-918E-F3935E78D0B2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D4585FBE-908E-4FDF-918E-F3935E78D0B2}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {B908AF29-C29E-4268-9FF2-21A867F7D775} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {6B653A44-BB84-48F9-9D9E-274CD90A56FE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {9E5AE502-7849-4D15-A2BA-4C552714D2F3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {0CDE76D0-D084-4755-A0B8-60A0BC93425B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {B0568C95-BF6A-4344-858D-C305ECFB7333} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {95B96B93-683C-4AC0-ACA6-51CB2053BF2A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {DA062365-9099-44E3-926E-C9ACBD364ECC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {166A3978-C9A5-4A64-BB35-3DBDEAE9D9B8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {53D82C7B-0A82-401A-81E1-422B34FA85B2} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C7014475-8744-4882-BE8B-5084B222D949} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D8880CBD-413A-4135-AA25-5ABEAAFD59A3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E169D568-D6DE-46AC-8A3B-7CDC0CBE77BA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D663649B-04DE-441C-BEEC-AA3FB2F38DA2} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {FBEF1F65-0061-4EDF-8653-BCD897C2FF2A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D4585FBE-908E-4FDF-918E-F3935E78D0B2} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {95B96B93-683C-4AC0-ACA6-51CB2053BF2A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {DA062365-9099-44E3-926E-C9ACBD364ECC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {166A3978-C9A5-4A64-BB35-3DBDEAE9D9B8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {53D82C7B-0A82-401A-81E1-422B34FA85B2} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C7014475-8744-4882-BE8B-5084B222D949} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D8880CBD-413A-4135-AA25-5ABEAAFD59A3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E169D568-D6DE-46AC-8A3B-7CDC0CBE77BA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D663649B-04DE-441C-BEEC-AA3FB2F38DA2} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {FBEF1F65-0061-4EDF-8653-BCD897C2FF2A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D4585FBE-908E-4FDF-918E-F3935E78D0B2} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {C084ABA7-0F9E-420A-BBE0-7E14A6D10BAE} diff --git a/sdk/src/Services/PersonalizeEvents/Properties/AssemblyInfo.cs b/sdk/src/Services/PersonalizeEvents/Properties/AssemblyInfo.cs index b8a97084eff5..445f221f2a42 100644 --- a/sdk/src/Services/PersonalizeEvents/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/PersonalizeEvents/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/PersonalizeRuntime/Generated/AmazonPersonalizeRuntimeConfig.cs b/sdk/src/Services/PersonalizeRuntime/Generated/AmazonPersonalizeRuntimeConfig.cs index 91f210de7055..ba092d2a4d18 100644 --- a/sdk/src/Services/PersonalizeRuntime/Generated/AmazonPersonalizeRuntimeConfig.cs +++ b/sdk/src/Services/PersonalizeRuntime/Generated/AmazonPersonalizeRuntimeConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.PersonalizeRuntime public partial class AmazonPersonalizeRuntimeConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("Personalize Runtime", "4.0.0.0"); private static readonly AmazonPersonalizeRuntimeEndpointResolver EndpointResolver = new AmazonPersonalizeRuntimeEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("Personalize Runtime", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("Personalize Runtime", "3.7.400.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/PersonalizeRuntime/PersonalizeRuntime.sln b/sdk/src/Services/PersonalizeRuntime/PersonalizeRuntime.sln index 30c58ff4110f..0d81b6c65971 100644 --- a/sdk/src/Services/PersonalizeRuntime/PersonalizeRuntime.sln +++ b/sdk/src/Services/PersonalizeRuntime/PersonalizeRuntime.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {34B204D5-C0BB-4505-AB23-A004D6FA9828}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {34B204D5-C0BB-4505-AB23-A004D6FA9828}.Debug|Any CPU.Build.0 = Debug|Any CPU {34B204D5-C0BB-4505-AB23-A004D6FA9828}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {35F87DC6-CC72-4C78-8BF7-1FDED930068F}.Debug|Any CPU.Build.0 = Debug|Any CPU {35F87DC6-CC72-4C78-8BF7-1FDED930068F}.Release|Any CPU.ActiveCfg = Release|Any CPU {35F87DC6-CC72-4C78-8BF7-1FDED930068F}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {15824F5C-CDC5-49A4-AE2E-979F26B7D1A0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {15824F5C-CDC5-49A4-AE2E-979F26B7D1A0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {15824F5C-CDC5-49A4-AE2E-979F26B7D1A0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {15824F5C-CDC5-49A4-AE2E-979F26B7D1A0}.Release|Any CPU.Build.0 = Release|Any CPU - {3C39A4D5-901A-4C29-BEA0-58BDF45A6A8F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3C39A4D5-901A-4C29-BEA0-58BDF45A6A8F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3C39A4D5-901A-4C29-BEA0-58BDF45A6A8F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3C39A4D5-901A-4C29-BEA0-58BDF45A6A8F}.Release|Any CPU.Build.0 = Release|Any CPU - {2E9EC8D8-89E2-43FB-90D5-B1B23197DD5B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2E9EC8D8-89E2-43FB-90D5-B1B23197DD5B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2E9EC8D8-89E2-43FB-90D5-B1B23197DD5B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2E9EC8D8-89E2-43FB-90D5-B1B23197DD5B}.Release|Any CPU.Build.0 = Release|Any CPU - {8F7AC99D-1294-4316-A323-290C4CC45149}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8F7AC99D-1294-4316-A323-290C4CC45149}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8F7AC99D-1294-4316-A323-290C4CC45149}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8F7AC99D-1294-4316-A323-290C4CC45149}.Release|Any CPU.Build.0 = Release|Any CPU - {94D70892-AE02-4643-B0B7-FFF905D3B3D9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {94D70892-AE02-4643-B0B7-FFF905D3B3D9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {94D70892-AE02-4643-B0B7-FFF905D3B3D9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {94D70892-AE02-4643-B0B7-FFF905D3B3D9}.Release|Any CPU.Build.0 = Release|Any CPU - {A11BE8A7-3755-4061-AA69-096ABD9634E7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A11BE8A7-3755-4061-AA69-096ABD9634E7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A11BE8A7-3755-4061-AA69-096ABD9634E7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A11BE8A7-3755-4061-AA69-096ABD9634E7}.Release|Any CPU.Build.0 = Release|Any CPU - {041488BF-284E-46F8-A905-6FB375E76216}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {041488BF-284E-46F8-A905-6FB375E76216}.Debug|Any CPU.Build.0 = Debug|Any CPU - {041488BF-284E-46F8-A905-6FB375E76216}.Release|Any CPU.ActiveCfg = Release|Any CPU - {041488BF-284E-46F8-A905-6FB375E76216}.Release|Any CPU.Build.0 = Release|Any CPU - {58CC0C28-2E05-41A5-A333-F1D7BC3FDA8D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {58CC0C28-2E05-41A5-A333-F1D7BC3FDA8D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {58CC0C28-2E05-41A5-A333-F1D7BC3FDA8D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {58CC0C28-2E05-41A5-A333-F1D7BC3FDA8D}.Release|Any CPU.Build.0 = Release|Any CPU - {6D1A08E2-3C9F-49CD-BDF9-9EED3FF5313E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6D1A08E2-3C9F-49CD-BDF9-9EED3FF5313E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6D1A08E2-3C9F-49CD-BDF9-9EED3FF5313E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6D1A08E2-3C9F-49CD-BDF9-9EED3FF5313E}.Release|Any CPU.Build.0 = Release|Any CPU - {1790E40E-63BF-4801-9CED-894E2B7C6FF7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1790E40E-63BF-4801-9CED-894E2B7C6FF7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1790E40E-63BF-4801-9CED-894E2B7C6FF7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1790E40E-63BF-4801-9CED-894E2B7C6FF7}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {15824F5C-CDC5-49A4-AE2E-979F26B7D1A0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {15824F5C-CDC5-49A4-AE2E-979F26B7D1A0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {15824F5C-CDC5-49A4-AE2E-979F26B7D1A0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {15824F5C-CDC5-49A4-AE2E-979F26B7D1A0}.Release|Any CPU.Build.0 = Release|Any CPU - {3C39A4D5-901A-4C29-BEA0-58BDF45A6A8F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3C39A4D5-901A-4C29-BEA0-58BDF45A6A8F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3C39A4D5-901A-4C29-BEA0-58BDF45A6A8F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3C39A4D5-901A-4C29-BEA0-58BDF45A6A8F}.Release|Any CPU.Build.0 = Release|Any CPU - {2E9EC8D8-89E2-43FB-90D5-B1B23197DD5B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2E9EC8D8-89E2-43FB-90D5-B1B23197DD5B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2E9EC8D8-89E2-43FB-90D5-B1B23197DD5B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2E9EC8D8-89E2-43FB-90D5-B1B23197DD5B}.Release|Any CPU.Build.0 = Release|Any CPU - {8F7AC99D-1294-4316-A323-290C4CC45149}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8F7AC99D-1294-4316-A323-290C4CC45149}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8F7AC99D-1294-4316-A323-290C4CC45149}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8F7AC99D-1294-4316-A323-290C4CC45149}.Release|Any CPU.Build.0 = Release|Any CPU - {94D70892-AE02-4643-B0B7-FFF905D3B3D9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {94D70892-AE02-4643-B0B7-FFF905D3B3D9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {94D70892-AE02-4643-B0B7-FFF905D3B3D9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {94D70892-AE02-4643-B0B7-FFF905D3B3D9}.Release|Any CPU.Build.0 = Release|Any CPU - {A11BE8A7-3755-4061-AA69-096ABD9634E7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A11BE8A7-3755-4061-AA69-096ABD9634E7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A11BE8A7-3755-4061-AA69-096ABD9634E7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A11BE8A7-3755-4061-AA69-096ABD9634E7}.Release|Any CPU.Build.0 = Release|Any CPU - {041488BF-284E-46F8-A905-6FB375E76216}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {041488BF-284E-46F8-A905-6FB375E76216}.Debug|Any CPU.Build.0 = Debug|Any CPU - {041488BF-284E-46F8-A905-6FB375E76216}.Release|Any CPU.ActiveCfg = Release|Any CPU - {041488BF-284E-46F8-A905-6FB375E76216}.Release|Any CPU.Build.0 = Release|Any CPU - {58CC0C28-2E05-41A5-A333-F1D7BC3FDA8D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {58CC0C28-2E05-41A5-A333-F1D7BC3FDA8D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {58CC0C28-2E05-41A5-A333-F1D7BC3FDA8D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {58CC0C28-2E05-41A5-A333-F1D7BC3FDA8D}.Release|Any CPU.Build.0 = Release|Any CPU - {6D1A08E2-3C9F-49CD-BDF9-9EED3FF5313E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6D1A08E2-3C9F-49CD-BDF9-9EED3FF5313E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6D1A08E2-3C9F-49CD-BDF9-9EED3FF5313E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6D1A08E2-3C9F-49CD-BDF9-9EED3FF5313E}.Release|Any CPU.Build.0 = Release|Any CPU - {1790E40E-63BF-4801-9CED-894E2B7C6FF7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1790E40E-63BF-4801-9CED-894E2B7C6FF7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1790E40E-63BF-4801-9CED-894E2B7C6FF7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1790E40E-63BF-4801-9CED-894E2B7C6FF7}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {34B204D5-C0BB-4505-AB23-A004D6FA9828} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {90C780AB-C779-45A8-916A-E8368D67D239} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {6201C9C8-C008-45A0-B992-C2A78FF6437C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {D9663F12-B200-4A68-9F52-C222F61F1488} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {35F87DC6-CC72-4C78-8BF7-1FDED930068F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {15824F5C-CDC5-49A4-AE2E-979F26B7D1A0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {3C39A4D5-901A-4C29-BEA0-58BDF45A6A8F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {2E9EC8D8-89E2-43FB-90D5-B1B23197DD5B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8F7AC99D-1294-4316-A323-290C4CC45149} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {94D70892-AE02-4643-B0B7-FFF905D3B3D9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A11BE8A7-3755-4061-AA69-096ABD9634E7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {041488BF-284E-46F8-A905-6FB375E76216} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {58CC0C28-2E05-41A5-A333-F1D7BC3FDA8D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6D1A08E2-3C9F-49CD-BDF9-9EED3FF5313E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {1790E40E-63BF-4801-9CED-894E2B7C6FF7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {15824F5C-CDC5-49A4-AE2E-979F26B7D1A0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {3C39A4D5-901A-4C29-BEA0-58BDF45A6A8F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {2E9EC8D8-89E2-43FB-90D5-B1B23197DD5B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8F7AC99D-1294-4316-A323-290C4CC45149} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {94D70892-AE02-4643-B0B7-FFF905D3B3D9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A11BE8A7-3755-4061-AA69-096ABD9634E7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {041488BF-284E-46F8-A905-6FB375E76216} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {58CC0C28-2E05-41A5-A333-F1D7BC3FDA8D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6D1A08E2-3C9F-49CD-BDF9-9EED3FF5313E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {1790E40E-63BF-4801-9CED-894E2B7C6FF7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {CB843D3E-E70D-4D39-B81D-692F2D2204DB} diff --git a/sdk/src/Services/PersonalizeRuntime/Properties/AssemblyInfo.cs b/sdk/src/Services/PersonalizeRuntime/Properties/AssemblyInfo.cs index 497f920bbf70..c593beefecab 100644 --- a/sdk/src/Services/PersonalizeRuntime/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/PersonalizeRuntime/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/Pinpoint/Generated/AmazonPinpointConfig.cs b/sdk/src/Services/Pinpoint/Generated/AmazonPinpointConfig.cs index f7f9101e27a0..dca58267f759 100644 --- a/sdk/src/Services/Pinpoint/Generated/AmazonPinpointConfig.cs +++ b/sdk/src/Services/Pinpoint/Generated/AmazonPinpointConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.Pinpoint public partial class AmazonPinpointConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("Pinpoint", "4.0.0.0"); private static readonly AmazonPinpointEndpointResolver EndpointResolver = new AmazonPinpointEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("Pinpoint", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("Pinpoint", "3.7.400.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/Pinpoint/Pinpoint.sln b/sdk/src/Services/Pinpoint/Pinpoint.sln index 1d601a35da77..736889f958fd 100644 --- a/sdk/src/Services/Pinpoint/Pinpoint.sln +++ b/sdk/src/Services/Pinpoint/Pinpoint.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {13DB3764-160B-4619-A083-5674B74FCC1D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {13DB3764-160B-4619-A083-5674B74FCC1D}.Debug|Any CPU.Build.0 = Debug|Any CPU {13DB3764-160B-4619-A083-5674B74FCC1D}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {6A6E66AB-980A-441B-A0E1-C5029B6699B3}.Debug|Any CPU.Build.0 = Debug|Any CPU {6A6E66AB-980A-441B-A0E1-C5029B6699B3}.Release|Any CPU.ActiveCfg = Release|Any CPU {6A6E66AB-980A-441B-A0E1-C5029B6699B3}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {71542089-5169-426E-8761-7F21850927FE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {71542089-5169-426E-8761-7F21850927FE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {71542089-5169-426E-8761-7F21850927FE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {71542089-5169-426E-8761-7F21850927FE}.Release|Any CPU.Build.0 = Release|Any CPU - {C4C8B0EF-43AA-42B1-9F47-33A36FEDCE83}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C4C8B0EF-43AA-42B1-9F47-33A36FEDCE83}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C4C8B0EF-43AA-42B1-9F47-33A36FEDCE83}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C4C8B0EF-43AA-42B1-9F47-33A36FEDCE83}.Release|Any CPU.Build.0 = Release|Any CPU - {B2273416-EB70-477B-9AD0-CDD419B7444B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B2273416-EB70-477B-9AD0-CDD419B7444B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B2273416-EB70-477B-9AD0-CDD419B7444B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B2273416-EB70-477B-9AD0-CDD419B7444B}.Release|Any CPU.Build.0 = Release|Any CPU - {182E5D12-59DC-4B47-BB45-EA129317891B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {182E5D12-59DC-4B47-BB45-EA129317891B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {182E5D12-59DC-4B47-BB45-EA129317891B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {182E5D12-59DC-4B47-BB45-EA129317891B}.Release|Any CPU.Build.0 = Release|Any CPU - {B3D4142C-4D36-4268-84C6-BBF5F5BA5B79}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B3D4142C-4D36-4268-84C6-BBF5F5BA5B79}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B3D4142C-4D36-4268-84C6-BBF5F5BA5B79}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B3D4142C-4D36-4268-84C6-BBF5F5BA5B79}.Release|Any CPU.Build.0 = Release|Any CPU - {D32A6C01-A9A4-41CC-98C2-63BAEEACE062}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D32A6C01-A9A4-41CC-98C2-63BAEEACE062}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D32A6C01-A9A4-41CC-98C2-63BAEEACE062}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D32A6C01-A9A4-41CC-98C2-63BAEEACE062}.Release|Any CPU.Build.0 = Release|Any CPU - {F0C4DCD7-3192-4606-B22B-E948ABECEC7D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F0C4DCD7-3192-4606-B22B-E948ABECEC7D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F0C4DCD7-3192-4606-B22B-E948ABECEC7D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F0C4DCD7-3192-4606-B22B-E948ABECEC7D}.Release|Any CPU.Build.0 = Release|Any CPU - {DD669A72-A0C1-4CEA-AFCE-EC99D569CF60}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DD669A72-A0C1-4CEA-AFCE-EC99D569CF60}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DD669A72-A0C1-4CEA-AFCE-EC99D569CF60}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DD669A72-A0C1-4CEA-AFCE-EC99D569CF60}.Release|Any CPU.Build.0 = Release|Any CPU - {18354633-5B53-40E9-A5AB-00B933AF247A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {18354633-5B53-40E9-A5AB-00B933AF247A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {18354633-5B53-40E9-A5AB-00B933AF247A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {18354633-5B53-40E9-A5AB-00B933AF247A}.Release|Any CPU.Build.0 = Release|Any CPU - {61D30B86-2F0B-45CD-817F-C25492B7393D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {61D30B86-2F0B-45CD-817F-C25492B7393D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {61D30B86-2F0B-45CD-817F-C25492B7393D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {61D30B86-2F0B-45CD-817F-C25492B7393D}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {71542089-5169-426E-8761-7F21850927FE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {71542089-5169-426E-8761-7F21850927FE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {71542089-5169-426E-8761-7F21850927FE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {71542089-5169-426E-8761-7F21850927FE}.Release|Any CPU.Build.0 = Release|Any CPU - {C4C8B0EF-43AA-42B1-9F47-33A36FEDCE83}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C4C8B0EF-43AA-42B1-9F47-33A36FEDCE83}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C4C8B0EF-43AA-42B1-9F47-33A36FEDCE83}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C4C8B0EF-43AA-42B1-9F47-33A36FEDCE83}.Release|Any CPU.Build.0 = Release|Any CPU - {B2273416-EB70-477B-9AD0-CDD419B7444B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B2273416-EB70-477B-9AD0-CDD419B7444B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B2273416-EB70-477B-9AD0-CDD419B7444B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B2273416-EB70-477B-9AD0-CDD419B7444B}.Release|Any CPU.Build.0 = Release|Any CPU - {182E5D12-59DC-4B47-BB45-EA129317891B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {182E5D12-59DC-4B47-BB45-EA129317891B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {182E5D12-59DC-4B47-BB45-EA129317891B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {182E5D12-59DC-4B47-BB45-EA129317891B}.Release|Any CPU.Build.0 = Release|Any CPU - {B3D4142C-4D36-4268-84C6-BBF5F5BA5B79}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B3D4142C-4D36-4268-84C6-BBF5F5BA5B79}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B3D4142C-4D36-4268-84C6-BBF5F5BA5B79}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B3D4142C-4D36-4268-84C6-BBF5F5BA5B79}.Release|Any CPU.Build.0 = Release|Any CPU - {D32A6C01-A9A4-41CC-98C2-63BAEEACE062}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D32A6C01-A9A4-41CC-98C2-63BAEEACE062}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D32A6C01-A9A4-41CC-98C2-63BAEEACE062}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D32A6C01-A9A4-41CC-98C2-63BAEEACE062}.Release|Any CPU.Build.0 = Release|Any CPU - {F0C4DCD7-3192-4606-B22B-E948ABECEC7D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F0C4DCD7-3192-4606-B22B-E948ABECEC7D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F0C4DCD7-3192-4606-B22B-E948ABECEC7D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F0C4DCD7-3192-4606-B22B-E948ABECEC7D}.Release|Any CPU.Build.0 = Release|Any CPU - {DD669A72-A0C1-4CEA-AFCE-EC99D569CF60}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DD669A72-A0C1-4CEA-AFCE-EC99D569CF60}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DD669A72-A0C1-4CEA-AFCE-EC99D569CF60}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DD669A72-A0C1-4CEA-AFCE-EC99D569CF60}.Release|Any CPU.Build.0 = Release|Any CPU - {18354633-5B53-40E9-A5AB-00B933AF247A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {18354633-5B53-40E9-A5AB-00B933AF247A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {18354633-5B53-40E9-A5AB-00B933AF247A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {18354633-5B53-40E9-A5AB-00B933AF247A}.Release|Any CPU.Build.0 = Release|Any CPU - {61D30B86-2F0B-45CD-817F-C25492B7393D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {61D30B86-2F0B-45CD-817F-C25492B7393D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {61D30B86-2F0B-45CD-817F-C25492B7393D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {61D30B86-2F0B-45CD-817F-C25492B7393D}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {13DB3764-160B-4619-A083-5674B74FCC1D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {A5975BA8-91F3-4C87-8716-F822B67347D6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {F614E8EB-C673-4A2F-BBC0-6FEBB2F78917} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {323AD322-8482-4704-A621-F593AF52C24E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {6A6E66AB-980A-441B-A0E1-C5029B6699B3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {71542089-5169-426E-8761-7F21850927FE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C4C8B0EF-43AA-42B1-9F47-33A36FEDCE83} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B2273416-EB70-477B-9AD0-CDD419B7444B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {182E5D12-59DC-4B47-BB45-EA129317891B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B3D4142C-4D36-4268-84C6-BBF5F5BA5B79} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D32A6C01-A9A4-41CC-98C2-63BAEEACE062} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F0C4DCD7-3192-4606-B22B-E948ABECEC7D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {DD669A72-A0C1-4CEA-AFCE-EC99D569CF60} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {18354633-5B53-40E9-A5AB-00B933AF247A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {61D30B86-2F0B-45CD-817F-C25492B7393D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {71542089-5169-426E-8761-7F21850927FE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C4C8B0EF-43AA-42B1-9F47-33A36FEDCE83} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B2273416-EB70-477B-9AD0-CDD419B7444B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {182E5D12-59DC-4B47-BB45-EA129317891B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B3D4142C-4D36-4268-84C6-BBF5F5BA5B79} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D32A6C01-A9A4-41CC-98C2-63BAEEACE062} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F0C4DCD7-3192-4606-B22B-E948ABECEC7D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {DD669A72-A0C1-4CEA-AFCE-EC99D569CF60} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {18354633-5B53-40E9-A5AB-00B933AF247A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {61D30B86-2F0B-45CD-817F-C25492B7393D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {6EE894E9-1C80-4064-9078-E343AC8A0793} diff --git a/sdk/src/Services/Pinpoint/Properties/AssemblyInfo.cs b/sdk/src/Services/Pinpoint/Properties/AssemblyInfo.cs index 65293893c7ff..e7dbf20e8403 100644 --- a/sdk/src/Services/Pinpoint/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/Pinpoint/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/PinpointEmail/Generated/AmazonPinpointEmailConfig.cs b/sdk/src/Services/PinpointEmail/Generated/AmazonPinpointEmailConfig.cs index 5ec36d38465d..66dfda3f7197 100644 --- a/sdk/src/Services/PinpointEmail/Generated/AmazonPinpointEmailConfig.cs +++ b/sdk/src/Services/PinpointEmail/Generated/AmazonPinpointEmailConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.PinpointEmail public partial class AmazonPinpointEmailConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("Pinpoint Email", "4.0.0.0"); private static readonly AmazonPinpointEmailEndpointResolver EndpointResolver = new AmazonPinpointEmailEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("Pinpoint Email", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("Pinpoint Email", "3.7.400.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/PinpointEmail/PinpointEmail.sln b/sdk/src/Services/PinpointEmail/PinpointEmail.sln index d7116803f60e..a04467a8a879 100644 --- a/sdk/src/Services/PinpointEmail/PinpointEmail.sln +++ b/sdk/src/Services/PinpointEmail/PinpointEmail.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {A885E0A4-9323-4976-860B-D972B1FD517F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {A885E0A4-9323-4976-860B-D972B1FD517F}.Debug|Any CPU.Build.0 = Debug|Any CPU {A885E0A4-9323-4976-860B-D972B1FD517F}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {9D58FCFD-C5D7-4A80-9C2A-E7B91111B6D3}.Debug|Any CPU.Build.0 = Debug|Any CPU {9D58FCFD-C5D7-4A80-9C2A-E7B91111B6D3}.Release|Any CPU.ActiveCfg = Release|Any CPU {9D58FCFD-C5D7-4A80-9C2A-E7B91111B6D3}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {DBA4B7F7-1788-4356-902A-991381242774}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DBA4B7F7-1788-4356-902A-991381242774}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DBA4B7F7-1788-4356-902A-991381242774}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DBA4B7F7-1788-4356-902A-991381242774}.Release|Any CPU.Build.0 = Release|Any CPU - {5C5A77B1-CA6D-444A-BCC6-325F2A2B8DDB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5C5A77B1-CA6D-444A-BCC6-325F2A2B8DDB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5C5A77B1-CA6D-444A-BCC6-325F2A2B8DDB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5C5A77B1-CA6D-444A-BCC6-325F2A2B8DDB}.Release|Any CPU.Build.0 = Release|Any CPU - {E10A0EDC-37A9-44F0-A84F-AD719FE1F9AF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E10A0EDC-37A9-44F0-A84F-AD719FE1F9AF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E10A0EDC-37A9-44F0-A84F-AD719FE1F9AF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E10A0EDC-37A9-44F0-A84F-AD719FE1F9AF}.Release|Any CPU.Build.0 = Release|Any CPU - {C1FD5D95-C31E-4EDF-AD85-7FC810405AAE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C1FD5D95-C31E-4EDF-AD85-7FC810405AAE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C1FD5D95-C31E-4EDF-AD85-7FC810405AAE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C1FD5D95-C31E-4EDF-AD85-7FC810405AAE}.Release|Any CPU.Build.0 = Release|Any CPU - {1F39C00D-5A09-4CC6-9912-2B0D9431755E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1F39C00D-5A09-4CC6-9912-2B0D9431755E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1F39C00D-5A09-4CC6-9912-2B0D9431755E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1F39C00D-5A09-4CC6-9912-2B0D9431755E}.Release|Any CPU.Build.0 = Release|Any CPU - {0A8FAFDD-0895-4FAB-A93F-EDB742C47A54}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0A8FAFDD-0895-4FAB-A93F-EDB742C47A54}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0A8FAFDD-0895-4FAB-A93F-EDB742C47A54}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0A8FAFDD-0895-4FAB-A93F-EDB742C47A54}.Release|Any CPU.Build.0 = Release|Any CPU - {7F38092B-E007-4C7E-8137-4A89572871EC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7F38092B-E007-4C7E-8137-4A89572871EC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7F38092B-E007-4C7E-8137-4A89572871EC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7F38092B-E007-4C7E-8137-4A89572871EC}.Release|Any CPU.Build.0 = Release|Any CPU - {CDAE8885-D8DF-47BD-AF0D-CB6CA18A814C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CDAE8885-D8DF-47BD-AF0D-CB6CA18A814C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CDAE8885-D8DF-47BD-AF0D-CB6CA18A814C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CDAE8885-D8DF-47BD-AF0D-CB6CA18A814C}.Release|Any CPU.Build.0 = Release|Any CPU - {F3319F65-D19F-45D8-AC4F-1FB746746A34}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F3319F65-D19F-45D8-AC4F-1FB746746A34}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F3319F65-D19F-45D8-AC4F-1FB746746A34}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F3319F65-D19F-45D8-AC4F-1FB746746A34}.Release|Any CPU.Build.0 = Release|Any CPU - {2204BF68-0D20-42EE-9EF3-45EC282D7960}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2204BF68-0D20-42EE-9EF3-45EC282D7960}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2204BF68-0D20-42EE-9EF3-45EC282D7960}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2204BF68-0D20-42EE-9EF3-45EC282D7960}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {DBA4B7F7-1788-4356-902A-991381242774}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DBA4B7F7-1788-4356-902A-991381242774}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DBA4B7F7-1788-4356-902A-991381242774}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DBA4B7F7-1788-4356-902A-991381242774}.Release|Any CPU.Build.0 = Release|Any CPU - {5C5A77B1-CA6D-444A-BCC6-325F2A2B8DDB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5C5A77B1-CA6D-444A-BCC6-325F2A2B8DDB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5C5A77B1-CA6D-444A-BCC6-325F2A2B8DDB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5C5A77B1-CA6D-444A-BCC6-325F2A2B8DDB}.Release|Any CPU.Build.0 = Release|Any CPU - {E10A0EDC-37A9-44F0-A84F-AD719FE1F9AF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E10A0EDC-37A9-44F0-A84F-AD719FE1F9AF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E10A0EDC-37A9-44F0-A84F-AD719FE1F9AF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E10A0EDC-37A9-44F0-A84F-AD719FE1F9AF}.Release|Any CPU.Build.0 = Release|Any CPU - {C1FD5D95-C31E-4EDF-AD85-7FC810405AAE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C1FD5D95-C31E-4EDF-AD85-7FC810405AAE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C1FD5D95-C31E-4EDF-AD85-7FC810405AAE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C1FD5D95-C31E-4EDF-AD85-7FC810405AAE}.Release|Any CPU.Build.0 = Release|Any CPU - {1F39C00D-5A09-4CC6-9912-2B0D9431755E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1F39C00D-5A09-4CC6-9912-2B0D9431755E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1F39C00D-5A09-4CC6-9912-2B0D9431755E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1F39C00D-5A09-4CC6-9912-2B0D9431755E}.Release|Any CPU.Build.0 = Release|Any CPU - {0A8FAFDD-0895-4FAB-A93F-EDB742C47A54}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0A8FAFDD-0895-4FAB-A93F-EDB742C47A54}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0A8FAFDD-0895-4FAB-A93F-EDB742C47A54}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0A8FAFDD-0895-4FAB-A93F-EDB742C47A54}.Release|Any CPU.Build.0 = Release|Any CPU - {7F38092B-E007-4C7E-8137-4A89572871EC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7F38092B-E007-4C7E-8137-4A89572871EC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7F38092B-E007-4C7E-8137-4A89572871EC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7F38092B-E007-4C7E-8137-4A89572871EC}.Release|Any CPU.Build.0 = Release|Any CPU - {CDAE8885-D8DF-47BD-AF0D-CB6CA18A814C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CDAE8885-D8DF-47BD-AF0D-CB6CA18A814C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CDAE8885-D8DF-47BD-AF0D-CB6CA18A814C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CDAE8885-D8DF-47BD-AF0D-CB6CA18A814C}.Release|Any CPU.Build.0 = Release|Any CPU - {F3319F65-D19F-45D8-AC4F-1FB746746A34}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F3319F65-D19F-45D8-AC4F-1FB746746A34}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F3319F65-D19F-45D8-AC4F-1FB746746A34}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F3319F65-D19F-45D8-AC4F-1FB746746A34}.Release|Any CPU.Build.0 = Release|Any CPU - {2204BF68-0D20-42EE-9EF3-45EC282D7960}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2204BF68-0D20-42EE-9EF3-45EC282D7960}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2204BF68-0D20-42EE-9EF3-45EC282D7960}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2204BF68-0D20-42EE-9EF3-45EC282D7960}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {A885E0A4-9323-4976-860B-D972B1FD517F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {DAEE46D5-C496-4AEA-ADF9-781D038355D7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {C5467F82-F90B-4241-A3CA-74221185F314} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {35233985-C195-4ADD-9B34-4AC928F87E9C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {9D58FCFD-C5D7-4A80-9C2A-E7B91111B6D3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {DBA4B7F7-1788-4356-902A-991381242774} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {5C5A77B1-CA6D-444A-BCC6-325F2A2B8DDB} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E10A0EDC-37A9-44F0-A84F-AD719FE1F9AF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C1FD5D95-C31E-4EDF-AD85-7FC810405AAE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {1F39C00D-5A09-4CC6-9912-2B0D9431755E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0A8FAFDD-0895-4FAB-A93F-EDB742C47A54} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {7F38092B-E007-4C7E-8137-4A89572871EC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {CDAE8885-D8DF-47BD-AF0D-CB6CA18A814C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F3319F65-D19F-45D8-AC4F-1FB746746A34} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {2204BF68-0D20-42EE-9EF3-45EC282D7960} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {DBA4B7F7-1788-4356-902A-991381242774} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {5C5A77B1-CA6D-444A-BCC6-325F2A2B8DDB} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E10A0EDC-37A9-44F0-A84F-AD719FE1F9AF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C1FD5D95-C31E-4EDF-AD85-7FC810405AAE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {1F39C00D-5A09-4CC6-9912-2B0D9431755E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0A8FAFDD-0895-4FAB-A93F-EDB742C47A54} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {7F38092B-E007-4C7E-8137-4A89572871EC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {CDAE8885-D8DF-47BD-AF0D-CB6CA18A814C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F3319F65-D19F-45D8-AC4F-1FB746746A34} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {2204BF68-0D20-42EE-9EF3-45EC282D7960} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {C7E42AED-632D-4021-B421-6CE713108426} diff --git a/sdk/src/Services/PinpointEmail/Properties/AssemblyInfo.cs b/sdk/src/Services/PinpointEmail/Properties/AssemblyInfo.cs index 8e06e766af45..841c50528e53 100644 --- a/sdk/src/Services/PinpointEmail/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/PinpointEmail/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/PinpointSMSVoice/Generated/AmazonPinpointSMSVoiceConfig.cs b/sdk/src/Services/PinpointSMSVoice/Generated/AmazonPinpointSMSVoiceConfig.cs index 897244230243..7f446219c325 100644 --- a/sdk/src/Services/PinpointSMSVoice/Generated/AmazonPinpointSMSVoiceConfig.cs +++ b/sdk/src/Services/PinpointSMSVoice/Generated/AmazonPinpointSMSVoiceConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.PinpointSMSVoice public partial class AmazonPinpointSMSVoiceConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("Pinpoint SMS Voice", "4.0.0.0"); private static readonly AmazonPinpointSMSVoiceEndpointResolver EndpointResolver = new AmazonPinpointSMSVoiceEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("Pinpoint SMS Voice", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("Pinpoint SMS Voice", "3.7.400.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/PinpointSMSVoice/PinpointSMSVoice.sln b/sdk/src/Services/PinpointSMSVoice/PinpointSMSVoice.sln index 0aeb9d18b508..041eb7524e77 100644 --- a/sdk/src/Services/PinpointSMSVoice/PinpointSMSVoice.sln +++ b/sdk/src/Services/PinpointSMSVoice/PinpointSMSVoice.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {81835417-FFEF-48F2-A00C-D3F38AE6B3BE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {81835417-FFEF-48F2-A00C-D3F38AE6B3BE}.Debug|Any CPU.Build.0 = Debug|Any CPU {81835417-FFEF-48F2-A00C-D3F38AE6B3BE}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {B58A8437-47E2-4A01-A8D4-FA336AAA96ED}.Debug|Any CPU.Build.0 = Debug|Any CPU {B58A8437-47E2-4A01-A8D4-FA336AAA96ED}.Release|Any CPU.ActiveCfg = Release|Any CPU {B58A8437-47E2-4A01-A8D4-FA336AAA96ED}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {65CEEE3D-F914-4672-B4BB-E627EFDFD97E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {65CEEE3D-F914-4672-B4BB-E627EFDFD97E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {65CEEE3D-F914-4672-B4BB-E627EFDFD97E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {65CEEE3D-F914-4672-B4BB-E627EFDFD97E}.Release|Any CPU.Build.0 = Release|Any CPU - {0B814CA8-6B43-4EE3-B7CE-DD5E784FC222}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0B814CA8-6B43-4EE3-B7CE-DD5E784FC222}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0B814CA8-6B43-4EE3-B7CE-DD5E784FC222}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0B814CA8-6B43-4EE3-B7CE-DD5E784FC222}.Release|Any CPU.Build.0 = Release|Any CPU - {662AB4D5-A4C5-486B-8DA2-FDC8A8A18470}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {662AB4D5-A4C5-486B-8DA2-FDC8A8A18470}.Debug|Any CPU.Build.0 = Debug|Any CPU - {662AB4D5-A4C5-486B-8DA2-FDC8A8A18470}.Release|Any CPU.ActiveCfg = Release|Any CPU - {662AB4D5-A4C5-486B-8DA2-FDC8A8A18470}.Release|Any CPU.Build.0 = Release|Any CPU - {D208CD12-60FD-45CC-A203-5D3EB311C830}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D208CD12-60FD-45CC-A203-5D3EB311C830}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D208CD12-60FD-45CC-A203-5D3EB311C830}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D208CD12-60FD-45CC-A203-5D3EB311C830}.Release|Any CPU.Build.0 = Release|Any CPU - {8BB8CAD2-2C5E-449D-BB64-9F560658CF20}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8BB8CAD2-2C5E-449D-BB64-9F560658CF20}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8BB8CAD2-2C5E-449D-BB64-9F560658CF20}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8BB8CAD2-2C5E-449D-BB64-9F560658CF20}.Release|Any CPU.Build.0 = Release|Any CPU - {0C932ECC-D97B-4461-9902-BE97E35049D6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0C932ECC-D97B-4461-9902-BE97E35049D6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0C932ECC-D97B-4461-9902-BE97E35049D6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0C932ECC-D97B-4461-9902-BE97E35049D6}.Release|Any CPU.Build.0 = Release|Any CPU - {F7BE3A2A-2684-4337-AC7A-78E6FD9EBBBF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F7BE3A2A-2684-4337-AC7A-78E6FD9EBBBF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F7BE3A2A-2684-4337-AC7A-78E6FD9EBBBF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F7BE3A2A-2684-4337-AC7A-78E6FD9EBBBF}.Release|Any CPU.Build.0 = Release|Any CPU - {6CDCE664-088B-4AD1-852C-F524D3C8C6F8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6CDCE664-088B-4AD1-852C-F524D3C8C6F8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6CDCE664-088B-4AD1-852C-F524D3C8C6F8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6CDCE664-088B-4AD1-852C-F524D3C8C6F8}.Release|Any CPU.Build.0 = Release|Any CPU - {FDF08BF7-CE3E-40C7-B83F-E58E4D6D4A92}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FDF08BF7-CE3E-40C7-B83F-E58E4D6D4A92}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FDF08BF7-CE3E-40C7-B83F-E58E4D6D4A92}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FDF08BF7-CE3E-40C7-B83F-E58E4D6D4A92}.Release|Any CPU.Build.0 = Release|Any CPU - {55EBB434-6F89-4225-945D-46CF068AEA42}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {55EBB434-6F89-4225-945D-46CF068AEA42}.Debug|Any CPU.Build.0 = Debug|Any CPU - {55EBB434-6F89-4225-945D-46CF068AEA42}.Release|Any CPU.ActiveCfg = Release|Any CPU - {55EBB434-6F89-4225-945D-46CF068AEA42}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {65CEEE3D-F914-4672-B4BB-E627EFDFD97E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {65CEEE3D-F914-4672-B4BB-E627EFDFD97E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {65CEEE3D-F914-4672-B4BB-E627EFDFD97E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {65CEEE3D-F914-4672-B4BB-E627EFDFD97E}.Release|Any CPU.Build.0 = Release|Any CPU - {0B814CA8-6B43-4EE3-B7CE-DD5E784FC222}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0B814CA8-6B43-4EE3-B7CE-DD5E784FC222}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0B814CA8-6B43-4EE3-B7CE-DD5E784FC222}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0B814CA8-6B43-4EE3-B7CE-DD5E784FC222}.Release|Any CPU.Build.0 = Release|Any CPU - {662AB4D5-A4C5-486B-8DA2-FDC8A8A18470}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {662AB4D5-A4C5-486B-8DA2-FDC8A8A18470}.Debug|Any CPU.Build.0 = Debug|Any CPU - {662AB4D5-A4C5-486B-8DA2-FDC8A8A18470}.Release|Any CPU.ActiveCfg = Release|Any CPU - {662AB4D5-A4C5-486B-8DA2-FDC8A8A18470}.Release|Any CPU.Build.0 = Release|Any CPU - {D208CD12-60FD-45CC-A203-5D3EB311C830}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D208CD12-60FD-45CC-A203-5D3EB311C830}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D208CD12-60FD-45CC-A203-5D3EB311C830}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D208CD12-60FD-45CC-A203-5D3EB311C830}.Release|Any CPU.Build.0 = Release|Any CPU - {8BB8CAD2-2C5E-449D-BB64-9F560658CF20}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8BB8CAD2-2C5E-449D-BB64-9F560658CF20}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8BB8CAD2-2C5E-449D-BB64-9F560658CF20}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8BB8CAD2-2C5E-449D-BB64-9F560658CF20}.Release|Any CPU.Build.0 = Release|Any CPU - {0C932ECC-D97B-4461-9902-BE97E35049D6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0C932ECC-D97B-4461-9902-BE97E35049D6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0C932ECC-D97B-4461-9902-BE97E35049D6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0C932ECC-D97B-4461-9902-BE97E35049D6}.Release|Any CPU.Build.0 = Release|Any CPU - {F7BE3A2A-2684-4337-AC7A-78E6FD9EBBBF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F7BE3A2A-2684-4337-AC7A-78E6FD9EBBBF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F7BE3A2A-2684-4337-AC7A-78E6FD9EBBBF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F7BE3A2A-2684-4337-AC7A-78E6FD9EBBBF}.Release|Any CPU.Build.0 = Release|Any CPU - {6CDCE664-088B-4AD1-852C-F524D3C8C6F8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6CDCE664-088B-4AD1-852C-F524D3C8C6F8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6CDCE664-088B-4AD1-852C-F524D3C8C6F8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6CDCE664-088B-4AD1-852C-F524D3C8C6F8}.Release|Any CPU.Build.0 = Release|Any CPU - {FDF08BF7-CE3E-40C7-B83F-E58E4D6D4A92}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FDF08BF7-CE3E-40C7-B83F-E58E4D6D4A92}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FDF08BF7-CE3E-40C7-B83F-E58E4D6D4A92}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FDF08BF7-CE3E-40C7-B83F-E58E4D6D4A92}.Release|Any CPU.Build.0 = Release|Any CPU - {55EBB434-6F89-4225-945D-46CF068AEA42}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {55EBB434-6F89-4225-945D-46CF068AEA42}.Debug|Any CPU.Build.0 = Debug|Any CPU - {55EBB434-6F89-4225-945D-46CF068AEA42}.Release|Any CPU.ActiveCfg = Release|Any CPU - {55EBB434-6F89-4225-945D-46CF068AEA42}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {81835417-FFEF-48F2-A00C-D3F38AE6B3BE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {C8F11746-9E23-407C-ACA0-469800601406} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {FE5BC6AF-5626-4ECE-A607-D95518C9CAB2} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {FDF5B7C1-74CB-4C46-86FE-6613C418C3D7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {B58A8437-47E2-4A01-A8D4-FA336AAA96ED} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {65CEEE3D-F914-4672-B4BB-E627EFDFD97E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0B814CA8-6B43-4EE3-B7CE-DD5E784FC222} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {662AB4D5-A4C5-486B-8DA2-FDC8A8A18470} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D208CD12-60FD-45CC-A203-5D3EB311C830} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8BB8CAD2-2C5E-449D-BB64-9F560658CF20} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0C932ECC-D97B-4461-9902-BE97E35049D6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F7BE3A2A-2684-4337-AC7A-78E6FD9EBBBF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6CDCE664-088B-4AD1-852C-F524D3C8C6F8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {FDF08BF7-CE3E-40C7-B83F-E58E4D6D4A92} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {55EBB434-6F89-4225-945D-46CF068AEA42} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {65CEEE3D-F914-4672-B4BB-E627EFDFD97E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0B814CA8-6B43-4EE3-B7CE-DD5E784FC222} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {662AB4D5-A4C5-486B-8DA2-FDC8A8A18470} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D208CD12-60FD-45CC-A203-5D3EB311C830} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8BB8CAD2-2C5E-449D-BB64-9F560658CF20} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0C932ECC-D97B-4461-9902-BE97E35049D6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F7BE3A2A-2684-4337-AC7A-78E6FD9EBBBF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6CDCE664-088B-4AD1-852C-F524D3C8C6F8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {FDF08BF7-CE3E-40C7-B83F-E58E4D6D4A92} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {55EBB434-6F89-4225-945D-46CF068AEA42} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {B339F443-C308-48FA-BEDA-8F7464360E48} diff --git a/sdk/src/Services/PinpointSMSVoice/Properties/AssemblyInfo.cs b/sdk/src/Services/PinpointSMSVoice/Properties/AssemblyInfo.cs index 44372ab731ed..2b0bf34be31a 100644 --- a/sdk/src/Services/PinpointSMSVoice/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/PinpointSMSVoice/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/PinpointSMSVoiceV2/Generated/AmazonPinpointSMSVoiceV2Config.cs b/sdk/src/Services/PinpointSMSVoiceV2/Generated/AmazonPinpointSMSVoiceV2Config.cs index 95746feb3508..96dc7ef3f942 100644 --- a/sdk/src/Services/PinpointSMSVoiceV2/Generated/AmazonPinpointSMSVoiceV2Config.cs +++ b/sdk/src/Services/PinpointSMSVoiceV2/Generated/AmazonPinpointSMSVoiceV2Config.cs @@ -34,16 +34,10 @@ namespace Amazon.PinpointSMSVoiceV2 public partial class AmazonPinpointSMSVoiceV2Config : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("Pinpoint SMS Voice V2", "4.0.0.0"); private static readonly AmazonPinpointSMSVoiceV2EndpointResolver EndpointResolver = new AmazonPinpointSMSVoiceV2EndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("Pinpoint SMS Voice V2", "3.7.401.3"); -======= - InternalSDKUtils.BuildUserAgentString("Pinpoint SMS Voice V2", "3.7.404.0"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/PinpointSMSVoiceV2/Generated/Model/ConfigurationSetInformation.cs b/sdk/src/Services/PinpointSMSVoiceV2/Generated/Model/ConfigurationSetInformation.cs index 700c7185981c..9c58b386defa 100644 --- a/sdk/src/Services/PinpointSMSVoiceV2/Generated/Model/ConfigurationSetInformation.cs +++ b/sdk/src/Services/PinpointSMSVoiceV2/Generated/Model/ConfigurationSetInformation.cs @@ -107,9 +107,9 @@ internal bool IsSetCreatedTimestamp() /// True if message feedback is enabled. /// /// - public bool DefaultMessageFeedbackEnabled + public bool? DefaultMessageFeedbackEnabled { - get { return this._defaultMessageFeedbackEnabled.GetValueOrDefault(); } + get { return this._defaultMessageFeedbackEnabled; } set { this._defaultMessageFeedbackEnabled = value; } } diff --git a/sdk/src/Services/PinpointSMSVoiceV2/Generated/Model/DeleteConfigurationSetResponse.cs b/sdk/src/Services/PinpointSMSVoiceV2/Generated/Model/DeleteConfigurationSetResponse.cs index 59a9d16cd3be..5c6fe4b67093 100644 --- a/sdk/src/Services/PinpointSMSVoiceV2/Generated/Model/DeleteConfigurationSetResponse.cs +++ b/sdk/src/Services/PinpointSMSVoiceV2/Generated/Model/DeleteConfigurationSetResponse.cs @@ -105,9 +105,9 @@ internal bool IsSetCreatedTimestamp() /// to false. /// /// - public bool DefaultMessageFeedbackEnabled + public bool? DefaultMessageFeedbackEnabled { - get { return this._defaultMessageFeedbackEnabled.GetValueOrDefault(); } + get { return this._defaultMessageFeedbackEnabled; } set { this._defaultMessageFeedbackEnabled = value; } } diff --git a/sdk/src/Services/PinpointSMSVoiceV2/Generated/Model/DeleteProtectConfigurationRuleSetNumberOverrideResponse.cs b/sdk/src/Services/PinpointSMSVoiceV2/Generated/Model/DeleteProtectConfigurationRuleSetNumberOverrideResponse.cs index 0c6a3f9fabc0..5c43541ed8ee 100644 --- a/sdk/src/Services/PinpointSMSVoiceV2/Generated/Model/DeleteProtectConfigurationRuleSetNumberOverrideResponse.cs +++ b/sdk/src/Services/PinpointSMSVoiceV2/Generated/Model/DeleteProtectConfigurationRuleSetNumberOverrideResponse.cs @@ -69,9 +69,9 @@ internal bool IsSetAction() /// /// [AWSProperty(Required=true)] - public DateTime CreatedTimestamp + public DateTime? CreatedTimestamp { - get { return this._createdTimestamp.GetValueOrDefault(); } + get { return this._createdTimestamp; } set { this._createdTimestamp = value; } } @@ -107,9 +107,9 @@ internal bool IsSetDestinationPhoneNumber() /// epoch time format. /// /// - public DateTime ExpirationTimestamp + public DateTime? ExpirationTimestamp { - get { return this._expirationTimestamp.GetValueOrDefault(); } + get { return this._expirationTimestamp; } set { this._expirationTimestamp = value; } } diff --git a/sdk/src/Services/PinpointSMSVoiceV2/Generated/Model/Internal/MarshallTransformations/ConfigurationSetInformationUnmarshaller.cs b/sdk/src/Services/PinpointSMSVoiceV2/Generated/Model/Internal/MarshallTransformations/ConfigurationSetInformationUnmarshaller.cs index 0e3a32622418..3f120368faa5 100644 --- a/sdk/src/Services/PinpointSMSVoiceV2/Generated/Model/Internal/MarshallTransformations/ConfigurationSetInformationUnmarshaller.cs +++ b/sdk/src/Services/PinpointSMSVoiceV2/Generated/Model/Internal/MarshallTransformations/ConfigurationSetInformationUnmarshaller.cs @@ -86,7 +86,7 @@ public ConfigurationSetInformation Unmarshall(JsonUnmarshallerContext context) } if (context.TestExpression("DefaultMessageFeedbackEnabled", targetDepth)) { - var unmarshaller = BoolUnmarshaller.Instance; + var unmarshaller = NullableBoolUnmarshaller.Instance; unmarshalledObject.DefaultMessageFeedbackEnabled = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/PinpointSMSVoiceV2/Generated/Model/Internal/MarshallTransformations/DeleteConfigurationSetResponseUnmarshaller.cs b/sdk/src/Services/PinpointSMSVoiceV2/Generated/Model/Internal/MarshallTransformations/DeleteConfigurationSetResponseUnmarshaller.cs index a47094bfd41d..5b77be2384e8 100644 --- a/sdk/src/Services/PinpointSMSVoiceV2/Generated/Model/Internal/MarshallTransformations/DeleteConfigurationSetResponseUnmarshaller.cs +++ b/sdk/src/Services/PinpointSMSVoiceV2/Generated/Model/Internal/MarshallTransformations/DeleteConfigurationSetResponseUnmarshaller.cs @@ -72,7 +72,7 @@ public override AmazonWebServiceResponse Unmarshall(JsonUnmarshallerContext cont } if (context.TestExpression("DefaultMessageFeedbackEnabled", targetDepth)) { - var unmarshaller = BoolUnmarshaller.Instance; + var unmarshaller = NullableBoolUnmarshaller.Instance; response.DefaultMessageFeedbackEnabled = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/PinpointSMSVoiceV2/Generated/Model/Internal/MarshallTransformations/DeleteProtectConfigurationRuleSetNumberOverrideRequestMarshaller.cs b/sdk/src/Services/PinpointSMSVoiceV2/Generated/Model/Internal/MarshallTransformations/DeleteProtectConfigurationRuleSetNumberOverrideRequestMarshaller.cs index 6459d8fc24cc..8aac6f0b3e06 100644 --- a/sdk/src/Services/PinpointSMSVoiceV2/Generated/Model/Internal/MarshallTransformations/DeleteProtectConfigurationRuleSetNumberOverrideRequestMarshaller.cs +++ b/sdk/src/Services/PinpointSMSVoiceV2/Generated/Model/Internal/MarshallTransformations/DeleteProtectConfigurationRuleSetNumberOverrideRequestMarshaller.cs @@ -63,27 +63,30 @@ public IRequest Marshall(DeleteProtectConfigurationRuleSetNumberOverrideRequest request.HttpMethod = "POST"; request.ResourcePath = "/"; - using (StringWriter stringWriter = new StringWriter(CultureInfo.InvariantCulture)) + using (MemoryStream memoryStream = new MemoryStream()) { - JsonWriter writer = new JsonWriter(stringWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetDestinationPhoneNumber()) + using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) { - context.Writer.WritePropertyName("DestinationPhoneNumber"); - context.Writer.Write(publicRequest.DestinationPhoneNumber); - } + JsonWriter writer = new JsonWriter(streamWriter); + writer.Validate = false; + writer.WriteObjectStart(); + var context = new JsonMarshallerContext(request, writer); + if(publicRequest.IsSetDestinationPhoneNumber()) + { + context.Writer.WritePropertyName("DestinationPhoneNumber"); + context.Writer.Write(publicRequest.DestinationPhoneNumber); + } - if(publicRequest.IsSetProtectConfigurationId()) - { - context.Writer.WritePropertyName("ProtectConfigurationId"); - context.Writer.Write(publicRequest.ProtectConfigurationId); + if(publicRequest.IsSetProtectConfigurationId()) + { + context.Writer.WritePropertyName("ProtectConfigurationId"); + context.Writer.Write(publicRequest.ProtectConfigurationId); + } + + writer.WriteObjectEnd(); } - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); + request.Content = memoryStream.ToArray(); } diff --git a/sdk/src/Services/PinpointSMSVoiceV2/Generated/Model/Internal/MarshallTransformations/DeleteProtectConfigurationRuleSetNumberOverrideResponseUnmarshaller.cs b/sdk/src/Services/PinpointSMSVoiceV2/Generated/Model/Internal/MarshallTransformations/DeleteProtectConfigurationRuleSetNumberOverrideResponseUnmarshaller.cs index 9e539f72075c..36413bf84f01 100644 --- a/sdk/src/Services/PinpointSMSVoiceV2/Generated/Model/Internal/MarshallTransformations/DeleteProtectConfigurationRuleSetNumberOverrideResponseUnmarshaller.cs +++ b/sdk/src/Services/PinpointSMSVoiceV2/Generated/Model/Internal/MarshallTransformations/DeleteProtectConfigurationRuleSetNumberOverrideResponseUnmarshaller.cs @@ -60,7 +60,7 @@ public override AmazonWebServiceResponse Unmarshall(JsonUnmarshallerContext cont } if (context.TestExpression("CreatedTimestamp", targetDepth)) { - var unmarshaller = DateTimeUnmarshaller.Instance; + var unmarshaller = NullableDateTimeUnmarshaller.Instance; response.CreatedTimestamp = unmarshaller.Unmarshall(context); continue; } @@ -72,7 +72,7 @@ public override AmazonWebServiceResponse Unmarshall(JsonUnmarshallerContext cont } if (context.TestExpression("ExpirationTimestamp", targetDepth)) { - var unmarshaller = DateTimeUnmarshaller.Instance; + var unmarshaller = NullableDateTimeUnmarshaller.Instance; response.ExpirationTimestamp = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/PinpointSMSVoiceV2/Generated/Model/Internal/MarshallTransformations/ListProtectConfigurationRuleSetNumberOverridesRequestMarshaller.cs b/sdk/src/Services/PinpointSMSVoiceV2/Generated/Model/Internal/MarshallTransformations/ListProtectConfigurationRuleSetNumberOverridesRequestMarshaller.cs index f8734dd33c6d..3b554e702684 100644 --- a/sdk/src/Services/PinpointSMSVoiceV2/Generated/Model/Internal/MarshallTransformations/ListProtectConfigurationRuleSetNumberOverridesRequestMarshaller.cs +++ b/sdk/src/Services/PinpointSMSVoiceV2/Generated/Model/Internal/MarshallTransformations/ListProtectConfigurationRuleSetNumberOverridesRequestMarshaller.cs @@ -63,49 +63,52 @@ public IRequest Marshall(ListProtectConfigurationRuleSetNumberOverridesRequest p request.HttpMethod = "POST"; request.ResourcePath = "/"; - using (StringWriter stringWriter = new StringWriter(CultureInfo.InvariantCulture)) + using (MemoryStream memoryStream = new MemoryStream()) { - JsonWriter writer = new JsonWriter(stringWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetFilters()) + using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) { - context.Writer.WritePropertyName("Filters"); - context.Writer.WriteArrayStart(); - foreach(var publicRequestFiltersListValue in publicRequest.Filters) + JsonWriter writer = new JsonWriter(streamWriter); + writer.Validate = false; + writer.WriteObjectStart(); + var context = new JsonMarshallerContext(request, writer); + if(publicRequest.IsSetFilters()) { - context.Writer.WriteObjectStart(); - - var marshaller = ProtectConfigurationRuleSetNumberOverrideFilterItemMarshaller.Instance; - marshaller.Marshall(publicRequestFiltersListValue, context); + context.Writer.WritePropertyName("Filters"); + context.Writer.WriteArrayStart(); + foreach(var publicRequestFiltersListValue in publicRequest.Filters) + { + context.Writer.WriteObjectStart(); + + var marshaller = ProtectConfigurationRuleSetNumberOverrideFilterItemMarshaller.Instance; + marshaller.Marshall(publicRequestFiltersListValue, context); + + context.Writer.WriteObjectEnd(); + } + context.Writer.WriteArrayEnd(); + } - context.Writer.WriteObjectEnd(); + if(publicRequest.IsSetMaxResults()) + { + context.Writer.WritePropertyName("MaxResults"); + context.Writer.Write(publicRequest.MaxResults.Value); } - context.Writer.WriteArrayEnd(); - } - if(publicRequest.IsSetMaxResults()) - { - context.Writer.WritePropertyName("MaxResults"); - context.Writer.Write(publicRequest.MaxResults); - } + if(publicRequest.IsSetNextToken()) + { + context.Writer.WritePropertyName("NextToken"); + context.Writer.Write(publicRequest.NextToken); + } - if(publicRequest.IsSetNextToken()) - { - context.Writer.WritePropertyName("NextToken"); - context.Writer.Write(publicRequest.NextToken); - } + if(publicRequest.IsSetProtectConfigurationId()) + { + context.Writer.WritePropertyName("ProtectConfigurationId"); + context.Writer.Write(publicRequest.ProtectConfigurationId); + } - if(publicRequest.IsSetProtectConfigurationId()) - { - context.Writer.WritePropertyName("ProtectConfigurationId"); - context.Writer.Write(publicRequest.ProtectConfigurationId); + writer.WriteObjectEnd(); } - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); + request.Content = memoryStream.ToArray(); } diff --git a/sdk/src/Services/PinpointSMSVoiceV2/Generated/Model/Internal/MarshallTransformations/ProtectConfigurationRuleSetNumberOverrideUnmarshaller.cs b/sdk/src/Services/PinpointSMSVoiceV2/Generated/Model/Internal/MarshallTransformations/ProtectConfigurationRuleSetNumberOverrideUnmarshaller.cs index a9e7871f61ba..f5bb805b86c2 100644 --- a/sdk/src/Services/PinpointSMSVoiceV2/Generated/Model/Internal/MarshallTransformations/ProtectConfigurationRuleSetNumberOverrideUnmarshaller.cs +++ b/sdk/src/Services/PinpointSMSVoiceV2/Generated/Model/Internal/MarshallTransformations/ProtectConfigurationRuleSetNumberOverrideUnmarshaller.cs @@ -74,7 +74,7 @@ public ProtectConfigurationRuleSetNumberOverride Unmarshall(JsonUnmarshallerCont } if (context.TestExpression("CreatedTimestamp", targetDepth)) { - var unmarshaller = DateTimeUnmarshaller.Instance; + var unmarshaller = NullableDateTimeUnmarshaller.Instance; unmarshalledObject.CreatedTimestamp = unmarshaller.Unmarshall(context); continue; } @@ -86,7 +86,7 @@ public ProtectConfigurationRuleSetNumberOverride Unmarshall(JsonUnmarshallerCont } if (context.TestExpression("ExpirationTimestamp", targetDepth)) { - var unmarshaller = DateTimeUnmarshaller.Instance; + var unmarshaller = NullableDateTimeUnmarshaller.Instance; unmarshalledObject.ExpirationTimestamp = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/PinpointSMSVoiceV2/Generated/Model/Internal/MarshallTransformations/PutMessageFeedbackRequestMarshaller.cs b/sdk/src/Services/PinpointSMSVoiceV2/Generated/Model/Internal/MarshallTransformations/PutMessageFeedbackRequestMarshaller.cs index 38b60f84c80a..cb09801503a9 100644 --- a/sdk/src/Services/PinpointSMSVoiceV2/Generated/Model/Internal/MarshallTransformations/PutMessageFeedbackRequestMarshaller.cs +++ b/sdk/src/Services/PinpointSMSVoiceV2/Generated/Model/Internal/MarshallTransformations/PutMessageFeedbackRequestMarshaller.cs @@ -63,27 +63,30 @@ public IRequest Marshall(PutMessageFeedbackRequest publicRequest) request.HttpMethod = "POST"; request.ResourcePath = "/"; - using (StringWriter stringWriter = new StringWriter(CultureInfo.InvariantCulture)) + using (MemoryStream memoryStream = new MemoryStream()) { - JsonWriter writer = new JsonWriter(stringWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetMessageFeedbackStatus()) + using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) { - context.Writer.WritePropertyName("MessageFeedbackStatus"); - context.Writer.Write(publicRequest.MessageFeedbackStatus); - } + JsonWriter writer = new JsonWriter(streamWriter); + writer.Validate = false; + writer.WriteObjectStart(); + var context = new JsonMarshallerContext(request, writer); + if(publicRequest.IsSetMessageFeedbackStatus()) + { + context.Writer.WritePropertyName("MessageFeedbackStatus"); + context.Writer.Write(publicRequest.MessageFeedbackStatus); + } - if(publicRequest.IsSetMessageId()) - { - context.Writer.WritePropertyName("MessageId"); - context.Writer.Write(publicRequest.MessageId); + if(publicRequest.IsSetMessageId()) + { + context.Writer.WritePropertyName("MessageId"); + context.Writer.Write(publicRequest.MessageId); + } + + writer.WriteObjectEnd(); } - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); + request.Content = memoryStream.ToArray(); } diff --git a/sdk/src/Services/PinpointSMSVoiceV2/Generated/Model/Internal/MarshallTransformations/PutProtectConfigurationRuleSetNumberOverrideRequestMarshaller.cs b/sdk/src/Services/PinpointSMSVoiceV2/Generated/Model/Internal/MarshallTransformations/PutProtectConfigurationRuleSetNumberOverrideRequestMarshaller.cs index 972d81a138ee..e545fcf065fb 100644 --- a/sdk/src/Services/PinpointSMSVoiceV2/Generated/Model/Internal/MarshallTransformations/PutProtectConfigurationRuleSetNumberOverrideRequestMarshaller.cs +++ b/sdk/src/Services/PinpointSMSVoiceV2/Generated/Model/Internal/MarshallTransformations/PutProtectConfigurationRuleSetNumberOverrideRequestMarshaller.cs @@ -63,50 +63,53 @@ public IRequest Marshall(PutProtectConfigurationRuleSetNumberOverrideRequest pub request.HttpMethod = "POST"; request.ResourcePath = "/"; - using (StringWriter stringWriter = new StringWriter(CultureInfo.InvariantCulture)) + using (MemoryStream memoryStream = new MemoryStream()) { - JsonWriter writer = new JsonWriter(stringWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetAction()) + using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) { - context.Writer.WritePropertyName("Action"); - context.Writer.Write(publicRequest.Action); - } + JsonWriter writer = new JsonWriter(streamWriter); + writer.Validate = false; + writer.WriteObjectStart(); + var context = new JsonMarshallerContext(request, writer); + if(publicRequest.IsSetAction()) + { + context.Writer.WritePropertyName("Action"); + context.Writer.Write(publicRequest.Action); + } - if(publicRequest.IsSetClientToken()) - { - context.Writer.WritePropertyName("ClientToken"); - context.Writer.Write(publicRequest.ClientToken); - } + if(publicRequest.IsSetClientToken()) + { + context.Writer.WritePropertyName("ClientToken"); + context.Writer.Write(publicRequest.ClientToken); + } - else if(!(publicRequest.IsSetClientToken())) - { - context.Writer.WritePropertyName("ClientToken"); - context.Writer.Write(Guid.NewGuid().ToString()); - } - if(publicRequest.IsSetDestinationPhoneNumber()) - { - context.Writer.WritePropertyName("DestinationPhoneNumber"); - context.Writer.Write(publicRequest.DestinationPhoneNumber); - } + else if(!(publicRequest.IsSetClientToken())) + { + context.Writer.WritePropertyName("ClientToken"); + context.Writer.Write(Guid.NewGuid().ToString()); + } + if(publicRequest.IsSetDestinationPhoneNumber()) + { + context.Writer.WritePropertyName("DestinationPhoneNumber"); + context.Writer.Write(publicRequest.DestinationPhoneNumber); + } - if(publicRequest.IsSetExpirationTimestamp()) - { - context.Writer.WritePropertyName("ExpirationTimestamp"); - context.Writer.Write(publicRequest.ExpirationTimestamp); - } + if(publicRequest.IsSetExpirationTimestamp()) + { + context.Writer.WritePropertyName("ExpirationTimestamp"); + context.Writer.Write(publicRequest.ExpirationTimestamp.Value); + } - if(publicRequest.IsSetProtectConfigurationId()) - { - context.Writer.WritePropertyName("ProtectConfigurationId"); - context.Writer.Write(publicRequest.ProtectConfigurationId); + if(publicRequest.IsSetProtectConfigurationId()) + { + context.Writer.WritePropertyName("ProtectConfigurationId"); + context.Writer.Write(publicRequest.ProtectConfigurationId); + } + + writer.WriteObjectEnd(); } - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); + request.Content = memoryStream.ToArray(); } diff --git a/sdk/src/Services/PinpointSMSVoiceV2/Generated/Model/Internal/MarshallTransformations/PutProtectConfigurationRuleSetNumberOverrideResponseUnmarshaller.cs b/sdk/src/Services/PinpointSMSVoiceV2/Generated/Model/Internal/MarshallTransformations/PutProtectConfigurationRuleSetNumberOverrideResponseUnmarshaller.cs index 578f6955c61a..2fd3c43a218e 100644 --- a/sdk/src/Services/PinpointSMSVoiceV2/Generated/Model/Internal/MarshallTransformations/PutProtectConfigurationRuleSetNumberOverrideResponseUnmarshaller.cs +++ b/sdk/src/Services/PinpointSMSVoiceV2/Generated/Model/Internal/MarshallTransformations/PutProtectConfigurationRuleSetNumberOverrideResponseUnmarshaller.cs @@ -60,7 +60,7 @@ public override AmazonWebServiceResponse Unmarshall(JsonUnmarshallerContext cont } if (context.TestExpression("CreatedTimestamp", targetDepth)) { - var unmarshaller = DateTimeUnmarshaller.Instance; + var unmarshaller = NullableDateTimeUnmarshaller.Instance; response.CreatedTimestamp = unmarshaller.Unmarshall(context); continue; } @@ -72,7 +72,7 @@ public override AmazonWebServiceResponse Unmarshall(JsonUnmarshallerContext cont } if (context.TestExpression("ExpirationTimestamp", targetDepth)) { - var unmarshaller = DateTimeUnmarshaller.Instance; + var unmarshaller = NullableDateTimeUnmarshaller.Instance; response.ExpirationTimestamp = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/PinpointSMSVoiceV2/Generated/Model/Internal/MarshallTransformations/RegistrationVersionStatusHistoryUnmarshaller.cs b/sdk/src/Services/PinpointSMSVoiceV2/Generated/Model/Internal/MarshallTransformations/RegistrationVersionStatusHistoryUnmarshaller.cs index 59a54c66190a..9a6e9dd77c79 100644 --- a/sdk/src/Services/PinpointSMSVoiceV2/Generated/Model/Internal/MarshallTransformations/RegistrationVersionStatusHistoryUnmarshaller.cs +++ b/sdk/src/Services/PinpointSMSVoiceV2/Generated/Model/Internal/MarshallTransformations/RegistrationVersionStatusHistoryUnmarshaller.cs @@ -98,7 +98,7 @@ public RegistrationVersionStatusHistory Unmarshall(JsonUnmarshallerContext conte } if (context.TestExpression("RequiresAuthenticationTimestamp", targetDepth)) { - var unmarshaller = DateTimeUnmarshaller.Instance; + var unmarshaller = NullableDateTimeUnmarshaller.Instance; unmarshalledObject.RequiresAuthenticationTimestamp = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/PinpointSMSVoiceV2/Generated/Model/Internal/MarshallTransformations/SendMediaMessageRequestMarshaller.cs b/sdk/src/Services/PinpointSMSVoiceV2/Generated/Model/Internal/MarshallTransformations/SendMediaMessageRequestMarshaller.cs index 43949a73fc09..3918b55f3025 100644 --- a/sdk/src/Services/PinpointSMSVoiceV2/Generated/Model/Internal/MarshallTransformations/SendMediaMessageRequestMarshaller.cs +++ b/sdk/src/Services/PinpointSMSVoiceV2/Generated/Model/Internal/MarshallTransformations/SendMediaMessageRequestMarshaller.cs @@ -126,37 +126,23 @@ public IRequest Marshall(SendMediaMessageRequest publicRequest) context.Writer.Write(publicRequest.MessageBody); } + if(publicRequest.IsSetMessageFeedbackEnabled()) + { + context.Writer.WritePropertyName("MessageFeedbackEnabled"); + context.Writer.Write(publicRequest.MessageFeedbackEnabled.Value); + } + if(publicRequest.IsSetOriginationIdentity()) { context.Writer.WritePropertyName("OriginationIdentity"); context.Writer.Write(publicRequest.OriginationIdentity); } -<<<<<<< HEAD if(publicRequest.IsSetProtectConfigurationId()) { context.Writer.WritePropertyName("ProtectConfigurationId"); context.Writer.Write(publicRequest.ProtectConfigurationId); } -||||||| Commit version number update changes - if(publicRequest.IsSetOriginationIdentity()) - { - context.Writer.WritePropertyName("OriginationIdentity"); - context.Writer.Write(publicRequest.OriginationIdentity); - } -======= - if(publicRequest.IsSetMessageFeedbackEnabled()) - { - context.Writer.WritePropertyName("MessageFeedbackEnabled"); - context.Writer.Write(publicRequest.MessageFeedbackEnabled); - } - - if(publicRequest.IsSetOriginationIdentity()) - { - context.Writer.WritePropertyName("OriginationIdentity"); - context.Writer.Write(publicRequest.OriginationIdentity); - } ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b if(publicRequest.IsSetTimeToLive()) { diff --git a/sdk/src/Services/PinpointSMSVoiceV2/Generated/Model/Internal/MarshallTransformations/SendTextMessageRequestMarshaller.cs b/sdk/src/Services/PinpointSMSVoiceV2/Generated/Model/Internal/MarshallTransformations/SendTextMessageRequestMarshaller.cs index 6f3dcd6e7e91..868c1643fa0e 100644 --- a/sdk/src/Services/PinpointSMSVoiceV2/Generated/Model/Internal/MarshallTransformations/SendTextMessageRequestMarshaller.cs +++ b/sdk/src/Services/PinpointSMSVoiceV2/Generated/Model/Internal/MarshallTransformations/SendTextMessageRequestMarshaller.cs @@ -135,37 +135,23 @@ public IRequest Marshall(SendTextMessageRequest publicRequest) context.Writer.Write(publicRequest.MessageBody); } + if(publicRequest.IsSetMessageFeedbackEnabled()) + { + context.Writer.WritePropertyName("MessageFeedbackEnabled"); + context.Writer.Write(publicRequest.MessageFeedbackEnabled.Value); + } + if(publicRequest.IsSetMessageType()) { context.Writer.WritePropertyName("MessageType"); context.Writer.Write(publicRequest.MessageType); } -<<<<<<< HEAD if(publicRequest.IsSetOriginationIdentity()) { context.Writer.WritePropertyName("OriginationIdentity"); context.Writer.Write(publicRequest.OriginationIdentity); } -||||||| Commit version number update changes - if(publicRequest.IsSetMessageType()) - { - context.Writer.WritePropertyName("MessageType"); - context.Writer.Write(publicRequest.MessageType); - } -======= - if(publicRequest.IsSetMessageFeedbackEnabled()) - { - context.Writer.WritePropertyName("MessageFeedbackEnabled"); - context.Writer.Write(publicRequest.MessageFeedbackEnabled); - } - - if(publicRequest.IsSetMessageType()) - { - context.Writer.WritePropertyName("MessageType"); - context.Writer.Write(publicRequest.MessageType); - } ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b if(publicRequest.IsSetProtectConfigurationId()) { diff --git a/sdk/src/Services/PinpointSMSVoiceV2/Generated/Model/Internal/MarshallTransformations/SendVoiceMessageRequestMarshaller.cs b/sdk/src/Services/PinpointSMSVoiceV2/Generated/Model/Internal/MarshallTransformations/SendVoiceMessageRequestMarshaller.cs index 30bd3aff5c6d..5a6d1fb9740e 100644 --- a/sdk/src/Services/PinpointSMSVoiceV2/Generated/Model/Internal/MarshallTransformations/SendVoiceMessageRequestMarshaller.cs +++ b/sdk/src/Services/PinpointSMSVoiceV2/Generated/Model/Internal/MarshallTransformations/SendVoiceMessageRequestMarshaller.cs @@ -121,37 +121,23 @@ public IRequest Marshall(SendVoiceMessageRequest publicRequest) context.Writer.Write(publicRequest.MessageBodyTextType); } + if(publicRequest.IsSetMessageFeedbackEnabled()) + { + context.Writer.WritePropertyName("MessageFeedbackEnabled"); + context.Writer.Write(publicRequest.MessageFeedbackEnabled.Value); + } + if(publicRequest.IsSetOriginationIdentity()) { context.Writer.WritePropertyName("OriginationIdentity"); context.Writer.Write(publicRequest.OriginationIdentity); } -<<<<<<< HEAD if(publicRequest.IsSetProtectConfigurationId()) { context.Writer.WritePropertyName("ProtectConfigurationId"); context.Writer.Write(publicRequest.ProtectConfigurationId); } -||||||| Commit version number update changes - if(publicRequest.IsSetOriginationIdentity()) - { - context.Writer.WritePropertyName("OriginationIdentity"); - context.Writer.Write(publicRequest.OriginationIdentity); - } -======= - if(publicRequest.IsSetMessageFeedbackEnabled()) - { - context.Writer.WritePropertyName("MessageFeedbackEnabled"); - context.Writer.Write(publicRequest.MessageFeedbackEnabled); - } - - if(publicRequest.IsSetOriginationIdentity()) - { - context.Writer.WritePropertyName("OriginationIdentity"); - context.Writer.Write(publicRequest.OriginationIdentity); - } ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b if(publicRequest.IsSetTimeToLive()) { diff --git a/sdk/src/Services/PinpointSMSVoiceV2/Generated/Model/Internal/MarshallTransformations/SetDefaultMessageFeedbackEnabledRequestMarshaller.cs b/sdk/src/Services/PinpointSMSVoiceV2/Generated/Model/Internal/MarshallTransformations/SetDefaultMessageFeedbackEnabledRequestMarshaller.cs index 1591f67a1c2f..7a702dd77c3f 100644 --- a/sdk/src/Services/PinpointSMSVoiceV2/Generated/Model/Internal/MarshallTransformations/SetDefaultMessageFeedbackEnabledRequestMarshaller.cs +++ b/sdk/src/Services/PinpointSMSVoiceV2/Generated/Model/Internal/MarshallTransformations/SetDefaultMessageFeedbackEnabledRequestMarshaller.cs @@ -63,27 +63,30 @@ public IRequest Marshall(SetDefaultMessageFeedbackEnabledRequest publicRequest) request.HttpMethod = "POST"; request.ResourcePath = "/"; - using (StringWriter stringWriter = new StringWriter(CultureInfo.InvariantCulture)) + using (MemoryStream memoryStream = new MemoryStream()) { - JsonWriter writer = new JsonWriter(stringWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetConfigurationSetName()) + using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) { - context.Writer.WritePropertyName("ConfigurationSetName"); - context.Writer.Write(publicRequest.ConfigurationSetName); - } + JsonWriter writer = new JsonWriter(streamWriter); + writer.Validate = false; + writer.WriteObjectStart(); + var context = new JsonMarshallerContext(request, writer); + if(publicRequest.IsSetConfigurationSetName()) + { + context.Writer.WritePropertyName("ConfigurationSetName"); + context.Writer.Write(publicRequest.ConfigurationSetName); + } - if(publicRequest.IsSetMessageFeedbackEnabled()) - { - context.Writer.WritePropertyName("MessageFeedbackEnabled"); - context.Writer.Write(publicRequest.MessageFeedbackEnabled); + if(publicRequest.IsSetMessageFeedbackEnabled()) + { + context.Writer.WritePropertyName("MessageFeedbackEnabled"); + context.Writer.Write(publicRequest.MessageFeedbackEnabled.Value); + } + + writer.WriteObjectEnd(); } - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); + request.Content = memoryStream.ToArray(); } diff --git a/sdk/src/Services/PinpointSMSVoiceV2/Generated/Model/Internal/MarshallTransformations/SetDefaultMessageFeedbackEnabledResponseUnmarshaller.cs b/sdk/src/Services/PinpointSMSVoiceV2/Generated/Model/Internal/MarshallTransformations/SetDefaultMessageFeedbackEnabledResponseUnmarshaller.cs index 26aeb0148357..3805d6dcdeec 100644 --- a/sdk/src/Services/PinpointSMSVoiceV2/Generated/Model/Internal/MarshallTransformations/SetDefaultMessageFeedbackEnabledResponseUnmarshaller.cs +++ b/sdk/src/Services/PinpointSMSVoiceV2/Generated/Model/Internal/MarshallTransformations/SetDefaultMessageFeedbackEnabledResponseUnmarshaller.cs @@ -66,7 +66,7 @@ public override AmazonWebServiceResponse Unmarshall(JsonUnmarshallerContext cont } if (context.TestExpression("MessageFeedbackEnabled", targetDepth)) { - var unmarshaller = BoolUnmarshaller.Instance; + var unmarshaller = NullableBoolUnmarshaller.Instance; response.MessageFeedbackEnabled = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/PinpointSMSVoiceV2/Generated/Model/ListProtectConfigurationRuleSetNumberOverridesRequest.cs b/sdk/src/Services/PinpointSMSVoiceV2/Generated/Model/ListProtectConfigurationRuleSetNumberOverridesRequest.cs index 467ec369ed5a..3b56c87d710f 100644 --- a/sdk/src/Services/PinpointSMSVoiceV2/Generated/Model/ListProtectConfigurationRuleSetNumberOverridesRequest.cs +++ b/sdk/src/Services/PinpointSMSVoiceV2/Generated/Model/ListProtectConfigurationRuleSetNumberOverridesRequest.cs @@ -68,9 +68,9 @@ internal bool IsSetFilters() /// /// [AWSProperty(Min=1, Max=100)] - public int MaxResults + public int? MaxResults { - get { return this._maxResults.GetValueOrDefault(); } + get { return this._maxResults; } set { this._maxResults = value; } } diff --git a/sdk/src/Services/PinpointSMSVoiceV2/Generated/Model/ProtectConfigurationRuleSetNumberOverride.cs b/sdk/src/Services/PinpointSMSVoiceV2/Generated/Model/ProtectConfigurationRuleSetNumberOverride.cs index e0259f52b1dd..2b848c9085bf 100644 --- a/sdk/src/Services/PinpointSMSVoiceV2/Generated/Model/ProtectConfigurationRuleSetNumberOverride.cs +++ b/sdk/src/Services/PinpointSMSVoiceV2/Generated/Model/ProtectConfigurationRuleSetNumberOverride.cs @@ -68,9 +68,9 @@ internal bool IsSetAction() /// /// [AWSProperty(Required=true)] - public DateTime CreatedTimestamp + public DateTime? CreatedTimestamp { - get { return this._createdTimestamp.GetValueOrDefault(); } + get { return this._createdTimestamp; } set { this._createdTimestamp = value; } } @@ -106,9 +106,9 @@ internal bool IsSetDestinationPhoneNumber() /// rule will not expire. /// /// - public DateTime ExpirationTimestamp + public DateTime? ExpirationTimestamp { - get { return this._expirationTimestamp.GetValueOrDefault(); } + get { return this._expirationTimestamp; } set { this._expirationTimestamp = value; } } diff --git a/sdk/src/Services/PinpointSMSVoiceV2/Generated/Model/PutProtectConfigurationRuleSetNumberOverrideRequest.cs b/sdk/src/Services/PinpointSMSVoiceV2/Generated/Model/PutProtectConfigurationRuleSetNumberOverrideRequest.cs index 923d56d7a6cc..47e4d5ea5999 100644 --- a/sdk/src/Services/PinpointSMSVoiceV2/Generated/Model/PutProtectConfigurationRuleSetNumberOverrideRequest.cs +++ b/sdk/src/Services/PinpointSMSVoiceV2/Generated/Model/PutProtectConfigurationRuleSetNumberOverrideRequest.cs @@ -108,9 +108,9 @@ internal bool IsSetDestinationPhoneNumber() /// rule does not expire. /// /// - public DateTime ExpirationTimestamp + public DateTime? ExpirationTimestamp { - get { return this._expirationTimestamp.GetValueOrDefault(); } + get { return this._expirationTimestamp; } set { this._expirationTimestamp = value; } } diff --git a/sdk/src/Services/PinpointSMSVoiceV2/Generated/Model/PutProtectConfigurationRuleSetNumberOverrideResponse.cs b/sdk/src/Services/PinpointSMSVoiceV2/Generated/Model/PutProtectConfigurationRuleSetNumberOverrideResponse.cs index 5f3311272584..ba860a709578 100644 --- a/sdk/src/Services/PinpointSMSVoiceV2/Generated/Model/PutProtectConfigurationRuleSetNumberOverrideResponse.cs +++ b/sdk/src/Services/PinpointSMSVoiceV2/Generated/Model/PutProtectConfigurationRuleSetNumberOverrideResponse.cs @@ -69,9 +69,9 @@ internal bool IsSetAction() /// /// [AWSProperty(Required=true)] - public DateTime CreatedTimestamp + public DateTime? CreatedTimestamp { - get { return this._createdTimestamp.GetValueOrDefault(); } + get { return this._createdTimestamp; } set { this._createdTimestamp = value; } } @@ -106,9 +106,9 @@ internal bool IsSetDestinationPhoneNumber() /// The time the rule will expire at. /// /// - public DateTime ExpirationTimestamp + public DateTime? ExpirationTimestamp { - get { return this._expirationTimestamp.GetValueOrDefault(); } + get { return this._expirationTimestamp; } set { this._expirationTimestamp = value; } } diff --git a/sdk/src/Services/PinpointSMSVoiceV2/Generated/Model/RegistrationVersionStatusHistory.cs b/sdk/src/Services/PinpointSMSVoiceV2/Generated/Model/RegistrationVersionStatusHistory.cs index 37f904cdd0e4..ffc2c119e212 100644 --- a/sdk/src/Services/PinpointSMSVoiceV2/Generated/Model/RegistrationVersionStatusHistory.cs +++ b/sdk/src/Services/PinpointSMSVoiceV2/Generated/Model/RegistrationVersionStatusHistory.cs @@ -148,9 +148,9 @@ internal bool IsSetDraftTimestamp() /// epoch time format. /// /// - public DateTime RequiresAuthenticationTimestamp + public DateTime? RequiresAuthenticationTimestamp { - get { return this._requiresAuthenticationTimestamp.GetValueOrDefault(); } + get { return this._requiresAuthenticationTimestamp; } set { this._requiresAuthenticationTimestamp = value; } } diff --git a/sdk/src/Services/PinpointSMSVoiceV2/Generated/Model/SendMediaMessageRequest.cs b/sdk/src/Services/PinpointSMSVoiceV2/Generated/Model/SendMediaMessageRequest.cs index 17a724f02909..b1faf5846b7f 100644 --- a/sdk/src/Services/PinpointSMSVoiceV2/Generated/Model/SendMediaMessageRequest.cs +++ b/sdk/src/Services/PinpointSMSVoiceV2/Generated/Model/SendMediaMessageRequest.cs @@ -198,9 +198,9 @@ internal bool IsSetMessageBody() /// you need to update the message status using PutMessageFeedback. /// /// - public bool MessageFeedbackEnabled + public bool? MessageFeedbackEnabled { - get { return this._messageFeedbackEnabled.GetValueOrDefault(); } + get { return this._messageFeedbackEnabled; } set { this._messageFeedbackEnabled = value; } } diff --git a/sdk/src/Services/PinpointSMSVoiceV2/Generated/Model/SendTextMessageRequest.cs b/sdk/src/Services/PinpointSMSVoiceV2/Generated/Model/SendTextMessageRequest.cs index 59e99179cb31..6327b8456b03 100644 --- a/sdk/src/Services/PinpointSMSVoiceV2/Generated/Model/SendTextMessageRequest.cs +++ b/sdk/src/Services/PinpointSMSVoiceV2/Generated/Model/SendTextMessageRequest.cs @@ -250,9 +250,9 @@ internal bool IsSetMessageBody() /// you need to update the message status using PutMessageFeedback. /// /// - public bool MessageFeedbackEnabled + public bool? MessageFeedbackEnabled { - get { return this._messageFeedbackEnabled.GetValueOrDefault(); } + get { return this._messageFeedbackEnabled; } set { this._messageFeedbackEnabled = value; } } diff --git a/sdk/src/Services/PinpointSMSVoiceV2/Generated/Model/SendVoiceMessageRequest.cs b/sdk/src/Services/PinpointSMSVoiceV2/Generated/Model/SendVoiceMessageRequest.cs index 47d2d310e3ad..f937c467568d 100644 --- a/sdk/src/Services/PinpointSMSVoiceV2/Generated/Model/SendVoiceMessageRequest.cs +++ b/sdk/src/Services/PinpointSMSVoiceV2/Generated/Model/SendVoiceMessageRequest.cs @@ -200,9 +200,9 @@ internal bool IsSetMessageBodyTextType() /// you need to update the message status using PutMessageFeedback. ///     ///     - public bool MessageFeedbackEnabled + public bool? MessageFeedbackEnabled { - get { return this._messageFeedbackEnabled.GetValueOrDefault(); } + get { return this._messageFeedbackEnabled; } set { this._messageFeedbackEnabled = value; } } diff --git a/sdk/src/Services/PinpointSMSVoiceV2/Generated/Model/SetDefaultMessageFeedbackEnabledRequest.cs b/sdk/src/Services/PinpointSMSVoiceV2/Generated/Model/SetDefaultMessageFeedbackEnabledRequest.cs index eaf069dc8d39..9c2aa2ff068c 100644 --- a/sdk/src/Services/PinpointSMSVoiceV2/Generated/Model/SetDefaultMessageFeedbackEnabledRequest.cs +++ b/sdk/src/Services/PinpointSMSVoiceV2/Generated/Model/SetDefaultMessageFeedbackEnabledRequest.cs @@ -65,9 +65,9 @@ internal bool IsSetConfigurationSetName() ///     ///     [AWSProperty(Required=true)] - public bool MessageFeedbackEnabled + public bool? MessageFeedbackEnabled { - get { return this._messageFeedbackEnabled.GetValueOrDefault(); } + get { return this._messageFeedbackEnabled; } set { this._messageFeedbackEnabled = value; } } diff --git a/sdk/src/Services/PinpointSMSVoiceV2/Generated/Model/SetDefaultMessageFeedbackEnabledResponse.cs b/sdk/src/Services/PinpointSMSVoiceV2/Generated/Model/SetDefaultMessageFeedbackEnabledResponse.cs index d3ab2dcbd79d..1afefdef8c32 100644 --- a/sdk/src/Services/PinpointSMSVoiceV2/Generated/Model/SetDefaultMessageFeedbackEnabledResponse.cs +++ b/sdk/src/Services/PinpointSMSVoiceV2/Generated/Model/SetDefaultMessageFeedbackEnabledResponse.cs @@ -81,9 +81,9 @@ internal bool IsSetConfigurationSetName() /// True if message feedback is enabled. ///     ///     - public bool MessageFeedbackEnabled + public bool? MessageFeedbackEnabled { - get { return this._messageFeedbackEnabled.GetValueOrDefault(); } + get { return this._messageFeedbackEnabled; } set { this._messageFeedbackEnabled = value; } } diff --git a/sdk/src/Services/PinpointSMSVoiceV2/Generated/Model/_bcl45+netstandard/IListProtectConfigurationRuleSetNumberOverridesPaginator.cs b/sdk/src/Services/PinpointSMSVoiceV2/Generated/Model/_bcl+netstandard/IListProtectConfigurationRuleSetNumberOverridesPaginator.cs similarity index 100% rename from sdk/src/Services/PinpointSMSVoiceV2/Generated/Model/_bcl45+netstandard/IListProtectConfigurationRuleSetNumberOverridesPaginator.cs rename to sdk/src/Services/PinpointSMSVoiceV2/Generated/Model/_bcl+netstandard/IListProtectConfigurationRuleSetNumberOverridesPaginator.cs diff --git a/sdk/src/Services/PinpointSMSVoiceV2/Generated/Model/_bcl45+netstandard/ListProtectConfigurationRuleSetNumberOverridesPaginator.cs b/sdk/src/Services/PinpointSMSVoiceV2/Generated/Model/_bcl+netstandard/ListProtectConfigurationRuleSetNumberOverridesPaginator.cs similarity index 100% rename from sdk/src/Services/PinpointSMSVoiceV2/Generated/Model/_bcl45+netstandard/ListProtectConfigurationRuleSetNumberOverridesPaginator.cs rename to sdk/src/Services/PinpointSMSVoiceV2/Generated/Model/_bcl+netstandard/ListProtectConfigurationRuleSetNumberOverridesPaginator.cs diff --git a/sdk/src/Services/PinpointSMSVoiceV2/Generated/_bcl/AmazonPinpointSMSVoiceV2Client.cs b/sdk/src/Services/PinpointSMSVoiceV2/Generated/_bcl/AmazonPinpointSMSVoiceV2Client.cs index 9762eb181e62..6853d6b8dc12 100644 --- a/sdk/src/Services/PinpointSMSVoiceV2/Generated/_bcl/AmazonPinpointSMSVoiceV2Client.cs +++ b/sdk/src/Services/PinpointSMSVoiceV2/Generated/_bcl/AmazonPinpointSMSVoiceV2Client.cs @@ -1259,9 +1259,15 @@ public virtual CreateRegistrationAssociationResponse CreateRegistrationAssociati /// /// Create a new registration attachment to use for uploading a file or a URL to a file. - /// The maximum file size is 1MiB and valid file extensions are PDF, JPEG and PNG. For + /// The maximum file size is 500KB and valid file extensions are PDF, JPEG and PNG. For /// example, many sender ID registrations require a signed “letter of authorization” (LOA) /// to be submitted. + /// + /// + /// + /// Use either AttachmentUrl or AttachmentBody to upload your attachment. + /// If both are specified then an exception is returned. + /// /// /// Container for the necessary parameters to execute the CreateRegistrationAttachment service method. /// @@ -1302,9 +1308,15 @@ public virtual CreateRegistrationAttachmentResponse CreateRegistrationAttachment /// /// Create a new registration attachment to use for uploading a file or a URL to a file. - /// The maximum file size is 1MiB and valid file extensions are PDF, JPEG and PNG. For + /// The maximum file size is 500KB and valid file extensions are PDF, JPEG and PNG. For /// example, many sender ID registrations require a signed “letter of authorization” (LOA) /// to be submitted. + /// + /// + /// + /// Use either AttachmentUrl or AttachmentBody to upload your attachment. + /// If both are specified then an exception is returned. + /// /// /// Container for the necessary parameters to execute the CreateRegistrationAttachment service method. /// @@ -2580,6 +2592,83 @@ public virtual DeleteProtectConfigurationResponse DeleteProtectConfiguration(Del #endregion + #region DeleteProtectConfigurationRuleSetNumberOverride + + + /// + /// Permanently delete the protect configuration rule set number override. + /// + /// Container for the necessary parameters to execute the DeleteProtectConfigurationRuleSetNumberOverride service method. + /// + /// The response from the DeleteProtectConfigurationRuleSetNumberOverride service method, as returned by PinpointSMSVoiceV2. + /// + /// The request was denied because you don't have sufficient permissions to access the + /// resource. + /// + /// + /// The API encountered an unexpected error and couldn't complete the request. You might + /// be able to successfully issue the request again in the future. + /// + /// + /// A requested resource couldn't be found. + /// + /// + /// An error that occurred because too many requests were sent during a certain amount + /// of time. + /// + /// + /// A validation exception for a field. + /// + /// REST API Reference for DeleteProtectConfigurationRuleSetNumberOverride Operation + public virtual DeleteProtectConfigurationRuleSetNumberOverrideResponse DeleteProtectConfigurationRuleSetNumberOverride(DeleteProtectConfigurationRuleSetNumberOverrideRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = DeleteProtectConfigurationRuleSetNumberOverrideRequestMarshaller.Instance; + options.ResponseUnmarshaller = DeleteProtectConfigurationRuleSetNumberOverrideResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// Permanently delete the protect configuration rule set number override. + /// + /// Container for the necessary parameters to execute the DeleteProtectConfigurationRuleSetNumberOverride service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the DeleteProtectConfigurationRuleSetNumberOverride service method, as returned by PinpointSMSVoiceV2. + /// + /// The request was denied because you don't have sufficient permissions to access the + /// resource. + /// + /// + /// The API encountered an unexpected error and couldn't complete the request. You might + /// be able to successfully issue the request again in the future. + /// + /// + /// A requested resource couldn't be found. + /// + /// + /// An error that occurred because too many requests were sent during a certain amount + /// of time. + /// + /// + /// A validation exception for a field. + /// + /// REST API Reference for DeleteProtectConfigurationRuleSetNumberOverride Operation + public virtual Task DeleteProtectConfigurationRuleSetNumberOverrideAsync(DeleteProtectConfigurationRuleSetNumberOverrideRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = DeleteProtectConfigurationRuleSetNumberOverrideRequestMarshaller.Instance; + options.ResponseUnmarshaller = DeleteProtectConfigurationRuleSetNumberOverrideResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + #region DeleteRegistration @@ -3572,7 +3661,7 @@ public virtual DescribeKeywordsResponse DescribeKeywords(DescribeKeywordsRequest ///     /// /// - /// If you specify an opted out number that isn't valid, an error is returned. + /// If you specify an opted out number that isn't valid, an exception is returned. /// ///     /// Container for the necessary parameters to execute the DescribeOptedOutNumbers service method. @@ -3621,7 +3710,7 @@ public virtual DescribeOptedOutNumbersResponse DescribeOptedOutNumbers(DescribeO ///     /// /// - /// If you specify an opted out number that isn't valid, an error is returned. + /// If you specify an opted out number that isn't valid, an exception is returned. /// ///     /// Container for the necessary parameters to execute the DescribeOptedOutNumbers service method. @@ -4787,7 +4876,7 @@ public virtual DescribeSpendLimitsResponse DescribeSpendLimits(DescribeSpendLimi /// - /// Retrieves the specified verified destiona numbers. + /// Retrieves the specified verified destination numbers. /// /// Container for the necessary parameters to execute the DescribeVerifiedDestinationNumbers service method. /// @@ -4822,7 +4911,7 @@ public virtual DescribeVerifiedDestinationNumbersResponse DescribeVerifiedDestin /// - /// Retrieves the specified verified destiona numbers. + /// Retrieves the specified verified destination numbers. /// /// Container for the necessary parameters to execute the DescribeVerifiedDestinationNumbers service method. /// @@ -5380,11 +5469,90 @@ public virtual ListPoolOriginationIdentitiesResponse ListPoolOriginationIdentiti #endregion + #region ListProtectConfigurationRuleSetNumberOverrides + + + /// + /// Retrieve all of the protect configuration rule set number overrides that match the + /// filters. + /// + /// Container for the necessary parameters to execute the ListProtectConfigurationRuleSetNumberOverrides service method. + /// + /// The response from the ListProtectConfigurationRuleSetNumberOverrides service method, as returned by PinpointSMSVoiceV2. + /// + /// The request was denied because you don't have sufficient permissions to access the + /// resource. + /// + /// + /// The API encountered an unexpected error and couldn't complete the request. You might + /// be able to successfully issue the request again in the future. + /// + /// + /// A requested resource couldn't be found. + /// + /// + /// An error that occurred because too many requests were sent during a certain amount + /// of time. + /// + /// + /// A validation exception for a field. + /// + /// REST API Reference for ListProtectConfigurationRuleSetNumberOverrides Operation + public virtual ListProtectConfigurationRuleSetNumberOverridesResponse ListProtectConfigurationRuleSetNumberOverrides(ListProtectConfigurationRuleSetNumberOverridesRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = ListProtectConfigurationRuleSetNumberOverridesRequestMarshaller.Instance; + options.ResponseUnmarshaller = ListProtectConfigurationRuleSetNumberOverridesResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// Retrieve all of the protect configuration rule set number overrides that match the + /// filters. + /// + /// Container for the necessary parameters to execute the ListProtectConfigurationRuleSetNumberOverrides service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the ListProtectConfigurationRuleSetNumberOverrides service method, as returned by PinpointSMSVoiceV2. + /// + /// The request was denied because you don't have sufficient permissions to access the + /// resource. + /// + /// + /// The API encountered an unexpected error and couldn't complete the request. You might + /// be able to successfully issue the request again in the future. + /// + /// + /// A requested resource couldn't be found. + /// + /// + /// An error that occurred because too many requests were sent during a certain amount + /// of time. + /// + /// + /// A validation exception for a field. + /// + /// REST API Reference for ListProtectConfigurationRuleSetNumberOverrides Operation + public virtual Task ListProtectConfigurationRuleSetNumberOverridesAsync(ListProtectConfigurationRuleSetNumberOverridesRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = ListProtectConfigurationRuleSetNumberOverridesRequestMarshaller.Instance; + options.ResponseUnmarshaller = ListProtectConfigurationRuleSetNumberOverridesResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + #region ListRegistrationAssociations /// - /// Retreive all of the origination identies that are associated with a registration. + /// Retrieve all of the origination identities that are associated with a registration. /// /// Container for the necessary parameters to execute the ListRegistrationAssociations service method. /// @@ -5419,7 +5587,7 @@ public virtual ListRegistrationAssociationsResponse ListRegistrationAssociations /// - /// Retreive all of the origination identies that are associated with a registration. + /// Retrieve all of the origination identities that are associated with a registration. /// /// Container for the necessary parameters to execute the ListRegistrationAssociations service method. /// @@ -5653,6 +5821,101 @@ public virtual PutKeywordResponse PutKeyword(PutKeywordRequest request) #endregion + #region PutMessageFeedback + + + /// + /// Set the MessageFeedbackStatus as RECEIVED or FAILED for the passed in + /// MessageId. + /// + /// + /// + /// If you use message feedback then you must update message feedback record. When you + /// receive a signal that a user has received the message you must use PutMessageFeedback + /// to set the message feedback record as RECEIVED; Otherwise, an hour after the + /// message feedback record is set to FAILED. + /// + /// + /// Container for the necessary parameters to execute the PutMessageFeedback service method. + /// + /// The response from the PutMessageFeedback service method, as returned by PinpointSMSVoiceV2. + /// + /// The request was denied because you don't have sufficient permissions to access the + /// resource. + /// + /// + /// The API encountered an unexpected error and couldn't complete the request. You might + /// be able to successfully issue the request again in the future. + /// + /// + /// A requested resource couldn't be found. + /// + /// + /// An error that occurred because too many requests were sent during a certain amount + /// of time. + /// + /// + /// A validation exception for a field. + /// + /// REST API Reference for PutMessageFeedback Operation + public virtual PutMessageFeedbackResponse PutMessageFeedback(PutMessageFeedbackRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = PutMessageFeedbackRequestMarshaller.Instance; + options.ResponseUnmarshaller = PutMessageFeedbackResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// Set the MessageFeedbackStatus as RECEIVED or FAILED for the passed in + /// MessageId. + /// + /// + /// + /// If you use message feedback then you must update message feedback record. When you + /// receive a signal that a user has received the message you must use PutMessageFeedback + /// to set the message feedback record as RECEIVED; Otherwise, an hour after the + /// message feedback record is set to FAILED. + /// + /// + /// Container for the necessary parameters to execute the PutMessageFeedback service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the PutMessageFeedback service method, as returned by PinpointSMSVoiceV2. + /// + /// The request was denied because you don't have sufficient permissions to access the + /// resource. + /// + /// + /// The API encountered an unexpected error and couldn't complete the request. You might + /// be able to successfully issue the request again in the future. + /// + /// + /// A requested resource couldn't be found. + /// + /// + /// An error that occurred because too many requests were sent during a certain amount + /// of time. + /// + /// + /// A validation exception for a field. + /// + /// REST API Reference for PutMessageFeedback Operation + public virtual Task PutMessageFeedbackAsync(PutMessageFeedbackRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = PutMessageFeedbackRequestMarshaller.Instance; + options.ResponseUnmarshaller = PutMessageFeedbackResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + #region PutOptedOutNumber @@ -5742,6 +6005,93 @@ public virtual PutOptedOutNumberResponse PutOptedOutNumber(PutOptedOutNumberRequ #endregion + #region PutProtectConfigurationRuleSetNumberOverride + + + /// + /// Create or update a RuleSetNumberOverride and associate it with a protect configuration. + /// + /// Container for the necessary parameters to execute the PutProtectConfigurationRuleSetNumberOverride service method. + /// + /// The response from the PutProtectConfigurationRuleSetNumberOverride service method, as returned by PinpointSMSVoiceV2. + /// + /// The request was denied because you don't have sufficient permissions to access the + /// resource. + /// + /// + /// Your request has conflicting operations. This can occur if you're trying to perform + /// more than one operation on the same resource at the same time or it could be that + /// the requested action isn't valid for the current state or configuration of the resource. + /// + /// + /// The API encountered an unexpected error and couldn't complete the request. You might + /// be able to successfully issue the request again in the future. + /// + /// + /// The request would cause a service quota to be exceeded. + /// + /// + /// An error that occurred because too many requests were sent during a certain amount + /// of time. + /// + /// + /// A validation exception for a field. + /// + /// REST API Reference for PutProtectConfigurationRuleSetNumberOverride Operation + public virtual PutProtectConfigurationRuleSetNumberOverrideResponse PutProtectConfigurationRuleSetNumberOverride(PutProtectConfigurationRuleSetNumberOverrideRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = PutProtectConfigurationRuleSetNumberOverrideRequestMarshaller.Instance; + options.ResponseUnmarshaller = PutProtectConfigurationRuleSetNumberOverrideResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// Create or update a RuleSetNumberOverride and associate it with a protect configuration. + /// + /// Container for the necessary parameters to execute the PutProtectConfigurationRuleSetNumberOverride service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the PutProtectConfigurationRuleSetNumberOverride service method, as returned by PinpointSMSVoiceV2. + /// + /// The request was denied because you don't have sufficient permissions to access the + /// resource. + /// + /// + /// Your request has conflicting operations. This can occur if you're trying to perform + /// more than one operation on the same resource at the same time or it could be that + /// the requested action isn't valid for the current state or configuration of the resource. + /// + /// + /// The API encountered an unexpected error and couldn't complete the request. You might + /// be able to successfully issue the request again in the future. + /// + /// + /// The request would cause a service quota to be exceeded. + /// + /// + /// An error that occurred because too many requests were sent during a certain amount + /// of time. + /// + /// + /// A validation exception for a field. + /// + /// REST API Reference for PutProtectConfigurationRuleSetNumberOverride Operation + public virtual Task PutProtectConfigurationRuleSetNumberOverrideAsync(PutProtectConfigurationRuleSetNumberOverrideRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = PutProtectConfigurationRuleSetNumberOverrideRequestMarshaller.Instance; + options.ResponseUnmarshaller = PutProtectConfigurationRuleSetNumberOverrideResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + #region PutRegistrationFieldValue @@ -6769,6 +7119,83 @@ public virtual SetAccountDefaultProtectConfigurationResponse SetAccountDefaultPr #endregion + #region SetDefaultMessageFeedbackEnabled + + + /// + /// Sets a configuration set's default for message feedback. + /// + /// Container for the necessary parameters to execute the SetDefaultMessageFeedbackEnabled service method. + /// + /// The response from the SetDefaultMessageFeedbackEnabled service method, as returned by PinpointSMSVoiceV2. + /// + /// The request was denied because you don't have sufficient permissions to access the + /// resource. + /// + /// + /// The API encountered an unexpected error and couldn't complete the request. You might + /// be able to successfully issue the request again in the future. + /// + /// + /// A requested resource couldn't be found. + /// + /// + /// An error that occurred because too many requests were sent during a certain amount + /// of time. + /// + /// + /// A validation exception for a field. + /// + /// REST API Reference for SetDefaultMessageFeedbackEnabled Operation + public virtual SetDefaultMessageFeedbackEnabledResponse SetDefaultMessageFeedbackEnabled(SetDefaultMessageFeedbackEnabledRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = SetDefaultMessageFeedbackEnabledRequestMarshaller.Instance; + options.ResponseUnmarshaller = SetDefaultMessageFeedbackEnabledResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// Sets a configuration set's default for message feedback. + /// + /// Container for the necessary parameters to execute the SetDefaultMessageFeedbackEnabled service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the SetDefaultMessageFeedbackEnabled service method, as returned by PinpointSMSVoiceV2. + /// + /// The request was denied because you don't have sufficient permissions to access the + /// resource. + /// + /// + /// The API encountered an unexpected error and couldn't complete the request. You might + /// be able to successfully issue the request again in the future. + /// + /// + /// A requested resource couldn't be found. + /// + /// + /// An error that occurred because too many requests were sent during a certain amount + /// of time. + /// + /// + /// A validation exception for a field. + /// + /// REST API Reference for SetDefaultMessageFeedbackEnabled Operation + public virtual Task SetDefaultMessageFeedbackEnabledAsync(SetDefaultMessageFeedbackEnabledRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = SetDefaultMessageFeedbackEnabledRequestMarshaller.Instance; + options.ResponseUnmarshaller = SetDefaultMessageFeedbackEnabledResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + #region SetDefaultMessageType diff --git a/sdk/src/Services/PinpointSMSVoiceV2/PinpointSMSVoiceV2.sln b/sdk/src/Services/PinpointSMSVoiceV2/PinpointSMSVoiceV2.sln index 57a810c4a4e8..fd596dd39b9b 100644 --- a/sdk/src/Services/PinpointSMSVoiceV2/PinpointSMSVoiceV2.sln +++ b/sdk/src/Services/PinpointSMSVoiceV2/PinpointSMSVoiceV2.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {F22723B2-ABB4-4A13-BBF1-598E5C44B562}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {F22723B2-ABB4-4A13-BBF1-598E5C44B562}.Debug|Any CPU.Build.0 = Debug|Any CPU {F22723B2-ABB4-4A13-BBF1-598E5C44B562}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {C32D7891-230C-4EE6-ABA7-99E499A3B111}.Debug|Any CPU.Build.0 = Debug|Any CPU {C32D7891-230C-4EE6-ABA7-99E499A3B111}.Release|Any CPU.ActiveCfg = Release|Any CPU {C32D7891-230C-4EE6-ABA7-99E499A3B111}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {4CF92A15-423D-42FF-ABB5-B1E1027A3EAA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4CF92A15-423D-42FF-ABB5-B1E1027A3EAA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4CF92A15-423D-42FF-ABB5-B1E1027A3EAA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4CF92A15-423D-42FF-ABB5-B1E1027A3EAA}.Release|Any CPU.Build.0 = Release|Any CPU - {0FF47BD4-F19B-4C3E-A4A4-165B1F4A7291}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0FF47BD4-F19B-4C3E-A4A4-165B1F4A7291}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0FF47BD4-F19B-4C3E-A4A4-165B1F4A7291}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0FF47BD4-F19B-4C3E-A4A4-165B1F4A7291}.Release|Any CPU.Build.0 = Release|Any CPU - {F2DAF60B-7DF8-4FF5-A277-E283BF0FB81B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F2DAF60B-7DF8-4FF5-A277-E283BF0FB81B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F2DAF60B-7DF8-4FF5-A277-E283BF0FB81B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F2DAF60B-7DF8-4FF5-A277-E283BF0FB81B}.Release|Any CPU.Build.0 = Release|Any CPU - {E00E653A-807A-4D97-A4CE-5AC6FC164041}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E00E653A-807A-4D97-A4CE-5AC6FC164041}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E00E653A-807A-4D97-A4CE-5AC6FC164041}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E00E653A-807A-4D97-A4CE-5AC6FC164041}.Release|Any CPU.Build.0 = Release|Any CPU - {64C0F8DE-5BB6-452E-AF90-FE015CE20265}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {64C0F8DE-5BB6-452E-AF90-FE015CE20265}.Debug|Any CPU.Build.0 = Debug|Any CPU - {64C0F8DE-5BB6-452E-AF90-FE015CE20265}.Release|Any CPU.ActiveCfg = Release|Any CPU - {64C0F8DE-5BB6-452E-AF90-FE015CE20265}.Release|Any CPU.Build.0 = Release|Any CPU - {3EA4F110-040E-4E30-9E44-D7FA51C1F7E1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3EA4F110-040E-4E30-9E44-D7FA51C1F7E1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3EA4F110-040E-4E30-9E44-D7FA51C1F7E1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3EA4F110-040E-4E30-9E44-D7FA51C1F7E1}.Release|Any CPU.Build.0 = Release|Any CPU - {B1784A34-11C8-4DEB-931D-EEB618C4916C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B1784A34-11C8-4DEB-931D-EEB618C4916C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B1784A34-11C8-4DEB-931D-EEB618C4916C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B1784A34-11C8-4DEB-931D-EEB618C4916C}.Release|Any CPU.Build.0 = Release|Any CPU - {0837CBD8-D2DA-4CED-8552-2FF51CF92DCE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0837CBD8-D2DA-4CED-8552-2FF51CF92DCE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0837CBD8-D2DA-4CED-8552-2FF51CF92DCE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0837CBD8-D2DA-4CED-8552-2FF51CF92DCE}.Release|Any CPU.Build.0 = Release|Any CPU - {6E2B390B-0818-41A5-BC37-C850E23AB429}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6E2B390B-0818-41A5-BC37-C850E23AB429}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6E2B390B-0818-41A5-BC37-C850E23AB429}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6E2B390B-0818-41A5-BC37-C850E23AB429}.Release|Any CPU.Build.0 = Release|Any CPU - {BFD85E9C-1E04-4AF9-A7A7-586B6EAA03AE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BFD85E9C-1E04-4AF9-A7A7-586B6EAA03AE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BFD85E9C-1E04-4AF9-A7A7-586B6EAA03AE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BFD85E9C-1E04-4AF9-A7A7-586B6EAA03AE}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {4CF92A15-423D-42FF-ABB5-B1E1027A3EAA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4CF92A15-423D-42FF-ABB5-B1E1027A3EAA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4CF92A15-423D-42FF-ABB5-B1E1027A3EAA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4CF92A15-423D-42FF-ABB5-B1E1027A3EAA}.Release|Any CPU.Build.0 = Release|Any CPU - {0FF47BD4-F19B-4C3E-A4A4-165B1F4A7291}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0FF47BD4-F19B-4C3E-A4A4-165B1F4A7291}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0FF47BD4-F19B-4C3E-A4A4-165B1F4A7291}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0FF47BD4-F19B-4C3E-A4A4-165B1F4A7291}.Release|Any CPU.Build.0 = Release|Any CPU - {F2DAF60B-7DF8-4FF5-A277-E283BF0FB81B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F2DAF60B-7DF8-4FF5-A277-E283BF0FB81B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F2DAF60B-7DF8-4FF5-A277-E283BF0FB81B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F2DAF60B-7DF8-4FF5-A277-E283BF0FB81B}.Release|Any CPU.Build.0 = Release|Any CPU - {E00E653A-807A-4D97-A4CE-5AC6FC164041}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E00E653A-807A-4D97-A4CE-5AC6FC164041}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E00E653A-807A-4D97-A4CE-5AC6FC164041}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E00E653A-807A-4D97-A4CE-5AC6FC164041}.Release|Any CPU.Build.0 = Release|Any CPU - {64C0F8DE-5BB6-452E-AF90-FE015CE20265}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {64C0F8DE-5BB6-452E-AF90-FE015CE20265}.Debug|Any CPU.Build.0 = Debug|Any CPU - {64C0F8DE-5BB6-452E-AF90-FE015CE20265}.Release|Any CPU.ActiveCfg = Release|Any CPU - {64C0F8DE-5BB6-452E-AF90-FE015CE20265}.Release|Any CPU.Build.0 = Release|Any CPU - {3EA4F110-040E-4E30-9E44-D7FA51C1F7E1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3EA4F110-040E-4E30-9E44-D7FA51C1F7E1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3EA4F110-040E-4E30-9E44-D7FA51C1F7E1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3EA4F110-040E-4E30-9E44-D7FA51C1F7E1}.Release|Any CPU.Build.0 = Release|Any CPU - {B1784A34-11C8-4DEB-931D-EEB618C4916C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B1784A34-11C8-4DEB-931D-EEB618C4916C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B1784A34-11C8-4DEB-931D-EEB618C4916C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B1784A34-11C8-4DEB-931D-EEB618C4916C}.Release|Any CPU.Build.0 = Release|Any CPU - {0837CBD8-D2DA-4CED-8552-2FF51CF92DCE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0837CBD8-D2DA-4CED-8552-2FF51CF92DCE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0837CBD8-D2DA-4CED-8552-2FF51CF92DCE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0837CBD8-D2DA-4CED-8552-2FF51CF92DCE}.Release|Any CPU.Build.0 = Release|Any CPU - {6E2B390B-0818-41A5-BC37-C850E23AB429}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6E2B390B-0818-41A5-BC37-C850E23AB429}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6E2B390B-0818-41A5-BC37-C850E23AB429}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6E2B390B-0818-41A5-BC37-C850E23AB429}.Release|Any CPU.Build.0 = Release|Any CPU - {BFD85E9C-1E04-4AF9-A7A7-586B6EAA03AE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BFD85E9C-1E04-4AF9-A7A7-586B6EAA03AE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BFD85E9C-1E04-4AF9-A7A7-586B6EAA03AE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BFD85E9C-1E04-4AF9-A7A7-586B6EAA03AE}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {F22723B2-ABB4-4A13-BBF1-598E5C44B562} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {F223AC8E-13BC-45A6-A471-DB4146275ABC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {F47A8315-CEC1-4672-B84F-B672C5F7E70A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {9896FD1A-2B11-42E3-974C-C3756F889370} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {C32D7891-230C-4EE6-ABA7-99E499A3B111} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {4CF92A15-423D-42FF-ABB5-B1E1027A3EAA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0FF47BD4-F19B-4C3E-A4A4-165B1F4A7291} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F2DAF60B-7DF8-4FF5-A277-E283BF0FB81B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E00E653A-807A-4D97-A4CE-5AC6FC164041} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {64C0F8DE-5BB6-452E-AF90-FE015CE20265} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {3EA4F110-040E-4E30-9E44-D7FA51C1F7E1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B1784A34-11C8-4DEB-931D-EEB618C4916C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0837CBD8-D2DA-4CED-8552-2FF51CF92DCE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6E2B390B-0818-41A5-BC37-C850E23AB429} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {BFD85E9C-1E04-4AF9-A7A7-586B6EAA03AE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {4CF92A15-423D-42FF-ABB5-B1E1027A3EAA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0FF47BD4-F19B-4C3E-A4A4-165B1F4A7291} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F2DAF60B-7DF8-4FF5-A277-E283BF0FB81B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E00E653A-807A-4D97-A4CE-5AC6FC164041} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {64C0F8DE-5BB6-452E-AF90-FE015CE20265} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {3EA4F110-040E-4E30-9E44-D7FA51C1F7E1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B1784A34-11C8-4DEB-931D-EEB618C4916C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0837CBD8-D2DA-4CED-8552-2FF51CF92DCE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6E2B390B-0818-41A5-BC37-C850E23AB429} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {BFD85E9C-1E04-4AF9-A7A7-586B6EAA03AE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {50151119-598E-469F-8E70-6D55CCF30696} diff --git a/sdk/src/Services/PinpointSMSVoiceV2/Properties/AssemblyInfo.cs b/sdk/src/Services/PinpointSMSVoiceV2/Properties/AssemblyInfo.cs index 7b3f300e5338..62063c96ed11 100644 --- a/sdk/src/Services/PinpointSMSVoiceV2/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/PinpointSMSVoiceV2/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.3")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.404.0")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/Pipes/Generated/AmazonPipesConfig.cs b/sdk/src/Services/Pipes/Generated/AmazonPipesConfig.cs index 29fc45e41e6a..a59aba811b32 100644 --- a/sdk/src/Services/Pipes/Generated/AmazonPipesConfig.cs +++ b/sdk/src/Services/Pipes/Generated/AmazonPipesConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.Pipes public partial class AmazonPipesConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("Pipes", "4.0.0.0"); private static readonly AmazonPipesEndpointResolver EndpointResolver = new AmazonPipesEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("Pipes", "3.7.401.8"); -======= - InternalSDKUtils.BuildUserAgentString("Pipes", "3.7.402.17"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/Pipes/Pipes.sln b/sdk/src/Services/Pipes/Pipes.sln index 6aba3f07f2e8..de5629dfd738 100644 --- a/sdk/src/Services/Pipes/Pipes.sln +++ b/sdk/src/Services/Pipes/Pipes.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {63DBA422-CEA2-4163-AA55-54DFBDC53DC5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {63DBA422-CEA2-4163-AA55-54DFBDC53DC5}.Debug|Any CPU.Build.0 = Debug|Any CPU {63DBA422-CEA2-4163-AA55-54DFBDC53DC5}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {BB3043B8-DF8B-41A1-AC10-B1C6CAD587F3}.Debug|Any CPU.Build.0 = Debug|Any CPU {BB3043B8-DF8B-41A1-AC10-B1C6CAD587F3}.Release|Any CPU.ActiveCfg = Release|Any CPU {BB3043B8-DF8B-41A1-AC10-B1C6CAD587F3}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {D75D2E03-C8F1-41C4-86D9-B4B7B72B227D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D75D2E03-C8F1-41C4-86D9-B4B7B72B227D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D75D2E03-C8F1-41C4-86D9-B4B7B72B227D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D75D2E03-C8F1-41C4-86D9-B4B7B72B227D}.Release|Any CPU.Build.0 = Release|Any CPU - {5EA48BF7-B71F-42D0-9C23-D48E0A0A9773}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5EA48BF7-B71F-42D0-9C23-D48E0A0A9773}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5EA48BF7-B71F-42D0-9C23-D48E0A0A9773}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5EA48BF7-B71F-42D0-9C23-D48E0A0A9773}.Release|Any CPU.Build.0 = Release|Any CPU - {D2284D86-3FA6-4AB5-A7F8-126967CFC711}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D2284D86-3FA6-4AB5-A7F8-126967CFC711}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D2284D86-3FA6-4AB5-A7F8-126967CFC711}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D2284D86-3FA6-4AB5-A7F8-126967CFC711}.Release|Any CPU.Build.0 = Release|Any CPU - {394274AC-40D1-403E-9565-7F8641F3203A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {394274AC-40D1-403E-9565-7F8641F3203A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {394274AC-40D1-403E-9565-7F8641F3203A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {394274AC-40D1-403E-9565-7F8641F3203A}.Release|Any CPU.Build.0 = Release|Any CPU - {51319123-2492-468A-A28A-5C9F510C9B23}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {51319123-2492-468A-A28A-5C9F510C9B23}.Debug|Any CPU.Build.0 = Debug|Any CPU - {51319123-2492-468A-A28A-5C9F510C9B23}.Release|Any CPU.ActiveCfg = Release|Any CPU - {51319123-2492-468A-A28A-5C9F510C9B23}.Release|Any CPU.Build.0 = Release|Any CPU - {54E10830-25B6-44EE-A769-DED8DD727BE5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {54E10830-25B6-44EE-A769-DED8DD727BE5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {54E10830-25B6-44EE-A769-DED8DD727BE5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {54E10830-25B6-44EE-A769-DED8DD727BE5}.Release|Any CPU.Build.0 = Release|Any CPU - {E6042D1A-E15D-4BF2-9502-3EAC30034289}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E6042D1A-E15D-4BF2-9502-3EAC30034289}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E6042D1A-E15D-4BF2-9502-3EAC30034289}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E6042D1A-E15D-4BF2-9502-3EAC30034289}.Release|Any CPU.Build.0 = Release|Any CPU - {2CA164EE-C741-4D2E-B7F4-9F1B17A8BE5F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2CA164EE-C741-4D2E-B7F4-9F1B17A8BE5F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2CA164EE-C741-4D2E-B7F4-9F1B17A8BE5F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2CA164EE-C741-4D2E-B7F4-9F1B17A8BE5F}.Release|Any CPU.Build.0 = Release|Any CPU - {E3981F3F-AC20-46D0-8254-6203CEA12E5E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E3981F3F-AC20-46D0-8254-6203CEA12E5E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E3981F3F-AC20-46D0-8254-6203CEA12E5E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E3981F3F-AC20-46D0-8254-6203CEA12E5E}.Release|Any CPU.Build.0 = Release|Any CPU - {614A589B-F271-43A7-8831-E20812B8FA48}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {614A589B-F271-43A7-8831-E20812B8FA48}.Debug|Any CPU.Build.0 = Debug|Any CPU - {614A589B-F271-43A7-8831-E20812B8FA48}.Release|Any CPU.ActiveCfg = Release|Any CPU - {614A589B-F271-43A7-8831-E20812B8FA48}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {D75D2E03-C8F1-41C4-86D9-B4B7B72B227D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D75D2E03-C8F1-41C4-86D9-B4B7B72B227D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D75D2E03-C8F1-41C4-86D9-B4B7B72B227D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D75D2E03-C8F1-41C4-86D9-B4B7B72B227D}.Release|Any CPU.Build.0 = Release|Any CPU - {5EA48BF7-B71F-42D0-9C23-D48E0A0A9773}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5EA48BF7-B71F-42D0-9C23-D48E0A0A9773}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5EA48BF7-B71F-42D0-9C23-D48E0A0A9773}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5EA48BF7-B71F-42D0-9C23-D48E0A0A9773}.Release|Any CPU.Build.0 = Release|Any CPU - {D2284D86-3FA6-4AB5-A7F8-126967CFC711}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D2284D86-3FA6-4AB5-A7F8-126967CFC711}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D2284D86-3FA6-4AB5-A7F8-126967CFC711}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D2284D86-3FA6-4AB5-A7F8-126967CFC711}.Release|Any CPU.Build.0 = Release|Any CPU - {394274AC-40D1-403E-9565-7F8641F3203A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {394274AC-40D1-403E-9565-7F8641F3203A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {394274AC-40D1-403E-9565-7F8641F3203A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {394274AC-40D1-403E-9565-7F8641F3203A}.Release|Any CPU.Build.0 = Release|Any CPU - {51319123-2492-468A-A28A-5C9F510C9B23}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {51319123-2492-468A-A28A-5C9F510C9B23}.Debug|Any CPU.Build.0 = Debug|Any CPU - {51319123-2492-468A-A28A-5C9F510C9B23}.Release|Any CPU.ActiveCfg = Release|Any CPU - {51319123-2492-468A-A28A-5C9F510C9B23}.Release|Any CPU.Build.0 = Release|Any CPU - {54E10830-25B6-44EE-A769-DED8DD727BE5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {54E10830-25B6-44EE-A769-DED8DD727BE5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {54E10830-25B6-44EE-A769-DED8DD727BE5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {54E10830-25B6-44EE-A769-DED8DD727BE5}.Release|Any CPU.Build.0 = Release|Any CPU - {E6042D1A-E15D-4BF2-9502-3EAC30034289}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E6042D1A-E15D-4BF2-9502-3EAC30034289}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E6042D1A-E15D-4BF2-9502-3EAC30034289}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E6042D1A-E15D-4BF2-9502-3EAC30034289}.Release|Any CPU.Build.0 = Release|Any CPU - {2CA164EE-C741-4D2E-B7F4-9F1B17A8BE5F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2CA164EE-C741-4D2E-B7F4-9F1B17A8BE5F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2CA164EE-C741-4D2E-B7F4-9F1B17A8BE5F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2CA164EE-C741-4D2E-B7F4-9F1B17A8BE5F}.Release|Any CPU.Build.0 = Release|Any CPU - {E3981F3F-AC20-46D0-8254-6203CEA12E5E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E3981F3F-AC20-46D0-8254-6203CEA12E5E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E3981F3F-AC20-46D0-8254-6203CEA12E5E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E3981F3F-AC20-46D0-8254-6203CEA12E5E}.Release|Any CPU.Build.0 = Release|Any CPU - {614A589B-F271-43A7-8831-E20812B8FA48}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {614A589B-F271-43A7-8831-E20812B8FA48}.Debug|Any CPU.Build.0 = Debug|Any CPU - {614A589B-F271-43A7-8831-E20812B8FA48}.Release|Any CPU.ActiveCfg = Release|Any CPU - {614A589B-F271-43A7-8831-E20812B8FA48}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {63DBA422-CEA2-4163-AA55-54DFBDC53DC5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {88FC557E-9488-4803-8E06-F8EF4D1D947A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {74AE4F4E-CC15-4E93-9169-4096CBBBE51E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {F6767DA0-8D92-4F95-9956-74DE702F2385} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {BB3043B8-DF8B-41A1-AC10-B1C6CAD587F3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {D75D2E03-C8F1-41C4-86D9-B4B7B72B227D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {5EA48BF7-B71F-42D0-9C23-D48E0A0A9773} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D2284D86-3FA6-4AB5-A7F8-126967CFC711} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {394274AC-40D1-403E-9565-7F8641F3203A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {51319123-2492-468A-A28A-5C9F510C9B23} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {54E10830-25B6-44EE-A769-DED8DD727BE5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E6042D1A-E15D-4BF2-9502-3EAC30034289} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {2CA164EE-C741-4D2E-B7F4-9F1B17A8BE5F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E3981F3F-AC20-46D0-8254-6203CEA12E5E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {614A589B-F271-43A7-8831-E20812B8FA48} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {D75D2E03-C8F1-41C4-86D9-B4B7B72B227D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {5EA48BF7-B71F-42D0-9C23-D48E0A0A9773} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D2284D86-3FA6-4AB5-A7F8-126967CFC711} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {394274AC-40D1-403E-9565-7F8641F3203A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {51319123-2492-468A-A28A-5C9F510C9B23} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {54E10830-25B6-44EE-A769-DED8DD727BE5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E6042D1A-E15D-4BF2-9502-3EAC30034289} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {2CA164EE-C741-4D2E-B7F4-9F1B17A8BE5F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E3981F3F-AC20-46D0-8254-6203CEA12E5E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {614A589B-F271-43A7-8831-E20812B8FA48} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {C8ED6E6C-13C2-44E8-9DFE-53E4D205011A} diff --git a/sdk/src/Services/Pipes/Properties/AssemblyInfo.cs b/sdk/src/Services/Pipes/Properties/AssemblyInfo.cs index 72c3e0e01c5c..13538e01690e 100644 --- a/sdk/src/Services/Pipes/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/Pipes/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.8")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.402.17")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/Polly/Generated/AmazonPollyConfig.cs b/sdk/src/Services/Polly/Generated/AmazonPollyConfig.cs index d17e7ad0b41b..f3efd7e6ac5a 100644 --- a/sdk/src/Services/Polly/Generated/AmazonPollyConfig.cs +++ b/sdk/src/Services/Polly/Generated/AmazonPollyConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.Polly public partial class AmazonPollyConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("Polly", "4.0.0.0"); private static readonly AmazonPollyEndpointResolver EndpointResolver = new AmazonPollyEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("Polly", "3.7.401.15"); -======= - InternalSDKUtils.BuildUserAgentString("Polly", "3.7.401.42"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/Polly/Polly.sln b/sdk/src/Services/Polly/Polly.sln index 007e01fb826c..d5915cded5cd 100644 --- a/sdk/src/Services/Polly/Polly.sln +++ b/sdk/src/Services/Polly/Polly.sln @@ -92,7 +92,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {F41E5E20-E27C-4EF5-9457-1C2249845DF2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {F41E5E20-E27C-4EF5-9457-1C2249845DF2}.Debug|Any CPU.Build.0 = Debug|Any CPU {F41E5E20-E27C-4EF5-9457-1C2249845DF2}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -113,97 +120,6 @@ Global {9C94AF8F-A0FC-41ED-BF48-DE219F9407DD}.Debug|Any CPU.Build.0 = Debug|Any CPU {9C94AF8F-A0FC-41ED-BF48-DE219F9407DD}.Release|Any CPU.ActiveCfg = Release|Any CPU {9C94AF8F-A0FC-41ED-BF48-DE219F9407DD}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {ACAD75C4-AD70-4A9B-8FB4-AA8CCF02F08D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {ACAD75C4-AD70-4A9B-8FB4-AA8CCF02F08D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {ACAD75C4-AD70-4A9B-8FB4-AA8CCF02F08D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {ACAD75C4-AD70-4A9B-8FB4-AA8CCF02F08D}.Release|Any CPU.Build.0 = Release|Any CPU - {39831131-D0AD-4DF2-949A-10F38F752104}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {39831131-D0AD-4DF2-949A-10F38F752104}.Debug|Any CPU.Build.0 = Debug|Any CPU - {39831131-D0AD-4DF2-949A-10F38F752104}.Release|Any CPU.ActiveCfg = Release|Any CPU - {39831131-D0AD-4DF2-949A-10F38F752104}.Release|Any CPU.Build.0 = Release|Any CPU - {EEA6BBB7-1278-4022-9461-3FF2BD1A6B5B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EEA6BBB7-1278-4022-9461-3FF2BD1A6B5B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EEA6BBB7-1278-4022-9461-3FF2BD1A6B5B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EEA6BBB7-1278-4022-9461-3FF2BD1A6B5B}.Release|Any CPU.Build.0 = Release|Any CPU - {85D250BA-3CE4-4786-9A82-978842097380}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {85D250BA-3CE4-4786-9A82-978842097380}.Debug|Any CPU.Build.0 = Debug|Any CPU - {85D250BA-3CE4-4786-9A82-978842097380}.Release|Any CPU.ActiveCfg = Release|Any CPU - {85D250BA-3CE4-4786-9A82-978842097380}.Release|Any CPU.Build.0 = Release|Any CPU - {7B323157-9307-46BD-9ADF-FA2916FE9CF0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7B323157-9307-46BD-9ADF-FA2916FE9CF0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7B323157-9307-46BD-9ADF-FA2916FE9CF0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7B323157-9307-46BD-9ADF-FA2916FE9CF0}.Release|Any CPU.Build.0 = Release|Any CPU - {852B5484-FE98-4649-96E5-D5ACB2DFDFDC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {852B5484-FE98-4649-96E5-D5ACB2DFDFDC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {852B5484-FE98-4649-96E5-D5ACB2DFDFDC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {852B5484-FE98-4649-96E5-D5ACB2DFDFDC}.Release|Any CPU.Build.0 = Release|Any CPU - {4B1197DA-B30E-41F3-A52C-00CA90A067B4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4B1197DA-B30E-41F3-A52C-00CA90A067B4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4B1197DA-B30E-41F3-A52C-00CA90A067B4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4B1197DA-B30E-41F3-A52C-00CA90A067B4}.Release|Any CPU.Build.0 = Release|Any CPU - {51C9A502-FCC4-4C31-B8AE-753E7478B34E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {51C9A502-FCC4-4C31-B8AE-753E7478B34E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {51C9A502-FCC4-4C31-B8AE-753E7478B34E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {51C9A502-FCC4-4C31-B8AE-753E7478B34E}.Release|Any CPU.Build.0 = Release|Any CPU - {DE12E4A7-D2A0-432C-BA78-AC9333EA4A78}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DE12E4A7-D2A0-432C-BA78-AC9333EA4A78}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DE12E4A7-D2A0-432C-BA78-AC9333EA4A78}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DE12E4A7-D2A0-432C-BA78-AC9333EA4A78}.Release|Any CPU.Build.0 = Release|Any CPU - {D56BE8A9-CEF9-4066-829D-680833860602}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D56BE8A9-CEF9-4066-829D-680833860602}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D56BE8A9-CEF9-4066-829D-680833860602}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D56BE8A9-CEF9-4066-829D-680833860602}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {ACAD75C4-AD70-4A9B-8FB4-AA8CCF02F08D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {ACAD75C4-AD70-4A9B-8FB4-AA8CCF02F08D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {ACAD75C4-AD70-4A9B-8FB4-AA8CCF02F08D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {ACAD75C4-AD70-4A9B-8FB4-AA8CCF02F08D}.Release|Any CPU.Build.0 = Release|Any CPU - {39831131-D0AD-4DF2-949A-10F38F752104}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {39831131-D0AD-4DF2-949A-10F38F752104}.Debug|Any CPU.Build.0 = Debug|Any CPU - {39831131-D0AD-4DF2-949A-10F38F752104}.Release|Any CPU.ActiveCfg = Release|Any CPU - {39831131-D0AD-4DF2-949A-10F38F752104}.Release|Any CPU.Build.0 = Release|Any CPU - {EEA6BBB7-1278-4022-9461-3FF2BD1A6B5B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EEA6BBB7-1278-4022-9461-3FF2BD1A6B5B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EEA6BBB7-1278-4022-9461-3FF2BD1A6B5B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EEA6BBB7-1278-4022-9461-3FF2BD1A6B5B}.Release|Any CPU.Build.0 = Release|Any CPU - {85D250BA-3CE4-4786-9A82-978842097380}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {85D250BA-3CE4-4786-9A82-978842097380}.Debug|Any CPU.Build.0 = Debug|Any CPU - {85D250BA-3CE4-4786-9A82-978842097380}.Release|Any CPU.ActiveCfg = Release|Any CPU - {85D250BA-3CE4-4786-9A82-978842097380}.Release|Any CPU.Build.0 = Release|Any CPU - {7B323157-9307-46BD-9ADF-FA2916FE9CF0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7B323157-9307-46BD-9ADF-FA2916FE9CF0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7B323157-9307-46BD-9ADF-FA2916FE9CF0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7B323157-9307-46BD-9ADF-FA2916FE9CF0}.Release|Any CPU.Build.0 = Release|Any CPU - {852B5484-FE98-4649-96E5-D5ACB2DFDFDC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {852B5484-FE98-4649-96E5-D5ACB2DFDFDC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {852B5484-FE98-4649-96E5-D5ACB2DFDFDC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {852B5484-FE98-4649-96E5-D5ACB2DFDFDC}.Release|Any CPU.Build.0 = Release|Any CPU - {4B1197DA-B30E-41F3-A52C-00CA90A067B4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4B1197DA-B30E-41F3-A52C-00CA90A067B4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4B1197DA-B30E-41F3-A52C-00CA90A067B4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4B1197DA-B30E-41F3-A52C-00CA90A067B4}.Release|Any CPU.Build.0 = Release|Any CPU - {51C9A502-FCC4-4C31-B8AE-753E7478B34E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {51C9A502-FCC4-4C31-B8AE-753E7478B34E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {51C9A502-FCC4-4C31-B8AE-753E7478B34E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {51C9A502-FCC4-4C31-B8AE-753E7478B34E}.Release|Any CPU.Build.0 = Release|Any CPU - {DE12E4A7-D2A0-432C-BA78-AC9333EA4A78}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DE12E4A7-D2A0-432C-BA78-AC9333EA4A78}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DE12E4A7-D2A0-432C-BA78-AC9333EA4A78}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DE12E4A7-D2A0-432C-BA78-AC9333EA4A78}.Release|Any CPU.Build.0 = Release|Any CPU - {D56BE8A9-CEF9-4066-829D-680833860602}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D56BE8A9-CEF9-4066-829D-680833860602}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D56BE8A9-CEF9-4066-829D-680833860602}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D56BE8A9-CEF9-4066-829D-680833860602}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -220,37 +136,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {F41E5E20-E27C-4EF5-9457-1C2249845DF2} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {4AD188D6-3855-49B4-92FC-3ACE513968BF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {7FFA0DC9-0726-486D-BB12-8BDB223FB014} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {90F16660-C4EB-4477-9147-0EA4ECA5D586} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {9C94AF8F-A0FC-41ED-BF48-DE219F9407DD} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {ACAD75C4-AD70-4A9B-8FB4-AA8CCF02F08D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {39831131-D0AD-4DF2-949A-10F38F752104} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {EEA6BBB7-1278-4022-9461-3FF2BD1A6B5B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {85D250BA-3CE4-4786-9A82-978842097380} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {7B323157-9307-46BD-9ADF-FA2916FE9CF0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {852B5484-FE98-4649-96E5-D5ACB2DFDFDC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4B1197DA-B30E-41F3-A52C-00CA90A067B4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {51C9A502-FCC4-4C31-B8AE-753E7478B34E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {DE12E4A7-D2A0-432C-BA78-AC9333EA4A78} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D56BE8A9-CEF9-4066-829D-680833860602} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {ACAD75C4-AD70-4A9B-8FB4-AA8CCF02F08D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {39831131-D0AD-4DF2-949A-10F38F752104} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {EEA6BBB7-1278-4022-9461-3FF2BD1A6B5B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {85D250BA-3CE4-4786-9A82-978842097380} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {7B323157-9307-46BD-9ADF-FA2916FE9CF0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {852B5484-FE98-4649-96E5-D5ACB2DFDFDC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4B1197DA-B30E-41F3-A52C-00CA90A067B4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {51C9A502-FCC4-4C31-B8AE-753E7478B34E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {DE12E4A7-D2A0-432C-BA78-AC9333EA4A78} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D56BE8A9-CEF9-4066-829D-680833860602} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {A25BE4AB-83AF-48F1-A1A2-8824CBBA244F} diff --git a/sdk/src/Services/Polly/Properties/AssemblyInfo.cs b/sdk/src/Services/Polly/Properties/AssemblyInfo.cs index dcc2c096b55d..1d925f7dd5fb 100644 --- a/sdk/src/Services/Polly/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/Polly/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.15")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.42")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/Pricing/Generated/AmazonPricingConfig.cs b/sdk/src/Services/Pricing/Generated/AmazonPricingConfig.cs index cec77eb1529b..80dc015afb70 100644 --- a/sdk/src/Services/Pricing/Generated/AmazonPricingConfig.cs +++ b/sdk/src/Services/Pricing/Generated/AmazonPricingConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.Pricing public partial class AmazonPricingConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("Pricing", "4.0.0.0"); private static readonly AmazonPricingEndpointResolver EndpointResolver = new AmazonPricingEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("Pricing", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("Pricing", "3.7.400.54"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/Pricing/Generated/_bcl/AmazonPricingClient.cs b/sdk/src/Services/Pricing/Generated/_bcl/AmazonPricingClient.cs index d32e27cce745..1e4273ff2d9b 100644 --- a/sdk/src/Services/Pricing/Generated/_bcl/AmazonPricingClient.cs +++ b/sdk/src/Services/Pricing/Generated/_bcl/AmazonPricingClient.cs @@ -66,11 +66,11 @@ namespace Amazon.Pricing /// /// /// Use GetServices without a service code to retrieve the service codes for all - /// Amazon Web Services, then GetServices with a service code to retrieve the attribute - /// names for that service. After you have the service code and attribute names, you can - /// use GetAttributeValues to see what values are available for an attribute. With - /// the service code and an attribute name and value, you can use GetProducts to - /// find specific products that you're interested in, such as an AmazonEC2 instance, + /// Amazon Web Services services, then GetServices with a service code to retrieve + /// the attribute names for that service. After you have the service code and attribute + /// names, you can use GetAttributeValues to see what values are available for + /// an attribute. With the service code and an attribute name and value, you can use GetProducts + /// to find specific products that you're interested in, such as an AmazonEC2 instance, /// with a Provisioned IOPS volumeType. /// /// diff --git a/sdk/src/Services/Pricing/Pricing.sln b/sdk/src/Services/Pricing/Pricing.sln index 3201b463db62..234cf1429906 100644 --- a/sdk/src/Services/Pricing/Pricing.sln +++ b/sdk/src/Services/Pricing/Pricing.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {AF7B0558-C205-4DC7-A436-4D25B9397992}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {AF7B0558-C205-4DC7-A436-4D25B9397992}.Debug|Any CPU.Build.0 = Debug|Any CPU {AF7B0558-C205-4DC7-A436-4D25B9397992}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {7D9EE71A-4477-48FE-A813-9D1BC1238D27}.Debug|Any CPU.Build.0 = Debug|Any CPU {7D9EE71A-4477-48FE-A813-9D1BC1238D27}.Release|Any CPU.ActiveCfg = Release|Any CPU {7D9EE71A-4477-48FE-A813-9D1BC1238D27}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {F2C1727A-0D86-4415-87C5-53CF5A6024C2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F2C1727A-0D86-4415-87C5-53CF5A6024C2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F2C1727A-0D86-4415-87C5-53CF5A6024C2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F2C1727A-0D86-4415-87C5-53CF5A6024C2}.Release|Any CPU.Build.0 = Release|Any CPU - {03B6101E-7C28-4454-9BE6-AEA4E026F4B8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {03B6101E-7C28-4454-9BE6-AEA4E026F4B8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {03B6101E-7C28-4454-9BE6-AEA4E026F4B8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {03B6101E-7C28-4454-9BE6-AEA4E026F4B8}.Release|Any CPU.Build.0 = Release|Any CPU - {7AD20024-FA12-4AC1-9F1D-362555BC219A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7AD20024-FA12-4AC1-9F1D-362555BC219A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7AD20024-FA12-4AC1-9F1D-362555BC219A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7AD20024-FA12-4AC1-9F1D-362555BC219A}.Release|Any CPU.Build.0 = Release|Any CPU - {1DEFF8C0-6529-4EF9-B789-74FC034A0FFE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1DEFF8C0-6529-4EF9-B789-74FC034A0FFE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1DEFF8C0-6529-4EF9-B789-74FC034A0FFE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1DEFF8C0-6529-4EF9-B789-74FC034A0FFE}.Release|Any CPU.Build.0 = Release|Any CPU - {B51640C5-7653-4A75-A170-F232EB771966}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B51640C5-7653-4A75-A170-F232EB771966}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B51640C5-7653-4A75-A170-F232EB771966}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B51640C5-7653-4A75-A170-F232EB771966}.Release|Any CPU.Build.0 = Release|Any CPU - {67CF041B-CC0E-4BD4-99D6-7A77A5D6B256}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {67CF041B-CC0E-4BD4-99D6-7A77A5D6B256}.Debug|Any CPU.Build.0 = Debug|Any CPU - {67CF041B-CC0E-4BD4-99D6-7A77A5D6B256}.Release|Any CPU.ActiveCfg = Release|Any CPU - {67CF041B-CC0E-4BD4-99D6-7A77A5D6B256}.Release|Any CPU.Build.0 = Release|Any CPU - {6E3ABB14-75B3-4F47-9B7A-82591831416B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6E3ABB14-75B3-4F47-9B7A-82591831416B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6E3ABB14-75B3-4F47-9B7A-82591831416B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6E3ABB14-75B3-4F47-9B7A-82591831416B}.Release|Any CPU.Build.0 = Release|Any CPU - {4C0E1A67-F222-499B-9F70-E2FE12BDD12C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4C0E1A67-F222-499B-9F70-E2FE12BDD12C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4C0E1A67-F222-499B-9F70-E2FE12BDD12C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4C0E1A67-F222-499B-9F70-E2FE12BDD12C}.Release|Any CPU.Build.0 = Release|Any CPU - {04FF06E7-38BB-494E-8E1B-9C4704BF9BC6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {04FF06E7-38BB-494E-8E1B-9C4704BF9BC6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {04FF06E7-38BB-494E-8E1B-9C4704BF9BC6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {04FF06E7-38BB-494E-8E1B-9C4704BF9BC6}.Release|Any CPU.Build.0 = Release|Any CPU - {7E4896CA-0EE2-41EC-99BB-53D54C180AE5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7E4896CA-0EE2-41EC-99BB-53D54C180AE5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7E4896CA-0EE2-41EC-99BB-53D54C180AE5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7E4896CA-0EE2-41EC-99BB-53D54C180AE5}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {F2C1727A-0D86-4415-87C5-53CF5A6024C2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F2C1727A-0D86-4415-87C5-53CF5A6024C2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F2C1727A-0D86-4415-87C5-53CF5A6024C2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F2C1727A-0D86-4415-87C5-53CF5A6024C2}.Release|Any CPU.Build.0 = Release|Any CPU - {03B6101E-7C28-4454-9BE6-AEA4E026F4B8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {03B6101E-7C28-4454-9BE6-AEA4E026F4B8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {03B6101E-7C28-4454-9BE6-AEA4E026F4B8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {03B6101E-7C28-4454-9BE6-AEA4E026F4B8}.Release|Any CPU.Build.0 = Release|Any CPU - {7AD20024-FA12-4AC1-9F1D-362555BC219A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7AD20024-FA12-4AC1-9F1D-362555BC219A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7AD20024-FA12-4AC1-9F1D-362555BC219A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7AD20024-FA12-4AC1-9F1D-362555BC219A}.Release|Any CPU.Build.0 = Release|Any CPU - {1DEFF8C0-6529-4EF9-B789-74FC034A0FFE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1DEFF8C0-6529-4EF9-B789-74FC034A0FFE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1DEFF8C0-6529-4EF9-B789-74FC034A0FFE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1DEFF8C0-6529-4EF9-B789-74FC034A0FFE}.Release|Any CPU.Build.0 = Release|Any CPU - {B51640C5-7653-4A75-A170-F232EB771966}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B51640C5-7653-4A75-A170-F232EB771966}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B51640C5-7653-4A75-A170-F232EB771966}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B51640C5-7653-4A75-A170-F232EB771966}.Release|Any CPU.Build.0 = Release|Any CPU - {67CF041B-CC0E-4BD4-99D6-7A77A5D6B256}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {67CF041B-CC0E-4BD4-99D6-7A77A5D6B256}.Debug|Any CPU.Build.0 = Debug|Any CPU - {67CF041B-CC0E-4BD4-99D6-7A77A5D6B256}.Release|Any CPU.ActiveCfg = Release|Any CPU - {67CF041B-CC0E-4BD4-99D6-7A77A5D6B256}.Release|Any CPU.Build.0 = Release|Any CPU - {6E3ABB14-75B3-4F47-9B7A-82591831416B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6E3ABB14-75B3-4F47-9B7A-82591831416B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6E3ABB14-75B3-4F47-9B7A-82591831416B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6E3ABB14-75B3-4F47-9B7A-82591831416B}.Release|Any CPU.Build.0 = Release|Any CPU - {4C0E1A67-F222-499B-9F70-E2FE12BDD12C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4C0E1A67-F222-499B-9F70-E2FE12BDD12C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4C0E1A67-F222-499B-9F70-E2FE12BDD12C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4C0E1A67-F222-499B-9F70-E2FE12BDD12C}.Release|Any CPU.Build.0 = Release|Any CPU - {04FF06E7-38BB-494E-8E1B-9C4704BF9BC6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {04FF06E7-38BB-494E-8E1B-9C4704BF9BC6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {04FF06E7-38BB-494E-8E1B-9C4704BF9BC6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {04FF06E7-38BB-494E-8E1B-9C4704BF9BC6}.Release|Any CPU.Build.0 = Release|Any CPU - {7E4896CA-0EE2-41EC-99BB-53D54C180AE5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7E4896CA-0EE2-41EC-99BB-53D54C180AE5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7E4896CA-0EE2-41EC-99BB-53D54C180AE5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7E4896CA-0EE2-41EC-99BB-53D54C180AE5}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {AF7B0558-C205-4DC7-A436-4D25B9397992} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {902E6FDE-52BB-4F3C-B9D3-9D053279BD38} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {60094808-B296-41D8-80D0-A0F3EC8B7D3D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {6F5B7741-1C18-4C19-AFA7-E7FDE69F0F3F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {7D9EE71A-4477-48FE-A813-9D1BC1238D27} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {F2C1727A-0D86-4415-87C5-53CF5A6024C2} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {03B6101E-7C28-4454-9BE6-AEA4E026F4B8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {7AD20024-FA12-4AC1-9F1D-362555BC219A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {1DEFF8C0-6529-4EF9-B789-74FC034A0FFE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B51640C5-7653-4A75-A170-F232EB771966} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {67CF041B-CC0E-4BD4-99D6-7A77A5D6B256} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6E3ABB14-75B3-4F47-9B7A-82591831416B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4C0E1A67-F222-499B-9F70-E2FE12BDD12C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {04FF06E7-38BB-494E-8E1B-9C4704BF9BC6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {7E4896CA-0EE2-41EC-99BB-53D54C180AE5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {F2C1727A-0D86-4415-87C5-53CF5A6024C2} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {03B6101E-7C28-4454-9BE6-AEA4E026F4B8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {7AD20024-FA12-4AC1-9F1D-362555BC219A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {1DEFF8C0-6529-4EF9-B789-74FC034A0FFE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B51640C5-7653-4A75-A170-F232EB771966} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {67CF041B-CC0E-4BD4-99D6-7A77A5D6B256} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6E3ABB14-75B3-4F47-9B7A-82591831416B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4C0E1A67-F222-499B-9F70-E2FE12BDD12C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {04FF06E7-38BB-494E-8E1B-9C4704BF9BC6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {7E4896CA-0EE2-41EC-99BB-53D54C180AE5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {24705D27-DDF1-49ED-8DF9-78CDF41E240A} diff --git a/sdk/src/Services/Pricing/Properties/AssemblyInfo.cs b/sdk/src/Services/Pricing/Properties/AssemblyInfo.cs index e9af911a5c2e..b55e6cce115b 100644 --- a/sdk/src/Services/Pricing/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/Pricing/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.54")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/Private5G/Generated/AmazonPrivate5GConfig.cs b/sdk/src/Services/Private5G/Generated/AmazonPrivate5GConfig.cs index 6f60bf157aff..8a61b9577790 100644 --- a/sdk/src/Services/Private5G/Generated/AmazonPrivate5GConfig.cs +++ b/sdk/src/Services/Private5G/Generated/AmazonPrivate5GConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.Private5G public partial class AmazonPrivate5GConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("PrivateNetworks", "4.0.0.0"); private static readonly AmazonPrivate5GEndpointResolver EndpointResolver = new AmazonPrivate5GEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("PrivateNetworks", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("PrivateNetworks", "3.7.400.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/Private5G/Private5G.sln b/sdk/src/Services/Private5G/Private5G.sln index 7b0270d6aa1d..2061f28984e3 100644 --- a/sdk/src/Services/Private5G/Private5G.sln +++ b/sdk/src/Services/Private5G/Private5G.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {D3FBE43E-4CAD-4B44-BFF8-796137B3DA8D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {D3FBE43E-4CAD-4B44-BFF8-796137B3DA8D}.Debug|Any CPU.Build.0 = Debug|Any CPU {D3FBE43E-4CAD-4B44-BFF8-796137B3DA8D}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {084245A1-3CD2-4F8A-AD6A-CB85766D73B6}.Debug|Any CPU.Build.0 = Debug|Any CPU {084245A1-3CD2-4F8A-AD6A-CB85766D73B6}.Release|Any CPU.ActiveCfg = Release|Any CPU {084245A1-3CD2-4F8A-AD6A-CB85766D73B6}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {21492D16-6997-4251-9FF0-B5DB267574E2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {21492D16-6997-4251-9FF0-B5DB267574E2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {21492D16-6997-4251-9FF0-B5DB267574E2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {21492D16-6997-4251-9FF0-B5DB267574E2}.Release|Any CPU.Build.0 = Release|Any CPU - {9F94E475-BBBA-4D22-A621-5E1C513A14A6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9F94E475-BBBA-4D22-A621-5E1C513A14A6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9F94E475-BBBA-4D22-A621-5E1C513A14A6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9F94E475-BBBA-4D22-A621-5E1C513A14A6}.Release|Any CPU.Build.0 = Release|Any CPU - {AABB8BEC-26A8-4AA5-BCED-76FF51C1DD6A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AABB8BEC-26A8-4AA5-BCED-76FF51C1DD6A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AABB8BEC-26A8-4AA5-BCED-76FF51C1DD6A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AABB8BEC-26A8-4AA5-BCED-76FF51C1DD6A}.Release|Any CPU.Build.0 = Release|Any CPU - {68DA37C4-2BF2-453D-8515-B0C5EE913FB7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {68DA37C4-2BF2-453D-8515-B0C5EE913FB7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {68DA37C4-2BF2-453D-8515-B0C5EE913FB7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {68DA37C4-2BF2-453D-8515-B0C5EE913FB7}.Release|Any CPU.Build.0 = Release|Any CPU - {6A598C7B-F1DA-42C2-9E1B-270B16E94045}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6A598C7B-F1DA-42C2-9E1B-270B16E94045}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6A598C7B-F1DA-42C2-9E1B-270B16E94045}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6A598C7B-F1DA-42C2-9E1B-270B16E94045}.Release|Any CPU.Build.0 = Release|Any CPU - {7F6D2AB7-F705-48FC-AC48-343A6366D873}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7F6D2AB7-F705-48FC-AC48-343A6366D873}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7F6D2AB7-F705-48FC-AC48-343A6366D873}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7F6D2AB7-F705-48FC-AC48-343A6366D873}.Release|Any CPU.Build.0 = Release|Any CPU - {C08F1898-2C7C-4AB9-A77B-E79999ED660B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C08F1898-2C7C-4AB9-A77B-E79999ED660B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C08F1898-2C7C-4AB9-A77B-E79999ED660B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C08F1898-2C7C-4AB9-A77B-E79999ED660B}.Release|Any CPU.Build.0 = Release|Any CPU - {82761381-9E57-4BA3-A28C-1AD4EE86A190}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {82761381-9E57-4BA3-A28C-1AD4EE86A190}.Debug|Any CPU.Build.0 = Debug|Any CPU - {82761381-9E57-4BA3-A28C-1AD4EE86A190}.Release|Any CPU.ActiveCfg = Release|Any CPU - {82761381-9E57-4BA3-A28C-1AD4EE86A190}.Release|Any CPU.Build.0 = Release|Any CPU - {4C0F35F4-5333-439A-858B-5EA2D25708B9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4C0F35F4-5333-439A-858B-5EA2D25708B9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4C0F35F4-5333-439A-858B-5EA2D25708B9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4C0F35F4-5333-439A-858B-5EA2D25708B9}.Release|Any CPU.Build.0 = Release|Any CPU - {FA8C3F2F-F8D9-4711-AA22-D071BEB837F6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FA8C3F2F-F8D9-4711-AA22-D071BEB837F6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FA8C3F2F-F8D9-4711-AA22-D071BEB837F6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FA8C3F2F-F8D9-4711-AA22-D071BEB837F6}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {21492D16-6997-4251-9FF0-B5DB267574E2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {21492D16-6997-4251-9FF0-B5DB267574E2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {21492D16-6997-4251-9FF0-B5DB267574E2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {21492D16-6997-4251-9FF0-B5DB267574E2}.Release|Any CPU.Build.0 = Release|Any CPU - {9F94E475-BBBA-4D22-A621-5E1C513A14A6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9F94E475-BBBA-4D22-A621-5E1C513A14A6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9F94E475-BBBA-4D22-A621-5E1C513A14A6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9F94E475-BBBA-4D22-A621-5E1C513A14A6}.Release|Any CPU.Build.0 = Release|Any CPU - {AABB8BEC-26A8-4AA5-BCED-76FF51C1DD6A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AABB8BEC-26A8-4AA5-BCED-76FF51C1DD6A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AABB8BEC-26A8-4AA5-BCED-76FF51C1DD6A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AABB8BEC-26A8-4AA5-BCED-76FF51C1DD6A}.Release|Any CPU.Build.0 = Release|Any CPU - {68DA37C4-2BF2-453D-8515-B0C5EE913FB7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {68DA37C4-2BF2-453D-8515-B0C5EE913FB7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {68DA37C4-2BF2-453D-8515-B0C5EE913FB7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {68DA37C4-2BF2-453D-8515-B0C5EE913FB7}.Release|Any CPU.Build.0 = Release|Any CPU - {6A598C7B-F1DA-42C2-9E1B-270B16E94045}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6A598C7B-F1DA-42C2-9E1B-270B16E94045}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6A598C7B-F1DA-42C2-9E1B-270B16E94045}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6A598C7B-F1DA-42C2-9E1B-270B16E94045}.Release|Any CPU.Build.0 = Release|Any CPU - {7F6D2AB7-F705-48FC-AC48-343A6366D873}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7F6D2AB7-F705-48FC-AC48-343A6366D873}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7F6D2AB7-F705-48FC-AC48-343A6366D873}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7F6D2AB7-F705-48FC-AC48-343A6366D873}.Release|Any CPU.Build.0 = Release|Any CPU - {C08F1898-2C7C-4AB9-A77B-E79999ED660B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C08F1898-2C7C-4AB9-A77B-E79999ED660B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C08F1898-2C7C-4AB9-A77B-E79999ED660B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C08F1898-2C7C-4AB9-A77B-E79999ED660B}.Release|Any CPU.Build.0 = Release|Any CPU - {82761381-9E57-4BA3-A28C-1AD4EE86A190}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {82761381-9E57-4BA3-A28C-1AD4EE86A190}.Debug|Any CPU.Build.0 = Debug|Any CPU - {82761381-9E57-4BA3-A28C-1AD4EE86A190}.Release|Any CPU.ActiveCfg = Release|Any CPU - {82761381-9E57-4BA3-A28C-1AD4EE86A190}.Release|Any CPU.Build.0 = Release|Any CPU - {4C0F35F4-5333-439A-858B-5EA2D25708B9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4C0F35F4-5333-439A-858B-5EA2D25708B9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4C0F35F4-5333-439A-858B-5EA2D25708B9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4C0F35F4-5333-439A-858B-5EA2D25708B9}.Release|Any CPU.Build.0 = Release|Any CPU - {FA8C3F2F-F8D9-4711-AA22-D071BEB837F6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FA8C3F2F-F8D9-4711-AA22-D071BEB837F6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FA8C3F2F-F8D9-4711-AA22-D071BEB837F6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FA8C3F2F-F8D9-4711-AA22-D071BEB837F6}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {D3FBE43E-4CAD-4B44-BFF8-796137B3DA8D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {FCF22BA2-40F7-4165-9C25-0FB07CEF02A1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {1CD34C59-B335-4809-90E7-AF7F0A2D22E8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {5A381A04-E757-45D1-BE77-32D17D3ADF1B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {084245A1-3CD2-4F8A-AD6A-CB85766D73B6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {21492D16-6997-4251-9FF0-B5DB267574E2} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {9F94E475-BBBA-4D22-A621-5E1C513A14A6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {AABB8BEC-26A8-4AA5-BCED-76FF51C1DD6A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {68DA37C4-2BF2-453D-8515-B0C5EE913FB7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6A598C7B-F1DA-42C2-9E1B-270B16E94045} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {7F6D2AB7-F705-48FC-AC48-343A6366D873} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C08F1898-2C7C-4AB9-A77B-E79999ED660B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {82761381-9E57-4BA3-A28C-1AD4EE86A190} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4C0F35F4-5333-439A-858B-5EA2D25708B9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {FA8C3F2F-F8D9-4711-AA22-D071BEB837F6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {21492D16-6997-4251-9FF0-B5DB267574E2} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {9F94E475-BBBA-4D22-A621-5E1C513A14A6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {AABB8BEC-26A8-4AA5-BCED-76FF51C1DD6A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {68DA37C4-2BF2-453D-8515-B0C5EE913FB7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6A598C7B-F1DA-42C2-9E1B-270B16E94045} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {7F6D2AB7-F705-48FC-AC48-343A6366D873} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C08F1898-2C7C-4AB9-A77B-E79999ED660B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {82761381-9E57-4BA3-A28C-1AD4EE86A190} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4C0F35F4-5333-439A-858B-5EA2D25708B9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {FA8C3F2F-F8D9-4711-AA22-D071BEB837F6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {23642F8D-4AB5-4A6A-9043-B0D263D2C0F0} diff --git a/sdk/src/Services/Private5G/Properties/AssemblyInfo.cs b/sdk/src/Services/Private5G/Properties/AssemblyInfo.cs index 869e8cd1e2a2..a82bc4269a0f 100644 --- a/sdk/src/Services/Private5G/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/Private5G/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/PrometheusService/Generated/AmazonPrometheusServiceConfig.cs b/sdk/src/Services/PrometheusService/Generated/AmazonPrometheusServiceConfig.cs index ab400a09bd37..dc061de8a426 100644 --- a/sdk/src/Services/PrometheusService/Generated/AmazonPrometheusServiceConfig.cs +++ b/sdk/src/Services/PrometheusService/Generated/AmazonPrometheusServiceConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.PrometheusService public partial class AmazonPrometheusServiceConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("amp", "4.0.0.0"); private static readonly AmazonPrometheusServiceEndpointResolver EndpointResolver = new AmazonPrometheusServiceEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("amp", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("amp", "3.7.401.9"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/PrometheusService/Generated/Model/Internal/MarshallTransformations/UpdateScraperRequestMarshaller.cs b/sdk/src/Services/PrometheusService/Generated/Model/Internal/MarshallTransformations/UpdateScraperRequestMarshaller.cs index 268eaef687e1..e7537fd9aacc 100644 --- a/sdk/src/Services/PrometheusService/Generated/Model/Internal/MarshallTransformations/UpdateScraperRequestMarshaller.cs +++ b/sdk/src/Services/PrometheusService/Generated/Model/Internal/MarshallTransformations/UpdateScraperRequestMarshaller.cs @@ -64,54 +64,57 @@ public IRequest Marshall(UpdateScraperRequest publicRequest) throw new AmazonPrometheusServiceException("Request object does not have required field ScraperId set"); request.AddPathResource("{scraperId}", StringUtils.FromString(publicRequest.ScraperId)); request.ResourcePath = "/scrapers/{scraperId}"; - using (StringWriter stringWriter = new StringWriter(CultureInfo.InvariantCulture)) + using (MemoryStream memoryStream = new MemoryStream()) { - JsonWriter writer = new JsonWriter(stringWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetAlias()) + using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) { - context.Writer.WritePropertyName("alias"); - context.Writer.Write(publicRequest.Alias); + JsonWriter writer = new JsonWriter(streamWriter); + writer.Validate = false; + writer.WriteObjectStart(); + var context = new JsonMarshallerContext(request, writer); + if(publicRequest.IsSetAlias()) + { + context.Writer.WritePropertyName("alias"); + context.Writer.Write(publicRequest.Alias); + } + + if(publicRequest.IsSetClientToken()) + { + context.Writer.WritePropertyName("clientToken"); + context.Writer.Write(publicRequest.ClientToken); + } + + else if(!(publicRequest.IsSetClientToken())) + { + context.Writer.WritePropertyName("clientToken"); + context.Writer.Write(Guid.NewGuid().ToString()); + } + if(publicRequest.IsSetDestination()) + { + context.Writer.WritePropertyName("destination"); + context.Writer.WriteObjectStart(); + + var marshaller = DestinationMarshaller.Instance; + marshaller.Marshall(publicRequest.Destination, context); + + context.Writer.WriteObjectEnd(); + } + + if(publicRequest.IsSetScrapeConfiguration()) + { + context.Writer.WritePropertyName("scrapeConfiguration"); + context.Writer.WriteObjectStart(); + + var marshaller = ScrapeConfigurationMarshaller.Instance; + marshaller.Marshall(publicRequest.ScrapeConfiguration, context); + + context.Writer.WriteObjectEnd(); + } + + writer.WriteObjectEnd(); } - if(publicRequest.IsSetClientToken()) - { - context.Writer.WritePropertyName("clientToken"); - context.Writer.Write(publicRequest.ClientToken); - } - - else if(!(publicRequest.IsSetClientToken())) - { - context.Writer.WritePropertyName("clientToken"); - context.Writer.Write(Guid.NewGuid().ToString()); - } - if(publicRequest.IsSetDestination()) - { - context.Writer.WritePropertyName("destination"); - context.Writer.WriteObjectStart(); - - var marshaller = DestinationMarshaller.Instance; - marshaller.Marshall(publicRequest.Destination, context); - - context.Writer.WriteObjectEnd(); - } - - if(publicRequest.IsSetScrapeConfiguration()) - { - context.Writer.WritePropertyName("scrapeConfiguration"); - context.Writer.WriteObjectStart(); - - var marshaller = ScrapeConfigurationMarshaller.Instance; - marshaller.Marshall(publicRequest.ScrapeConfiguration, context); - - context.Writer.WriteObjectEnd(); - } - - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); + request.Content = memoryStream.ToArray(); } diff --git a/sdk/src/Services/PrometheusService/Generated/_bcl/AmazonPrometheusServiceClient.cs b/sdk/src/Services/PrometheusService/Generated/_bcl/AmazonPrometheusServiceClient.cs index 9bbc86a2062d..13e6e2e2998c 100644 --- a/sdk/src/Services/PrometheusService/Generated/_bcl/AmazonPrometheusServiceClient.cs +++ b/sdk/src/Services/PrometheusService/Generated/_bcl/AmazonPrometheusServiceClient.cs @@ -552,33 +552,28 @@ public virtual CreateRuleGroupsNamespaceResponse CreateRuleGroupsNamespace(Creat /// /// The CreateScraper operation creates a scraper to collect metrics. A scraper /// pulls metrics from Prometheus-compatible sources within an Amazon EKS cluster, and - /// sends them to your Amazon Managed Service for Prometheus workspace. You can configure - /// the scraper to control what metrics are collected, and what transformations are applied - /// prior to sending them to your workspace. + /// sends them to your Amazon Managed Service for Prometheus workspace. Scrapers are flexible, + /// and can be configured to control what metrics are collected, the frequency of collection, + /// what transformations are applied to the metrics, and more. /// /// /// - /// If needed, an IAM role will be created for you that gives Amazon Managed Service for - /// Prometheus access to the metrics in your cluster. For more information, see Using - /// roles for scraping metrics from EKS in the Amazon Managed Service for Prometheus - /// User Guide. + /// An IAM role will be created for you that Amazon Managed Service for Prometheus uses + /// to access the metrics in your cluster. You must configure this role with a policy + /// that allows it to scrape metrics from your cluster. For more information, see Configuring + /// your Amazon EKS cluster in the Amazon Managed Service for Prometheus User Guide. /// /// /// - /// You cannot update a scraper. If you want to change the configuration of the scraper, - /// create a new scraper and delete the old one. - /// - /// - /// - /// The scrapeConfiguration parameter contains the base64-encoded version of the - /// YAML configuration file. + /// The scrapeConfiguration parameter contains the base-64 encoded YAML configuration + /// for the scraper. /// /// /// /// For more information about collectors, including what metrics are collected, and how - /// to configure the scraper, see Amazon - /// Web Services managed collectors in the Amazon Managed Service for Prometheus - /// User Guide. + /// to configure the scraper, see Using + /// an Amazon Web Services managed collector in the Amazon Managed Service for + /// Prometheus User Guide. /// /// /// @@ -620,33 +615,28 @@ public virtual CreateScraperResponse CreateScraper(CreateScraperRequest request) /// /// The CreateScraper operation creates a scraper to collect metrics. A scraper /// pulls metrics from Prometheus-compatible sources within an Amazon EKS cluster, and - /// sends them to your Amazon Managed Service for Prometheus workspace. You can configure - /// the scraper to control what metrics are collected, and what transformations are applied - /// prior to sending them to your workspace. + /// sends them to your Amazon Managed Service for Prometheus workspace. Scrapers are flexible, + /// and can be configured to control what metrics are collected, the frequency of collection, + /// what transformations are applied to the metrics, and more. /// /// /// - /// If needed, an IAM role will be created for you that gives Amazon Managed Service for - /// Prometheus access to the metrics in your cluster. For more information, see Using - /// roles for scraping metrics from EKS in the Amazon Managed Service for Prometheus - /// User Guide. - /// - /// - /// - /// You cannot update a scraper. If you want to change the configuration of the scraper, - /// create a new scraper and delete the old one. + /// An IAM role will be created for you that Amazon Managed Service for Prometheus uses + /// to access the metrics in your cluster. You must configure this role with a policy + /// that allows it to scrape metrics from your cluster. For more information, see Configuring + /// your Amazon EKS cluster in the Amazon Managed Service for Prometheus User Guide. /// /// /// - /// The scrapeConfiguration parameter contains the base64-encoded version of the - /// YAML configuration file. + /// The scrapeConfiguration parameter contains the base-64 encoded YAML configuration + /// for the scraper. /// /// /// /// For more information about collectors, including what metrics are collected, and how - /// to configure the scraper, see Amazon - /// Web Services managed collectors in the Amazon Managed Service for Prometheus - /// User Guide. + /// to configure the scraper, see Using + /// an Amazon Web Services managed collector in the Amazon Managed Service for + /// Prometheus User Guide. /// /// /// @@ -1723,7 +1713,7 @@ public virtual ListScrapersResponse ListScrapers(ListScrapersRequest request) /// /// The ListTagsForResource operation returns the tags that are associated with /// an Amazon Managed Service for Prometheus resource. Currently, the only resources that - /// can be tagged are workspaces and rule groups namespaces. + /// can be tagged are scrapers, workspaces, and rule groups namespaces. /// /// Container for the necessary parameters to execute the ListTagsForResource service method. /// @@ -1757,7 +1747,7 @@ public virtual ListTagsForResourceResponse ListTagsForResource(ListTagsForResour /// /// The ListTagsForResource operation returns the tags that are associated with /// an Amazon Managed Service for Prometheus resource. Currently, the only resources that - /// can be tagged are workspaces and rule groups namespaces. + /// can be tagged are scrapers, workspaces, and rule groups namespaces. /// /// Container for the necessary parameters to execute the ListTagsForResource service method. /// @@ -2060,15 +2050,15 @@ public virtual PutRuleGroupsNamespaceResponse PutRuleGroupsNamespace(PutRuleGrou /// /// The TagResource operation associates tags with an Amazon Managed Service for - /// Prometheus resource. The only resources that can be tagged are workspaces and rule - /// groups namespaces. + /// Prometheus resource. The only resources that can be tagged are rule groups namespaces, + /// scrapers, and workspaces. /// /// /// /// If you specify a new tag key for the resource, this tag is appended to the list of /// tags associated with the resource. If you specify a tag key that is already associated /// with the resource, the new tag value that you specify replaces the previous value - /// for that tag. + /// for that tag. To remove a tag, use UntagResource. /// /// /// Container for the necessary parameters to execute the TagResource service method. @@ -2102,15 +2092,15 @@ public virtual TagResourceResponse TagResource(TagResourceRequest request) /// /// The TagResource operation associates tags with an Amazon Managed Service for - /// Prometheus resource. The only resources that can be tagged are workspaces and rule - /// groups namespaces. + /// Prometheus resource. The only resources that can be tagged are rule groups namespaces, + /// scrapers, and workspaces. /// /// /// /// If you specify a new tag key for the resource, this tag is appended to the list of /// tags associated with the resource. If you specify a tag key that is already associated /// with the resource, the new tag value that you specify replaces the previous value - /// for that tag. + /// for that tag. To remove a tag, use UntagResource. /// /// /// Container for the necessary parameters to execute the TagResource service method. @@ -2151,7 +2141,7 @@ public virtual TagResourceResponse TagResource(TagResourceRequest request) /// /// Removes the specified tags from an Amazon Managed Service for Prometheus resource. - /// The only resources that can be tagged are workspaces and rule groups namespaces. + /// The only resources that can be tagged are rule groups namespaces, scrapers, and workspaces. /// /// Container for the necessary parameters to execute the UntagResource service method. /// @@ -2184,7 +2174,7 @@ public virtual UntagResourceResponse UntagResource(UntagResourceRequest request) /// /// Removes the specified tags from an Amazon Managed Service for Prometheus resource. - /// The only resources that can be tagged are workspaces and rule groups namespaces. + /// The only resources that can be tagged are rule groups namespaces, scrapers, and workspaces. /// /// Container for the necessary parameters to execute the UntagResource service method. /// @@ -2290,6 +2280,101 @@ public virtual UpdateLoggingConfigurationResponse UpdateLoggingConfiguration(Upd #endregion + #region UpdateScraper + + + /// + /// Updates an existing scraper. + /// + /// + /// + /// You can't use this function to update the source from which the scraper is collecting + /// metrics. To change the source, delete the scraper and create a new one. + /// + /// + /// Container for the necessary parameters to execute the UpdateScraper service method. + /// + /// The response from the UpdateScraper service method, as returned by PrometheusService. + /// + /// You do not have sufficient access to perform this action. + /// + /// + /// The request would cause an inconsistent state. + /// + /// + /// An unexpected error occurred during the processing of the request. + /// + /// + /// The request references a resources that doesn't exist. + /// + /// + /// Completing the request would cause a service quota to be exceeded. + /// + /// + /// The request was denied due to request throttling. + /// + /// + /// The input fails to satisfy the constraints specified by an Amazon Web Services service. + /// + /// REST API Reference for UpdateScraper Operation + public virtual UpdateScraperResponse UpdateScraper(UpdateScraperRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = UpdateScraperRequestMarshaller.Instance; + options.ResponseUnmarshaller = UpdateScraperResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// Updates an existing scraper. + /// + /// + /// + /// You can't use this function to update the source from which the scraper is collecting + /// metrics. To change the source, delete the scraper and create a new one. + /// + /// + /// Container for the necessary parameters to execute the UpdateScraper service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the UpdateScraper service method, as returned by PrometheusService. + /// + /// You do not have sufficient access to perform this action. + /// + /// + /// The request would cause an inconsistent state. + /// + /// + /// An unexpected error occurred during the processing of the request. + /// + /// + /// The request references a resources that doesn't exist. + /// + /// + /// Completing the request would cause a service quota to be exceeded. + /// + /// + /// The request was denied due to request throttling. + /// + /// + /// The input fails to satisfy the constraints specified by an Amazon Web Services service. + /// + /// REST API Reference for UpdateScraper Operation + public virtual Task UpdateScraperAsync(UpdateScraperRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = UpdateScraperRequestMarshaller.Instance; + options.ResponseUnmarshaller = UpdateScraperResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + #region UpdateWorkspaceAlias diff --git a/sdk/src/Services/PrometheusService/PrometheusService.sln b/sdk/src/Services/PrometheusService/PrometheusService.sln index a804e4ba713f..2eb9a5919370 100644 --- a/sdk/src/Services/PrometheusService/PrometheusService.sln +++ b/sdk/src/Services/PrometheusService/PrometheusService.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {ED1C4DA3-F5CB-4D3A-8346-772E9B6ADE9A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {ED1C4DA3-F5CB-4D3A-8346-772E9B6ADE9A}.Debug|Any CPU.Build.0 = Debug|Any CPU {ED1C4DA3-F5CB-4D3A-8346-772E9B6ADE9A}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {930A85E6-8A99-4681-9D29-BBF6071A40D5}.Debug|Any CPU.Build.0 = Debug|Any CPU {930A85E6-8A99-4681-9D29-BBF6071A40D5}.Release|Any CPU.ActiveCfg = Release|Any CPU {930A85E6-8A99-4681-9D29-BBF6071A40D5}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {7DEB9D0A-3859-4868-9811-4BE6BEDBDBB1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7DEB9D0A-3859-4868-9811-4BE6BEDBDBB1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7DEB9D0A-3859-4868-9811-4BE6BEDBDBB1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7DEB9D0A-3859-4868-9811-4BE6BEDBDBB1}.Release|Any CPU.Build.0 = Release|Any CPU - {539E503F-F7B3-451A-B19B-04F2A6796A3E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {539E503F-F7B3-451A-B19B-04F2A6796A3E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {539E503F-F7B3-451A-B19B-04F2A6796A3E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {539E503F-F7B3-451A-B19B-04F2A6796A3E}.Release|Any CPU.Build.0 = Release|Any CPU - {270E899A-6D39-4272-8C99-698DA70E3457}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {270E899A-6D39-4272-8C99-698DA70E3457}.Debug|Any CPU.Build.0 = Debug|Any CPU - {270E899A-6D39-4272-8C99-698DA70E3457}.Release|Any CPU.ActiveCfg = Release|Any CPU - {270E899A-6D39-4272-8C99-698DA70E3457}.Release|Any CPU.Build.0 = Release|Any CPU - {FA633CB2-AB8B-44F4-AD20-AB0CD84A966E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FA633CB2-AB8B-44F4-AD20-AB0CD84A966E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FA633CB2-AB8B-44F4-AD20-AB0CD84A966E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FA633CB2-AB8B-44F4-AD20-AB0CD84A966E}.Release|Any CPU.Build.0 = Release|Any CPU - {F975E540-2495-4BBE-8F56-3DB0FF80A430}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F975E540-2495-4BBE-8F56-3DB0FF80A430}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F975E540-2495-4BBE-8F56-3DB0FF80A430}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F975E540-2495-4BBE-8F56-3DB0FF80A430}.Release|Any CPU.Build.0 = Release|Any CPU - {6C04C6AC-C411-4D5A-9016-1F170C978DE7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6C04C6AC-C411-4D5A-9016-1F170C978DE7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6C04C6AC-C411-4D5A-9016-1F170C978DE7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6C04C6AC-C411-4D5A-9016-1F170C978DE7}.Release|Any CPU.Build.0 = Release|Any CPU - {57C291ED-DC7F-490D-9A07-DDC2B91EC00F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {57C291ED-DC7F-490D-9A07-DDC2B91EC00F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {57C291ED-DC7F-490D-9A07-DDC2B91EC00F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {57C291ED-DC7F-490D-9A07-DDC2B91EC00F}.Release|Any CPU.Build.0 = Release|Any CPU - {1C18C857-B1EA-4952-856A-E84CB3AF7B55}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1C18C857-B1EA-4952-856A-E84CB3AF7B55}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1C18C857-B1EA-4952-856A-E84CB3AF7B55}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1C18C857-B1EA-4952-856A-E84CB3AF7B55}.Release|Any CPU.Build.0 = Release|Any CPU - {49C60FA9-9B94-490B-879F-6A9F96A309FA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {49C60FA9-9B94-490B-879F-6A9F96A309FA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {49C60FA9-9B94-490B-879F-6A9F96A309FA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {49C60FA9-9B94-490B-879F-6A9F96A309FA}.Release|Any CPU.Build.0 = Release|Any CPU - {E285A571-939E-4C33-89C5-0C37FC921BDE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E285A571-939E-4C33-89C5-0C37FC921BDE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E285A571-939E-4C33-89C5-0C37FC921BDE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E285A571-939E-4C33-89C5-0C37FC921BDE}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {7DEB9D0A-3859-4868-9811-4BE6BEDBDBB1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7DEB9D0A-3859-4868-9811-4BE6BEDBDBB1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7DEB9D0A-3859-4868-9811-4BE6BEDBDBB1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7DEB9D0A-3859-4868-9811-4BE6BEDBDBB1}.Release|Any CPU.Build.0 = Release|Any CPU - {539E503F-F7B3-451A-B19B-04F2A6796A3E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {539E503F-F7B3-451A-B19B-04F2A6796A3E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {539E503F-F7B3-451A-B19B-04F2A6796A3E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {539E503F-F7B3-451A-B19B-04F2A6796A3E}.Release|Any CPU.Build.0 = Release|Any CPU - {270E899A-6D39-4272-8C99-698DA70E3457}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {270E899A-6D39-4272-8C99-698DA70E3457}.Debug|Any CPU.Build.0 = Debug|Any CPU - {270E899A-6D39-4272-8C99-698DA70E3457}.Release|Any CPU.ActiveCfg = Release|Any CPU - {270E899A-6D39-4272-8C99-698DA70E3457}.Release|Any CPU.Build.0 = Release|Any CPU - {FA633CB2-AB8B-44F4-AD20-AB0CD84A966E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FA633CB2-AB8B-44F4-AD20-AB0CD84A966E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FA633CB2-AB8B-44F4-AD20-AB0CD84A966E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FA633CB2-AB8B-44F4-AD20-AB0CD84A966E}.Release|Any CPU.Build.0 = Release|Any CPU - {F975E540-2495-4BBE-8F56-3DB0FF80A430}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F975E540-2495-4BBE-8F56-3DB0FF80A430}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F975E540-2495-4BBE-8F56-3DB0FF80A430}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F975E540-2495-4BBE-8F56-3DB0FF80A430}.Release|Any CPU.Build.0 = Release|Any CPU - {6C04C6AC-C411-4D5A-9016-1F170C978DE7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6C04C6AC-C411-4D5A-9016-1F170C978DE7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6C04C6AC-C411-4D5A-9016-1F170C978DE7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6C04C6AC-C411-4D5A-9016-1F170C978DE7}.Release|Any CPU.Build.0 = Release|Any CPU - {57C291ED-DC7F-490D-9A07-DDC2B91EC00F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {57C291ED-DC7F-490D-9A07-DDC2B91EC00F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {57C291ED-DC7F-490D-9A07-DDC2B91EC00F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {57C291ED-DC7F-490D-9A07-DDC2B91EC00F}.Release|Any CPU.Build.0 = Release|Any CPU - {1C18C857-B1EA-4952-856A-E84CB3AF7B55}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1C18C857-B1EA-4952-856A-E84CB3AF7B55}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1C18C857-B1EA-4952-856A-E84CB3AF7B55}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1C18C857-B1EA-4952-856A-E84CB3AF7B55}.Release|Any CPU.Build.0 = Release|Any CPU - {49C60FA9-9B94-490B-879F-6A9F96A309FA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {49C60FA9-9B94-490B-879F-6A9F96A309FA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {49C60FA9-9B94-490B-879F-6A9F96A309FA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {49C60FA9-9B94-490B-879F-6A9F96A309FA}.Release|Any CPU.Build.0 = Release|Any CPU - {E285A571-939E-4C33-89C5-0C37FC921BDE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E285A571-939E-4C33-89C5-0C37FC921BDE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E285A571-939E-4C33-89C5-0C37FC921BDE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E285A571-939E-4C33-89C5-0C37FC921BDE}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {ED1C4DA3-F5CB-4D3A-8346-772E9B6ADE9A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {38428C25-6324-4B92-BAEB-E95CC439034D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {55D492A2-E184-4E53-A9A1-92004EAA17F7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {4A1AF84D-4352-407D-9273-C9E6324F42B6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {930A85E6-8A99-4681-9D29-BBF6071A40D5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {7DEB9D0A-3859-4868-9811-4BE6BEDBDBB1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {539E503F-F7B3-451A-B19B-04F2A6796A3E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {270E899A-6D39-4272-8C99-698DA70E3457} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {FA633CB2-AB8B-44F4-AD20-AB0CD84A966E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F975E540-2495-4BBE-8F56-3DB0FF80A430} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6C04C6AC-C411-4D5A-9016-1F170C978DE7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {57C291ED-DC7F-490D-9A07-DDC2B91EC00F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {1C18C857-B1EA-4952-856A-E84CB3AF7B55} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {49C60FA9-9B94-490B-879F-6A9F96A309FA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E285A571-939E-4C33-89C5-0C37FC921BDE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {7DEB9D0A-3859-4868-9811-4BE6BEDBDBB1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {539E503F-F7B3-451A-B19B-04F2A6796A3E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {270E899A-6D39-4272-8C99-698DA70E3457} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {FA633CB2-AB8B-44F4-AD20-AB0CD84A966E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F975E540-2495-4BBE-8F56-3DB0FF80A430} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6C04C6AC-C411-4D5A-9016-1F170C978DE7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {57C291ED-DC7F-490D-9A07-DDC2B91EC00F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {1C18C857-B1EA-4952-856A-E84CB3AF7B55} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {49C60FA9-9B94-490B-879F-6A9F96A309FA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E285A571-939E-4C33-89C5-0C37FC921BDE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {67E2ACAE-AFE9-46FA-8EDB-4AE8423C991D} diff --git a/sdk/src/Services/PrometheusService/Properties/AssemblyInfo.cs b/sdk/src/Services/PrometheusService/Properties/AssemblyInfo.cs index d1ba756be5d9..c745fbe36495 100644 --- a/sdk/src/Services/PrometheusService/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/PrometheusService/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.9")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/Proton/Generated/AmazonProtonConfig.cs b/sdk/src/Services/Proton/Generated/AmazonProtonConfig.cs index 1d3cd7eceb10..df1cea33cffd 100644 --- a/sdk/src/Services/Proton/Generated/AmazonProtonConfig.cs +++ b/sdk/src/Services/Proton/Generated/AmazonProtonConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.Proton public partial class AmazonProtonConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("Proton", "4.0.0.0"); private static readonly AmazonProtonEndpointResolver EndpointResolver = new AmazonProtonEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("Proton", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("Proton", "3.7.400.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/Proton/Properties/AssemblyInfo.cs b/sdk/src/Services/Proton/Properties/AssemblyInfo.cs index f47d9080c8f3..e75c9dace876 100644 --- a/sdk/src/Services/Proton/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/Proton/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/Proton/Proton.sln b/sdk/src/Services/Proton/Proton.sln index 4f43458dbf83..d669d1113af7 100644 --- a/sdk/src/Services/Proton/Proton.sln +++ b/sdk/src/Services/Proton/Proton.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {AF370826-DD39-4538-9CFA-53557CB1E008}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {AF370826-DD39-4538-9CFA-53557CB1E008}.Debug|Any CPU.Build.0 = Debug|Any CPU {AF370826-DD39-4538-9CFA-53557CB1E008}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {EC86311E-1C4C-4274-871E-6CF363FA3E87}.Debug|Any CPU.Build.0 = Debug|Any CPU {EC86311E-1C4C-4274-871E-6CF363FA3E87}.Release|Any CPU.ActiveCfg = Release|Any CPU {EC86311E-1C4C-4274-871E-6CF363FA3E87}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {1C2E6F8E-4E0F-4F74-B99A-871E56591987}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1C2E6F8E-4E0F-4F74-B99A-871E56591987}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1C2E6F8E-4E0F-4F74-B99A-871E56591987}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1C2E6F8E-4E0F-4F74-B99A-871E56591987}.Release|Any CPU.Build.0 = Release|Any CPU - {B9DF330C-CF54-4A64-9851-380FC8812126}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B9DF330C-CF54-4A64-9851-380FC8812126}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B9DF330C-CF54-4A64-9851-380FC8812126}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B9DF330C-CF54-4A64-9851-380FC8812126}.Release|Any CPU.Build.0 = Release|Any CPU - {EE4B100E-6CB5-41B3-BF15-CA8C972B675E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EE4B100E-6CB5-41B3-BF15-CA8C972B675E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EE4B100E-6CB5-41B3-BF15-CA8C972B675E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EE4B100E-6CB5-41B3-BF15-CA8C972B675E}.Release|Any CPU.Build.0 = Release|Any CPU - {BDDAC30F-F321-46D6-8A9D-264D1D172A92}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BDDAC30F-F321-46D6-8A9D-264D1D172A92}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BDDAC30F-F321-46D6-8A9D-264D1D172A92}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BDDAC30F-F321-46D6-8A9D-264D1D172A92}.Release|Any CPU.Build.0 = Release|Any CPU - {F2DA3E8E-2D99-4382-B576-958F8EFC5106}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F2DA3E8E-2D99-4382-B576-958F8EFC5106}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F2DA3E8E-2D99-4382-B576-958F8EFC5106}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F2DA3E8E-2D99-4382-B576-958F8EFC5106}.Release|Any CPU.Build.0 = Release|Any CPU - {6903120E-E3A2-419B-BAFE-89EF49044FFA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6903120E-E3A2-419B-BAFE-89EF49044FFA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6903120E-E3A2-419B-BAFE-89EF49044FFA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6903120E-E3A2-419B-BAFE-89EF49044FFA}.Release|Any CPU.Build.0 = Release|Any CPU - {3D2F6515-4AE0-4F0F-9F65-E4EFBD876C8B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3D2F6515-4AE0-4F0F-9F65-E4EFBD876C8B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3D2F6515-4AE0-4F0F-9F65-E4EFBD876C8B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3D2F6515-4AE0-4F0F-9F65-E4EFBD876C8B}.Release|Any CPU.Build.0 = Release|Any CPU - {A9AA4643-0017-4764-AAD4-A82E5115CE5D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A9AA4643-0017-4764-AAD4-A82E5115CE5D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A9AA4643-0017-4764-AAD4-A82E5115CE5D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A9AA4643-0017-4764-AAD4-A82E5115CE5D}.Release|Any CPU.Build.0 = Release|Any CPU - {40BB7887-9F8B-4353-AC13-482FB04A4867}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {40BB7887-9F8B-4353-AC13-482FB04A4867}.Debug|Any CPU.Build.0 = Debug|Any CPU - {40BB7887-9F8B-4353-AC13-482FB04A4867}.Release|Any CPU.ActiveCfg = Release|Any CPU - {40BB7887-9F8B-4353-AC13-482FB04A4867}.Release|Any CPU.Build.0 = Release|Any CPU - {0FF1DE18-5986-4A99-BF85-060756A2D0C1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0FF1DE18-5986-4A99-BF85-060756A2D0C1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0FF1DE18-5986-4A99-BF85-060756A2D0C1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0FF1DE18-5986-4A99-BF85-060756A2D0C1}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {1C2E6F8E-4E0F-4F74-B99A-871E56591987}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1C2E6F8E-4E0F-4F74-B99A-871E56591987}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1C2E6F8E-4E0F-4F74-B99A-871E56591987}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1C2E6F8E-4E0F-4F74-B99A-871E56591987}.Release|Any CPU.Build.0 = Release|Any CPU - {B9DF330C-CF54-4A64-9851-380FC8812126}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B9DF330C-CF54-4A64-9851-380FC8812126}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B9DF330C-CF54-4A64-9851-380FC8812126}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B9DF330C-CF54-4A64-9851-380FC8812126}.Release|Any CPU.Build.0 = Release|Any CPU - {EE4B100E-6CB5-41B3-BF15-CA8C972B675E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EE4B100E-6CB5-41B3-BF15-CA8C972B675E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EE4B100E-6CB5-41B3-BF15-CA8C972B675E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EE4B100E-6CB5-41B3-BF15-CA8C972B675E}.Release|Any CPU.Build.0 = Release|Any CPU - {BDDAC30F-F321-46D6-8A9D-264D1D172A92}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BDDAC30F-F321-46D6-8A9D-264D1D172A92}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BDDAC30F-F321-46D6-8A9D-264D1D172A92}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BDDAC30F-F321-46D6-8A9D-264D1D172A92}.Release|Any CPU.Build.0 = Release|Any CPU - {F2DA3E8E-2D99-4382-B576-958F8EFC5106}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F2DA3E8E-2D99-4382-B576-958F8EFC5106}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F2DA3E8E-2D99-4382-B576-958F8EFC5106}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F2DA3E8E-2D99-4382-B576-958F8EFC5106}.Release|Any CPU.Build.0 = Release|Any CPU - {6903120E-E3A2-419B-BAFE-89EF49044FFA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6903120E-E3A2-419B-BAFE-89EF49044FFA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6903120E-E3A2-419B-BAFE-89EF49044FFA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6903120E-E3A2-419B-BAFE-89EF49044FFA}.Release|Any CPU.Build.0 = Release|Any CPU - {3D2F6515-4AE0-4F0F-9F65-E4EFBD876C8B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3D2F6515-4AE0-4F0F-9F65-E4EFBD876C8B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3D2F6515-4AE0-4F0F-9F65-E4EFBD876C8B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3D2F6515-4AE0-4F0F-9F65-E4EFBD876C8B}.Release|Any CPU.Build.0 = Release|Any CPU - {A9AA4643-0017-4764-AAD4-A82E5115CE5D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A9AA4643-0017-4764-AAD4-A82E5115CE5D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A9AA4643-0017-4764-AAD4-A82E5115CE5D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A9AA4643-0017-4764-AAD4-A82E5115CE5D}.Release|Any CPU.Build.0 = Release|Any CPU - {40BB7887-9F8B-4353-AC13-482FB04A4867}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {40BB7887-9F8B-4353-AC13-482FB04A4867}.Debug|Any CPU.Build.0 = Debug|Any CPU - {40BB7887-9F8B-4353-AC13-482FB04A4867}.Release|Any CPU.ActiveCfg = Release|Any CPU - {40BB7887-9F8B-4353-AC13-482FB04A4867}.Release|Any CPU.Build.0 = Release|Any CPU - {0FF1DE18-5986-4A99-BF85-060756A2D0C1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0FF1DE18-5986-4A99-BF85-060756A2D0C1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0FF1DE18-5986-4A99-BF85-060756A2D0C1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0FF1DE18-5986-4A99-BF85-060756A2D0C1}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {AF370826-DD39-4538-9CFA-53557CB1E008} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {A9432287-9764-42D6-B94D-2F9D5377B595} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {DCF3E8C9-6DC9-4803-A514-0A105A8F3BA5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {5B76C257-78D0-4931-B5A1-2C6DB8165646} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {EC86311E-1C4C-4274-871E-6CF363FA3E87} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {1C2E6F8E-4E0F-4F74-B99A-871E56591987} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B9DF330C-CF54-4A64-9851-380FC8812126} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {EE4B100E-6CB5-41B3-BF15-CA8C972B675E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {BDDAC30F-F321-46D6-8A9D-264D1D172A92} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F2DA3E8E-2D99-4382-B576-958F8EFC5106} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6903120E-E3A2-419B-BAFE-89EF49044FFA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {3D2F6515-4AE0-4F0F-9F65-E4EFBD876C8B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A9AA4643-0017-4764-AAD4-A82E5115CE5D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {40BB7887-9F8B-4353-AC13-482FB04A4867} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0FF1DE18-5986-4A99-BF85-060756A2D0C1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {1C2E6F8E-4E0F-4F74-B99A-871E56591987} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B9DF330C-CF54-4A64-9851-380FC8812126} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {EE4B100E-6CB5-41B3-BF15-CA8C972B675E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {BDDAC30F-F321-46D6-8A9D-264D1D172A92} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F2DA3E8E-2D99-4382-B576-958F8EFC5106} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6903120E-E3A2-419B-BAFE-89EF49044FFA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {3D2F6515-4AE0-4F0F-9F65-E4EFBD876C8B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A9AA4643-0017-4764-AAD4-A82E5115CE5D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {40BB7887-9F8B-4353-AC13-482FB04A4867} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0FF1DE18-5986-4A99-BF85-060756A2D0C1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {54404DFF-F723-43E3-8C63-14539ECBADDC} diff --git a/sdk/src/Services/QApps/Generated/AmazonQAppsConfig.cs b/sdk/src/Services/QApps/Generated/AmazonQAppsConfig.cs index 7ae076c4a8b3..acf47c6a1866 100644 --- a/sdk/src/Services/QApps/Generated/AmazonQAppsConfig.cs +++ b/sdk/src/Services/QApps/Generated/AmazonQAppsConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.QApps public partial class AmazonQAppsConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("QApps", "4.0.0.0"); private static readonly AmazonQAppsEndpointResolver EndpointResolver = new AmazonQAppsEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("QApps", "3.7.401.10"); -======= - InternalSDKUtils.BuildUserAgentString("QApps", "3.7.402.8"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/QApps/Generated/Model/Category.cs b/sdk/src/Services/QApps/Generated/Model/Category.cs index b00e5b12a3b2..b0a71812412d 100644 --- a/sdk/src/Services/QApps/Generated/Model/Category.cs +++ b/sdk/src/Services/QApps/Generated/Model/Category.cs @@ -45,9 +45,9 @@ public partial class Category /// The number of published Amazon Q Apps associated with a category /// /// - public int AppCount + public int? AppCount { - get { return this._appCount.GetValueOrDefault(); } + get { return this._appCount; } set { this._appCount = value; } } diff --git a/sdk/src/Services/QApps/Generated/Model/Internal/MarshallTransformations/BatchCreateCategoryRequestMarshaller.cs b/sdk/src/Services/QApps/Generated/Model/Internal/MarshallTransformations/BatchCreateCategoryRequestMarshaller.cs index 53e8638ed22a..ce4b96f5be55 100644 --- a/sdk/src/Services/QApps/Generated/Model/Internal/MarshallTransformations/BatchCreateCategoryRequestMarshaller.cs +++ b/sdk/src/Services/QApps/Generated/Model/Internal/MarshallTransformations/BatchCreateCategoryRequestMarshaller.cs @@ -61,31 +61,34 @@ public IRequest Marshall(BatchCreateCategoryRequest publicRequest) request.HttpMethod = "POST"; request.ResourcePath = "/catalog.createCategories"; - using (StringWriter stringWriter = new StringWriter(CultureInfo.InvariantCulture)) + using (MemoryStream memoryStream = new MemoryStream()) { - JsonWriter writer = new JsonWriter(stringWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetCategories()) + using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) { - context.Writer.WritePropertyName("categories"); - context.Writer.WriteArrayStart(); - foreach(var publicRequestCategoriesListValue in publicRequest.Categories) + JsonWriter writer = new JsonWriter(streamWriter); + writer.Validate = false; + writer.WriteObjectStart(); + var context = new JsonMarshallerContext(request, writer); + if(publicRequest.IsSetCategories()) { - context.Writer.WriteObjectStart(); + context.Writer.WritePropertyName("categories"); + context.Writer.WriteArrayStart(); + foreach(var publicRequestCategoriesListValue in publicRequest.Categories) + { + context.Writer.WriteObjectStart(); - var marshaller = BatchCreateCategoryInputCategoryMarshaller.Instance; - marshaller.Marshall(publicRequestCategoriesListValue, context); + var marshaller = BatchCreateCategoryInputCategoryMarshaller.Instance; + marshaller.Marshall(publicRequestCategoriesListValue, context); - context.Writer.WriteObjectEnd(); + context.Writer.WriteObjectEnd(); + } + context.Writer.WriteArrayEnd(); } - context.Writer.WriteArrayEnd(); + + writer.WriteObjectEnd(); } - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); + request.Content = memoryStream.ToArray(); } diff --git a/sdk/src/Services/QApps/Generated/Model/Internal/MarshallTransformations/BatchDeleteCategoryRequestMarshaller.cs b/sdk/src/Services/QApps/Generated/Model/Internal/MarshallTransformations/BatchDeleteCategoryRequestMarshaller.cs index ce39a274ca8b..952cf1a3152d 100644 --- a/sdk/src/Services/QApps/Generated/Model/Internal/MarshallTransformations/BatchDeleteCategoryRequestMarshaller.cs +++ b/sdk/src/Services/QApps/Generated/Model/Internal/MarshallTransformations/BatchDeleteCategoryRequestMarshaller.cs @@ -61,26 +61,29 @@ public IRequest Marshall(BatchDeleteCategoryRequest publicRequest) request.HttpMethod = "POST"; request.ResourcePath = "/catalog.deleteCategories"; - using (StringWriter stringWriter = new StringWriter(CultureInfo.InvariantCulture)) + using (MemoryStream memoryStream = new MemoryStream()) { - JsonWriter writer = new JsonWriter(stringWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetCategories()) + using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) { - context.Writer.WritePropertyName("categories"); - context.Writer.WriteArrayStart(); - foreach(var publicRequestCategoriesListValue in publicRequest.Categories) + JsonWriter writer = new JsonWriter(streamWriter); + writer.Validate = false; + writer.WriteObjectStart(); + var context = new JsonMarshallerContext(request, writer); + if(publicRequest.IsSetCategories()) { - context.Writer.Write(publicRequestCategoriesListValue); + context.Writer.WritePropertyName("categories"); + context.Writer.WriteArrayStart(); + foreach(var publicRequestCategoriesListValue in publicRequest.Categories) + { + context.Writer.Write(publicRequestCategoriesListValue); + } + context.Writer.WriteArrayEnd(); } - context.Writer.WriteArrayEnd(); + + writer.WriteObjectEnd(); } - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); + request.Content = memoryStream.ToArray(); } diff --git a/sdk/src/Services/QApps/Generated/Model/Internal/MarshallTransformations/BatchUpdateCategoryRequestMarshaller.cs b/sdk/src/Services/QApps/Generated/Model/Internal/MarshallTransformations/BatchUpdateCategoryRequestMarshaller.cs index 7b4acbabd025..eea3f3c31022 100644 --- a/sdk/src/Services/QApps/Generated/Model/Internal/MarshallTransformations/BatchUpdateCategoryRequestMarshaller.cs +++ b/sdk/src/Services/QApps/Generated/Model/Internal/MarshallTransformations/BatchUpdateCategoryRequestMarshaller.cs @@ -61,31 +61,34 @@ public IRequest Marshall(BatchUpdateCategoryRequest publicRequest) request.HttpMethod = "POST"; request.ResourcePath = "/catalog.updateCategories"; - using (StringWriter stringWriter = new StringWriter(CultureInfo.InvariantCulture)) + using (MemoryStream memoryStream = new MemoryStream()) { - JsonWriter writer = new JsonWriter(stringWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetCategories()) + using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) { - context.Writer.WritePropertyName("categories"); - context.Writer.WriteArrayStart(); - foreach(var publicRequestCategoriesListValue in publicRequest.Categories) + JsonWriter writer = new JsonWriter(streamWriter); + writer.Validate = false; + writer.WriteObjectStart(); + var context = new JsonMarshallerContext(request, writer); + if(publicRequest.IsSetCategories()) { - context.Writer.WriteObjectStart(); + context.Writer.WritePropertyName("categories"); + context.Writer.WriteArrayStart(); + foreach(var publicRequestCategoriesListValue in publicRequest.Categories) + { + context.Writer.WriteObjectStart(); - var marshaller = CategoryInputMarshaller.Instance; - marshaller.Marshall(publicRequestCategoriesListValue, context); + var marshaller = CategoryInputMarshaller.Instance; + marshaller.Marshall(publicRequestCategoriesListValue, context); - context.Writer.WriteObjectEnd(); + context.Writer.WriteObjectEnd(); + } + context.Writer.WriteArrayEnd(); } - context.Writer.WriteArrayEnd(); + + writer.WriteObjectEnd(); } - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); + request.Content = memoryStream.ToArray(); } diff --git a/sdk/src/Services/QApps/Generated/Model/Internal/MarshallTransformations/CategoryUnmarshaller.cs b/sdk/src/Services/QApps/Generated/Model/Internal/MarshallTransformations/CategoryUnmarshaller.cs index f66ab402a987..d95b737bceb6 100644 --- a/sdk/src/Services/QApps/Generated/Model/Internal/MarshallTransformations/CategoryUnmarshaller.cs +++ b/sdk/src/Services/QApps/Generated/Model/Internal/MarshallTransformations/CategoryUnmarshaller.cs @@ -68,7 +68,7 @@ public Category Unmarshall(JsonUnmarshallerContext context) { if (context.TestExpression("appCount", targetDepth)) { - var unmarshaller = IntUnmarshaller.Instance; + var unmarshaller = NullableIntUnmarshaller.Instance; unmarshalledObject.AppCount = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/QApps/Generated/_bcl/AmazonQAppsClient.cs b/sdk/src/Services/QApps/Generated/_bcl/AmazonQAppsClient.cs index 1316bf2dc144..0c28427d6c0a 100644 --- a/sdk/src/Services/QApps/Generated/_bcl/AmazonQAppsClient.cs +++ b/sdk/src/Services/QApps/Generated/_bcl/AmazonQAppsClient.cs @@ -475,6 +475,285 @@ public virtual AssociateQAppWithUserResponse AssociateQAppWithUser(AssociateQApp #endregion + #region BatchCreateCategory + + + /// + /// Creates Categories for the Amazon Q Business application environment instance. Web + /// experience users use Categories to tag and filter library items. For more information, + /// see Custom + /// labels for Amazon Q Apps. + /// + /// Container for the necessary parameters to execute the BatchCreateCategory service method. + /// + /// The response from the BatchCreateCategory service method, as returned by QApps. + /// + /// The client is not authorized to perform the requested operation. + /// + /// + /// The requested operation could not be completed due to a conflict with the current + /// state of the resource. + /// + /// + /// An internal service error occurred while processing the request. + /// + /// + /// The requested resource could not be found. + /// + /// + /// The requested operation could not be completed because too many requests were sent + /// at once. Wait a bit and try again later. + /// + /// + /// The client is not authenticated or authorized to perform the requested operation. + /// + /// + /// The input failed to satisfy the constraints specified by the service. + /// + /// REST API Reference for BatchCreateCategory Operation + public virtual BatchCreateCategoryResponse BatchCreateCategory(BatchCreateCategoryRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = BatchCreateCategoryRequestMarshaller.Instance; + options.ResponseUnmarshaller = BatchCreateCategoryResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// Creates Categories for the Amazon Q Business application environment instance. Web + /// experience users use Categories to tag and filter library items. For more information, + /// see Custom + /// labels for Amazon Q Apps. + /// + /// Container for the necessary parameters to execute the BatchCreateCategory service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the BatchCreateCategory service method, as returned by QApps. + /// + /// The client is not authorized to perform the requested operation. + /// + /// + /// The requested operation could not be completed due to a conflict with the current + /// state of the resource. + /// + /// + /// An internal service error occurred while processing the request. + /// + /// + /// The requested resource could not be found. + /// + /// + /// The requested operation could not be completed because too many requests were sent + /// at once. Wait a bit and try again later. + /// + /// + /// The client is not authenticated or authorized to perform the requested operation. + /// + /// + /// The input failed to satisfy the constraints specified by the service. + /// + /// REST API Reference for BatchCreateCategory Operation + public virtual Task BatchCreateCategoryAsync(BatchCreateCategoryRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = BatchCreateCategoryRequestMarshaller.Instance; + options.ResponseUnmarshaller = BatchCreateCategoryResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + + #region BatchDeleteCategory + + + /// + /// Deletes Categories for the Amazon Q Business application environment instance. Web + /// experience users use Categories to tag and filter library items. For more information, + /// see Custom + /// labels for Amazon Q Apps. + /// + /// Container for the necessary parameters to execute the BatchDeleteCategory service method. + /// + /// The response from the BatchDeleteCategory service method, as returned by QApps. + /// + /// The client is not authorized to perform the requested operation. + /// + /// + /// The requested operation could not be completed due to a conflict with the current + /// state of the resource. + /// + /// + /// An internal service error occurred while processing the request. + /// + /// + /// The requested resource could not be found. + /// + /// + /// The requested operation could not be completed because too many requests were sent + /// at once. Wait a bit and try again later. + /// + /// + /// The client is not authenticated or authorized to perform the requested operation. + /// + /// + /// The input failed to satisfy the constraints specified by the service. + /// + /// REST API Reference for BatchDeleteCategory Operation + public virtual BatchDeleteCategoryResponse BatchDeleteCategory(BatchDeleteCategoryRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = BatchDeleteCategoryRequestMarshaller.Instance; + options.ResponseUnmarshaller = BatchDeleteCategoryResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// Deletes Categories for the Amazon Q Business application environment instance. Web + /// experience users use Categories to tag and filter library items. For more information, + /// see Custom + /// labels for Amazon Q Apps. + /// + /// Container for the necessary parameters to execute the BatchDeleteCategory service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the BatchDeleteCategory service method, as returned by QApps. + /// + /// The client is not authorized to perform the requested operation. + /// + /// + /// The requested operation could not be completed due to a conflict with the current + /// state of the resource. + /// + /// + /// An internal service error occurred while processing the request. + /// + /// + /// The requested resource could not be found. + /// + /// + /// The requested operation could not be completed because too many requests were sent + /// at once. Wait a bit and try again later. + /// + /// + /// The client is not authenticated or authorized to perform the requested operation. + /// + /// + /// The input failed to satisfy the constraints specified by the service. + /// + /// REST API Reference for BatchDeleteCategory Operation + public virtual Task BatchDeleteCategoryAsync(BatchDeleteCategoryRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = BatchDeleteCategoryRequestMarshaller.Instance; + options.ResponseUnmarshaller = BatchDeleteCategoryResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + + #region BatchUpdateCategory + + + /// + /// Updates Categories for the Amazon Q Business application environment instance. Web + /// experience users use Categories to tag and filter library items. For more information, + /// see Custom + /// labels for Amazon Q Apps. + /// + /// Container for the necessary parameters to execute the BatchUpdateCategory service method. + /// + /// The response from the BatchUpdateCategory service method, as returned by QApps. + /// + /// The client is not authorized to perform the requested operation. + /// + /// + /// The requested operation could not be completed due to a conflict with the current + /// state of the resource. + /// + /// + /// An internal service error occurred while processing the request. + /// + /// + /// The requested resource could not be found. + /// + /// + /// The requested operation could not be completed because too many requests were sent + /// at once. Wait a bit and try again later. + /// + /// + /// The client is not authenticated or authorized to perform the requested operation. + /// + /// + /// The input failed to satisfy the constraints specified by the service. + /// + /// REST API Reference for BatchUpdateCategory Operation + public virtual BatchUpdateCategoryResponse BatchUpdateCategory(BatchUpdateCategoryRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = BatchUpdateCategoryRequestMarshaller.Instance; + options.ResponseUnmarshaller = BatchUpdateCategoryResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// Updates Categories for the Amazon Q Business application environment instance. Web + /// experience users use Categories to tag and filter library items. For more information, + /// see Custom + /// labels for Amazon Q Apps. + /// + /// Container for the necessary parameters to execute the BatchUpdateCategory service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the BatchUpdateCategory service method, as returned by QApps. + /// + /// The client is not authorized to perform the requested operation. + /// + /// + /// The requested operation could not be completed due to a conflict with the current + /// state of the resource. + /// + /// + /// An internal service error occurred while processing the request. + /// + /// + /// The requested resource could not be found. + /// + /// + /// The requested operation could not be completed because too many requests were sent + /// at once. Wait a bit and try again later. + /// + /// + /// The client is not authenticated or authorized to perform the requested operation. + /// + /// + /// The input failed to satisfy the constraints specified by the service. + /// + /// REST API Reference for BatchUpdateCategory Operation + public virtual Task BatchUpdateCategoryAsync(BatchUpdateCategoryRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = BatchUpdateCategoryRequestMarshaller.Instance; + options.ResponseUnmarshaller = BatchUpdateCategoryResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + #region CreateLibraryItem @@ -1359,6 +1638,89 @@ public virtual ImportDocumentResponse ImportDocument(ImportDocumentRequest reque #endregion + #region ListCategories + + + /// + /// Lists the categories of a Amazon Q Business application environment instance. For + /// more information, see Custom + /// labels for Amazon Q Apps. + /// + /// Container for the necessary parameters to execute the ListCategories service method. + /// + /// The response from the ListCategories service method, as returned by QApps. + /// + /// The client is not authorized to perform the requested operation. + /// + /// + /// An internal service error occurred while processing the request. + /// + /// + /// The requested resource could not be found. + /// + /// + /// The requested operation could not be completed because too many requests were sent + /// at once. Wait a bit and try again later. + /// + /// + /// The client is not authenticated or authorized to perform the requested operation. + /// + /// + /// The input failed to satisfy the constraints specified by the service. + /// + /// REST API Reference for ListCategories Operation + public virtual ListCategoriesResponse ListCategories(ListCategoriesRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = ListCategoriesRequestMarshaller.Instance; + options.ResponseUnmarshaller = ListCategoriesResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// Lists the categories of a Amazon Q Business application environment instance. For + /// more information, see Custom + /// labels for Amazon Q Apps. + /// + /// Container for the necessary parameters to execute the ListCategories service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the ListCategories service method, as returned by QApps. + /// + /// The client is not authorized to perform the requested operation. + /// + /// + /// An internal service error occurred while processing the request. + /// + /// + /// The requested resource could not be found. + /// + /// + /// The requested operation could not be completed because too many requests were sent + /// at once. Wait a bit and try again later. + /// + /// + /// The client is not authenticated or authorized to perform the requested operation. + /// + /// + /// The input failed to satisfy the constraints specified by the service. + /// + /// REST API Reference for ListCategories Operation + public virtual Task ListCategoriesAsync(ListCategoriesRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = ListCategoriesRequestMarshaller.Instance; + options.ResponseUnmarshaller = ListCategoriesResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + #region ListLibraryItems diff --git a/sdk/src/Services/QApps/Properties/AssemblyInfo.cs b/sdk/src/Services/QApps/Properties/AssemblyInfo.cs index c948925e38e1..90e70a768255 100644 --- a/sdk/src/Services/QApps/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/QApps/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.10")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.402.8")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/QApps/QApps.sln b/sdk/src/Services/QApps/QApps.sln index ffc0c75cbb9f..0654fa25aea8 100644 --- a/sdk/src/Services/QApps/QApps.sln +++ b/sdk/src/Services/QApps/QApps.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {575562C8-4F2D-47AF-9474-48A96D2A019B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {575562C8-4F2D-47AF-9474-48A96D2A019B}.Debug|Any CPU.Build.0 = Debug|Any CPU {575562C8-4F2D-47AF-9474-48A96D2A019B}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {E9394FF3-07DD-4D5A-A211-BD2979FB22DE}.Debug|Any CPU.Build.0 = Debug|Any CPU {E9394FF3-07DD-4D5A-A211-BD2979FB22DE}.Release|Any CPU.ActiveCfg = Release|Any CPU {E9394FF3-07DD-4D5A-A211-BD2979FB22DE}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {7671B3E5-00C2-4C54-9915-16582B47BAC1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7671B3E5-00C2-4C54-9915-16582B47BAC1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7671B3E5-00C2-4C54-9915-16582B47BAC1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7671B3E5-00C2-4C54-9915-16582B47BAC1}.Release|Any CPU.Build.0 = Release|Any CPU - {D68A2DAB-438F-44C5-9817-D1246129C063}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D68A2DAB-438F-44C5-9817-D1246129C063}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D68A2DAB-438F-44C5-9817-D1246129C063}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D68A2DAB-438F-44C5-9817-D1246129C063}.Release|Any CPU.Build.0 = Release|Any CPU - {FD93BE5E-C916-4AC3-9B2E-F30F697C2593}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FD93BE5E-C916-4AC3-9B2E-F30F697C2593}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FD93BE5E-C916-4AC3-9B2E-F30F697C2593}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FD93BE5E-C916-4AC3-9B2E-F30F697C2593}.Release|Any CPU.Build.0 = Release|Any CPU - {F102DAF6-BFAF-4540-B2EC-8FC2085123AB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F102DAF6-BFAF-4540-B2EC-8FC2085123AB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F102DAF6-BFAF-4540-B2EC-8FC2085123AB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F102DAF6-BFAF-4540-B2EC-8FC2085123AB}.Release|Any CPU.Build.0 = Release|Any CPU - {A0FD5F4D-6AE6-4C25-BA75-3D625E0DEF5F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A0FD5F4D-6AE6-4C25-BA75-3D625E0DEF5F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A0FD5F4D-6AE6-4C25-BA75-3D625E0DEF5F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A0FD5F4D-6AE6-4C25-BA75-3D625E0DEF5F}.Release|Any CPU.Build.0 = Release|Any CPU - {1F406E0A-18E9-4935-8883-75EE9E8F65AA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1F406E0A-18E9-4935-8883-75EE9E8F65AA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1F406E0A-18E9-4935-8883-75EE9E8F65AA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1F406E0A-18E9-4935-8883-75EE9E8F65AA}.Release|Any CPU.Build.0 = Release|Any CPU - {C83669DD-78C8-4E78-B7E0-7C14A577B94F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C83669DD-78C8-4E78-B7E0-7C14A577B94F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C83669DD-78C8-4E78-B7E0-7C14A577B94F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C83669DD-78C8-4E78-B7E0-7C14A577B94F}.Release|Any CPU.Build.0 = Release|Any CPU - {47C2656B-A549-41F6-817A-20F8CBED542A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {47C2656B-A549-41F6-817A-20F8CBED542A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {47C2656B-A549-41F6-817A-20F8CBED542A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {47C2656B-A549-41F6-817A-20F8CBED542A}.Release|Any CPU.Build.0 = Release|Any CPU - {51DDD6D6-CDD6-43DA-96F6-E11A836BE644}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {51DDD6D6-CDD6-43DA-96F6-E11A836BE644}.Debug|Any CPU.Build.0 = Debug|Any CPU - {51DDD6D6-CDD6-43DA-96F6-E11A836BE644}.Release|Any CPU.ActiveCfg = Release|Any CPU - {51DDD6D6-CDD6-43DA-96F6-E11A836BE644}.Release|Any CPU.Build.0 = Release|Any CPU - {F4984EC6-A3FE-4E18-97FD-7EF10964FE1A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F4984EC6-A3FE-4E18-97FD-7EF10964FE1A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F4984EC6-A3FE-4E18-97FD-7EF10964FE1A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F4984EC6-A3FE-4E18-97FD-7EF10964FE1A}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {7671B3E5-00C2-4C54-9915-16582B47BAC1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7671B3E5-00C2-4C54-9915-16582B47BAC1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7671B3E5-00C2-4C54-9915-16582B47BAC1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7671B3E5-00C2-4C54-9915-16582B47BAC1}.Release|Any CPU.Build.0 = Release|Any CPU - {D68A2DAB-438F-44C5-9817-D1246129C063}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D68A2DAB-438F-44C5-9817-D1246129C063}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D68A2DAB-438F-44C5-9817-D1246129C063}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D68A2DAB-438F-44C5-9817-D1246129C063}.Release|Any CPU.Build.0 = Release|Any CPU - {FD93BE5E-C916-4AC3-9B2E-F30F697C2593}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FD93BE5E-C916-4AC3-9B2E-F30F697C2593}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FD93BE5E-C916-4AC3-9B2E-F30F697C2593}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FD93BE5E-C916-4AC3-9B2E-F30F697C2593}.Release|Any CPU.Build.0 = Release|Any CPU - {F102DAF6-BFAF-4540-B2EC-8FC2085123AB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F102DAF6-BFAF-4540-B2EC-8FC2085123AB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F102DAF6-BFAF-4540-B2EC-8FC2085123AB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F102DAF6-BFAF-4540-B2EC-8FC2085123AB}.Release|Any CPU.Build.0 = Release|Any CPU - {A0FD5F4D-6AE6-4C25-BA75-3D625E0DEF5F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A0FD5F4D-6AE6-4C25-BA75-3D625E0DEF5F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A0FD5F4D-6AE6-4C25-BA75-3D625E0DEF5F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A0FD5F4D-6AE6-4C25-BA75-3D625E0DEF5F}.Release|Any CPU.Build.0 = Release|Any CPU - {1F406E0A-18E9-4935-8883-75EE9E8F65AA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1F406E0A-18E9-4935-8883-75EE9E8F65AA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1F406E0A-18E9-4935-8883-75EE9E8F65AA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1F406E0A-18E9-4935-8883-75EE9E8F65AA}.Release|Any CPU.Build.0 = Release|Any CPU - {C83669DD-78C8-4E78-B7E0-7C14A577B94F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C83669DD-78C8-4E78-B7E0-7C14A577B94F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C83669DD-78C8-4E78-B7E0-7C14A577B94F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C83669DD-78C8-4E78-B7E0-7C14A577B94F}.Release|Any CPU.Build.0 = Release|Any CPU - {47C2656B-A549-41F6-817A-20F8CBED542A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {47C2656B-A549-41F6-817A-20F8CBED542A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {47C2656B-A549-41F6-817A-20F8CBED542A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {47C2656B-A549-41F6-817A-20F8CBED542A}.Release|Any CPU.Build.0 = Release|Any CPU - {51DDD6D6-CDD6-43DA-96F6-E11A836BE644}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {51DDD6D6-CDD6-43DA-96F6-E11A836BE644}.Debug|Any CPU.Build.0 = Debug|Any CPU - {51DDD6D6-CDD6-43DA-96F6-E11A836BE644}.Release|Any CPU.ActiveCfg = Release|Any CPU - {51DDD6D6-CDD6-43DA-96F6-E11A836BE644}.Release|Any CPU.Build.0 = Release|Any CPU - {F4984EC6-A3FE-4E18-97FD-7EF10964FE1A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F4984EC6-A3FE-4E18-97FD-7EF10964FE1A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F4984EC6-A3FE-4E18-97FD-7EF10964FE1A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F4984EC6-A3FE-4E18-97FD-7EF10964FE1A}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {575562C8-4F2D-47AF-9474-48A96D2A019B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {9CB3C693-7207-4560-8E11-EF1C9146440F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {9FB73BB6-3A32-4C27-A7A6-C3BB89D52360} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {377F2A7A-DB30-4084-9AED-F2C5C6666C65} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {E9394FF3-07DD-4D5A-A211-BD2979FB22DE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {7671B3E5-00C2-4C54-9915-16582B47BAC1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D68A2DAB-438F-44C5-9817-D1246129C063} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {FD93BE5E-C916-4AC3-9B2E-F30F697C2593} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F102DAF6-BFAF-4540-B2EC-8FC2085123AB} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A0FD5F4D-6AE6-4C25-BA75-3D625E0DEF5F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {1F406E0A-18E9-4935-8883-75EE9E8F65AA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C83669DD-78C8-4E78-B7E0-7C14A577B94F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {47C2656B-A549-41F6-817A-20F8CBED542A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {51DDD6D6-CDD6-43DA-96F6-E11A836BE644} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F4984EC6-A3FE-4E18-97FD-7EF10964FE1A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {7671B3E5-00C2-4C54-9915-16582B47BAC1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D68A2DAB-438F-44C5-9817-D1246129C063} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {FD93BE5E-C916-4AC3-9B2E-F30F697C2593} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F102DAF6-BFAF-4540-B2EC-8FC2085123AB} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A0FD5F4D-6AE6-4C25-BA75-3D625E0DEF5F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {1F406E0A-18E9-4935-8883-75EE9E8F65AA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C83669DD-78C8-4E78-B7E0-7C14A577B94F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {47C2656B-A549-41F6-817A-20F8CBED542A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {51DDD6D6-CDD6-43DA-96F6-E11A836BE644} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F4984EC6-A3FE-4E18-97FD-7EF10964FE1A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {398401A6-C9FB-441E-915B-2DD9C0A735B1} diff --git a/sdk/src/Services/QBusiness/Generated/AmazonQBusinessConfig.cs b/sdk/src/Services/QBusiness/Generated/AmazonQBusinessConfig.cs index 0d65c40def0b..a8be5ea08ed8 100644 --- a/sdk/src/Services/QBusiness/Generated/AmazonQBusinessConfig.cs +++ b/sdk/src/Services/QBusiness/Generated/AmazonQBusinessConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.QBusiness public partial class AmazonQBusinessConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("QBusiness", "4.0.0.0"); private static readonly AmazonQBusinessEndpointResolver EndpointResolver = new AmazonQBusinessEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("QBusiness", "3.7.401.15"); -======= - InternalSDKUtils.BuildUserAgentString("QBusiness", "3.7.404.6"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/QBusiness/Generated/Model/Internal/MarshallTransformations/CreateWebExperienceRequestMarshaller.cs b/sdk/src/Services/QBusiness/Generated/Model/Internal/MarshallTransformations/CreateWebExperienceRequestMarshaller.cs index cab7580501c8..5c53b13d2d9c 100644 --- a/sdk/src/Services/QBusiness/Generated/Model/Internal/MarshallTransformations/CreateWebExperienceRequestMarshaller.cs +++ b/sdk/src/Services/QBusiness/Generated/Model/Internal/MarshallTransformations/CreateWebExperienceRequestMarshaller.cs @@ -91,33 +91,19 @@ public IRequest Marshall(CreateWebExperienceRequest publicRequest) var marshaller = IdentityProviderConfigurationMarshaller.Instance; marshaller.Marshall(publicRequest.IdentityProviderConfiguration, context); -<<<<<<< HEAD context.Writer.WriteObjectEnd(); } -||||||| Commit version number update changes - if(publicRequest.IsSetRoleArn()) - { - context.Writer.WritePropertyName("roleArn"); - context.Writer.Write(publicRequest.RoleArn); - } -======= - if(publicRequest.IsSetOrigins()) - { - context.Writer.WritePropertyName("origins"); - context.Writer.WriteArrayStart(); - foreach(var publicRequestOriginsListValue in publicRequest.Origins) + + if(publicRequest.IsSetOrigins()) { - context.Writer.Write(publicRequestOriginsListValue); + context.Writer.WritePropertyName("origins"); + context.Writer.WriteArrayStart(); + foreach(var publicRequestOriginsListValue in publicRequest.Origins) + { + context.Writer.Write(publicRequestOriginsListValue); + } + context.Writer.WriteArrayEnd(); } - context.Writer.WriteArrayEnd(); - } - - if(publicRequest.IsSetRoleArn()) - { - context.Writer.WritePropertyName("roleArn"); - context.Writer.Write(publicRequest.RoleArn); - } ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b if(publicRequest.IsSetRoleArn()) { diff --git a/sdk/src/Services/QBusiness/Generated/Model/Internal/MarshallTransformations/PutGroupRequestMarshaller.cs b/sdk/src/Services/QBusiness/Generated/Model/Internal/MarshallTransformations/PutGroupRequestMarshaller.cs index 5fddd416b8d4..8424f54aff35 100644 --- a/sdk/src/Services/QBusiness/Generated/Model/Internal/MarshallTransformations/PutGroupRequestMarshaller.cs +++ b/sdk/src/Services/QBusiness/Generated/Model/Internal/MarshallTransformations/PutGroupRequestMarshaller.cs @@ -98,6 +98,12 @@ public IRequest Marshall(PutGroupRequest publicRequest) context.Writer.Write(publicRequest.GroupName); } + if(publicRequest.IsSetRoleArn()) + { + context.Writer.WritePropertyName("roleArn"); + context.Writer.Write(publicRequest.RoleArn); + } + if(publicRequest.IsSetType()) { context.Writer.WritePropertyName("type"); @@ -107,69 +113,7 @@ public IRequest Marshall(PutGroupRequest publicRequest) writer.WriteObjectEnd(); } -<<<<<<< HEAD request.Content = memoryStream.ToArray(); -||||||| Commit version number update changes - if(publicRequest.IsSetGroupMembers()) - { - context.Writer.WritePropertyName("groupMembers"); - context.Writer.WriteObjectStart(); - - var marshaller = GroupMembersMarshaller.Instance; - marshaller.Marshall(publicRequest.GroupMembers, context); - - context.Writer.WriteObjectEnd(); - } - - if(publicRequest.IsSetGroupName()) - { - context.Writer.WritePropertyName("groupName"); - context.Writer.Write(publicRequest.GroupName); - } - - if(publicRequest.IsSetType()) - { - context.Writer.WritePropertyName("type"); - context.Writer.Write(publicRequest.Type); - } - - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); -======= - if(publicRequest.IsSetGroupMembers()) - { - context.Writer.WritePropertyName("groupMembers"); - context.Writer.WriteObjectStart(); - - var marshaller = GroupMembersMarshaller.Instance; - marshaller.Marshall(publicRequest.GroupMembers, context); - - context.Writer.WriteObjectEnd(); - } - - if(publicRequest.IsSetGroupName()) - { - context.Writer.WritePropertyName("groupName"); - context.Writer.Write(publicRequest.GroupName); - } - - if(publicRequest.IsSetRoleArn()) - { - context.Writer.WritePropertyName("roleArn"); - context.Writer.Write(publicRequest.RoleArn); - } - - if(publicRequest.IsSetType()) - { - context.Writer.WritePropertyName("type"); - context.Writer.Write(publicRequest.Type); - } - - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b } diff --git a/sdk/src/Services/QBusiness/Generated/Model/Internal/MarshallTransformations/UpdateWebExperienceRequestMarshaller.cs b/sdk/src/Services/QBusiness/Generated/Model/Internal/MarshallTransformations/UpdateWebExperienceRequestMarshaller.cs index db456a08f8e4..a9b0763d35c7 100644 --- a/sdk/src/Services/QBusiness/Generated/Model/Internal/MarshallTransformations/UpdateWebExperienceRequestMarshaller.cs +++ b/sdk/src/Services/QBusiness/Generated/Model/Internal/MarshallTransformations/UpdateWebExperienceRequestMarshaller.cs @@ -71,7 +71,6 @@ public IRequest Marshall(UpdateWebExperienceRequest publicRequest) { using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) { -<<<<<<< HEAD JsonWriter writer = new JsonWriter(streamWriter); writer.Validate = false; writer.WriteObjectStart(); @@ -98,6 +97,17 @@ public IRequest Marshall(UpdateWebExperienceRequest publicRequest) context.Writer.WriteObjectEnd(); } + if(publicRequest.IsSetOrigins()) + { + context.Writer.WritePropertyName("origins"); + context.Writer.WriteArrayStart(); + foreach(var publicRequestOriginsListValue in publicRequest.Origins) + { + context.Writer.Write(publicRequestOriginsListValue); + } + context.Writer.WriteArrayEnd(); + } + if(publicRequest.IsSetRoleArn()) { context.Writer.WritePropertyName("roleArn"); @@ -129,116 +139,6 @@ public IRequest Marshall(UpdateWebExperienceRequest publicRequest) } writer.WriteObjectEnd(); -||||||| Commit version number update changes - context.Writer.WritePropertyName("authenticationConfiguration"); - context.Writer.WriteObjectStart(); - - var marshaller = WebExperienceAuthConfigurationMarshaller.Instance; - marshaller.Marshall(publicRequest.AuthenticationConfiguration, context); - - context.Writer.WriteObjectEnd(); - } - - if(publicRequest.IsSetIdentityProviderConfiguration()) - { - context.Writer.WritePropertyName("identityProviderConfiguration"); - context.Writer.WriteObjectStart(); - - var marshaller = IdentityProviderConfigurationMarshaller.Instance; - marshaller.Marshall(publicRequest.IdentityProviderConfiguration, context); - - context.Writer.WriteObjectEnd(); - } - - if(publicRequest.IsSetRoleArn()) - { - context.Writer.WritePropertyName("roleArn"); - context.Writer.Write(publicRequest.RoleArn); - } - - if(publicRequest.IsSetSamplePromptsControlMode()) - { - context.Writer.WritePropertyName("samplePromptsControlMode"); - context.Writer.Write(publicRequest.SamplePromptsControlMode); - } - - if(publicRequest.IsSetSubtitle()) - { - context.Writer.WritePropertyName("subtitle"); - context.Writer.Write(publicRequest.Subtitle); - } - - if(publicRequest.IsSetTitle()) - { - context.Writer.WritePropertyName("title"); - context.Writer.Write(publicRequest.Title); - } - - if(publicRequest.IsSetWelcomeMessage()) - { - context.Writer.WritePropertyName("welcomeMessage"); - context.Writer.Write(publicRequest.WelcomeMessage); -======= - context.Writer.WritePropertyName("authenticationConfiguration"); - context.Writer.WriteObjectStart(); - - var marshaller = WebExperienceAuthConfigurationMarshaller.Instance; - marshaller.Marshall(publicRequest.AuthenticationConfiguration, context); - - context.Writer.WriteObjectEnd(); - } - - if(publicRequest.IsSetIdentityProviderConfiguration()) - { - context.Writer.WritePropertyName("identityProviderConfiguration"); - context.Writer.WriteObjectStart(); - - var marshaller = IdentityProviderConfigurationMarshaller.Instance; - marshaller.Marshall(publicRequest.IdentityProviderConfiguration, context); - - context.Writer.WriteObjectEnd(); - } - - if(publicRequest.IsSetOrigins()) - { - context.Writer.WritePropertyName("origins"); - context.Writer.WriteArrayStart(); - foreach(var publicRequestOriginsListValue in publicRequest.Origins) - { - context.Writer.Write(publicRequestOriginsListValue); - } - context.Writer.WriteArrayEnd(); - } - - if(publicRequest.IsSetRoleArn()) - { - context.Writer.WritePropertyName("roleArn"); - context.Writer.Write(publicRequest.RoleArn); - } - - if(publicRequest.IsSetSamplePromptsControlMode()) - { - context.Writer.WritePropertyName("samplePromptsControlMode"); - context.Writer.Write(publicRequest.SamplePromptsControlMode); - } - - if(publicRequest.IsSetSubtitle()) - { - context.Writer.WritePropertyName("subtitle"); - context.Writer.Write(publicRequest.Subtitle); - } - - if(publicRequest.IsSetTitle()) - { - context.Writer.WritePropertyName("title"); - context.Writer.Write(publicRequest.Title); - } - - if(publicRequest.IsSetWelcomeMessage()) - { - context.Writer.WritePropertyName("welcomeMessage"); - context.Writer.Write(publicRequest.WelcomeMessage); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b } request.Content = memoryStream.ToArray(); diff --git a/sdk/src/Services/QBusiness/Generated/_bcl/AmazonQBusinessClient.cs b/sdk/src/Services/QBusiness/Generated/_bcl/AmazonQBusinessClient.cs index 7f84f13b578b..cba982b83d9e 100644 --- a/sdk/src/Services/QBusiness/Generated/_bcl/AmazonQBusinessClient.cs +++ b/sdk/src/Services/QBusiness/Generated/_bcl/AmazonQBusinessClient.cs @@ -658,7 +658,14 @@ public virtual ChatSyncResponse ChatSync(ChatSyncRequest request) /// are also available in Amazon Q Business Lite. For information on what's included in /// Amazon Q Business Lite and what's included in Amazon Q Business Pro, see Amazon /// Q Business tiers. You must use the Amazon Q Business console to assign subscription - /// tiers to users. + /// tiers to users. + /// + /// + /// + /// A Amazon Q Apps service linked role will be created if it's absent in the Amazon + /// Web Services account when the QAppsConfiguration is enabled in the request. For more + /// information, see + /// Using service-linked roles for Q Apps /// /// /// @@ -712,7 +719,14 @@ public virtual CreateApplicationResponse CreateApplication(CreateApplicationRequ /// are also available in Amazon Q Business Lite. For information on what's included in /// Amazon Q Business Lite and what's included in Amazon Q Business Pro, see Amazon /// Q Business tiers. You must use the Amazon Q Business console to assign subscription - /// tiers to users. + /// tiers to users. + /// + /// + /// + /// A Amazon Q Apps service linked role will be created if it's absent in the Amazon + /// Web Services account when the QAppsConfiguration is enabled in the request. For more + /// information, see + /// Using service-linked roles for Q Apps /// /// /// @@ -4569,6 +4583,15 @@ public virtual UntagResourceResponse UntagResource(UntagResourceRequest request) /// /// Updates an existing Amazon Q Business application. + /// + /// + /// + /// A Amazon Q Apps service-linked role will be created if it's absent in the Amazon + /// Web Services account when the QAppsConfiguration is enabled in the request. For more + /// information, see + /// Using service-linked roles for Q Apps + /// + /// /// /// Container for the necessary parameters to execute the UpdateApplication service method. /// @@ -4610,6 +4633,15 @@ public virtual UpdateApplicationResponse UpdateApplication(UpdateApplicationRequ /// /// Updates an existing Amazon Q Business application. + /// + /// + /// + /// A Amazon Q Apps service-linked role will be created if it's absent in the Amazon + /// Web Services account when the QAppsConfiguration is enabled in the request. For more + /// information, see + /// Using service-linked roles for Q Apps + /// + /// /// /// Container for the necessary parameters to execute the UpdateApplication service method. /// diff --git a/sdk/src/Services/QBusiness/Properties/AssemblyInfo.cs b/sdk/src/Services/QBusiness/Properties/AssemblyInfo.cs index 7bfdf61bba53..da683569576e 100644 --- a/sdk/src/Services/QBusiness/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/QBusiness/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.15")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.404.6")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/QBusiness/QBusiness.sln b/sdk/src/Services/QBusiness/QBusiness.sln index 09f74c7f707f..fb1f129ac0b0 100644 --- a/sdk/src/Services/QBusiness/QBusiness.sln +++ b/sdk/src/Services/QBusiness/QBusiness.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {D0E2FE83-C771-42AE-B73B-6E1B8969E351}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {D0E2FE83-C771-42AE-B73B-6E1B8969E351}.Debug|Any CPU.Build.0 = Debug|Any CPU {D0E2FE83-C771-42AE-B73B-6E1B8969E351}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {88C21B07-F25B-4043-BBB3-86A17F3AEAA3}.Debug|Any CPU.Build.0 = Debug|Any CPU {88C21B07-F25B-4043-BBB3-86A17F3AEAA3}.Release|Any CPU.ActiveCfg = Release|Any CPU {88C21B07-F25B-4043-BBB3-86A17F3AEAA3}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {DD7654AF-6CB1-44CB-93AF-A41C9C22831F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DD7654AF-6CB1-44CB-93AF-A41C9C22831F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DD7654AF-6CB1-44CB-93AF-A41C9C22831F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DD7654AF-6CB1-44CB-93AF-A41C9C22831F}.Release|Any CPU.Build.0 = Release|Any CPU - {93A1DA65-C3B2-4E7B-8D5E-0040685E1C20}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {93A1DA65-C3B2-4E7B-8D5E-0040685E1C20}.Debug|Any CPU.Build.0 = Debug|Any CPU - {93A1DA65-C3B2-4E7B-8D5E-0040685E1C20}.Release|Any CPU.ActiveCfg = Release|Any CPU - {93A1DA65-C3B2-4E7B-8D5E-0040685E1C20}.Release|Any CPU.Build.0 = Release|Any CPU - {F585CC5A-910D-4585-B94C-C39D314813EA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F585CC5A-910D-4585-B94C-C39D314813EA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F585CC5A-910D-4585-B94C-C39D314813EA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F585CC5A-910D-4585-B94C-C39D314813EA}.Release|Any CPU.Build.0 = Release|Any CPU - {3EE5A766-8020-42AD-8DA8-7D5DB76B9F31}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3EE5A766-8020-42AD-8DA8-7D5DB76B9F31}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3EE5A766-8020-42AD-8DA8-7D5DB76B9F31}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3EE5A766-8020-42AD-8DA8-7D5DB76B9F31}.Release|Any CPU.Build.0 = Release|Any CPU - {DD8B1A78-BCB1-4972-BF93-538DDE4F0CB1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DD8B1A78-BCB1-4972-BF93-538DDE4F0CB1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DD8B1A78-BCB1-4972-BF93-538DDE4F0CB1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DD8B1A78-BCB1-4972-BF93-538DDE4F0CB1}.Release|Any CPU.Build.0 = Release|Any CPU - {9B8A548D-F901-49EA-A832-A7F8565AAD58}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9B8A548D-F901-49EA-A832-A7F8565AAD58}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9B8A548D-F901-49EA-A832-A7F8565AAD58}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9B8A548D-F901-49EA-A832-A7F8565AAD58}.Release|Any CPU.Build.0 = Release|Any CPU - {7D012287-72CB-4D02-8A0F-55696A8B13D4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7D012287-72CB-4D02-8A0F-55696A8B13D4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7D012287-72CB-4D02-8A0F-55696A8B13D4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7D012287-72CB-4D02-8A0F-55696A8B13D4}.Release|Any CPU.Build.0 = Release|Any CPU - {46C073D2-FE80-4216-8A56-6DD64A722561}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {46C073D2-FE80-4216-8A56-6DD64A722561}.Debug|Any CPU.Build.0 = Debug|Any CPU - {46C073D2-FE80-4216-8A56-6DD64A722561}.Release|Any CPU.ActiveCfg = Release|Any CPU - {46C073D2-FE80-4216-8A56-6DD64A722561}.Release|Any CPU.Build.0 = Release|Any CPU - {DF4FCF92-73AB-4D3A-8BB8-FC3DCB75061A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DF4FCF92-73AB-4D3A-8BB8-FC3DCB75061A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DF4FCF92-73AB-4D3A-8BB8-FC3DCB75061A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DF4FCF92-73AB-4D3A-8BB8-FC3DCB75061A}.Release|Any CPU.Build.0 = Release|Any CPU - {94D946F5-B37C-4DCC-A002-C74E665FAD7E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {94D946F5-B37C-4DCC-A002-C74E665FAD7E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {94D946F5-B37C-4DCC-A002-C74E665FAD7E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {94D946F5-B37C-4DCC-A002-C74E665FAD7E}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {DD7654AF-6CB1-44CB-93AF-A41C9C22831F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DD7654AF-6CB1-44CB-93AF-A41C9C22831F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DD7654AF-6CB1-44CB-93AF-A41C9C22831F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DD7654AF-6CB1-44CB-93AF-A41C9C22831F}.Release|Any CPU.Build.0 = Release|Any CPU - {93A1DA65-C3B2-4E7B-8D5E-0040685E1C20}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {93A1DA65-C3B2-4E7B-8D5E-0040685E1C20}.Debug|Any CPU.Build.0 = Debug|Any CPU - {93A1DA65-C3B2-4E7B-8D5E-0040685E1C20}.Release|Any CPU.ActiveCfg = Release|Any CPU - {93A1DA65-C3B2-4E7B-8D5E-0040685E1C20}.Release|Any CPU.Build.0 = Release|Any CPU - {F585CC5A-910D-4585-B94C-C39D314813EA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F585CC5A-910D-4585-B94C-C39D314813EA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F585CC5A-910D-4585-B94C-C39D314813EA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F585CC5A-910D-4585-B94C-C39D314813EA}.Release|Any CPU.Build.0 = Release|Any CPU - {3EE5A766-8020-42AD-8DA8-7D5DB76B9F31}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3EE5A766-8020-42AD-8DA8-7D5DB76B9F31}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3EE5A766-8020-42AD-8DA8-7D5DB76B9F31}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3EE5A766-8020-42AD-8DA8-7D5DB76B9F31}.Release|Any CPU.Build.0 = Release|Any CPU - {DD8B1A78-BCB1-4972-BF93-538DDE4F0CB1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DD8B1A78-BCB1-4972-BF93-538DDE4F0CB1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DD8B1A78-BCB1-4972-BF93-538DDE4F0CB1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DD8B1A78-BCB1-4972-BF93-538DDE4F0CB1}.Release|Any CPU.Build.0 = Release|Any CPU - {9B8A548D-F901-49EA-A832-A7F8565AAD58}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9B8A548D-F901-49EA-A832-A7F8565AAD58}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9B8A548D-F901-49EA-A832-A7F8565AAD58}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9B8A548D-F901-49EA-A832-A7F8565AAD58}.Release|Any CPU.Build.0 = Release|Any CPU - {7D012287-72CB-4D02-8A0F-55696A8B13D4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7D012287-72CB-4D02-8A0F-55696A8B13D4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7D012287-72CB-4D02-8A0F-55696A8B13D4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7D012287-72CB-4D02-8A0F-55696A8B13D4}.Release|Any CPU.Build.0 = Release|Any CPU - {46C073D2-FE80-4216-8A56-6DD64A722561}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {46C073D2-FE80-4216-8A56-6DD64A722561}.Debug|Any CPU.Build.0 = Debug|Any CPU - {46C073D2-FE80-4216-8A56-6DD64A722561}.Release|Any CPU.ActiveCfg = Release|Any CPU - {46C073D2-FE80-4216-8A56-6DD64A722561}.Release|Any CPU.Build.0 = Release|Any CPU - {DF4FCF92-73AB-4D3A-8BB8-FC3DCB75061A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DF4FCF92-73AB-4D3A-8BB8-FC3DCB75061A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DF4FCF92-73AB-4D3A-8BB8-FC3DCB75061A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DF4FCF92-73AB-4D3A-8BB8-FC3DCB75061A}.Release|Any CPU.Build.0 = Release|Any CPU - {94D946F5-B37C-4DCC-A002-C74E665FAD7E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {94D946F5-B37C-4DCC-A002-C74E665FAD7E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {94D946F5-B37C-4DCC-A002-C74E665FAD7E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {94D946F5-B37C-4DCC-A002-C74E665FAD7E}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {D0E2FE83-C771-42AE-B73B-6E1B8969E351} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {E2A26F04-5BEE-4735-B7A8-9F543B44ED89} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {726C80EF-B986-475A-A895-51F785B29E44} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {D44A5D0B-4F09-42A9-9D92-DF337D3DBE91} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {88C21B07-F25B-4043-BBB3-86A17F3AEAA3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {DD7654AF-6CB1-44CB-93AF-A41C9C22831F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {93A1DA65-C3B2-4E7B-8D5E-0040685E1C20} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F585CC5A-910D-4585-B94C-C39D314813EA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {3EE5A766-8020-42AD-8DA8-7D5DB76B9F31} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {DD8B1A78-BCB1-4972-BF93-538DDE4F0CB1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {9B8A548D-F901-49EA-A832-A7F8565AAD58} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {7D012287-72CB-4D02-8A0F-55696A8B13D4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {46C073D2-FE80-4216-8A56-6DD64A722561} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {DF4FCF92-73AB-4D3A-8BB8-FC3DCB75061A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {94D946F5-B37C-4DCC-A002-C74E665FAD7E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {DD7654AF-6CB1-44CB-93AF-A41C9C22831F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {93A1DA65-C3B2-4E7B-8D5E-0040685E1C20} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F585CC5A-910D-4585-B94C-C39D314813EA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {3EE5A766-8020-42AD-8DA8-7D5DB76B9F31} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {DD8B1A78-BCB1-4972-BF93-538DDE4F0CB1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {9B8A548D-F901-49EA-A832-A7F8565AAD58} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {7D012287-72CB-4D02-8A0F-55696A8B13D4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {46C073D2-FE80-4216-8A56-6DD64A722561} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {DF4FCF92-73AB-4D3A-8BB8-FC3DCB75061A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {94D946F5-B37C-4DCC-A002-C74E665FAD7E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {74BC9424-61F3-4B56-97D8-91BF444C1F8C} diff --git a/sdk/src/Services/QConnect/Generated/AmazonQConnectConfig.cs b/sdk/src/Services/QConnect/Generated/AmazonQConnectConfig.cs index d4923c97c470..4af2a103c06a 100644 --- a/sdk/src/Services/QConnect/Generated/AmazonQConnectConfig.cs +++ b/sdk/src/Services/QConnect/Generated/AmazonQConnectConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.QConnect public partial class AmazonQConnectConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("QConnect", "4.0.0.0"); private static readonly AmazonQConnectEndpointResolver EndpointResolver = new AmazonQConnectEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("QConnect", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("QConnect", "3.7.401.22"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/QConnect/Generated/Model/AIAgentData.cs b/sdk/src/Services/QConnect/Generated/Model/AIAgentData.cs index 4cbba0023cd2..a7038d8667a2 100644 --- a/sdk/src/Services/QConnect/Generated/Model/AIAgentData.cs +++ b/sdk/src/Services/QConnect/Generated/Model/AIAgentData.cs @@ -169,9 +169,9 @@ internal bool IsSetDescription() /// The time the AI Agent was last modified. /// /// - public DateTime ModifiedTime + public DateTime? ModifiedTime { - get { return this._modifiedTime.GetValueOrDefault(); } + get { return this._modifiedTime; } set { this._modifiedTime = value; } } diff --git a/sdk/src/Services/QConnect/Generated/Model/AIAgentSummary.cs b/sdk/src/Services/QConnect/Generated/Model/AIAgentSummary.cs index c7df4976d1a4..10e8b95cdb2c 100644 --- a/sdk/src/Services/QConnect/Generated/Model/AIAgentSummary.cs +++ b/sdk/src/Services/QConnect/Generated/Model/AIAgentSummary.cs @@ -168,9 +168,9 @@ internal bool IsSetDescription() /// The time the AI Agent was last modified. /// /// - public DateTime ModifiedTime + public DateTime? ModifiedTime { - get { return this._modifiedTime.GetValueOrDefault(); } + get { return this._modifiedTime; } set { this._modifiedTime = value; } } diff --git a/sdk/src/Services/QConnect/Generated/Model/AIAgentVersionSummary.cs b/sdk/src/Services/QConnect/Generated/Model/AIAgentVersionSummary.cs index 0e87ab0968d5..5ad4ed15b820 100644 --- a/sdk/src/Services/QConnect/Generated/Model/AIAgentVersionSummary.cs +++ b/sdk/src/Services/QConnect/Generated/Model/AIAgentVersionSummary.cs @@ -62,9 +62,9 @@ internal bool IsSetAiAgentSummary() /// /// [AWSProperty(Min=1)] - public long VersionNumber + public long? VersionNumber { - get { return this._versionNumber.GetValueOrDefault(); } + get { return this._versionNumber; } set { this._versionNumber = value; } } diff --git a/sdk/src/Services/QConnect/Generated/Model/AIPromptData.cs b/sdk/src/Services/QConnect/Generated/Model/AIPromptData.cs index 2b5e9ac165cc..1c966bea48b7 100644 --- a/sdk/src/Services/QConnect/Generated/Model/AIPromptData.cs +++ b/sdk/src/Services/QConnect/Generated/Model/AIPromptData.cs @@ -191,9 +191,9 @@ internal bool IsSetModelId() /// The time the AI Prompt was last modified. /// /// - public DateTime ModifiedTime + public DateTime? ModifiedTime { - get { return this._modifiedTime.GetValueOrDefault(); } + get { return this._modifiedTime; } set { this._modifiedTime = value; } } diff --git a/sdk/src/Services/QConnect/Generated/Model/AIPromptSummary.cs b/sdk/src/Services/QConnect/Generated/Model/AIPromptSummary.cs index 7655ed91637c..755329f152e3 100644 --- a/sdk/src/Services/QConnect/Generated/Model/AIPromptSummary.cs +++ b/sdk/src/Services/QConnect/Generated/Model/AIPromptSummary.cs @@ -190,9 +190,9 @@ internal bool IsSetModelId() /// The time the AI Prompt was last modified. /// /// - public DateTime ModifiedTime + public DateTime? ModifiedTime { - get { return this._modifiedTime.GetValueOrDefault(); } + get { return this._modifiedTime; } set { this._modifiedTime = value; } } diff --git a/sdk/src/Services/QConnect/Generated/Model/AIPromptVersionSummary.cs b/sdk/src/Services/QConnect/Generated/Model/AIPromptVersionSummary.cs index b19fab44795f..a5ed37a327aa 100644 --- a/sdk/src/Services/QConnect/Generated/Model/AIPromptVersionSummary.cs +++ b/sdk/src/Services/QConnect/Generated/Model/AIPromptVersionSummary.cs @@ -62,9 +62,9 @@ internal bool IsSetAiPromptSummary() /// /// [AWSProperty(Min=1)] - public long VersionNumber + public long? VersionNumber { - get { return this._versionNumber.GetValueOrDefault(); } + get { return this._versionNumber; } set { this._versionNumber = value; } } diff --git a/sdk/src/Services/QConnect/Generated/Model/CitationSpan.cs b/sdk/src/Services/QConnect/Generated/Model/CitationSpan.cs index b4b8c385c8c9..4c3ba2c76d87 100644 --- a/sdk/src/Services/QConnect/Generated/Model/CitationSpan.cs +++ b/sdk/src/Services/QConnect/Generated/Model/CitationSpan.cs @@ -44,9 +44,9 @@ public partial class CitationSpan /// Where the text with a citation starts in the generated output. ///     ///     - public int BeginOffsetInclusive + public int? BeginOffsetInclusive { - get { return this._beginOffsetInclusive.GetValueOrDefault(); } + get { return this._beginOffsetInclusive; } set { this._beginOffsetInclusive = value; } } @@ -62,9 +62,9 @@ internal bool IsSetBeginOffsetInclusive() /// Where the text with a citation ends in the generated output. ///     ///     - public int EndOffsetExclusive + public int? EndOffsetExclusive { - get { return this._endOffsetExclusive.GetValueOrDefault(); } + get { return this._endOffsetExclusive; } set { this._endOffsetExclusive = value; } } diff --git a/sdk/src/Services/QConnect/Generated/Model/CreateAIAgentVersionRequest.cs b/sdk/src/Services/QConnect/Generated/Model/CreateAIAgentVersionRequest.cs index 98a3786300de..831048891079 100644 --- a/sdk/src/Services/QConnect/Generated/Model/CreateAIAgentVersionRequest.cs +++ b/sdk/src/Services/QConnect/Generated/Model/CreateAIAgentVersionRequest.cs @@ -111,9 +111,9 @@ internal bool IsSetClientToken() /// update to the AI Agent post the specified modification time has been made. ///     ///     - public DateTime ModifiedTime + public DateTime? ModifiedTime { - get { return this._modifiedTime.GetValueOrDefault(); } + get { return this._modifiedTime; } set { this._modifiedTime = value; } } diff --git a/sdk/src/Services/QConnect/Generated/Model/CreateAIAgentVersionResponse.cs b/sdk/src/Services/QConnect/Generated/Model/CreateAIAgentVersionResponse.cs index 04b8271e8cfb..3e1d95881a70 100644 --- a/sdk/src/Services/QConnect/Generated/Model/CreateAIAgentVersionResponse.cs +++ b/sdk/src/Services/QConnect/Generated/Model/CreateAIAgentVersionResponse.cs @@ -62,9 +62,9 @@ internal bool IsSetAiAgent() ///     ///     [AWSProperty(Min=1)] - public long VersionNumber + public long? VersionNumber { - get { return this._versionNumber.GetValueOrDefault(); } + get { return this._versionNumber; } set { this._versionNumber = value; } } diff --git a/sdk/src/Services/QConnect/Generated/Model/CreateAIPromptVersionRequest.cs b/sdk/src/Services/QConnect/Generated/Model/CreateAIPromptVersionRequest.cs index b27dd97c48f9..27c5e2b6460f 100644 --- a/sdk/src/Services/QConnect/Generated/Model/CreateAIPromptVersionRequest.cs +++ b/sdk/src/Services/QConnect/Generated/Model/CreateAIPromptVersionRequest.cs @@ -107,9 +107,9 @@ internal bool IsSetClientToken() /// The time the AI Prompt was last modified. ///     ///     - public DateTime ModifiedTime + public DateTime? ModifiedTime { - get { return this._modifiedTime.GetValueOrDefault(); } + get { return this._modifiedTime; } set { this._modifiedTime = value; } } diff --git a/sdk/src/Services/QConnect/Generated/Model/CreateAIPromptVersionResponse.cs b/sdk/src/Services/QConnect/Generated/Model/CreateAIPromptVersionResponse.cs index b01a3f50c464..3e2336e47f5d 100644 --- a/sdk/src/Services/QConnect/Generated/Model/CreateAIPromptVersionResponse.cs +++ b/sdk/src/Services/QConnect/Generated/Model/CreateAIPromptVersionResponse.cs @@ -62,9 +62,9 @@ internal bool IsSetAiPrompt() ///     ///     [AWSProperty(Min=1)] - public long VersionNumber + public long? VersionNumber { - get { return this._versionNumber.GetValueOrDefault(); } + get { return this._versionNumber; } set { this._versionNumber = value; } } diff --git a/sdk/src/Services/QConnect/Generated/Model/DeleteAIAgentVersionRequest.cs b/sdk/src/Services/QConnect/Generated/Model/DeleteAIAgentVersionRequest.cs index 478220cb9771..89ec3725ae50 100644 --- a/sdk/src/Services/QConnect/Generated/Model/DeleteAIAgentVersionRequest.cs +++ b/sdk/src/Services/QConnect/Generated/Model/DeleteAIAgentVersionRequest.cs @@ -86,9 +86,9 @@ internal bool IsSetAssistantId() ///     ///     [AWSProperty(Required=true, Min=1)] - public long VersionNumber + public long? VersionNumber { - get { return this._versionNumber.GetValueOrDefault(); } + get { return this._versionNumber; } set { this._versionNumber = value; } } diff --git a/sdk/src/Services/QConnect/Generated/Model/DeleteAIPromptVersionRequest.cs b/sdk/src/Services/QConnect/Generated/Model/DeleteAIPromptVersionRequest.cs index 5f7b7ea02de0..0c2d66fbafcf 100644 --- a/sdk/src/Services/QConnect/Generated/Model/DeleteAIPromptVersionRequest.cs +++ b/sdk/src/Services/QConnect/Generated/Model/DeleteAIPromptVersionRequest.cs @@ -85,9 +85,9 @@ internal bool IsSetAssistantId() /// ///     [AWSProperty(Required=true, Min=1)] - public long VersionNumber + public long? VersionNumber { - get { return this._versionNumber.GetValueOrDefault(); } + get { return this._versionNumber; } set { this._versionNumber = value; } } diff --git a/sdk/src/Services/QConnect/Generated/Model/FixedSizeChunkingConfiguration.cs b/sdk/src/Services/QConnect/Generated/Model/FixedSizeChunkingConfiguration.cs index d0f4e9d0ebc4..eb4ffb2acfff 100644 --- a/sdk/src/Services/QConnect/Generated/Model/FixedSizeChunkingConfiguration.cs +++ b/sdk/src/Services/QConnect/Generated/Model/FixedSizeChunkingConfiguration.cs @@ -45,9 +45,9 @@ public partial class FixedSizeChunkingConfiguration /// ///     [AWSProperty(Required=true, Min=1)] - public int MaxTokens + public int? MaxTokens { - get { return this._maxTokens.GetValueOrDefault(); } + get { return this._maxTokens; } set { this._maxTokens = value; } } @@ -64,9 +64,9 @@ internal bool IsSetMaxTokens() /// ///     [AWSProperty(Required=true, Min=1, Max=99)] - public int OverlapPercentage + public int? OverlapPercentage { - get { return this._overlapPercentage.GetValueOrDefault(); } + get { return this._overlapPercentage; } set { this._overlapPercentage = value; } } diff --git a/sdk/src/Services/QConnect/Generated/Model/GetAIAgentResponse.cs b/sdk/src/Services/QConnect/Generated/Model/GetAIAgentResponse.cs index d61d9738816b..d428a8407ecc 100644 --- a/sdk/src/Services/QConnect/Generated/Model/GetAIAgentResponse.cs +++ b/sdk/src/Services/QConnect/Generated/Model/GetAIAgentResponse.cs @@ -63,9 +63,9 @@ internal bool IsSetAiAgent() /// ///     [AWSProperty(Min=1)] - public long VersionNumber + public long? VersionNumber { - get { return this._versionNumber.GetValueOrDefault(); } + get { return this._versionNumber; } set { this._versionNumber = value; } } diff --git a/sdk/src/Services/QConnect/Generated/Model/GetAIPromptResponse.cs b/sdk/src/Services/QConnect/Generated/Model/GetAIPromptResponse.cs index 83fe198e76a0..dfcdb28de4c8 100644 --- a/sdk/src/Services/QConnect/Generated/Model/GetAIPromptResponse.cs +++ b/sdk/src/Services/QConnect/Generated/Model/GetAIPromptResponse.cs @@ -63,9 +63,9 @@ internal bool IsSetAiPrompt() /// ///     [AWSProperty(Min=1)] - public long VersionNumber + public long? VersionNumber { - get { return this._versionNumber.GetValueOrDefault(); } + get { return this._versionNumber; } set { this._versionNumber = value; } } diff --git a/sdk/src/Services/QConnect/Generated/Model/HierarchicalChunkingConfiguration.cs b/sdk/src/Services/QConnect/Generated/Model/HierarchicalChunkingConfiguration.cs index 5df65b71f5e4..eec93cc0f284 100644 --- a/sdk/src/Services/QConnect/Generated/Model/HierarchicalChunkingConfiguration.cs +++ b/sdk/src/Services/QConnect/Generated/Model/HierarchicalChunkingConfiguration.cs @@ -65,9 +65,9 @@ internal bool IsSetLevelConfigurations() /// ///     [AWSProperty(Required=true, Min=1)] - public int OverlapTokens + public int? OverlapTokens { - get { return this._overlapTokens.GetValueOrDefault(); } + get { return this._overlapTokens; } set { this._overlapTokens = value; } } diff --git a/sdk/src/Services/QConnect/Generated/Model/HierarchicalChunkingLevelConfiguration.cs b/sdk/src/Services/QConnect/Generated/Model/HierarchicalChunkingLevelConfiguration.cs index 3e14abfa31d1..588a36b05b77 100644 --- a/sdk/src/Services/QConnect/Generated/Model/HierarchicalChunkingLevelConfiguration.cs +++ b/sdk/src/Services/QConnect/Generated/Model/HierarchicalChunkingLevelConfiguration.cs @@ -43,9 +43,9 @@ public partial class HierarchicalChunkingLevelConfiguration /// ///     [AWSProperty(Required=true, Min=1, Max=8192)] - public int MaxTokens + public int? MaxTokens { - get { return this._maxTokens.GetValueOrDefault(); } + get { return this._maxTokens; } set { this._maxTokens = value; } } diff --git a/sdk/src/Services/QConnect/Generated/Model/Internal/MarshallTransformations/AIAgentDataUnmarshaller.cs b/sdk/src/Services/QConnect/Generated/Model/Internal/MarshallTransformations/AIAgentDataUnmarshaller.cs index d6f87c0e6ba4..eb4a2b9f3b33 100644 --- a/sdk/src/Services/QConnect/Generated/Model/Internal/MarshallTransformations/AIAgentDataUnmarshaller.cs +++ b/sdk/src/Services/QConnect/Generated/Model/Internal/MarshallTransformations/AIAgentDataUnmarshaller.cs @@ -104,7 +104,7 @@ public AIAgentData Unmarshall(JsonUnmarshallerContext context) } if (context.TestExpression("modifiedTime", targetDepth)) { - var unmarshaller = DateTimeUnmarshaller.Instance; + var unmarshaller = NullableDateTimeUnmarshaller.Instance; unmarshalledObject.ModifiedTime = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/QConnect/Generated/Model/Internal/MarshallTransformations/AIAgentSummaryUnmarshaller.cs b/sdk/src/Services/QConnect/Generated/Model/Internal/MarshallTransformations/AIAgentSummaryUnmarshaller.cs index ae35315e6ef5..214df39438a1 100644 --- a/sdk/src/Services/QConnect/Generated/Model/Internal/MarshallTransformations/AIAgentSummaryUnmarshaller.cs +++ b/sdk/src/Services/QConnect/Generated/Model/Internal/MarshallTransformations/AIAgentSummaryUnmarshaller.cs @@ -104,7 +104,7 @@ public AIAgentSummary Unmarshall(JsonUnmarshallerContext context) } if (context.TestExpression("modifiedTime", targetDepth)) { - var unmarshaller = DateTimeUnmarshaller.Instance; + var unmarshaller = NullableDateTimeUnmarshaller.Instance; unmarshalledObject.ModifiedTime = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/QConnect/Generated/Model/Internal/MarshallTransformations/AIAgentVersionSummaryUnmarshaller.cs b/sdk/src/Services/QConnect/Generated/Model/Internal/MarshallTransformations/AIAgentVersionSummaryUnmarshaller.cs index caa1c0fa6aad..fcad57dee0b0 100644 --- a/sdk/src/Services/QConnect/Generated/Model/Internal/MarshallTransformations/AIAgentVersionSummaryUnmarshaller.cs +++ b/sdk/src/Services/QConnect/Generated/Model/Internal/MarshallTransformations/AIAgentVersionSummaryUnmarshaller.cs @@ -74,7 +74,7 @@ public AIAgentVersionSummary Unmarshall(JsonUnmarshallerContext context) } if (context.TestExpression("versionNumber", targetDepth)) { - var unmarshaller = LongUnmarshaller.Instance; + var unmarshaller = NullableLongUnmarshaller.Instance; unmarshalledObject.VersionNumber = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/QConnect/Generated/Model/Internal/MarshallTransformations/AIPromptDataUnmarshaller.cs b/sdk/src/Services/QConnect/Generated/Model/Internal/MarshallTransformations/AIPromptDataUnmarshaller.cs index 575f5338e505..b356420f714f 100644 --- a/sdk/src/Services/QConnect/Generated/Model/Internal/MarshallTransformations/AIPromptDataUnmarshaller.cs +++ b/sdk/src/Services/QConnect/Generated/Model/Internal/MarshallTransformations/AIPromptDataUnmarshaller.cs @@ -110,7 +110,7 @@ public AIPromptData Unmarshall(JsonUnmarshallerContext context) } if (context.TestExpression("modifiedTime", targetDepth)) { - var unmarshaller = DateTimeUnmarshaller.Instance; + var unmarshaller = NullableDateTimeUnmarshaller.Instance; unmarshalledObject.ModifiedTime = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/QConnect/Generated/Model/Internal/MarshallTransformations/AIPromptSummaryUnmarshaller.cs b/sdk/src/Services/QConnect/Generated/Model/Internal/MarshallTransformations/AIPromptSummaryUnmarshaller.cs index c129a8816495..5862bd71fb59 100644 --- a/sdk/src/Services/QConnect/Generated/Model/Internal/MarshallTransformations/AIPromptSummaryUnmarshaller.cs +++ b/sdk/src/Services/QConnect/Generated/Model/Internal/MarshallTransformations/AIPromptSummaryUnmarshaller.cs @@ -110,7 +110,7 @@ public AIPromptSummary Unmarshall(JsonUnmarshallerContext context) } if (context.TestExpression("modifiedTime", targetDepth)) { - var unmarshaller = DateTimeUnmarshaller.Instance; + var unmarshaller = NullableDateTimeUnmarshaller.Instance; unmarshalledObject.ModifiedTime = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/QConnect/Generated/Model/Internal/MarshallTransformations/AIPromptVersionSummaryUnmarshaller.cs b/sdk/src/Services/QConnect/Generated/Model/Internal/MarshallTransformations/AIPromptVersionSummaryUnmarshaller.cs index 1b004cd6dc2a..ae6041c680c3 100644 --- a/sdk/src/Services/QConnect/Generated/Model/Internal/MarshallTransformations/AIPromptVersionSummaryUnmarshaller.cs +++ b/sdk/src/Services/QConnect/Generated/Model/Internal/MarshallTransformations/AIPromptVersionSummaryUnmarshaller.cs @@ -74,7 +74,7 @@ public AIPromptVersionSummary Unmarshall(JsonUnmarshallerContext context) } if (context.TestExpression("versionNumber", targetDepth)) { - var unmarshaller = LongUnmarshaller.Instance; + var unmarshaller = NullableLongUnmarshaller.Instance; unmarshalledObject.VersionNumber = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/QConnect/Generated/Model/Internal/MarshallTransformations/CitationSpanUnmarshaller.cs b/sdk/src/Services/QConnect/Generated/Model/Internal/MarshallTransformations/CitationSpanUnmarshaller.cs index b3fa124799e6..4c24b47fa186 100644 --- a/sdk/src/Services/QConnect/Generated/Model/Internal/MarshallTransformations/CitationSpanUnmarshaller.cs +++ b/sdk/src/Services/QConnect/Generated/Model/Internal/MarshallTransformations/CitationSpanUnmarshaller.cs @@ -68,13 +68,13 @@ public CitationSpan Unmarshall(JsonUnmarshallerContext context) { if (context.TestExpression("beginOffsetInclusive", targetDepth)) { - var unmarshaller = IntUnmarshaller.Instance; + var unmarshaller = NullableIntUnmarshaller.Instance; unmarshalledObject.BeginOffsetInclusive = unmarshaller.Unmarshall(context); continue; } if (context.TestExpression("endOffsetExclusive", targetDepth)) { - var unmarshaller = IntUnmarshaller.Instance; + var unmarshaller = NullableIntUnmarshaller.Instance; unmarshalledObject.EndOffsetExclusive = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/QConnect/Generated/Model/Internal/MarshallTransformations/CreateAIAgentRequestMarshaller.cs b/sdk/src/Services/QConnect/Generated/Model/Internal/MarshallTransformations/CreateAIAgentRequestMarshaller.cs index bbd91323643a..d003c50623bb 100644 --- a/sdk/src/Services/QConnect/Generated/Model/Internal/MarshallTransformations/CreateAIAgentRequestMarshaller.cs +++ b/sdk/src/Services/QConnect/Generated/Model/Internal/MarshallTransformations/CreateAIAgentRequestMarshaller.cs @@ -64,75 +64,78 @@ public IRequest Marshall(CreateAIAgentRequest publicRequest) throw new AmazonQConnectException("Request object does not have required field AssistantId set"); request.AddPathResource("{assistantId}", StringUtils.FromString(publicRequest.AssistantId)); request.ResourcePath = "/assistants/{assistantId}/aiagents"; - using (StringWriter stringWriter = new StringWriter(CultureInfo.InvariantCulture)) + using (MemoryStream memoryStream = new MemoryStream()) { - JsonWriter writer = new JsonWriter(stringWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetClientToken()) + using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) { - context.Writer.WritePropertyName("clientToken"); - context.Writer.Write(publicRequest.ClientToken); - } + JsonWriter writer = new JsonWriter(streamWriter); + writer.Validate = false; + writer.WriteObjectStart(); + var context = new JsonMarshallerContext(request, writer); + if(publicRequest.IsSetClientToken()) + { + context.Writer.WritePropertyName("clientToken"); + context.Writer.Write(publicRequest.ClientToken); + } - else if(!(publicRequest.IsSetClientToken())) - { - context.Writer.WritePropertyName("clientToken"); - context.Writer.Write(Guid.NewGuid().ToString()); - } - if(publicRequest.IsSetConfiguration()) - { - context.Writer.WritePropertyName("configuration"); - context.Writer.WriteObjectStart(); + else if(!(publicRequest.IsSetClientToken())) + { + context.Writer.WritePropertyName("clientToken"); + context.Writer.Write(Guid.NewGuid().ToString()); + } + if(publicRequest.IsSetConfiguration()) + { + context.Writer.WritePropertyName("configuration"); + context.Writer.WriteObjectStart(); - var marshaller = AIAgentConfigurationMarshaller.Instance; - marshaller.Marshall(publicRequest.Configuration, context); + var marshaller = AIAgentConfigurationMarshaller.Instance; + marshaller.Marshall(publicRequest.Configuration, context); - context.Writer.WriteObjectEnd(); - } + context.Writer.WriteObjectEnd(); + } - if(publicRequest.IsSetDescription()) - { - context.Writer.WritePropertyName("description"); - context.Writer.Write(publicRequest.Description); - } + if(publicRequest.IsSetDescription()) + { + context.Writer.WritePropertyName("description"); + context.Writer.Write(publicRequest.Description); + } - if(publicRequest.IsSetName()) - { - context.Writer.WritePropertyName("name"); - context.Writer.Write(publicRequest.Name); - } + if(publicRequest.IsSetName()) + { + context.Writer.WritePropertyName("name"); + context.Writer.Write(publicRequest.Name); + } - if(publicRequest.IsSetTags()) - { - context.Writer.WritePropertyName("tags"); - context.Writer.WriteObjectStart(); - foreach (var publicRequestTagsKvp in publicRequest.Tags) + if(publicRequest.IsSetTags()) { - context.Writer.WritePropertyName(publicRequestTagsKvp.Key); - var publicRequestTagsValue = publicRequestTagsKvp.Value; + context.Writer.WritePropertyName("tags"); + context.Writer.WriteObjectStart(); + foreach (var publicRequestTagsKvp in publicRequest.Tags) + { + context.Writer.WritePropertyName(publicRequestTagsKvp.Key); + var publicRequestTagsValue = publicRequestTagsKvp.Value; + + context.Writer.Write(publicRequestTagsValue); + } + context.Writer.WriteObjectEnd(); + } - context.Writer.Write(publicRequestTagsValue); + if(publicRequest.IsSetType()) + { + context.Writer.WritePropertyName("type"); + context.Writer.Write(publicRequest.Type); } - context.Writer.WriteObjectEnd(); - } - if(publicRequest.IsSetType()) - { - context.Writer.WritePropertyName("type"); - context.Writer.Write(publicRequest.Type); - } + if(publicRequest.IsSetVisibilityStatus()) + { + context.Writer.WritePropertyName("visibilityStatus"); + context.Writer.Write(publicRequest.VisibilityStatus); + } - if(publicRequest.IsSetVisibilityStatus()) - { - context.Writer.WritePropertyName("visibilityStatus"); - context.Writer.Write(publicRequest.VisibilityStatus); + writer.WriteObjectEnd(); } - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); + request.Content = memoryStream.ToArray(); } diff --git a/sdk/src/Services/QConnect/Generated/Model/Internal/MarshallTransformations/CreateAIAgentVersionRequestMarshaller.cs b/sdk/src/Services/QConnect/Generated/Model/Internal/MarshallTransformations/CreateAIAgentVersionRequestMarshaller.cs index 168cbc1b0236..3addb3c1f577 100644 --- a/sdk/src/Services/QConnect/Generated/Model/Internal/MarshallTransformations/CreateAIAgentVersionRequestMarshaller.cs +++ b/sdk/src/Services/QConnect/Generated/Model/Internal/MarshallTransformations/CreateAIAgentVersionRequestMarshaller.cs @@ -67,32 +67,35 @@ public IRequest Marshall(CreateAIAgentVersionRequest publicRequest) throw new AmazonQConnectException("Request object does not have required field AssistantId set"); request.AddPathResource("{assistantId}", StringUtils.FromString(publicRequest.AssistantId)); request.ResourcePath = "/assistants/{assistantId}/aiagents/{aiAgentId}/versions"; - using (StringWriter stringWriter = new StringWriter(CultureInfo.InvariantCulture)) + using (MemoryStream memoryStream = new MemoryStream()) { - JsonWriter writer = new JsonWriter(stringWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetClientToken()) + using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) { - context.Writer.WritePropertyName("clientToken"); - context.Writer.Write(publicRequest.ClientToken); - } + JsonWriter writer = new JsonWriter(streamWriter); + writer.Validate = false; + writer.WriteObjectStart(); + var context = new JsonMarshallerContext(request, writer); + if(publicRequest.IsSetClientToken()) + { + context.Writer.WritePropertyName("clientToken"); + context.Writer.Write(publicRequest.ClientToken); + } - else if(!(publicRequest.IsSetClientToken())) - { - context.Writer.WritePropertyName("clientToken"); - context.Writer.Write(Guid.NewGuid().ToString()); - } - if(publicRequest.IsSetModifiedTime()) - { - context.Writer.WritePropertyName("modifiedTime"); - context.Writer.Write(publicRequest.ModifiedTime); + else if(!(publicRequest.IsSetClientToken())) + { + context.Writer.WritePropertyName("clientToken"); + context.Writer.Write(Guid.NewGuid().ToString()); + } + if(publicRequest.IsSetModifiedTime()) + { + context.Writer.WritePropertyName("modifiedTime"); + context.Writer.Write(publicRequest.ModifiedTime.Value); + } + + writer.WriteObjectEnd(); } - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); + request.Content = memoryStream.ToArray(); } diff --git a/sdk/src/Services/QConnect/Generated/Model/Internal/MarshallTransformations/CreateAIAgentVersionResponseUnmarshaller.cs b/sdk/src/Services/QConnect/Generated/Model/Internal/MarshallTransformations/CreateAIAgentVersionResponseUnmarshaller.cs index f906d420f3a1..6527fa4060bf 100644 --- a/sdk/src/Services/QConnect/Generated/Model/Internal/MarshallTransformations/CreateAIAgentVersionResponseUnmarshaller.cs +++ b/sdk/src/Services/QConnect/Generated/Model/Internal/MarshallTransformations/CreateAIAgentVersionResponseUnmarshaller.cs @@ -60,7 +60,7 @@ public override AmazonWebServiceResponse Unmarshall(JsonUnmarshallerContext cont } if (context.TestExpression("versionNumber", targetDepth)) { - var unmarshaller = LongUnmarshaller.Instance; + var unmarshaller = NullableLongUnmarshaller.Instance; response.VersionNumber = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/QConnect/Generated/Model/Internal/MarshallTransformations/CreateAIPromptRequestMarshaller.cs b/sdk/src/Services/QConnect/Generated/Model/Internal/MarshallTransformations/CreateAIPromptRequestMarshaller.cs index 800109b55b4a..038f94c142d8 100644 --- a/sdk/src/Services/QConnect/Generated/Model/Internal/MarshallTransformations/CreateAIPromptRequestMarshaller.cs +++ b/sdk/src/Services/QConnect/Generated/Model/Internal/MarshallTransformations/CreateAIPromptRequestMarshaller.cs @@ -64,93 +64,96 @@ public IRequest Marshall(CreateAIPromptRequest publicRequest) throw new AmazonQConnectException("Request object does not have required field AssistantId set"); request.AddPathResource("{assistantId}", StringUtils.FromString(publicRequest.AssistantId)); request.ResourcePath = "/assistants/{assistantId}/aiprompts"; - using (StringWriter stringWriter = new StringWriter(CultureInfo.InvariantCulture)) + using (MemoryStream memoryStream = new MemoryStream()) { - JsonWriter writer = new JsonWriter(stringWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetApiFormat()) + using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) { - context.Writer.WritePropertyName("apiFormat"); - context.Writer.Write(publicRequest.ApiFormat); - } - - if(publicRequest.IsSetClientToken()) - { - context.Writer.WritePropertyName("clientToken"); - context.Writer.Write(publicRequest.ClientToken); - } + JsonWriter writer = new JsonWriter(streamWriter); + writer.Validate = false; + writer.WriteObjectStart(); + var context = new JsonMarshallerContext(request, writer); + if(publicRequest.IsSetApiFormat()) + { + context.Writer.WritePropertyName("apiFormat"); + context.Writer.Write(publicRequest.ApiFormat); + } - else if(!(publicRequest.IsSetClientToken())) - { - context.Writer.WritePropertyName("clientToken"); - context.Writer.Write(Guid.NewGuid().ToString()); - } - if(publicRequest.IsSetDescription()) - { - context.Writer.WritePropertyName("description"); - context.Writer.Write(publicRequest.Description); - } + if(publicRequest.IsSetClientToken()) + { + context.Writer.WritePropertyName("clientToken"); + context.Writer.Write(publicRequest.ClientToken); + } - if(publicRequest.IsSetModelId()) - { - context.Writer.WritePropertyName("modelId"); - context.Writer.Write(publicRequest.ModelId); - } + else if(!(publicRequest.IsSetClientToken())) + { + context.Writer.WritePropertyName("clientToken"); + context.Writer.Write(Guid.NewGuid().ToString()); + } + if(publicRequest.IsSetDescription()) + { + context.Writer.WritePropertyName("description"); + context.Writer.Write(publicRequest.Description); + } - if(publicRequest.IsSetName()) - { - context.Writer.WritePropertyName("name"); - context.Writer.Write(publicRequest.Name); - } + if(publicRequest.IsSetModelId()) + { + context.Writer.WritePropertyName("modelId"); + context.Writer.Write(publicRequest.ModelId); + } - if(publicRequest.IsSetTags()) - { - context.Writer.WritePropertyName("tags"); - context.Writer.WriteObjectStart(); - foreach (var publicRequestTagsKvp in publicRequest.Tags) + if(publicRequest.IsSetName()) { - context.Writer.WritePropertyName(publicRequestTagsKvp.Key); - var publicRequestTagsValue = publicRequestTagsKvp.Value; + context.Writer.WritePropertyName("name"); + context.Writer.Write(publicRequest.Name); + } - context.Writer.Write(publicRequestTagsValue); + if(publicRequest.IsSetTags()) + { + context.Writer.WritePropertyName("tags"); + context.Writer.WriteObjectStart(); + foreach (var publicRequestTagsKvp in publicRequest.Tags) + { + context.Writer.WritePropertyName(publicRequestTagsKvp.Key); + var publicRequestTagsValue = publicRequestTagsKvp.Value; + + context.Writer.Write(publicRequestTagsValue); + } + context.Writer.WriteObjectEnd(); } - context.Writer.WriteObjectEnd(); - } - if(publicRequest.IsSetTemplateConfiguration()) - { - context.Writer.WritePropertyName("templateConfiguration"); - context.Writer.WriteObjectStart(); + if(publicRequest.IsSetTemplateConfiguration()) + { + context.Writer.WritePropertyName("templateConfiguration"); + context.Writer.WriteObjectStart(); - var marshaller = AIPromptTemplateConfigurationMarshaller.Instance; - marshaller.Marshall(publicRequest.TemplateConfiguration, context); + var marshaller = AIPromptTemplateConfigurationMarshaller.Instance; + marshaller.Marshall(publicRequest.TemplateConfiguration, context); - context.Writer.WriteObjectEnd(); - } + context.Writer.WriteObjectEnd(); + } - if(publicRequest.IsSetTemplateType()) - { - context.Writer.WritePropertyName("templateType"); - context.Writer.Write(publicRequest.TemplateType); - } + if(publicRequest.IsSetTemplateType()) + { + context.Writer.WritePropertyName("templateType"); + context.Writer.Write(publicRequest.TemplateType); + } - if(publicRequest.IsSetType()) - { - context.Writer.WritePropertyName("type"); - context.Writer.Write(publicRequest.Type); - } + if(publicRequest.IsSetType()) + { + context.Writer.WritePropertyName("type"); + context.Writer.Write(publicRequest.Type); + } - if(publicRequest.IsSetVisibilityStatus()) - { - context.Writer.WritePropertyName("visibilityStatus"); - context.Writer.Write(publicRequest.VisibilityStatus); + if(publicRequest.IsSetVisibilityStatus()) + { + context.Writer.WritePropertyName("visibilityStatus"); + context.Writer.Write(publicRequest.VisibilityStatus); + } + + writer.WriteObjectEnd(); } - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); + request.Content = memoryStream.ToArray(); } diff --git a/sdk/src/Services/QConnect/Generated/Model/Internal/MarshallTransformations/CreateAIPromptVersionRequestMarshaller.cs b/sdk/src/Services/QConnect/Generated/Model/Internal/MarshallTransformations/CreateAIPromptVersionRequestMarshaller.cs index 3881c02d9a5a..f3960db1f79d 100644 --- a/sdk/src/Services/QConnect/Generated/Model/Internal/MarshallTransformations/CreateAIPromptVersionRequestMarshaller.cs +++ b/sdk/src/Services/QConnect/Generated/Model/Internal/MarshallTransformations/CreateAIPromptVersionRequestMarshaller.cs @@ -67,32 +67,35 @@ public IRequest Marshall(CreateAIPromptVersionRequest publicRequest) throw new AmazonQConnectException("Request object does not have required field AssistantId set"); request.AddPathResource("{assistantId}", StringUtils.FromString(publicRequest.AssistantId)); request.ResourcePath = "/assistants/{assistantId}/aiprompts/{aiPromptId}/versions"; - using (StringWriter stringWriter = new StringWriter(CultureInfo.InvariantCulture)) + using (MemoryStream memoryStream = new MemoryStream()) { - JsonWriter writer = new JsonWriter(stringWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetClientToken()) + using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) { - context.Writer.WritePropertyName("clientToken"); - context.Writer.Write(publicRequest.ClientToken); - } + JsonWriter writer = new JsonWriter(streamWriter); + writer.Validate = false; + writer.WriteObjectStart(); + var context = new JsonMarshallerContext(request, writer); + if(publicRequest.IsSetClientToken()) + { + context.Writer.WritePropertyName("clientToken"); + context.Writer.Write(publicRequest.ClientToken); + } - else if(!(publicRequest.IsSetClientToken())) - { - context.Writer.WritePropertyName("clientToken"); - context.Writer.Write(Guid.NewGuid().ToString()); - } - if(publicRequest.IsSetModifiedTime()) - { - context.Writer.WritePropertyName("modifiedTime"); - context.Writer.Write(publicRequest.ModifiedTime); + else if(!(publicRequest.IsSetClientToken())) + { + context.Writer.WritePropertyName("clientToken"); + context.Writer.Write(Guid.NewGuid().ToString()); + } + if(publicRequest.IsSetModifiedTime()) + { + context.Writer.WritePropertyName("modifiedTime"); + context.Writer.Write(publicRequest.ModifiedTime.Value); + } + + writer.WriteObjectEnd(); } - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); + request.Content = memoryStream.ToArray(); } diff --git a/sdk/src/Services/QConnect/Generated/Model/Internal/MarshallTransformations/CreateAIPromptVersionResponseUnmarshaller.cs b/sdk/src/Services/QConnect/Generated/Model/Internal/MarshallTransformations/CreateAIPromptVersionResponseUnmarshaller.cs index 4d1fe629e12c..268b941389d5 100644 --- a/sdk/src/Services/QConnect/Generated/Model/Internal/MarshallTransformations/CreateAIPromptVersionResponseUnmarshaller.cs +++ b/sdk/src/Services/QConnect/Generated/Model/Internal/MarshallTransformations/CreateAIPromptVersionResponseUnmarshaller.cs @@ -60,7 +60,7 @@ public override AmazonWebServiceResponse Unmarshall(JsonUnmarshallerContext cont } if (context.TestExpression("versionNumber", targetDepth)) { - var unmarshaller = LongUnmarshaller.Instance; + var unmarshaller = NullableLongUnmarshaller.Instance; response.VersionNumber = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/QConnect/Generated/Model/Internal/MarshallTransformations/CreateKnowledgeBaseRequestMarshaller.cs b/sdk/src/Services/QConnect/Generated/Model/Internal/MarshallTransformations/CreateKnowledgeBaseRequestMarshaller.cs index b2b37281cba8..94e8bafec6e9 100644 --- a/sdk/src/Services/QConnect/Generated/Model/Internal/MarshallTransformations/CreateKnowledgeBaseRequestMarshaller.cs +++ b/sdk/src/Services/QConnect/Generated/Model/Internal/MarshallTransformations/CreateKnowledgeBaseRequestMarshaller.cs @@ -145,31 +145,21 @@ public IRequest Marshall(CreateKnowledgeBaseRequest publicRequest) context.Writer.WriteObjectEnd(); } - writer.WriteObjectEnd(); - } + if(publicRequest.IsSetVectorIngestionConfiguration()) + { + context.Writer.WritePropertyName("vectorIngestionConfiguration"); + context.Writer.WriteObjectStart(); -<<<<<<< HEAD - request.Content = memoryStream.ToArray(); -||||||| Commit version number update changes - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); -======= - if(publicRequest.IsSetVectorIngestionConfiguration()) - { - context.Writer.WritePropertyName("vectorIngestionConfiguration"); - context.Writer.WriteObjectStart(); + var marshaller = VectorIngestionConfigurationMarshaller.Instance; + marshaller.Marshall(publicRequest.VectorIngestionConfiguration, context); - var marshaller = VectorIngestionConfigurationMarshaller.Instance; - marshaller.Marshall(publicRequest.VectorIngestionConfiguration, context); + context.Writer.WriteObjectEnd(); + } - context.Writer.WriteObjectEnd(); + writer.WriteObjectEnd(); } - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b + request.Content = memoryStream.ToArray(); } diff --git a/sdk/src/Services/QConnect/Generated/Model/Internal/MarshallTransformations/CreateSessionRequestMarshaller.cs b/sdk/src/Services/QConnect/Generated/Model/Internal/MarshallTransformations/CreateSessionRequestMarshaller.cs index 90380d062e1e..fd7039d79613 100644 --- a/sdk/src/Services/QConnect/Generated/Model/Internal/MarshallTransformations/CreateSessionRequestMarshaller.cs +++ b/sdk/src/Services/QConnect/Generated/Model/Internal/MarshallTransformations/CreateSessionRequestMarshaller.cs @@ -66,45 +66,31 @@ public IRequest Marshall(CreateSessionRequest publicRequest) request.ResourcePath = "/assistants/{assistantId}/sessions"; using (MemoryStream memoryStream = new MemoryStream()) { -<<<<<<< HEAD using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) -||||||| Commit version number update changes - JsonWriter writer = new JsonWriter(stringWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetClientToken()) -======= - JsonWriter writer = new JsonWriter(stringWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetAiAgentConfiguration()) { - context.Writer.WritePropertyName("aiAgentConfiguration"); - context.Writer.WriteObjectStart(); - foreach (var publicRequestAiAgentConfigurationKvp in publicRequest.AiAgentConfiguration) + JsonWriter writer = new JsonWriter(streamWriter); + writer.Validate = false; + writer.WriteObjectStart(); + var context = new JsonMarshallerContext(request, writer); + if(publicRequest.IsSetAiAgentConfiguration()) { - context.Writer.WritePropertyName(publicRequestAiAgentConfigurationKvp.Key); - var publicRequestAiAgentConfigurationValue = publicRequestAiAgentConfigurationKvp.Value; - + context.Writer.WritePropertyName("aiAgentConfiguration"); context.Writer.WriteObjectStart(); + foreach (var publicRequestAiAgentConfigurationKvp in publicRequest.AiAgentConfiguration) + { + context.Writer.WritePropertyName(publicRequestAiAgentConfigurationKvp.Key); + var publicRequestAiAgentConfigurationValue = publicRequestAiAgentConfigurationKvp.Value; + + context.Writer.WriteObjectStart(); - var marshaller = AIAgentConfigurationDataMarshaller.Instance; - marshaller.Marshall(publicRequestAiAgentConfigurationValue, context); + var marshaller = AIAgentConfigurationDataMarshaller.Instance; + marshaller.Marshall(publicRequestAiAgentConfigurationValue, context); + context.Writer.WriteObjectEnd(); + } context.Writer.WriteObjectEnd(); } - context.Writer.WriteObjectEnd(); - } - if(publicRequest.IsSetClientToken()) ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b - { - JsonWriter writer = new JsonWriter(streamWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); if(publicRequest.IsSetClientToken()) { context.Writer.WritePropertyName("clientToken"); diff --git a/sdk/src/Services/QConnect/Generated/Model/Internal/MarshallTransformations/FixedSizeChunkingConfigurationMarshaller.cs b/sdk/src/Services/QConnect/Generated/Model/Internal/MarshallTransformations/FixedSizeChunkingConfigurationMarshaller.cs index 090eba4d382e..bc2cbb45ef94 100644 --- a/sdk/src/Services/QConnect/Generated/Model/Internal/MarshallTransformations/FixedSizeChunkingConfigurationMarshaller.cs +++ b/sdk/src/Services/QConnect/Generated/Model/Internal/MarshallTransformations/FixedSizeChunkingConfigurationMarshaller.cs @@ -51,13 +51,13 @@ public void Marshall(FixedSizeChunkingConfiguration requestObject, JsonMarshalle if(requestObject.IsSetMaxTokens()) { context.Writer.WritePropertyName("maxTokens"); - context.Writer.Write(requestObject.MaxTokens); + context.Writer.Write(requestObject.MaxTokens.Value); } if(requestObject.IsSetOverlapPercentage()) { context.Writer.WritePropertyName("overlapPercentage"); - context.Writer.Write(requestObject.OverlapPercentage); + context.Writer.Write(requestObject.OverlapPercentage.Value); } } diff --git a/sdk/src/Services/QConnect/Generated/Model/Internal/MarshallTransformations/FixedSizeChunkingConfigurationUnmarshaller.cs b/sdk/src/Services/QConnect/Generated/Model/Internal/MarshallTransformations/FixedSizeChunkingConfigurationUnmarshaller.cs index c634402f64fe..c6af913e1ad7 100644 --- a/sdk/src/Services/QConnect/Generated/Model/Internal/MarshallTransformations/FixedSizeChunkingConfigurationUnmarshaller.cs +++ b/sdk/src/Services/QConnect/Generated/Model/Internal/MarshallTransformations/FixedSizeChunkingConfigurationUnmarshaller.cs @@ -68,13 +68,13 @@ public FixedSizeChunkingConfiguration Unmarshall(JsonUnmarshallerContext context { if (context.TestExpression("maxTokens", targetDepth)) { - var unmarshaller = IntUnmarshaller.Instance; + var unmarshaller = NullableIntUnmarshaller.Instance; unmarshalledObject.MaxTokens = unmarshaller.Unmarshall(context); continue; } if (context.TestExpression("overlapPercentage", targetDepth)) { - var unmarshaller = IntUnmarshaller.Instance; + var unmarshaller = NullableIntUnmarshaller.Instance; unmarshalledObject.OverlapPercentage = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/QConnect/Generated/Model/Internal/MarshallTransformations/GetAIAgentResponseUnmarshaller.cs b/sdk/src/Services/QConnect/Generated/Model/Internal/MarshallTransformations/GetAIAgentResponseUnmarshaller.cs index 3a36aedf71ce..56f2869dec67 100644 --- a/sdk/src/Services/QConnect/Generated/Model/Internal/MarshallTransformations/GetAIAgentResponseUnmarshaller.cs +++ b/sdk/src/Services/QConnect/Generated/Model/Internal/MarshallTransformations/GetAIAgentResponseUnmarshaller.cs @@ -60,7 +60,7 @@ public override AmazonWebServiceResponse Unmarshall(JsonUnmarshallerContext cont } if (context.TestExpression("versionNumber", targetDepth)) { - var unmarshaller = LongUnmarshaller.Instance; + var unmarshaller = NullableLongUnmarshaller.Instance; response.VersionNumber = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/QConnect/Generated/Model/Internal/MarshallTransformations/GetAIPromptResponseUnmarshaller.cs b/sdk/src/Services/QConnect/Generated/Model/Internal/MarshallTransformations/GetAIPromptResponseUnmarshaller.cs index 17e8052a2f18..81948599a211 100644 --- a/sdk/src/Services/QConnect/Generated/Model/Internal/MarshallTransformations/GetAIPromptResponseUnmarshaller.cs +++ b/sdk/src/Services/QConnect/Generated/Model/Internal/MarshallTransformations/GetAIPromptResponseUnmarshaller.cs @@ -60,7 +60,7 @@ public override AmazonWebServiceResponse Unmarshall(JsonUnmarshallerContext cont } if (context.TestExpression("versionNumber", targetDepth)) { - var unmarshaller = LongUnmarshaller.Instance; + var unmarshaller = NullableLongUnmarshaller.Instance; response.VersionNumber = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/QConnect/Generated/Model/Internal/MarshallTransformations/HierarchicalChunkingConfigurationMarshaller.cs b/sdk/src/Services/QConnect/Generated/Model/Internal/MarshallTransformations/HierarchicalChunkingConfigurationMarshaller.cs index 57537fd34167..2dc8d66dcb2a 100644 --- a/sdk/src/Services/QConnect/Generated/Model/Internal/MarshallTransformations/HierarchicalChunkingConfigurationMarshaller.cs +++ b/sdk/src/Services/QConnect/Generated/Model/Internal/MarshallTransformations/HierarchicalChunkingConfigurationMarshaller.cs @@ -67,7 +67,7 @@ public void Marshall(HierarchicalChunkingConfiguration requestObject, JsonMarsha if(requestObject.IsSetOverlapTokens()) { context.Writer.WritePropertyName("overlapTokens"); - context.Writer.Write(requestObject.OverlapTokens); + context.Writer.Write(requestObject.OverlapTokens.Value); } } diff --git a/sdk/src/Services/QConnect/Generated/Model/Internal/MarshallTransformations/HierarchicalChunkingConfigurationUnmarshaller.cs b/sdk/src/Services/QConnect/Generated/Model/Internal/MarshallTransformations/HierarchicalChunkingConfigurationUnmarshaller.cs index 624b6b3f8b41..683f4e29a4b1 100644 --- a/sdk/src/Services/QConnect/Generated/Model/Internal/MarshallTransformations/HierarchicalChunkingConfigurationUnmarshaller.cs +++ b/sdk/src/Services/QConnect/Generated/Model/Internal/MarshallTransformations/HierarchicalChunkingConfigurationUnmarshaller.cs @@ -74,7 +74,7 @@ public HierarchicalChunkingConfiguration Unmarshall(JsonUnmarshallerContext cont } if (context.TestExpression("overlapTokens", targetDepth)) { - var unmarshaller = IntUnmarshaller.Instance; + var unmarshaller = NullableIntUnmarshaller.Instance; unmarshalledObject.OverlapTokens = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/QConnect/Generated/Model/Internal/MarshallTransformations/HierarchicalChunkingLevelConfigurationMarshaller.cs b/sdk/src/Services/QConnect/Generated/Model/Internal/MarshallTransformations/HierarchicalChunkingLevelConfigurationMarshaller.cs index 20b0e6143bb8..2c162781acb0 100644 --- a/sdk/src/Services/QConnect/Generated/Model/Internal/MarshallTransformations/HierarchicalChunkingLevelConfigurationMarshaller.cs +++ b/sdk/src/Services/QConnect/Generated/Model/Internal/MarshallTransformations/HierarchicalChunkingLevelConfigurationMarshaller.cs @@ -51,7 +51,7 @@ public void Marshall(HierarchicalChunkingLevelConfiguration requestObject, JsonM if(requestObject.IsSetMaxTokens()) { context.Writer.WritePropertyName("maxTokens"); - context.Writer.Write(requestObject.MaxTokens); + context.Writer.Write(requestObject.MaxTokens.Value); } } diff --git a/sdk/src/Services/QConnect/Generated/Model/Internal/MarshallTransformations/HierarchicalChunkingLevelConfigurationUnmarshaller.cs b/sdk/src/Services/QConnect/Generated/Model/Internal/MarshallTransformations/HierarchicalChunkingLevelConfigurationUnmarshaller.cs index b5c4a23f6722..07f3678bc1aa 100644 --- a/sdk/src/Services/QConnect/Generated/Model/Internal/MarshallTransformations/HierarchicalChunkingLevelConfigurationUnmarshaller.cs +++ b/sdk/src/Services/QConnect/Generated/Model/Internal/MarshallTransformations/HierarchicalChunkingLevelConfigurationUnmarshaller.cs @@ -68,7 +68,7 @@ public HierarchicalChunkingLevelConfiguration Unmarshall(JsonUnmarshallerContext { if (context.TestExpression("maxTokens", targetDepth)) { - var unmarshaller = IntUnmarshaller.Instance; + var unmarshaller = NullableIntUnmarshaller.Instance; unmarshalledObject.MaxTokens = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/QConnect/Generated/Model/Internal/MarshallTransformations/KnowledgeBaseAssociationConfigurationDataMarshaller.cs b/sdk/src/Services/QConnect/Generated/Model/Internal/MarshallTransformations/KnowledgeBaseAssociationConfigurationDataMarshaller.cs index d9e0d33c7bdf..54ff82a17c14 100644 --- a/sdk/src/Services/QConnect/Generated/Model/Internal/MarshallTransformations/KnowledgeBaseAssociationConfigurationDataMarshaller.cs +++ b/sdk/src/Services/QConnect/Generated/Model/Internal/MarshallTransformations/KnowledgeBaseAssociationConfigurationDataMarshaller.cs @@ -62,7 +62,7 @@ public void Marshall(KnowledgeBaseAssociationConfigurationData requestObject, Js if(requestObject.IsSetMaxResults()) { context.Writer.WritePropertyName("maxResults"); - context.Writer.Write(requestObject.MaxResults); + context.Writer.Write(requestObject.MaxResults.Value); } if(requestObject.IsSetOverrideKnowledgeBaseSearchType()) diff --git a/sdk/src/Services/QConnect/Generated/Model/Internal/MarshallTransformations/KnowledgeBaseAssociationConfigurationDataUnmarshaller.cs b/sdk/src/Services/QConnect/Generated/Model/Internal/MarshallTransformations/KnowledgeBaseAssociationConfigurationDataUnmarshaller.cs index 26e0a8fdaf85..ec39d3e17442 100644 --- a/sdk/src/Services/QConnect/Generated/Model/Internal/MarshallTransformations/KnowledgeBaseAssociationConfigurationDataUnmarshaller.cs +++ b/sdk/src/Services/QConnect/Generated/Model/Internal/MarshallTransformations/KnowledgeBaseAssociationConfigurationDataUnmarshaller.cs @@ -74,7 +74,7 @@ public KnowledgeBaseAssociationConfigurationData Unmarshall(JsonUnmarshallerCont } if (context.TestExpression("maxResults", targetDepth)) { - var unmarshaller = IntUnmarshaller.Instance; + var unmarshaller = NullableIntUnmarshaller.Instance; unmarshalledObject.MaxResults = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/QConnect/Generated/Model/Internal/MarshallTransformations/QueryAssistantRequestMarshaller.cs b/sdk/src/Services/QConnect/Generated/Model/Internal/MarshallTransformations/QueryAssistantRequestMarshaller.cs index 3d206199ec66..8ff86476d798 100644 --- a/sdk/src/Services/QConnect/Generated/Model/Internal/MarshallTransformations/QueryAssistantRequestMarshaller.cs +++ b/sdk/src/Services/QConnect/Generated/Model/Internal/MarshallTransformations/QueryAssistantRequestMarshaller.cs @@ -78,32 +78,18 @@ public IRequest Marshall(QueryAssistantRequest publicRequest) context.Writer.Write(publicRequest.MaxResults.Value); } -<<<<<<< HEAD if(publicRequest.IsSetNextToken()) -||||||| Commit version number update changes - if(publicRequest.IsSetQueryCondition()) - { - context.Writer.WritePropertyName("queryCondition"); - context.Writer.WriteArrayStart(); - foreach(var publicRequestQueryConditionListValue in publicRequest.QueryCondition) -======= - if(publicRequest.IsSetOverrideKnowledgeBaseSearchType()) - { - context.Writer.WritePropertyName("overrideKnowledgeBaseSearchType"); - context.Writer.Write(publicRequest.OverrideKnowledgeBaseSearchType); - } - - if(publicRequest.IsSetQueryCondition()) - { - context.Writer.WritePropertyName("queryCondition"); - context.Writer.WriteArrayStart(); - foreach(var publicRequestQueryConditionListValue in publicRequest.QueryCondition) ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b { context.Writer.WritePropertyName("nextToken"); context.Writer.Write(publicRequest.NextToken); } + if(publicRequest.IsSetOverrideKnowledgeBaseSearchType()) + { + context.Writer.WritePropertyName("overrideKnowledgeBaseSearchType"); + context.Writer.Write(publicRequest.OverrideKnowledgeBaseSearchType); + } + if(publicRequest.IsSetQueryCondition()) { context.Writer.WritePropertyName("queryCondition"); @@ -120,42 +106,28 @@ public IRequest Marshall(QueryAssistantRequest publicRequest) context.Writer.WriteArrayEnd(); } + if(publicRequest.IsSetQueryInputData()) + { + context.Writer.WritePropertyName("queryInputData"); + context.Writer.WriteObjectStart(); + + var marshaller = QueryInputDataMarshaller.Instance; + marshaller.Marshall(publicRequest.QueryInputData, context); + + context.Writer.WriteObjectEnd(); + } + if(publicRequest.IsSetQueryText()) { context.Writer.WritePropertyName("queryText"); context.Writer.Write(publicRequest.QueryText); } -<<<<<<< HEAD if(publicRequest.IsSetSessionId()) { context.Writer.WritePropertyName("sessionId"); context.Writer.Write(publicRequest.SessionId); } -||||||| Commit version number update changes - if(publicRequest.IsSetQueryText()) - { - context.Writer.WritePropertyName("queryText"); - context.Writer.Write(publicRequest.QueryText); - } -======= - if(publicRequest.IsSetQueryInputData()) - { - context.Writer.WritePropertyName("queryInputData"); - context.Writer.WriteObjectStart(); - - var marshaller = QueryInputDataMarshaller.Instance; - marshaller.Marshall(publicRequest.QueryInputData, context); - - context.Writer.WriteObjectEnd(); - } - - if(publicRequest.IsSetQueryText()) - { - context.Writer.WritePropertyName("queryText"); - context.Writer.Write(publicRequest.QueryText); - } ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b writer.WriteObjectEnd(); } diff --git a/sdk/src/Services/QConnect/Generated/Model/Internal/MarshallTransformations/SemanticChunkingConfigurationMarshaller.cs b/sdk/src/Services/QConnect/Generated/Model/Internal/MarshallTransformations/SemanticChunkingConfigurationMarshaller.cs index 9ddfb88b6719..961ad69ad949 100644 --- a/sdk/src/Services/QConnect/Generated/Model/Internal/MarshallTransformations/SemanticChunkingConfigurationMarshaller.cs +++ b/sdk/src/Services/QConnect/Generated/Model/Internal/MarshallTransformations/SemanticChunkingConfigurationMarshaller.cs @@ -51,19 +51,19 @@ public void Marshall(SemanticChunkingConfiguration requestObject, JsonMarshaller if(requestObject.IsSetBreakpointPercentileThreshold()) { context.Writer.WritePropertyName("breakpointPercentileThreshold"); - context.Writer.Write(requestObject.BreakpointPercentileThreshold); + context.Writer.Write(requestObject.BreakpointPercentileThreshold.Value); } if(requestObject.IsSetBufferSize()) { context.Writer.WritePropertyName("bufferSize"); - context.Writer.Write(requestObject.BufferSize); + context.Writer.Write(requestObject.BufferSize.Value); } if(requestObject.IsSetMaxTokens()) { context.Writer.WritePropertyName("maxTokens"); - context.Writer.Write(requestObject.MaxTokens); + context.Writer.Write(requestObject.MaxTokens.Value); } } diff --git a/sdk/src/Services/QConnect/Generated/Model/Internal/MarshallTransformations/SemanticChunkingConfigurationUnmarshaller.cs b/sdk/src/Services/QConnect/Generated/Model/Internal/MarshallTransformations/SemanticChunkingConfigurationUnmarshaller.cs index e0831adb7549..1be77edf5d2b 100644 --- a/sdk/src/Services/QConnect/Generated/Model/Internal/MarshallTransformations/SemanticChunkingConfigurationUnmarshaller.cs +++ b/sdk/src/Services/QConnect/Generated/Model/Internal/MarshallTransformations/SemanticChunkingConfigurationUnmarshaller.cs @@ -68,19 +68,19 @@ public SemanticChunkingConfiguration Unmarshall(JsonUnmarshallerContext context) { if (context.TestExpression("breakpointPercentileThreshold", targetDepth)) { - var unmarshaller = IntUnmarshaller.Instance; + var unmarshaller = NullableIntUnmarshaller.Instance; unmarshalledObject.BreakpointPercentileThreshold = unmarshaller.Unmarshall(context); continue; } if (context.TestExpression("bufferSize", targetDepth)) { - var unmarshaller = IntUnmarshaller.Instance; + var unmarshaller = NullableIntUnmarshaller.Instance; unmarshalledObject.BufferSize = unmarshaller.Unmarshall(context); continue; } if (context.TestExpression("maxTokens", targetDepth)) { - var unmarshaller = IntUnmarshaller.Instance; + var unmarshaller = NullableIntUnmarshaller.Instance; unmarshalledObject.MaxTokens = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/QConnect/Generated/Model/Internal/MarshallTransformations/UpdateAIAgentRequestMarshaller.cs b/sdk/src/Services/QConnect/Generated/Model/Internal/MarshallTransformations/UpdateAIAgentRequestMarshaller.cs index 00a7e530c314..46131d59fa3b 100644 --- a/sdk/src/Services/QConnect/Generated/Model/Internal/MarshallTransformations/UpdateAIAgentRequestMarshaller.cs +++ b/sdk/src/Services/QConnect/Generated/Model/Internal/MarshallTransformations/UpdateAIAgentRequestMarshaller.cs @@ -67,49 +67,52 @@ public IRequest Marshall(UpdateAIAgentRequest publicRequest) throw new AmazonQConnectException("Request object does not have required field AssistantId set"); request.AddPathResource("{assistantId}", StringUtils.FromString(publicRequest.AssistantId)); request.ResourcePath = "/assistants/{assistantId}/aiagents/{aiAgentId}"; - using (StringWriter stringWriter = new StringWriter(CultureInfo.InvariantCulture)) + using (MemoryStream memoryStream = new MemoryStream()) { - JsonWriter writer = new JsonWriter(stringWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetClientToken()) + using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) { - context.Writer.WritePropertyName("clientToken"); - context.Writer.Write(publicRequest.ClientToken); + JsonWriter writer = new JsonWriter(streamWriter); + writer.Validate = false; + writer.WriteObjectStart(); + var context = new JsonMarshallerContext(request, writer); + if(publicRequest.IsSetClientToken()) + { + context.Writer.WritePropertyName("clientToken"); + context.Writer.Write(publicRequest.ClientToken); + } + + else if(!(publicRequest.IsSetClientToken())) + { + context.Writer.WritePropertyName("clientToken"); + context.Writer.Write(Guid.NewGuid().ToString()); + } + if(publicRequest.IsSetConfiguration()) + { + context.Writer.WritePropertyName("configuration"); + context.Writer.WriteObjectStart(); + + var marshaller = AIAgentConfigurationMarshaller.Instance; + marshaller.Marshall(publicRequest.Configuration, context); + + context.Writer.WriteObjectEnd(); + } + + if(publicRequest.IsSetDescription()) + { + context.Writer.WritePropertyName("description"); + context.Writer.Write(publicRequest.Description); + } + + if(publicRequest.IsSetVisibilityStatus()) + { + context.Writer.WritePropertyName("visibilityStatus"); + context.Writer.Write(publicRequest.VisibilityStatus); + } + + writer.WriteObjectEnd(); } - else if(!(publicRequest.IsSetClientToken())) - { - context.Writer.WritePropertyName("clientToken"); - context.Writer.Write(Guid.NewGuid().ToString()); - } - if(publicRequest.IsSetConfiguration()) - { - context.Writer.WritePropertyName("configuration"); - context.Writer.WriteObjectStart(); - - var marshaller = AIAgentConfigurationMarshaller.Instance; - marshaller.Marshall(publicRequest.Configuration, context); - - context.Writer.WriteObjectEnd(); - } - - if(publicRequest.IsSetDescription()) - { - context.Writer.WritePropertyName("description"); - context.Writer.Write(publicRequest.Description); - } - - if(publicRequest.IsSetVisibilityStatus()) - { - context.Writer.WritePropertyName("visibilityStatus"); - context.Writer.Write(publicRequest.VisibilityStatus); - } - - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); + request.Content = memoryStream.ToArray(); } diff --git a/sdk/src/Services/QConnect/Generated/Model/Internal/MarshallTransformations/UpdateAIPromptRequestMarshaller.cs b/sdk/src/Services/QConnect/Generated/Model/Internal/MarshallTransformations/UpdateAIPromptRequestMarshaller.cs index 45320b283cc0..ec4721302da3 100644 --- a/sdk/src/Services/QConnect/Generated/Model/Internal/MarshallTransformations/UpdateAIPromptRequestMarshaller.cs +++ b/sdk/src/Services/QConnect/Generated/Model/Internal/MarshallTransformations/UpdateAIPromptRequestMarshaller.cs @@ -67,49 +67,52 @@ public IRequest Marshall(UpdateAIPromptRequest publicRequest) throw new AmazonQConnectException("Request object does not have required field AssistantId set"); request.AddPathResource("{assistantId}", StringUtils.FromString(publicRequest.AssistantId)); request.ResourcePath = "/assistants/{assistantId}/aiprompts/{aiPromptId}"; - using (StringWriter stringWriter = new StringWriter(CultureInfo.InvariantCulture)) + using (MemoryStream memoryStream = new MemoryStream()) { - JsonWriter writer = new JsonWriter(stringWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetClientToken()) + using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) { - context.Writer.WritePropertyName("clientToken"); - context.Writer.Write(publicRequest.ClientToken); + JsonWriter writer = new JsonWriter(streamWriter); + writer.Validate = false; + writer.WriteObjectStart(); + var context = new JsonMarshallerContext(request, writer); + if(publicRequest.IsSetClientToken()) + { + context.Writer.WritePropertyName("clientToken"); + context.Writer.Write(publicRequest.ClientToken); + } + + else if(!(publicRequest.IsSetClientToken())) + { + context.Writer.WritePropertyName("clientToken"); + context.Writer.Write(Guid.NewGuid().ToString()); + } + if(publicRequest.IsSetDescription()) + { + context.Writer.WritePropertyName("description"); + context.Writer.Write(publicRequest.Description); + } + + if(publicRequest.IsSetTemplateConfiguration()) + { + context.Writer.WritePropertyName("templateConfiguration"); + context.Writer.WriteObjectStart(); + + var marshaller = AIPromptTemplateConfigurationMarshaller.Instance; + marshaller.Marshall(publicRequest.TemplateConfiguration, context); + + context.Writer.WriteObjectEnd(); + } + + if(publicRequest.IsSetVisibilityStatus()) + { + context.Writer.WritePropertyName("visibilityStatus"); + context.Writer.Write(publicRequest.VisibilityStatus); + } + + writer.WriteObjectEnd(); } - else if(!(publicRequest.IsSetClientToken())) - { - context.Writer.WritePropertyName("clientToken"); - context.Writer.Write(Guid.NewGuid().ToString()); - } - if(publicRequest.IsSetDescription()) - { - context.Writer.WritePropertyName("description"); - context.Writer.Write(publicRequest.Description); - } - - if(publicRequest.IsSetTemplateConfiguration()) - { - context.Writer.WritePropertyName("templateConfiguration"); - context.Writer.WriteObjectStart(); - - var marshaller = AIPromptTemplateConfigurationMarshaller.Instance; - marshaller.Marshall(publicRequest.TemplateConfiguration, context); - - context.Writer.WriteObjectEnd(); - } - - if(publicRequest.IsSetVisibilityStatus()) - { - context.Writer.WritePropertyName("visibilityStatus"); - context.Writer.Write(publicRequest.VisibilityStatus); - } - - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); + request.Content = memoryStream.ToArray(); } diff --git a/sdk/src/Services/QConnect/Generated/Model/Internal/MarshallTransformations/UpdateAssistantAIAgentRequestMarshaller.cs b/sdk/src/Services/QConnect/Generated/Model/Internal/MarshallTransformations/UpdateAssistantAIAgentRequestMarshaller.cs index 5eb9f608ace1..2ddf943c7a76 100644 --- a/sdk/src/Services/QConnect/Generated/Model/Internal/MarshallTransformations/UpdateAssistantAIAgentRequestMarshaller.cs +++ b/sdk/src/Services/QConnect/Generated/Model/Internal/MarshallTransformations/UpdateAssistantAIAgentRequestMarshaller.cs @@ -64,32 +64,35 @@ public IRequest Marshall(UpdateAssistantAIAgentRequest publicRequest) throw new AmazonQConnectException("Request object does not have required field AssistantId set"); request.AddPathResource("{assistantId}", StringUtils.FromString(publicRequest.AssistantId)); request.ResourcePath = "/assistants/{assistantId}/aiagentConfiguration"; - using (StringWriter stringWriter = new StringWriter(CultureInfo.InvariantCulture)) + using (MemoryStream memoryStream = new MemoryStream()) { - JsonWriter writer = new JsonWriter(stringWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetAiAgentType()) + using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) { - context.Writer.WritePropertyName("aiAgentType"); - context.Writer.Write(publicRequest.AiAgentType); - } + JsonWriter writer = new JsonWriter(streamWriter); + writer.Validate = false; + writer.WriteObjectStart(); + var context = new JsonMarshallerContext(request, writer); + if(publicRequest.IsSetAiAgentType()) + { + context.Writer.WritePropertyName("aiAgentType"); + context.Writer.Write(publicRequest.AiAgentType); + } - if(publicRequest.IsSetConfiguration()) - { - context.Writer.WritePropertyName("configuration"); - context.Writer.WriteObjectStart(); + if(publicRequest.IsSetConfiguration()) + { + context.Writer.WritePropertyName("configuration"); + context.Writer.WriteObjectStart(); + + var marshaller = AIAgentConfigurationDataMarshaller.Instance; + marshaller.Marshall(publicRequest.Configuration, context); - var marshaller = AIAgentConfigurationDataMarshaller.Instance; - marshaller.Marshall(publicRequest.Configuration, context); + context.Writer.WriteObjectEnd(); + } - context.Writer.WriteObjectEnd(); + writer.WriteObjectEnd(); } - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); + request.Content = memoryStream.ToArray(); } diff --git a/sdk/src/Services/QConnect/Generated/Model/Internal/MarshallTransformations/UpdateSessionDataRequestMarshaller.cs b/sdk/src/Services/QConnect/Generated/Model/Internal/MarshallTransformations/UpdateSessionDataRequestMarshaller.cs index 231b919149b5..97fac0abca4c 100644 --- a/sdk/src/Services/QConnect/Generated/Model/Internal/MarshallTransformations/UpdateSessionDataRequestMarshaller.cs +++ b/sdk/src/Services/QConnect/Generated/Model/Internal/MarshallTransformations/UpdateSessionDataRequestMarshaller.cs @@ -67,37 +67,40 @@ public IRequest Marshall(UpdateSessionDataRequest publicRequest) throw new AmazonQConnectException("Request object does not have required field SessionId set"); request.AddPathResource("{sessionId}", StringUtils.FromString(publicRequest.SessionId)); request.ResourcePath = "/assistants/{assistantId}/sessions/{sessionId}/data"; - using (StringWriter stringWriter = new StringWriter(CultureInfo.InvariantCulture)) + using (MemoryStream memoryStream = new MemoryStream()) { - JsonWriter writer = new JsonWriter(stringWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetData()) + using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) { - context.Writer.WritePropertyName("data"); - context.Writer.WriteArrayStart(); - foreach(var publicRequestDataListValue in publicRequest.Data) + JsonWriter writer = new JsonWriter(streamWriter); + writer.Validate = false; + writer.WriteObjectStart(); + var context = new JsonMarshallerContext(request, writer); + if(publicRequest.IsSetData()) { - context.Writer.WriteObjectStart(); + context.Writer.WritePropertyName("data"); + context.Writer.WriteArrayStart(); + foreach(var publicRequestDataListValue in publicRequest.Data) + { + context.Writer.WriteObjectStart(); - var marshaller = RuntimeSessionDataMarshaller.Instance; - marshaller.Marshall(publicRequestDataListValue, context); + var marshaller = RuntimeSessionDataMarshaller.Instance; + marshaller.Marshall(publicRequestDataListValue, context); - context.Writer.WriteObjectEnd(); + context.Writer.WriteObjectEnd(); + } + context.Writer.WriteArrayEnd(); } - context.Writer.WriteArrayEnd(); - } - if(publicRequest.IsSetNamespace()) - { - context.Writer.WritePropertyName("namespace"); - context.Writer.Write(publicRequest.Namespace); + if(publicRequest.IsSetNamespace()) + { + context.Writer.WritePropertyName("namespace"); + context.Writer.Write(publicRequest.Namespace); + } + + writer.WriteObjectEnd(); } - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); + request.Content = memoryStream.ToArray(); } diff --git a/sdk/src/Services/QConnect/Generated/Model/Internal/MarshallTransformations/UpdateSessionRequestMarshaller.cs b/sdk/src/Services/QConnect/Generated/Model/Internal/MarshallTransformations/UpdateSessionRequestMarshaller.cs index f3cb482f1822..af78d00ddf9c 100644 --- a/sdk/src/Services/QConnect/Generated/Model/Internal/MarshallTransformations/UpdateSessionRequestMarshaller.cs +++ b/sdk/src/Services/QConnect/Generated/Model/Internal/MarshallTransformations/UpdateSessionRequestMarshaller.cs @@ -69,45 +69,31 @@ public IRequest Marshall(UpdateSessionRequest publicRequest) request.ResourcePath = "/assistants/{assistantId}/sessions/{sessionId}"; using (MemoryStream memoryStream = new MemoryStream()) { -<<<<<<< HEAD using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) -||||||| Commit version number update changes - JsonWriter writer = new JsonWriter(stringWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetDescription()) -======= - JsonWriter writer = new JsonWriter(stringWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetAiAgentConfiguration()) { - context.Writer.WritePropertyName("aiAgentConfiguration"); - context.Writer.WriteObjectStart(); - foreach (var publicRequestAiAgentConfigurationKvp in publicRequest.AiAgentConfiguration) + JsonWriter writer = new JsonWriter(streamWriter); + writer.Validate = false; + writer.WriteObjectStart(); + var context = new JsonMarshallerContext(request, writer); + if(publicRequest.IsSetAiAgentConfiguration()) { - context.Writer.WritePropertyName(publicRequestAiAgentConfigurationKvp.Key); - var publicRequestAiAgentConfigurationValue = publicRequestAiAgentConfigurationKvp.Value; - + context.Writer.WritePropertyName("aiAgentConfiguration"); context.Writer.WriteObjectStart(); + foreach (var publicRequestAiAgentConfigurationKvp in publicRequest.AiAgentConfiguration) + { + context.Writer.WritePropertyName(publicRequestAiAgentConfigurationKvp.Key); + var publicRequestAiAgentConfigurationValue = publicRequestAiAgentConfigurationKvp.Value; + + context.Writer.WriteObjectStart(); - var marshaller = AIAgentConfigurationDataMarshaller.Instance; - marshaller.Marshall(publicRequestAiAgentConfigurationValue, context); + var marshaller = AIAgentConfigurationDataMarshaller.Instance; + marshaller.Marshall(publicRequestAiAgentConfigurationValue, context); + context.Writer.WriteObjectEnd(); + } context.Writer.WriteObjectEnd(); } - context.Writer.WriteObjectEnd(); - } - if(publicRequest.IsSetDescription()) ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b - { - JsonWriter writer = new JsonWriter(streamWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); if(publicRequest.IsSetDescription()) { context.Writer.WritePropertyName("description"); diff --git a/sdk/src/Services/QConnect/Generated/Model/Internal/MarshallTransformations/WebCrawlerLimitsMarshaller.cs b/sdk/src/Services/QConnect/Generated/Model/Internal/MarshallTransformations/WebCrawlerLimitsMarshaller.cs index 07777ae5c98b..b9fa968de88b 100644 --- a/sdk/src/Services/QConnect/Generated/Model/Internal/MarshallTransformations/WebCrawlerLimitsMarshaller.cs +++ b/sdk/src/Services/QConnect/Generated/Model/Internal/MarshallTransformations/WebCrawlerLimitsMarshaller.cs @@ -51,7 +51,7 @@ public void Marshall(WebCrawlerLimits requestObject, JsonMarshallerContext conte if(requestObject.IsSetRateLimit()) { context.Writer.WritePropertyName("rateLimit"); - context.Writer.Write(requestObject.RateLimit); + context.Writer.Write(requestObject.RateLimit.Value); } } diff --git a/sdk/src/Services/QConnect/Generated/Model/Internal/MarshallTransformations/WebCrawlerLimitsUnmarshaller.cs b/sdk/src/Services/QConnect/Generated/Model/Internal/MarshallTransformations/WebCrawlerLimitsUnmarshaller.cs index adef6939ee64..5a5e971420b6 100644 --- a/sdk/src/Services/QConnect/Generated/Model/Internal/MarshallTransformations/WebCrawlerLimitsUnmarshaller.cs +++ b/sdk/src/Services/QConnect/Generated/Model/Internal/MarshallTransformations/WebCrawlerLimitsUnmarshaller.cs @@ -68,7 +68,7 @@ public WebCrawlerLimits Unmarshall(JsonUnmarshallerContext context) { if (context.TestExpression("rateLimit", targetDepth)) { - var unmarshaller = IntUnmarshaller.Instance; + var unmarshaller = NullableIntUnmarshaller.Instance; unmarshalledObject.RateLimit = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/QConnect/Generated/Model/KnowledgeBaseAssociationConfigurationData.cs b/sdk/src/Services/QConnect/Generated/Model/KnowledgeBaseAssociationConfigurationData.cs index 646d40ab04fc..90d1d4d6a1d7 100644 --- a/sdk/src/Services/QConnect/Generated/Model/KnowledgeBaseAssociationConfigurationData.cs +++ b/sdk/src/Services/QConnect/Generated/Model/KnowledgeBaseAssociationConfigurationData.cs @@ -61,9 +61,9 @@ internal bool IsSetContentTagFilter() /// ///     [AWSProperty(Min=1, Max=100)] - public int MaxResults + public int? MaxResults { - get { return this._maxResults.GetValueOrDefault(); } + get { return this._maxResults; } set { this._maxResults = value; } } diff --git a/sdk/src/Services/QConnect/Generated/Model/ListAIAgentVersionsRequest.cs b/sdk/src/Services/QConnect/Generated/Model/ListAIAgentVersionsRequest.cs index f5055a5505ad..59b6bf8e39db 100644 --- a/sdk/src/Services/QConnect/Generated/Model/ListAIAgentVersionsRequest.cs +++ b/sdk/src/Services/QConnect/Generated/Model/ListAIAgentVersionsRequest.cs @@ -87,9 +87,9 @@ internal bool IsSetAssistantId() /// ///     [AWSProperty(Min=1, Max=100)] - public int MaxResults + public int? MaxResults { - get { return this._maxResults.GetValueOrDefault(); } + get { return this._maxResults; } set { this._maxResults = value; } } diff --git a/sdk/src/Services/QConnect/Generated/Model/ListAIAgentsRequest.cs b/sdk/src/Services/QConnect/Generated/Model/ListAIAgentsRequest.cs index 51e6ff0dbf37..d900d52065e4 100644 --- a/sdk/src/Services/QConnect/Generated/Model/ListAIAgentsRequest.cs +++ b/sdk/src/Services/QConnect/Generated/Model/ListAIAgentsRequest.cs @@ -67,9 +67,9 @@ internal bool IsSetAssistantId() ///     ///     [AWSProperty(Min=1, Max=100)] - public int MaxResults + public int? MaxResults { - get { return this._maxResults.GetValueOrDefault(); } + get { return this._maxResults; } set { this._maxResults = value; } } diff --git a/sdk/src/Services/QConnect/Generated/Model/ListAIPromptVersionsRequest.cs b/sdk/src/Services/QConnect/Generated/Model/ListAIPromptVersionsRequest.cs index ab7c21845499..a6c1d0747885 100644 --- a/sdk/src/Services/QConnect/Generated/Model/ListAIPromptVersionsRequest.cs +++ b/sdk/src/Services/QConnect/Generated/Model/ListAIPromptVersionsRequest.cs @@ -87,9 +87,9 @@ internal bool IsSetAssistantId() ///     ///     [AWSProperty(Min=1, Max=100)] - public int MaxResults + public int? MaxResults { - get { return this._maxResults.GetValueOrDefault(); } + get { return this._maxResults; } set { this._maxResults = value; } } diff --git a/sdk/src/Services/QConnect/Generated/Model/ListAIPromptsRequest.cs b/sdk/src/Services/QConnect/Generated/Model/ListAIPromptsRequest.cs index 38e76455a1fb..7f37c8bd4e25 100644 --- a/sdk/src/Services/QConnect/Generated/Model/ListAIPromptsRequest.cs +++ b/sdk/src/Services/QConnect/Generated/Model/ListAIPromptsRequest.cs @@ -67,9 +67,9 @@ internal bool IsSetAssistantId() ///     ///     [AWSProperty(Min=1, Max=100)] - public int MaxResults + public int? MaxResults { - get { return this._maxResults.GetValueOrDefault(); } + get { return this._maxResults; } set { this._maxResults = value; } } diff --git a/sdk/src/Services/QConnect/Generated/Model/SemanticChunkingConfiguration.cs b/sdk/src/Services/QConnect/Generated/Model/SemanticChunkingConfiguration.cs index 073287ddeed5..1cc65577d310 100644 --- a/sdk/src/Services/QConnect/Generated/Model/SemanticChunkingConfiguration.cs +++ b/sdk/src/Services/QConnect/Generated/Model/SemanticChunkingConfiguration.cs @@ -47,9 +47,9 @@ public partial class SemanticChunkingConfiguration ///     ///     [AWSProperty(Required=true, Min=50, Max=99)] - public int BreakpointPercentileThreshold + public int? BreakpointPercentileThreshold { - get { return this._breakpointPercentileThreshold.GetValueOrDefault(); } + get { return this._breakpointPercentileThreshold; } set { this._breakpointPercentileThreshold = value; } } @@ -66,9 +66,9 @@ internal bool IsSetBreakpointPercentileThreshold() ///     ///     [AWSProperty(Required=true, Min=0, Max=1)] - public int BufferSize + public int? BufferSize { - get { return this._bufferSize.GetValueOrDefault(); } + get { return this._bufferSize; } set { this._bufferSize = value; } } @@ -85,9 +85,9 @@ internal bool IsSetBufferSize() ///     ///     [AWSProperty(Required=true, Min=1)] - public int MaxTokens + public int? MaxTokens { - get { return this._maxTokens.GetValueOrDefault(); } + get { return this._maxTokens; } set { this._maxTokens = value; } } diff --git a/sdk/src/Services/QConnect/Generated/Model/WebCrawlerLimits.cs b/sdk/src/Services/QConnect/Generated/Model/WebCrawlerLimits.cs index bc431ffaf89d..bed2c52e33b4 100644 --- a/sdk/src/Services/QConnect/Generated/Model/WebCrawlerLimits.cs +++ b/sdk/src/Services/QConnect/Generated/Model/WebCrawlerLimits.cs @@ -43,9 +43,9 @@ public partial class WebCrawlerLimits ///     ///     [AWSProperty(Min=1, Max=300)] - public int RateLimit + public int? RateLimit { - get { return this._rateLimit.GetValueOrDefault(); } + get { return this._rateLimit; } set { this._rateLimit = value; } } diff --git a/sdk/src/Services/QConnect/Generated/Model/_bcl45+netstandard/IListAIAgentVersionsPaginator.cs b/sdk/src/Services/QConnect/Generated/Model/_bcl+netstandard/IListAIAgentVersionsPaginator.cs similarity index 100% rename from sdk/src/Services/QConnect/Generated/Model/_bcl45+netstandard/IListAIAgentVersionsPaginator.cs rename to sdk/src/Services/QConnect/Generated/Model/_bcl+netstandard/IListAIAgentVersionsPaginator.cs diff --git a/sdk/src/Services/QConnect/Generated/Model/_bcl45+netstandard/IListAIAgentsPaginator.cs b/sdk/src/Services/QConnect/Generated/Model/_bcl+netstandard/IListAIAgentsPaginator.cs similarity index 100% rename from sdk/src/Services/QConnect/Generated/Model/_bcl45+netstandard/IListAIAgentsPaginator.cs rename to sdk/src/Services/QConnect/Generated/Model/_bcl+netstandard/IListAIAgentsPaginator.cs diff --git a/sdk/src/Services/QConnect/Generated/Model/_bcl45+netstandard/IListAIPromptVersionsPaginator.cs b/sdk/src/Services/QConnect/Generated/Model/_bcl+netstandard/IListAIPromptVersionsPaginator.cs similarity index 100% rename from sdk/src/Services/QConnect/Generated/Model/_bcl45+netstandard/IListAIPromptVersionsPaginator.cs rename to sdk/src/Services/QConnect/Generated/Model/_bcl+netstandard/IListAIPromptVersionsPaginator.cs diff --git a/sdk/src/Services/QConnect/Generated/Model/_bcl45+netstandard/IListAIPromptsPaginator.cs b/sdk/src/Services/QConnect/Generated/Model/_bcl+netstandard/IListAIPromptsPaginator.cs similarity index 100% rename from sdk/src/Services/QConnect/Generated/Model/_bcl45+netstandard/IListAIPromptsPaginator.cs rename to sdk/src/Services/QConnect/Generated/Model/_bcl+netstandard/IListAIPromptsPaginator.cs diff --git a/sdk/src/Services/QConnect/Generated/Model/_bcl45+netstandard/ListAIAgentVersionsPaginator.cs b/sdk/src/Services/QConnect/Generated/Model/_bcl+netstandard/ListAIAgentVersionsPaginator.cs similarity index 100% rename from sdk/src/Services/QConnect/Generated/Model/_bcl45+netstandard/ListAIAgentVersionsPaginator.cs rename to sdk/src/Services/QConnect/Generated/Model/_bcl+netstandard/ListAIAgentVersionsPaginator.cs diff --git a/sdk/src/Services/QConnect/Generated/Model/_bcl45+netstandard/ListAIAgentsPaginator.cs b/sdk/src/Services/QConnect/Generated/Model/_bcl+netstandard/ListAIAgentsPaginator.cs similarity index 100% rename from sdk/src/Services/QConnect/Generated/Model/_bcl45+netstandard/ListAIAgentsPaginator.cs rename to sdk/src/Services/QConnect/Generated/Model/_bcl+netstandard/ListAIAgentsPaginator.cs diff --git a/sdk/src/Services/QConnect/Generated/Model/_bcl45+netstandard/ListAIPromptVersionsPaginator.cs b/sdk/src/Services/QConnect/Generated/Model/_bcl+netstandard/ListAIPromptVersionsPaginator.cs similarity index 100% rename from sdk/src/Services/QConnect/Generated/Model/_bcl45+netstandard/ListAIPromptVersionsPaginator.cs rename to sdk/src/Services/QConnect/Generated/Model/_bcl+netstandard/ListAIPromptVersionsPaginator.cs diff --git a/sdk/src/Services/QConnect/Generated/Model/_bcl45+netstandard/ListAIPromptsPaginator.cs b/sdk/src/Services/QConnect/Generated/Model/_bcl+netstandard/ListAIPromptsPaginator.cs similarity index 100% rename from sdk/src/Services/QConnect/Generated/Model/_bcl45+netstandard/ListAIPromptsPaginator.cs rename to sdk/src/Services/QConnect/Generated/Model/_bcl+netstandard/ListAIPromptsPaginator.cs diff --git a/sdk/src/Services/QConnect/Generated/_bcl/AmazonQConnectClient.cs b/sdk/src/Services/QConnect/Generated/_bcl/AmazonQConnectClient.cs index 6c97a99456d5..ee783507e43d 100644 --- a/sdk/src/Services/QConnect/Generated/_bcl/AmazonQConnectClient.cs +++ b/sdk/src/Services/QConnect/Generated/_bcl/AmazonQConnectClient.cs @@ -40,7 +40,17 @@ namespace Amazon.QConnect /// /// Implementation for accessing QConnect /// - /// + /// /// /// Powered by Amazon Bedrock: Amazon Web Services implements automated /// abuse detection. Because Amazon Q in Connect is built on Amazon Bedrock, users @@ -296,15 +306,15 @@ protected override void Dispose(bool disposing) #endregion - #region CreateAssistant + #region CreateAIAgent /// - /// Creates an Amazon Q in Connect assistant. + /// Creates an Amazon Q in Connect AI Agent. /// - /// Container for the necessary parameters to execute the CreateAssistant service method. + /// Container for the necessary parameters to execute the CreateAIAgent service method. /// - /// The response from the CreateAssistant service method, as returned by QConnect. + /// The response from the CreateAIAgent service method, as returned by QConnect. /// /// You do not have sufficient access to perform this action. /// @@ -314,33 +324,39 @@ protected override void Dispose(bool disposing) /// that accepts name, a conflicting resource (usually with the same name) is being created /// or mutated. /// + /// + /// The specified resource does not exist. + /// /// /// You've exceeded your service quota. To perform the requested action, remove some of /// the relevant resources, or use service quotas to request a service quota increase. /// + /// + /// The throttling limit has been exceeded. + /// /// /// The input fails to satisfy the constraints specified by a service. /// - /// REST API Reference for CreateAssistant Operation - public virtual CreateAssistantResponse CreateAssistant(CreateAssistantRequest request) + /// REST API Reference for CreateAIAgent Operation + public virtual CreateAIAgentResponse CreateAIAgent(CreateAIAgentRequest request) { var options = new InvokeOptions(); - options.RequestMarshaller = CreateAssistantRequestMarshaller.Instance; - options.ResponseUnmarshaller = CreateAssistantResponseUnmarshaller.Instance; + options.RequestMarshaller = CreateAIAgentRequestMarshaller.Instance; + options.ResponseUnmarshaller = CreateAIAgentResponseUnmarshaller.Instance; - return Invoke(request, options); + return Invoke(request, options); } /// - /// Creates an Amazon Q in Connect assistant. + /// Creates an Amazon Q in Connect AI Agent. /// - /// Container for the necessary parameters to execute the CreateAssistant service method. + /// Container for the necessary parameters to execute the CreateAIAgent service method. /// /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// /// - /// The response from the CreateAssistant service method, as returned by QConnect. + /// The response from the CreateAIAgent service method, as returned by QConnect. /// /// You do not have sufficient access to perform this action. /// @@ -350,36 +366,40 @@ public virtual CreateAssistantResponse CreateAssistant(CreateAssistantRequest re /// that accepts name, a conflicting resource (usually with the same name) is being created /// or mutated. /// + /// + /// The specified resource does not exist. + /// /// /// You've exceeded your service quota. To perform the requested action, remove some of /// the relevant resources, or use service quotas to request a service quota increase. /// + /// + /// The throttling limit has been exceeded. + /// /// /// The input fails to satisfy the constraints specified by a service. /// - /// REST API Reference for CreateAssistant Operation - public virtual Task CreateAssistantAsync(CreateAssistantRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + /// REST API Reference for CreateAIAgent Operation + public virtual Task CreateAIAgentAsync(CreateAIAgentRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { var options = new InvokeOptions(); - options.RequestMarshaller = CreateAssistantRequestMarshaller.Instance; - options.ResponseUnmarshaller = CreateAssistantResponseUnmarshaller.Instance; + options.RequestMarshaller = CreateAIAgentRequestMarshaller.Instance; + options.ResponseUnmarshaller = CreateAIAgentResponseUnmarshaller.Instance; - return InvokeAsync(request, options, cancellationToken); + return InvokeAsync(request, options, cancellationToken); } #endregion - #region CreateAssistantAssociation + #region CreateAIAgentVersion /// - /// Creates an association between an Amazon Q in Connect assistant and another resource. - /// Currently, the only supported association is with a knowledge base. An assistant can - /// have only a single association. + /// Creates and Amazon Q in Connect AI Agent version. /// - /// Container for the necessary parameters to execute the CreateAssistantAssociation service method. + /// Container for the necessary parameters to execute the CreateAIAgentVersion service method. /// - /// The response from the CreateAssistantAssociation service method, as returned by QConnect. + /// The response from the CreateAIAgentVersion service method, as returned by QConnect. /// /// You do not have sufficient access to perform this action. /// @@ -396,31 +416,32 @@ public virtual CreateAssistantResponse CreateAssistant(CreateAssistantRequest re /// You've exceeded your service quota. To perform the requested action, remove some of /// the relevant resources, or use service quotas to request a service quota increase. /// + /// + /// The throttling limit has been exceeded. + /// /// /// The input fails to satisfy the constraints specified by a service. /// - /// REST API Reference for CreateAssistantAssociation Operation - public virtual CreateAssistantAssociationResponse CreateAssistantAssociation(CreateAssistantAssociationRequest request) + /// REST API Reference for CreateAIAgentVersion Operation + public virtual CreateAIAgentVersionResponse CreateAIAgentVersion(CreateAIAgentVersionRequest request) { var options = new InvokeOptions(); - options.RequestMarshaller = CreateAssistantAssociationRequestMarshaller.Instance; - options.ResponseUnmarshaller = CreateAssistantAssociationResponseUnmarshaller.Instance; + options.RequestMarshaller = CreateAIAgentVersionRequestMarshaller.Instance; + options.ResponseUnmarshaller = CreateAIAgentVersionResponseUnmarshaller.Instance; - return Invoke(request, options); + return Invoke(request, options); } /// - /// Creates an association between an Amazon Q in Connect assistant and another resource. - /// Currently, the only supported association is with a knowledge base. An assistant can - /// have only a single association. + /// Creates and Amazon Q in Connect AI Agent version. /// - /// Container for the necessary parameters to execute the CreateAssistantAssociation service method. + /// Container for the necessary parameters to execute the CreateAIAgentVersion service method. /// /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// /// - /// The response from the CreateAssistantAssociation service method, as returned by QConnect. + /// The response from the CreateAIAgentVersion service method, as returned by QConnect. /// /// You do not have sufficient access to perform this action. /// @@ -437,31 +458,33 @@ public virtual CreateAssistantAssociationResponse CreateAssistantAssociation(Cre /// You've exceeded your service quota. To perform the requested action, remove some of /// the relevant resources, or use service quotas to request a service quota increase. /// + /// + /// The throttling limit has been exceeded. + /// /// /// The input fails to satisfy the constraints specified by a service. /// - /// REST API Reference for CreateAssistantAssociation Operation - public virtual Task CreateAssistantAssociationAsync(CreateAssistantAssociationRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + /// REST API Reference for CreateAIAgentVersion Operation + public virtual Task CreateAIAgentVersionAsync(CreateAIAgentVersionRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { var options = new InvokeOptions(); - options.RequestMarshaller = CreateAssistantAssociationRequestMarshaller.Instance; - options.ResponseUnmarshaller = CreateAssistantAssociationResponseUnmarshaller.Instance; + options.RequestMarshaller = CreateAIAgentVersionRequestMarshaller.Instance; + options.ResponseUnmarshaller = CreateAIAgentVersionResponseUnmarshaller.Instance; - return InvokeAsync(request, options, cancellationToken); + return InvokeAsync(request, options, cancellationToken); } #endregion - #region CreateContent + #region CreateAIPrompt /// - /// Creates Amazon Q in Connect content. Before to calling this API, use StartContentUpload - /// to upload an asset. + /// Creates an Amazon Q in Connect AI Prompt. /// - /// Container for the necessary parameters to execute the CreateContent service method. + /// Container for the necessary parameters to execute the CreateAIPrompt service method. /// - /// The response from the CreateContent service method, as returned by QConnect. + /// The response from the CreateAIPrompt service method, as returned by QConnect. /// /// You do not have sufficient access to perform this action. /// @@ -478,30 +501,32 @@ public virtual CreateAssistantAssociationResponse CreateAssistantAssociation(Cre /// You've exceeded your service quota. To perform the requested action, remove some of /// the relevant resources, or use service quotas to request a service quota increase. /// + /// + /// The throttling limit has been exceeded. + /// /// /// The input fails to satisfy the constraints specified by a service. /// - /// REST API Reference for CreateContent Operation - public virtual CreateContentResponse CreateContent(CreateContentRequest request) + /// REST API Reference for CreateAIPrompt Operation + public virtual CreateAIPromptResponse CreateAIPrompt(CreateAIPromptRequest request) { var options = new InvokeOptions(); - options.RequestMarshaller = CreateContentRequestMarshaller.Instance; - options.ResponseUnmarshaller = CreateContentResponseUnmarshaller.Instance; + options.RequestMarshaller = CreateAIPromptRequestMarshaller.Instance; + options.ResponseUnmarshaller = CreateAIPromptResponseUnmarshaller.Instance; - return Invoke(request, options); + return Invoke(request, options); } /// - /// Creates Amazon Q in Connect content. Before to calling this API, use StartContentUpload - /// to upload an asset. + /// Creates an Amazon Q in Connect AI Prompt. /// - /// Container for the necessary parameters to execute the CreateContent service method. + /// Container for the necessary parameters to execute the CreateAIPrompt service method. /// /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// /// - /// The response from the CreateContent service method, as returned by QConnect. + /// The response from the CreateAIPrompt service method, as returned by QConnect. /// /// You do not have sufficient access to perform this action. /// @@ -518,59 +543,33 @@ public virtual CreateContentResponse CreateContent(CreateContentRequest request) /// You've exceeded your service quota. To perform the requested action, remove some of /// the relevant resources, or use service quotas to request a service quota increase. /// + /// + /// The throttling limit has been exceeded. + /// /// /// The input fails to satisfy the constraints specified by a service. /// - /// REST API Reference for CreateContent Operation - public virtual Task CreateContentAsync(CreateContentRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + /// REST API Reference for CreateAIPrompt Operation + public virtual Task CreateAIPromptAsync(CreateAIPromptRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { var options = new InvokeOptions(); - options.RequestMarshaller = CreateContentRequestMarshaller.Instance; - options.ResponseUnmarshaller = CreateContentResponseUnmarshaller.Instance; + options.RequestMarshaller = CreateAIPromptRequestMarshaller.Instance; + options.ResponseUnmarshaller = CreateAIPromptResponseUnmarshaller.Instance; - return InvokeAsync(request, options, cancellationToken); + return InvokeAsync(request, options, cancellationToken); } #endregion - #region CreateContentAssociation + #region CreateAIPromptVersion /// - /// Creates an association between a content resource in a knowledge base and step-by-step - /// guides. Step-by-step guides offer instructions to agents for resolving common - /// customer issues. You create a content association to integrate Amazon Q in Connect - /// and step-by-step guides. - /// - /// - /// - /// After you integrate Amazon Q and step-by-step guides, when Amazon Q provides a recommendation - /// to an agent based on the intent that it's detected, it also provides them with the - /// option to start the step-by-step guide that you have associated with the content. - /// - /// - /// - /// Note the following limitations: - /// - ///
    • - /// - /// You can create only one content association for each content resource in a knowledge - /// base. - /// - ///
    • - /// - /// You can associate a step-by-step guide with multiple content resources. - /// - ///
    - /// - /// For more information, see Integrate - /// Amazon Q in Connect with step-by-step guides in the Amazon Connect Administrator - /// Guide. - /// + /// Creates an Amazon Q in Connect AI Prompt version. ///     - /// Container for the necessary parameters to execute the CreateContentAssociation service method. + /// Container for the necessary parameters to execute the CreateAIPromptVersion service method. /// - /// The response from the CreateContentAssociation service method, as returned by QConnect. + /// The response from the CreateAIPromptVersion service method, as returned by QConnect. /// /// You do not have sufficient access to perform this action. /// @@ -593,55 +592,26 @@ public virtual CreateContentResponse CreateContent(CreateContentRequest request) /// /// The input fails to satisfy the constraints specified by a service. /// - /// REST API Reference for CreateContentAssociation Operation - public virtual CreateContentAssociationResponse CreateContentAssociation(CreateContentAssociationRequest request) + /// REST API Reference for CreateAIPromptVersion Operation + public virtual CreateAIPromptVersionResponse CreateAIPromptVersion(CreateAIPromptVersionRequest request) { var options = new InvokeOptions(); - options.RequestMarshaller = CreateContentAssociationRequestMarshaller.Instance; - options.ResponseUnmarshaller = CreateContentAssociationResponseUnmarshaller.Instance; + options.RequestMarshaller = CreateAIPromptVersionRequestMarshaller.Instance; + options.ResponseUnmarshaller = CreateAIPromptVersionResponseUnmarshaller.Instance; - return Invoke(request, options); + return Invoke(request, options); } /// - /// Creates an association between a content resource in a knowledge base and step-by-step - /// guides. Step-by-step guides offer instructions to agents for resolving common - /// customer issues. You create a content association to integrate Amazon Q in Connect - /// and step-by-step guides. - /// - /// - /// - /// After you integrate Amazon Q and step-by-step guides, when Amazon Q provides a recommendation - /// to an agent based on the intent that it's detected, it also provides them with the - /// option to start the step-by-step guide that you have associated with the content. - /// - /// - /// - /// Note the following limitations: - /// - ///
    • - /// - /// You can create only one content association for each content resource in a knowledge - /// base. - /// - ///
    • - /// - /// You can associate a step-by-step guide with multiple content resources. - /// - ///
    - /// - /// For more information, see Integrate - /// Amazon Q in Connect with step-by-step guides in the Amazon Connect Administrator - /// Guide. - /// + /// Creates an Amazon Q in Connect AI Prompt version. ///     - /// Container for the necessary parameters to execute the CreateContentAssociation service method. + /// Container for the necessary parameters to execute the CreateAIPromptVersion service method. /// /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// /// - /// The response from the CreateContentAssociation service method, as returned by QConnect. + /// The response from the CreateAIPromptVersion service method, as returned by QConnect. /// /// You do not have sufficient access to perform this action. /// @@ -664,58 +634,27 @@ public virtual CreateContentAssociationResponse CreateContentAssociation(CreateC /// /// The input fails to satisfy the constraints specified by a service. /// - /// REST API Reference for CreateContentAssociation Operation - public virtual Task CreateContentAssociationAsync(CreateContentAssociationRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + /// REST API Reference for CreateAIPromptVersion Operation + public virtual Task CreateAIPromptVersionAsync(CreateAIPromptVersionRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { var options = new InvokeOptions(); - options.RequestMarshaller = CreateContentAssociationRequestMarshaller.Instance; - options.ResponseUnmarshaller = CreateContentAssociationResponseUnmarshaller.Instance; + options.RequestMarshaller = CreateAIPromptVersionRequestMarshaller.Instance; + options.ResponseUnmarshaller = CreateAIPromptVersionResponseUnmarshaller.Instance; - return InvokeAsync(request, options, cancellationToken); + return InvokeAsync(request, options, cancellationToken); } #endregion - #region CreateKnowledgeBase + #region CreateAssistant /// - /// Creates a knowledge base. - /// - /// - /// - /// When using this API, you cannot reuse Amazon - /// AppIntegrations DataIntegrations with external knowledge bases such as Salesforce - /// and ServiceNow. If you do, you'll get an InvalidRequestException error. - /// - /// - /// - /// For example, you're programmatically managing your external knowledge base, and you - /// want to add or remove one of the fields that is being ingested from Salesforce. Do - /// the following: - /// - ///
    1. - /// - /// Call DeleteKnowledgeBase. - /// - ///
    2. - /// - /// Call DeleteDataIntegration. - /// - ///
    3. - /// - /// Call CreateDataIntegration - /// to recreate the DataIntegration or a create different one. - /// - ///
    4. - /// - /// Call CreateKnowledgeBase. - /// - ///
    + /// Creates an Amazon Q in Connect assistant. ///     - /// Container for the necessary parameters to execute the CreateKnowledgeBase service method. + /// Container for the necessary parameters to execute the CreateAssistant service method. /// - /// The response from the CreateKnowledgeBase service method, as returned by QConnect. + /// The response from the CreateAssistant service method, as returned by QConnect. /// /// You do not have sufficient access to perform this action. /// @@ -732,57 +671,26 @@ public virtual CreateContentAssociationResponse CreateContentAssociation(CreateC /// /// The input fails to satisfy the constraints specified by a service. /// - /// REST API Reference for CreateKnowledgeBase Operation - public virtual CreateKnowledgeBaseResponse CreateKnowledgeBase(CreateKnowledgeBaseRequest request) + /// REST API Reference for CreateAssistant Operation + public virtual CreateAssistantResponse CreateAssistant(CreateAssistantRequest request) { var options = new InvokeOptions(); - options.RequestMarshaller = CreateKnowledgeBaseRequestMarshaller.Instance; - options.ResponseUnmarshaller = CreateKnowledgeBaseResponseUnmarshaller.Instance; + options.RequestMarshaller = CreateAssistantRequestMarshaller.Instance; + options.ResponseUnmarshaller = CreateAssistantResponseUnmarshaller.Instance; - return Invoke(request, options); + return Invoke(request, options); } /// - /// Creates a knowledge base. - /// - /// - /// - /// When using this API, you cannot reuse Amazon - /// AppIntegrations DataIntegrations with external knowledge bases such as Salesforce - /// and ServiceNow. If you do, you'll get an InvalidRequestException error. - /// - /// - /// - /// For example, you're programmatically managing your external knowledge base, and you - /// want to add or remove one of the fields that is being ingested from Salesforce. Do - /// the following: - /// - ///
    1. - /// - /// Call DeleteKnowledgeBase. - /// - ///
    2. - /// - /// Call DeleteDataIntegration. - /// - ///
    3. - /// - /// Call CreateDataIntegration - /// to recreate the DataIntegration or a create different one. - /// - ///
    4. - /// - /// Call CreateKnowledgeBase. - /// - ///
    + /// Creates an Amazon Q in Connect assistant. ///     - /// Container for the necessary parameters to execute the CreateKnowledgeBase service method. + /// Container for the necessary parameters to execute the CreateAssistant service method. /// /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// /// - /// The response from the CreateKnowledgeBase service method, as returned by QConnect. + /// The response from the CreateAssistant service method, as returned by QConnect. /// /// You do not have sufficient access to perform this action. /// @@ -799,27 +707,29 @@ public virtual CreateKnowledgeBaseResponse CreateKnowledgeBase(CreateKnowledgeBa /// /// The input fails to satisfy the constraints specified by a service. /// - /// REST API Reference for CreateKnowledgeBase Operation - public virtual Task CreateKnowledgeBaseAsync(CreateKnowledgeBaseRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + /// REST API Reference for CreateAssistant Operation + public virtual Task CreateAssistantAsync(CreateAssistantRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { var options = new InvokeOptions(); - options.RequestMarshaller = CreateKnowledgeBaseRequestMarshaller.Instance; - options.ResponseUnmarshaller = CreateKnowledgeBaseResponseUnmarshaller.Instance; + options.RequestMarshaller = CreateAssistantRequestMarshaller.Instance; + options.ResponseUnmarshaller = CreateAssistantResponseUnmarshaller.Instance; - return InvokeAsync(request, options, cancellationToken); + return InvokeAsync(request, options, cancellationToken); } #endregion - #region CreateQuickResponse + #region CreateAssistantAssociation /// - /// Creates an Amazon Q in Connect quick response. + /// Creates an association between an Amazon Q in Connect assistant and another resource. + /// Currently, the only supported association is with a knowledge base. An assistant can + /// have only a single association. /// - /// Container for the necessary parameters to execute the CreateQuickResponse service method. + /// Container for the necessary parameters to execute the CreateAssistantAssociation service method. /// - /// The response from the CreateQuickResponse service method, as returned by QConnect. + /// The response from the CreateAssistantAssociation service method, as returned by QConnect. /// /// You do not have sufficient access to perform this action. /// @@ -839,26 +749,28 @@ public virtual CreateKnowledgeBaseResponse CreateKnowledgeBase(CreateKnowledgeBa /// /// The input fails to satisfy the constraints specified by a service. /// - /// REST API Reference for CreateQuickResponse Operation - public virtual CreateQuickResponseResponse CreateQuickResponse(CreateQuickResponseRequest request) + /// REST API Reference for CreateAssistantAssociation Operation + public virtual CreateAssistantAssociationResponse CreateAssistantAssociation(CreateAssistantAssociationRequest request) { var options = new InvokeOptions(); - options.RequestMarshaller = CreateQuickResponseRequestMarshaller.Instance; - options.ResponseUnmarshaller = CreateQuickResponseResponseUnmarshaller.Instance; + options.RequestMarshaller = CreateAssistantAssociationRequestMarshaller.Instance; + options.ResponseUnmarshaller = CreateAssistantAssociationResponseUnmarshaller.Instance; - return Invoke(request, options); + return Invoke(request, options); } /// - /// Creates an Amazon Q in Connect quick response. + /// Creates an association between an Amazon Q in Connect assistant and another resource. + /// Currently, the only supported association is with a knowledge base. An assistant can + /// have only a single association. /// - /// Container for the necessary parameters to execute the CreateQuickResponse service method. + /// Container for the necessary parameters to execute the CreateAssistantAssociation service method. /// /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// /// - /// The response from the CreateQuickResponse service method, as returned by QConnect. + /// The response from the CreateAssistantAssociation service method, as returned by QConnect. /// /// You do not have sufficient access to perform this action. /// @@ -878,29 +790,28 @@ public virtual CreateQuickResponseResponse CreateQuickResponse(CreateQuickRespon /// /// The input fails to satisfy the constraints specified by a service. /// - /// REST API Reference for CreateQuickResponse Operation - public virtual Task CreateQuickResponseAsync(CreateQuickResponseRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + /// REST API Reference for CreateAssistantAssociation Operation + public virtual Task CreateAssistantAssociationAsync(CreateAssistantAssociationRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { var options = new InvokeOptions(); - options.RequestMarshaller = CreateQuickResponseRequestMarshaller.Instance; - options.ResponseUnmarshaller = CreateQuickResponseResponseUnmarshaller.Instance; + options.RequestMarshaller = CreateAssistantAssociationRequestMarshaller.Instance; + options.ResponseUnmarshaller = CreateAssistantAssociationResponseUnmarshaller.Instance; - return InvokeAsync(request, options, cancellationToken); + return InvokeAsync(request, options, cancellationToken); } #endregion - #region CreateSession + #region CreateContent /// - /// Creates a session. A session is a contextual container used for generating recommendations. - /// Amazon Connect creates a new Amazon Q in Connect session for each contact on which - /// Amazon Q in Connect is enabled. + /// Creates Amazon Q in Connect content. Before to calling this API, use StartContentUpload + /// to upload an asset. /// - /// Container for the necessary parameters to execute the CreateSession service method. + /// Container for the necessary parameters to execute the CreateContent service method. /// - /// The response from the CreateSession service method, as returned by QConnect. + /// The response from the CreateContent service method, as returned by QConnect. /// /// You do not have sufficient access to perform this action. /// @@ -913,31 +824,1172 @@ public virtual CreateQuickResponseResponse CreateQuickResponse(CreateQuickRespon /// /// The specified resource does not exist. /// + /// + /// You've exceeded your service quota. To perform the requested action, remove some of + /// the relevant resources, or use service quotas to request a service quota increase. + /// /// /// The input fails to satisfy the constraints specified by a service. /// - /// REST API Reference for CreateSession Operation - public virtual CreateSessionResponse CreateSession(CreateSessionRequest request) + /// REST API Reference for CreateContent Operation + public virtual CreateContentResponse CreateContent(CreateContentRequest request) { var options = new InvokeOptions(); - options.RequestMarshaller = CreateSessionRequestMarshaller.Instance; - options.ResponseUnmarshaller = CreateSessionResponseUnmarshaller.Instance; + options.RequestMarshaller = CreateContentRequestMarshaller.Instance; + options.ResponseUnmarshaller = CreateContentResponseUnmarshaller.Instance; - return Invoke(request, options); + return Invoke(request, options); } /// - /// Creates a session. A session is a contextual container used for generating recommendations. - /// Amazon Connect creates a new Amazon Q in Connect session for each contact on which - /// Amazon Q in Connect is enabled. + /// Creates Amazon Q in Connect content. Before to calling this API, use StartContentUpload + /// to upload an asset. + /// + /// Container for the necessary parameters to execute the CreateContent service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the CreateContent service method, as returned by QConnect. + /// + /// You do not have sufficient access to perform this action. + /// + /// + /// The request could not be processed because of conflict in the current state of the + /// resource. For example, if you're using a Create API (such as CreateAssistant) + /// that accepts name, a conflicting resource (usually with the same name) is being created + /// or mutated. + /// + /// + /// The specified resource does not exist. + /// + /// + /// You've exceeded your service quota. To perform the requested action, remove some of + /// the relevant resources, or use service quotas to request a service quota increase. + /// + /// + /// The input fails to satisfy the constraints specified by a service. + /// + /// REST API Reference for CreateContent Operation + public virtual Task CreateContentAsync(CreateContentRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = CreateContentRequestMarshaller.Instance; + options.ResponseUnmarshaller = CreateContentResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + + #region CreateContentAssociation + + + /// + /// Creates an association between a content resource in a knowledge base and step-by-step + /// guides. Step-by-step guides offer instructions to agents for resolving common + /// customer issues. You create a content association to integrate Amazon Q in Connect + /// and step-by-step guides. + /// + /// + /// + /// After you integrate Amazon Q and step-by-step guides, when Amazon Q provides a recommendation + /// to an agent based on the intent that it's detected, it also provides them with the + /// option to start the step-by-step guide that you have associated with the content. + /// + /// + /// + /// Note the following limitations: + /// + ///
    • + /// + /// You can create only one content association for each content resource in a knowledge + /// base. + /// + ///
    • + /// + /// You can associate a step-by-step guide with multiple content resources. + /// + ///
    + /// + /// For more information, see Integrate + /// Amazon Q in Connect with step-by-step guides in the Amazon Connect Administrator + /// Guide. + /// + ///     + /// Container for the necessary parameters to execute the CreateContentAssociation service method. + /// + /// The response from the CreateContentAssociation service method, as returned by QConnect. + /// + /// You do not have sufficient access to perform this action. + /// + /// + /// The request could not be processed because of conflict in the current state of the + /// resource. For example, if you're using a Create API (such as CreateAssistant) + /// that accepts name, a conflicting resource (usually with the same name) is being created + /// or mutated. + /// + /// + /// The specified resource does not exist. + /// + /// + /// You've exceeded your service quota. To perform the requested action, remove some of + /// the relevant resources, or use service quotas to request a service quota increase. + /// + /// + /// The throttling limit has been exceeded. + /// + /// + /// The input fails to satisfy the constraints specified by a service. + /// + /// REST API Reference for CreateContentAssociation Operation + public virtual CreateContentAssociationResponse CreateContentAssociation(CreateContentAssociationRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = CreateContentAssociationRequestMarshaller.Instance; + options.ResponseUnmarshaller = CreateContentAssociationResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// Creates an association between a content resource in a knowledge base and step-by-step + /// guides. Step-by-step guides offer instructions to agents for resolving common + /// customer issues. You create a content association to integrate Amazon Q in Connect + /// and step-by-step guides. + /// + /// + /// + /// After you integrate Amazon Q and step-by-step guides, when Amazon Q provides a recommendation + /// to an agent based on the intent that it's detected, it also provides them with the + /// option to start the step-by-step guide that you have associated with the content. + /// + /// + /// + /// Note the following limitations: + /// + ///
    • + /// + /// You can create only one content association for each content resource in a knowledge + /// base. + /// + ///
    • + /// + /// You can associate a step-by-step guide with multiple content resources. + /// + ///
    + /// + /// For more information, see Integrate + /// Amazon Q in Connect with step-by-step guides in the Amazon Connect Administrator + /// Guide. + /// + ///     + /// Container for the necessary parameters to execute the CreateContentAssociation service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the CreateContentAssociation service method, as returned by QConnect. + /// + /// You do not have sufficient access to perform this action. + /// + /// + /// The request could not be processed because of conflict in the current state of the + /// resource. For example, if you're using a Create API (such as CreateAssistant) + /// that accepts name, a conflicting resource (usually with the same name) is being created + /// or mutated. + /// + /// + /// The specified resource does not exist. + /// + /// + /// You've exceeded your service quota. To perform the requested action, remove some of + /// the relevant resources, or use service quotas to request a service quota increase. + /// + /// + /// The throttling limit has been exceeded. + /// + /// + /// The input fails to satisfy the constraints specified by a service. + /// + /// REST API Reference for CreateContentAssociation Operation + public virtual Task CreateContentAssociationAsync(CreateContentAssociationRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = CreateContentAssociationRequestMarshaller.Instance; + options.ResponseUnmarshaller = CreateContentAssociationResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + + #region CreateKnowledgeBase + + + /// + /// Creates a knowledge base. + /// + /// + /// + /// When using this API, you cannot reuse Amazon + /// AppIntegrations DataIntegrations with external knowledge bases such as Salesforce + /// and ServiceNow. If you do, you'll get an InvalidRequestException error. + /// + /// + /// + /// For example, you're programmatically managing your external knowledge base, and you + /// want to add or remove one of the fields that is being ingested from Salesforce. Do + /// the following: + /// + ///
    1. + /// + /// Call DeleteKnowledgeBase. + /// + ///
    2. + /// + /// Call DeleteDataIntegration. + /// + ///
    3. + /// + /// Call CreateDataIntegration + /// to recreate the DataIntegration or a create different one. + /// + ///
    4. + /// + /// Call CreateKnowledgeBase. + /// + ///
    + ///     + /// Container for the necessary parameters to execute the CreateKnowledgeBase service method. + /// + /// The response from the CreateKnowledgeBase service method, as returned by QConnect. + /// + /// You do not have sufficient access to perform this action. + /// + /// + /// The request could not be processed because of conflict in the current state of the + /// resource. For example, if you're using a Create API (such as CreateAssistant) + /// that accepts name, a conflicting resource (usually with the same name) is being created + /// or mutated. + /// + /// + /// You've exceeded your service quota. To perform the requested action, remove some of + /// the relevant resources, or use service quotas to request a service quota increase. + /// + /// + /// The input fails to satisfy the constraints specified by a service. + /// + /// REST API Reference for CreateKnowledgeBase Operation + public virtual CreateKnowledgeBaseResponse CreateKnowledgeBase(CreateKnowledgeBaseRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = CreateKnowledgeBaseRequestMarshaller.Instance; + options.ResponseUnmarshaller = CreateKnowledgeBaseResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// Creates a knowledge base. + /// + /// + /// + /// When using this API, you cannot reuse Amazon + /// AppIntegrations DataIntegrations with external knowledge bases such as Salesforce + /// and ServiceNow. If you do, you'll get an InvalidRequestException error. + /// + /// + /// + /// For example, you're programmatically managing your external knowledge base, and you + /// want to add or remove one of the fields that is being ingested from Salesforce. Do + /// the following: + /// + ///
    1. + /// + /// Call DeleteKnowledgeBase. + /// + ///
    2. + /// + /// Call DeleteDataIntegration. + /// + ///
    3. + /// + /// Call CreateDataIntegration + /// to recreate the DataIntegration or a create different one. + /// + ///
    4. + /// + /// Call CreateKnowledgeBase. + /// + ///
    + ///     + /// Container for the necessary parameters to execute the CreateKnowledgeBase service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the CreateKnowledgeBase service method, as returned by QConnect. + /// + /// You do not have sufficient access to perform this action. + /// + /// + /// The request could not be processed because of conflict in the current state of the + /// resource. For example, if you're using a Create API (such as CreateAssistant) + /// that accepts name, a conflicting resource (usually with the same name) is being created + /// or mutated. + /// + /// + /// You've exceeded your service quota. To perform the requested action, remove some of + /// the relevant resources, or use service quotas to request a service quota increase. + /// + /// + /// The input fails to satisfy the constraints specified by a service. + /// + /// REST API Reference for CreateKnowledgeBase Operation + public virtual Task CreateKnowledgeBaseAsync(CreateKnowledgeBaseRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = CreateKnowledgeBaseRequestMarshaller.Instance; + options.ResponseUnmarshaller = CreateKnowledgeBaseResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + + #region CreateQuickResponse + + + /// + /// Creates an Amazon Q in Connect quick response. + /// + /// Container for the necessary parameters to execute the CreateQuickResponse service method. + /// + /// The response from the CreateQuickResponse service method, as returned by QConnect. + /// + /// You do not have sufficient access to perform this action. + /// + /// + /// The request could not be processed because of conflict in the current state of the + /// resource. For example, if you're using a Create API (such as CreateAssistant) + /// that accepts name, a conflicting resource (usually with the same name) is being created + /// or mutated. + /// + /// + /// The specified resource does not exist. + /// + /// + /// You've exceeded your service quota. To perform the requested action, remove some of + /// the relevant resources, or use service quotas to request a service quota increase. + /// + /// + /// The input fails to satisfy the constraints specified by a service. + /// + /// REST API Reference for CreateQuickResponse Operation + public virtual CreateQuickResponseResponse CreateQuickResponse(CreateQuickResponseRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = CreateQuickResponseRequestMarshaller.Instance; + options.ResponseUnmarshaller = CreateQuickResponseResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// Creates an Amazon Q in Connect quick response. + /// + /// Container for the necessary parameters to execute the CreateQuickResponse service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the CreateQuickResponse service method, as returned by QConnect. + /// + /// You do not have sufficient access to perform this action. + /// + /// + /// The request could not be processed because of conflict in the current state of the + /// resource. For example, if you're using a Create API (such as CreateAssistant) + /// that accepts name, a conflicting resource (usually with the same name) is being created + /// or mutated. + /// + /// + /// The specified resource does not exist. + /// + /// + /// You've exceeded your service quota. To perform the requested action, remove some of + /// the relevant resources, or use service quotas to request a service quota increase. + /// + /// + /// The input fails to satisfy the constraints specified by a service. + /// + /// REST API Reference for CreateQuickResponse Operation + public virtual Task CreateQuickResponseAsync(CreateQuickResponseRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = CreateQuickResponseRequestMarshaller.Instance; + options.ResponseUnmarshaller = CreateQuickResponseResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + + #region CreateSession + + + /// + /// Creates a session. A session is a contextual container used for generating recommendations. + /// Amazon Connect creates a new Amazon Q in Connect session for each contact on which + /// Amazon Q in Connect is enabled. + /// + /// Container for the necessary parameters to execute the CreateSession service method. + /// + /// The response from the CreateSession service method, as returned by QConnect. + /// + /// You do not have sufficient access to perform this action. + /// + /// + /// The request could not be processed because of conflict in the current state of the + /// resource. For example, if you're using a Create API (such as CreateAssistant) + /// that accepts name, a conflicting resource (usually with the same name) is being created + /// or mutated. + /// + /// + /// The specified resource does not exist. + /// + /// + /// The input fails to satisfy the constraints specified by a service. + /// + /// REST API Reference for CreateSession Operation + public virtual CreateSessionResponse CreateSession(CreateSessionRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = CreateSessionRequestMarshaller.Instance; + options.ResponseUnmarshaller = CreateSessionResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// Creates a session. A session is a contextual container used for generating recommendations. + /// Amazon Connect creates a new Amazon Q in Connect session for each contact on which + /// Amazon Q in Connect is enabled. + /// + /// Container for the necessary parameters to execute the CreateSession service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the CreateSession service method, as returned by QConnect. + /// + /// You do not have sufficient access to perform this action. + /// + /// + /// The request could not be processed because of conflict in the current state of the + /// resource. For example, if you're using a Create API (such as CreateAssistant) + /// that accepts name, a conflicting resource (usually with the same name) is being created + /// or mutated. + /// + /// + /// The specified resource does not exist. + /// + /// + /// The input fails to satisfy the constraints specified by a service. + /// + /// REST API Reference for CreateSession Operation + public virtual Task CreateSessionAsync(CreateSessionRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = CreateSessionRequestMarshaller.Instance; + options.ResponseUnmarshaller = CreateSessionResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + + #region DeleteAIAgent + + + /// + /// Deletes an Amazon Q in Connect AI Agent. + /// + /// Container for the necessary parameters to execute the DeleteAIAgent service method. + /// + /// The response from the DeleteAIAgent service method, as returned by QConnect. + /// + /// You do not have sufficient access to perform this action. + /// + /// + /// The specified resource does not exist. + /// + /// + /// The throttling limit has been exceeded. + /// + /// + /// The input fails to satisfy the constraints specified by a service. + /// + /// REST API Reference for DeleteAIAgent Operation + public virtual DeleteAIAgentResponse DeleteAIAgent(DeleteAIAgentRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = DeleteAIAgentRequestMarshaller.Instance; + options.ResponseUnmarshaller = DeleteAIAgentResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// Deletes an Amazon Q in Connect AI Agent. + /// + /// Container for the necessary parameters to execute the DeleteAIAgent service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the DeleteAIAgent service method, as returned by QConnect. + /// + /// You do not have sufficient access to perform this action. + /// + /// + /// The specified resource does not exist. + /// + /// + /// The throttling limit has been exceeded. + /// + /// + /// The input fails to satisfy the constraints specified by a service. + /// + /// REST API Reference for DeleteAIAgent Operation + public virtual Task DeleteAIAgentAsync(DeleteAIAgentRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = DeleteAIAgentRequestMarshaller.Instance; + options.ResponseUnmarshaller = DeleteAIAgentResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + + #region DeleteAIAgentVersion + + + /// + /// Deletes an Amazon Q in Connect AI Agent Version. + /// + /// Container for the necessary parameters to execute the DeleteAIAgentVersion service method. + /// + /// The response from the DeleteAIAgentVersion service method, as returned by QConnect. + /// + /// You do not have sufficient access to perform this action. + /// + /// + /// The request could not be processed because of conflict in the current state of the + /// resource. For example, if you're using a Create API (such as CreateAssistant) + /// that accepts name, a conflicting resource (usually with the same name) is being created + /// or mutated. + /// + /// + /// The specified resource does not exist. + /// + /// + /// The throttling limit has been exceeded. + /// + /// + /// The input fails to satisfy the constraints specified by a service. + /// + /// REST API Reference for DeleteAIAgentVersion Operation + public virtual DeleteAIAgentVersionResponse DeleteAIAgentVersion(DeleteAIAgentVersionRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = DeleteAIAgentVersionRequestMarshaller.Instance; + options.ResponseUnmarshaller = DeleteAIAgentVersionResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// Deletes an Amazon Q in Connect AI Agent Version. + /// + /// Container for the necessary parameters to execute the DeleteAIAgentVersion service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the DeleteAIAgentVersion service method, as returned by QConnect. + /// + /// You do not have sufficient access to perform this action. + /// + /// + /// The request could not be processed because of conflict in the current state of the + /// resource. For example, if you're using a Create API (such as CreateAssistant) + /// that accepts name, a conflicting resource (usually with the same name) is being created + /// or mutated. + /// + /// + /// The specified resource does not exist. + /// + /// + /// The throttling limit has been exceeded. + /// + /// + /// The input fails to satisfy the constraints specified by a service. + /// + /// REST API Reference for DeleteAIAgentVersion Operation + public virtual Task DeleteAIAgentVersionAsync(DeleteAIAgentVersionRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = DeleteAIAgentVersionRequestMarshaller.Instance; + options.ResponseUnmarshaller = DeleteAIAgentVersionResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + + #region DeleteAIPrompt + + + /// + /// Deletes an Amazon Q in Connect AI Prompt. + /// + /// Container for the necessary parameters to execute the DeleteAIPrompt service method. + /// + /// The response from the DeleteAIPrompt service method, as returned by QConnect. + /// + /// You do not have sufficient access to perform this action. + /// + /// + /// The specified resource does not exist. + /// + /// + /// The throttling limit has been exceeded. + /// + /// + /// The input fails to satisfy the constraints specified by a service. + /// + /// REST API Reference for DeleteAIPrompt Operation + public virtual DeleteAIPromptResponse DeleteAIPrompt(DeleteAIPromptRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = DeleteAIPromptRequestMarshaller.Instance; + options.ResponseUnmarshaller = DeleteAIPromptResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// Deletes an Amazon Q in Connect AI Prompt. + /// + /// Container for the necessary parameters to execute the DeleteAIPrompt service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the DeleteAIPrompt service method, as returned by QConnect. + /// + /// You do not have sufficient access to perform this action. + /// + /// + /// The specified resource does not exist. + /// + /// + /// The throttling limit has been exceeded. + /// + /// + /// The input fails to satisfy the constraints specified by a service. + /// + /// REST API Reference for DeleteAIPrompt Operation + public virtual Task DeleteAIPromptAsync(DeleteAIPromptRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = DeleteAIPromptRequestMarshaller.Instance; + options.ResponseUnmarshaller = DeleteAIPromptResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + + #region DeleteAIPromptVersion + + + /// + /// Delete and Amazon Q in Connect AI Prompt version. + /// + /// Container for the necessary parameters to execute the DeleteAIPromptVersion service method. + /// + /// The response from the DeleteAIPromptVersion service method, as returned by QConnect. + /// + /// You do not have sufficient access to perform this action. + /// + /// + /// The request could not be processed because of conflict in the current state of the + /// resource. For example, if you're using a Create API (such as CreateAssistant) + /// that accepts name, a conflicting resource (usually with the same name) is being created + /// or mutated. + /// + /// + /// The specified resource does not exist. + /// + /// + /// The throttling limit has been exceeded. + /// + /// + /// The input fails to satisfy the constraints specified by a service. + /// + /// REST API Reference for DeleteAIPromptVersion Operation + public virtual DeleteAIPromptVersionResponse DeleteAIPromptVersion(DeleteAIPromptVersionRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = DeleteAIPromptVersionRequestMarshaller.Instance; + options.ResponseUnmarshaller = DeleteAIPromptVersionResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// Delete and Amazon Q in Connect AI Prompt version. + /// + /// Container for the necessary parameters to execute the DeleteAIPromptVersion service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the DeleteAIPromptVersion service method, as returned by QConnect. + /// + /// You do not have sufficient access to perform this action. + /// + /// + /// The request could not be processed because of conflict in the current state of the + /// resource. For example, if you're using a Create API (such as CreateAssistant) + /// that accepts name, a conflicting resource (usually with the same name) is being created + /// or mutated. + /// + /// + /// The specified resource does not exist. + /// + /// + /// The throttling limit has been exceeded. + /// + /// + /// The input fails to satisfy the constraints specified by a service. + /// + /// REST API Reference for DeleteAIPromptVersion Operation + public virtual Task DeleteAIPromptVersionAsync(DeleteAIPromptVersionRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = DeleteAIPromptVersionRequestMarshaller.Instance; + options.ResponseUnmarshaller = DeleteAIPromptVersionResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + + #region DeleteAssistant + + + /// + /// Deletes an assistant. + /// + /// Container for the necessary parameters to execute the DeleteAssistant service method. + /// + /// The response from the DeleteAssistant service method, as returned by QConnect. + /// + /// You do not have sufficient access to perform this action. + /// + /// + /// The specified resource does not exist. + /// + /// + /// The input fails to satisfy the constraints specified by a service. + /// + /// REST API Reference for DeleteAssistant Operation + public virtual DeleteAssistantResponse DeleteAssistant(DeleteAssistantRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = DeleteAssistantRequestMarshaller.Instance; + options.ResponseUnmarshaller = DeleteAssistantResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// Deletes an assistant. + /// + /// Container for the necessary parameters to execute the DeleteAssistant service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the DeleteAssistant service method, as returned by QConnect. + /// + /// You do not have sufficient access to perform this action. + /// + /// + /// The specified resource does not exist. + /// + /// + /// The input fails to satisfy the constraints specified by a service. + /// + /// REST API Reference for DeleteAssistant Operation + public virtual Task DeleteAssistantAsync(DeleteAssistantRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = DeleteAssistantRequestMarshaller.Instance; + options.ResponseUnmarshaller = DeleteAssistantResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + + #region DeleteAssistantAssociation + + + /// + /// Deletes an assistant association. + /// + /// Container for the necessary parameters to execute the DeleteAssistantAssociation service method. + /// + /// The response from the DeleteAssistantAssociation service method, as returned by QConnect. + /// + /// You do not have sufficient access to perform this action. + /// + /// + /// The specified resource does not exist. + /// + /// + /// The input fails to satisfy the constraints specified by a service. + /// + /// REST API Reference for DeleteAssistantAssociation Operation + public virtual DeleteAssistantAssociationResponse DeleteAssistantAssociation(DeleteAssistantAssociationRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = DeleteAssistantAssociationRequestMarshaller.Instance; + options.ResponseUnmarshaller = DeleteAssistantAssociationResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// Deletes an assistant association. + /// + /// Container for the necessary parameters to execute the DeleteAssistantAssociation service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the DeleteAssistantAssociation service method, as returned by QConnect. + /// + /// You do not have sufficient access to perform this action. + /// + /// + /// The specified resource does not exist. + /// + /// + /// The input fails to satisfy the constraints specified by a service. + /// + /// REST API Reference for DeleteAssistantAssociation Operation + public virtual Task DeleteAssistantAssociationAsync(DeleteAssistantAssociationRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = DeleteAssistantAssociationRequestMarshaller.Instance; + options.ResponseUnmarshaller = DeleteAssistantAssociationResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + + #region DeleteContent + + + /// + /// Deletes the content. + /// + /// Container for the necessary parameters to execute the DeleteContent service method. + /// + /// The response from the DeleteContent service method, as returned by QConnect. + /// + /// You do not have sufficient access to perform this action. + /// + /// + /// The specified resource does not exist. + /// + /// + /// The input fails to satisfy the constraints specified by a service. + /// + /// REST API Reference for DeleteContent Operation + public virtual DeleteContentResponse DeleteContent(DeleteContentRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = DeleteContentRequestMarshaller.Instance; + options.ResponseUnmarshaller = DeleteContentResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// Deletes the content. + /// + /// Container for the necessary parameters to execute the DeleteContent service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the DeleteContent service method, as returned by QConnect. + /// + /// You do not have sufficient access to perform this action. + /// + /// + /// The specified resource does not exist. + /// + /// + /// The input fails to satisfy the constraints specified by a service. + /// + /// REST API Reference for DeleteContent Operation + public virtual Task DeleteContentAsync(DeleteContentRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = DeleteContentRequestMarshaller.Instance; + options.ResponseUnmarshaller = DeleteContentResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + + #region DeleteContentAssociation + + + /// + /// Deletes the content association. + /// + /// + /// + /// For more information about content associations--what they are and when they are used--see + /// Integrate + /// Amazon Q in Connect with step-by-step guides in the Amazon Connect Administrator + /// Guide. + /// + /// + /// Container for the necessary parameters to execute the DeleteContentAssociation service method. + /// + /// The response from the DeleteContentAssociation service method, as returned by QConnect. + /// + /// You do not have sufficient access to perform this action. + /// + /// + /// The specified resource does not exist. + /// + /// + /// The input fails to satisfy the constraints specified by a service. + /// + /// REST API Reference for DeleteContentAssociation Operation + public virtual DeleteContentAssociationResponse DeleteContentAssociation(DeleteContentAssociationRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = DeleteContentAssociationRequestMarshaller.Instance; + options.ResponseUnmarshaller = DeleteContentAssociationResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// Deletes the content association. + /// + /// + /// + /// For more information about content associations--what they are and when they are used--see + /// Integrate + /// Amazon Q in Connect with step-by-step guides in the Amazon Connect Administrator + /// Guide. + /// + /// + /// Container for the necessary parameters to execute the DeleteContentAssociation service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the DeleteContentAssociation service method, as returned by QConnect. + /// + /// You do not have sufficient access to perform this action. + /// + /// + /// The specified resource does not exist. + /// + /// + /// The input fails to satisfy the constraints specified by a service. + /// + /// REST API Reference for DeleteContentAssociation Operation + public virtual Task DeleteContentAssociationAsync(DeleteContentAssociationRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = DeleteContentAssociationRequestMarshaller.Instance; + options.ResponseUnmarshaller = DeleteContentAssociationResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + + #region DeleteImportJob + + + /// + /// Deletes the quick response import job. + /// + /// Container for the necessary parameters to execute the DeleteImportJob service method. + /// + /// The response from the DeleteImportJob service method, as returned by QConnect. + /// + /// You do not have sufficient access to perform this action. + /// + /// + /// The request could not be processed because of conflict in the current state of the + /// resource. For example, if you're using a Create API (such as CreateAssistant) + /// that accepts name, a conflicting resource (usually with the same name) is being created + /// or mutated. + /// + /// + /// The specified resource does not exist. + /// + /// + /// The input fails to satisfy the constraints specified by a service. + /// + /// REST API Reference for DeleteImportJob Operation + public virtual DeleteImportJobResponse DeleteImportJob(DeleteImportJobRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = DeleteImportJobRequestMarshaller.Instance; + options.ResponseUnmarshaller = DeleteImportJobResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// Deletes the quick response import job. + /// + /// Container for the necessary parameters to execute the DeleteImportJob service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the DeleteImportJob service method, as returned by QConnect. + /// + /// You do not have sufficient access to perform this action. + /// + /// + /// The request could not be processed because of conflict in the current state of the + /// resource. For example, if you're using a Create API (such as CreateAssistant) + /// that accepts name, a conflicting resource (usually with the same name) is being created + /// or mutated. + /// + /// + /// The specified resource does not exist. + /// + /// + /// The input fails to satisfy the constraints specified by a service. + /// + /// REST API Reference for DeleteImportJob Operation + public virtual Task DeleteImportJobAsync(DeleteImportJobRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = DeleteImportJobRequestMarshaller.Instance; + options.ResponseUnmarshaller = DeleteImportJobResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + + #region DeleteKnowledgeBase + + + /// + /// Deletes the knowledge base. + /// + /// + /// + /// When you use this API to delete an external knowledge base such as Salesforce or ServiceNow, + /// you must also delete the Amazon + /// AppIntegrations DataIntegration. This is because you can't reuse the DataIntegration + /// after it's been associated with an external knowledge base. However, you can delete + /// and recreate it. See DeleteDataIntegration + /// and CreateDataIntegration + /// in the Amazon AppIntegrations API Reference. + /// + /// + /// + /// Container for the necessary parameters to execute the DeleteKnowledgeBase service method. + /// + /// The response from the DeleteKnowledgeBase service method, as returned by QConnect. + /// + /// You do not have sufficient access to perform this action. + /// + /// + /// The request could not be processed because of conflict in the current state of the + /// resource. For example, if you're using a Create API (such as CreateAssistant) + /// that accepts name, a conflicting resource (usually with the same name) is being created + /// or mutated. + /// + /// + /// The specified resource does not exist. + /// + /// + /// The input fails to satisfy the constraints specified by a service. + /// + /// REST API Reference for DeleteKnowledgeBase Operation + public virtual DeleteKnowledgeBaseResponse DeleteKnowledgeBase(DeleteKnowledgeBaseRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = DeleteKnowledgeBaseRequestMarshaller.Instance; + options.ResponseUnmarshaller = DeleteKnowledgeBaseResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// Deletes the knowledge base. + /// + /// + /// + /// When you use this API to delete an external knowledge base such as Salesforce or ServiceNow, + /// you must also delete the Amazon + /// AppIntegrations DataIntegration. This is because you can't reuse the DataIntegration + /// after it's been associated with an external knowledge base. However, you can delete + /// and recreate it. See DeleteDataIntegration + /// and CreateDataIntegration + /// in the Amazon AppIntegrations API Reference. + /// + /// /// - /// Container for the necessary parameters to execute the CreateSession service method. + /// Container for the necessary parameters to execute the DeleteKnowledgeBase service method. /// /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// /// - /// The response from the CreateSession service method, as returned by QConnect. + /// The response from the DeleteKnowledgeBase service method, as returned by QConnect. /// /// You do not have sufficient access to perform this action. /// @@ -953,27 +2005,27 @@ public virtual CreateSessionResponse CreateSession(CreateSessionRequest request) /// /// The input fails to satisfy the constraints specified by a service. /// - /// REST API Reference for CreateSession Operation - public virtual Task CreateSessionAsync(CreateSessionRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + /// REST API Reference for DeleteKnowledgeBase Operation + public virtual Task DeleteKnowledgeBaseAsync(DeleteKnowledgeBaseRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { var options = new InvokeOptions(); - options.RequestMarshaller = CreateSessionRequestMarshaller.Instance; - options.ResponseUnmarshaller = CreateSessionResponseUnmarshaller.Instance; + options.RequestMarshaller = DeleteKnowledgeBaseRequestMarshaller.Instance; + options.ResponseUnmarshaller = DeleteKnowledgeBaseResponseUnmarshaller.Instance; - return InvokeAsync(request, options, cancellationToken); + return InvokeAsync(request, options, cancellationToken); } #endregion - #region DeleteAssistant + #region DeleteQuickResponse /// - /// Deletes an assistant. + /// Deletes a quick response. /// - /// Container for the necessary parameters to execute the DeleteAssistant service method. + /// Container for the necessary parameters to execute the DeleteQuickResponse service method. /// - /// The response from the DeleteAssistant service method, as returned by QConnect. + /// The response from the DeleteQuickResponse service method, as returned by QConnect. /// /// You do not have sufficient access to perform this action. /// @@ -983,26 +2035,26 @@ public virtual CreateSessionResponse CreateSession(CreateSessionRequest request) /// /// The input fails to satisfy the constraints specified by a service. /// - /// REST API Reference for DeleteAssistant Operation - public virtual DeleteAssistantResponse DeleteAssistant(DeleteAssistantRequest request) + /// REST API Reference for DeleteQuickResponse Operation + public virtual DeleteQuickResponseResponse DeleteQuickResponse(DeleteQuickResponseRequest request) { var options = new InvokeOptions(); - options.RequestMarshaller = DeleteAssistantRequestMarshaller.Instance; - options.ResponseUnmarshaller = DeleteAssistantResponseUnmarshaller.Instance; + options.RequestMarshaller = DeleteQuickResponseRequestMarshaller.Instance; + options.ResponseUnmarshaller = DeleteQuickResponseResponseUnmarshaller.Instance; - return Invoke(request, options); + return Invoke(request, options); } /// - /// Deletes an assistant. + /// Deletes a quick response. /// - /// Container for the necessary parameters to execute the DeleteAssistant service method. + /// Container for the necessary parameters to execute the DeleteQuickResponse service method. /// /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// /// - /// The response from the DeleteAssistant service method, as returned by QConnect. + /// The response from the DeleteQuickResponse service method, as returned by QConnect. /// /// You do not have sufficient access to perform this action. /// @@ -1012,153 +2064,157 @@ public virtual DeleteAssistantResponse DeleteAssistant(DeleteAssistantRequest re /// /// The input fails to satisfy the constraints specified by a service. /// - /// REST API Reference for DeleteAssistant Operation - public virtual Task DeleteAssistantAsync(DeleteAssistantRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + /// REST API Reference for DeleteQuickResponse Operation + public virtual Task DeleteQuickResponseAsync(DeleteQuickResponseRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { var options = new InvokeOptions(); - options.RequestMarshaller = DeleteAssistantRequestMarshaller.Instance; - options.ResponseUnmarshaller = DeleteAssistantResponseUnmarshaller.Instance; + options.RequestMarshaller = DeleteQuickResponseRequestMarshaller.Instance; + options.ResponseUnmarshaller = DeleteQuickResponseResponseUnmarshaller.Instance; - return InvokeAsync(request, options, cancellationToken); + return InvokeAsync(request, options, cancellationToken); } #endregion - #region DeleteAssistantAssociation + #region GetAIAgent /// - /// Deletes an assistant association. + /// Gets an Amazon Q in Connect AI Agent. /// - /// Container for the necessary parameters to execute the DeleteAssistantAssociation service method. + /// Container for the necessary parameters to execute the GetAIAgent service method. /// - /// The response from the DeleteAssistantAssociation service method, as returned by QConnect. + /// The response from the GetAIAgent service method, as returned by QConnect. /// /// You do not have sufficient access to perform this action. /// /// /// The specified resource does not exist. /// + /// + /// The throttling limit has been exceeded. + /// /// /// The input fails to satisfy the constraints specified by a service. /// - /// REST API Reference for DeleteAssistantAssociation Operation - public virtual DeleteAssistantAssociationResponse DeleteAssistantAssociation(DeleteAssistantAssociationRequest request) + /// REST API Reference for GetAIAgent Operation + public virtual GetAIAgentResponse GetAIAgent(GetAIAgentRequest request) { var options = new InvokeOptions(); - options.RequestMarshaller = DeleteAssistantAssociationRequestMarshaller.Instance; - options.ResponseUnmarshaller = DeleteAssistantAssociationResponseUnmarshaller.Instance; + options.RequestMarshaller = GetAIAgentRequestMarshaller.Instance; + options.ResponseUnmarshaller = GetAIAgentResponseUnmarshaller.Instance; - return Invoke(request, options); + return Invoke(request, options); } /// - /// Deletes an assistant association. + /// Gets an Amazon Q in Connect AI Agent. /// - /// Container for the necessary parameters to execute the DeleteAssistantAssociation service method. + /// Container for the necessary parameters to execute the GetAIAgent service method. /// /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// /// - /// The response from the DeleteAssistantAssociation service method, as returned by QConnect. + /// The response from the GetAIAgent service method, as returned by QConnect. /// /// You do not have sufficient access to perform this action. /// /// /// The specified resource does not exist. /// + /// + /// The throttling limit has been exceeded. + /// /// /// The input fails to satisfy the constraints specified by a service. /// - /// REST API Reference for DeleteAssistantAssociation Operation - public virtual Task DeleteAssistantAssociationAsync(DeleteAssistantAssociationRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + /// REST API Reference for GetAIAgent Operation + public virtual Task GetAIAgentAsync(GetAIAgentRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { var options = new InvokeOptions(); - options.RequestMarshaller = DeleteAssistantAssociationRequestMarshaller.Instance; - options.ResponseUnmarshaller = DeleteAssistantAssociationResponseUnmarshaller.Instance; + options.RequestMarshaller = GetAIAgentRequestMarshaller.Instance; + options.ResponseUnmarshaller = GetAIAgentResponseUnmarshaller.Instance; - return InvokeAsync(request, options, cancellationToken); + return InvokeAsync(request, options, cancellationToken); } #endregion - #region DeleteContent + #region GetAIPrompt /// - /// Deletes the content. + /// Gets and Amazon Q in Connect AI Prompt. /// - /// Container for the necessary parameters to execute the DeleteContent service method. + /// Container for the necessary parameters to execute the GetAIPrompt service method. /// - /// The response from the DeleteContent service method, as returned by QConnect. + /// The response from the GetAIPrompt service method, as returned by QConnect. /// /// You do not have sufficient access to perform this action. /// /// /// The specified resource does not exist. /// + /// + /// The throttling limit has been exceeded. + /// /// /// The input fails to satisfy the constraints specified by a service. /// - /// REST API Reference for DeleteContent Operation - public virtual DeleteContentResponse DeleteContent(DeleteContentRequest request) + /// REST API Reference for GetAIPrompt Operation + public virtual GetAIPromptResponse GetAIPrompt(GetAIPromptRequest request) { var options = new InvokeOptions(); - options.RequestMarshaller = DeleteContentRequestMarshaller.Instance; - options.ResponseUnmarshaller = DeleteContentResponseUnmarshaller.Instance; + options.RequestMarshaller = GetAIPromptRequestMarshaller.Instance; + options.ResponseUnmarshaller = GetAIPromptResponseUnmarshaller.Instance; - return Invoke(request, options); + return Invoke(request, options); } /// - /// Deletes the content. + /// Gets and Amazon Q in Connect AI Prompt. /// - /// Container for the necessary parameters to execute the DeleteContent service method. + /// Container for the necessary parameters to execute the GetAIPrompt service method. /// /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// /// - /// The response from the DeleteContent service method, as returned by QConnect. + /// The response from the GetAIPrompt service method, as returned by QConnect. /// /// You do not have sufficient access to perform this action. /// /// /// The specified resource does not exist. /// + /// + /// The throttling limit has been exceeded. + /// /// /// The input fails to satisfy the constraints specified by a service. /// - /// REST API Reference for DeleteContent Operation - public virtual Task DeleteContentAsync(DeleteContentRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + /// REST API Reference for GetAIPrompt Operation + public virtual Task GetAIPromptAsync(GetAIPromptRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { var options = new InvokeOptions(); - options.RequestMarshaller = DeleteContentRequestMarshaller.Instance; - options.ResponseUnmarshaller = DeleteContentResponseUnmarshaller.Instance; + options.RequestMarshaller = GetAIPromptRequestMarshaller.Instance; + options.ResponseUnmarshaller = GetAIPromptResponseUnmarshaller.Instance; - return InvokeAsync(request, options, cancellationToken); + return InvokeAsync(request, options, cancellationToken); } #endregion - #region DeleteContentAssociation + #region GetAssistant /// - /// Deletes the content association. - /// - /// - /// - /// For more information about content associations--what they are and when they are used--see - /// Integrate - /// Amazon Q in Connect with step-by-step guides in the Amazon Connect Administrator - /// Guide. - /// + /// Retrieves information about an assistant. /// - /// Container for the necessary parameters to execute the DeleteContentAssociation service method. + /// Container for the necessary parameters to execute the GetAssistant service method. /// - /// The response from the DeleteContentAssociation service method, as returned by QConnect. + /// The response from the GetAssistant service method, as returned by QConnect. /// /// You do not have sufficient access to perform this action. /// @@ -1168,34 +2224,26 @@ public virtual DeleteContentResponse DeleteContent(DeleteContentRequest request) /// /// The input fails to satisfy the constraints specified by a service. /// - /// REST API Reference for DeleteContentAssociation Operation - public virtual DeleteContentAssociationResponse DeleteContentAssociation(DeleteContentAssociationRequest request) + /// REST API Reference for GetAssistant Operation + public virtual GetAssistantResponse GetAssistant(GetAssistantRequest request) { var options = new InvokeOptions(); - options.RequestMarshaller = DeleteContentAssociationRequestMarshaller.Instance; - options.ResponseUnmarshaller = DeleteContentAssociationResponseUnmarshaller.Instance; + options.RequestMarshaller = GetAssistantRequestMarshaller.Instance; + options.ResponseUnmarshaller = GetAssistantResponseUnmarshaller.Instance; - return Invoke(request, options); + return Invoke(request, options); } /// - /// Deletes the content association. - /// - /// - /// - /// For more information about content associations--what they are and when they are used--see - /// Integrate - /// Amazon Q in Connect with step-by-step guides in the Amazon Connect Administrator - /// Guide. - /// + /// Retrieves information about an assistant. /// - /// Container for the necessary parameters to execute the DeleteContentAssociation service method. + /// Container for the necessary parameters to execute the GetAssistant service method. /// /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// /// - /// The response from the DeleteContentAssociation service method, as returned by QConnect. + /// The response from the GetAssistant service method, as returned by QConnect. /// /// You do not have sufficient access to perform this action. /// @@ -1205,193 +2253,153 @@ public virtual DeleteContentAssociationResponse DeleteContentAssociation(DeleteC /// /// The input fails to satisfy the constraints specified by a service. /// - /// REST API Reference for DeleteContentAssociation Operation - public virtual Task DeleteContentAssociationAsync(DeleteContentAssociationRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + /// REST API Reference for GetAssistant Operation + public virtual Task GetAssistantAsync(GetAssistantRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { var options = new InvokeOptions(); - options.RequestMarshaller = DeleteContentAssociationRequestMarshaller.Instance; - options.ResponseUnmarshaller = DeleteContentAssociationResponseUnmarshaller.Instance; + options.RequestMarshaller = GetAssistantRequestMarshaller.Instance; + options.ResponseUnmarshaller = GetAssistantResponseUnmarshaller.Instance; - return InvokeAsync(request, options, cancellationToken); + return InvokeAsync(request, options, cancellationToken); } #endregion - #region DeleteImportJob + #region GetAssistantAssociation /// - /// Deletes the quick response import job. + /// Retrieves information about an assistant association. /// - /// Container for the necessary parameters to execute the DeleteImportJob service method. + /// Container for the necessary parameters to execute the GetAssistantAssociation service method. /// - /// The response from the DeleteImportJob service method, as returned by QConnect. + /// The response from the GetAssistantAssociation service method, as returned by QConnect. /// /// You do not have sufficient access to perform this action. /// - /// - /// The request could not be processed because of conflict in the current state of the - /// resource. For example, if you're using a Create API (such as CreateAssistant) - /// that accepts name, a conflicting resource (usually with the same name) is being created - /// or mutated. - /// /// /// The specified resource does not exist. /// /// /// The input fails to satisfy the constraints specified by a service. /// - /// REST API Reference for DeleteImportJob Operation - public virtual DeleteImportJobResponse DeleteImportJob(DeleteImportJobRequest request) + /// REST API Reference for GetAssistantAssociation Operation + public virtual GetAssistantAssociationResponse GetAssistantAssociation(GetAssistantAssociationRequest request) { var options = new InvokeOptions(); - options.RequestMarshaller = DeleteImportJobRequestMarshaller.Instance; - options.ResponseUnmarshaller = DeleteImportJobResponseUnmarshaller.Instance; + options.RequestMarshaller = GetAssistantAssociationRequestMarshaller.Instance; + options.ResponseUnmarshaller = GetAssistantAssociationResponseUnmarshaller.Instance; - return Invoke(request, options); + return Invoke(request, options); } /// - /// Deletes the quick response import job. + /// Retrieves information about an assistant association. /// - /// Container for the necessary parameters to execute the DeleteImportJob service method. + /// Container for the necessary parameters to execute the GetAssistantAssociation service method. /// /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// /// - /// The response from the DeleteImportJob service method, as returned by QConnect. + /// The response from the GetAssistantAssociation service method, as returned by QConnect. /// /// You do not have sufficient access to perform this action. /// - /// - /// The request could not be processed because of conflict in the current state of the - /// resource. For example, if you're using a Create API (such as CreateAssistant) - /// that accepts name, a conflicting resource (usually with the same name) is being created - /// or mutated. - /// /// /// The specified resource does not exist. /// /// /// The input fails to satisfy the constraints specified by a service. /// - /// REST API Reference for DeleteImportJob Operation - public virtual Task DeleteImportJobAsync(DeleteImportJobRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + /// REST API Reference for GetAssistantAssociation Operation + public virtual Task GetAssistantAssociationAsync(GetAssistantAssociationRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { var options = new InvokeOptions(); - options.RequestMarshaller = DeleteImportJobRequestMarshaller.Instance; - options.ResponseUnmarshaller = DeleteImportJobResponseUnmarshaller.Instance; + options.RequestMarshaller = GetAssistantAssociationRequestMarshaller.Instance; + options.ResponseUnmarshaller = GetAssistantAssociationResponseUnmarshaller.Instance; - return InvokeAsync(request, options, cancellationToken); + return InvokeAsync(request, options, cancellationToken); } #endregion - #region DeleteKnowledgeBase + #region GetContent /// - /// Deletes the knowledge base. - /// - /// - /// - /// When you use this API to delete an external knowledge base such as Salesforce or ServiceNow, - /// you must also delete the Amazon - /// AppIntegrations DataIntegration. This is because you can't reuse the DataIntegration - /// after it's been associated with an external knowledge base. However, you can delete - /// and recreate it. See DeleteDataIntegration - /// and CreateDataIntegration - /// in the Amazon AppIntegrations API Reference. - /// - /// + /// Retrieves content, including a pre-signed URL to download the content. /// - /// Container for the necessary parameters to execute the DeleteKnowledgeBase service method. + /// Container for the necessary parameters to execute the GetContent service method. /// - /// The response from the DeleteKnowledgeBase service method, as returned by QConnect. + /// The response from the GetContent service method, as returned by QConnect. /// /// You do not have sufficient access to perform this action. /// - /// - /// The request could not be processed because of conflict in the current state of the - /// resource. For example, if you're using a Create API (such as CreateAssistant) - /// that accepts name, a conflicting resource (usually with the same name) is being created - /// or mutated. - /// /// /// The specified resource does not exist. /// /// /// The input fails to satisfy the constraints specified by a service. /// - /// REST API Reference for DeleteKnowledgeBase Operation - public virtual DeleteKnowledgeBaseResponse DeleteKnowledgeBase(DeleteKnowledgeBaseRequest request) + /// REST API Reference for GetContent Operation + public virtual GetContentResponse GetContent(GetContentRequest request) { var options = new InvokeOptions(); - options.RequestMarshaller = DeleteKnowledgeBaseRequestMarshaller.Instance; - options.ResponseUnmarshaller = DeleteKnowledgeBaseResponseUnmarshaller.Instance; + options.RequestMarshaller = GetContentRequestMarshaller.Instance; + options.ResponseUnmarshaller = GetContentResponseUnmarshaller.Instance; - return Invoke(request, options); + return Invoke(request, options); } /// - /// Deletes the knowledge base. - /// - /// - /// - /// When you use this API to delete an external knowledge base such as Salesforce or ServiceNow, - /// you must also delete the Amazon - /// AppIntegrations DataIntegration. This is because you can't reuse the DataIntegration - /// after it's been associated with an external knowledge base. However, you can delete - /// and recreate it. See DeleteDataIntegration - /// and CreateDataIntegration - /// in the Amazon AppIntegrations API Reference. - /// - /// + /// Retrieves content, including a pre-signed URL to download the content. /// - /// Container for the necessary parameters to execute the DeleteKnowledgeBase service method. + /// Container for the necessary parameters to execute the GetContent service method. /// /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// /// - /// The response from the DeleteKnowledgeBase service method, as returned by QConnect. + /// The response from the GetContent service method, as returned by QConnect. /// /// You do not have sufficient access to perform this action. /// - /// - /// The request could not be processed because of conflict in the current state of the - /// resource. For example, if you're using a Create API (such as CreateAssistant) - /// that accepts name, a conflicting resource (usually with the same name) is being created - /// or mutated. - /// /// /// The specified resource does not exist. /// /// /// The input fails to satisfy the constraints specified by a service. /// - /// REST API Reference for DeleteKnowledgeBase Operation - public virtual Task DeleteKnowledgeBaseAsync(DeleteKnowledgeBaseRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + /// REST API Reference for GetContent Operation + public virtual Task GetContentAsync(GetContentRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { var options = new InvokeOptions(); - options.RequestMarshaller = DeleteKnowledgeBaseRequestMarshaller.Instance; - options.ResponseUnmarshaller = DeleteKnowledgeBaseResponseUnmarshaller.Instance; + options.RequestMarshaller = GetContentRequestMarshaller.Instance; + options.ResponseUnmarshaller = GetContentResponseUnmarshaller.Instance; - return InvokeAsync(request, options, cancellationToken); + return InvokeAsync(request, options, cancellationToken); } #endregion - #region DeleteQuickResponse + #region GetContentAssociation /// - /// Deletes a quick response. + /// Returns the content association. + /// + /// + /// + /// For more information about content associations--what they are and when they are used--see + /// Integrate + /// Amazon Q in Connect with step-by-step guides in the Amazon Connect Administrator + /// Guide. + /// /// - /// Container for the necessary parameters to execute the DeleteQuickResponse service method. + /// Container for the necessary parameters to execute the GetContentAssociation service method. /// - /// The response from the DeleteQuickResponse service method, as returned by QConnect. + /// The response from the GetContentAssociation service method, as returned by QConnect. /// /// You do not have sufficient access to perform this action. /// @@ -1401,26 +2409,34 @@ public virtual DeleteKnowledgeBaseResponse DeleteKnowledgeBase(DeleteKnowledgeBa /// /// The input fails to satisfy the constraints specified by a service. /// - /// REST API Reference for DeleteQuickResponse Operation - public virtual DeleteQuickResponseResponse DeleteQuickResponse(DeleteQuickResponseRequest request) + /// REST API Reference for GetContentAssociation Operation + public virtual GetContentAssociationResponse GetContentAssociation(GetContentAssociationRequest request) { var options = new InvokeOptions(); - options.RequestMarshaller = DeleteQuickResponseRequestMarshaller.Instance; - options.ResponseUnmarshaller = DeleteQuickResponseResponseUnmarshaller.Instance; + options.RequestMarshaller = GetContentAssociationRequestMarshaller.Instance; + options.ResponseUnmarshaller = GetContentAssociationResponseUnmarshaller.Instance; - return Invoke(request, options); + return Invoke(request, options); } /// - /// Deletes a quick response. + /// Returns the content association. + /// + /// + /// + /// For more information about content associations--what they are and when they are used--see + /// Integrate + /// Amazon Q in Connect with step-by-step guides in the Amazon Connect Administrator + /// Guide. + /// /// - /// Container for the necessary parameters to execute the DeleteQuickResponse service method. + /// Container for the necessary parameters to execute the GetContentAssociation service method. /// /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// /// - /// The response from the DeleteQuickResponse service method, as returned by QConnect. + /// The response from the GetContentAssociation service method, as returned by QConnect. /// /// You do not have sufficient access to perform this action. /// @@ -1430,27 +2446,27 @@ public virtual DeleteQuickResponseResponse DeleteQuickResponse(DeleteQuickRespon /// /// The input fails to satisfy the constraints specified by a service. /// - /// REST API Reference for DeleteQuickResponse Operation - public virtual Task DeleteQuickResponseAsync(DeleteQuickResponseRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + /// REST API Reference for GetContentAssociation Operation + public virtual Task GetContentAssociationAsync(GetContentAssociationRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { var options = new InvokeOptions(); - options.RequestMarshaller = DeleteQuickResponseRequestMarshaller.Instance; - options.ResponseUnmarshaller = DeleteQuickResponseResponseUnmarshaller.Instance; + options.RequestMarshaller = GetContentAssociationRequestMarshaller.Instance; + options.ResponseUnmarshaller = GetContentAssociationResponseUnmarshaller.Instance; - return InvokeAsync(request, options, cancellationToken); + return InvokeAsync(request, options, cancellationToken); } #endregion - #region GetAssistant + #region GetContentSummary /// - /// Retrieves information about an assistant. + /// Retrieves summary information about the content. /// - /// Container for the necessary parameters to execute the GetAssistant service method. + /// Container for the necessary parameters to execute the GetContentSummary service method. /// - /// The response from the GetAssistant service method, as returned by QConnect. + /// The response from the GetContentSummary service method, as returned by QConnect. /// /// You do not have sufficient access to perform this action. /// @@ -1460,26 +2476,26 @@ public virtual DeleteQuickResponseResponse DeleteQuickResponse(DeleteQuickRespon /// /// The input fails to satisfy the constraints specified by a service. /// - /// REST API Reference for GetAssistant Operation - public virtual GetAssistantResponse GetAssistant(GetAssistantRequest request) + /// REST API Reference for GetContentSummary Operation + public virtual GetContentSummaryResponse GetContentSummary(GetContentSummaryRequest request) { var options = new InvokeOptions(); - options.RequestMarshaller = GetAssistantRequestMarshaller.Instance; - options.ResponseUnmarshaller = GetAssistantResponseUnmarshaller.Instance; + options.RequestMarshaller = GetContentSummaryRequestMarshaller.Instance; + options.ResponseUnmarshaller = GetContentSummaryResponseUnmarshaller.Instance; - return Invoke(request, options); + return Invoke(request, options); } /// - /// Retrieves information about an assistant. + /// Retrieves summary information about the content. /// - /// Container for the necessary parameters to execute the GetAssistant service method. + /// Container for the necessary parameters to execute the GetContentSummary service method. /// /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// /// - /// The response from the GetAssistant service method, as returned by QConnect. + /// The response from the GetContentSummary service method, as returned by QConnect. /// /// You do not have sufficient access to perform this action. /// @@ -1489,27 +2505,27 @@ public virtual GetAssistantResponse GetAssistant(GetAssistantRequest request) /// /// The input fails to satisfy the constraints specified by a service. /// - /// REST API Reference for GetAssistant Operation - public virtual Task GetAssistantAsync(GetAssistantRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + /// REST API Reference for GetContentSummary Operation + public virtual Task GetContentSummaryAsync(GetContentSummaryRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { var options = new InvokeOptions(); - options.RequestMarshaller = GetAssistantRequestMarshaller.Instance; - options.ResponseUnmarshaller = GetAssistantResponseUnmarshaller.Instance; + options.RequestMarshaller = GetContentSummaryRequestMarshaller.Instance; + options.ResponseUnmarshaller = GetContentSummaryResponseUnmarshaller.Instance; - return InvokeAsync(request, options, cancellationToken); + return InvokeAsync(request, options, cancellationToken); } #endregion - #region GetAssistantAssociation + #region GetImportJob /// - /// Retrieves information about an assistant association. + /// Retrieves the started import job. /// - /// Container for the necessary parameters to execute the GetAssistantAssociation service method. + /// Container for the necessary parameters to execute the GetImportJob service method. /// - /// The response from the GetAssistantAssociation service method, as returned by QConnect. + /// The response from the GetImportJob service method, as returned by QConnect. /// /// You do not have sufficient access to perform this action. /// @@ -1519,26 +2535,26 @@ public virtual GetAssistantResponse GetAssistant(GetAssistantRequest request) /// /// The input fails to satisfy the constraints specified by a service. /// - /// REST API Reference for GetAssistantAssociation Operation - public virtual GetAssistantAssociationResponse GetAssistantAssociation(GetAssistantAssociationRequest request) + /// REST API Reference for GetImportJob Operation + public virtual GetImportJobResponse GetImportJob(GetImportJobRequest request) { var options = new InvokeOptions(); - options.RequestMarshaller = GetAssistantAssociationRequestMarshaller.Instance; - options.ResponseUnmarshaller = GetAssistantAssociationResponseUnmarshaller.Instance; + options.RequestMarshaller = GetImportJobRequestMarshaller.Instance; + options.ResponseUnmarshaller = GetImportJobResponseUnmarshaller.Instance; - return Invoke(request, options); + return Invoke(request, options); } /// - /// Retrieves information about an assistant association. + /// Retrieves the started import job. /// - /// Container for the necessary parameters to execute the GetAssistantAssociation service method. + /// Container for the necessary parameters to execute the GetImportJob service method. /// /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// /// - /// The response from the GetAssistantAssociation service method, as returned by QConnect. + /// The response from the GetImportJob service method, as returned by QConnect. /// /// You do not have sufficient access to perform this action. /// @@ -1548,27 +2564,27 @@ public virtual GetAssistantAssociationResponse GetAssistantAssociation(GetAssist /// /// The input fails to satisfy the constraints specified by a service. /// - /// REST API Reference for GetAssistantAssociation Operation - public virtual Task GetAssistantAssociationAsync(GetAssistantAssociationRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + /// REST API Reference for GetImportJob Operation + public virtual Task GetImportJobAsync(GetImportJobRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { var options = new InvokeOptions(); - options.RequestMarshaller = GetAssistantAssociationRequestMarshaller.Instance; - options.ResponseUnmarshaller = GetAssistantAssociationResponseUnmarshaller.Instance; + options.RequestMarshaller = GetImportJobRequestMarshaller.Instance; + options.ResponseUnmarshaller = GetImportJobResponseUnmarshaller.Instance; - return InvokeAsync(request, options, cancellationToken); + return InvokeAsync(request, options, cancellationToken); } #endregion - #region GetContent + #region GetKnowledgeBase /// - /// Retrieves content, including a pre-signed URL to download the content. + /// Retrieves information about the knowledge base. /// - /// Container for the necessary parameters to execute the GetContent service method. + /// Container for the necessary parameters to execute the GetKnowledgeBase service method. /// - /// The response from the GetContent service method, as returned by QConnect. + /// The response from the GetKnowledgeBase service method, as returned by QConnect. /// /// You do not have sufficient access to perform this action. /// @@ -1578,26 +2594,26 @@ public virtual GetAssistantAssociationResponse GetAssistantAssociation(GetAssist /// /// The input fails to satisfy the constraints specified by a service. /// - /// REST API Reference for GetContent Operation - public virtual GetContentResponse GetContent(GetContentRequest request) + /// REST API Reference for GetKnowledgeBase Operation + public virtual GetKnowledgeBaseResponse GetKnowledgeBase(GetKnowledgeBaseRequest request) { var options = new InvokeOptions(); - options.RequestMarshaller = GetContentRequestMarshaller.Instance; - options.ResponseUnmarshaller = GetContentResponseUnmarshaller.Instance; + options.RequestMarshaller = GetKnowledgeBaseRequestMarshaller.Instance; + options.ResponseUnmarshaller = GetKnowledgeBaseResponseUnmarshaller.Instance; - return Invoke(request, options); + return Invoke(request, options); } /// - /// Retrieves content, including a pre-signed URL to download the content. + /// Retrieves information about the knowledge base. /// - /// Container for the necessary parameters to execute the GetContent service method. + /// Container for the necessary parameters to execute the GetKnowledgeBase service method. /// /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// /// - /// The response from the GetContent service method, as returned by QConnect. + /// The response from the GetKnowledgeBase service method, as returned by QConnect. /// /// You do not have sufficient access to perform this action. /// @@ -1607,35 +2623,27 @@ public virtual GetContentResponse GetContent(GetContentRequest request) /// /// The input fails to satisfy the constraints specified by a service. /// - /// REST API Reference for GetContent Operation - public virtual Task GetContentAsync(GetContentRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + /// REST API Reference for GetKnowledgeBase Operation + public virtual Task GetKnowledgeBaseAsync(GetKnowledgeBaseRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { var options = new InvokeOptions(); - options.RequestMarshaller = GetContentRequestMarshaller.Instance; - options.ResponseUnmarshaller = GetContentResponseUnmarshaller.Instance; + options.RequestMarshaller = GetKnowledgeBaseRequestMarshaller.Instance; + options.ResponseUnmarshaller = GetKnowledgeBaseResponseUnmarshaller.Instance; - return InvokeAsync(request, options, cancellationToken); + return InvokeAsync(request, options, cancellationToken); } #endregion - #region GetContentAssociation + #region GetQuickResponse /// - /// Returns the content association. - /// - /// - /// - /// For more information about content associations--what they are and when they are used--see - /// Integrate - /// Amazon Q in Connect with step-by-step guides in the Amazon Connect Administrator - /// Guide. - /// + /// Retrieves the quick response. /// - /// Container for the necessary parameters to execute the GetContentAssociation service method. + /// Container for the necessary parameters to execute the GetQuickResponse service method. /// - /// The response from the GetContentAssociation service method, as returned by QConnect. + /// The response from the GetQuickResponse service method, as returned by QConnect. /// /// You do not have sufficient access to perform this action. /// @@ -1645,34 +2653,26 @@ public virtual GetContentResponse GetContent(GetContentRequest request) /// /// The input fails to satisfy the constraints specified by a service. /// - /// REST API Reference for GetContentAssociation Operation - public virtual GetContentAssociationResponse GetContentAssociation(GetContentAssociationRequest request) + /// REST API Reference for GetQuickResponse Operation + public virtual GetQuickResponseResponse GetQuickResponse(GetQuickResponseRequest request) { var options = new InvokeOptions(); - options.RequestMarshaller = GetContentAssociationRequestMarshaller.Instance; - options.ResponseUnmarshaller = GetContentAssociationResponseUnmarshaller.Instance; + options.RequestMarshaller = GetQuickResponseRequestMarshaller.Instance; + options.ResponseUnmarshaller = GetQuickResponseResponseUnmarshaller.Instance; - return Invoke(request, options); + return Invoke(request, options); } /// - /// Returns the content association. - /// - /// - /// - /// For more information about content associations--what they are and when they are used--see - /// Integrate - /// Amazon Q in Connect with step-by-step guides in the Amazon Connect Administrator - /// Guide. - /// + /// Retrieves the quick response. /// - /// Container for the necessary parameters to execute the GetContentAssociation service method. + /// Container for the necessary parameters to execute the GetQuickResponse service method. /// /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// /// - /// The response from the GetContentAssociation service method, as returned by QConnect. + /// The response from the GetQuickResponse service method, as returned by QConnect. /// /// You do not have sufficient access to perform this action. /// @@ -1682,27 +2682,41 @@ public virtual GetContentAssociationResponse GetContentAssociation(GetContentAss /// /// The input fails to satisfy the constraints specified by a service. /// - /// REST API Reference for GetContentAssociation Operation - public virtual Task GetContentAssociationAsync(GetContentAssociationRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + /// REST API Reference for GetQuickResponse Operation + public virtual Task GetQuickResponseAsync(GetQuickResponseRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { var options = new InvokeOptions(); - options.RequestMarshaller = GetContentAssociationRequestMarshaller.Instance; - options.ResponseUnmarshaller = GetContentAssociationResponseUnmarshaller.Instance; + options.RequestMarshaller = GetQuickResponseRequestMarshaller.Instance; + options.ResponseUnmarshaller = GetQuickResponseResponseUnmarshaller.Instance; - return InvokeAsync(request, options, cancellationToken); + return InvokeAsync(request, options, cancellationToken); } #endregion - #region GetContentSummary + #region GetRecommendations /// - /// Retrieves summary information about the content. + /// + /// + /// This API will be discontinued starting June 1, 2024. To receive generative responses + /// after March 1, 2024, you will need to create a new Assistant in the Amazon Connect + /// console and integrate the Amazon Q in Connect JavaScript library (amazon-q-connectjs) + /// into your applications. + /// + /// + /// + /// Retrieves recommendations for the specified session. To avoid retrieving the same + /// recommendations in subsequent calls, use NotifyRecommendationsReceived. + /// This API supports long-polling behavior with the waitTimeSeconds parameter. + /// Short poll is the default behavior and only returns recommendations already available. + /// To perform a manual query against an assistant, use QueryAssistant. + /// /// - /// Container for the necessary parameters to execute the GetContentSummary service method. + /// Container for the necessary parameters to execute the GetRecommendations service method. /// - /// The response from the GetContentSummary service method, as returned by QConnect. + /// The response from the GetRecommendations service method, as returned by QConnect. /// /// You do not have sufficient access to perform this action. /// @@ -1712,26 +2726,41 @@ public virtual GetContentAssociationResponse GetContentAssociation(GetContentAss /// /// The input fails to satisfy the constraints specified by a service. /// - /// REST API Reference for GetContentSummary Operation - public virtual GetContentSummaryResponse GetContentSummary(GetContentSummaryRequest request) + /// REST API Reference for GetRecommendations Operation + [Obsolete("GetRecommendations API will be discontinued starting June 1, 2024. To receive generative responses after March 1, 2024 you will need to create a new Assistant in the Connect console and integrate the Amazon Q in Connect JavaScript library (amazon-q-connectjs) into your applications.")] + public virtual GetRecommendationsResponse GetRecommendations(GetRecommendationsRequest request) { var options = new InvokeOptions(); - options.RequestMarshaller = GetContentSummaryRequestMarshaller.Instance; - options.ResponseUnmarshaller = GetContentSummaryResponseUnmarshaller.Instance; + options.RequestMarshaller = GetRecommendationsRequestMarshaller.Instance; + options.ResponseUnmarshaller = GetRecommendationsResponseUnmarshaller.Instance; - return Invoke(request, options); + return Invoke(request, options); } /// - /// Retrieves summary information about the content. + /// + /// + /// This API will be discontinued starting June 1, 2024. To receive generative responses + /// after March 1, 2024, you will need to create a new Assistant in the Amazon Connect + /// console and integrate the Amazon Q in Connect JavaScript library (amazon-q-connectjs) + /// into your applications. + /// + /// + /// + /// Retrieves recommendations for the specified session. To avoid retrieving the same + /// recommendations in subsequent calls, use NotifyRecommendationsReceived. + /// This API supports long-polling behavior with the waitTimeSeconds parameter. + /// Short poll is the default behavior and only returns recommendations already available. + /// To perform a manual query against an assistant, use QueryAssistant. + /// /// - /// Container for the necessary parameters to execute the GetContentSummary service method. + /// Container for the necessary parameters to execute the GetRecommendations service method. /// /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// /// - /// The response from the GetContentSummary service method, as returned by QConnect. + /// The response from the GetRecommendations service method, as returned by QConnect. /// /// You do not have sufficient access to perform this action. /// @@ -1741,27 +2770,28 @@ public virtual GetContentSummaryResponse GetContentSummary(GetContentSummaryRequ /// /// The input fails to satisfy the constraints specified by a service. /// - /// REST API Reference for GetContentSummary Operation - public virtual Task GetContentSummaryAsync(GetContentSummaryRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + /// REST API Reference for GetRecommendations Operation + [Obsolete("GetRecommendations API will be discontinued starting June 1, 2024. To receive generative responses after March 1, 2024 you will need to create a new Assistant in the Connect console and integrate the Amazon Q in Connect JavaScript library (amazon-q-connectjs) into your applications.")] + public virtual Task GetRecommendationsAsync(GetRecommendationsRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { var options = new InvokeOptions(); - options.RequestMarshaller = GetContentSummaryRequestMarshaller.Instance; - options.ResponseUnmarshaller = GetContentSummaryResponseUnmarshaller.Instance; + options.RequestMarshaller = GetRecommendationsRequestMarshaller.Instance; + options.ResponseUnmarshaller = GetRecommendationsResponseUnmarshaller.Instance; - return InvokeAsync(request, options, cancellationToken); + return InvokeAsync(request, options, cancellationToken); } #endregion - #region GetImportJob + #region GetSession /// - /// Retrieves the started import job. + /// Retrieves information for a specified session. /// - /// Container for the necessary parameters to execute the GetImportJob service method. + /// Container for the necessary parameters to execute the GetSession service method. /// - /// The response from the GetImportJob service method, as returned by QConnect. + /// The response from the GetSession service method, as returned by QConnect. /// /// You do not have sufficient access to perform this action. /// @@ -1771,26 +2801,26 @@ public virtual GetContentSummaryResponse GetContentSummary(GetContentSummaryRequ /// /// The input fails to satisfy the constraints specified by a service. /// - /// REST API Reference for GetImportJob Operation - public virtual GetImportJobResponse GetImportJob(GetImportJobRequest request) + /// REST API Reference for GetSession Operation + public virtual GetSessionResponse GetSession(GetSessionRequest request) { var options = new InvokeOptions(); - options.RequestMarshaller = GetImportJobRequestMarshaller.Instance; - options.ResponseUnmarshaller = GetImportJobResponseUnmarshaller.Instance; + options.RequestMarshaller = GetSessionRequestMarshaller.Instance; + options.ResponseUnmarshaller = GetSessionResponseUnmarshaller.Instance; - return Invoke(request, options); + return Invoke(request, options); } /// - /// Retrieves the started import job. + /// Retrieves information for a specified session. /// - /// Container for the necessary parameters to execute the GetImportJob service method. + /// Container for the necessary parameters to execute the GetSession service method. /// /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// /// - /// The response from the GetImportJob service method, as returned by QConnect. + /// The response from the GetSession service method, as returned by QConnect. /// /// You do not have sufficient access to perform this action. /// @@ -1800,280 +2830,274 @@ public virtual GetImportJobResponse GetImportJob(GetImportJobRequest request) /// /// The input fails to satisfy the constraints specified by a service. /// - /// REST API Reference for GetImportJob Operation - public virtual Task GetImportJobAsync(GetImportJobRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + /// REST API Reference for GetSession Operation + public virtual Task GetSessionAsync(GetSessionRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { var options = new InvokeOptions(); - options.RequestMarshaller = GetImportJobRequestMarshaller.Instance; - options.ResponseUnmarshaller = GetImportJobResponseUnmarshaller.Instance; + options.RequestMarshaller = GetSessionRequestMarshaller.Instance; + options.ResponseUnmarshaller = GetSessionResponseUnmarshaller.Instance; - return InvokeAsync(request, options, cancellationToken); + return InvokeAsync(request, options, cancellationToken); } #endregion - #region GetKnowledgeBase + #region ListAIAgents /// - /// Retrieves information about the knowledge base. + /// Lists AI Agents. /// - /// Container for the necessary parameters to execute the GetKnowledgeBase service method. + /// Container for the necessary parameters to execute the ListAIAgents service method. /// - /// The response from the GetKnowledgeBase service method, as returned by QConnect. + /// The response from the ListAIAgents service method, as returned by QConnect. /// /// You do not have sufficient access to perform this action. /// /// /// The specified resource does not exist. /// + /// + /// The throttling limit has been exceeded. + /// /// /// The input fails to satisfy the constraints specified by a service. /// - /// REST API Reference for GetKnowledgeBase Operation - public virtual GetKnowledgeBaseResponse GetKnowledgeBase(GetKnowledgeBaseRequest request) + /// REST API Reference for ListAIAgents Operation + public virtual ListAIAgentsResponse ListAIAgents(ListAIAgentsRequest request) { var options = new InvokeOptions(); - options.RequestMarshaller = GetKnowledgeBaseRequestMarshaller.Instance; - options.ResponseUnmarshaller = GetKnowledgeBaseResponseUnmarshaller.Instance; + options.RequestMarshaller = ListAIAgentsRequestMarshaller.Instance; + options.ResponseUnmarshaller = ListAIAgentsResponseUnmarshaller.Instance; - return Invoke(request, options); + return Invoke(request, options); } /// - /// Retrieves information about the knowledge base. + /// Lists AI Agents. /// - /// Container for the necessary parameters to execute the GetKnowledgeBase service method. + /// Container for the necessary parameters to execute the ListAIAgents service method. /// /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// /// - /// The response from the GetKnowledgeBase service method, as returned by QConnect. + /// The response from the ListAIAgents service method, as returned by QConnect. /// /// You do not have sufficient access to perform this action. /// /// /// The specified resource does not exist. /// + /// + /// The throttling limit has been exceeded. + /// /// /// The input fails to satisfy the constraints specified by a service. /// - /// REST API Reference for GetKnowledgeBase Operation - public virtual Task GetKnowledgeBaseAsync(GetKnowledgeBaseRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + /// REST API Reference for ListAIAgents Operation + public virtual Task ListAIAgentsAsync(ListAIAgentsRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { var options = new InvokeOptions(); - options.RequestMarshaller = GetKnowledgeBaseRequestMarshaller.Instance; - options.ResponseUnmarshaller = GetKnowledgeBaseResponseUnmarshaller.Instance; + options.RequestMarshaller = ListAIAgentsRequestMarshaller.Instance; + options.ResponseUnmarshaller = ListAIAgentsResponseUnmarshaller.Instance; - return InvokeAsync(request, options, cancellationToken); + return InvokeAsync(request, options, cancellationToken); } #endregion - #region GetQuickResponse + #region ListAIAgentVersions /// - /// Retrieves the quick response. + /// List AI Agent versions. /// - /// Container for the necessary parameters to execute the GetQuickResponse service method. + /// Container for the necessary parameters to execute the ListAIAgentVersions service method. /// - /// The response from the GetQuickResponse service method, as returned by QConnect. + /// The response from the ListAIAgentVersions service method, as returned by QConnect. /// /// You do not have sufficient access to perform this action. /// /// /// The specified resource does not exist. /// + /// + /// The throttling limit has been exceeded. + /// /// /// The input fails to satisfy the constraints specified by a service. /// - /// REST API Reference for GetQuickResponse Operation - public virtual GetQuickResponseResponse GetQuickResponse(GetQuickResponseRequest request) + /// REST API Reference for ListAIAgentVersions Operation + public virtual ListAIAgentVersionsResponse ListAIAgentVersions(ListAIAgentVersionsRequest request) { var options = new InvokeOptions(); - options.RequestMarshaller = GetQuickResponseRequestMarshaller.Instance; - options.ResponseUnmarshaller = GetQuickResponseResponseUnmarshaller.Instance; + options.RequestMarshaller = ListAIAgentVersionsRequestMarshaller.Instance; + options.ResponseUnmarshaller = ListAIAgentVersionsResponseUnmarshaller.Instance; - return Invoke(request, options); + return Invoke(request, options); } /// - /// Retrieves the quick response. + /// List AI Agent versions. /// - /// Container for the necessary parameters to execute the GetQuickResponse service method. + /// Container for the necessary parameters to execute the ListAIAgentVersions service method. /// /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// /// - /// The response from the GetQuickResponse service method, as returned by QConnect. + /// The response from the ListAIAgentVersions service method, as returned by QConnect. /// /// You do not have sufficient access to perform this action. /// /// /// The specified resource does not exist. /// + /// + /// The throttling limit has been exceeded. + /// /// /// The input fails to satisfy the constraints specified by a service. /// - /// REST API Reference for GetQuickResponse Operation - public virtual Task GetQuickResponseAsync(GetQuickResponseRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + /// REST API Reference for ListAIAgentVersions Operation + public virtual Task ListAIAgentVersionsAsync(ListAIAgentVersionsRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { var options = new InvokeOptions(); - options.RequestMarshaller = GetQuickResponseRequestMarshaller.Instance; - options.ResponseUnmarshaller = GetQuickResponseResponseUnmarshaller.Instance; + options.RequestMarshaller = ListAIAgentVersionsRequestMarshaller.Instance; + options.ResponseUnmarshaller = ListAIAgentVersionsResponseUnmarshaller.Instance; - return InvokeAsync(request, options, cancellationToken); + return InvokeAsync(request, options, cancellationToken); } #endregion - #region GetRecommendations + #region ListAIPrompts /// - /// - /// - /// This API will be discontinued starting June 1, 2024. To receive generative responses - /// after March 1, 2024, you will need to create a new Assistant in the Amazon Connect - /// console and integrate the Amazon Q in Connect JavaScript library (amazon-q-connectjs) - /// into your applications. - /// - /// - /// - /// Retrieves recommendations for the specified session. To avoid retrieving the same - /// recommendations in subsequent calls, use NotifyRecommendationsReceived. - /// This API supports long-polling behavior with the waitTimeSeconds parameter. - /// Short poll is the default behavior and only returns recommendations already available. - /// To perform a manual query against an assistant, use QueryAssistant. - /// + /// Lists the AI Prompts available on the Amazon Q in Connect assistant. /// - /// Container for the necessary parameters to execute the GetRecommendations service method. + /// Container for the necessary parameters to execute the ListAIPrompts service method. /// - /// The response from the GetRecommendations service method, as returned by QConnect. + /// The response from the ListAIPrompts service method, as returned by QConnect. /// /// You do not have sufficient access to perform this action. /// /// /// The specified resource does not exist. /// + /// + /// The throttling limit has been exceeded. + /// /// /// The input fails to satisfy the constraints specified by a service. /// - /// REST API Reference for GetRecommendations Operation - [Obsolete("GetRecommendations API will be discontinued starting June 1, 2024. To receive generative responses after March 1, 2024 you will need to create a new Assistant in the Connect console and integrate the Amazon Q in Connect JavaScript library (amazon-q-connectjs) into your applications.")] - public virtual GetRecommendationsResponse GetRecommendations(GetRecommendationsRequest request) + /// REST API Reference for ListAIPrompts Operation + public virtual ListAIPromptsResponse ListAIPrompts(ListAIPromptsRequest request) { var options = new InvokeOptions(); - options.RequestMarshaller = GetRecommendationsRequestMarshaller.Instance; - options.ResponseUnmarshaller = GetRecommendationsResponseUnmarshaller.Instance; + options.RequestMarshaller = ListAIPromptsRequestMarshaller.Instance; + options.ResponseUnmarshaller = ListAIPromptsResponseUnmarshaller.Instance; - return Invoke(request, options); + return Invoke(request, options); } /// - /// - /// - /// This API will be discontinued starting June 1, 2024. To receive generative responses - /// after March 1, 2024, you will need to create a new Assistant in the Amazon Connect - /// console and integrate the Amazon Q in Connect JavaScript library (amazon-q-connectjs) - /// into your applications. - /// - /// - /// - /// Retrieves recommendations for the specified session. To avoid retrieving the same - /// recommendations in subsequent calls, use NotifyRecommendationsReceived. - /// This API supports long-polling behavior with the waitTimeSeconds parameter. - /// Short poll is the default behavior and only returns recommendations already available. - /// To perform a manual query against an assistant, use QueryAssistant. - /// + /// Lists the AI Prompts available on the Amazon Q in Connect assistant. /// - /// Container for the necessary parameters to execute the GetRecommendations service method. + /// Container for the necessary parameters to execute the ListAIPrompts service method. /// /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// /// - /// The response from the GetRecommendations service method, as returned by QConnect. + /// The response from the ListAIPrompts service method, as returned by QConnect. /// /// You do not have sufficient access to perform this action. /// /// /// The specified resource does not exist. /// + /// + /// The throttling limit has been exceeded. + /// /// /// The input fails to satisfy the constraints specified by a service. /// - /// REST API Reference for GetRecommendations Operation - [Obsolete("GetRecommendations API will be discontinued starting June 1, 2024. To receive generative responses after March 1, 2024 you will need to create a new Assistant in the Connect console and integrate the Amazon Q in Connect JavaScript library (amazon-q-connectjs) into your applications.")] - public virtual Task GetRecommendationsAsync(GetRecommendationsRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + /// REST API Reference for ListAIPrompts Operation + public virtual Task ListAIPromptsAsync(ListAIPromptsRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { var options = new InvokeOptions(); - options.RequestMarshaller = GetRecommendationsRequestMarshaller.Instance; - options.ResponseUnmarshaller = GetRecommendationsResponseUnmarshaller.Instance; + options.RequestMarshaller = ListAIPromptsRequestMarshaller.Instance; + options.ResponseUnmarshaller = ListAIPromptsResponseUnmarshaller.Instance; - return InvokeAsync(request, options, cancellationToken); + return InvokeAsync(request, options, cancellationToken); } #endregion - #region GetSession + #region ListAIPromptVersions /// - /// Retrieves information for a specified session. + /// Lists AI Prompt versions. /// - /// Container for the necessary parameters to execute the GetSession service method. + /// Container for the necessary parameters to execute the ListAIPromptVersions service method. /// - /// The response from the GetSession service method, as returned by QConnect. + /// The response from the ListAIPromptVersions service method, as returned by QConnect. /// /// You do not have sufficient access to perform this action. /// /// /// The specified resource does not exist. /// + /// + /// The throttling limit has been exceeded. + /// /// /// The input fails to satisfy the constraints specified by a service. /// - /// REST API Reference for GetSession Operation - public virtual GetSessionResponse GetSession(GetSessionRequest request) + /// REST API Reference for ListAIPromptVersions Operation + public virtual ListAIPromptVersionsResponse ListAIPromptVersions(ListAIPromptVersionsRequest request) { var options = new InvokeOptions(); - options.RequestMarshaller = GetSessionRequestMarshaller.Instance; - options.ResponseUnmarshaller = GetSessionResponseUnmarshaller.Instance; + options.RequestMarshaller = ListAIPromptVersionsRequestMarshaller.Instance; + options.ResponseUnmarshaller = ListAIPromptVersionsResponseUnmarshaller.Instance; - return Invoke(request, options); + return Invoke(request, options); } /// - /// Retrieves information for a specified session. + /// Lists AI Prompt versions. /// - /// Container for the necessary parameters to execute the GetSession service method. + /// Container for the necessary parameters to execute the ListAIPromptVersions service method. /// /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// /// - /// The response from the GetSession service method, as returned by QConnect. + /// The response from the ListAIPromptVersions service method, as returned by QConnect. /// /// You do not have sufficient access to perform this action. /// /// /// The specified resource does not exist. /// + /// + /// The throttling limit has been exceeded. + /// /// /// The input fails to satisfy the constraints specified by a service. /// - /// REST API Reference for GetSession Operation - public virtual Task GetSessionAsync(GetSessionRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + /// REST API Reference for ListAIPromptVersions Operation + public virtual Task ListAIPromptVersionsAsync(ListAIPromptVersionsRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { var options = new InvokeOptions(); - options.RequestMarshaller = GetSessionRequestMarshaller.Instance; - options.ResponseUnmarshaller = GetSessionResponseUnmarshaller.Instance; + options.RequestMarshaller = ListAIPromptVersionsRequestMarshaller.Instance; + options.ResponseUnmarshaller = ListAIPromptVersionsResponseUnmarshaller.Instance; - return InvokeAsync(request, options, cancellationToken); + return InvokeAsync(request, options, cancellationToken); } #endregion @@ -2680,79 +3704,144 @@ public virtual PutFeedbackResponse PutFeedback(PutFeedbackRequest request) /// ///     ///     - /// Container for the necessary parameters to execute the QueryAssistant service method. + /// Container for the necessary parameters to execute the QueryAssistant service method. + /// + /// The response from the QueryAssistant service method, as returned by QConnect. + /// + /// You do not have sufficient access to perform this action. + /// + /// + /// The request reached the service more than 15 minutes after the date stamp on the request + /// or more than 15 minutes after the request expiration date (such as for pre-signed + /// URLs), or the date stamp on the request is more than 15 minutes in the future. + /// + /// + /// The specified resource does not exist. + /// + /// + /// The input fails to satisfy the constraints specified by a service. + /// + /// REST API Reference for QueryAssistant Operation + [Obsolete("QueryAssistant API will be discontinued starting June 1, 2024. To receive generative responses after March 1, 2024 you will need to create a new Assistant in the Connect console and integrate the Amazon Q in Connect JavaScript library (amazon-q-connectjs) into your applications.")] + public virtual QueryAssistantResponse QueryAssistant(QueryAssistantRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = QueryAssistantRequestMarshaller.Instance; + options.ResponseUnmarshaller = QueryAssistantResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// + /// + /// This API will be discontinued starting June 1, 2024. To receive generative responses + /// after March 1, 2024, you will need to create a new Assistant in the Amazon Connect + /// console and integrate the Amazon Q in Connect JavaScript library (amazon-q-connectjs) + /// into your applications. + /// + /// + /// + /// Performs a manual search against the specified assistant. To retrieve recommendations + /// for an assistant, use GetRecommendations. + /// + /// + /// + /// Container for the necessary parameters to execute the QueryAssistant service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the QueryAssistant service method, as returned by QConnect. + /// + /// You do not have sufficient access to perform this action. + /// + /// + /// The request reached the service more than 15 minutes after the date stamp on the request + /// or more than 15 minutes after the request expiration date (such as for pre-signed + /// URLs), or the date stamp on the request is more than 15 minutes in the future. + /// + /// + /// The specified resource does not exist. + /// + /// + /// The input fails to satisfy the constraints specified by a service. + /// + /// REST API Reference for QueryAssistant Operation + [Obsolete("QueryAssistant API will be discontinued starting June 1, 2024. To receive generative responses after March 1, 2024 you will need to create a new Assistant in the Connect console and integrate the Amazon Q in Connect JavaScript library (amazon-q-connectjs) into your applications.")] + public virtual Task QueryAssistantAsync(QueryAssistantRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = QueryAssistantRequestMarshaller.Instance; + options.ResponseUnmarshaller = QueryAssistantResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + + #region RemoveAssistantAIAgent + + + /// + /// Removes the AI Agent that is set for use by defafult on an Amazon Q in Connect Assistant. + /// + /// Container for the necessary parameters to execute the RemoveAssistantAIAgent service method. /// - /// The response from the QueryAssistant service method, as returned by QConnect. + /// The response from the RemoveAssistantAIAgent service method, as returned by QConnect. /// /// You do not have sufficient access to perform this action. /// - /// - /// The request reached the service more than 15 minutes after the date stamp on the request - /// or more than 15 minutes after the request expiration date (such as for pre-signed - /// URLs), or the date stamp on the request is more than 15 minutes in the future. - /// /// /// The specified resource does not exist. /// + /// + /// The throttling limit has been exceeded. + /// /// /// The input fails to satisfy the constraints specified by a service. /// - /// REST API Reference for QueryAssistant Operation - [Obsolete("QueryAssistant API will be discontinued starting June 1, 2024. To receive generative responses after March 1, 2024 you will need to create a new Assistant in the Connect console and integrate the Amazon Q in Connect JavaScript library (amazon-q-connectjs) into your applications.")] - public virtual QueryAssistantResponse QueryAssistant(QueryAssistantRequest request) + /// REST API Reference for RemoveAssistantAIAgent Operation + public virtual RemoveAssistantAIAgentResponse RemoveAssistantAIAgent(RemoveAssistantAIAgentRequest request) { var options = new InvokeOptions(); - options.RequestMarshaller = QueryAssistantRequestMarshaller.Instance; - options.ResponseUnmarshaller = QueryAssistantResponseUnmarshaller.Instance; + options.RequestMarshaller = RemoveAssistantAIAgentRequestMarshaller.Instance; + options.ResponseUnmarshaller = RemoveAssistantAIAgentResponseUnmarshaller.Instance; - return Invoke(request, options); + return Invoke(request, options); } /// - /// - /// - /// This API will be discontinued starting June 1, 2024. To receive generative responses - /// after March 1, 2024, you will need to create a new Assistant in the Amazon Connect - /// console and integrate the Amazon Q in Connect JavaScript library (amazon-q-connectjs) - /// into your applications. - /// - /// - /// - /// Performs a manual search against the specified assistant. To retrieve recommendations - /// for an assistant, use GetRecommendations. - /// - /// + /// Removes the AI Agent that is set for use by defafult on an Amazon Q in Connect Assistant. /// - /// Container for the necessary parameters to execute the QueryAssistant service method. + /// Container for the necessary parameters to execute the RemoveAssistantAIAgent service method. /// /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// /// - /// The response from the QueryAssistant service method, as returned by QConnect. + /// The response from the RemoveAssistantAIAgent service method, as returned by QConnect. /// /// You do not have sufficient access to perform this action. /// - /// - /// The request reached the service more than 15 minutes after the date stamp on the request - /// or more than 15 minutes after the request expiration date (such as for pre-signed - /// URLs), or the date stamp on the request is more than 15 minutes in the future. - /// /// /// The specified resource does not exist. /// + /// + /// The throttling limit has been exceeded. + /// /// /// The input fails to satisfy the constraints specified by a service. /// - /// REST API Reference for QueryAssistant Operation - [Obsolete("QueryAssistant API will be discontinued starting June 1, 2024. To receive generative responses after March 1, 2024 you will need to create a new Assistant in the Connect console and integrate the Amazon Q in Connect JavaScript library (amazon-q-connectjs) into your applications.")] - public virtual Task QueryAssistantAsync(QueryAssistantRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + /// REST API Reference for RemoveAssistantAIAgent Operation + public virtual Task RemoveAssistantAIAgentAsync(RemoveAssistantAIAgentRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { var options = new InvokeOptions(); - options.RequestMarshaller = QueryAssistantRequestMarshaller.Instance; - options.ResponseUnmarshaller = QueryAssistantResponseUnmarshaller.Instance; + options.RequestMarshaller = RemoveAssistantAIAgentRequestMarshaller.Instance; + options.ResponseUnmarshaller = RemoveAssistantAIAgentResponseUnmarshaller.Instance; - return InvokeAsync(request, options, cancellationToken); + return InvokeAsync(request, options, cancellationToken); } #endregion @@ -3277,6 +4366,225 @@ public virtual UntagResourceResponse UntagResource(UntagResourceRequest request) #endregion + #region UpdateAIAgent + + + /// + /// Updates an AI Agent. + /// + /// Container for the necessary parameters to execute the UpdateAIAgent service method. + /// + /// The response from the UpdateAIAgent service method, as returned by QConnect. + /// + /// You do not have sufficient access to perform this action. + /// + /// + /// The request could not be processed because of conflict in the current state of the + /// resource. For example, if you're using a Create API (such as CreateAssistant) + /// that accepts name, a conflicting resource (usually with the same name) is being created + /// or mutated. + /// + /// + /// The specified resource does not exist. + /// + /// + /// The throttling limit has been exceeded. + /// + /// + /// The input fails to satisfy the constraints specified by a service. + /// + /// REST API Reference for UpdateAIAgent Operation + public virtual UpdateAIAgentResponse UpdateAIAgent(UpdateAIAgentRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = UpdateAIAgentRequestMarshaller.Instance; + options.ResponseUnmarshaller = UpdateAIAgentResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// Updates an AI Agent. + /// + /// Container for the necessary parameters to execute the UpdateAIAgent service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the UpdateAIAgent service method, as returned by QConnect. + /// + /// You do not have sufficient access to perform this action. + /// + /// + /// The request could not be processed because of conflict in the current state of the + /// resource. For example, if you're using a Create API (such as CreateAssistant) + /// that accepts name, a conflicting resource (usually with the same name) is being created + /// or mutated. + /// + /// + /// The specified resource does not exist. + /// + /// + /// The throttling limit has been exceeded. + /// + /// + /// The input fails to satisfy the constraints specified by a service. + /// + /// REST API Reference for UpdateAIAgent Operation + public virtual Task UpdateAIAgentAsync(UpdateAIAgentRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = UpdateAIAgentRequestMarshaller.Instance; + options.ResponseUnmarshaller = UpdateAIAgentResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + + #region UpdateAIPrompt + + + /// + /// Updates an AI Prompt. + /// + /// Container for the necessary parameters to execute the UpdateAIPrompt service method. + /// + /// The response from the UpdateAIPrompt service method, as returned by QConnect. + /// + /// You do not have sufficient access to perform this action. + /// + /// + /// The request could not be processed because of conflict in the current state of the + /// resource. For example, if you're using a Create API (such as CreateAssistant) + /// that accepts name, a conflicting resource (usually with the same name) is being created + /// or mutated. + /// + /// + /// The specified resource does not exist. + /// + /// + /// The throttling limit has been exceeded. + /// + /// + /// The input fails to satisfy the constraints specified by a service. + /// + /// REST API Reference for UpdateAIPrompt Operation + public virtual UpdateAIPromptResponse UpdateAIPrompt(UpdateAIPromptRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = UpdateAIPromptRequestMarshaller.Instance; + options.ResponseUnmarshaller = UpdateAIPromptResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// Updates an AI Prompt. + /// + /// Container for the necessary parameters to execute the UpdateAIPrompt service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the UpdateAIPrompt service method, as returned by QConnect. + /// + /// You do not have sufficient access to perform this action. + /// + /// + /// The request could not be processed because of conflict in the current state of the + /// resource. For example, if you're using a Create API (such as CreateAssistant) + /// that accepts name, a conflicting resource (usually with the same name) is being created + /// or mutated. + /// + /// + /// The specified resource does not exist. + /// + /// + /// The throttling limit has been exceeded. + /// + /// + /// The input fails to satisfy the constraints specified by a service. + /// + /// REST API Reference for UpdateAIPrompt Operation + public virtual Task UpdateAIPromptAsync(UpdateAIPromptRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = UpdateAIPromptRequestMarshaller.Instance; + options.ResponseUnmarshaller = UpdateAIPromptResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + + #region UpdateAssistantAIAgent + + + /// + /// Updates the AI Agent that is set for use by defafult on an Amazon Q in Connect Assistant. + /// + /// Container for the necessary parameters to execute the UpdateAssistantAIAgent service method. + /// + /// The response from the UpdateAssistantAIAgent service method, as returned by QConnect. + /// + /// You do not have sufficient access to perform this action. + /// + /// + /// The specified resource does not exist. + /// + /// + /// The throttling limit has been exceeded. + /// + /// + /// The input fails to satisfy the constraints specified by a service. + /// + /// REST API Reference for UpdateAssistantAIAgent Operation + public virtual UpdateAssistantAIAgentResponse UpdateAssistantAIAgent(UpdateAssistantAIAgentRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = UpdateAssistantAIAgentRequestMarshaller.Instance; + options.ResponseUnmarshaller = UpdateAssistantAIAgentResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// Updates the AI Agent that is set for use by defafult on an Amazon Q in Connect Assistant. + /// + /// Container for the necessary parameters to execute the UpdateAssistantAIAgent service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the UpdateAssistantAIAgent service method, as returned by QConnect. + /// + /// You do not have sufficient access to perform this action. + /// + /// + /// The specified resource does not exist. + /// + /// + /// The throttling limit has been exceeded. + /// + /// + /// The input fails to satisfy the constraints specified by a service. + /// + /// REST API Reference for UpdateAssistantAIAgent Operation + public virtual Task UpdateAssistantAIAgentAsync(UpdateAssistantAIAgentRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = UpdateAssistantAIAgentRequestMarshaller.Instance; + options.ResponseUnmarshaller = UpdateAssistantAIAgentResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + #region UpdateContent @@ -3553,6 +4861,65 @@ public virtual UpdateSessionResponse UpdateSession(UpdateSessionRequest request) #endregion + #region UpdateSessionData + + + /// + /// Updates the data stored on an Amazon Q in Connect Session. + /// + /// Container for the necessary parameters to execute the UpdateSessionData service method. + /// + /// The response from the UpdateSessionData service method, as returned by QConnect. + /// + /// You do not have sufficient access to perform this action. + /// + /// + /// The specified resource does not exist. + /// + /// + /// The input fails to satisfy the constraints specified by a service. + /// + /// REST API Reference for UpdateSessionData Operation + public virtual UpdateSessionDataResponse UpdateSessionData(UpdateSessionDataRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = UpdateSessionDataRequestMarshaller.Instance; + options.ResponseUnmarshaller = UpdateSessionDataResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// Updates the data stored on an Amazon Q in Connect Session. + /// + /// Container for the necessary parameters to execute the UpdateSessionData service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the UpdateSessionData service method, as returned by QConnect. + /// + /// You do not have sufficient access to perform this action. + /// + /// + /// The specified resource does not exist. + /// + /// + /// The input fails to satisfy the constraints specified by a service. + /// + /// REST API Reference for UpdateSessionData Operation + public virtual Task UpdateSessionDataAsync(UpdateSessionDataRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = UpdateSessionDataRequestMarshaller.Instance; + options.ResponseUnmarshaller = UpdateSessionDataResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + #region DetermineServiceOperationEndpoint /// diff --git a/sdk/src/Services/QConnect/Properties/AssemblyInfo.cs b/sdk/src/Services/QConnect/Properties/AssemblyInfo.cs index ede50df4e638..9a078f25915e 100644 --- a/sdk/src/Services/QConnect/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/QConnect/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.22")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/QConnect/QConnect.sln b/sdk/src/Services/QConnect/QConnect.sln index 9457c6fd6e19..ee3ddd69289d 100644 --- a/sdk/src/Services/QConnect/QConnect.sln +++ b/sdk/src/Services/QConnect/QConnect.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {5C2C9CAA-C90C-4C18-9B83-A3198D536541}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {5C2C9CAA-C90C-4C18-9B83-A3198D536541}.Debug|Any CPU.Build.0 = Debug|Any CPU {5C2C9CAA-C90C-4C18-9B83-A3198D536541}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {0D4E999C-12B2-43FF-9B6F-7A46E869EA7F}.Debug|Any CPU.Build.0 = Debug|Any CPU {0D4E999C-12B2-43FF-9B6F-7A46E869EA7F}.Release|Any CPU.ActiveCfg = Release|Any CPU {0D4E999C-12B2-43FF-9B6F-7A46E869EA7F}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {90D8AD3E-B833-4401-A8DC-6B097FEE8613}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {90D8AD3E-B833-4401-A8DC-6B097FEE8613}.Debug|Any CPU.Build.0 = Debug|Any CPU - {90D8AD3E-B833-4401-A8DC-6B097FEE8613}.Release|Any CPU.ActiveCfg = Release|Any CPU - {90D8AD3E-B833-4401-A8DC-6B097FEE8613}.Release|Any CPU.Build.0 = Release|Any CPU - {AA123834-D2A8-4CCE-B372-C0F913E6EF7E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AA123834-D2A8-4CCE-B372-C0F913E6EF7E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AA123834-D2A8-4CCE-B372-C0F913E6EF7E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AA123834-D2A8-4CCE-B372-C0F913E6EF7E}.Release|Any CPU.Build.0 = Release|Any CPU - {95ABBF1D-5536-4517-B1FF-420485C6A2A9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {95ABBF1D-5536-4517-B1FF-420485C6A2A9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {95ABBF1D-5536-4517-B1FF-420485C6A2A9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {95ABBF1D-5536-4517-B1FF-420485C6A2A9}.Release|Any CPU.Build.0 = Release|Any CPU - {B40BB744-0FED-4239-9929-AA6CF65627BE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B40BB744-0FED-4239-9929-AA6CF65627BE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B40BB744-0FED-4239-9929-AA6CF65627BE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B40BB744-0FED-4239-9929-AA6CF65627BE}.Release|Any CPU.Build.0 = Release|Any CPU - {1F7FD47B-E9E9-453F-ACC5-CCECC59B6B2B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1F7FD47B-E9E9-453F-ACC5-CCECC59B6B2B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1F7FD47B-E9E9-453F-ACC5-CCECC59B6B2B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1F7FD47B-E9E9-453F-ACC5-CCECC59B6B2B}.Release|Any CPU.Build.0 = Release|Any CPU - {18921C77-31D7-4D7B-95B4-A7D7E37D8A65}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {18921C77-31D7-4D7B-95B4-A7D7E37D8A65}.Debug|Any CPU.Build.0 = Debug|Any CPU - {18921C77-31D7-4D7B-95B4-A7D7E37D8A65}.Release|Any CPU.ActiveCfg = Release|Any CPU - {18921C77-31D7-4D7B-95B4-A7D7E37D8A65}.Release|Any CPU.Build.0 = Release|Any CPU - {02739CCB-9E31-425F-AC85-027DACEFCE47}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {02739CCB-9E31-425F-AC85-027DACEFCE47}.Debug|Any CPU.Build.0 = Debug|Any CPU - {02739CCB-9E31-425F-AC85-027DACEFCE47}.Release|Any CPU.ActiveCfg = Release|Any CPU - {02739CCB-9E31-425F-AC85-027DACEFCE47}.Release|Any CPU.Build.0 = Release|Any CPU - {051A41D9-209A-471D-B54B-30D672D01742}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {051A41D9-209A-471D-B54B-30D672D01742}.Debug|Any CPU.Build.0 = Debug|Any CPU - {051A41D9-209A-471D-B54B-30D672D01742}.Release|Any CPU.ActiveCfg = Release|Any CPU - {051A41D9-209A-471D-B54B-30D672D01742}.Release|Any CPU.Build.0 = Release|Any CPU - {0FD5F20E-DD16-420C-8C68-CDEAC8D0449E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0FD5F20E-DD16-420C-8C68-CDEAC8D0449E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0FD5F20E-DD16-420C-8C68-CDEAC8D0449E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0FD5F20E-DD16-420C-8C68-CDEAC8D0449E}.Release|Any CPU.Build.0 = Release|Any CPU - {584F0D1A-7AA3-403A-90C7-75FBC10D3033}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {584F0D1A-7AA3-403A-90C7-75FBC10D3033}.Debug|Any CPU.Build.0 = Debug|Any CPU - {584F0D1A-7AA3-403A-90C7-75FBC10D3033}.Release|Any CPU.ActiveCfg = Release|Any CPU - {584F0D1A-7AA3-403A-90C7-75FBC10D3033}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {90D8AD3E-B833-4401-A8DC-6B097FEE8613}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {90D8AD3E-B833-4401-A8DC-6B097FEE8613}.Debug|Any CPU.Build.0 = Debug|Any CPU - {90D8AD3E-B833-4401-A8DC-6B097FEE8613}.Release|Any CPU.ActiveCfg = Release|Any CPU - {90D8AD3E-B833-4401-A8DC-6B097FEE8613}.Release|Any CPU.Build.0 = Release|Any CPU - {AA123834-D2A8-4CCE-B372-C0F913E6EF7E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AA123834-D2A8-4CCE-B372-C0F913E6EF7E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AA123834-D2A8-4CCE-B372-C0F913E6EF7E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AA123834-D2A8-4CCE-B372-C0F913E6EF7E}.Release|Any CPU.Build.0 = Release|Any CPU - {95ABBF1D-5536-4517-B1FF-420485C6A2A9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {95ABBF1D-5536-4517-B1FF-420485C6A2A9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {95ABBF1D-5536-4517-B1FF-420485C6A2A9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {95ABBF1D-5536-4517-B1FF-420485C6A2A9}.Release|Any CPU.Build.0 = Release|Any CPU - {B40BB744-0FED-4239-9929-AA6CF65627BE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B40BB744-0FED-4239-9929-AA6CF65627BE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B40BB744-0FED-4239-9929-AA6CF65627BE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B40BB744-0FED-4239-9929-AA6CF65627BE}.Release|Any CPU.Build.0 = Release|Any CPU - {1F7FD47B-E9E9-453F-ACC5-CCECC59B6B2B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1F7FD47B-E9E9-453F-ACC5-CCECC59B6B2B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1F7FD47B-E9E9-453F-ACC5-CCECC59B6B2B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1F7FD47B-E9E9-453F-ACC5-CCECC59B6B2B}.Release|Any CPU.Build.0 = Release|Any CPU - {18921C77-31D7-4D7B-95B4-A7D7E37D8A65}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {18921C77-31D7-4D7B-95B4-A7D7E37D8A65}.Debug|Any CPU.Build.0 = Debug|Any CPU - {18921C77-31D7-4D7B-95B4-A7D7E37D8A65}.Release|Any CPU.ActiveCfg = Release|Any CPU - {18921C77-31D7-4D7B-95B4-A7D7E37D8A65}.Release|Any CPU.Build.0 = Release|Any CPU - {02739CCB-9E31-425F-AC85-027DACEFCE47}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {02739CCB-9E31-425F-AC85-027DACEFCE47}.Debug|Any CPU.Build.0 = Debug|Any CPU - {02739CCB-9E31-425F-AC85-027DACEFCE47}.Release|Any CPU.ActiveCfg = Release|Any CPU - {02739CCB-9E31-425F-AC85-027DACEFCE47}.Release|Any CPU.Build.0 = Release|Any CPU - {051A41D9-209A-471D-B54B-30D672D01742}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {051A41D9-209A-471D-B54B-30D672D01742}.Debug|Any CPU.Build.0 = Debug|Any CPU - {051A41D9-209A-471D-B54B-30D672D01742}.Release|Any CPU.ActiveCfg = Release|Any CPU - {051A41D9-209A-471D-B54B-30D672D01742}.Release|Any CPU.Build.0 = Release|Any CPU - {0FD5F20E-DD16-420C-8C68-CDEAC8D0449E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0FD5F20E-DD16-420C-8C68-CDEAC8D0449E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0FD5F20E-DD16-420C-8C68-CDEAC8D0449E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0FD5F20E-DD16-420C-8C68-CDEAC8D0449E}.Release|Any CPU.Build.0 = Release|Any CPU - {584F0D1A-7AA3-403A-90C7-75FBC10D3033}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {584F0D1A-7AA3-403A-90C7-75FBC10D3033}.Debug|Any CPU.Build.0 = Debug|Any CPU - {584F0D1A-7AA3-403A-90C7-75FBC10D3033}.Release|Any CPU.ActiveCfg = Release|Any CPU - {584F0D1A-7AA3-403A-90C7-75FBC10D3033}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {5C2C9CAA-C90C-4C18-9B83-A3198D536541} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {783297D9-05AF-40FC-A75D-9F9AFE2756FA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {EF462445-0F0C-4A5C-81FB-A26809637E50} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {6699EFC3-F808-44DB-BC48-9CF203A7A9A4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {0D4E999C-12B2-43FF-9B6F-7A46E869EA7F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {90D8AD3E-B833-4401-A8DC-6B097FEE8613} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {AA123834-D2A8-4CCE-B372-C0F913E6EF7E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {95ABBF1D-5536-4517-B1FF-420485C6A2A9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B40BB744-0FED-4239-9929-AA6CF65627BE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {1F7FD47B-E9E9-453F-ACC5-CCECC59B6B2B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {18921C77-31D7-4D7B-95B4-A7D7E37D8A65} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {02739CCB-9E31-425F-AC85-027DACEFCE47} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {051A41D9-209A-471D-B54B-30D672D01742} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0FD5F20E-DD16-420C-8C68-CDEAC8D0449E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {584F0D1A-7AA3-403A-90C7-75FBC10D3033} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {90D8AD3E-B833-4401-A8DC-6B097FEE8613} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {AA123834-D2A8-4CCE-B372-C0F913E6EF7E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {95ABBF1D-5536-4517-B1FF-420485C6A2A9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B40BB744-0FED-4239-9929-AA6CF65627BE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {1F7FD47B-E9E9-453F-ACC5-CCECC59B6B2B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {18921C77-31D7-4D7B-95B4-A7D7E37D8A65} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {02739CCB-9E31-425F-AC85-027DACEFCE47} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {051A41D9-209A-471D-B54B-30D672D01742} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0FD5F20E-DD16-420C-8C68-CDEAC8D0449E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {584F0D1A-7AA3-403A-90C7-75FBC10D3033} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {892505B8-E728-4B7D-AC73-CC59A5B4B9AD} diff --git a/sdk/src/Services/QLDB/Generated/AmazonQLDBConfig.cs b/sdk/src/Services/QLDB/Generated/AmazonQLDBConfig.cs index aabddbec1201..043e048fa71c 100644 --- a/sdk/src/Services/QLDB/Generated/AmazonQLDBConfig.cs +++ b/sdk/src/Services/QLDB/Generated/AmazonQLDBConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.QLDB public partial class AmazonQLDBConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("QLDB", "4.0.0.0"); private static readonly AmazonQLDBEndpointResolver EndpointResolver = new AmazonQLDBEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("QLDB", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("QLDB", "3.7.400.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/QLDB/Properties/AssemblyInfo.cs b/sdk/src/Services/QLDB/Properties/AssemblyInfo.cs index 7d97f32935cc..a7bd2d6bd821 100644 --- a/sdk/src/Services/QLDB/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/QLDB/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/QLDB/QLDB.sln b/sdk/src/Services/QLDB/QLDB.sln index 7a824cf93299..74eaa752f3ae 100644 --- a/sdk/src/Services/QLDB/QLDB.sln +++ b/sdk/src/Services/QLDB/QLDB.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {2D60D46A-FBE5-45F5-93CF-187EA4F2D0DE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {2D60D46A-FBE5-45F5-93CF-187EA4F2D0DE}.Debug|Any CPU.Build.0 = Debug|Any CPU {2D60D46A-FBE5-45F5-93CF-187EA4F2D0DE}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {604B1EE8-8CB4-4146-AB8D-440FF3E3EDD3}.Debug|Any CPU.Build.0 = Debug|Any CPU {604B1EE8-8CB4-4146-AB8D-440FF3E3EDD3}.Release|Any CPU.ActiveCfg = Release|Any CPU {604B1EE8-8CB4-4146-AB8D-440FF3E3EDD3}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {0DC871E0-A790-44A4-87E0-C3D2E4DB9A55}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0DC871E0-A790-44A4-87E0-C3D2E4DB9A55}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0DC871E0-A790-44A4-87E0-C3D2E4DB9A55}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0DC871E0-A790-44A4-87E0-C3D2E4DB9A55}.Release|Any CPU.Build.0 = Release|Any CPU - {32CDB230-896D-498C-888D-EF28DB81FA06}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {32CDB230-896D-498C-888D-EF28DB81FA06}.Debug|Any CPU.Build.0 = Debug|Any CPU - {32CDB230-896D-498C-888D-EF28DB81FA06}.Release|Any CPU.ActiveCfg = Release|Any CPU - {32CDB230-896D-498C-888D-EF28DB81FA06}.Release|Any CPU.Build.0 = Release|Any CPU - {15FBCC8C-096D-4327-B80A-14928EDEA7D8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {15FBCC8C-096D-4327-B80A-14928EDEA7D8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {15FBCC8C-096D-4327-B80A-14928EDEA7D8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {15FBCC8C-096D-4327-B80A-14928EDEA7D8}.Release|Any CPU.Build.0 = Release|Any CPU - {6E2F881D-CCAF-46B8-BB14-BD93A586A41A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6E2F881D-CCAF-46B8-BB14-BD93A586A41A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6E2F881D-CCAF-46B8-BB14-BD93A586A41A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6E2F881D-CCAF-46B8-BB14-BD93A586A41A}.Release|Any CPU.Build.0 = Release|Any CPU - {5F57468B-8F9C-40C6-86B3-AAEE8E4C33FD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5F57468B-8F9C-40C6-86B3-AAEE8E4C33FD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5F57468B-8F9C-40C6-86B3-AAEE8E4C33FD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5F57468B-8F9C-40C6-86B3-AAEE8E4C33FD}.Release|Any CPU.Build.0 = Release|Any CPU - {FCA80381-AEC0-4D16-9DA4-171118F0EAFA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FCA80381-AEC0-4D16-9DA4-171118F0EAFA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FCA80381-AEC0-4D16-9DA4-171118F0EAFA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FCA80381-AEC0-4D16-9DA4-171118F0EAFA}.Release|Any CPU.Build.0 = Release|Any CPU - {2C07D612-E8D7-45CE-B211-4203B06A9235}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2C07D612-E8D7-45CE-B211-4203B06A9235}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2C07D612-E8D7-45CE-B211-4203B06A9235}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2C07D612-E8D7-45CE-B211-4203B06A9235}.Release|Any CPU.Build.0 = Release|Any CPU - {7498FD13-1C74-4F01-B568-96E8BB5143ED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7498FD13-1C74-4F01-B568-96E8BB5143ED}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7498FD13-1C74-4F01-B568-96E8BB5143ED}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7498FD13-1C74-4F01-B568-96E8BB5143ED}.Release|Any CPU.Build.0 = Release|Any CPU - {E175FDB2-4495-44DE-964C-E2C76B4D312F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E175FDB2-4495-44DE-964C-E2C76B4D312F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E175FDB2-4495-44DE-964C-E2C76B4D312F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E175FDB2-4495-44DE-964C-E2C76B4D312F}.Release|Any CPU.Build.0 = Release|Any CPU - {1F258371-3B85-4CDF-8998-F356765F56E9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1F258371-3B85-4CDF-8998-F356765F56E9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1F258371-3B85-4CDF-8998-F356765F56E9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1F258371-3B85-4CDF-8998-F356765F56E9}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {0DC871E0-A790-44A4-87E0-C3D2E4DB9A55}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0DC871E0-A790-44A4-87E0-C3D2E4DB9A55}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0DC871E0-A790-44A4-87E0-C3D2E4DB9A55}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0DC871E0-A790-44A4-87E0-C3D2E4DB9A55}.Release|Any CPU.Build.0 = Release|Any CPU - {32CDB230-896D-498C-888D-EF28DB81FA06}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {32CDB230-896D-498C-888D-EF28DB81FA06}.Debug|Any CPU.Build.0 = Debug|Any CPU - {32CDB230-896D-498C-888D-EF28DB81FA06}.Release|Any CPU.ActiveCfg = Release|Any CPU - {32CDB230-896D-498C-888D-EF28DB81FA06}.Release|Any CPU.Build.0 = Release|Any CPU - {15FBCC8C-096D-4327-B80A-14928EDEA7D8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {15FBCC8C-096D-4327-B80A-14928EDEA7D8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {15FBCC8C-096D-4327-B80A-14928EDEA7D8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {15FBCC8C-096D-4327-B80A-14928EDEA7D8}.Release|Any CPU.Build.0 = Release|Any CPU - {6E2F881D-CCAF-46B8-BB14-BD93A586A41A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6E2F881D-CCAF-46B8-BB14-BD93A586A41A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6E2F881D-CCAF-46B8-BB14-BD93A586A41A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6E2F881D-CCAF-46B8-BB14-BD93A586A41A}.Release|Any CPU.Build.0 = Release|Any CPU - {5F57468B-8F9C-40C6-86B3-AAEE8E4C33FD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5F57468B-8F9C-40C6-86B3-AAEE8E4C33FD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5F57468B-8F9C-40C6-86B3-AAEE8E4C33FD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5F57468B-8F9C-40C6-86B3-AAEE8E4C33FD}.Release|Any CPU.Build.0 = Release|Any CPU - {FCA80381-AEC0-4D16-9DA4-171118F0EAFA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FCA80381-AEC0-4D16-9DA4-171118F0EAFA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FCA80381-AEC0-4D16-9DA4-171118F0EAFA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FCA80381-AEC0-4D16-9DA4-171118F0EAFA}.Release|Any CPU.Build.0 = Release|Any CPU - {2C07D612-E8D7-45CE-B211-4203B06A9235}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2C07D612-E8D7-45CE-B211-4203B06A9235}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2C07D612-E8D7-45CE-B211-4203B06A9235}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2C07D612-E8D7-45CE-B211-4203B06A9235}.Release|Any CPU.Build.0 = Release|Any CPU - {7498FD13-1C74-4F01-B568-96E8BB5143ED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7498FD13-1C74-4F01-B568-96E8BB5143ED}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7498FD13-1C74-4F01-B568-96E8BB5143ED}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7498FD13-1C74-4F01-B568-96E8BB5143ED}.Release|Any CPU.Build.0 = Release|Any CPU - {E175FDB2-4495-44DE-964C-E2C76B4D312F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E175FDB2-4495-44DE-964C-E2C76B4D312F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E175FDB2-4495-44DE-964C-E2C76B4D312F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E175FDB2-4495-44DE-964C-E2C76B4D312F}.Release|Any CPU.Build.0 = Release|Any CPU - {1F258371-3B85-4CDF-8998-F356765F56E9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1F258371-3B85-4CDF-8998-F356765F56E9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1F258371-3B85-4CDF-8998-F356765F56E9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1F258371-3B85-4CDF-8998-F356765F56E9}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {2D60D46A-FBE5-45F5-93CF-187EA4F2D0DE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {72CD437C-1218-46FE-B39F-4A0AF8D9B8CF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {07C5798B-3DDC-4387-833E-BB086B6276C9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {4837E363-6BF4-4B81-87C4-6FC9353FB48F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {604B1EE8-8CB4-4146-AB8D-440FF3E3EDD3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {0DC871E0-A790-44A4-87E0-C3D2E4DB9A55} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {32CDB230-896D-498C-888D-EF28DB81FA06} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {15FBCC8C-096D-4327-B80A-14928EDEA7D8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6E2F881D-CCAF-46B8-BB14-BD93A586A41A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {5F57468B-8F9C-40C6-86B3-AAEE8E4C33FD} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {FCA80381-AEC0-4D16-9DA4-171118F0EAFA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {2C07D612-E8D7-45CE-B211-4203B06A9235} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {7498FD13-1C74-4F01-B568-96E8BB5143ED} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E175FDB2-4495-44DE-964C-E2C76B4D312F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {1F258371-3B85-4CDF-8998-F356765F56E9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {0DC871E0-A790-44A4-87E0-C3D2E4DB9A55} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {32CDB230-896D-498C-888D-EF28DB81FA06} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {15FBCC8C-096D-4327-B80A-14928EDEA7D8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6E2F881D-CCAF-46B8-BB14-BD93A586A41A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {5F57468B-8F9C-40C6-86B3-AAEE8E4C33FD} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {FCA80381-AEC0-4D16-9DA4-171118F0EAFA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {2C07D612-E8D7-45CE-B211-4203B06A9235} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {7498FD13-1C74-4F01-B568-96E8BB5143ED} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E175FDB2-4495-44DE-964C-E2C76B4D312F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {1F258371-3B85-4CDF-8998-F356765F56E9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {BE52E68D-0D60-4A27-8BCE-CF94C63052E6} diff --git a/sdk/src/Services/QLDBSession/Generated/AmazonQLDBSessionConfig.cs b/sdk/src/Services/QLDBSession/Generated/AmazonQLDBSessionConfig.cs index 87fbad1df697..841c148bc0ab 100644 --- a/sdk/src/Services/QLDBSession/Generated/AmazonQLDBSessionConfig.cs +++ b/sdk/src/Services/QLDBSession/Generated/AmazonQLDBSessionConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.QLDBSession public partial class AmazonQLDBSessionConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("QLDB Session", "4.0.0.0"); private static readonly AmazonQLDBSessionEndpointResolver EndpointResolver = new AmazonQLDBSessionEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("QLDB Session", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("QLDB Session", "3.7.400.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/QLDBSession/Properties/AssemblyInfo.cs b/sdk/src/Services/QLDBSession/Properties/AssemblyInfo.cs index 71acaeb0c613..07c42bff311d 100644 --- a/sdk/src/Services/QLDBSession/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/QLDBSession/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/QLDBSession/QLDBSession.sln b/sdk/src/Services/QLDBSession/QLDBSession.sln index 046bf2b558b6..f9b9def6729b 100644 --- a/sdk/src/Services/QLDBSession/QLDBSession.sln +++ b/sdk/src/Services/QLDBSession/QLDBSession.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {CB2CA617-8F4F-435E-BC12-C3ED32CCBC90}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {CB2CA617-8F4F-435E-BC12-C3ED32CCBC90}.Debug|Any CPU.Build.0 = Debug|Any CPU {CB2CA617-8F4F-435E-BC12-C3ED32CCBC90}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {8F90DD9F-1754-4075-AA3E-D862C73C5AC0}.Debug|Any CPU.Build.0 = Debug|Any CPU {8F90DD9F-1754-4075-AA3E-D862C73C5AC0}.Release|Any CPU.ActiveCfg = Release|Any CPU {8F90DD9F-1754-4075-AA3E-D862C73C5AC0}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {AD13FCEA-2B3F-4869-8B8E-6EF3482559AA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AD13FCEA-2B3F-4869-8B8E-6EF3482559AA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AD13FCEA-2B3F-4869-8B8E-6EF3482559AA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AD13FCEA-2B3F-4869-8B8E-6EF3482559AA}.Release|Any CPU.Build.0 = Release|Any CPU - {2D1D1EEC-1409-4D15-8143-671311684F69}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2D1D1EEC-1409-4D15-8143-671311684F69}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2D1D1EEC-1409-4D15-8143-671311684F69}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2D1D1EEC-1409-4D15-8143-671311684F69}.Release|Any CPU.Build.0 = Release|Any CPU - {AF8AFB16-931A-4E8D-A715-809A4CDC4D94}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AF8AFB16-931A-4E8D-A715-809A4CDC4D94}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AF8AFB16-931A-4E8D-A715-809A4CDC4D94}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AF8AFB16-931A-4E8D-A715-809A4CDC4D94}.Release|Any CPU.Build.0 = Release|Any CPU - {AD1A1172-3EDC-4EB3-A3E8-00894ED62AE1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AD1A1172-3EDC-4EB3-A3E8-00894ED62AE1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AD1A1172-3EDC-4EB3-A3E8-00894ED62AE1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AD1A1172-3EDC-4EB3-A3E8-00894ED62AE1}.Release|Any CPU.Build.0 = Release|Any CPU - {E8E02B1F-05BF-440F-ADCE-0CD78B9082A4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E8E02B1F-05BF-440F-ADCE-0CD78B9082A4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E8E02B1F-05BF-440F-ADCE-0CD78B9082A4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E8E02B1F-05BF-440F-ADCE-0CD78B9082A4}.Release|Any CPU.Build.0 = Release|Any CPU - {01234957-7895-4F68-862E-FA594E55B27A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {01234957-7895-4F68-862E-FA594E55B27A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {01234957-7895-4F68-862E-FA594E55B27A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {01234957-7895-4F68-862E-FA594E55B27A}.Release|Any CPU.Build.0 = Release|Any CPU - {4677E553-77CE-4AB7-AB42-DC4D154C383E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4677E553-77CE-4AB7-AB42-DC4D154C383E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4677E553-77CE-4AB7-AB42-DC4D154C383E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4677E553-77CE-4AB7-AB42-DC4D154C383E}.Release|Any CPU.Build.0 = Release|Any CPU - {20950DE3-ACA1-464F-AC61-49CBA30A240A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {20950DE3-ACA1-464F-AC61-49CBA30A240A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {20950DE3-ACA1-464F-AC61-49CBA30A240A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {20950DE3-ACA1-464F-AC61-49CBA30A240A}.Release|Any CPU.Build.0 = Release|Any CPU - {411CAD1B-DDC6-4F1A-B01B-20FC6CBC80C4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {411CAD1B-DDC6-4F1A-B01B-20FC6CBC80C4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {411CAD1B-DDC6-4F1A-B01B-20FC6CBC80C4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {411CAD1B-DDC6-4F1A-B01B-20FC6CBC80C4}.Release|Any CPU.Build.0 = Release|Any CPU - {F3496535-C489-4A19-AE7B-68097285CAFB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F3496535-C489-4A19-AE7B-68097285CAFB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F3496535-C489-4A19-AE7B-68097285CAFB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F3496535-C489-4A19-AE7B-68097285CAFB}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {AD13FCEA-2B3F-4869-8B8E-6EF3482559AA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AD13FCEA-2B3F-4869-8B8E-6EF3482559AA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AD13FCEA-2B3F-4869-8B8E-6EF3482559AA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AD13FCEA-2B3F-4869-8B8E-6EF3482559AA}.Release|Any CPU.Build.0 = Release|Any CPU - {2D1D1EEC-1409-4D15-8143-671311684F69}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2D1D1EEC-1409-4D15-8143-671311684F69}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2D1D1EEC-1409-4D15-8143-671311684F69}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2D1D1EEC-1409-4D15-8143-671311684F69}.Release|Any CPU.Build.0 = Release|Any CPU - {AF8AFB16-931A-4E8D-A715-809A4CDC4D94}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AF8AFB16-931A-4E8D-A715-809A4CDC4D94}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AF8AFB16-931A-4E8D-A715-809A4CDC4D94}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AF8AFB16-931A-4E8D-A715-809A4CDC4D94}.Release|Any CPU.Build.0 = Release|Any CPU - {AD1A1172-3EDC-4EB3-A3E8-00894ED62AE1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AD1A1172-3EDC-4EB3-A3E8-00894ED62AE1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AD1A1172-3EDC-4EB3-A3E8-00894ED62AE1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AD1A1172-3EDC-4EB3-A3E8-00894ED62AE1}.Release|Any CPU.Build.0 = Release|Any CPU - {E8E02B1F-05BF-440F-ADCE-0CD78B9082A4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E8E02B1F-05BF-440F-ADCE-0CD78B9082A4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E8E02B1F-05BF-440F-ADCE-0CD78B9082A4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E8E02B1F-05BF-440F-ADCE-0CD78B9082A4}.Release|Any CPU.Build.0 = Release|Any CPU - {01234957-7895-4F68-862E-FA594E55B27A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {01234957-7895-4F68-862E-FA594E55B27A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {01234957-7895-4F68-862E-FA594E55B27A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {01234957-7895-4F68-862E-FA594E55B27A}.Release|Any CPU.Build.0 = Release|Any CPU - {4677E553-77CE-4AB7-AB42-DC4D154C383E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4677E553-77CE-4AB7-AB42-DC4D154C383E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4677E553-77CE-4AB7-AB42-DC4D154C383E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4677E553-77CE-4AB7-AB42-DC4D154C383E}.Release|Any CPU.Build.0 = Release|Any CPU - {20950DE3-ACA1-464F-AC61-49CBA30A240A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {20950DE3-ACA1-464F-AC61-49CBA30A240A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {20950DE3-ACA1-464F-AC61-49CBA30A240A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {20950DE3-ACA1-464F-AC61-49CBA30A240A}.Release|Any CPU.Build.0 = Release|Any CPU - {411CAD1B-DDC6-4F1A-B01B-20FC6CBC80C4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {411CAD1B-DDC6-4F1A-B01B-20FC6CBC80C4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {411CAD1B-DDC6-4F1A-B01B-20FC6CBC80C4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {411CAD1B-DDC6-4F1A-B01B-20FC6CBC80C4}.Release|Any CPU.Build.0 = Release|Any CPU - {F3496535-C489-4A19-AE7B-68097285CAFB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F3496535-C489-4A19-AE7B-68097285CAFB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F3496535-C489-4A19-AE7B-68097285CAFB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F3496535-C489-4A19-AE7B-68097285CAFB}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {CB2CA617-8F4F-435E-BC12-C3ED32CCBC90} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {44A39346-E870-4DC6-8EE9-CBCD94464004} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {88AD7055-3DE2-495A-9A95-545B4D648105} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {486897E2-D233-48FE-96CD-9AF0CBC1ADAE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {8F90DD9F-1754-4075-AA3E-D862C73C5AC0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {AD13FCEA-2B3F-4869-8B8E-6EF3482559AA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {2D1D1EEC-1409-4D15-8143-671311684F69} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {AF8AFB16-931A-4E8D-A715-809A4CDC4D94} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {AD1A1172-3EDC-4EB3-A3E8-00894ED62AE1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E8E02B1F-05BF-440F-ADCE-0CD78B9082A4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {01234957-7895-4F68-862E-FA594E55B27A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4677E553-77CE-4AB7-AB42-DC4D154C383E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {20950DE3-ACA1-464F-AC61-49CBA30A240A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {411CAD1B-DDC6-4F1A-B01B-20FC6CBC80C4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F3496535-C489-4A19-AE7B-68097285CAFB} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {AD13FCEA-2B3F-4869-8B8E-6EF3482559AA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {2D1D1EEC-1409-4D15-8143-671311684F69} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {AF8AFB16-931A-4E8D-A715-809A4CDC4D94} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {AD1A1172-3EDC-4EB3-A3E8-00894ED62AE1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E8E02B1F-05BF-440F-ADCE-0CD78B9082A4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {01234957-7895-4F68-862E-FA594E55B27A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4677E553-77CE-4AB7-AB42-DC4D154C383E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {20950DE3-ACA1-464F-AC61-49CBA30A240A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {411CAD1B-DDC6-4F1A-B01B-20FC6CBC80C4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F3496535-C489-4A19-AE7B-68097285CAFB} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {AC7036A5-475A-49B1-ACDF-9CFCA3AA0762} diff --git a/sdk/src/Services/QuickSight/Generated/AmazonQuickSightConfig.cs b/sdk/src/Services/QuickSight/Generated/AmazonQuickSightConfig.cs index b363c7363849..4801f90db70a 100644 --- a/sdk/src/Services/QuickSight/Generated/AmazonQuickSightConfig.cs +++ b/sdk/src/Services/QuickSight/Generated/AmazonQuickSightConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.QuickSight public partial class AmazonQuickSightConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("QuickSight", "4.0.0.0"); private static readonly AmazonQuickSightEndpointResolver EndpointResolver = new AmazonQuickSightEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("QuickSight", "3.7.405.0"); -======= - InternalSDKUtils.BuildUserAgentString("QuickSight", "3.7.409.2"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/QuickSight/Generated/Model/BrandDetail.cs b/sdk/src/Services/QuickSight/Generated/Model/BrandDetail.cs index 45fbd21a853d..16dfae677701 100644 --- a/sdk/src/Services/QuickSight/Generated/Model/BrandDetail.cs +++ b/sdk/src/Services/QuickSight/Generated/Model/BrandDetail.cs @@ -105,9 +105,9 @@ internal bool IsSetBrandStatus() /// The time that the brand was created. /// /// - public DateTime CreatedTime + public DateTime? CreatedTime { - get { return this._createdTime.GetValueOrDefault(); } + get { return this._createdTime; } set { this._createdTime = value; } } @@ -141,9 +141,9 @@ internal bool IsSetErrors() /// The last time the brand was updated. /// /// - public DateTime LastUpdatedTime + public DateTime? LastUpdatedTime { - get { return this._lastUpdatedTime.GetValueOrDefault(); } + get { return this._lastUpdatedTime; } set { this._lastUpdatedTime = value; } } diff --git a/sdk/src/Services/QuickSight/Generated/Model/BrandSummary.cs b/sdk/src/Services/QuickSight/Generated/Model/BrandSummary.cs index d96174f74acd..657132ef7607 100644 --- a/sdk/src/Services/QuickSight/Generated/Model/BrandSummary.cs +++ b/sdk/src/Services/QuickSight/Generated/Model/BrandSummary.cs @@ -122,9 +122,9 @@ internal bool IsSetBrandStatus() /// The time that the brand was created. /// /// - public DateTime CreatedTime + public DateTime? CreatedTime { - get { return this._createdTime.GetValueOrDefault(); } + get { return this._createdTime; } set { this._createdTime = value; } } @@ -159,9 +159,9 @@ internal bool IsSetDescription() /// The time when the brand was last updated. /// /// - public DateTime LastUpdatedTime + public DateTime? LastUpdatedTime { - get { return this._lastUpdatedTime.GetValueOrDefault(); } + get { return this._lastUpdatedTime; } set { this._lastUpdatedTime = value; } } diff --git a/sdk/src/Services/QuickSight/Generated/Model/CreateCustomPermissionsResponse.cs b/sdk/src/Services/QuickSight/Generated/Model/CreateCustomPermissionsResponse.cs index d5ac84cb0411..3f0d81d1987b 100644 --- a/sdk/src/Services/QuickSight/Generated/Model/CreateCustomPermissionsResponse.cs +++ b/sdk/src/Services/QuickSight/Generated/Model/CreateCustomPermissionsResponse.cs @@ -80,9 +80,9 @@ internal bool IsSetRequestId() /// The HTTP status of the request. ///     ///     - public int Status + public int? Status { - get { return this._status.GetValueOrDefault(); } + get { return this._status; } set { this._status = value; } } diff --git a/sdk/src/Services/QuickSight/Generated/Model/DeleteCustomPermissionsResponse.cs b/sdk/src/Services/QuickSight/Generated/Model/DeleteCustomPermissionsResponse.cs index 808593de53cb..deb07a4b9ff9 100644 --- a/sdk/src/Services/QuickSight/Generated/Model/DeleteCustomPermissionsResponse.cs +++ b/sdk/src/Services/QuickSight/Generated/Model/DeleteCustomPermissionsResponse.cs @@ -80,9 +80,9 @@ internal bool IsSetRequestId() /// The HTTP status of the request. /// ///     - public int Status + public int? Status { - get { return this._status.GetValueOrDefault(); } + get { return this._status; } set { this._status = value; } } diff --git a/sdk/src/Services/QuickSight/Generated/Model/DeleteUserCustomPermissionResponse.cs b/sdk/src/Services/QuickSight/Generated/Model/DeleteUserCustomPermissionResponse.cs index 7b11d55f0681..5a5952db2171 100644 --- a/sdk/src/Services/QuickSight/Generated/Model/DeleteUserCustomPermissionResponse.cs +++ b/sdk/src/Services/QuickSight/Generated/Model/DeleteUserCustomPermissionResponse.cs @@ -61,9 +61,9 @@ internal bool IsSetRequestId() /// The HTTP status of the request. /// ///     - public int Status + public int? Status { - get { return this._status.GetValueOrDefault(); } + get { return this._status; } set { this._status = value; } } diff --git a/sdk/src/Services/QuickSight/Generated/Model/DescribeAssetBundleExportJobResponse.cs b/sdk/src/Services/QuickSight/Generated/Model/DescribeAssetBundleExportJobResponse.cs index d9438ff92021..523a9d38c72e 100644 --- a/sdk/src/Services/QuickSight/Generated/Model/DescribeAssetBundleExportJobResponse.cs +++ b/sdk/src/Services/QuickSight/Generated/Model/DescribeAssetBundleExportJobResponse.cs @@ -269,9 +269,9 @@ internal bool IsSetIncludeFolderMembers() /// The include folder memberships flag. /// ///     - public bool IncludeFolderMemberships + public bool? IncludeFolderMemberships { - get { return this._includeFolderMemberships.GetValueOrDefault(); } + get { return this._includeFolderMemberships; } set { this._includeFolderMemberships = value; } } diff --git a/sdk/src/Services/QuickSight/Generated/Model/DescribeCustomPermissionsResponse.cs b/sdk/src/Services/QuickSight/Generated/Model/DescribeCustomPermissionsResponse.cs index e088f63ae1eb..d112ba96afe8 100644 --- a/sdk/src/Services/QuickSight/Generated/Model/DescribeCustomPermissionsResponse.cs +++ b/sdk/src/Services/QuickSight/Generated/Model/DescribeCustomPermissionsResponse.cs @@ -80,9 +80,9 @@ internal bool IsSetRequestId() /// The HTTP status of the request. /// ///     - public int Status + public int? Status { - get { return this._status.GetValueOrDefault(); } + get { return this._status; } set { this._status = value; } } diff --git a/sdk/src/Services/QuickSight/Generated/Model/Internal/MarshallTransformations/BrandDetailUnmarshaller.cs b/sdk/src/Services/QuickSight/Generated/Model/Internal/MarshallTransformations/BrandDetailUnmarshaller.cs index e55c6b2ac50b..8d1507af890d 100644 --- a/sdk/src/Services/QuickSight/Generated/Model/Internal/MarshallTransformations/BrandDetailUnmarshaller.cs +++ b/sdk/src/Services/QuickSight/Generated/Model/Internal/MarshallTransformations/BrandDetailUnmarshaller.cs @@ -86,7 +86,7 @@ public BrandDetail Unmarshall(JsonUnmarshallerContext context) } if (context.TestExpression("CreatedTime", targetDepth)) { - var unmarshaller = DateTimeUnmarshaller.Instance; + var unmarshaller = NullableDateTimeUnmarshaller.Instance; unmarshalledObject.CreatedTime = unmarshaller.Unmarshall(context); continue; } @@ -98,7 +98,7 @@ public BrandDetail Unmarshall(JsonUnmarshallerContext context) } if (context.TestExpression("LastUpdatedTime", targetDepth)) { - var unmarshaller = DateTimeUnmarshaller.Instance; + var unmarshaller = NullableDateTimeUnmarshaller.Instance; unmarshalledObject.LastUpdatedTime = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/QuickSight/Generated/Model/Internal/MarshallTransformations/BrandSummaryUnmarshaller.cs b/sdk/src/Services/QuickSight/Generated/Model/Internal/MarshallTransformations/BrandSummaryUnmarshaller.cs index 6087d8ab869a..2389927966a0 100644 --- a/sdk/src/Services/QuickSight/Generated/Model/Internal/MarshallTransformations/BrandSummaryUnmarshaller.cs +++ b/sdk/src/Services/QuickSight/Generated/Model/Internal/MarshallTransformations/BrandSummaryUnmarshaller.cs @@ -92,7 +92,7 @@ public BrandSummary Unmarshall(JsonUnmarshallerContext context) } if (context.TestExpression("CreatedTime", targetDepth)) { - var unmarshaller = DateTimeUnmarshaller.Instance; + var unmarshaller = NullableDateTimeUnmarshaller.Instance; unmarshalledObject.CreatedTime = unmarshaller.Unmarshall(context); continue; } @@ -104,7 +104,7 @@ public BrandSummary Unmarshall(JsonUnmarshallerContext context) } if (context.TestExpression("LastUpdatedTime", targetDepth)) { - var unmarshaller = DateTimeUnmarshaller.Instance; + var unmarshaller = NullableDateTimeUnmarshaller.Instance; unmarshalledObject.LastUpdatedTime = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/QuickSight/Generated/Model/Internal/MarshallTransformations/CreateBrandRequestMarshaller.cs b/sdk/src/Services/QuickSight/Generated/Model/Internal/MarshallTransformations/CreateBrandRequestMarshaller.cs index cfc889722705..86634551244b 100644 --- a/sdk/src/Services/QuickSight/Generated/Model/Internal/MarshallTransformations/CreateBrandRequestMarshaller.cs +++ b/sdk/src/Services/QuickSight/Generated/Model/Internal/MarshallTransformations/CreateBrandRequestMarshaller.cs @@ -67,42 +67,45 @@ public IRequest Marshall(CreateBrandRequest publicRequest) throw new AmazonQuickSightException("Request object does not have required field BrandId set"); request.AddPathResource("{BrandId}", StringUtils.FromString(publicRequest.BrandId)); request.ResourcePath = "/accounts/{AwsAccountId}/brands/{BrandId}"; - using (StringWriter stringWriter = new StringWriter(CultureInfo.InvariantCulture)) + using (MemoryStream memoryStream = new MemoryStream()) { - JsonWriter writer = new JsonWriter(stringWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetBrandDefinition()) + using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) { - context.Writer.WritePropertyName("BrandDefinition"); - context.Writer.WriteObjectStart(); - - var marshaller = BrandDefinitionMarshaller.Instance; - marshaller.Marshall(publicRequest.BrandDefinition, context); - - context.Writer.WriteObjectEnd(); - } - - if(publicRequest.IsSetTags()) - { - context.Writer.WritePropertyName("Tags"); - context.Writer.WriteArrayStart(); - foreach(var publicRequestTagsListValue in publicRequest.Tags) + JsonWriter writer = new JsonWriter(streamWriter); + writer.Validate = false; + writer.WriteObjectStart(); + var context = new JsonMarshallerContext(request, writer); + if(publicRequest.IsSetBrandDefinition()) { + context.Writer.WritePropertyName("BrandDefinition"); context.Writer.WriteObjectStart(); - var marshaller = TagMarshaller.Instance; - marshaller.Marshall(publicRequestTagsListValue, context); + var marshaller = BrandDefinitionMarshaller.Instance; + marshaller.Marshall(publicRequest.BrandDefinition, context); context.Writer.WriteObjectEnd(); } - context.Writer.WriteArrayEnd(); + + if(publicRequest.IsSetTags()) + { + context.Writer.WritePropertyName("Tags"); + context.Writer.WriteArrayStart(); + foreach(var publicRequestTagsListValue in publicRequest.Tags) + { + context.Writer.WriteObjectStart(); + + var marshaller = TagMarshaller.Instance; + marshaller.Marshall(publicRequestTagsListValue, context); + + context.Writer.WriteObjectEnd(); + } + context.Writer.WriteArrayEnd(); + } + + writer.WriteObjectEnd(); } - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); + request.Content = memoryStream.ToArray(); } diff --git a/sdk/src/Services/QuickSight/Generated/Model/Internal/MarshallTransformations/CreateCustomPermissionsRequestMarshaller.cs b/sdk/src/Services/QuickSight/Generated/Model/Internal/MarshallTransformations/CreateCustomPermissionsRequestMarshaller.cs index 470e050da68f..9e882a552e06 100644 --- a/sdk/src/Services/QuickSight/Generated/Model/Internal/MarshallTransformations/CreateCustomPermissionsRequestMarshaller.cs +++ b/sdk/src/Services/QuickSight/Generated/Model/Internal/MarshallTransformations/CreateCustomPermissionsRequestMarshaller.cs @@ -64,48 +64,51 @@ public IRequest Marshall(CreateCustomPermissionsRequest publicRequest) throw new AmazonQuickSightException("Request object does not have required field AwsAccountId set"); request.AddPathResource("{AwsAccountId}", StringUtils.FromString(publicRequest.AwsAccountId)); request.ResourcePath = "/accounts/{AwsAccountId}/custom-permissions"; - using (StringWriter stringWriter = new StringWriter(CultureInfo.InvariantCulture)) + using (MemoryStream memoryStream = new MemoryStream()) { - JsonWriter writer = new JsonWriter(stringWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetCapabilities()) + using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) { - context.Writer.WritePropertyName("Capabilities"); - context.Writer.WriteObjectStart(); - - var marshaller = CapabilitiesMarshaller.Instance; - marshaller.Marshall(publicRequest.Capabilities, context); - - context.Writer.WriteObjectEnd(); - } - - if(publicRequest.IsSetCustomPermissionsName()) - { - context.Writer.WritePropertyName("CustomPermissionsName"); - context.Writer.Write(publicRequest.CustomPermissionsName); - } - - if(publicRequest.IsSetTags()) - { - context.Writer.WritePropertyName("Tags"); - context.Writer.WriteArrayStart(); - foreach(var publicRequestTagsListValue in publicRequest.Tags) + JsonWriter writer = new JsonWriter(streamWriter); + writer.Validate = false; + writer.WriteObjectStart(); + var context = new JsonMarshallerContext(request, writer); + if(publicRequest.IsSetCapabilities()) { + context.Writer.WritePropertyName("Capabilities"); context.Writer.WriteObjectStart(); - var marshaller = TagMarshaller.Instance; - marshaller.Marshall(publicRequestTagsListValue, context); + var marshaller = CapabilitiesMarshaller.Instance; + marshaller.Marshall(publicRequest.Capabilities, context); context.Writer.WriteObjectEnd(); } - context.Writer.WriteArrayEnd(); + + if(publicRequest.IsSetCustomPermissionsName()) + { + context.Writer.WritePropertyName("CustomPermissionsName"); + context.Writer.Write(publicRequest.CustomPermissionsName); + } + + if(publicRequest.IsSetTags()) + { + context.Writer.WritePropertyName("Tags"); + context.Writer.WriteArrayStart(); + foreach(var publicRequestTagsListValue in publicRequest.Tags) + { + context.Writer.WriteObjectStart(); + + var marshaller = TagMarshaller.Instance; + marshaller.Marshall(publicRequestTagsListValue, context); + + context.Writer.WriteObjectEnd(); + } + context.Writer.WriteArrayEnd(); + } + + writer.WriteObjectEnd(); } - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); + request.Content = memoryStream.ToArray(); } diff --git a/sdk/src/Services/QuickSight/Generated/Model/Internal/MarshallTransformations/CreateCustomPermissionsResponseUnmarshaller.cs b/sdk/src/Services/QuickSight/Generated/Model/Internal/MarshallTransformations/CreateCustomPermissionsResponseUnmarshaller.cs index 87cacbf29496..7558d3f396d0 100644 --- a/sdk/src/Services/QuickSight/Generated/Model/Internal/MarshallTransformations/CreateCustomPermissionsResponseUnmarshaller.cs +++ b/sdk/src/Services/QuickSight/Generated/Model/Internal/MarshallTransformations/CreateCustomPermissionsResponseUnmarshaller.cs @@ -66,7 +66,7 @@ public override AmazonWebServiceResponse Unmarshall(JsonUnmarshallerContext cont } if (context.TestExpression("Status", targetDepth)) { - var unmarshaller = IntUnmarshaller.Instance; + var unmarshaller = NullableIntUnmarshaller.Instance; response.Status = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/QuickSight/Generated/Model/Internal/MarshallTransformations/DeleteCustomPermissionsResponseUnmarshaller.cs b/sdk/src/Services/QuickSight/Generated/Model/Internal/MarshallTransformations/DeleteCustomPermissionsResponseUnmarshaller.cs index 5f2a9ce2abc1..5f5a3916b306 100644 --- a/sdk/src/Services/QuickSight/Generated/Model/Internal/MarshallTransformations/DeleteCustomPermissionsResponseUnmarshaller.cs +++ b/sdk/src/Services/QuickSight/Generated/Model/Internal/MarshallTransformations/DeleteCustomPermissionsResponseUnmarshaller.cs @@ -66,7 +66,7 @@ public override AmazonWebServiceResponse Unmarshall(JsonUnmarshallerContext cont } if (context.TestExpression("Status", targetDepth)) { - var unmarshaller = IntUnmarshaller.Instance; + var unmarshaller = NullableIntUnmarshaller.Instance; response.Status = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/QuickSight/Generated/Model/Internal/MarshallTransformations/DescribeAssetBundleExportJobResponseUnmarshaller.cs b/sdk/src/Services/QuickSight/Generated/Model/Internal/MarshallTransformations/DescribeAssetBundleExportJobResponseUnmarshaller.cs index 29d7b276c863..17ac0914514d 100644 --- a/sdk/src/Services/QuickSight/Generated/Model/Internal/MarshallTransformations/DescribeAssetBundleExportJobResponseUnmarshaller.cs +++ b/sdk/src/Services/QuickSight/Generated/Model/Internal/MarshallTransformations/DescribeAssetBundleExportJobResponseUnmarshaller.cs @@ -114,7 +114,7 @@ public override AmazonWebServiceResponse Unmarshall(JsonUnmarshallerContext cont } if (context.TestExpression("IncludeFolderMemberships", targetDepth)) { - var unmarshaller = BoolUnmarshaller.Instance; + var unmarshaller = NullableBoolUnmarshaller.Instance; response.IncludeFolderMemberships = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/QuickSight/Generated/Model/Internal/MarshallTransformations/DescribeCustomPermissionsResponseUnmarshaller.cs b/sdk/src/Services/QuickSight/Generated/Model/Internal/MarshallTransformations/DescribeCustomPermissionsResponseUnmarshaller.cs index b117518b84fc..9aa0fa136b37 100644 --- a/sdk/src/Services/QuickSight/Generated/Model/Internal/MarshallTransformations/DescribeCustomPermissionsResponseUnmarshaller.cs +++ b/sdk/src/Services/QuickSight/Generated/Model/Internal/MarshallTransformations/DescribeCustomPermissionsResponseUnmarshaller.cs @@ -66,7 +66,7 @@ public override AmazonWebServiceResponse Unmarshall(JsonUnmarshallerContext cont } if (context.TestExpression("Status", targetDepth)) { - var unmarshaller = IntUnmarshaller.Instance; + var unmarshaller = NullableIntUnmarshaller.Instance; response.Status = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/QuickSight/Generated/Model/Internal/MarshallTransformations/StartAssetBundleExportJobRequestMarshaller.cs b/sdk/src/Services/QuickSight/Generated/Model/Internal/MarshallTransformations/StartAssetBundleExportJobRequestMarshaller.cs index 7a7e4f5c9c05..72f2503f5906 100644 --- a/sdk/src/Services/QuickSight/Generated/Model/Internal/MarshallTransformations/StartAssetBundleExportJobRequestMarshaller.cs +++ b/sdk/src/Services/QuickSight/Generated/Model/Internal/MarshallTransformations/StartAssetBundleExportJobRequestMarshaller.cs @@ -101,37 +101,23 @@ public IRequest Marshall(StartAssetBundleExportJobRequest publicRequest) context.Writer.Write(publicRequest.IncludeAllDependencies.Value); } -<<<<<<< HEAD + if(publicRequest.IsSetIncludeFolderMembers()) + { + context.Writer.WritePropertyName("IncludeFolderMembers"); + context.Writer.Write(publicRequest.IncludeFolderMembers); + } + + if(publicRequest.IsSetIncludeFolderMemberships()) + { + context.Writer.WritePropertyName("IncludeFolderMemberships"); + context.Writer.Write(publicRequest.IncludeFolderMemberships.Value); + } + if(publicRequest.IsSetIncludePermissions()) { context.Writer.WritePropertyName("IncludePermissions"); context.Writer.Write(publicRequest.IncludePermissions.Value); } -||||||| Commit version number update changes - if(publicRequest.IsSetIncludePermissions()) - { - context.Writer.WritePropertyName("IncludePermissions"); - context.Writer.Write(publicRequest.IncludePermissions); - } -======= - if(publicRequest.IsSetIncludeFolderMembers()) - { - context.Writer.WritePropertyName("IncludeFolderMembers"); - context.Writer.Write(publicRequest.IncludeFolderMembers); - } - - if(publicRequest.IsSetIncludeFolderMemberships()) - { - context.Writer.WritePropertyName("IncludeFolderMemberships"); - context.Writer.Write(publicRequest.IncludeFolderMemberships); - } - - if(publicRequest.IsSetIncludePermissions()) - { - context.Writer.WritePropertyName("IncludePermissions"); - context.Writer.Write(publicRequest.IncludePermissions); - } ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b if(publicRequest.IsSetIncludeTags()) { diff --git a/sdk/src/Services/QuickSight/Generated/Model/Internal/MarshallTransformations/TopicConfigOptionsMarshaller.cs b/sdk/src/Services/QuickSight/Generated/Model/Internal/MarshallTransformations/TopicConfigOptionsMarshaller.cs index 375b6b5323ab..a17aea32afb0 100644 --- a/sdk/src/Services/QuickSight/Generated/Model/Internal/MarshallTransformations/TopicConfigOptionsMarshaller.cs +++ b/sdk/src/Services/QuickSight/Generated/Model/Internal/MarshallTransformations/TopicConfigOptionsMarshaller.cs @@ -51,7 +51,7 @@ public void Marshall(TopicConfigOptions requestObject, JsonMarshallerContext con if(requestObject.IsSetQBusinessInsightsEnabled()) { context.Writer.WritePropertyName("QBusinessInsightsEnabled"); - context.Writer.Write(requestObject.QBusinessInsightsEnabled); + context.Writer.Write(requestObject.QBusinessInsightsEnabled.Value); } } diff --git a/sdk/src/Services/QuickSight/Generated/Model/Internal/MarshallTransformations/TopicConfigOptionsUnmarshaller.cs b/sdk/src/Services/QuickSight/Generated/Model/Internal/MarshallTransformations/TopicConfigOptionsUnmarshaller.cs index 8a3f668146e7..a67ed0ce881b 100644 --- a/sdk/src/Services/QuickSight/Generated/Model/Internal/MarshallTransformations/TopicConfigOptionsUnmarshaller.cs +++ b/sdk/src/Services/QuickSight/Generated/Model/Internal/MarshallTransformations/TopicConfigOptionsUnmarshaller.cs @@ -68,7 +68,7 @@ public TopicConfigOptions Unmarshall(JsonUnmarshallerContext context) { if (context.TestExpression("QBusinessInsightsEnabled", targetDepth)) { - var unmarshaller = BoolUnmarshaller.Instance; + var unmarshaller = NullableBoolUnmarshaller.Instance; unmarshalledObject.QBusinessInsightsEnabled = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/QuickSight/Generated/Model/Internal/MarshallTransformations/UpdateBrandAssignmentRequestMarshaller.cs b/sdk/src/Services/QuickSight/Generated/Model/Internal/MarshallTransformations/UpdateBrandAssignmentRequestMarshaller.cs index 6755e64b1fd1..c8333d0a384a 100644 --- a/sdk/src/Services/QuickSight/Generated/Model/Internal/MarshallTransformations/UpdateBrandAssignmentRequestMarshaller.cs +++ b/sdk/src/Services/QuickSight/Generated/Model/Internal/MarshallTransformations/UpdateBrandAssignmentRequestMarshaller.cs @@ -64,21 +64,24 @@ public IRequest Marshall(UpdateBrandAssignmentRequest publicRequest) throw new AmazonQuickSightException("Request object does not have required field AwsAccountId set"); request.AddPathResource("{AwsAccountId}", StringUtils.FromString(publicRequest.AwsAccountId)); request.ResourcePath = "/accounts/{AwsAccountId}/brandassignments"; - using (StringWriter stringWriter = new StringWriter(CultureInfo.InvariantCulture)) + using (MemoryStream memoryStream = new MemoryStream()) { - JsonWriter writer = new JsonWriter(stringWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetBrandArn()) + using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) { - context.Writer.WritePropertyName("BrandArn"); - context.Writer.Write(publicRequest.BrandArn); + JsonWriter writer = new JsonWriter(streamWriter); + writer.Validate = false; + writer.WriteObjectStart(); + var context = new JsonMarshallerContext(request, writer); + if(publicRequest.IsSetBrandArn()) + { + context.Writer.WritePropertyName("BrandArn"); + context.Writer.Write(publicRequest.BrandArn); + } + + writer.WriteObjectEnd(); } - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); + request.Content = memoryStream.ToArray(); } diff --git a/sdk/src/Services/QuickSight/Generated/Model/Internal/MarshallTransformations/UpdateBrandPublishedVersionRequestMarshaller.cs b/sdk/src/Services/QuickSight/Generated/Model/Internal/MarshallTransformations/UpdateBrandPublishedVersionRequestMarshaller.cs index dfed6d61dfdc..50d1d9608302 100644 --- a/sdk/src/Services/QuickSight/Generated/Model/Internal/MarshallTransformations/UpdateBrandPublishedVersionRequestMarshaller.cs +++ b/sdk/src/Services/QuickSight/Generated/Model/Internal/MarshallTransformations/UpdateBrandPublishedVersionRequestMarshaller.cs @@ -67,21 +67,24 @@ public IRequest Marshall(UpdateBrandPublishedVersionRequest publicRequest) throw new AmazonQuickSightException("Request object does not have required field BrandId set"); request.AddPathResource("{BrandId}", StringUtils.FromString(publicRequest.BrandId)); request.ResourcePath = "/accounts/{AwsAccountId}/brands/{BrandId}/publishedversion"; - using (StringWriter stringWriter = new StringWriter(CultureInfo.InvariantCulture)) + using (MemoryStream memoryStream = new MemoryStream()) { - JsonWriter writer = new JsonWriter(stringWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetVersionId()) + using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) { - context.Writer.WritePropertyName("VersionId"); - context.Writer.Write(publicRequest.VersionId); + JsonWriter writer = new JsonWriter(streamWriter); + writer.Validate = false; + writer.WriteObjectStart(); + var context = new JsonMarshallerContext(request, writer); + if(publicRequest.IsSetVersionId()) + { + context.Writer.WritePropertyName("VersionId"); + context.Writer.Write(publicRequest.VersionId); + } + + writer.WriteObjectEnd(); } - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); + request.Content = memoryStream.ToArray(); } diff --git a/sdk/src/Services/QuickSight/Generated/Model/Internal/MarshallTransformations/UpdateBrandRequestMarshaller.cs b/sdk/src/Services/QuickSight/Generated/Model/Internal/MarshallTransformations/UpdateBrandRequestMarshaller.cs index 92297c15a2cf..7aaa3b1ca4ab 100644 --- a/sdk/src/Services/QuickSight/Generated/Model/Internal/MarshallTransformations/UpdateBrandRequestMarshaller.cs +++ b/sdk/src/Services/QuickSight/Generated/Model/Internal/MarshallTransformations/UpdateBrandRequestMarshaller.cs @@ -67,26 +67,29 @@ public IRequest Marshall(UpdateBrandRequest publicRequest) throw new AmazonQuickSightException("Request object does not have required field BrandId set"); request.AddPathResource("{BrandId}", StringUtils.FromString(publicRequest.BrandId)); request.ResourcePath = "/accounts/{AwsAccountId}/brands/{BrandId}"; - using (StringWriter stringWriter = new StringWriter(CultureInfo.InvariantCulture)) + using (MemoryStream memoryStream = new MemoryStream()) { - JsonWriter writer = new JsonWriter(stringWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetBrandDefinition()) + using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) { - context.Writer.WritePropertyName("BrandDefinition"); - context.Writer.WriteObjectStart(); + JsonWriter writer = new JsonWriter(streamWriter); + writer.Validate = false; + writer.WriteObjectStart(); + var context = new JsonMarshallerContext(request, writer); + if(publicRequest.IsSetBrandDefinition()) + { + context.Writer.WritePropertyName("BrandDefinition"); + context.Writer.WriteObjectStart(); - var marshaller = BrandDefinitionMarshaller.Instance; - marshaller.Marshall(publicRequest.BrandDefinition, context); + var marshaller = BrandDefinitionMarshaller.Instance; + marshaller.Marshall(publicRequest.BrandDefinition, context); - context.Writer.WriteObjectEnd(); + context.Writer.WriteObjectEnd(); + } + + writer.WriteObjectEnd(); } - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); + request.Content = memoryStream.ToArray(); } diff --git a/sdk/src/Services/QuickSight/Generated/Model/Internal/MarshallTransformations/UpdateCustomPermissionsRequestMarshaller.cs b/sdk/src/Services/QuickSight/Generated/Model/Internal/MarshallTransformations/UpdateCustomPermissionsRequestMarshaller.cs index 8fad28e7a0ea..693839868406 100644 --- a/sdk/src/Services/QuickSight/Generated/Model/Internal/MarshallTransformations/UpdateCustomPermissionsRequestMarshaller.cs +++ b/sdk/src/Services/QuickSight/Generated/Model/Internal/MarshallTransformations/UpdateCustomPermissionsRequestMarshaller.cs @@ -67,26 +67,29 @@ public IRequest Marshall(UpdateCustomPermissionsRequest publicRequest) throw new AmazonQuickSightException("Request object does not have required field CustomPermissionsName set"); request.AddPathResource("{CustomPermissionsName}", StringUtils.FromString(publicRequest.CustomPermissionsName)); request.ResourcePath = "/accounts/{AwsAccountId}/custom-permissions/{CustomPermissionsName}"; - using (StringWriter stringWriter = new StringWriter(CultureInfo.InvariantCulture)) + using (MemoryStream memoryStream = new MemoryStream()) { - JsonWriter writer = new JsonWriter(stringWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetCapabilities()) + using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) { - context.Writer.WritePropertyName("Capabilities"); - context.Writer.WriteObjectStart(); + JsonWriter writer = new JsonWriter(streamWriter); + writer.Validate = false; + writer.WriteObjectStart(); + var context = new JsonMarshallerContext(request, writer); + if(publicRequest.IsSetCapabilities()) + { + context.Writer.WritePropertyName("Capabilities"); + context.Writer.WriteObjectStart(); - var marshaller = CapabilitiesMarshaller.Instance; - marshaller.Marshall(publicRequest.Capabilities, context); + var marshaller = CapabilitiesMarshaller.Instance; + marshaller.Marshall(publicRequest.Capabilities, context); - context.Writer.WriteObjectEnd(); + context.Writer.WriteObjectEnd(); + } + + writer.WriteObjectEnd(); } - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); + request.Content = memoryStream.ToArray(); } diff --git a/sdk/src/Services/QuickSight/Generated/Model/Internal/MarshallTransformations/UpdateCustomPermissionsResponseUnmarshaller.cs b/sdk/src/Services/QuickSight/Generated/Model/Internal/MarshallTransformations/UpdateCustomPermissionsResponseUnmarshaller.cs index 5d522d30fdab..6c056cd92272 100644 --- a/sdk/src/Services/QuickSight/Generated/Model/Internal/MarshallTransformations/UpdateCustomPermissionsResponseUnmarshaller.cs +++ b/sdk/src/Services/QuickSight/Generated/Model/Internal/MarshallTransformations/UpdateCustomPermissionsResponseUnmarshaller.cs @@ -66,7 +66,7 @@ public override AmazonWebServiceResponse Unmarshall(JsonUnmarshallerContext cont } if (context.TestExpression("Status", targetDepth)) { - var unmarshaller = IntUnmarshaller.Instance; + var unmarshaller = NullableIntUnmarshaller.Instance; response.Status = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/QuickSight/Generated/Model/Internal/MarshallTransformations/UpdateUserCustomPermissionRequestMarshaller.cs b/sdk/src/Services/QuickSight/Generated/Model/Internal/MarshallTransformations/UpdateUserCustomPermissionRequestMarshaller.cs index 46dbc7d96c97..7347dd197cb5 100644 --- a/sdk/src/Services/QuickSight/Generated/Model/Internal/MarshallTransformations/UpdateUserCustomPermissionRequestMarshaller.cs +++ b/sdk/src/Services/QuickSight/Generated/Model/Internal/MarshallTransformations/UpdateUserCustomPermissionRequestMarshaller.cs @@ -70,21 +70,24 @@ public IRequest Marshall(UpdateUserCustomPermissionRequest publicRequest) throw new AmazonQuickSightException("Request object does not have required field UserName set"); request.AddPathResource("{UserName}", StringUtils.FromString(publicRequest.UserName)); request.ResourcePath = "/accounts/{AwsAccountId}/namespaces/{Namespace}/users/{UserName}/custom-permission"; - using (StringWriter stringWriter = new StringWriter(CultureInfo.InvariantCulture)) + using (MemoryStream memoryStream = new MemoryStream()) { - JsonWriter writer = new JsonWriter(stringWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetCustomPermissionsName()) + using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) { - context.Writer.WritePropertyName("CustomPermissionsName"); - context.Writer.Write(publicRequest.CustomPermissionsName); + JsonWriter writer = new JsonWriter(streamWriter); + writer.Validate = false; + writer.WriteObjectStart(); + var context = new JsonMarshallerContext(request, writer); + if(publicRequest.IsSetCustomPermissionsName()) + { + context.Writer.WritePropertyName("CustomPermissionsName"); + context.Writer.Write(publicRequest.CustomPermissionsName); + } + + writer.WriteObjectEnd(); } - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); + request.Content = memoryStream.ToArray(); } diff --git a/sdk/src/Services/QuickSight/Generated/Model/InternalServerException.cs b/sdk/src/Services/QuickSight/Generated/Model/InternalServerException.cs index de867e3b5f76..9552fc5ea3c4 100644 --- a/sdk/src/Services/QuickSight/Generated/Model/InternalServerException.cs +++ b/sdk/src/Services/QuickSight/Generated/Model/InternalServerException.cs @@ -106,11 +106,6 @@ protected InternalServerException(System.Runtime.Serialization.SerializationInfo /// The that holds the serialized object data about the exception being thrown. /// The that contains contextual information about the source or destination. /// The parameter is a null reference (Nothing in Visual Basic). -#if BCL35 - [System.Security.Permissions.SecurityPermission( - System.Security.Permissions.SecurityAction.LinkDemand, - Flags = System.Security.Permissions.SecurityPermissionFlag.SerializationFormatter)] -#endif [System.Security.SecurityCritical] // These FxCop rules are giving false-positives for this method [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Security", "CA2123:OverrideLinkDemandsShouldBeIdenticalToBase")] diff --git a/sdk/src/Services/QuickSight/Generated/Model/ListBrandsRequest.cs b/sdk/src/Services/QuickSight/Generated/Model/ListBrandsRequest.cs index 332ccb3f14d6..f4d01f744df2 100644 --- a/sdk/src/Services/QuickSight/Generated/Model/ListBrandsRequest.cs +++ b/sdk/src/Services/QuickSight/Generated/Model/ListBrandsRequest.cs @@ -65,9 +65,9 @@ internal bool IsSetAwsAccountId() /// ///     [AWSProperty(Min=1, Max=100)] - public int MaxResults + public int? MaxResults { - get { return this._maxResults.GetValueOrDefault(); } + get { return this._maxResults; } set { this._maxResults = value; } } diff --git a/sdk/src/Services/QuickSight/Generated/Model/ListCustomPermissionsRequest.cs b/sdk/src/Services/QuickSight/Generated/Model/ListCustomPermissionsRequest.cs index 7effde54fa5c..507137c36098 100644 --- a/sdk/src/Services/QuickSight/Generated/Model/ListCustomPermissionsRequest.cs +++ b/sdk/src/Services/QuickSight/Generated/Model/ListCustomPermissionsRequest.cs @@ -66,9 +66,9 @@ internal bool IsSetAwsAccountId() /// ///     [AWSProperty(Min=1, Max=100)] - public int MaxResults + public int? MaxResults { - get { return this._maxResults.GetValueOrDefault(); } + get { return this._maxResults; } set { this._maxResults = value; } } diff --git a/sdk/src/Services/QuickSight/Generated/Model/ListCustomPermissionsResponse.cs b/sdk/src/Services/QuickSight/Generated/Model/ListCustomPermissionsResponse.cs index e2f70022adc9..e7ebd3118083 100644 --- a/sdk/src/Services/QuickSight/Generated/Model/ListCustomPermissionsResponse.cs +++ b/sdk/src/Services/QuickSight/Generated/Model/ListCustomPermissionsResponse.cs @@ -99,9 +99,9 @@ internal bool IsSetRequestId() /// The HTTP status of the request. /// ///     - public int Status + public int? Status { - get { return this._status.GetValueOrDefault(); } + get { return this._status; } set { this._status = value; } } diff --git a/sdk/src/Services/QuickSight/Generated/Model/RestoreAnalysisRequest.cs b/sdk/src/Services/QuickSight/Generated/Model/RestoreAnalysisRequest.cs index e9790cae1361..0cb0cf4e048e 100644 --- a/sdk/src/Services/QuickSight/Generated/Model/RestoreAnalysisRequest.cs +++ b/sdk/src/Services/QuickSight/Generated/Model/RestoreAnalysisRequest.cs @@ -87,9 +87,9 @@ internal bool IsSetAwsAccountId() /// analysis requires this parameter to be set to True. /// ///     - public bool RestoreToFolders + public bool? RestoreToFolders { - get { return this._restoreToFolders.GetValueOrDefault(); } + get { return this._restoreToFolders; } set { this._restoreToFolders = value; } } diff --git a/sdk/src/Services/QuickSight/Generated/Model/StartAssetBundleExportJobRequest.cs b/sdk/src/Services/QuickSight/Generated/Model/StartAssetBundleExportJobRequest.cs index 68ce24028612..5120b0ab1e6c 100644 --- a/sdk/src/Services/QuickSight/Generated/Model/StartAssetBundleExportJobRequest.cs +++ b/sdk/src/Services/QuickSight/Generated/Model/StartAssetBundleExportJobRequest.cs @@ -192,9 +192,9 @@ internal bool IsSetIncludeFolderMembers() /// folders that the asset is a member of. /// ///     - public bool IncludeFolderMemberships + public bool? IncludeFolderMemberships { - get { return this._includeFolderMemberships.GetValueOrDefault(); } + get { return this._includeFolderMemberships; } set { this._includeFolderMemberships = value; } } diff --git a/sdk/src/Services/QuickSight/Generated/Model/StartDashboardSnapshotJobScheduleResponse.cs b/sdk/src/Services/QuickSight/Generated/Model/StartDashboardSnapshotJobScheduleResponse.cs index 3e012ecf53a8..468b7aef9324 100644 --- a/sdk/src/Services/QuickSight/Generated/Model/StartDashboardSnapshotJobScheduleResponse.cs +++ b/sdk/src/Services/QuickSight/Generated/Model/StartDashboardSnapshotJobScheduleResponse.cs @@ -61,9 +61,9 @@ internal bool IsSetRequestId() /// The HTTP status of the request /// ///     - public int Status + public int? Status { - get { return this._status.GetValueOrDefault(); } + get { return this._status; } set { this._status = value; } } diff --git a/sdk/src/Services/QuickSight/Generated/Model/TopicConfigOptions.cs b/sdk/src/Services/QuickSight/Generated/Model/TopicConfigOptions.cs index 11af9d12b49d..5d722177e0d5 100644 --- a/sdk/src/Services/QuickSight/Generated/Model/TopicConfigOptions.cs +++ b/sdk/src/Services/QuickSight/Generated/Model/TopicConfigOptions.cs @@ -42,9 +42,9 @@ public partial class TopicConfigOptions /// Enables Amazon Q Business Insights for a Topic. /// ///     - public bool QBusinessInsightsEnabled + public bool? QBusinessInsightsEnabled { - get { return this._qBusinessInsightsEnabled.GetValueOrDefault(); } + get { return this._qBusinessInsightsEnabled; } set { this._qBusinessInsightsEnabled = value; } } diff --git a/sdk/src/Services/QuickSight/Generated/Model/UpdateCustomPermissionsResponse.cs b/sdk/src/Services/QuickSight/Generated/Model/UpdateCustomPermissionsResponse.cs index 91e920148fff..8f260acf67eb 100644 --- a/sdk/src/Services/QuickSight/Generated/Model/UpdateCustomPermissionsResponse.cs +++ b/sdk/src/Services/QuickSight/Generated/Model/UpdateCustomPermissionsResponse.cs @@ -80,9 +80,9 @@ internal bool IsSetRequestId() /// The HTTP status of the request. /// ///     - public int Status + public int? Status { - get { return this._status.GetValueOrDefault(); } + get { return this._status; } set { this._status = value; } } diff --git a/sdk/src/Services/QuickSight/Generated/Model/UpdateUserCustomPermissionResponse.cs b/sdk/src/Services/QuickSight/Generated/Model/UpdateUserCustomPermissionResponse.cs index b464ea61eb7a..e5f4b8fc51b3 100644 --- a/sdk/src/Services/QuickSight/Generated/Model/UpdateUserCustomPermissionResponse.cs +++ b/sdk/src/Services/QuickSight/Generated/Model/UpdateUserCustomPermissionResponse.cs @@ -61,9 +61,9 @@ internal bool IsSetRequestId() /// The HTTP status of the request. /// ///     - public int Status + public int? Status { - get { return this._status.GetValueOrDefault(); } + get { return this._status; } set { this._status = value; } } diff --git a/sdk/src/Services/QuickSight/Generated/Model/_bcl45+netstandard/IListBrandsPaginator.cs b/sdk/src/Services/QuickSight/Generated/Model/_bcl+netstandard/IListBrandsPaginator.cs similarity index 100% rename from sdk/src/Services/QuickSight/Generated/Model/_bcl45+netstandard/IListBrandsPaginator.cs rename to sdk/src/Services/QuickSight/Generated/Model/_bcl+netstandard/IListBrandsPaginator.cs diff --git a/sdk/src/Services/QuickSight/Generated/Model/_bcl45+netstandard/IListCustomPermissionsPaginator.cs b/sdk/src/Services/QuickSight/Generated/Model/_bcl+netstandard/IListCustomPermissionsPaginator.cs similarity index 100% rename from sdk/src/Services/QuickSight/Generated/Model/_bcl45+netstandard/IListCustomPermissionsPaginator.cs rename to sdk/src/Services/QuickSight/Generated/Model/_bcl+netstandard/IListCustomPermissionsPaginator.cs diff --git a/sdk/src/Services/QuickSight/Generated/Model/_bcl45+netstandard/ListBrandsPaginator.cs b/sdk/src/Services/QuickSight/Generated/Model/_bcl+netstandard/ListBrandsPaginator.cs similarity index 100% rename from sdk/src/Services/QuickSight/Generated/Model/_bcl45+netstandard/ListBrandsPaginator.cs rename to sdk/src/Services/QuickSight/Generated/Model/_bcl+netstandard/ListBrandsPaginator.cs diff --git a/sdk/src/Services/QuickSight/Generated/Model/_bcl45+netstandard/ListCustomPermissionsPaginator.cs b/sdk/src/Services/QuickSight/Generated/Model/_bcl+netstandard/ListCustomPermissionsPaginator.cs similarity index 100% rename from sdk/src/Services/QuickSight/Generated/Model/_bcl45+netstandard/ListCustomPermissionsPaginator.cs rename to sdk/src/Services/QuickSight/Generated/Model/_bcl+netstandard/ListCustomPermissionsPaginator.cs diff --git a/sdk/src/Services/QuickSight/Generated/_bcl/AmazonQuickSightClient.cs b/sdk/src/Services/QuickSight/Generated/_bcl/AmazonQuickSightClient.cs index 112abd1f2b06..9f8a851bfd63 100644 --- a/sdk/src/Services/QuickSight/Generated/_bcl/AmazonQuickSightClient.cs +++ b/sdk/src/Services/QuickSight/Generated/_bcl/AmazonQuickSightClient.cs @@ -923,6 +923,198 @@ public virtual CreateAnalysisResponse CreateAnalysis(CreateAnalysisRequest reque #endregion + #region CreateBrand + + + /// + /// Creates an Amazon QuickSight brand. + /// + /// Container for the necessary parameters to execute the CreateBrand service method. + /// + /// The response from the CreateBrand service method, as returned by QuickSight. + /// + /// You don't have access to this item. The provided credentials couldn't be validated. + /// You might not be authorized to carry out the request. Make sure that your account + /// is authorized to use the Amazon QuickSight service, that your policies have the correct + /// permissions, and that you are using the correct credentials. + /// + /// + /// Updating or deleting a resource can cause an inconsistent state. + /// + /// + /// An internal service exception. + /// + /// + /// You don't have this feature activated for your account. To fix this issue, contact + /// Amazon Web Services support. + /// + /// + /// A limit is exceeded. + /// + /// + /// Access is throttled. + /// + /// REST API Reference for CreateBrand Operation + public virtual CreateBrandResponse CreateBrand(CreateBrandRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = CreateBrandRequestMarshaller.Instance; + options.ResponseUnmarshaller = CreateBrandResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// Creates an Amazon QuickSight brand. + /// + /// Container for the necessary parameters to execute the CreateBrand service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the CreateBrand service method, as returned by QuickSight. + /// + /// You don't have access to this item. The provided credentials couldn't be validated. + /// You might not be authorized to carry out the request. Make sure that your account + /// is authorized to use the Amazon QuickSight service, that your policies have the correct + /// permissions, and that you are using the correct credentials. + /// + /// + /// Updating or deleting a resource can cause an inconsistent state. + /// + /// + /// An internal service exception. + /// + /// + /// You don't have this feature activated for your account. To fix this issue, contact + /// Amazon Web Services support. + /// + /// + /// A limit is exceeded. + /// + /// + /// Access is throttled. + /// + /// REST API Reference for CreateBrand Operation + public virtual Task CreateBrandAsync(CreateBrandRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = CreateBrandRequestMarshaller.Instance; + options.ResponseUnmarshaller = CreateBrandResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + + #region CreateCustomPermissions + + + /// + /// Creates a custom permissions profile. + /// + /// Container for the necessary parameters to execute the CreateCustomPermissions service method. + /// + /// The response from the CreateCustomPermissions service method, as returned by QuickSight. + /// + /// You don't have access to this item. The provided credentials couldn't be validated. + /// You might not be authorized to carry out the request. Make sure that your account + /// is authorized to use the Amazon QuickSight service, that your policies have the correct + /// permissions, and that you are using the correct credentials. + /// + /// + /// Updating or deleting a resource can cause an inconsistent state. + /// + /// + /// An internal failure occurred. + /// + /// + /// One or more parameters has a value that isn't valid. + /// + /// + /// A limit is exceeded. + /// + /// + /// One or more preconditions aren't met. + /// + /// + /// The resource specified already exists. + /// + /// + /// One or more resources can't be found. + /// + /// + /// This resource is currently unavailable. + /// + /// + /// Access is throttled. + /// + /// REST API Reference for CreateCustomPermissions Operation + public virtual CreateCustomPermissionsResponse CreateCustomPermissions(CreateCustomPermissionsRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = CreateCustomPermissionsRequestMarshaller.Instance; + options.ResponseUnmarshaller = CreateCustomPermissionsResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// Creates a custom permissions profile. + /// + /// Container for the necessary parameters to execute the CreateCustomPermissions service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the CreateCustomPermissions service method, as returned by QuickSight. + /// + /// You don't have access to this item. The provided credentials couldn't be validated. + /// You might not be authorized to carry out the request. Make sure that your account + /// is authorized to use the Amazon QuickSight service, that your policies have the correct + /// permissions, and that you are using the correct credentials. + /// + /// + /// Updating or deleting a resource can cause an inconsistent state. + /// + /// + /// An internal failure occurred. + /// + /// + /// One or more parameters has a value that isn't valid. + /// + /// + /// A limit is exceeded. + /// + /// + /// One or more preconditions aren't met. + /// + /// + /// The resource specified already exists. + /// + /// + /// One or more resources can't be found. + /// + /// + /// This resource is currently unavailable. + /// + /// + /// Access is throttled. + /// + /// REST API Reference for CreateCustomPermissions Operation + public virtual Task CreateCustomPermissionsAsync(CreateCustomPermissionsRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = CreateCustomPermissionsRequestMarshaller.Instance; + options.ResponseUnmarshaller = CreateCustomPermissionsResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + #region CreateDashboard @@ -3243,23 +3435,30 @@ public virtual DeleteAnalysisResponse DeleteAnalysis(DeleteAnalysisRequest reque #endregion - #region DeleteDashboard + #region DeleteBrand /// - /// Deletes a dashboard. + /// Deletes an Amazon QuickSight brand. /// - /// Container for the necessary parameters to execute the DeleteDashboard service method. + /// Container for the necessary parameters to execute the DeleteBrand service method. /// - /// The response from the DeleteDashboard service method, as returned by QuickSight. + /// The response from the DeleteBrand service method, as returned by QuickSight. + /// + /// You don't have access to this item. The provided credentials couldn't be validated. + /// You might not be authorized to carry out the request. Make sure that your account + /// is authorized to use the Amazon QuickSight service, that your policies have the correct + /// permissions, and that you are using the correct credentials. + /// /// /// Updating or deleting a resource can cause an inconsistent state. /// - /// - /// An internal failure occurred. + /// + /// An internal service exception. /// - /// - /// One or more parameters has a value that isn't valid. + /// + /// You don't have this feature activated for your account. To fix this issue, contact + /// Amazon Web Services support. /// /// /// One or more resources can't be found. @@ -3267,40 +3466,41 @@ public virtual DeleteAnalysisResponse DeleteAnalysis(DeleteAnalysisRequest reque /// /// Access is throttled. /// - /// - /// This error indicates that you are calling an operation on an Amazon QuickSight subscription - /// where the edition doesn't include support for that operation. Amazon Amazon QuickSight - /// currently has Standard Edition and Enterprise Edition. Not every operation and capability - /// is available in every edition. - /// - /// REST API Reference for DeleteDashboard Operation - public virtual DeleteDashboardResponse DeleteDashboard(DeleteDashboardRequest request) + /// REST API Reference for DeleteBrand Operation + public virtual DeleteBrandResponse DeleteBrand(DeleteBrandRequest request) { var options = new InvokeOptions(); - options.RequestMarshaller = DeleteDashboardRequestMarshaller.Instance; - options.ResponseUnmarshaller = DeleteDashboardResponseUnmarshaller.Instance; + options.RequestMarshaller = DeleteBrandRequestMarshaller.Instance; + options.ResponseUnmarshaller = DeleteBrandResponseUnmarshaller.Instance; - return Invoke(request, options); + return Invoke(request, options); } /// - /// Deletes a dashboard. + /// Deletes an Amazon QuickSight brand. /// - /// Container for the necessary parameters to execute the DeleteDashboard service method. + /// Container for the necessary parameters to execute the DeleteBrand service method. /// /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// /// - /// The response from the DeleteDashboard service method, as returned by QuickSight. + /// The response from the DeleteBrand service method, as returned by QuickSight. + /// + /// You don't have access to this item. The provided credentials couldn't be validated. + /// You might not be authorized to carry out the request. Make sure that your account + /// is authorized to use the Amazon QuickSight service, that your policies have the correct + /// permissions, and that you are using the correct credentials. + /// /// /// Updating or deleting a resource can cause an inconsistent state. /// - /// - /// An internal failure occurred. + /// + /// An internal service exception. /// - /// - /// One or more parameters has a value that isn't valid. + /// + /// You don't have this feature activated for your account. To fix this issue, contact + /// Amazon Web Services support. /// /// /// One or more resources can't be found. @@ -3308,44 +3508,42 @@ public virtual DeleteDashboardResponse DeleteDashboard(DeleteDashboardRequest re /// /// Access is throttled. /// - /// - /// This error indicates that you are calling an operation on an Amazon QuickSight subscription - /// where the edition doesn't include support for that operation. Amazon Amazon QuickSight - /// currently has Standard Edition and Enterprise Edition. Not every operation and capability - /// is available in every edition. - /// - /// REST API Reference for DeleteDashboard Operation - public virtual Task DeleteDashboardAsync(DeleteDashboardRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + /// REST API Reference for DeleteBrand Operation + public virtual Task DeleteBrandAsync(DeleteBrandRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { var options = new InvokeOptions(); - options.RequestMarshaller = DeleteDashboardRequestMarshaller.Instance; - options.ResponseUnmarshaller = DeleteDashboardResponseUnmarshaller.Instance; + options.RequestMarshaller = DeleteBrandRequestMarshaller.Instance; + options.ResponseUnmarshaller = DeleteBrandResponseUnmarshaller.Instance; - return InvokeAsync(request, options, cancellationToken); + return InvokeAsync(request, options, cancellationToken); } #endregion - #region DeleteDataSet + #region DeleteBrandAssignment /// - /// Deletes a dataset. + /// Deletes a brand assignment. /// - /// Container for the necessary parameters to execute the DeleteDataSet service method. + /// Container for the necessary parameters to execute the DeleteBrandAssignment service method. /// - /// The response from the DeleteDataSet service method, as returned by QuickSight. + /// The response from the DeleteBrandAssignment service method, as returned by QuickSight. /// /// You don't have access to this item. The provided credentials couldn't be validated. /// You might not be authorized to carry out the request. Make sure that your account /// is authorized to use the Amazon QuickSight service, that your policies have the correct /// permissions, and that you are using the correct credentials. /// - /// - /// An internal failure occurred. + /// + /// Updating or deleting a resource can cause an inconsistent state. /// - /// - /// One or more parameters has a value that isn't valid. + /// + /// An internal service exception. + /// + /// + /// You don't have this feature activated for your account. To fix this issue, contact + /// Amazon Web Services support. /// /// /// One or more resources can't be found. @@ -3353,37 +3551,41 @@ public virtual DeleteDashboardResponse DeleteDashboard(DeleteDashboardRequest re /// /// Access is throttled. /// - /// REST API Reference for DeleteDataSet Operation - public virtual DeleteDataSetResponse DeleteDataSet(DeleteDataSetRequest request) + /// REST API Reference for DeleteBrandAssignment Operation + public virtual DeleteBrandAssignmentResponse DeleteBrandAssignment(DeleteBrandAssignmentRequest request) { var options = new InvokeOptions(); - options.RequestMarshaller = DeleteDataSetRequestMarshaller.Instance; - options.ResponseUnmarshaller = DeleteDataSetResponseUnmarshaller.Instance; + options.RequestMarshaller = DeleteBrandAssignmentRequestMarshaller.Instance; + options.ResponseUnmarshaller = DeleteBrandAssignmentResponseUnmarshaller.Instance; - return Invoke(request, options); + return Invoke(request, options); } /// - /// Deletes a dataset. + /// Deletes a brand assignment. /// - /// Container for the necessary parameters to execute the DeleteDataSet service method. + /// Container for the necessary parameters to execute the DeleteBrandAssignment service method. /// /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// /// - /// The response from the DeleteDataSet service method, as returned by QuickSight. + /// The response from the DeleteBrandAssignment service method, as returned by QuickSight. /// /// You don't have access to this item. The provided credentials couldn't be validated. /// You might not be authorized to carry out the request. Make sure that your account /// is authorized to use the Amazon QuickSight service, that your policies have the correct /// permissions, and that you are using the correct credentials. /// - /// - /// An internal failure occurred. + /// + /// Updating or deleting a resource can cause an inconsistent state. /// - /// - /// One or more parameters has a value that isn't valid. + /// + /// An internal service exception. + /// + /// + /// You don't have this feature activated for your account. To fix this issue, contact + /// Amazon Web Services support. /// /// /// One or more resources can't be found. @@ -3391,27 +3593,27 @@ public virtual DeleteDataSetResponse DeleteDataSet(DeleteDataSetRequest request) /// /// Access is throttled. /// - /// REST API Reference for DeleteDataSet Operation - public virtual Task DeleteDataSetAsync(DeleteDataSetRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + /// REST API Reference for DeleteBrandAssignment Operation + public virtual Task DeleteBrandAssignmentAsync(DeleteBrandAssignmentRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { var options = new InvokeOptions(); - options.RequestMarshaller = DeleteDataSetRequestMarshaller.Instance; - options.ResponseUnmarshaller = DeleteDataSetResponseUnmarshaller.Instance; + options.RequestMarshaller = DeleteBrandAssignmentRequestMarshaller.Instance; + options.ResponseUnmarshaller = DeleteBrandAssignmentResponseUnmarshaller.Instance; - return InvokeAsync(request, options, cancellationToken); + return InvokeAsync(request, options, cancellationToken); } #endregion - #region DeleteDataSetRefreshProperties + #region DeleteCustomPermissions /// - /// Deletes the dataset refresh properties of the dataset. + /// Deletes a custom permissions profile. /// - /// Container for the necessary parameters to execute the DeleteDataSetRefreshProperties service method. + /// Container for the necessary parameters to execute the DeleteCustomPermissions service method. /// - /// The response from the DeleteDataSetRefreshProperties service method, as returned by QuickSight. + /// The response from the DeleteCustomPermissions service method, as returned by QuickSight. /// /// You don't have access to this item. The provided credentials couldn't be validated. /// You might not be authorized to carry out the request. Make sure that your account @@ -3427,11 +3629,272 @@ public virtual DeleteDataSetResponse DeleteDataSet(DeleteDataSetRequest request) /// /// One or more parameters has a value that isn't valid. /// - /// - /// A limit is exceeded. + /// + /// One or more preconditions aren't met. /// - /// - /// One or more resources can't be found. + /// + /// The resource specified already exists. + /// + /// + /// One or more resources can't be found. + /// + /// + /// This resource is currently unavailable. + /// + /// + /// Access is throttled. + /// + /// REST API Reference for DeleteCustomPermissions Operation + public virtual DeleteCustomPermissionsResponse DeleteCustomPermissions(DeleteCustomPermissionsRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = DeleteCustomPermissionsRequestMarshaller.Instance; + options.ResponseUnmarshaller = DeleteCustomPermissionsResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// Deletes a custom permissions profile. + /// + /// Container for the necessary parameters to execute the DeleteCustomPermissions service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the DeleteCustomPermissions service method, as returned by QuickSight. + /// + /// You don't have access to this item. The provided credentials couldn't be validated. + /// You might not be authorized to carry out the request. Make sure that your account + /// is authorized to use the Amazon QuickSight service, that your policies have the correct + /// permissions, and that you are using the correct credentials. + /// + /// + /// Updating or deleting a resource can cause an inconsistent state. + /// + /// + /// An internal failure occurred. + /// + /// + /// One or more parameters has a value that isn't valid. + /// + /// + /// One or more preconditions aren't met. + /// + /// + /// The resource specified already exists. + /// + /// + /// One or more resources can't be found. + /// + /// + /// This resource is currently unavailable. + /// + /// + /// Access is throttled. + /// + /// REST API Reference for DeleteCustomPermissions Operation + public virtual Task DeleteCustomPermissionsAsync(DeleteCustomPermissionsRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = DeleteCustomPermissionsRequestMarshaller.Instance; + options.ResponseUnmarshaller = DeleteCustomPermissionsResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + + #region DeleteDashboard + + + /// + /// Deletes a dashboard. + /// + /// Container for the necessary parameters to execute the DeleteDashboard service method. + /// + /// The response from the DeleteDashboard service method, as returned by QuickSight. + /// + /// Updating or deleting a resource can cause an inconsistent state. + /// + /// + /// An internal failure occurred. + /// + /// + /// One or more parameters has a value that isn't valid. + /// + /// + /// One or more resources can't be found. + /// + /// + /// Access is throttled. + /// + /// + /// This error indicates that you are calling an operation on an Amazon QuickSight subscription + /// where the edition doesn't include support for that operation. Amazon Amazon QuickSight + /// currently has Standard Edition and Enterprise Edition. Not every operation and capability + /// is available in every edition. + /// + /// REST API Reference for DeleteDashboard Operation + public virtual DeleteDashboardResponse DeleteDashboard(DeleteDashboardRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = DeleteDashboardRequestMarshaller.Instance; + options.ResponseUnmarshaller = DeleteDashboardResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// Deletes a dashboard. + /// + /// Container for the necessary parameters to execute the DeleteDashboard service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the DeleteDashboard service method, as returned by QuickSight. + /// + /// Updating or deleting a resource can cause an inconsistent state. + /// + /// + /// An internal failure occurred. + /// + /// + /// One or more parameters has a value that isn't valid. + /// + /// + /// One or more resources can't be found. + /// + /// + /// Access is throttled. + /// + /// + /// This error indicates that you are calling an operation on an Amazon QuickSight subscription + /// where the edition doesn't include support for that operation. Amazon Amazon QuickSight + /// currently has Standard Edition and Enterprise Edition. Not every operation and capability + /// is available in every edition. + /// + /// REST API Reference for DeleteDashboard Operation + public virtual Task DeleteDashboardAsync(DeleteDashboardRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = DeleteDashboardRequestMarshaller.Instance; + options.ResponseUnmarshaller = DeleteDashboardResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + + #region DeleteDataSet + + + /// + /// Deletes a dataset. + /// + /// Container for the necessary parameters to execute the DeleteDataSet service method. + /// + /// The response from the DeleteDataSet service method, as returned by QuickSight. + /// + /// You don't have access to this item. The provided credentials couldn't be validated. + /// You might not be authorized to carry out the request. Make sure that your account + /// is authorized to use the Amazon QuickSight service, that your policies have the correct + /// permissions, and that you are using the correct credentials. + /// + /// + /// An internal failure occurred. + /// + /// + /// One or more parameters has a value that isn't valid. + /// + /// + /// One or more resources can't be found. + /// + /// + /// Access is throttled. + /// + /// REST API Reference for DeleteDataSet Operation + public virtual DeleteDataSetResponse DeleteDataSet(DeleteDataSetRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = DeleteDataSetRequestMarshaller.Instance; + options.ResponseUnmarshaller = DeleteDataSetResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// Deletes a dataset. + /// + /// Container for the necessary parameters to execute the DeleteDataSet service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the DeleteDataSet service method, as returned by QuickSight. + /// + /// You don't have access to this item. The provided credentials couldn't be validated. + /// You might not be authorized to carry out the request. Make sure that your account + /// is authorized to use the Amazon QuickSight service, that your policies have the correct + /// permissions, and that you are using the correct credentials. + /// + /// + /// An internal failure occurred. + /// + /// + /// One or more parameters has a value that isn't valid. + /// + /// + /// One or more resources can't be found. + /// + /// + /// Access is throttled. + /// + /// REST API Reference for DeleteDataSet Operation + public virtual Task DeleteDataSetAsync(DeleteDataSetRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = DeleteDataSetRequestMarshaller.Instance; + options.ResponseUnmarshaller = DeleteDataSetResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + + #region DeleteDataSetRefreshProperties + + + /// + /// Deletes the dataset refresh properties of the dataset. + /// + /// Container for the necessary parameters to execute the DeleteDataSetRefreshProperties service method. + /// + /// The response from the DeleteDataSetRefreshProperties service method, as returned by QuickSight. + /// + /// You don't have access to this item. The provided credentials couldn't be validated. + /// You might not be authorized to carry out the request. Make sure that your account + /// is authorized to use the Amazon QuickSight service, that your policies have the correct + /// permissions, and that you are using the correct credentials. + /// + /// + /// Updating or deleting a resource can cause an inconsistent state. + /// + /// + /// An internal failure occurred. + /// + /// + /// One or more parameters has a value that isn't valid. + /// + /// + /// A limit is exceeded. + /// + /// + /// One or more resources can't be found. /// /// /// Access is throttled. @@ -5187,15 +5650,15 @@ public virtual DeleteUserByPrincipalIdResponse DeleteUserByPrincipalId(DeleteUse #endregion - #region DeleteVPCConnection + #region DeleteUserCustomPermission /// - /// Deletes a VPC connection. + /// Deletes a custom permissions profile from a user. /// - /// Container for the necessary parameters to execute the DeleteVPCConnection service method. + /// Container for the necessary parameters to execute the DeleteUserCustomPermission service method. /// - /// The response from the DeleteVPCConnection service method, as returned by QuickSight. + /// The response from the DeleteUserCustomPermission service method, as returned by QuickSight. /// /// You don't have access to this item. The provided credentials couldn't be validated. /// You might not be authorized to carry out the request. Make sure that your account @@ -5211,8 +5674,103 @@ public virtual DeleteUserByPrincipalIdResponse DeleteUserByPrincipalId(DeleteUse /// /// One or more parameters has a value that isn't valid. /// - /// - /// One or more resources can't be found. + /// + /// One or more preconditions aren't met. + /// + /// + /// One or more resources can't be found. + /// + /// + /// This resource is currently unavailable. + /// + /// + /// Access is throttled. + /// + /// REST API Reference for DeleteUserCustomPermission Operation + public virtual DeleteUserCustomPermissionResponse DeleteUserCustomPermission(DeleteUserCustomPermissionRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = DeleteUserCustomPermissionRequestMarshaller.Instance; + options.ResponseUnmarshaller = DeleteUserCustomPermissionResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// Deletes a custom permissions profile from a user. + /// + /// Container for the necessary parameters to execute the DeleteUserCustomPermission service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the DeleteUserCustomPermission service method, as returned by QuickSight. + /// + /// You don't have access to this item. The provided credentials couldn't be validated. + /// You might not be authorized to carry out the request. Make sure that your account + /// is authorized to use the Amazon QuickSight service, that your policies have the correct + /// permissions, and that you are using the correct credentials. + /// + /// + /// Updating or deleting a resource can cause an inconsistent state. + /// + /// + /// An internal failure occurred. + /// + /// + /// One or more parameters has a value that isn't valid. + /// + /// + /// One or more preconditions aren't met. + /// + /// + /// One or more resources can't be found. + /// + /// + /// This resource is currently unavailable. + /// + /// + /// Access is throttled. + /// + /// REST API Reference for DeleteUserCustomPermission Operation + public virtual Task DeleteUserCustomPermissionAsync(DeleteUserCustomPermissionRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = DeleteUserCustomPermissionRequestMarshaller.Instance; + options.ResponseUnmarshaller = DeleteUserCustomPermissionResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + + #region DeleteVPCConnection + + + /// + /// Deletes a VPC connection. + /// + /// Container for the necessary parameters to execute the DeleteVPCConnection service method. + /// + /// The response from the DeleteVPCConnection service method, as returned by QuickSight. + /// + /// You don't have access to this item. The provided credentials couldn't be validated. + /// You might not be authorized to carry out the request. Make sure that your account + /// is authorized to use the Amazon QuickSight service, that your policies have the correct + /// permissions, and that you are using the correct credentials. + /// + /// + /// Updating or deleting a resource can cause an inconsistent state. + /// + /// + /// An internal failure occurred. + /// + /// + /// One or more parameters has a value that isn't valid. + /// + /// + /// One or more resources can't be found. /// /// /// Access is throttled. @@ -6126,26 +6684,30 @@ public virtual DescribeAssetBundleImportJobResponse DescribeAssetBundleImportJob #endregion - #region DescribeDashboard + #region DescribeBrand /// - /// Provides a summary for a dashboard. + /// Describes a brand. /// - /// Container for the necessary parameters to execute the DescribeDashboard service method. + /// Container for the necessary parameters to execute the DescribeBrand service method. /// - /// The response from the DescribeDashboard service method, as returned by QuickSight. + /// The response from the DescribeBrand service method, as returned by QuickSight. /// /// You don't have access to this item. The provided credentials couldn't be validated. /// You might not be authorized to carry out the request. Make sure that your account /// is authorized to use the Amazon QuickSight service, that your policies have the correct /// permissions, and that you are using the correct credentials. /// - /// - /// An internal failure occurred. + /// + /// Updating or deleting a resource can cause an inconsistent state. /// - /// - /// One or more parameters has a value that isn't valid. + /// + /// An internal service exception. + /// + /// + /// You don't have this feature activated for your account. To fix this issue, contact + /// Amazon Web Services support. /// /// /// One or more resources can't be found. @@ -6153,43 +6715,41 @@ public virtual DescribeAssetBundleImportJobResponse DescribeAssetBundleImportJob /// /// Access is throttled. /// - /// - /// This error indicates that you are calling an operation on an Amazon QuickSight subscription - /// where the edition doesn't include support for that operation. Amazon Amazon QuickSight - /// currently has Standard Edition and Enterprise Edition. Not every operation and capability - /// is available in every edition. - /// - /// REST API Reference for DescribeDashboard Operation - public virtual DescribeDashboardResponse DescribeDashboard(DescribeDashboardRequest request) + /// REST API Reference for DescribeBrand Operation + public virtual DescribeBrandResponse DescribeBrand(DescribeBrandRequest request) { var options = new InvokeOptions(); - options.RequestMarshaller = DescribeDashboardRequestMarshaller.Instance; - options.ResponseUnmarshaller = DescribeDashboardResponseUnmarshaller.Instance; + options.RequestMarshaller = DescribeBrandRequestMarshaller.Instance; + options.ResponseUnmarshaller = DescribeBrandResponseUnmarshaller.Instance; - return Invoke(request, options); + return Invoke(request, options); } /// - /// Provides a summary for a dashboard. + /// Describes a brand. /// - /// Container for the necessary parameters to execute the DescribeDashboard service method. + /// Container for the necessary parameters to execute the DescribeBrand service method. /// /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// /// - /// The response from the DescribeDashboard service method, as returned by QuickSight. + /// The response from the DescribeBrand service method, as returned by QuickSight. /// /// You don't have access to this item. The provided credentials couldn't be validated. /// You might not be authorized to carry out the request. Make sure that your account /// is authorized to use the Amazon QuickSight service, that your policies have the correct /// permissions, and that you are using the correct credentials. /// - /// - /// An internal failure occurred. + /// + /// Updating or deleting a resource can cause an inconsistent state. /// - /// - /// One or more parameters has a value that isn't valid. + /// + /// An internal service exception. + /// + /// + /// You don't have this feature activated for your account. To fix this issue, contact + /// Amazon Web Services support. /// /// /// One or more resources can't be found. @@ -6197,42 +6757,27 @@ public virtual DescribeDashboardResponse DescribeDashboard(DescribeDashboardRequ /// /// Access is throttled. /// - /// - /// This error indicates that you are calling an operation on an Amazon QuickSight subscription - /// where the edition doesn't include support for that operation. Amazon Amazon QuickSight - /// currently has Standard Edition and Enterprise Edition. Not every operation and capability - /// is available in every edition. - /// - /// REST API Reference for DescribeDashboard Operation - public virtual Task DescribeDashboardAsync(DescribeDashboardRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + /// REST API Reference for DescribeBrand Operation + public virtual Task DescribeBrandAsync(DescribeBrandRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { var options = new InvokeOptions(); - options.RequestMarshaller = DescribeDashboardRequestMarshaller.Instance; - options.ResponseUnmarshaller = DescribeDashboardResponseUnmarshaller.Instance; + options.RequestMarshaller = DescribeBrandRequestMarshaller.Instance; + options.ResponseUnmarshaller = DescribeBrandResponseUnmarshaller.Instance; - return InvokeAsync(request, options, cancellationToken); + return InvokeAsync(request, options, cancellationToken); } #endregion - #region DescribeDashboardDefinition + #region DescribeBrandAssignment /// - /// Provides a detailed description of the definition of a dashboard. - /// - /// - /// - /// If you do not need to know details about the content of a dashboard, for instance - /// if you are trying to check the status of a recently created or updated dashboard, - /// use the - /// DescribeDashboard instead. - /// - /// + /// Describes a brand assignment. /// - /// Container for the necessary parameters to execute the DescribeDashboardDefinition service method. + /// Container for the necessary parameters to execute the DescribeBrandAssignment service method. /// - /// The response from the DescribeDashboardDefinition service method, as returned by QuickSight. + /// The response from the DescribeBrandAssignment service method, as returned by QuickSight. /// /// You don't have access to this item. The provided credentials couldn't be validated. /// You might not be authorized to carry out the request. Make sure that your account @@ -6242,14 +6787,12 @@ public virtual DescribeDashboardResponse DescribeDashboard(DescribeDashboardRequ /// /// Updating or deleting a resource can cause an inconsistent state. /// - /// - /// An internal failure occurred. - /// - /// - /// One or more parameters has a value that isn't valid. + /// + /// An internal service exception. /// - /// - /// The resource specified already exists. + /// + /// You don't have this feature activated for your account. To fix this issue, contact + /// Amazon Web Services support. /// /// /// One or more resources can't be found. @@ -6257,41 +6800,26 @@ public virtual DescribeDashboardResponse DescribeDashboard(DescribeDashboardRequ /// /// Access is throttled. /// - /// - /// This error indicates that you are calling an operation on an Amazon QuickSight subscription - /// where the edition doesn't include support for that operation. Amazon Amazon QuickSight - /// currently has Standard Edition and Enterprise Edition. Not every operation and capability - /// is available in every edition. - /// - /// REST API Reference for DescribeDashboardDefinition Operation - public virtual DescribeDashboardDefinitionResponse DescribeDashboardDefinition(DescribeDashboardDefinitionRequest request) + /// REST API Reference for DescribeBrandAssignment Operation + public virtual DescribeBrandAssignmentResponse DescribeBrandAssignment(DescribeBrandAssignmentRequest request) { var options = new InvokeOptions(); - options.RequestMarshaller = DescribeDashboardDefinitionRequestMarshaller.Instance; - options.ResponseUnmarshaller = DescribeDashboardDefinitionResponseUnmarshaller.Instance; + options.RequestMarshaller = DescribeBrandAssignmentRequestMarshaller.Instance; + options.ResponseUnmarshaller = DescribeBrandAssignmentResponseUnmarshaller.Instance; - return Invoke(request, options); + return Invoke(request, options); } /// - /// Provides a detailed description of the definition of a dashboard. - /// - /// - /// - /// If you do not need to know details about the content of a dashboard, for instance - /// if you are trying to check the status of a recently created or updated dashboard, - /// use the - /// DescribeDashboard instead. - /// - /// + /// Describes a brand assignment. /// - /// Container for the necessary parameters to execute the DescribeDashboardDefinition service method. + /// Container for the necessary parameters to execute the DescribeBrandAssignment service method. /// /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// /// - /// The response from the DescribeDashboardDefinition service method, as returned by QuickSight. + /// The response from the DescribeBrandAssignment service method, as returned by QuickSight. /// /// You don't have access to this item. The provided credentials couldn't be validated. /// You might not be authorized to carry out the request. Make sure that your account @@ -6301,14 +6829,12 @@ public virtual DescribeDashboardDefinitionResponse DescribeDashboardDefinition(D /// /// Updating or deleting a resource can cause an inconsistent state. /// - /// - /// An internal failure occurred. - /// - /// - /// One or more parameters has a value that isn't valid. + /// + /// An internal service exception. /// - /// - /// The resource specified already exists. + /// + /// You don't have this feature activated for your account. To fix this issue, contact + /// Amazon Web Services support. /// /// /// One or more resources can't be found. @@ -6316,38 +6842,42 @@ public virtual DescribeDashboardDefinitionResponse DescribeDashboardDefinition(D /// /// Access is throttled. /// - /// - /// This error indicates that you are calling an operation on an Amazon QuickSight subscription - /// where the edition doesn't include support for that operation. Amazon Amazon QuickSight - /// currently has Standard Edition and Enterprise Edition. Not every operation and capability - /// is available in every edition. - /// - /// REST API Reference for DescribeDashboardDefinition Operation - public virtual Task DescribeDashboardDefinitionAsync(DescribeDashboardDefinitionRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + /// REST API Reference for DescribeBrandAssignment Operation + public virtual Task DescribeBrandAssignmentAsync(DescribeBrandAssignmentRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { var options = new InvokeOptions(); - options.RequestMarshaller = DescribeDashboardDefinitionRequestMarshaller.Instance; - options.ResponseUnmarshaller = DescribeDashboardDefinitionResponseUnmarshaller.Instance; + options.RequestMarshaller = DescribeBrandAssignmentRequestMarshaller.Instance; + options.ResponseUnmarshaller = DescribeBrandAssignmentResponseUnmarshaller.Instance; - return InvokeAsync(request, options, cancellationToken); + return InvokeAsync(request, options, cancellationToken); } #endregion - #region DescribeDashboardPermissions + #region DescribeBrandPublishedVersion /// - /// Describes read and write permissions for a dashboard. + /// Describes the published version of the brand. /// - /// Container for the necessary parameters to execute the DescribeDashboardPermissions service method. + /// Container for the necessary parameters to execute the DescribeBrandPublishedVersion service method. /// - /// The response from the DescribeDashboardPermissions service method, as returned by QuickSight. - /// - /// An internal failure occurred. + /// The response from the DescribeBrandPublishedVersion service method, as returned by QuickSight. + /// + /// You don't have access to this item. The provided credentials couldn't be validated. + /// You might not be authorized to carry out the request. Make sure that your account + /// is authorized to use the Amazon QuickSight service, that your policies have the correct + /// permissions, and that you are using the correct credentials. /// - /// - /// One or more parameters has a value that isn't valid. + /// + /// Updating or deleting a resource can cause an inconsistent state. + /// + /// + /// An internal service exception. + /// + /// + /// You don't have this feature activated for your account. To fix this issue, contact + /// Amazon Web Services support. /// /// /// One or more resources can't be found. @@ -6355,37 +6885,41 @@ public virtual DescribeDashboardDefinitionResponse DescribeDashboardDefinition(D /// /// Access is throttled. /// - /// - /// This error indicates that you are calling an operation on an Amazon QuickSight subscription - /// where the edition doesn't include support for that operation. Amazon Amazon QuickSight - /// currently has Standard Edition and Enterprise Edition. Not every operation and capability - /// is available in every edition. - /// - /// REST API Reference for DescribeDashboardPermissions Operation - public virtual DescribeDashboardPermissionsResponse DescribeDashboardPermissions(DescribeDashboardPermissionsRequest request) + /// REST API Reference for DescribeBrandPublishedVersion Operation + public virtual DescribeBrandPublishedVersionResponse DescribeBrandPublishedVersion(DescribeBrandPublishedVersionRequest request) { var options = new InvokeOptions(); - options.RequestMarshaller = DescribeDashboardPermissionsRequestMarshaller.Instance; - options.ResponseUnmarshaller = DescribeDashboardPermissionsResponseUnmarshaller.Instance; + options.RequestMarshaller = DescribeBrandPublishedVersionRequestMarshaller.Instance; + options.ResponseUnmarshaller = DescribeBrandPublishedVersionResponseUnmarshaller.Instance; - return Invoke(request, options); + return Invoke(request, options); } /// - /// Describes read and write permissions for a dashboard. + /// Describes the published version of the brand. /// - /// Container for the necessary parameters to execute the DescribeDashboardPermissions service method. + /// Container for the necessary parameters to execute the DescribeBrandPublishedVersion service method. /// /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// /// - /// The response from the DescribeDashboardPermissions service method, as returned by QuickSight. - /// - /// An internal failure occurred. + /// The response from the DescribeBrandPublishedVersion service method, as returned by QuickSight. + /// + /// You don't have access to this item. The provided credentials couldn't be validated. + /// You might not be authorized to carry out the request. Make sure that your account + /// is authorized to use the Amazon QuickSight service, that your policies have the correct + /// permissions, and that you are using the correct credentials. /// - /// - /// One or more parameters has a value that isn't valid. + /// + /// Updating or deleting a resource can cause an inconsistent state. + /// + /// + /// An internal service exception. + /// + /// + /// You don't have this feature activated for your account. To fix this issue, contact + /// Amazon Web Services support. /// /// /// One or more resources can't be found. @@ -6393,39 +6927,27 @@ public virtual DescribeDashboardPermissionsResponse DescribeDashboardPermissions /// /// Access is throttled. /// - /// - /// This error indicates that you are calling an operation on an Amazon QuickSight subscription - /// where the edition doesn't include support for that operation. Amazon Amazon QuickSight - /// currently has Standard Edition and Enterprise Edition. Not every operation and capability - /// is available in every edition. - /// - /// REST API Reference for DescribeDashboardPermissions Operation - public virtual Task DescribeDashboardPermissionsAsync(DescribeDashboardPermissionsRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + /// REST API Reference for DescribeBrandPublishedVersion Operation + public virtual Task DescribeBrandPublishedVersionAsync(DescribeBrandPublishedVersionRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { var options = new InvokeOptions(); - options.RequestMarshaller = DescribeDashboardPermissionsRequestMarshaller.Instance; - options.ResponseUnmarshaller = DescribeDashboardPermissionsResponseUnmarshaller.Instance; + options.RequestMarshaller = DescribeBrandPublishedVersionRequestMarshaller.Instance; + options.ResponseUnmarshaller = DescribeBrandPublishedVersionResponseUnmarshaller.Instance; - return InvokeAsync(request, options, cancellationToken); + return InvokeAsync(request, options, cancellationToken); } #endregion - #region DescribeDashboardSnapshotJob + #region DescribeCustomPermissions /// - /// Describes an existing snapshot job. - /// - /// - /// - /// Poll job descriptions after a job starts to know the status of the job. For information - /// on available status codes, see JobStatus. - /// + /// Describes a custom permissions profile. /// - /// Container for the necessary parameters to execute the DescribeDashboardSnapshotJob service method. + /// Container for the necessary parameters to execute the DescribeCustomPermissions service method. /// - /// The response from the DescribeDashboardSnapshotJob service method, as returned by QuickSight. + /// The response from the DescribeCustomPermissions service method, as returned by QuickSight. /// /// You don't have access to this item. The provided credentials couldn't be validated. /// You might not be authorized to carry out the request. Make sure that your account @@ -6435,44 +6957,41 @@ public virtual DescribeDashboardPermissionsResponse DescribeDashboardPermissions /// /// An internal failure occurred. /// + /// + /// One or more parameters has a value that isn't valid. + /// + /// + /// One or more preconditions aren't met. + /// /// /// One or more resources can't be found. /// + /// + /// This resource is currently unavailable. + /// /// /// Access is throttled. /// - /// - /// This error indicates that you are calling an operation on an Amazon QuickSight subscription - /// where the edition doesn't include support for that operation. Amazon Amazon QuickSight - /// currently has Standard Edition and Enterprise Edition. Not every operation and capability - /// is available in every edition. - /// - /// REST API Reference for DescribeDashboardSnapshotJob Operation - public virtual DescribeDashboardSnapshotJobResponse DescribeDashboardSnapshotJob(DescribeDashboardSnapshotJobRequest request) + /// REST API Reference for DescribeCustomPermissions Operation + public virtual DescribeCustomPermissionsResponse DescribeCustomPermissions(DescribeCustomPermissionsRequest request) { var options = new InvokeOptions(); - options.RequestMarshaller = DescribeDashboardSnapshotJobRequestMarshaller.Instance; - options.ResponseUnmarshaller = DescribeDashboardSnapshotJobResponseUnmarshaller.Instance; + options.RequestMarshaller = DescribeCustomPermissionsRequestMarshaller.Instance; + options.ResponseUnmarshaller = DescribeCustomPermissionsResponseUnmarshaller.Instance; - return Invoke(request, options); + return Invoke(request, options); } /// - /// Describes an existing snapshot job. - /// - /// - /// - /// Poll job descriptions after a job starts to know the status of the job. For information - /// on available status codes, see JobStatus. - /// + /// Describes a custom permissions profile. /// - /// Container for the necessary parameters to execute the DescribeDashboardSnapshotJob service method. + /// Container for the necessary parameters to execute the DescribeCustomPermissions service method. /// /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// /// - /// The response from the DescribeDashboardSnapshotJob service method, as returned by QuickSight. + /// The response from the DescribeCustomPermissions service method, as returned by QuickSight. /// /// You don't have access to this item. The provided credentials couldn't be validated. /// You might not be authorized to carry out the request. Make sure that your account @@ -6482,50 +7001,42 @@ public virtual DescribeDashboardSnapshotJobResponse DescribeDashboardSnapshotJob /// /// An internal failure occurred. /// + /// + /// One or more parameters has a value that isn't valid. + /// + /// + /// One or more preconditions aren't met. + /// /// /// One or more resources can't be found. /// + /// + /// This resource is currently unavailable. + /// /// /// Access is throttled. /// - /// - /// This error indicates that you are calling an operation on an Amazon QuickSight subscription - /// where the edition doesn't include support for that operation. Amazon Amazon QuickSight - /// currently has Standard Edition and Enterprise Edition. Not every operation and capability - /// is available in every edition. - /// - /// REST API Reference for DescribeDashboardSnapshotJob Operation - public virtual Task DescribeDashboardSnapshotJobAsync(DescribeDashboardSnapshotJobRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + /// REST API Reference for DescribeCustomPermissions Operation + public virtual Task DescribeCustomPermissionsAsync(DescribeCustomPermissionsRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { var options = new InvokeOptions(); - options.RequestMarshaller = DescribeDashboardSnapshotJobRequestMarshaller.Instance; - options.ResponseUnmarshaller = DescribeDashboardSnapshotJobResponseUnmarshaller.Instance; + options.RequestMarshaller = DescribeCustomPermissionsRequestMarshaller.Instance; + options.ResponseUnmarshaller = DescribeCustomPermissionsResponseUnmarshaller.Instance; - return InvokeAsync(request, options, cancellationToken); + return InvokeAsync(request, options, cancellationToken); } #endregion - #region DescribeDashboardSnapshotJobResult + #region DescribeDashboard /// - /// Describes the result of an existing snapshot job that has finished running. - /// - /// - /// - /// A finished snapshot job will return a COMPLETED or FAILED status when - /// you poll the job with a DescribeDashboardSnapshotJob API call. - /// - /// - /// - /// If the job has not finished running, this operation returns a message that says Dashboard - /// Snapshot Job with id <SnapshotjobId> has not reached a terminal state.. - /// + /// Provides a summary for a dashboard. /// - /// Container for the necessary parameters to execute the DescribeDashboardSnapshotJobResult service method. + /// Container for the necessary parameters to execute the DescribeDashboard service method. /// - /// The response from the DescribeDashboardSnapshotJobResult service method, as returned by QuickSight. + /// The response from the DescribeDashboard service method, as returned by QuickSight. /// /// You don't have access to this item. The provided credentials couldn't be validated. /// You might not be authorized to carry out the request. Make sure that your account @@ -6538,9 +7049,6 @@ public virtual DescribeDashboardSnapshotJobResponse DescribeDashboardSnapshotJob /// /// One or more parameters has a value that isn't valid. /// - /// - /// One or more preconditions aren't met. - /// /// /// One or more resources can't be found. /// @@ -6553,37 +7061,26 @@ public virtual DescribeDashboardSnapshotJobResponse DescribeDashboardSnapshotJob /// currently has Standard Edition and Enterprise Edition. Not every operation and capability /// is available in every edition. /// - /// REST API Reference for DescribeDashboardSnapshotJobResult Operation - public virtual DescribeDashboardSnapshotJobResultResponse DescribeDashboardSnapshotJobResult(DescribeDashboardSnapshotJobResultRequest request) + /// REST API Reference for DescribeDashboard Operation + public virtual DescribeDashboardResponse DescribeDashboard(DescribeDashboardRequest request) { var options = new InvokeOptions(); - options.RequestMarshaller = DescribeDashboardSnapshotJobResultRequestMarshaller.Instance; - options.ResponseUnmarshaller = DescribeDashboardSnapshotJobResultResponseUnmarshaller.Instance; + options.RequestMarshaller = DescribeDashboardRequestMarshaller.Instance; + options.ResponseUnmarshaller = DescribeDashboardResponseUnmarshaller.Instance; - return Invoke(request, options); + return Invoke(request, options); } /// - /// Describes the result of an existing snapshot job that has finished running. - /// - /// - /// - /// A finished snapshot job will return a COMPLETED or FAILED status when - /// you poll the job with a DescribeDashboardSnapshotJob API call. - /// - /// - /// - /// If the job has not finished running, this operation returns a message that says Dashboard - /// Snapshot Job with id <SnapshotjobId> has not reached a terminal state.. - /// + /// Provides a summary for a dashboard. /// - /// Container for the necessary parameters to execute the DescribeDashboardSnapshotJobResult service method. + /// Container for the necessary parameters to execute the DescribeDashboard service method. /// /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// /// - /// The response from the DescribeDashboardSnapshotJobResult service method, as returned by QuickSight. + /// The response from the DescribeDashboard service method, as returned by QuickSight. /// /// You don't have access to this item. The provided credentials couldn't be validated. /// You might not be authorized to carry out the request. Make sure that your account @@ -6596,9 +7093,6 @@ public virtual DescribeDashboardSnapshotJobResultResponse DescribeDashboardSnaps /// /// One or more parameters has a value that isn't valid. /// - /// - /// One or more preconditions aren't met. - /// /// /// One or more resources can't be found. /// @@ -6611,117 +7105,146 @@ public virtual DescribeDashboardSnapshotJobResultResponse DescribeDashboardSnaps /// currently has Standard Edition and Enterprise Edition. Not every operation and capability /// is available in every edition. /// - /// REST API Reference for DescribeDashboardSnapshotJobResult Operation - public virtual Task DescribeDashboardSnapshotJobResultAsync(DescribeDashboardSnapshotJobResultRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + /// REST API Reference for DescribeDashboard Operation + public virtual Task DescribeDashboardAsync(DescribeDashboardRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { var options = new InvokeOptions(); - options.RequestMarshaller = DescribeDashboardSnapshotJobResultRequestMarshaller.Instance; - options.ResponseUnmarshaller = DescribeDashboardSnapshotJobResultResponseUnmarshaller.Instance; + options.RequestMarshaller = DescribeDashboardRequestMarshaller.Instance; + options.ResponseUnmarshaller = DescribeDashboardResponseUnmarshaller.Instance; - return InvokeAsync(request, options, cancellationToken); + return InvokeAsync(request, options, cancellationToken); } #endregion - #region DescribeDataSet + #region DescribeDashboardDefinition /// - /// Describes a dataset. This operation doesn't support datasets that include uploaded - /// files as a source. + /// Provides a detailed description of the definition of a dashboard. + /// + /// + /// + /// If you do not need to know details about the content of a dashboard, for instance + /// if you are trying to check the status of a recently created or updated dashboard, + /// use the + /// DescribeDashboard instead. + /// + /// /// - /// Container for the necessary parameters to execute the DescribeDataSet service method. + /// Container for the necessary parameters to execute the DescribeDashboardDefinition service method. /// - /// The response from the DescribeDataSet service method, as returned by QuickSight. + /// The response from the DescribeDashboardDefinition service method, as returned by QuickSight. /// /// You don't have access to this item. The provided credentials couldn't be validated. /// You might not be authorized to carry out the request. Make sure that your account /// is authorized to use the Amazon QuickSight service, that your policies have the correct /// permissions, and that you are using the correct credentials. /// + /// + /// Updating or deleting a resource can cause an inconsistent state. + /// /// /// An internal failure occurred. /// /// /// One or more parameters has a value that isn't valid. /// + /// + /// The resource specified already exists. + /// /// /// One or more resources can't be found. /// /// /// Access is throttled. /// - /// REST API Reference for DescribeDataSet Operation - public virtual DescribeDataSetResponse DescribeDataSet(DescribeDataSetRequest request) + /// + /// This error indicates that you are calling an operation on an Amazon QuickSight subscription + /// where the edition doesn't include support for that operation. Amazon Amazon QuickSight + /// currently has Standard Edition and Enterprise Edition. Not every operation and capability + /// is available in every edition. + /// + /// REST API Reference for DescribeDashboardDefinition Operation + public virtual DescribeDashboardDefinitionResponse DescribeDashboardDefinition(DescribeDashboardDefinitionRequest request) { var options = new InvokeOptions(); - options.RequestMarshaller = DescribeDataSetRequestMarshaller.Instance; - options.ResponseUnmarshaller = DescribeDataSetResponseUnmarshaller.Instance; + options.RequestMarshaller = DescribeDashboardDefinitionRequestMarshaller.Instance; + options.ResponseUnmarshaller = DescribeDashboardDefinitionResponseUnmarshaller.Instance; - return Invoke(request, options); + return Invoke(request, options); } /// - /// Describes a dataset. This operation doesn't support datasets that include uploaded - /// files as a source. + /// Provides a detailed description of the definition of a dashboard. + /// + /// + /// + /// If you do not need to know details about the content of a dashboard, for instance + /// if you are trying to check the status of a recently created or updated dashboard, + /// use the + /// DescribeDashboard instead. + /// + /// /// - /// Container for the necessary parameters to execute the DescribeDataSet service method. + /// Container for the necessary parameters to execute the DescribeDashboardDefinition service method. /// /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// /// - /// The response from the DescribeDataSet service method, as returned by QuickSight. + /// The response from the DescribeDashboardDefinition service method, as returned by QuickSight. /// /// You don't have access to this item. The provided credentials couldn't be validated. /// You might not be authorized to carry out the request. Make sure that your account /// is authorized to use the Amazon QuickSight service, that your policies have the correct /// permissions, and that you are using the correct credentials. /// + /// + /// Updating or deleting a resource can cause an inconsistent state. + /// /// /// An internal failure occurred. /// /// /// One or more parameters has a value that isn't valid. /// + /// + /// The resource specified already exists. + /// /// /// One or more resources can't be found. /// /// /// Access is throttled. /// - /// REST API Reference for DescribeDataSet Operation - public virtual Task DescribeDataSetAsync(DescribeDataSetRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + /// + /// This error indicates that you are calling an operation on an Amazon QuickSight subscription + /// where the edition doesn't include support for that operation. Amazon Amazon QuickSight + /// currently has Standard Edition and Enterprise Edition. Not every operation and capability + /// is available in every edition. + /// + /// REST API Reference for DescribeDashboardDefinition Operation + public virtual Task DescribeDashboardDefinitionAsync(DescribeDashboardDefinitionRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { var options = new InvokeOptions(); - options.RequestMarshaller = DescribeDataSetRequestMarshaller.Instance; - options.ResponseUnmarshaller = DescribeDataSetResponseUnmarshaller.Instance; + options.RequestMarshaller = DescribeDashboardDefinitionRequestMarshaller.Instance; + options.ResponseUnmarshaller = DescribeDashboardDefinitionResponseUnmarshaller.Instance; - return InvokeAsync(request, options, cancellationToken); + return InvokeAsync(request, options, cancellationToken); } #endregion - #region DescribeDataSetPermissions + #region DescribeDashboardPermissions /// - /// Describes the permissions on a dataset. - /// - /// - /// - /// The permissions resource is arn:aws:quicksight:region:aws-account-id:dataset/data-set-id. - /// + /// Describes read and write permissions for a dashboard. /// - /// Container for the necessary parameters to execute the DescribeDataSetPermissions service method. + /// Container for the necessary parameters to execute the DescribeDashboardPermissions service method. /// - /// The response from the DescribeDataSetPermissions service method, as returned by QuickSight. - /// - /// You don't have access to this item. The provided credentials couldn't be validated. - /// You might not be authorized to carry out the request. Make sure that your account - /// is authorized to use the Amazon QuickSight service, that your policies have the correct - /// permissions, and that you are using the correct credentials. - /// + /// The response from the DescribeDashboardPermissions service method, as returned by QuickSight. /// /// An internal failure occurred. /// @@ -6734,37 +7257,32 @@ public virtual DescribeDataSetResponse DescribeDataSet(DescribeDataSetRequest re /// /// Access is throttled. /// - /// REST API Reference for DescribeDataSetPermissions Operation - public virtual DescribeDataSetPermissionsResponse DescribeDataSetPermissions(DescribeDataSetPermissionsRequest request) + /// + /// This error indicates that you are calling an operation on an Amazon QuickSight subscription + /// where the edition doesn't include support for that operation. Amazon Amazon QuickSight + /// currently has Standard Edition and Enterprise Edition. Not every operation and capability + /// is available in every edition. + /// + /// REST API Reference for DescribeDashboardPermissions Operation + public virtual DescribeDashboardPermissionsResponse DescribeDashboardPermissions(DescribeDashboardPermissionsRequest request) { var options = new InvokeOptions(); - options.RequestMarshaller = DescribeDataSetPermissionsRequestMarshaller.Instance; - options.ResponseUnmarshaller = DescribeDataSetPermissionsResponseUnmarshaller.Instance; + options.RequestMarshaller = DescribeDashboardPermissionsRequestMarshaller.Instance; + options.ResponseUnmarshaller = DescribeDashboardPermissionsResponseUnmarshaller.Instance; - return Invoke(request, options); + return Invoke(request, options); } /// - /// Describes the permissions on a dataset. - /// - /// - /// - /// The permissions resource is arn:aws:quicksight:region:aws-account-id:dataset/data-set-id. - /// + /// Describes read and write permissions for a dashboard. /// - /// Container for the necessary parameters to execute the DescribeDataSetPermissions service method. + /// Container for the necessary parameters to execute the DescribeDashboardPermissions service method. /// /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// /// - /// The response from the DescribeDataSetPermissions service method, as returned by QuickSight. - /// - /// You don't have access to this item. The provided credentials couldn't be validated. - /// You might not be authorized to carry out the request. Make sure that your account - /// is authorized to use the Amazon QuickSight service, that your policies have the correct - /// permissions, and that you are using the correct credentials. - /// + /// The response from the DescribeDashboardPermissions service method, as returned by QuickSight. /// /// An internal failure occurred. /// @@ -6777,27 +7295,39 @@ public virtual DescribeDataSetPermissionsResponse DescribeDataSetPermissions(Des /// /// Access is throttled. /// - /// REST API Reference for DescribeDataSetPermissions Operation - public virtual Task DescribeDataSetPermissionsAsync(DescribeDataSetPermissionsRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + /// + /// This error indicates that you are calling an operation on an Amazon QuickSight subscription + /// where the edition doesn't include support for that operation. Amazon Amazon QuickSight + /// currently has Standard Edition and Enterprise Edition. Not every operation and capability + /// is available in every edition. + /// + /// REST API Reference for DescribeDashboardPermissions Operation + public virtual Task DescribeDashboardPermissionsAsync(DescribeDashboardPermissionsRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { var options = new InvokeOptions(); - options.RequestMarshaller = DescribeDataSetPermissionsRequestMarshaller.Instance; - options.ResponseUnmarshaller = DescribeDataSetPermissionsResponseUnmarshaller.Instance; + options.RequestMarshaller = DescribeDashboardPermissionsRequestMarshaller.Instance; + options.ResponseUnmarshaller = DescribeDashboardPermissionsResponseUnmarshaller.Instance; - return InvokeAsync(request, options, cancellationToken); + return InvokeAsync(request, options, cancellationToken); } #endregion - #region DescribeDataSetRefreshProperties + #region DescribeDashboardSnapshotJob /// - /// Describes the refresh properties of a dataset. + /// Describes an existing snapshot job. + /// + /// + /// + /// Poll job descriptions after a job starts to know the status of the job. For information + /// on available status codes, see JobStatus. + /// /// - /// Container for the necessary parameters to execute the DescribeDataSetRefreshProperties service method. + /// Container for the necessary parameters to execute the DescribeDashboardSnapshotJob service method. /// - /// The response from the DescribeDataSetRefreshProperties service method, as returned by QuickSight. + /// The response from the DescribeDashboardSnapshotJob service method, as returned by QuickSight. /// /// You don't have access to this item. The provided credentials couldn't be validated. /// You might not be authorized to carry out the request. Make sure that your account @@ -6807,41 +7337,44 @@ public virtual DescribeDataSetPermissionsResponse DescribeDataSetPermissions(Des /// /// An internal failure occurred. /// - /// - /// One or more parameters has a value that isn't valid. - /// - /// - /// A limit is exceeded. - /// - /// - /// One or more preconditions aren't met. - /// /// /// One or more resources can't be found. /// /// /// Access is throttled. /// - /// REST API Reference for DescribeDataSetRefreshProperties Operation - public virtual DescribeDataSetRefreshPropertiesResponse DescribeDataSetRefreshProperties(DescribeDataSetRefreshPropertiesRequest request) + /// + /// This error indicates that you are calling an operation on an Amazon QuickSight subscription + /// where the edition doesn't include support for that operation. Amazon Amazon QuickSight + /// currently has Standard Edition and Enterprise Edition. Not every operation and capability + /// is available in every edition. + /// + /// REST API Reference for DescribeDashboardSnapshotJob Operation + public virtual DescribeDashboardSnapshotJobResponse DescribeDashboardSnapshotJob(DescribeDashboardSnapshotJobRequest request) { var options = new InvokeOptions(); - options.RequestMarshaller = DescribeDataSetRefreshPropertiesRequestMarshaller.Instance; - options.ResponseUnmarshaller = DescribeDataSetRefreshPropertiesResponseUnmarshaller.Instance; + options.RequestMarshaller = DescribeDashboardSnapshotJobRequestMarshaller.Instance; + options.ResponseUnmarshaller = DescribeDashboardSnapshotJobResponseUnmarshaller.Instance; - return Invoke(request, options); + return Invoke(request, options); } /// - /// Describes the refresh properties of a dataset. + /// Describes an existing snapshot job. + /// + /// + /// + /// Poll job descriptions after a job starts to know the status of the job. For information + /// on available status codes, see JobStatus. + /// /// - /// Container for the necessary parameters to execute the DescribeDataSetRefreshProperties service method. + /// Container for the necessary parameters to execute the DescribeDashboardSnapshotJob service method. /// /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// /// - /// The response from the DescribeDataSetRefreshProperties service method, as returned by QuickSight. + /// The response from the DescribeDashboardSnapshotJob service method, as returned by QuickSight. /// /// You don't have access to this item. The provided credentials couldn't be validated. /// You might not be authorized to carry out the request. Make sure that your account @@ -6851,42 +7384,50 @@ public virtual DescribeDataSetRefreshPropertiesResponse DescribeDataSetRefreshPr /// /// An internal failure occurred. /// - /// - /// One or more parameters has a value that isn't valid. - /// - /// - /// A limit is exceeded. - /// - /// - /// One or more preconditions aren't met. - /// /// /// One or more resources can't be found. /// /// /// Access is throttled. /// - /// REST API Reference for DescribeDataSetRefreshProperties Operation - public virtual Task DescribeDataSetRefreshPropertiesAsync(DescribeDataSetRefreshPropertiesRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + /// + /// This error indicates that you are calling an operation on an Amazon QuickSight subscription + /// where the edition doesn't include support for that operation. Amazon Amazon QuickSight + /// currently has Standard Edition and Enterprise Edition. Not every operation and capability + /// is available in every edition. + /// + /// REST API Reference for DescribeDashboardSnapshotJob Operation + public virtual Task DescribeDashboardSnapshotJobAsync(DescribeDashboardSnapshotJobRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { var options = new InvokeOptions(); - options.RequestMarshaller = DescribeDataSetRefreshPropertiesRequestMarshaller.Instance; - options.ResponseUnmarshaller = DescribeDataSetRefreshPropertiesResponseUnmarshaller.Instance; + options.RequestMarshaller = DescribeDashboardSnapshotJobRequestMarshaller.Instance; + options.ResponseUnmarshaller = DescribeDashboardSnapshotJobResponseUnmarshaller.Instance; - return InvokeAsync(request, options, cancellationToken); + return InvokeAsync(request, options, cancellationToken); } #endregion - #region DescribeDataSource + #region DescribeDashboardSnapshotJobResult /// - /// Describes a data source. + /// Describes the result of an existing snapshot job that has finished running. + /// + /// + /// + /// A finished snapshot job will return a COMPLETED or FAILED status when + /// you poll the job with a DescribeDashboardSnapshotJob API call. + /// + /// + /// + /// If the job has not finished running, this operation returns a message that says Dashboard + /// Snapshot Job with id <SnapshotjobId> has not reached a terminal state.. + /// /// - /// Container for the necessary parameters to execute the DescribeDataSource service method. + /// Container for the necessary parameters to execute the DescribeDashboardSnapshotJobResult service method. /// - /// The response from the DescribeDataSource service method, as returned by QuickSight. + /// The response from the DescribeDashboardSnapshotJobResult service method, as returned by QuickSight. /// /// You don't have access to this item. The provided credentials couldn't be validated. /// You might not be authorized to carry out the request. Make sure that your account @@ -6899,32 +7440,52 @@ public virtual DescribeDataSetRefreshPropertiesResponse DescribeDataSetRefreshPr /// /// One or more parameters has a value that isn't valid. /// + /// + /// One or more preconditions aren't met. + /// /// /// One or more resources can't be found. /// /// /// Access is throttled. /// - /// REST API Reference for DescribeDataSource Operation - public virtual DescribeDataSourceResponse DescribeDataSource(DescribeDataSourceRequest request) + /// + /// This error indicates that you are calling an operation on an Amazon QuickSight subscription + /// where the edition doesn't include support for that operation. Amazon Amazon QuickSight + /// currently has Standard Edition and Enterprise Edition. Not every operation and capability + /// is available in every edition. + /// + /// REST API Reference for DescribeDashboardSnapshotJobResult Operation + public virtual DescribeDashboardSnapshotJobResultResponse DescribeDashboardSnapshotJobResult(DescribeDashboardSnapshotJobResultRequest request) { var options = new InvokeOptions(); - options.RequestMarshaller = DescribeDataSourceRequestMarshaller.Instance; - options.ResponseUnmarshaller = DescribeDataSourceResponseUnmarshaller.Instance; + options.RequestMarshaller = DescribeDashboardSnapshotJobResultRequestMarshaller.Instance; + options.ResponseUnmarshaller = DescribeDashboardSnapshotJobResultResponseUnmarshaller.Instance; - return Invoke(request, options); + return Invoke(request, options); } /// - /// Describes a data source. + /// Describes the result of an existing snapshot job that has finished running. + /// + /// + /// + /// A finished snapshot job will return a COMPLETED or FAILED status when + /// you poll the job with a DescribeDashboardSnapshotJob API call. + /// + /// + /// + /// If the job has not finished running, this operation returns a message that says Dashboard + /// Snapshot Job with id <SnapshotjobId> has not reached a terminal state.. + /// /// - /// Container for the necessary parameters to execute the DescribeDataSource service method. + /// Container for the necessary parameters to execute the DescribeDashboardSnapshotJobResult service method. /// /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// /// - /// The response from the DescribeDataSource service method, as returned by QuickSight. + /// The response from the DescribeDashboardSnapshotJobResult service method, as returned by QuickSight. /// /// You don't have access to this item. The provided credentials couldn't be validated. /// You might not be authorized to carry out the request. Make sure that your account @@ -6937,33 +7498,43 @@ public virtual DescribeDataSourceResponse DescribeDataSource(DescribeDataSourceR /// /// One or more parameters has a value that isn't valid. /// + /// + /// One or more preconditions aren't met. + /// /// /// One or more resources can't be found. /// /// /// Access is throttled. /// - /// REST API Reference for DescribeDataSource Operation - public virtual Task DescribeDataSourceAsync(DescribeDataSourceRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + /// + /// This error indicates that you are calling an operation on an Amazon QuickSight subscription + /// where the edition doesn't include support for that operation. Amazon Amazon QuickSight + /// currently has Standard Edition and Enterprise Edition. Not every operation and capability + /// is available in every edition. + /// + /// REST API Reference for DescribeDashboardSnapshotJobResult Operation + public virtual Task DescribeDashboardSnapshotJobResultAsync(DescribeDashboardSnapshotJobResultRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { var options = new InvokeOptions(); - options.RequestMarshaller = DescribeDataSourceRequestMarshaller.Instance; - options.ResponseUnmarshaller = DescribeDataSourceResponseUnmarshaller.Instance; + options.RequestMarshaller = DescribeDashboardSnapshotJobResultRequestMarshaller.Instance; + options.ResponseUnmarshaller = DescribeDashboardSnapshotJobResultResponseUnmarshaller.Instance; - return InvokeAsync(request, options, cancellationToken); + return InvokeAsync(request, options, cancellationToken); } #endregion - #region DescribeDataSourcePermissions + #region DescribeDataSet /// - /// Describes the resource permissions for a data source. + /// Describes a dataset. This operation doesn't support datasets that include uploaded + /// files as a source. /// - /// Container for the necessary parameters to execute the DescribeDataSourcePermissions service method. + /// Container for the necessary parameters to execute the DescribeDataSet service method. /// - /// The response from the DescribeDataSourcePermissions service method, as returned by QuickSight. + /// The response from the DescribeDataSet service method, as returned by QuickSight. /// /// You don't have access to this item. The provided credentials couldn't be validated. /// You might not be authorized to carry out the request. Make sure that your account @@ -6982,26 +7553,27 @@ public virtual DescribeDataSourceResponse DescribeDataSource(DescribeDataSourceR /// /// Access is throttled. /// - /// REST API Reference for DescribeDataSourcePermissions Operation - public virtual DescribeDataSourcePermissionsResponse DescribeDataSourcePermissions(DescribeDataSourcePermissionsRequest request) + /// REST API Reference for DescribeDataSet Operation + public virtual DescribeDataSetResponse DescribeDataSet(DescribeDataSetRequest request) { var options = new InvokeOptions(); - options.RequestMarshaller = DescribeDataSourcePermissionsRequestMarshaller.Instance; - options.ResponseUnmarshaller = DescribeDataSourcePermissionsResponseUnmarshaller.Instance; + options.RequestMarshaller = DescribeDataSetRequestMarshaller.Instance; + options.ResponseUnmarshaller = DescribeDataSetResponseUnmarshaller.Instance; - return Invoke(request, options); + return Invoke(request, options); } /// - /// Describes the resource permissions for a data source. + /// Describes a dataset. This operation doesn't support datasets that include uploaded + /// files as a source. /// - /// Container for the necessary parameters to execute the DescribeDataSourcePermissions service method. + /// Container for the necessary parameters to execute the DescribeDataSet service method. /// /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// /// - /// The response from the DescribeDataSourcePermissions service method, as returned by QuickSight. + /// The response from the DescribeDataSet service method, as returned by QuickSight. /// /// You don't have access to this item. The provided credentials couldn't be validated. /// You might not be authorized to carry out the request. Make sure that your account @@ -7020,27 +7592,32 @@ public virtual DescribeDataSourcePermissionsResponse DescribeDataSourcePermissio /// /// Access is throttled. /// - /// REST API Reference for DescribeDataSourcePermissions Operation - public virtual Task DescribeDataSourcePermissionsAsync(DescribeDataSourcePermissionsRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + /// REST API Reference for DescribeDataSet Operation + public virtual Task DescribeDataSetAsync(DescribeDataSetRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { var options = new InvokeOptions(); - options.RequestMarshaller = DescribeDataSourcePermissionsRequestMarshaller.Instance; - options.ResponseUnmarshaller = DescribeDataSourcePermissionsResponseUnmarshaller.Instance; + options.RequestMarshaller = DescribeDataSetRequestMarshaller.Instance; + options.ResponseUnmarshaller = DescribeDataSetResponseUnmarshaller.Instance; - return InvokeAsync(request, options, cancellationToken); + return InvokeAsync(request, options, cancellationToken); } #endregion - #region DescribeFolder + #region DescribeDataSetPermissions /// - /// Describes a folder. + /// Describes the permissions on a dataset. + /// + /// + /// + /// The permissions resource is arn:aws:quicksight:region:aws-account-id:dataset/data-set-id. + /// /// - /// Container for the necessary parameters to execute the DescribeFolder service method. + /// Container for the necessary parameters to execute the DescribeDataSetPermissions service method. /// - /// The response from the DescribeFolder service method, as returned by QuickSight. + /// The response from the DescribeDataSetPermissions service method, as returned by QuickSight. /// /// You don't have access to this item. The provided credentials couldn't be validated. /// You might not be authorized to carry out the request. Make sure that your account @@ -7059,32 +7636,31 @@ public virtual DescribeDataSourcePermissionsResponse DescribeDataSourcePermissio /// /// Access is throttled. /// - /// - /// This error indicates that you are calling an operation on an Amazon QuickSight subscription - /// where the edition doesn't include support for that operation. Amazon Amazon QuickSight - /// currently has Standard Edition and Enterprise Edition. Not every operation and capability - /// is available in every edition. - /// - /// REST API Reference for DescribeFolder Operation - public virtual DescribeFolderResponse DescribeFolder(DescribeFolderRequest request) + /// REST API Reference for DescribeDataSetPermissions Operation + public virtual DescribeDataSetPermissionsResponse DescribeDataSetPermissions(DescribeDataSetPermissionsRequest request) { var options = new InvokeOptions(); - options.RequestMarshaller = DescribeFolderRequestMarshaller.Instance; - options.ResponseUnmarshaller = DescribeFolderResponseUnmarshaller.Instance; + options.RequestMarshaller = DescribeDataSetPermissionsRequestMarshaller.Instance; + options.ResponseUnmarshaller = DescribeDataSetPermissionsResponseUnmarshaller.Instance; - return Invoke(request, options); + return Invoke(request, options); } /// - /// Describes a folder. + /// Describes the permissions on a dataset. + /// + /// + /// + /// The permissions resource is arn:aws:quicksight:region:aws-account-id:dataset/data-set-id. + /// /// - /// Container for the necessary parameters to execute the DescribeFolder service method. + /// Container for the necessary parameters to execute the DescribeDataSetPermissions service method. /// /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// /// - /// The response from the DescribeFolder service method, as returned by QuickSight. + /// The response from the DescribeDataSetPermissions service method, as returned by QuickSight. /// /// You don't have access to this item. The provided credentials couldn't be validated. /// You might not be authorized to carry out the request. Make sure that your account @@ -7103,33 +7679,27 @@ public virtual DescribeFolderResponse DescribeFolder(DescribeFolderRequest reque /// /// Access is throttled. /// - /// - /// This error indicates that you are calling an operation on an Amazon QuickSight subscription - /// where the edition doesn't include support for that operation. Amazon Amazon QuickSight - /// currently has Standard Edition and Enterprise Edition. Not every operation and capability - /// is available in every edition. - /// - /// REST API Reference for DescribeFolder Operation - public virtual Task DescribeFolderAsync(DescribeFolderRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + /// REST API Reference for DescribeDataSetPermissions Operation + public virtual Task DescribeDataSetPermissionsAsync(DescribeDataSetPermissionsRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { var options = new InvokeOptions(); - options.RequestMarshaller = DescribeFolderRequestMarshaller.Instance; - options.ResponseUnmarshaller = DescribeFolderResponseUnmarshaller.Instance; + options.RequestMarshaller = DescribeDataSetPermissionsRequestMarshaller.Instance; + options.ResponseUnmarshaller = DescribeDataSetPermissionsResponseUnmarshaller.Instance; - return InvokeAsync(request, options, cancellationToken); + return InvokeAsync(request, options, cancellationToken); } #endregion - #region DescribeFolderPermissions + #region DescribeDataSetRefreshProperties /// - /// Describes permissions for a folder. + /// Describes the refresh properties of a dataset. /// - /// Container for the necessary parameters to execute the DescribeFolderPermissions service method. + /// Container for the necessary parameters to execute the DescribeDataSetRefreshProperties service method. /// - /// The response from the DescribeFolderPermissions service method, as returned by QuickSight. + /// The response from the DescribeDataSetRefreshProperties service method, as returned by QuickSight. /// /// You don't have access to this item. The provided credentials couldn't be validated. /// You might not be authorized to carry out the request. Make sure that your account @@ -7139,44 +7709,41 @@ public virtual DescribeFolderResponse DescribeFolder(DescribeFolderRequest reque /// /// An internal failure occurred. /// - /// - /// The NextToken value isn't valid. - /// /// /// One or more parameters has a value that isn't valid. /// + /// + /// A limit is exceeded. + /// + /// + /// One or more preconditions aren't met. + /// /// /// One or more resources can't be found. /// /// /// Access is throttled. /// - /// - /// This error indicates that you are calling an operation on an Amazon QuickSight subscription - /// where the edition doesn't include support for that operation. Amazon Amazon QuickSight - /// currently has Standard Edition and Enterprise Edition. Not every operation and capability - /// is available in every edition. - /// - /// REST API Reference for DescribeFolderPermissions Operation - public virtual DescribeFolderPermissionsResponse DescribeFolderPermissions(DescribeFolderPermissionsRequest request) + /// REST API Reference for DescribeDataSetRefreshProperties Operation + public virtual DescribeDataSetRefreshPropertiesResponse DescribeDataSetRefreshProperties(DescribeDataSetRefreshPropertiesRequest request) { var options = new InvokeOptions(); - options.RequestMarshaller = DescribeFolderPermissionsRequestMarshaller.Instance; - options.ResponseUnmarshaller = DescribeFolderPermissionsResponseUnmarshaller.Instance; + options.RequestMarshaller = DescribeDataSetRefreshPropertiesRequestMarshaller.Instance; + options.ResponseUnmarshaller = DescribeDataSetRefreshPropertiesResponseUnmarshaller.Instance; - return Invoke(request, options); + return Invoke(request, options); } /// - /// Describes permissions for a folder. + /// Describes the refresh properties of a dataset. /// - /// Container for the necessary parameters to execute the DescribeFolderPermissions service method. + /// Container for the necessary parameters to execute the DescribeDataSetRefreshProperties service method. /// /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// /// - /// The response from the DescribeFolderPermissions service method, as returned by QuickSight. + /// The response from the DescribeDataSetRefreshProperties service method, as returned by QuickSight. /// /// You don't have access to this item. The provided credentials couldn't be validated. /// You might not be authorized to carry out the request. Make sure that your account @@ -7186,46 +7753,42 @@ public virtual DescribeFolderPermissionsResponse DescribeFolderPermissions(Descr /// /// An internal failure occurred. /// - /// - /// The NextToken value isn't valid. - /// /// /// One or more parameters has a value that isn't valid. /// + /// + /// A limit is exceeded. + /// + /// + /// One or more preconditions aren't met. + /// /// /// One or more resources can't be found. /// /// /// Access is throttled. /// - /// - /// This error indicates that you are calling an operation on an Amazon QuickSight subscription - /// where the edition doesn't include support for that operation. Amazon Amazon QuickSight - /// currently has Standard Edition and Enterprise Edition. Not every operation and capability - /// is available in every edition. - /// - /// REST API Reference for DescribeFolderPermissions Operation - public virtual Task DescribeFolderPermissionsAsync(DescribeFolderPermissionsRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + /// REST API Reference for DescribeDataSetRefreshProperties Operation + public virtual Task DescribeDataSetRefreshPropertiesAsync(DescribeDataSetRefreshPropertiesRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { var options = new InvokeOptions(); - options.RequestMarshaller = DescribeFolderPermissionsRequestMarshaller.Instance; - options.ResponseUnmarshaller = DescribeFolderPermissionsResponseUnmarshaller.Instance; + options.RequestMarshaller = DescribeDataSetRefreshPropertiesRequestMarshaller.Instance; + options.ResponseUnmarshaller = DescribeDataSetRefreshPropertiesResponseUnmarshaller.Instance; - return InvokeAsync(request, options, cancellationToken); + return InvokeAsync(request, options, cancellationToken); } #endregion - #region DescribeFolderResolvedPermissions + #region DescribeDataSource /// - /// Describes the folder resolved permissions. Permissions consists of both folder direct - /// permissions and the inherited permissions from the ancestor folders. + /// Describes a data source. /// - /// Container for the necessary parameters to execute the DescribeFolderResolvedPermissions service method. + /// Container for the necessary parameters to execute the DescribeDataSource service method. /// - /// The response from the DescribeFolderResolvedPermissions service method, as returned by QuickSight. + /// The response from the DescribeDataSource service method, as returned by QuickSight. /// /// You don't have access to this item. The provided credentials couldn't be validated. /// You might not be authorized to carry out the request. Make sure that your account @@ -7235,9 +7798,6 @@ public virtual DescribeFolderPermissionsResponse DescribeFolderPermissions(Descr /// /// An internal failure occurred. /// - /// - /// The NextToken value isn't valid. - /// /// /// One or more parameters has a value that isn't valid. /// @@ -7247,33 +7807,26 @@ public virtual DescribeFolderPermissionsResponse DescribeFolderPermissions(Descr /// /// Access is throttled. /// - /// - /// This error indicates that you are calling an operation on an Amazon QuickSight subscription - /// where the edition doesn't include support for that operation. Amazon Amazon QuickSight - /// currently has Standard Edition and Enterprise Edition. Not every operation and capability - /// is available in every edition. - /// - /// REST API Reference for DescribeFolderResolvedPermissions Operation - public virtual DescribeFolderResolvedPermissionsResponse DescribeFolderResolvedPermissions(DescribeFolderResolvedPermissionsRequest request) + /// REST API Reference for DescribeDataSource Operation + public virtual DescribeDataSourceResponse DescribeDataSource(DescribeDataSourceRequest request) { var options = new InvokeOptions(); - options.RequestMarshaller = DescribeFolderResolvedPermissionsRequestMarshaller.Instance; - options.ResponseUnmarshaller = DescribeFolderResolvedPermissionsResponseUnmarshaller.Instance; + options.RequestMarshaller = DescribeDataSourceRequestMarshaller.Instance; + options.ResponseUnmarshaller = DescribeDataSourceResponseUnmarshaller.Instance; - return Invoke(request, options); + return Invoke(request, options); } /// - /// Describes the folder resolved permissions. Permissions consists of both folder direct - /// permissions and the inherited permissions from the ancestor folders. + /// Describes a data source. /// - /// Container for the necessary parameters to execute the DescribeFolderResolvedPermissions service method. + /// Container for the necessary parameters to execute the DescribeDataSource service method. /// /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// /// - /// The response from the DescribeFolderResolvedPermissions service method, as returned by QuickSight. + /// The response from the DescribeDataSource service method, as returned by QuickSight. /// /// You don't have access to this item. The provided credentials couldn't be validated. /// You might not be authorized to carry out the request. Make sure that your account @@ -7283,9 +7836,6 @@ public virtual DescribeFolderResolvedPermissionsResponse DescribeFolderResolvedP /// /// An internal failure occurred. /// - /// - /// The NextToken value isn't valid. - /// /// /// One or more parameters has a value that isn't valid. /// @@ -7295,33 +7845,27 @@ public virtual DescribeFolderResolvedPermissionsResponse DescribeFolderResolvedP /// /// Access is throttled. /// - /// - /// This error indicates that you are calling an operation on an Amazon QuickSight subscription - /// where the edition doesn't include support for that operation. Amazon Amazon QuickSight - /// currently has Standard Edition and Enterprise Edition. Not every operation and capability - /// is available in every edition. - /// - /// REST API Reference for DescribeFolderResolvedPermissions Operation - public virtual Task DescribeFolderResolvedPermissionsAsync(DescribeFolderResolvedPermissionsRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + /// REST API Reference for DescribeDataSource Operation + public virtual Task DescribeDataSourceAsync(DescribeDataSourceRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { var options = new InvokeOptions(); - options.RequestMarshaller = DescribeFolderResolvedPermissionsRequestMarshaller.Instance; - options.ResponseUnmarshaller = DescribeFolderResolvedPermissionsResponseUnmarshaller.Instance; + options.RequestMarshaller = DescribeDataSourceRequestMarshaller.Instance; + options.ResponseUnmarshaller = DescribeDataSourceResponseUnmarshaller.Instance; - return InvokeAsync(request, options, cancellationToken); + return InvokeAsync(request, options, cancellationToken); } #endregion - #region DescribeGroup + #region DescribeDataSourcePermissions /// - /// Returns an Amazon QuickSight group's description and Amazon Resource Name (ARN). + /// Describes the resource permissions for a data source. /// - /// Container for the necessary parameters to execute the DescribeGroup service method. + /// Container for the necessary parameters to execute the DescribeDataSourcePermissions service method. /// - /// The response from the DescribeGroup service method, as returned by QuickSight. + /// The response from the DescribeDataSourcePermissions service method, as returned by QuickSight. /// /// You don't have access to this item. The provided credentials couldn't be validated. /// You might not be authorized to carry out the request. Make sure that your account @@ -7334,38 +7878,32 @@ public virtual DescribeFolderResolvedPermissionsResponse DescribeFolderResolvedP /// /// One or more parameters has a value that isn't valid. /// - /// - /// One or more preconditions aren't met. - /// /// /// One or more resources can't be found. /// - /// - /// This resource is currently unavailable. - /// /// /// Access is throttled. /// - /// REST API Reference for DescribeGroup Operation - public virtual DescribeGroupResponse DescribeGroup(DescribeGroupRequest request) + /// REST API Reference for DescribeDataSourcePermissions Operation + public virtual DescribeDataSourcePermissionsResponse DescribeDataSourcePermissions(DescribeDataSourcePermissionsRequest request) { var options = new InvokeOptions(); - options.RequestMarshaller = DescribeGroupRequestMarshaller.Instance; - options.ResponseUnmarshaller = DescribeGroupResponseUnmarshaller.Instance; + options.RequestMarshaller = DescribeDataSourcePermissionsRequestMarshaller.Instance; + options.ResponseUnmarshaller = DescribeDataSourcePermissionsResponseUnmarshaller.Instance; - return Invoke(request, options); + return Invoke(request, options); } /// - /// Returns an Amazon QuickSight group's description and Amazon Resource Name (ARN). + /// Describes the resource permissions for a data source. /// - /// Container for the necessary parameters to execute the DescribeGroup service method. + /// Container for the necessary parameters to execute the DescribeDataSourcePermissions service method. /// /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// /// - /// The response from the DescribeGroup service method, as returned by QuickSight. + /// The response from the DescribeDataSourcePermissions service method, as returned by QuickSight. /// /// You don't have access to this item. The provided credentials couldn't be validated. /// You might not be authorized to carry out the request. Make sure that your account @@ -7378,41 +7916,33 @@ public virtual DescribeGroupResponse DescribeGroup(DescribeGroupRequest request) /// /// One or more parameters has a value that isn't valid. /// - /// - /// One or more preconditions aren't met. - /// /// /// One or more resources can't be found. /// - /// - /// This resource is currently unavailable. - /// /// /// Access is throttled. /// - /// REST API Reference for DescribeGroup Operation - public virtual Task DescribeGroupAsync(DescribeGroupRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + /// REST API Reference for DescribeDataSourcePermissions Operation + public virtual Task DescribeDataSourcePermissionsAsync(DescribeDataSourcePermissionsRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { var options = new InvokeOptions(); - options.RequestMarshaller = DescribeGroupRequestMarshaller.Instance; - options.ResponseUnmarshaller = DescribeGroupResponseUnmarshaller.Instance; + options.RequestMarshaller = DescribeDataSourcePermissionsRequestMarshaller.Instance; + options.ResponseUnmarshaller = DescribeDataSourcePermissionsResponseUnmarshaller.Instance; - return InvokeAsync(request, options, cancellationToken); + return InvokeAsync(request, options, cancellationToken); } #endregion - #region DescribeGroupMembership + #region DescribeFolder /// - /// Use the DescribeGroupMembership operation to determine if a user is a member - /// of the specified group. If the user exists and is a member of the specified group, - /// an associated GroupMember object is returned. + /// Describes a folder. /// - /// Container for the necessary parameters to execute the DescribeGroupMembership service method. + /// Container for the necessary parameters to execute the DescribeFolder service method. /// - /// The response from the DescribeGroupMembership service method, as returned by QuickSight. + /// The response from the DescribeFolder service method, as returned by QuickSight. /// /// You don't have access to this item. The provided credentials couldn't be validated. /// You might not be authorized to carry out the request. Make sure that your account @@ -7425,40 +7955,38 @@ public virtual DescribeGroupResponse DescribeGroup(DescribeGroupRequest request) /// /// One or more parameters has a value that isn't valid. /// - /// - /// One or more preconditions aren't met. - /// /// /// One or more resources can't be found. /// - /// - /// This resource is currently unavailable. - /// /// /// Access is throttled. /// - /// REST API Reference for DescribeGroupMembership Operation - public virtual DescribeGroupMembershipResponse DescribeGroupMembership(DescribeGroupMembershipRequest request) + /// + /// This error indicates that you are calling an operation on an Amazon QuickSight subscription + /// where the edition doesn't include support for that operation. Amazon Amazon QuickSight + /// currently has Standard Edition and Enterprise Edition. Not every operation and capability + /// is available in every edition. + /// + /// REST API Reference for DescribeFolder Operation + public virtual DescribeFolderResponse DescribeFolder(DescribeFolderRequest request) { var options = new InvokeOptions(); - options.RequestMarshaller = DescribeGroupMembershipRequestMarshaller.Instance; - options.ResponseUnmarshaller = DescribeGroupMembershipResponseUnmarshaller.Instance; + options.RequestMarshaller = DescribeFolderRequestMarshaller.Instance; + options.ResponseUnmarshaller = DescribeFolderResponseUnmarshaller.Instance; - return Invoke(request, options); + return Invoke(request, options); } /// - /// Use the DescribeGroupMembership operation to determine if a user is a member - /// of the specified group. If the user exists and is a member of the specified group, - /// an associated GroupMember object is returned. + /// Describes a folder. /// - /// Container for the necessary parameters to execute the DescribeGroupMembership service method. + /// Container for the necessary parameters to execute the DescribeFolder service method. /// /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// /// - /// The response from the DescribeGroupMembership service method, as returned by QuickSight. + /// The response from the DescribeFolder service method, as returned by QuickSight. /// /// You don't have access to this item. The provided credentials couldn't be validated. /// You might not be authorized to carry out the request. Make sure that your account @@ -7471,39 +7999,39 @@ public virtual DescribeGroupMembershipResponse DescribeGroupMembership(DescribeG /// /// One or more parameters has a value that isn't valid. /// - /// - /// One or more preconditions aren't met. - /// /// /// One or more resources can't be found. /// - /// - /// This resource is currently unavailable. - /// /// /// Access is throttled. /// - /// REST API Reference for DescribeGroupMembership Operation - public virtual Task DescribeGroupMembershipAsync(DescribeGroupMembershipRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + /// + /// This error indicates that you are calling an operation on an Amazon QuickSight subscription + /// where the edition doesn't include support for that operation. Amazon Amazon QuickSight + /// currently has Standard Edition and Enterprise Edition. Not every operation and capability + /// is available in every edition. + /// + /// REST API Reference for DescribeFolder Operation + public virtual Task DescribeFolderAsync(DescribeFolderRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { var options = new InvokeOptions(); - options.RequestMarshaller = DescribeGroupMembershipRequestMarshaller.Instance; - options.ResponseUnmarshaller = DescribeGroupMembershipResponseUnmarshaller.Instance; + options.RequestMarshaller = DescribeFolderRequestMarshaller.Instance; + options.ResponseUnmarshaller = DescribeFolderResponseUnmarshaller.Instance; - return InvokeAsync(request, options, cancellationToken); + return InvokeAsync(request, options, cancellationToken); } #endregion - #region DescribeIAMPolicyAssignment + #region DescribeFolderPermissions /// - /// Describes an existing IAM policy assignment, as specified by the assignment name. + /// Describes permissions for a folder. /// - /// Container for the necessary parameters to execute the DescribeIAMPolicyAssignment service method. + /// Container for the necessary parameters to execute the DescribeFolderPermissions service method. /// - /// The response from the DescribeIAMPolicyAssignment service method, as returned by QuickSight. + /// The response from the DescribeFolderPermissions service method, as returned by QuickSight. /// /// You don't have access to this item. The provided credentials couldn't be validated. /// You might not be authorized to carry out the request. Make sure that your account @@ -7525,26 +8053,32 @@ public virtual DescribeGroupMembershipResponse DescribeGroupMembership(DescribeG /// /// Access is throttled. /// - /// REST API Reference for DescribeIAMPolicyAssignment Operation - public virtual DescribeIAMPolicyAssignmentResponse DescribeIAMPolicyAssignment(DescribeIAMPolicyAssignmentRequest request) + /// + /// This error indicates that you are calling an operation on an Amazon QuickSight subscription + /// where the edition doesn't include support for that operation. Amazon Amazon QuickSight + /// currently has Standard Edition and Enterprise Edition. Not every operation and capability + /// is available in every edition. + /// + /// REST API Reference for DescribeFolderPermissions Operation + public virtual DescribeFolderPermissionsResponse DescribeFolderPermissions(DescribeFolderPermissionsRequest request) { var options = new InvokeOptions(); - options.RequestMarshaller = DescribeIAMPolicyAssignmentRequestMarshaller.Instance; - options.ResponseUnmarshaller = DescribeIAMPolicyAssignmentResponseUnmarshaller.Instance; + options.RequestMarshaller = DescribeFolderPermissionsRequestMarshaller.Instance; + options.ResponseUnmarshaller = DescribeFolderPermissionsResponseUnmarshaller.Instance; - return Invoke(request, options); + return Invoke(request, options); } /// - /// Describes an existing IAM policy assignment, as specified by the assignment name. + /// Describes permissions for a folder. /// - /// Container for the necessary parameters to execute the DescribeIAMPolicyAssignment service method. + /// Container for the necessary parameters to execute the DescribeFolderPermissions service method. /// /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// /// - /// The response from the DescribeIAMPolicyAssignment service method, as returned by QuickSight. + /// The response from the DescribeFolderPermissions service method, as returned by QuickSight. /// /// You don't have access to this item. The provided credentials couldn't be validated. /// You might not be authorized to carry out the request. Make sure that your account @@ -7566,27 +8100,34 @@ public virtual DescribeIAMPolicyAssignmentResponse DescribeIAMPolicyAssignment(D /// /// Access is throttled. /// - /// REST API Reference for DescribeIAMPolicyAssignment Operation - public virtual Task DescribeIAMPolicyAssignmentAsync(DescribeIAMPolicyAssignmentRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + /// + /// This error indicates that you are calling an operation on an Amazon QuickSight subscription + /// where the edition doesn't include support for that operation. Amazon Amazon QuickSight + /// currently has Standard Edition and Enterprise Edition. Not every operation and capability + /// is available in every edition. + /// + /// REST API Reference for DescribeFolderPermissions Operation + public virtual Task DescribeFolderPermissionsAsync(DescribeFolderPermissionsRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { var options = new InvokeOptions(); - options.RequestMarshaller = DescribeIAMPolicyAssignmentRequestMarshaller.Instance; - options.ResponseUnmarshaller = DescribeIAMPolicyAssignmentResponseUnmarshaller.Instance; + options.RequestMarshaller = DescribeFolderPermissionsRequestMarshaller.Instance; + options.ResponseUnmarshaller = DescribeFolderPermissionsResponseUnmarshaller.Instance; - return InvokeAsync(request, options, cancellationToken); + return InvokeAsync(request, options, cancellationToken); } #endregion - #region DescribeIngestion + #region DescribeFolderResolvedPermissions /// - /// Describes a SPICE ingestion. + /// Describes the folder resolved permissions. Permissions consists of both folder direct + /// permissions and the inherited permissions from the ancestor folders. /// - /// Container for the necessary parameters to execute the DescribeIngestion service method. + /// Container for the necessary parameters to execute the DescribeFolderResolvedPermissions service method. /// - /// The response from the DescribeIngestion service method, as returned by QuickSight. + /// The response from the DescribeFolderResolvedPermissions service method, as returned by QuickSight. /// /// You don't have access to this item. The provided credentials couldn't be validated. /// You might not be authorized to carry out the request. Make sure that your account @@ -7596,38 +8137,45 @@ public virtual DescribeIAMPolicyAssignmentResponse DescribeIAMPolicyAssignment(D /// /// An internal failure occurred. /// + /// + /// The NextToken value isn't valid. + /// /// /// One or more parameters has a value that isn't valid. /// - /// - /// The resource specified already exists. - /// /// /// One or more resources can't be found. /// /// /// Access is throttled. /// - /// REST API Reference for DescribeIngestion Operation - public virtual DescribeIngestionResponse DescribeIngestion(DescribeIngestionRequest request) + /// + /// This error indicates that you are calling an operation on an Amazon QuickSight subscription + /// where the edition doesn't include support for that operation. Amazon Amazon QuickSight + /// currently has Standard Edition and Enterprise Edition. Not every operation and capability + /// is available in every edition. + /// + /// REST API Reference for DescribeFolderResolvedPermissions Operation + public virtual DescribeFolderResolvedPermissionsResponse DescribeFolderResolvedPermissions(DescribeFolderResolvedPermissionsRequest request) { var options = new InvokeOptions(); - options.RequestMarshaller = DescribeIngestionRequestMarshaller.Instance; - options.ResponseUnmarshaller = DescribeIngestionResponseUnmarshaller.Instance; + options.RequestMarshaller = DescribeFolderResolvedPermissionsRequestMarshaller.Instance; + options.ResponseUnmarshaller = DescribeFolderResolvedPermissionsResponseUnmarshaller.Instance; - return Invoke(request, options); + return Invoke(request, options); } /// - /// Describes a SPICE ingestion. + /// Describes the folder resolved permissions. Permissions consists of both folder direct + /// permissions and the inherited permissions from the ancestor folders. /// - /// Container for the necessary parameters to execute the DescribeIngestion service method. + /// Container for the necessary parameters to execute the DescribeFolderResolvedPermissions service method. /// /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// /// - /// The response from the DescribeIngestion service method, as returned by QuickSight. + /// The response from the DescribeFolderResolvedPermissions service method, as returned by QuickSight. /// /// You don't have access to this item. The provided credentials couldn't be validated. /// You might not be authorized to carry out the request. Make sure that your account @@ -7637,39 +8185,45 @@ public virtual DescribeIngestionResponse DescribeIngestion(DescribeIngestionRequ /// /// An internal failure occurred. /// + /// + /// The NextToken value isn't valid. + /// /// /// One or more parameters has a value that isn't valid. /// - /// - /// The resource specified already exists. - /// /// /// One or more resources can't be found. /// /// /// Access is throttled. /// - /// REST API Reference for DescribeIngestion Operation - public virtual Task DescribeIngestionAsync(DescribeIngestionRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + /// + /// This error indicates that you are calling an operation on an Amazon QuickSight subscription + /// where the edition doesn't include support for that operation. Amazon Amazon QuickSight + /// currently has Standard Edition and Enterprise Edition. Not every operation and capability + /// is available in every edition. + /// + /// REST API Reference for DescribeFolderResolvedPermissions Operation + public virtual Task DescribeFolderResolvedPermissionsAsync(DescribeFolderResolvedPermissionsRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { var options = new InvokeOptions(); - options.RequestMarshaller = DescribeIngestionRequestMarshaller.Instance; - options.ResponseUnmarshaller = DescribeIngestionResponseUnmarshaller.Instance; + options.RequestMarshaller = DescribeFolderResolvedPermissionsRequestMarshaller.Instance; + options.ResponseUnmarshaller = DescribeFolderResolvedPermissionsResponseUnmarshaller.Instance; - return InvokeAsync(request, options, cancellationToken); + return InvokeAsync(request, options, cancellationToken); } #endregion - #region DescribeIpRestriction + #region DescribeGroup /// - /// Provides a summary and status of IP rules. + /// Returns an Amazon QuickSight group's description and Amazon Resource Name (ARN). /// - /// Container for the necessary parameters to execute the DescribeIpRestriction service method. + /// Container for the necessary parameters to execute the DescribeGroup service method. /// - /// The response from the DescribeIpRestriction service method, as returned by QuickSight. + /// The response from the DescribeGroup service method, as returned by QuickSight. /// /// You don't have access to this item. The provided credentials couldn't be validated. /// You might not be authorized to carry out the request. Make sure that your account @@ -7682,32 +8236,38 @@ public virtual DescribeIngestionResponse DescribeIngestion(DescribeIngestionRequ /// /// One or more parameters has a value that isn't valid. /// + /// + /// One or more preconditions aren't met. + /// /// /// One or more resources can't be found. /// + /// + /// This resource is currently unavailable. + /// /// /// Access is throttled. /// - /// REST API Reference for DescribeIpRestriction Operation - public virtual DescribeIpRestrictionResponse DescribeIpRestriction(DescribeIpRestrictionRequest request) + /// REST API Reference for DescribeGroup Operation + public virtual DescribeGroupResponse DescribeGroup(DescribeGroupRequest request) { var options = new InvokeOptions(); - options.RequestMarshaller = DescribeIpRestrictionRequestMarshaller.Instance; - options.ResponseUnmarshaller = DescribeIpRestrictionResponseUnmarshaller.Instance; + options.RequestMarshaller = DescribeGroupRequestMarshaller.Instance; + options.ResponseUnmarshaller = DescribeGroupResponseUnmarshaller.Instance; - return Invoke(request, options); + return Invoke(request, options); } /// - /// Provides a summary and status of IP rules. + /// Returns an Amazon QuickSight group's description and Amazon Resource Name (ARN). /// - /// Container for the necessary parameters to execute the DescribeIpRestriction service method. + /// Container for the necessary parameters to execute the DescribeGroup service method. /// /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// /// - /// The response from the DescribeIpRestriction service method, as returned by QuickSight. + /// The response from the DescribeGroup service method, as returned by QuickSight. /// /// You don't have access to this item. The provided credentials couldn't be validated. /// You might not be authorized to carry out the request. Make sure that your account @@ -7720,33 +8280,41 @@ public virtual DescribeIpRestrictionResponse DescribeIpRestriction(DescribeIpRes /// /// One or more parameters has a value that isn't valid. /// + /// + /// One or more preconditions aren't met. + /// /// /// One or more resources can't be found. /// + /// + /// This resource is currently unavailable. + /// /// /// Access is throttled. /// - /// REST API Reference for DescribeIpRestriction Operation - public virtual Task DescribeIpRestrictionAsync(DescribeIpRestrictionRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + /// REST API Reference for DescribeGroup Operation + public virtual Task DescribeGroupAsync(DescribeGroupRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { var options = new InvokeOptions(); - options.RequestMarshaller = DescribeIpRestrictionRequestMarshaller.Instance; - options.ResponseUnmarshaller = DescribeIpRestrictionResponseUnmarshaller.Instance; + options.RequestMarshaller = DescribeGroupRequestMarshaller.Instance; + options.ResponseUnmarshaller = DescribeGroupResponseUnmarshaller.Instance; - return InvokeAsync(request, options, cancellationToken); + return InvokeAsync(request, options, cancellationToken); } #endregion - #region DescribeKeyRegistration + #region DescribeGroupMembership /// - /// Describes all customer managed key registrations in a Amazon QuickSight account. + /// Use the DescribeGroupMembership operation to determine if a user is a member + /// of the specified group. If the user exists and is a member of the specified group, + /// an associated GroupMember object is returned. /// - /// Container for the necessary parameters to execute the DescribeKeyRegistration service method. + /// Container for the necessary parameters to execute the DescribeGroupMembership service method. /// - /// The response from the DescribeKeyRegistration service method, as returned by QuickSight. + /// The response from the DescribeGroupMembership service method, as returned by QuickSight. /// /// You don't have access to this item. The provided credentials couldn't be validated. /// You might not be authorized to carry out the request. Make sure that your account @@ -7759,29 +8327,40 @@ public virtual DescribeIpRestrictionResponse DescribeIpRestriction(DescribeIpRes /// /// One or more parameters has a value that isn't valid. /// + /// + /// One or more preconditions aren't met. + /// + /// + /// One or more resources can't be found. + /// + /// + /// This resource is currently unavailable. + /// /// /// Access is throttled. /// - /// REST API Reference for DescribeKeyRegistration Operation - public virtual DescribeKeyRegistrationResponse DescribeKeyRegistration(DescribeKeyRegistrationRequest request) + /// REST API Reference for DescribeGroupMembership Operation + public virtual DescribeGroupMembershipResponse DescribeGroupMembership(DescribeGroupMembershipRequest request) { var options = new InvokeOptions(); - options.RequestMarshaller = DescribeKeyRegistrationRequestMarshaller.Instance; - options.ResponseUnmarshaller = DescribeKeyRegistrationResponseUnmarshaller.Instance; + options.RequestMarshaller = DescribeGroupMembershipRequestMarshaller.Instance; + options.ResponseUnmarshaller = DescribeGroupMembershipResponseUnmarshaller.Instance; - return Invoke(request, options); + return Invoke(request, options); } /// - /// Describes all customer managed key registrations in a Amazon QuickSight account. + /// Use the DescribeGroupMembership operation to determine if a user is a member + /// of the specified group. If the user exists and is a member of the specified group, + /// an associated GroupMember object is returned. /// - /// Container for the necessary parameters to execute the DescribeKeyRegistration service method. + /// Container for the necessary parameters to execute the DescribeGroupMembership service method. /// /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// /// - /// The response from the DescribeKeyRegistration service method, as returned by QuickSight. + /// The response from the DescribeGroupMembership service method, as returned by QuickSight. /// /// You don't have access to this item. The provided credentials couldn't be validated. /// You might not be authorized to carry out the request. Make sure that your account @@ -7794,30 +8373,39 @@ public virtual DescribeKeyRegistrationResponse DescribeKeyRegistration(DescribeK /// /// One or more parameters has a value that isn't valid. /// + /// + /// One or more preconditions aren't met. + /// + /// + /// One or more resources can't be found. + /// + /// + /// This resource is currently unavailable. + /// /// /// Access is throttled. /// - /// REST API Reference for DescribeKeyRegistration Operation - public virtual Task DescribeKeyRegistrationAsync(DescribeKeyRegistrationRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + /// REST API Reference for DescribeGroupMembership Operation + public virtual Task DescribeGroupMembershipAsync(DescribeGroupMembershipRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { var options = new InvokeOptions(); - options.RequestMarshaller = DescribeKeyRegistrationRequestMarshaller.Instance; - options.ResponseUnmarshaller = DescribeKeyRegistrationResponseUnmarshaller.Instance; + options.RequestMarshaller = DescribeGroupMembershipRequestMarshaller.Instance; + options.ResponseUnmarshaller = DescribeGroupMembershipResponseUnmarshaller.Instance; - return InvokeAsync(request, options, cancellationToken); + return InvokeAsync(request, options, cancellationToken); } #endregion - #region DescribeNamespace + #region DescribeIAMPolicyAssignment /// - /// Describes the current namespace. + /// Describes an existing IAM policy assignment, as specified by the assignment name. /// - /// Container for the necessary parameters to execute the DescribeNamespace service method. + /// Container for the necessary parameters to execute the DescribeIAMPolicyAssignment service method. /// - /// The response from the DescribeNamespace service method, as returned by QuickSight. + /// The response from the DescribeIAMPolicyAssignment service method, as returned by QuickSight. /// /// You don't have access to this item. The provided credentials couldn't be validated. /// You might not be authorized to carry out the request. Make sure that your account @@ -7827,38 +8415,38 @@ public virtual DescribeKeyRegistrationResponse DescribeKeyRegistration(DescribeK /// /// An internal failure occurred. /// + /// + /// The NextToken value isn't valid. + /// /// /// One or more parameters has a value that isn't valid. /// /// /// One or more resources can't be found. /// - /// - /// This resource is currently unavailable. - /// /// /// Access is throttled. /// - /// REST API Reference for DescribeNamespace Operation - public virtual DescribeNamespaceResponse DescribeNamespace(DescribeNamespaceRequest request) + /// REST API Reference for DescribeIAMPolicyAssignment Operation + public virtual DescribeIAMPolicyAssignmentResponse DescribeIAMPolicyAssignment(DescribeIAMPolicyAssignmentRequest request) { var options = new InvokeOptions(); - options.RequestMarshaller = DescribeNamespaceRequestMarshaller.Instance; - options.ResponseUnmarshaller = DescribeNamespaceResponseUnmarshaller.Instance; + options.RequestMarshaller = DescribeIAMPolicyAssignmentRequestMarshaller.Instance; + options.ResponseUnmarshaller = DescribeIAMPolicyAssignmentResponseUnmarshaller.Instance; - return Invoke(request, options); + return Invoke(request, options); } /// - /// Describes the current namespace. + /// Describes an existing IAM policy assignment, as specified by the assignment name. /// - /// Container for the necessary parameters to execute the DescribeNamespace service method. + /// Container for the necessary parameters to execute the DescribeIAMPolicyAssignment service method. /// /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// /// - /// The response from the DescribeNamespace service method, as returned by QuickSight. + /// The response from the DescribeIAMPolicyAssignment service method, as returned by QuickSight. /// /// You don't have access to this item. The provided credentials couldn't be validated. /// You might not be authorized to carry out the request. Make sure that your account @@ -7868,122 +8456,122 @@ public virtual DescribeNamespaceResponse DescribeNamespace(DescribeNamespaceRequ /// /// An internal failure occurred. /// + /// + /// The NextToken value isn't valid. + /// /// /// One or more parameters has a value that isn't valid. /// /// /// One or more resources can't be found. /// - /// - /// This resource is currently unavailable. - /// /// /// Access is throttled. /// - /// REST API Reference for DescribeNamespace Operation - public virtual Task DescribeNamespaceAsync(DescribeNamespaceRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + /// REST API Reference for DescribeIAMPolicyAssignment Operation + public virtual Task DescribeIAMPolicyAssignmentAsync(DescribeIAMPolicyAssignmentRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { var options = new InvokeOptions(); - options.RequestMarshaller = DescribeNamespaceRequestMarshaller.Instance; - options.ResponseUnmarshaller = DescribeNamespaceResponseUnmarshaller.Instance; + options.RequestMarshaller = DescribeIAMPolicyAssignmentRequestMarshaller.Instance; + options.ResponseUnmarshaller = DescribeIAMPolicyAssignmentResponseUnmarshaller.Instance; - return InvokeAsync(request, options, cancellationToken); + return InvokeAsync(request, options, cancellationToken); } #endregion - #region DescribeQPersonalizationConfiguration + #region DescribeIngestion /// - /// Describes a personalization configuration. + /// Describes a SPICE ingestion. /// - /// Container for the necessary parameters to execute the DescribeQPersonalizationConfiguration service method. + /// Container for the necessary parameters to execute the DescribeIngestion service method. /// - /// The response from the DescribeQPersonalizationConfiguration service method, as returned by QuickSight. + /// The response from the DescribeIngestion service method, as returned by QuickSight. /// /// You don't have access to this item. The provided credentials couldn't be validated. /// You might not be authorized to carry out the request. Make sure that your account /// is authorized to use the Amazon QuickSight service, that your policies have the correct /// permissions, and that you are using the correct credentials. /// - /// - /// Updating or deleting a resource can cause an inconsistent state. - /// /// /// An internal failure occurred. /// /// /// One or more parameters has a value that isn't valid. /// + /// + /// The resource specified already exists. + /// /// /// One or more resources can't be found. /// /// /// Access is throttled. /// - /// REST API Reference for DescribeQPersonalizationConfiguration Operation - public virtual DescribeQPersonalizationConfigurationResponse DescribeQPersonalizationConfiguration(DescribeQPersonalizationConfigurationRequest request) + /// REST API Reference for DescribeIngestion Operation + public virtual DescribeIngestionResponse DescribeIngestion(DescribeIngestionRequest request) { var options = new InvokeOptions(); - options.RequestMarshaller = DescribeQPersonalizationConfigurationRequestMarshaller.Instance; - options.ResponseUnmarshaller = DescribeQPersonalizationConfigurationResponseUnmarshaller.Instance; + options.RequestMarshaller = DescribeIngestionRequestMarshaller.Instance; + options.ResponseUnmarshaller = DescribeIngestionResponseUnmarshaller.Instance; - return Invoke(request, options); + return Invoke(request, options); } /// - /// Describes a personalization configuration. + /// Describes a SPICE ingestion. /// - /// Container for the necessary parameters to execute the DescribeQPersonalizationConfiguration service method. + /// Container for the necessary parameters to execute the DescribeIngestion service method. /// /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// /// - /// The response from the DescribeQPersonalizationConfiguration service method, as returned by QuickSight. + /// The response from the DescribeIngestion service method, as returned by QuickSight. /// /// You don't have access to this item. The provided credentials couldn't be validated. /// You might not be authorized to carry out the request. Make sure that your account /// is authorized to use the Amazon QuickSight service, that your policies have the correct /// permissions, and that you are using the correct credentials. /// - /// - /// Updating or deleting a resource can cause an inconsistent state. - /// /// /// An internal failure occurred. /// /// /// One or more parameters has a value that isn't valid. /// + /// + /// The resource specified already exists. + /// /// /// One or more resources can't be found. /// /// /// Access is throttled. /// - /// REST API Reference for DescribeQPersonalizationConfiguration Operation - public virtual Task DescribeQPersonalizationConfigurationAsync(DescribeQPersonalizationConfigurationRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + /// REST API Reference for DescribeIngestion Operation + public virtual Task DescribeIngestionAsync(DescribeIngestionRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { var options = new InvokeOptions(); - options.RequestMarshaller = DescribeQPersonalizationConfigurationRequestMarshaller.Instance; - options.ResponseUnmarshaller = DescribeQPersonalizationConfigurationResponseUnmarshaller.Instance; + options.RequestMarshaller = DescribeIngestionRequestMarshaller.Instance; + options.ResponseUnmarshaller = DescribeIngestionResponseUnmarshaller.Instance; - return InvokeAsync(request, options, cancellationToken); + return InvokeAsync(request, options, cancellationToken); } #endregion - #region DescribeRefreshSchedule + #region DescribeIpRestriction /// - /// Provides a summary of a refresh schedule. + /// Provides a summary and status of IP rules. /// - /// Container for the necessary parameters to execute the DescribeRefreshSchedule service method. + /// Container for the necessary parameters to execute the DescribeIpRestriction service method. /// - /// The response from the DescribeRefreshSchedule service method, as returned by QuickSight. + /// The response from the DescribeIpRestriction service method, as returned by QuickSight. /// /// You don't have access to this item. The provided credentials couldn't be validated. /// You might not be authorized to carry out the request. Make sure that your account @@ -7996,35 +8584,32 @@ public virtual DescribeQPersonalizationConfigurationResponse DescribeQPersonaliz /// /// One or more parameters has a value that isn't valid. /// - /// - /// A limit is exceeded. - /// /// /// One or more resources can't be found. /// /// /// Access is throttled. /// - /// REST API Reference for DescribeRefreshSchedule Operation - public virtual DescribeRefreshScheduleResponse DescribeRefreshSchedule(DescribeRefreshScheduleRequest request) + /// REST API Reference for DescribeIpRestriction Operation + public virtual DescribeIpRestrictionResponse DescribeIpRestriction(DescribeIpRestrictionRequest request) { var options = new InvokeOptions(); - options.RequestMarshaller = DescribeRefreshScheduleRequestMarshaller.Instance; - options.ResponseUnmarshaller = DescribeRefreshScheduleResponseUnmarshaller.Instance; + options.RequestMarshaller = DescribeIpRestrictionRequestMarshaller.Instance; + options.ResponseUnmarshaller = DescribeIpRestrictionResponseUnmarshaller.Instance; - return Invoke(request, options); + return Invoke(request, options); } /// - /// Provides a summary of a refresh schedule. + /// Provides a summary and status of IP rules. /// - /// Container for the necessary parameters to execute the DescribeRefreshSchedule service method. + /// Container for the necessary parameters to execute the DescribeIpRestriction service method. /// /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// /// - /// The response from the DescribeRefreshSchedule service method, as returned by QuickSight. + /// The response from the DescribeIpRestriction service method, as returned by QuickSight. /// /// You don't have access to this item. The provided credentials couldn't be validated. /// You might not be authorized to carry out the request. Make sure that your account @@ -8037,36 +8622,33 @@ public virtual DescribeRefreshScheduleResponse DescribeRefreshSchedule(DescribeR /// /// One or more parameters has a value that isn't valid. /// - /// - /// A limit is exceeded. - /// /// /// One or more resources can't be found. /// /// /// Access is throttled. /// - /// REST API Reference for DescribeRefreshSchedule Operation - public virtual Task DescribeRefreshScheduleAsync(DescribeRefreshScheduleRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + /// REST API Reference for DescribeIpRestriction Operation + public virtual Task DescribeIpRestrictionAsync(DescribeIpRestrictionRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { var options = new InvokeOptions(); - options.RequestMarshaller = DescribeRefreshScheduleRequestMarshaller.Instance; - options.ResponseUnmarshaller = DescribeRefreshScheduleResponseUnmarshaller.Instance; + options.RequestMarshaller = DescribeIpRestrictionRequestMarshaller.Instance; + options.ResponseUnmarshaller = DescribeIpRestrictionResponseUnmarshaller.Instance; - return InvokeAsync(request, options, cancellationToken); + return InvokeAsync(request, options, cancellationToken); } #endregion - #region DescribeRoleCustomPermission + #region DescribeKeyRegistration /// - /// Describes all custom permissions that are mapped to a role. + /// Describes all customer managed key registrations in a Amazon QuickSight account. /// - /// Container for the necessary parameters to execute the DescribeRoleCustomPermission service method. + /// Container for the necessary parameters to execute the DescribeKeyRegistration service method. /// - /// The response from the DescribeRoleCustomPermission service method, as returned by QuickSight. + /// The response from the DescribeKeyRegistration service method, as returned by QuickSight. /// /// You don't have access to this item. The provided credentials couldn't be validated. /// You might not be authorized to carry out the request. Make sure that your account @@ -8079,38 +8661,29 @@ public virtual DescribeRefreshScheduleResponse DescribeRefreshSchedule(DescribeR /// /// One or more parameters has a value that isn't valid. /// - /// - /// One or more preconditions aren't met. - /// - /// - /// One or more resources can't be found. - /// - /// - /// This resource is currently unavailable. - /// /// /// Access is throttled. /// - /// REST API Reference for DescribeRoleCustomPermission Operation - public virtual DescribeRoleCustomPermissionResponse DescribeRoleCustomPermission(DescribeRoleCustomPermissionRequest request) + /// REST API Reference for DescribeKeyRegistration Operation + public virtual DescribeKeyRegistrationResponse DescribeKeyRegistration(DescribeKeyRegistrationRequest request) { var options = new InvokeOptions(); - options.RequestMarshaller = DescribeRoleCustomPermissionRequestMarshaller.Instance; - options.ResponseUnmarshaller = DescribeRoleCustomPermissionResponseUnmarshaller.Instance; + options.RequestMarshaller = DescribeKeyRegistrationRequestMarshaller.Instance; + options.ResponseUnmarshaller = DescribeKeyRegistrationResponseUnmarshaller.Instance; - return Invoke(request, options); + return Invoke(request, options); } /// - /// Describes all custom permissions that are mapped to a role. + /// Describes all customer managed key registrations in a Amazon QuickSight account. /// - /// Container for the necessary parameters to execute the DescribeRoleCustomPermission service method. + /// Container for the necessary parameters to execute the DescribeKeyRegistration service method. /// /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// /// - /// The response from the DescribeRoleCustomPermission service method, as returned by QuickSight. + /// The response from the DescribeKeyRegistration service method, as returned by QuickSight. /// /// You don't have access to this item. The provided credentials couldn't be validated. /// You might not be authorized to carry out the request. Make sure that your account @@ -8123,237 +8696,210 @@ public virtual DescribeRoleCustomPermissionResponse DescribeRoleCustomPermission /// /// One or more parameters has a value that isn't valid. /// - /// - /// One or more preconditions aren't met. - /// - /// - /// One or more resources can't be found. - /// - /// - /// This resource is currently unavailable. - /// /// /// Access is throttled. /// - /// REST API Reference for DescribeRoleCustomPermission Operation - public virtual Task DescribeRoleCustomPermissionAsync(DescribeRoleCustomPermissionRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + /// REST API Reference for DescribeKeyRegistration Operation + public virtual Task DescribeKeyRegistrationAsync(DescribeKeyRegistrationRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { var options = new InvokeOptions(); - options.RequestMarshaller = DescribeRoleCustomPermissionRequestMarshaller.Instance; - options.ResponseUnmarshaller = DescribeRoleCustomPermissionResponseUnmarshaller.Instance; + options.RequestMarshaller = DescribeKeyRegistrationRequestMarshaller.Instance; + options.ResponseUnmarshaller = DescribeKeyRegistrationResponseUnmarshaller.Instance; - return InvokeAsync(request, options, cancellationToken); + return InvokeAsync(request, options, cancellationToken); } #endregion - #region DescribeTemplate + #region DescribeNamespace /// - /// Describes a template's metadata. + /// Describes the current namespace. /// - /// Container for the necessary parameters to execute the DescribeTemplate service method. + /// Container for the necessary parameters to execute the DescribeNamespace service method. /// - /// The response from the DescribeTemplate service method, as returned by QuickSight. + /// The response from the DescribeNamespace service method, as returned by QuickSight. /// /// You don't have access to this item. The provided credentials couldn't be validated. /// You might not be authorized to carry out the request. Make sure that your account /// is authorized to use the Amazon QuickSight service, that your policies have the correct /// permissions, and that you are using the correct credentials. /// - /// - /// Updating or deleting a resource can cause an inconsistent state. - /// /// /// An internal failure occurred. /// /// /// One or more parameters has a value that isn't valid. /// - /// - /// The resource specified already exists. - /// /// /// One or more resources can't be found. /// + /// + /// This resource is currently unavailable. + /// /// /// Access is throttled. /// - /// - /// This error indicates that you are calling an operation on an Amazon QuickSight subscription - /// where the edition doesn't include support for that operation. Amazon Amazon QuickSight - /// currently has Standard Edition and Enterprise Edition. Not every operation and capability - /// is available in every edition. - /// - /// REST API Reference for DescribeTemplate Operation - public virtual DescribeTemplateResponse DescribeTemplate(DescribeTemplateRequest request) + /// REST API Reference for DescribeNamespace Operation + public virtual DescribeNamespaceResponse DescribeNamespace(DescribeNamespaceRequest request) { var options = new InvokeOptions(); - options.RequestMarshaller = DescribeTemplateRequestMarshaller.Instance; - options.ResponseUnmarshaller = DescribeTemplateResponseUnmarshaller.Instance; + options.RequestMarshaller = DescribeNamespaceRequestMarshaller.Instance; + options.ResponseUnmarshaller = DescribeNamespaceResponseUnmarshaller.Instance; - return Invoke(request, options); + return Invoke(request, options); } /// - /// Describes a template's metadata. + /// Describes the current namespace. /// - /// Container for the necessary parameters to execute the DescribeTemplate service method. + /// Container for the necessary parameters to execute the DescribeNamespace service method. /// /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// /// - /// The response from the DescribeTemplate service method, as returned by QuickSight. + /// The response from the DescribeNamespace service method, as returned by QuickSight. /// /// You don't have access to this item. The provided credentials couldn't be validated. /// You might not be authorized to carry out the request. Make sure that your account /// is authorized to use the Amazon QuickSight service, that your policies have the correct /// permissions, and that you are using the correct credentials. /// - /// - /// Updating or deleting a resource can cause an inconsistent state. - /// /// /// An internal failure occurred. /// /// /// One or more parameters has a value that isn't valid. /// - /// - /// The resource specified already exists. - /// /// /// One or more resources can't be found. /// + /// + /// This resource is currently unavailable. + /// /// /// Access is throttled. /// - /// - /// This error indicates that you are calling an operation on an Amazon QuickSight subscription - /// where the edition doesn't include support for that operation. Amazon Amazon QuickSight - /// currently has Standard Edition and Enterprise Edition. Not every operation and capability - /// is available in every edition. - /// - /// REST API Reference for DescribeTemplate Operation - public virtual Task DescribeTemplateAsync(DescribeTemplateRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + /// REST API Reference for DescribeNamespace Operation + public virtual Task DescribeNamespaceAsync(DescribeNamespaceRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { var options = new InvokeOptions(); - options.RequestMarshaller = DescribeTemplateRequestMarshaller.Instance; - options.ResponseUnmarshaller = DescribeTemplateResponseUnmarshaller.Instance; + options.RequestMarshaller = DescribeNamespaceRequestMarshaller.Instance; + options.ResponseUnmarshaller = DescribeNamespaceResponseUnmarshaller.Instance; - return InvokeAsync(request, options, cancellationToken); + return InvokeAsync(request, options, cancellationToken); } #endregion - #region DescribeTemplateAlias + #region DescribeQPersonalizationConfiguration /// - /// Describes the template alias for a template. + /// Describes a personalization configuration. /// - /// Container for the necessary parameters to execute the DescribeTemplateAlias service method. + /// Container for the necessary parameters to execute the DescribeQPersonalizationConfiguration service method. /// - /// The response from the DescribeTemplateAlias service method, as returned by QuickSight. + /// The response from the DescribeQPersonalizationConfiguration service method, as returned by QuickSight. + /// + /// You don't have access to this item. The provided credentials couldn't be validated. + /// You might not be authorized to carry out the request. Make sure that your account + /// is authorized to use the Amazon QuickSight service, that your policies have the correct + /// permissions, and that you are using the correct credentials. + /// + /// + /// Updating or deleting a resource can cause an inconsistent state. + /// /// /// An internal failure occurred. /// + /// + /// One or more parameters has a value that isn't valid. + /// /// /// One or more resources can't be found. /// /// /// Access is throttled. /// - /// - /// This error indicates that you are calling an operation on an Amazon QuickSight subscription - /// where the edition doesn't include support for that operation. Amazon Amazon QuickSight - /// currently has Standard Edition and Enterprise Edition. Not every operation and capability - /// is available in every edition. - /// - /// REST API Reference for DescribeTemplateAlias Operation - public virtual DescribeTemplateAliasResponse DescribeTemplateAlias(DescribeTemplateAliasRequest request) + /// REST API Reference for DescribeQPersonalizationConfiguration Operation + public virtual DescribeQPersonalizationConfigurationResponse DescribeQPersonalizationConfiguration(DescribeQPersonalizationConfigurationRequest request) { var options = new InvokeOptions(); - options.RequestMarshaller = DescribeTemplateAliasRequestMarshaller.Instance; - options.ResponseUnmarshaller = DescribeTemplateAliasResponseUnmarshaller.Instance; + options.RequestMarshaller = DescribeQPersonalizationConfigurationRequestMarshaller.Instance; + options.ResponseUnmarshaller = DescribeQPersonalizationConfigurationResponseUnmarshaller.Instance; - return Invoke(request, options); + return Invoke(request, options); } /// - /// Describes the template alias for a template. + /// Describes a personalization configuration. /// - /// Container for the necessary parameters to execute the DescribeTemplateAlias service method. + /// Container for the necessary parameters to execute the DescribeQPersonalizationConfiguration service method. /// /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// /// - /// The response from the DescribeTemplateAlias service method, as returned by QuickSight. + /// The response from the DescribeQPersonalizationConfiguration service method, as returned by QuickSight. + /// + /// You don't have access to this item. The provided credentials couldn't be validated. + /// You might not be authorized to carry out the request. Make sure that your account + /// is authorized to use the Amazon QuickSight service, that your policies have the correct + /// permissions, and that you are using the correct credentials. + /// + /// + /// Updating or deleting a resource can cause an inconsistent state. + /// /// /// An internal failure occurred. /// + /// + /// One or more parameters has a value that isn't valid. + /// /// /// One or more resources can't be found. /// /// /// Access is throttled. /// - /// - /// This error indicates that you are calling an operation on an Amazon QuickSight subscription - /// where the edition doesn't include support for that operation. Amazon Amazon QuickSight - /// currently has Standard Edition and Enterprise Edition. Not every operation and capability - /// is available in every edition. - /// - /// REST API Reference for DescribeTemplateAlias Operation - public virtual Task DescribeTemplateAliasAsync(DescribeTemplateAliasRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + /// REST API Reference for DescribeQPersonalizationConfiguration Operation + public virtual Task DescribeQPersonalizationConfigurationAsync(DescribeQPersonalizationConfigurationRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { var options = new InvokeOptions(); - options.RequestMarshaller = DescribeTemplateAliasRequestMarshaller.Instance; - options.ResponseUnmarshaller = DescribeTemplateAliasResponseUnmarshaller.Instance; + options.RequestMarshaller = DescribeQPersonalizationConfigurationRequestMarshaller.Instance; + options.ResponseUnmarshaller = DescribeQPersonalizationConfigurationResponseUnmarshaller.Instance; - return InvokeAsync(request, options, cancellationToken); + return InvokeAsync(request, options, cancellationToken); } #endregion - #region DescribeTemplateDefinition + #region DescribeRefreshSchedule /// - /// Provides a detailed description of the definition of a template. - /// - /// - /// - /// If you do not need to know details about the content of a template, for instance if - /// you are trying to check the status of a recently created or updated template, use - /// the - /// DescribeTemplate instead. - /// - /// + /// Provides a summary of a refresh schedule. /// - /// Container for the necessary parameters to execute the DescribeTemplateDefinition service method. + /// Container for the necessary parameters to execute the DescribeRefreshSchedule service method. /// - /// The response from the DescribeTemplateDefinition service method, as returned by QuickSight. + /// The response from the DescribeRefreshSchedule service method, as returned by QuickSight. /// /// You don't have access to this item. The provided credentials couldn't be validated. /// You might not be authorized to carry out the request. Make sure that your account /// is authorized to use the Amazon QuickSight service, that your policies have the correct /// permissions, and that you are using the correct credentials. /// - /// - /// Updating or deleting a resource can cause an inconsistent state. - /// /// /// An internal failure occurred. /// /// /// One or more parameters has a value that isn't valid. /// - /// - /// The resource specified already exists. + /// + /// A limit is exceeded. /// /// /// One or more resources can't be found. @@ -8361,58 +8907,40 @@ public virtual DescribeTemplateAliasResponse DescribeTemplateAlias(DescribeTempl /// /// Access is throttled. /// - /// - /// This error indicates that you are calling an operation on an Amazon QuickSight subscription - /// where the edition doesn't include support for that operation. Amazon Amazon QuickSight - /// currently has Standard Edition and Enterprise Edition. Not every operation and capability - /// is available in every edition. - /// - /// REST API Reference for DescribeTemplateDefinition Operation - public virtual DescribeTemplateDefinitionResponse DescribeTemplateDefinition(DescribeTemplateDefinitionRequest request) + /// REST API Reference for DescribeRefreshSchedule Operation + public virtual DescribeRefreshScheduleResponse DescribeRefreshSchedule(DescribeRefreshScheduleRequest request) { var options = new InvokeOptions(); - options.RequestMarshaller = DescribeTemplateDefinitionRequestMarshaller.Instance; - options.ResponseUnmarshaller = DescribeTemplateDefinitionResponseUnmarshaller.Instance; + options.RequestMarshaller = DescribeRefreshScheduleRequestMarshaller.Instance; + options.ResponseUnmarshaller = DescribeRefreshScheduleResponseUnmarshaller.Instance; - return Invoke(request, options); + return Invoke(request, options); } /// - /// Provides a detailed description of the definition of a template. - /// - /// - /// - /// If you do not need to know details about the content of a template, for instance if - /// you are trying to check the status of a recently created or updated template, use - /// the - /// DescribeTemplate instead. - /// - /// + /// Provides a summary of a refresh schedule. /// - /// Container for the necessary parameters to execute the DescribeTemplateDefinition service method. + /// Container for the necessary parameters to execute the DescribeRefreshSchedule service method. /// /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// /// - /// The response from the DescribeTemplateDefinition service method, as returned by QuickSight. + /// The response from the DescribeRefreshSchedule service method, as returned by QuickSight. /// /// You don't have access to this item. The provided credentials couldn't be validated. /// You might not be authorized to carry out the request. Make sure that your account /// is authorized to use the Amazon QuickSight service, that your policies have the correct /// permissions, and that you are using the correct credentials. /// - /// - /// Updating or deleting a resource can cause an inconsistent state. - /// /// /// An internal failure occurred. /// /// /// One or more parameters has a value that isn't valid. /// - /// - /// The resource specified already exists. + /// + /// A limit is exceeded. /// /// /// One or more resources can't be found. @@ -8420,35 +8948,32 @@ public virtual DescribeTemplateDefinitionResponse DescribeTemplateDefinition(Des /// /// Access is throttled. /// - /// - /// This error indicates that you are calling an operation on an Amazon QuickSight subscription - /// where the edition doesn't include support for that operation. Amazon Amazon QuickSight - /// currently has Standard Edition and Enterprise Edition. Not every operation and capability - /// is available in every edition. - /// - /// REST API Reference for DescribeTemplateDefinition Operation - public virtual Task DescribeTemplateDefinitionAsync(DescribeTemplateDefinitionRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + /// REST API Reference for DescribeRefreshSchedule Operation + public virtual Task DescribeRefreshScheduleAsync(DescribeRefreshScheduleRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { var options = new InvokeOptions(); - options.RequestMarshaller = DescribeTemplateDefinitionRequestMarshaller.Instance; - options.ResponseUnmarshaller = DescribeTemplateDefinitionResponseUnmarshaller.Instance; + options.RequestMarshaller = DescribeRefreshScheduleRequestMarshaller.Instance; + options.ResponseUnmarshaller = DescribeRefreshScheduleResponseUnmarshaller.Instance; - return InvokeAsync(request, options, cancellationToken); + return InvokeAsync(request, options, cancellationToken); } #endregion - #region DescribeTemplatePermissions + #region DescribeRoleCustomPermission /// - /// Describes read and write permissions on a template. + /// Describes all custom permissions that are mapped to a role. /// - /// Container for the necessary parameters to execute the DescribeTemplatePermissions service method. + /// Container for the necessary parameters to execute the DescribeRoleCustomPermission service method. /// - /// The response from the DescribeTemplatePermissions service method, as returned by QuickSight. - /// - /// Updating or deleting a resource can cause an inconsistent state. + /// The response from the DescribeRoleCustomPermission service method, as returned by QuickSight. + /// + /// You don't have access to this item. The provided credentials couldn't be validated. + /// You might not be authorized to carry out the request. Make sure that your account + /// is authorized to use the Amazon QuickSight service, that your policies have the correct + /// permissions, and that you are using the correct credentials. /// /// /// An internal failure occurred. @@ -8456,40 +8981,43 @@ public virtual DescribeTemplateDefinitionResponse DescribeTemplateDefinition(Des /// /// One or more parameters has a value that isn't valid. /// + /// + /// One or more preconditions aren't met. + /// /// /// One or more resources can't be found. /// + /// + /// This resource is currently unavailable. + /// /// /// Access is throttled. /// - /// - /// This error indicates that you are calling an operation on an Amazon QuickSight subscription - /// where the edition doesn't include support for that operation. Amazon Amazon QuickSight - /// currently has Standard Edition and Enterprise Edition. Not every operation and capability - /// is available in every edition. - /// - /// REST API Reference for DescribeTemplatePermissions Operation - public virtual DescribeTemplatePermissionsResponse DescribeTemplatePermissions(DescribeTemplatePermissionsRequest request) + /// REST API Reference for DescribeRoleCustomPermission Operation + public virtual DescribeRoleCustomPermissionResponse DescribeRoleCustomPermission(DescribeRoleCustomPermissionRequest request) { var options = new InvokeOptions(); - options.RequestMarshaller = DescribeTemplatePermissionsRequestMarshaller.Instance; - options.ResponseUnmarshaller = DescribeTemplatePermissionsResponseUnmarshaller.Instance; + options.RequestMarshaller = DescribeRoleCustomPermissionRequestMarshaller.Instance; + options.ResponseUnmarshaller = DescribeRoleCustomPermissionResponseUnmarshaller.Instance; - return Invoke(request, options); + return Invoke(request, options); } /// - /// Describes read and write permissions on a template. + /// Describes all custom permissions that are mapped to a role. /// - /// Container for the necessary parameters to execute the DescribeTemplatePermissions service method. + /// Container for the necessary parameters to execute the DescribeRoleCustomPermission service method. /// /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// /// - /// The response from the DescribeTemplatePermissions service method, as returned by QuickSight. - /// - /// Updating or deleting a resource can cause an inconsistent state. + /// The response from the DescribeRoleCustomPermission service method, as returned by QuickSight. + /// + /// You don't have access to this item. The provided credentials couldn't be validated. + /// You might not be authorized to carry out the request. Make sure that your account + /// is authorized to use the Amazon QuickSight service, that your policies have the correct + /// permissions, and that you are using the correct credentials. /// /// /// An internal failure occurred. @@ -8497,45 +9025,48 @@ public virtual DescribeTemplatePermissionsResponse DescribeTemplatePermissions(D /// /// One or more parameters has a value that isn't valid. /// + /// + /// One or more preconditions aren't met. + /// /// /// One or more resources can't be found. /// + /// + /// This resource is currently unavailable. + /// /// /// Access is throttled. /// - /// - /// This error indicates that you are calling an operation on an Amazon QuickSight subscription - /// where the edition doesn't include support for that operation. Amazon Amazon QuickSight - /// currently has Standard Edition and Enterprise Edition. Not every operation and capability - /// is available in every edition. - /// - /// REST API Reference for DescribeTemplatePermissions Operation - public virtual Task DescribeTemplatePermissionsAsync(DescribeTemplatePermissionsRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + /// REST API Reference for DescribeRoleCustomPermission Operation + public virtual Task DescribeRoleCustomPermissionAsync(DescribeRoleCustomPermissionRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { var options = new InvokeOptions(); - options.RequestMarshaller = DescribeTemplatePermissionsRequestMarshaller.Instance; - options.ResponseUnmarshaller = DescribeTemplatePermissionsResponseUnmarshaller.Instance; + options.RequestMarshaller = DescribeRoleCustomPermissionRequestMarshaller.Instance; + options.ResponseUnmarshaller = DescribeRoleCustomPermissionResponseUnmarshaller.Instance; - return InvokeAsync(request, options, cancellationToken); + return InvokeAsync(request, options, cancellationToken); } #endregion - #region DescribeTheme + #region DescribeTemplate /// - /// Describes a theme. + /// Describes a template's metadata. /// - /// Container for the necessary parameters to execute the DescribeTheme service method. + /// Container for the necessary parameters to execute the DescribeTemplate service method. /// - /// The response from the DescribeTheme service method, as returned by QuickSight. + /// The response from the DescribeTemplate service method, as returned by QuickSight. /// /// You don't have access to this item. The provided credentials couldn't be validated. /// You might not be authorized to carry out the request. Make sure that your account /// is authorized to use the Amazon QuickSight service, that your policies have the correct /// permissions, and that you are using the correct credentials. /// + /// + /// Updating or deleting a resource can cause an inconsistent state. + /// /// /// An internal failure occurred. /// @@ -8557,32 +9088,35 @@ public virtual DescribeTemplatePermissionsResponse DescribeTemplatePermissions(D /// currently has Standard Edition and Enterprise Edition. Not every operation and capability /// is available in every edition. /// - /// REST API Reference for DescribeTheme Operation - public virtual DescribeThemeResponse DescribeTheme(DescribeThemeRequest request) + /// REST API Reference for DescribeTemplate Operation + public virtual DescribeTemplateResponse DescribeTemplate(DescribeTemplateRequest request) { var options = new InvokeOptions(); - options.RequestMarshaller = DescribeThemeRequestMarshaller.Instance; - options.ResponseUnmarshaller = DescribeThemeResponseUnmarshaller.Instance; + options.RequestMarshaller = DescribeTemplateRequestMarshaller.Instance; + options.ResponseUnmarshaller = DescribeTemplateResponseUnmarshaller.Instance; - return Invoke(request, options); + return Invoke(request, options); } /// - /// Describes a theme. + /// Describes a template's metadata. /// - /// Container for the necessary parameters to execute the DescribeTheme service method. + /// Container for the necessary parameters to execute the DescribeTemplate service method. /// /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// /// - /// The response from the DescribeTheme service method, as returned by QuickSight. + /// The response from the DescribeTemplate service method, as returned by QuickSight. /// /// You don't have access to this item. The provided credentials couldn't be validated. /// You might not be authorized to carry out the request. Make sure that your account /// is authorized to use the Amazon QuickSight service, that your policies have the correct /// permissions, and that you are using the correct credentials. /// + /// + /// Updating or deleting a resource can cause an inconsistent state. + /// /// /// An internal failure occurred. /// @@ -8604,36 +9138,30 @@ public virtual DescribeThemeResponse DescribeTheme(DescribeThemeRequest request) /// currently has Standard Edition and Enterprise Edition. Not every operation and capability /// is available in every edition. /// - /// REST API Reference for DescribeTheme Operation - public virtual Task DescribeThemeAsync(DescribeThemeRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + /// REST API Reference for DescribeTemplate Operation + public virtual Task DescribeTemplateAsync(DescribeTemplateRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { var options = new InvokeOptions(); - options.RequestMarshaller = DescribeThemeRequestMarshaller.Instance; - options.ResponseUnmarshaller = DescribeThemeResponseUnmarshaller.Instance; + options.RequestMarshaller = DescribeTemplateRequestMarshaller.Instance; + options.ResponseUnmarshaller = DescribeTemplateResponseUnmarshaller.Instance; - return InvokeAsync(request, options, cancellationToken); + return InvokeAsync(request, options, cancellationToken); } #endregion - #region DescribeThemeAlias + #region DescribeTemplateAlias /// - /// Describes the alias for a theme. + /// Describes the template alias for a template. /// - /// Container for the necessary parameters to execute the DescribeThemeAlias service method. + /// Container for the necessary parameters to execute the DescribeTemplateAlias service method. /// - /// The response from the DescribeThemeAlias service method, as returned by QuickSight. - /// - /// Updating or deleting a resource can cause an inconsistent state. - /// + /// The response from the DescribeTemplateAlias service method, as returned by QuickSight. /// /// An internal failure occurred. /// - /// - /// One or more parameters has a value that isn't valid. - /// /// /// One or more resources can't be found. /// @@ -8646,35 +9174,29 @@ public virtual DescribeThemeResponse DescribeTheme(DescribeThemeRequest request) /// currently has Standard Edition and Enterprise Edition. Not every operation and capability /// is available in every edition. /// - /// REST API Reference for DescribeThemeAlias Operation - public virtual DescribeThemeAliasResponse DescribeThemeAlias(DescribeThemeAliasRequest request) + /// REST API Reference for DescribeTemplateAlias Operation + public virtual DescribeTemplateAliasResponse DescribeTemplateAlias(DescribeTemplateAliasRequest request) { var options = new InvokeOptions(); - options.RequestMarshaller = DescribeThemeAliasRequestMarshaller.Instance; - options.ResponseUnmarshaller = DescribeThemeAliasResponseUnmarshaller.Instance; + options.RequestMarshaller = DescribeTemplateAliasRequestMarshaller.Instance; + options.ResponseUnmarshaller = DescribeTemplateAliasResponseUnmarshaller.Instance; - return Invoke(request, options); + return Invoke(request, options); } /// - /// Describes the alias for a theme. + /// Describes the template alias for a template. /// - /// Container for the necessary parameters to execute the DescribeThemeAlias service method. + /// Container for the necessary parameters to execute the DescribeTemplateAlias service method. /// /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// /// - /// The response from the DescribeThemeAlias service method, as returned by QuickSight. - /// - /// Updating or deleting a resource can cause an inconsistent state. - /// + /// The response from the DescribeTemplateAlias service method, as returned by QuickSight. /// /// An internal failure occurred. /// - /// - /// One or more parameters has a value that isn't valid. - /// /// /// One or more resources can't be found. /// @@ -8687,39 +9209,54 @@ public virtual DescribeThemeAliasResponse DescribeThemeAlias(DescribeThemeAliasR /// currently has Standard Edition and Enterprise Edition. Not every operation and capability /// is available in every edition. /// - /// REST API Reference for DescribeThemeAlias Operation - public virtual Task DescribeThemeAliasAsync(DescribeThemeAliasRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + /// REST API Reference for DescribeTemplateAlias Operation + public virtual Task DescribeTemplateAliasAsync(DescribeTemplateAliasRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { var options = new InvokeOptions(); - options.RequestMarshaller = DescribeThemeAliasRequestMarshaller.Instance; - options.ResponseUnmarshaller = DescribeThemeAliasResponseUnmarshaller.Instance; + options.RequestMarshaller = DescribeTemplateAliasRequestMarshaller.Instance; + options.ResponseUnmarshaller = DescribeTemplateAliasResponseUnmarshaller.Instance; - return InvokeAsync(request, options, cancellationToken); + return InvokeAsync(request, options, cancellationToken); } #endregion - #region DescribeThemePermissions + #region DescribeTemplateDefinition /// - /// Describes the read and write permissions for a theme. + /// Provides a detailed description of the definition of a template. + /// + /// + /// + /// If you do not need to know details about the content of a template, for instance if + /// you are trying to check the status of a recently created or updated template, use + /// the + /// DescribeTemplate instead. + /// + /// /// - /// Container for the necessary parameters to execute the DescribeThemePermissions service method. + /// Container for the necessary parameters to execute the DescribeTemplateDefinition service method. /// - /// The response from the DescribeThemePermissions service method, as returned by QuickSight. + /// The response from the DescribeTemplateDefinition service method, as returned by QuickSight. /// /// You don't have access to this item. The provided credentials couldn't be validated. /// You might not be authorized to carry out the request. Make sure that your account /// is authorized to use the Amazon QuickSight service, that your policies have the correct /// permissions, and that you are using the correct credentials. /// + /// + /// Updating or deleting a resource can cause an inconsistent state. + /// /// /// An internal failure occurred. /// /// /// One or more parameters has a value that isn't valid. /// + /// + /// The resource specified already exists. + /// /// /// One or more resources can't be found. /// @@ -8732,38 +9269,53 @@ public virtual DescribeThemeAliasResponse DescribeThemeAlias(DescribeThemeAliasR /// currently has Standard Edition and Enterprise Edition. Not every operation and capability /// is available in every edition. /// - /// REST API Reference for DescribeThemePermissions Operation - public virtual DescribeThemePermissionsResponse DescribeThemePermissions(DescribeThemePermissionsRequest request) + /// REST API Reference for DescribeTemplateDefinition Operation + public virtual DescribeTemplateDefinitionResponse DescribeTemplateDefinition(DescribeTemplateDefinitionRequest request) { var options = new InvokeOptions(); - options.RequestMarshaller = DescribeThemePermissionsRequestMarshaller.Instance; - options.ResponseUnmarshaller = DescribeThemePermissionsResponseUnmarshaller.Instance; + options.RequestMarshaller = DescribeTemplateDefinitionRequestMarshaller.Instance; + options.ResponseUnmarshaller = DescribeTemplateDefinitionResponseUnmarshaller.Instance; - return Invoke(request, options); + return Invoke(request, options); } /// - /// Describes the read and write permissions for a theme. + /// Provides a detailed description of the definition of a template. + /// + /// + /// + /// If you do not need to know details about the content of a template, for instance if + /// you are trying to check the status of a recently created or updated template, use + /// the + /// DescribeTemplate instead. + /// + /// /// - /// Container for the necessary parameters to execute the DescribeThemePermissions service method. + /// Container for the necessary parameters to execute the DescribeTemplateDefinition service method. /// /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// /// - /// The response from the DescribeThemePermissions service method, as returned by QuickSight. + /// The response from the DescribeTemplateDefinition service method, as returned by QuickSight. /// /// You don't have access to this item. The provided credentials couldn't be validated. /// You might not be authorized to carry out the request. Make sure that your account /// is authorized to use the Amazon QuickSight service, that your policies have the correct /// permissions, and that you are using the correct credentials. /// + /// + /// Updating or deleting a resource can cause an inconsistent state. + /// /// /// An internal failure occurred. /// /// /// One or more parameters has a value that isn't valid. /// + /// + /// The resource specified already exists. + /// /// /// One or more resources can't be found. /// @@ -8776,32 +9328,29 @@ public virtual DescribeThemePermissionsResponse DescribeThemePermissions(Describ /// currently has Standard Edition and Enterprise Edition. Not every operation and capability /// is available in every edition. /// - /// REST API Reference for DescribeThemePermissions Operation - public virtual Task DescribeThemePermissionsAsync(DescribeThemePermissionsRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + /// REST API Reference for DescribeTemplateDefinition Operation + public virtual Task DescribeTemplateDefinitionAsync(DescribeTemplateDefinitionRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { var options = new InvokeOptions(); - options.RequestMarshaller = DescribeThemePermissionsRequestMarshaller.Instance; - options.ResponseUnmarshaller = DescribeThemePermissionsResponseUnmarshaller.Instance; + options.RequestMarshaller = DescribeTemplateDefinitionRequestMarshaller.Instance; + options.ResponseUnmarshaller = DescribeTemplateDefinitionResponseUnmarshaller.Instance; - return InvokeAsync(request, options, cancellationToken); + return InvokeAsync(request, options, cancellationToken); } #endregion - #region DescribeTopic + #region DescribeTemplatePermissions /// - /// Describes a topic. + /// Describes read and write permissions on a template. /// - /// Container for the necessary parameters to execute the DescribeTopic service method. + /// Container for the necessary parameters to execute the DescribeTemplatePermissions service method. /// - /// The response from the DescribeTopic service method, as returned by QuickSight. - /// - /// You don't have access to this item. The provided credentials couldn't be validated. - /// You might not be authorized to carry out the request. Make sure that your account - /// is authorized to use the Amazon QuickSight service, that your policies have the correct - /// permissions, and that you are using the correct credentials. + /// The response from the DescribeTemplatePermissions service method, as returned by QuickSight. + /// + /// Updating or deleting a resource can cause an inconsistent state. /// /// /// An internal failure occurred. @@ -8815,31 +9364,34 @@ public virtual DescribeThemePermissionsResponse DescribeThemePermissions(Describ /// /// Access is throttled. /// - /// REST API Reference for DescribeTopic Operation - public virtual DescribeTopicResponse DescribeTopic(DescribeTopicRequest request) + /// + /// This error indicates that you are calling an operation on an Amazon QuickSight subscription + /// where the edition doesn't include support for that operation. Amazon Amazon QuickSight + /// currently has Standard Edition and Enterprise Edition. Not every operation and capability + /// is available in every edition. + /// + /// REST API Reference for DescribeTemplatePermissions Operation + public virtual DescribeTemplatePermissionsResponse DescribeTemplatePermissions(DescribeTemplatePermissionsRequest request) { var options = new InvokeOptions(); - options.RequestMarshaller = DescribeTopicRequestMarshaller.Instance; - options.ResponseUnmarshaller = DescribeTopicResponseUnmarshaller.Instance; + options.RequestMarshaller = DescribeTemplatePermissionsRequestMarshaller.Instance; + options.ResponseUnmarshaller = DescribeTemplatePermissionsResponseUnmarshaller.Instance; - return Invoke(request, options); + return Invoke(request, options); } /// - /// Describes a topic. + /// Describes read and write permissions on a template. /// - /// Container for the necessary parameters to execute the DescribeTopic service method. + /// Container for the necessary parameters to execute the DescribeTemplatePermissions service method. /// /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// /// - /// The response from the DescribeTopic service method, as returned by QuickSight. - /// - /// You don't have access to this item. The provided credentials couldn't be validated. - /// You might not be authorized to carry out the request. Make sure that your account - /// is authorized to use the Amazon QuickSight service, that your policies have the correct - /// permissions, and that you are using the correct credentials. + /// The response from the DescribeTemplatePermissions service method, as returned by QuickSight. + /// + /// Updating or deleting a resource can cause an inconsistent state. /// /// /// An internal failure occurred. @@ -8853,27 +9405,33 @@ public virtual DescribeTopicResponse DescribeTopic(DescribeTopicRequest request) /// /// Access is throttled. /// - /// REST API Reference for DescribeTopic Operation - public virtual Task DescribeTopicAsync(DescribeTopicRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + /// + /// This error indicates that you are calling an operation on an Amazon QuickSight subscription + /// where the edition doesn't include support for that operation. Amazon Amazon QuickSight + /// currently has Standard Edition and Enterprise Edition. Not every operation and capability + /// is available in every edition. + /// + /// REST API Reference for DescribeTemplatePermissions Operation + public virtual Task DescribeTemplatePermissionsAsync(DescribeTemplatePermissionsRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { var options = new InvokeOptions(); - options.RequestMarshaller = DescribeTopicRequestMarshaller.Instance; - options.ResponseUnmarshaller = DescribeTopicResponseUnmarshaller.Instance; + options.RequestMarshaller = DescribeTemplatePermissionsRequestMarshaller.Instance; + options.ResponseUnmarshaller = DescribeTemplatePermissionsResponseUnmarshaller.Instance; - return InvokeAsync(request, options, cancellationToken); + return InvokeAsync(request, options, cancellationToken); } #endregion - #region DescribeTopicPermissions + #region DescribeTheme /// - /// Describes the permissions of a topic. + /// Describes a theme. /// - /// Container for the necessary parameters to execute the DescribeTopicPermissions service method. + /// Container for the necessary parameters to execute the DescribeTheme service method. /// - /// The response from the DescribeTopicPermissions service method, as returned by QuickSight. + /// The response from the DescribeTheme service method, as returned by QuickSight. /// /// You don't have access to this item. The provided credentials couldn't be validated. /// You might not be authorized to carry out the request. Make sure that your account @@ -8886,32 +9444,41 @@ public virtual DescribeTopicResponse DescribeTopic(DescribeTopicRequest request) /// /// One or more parameters has a value that isn't valid. /// + /// + /// The resource specified already exists. + /// /// /// One or more resources can't be found. /// /// /// Access is throttled. /// - /// REST API Reference for DescribeTopicPermissions Operation - public virtual DescribeTopicPermissionsResponse DescribeTopicPermissions(DescribeTopicPermissionsRequest request) + /// + /// This error indicates that you are calling an operation on an Amazon QuickSight subscription + /// where the edition doesn't include support for that operation. Amazon Amazon QuickSight + /// currently has Standard Edition and Enterprise Edition. Not every operation and capability + /// is available in every edition. + /// + /// REST API Reference for DescribeTheme Operation + public virtual DescribeThemeResponse DescribeTheme(DescribeThemeRequest request) { var options = new InvokeOptions(); - options.RequestMarshaller = DescribeTopicPermissionsRequestMarshaller.Instance; - options.ResponseUnmarshaller = DescribeTopicPermissionsResponseUnmarshaller.Instance; + options.RequestMarshaller = DescribeThemeRequestMarshaller.Instance; + options.ResponseUnmarshaller = DescribeThemeResponseUnmarshaller.Instance; - return Invoke(request, options); + return Invoke(request, options); } /// - /// Describes the permissions of a topic. + /// Describes a theme. /// - /// Container for the necessary parameters to execute the DescribeTopicPermissions service method. + /// Container for the necessary parameters to execute the DescribeTheme service method. /// /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// /// - /// The response from the DescribeTopicPermissions service method, as returned by QuickSight. + /// The response from the DescribeTheme service method, as returned by QuickSight. /// /// You don't have access to this item. The provided credentials couldn't be validated. /// You might not be authorized to carry out the request. Make sure that your account @@ -8924,38 +9491,44 @@ public virtual DescribeTopicPermissionsResponse DescribeTopicPermissions(Describ /// /// One or more parameters has a value that isn't valid. /// + /// + /// The resource specified already exists. + /// /// /// One or more resources can't be found. /// /// /// Access is throttled. /// - /// REST API Reference for DescribeTopicPermissions Operation - public virtual Task DescribeTopicPermissionsAsync(DescribeTopicPermissionsRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + /// + /// This error indicates that you are calling an operation on an Amazon QuickSight subscription + /// where the edition doesn't include support for that operation. Amazon Amazon QuickSight + /// currently has Standard Edition and Enterprise Edition. Not every operation and capability + /// is available in every edition. + /// + /// REST API Reference for DescribeTheme Operation + public virtual Task DescribeThemeAsync(DescribeThemeRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { var options = new InvokeOptions(); - options.RequestMarshaller = DescribeTopicPermissionsRequestMarshaller.Instance; - options.ResponseUnmarshaller = DescribeTopicPermissionsResponseUnmarshaller.Instance; + options.RequestMarshaller = DescribeThemeRequestMarshaller.Instance; + options.ResponseUnmarshaller = DescribeThemeResponseUnmarshaller.Instance; - return InvokeAsync(request, options, cancellationToken); + return InvokeAsync(request, options, cancellationToken); } #endregion - #region DescribeTopicRefresh + #region DescribeThemeAlias /// - /// Describes the status of a topic refresh. + /// Describes the alias for a theme. /// - /// Container for the necessary parameters to execute the DescribeTopicRefresh service method. + /// Container for the necessary parameters to execute the DescribeThemeAlias service method. /// - /// The response from the DescribeTopicRefresh service method, as returned by QuickSight. - /// - /// You don't have access to this item. The provided credentials couldn't be validated. - /// You might not be authorized to carry out the request. Make sure that your account - /// is authorized to use the Amazon QuickSight service, that your policies have the correct - /// permissions, and that you are using the correct credentials. + /// The response from the DescribeThemeAlias service method, as returned by QuickSight. + /// + /// Updating or deleting a resource can cause an inconsistent state. /// /// /// An internal failure occurred. @@ -8969,31 +9542,34 @@ public virtual DescribeTopicPermissionsResponse DescribeTopicPermissions(Describ /// /// Access is throttled. /// - /// REST API Reference for DescribeTopicRefresh Operation - public virtual DescribeTopicRefreshResponse DescribeTopicRefresh(DescribeTopicRefreshRequest request) + /// + /// This error indicates that you are calling an operation on an Amazon QuickSight subscription + /// where the edition doesn't include support for that operation. Amazon Amazon QuickSight + /// currently has Standard Edition and Enterprise Edition. Not every operation and capability + /// is available in every edition. + /// + /// REST API Reference for DescribeThemeAlias Operation + public virtual DescribeThemeAliasResponse DescribeThemeAlias(DescribeThemeAliasRequest request) { var options = new InvokeOptions(); - options.RequestMarshaller = DescribeTopicRefreshRequestMarshaller.Instance; - options.ResponseUnmarshaller = DescribeTopicRefreshResponseUnmarshaller.Instance; + options.RequestMarshaller = DescribeThemeAliasRequestMarshaller.Instance; + options.ResponseUnmarshaller = DescribeThemeAliasResponseUnmarshaller.Instance; - return Invoke(request, options); + return Invoke(request, options); } /// - /// Describes the status of a topic refresh. + /// Describes the alias for a theme. /// - /// Container for the necessary parameters to execute the DescribeTopicRefresh service method. + /// Container for the necessary parameters to execute the DescribeThemeAlias service method. /// /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// /// - /// The response from the DescribeTopicRefresh service method, as returned by QuickSight. - /// - /// You don't have access to this item. The provided credentials couldn't be validated. - /// You might not be authorized to carry out the request. Make sure that your account - /// is authorized to use the Amazon QuickSight service, that your policies have the correct - /// permissions, and that you are using the correct credentials. + /// The response from the DescribeThemeAlias service method, as returned by QuickSight. + /// + /// Updating or deleting a resource can cause an inconsistent state. /// /// /// An internal failure occurred. @@ -9007,122 +9583,122 @@ public virtual DescribeTopicRefreshResponse DescribeTopicRefresh(DescribeTopicRe /// /// Access is throttled. /// - /// REST API Reference for DescribeTopicRefresh Operation - public virtual Task DescribeTopicRefreshAsync(DescribeTopicRefreshRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + /// + /// This error indicates that you are calling an operation on an Amazon QuickSight subscription + /// where the edition doesn't include support for that operation. Amazon Amazon QuickSight + /// currently has Standard Edition and Enterprise Edition. Not every operation and capability + /// is available in every edition. + /// + /// REST API Reference for DescribeThemeAlias Operation + public virtual Task DescribeThemeAliasAsync(DescribeThemeAliasRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { var options = new InvokeOptions(); - options.RequestMarshaller = DescribeTopicRefreshRequestMarshaller.Instance; - options.ResponseUnmarshaller = DescribeTopicRefreshResponseUnmarshaller.Instance; + options.RequestMarshaller = DescribeThemeAliasRequestMarshaller.Instance; + options.ResponseUnmarshaller = DescribeThemeAliasResponseUnmarshaller.Instance; - return InvokeAsync(request, options, cancellationToken); + return InvokeAsync(request, options, cancellationToken); } #endregion - #region DescribeTopicRefreshSchedule + #region DescribeThemePermissions /// - /// Deletes a topic refresh schedule. + /// Describes the read and write permissions for a theme. /// - /// Container for the necessary parameters to execute the DescribeTopicRefreshSchedule service method. + /// Container for the necessary parameters to execute the DescribeThemePermissions service method. /// - /// The response from the DescribeTopicRefreshSchedule service method, as returned by QuickSight. + /// The response from the DescribeThemePermissions service method, as returned by QuickSight. /// /// You don't have access to this item. The provided credentials couldn't be validated. /// You might not be authorized to carry out the request. Make sure that your account /// is authorized to use the Amazon QuickSight service, that your policies have the correct /// permissions, and that you are using the correct credentials. /// - /// - /// Updating or deleting a resource can cause an inconsistent state. - /// /// /// An internal failure occurred. /// /// /// One or more parameters has a value that isn't valid. /// - /// - /// A limit is exceeded. - /// - /// - /// The resource specified already exists. - /// /// /// One or more resources can't be found. /// /// /// Access is throttled. /// - /// REST API Reference for DescribeTopicRefreshSchedule Operation - public virtual DescribeTopicRefreshScheduleResponse DescribeTopicRefreshSchedule(DescribeTopicRefreshScheduleRequest request) + /// + /// This error indicates that you are calling an operation on an Amazon QuickSight subscription + /// where the edition doesn't include support for that operation. Amazon Amazon QuickSight + /// currently has Standard Edition and Enterprise Edition. Not every operation and capability + /// is available in every edition. + /// + /// REST API Reference for DescribeThemePermissions Operation + public virtual DescribeThemePermissionsResponse DescribeThemePermissions(DescribeThemePermissionsRequest request) { var options = new InvokeOptions(); - options.RequestMarshaller = DescribeTopicRefreshScheduleRequestMarshaller.Instance; - options.ResponseUnmarshaller = DescribeTopicRefreshScheduleResponseUnmarshaller.Instance; + options.RequestMarshaller = DescribeThemePermissionsRequestMarshaller.Instance; + options.ResponseUnmarshaller = DescribeThemePermissionsResponseUnmarshaller.Instance; - return Invoke(request, options); + return Invoke(request, options); } /// - /// Deletes a topic refresh schedule. + /// Describes the read and write permissions for a theme. /// - /// Container for the necessary parameters to execute the DescribeTopicRefreshSchedule service method. + /// Container for the necessary parameters to execute the DescribeThemePermissions service method. /// /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// /// - /// The response from the DescribeTopicRefreshSchedule service method, as returned by QuickSight. + /// The response from the DescribeThemePermissions service method, as returned by QuickSight. /// /// You don't have access to this item. The provided credentials couldn't be validated. /// You might not be authorized to carry out the request. Make sure that your account /// is authorized to use the Amazon QuickSight service, that your policies have the correct /// permissions, and that you are using the correct credentials. /// - /// - /// Updating or deleting a resource can cause an inconsistent state. - /// /// /// An internal failure occurred. /// /// /// One or more parameters has a value that isn't valid. /// - /// - /// A limit is exceeded. - /// - /// - /// The resource specified already exists. - /// /// /// One or more resources can't be found. /// /// /// Access is throttled. /// - /// REST API Reference for DescribeTopicRefreshSchedule Operation - public virtual Task DescribeTopicRefreshScheduleAsync(DescribeTopicRefreshScheduleRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) - { - var options = new InvokeOptions(); - options.RequestMarshaller = DescribeTopicRefreshScheduleRequestMarshaller.Instance; - options.ResponseUnmarshaller = DescribeTopicRefreshScheduleResponseUnmarshaller.Instance; + /// + /// This error indicates that you are calling an operation on an Amazon QuickSight subscription + /// where the edition doesn't include support for that operation. Amazon Amazon QuickSight + /// currently has Standard Edition and Enterprise Edition. Not every operation and capability + /// is available in every edition. + /// + /// REST API Reference for DescribeThemePermissions Operation + public virtual Task DescribeThemePermissionsAsync(DescribeThemePermissionsRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = DescribeThemePermissionsRequestMarshaller.Instance; + options.ResponseUnmarshaller = DescribeThemePermissionsResponseUnmarshaller.Instance; - return InvokeAsync(request, options, cancellationToken); + return InvokeAsync(request, options, cancellationToken); } #endregion - #region DescribeUser + #region DescribeTopic /// - /// Returns information about a user, given the user name. + /// Describes a topic. /// - /// Container for the necessary parameters to execute the DescribeUser service method. + /// Container for the necessary parameters to execute the DescribeTopic service method. /// - /// The response from the DescribeUser service method, as returned by QuickSight. + /// The response from the DescribeTopic service method, as returned by QuickSight. /// /// You don't have access to this item. The provided credentials couldn't be validated. /// You might not be authorized to carry out the request. Make sure that your account @@ -9135,38 +9711,32 @@ public virtual DescribeTopicRefreshScheduleResponse DescribeTopicRefreshSchedule /// /// One or more parameters has a value that isn't valid. /// - /// - /// One or more preconditions aren't met. - /// /// /// One or more resources can't be found. /// - /// - /// This resource is currently unavailable. - /// /// /// Access is throttled. /// - /// REST API Reference for DescribeUser Operation - public virtual DescribeUserResponse DescribeUser(DescribeUserRequest request) + /// REST API Reference for DescribeTopic Operation + public virtual DescribeTopicResponse DescribeTopic(DescribeTopicRequest request) { var options = new InvokeOptions(); - options.RequestMarshaller = DescribeUserRequestMarshaller.Instance; - options.ResponseUnmarshaller = DescribeUserResponseUnmarshaller.Instance; + options.RequestMarshaller = DescribeTopicRequestMarshaller.Instance; + options.ResponseUnmarshaller = DescribeTopicResponseUnmarshaller.Instance; - return Invoke(request, options); + return Invoke(request, options); } /// - /// Returns information about a user, given the user name. + /// Describes a topic. /// - /// Container for the necessary parameters to execute the DescribeUser service method. + /// Container for the necessary parameters to execute the DescribeTopic service method. /// /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// /// - /// The response from the DescribeUser service method, as returned by QuickSight. + /// The response from the DescribeTopic service method, as returned by QuickSight. /// /// You don't have access to this item. The provided credentials couldn't be validated. /// You might not be authorized to carry out the request. Make sure that your account @@ -9179,39 +9749,33 @@ public virtual DescribeUserResponse DescribeUser(DescribeUserRequest request) /// /// One or more parameters has a value that isn't valid. /// - /// - /// One or more preconditions aren't met. - /// /// /// One or more resources can't be found. /// - /// - /// This resource is currently unavailable. - /// /// /// Access is throttled. /// - /// REST API Reference for DescribeUser Operation - public virtual Task DescribeUserAsync(DescribeUserRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + /// REST API Reference for DescribeTopic Operation + public virtual Task DescribeTopicAsync(DescribeTopicRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { var options = new InvokeOptions(); - options.RequestMarshaller = DescribeUserRequestMarshaller.Instance; - options.ResponseUnmarshaller = DescribeUserResponseUnmarshaller.Instance; + options.RequestMarshaller = DescribeTopicRequestMarshaller.Instance; + options.ResponseUnmarshaller = DescribeTopicResponseUnmarshaller.Instance; - return InvokeAsync(request, options, cancellationToken); + return InvokeAsync(request, options, cancellationToken); } #endregion - #region DescribeVPCConnection + #region DescribeTopicPermissions /// - /// Describes a VPC connection. + /// Describes the permissions of a topic. /// - /// Container for the necessary parameters to execute the DescribeVPCConnection service method. + /// Container for the necessary parameters to execute the DescribeTopicPermissions service method. /// - /// The response from the DescribeVPCConnection service method, as returned by QuickSight. + /// The response from the DescribeTopicPermissions service method, as returned by QuickSight. /// /// You don't have access to this item. The provided credentials couldn't be validated. /// You might not be authorized to carry out the request. Make sure that your account @@ -9230,32 +9794,26 @@ public virtual DescribeUserResponse DescribeUser(DescribeUserRequest request) /// /// Access is throttled. /// - /// - /// This error indicates that you are calling an operation on an Amazon QuickSight subscription - /// where the edition doesn't include support for that operation. Amazon Amazon QuickSight - /// currently has Standard Edition and Enterprise Edition. Not every operation and capability - /// is available in every edition. - /// - /// REST API Reference for DescribeVPCConnection Operation - public virtual DescribeVPCConnectionResponse DescribeVPCConnection(DescribeVPCConnectionRequest request) + /// REST API Reference for DescribeTopicPermissions Operation + public virtual DescribeTopicPermissionsResponse DescribeTopicPermissions(DescribeTopicPermissionsRequest request) { var options = new InvokeOptions(); - options.RequestMarshaller = DescribeVPCConnectionRequestMarshaller.Instance; - options.ResponseUnmarshaller = DescribeVPCConnectionResponseUnmarshaller.Instance; + options.RequestMarshaller = DescribeTopicPermissionsRequestMarshaller.Instance; + options.ResponseUnmarshaller = DescribeTopicPermissionsResponseUnmarshaller.Instance; - return Invoke(request, options); + return Invoke(request, options); } /// - /// Describes a VPC connection. + /// Describes the permissions of a topic. /// - /// Container for the necessary parameters to execute the DescribeVPCConnection service method. + /// Container for the necessary parameters to execute the DescribeTopicPermissions service method. /// /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// /// - /// The response from the DescribeVPCConnection service method, as returned by QuickSight. + /// The response from the DescribeTopicPermissions service method, as returned by QuickSight. /// /// You don't have access to this item. The provided credentials couldn't be validated. /// You might not be authorized to carry out the request. Make sure that your account @@ -9274,67 +9832,27 @@ public virtual DescribeVPCConnectionResponse DescribeVPCConnection(DescribeVPCCo /// /// Access is throttled. /// - /// - /// This error indicates that you are calling an operation on an Amazon QuickSight subscription - /// where the edition doesn't include support for that operation. Amazon Amazon QuickSight - /// currently has Standard Edition and Enterprise Edition. Not every operation and capability - /// is available in every edition. - /// - /// REST API Reference for DescribeVPCConnection Operation - public virtual Task DescribeVPCConnectionAsync(DescribeVPCConnectionRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + /// REST API Reference for DescribeTopicPermissions Operation + public virtual Task DescribeTopicPermissionsAsync(DescribeTopicPermissionsRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { var options = new InvokeOptions(); - options.RequestMarshaller = DescribeVPCConnectionRequestMarshaller.Instance; - options.ResponseUnmarshaller = DescribeVPCConnectionResponseUnmarshaller.Instance; + options.RequestMarshaller = DescribeTopicPermissionsRequestMarshaller.Instance; + options.ResponseUnmarshaller = DescribeTopicPermissionsResponseUnmarshaller.Instance; - return InvokeAsync(request, options, cancellationToken); + return InvokeAsync(request, options, cancellationToken); } #endregion - #region GenerateEmbedUrlForAnonymousUser + #region DescribeTopicRefresh /// - /// Generates an embed URL that you can use to embed an Amazon QuickSight dashboard or - /// visual in your website, without having to register any reader users. Before you use - /// this action, make sure that you have configured the dashboards and permissions. - /// - /// - /// - /// The following rules apply to the generated URL: - /// - ///
    • - /// - /// It contains a temporary bearer token. It is valid for 5 minutes after it is generated. - /// Once redeemed within this period, it cannot be re-used again. - /// - ///
    • - /// - /// The URL validity period should not be confused with the actual session lifetime that - /// can be customized using the SessionLifetimeInMinutes - /// parameter. The resulting user session is valid for 15 minutes (minimum) to 10 - /// hours (maximum). The default session duration is 10 hours. - /// - ///
    • - /// - /// You are charged only when the URL is used or there is interaction with Amazon QuickSight. - /// - ///
    - /// - /// For more information, see Embedded - /// Analytics in the Amazon QuickSight User Guide. - /// - /// - /// - /// For more information about the high-level steps for embedding and for an interactive - /// demo of the ways you can customize embedding, visit the Amazon - /// QuickSight Developer Portal. - /// + /// Describes the status of a topic refresh. ///     - /// Container for the necessary parameters to execute the GenerateEmbedUrlForAnonymousUser service method. + /// Container for the necessary parameters to execute the DescribeTopicRefresh service method. /// - /// The response from the GenerateEmbedUrlForAnonymousUser service method, as returned by QuickSight. + /// The response from the DescribeTopicRefresh service method, as returned by QuickSight. /// /// You don't have access to this item. The provided credentials couldn't be validated. /// You might not be authorized to carry out the request. Make sure that your account @@ -9350,86 +9868,29 @@ public virtual DescribeVPCConnectionResponse DescribeVPCConnection(DescribeVPCCo /// /// One or more resources can't be found. /// - /// - /// The number of minutes specified for the lifetime of a session isn't valid. The session - /// lifetime must be 15-600 minutes. - /// /// /// Access is throttled. /// - /// - /// This error indicates that you are calling an embedding operation in Amazon QuickSight - /// without the required pricing plan on your Amazon Web Services account. Before you - /// can use embedding for anonymous users, a QuickSight administrator needs to add capacity - /// pricing to Amazon QuickSight. You can do this on the Manage Amazon QuickSight - /// page. - /// - /// - /// - /// After capacity pricing is added, you can use the GetDashboardEmbedUrl - /// API operation with the --identity-type ANONYMOUS option. - /// - /// - /// - /// This error indicates that you are calling an operation on an Amazon QuickSight subscription - /// where the edition doesn't include support for that operation. Amazon Amazon QuickSight - /// currently has Standard Edition and Enterprise Edition. Not every operation and capability - /// is available in every edition. - /// - /// REST API Reference for GenerateEmbedUrlForAnonymousUser Operation - public virtual GenerateEmbedUrlForAnonymousUserResponse GenerateEmbedUrlForAnonymousUser(GenerateEmbedUrlForAnonymousUserRequest request) + /// REST API Reference for DescribeTopicRefresh Operation + public virtual DescribeTopicRefreshResponse DescribeTopicRefresh(DescribeTopicRefreshRequest request) { var options = new InvokeOptions(); - options.RequestMarshaller = GenerateEmbedUrlForAnonymousUserRequestMarshaller.Instance; - options.ResponseUnmarshaller = GenerateEmbedUrlForAnonymousUserResponseUnmarshaller.Instance; + options.RequestMarshaller = DescribeTopicRefreshRequestMarshaller.Instance; + options.ResponseUnmarshaller = DescribeTopicRefreshResponseUnmarshaller.Instance; - return Invoke(request, options); + return Invoke(request, options); } /// - /// Generates an embed URL that you can use to embed an Amazon QuickSight dashboard or - /// visual in your website, without having to register any reader users. Before you use - /// this action, make sure that you have configured the dashboards and permissions. - /// - /// - /// - /// The following rules apply to the generated URL: - /// - ///
    • - /// - /// It contains a temporary bearer token. It is valid for 5 minutes after it is generated. - /// Once redeemed within this period, it cannot be re-used again. - /// - ///
    • - /// - /// The URL validity period should not be confused with the actual session lifetime that - /// can be customized using the SessionLifetimeInMinutes - /// parameter. The resulting user session is valid for 15 minutes (minimum) to 10 - /// hours (maximum). The default session duration is 10 hours. - /// - ///
    • - /// - /// You are charged only when the URL is used or there is interaction with Amazon QuickSight. - /// - ///
    - /// - /// For more information, see Embedded - /// Analytics in the Amazon QuickSight User Guide. - /// - /// - /// - /// For more information about the high-level steps for embedding and for an interactive - /// demo of the ways you can customize embedding, visit the Amazon - /// QuickSight Developer Portal. - /// + /// Describes the status of a topic refresh. ///     - /// Container for the necessary parameters to execute the GenerateEmbedUrlForAnonymousUser service method. + /// Container for the necessary parameters to execute the DescribeTopicRefresh service method. /// /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// /// - /// The response from the GenerateEmbedUrlForAnonymousUser service method, as returned by QuickSight. + /// The response from the DescribeTopicRefresh service method, as returned by QuickSight. /// /// You don't have access to this item. The provided credentials couldn't be validated. /// You might not be authorized to carry out the request. Make sure that your account @@ -9445,524 +9906,214 @@ public virtual GenerateEmbedUrlForAnonymousUserResponse GenerateEmbedUrlForAnony /// /// One or more resources can't be found. /// - /// - /// The number of minutes specified for the lifetime of a session isn't valid. The session - /// lifetime must be 15-600 minutes. - /// /// /// Access is throttled. /// - /// - /// This error indicates that you are calling an embedding operation in Amazon QuickSight - /// without the required pricing plan on your Amazon Web Services account. Before you - /// can use embedding for anonymous users, a QuickSight administrator needs to add capacity - /// pricing to Amazon QuickSight. You can do this on the Manage Amazon QuickSight - /// page. - /// - /// - /// - /// After capacity pricing is added, you can use the GetDashboardEmbedUrl - /// API operation with the --identity-type ANONYMOUS option. - /// - /// - /// - /// This error indicates that you are calling an operation on an Amazon QuickSight subscription - /// where the edition doesn't include support for that operation. Amazon Amazon QuickSight - /// currently has Standard Edition and Enterprise Edition. Not every operation and capability - /// is available in every edition. - /// - /// REST API Reference for GenerateEmbedUrlForAnonymousUser Operation - public virtual Task GenerateEmbedUrlForAnonymousUserAsync(GenerateEmbedUrlForAnonymousUserRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + /// REST API Reference for DescribeTopicRefresh Operation + public virtual Task DescribeTopicRefreshAsync(DescribeTopicRefreshRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { var options = new InvokeOptions(); - options.RequestMarshaller = GenerateEmbedUrlForAnonymousUserRequestMarshaller.Instance; - options.ResponseUnmarshaller = GenerateEmbedUrlForAnonymousUserResponseUnmarshaller.Instance; + options.RequestMarshaller = DescribeTopicRefreshRequestMarshaller.Instance; + options.ResponseUnmarshaller = DescribeTopicRefreshResponseUnmarshaller.Instance; - return InvokeAsync(request, options, cancellationToken); + return InvokeAsync(request, options, cancellationToken); } #endregion - #region GenerateEmbedUrlForRegisteredUser + #region DescribeTopicRefreshSchedule /// - /// Generates an embed URL that you can use to embed an Amazon QuickSight experience in - /// your website. This action can be used for any type of user registered in an Amazon - /// QuickSight account. Before you use this action, make sure that you have configured - /// the relevant Amazon QuickSight resource and permissions. - /// - /// - /// - /// The following rules apply to the generated URL: - /// - ///
    • - /// - /// It contains a temporary bearer token. It is valid for 5 minutes after it is generated. - /// Once redeemed within this period, it cannot be re-used again. - /// - ///
    • - /// - /// The URL validity period should not be confused with the actual session lifetime that - /// can be customized using the SessionLifetimeInMinutes - /// parameter. - /// - /// - /// - /// The resulting user session is valid for 15 minutes (minimum) to 10 hours (maximum). - /// The default session duration is 10 hours. - /// - ///
    • - /// - /// You are charged only when the URL is used or there is interaction with Amazon QuickSight. - /// - ///
    - /// - /// For more information, see Embedded - /// Analytics in the Amazon QuickSight User Guide. - /// - /// - /// - /// For more information about the high-level steps for embedding and for an interactive - /// demo of the ways you can customize embedding, visit the Amazon - /// QuickSight Developer Portal. - /// + /// Deletes a topic refresh schedule. ///     - /// Container for the necessary parameters to execute the GenerateEmbedUrlForRegisteredUser service method. + /// Container for the necessary parameters to execute the DescribeTopicRefreshSchedule service method. /// - /// The response from the GenerateEmbedUrlForRegisteredUser service method, as returned by QuickSight. + /// The response from the DescribeTopicRefreshSchedule service method, as returned by QuickSight. /// /// You don't have access to this item. The provided credentials couldn't be validated. /// You might not be authorized to carry out the request. Make sure that your account /// is authorized to use the Amazon QuickSight service, that your policies have the correct /// permissions, and that you are using the correct credentials. /// + /// + /// Updating or deleting a resource can cause an inconsistent state. + /// /// /// An internal failure occurred. /// /// /// One or more parameters has a value that isn't valid. /// - /// - /// The user with the provided name isn't found. This error can happen in any operation - /// that requires finding a user based on a provided user name, such as DeleteUser, - /// DescribeUser, and so on. + /// + /// A limit is exceeded. + /// + /// + /// The resource specified already exists. /// /// /// One or more resources can't be found. /// - /// - /// The number of minutes specified for the lifetime of a session isn't valid. The session - /// lifetime must be 15-600 minutes. - /// /// /// Access is throttled. /// - /// - /// This error indicates that you are calling an embedding operation in Amazon QuickSight - /// without the required pricing plan on your Amazon Web Services account. Before you - /// can use embedding for anonymous users, a QuickSight administrator needs to add capacity - /// pricing to Amazon QuickSight. You can do this on the Manage Amazon QuickSight - /// page. - /// - /// - /// - /// After capacity pricing is added, you can use the GetDashboardEmbedUrl - /// API operation with the --identity-type ANONYMOUS option. - /// - /// - /// - /// This error indicates that you are calling an operation on an Amazon QuickSight subscription - /// where the edition doesn't include support for that operation. Amazon Amazon QuickSight - /// currently has Standard Edition and Enterprise Edition. Not every operation and capability - /// is available in every edition. - /// - /// REST API Reference for GenerateEmbedUrlForRegisteredUser Operation - public virtual GenerateEmbedUrlForRegisteredUserResponse GenerateEmbedUrlForRegisteredUser(GenerateEmbedUrlForRegisteredUserRequest request) + /// REST API Reference for DescribeTopicRefreshSchedule Operation + public virtual DescribeTopicRefreshScheduleResponse DescribeTopicRefreshSchedule(DescribeTopicRefreshScheduleRequest request) { var options = new InvokeOptions(); - options.RequestMarshaller = GenerateEmbedUrlForRegisteredUserRequestMarshaller.Instance; - options.ResponseUnmarshaller = GenerateEmbedUrlForRegisteredUserResponseUnmarshaller.Instance; + options.RequestMarshaller = DescribeTopicRefreshScheduleRequestMarshaller.Instance; + options.ResponseUnmarshaller = DescribeTopicRefreshScheduleResponseUnmarshaller.Instance; - return Invoke(request, options); + return Invoke(request, options); } /// - /// Generates an embed URL that you can use to embed an Amazon QuickSight experience in - /// your website. This action can be used for any type of user registered in an Amazon - /// QuickSight account. Before you use this action, make sure that you have configured - /// the relevant Amazon QuickSight resource and permissions. - /// - /// - /// - /// The following rules apply to the generated URL: - /// - ///
    • - /// - /// It contains a temporary bearer token. It is valid for 5 minutes after it is generated. - /// Once redeemed within this period, it cannot be re-used again. - /// - ///
    • - /// - /// The URL validity period should not be confused with the actual session lifetime that - /// can be customized using the SessionLifetimeInMinutes - /// parameter. - /// - /// - /// - /// The resulting user session is valid for 15 minutes (minimum) to 10 hours (maximum). - /// The default session duration is 10 hours. - /// - ///
    • - /// - /// You are charged only when the URL is used or there is interaction with Amazon QuickSight. - /// - ///
    - /// - /// For more information, see Embedded - /// Analytics in the Amazon QuickSight User Guide. - /// - /// - /// - /// For more information about the high-level steps for embedding and for an interactive - /// demo of the ways you can customize embedding, visit the Amazon - /// QuickSight Developer Portal. - /// + /// Deletes a topic refresh schedule. ///     - /// Container for the necessary parameters to execute the GenerateEmbedUrlForRegisteredUser service method. + /// Container for the necessary parameters to execute the DescribeTopicRefreshSchedule service method. /// /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// /// - /// The response from the GenerateEmbedUrlForRegisteredUser service method, as returned by QuickSight. + /// The response from the DescribeTopicRefreshSchedule service method, as returned by QuickSight. /// /// You don't have access to this item. The provided credentials couldn't be validated. /// You might not be authorized to carry out the request. Make sure that your account /// is authorized to use the Amazon QuickSight service, that your policies have the correct /// permissions, and that you are using the correct credentials. /// + /// + /// Updating or deleting a resource can cause an inconsistent state. + /// /// /// An internal failure occurred. /// /// /// One or more parameters has a value that isn't valid. /// - /// - /// The user with the provided name isn't found. This error can happen in any operation - /// that requires finding a user based on a provided user name, such as DeleteUser, - /// DescribeUser, and so on. + /// + /// A limit is exceeded. + /// + /// + /// The resource specified already exists. /// /// /// One or more resources can't be found. /// - /// - /// The number of minutes specified for the lifetime of a session isn't valid. The session - /// lifetime must be 15-600 minutes. - /// /// /// Access is throttled. /// - /// - /// This error indicates that you are calling an embedding operation in Amazon QuickSight - /// without the required pricing plan on your Amazon Web Services account. Before you - /// can use embedding for anonymous users, a QuickSight administrator needs to add capacity - /// pricing to Amazon QuickSight. You can do this on the Manage Amazon QuickSight - /// page. - /// - /// - /// - /// After capacity pricing is added, you can use the GetDashboardEmbedUrl - /// API operation with the --identity-type ANONYMOUS option. - /// - /// - /// - /// This error indicates that you are calling an operation on an Amazon QuickSight subscription - /// where the edition doesn't include support for that operation. Amazon Amazon QuickSight - /// currently has Standard Edition and Enterprise Edition. Not every operation and capability - /// is available in every edition. - /// - /// REST API Reference for GenerateEmbedUrlForRegisteredUser Operation - public virtual Task GenerateEmbedUrlForRegisteredUserAsync(GenerateEmbedUrlForRegisteredUserRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + /// REST API Reference for DescribeTopicRefreshSchedule Operation + public virtual Task DescribeTopicRefreshScheduleAsync(DescribeTopicRefreshScheduleRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { var options = new InvokeOptions(); - options.RequestMarshaller = GenerateEmbedUrlForRegisteredUserRequestMarshaller.Instance; - options.ResponseUnmarshaller = GenerateEmbedUrlForRegisteredUserResponseUnmarshaller.Instance; + options.RequestMarshaller = DescribeTopicRefreshScheduleRequestMarshaller.Instance; + options.ResponseUnmarshaller = DescribeTopicRefreshScheduleResponseUnmarshaller.Instance; - return InvokeAsync(request, options, cancellationToken); + return InvokeAsync(request, options, cancellationToken); } #endregion - #region GetDashboardEmbedUrl + #region DescribeUser /// - /// Generates a temporary session URL and authorization code(bearer token) that you can - /// use to embed an Amazon QuickSight read-only dashboard in your website or application. - /// Before you use this command, make sure that you have configured the dashboards and - /// permissions. - /// - /// - /// - /// Currently, you can use GetDashboardEmbedURL only from the server, not from - /// the user's browser. The following rules apply to the generated URL: - /// - ///
    • - /// - /// They must be used together. - /// - ///
    • - /// - /// They can be used one time only. - /// - ///
    • - /// - /// They are valid for 5 minutes after you run this command. - /// - ///
    • - /// - /// You are charged only when the URL is used or there is interaction with Amazon QuickSight. - /// - ///
    • - /// - /// The resulting user session is valid for 15 minutes (default) up to 10 hours (maximum). - /// You can use the optional SessionLifetimeInMinutes parameter to customize session - /// duration. - /// - ///
    - /// - /// For more information, see Embedding - /// Analytics Using GetDashboardEmbedUrl in the Amazon QuickSight User Guide. - /// - /// - /// - /// For more information about the high-level steps for embedding and for an interactive - /// demo of the ways you can customize embedding, visit the Amazon - /// QuickSight Developer Portal. - /// + /// Returns information about a user, given the user name. ///     - /// Container for the necessary parameters to execute the GetDashboardEmbedUrl service method. + /// Container for the necessary parameters to execute the DescribeUser service method. /// - /// The response from the GetDashboardEmbedUrl service method, as returned by QuickSight. + /// The response from the DescribeUser service method, as returned by QuickSight. /// /// You don't have access to this item. The provided credentials couldn't be validated. /// You might not be authorized to carry out the request. Make sure that your account /// is authorized to use the Amazon QuickSight service, that your policies have the correct /// permissions, and that you are using the correct credentials. /// - /// - /// The domain specified isn't on the allow list. All domains for embedded dashboards - /// must be added to the approved list by an Amazon QuickSight admin. - /// - /// - /// The identity type specified isn't supported. Supported identity types include IAM - /// and QUICKSIGHT. - /// /// /// An internal failure occurred. /// /// /// One or more parameters has a value that isn't valid. /// - /// - /// The user with the provided name isn't found. This error can happen in any operation - /// that requires finding a user based on a provided user name, such as DeleteUser, - /// DescribeUser, and so on. - /// - /// - /// The resource specified already exists. + /// + /// One or more preconditions aren't met. /// /// /// One or more resources can't be found. /// - /// - /// The number of minutes specified for the lifetime of a session isn't valid. The session - /// lifetime must be 15-600 minutes. + /// + /// This resource is currently unavailable. /// /// /// Access is throttled. /// - /// - /// This error indicates that you are calling an embedding operation in Amazon QuickSight - /// without the required pricing plan on your Amazon Web Services account. Before you - /// can use embedding for anonymous users, a QuickSight administrator needs to add capacity - /// pricing to Amazon QuickSight. You can do this on the Manage Amazon QuickSight - /// page. - /// - /// - /// - /// After capacity pricing is added, you can use the GetDashboardEmbedUrl - /// API operation with the --identity-type ANONYMOUS option. - /// - /// - /// - /// This error indicates that you are calling an operation on an Amazon QuickSight subscription - /// where the edition doesn't include support for that operation. Amazon Amazon QuickSight - /// currently has Standard Edition and Enterprise Edition. Not every operation and capability - /// is available in every edition. - /// - /// REST API Reference for GetDashboardEmbedUrl Operation - public virtual GetDashboardEmbedUrlResponse GetDashboardEmbedUrl(GetDashboardEmbedUrlRequest request) + /// REST API Reference for DescribeUser Operation + public virtual DescribeUserResponse DescribeUser(DescribeUserRequest request) { var options = new InvokeOptions(); - options.RequestMarshaller = GetDashboardEmbedUrlRequestMarshaller.Instance; - options.ResponseUnmarshaller = GetDashboardEmbedUrlResponseUnmarshaller.Instance; + options.RequestMarshaller = DescribeUserRequestMarshaller.Instance; + options.ResponseUnmarshaller = DescribeUserResponseUnmarshaller.Instance; - return Invoke(request, options); + return Invoke(request, options); } /// - /// Generates a temporary session URL and authorization code(bearer token) that you can - /// use to embed an Amazon QuickSight read-only dashboard in your website or application. - /// Before you use this command, make sure that you have configured the dashboards and - /// permissions. - /// - /// - /// - /// Currently, you can use GetDashboardEmbedURL only from the server, not from - /// the user's browser. The following rules apply to the generated URL: - /// - ///
    • - /// - /// They must be used together. - /// - ///
    • - /// - /// They can be used one time only. - /// - ///
    • - /// - /// They are valid for 5 minutes after you run this command. - /// - ///
    • - /// - /// You are charged only when the URL is used or there is interaction with Amazon QuickSight. - /// - ///
    • - /// - /// The resulting user session is valid for 15 minutes (default) up to 10 hours (maximum). - /// You can use the optional SessionLifetimeInMinutes parameter to customize session - /// duration. - /// - ///
    - /// - /// For more information, see Embedding - /// Analytics Using GetDashboardEmbedUrl in the Amazon QuickSight User Guide. - /// - /// - /// - /// For more information about the high-level steps for embedding and for an interactive - /// demo of the ways you can customize embedding, visit the Amazon - /// QuickSight Developer Portal. - /// + /// Returns information about a user, given the user name. ///     - /// Container for the necessary parameters to execute the GetDashboardEmbedUrl service method. + /// Container for the necessary parameters to execute the DescribeUser service method. /// /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// /// - /// The response from the GetDashboardEmbedUrl service method, as returned by QuickSight. + /// The response from the DescribeUser service method, as returned by QuickSight. /// /// You don't have access to this item. The provided credentials couldn't be validated. /// You might not be authorized to carry out the request. Make sure that your account /// is authorized to use the Amazon QuickSight service, that your policies have the correct /// permissions, and that you are using the correct credentials. /// - /// - /// The domain specified isn't on the allow list. All domains for embedded dashboards - /// must be added to the approved list by an Amazon QuickSight admin. - /// - /// - /// The identity type specified isn't supported. Supported identity types include IAM - /// and QUICKSIGHT. - /// /// /// An internal failure occurred. /// /// /// One or more parameters has a value that isn't valid. /// - /// - /// The user with the provided name isn't found. This error can happen in any operation - /// that requires finding a user based on a provided user name, such as DeleteUser, - /// DescribeUser, and so on. - /// - /// - /// The resource specified already exists. + /// + /// One or more preconditions aren't met. /// /// /// One or more resources can't be found. /// - /// - /// The number of minutes specified for the lifetime of a session isn't valid. The session - /// lifetime must be 15-600 minutes. + /// + /// This resource is currently unavailable. /// /// /// Access is throttled. /// - /// - /// This error indicates that you are calling an embedding operation in Amazon QuickSight - /// without the required pricing plan on your Amazon Web Services account. Before you - /// can use embedding for anonymous users, a QuickSight administrator needs to add capacity - /// pricing to Amazon QuickSight. You can do this on the Manage Amazon QuickSight - /// page. - /// - /// - /// - /// After capacity pricing is added, you can use the GetDashboardEmbedUrl - /// API operation with the --identity-type ANONYMOUS option. - /// - /// - /// - /// This error indicates that you are calling an operation on an Amazon QuickSight subscription - /// where the edition doesn't include support for that operation. Amazon Amazon QuickSight - /// currently has Standard Edition and Enterprise Edition. Not every operation and capability - /// is available in every edition. - /// - /// REST API Reference for GetDashboardEmbedUrl Operation - public virtual Task GetDashboardEmbedUrlAsync(GetDashboardEmbedUrlRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + /// REST API Reference for DescribeUser Operation + public virtual Task DescribeUserAsync(DescribeUserRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { var options = new InvokeOptions(); - options.RequestMarshaller = GetDashboardEmbedUrlRequestMarshaller.Instance; - options.ResponseUnmarshaller = GetDashboardEmbedUrlResponseUnmarshaller.Instance; + options.RequestMarshaller = DescribeUserRequestMarshaller.Instance; + options.ResponseUnmarshaller = DescribeUserResponseUnmarshaller.Instance; - return InvokeAsync(request, options, cancellationToken); + return InvokeAsync(request, options, cancellationToken); } #endregion - #region GetSessionEmbedUrl + #region DescribeVPCConnection /// - /// Generates a session URL and authorization code that you can use to embed the Amazon - /// Amazon QuickSight console in your web server code. Use GetSessionEmbedUrl where - /// you want to provide an authoring portal that allows users to create data sources, - /// datasets, analyses, and dashboards. The users who access an embedded Amazon QuickSight - /// console need belong to the author or admin security cohort. If you want to restrict - /// permissions to some of these features, add a custom permissions profile to the user - /// with the UpdateUser - /// API operation. Use RegisterUser - /// API operation to add a new user with a custom permission profile attached. For - /// more information, see the following sections in the Amazon QuickSight User Guide: - /// - /// + /// Describes a VPC connection. /// - /// Container for the necessary parameters to execute the GetSessionEmbedUrl service method. + /// Container for the necessary parameters to execute the DescribeVPCConnection service method. /// - /// The response from the GetSessionEmbedUrl service method, as returned by QuickSight. + /// The response from the DescribeVPCConnection service method, as returned by QuickSight. /// /// You don't have access to this item. The provided credentials couldn't be validated. /// You might not be authorized to carry out the request. Make sure that your account @@ -9975,21 +10126,9 @@ public virtual GetDashboardEmbedUrlResponse GetDashboardEmbedUrl(GetDashboardEmb /// /// One or more parameters has a value that isn't valid. /// - /// - /// The user with the provided name isn't found. This error can happen in any operation - /// that requires finding a user based on a provided user name, such as DeleteUser, - /// DescribeUser, and so on. - /// - /// - /// The resource specified already exists. - /// /// /// One or more resources can't be found. /// - /// - /// The number of minutes specified for the lifetime of a session isn't valid. The session - /// lifetime must be 15-600 minutes. - /// /// /// Access is throttled. /// @@ -9999,47 +10138,26 @@ public virtual GetDashboardEmbedUrlResponse GetDashboardEmbedUrl(GetDashboardEmb /// currently has Standard Edition and Enterprise Edition. Not every operation and capability /// is available in every edition. /// - /// REST API Reference for GetSessionEmbedUrl Operation - public virtual GetSessionEmbedUrlResponse GetSessionEmbedUrl(GetSessionEmbedUrlRequest request) + /// REST API Reference for DescribeVPCConnection Operation + public virtual DescribeVPCConnectionResponse DescribeVPCConnection(DescribeVPCConnectionRequest request) { var options = new InvokeOptions(); - options.RequestMarshaller = GetSessionEmbedUrlRequestMarshaller.Instance; - options.ResponseUnmarshaller = GetSessionEmbedUrlResponseUnmarshaller.Instance; + options.RequestMarshaller = DescribeVPCConnectionRequestMarshaller.Instance; + options.ResponseUnmarshaller = DescribeVPCConnectionResponseUnmarshaller.Instance; - return Invoke(request, options); + return Invoke(request, options); } /// - /// Generates a session URL and authorization code that you can use to embed the Amazon - /// Amazon QuickSight console in your web server code. Use GetSessionEmbedUrl where - /// you want to provide an authoring portal that allows users to create data sources, - /// datasets, analyses, and dashboards. The users who access an embedded Amazon QuickSight - /// console need belong to the author or admin security cohort. If you want to restrict - /// permissions to some of these features, add a custom permissions profile to the user - /// with the UpdateUser - /// API operation. Use RegisterUser - /// API operation to add a new user with a custom permission profile attached. For - /// more information, see the following sections in the Amazon QuickSight User Guide: - /// - /// + /// Describes a VPC connection. /// - /// Container for the necessary parameters to execute the GetSessionEmbedUrl service method. + /// Container for the necessary parameters to execute the DescribeVPCConnection service method. /// /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// /// - /// The response from the GetSessionEmbedUrl service method, as returned by QuickSight. + /// The response from the DescribeVPCConnection service method, as returned by QuickSight. /// /// You don't have access to this item. The provided credentials couldn't be validated. /// You might not be authorized to carry out the request. Make sure that your account @@ -10052,21 +10170,9 @@ public virtual GetSessionEmbedUrlResponse GetSessionEmbedUrl(GetSessionEmbedUrlR /// /// One or more parameters has a value that isn't valid. /// - /// - /// The user with the provided name isn't found. This error can happen in any operation - /// that requires finding a user based on a provided user name, such as DeleteUser, - /// DescribeUser, and so on. - /// - /// - /// The resource specified already exists. - /// /// /// One or more resources can't be found. /// - /// - /// The number of minutes specified for the lifetime of a session isn't valid. The session - /// lifetime must be 15-600 minutes. - /// /// /// Access is throttled. /// @@ -10076,436 +10182,689 @@ public virtual GetSessionEmbedUrlResponse GetSessionEmbedUrl(GetSessionEmbedUrlR /// currently has Standard Edition and Enterprise Edition. Not every operation and capability /// is available in every edition. /// - /// REST API Reference for GetSessionEmbedUrl Operation - public virtual Task GetSessionEmbedUrlAsync(GetSessionEmbedUrlRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + /// REST API Reference for DescribeVPCConnection Operation + public virtual Task DescribeVPCConnectionAsync(DescribeVPCConnectionRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { var options = new InvokeOptions(); - options.RequestMarshaller = GetSessionEmbedUrlRequestMarshaller.Instance; - options.ResponseUnmarshaller = GetSessionEmbedUrlResponseUnmarshaller.Instance; + options.RequestMarshaller = DescribeVPCConnectionRequestMarshaller.Instance; + options.ResponseUnmarshaller = DescribeVPCConnectionResponseUnmarshaller.Instance; - return InvokeAsync(request, options, cancellationToken); + return InvokeAsync(request, options, cancellationToken); } #endregion - #region ListAnalyses + #region GenerateEmbedUrlForAnonymousUser /// - /// Lists Amazon QuickSight analyses that exist in the specified Amazon Web Services account. - /// - /// Container for the necessary parameters to execute the ListAnalyses service method. + /// Generates an embed URL that you can use to embed an Amazon QuickSight dashboard or + /// visual in your website, without having to register any reader users. Before you use + /// this action, make sure that you have configured the dashboards and permissions. /// - /// The response from the ListAnalyses service method, as returned by QuickSight. - /// - /// An internal failure occurred. - /// - /// - /// The NextToken value isn't valid. - /// - /// - /// Access is throttled. - /// - /// - /// This error indicates that you are calling an operation on an Amazon QuickSight subscription - /// where the edition doesn't include support for that operation. Amazon Amazon QuickSight - /// currently has Standard Edition and Enterprise Edition. Not every operation and capability - /// is available in every edition. - /// - /// REST API Reference for ListAnalyses Operation - public virtual ListAnalysesResponse ListAnalyses(ListAnalysesRequest request) - { - var options = new InvokeOptions(); - options.RequestMarshaller = ListAnalysesRequestMarshaller.Instance; - options.ResponseUnmarshaller = ListAnalysesResponseUnmarshaller.Instance; - - return Invoke(request, options); - } - - - /// - /// Lists Amazon QuickSight analyses that exist in the specified Amazon Web Services account. - /// - /// Container for the necessary parameters to execute the ListAnalyses service method. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// - /// - /// The response from the ListAnalyses service method, as returned by QuickSight. - /// - /// An internal failure occurred. - /// - /// - /// The NextToken value isn't valid. - /// - /// - /// Access is throttled. - /// - /// - /// This error indicates that you are calling an operation on an Amazon QuickSight subscription - /// where the edition doesn't include support for that operation. Amazon Amazon QuickSight - /// currently has Standard Edition and Enterprise Edition. Not every operation and capability - /// is available in every edition. - /// - /// REST API Reference for ListAnalyses Operation - public virtual Task ListAnalysesAsync(ListAnalysesRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) - { - var options = new InvokeOptions(); - options.RequestMarshaller = ListAnalysesRequestMarshaller.Instance; - options.ResponseUnmarshaller = ListAnalysesResponseUnmarshaller.Instance; - - return InvokeAsync(request, options, cancellationToken); - } - - #endregion - - #region ListAssetBundleExportJobs - - - /// - /// Lists all asset bundle export jobs that have been taken place in the last 14 days. - /// Jobs created more than 14 days ago are deleted forever and are not returned. If you - /// are using the same job ID for multiple jobs, ListAssetBundleExportJobs only - /// returns the most recent job that uses the repeated job ID. + /// + /// + /// The following rules apply to the generated URL: + /// + ///
    • + /// + /// It contains a temporary bearer token. It is valid for 5 minutes after it is generated. + /// Once redeemed within this period, it cannot be re-used again. + /// + ///
    • + /// + /// The URL validity period should not be confused with the actual session lifetime that + /// can be customized using the SessionLifetimeInMinutes + /// parameter. The resulting user session is valid for 15 minutes (minimum) to 10 + /// hours (maximum). The default session duration is 10 hours. + /// + ///
    • + /// + /// You are charged only when the URL is used or there is interaction with Amazon QuickSight. + /// + ///
    + /// + /// For more information, see Embedded + /// Analytics in the Amazon QuickSight User Guide. + /// + /// + /// + /// For more information about the high-level steps for embedding and for an interactive + /// demo of the ways you can customize embedding, visit the Amazon + /// QuickSight Developer Portal. + /// ///     - /// Container for the necessary parameters to execute the ListAssetBundleExportJobs service method. + /// Container for the necessary parameters to execute the GenerateEmbedUrlForAnonymousUser service method. /// - /// The response from the ListAssetBundleExportJobs service method, as returned by QuickSight. + /// The response from the GenerateEmbedUrlForAnonymousUser service method, as returned by QuickSight. /// /// You don't have access to this item. The provided credentials couldn't be validated. /// You might not be authorized to carry out the request. Make sure that your account /// is authorized to use the Amazon QuickSight service, that your policies have the correct /// permissions, and that you are using the correct credentials. /// - /// - /// The NextToken value isn't valid. + /// + /// An internal failure occurred. + /// + /// + /// One or more parameters has a value that isn't valid. /// /// /// One or more resources can't be found. /// + /// + /// The number of minutes specified for the lifetime of a session isn't valid. The session + /// lifetime must be 15-600 minutes. + /// /// /// Access is throttled. /// + /// + /// This error indicates that you are calling an embedding operation in Amazon QuickSight + /// without the required pricing plan on your Amazon Web Services account. Before you + /// can use embedding for anonymous users, a QuickSight administrator needs to add capacity + /// pricing to Amazon QuickSight. You can do this on the Manage Amazon QuickSight + /// page. + /// + /// + /// + /// After capacity pricing is added, you can use the GetDashboardEmbedUrl + /// API operation with the --identity-type ANONYMOUS option. + /// + /// /// /// This error indicates that you are calling an operation on an Amazon QuickSight subscription /// where the edition doesn't include support for that operation. Amazon Amazon QuickSight /// currently has Standard Edition and Enterprise Edition. Not every operation and capability /// is available in every edition. /// - /// REST API Reference for ListAssetBundleExportJobs Operation - public virtual ListAssetBundleExportJobsResponse ListAssetBundleExportJobs(ListAssetBundleExportJobsRequest request) + /// REST API Reference for GenerateEmbedUrlForAnonymousUser Operation + public virtual GenerateEmbedUrlForAnonymousUserResponse GenerateEmbedUrlForAnonymousUser(GenerateEmbedUrlForAnonymousUserRequest request) { var options = new InvokeOptions(); - options.RequestMarshaller = ListAssetBundleExportJobsRequestMarshaller.Instance; - options.ResponseUnmarshaller = ListAssetBundleExportJobsResponseUnmarshaller.Instance; + options.RequestMarshaller = GenerateEmbedUrlForAnonymousUserRequestMarshaller.Instance; + options.ResponseUnmarshaller = GenerateEmbedUrlForAnonymousUserResponseUnmarshaller.Instance; - return Invoke(request, options); + return Invoke(request, options); } /// - /// Lists all asset bundle export jobs that have been taken place in the last 14 days. - /// Jobs created more than 14 days ago are deleted forever and are not returned. If you - /// are using the same job ID for multiple jobs, ListAssetBundleExportJobs only - /// returns the most recent job that uses the repeated job ID. + /// Generates an embed URL that you can use to embed an Amazon QuickSight dashboard or + /// visual in your website, without having to register any reader users. Before you use + /// this action, make sure that you have configured the dashboards and permissions. + /// + /// + /// + /// The following rules apply to the generated URL: + /// + ///
    • + /// + /// It contains a temporary bearer token. It is valid for 5 minutes after it is generated. + /// Once redeemed within this period, it cannot be re-used again. + /// + ///
    • + /// + /// The URL validity period should not be confused with the actual session lifetime that + /// can be customized using the SessionLifetimeInMinutes + /// parameter. The resulting user session is valid for 15 minutes (minimum) to 10 + /// hours (maximum). The default session duration is 10 hours. + /// + ///
    • + /// + /// You are charged only when the URL is used or there is interaction with Amazon QuickSight. + /// + ///
    + /// + /// For more information, see Embedded + /// Analytics in the Amazon QuickSight User Guide. + /// + /// + /// + /// For more information about the high-level steps for embedding and for an interactive + /// demo of the ways you can customize embedding, visit the Amazon + /// QuickSight Developer Portal. + /// ///     - /// Container for the necessary parameters to execute the ListAssetBundleExportJobs service method. + /// Container for the necessary parameters to execute the GenerateEmbedUrlForAnonymousUser service method. /// /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// /// - /// The response from the ListAssetBundleExportJobs service method, as returned by QuickSight. + /// The response from the GenerateEmbedUrlForAnonymousUser service method, as returned by QuickSight. /// /// You don't have access to this item. The provided credentials couldn't be validated. /// You might not be authorized to carry out the request. Make sure that your account /// is authorized to use the Amazon QuickSight service, that your policies have the correct /// permissions, and that you are using the correct credentials. /// - /// - /// The NextToken value isn't valid. + /// + /// An internal failure occurred. + /// + /// + /// One or more parameters has a value that isn't valid. /// /// /// One or more resources can't be found. /// + /// + /// The number of minutes specified for the lifetime of a session isn't valid. The session + /// lifetime must be 15-600 minutes. + /// /// /// Access is throttled. /// + /// + /// This error indicates that you are calling an embedding operation in Amazon QuickSight + /// without the required pricing plan on your Amazon Web Services account. Before you + /// can use embedding for anonymous users, a QuickSight administrator needs to add capacity + /// pricing to Amazon QuickSight. You can do this on the Manage Amazon QuickSight + /// page. + /// + /// + /// + /// After capacity pricing is added, you can use the GetDashboardEmbedUrl + /// API operation with the --identity-type ANONYMOUS option. + /// + /// /// /// This error indicates that you are calling an operation on an Amazon QuickSight subscription /// where the edition doesn't include support for that operation. Amazon Amazon QuickSight /// currently has Standard Edition and Enterprise Edition. Not every operation and capability /// is available in every edition. /// - /// REST API Reference for ListAssetBundleExportJobs Operation - public virtual Task ListAssetBundleExportJobsAsync(ListAssetBundleExportJobsRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + /// REST API Reference for GenerateEmbedUrlForAnonymousUser Operation + public virtual Task GenerateEmbedUrlForAnonymousUserAsync(GenerateEmbedUrlForAnonymousUserRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { var options = new InvokeOptions(); - options.RequestMarshaller = ListAssetBundleExportJobsRequestMarshaller.Instance; - options.ResponseUnmarshaller = ListAssetBundleExportJobsResponseUnmarshaller.Instance; + options.RequestMarshaller = GenerateEmbedUrlForAnonymousUserRequestMarshaller.Instance; + options.ResponseUnmarshaller = GenerateEmbedUrlForAnonymousUserResponseUnmarshaller.Instance; - return InvokeAsync(request, options, cancellationToken); + return InvokeAsync(request, options, cancellationToken); } #endregion - #region ListAssetBundleImportJobs + #region GenerateEmbedUrlForRegisteredUser /// - /// Lists all asset bundle import jobs that have taken place in the last 14 days. Jobs - /// created more than 14 days ago are deleted forever and are not returned. If you are - /// using the same job ID for multiple jobs, ListAssetBundleImportJobs only returns - /// the most recent job that uses the repeated job ID. + /// Generates an embed URL that you can use to embed an Amazon QuickSight experience in + /// your website. This action can be used for any type of user registered in an Amazon + /// QuickSight account. Before you use this action, make sure that you have configured + /// the relevant Amazon QuickSight resource and permissions. + /// + /// + /// + /// The following rules apply to the generated URL: + /// + ///
    • + /// + /// It contains a temporary bearer token. It is valid for 5 minutes after it is generated. + /// Once redeemed within this period, it cannot be re-used again. + /// + ///
    • + /// + /// The URL validity period should not be confused with the actual session lifetime that + /// can be customized using the SessionLifetimeInMinutes + /// parameter. + /// + /// + /// + /// The resulting user session is valid for 15 minutes (minimum) to 10 hours (maximum). + /// The default session duration is 10 hours. + /// + ///
    • + /// + /// You are charged only when the URL is used or there is interaction with Amazon QuickSight. + /// + ///
    + /// + /// For more information, see Embedded + /// Analytics in the Amazon QuickSight User Guide. + /// + /// + /// + /// For more information about the high-level steps for embedding and for an interactive + /// demo of the ways you can customize embedding, visit the Amazon + /// QuickSight Developer Portal. + /// ///     - /// Container for the necessary parameters to execute the ListAssetBundleImportJobs service method. + /// Container for the necessary parameters to execute the GenerateEmbedUrlForRegisteredUser service method. /// - /// The response from the ListAssetBundleImportJobs service method, as returned by QuickSight. + /// The response from the GenerateEmbedUrlForRegisteredUser service method, as returned by QuickSight. /// /// You don't have access to this item. The provided credentials couldn't be validated. /// You might not be authorized to carry out the request. Make sure that your account /// is authorized to use the Amazon QuickSight service, that your policies have the correct /// permissions, and that you are using the correct credentials. /// - /// - /// The NextToken value isn't valid. + /// + /// An internal failure occurred. + /// + /// + /// One or more parameters has a value that isn't valid. + /// + /// + /// The user with the provided name isn't found. This error can happen in any operation + /// that requires finding a user based on a provided user name, such as DeleteUser, + /// DescribeUser, and so on. /// /// /// One or more resources can't be found. /// - /// + /// + /// The number of minutes specified for the lifetime of a session isn't valid. The session + /// lifetime must be 15-600 minutes. + /// + /// /// Access is throttled. /// + /// + /// This error indicates that you are calling an embedding operation in Amazon QuickSight + /// without the required pricing plan on your Amazon Web Services account. Before you + /// can use embedding for anonymous users, a QuickSight administrator needs to add capacity + /// pricing to Amazon QuickSight. You can do this on the Manage Amazon QuickSight + /// page. + /// + /// + /// + /// After capacity pricing is added, you can use the GetDashboardEmbedUrl + /// API operation with the --identity-type ANONYMOUS option. + /// + /// /// /// This error indicates that you are calling an operation on an Amazon QuickSight subscription /// where the edition doesn't include support for that operation. Amazon Amazon QuickSight /// currently has Standard Edition and Enterprise Edition. Not every operation and capability /// is available in every edition. /// - /// REST API Reference for ListAssetBundleImportJobs Operation - public virtual ListAssetBundleImportJobsResponse ListAssetBundleImportJobs(ListAssetBundleImportJobsRequest request) + /// REST API Reference for GenerateEmbedUrlForRegisteredUser Operation + public virtual GenerateEmbedUrlForRegisteredUserResponse GenerateEmbedUrlForRegisteredUser(GenerateEmbedUrlForRegisteredUserRequest request) { var options = new InvokeOptions(); - options.RequestMarshaller = ListAssetBundleImportJobsRequestMarshaller.Instance; - options.ResponseUnmarshaller = ListAssetBundleImportJobsResponseUnmarshaller.Instance; + options.RequestMarshaller = GenerateEmbedUrlForRegisteredUserRequestMarshaller.Instance; + options.ResponseUnmarshaller = GenerateEmbedUrlForRegisteredUserResponseUnmarshaller.Instance; - return Invoke(request, options); + return Invoke(request, options); } /// - /// Lists all asset bundle import jobs that have taken place in the last 14 days. Jobs - /// created more than 14 days ago are deleted forever and are not returned. If you are - /// using the same job ID for multiple jobs, ListAssetBundleImportJobs only returns - /// the most recent job that uses the repeated job ID. + /// Generates an embed URL that you can use to embed an Amazon QuickSight experience in + /// your website. This action can be used for any type of user registered in an Amazon + /// QuickSight account. Before you use this action, make sure that you have configured + /// the relevant Amazon QuickSight resource and permissions. + /// + /// + /// + /// The following rules apply to the generated URL: + /// + ///
    • + /// + /// It contains a temporary bearer token. It is valid for 5 minutes after it is generated. + /// Once redeemed within this period, it cannot be re-used again. + /// + ///
    • + /// + /// The URL validity period should not be confused with the actual session lifetime that + /// can be customized using the SessionLifetimeInMinutes + /// parameter. + /// + /// + /// + /// The resulting user session is valid for 15 minutes (minimum) to 10 hours (maximum). + /// The default session duration is 10 hours. + /// + ///
    • + /// + /// You are charged only when the URL is used or there is interaction with Amazon QuickSight. + /// + ///
    + /// + /// For more information, see Embedded + /// Analytics in the Amazon QuickSight User Guide. + /// + /// + /// + /// For more information about the high-level steps for embedding and for an interactive + /// demo of the ways you can customize embedding, visit the Amazon + /// QuickSight Developer Portal. + /// ///     - /// Container for the necessary parameters to execute the ListAssetBundleImportJobs service method. + /// Container for the necessary parameters to execute the GenerateEmbedUrlForRegisteredUser service method. /// /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// /// - /// The response from the ListAssetBundleImportJobs service method, as returned by QuickSight. + /// The response from the GenerateEmbedUrlForRegisteredUser service method, as returned by QuickSight. /// /// You don't have access to this item. The provided credentials couldn't be validated. /// You might not be authorized to carry out the request. Make sure that your account /// is authorized to use the Amazon QuickSight service, that your policies have the correct /// permissions, and that you are using the correct credentials. /// - /// - /// The NextToken value isn't valid. + /// + /// An internal failure occurred. + /// + /// + /// One or more parameters has a value that isn't valid. + /// + /// + /// The user with the provided name isn't found. This error can happen in any operation + /// that requires finding a user based on a provided user name, such as DeleteUser, + /// DescribeUser, and so on. /// /// /// One or more resources can't be found. /// + /// + /// The number of minutes specified for the lifetime of a session isn't valid. The session + /// lifetime must be 15-600 minutes. + /// /// /// Access is throttled. /// + /// + /// This error indicates that you are calling an embedding operation in Amazon QuickSight + /// without the required pricing plan on your Amazon Web Services account. Before you + /// can use embedding for anonymous users, a QuickSight administrator needs to add capacity + /// pricing to Amazon QuickSight. You can do this on the Manage Amazon QuickSight + /// page. + /// + /// + /// + /// After capacity pricing is added, you can use the GetDashboardEmbedUrl + /// API operation with the --identity-type ANONYMOUS option. + /// + /// /// /// This error indicates that you are calling an operation on an Amazon QuickSight subscription /// where the edition doesn't include support for that operation. Amazon Amazon QuickSight /// currently has Standard Edition and Enterprise Edition. Not every operation and capability /// is available in every edition. /// - /// REST API Reference for ListAssetBundleImportJobs Operation - public virtual Task ListAssetBundleImportJobsAsync(ListAssetBundleImportJobsRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + /// REST API Reference for GenerateEmbedUrlForRegisteredUser Operation + public virtual Task GenerateEmbedUrlForRegisteredUserAsync(GenerateEmbedUrlForRegisteredUserRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { var options = new InvokeOptions(); - options.RequestMarshaller = ListAssetBundleImportJobsRequestMarshaller.Instance; - options.ResponseUnmarshaller = ListAssetBundleImportJobsResponseUnmarshaller.Instance; + options.RequestMarshaller = GenerateEmbedUrlForRegisteredUserRequestMarshaller.Instance; + options.ResponseUnmarshaller = GenerateEmbedUrlForRegisteredUserResponseUnmarshaller.Instance; - return InvokeAsync(request, options, cancellationToken); + return InvokeAsync(request, options, cancellationToken); } #endregion - #region ListDashboards + #region GetDashboardEmbedUrl /// - /// Lists dashboards in an Amazon Web Services account. + /// Generates a temporary session URL and authorization code(bearer token) that you can + /// use to embed an Amazon QuickSight read-only dashboard in your website or application. + /// Before you use this command, make sure that you have configured the dashboards and + /// permissions. + /// + /// + /// + /// Currently, you can use GetDashboardEmbedURL only from the server, not from + /// the user's browser. The following rules apply to the generated URL: + /// + ///
    • + /// + /// They must be used together. + /// + ///
    • + /// + /// They can be used one time only. + /// + ///
    • + /// + /// They are valid for 5 minutes after you run this command. + /// + ///
    • + /// + /// You are charged only when the URL is used or there is interaction with Amazon QuickSight. + /// + ///
    • + /// + /// The resulting user session is valid for 15 minutes (default) up to 10 hours (maximum). + /// You can use the optional SessionLifetimeInMinutes parameter to customize session + /// duration. + /// + ///
    + /// + /// For more information, see Embedding + /// Analytics Using GetDashboardEmbedUrl in the Amazon QuickSight User Guide. + /// + /// + /// + /// For more information about the high-level steps for embedding and for an interactive + /// demo of the ways you can customize embedding, visit the Amazon + /// QuickSight Developer Portal. + /// ///     - /// Container for the necessary parameters to execute the ListDashboards service method. + /// Container for the necessary parameters to execute the GetDashboardEmbedUrl service method. /// - /// The response from the ListDashboards service method, as returned by QuickSight. + /// The response from the GetDashboardEmbedUrl service method, as returned by QuickSight. + /// + /// You don't have access to this item. The provided credentials couldn't be validated. + /// You might not be authorized to carry out the request. Make sure that your account + /// is authorized to use the Amazon QuickSight service, that your policies have the correct + /// permissions, and that you are using the correct credentials. + /// + /// + /// The domain specified isn't on the allow list. All domains for embedded dashboards + /// must be added to the approved list by an Amazon QuickSight admin. + /// + /// + /// The identity type specified isn't supported. Supported identity types include IAM + /// and QUICKSIGHT. + /// /// /// An internal failure occurred. /// - /// - /// The NextToken value isn't valid. + /// + /// One or more parameters has a value that isn't valid. /// - /// - /// Access is throttled. + /// + /// The user with the provided name isn't found. This error can happen in any operation + /// that requires finding a user based on a provided user name, such as DeleteUser, + /// DescribeUser, and so on. /// - /// - /// This error indicates that you are calling an operation on an Amazon QuickSight subscription - /// where the edition doesn't include support for that operation. Amazon Amazon QuickSight - /// currently has Standard Edition and Enterprise Edition. Not every operation and capability - /// is available in every edition. + /// + /// The resource specified already exists. /// - /// REST API Reference for ListDashboards Operation - public virtual ListDashboardsResponse ListDashboards(ListDashboardsRequest request) - { - var options = new InvokeOptions(); - options.RequestMarshaller = ListDashboardsRequestMarshaller.Instance; - options.ResponseUnmarshaller = ListDashboardsResponseUnmarshaller.Instance; - - return Invoke(request, options); - } - - - /// - /// Lists dashboards in an Amazon Web Services account. - /// - /// Container for the necessary parameters to execute the ListDashboards service method. - /// - /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. - /// - /// - /// The response from the ListDashboards service method, as returned by QuickSight. - /// - /// An internal failure occurred. + /// + /// One or more resources can't be found. /// - /// - /// The NextToken value isn't valid. + /// + /// The number of minutes specified for the lifetime of a session isn't valid. The session + /// lifetime must be 15-600 minutes. /// /// /// Access is throttled. /// + /// + /// This error indicates that you are calling an embedding operation in Amazon QuickSight + /// without the required pricing plan on your Amazon Web Services account. Before you + /// can use embedding for anonymous users, a QuickSight administrator needs to add capacity + /// pricing to Amazon QuickSight. You can do this on the Manage Amazon QuickSight + /// page. + /// + /// + /// + /// After capacity pricing is added, you can use the GetDashboardEmbedUrl + /// API operation with the --identity-type ANONYMOUS option. + /// + /// /// /// This error indicates that you are calling an operation on an Amazon QuickSight subscription /// where the edition doesn't include support for that operation. Amazon Amazon QuickSight /// currently has Standard Edition and Enterprise Edition. Not every operation and capability /// is available in every edition. /// - /// REST API Reference for ListDashboards Operation - public virtual Task ListDashboardsAsync(ListDashboardsRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + /// REST API Reference for GetDashboardEmbedUrl Operation + public virtual GetDashboardEmbedUrlResponse GetDashboardEmbedUrl(GetDashboardEmbedUrlRequest request) { var options = new InvokeOptions(); - options.RequestMarshaller = ListDashboardsRequestMarshaller.Instance; - options.ResponseUnmarshaller = ListDashboardsResponseUnmarshaller.Instance; - - return InvokeAsync(request, options, cancellationToken); - } + options.RequestMarshaller = GetDashboardEmbedUrlRequestMarshaller.Instance; + options.ResponseUnmarshaller = GetDashboardEmbedUrlResponseUnmarshaller.Instance; - #endregion - - #region ListDashboardVersions + return Invoke(request, options); + } /// - /// Lists all the versions of the dashboards in the Amazon QuickSight subscription. - /// - /// Container for the necessary parameters to execute the ListDashboardVersions service method. + /// Generates a temporary session URL and authorization code(bearer token) that you can + /// use to embed an Amazon QuickSight read-only dashboard in your website or application. + /// Before you use this command, make sure that you have configured the dashboards and + /// permissions. /// - /// The response from the ListDashboardVersions service method, as returned by QuickSight. - /// - /// An internal failure occurred. - /// - /// - /// The NextToken value isn't valid. - /// - /// - /// One or more parameters has a value that isn't valid. - /// - /// - /// One or more resources can't be found. - /// - /// - /// Access is throttled. - /// - /// - /// This error indicates that you are calling an operation on an Amazon QuickSight subscription - /// where the edition doesn't include support for that operation. Amazon Amazon QuickSight - /// currently has Standard Edition and Enterprise Edition. Not every operation and capability - /// is available in every edition. - /// - /// REST API Reference for ListDashboardVersions Operation - public virtual ListDashboardVersionsResponse ListDashboardVersions(ListDashboardVersionsRequest request) - { - var options = new InvokeOptions(); - options.RequestMarshaller = ListDashboardVersionsRequestMarshaller.Instance; - options.ResponseUnmarshaller = ListDashboardVersionsResponseUnmarshaller.Instance; - - return Invoke(request, options); - } - - - /// - /// Lists all the versions of the dashboards in the Amazon QuickSight subscription. + /// + /// + /// Currently, you can use GetDashboardEmbedURL only from the server, not from + /// the user's browser. The following rules apply to the generated URL: + /// + ///
    • + /// + /// They must be used together. + /// + ///
    • + /// + /// They can be used one time only. + /// + ///
    • + /// + /// They are valid for 5 minutes after you run this command. + /// + ///
    • + /// + /// You are charged only when the URL is used or there is interaction with Amazon QuickSight. + /// + ///
    • + /// + /// The resulting user session is valid for 15 minutes (default) up to 10 hours (maximum). + /// You can use the optional SessionLifetimeInMinutes parameter to customize session + /// duration. + /// + ///
    + /// + /// For more information, see Embedding + /// Analytics Using GetDashboardEmbedUrl in the Amazon QuickSight User Guide. + /// + /// + /// + /// For more information about the high-level steps for embedding and for an interactive + /// demo of the ways you can customize embedding, visit the Amazon + /// QuickSight Developer Portal. + /// ///     - /// Container for the necessary parameters to execute the ListDashboardVersions service method. + /// Container for the necessary parameters to execute the GetDashboardEmbedUrl service method. /// /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// /// - /// The response from the ListDashboardVersions service method, as returned by QuickSight. + /// The response from the GetDashboardEmbedUrl service method, as returned by QuickSight. + /// + /// You don't have access to this item. The provided credentials couldn't be validated. + /// You might not be authorized to carry out the request. Make sure that your account + /// is authorized to use the Amazon QuickSight service, that your policies have the correct + /// permissions, and that you are using the correct credentials. + /// + /// + /// The domain specified isn't on the allow list. All domains for embedded dashboards + /// must be added to the approved list by an Amazon QuickSight admin. + /// + /// + /// The identity type specified isn't supported. Supported identity types include IAM + /// and QUICKSIGHT. + /// /// /// An internal failure occurred. /// - /// - /// The NextToken value isn't valid. - /// /// /// One or more parameters has a value that isn't valid. /// + /// + /// The user with the provided name isn't found. This error can happen in any operation + /// that requires finding a user based on a provided user name, such as DeleteUser, + /// DescribeUser, and so on. + /// + /// + /// The resource specified already exists. + /// /// /// One or more resources can't be found. /// + /// + /// The number of minutes specified for the lifetime of a session isn't valid. The session + /// lifetime must be 15-600 minutes. + /// /// /// Access is throttled. /// + /// + /// This error indicates that you are calling an embedding operation in Amazon QuickSight + /// without the required pricing plan on your Amazon Web Services account. Before you + /// can use embedding for anonymous users, a QuickSight administrator needs to add capacity + /// pricing to Amazon QuickSight. You can do this on the Manage Amazon QuickSight + /// page. + /// + /// + /// + /// After capacity pricing is added, you can use the GetDashboardEmbedUrl + /// API operation with the --identity-type ANONYMOUS option. + /// + /// /// /// This error indicates that you are calling an operation on an Amazon QuickSight subscription /// where the edition doesn't include support for that operation. Amazon Amazon QuickSight /// currently has Standard Edition and Enterprise Edition. Not every operation and capability /// is available in every edition. /// - /// REST API Reference for ListDashboardVersions Operation - public virtual Task ListDashboardVersionsAsync(ListDashboardVersionsRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + /// REST API Reference for GetDashboardEmbedUrl Operation + public virtual Task GetDashboardEmbedUrlAsync(GetDashboardEmbedUrlRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { var options = new InvokeOptions(); - options.RequestMarshaller = ListDashboardVersionsRequestMarshaller.Instance; - options.ResponseUnmarshaller = ListDashboardVersionsResponseUnmarshaller.Instance; + options.RequestMarshaller = GetDashboardEmbedUrlRequestMarshaller.Instance; + options.ResponseUnmarshaller = GetDashboardEmbedUrlResponseUnmarshaller.Instance; - return InvokeAsync(request, options, cancellationToken); + return InvokeAsync(request, options, cancellationToken); } #endregion - #region ListDataSets + #region GetSessionEmbedUrl /// - /// Lists all of the datasets belonging to the current Amazon Web Services account in - /// an Amazon Web Services Region. + /// Generates a session URL and authorization code that you can use to embed the Amazon + /// Amazon QuickSight console in your web server code. Use GetSessionEmbedUrl where + /// you want to provide an authoring portal that allows users to create data sources, + /// datasets, analyses, and dashboards. The users who access an embedded Amazon QuickSight + /// console need belong to the author or admin security cohort. If you want to restrict + /// permissions to some of these features, add a custom permissions profile to the user + /// with the UpdateUser + /// API operation. Use RegisterUser + /// API operation to add a new user with a custom permission profile attached. For + /// more information, see the following sections in the Amazon QuickSight User Guide: /// - /// + /// /// - /// Container for the necessary parameters to execute the ListDataSets service method. + /// Container for the necessary parameters to execute the GetSessionEmbedUrl service method. /// - /// The response from the ListDataSets service method, as returned by QuickSight. + /// The response from the GetSessionEmbedUrl service method, as returned by QuickSight. /// /// You don't have access to this item. The provided credentials couldn't be validated. /// You might not be authorized to carry out the request. Make sure that your account @@ -10515,41 +10874,74 @@ public virtual ListDashboardVersionsResponse ListDashboardVersions(ListDashboard /// /// An internal failure occurred. /// - /// - /// The NextToken value isn't valid. - /// /// /// One or more parameters has a value that isn't valid. /// + /// + /// The user with the provided name isn't found. This error can happen in any operation + /// that requires finding a user based on a provided user name, such as DeleteUser, + /// DescribeUser, and so on. + /// + /// + /// The resource specified already exists. + /// + /// + /// One or more resources can't be found. + /// + /// + /// The number of minutes specified for the lifetime of a session isn't valid. The session + /// lifetime must be 15-600 minutes. + /// /// /// Access is throttled. /// - /// REST API Reference for ListDataSets Operation - public virtual ListDataSetsResponse ListDataSets(ListDataSetsRequest request) + /// + /// This error indicates that you are calling an operation on an Amazon QuickSight subscription + /// where the edition doesn't include support for that operation. Amazon Amazon QuickSight + /// currently has Standard Edition and Enterprise Edition. Not every operation and capability + /// is available in every edition. + /// + /// REST API Reference for GetSessionEmbedUrl Operation + public virtual GetSessionEmbedUrlResponse GetSessionEmbedUrl(GetSessionEmbedUrlRequest request) { var options = new InvokeOptions(); - options.RequestMarshaller = ListDataSetsRequestMarshaller.Instance; - options.ResponseUnmarshaller = ListDataSetsResponseUnmarshaller.Instance; + options.RequestMarshaller = GetSessionEmbedUrlRequestMarshaller.Instance; + options.ResponseUnmarshaller = GetSessionEmbedUrlResponseUnmarshaller.Instance; - return Invoke(request, options); + return Invoke(request, options); } /// - /// Lists all of the datasets belonging to the current Amazon Web Services account in - /// an Amazon Web Services Region. + /// Generates a session URL and authorization code that you can use to embed the Amazon + /// Amazon QuickSight console in your web server code. Use GetSessionEmbedUrl where + /// you want to provide an authoring portal that allows users to create data sources, + /// datasets, analyses, and dashboards. The users who access an embedded Amazon QuickSight + /// console need belong to the author or admin security cohort. If you want to restrict + /// permissions to some of these features, add a custom permissions profile to the user + /// with the UpdateUser + /// API operation. Use RegisterUser + /// API operation to add a new user with a custom permission profile attached. For + /// more information, see the following sections in the Amazon QuickSight User Guide: /// - /// + /// /// - /// Container for the necessary parameters to execute the ListDataSets service method. + /// Container for the necessary parameters to execute the GetSessionEmbedUrl service method. /// /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// /// - /// The response from the ListDataSets service method, as returned by QuickSight. + /// The response from the GetSessionEmbedUrl service method, as returned by QuickSight. /// /// You don't have access to this item. The provided credentials couldn't be validated. /// You might not be authorized to carry out the request. Make sure that your account @@ -10559,130 +10951,137 @@ public virtual ListDataSetsResponse ListDataSets(ListDataSetsRequest request) /// /// An internal failure occurred. /// - /// - /// The NextToken value isn't valid. - /// /// /// One or more parameters has a value that isn't valid. /// + /// + /// The user with the provided name isn't found. This error can happen in any operation + /// that requires finding a user based on a provided user name, such as DeleteUser, + /// DescribeUser, and so on. + /// + /// + /// The resource specified already exists. + /// + /// + /// One or more resources can't be found. + /// + /// + /// The number of minutes specified for the lifetime of a session isn't valid. The session + /// lifetime must be 15-600 minutes. + /// /// /// Access is throttled. /// - /// REST API Reference for ListDataSets Operation - public virtual Task ListDataSetsAsync(ListDataSetsRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + /// + /// This error indicates that you are calling an operation on an Amazon QuickSight subscription + /// where the edition doesn't include support for that operation. Amazon Amazon QuickSight + /// currently has Standard Edition and Enterprise Edition. Not every operation and capability + /// is available in every edition. + /// + /// REST API Reference for GetSessionEmbedUrl Operation + public virtual Task GetSessionEmbedUrlAsync(GetSessionEmbedUrlRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { var options = new InvokeOptions(); - options.RequestMarshaller = ListDataSetsRequestMarshaller.Instance; - options.ResponseUnmarshaller = ListDataSetsResponseUnmarshaller.Instance; + options.RequestMarshaller = GetSessionEmbedUrlRequestMarshaller.Instance; + options.ResponseUnmarshaller = GetSessionEmbedUrlResponseUnmarshaller.Instance; - return InvokeAsync(request, options, cancellationToken); + return InvokeAsync(request, options, cancellationToken); } #endregion - #region ListDataSources + #region ListAnalyses /// - /// Lists data sources in current Amazon Web Services Region that belong to this Amazon - /// Web Services account. + /// Lists Amazon QuickSight analyses that exist in the specified Amazon Web Services account. /// - /// Container for the necessary parameters to execute the ListDataSources service method. + /// Container for the necessary parameters to execute the ListAnalyses service method. /// - /// The response from the ListDataSources service method, as returned by QuickSight. - /// - /// You don't have access to this item. The provided credentials couldn't be validated. - /// You might not be authorized to carry out the request. Make sure that your account - /// is authorized to use the Amazon QuickSight service, that your policies have the correct - /// permissions, and that you are using the correct credentials. - /// + /// The response from the ListAnalyses service method, as returned by QuickSight. /// /// An internal failure occurred. /// /// /// The NextToken value isn't valid. /// - /// - /// One or more parameters has a value that isn't valid. - /// /// /// Access is throttled. /// - /// REST API Reference for ListDataSources Operation - public virtual ListDataSourcesResponse ListDataSources(ListDataSourcesRequest request) + /// + /// This error indicates that you are calling an operation on an Amazon QuickSight subscription + /// where the edition doesn't include support for that operation. Amazon Amazon QuickSight + /// currently has Standard Edition and Enterprise Edition. Not every operation and capability + /// is available in every edition. + /// + /// REST API Reference for ListAnalyses Operation + public virtual ListAnalysesResponse ListAnalyses(ListAnalysesRequest request) { var options = new InvokeOptions(); - options.RequestMarshaller = ListDataSourcesRequestMarshaller.Instance; - options.ResponseUnmarshaller = ListDataSourcesResponseUnmarshaller.Instance; + options.RequestMarshaller = ListAnalysesRequestMarshaller.Instance; + options.ResponseUnmarshaller = ListAnalysesResponseUnmarshaller.Instance; - return Invoke(request, options); + return Invoke(request, options); } /// - /// Lists data sources in current Amazon Web Services Region that belong to this Amazon - /// Web Services account. + /// Lists Amazon QuickSight analyses that exist in the specified Amazon Web Services account. /// - /// Container for the necessary parameters to execute the ListDataSources service method. + /// Container for the necessary parameters to execute the ListAnalyses service method. /// /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// /// - /// The response from the ListDataSources service method, as returned by QuickSight. - /// - /// You don't have access to this item. The provided credentials couldn't be validated. - /// You might not be authorized to carry out the request. Make sure that your account - /// is authorized to use the Amazon QuickSight service, that your policies have the correct - /// permissions, and that you are using the correct credentials. - /// + /// The response from the ListAnalyses service method, as returned by QuickSight. /// /// An internal failure occurred. /// /// /// The NextToken value isn't valid. /// - /// - /// One or more parameters has a value that isn't valid. - /// /// /// Access is throttled. /// - /// REST API Reference for ListDataSources Operation - public virtual Task ListDataSourcesAsync(ListDataSourcesRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + /// + /// This error indicates that you are calling an operation on an Amazon QuickSight subscription + /// where the edition doesn't include support for that operation. Amazon Amazon QuickSight + /// currently has Standard Edition and Enterprise Edition. Not every operation and capability + /// is available in every edition. + /// + /// REST API Reference for ListAnalyses Operation + public virtual Task ListAnalysesAsync(ListAnalysesRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { var options = new InvokeOptions(); - options.RequestMarshaller = ListDataSourcesRequestMarshaller.Instance; - options.ResponseUnmarshaller = ListDataSourcesResponseUnmarshaller.Instance; + options.RequestMarshaller = ListAnalysesRequestMarshaller.Instance; + options.ResponseUnmarshaller = ListAnalysesResponseUnmarshaller.Instance; - return InvokeAsync(request, options, cancellationToken); + return InvokeAsync(request, options, cancellationToken); } #endregion - #region ListFolderMembers + #region ListAssetBundleExportJobs /// - /// List all assets (DASHBOARD, ANALYSIS, and DATASET) in a folder. + /// Lists all asset bundle export jobs that have been taken place in the last 14 days. + /// Jobs created more than 14 days ago are deleted forever and are not returned. If you + /// are using the same job ID for multiple jobs, ListAssetBundleExportJobs only + /// returns the most recent job that uses the repeated job ID. /// - /// Container for the necessary parameters to execute the ListFolderMembers service method. + /// Container for the necessary parameters to execute the ListAssetBundleExportJobs service method. /// - /// The response from the ListFolderMembers service method, as returned by QuickSight. + /// The response from the ListAssetBundleExportJobs service method, as returned by QuickSight. /// /// You don't have access to this item. The provided credentials couldn't be validated. /// You might not be authorized to carry out the request. Make sure that your account /// is authorized to use the Amazon QuickSight service, that your policies have the correct /// permissions, and that you are using the correct credentials. /// - /// - /// An internal failure occurred. - /// /// /// The NextToken value isn't valid. /// - /// - /// One or more parameters has a value that isn't valid. - /// /// /// One or more resources can't be found. /// @@ -10695,41 +11094,38 @@ public virtual ListDataSourcesResponse ListDataSources(ListDataSourcesRequest re /// currently has Standard Edition and Enterprise Edition. Not every operation and capability /// is available in every edition. /// - /// REST API Reference for ListFolderMembers Operation - public virtual ListFolderMembersResponse ListFolderMembers(ListFolderMembersRequest request) + /// REST API Reference for ListAssetBundleExportJobs Operation + public virtual ListAssetBundleExportJobsResponse ListAssetBundleExportJobs(ListAssetBundleExportJobsRequest request) { var options = new InvokeOptions(); - options.RequestMarshaller = ListFolderMembersRequestMarshaller.Instance; - options.ResponseUnmarshaller = ListFolderMembersResponseUnmarshaller.Instance; + options.RequestMarshaller = ListAssetBundleExportJobsRequestMarshaller.Instance; + options.ResponseUnmarshaller = ListAssetBundleExportJobsResponseUnmarshaller.Instance; - return Invoke(request, options); + return Invoke(request, options); } /// - /// List all assets (DASHBOARD, ANALYSIS, and DATASET) in a folder. + /// Lists all asset bundle export jobs that have been taken place in the last 14 days. + /// Jobs created more than 14 days ago are deleted forever and are not returned. If you + /// are using the same job ID for multiple jobs, ListAssetBundleExportJobs only + /// returns the most recent job that uses the repeated job ID. /// - /// Container for the necessary parameters to execute the ListFolderMembers service method. + /// Container for the necessary parameters to execute the ListAssetBundleExportJobs service method. /// /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// /// - /// The response from the ListFolderMembers service method, as returned by QuickSight. + /// The response from the ListAssetBundleExportJobs service method, as returned by QuickSight. /// /// You don't have access to this item. The provided credentials couldn't be validated. /// You might not be authorized to carry out the request. Make sure that your account /// is authorized to use the Amazon QuickSight service, that your policies have the correct /// permissions, and that you are using the correct credentials. /// - /// - /// An internal failure occurred. - /// /// /// The NextToken value isn't valid. /// - /// - /// One or more parameters has a value that isn't valid. - /// /// /// One or more resources can't be found. /// @@ -10742,42 +11138,39 @@ public virtual ListFolderMembersResponse ListFolderMembers(ListFolderMembersRequ /// currently has Standard Edition and Enterprise Edition. Not every operation and capability /// is available in every edition. /// - /// REST API Reference for ListFolderMembers Operation - public virtual Task ListFolderMembersAsync(ListFolderMembersRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + /// REST API Reference for ListAssetBundleExportJobs Operation + public virtual Task ListAssetBundleExportJobsAsync(ListAssetBundleExportJobsRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { var options = new InvokeOptions(); - options.RequestMarshaller = ListFolderMembersRequestMarshaller.Instance; - options.ResponseUnmarshaller = ListFolderMembersResponseUnmarshaller.Instance; + options.RequestMarshaller = ListAssetBundleExportJobsRequestMarshaller.Instance; + options.ResponseUnmarshaller = ListAssetBundleExportJobsResponseUnmarshaller.Instance; - return InvokeAsync(request, options, cancellationToken); + return InvokeAsync(request, options, cancellationToken); } #endregion - #region ListFolders + #region ListAssetBundleImportJobs /// - /// Lists all folders in an account. + /// Lists all asset bundle import jobs that have taken place in the last 14 days. Jobs + /// created more than 14 days ago are deleted forever and are not returned. If you are + /// using the same job ID for multiple jobs, ListAssetBundleImportJobs only returns + /// the most recent job that uses the repeated job ID. /// - /// Container for the necessary parameters to execute the ListFolders service method. + /// Container for the necessary parameters to execute the ListAssetBundleImportJobs service method. /// - /// The response from the ListFolders service method, as returned by QuickSight. + /// The response from the ListAssetBundleImportJobs service method, as returned by QuickSight. /// /// You don't have access to this item. The provided credentials couldn't be validated. /// You might not be authorized to carry out the request. Make sure that your account /// is authorized to use the Amazon QuickSight service, that your policies have the correct /// permissions, and that you are using the correct credentials. /// - /// - /// An internal failure occurred. - /// /// /// The NextToken value isn't valid. /// - /// - /// One or more parameters has a value that isn't valid. - /// /// /// One or more resources can't be found. /// @@ -10790,41 +11183,38 @@ public virtual ListFolderMembersResponse ListFolderMembers(ListFolderMembersRequ /// currently has Standard Edition and Enterprise Edition. Not every operation and capability /// is available in every edition. ///     - /// REST API Reference for ListFolders Operation - public virtual ListFoldersResponse ListFolders(ListFoldersRequest request) + /// REST API Reference for ListAssetBundleImportJobs Operation + public virtual ListAssetBundleImportJobsResponse ListAssetBundleImportJobs(ListAssetBundleImportJobsRequest request) { var options = new InvokeOptions(); - options.RequestMarshaller = ListFoldersRequestMarshaller.Instance; - options.ResponseUnmarshaller = ListFoldersResponseUnmarshaller.Instance; + options.RequestMarshaller = ListAssetBundleImportJobsRequestMarshaller.Instance; + options.ResponseUnmarshaller = ListAssetBundleImportJobsResponseUnmarshaller.Instance; - return Invoke(request, options); + return Invoke(request, options); } /// - /// Lists all folders in an account. + /// Lists all asset bundle import jobs that have taken place in the last 14 days. Jobs + /// created more than 14 days ago are deleted forever and are not returned. If you are + /// using the same job ID for multiple jobs, ListAssetBundleImportJobs only returns + /// the most recent job that uses the repeated job ID. /// - /// Container for the necessary parameters to execute the ListFolders service method. + /// Container for the necessary parameters to execute the ListAssetBundleImportJobs service method. /// /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// /// - /// The response from the ListFolders service method, as returned by QuickSight. + /// The response from the ListAssetBundleImportJobs service method, as returned by QuickSight. /// /// You don't have access to this item. The provided credentials couldn't be validated. /// You might not be authorized to carry out the request. Make sure that your account /// is authorized to use the Amazon QuickSight service, that your policies have the correct /// permissions, and that you are using the correct credentials. /// - /// - /// An internal failure occurred. - /// /// /// The NextToken value isn't valid. /// - /// - /// One or more parameters has a value that isn't valid. - /// /// /// One or more resources can't be found. /// @@ -10837,122 +11227,100 @@ public virtual ListFoldersResponse ListFolders(ListFoldersRequest request) /// currently has Standard Edition and Enterprise Edition. Not every operation and capability /// is available in every edition. ///     - /// REST API Reference for ListFolders Operation - public virtual Task ListFoldersAsync(ListFoldersRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + /// REST API Reference for ListAssetBundleImportJobs Operation + public virtual Task ListAssetBundleImportJobsAsync(ListAssetBundleImportJobsRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { var options = new InvokeOptions(); - options.RequestMarshaller = ListFoldersRequestMarshaller.Instance; - options.ResponseUnmarshaller = ListFoldersResponseUnmarshaller.Instance; + options.RequestMarshaller = ListAssetBundleImportJobsRequestMarshaller.Instance; + options.ResponseUnmarshaller = ListAssetBundleImportJobsResponseUnmarshaller.Instance; - return InvokeAsync(request, options, cancellationToken); + return InvokeAsync(request, options, cancellationToken); } #endregion - #region ListFoldersForResource + #region ListBrands /// - /// List all folders that a resource is a member of. + /// Lists all brands in an Amazon QuickSight account. /// - /// Container for the necessary parameters to execute the ListFoldersForResource service method. + /// Container for the necessary parameters to execute the ListBrands service method. /// - /// The response from the ListFoldersForResource service method, as returned by QuickSight. + /// The response from the ListBrands service method, as returned by QuickSight. /// /// You don't have access to this item. The provided credentials couldn't be validated. /// You might not be authorized to carry out the request. Make sure that your account /// is authorized to use the Amazon QuickSight service, that your policies have the correct /// permissions, and that you are using the correct credentials. /// - /// - /// An internal failure occurred. - /// - /// - /// The NextToken value isn't valid. - /// - /// - /// One or more parameters has a value that isn't valid. + /// + /// An internal service exception. /// - /// - /// One or more resources can't be found. + /// + /// You don't have this feature activated for your account. To fix this issue, contact + /// Amazon Web Services support. /// /// /// Access is throttled. /// - /// - /// This error indicates that you are calling an operation on an Amazon QuickSight subscription - /// where the edition doesn't include support for that operation. Amazon Amazon QuickSight - /// currently has Standard Edition and Enterprise Edition. Not every operation and capability - /// is available in every edition. - /// - /// REST API Reference for ListFoldersForResource Operation - public virtual ListFoldersForResourceResponse ListFoldersForResource(ListFoldersForResourceRequest request) + /// REST API Reference for ListBrands Operation + public virtual ListBrandsResponse ListBrands(ListBrandsRequest request) { var options = new InvokeOptions(); - options.RequestMarshaller = ListFoldersForResourceRequestMarshaller.Instance; - options.ResponseUnmarshaller = ListFoldersForResourceResponseUnmarshaller.Instance; + options.RequestMarshaller = ListBrandsRequestMarshaller.Instance; + options.ResponseUnmarshaller = ListBrandsResponseUnmarshaller.Instance; - return Invoke(request, options); + return Invoke(request, options); } /// - /// List all folders that a resource is a member of. + /// Lists all brands in an Amazon QuickSight account. /// - /// Container for the necessary parameters to execute the ListFoldersForResource service method. + /// Container for the necessary parameters to execute the ListBrands service method. /// /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// /// - /// The response from the ListFoldersForResource service method, as returned by QuickSight. + /// The response from the ListBrands service method, as returned by QuickSight. /// /// You don't have access to this item. The provided credentials couldn't be validated. /// You might not be authorized to carry out the request. Make sure that your account /// is authorized to use the Amazon QuickSight service, that your policies have the correct /// permissions, and that you are using the correct credentials. /// - /// - /// An internal failure occurred. - /// - /// - /// The NextToken value isn't valid. - /// - /// - /// One or more parameters has a value that isn't valid. + /// + /// An internal service exception. /// - /// - /// One or more resources can't be found. + /// + /// You don't have this feature activated for your account. To fix this issue, contact + /// Amazon Web Services support. /// /// /// Access is throttled. /// - /// - /// This error indicates that you are calling an operation on an Amazon QuickSight subscription - /// where the edition doesn't include support for that operation. Amazon Amazon QuickSight - /// currently has Standard Edition and Enterprise Edition. Not every operation and capability - /// is available in every edition. - /// - /// REST API Reference for ListFoldersForResource Operation - public virtual Task ListFoldersForResourceAsync(ListFoldersForResourceRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + /// REST API Reference for ListBrands Operation + public virtual Task ListBrandsAsync(ListBrandsRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { var options = new InvokeOptions(); - options.RequestMarshaller = ListFoldersForResourceRequestMarshaller.Instance; - options.ResponseUnmarshaller = ListFoldersForResourceResponseUnmarshaller.Instance; + options.RequestMarshaller = ListBrandsRequestMarshaller.Instance; + options.ResponseUnmarshaller = ListBrandsResponseUnmarshaller.Instance; - return InvokeAsync(request, options, cancellationToken); + return InvokeAsync(request, options, cancellationToken); } #endregion - #region ListGroupMemberships + #region ListCustomPermissions /// - /// Lists member users in a group. + /// Returns a list of all the custom permissions profiles. /// - /// Container for the necessary parameters to execute the ListGroupMemberships service method. + /// Container for the necessary parameters to execute the ListCustomPermissions service method. /// - /// The response from the ListGroupMemberships service method, as returned by QuickSight. + /// The response from the ListCustomPermissions service method, as returned by QuickSight. /// /// You don't have access to this item. The provided credentials couldn't be validated. /// You might not be authorized to carry out the request. Make sure that your account @@ -10962,9 +11330,6 @@ public virtual ListFoldersForResourceResponse ListFoldersForResource(ListFolders /// /// An internal failure occurred. /// - /// - /// The NextToken value isn't valid. - /// /// /// One or more parameters has a value that isn't valid. /// @@ -10980,26 +11345,26 @@ public virtual ListFoldersForResourceResponse ListFoldersForResource(ListFolders /// /// Access is throttled. /// - /// REST API Reference for ListGroupMemberships Operation - public virtual ListGroupMembershipsResponse ListGroupMemberships(ListGroupMembershipsRequest request) + /// REST API Reference for ListCustomPermissions Operation + public virtual ListCustomPermissionsResponse ListCustomPermissions(ListCustomPermissionsRequest request) { var options = new InvokeOptions(); - options.RequestMarshaller = ListGroupMembershipsRequestMarshaller.Instance; - options.ResponseUnmarshaller = ListGroupMembershipsResponseUnmarshaller.Instance; + options.RequestMarshaller = ListCustomPermissionsRequestMarshaller.Instance; + options.ResponseUnmarshaller = ListCustomPermissionsResponseUnmarshaller.Instance; - return Invoke(request, options); + return Invoke(request, options); } /// - /// Lists member users in a group. + /// Returns a list of all the custom permissions profiles. /// - /// Container for the necessary parameters to execute the ListGroupMemberships service method. + /// Container for the necessary parameters to execute the ListCustomPermissions service method. /// /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// /// - /// The response from the ListGroupMemberships service method, as returned by QuickSight. + /// The response from the ListCustomPermissions service method, as returned by QuickSight. /// /// You don't have access to this item. The provided credentials couldn't be validated. /// You might not be authorized to carry out the request. Make sure that your account @@ -11009,9 +11374,6 @@ public virtual ListGroupMembershipsResponse ListGroupMemberships(ListGroupMember /// /// An internal failure occurred. /// - /// - /// The NextToken value isn't valid. - /// /// /// One or more parameters has a value that isn't valid. /// @@ -11027,128 +11389,98 @@ public virtual ListGroupMembershipsResponse ListGroupMemberships(ListGroupMember /// /// Access is throttled. /// - /// REST API Reference for ListGroupMemberships Operation - public virtual Task ListGroupMembershipsAsync(ListGroupMembershipsRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + /// REST API Reference for ListCustomPermissions Operation + public virtual Task ListCustomPermissionsAsync(ListCustomPermissionsRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { var options = new InvokeOptions(); - options.RequestMarshaller = ListGroupMembershipsRequestMarshaller.Instance; - options.ResponseUnmarshaller = ListGroupMembershipsResponseUnmarshaller.Instance; + options.RequestMarshaller = ListCustomPermissionsRequestMarshaller.Instance; + options.ResponseUnmarshaller = ListCustomPermissionsResponseUnmarshaller.Instance; - return InvokeAsync(request, options, cancellationToken); + return InvokeAsync(request, options, cancellationToken); } #endregion - #region ListGroups + #region ListDashboards /// - /// Lists all user groups in Amazon QuickSight. + /// Lists dashboards in an Amazon Web Services account. /// - /// Container for the necessary parameters to execute the ListGroups service method. + /// Container for the necessary parameters to execute the ListDashboards service method. /// - /// The response from the ListGroups service method, as returned by QuickSight. - /// - /// You don't have access to this item. The provided credentials couldn't be validated. - /// You might not be authorized to carry out the request. Make sure that your account - /// is authorized to use the Amazon QuickSight service, that your policies have the correct - /// permissions, and that you are using the correct credentials. - /// + /// The response from the ListDashboards service method, as returned by QuickSight. /// /// An internal failure occurred. /// /// /// The NextToken value isn't valid. /// - /// - /// One or more parameters has a value that isn't valid. - /// - /// - /// One or more preconditions aren't met. - /// - /// - /// One or more resources can't be found. - /// - /// - /// This resource is currently unavailable. - /// /// /// Access is throttled. /// - /// REST API Reference for ListGroups Operation - public virtual ListGroupsResponse ListGroups(ListGroupsRequest request) + /// + /// This error indicates that you are calling an operation on an Amazon QuickSight subscription + /// where the edition doesn't include support for that operation. Amazon Amazon QuickSight + /// currently has Standard Edition and Enterprise Edition. Not every operation and capability + /// is available in every edition. + /// + /// REST API Reference for ListDashboards Operation + public virtual ListDashboardsResponse ListDashboards(ListDashboardsRequest request) { var options = new InvokeOptions(); - options.RequestMarshaller = ListGroupsRequestMarshaller.Instance; - options.ResponseUnmarshaller = ListGroupsResponseUnmarshaller.Instance; + options.RequestMarshaller = ListDashboardsRequestMarshaller.Instance; + options.ResponseUnmarshaller = ListDashboardsResponseUnmarshaller.Instance; - return Invoke(request, options); + return Invoke(request, options); } /// - /// Lists all user groups in Amazon QuickSight. + /// Lists dashboards in an Amazon Web Services account. /// - /// Container for the necessary parameters to execute the ListGroups service method. + /// Container for the necessary parameters to execute the ListDashboards service method. /// /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// /// - /// The response from the ListGroups service method, as returned by QuickSight. - /// - /// You don't have access to this item. The provided credentials couldn't be validated. - /// You might not be authorized to carry out the request. Make sure that your account - /// is authorized to use the Amazon QuickSight service, that your policies have the correct - /// permissions, and that you are using the correct credentials. - /// + /// The response from the ListDashboards service method, as returned by QuickSight. /// /// An internal failure occurred. /// /// /// The NextToken value isn't valid. /// - /// - /// One or more parameters has a value that isn't valid. - /// - /// - /// One or more preconditions aren't met. - /// - /// - /// One or more resources can't be found. - /// - /// - /// This resource is currently unavailable. - /// /// /// Access is throttled. /// - /// REST API Reference for ListGroups Operation - public virtual Task ListGroupsAsync(ListGroupsRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + /// + /// This error indicates that you are calling an operation on an Amazon QuickSight subscription + /// where the edition doesn't include support for that operation. Amazon Amazon QuickSight + /// currently has Standard Edition and Enterprise Edition. Not every operation and capability + /// is available in every edition. + /// + /// REST API Reference for ListDashboards Operation + public virtual Task ListDashboardsAsync(ListDashboardsRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { var options = new InvokeOptions(); - options.RequestMarshaller = ListGroupsRequestMarshaller.Instance; - options.ResponseUnmarshaller = ListGroupsResponseUnmarshaller.Instance; + options.RequestMarshaller = ListDashboardsRequestMarshaller.Instance; + options.ResponseUnmarshaller = ListDashboardsResponseUnmarshaller.Instance; - return InvokeAsync(request, options, cancellationToken); + return InvokeAsync(request, options, cancellationToken); } #endregion - #region ListIAMPolicyAssignments + #region ListDashboardVersions /// - /// Lists the IAM policy assignments in the current Amazon QuickSight account. + /// Lists all the versions of the dashboards in the Amazon QuickSight subscription. /// - /// Container for the necessary parameters to execute the ListIAMPolicyAssignments service method. + /// Container for the necessary parameters to execute the ListDashboardVersions service method. /// - /// The response from the ListIAMPolicyAssignments service method, as returned by QuickSight. - /// - /// You don't have access to this item. The provided credentials couldn't be validated. - /// You might not be authorized to carry out the request. Make sure that your account - /// is authorized to use the Amazon QuickSight service, that your policies have the correct - /// permissions, and that you are using the correct credentials. - /// + /// The response from the ListDashboardVersions service method, as returned by QuickSight. /// /// An internal failure occurred. /// @@ -11164,32 +11496,32 @@ public virtual ListGroupsResponse ListGroups(ListGroupsRequest request) /// /// Access is throttled. /// - /// REST API Reference for ListIAMPolicyAssignments Operation - public virtual ListIAMPolicyAssignmentsResponse ListIAMPolicyAssignments(ListIAMPolicyAssignmentsRequest request) + /// + /// This error indicates that you are calling an operation on an Amazon QuickSight subscription + /// where the edition doesn't include support for that operation. Amazon Amazon QuickSight + /// currently has Standard Edition and Enterprise Edition. Not every operation and capability + /// is available in every edition. + /// + /// REST API Reference for ListDashboardVersions Operation + public virtual ListDashboardVersionsResponse ListDashboardVersions(ListDashboardVersionsRequest request) { var options = new InvokeOptions(); - options.RequestMarshaller = ListIAMPolicyAssignmentsRequestMarshaller.Instance; - options.ResponseUnmarshaller = ListIAMPolicyAssignmentsResponseUnmarshaller.Instance; + options.RequestMarshaller = ListDashboardVersionsRequestMarshaller.Instance; + options.ResponseUnmarshaller = ListDashboardVersionsResponseUnmarshaller.Instance; - return Invoke(request, options); + return Invoke(request, options); } /// - /// Lists the IAM policy assignments in the current Amazon QuickSight account. + /// Lists all the versions of the dashboards in the Amazon QuickSight subscription. /// - /// Container for the necessary parameters to execute the ListIAMPolicyAssignments service method. + /// Container for the necessary parameters to execute the ListDashboardVersions service method. /// /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// /// - /// The response from the ListIAMPolicyAssignments service method, as returned by QuickSight. - /// - /// You don't have access to this item. The provided credentials couldn't be validated. - /// You might not be authorized to carry out the request. Make sure that your account - /// is authorized to use the Amazon QuickSight service, that your policies have the correct - /// permissions, and that you are using the correct credentials. - /// + /// The response from the ListDashboardVersions service method, as returned by QuickSight. /// /// An internal failure occurred. /// @@ -11205,129 +11537,123 @@ public virtual ListIAMPolicyAssignmentsResponse ListIAMPolicyAssignments(ListIAM /// /// Access is throttled. /// - /// REST API Reference for ListIAMPolicyAssignments Operation - public virtual Task ListIAMPolicyAssignmentsAsync(ListIAMPolicyAssignmentsRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + /// + /// This error indicates that you are calling an operation on an Amazon QuickSight subscription + /// where the edition doesn't include support for that operation. Amazon Amazon QuickSight + /// currently has Standard Edition and Enterprise Edition. Not every operation and capability + /// is available in every edition. + /// + /// REST API Reference for ListDashboardVersions Operation + public virtual Task ListDashboardVersionsAsync(ListDashboardVersionsRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { var options = new InvokeOptions(); - options.RequestMarshaller = ListIAMPolicyAssignmentsRequestMarshaller.Instance; - options.ResponseUnmarshaller = ListIAMPolicyAssignmentsResponseUnmarshaller.Instance; + options.RequestMarshaller = ListDashboardVersionsRequestMarshaller.Instance; + options.ResponseUnmarshaller = ListDashboardVersionsResponseUnmarshaller.Instance; - return InvokeAsync(request, options, cancellationToken); + return InvokeAsync(request, options, cancellationToken); } #endregion - #region ListIAMPolicyAssignmentsForUser + #region ListDataSets /// - /// Lists all of the IAM policy assignments, including the Amazon Resource Names (ARNs), - /// for the IAM policies assigned to the specified user and group, or groups that the - /// user belongs to. + /// Lists all of the datasets belonging to the current Amazon Web Services account in + /// an Amazon Web Services Region. + /// + /// + /// + /// The permissions resource is arn:aws:quicksight:region:aws-account-id:dataset/*. + /// /// - /// Container for the necessary parameters to execute the ListIAMPolicyAssignmentsForUser service method. + /// Container for the necessary parameters to execute the ListDataSets service method. /// - /// The response from the ListIAMPolicyAssignmentsForUser service method, as returned by QuickSight. + /// The response from the ListDataSets service method, as returned by QuickSight. /// /// You don't have access to this item. The provided credentials couldn't be validated. /// You might not be authorized to carry out the request. Make sure that your account /// is authorized to use the Amazon QuickSight service, that your policies have the correct /// permissions, and that you are using the correct credentials. /// - /// - /// A resource is already in a state that indicates an operation is happening that must - /// complete before a new update can be applied. - /// /// /// An internal failure occurred. /// + /// + /// The NextToken value isn't valid. + /// /// /// One or more parameters has a value that isn't valid. /// - /// - /// The resource specified already exists. - /// - /// - /// One or more resources can't be found. - /// /// /// Access is throttled. /// - /// REST API Reference for ListIAMPolicyAssignmentsForUser Operation - public virtual ListIAMPolicyAssignmentsForUserResponse ListIAMPolicyAssignmentsForUser(ListIAMPolicyAssignmentsForUserRequest request) + /// REST API Reference for ListDataSets Operation + public virtual ListDataSetsResponse ListDataSets(ListDataSetsRequest request) { var options = new InvokeOptions(); - options.RequestMarshaller = ListIAMPolicyAssignmentsForUserRequestMarshaller.Instance; - options.ResponseUnmarshaller = ListIAMPolicyAssignmentsForUserResponseUnmarshaller.Instance; + options.RequestMarshaller = ListDataSetsRequestMarshaller.Instance; + options.ResponseUnmarshaller = ListDataSetsResponseUnmarshaller.Instance; - return Invoke(request, options); + return Invoke(request, options); } /// - /// Lists all of the IAM policy assignments, including the Amazon Resource Names (ARNs), - /// for the IAM policies assigned to the specified user and group, or groups that the - /// user belongs to. + /// Lists all of the datasets belonging to the current Amazon Web Services account in + /// an Amazon Web Services Region. + /// + /// + /// + /// The permissions resource is arn:aws:quicksight:region:aws-account-id:dataset/*. + /// /// - /// Container for the necessary parameters to execute the ListIAMPolicyAssignmentsForUser service method. + /// Container for the necessary parameters to execute the ListDataSets service method. /// /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// /// - /// The response from the ListIAMPolicyAssignmentsForUser service method, as returned by QuickSight. + /// The response from the ListDataSets service method, as returned by QuickSight. /// /// You don't have access to this item. The provided credentials couldn't be validated. /// You might not be authorized to carry out the request. Make sure that your account /// is authorized to use the Amazon QuickSight service, that your policies have the correct /// permissions, and that you are using the correct credentials. /// - /// - /// A resource is already in a state that indicates an operation is happening that must - /// complete before a new update can be applied. - /// /// /// An internal failure occurred. /// + /// + /// The NextToken value isn't valid. + /// /// /// One or more parameters has a value that isn't valid. /// - /// - /// The resource specified already exists. - /// - /// - /// One or more resources can't be found. - /// /// /// Access is throttled. /// - /// REST API Reference for ListIAMPolicyAssignmentsForUser Operation - public virtual Task ListIAMPolicyAssignmentsForUserAsync(ListIAMPolicyAssignmentsForUserRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + /// REST API Reference for ListDataSets Operation + public virtual Task ListDataSetsAsync(ListDataSetsRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { var options = new InvokeOptions(); - options.RequestMarshaller = ListIAMPolicyAssignmentsForUserRequestMarshaller.Instance; - options.ResponseUnmarshaller = ListIAMPolicyAssignmentsForUserResponseUnmarshaller.Instance; + options.RequestMarshaller = ListDataSetsRequestMarshaller.Instance; + options.ResponseUnmarshaller = ListDataSetsResponseUnmarshaller.Instance; - return InvokeAsync(request, options, cancellationToken); + return InvokeAsync(request, options, cancellationToken); } #endregion - #region ListIdentityPropagationConfigs + #region ListDataSources /// - /// Lists all services and authorized targets that the Amazon QuickSight IAM Identity - /// Center application can access. - /// - /// - /// - /// This operation is only supported for Amazon QuickSight accounts that use IAM Identity - /// Center. - /// + /// Lists data sources in current Amazon Web Services Region that belong to this Amazon + /// Web Services account. /// - /// Container for the necessary parameters to execute the ListIdentityPropagationConfigs service method. + /// Container for the necessary parameters to execute the ListDataSources service method. /// - /// The response from the ListIdentityPropagationConfigs service method, as returned by QuickSight. + /// The response from the ListDataSources service method, as returned by QuickSight. /// /// You don't have access to this item. The provided credentials couldn't be validated. /// You might not be authorized to carry out the request. Make sure that your account @@ -11337,42 +11663,36 @@ public virtual ListIAMPolicyAssignmentsForUserResponse ListIAMPolicyAssignmentsF /// /// An internal failure occurred. /// + /// + /// The NextToken value isn't valid. + /// /// /// One or more parameters has a value that isn't valid. /// - /// - /// One or more resources can't be found. - /// /// /// Access is throttled. /// - /// REST API Reference for ListIdentityPropagationConfigs Operation - public virtual ListIdentityPropagationConfigsResponse ListIdentityPropagationConfigs(ListIdentityPropagationConfigsRequest request) + /// REST API Reference for ListDataSources Operation + public virtual ListDataSourcesResponse ListDataSources(ListDataSourcesRequest request) { var options = new InvokeOptions(); - options.RequestMarshaller = ListIdentityPropagationConfigsRequestMarshaller.Instance; - options.ResponseUnmarshaller = ListIdentityPropagationConfigsResponseUnmarshaller.Instance; + options.RequestMarshaller = ListDataSourcesRequestMarshaller.Instance; + options.ResponseUnmarshaller = ListDataSourcesResponseUnmarshaller.Instance; - return Invoke(request, options); + return Invoke(request, options); } /// - /// Lists all services and authorized targets that the Amazon QuickSight IAM Identity - /// Center application can access. - /// - /// - /// - /// This operation is only supported for Amazon QuickSight accounts that use IAM Identity - /// Center. - /// + /// Lists data sources in current Amazon Web Services Region that belong to this Amazon + /// Web Services account. /// - /// Container for the necessary parameters to execute the ListIdentityPropagationConfigs service method. + /// Container for the necessary parameters to execute the ListDataSources service method. /// /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// /// - /// The response from the ListIdentityPropagationConfigs service method, as returned by QuickSight. + /// The response from the ListDataSources service method, as returned by QuickSight. /// /// You don't have access to this item. The provided credentials couldn't be validated. /// You might not be authorized to carry out the request. Make sure that your account @@ -11382,36 +11702,36 @@ public virtual ListIdentityPropagationConfigsResponse ListIdentityPropagationCon /// /// An internal failure occurred. /// + /// + /// The NextToken value isn't valid. + /// /// /// One or more parameters has a value that isn't valid. /// - /// - /// One or more resources can't be found. - /// /// /// Access is throttled. /// - /// REST API Reference for ListIdentityPropagationConfigs Operation - public virtual Task ListIdentityPropagationConfigsAsync(ListIdentityPropagationConfigsRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + /// REST API Reference for ListDataSources Operation + public virtual Task ListDataSourcesAsync(ListDataSourcesRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { var options = new InvokeOptions(); - options.RequestMarshaller = ListIdentityPropagationConfigsRequestMarshaller.Instance; - options.ResponseUnmarshaller = ListIdentityPropagationConfigsResponseUnmarshaller.Instance; + options.RequestMarshaller = ListDataSourcesRequestMarshaller.Instance; + options.ResponseUnmarshaller = ListDataSourcesResponseUnmarshaller.Instance; - return InvokeAsync(request, options, cancellationToken); + return InvokeAsync(request, options, cancellationToken); } #endregion - #region ListIngestions + #region ListFolderMembers /// - /// Lists the history of SPICE ingestions for a dataset. + /// List all assets (DASHBOARD, ANALYSIS, and DATASET) in a folder. /// - /// Container for the necessary parameters to execute the ListIngestions service method. + /// Container for the necessary parameters to execute the ListFolderMembers service method. /// - /// The response from the ListIngestions service method, as returned by QuickSight. + /// The response from the ListFolderMembers service method, as returned by QuickSight. /// /// You don't have access to this item. The provided credentials couldn't be validated. /// You might not be authorized to carry out the request. Make sure that your account @@ -11427,35 +11747,38 @@ public virtual ListIdentityPropagationConfigsResponse ListIdentityPropagationCon /// /// One or more parameters has a value that isn't valid. /// - /// - /// The resource specified already exists. - /// /// /// One or more resources can't be found. /// /// /// Access is throttled. /// - /// REST API Reference for ListIngestions Operation - public virtual ListIngestionsResponse ListIngestions(ListIngestionsRequest request) + /// + /// This error indicates that you are calling an operation on an Amazon QuickSight subscription + /// where the edition doesn't include support for that operation. Amazon Amazon QuickSight + /// currently has Standard Edition and Enterprise Edition. Not every operation and capability + /// is available in every edition. + /// + /// REST API Reference for ListFolderMembers Operation + public virtual ListFolderMembersResponse ListFolderMembers(ListFolderMembersRequest request) { var options = new InvokeOptions(); - options.RequestMarshaller = ListIngestionsRequestMarshaller.Instance; - options.ResponseUnmarshaller = ListIngestionsResponseUnmarshaller.Instance; + options.RequestMarshaller = ListFolderMembersRequestMarshaller.Instance; + options.ResponseUnmarshaller = ListFolderMembersResponseUnmarshaller.Instance; - return Invoke(request, options); + return Invoke(request, options); } /// - /// Lists the history of SPICE ingestions for a dataset. + /// List all assets (DASHBOARD, ANALYSIS, and DATASET) in a folder. /// - /// Container for the necessary parameters to execute the ListIngestions service method. + /// Container for the necessary parameters to execute the ListFolderMembers service method. /// /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// /// - /// The response from the ListIngestions service method, as returned by QuickSight. + /// The response from the ListFolderMembers service method, as returned by QuickSight. /// /// You don't have access to this item. The provided credentials couldn't be validated. /// You might not be authorized to carry out the request. Make sure that your account @@ -11471,37 +11794,39 @@ public virtual ListIngestionsResponse ListIngestions(ListIngestionsRequest reque /// /// One or more parameters has a value that isn't valid. /// - /// - /// The resource specified already exists. - /// /// /// One or more resources can't be found. /// /// /// Access is throttled. /// - /// REST API Reference for ListIngestions Operation - public virtual Task ListIngestionsAsync(ListIngestionsRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + /// + /// This error indicates that you are calling an operation on an Amazon QuickSight subscription + /// where the edition doesn't include support for that operation. Amazon Amazon QuickSight + /// currently has Standard Edition and Enterprise Edition. Not every operation and capability + /// is available in every edition. + /// + /// REST API Reference for ListFolderMembers Operation + public virtual Task ListFolderMembersAsync(ListFolderMembersRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { var options = new InvokeOptions(); - options.RequestMarshaller = ListIngestionsRequestMarshaller.Instance; - options.ResponseUnmarshaller = ListIngestionsResponseUnmarshaller.Instance; + options.RequestMarshaller = ListFolderMembersRequestMarshaller.Instance; + options.ResponseUnmarshaller = ListFolderMembersResponseUnmarshaller.Instance; - return InvokeAsync(request, options, cancellationToken); + return InvokeAsync(request, options, cancellationToken); } #endregion - #region ListNamespaces + #region ListFolders /// - /// Lists the namespaces for the specified Amazon Web Services account. This operation - /// doesn't list deleted namespaces. + /// Lists all folders in an account. /// - /// Container for the necessary parameters to execute the ListNamespaces service method. + /// Container for the necessary parameters to execute the ListFolders service method. /// - /// The response from the ListNamespaces service method, as returned by QuickSight. + /// The response from the ListFolders service method, as returned by QuickSight. /// /// You don't have access to this item. The provided credentials couldn't be validated. /// You might not be authorized to carry out the request. Make sure that your account @@ -11517,39 +11842,38 @@ public virtual ListIngestionsResponse ListIngestions(ListIngestionsRequest reque /// /// One or more parameters has a value that isn't valid. /// - /// - /// One or more preconditions aren't met. - /// /// /// One or more resources can't be found. /// - /// - /// This resource is currently unavailable. - /// /// /// Access is throttled. /// - /// REST API Reference for ListNamespaces Operation - public virtual ListNamespacesResponse ListNamespaces(ListNamespacesRequest request) + /// + /// This error indicates that you are calling an operation on an Amazon QuickSight subscription + /// where the edition doesn't include support for that operation. Amazon Amazon QuickSight + /// currently has Standard Edition and Enterprise Edition. Not every operation and capability + /// is available in every edition. + /// + /// REST API Reference for ListFolders Operation + public virtual ListFoldersResponse ListFolders(ListFoldersRequest request) { var options = new InvokeOptions(); - options.RequestMarshaller = ListNamespacesRequestMarshaller.Instance; - options.ResponseUnmarshaller = ListNamespacesResponseUnmarshaller.Instance; + options.RequestMarshaller = ListFoldersRequestMarshaller.Instance; + options.ResponseUnmarshaller = ListFoldersResponseUnmarshaller.Instance; - return Invoke(request, options); + return Invoke(request, options); } /// - /// Lists the namespaces for the specified Amazon Web Services account. This operation - /// doesn't list deleted namespaces. + /// Lists all folders in an account. /// - /// Container for the necessary parameters to execute the ListNamespaces service method. + /// Container for the necessary parameters to execute the ListFolders service method. /// /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// /// - /// The response from the ListNamespaces service method, as returned by QuickSight. + /// The response from the ListFolders service method, as returned by QuickSight. /// /// You don't have access to this item. The provided credentials couldn't be validated. /// You might not be authorized to carry out the request. Make sure that your account @@ -11565,39 +11889,39 @@ public virtual ListNamespacesResponse ListNamespaces(ListNamespacesRequest reque /// /// One or more parameters has a value that isn't valid. /// - /// - /// One or more preconditions aren't met. - /// /// /// One or more resources can't be found. /// - /// - /// This resource is currently unavailable. - /// /// /// Access is throttled. /// - /// REST API Reference for ListNamespaces Operation - public virtual Task ListNamespacesAsync(ListNamespacesRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + /// + /// This error indicates that you are calling an operation on an Amazon QuickSight subscription + /// where the edition doesn't include support for that operation. Amazon Amazon QuickSight + /// currently has Standard Edition and Enterprise Edition. Not every operation and capability + /// is available in every edition. + /// + /// REST API Reference for ListFolders Operation + public virtual Task ListFoldersAsync(ListFoldersRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { var options = new InvokeOptions(); - options.RequestMarshaller = ListNamespacesRequestMarshaller.Instance; - options.ResponseUnmarshaller = ListNamespacesResponseUnmarshaller.Instance; + options.RequestMarshaller = ListFoldersRequestMarshaller.Instance; + options.ResponseUnmarshaller = ListFoldersResponseUnmarshaller.Instance; - return InvokeAsync(request, options, cancellationToken); + return InvokeAsync(request, options, cancellationToken); } #endregion - #region ListRefreshSchedules + #region ListFoldersForResource /// - /// Lists the refresh schedules of a dataset. Each dataset can have up to 5 schedules. + /// List all folders that a resource is a member of. /// - /// Container for the necessary parameters to execute the ListRefreshSchedules service method. + /// Container for the necessary parameters to execute the ListFoldersForResource service method. /// - /// The response from the ListRefreshSchedules service method, as returned by QuickSight. + /// The response from the ListFoldersForResource service method, as returned by QuickSight. /// /// You don't have access to this item. The provided credentials couldn't be validated. /// You might not be authorized to carry out the request. Make sure that your account @@ -11607,38 +11931,44 @@ public virtual ListNamespacesResponse ListNamespaces(ListNamespacesRequest reque /// /// An internal failure occurred. /// + /// + /// The NextToken value isn't valid. + /// /// /// One or more parameters has a value that isn't valid. /// - /// - /// A limit is exceeded. - /// /// /// One or more resources can't be found. /// /// /// Access is throttled. /// - /// REST API Reference for ListRefreshSchedules Operation - public virtual ListRefreshSchedulesResponse ListRefreshSchedules(ListRefreshSchedulesRequest request) + /// + /// This error indicates that you are calling an operation on an Amazon QuickSight subscription + /// where the edition doesn't include support for that operation. Amazon Amazon QuickSight + /// currently has Standard Edition and Enterprise Edition. Not every operation and capability + /// is available in every edition. + /// + /// REST API Reference for ListFoldersForResource Operation + public virtual ListFoldersForResourceResponse ListFoldersForResource(ListFoldersForResourceRequest request) { var options = new InvokeOptions(); - options.RequestMarshaller = ListRefreshSchedulesRequestMarshaller.Instance; - options.ResponseUnmarshaller = ListRefreshSchedulesResponseUnmarshaller.Instance; + options.RequestMarshaller = ListFoldersForResourceRequestMarshaller.Instance; + options.ResponseUnmarshaller = ListFoldersForResourceResponseUnmarshaller.Instance; - return Invoke(request, options); + return Invoke(request, options); } /// - /// Lists the refresh schedules of a dataset. Each dataset can have up to 5 schedules. + /// List all folders that a resource is a member of. /// - /// Container for the necessary parameters to execute the ListRefreshSchedules service method. + /// Container for the necessary parameters to execute the ListFoldersForResource service method. /// /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// /// - /// The response from the ListRefreshSchedules service method, as returned by QuickSight. + /// The response from the ListFoldersForResource service method, as returned by QuickSight. /// /// You don't have access to this item. The provided credentials couldn't be validated. /// You might not be authorized to carry out the request. Make sure that your account @@ -11648,39 +11978,45 @@ public virtual ListRefreshSchedulesResponse ListRefreshSchedules(ListRefreshSche /// /// An internal failure occurred. /// + /// + /// The NextToken value isn't valid. + /// /// /// One or more parameters has a value that isn't valid. /// - /// - /// A limit is exceeded. - /// /// /// One or more resources can't be found. /// /// /// Access is throttled. /// - /// REST API Reference for ListRefreshSchedules Operation - public virtual Task ListRefreshSchedulesAsync(ListRefreshSchedulesRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + /// + /// This error indicates that you are calling an operation on an Amazon QuickSight subscription + /// where the edition doesn't include support for that operation. Amazon Amazon QuickSight + /// currently has Standard Edition and Enterprise Edition. Not every operation and capability + /// is available in every edition. + /// + /// REST API Reference for ListFoldersForResource Operation + public virtual Task ListFoldersForResourceAsync(ListFoldersForResourceRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { var options = new InvokeOptions(); - options.RequestMarshaller = ListRefreshSchedulesRequestMarshaller.Instance; - options.ResponseUnmarshaller = ListRefreshSchedulesResponseUnmarshaller.Instance; + options.RequestMarshaller = ListFoldersForResourceRequestMarshaller.Instance; + options.ResponseUnmarshaller = ListFoldersForResourceResponseUnmarshaller.Instance; - return InvokeAsync(request, options, cancellationToken); + return InvokeAsync(request, options, cancellationToken); } #endregion - #region ListRoleMemberships + #region ListGroupMemberships /// - /// Lists all groups that are associated with a role. + /// Lists member users in a group. /// - /// Container for the necessary parameters to execute the ListRoleMemberships service method. + /// Container for the necessary parameters to execute the ListGroupMemberships service method. /// - /// The response from the ListRoleMemberships service method, as returned by QuickSight. + /// The response from the ListGroupMemberships service method, as returned by QuickSight. /// /// You don't have access to this item. The provided credentials couldn't be validated. /// You might not be authorized to carry out the request. Make sure that your account @@ -11696,9 +12032,6 @@ public virtual ListRefreshSchedulesResponse ListRefreshSchedules(ListRefreshSche /// /// One or more parameters has a value that isn't valid. /// - /// - /// A limit is exceeded. - /// /// /// One or more preconditions aren't met. /// @@ -11711,26 +12044,26 @@ public virtual ListRefreshSchedulesResponse ListRefreshSchedules(ListRefreshSche /// /// Access is throttled. /// - /// REST API Reference for ListRoleMemberships Operation - public virtual ListRoleMembershipsResponse ListRoleMemberships(ListRoleMembershipsRequest request) + /// REST API Reference for ListGroupMemberships Operation + public virtual ListGroupMembershipsResponse ListGroupMemberships(ListGroupMembershipsRequest request) { var options = new InvokeOptions(); - options.RequestMarshaller = ListRoleMembershipsRequestMarshaller.Instance; - options.ResponseUnmarshaller = ListRoleMembershipsResponseUnmarshaller.Instance; + options.RequestMarshaller = ListGroupMembershipsRequestMarshaller.Instance; + options.ResponseUnmarshaller = ListGroupMembershipsResponseUnmarshaller.Instance; - return Invoke(request, options); + return Invoke(request, options); } /// - /// Lists all groups that are associated with a role. + /// Lists member users in a group. /// - /// Container for the necessary parameters to execute the ListRoleMemberships service method. + /// Container for the necessary parameters to execute the ListGroupMemberships service method. /// /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// /// - /// The response from the ListRoleMemberships service method, as returned by QuickSight. + /// The response from the ListGroupMemberships service method, as returned by QuickSight. /// /// You don't have access to this item. The provided credentials couldn't be validated. /// You might not be authorized to carry out the request. Make sure that your account @@ -11746,9 +12079,6 @@ public virtual ListRoleMembershipsResponse ListRoleMemberships(ListRoleMembershi /// /// One or more parameters has a value that isn't valid. /// - /// - /// A limit is exceeded. - /// /// /// One or more preconditions aren't met. /// @@ -11761,27 +12091,27 @@ public virtual ListRoleMembershipsResponse ListRoleMemberships(ListRoleMembershi /// /// Access is throttled. /// - /// REST API Reference for ListRoleMemberships Operation - public virtual Task ListRoleMembershipsAsync(ListRoleMembershipsRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + /// REST API Reference for ListGroupMemberships Operation + public virtual Task ListGroupMembershipsAsync(ListGroupMembershipsRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { var options = new InvokeOptions(); - options.RequestMarshaller = ListRoleMembershipsRequestMarshaller.Instance; - options.ResponseUnmarshaller = ListRoleMembershipsResponseUnmarshaller.Instance; + options.RequestMarshaller = ListGroupMembershipsRequestMarshaller.Instance; + options.ResponseUnmarshaller = ListGroupMembershipsResponseUnmarshaller.Instance; - return InvokeAsync(request, options, cancellationToken); + return InvokeAsync(request, options, cancellationToken); } #endregion - #region ListTagsForResource + #region ListGroups /// - /// Lists the tags assigned to a resource. + /// Lists all user groups in Amazon QuickSight. /// - /// Container for the necessary parameters to execute the ListTagsForResource service method. + /// Container for the necessary parameters to execute the ListGroups service method. /// - /// The response from the ListTagsForResource service method, as returned by QuickSight. + /// The response from the ListGroups service method, as returned by QuickSight. /// /// You don't have access to this item. The provided credentials couldn't be validated. /// You might not be authorized to carry out the request. Make sure that your account @@ -11791,35 +12121,44 @@ public virtual ListRoleMembershipsResponse ListRoleMemberships(ListRoleMembershi /// /// An internal failure occurred. /// + /// + /// The NextToken value isn't valid. + /// /// /// One or more parameters has a value that isn't valid. /// + /// + /// One or more preconditions aren't met. + /// /// /// One or more resources can't be found. /// + /// + /// This resource is currently unavailable. + /// /// /// Access is throttled. /// - /// REST API Reference for ListTagsForResource Operation - public virtual ListTagsForResourceResponse ListTagsForResource(ListTagsForResourceRequest request) + /// REST API Reference for ListGroups Operation + public virtual ListGroupsResponse ListGroups(ListGroupsRequest request) { var options = new InvokeOptions(); - options.RequestMarshaller = ListTagsForResourceRequestMarshaller.Instance; - options.ResponseUnmarshaller = ListTagsForResourceResponseUnmarshaller.Instance; + options.RequestMarshaller = ListGroupsRequestMarshaller.Instance; + options.ResponseUnmarshaller = ListGroupsResponseUnmarshaller.Instance; - return Invoke(request, options); + return Invoke(request, options); } /// - /// Lists the tags assigned to a resource. + /// Lists all user groups in Amazon QuickSight. /// - /// Container for the necessary parameters to execute the ListTagsForResource service method. + /// Container for the necessary parameters to execute the ListGroups service method. /// /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// /// - /// The response from the ListTagsForResource service method, as returned by QuickSight. + /// The response from the ListGroups service method, as returned by QuickSight. /// /// You don't have access to this item. The provided credentials couldn't be validated. /// You might not be authorized to carry out the request. Make sure that your account @@ -11829,202 +12168,239 @@ public virtual ListTagsForResourceResponse ListTagsForResource(ListTagsForResour /// /// An internal failure occurred. /// + /// + /// The NextToken value isn't valid. + /// /// /// One or more parameters has a value that isn't valid. /// + /// + /// One or more preconditions aren't met. + /// /// /// One or more resources can't be found. /// + /// + /// This resource is currently unavailable. + /// /// /// Access is throttled. /// - /// REST API Reference for ListTagsForResource Operation - public virtual Task ListTagsForResourceAsync(ListTagsForResourceRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + /// REST API Reference for ListGroups Operation + public virtual Task ListGroupsAsync(ListGroupsRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { var options = new InvokeOptions(); - options.RequestMarshaller = ListTagsForResourceRequestMarshaller.Instance; - options.ResponseUnmarshaller = ListTagsForResourceResponseUnmarshaller.Instance; + options.RequestMarshaller = ListGroupsRequestMarshaller.Instance; + options.ResponseUnmarshaller = ListGroupsResponseUnmarshaller.Instance; - return InvokeAsync(request, options, cancellationToken); + return InvokeAsync(request, options, cancellationToken); } #endregion - #region ListTemplateAliases + #region ListIAMPolicyAssignments /// - /// Lists all the aliases of a template. + /// Lists the IAM policy assignments in the current Amazon QuickSight account. /// - /// Container for the necessary parameters to execute the ListTemplateAliases service method. + /// Container for the necessary parameters to execute the ListIAMPolicyAssignments service method. /// - /// The response from the ListTemplateAliases service method, as returned by QuickSight. + /// The response from the ListIAMPolicyAssignments service method, as returned by QuickSight. + /// + /// You don't have access to this item. The provided credentials couldn't be validated. + /// You might not be authorized to carry out the request. Make sure that your account + /// is authorized to use the Amazon QuickSight service, that your policies have the correct + /// permissions, and that you are using the correct credentials. + /// /// /// An internal failure occurred. /// /// /// The NextToken value isn't valid. /// + /// + /// One or more parameters has a value that isn't valid. + /// /// /// One or more resources can't be found. /// /// /// Access is throttled. /// - /// - /// This error indicates that you are calling an operation on an Amazon QuickSight subscription - /// where the edition doesn't include support for that operation. Amazon Amazon QuickSight - /// currently has Standard Edition and Enterprise Edition. Not every operation and capability - /// is available in every edition. - /// - /// REST API Reference for ListTemplateAliases Operation - public virtual ListTemplateAliasesResponse ListTemplateAliases(ListTemplateAliasesRequest request) + /// REST API Reference for ListIAMPolicyAssignments Operation + public virtual ListIAMPolicyAssignmentsResponse ListIAMPolicyAssignments(ListIAMPolicyAssignmentsRequest request) { var options = new InvokeOptions(); - options.RequestMarshaller = ListTemplateAliasesRequestMarshaller.Instance; - options.ResponseUnmarshaller = ListTemplateAliasesResponseUnmarshaller.Instance; + options.RequestMarshaller = ListIAMPolicyAssignmentsRequestMarshaller.Instance; + options.ResponseUnmarshaller = ListIAMPolicyAssignmentsResponseUnmarshaller.Instance; - return Invoke(request, options); + return Invoke(request, options); } /// - /// Lists all the aliases of a template. + /// Lists the IAM policy assignments in the current Amazon QuickSight account. /// - /// Container for the necessary parameters to execute the ListTemplateAliases service method. + /// Container for the necessary parameters to execute the ListIAMPolicyAssignments service method. /// /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// /// - /// The response from the ListTemplateAliases service method, as returned by QuickSight. + /// The response from the ListIAMPolicyAssignments service method, as returned by QuickSight. + /// + /// You don't have access to this item. The provided credentials couldn't be validated. + /// You might not be authorized to carry out the request. Make sure that your account + /// is authorized to use the Amazon QuickSight service, that your policies have the correct + /// permissions, and that you are using the correct credentials. + /// /// /// An internal failure occurred. /// /// /// The NextToken value isn't valid. /// + /// + /// One or more parameters has a value that isn't valid. + /// /// /// One or more resources can't be found. /// /// /// Access is throttled. /// - /// - /// This error indicates that you are calling an operation on an Amazon QuickSight subscription - /// where the edition doesn't include support for that operation. Amazon Amazon QuickSight - /// currently has Standard Edition and Enterprise Edition. Not every operation and capability - /// is available in every edition. - /// - /// REST API Reference for ListTemplateAliases Operation - public virtual Task ListTemplateAliasesAsync(ListTemplateAliasesRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + /// REST API Reference for ListIAMPolicyAssignments Operation + public virtual Task ListIAMPolicyAssignmentsAsync(ListIAMPolicyAssignmentsRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { var options = new InvokeOptions(); - options.RequestMarshaller = ListTemplateAliasesRequestMarshaller.Instance; - options.ResponseUnmarshaller = ListTemplateAliasesResponseUnmarshaller.Instance; + options.RequestMarshaller = ListIAMPolicyAssignmentsRequestMarshaller.Instance; + options.ResponseUnmarshaller = ListIAMPolicyAssignmentsResponseUnmarshaller.Instance; - return InvokeAsync(request, options, cancellationToken); + return InvokeAsync(request, options, cancellationToken); } #endregion - #region ListTemplates + #region ListIAMPolicyAssignmentsForUser /// - /// Lists all the templates in the current Amazon QuickSight account. + /// Lists all of the IAM policy assignments, including the Amazon Resource Names (ARNs), + /// for the IAM policies assigned to the specified user and group, or groups that the + /// user belongs to. /// - /// Container for the necessary parameters to execute the ListTemplates service method. + /// Container for the necessary parameters to execute the ListIAMPolicyAssignmentsForUser service method. /// - /// The response from the ListTemplates service method, as returned by QuickSight. + /// The response from the ListIAMPolicyAssignmentsForUser service method, as returned by QuickSight. + /// + /// You don't have access to this item. The provided credentials couldn't be validated. + /// You might not be authorized to carry out the request. Make sure that your account + /// is authorized to use the Amazon QuickSight service, that your policies have the correct + /// permissions, and that you are using the correct credentials. + /// + /// + /// A resource is already in a state that indicates an operation is happening that must + /// complete before a new update can be applied. + /// /// /// An internal failure occurred. /// - /// - /// The NextToken value isn't valid. - /// /// /// One or more parameters has a value that isn't valid. /// + /// + /// The resource specified already exists. + /// /// /// One or more resources can't be found. /// /// /// Access is throttled. /// - /// - /// This error indicates that you are calling an operation on an Amazon QuickSight subscription - /// where the edition doesn't include support for that operation. Amazon Amazon QuickSight - /// currently has Standard Edition and Enterprise Edition. Not every operation and capability - /// is available in every edition. - /// - /// REST API Reference for ListTemplates Operation - public virtual ListTemplatesResponse ListTemplates(ListTemplatesRequest request) + /// REST API Reference for ListIAMPolicyAssignmentsForUser Operation + public virtual ListIAMPolicyAssignmentsForUserResponse ListIAMPolicyAssignmentsForUser(ListIAMPolicyAssignmentsForUserRequest request) { var options = new InvokeOptions(); - options.RequestMarshaller = ListTemplatesRequestMarshaller.Instance; - options.ResponseUnmarshaller = ListTemplatesResponseUnmarshaller.Instance; + options.RequestMarshaller = ListIAMPolicyAssignmentsForUserRequestMarshaller.Instance; + options.ResponseUnmarshaller = ListIAMPolicyAssignmentsForUserResponseUnmarshaller.Instance; - return Invoke(request, options); + return Invoke(request, options); } /// - /// Lists all the templates in the current Amazon QuickSight account. + /// Lists all of the IAM policy assignments, including the Amazon Resource Names (ARNs), + /// for the IAM policies assigned to the specified user and group, or groups that the + /// user belongs to. /// - /// Container for the necessary parameters to execute the ListTemplates service method. + /// Container for the necessary parameters to execute the ListIAMPolicyAssignmentsForUser service method. /// /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// /// - /// The response from the ListTemplates service method, as returned by QuickSight. + /// The response from the ListIAMPolicyAssignmentsForUser service method, as returned by QuickSight. + /// + /// You don't have access to this item. The provided credentials couldn't be validated. + /// You might not be authorized to carry out the request. Make sure that your account + /// is authorized to use the Amazon QuickSight service, that your policies have the correct + /// permissions, and that you are using the correct credentials. + /// + /// + /// A resource is already in a state that indicates an operation is happening that must + /// complete before a new update can be applied. + /// /// /// An internal failure occurred. /// - /// - /// The NextToken value isn't valid. - /// /// /// One or more parameters has a value that isn't valid. /// + /// + /// The resource specified already exists. + /// /// /// One or more resources can't be found. /// /// /// Access is throttled. /// - /// - /// This error indicates that you are calling an operation on an Amazon QuickSight subscription - /// where the edition doesn't include support for that operation. Amazon Amazon QuickSight - /// currently has Standard Edition and Enterprise Edition. Not every operation and capability - /// is available in every edition. - /// - /// REST API Reference for ListTemplates Operation - public virtual Task ListTemplatesAsync(ListTemplatesRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + /// REST API Reference for ListIAMPolicyAssignmentsForUser Operation + public virtual Task ListIAMPolicyAssignmentsForUserAsync(ListIAMPolicyAssignmentsForUserRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { var options = new InvokeOptions(); - options.RequestMarshaller = ListTemplatesRequestMarshaller.Instance; - options.ResponseUnmarshaller = ListTemplatesResponseUnmarshaller.Instance; + options.RequestMarshaller = ListIAMPolicyAssignmentsForUserRequestMarshaller.Instance; + options.ResponseUnmarshaller = ListIAMPolicyAssignmentsForUserResponseUnmarshaller.Instance; - return InvokeAsync(request, options, cancellationToken); + return InvokeAsync(request, options, cancellationToken); } #endregion - #region ListTemplateVersions + #region ListIdentityPropagationConfigs /// - /// Lists all the versions of the templates in the current Amazon QuickSight account. + /// Lists all services and authorized targets that the Amazon QuickSight IAM Identity + /// Center application can access. + /// + /// + /// + /// This operation is only supported for Amazon QuickSight accounts that use IAM Identity + /// Center. + /// /// - /// Container for the necessary parameters to execute the ListTemplateVersions service method. + /// Container for the necessary parameters to execute the ListIdentityPropagationConfigs service method. /// - /// The response from the ListTemplateVersions service method, as returned by QuickSight. + /// The response from the ListIdentityPropagationConfigs service method, as returned by QuickSight. + /// + /// You don't have access to this item. The provided credentials couldn't be validated. + /// You might not be authorized to carry out the request. Make sure that your account + /// is authorized to use the Amazon QuickSight service, that your policies have the correct + /// permissions, and that you are using the correct credentials. + /// /// /// An internal failure occurred. /// - /// - /// The NextToken value isn't valid. - /// /// /// One or more parameters has a value that isn't valid. /// @@ -12034,38 +12410,42 @@ public virtual ListTemplatesResponse ListTemplates(ListTemplatesRequest request) /// /// Access is throttled. /// - /// - /// This error indicates that you are calling an operation on an Amazon QuickSight subscription - /// where the edition doesn't include support for that operation. Amazon Amazon QuickSight - /// currently has Standard Edition and Enterprise Edition. Not every operation and capability - /// is available in every edition. - /// - /// REST API Reference for ListTemplateVersions Operation - public virtual ListTemplateVersionsResponse ListTemplateVersions(ListTemplateVersionsRequest request) + /// REST API Reference for ListIdentityPropagationConfigs Operation + public virtual ListIdentityPropagationConfigsResponse ListIdentityPropagationConfigs(ListIdentityPropagationConfigsRequest request) { var options = new InvokeOptions(); - options.RequestMarshaller = ListTemplateVersionsRequestMarshaller.Instance; - options.ResponseUnmarshaller = ListTemplateVersionsResponseUnmarshaller.Instance; + options.RequestMarshaller = ListIdentityPropagationConfigsRequestMarshaller.Instance; + options.ResponseUnmarshaller = ListIdentityPropagationConfigsResponseUnmarshaller.Instance; - return Invoke(request, options); + return Invoke(request, options); } /// - /// Lists all the versions of the templates in the current Amazon QuickSight account. + /// Lists all services and authorized targets that the Amazon QuickSight IAM Identity + /// Center application can access. + /// + /// + /// + /// This operation is only supported for Amazon QuickSight accounts that use IAM Identity + /// Center. + /// /// - /// Container for the necessary parameters to execute the ListTemplateVersions service method. + /// Container for the necessary parameters to execute the ListIdentityPropagationConfigs service method. /// /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// /// - /// The response from the ListTemplateVersions service method, as returned by QuickSight. + /// The response from the ListIdentityPropagationConfigs service method, as returned by QuickSight. + /// + /// You don't have access to this item. The provided credentials couldn't be validated. + /// You might not be authorized to carry out the request. Make sure that your account + /// is authorized to use the Amazon QuickSight service, that your policies have the correct + /// permissions, and that you are using the correct credentials. + /// /// /// An internal failure occurred. /// - /// - /// The NextToken value isn't valid. - /// /// /// One or more parameters has a value that isn't valid. /// @@ -12075,36 +12455,33 @@ public virtual ListTemplateVersionsResponse ListTemplateVersions(ListTemplateVer /// /// Access is throttled. /// - /// - /// This error indicates that you are calling an operation on an Amazon QuickSight subscription - /// where the edition doesn't include support for that operation. Amazon Amazon QuickSight - /// currently has Standard Edition and Enterprise Edition. Not every operation and capability - /// is available in every edition. - /// - /// REST API Reference for ListTemplateVersions Operation - public virtual Task ListTemplateVersionsAsync(ListTemplateVersionsRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + /// REST API Reference for ListIdentityPropagationConfigs Operation + public virtual Task ListIdentityPropagationConfigsAsync(ListIdentityPropagationConfigsRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { var options = new InvokeOptions(); - options.RequestMarshaller = ListTemplateVersionsRequestMarshaller.Instance; - options.ResponseUnmarshaller = ListTemplateVersionsResponseUnmarshaller.Instance; + options.RequestMarshaller = ListIdentityPropagationConfigsRequestMarshaller.Instance; + options.ResponseUnmarshaller = ListIdentityPropagationConfigsResponseUnmarshaller.Instance; - return InvokeAsync(request, options, cancellationToken); + return InvokeAsync(request, options, cancellationToken); } #endregion - #region ListThemeAliases + #region ListIngestions /// - /// Lists all the aliases of a theme. + /// Lists the history of SPICE ingestions for a dataset. /// - /// Container for the necessary parameters to execute the ListThemeAliases service method. + /// Container for the necessary parameters to execute the ListIngestions service method. /// - /// The response from the ListThemeAliases service method, as returned by QuickSight. - /// - /// Updating or deleting a resource can cause an inconsistent state. - /// + /// The response from the ListIngestions service method, as returned by QuickSight. + /// + /// You don't have access to this item. The provided credentials couldn't be validated. + /// You might not be authorized to carry out the request. Make sure that your account + /// is authorized to use the Amazon QuickSight service, that your policies have the correct + /// permissions, and that you are using the correct credentials. + /// /// /// An internal failure occurred. /// @@ -12114,40 +12491,40 @@ public virtual ListTemplateVersionsResponse ListTemplateVersions(ListTemplateVer /// /// One or more parameters has a value that isn't valid. /// + /// + /// The resource specified already exists. + /// /// /// One or more resources can't be found. /// /// /// Access is throttled. /// - /// - /// This error indicates that you are calling an operation on an Amazon QuickSight subscription - /// where the edition doesn't include support for that operation. Amazon Amazon QuickSight - /// currently has Standard Edition and Enterprise Edition. Not every operation and capability - /// is available in every edition. - /// - /// REST API Reference for ListThemeAliases Operation - public virtual ListThemeAliasesResponse ListThemeAliases(ListThemeAliasesRequest request) + /// REST API Reference for ListIngestions Operation + public virtual ListIngestionsResponse ListIngestions(ListIngestionsRequest request) { var options = new InvokeOptions(); - options.RequestMarshaller = ListThemeAliasesRequestMarshaller.Instance; - options.ResponseUnmarshaller = ListThemeAliasesResponseUnmarshaller.Instance; + options.RequestMarshaller = ListIngestionsRequestMarshaller.Instance; + options.ResponseUnmarshaller = ListIngestionsResponseUnmarshaller.Instance; - return Invoke(request, options); + return Invoke(request, options); } /// - /// Lists all the aliases of a theme. + /// Lists the history of SPICE ingestions for a dataset. /// - /// Container for the necessary parameters to execute the ListThemeAliases service method. + /// Container for the necessary parameters to execute the ListIngestions service method. /// /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// /// - /// The response from the ListThemeAliases service method, as returned by QuickSight. - /// - /// Updating or deleting a resource can cause an inconsistent state. + /// The response from the ListIngestions service method, as returned by QuickSight. + /// + /// You don't have access to this item. The provided credentials couldn't be validated. + /// You might not be authorized to carry out the request. Make sure that your account + /// is authorized to use the Amazon QuickSight service, that your policies have the correct + /// permissions, and that you are using the correct credentials. /// /// /// An internal failure occurred. @@ -12158,39 +12535,37 @@ public virtual ListThemeAliasesResponse ListThemeAliases(ListThemeAliasesRequest /// /// One or more parameters has a value that isn't valid. /// + /// + /// The resource specified already exists. + /// /// /// One or more resources can't be found. /// /// /// Access is throttled. /// - /// - /// This error indicates that you are calling an operation on an Amazon QuickSight subscription - /// where the edition doesn't include support for that operation. Amazon Amazon QuickSight - /// currently has Standard Edition and Enterprise Edition. Not every operation and capability - /// is available in every edition. - /// - /// REST API Reference for ListThemeAliases Operation - public virtual Task ListThemeAliasesAsync(ListThemeAliasesRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + /// REST API Reference for ListIngestions Operation + public virtual Task ListIngestionsAsync(ListIngestionsRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { var options = new InvokeOptions(); - options.RequestMarshaller = ListThemeAliasesRequestMarshaller.Instance; - options.ResponseUnmarshaller = ListThemeAliasesResponseUnmarshaller.Instance; + options.RequestMarshaller = ListIngestionsRequestMarshaller.Instance; + options.ResponseUnmarshaller = ListIngestionsResponseUnmarshaller.Instance; - return InvokeAsync(request, options, cancellationToken); + return InvokeAsync(request, options, cancellationToken); } #endregion - #region ListThemes + #region ListNamespaces /// - /// Lists all the themes in the current Amazon Web Services account. + /// Lists the namespaces for the specified Amazon Web Services account. This operation + /// doesn't list deleted namespaces. /// - /// Container for the necessary parameters to execute the ListThemes service method. + /// Container for the necessary parameters to execute the ListNamespaces service method. /// - /// The response from the ListThemes service method, as returned by QuickSight. + /// The response from the ListNamespaces service method, as returned by QuickSight. /// /// You don't have access to this item. The provided credentials couldn't be validated. /// You might not be authorized to carry out the request. Make sure that your account @@ -12206,38 +12581,39 @@ public virtual ListThemeAliasesResponse ListThemeAliases(ListThemeAliasesRequest /// /// One or more parameters has a value that isn't valid. /// + /// + /// One or more preconditions aren't met. + /// /// /// One or more resources can't be found. /// + /// + /// This resource is currently unavailable. + /// /// /// Access is throttled. /// - /// - /// This error indicates that you are calling an operation on an Amazon QuickSight subscription - /// where the edition doesn't include support for that operation. Amazon Amazon QuickSight - /// currently has Standard Edition and Enterprise Edition. Not every operation and capability - /// is available in every edition. - /// - /// REST API Reference for ListThemes Operation - public virtual ListThemesResponse ListThemes(ListThemesRequest request) + /// REST API Reference for ListNamespaces Operation + public virtual ListNamespacesResponse ListNamespaces(ListNamespacesRequest request) { var options = new InvokeOptions(); - options.RequestMarshaller = ListThemesRequestMarshaller.Instance; - options.ResponseUnmarshaller = ListThemesResponseUnmarshaller.Instance; + options.RequestMarshaller = ListNamespacesRequestMarshaller.Instance; + options.ResponseUnmarshaller = ListNamespacesResponseUnmarshaller.Instance; - return Invoke(request, options); + return Invoke(request, options); } /// - /// Lists all the themes in the current Amazon Web Services account. + /// Lists the namespaces for the specified Amazon Web Services account. This operation + /// doesn't list deleted namespaces. /// - /// Container for the necessary parameters to execute the ListThemes service method. + /// Container for the necessary parameters to execute the ListNamespaces service method. /// /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// /// - /// The response from the ListThemes service method, as returned by QuickSight. + /// The response from the ListNamespaces service method, as returned by QuickSight. /// /// You don't have access to this item. The provided credentials couldn't be validated. /// You might not be authorized to carry out the request. Make sure that your account @@ -12253,39 +12629,39 @@ public virtual ListThemesResponse ListThemes(ListThemesRequest request) /// /// One or more parameters has a value that isn't valid. /// + /// + /// One or more preconditions aren't met. + /// /// /// One or more resources can't be found. /// + /// + /// This resource is currently unavailable. + /// /// /// Access is throttled. /// - /// - /// This error indicates that you are calling an operation on an Amazon QuickSight subscription - /// where the edition doesn't include support for that operation. Amazon Amazon QuickSight - /// currently has Standard Edition and Enterprise Edition. Not every operation and capability - /// is available in every edition. - /// - /// REST API Reference for ListThemes Operation - public virtual Task ListThemesAsync(ListThemesRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + /// REST API Reference for ListNamespaces Operation + public virtual Task ListNamespacesAsync(ListNamespacesRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { var options = new InvokeOptions(); - options.RequestMarshaller = ListThemesRequestMarshaller.Instance; - options.ResponseUnmarshaller = ListThemesResponseUnmarshaller.Instance; + options.RequestMarshaller = ListNamespacesRequestMarshaller.Instance; + options.ResponseUnmarshaller = ListNamespacesResponseUnmarshaller.Instance; - return InvokeAsync(request, options, cancellationToken); + return InvokeAsync(request, options, cancellationToken); } #endregion - #region ListThemeVersions + #region ListRefreshSchedules /// - /// Lists all the versions of the themes in the current Amazon Web Services account. + /// Lists the refresh schedules of a dataset. Each dataset can have up to 5 schedules. /// - /// Container for the necessary parameters to execute the ListThemeVersions service method. + /// Container for the necessary parameters to execute the ListRefreshSchedules service method. /// - /// The response from the ListThemeVersions service method, as returned by QuickSight. + /// The response from the ListRefreshSchedules service method, as returned by QuickSight. /// /// You don't have access to this item. The provided credentials couldn't be validated. /// You might not be authorized to carry out the request. Make sure that your account @@ -12295,44 +12671,38 @@ public virtual ListThemesResponse ListThemes(ListThemesRequest request) /// /// An internal failure occurred. /// - /// - /// The NextToken value isn't valid. - /// /// /// One or more parameters has a value that isn't valid. /// + /// + /// A limit is exceeded. + /// /// /// One or more resources can't be found. /// /// /// Access is throttled. /// - /// - /// This error indicates that you are calling an operation on an Amazon QuickSight subscription - /// where the edition doesn't include support for that operation. Amazon Amazon QuickSight - /// currently has Standard Edition and Enterprise Edition. Not every operation and capability - /// is available in every edition. - /// - /// REST API Reference for ListThemeVersions Operation - public virtual ListThemeVersionsResponse ListThemeVersions(ListThemeVersionsRequest request) + /// REST API Reference for ListRefreshSchedules Operation + public virtual ListRefreshSchedulesResponse ListRefreshSchedules(ListRefreshSchedulesRequest request) { var options = new InvokeOptions(); - options.RequestMarshaller = ListThemeVersionsRequestMarshaller.Instance; - options.ResponseUnmarshaller = ListThemeVersionsResponseUnmarshaller.Instance; + options.RequestMarshaller = ListRefreshSchedulesRequestMarshaller.Instance; + options.ResponseUnmarshaller = ListRefreshSchedulesResponseUnmarshaller.Instance; - return Invoke(request, options); + return Invoke(request, options); } /// - /// Lists all the versions of the themes in the current Amazon Web Services account. + /// Lists the refresh schedules of a dataset. Each dataset can have up to 5 schedules. /// - /// Container for the necessary parameters to execute the ListThemeVersions service method. + /// Container for the necessary parameters to execute the ListRefreshSchedules service method. /// /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// /// - /// The response from the ListThemeVersions service method, as returned by QuickSight. + /// The response from the ListRefreshSchedules service method, as returned by QuickSight. /// /// You don't have access to this item. The provided credentials couldn't be validated. /// You might not be authorized to carry out the request. Make sure that your account @@ -12342,140 +12712,140 @@ public virtual ListThemeVersionsResponse ListThemeVersions(ListThemeVersionsRequ /// /// An internal failure occurred. /// - /// - /// The NextToken value isn't valid. - /// /// /// One or more parameters has a value that isn't valid. /// + /// + /// A limit is exceeded. + /// /// /// One or more resources can't be found. /// /// /// Access is throttled. /// - /// - /// This error indicates that you are calling an operation on an Amazon QuickSight subscription - /// where the edition doesn't include support for that operation. Amazon Amazon QuickSight - /// currently has Standard Edition and Enterprise Edition. Not every operation and capability - /// is available in every edition. - /// - /// REST API Reference for ListThemeVersions Operation - public virtual Task ListThemeVersionsAsync(ListThemeVersionsRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + /// REST API Reference for ListRefreshSchedules Operation + public virtual Task ListRefreshSchedulesAsync(ListRefreshSchedulesRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { var options = new InvokeOptions(); - options.RequestMarshaller = ListThemeVersionsRequestMarshaller.Instance; - options.ResponseUnmarshaller = ListThemeVersionsResponseUnmarshaller.Instance; + options.RequestMarshaller = ListRefreshSchedulesRequestMarshaller.Instance; + options.ResponseUnmarshaller = ListRefreshSchedulesResponseUnmarshaller.Instance; - return InvokeAsync(request, options, cancellationToken); + return InvokeAsync(request, options, cancellationToken); } #endregion - #region ListTopicRefreshSchedules + #region ListRoleMemberships /// - /// Lists all of the refresh schedules for a topic. + /// Lists all groups that are associated with a role. /// - /// Container for the necessary parameters to execute the ListTopicRefreshSchedules service method. + /// Container for the necessary parameters to execute the ListRoleMemberships service method. /// - /// The response from the ListTopicRefreshSchedules service method, as returned by QuickSight. + /// The response from the ListRoleMemberships service method, as returned by QuickSight. /// /// You don't have access to this item. The provided credentials couldn't be validated. /// You might not be authorized to carry out the request. Make sure that your account /// is authorized to use the Amazon QuickSight service, that your policies have the correct /// permissions, and that you are using the correct credentials. /// - /// - /// Updating or deleting a resource can cause an inconsistent state. - /// /// /// An internal failure occurred. /// + /// + /// The NextToken value isn't valid. + /// /// /// One or more parameters has a value that isn't valid. /// /// /// A limit is exceeded. /// - /// - /// The resource specified already exists. + /// + /// One or more preconditions aren't met. /// /// /// One or more resources can't be found. /// + /// + /// This resource is currently unavailable. + /// /// /// Access is throttled. /// - /// REST API Reference for ListTopicRefreshSchedules Operation - public virtual ListTopicRefreshSchedulesResponse ListTopicRefreshSchedules(ListTopicRefreshSchedulesRequest request) + /// REST API Reference for ListRoleMemberships Operation + public virtual ListRoleMembershipsResponse ListRoleMemberships(ListRoleMembershipsRequest request) { var options = new InvokeOptions(); - options.RequestMarshaller = ListTopicRefreshSchedulesRequestMarshaller.Instance; - options.ResponseUnmarshaller = ListTopicRefreshSchedulesResponseUnmarshaller.Instance; + options.RequestMarshaller = ListRoleMembershipsRequestMarshaller.Instance; + options.ResponseUnmarshaller = ListRoleMembershipsResponseUnmarshaller.Instance; - return Invoke(request, options); + return Invoke(request, options); } /// - /// Lists all of the refresh schedules for a topic. + /// Lists all groups that are associated with a role. /// - /// Container for the necessary parameters to execute the ListTopicRefreshSchedules service method. + /// Container for the necessary parameters to execute the ListRoleMemberships service method. /// /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// /// - /// The response from the ListTopicRefreshSchedules service method, as returned by QuickSight. + /// The response from the ListRoleMemberships service method, as returned by QuickSight. /// /// You don't have access to this item. The provided credentials couldn't be validated. /// You might not be authorized to carry out the request. Make sure that your account /// is authorized to use the Amazon QuickSight service, that your policies have the correct /// permissions, and that you are using the correct credentials. /// - /// - /// Updating or deleting a resource can cause an inconsistent state. - /// /// /// An internal failure occurred. /// + /// + /// The NextToken value isn't valid. + /// /// /// One or more parameters has a value that isn't valid. /// /// /// A limit is exceeded. /// - /// - /// The resource specified already exists. + /// + /// One or more preconditions aren't met. /// /// /// One or more resources can't be found. /// + /// + /// This resource is currently unavailable. + /// /// /// Access is throttled. /// - /// REST API Reference for ListTopicRefreshSchedules Operation - public virtual Task ListTopicRefreshSchedulesAsync(ListTopicRefreshSchedulesRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + /// REST API Reference for ListRoleMemberships Operation + public virtual Task ListRoleMembershipsAsync(ListRoleMembershipsRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { var options = new InvokeOptions(); - options.RequestMarshaller = ListTopicRefreshSchedulesRequestMarshaller.Instance; - options.ResponseUnmarshaller = ListTopicRefreshSchedulesResponseUnmarshaller.Instance; + options.RequestMarshaller = ListRoleMembershipsRequestMarshaller.Instance; + options.ResponseUnmarshaller = ListRoleMembershipsResponseUnmarshaller.Instance; - return InvokeAsync(request, options, cancellationToken); + return InvokeAsync(request, options, cancellationToken); } #endregion - #region ListTopicReviewedAnswers + #region ListTagsForResource /// - /// Lists all reviewed answers for a Q Topic. + /// Lists the tags assigned to a resource. /// - /// Container for the necessary parameters to execute the ListTopicReviewedAnswers service method. + /// Container for the necessary parameters to execute the ListTagsForResource service method. /// - /// The response from the ListTopicReviewedAnswers service method, as returned by QuickSight. + /// The response from the ListTagsForResource service method, as returned by QuickSight. /// /// You don't have access to this item. The provided credentials couldn't be validated. /// You might not be authorized to carry out the request. Make sure that your account @@ -12494,26 +12864,26 @@ public virtual ListTopicRefreshSchedulesResponse ListTopicRefreshSchedules(ListT /// /// Access is throttled. /// - /// REST API Reference for ListTopicReviewedAnswers Operation - public virtual ListTopicReviewedAnswersResponse ListTopicReviewedAnswers(ListTopicReviewedAnswersRequest request) + /// REST API Reference for ListTagsForResource Operation + public virtual ListTagsForResourceResponse ListTagsForResource(ListTagsForResourceRequest request) { var options = new InvokeOptions(); - options.RequestMarshaller = ListTopicReviewedAnswersRequestMarshaller.Instance; - options.ResponseUnmarshaller = ListTopicReviewedAnswersResponseUnmarshaller.Instance; + options.RequestMarshaller = ListTagsForResourceRequestMarshaller.Instance; + options.ResponseUnmarshaller = ListTagsForResourceResponseUnmarshaller.Instance; - return Invoke(request, options); + return Invoke(request, options); } /// - /// Lists all reviewed answers for a Q Topic. + /// Lists the tags assigned to a resource. /// - /// Container for the necessary parameters to execute the ListTopicReviewedAnswers service method. + /// Container for the necessary parameters to execute the ListTagsForResource service method. /// /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// /// - /// The response from the ListTopicReviewedAnswers service method, as returned by QuickSight. + /// The response from the ListTagsForResource service method, as returned by QuickSight. /// /// You don't have access to this item. The provided credentials couldn't be validated. /// You might not be authorized to carry out the request. Make sure that your account @@ -12532,199 +12902,187 @@ public virtual ListTopicReviewedAnswersResponse ListTopicReviewedAnswers(ListTop /// /// Access is throttled. /// - /// REST API Reference for ListTopicReviewedAnswers Operation - public virtual Task ListTopicReviewedAnswersAsync(ListTopicReviewedAnswersRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + /// REST API Reference for ListTagsForResource Operation + public virtual Task ListTagsForResourceAsync(ListTagsForResourceRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { var options = new InvokeOptions(); - options.RequestMarshaller = ListTopicReviewedAnswersRequestMarshaller.Instance; - options.ResponseUnmarshaller = ListTopicReviewedAnswersResponseUnmarshaller.Instance; + options.RequestMarshaller = ListTagsForResourceRequestMarshaller.Instance; + options.ResponseUnmarshaller = ListTagsForResourceResponseUnmarshaller.Instance; - return InvokeAsync(request, options, cancellationToken); + return InvokeAsync(request, options, cancellationToken); } #endregion - #region ListTopics + #region ListTemplateAliases /// - /// Lists all of the topics within an account. + /// Lists all the aliases of a template. /// - /// Container for the necessary parameters to execute the ListTopics service method. + /// Container for the necessary parameters to execute the ListTemplateAliases service method. /// - /// The response from the ListTopics service method, as returned by QuickSight. - /// - /// You don't have access to this item. The provided credentials couldn't be validated. - /// You might not be authorized to carry out the request. Make sure that your account - /// is authorized to use the Amazon QuickSight service, that your policies have the correct - /// permissions, and that you are using the correct credentials. - /// + /// The response from the ListTemplateAliases service method, as returned by QuickSight. /// /// An internal failure occurred. /// /// /// The NextToken value isn't valid. /// - /// - /// One or more parameters has a value that isn't valid. + /// + /// One or more resources can't be found. /// /// /// Access is throttled. /// - /// REST API Reference for ListTopics Operation - public virtual ListTopicsResponse ListTopics(ListTopicsRequest request) + /// + /// This error indicates that you are calling an operation on an Amazon QuickSight subscription + /// where the edition doesn't include support for that operation. Amazon Amazon QuickSight + /// currently has Standard Edition and Enterprise Edition. Not every operation and capability + /// is available in every edition. + /// + /// REST API Reference for ListTemplateAliases Operation + public virtual ListTemplateAliasesResponse ListTemplateAliases(ListTemplateAliasesRequest request) { var options = new InvokeOptions(); - options.RequestMarshaller = ListTopicsRequestMarshaller.Instance; - options.ResponseUnmarshaller = ListTopicsResponseUnmarshaller.Instance; + options.RequestMarshaller = ListTemplateAliasesRequestMarshaller.Instance; + options.ResponseUnmarshaller = ListTemplateAliasesResponseUnmarshaller.Instance; - return Invoke(request, options); + return Invoke(request, options); } /// - /// Lists all of the topics within an account. + /// Lists all the aliases of a template. /// - /// Container for the necessary parameters to execute the ListTopics service method. + /// Container for the necessary parameters to execute the ListTemplateAliases service method. /// /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// /// - /// The response from the ListTopics service method, as returned by QuickSight. - /// - /// You don't have access to this item. The provided credentials couldn't be validated. - /// You might not be authorized to carry out the request. Make sure that your account - /// is authorized to use the Amazon QuickSight service, that your policies have the correct - /// permissions, and that you are using the correct credentials. - /// + /// The response from the ListTemplateAliases service method, as returned by QuickSight. /// /// An internal failure occurred. /// /// /// The NextToken value isn't valid. /// - /// - /// One or more parameters has a value that isn't valid. + /// + /// One or more resources can't be found. /// /// /// Access is throttled. /// - /// REST API Reference for ListTopics Operation - public virtual Task ListTopicsAsync(ListTopicsRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + /// + /// This error indicates that you are calling an operation on an Amazon QuickSight subscription + /// where the edition doesn't include support for that operation. Amazon Amazon QuickSight + /// currently has Standard Edition and Enterprise Edition. Not every operation and capability + /// is available in every edition. + /// + /// REST API Reference for ListTemplateAliases Operation + public virtual Task ListTemplateAliasesAsync(ListTemplateAliasesRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { var options = new InvokeOptions(); - options.RequestMarshaller = ListTopicsRequestMarshaller.Instance; - options.ResponseUnmarshaller = ListTopicsResponseUnmarshaller.Instance; + options.RequestMarshaller = ListTemplateAliasesRequestMarshaller.Instance; + options.ResponseUnmarshaller = ListTemplateAliasesResponseUnmarshaller.Instance; - return InvokeAsync(request, options, cancellationToken); + return InvokeAsync(request, options, cancellationToken); } #endregion - #region ListUserGroups + #region ListTemplates /// - /// Lists the Amazon QuickSight groups that an Amazon QuickSight user is a member of. + /// Lists all the templates in the current Amazon QuickSight account. /// - /// Container for the necessary parameters to execute the ListUserGroups service method. + /// Container for the necessary parameters to execute the ListTemplates service method. /// - /// The response from the ListUserGroups service method, as returned by QuickSight. - /// - /// You don't have access to this item. The provided credentials couldn't be validated. - /// You might not be authorized to carry out the request. Make sure that your account - /// is authorized to use the Amazon QuickSight service, that your policies have the correct - /// permissions, and that you are using the correct credentials. - /// + /// The response from the ListTemplates service method, as returned by QuickSight. /// /// An internal failure occurred. /// + /// + /// The NextToken value isn't valid. + /// /// /// One or more parameters has a value that isn't valid. /// - /// - /// One or more preconditions aren't met. - /// /// /// One or more resources can't be found. /// - /// - /// This resource is currently unavailable. - /// /// /// Access is throttled. /// - /// REST API Reference for ListUserGroups Operation - public virtual ListUserGroupsResponse ListUserGroups(ListUserGroupsRequest request) + /// + /// This error indicates that you are calling an operation on an Amazon QuickSight subscription + /// where the edition doesn't include support for that operation. Amazon Amazon QuickSight + /// currently has Standard Edition and Enterprise Edition. Not every operation and capability + /// is available in every edition. + /// + /// REST API Reference for ListTemplates Operation + public virtual ListTemplatesResponse ListTemplates(ListTemplatesRequest request) { var options = new InvokeOptions(); - options.RequestMarshaller = ListUserGroupsRequestMarshaller.Instance; - options.ResponseUnmarshaller = ListUserGroupsResponseUnmarshaller.Instance; + options.RequestMarshaller = ListTemplatesRequestMarshaller.Instance; + options.ResponseUnmarshaller = ListTemplatesResponseUnmarshaller.Instance; - return Invoke(request, options); + return Invoke(request, options); } /// - /// Lists the Amazon QuickSight groups that an Amazon QuickSight user is a member of. + /// Lists all the templates in the current Amazon QuickSight account. /// - /// Container for the necessary parameters to execute the ListUserGroups service method. + /// Container for the necessary parameters to execute the ListTemplates service method. /// /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// /// - /// The response from the ListUserGroups service method, as returned by QuickSight. - /// - /// You don't have access to this item. The provided credentials couldn't be validated. - /// You might not be authorized to carry out the request. Make sure that your account - /// is authorized to use the Amazon QuickSight service, that your policies have the correct - /// permissions, and that you are using the correct credentials. - /// + /// The response from the ListTemplates service method, as returned by QuickSight. /// /// An internal failure occurred. /// + /// + /// The NextToken value isn't valid. + /// /// /// One or more parameters has a value that isn't valid. /// - /// - /// One or more preconditions aren't met. - /// /// /// One or more resources can't be found. /// - /// - /// This resource is currently unavailable. - /// /// /// Access is throttled. /// - /// REST API Reference for ListUserGroups Operation - public virtual Task ListUserGroupsAsync(ListUserGroupsRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + /// + /// This error indicates that you are calling an operation on an Amazon QuickSight subscription + /// where the edition doesn't include support for that operation. Amazon Amazon QuickSight + /// currently has Standard Edition and Enterprise Edition. Not every operation and capability + /// is available in every edition. + /// + /// REST API Reference for ListTemplates Operation + public virtual Task ListTemplatesAsync(ListTemplatesRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { var options = new InvokeOptions(); - options.RequestMarshaller = ListUserGroupsRequestMarshaller.Instance; - options.ResponseUnmarshaller = ListUserGroupsResponseUnmarshaller.Instance; + options.RequestMarshaller = ListTemplatesRequestMarshaller.Instance; + options.ResponseUnmarshaller = ListTemplatesResponseUnmarshaller.Instance; - return InvokeAsync(request, options, cancellationToken); + return InvokeAsync(request, options, cancellationToken); } #endregion - #region ListUsers + #region ListTemplateVersions /// - /// Returns a list of all of the Amazon QuickSight users belonging to this account. + /// Lists all the versions of the templates in the current Amazon QuickSight account. /// - /// Container for the necessary parameters to execute the ListUsers service method. + /// Container for the necessary parameters to execute the ListTemplateVersions service method. /// - /// The response from the ListUsers service method, as returned by QuickSight. - /// - /// You don't have access to this item. The provided credentials couldn't be validated. - /// You might not be authorized to carry out the request. Make sure that your account - /// is authorized to use the Amazon QuickSight service, that your policies have the correct - /// permissions, and that you are using the correct credentials. - /// + /// The response from the ListTemplateVersions service method, as returned by QuickSight. /// /// An internal failure occurred. /// @@ -12734,44 +13092,38 @@ public virtual ListUserGroupsResponse ListUserGroups(ListUserGroupsRequest reque /// /// One or more parameters has a value that isn't valid. /// - /// - /// One or more preconditions aren't met. - /// /// /// One or more resources can't be found. /// - /// - /// This resource is currently unavailable. - /// /// /// Access is throttled. /// - /// REST API Reference for ListUsers Operation - public virtual ListUsersResponse ListUsers(ListUsersRequest request) + /// + /// This error indicates that you are calling an operation on an Amazon QuickSight subscription + /// where the edition doesn't include support for that operation. Amazon Amazon QuickSight + /// currently has Standard Edition and Enterprise Edition. Not every operation and capability + /// is available in every edition. + /// + /// REST API Reference for ListTemplateVersions Operation + public virtual ListTemplateVersionsResponse ListTemplateVersions(ListTemplateVersionsRequest request) { var options = new InvokeOptions(); - options.RequestMarshaller = ListUsersRequestMarshaller.Instance; - options.ResponseUnmarshaller = ListUsersResponseUnmarshaller.Instance; + options.RequestMarshaller = ListTemplateVersionsRequestMarshaller.Instance; + options.ResponseUnmarshaller = ListTemplateVersionsResponseUnmarshaller.Instance; - return Invoke(request, options); + return Invoke(request, options); } /// - /// Returns a list of all of the Amazon QuickSight users belonging to this account. + /// Lists all the versions of the templates in the current Amazon QuickSight account. /// - /// Container for the necessary parameters to execute the ListUsers service method. + /// Container for the necessary parameters to execute the ListTemplateVersions service method. /// /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// /// - /// The response from the ListUsers service method, as returned by QuickSight. - /// - /// You don't have access to this item. The provided credentials couldn't be validated. - /// You might not be authorized to carry out the request. Make sure that your account - /// is authorized to use the Amazon QuickSight service, that your policies have the correct - /// permissions, and that you are using the correct credentials. - /// + /// The response from the ListTemplateVersions service method, as returned by QuickSight. /// /// An internal failure occurred. /// @@ -12781,45 +13133,41 @@ public virtual ListUsersResponse ListUsers(ListUsersRequest request) /// /// One or more parameters has a value that isn't valid. /// - /// - /// One or more preconditions aren't met. - /// /// /// One or more resources can't be found. /// - /// - /// This resource is currently unavailable. - /// /// /// Access is throttled. /// - /// REST API Reference for ListUsers Operation - public virtual Task ListUsersAsync(ListUsersRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + /// + /// This error indicates that you are calling an operation on an Amazon QuickSight subscription + /// where the edition doesn't include support for that operation. Amazon Amazon QuickSight + /// currently has Standard Edition and Enterprise Edition. Not every operation and capability + /// is available in every edition. + /// + /// REST API Reference for ListTemplateVersions Operation + public virtual Task ListTemplateVersionsAsync(ListTemplateVersionsRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { var options = new InvokeOptions(); - options.RequestMarshaller = ListUsersRequestMarshaller.Instance; - options.ResponseUnmarshaller = ListUsersResponseUnmarshaller.Instance; + options.RequestMarshaller = ListTemplateVersionsRequestMarshaller.Instance; + options.ResponseUnmarshaller = ListTemplateVersionsResponseUnmarshaller.Instance; - return InvokeAsync(request, options, cancellationToken); + return InvokeAsync(request, options, cancellationToken); } #endregion - #region ListVPCConnections + #region ListThemeAliases /// - /// Lists all of the VPC connections in the current set Amazon Web Services Region of - /// an Amazon Web Services account. + /// Lists all the aliases of a theme. /// - /// Container for the necessary parameters to execute the ListVPCConnections service method. + /// Container for the necessary parameters to execute the ListThemeAliases service method. /// - /// The response from the ListVPCConnections service method, as returned by QuickSight. - /// - /// You don't have access to this item. The provided credentials couldn't be validated. - /// You might not be authorized to carry out the request. Make sure that your account - /// is authorized to use the Amazon QuickSight service, that your policies have the correct - /// permissions, and that you are using the correct credentials. + /// The response from the ListThemeAliases service method, as returned by QuickSight. + /// + /// Updating or deleting a resource can cause an inconsistent state. /// /// /// An internal failure occurred. @@ -12830,6 +13178,9 @@ public virtual ListUsersResponse ListUsers(ListUsersRequest request) /// /// One or more parameters has a value that isn't valid. /// + /// + /// One or more resources can't be found. + /// /// /// Access is throttled. /// @@ -12839,32 +13190,28 @@ public virtual ListUsersResponse ListUsers(ListUsersRequest request) /// currently has Standard Edition and Enterprise Edition. Not every operation and capability /// is available in every edition. /// - /// REST API Reference for ListVPCConnections Operation - public virtual ListVPCConnectionsResponse ListVPCConnections(ListVPCConnectionsRequest request) + /// REST API Reference for ListThemeAliases Operation + public virtual ListThemeAliasesResponse ListThemeAliases(ListThemeAliasesRequest request) { var options = new InvokeOptions(); - options.RequestMarshaller = ListVPCConnectionsRequestMarshaller.Instance; - options.ResponseUnmarshaller = ListVPCConnectionsResponseUnmarshaller.Instance; + options.RequestMarshaller = ListThemeAliasesRequestMarshaller.Instance; + options.ResponseUnmarshaller = ListThemeAliasesResponseUnmarshaller.Instance; - return Invoke(request, options); + return Invoke(request, options); } /// - /// Lists all of the VPC connections in the current set Amazon Web Services Region of - /// an Amazon Web Services account. + /// Lists all the aliases of a theme. /// - /// Container for the necessary parameters to execute the ListVPCConnections service method. + /// Container for the necessary parameters to execute the ListThemeAliases service method. /// /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// /// - /// The response from the ListVPCConnections service method, as returned by QuickSight. - /// - /// You don't have access to this item. The provided credentials couldn't be validated. - /// You might not be authorized to carry out the request. Make sure that your account - /// is authorized to use the Amazon QuickSight service, that your policies have the correct - /// permissions, and that you are using the correct credentials. + /// The response from the ListThemeAliases service method, as returned by QuickSight. + /// + /// Updating or deleting a resource can cause an inconsistent state. /// /// /// An internal failure occurred. @@ -12875,6 +13222,9 @@ public virtual ListVPCConnectionsResponse ListVPCConnections(ListVPCConnectionsR /// /// One or more parameters has a value that isn't valid. /// + /// + /// One or more resources can't be found. + /// /// /// Access is throttled. /// @@ -12884,130 +13234,122 @@ public virtual ListVPCConnectionsResponse ListVPCConnections(ListVPCConnectionsR /// currently has Standard Edition and Enterprise Edition. Not every operation and capability /// is available in every edition. /// - /// REST API Reference for ListVPCConnections Operation - public virtual Task ListVPCConnectionsAsync(ListVPCConnectionsRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + /// REST API Reference for ListThemeAliases Operation + public virtual Task ListThemeAliasesAsync(ListThemeAliasesRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { var options = new InvokeOptions(); - options.RequestMarshaller = ListVPCConnectionsRequestMarshaller.Instance; - options.ResponseUnmarshaller = ListVPCConnectionsResponseUnmarshaller.Instance; + options.RequestMarshaller = ListThemeAliasesRequestMarshaller.Instance; + options.ResponseUnmarshaller = ListThemeAliasesResponseUnmarshaller.Instance; - return InvokeAsync(request, options, cancellationToken); + return InvokeAsync(request, options, cancellationToken); } #endregion - #region PutDataSetRefreshProperties + #region ListThemes /// - /// Creates or updates the dataset refresh properties for the dataset. + /// Lists all the themes in the current Amazon Web Services account. /// - /// Container for the necessary parameters to execute the PutDataSetRefreshProperties service method. + /// Container for the necessary parameters to execute the ListThemes service method. /// - /// The response from the PutDataSetRefreshProperties service method, as returned by QuickSight. + /// The response from the ListThemes service method, as returned by QuickSight. /// /// You don't have access to this item. The provided credentials couldn't be validated. /// You might not be authorized to carry out the request. Make sure that your account /// is authorized to use the Amazon QuickSight service, that your policies have the correct /// permissions, and that you are using the correct credentials. /// - /// - /// Updating or deleting a resource can cause an inconsistent state. - /// /// /// An internal failure occurred. /// + /// + /// The NextToken value isn't valid. + /// /// /// One or more parameters has a value that isn't valid. /// - /// - /// A limit is exceeded. - /// - /// - /// One or more preconditions aren't met. - /// /// /// One or more resources can't be found. /// /// /// Access is throttled. /// - /// REST API Reference for PutDataSetRefreshProperties Operation - public virtual PutDataSetRefreshPropertiesResponse PutDataSetRefreshProperties(PutDataSetRefreshPropertiesRequest request) + /// + /// This error indicates that you are calling an operation on an Amazon QuickSight subscription + /// where the edition doesn't include support for that operation. Amazon Amazon QuickSight + /// currently has Standard Edition and Enterprise Edition. Not every operation and capability + /// is available in every edition. + /// + /// REST API Reference for ListThemes Operation + public virtual ListThemesResponse ListThemes(ListThemesRequest request) { var options = new InvokeOptions(); - options.RequestMarshaller = PutDataSetRefreshPropertiesRequestMarshaller.Instance; - options.ResponseUnmarshaller = PutDataSetRefreshPropertiesResponseUnmarshaller.Instance; + options.RequestMarshaller = ListThemesRequestMarshaller.Instance; + options.ResponseUnmarshaller = ListThemesResponseUnmarshaller.Instance; - return Invoke(request, options); + return Invoke(request, options); } /// - /// Creates or updates the dataset refresh properties for the dataset. + /// Lists all the themes in the current Amazon Web Services account. /// - /// Container for the necessary parameters to execute the PutDataSetRefreshProperties service method. + /// Container for the necessary parameters to execute the ListThemes service method. /// /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// /// - /// The response from the PutDataSetRefreshProperties service method, as returned by QuickSight. + /// The response from the ListThemes service method, as returned by QuickSight. /// /// You don't have access to this item. The provided credentials couldn't be validated. /// You might not be authorized to carry out the request. Make sure that your account /// is authorized to use the Amazon QuickSight service, that your policies have the correct /// permissions, and that you are using the correct credentials. /// - /// - /// Updating or deleting a resource can cause an inconsistent state. - /// /// /// An internal failure occurred. /// + /// + /// The NextToken value isn't valid. + /// /// /// One or more parameters has a value that isn't valid. /// - /// - /// A limit is exceeded. - /// - /// - /// One or more preconditions aren't met. - /// /// /// One or more resources can't be found. /// /// /// Access is throttled. /// - /// REST API Reference for PutDataSetRefreshProperties Operation - public virtual Task PutDataSetRefreshPropertiesAsync(PutDataSetRefreshPropertiesRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + /// + /// This error indicates that you are calling an operation on an Amazon QuickSight subscription + /// where the edition doesn't include support for that operation. Amazon Amazon QuickSight + /// currently has Standard Edition and Enterprise Edition. Not every operation and capability + /// is available in every edition. + /// + /// REST API Reference for ListThemes Operation + public virtual Task ListThemesAsync(ListThemesRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { var options = new InvokeOptions(); - options.RequestMarshaller = PutDataSetRefreshPropertiesRequestMarshaller.Instance; - options.ResponseUnmarshaller = PutDataSetRefreshPropertiesResponseUnmarshaller.Instance; + options.RequestMarshaller = ListThemesRequestMarshaller.Instance; + options.ResponseUnmarshaller = ListThemesResponseUnmarshaller.Instance; - return InvokeAsync(request, options, cancellationToken); + return InvokeAsync(request, options, cancellationToken); } #endregion - #region RegisterUser + #region ListThemeVersions /// - /// Creates an Amazon QuickSight user whose identity is associated with the Identity and - /// Access Management (IAM) identity or role specified in the request. When you register - /// a new user from the Amazon QuickSight API, Amazon QuickSight generates a registration - /// URL. The user accesses this registration URL to create their account. Amazon QuickSight - /// doesn't send a registration email to users who are registered from the Amazon QuickSight - /// API. If you want new users to receive a registration email, then add those users in - /// the Amazon QuickSight console. For more information on registering a new user in the - /// Amazon QuickSight console, see - /// Inviting users to access Amazon QuickSight. + /// Lists all the versions of the themes in the current Amazon Web Services account. /// - /// Container for the necessary parameters to execute the RegisterUser service method. + /// Container for the necessary parameters to execute the ListThemeVersions service method. /// - /// The response from the RegisterUser service method, as returned by QuickSight. + /// The response from the ListThemeVersions service method, as returned by QuickSight. /// /// You don't have access to this item. The provided credentials couldn't be validated. /// You might not be authorized to carry out the request. Make sure that your account @@ -13017,55 +13359,44 @@ public virtual PutDataSetRefreshPropertiesResponse PutDataSetRefreshProperties(P /// /// An internal failure occurred. /// + /// + /// The NextToken value isn't valid. + /// /// /// One or more parameters has a value that isn't valid. /// - /// - /// A limit is exceeded. - /// - /// - /// One or more preconditions aren't met. - /// - /// - /// The resource specified already exists. - /// /// /// One or more resources can't be found. /// - /// - /// This resource is currently unavailable. - /// /// /// Access is throttled. /// - /// REST API Reference for RegisterUser Operation - public virtual RegisterUserResponse RegisterUser(RegisterUserRequest request) + /// + /// This error indicates that you are calling an operation on an Amazon QuickSight subscription + /// where the edition doesn't include support for that operation. Amazon Amazon QuickSight + /// currently has Standard Edition and Enterprise Edition. Not every operation and capability + /// is available in every edition. + /// + /// REST API Reference for ListThemeVersions Operation + public virtual ListThemeVersionsResponse ListThemeVersions(ListThemeVersionsRequest request) { var options = new InvokeOptions(); - options.RequestMarshaller = RegisterUserRequestMarshaller.Instance; - options.ResponseUnmarshaller = RegisterUserResponseUnmarshaller.Instance; + options.RequestMarshaller = ListThemeVersionsRequestMarshaller.Instance; + options.ResponseUnmarshaller = ListThemeVersionsResponseUnmarshaller.Instance; - return Invoke(request, options); + return Invoke(request, options); } /// - /// Creates an Amazon QuickSight user whose identity is associated with the Identity and - /// Access Management (IAM) identity or role specified in the request. When you register - /// a new user from the Amazon QuickSight API, Amazon QuickSight generates a registration - /// URL. The user accesses this registration URL to create their account. Amazon QuickSight - /// doesn't send a registration email to users who are registered from the Amazon QuickSight - /// API. If you want new users to receive a registration email, then add those users in - /// the Amazon QuickSight console. For more information on registering a new user in the - /// Amazon QuickSight console, see - /// Inviting users to access Amazon QuickSight. + /// Lists all the versions of the themes in the current Amazon Web Services account. /// - /// Container for the necessary parameters to execute the RegisterUser service method. + /// Container for the necessary parameters to execute the ListThemeVersions service method. /// /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// /// - /// The response from the RegisterUser service method, as returned by QuickSight. + /// The response from the ListThemeVersions service method, as returned by QuickSight. /// /// You don't have access to this item. The provided credentials couldn't be validated. /// You might not be authorized to carry out the request. Make sure that your account @@ -13075,48 +13406,51 @@ public virtual RegisterUserResponse RegisterUser(RegisterUserRequest request) /// /// An internal failure occurred. /// + /// + /// The NextToken value isn't valid. + /// /// /// One or more parameters has a value that isn't valid. /// - /// - /// A limit is exceeded. - /// - /// - /// One or more preconditions aren't met. - /// - /// - /// The resource specified already exists. - /// /// /// One or more resources can't be found. /// - /// - /// This resource is currently unavailable. - /// /// /// Access is throttled. /// - /// REST API Reference for RegisterUser Operation - public virtual Task RegisterUserAsync(RegisterUserRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + /// + /// This error indicates that you are calling an operation on an Amazon QuickSight subscription + /// where the edition doesn't include support for that operation. Amazon Amazon QuickSight + /// currently has Standard Edition and Enterprise Edition. Not every operation and capability + /// is available in every edition. + /// + /// REST API Reference for ListThemeVersions Operation + public virtual Task ListThemeVersionsAsync(ListThemeVersionsRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { var options = new InvokeOptions(); - options.RequestMarshaller = RegisterUserRequestMarshaller.Instance; - options.ResponseUnmarshaller = RegisterUserResponseUnmarshaller.Instance; + options.RequestMarshaller = ListThemeVersionsRequestMarshaller.Instance; + options.ResponseUnmarshaller = ListThemeVersionsResponseUnmarshaller.Instance; - return InvokeAsync(request, options, cancellationToken); + return InvokeAsync(request, options, cancellationToken); } #endregion - #region RestoreAnalysis + #region ListTopicRefreshSchedules /// - /// Restores an analysis. + /// Lists all of the refresh schedules for a topic. /// - /// Container for the necessary parameters to execute the RestoreAnalysis service method. + /// Container for the necessary parameters to execute the ListTopicRefreshSchedules service method. /// - /// The response from the RestoreAnalysis service method, as returned by QuickSight. + /// The response from the ListTopicRefreshSchedules service method, as returned by QuickSight. + /// + /// You don't have access to this item. The provided credentials couldn't be validated. + /// You might not be authorized to carry out the request. Make sure that your account + /// is authorized to use the Amazon QuickSight service, that your policies have the correct + /// permissions, and that you are using the correct credentials. + /// /// /// Updating or deleting a resource can cause an inconsistent state. /// @@ -13126,38 +13460,44 @@ public virtual RegisterUserResponse RegisterUser(RegisterUserRequest request) /// /// One or more parameters has a value that isn't valid. /// + /// + /// A limit is exceeded. + /// + /// + /// The resource specified already exists. + /// /// /// One or more resources can't be found. /// /// /// Access is throttled. /// - /// - /// This error indicates that you are calling an operation on an Amazon QuickSight subscription - /// where the edition doesn't include support for that operation. Amazon Amazon QuickSight - /// currently has Standard Edition and Enterprise Edition. Not every operation and capability - /// is available in every edition. - /// - /// REST API Reference for RestoreAnalysis Operation - public virtual RestoreAnalysisResponse RestoreAnalysis(RestoreAnalysisRequest request) + /// REST API Reference for ListTopicRefreshSchedules Operation + public virtual ListTopicRefreshSchedulesResponse ListTopicRefreshSchedules(ListTopicRefreshSchedulesRequest request) { var options = new InvokeOptions(); - options.RequestMarshaller = RestoreAnalysisRequestMarshaller.Instance; - options.ResponseUnmarshaller = RestoreAnalysisResponseUnmarshaller.Instance; + options.RequestMarshaller = ListTopicRefreshSchedulesRequestMarshaller.Instance; + options.ResponseUnmarshaller = ListTopicRefreshSchedulesResponseUnmarshaller.Instance; - return Invoke(request, options); + return Invoke(request, options); } /// - /// Restores an analysis. + /// Lists all of the refresh schedules for a topic. /// - /// Container for the necessary parameters to execute the RestoreAnalysis service method. + /// Container for the necessary parameters to execute the ListTopicRefreshSchedules service method. /// /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// /// - /// The response from the RestoreAnalysis service method, as returned by QuickSight. + /// The response from the ListTopicRefreshSchedules service method, as returned by QuickSight. + /// + /// You don't have access to this item. The provided credentials couldn't be validated. + /// You might not be authorized to carry out the request. Make sure that your account + /// is authorized to use the Amazon QuickSight service, that your policies have the correct + /// permissions, and that you are using the correct credentials. + /// /// /// Updating or deleting a resource can cause an inconsistent state. /// @@ -13167,52 +13507,48 @@ public virtual RestoreAnalysisResponse RestoreAnalysis(RestoreAnalysisRequest re /// /// One or more parameters has a value that isn't valid. /// + /// + /// A limit is exceeded. + /// + /// + /// The resource specified already exists. + /// /// /// One or more resources can't be found. /// /// /// Access is throttled. /// - /// - /// This error indicates that you are calling an operation on an Amazon QuickSight subscription - /// where the edition doesn't include support for that operation. Amazon Amazon QuickSight - /// currently has Standard Edition and Enterprise Edition. Not every operation and capability - /// is available in every edition. - /// - /// REST API Reference for RestoreAnalysis Operation - public virtual Task RestoreAnalysisAsync(RestoreAnalysisRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + /// REST API Reference for ListTopicRefreshSchedules Operation + public virtual Task ListTopicRefreshSchedulesAsync(ListTopicRefreshSchedulesRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { var options = new InvokeOptions(); - options.RequestMarshaller = RestoreAnalysisRequestMarshaller.Instance; - options.ResponseUnmarshaller = RestoreAnalysisResponseUnmarshaller.Instance; + options.RequestMarshaller = ListTopicRefreshSchedulesRequestMarshaller.Instance; + options.ResponseUnmarshaller = ListTopicRefreshSchedulesResponseUnmarshaller.Instance; - return InvokeAsync(request, options, cancellationToken); + return InvokeAsync(request, options, cancellationToken); } #endregion - #region SearchAnalyses + #region ListTopicReviewedAnswers /// - /// Searches for analyses that belong to the user specified in the filter. - /// - /// - /// - /// This operation is eventually consistent. The results are best effort and may not reflect - /// very recent updates and changes. - /// - /// + /// Lists all reviewed answers for a Q Topic. /// - /// Container for the necessary parameters to execute the SearchAnalyses service method. + /// Container for the necessary parameters to execute the ListTopicReviewedAnswers service method. /// - /// The response from the SearchAnalyses service method, as returned by QuickSight. + /// The response from the ListTopicReviewedAnswers service method, as returned by QuickSight. + /// + /// You don't have access to this item. The provided credentials couldn't be validated. + /// You might not be authorized to carry out the request. Make sure that your account + /// is authorized to use the Amazon QuickSight service, that your policies have the correct + /// permissions, and that you are using the correct credentials. + /// /// /// An internal failure occurred. /// - /// - /// The NextToken value isn't valid. - /// /// /// One or more parameters has a value that isn't valid. /// @@ -13222,45 +13558,35 @@ public virtual RestoreAnalysisResponse RestoreAnalysis(RestoreAnalysisRequest re /// /// Access is throttled. /// - /// - /// This error indicates that you are calling an operation on an Amazon QuickSight subscription - /// where the edition doesn't include support for that operation. Amazon Amazon QuickSight - /// currently has Standard Edition and Enterprise Edition. Not every operation and capability - /// is available in every edition. - /// - /// REST API Reference for SearchAnalyses Operation - public virtual SearchAnalysesResponse SearchAnalyses(SearchAnalysesRequest request) + /// REST API Reference for ListTopicReviewedAnswers Operation + public virtual ListTopicReviewedAnswersResponse ListTopicReviewedAnswers(ListTopicReviewedAnswersRequest request) { var options = new InvokeOptions(); - options.RequestMarshaller = SearchAnalysesRequestMarshaller.Instance; - options.ResponseUnmarshaller = SearchAnalysesResponseUnmarshaller.Instance; + options.RequestMarshaller = ListTopicReviewedAnswersRequestMarshaller.Instance; + options.ResponseUnmarshaller = ListTopicReviewedAnswersResponseUnmarshaller.Instance; - return Invoke(request, options); + return Invoke(request, options); } /// - /// Searches for analyses that belong to the user specified in the filter. - /// - /// - /// - /// This operation is eventually consistent. The results are best effort and may not reflect - /// very recent updates and changes. - /// - /// + /// Lists all reviewed answers for a Q Topic. /// - /// Container for the necessary parameters to execute the SearchAnalyses service method. + /// Container for the necessary parameters to execute the ListTopicReviewedAnswers service method. /// /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// /// - /// The response from the SearchAnalyses service method, as returned by QuickSight. + /// The response from the ListTopicReviewedAnswers service method, as returned by QuickSight. + /// + /// You don't have access to this item. The provided credentials couldn't be validated. + /// You might not be authorized to carry out the request. Make sure that your account + /// is authorized to use the Amazon QuickSight service, that your policies have the correct + /// permissions, and that you are using the correct credentials. + /// /// /// An internal failure occurred. /// - /// - /// The NextToken value isn't valid. - /// /// /// One or more parameters has a value that isn't valid. /// @@ -13270,40 +13596,33 @@ public virtual SearchAnalysesResponse SearchAnalyses(SearchAnalysesRequest reque /// /// Access is throttled. /// - /// - /// This error indicates that you are calling an operation on an Amazon QuickSight subscription - /// where the edition doesn't include support for that operation. Amazon Amazon QuickSight - /// currently has Standard Edition and Enterprise Edition. Not every operation and capability - /// is available in every edition. - /// - /// REST API Reference for SearchAnalyses Operation - public virtual Task SearchAnalysesAsync(SearchAnalysesRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + /// REST API Reference for ListTopicReviewedAnswers Operation + public virtual Task ListTopicReviewedAnswersAsync(ListTopicReviewedAnswersRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { var options = new InvokeOptions(); - options.RequestMarshaller = SearchAnalysesRequestMarshaller.Instance; - options.ResponseUnmarshaller = SearchAnalysesResponseUnmarshaller.Instance; + options.RequestMarshaller = ListTopicReviewedAnswersRequestMarshaller.Instance; + options.ResponseUnmarshaller = ListTopicReviewedAnswersResponseUnmarshaller.Instance; - return InvokeAsync(request, options, cancellationToken); + return InvokeAsync(request, options, cancellationToken); } #endregion - #region SearchDashboards + #region ListTopics /// - /// Searches for dashboards that belong to a user. - /// - /// - /// - /// This operation is eventually consistent. The results are best effort and may not reflect - /// very recent updates and changes. - /// - /// + /// Lists all of the topics within an account. /// - /// Container for the necessary parameters to execute the SearchDashboards service method. + /// Container for the necessary parameters to execute the ListTopics service method. /// - /// The response from the SearchDashboards service method, as returned by QuickSight. + /// The response from the ListTopics service method, as returned by QuickSight. + /// + /// You don't have access to this item. The provided credentials couldn't be validated. + /// You might not be authorized to carry out the request. Make sure that your account + /// is authorized to use the Amazon QuickSight service, that your policies have the correct + /// permissions, and that you are using the correct credentials. + /// /// /// An internal failure occurred. /// @@ -13313,45 +13632,35 @@ public virtual SearchAnalysesResponse SearchAnalyses(SearchAnalysesRequest reque /// /// One or more parameters has a value that isn't valid. /// - /// - /// One or more resources can't be found. - /// /// /// Access is throttled. /// - /// - /// This error indicates that you are calling an operation on an Amazon QuickSight subscription - /// where the edition doesn't include support for that operation. Amazon Amazon QuickSight - /// currently has Standard Edition and Enterprise Edition. Not every operation and capability - /// is available in every edition. - /// - /// REST API Reference for SearchDashboards Operation - public virtual SearchDashboardsResponse SearchDashboards(SearchDashboardsRequest request) + /// REST API Reference for ListTopics Operation + public virtual ListTopicsResponse ListTopics(ListTopicsRequest request) { var options = new InvokeOptions(); - options.RequestMarshaller = SearchDashboardsRequestMarshaller.Instance; - options.ResponseUnmarshaller = SearchDashboardsResponseUnmarshaller.Instance; + options.RequestMarshaller = ListTopicsRequestMarshaller.Instance; + options.ResponseUnmarshaller = ListTopicsResponseUnmarshaller.Instance; - return Invoke(request, options); + return Invoke(request, options); } /// - /// Searches for dashboards that belong to a user. - /// - /// - /// - /// This operation is eventually consistent. The results are best effort and may not reflect - /// very recent updates and changes. - /// - /// + /// Lists all of the topics within an account. /// - /// Container for the necessary parameters to execute the SearchDashboards service method. + /// Container for the necessary parameters to execute the ListTopics service method. /// /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// /// - /// The response from the SearchDashboards service method, as returned by QuickSight. + /// The response from the ListTopics service method, as returned by QuickSight. + /// + /// You don't have access to this item. The provided credentials couldn't be validated. + /// You might not be authorized to carry out the request. Make sure that your account + /// is authorized to use the Amazon QuickSight service, that your policies have the correct + /// permissions, and that you are using the correct credentials. + /// /// /// An internal failure occurred. /// @@ -13361,39 +13670,30 @@ public virtual SearchDashboardsResponse SearchDashboards(SearchDashboardsRequest /// /// One or more parameters has a value that isn't valid. /// - /// - /// One or more resources can't be found. - /// /// /// Access is throttled. /// - /// - /// This error indicates that you are calling an operation on an Amazon QuickSight subscription - /// where the edition doesn't include support for that operation. Amazon Amazon QuickSight - /// currently has Standard Edition and Enterprise Edition. Not every operation and capability - /// is available in every edition. - /// - /// REST API Reference for SearchDashboards Operation - public virtual Task SearchDashboardsAsync(SearchDashboardsRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + /// REST API Reference for ListTopics Operation + public virtual Task ListTopicsAsync(ListTopicsRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { var options = new InvokeOptions(); - options.RequestMarshaller = SearchDashboardsRequestMarshaller.Instance; - options.ResponseUnmarshaller = SearchDashboardsResponseUnmarshaller.Instance; + options.RequestMarshaller = ListTopicsRequestMarshaller.Instance; + options.ResponseUnmarshaller = ListTopicsResponseUnmarshaller.Instance; - return InvokeAsync(request, options, cancellationToken); + return InvokeAsync(request, options, cancellationToken); } #endregion - #region SearchDataSets + #region ListUserGroups /// - /// Use the SearchDataSets operation to search for datasets that belong to an account. + /// Lists the Amazon QuickSight groups that an Amazon QuickSight user is a member of. /// - /// Container for the necessary parameters to execute the SearchDataSets service method. + /// Container for the necessary parameters to execute the ListUserGroups service method. /// - /// The response from the SearchDataSets service method, as returned by QuickSight. + /// The response from the ListUserGroups service method, as returned by QuickSight. /// /// You don't have access to this item. The provided credentials couldn't be validated. /// You might not be authorized to carry out the request. Make sure that your account @@ -13403,38 +13703,41 @@ public virtual SearchDashboardsResponse SearchDashboards(SearchDashboardsRequest /// /// An internal failure occurred. /// - /// - /// The NextToken value isn't valid. - /// /// /// One or more parameters has a value that isn't valid. /// + /// + /// One or more preconditions aren't met. + /// /// /// One or more resources can't be found. /// + /// + /// This resource is currently unavailable. + /// /// /// Access is throttled. /// - /// REST API Reference for SearchDataSets Operation - public virtual SearchDataSetsResponse SearchDataSets(SearchDataSetsRequest request) + /// REST API Reference for ListUserGroups Operation + public virtual ListUserGroupsResponse ListUserGroups(ListUserGroupsRequest request) { var options = new InvokeOptions(); - options.RequestMarshaller = SearchDataSetsRequestMarshaller.Instance; - options.ResponseUnmarshaller = SearchDataSetsResponseUnmarshaller.Instance; + options.RequestMarshaller = ListUserGroupsRequestMarshaller.Instance; + options.ResponseUnmarshaller = ListUserGroupsResponseUnmarshaller.Instance; - return Invoke(request, options); + return Invoke(request, options); } /// - /// Use the SearchDataSets operation to search for datasets that belong to an account. + /// Lists the Amazon QuickSight groups that an Amazon QuickSight user is a member of. /// - /// Container for the necessary parameters to execute the SearchDataSets service method. + /// Container for the necessary parameters to execute the ListUserGroups service method. /// /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// /// - /// The response from the SearchDataSets service method, as returned by QuickSight. + /// The response from the ListUserGroups service method, as returned by QuickSight. /// /// You don't have access to this item. The provided credentials couldn't be validated. /// You might not be authorized to carry out the request. Make sure that your account @@ -13444,40 +13747,42 @@ public virtual SearchDataSetsResponse SearchDataSets(SearchDataSetsRequest reque /// /// An internal failure occurred. /// - /// - /// The NextToken value isn't valid. - /// /// /// One or more parameters has a value that isn't valid. /// + /// + /// One or more preconditions aren't met. + /// /// /// One or more resources can't be found. /// + /// + /// This resource is currently unavailable. + /// /// /// Access is throttled. /// - /// REST API Reference for SearchDataSets Operation - public virtual Task SearchDataSetsAsync(SearchDataSetsRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + /// REST API Reference for ListUserGroups Operation + public virtual Task ListUserGroupsAsync(ListUserGroupsRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { var options = new InvokeOptions(); - options.RequestMarshaller = SearchDataSetsRequestMarshaller.Instance; - options.ResponseUnmarshaller = SearchDataSetsResponseUnmarshaller.Instance; + options.RequestMarshaller = ListUserGroupsRequestMarshaller.Instance; + options.ResponseUnmarshaller = ListUserGroupsResponseUnmarshaller.Instance; - return InvokeAsync(request, options, cancellationToken); + return InvokeAsync(request, options, cancellationToken); } #endregion - #region SearchDataSources + #region ListUsers /// - /// Use the SearchDataSources operation to search for data sources that belong - /// to an account. + /// Returns a list of all of the Amazon QuickSight users belonging to this account. /// - /// Container for the necessary parameters to execute the SearchDataSources service method. + /// Container for the necessary parameters to execute the ListUsers service method. /// - /// The response from the SearchDataSources service method, as returned by QuickSight. + /// The response from the ListUsers service method, as returned by QuickSight. /// /// You don't have access to this item. The provided credentials couldn't be validated. /// You might not be authorized to carry out the request. Make sure that your account @@ -13493,33 +13798,38 @@ public virtual SearchDataSetsResponse SearchDataSets(SearchDataSetsRequest reque /// /// One or more parameters has a value that isn't valid. /// + /// + /// One or more preconditions aren't met. + /// /// /// One or more resources can't be found. /// + /// + /// This resource is currently unavailable. + /// /// /// Access is throttled. /// - /// REST API Reference for SearchDataSources Operation - public virtual SearchDataSourcesResponse SearchDataSources(SearchDataSourcesRequest request) + /// REST API Reference for ListUsers Operation + public virtual ListUsersResponse ListUsers(ListUsersRequest request) { var options = new InvokeOptions(); - options.RequestMarshaller = SearchDataSourcesRequestMarshaller.Instance; - options.ResponseUnmarshaller = SearchDataSourcesResponseUnmarshaller.Instance; + options.RequestMarshaller = ListUsersRequestMarshaller.Instance; + options.ResponseUnmarshaller = ListUsersResponseUnmarshaller.Instance; - return Invoke(request, options); + return Invoke(request, options); } /// - /// Use the SearchDataSources operation to search for data sources that belong - /// to an account. + /// Returns a list of all of the Amazon QuickSight users belonging to this account. /// - /// Container for the necessary parameters to execute the SearchDataSources service method. + /// Container for the necessary parameters to execute the ListUsers service method. /// /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// /// - /// The response from the SearchDataSources service method, as returned by QuickSight. + /// The response from the ListUsers service method, as returned by QuickSight. /// /// You don't have access to this item. The provided credentials couldn't be validated. /// You might not be authorized to carry out the request. Make sure that your account @@ -13535,33 +13845,40 @@ public virtual SearchDataSourcesResponse SearchDataSources(SearchDataSourcesRequ /// /// One or more parameters has a value that isn't valid. /// + /// + /// One or more preconditions aren't met. + /// /// /// One or more resources can't be found. /// + /// + /// This resource is currently unavailable. + /// /// /// Access is throttled. /// - /// REST API Reference for SearchDataSources Operation - public virtual Task SearchDataSourcesAsync(SearchDataSourcesRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + /// REST API Reference for ListUsers Operation + public virtual Task ListUsersAsync(ListUsersRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { var options = new InvokeOptions(); - options.RequestMarshaller = SearchDataSourcesRequestMarshaller.Instance; - options.ResponseUnmarshaller = SearchDataSourcesResponseUnmarshaller.Instance; + options.RequestMarshaller = ListUsersRequestMarshaller.Instance; + options.ResponseUnmarshaller = ListUsersResponseUnmarshaller.Instance; - return InvokeAsync(request, options, cancellationToken); + return InvokeAsync(request, options, cancellationToken); } #endregion - #region SearchFolders + #region ListVPCConnections /// - /// Searches the subfolders in a folder. + /// Lists all of the VPC connections in the current set Amazon Web Services Region of + /// an Amazon Web Services account. /// - /// Container for the necessary parameters to execute the SearchFolders service method. + /// Container for the necessary parameters to execute the ListVPCConnections service method. /// - /// The response from the SearchFolders service method, as returned by QuickSight. + /// The response from the ListVPCConnections service method, as returned by QuickSight. /// /// You don't have access to this item. The provided credentials couldn't be validated. /// You might not be authorized to carry out the request. Make sure that your account @@ -13577,13 +13894,6 @@ public virtual SearchDataSourcesResponse SearchDataSources(SearchDataSourcesRequ /// /// One or more parameters has a value that isn't valid. /// - /// - /// You don't have this feature activated for your account. To fix this issue, contact - /// Amazon Web Services support. - /// - /// - /// One or more resources can't be found. - /// /// /// Access is throttled. /// @@ -13593,26 +13903,27 @@ public virtual SearchDataSourcesResponse SearchDataSources(SearchDataSourcesRequ /// currently has Standard Edition and Enterprise Edition. Not every operation and capability /// is available in every edition. /// - /// REST API Reference for SearchFolders Operation - public virtual SearchFoldersResponse SearchFolders(SearchFoldersRequest request) + /// REST API Reference for ListVPCConnections Operation + public virtual ListVPCConnectionsResponse ListVPCConnections(ListVPCConnectionsRequest request) { var options = new InvokeOptions(); - options.RequestMarshaller = SearchFoldersRequestMarshaller.Instance; - options.ResponseUnmarshaller = SearchFoldersResponseUnmarshaller.Instance; + options.RequestMarshaller = ListVPCConnectionsRequestMarshaller.Instance; + options.ResponseUnmarshaller = ListVPCConnectionsResponseUnmarshaller.Instance; - return Invoke(request, options); + return Invoke(request, options); } /// - /// Searches the subfolders in a folder. + /// Lists all of the VPC connections in the current set Amazon Web Services Region of + /// an Amazon Web Services account. /// - /// Container for the necessary parameters to execute the SearchFolders service method. + /// Container for the necessary parameters to execute the ListVPCConnections service method. /// /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// /// - /// The response from the SearchFolders service method, as returned by QuickSight. + /// The response from the ListVPCConnections service method, as returned by QuickSight. /// /// You don't have access to this item. The provided credentials couldn't be validated. /// You might not be authorized to carry out the request. Make sure that your account @@ -13628,13 +13939,6 @@ public virtual SearchFoldersResponse SearchFolders(SearchFoldersRequest request) /// /// One or more parameters has a value that isn't valid. /// - /// - /// You don't have this feature activated for your account. To fix this issue, contact - /// Amazon Web Services support. - /// - /// - /// One or more resources can't be found. - /// /// /// Access is throttled. /// @@ -13644,147 +13948,138 @@ public virtual SearchFoldersResponse SearchFolders(SearchFoldersRequest request) /// currently has Standard Edition and Enterprise Edition. Not every operation and capability /// is available in every edition. /// - /// REST API Reference for SearchFolders Operation - public virtual Task SearchFoldersAsync(SearchFoldersRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + /// REST API Reference for ListVPCConnections Operation + public virtual Task ListVPCConnectionsAsync(ListVPCConnectionsRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { var options = new InvokeOptions(); - options.RequestMarshaller = SearchFoldersRequestMarshaller.Instance; - options.ResponseUnmarshaller = SearchFoldersResponseUnmarshaller.Instance; + options.RequestMarshaller = ListVPCConnectionsRequestMarshaller.Instance; + options.ResponseUnmarshaller = ListVPCConnectionsResponseUnmarshaller.Instance; - return InvokeAsync(request, options, cancellationToken); + return InvokeAsync(request, options, cancellationToken); } #endregion - #region SearchGroups + #region PutDataSetRefreshProperties /// - /// Use the SearchGroups operation to search groups in a specified Amazon QuickSight - /// namespace using the supplied filters. + /// Creates or updates the dataset refresh properties for the dataset. /// - /// Container for the necessary parameters to execute the SearchGroups service method. + /// Container for the necessary parameters to execute the PutDataSetRefreshProperties service method. /// - /// The response from the SearchGroups service method, as returned by QuickSight. + /// The response from the PutDataSetRefreshProperties service method, as returned by QuickSight. /// /// You don't have access to this item. The provided credentials couldn't be validated. /// You might not be authorized to carry out the request. Make sure that your account /// is authorized to use the Amazon QuickSight service, that your policies have the correct /// permissions, and that you are using the correct credentials. /// + /// + /// Updating or deleting a resource can cause an inconsistent state. + /// /// /// An internal failure occurred. /// - /// - /// The NextToken value isn't valid. - /// /// /// One or more parameters has a value that isn't valid. /// + /// + /// A limit is exceeded. + /// /// /// One or more preconditions aren't met. /// /// /// One or more resources can't be found. /// - /// - /// This resource is currently unavailable. - /// /// /// Access is throttled. /// - /// REST API Reference for SearchGroups Operation - public virtual SearchGroupsResponse SearchGroups(SearchGroupsRequest request) + /// REST API Reference for PutDataSetRefreshProperties Operation + public virtual PutDataSetRefreshPropertiesResponse PutDataSetRefreshProperties(PutDataSetRefreshPropertiesRequest request) { var options = new InvokeOptions(); - options.RequestMarshaller = SearchGroupsRequestMarshaller.Instance; - options.ResponseUnmarshaller = SearchGroupsResponseUnmarshaller.Instance; + options.RequestMarshaller = PutDataSetRefreshPropertiesRequestMarshaller.Instance; + options.ResponseUnmarshaller = PutDataSetRefreshPropertiesResponseUnmarshaller.Instance; - return Invoke(request, options); + return Invoke(request, options); } /// - /// Use the SearchGroups operation to search groups in a specified Amazon QuickSight - /// namespace using the supplied filters. + /// Creates or updates the dataset refresh properties for the dataset. /// - /// Container for the necessary parameters to execute the SearchGroups service method. + /// Container for the necessary parameters to execute the PutDataSetRefreshProperties service method. /// /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// /// - /// The response from the SearchGroups service method, as returned by QuickSight. + /// The response from the PutDataSetRefreshProperties service method, as returned by QuickSight. /// /// You don't have access to this item. The provided credentials couldn't be validated. /// You might not be authorized to carry out the request. Make sure that your account /// is authorized to use the Amazon QuickSight service, that your policies have the correct /// permissions, and that you are using the correct credentials. /// + /// + /// Updating or deleting a resource can cause an inconsistent state. + /// /// /// An internal failure occurred. /// - /// - /// The NextToken value isn't valid. - /// /// /// One or more parameters has a value that isn't valid. /// + /// + /// A limit is exceeded. + /// /// /// One or more preconditions aren't met. /// /// /// One or more resources can't be found. /// - /// - /// This resource is currently unavailable. - /// /// /// Access is throttled. /// - /// REST API Reference for SearchGroups Operation - public virtual Task SearchGroupsAsync(SearchGroupsRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + /// REST API Reference for PutDataSetRefreshProperties Operation + public virtual Task PutDataSetRefreshPropertiesAsync(PutDataSetRefreshPropertiesRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { var options = new InvokeOptions(); - options.RequestMarshaller = SearchGroupsRequestMarshaller.Instance; - options.ResponseUnmarshaller = SearchGroupsResponseUnmarshaller.Instance; + options.RequestMarshaller = PutDataSetRefreshPropertiesRequestMarshaller.Instance; + options.ResponseUnmarshaller = PutDataSetRefreshPropertiesResponseUnmarshaller.Instance; - return InvokeAsync(request, options, cancellationToken); + return InvokeAsync(request, options, cancellationToken); } #endregion - #region StartAssetBundleExportJob + #region RegisterUser /// - /// Starts an Asset Bundle export job. - /// - /// - /// - /// An Asset Bundle export job exports specified Amazon QuickSight assets. You can also - /// choose to export any asset dependencies in the same job. Export jobs run asynchronously - /// and can be polled with a DescribeAssetBundleExportJob API call. When a job - /// is successfully completed, a download URL that contains the exported assets is returned. - /// The URL is valid for 5 minutes and can be refreshed with a DescribeAssetBundleExportJob - /// API call. Each Amazon QuickSight account can run up to 5 export jobs concurrently. - /// - /// - /// - /// The API caller must have the necessary permissions in their IAM role to access each - /// resource before the resources can be exported. - /// + /// Creates an Amazon QuickSight user whose identity is associated with the Identity and + /// Access Management (IAM) identity or role specified in the request. When you register + /// a new user from the Amazon QuickSight API, Amazon QuickSight generates a registration + /// URL. The user accesses this registration URL to create their account. Amazon QuickSight + /// doesn't send a registration email to users who are registered from the Amazon QuickSight + /// API. If you want new users to receive a registration email, then add those users in + /// the Amazon QuickSight console. For more information on registering a new user in the + /// Amazon QuickSight console, see + /// Inviting users to access Amazon QuickSight. /// - /// Container for the necessary parameters to execute the StartAssetBundleExportJob service method. + /// Container for the necessary parameters to execute the RegisterUser service method. /// - /// The response from the StartAssetBundleExportJob service method, as returned by QuickSight. + /// The response from the RegisterUser service method, as returned by QuickSight. /// /// You don't have access to this item. The provided credentials couldn't be validated. /// You might not be authorized to carry out the request. Make sure that your account /// is authorized to use the Amazon QuickSight service, that your policies have the correct /// permissions, and that you are using the correct credentials. /// - /// - /// Updating or deleting a resource can cause an inconsistent state. + /// + /// An internal failure occurred. /// /// /// One or more parameters has a value that isn't valid. @@ -13792,61 +14087,57 @@ public virtual SearchGroupsResponse SearchGroups(SearchGroupsRequest request) /// /// A limit is exceeded. /// + /// + /// One or more preconditions aren't met. + /// + /// + /// The resource specified already exists. + /// /// /// One or more resources can't be found. /// + /// + /// This resource is currently unavailable. + /// /// /// Access is throttled. /// - /// - /// This error indicates that you are calling an operation on an Amazon QuickSight subscription - /// where the edition doesn't include support for that operation. Amazon Amazon QuickSight - /// currently has Standard Edition and Enterprise Edition. Not every operation and capability - /// is available in every edition. - /// - /// REST API Reference for StartAssetBundleExportJob Operation - public virtual StartAssetBundleExportJobResponse StartAssetBundleExportJob(StartAssetBundleExportJobRequest request) + /// REST API Reference for RegisterUser Operation + public virtual RegisterUserResponse RegisterUser(RegisterUserRequest request) { var options = new InvokeOptions(); - options.RequestMarshaller = StartAssetBundleExportJobRequestMarshaller.Instance; - options.ResponseUnmarshaller = StartAssetBundleExportJobResponseUnmarshaller.Instance; + options.RequestMarshaller = RegisterUserRequestMarshaller.Instance; + options.ResponseUnmarshaller = RegisterUserResponseUnmarshaller.Instance; - return Invoke(request, options); + return Invoke(request, options); } /// - /// Starts an Asset Bundle export job. - /// - /// - /// - /// An Asset Bundle export job exports specified Amazon QuickSight assets. You can also - /// choose to export any asset dependencies in the same job. Export jobs run asynchronously - /// and can be polled with a DescribeAssetBundleExportJob API call. When a job - /// is successfully completed, a download URL that contains the exported assets is returned. - /// The URL is valid for 5 minutes and can be refreshed with a DescribeAssetBundleExportJob - /// API call. Each Amazon QuickSight account can run up to 5 export jobs concurrently. - /// - /// - /// - /// The API caller must have the necessary permissions in their IAM role to access each - /// resource before the resources can be exported. - /// + /// Creates an Amazon QuickSight user whose identity is associated with the Identity and + /// Access Management (IAM) identity or role specified in the request. When you register + /// a new user from the Amazon QuickSight API, Amazon QuickSight generates a registration + /// URL. The user accesses this registration URL to create their account. Amazon QuickSight + /// doesn't send a registration email to users who are registered from the Amazon QuickSight + /// API. If you want new users to receive a registration email, then add those users in + /// the Amazon QuickSight console. For more information on registering a new user in the + /// Amazon QuickSight console, see + /// Inviting users to access Amazon QuickSight. /// - /// Container for the necessary parameters to execute the StartAssetBundleExportJob service method. + /// Container for the necessary parameters to execute the RegisterUser service method. /// /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// /// - /// The response from the StartAssetBundleExportJob service method, as returned by QuickSight. + /// The response from the RegisterUser service method, as returned by QuickSight. /// /// You don't have access to this item. The provided credentials couldn't be validated. /// You might not be authorized to carry out the request. Make sure that your account /// is authorized to use the Amazon QuickSight service, that your policies have the correct /// permissions, and that you are using the correct credentials. /// - /// - /// Updating or deleting a resource can cause an inconsistent state. + /// + /// An internal failure occurred. /// /// /// One or more parameters has a value that isn't valid. @@ -13854,69 +14145,57 @@ public virtual StartAssetBundleExportJobResponse StartAssetBundleExportJob(Start /// /// A limit is exceeded. /// + /// + /// One or more preconditions aren't met. + /// + /// + /// The resource specified already exists. + /// /// /// One or more resources can't be found. /// + /// + /// This resource is currently unavailable. + /// /// /// Access is throttled. /// - /// - /// This error indicates that you are calling an operation on an Amazon QuickSight subscription - /// where the edition doesn't include support for that operation. Amazon Amazon QuickSight - /// currently has Standard Edition and Enterprise Edition. Not every operation and capability - /// is available in every edition. - /// - /// REST API Reference for StartAssetBundleExportJob Operation - public virtual Task StartAssetBundleExportJobAsync(StartAssetBundleExportJobRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + /// REST API Reference for RegisterUser Operation + public virtual Task RegisterUserAsync(RegisterUserRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { var options = new InvokeOptions(); - options.RequestMarshaller = StartAssetBundleExportJobRequestMarshaller.Instance; - options.ResponseUnmarshaller = StartAssetBundleExportJobResponseUnmarshaller.Instance; + options.RequestMarshaller = RegisterUserRequestMarshaller.Instance; + options.ResponseUnmarshaller = RegisterUserResponseUnmarshaller.Instance; - return InvokeAsync(request, options, cancellationToken); + return InvokeAsync(request, options, cancellationToken); } #endregion - #region StartAssetBundleImportJob + #region RestoreAnalysis /// - /// Starts an Asset Bundle import job. - /// - /// - /// - /// An Asset Bundle import job imports specified Amazon QuickSight assets into an Amazon - /// QuickSight account. You can also choose to import a naming prefix and specified configuration - /// overrides. The assets that are contained in the bundle file that you provide are used - /// to create or update a new or existing asset in your Amazon QuickSight account. Each - /// Amazon QuickSight account can run up to 5 import jobs concurrently. - /// - /// - /// - /// The API caller must have the necessary "create", "describe", and "update" - /// permissions in their IAM role to access each resource type that is contained in the - /// bundle file before the resources can be imported. - /// + /// Restores an analysis. /// - /// Container for the necessary parameters to execute the StartAssetBundleImportJob service method. + /// Container for the necessary parameters to execute the RestoreAnalysis service method. /// - /// The response from the StartAssetBundleImportJob service method, as returned by QuickSight. - /// - /// You don't have access to this item. The provided credentials couldn't be validated. - /// You might not be authorized to carry out the request. Make sure that your account - /// is authorized to use the Amazon QuickSight service, that your policies have the correct - /// permissions, and that you are using the correct credentials. - /// + /// The response from the RestoreAnalysis service method, as returned by QuickSight. /// /// Updating or deleting a resource can cause an inconsistent state. /// + /// + /// An internal failure occurred. + /// /// /// One or more parameters has a value that isn't valid. /// /// /// A limit is exceeded. /// + /// + /// One or more preconditions aren't met. + /// /// /// One or more resources can't be found. /// @@ -13929,56 +14208,41 @@ public virtual StartAssetBundleExportJobResponse StartAssetBundleExportJob(Start /// currently has Standard Edition and Enterprise Edition. Not every operation and capability /// is available in every edition. /// - /// REST API Reference for StartAssetBundleImportJob Operation - public virtual StartAssetBundleImportJobResponse StartAssetBundleImportJob(StartAssetBundleImportJobRequest request) + /// REST API Reference for RestoreAnalysis Operation + public virtual RestoreAnalysisResponse RestoreAnalysis(RestoreAnalysisRequest request) { var options = new InvokeOptions(); - options.RequestMarshaller = StartAssetBundleImportJobRequestMarshaller.Instance; - options.ResponseUnmarshaller = StartAssetBundleImportJobResponseUnmarshaller.Instance; + options.RequestMarshaller = RestoreAnalysisRequestMarshaller.Instance; + options.ResponseUnmarshaller = RestoreAnalysisResponseUnmarshaller.Instance; - return Invoke(request, options); + return Invoke(request, options); } /// - /// Starts an Asset Bundle import job. - /// - /// - /// - /// An Asset Bundle import job imports specified Amazon QuickSight assets into an Amazon - /// QuickSight account. You can also choose to import a naming prefix and specified configuration - /// overrides. The assets that are contained in the bundle file that you provide are used - /// to create or update a new or existing asset in your Amazon QuickSight account. Each - /// Amazon QuickSight account can run up to 5 import jobs concurrently. - /// - /// - /// - /// The API caller must have the necessary "create", "describe", and "update" - /// permissions in their IAM role to access each resource type that is contained in the - /// bundle file before the resources can be imported. - /// + /// Restores an analysis. /// - /// Container for the necessary parameters to execute the StartAssetBundleImportJob service method. + /// Container for the necessary parameters to execute the RestoreAnalysis service method. /// /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// /// - /// The response from the StartAssetBundleImportJob service method, as returned by QuickSight. - /// - /// You don't have access to this item. The provided credentials couldn't be validated. - /// You might not be authorized to carry out the request. Make sure that your account - /// is authorized to use the Amazon QuickSight service, that your policies have the correct - /// permissions, and that you are using the correct credentials. - /// + /// The response from the RestoreAnalysis service method, as returned by QuickSight. /// /// Updating or deleting a resource can cause an inconsistent state. /// + /// + /// An internal failure occurred. + /// /// /// One or more parameters has a value that isn't valid. /// /// /// A limit is exceeded. /// + /// + /// One or more preconditions aren't met. + /// /// /// One or more resources can't be found. /// @@ -13991,228 +14255,1040 @@ public virtual StartAssetBundleImportJobResponse StartAssetBundleImportJob(Start /// currently has Standard Edition and Enterprise Edition. Not every operation and capability /// is available in every edition. /// - /// REST API Reference for StartAssetBundleImportJob Operation - public virtual Task StartAssetBundleImportJobAsync(StartAssetBundleImportJobRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + /// REST API Reference for RestoreAnalysis Operation + public virtual Task RestoreAnalysisAsync(RestoreAnalysisRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { var options = new InvokeOptions(); - options.RequestMarshaller = StartAssetBundleImportJobRequestMarshaller.Instance; - options.ResponseUnmarshaller = StartAssetBundleImportJobResponseUnmarshaller.Instance; + options.RequestMarshaller = RestoreAnalysisRequestMarshaller.Instance; + options.ResponseUnmarshaller = RestoreAnalysisResponseUnmarshaller.Instance; - return InvokeAsync(request, options, cancellationToken); + return InvokeAsync(request, options, cancellationToken); } #endregion - #region StartDashboardSnapshotJob + #region SearchAnalyses /// - /// Starts an asynchronous job that generates a snapshot of a dashboard's output. You - /// can request one or several of the following format configurations in each API call. + /// Searches for analyses that belong to the user specified in the filter. /// - ///
    • - /// - /// 1 Paginated PDF - /// - ///
    • - /// - /// 1 Excel workbook that includes up to 5 table or pivot table visuals - /// - ///
    • - /// - /// 5 CSVs from table or pivot table visuals - /// - ///
    - /// - /// The status of a submitted job can be polled with the DescribeDashboardSnapshotJob - /// API. When you call the DescribeDashboardSnapshotJob API, check the JobStatus - /// field in the response. Once the job reaches a COMPLETED or FAILED status, - /// use the DescribeDashboardSnapshotJobResult API to obtain the URLs for the generated - /// files. If the job fails, the DescribeDashboardSnapshotJobResult API returns - /// detailed information about the error that occurred. - /// - /// - /// - /// StartDashboardSnapshotJob API throttling - /// - /// - /// - /// Amazon QuickSight utilizes API throttling to create a more consistent user experience - /// within a time span for customers when they call the StartDashboardSnapshotJob. - /// By default, 12 jobs can run simlutaneously in one Amazon Web Services account and - /// users can submit up 10 API requests per second before an account is throttled. If - /// an overwhelming number of API requests are made by the same user in a short period - /// of time, Amazon QuickSight throttles the API calls to maintin an optimal experience - /// and reliability for all Amazon QuickSight users. - /// - /// - /// - /// Common throttling scenarios - /// - /// - /// - /// The following list provides information about the most commin throttling scenarios - /// that can occur. - /// - ///
    • - /// - /// A large number of SnapshotExport API jobs are running simultaneously on - /// an Amazon Web Services account. When a new StartDashboardSnapshotJob is - /// created and there are already 12 jobs with the RUNNING status, the new job - /// request fails and returns a LimitExceededException error. Wait for a current - /// job to comlpete before you resubmit the new job. - /// - ///
    • - /// - /// A large number of API requests are submitted on an Amazon Web Services account. - /// When a user makes more than 10 API calls to the Amazon QuickSight API in one second, - /// a ThrottlingException is returned. - /// - ///
    - /// - /// If your use case requires a higher throttling limit, contact your account admin or - /// Amazon Web ServicesSupport to explore - /// options to tailor a more optimal expereince for your account. - /// - /// - /// - /// Best practices to handle throttling - /// - /// - /// - /// If your use case projects high levels of API traffic, try to reduce the degree of - /// frequency and parallelism of API calls as much as you can to avoid throttling. You - /// can also perform a timing test to calculate an estimate for the total processing time - /// of your projected load that stays within the throttling limits of the Amazon QuickSight - /// APIs. For example, if your projected traffic is 100 snapshot jobs before 12:00 PM - /// per day, start 12 jobs in parallel and measure the amount of time it takes to proccess - /// all 12 jobs. Once you obtain the result, multiply the duration by 9, for example (12 - /// minutes * 9 = 108 minutes). Use the new result to determine the latest time at - /// which the jobs need to be started to meet your target deadline. - /// - /// - /// - /// The time that it takes to process a job can be impacted by the following factors: - /// - ///
    • - /// - /// The dataset type (Direct Query or SPICE). - /// - ///
    • - /// - /// The size of the dataset. - /// - ///
    • - /// - /// The complexity of the calculated fields that are used in the dashboard. - /// - ///
    • - /// - /// The number of visuals that are on a sheet. - /// - ///
    • - /// - /// The types of visuals that are on the sheet. - /// - ///
    • - /// - /// The number of formats and snapshots that are requested in the job configuration. - /// - ///
    • + /// /// - /// The size of the generated snapshots. + /// This operation is eventually consistent. The results are best effort and may not reflect + /// very recent updates and changes. /// - ///
    + /// ///     - /// Container for the necessary parameters to execute the StartDashboardSnapshotJob service method. + /// Container for the necessary parameters to execute the SearchAnalyses service method. /// - /// The response from the StartDashboardSnapshotJob service method, as returned by QuickSight. - /// - /// You don't have access to this item. The provided credentials couldn't be validated. - /// You might not be authorized to carry out the request. Make sure that your account - /// is authorized to use the Amazon QuickSight service, that your policies have the correct - /// permissions, and that you are using the correct credentials. - /// + /// The response from the SearchAnalyses service method, as returned by QuickSight. /// /// An internal failure occurred. /// + /// + /// The NextToken value isn't valid. + /// /// /// One or more parameters has a value that isn't valid. /// - /// - /// A limit is exceeded. - /// - /// - /// The resource specified already exists. - /// /// /// One or more resources can't be found. /// /// /// Access is throttled. /// - /// - /// This error indicates that you are calling an embedding operation in Amazon QuickSight - /// without the required pricing plan on your Amazon Web Services account. Before you - /// can use embedding for anonymous users, a QuickSight administrator needs to add capacity - /// pricing to Amazon QuickSight. You can do this on the Manage Amazon QuickSight - /// page. - /// - /// - /// - /// After capacity pricing is added, you can use the GetDashboardEmbedUrl - /// API operation with the --identity-type ANONYMOUS option. - /// - /// /// /// This error indicates that you are calling an operation on an Amazon QuickSight subscription /// where the edition doesn't include support for that operation. Amazon Amazon QuickSight /// currently has Standard Edition and Enterprise Edition. Not every operation and capability /// is available in every edition. /// - /// REST API Reference for StartDashboardSnapshotJob Operation - public virtual StartDashboardSnapshotJobResponse StartDashboardSnapshotJob(StartDashboardSnapshotJobRequest request) + /// REST API Reference for SearchAnalyses Operation + public virtual SearchAnalysesResponse SearchAnalyses(SearchAnalysesRequest request) { var options = new InvokeOptions(); - options.RequestMarshaller = StartDashboardSnapshotJobRequestMarshaller.Instance; - options.ResponseUnmarshaller = StartDashboardSnapshotJobResponseUnmarshaller.Instance; + options.RequestMarshaller = SearchAnalysesRequestMarshaller.Instance; + options.ResponseUnmarshaller = SearchAnalysesResponseUnmarshaller.Instance; - return Invoke(request, options); + return Invoke(request, options); } /// - /// Starts an asynchronous job that generates a snapshot of a dashboard's output. You - /// can request one or several of the following format configurations in each API call. + /// Searches for analyses that belong to the user specified in the filter. /// - ///
    • - /// - /// 1 Paginated PDF - /// - ///
    • - /// - /// 1 Excel workbook that includes up to 5 table or pivot table visuals - /// - ///
    • - /// - /// 5 CSVs from table or pivot table visuals - /// - ///
    - /// - /// The status of a submitted job can be polled with the DescribeDashboardSnapshotJob - /// API. When you call the DescribeDashboardSnapshotJob API, check the JobStatus - /// field in the response. Once the job reaches a COMPLETED or FAILED status, - /// use the DescribeDashboardSnapshotJobResult API to obtain the URLs for the generated - /// files. If the job fails, the DescribeDashboardSnapshotJobResult API returns - /// detailed information about the error that occurred. - /// - /// + /// /// - /// StartDashboardSnapshotJob API throttling + /// This operation is eventually consistent. The results are best effort and may not reflect + /// very recent updates and changes. /// - /// - /// - /// Amazon QuickSight utilizes API throttling to create a more consistent user experience + /// + ///     + /// Container for the necessary parameters to execute the SearchAnalyses service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the SearchAnalyses service method, as returned by QuickSight. + /// + /// An internal failure occurred. + /// + /// + /// The NextToken value isn't valid. + /// + /// + /// One or more parameters has a value that isn't valid. + /// + /// + /// One or more resources can't be found. + /// + /// + /// Access is throttled. + /// + /// + /// This error indicates that you are calling an operation on an Amazon QuickSight subscription + /// where the edition doesn't include support for that operation. Amazon Amazon QuickSight + /// currently has Standard Edition and Enterprise Edition. Not every operation and capability + /// is available in every edition. + /// + /// REST API Reference for SearchAnalyses Operation + public virtual Task SearchAnalysesAsync(SearchAnalysesRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = SearchAnalysesRequestMarshaller.Instance; + options.ResponseUnmarshaller = SearchAnalysesResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + + #region SearchDashboards + + + /// + /// Searches for dashboards that belong to a user. + /// + /// + /// + /// This operation is eventually consistent. The results are best effort and may not reflect + /// very recent updates and changes. + /// + /// + /// + /// Container for the necessary parameters to execute the SearchDashboards service method. + /// + /// The response from the SearchDashboards service method, as returned by QuickSight. + /// + /// An internal failure occurred. + /// + /// + /// The NextToken value isn't valid. + /// + /// + /// One or more parameters has a value that isn't valid. + /// + /// + /// One or more resources can't be found. + /// + /// + /// Access is throttled. + /// + /// + /// This error indicates that you are calling an operation on an Amazon QuickSight subscription + /// where the edition doesn't include support for that operation. Amazon Amazon QuickSight + /// currently has Standard Edition and Enterprise Edition. Not every operation and capability + /// is available in every edition. + /// + /// REST API Reference for SearchDashboards Operation + public virtual SearchDashboardsResponse SearchDashboards(SearchDashboardsRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = SearchDashboardsRequestMarshaller.Instance; + options.ResponseUnmarshaller = SearchDashboardsResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// Searches for dashboards that belong to a user. + /// + /// + /// + /// This operation is eventually consistent. The results are best effort and may not reflect + /// very recent updates and changes. + /// + /// + /// + /// Container for the necessary parameters to execute the SearchDashboards service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the SearchDashboards service method, as returned by QuickSight. + /// + /// An internal failure occurred. + /// + /// + /// The NextToken value isn't valid. + /// + /// + /// One or more parameters has a value that isn't valid. + /// + /// + /// One or more resources can't be found. + /// + /// + /// Access is throttled. + /// + /// + /// This error indicates that you are calling an operation on an Amazon QuickSight subscription + /// where the edition doesn't include support for that operation. Amazon Amazon QuickSight + /// currently has Standard Edition and Enterprise Edition. Not every operation and capability + /// is available in every edition. + /// + /// REST API Reference for SearchDashboards Operation + public virtual Task SearchDashboardsAsync(SearchDashboardsRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = SearchDashboardsRequestMarshaller.Instance; + options.ResponseUnmarshaller = SearchDashboardsResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + + #region SearchDataSets + + + /// + /// Use the SearchDataSets operation to search for datasets that belong to an account. + /// + /// Container for the necessary parameters to execute the SearchDataSets service method. + /// + /// The response from the SearchDataSets service method, as returned by QuickSight. + /// + /// You don't have access to this item. The provided credentials couldn't be validated. + /// You might not be authorized to carry out the request. Make sure that your account + /// is authorized to use the Amazon QuickSight service, that your policies have the correct + /// permissions, and that you are using the correct credentials. + /// + /// + /// An internal failure occurred. + /// + /// + /// The NextToken value isn't valid. + /// + /// + /// One or more parameters has a value that isn't valid. + /// + /// + /// One or more resources can't be found. + /// + /// + /// Access is throttled. + /// + /// REST API Reference for SearchDataSets Operation + public virtual SearchDataSetsResponse SearchDataSets(SearchDataSetsRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = SearchDataSetsRequestMarshaller.Instance; + options.ResponseUnmarshaller = SearchDataSetsResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// Use the SearchDataSets operation to search for datasets that belong to an account. + /// + /// Container for the necessary parameters to execute the SearchDataSets service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the SearchDataSets service method, as returned by QuickSight. + /// + /// You don't have access to this item. The provided credentials couldn't be validated. + /// You might not be authorized to carry out the request. Make sure that your account + /// is authorized to use the Amazon QuickSight service, that your policies have the correct + /// permissions, and that you are using the correct credentials. + /// + /// + /// An internal failure occurred. + /// + /// + /// The NextToken value isn't valid. + /// + /// + /// One or more parameters has a value that isn't valid. + /// + /// + /// One or more resources can't be found. + /// + /// + /// Access is throttled. + /// + /// REST API Reference for SearchDataSets Operation + public virtual Task SearchDataSetsAsync(SearchDataSetsRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = SearchDataSetsRequestMarshaller.Instance; + options.ResponseUnmarshaller = SearchDataSetsResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + + #region SearchDataSources + + + /// + /// Use the SearchDataSources operation to search for data sources that belong + /// to an account. + /// + /// Container for the necessary parameters to execute the SearchDataSources service method. + /// + /// The response from the SearchDataSources service method, as returned by QuickSight. + /// + /// You don't have access to this item. The provided credentials couldn't be validated. + /// You might not be authorized to carry out the request. Make sure that your account + /// is authorized to use the Amazon QuickSight service, that your policies have the correct + /// permissions, and that you are using the correct credentials. + /// + /// + /// An internal failure occurred. + /// + /// + /// The NextToken value isn't valid. + /// + /// + /// One or more parameters has a value that isn't valid. + /// + /// + /// One or more resources can't be found. + /// + /// + /// Access is throttled. + /// + /// REST API Reference for SearchDataSources Operation + public virtual SearchDataSourcesResponse SearchDataSources(SearchDataSourcesRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = SearchDataSourcesRequestMarshaller.Instance; + options.ResponseUnmarshaller = SearchDataSourcesResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// Use the SearchDataSources operation to search for data sources that belong + /// to an account. + /// + /// Container for the necessary parameters to execute the SearchDataSources service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the SearchDataSources service method, as returned by QuickSight. + /// + /// You don't have access to this item. The provided credentials couldn't be validated. + /// You might not be authorized to carry out the request. Make sure that your account + /// is authorized to use the Amazon QuickSight service, that your policies have the correct + /// permissions, and that you are using the correct credentials. + /// + /// + /// An internal failure occurred. + /// + /// + /// The NextToken value isn't valid. + /// + /// + /// One or more parameters has a value that isn't valid. + /// + /// + /// One or more resources can't be found. + /// + /// + /// Access is throttled. + /// + /// REST API Reference for SearchDataSources Operation + public virtual Task SearchDataSourcesAsync(SearchDataSourcesRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = SearchDataSourcesRequestMarshaller.Instance; + options.ResponseUnmarshaller = SearchDataSourcesResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + + #region SearchFolders + + + /// + /// Searches the subfolders in a folder. + /// + /// Container for the necessary parameters to execute the SearchFolders service method. + /// + /// The response from the SearchFolders service method, as returned by QuickSight. + /// + /// You don't have access to this item. The provided credentials couldn't be validated. + /// You might not be authorized to carry out the request. Make sure that your account + /// is authorized to use the Amazon QuickSight service, that your policies have the correct + /// permissions, and that you are using the correct credentials. + /// + /// + /// An internal failure occurred. + /// + /// + /// The NextToken value isn't valid. + /// + /// + /// One or more parameters has a value that isn't valid. + /// + /// + /// You don't have this feature activated for your account. To fix this issue, contact + /// Amazon Web Services support. + /// + /// + /// One or more resources can't be found. + /// + /// + /// Access is throttled. + /// + /// + /// This error indicates that you are calling an operation on an Amazon QuickSight subscription + /// where the edition doesn't include support for that operation. Amazon Amazon QuickSight + /// currently has Standard Edition and Enterprise Edition. Not every operation and capability + /// is available in every edition. + /// + /// REST API Reference for SearchFolders Operation + public virtual SearchFoldersResponse SearchFolders(SearchFoldersRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = SearchFoldersRequestMarshaller.Instance; + options.ResponseUnmarshaller = SearchFoldersResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// Searches the subfolders in a folder. + /// + /// Container for the necessary parameters to execute the SearchFolders service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the SearchFolders service method, as returned by QuickSight. + /// + /// You don't have access to this item. The provided credentials couldn't be validated. + /// You might not be authorized to carry out the request. Make sure that your account + /// is authorized to use the Amazon QuickSight service, that your policies have the correct + /// permissions, and that you are using the correct credentials. + /// + /// + /// An internal failure occurred. + /// + /// + /// The NextToken value isn't valid. + /// + /// + /// One or more parameters has a value that isn't valid. + /// + /// + /// You don't have this feature activated for your account. To fix this issue, contact + /// Amazon Web Services support. + /// + /// + /// One or more resources can't be found. + /// + /// + /// Access is throttled. + /// + /// + /// This error indicates that you are calling an operation on an Amazon QuickSight subscription + /// where the edition doesn't include support for that operation. Amazon Amazon QuickSight + /// currently has Standard Edition and Enterprise Edition. Not every operation and capability + /// is available in every edition. + /// + /// REST API Reference for SearchFolders Operation + public virtual Task SearchFoldersAsync(SearchFoldersRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = SearchFoldersRequestMarshaller.Instance; + options.ResponseUnmarshaller = SearchFoldersResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + + #region SearchGroups + + + /// + /// Use the SearchGroups operation to search groups in a specified Amazon QuickSight + /// namespace using the supplied filters. + /// + /// Container for the necessary parameters to execute the SearchGroups service method. + /// + /// The response from the SearchGroups service method, as returned by QuickSight. + /// + /// You don't have access to this item. The provided credentials couldn't be validated. + /// You might not be authorized to carry out the request. Make sure that your account + /// is authorized to use the Amazon QuickSight service, that your policies have the correct + /// permissions, and that you are using the correct credentials. + /// + /// + /// An internal failure occurred. + /// + /// + /// The NextToken value isn't valid. + /// + /// + /// One or more parameters has a value that isn't valid. + /// + /// + /// One or more preconditions aren't met. + /// + /// + /// One or more resources can't be found. + /// + /// + /// This resource is currently unavailable. + /// + /// + /// Access is throttled. + /// + /// REST API Reference for SearchGroups Operation + public virtual SearchGroupsResponse SearchGroups(SearchGroupsRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = SearchGroupsRequestMarshaller.Instance; + options.ResponseUnmarshaller = SearchGroupsResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// Use the SearchGroups operation to search groups in a specified Amazon QuickSight + /// namespace using the supplied filters. + /// + /// Container for the necessary parameters to execute the SearchGroups service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the SearchGroups service method, as returned by QuickSight. + /// + /// You don't have access to this item. The provided credentials couldn't be validated. + /// You might not be authorized to carry out the request. Make sure that your account + /// is authorized to use the Amazon QuickSight service, that your policies have the correct + /// permissions, and that you are using the correct credentials. + /// + /// + /// An internal failure occurred. + /// + /// + /// The NextToken value isn't valid. + /// + /// + /// One or more parameters has a value that isn't valid. + /// + /// + /// One or more preconditions aren't met. + /// + /// + /// One or more resources can't be found. + /// + /// + /// This resource is currently unavailable. + /// + /// + /// Access is throttled. + /// + /// REST API Reference for SearchGroups Operation + public virtual Task SearchGroupsAsync(SearchGroupsRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = SearchGroupsRequestMarshaller.Instance; + options.ResponseUnmarshaller = SearchGroupsResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + + #region StartAssetBundleExportJob + + + /// + /// Starts an Asset Bundle export job. + /// + /// + /// + /// An Asset Bundle export job exports specified Amazon QuickSight assets. You can also + /// choose to export any asset dependencies in the same job. Export jobs run asynchronously + /// and can be polled with a DescribeAssetBundleExportJob API call. When a job + /// is successfully completed, a download URL that contains the exported assets is returned. + /// The URL is valid for 5 minutes and can be refreshed with a DescribeAssetBundleExportJob + /// API call. Each Amazon QuickSight account can run up to 5 export jobs concurrently. + /// + /// + /// + /// The API caller must have the necessary permissions in their IAM role to access each + /// resource before the resources can be exported. + /// + /// + /// Container for the necessary parameters to execute the StartAssetBundleExportJob service method. + /// + /// The response from the StartAssetBundleExportJob service method, as returned by QuickSight. + /// + /// You don't have access to this item. The provided credentials couldn't be validated. + /// You might not be authorized to carry out the request. Make sure that your account + /// is authorized to use the Amazon QuickSight service, that your policies have the correct + /// permissions, and that you are using the correct credentials. + /// + /// + /// Updating or deleting a resource can cause an inconsistent state. + /// + /// + /// One or more parameters has a value that isn't valid. + /// + /// + /// A limit is exceeded. + /// + /// + /// One or more resources can't be found. + /// + /// + /// Access is throttled. + /// + /// + /// This error indicates that you are calling an operation on an Amazon QuickSight subscription + /// where the edition doesn't include support for that operation. Amazon Amazon QuickSight + /// currently has Standard Edition and Enterprise Edition. Not every operation and capability + /// is available in every edition. + /// + /// REST API Reference for StartAssetBundleExportJob Operation + public virtual StartAssetBundleExportJobResponse StartAssetBundleExportJob(StartAssetBundleExportJobRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = StartAssetBundleExportJobRequestMarshaller.Instance; + options.ResponseUnmarshaller = StartAssetBundleExportJobResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// Starts an Asset Bundle export job. + /// + /// + /// + /// An Asset Bundle export job exports specified Amazon QuickSight assets. You can also + /// choose to export any asset dependencies in the same job. Export jobs run asynchronously + /// and can be polled with a DescribeAssetBundleExportJob API call. When a job + /// is successfully completed, a download URL that contains the exported assets is returned. + /// The URL is valid for 5 minutes and can be refreshed with a DescribeAssetBundleExportJob + /// API call. Each Amazon QuickSight account can run up to 5 export jobs concurrently. + /// + /// + /// + /// The API caller must have the necessary permissions in their IAM role to access each + /// resource before the resources can be exported. + /// + /// + /// Container for the necessary parameters to execute the StartAssetBundleExportJob service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the StartAssetBundleExportJob service method, as returned by QuickSight. + /// + /// You don't have access to this item. The provided credentials couldn't be validated. + /// You might not be authorized to carry out the request. Make sure that your account + /// is authorized to use the Amazon QuickSight service, that your policies have the correct + /// permissions, and that you are using the correct credentials. + /// + /// + /// Updating or deleting a resource can cause an inconsistent state. + /// + /// + /// One or more parameters has a value that isn't valid. + /// + /// + /// A limit is exceeded. + /// + /// + /// One or more resources can't be found. + /// + /// + /// Access is throttled. + /// + /// + /// This error indicates that you are calling an operation on an Amazon QuickSight subscription + /// where the edition doesn't include support for that operation. Amazon Amazon QuickSight + /// currently has Standard Edition and Enterprise Edition. Not every operation and capability + /// is available in every edition. + /// + /// REST API Reference for StartAssetBundleExportJob Operation + public virtual Task StartAssetBundleExportJobAsync(StartAssetBundleExportJobRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = StartAssetBundleExportJobRequestMarshaller.Instance; + options.ResponseUnmarshaller = StartAssetBundleExportJobResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + + #region StartAssetBundleImportJob + + + /// + /// Starts an Asset Bundle import job. + /// + /// + /// + /// An Asset Bundle import job imports specified Amazon QuickSight assets into an Amazon + /// QuickSight account. You can also choose to import a naming prefix and specified configuration + /// overrides. The assets that are contained in the bundle file that you provide are used + /// to create or update a new or existing asset in your Amazon QuickSight account. Each + /// Amazon QuickSight account can run up to 5 import jobs concurrently. + /// + /// + /// + /// The API caller must have the necessary "create", "describe", and "update" + /// permissions in their IAM role to access each resource type that is contained in the + /// bundle file before the resources can be imported. + /// + /// + /// Container for the necessary parameters to execute the StartAssetBundleImportJob service method. + /// + /// The response from the StartAssetBundleImportJob service method, as returned by QuickSight. + /// + /// You don't have access to this item. The provided credentials couldn't be validated. + /// You might not be authorized to carry out the request. Make sure that your account + /// is authorized to use the Amazon QuickSight service, that your policies have the correct + /// permissions, and that you are using the correct credentials. + /// + /// + /// Updating or deleting a resource can cause an inconsistent state. + /// + /// + /// One or more parameters has a value that isn't valid. + /// + /// + /// A limit is exceeded. + /// + /// + /// One or more resources can't be found. + /// + /// + /// Access is throttled. + /// + /// + /// This error indicates that you are calling an operation on an Amazon QuickSight subscription + /// where the edition doesn't include support for that operation. Amazon Amazon QuickSight + /// currently has Standard Edition and Enterprise Edition. Not every operation and capability + /// is available in every edition. + /// + /// REST API Reference for StartAssetBundleImportJob Operation + public virtual StartAssetBundleImportJobResponse StartAssetBundleImportJob(StartAssetBundleImportJobRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = StartAssetBundleImportJobRequestMarshaller.Instance; + options.ResponseUnmarshaller = StartAssetBundleImportJobResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// Starts an Asset Bundle import job. + /// + /// + /// + /// An Asset Bundle import job imports specified Amazon QuickSight assets into an Amazon + /// QuickSight account. You can also choose to import a naming prefix and specified configuration + /// overrides. The assets that are contained in the bundle file that you provide are used + /// to create or update a new or existing asset in your Amazon QuickSight account. Each + /// Amazon QuickSight account can run up to 5 import jobs concurrently. + /// + /// + /// + /// The API caller must have the necessary "create", "describe", and "update" + /// permissions in their IAM role to access each resource type that is contained in the + /// bundle file before the resources can be imported. + /// + /// + /// Container for the necessary parameters to execute the StartAssetBundleImportJob service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the StartAssetBundleImportJob service method, as returned by QuickSight. + /// + /// You don't have access to this item. The provided credentials couldn't be validated. + /// You might not be authorized to carry out the request. Make sure that your account + /// is authorized to use the Amazon QuickSight service, that your policies have the correct + /// permissions, and that you are using the correct credentials. + /// + /// + /// Updating or deleting a resource can cause an inconsistent state. + /// + /// + /// One or more parameters has a value that isn't valid. + /// + /// + /// A limit is exceeded. + /// + /// + /// One or more resources can't be found. + /// + /// + /// Access is throttled. + /// + /// + /// This error indicates that you are calling an operation on an Amazon QuickSight subscription + /// where the edition doesn't include support for that operation. Amazon Amazon QuickSight + /// currently has Standard Edition and Enterprise Edition. Not every operation and capability + /// is available in every edition. + /// + /// REST API Reference for StartAssetBundleImportJob Operation + public virtual Task StartAssetBundleImportJobAsync(StartAssetBundleImportJobRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = StartAssetBundleImportJobRequestMarshaller.Instance; + options.ResponseUnmarshaller = StartAssetBundleImportJobResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + + #region StartDashboardSnapshotJob + + + /// + /// Starts an asynchronous job that generates a snapshot of a dashboard's output. You + /// can request one or several of the following format configurations in each API call. + /// + ///
    • + /// + /// 1 Paginated PDF + /// + ///
    • + /// + /// 1 Excel workbook that includes up to 5 table or pivot table visuals + /// + ///
    • + /// + /// 5 CSVs from table or pivot table visuals + /// + ///
    + /// + /// The status of a submitted job can be polled with the DescribeDashboardSnapshotJob + /// API. When you call the DescribeDashboardSnapshotJob API, check the JobStatus + /// field in the response. Once the job reaches a COMPLETED or FAILED status, + /// use the DescribeDashboardSnapshotJobResult API to obtain the URLs for the generated + /// files. If the job fails, the DescribeDashboardSnapshotJobResult API returns + /// detailed information about the error that occurred. + /// + /// + /// + /// StartDashboardSnapshotJob API throttling + /// + /// + /// + /// Amazon QuickSight utilizes API throttling to create a more consistent user experience + /// within a time span for customers when they call the StartDashboardSnapshotJob. + /// By default, 12 jobs can run simlutaneously in one Amazon Web Services account and + /// users can submit up 10 API requests per second before an account is throttled. If + /// an overwhelming number of API requests are made by the same user in a short period + /// of time, Amazon QuickSight throttles the API calls to maintin an optimal experience + /// and reliability for all Amazon QuickSight users. + /// + /// + /// + /// Common throttling scenarios + /// + /// + /// + /// The following list provides information about the most commin throttling scenarios + /// that can occur. + /// + ///
    • + /// + /// A large number of SnapshotExport API jobs are running simultaneously on + /// an Amazon Web Services account. When a new StartDashboardSnapshotJob is + /// created and there are already 12 jobs with the RUNNING status, the new job + /// request fails and returns a LimitExceededException error. Wait for a current + /// job to comlpete before you resubmit the new job. + /// + ///
    • + /// + /// A large number of API requests are submitted on an Amazon Web Services account. + /// When a user makes more than 10 API calls to the Amazon QuickSight API in one second, + /// a ThrottlingException is returned. + /// + ///
    + /// + /// If your use case requires a higher throttling limit, contact your account admin or + /// Amazon Web ServicesSupport to explore + /// options to tailor a more optimal expereince for your account. + /// + /// + /// + /// Best practices to handle throttling + /// + /// + /// + /// If your use case projects high levels of API traffic, try to reduce the degree of + /// frequency and parallelism of API calls as much as you can to avoid throttling. You + /// can also perform a timing test to calculate an estimate for the total processing time + /// of your projected load that stays within the throttling limits of the Amazon QuickSight + /// APIs. For example, if your projected traffic is 100 snapshot jobs before 12:00 PM + /// per day, start 12 jobs in parallel and measure the amount of time it takes to proccess + /// all 12 jobs. Once you obtain the result, multiply the duration by 9, for example (12 + /// minutes * 9 = 108 minutes). Use the new result to determine the latest time at + /// which the jobs need to be started to meet your target deadline. + /// + /// + /// + /// The time that it takes to process a job can be impacted by the following factors: + /// + ///
    • + /// + /// The dataset type (Direct Query or SPICE). + /// + ///
    • + /// + /// The size of the dataset. + /// + ///
    • + /// + /// The complexity of the calculated fields that are used in the dashboard. + /// + ///
    • + /// + /// The number of visuals that are on a sheet. + /// + ///
    • + /// + /// The types of visuals that are on the sheet. + /// + ///
    • + /// + /// The number of formats and snapshots that are requested in the job configuration. + /// + ///
    • + /// + /// The size of the generated snapshots. + /// + ///
    + ///     + /// Container for the necessary parameters to execute the StartDashboardSnapshotJob service method. + /// + /// The response from the StartDashboardSnapshotJob service method, as returned by QuickSight. + /// + /// You don't have access to this item. The provided credentials couldn't be validated. + /// You might not be authorized to carry out the request. Make sure that your account + /// is authorized to use the Amazon QuickSight service, that your policies have the correct + /// permissions, and that you are using the correct credentials. + /// + /// + /// An internal failure occurred. + /// + /// + /// One or more parameters has a value that isn't valid. + /// + /// + /// A limit is exceeded. + /// + /// + /// The resource specified already exists. + /// + /// + /// One or more resources can't be found. + /// + /// + /// Access is throttled. + /// + /// + /// This error indicates that you are calling an embedding operation in Amazon QuickSight + /// without the required pricing plan on your Amazon Web Services account. Before you + /// can use embedding for anonymous users, a QuickSight administrator needs to add capacity + /// pricing to Amazon QuickSight. You can do this on the Manage Amazon QuickSight + /// page. + /// + /// + /// + /// After capacity pricing is added, you can use the GetDashboardEmbedUrl + /// API operation with the --identity-type ANONYMOUS option. + /// + /// + /// + /// This error indicates that you are calling an operation on an Amazon QuickSight subscription + /// where the edition doesn't include support for that operation. Amazon Amazon QuickSight + /// currently has Standard Edition and Enterprise Edition. Not every operation and capability + /// is available in every edition. + /// + /// REST API Reference for StartDashboardSnapshotJob Operation + public virtual StartDashboardSnapshotJobResponse StartDashboardSnapshotJob(StartDashboardSnapshotJobRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = StartDashboardSnapshotJobRequestMarshaller.Instance; + options.ResponseUnmarshaller = StartDashboardSnapshotJobResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// Starts an asynchronous job that generates a snapshot of a dashboard's output. You + /// can request one or several of the following format configurations in each API call. + /// + ///
    • + /// + /// 1 Paginated PDF + /// + ///
    • + /// + /// 1 Excel workbook that includes up to 5 table or pivot table visuals + /// + ///
    • + /// + /// 5 CSVs from table or pivot table visuals + /// + ///
    + /// + /// The status of a submitted job can be polled with the DescribeDashboardSnapshotJob + /// API. When you call the DescribeDashboardSnapshotJob API, check the JobStatus + /// field in the response. Once the job reaches a COMPLETED or FAILED status, + /// use the DescribeDashboardSnapshotJobResult API to obtain the URLs for the generated + /// files. If the job fails, the DescribeDashboardSnapshotJobResult API returns + /// detailed information about the error that occurred. + /// + /// + /// + /// StartDashboardSnapshotJob API throttling + /// + /// + /// + /// Amazon QuickSight utilizes API throttling to create a more consistent user experience /// within a time span for customers when they call the StartDashboardSnapshotJob. /// By default, 12 jobs can run simlutaneously in one Amazon Web Services account and /// users can submit up 10 API requests per second before an account is throttled. If @@ -14222,191 +15298,696 @@ public virtual StartDashboardSnapshotJobResponse StartDashboardSnapshotJob(Start /// /// /// - /// Common throttling scenarios + /// Common throttling scenarios + /// + /// + /// + /// The following list provides information about the most commin throttling scenarios + /// that can occur. + /// + ///
    • + /// + /// A large number of SnapshotExport API jobs are running simultaneously on + /// an Amazon Web Services account. When a new StartDashboardSnapshotJob is + /// created and there are already 12 jobs with the RUNNING status, the new job + /// request fails and returns a LimitExceededException error. Wait for a current + /// job to comlpete before you resubmit the new job. + /// + ///
    • + /// + /// A large number of API requests are submitted on an Amazon Web Services account. + /// When a user makes more than 10 API calls to the Amazon QuickSight API in one second, + /// a ThrottlingException is returned. + /// + ///
    + /// + /// If your use case requires a higher throttling limit, contact your account admin or + /// Amazon Web ServicesSupport to explore + /// options to tailor a more optimal expereince for your account. + /// + /// + /// + /// Best practices to handle throttling + /// + /// + /// + /// If your use case projects high levels of API traffic, try to reduce the degree of + /// frequency and parallelism of API calls as much as you can to avoid throttling. You + /// can also perform a timing test to calculate an estimate for the total processing time + /// of your projected load that stays within the throttling limits of the Amazon QuickSight + /// APIs. For example, if your projected traffic is 100 snapshot jobs before 12:00 PM + /// per day, start 12 jobs in parallel and measure the amount of time it takes to proccess + /// all 12 jobs. Once you obtain the result, multiply the duration by 9, for example (12 + /// minutes * 9 = 108 minutes). Use the new result to determine the latest time at + /// which the jobs need to be started to meet your target deadline. + /// + /// + /// + /// The time that it takes to process a job can be impacted by the following factors: + /// + ///
    • + /// + /// The dataset type (Direct Query or SPICE). + /// + ///
    • + /// + /// The size of the dataset. + /// + ///
    • + /// + /// The complexity of the calculated fields that are used in the dashboard. + /// + ///
    • + /// + /// The number of visuals that are on a sheet. + /// + ///
    • + /// + /// The types of visuals that are on the sheet. + /// + ///
    • + /// + /// The number of formats and snapshots that are requested in the job configuration. + /// + ///
    • + /// + /// The size of the generated snapshots. + /// + ///
    + ///     + /// Container for the necessary parameters to execute the StartDashboardSnapshotJob service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the StartDashboardSnapshotJob service method, as returned by QuickSight. + /// + /// You don't have access to this item. The provided credentials couldn't be validated. + /// You might not be authorized to carry out the request. Make sure that your account + /// is authorized to use the Amazon QuickSight service, that your policies have the correct + /// permissions, and that you are using the correct credentials. + /// + /// + /// An internal failure occurred. + /// + /// + /// One or more parameters has a value that isn't valid. + /// + /// + /// A limit is exceeded. + /// + /// + /// The resource specified already exists. + /// + /// + /// One or more resources can't be found. + /// + /// + /// Access is throttled. + /// + /// + /// This error indicates that you are calling an embedding operation in Amazon QuickSight + /// without the required pricing plan on your Amazon Web Services account. Before you + /// can use embedding for anonymous users, a QuickSight administrator needs to add capacity + /// pricing to Amazon QuickSight. You can do this on the Manage Amazon QuickSight + /// page. + /// + /// + /// + /// After capacity pricing is added, you can use the GetDashboardEmbedUrl + /// API operation with the --identity-type ANONYMOUS option. + /// + /// + /// + /// This error indicates that you are calling an operation on an Amazon QuickSight subscription + /// where the edition doesn't include support for that operation. Amazon Amazon QuickSight + /// currently has Standard Edition and Enterprise Edition. Not every operation and capability + /// is available in every edition. + /// + /// REST API Reference for StartDashboardSnapshotJob Operation + public virtual Task StartDashboardSnapshotJobAsync(StartDashboardSnapshotJobRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = StartDashboardSnapshotJobRequestMarshaller.Instance; + options.ResponseUnmarshaller = StartDashboardSnapshotJobResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + + #region StartDashboardSnapshotJobSchedule + + + /// + /// Starts an asynchronous job that runs an existing dashboard schedule and sends the + /// dashboard snapshot through email. + /// + /// + /// + /// Only one job can run simultaneously in a given schedule. Repeated requests are skipped + /// with a 202 HTTP status code. + /// + /// + /// + /// For more information, see Scheduling + /// and sending Amazon QuickSight reports by email and Configuring + /// email report settings for a Amazon QuickSight dashboard in the Amazon QuickSight + /// User Guide. + /// + /// + /// Container for the necessary parameters to execute the StartDashboardSnapshotJobSchedule service method. + /// + /// The response from the StartDashboardSnapshotJobSchedule service method, as returned by QuickSight. + /// + /// You don't have access to this item. The provided credentials couldn't be validated. + /// You might not be authorized to carry out the request. Make sure that your account + /// is authorized to use the Amazon QuickSight service, that your policies have the correct + /// permissions, and that you are using the correct credentials. + /// + /// + /// An internal failure occurred. + /// + /// + /// One or more parameters has a value that isn't valid. + /// + /// + /// A limit is exceeded. + /// + /// + /// One or more resources can't be found. + /// + /// + /// Access is throttled. + /// + /// + /// This error indicates that you are calling an operation on an Amazon QuickSight subscription + /// where the edition doesn't include support for that operation. Amazon Amazon QuickSight + /// currently has Standard Edition and Enterprise Edition. Not every operation and capability + /// is available in every edition. + /// + /// REST API Reference for StartDashboardSnapshotJobSchedule Operation + public virtual StartDashboardSnapshotJobScheduleResponse StartDashboardSnapshotJobSchedule(StartDashboardSnapshotJobScheduleRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = StartDashboardSnapshotJobScheduleRequestMarshaller.Instance; + options.ResponseUnmarshaller = StartDashboardSnapshotJobScheduleResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// Starts an asynchronous job that runs an existing dashboard schedule and sends the + /// dashboard snapshot through email. + /// + /// + /// + /// Only one job can run simultaneously in a given schedule. Repeated requests are skipped + /// with a 202 HTTP status code. /// /// /// - /// The following list provides information about the most commin throttling scenarios - /// that can occur. + /// For more information, see Scheduling + /// and sending Amazon QuickSight reports by email and Configuring + /// email report settings for a Amazon QuickSight dashboard in the Amazon QuickSight + /// User Guide. + /// + /// + /// Container for the necessary parameters to execute the StartDashboardSnapshotJobSchedule service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the StartDashboardSnapshotJobSchedule service method, as returned by QuickSight. + /// + /// You don't have access to this item. The provided credentials couldn't be validated. + /// You might not be authorized to carry out the request. Make sure that your account + /// is authorized to use the Amazon QuickSight service, that your policies have the correct + /// permissions, and that you are using the correct credentials. + /// + /// + /// An internal failure occurred. + /// + /// + /// One or more parameters has a value that isn't valid. + /// + /// + /// A limit is exceeded. + /// + /// + /// One or more resources can't be found. + /// + /// + /// Access is throttled. + /// + /// + /// This error indicates that you are calling an operation on an Amazon QuickSight subscription + /// where the edition doesn't include support for that operation. Amazon Amazon QuickSight + /// currently has Standard Edition and Enterprise Edition. Not every operation and capability + /// is available in every edition. + /// + /// REST API Reference for StartDashboardSnapshotJobSchedule Operation + public virtual Task StartDashboardSnapshotJobScheduleAsync(StartDashboardSnapshotJobScheduleRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = StartDashboardSnapshotJobScheduleRequestMarshaller.Instance; + options.ResponseUnmarshaller = StartDashboardSnapshotJobScheduleResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + + #region TagResource + + + /// + /// Assigns one or more tags (key-value pairs) to the specified Amazon QuickSight resource. + /// + /// + /// + /// + /// Tags can help you organize and categorize your resources. You can also use them to + /// scope user permissions, by granting a user permission to access or change only resources + /// with certain tag values. You can use the TagResource operation with a resource + /// that already has tags. If you specify a new tag key for the resource, this tag is + /// appended to the list of tags associated with the resource. If you specify a tag key + /// that is already associated with the resource, the new tag value that you specify replaces + /// the previous value for that tag. + /// + /// + /// + /// You can associate as many as 50 tags with a resource. Amazon QuickSight supports tagging + /// on data set, data source, dashboard, template, topic, and user. + /// + /// + /// + /// Tagging for Amazon QuickSight works in a similar way to tagging for other Amazon Web + /// Services services, except for the following: /// ///
    • /// - /// A large number of SnapshotExport API jobs are running simultaneously on - /// an Amazon Web Services account. When a new StartDashboardSnapshotJob is - /// created and there are already 12 jobs with the RUNNING status, the new job - /// request fails and returns a LimitExceededException error. Wait for a current - /// job to comlpete before you resubmit the new job. + /// Tags are used to track costs for users in Amazon QuickSight. You can't tag other resources + /// that Amazon QuickSight costs are based on, such as storage capacoty (SPICE), session + /// usage, alert consumption, or reporting units. /// ///
    • /// - /// A large number of API requests are submitted on an Amazon Web Services account. - /// When a user makes more than 10 API calls to the Amazon QuickSight API in one second, - /// a ThrottlingException is returned. + /// Amazon QuickSight doesn't currently support the tag editor for Resource Groups. /// - ///
    + /// + ///     + /// Container for the necessary parameters to execute the TagResource service method. + /// + /// The response from the TagResource service method, as returned by QuickSight. + /// + /// You don't have access to this item. The provided credentials couldn't be validated. + /// You might not be authorized to carry out the request. Make sure that your account + /// is authorized to use the Amazon QuickSight service, that your policies have the correct + /// permissions, and that you are using the correct credentials. + /// + /// + /// An internal failure occurred. + /// + /// + /// One or more parameters has a value that isn't valid. + /// + /// + /// A limit is exceeded. + /// + /// + /// One or more resources can't be found. + /// + /// + /// Access is throttled. + /// + /// REST API Reference for TagResource Operation + public virtual TagResourceResponse TagResource(TagResourceRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = TagResourceRequestMarshaller.Instance; + options.ResponseUnmarshaller = TagResourceResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// Assigns one or more tags (key-value pairs) to the specified Amazon QuickSight resource. + /// + /// + /// /// - /// If your use case requires a higher throttling limit, contact your account admin or - /// Amazon Web ServicesSupport to explore - /// options to tailor a more optimal expereince for your account. + /// Tags can help you organize and categorize your resources. You can also use them to + /// scope user permissions, by granting a user permission to access or change only resources + /// with certain tag values. You can use the TagResource operation with a resource + /// that already has tags. If you specify a new tag key for the resource, this tag is + /// appended to the list of tags associated with the resource. If you specify a tag key + /// that is already associated with the resource, the new tag value that you specify replaces + /// the previous value for that tag. /// /// /// - /// Best practices to handle throttling + /// You can associate as many as 50 tags with a resource. Amazon QuickSight supports tagging + /// on data set, data source, dashboard, template, topic, and user. /// /// /// - /// If your use case projects high levels of API traffic, try to reduce the degree of - /// frequency and parallelism of API calls as much as you can to avoid throttling. You - /// can also perform a timing test to calculate an estimate for the total processing time - /// of your projected load that stays within the throttling limits of the Amazon QuickSight - /// APIs. For example, if your projected traffic is 100 snapshot jobs before 12:00 PM - /// per day, start 12 jobs in parallel and measure the amount of time it takes to proccess - /// all 12 jobs. Once you obtain the result, multiply the duration by 9, for example (12 - /// minutes * 9 = 108 minutes). Use the new result to determine the latest time at - /// which the jobs need to be started to meet your target deadline. + /// Tagging for Amazon QuickSight works in a similar way to tagging for other Amazon Web + /// Services services, except for the following: + /// + ///
    • + /// + /// Tags are used to track costs for users in Amazon QuickSight. You can't tag other resources + /// that Amazon QuickSight costs are based on, such as storage capacoty (SPICE), session + /// usage, alert consumption, or reporting units. + /// + ///
    • + /// + /// Amazon QuickSight doesn't currently support the tag editor for Resource Groups. + /// + ///
    + ///     + /// Container for the necessary parameters to execute the TagResource service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the TagResource service method, as returned by QuickSight. + /// + /// You don't have access to this item. The provided credentials couldn't be validated. + /// You might not be authorized to carry out the request. Make sure that your account + /// is authorized to use the Amazon QuickSight service, that your policies have the correct + /// permissions, and that you are using the correct credentials. + /// + /// + /// An internal failure occurred. + /// + /// + /// One or more parameters has a value that isn't valid. + /// + /// + /// A limit is exceeded. + /// + /// + /// One or more resources can't be found. + /// + /// + /// Access is throttled. + /// + /// REST API Reference for TagResource Operation + public virtual Task TagResourceAsync(TagResourceRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = TagResourceRequestMarshaller.Instance; + options.ResponseUnmarshaller = TagResourceResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + + #region UntagResource + + + /// + /// Removes a tag or tags from a resource. + /// + /// Container for the necessary parameters to execute the UntagResource service method. + /// + /// The response from the UntagResource service method, as returned by QuickSight. + /// + /// You don't have access to this item. The provided credentials couldn't be validated. + /// You might not be authorized to carry out the request. Make sure that your account + /// is authorized to use the Amazon QuickSight service, that your policies have the correct + /// permissions, and that you are using the correct credentials. + /// + /// + /// An internal failure occurred. + /// + /// + /// One or more parameters has a value that isn't valid. + /// + /// + /// One or more resources can't be found. + /// + /// + /// Access is throttled. + /// + /// REST API Reference for UntagResource Operation + public virtual UntagResourceResponse UntagResource(UntagResourceRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = UntagResourceRequestMarshaller.Instance; + options.ResponseUnmarshaller = UntagResourceResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// Removes a tag or tags from a resource. + /// + /// Container for the necessary parameters to execute the UntagResource service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the UntagResource service method, as returned by QuickSight. + /// + /// You don't have access to this item. The provided credentials couldn't be validated. + /// You might not be authorized to carry out the request. Make sure that your account + /// is authorized to use the Amazon QuickSight service, that your policies have the correct + /// permissions, and that you are using the correct credentials. + /// + /// + /// An internal failure occurred. + /// + /// + /// One or more parameters has a value that isn't valid. + /// + /// + /// One or more resources can't be found. + /// + /// + /// Access is throttled. + /// + /// REST API Reference for UntagResource Operation + public virtual Task UntagResourceAsync(UntagResourceRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = UntagResourceRequestMarshaller.Instance; + options.ResponseUnmarshaller = UntagResourceResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + + #region UpdateAccountCustomization + + + /// + /// Updates Amazon QuickSight customizations for the current Amazon Web Services Region. + /// Currently, the only customization that you can use is a theme. + /// + /// + /// + /// You can use customizations for your Amazon Web Services account or, if you specify + /// a namespace, for a Amazon QuickSight namespace instead. Customizations that apply + /// to a namespace override customizations that apply to an Amazon Web Services account. + /// To find out which customizations apply, use the DescribeAccountCustomization + /// API operation. /// + /// + /// Container for the necessary parameters to execute the UpdateAccountCustomization service method. + /// + /// The response from the UpdateAccountCustomization service method, as returned by QuickSight. + /// + /// You don't have access to this item. The provided credentials couldn't be validated. + /// You might not be authorized to carry out the request. Make sure that your account + /// is authorized to use the Amazon QuickSight service, that your policies have the correct + /// permissions, and that you are using the correct credentials. + /// + /// + /// Updating or deleting a resource can cause an inconsistent state. + /// + /// + /// An internal failure occurred. + /// + /// + /// One or more parameters has a value that isn't valid. + /// + /// + /// One or more resources can't be found. + /// + /// + /// This resource is currently unavailable. + /// + /// + /// Access is throttled. + /// + /// REST API Reference for UpdateAccountCustomization Operation + public virtual UpdateAccountCustomizationResponse UpdateAccountCustomization(UpdateAccountCustomizationRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = UpdateAccountCustomizationRequestMarshaller.Instance; + options.ResponseUnmarshaller = UpdateAccountCustomizationResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// Updates Amazon QuickSight customizations for the current Amazon Web Services Region. + /// Currently, the only customization that you can use is a theme. + /// /// /// - /// The time that it takes to process a job can be impacted by the following factors: - /// - ///
    • - /// - /// The dataset type (Direct Query or SPICE). - /// - ///
    • - /// - /// The size of the dataset. - /// - ///
    • - /// - /// The complexity of the calculated fields that are used in the dashboard. - /// - ///
    • - /// - /// The number of visuals that are on a sheet. - /// - ///
    • - /// - /// The types of visuals that are on the sheet. - /// - ///
    • - /// - /// The number of formats and snapshots that are requested in the job configuration. - /// - ///
    • - /// - /// The size of the generated snapshots. + /// You can use customizations for your Amazon Web Services account or, if you specify + /// a namespace, for a Amazon QuickSight namespace instead. Customizations that apply + /// to a namespace override customizations that apply to an Amazon Web Services account. + /// To find out which customizations apply, use the DescribeAccountCustomization + /// API operation. /// - ///
    ///     - /// Container for the necessary parameters to execute the StartDashboardSnapshotJob service method. + /// Container for the necessary parameters to execute the UpdateAccountCustomization service method. /// /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// /// - /// The response from the StartDashboardSnapshotJob service method, as returned by QuickSight. + /// The response from the UpdateAccountCustomization service method, as returned by QuickSight. /// /// You don't have access to this item. The provided credentials couldn't be validated. /// You might not be authorized to carry out the request. Make sure that your account /// is authorized to use the Amazon QuickSight service, that your policies have the correct /// permissions, and that you are using the correct credentials. /// + /// + /// Updating or deleting a resource can cause an inconsistent state. + /// /// /// An internal failure occurred. /// /// /// One or more parameters has a value that isn't valid. /// - /// - /// A limit is exceeded. + /// + /// One or more resources can't be found. /// - /// - /// The resource specified already exists. + /// + /// This resource is currently unavailable. + /// + /// + /// Access is throttled. + /// + /// REST API Reference for UpdateAccountCustomization Operation + public virtual Task UpdateAccountCustomizationAsync(UpdateAccountCustomizationRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = UpdateAccountCustomizationRequestMarshaller.Instance; + options.ResponseUnmarshaller = UpdateAccountCustomizationResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + + #region UpdateAccountSettings + + + /// + /// Updates the Amazon QuickSight settings in your Amazon Web Services account. + /// + /// Container for the necessary parameters to execute the UpdateAccountSettings service method. + /// + /// The response from the UpdateAccountSettings service method, as returned by QuickSight. + /// + /// You don't have access to this item. The provided credentials couldn't be validated. + /// You might not be authorized to carry out the request. Make sure that your account + /// is authorized to use the Amazon QuickSight service, that your policies have the correct + /// permissions, and that you are using the correct credentials. + /// + /// + /// An internal failure occurred. + /// + /// + /// One or more parameters has a value that isn't valid. /// /// /// One or more resources can't be found. /// + /// + /// This resource is currently unavailable. + /// /// /// Access is throttled. /// - /// - /// This error indicates that you are calling an embedding operation in Amazon QuickSight - /// without the required pricing plan on your Amazon Web Services account. Before you - /// can use embedding for anonymous users, a QuickSight administrator needs to add capacity - /// pricing to Amazon QuickSight. You can do this on the Manage Amazon QuickSight - /// page. + /// REST API Reference for UpdateAccountSettings Operation + public virtual UpdateAccountSettingsResponse UpdateAccountSettings(UpdateAccountSettingsRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = UpdateAccountSettingsRequestMarshaller.Instance; + options.ResponseUnmarshaller = UpdateAccountSettingsResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// Updates the Amazon QuickSight settings in your Amazon Web Services account. + /// + /// Container for the necessary parameters to execute the UpdateAccountSettings service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// /// - /// - /// - /// After capacity pricing is added, you can use the GetDashboardEmbedUrl - /// API operation with the --identity-type ANONYMOUS option. - /// + /// The response from the UpdateAccountSettings service method, as returned by QuickSight. + /// + /// You don't have access to this item. The provided credentials couldn't be validated. + /// You might not be authorized to carry out the request. Make sure that your account + /// is authorized to use the Amazon QuickSight service, that your policies have the correct + /// permissions, and that you are using the correct credentials. /// - /// - /// This error indicates that you are calling an operation on an Amazon QuickSight subscription - /// where the edition doesn't include support for that operation. Amazon Amazon QuickSight - /// currently has Standard Edition and Enterprise Edition. Not every operation and capability - /// is available in every edition. + /// + /// An internal failure occurred. + /// + /// + /// One or more parameters has a value that isn't valid. + /// + /// + /// One or more resources can't be found. + /// + /// + /// This resource is currently unavailable. /// - /// REST API Reference for StartDashboardSnapshotJob Operation - public virtual Task StartDashboardSnapshotJobAsync(StartDashboardSnapshotJobRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + /// + /// Access is throttled. + /// + /// REST API Reference for UpdateAccountSettings Operation + public virtual Task UpdateAccountSettingsAsync(UpdateAccountSettingsRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { var options = new InvokeOptions(); - options.RequestMarshaller = StartDashboardSnapshotJobRequestMarshaller.Instance; - options.ResponseUnmarshaller = StartDashboardSnapshotJobResponseUnmarshaller.Instance; + options.RequestMarshaller = UpdateAccountSettingsRequestMarshaller.Instance; + options.ResponseUnmarshaller = UpdateAccountSettingsResponseUnmarshaller.Instance; - return InvokeAsync(request, options, cancellationToken); + return InvokeAsync(request, options, cancellationToken); } #endregion - #region TagResource + #region UpdateAnalysis /// - /// Assigns one or more tags (key-value pairs) to the specified Amazon QuickSight resource. - /// - /// - /// - /// - /// Tags can help you organize and categorize your resources. You can also use them to - /// scope user permissions, by granting a user permission to access or change only resources - /// with certain tag values. You can use the TagResource operation with a resource - /// that already has tags. If you specify a new tag key for the resource, this tag is - /// appended to the list of tags associated with the resource. If you specify a tag key - /// that is already associated with the resource, the new tag value that you specify replaces - /// the previous value for that tag. - /// - /// - /// - /// You can associate as many as 50 tags with a resource. Amazon QuickSight supports tagging - /// on data set, data source, dashboard, template, topic, and user. - /// - /// - /// - /// Tagging for Amazon QuickSight works in a similar way to tagging for other Amazon Web - /// Services services, except for the following: - /// - ///
    • - /// - /// Tags are used to track costs for users in Amazon QuickSight. You can't tag other resources - /// that Amazon QuickSight costs are based on, such as storage capacoty (SPICE), session - /// usage, alert consumption, or reporting units. - /// - ///
    • - /// - /// Amazon QuickSight doesn't currently support the tag editor for Resource Groups. - /// - ///
    + /// Updates an analysis in Amazon QuickSight ///     - /// Container for the necessary parameters to execute the TagResource service method. + /// Container for the necessary parameters to execute the UpdateAnalysis service method. /// - /// The response from the TagResource service method, as returned by QuickSight. - /// - /// You don't have access to this item. The provided credentials couldn't be validated. - /// You might not be authorized to carry out the request. Make sure that your account - /// is authorized to use the Amazon QuickSight service, that your policies have the correct - /// permissions, and that you are using the correct credentials. + /// The response from the UpdateAnalysis service method, as returned by QuickSight. + /// + /// Updating or deleting a resource can cause an inconsistent state. /// /// /// An internal failure occurred. @@ -14414,8 +15995,8 @@ public virtual StartDashboardSnapshotJobResponse StartDashboardSnapshotJob(Start /// /// One or more parameters has a value that isn't valid. /// - /// - /// A limit is exceeded. + /// + /// The resource specified already exists. /// /// /// One or more resources can't be found. @@ -14423,64 +16004,34 @@ public virtual StartDashboardSnapshotJobResponse StartDashboardSnapshotJob(Start /// /// Access is throttled. /// - /// REST API Reference for TagResource Operation - public virtual TagResourceResponse TagResource(TagResourceRequest request) + /// + /// This error indicates that you are calling an operation on an Amazon QuickSight subscription + /// where the edition doesn't include support for that operation. Amazon Amazon QuickSight + /// currently has Standard Edition and Enterprise Edition. Not every operation and capability + /// is available in every edition. + /// + /// REST API Reference for UpdateAnalysis Operation + public virtual UpdateAnalysisResponse UpdateAnalysis(UpdateAnalysisRequest request) { var options = new InvokeOptions(); - options.RequestMarshaller = TagResourceRequestMarshaller.Instance; - options.ResponseUnmarshaller = TagResourceResponseUnmarshaller.Instance; + options.RequestMarshaller = UpdateAnalysisRequestMarshaller.Instance; + options.ResponseUnmarshaller = UpdateAnalysisResponseUnmarshaller.Instance; - return Invoke(request, options); + return Invoke(request, options); } /// - /// Assigns one or more tags (key-value pairs) to the specified Amazon QuickSight resource. - /// - /// - /// - /// - /// Tags can help you organize and categorize your resources. You can also use them to - /// scope user permissions, by granting a user permission to access or change only resources - /// with certain tag values. You can use the TagResource operation with a resource - /// that already has tags. If you specify a new tag key for the resource, this tag is - /// appended to the list of tags associated with the resource. If you specify a tag key - /// that is already associated with the resource, the new tag value that you specify replaces - /// the previous value for that tag. - /// - /// - /// - /// You can associate as many as 50 tags with a resource. Amazon QuickSight supports tagging - /// on data set, data source, dashboard, template, topic, and user. - /// - /// - /// - /// Tagging for Amazon QuickSight works in a similar way to tagging for other Amazon Web - /// Services services, except for the following: - /// - ///
    • - /// - /// Tags are used to track costs for users in Amazon QuickSight. You can't tag other resources - /// that Amazon QuickSight costs are based on, such as storage capacoty (SPICE), session - /// usage, alert consumption, or reporting units. - /// - ///
    • - /// - /// Amazon QuickSight doesn't currently support the tag editor for Resource Groups. - /// - ///
    + /// Updates an analysis in Amazon QuickSight ///     - /// Container for the necessary parameters to execute the TagResource service method. + /// Container for the necessary parameters to execute the UpdateAnalysis service method. /// /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// /// - /// The response from the TagResource service method, as returned by QuickSight. - /// - /// You don't have access to this item. The provided credentials couldn't be validated. - /// You might not be authorized to carry out the request. Make sure that your account - /// is authorized to use the Amazon QuickSight service, that your policies have the correct - /// permissions, and that you are using the correct credentials. + /// The response from the UpdateAnalysis service method, as returned by QuickSight. + /// + /// Updating or deleting a resource can cause an inconsistent state. /// /// /// An internal failure occurred. @@ -14488,8 +16039,8 @@ public virtual TagResourceResponse TagResource(TagResourceRequest request) /// /// One or more parameters has a value that isn't valid. /// - /// - /// A limit is exceeded. + /// + /// The resource specified already exists. /// /// /// One or more resources can't be found. @@ -14497,32 +16048,35 @@ public virtual TagResourceResponse TagResource(TagResourceRequest request) /// /// Access is throttled. /// - /// REST API Reference for TagResource Operation - public virtual Task TagResourceAsync(TagResourceRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + /// + /// This error indicates that you are calling an operation on an Amazon QuickSight subscription + /// where the edition doesn't include support for that operation. Amazon Amazon QuickSight + /// currently has Standard Edition and Enterprise Edition. Not every operation and capability + /// is available in every edition. + /// + /// REST API Reference for UpdateAnalysis Operation + public virtual Task UpdateAnalysisAsync(UpdateAnalysisRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { var options = new InvokeOptions(); - options.RequestMarshaller = TagResourceRequestMarshaller.Instance; - options.ResponseUnmarshaller = TagResourceResponseUnmarshaller.Instance; + options.RequestMarshaller = UpdateAnalysisRequestMarshaller.Instance; + options.ResponseUnmarshaller = UpdateAnalysisResponseUnmarshaller.Instance; - return InvokeAsync(request, options, cancellationToken); + return InvokeAsync(request, options, cancellationToken); } #endregion - #region UntagResource + #region UpdateAnalysisPermissions /// - /// Removes a tag or tags from a resource. + /// Updates the read and write permissions for an analysis. /// - /// Container for the necessary parameters to execute the UntagResource service method. + /// Container for the necessary parameters to execute the UpdateAnalysisPermissions service method. /// - /// The response from the UntagResource service method, as returned by QuickSight. - /// - /// You don't have access to this item. The provided credentials couldn't be validated. - /// You might not be authorized to carry out the request. Make sure that your account - /// is authorized to use the Amazon QuickSight service, that your policies have the correct - /// permissions, and that you are using the correct credentials. + /// The response from the UpdateAnalysisPermissions service method, as returned by QuickSight. + /// + /// Updating or deleting a resource can cause an inconsistent state. /// /// /// An internal failure occurred. @@ -14530,37 +16084,43 @@ public virtual TagResourceResponse TagResource(TagResourceRequest request) /// /// One or more parameters has a value that isn't valid. /// + /// + /// A limit is exceeded. + /// /// /// One or more resources can't be found. /// /// /// Access is throttled. /// - /// REST API Reference for UntagResource Operation - public virtual UntagResourceResponse UntagResource(UntagResourceRequest request) + /// + /// This error indicates that you are calling an operation on an Amazon QuickSight subscription + /// where the edition doesn't include support for that operation. Amazon Amazon QuickSight + /// currently has Standard Edition and Enterprise Edition. Not every operation and capability + /// is available in every edition. + /// + /// REST API Reference for UpdateAnalysisPermissions Operation + public virtual UpdateAnalysisPermissionsResponse UpdateAnalysisPermissions(UpdateAnalysisPermissionsRequest request) { var options = new InvokeOptions(); - options.RequestMarshaller = UntagResourceRequestMarshaller.Instance; - options.ResponseUnmarshaller = UntagResourceResponseUnmarshaller.Instance; + options.RequestMarshaller = UpdateAnalysisPermissionsRequestMarshaller.Instance; + options.ResponseUnmarshaller = UpdateAnalysisPermissionsResponseUnmarshaller.Instance; - return Invoke(request, options); + return Invoke(request, options); } /// - /// Removes a tag or tags from a resource. + /// Updates the read and write permissions for an analysis. /// - /// Container for the necessary parameters to execute the UntagResource service method. + /// Container for the necessary parameters to execute the UpdateAnalysisPermissions service method. /// /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// /// - /// The response from the UntagResource service method, as returned by QuickSight. - /// - /// You don't have access to this item. The provided credentials couldn't be validated. - /// You might not be authorized to carry out the request. Make sure that your account - /// is authorized to use the Amazon QuickSight service, that your policies have the correct - /// permissions, and that you are using the correct credentials. + /// The response from the UpdateAnalysisPermissions service method, as returned by QuickSight. + /// + /// Updating or deleting a resource can cause an inconsistent state. /// /// /// An internal failure occurred. @@ -14568,43 +16128,42 @@ public virtual UntagResourceResponse UntagResource(UntagResourceRequest request) /// /// One or more parameters has a value that isn't valid. /// + /// + /// A limit is exceeded. + /// /// /// One or more resources can't be found. /// /// /// Access is throttled. /// - /// REST API Reference for UntagResource Operation - public virtual Task UntagResourceAsync(UntagResourceRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + /// + /// This error indicates that you are calling an operation on an Amazon QuickSight subscription + /// where the edition doesn't include support for that operation. Amazon Amazon QuickSight + /// currently has Standard Edition and Enterprise Edition. Not every operation and capability + /// is available in every edition. + /// + /// REST API Reference for UpdateAnalysisPermissions Operation + public virtual Task UpdateAnalysisPermissionsAsync(UpdateAnalysisPermissionsRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { var options = new InvokeOptions(); - options.RequestMarshaller = UntagResourceRequestMarshaller.Instance; - options.ResponseUnmarshaller = UntagResourceResponseUnmarshaller.Instance; + options.RequestMarshaller = UpdateAnalysisPermissionsRequestMarshaller.Instance; + options.ResponseUnmarshaller = UpdateAnalysisPermissionsResponseUnmarshaller.Instance; - return InvokeAsync(request, options, cancellationToken); + return InvokeAsync(request, options, cancellationToken); } #endregion - #region UpdateAccountCustomization + #region UpdateBrand /// - /// Updates Amazon QuickSight customizations for the current Amazon Web Services Region. - /// Currently, the only customization that you can use is a theme. - /// - /// - /// - /// You can use customizations for your Amazon Web Services account or, if you specify - /// a namespace, for a Amazon QuickSight namespace instead. Customizations that apply - /// to a namespace override customizations that apply to an Amazon Web Services account. - /// To find out which customizations apply, use the DescribeAccountCustomization - /// API operation. - /// + /// Updates a brand. /// - /// Container for the necessary parameters to execute the UpdateAccountCustomization service method. + /// Container for the necessary parameters to execute the UpdateBrand service method. /// - /// The response from the UpdateAccountCustomization service method, as returned by QuickSight. + /// The response from the UpdateBrand service method, as returned by QuickSight. /// /// You don't have access to this item. The provided credentials couldn't be validated. /// You might not be authorized to carry out the request. Make sure that your account @@ -14614,51 +16173,39 @@ public virtual UntagResourceResponse UntagResource(UntagResourceRequest request) /// /// Updating or deleting a resource can cause an inconsistent state. /// - /// - /// An internal failure occurred. + /// + /// An internal service exception. /// - /// - /// One or more parameters has a value that isn't valid. + /// + /// You don't have this feature activated for your account. To fix this issue, contact + /// Amazon Web Services support. /// /// /// One or more resources can't be found. /// - /// - /// This resource is currently unavailable. - /// /// /// Access is throttled. /// - /// REST API Reference for UpdateAccountCustomization Operation - public virtual UpdateAccountCustomizationResponse UpdateAccountCustomization(UpdateAccountCustomizationRequest request) + /// REST API Reference for UpdateBrand Operation + public virtual UpdateBrandResponse UpdateBrand(UpdateBrandRequest request) { var options = new InvokeOptions(); - options.RequestMarshaller = UpdateAccountCustomizationRequestMarshaller.Instance; - options.ResponseUnmarshaller = UpdateAccountCustomizationResponseUnmarshaller.Instance; + options.RequestMarshaller = UpdateBrandRequestMarshaller.Instance; + options.ResponseUnmarshaller = UpdateBrandResponseUnmarshaller.Instance; - return Invoke(request, options); + return Invoke(request, options); } - - /// - /// Updates Amazon QuickSight customizations for the current Amazon Web Services Region. - /// Currently, the only customization that you can use is a theme. - /// - /// - /// - /// You can use customizations for your Amazon Web Services account or, if you specify - /// a namespace, for a Amazon QuickSight namespace instead. Customizations that apply - /// to a namespace override customizations that apply to an Amazon Web Services account. - /// To find out which customizations apply, use the DescribeAccountCustomization - /// API operation. - /// + + /// + /// Updates a brand. /// - /// Container for the necessary parameters to execute the UpdateAccountCustomization service method. + /// Container for the necessary parameters to execute the UpdateBrand service method. /// /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// /// - /// The response from the UpdateAccountCustomization service method, as returned by QuickSight. + /// The response from the UpdateBrand service method, as returned by QuickSight. /// /// You don't have access to this item. The provided credentials couldn't be validated. /// You might not be authorized to carry out the request. Make sure that your account @@ -14668,136 +16215,140 @@ public virtual UpdateAccountCustomizationResponse UpdateAccountCustomization(Upd /// /// Updating or deleting a resource can cause an inconsistent state. /// - /// - /// An internal failure occurred. + /// + /// An internal service exception. /// - /// - /// One or more parameters has a value that isn't valid. + /// + /// You don't have this feature activated for your account. To fix this issue, contact + /// Amazon Web Services support. /// /// /// One or more resources can't be found. /// - /// - /// This resource is currently unavailable. - /// /// /// Access is throttled. /// - /// REST API Reference for UpdateAccountCustomization Operation - public virtual Task UpdateAccountCustomizationAsync(UpdateAccountCustomizationRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + /// REST API Reference for UpdateBrand Operation + public virtual Task UpdateBrandAsync(UpdateBrandRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { var options = new InvokeOptions(); - options.RequestMarshaller = UpdateAccountCustomizationRequestMarshaller.Instance; - options.ResponseUnmarshaller = UpdateAccountCustomizationResponseUnmarshaller.Instance; + options.RequestMarshaller = UpdateBrandRequestMarshaller.Instance; + options.ResponseUnmarshaller = UpdateBrandResponseUnmarshaller.Instance; - return InvokeAsync(request, options, cancellationToken); + return InvokeAsync(request, options, cancellationToken); } #endregion - #region UpdateAccountSettings + #region UpdateBrandAssignment /// - /// Updates the Amazon QuickSight settings in your Amazon Web Services account. + /// Updates a brand assignment. /// - /// Container for the necessary parameters to execute the UpdateAccountSettings service method. + /// Container for the necessary parameters to execute the UpdateBrandAssignment service method. /// - /// The response from the UpdateAccountSettings service method, as returned by QuickSight. + /// The response from the UpdateBrandAssignment service method, as returned by QuickSight. /// /// You don't have access to this item. The provided credentials couldn't be validated. /// You might not be authorized to carry out the request. Make sure that your account /// is authorized to use the Amazon QuickSight service, that your policies have the correct /// permissions, and that you are using the correct credentials. /// - /// - /// An internal failure occurred. + /// + /// Updating or deleting a resource can cause an inconsistent state. /// - /// - /// One or more parameters has a value that isn't valid. + /// + /// An internal service exception. + /// + /// + /// You don't have this feature activated for your account. To fix this issue, contact + /// Amazon Web Services support. /// /// /// One or more resources can't be found. /// - /// - /// This resource is currently unavailable. - /// /// /// Access is throttled. /// - /// REST API Reference for UpdateAccountSettings Operation - public virtual UpdateAccountSettingsResponse UpdateAccountSettings(UpdateAccountSettingsRequest request) + /// REST API Reference for UpdateBrandAssignment Operation + public virtual UpdateBrandAssignmentResponse UpdateBrandAssignment(UpdateBrandAssignmentRequest request) { var options = new InvokeOptions(); - options.RequestMarshaller = UpdateAccountSettingsRequestMarshaller.Instance; - options.ResponseUnmarshaller = UpdateAccountSettingsResponseUnmarshaller.Instance; + options.RequestMarshaller = UpdateBrandAssignmentRequestMarshaller.Instance; + options.ResponseUnmarshaller = UpdateBrandAssignmentResponseUnmarshaller.Instance; - return Invoke(request, options); + return Invoke(request, options); } /// - /// Updates the Amazon QuickSight settings in your Amazon Web Services account. + /// Updates a brand assignment. /// - /// Container for the necessary parameters to execute the UpdateAccountSettings service method. + /// Container for the necessary parameters to execute the UpdateBrandAssignment service method. /// /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// /// - /// The response from the UpdateAccountSettings service method, as returned by QuickSight. + /// The response from the UpdateBrandAssignment service method, as returned by QuickSight. /// /// You don't have access to this item. The provided credentials couldn't be validated. /// You might not be authorized to carry out the request. Make sure that your account /// is authorized to use the Amazon QuickSight service, that your policies have the correct /// permissions, and that you are using the correct credentials. /// - /// - /// An internal failure occurred. + /// + /// Updating or deleting a resource can cause an inconsistent state. /// - /// - /// One or more parameters has a value that isn't valid. + /// + /// An internal service exception. + /// + /// + /// You don't have this feature activated for your account. To fix this issue, contact + /// Amazon Web Services support. /// /// /// One or more resources can't be found. /// - /// - /// This resource is currently unavailable. - /// /// /// Access is throttled. /// - /// REST API Reference for UpdateAccountSettings Operation - public virtual Task UpdateAccountSettingsAsync(UpdateAccountSettingsRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + /// REST API Reference for UpdateBrandAssignment Operation + public virtual Task UpdateBrandAssignmentAsync(UpdateBrandAssignmentRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { var options = new InvokeOptions(); - options.RequestMarshaller = UpdateAccountSettingsRequestMarshaller.Instance; - options.ResponseUnmarshaller = UpdateAccountSettingsResponseUnmarshaller.Instance; + options.RequestMarshaller = UpdateBrandAssignmentRequestMarshaller.Instance; + options.ResponseUnmarshaller = UpdateBrandAssignmentResponseUnmarshaller.Instance; - return InvokeAsync(request, options, cancellationToken); + return InvokeAsync(request, options, cancellationToken); } #endregion - #region UpdateAnalysis + #region UpdateBrandPublishedVersion /// - /// Updates an analysis in Amazon QuickSight + /// Updates the published version of a brand. /// - /// Container for the necessary parameters to execute the UpdateAnalysis service method. + /// Container for the necessary parameters to execute the UpdateBrandPublishedVersion service method. /// - /// The response from the UpdateAnalysis service method, as returned by QuickSight. + /// The response from the UpdateBrandPublishedVersion service method, as returned by QuickSight. + /// + /// You don't have access to this item. The provided credentials couldn't be validated. + /// You might not be authorized to carry out the request. Make sure that your account + /// is authorized to use the Amazon QuickSight service, that your policies have the correct + /// permissions, and that you are using the correct credentials. + /// /// /// Updating or deleting a resource can cause an inconsistent state. /// - /// - /// An internal failure occurred. - /// - /// - /// One or more parameters has a value that isn't valid. + /// + /// An internal service exception. /// - /// - /// The resource specified already exists. + /// + /// You don't have this feature activated for your account. To fix this issue, contact + /// Amazon Web Services support. /// /// /// One or more resources can't be found. @@ -14805,43 +16356,41 @@ public virtual UpdateAccountSettingsResponse UpdateAccountSettings(UpdateAccount /// /// Access is throttled. /// - /// - /// This error indicates that you are calling an operation on an Amazon QuickSight subscription - /// where the edition doesn't include support for that operation. Amazon Amazon QuickSight - /// currently has Standard Edition and Enterprise Edition. Not every operation and capability - /// is available in every edition. - /// - /// REST API Reference for UpdateAnalysis Operation - public virtual UpdateAnalysisResponse UpdateAnalysis(UpdateAnalysisRequest request) + /// REST API Reference for UpdateBrandPublishedVersion Operation + public virtual UpdateBrandPublishedVersionResponse UpdateBrandPublishedVersion(UpdateBrandPublishedVersionRequest request) { var options = new InvokeOptions(); - options.RequestMarshaller = UpdateAnalysisRequestMarshaller.Instance; - options.ResponseUnmarshaller = UpdateAnalysisResponseUnmarshaller.Instance; + options.RequestMarshaller = UpdateBrandPublishedVersionRequestMarshaller.Instance; + options.ResponseUnmarshaller = UpdateBrandPublishedVersionResponseUnmarshaller.Instance; - return Invoke(request, options); + return Invoke(request, options); } /// - /// Updates an analysis in Amazon QuickSight + /// Updates the published version of a brand. /// - /// Container for the necessary parameters to execute the UpdateAnalysis service method. + /// Container for the necessary parameters to execute the UpdateBrandPublishedVersion service method. /// /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// /// - /// The response from the UpdateAnalysis service method, as returned by QuickSight. + /// The response from the UpdateBrandPublishedVersion service method, as returned by QuickSight. + /// + /// You don't have access to this item. The provided credentials couldn't be validated. + /// You might not be authorized to carry out the request. Make sure that your account + /// is authorized to use the Amazon QuickSight service, that your policies have the correct + /// permissions, and that you are using the correct credentials. + /// /// /// Updating or deleting a resource can cause an inconsistent state. /// - /// - /// An internal failure occurred. - /// - /// - /// One or more parameters has a value that isn't valid. + /// + /// An internal service exception. /// - /// - /// The resource specified already exists. + /// + /// You don't have this feature activated for your account. To fix this issue, contact + /// Amazon Web Services support. /// /// /// One or more resources can't be found. @@ -14849,33 +16398,33 @@ public virtual UpdateAnalysisResponse UpdateAnalysis(UpdateAnalysisRequest reque /// /// Access is throttled. /// - /// - /// This error indicates that you are calling an operation on an Amazon QuickSight subscription - /// where the edition doesn't include support for that operation. Amazon Amazon QuickSight - /// currently has Standard Edition and Enterprise Edition. Not every operation and capability - /// is available in every edition. - /// - /// REST API Reference for UpdateAnalysis Operation - public virtual Task UpdateAnalysisAsync(UpdateAnalysisRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + /// REST API Reference for UpdateBrandPublishedVersion Operation + public virtual Task UpdateBrandPublishedVersionAsync(UpdateBrandPublishedVersionRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { var options = new InvokeOptions(); - options.RequestMarshaller = UpdateAnalysisRequestMarshaller.Instance; - options.ResponseUnmarshaller = UpdateAnalysisResponseUnmarshaller.Instance; + options.RequestMarshaller = UpdateBrandPublishedVersionRequestMarshaller.Instance; + options.ResponseUnmarshaller = UpdateBrandPublishedVersionResponseUnmarshaller.Instance; - return InvokeAsync(request, options, cancellationToken); + return InvokeAsync(request, options, cancellationToken); } #endregion - #region UpdateAnalysisPermissions + #region UpdateCustomPermissions /// - /// Updates the read and write permissions for an analysis. + /// Updates a custom permissions profile. /// - /// Container for the necessary parameters to execute the UpdateAnalysisPermissions service method. + /// Container for the necessary parameters to execute the UpdateCustomPermissions service method. /// - /// The response from the UpdateAnalysisPermissions service method, as returned by QuickSight. + /// The response from the UpdateCustomPermissions service method, as returned by QuickSight. + /// + /// You don't have access to this item. The provided credentials couldn't be validated. + /// You might not be authorized to carry out the request. Make sure that your account + /// is authorized to use the Amazon QuickSight service, that your policies have the correct + /// permissions, and that you are using the correct credentials. + /// /// /// Updating or deleting a resource can cause an inconsistent state. /// @@ -14885,41 +16434,44 @@ public virtual UpdateAnalysisResponse UpdateAnalysis(UpdateAnalysisRequest reque /// /// One or more parameters has a value that isn't valid. /// - /// - /// A limit is exceeded. + /// + /// One or more preconditions aren't met. /// /// /// One or more resources can't be found. /// + /// + /// This resource is currently unavailable. + /// /// /// Access is throttled. /// - /// - /// This error indicates that you are calling an operation on an Amazon QuickSight subscription - /// where the edition doesn't include support for that operation. Amazon Amazon QuickSight - /// currently has Standard Edition and Enterprise Edition. Not every operation and capability - /// is available in every edition. - /// - /// REST API Reference for UpdateAnalysisPermissions Operation - public virtual UpdateAnalysisPermissionsResponse UpdateAnalysisPermissions(UpdateAnalysisPermissionsRequest request) + /// REST API Reference for UpdateCustomPermissions Operation + public virtual UpdateCustomPermissionsResponse UpdateCustomPermissions(UpdateCustomPermissionsRequest request) { var options = new InvokeOptions(); - options.RequestMarshaller = UpdateAnalysisPermissionsRequestMarshaller.Instance; - options.ResponseUnmarshaller = UpdateAnalysisPermissionsResponseUnmarshaller.Instance; + options.RequestMarshaller = UpdateCustomPermissionsRequestMarshaller.Instance; + options.ResponseUnmarshaller = UpdateCustomPermissionsResponseUnmarshaller.Instance; - return Invoke(request, options); + return Invoke(request, options); } /// - /// Updates the read and write permissions for an analysis. + /// Updates a custom permissions profile. /// - /// Container for the necessary parameters to execute the UpdateAnalysisPermissions service method. + /// Container for the necessary parameters to execute the UpdateCustomPermissions service method. /// /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// /// - /// The response from the UpdateAnalysisPermissions service method, as returned by QuickSight. + /// The response from the UpdateCustomPermissions service method, as returned by QuickSight. + /// + /// You don't have access to this item. The provided credentials couldn't be validated. + /// You might not be authorized to carry out the request. Make sure that your account + /// is authorized to use the Amazon QuickSight service, that your policies have the correct + /// permissions, and that you are using the correct credentials. + /// /// /// Updating or deleting a resource can cause an inconsistent state. /// @@ -14929,29 +16481,26 @@ public virtual UpdateAnalysisPermissionsResponse UpdateAnalysisPermissions(Updat /// /// One or more parameters has a value that isn't valid. /// - /// - /// A limit is exceeded. + /// + /// One or more preconditions aren't met. /// /// /// One or more resources can't be found. /// + /// + /// This resource is currently unavailable. + /// /// /// Access is throttled. /// - /// - /// This error indicates that you are calling an operation on an Amazon QuickSight subscription - /// where the edition doesn't include support for that operation. Amazon Amazon QuickSight - /// currently has Standard Edition and Enterprise Edition. Not every operation and capability - /// is available in every edition. - /// - /// REST API Reference for UpdateAnalysisPermissions Operation - public virtual Task UpdateAnalysisPermissionsAsync(UpdateAnalysisPermissionsRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + /// REST API Reference for UpdateCustomPermissions Operation + public virtual Task UpdateCustomPermissionsAsync(UpdateCustomPermissionsRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { var options = new InvokeOptions(); - options.RequestMarshaller = UpdateAnalysisPermissionsRequestMarshaller.Instance; - options.ResponseUnmarshaller = UpdateAnalysisPermissionsResponseUnmarshaller.Instance; + options.RequestMarshaller = UpdateCustomPermissionsRequestMarshaller.Instance; + options.ResponseUnmarshaller = UpdateCustomPermissionsResponseUnmarshaller.Instance; - return InvokeAsync(request, options, cancellationToken); + return InvokeAsync(request, options, cancellationToken); } #endregion @@ -17892,6 +19441,101 @@ public virtual UpdateUserResponse UpdateUser(UpdateUserRequest request) #endregion + #region UpdateUserCustomPermission + + + /// + /// Updates a custom permissions profile for a user. + /// + /// Container for the necessary parameters to execute the UpdateUserCustomPermission service method. + /// + /// The response from the UpdateUserCustomPermission service method, as returned by QuickSight. + /// + /// You don't have access to this item. The provided credentials couldn't be validated. + /// You might not be authorized to carry out the request. Make sure that your account + /// is authorized to use the Amazon QuickSight service, that your policies have the correct + /// permissions, and that you are using the correct credentials. + /// + /// + /// Updating or deleting a resource can cause an inconsistent state. + /// + /// + /// An internal failure occurred. + /// + /// + /// One or more parameters has a value that isn't valid. + /// + /// + /// One or more preconditions aren't met. + /// + /// + /// One or more resources can't be found. + /// + /// + /// This resource is currently unavailable. + /// + /// + /// Access is throttled. + /// + /// REST API Reference for UpdateUserCustomPermission Operation + public virtual UpdateUserCustomPermissionResponse UpdateUserCustomPermission(UpdateUserCustomPermissionRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = UpdateUserCustomPermissionRequestMarshaller.Instance; + options.ResponseUnmarshaller = UpdateUserCustomPermissionResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// Updates a custom permissions profile for a user. + /// + /// Container for the necessary parameters to execute the UpdateUserCustomPermission service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the UpdateUserCustomPermission service method, as returned by QuickSight. + /// + /// You don't have access to this item. The provided credentials couldn't be validated. + /// You might not be authorized to carry out the request. Make sure that your account + /// is authorized to use the Amazon QuickSight service, that your policies have the correct + /// permissions, and that you are using the correct credentials. + /// + /// + /// Updating or deleting a resource can cause an inconsistent state. + /// + /// + /// An internal failure occurred. + /// + /// + /// One or more parameters has a value that isn't valid. + /// + /// + /// One or more preconditions aren't met. + /// + /// + /// One or more resources can't be found. + /// + /// + /// This resource is currently unavailable. + /// + /// + /// Access is throttled. + /// + /// REST API Reference for UpdateUserCustomPermission Operation + public virtual Task UpdateUserCustomPermissionAsync(UpdateUserCustomPermissionRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = UpdateUserCustomPermissionRequestMarshaller.Instance; + options.ResponseUnmarshaller = UpdateUserCustomPermissionResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + #region UpdateVPCConnection diff --git a/sdk/src/Services/QuickSight/Properties/AssemblyInfo.cs b/sdk/src/Services/QuickSight/Properties/AssemblyInfo.cs index f9c3e42d62f8..8eb0f3fe2fd8 100644 --- a/sdk/src/Services/QuickSight/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/QuickSight/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.405.0")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.409.2")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/QuickSight/QuickSight.sln b/sdk/src/Services/QuickSight/QuickSight.sln index 0c6a70e76fa1..f286bdacb494 100644 --- a/sdk/src/Services/QuickSight/QuickSight.sln +++ b/sdk/src/Services/QuickSight/QuickSight.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {383DAB6B-79BF-48F7-A0D1-25C3E081D57E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {383DAB6B-79BF-48F7-A0D1-25C3E081D57E}.Debug|Any CPU.Build.0 = Debug|Any CPU {383DAB6B-79BF-48F7-A0D1-25C3E081D57E}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {E7712F6B-A335-45BA-B5BA-AA622248DEFE}.Debug|Any CPU.Build.0 = Debug|Any CPU {E7712F6B-A335-45BA-B5BA-AA622248DEFE}.Release|Any CPU.ActiveCfg = Release|Any CPU {E7712F6B-A335-45BA-B5BA-AA622248DEFE}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {68C1DC65-D965-4B51-B84D-4DE0DAE4ACFD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {68C1DC65-D965-4B51-B84D-4DE0DAE4ACFD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {68C1DC65-D965-4B51-B84D-4DE0DAE4ACFD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {68C1DC65-D965-4B51-B84D-4DE0DAE4ACFD}.Release|Any CPU.Build.0 = Release|Any CPU - {E9FEF015-8902-466E-A12A-4D7AB97409A8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E9FEF015-8902-466E-A12A-4D7AB97409A8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E9FEF015-8902-466E-A12A-4D7AB97409A8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E9FEF015-8902-466E-A12A-4D7AB97409A8}.Release|Any CPU.Build.0 = Release|Any CPU - {73FD1630-55FA-41BB-AA90-918D24B8CF7D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {73FD1630-55FA-41BB-AA90-918D24B8CF7D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {73FD1630-55FA-41BB-AA90-918D24B8CF7D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {73FD1630-55FA-41BB-AA90-918D24B8CF7D}.Release|Any CPU.Build.0 = Release|Any CPU - {C2FDFEBE-2E5E-4A2E-A26C-AE17CC67F5C2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C2FDFEBE-2E5E-4A2E-A26C-AE17CC67F5C2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C2FDFEBE-2E5E-4A2E-A26C-AE17CC67F5C2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C2FDFEBE-2E5E-4A2E-A26C-AE17CC67F5C2}.Release|Any CPU.Build.0 = Release|Any CPU - {7D884A46-A388-4E41-A4BD-83F284B12EDB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7D884A46-A388-4E41-A4BD-83F284B12EDB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7D884A46-A388-4E41-A4BD-83F284B12EDB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7D884A46-A388-4E41-A4BD-83F284B12EDB}.Release|Any CPU.Build.0 = Release|Any CPU - {7836F9E7-B66A-48A1-BE02-0E6847A4FF6E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7836F9E7-B66A-48A1-BE02-0E6847A4FF6E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7836F9E7-B66A-48A1-BE02-0E6847A4FF6E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7836F9E7-B66A-48A1-BE02-0E6847A4FF6E}.Release|Any CPU.Build.0 = Release|Any CPU - {20683D24-D035-4A30-8AA7-3279FF77B196}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {20683D24-D035-4A30-8AA7-3279FF77B196}.Debug|Any CPU.Build.0 = Debug|Any CPU - {20683D24-D035-4A30-8AA7-3279FF77B196}.Release|Any CPU.ActiveCfg = Release|Any CPU - {20683D24-D035-4A30-8AA7-3279FF77B196}.Release|Any CPU.Build.0 = Release|Any CPU - {FB527D0A-3697-4BFC-9A8F-3194267A2ABE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FB527D0A-3697-4BFC-9A8F-3194267A2ABE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FB527D0A-3697-4BFC-9A8F-3194267A2ABE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FB527D0A-3697-4BFC-9A8F-3194267A2ABE}.Release|Any CPU.Build.0 = Release|Any CPU - {AC9DE7C4-6B64-4783-86CB-3DDCE0CCE39D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AC9DE7C4-6B64-4783-86CB-3DDCE0CCE39D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AC9DE7C4-6B64-4783-86CB-3DDCE0CCE39D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AC9DE7C4-6B64-4783-86CB-3DDCE0CCE39D}.Release|Any CPU.Build.0 = Release|Any CPU - {6770FFBD-341F-42B4-BF80-43E467CE823D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6770FFBD-341F-42B4-BF80-43E467CE823D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6770FFBD-341F-42B4-BF80-43E467CE823D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6770FFBD-341F-42B4-BF80-43E467CE823D}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {68C1DC65-D965-4B51-B84D-4DE0DAE4ACFD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {68C1DC65-D965-4B51-B84D-4DE0DAE4ACFD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {68C1DC65-D965-4B51-B84D-4DE0DAE4ACFD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {68C1DC65-D965-4B51-B84D-4DE0DAE4ACFD}.Release|Any CPU.Build.0 = Release|Any CPU - {E9FEF015-8902-466E-A12A-4D7AB97409A8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E9FEF015-8902-466E-A12A-4D7AB97409A8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E9FEF015-8902-466E-A12A-4D7AB97409A8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E9FEF015-8902-466E-A12A-4D7AB97409A8}.Release|Any CPU.Build.0 = Release|Any CPU - {73FD1630-55FA-41BB-AA90-918D24B8CF7D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {73FD1630-55FA-41BB-AA90-918D24B8CF7D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {73FD1630-55FA-41BB-AA90-918D24B8CF7D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {73FD1630-55FA-41BB-AA90-918D24B8CF7D}.Release|Any CPU.Build.0 = Release|Any CPU - {C2FDFEBE-2E5E-4A2E-A26C-AE17CC67F5C2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C2FDFEBE-2E5E-4A2E-A26C-AE17CC67F5C2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C2FDFEBE-2E5E-4A2E-A26C-AE17CC67F5C2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C2FDFEBE-2E5E-4A2E-A26C-AE17CC67F5C2}.Release|Any CPU.Build.0 = Release|Any CPU - {7D884A46-A388-4E41-A4BD-83F284B12EDB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7D884A46-A388-4E41-A4BD-83F284B12EDB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7D884A46-A388-4E41-A4BD-83F284B12EDB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7D884A46-A388-4E41-A4BD-83F284B12EDB}.Release|Any CPU.Build.0 = Release|Any CPU - {7836F9E7-B66A-48A1-BE02-0E6847A4FF6E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7836F9E7-B66A-48A1-BE02-0E6847A4FF6E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7836F9E7-B66A-48A1-BE02-0E6847A4FF6E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7836F9E7-B66A-48A1-BE02-0E6847A4FF6E}.Release|Any CPU.Build.0 = Release|Any CPU - {20683D24-D035-4A30-8AA7-3279FF77B196}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {20683D24-D035-4A30-8AA7-3279FF77B196}.Debug|Any CPU.Build.0 = Debug|Any CPU - {20683D24-D035-4A30-8AA7-3279FF77B196}.Release|Any CPU.ActiveCfg = Release|Any CPU - {20683D24-D035-4A30-8AA7-3279FF77B196}.Release|Any CPU.Build.0 = Release|Any CPU - {FB527D0A-3697-4BFC-9A8F-3194267A2ABE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FB527D0A-3697-4BFC-9A8F-3194267A2ABE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FB527D0A-3697-4BFC-9A8F-3194267A2ABE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FB527D0A-3697-4BFC-9A8F-3194267A2ABE}.Release|Any CPU.Build.0 = Release|Any CPU - {AC9DE7C4-6B64-4783-86CB-3DDCE0CCE39D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AC9DE7C4-6B64-4783-86CB-3DDCE0CCE39D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AC9DE7C4-6B64-4783-86CB-3DDCE0CCE39D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AC9DE7C4-6B64-4783-86CB-3DDCE0CCE39D}.Release|Any CPU.Build.0 = Release|Any CPU - {6770FFBD-341F-42B4-BF80-43E467CE823D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6770FFBD-341F-42B4-BF80-43E467CE823D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6770FFBD-341F-42B4-BF80-43E467CE823D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6770FFBD-341F-42B4-BF80-43E467CE823D}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {383DAB6B-79BF-48F7-A0D1-25C3E081D57E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {9096D7B5-3476-4CCE-AD81-40D467306DAB} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {C0FA84E8-8735-453F-AA6C-D4DFA6EF2084} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {FA03215C-0B67-4F9E-ACAE-6F8031E2EECF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {E7712F6B-A335-45BA-B5BA-AA622248DEFE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {68C1DC65-D965-4B51-B84D-4DE0DAE4ACFD} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E9FEF015-8902-466E-A12A-4D7AB97409A8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {73FD1630-55FA-41BB-AA90-918D24B8CF7D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C2FDFEBE-2E5E-4A2E-A26C-AE17CC67F5C2} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {7D884A46-A388-4E41-A4BD-83F284B12EDB} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {7836F9E7-B66A-48A1-BE02-0E6847A4FF6E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {20683D24-D035-4A30-8AA7-3279FF77B196} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {FB527D0A-3697-4BFC-9A8F-3194267A2ABE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {AC9DE7C4-6B64-4783-86CB-3DDCE0CCE39D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6770FFBD-341F-42B4-BF80-43E467CE823D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {68C1DC65-D965-4B51-B84D-4DE0DAE4ACFD} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E9FEF015-8902-466E-A12A-4D7AB97409A8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {73FD1630-55FA-41BB-AA90-918D24B8CF7D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C2FDFEBE-2E5E-4A2E-A26C-AE17CC67F5C2} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {7D884A46-A388-4E41-A4BD-83F284B12EDB} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {7836F9E7-B66A-48A1-BE02-0E6847A4FF6E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {20683D24-D035-4A30-8AA7-3279FF77B196} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {FB527D0A-3697-4BFC-9A8F-3194267A2ABE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {AC9DE7C4-6B64-4783-86CB-3DDCE0CCE39D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6770FFBD-341F-42B4-BF80-43E467CE823D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {78225AE0-9AE6-48A6-AEF9-06376DE9A820} diff --git a/sdk/src/Services/RAM/Generated/AmazonRAMConfig.cs b/sdk/src/Services/RAM/Generated/AmazonRAMConfig.cs index e2a8aa134746..11910856a787 100644 --- a/sdk/src/Services/RAM/Generated/AmazonRAMConfig.cs +++ b/sdk/src/Services/RAM/Generated/AmazonRAMConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.RAM public partial class AmazonRAMConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("RAM", "4.0.0.0"); private static readonly AmazonRAMEndpointResolver EndpointResolver = new AmazonRAMEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("RAM", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("RAM", "3.7.400.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/RAM/Properties/AssemblyInfo.cs b/sdk/src/Services/RAM/Properties/AssemblyInfo.cs index 717e73687201..91f016be8d23 100644 --- a/sdk/src/Services/RAM/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/RAM/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/RAM/RAM.sln b/sdk/src/Services/RAM/RAM.sln index 607fb2aaffc9..d113accd30f7 100644 --- a/sdk/src/Services/RAM/RAM.sln +++ b/sdk/src/Services/RAM/RAM.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {C2C61CCE-4D7E-46E4-A7B1-01AA9AD5B863}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {C2C61CCE-4D7E-46E4-A7B1-01AA9AD5B863}.Debug|Any CPU.Build.0 = Debug|Any CPU {C2C61CCE-4D7E-46E4-A7B1-01AA9AD5B863}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {5FCF7665-0056-4E6B-BACC-4667219A23A8}.Debug|Any CPU.Build.0 = Debug|Any CPU {5FCF7665-0056-4E6B-BACC-4667219A23A8}.Release|Any CPU.ActiveCfg = Release|Any CPU {5FCF7665-0056-4E6B-BACC-4667219A23A8}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {9207E29F-B64E-42BB-A17B-DFCDAC76B2D0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9207E29F-B64E-42BB-A17B-DFCDAC76B2D0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9207E29F-B64E-42BB-A17B-DFCDAC76B2D0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9207E29F-B64E-42BB-A17B-DFCDAC76B2D0}.Release|Any CPU.Build.0 = Release|Any CPU - {E7BF1BA3-FCEA-4BCE-95A3-3498F7E7414C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E7BF1BA3-FCEA-4BCE-95A3-3498F7E7414C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E7BF1BA3-FCEA-4BCE-95A3-3498F7E7414C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E7BF1BA3-FCEA-4BCE-95A3-3498F7E7414C}.Release|Any CPU.Build.0 = Release|Any CPU - {E65B1B58-7FDE-412B-AD81-AD8F61D57DF5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E65B1B58-7FDE-412B-AD81-AD8F61D57DF5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E65B1B58-7FDE-412B-AD81-AD8F61D57DF5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E65B1B58-7FDE-412B-AD81-AD8F61D57DF5}.Release|Any CPU.Build.0 = Release|Any CPU - {33E01BC2-4008-4F84-8581-236687BCDAF8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {33E01BC2-4008-4F84-8581-236687BCDAF8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {33E01BC2-4008-4F84-8581-236687BCDAF8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {33E01BC2-4008-4F84-8581-236687BCDAF8}.Release|Any CPU.Build.0 = Release|Any CPU - {C04F5736-C2C1-42DE-9CF7-42D67A4714A4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C04F5736-C2C1-42DE-9CF7-42D67A4714A4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C04F5736-C2C1-42DE-9CF7-42D67A4714A4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C04F5736-C2C1-42DE-9CF7-42D67A4714A4}.Release|Any CPU.Build.0 = Release|Any CPU - {74946651-C778-4918-B3CA-BDB73D3D9353}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {74946651-C778-4918-B3CA-BDB73D3D9353}.Debug|Any CPU.Build.0 = Debug|Any CPU - {74946651-C778-4918-B3CA-BDB73D3D9353}.Release|Any CPU.ActiveCfg = Release|Any CPU - {74946651-C778-4918-B3CA-BDB73D3D9353}.Release|Any CPU.Build.0 = Release|Any CPU - {1FF40033-3557-4803-8520-93CC2A1E895B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1FF40033-3557-4803-8520-93CC2A1E895B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1FF40033-3557-4803-8520-93CC2A1E895B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1FF40033-3557-4803-8520-93CC2A1E895B}.Release|Any CPU.Build.0 = Release|Any CPU - {A73885A6-A189-462B-A3B4-794EF38125CD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A73885A6-A189-462B-A3B4-794EF38125CD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A73885A6-A189-462B-A3B4-794EF38125CD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A73885A6-A189-462B-A3B4-794EF38125CD}.Release|Any CPU.Build.0 = Release|Any CPU - {BABFC698-E1A4-477E-B4F6-11C6A5695F70}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BABFC698-E1A4-477E-B4F6-11C6A5695F70}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BABFC698-E1A4-477E-B4F6-11C6A5695F70}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BABFC698-E1A4-477E-B4F6-11C6A5695F70}.Release|Any CPU.Build.0 = Release|Any CPU - {73FF383F-15C3-4E3E-AF54-03070FCAEFC5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {73FF383F-15C3-4E3E-AF54-03070FCAEFC5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {73FF383F-15C3-4E3E-AF54-03070FCAEFC5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {73FF383F-15C3-4E3E-AF54-03070FCAEFC5}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {9207E29F-B64E-42BB-A17B-DFCDAC76B2D0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9207E29F-B64E-42BB-A17B-DFCDAC76B2D0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9207E29F-B64E-42BB-A17B-DFCDAC76B2D0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9207E29F-B64E-42BB-A17B-DFCDAC76B2D0}.Release|Any CPU.Build.0 = Release|Any CPU - {E7BF1BA3-FCEA-4BCE-95A3-3498F7E7414C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E7BF1BA3-FCEA-4BCE-95A3-3498F7E7414C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E7BF1BA3-FCEA-4BCE-95A3-3498F7E7414C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E7BF1BA3-FCEA-4BCE-95A3-3498F7E7414C}.Release|Any CPU.Build.0 = Release|Any CPU - {E65B1B58-7FDE-412B-AD81-AD8F61D57DF5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E65B1B58-7FDE-412B-AD81-AD8F61D57DF5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E65B1B58-7FDE-412B-AD81-AD8F61D57DF5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E65B1B58-7FDE-412B-AD81-AD8F61D57DF5}.Release|Any CPU.Build.0 = Release|Any CPU - {33E01BC2-4008-4F84-8581-236687BCDAF8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {33E01BC2-4008-4F84-8581-236687BCDAF8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {33E01BC2-4008-4F84-8581-236687BCDAF8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {33E01BC2-4008-4F84-8581-236687BCDAF8}.Release|Any CPU.Build.0 = Release|Any CPU - {C04F5736-C2C1-42DE-9CF7-42D67A4714A4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C04F5736-C2C1-42DE-9CF7-42D67A4714A4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C04F5736-C2C1-42DE-9CF7-42D67A4714A4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C04F5736-C2C1-42DE-9CF7-42D67A4714A4}.Release|Any CPU.Build.0 = Release|Any CPU - {74946651-C778-4918-B3CA-BDB73D3D9353}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {74946651-C778-4918-B3CA-BDB73D3D9353}.Debug|Any CPU.Build.0 = Debug|Any CPU - {74946651-C778-4918-B3CA-BDB73D3D9353}.Release|Any CPU.ActiveCfg = Release|Any CPU - {74946651-C778-4918-B3CA-BDB73D3D9353}.Release|Any CPU.Build.0 = Release|Any CPU - {1FF40033-3557-4803-8520-93CC2A1E895B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1FF40033-3557-4803-8520-93CC2A1E895B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1FF40033-3557-4803-8520-93CC2A1E895B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1FF40033-3557-4803-8520-93CC2A1E895B}.Release|Any CPU.Build.0 = Release|Any CPU - {A73885A6-A189-462B-A3B4-794EF38125CD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A73885A6-A189-462B-A3B4-794EF38125CD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A73885A6-A189-462B-A3B4-794EF38125CD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A73885A6-A189-462B-A3B4-794EF38125CD}.Release|Any CPU.Build.0 = Release|Any CPU - {BABFC698-E1A4-477E-B4F6-11C6A5695F70}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BABFC698-E1A4-477E-B4F6-11C6A5695F70}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BABFC698-E1A4-477E-B4F6-11C6A5695F70}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BABFC698-E1A4-477E-B4F6-11C6A5695F70}.Release|Any CPU.Build.0 = Release|Any CPU - {73FF383F-15C3-4E3E-AF54-03070FCAEFC5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {73FF383F-15C3-4E3E-AF54-03070FCAEFC5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {73FF383F-15C3-4E3E-AF54-03070FCAEFC5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {73FF383F-15C3-4E3E-AF54-03070FCAEFC5}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {C2C61CCE-4D7E-46E4-A7B1-01AA9AD5B863} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {C879A9FC-D396-4A24-923A-8DC2759CA3F8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {B1EBD994-85D0-45F6-9306-72DEC21CB1FA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {C36F7F68-6E79-4D01-A316-2A8038AB549C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {5FCF7665-0056-4E6B-BACC-4667219A23A8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {9207E29F-B64E-42BB-A17B-DFCDAC76B2D0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E7BF1BA3-FCEA-4BCE-95A3-3498F7E7414C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E65B1B58-7FDE-412B-AD81-AD8F61D57DF5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {33E01BC2-4008-4F84-8581-236687BCDAF8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C04F5736-C2C1-42DE-9CF7-42D67A4714A4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {74946651-C778-4918-B3CA-BDB73D3D9353} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {1FF40033-3557-4803-8520-93CC2A1E895B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A73885A6-A189-462B-A3B4-794EF38125CD} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {BABFC698-E1A4-477E-B4F6-11C6A5695F70} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {73FF383F-15C3-4E3E-AF54-03070FCAEFC5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {9207E29F-B64E-42BB-A17B-DFCDAC76B2D0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E7BF1BA3-FCEA-4BCE-95A3-3498F7E7414C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E65B1B58-7FDE-412B-AD81-AD8F61D57DF5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {33E01BC2-4008-4F84-8581-236687BCDAF8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C04F5736-C2C1-42DE-9CF7-42D67A4714A4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {74946651-C778-4918-B3CA-BDB73D3D9353} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {1FF40033-3557-4803-8520-93CC2A1E895B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A73885A6-A189-462B-A3B4-794EF38125CD} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {BABFC698-E1A4-477E-B4F6-11C6A5695F70} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {73FF383F-15C3-4E3E-AF54-03070FCAEFC5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {C797F283-904C-4253-9EF9-E8EFC4BD863B} diff --git a/sdk/src/Services/RDS/Generated/AmazonRDSConfig.cs b/sdk/src/Services/RDS/Generated/AmazonRDSConfig.cs index 7acc56fe1637..e239bb276b02 100644 --- a/sdk/src/Services/RDS/Generated/AmazonRDSConfig.cs +++ b/sdk/src/Services/RDS/Generated/AmazonRDSConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.RDS public partial class AmazonRDSConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("RDS", "4.0.0.0"); private static readonly AmazonRDSEndpointResolver EndpointResolver = new AmazonRDSEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("RDS", "3.7.403.4"); -======= - InternalSDKUtils.BuildUserAgentString("RDS", "3.7.406.12"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/RDS/Generated/Model/Internal/MarshallTransformations/CreateDBShardGroupRequestMarshaller.cs b/sdk/src/Services/RDS/Generated/Model/Internal/MarshallTransformations/CreateDBShardGroupRequestMarshaller.cs index 839bf715fd72..fbba27156d37 100644 --- a/sdk/src/Services/RDS/Generated/Model/Internal/MarshallTransformations/CreateDBShardGroupRequestMarshaller.cs +++ b/sdk/src/Services/RDS/Generated/Model/Internal/MarshallTransformations/CreateDBShardGroupRequestMarshaller.cs @@ -85,18 +85,23 @@ public IRequest Marshall(CreateDBShardGroupRequest publicRequest) } if(publicRequest.IsSetTags()) { - int publicRequestlistValueIndex = 1; - foreach(var publicRequestlistValue in publicRequest.Tags) + if (publicRequest.Tags.Count == 0) + request.Parameters.Add("Tags", ""); + else { - if(publicRequestlistValue.IsSetKey()) - { - request.Parameters.Add("Tags" + "." + "Tag" + "." + publicRequestlistValueIndex + "." + "Key", StringUtils.FromString(publicRequestlistValue.Key)); - } - if(publicRequestlistValue.IsSetValue()) - { - request.Parameters.Add("Tags" + "." + "Tag" + "." + publicRequestlistValueIndex + "." + "Value", StringUtils.FromString(publicRequestlistValue.Value)); - } - publicRequestlistValueIndex++; + int publicRequestlistValueIndex = 1; + foreach(var publicRequestlistValue in publicRequest.Tags) + { + if(publicRequestlistValue.IsSetKey()) + { + request.Parameters.Add("Tags" + "." + "Tag" + "." + publicRequestlistValueIndex + "." + "Key", StringUtils.FromString(publicRequestlistValue.Key)); + } + if(publicRequestlistValue.IsSetValue()) + { + request.Parameters.Add("Tags" + "." + "Tag" + "." + publicRequestlistValueIndex + "." + "Value", StringUtils.FromString(publicRequestlistValue.Value)); + } + publicRequestlistValueIndex++; + } } } } diff --git a/sdk/src/Services/RDS/Generated/Model/RestoreDBClusterFromSnapshotRequest.cs b/sdk/src/Services/RDS/Generated/Model/RestoreDBClusterFromSnapshotRequest.cs index 0a4a612051e9..9d2f87d91ac7 100644 --- a/sdk/src/Services/RDS/Generated/Model/RestoreDBClusterFromSnapshotRequest.cs +++ b/sdk/src/Services/RDS/Generated/Model/RestoreDBClusterFromSnapshotRequest.cs @@ -527,9 +527,9 @@ internal bool IsSetEnableIAMDatabaseAuthentication() /// Specifies whether to turn on Performance Insights for the DB cluster. /// /// - public bool EnablePerformanceInsights + public bool? EnablePerformanceInsights { - get { return this._enablePerformanceInsights.GetValueOrDefault(); } + get { return this._enablePerformanceInsights; } set { this._enablePerformanceInsights = value; } } @@ -851,9 +851,9 @@ internal bool IsSetKmsKeyId() /// Default: 0 /// /// - public int MonitoringInterval + public int? MonitoringInterval { - get { return this._monitoringInterval.GetValueOrDefault(); } + get { return this._monitoringInterval; } set { this._monitoringInterval = value; } } @@ -1017,9 +1017,9 @@ internal bool IsSetPerformanceInsightsKMSKeyId() /// issues an error. /// /// - public int PerformanceInsightsRetentionPeriod + public int? PerformanceInsightsRetentionPeriod { - get { return this._performanceInsightsRetentionPeriod.GetValueOrDefault(); } + get { return this._performanceInsightsRetentionPeriod; } set { this._performanceInsightsRetentionPeriod = value; } } diff --git a/sdk/src/Services/RDS/Generated/Model/RestoreDBClusterToPointInTimeRequest.cs b/sdk/src/Services/RDS/Generated/Model/RestoreDBClusterToPointInTimeRequest.cs index 51a01ef9c662..ee567ac32043 100644 --- a/sdk/src/Services/RDS/Generated/Model/RestoreDBClusterToPointInTimeRequest.cs +++ b/sdk/src/Services/RDS/Generated/Model/RestoreDBClusterToPointInTimeRequest.cs @@ -475,9 +475,9 @@ internal bool IsSetEnableIAMDatabaseAuthentication() /// Specifies whether to turn on Performance Insights for the DB cluster. /// /// - public bool EnablePerformanceInsights + public bool? EnablePerformanceInsights { - get { return this._enablePerformanceInsights.GetValueOrDefault(); } + get { return this._enablePerformanceInsights; } set { this._enablePerformanceInsights = value; } } @@ -676,9 +676,9 @@ internal bool IsSetKmsKeyId() /// Default: 0 /// /// - public int MonitoringInterval + public int? MonitoringInterval { - get { return this._monitoringInterval.GetValueOrDefault(); } + get { return this._monitoringInterval; } set { this._monitoringInterval = value; } } @@ -842,9 +842,9 @@ internal bool IsSetPerformanceInsightsKMSKeyId() /// issues an error. /// /// - public int PerformanceInsightsRetentionPeriod + public int? PerformanceInsightsRetentionPeriod { - get { return this._performanceInsightsRetentionPeriod.GetValueOrDefault(); } + get { return this._performanceInsightsRetentionPeriod; } set { this._performanceInsightsRetentionPeriod = value; } } diff --git a/sdk/src/Services/RDS/Generated/_bcl/AmazonRDSClient.cs b/sdk/src/Services/RDS/Generated/_bcl/AmazonRDSClient.cs index 6df829f70b3b..0078906172b3 100644 --- a/sdk/src/Services/RDS/Generated/_bcl/AmazonRDSClient.cs +++ b/sdk/src/Services/RDS/Generated/_bcl/AmazonRDSClient.cs @@ -3141,6 +3141,10 @@ public virtual CreateDBSecurityGroupResponse CreateDBSecurityGroup(CreateDBSecur /// The maximum number of DB shard groups for your Amazon Web Services account in the /// specified Amazon Web Services Region has been reached. /// + /// + /// The network type is invalid for the DB instance. Valid nework type values are IPV4 + /// and DUAL. + /// /// /// The specified DB engine version isn't supported for Aurora Limitless Database. /// @@ -3188,6 +3192,10 @@ public virtual CreateDBShardGroupResponse CreateDBShardGroup(CreateDBShardGroupR /// The maximum number of DB shard groups for your Amazon Web Services account in the /// specified Amazon Web Services Region has been reached. /// + /// + /// The network type is invalid for the DB instance. Valid nework type values are IPV4 + /// and DUAL. + /// /// /// The specified DB engine version isn't supported for Aurora Limitless Database. /// @@ -3527,8 +3535,8 @@ public virtual CreateEventSubscriptionResponse CreateEventSubscription(CreateEve /// DBClusterIdentifier doesn't refer to an existing DB cluster. /// /// - /// The GlobalClusterIdentifier already exists. Choose a new global database identifier - /// (unique name) to create a new global database cluster. + /// The GlobalClusterIdentifier already exists. Specify a new global database identifier + /// (unique name) to create a new global database cluster or to rename an existing one. /// /// /// The number of global database clusters for this account is already at the maximum @@ -3577,8 +3585,8 @@ public virtual CreateGlobalClusterResponse CreateGlobalCluster(CreateGlobalClust /// DBClusterIdentifier doesn't refer to an existing DB cluster. /// /// - /// The GlobalClusterIdentifier already exists. Choose a new global database identifier - /// (unique name) to create a new global database cluster. + /// The GlobalClusterIdentifier already exists. Specify a new global database identifier + /// (unique name) to create a new global database cluster or to rename an existing one. /// /// /// The number of global database clusters for this account is already at the maximum @@ -11176,6 +11184,10 @@ public virtual ModifyEventSubscriptionResponse ModifyEventSubscription(ModifyEve /// Container for the necessary parameters to execute the ModifyGlobalCluster service method. /// /// The response from the ModifyGlobalCluster service method, as returned by RDS. + /// + /// The GlobalClusterIdentifier already exists. Specify a new global database identifier + /// (unique name) to create a new global database cluster or to rename an existing one. + /// /// /// The GlobalClusterIdentifier doesn't refer to an existing global database cluster. /// @@ -11217,6 +11229,10 @@ public virtual ModifyGlobalClusterResponse ModifyGlobalCluster(ModifyGlobalClust /// /// /// The response from the ModifyGlobalCluster service method, as returned by RDS. + /// + /// The GlobalClusterIdentifier already exists. Specify a new global database identifier + /// (unique name) to create a new global database cluster or to rename an existing one. + /// /// /// The GlobalClusterIdentifier doesn't refer to an existing global database cluster. /// diff --git a/sdk/src/Services/RDS/Properties/AssemblyInfo.cs b/sdk/src/Services/RDS/Properties/AssemblyInfo.cs index fc708d2dc60f..8e10370281e7 100644 --- a/sdk/src/Services/RDS/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/RDS/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.403.4")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.406.12")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/RDS/RDS.sln b/sdk/src/Services/RDS/RDS.sln index da17df62d813..8ce481991f33 100644 --- a/sdk/src/Services/RDS/RDS.sln +++ b/sdk/src/Services/RDS/RDS.sln @@ -94,7 +94,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {510A9B69-8345-4D61-A03F-E78FD300F6E7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {510A9B69-8345-4D61-A03F-E78FD300F6E7}.Debug|Any CPU.Build.0 = Debug|Any CPU {510A9B69-8345-4D61-A03F-E78FD300F6E7}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -119,113 +126,6 @@ Global {72ECC2CB-0646-4CBF-9397-4CF889417550}.Debug|Any CPU.Build.0 = Debug|Any CPU {72ECC2CB-0646-4CBF-9397-4CF889417550}.Release|Any CPU.ActiveCfg = Release|Any CPU {72ECC2CB-0646-4CBF-9397-4CF889417550}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {2D171F77-61E4-4AA3-92A7-8BB91A6F1C01}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2D171F77-61E4-4AA3-92A7-8BB91A6F1C01}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2D171F77-61E4-4AA3-92A7-8BB91A6F1C01}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2D171F77-61E4-4AA3-92A7-8BB91A6F1C01}.Release|Any CPU.Build.0 = Release|Any CPU - {404E56B0-7874-484D-9F78-709D29513975}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {404E56B0-7874-484D-9F78-709D29513975}.Debug|Any CPU.Build.0 = Debug|Any CPU - {404E56B0-7874-484D-9F78-709D29513975}.Release|Any CPU.ActiveCfg = Release|Any CPU - {404E56B0-7874-484D-9F78-709D29513975}.Release|Any CPU.Build.0 = Release|Any CPU - {672651E8-7387-4D5C-81AD-50702BC17FBA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {672651E8-7387-4D5C-81AD-50702BC17FBA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {672651E8-7387-4D5C-81AD-50702BC17FBA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {672651E8-7387-4D5C-81AD-50702BC17FBA}.Release|Any CPU.Build.0 = Release|Any CPU - {5A674575-C844-43E6-80B5-E25B50267068}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5A674575-C844-43E6-80B5-E25B50267068}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5A674575-C844-43E6-80B5-E25B50267068}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5A674575-C844-43E6-80B5-E25B50267068}.Release|Any CPU.Build.0 = Release|Any CPU - {29A6BD5A-3CDD-4390-8BFA-E7CE249FCFD2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {29A6BD5A-3CDD-4390-8BFA-E7CE249FCFD2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {29A6BD5A-3CDD-4390-8BFA-E7CE249FCFD2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {29A6BD5A-3CDD-4390-8BFA-E7CE249FCFD2}.Release|Any CPU.Build.0 = Release|Any CPU - {A0E9AE6F-CB87-4EA2-9251-8BF9640C3089}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A0E9AE6F-CB87-4EA2-9251-8BF9640C3089}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A0E9AE6F-CB87-4EA2-9251-8BF9640C3089}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A0E9AE6F-CB87-4EA2-9251-8BF9640C3089}.Release|Any CPU.Build.0 = Release|Any CPU - {71A6AE82-72A3-4469-A04A-CC1AD5420003}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {71A6AE82-72A3-4469-A04A-CC1AD5420003}.Debug|Any CPU.Build.0 = Debug|Any CPU - {71A6AE82-72A3-4469-A04A-CC1AD5420003}.Release|Any CPU.ActiveCfg = Release|Any CPU - {71A6AE82-72A3-4469-A04A-CC1AD5420003}.Release|Any CPU.Build.0 = Release|Any CPU - {F1C4402D-C440-4444-977C-BA9AC4765BB7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F1C4402D-C440-4444-977C-BA9AC4765BB7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F1C4402D-C440-4444-977C-BA9AC4765BB7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F1C4402D-C440-4444-977C-BA9AC4765BB7}.Release|Any CPU.Build.0 = Release|Any CPU - {B300DE5E-F041-45DD-AF65-BB08F84D729B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B300DE5E-F041-45DD-AF65-BB08F84D729B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B300DE5E-F041-45DD-AF65-BB08F84D729B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B300DE5E-F041-45DD-AF65-BB08F84D729B}.Release|Any CPU.Build.0 = Release|Any CPU - {8499403E-90F5-4B1F-84EA-660E79FC11EC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8499403E-90F5-4B1F-84EA-660E79FC11EC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8499403E-90F5-4B1F-84EA-660E79FC11EC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8499403E-90F5-4B1F-84EA-660E79FC11EC}.Release|Any CPU.Build.0 = Release|Any CPU - {0FF9934D-75DF-42C7-AC5A-AE59CA2735FD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0FF9934D-75DF-42C7-AC5A-AE59CA2735FD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0FF9934D-75DF-42C7-AC5A-AE59CA2735FD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0FF9934D-75DF-42C7-AC5A-AE59CA2735FD}.Release|Any CPU.Build.0 = Release|Any CPU - {C9910138-C9F5-4020-B006-A25B2C805F99}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C9910138-C9F5-4020-B006-A25B2C805F99}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C9910138-C9F5-4020-B006-A25B2C805F99}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C9910138-C9F5-4020-B006-A25B2C805F99}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {2D171F77-61E4-4AA3-92A7-8BB91A6F1C01}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2D171F77-61E4-4AA3-92A7-8BB91A6F1C01}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2D171F77-61E4-4AA3-92A7-8BB91A6F1C01}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2D171F77-61E4-4AA3-92A7-8BB91A6F1C01}.Release|Any CPU.Build.0 = Release|Any CPU - {404E56B0-7874-484D-9F78-709D29513975}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {404E56B0-7874-484D-9F78-709D29513975}.Debug|Any CPU.Build.0 = Debug|Any CPU - {404E56B0-7874-484D-9F78-709D29513975}.Release|Any CPU.ActiveCfg = Release|Any CPU - {404E56B0-7874-484D-9F78-709D29513975}.Release|Any CPU.Build.0 = Release|Any CPU - {672651E8-7387-4D5C-81AD-50702BC17FBA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {672651E8-7387-4D5C-81AD-50702BC17FBA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {672651E8-7387-4D5C-81AD-50702BC17FBA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {672651E8-7387-4D5C-81AD-50702BC17FBA}.Release|Any CPU.Build.0 = Release|Any CPU - {5A674575-C844-43E6-80B5-E25B50267068}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5A674575-C844-43E6-80B5-E25B50267068}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5A674575-C844-43E6-80B5-E25B50267068}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5A674575-C844-43E6-80B5-E25B50267068}.Release|Any CPU.Build.0 = Release|Any CPU - {29A6BD5A-3CDD-4390-8BFA-E7CE249FCFD2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {29A6BD5A-3CDD-4390-8BFA-E7CE249FCFD2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {29A6BD5A-3CDD-4390-8BFA-E7CE249FCFD2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {29A6BD5A-3CDD-4390-8BFA-E7CE249FCFD2}.Release|Any CPU.Build.0 = Release|Any CPU - {A0E9AE6F-CB87-4EA2-9251-8BF9640C3089}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A0E9AE6F-CB87-4EA2-9251-8BF9640C3089}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A0E9AE6F-CB87-4EA2-9251-8BF9640C3089}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A0E9AE6F-CB87-4EA2-9251-8BF9640C3089}.Release|Any CPU.Build.0 = Release|Any CPU - {71A6AE82-72A3-4469-A04A-CC1AD5420003}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {71A6AE82-72A3-4469-A04A-CC1AD5420003}.Debug|Any CPU.Build.0 = Debug|Any CPU - {71A6AE82-72A3-4469-A04A-CC1AD5420003}.Release|Any CPU.ActiveCfg = Release|Any CPU - {71A6AE82-72A3-4469-A04A-CC1AD5420003}.Release|Any CPU.Build.0 = Release|Any CPU - {F1C4402D-C440-4444-977C-BA9AC4765BB7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F1C4402D-C440-4444-977C-BA9AC4765BB7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F1C4402D-C440-4444-977C-BA9AC4765BB7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F1C4402D-C440-4444-977C-BA9AC4765BB7}.Release|Any CPU.Build.0 = Release|Any CPU - {B300DE5E-F041-45DD-AF65-BB08F84D729B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B300DE5E-F041-45DD-AF65-BB08F84D729B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B300DE5E-F041-45DD-AF65-BB08F84D729B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B300DE5E-F041-45DD-AF65-BB08F84D729B}.Release|Any CPU.Build.0 = Release|Any CPU - {8499403E-90F5-4B1F-84EA-660E79FC11EC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8499403E-90F5-4B1F-84EA-660E79FC11EC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8499403E-90F5-4B1F-84EA-660E79FC11EC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8499403E-90F5-4B1F-84EA-660E79FC11EC}.Release|Any CPU.Build.0 = Release|Any CPU - {0FF9934D-75DF-42C7-AC5A-AE59CA2735FD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0FF9934D-75DF-42C7-AC5A-AE59CA2735FD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0FF9934D-75DF-42C7-AC5A-AE59CA2735FD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0FF9934D-75DF-42C7-AC5A-AE59CA2735FD}.Release|Any CPU.Build.0 = Release|Any CPU - {C9910138-C9F5-4020-B006-A25B2C805F99}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C9910138-C9F5-4020-B006-A25B2C805F99}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C9910138-C9F5-4020-B006-A25B2C805F99}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C9910138-C9F5-4020-B006-A25B2C805F99}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -242,42 +142,14 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {510A9B69-8345-4D61-A03F-E78FD300F6E7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {79DE6086-ACA7-4C5A-9A97-802DC7C53E4C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {6A62336E-5ADE-4E62-A74B-F2A2418105FC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {F071DF3D-9E54-4107-A9ED-5D032958FAF2} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {CCBD4427-82EE-4B05-9EC4-A03203BC4524} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {72ECC2CB-0646-4CBF-9397-4CF889417550} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {2D171F77-61E4-4AA3-92A7-8BB91A6F1C01} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {404E56B0-7874-484D-9F78-709D29513975} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {672651E8-7387-4D5C-81AD-50702BC17FBA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {5A674575-C844-43E6-80B5-E25B50267068} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {29A6BD5A-3CDD-4390-8BFA-E7CE249FCFD2} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A0E9AE6F-CB87-4EA2-9251-8BF9640C3089} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {71A6AE82-72A3-4469-A04A-CC1AD5420003} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F1C4402D-C440-4444-977C-BA9AC4765BB7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B300DE5E-F041-45DD-AF65-BB08F84D729B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8499403E-90F5-4B1F-84EA-660E79FC11EC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0FF9934D-75DF-42C7-AC5A-AE59CA2735FD} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C9910138-C9F5-4020-B006-A25B2C805F99} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {2D171F77-61E4-4AA3-92A7-8BB91A6F1C01} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {404E56B0-7874-484D-9F78-709D29513975} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {672651E8-7387-4D5C-81AD-50702BC17FBA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {5A674575-C844-43E6-80B5-E25B50267068} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {29A6BD5A-3CDD-4390-8BFA-E7CE249FCFD2} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A0E9AE6F-CB87-4EA2-9251-8BF9640C3089} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {71A6AE82-72A3-4469-A04A-CC1AD5420003} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F1C4402D-C440-4444-977C-BA9AC4765BB7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B300DE5E-F041-45DD-AF65-BB08F84D729B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8499403E-90F5-4B1F-84EA-660E79FC11EC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0FF9934D-75DF-42C7-AC5A-AE59CA2735FD} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C9910138-C9F5-4020-B006-A25B2C805F99} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {D4D4D302-4EA0-45EA-8126-6F4104AF0C94} diff --git a/sdk/src/Services/RDSDataService/Generated/AmazonRDSDataServiceConfig.cs b/sdk/src/Services/RDSDataService/Generated/AmazonRDSDataServiceConfig.cs index 74c911a3d0a2..d8f573634b9b 100644 --- a/sdk/src/Services/RDSDataService/Generated/AmazonRDSDataServiceConfig.cs +++ b/sdk/src/Services/RDSDataService/Generated/AmazonRDSDataServiceConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.RDSDataService public partial class AmazonRDSDataServiceConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("RDS Data", "4.0.0.0"); private static readonly AmazonRDSDataServiceEndpointResolver EndpointResolver = new AmazonRDSDataServiceEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("RDS Data", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("RDS Data", "3.7.400.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/RDSDataService/Properties/AssemblyInfo.cs b/sdk/src/Services/RDSDataService/Properties/AssemblyInfo.cs index 6863bfb0aacd..4ffe4319b9dd 100644 --- a/sdk/src/Services/RDSDataService/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/RDSDataService/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/RDSDataService/RDSDataService.sln b/sdk/src/Services/RDSDataService/RDSDataService.sln index 93b221d48f57..355dddc6b5a5 100644 --- a/sdk/src/Services/RDSDataService/RDSDataService.sln +++ b/sdk/src/Services/RDSDataService/RDSDataService.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {41003FAC-ED3A-43B4-9246-528119A8AB3C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {41003FAC-ED3A-43B4-9246-528119A8AB3C}.Debug|Any CPU.Build.0 = Debug|Any CPU {41003FAC-ED3A-43B4-9246-528119A8AB3C}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {DB67A222-41D8-4A0B-8266-B917FBEDCB1A}.Debug|Any CPU.Build.0 = Debug|Any CPU {DB67A222-41D8-4A0B-8266-B917FBEDCB1A}.Release|Any CPU.ActiveCfg = Release|Any CPU {DB67A222-41D8-4A0B-8266-B917FBEDCB1A}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {25AB0371-5CDC-4628-A17D-FA94615334A3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {25AB0371-5CDC-4628-A17D-FA94615334A3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {25AB0371-5CDC-4628-A17D-FA94615334A3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {25AB0371-5CDC-4628-A17D-FA94615334A3}.Release|Any CPU.Build.0 = Release|Any CPU - {13629D66-25B9-47F6-A3F3-BF9045BF9C62}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {13629D66-25B9-47F6-A3F3-BF9045BF9C62}.Debug|Any CPU.Build.0 = Debug|Any CPU - {13629D66-25B9-47F6-A3F3-BF9045BF9C62}.Release|Any CPU.ActiveCfg = Release|Any CPU - {13629D66-25B9-47F6-A3F3-BF9045BF9C62}.Release|Any CPU.Build.0 = Release|Any CPU - {219BB318-D044-4688-820C-B39069DA4793}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {219BB318-D044-4688-820C-B39069DA4793}.Debug|Any CPU.Build.0 = Debug|Any CPU - {219BB318-D044-4688-820C-B39069DA4793}.Release|Any CPU.ActiveCfg = Release|Any CPU - {219BB318-D044-4688-820C-B39069DA4793}.Release|Any CPU.Build.0 = Release|Any CPU - {80176214-379C-4520-8D9F-6C64770BF754}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {80176214-379C-4520-8D9F-6C64770BF754}.Debug|Any CPU.Build.0 = Debug|Any CPU - {80176214-379C-4520-8D9F-6C64770BF754}.Release|Any CPU.ActiveCfg = Release|Any CPU - {80176214-379C-4520-8D9F-6C64770BF754}.Release|Any CPU.Build.0 = Release|Any CPU - {D0586D69-A9F7-4BD7-A881-4FAA9CC29F10}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D0586D69-A9F7-4BD7-A881-4FAA9CC29F10}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D0586D69-A9F7-4BD7-A881-4FAA9CC29F10}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D0586D69-A9F7-4BD7-A881-4FAA9CC29F10}.Release|Any CPU.Build.0 = Release|Any CPU - {FF2DF6EB-3C07-44BB-94BC-B52774724C6A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FF2DF6EB-3C07-44BB-94BC-B52774724C6A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FF2DF6EB-3C07-44BB-94BC-B52774724C6A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FF2DF6EB-3C07-44BB-94BC-B52774724C6A}.Release|Any CPU.Build.0 = Release|Any CPU - {46A62419-8C67-42B7-B399-6FDB5E0AA7C9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {46A62419-8C67-42B7-B399-6FDB5E0AA7C9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {46A62419-8C67-42B7-B399-6FDB5E0AA7C9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {46A62419-8C67-42B7-B399-6FDB5E0AA7C9}.Release|Any CPU.Build.0 = Release|Any CPU - {AE010261-FED6-4D91-BD28-7D1D243953AB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AE010261-FED6-4D91-BD28-7D1D243953AB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AE010261-FED6-4D91-BD28-7D1D243953AB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AE010261-FED6-4D91-BD28-7D1D243953AB}.Release|Any CPU.Build.0 = Release|Any CPU - {4C088A05-5137-4F11-A339-160B57C98123}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4C088A05-5137-4F11-A339-160B57C98123}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4C088A05-5137-4F11-A339-160B57C98123}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4C088A05-5137-4F11-A339-160B57C98123}.Release|Any CPU.Build.0 = Release|Any CPU - {8D9F199C-5068-43B9-87E2-3629D9F75439}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8D9F199C-5068-43B9-87E2-3629D9F75439}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8D9F199C-5068-43B9-87E2-3629D9F75439}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8D9F199C-5068-43B9-87E2-3629D9F75439}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {25AB0371-5CDC-4628-A17D-FA94615334A3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {25AB0371-5CDC-4628-A17D-FA94615334A3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {25AB0371-5CDC-4628-A17D-FA94615334A3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {25AB0371-5CDC-4628-A17D-FA94615334A3}.Release|Any CPU.Build.0 = Release|Any CPU - {13629D66-25B9-47F6-A3F3-BF9045BF9C62}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {13629D66-25B9-47F6-A3F3-BF9045BF9C62}.Debug|Any CPU.Build.0 = Debug|Any CPU - {13629D66-25B9-47F6-A3F3-BF9045BF9C62}.Release|Any CPU.ActiveCfg = Release|Any CPU - {13629D66-25B9-47F6-A3F3-BF9045BF9C62}.Release|Any CPU.Build.0 = Release|Any CPU - {219BB318-D044-4688-820C-B39069DA4793}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {219BB318-D044-4688-820C-B39069DA4793}.Debug|Any CPU.Build.0 = Debug|Any CPU - {219BB318-D044-4688-820C-B39069DA4793}.Release|Any CPU.ActiveCfg = Release|Any CPU - {219BB318-D044-4688-820C-B39069DA4793}.Release|Any CPU.Build.0 = Release|Any CPU - {80176214-379C-4520-8D9F-6C64770BF754}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {80176214-379C-4520-8D9F-6C64770BF754}.Debug|Any CPU.Build.0 = Debug|Any CPU - {80176214-379C-4520-8D9F-6C64770BF754}.Release|Any CPU.ActiveCfg = Release|Any CPU - {80176214-379C-4520-8D9F-6C64770BF754}.Release|Any CPU.Build.0 = Release|Any CPU - {D0586D69-A9F7-4BD7-A881-4FAA9CC29F10}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D0586D69-A9F7-4BD7-A881-4FAA9CC29F10}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D0586D69-A9F7-4BD7-A881-4FAA9CC29F10}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D0586D69-A9F7-4BD7-A881-4FAA9CC29F10}.Release|Any CPU.Build.0 = Release|Any CPU - {FF2DF6EB-3C07-44BB-94BC-B52774724C6A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FF2DF6EB-3C07-44BB-94BC-B52774724C6A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FF2DF6EB-3C07-44BB-94BC-B52774724C6A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FF2DF6EB-3C07-44BB-94BC-B52774724C6A}.Release|Any CPU.Build.0 = Release|Any CPU - {46A62419-8C67-42B7-B399-6FDB5E0AA7C9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {46A62419-8C67-42B7-B399-6FDB5E0AA7C9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {46A62419-8C67-42B7-B399-6FDB5E0AA7C9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {46A62419-8C67-42B7-B399-6FDB5E0AA7C9}.Release|Any CPU.Build.0 = Release|Any CPU - {AE010261-FED6-4D91-BD28-7D1D243953AB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AE010261-FED6-4D91-BD28-7D1D243953AB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AE010261-FED6-4D91-BD28-7D1D243953AB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AE010261-FED6-4D91-BD28-7D1D243953AB}.Release|Any CPU.Build.0 = Release|Any CPU - {4C088A05-5137-4F11-A339-160B57C98123}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4C088A05-5137-4F11-A339-160B57C98123}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4C088A05-5137-4F11-A339-160B57C98123}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4C088A05-5137-4F11-A339-160B57C98123}.Release|Any CPU.Build.0 = Release|Any CPU - {8D9F199C-5068-43B9-87E2-3629D9F75439}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8D9F199C-5068-43B9-87E2-3629D9F75439}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8D9F199C-5068-43B9-87E2-3629D9F75439}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8D9F199C-5068-43B9-87E2-3629D9F75439}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {41003FAC-ED3A-43B4-9246-528119A8AB3C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {D03CA677-3A14-4808-96A1-DA20CAA6E0BC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {53A0D984-0C09-4413-93D0-046B8D385E09} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {420B5213-CC8A-4071-95FF-9B503F458AAF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {DB67A222-41D8-4A0B-8266-B917FBEDCB1A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {25AB0371-5CDC-4628-A17D-FA94615334A3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {13629D66-25B9-47F6-A3F3-BF9045BF9C62} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {219BB318-D044-4688-820C-B39069DA4793} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {80176214-379C-4520-8D9F-6C64770BF754} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D0586D69-A9F7-4BD7-A881-4FAA9CC29F10} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {FF2DF6EB-3C07-44BB-94BC-B52774724C6A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {46A62419-8C67-42B7-B399-6FDB5E0AA7C9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {AE010261-FED6-4D91-BD28-7D1D243953AB} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4C088A05-5137-4F11-A339-160B57C98123} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8D9F199C-5068-43B9-87E2-3629D9F75439} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {25AB0371-5CDC-4628-A17D-FA94615334A3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {13629D66-25B9-47F6-A3F3-BF9045BF9C62} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {219BB318-D044-4688-820C-B39069DA4793} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {80176214-379C-4520-8D9F-6C64770BF754} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D0586D69-A9F7-4BD7-A881-4FAA9CC29F10} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {FF2DF6EB-3C07-44BB-94BC-B52774724C6A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {46A62419-8C67-42B7-B399-6FDB5E0AA7C9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {AE010261-FED6-4D91-BD28-7D1D243953AB} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4C088A05-5137-4F11-A339-160B57C98123} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8D9F199C-5068-43B9-87E2-3629D9F75439} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {AD473EDA-4DFA-4D52-96E2-4D221114F999} diff --git a/sdk/src/Services/RecycleBin/Generated/AmazonRecycleBinConfig.cs b/sdk/src/Services/RecycleBin/Generated/AmazonRecycleBinConfig.cs index 68a1ee6fb931..c3d2a40fae6a 100644 --- a/sdk/src/Services/RecycleBin/Generated/AmazonRecycleBinConfig.cs +++ b/sdk/src/Services/RecycleBin/Generated/AmazonRecycleBinConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.RecycleBin public partial class AmazonRecycleBinConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("rbin", "4.0.0.0"); private static readonly AmazonRecycleBinEndpointResolver EndpointResolver = new AmazonRecycleBinEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("rbin", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("rbin", "3.7.400.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/RecycleBin/Properties/AssemblyInfo.cs b/sdk/src/Services/RecycleBin/Properties/AssemblyInfo.cs index 8f675c494203..59f786a246fd 100644 --- a/sdk/src/Services/RecycleBin/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/RecycleBin/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/RecycleBin/RecycleBin.sln b/sdk/src/Services/RecycleBin/RecycleBin.sln index ae6f6ca5e98c..03998fa4edfd 100644 --- a/sdk/src/Services/RecycleBin/RecycleBin.sln +++ b/sdk/src/Services/RecycleBin/RecycleBin.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {01D616CF-91B1-4C8F-B6D9-4B92C1BC4008}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {01D616CF-91B1-4C8F-B6D9-4B92C1BC4008}.Debug|Any CPU.Build.0 = Debug|Any CPU {01D616CF-91B1-4C8F-B6D9-4B92C1BC4008}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {7D2BAA40-F65A-4983-9173-71D5A64EAF48}.Debug|Any CPU.Build.0 = Debug|Any CPU {7D2BAA40-F65A-4983-9173-71D5A64EAF48}.Release|Any CPU.ActiveCfg = Release|Any CPU {7D2BAA40-F65A-4983-9173-71D5A64EAF48}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {CC9EF02C-A807-475A-AA43-7CD0B235213A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CC9EF02C-A807-475A-AA43-7CD0B235213A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CC9EF02C-A807-475A-AA43-7CD0B235213A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CC9EF02C-A807-475A-AA43-7CD0B235213A}.Release|Any CPU.Build.0 = Release|Any CPU - {075A7DFB-9125-4B8E-A144-95BAF512FA2D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {075A7DFB-9125-4B8E-A144-95BAF512FA2D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {075A7DFB-9125-4B8E-A144-95BAF512FA2D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {075A7DFB-9125-4B8E-A144-95BAF512FA2D}.Release|Any CPU.Build.0 = Release|Any CPU - {9F26837C-178D-4C2F-8F39-ABA1384E2A4F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9F26837C-178D-4C2F-8F39-ABA1384E2A4F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9F26837C-178D-4C2F-8F39-ABA1384E2A4F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9F26837C-178D-4C2F-8F39-ABA1384E2A4F}.Release|Any CPU.Build.0 = Release|Any CPU - {D9E6D3F6-277B-4E94-9CE1-4B805CC60C1B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D9E6D3F6-277B-4E94-9CE1-4B805CC60C1B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D9E6D3F6-277B-4E94-9CE1-4B805CC60C1B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D9E6D3F6-277B-4E94-9CE1-4B805CC60C1B}.Release|Any CPU.Build.0 = Release|Any CPU - {3611333A-3F87-485C-A3C9-C2C669E5AFEE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3611333A-3F87-485C-A3C9-C2C669E5AFEE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3611333A-3F87-485C-A3C9-C2C669E5AFEE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3611333A-3F87-485C-A3C9-C2C669E5AFEE}.Release|Any CPU.Build.0 = Release|Any CPU - {531144DE-25F2-4A61-8F89-88603448F3AD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {531144DE-25F2-4A61-8F89-88603448F3AD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {531144DE-25F2-4A61-8F89-88603448F3AD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {531144DE-25F2-4A61-8F89-88603448F3AD}.Release|Any CPU.Build.0 = Release|Any CPU - {312BFA14-16EB-415E-8C47-B23B57D98931}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {312BFA14-16EB-415E-8C47-B23B57D98931}.Debug|Any CPU.Build.0 = Debug|Any CPU - {312BFA14-16EB-415E-8C47-B23B57D98931}.Release|Any CPU.ActiveCfg = Release|Any CPU - {312BFA14-16EB-415E-8C47-B23B57D98931}.Release|Any CPU.Build.0 = Release|Any CPU - {66CF9236-899A-4D59-95A8-8DC504F483C0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {66CF9236-899A-4D59-95A8-8DC504F483C0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {66CF9236-899A-4D59-95A8-8DC504F483C0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {66CF9236-899A-4D59-95A8-8DC504F483C0}.Release|Any CPU.Build.0 = Release|Any CPU - {20D8CF9D-75DA-46E1-A7E2-4E6C0E286125}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {20D8CF9D-75DA-46E1-A7E2-4E6C0E286125}.Debug|Any CPU.Build.0 = Debug|Any CPU - {20D8CF9D-75DA-46E1-A7E2-4E6C0E286125}.Release|Any CPU.ActiveCfg = Release|Any CPU - {20D8CF9D-75DA-46E1-A7E2-4E6C0E286125}.Release|Any CPU.Build.0 = Release|Any CPU - {8D785092-0702-430B-B33C-7935B3960D27}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8D785092-0702-430B-B33C-7935B3960D27}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8D785092-0702-430B-B33C-7935B3960D27}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8D785092-0702-430B-B33C-7935B3960D27}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {CC9EF02C-A807-475A-AA43-7CD0B235213A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CC9EF02C-A807-475A-AA43-7CD0B235213A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CC9EF02C-A807-475A-AA43-7CD0B235213A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CC9EF02C-A807-475A-AA43-7CD0B235213A}.Release|Any CPU.Build.0 = Release|Any CPU - {075A7DFB-9125-4B8E-A144-95BAF512FA2D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {075A7DFB-9125-4B8E-A144-95BAF512FA2D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {075A7DFB-9125-4B8E-A144-95BAF512FA2D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {075A7DFB-9125-4B8E-A144-95BAF512FA2D}.Release|Any CPU.Build.0 = Release|Any CPU - {9F26837C-178D-4C2F-8F39-ABA1384E2A4F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9F26837C-178D-4C2F-8F39-ABA1384E2A4F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9F26837C-178D-4C2F-8F39-ABA1384E2A4F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9F26837C-178D-4C2F-8F39-ABA1384E2A4F}.Release|Any CPU.Build.0 = Release|Any CPU - {D9E6D3F6-277B-4E94-9CE1-4B805CC60C1B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D9E6D3F6-277B-4E94-9CE1-4B805CC60C1B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D9E6D3F6-277B-4E94-9CE1-4B805CC60C1B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D9E6D3F6-277B-4E94-9CE1-4B805CC60C1B}.Release|Any CPU.Build.0 = Release|Any CPU - {3611333A-3F87-485C-A3C9-C2C669E5AFEE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3611333A-3F87-485C-A3C9-C2C669E5AFEE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3611333A-3F87-485C-A3C9-C2C669E5AFEE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3611333A-3F87-485C-A3C9-C2C669E5AFEE}.Release|Any CPU.Build.0 = Release|Any CPU - {531144DE-25F2-4A61-8F89-88603448F3AD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {531144DE-25F2-4A61-8F89-88603448F3AD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {531144DE-25F2-4A61-8F89-88603448F3AD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {531144DE-25F2-4A61-8F89-88603448F3AD}.Release|Any CPU.Build.0 = Release|Any CPU - {312BFA14-16EB-415E-8C47-B23B57D98931}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {312BFA14-16EB-415E-8C47-B23B57D98931}.Debug|Any CPU.Build.0 = Debug|Any CPU - {312BFA14-16EB-415E-8C47-B23B57D98931}.Release|Any CPU.ActiveCfg = Release|Any CPU - {312BFA14-16EB-415E-8C47-B23B57D98931}.Release|Any CPU.Build.0 = Release|Any CPU - {66CF9236-899A-4D59-95A8-8DC504F483C0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {66CF9236-899A-4D59-95A8-8DC504F483C0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {66CF9236-899A-4D59-95A8-8DC504F483C0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {66CF9236-899A-4D59-95A8-8DC504F483C0}.Release|Any CPU.Build.0 = Release|Any CPU - {20D8CF9D-75DA-46E1-A7E2-4E6C0E286125}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {20D8CF9D-75DA-46E1-A7E2-4E6C0E286125}.Debug|Any CPU.Build.0 = Debug|Any CPU - {20D8CF9D-75DA-46E1-A7E2-4E6C0E286125}.Release|Any CPU.ActiveCfg = Release|Any CPU - {20D8CF9D-75DA-46E1-A7E2-4E6C0E286125}.Release|Any CPU.Build.0 = Release|Any CPU - {8D785092-0702-430B-B33C-7935B3960D27}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8D785092-0702-430B-B33C-7935B3960D27}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8D785092-0702-430B-B33C-7935B3960D27}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8D785092-0702-430B-B33C-7935B3960D27}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {01D616CF-91B1-4C8F-B6D9-4B92C1BC4008} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {66411E92-B35A-4CBA-95F8-152CF5F58C78} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {BFDEE5D0-DBF9-4A0B-844B-BE69CE6E836D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {5459ED53-0539-478E-8D78-45EEC97D1213} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {7D2BAA40-F65A-4983-9173-71D5A64EAF48} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {CC9EF02C-A807-475A-AA43-7CD0B235213A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {075A7DFB-9125-4B8E-A144-95BAF512FA2D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {9F26837C-178D-4C2F-8F39-ABA1384E2A4F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D9E6D3F6-277B-4E94-9CE1-4B805CC60C1B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {3611333A-3F87-485C-A3C9-C2C669E5AFEE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {531144DE-25F2-4A61-8F89-88603448F3AD} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {312BFA14-16EB-415E-8C47-B23B57D98931} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {66CF9236-899A-4D59-95A8-8DC504F483C0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {20D8CF9D-75DA-46E1-A7E2-4E6C0E286125} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8D785092-0702-430B-B33C-7935B3960D27} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {CC9EF02C-A807-475A-AA43-7CD0B235213A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {075A7DFB-9125-4B8E-A144-95BAF512FA2D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {9F26837C-178D-4C2F-8F39-ABA1384E2A4F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D9E6D3F6-277B-4E94-9CE1-4B805CC60C1B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {3611333A-3F87-485C-A3C9-C2C669E5AFEE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {531144DE-25F2-4A61-8F89-88603448F3AD} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {312BFA14-16EB-415E-8C47-B23B57D98931} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {66CF9236-899A-4D59-95A8-8DC504F483C0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {20D8CF9D-75DA-46E1-A7E2-4E6C0E286125} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8D785092-0702-430B-B33C-7935B3960D27} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {C2409030-22E5-4578-A8C3-3C57CD14913C} diff --git a/sdk/src/Services/Redshift/Generated/AmazonRedshiftConfig.cs b/sdk/src/Services/Redshift/Generated/AmazonRedshiftConfig.cs index 63eff48c8b09..30c83168bce2 100644 --- a/sdk/src/Services/Redshift/Generated/AmazonRedshiftConfig.cs +++ b/sdk/src/Services/Redshift/Generated/AmazonRedshiftConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.Redshift public partial class AmazonRedshiftConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("Redshift", "4.0.0.0"); private static readonly AmazonRedshiftEndpointResolver EndpointResolver = new AmazonRedshiftEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("Redshift", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("Redshift", "3.7.404.2"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/Redshift/Generated/Model/CreateIntegrationResponse.cs b/sdk/src/Services/Redshift/Generated/Model/CreateIntegrationResponse.cs index 507c440cfe25..8de3926b0d0a 100644 --- a/sdk/src/Services/Redshift/Generated/Model/CreateIntegrationResponse.cs +++ b/sdk/src/Services/Redshift/Generated/Model/CreateIntegrationResponse.cs @@ -71,9 +71,9 @@ internal bool IsSetAdditionalEncryptionContext() /// The time (UTC) when the integration was created. /// /// - public DateTime CreateTime + public DateTime? CreateTime { - get { return this._createTime.GetValueOrDefault(); } + get { return this._createTime; } set { this._createTime = value; } } diff --git a/sdk/src/Services/Redshift/Generated/Model/DeleteIntegrationResponse.cs b/sdk/src/Services/Redshift/Generated/Model/DeleteIntegrationResponse.cs index 91209441084f..137aa69f5c18 100644 --- a/sdk/src/Services/Redshift/Generated/Model/DeleteIntegrationResponse.cs +++ b/sdk/src/Services/Redshift/Generated/Model/DeleteIntegrationResponse.cs @@ -71,9 +71,9 @@ internal bool IsSetAdditionalEncryptionContext() /// The time (UTC) when the integration was created. /// /// - public DateTime CreateTime + public DateTime? CreateTime { - get { return this._createTime.GetValueOrDefault(); } + get { return this._createTime; } set { this._createTime = value; } } diff --git a/sdk/src/Services/Redshift/Generated/Model/DescribeIntegrationsRequest.cs b/sdk/src/Services/Redshift/Generated/Model/DescribeIntegrationsRequest.cs index b4d48b8142f3..b2132e1e0347 100644 --- a/sdk/src/Services/Redshift/Generated/Model/DescribeIntegrationsRequest.cs +++ b/sdk/src/Services/Redshift/Generated/Model/DescribeIntegrationsRequest.cs @@ -115,9 +115,9 @@ internal bool IsSetMarker() /// Constraints: minimum 20, maximum 100. /// /// - public int MaxRecords + public int? MaxRecords { - get { return this._maxRecords.GetValueOrDefault(); } + get { return this._maxRecords; } set { this._maxRecords = value; } } diff --git a/sdk/src/Services/Redshift/Generated/Model/Integration.cs b/sdk/src/Services/Redshift/Generated/Model/Integration.cs index a422ef7df875..e66b5761d142 100644 --- a/sdk/src/Services/Redshift/Generated/Model/Integration.cs +++ b/sdk/src/Services/Redshift/Generated/Model/Integration.cs @@ -71,9 +71,9 @@ internal bool IsSetAdditionalEncryptionContext() /// The time (UTC) when the integration was created. /// /// - public DateTime CreateTime + public DateTime? CreateTime { - get { return this._createTime.GetValueOrDefault(); } + get { return this._createTime; } set { this._createTime = value; } } diff --git a/sdk/src/Services/Redshift/Generated/Model/IntegrationAlreadyExistsException.cs b/sdk/src/Services/Redshift/Generated/Model/IntegrationAlreadyExistsException.cs index 7da2554ce13b..53d598eaa2b6 100644 --- a/sdk/src/Services/Redshift/Generated/Model/IntegrationAlreadyExistsException.cs +++ b/sdk/src/Services/Redshift/Generated/Model/IntegrationAlreadyExistsException.cs @@ -106,11 +106,6 @@ protected IntegrationAlreadyExistsException(System.Runtime.Serialization.Seriali /// The that holds the serialized object data about the exception being thrown. /// The that contains contextual information about the source or destination. /// The parameter is a null reference (Nothing in Visual Basic). -#if BCL35 - [System.Security.Permissions.SecurityPermission( - System.Security.Permissions.SecurityAction.LinkDemand, - Flags = System.Security.Permissions.SecurityPermissionFlag.SerializationFormatter)] -#endif [System.Security.SecurityCritical] // These FxCop rules are giving false-positives for this method [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Security", "CA2123:OverrideLinkDemandsShouldBeIdenticalToBase")] diff --git a/sdk/src/Services/Redshift/Generated/Model/IntegrationConflictOperationException.cs b/sdk/src/Services/Redshift/Generated/Model/IntegrationConflictOperationException.cs index 991ba04d4eaa..16f1d3426cef 100644 --- a/sdk/src/Services/Redshift/Generated/Model/IntegrationConflictOperationException.cs +++ b/sdk/src/Services/Redshift/Generated/Model/IntegrationConflictOperationException.cs @@ -108,11 +108,6 @@ protected IntegrationConflictOperationException(System.Runtime.Serialization.Ser /// The that holds the serialized object data about the exception being thrown. /// The that contains contextual information about the source or destination. /// The parameter is a null reference (Nothing in Visual Basic). -#if BCL35 - [System.Security.Permissions.SecurityPermission( - System.Security.Permissions.SecurityAction.LinkDemand, - Flags = System.Security.Permissions.SecurityPermissionFlag.SerializationFormatter)] -#endif [System.Security.SecurityCritical] // These FxCop rules are giving false-positives for this method [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Security", "CA2123:OverrideLinkDemandsShouldBeIdenticalToBase")] diff --git a/sdk/src/Services/Redshift/Generated/Model/IntegrationConflictStateException.cs b/sdk/src/Services/Redshift/Generated/Model/IntegrationConflictStateException.cs index c22f8ae3aca8..d1d8a251827f 100644 --- a/sdk/src/Services/Redshift/Generated/Model/IntegrationConflictStateException.cs +++ b/sdk/src/Services/Redshift/Generated/Model/IntegrationConflictStateException.cs @@ -106,11 +106,6 @@ protected IntegrationConflictStateException(System.Runtime.Serialization.Seriali /// The that holds the serialized object data about the exception being thrown. /// The that contains contextual information about the source or destination. /// The parameter is a null reference (Nothing in Visual Basic). -#if BCL35 - [System.Security.Permissions.SecurityPermission( - System.Security.Permissions.SecurityAction.LinkDemand, - Flags = System.Security.Permissions.SecurityPermissionFlag.SerializationFormatter)] -#endif [System.Security.SecurityCritical] // These FxCop rules are giving false-positives for this method [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Security", "CA2123:OverrideLinkDemandsShouldBeIdenticalToBase")] diff --git a/sdk/src/Services/Redshift/Generated/Model/IntegrationQuotaExceededException.cs b/sdk/src/Services/Redshift/Generated/Model/IntegrationQuotaExceededException.cs index df6608bd4cdb..7e59c4940915 100644 --- a/sdk/src/Services/Redshift/Generated/Model/IntegrationQuotaExceededException.cs +++ b/sdk/src/Services/Redshift/Generated/Model/IntegrationQuotaExceededException.cs @@ -107,11 +107,6 @@ protected IntegrationQuotaExceededException(System.Runtime.Serialization.Seriali /// The that holds the serialized object data about the exception being thrown. /// The that contains contextual information about the source or destination. /// The parameter is a null reference (Nothing in Visual Basic). -#if BCL35 - [System.Security.Permissions.SecurityPermission( - System.Security.Permissions.SecurityAction.LinkDemand, - Flags = System.Security.Permissions.SecurityPermissionFlag.SerializationFormatter)] -#endif [System.Security.SecurityCritical] // These FxCop rules are giving false-positives for this method [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Security", "CA2123:OverrideLinkDemandsShouldBeIdenticalToBase")] diff --git a/sdk/src/Services/Redshift/Generated/Model/IntegrationSourceNotFoundException.cs b/sdk/src/Services/Redshift/Generated/Model/IntegrationSourceNotFoundException.cs index 32ff1bb18790..c89ed4d40deb 100644 --- a/sdk/src/Services/Redshift/Generated/Model/IntegrationSourceNotFoundException.cs +++ b/sdk/src/Services/Redshift/Generated/Model/IntegrationSourceNotFoundException.cs @@ -106,11 +106,6 @@ protected IntegrationSourceNotFoundException(System.Runtime.Serialization.Serial /// The that holds the serialized object data about the exception being thrown. /// The that contains contextual information about the source or destination. /// The parameter is a null reference (Nothing in Visual Basic). -#if BCL35 - [System.Security.Permissions.SecurityPermission( - System.Security.Permissions.SecurityAction.LinkDemand, - Flags = System.Security.Permissions.SecurityPermissionFlag.SerializationFormatter)] -#endif [System.Security.SecurityCritical] // These FxCop rules are giving false-positives for this method [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Security", "CA2123:OverrideLinkDemandsShouldBeIdenticalToBase")] diff --git a/sdk/src/Services/Redshift/Generated/Model/IntegrationTargetNotFoundException.cs b/sdk/src/Services/Redshift/Generated/Model/IntegrationTargetNotFoundException.cs index dc51830356fe..1169d6f46591 100644 --- a/sdk/src/Services/Redshift/Generated/Model/IntegrationTargetNotFoundException.cs +++ b/sdk/src/Services/Redshift/Generated/Model/IntegrationTargetNotFoundException.cs @@ -106,11 +106,6 @@ protected IntegrationTargetNotFoundException(System.Runtime.Serialization.Serial /// The that holds the serialized object data about the exception being thrown. /// The that contains contextual information about the source or destination. /// The parameter is a null reference (Nothing in Visual Basic). -#if BCL35 - [System.Security.Permissions.SecurityPermission( - System.Security.Permissions.SecurityAction.LinkDemand, - Flags = System.Security.Permissions.SecurityPermissionFlag.SerializationFormatter)] -#endif [System.Security.SecurityCritical] // These FxCop rules are giving false-positives for this method [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Security", "CA2123:OverrideLinkDemandsShouldBeIdenticalToBase")] diff --git a/sdk/src/Services/Redshift/Generated/Model/Internal/MarshallTransformations/CreateIntegrationRequestMarshaller.cs b/sdk/src/Services/Redshift/Generated/Model/Internal/MarshallTransformations/CreateIntegrationRequestMarshaller.cs index 73c8b0c7e1c6..0c6a9a18e426 100644 --- a/sdk/src/Services/Redshift/Generated/Model/Internal/MarshallTransformations/CreateIntegrationRequestMarshaller.cs +++ b/sdk/src/Services/Redshift/Generated/Model/Internal/MarshallTransformations/CreateIntegrationRequestMarshaller.cs @@ -92,18 +92,23 @@ public IRequest Marshall(CreateIntegrationRequest publicRequest) } if(publicRequest.IsSetTagList()) { - int publicRequestlistValueIndex = 1; - foreach(var publicRequestlistValue in publicRequest.TagList) + if (publicRequest.TagList.Count == 0) + request.Parameters.Add("TagList", ""); + else { - if(publicRequestlistValue.IsSetKey()) - { - request.Parameters.Add("TagList" + "." + "Tag" + "." + publicRequestlistValueIndex + "." + "Key", StringUtils.FromString(publicRequestlistValue.Key)); - } - if(publicRequestlistValue.IsSetValue()) - { - request.Parameters.Add("TagList" + "." + "Tag" + "." + publicRequestlistValueIndex + "." + "Value", StringUtils.FromString(publicRequestlistValue.Value)); - } - publicRequestlistValueIndex++; + int publicRequestlistValueIndex = 1; + foreach(var publicRequestlistValue in publicRequest.TagList) + { + if(publicRequestlistValue.IsSetKey()) + { + request.Parameters.Add("TagList" + "." + "Tag" + "." + publicRequestlistValueIndex + "." + "Key", StringUtils.FromString(publicRequestlistValue.Key)); + } + if(publicRequestlistValue.IsSetValue()) + { + request.Parameters.Add("TagList" + "." + "Tag" + "." + publicRequestlistValueIndex + "." + "Value", StringUtils.FromString(publicRequestlistValue.Value)); + } + publicRequestlistValueIndex++; + } } } if(publicRequest.IsSetTargetArn()) diff --git a/sdk/src/Services/Redshift/Generated/Model/Internal/MarshallTransformations/CreateIntegrationResponseUnmarshaller.cs b/sdk/src/Services/Redshift/Generated/Model/Internal/MarshallTransformations/CreateIntegrationResponseUnmarshaller.cs index 010e008f5961..a92ae234c2fb 100644 --- a/sdk/src/Services/Redshift/Generated/Model/Internal/MarshallTransformations/CreateIntegrationResponseUnmarshaller.cs +++ b/sdk/src/Services/Redshift/Generated/Model/Internal/MarshallTransformations/CreateIntegrationResponseUnmarshaller.cs @@ -95,7 +95,7 @@ private static void UnmarshallResult(XmlUnmarshallerContext context, CreateInteg } if (context.TestExpression("CreateTime", targetDepth)) { - var unmarshaller = DateTimeUnmarshaller.Instance; + var unmarshaller = NullableDateTimeUnmarshaller.Instance; response.CreateTime = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/Redshift/Generated/Model/Internal/MarshallTransformations/CreateRedshiftIdcApplicationRequestMarshaller.cs b/sdk/src/Services/Redshift/Generated/Model/Internal/MarshallTransformations/CreateRedshiftIdcApplicationRequestMarshaller.cs index a1b38c6e9b03..b94f97b90641 100644 --- a/sdk/src/Services/Redshift/Generated/Model/Internal/MarshallTransformations/CreateRedshiftIdcApplicationRequestMarshaller.cs +++ b/sdk/src/Services/Redshift/Generated/Model/Internal/MarshallTransformations/CreateRedshiftIdcApplicationRequestMarshaller.cs @@ -139,31 +139,28 @@ public IRequest Marshall(CreateRedshiftIdcApplicationRequest publicRequest) } } } -<<<<<<< HEAD - publicRequestlistValueIndex++; - } -||||||| Commit version number update changes - } - publicRequestlistValueIndex++; -======= - } - if(publicRequestlistValue.IsSetS3AccessGrants()) - { - int publicRequestlistValuelistValueIndex = 1; - foreach(var publicRequestlistValuelistValue in publicRequestlistValue.S3AccessGrants) + if(publicRequestlistValue.IsSetS3AccessGrants()) { - if(publicRequestlistValuelistValue.IsSetReadWriteAccess()) + if (publicRequestlistValue.S3AccessGrants.Count == 0) + request.Parameters.Add("ServiceIntegrations" + "." + "member" + "." + publicRequestlistValueIndex + "." + "S3AccessGrants", ""); + else { - if(publicRequestlistValuelistValue.ReadWriteAccess.IsSetAuthorization()) - { - request.Parameters.Add("ServiceIntegrations" + "." + "member" + "." + publicRequestlistValueIndex + "." + "S3AccessGrants" + "." + "member" + "." + publicRequestlistValuelistValueIndex + "." + "ReadWriteAccess" + "." + "Authorization", StringUtils.FromString(publicRequestlistValuelistValue.ReadWriteAccess.Authorization)); - } + int publicRequestlistValuelistValueIndex = 1; + foreach(var publicRequestlistValuelistValue in publicRequestlistValue.S3AccessGrants) + { + if(publicRequestlistValuelistValue.IsSetReadWriteAccess()) + { + if(publicRequestlistValuelistValue.ReadWriteAccess.IsSetAuthorization()) + { + request.Parameters.Add("ServiceIntegrations" + "." + "member" + "." + publicRequestlistValueIndex + "." + "S3AccessGrants" + "." + "member" + "." + publicRequestlistValuelistValueIndex + "." + "ReadWriteAccess" + "." + "Authorization", StringUtils.FromString(publicRequestlistValuelistValue.ReadWriteAccess.Authorization)); + } + } + publicRequestlistValuelistValueIndex++; + } } - publicRequestlistValuelistValueIndex++; } - } - publicRequestlistValueIndex++; ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b + publicRequestlistValueIndex++; + } } } } diff --git a/sdk/src/Services/Redshift/Generated/Model/Internal/MarshallTransformations/DeleteIntegrationResponseUnmarshaller.cs b/sdk/src/Services/Redshift/Generated/Model/Internal/MarshallTransformations/DeleteIntegrationResponseUnmarshaller.cs index 20cb176e2901..ced7e23d69f3 100644 --- a/sdk/src/Services/Redshift/Generated/Model/Internal/MarshallTransformations/DeleteIntegrationResponseUnmarshaller.cs +++ b/sdk/src/Services/Redshift/Generated/Model/Internal/MarshallTransformations/DeleteIntegrationResponseUnmarshaller.cs @@ -95,7 +95,7 @@ private static void UnmarshallResult(XmlUnmarshallerContext context, DeleteInteg } if (context.TestExpression("CreateTime", targetDepth)) { - var unmarshaller = DateTimeUnmarshaller.Instance; + var unmarshaller = NullableDateTimeUnmarshaller.Instance; response.CreateTime = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/Redshift/Generated/Model/Internal/MarshallTransformations/DescribeIntegrationsRequestMarshaller.cs b/sdk/src/Services/Redshift/Generated/Model/Internal/MarshallTransformations/DescribeIntegrationsRequestMarshaller.cs index 10a3a7658723..c9ddb74f0e7c 100644 --- a/sdk/src/Services/Redshift/Generated/Model/Internal/MarshallTransformations/DescribeIntegrationsRequestMarshaller.cs +++ b/sdk/src/Services/Redshift/Generated/Model/Internal/MarshallTransformations/DescribeIntegrationsRequestMarshaller.cs @@ -61,23 +61,33 @@ public IRequest Marshall(DescribeIntegrationsRequest publicRequest) { if(publicRequest.IsSetFilters()) { - int publicRequestlistValueIndex = 1; - foreach(var publicRequestlistValue in publicRequest.Filters) + if (publicRequest.Filters.Count == 0) + request.Parameters.Add("Filters", ""); + else { - if(publicRequestlistValue.IsSetName()) - { - request.Parameters.Add("Filters" + "." + "DescribeIntegrationsFilter" + "." + publicRequestlistValueIndex + "." + "Name", StringUtils.FromString(publicRequestlistValue.Name)); - } - if(publicRequestlistValue.IsSetValues()) - { - int publicRequestlistValuelistValueIndex = 1; - foreach(var publicRequestlistValuelistValue in publicRequestlistValue.Values) + int publicRequestlistValueIndex = 1; + foreach(var publicRequestlistValue in publicRequest.Filters) + { + if(publicRequestlistValue.IsSetName()) { - request.Parameters.Add("Filters" + "." + "DescribeIntegrationsFilter" + "." + publicRequestlistValueIndex + "." + "Values" + "." + "Value" + "." + publicRequestlistValuelistValueIndex, StringUtils.FromString(publicRequestlistValuelistValue)); - publicRequestlistValuelistValueIndex++; + request.Parameters.Add("Filters" + "." + "DescribeIntegrationsFilter" + "." + publicRequestlistValueIndex + "." + "Name", StringUtils.FromString(publicRequestlistValue.Name)); } - } - publicRequestlistValueIndex++; + if(publicRequestlistValue.IsSetValues()) + { + if (publicRequestlistValue.Values.Count == 0) + request.Parameters.Add("Filters" + "." + "DescribeIntegrationsFilter" + "." + publicRequestlistValueIndex + "." + "Values", ""); + else + { + int publicRequestlistValuelistValueIndex = 1; + foreach(var publicRequestlistValuelistValue in publicRequestlistValue.Values) + { + request.Parameters.Add("Filters" + "." + "DescribeIntegrationsFilter" + "." + publicRequestlistValueIndex + "." + "Values" + "." + "Value" + "." + publicRequestlistValuelistValueIndex, StringUtils.FromString(publicRequestlistValuelistValue)); + publicRequestlistValuelistValueIndex++; + } + } + } + publicRequestlistValueIndex++; + } } } if(publicRequest.IsSetIntegrationArn()) diff --git a/sdk/src/Services/Redshift/Generated/Model/Internal/MarshallTransformations/IntegrationUnmarshaller.cs b/sdk/src/Services/Redshift/Generated/Model/Internal/MarshallTransformations/IntegrationUnmarshaller.cs index 91894735dfd1..287ca09f8221 100644 --- a/sdk/src/Services/Redshift/Generated/Model/Internal/MarshallTransformations/IntegrationUnmarshaller.cs +++ b/sdk/src/Services/Redshift/Generated/Model/Internal/MarshallTransformations/IntegrationUnmarshaller.cs @@ -68,7 +68,7 @@ public Integration Unmarshall(XmlUnmarshallerContext context) } if (context.TestExpression("CreateTime", targetDepth)) { - var unmarshaller = DateTimeUnmarshaller.Instance; + var unmarshaller = NullableDateTimeUnmarshaller.Instance; unmarshalledObject.CreateTime = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/Redshift/Generated/Model/Internal/MarshallTransformations/ModifyIntegrationResponseUnmarshaller.cs b/sdk/src/Services/Redshift/Generated/Model/Internal/MarshallTransformations/ModifyIntegrationResponseUnmarshaller.cs index b0fc32ea7d22..e1f8bedfcf6f 100644 --- a/sdk/src/Services/Redshift/Generated/Model/Internal/MarshallTransformations/ModifyIntegrationResponseUnmarshaller.cs +++ b/sdk/src/Services/Redshift/Generated/Model/Internal/MarshallTransformations/ModifyIntegrationResponseUnmarshaller.cs @@ -95,7 +95,7 @@ private static void UnmarshallResult(XmlUnmarshallerContext context, ModifyInteg } if (context.TestExpression("CreateTime", targetDepth)) { - var unmarshaller = DateTimeUnmarshaller.Instance; + var unmarshaller = NullableDateTimeUnmarshaller.Instance; response.CreateTime = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/Redshift/Generated/Model/Internal/MarshallTransformations/ModifyRedshiftIdcApplicationRequestMarshaller.cs b/sdk/src/Services/Redshift/Generated/Model/Internal/MarshallTransformations/ModifyRedshiftIdcApplicationRequestMarshaller.cs index 77e8dcaeeb9c..5658e97069c9 100644 --- a/sdk/src/Services/Redshift/Generated/Model/Internal/MarshallTransformations/ModifyRedshiftIdcApplicationRequestMarshaller.cs +++ b/sdk/src/Services/Redshift/Generated/Model/Internal/MarshallTransformations/ModifyRedshiftIdcApplicationRequestMarshaller.cs @@ -135,31 +135,28 @@ public IRequest Marshall(ModifyRedshiftIdcApplicationRequest publicRequest) } } } -<<<<<<< HEAD - publicRequestlistValueIndex++; - } -||||||| Commit version number update changes - } - publicRequestlistValueIndex++; -======= - } - if(publicRequestlistValue.IsSetS3AccessGrants()) - { - int publicRequestlistValuelistValueIndex = 1; - foreach(var publicRequestlistValuelistValue in publicRequestlistValue.S3AccessGrants) + if(publicRequestlistValue.IsSetS3AccessGrants()) { - if(publicRequestlistValuelistValue.IsSetReadWriteAccess()) + if (publicRequestlistValue.S3AccessGrants.Count == 0) + request.Parameters.Add("ServiceIntegrations" + "." + "member" + "." + publicRequestlistValueIndex + "." + "S3AccessGrants", ""); + else { - if(publicRequestlistValuelistValue.ReadWriteAccess.IsSetAuthorization()) - { - request.Parameters.Add("ServiceIntegrations" + "." + "member" + "." + publicRequestlistValueIndex + "." + "S3AccessGrants" + "." + "member" + "." + publicRequestlistValuelistValueIndex + "." + "ReadWriteAccess" + "." + "Authorization", StringUtils.FromString(publicRequestlistValuelistValue.ReadWriteAccess.Authorization)); - } + int publicRequestlistValuelistValueIndex = 1; + foreach(var publicRequestlistValuelistValue in publicRequestlistValue.S3AccessGrants) + { + if(publicRequestlistValuelistValue.IsSetReadWriteAccess()) + { + if(publicRequestlistValuelistValue.ReadWriteAccess.IsSetAuthorization()) + { + request.Parameters.Add("ServiceIntegrations" + "." + "member" + "." + publicRequestlistValueIndex + "." + "S3AccessGrants" + "." + "member" + "." + publicRequestlistValuelistValueIndex + "." + "ReadWriteAccess" + "." + "Authorization", StringUtils.FromString(publicRequestlistValuelistValue.ReadWriteAccess.Authorization)); + } + } + publicRequestlistValuelistValueIndex++; + } } - publicRequestlistValuelistValueIndex++; } - } - publicRequestlistValueIndex++; ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b + publicRequestlistValueIndex++; + } } } } diff --git a/sdk/src/Services/Redshift/Generated/Model/ModifyIntegrationResponse.cs b/sdk/src/Services/Redshift/Generated/Model/ModifyIntegrationResponse.cs index 4aa1bbef0103..9b4415e8616c 100644 --- a/sdk/src/Services/Redshift/Generated/Model/ModifyIntegrationResponse.cs +++ b/sdk/src/Services/Redshift/Generated/Model/ModifyIntegrationResponse.cs @@ -71,9 +71,9 @@ internal bool IsSetAdditionalEncryptionContext() /// The time (UTC) when the integration was created. /// /// - public DateTime CreateTime + public DateTime? CreateTime { - get { return this._createTime.GetValueOrDefault(); } + get { return this._createTime; } set { this._createTime = value; } } diff --git a/sdk/src/Services/Redshift/Generated/Model/_bcl45+netstandard/DescribeIntegrationsPaginator.cs b/sdk/src/Services/Redshift/Generated/Model/_bcl+netstandard/DescribeIntegrationsPaginator.cs similarity index 100% rename from sdk/src/Services/Redshift/Generated/Model/_bcl45+netstandard/DescribeIntegrationsPaginator.cs rename to sdk/src/Services/Redshift/Generated/Model/_bcl+netstandard/DescribeIntegrationsPaginator.cs diff --git a/sdk/src/Services/Redshift/Generated/Model/_bcl45+netstandard/IDescribeIntegrationsPaginator.cs b/sdk/src/Services/Redshift/Generated/Model/_bcl+netstandard/IDescribeIntegrationsPaginator.cs similarity index 100% rename from sdk/src/Services/Redshift/Generated/Model/_bcl45+netstandard/IDescribeIntegrationsPaginator.cs rename to sdk/src/Services/Redshift/Generated/Model/_bcl+netstandard/IDescribeIntegrationsPaginator.cs diff --git a/sdk/src/Services/Redshift/Generated/_bcl/AmazonRedshiftClient.cs b/sdk/src/Services/Redshift/Generated/_bcl/AmazonRedshiftClient.cs index 5161700f3e1d..48c978d0279f 100644 --- a/sdk/src/Services/Redshift/Generated/_bcl/AmazonRedshiftClient.cs +++ b/sdk/src/Services/Redshift/Generated/_bcl/AmazonRedshiftClient.cs @@ -2373,6 +2373,107 @@ public virtual CreateHsmConfigurationResponse CreateHsmConfiguration(CreateHsmCo #endregion + #region CreateIntegration + + + /// + /// Creates a zero-ETL integration or S3 event integration with Amazon Redshift. + /// + /// Container for the necessary parameters to execute the CreateIntegration service method. + /// + /// The response from the CreateIntegration service method, as returned by Redshift. + /// + /// The integration you are trying to create already exists. + /// + /// + /// A conflicting conditional operation is currently in progress against this resource. + /// This typically occurs when there are multiple requests being made to the same resource + /// at the same time, and these requests conflict with each other. + /// + /// + /// You can't create any more zero-ETL or S3 event integrations because the quota has + /// been reached. + /// + /// + /// The specified integration source can't be found. + /// + /// + /// The specified integration target can't be found. + /// + /// + /// The specified cluster is not in the available state. + /// + /// + /// The tag is invalid. + /// + /// + /// You have exceeded the number of tags allowed. + /// + /// + /// The requested operation isn't supported. + /// + /// REST API Reference for CreateIntegration Operation + public virtual CreateIntegrationResponse CreateIntegration(CreateIntegrationRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = CreateIntegrationRequestMarshaller.Instance; + options.ResponseUnmarshaller = CreateIntegrationResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// Creates a zero-ETL integration or S3 event integration with Amazon Redshift. + /// + /// Container for the necessary parameters to execute the CreateIntegration service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the CreateIntegration service method, as returned by Redshift. + /// + /// The integration you are trying to create already exists. + /// + /// + /// A conflicting conditional operation is currently in progress against this resource. + /// This typically occurs when there are multiple requests being made to the same resource + /// at the same time, and these requests conflict with each other. + /// + /// + /// You can't create any more zero-ETL or S3 event integrations because the quota has + /// been reached. + /// + /// + /// The specified integration source can't be found. + /// + /// + /// The specified integration target can't be found. + /// + /// + /// The specified cluster is not in the available state. + /// + /// + /// The tag is invalid. + /// + /// + /// You have exceeded the number of tags allowed. + /// + /// + /// The requested operation isn't supported. + /// + /// REST API Reference for CreateIntegration Operation + public virtual Task CreateIntegrationAsync(CreateIntegrationRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = CreateIntegrationRequestMarshaller.Instance; + options.ResponseUnmarshaller = CreateIntegrationResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + #region CreateRedshiftIdcApplication @@ -3699,6 +3800,75 @@ public virtual DeleteHsmConfigurationResponse DeleteHsmConfiguration(DeleteHsmCo #endregion + #region DeleteIntegration + + + /// + /// Deletes a zero-ETL integration or S3 event integration with Amazon Redshift. + /// + /// Container for the necessary parameters to execute the DeleteIntegration service method. + /// + /// The response from the DeleteIntegration service method, as returned by Redshift. + /// + /// A conflicting conditional operation is currently in progress against this resource. + /// This typically occurs when there are multiple requests being made to the same resource + /// at the same time, and these requests conflict with each other. + /// + /// + /// The integration is in an invalid state and can't perform the requested operation. + /// + /// + /// The integration can't be found. + /// + /// + /// The requested operation isn't supported. + /// + /// REST API Reference for DeleteIntegration Operation + public virtual DeleteIntegrationResponse DeleteIntegration(DeleteIntegrationRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = DeleteIntegrationRequestMarshaller.Instance; + options.ResponseUnmarshaller = DeleteIntegrationResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// Deletes a zero-ETL integration or S3 event integration with Amazon Redshift. + /// + /// Container for the necessary parameters to execute the DeleteIntegration service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the DeleteIntegration service method, as returned by Redshift. + /// + /// A conflicting conditional operation is currently in progress against this resource. + /// This typically occurs when there are multiple requests being made to the same resource + /// at the same time, and these requests conflict with each other. + /// + /// + /// The integration is in an invalid state and can't perform the requested operation. + /// + /// + /// The integration can't be found. + /// + /// + /// The requested operation isn't supported. + /// + /// REST API Reference for DeleteIntegration Operation + public virtual Task DeleteIntegrationAsync(DeleteIntegrationRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = DeleteIntegrationRequestMarshaller.Instance; + options.ResponseUnmarshaller = DeleteIntegrationResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + #region DeletePartner @@ -6425,6 +6595,59 @@ public virtual DescribeInboundIntegrationsResponse DescribeInboundIntegrations(D #endregion + #region DescribeIntegrations + + + /// + /// Describes one or more zero-ETL or S3 event integrations with Amazon Redshift. + /// + /// Container for the necessary parameters to execute the DescribeIntegrations service method. + /// + /// The response from the DescribeIntegrations service method, as returned by Redshift. + /// + /// The integration can't be found. + /// + /// + /// The requested operation isn't supported. + /// + /// REST API Reference for DescribeIntegrations Operation + public virtual DescribeIntegrationsResponse DescribeIntegrations(DescribeIntegrationsRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = DescribeIntegrationsRequestMarshaller.Instance; + options.ResponseUnmarshaller = DescribeIntegrationsResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// Describes one or more zero-ETL or S3 event integrations with Amazon Redshift. + /// + /// Container for the necessary parameters to execute the DescribeIntegrations service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the DescribeIntegrations service method, as returned by Redshift. + /// + /// The integration can't be found. + /// + /// + /// The requested operation isn't supported. + /// + /// REST API Reference for DescribeIntegrations Operation + public virtual Task DescribeIntegrationsAsync(DescribeIntegrationsRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = DescribeIntegrationsRequestMarshaller.Instance; + options.ResponseUnmarshaller = DescribeIntegrationsResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + #region DescribeLoggingStatus @@ -9704,6 +9927,81 @@ public virtual ModifyEventSubscriptionResponse ModifyEventSubscription(ModifyEve #endregion + #region ModifyIntegration + + + /// + /// Modifies a zero-ETL integration or S3 event integration with Amazon Redshift. + /// + /// Container for the necessary parameters to execute the ModifyIntegration service method. + /// + /// The response from the ModifyIntegration service method, as returned by Redshift. + /// + /// The integration you are trying to create already exists. + /// + /// + /// A conflicting conditional operation is currently in progress against this resource. + /// This typically occurs when there are multiple requests being made to the same resource + /// at the same time, and these requests conflict with each other. + /// + /// + /// The integration is in an invalid state and can't perform the requested operation. + /// + /// + /// The integration can't be found. + /// + /// + /// The requested operation isn't supported. + /// + /// REST API Reference for ModifyIntegration Operation + public virtual ModifyIntegrationResponse ModifyIntegration(ModifyIntegrationRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = ModifyIntegrationRequestMarshaller.Instance; + options.ResponseUnmarshaller = ModifyIntegrationResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// Modifies a zero-ETL integration or S3 event integration with Amazon Redshift. + /// + /// Container for the necessary parameters to execute the ModifyIntegration service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the ModifyIntegration service method, as returned by Redshift. + /// + /// The integration you are trying to create already exists. + /// + /// + /// A conflicting conditional operation is currently in progress against this resource. + /// This typically occurs when there are multiple requests being made to the same resource + /// at the same time, and these requests conflict with each other. + /// + /// + /// The integration is in an invalid state and can't perform the requested operation. + /// + /// + /// The integration can't be found. + /// + /// + /// The requested operation isn't supported. + /// + /// REST API Reference for ModifyIntegration Operation + public virtual Task ModifyIntegrationAsync(ModifyIntegrationRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = ModifyIntegrationRequestMarshaller.Instance; + options.ResponseUnmarshaller = ModifyIntegrationResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + #region ModifyRedshiftIdcApplication @@ -10480,6 +10778,10 @@ public virtual ResetClusterParameterGroupResponse ResetClusterParameterGroup(Res /// ///
  • /// + /// ra3.large + /// + ///
  • + /// /// ra3.xlplus /// ///
  • @@ -10582,6 +10884,10 @@ public virtual ResizeClusterResponse ResizeCluster(ResizeClusterRequest request) /// ///
  • /// + /// ra3.large + /// + ///
  • + /// /// ra3.xlplus /// ///
  • diff --git a/sdk/src/Services/Redshift/Properties/AssemblyInfo.cs b/sdk/src/Services/Redshift/Properties/AssemblyInfo.cs index b1c71aafbf79..6fbf815a44ce 100644 --- a/sdk/src/Services/Redshift/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/Redshift/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.404.2")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/Redshift/Redshift.sln b/sdk/src/Services/Redshift/Redshift.sln index ab97f6290b5c..6245bf16d41b 100644 --- a/sdk/src/Services/Redshift/Redshift.sln +++ b/sdk/src/Services/Redshift/Redshift.sln @@ -92,7 +92,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {955BAE01-B4D7-403A-89B3-C2085E450D5D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {955BAE01-B4D7-403A-89B3-C2085E450D5D}.Debug|Any CPU.Build.0 = Debug|Any CPU {955BAE01-B4D7-403A-89B3-C2085E450D5D}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -113,97 +120,6 @@ Global {A80C921D-4FB9-416D-9904-696B7CEE1493}.Debug|Any CPU.Build.0 = Debug|Any CPU {A80C921D-4FB9-416D-9904-696B7CEE1493}.Release|Any CPU.ActiveCfg = Release|Any CPU {A80C921D-4FB9-416D-9904-696B7CEE1493}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {501C8552-B916-4126-A297-EF8BCD283487}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {501C8552-B916-4126-A297-EF8BCD283487}.Debug|Any CPU.Build.0 = Debug|Any CPU - {501C8552-B916-4126-A297-EF8BCD283487}.Release|Any CPU.ActiveCfg = Release|Any CPU - {501C8552-B916-4126-A297-EF8BCD283487}.Release|Any CPU.Build.0 = Release|Any CPU - {4B7E5AD6-A6CE-4C71-8154-4C31461D060C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4B7E5AD6-A6CE-4C71-8154-4C31461D060C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4B7E5AD6-A6CE-4C71-8154-4C31461D060C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4B7E5AD6-A6CE-4C71-8154-4C31461D060C}.Release|Any CPU.Build.0 = Release|Any CPU - {16053427-9575-4764-B9A7-2608235E8723}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {16053427-9575-4764-B9A7-2608235E8723}.Debug|Any CPU.Build.0 = Debug|Any CPU - {16053427-9575-4764-B9A7-2608235E8723}.Release|Any CPU.ActiveCfg = Release|Any CPU - {16053427-9575-4764-B9A7-2608235E8723}.Release|Any CPU.Build.0 = Release|Any CPU - {1F331E78-4CE3-47EC-A432-8A42C5F8C448}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1F331E78-4CE3-47EC-A432-8A42C5F8C448}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1F331E78-4CE3-47EC-A432-8A42C5F8C448}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1F331E78-4CE3-47EC-A432-8A42C5F8C448}.Release|Any CPU.Build.0 = Release|Any CPU - {AA9B468A-3DD1-4A4B-825E-A6899C85547F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AA9B468A-3DD1-4A4B-825E-A6899C85547F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AA9B468A-3DD1-4A4B-825E-A6899C85547F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AA9B468A-3DD1-4A4B-825E-A6899C85547F}.Release|Any CPU.Build.0 = Release|Any CPU - {A0A9298A-C036-4752-B7C9-AB71571C544E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A0A9298A-C036-4752-B7C9-AB71571C544E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A0A9298A-C036-4752-B7C9-AB71571C544E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A0A9298A-C036-4752-B7C9-AB71571C544E}.Release|Any CPU.Build.0 = Release|Any CPU - {6D5DC2D0-5C94-4651-A17F-9BD0509D9258}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6D5DC2D0-5C94-4651-A17F-9BD0509D9258}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6D5DC2D0-5C94-4651-A17F-9BD0509D9258}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6D5DC2D0-5C94-4651-A17F-9BD0509D9258}.Release|Any CPU.Build.0 = Release|Any CPU - {3A043D01-692F-4924-9AC9-F1C2DCD510D6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3A043D01-692F-4924-9AC9-F1C2DCD510D6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3A043D01-692F-4924-9AC9-F1C2DCD510D6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3A043D01-692F-4924-9AC9-F1C2DCD510D6}.Release|Any CPU.Build.0 = Release|Any CPU - {1DA7FABB-0663-4667-99D3-88E4F15317B6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1DA7FABB-0663-4667-99D3-88E4F15317B6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1DA7FABB-0663-4667-99D3-88E4F15317B6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1DA7FABB-0663-4667-99D3-88E4F15317B6}.Release|Any CPU.Build.0 = Release|Any CPU - {183764A3-2B85-436F-B5ED-22D9E9B2C54C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {183764A3-2B85-436F-B5ED-22D9E9B2C54C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {183764A3-2B85-436F-B5ED-22D9E9B2C54C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {183764A3-2B85-436F-B5ED-22D9E9B2C54C}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {501C8552-B916-4126-A297-EF8BCD283487}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {501C8552-B916-4126-A297-EF8BCD283487}.Debug|Any CPU.Build.0 = Debug|Any CPU - {501C8552-B916-4126-A297-EF8BCD283487}.Release|Any CPU.ActiveCfg = Release|Any CPU - {501C8552-B916-4126-A297-EF8BCD283487}.Release|Any CPU.Build.0 = Release|Any CPU - {4B7E5AD6-A6CE-4C71-8154-4C31461D060C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4B7E5AD6-A6CE-4C71-8154-4C31461D060C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4B7E5AD6-A6CE-4C71-8154-4C31461D060C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4B7E5AD6-A6CE-4C71-8154-4C31461D060C}.Release|Any CPU.Build.0 = Release|Any CPU - {16053427-9575-4764-B9A7-2608235E8723}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {16053427-9575-4764-B9A7-2608235E8723}.Debug|Any CPU.Build.0 = Debug|Any CPU - {16053427-9575-4764-B9A7-2608235E8723}.Release|Any CPU.ActiveCfg = Release|Any CPU - {16053427-9575-4764-B9A7-2608235E8723}.Release|Any CPU.Build.0 = Release|Any CPU - {1F331E78-4CE3-47EC-A432-8A42C5F8C448}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1F331E78-4CE3-47EC-A432-8A42C5F8C448}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1F331E78-4CE3-47EC-A432-8A42C5F8C448}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1F331E78-4CE3-47EC-A432-8A42C5F8C448}.Release|Any CPU.Build.0 = Release|Any CPU - {AA9B468A-3DD1-4A4B-825E-A6899C85547F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AA9B468A-3DD1-4A4B-825E-A6899C85547F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AA9B468A-3DD1-4A4B-825E-A6899C85547F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AA9B468A-3DD1-4A4B-825E-A6899C85547F}.Release|Any CPU.Build.0 = Release|Any CPU - {A0A9298A-C036-4752-B7C9-AB71571C544E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A0A9298A-C036-4752-B7C9-AB71571C544E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A0A9298A-C036-4752-B7C9-AB71571C544E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A0A9298A-C036-4752-B7C9-AB71571C544E}.Release|Any CPU.Build.0 = Release|Any CPU - {6D5DC2D0-5C94-4651-A17F-9BD0509D9258}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6D5DC2D0-5C94-4651-A17F-9BD0509D9258}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6D5DC2D0-5C94-4651-A17F-9BD0509D9258}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6D5DC2D0-5C94-4651-A17F-9BD0509D9258}.Release|Any CPU.Build.0 = Release|Any CPU - {3A043D01-692F-4924-9AC9-F1C2DCD510D6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3A043D01-692F-4924-9AC9-F1C2DCD510D6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3A043D01-692F-4924-9AC9-F1C2DCD510D6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3A043D01-692F-4924-9AC9-F1C2DCD510D6}.Release|Any CPU.Build.0 = Release|Any CPU - {1DA7FABB-0663-4667-99D3-88E4F15317B6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1DA7FABB-0663-4667-99D3-88E4F15317B6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1DA7FABB-0663-4667-99D3-88E4F15317B6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1DA7FABB-0663-4667-99D3-88E4F15317B6}.Release|Any CPU.Build.0 = Release|Any CPU - {183764A3-2B85-436F-B5ED-22D9E9B2C54C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {183764A3-2B85-436F-B5ED-22D9E9B2C54C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {183764A3-2B85-436F-B5ED-22D9E9B2C54C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {183764A3-2B85-436F-B5ED-22D9E9B2C54C}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -220,37 +136,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {955BAE01-B4D7-403A-89B3-C2085E450D5D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {73F28687-3E9F-405A-9499-10A1122B7704} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {D89944EF-958C-48FE-AB39-DD624B25F29D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {C6DAACF9-EC0F-4B4D-AA3F-6068A05BEAF1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {A80C921D-4FB9-416D-9904-696B7CEE1493} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {501C8552-B916-4126-A297-EF8BCD283487} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4B7E5AD6-A6CE-4C71-8154-4C31461D060C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {16053427-9575-4764-B9A7-2608235E8723} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {1F331E78-4CE3-47EC-A432-8A42C5F8C448} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {AA9B468A-3DD1-4A4B-825E-A6899C85547F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A0A9298A-C036-4752-B7C9-AB71571C544E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6D5DC2D0-5C94-4651-A17F-9BD0509D9258} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {3A043D01-692F-4924-9AC9-F1C2DCD510D6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {1DA7FABB-0663-4667-99D3-88E4F15317B6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {183764A3-2B85-436F-B5ED-22D9E9B2C54C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {501C8552-B916-4126-A297-EF8BCD283487} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4B7E5AD6-A6CE-4C71-8154-4C31461D060C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {16053427-9575-4764-B9A7-2608235E8723} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {1F331E78-4CE3-47EC-A432-8A42C5F8C448} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {AA9B468A-3DD1-4A4B-825E-A6899C85547F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A0A9298A-C036-4752-B7C9-AB71571C544E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6D5DC2D0-5C94-4651-A17F-9BD0509D9258} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {3A043D01-692F-4924-9AC9-F1C2DCD510D6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {1DA7FABB-0663-4667-99D3-88E4F15317B6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {183764A3-2B85-436F-B5ED-22D9E9B2C54C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {6DF37F9A-B0F1-404D-A61A-ACC369BB0AA7} diff --git a/sdk/src/Services/RedshiftDataAPIService/Generated/AmazonRedshiftDataAPIServiceConfig.cs b/sdk/src/Services/RedshiftDataAPIService/Generated/AmazonRedshiftDataAPIServiceConfig.cs index 48dad6f35269..e679684cc994 100644 --- a/sdk/src/Services/RedshiftDataAPIService/Generated/AmazonRedshiftDataAPIServiceConfig.cs +++ b/sdk/src/Services/RedshiftDataAPIService/Generated/AmazonRedshiftDataAPIServiceConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.RedshiftDataAPIService public partial class AmazonRedshiftDataAPIServiceConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("Redshift Data", "4.0.0.0"); private static readonly AmazonRedshiftDataAPIServiceEndpointResolver EndpointResolver = new AmazonRedshiftDataAPIServiceEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("Redshift Data", "3.7.401.13"); -======= - InternalSDKUtils.BuildUserAgentString("Redshift Data", "3.7.402.11"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/RedshiftDataAPIService/Generated/Model/GetStatementResultV2Response.cs b/sdk/src/Services/RedshiftDataAPIService/Generated/Model/GetStatementResultV2Response.cs index ca1e32180be9..92b51fc7419a 100644 --- a/sdk/src/Services/RedshiftDataAPIService/Generated/Model/GetStatementResultV2Response.cs +++ b/sdk/src/Services/RedshiftDataAPIService/Generated/Model/GetStatementResultV2Response.cs @@ -125,9 +125,9 @@ internal bool IsSetResultFormat() /// needed to page through the results. /// /// - public long TotalNumRows + public long? TotalNumRows { - get { return this._totalNumRows.GetValueOrDefault(); } + get { return this._totalNumRows; } set { this._totalNumRows = value; } } diff --git a/sdk/src/Services/RedshiftDataAPIService/Generated/Model/Internal/MarshallTransformations/BatchExecuteStatementRequestMarshaller.cs b/sdk/src/Services/RedshiftDataAPIService/Generated/Model/Internal/MarshallTransformations/BatchExecuteStatementRequestMarshaller.cs index d42e725ec72c..8b72b3c55727 100644 --- a/sdk/src/Services/RedshiftDataAPIService/Generated/Model/Internal/MarshallTransformations/BatchExecuteStatementRequestMarshaller.cs +++ b/sdk/src/Services/RedshiftDataAPIService/Generated/Model/Internal/MarshallTransformations/BatchExecuteStatementRequestMarshaller.cs @@ -100,31 +100,17 @@ public IRequest Marshall(BatchExecuteStatementRequest publicRequest) context.Writer.Write(publicRequest.DbUser); } -<<<<<<< HEAD + if(publicRequest.IsSetResultFormat()) + { + context.Writer.WritePropertyName("ResultFormat"); + context.Writer.Write(publicRequest.ResultFormat); + } + if(publicRequest.IsSetSecretArn()) { context.Writer.WritePropertyName("SecretArn"); context.Writer.Write(publicRequest.SecretArn); } -||||||| Commit version number update changes - if(publicRequest.IsSetSecretArn()) - { - context.Writer.WritePropertyName("SecretArn"); - context.Writer.Write(publicRequest.SecretArn); - } -======= - if(publicRequest.IsSetResultFormat()) - { - context.Writer.WritePropertyName("ResultFormat"); - context.Writer.Write(publicRequest.ResultFormat); - } - - if(publicRequest.IsSetSecretArn()) - { - context.Writer.WritePropertyName("SecretArn"); - context.Writer.Write(publicRequest.SecretArn); - } ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b if(publicRequest.IsSetSessionId()) { diff --git a/sdk/src/Services/RedshiftDataAPIService/Generated/Model/Internal/MarshallTransformations/ExecuteStatementRequestMarshaller.cs b/sdk/src/Services/RedshiftDataAPIService/Generated/Model/Internal/MarshallTransformations/ExecuteStatementRequestMarshaller.cs index 1eb1d62683c6..88b5e9bdb92d 100644 --- a/sdk/src/Services/RedshiftDataAPIService/Generated/Model/Internal/MarshallTransformations/ExecuteStatementRequestMarshaller.cs +++ b/sdk/src/Services/RedshiftDataAPIService/Generated/Model/Internal/MarshallTransformations/ExecuteStatementRequestMarshaller.cs @@ -116,37 +116,23 @@ public IRequest Marshall(ExecuteStatementRequest publicRequest) context.Writer.WriteArrayEnd(); } + if(publicRequest.IsSetResultFormat()) + { + context.Writer.WritePropertyName("ResultFormat"); + context.Writer.Write(publicRequest.ResultFormat); + } + if(publicRequest.IsSetSecretArn()) { context.Writer.WritePropertyName("SecretArn"); context.Writer.Write(publicRequest.SecretArn); } -<<<<<<< HEAD if(publicRequest.IsSetSessionId()) { context.Writer.WritePropertyName("SessionId"); context.Writer.Write(publicRequest.SessionId); } -||||||| Commit version number update changes - if(publicRequest.IsSetSecretArn()) - { - context.Writer.WritePropertyName("SecretArn"); - context.Writer.Write(publicRequest.SecretArn); - } -======= - if(publicRequest.IsSetResultFormat()) - { - context.Writer.WritePropertyName("ResultFormat"); - context.Writer.Write(publicRequest.ResultFormat); - } - - if(publicRequest.IsSetSecretArn()) - { - context.Writer.WritePropertyName("SecretArn"); - context.Writer.Write(publicRequest.SecretArn); - } ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b if(publicRequest.IsSetSessionKeepAliveSeconds()) { diff --git a/sdk/src/Services/RedshiftDataAPIService/Generated/Model/Internal/MarshallTransformations/GetStatementResultV2RequestMarshaller.cs b/sdk/src/Services/RedshiftDataAPIService/Generated/Model/Internal/MarshallTransformations/GetStatementResultV2RequestMarshaller.cs index 328424d7a382..1a78221b69cc 100644 --- a/sdk/src/Services/RedshiftDataAPIService/Generated/Model/Internal/MarshallTransformations/GetStatementResultV2RequestMarshaller.cs +++ b/sdk/src/Services/RedshiftDataAPIService/Generated/Model/Internal/MarshallTransformations/GetStatementResultV2RequestMarshaller.cs @@ -63,27 +63,30 @@ public IRequest Marshall(GetStatementResultV2Request publicRequest) request.HttpMethod = "POST"; request.ResourcePath = "/"; - using (StringWriter stringWriter = new StringWriter(CultureInfo.InvariantCulture)) + using (MemoryStream memoryStream = new MemoryStream()) { - JsonWriter writer = new JsonWriter(stringWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetId()) + using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) { - context.Writer.WritePropertyName("Id"); - context.Writer.Write(publicRequest.Id); - } + JsonWriter writer = new JsonWriter(streamWriter); + writer.Validate = false; + writer.WriteObjectStart(); + var context = new JsonMarshallerContext(request, writer); + if(publicRequest.IsSetId()) + { + context.Writer.WritePropertyName("Id"); + context.Writer.Write(publicRequest.Id); + } - if(publicRequest.IsSetNextToken()) - { - context.Writer.WritePropertyName("NextToken"); - context.Writer.Write(publicRequest.NextToken); + if(publicRequest.IsSetNextToken()) + { + context.Writer.WritePropertyName("NextToken"); + context.Writer.Write(publicRequest.NextToken); + } + + writer.WriteObjectEnd(); } - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); + request.Content = memoryStream.ToArray(); } diff --git a/sdk/src/Services/RedshiftDataAPIService/Generated/Model/Internal/MarshallTransformations/GetStatementResultV2ResponseUnmarshaller.cs b/sdk/src/Services/RedshiftDataAPIService/Generated/Model/Internal/MarshallTransformations/GetStatementResultV2ResponseUnmarshaller.cs index 64a20ca24131..3099c625b15e 100644 --- a/sdk/src/Services/RedshiftDataAPIService/Generated/Model/Internal/MarshallTransformations/GetStatementResultV2ResponseUnmarshaller.cs +++ b/sdk/src/Services/RedshiftDataAPIService/Generated/Model/Internal/MarshallTransformations/GetStatementResultV2ResponseUnmarshaller.cs @@ -78,7 +78,7 @@ public override AmazonWebServiceResponse Unmarshall(JsonUnmarshallerContext cont } if (context.TestExpression("TotalNumRows", targetDepth)) { - var unmarshaller = LongUnmarshaller.Instance; + var unmarshaller = NullableLongUnmarshaller.Instance; response.TotalNumRows = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/RedshiftDataAPIService/Generated/Model/_bcl45+netstandard/GetStatementResultV2Paginator.cs b/sdk/src/Services/RedshiftDataAPIService/Generated/Model/_bcl+netstandard/GetStatementResultV2Paginator.cs similarity index 100% rename from sdk/src/Services/RedshiftDataAPIService/Generated/Model/_bcl45+netstandard/GetStatementResultV2Paginator.cs rename to sdk/src/Services/RedshiftDataAPIService/Generated/Model/_bcl+netstandard/GetStatementResultV2Paginator.cs diff --git a/sdk/src/Services/RedshiftDataAPIService/Generated/Model/_bcl45+netstandard/IGetStatementResultV2Paginator.cs b/sdk/src/Services/RedshiftDataAPIService/Generated/Model/_bcl+netstandard/IGetStatementResultV2Paginator.cs similarity index 100% rename from sdk/src/Services/RedshiftDataAPIService/Generated/Model/_bcl45+netstandard/IGetStatementResultV2Paginator.cs rename to sdk/src/Services/RedshiftDataAPIService/Generated/Model/_bcl+netstandard/IGetStatementResultV2Paginator.cs diff --git a/sdk/src/Services/RedshiftDataAPIService/Generated/_bcl/AmazonRedshiftDataAPIServiceClient.cs b/sdk/src/Services/RedshiftDataAPIService/Generated/_bcl/AmazonRedshiftDataAPIServiceClient.cs index c0defe228c42..957802211d81 100644 --- a/sdk/src/Services/RedshiftDataAPIService/Generated/_bcl/AmazonRedshiftDataAPIServiceClient.cs +++ b/sdk/src/Services/RedshiftDataAPIService/Generated/_bcl/AmazonRedshiftDataAPIServiceClient.cs @@ -910,8 +910,10 @@ public virtual ExecuteStatementResponse ExecuteStatement(ExecuteStatementRequest /// - /// Fetches the temporarily cached result of an SQL statement. A token is returned to - /// page through the statement results. + /// Fetches the temporarily cached result of an SQL statement in JSON format. The ExecuteStatement + /// or BatchExecuteStatement operation that ran the SQL statement must have specified + /// ResultFormat as JSON , or let the format default to JSON. A token is + /// returned to page through the statement results. /// /// /// @@ -944,8 +946,10 @@ public virtual GetStatementResultResponse GetStatementResult(GetStatementResultR /// - /// Fetches the temporarily cached result of an SQL statement. A token is returned to - /// page through the statement results. + /// Fetches the temporarily cached result of an SQL statement in JSON format. The ExecuteStatement + /// or BatchExecuteStatement operation that ran the SQL statement must have specified + /// ResultFormat as JSON , or let the format default to JSON. A token is + /// returned to page through the statement results. /// /// /// @@ -981,6 +985,85 @@ public virtual GetStatementResultResponse GetStatementResult(GetStatementResultR #endregion + #region GetStatementResultV2 + + + /// + /// Fetches the temporarily cached result of an SQL statement in CSV format. The ExecuteStatement + /// or BatchExecuteStatement operation that ran the SQL statement must have specified + /// ResultFormat as CSV. A token is returned to page through the statement + /// results. + /// + /// + /// + /// For more information about the Amazon Redshift Data API and CLI usage examples, see + /// Using the + /// Amazon Redshift Data API in the Amazon Redshift Management Guide. + /// + /// + /// Container for the necessary parameters to execute the GetStatementResultV2 service method. + /// + /// The response from the GetStatementResultV2 service method, as returned by RedshiftDataAPIService. + /// + /// The Amazon Redshift Data API operation failed due to invalid input. + /// + /// + /// The Amazon Redshift Data API operation failed due to a missing resource. + /// + /// + /// The Amazon Redshift Data API operation failed due to invalid input. + /// + /// REST API Reference for GetStatementResultV2 Operation + public virtual GetStatementResultV2Response GetStatementResultV2(GetStatementResultV2Request request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = GetStatementResultV2RequestMarshaller.Instance; + options.ResponseUnmarshaller = GetStatementResultV2ResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// Fetches the temporarily cached result of an SQL statement in CSV format. The ExecuteStatement + /// or BatchExecuteStatement operation that ran the SQL statement must have specified + /// ResultFormat as CSV. A token is returned to page through the statement + /// results. + /// + /// + /// + /// For more information about the Amazon Redshift Data API and CLI usage examples, see + /// Using the + /// Amazon Redshift Data API in the Amazon Redshift Management Guide. + /// + /// + /// Container for the necessary parameters to execute the GetStatementResultV2 service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the GetStatementResultV2 service method, as returned by RedshiftDataAPIService. + /// + /// The Amazon Redshift Data API operation failed due to invalid input. + /// + /// + /// The Amazon Redshift Data API operation failed due to a missing resource. + /// + /// + /// The Amazon Redshift Data API operation failed due to invalid input. + /// + /// REST API Reference for GetStatementResultV2 Operation + public virtual Task GetStatementResultV2Async(GetStatementResultV2Request request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = GetStatementResultV2RequestMarshaller.Instance; + options.ResponseUnmarshaller = GetStatementResultV2ResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + #region ListDatabases diff --git a/sdk/src/Services/RedshiftDataAPIService/Properties/AssemblyInfo.cs b/sdk/src/Services/RedshiftDataAPIService/Properties/AssemblyInfo.cs index c5100f1b25fb..441150ebd0fa 100644 --- a/sdk/src/Services/RedshiftDataAPIService/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/RedshiftDataAPIService/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.13")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.402.11")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/RedshiftDataAPIService/RedshiftDataAPIService.sln b/sdk/src/Services/RedshiftDataAPIService/RedshiftDataAPIService.sln index c51f2edb58ea..6396756867b3 100644 --- a/sdk/src/Services/RedshiftDataAPIService/RedshiftDataAPIService.sln +++ b/sdk/src/Services/RedshiftDataAPIService/RedshiftDataAPIService.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {1B35A9F2-6FE7-4C0F-9E4D-7BA7DAE0BF4D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {1B35A9F2-6FE7-4C0F-9E4D-7BA7DAE0BF4D}.Debug|Any CPU.Build.0 = Debug|Any CPU {1B35A9F2-6FE7-4C0F-9E4D-7BA7DAE0BF4D}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {87C4605E-A148-4697-BD3E-62B49AA786EE}.Debug|Any CPU.Build.0 = Debug|Any CPU {87C4605E-A148-4697-BD3E-62B49AA786EE}.Release|Any CPU.ActiveCfg = Release|Any CPU {87C4605E-A148-4697-BD3E-62B49AA786EE}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {2D95407D-A7F8-4FD4-956D-26A63D9EB493}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2D95407D-A7F8-4FD4-956D-26A63D9EB493}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2D95407D-A7F8-4FD4-956D-26A63D9EB493}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2D95407D-A7F8-4FD4-956D-26A63D9EB493}.Release|Any CPU.Build.0 = Release|Any CPU - {83E034E5-9370-4E97-B547-6FF42F32CB78}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {83E034E5-9370-4E97-B547-6FF42F32CB78}.Debug|Any CPU.Build.0 = Debug|Any CPU - {83E034E5-9370-4E97-B547-6FF42F32CB78}.Release|Any CPU.ActiveCfg = Release|Any CPU - {83E034E5-9370-4E97-B547-6FF42F32CB78}.Release|Any CPU.Build.0 = Release|Any CPU - {6ECD726B-C598-402B-9A11-8DC153A4DE01}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6ECD726B-C598-402B-9A11-8DC153A4DE01}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6ECD726B-C598-402B-9A11-8DC153A4DE01}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6ECD726B-C598-402B-9A11-8DC153A4DE01}.Release|Any CPU.Build.0 = Release|Any CPU - {D76E433B-3B19-4233-A3A3-8035D08BFCB9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D76E433B-3B19-4233-A3A3-8035D08BFCB9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D76E433B-3B19-4233-A3A3-8035D08BFCB9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D76E433B-3B19-4233-A3A3-8035D08BFCB9}.Release|Any CPU.Build.0 = Release|Any CPU - {EC777C0D-9267-459C-A60E-FC8847A7E283}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EC777C0D-9267-459C-A60E-FC8847A7E283}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EC777C0D-9267-459C-A60E-FC8847A7E283}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EC777C0D-9267-459C-A60E-FC8847A7E283}.Release|Any CPU.Build.0 = Release|Any CPU - {7ED27F42-B48E-4A03-AB9E-FB83FC31AC11}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7ED27F42-B48E-4A03-AB9E-FB83FC31AC11}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7ED27F42-B48E-4A03-AB9E-FB83FC31AC11}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7ED27F42-B48E-4A03-AB9E-FB83FC31AC11}.Release|Any CPU.Build.0 = Release|Any CPU - {574401FE-822F-46F4-BF91-51048F993129}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {574401FE-822F-46F4-BF91-51048F993129}.Debug|Any CPU.Build.0 = Debug|Any CPU - {574401FE-822F-46F4-BF91-51048F993129}.Release|Any CPU.ActiveCfg = Release|Any CPU - {574401FE-822F-46F4-BF91-51048F993129}.Release|Any CPU.Build.0 = Release|Any CPU - {D5A7E4F1-3534-483A-A192-73AC10118D58}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D5A7E4F1-3534-483A-A192-73AC10118D58}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D5A7E4F1-3534-483A-A192-73AC10118D58}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D5A7E4F1-3534-483A-A192-73AC10118D58}.Release|Any CPU.Build.0 = Release|Any CPU - {6D254718-5C22-45DA-A4D3-AD584549F614}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6D254718-5C22-45DA-A4D3-AD584549F614}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6D254718-5C22-45DA-A4D3-AD584549F614}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6D254718-5C22-45DA-A4D3-AD584549F614}.Release|Any CPU.Build.0 = Release|Any CPU - {D1292773-BAFD-4F0B-AAFC-26887E047A01}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D1292773-BAFD-4F0B-AAFC-26887E047A01}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D1292773-BAFD-4F0B-AAFC-26887E047A01}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D1292773-BAFD-4F0B-AAFC-26887E047A01}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {2D95407D-A7F8-4FD4-956D-26A63D9EB493}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2D95407D-A7F8-4FD4-956D-26A63D9EB493}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2D95407D-A7F8-4FD4-956D-26A63D9EB493}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2D95407D-A7F8-4FD4-956D-26A63D9EB493}.Release|Any CPU.Build.0 = Release|Any CPU - {83E034E5-9370-4E97-B547-6FF42F32CB78}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {83E034E5-9370-4E97-B547-6FF42F32CB78}.Debug|Any CPU.Build.0 = Debug|Any CPU - {83E034E5-9370-4E97-B547-6FF42F32CB78}.Release|Any CPU.ActiveCfg = Release|Any CPU - {83E034E5-9370-4E97-B547-6FF42F32CB78}.Release|Any CPU.Build.0 = Release|Any CPU - {6ECD726B-C598-402B-9A11-8DC153A4DE01}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6ECD726B-C598-402B-9A11-8DC153A4DE01}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6ECD726B-C598-402B-9A11-8DC153A4DE01}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6ECD726B-C598-402B-9A11-8DC153A4DE01}.Release|Any CPU.Build.0 = Release|Any CPU - {D76E433B-3B19-4233-A3A3-8035D08BFCB9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D76E433B-3B19-4233-A3A3-8035D08BFCB9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D76E433B-3B19-4233-A3A3-8035D08BFCB9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D76E433B-3B19-4233-A3A3-8035D08BFCB9}.Release|Any CPU.Build.0 = Release|Any CPU - {EC777C0D-9267-459C-A60E-FC8847A7E283}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EC777C0D-9267-459C-A60E-FC8847A7E283}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EC777C0D-9267-459C-A60E-FC8847A7E283}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EC777C0D-9267-459C-A60E-FC8847A7E283}.Release|Any CPU.Build.0 = Release|Any CPU - {7ED27F42-B48E-4A03-AB9E-FB83FC31AC11}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7ED27F42-B48E-4A03-AB9E-FB83FC31AC11}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7ED27F42-B48E-4A03-AB9E-FB83FC31AC11}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7ED27F42-B48E-4A03-AB9E-FB83FC31AC11}.Release|Any CPU.Build.0 = Release|Any CPU - {574401FE-822F-46F4-BF91-51048F993129}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {574401FE-822F-46F4-BF91-51048F993129}.Debug|Any CPU.Build.0 = Debug|Any CPU - {574401FE-822F-46F4-BF91-51048F993129}.Release|Any CPU.ActiveCfg = Release|Any CPU - {574401FE-822F-46F4-BF91-51048F993129}.Release|Any CPU.Build.0 = Release|Any CPU - {D5A7E4F1-3534-483A-A192-73AC10118D58}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D5A7E4F1-3534-483A-A192-73AC10118D58}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D5A7E4F1-3534-483A-A192-73AC10118D58}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D5A7E4F1-3534-483A-A192-73AC10118D58}.Release|Any CPU.Build.0 = Release|Any CPU - {6D254718-5C22-45DA-A4D3-AD584549F614}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6D254718-5C22-45DA-A4D3-AD584549F614}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6D254718-5C22-45DA-A4D3-AD584549F614}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6D254718-5C22-45DA-A4D3-AD584549F614}.Release|Any CPU.Build.0 = Release|Any CPU - {D1292773-BAFD-4F0B-AAFC-26887E047A01}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D1292773-BAFD-4F0B-AAFC-26887E047A01}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D1292773-BAFD-4F0B-AAFC-26887E047A01}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D1292773-BAFD-4F0B-AAFC-26887E047A01}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {1B35A9F2-6FE7-4C0F-9E4D-7BA7DAE0BF4D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {F6AA130A-4D60-47E2-8BA1-9C5C2742BCB0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {A5705B8C-254D-4794-81A0-FB98E4AB2583} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {4407DAF4-94F6-4F61-8111-F514F6D7AEF3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {87C4605E-A148-4697-BD3E-62B49AA786EE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {2D95407D-A7F8-4FD4-956D-26A63D9EB493} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {83E034E5-9370-4E97-B547-6FF42F32CB78} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6ECD726B-C598-402B-9A11-8DC153A4DE01} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D76E433B-3B19-4233-A3A3-8035D08BFCB9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {EC777C0D-9267-459C-A60E-FC8847A7E283} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {7ED27F42-B48E-4A03-AB9E-FB83FC31AC11} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {574401FE-822F-46F4-BF91-51048F993129} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D5A7E4F1-3534-483A-A192-73AC10118D58} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6D254718-5C22-45DA-A4D3-AD584549F614} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D1292773-BAFD-4F0B-AAFC-26887E047A01} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {2D95407D-A7F8-4FD4-956D-26A63D9EB493} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {83E034E5-9370-4E97-B547-6FF42F32CB78} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6ECD726B-C598-402B-9A11-8DC153A4DE01} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D76E433B-3B19-4233-A3A3-8035D08BFCB9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {EC777C0D-9267-459C-A60E-FC8847A7E283} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {7ED27F42-B48E-4A03-AB9E-FB83FC31AC11} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {574401FE-822F-46F4-BF91-51048F993129} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D5A7E4F1-3534-483A-A192-73AC10118D58} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6D254718-5C22-45DA-A4D3-AD584549F614} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D1292773-BAFD-4F0B-AAFC-26887E047A01} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {0E1370E7-8943-4E92-86CF-E5A2B18E3437} diff --git a/sdk/src/Services/RedshiftServerless/Generated/AmazonRedshiftServerlessConfig.cs b/sdk/src/Services/RedshiftServerless/Generated/AmazonRedshiftServerlessConfig.cs index 5838db83787d..76235d65744a 100644 --- a/sdk/src/Services/RedshiftServerless/Generated/AmazonRedshiftServerlessConfig.cs +++ b/sdk/src/Services/RedshiftServerless/Generated/AmazonRedshiftServerlessConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.RedshiftServerless public partial class AmazonRedshiftServerlessConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("Redshift Serverless", "4.0.0.0"); private static readonly AmazonRedshiftServerlessEndpointResolver EndpointResolver = new AmazonRedshiftServerlessEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("Redshift Serverless", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("Redshift Serverless", "3.7.401.10"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/RedshiftServerless/Generated/Model/Internal/MarshallTransformations/CreateWorkgroupRequestMarshaller.cs b/sdk/src/Services/RedshiftServerless/Generated/Model/Internal/MarshallTransformations/CreateWorkgroupRequestMarshaller.cs index 8cfab6480896..33335046411c 100644 --- a/sdk/src/Services/RedshiftServerless/Generated/Model/Internal/MarshallTransformations/CreateWorkgroupRequestMarshaller.cs +++ b/sdk/src/Services/RedshiftServerless/Generated/Model/Internal/MarshallTransformations/CreateWorkgroupRequestMarshaller.cs @@ -117,36 +117,22 @@ public IRequest Marshall(CreateWorkgroupRequest publicRequest) context.Writer.Write(publicRequest.NamespaceName); } -<<<<<<< HEAD if(publicRequest.IsSetPort()) { context.Writer.WritePropertyName("port"); context.Writer.Write(publicRequest.Port.Value); } -||||||| Commit version number update changes - if(publicRequest.IsSetPubliclyAccessible()) - { - context.Writer.WritePropertyName("publiclyAccessible"); - context.Writer.Write(publicRequest.PubliclyAccessible); - } -======= - if(publicRequest.IsSetPricePerformanceTarget()) - { - context.Writer.WritePropertyName("pricePerformanceTarget"); - context.Writer.WriteObjectStart(); - var marshaller = PerformanceTargetMarshaller.Instance; - marshaller.Marshall(publicRequest.PricePerformanceTarget, context); + if(publicRequest.IsSetPricePerformanceTarget()) + { + context.Writer.WritePropertyName("pricePerformanceTarget"); + context.Writer.WriteObjectStart(); - context.Writer.WriteObjectEnd(); - } + var marshaller = PerformanceTargetMarshaller.Instance; + marshaller.Marshall(publicRequest.PricePerformanceTarget, context); - if(publicRequest.IsSetPubliclyAccessible()) - { - context.Writer.WritePropertyName("publiclyAccessible"); - context.Writer.Write(publicRequest.PubliclyAccessible); - } ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b + context.Writer.WriteObjectEnd(); + } if(publicRequest.IsSetPubliclyAccessible()) { diff --git a/sdk/src/Services/RedshiftServerless/Generated/Model/Internal/MarshallTransformations/PerformanceTargetMarshaller.cs b/sdk/src/Services/RedshiftServerless/Generated/Model/Internal/MarshallTransformations/PerformanceTargetMarshaller.cs index e029b5decdbe..610a3625f72a 100644 --- a/sdk/src/Services/RedshiftServerless/Generated/Model/Internal/MarshallTransformations/PerformanceTargetMarshaller.cs +++ b/sdk/src/Services/RedshiftServerless/Generated/Model/Internal/MarshallTransformations/PerformanceTargetMarshaller.cs @@ -51,7 +51,7 @@ public void Marshall(PerformanceTarget requestObject, JsonMarshallerContext cont if(requestObject.IsSetLevel()) { context.Writer.WritePropertyName("level"); - context.Writer.Write(requestObject.Level); + context.Writer.Write(requestObject.Level.Value); } if(requestObject.IsSetStatus()) diff --git a/sdk/src/Services/RedshiftServerless/Generated/Model/Internal/MarshallTransformations/PerformanceTargetUnmarshaller.cs b/sdk/src/Services/RedshiftServerless/Generated/Model/Internal/MarshallTransformations/PerformanceTargetUnmarshaller.cs index c37193d355ef..0ba14ed7cabc 100644 --- a/sdk/src/Services/RedshiftServerless/Generated/Model/Internal/MarshallTransformations/PerformanceTargetUnmarshaller.cs +++ b/sdk/src/Services/RedshiftServerless/Generated/Model/Internal/MarshallTransformations/PerformanceTargetUnmarshaller.cs @@ -68,7 +68,7 @@ public PerformanceTarget Unmarshall(JsonUnmarshallerContext context) { if (context.TestExpression("level", targetDepth)) { - var unmarshaller = IntUnmarshaller.Instance; + var unmarshaller = NullableIntUnmarshaller.Instance; unmarshalledObject.Level = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/RedshiftServerless/Generated/Model/Internal/MarshallTransformations/UpdateWorkgroupRequestMarshaller.cs b/sdk/src/Services/RedshiftServerless/Generated/Model/Internal/MarshallTransformations/UpdateWorkgroupRequestMarshaller.cs index 9984aec86a2c..76275ea66d2d 100644 --- a/sdk/src/Services/RedshiftServerless/Generated/Model/Internal/MarshallTransformations/UpdateWorkgroupRequestMarshaller.cs +++ b/sdk/src/Services/RedshiftServerless/Generated/Model/Internal/MarshallTransformations/UpdateWorkgroupRequestMarshaller.cs @@ -117,13 +117,23 @@ public IRequest Marshall(UpdateWorkgroupRequest publicRequest) context.Writer.Write(publicRequest.Port.Value); } + if(publicRequest.IsSetPricePerformanceTarget()) + { + context.Writer.WritePropertyName("pricePerformanceTarget"); + context.Writer.WriteObjectStart(); + + var marshaller = PerformanceTargetMarshaller.Instance; + marshaller.Marshall(publicRequest.PricePerformanceTarget, context); + + context.Writer.WriteObjectEnd(); + } + if(publicRequest.IsSetPubliclyAccessible()) { context.Writer.WritePropertyName("publiclyAccessible"); context.Writer.Write(publicRequest.PubliclyAccessible.Value); } -<<<<<<< HEAD if(publicRequest.IsSetSecurityGroupIds()) { context.Writer.WritePropertyName("securityGroupIds"); @@ -134,30 +144,6 @@ public IRequest Marshall(UpdateWorkgroupRequest publicRequest) } context.Writer.WriteArrayEnd(); } -||||||| Commit version number update changes - if(publicRequest.IsSetPubliclyAccessible()) - { - context.Writer.WritePropertyName("publiclyAccessible"); - context.Writer.Write(publicRequest.PubliclyAccessible); - } -======= - if(publicRequest.IsSetPricePerformanceTarget()) - { - context.Writer.WritePropertyName("pricePerformanceTarget"); - context.Writer.WriteObjectStart(); - - var marshaller = PerformanceTargetMarshaller.Instance; - marshaller.Marshall(publicRequest.PricePerformanceTarget, context); - - context.Writer.WriteObjectEnd(); - } - - if(publicRequest.IsSetPubliclyAccessible()) - { - context.Writer.WritePropertyName("publiclyAccessible"); - context.Writer.Write(publicRequest.PubliclyAccessible); - } ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b if(publicRequest.IsSetSubnetIds()) { diff --git a/sdk/src/Services/RedshiftServerless/Generated/Model/PerformanceTarget.cs b/sdk/src/Services/RedshiftServerless/Generated/Model/PerformanceTarget.cs index ab020578960e..32bffb23ec34 100644 --- a/sdk/src/Services/RedshiftServerless/Generated/Model/PerformanceTarget.cs +++ b/sdk/src/Services/RedshiftServerless/Generated/Model/PerformanceTarget.cs @@ -46,9 +46,9 @@ public partial class PerformanceTarget /// /// [AWSProperty(Min=1, Max=100)] - public int Level + public int? Level { - get { return this._level.GetValueOrDefault(); } + get { return this._level; } set { this._level = value; } } diff --git a/sdk/src/Services/RedshiftServerless/Properties/AssemblyInfo.cs b/sdk/src/Services/RedshiftServerless/Properties/AssemblyInfo.cs index 1aeec4c14f65..77895264a4e1 100644 --- a/sdk/src/Services/RedshiftServerless/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/RedshiftServerless/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.10")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/RedshiftServerless/RedshiftServerless.sln b/sdk/src/Services/RedshiftServerless/RedshiftServerless.sln index 6ea5d7530110..5c1ffe4c278d 100644 --- a/sdk/src/Services/RedshiftServerless/RedshiftServerless.sln +++ b/sdk/src/Services/RedshiftServerless/RedshiftServerless.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {FD342732-5699-497D-81D7-F2AAD672F637}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {FD342732-5699-497D-81D7-F2AAD672F637}.Debug|Any CPU.Build.0 = Debug|Any CPU {FD342732-5699-497D-81D7-F2AAD672F637}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {B03CAB9E-308D-4BC2-A54E-4EAE961DA1CB}.Debug|Any CPU.Build.0 = Debug|Any CPU {B03CAB9E-308D-4BC2-A54E-4EAE961DA1CB}.Release|Any CPU.ActiveCfg = Release|Any CPU {B03CAB9E-308D-4BC2-A54E-4EAE961DA1CB}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {58FEF705-5192-4D0D-A9F9-9035B90211FF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {58FEF705-5192-4D0D-A9F9-9035B90211FF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {58FEF705-5192-4D0D-A9F9-9035B90211FF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {58FEF705-5192-4D0D-A9F9-9035B90211FF}.Release|Any CPU.Build.0 = Release|Any CPU - {90E4E691-705D-4EE4-933E-80D1C60DAAAE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {90E4E691-705D-4EE4-933E-80D1C60DAAAE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {90E4E691-705D-4EE4-933E-80D1C60DAAAE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {90E4E691-705D-4EE4-933E-80D1C60DAAAE}.Release|Any CPU.Build.0 = Release|Any CPU - {79CBC1AB-4423-433B-9D7D-E672DF2B29E8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {79CBC1AB-4423-433B-9D7D-E672DF2B29E8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {79CBC1AB-4423-433B-9D7D-E672DF2B29E8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {79CBC1AB-4423-433B-9D7D-E672DF2B29E8}.Release|Any CPU.Build.0 = Release|Any CPU - {575138CC-A395-4EEE-8674-104DDF1B81D5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {575138CC-A395-4EEE-8674-104DDF1B81D5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {575138CC-A395-4EEE-8674-104DDF1B81D5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {575138CC-A395-4EEE-8674-104DDF1B81D5}.Release|Any CPU.Build.0 = Release|Any CPU - {9B1F10A1-717C-46E4-AA67-0C2EFF955112}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9B1F10A1-717C-46E4-AA67-0C2EFF955112}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9B1F10A1-717C-46E4-AA67-0C2EFF955112}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9B1F10A1-717C-46E4-AA67-0C2EFF955112}.Release|Any CPU.Build.0 = Release|Any CPU - {8475EF2D-07BC-4986-B962-39036C61D276}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8475EF2D-07BC-4986-B962-39036C61D276}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8475EF2D-07BC-4986-B962-39036C61D276}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8475EF2D-07BC-4986-B962-39036C61D276}.Release|Any CPU.Build.0 = Release|Any CPU - {7268E117-9058-4136-9F3A-6855E19838BB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7268E117-9058-4136-9F3A-6855E19838BB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7268E117-9058-4136-9F3A-6855E19838BB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7268E117-9058-4136-9F3A-6855E19838BB}.Release|Any CPU.Build.0 = Release|Any CPU - {D859DA0B-E4DA-4283-A793-A9FEFD5D1844}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D859DA0B-E4DA-4283-A793-A9FEFD5D1844}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D859DA0B-E4DA-4283-A793-A9FEFD5D1844}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D859DA0B-E4DA-4283-A793-A9FEFD5D1844}.Release|Any CPU.Build.0 = Release|Any CPU - {60C0CE87-11C7-420E-BA6C-72FE5F23CDD4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {60C0CE87-11C7-420E-BA6C-72FE5F23CDD4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {60C0CE87-11C7-420E-BA6C-72FE5F23CDD4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {60C0CE87-11C7-420E-BA6C-72FE5F23CDD4}.Release|Any CPU.Build.0 = Release|Any CPU - {2523B321-1B48-4221-B4F8-1397DBFB3B07}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2523B321-1B48-4221-B4F8-1397DBFB3B07}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2523B321-1B48-4221-B4F8-1397DBFB3B07}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2523B321-1B48-4221-B4F8-1397DBFB3B07}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {58FEF705-5192-4D0D-A9F9-9035B90211FF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {58FEF705-5192-4D0D-A9F9-9035B90211FF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {58FEF705-5192-4D0D-A9F9-9035B90211FF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {58FEF705-5192-4D0D-A9F9-9035B90211FF}.Release|Any CPU.Build.0 = Release|Any CPU - {90E4E691-705D-4EE4-933E-80D1C60DAAAE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {90E4E691-705D-4EE4-933E-80D1C60DAAAE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {90E4E691-705D-4EE4-933E-80D1C60DAAAE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {90E4E691-705D-4EE4-933E-80D1C60DAAAE}.Release|Any CPU.Build.0 = Release|Any CPU - {79CBC1AB-4423-433B-9D7D-E672DF2B29E8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {79CBC1AB-4423-433B-9D7D-E672DF2B29E8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {79CBC1AB-4423-433B-9D7D-E672DF2B29E8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {79CBC1AB-4423-433B-9D7D-E672DF2B29E8}.Release|Any CPU.Build.0 = Release|Any CPU - {575138CC-A395-4EEE-8674-104DDF1B81D5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {575138CC-A395-4EEE-8674-104DDF1B81D5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {575138CC-A395-4EEE-8674-104DDF1B81D5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {575138CC-A395-4EEE-8674-104DDF1B81D5}.Release|Any CPU.Build.0 = Release|Any CPU - {9B1F10A1-717C-46E4-AA67-0C2EFF955112}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9B1F10A1-717C-46E4-AA67-0C2EFF955112}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9B1F10A1-717C-46E4-AA67-0C2EFF955112}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9B1F10A1-717C-46E4-AA67-0C2EFF955112}.Release|Any CPU.Build.0 = Release|Any CPU - {8475EF2D-07BC-4986-B962-39036C61D276}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8475EF2D-07BC-4986-B962-39036C61D276}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8475EF2D-07BC-4986-B962-39036C61D276}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8475EF2D-07BC-4986-B962-39036C61D276}.Release|Any CPU.Build.0 = Release|Any CPU - {7268E117-9058-4136-9F3A-6855E19838BB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7268E117-9058-4136-9F3A-6855E19838BB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7268E117-9058-4136-9F3A-6855E19838BB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7268E117-9058-4136-9F3A-6855E19838BB}.Release|Any CPU.Build.0 = Release|Any CPU - {D859DA0B-E4DA-4283-A793-A9FEFD5D1844}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D859DA0B-E4DA-4283-A793-A9FEFD5D1844}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D859DA0B-E4DA-4283-A793-A9FEFD5D1844}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D859DA0B-E4DA-4283-A793-A9FEFD5D1844}.Release|Any CPU.Build.0 = Release|Any CPU - {60C0CE87-11C7-420E-BA6C-72FE5F23CDD4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {60C0CE87-11C7-420E-BA6C-72FE5F23CDD4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {60C0CE87-11C7-420E-BA6C-72FE5F23CDD4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {60C0CE87-11C7-420E-BA6C-72FE5F23CDD4}.Release|Any CPU.Build.0 = Release|Any CPU - {2523B321-1B48-4221-B4F8-1397DBFB3B07}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2523B321-1B48-4221-B4F8-1397DBFB3B07}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2523B321-1B48-4221-B4F8-1397DBFB3B07}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2523B321-1B48-4221-B4F8-1397DBFB3B07}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {FD342732-5699-497D-81D7-F2AAD672F637} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {289024B9-7360-4A8C-A731-84B6F7E7FAC1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {AAA29F84-CD60-46A8-B149-9AE4B07278BE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {A4511595-098A-4351-A89E-280B5FE204FF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {B03CAB9E-308D-4BC2-A54E-4EAE961DA1CB} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {58FEF705-5192-4D0D-A9F9-9035B90211FF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {90E4E691-705D-4EE4-933E-80D1C60DAAAE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {79CBC1AB-4423-433B-9D7D-E672DF2B29E8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {575138CC-A395-4EEE-8674-104DDF1B81D5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {9B1F10A1-717C-46E4-AA67-0C2EFF955112} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8475EF2D-07BC-4986-B962-39036C61D276} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {7268E117-9058-4136-9F3A-6855E19838BB} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D859DA0B-E4DA-4283-A793-A9FEFD5D1844} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {60C0CE87-11C7-420E-BA6C-72FE5F23CDD4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {2523B321-1B48-4221-B4F8-1397DBFB3B07} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {58FEF705-5192-4D0D-A9F9-9035B90211FF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {90E4E691-705D-4EE4-933E-80D1C60DAAAE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {79CBC1AB-4423-433B-9D7D-E672DF2B29E8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {575138CC-A395-4EEE-8674-104DDF1B81D5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {9B1F10A1-717C-46E4-AA67-0C2EFF955112} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8475EF2D-07BC-4986-B962-39036C61D276} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {7268E117-9058-4136-9F3A-6855E19838BB} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D859DA0B-E4DA-4283-A793-A9FEFD5D1844} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {60C0CE87-11C7-420E-BA6C-72FE5F23CDD4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {2523B321-1B48-4221-B4F8-1397DBFB3B07} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {BA24DAB3-F8AA-43F0-A787-751BB8A5125A} diff --git a/sdk/src/Services/Rekognition/Generated/AmazonRekognitionConfig.cs b/sdk/src/Services/Rekognition/Generated/AmazonRekognitionConfig.cs index 1f9f38d35eb7..ffaa2c17b2c1 100644 --- a/sdk/src/Services/Rekognition/Generated/AmazonRekognitionConfig.cs +++ b/sdk/src/Services/Rekognition/Generated/AmazonRekognitionConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.Rekognition public partial class AmazonRekognitionConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("Rekognition", "4.0.0.0"); private static readonly AmazonRekognitionEndpointResolver EndpointResolver = new AmazonRekognitionEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("Rekognition", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("Rekognition", "3.7.400.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/Rekognition/Properties/AssemblyInfo.cs b/sdk/src/Services/Rekognition/Properties/AssemblyInfo.cs index 910ea432ed06..45623ceb9572 100644 --- a/sdk/src/Services/Rekognition/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/Rekognition/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/Rekognition/Rekognition.sln b/sdk/src/Services/Rekognition/Rekognition.sln index b376f7af19e0..2b1a030c373c 100644 --- a/sdk/src/Services/Rekognition/Rekognition.sln +++ b/sdk/src/Services/Rekognition/Rekognition.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {B4975820-81F3-4549-8214-8A4EE00AE832}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {B4975820-81F3-4549-8214-8A4EE00AE832}.Debug|Any CPU.Build.0 = Debug|Any CPU {B4975820-81F3-4549-8214-8A4EE00AE832}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {A34FC24B-1160-4B1E-BE95-4918FAB59473}.Debug|Any CPU.Build.0 = Debug|Any CPU {A34FC24B-1160-4B1E-BE95-4918FAB59473}.Release|Any CPU.ActiveCfg = Release|Any CPU {A34FC24B-1160-4B1E-BE95-4918FAB59473}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {5578C659-C543-4AE4-A06E-7D8B9F1E4448}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5578C659-C543-4AE4-A06E-7D8B9F1E4448}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5578C659-C543-4AE4-A06E-7D8B9F1E4448}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5578C659-C543-4AE4-A06E-7D8B9F1E4448}.Release|Any CPU.Build.0 = Release|Any CPU - {6A12FA05-E343-402B-B611-0EF775F94B9A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6A12FA05-E343-402B-B611-0EF775F94B9A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6A12FA05-E343-402B-B611-0EF775F94B9A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6A12FA05-E343-402B-B611-0EF775F94B9A}.Release|Any CPU.Build.0 = Release|Any CPU - {0E26D2B8-B8CE-4809-9D0C-75FE8A377655}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0E26D2B8-B8CE-4809-9D0C-75FE8A377655}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0E26D2B8-B8CE-4809-9D0C-75FE8A377655}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0E26D2B8-B8CE-4809-9D0C-75FE8A377655}.Release|Any CPU.Build.0 = Release|Any CPU - {CE47FDF4-6D22-4E52-BD6D-4BE1836F0457}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CE47FDF4-6D22-4E52-BD6D-4BE1836F0457}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CE47FDF4-6D22-4E52-BD6D-4BE1836F0457}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CE47FDF4-6D22-4E52-BD6D-4BE1836F0457}.Release|Any CPU.Build.0 = Release|Any CPU - {96250786-5847-4D15-A69E-23599C66B46E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {96250786-5847-4D15-A69E-23599C66B46E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {96250786-5847-4D15-A69E-23599C66B46E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {96250786-5847-4D15-A69E-23599C66B46E}.Release|Any CPU.Build.0 = Release|Any CPU - {B74CAC04-31B3-4640-AFF2-D16062134844}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B74CAC04-31B3-4640-AFF2-D16062134844}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B74CAC04-31B3-4640-AFF2-D16062134844}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B74CAC04-31B3-4640-AFF2-D16062134844}.Release|Any CPU.Build.0 = Release|Any CPU - {F26AE976-4E9F-4288-9C10-03445B7BDA51}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F26AE976-4E9F-4288-9C10-03445B7BDA51}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F26AE976-4E9F-4288-9C10-03445B7BDA51}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F26AE976-4E9F-4288-9C10-03445B7BDA51}.Release|Any CPU.Build.0 = Release|Any CPU - {A636B855-C757-425A-9656-EB9FA33750EB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A636B855-C757-425A-9656-EB9FA33750EB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A636B855-C757-425A-9656-EB9FA33750EB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A636B855-C757-425A-9656-EB9FA33750EB}.Release|Any CPU.Build.0 = Release|Any CPU - {C875D9C7-F2A2-4CEA-9D3F-38A5763AB016}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C875D9C7-F2A2-4CEA-9D3F-38A5763AB016}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C875D9C7-F2A2-4CEA-9D3F-38A5763AB016}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C875D9C7-F2A2-4CEA-9D3F-38A5763AB016}.Release|Any CPU.Build.0 = Release|Any CPU - {1D2A28B6-9126-4F9C-ADB8-8AF527777B41}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1D2A28B6-9126-4F9C-ADB8-8AF527777B41}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1D2A28B6-9126-4F9C-ADB8-8AF527777B41}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1D2A28B6-9126-4F9C-ADB8-8AF527777B41}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {5578C659-C543-4AE4-A06E-7D8B9F1E4448}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5578C659-C543-4AE4-A06E-7D8B9F1E4448}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5578C659-C543-4AE4-A06E-7D8B9F1E4448}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5578C659-C543-4AE4-A06E-7D8B9F1E4448}.Release|Any CPU.Build.0 = Release|Any CPU - {6A12FA05-E343-402B-B611-0EF775F94B9A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6A12FA05-E343-402B-B611-0EF775F94B9A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6A12FA05-E343-402B-B611-0EF775F94B9A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6A12FA05-E343-402B-B611-0EF775F94B9A}.Release|Any CPU.Build.0 = Release|Any CPU - {0E26D2B8-B8CE-4809-9D0C-75FE8A377655}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0E26D2B8-B8CE-4809-9D0C-75FE8A377655}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0E26D2B8-B8CE-4809-9D0C-75FE8A377655}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0E26D2B8-B8CE-4809-9D0C-75FE8A377655}.Release|Any CPU.Build.0 = Release|Any CPU - {CE47FDF4-6D22-4E52-BD6D-4BE1836F0457}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CE47FDF4-6D22-4E52-BD6D-4BE1836F0457}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CE47FDF4-6D22-4E52-BD6D-4BE1836F0457}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CE47FDF4-6D22-4E52-BD6D-4BE1836F0457}.Release|Any CPU.Build.0 = Release|Any CPU - {96250786-5847-4D15-A69E-23599C66B46E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {96250786-5847-4D15-A69E-23599C66B46E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {96250786-5847-4D15-A69E-23599C66B46E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {96250786-5847-4D15-A69E-23599C66B46E}.Release|Any CPU.Build.0 = Release|Any CPU - {B74CAC04-31B3-4640-AFF2-D16062134844}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B74CAC04-31B3-4640-AFF2-D16062134844}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B74CAC04-31B3-4640-AFF2-D16062134844}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B74CAC04-31B3-4640-AFF2-D16062134844}.Release|Any CPU.Build.0 = Release|Any CPU - {F26AE976-4E9F-4288-9C10-03445B7BDA51}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F26AE976-4E9F-4288-9C10-03445B7BDA51}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F26AE976-4E9F-4288-9C10-03445B7BDA51}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F26AE976-4E9F-4288-9C10-03445B7BDA51}.Release|Any CPU.Build.0 = Release|Any CPU - {A636B855-C757-425A-9656-EB9FA33750EB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A636B855-C757-425A-9656-EB9FA33750EB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A636B855-C757-425A-9656-EB9FA33750EB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A636B855-C757-425A-9656-EB9FA33750EB}.Release|Any CPU.Build.0 = Release|Any CPU - {C875D9C7-F2A2-4CEA-9D3F-38A5763AB016}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C875D9C7-F2A2-4CEA-9D3F-38A5763AB016}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C875D9C7-F2A2-4CEA-9D3F-38A5763AB016}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C875D9C7-F2A2-4CEA-9D3F-38A5763AB016}.Release|Any CPU.Build.0 = Release|Any CPU - {1D2A28B6-9126-4F9C-ADB8-8AF527777B41}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1D2A28B6-9126-4F9C-ADB8-8AF527777B41}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1D2A28B6-9126-4F9C-ADB8-8AF527777B41}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1D2A28B6-9126-4F9C-ADB8-8AF527777B41}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {B4975820-81F3-4549-8214-8A4EE00AE832} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {ED0C13FD-6D32-4B12-BE70-977B458E2948} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {536868E3-94E7-4AD2-A7BD-97EC62EA338A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {CD2DE7AA-80E7-45A5-9F36-0B02A9031FA3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {A34FC24B-1160-4B1E-BE95-4918FAB59473} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {5578C659-C543-4AE4-A06E-7D8B9F1E4448} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6A12FA05-E343-402B-B611-0EF775F94B9A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0E26D2B8-B8CE-4809-9D0C-75FE8A377655} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {CE47FDF4-6D22-4E52-BD6D-4BE1836F0457} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {96250786-5847-4D15-A69E-23599C66B46E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B74CAC04-31B3-4640-AFF2-D16062134844} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F26AE976-4E9F-4288-9C10-03445B7BDA51} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A636B855-C757-425A-9656-EB9FA33750EB} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C875D9C7-F2A2-4CEA-9D3F-38A5763AB016} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {1D2A28B6-9126-4F9C-ADB8-8AF527777B41} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {5578C659-C543-4AE4-A06E-7D8B9F1E4448} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6A12FA05-E343-402B-B611-0EF775F94B9A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0E26D2B8-B8CE-4809-9D0C-75FE8A377655} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {CE47FDF4-6D22-4E52-BD6D-4BE1836F0457} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {96250786-5847-4D15-A69E-23599C66B46E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B74CAC04-31B3-4640-AFF2-D16062134844} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F26AE976-4E9F-4288-9C10-03445B7BDA51} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A636B855-C757-425A-9656-EB9FA33750EB} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C875D9C7-F2A2-4CEA-9D3F-38A5763AB016} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {1D2A28B6-9126-4F9C-ADB8-8AF527777B41} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {00C7E536-47EB-48F8-8E4F-0DFC6C827629} diff --git a/sdk/src/Services/Repostspace/Generated/AmazonRepostspaceConfig.cs b/sdk/src/Services/Repostspace/Generated/AmazonRepostspaceConfig.cs index 26463662d9bb..e75d810f3ea6 100644 --- a/sdk/src/Services/Repostspace/Generated/AmazonRepostspaceConfig.cs +++ b/sdk/src/Services/Repostspace/Generated/AmazonRepostspaceConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.Repostspace public partial class AmazonRepostspaceConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("repostspace", "4.0.0.0"); private static readonly AmazonRepostspaceEndpointResolver EndpointResolver = new AmazonRepostspaceEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("repostspace", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("repostspace", "3.7.401.16"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/Repostspace/Generated/Model/BatchError.cs b/sdk/src/Services/Repostspace/Generated/Model/BatchError.cs index a1200534b47a..5820fa866e3c 100644 --- a/sdk/src/Services/Repostspace/Generated/Model/BatchError.cs +++ b/sdk/src/Services/Repostspace/Generated/Model/BatchError.cs @@ -64,9 +64,9 @@ internal bool IsSetAccessorId() /// /// [AWSProperty(Required=true)] - public int Error + public int? Error { - get { return this._error.GetValueOrDefault(); } + get { return this._error; } set { this._error = value; } } diff --git a/sdk/src/Services/Repostspace/Generated/Model/Internal/MarshallTransformations/BatchAddRoleRequestMarshaller.cs b/sdk/src/Services/Repostspace/Generated/Model/Internal/MarshallTransformations/BatchAddRoleRequestMarshaller.cs index 0a5ed4f5a967..87b700e27ad0 100644 --- a/sdk/src/Services/Repostspace/Generated/Model/Internal/MarshallTransformations/BatchAddRoleRequestMarshaller.cs +++ b/sdk/src/Services/Repostspace/Generated/Model/Internal/MarshallTransformations/BatchAddRoleRequestMarshaller.cs @@ -64,32 +64,35 @@ public IRequest Marshall(BatchAddRoleRequest publicRequest) throw new AmazonRepostspaceException("Request object does not have required field SpaceId set"); request.AddPathResource("{spaceId}", StringUtils.FromString(publicRequest.SpaceId)); request.ResourcePath = "/spaces/{spaceId}/roles"; - using (StringWriter stringWriter = new StringWriter(CultureInfo.InvariantCulture)) + using (MemoryStream memoryStream = new MemoryStream()) { - JsonWriter writer = new JsonWriter(stringWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetAccessorIds()) + using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) { - context.Writer.WritePropertyName("accessorIds"); - context.Writer.WriteArrayStart(); - foreach(var publicRequestAccessorIdsListValue in publicRequest.AccessorIds) + JsonWriter writer = new JsonWriter(streamWriter); + writer.Validate = false; + writer.WriteObjectStart(); + var context = new JsonMarshallerContext(request, writer); + if(publicRequest.IsSetAccessorIds()) { - context.Writer.Write(publicRequestAccessorIdsListValue); + context.Writer.WritePropertyName("accessorIds"); + context.Writer.WriteArrayStart(); + foreach(var publicRequestAccessorIdsListValue in publicRequest.AccessorIds) + { + context.Writer.Write(publicRequestAccessorIdsListValue); + } + context.Writer.WriteArrayEnd(); } - context.Writer.WriteArrayEnd(); - } - if(publicRequest.IsSetRole()) - { - context.Writer.WritePropertyName("role"); - context.Writer.Write(publicRequest.Role); + if(publicRequest.IsSetRole()) + { + context.Writer.WritePropertyName("role"); + context.Writer.Write(publicRequest.Role); + } + + writer.WriteObjectEnd(); } - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); + request.Content = memoryStream.ToArray(); } diff --git a/sdk/src/Services/Repostspace/Generated/Model/Internal/MarshallTransformations/BatchErrorUnmarshaller.cs b/sdk/src/Services/Repostspace/Generated/Model/Internal/MarshallTransformations/BatchErrorUnmarshaller.cs index 8bfaf7897ae0..e149aeebef32 100644 --- a/sdk/src/Services/Repostspace/Generated/Model/Internal/MarshallTransformations/BatchErrorUnmarshaller.cs +++ b/sdk/src/Services/Repostspace/Generated/Model/Internal/MarshallTransformations/BatchErrorUnmarshaller.cs @@ -74,7 +74,7 @@ public BatchError Unmarshall(JsonUnmarshallerContext context) } if (context.TestExpression("error", targetDepth)) { - var unmarshaller = IntUnmarshaller.Instance; + var unmarshaller = NullableIntUnmarshaller.Instance; unmarshalledObject.Error = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/Repostspace/Generated/Model/Internal/MarshallTransformations/BatchRemoveRoleRequestMarshaller.cs b/sdk/src/Services/Repostspace/Generated/Model/Internal/MarshallTransformations/BatchRemoveRoleRequestMarshaller.cs index 1f85d27acb86..a66dd335188f 100644 --- a/sdk/src/Services/Repostspace/Generated/Model/Internal/MarshallTransformations/BatchRemoveRoleRequestMarshaller.cs +++ b/sdk/src/Services/Repostspace/Generated/Model/Internal/MarshallTransformations/BatchRemoveRoleRequestMarshaller.cs @@ -64,32 +64,35 @@ public IRequest Marshall(BatchRemoveRoleRequest publicRequest) throw new AmazonRepostspaceException("Request object does not have required field SpaceId set"); request.AddPathResource("{spaceId}", StringUtils.FromString(publicRequest.SpaceId)); request.ResourcePath = "/spaces/{spaceId}/roles"; - using (StringWriter stringWriter = new StringWriter(CultureInfo.InvariantCulture)) + using (MemoryStream memoryStream = new MemoryStream()) { - JsonWriter writer = new JsonWriter(stringWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetAccessorIds()) + using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) { - context.Writer.WritePropertyName("accessorIds"); - context.Writer.WriteArrayStart(); - foreach(var publicRequestAccessorIdsListValue in publicRequest.AccessorIds) + JsonWriter writer = new JsonWriter(streamWriter); + writer.Validate = false; + writer.WriteObjectStart(); + var context = new JsonMarshallerContext(request, writer); + if(publicRequest.IsSetAccessorIds()) { - context.Writer.Write(publicRequestAccessorIdsListValue); + context.Writer.WritePropertyName("accessorIds"); + context.Writer.WriteArrayStart(); + foreach(var publicRequestAccessorIdsListValue in publicRequest.AccessorIds) + { + context.Writer.Write(publicRequestAccessorIdsListValue); + } + context.Writer.WriteArrayEnd(); } - context.Writer.WriteArrayEnd(); - } - if(publicRequest.IsSetRole()) - { - context.Writer.WritePropertyName("role"); - context.Writer.Write(publicRequest.Role); + if(publicRequest.IsSetRole()) + { + context.Writer.WritePropertyName("role"); + context.Writer.Write(publicRequest.Role); + } + + writer.WriteObjectEnd(); } - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); + request.Content = memoryStream.ToArray(); } diff --git a/sdk/src/Services/Repostspace/Generated/_bcl/AmazonRepostspaceClient.cs b/sdk/src/Services/Repostspace/Generated/_bcl/AmazonRepostspaceClient.cs index 2fca61ca31d0..b1780f18c282 100644 --- a/sdk/src/Services/Repostspace/Generated/_bcl/AmazonRepostspaceClient.cs +++ b/sdk/src/Services/Repostspace/Generated/_bcl/AmazonRepostspaceClient.cs @@ -272,6 +272,148 @@ protected override void Dispose(bool disposing) #endregion + #region BatchAddRole + + + /// + /// Add role to multiple users or groups in a private re:Post. + /// + /// Container for the necessary parameters to execute the BatchAddRole service method. + /// + /// The response from the BatchAddRole service method, as returned by Repostspace. + /// + /// User does not have sufficient access to perform this action. + /// + /// + /// Unexpected error during processing of request. + /// + /// + /// Request references a resource which does not exist. + /// + /// + /// Request was denied due to request throttling. + /// + /// + /// The input fails to satisfy the constraints specified by an AWS service. + /// + /// REST API Reference for BatchAddRole Operation + public virtual BatchAddRoleResponse BatchAddRole(BatchAddRoleRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = BatchAddRoleRequestMarshaller.Instance; + options.ResponseUnmarshaller = BatchAddRoleResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// Add role to multiple users or groups in a private re:Post. + /// + /// Container for the necessary parameters to execute the BatchAddRole service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the BatchAddRole service method, as returned by Repostspace. + /// + /// User does not have sufficient access to perform this action. + /// + /// + /// Unexpected error during processing of request. + /// + /// + /// Request references a resource which does not exist. + /// + /// + /// Request was denied due to request throttling. + /// + /// + /// The input fails to satisfy the constraints specified by an AWS service. + /// + /// REST API Reference for BatchAddRole Operation + public virtual Task BatchAddRoleAsync(BatchAddRoleRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = BatchAddRoleRequestMarshaller.Instance; + options.ResponseUnmarshaller = BatchAddRoleResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + + #region BatchRemoveRole + + + /// + /// Remove role from multiple users or groups in a private re:Post. + /// + /// Container for the necessary parameters to execute the BatchRemoveRole service method. + /// + /// The response from the BatchRemoveRole service method, as returned by Repostspace. + /// + /// User does not have sufficient access to perform this action. + /// + /// + /// Unexpected error during processing of request. + /// + /// + /// Request references a resource which does not exist. + /// + /// + /// Request was denied due to request throttling. + /// + /// + /// The input fails to satisfy the constraints specified by an AWS service. + /// + /// REST API Reference for BatchRemoveRole Operation + public virtual BatchRemoveRoleResponse BatchRemoveRole(BatchRemoveRoleRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = BatchRemoveRoleRequestMarshaller.Instance; + options.ResponseUnmarshaller = BatchRemoveRoleResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// Remove role from multiple users or groups in a private re:Post. + /// + /// Container for the necessary parameters to execute the BatchRemoveRole service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the BatchRemoveRole service method, as returned by Repostspace. + /// + /// User does not have sufficient access to perform this action. + /// + /// + /// Unexpected error during processing of request. + /// + /// + /// Request references a resource which does not exist. + /// + /// + /// Request was denied due to request throttling. + /// + /// + /// The input fails to satisfy the constraints specified by an AWS service. + /// + /// REST API Reference for BatchRemoveRole Operation + public virtual Task BatchRemoveRoleAsync(BatchRemoveRoleRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = BatchRemoveRoleRequestMarshaller.Instance; + options.ResponseUnmarshaller = BatchRemoveRoleResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + #region CreateSpace diff --git a/sdk/src/Services/Repostspace/Properties/AssemblyInfo.cs b/sdk/src/Services/Repostspace/Properties/AssemblyInfo.cs index bbda912bccd9..db721a4a8e96 100644 --- a/sdk/src/Services/Repostspace/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/Repostspace/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.16")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/Repostspace/Repostspace.sln b/sdk/src/Services/Repostspace/Repostspace.sln index b401d03be71f..ba2e097d9524 100644 --- a/sdk/src/Services/Repostspace/Repostspace.sln +++ b/sdk/src/Services/Repostspace/Repostspace.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {85232B29-8EEB-4405-A4A9-6DD4ED89C975}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {85232B29-8EEB-4405-A4A9-6DD4ED89C975}.Debug|Any CPU.Build.0 = Debug|Any CPU {85232B29-8EEB-4405-A4A9-6DD4ED89C975}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {93EFCA4D-0F37-4927-B501-2F76C78E7102}.Debug|Any CPU.Build.0 = Debug|Any CPU {93EFCA4D-0F37-4927-B501-2F76C78E7102}.Release|Any CPU.ActiveCfg = Release|Any CPU {93EFCA4D-0F37-4927-B501-2F76C78E7102}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {29E3462F-AEE6-4FE5-98DF-BE340E710B0B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {29E3462F-AEE6-4FE5-98DF-BE340E710B0B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {29E3462F-AEE6-4FE5-98DF-BE340E710B0B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {29E3462F-AEE6-4FE5-98DF-BE340E710B0B}.Release|Any CPU.Build.0 = Release|Any CPU - {0A3B0508-4C6D-42C4-914B-3C1BFCC55427}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0A3B0508-4C6D-42C4-914B-3C1BFCC55427}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0A3B0508-4C6D-42C4-914B-3C1BFCC55427}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0A3B0508-4C6D-42C4-914B-3C1BFCC55427}.Release|Any CPU.Build.0 = Release|Any CPU - {3E5F6807-0E97-4515-BB88-3B93F68E79E4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3E5F6807-0E97-4515-BB88-3B93F68E79E4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3E5F6807-0E97-4515-BB88-3B93F68E79E4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3E5F6807-0E97-4515-BB88-3B93F68E79E4}.Release|Any CPU.Build.0 = Release|Any CPU - {1FCE5E1D-1090-4F7F-924E-5516E747C2F3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1FCE5E1D-1090-4F7F-924E-5516E747C2F3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1FCE5E1D-1090-4F7F-924E-5516E747C2F3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1FCE5E1D-1090-4F7F-924E-5516E747C2F3}.Release|Any CPU.Build.0 = Release|Any CPU - {27365B98-757A-4C44-858B-8C422A82D207}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {27365B98-757A-4C44-858B-8C422A82D207}.Debug|Any CPU.Build.0 = Debug|Any CPU - {27365B98-757A-4C44-858B-8C422A82D207}.Release|Any CPU.ActiveCfg = Release|Any CPU - {27365B98-757A-4C44-858B-8C422A82D207}.Release|Any CPU.Build.0 = Release|Any CPU - {B574F30A-3585-4A6A-8E7A-3DD7E4527C7F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B574F30A-3585-4A6A-8E7A-3DD7E4527C7F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B574F30A-3585-4A6A-8E7A-3DD7E4527C7F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B574F30A-3585-4A6A-8E7A-3DD7E4527C7F}.Release|Any CPU.Build.0 = Release|Any CPU - {A64BA3E0-3613-43CE-B633-E137384D93CA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A64BA3E0-3613-43CE-B633-E137384D93CA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A64BA3E0-3613-43CE-B633-E137384D93CA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A64BA3E0-3613-43CE-B633-E137384D93CA}.Release|Any CPU.Build.0 = Release|Any CPU - {E42EEB14-D2FC-45F8-9AA7-DCDDBA524A10}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E42EEB14-D2FC-45F8-9AA7-DCDDBA524A10}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E42EEB14-D2FC-45F8-9AA7-DCDDBA524A10}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E42EEB14-D2FC-45F8-9AA7-DCDDBA524A10}.Release|Any CPU.Build.0 = Release|Any CPU - {E666EAD6-A7A4-4359-9635-9F20E1B72820}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E666EAD6-A7A4-4359-9635-9F20E1B72820}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E666EAD6-A7A4-4359-9635-9F20E1B72820}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E666EAD6-A7A4-4359-9635-9F20E1B72820}.Release|Any CPU.Build.0 = Release|Any CPU - {393C6F71-44A6-4DC7-A828-D868A04929AA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {393C6F71-44A6-4DC7-A828-D868A04929AA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {393C6F71-44A6-4DC7-A828-D868A04929AA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {393C6F71-44A6-4DC7-A828-D868A04929AA}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {29E3462F-AEE6-4FE5-98DF-BE340E710B0B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {29E3462F-AEE6-4FE5-98DF-BE340E710B0B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {29E3462F-AEE6-4FE5-98DF-BE340E710B0B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {29E3462F-AEE6-4FE5-98DF-BE340E710B0B}.Release|Any CPU.Build.0 = Release|Any CPU - {0A3B0508-4C6D-42C4-914B-3C1BFCC55427}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0A3B0508-4C6D-42C4-914B-3C1BFCC55427}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0A3B0508-4C6D-42C4-914B-3C1BFCC55427}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0A3B0508-4C6D-42C4-914B-3C1BFCC55427}.Release|Any CPU.Build.0 = Release|Any CPU - {3E5F6807-0E97-4515-BB88-3B93F68E79E4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3E5F6807-0E97-4515-BB88-3B93F68E79E4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3E5F6807-0E97-4515-BB88-3B93F68E79E4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3E5F6807-0E97-4515-BB88-3B93F68E79E4}.Release|Any CPU.Build.0 = Release|Any CPU - {1FCE5E1D-1090-4F7F-924E-5516E747C2F3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1FCE5E1D-1090-4F7F-924E-5516E747C2F3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1FCE5E1D-1090-4F7F-924E-5516E747C2F3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1FCE5E1D-1090-4F7F-924E-5516E747C2F3}.Release|Any CPU.Build.0 = Release|Any CPU - {27365B98-757A-4C44-858B-8C422A82D207}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {27365B98-757A-4C44-858B-8C422A82D207}.Debug|Any CPU.Build.0 = Debug|Any CPU - {27365B98-757A-4C44-858B-8C422A82D207}.Release|Any CPU.ActiveCfg = Release|Any CPU - {27365B98-757A-4C44-858B-8C422A82D207}.Release|Any CPU.Build.0 = Release|Any CPU - {B574F30A-3585-4A6A-8E7A-3DD7E4527C7F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B574F30A-3585-4A6A-8E7A-3DD7E4527C7F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B574F30A-3585-4A6A-8E7A-3DD7E4527C7F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B574F30A-3585-4A6A-8E7A-3DD7E4527C7F}.Release|Any CPU.Build.0 = Release|Any CPU - {A64BA3E0-3613-43CE-B633-E137384D93CA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A64BA3E0-3613-43CE-B633-E137384D93CA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A64BA3E0-3613-43CE-B633-E137384D93CA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A64BA3E0-3613-43CE-B633-E137384D93CA}.Release|Any CPU.Build.0 = Release|Any CPU - {E42EEB14-D2FC-45F8-9AA7-DCDDBA524A10}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E42EEB14-D2FC-45F8-9AA7-DCDDBA524A10}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E42EEB14-D2FC-45F8-9AA7-DCDDBA524A10}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E42EEB14-D2FC-45F8-9AA7-DCDDBA524A10}.Release|Any CPU.Build.0 = Release|Any CPU - {E666EAD6-A7A4-4359-9635-9F20E1B72820}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E666EAD6-A7A4-4359-9635-9F20E1B72820}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E666EAD6-A7A4-4359-9635-9F20E1B72820}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E666EAD6-A7A4-4359-9635-9F20E1B72820}.Release|Any CPU.Build.0 = Release|Any CPU - {393C6F71-44A6-4DC7-A828-D868A04929AA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {393C6F71-44A6-4DC7-A828-D868A04929AA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {393C6F71-44A6-4DC7-A828-D868A04929AA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {393C6F71-44A6-4DC7-A828-D868A04929AA}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {85232B29-8EEB-4405-A4A9-6DD4ED89C975} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {58448928-2A15-4E95-A2A4-F8DDFC23775E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {01C45063-8BF4-4709-9538-23CA1E49A3B8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {62653182-45A9-48F1-AF96-E08EB9A97646} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {93EFCA4D-0F37-4927-B501-2F76C78E7102} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {29E3462F-AEE6-4FE5-98DF-BE340E710B0B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0A3B0508-4C6D-42C4-914B-3C1BFCC55427} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {3E5F6807-0E97-4515-BB88-3B93F68E79E4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {1FCE5E1D-1090-4F7F-924E-5516E747C2F3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {27365B98-757A-4C44-858B-8C422A82D207} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B574F30A-3585-4A6A-8E7A-3DD7E4527C7F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A64BA3E0-3613-43CE-B633-E137384D93CA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E42EEB14-D2FC-45F8-9AA7-DCDDBA524A10} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E666EAD6-A7A4-4359-9635-9F20E1B72820} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {393C6F71-44A6-4DC7-A828-D868A04929AA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {29E3462F-AEE6-4FE5-98DF-BE340E710B0B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0A3B0508-4C6D-42C4-914B-3C1BFCC55427} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {3E5F6807-0E97-4515-BB88-3B93F68E79E4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {1FCE5E1D-1090-4F7F-924E-5516E747C2F3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {27365B98-757A-4C44-858B-8C422A82D207} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B574F30A-3585-4A6A-8E7A-3DD7E4527C7F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A64BA3E0-3613-43CE-B633-E137384D93CA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E42EEB14-D2FC-45F8-9AA7-DCDDBA524A10} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E666EAD6-A7A4-4359-9635-9F20E1B72820} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {393C6F71-44A6-4DC7-A828-D868A04929AA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {BCD8D1E3-BD06-4683-93CE-CC6F81213C78} diff --git a/sdk/src/Services/ResilienceHub/Generated/AmazonResilienceHubConfig.cs b/sdk/src/Services/ResilienceHub/Generated/AmazonResilienceHubConfig.cs index d5804f5ae469..f6f0330a8daf 100644 --- a/sdk/src/Services/ResilienceHub/Generated/AmazonResilienceHubConfig.cs +++ b/sdk/src/Services/ResilienceHub/Generated/AmazonResilienceHubConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.ResilienceHub public partial class AmazonResilienceHubConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("resiliencehub", "4.0.0.0"); private static readonly AmazonResilienceHubEndpointResolver EndpointResolver = new AmazonResilienceHubEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("resiliencehub", "3.7.401.24"); -======= - InternalSDKUtils.BuildUserAgentString("resiliencehub", "3.7.402.18"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/ResilienceHub/Generated/Model/Internal/MarshallTransformations/CreateAppRequestMarshaller.cs b/sdk/src/Services/ResilienceHub/Generated/Model/Internal/MarshallTransformations/CreateAppRequestMarshaller.cs index 75c0fd6c9d05..74a773eefbbf 100644 --- a/sdk/src/Services/ResilienceHub/Generated/Model/Internal/MarshallTransformations/CreateAppRequestMarshaller.cs +++ b/sdk/src/Services/ResilienceHub/Generated/Model/Internal/MarshallTransformations/CreateAppRequestMarshaller.cs @@ -65,7 +65,6 @@ public IRequest Marshall(CreateAppRequest publicRequest) { using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) { -<<<<<<< HEAD JsonWriter writer = new JsonWriter(streamWriter); writer.Validate = false; writer.WriteObjectStart(); @@ -75,55 +74,12 @@ public IRequest Marshall(CreateAppRequest publicRequest) context.Writer.WritePropertyName("assessmentSchedule"); context.Writer.Write(publicRequest.AssessmentSchedule); } -||||||| Commit version number update changes - context.Writer.WritePropertyName("assessmentSchedule"); - context.Writer.Write(publicRequest.AssessmentSchedule); - } - - if(publicRequest.IsSetClientToken()) - { - context.Writer.WritePropertyName("clientToken"); - context.Writer.Write(publicRequest.ClientToken); - } - - else if(!(publicRequest.IsSetClientToken())) - { - context.Writer.WritePropertyName("clientToken"); - context.Writer.Write(Guid.NewGuid().ToString()); - } - if(publicRequest.IsSetDescription()) - { - context.Writer.WritePropertyName("description"); - context.Writer.Write(publicRequest.Description); - } -======= - context.Writer.WritePropertyName("assessmentSchedule"); - context.Writer.Write(publicRequest.AssessmentSchedule); - } - - if(publicRequest.IsSetAwsApplicationArn()) - { - context.Writer.WritePropertyName("awsApplicationArn"); - context.Writer.Write(publicRequest.AwsApplicationArn); - } - - if(publicRequest.IsSetClientToken()) - { - context.Writer.WritePropertyName("clientToken"); - context.Writer.Write(publicRequest.ClientToken); - } - else if(!(publicRequest.IsSetClientToken())) - { - context.Writer.WritePropertyName("clientToken"); - context.Writer.Write(Guid.NewGuid().ToString()); - } - if(publicRequest.IsSetDescription()) - { - context.Writer.WritePropertyName("description"); - context.Writer.Write(publicRequest.Description); - } ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b + if(publicRequest.IsSetAwsApplicationArn()) + { + context.Writer.WritePropertyName("awsApplicationArn"); + context.Writer.Write(publicRequest.AwsApplicationArn); + } if(publicRequest.IsSetClientToken()) { diff --git a/sdk/src/Services/ResilienceHub/Generated/_bcl/AmazonResilienceHubClient.cs b/sdk/src/Services/ResilienceHub/Generated/_bcl/AmazonResilienceHubClient.cs index 2fa6d1940377..2eba44f72a75 100644 --- a/sdk/src/Services/ResilienceHub/Generated/_bcl/AmazonResilienceHubClient.cs +++ b/sdk/src/Services/ResilienceHub/Generated/_bcl/AmazonResilienceHubClient.cs @@ -2847,7 +2847,7 @@ public virtual ListAlarmRecommendationsResponse ListAlarmRecommendations(ListAla /// - /// List of compliance drifts that were detected while running an assessment. + /// Indicates the list of compliance drifts that were detected while running an assessment. /// /// Container for the necessary parameters to execute the ListAppAssessmentComplianceDrifts service method. /// @@ -2879,7 +2879,7 @@ public virtual ListAppAssessmentComplianceDriftsResponse ListAppAssessmentCompli /// - /// List of compliance drifts that were detected while running an assessment. + /// Indicates the list of compliance drifts that were detected while running an assessment. /// /// Container for the necessary parameters to execute the ListAppAssessmentComplianceDrifts service method. /// diff --git a/sdk/src/Services/ResilienceHub/Properties/AssemblyInfo.cs b/sdk/src/Services/ResilienceHub/Properties/AssemblyInfo.cs index 1609da4342de..39948dce5cbd 100644 --- a/sdk/src/Services/ResilienceHub/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/ResilienceHub/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.24")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.402.18")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/ResilienceHub/ResilienceHub.sln b/sdk/src/Services/ResilienceHub/ResilienceHub.sln index 4de5fb10ce25..1d5ac98b60e1 100644 --- a/sdk/src/Services/ResilienceHub/ResilienceHub.sln +++ b/sdk/src/Services/ResilienceHub/ResilienceHub.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {D90BEB98-DA54-4179-B761-2D23F4863562}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {D90BEB98-DA54-4179-B761-2D23F4863562}.Debug|Any CPU.Build.0 = Debug|Any CPU {D90BEB98-DA54-4179-B761-2D23F4863562}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {F8DF7F7B-D1CE-4889-AB3A-9D53D93DAD47}.Debug|Any CPU.Build.0 = Debug|Any CPU {F8DF7F7B-D1CE-4889-AB3A-9D53D93DAD47}.Release|Any CPU.ActiveCfg = Release|Any CPU {F8DF7F7B-D1CE-4889-AB3A-9D53D93DAD47}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {CE3B9B18-BD47-412E-9DEE-D0DB96DA38A1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CE3B9B18-BD47-412E-9DEE-D0DB96DA38A1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CE3B9B18-BD47-412E-9DEE-D0DB96DA38A1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CE3B9B18-BD47-412E-9DEE-D0DB96DA38A1}.Release|Any CPU.Build.0 = Release|Any CPU - {620C87EC-05B4-45F9-82D8-91D42BF8D295}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {620C87EC-05B4-45F9-82D8-91D42BF8D295}.Debug|Any CPU.Build.0 = Debug|Any CPU - {620C87EC-05B4-45F9-82D8-91D42BF8D295}.Release|Any CPU.ActiveCfg = Release|Any CPU - {620C87EC-05B4-45F9-82D8-91D42BF8D295}.Release|Any CPU.Build.0 = Release|Any CPU - {C58AAAC9-9375-406B-9F51-DBB16442FD0B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C58AAAC9-9375-406B-9F51-DBB16442FD0B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C58AAAC9-9375-406B-9F51-DBB16442FD0B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C58AAAC9-9375-406B-9F51-DBB16442FD0B}.Release|Any CPU.Build.0 = Release|Any CPU - {179D2BBA-ACC1-4580-9092-D0C1147B6936}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {179D2BBA-ACC1-4580-9092-D0C1147B6936}.Debug|Any CPU.Build.0 = Debug|Any CPU - {179D2BBA-ACC1-4580-9092-D0C1147B6936}.Release|Any CPU.ActiveCfg = Release|Any CPU - {179D2BBA-ACC1-4580-9092-D0C1147B6936}.Release|Any CPU.Build.0 = Release|Any CPU - {37E79E98-7983-4E5C-A701-1AE75616430D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {37E79E98-7983-4E5C-A701-1AE75616430D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {37E79E98-7983-4E5C-A701-1AE75616430D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {37E79E98-7983-4E5C-A701-1AE75616430D}.Release|Any CPU.Build.0 = Release|Any CPU - {EE09DC39-91F6-41D4-923C-2A3BE0BCEC25}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EE09DC39-91F6-41D4-923C-2A3BE0BCEC25}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EE09DC39-91F6-41D4-923C-2A3BE0BCEC25}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EE09DC39-91F6-41D4-923C-2A3BE0BCEC25}.Release|Any CPU.Build.0 = Release|Any CPU - {44D993F1-1EB1-436A-BE56-D5219B7069F5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {44D993F1-1EB1-436A-BE56-D5219B7069F5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {44D993F1-1EB1-436A-BE56-D5219B7069F5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {44D993F1-1EB1-436A-BE56-D5219B7069F5}.Release|Any CPU.Build.0 = Release|Any CPU - {401FA9AA-825A-4BC9-9624-31006B727285}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {401FA9AA-825A-4BC9-9624-31006B727285}.Debug|Any CPU.Build.0 = Debug|Any CPU - {401FA9AA-825A-4BC9-9624-31006B727285}.Release|Any CPU.ActiveCfg = Release|Any CPU - {401FA9AA-825A-4BC9-9624-31006B727285}.Release|Any CPU.Build.0 = Release|Any CPU - {EE72D628-CCB1-4E8C-B76C-411FA9450120}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EE72D628-CCB1-4E8C-B76C-411FA9450120}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EE72D628-CCB1-4E8C-B76C-411FA9450120}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EE72D628-CCB1-4E8C-B76C-411FA9450120}.Release|Any CPU.Build.0 = Release|Any CPU - {3EECED9C-8155-4D1F-A91F-3F27605E599A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3EECED9C-8155-4D1F-A91F-3F27605E599A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3EECED9C-8155-4D1F-A91F-3F27605E599A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3EECED9C-8155-4D1F-A91F-3F27605E599A}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {CE3B9B18-BD47-412E-9DEE-D0DB96DA38A1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CE3B9B18-BD47-412E-9DEE-D0DB96DA38A1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CE3B9B18-BD47-412E-9DEE-D0DB96DA38A1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CE3B9B18-BD47-412E-9DEE-D0DB96DA38A1}.Release|Any CPU.Build.0 = Release|Any CPU - {620C87EC-05B4-45F9-82D8-91D42BF8D295}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {620C87EC-05B4-45F9-82D8-91D42BF8D295}.Debug|Any CPU.Build.0 = Debug|Any CPU - {620C87EC-05B4-45F9-82D8-91D42BF8D295}.Release|Any CPU.ActiveCfg = Release|Any CPU - {620C87EC-05B4-45F9-82D8-91D42BF8D295}.Release|Any CPU.Build.0 = Release|Any CPU - {C58AAAC9-9375-406B-9F51-DBB16442FD0B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C58AAAC9-9375-406B-9F51-DBB16442FD0B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C58AAAC9-9375-406B-9F51-DBB16442FD0B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C58AAAC9-9375-406B-9F51-DBB16442FD0B}.Release|Any CPU.Build.0 = Release|Any CPU - {179D2BBA-ACC1-4580-9092-D0C1147B6936}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {179D2BBA-ACC1-4580-9092-D0C1147B6936}.Debug|Any CPU.Build.0 = Debug|Any CPU - {179D2BBA-ACC1-4580-9092-D0C1147B6936}.Release|Any CPU.ActiveCfg = Release|Any CPU - {179D2BBA-ACC1-4580-9092-D0C1147B6936}.Release|Any CPU.Build.0 = Release|Any CPU - {37E79E98-7983-4E5C-A701-1AE75616430D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {37E79E98-7983-4E5C-A701-1AE75616430D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {37E79E98-7983-4E5C-A701-1AE75616430D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {37E79E98-7983-4E5C-A701-1AE75616430D}.Release|Any CPU.Build.0 = Release|Any CPU - {EE09DC39-91F6-41D4-923C-2A3BE0BCEC25}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EE09DC39-91F6-41D4-923C-2A3BE0BCEC25}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EE09DC39-91F6-41D4-923C-2A3BE0BCEC25}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EE09DC39-91F6-41D4-923C-2A3BE0BCEC25}.Release|Any CPU.Build.0 = Release|Any CPU - {44D993F1-1EB1-436A-BE56-D5219B7069F5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {44D993F1-1EB1-436A-BE56-D5219B7069F5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {44D993F1-1EB1-436A-BE56-D5219B7069F5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {44D993F1-1EB1-436A-BE56-D5219B7069F5}.Release|Any CPU.Build.0 = Release|Any CPU - {401FA9AA-825A-4BC9-9624-31006B727285}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {401FA9AA-825A-4BC9-9624-31006B727285}.Debug|Any CPU.Build.0 = Debug|Any CPU - {401FA9AA-825A-4BC9-9624-31006B727285}.Release|Any CPU.ActiveCfg = Release|Any CPU - {401FA9AA-825A-4BC9-9624-31006B727285}.Release|Any CPU.Build.0 = Release|Any CPU - {EE72D628-CCB1-4E8C-B76C-411FA9450120}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EE72D628-CCB1-4E8C-B76C-411FA9450120}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EE72D628-CCB1-4E8C-B76C-411FA9450120}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EE72D628-CCB1-4E8C-B76C-411FA9450120}.Release|Any CPU.Build.0 = Release|Any CPU - {3EECED9C-8155-4D1F-A91F-3F27605E599A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3EECED9C-8155-4D1F-A91F-3F27605E599A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3EECED9C-8155-4D1F-A91F-3F27605E599A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3EECED9C-8155-4D1F-A91F-3F27605E599A}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {D90BEB98-DA54-4179-B761-2D23F4863562} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {D7CCA019-BBDA-4AA3-B392-9B5F90DB8549} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {078D14BE-616C-40F0-886E-5ECEB18720F3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {7C3FD26F-C3B9-4E6A-96D8-8D0E97CF3C59} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {F8DF7F7B-D1CE-4889-AB3A-9D53D93DAD47} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {CE3B9B18-BD47-412E-9DEE-D0DB96DA38A1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {620C87EC-05B4-45F9-82D8-91D42BF8D295} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C58AAAC9-9375-406B-9F51-DBB16442FD0B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {179D2BBA-ACC1-4580-9092-D0C1147B6936} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {37E79E98-7983-4E5C-A701-1AE75616430D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {EE09DC39-91F6-41D4-923C-2A3BE0BCEC25} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {44D993F1-1EB1-436A-BE56-D5219B7069F5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {401FA9AA-825A-4BC9-9624-31006B727285} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {EE72D628-CCB1-4E8C-B76C-411FA9450120} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {3EECED9C-8155-4D1F-A91F-3F27605E599A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {CE3B9B18-BD47-412E-9DEE-D0DB96DA38A1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {620C87EC-05B4-45F9-82D8-91D42BF8D295} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C58AAAC9-9375-406B-9F51-DBB16442FD0B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {179D2BBA-ACC1-4580-9092-D0C1147B6936} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {37E79E98-7983-4E5C-A701-1AE75616430D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {EE09DC39-91F6-41D4-923C-2A3BE0BCEC25} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {44D993F1-1EB1-436A-BE56-D5219B7069F5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {401FA9AA-825A-4BC9-9624-31006B727285} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {EE72D628-CCB1-4E8C-B76C-411FA9450120} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {3EECED9C-8155-4D1F-A91F-3F27605E599A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {26812BAB-8F38-422D-88D4-89E8A54C7FC9} diff --git a/sdk/src/Services/ResourceExplorer2/Generated/AmazonResourceExplorer2Config.cs b/sdk/src/Services/ResourceExplorer2/Generated/AmazonResourceExplorer2Config.cs index 97d8f337cdca..967ef567d7bc 100644 --- a/sdk/src/Services/ResourceExplorer2/Generated/AmazonResourceExplorer2Config.cs +++ b/sdk/src/Services/ResourceExplorer2/Generated/AmazonResourceExplorer2Config.cs @@ -34,16 +34,10 @@ namespace Amazon.ResourceExplorer2 public partial class AmazonResourceExplorer2Config : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("Resource Explorer 2", "4.0.0.0"); private static readonly AmazonResourceExplorer2EndpointResolver EndpointResolver = new AmazonResourceExplorer2EndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("Resource Explorer 2", "3.7.401.4"); -======= - InternalSDKUtils.BuildUserAgentString("Resource Explorer 2", "3.7.402.7"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/ResourceExplorer2/Generated/Model/Internal/MarshallTransformations/GetManagedViewRequestMarshaller.cs b/sdk/src/Services/ResourceExplorer2/Generated/Model/Internal/MarshallTransformations/GetManagedViewRequestMarshaller.cs index f7e1715546e7..90de0f506442 100644 --- a/sdk/src/Services/ResourceExplorer2/Generated/Model/Internal/MarshallTransformations/GetManagedViewRequestMarshaller.cs +++ b/sdk/src/Services/ResourceExplorer2/Generated/Model/Internal/MarshallTransformations/GetManagedViewRequestMarshaller.cs @@ -61,21 +61,24 @@ public IRequest Marshall(GetManagedViewRequest publicRequest) request.HttpMethod = "POST"; request.ResourcePath = "/GetManagedView"; - using (StringWriter stringWriter = new StringWriter(CultureInfo.InvariantCulture)) + using (MemoryStream memoryStream = new MemoryStream()) { - JsonWriter writer = new JsonWriter(stringWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetManagedViewArn()) + using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) { - context.Writer.WritePropertyName("ManagedViewArn"); - context.Writer.Write(publicRequest.ManagedViewArn); + JsonWriter writer = new JsonWriter(streamWriter); + writer.Validate = false; + writer.WriteObjectStart(); + var context = new JsonMarshallerContext(request, writer); + if(publicRequest.IsSetManagedViewArn()) + { + context.Writer.WritePropertyName("ManagedViewArn"); + context.Writer.Write(publicRequest.ManagedViewArn); + } + + writer.WriteObjectEnd(); } - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); + request.Content = memoryStream.ToArray(); } diff --git a/sdk/src/Services/ResourceExplorer2/Generated/Model/Internal/MarshallTransformations/ListManagedViewsRequestMarshaller.cs b/sdk/src/Services/ResourceExplorer2/Generated/Model/Internal/MarshallTransformations/ListManagedViewsRequestMarshaller.cs index fa09dfba2ecd..66f90cb52af8 100644 --- a/sdk/src/Services/ResourceExplorer2/Generated/Model/Internal/MarshallTransformations/ListManagedViewsRequestMarshaller.cs +++ b/sdk/src/Services/ResourceExplorer2/Generated/Model/Internal/MarshallTransformations/ListManagedViewsRequestMarshaller.cs @@ -61,33 +61,36 @@ public IRequest Marshall(ListManagedViewsRequest publicRequest) request.HttpMethod = "POST"; request.ResourcePath = "/ListManagedViews"; - using (StringWriter stringWriter = new StringWriter(CultureInfo.InvariantCulture)) + using (MemoryStream memoryStream = new MemoryStream()) { - JsonWriter writer = new JsonWriter(stringWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetMaxResults()) + using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) { - context.Writer.WritePropertyName("MaxResults"); - context.Writer.Write(publicRequest.MaxResults); - } + JsonWriter writer = new JsonWriter(streamWriter); + writer.Validate = false; + writer.WriteObjectStart(); + var context = new JsonMarshallerContext(request, writer); + if(publicRequest.IsSetMaxResults()) + { + context.Writer.WritePropertyName("MaxResults"); + context.Writer.Write(publicRequest.MaxResults.Value); + } - if(publicRequest.IsSetNextToken()) - { - context.Writer.WritePropertyName("NextToken"); - context.Writer.Write(publicRequest.NextToken); - } + if(publicRequest.IsSetNextToken()) + { + context.Writer.WritePropertyName("NextToken"); + context.Writer.Write(publicRequest.NextToken); + } - if(publicRequest.IsSetServicePrincipal()) - { - context.Writer.WritePropertyName("ServicePrincipal"); - context.Writer.Write(publicRequest.ServicePrincipal); + if(publicRequest.IsSetServicePrincipal()) + { + context.Writer.WritePropertyName("ServicePrincipal"); + context.Writer.Write(publicRequest.ServicePrincipal); + } + + writer.WriteObjectEnd(); } - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); + request.Content = memoryStream.ToArray(); } diff --git a/sdk/src/Services/ResourceExplorer2/Generated/Model/Internal/MarshallTransformations/ManagedViewUnmarshaller.cs b/sdk/src/Services/ResourceExplorer2/Generated/Model/Internal/MarshallTransformations/ManagedViewUnmarshaller.cs index c1801ba2be6f..c68d3f1ac885 100644 --- a/sdk/src/Services/ResourceExplorer2/Generated/Model/Internal/MarshallTransformations/ManagedViewUnmarshaller.cs +++ b/sdk/src/Services/ResourceExplorer2/Generated/Model/Internal/MarshallTransformations/ManagedViewUnmarshaller.cs @@ -80,7 +80,7 @@ public ManagedView Unmarshall(JsonUnmarshallerContext context) } if (context.TestExpression("LastUpdatedAt", targetDepth)) { - var unmarshaller = DateTimeUnmarshaller.Instance; + var unmarshaller = NullableDateTimeUnmarshaller.Instance; unmarshalledObject.LastUpdatedAt = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/ResourceExplorer2/Generated/Model/ListManagedViewsRequest.cs b/sdk/src/Services/ResourceExplorer2/Generated/Model/ListManagedViewsRequest.cs index 29b766bcc7e1..e02f7446189a 100644 --- a/sdk/src/Services/ResourceExplorer2/Generated/Model/ListManagedViewsRequest.cs +++ b/sdk/src/Services/ResourceExplorer2/Generated/Model/ListManagedViewsRequest.cs @@ -60,9 +60,9 @@ public partial class ListManagedViewsRequest : AmazonResourceExplorer2Request /// /// [AWSProperty(Min=1, Max=50)] - public int MaxResults + public int? MaxResults { - get { return this._maxResults.GetValueOrDefault(); } + get { return this._maxResults; } set { this._maxResults = value; } } diff --git a/sdk/src/Services/ResourceExplorer2/Generated/Model/ManagedView.cs b/sdk/src/Services/ResourceExplorer2/Generated/Model/ManagedView.cs index 5d8980475f7a..2edb458354ff 100644 --- a/sdk/src/Services/ResourceExplorer2/Generated/Model/ManagedView.cs +++ b/sdk/src/Services/ResourceExplorer2/Generated/Model/ManagedView.cs @@ -88,9 +88,9 @@ internal bool IsSetIncludedProperties() /// The date and time when this managed view was last modified. /// /// - public DateTime LastUpdatedAt + public DateTime? LastUpdatedAt { - get { return this._lastUpdatedAt.GetValueOrDefault(); } + get { return this._lastUpdatedAt; } set { this._lastUpdatedAt = value; } } diff --git a/sdk/src/Services/ResourceExplorer2/Generated/Model/_bcl45+netstandard/IListManagedViewsPaginator.cs b/sdk/src/Services/ResourceExplorer2/Generated/Model/_bcl+netstandard/IListManagedViewsPaginator.cs similarity index 100% rename from sdk/src/Services/ResourceExplorer2/Generated/Model/_bcl45+netstandard/IListManagedViewsPaginator.cs rename to sdk/src/Services/ResourceExplorer2/Generated/Model/_bcl+netstandard/IListManagedViewsPaginator.cs diff --git a/sdk/src/Services/ResourceExplorer2/Generated/Model/_bcl45+netstandard/ListManagedViewsPaginator.cs b/sdk/src/Services/ResourceExplorer2/Generated/Model/_bcl+netstandard/ListManagedViewsPaginator.cs similarity index 100% rename from sdk/src/Services/ResourceExplorer2/Generated/Model/_bcl45+netstandard/ListManagedViewsPaginator.cs rename to sdk/src/Services/ResourceExplorer2/Generated/Model/_bcl+netstandard/ListManagedViewsPaginator.cs diff --git a/sdk/src/Services/ResourceExplorer2/Generated/_bcl/AmazonResourceExplorer2Client.cs b/sdk/src/Services/ResourceExplorer2/Generated/_bcl/AmazonResourceExplorer2Client.cs index 11a56e73a67f..8438417c793d 100644 --- a/sdk/src/Services/ResourceExplorer2/Generated/_bcl/AmazonResourceExplorer2Client.cs +++ b/sdk/src/Services/ResourceExplorer2/Generated/_bcl/AmazonResourceExplorer2Client.cs @@ -1421,6 +1421,95 @@ public virtual GetIndexResponse GetIndex(GetIndexRequest request) #endregion + #region GetManagedView + + + /// + /// Retrieves details of the specified Amazon + /// Web Services-managed view. + /// + /// Container for the necessary parameters to execute the GetManagedView service method. + /// + /// The response from the GetManagedView service method, as returned by ResourceExplorer2. + /// + /// The credentials that you used to call this operation don't have the minimum required + /// permissions. + /// + /// + /// The request failed because of internal service error. Try your request again later. + /// + /// + /// You specified a resource that doesn't exist. Check the ID or ARN that you used to + /// identity the resource, and try again. + /// + /// + /// The request failed because you exceeded a rate limit for this operation. For more + /// information, see Quotas + /// for Resource Explorer. + /// + /// + /// The principal making the request isn't permitted to perform the operation. + /// + /// + /// You provided an invalid value for one of the operation's parameters. Check the syntax + /// for the operation, and try again. + /// + /// REST API Reference for GetManagedView Operation + public virtual GetManagedViewResponse GetManagedView(GetManagedViewRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = GetManagedViewRequestMarshaller.Instance; + options.ResponseUnmarshaller = GetManagedViewResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// Retrieves details of the specified Amazon + /// Web Services-managed view. + /// + /// Container for the necessary parameters to execute the GetManagedView service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the GetManagedView service method, as returned by ResourceExplorer2. + /// + /// The credentials that you used to call this operation don't have the minimum required + /// permissions. + /// + /// + /// The request failed because of internal service error. Try your request again later. + /// + /// + /// You specified a resource that doesn't exist. Check the ID or ARN that you used to + /// identity the resource, and try again. + /// + /// + /// The request failed because you exceeded a rate limit for this operation. For more + /// information, see Quotas + /// for Resource Explorer. + /// + /// + /// The principal making the request isn't permitted to perform the operation. + /// + /// + /// You provided an invalid value for one of the operation's parameters. Check the syntax + /// for the operation, and try again. + /// + /// REST API Reference for GetManagedView Operation + public virtual Task GetManagedViewAsync(GetManagedViewRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = GetManagedViewRequestMarshaller.Instance; + options.ResponseUnmarshaller = GetManagedViewResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + #region GetView @@ -1662,6 +1751,89 @@ public virtual ListIndexesForMembersResponse ListIndexesForMembers(ListIndexesFo #endregion + #region ListManagedViews + + + /// + /// Lists the Amazon resource names (ARNs) of the Amazon + /// Web Services-managed views available in the Amazon Web Services Region in which + /// you call this operation. + /// + /// Container for the necessary parameters to execute the ListManagedViews service method. + /// + /// The response from the ListManagedViews service method, as returned by ResourceExplorer2. + /// + /// The credentials that you used to call this operation don't have the minimum required + /// permissions. + /// + /// + /// The request failed because of internal service error. Try your request again later. + /// + /// + /// The request failed because you exceeded a rate limit for this operation. For more + /// information, see Quotas + /// for Resource Explorer. + /// + /// + /// The principal making the request isn't permitted to perform the operation. + /// + /// + /// You provided an invalid value for one of the operation's parameters. Check the syntax + /// for the operation, and try again. + /// + /// REST API Reference for ListManagedViews Operation + public virtual ListManagedViewsResponse ListManagedViews(ListManagedViewsRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = ListManagedViewsRequestMarshaller.Instance; + options.ResponseUnmarshaller = ListManagedViewsResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// Lists the Amazon resource names (ARNs) of the Amazon + /// Web Services-managed views available in the Amazon Web Services Region in which + /// you call this operation. + /// + /// Container for the necessary parameters to execute the ListManagedViews service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the ListManagedViews service method, as returned by ResourceExplorer2. + /// + /// The credentials that you used to call this operation don't have the minimum required + /// permissions. + /// + /// + /// The request failed because of internal service error. Try your request again later. + /// + /// + /// The request failed because you exceeded a rate limit for this operation. For more + /// information, see Quotas + /// for Resource Explorer. + /// + /// + /// The principal making the request isn't permitted to perform the operation. + /// + /// + /// You provided an invalid value for one of the operation's parameters. Check the syntax + /// for the operation, and try again. + /// + /// REST API Reference for ListManagedViews Operation + public virtual Task ListManagedViewsAsync(ListManagedViewsRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = ListManagedViewsRequestMarshaller.Instance; + options.ResponseUnmarshaller = ListManagedViewsResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + #region ListResources diff --git a/sdk/src/Services/ResourceExplorer2/Properties/AssemblyInfo.cs b/sdk/src/Services/ResourceExplorer2/Properties/AssemblyInfo.cs index 4631866b9df9..6a839fa4d1e5 100644 --- a/sdk/src/Services/ResourceExplorer2/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/ResourceExplorer2/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.4")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.402.7")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/ResourceExplorer2/ResourceExplorer2.sln b/sdk/src/Services/ResourceExplorer2/ResourceExplorer2.sln index 7bdad4e58d1e..4e4cab671454 100644 --- a/sdk/src/Services/ResourceExplorer2/ResourceExplorer2.sln +++ b/sdk/src/Services/ResourceExplorer2/ResourceExplorer2.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {89AA46D8-38DE-4A53-A5E8-22CDAE662B02}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {89AA46D8-38DE-4A53-A5E8-22CDAE662B02}.Debug|Any CPU.Build.0 = Debug|Any CPU {89AA46D8-38DE-4A53-A5E8-22CDAE662B02}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {05A8E4AF-D3F4-4DF9-8AA9-61F8A87C9885}.Debug|Any CPU.Build.0 = Debug|Any CPU {05A8E4AF-D3F4-4DF9-8AA9-61F8A87C9885}.Release|Any CPU.ActiveCfg = Release|Any CPU {05A8E4AF-D3F4-4DF9-8AA9-61F8A87C9885}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {B338F0A4-9BF9-45AF-9E3E-AABD35F32CDF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B338F0A4-9BF9-45AF-9E3E-AABD35F32CDF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B338F0A4-9BF9-45AF-9E3E-AABD35F32CDF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B338F0A4-9BF9-45AF-9E3E-AABD35F32CDF}.Release|Any CPU.Build.0 = Release|Any CPU - {7B606AB9-D6C1-4EE8-8460-9EDE00594080}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7B606AB9-D6C1-4EE8-8460-9EDE00594080}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7B606AB9-D6C1-4EE8-8460-9EDE00594080}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7B606AB9-D6C1-4EE8-8460-9EDE00594080}.Release|Any CPU.Build.0 = Release|Any CPU - {CB280949-7496-49C5-AEA4-466BC6E88B6E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CB280949-7496-49C5-AEA4-466BC6E88B6E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CB280949-7496-49C5-AEA4-466BC6E88B6E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CB280949-7496-49C5-AEA4-466BC6E88B6E}.Release|Any CPU.Build.0 = Release|Any CPU - {A831F93D-CAB7-4287-B367-394E06EE9B5C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A831F93D-CAB7-4287-B367-394E06EE9B5C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A831F93D-CAB7-4287-B367-394E06EE9B5C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A831F93D-CAB7-4287-B367-394E06EE9B5C}.Release|Any CPU.Build.0 = Release|Any CPU - {C80511D5-38A8-4FEC-B947-F8A37323B30E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C80511D5-38A8-4FEC-B947-F8A37323B30E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C80511D5-38A8-4FEC-B947-F8A37323B30E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C80511D5-38A8-4FEC-B947-F8A37323B30E}.Release|Any CPU.Build.0 = Release|Any CPU - {036A818B-C798-4086-97FA-8F8E27B3158B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {036A818B-C798-4086-97FA-8F8E27B3158B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {036A818B-C798-4086-97FA-8F8E27B3158B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {036A818B-C798-4086-97FA-8F8E27B3158B}.Release|Any CPU.Build.0 = Release|Any CPU - {5E6E21FD-565E-4A02-99E5-C34408049F4F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5E6E21FD-565E-4A02-99E5-C34408049F4F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5E6E21FD-565E-4A02-99E5-C34408049F4F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5E6E21FD-565E-4A02-99E5-C34408049F4F}.Release|Any CPU.Build.0 = Release|Any CPU - {E900B069-72D1-4988-AE88-ADDD5222CDD6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E900B069-72D1-4988-AE88-ADDD5222CDD6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E900B069-72D1-4988-AE88-ADDD5222CDD6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E900B069-72D1-4988-AE88-ADDD5222CDD6}.Release|Any CPU.Build.0 = Release|Any CPU - {6701B191-15F9-409C-AFDD-1D803C22BC86}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6701B191-15F9-409C-AFDD-1D803C22BC86}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6701B191-15F9-409C-AFDD-1D803C22BC86}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6701B191-15F9-409C-AFDD-1D803C22BC86}.Release|Any CPU.Build.0 = Release|Any CPU - {703219F0-4643-45BA-AE72-301F75627EC5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {703219F0-4643-45BA-AE72-301F75627EC5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {703219F0-4643-45BA-AE72-301F75627EC5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {703219F0-4643-45BA-AE72-301F75627EC5}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {B338F0A4-9BF9-45AF-9E3E-AABD35F32CDF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B338F0A4-9BF9-45AF-9E3E-AABD35F32CDF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B338F0A4-9BF9-45AF-9E3E-AABD35F32CDF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B338F0A4-9BF9-45AF-9E3E-AABD35F32CDF}.Release|Any CPU.Build.0 = Release|Any CPU - {7B606AB9-D6C1-4EE8-8460-9EDE00594080}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7B606AB9-D6C1-4EE8-8460-9EDE00594080}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7B606AB9-D6C1-4EE8-8460-9EDE00594080}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7B606AB9-D6C1-4EE8-8460-9EDE00594080}.Release|Any CPU.Build.0 = Release|Any CPU - {CB280949-7496-49C5-AEA4-466BC6E88B6E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CB280949-7496-49C5-AEA4-466BC6E88B6E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CB280949-7496-49C5-AEA4-466BC6E88B6E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CB280949-7496-49C5-AEA4-466BC6E88B6E}.Release|Any CPU.Build.0 = Release|Any CPU - {A831F93D-CAB7-4287-B367-394E06EE9B5C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A831F93D-CAB7-4287-B367-394E06EE9B5C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A831F93D-CAB7-4287-B367-394E06EE9B5C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A831F93D-CAB7-4287-B367-394E06EE9B5C}.Release|Any CPU.Build.0 = Release|Any CPU - {C80511D5-38A8-4FEC-B947-F8A37323B30E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C80511D5-38A8-4FEC-B947-F8A37323B30E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C80511D5-38A8-4FEC-B947-F8A37323B30E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C80511D5-38A8-4FEC-B947-F8A37323B30E}.Release|Any CPU.Build.0 = Release|Any CPU - {036A818B-C798-4086-97FA-8F8E27B3158B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {036A818B-C798-4086-97FA-8F8E27B3158B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {036A818B-C798-4086-97FA-8F8E27B3158B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {036A818B-C798-4086-97FA-8F8E27B3158B}.Release|Any CPU.Build.0 = Release|Any CPU - {5E6E21FD-565E-4A02-99E5-C34408049F4F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5E6E21FD-565E-4A02-99E5-C34408049F4F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5E6E21FD-565E-4A02-99E5-C34408049F4F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5E6E21FD-565E-4A02-99E5-C34408049F4F}.Release|Any CPU.Build.0 = Release|Any CPU - {E900B069-72D1-4988-AE88-ADDD5222CDD6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E900B069-72D1-4988-AE88-ADDD5222CDD6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E900B069-72D1-4988-AE88-ADDD5222CDD6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E900B069-72D1-4988-AE88-ADDD5222CDD6}.Release|Any CPU.Build.0 = Release|Any CPU - {6701B191-15F9-409C-AFDD-1D803C22BC86}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6701B191-15F9-409C-AFDD-1D803C22BC86}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6701B191-15F9-409C-AFDD-1D803C22BC86}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6701B191-15F9-409C-AFDD-1D803C22BC86}.Release|Any CPU.Build.0 = Release|Any CPU - {703219F0-4643-45BA-AE72-301F75627EC5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {703219F0-4643-45BA-AE72-301F75627EC5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {703219F0-4643-45BA-AE72-301F75627EC5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {703219F0-4643-45BA-AE72-301F75627EC5}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {89AA46D8-38DE-4A53-A5E8-22CDAE662B02} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {B6ADD0EF-19AE-448E-B7FD-BD7764CA772F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {E51172FA-C64D-4A2E-B02C-65D6D488483F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {2A38EE7A-3DDB-4845-ABA4-AD6F729C9445} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {05A8E4AF-D3F4-4DF9-8AA9-61F8A87C9885} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {B338F0A4-9BF9-45AF-9E3E-AABD35F32CDF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {7B606AB9-D6C1-4EE8-8460-9EDE00594080} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {CB280949-7496-49C5-AEA4-466BC6E88B6E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A831F93D-CAB7-4287-B367-394E06EE9B5C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C80511D5-38A8-4FEC-B947-F8A37323B30E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {036A818B-C798-4086-97FA-8F8E27B3158B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {5E6E21FD-565E-4A02-99E5-C34408049F4F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E900B069-72D1-4988-AE88-ADDD5222CDD6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6701B191-15F9-409C-AFDD-1D803C22BC86} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {703219F0-4643-45BA-AE72-301F75627EC5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B338F0A4-9BF9-45AF-9E3E-AABD35F32CDF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {7B606AB9-D6C1-4EE8-8460-9EDE00594080} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {CB280949-7496-49C5-AEA4-466BC6E88B6E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A831F93D-CAB7-4287-B367-394E06EE9B5C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C80511D5-38A8-4FEC-B947-F8A37323B30E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {036A818B-C798-4086-97FA-8F8E27B3158B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {5E6E21FD-565E-4A02-99E5-C34408049F4F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E900B069-72D1-4988-AE88-ADDD5222CDD6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6701B191-15F9-409C-AFDD-1D803C22BC86} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {703219F0-4643-45BA-AE72-301F75627EC5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {8FA556BE-1F03-4310-BEFF-DA4798EEA1B6} diff --git a/sdk/src/Services/ResourceGroups/Generated/AmazonResourceGroupsConfig.cs b/sdk/src/Services/ResourceGroups/Generated/AmazonResourceGroupsConfig.cs index 28e087350134..5ed33926084b 100644 --- a/sdk/src/Services/ResourceGroups/Generated/AmazonResourceGroupsConfig.cs +++ b/sdk/src/Services/ResourceGroups/Generated/AmazonResourceGroupsConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.ResourceGroups public partial class AmazonResourceGroupsConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("Resource Groups", "4.0.0.0"); private static readonly AmazonResourceGroupsEndpointResolver EndpointResolver = new AmazonResourceGroupsEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("Resource Groups", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("Resource Groups", "3.7.401.27"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/ResourceGroups/Generated/Model/CreateGroupRequest.cs b/sdk/src/Services/ResourceGroups/Generated/Model/CreateGroupRequest.cs index 11842acccba6..2aaf7538984e 100644 --- a/sdk/src/Services/ResourceGroups/Generated/Model/CreateGroupRequest.cs +++ b/sdk/src/Services/ResourceGroups/Generated/Model/CreateGroupRequest.cs @@ -101,9 +101,9 @@ internal bool IsSetConfiguration() /// /// [AWSProperty(Min=1, Max=10)] - public int Criticality + public int? Criticality { - get { return this._criticality.GetValueOrDefault(); } + get { return this._criticality; } set { this._criticality = value; } } diff --git a/sdk/src/Services/ResourceGroups/Generated/Model/GetTagSyncTaskResponse.cs b/sdk/src/Services/ResourceGroups/Generated/Model/GetTagSyncTaskResponse.cs index 52178afc4ea0..dcfefb45e690 100644 --- a/sdk/src/Services/ResourceGroups/Generated/Model/GetTagSyncTaskResponse.cs +++ b/sdk/src/Services/ResourceGroups/Generated/Model/GetTagSyncTaskResponse.cs @@ -50,9 +50,9 @@ public partial class GetTagSyncTaskResponse : AmazonWebServiceResponse /// The timestamp of when the tag-sync task was created. /// /// - public DateTime CreatedAt + public DateTime? CreatedAt { - get { return this._createdAt.GetValueOrDefault(); } + get { return this._createdAt; } set { this._createdAt = value; } } diff --git a/sdk/src/Services/ResourceGroups/Generated/Model/Group.cs b/sdk/src/Services/ResourceGroups/Generated/Model/Group.cs index b06bb611fcb8..f9aa61a7314f 100644 --- a/sdk/src/Services/ResourceGroups/Generated/Model/Group.cs +++ b/sdk/src/Services/ResourceGroups/Generated/Model/Group.cs @@ -86,9 +86,9 @@ internal bool IsSetApplicationTag() /// /// [AWSProperty(Min=1, Max=10)] - public int Criticality + public int? Criticality { - get { return this._criticality.GetValueOrDefault(); } + get { return this._criticality; } set { this._criticality = value; } } diff --git a/sdk/src/Services/ResourceGroups/Generated/Model/GroupIdentifier.cs b/sdk/src/Services/ResourceGroups/Generated/Model/GroupIdentifier.cs index 06f05ad2ca16..0a4401b6e172 100644 --- a/sdk/src/Services/ResourceGroups/Generated/Model/GroupIdentifier.cs +++ b/sdk/src/Services/ResourceGroups/Generated/Model/GroupIdentifier.cs @@ -49,9 +49,9 @@ public partial class GroupIdentifier /// /// [AWSProperty(Min=1, Max=10)] - public int Criticality + public int? Criticality { - get { return this._criticality.GetValueOrDefault(); } + get { return this._criticality; } set { this._criticality = value; } } diff --git a/sdk/src/Services/ResourceGroups/Generated/Model/GroupingStatusesItem.cs b/sdk/src/Services/ResourceGroups/Generated/Model/GroupingStatusesItem.cs index 1d054f14df74..f9c896fea867 100644 --- a/sdk/src/Services/ResourceGroups/Generated/Model/GroupingStatusesItem.cs +++ b/sdk/src/Services/ResourceGroups/Generated/Model/GroupingStatusesItem.cs @@ -141,9 +141,9 @@ internal bool IsSetStatus() /// A timestamp of when the status was last updated. /// /// - public DateTime UpdatedAt + public DateTime? UpdatedAt { - get { return this._updatedAt.GetValueOrDefault(); } + get { return this._updatedAt; } set { this._updatedAt = value; } } diff --git a/sdk/src/Services/ResourceGroups/Generated/Model/Internal/MarshallTransformations/CancelTagSyncTaskRequestMarshaller.cs b/sdk/src/Services/ResourceGroups/Generated/Model/Internal/MarshallTransformations/CancelTagSyncTaskRequestMarshaller.cs index 50fe2c0ab95a..eaf1fc0ec80c 100644 --- a/sdk/src/Services/ResourceGroups/Generated/Model/Internal/MarshallTransformations/CancelTagSyncTaskRequestMarshaller.cs +++ b/sdk/src/Services/ResourceGroups/Generated/Model/Internal/MarshallTransformations/CancelTagSyncTaskRequestMarshaller.cs @@ -61,21 +61,24 @@ public IRequest Marshall(CancelTagSyncTaskRequest publicRequest) request.HttpMethod = "POST"; request.ResourcePath = "/cancel-tag-sync-task"; - using (StringWriter stringWriter = new StringWriter(CultureInfo.InvariantCulture)) + using (MemoryStream memoryStream = new MemoryStream()) { - JsonWriter writer = new JsonWriter(stringWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetTaskArn()) + using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) { - context.Writer.WritePropertyName("TaskArn"); - context.Writer.Write(publicRequest.TaskArn); + JsonWriter writer = new JsonWriter(streamWriter); + writer.Validate = false; + writer.WriteObjectStart(); + var context = new JsonMarshallerContext(request, writer); + if(publicRequest.IsSetTaskArn()) + { + context.Writer.WritePropertyName("TaskArn"); + context.Writer.Write(publicRequest.TaskArn); + } + + writer.WriteObjectEnd(); } - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); + request.Content = memoryStream.ToArray(); } diff --git a/sdk/src/Services/ResourceGroups/Generated/Model/Internal/MarshallTransformations/CreateGroupRequestMarshaller.cs b/sdk/src/Services/ResourceGroups/Generated/Model/Internal/MarshallTransformations/CreateGroupRequestMarshaller.cs index f6e18ceaeca3..7535f0f879a5 100644 --- a/sdk/src/Services/ResourceGroups/Generated/Model/Internal/MarshallTransformations/CreateGroupRequestMarshaller.cs +++ b/sdk/src/Services/ResourceGroups/Generated/Model/Internal/MarshallTransformations/CreateGroupRequestMarshaller.cs @@ -85,80 +85,40 @@ public IRequest Marshall(CreateGroupRequest publicRequest) context.Writer.WriteArrayEnd(); } -<<<<<<< HEAD + if(publicRequest.IsSetCriticality()) + { + context.Writer.WritePropertyName("Criticality"); + context.Writer.Write(publicRequest.Criticality.Value); + } + if(publicRequest.IsSetDescription()) { context.Writer.WritePropertyName("Description"); context.Writer.Write(publicRequest.Description); } -||||||| Commit version number update changes - if(publicRequest.IsSetDescription()) - { - context.Writer.WritePropertyName("Description"); - context.Writer.Write(publicRequest.Description); - } -======= - if(publicRequest.IsSetCriticality()) - { - context.Writer.WritePropertyName("Criticality"); - context.Writer.Write(publicRequest.Criticality); - } - if(publicRequest.IsSetDescription()) - { - context.Writer.WritePropertyName("Description"); - context.Writer.Write(publicRequest.Description); - } ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b + if(publicRequest.IsSetDisplayName()) + { + context.Writer.WritePropertyName("DisplayName"); + context.Writer.Write(publicRequest.DisplayName); + } -<<<<<<< HEAD if(publicRequest.IsSetName()) { context.Writer.WritePropertyName("Name"); context.Writer.Write(publicRequest.Name); } -||||||| Commit version number update changes - if(publicRequest.IsSetName()) - { - context.Writer.WritePropertyName("Name"); - context.Writer.Write(publicRequest.Name); - } -======= - if(publicRequest.IsSetDisplayName()) - { - context.Writer.WritePropertyName("DisplayName"); - context.Writer.Write(publicRequest.DisplayName); - } - if(publicRequest.IsSetName()) - { - context.Writer.WritePropertyName("Name"); - context.Writer.Write(publicRequest.Name); - } ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b + if(publicRequest.IsSetOwner()) + { + context.Writer.WritePropertyName("Owner"); + context.Writer.Write(publicRequest.Owner); + } -<<<<<<< HEAD if(publicRequest.IsSetResourceQuery()) { context.Writer.WritePropertyName("ResourceQuery"); context.Writer.WriteObjectStart(); -||||||| Commit version number update changes - if(publicRequest.IsSetResourceQuery()) - { - context.Writer.WritePropertyName("ResourceQuery"); - context.Writer.WriteObjectStart(); -======= - if(publicRequest.IsSetOwner()) - { - context.Writer.WritePropertyName("Owner"); - context.Writer.Write(publicRequest.Owner); - } - - if(publicRequest.IsSetResourceQuery()) - { - context.Writer.WritePropertyName("ResourceQuery"); - context.Writer.WriteObjectStart(); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b var marshaller = ResourceQueryMarshaller.Instance; marshaller.Marshall(publicRequest.ResourceQuery, context); diff --git a/sdk/src/Services/ResourceGroups/Generated/Model/Internal/MarshallTransformations/GetTagSyncTaskRequestMarshaller.cs b/sdk/src/Services/ResourceGroups/Generated/Model/Internal/MarshallTransformations/GetTagSyncTaskRequestMarshaller.cs index 707e7099eebb..a09435c9d4f0 100644 --- a/sdk/src/Services/ResourceGroups/Generated/Model/Internal/MarshallTransformations/GetTagSyncTaskRequestMarshaller.cs +++ b/sdk/src/Services/ResourceGroups/Generated/Model/Internal/MarshallTransformations/GetTagSyncTaskRequestMarshaller.cs @@ -61,21 +61,24 @@ public IRequest Marshall(GetTagSyncTaskRequest publicRequest) request.HttpMethod = "POST"; request.ResourcePath = "/get-tag-sync-task"; - using (StringWriter stringWriter = new StringWriter(CultureInfo.InvariantCulture)) + using (MemoryStream memoryStream = new MemoryStream()) { - JsonWriter writer = new JsonWriter(stringWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetTaskArn()) + using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) { - context.Writer.WritePropertyName("TaskArn"); - context.Writer.Write(publicRequest.TaskArn); + JsonWriter writer = new JsonWriter(streamWriter); + writer.Validate = false; + writer.WriteObjectStart(); + var context = new JsonMarshallerContext(request, writer); + if(publicRequest.IsSetTaskArn()) + { + context.Writer.WritePropertyName("TaskArn"); + context.Writer.Write(publicRequest.TaskArn); + } + + writer.WriteObjectEnd(); } - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); + request.Content = memoryStream.ToArray(); } diff --git a/sdk/src/Services/ResourceGroups/Generated/Model/Internal/MarshallTransformations/GetTagSyncTaskResponseUnmarshaller.cs b/sdk/src/Services/ResourceGroups/Generated/Model/Internal/MarshallTransformations/GetTagSyncTaskResponseUnmarshaller.cs index 2db78f9c0601..1073be26a6dc 100644 --- a/sdk/src/Services/ResourceGroups/Generated/Model/Internal/MarshallTransformations/GetTagSyncTaskResponseUnmarshaller.cs +++ b/sdk/src/Services/ResourceGroups/Generated/Model/Internal/MarshallTransformations/GetTagSyncTaskResponseUnmarshaller.cs @@ -54,7 +54,7 @@ public override AmazonWebServiceResponse Unmarshall(JsonUnmarshallerContext cont { if (context.TestExpression("CreatedAt", targetDepth)) { - var unmarshaller = DateTimeUnmarshaller.Instance; + var unmarshaller = NullableDateTimeUnmarshaller.Instance; response.CreatedAt = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/ResourceGroups/Generated/Model/Internal/MarshallTransformations/GroupIdentifierUnmarshaller.cs b/sdk/src/Services/ResourceGroups/Generated/Model/Internal/MarshallTransformations/GroupIdentifierUnmarshaller.cs index 53015444e6e9..89f2b0aa3de3 100644 --- a/sdk/src/Services/ResourceGroups/Generated/Model/Internal/MarshallTransformations/GroupIdentifierUnmarshaller.cs +++ b/sdk/src/Services/ResourceGroups/Generated/Model/Internal/MarshallTransformations/GroupIdentifierUnmarshaller.cs @@ -68,7 +68,7 @@ public GroupIdentifier Unmarshall(JsonUnmarshallerContext context) { if (context.TestExpression("Criticality", targetDepth)) { - var unmarshaller = IntUnmarshaller.Instance; + var unmarshaller = NullableIntUnmarshaller.Instance; unmarshalledObject.Criticality = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/ResourceGroups/Generated/Model/Internal/MarshallTransformations/GroupUnmarshaller.cs b/sdk/src/Services/ResourceGroups/Generated/Model/Internal/MarshallTransformations/GroupUnmarshaller.cs index e7f66aeaf88e..8555cdf5859d 100644 --- a/sdk/src/Services/ResourceGroups/Generated/Model/Internal/MarshallTransformations/GroupUnmarshaller.cs +++ b/sdk/src/Services/ResourceGroups/Generated/Model/Internal/MarshallTransformations/GroupUnmarshaller.cs @@ -74,7 +74,7 @@ public Group Unmarshall(JsonUnmarshallerContext context) } if (context.TestExpression("Criticality", targetDepth)) { - var unmarshaller = IntUnmarshaller.Instance; + var unmarshaller = NullableIntUnmarshaller.Instance; unmarshalledObject.Criticality = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/ResourceGroups/Generated/Model/Internal/MarshallTransformations/GroupingStatusesItemUnmarshaller.cs b/sdk/src/Services/ResourceGroups/Generated/Model/Internal/MarshallTransformations/GroupingStatusesItemUnmarshaller.cs index 61653d6cfa8a..493b7e755df5 100644 --- a/sdk/src/Services/ResourceGroups/Generated/Model/Internal/MarshallTransformations/GroupingStatusesItemUnmarshaller.cs +++ b/sdk/src/Services/ResourceGroups/Generated/Model/Internal/MarshallTransformations/GroupingStatusesItemUnmarshaller.cs @@ -98,7 +98,7 @@ public GroupingStatusesItem Unmarshall(JsonUnmarshallerContext context) } if (context.TestExpression("UpdatedAt", targetDepth)) { - var unmarshaller = DateTimeUnmarshaller.Instance; + var unmarshaller = NullableDateTimeUnmarshaller.Instance; unmarshalledObject.UpdatedAt = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/ResourceGroups/Generated/Model/Internal/MarshallTransformations/ListGroupingStatusesRequestMarshaller.cs b/sdk/src/Services/ResourceGroups/Generated/Model/Internal/MarshallTransformations/ListGroupingStatusesRequestMarshaller.cs index d0db6250c3ff..dd9ff83bc806 100644 --- a/sdk/src/Services/ResourceGroups/Generated/Model/Internal/MarshallTransformations/ListGroupingStatusesRequestMarshaller.cs +++ b/sdk/src/Services/ResourceGroups/Generated/Model/Internal/MarshallTransformations/ListGroupingStatusesRequestMarshaller.cs @@ -61,49 +61,52 @@ public IRequest Marshall(ListGroupingStatusesRequest publicRequest) request.HttpMethod = "POST"; request.ResourcePath = "/list-grouping-statuses"; - using (StringWriter stringWriter = new StringWriter(CultureInfo.InvariantCulture)) + using (MemoryStream memoryStream = new MemoryStream()) { - JsonWriter writer = new JsonWriter(stringWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetFilters()) + using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) { - context.Writer.WritePropertyName("Filters"); - context.Writer.WriteArrayStart(); - foreach(var publicRequestFiltersListValue in publicRequest.Filters) + JsonWriter writer = new JsonWriter(streamWriter); + writer.Validate = false; + writer.WriteObjectStart(); + var context = new JsonMarshallerContext(request, writer); + if(publicRequest.IsSetFilters()) { - context.Writer.WriteObjectStart(); - - var marshaller = ListGroupingStatusesFilterMarshaller.Instance; - marshaller.Marshall(publicRequestFiltersListValue, context); + context.Writer.WritePropertyName("Filters"); + context.Writer.WriteArrayStart(); + foreach(var publicRequestFiltersListValue in publicRequest.Filters) + { + context.Writer.WriteObjectStart(); + + var marshaller = ListGroupingStatusesFilterMarshaller.Instance; + marshaller.Marshall(publicRequestFiltersListValue, context); + + context.Writer.WriteObjectEnd(); + } + context.Writer.WriteArrayEnd(); + } - context.Writer.WriteObjectEnd(); + if(publicRequest.IsSetGroup()) + { + context.Writer.WritePropertyName("Group"); + context.Writer.Write(publicRequest.Group); } - context.Writer.WriteArrayEnd(); - } - if(publicRequest.IsSetGroup()) - { - context.Writer.WritePropertyName("Group"); - context.Writer.Write(publicRequest.Group); - } + if(publicRequest.IsSetMaxResults()) + { + context.Writer.WritePropertyName("MaxResults"); + context.Writer.Write(publicRequest.MaxResults.Value); + } - if(publicRequest.IsSetMaxResults()) - { - context.Writer.WritePropertyName("MaxResults"); - context.Writer.Write(publicRequest.MaxResults); - } + if(publicRequest.IsSetNextToken()) + { + context.Writer.WritePropertyName("NextToken"); + context.Writer.Write(publicRequest.NextToken); + } - if(publicRequest.IsSetNextToken()) - { - context.Writer.WritePropertyName("NextToken"); - context.Writer.Write(publicRequest.NextToken); + writer.WriteObjectEnd(); } - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); + request.Content = memoryStream.ToArray(); } diff --git a/sdk/src/Services/ResourceGroups/Generated/Model/Internal/MarshallTransformations/ListTagSyncTasksRequestMarshaller.cs b/sdk/src/Services/ResourceGroups/Generated/Model/Internal/MarshallTransformations/ListTagSyncTasksRequestMarshaller.cs index 80f4b337092a..f2bda8d26958 100644 --- a/sdk/src/Services/ResourceGroups/Generated/Model/Internal/MarshallTransformations/ListTagSyncTasksRequestMarshaller.cs +++ b/sdk/src/Services/ResourceGroups/Generated/Model/Internal/MarshallTransformations/ListTagSyncTasksRequestMarshaller.cs @@ -61,43 +61,46 @@ public IRequest Marshall(ListTagSyncTasksRequest publicRequest) request.HttpMethod = "POST"; request.ResourcePath = "/list-tag-sync-tasks"; - using (StringWriter stringWriter = new StringWriter(CultureInfo.InvariantCulture)) + using (MemoryStream memoryStream = new MemoryStream()) { - JsonWriter writer = new JsonWriter(stringWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetFilters()) + using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) { - context.Writer.WritePropertyName("Filters"); - context.Writer.WriteArrayStart(); - foreach(var publicRequestFiltersListValue in publicRequest.Filters) + JsonWriter writer = new JsonWriter(streamWriter); + writer.Validate = false; + writer.WriteObjectStart(); + var context = new JsonMarshallerContext(request, writer); + if(publicRequest.IsSetFilters()) { - context.Writer.WriteObjectStart(); + context.Writer.WritePropertyName("Filters"); + context.Writer.WriteArrayStart(); + foreach(var publicRequestFiltersListValue in publicRequest.Filters) + { + context.Writer.WriteObjectStart(); - var marshaller = ListTagSyncTasksFilterMarshaller.Instance; - marshaller.Marshall(publicRequestFiltersListValue, context); + var marshaller = ListTagSyncTasksFilterMarshaller.Instance; + marshaller.Marshall(publicRequestFiltersListValue, context); - context.Writer.WriteObjectEnd(); + context.Writer.WriteObjectEnd(); + } + context.Writer.WriteArrayEnd(); } - context.Writer.WriteArrayEnd(); - } - if(publicRequest.IsSetMaxResults()) - { - context.Writer.WritePropertyName("MaxResults"); - context.Writer.Write(publicRequest.MaxResults); - } + if(publicRequest.IsSetMaxResults()) + { + context.Writer.WritePropertyName("MaxResults"); + context.Writer.Write(publicRequest.MaxResults.Value); + } - if(publicRequest.IsSetNextToken()) - { - context.Writer.WritePropertyName("NextToken"); - context.Writer.Write(publicRequest.NextToken); + if(publicRequest.IsSetNextToken()) + { + context.Writer.WritePropertyName("NextToken"); + context.Writer.Write(publicRequest.NextToken); + } + + writer.WriteObjectEnd(); } - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); + request.Content = memoryStream.ToArray(); } diff --git a/sdk/src/Services/ResourceGroups/Generated/Model/Internal/MarshallTransformations/StartTagSyncTaskRequestMarshaller.cs b/sdk/src/Services/ResourceGroups/Generated/Model/Internal/MarshallTransformations/StartTagSyncTaskRequestMarshaller.cs index 070ac0dc1b6e..11700860ae8a 100644 --- a/sdk/src/Services/ResourceGroups/Generated/Model/Internal/MarshallTransformations/StartTagSyncTaskRequestMarshaller.cs +++ b/sdk/src/Services/ResourceGroups/Generated/Model/Internal/MarshallTransformations/StartTagSyncTaskRequestMarshaller.cs @@ -61,39 +61,42 @@ public IRequest Marshall(StartTagSyncTaskRequest publicRequest) request.HttpMethod = "POST"; request.ResourcePath = "/start-tag-sync-task"; - using (StringWriter stringWriter = new StringWriter(CultureInfo.InvariantCulture)) + using (MemoryStream memoryStream = new MemoryStream()) { - JsonWriter writer = new JsonWriter(stringWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetGroup()) + using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) { - context.Writer.WritePropertyName("Group"); - context.Writer.Write(publicRequest.Group); - } + JsonWriter writer = new JsonWriter(streamWriter); + writer.Validate = false; + writer.WriteObjectStart(); + var context = new JsonMarshallerContext(request, writer); + if(publicRequest.IsSetGroup()) + { + context.Writer.WritePropertyName("Group"); + context.Writer.Write(publicRequest.Group); + } - if(publicRequest.IsSetRoleArn()) - { - context.Writer.WritePropertyName("RoleArn"); - context.Writer.Write(publicRequest.RoleArn); - } + if(publicRequest.IsSetRoleArn()) + { + context.Writer.WritePropertyName("RoleArn"); + context.Writer.Write(publicRequest.RoleArn); + } - if(publicRequest.IsSetTagKey()) - { - context.Writer.WritePropertyName("TagKey"); - context.Writer.Write(publicRequest.TagKey); - } + if(publicRequest.IsSetTagKey()) + { + context.Writer.WritePropertyName("TagKey"); + context.Writer.Write(publicRequest.TagKey); + } - if(publicRequest.IsSetTagValue()) - { - context.Writer.WritePropertyName("TagValue"); - context.Writer.Write(publicRequest.TagValue); + if(publicRequest.IsSetTagValue()) + { + context.Writer.WritePropertyName("TagValue"); + context.Writer.Write(publicRequest.TagValue); + } + + writer.WriteObjectEnd(); } - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); + request.Content = memoryStream.ToArray(); } diff --git a/sdk/src/Services/ResourceGroups/Generated/Model/Internal/MarshallTransformations/TagSyncTaskItemUnmarshaller.cs b/sdk/src/Services/ResourceGroups/Generated/Model/Internal/MarshallTransformations/TagSyncTaskItemUnmarshaller.cs index b0643ce0bec9..12d62f324586 100644 --- a/sdk/src/Services/ResourceGroups/Generated/Model/Internal/MarshallTransformations/TagSyncTaskItemUnmarshaller.cs +++ b/sdk/src/Services/ResourceGroups/Generated/Model/Internal/MarshallTransformations/TagSyncTaskItemUnmarshaller.cs @@ -68,7 +68,7 @@ public TagSyncTaskItem Unmarshall(JsonUnmarshallerContext context) { if (context.TestExpression("CreatedAt", targetDepth)) { - var unmarshaller = DateTimeUnmarshaller.Instance; + var unmarshaller = NullableDateTimeUnmarshaller.Instance; unmarshalledObject.CreatedAt = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/ResourceGroups/Generated/Model/Internal/MarshallTransformations/UpdateGroupRequestMarshaller.cs b/sdk/src/Services/ResourceGroups/Generated/Model/Internal/MarshallTransformations/UpdateGroupRequestMarshaller.cs index ae8ecebe787e..0b2c246dfff5 100644 --- a/sdk/src/Services/ResourceGroups/Generated/Model/Internal/MarshallTransformations/UpdateGroupRequestMarshaller.cs +++ b/sdk/src/Services/ResourceGroups/Generated/Model/Internal/MarshallTransformations/UpdateGroupRequestMarshaller.cs @@ -63,63 +63,35 @@ public IRequest Marshall(UpdateGroupRequest publicRequest) request.ResourcePath = "/update-group"; using (MemoryStream memoryStream = new MemoryStream()) { -<<<<<<< HEAD using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) -||||||| Commit version number update changes - JsonWriter writer = new JsonWriter(stringWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetDescription()) -======= - JsonWriter writer = new JsonWriter(stringWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetCriticality()) - { - context.Writer.WritePropertyName("Criticality"); - context.Writer.Write(publicRequest.Criticality); - } - - if(publicRequest.IsSetDescription()) ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b { JsonWriter writer = new JsonWriter(streamWriter); writer.Validate = false; writer.WriteObjectStart(); var context = new JsonMarshallerContext(request, writer); + if(publicRequest.IsSetCriticality()) + { + context.Writer.WritePropertyName("Criticality"); + context.Writer.Write(publicRequest.Criticality.Value); + } + if(publicRequest.IsSetDescription()) { context.Writer.WritePropertyName("Description"); context.Writer.Write(publicRequest.Description); } -<<<<<<< HEAD + if(publicRequest.IsSetDisplayName()) + { + context.Writer.WritePropertyName("DisplayName"); + context.Writer.Write(publicRequest.DisplayName); + } + if(publicRequest.IsSetGroup()) { context.Writer.WritePropertyName("Group"); context.Writer.Write(publicRequest.Group); } -||||||| Commit version number update changes - if(publicRequest.IsSetGroup()) - { - context.Writer.WritePropertyName("Group"); - context.Writer.Write(publicRequest.Group); - } -======= - if(publicRequest.IsSetDisplayName()) - { - context.Writer.WritePropertyName("DisplayName"); - context.Writer.Write(publicRequest.DisplayName); - } - - if(publicRequest.IsSetGroup()) - { - context.Writer.WritePropertyName("Group"); - context.Writer.Write(publicRequest.Group); - } ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b if(publicRequest.IsSetGroupName()) { @@ -127,26 +99,16 @@ public IRequest Marshall(UpdateGroupRequest publicRequest) context.Writer.Write(publicRequest.GroupName); } + if(publicRequest.IsSetOwner()) + { + context.Writer.WritePropertyName("Owner"); + context.Writer.Write(publicRequest.Owner); + } + writer.WriteObjectEnd(); } -<<<<<<< HEAD request.Content = memoryStream.ToArray(); -||||||| Commit version number update changes - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); -======= - if(publicRequest.IsSetOwner()) - { - context.Writer.WritePropertyName("Owner"); - context.Writer.Write(publicRequest.Owner); - } - - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b } diff --git a/sdk/src/Services/ResourceGroups/Generated/Model/ListGroupingStatusesRequest.cs b/sdk/src/Services/ResourceGroups/Generated/Model/ListGroupingStatusesRequest.cs index 31852284ff9c..10368d0659df 100644 --- a/sdk/src/Services/ResourceGroups/Generated/Model/ListGroupingStatusesRequest.cs +++ b/sdk/src/Services/ResourceGroups/Generated/Model/ListGroupingStatusesRequest.cs @@ -87,9 +87,9 @@ internal bool IsSetGroup() /// /// [AWSProperty(Min=1, Max=50)] - public int MaxResults + public int? MaxResults { - get { return this._maxResults.GetValueOrDefault(); } + get { return this._maxResults; } set { this._maxResults = value; } } diff --git a/sdk/src/Services/ResourceGroups/Generated/Model/ListTagSyncTasksRequest.cs b/sdk/src/Services/ResourceGroups/Generated/Model/ListTagSyncTasksRequest.cs index 74e19ce261d8..dada60e3afa2 100644 --- a/sdk/src/Services/ResourceGroups/Generated/Model/ListTagSyncTasksRequest.cs +++ b/sdk/src/Services/ResourceGroups/Generated/Model/ListTagSyncTasksRequest.cs @@ -80,9 +80,9 @@ internal bool IsSetFilters() /// /// [AWSProperty(Min=1, Max=50)] - public int MaxResults + public int? MaxResults { - get { return this._maxResults.GetValueOrDefault(); } + get { return this._maxResults; } set { this._maxResults = value; } } diff --git a/sdk/src/Services/ResourceGroups/Generated/Model/TagSyncTaskItem.cs b/sdk/src/Services/ResourceGroups/Generated/Model/TagSyncTaskItem.cs index 73e0676f17fd..0c9ef32d58cc 100644 --- a/sdk/src/Services/ResourceGroups/Generated/Model/TagSyncTaskItem.cs +++ b/sdk/src/Services/ResourceGroups/Generated/Model/TagSyncTaskItem.cs @@ -50,9 +50,9 @@ public partial class TagSyncTaskItem /// The timestamp of when the tag-sync task was created. /// /// - public DateTime CreatedAt + public DateTime? CreatedAt { - get { return this._createdAt.GetValueOrDefault(); } + get { return this._createdAt; } set { this._createdAt = value; } } diff --git a/sdk/src/Services/ResourceGroups/Generated/Model/UpdateGroupRequest.cs b/sdk/src/Services/ResourceGroups/Generated/Model/UpdateGroupRequest.cs index 9aed4179b2f9..d0bfd32c7a99 100644 --- a/sdk/src/Services/ResourceGroups/Generated/Model/UpdateGroupRequest.cs +++ b/sdk/src/Services/ResourceGroups/Generated/Model/UpdateGroupRequest.cs @@ -65,9 +65,9 @@ public partial class UpdateGroupRequest : AmazonResourceGroupsRequest /// /// [AWSProperty(Min=1, Max=10)] - public int Criticality + public int? Criticality { - get { return this._criticality.GetValueOrDefault(); } + get { return this._criticality; } set { this._criticality = value; } } diff --git a/sdk/src/Services/ResourceGroups/Generated/Model/_bcl45+netstandard/IListGroupingStatusesPaginator.cs b/sdk/src/Services/ResourceGroups/Generated/Model/_bcl+netstandard/IListGroupingStatusesPaginator.cs similarity index 100% rename from sdk/src/Services/ResourceGroups/Generated/Model/_bcl45+netstandard/IListGroupingStatusesPaginator.cs rename to sdk/src/Services/ResourceGroups/Generated/Model/_bcl+netstandard/IListGroupingStatusesPaginator.cs diff --git a/sdk/src/Services/ResourceGroups/Generated/Model/_bcl45+netstandard/IListTagSyncTasksPaginator.cs b/sdk/src/Services/ResourceGroups/Generated/Model/_bcl+netstandard/IListTagSyncTasksPaginator.cs similarity index 100% rename from sdk/src/Services/ResourceGroups/Generated/Model/_bcl45+netstandard/IListTagSyncTasksPaginator.cs rename to sdk/src/Services/ResourceGroups/Generated/Model/_bcl+netstandard/IListTagSyncTasksPaginator.cs diff --git a/sdk/src/Services/ResourceGroups/Generated/Model/_bcl45+netstandard/ListGroupingStatusesPaginator.cs b/sdk/src/Services/ResourceGroups/Generated/Model/_bcl+netstandard/ListGroupingStatusesPaginator.cs similarity index 100% rename from sdk/src/Services/ResourceGroups/Generated/Model/_bcl45+netstandard/ListGroupingStatusesPaginator.cs rename to sdk/src/Services/ResourceGroups/Generated/Model/_bcl+netstandard/ListGroupingStatusesPaginator.cs diff --git a/sdk/src/Services/ResourceGroups/Generated/Model/_bcl45+netstandard/ListTagSyncTasksPaginator.cs b/sdk/src/Services/ResourceGroups/Generated/Model/_bcl+netstandard/ListTagSyncTasksPaginator.cs similarity index 100% rename from sdk/src/Services/ResourceGroups/Generated/Model/_bcl45+netstandard/ListTagSyncTasksPaginator.cs rename to sdk/src/Services/ResourceGroups/Generated/Model/_bcl+netstandard/ListTagSyncTasksPaginator.cs diff --git a/sdk/src/Services/ResourceGroups/Generated/_bcl/AmazonResourceGroupsClient.cs b/sdk/src/Services/ResourceGroups/Generated/_bcl/AmazonResourceGroupsClient.cs index 4df9222c8efc..52074a6c76fc 100644 --- a/sdk/src/Services/ResourceGroups/Generated/_bcl/AmazonResourceGroupsClient.cs +++ b/sdk/src/Services/ResourceGroups/Generated/_bcl/AmazonResourceGroupsClient.cs @@ -79,7 +79,8 @@ namespace Amazon.ResourceGroups /// ///
  • /// - /// Resolving resource group member ARNs so they can be returned as search results + /// Resolving resource group member Amazon resource names (ARN)s so they can be returned + /// as search results /// ///
  • /// @@ -314,6 +315,121 @@ protected override void Dispose(bool disposing) #endregion + #region CancelTagSyncTask + + + /// + /// Cancels the specified tag-sync task. + /// + /// + /// + /// Minimum permissions + /// + /// + /// + /// To run this command, you must have the following permissions: + /// + ///
    • + /// + /// resource-groups:CancelTagSyncTask on the application group + /// + ///
    • + /// + /// resource-groups:DeleteGroup + /// + ///
    + ///     + /// Container for the necessary parameters to execute the CancelTagSyncTask service method. + /// + /// The response from the CancelTagSyncTask service method, as returned by ResourceGroups. + /// + /// The request includes one or more parameters that violate validation rules. + /// + /// + /// The caller isn't authorized to make the request. Check permissions. + /// + /// + /// An internal error occurred while processing the request. Try again later. + /// + /// + /// The request uses an HTTP method that isn't allowed for the specified resource. + /// + /// + /// You've exceeded throttling limits by making too many requests in a period of time. + /// + /// + /// The request was rejected because it doesn't have valid credentials for the target + /// resource. + /// + /// REST API Reference for CancelTagSyncTask Operation + public virtual CancelTagSyncTaskResponse CancelTagSyncTask(CancelTagSyncTaskRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = CancelTagSyncTaskRequestMarshaller.Instance; + options.ResponseUnmarshaller = CancelTagSyncTaskResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// Cancels the specified tag-sync task. + /// + /// + /// + /// Minimum permissions + /// + /// + /// + /// To run this command, you must have the following permissions: + /// + ///
    • + /// + /// resource-groups:CancelTagSyncTask on the application group + /// + ///
    • + /// + /// resource-groups:DeleteGroup + /// + ///
    + ///     + /// Container for the necessary parameters to execute the CancelTagSyncTask service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the CancelTagSyncTask service method, as returned by ResourceGroups. + /// + /// The request includes one or more parameters that violate validation rules. + /// + /// + /// The caller isn't authorized to make the request. Check permissions. + /// + /// + /// An internal error occurred while processing the request. Try again later. + /// + /// + /// The request uses an HTTP method that isn't allowed for the specified resource. + /// + /// + /// You've exceeded throttling limits by making too many requests in a period of time. + /// + /// + /// The request was rejected because it doesn't have valid credentials for the target + /// resource. + /// + /// REST API Reference for CancelTagSyncTask Operation + public virtual Task CancelTagSyncTaskAsync(CancelTagSyncTaskRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = CancelTagSyncTaskRequestMarshaller.Instance; + options.ResponseUnmarshaller = CancelTagSyncTaskResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + #region CreateGroup @@ -931,7 +1047,7 @@ public virtual GetGroupQueryResponse GetGroupQuery(GetGroupQueryRequest request) /// /// Returns a list of tags that are associated with a resource group, specified by an - /// ARN. + /// Amazon resource name (ARN). /// /// /// @@ -981,7 +1097,7 @@ public virtual GetTagsResponse GetTags(GetTagsRequest request) /// /// Returns a list of tags that are associated with a resource group, specified by an - /// ARN. + /// Amazon resource name (ARN). /// /// /// @@ -1033,6 +1149,119 @@ public virtual GetTagsResponse GetTags(GetTagsRequest request) #endregion + #region GetTagSyncTask + + + /// + /// Returns information about a specified tag-sync task. + /// + /// + /// + /// Minimum permissions + /// + /// + /// + /// To run this command, you must have the following permissions: + /// + ///
    • + /// + /// resource-groups:GetTagSyncTask on the application group + /// + ///
    + ///     + /// Container for the necessary parameters to execute the GetTagSyncTask service method. + /// + /// The response from the GetTagSyncTask service method, as returned by ResourceGroups. + /// + /// The request includes one or more parameters that violate validation rules. + /// + /// + /// The caller isn't authorized to make the request. Check permissions. + /// + /// + /// An internal error occurred while processing the request. Try again later. + /// + /// + /// The request uses an HTTP method that isn't allowed for the specified resource. + /// + /// + /// One or more of the specified resources don't exist. + /// + /// + /// You've exceeded throttling limits by making too many requests in a period of time. + /// + /// + /// The request was rejected because it doesn't have valid credentials for the target + /// resource. + /// + /// REST API Reference for GetTagSyncTask Operation + public virtual GetTagSyncTaskResponse GetTagSyncTask(GetTagSyncTaskRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = GetTagSyncTaskRequestMarshaller.Instance; + options.ResponseUnmarshaller = GetTagSyncTaskResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// Returns information about a specified tag-sync task. + /// + /// + /// + /// Minimum permissions + /// + /// + /// + /// To run this command, you must have the following permissions: + /// + ///
    • + /// + /// resource-groups:GetTagSyncTask on the application group + /// + ///
    + ///     + /// Container for the necessary parameters to execute the GetTagSyncTask service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the GetTagSyncTask service method, as returned by ResourceGroups. + /// + /// The request includes one or more parameters that violate validation rules. + /// + /// + /// The caller isn't authorized to make the request. Check permissions. + /// + /// + /// An internal error occurred while processing the request. Try again later. + /// + /// + /// The request uses an HTTP method that isn't allowed for the specified resource. + /// + /// + /// One or more of the specified resources don't exist. + /// + /// + /// You've exceeded throttling limits by making too many requests in a period of time. + /// + /// + /// The request was rejected because it doesn't have valid credentials for the target + /// resource. + /// + /// REST API Reference for GetTagSyncTask Operation + public virtual Task GetTagSyncTaskAsync(GetTagSyncTaskRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = GetTagSyncTaskRequestMarshaller.Instance; + options.ResponseUnmarshaller = GetTagSyncTaskResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + #region GroupResources @@ -1041,8 +1270,7 @@ public virtual GetTagsResponse GetTags(GetTagsRequest request) /// /// /// - /// You can use this operation with only resource groups that are configured with the - /// following types: + /// You can only use this operation with the following groups: /// ///
    • /// @@ -1052,9 +1280,14 @@ public virtual GetTagsResponse GetTags(GetTagsRequest request) /// /// AWS::EC2::CapacityReservationPool /// + ///
    • + /// + /// AWS::ResourceGroups::ApplicationGroup + /// ///
    /// - /// Other resource group type and resource types aren't currently supported by this operation. + /// Other resource group types and resource types are not currently supported by this + /// operation. /// ///     /// @@ -1107,8 +1340,7 @@ public virtual GroupResourcesResponse GroupResources(GroupResourcesRequest reque /// /// /// - /// You can use this operation with only resource groups that are configured with the - /// following types: + /// You can only use this operation with the following groups: /// ///
    • /// @@ -1118,9 +1350,14 @@ public virtual GroupResourcesResponse GroupResources(GroupResourcesRequest reque /// /// AWS::EC2::CapacityReservationPool /// + ///
    • + /// + /// AWS::ResourceGroups::ApplicationGroup + /// ///
    /// - /// Other resource group type and resource types aren't currently supported by this operation. + /// Other resource group types and resource types are not currently supported by this + /// operation. /// ///     /// @@ -1172,11 +1409,85 @@ public virtual GroupResourcesResponse GroupResources(GroupResourcesRequest reque #endregion + #region ListGroupingStatuses + + + /// + /// Returns the status of the last grouping or ungrouping action for each resource in + /// the specified application group. + /// + /// Container for the necessary parameters to execute the ListGroupingStatuses service method. + /// + /// The response from the ListGroupingStatuses service method, as returned by ResourceGroups. + /// + /// The request includes one or more parameters that violate validation rules. + /// + /// + /// The caller isn't authorized to make the request. Check permissions. + /// + /// + /// An internal error occurred while processing the request. Try again later. + /// + /// + /// The request uses an HTTP method that isn't allowed for the specified resource. + /// + /// + /// You've exceeded throttling limits by making too many requests in a period of time. + /// + /// REST API Reference for ListGroupingStatuses Operation + public virtual ListGroupingStatusesResponse ListGroupingStatuses(ListGroupingStatusesRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = ListGroupingStatusesRequestMarshaller.Instance; + options.ResponseUnmarshaller = ListGroupingStatusesResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// Returns the status of the last grouping or ungrouping action for each resource in + /// the specified application group. + /// + /// Container for the necessary parameters to execute the ListGroupingStatuses service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the ListGroupingStatuses service method, as returned by ResourceGroups. + /// + /// The request includes one or more parameters that violate validation rules. + /// + /// + /// The caller isn't authorized to make the request. Check permissions. + /// + /// + /// An internal error occurred while processing the request. Try again later. + /// + /// + /// The request uses an HTTP method that isn't allowed for the specified resource. + /// + /// + /// You've exceeded throttling limits by making too many requests in a period of time. + /// + /// REST API Reference for ListGroupingStatuses Operation + public virtual Task ListGroupingStatusesAsync(ListGroupingStatusesRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = ListGroupingStatusesRequestMarshaller.Instance; + options.ResponseUnmarshaller = ListGroupingStatusesResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + #region ListGroupResources /// - /// Returns a list of ARNs of the resources that are members of a specified resource group. + /// Returns a list of Amazon resource names (ARNs) of the resources that are members of + /// a specified resource group. /// /// /// @@ -1241,7 +1552,8 @@ public virtual ListGroupResourcesResponse ListGroupResources(ListGroupResourcesR /// - /// Returns a list of ARNs of the resources that are members of a specified resource group. + /// Returns a list of Amazon resource names (ARNs) of the resources that are members of + /// a specified resource group. /// /// /// @@ -1408,6 +1720,115 @@ public virtual ListGroupsResponse ListGroups(ListGroupsRequest request) #endregion + #region ListTagSyncTasks + + + /// + /// Returns a list of tag-sync tasks. + /// + /// + /// + /// Minimum permissions + /// + /// + /// + /// To run this command, you must have the following permissions: + /// + ///
    • + /// + /// resource-groups:ListTagSyncTasks with the group passed in the filters as the + /// resource or * if using no filters + /// + ///
    + ///     + /// Container for the necessary parameters to execute the ListTagSyncTasks service method. + /// + /// The response from the ListTagSyncTasks service method, as returned by ResourceGroups. + /// + /// The request includes one or more parameters that violate validation rules. + /// + /// + /// The caller isn't authorized to make the request. Check permissions. + /// + /// + /// An internal error occurred while processing the request. Try again later. + /// + /// + /// The request uses an HTTP method that isn't allowed for the specified resource. + /// + /// + /// You've exceeded throttling limits by making too many requests in a period of time. + /// + /// + /// The request was rejected because it doesn't have valid credentials for the target + /// resource. + /// + /// REST API Reference for ListTagSyncTasks Operation + public virtual ListTagSyncTasksResponse ListTagSyncTasks(ListTagSyncTasksRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = ListTagSyncTasksRequestMarshaller.Instance; + options.ResponseUnmarshaller = ListTagSyncTasksResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// Returns a list of tag-sync tasks. + /// + /// + /// + /// Minimum permissions + /// + /// + /// + /// To run this command, you must have the following permissions: + /// + ///
    • + /// + /// resource-groups:ListTagSyncTasks with the group passed in the filters as the + /// resource or * if using no filters + /// + ///
    + ///     + /// Container for the necessary parameters to execute the ListTagSyncTasks service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the ListTagSyncTasks service method, as returned by ResourceGroups. + /// + /// The request includes one or more parameters that violate validation rules. + /// + /// + /// The caller isn't authorized to make the request. Check permissions. + /// + /// + /// An internal error occurred while processing the request. Try again later. + /// + /// + /// The request uses an HTTP method that isn't allowed for the specified resource. + /// + /// + /// You've exceeded throttling limits by making too many requests in a period of time. + /// + /// + /// The request was rejected because it doesn't have valid credentials for the target + /// resource. + /// + /// REST API Reference for ListTagSyncTasks Operation + public virtual Task ListTagSyncTasksAsync(ListTagSyncTasksRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = ListTagSyncTasksRequestMarshaller.Instance; + options.ResponseUnmarshaller = ListTagSyncTasksResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + #region PutGroupConfiguration @@ -1652,12 +2073,144 @@ public virtual SearchResourcesResponse SearchResources(SearchResourcesRequest re #endregion + #region StartTagSyncTask + + + /// + /// Creates a new tag-sync task to onboard and sync resources tagged with a specific tag + /// key-value pair to an application. + /// + /// + /// + /// Minimum permissions + /// + /// + /// + /// To run this command, you must have the following permissions: + /// + ///
    • + /// + /// resource-groups:StartTagSyncTask on the application group + /// + ///
    • + /// + /// resource-groups:CreateGroup + /// + ///
    • + /// + /// iam:PassRole on the role provided in the request + /// + ///
    + ///     + /// Container for the necessary parameters to execute the StartTagSyncTask service method. + /// + /// The response from the StartTagSyncTask service method, as returned by ResourceGroups. + /// + /// The request includes one or more parameters that violate validation rules. + /// + /// + /// The caller isn't authorized to make the request. Check permissions. + /// + /// + /// An internal error occurred while processing the request. Try again later. + /// + /// + /// The request uses an HTTP method that isn't allowed for the specified resource. + /// + /// + /// One or more of the specified resources don't exist. + /// + /// + /// You've exceeded throttling limits by making too many requests in a period of time. + /// + /// + /// The request was rejected because it doesn't have valid credentials for the target + /// resource. + /// + /// REST API Reference for StartTagSyncTask Operation + public virtual StartTagSyncTaskResponse StartTagSyncTask(StartTagSyncTaskRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = StartTagSyncTaskRequestMarshaller.Instance; + options.ResponseUnmarshaller = StartTagSyncTaskResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// Creates a new tag-sync task to onboard and sync resources tagged with a specific tag + /// key-value pair to an application. + /// + /// + /// + /// Minimum permissions + /// + /// + /// + /// To run this command, you must have the following permissions: + /// + ///
    • + /// + /// resource-groups:StartTagSyncTask on the application group + /// + ///
    • + /// + /// resource-groups:CreateGroup + /// + ///
    • + /// + /// iam:PassRole on the role provided in the request + /// + ///
    + ///     + /// Container for the necessary parameters to execute the StartTagSyncTask service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the StartTagSyncTask service method, as returned by ResourceGroups. + /// + /// The request includes one or more parameters that violate validation rules. + /// + /// + /// The caller isn't authorized to make the request. Check permissions. + /// + /// + /// An internal error occurred while processing the request. Try again later. + /// + /// + /// The request uses an HTTP method that isn't allowed for the specified resource. + /// + /// + /// One or more of the specified resources don't exist. + /// + /// + /// You've exceeded throttling limits by making too many requests in a period of time. + /// + /// + /// The request was rejected because it doesn't have valid credentials for the target + /// resource. + /// + /// REST API Reference for StartTagSyncTask Operation + public virtual Task StartTagSyncTaskAsync(StartTagSyncTaskRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = StartTagSyncTaskRequestMarshaller.Instance; + options.ResponseUnmarshaller = StartTagSyncTaskResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + #region Tag /// - /// Adds tags to a resource group with the specified ARN. Existing tags on a resource - /// group are not changed if they are not specified in the request parameters. + /// Adds tags to a resource group with the specified Amazon resource name (ARN). Existing + /// tags on a resource group are not changed if they are not specified in the request + /// parameters. /// /// /// @@ -1712,8 +2265,9 @@ public virtual TagResponse Tag(TagRequest request) /// - /// Adds tags to a resource group with the specified ARN. Existing tags on a resource - /// group are not changed if they are not specified in the request parameters. + /// Adds tags to a resource group with the specified Amazon resource name (ARN). Existing + /// tags on a resource group are not changed if they are not specified in the request + /// parameters. /// /// /// diff --git a/sdk/src/Services/ResourceGroups/Properties/AssemblyInfo.cs b/sdk/src/Services/ResourceGroups/Properties/AssemblyInfo.cs index cc659ebd5f16..9d54e9f3af17 100644 --- a/sdk/src/Services/ResourceGroups/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/ResourceGroups/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.27")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/ResourceGroups/ResourceGroups.sln b/sdk/src/Services/ResourceGroups/ResourceGroups.sln index f0bfdc286253..ec1575e43faa 100644 --- a/sdk/src/Services/ResourceGroups/ResourceGroups.sln +++ b/sdk/src/Services/ResourceGroups/ResourceGroups.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {F07099FD-F071-4A52-A92D-5A703CB6CC83}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {F07099FD-F071-4A52-A92D-5A703CB6CC83}.Debug|Any CPU.Build.0 = Debug|Any CPU {F07099FD-F071-4A52-A92D-5A703CB6CC83}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {4E14B323-21DB-45BB-8BB1-E8AAD5134840}.Debug|Any CPU.Build.0 = Debug|Any CPU {4E14B323-21DB-45BB-8BB1-E8AAD5134840}.Release|Any CPU.ActiveCfg = Release|Any CPU {4E14B323-21DB-45BB-8BB1-E8AAD5134840}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {8296D3E8-0F7B-4CEF-AD70-048EF4DA8B8C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8296D3E8-0F7B-4CEF-AD70-048EF4DA8B8C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8296D3E8-0F7B-4CEF-AD70-048EF4DA8B8C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8296D3E8-0F7B-4CEF-AD70-048EF4DA8B8C}.Release|Any CPU.Build.0 = Release|Any CPU - {50862EC5-A427-4748-B4D7-AB8CACE33DD2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {50862EC5-A427-4748-B4D7-AB8CACE33DD2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {50862EC5-A427-4748-B4D7-AB8CACE33DD2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {50862EC5-A427-4748-B4D7-AB8CACE33DD2}.Release|Any CPU.Build.0 = Release|Any CPU - {DBA6203A-FD2A-460D-BC97-4278CA8CF9D3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DBA6203A-FD2A-460D-BC97-4278CA8CF9D3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DBA6203A-FD2A-460D-BC97-4278CA8CF9D3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DBA6203A-FD2A-460D-BC97-4278CA8CF9D3}.Release|Any CPU.Build.0 = Release|Any CPU - {1DB068CE-8007-470D-A2EE-BA02FFB0A4AF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1DB068CE-8007-470D-A2EE-BA02FFB0A4AF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1DB068CE-8007-470D-A2EE-BA02FFB0A4AF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1DB068CE-8007-470D-A2EE-BA02FFB0A4AF}.Release|Any CPU.Build.0 = Release|Any CPU - {053D0FB0-D613-4AF3-8B08-1782FE072756}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {053D0FB0-D613-4AF3-8B08-1782FE072756}.Debug|Any CPU.Build.0 = Debug|Any CPU - {053D0FB0-D613-4AF3-8B08-1782FE072756}.Release|Any CPU.ActiveCfg = Release|Any CPU - {053D0FB0-D613-4AF3-8B08-1782FE072756}.Release|Any CPU.Build.0 = Release|Any CPU - {495BF000-FD6A-4A85-BC32-FEEAC877A247}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {495BF000-FD6A-4A85-BC32-FEEAC877A247}.Debug|Any CPU.Build.0 = Debug|Any CPU - {495BF000-FD6A-4A85-BC32-FEEAC877A247}.Release|Any CPU.ActiveCfg = Release|Any CPU - {495BF000-FD6A-4A85-BC32-FEEAC877A247}.Release|Any CPU.Build.0 = Release|Any CPU - {40B899AE-DA8C-42BE-92EA-19E9E0E5C69E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {40B899AE-DA8C-42BE-92EA-19E9E0E5C69E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {40B899AE-DA8C-42BE-92EA-19E9E0E5C69E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {40B899AE-DA8C-42BE-92EA-19E9E0E5C69E}.Release|Any CPU.Build.0 = Release|Any CPU - {F29E2363-8710-41BE-81E4-C8184A8AF1D3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F29E2363-8710-41BE-81E4-C8184A8AF1D3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F29E2363-8710-41BE-81E4-C8184A8AF1D3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F29E2363-8710-41BE-81E4-C8184A8AF1D3}.Release|Any CPU.Build.0 = Release|Any CPU - {890C32B2-80B7-4DE2-A0AE-4B438DA3B2D3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {890C32B2-80B7-4DE2-A0AE-4B438DA3B2D3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {890C32B2-80B7-4DE2-A0AE-4B438DA3B2D3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {890C32B2-80B7-4DE2-A0AE-4B438DA3B2D3}.Release|Any CPU.Build.0 = Release|Any CPU - {F7EA43F5-2403-4978-B74C-41B6A5F0641D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F7EA43F5-2403-4978-B74C-41B6A5F0641D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F7EA43F5-2403-4978-B74C-41B6A5F0641D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F7EA43F5-2403-4978-B74C-41B6A5F0641D}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {8296D3E8-0F7B-4CEF-AD70-048EF4DA8B8C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8296D3E8-0F7B-4CEF-AD70-048EF4DA8B8C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8296D3E8-0F7B-4CEF-AD70-048EF4DA8B8C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8296D3E8-0F7B-4CEF-AD70-048EF4DA8B8C}.Release|Any CPU.Build.0 = Release|Any CPU - {50862EC5-A427-4748-B4D7-AB8CACE33DD2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {50862EC5-A427-4748-B4D7-AB8CACE33DD2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {50862EC5-A427-4748-B4D7-AB8CACE33DD2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {50862EC5-A427-4748-B4D7-AB8CACE33DD2}.Release|Any CPU.Build.0 = Release|Any CPU - {DBA6203A-FD2A-460D-BC97-4278CA8CF9D3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DBA6203A-FD2A-460D-BC97-4278CA8CF9D3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DBA6203A-FD2A-460D-BC97-4278CA8CF9D3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DBA6203A-FD2A-460D-BC97-4278CA8CF9D3}.Release|Any CPU.Build.0 = Release|Any CPU - {1DB068CE-8007-470D-A2EE-BA02FFB0A4AF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1DB068CE-8007-470D-A2EE-BA02FFB0A4AF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1DB068CE-8007-470D-A2EE-BA02FFB0A4AF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1DB068CE-8007-470D-A2EE-BA02FFB0A4AF}.Release|Any CPU.Build.0 = Release|Any CPU - {053D0FB0-D613-4AF3-8B08-1782FE072756}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {053D0FB0-D613-4AF3-8B08-1782FE072756}.Debug|Any CPU.Build.0 = Debug|Any CPU - {053D0FB0-D613-4AF3-8B08-1782FE072756}.Release|Any CPU.ActiveCfg = Release|Any CPU - {053D0FB0-D613-4AF3-8B08-1782FE072756}.Release|Any CPU.Build.0 = Release|Any CPU - {495BF000-FD6A-4A85-BC32-FEEAC877A247}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {495BF000-FD6A-4A85-BC32-FEEAC877A247}.Debug|Any CPU.Build.0 = Debug|Any CPU - {495BF000-FD6A-4A85-BC32-FEEAC877A247}.Release|Any CPU.ActiveCfg = Release|Any CPU - {495BF000-FD6A-4A85-BC32-FEEAC877A247}.Release|Any CPU.Build.0 = Release|Any CPU - {40B899AE-DA8C-42BE-92EA-19E9E0E5C69E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {40B899AE-DA8C-42BE-92EA-19E9E0E5C69E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {40B899AE-DA8C-42BE-92EA-19E9E0E5C69E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {40B899AE-DA8C-42BE-92EA-19E9E0E5C69E}.Release|Any CPU.Build.0 = Release|Any CPU - {F29E2363-8710-41BE-81E4-C8184A8AF1D3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F29E2363-8710-41BE-81E4-C8184A8AF1D3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F29E2363-8710-41BE-81E4-C8184A8AF1D3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F29E2363-8710-41BE-81E4-C8184A8AF1D3}.Release|Any CPU.Build.0 = Release|Any CPU - {890C32B2-80B7-4DE2-A0AE-4B438DA3B2D3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {890C32B2-80B7-4DE2-A0AE-4B438DA3B2D3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {890C32B2-80B7-4DE2-A0AE-4B438DA3B2D3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {890C32B2-80B7-4DE2-A0AE-4B438DA3B2D3}.Release|Any CPU.Build.0 = Release|Any CPU - {F7EA43F5-2403-4978-B74C-41B6A5F0641D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F7EA43F5-2403-4978-B74C-41B6A5F0641D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F7EA43F5-2403-4978-B74C-41B6A5F0641D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F7EA43F5-2403-4978-B74C-41B6A5F0641D}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {F07099FD-F071-4A52-A92D-5A703CB6CC83} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {BB84B07C-5667-4896-8F3A-331E456EB68D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {FAEEC6EA-4312-4A80-B297-D4F9B04178B5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {9D563E66-7078-424A-8050-FB661B1A6474} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {4E14B323-21DB-45BB-8BB1-E8AAD5134840} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {8296D3E8-0F7B-4CEF-AD70-048EF4DA8B8C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {50862EC5-A427-4748-B4D7-AB8CACE33DD2} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {DBA6203A-FD2A-460D-BC97-4278CA8CF9D3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {1DB068CE-8007-470D-A2EE-BA02FFB0A4AF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {053D0FB0-D613-4AF3-8B08-1782FE072756} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {495BF000-FD6A-4A85-BC32-FEEAC877A247} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {40B899AE-DA8C-42BE-92EA-19E9E0E5C69E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F29E2363-8710-41BE-81E4-C8184A8AF1D3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {890C32B2-80B7-4DE2-A0AE-4B438DA3B2D3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F7EA43F5-2403-4978-B74C-41B6A5F0641D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {8296D3E8-0F7B-4CEF-AD70-048EF4DA8B8C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {50862EC5-A427-4748-B4D7-AB8CACE33DD2} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {DBA6203A-FD2A-460D-BC97-4278CA8CF9D3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {1DB068CE-8007-470D-A2EE-BA02FFB0A4AF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {053D0FB0-D613-4AF3-8B08-1782FE072756} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {495BF000-FD6A-4A85-BC32-FEEAC877A247} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {40B899AE-DA8C-42BE-92EA-19E9E0E5C69E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F29E2363-8710-41BE-81E4-C8184A8AF1D3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {890C32B2-80B7-4DE2-A0AE-4B438DA3B2D3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F7EA43F5-2403-4978-B74C-41B6A5F0641D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {6329EED5-FA55-4A2C-A3EA-CF9D85F90100} diff --git a/sdk/src/Services/ResourceGroupsTaggingAPI/Generated/AmazonResourceGroupsTaggingAPIConfig.cs b/sdk/src/Services/ResourceGroupsTaggingAPI/Generated/AmazonResourceGroupsTaggingAPIConfig.cs index 5b91dd35f706..1efe2384bd55 100644 --- a/sdk/src/Services/ResourceGroupsTaggingAPI/Generated/AmazonResourceGroupsTaggingAPIConfig.cs +++ b/sdk/src/Services/ResourceGroupsTaggingAPI/Generated/AmazonResourceGroupsTaggingAPIConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.ResourceGroupsTaggingAPI public partial class AmazonResourceGroupsTaggingAPIConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("Resource Groups Tagging API", "4.0.0.0"); private static readonly AmazonResourceGroupsTaggingAPIEndpointResolver EndpointResolver = new AmazonResourceGroupsTaggingAPIEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("Resource Groups Tagging API", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("Resource Groups Tagging API", "3.7.400.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/ResourceGroupsTaggingAPI/Properties/AssemblyInfo.cs b/sdk/src/Services/ResourceGroupsTaggingAPI/Properties/AssemblyInfo.cs index efcebb4f131c..1668b085ab57 100644 --- a/sdk/src/Services/ResourceGroupsTaggingAPI/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/ResourceGroupsTaggingAPI/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/ResourceGroupsTaggingAPI/ResourceGroupsTaggingAPI.sln b/sdk/src/Services/ResourceGroupsTaggingAPI/ResourceGroupsTaggingAPI.sln index 97e3f3fe645f..23f89d340b84 100644 --- a/sdk/src/Services/ResourceGroupsTaggingAPI/ResourceGroupsTaggingAPI.sln +++ b/sdk/src/Services/ResourceGroupsTaggingAPI/ResourceGroupsTaggingAPI.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {7A1E2875-445B-4937-93B5-3C6E6C970D83}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {7A1E2875-445B-4937-93B5-3C6E6C970D83}.Debug|Any CPU.Build.0 = Debug|Any CPU {7A1E2875-445B-4937-93B5-3C6E6C970D83}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {A59F55BC-F760-472B-A839-09E242F84E62}.Debug|Any CPU.Build.0 = Debug|Any CPU {A59F55BC-F760-472B-A839-09E242F84E62}.Release|Any CPU.ActiveCfg = Release|Any CPU {A59F55BC-F760-472B-A839-09E242F84E62}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {6813DD22-C6A8-4E4C-8B3B-F4D8A696445E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6813DD22-C6A8-4E4C-8B3B-F4D8A696445E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6813DD22-C6A8-4E4C-8B3B-F4D8A696445E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6813DD22-C6A8-4E4C-8B3B-F4D8A696445E}.Release|Any CPU.Build.0 = Release|Any CPU - {75EC4B5F-E5DB-455C-B0BD-CE960AAC13EF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {75EC4B5F-E5DB-455C-B0BD-CE960AAC13EF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {75EC4B5F-E5DB-455C-B0BD-CE960AAC13EF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {75EC4B5F-E5DB-455C-B0BD-CE960AAC13EF}.Release|Any CPU.Build.0 = Release|Any CPU - {6B724185-8F6F-4C42-B04D-828B265DEFB9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6B724185-8F6F-4C42-B04D-828B265DEFB9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6B724185-8F6F-4C42-B04D-828B265DEFB9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6B724185-8F6F-4C42-B04D-828B265DEFB9}.Release|Any CPU.Build.0 = Release|Any CPU - {F63765D8-B4A9-4B05-AC82-8E7097A413A8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F63765D8-B4A9-4B05-AC82-8E7097A413A8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F63765D8-B4A9-4B05-AC82-8E7097A413A8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F63765D8-B4A9-4B05-AC82-8E7097A413A8}.Release|Any CPU.Build.0 = Release|Any CPU - {BAF0FD2D-2275-4423-8EF1-D6D108855E8B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BAF0FD2D-2275-4423-8EF1-D6D108855E8B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BAF0FD2D-2275-4423-8EF1-D6D108855E8B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BAF0FD2D-2275-4423-8EF1-D6D108855E8B}.Release|Any CPU.Build.0 = Release|Any CPU - {97EB8B88-8865-4FE2-AC75-3A238095AEEE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {97EB8B88-8865-4FE2-AC75-3A238095AEEE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {97EB8B88-8865-4FE2-AC75-3A238095AEEE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {97EB8B88-8865-4FE2-AC75-3A238095AEEE}.Release|Any CPU.Build.0 = Release|Any CPU - {1CD4DEB4-AA4C-4C6E-AE38-FD1A834B7231}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1CD4DEB4-AA4C-4C6E-AE38-FD1A834B7231}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1CD4DEB4-AA4C-4C6E-AE38-FD1A834B7231}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1CD4DEB4-AA4C-4C6E-AE38-FD1A834B7231}.Release|Any CPU.Build.0 = Release|Any CPU - {6884B4B6-CE09-427E-B3F0-3C86ACCEE10A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6884B4B6-CE09-427E-B3F0-3C86ACCEE10A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6884B4B6-CE09-427E-B3F0-3C86ACCEE10A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6884B4B6-CE09-427E-B3F0-3C86ACCEE10A}.Release|Any CPU.Build.0 = Release|Any CPU - {18F3C9A2-2E0C-4BD2-86CE-D81CB17FA0C8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {18F3C9A2-2E0C-4BD2-86CE-D81CB17FA0C8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {18F3C9A2-2E0C-4BD2-86CE-D81CB17FA0C8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {18F3C9A2-2E0C-4BD2-86CE-D81CB17FA0C8}.Release|Any CPU.Build.0 = Release|Any CPU - {C444D118-E3AB-46F3-818D-E0159FFBC9E2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C444D118-E3AB-46F3-818D-E0159FFBC9E2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C444D118-E3AB-46F3-818D-E0159FFBC9E2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C444D118-E3AB-46F3-818D-E0159FFBC9E2}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {6813DD22-C6A8-4E4C-8B3B-F4D8A696445E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6813DD22-C6A8-4E4C-8B3B-F4D8A696445E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6813DD22-C6A8-4E4C-8B3B-F4D8A696445E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6813DD22-C6A8-4E4C-8B3B-F4D8A696445E}.Release|Any CPU.Build.0 = Release|Any CPU - {75EC4B5F-E5DB-455C-B0BD-CE960AAC13EF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {75EC4B5F-E5DB-455C-B0BD-CE960AAC13EF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {75EC4B5F-E5DB-455C-B0BD-CE960AAC13EF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {75EC4B5F-E5DB-455C-B0BD-CE960AAC13EF}.Release|Any CPU.Build.0 = Release|Any CPU - {6B724185-8F6F-4C42-B04D-828B265DEFB9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6B724185-8F6F-4C42-B04D-828B265DEFB9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6B724185-8F6F-4C42-B04D-828B265DEFB9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6B724185-8F6F-4C42-B04D-828B265DEFB9}.Release|Any CPU.Build.0 = Release|Any CPU - {F63765D8-B4A9-4B05-AC82-8E7097A413A8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F63765D8-B4A9-4B05-AC82-8E7097A413A8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F63765D8-B4A9-4B05-AC82-8E7097A413A8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F63765D8-B4A9-4B05-AC82-8E7097A413A8}.Release|Any CPU.Build.0 = Release|Any CPU - {BAF0FD2D-2275-4423-8EF1-D6D108855E8B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BAF0FD2D-2275-4423-8EF1-D6D108855E8B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BAF0FD2D-2275-4423-8EF1-D6D108855E8B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BAF0FD2D-2275-4423-8EF1-D6D108855E8B}.Release|Any CPU.Build.0 = Release|Any CPU - {97EB8B88-8865-4FE2-AC75-3A238095AEEE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {97EB8B88-8865-4FE2-AC75-3A238095AEEE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {97EB8B88-8865-4FE2-AC75-3A238095AEEE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {97EB8B88-8865-4FE2-AC75-3A238095AEEE}.Release|Any CPU.Build.0 = Release|Any CPU - {1CD4DEB4-AA4C-4C6E-AE38-FD1A834B7231}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1CD4DEB4-AA4C-4C6E-AE38-FD1A834B7231}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1CD4DEB4-AA4C-4C6E-AE38-FD1A834B7231}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1CD4DEB4-AA4C-4C6E-AE38-FD1A834B7231}.Release|Any CPU.Build.0 = Release|Any CPU - {6884B4B6-CE09-427E-B3F0-3C86ACCEE10A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6884B4B6-CE09-427E-B3F0-3C86ACCEE10A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6884B4B6-CE09-427E-B3F0-3C86ACCEE10A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6884B4B6-CE09-427E-B3F0-3C86ACCEE10A}.Release|Any CPU.Build.0 = Release|Any CPU - {18F3C9A2-2E0C-4BD2-86CE-D81CB17FA0C8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {18F3C9A2-2E0C-4BD2-86CE-D81CB17FA0C8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {18F3C9A2-2E0C-4BD2-86CE-D81CB17FA0C8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {18F3C9A2-2E0C-4BD2-86CE-D81CB17FA0C8}.Release|Any CPU.Build.0 = Release|Any CPU - {C444D118-E3AB-46F3-818D-E0159FFBC9E2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C444D118-E3AB-46F3-818D-E0159FFBC9E2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C444D118-E3AB-46F3-818D-E0159FFBC9E2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C444D118-E3AB-46F3-818D-E0159FFBC9E2}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7A1E2875-445B-4937-93B5-3C6E6C970D83} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {7AC00A9F-8D18-45A7-BC1A-D3046A213EE2} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {313B04AD-6D3F-4702-A3E9-B1FB32AD5EDC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {022C87C1-E550-44C4-A1FA-1E0B0844E4FB} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {A59F55BC-F760-472B-A839-09E242F84E62} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {6813DD22-C6A8-4E4C-8B3B-F4D8A696445E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {75EC4B5F-E5DB-455C-B0BD-CE960AAC13EF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6B724185-8F6F-4C42-B04D-828B265DEFB9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F63765D8-B4A9-4B05-AC82-8E7097A413A8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {BAF0FD2D-2275-4423-8EF1-D6D108855E8B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {97EB8B88-8865-4FE2-AC75-3A238095AEEE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {1CD4DEB4-AA4C-4C6E-AE38-FD1A834B7231} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6884B4B6-CE09-427E-B3F0-3C86ACCEE10A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {18F3C9A2-2E0C-4BD2-86CE-D81CB17FA0C8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C444D118-E3AB-46F3-818D-E0159FFBC9E2} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {6813DD22-C6A8-4E4C-8B3B-F4D8A696445E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {75EC4B5F-E5DB-455C-B0BD-CE960AAC13EF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6B724185-8F6F-4C42-B04D-828B265DEFB9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F63765D8-B4A9-4B05-AC82-8E7097A413A8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {BAF0FD2D-2275-4423-8EF1-D6D108855E8B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {97EB8B88-8865-4FE2-AC75-3A238095AEEE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {1CD4DEB4-AA4C-4C6E-AE38-FD1A834B7231} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6884B4B6-CE09-427E-B3F0-3C86ACCEE10A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {18F3C9A2-2E0C-4BD2-86CE-D81CB17FA0C8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C444D118-E3AB-46F3-818D-E0159FFBC9E2} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {368E7B16-D401-4150-81A7-F32AEE822B98} diff --git a/sdk/src/Services/RoboMaker/Generated/AmazonRoboMakerConfig.cs b/sdk/src/Services/RoboMaker/Generated/AmazonRoboMakerConfig.cs index a5c84cb5df85..30ebe5ecbc9a 100644 --- a/sdk/src/Services/RoboMaker/Generated/AmazonRoboMakerConfig.cs +++ b/sdk/src/Services/RoboMaker/Generated/AmazonRoboMakerConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.RoboMaker public partial class AmazonRoboMakerConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("RoboMaker", "4.0.0.0"); private static readonly AmazonRoboMakerEndpointResolver EndpointResolver = new AmazonRoboMakerEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("RoboMaker", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("RoboMaker", "3.7.400.54"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/RoboMaker/Generated/_bcl/AmazonRoboMakerClient.cs b/sdk/src/Services/RoboMaker/Generated/_bcl/AmazonRoboMakerClient.cs index 2860821bb608..d9dddb70baa2 100644 --- a/sdk/src/Services/RoboMaker/Generated/_bcl/AmazonRoboMakerClient.cs +++ b/sdk/src/Services/RoboMaker/Generated/_bcl/AmazonRoboMakerClient.cs @@ -269,7 +269,19 @@ protected override void Dispose(bool disposing) /// + /// + /// + /// End of support notice: On September 10, 2025, Amazon Web Services will discontinue + /// support for Amazon Web Services RoboMaker. After September 10, 2025, you will no longer + /// be able to access the Amazon Web Services RoboMaker console or Amazon Web Services + /// RoboMaker resources. For more information on transitioning to Batch to help run containerized + /// simulations, visit https://aws.amazon.com/blogs/hpc/run-simulations-using-multiple-containers-in-a-single-aws-batch-job/. + /// + /// + /// + /// /// Deletes one or more worlds in a batch operation. + /// /// /// Container for the necessary parameters to execute the BatchDeleteWorlds service method. /// @@ -296,7 +308,19 @@ public virtual BatchDeleteWorldsResponse BatchDeleteWorlds(BatchDeleteWorldsRequ /// + /// + /// + /// End of support notice: On September 10, 2025, Amazon Web Services will discontinue + /// support for Amazon Web Services RoboMaker. After September 10, 2025, you will no longer + /// be able to access the Amazon Web Services RoboMaker console or Amazon Web Services + /// RoboMaker resources. For more information on transitioning to Batch to help run containerized + /// simulations, visit https://aws.amazon.com/blogs/hpc/run-simulations-using-multiple-containers-in-a-single-aws-batch-job/. + /// + /// + /// + /// /// Deletes one or more worlds in a batch operation. + /// /// /// Container for the necessary parameters to execute the BatchDeleteWorlds service method. /// @@ -330,7 +354,19 @@ public virtual BatchDeleteWorldsResponse BatchDeleteWorlds(BatchDeleteWorldsRequ /// + /// + /// + /// End of support notice: On September 10, 2025, Amazon Web Services will discontinue + /// support for Amazon Web Services RoboMaker. After September 10, 2025, you will no longer + /// be able to access the Amazon Web Services RoboMaker console or Amazon Web Services + /// RoboMaker resources. For more information on transitioning to Batch to help run containerized + /// simulations, visit https://aws.amazon.com/blogs/hpc/run-simulations-using-multiple-containers-in-a-single-aws-batch-job/. + /// + /// + /// + /// /// Describes one or more simulation jobs. + /// /// /// Container for the necessary parameters to execute the BatchDescribeSimulationJob service method. /// @@ -360,7 +396,19 @@ public virtual BatchDescribeSimulationJobResponse BatchDescribeSimulationJob(Bat /// + /// + /// + /// End of support notice: On September 10, 2025, Amazon Web Services will discontinue + /// support for Amazon Web Services RoboMaker. After September 10, 2025, you will no longer + /// be able to access the Amazon Web Services RoboMaker console or Amazon Web Services + /// RoboMaker resources. For more information on transitioning to Batch to help run containerized + /// simulations, visit https://aws.amazon.com/blogs/hpc/run-simulations-using-multiple-containers-in-a-single-aws-batch-job/. + /// + /// + /// + /// /// Describes one or more simulation jobs. + /// /// /// Container for the necessary parameters to execute the BatchDescribeSimulationJob service method. /// @@ -397,14 +445,16 @@ public virtual BatchDescribeSimulationJobResponse BatchDescribeSimulationJob(Bat /// - /// Cancels the specified deployment job. - /// - /// + /// /// - /// This API will no longer be supported as of May 2, 2022. Use it to remove resources - /// that were created for Deployment Service. + /// This API is no longer supported. For more information, see the May 2, 2022 update + /// in the Support + /// policy page. + /// + /// + /// + /// Cancels the specified deployment job. /// - /// /// /// Container for the necessary parameters to execute the CancelDeploymentJob service method. /// @@ -435,14 +485,16 @@ public virtual CancelDeploymentJobResponse CancelDeploymentJob(CancelDeploymentJ /// - /// Cancels the specified deployment job. - /// - /// + /// /// - /// This API will no longer be supported as of May 2, 2022. Use it to remove resources - /// that were created for Deployment Service. + /// This API is no longer supported. For more information, see the May 2, 2022 update + /// in the Support + /// policy page. + /// + /// + /// + /// Cancels the specified deployment job. /// - /// /// /// Container for the necessary parameters to execute the CancelDeploymentJob service method. /// @@ -480,7 +532,19 @@ public virtual CancelDeploymentJobResponse CancelDeploymentJob(CancelDeploymentJ /// + /// + /// + /// End of support notice: On September 10, 2025, Amazon Web Services will discontinue + /// support for Amazon Web Services RoboMaker. After September 10, 2025, you will no longer + /// be able to access the Amazon Web Services RoboMaker console or Amazon Web Services + /// RoboMaker resources. For more information on transitioning to Batch to help run containerized + /// simulations, visit https://aws.amazon.com/blogs/hpc/run-simulations-using-multiple-containers-in-a-single-aws-batch-job/. + /// + /// + /// + /// /// Cancels the specified simulation job. + /// /// /// Container for the necessary parameters to execute the CancelSimulationJob service method. /// @@ -510,7 +574,19 @@ public virtual CancelSimulationJobResponse CancelSimulationJob(CancelSimulationJ /// + /// + /// + /// End of support notice: On September 10, 2025, Amazon Web Services will discontinue + /// support for Amazon Web Services RoboMaker. After September 10, 2025, you will no longer + /// be able to access the Amazon Web Services RoboMaker console or Amazon Web Services + /// RoboMaker resources. For more information on transitioning to Batch to help run containerized + /// simulations, visit https://aws.amazon.com/blogs/hpc/run-simulations-using-multiple-containers-in-a-single-aws-batch-job/. + /// + /// + /// + /// /// Cancels the specified simulation job. + /// /// /// Container for the necessary parameters to execute the CancelSimulationJob service method. /// @@ -547,8 +623,20 @@ public virtual CancelSimulationJobResponse CancelSimulationJob(CancelSimulationJ /// + /// + /// + /// End of support notice: On September 10, 2025, Amazon Web Services will discontinue + /// support for Amazon Web Services RoboMaker. After September 10, 2025, you will no longer + /// be able to access the Amazon Web Services RoboMaker console or Amazon Web Services + /// RoboMaker resources. For more information on transitioning to Batch to help run containerized + /// simulations, visit https://aws.amazon.com/blogs/hpc/run-simulations-using-multiple-containers-in-a-single-aws-batch-job/. + /// + /// + /// + /// /// Cancels a simulation job batch. When you cancel a simulation job batch, you are also - /// cancelling all of the active simulation jobs created as part of the batch. + /// cancelling all of the active simulation jobs created as part of the batch. + /// /// /// Container for the necessary parameters to execute the CancelSimulationJobBatch service method. /// @@ -578,8 +666,20 @@ public virtual CancelSimulationJobBatchResponse CancelSimulationJobBatch(CancelS /// + /// + /// + /// End of support notice: On September 10, 2025, Amazon Web Services will discontinue + /// support for Amazon Web Services RoboMaker. After September 10, 2025, you will no longer + /// be able to access the Amazon Web Services RoboMaker console or Amazon Web Services + /// RoboMaker resources. For more information on transitioning to Batch to help run containerized + /// simulations, visit https://aws.amazon.com/blogs/hpc/run-simulations-using-multiple-containers-in-a-single-aws-batch-job/. + /// + /// + /// + /// /// Cancels a simulation job batch. When you cancel a simulation job batch, you are also - /// cancelling all of the active simulation jobs created as part of the batch. + /// cancelling all of the active simulation jobs created as part of the batch. + /// /// /// Container for the necessary parameters to execute the CancelSimulationJobBatch service method. /// @@ -616,7 +716,19 @@ public virtual CancelSimulationJobBatchResponse CancelSimulationJobBatch(CancelS /// + /// + /// + /// End of support notice: On September 10, 2025, Amazon Web Services will discontinue + /// support for Amazon Web Services RoboMaker. After September 10, 2025, you will no longer + /// be able to access the Amazon Web Services RoboMaker console or Amazon Web Services + /// RoboMaker resources. For more information on transitioning to Batch to help run containerized + /// simulations, visit https://aws.amazon.com/blogs/hpc/run-simulations-using-multiple-containers-in-a-single-aws-batch-job/. + /// + /// + /// + /// /// Cancels the specified export job. + /// /// /// Container for the necessary parameters to execute the CancelWorldExportJob service method. /// @@ -646,7 +758,19 @@ public virtual CancelWorldExportJobResponse CancelWorldExportJob(CancelWorldExpo /// + /// + /// + /// End of support notice: On September 10, 2025, Amazon Web Services will discontinue + /// support for Amazon Web Services RoboMaker. After September 10, 2025, you will no longer + /// be able to access the Amazon Web Services RoboMaker console or Amazon Web Services + /// RoboMaker resources. For more information on transitioning to Batch to help run containerized + /// simulations, visit https://aws.amazon.com/blogs/hpc/run-simulations-using-multiple-containers-in-a-single-aws-batch-job/. + /// + /// + /// + /// /// Cancels the specified export job. + /// /// /// Container for the necessary parameters to execute the CancelWorldExportJob service method. /// @@ -683,7 +807,19 @@ public virtual CancelWorldExportJobResponse CancelWorldExportJob(CancelWorldExpo /// + /// + /// + /// End of support notice: On September 10, 2025, Amazon Web Services will discontinue + /// support for Amazon Web Services RoboMaker. After September 10, 2025, you will no longer + /// be able to access the Amazon Web Services RoboMaker console or Amazon Web Services + /// RoboMaker resources. For more information on transitioning to Batch to help run containerized + /// simulations, visit https://aws.amazon.com/blogs/hpc/run-simulations-using-multiple-containers-in-a-single-aws-batch-job/. + /// + /// + /// + /// /// Cancels the specified world generator job. + /// /// /// Container for the necessary parameters to execute the CancelWorldGenerationJob service method. /// @@ -713,7 +849,19 @@ public virtual CancelWorldGenerationJobResponse CancelWorldGenerationJob(CancelW /// + /// + /// + /// End of support notice: On September 10, 2025, Amazon Web Services will discontinue + /// support for Amazon Web Services RoboMaker. After September 10, 2025, you will no longer + /// be able to access the Amazon Web Services RoboMaker console or Amazon Web Services + /// RoboMaker resources. For more information on transitioning to Batch to help run containerized + /// simulations, visit https://aws.amazon.com/blogs/hpc/run-simulations-using-multiple-containers-in-a-single-aws-batch-job/. + /// + /// + /// + /// /// Cancels the specified world generator job. + /// /// /// Container for the necessary parameters to execute the CancelWorldGenerationJob service method. /// @@ -750,14 +898,27 @@ public virtual CancelWorldGenerationJobResponse CancelWorldGenerationJob(CancelW /// - /// Deploys a specific version of a robot application to robots in a fleet. + /// + /// + /// End of support notice: On September 10, 2025, Amazon Web Services will discontinue + /// support for Amazon Web Services RoboMaker. After September 10, 2025, you will no longer + /// be able to access the Amazon Web Services RoboMaker console or Amazon Web Services + /// RoboMaker resources. For more information on transitioning to Batch to help run containerized + /// simulations, visit https://aws.amazon.com/blogs/hpc/run-simulations-using-multiple-containers-in-a-single-aws-batch-job/. /// - /// + /// + /// /// - /// This API is no longer supported and will throw an error if used. + /// This API is no longer supported and will throw an error if used. For more information, + /// see the January 31, 2022 update in the Support + /// policy page. /// /// /// + /// Deploys a specific version of a robot application to robots in a fleet. + /// + /// + /// /// The robot application must have a numbered applicationVersion for consistency /// reasons. To create a new version, use CreateRobotApplicationVersion or see /// Creating @@ -810,14 +971,27 @@ public virtual CreateDeploymentJobResponse CreateDeploymentJob(CreateDeploymentJ /// - /// Deploys a specific version of a robot application to robots in a fleet. + /// + /// + /// End of support notice: On September 10, 2025, Amazon Web Services will discontinue + /// support for Amazon Web Services RoboMaker. After September 10, 2025, you will no longer + /// be able to access the Amazon Web Services RoboMaker console or Amazon Web Services + /// RoboMaker resources. For more information on transitioning to Batch to help run containerized + /// simulations, visit https://aws.amazon.com/blogs/hpc/run-simulations-using-multiple-containers-in-a-single-aws-batch-job/. /// - /// + /// + /// /// - /// This API is no longer supported and will throw an error if used. + /// This API is no longer supported and will throw an error if used. For more information, + /// see the January 31, 2022 update in the Support + /// policy page. /// /// /// + /// Deploys a specific version of a robot application to robots in a fleet. + /// + /// + /// /// The robot application must have a numbered applicationVersion for consistency /// reasons. To create a new version, use CreateRobotApplicationVersion or see /// Creating @@ -877,13 +1051,25 @@ public virtual CreateDeploymentJobResponse CreateDeploymentJob(CreateDeploymentJ /// - /// Creates a fleet, a logical group of robots running the same robot application. + /// + /// + /// End of support notice: On September 10, 2025, Amazon Web Services will discontinue + /// support for Amazon Web Services RoboMaker. After September 10, 2025, you will no longer + /// be able to access the Amazon Web Services RoboMaker console or Amazon Web Services + /// RoboMaker resources. For more information on transitioning to Batch to help run containerized + /// simulations, visit https://aws.amazon.com/blogs/hpc/run-simulations-using-multiple-containers-in-a-single-aws-batch-job/. /// - /// + /// + /// /// - /// This API is no longer supported and will throw an error if used. + /// This API is no longer supported and will throw an error if used. For more information, + /// see the January 31, 2022 update in the Support + /// policy page. + /// + /// + /// + /// Creates a fleet, a logical group of robots running the same robot application. /// - /// /// /// Container for the necessary parameters to execute the CreateFleet service method. /// @@ -915,13 +1101,25 @@ public virtual CreateFleetResponse CreateFleet(CreateFleetRequest request) /// - /// Creates a fleet, a logical group of robots running the same robot application. + /// + /// + /// End of support notice: On September 10, 2025, Amazon Web Services will discontinue + /// support for Amazon Web Services RoboMaker. After September 10, 2025, you will no longer + /// be able to access the Amazon Web Services RoboMaker console or Amazon Web Services + /// RoboMaker resources. For more information on transitioning to Batch to help run containerized + /// simulations, visit https://aws.amazon.com/blogs/hpc/run-simulations-using-multiple-containers-in-a-single-aws-batch-job/. /// - /// + /// + /// /// - /// This API is no longer supported and will throw an error if used. + /// This API is no longer supported and will throw an error if used. For more information, + /// see the January 31, 2022 update in the Support + /// policy page. + /// + /// + /// + /// Creates a fleet, a logical group of robots running the same robot application. /// - /// /// /// Container for the necessary parameters to execute the CreateFleet service method. /// @@ -960,13 +1158,25 @@ public virtual CreateFleetResponse CreateFleet(CreateFleetRequest request) /// - /// Creates a robot. + /// + /// + /// End of support notice: On September 10, 2025, Amazon Web Services will discontinue + /// support for Amazon Web Services RoboMaker. After September 10, 2025, you will no longer + /// be able to access the Amazon Web Services RoboMaker console or Amazon Web Services + /// RoboMaker resources. For more information on transitioning to Batch to help run containerized + /// simulations, visit https://aws.amazon.com/blogs/hpc/run-simulations-using-multiple-containers-in-a-single-aws-batch-job/. /// - /// + /// + /// /// - /// This API is no longer supported and will throw an error if used. + /// This API is no longer supported and will throw an error if used. For more information, + /// see the January 31, 2022 update in the Support + /// policy page. + /// + /// + /// + /// Creates a robot. /// - /// /// /// Container for the necessary parameters to execute the CreateRobot service method. /// @@ -1001,13 +1211,25 @@ public virtual CreateRobotResponse CreateRobot(CreateRobotRequest request) /// - /// Creates a robot. + /// + /// + /// End of support notice: On September 10, 2025, Amazon Web Services will discontinue + /// support for Amazon Web Services RoboMaker. After September 10, 2025, you will no longer + /// be able to access the Amazon Web Services RoboMaker console or Amazon Web Services + /// RoboMaker resources. For more information on transitioning to Batch to help run containerized + /// simulations, visit https://aws.amazon.com/blogs/hpc/run-simulations-using-multiple-containers-in-a-single-aws-batch-job/. /// - /// + /// + /// /// - /// This API is no longer supported and will throw an error if used. + /// This API is no longer supported and will throw an error if used. For more information, + /// see the January 31, 2022 update in the Support + /// policy page. + /// + /// + /// + /// Creates a robot. /// - /// /// /// Container for the necessary parameters to execute the CreateRobot service method. /// @@ -1049,7 +1271,19 @@ public virtual CreateRobotResponse CreateRobot(CreateRobotRequest request) /// - /// Creates a robot application. + /// + /// + /// End of support notice: On September 10, 2025, Amazon Web Services will discontinue + /// support for Amazon Web Services RoboMaker. After September 10, 2025, you will no longer + /// be able to access the Amazon Web Services RoboMaker console or Amazon Web Services + /// RoboMaker resources. For more information on transitioning to Batch to help run containerized + /// simulations, visit https://aws.amazon.com/blogs/hpc/run-simulations-using-multiple-containers-in-a-single-aws-batch-job/. + /// + /// + /// + /// + /// Creates a robot application. + /// /// /// Container for the necessary parameters to execute the CreateRobotApplication service method. /// @@ -1087,7 +1321,19 @@ public virtual CreateRobotApplicationResponse CreateRobotApplication(CreateRobot /// - /// Creates a robot application. + /// + /// + /// End of support notice: On September 10, 2025, Amazon Web Services will discontinue + /// support for Amazon Web Services RoboMaker. After September 10, 2025, you will no longer + /// be able to access the Amazon Web Services RoboMaker console or Amazon Web Services + /// RoboMaker resources. For more information on transitioning to Batch to help run containerized + /// simulations, visit https://aws.amazon.com/blogs/hpc/run-simulations-using-multiple-containers-in-a-single-aws-batch-job/. + /// + /// + /// + /// + /// Creates a robot application. + /// /// /// Container for the necessary parameters to execute the CreateRobotApplication service method. /// @@ -1132,7 +1378,19 @@ public virtual CreateRobotApplicationResponse CreateRobotApplication(CreateRobot /// + /// + /// + /// End of support notice: On September 10, 2025, Amazon Web Services will discontinue + /// support for Amazon Web Services RoboMaker. After September 10, 2025, you will no longer + /// be able to access the Amazon Web Services RoboMaker console or Amazon Web Services + /// RoboMaker resources. For more information on transitioning to Batch to help run containerized + /// simulations, visit https://aws.amazon.com/blogs/hpc/run-simulations-using-multiple-containers-in-a-single-aws-batch-job/. + /// + /// + /// + /// /// Creates a version of a robot application. + /// /// /// Container for the necessary parameters to execute the CreateRobotApplicationVersion service method. /// @@ -1167,7 +1425,19 @@ public virtual CreateRobotApplicationVersionResponse CreateRobotApplicationVersi /// + /// + /// + /// End of support notice: On September 10, 2025, Amazon Web Services will discontinue + /// support for Amazon Web Services RoboMaker. After September 10, 2025, you will no longer + /// be able to access the Amazon Web Services RoboMaker console or Amazon Web Services + /// RoboMaker resources. For more information on transitioning to Batch to help run containerized + /// simulations, visit https://aws.amazon.com/blogs/hpc/run-simulations-using-multiple-containers-in-a-single-aws-batch-job/. + /// + /// + /// + /// /// Creates a version of a robot application. + /// /// /// Container for the necessary parameters to execute the CreateRobotApplicationVersion service method. /// @@ -1209,7 +1479,19 @@ public virtual CreateRobotApplicationVersionResponse CreateRobotApplicationVersi /// + /// + /// + /// End of support notice: On September 10, 2025, Amazon Web Services will discontinue + /// support for Amazon Web Services RoboMaker. After September 10, 2025, you will no longer + /// be able to access the Amazon Web Services RoboMaker console or Amazon Web Services + /// RoboMaker resources. For more information on transitioning to Batch to help run containerized + /// simulations, visit https://aws.amazon.com/blogs/hpc/run-simulations-using-multiple-containers-in-a-single-aws-batch-job/. + /// + /// + /// + /// /// Creates a simulation application. + /// /// /// Container for the necessary parameters to execute the CreateSimulationApplication service method. /// @@ -1247,7 +1529,19 @@ public virtual CreateSimulationApplicationResponse CreateSimulationApplication(C /// + /// + /// + /// End of support notice: On September 10, 2025, Amazon Web Services will discontinue + /// support for Amazon Web Services RoboMaker. After September 10, 2025, you will no longer + /// be able to access the Amazon Web Services RoboMaker console or Amazon Web Services + /// RoboMaker resources. For more information on transitioning to Batch to help run containerized + /// simulations, visit https://aws.amazon.com/blogs/hpc/run-simulations-using-multiple-containers-in-a-single-aws-batch-job/. + /// + /// + /// + /// /// Creates a simulation application. + /// /// /// Container for the necessary parameters to execute the CreateSimulationApplication service method. /// @@ -1292,7 +1586,19 @@ public virtual CreateSimulationApplicationResponse CreateSimulationApplication(C /// + /// + /// + /// End of support notice: On September 10, 2025, Amazon Web Services will discontinue + /// support for Amazon Web Services RoboMaker. After September 10, 2025, you will no longer + /// be able to access the Amazon Web Services RoboMaker console or Amazon Web Services + /// RoboMaker resources. For more information on transitioning to Batch to help run containerized + /// simulations, visit https://aws.amazon.com/blogs/hpc/run-simulations-using-multiple-containers-in-a-single-aws-batch-job/. + /// + /// + /// + /// /// Creates a simulation application with a specific revision id. + /// /// /// Container for the necessary parameters to execute the CreateSimulationApplicationVersion service method. /// @@ -1327,7 +1633,19 @@ public virtual CreateSimulationApplicationVersionResponse CreateSimulationApplic /// + /// + /// + /// End of support notice: On September 10, 2025, Amazon Web Services will discontinue + /// support for Amazon Web Services RoboMaker. After September 10, 2025, you will no longer + /// be able to access the Amazon Web Services RoboMaker console or Amazon Web Services + /// RoboMaker resources. For more information on transitioning to Batch to help run containerized + /// simulations, visit https://aws.amazon.com/blogs/hpc/run-simulations-using-multiple-containers-in-a-single-aws-batch-job/. + /// + /// + /// + /// /// Creates a simulation application with a specific revision id. + /// /// /// Container for the necessary parameters to execute the CreateSimulationApplicationVersion service method. /// @@ -1369,8 +1687,19 @@ public virtual CreateSimulationApplicationVersionResponse CreateSimulationApplic /// - /// Creates a simulation job. + /// + /// + /// End of support notice: On September 10, 2025, Amazon Web Services will discontinue + /// support for Amazon Web Services RoboMaker. After September 10, 2025, you will no longer + /// be able to access the Amazon Web Services RoboMaker console or Amazon Web Services + /// RoboMaker resources. For more information on transitioning to Batch to help run containerized + /// simulations, visit https://aws.amazon.com/blogs/hpc/run-simulations-using-multiple-containers-in-a-single-aws-batch-job/. /// + /// + /// + /// + /// Creates a simulation job. + /// /// /// /// After 90 days, simulation jobs expire and will be deleted. They will no longer be @@ -1417,8 +1746,19 @@ public virtual CreateSimulationJobResponse CreateSimulationJob(CreateSimulationJ /// - /// Creates a simulation job. + /// + /// + /// End of support notice: On September 10, 2025, Amazon Web Services will discontinue + /// support for Amazon Web Services RoboMaker. After September 10, 2025, you will no longer + /// be able to access the Amazon Web Services RoboMaker console or Amazon Web Services + /// RoboMaker resources. For more information on transitioning to Batch to help run containerized + /// simulations, visit https://aws.amazon.com/blogs/hpc/run-simulations-using-multiple-containers-in-a-single-aws-batch-job/. /// + /// + /// + /// + /// Creates a simulation job. + /// /// /// /// After 90 days, simulation jobs expire and will be deleted. They will no longer be @@ -1472,7 +1812,19 @@ public virtual CreateSimulationJobResponse CreateSimulationJob(CreateSimulationJ /// + /// + /// + /// End of support notice: On September 10, 2025, Amazon Web Services will discontinue + /// support for Amazon Web Services RoboMaker. After September 10, 2025, you will no longer + /// be able to access the Amazon Web Services RoboMaker console or Amazon Web Services + /// RoboMaker resources. For more information on transitioning to Batch to help run containerized + /// simulations, visit https://aws.amazon.com/blogs/hpc/run-simulations-using-multiple-containers-in-a-single-aws-batch-job/. + /// + /// + /// + /// /// Creates a world export job. + /// /// /// Container for the necessary parameters to execute the CreateWorldExportJob service method. /// @@ -1509,7 +1861,19 @@ public virtual CreateWorldExportJobResponse CreateWorldExportJob(CreateWorldExpo /// + /// + /// + /// End of support notice: On September 10, 2025, Amazon Web Services will discontinue + /// support for Amazon Web Services RoboMaker. After September 10, 2025, you will no longer + /// be able to access the Amazon Web Services RoboMaker console or Amazon Web Services + /// RoboMaker resources. For more information on transitioning to Batch to help run containerized + /// simulations, visit https://aws.amazon.com/blogs/hpc/run-simulations-using-multiple-containers-in-a-single-aws-batch-job/. + /// + /// + /// + /// /// Creates a world export job. + /// /// /// Container for the necessary parameters to execute the CreateWorldExportJob service method. /// @@ -1553,7 +1917,19 @@ public virtual CreateWorldExportJobResponse CreateWorldExportJob(CreateWorldExpo /// + /// + /// + /// End of support notice: On September 10, 2025, Amazon Web Services will discontinue + /// support for Amazon Web Services RoboMaker. After September 10, 2025, you will no longer + /// be able to access the Amazon Web Services RoboMaker console or Amazon Web Services + /// RoboMaker resources. For more information on transitioning to Batch to help run containerized + /// simulations, visit https://aws.amazon.com/blogs/hpc/run-simulations-using-multiple-containers-in-a-single-aws-batch-job/. + /// + /// + /// + /// /// Creates worlds using the specified template. + /// /// /// Container for the necessary parameters to execute the CreateWorldGenerationJob service method. /// @@ -1594,7 +1970,19 @@ public virtual CreateWorldGenerationJobResponse CreateWorldGenerationJob(CreateW /// + /// + /// + /// End of support notice: On September 10, 2025, Amazon Web Services will discontinue + /// support for Amazon Web Services RoboMaker. After September 10, 2025, you will no longer + /// be able to access the Amazon Web Services RoboMaker console or Amazon Web Services + /// RoboMaker resources. For more information on transitioning to Batch to help run containerized + /// simulations, visit https://aws.amazon.com/blogs/hpc/run-simulations-using-multiple-containers-in-a-single-aws-batch-job/. + /// + /// + /// + /// /// Creates worlds using the specified template. + /// /// /// Container for the necessary parameters to execute the CreateWorldGenerationJob service method. /// @@ -1642,7 +2030,19 @@ public virtual CreateWorldGenerationJobResponse CreateWorldGenerationJob(CreateW /// + /// + /// + /// End of support notice: On September 10, 2025, Amazon Web Services will discontinue + /// support for Amazon Web Services RoboMaker. After September 10, 2025, you will no longer + /// be able to access the Amazon Web Services RoboMaker console or Amazon Web Services + /// RoboMaker resources. For more information on transitioning to Batch to help run containerized + /// simulations, visit https://aws.amazon.com/blogs/hpc/run-simulations-using-multiple-containers-in-a-single-aws-batch-job/. + /// + /// + /// + /// /// Creates a world template. + /// /// /// Container for the necessary parameters to execute the CreateWorldTemplate service method. /// @@ -1679,7 +2079,19 @@ public virtual CreateWorldTemplateResponse CreateWorldTemplate(CreateWorldTempla /// + /// + /// + /// End of support notice: On September 10, 2025, Amazon Web Services will discontinue + /// support for Amazon Web Services RoboMaker. After September 10, 2025, you will no longer + /// be able to access the Amazon Web Services RoboMaker console or Amazon Web Services + /// RoboMaker resources. For more information on transitioning to Batch to help run containerized + /// simulations, visit https://aws.amazon.com/blogs/hpc/run-simulations-using-multiple-containers-in-a-single-aws-batch-job/. + /// + /// + /// + /// /// Creates a world template. + /// /// /// Container for the necessary parameters to execute the CreateWorldTemplate service method. /// @@ -1723,14 +2135,25 @@ public virtual CreateWorldTemplateResponse CreateWorldTemplate(CreateWorldTempla /// - /// Deletes a fleet. + /// + /// + /// End of support notice: On September 10, 2025, Amazon Web Services will discontinue + /// support for Amazon Web Services RoboMaker. After September 10, 2025, you will no longer + /// be able to access the Amazon Web Services RoboMaker console or Amazon Web Services + /// RoboMaker resources. For more information on transitioning to Batch to help run containerized + /// simulations, visit https://aws.amazon.com/blogs/hpc/run-simulations-using-multiple-containers-in-a-single-aws-batch-job/. /// - /// + /// + /// /// - /// This API will no longer be supported as of May 2, 2022. Use it to remove resources - /// that were created for Deployment Service. + /// This API is no longer supported. For more information, see the May 2, 2022 update + /// in the Support + /// policy page. + /// + /// + /// + /// Deletes a fleet. /// - /// /// /// Container for the necessary parameters to execute the DeleteFleet service method. /// @@ -1758,14 +2181,25 @@ public virtual DeleteFleetResponse DeleteFleet(DeleteFleetRequest request) /// - /// Deletes a fleet. + /// + /// + /// End of support notice: On September 10, 2025, Amazon Web Services will discontinue + /// support for Amazon Web Services RoboMaker. After September 10, 2025, you will no longer + /// be able to access the Amazon Web Services RoboMaker console or Amazon Web Services + /// RoboMaker resources. For more information on transitioning to Batch to help run containerized + /// simulations, visit https://aws.amazon.com/blogs/hpc/run-simulations-using-multiple-containers-in-a-single-aws-batch-job/. /// - /// + /// + /// /// - /// This API will no longer be supported as of May 2, 2022. Use it to remove resources - /// that were created for Deployment Service. + /// This API is no longer supported. For more information, see the May 2, 2022 update + /// in the Support + /// policy page. + /// + /// + /// + /// Deletes a fleet. /// - /// /// /// Container for the necessary parameters to execute the DeleteFleet service method. /// @@ -1800,14 +2234,25 @@ public virtual DeleteFleetResponse DeleteFleet(DeleteFleetRequest request) /// - /// Deletes a robot. + /// + /// + /// End of support notice: On September 10, 2025, Amazon Web Services will discontinue + /// support for Amazon Web Services RoboMaker. After September 10, 2025, you will no longer + /// be able to access the Amazon Web Services RoboMaker console or Amazon Web Services + /// RoboMaker resources. For more information on transitioning to Batch to help run containerized + /// simulations, visit https://aws.amazon.com/blogs/hpc/run-simulations-using-multiple-containers-in-a-single-aws-batch-job/. /// - /// + /// + /// /// - /// This API will no longer be supported as of May 2, 2022. Use it to remove resources - /// that were created for Deployment Service. + /// This API is no longer supported. For more information, see the May 2, 2022 update + /// in the Support + /// policy page. + /// + /// + /// + /// Deletes a robot. /// - /// /// /// Container for the necessary parameters to execute the DeleteRobot service method. /// @@ -1835,14 +2280,25 @@ public virtual DeleteRobotResponse DeleteRobot(DeleteRobotRequest request) /// - /// Deletes a robot. + /// + /// + /// End of support notice: On September 10, 2025, Amazon Web Services will discontinue + /// support for Amazon Web Services RoboMaker. After September 10, 2025, you will no longer + /// be able to access the Amazon Web Services RoboMaker console or Amazon Web Services + /// RoboMaker resources. For more information on transitioning to Batch to help run containerized + /// simulations, visit https://aws.amazon.com/blogs/hpc/run-simulations-using-multiple-containers-in-a-single-aws-batch-job/. /// - /// + /// + /// /// - /// This API will no longer be supported as of May 2, 2022. Use it to remove resources - /// that were created for Deployment Service. + /// This API is no longer supported. For more information, see the May 2, 2022 update + /// in the Support + /// policy page. + /// + /// + /// + /// Deletes a robot. /// - /// /// /// Container for the necessary parameters to execute the DeleteRobot service method. /// @@ -1877,7 +2333,19 @@ public virtual DeleteRobotResponse DeleteRobot(DeleteRobotRequest request) /// + /// + /// + /// End of support notice: On September 10, 2025, Amazon Web Services will discontinue + /// support for Amazon Web Services RoboMaker. After September 10, 2025, you will no longer + /// be able to access the Amazon Web Services RoboMaker console or Amazon Web Services + /// RoboMaker resources. For more information on transitioning to Batch to help run containerized + /// simulations, visit https://aws.amazon.com/blogs/hpc/run-simulations-using-multiple-containers-in-a-single-aws-batch-job/. + /// + /// + /// + /// /// Deletes a robot application. + /// /// /// Container for the necessary parameters to execute the DeleteRobotApplication service method. /// @@ -1904,7 +2372,19 @@ public virtual DeleteRobotApplicationResponse DeleteRobotApplication(DeleteRobot /// + /// + /// + /// End of support notice: On September 10, 2025, Amazon Web Services will discontinue + /// support for Amazon Web Services RoboMaker. After September 10, 2025, you will no longer + /// be able to access the Amazon Web Services RoboMaker console or Amazon Web Services + /// RoboMaker resources. For more information on transitioning to Batch to help run containerized + /// simulations, visit https://aws.amazon.com/blogs/hpc/run-simulations-using-multiple-containers-in-a-single-aws-batch-job/. + /// + /// + /// + /// /// Deletes a robot application. + /// /// /// Container for the necessary parameters to execute the DeleteRobotApplication service method. /// @@ -1938,7 +2418,19 @@ public virtual DeleteRobotApplicationResponse DeleteRobotApplication(DeleteRobot /// + /// + /// + /// End of support notice: On September 10, 2025, Amazon Web Services will discontinue + /// support for Amazon Web Services RoboMaker. After September 10, 2025, you will no longer + /// be able to access the Amazon Web Services RoboMaker console or Amazon Web Services + /// RoboMaker resources. For more information on transitioning to Batch to help run containerized + /// simulations, visit https://aws.amazon.com/blogs/hpc/run-simulations-using-multiple-containers-in-a-single-aws-batch-job/. + /// + /// + /// + /// /// Deletes a simulation application. + /// /// /// Container for the necessary parameters to execute the DeleteSimulationApplication service method. /// @@ -1965,7 +2457,19 @@ public virtual DeleteSimulationApplicationResponse DeleteSimulationApplication(D /// + /// + /// + /// End of support notice: On September 10, 2025, Amazon Web Services will discontinue + /// support for Amazon Web Services RoboMaker. After September 10, 2025, you will no longer + /// be able to access the Amazon Web Services RoboMaker console or Amazon Web Services + /// RoboMaker resources. For more information on transitioning to Batch to help run containerized + /// simulations, visit https://aws.amazon.com/blogs/hpc/run-simulations-using-multiple-containers-in-a-single-aws-batch-job/. + /// + /// + /// + /// /// Deletes a simulation application. + /// /// /// Container for the necessary parameters to execute the DeleteSimulationApplication service method. /// @@ -1999,7 +2503,19 @@ public virtual DeleteSimulationApplicationResponse DeleteSimulationApplication(D /// + /// + /// + /// End of support notice: On September 10, 2025, Amazon Web Services will discontinue + /// support for Amazon Web Services RoboMaker. After September 10, 2025, you will no longer + /// be able to access the Amazon Web Services RoboMaker console or Amazon Web Services + /// RoboMaker resources. For more information on transitioning to Batch to help run containerized + /// simulations, visit https://aws.amazon.com/blogs/hpc/run-simulations-using-multiple-containers-in-a-single-aws-batch-job/. + /// + /// + /// + /// /// Deletes a world template. + /// /// /// Container for the necessary parameters to execute the DeleteWorldTemplate service method. /// @@ -2029,7 +2545,19 @@ public virtual DeleteWorldTemplateResponse DeleteWorldTemplate(DeleteWorldTempla /// + /// + /// + /// End of support notice: On September 10, 2025, Amazon Web Services will discontinue + /// support for Amazon Web Services RoboMaker. After September 10, 2025, you will no longer + /// be able to access the Amazon Web Services RoboMaker console or Amazon Web Services + /// RoboMaker resources. For more information on transitioning to Batch to help run containerized + /// simulations, visit https://aws.amazon.com/blogs/hpc/run-simulations-using-multiple-containers-in-a-single-aws-batch-job/. + /// + /// + /// + /// /// Deletes a world template. + /// /// /// Container for the necessary parameters to execute the DeleteWorldTemplate service method. /// @@ -2066,14 +2594,25 @@ public virtual DeleteWorldTemplateResponse DeleteWorldTemplate(DeleteWorldTempla /// - /// Deregisters a robot. + /// + /// + /// End of support notice: On September 10, 2025, Amazon Web Services will discontinue + /// support for Amazon Web Services RoboMaker. After September 10, 2025, you will no longer + /// be able to access the Amazon Web Services RoboMaker console or Amazon Web Services + /// RoboMaker resources. For more information on transitioning to Batch to help run containerized + /// simulations, visit https://aws.amazon.com/blogs/hpc/run-simulations-using-multiple-containers-in-a-single-aws-batch-job/. /// - /// + /// + /// /// - /// This API will no longer be supported as of May 2, 2022. Use it to remove resources - /// that were created for Deployment Service. + /// This API is no longer supported. For more information, see the May 2, 2022 update + /// in the Support + /// policy page. + /// + /// + /// + /// Deregisters a robot. /// - /// /// /// Container for the necessary parameters to execute the DeregisterRobot service method. /// @@ -2104,14 +2643,25 @@ public virtual DeregisterRobotResponse DeregisterRobot(DeregisterRobotRequest re /// - /// Deregisters a robot. + /// + /// + /// End of support notice: On September 10, 2025, Amazon Web Services will discontinue + /// support for Amazon Web Services RoboMaker. After September 10, 2025, you will no longer + /// be able to access the Amazon Web Services RoboMaker console or Amazon Web Services + /// RoboMaker resources. For more information on transitioning to Batch to help run containerized + /// simulations, visit https://aws.amazon.com/blogs/hpc/run-simulations-using-multiple-containers-in-a-single-aws-batch-job/. /// - /// + /// + /// /// - /// This API will no longer be supported as of May 2, 2022. Use it to remove resources - /// that were created for Deployment Service. + /// This API is no longer supported. For more information, see the May 2, 2022 update + /// in the Support + /// policy page. + /// + /// + /// + /// Deregisters a robot. /// - /// /// /// Container for the necessary parameters to execute the DeregisterRobot service method. /// @@ -2149,14 +2699,25 @@ public virtual DeregisterRobotResponse DeregisterRobot(DeregisterRobotRequest re /// - /// Describes a deployment job. + /// + /// + /// End of support notice: On September 10, 2025, Amazon Web Services will discontinue + /// support for Amazon Web Services RoboMaker. After September 10, 2025, you will no longer + /// be able to access the Amazon Web Services RoboMaker console or Amazon Web Services + /// RoboMaker resources. For more information on transitioning to Batch to help run containerized + /// simulations, visit https://aws.amazon.com/blogs/hpc/run-simulations-using-multiple-containers-in-a-single-aws-batch-job/. /// - /// + /// + /// /// - /// This API will no longer be supported as of May 2, 2022. Use it to remove resources - /// that were created for Deployment Service. + /// This API is no longer supported. For more information, see the May 2, 2022 update + /// in the Support + /// policy page. + /// + /// + /// + /// Describes a deployment job. /// - /// /// /// Container for the necessary parameters to execute the DescribeDeploymentJob service method. /// @@ -2187,14 +2748,25 @@ public virtual DescribeDeploymentJobResponse DescribeDeploymentJob(DescribeDeplo /// - /// Describes a deployment job. + /// + /// + /// End of support notice: On September 10, 2025, Amazon Web Services will discontinue + /// support for Amazon Web Services RoboMaker. After September 10, 2025, you will no longer + /// be able to access the Amazon Web Services RoboMaker console or Amazon Web Services + /// RoboMaker resources. For more information on transitioning to Batch to help run containerized + /// simulations, visit https://aws.amazon.com/blogs/hpc/run-simulations-using-multiple-containers-in-a-single-aws-batch-job/. /// - /// + /// + /// /// - /// This API will no longer be supported as of May 2, 2022. Use it to remove resources - /// that were created for Deployment Service. + /// This API is no longer supported. For more information, see the May 2, 2022 update + /// in the Support + /// policy page. + /// + /// + /// + /// Describes a deployment job. /// - /// /// /// Container for the necessary parameters to execute the DescribeDeploymentJob service method. /// @@ -2232,14 +2804,25 @@ public virtual DescribeDeploymentJobResponse DescribeDeploymentJob(DescribeDeplo /// - /// Describes a fleet. + /// + /// + /// End of support notice: On September 10, 2025, Amazon Web Services will discontinue + /// support for Amazon Web Services RoboMaker. After September 10, 2025, you will no longer + /// be able to access the Amazon Web Services RoboMaker console or Amazon Web Services + /// RoboMaker resources. For more information on transitioning to Batch to help run containerized + /// simulations, visit https://aws.amazon.com/blogs/hpc/run-simulations-using-multiple-containers-in-a-single-aws-batch-job/. /// - /// + /// + /// /// - /// This API will no longer be supported as of May 2, 2022. Use it to remove resources - /// that were created for Deployment Service. + /// This API is no longer supported. For more information, see the May 2, 2022 update + /// in the Support + /// policy page. + /// + /// + /// + /// Describes a fleet. /// - /// /// /// Container for the necessary parameters to execute the DescribeFleet service method. /// @@ -2270,14 +2853,25 @@ public virtual DescribeFleetResponse DescribeFleet(DescribeFleetRequest request) /// - /// Describes a fleet. + /// + /// + /// End of support notice: On September 10, 2025, Amazon Web Services will discontinue + /// support for Amazon Web Services RoboMaker. After September 10, 2025, you will no longer + /// be able to access the Amazon Web Services RoboMaker console or Amazon Web Services + /// RoboMaker resources. For more information on transitioning to Batch to help run containerized + /// simulations, visit https://aws.amazon.com/blogs/hpc/run-simulations-using-multiple-containers-in-a-single-aws-batch-job/. /// - /// + /// + /// /// - /// This API will no longer be supported as of May 2, 2022. Use it to remove resources - /// that were created for Deployment Service. + /// This API is no longer supported. For more information, see the May 2, 2022 update + /// in the Support + /// policy page. + /// + /// + /// + /// Describes a fleet. /// - /// /// /// Container for the necessary parameters to execute the DescribeFleet service method. /// @@ -2315,14 +2909,25 @@ public virtual DescribeFleetResponse DescribeFleet(DescribeFleetRequest request) /// - /// Describes a robot. + /// + /// + /// End of support notice: On September 10, 2025, Amazon Web Services will discontinue + /// support for Amazon Web Services RoboMaker. After September 10, 2025, you will no longer + /// be able to access the Amazon Web Services RoboMaker console or Amazon Web Services + /// RoboMaker resources. For more information on transitioning to Batch to help run containerized + /// simulations, visit https://aws.amazon.com/blogs/hpc/run-simulations-using-multiple-containers-in-a-single-aws-batch-job/. /// - /// + /// + /// /// - /// This API will no longer be supported as of May 2, 2022. Use it to remove resources - /// that were created for Deployment Service. + /// This API is no longer supported. For more information, see the May 2, 2022 update + /// in the Support + /// policy page. + /// + /// + /// + /// Describes a robot. /// - /// /// /// Container for the necessary parameters to execute the DescribeRobot service method. /// @@ -2353,14 +2958,25 @@ public virtual DescribeRobotResponse DescribeRobot(DescribeRobotRequest request) /// - /// Describes a robot. + /// + /// + /// End of support notice: On September 10, 2025, Amazon Web Services will discontinue + /// support for Amazon Web Services RoboMaker. After September 10, 2025, you will no longer + /// be able to access the Amazon Web Services RoboMaker console or Amazon Web Services + /// RoboMaker resources. For more information on transitioning to Batch to help run containerized + /// simulations, visit https://aws.amazon.com/blogs/hpc/run-simulations-using-multiple-containers-in-a-single-aws-batch-job/. /// - /// + /// + /// /// - /// This API will no longer be supported as of May 2, 2022. Use it to remove resources - /// that were created for Deployment Service. + /// This API is no longer supported. For more information, see the May 2, 2022 update + /// in the Support + /// policy page. + /// + /// + /// + /// Describes a robot. /// - /// /// /// Container for the necessary parameters to execute the DescribeRobot service method. /// @@ -2398,7 +3014,19 @@ public virtual DescribeRobotResponse DescribeRobot(DescribeRobotRequest request) /// + /// + /// + /// End of support notice: On September 10, 2025, Amazon Web Services will discontinue + /// support for Amazon Web Services RoboMaker. After September 10, 2025, you will no longer + /// be able to access the Amazon Web Services RoboMaker console or Amazon Web Services + /// RoboMaker resources. For more information on transitioning to Batch to help run containerized + /// simulations, visit https://aws.amazon.com/blogs/hpc/run-simulations-using-multiple-containers-in-a-single-aws-batch-job/. + /// + /// + /// + /// /// Describes a robot application. + /// /// /// Container for the necessary parameters to execute the DescribeRobotApplication service method. /// @@ -2428,7 +3056,19 @@ public virtual DescribeRobotApplicationResponse DescribeRobotApplication(Describ /// + /// + /// + /// End of support notice: On September 10, 2025, Amazon Web Services will discontinue + /// support for Amazon Web Services RoboMaker. After September 10, 2025, you will no longer + /// be able to access the Amazon Web Services RoboMaker console or Amazon Web Services + /// RoboMaker resources. For more information on transitioning to Batch to help run containerized + /// simulations, visit https://aws.amazon.com/blogs/hpc/run-simulations-using-multiple-containers-in-a-single-aws-batch-job/. + /// + /// + /// + /// /// Describes a robot application. + /// /// /// Container for the necessary parameters to execute the DescribeRobotApplication service method. /// @@ -2465,7 +3105,19 @@ public virtual DescribeRobotApplicationResponse DescribeRobotApplication(Describ /// + /// + /// + /// End of support notice: On September 10, 2025, Amazon Web Services will discontinue + /// support for Amazon Web Services RoboMaker. After September 10, 2025, you will no longer + /// be able to access the Amazon Web Services RoboMaker console or Amazon Web Services + /// RoboMaker resources. For more information on transitioning to Batch to help run containerized + /// simulations, visit https://aws.amazon.com/blogs/hpc/run-simulations-using-multiple-containers-in-a-single-aws-batch-job/. + /// + /// + /// + /// /// Describes a simulation application. + /// /// /// Container for the necessary parameters to execute the DescribeSimulationApplication service method. /// @@ -2495,7 +3147,19 @@ public virtual DescribeSimulationApplicationResponse DescribeSimulationApplicati /// + /// + /// + /// End of support notice: On September 10, 2025, Amazon Web Services will discontinue + /// support for Amazon Web Services RoboMaker. After September 10, 2025, you will no longer + /// be able to access the Amazon Web Services RoboMaker console or Amazon Web Services + /// RoboMaker resources. For more information on transitioning to Batch to help run containerized + /// simulations, visit https://aws.amazon.com/blogs/hpc/run-simulations-using-multiple-containers-in-a-single-aws-batch-job/. + /// + /// + /// + /// /// Describes a simulation application. + /// /// /// Container for the necessary parameters to execute the DescribeSimulationApplication service method. /// @@ -2532,7 +3196,19 @@ public virtual DescribeSimulationApplicationResponse DescribeSimulationApplicati /// + /// + /// + /// End of support notice: On September 10, 2025, Amazon Web Services will discontinue + /// support for Amazon Web Services RoboMaker. After September 10, 2025, you will no longer + /// be able to access the Amazon Web Services RoboMaker console or Amazon Web Services + /// RoboMaker resources. For more information on transitioning to Batch to help run containerized + /// simulations, visit https://aws.amazon.com/blogs/hpc/run-simulations-using-multiple-containers-in-a-single-aws-batch-job/. + /// + /// + /// + /// /// Describes a simulation job. + /// /// /// Container for the necessary parameters to execute the DescribeSimulationJob service method. /// @@ -2562,7 +3238,19 @@ public virtual DescribeSimulationJobResponse DescribeSimulationJob(DescribeSimul /// + /// + /// + /// End of support notice: On September 10, 2025, Amazon Web Services will discontinue + /// support for Amazon Web Services RoboMaker. After September 10, 2025, you will no longer + /// be able to access the Amazon Web Services RoboMaker console or Amazon Web Services + /// RoboMaker resources. For more information on transitioning to Batch to help run containerized + /// simulations, visit https://aws.amazon.com/blogs/hpc/run-simulations-using-multiple-containers-in-a-single-aws-batch-job/. + /// + /// + /// + /// /// Describes a simulation job. + /// /// /// Container for the necessary parameters to execute the DescribeSimulationJob service method. /// @@ -2599,7 +3287,19 @@ public virtual DescribeSimulationJobResponse DescribeSimulationJob(DescribeSimul /// + /// + /// + /// End of support notice: On September 10, 2025, Amazon Web Services will discontinue + /// support for Amazon Web Services RoboMaker. After September 10, 2025, you will no longer + /// be able to access the Amazon Web Services RoboMaker console or Amazon Web Services + /// RoboMaker resources. For more information on transitioning to Batch to help run containerized + /// simulations, visit https://aws.amazon.com/blogs/hpc/run-simulations-using-multiple-containers-in-a-single-aws-batch-job/. + /// + /// + /// + /// /// Describes a simulation job batch. + /// /// /// Container for the necessary parameters to execute the DescribeSimulationJobBatch service method. /// @@ -2626,7 +3326,19 @@ public virtual DescribeSimulationJobBatchResponse DescribeSimulationJobBatch(Des /// + /// + /// + /// End of support notice: On September 10, 2025, Amazon Web Services will discontinue + /// support for Amazon Web Services RoboMaker. After September 10, 2025, you will no longer + /// be able to access the Amazon Web Services RoboMaker console or Amazon Web Services + /// RoboMaker resources. For more information on transitioning to Batch to help run containerized + /// simulations, visit https://aws.amazon.com/blogs/hpc/run-simulations-using-multiple-containers-in-a-single-aws-batch-job/. + /// + /// + /// + /// /// Describes a simulation job batch. + /// /// /// Container for the necessary parameters to execute the DescribeSimulationJobBatch service method. /// @@ -2660,7 +3372,19 @@ public virtual DescribeSimulationJobBatchResponse DescribeSimulationJobBatch(Des /// + /// + /// + /// End of support notice: On September 10, 2025, Amazon Web Services will discontinue + /// support for Amazon Web Services RoboMaker. After September 10, 2025, you will no longer + /// be able to access the Amazon Web Services RoboMaker console or Amazon Web Services + /// RoboMaker resources. For more information on transitioning to Batch to help run containerized + /// simulations, visit https://aws.amazon.com/blogs/hpc/run-simulations-using-multiple-containers-in-a-single-aws-batch-job/. + /// + /// + /// + /// /// Describes a world. + /// /// /// Container for the necessary parameters to execute the DescribeWorld service method. /// @@ -2690,7 +3414,19 @@ public virtual DescribeWorldResponse DescribeWorld(DescribeWorldRequest request) /// + /// + /// + /// End of support notice: On September 10, 2025, Amazon Web Services will discontinue + /// support for Amazon Web Services RoboMaker. After September 10, 2025, you will no longer + /// be able to access the Amazon Web Services RoboMaker console or Amazon Web Services + /// RoboMaker resources. For more information on transitioning to Batch to help run containerized + /// simulations, visit https://aws.amazon.com/blogs/hpc/run-simulations-using-multiple-containers-in-a-single-aws-batch-job/. + /// + /// + /// + /// /// Describes a world. + /// /// /// Container for the necessary parameters to execute the DescribeWorld service method. /// @@ -2727,7 +3463,19 @@ public virtual DescribeWorldResponse DescribeWorld(DescribeWorldRequest request) /// + /// + /// + /// End of support notice: On September 10, 2025, Amazon Web Services will discontinue + /// support for Amazon Web Services RoboMaker. After September 10, 2025, you will no longer + /// be able to access the Amazon Web Services RoboMaker console or Amazon Web Services + /// RoboMaker resources. For more information on transitioning to Batch to help run containerized + /// simulations, visit https://aws.amazon.com/blogs/hpc/run-simulations-using-multiple-containers-in-a-single-aws-batch-job/. + /// + /// + /// + /// /// Describes a world export job. + /// /// /// Container for the necessary parameters to execute the DescribeWorldExportJob service method. /// @@ -2757,7 +3505,19 @@ public virtual DescribeWorldExportJobResponse DescribeWorldExportJob(DescribeWor /// + /// + /// + /// End of support notice: On September 10, 2025, Amazon Web Services will discontinue + /// support for Amazon Web Services RoboMaker. After September 10, 2025, you will no longer + /// be able to access the Amazon Web Services RoboMaker console or Amazon Web Services + /// RoboMaker resources. For more information on transitioning to Batch to help run containerized + /// simulations, visit https://aws.amazon.com/blogs/hpc/run-simulations-using-multiple-containers-in-a-single-aws-batch-job/. + /// + /// + /// + /// /// Describes a world export job. + /// /// /// Container for the necessary parameters to execute the DescribeWorldExportJob service method. /// @@ -2794,7 +3554,19 @@ public virtual DescribeWorldExportJobResponse DescribeWorldExportJob(DescribeWor /// + /// + /// + /// End of support notice: On September 10, 2025, Amazon Web Services will discontinue + /// support for Amazon Web Services RoboMaker. After September 10, 2025, you will no longer + /// be able to access the Amazon Web Services RoboMaker console or Amazon Web Services + /// RoboMaker resources. For more information on transitioning to Batch to help run containerized + /// simulations, visit https://aws.amazon.com/blogs/hpc/run-simulations-using-multiple-containers-in-a-single-aws-batch-job/. + /// + /// + /// + /// /// Describes a world generation job. + /// /// /// Container for the necessary parameters to execute the DescribeWorldGenerationJob service method. /// @@ -2824,7 +3596,19 @@ public virtual DescribeWorldGenerationJobResponse DescribeWorldGenerationJob(Des /// + /// + /// + /// End of support notice: On September 10, 2025, Amazon Web Services will discontinue + /// support for Amazon Web Services RoboMaker. After September 10, 2025, you will no longer + /// be able to access the Amazon Web Services RoboMaker console or Amazon Web Services + /// RoboMaker resources. For more information on transitioning to Batch to help run containerized + /// simulations, visit https://aws.amazon.com/blogs/hpc/run-simulations-using-multiple-containers-in-a-single-aws-batch-job/. + /// + /// + /// + /// /// Describes a world generation job. + /// /// /// Container for the necessary parameters to execute the DescribeWorldGenerationJob service method. /// @@ -2861,7 +3645,19 @@ public virtual DescribeWorldGenerationJobResponse DescribeWorldGenerationJob(Des /// + /// + /// + /// End of support notice: On September 10, 2025, Amazon Web Services will discontinue + /// support for Amazon Web Services RoboMaker. After September 10, 2025, you will no longer + /// be able to access the Amazon Web Services RoboMaker console or Amazon Web Services + /// RoboMaker resources. For more information on transitioning to Batch to help run containerized + /// simulations, visit https://aws.amazon.com/blogs/hpc/run-simulations-using-multiple-containers-in-a-single-aws-batch-job/. + /// + /// + /// + /// /// Describes a world template. + /// /// /// Container for the necessary parameters to execute the DescribeWorldTemplate service method. /// @@ -2891,7 +3687,19 @@ public virtual DescribeWorldTemplateResponse DescribeWorldTemplate(DescribeWorld /// + /// + /// + /// End of support notice: On September 10, 2025, Amazon Web Services will discontinue + /// support for Amazon Web Services RoboMaker. After September 10, 2025, you will no longer + /// be able to access the Amazon Web Services RoboMaker console or Amazon Web Services + /// RoboMaker resources. For more information on transitioning to Batch to help run containerized + /// simulations, visit https://aws.amazon.com/blogs/hpc/run-simulations-using-multiple-containers-in-a-single-aws-batch-job/. + /// + /// + /// + /// /// Describes a world template. + /// /// /// Container for the necessary parameters to execute the DescribeWorldTemplate service method. /// @@ -2928,7 +3736,19 @@ public virtual DescribeWorldTemplateResponse DescribeWorldTemplate(DescribeWorld /// + /// + /// + /// End of support notice: On September 10, 2025, Amazon Web Services will discontinue + /// support for Amazon Web Services RoboMaker. After September 10, 2025, you will no longer + /// be able to access the Amazon Web Services RoboMaker console or Amazon Web Services + /// RoboMaker resources. For more information on transitioning to Batch to help run containerized + /// simulations, visit https://aws.amazon.com/blogs/hpc/run-simulations-using-multiple-containers-in-a-single-aws-batch-job/. + /// + /// + /// + /// /// Gets the world template body. + /// /// /// Container for the necessary parameters to execute the GetWorldTemplateBody service method. /// @@ -2958,7 +3778,19 @@ public virtual GetWorldTemplateBodyResponse GetWorldTemplateBody(GetWorldTemplat /// + /// + /// + /// End of support notice: On September 10, 2025, Amazon Web Services will discontinue + /// support for Amazon Web Services RoboMaker. After September 10, 2025, you will no longer + /// be able to access the Amazon Web Services RoboMaker console or Amazon Web Services + /// RoboMaker resources. For more information on transitioning to Batch to help run containerized + /// simulations, visit https://aws.amazon.com/blogs/hpc/run-simulations-using-multiple-containers-in-a-single-aws-batch-job/. + /// + /// + /// + /// /// Gets the world template body. + /// /// /// Container for the necessary parameters to execute the GetWorldTemplateBody service method. /// @@ -2995,15 +3827,26 @@ public virtual GetWorldTemplateBodyResponse GetWorldTemplateBody(GetWorldTemplat /// - /// Returns a list of deployment jobs for a fleet. You can optionally provide filters - /// to retrieve specific deployment jobs. + /// + /// + /// End of support notice: On September 10, 2025, Amazon Web Services will discontinue + /// support for Amazon Web Services RoboMaker. After September 10, 2025, you will no longer + /// be able to access the Amazon Web Services RoboMaker console or Amazon Web Services + /// RoboMaker resources. For more information on transitioning to Batch to help run containerized + /// simulations, visit https://aws.amazon.com/blogs/hpc/run-simulations-using-multiple-containers-in-a-single-aws-batch-job/. /// - /// + /// + /// /// - /// This API will no longer be supported as of May 2, 2022. Use it to remove resources - /// that were created for Deployment Service. + /// This API is no longer supported. For more information, see the May 2, 2022 update + /// in the Support + /// policy page. + /// + /// + /// + /// Returns a list of deployment jobs for a fleet. You can optionally provide filters + /// to retrieve specific deployment jobs. /// - /// /// /// Container for the necessary parameters to execute the ListDeploymentJobs service method. /// @@ -3034,15 +3877,26 @@ public virtual ListDeploymentJobsResponse ListDeploymentJobs(ListDeploymentJobsR /// - /// Returns a list of deployment jobs for a fleet. You can optionally provide filters - /// to retrieve specific deployment jobs. + /// + /// + /// End of support notice: On September 10, 2025, Amazon Web Services will discontinue + /// support for Amazon Web Services RoboMaker. After September 10, 2025, you will no longer + /// be able to access the Amazon Web Services RoboMaker console or Amazon Web Services + /// RoboMaker resources. For more information on transitioning to Batch to help run containerized + /// simulations, visit https://aws.amazon.com/blogs/hpc/run-simulations-using-multiple-containers-in-a-single-aws-batch-job/. /// - /// + /// + /// /// - /// This API will no longer be supported as of May 2, 2022. Use it to remove resources - /// that were created for Deployment Service. + /// This API is no longer supported. For more information, see the May 2, 2022 update + /// in the Support + /// policy page. + /// + /// + /// + /// Returns a list of deployment jobs for a fleet. You can optionally provide filters + /// to retrieve specific deployment jobs. /// - /// /// /// Container for the necessary parameters to execute the ListDeploymentJobs service method. /// @@ -3080,15 +3934,26 @@ public virtual ListDeploymentJobsResponse ListDeploymentJobs(ListDeploymentJobsR /// - /// Returns a list of fleets. You can optionally provide filters to retrieve specific - /// fleets. + /// + /// + /// End of support notice: On September 10, 2025, Amazon Web Services will discontinue + /// support for Amazon Web Services RoboMaker. After September 10, 2025, you will no longer + /// be able to access the Amazon Web Services RoboMaker console or Amazon Web Services + /// RoboMaker resources. For more information on transitioning to Batch to help run containerized + /// simulations, visit https://aws.amazon.com/blogs/hpc/run-simulations-using-multiple-containers-in-a-single-aws-batch-job/. /// - /// + /// + /// /// - /// This API will no longer be supported as of May 2, 2022. Use it to remove resources - /// that were created for Deployment Service. + /// This API is no longer supported. For more information, see the May 2, 2022 update + /// in the Support + /// policy page. + /// + /// + /// + /// Returns a list of fleets. You can optionally provide filters to retrieve specific + /// fleets. /// - /// /// /// Container for the necessary parameters to execute the ListFleets service method. /// @@ -3119,15 +3984,26 @@ public virtual ListFleetsResponse ListFleets(ListFleetsRequest request) /// - /// Returns a list of fleets. You can optionally provide filters to retrieve specific - /// fleets. + /// + /// + /// End of support notice: On September 10, 2025, Amazon Web Services will discontinue + /// support for Amazon Web Services RoboMaker. After September 10, 2025, you will no longer + /// be able to access the Amazon Web Services RoboMaker console or Amazon Web Services + /// RoboMaker resources. For more information on transitioning to Batch to help run containerized + /// simulations, visit https://aws.amazon.com/blogs/hpc/run-simulations-using-multiple-containers-in-a-single-aws-batch-job/. /// - /// + /// + /// /// - /// This API will no longer be supported as of May 2, 2022. Use it to remove resources - /// that were created for Deployment Service. + /// This API is no longer supported. For more information, see the May 2, 2022 update + /// in the Support + /// policy page. + /// + /// + /// + /// Returns a list of fleets. You can optionally provide filters to retrieve specific + /// fleets. /// - /// /// /// Container for the necessary parameters to execute the ListFleets service method. /// @@ -3165,8 +4041,20 @@ public virtual ListFleetsResponse ListFleets(ListFleetsRequest request) /// + /// + /// + /// End of support notice: On September 10, 2025, Amazon Web Services will discontinue + /// support for Amazon Web Services RoboMaker. After September 10, 2025, you will no longer + /// be able to access the Amazon Web Services RoboMaker console or Amazon Web Services + /// RoboMaker resources. For more information on transitioning to Batch to help run containerized + /// simulations, visit https://aws.amazon.com/blogs/hpc/run-simulations-using-multiple-containers-in-a-single-aws-batch-job/. + /// + /// + /// + /// /// Returns a list of robot application. You can optionally provide filters to retrieve /// specific robot applications. + /// /// /// Container for the necessary parameters to execute the ListRobotApplications service method. /// @@ -3193,8 +4081,20 @@ public virtual ListRobotApplicationsResponse ListRobotApplications(ListRobotAppl /// + /// + /// + /// End of support notice: On September 10, 2025, Amazon Web Services will discontinue + /// support for Amazon Web Services RoboMaker. After September 10, 2025, you will no longer + /// be able to access the Amazon Web Services RoboMaker console or Amazon Web Services + /// RoboMaker resources. For more information on transitioning to Batch to help run containerized + /// simulations, visit https://aws.amazon.com/blogs/hpc/run-simulations-using-multiple-containers-in-a-single-aws-batch-job/. + /// + /// + /// + /// /// Returns a list of robot application. You can optionally provide filters to retrieve /// specific robot applications. + /// /// /// Container for the necessary parameters to execute the ListRobotApplications service method. /// @@ -3228,15 +4128,26 @@ public virtual ListRobotApplicationsResponse ListRobotApplications(ListRobotAppl /// - /// Returns a list of robots. You can optionally provide filters to retrieve specific - /// robots. + /// + /// + /// End of support notice: On September 10, 2025, Amazon Web Services will discontinue + /// support for Amazon Web Services RoboMaker. After September 10, 2025, you will no longer + /// be able to access the Amazon Web Services RoboMaker console or Amazon Web Services + /// RoboMaker resources. For more information on transitioning to Batch to help run containerized + /// simulations, visit https://aws.amazon.com/blogs/hpc/run-simulations-using-multiple-containers-in-a-single-aws-batch-job/. /// - /// + /// + /// /// - /// This API will no longer be supported as of May 2, 2022. Use it to remove resources - /// that were created for Deployment Service. + /// This API is no longer supported. For more information, see the May 2, 2022 update + /// in the Support + /// policy page. + /// + /// + /// + /// Returns a list of robots. You can optionally provide filters to retrieve specific + /// robots. /// - /// /// /// Container for the necessary parameters to execute the ListRobots service method. /// @@ -3267,15 +4178,26 @@ public virtual ListRobotsResponse ListRobots(ListRobotsRequest request) /// - /// Returns a list of robots. You can optionally provide filters to retrieve specific - /// robots. + /// + /// + /// End of support notice: On September 10, 2025, Amazon Web Services will discontinue + /// support for Amazon Web Services RoboMaker. After September 10, 2025, you will no longer + /// be able to access the Amazon Web Services RoboMaker console or Amazon Web Services + /// RoboMaker resources. For more information on transitioning to Batch to help run containerized + /// simulations, visit https://aws.amazon.com/blogs/hpc/run-simulations-using-multiple-containers-in-a-single-aws-batch-job/. /// - /// + /// + /// /// - /// This API will no longer be supported as of May 2, 2022. Use it to remove resources - /// that were created for Deployment Service. + /// This API is no longer supported. For more information, see the May 2, 2022 update + /// in the Support + /// policy page. + /// + /// + /// + /// Returns a list of robots. You can optionally provide filters to retrieve specific + /// robots. /// - /// /// /// Container for the necessary parameters to execute the ListRobots service method. /// @@ -3313,8 +4235,20 @@ public virtual ListRobotsResponse ListRobots(ListRobotsRequest request) /// + /// + /// + /// End of support notice: On September 10, 2025, Amazon Web Services will discontinue + /// support for Amazon Web Services RoboMaker. After September 10, 2025, you will no longer + /// be able to access the Amazon Web Services RoboMaker console or Amazon Web Services + /// RoboMaker resources. For more information on transitioning to Batch to help run containerized + /// simulations, visit https://aws.amazon.com/blogs/hpc/run-simulations-using-multiple-containers-in-a-single-aws-batch-job/. + /// + /// + /// + /// /// Returns a list of simulation applications. You can optionally provide filters to retrieve - /// specific simulation applications. + /// specific simulation applications. + /// /// /// Container for the necessary parameters to execute the ListSimulationApplications service method. /// @@ -3341,8 +4275,20 @@ public virtual ListSimulationApplicationsResponse ListSimulationApplications(Lis /// + /// + /// + /// End of support notice: On September 10, 2025, Amazon Web Services will discontinue + /// support for Amazon Web Services RoboMaker. After September 10, 2025, you will no longer + /// be able to access the Amazon Web Services RoboMaker console or Amazon Web Services + /// RoboMaker resources. For more information on transitioning to Batch to help run containerized + /// simulations, visit https://aws.amazon.com/blogs/hpc/run-simulations-using-multiple-containers-in-a-single-aws-batch-job/. + /// + /// + /// + /// /// Returns a list of simulation applications. You can optionally provide filters to retrieve - /// specific simulation applications. + /// specific simulation applications. + /// /// /// Container for the necessary parameters to execute the ListSimulationApplications service method. /// @@ -3376,8 +4322,20 @@ public virtual ListSimulationApplicationsResponse ListSimulationApplications(Lis /// + /// + /// + /// End of support notice: On September 10, 2025, Amazon Web Services will discontinue + /// support for Amazon Web Services RoboMaker. After September 10, 2025, you will no longer + /// be able to access the Amazon Web Services RoboMaker console or Amazon Web Services + /// RoboMaker resources. For more information on transitioning to Batch to help run containerized + /// simulations, visit https://aws.amazon.com/blogs/hpc/run-simulations-using-multiple-containers-in-a-single-aws-batch-job/. + /// + /// + /// + /// /// Returns a list simulation job batches. You can optionally provide filters to retrieve - /// specific simulation batch jobs. + /// specific simulation batch jobs. + /// /// /// Container for the necessary parameters to execute the ListSimulationJobBatches service method. /// @@ -3401,8 +4359,20 @@ public virtual ListSimulationJobBatchesResponse ListSimulationJobBatches(ListSim /// + /// + /// + /// End of support notice: On September 10, 2025, Amazon Web Services will discontinue + /// support for Amazon Web Services RoboMaker. After September 10, 2025, you will no longer + /// be able to access the Amazon Web Services RoboMaker console or Amazon Web Services + /// RoboMaker resources. For more information on transitioning to Batch to help run containerized + /// simulations, visit https://aws.amazon.com/blogs/hpc/run-simulations-using-multiple-containers-in-a-single-aws-batch-job/. + /// + /// + /// + /// /// Returns a list simulation job batches. You can optionally provide filters to retrieve - /// specific simulation batch jobs. + /// specific simulation batch jobs. + /// /// /// Container for the necessary parameters to execute the ListSimulationJobBatches service method. /// @@ -3433,8 +4403,20 @@ public virtual ListSimulationJobBatchesResponse ListSimulationJobBatches(ListSim /// + /// + /// + /// End of support notice: On September 10, 2025, Amazon Web Services will discontinue + /// support for Amazon Web Services RoboMaker. After September 10, 2025, you will no longer + /// be able to access the Amazon Web Services RoboMaker console or Amazon Web Services + /// RoboMaker resources. For more information on transitioning to Batch to help run containerized + /// simulations, visit https://aws.amazon.com/blogs/hpc/run-simulations-using-multiple-containers-in-a-single-aws-batch-job/. + /// + /// + /// + /// /// Returns a list of simulation jobs. You can optionally provide filters to retrieve - /// specific simulation jobs. + /// specific simulation jobs. + /// /// /// Container for the necessary parameters to execute the ListSimulationJobs service method. /// @@ -3461,8 +4443,20 @@ public virtual ListSimulationJobsResponse ListSimulationJobs(ListSimulationJobsR /// + /// + /// + /// End of support notice: On September 10, 2025, Amazon Web Services will discontinue + /// support for Amazon Web Services RoboMaker. After September 10, 2025, you will no longer + /// be able to access the Amazon Web Services RoboMaker console or Amazon Web Services + /// RoboMaker resources. For more information on transitioning to Batch to help run containerized + /// simulations, visit https://aws.amazon.com/blogs/hpc/run-simulations-using-multiple-containers-in-a-single-aws-batch-job/. + /// + /// + /// + /// /// Returns a list of simulation jobs. You can optionally provide filters to retrieve - /// specific simulation jobs. + /// specific simulation jobs. + /// /// /// Container for the necessary parameters to execute the ListSimulationJobs service method. /// @@ -3496,7 +4490,19 @@ public virtual ListSimulationJobsResponse ListSimulationJobs(ListSimulationJobsR /// + /// + /// + /// End of support notice: On September 10, 2025, Amazon Web Services will discontinue + /// support for Amazon Web Services RoboMaker. After September 10, 2025, you will no longer + /// be able to access the Amazon Web Services RoboMaker console or Amazon Web Services + /// RoboMaker resources. For more information on transitioning to Batch to help run containerized + /// simulations, visit https://aws.amazon.com/blogs/hpc/run-simulations-using-multiple-containers-in-a-single-aws-batch-job/. + /// + /// + /// + /// /// Lists all tags on a AWS RoboMaker resource. + /// /// /// Container for the necessary parameters to execute the ListTagsForResource service method. /// @@ -3526,7 +4532,19 @@ public virtual ListTagsForResourceResponse ListTagsForResource(ListTagsForResour /// + /// + /// + /// End of support notice: On September 10, 2025, Amazon Web Services will discontinue + /// support for Amazon Web Services RoboMaker. After September 10, 2025, you will no longer + /// be able to access the Amazon Web Services RoboMaker console or Amazon Web Services + /// RoboMaker resources. For more information on transitioning to Batch to help run containerized + /// simulations, visit https://aws.amazon.com/blogs/hpc/run-simulations-using-multiple-containers-in-a-single-aws-batch-job/. + /// + /// + /// + /// /// Lists all tags on a AWS RoboMaker resource. + /// /// /// Container for the necessary parameters to execute the ListTagsForResource service method. /// @@ -3563,7 +4581,19 @@ public virtual ListTagsForResourceResponse ListTagsForResource(ListTagsForResour /// + /// + /// + /// End of support notice: On September 10, 2025, Amazon Web Services will discontinue + /// support for Amazon Web Services RoboMaker. After September 10, 2025, you will no longer + /// be able to access the Amazon Web Services RoboMaker console or Amazon Web Services + /// RoboMaker resources. For more information on transitioning to Batch to help run containerized + /// simulations, visit https://aws.amazon.com/blogs/hpc/run-simulations-using-multiple-containers-in-a-single-aws-batch-job/. + /// + /// + /// + /// /// Lists world export jobs. + /// /// /// Container for the necessary parameters to execute the ListWorldExportJobs service method. /// @@ -3590,7 +4620,19 @@ public virtual ListWorldExportJobsResponse ListWorldExportJobs(ListWorldExportJo /// + /// + /// + /// End of support notice: On September 10, 2025, Amazon Web Services will discontinue + /// support for Amazon Web Services RoboMaker. After September 10, 2025, you will no longer + /// be able to access the Amazon Web Services RoboMaker console or Amazon Web Services + /// RoboMaker resources. For more information on transitioning to Batch to help run containerized + /// simulations, visit https://aws.amazon.com/blogs/hpc/run-simulations-using-multiple-containers-in-a-single-aws-batch-job/. + /// + /// + /// + /// /// Lists world export jobs. + /// /// /// Container for the necessary parameters to execute the ListWorldExportJobs service method. /// @@ -3624,7 +4666,19 @@ public virtual ListWorldExportJobsResponse ListWorldExportJobs(ListWorldExportJo /// + /// + /// + /// End of support notice: On September 10, 2025, Amazon Web Services will discontinue + /// support for Amazon Web Services RoboMaker. After September 10, 2025, you will no longer + /// be able to access the Amazon Web Services RoboMaker console or Amazon Web Services + /// RoboMaker resources. For more information on transitioning to Batch to help run containerized + /// simulations, visit https://aws.amazon.com/blogs/hpc/run-simulations-using-multiple-containers-in-a-single-aws-batch-job/. + /// + /// + /// + /// /// Lists world generator jobs. + /// /// /// Container for the necessary parameters to execute the ListWorldGenerationJobs service method. /// @@ -3651,7 +4705,19 @@ public virtual ListWorldGenerationJobsResponse ListWorldGenerationJobs(ListWorld /// + /// + /// + /// End of support notice: On September 10, 2025, Amazon Web Services will discontinue + /// support for Amazon Web Services RoboMaker. After September 10, 2025, you will no longer + /// be able to access the Amazon Web Services RoboMaker console or Amazon Web Services + /// RoboMaker resources. For more information on transitioning to Batch to help run containerized + /// simulations, visit https://aws.amazon.com/blogs/hpc/run-simulations-using-multiple-containers-in-a-single-aws-batch-job/. + /// + /// + /// + /// /// Lists world generator jobs. + /// /// /// Container for the necessary parameters to execute the ListWorldGenerationJobs service method. /// @@ -3685,7 +4751,19 @@ public virtual ListWorldGenerationJobsResponse ListWorldGenerationJobs(ListWorld /// + /// + /// + /// End of support notice: On September 10, 2025, Amazon Web Services will discontinue + /// support for Amazon Web Services RoboMaker. After September 10, 2025, you will no longer + /// be able to access the Amazon Web Services RoboMaker console or Amazon Web Services + /// RoboMaker resources. For more information on transitioning to Batch to help run containerized + /// simulations, visit https://aws.amazon.com/blogs/hpc/run-simulations-using-multiple-containers-in-a-single-aws-batch-job/. + /// + /// + /// + /// /// Lists worlds. + /// /// /// Container for the necessary parameters to execute the ListWorlds service method. /// @@ -3712,7 +4790,19 @@ public virtual ListWorldsResponse ListWorlds(ListWorldsRequest request) /// + /// + /// + /// End of support notice: On September 10, 2025, Amazon Web Services will discontinue + /// support for Amazon Web Services RoboMaker. After September 10, 2025, you will no longer + /// be able to access the Amazon Web Services RoboMaker console or Amazon Web Services + /// RoboMaker resources. For more information on transitioning to Batch to help run containerized + /// simulations, visit https://aws.amazon.com/blogs/hpc/run-simulations-using-multiple-containers-in-a-single-aws-batch-job/. + /// + /// + /// + /// /// Lists worlds. + /// /// /// Container for the necessary parameters to execute the ListWorlds service method. /// @@ -3746,7 +4836,19 @@ public virtual ListWorldsResponse ListWorlds(ListWorldsRequest request) /// + /// + /// + /// End of support notice: On September 10, 2025, Amazon Web Services will discontinue + /// support for Amazon Web Services RoboMaker. After September 10, 2025, you will no longer + /// be able to access the Amazon Web Services RoboMaker console or Amazon Web Services + /// RoboMaker resources. For more information on transitioning to Batch to help run containerized + /// simulations, visit https://aws.amazon.com/blogs/hpc/run-simulations-using-multiple-containers-in-a-single-aws-batch-job/. + /// + /// + /// + /// /// Lists world templates. + /// /// /// Container for the necessary parameters to execute the ListWorldTemplates service method. /// @@ -3773,7 +4875,19 @@ public virtual ListWorldTemplatesResponse ListWorldTemplates(ListWorldTemplatesR /// + /// + /// + /// End of support notice: On September 10, 2025, Amazon Web Services will discontinue + /// support for Amazon Web Services RoboMaker. After September 10, 2025, you will no longer + /// be able to access the Amazon Web Services RoboMaker console or Amazon Web Services + /// RoboMaker resources. For more information on transitioning to Batch to help run containerized + /// simulations, visit https://aws.amazon.com/blogs/hpc/run-simulations-using-multiple-containers-in-a-single-aws-batch-job/. + /// + /// + /// + /// /// Lists world templates. + /// /// /// Container for the necessary parameters to execute the ListWorldTemplates service method. /// @@ -3807,11 +4921,24 @@ public virtual ListWorldTemplatesResponse ListWorldTemplates(ListWorldTemplatesR /// - /// Registers a robot with a fleet. + /// + /// + /// End of support notice: On September 10, 2025, Amazon Web Services will discontinue + /// support for Amazon Web Services RoboMaker. After September 10, 2025, you will no longer + /// be able to access the Amazon Web Services RoboMaker console or Amazon Web Services + /// RoboMaker resources. For more information on transitioning to Batch to help run containerized + /// simulations, visit https://aws.amazon.com/blogs/hpc/run-simulations-using-multiple-containers-in-a-single-aws-batch-job/. /// + /// + /// + /// + /// Registers a robot with a fleet. + /// /// /// - /// This API is no longer supported and will throw an error if used. + /// This API is no longer supported and will throw an error if used. For more information, + /// see the January 31, 2022 update in the Support + /// policy page. /// /// /// @@ -3848,11 +4975,24 @@ public virtual RegisterRobotResponse RegisterRobot(RegisterRobotRequest request) /// - /// Registers a robot with a fleet. + /// + /// + /// End of support notice: On September 10, 2025, Amazon Web Services will discontinue + /// support for Amazon Web Services RoboMaker. After September 10, 2025, you will no longer + /// be able to access the Amazon Web Services RoboMaker console or Amazon Web Services + /// RoboMaker resources. For more information on transitioning to Batch to help run containerized + /// simulations, visit https://aws.amazon.com/blogs/hpc/run-simulations-using-multiple-containers-in-a-single-aws-batch-job/. /// + /// + /// + /// + /// Registers a robot with a fleet. + /// /// /// - /// This API is no longer supported and will throw an error if used. + /// This API is no longer supported and will throw an error if used. For more information, + /// see the January 31, 2022 update in the Support + /// policy page. /// /// /// @@ -3896,7 +5036,19 @@ public virtual RegisterRobotResponse RegisterRobot(RegisterRobotRequest request) /// + /// + /// + /// End of support notice: On September 10, 2025, Amazon Web Services will discontinue + /// support for Amazon Web Services RoboMaker. After September 10, 2025, you will no longer + /// be able to access the Amazon Web Services RoboMaker console or Amazon Web Services + /// RoboMaker resources. For more information on transitioning to Batch to help run containerized + /// simulations, visit https://aws.amazon.com/blogs/hpc/run-simulations-using-multiple-containers-in-a-single-aws-batch-job/. + /// + /// + /// + /// /// Restarts a running simulation job. + /// /// /// Container for the necessary parameters to execute the RestartSimulationJob service method. /// @@ -3930,7 +5082,19 @@ public virtual RestartSimulationJobResponse RestartSimulationJob(RestartSimulati /// + /// + /// + /// End of support notice: On September 10, 2025, Amazon Web Services will discontinue + /// support for Amazon Web Services RoboMaker. After September 10, 2025, you will no longer + /// be able to access the Amazon Web Services RoboMaker console or Amazon Web Services + /// RoboMaker resources. For more information on transitioning to Batch to help run containerized + /// simulations, visit https://aws.amazon.com/blogs/hpc/run-simulations-using-multiple-containers-in-a-single-aws-batch-job/. + /// + /// + /// + /// /// Restarts a running simulation job. + /// /// /// Container for the necessary parameters to execute the RestartSimulationJob service method. /// @@ -3971,8 +5135,20 @@ public virtual RestartSimulationJobResponse RestartSimulationJob(RestartSimulati /// + /// + /// + /// End of support notice: On September 10, 2025, Amazon Web Services will discontinue + /// support for Amazon Web Services RoboMaker. After September 10, 2025, you will no longer + /// be able to access the Amazon Web Services RoboMaker console or Amazon Web Services + /// RoboMaker resources. For more information on transitioning to Batch to help run containerized + /// simulations, visit https://aws.amazon.com/blogs/hpc/run-simulations-using-multiple-containers-in-a-single-aws-batch-job/. + /// + /// + /// + /// /// Starts a new simulation job batch. The batch is defined using one or more SimulationJobRequest - /// objects. + /// objects. + /// /// /// Container for the necessary parameters to execute the StartSimulationJobBatch service method. /// @@ -4007,8 +5183,20 @@ public virtual StartSimulationJobBatchResponse StartSimulationJobBatch(StartSimu /// + /// + /// + /// End of support notice: On September 10, 2025, Amazon Web Services will discontinue + /// support for Amazon Web Services RoboMaker. After September 10, 2025, you will no longer + /// be able to access the Amazon Web Services RoboMaker console or Amazon Web Services + /// RoboMaker resources. For more information on transitioning to Batch to help run containerized + /// simulations, visit https://aws.amazon.com/blogs/hpc/run-simulations-using-multiple-containers-in-a-single-aws-batch-job/. + /// + /// + /// + /// /// Starts a new simulation job batch. The batch is defined using one or more SimulationJobRequest - /// objects. + /// objects. + /// /// /// Container for the necessary parameters to execute the StartSimulationJobBatch service method. /// @@ -4050,15 +5238,26 @@ public virtual StartSimulationJobBatchResponse StartSimulationJobBatch(StartSimu /// - /// Syncrhonizes robots in a fleet to the latest deployment. This is helpful if robots - /// were added after a deployment. + /// + /// + /// End of support notice: On September 10, 2025, Amazon Web Services will discontinue + /// support for Amazon Web Services RoboMaker. After September 10, 2025, you will no longer + /// be able to access the Amazon Web Services RoboMaker console or Amazon Web Services + /// RoboMaker resources. For more information on transitioning to Batch to help run containerized + /// simulations, visit https://aws.amazon.com/blogs/hpc/run-simulations-using-multiple-containers-in-a-single-aws-batch-job/. /// - /// + /// + /// /// - /// This API will no longer be supported as of May 2, 2022. Use it to remove resources - /// that were created for Deployment Service. + /// This API is no longer supported. For more information, see the May 2, 2022 update + /// in the Support + /// policy page. + /// + /// + /// + /// Syncrhonizes robots in a fleet to the latest deployment. This is helpful if robots + /// were added after a deployment. /// - /// /// /// Container for the necessary parameters to execute the SyncDeploymentJob service method. /// @@ -4100,15 +5299,26 @@ public virtual SyncDeploymentJobResponse SyncDeploymentJob(SyncDeploymentJobRequ /// - /// Syncrhonizes robots in a fleet to the latest deployment. This is helpful if robots - /// were added after a deployment. + /// + /// + /// End of support notice: On September 10, 2025, Amazon Web Services will discontinue + /// support for Amazon Web Services RoboMaker. After September 10, 2025, you will no longer + /// be able to access the Amazon Web Services RoboMaker console or Amazon Web Services + /// RoboMaker resources. For more information on transitioning to Batch to help run containerized + /// simulations, visit https://aws.amazon.com/blogs/hpc/run-simulations-using-multiple-containers-in-a-single-aws-batch-job/. /// - /// + /// + /// /// - /// This API will no longer be supported as of May 2, 2022. Use it to remove resources - /// that were created for Deployment Service. + /// This API is no longer supported. For more information, see the May 2, 2022 update + /// in the Support + /// policy page. + /// + /// + /// + /// Syncrhonizes robots in a fleet to the latest deployment. This is helpful if robots + /// were added after a deployment. /// - /// /// /// Container for the necessary parameters to execute the SyncDeploymentJob service method. /// @@ -4157,8 +5367,19 @@ public virtual SyncDeploymentJobResponse SyncDeploymentJob(SyncDeploymentJobRequ /// - /// Adds or edits tags for a AWS RoboMaker resource. + /// + /// + /// End of support notice: On September 10, 2025, Amazon Web Services will discontinue + /// support for Amazon Web Services RoboMaker. After September 10, 2025, you will no longer + /// be able to access the Amazon Web Services RoboMaker console or Amazon Web Services + /// RoboMaker resources. For more information on transitioning to Batch to help run containerized + /// simulations, visit https://aws.amazon.com/blogs/hpc/run-simulations-using-multiple-containers-in-a-single-aws-batch-job/. /// + /// + /// + /// + /// Adds or edits tags for a AWS RoboMaker resource. + /// /// /// /// Each tag consists of a tag key and a tag value. Tag keys and tag values are both required, @@ -4198,8 +5419,19 @@ public virtual TagResourceResponse TagResource(TagResourceRequest request) /// - /// Adds or edits tags for a AWS RoboMaker resource. + /// + /// + /// End of support notice: On September 10, 2025, Amazon Web Services will discontinue + /// support for Amazon Web Services RoboMaker. After September 10, 2025, you will no longer + /// be able to access the Amazon Web Services RoboMaker console or Amazon Web Services + /// RoboMaker resources. For more information on transitioning to Batch to help run containerized + /// simulations, visit https://aws.amazon.com/blogs/hpc/run-simulations-using-multiple-containers-in-a-single-aws-batch-job/. /// + /// + /// + /// + /// Adds or edits tags for a AWS RoboMaker resource. + /// /// /// /// Each tag consists of a tag key and a tag value. Tag keys and tag values are both required, @@ -4246,8 +5478,19 @@ public virtual TagResourceResponse TagResource(TagResourceRequest request) /// - /// Removes the specified tags from the specified AWS RoboMaker resource. + /// + /// + /// End of support notice: On September 10, 2025, Amazon Web Services will discontinue + /// support for Amazon Web Services RoboMaker. After September 10, 2025, you will no longer + /// be able to access the Amazon Web Services RoboMaker console or Amazon Web Services + /// RoboMaker resources. For more information on transitioning to Batch to help run containerized + /// simulations, visit https://aws.amazon.com/blogs/hpc/run-simulations-using-multiple-containers-in-a-single-aws-batch-job/. /// + /// + /// + /// + /// Removes the specified tags from the specified AWS RoboMaker resource. + /// /// /// /// To remove a tag, specify the tag key. To change the tag value of an existing tag key, @@ -4283,8 +5526,19 @@ public virtual UntagResourceResponse UntagResource(UntagResourceRequest request) /// - /// Removes the specified tags from the specified AWS RoboMaker resource. + /// + /// + /// End of support notice: On September 10, 2025, Amazon Web Services will discontinue + /// support for Amazon Web Services RoboMaker. After September 10, 2025, you will no longer + /// be able to access the Amazon Web Services RoboMaker console or Amazon Web Services + /// RoboMaker resources. For more information on transitioning to Batch to help run containerized + /// simulations, visit https://aws.amazon.com/blogs/hpc/run-simulations-using-multiple-containers-in-a-single-aws-batch-job/. /// + /// + /// + /// + /// Removes the specified tags from the specified AWS RoboMaker resource. + /// /// /// /// To remove a tag, specify the tag key. To change the tag value of an existing tag key, @@ -4327,7 +5581,19 @@ public virtual UntagResourceResponse UntagResource(UntagResourceRequest request) /// + /// + /// + /// End of support notice: On September 10, 2025, Amazon Web Services will discontinue + /// support for Amazon Web Services RoboMaker. After September 10, 2025, you will no longer + /// be able to access the Amazon Web Services RoboMaker console or Amazon Web Services + /// RoboMaker resources. For more information on transitioning to Batch to help run containerized + /// simulations, visit https://aws.amazon.com/blogs/hpc/run-simulations-using-multiple-containers-in-a-single-aws-batch-job/. + /// + /// + /// + /// /// Updates a robot application. + /// /// /// Container for the necessary parameters to execute the UpdateRobotApplication service method. /// @@ -4361,7 +5627,19 @@ public virtual UpdateRobotApplicationResponse UpdateRobotApplication(UpdateRobot /// + /// + /// + /// End of support notice: On September 10, 2025, Amazon Web Services will discontinue + /// support for Amazon Web Services RoboMaker. After September 10, 2025, you will no longer + /// be able to access the Amazon Web Services RoboMaker console or Amazon Web Services + /// RoboMaker resources. For more information on transitioning to Batch to help run containerized + /// simulations, visit https://aws.amazon.com/blogs/hpc/run-simulations-using-multiple-containers-in-a-single-aws-batch-job/. + /// + /// + /// + /// /// Updates a robot application. + /// /// /// Container for the necessary parameters to execute the UpdateRobotApplication service method. /// @@ -4402,7 +5680,19 @@ public virtual UpdateRobotApplicationResponse UpdateRobotApplication(UpdateRobot /// + /// + /// + /// End of support notice: On September 10, 2025, Amazon Web Services will discontinue + /// support for Amazon Web Services RoboMaker. After September 10, 2025, you will no longer + /// be able to access the Amazon Web Services RoboMaker console or Amazon Web Services + /// RoboMaker resources. For more information on transitioning to Batch to help run containerized + /// simulations, visit https://aws.amazon.com/blogs/hpc/run-simulations-using-multiple-containers-in-a-single-aws-batch-job/. + /// + /// + /// + /// /// Updates a simulation application. + /// /// /// Container for the necessary parameters to execute the UpdateSimulationApplication service method. /// @@ -4436,7 +5726,19 @@ public virtual UpdateSimulationApplicationResponse UpdateSimulationApplication(U /// + /// + /// + /// End of support notice: On September 10, 2025, Amazon Web Services will discontinue + /// support for Amazon Web Services RoboMaker. After September 10, 2025, you will no longer + /// be able to access the Amazon Web Services RoboMaker console or Amazon Web Services + /// RoboMaker resources. For more information on transitioning to Batch to help run containerized + /// simulations, visit https://aws.amazon.com/blogs/hpc/run-simulations-using-multiple-containers-in-a-single-aws-batch-job/. + /// + /// + /// + /// /// Updates a simulation application. + /// /// /// Container for the necessary parameters to execute the UpdateSimulationApplication service method. /// @@ -4477,7 +5779,19 @@ public virtual UpdateSimulationApplicationResponse UpdateSimulationApplication(U /// + /// + /// + /// End of support notice: On September 10, 2025, Amazon Web Services will discontinue + /// support for Amazon Web Services RoboMaker. After September 10, 2025, you will no longer + /// be able to access the Amazon Web Services RoboMaker console or Amazon Web Services + /// RoboMaker resources. For more information on transitioning to Batch to help run containerized + /// simulations, visit https://aws.amazon.com/blogs/hpc/run-simulations-using-multiple-containers-in-a-single-aws-batch-job/. + /// + /// + /// + /// /// Updates a world template. + /// /// /// Container for the necessary parameters to execute the UpdateWorldTemplate service method. /// @@ -4507,7 +5821,19 @@ public virtual UpdateWorldTemplateResponse UpdateWorldTemplate(UpdateWorldTempla /// + /// + /// + /// End of support notice: On September 10, 2025, Amazon Web Services will discontinue + /// support for Amazon Web Services RoboMaker. After September 10, 2025, you will no longer + /// be able to access the Amazon Web Services RoboMaker console or Amazon Web Services + /// RoboMaker resources. For more information on transitioning to Batch to help run containerized + /// simulations, visit https://aws.amazon.com/blogs/hpc/run-simulations-using-multiple-containers-in-a-single-aws-batch-job/. + /// + /// + /// + /// /// Updates a world template. + /// /// /// Container for the necessary parameters to execute the UpdateWorldTemplate service method. /// diff --git a/sdk/src/Services/RoboMaker/Properties/AssemblyInfo.cs b/sdk/src/Services/RoboMaker/Properties/AssemblyInfo.cs index 3d7304ecedc5..a0b90a3d041f 100644 --- a/sdk/src/Services/RoboMaker/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/RoboMaker/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.54")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/RoboMaker/RoboMaker.sln b/sdk/src/Services/RoboMaker/RoboMaker.sln index cf4fb3068bc9..cef5153bce4f 100644 --- a/sdk/src/Services/RoboMaker/RoboMaker.sln +++ b/sdk/src/Services/RoboMaker/RoboMaker.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {7105B235-65E2-46EB-BAB9-8E1D35E693FF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {7105B235-65E2-46EB-BAB9-8E1D35E693FF}.Debug|Any CPU.Build.0 = Debug|Any CPU {7105B235-65E2-46EB-BAB9-8E1D35E693FF}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {0DD29468-A45E-43BD-BF3B-D37000C0271D}.Debug|Any CPU.Build.0 = Debug|Any CPU {0DD29468-A45E-43BD-BF3B-D37000C0271D}.Release|Any CPU.ActiveCfg = Release|Any CPU {0DD29468-A45E-43BD-BF3B-D37000C0271D}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {DE19DFAB-8178-4A91-B8EB-2DC0A9FD3C70}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DE19DFAB-8178-4A91-B8EB-2DC0A9FD3C70}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DE19DFAB-8178-4A91-B8EB-2DC0A9FD3C70}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DE19DFAB-8178-4A91-B8EB-2DC0A9FD3C70}.Release|Any CPU.Build.0 = Release|Any CPU - {925BDA6E-2E96-4795-A998-2D4DA7FD12E0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {925BDA6E-2E96-4795-A998-2D4DA7FD12E0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {925BDA6E-2E96-4795-A998-2D4DA7FD12E0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {925BDA6E-2E96-4795-A998-2D4DA7FD12E0}.Release|Any CPU.Build.0 = Release|Any CPU - {8F0D1B71-F827-4A8C-B0FF-94D0F18CEB1A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8F0D1B71-F827-4A8C-B0FF-94D0F18CEB1A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8F0D1B71-F827-4A8C-B0FF-94D0F18CEB1A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8F0D1B71-F827-4A8C-B0FF-94D0F18CEB1A}.Release|Any CPU.Build.0 = Release|Any CPU - {B62F6834-7E8E-41F4-899B-4E34068AE37A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B62F6834-7E8E-41F4-899B-4E34068AE37A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B62F6834-7E8E-41F4-899B-4E34068AE37A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B62F6834-7E8E-41F4-899B-4E34068AE37A}.Release|Any CPU.Build.0 = Release|Any CPU - {6EF241F3-F7A5-4A5B-97AD-2F3E64D06361}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6EF241F3-F7A5-4A5B-97AD-2F3E64D06361}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6EF241F3-F7A5-4A5B-97AD-2F3E64D06361}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6EF241F3-F7A5-4A5B-97AD-2F3E64D06361}.Release|Any CPU.Build.0 = Release|Any CPU - {8954FE6A-A2C5-4155-AF8D-83FE035B21C6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8954FE6A-A2C5-4155-AF8D-83FE035B21C6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8954FE6A-A2C5-4155-AF8D-83FE035B21C6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8954FE6A-A2C5-4155-AF8D-83FE035B21C6}.Release|Any CPU.Build.0 = Release|Any CPU - {788BA1BA-2B5B-4318-BE86-C6816F52A45F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {788BA1BA-2B5B-4318-BE86-C6816F52A45F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {788BA1BA-2B5B-4318-BE86-C6816F52A45F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {788BA1BA-2B5B-4318-BE86-C6816F52A45F}.Release|Any CPU.Build.0 = Release|Any CPU - {58D4D5B3-2EE5-4158-BC68-3C8FC78AFB99}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {58D4D5B3-2EE5-4158-BC68-3C8FC78AFB99}.Debug|Any CPU.Build.0 = Debug|Any CPU - {58D4D5B3-2EE5-4158-BC68-3C8FC78AFB99}.Release|Any CPU.ActiveCfg = Release|Any CPU - {58D4D5B3-2EE5-4158-BC68-3C8FC78AFB99}.Release|Any CPU.Build.0 = Release|Any CPU - {734805AF-C9F8-4DF2-BC49-658D729FA8C6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {734805AF-C9F8-4DF2-BC49-658D729FA8C6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {734805AF-C9F8-4DF2-BC49-658D729FA8C6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {734805AF-C9F8-4DF2-BC49-658D729FA8C6}.Release|Any CPU.Build.0 = Release|Any CPU - {E147A839-5599-4929-94DD-32177B7CE521}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E147A839-5599-4929-94DD-32177B7CE521}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E147A839-5599-4929-94DD-32177B7CE521}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E147A839-5599-4929-94DD-32177B7CE521}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {DE19DFAB-8178-4A91-B8EB-2DC0A9FD3C70}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DE19DFAB-8178-4A91-B8EB-2DC0A9FD3C70}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DE19DFAB-8178-4A91-B8EB-2DC0A9FD3C70}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DE19DFAB-8178-4A91-B8EB-2DC0A9FD3C70}.Release|Any CPU.Build.0 = Release|Any CPU - {925BDA6E-2E96-4795-A998-2D4DA7FD12E0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {925BDA6E-2E96-4795-A998-2D4DA7FD12E0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {925BDA6E-2E96-4795-A998-2D4DA7FD12E0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {925BDA6E-2E96-4795-A998-2D4DA7FD12E0}.Release|Any CPU.Build.0 = Release|Any CPU - {8F0D1B71-F827-4A8C-B0FF-94D0F18CEB1A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8F0D1B71-F827-4A8C-B0FF-94D0F18CEB1A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8F0D1B71-F827-4A8C-B0FF-94D0F18CEB1A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8F0D1B71-F827-4A8C-B0FF-94D0F18CEB1A}.Release|Any CPU.Build.0 = Release|Any CPU - {B62F6834-7E8E-41F4-899B-4E34068AE37A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B62F6834-7E8E-41F4-899B-4E34068AE37A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B62F6834-7E8E-41F4-899B-4E34068AE37A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B62F6834-7E8E-41F4-899B-4E34068AE37A}.Release|Any CPU.Build.0 = Release|Any CPU - {6EF241F3-F7A5-4A5B-97AD-2F3E64D06361}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6EF241F3-F7A5-4A5B-97AD-2F3E64D06361}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6EF241F3-F7A5-4A5B-97AD-2F3E64D06361}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6EF241F3-F7A5-4A5B-97AD-2F3E64D06361}.Release|Any CPU.Build.0 = Release|Any CPU - {8954FE6A-A2C5-4155-AF8D-83FE035B21C6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8954FE6A-A2C5-4155-AF8D-83FE035B21C6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8954FE6A-A2C5-4155-AF8D-83FE035B21C6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8954FE6A-A2C5-4155-AF8D-83FE035B21C6}.Release|Any CPU.Build.0 = Release|Any CPU - {788BA1BA-2B5B-4318-BE86-C6816F52A45F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {788BA1BA-2B5B-4318-BE86-C6816F52A45F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {788BA1BA-2B5B-4318-BE86-C6816F52A45F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {788BA1BA-2B5B-4318-BE86-C6816F52A45F}.Release|Any CPU.Build.0 = Release|Any CPU - {58D4D5B3-2EE5-4158-BC68-3C8FC78AFB99}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {58D4D5B3-2EE5-4158-BC68-3C8FC78AFB99}.Debug|Any CPU.Build.0 = Debug|Any CPU - {58D4D5B3-2EE5-4158-BC68-3C8FC78AFB99}.Release|Any CPU.ActiveCfg = Release|Any CPU - {58D4D5B3-2EE5-4158-BC68-3C8FC78AFB99}.Release|Any CPU.Build.0 = Release|Any CPU - {734805AF-C9F8-4DF2-BC49-658D729FA8C6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {734805AF-C9F8-4DF2-BC49-658D729FA8C6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {734805AF-C9F8-4DF2-BC49-658D729FA8C6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {734805AF-C9F8-4DF2-BC49-658D729FA8C6}.Release|Any CPU.Build.0 = Release|Any CPU - {E147A839-5599-4929-94DD-32177B7CE521}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E147A839-5599-4929-94DD-32177B7CE521}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E147A839-5599-4929-94DD-32177B7CE521}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E147A839-5599-4929-94DD-32177B7CE521}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7105B235-65E2-46EB-BAB9-8E1D35E693FF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {3D7BD6FB-B8BD-4533-BFC4-CD3CB094ED6B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {808AF02F-DF47-40E8-825B-6509EEDB4A01} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {AEFE659C-02B8-4B43-A8A9-830E77E149DE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {0DD29468-A45E-43BD-BF3B-D37000C0271D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {DE19DFAB-8178-4A91-B8EB-2DC0A9FD3C70} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {925BDA6E-2E96-4795-A998-2D4DA7FD12E0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8F0D1B71-F827-4A8C-B0FF-94D0F18CEB1A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B62F6834-7E8E-41F4-899B-4E34068AE37A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6EF241F3-F7A5-4A5B-97AD-2F3E64D06361} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8954FE6A-A2C5-4155-AF8D-83FE035B21C6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {788BA1BA-2B5B-4318-BE86-C6816F52A45F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {58D4D5B3-2EE5-4158-BC68-3C8FC78AFB99} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {734805AF-C9F8-4DF2-BC49-658D729FA8C6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E147A839-5599-4929-94DD-32177B7CE521} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {DE19DFAB-8178-4A91-B8EB-2DC0A9FD3C70} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {925BDA6E-2E96-4795-A998-2D4DA7FD12E0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8F0D1B71-F827-4A8C-B0FF-94D0F18CEB1A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B62F6834-7E8E-41F4-899B-4E34068AE37A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6EF241F3-F7A5-4A5B-97AD-2F3E64D06361} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8954FE6A-A2C5-4155-AF8D-83FE035B21C6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {788BA1BA-2B5B-4318-BE86-C6816F52A45F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {58D4D5B3-2EE5-4158-BC68-3C8FC78AFB99} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {734805AF-C9F8-4DF2-BC49-658D729FA8C6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E147A839-5599-4929-94DD-32177B7CE521} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {A7599D73-13F3-430E-B6FD-3FF48C5ADE8F} diff --git a/sdk/src/Services/Route53/Generated/AmazonRoute53Config.cs b/sdk/src/Services/Route53/Generated/AmazonRoute53Config.cs index 8299cbdd8835..579f398f7341 100644 --- a/sdk/src/Services/Route53/Generated/AmazonRoute53Config.cs +++ b/sdk/src/Services/Route53/Generated/AmazonRoute53Config.cs @@ -34,16 +34,10 @@ namespace Amazon.Route53 public partial class AmazonRoute53Config : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("Route 53", "4.0.0.0"); private static readonly AmazonRoute53EndpointResolver EndpointResolver = new AmazonRoute53EndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("Route 53", "3.7.402.15"); -======= - InternalSDKUtils.BuildUserAgentString("Route 53", "3.7.403.10"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/Route53/Generated/_bcl/AmazonRoute53Client.cs b/sdk/src/Services/Route53/Generated/_bcl/AmazonRoute53Client.cs index 649d9d912a48..73b2190415cd 100644 --- a/sdk/src/Services/Route53/Generated/_bcl/AmazonRoute53Client.cs +++ b/sdk/src/Services/Route53/Generated/_bcl/AmazonRoute53Client.cs @@ -2014,11 +2014,11 @@ public virtual CreateKeySigningKeyResponse CreateKeySigningKey(CreateKeySigningK ///
  • /// /// Create a CloudWatch Logs resource policy, and give it the permissions that Route 53 - /// needs to create log streams and to send query logs to log streams. For the value of - /// Resource, specify the ARN for the log group that you created in the previous - /// step. To use the same resource policy for all the CloudWatch Logs log groups that - /// you created for query logging configurations, replace the hosted zone name with *, - /// for example: + /// needs to create log streams and to send query logs to log streams. You must create + /// the CloudWatch Logs resource policy in the us-east-1 region. For the value of Resource, + /// specify the ARN for the log group that you created in the previous step. To use the + /// same resource policy for all the CloudWatch Logs log groups that you created for query + /// logging configurations, replace the hosted zone name with *, for example: /// /// /// @@ -2244,11 +2244,11 @@ public virtual CreateQueryLoggingConfigResponse CreateQueryLoggingConfig(CreateQ ///
  • /// /// Create a CloudWatch Logs resource policy, and give it the permissions that Route 53 - /// needs to create log streams and to send query logs to log streams. For the value of - /// Resource, specify the ARN for the log group that you created in the previous - /// step. To use the same resource policy for all the CloudWatch Logs log groups that - /// you created for query logging configurations, replace the hosted zone name with *, - /// for example: + /// needs to create log streams and to send query logs to log streams. You must create + /// the CloudWatch Logs resource policy in the us-east-1 region. For the value of Resource, + /// specify the ARN for the log group that you created in the previous step. To use the + /// same resource policy for all the CloudWatch Logs log groups that you created for query + /// logging configurations, replace the hosted zone name with *, for example: /// /// /// @@ -5135,6 +5135,14 @@ public virtual GetHealthCheckStatusResponse GetHealthCheckStatus(GetHealthCheckS /// /// Gets information about a specified hosted zone including the four name servers assigned /// to the hosted zone. + /// + /// + /// + /// returns the VPCs associated with the specified hosted zone and does not reflect + /// the VPC associations by Route 53 Profiles. To get the associations to a Profile, call + /// the ListProfileAssociations + /// API. + /// /// /// Container for the necessary parameters to execute the GetHostedZone service method. /// @@ -5159,6 +5167,14 @@ public virtual GetHostedZoneResponse GetHostedZone(GetHostedZoneRequest request) /// /// Gets information about a specified hosted zone including the four name servers assigned /// to the hosted zone. + /// + /// + /// + /// returns the VPCs associated with the specified hosted zone and does not reflect + /// the VPC associations by Route 53 Profiles. To get the associations to a Profile, call + /// the ListProfileAssociations + /// API. + /// /// /// Container for the necessary parameters to execute the GetHostedZone service method. /// @@ -6499,7 +6515,14 @@ public virtual ListHostedZonesByNameResponse ListHostedZonesByName(ListHostedZon /// Amazon Elastic File System (Amazon EFS), the value of Owner is efs.amazonaws.com. /// /// - ///
    • + /// + /// + /// ListHostedZonesByVPC returns the hosted zones associated with the specified + /// VPC and does not reflect the hosted zone associations to VPCs via Route 53 Profiles. + /// To get the associations to a Profile, call the ListProfileResourceAssociations + /// API. + /// + /// /// /// When listing private hosted zones, the hosted zone and the Amazon VPC must belong /// to the same partition where the hosted zones were created. A partition is a group @@ -6568,7 +6591,14 @@ public virtual ListHostedZonesByVPCResponse ListHostedZonesByVPC(ListHostedZones /// Amazon Elastic File System (Amazon EFS), the value of Owner is efs.amazonaws.com. /// /// - /// + /// + /// + /// ListHostedZonesByVPC returns the hosted zones associated with the specified + /// VPC and does not reflect the hosted zone associations to VPCs via Route 53 Profiles. + /// To get the associations to a Profile, call the ListProfileResourceAssociations + /// API. + /// + /// /// /// When listing private hosted zones, the hosted zone and the Amazon VPC must belong /// to the same partition where the hosted zones were created. A partition is a group diff --git a/sdk/src/Services/Route53/Properties/AssemblyInfo.cs b/sdk/src/Services/Route53/Properties/AssemblyInfo.cs index 62f867982756..0b1ffc1537f0 100644 --- a/sdk/src/Services/Route53/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/Route53/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.402.15")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.403.10")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/Route53/Route53.sln b/sdk/src/Services/Route53/Route53.sln index cdff791b315f..2a99e6ffd9b5 100644 --- a/sdk/src/Services/Route53/Route53.sln +++ b/sdk/src/Services/Route53/Route53.sln @@ -94,7 +94,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {EC9322DD-DF27-40BC-802E-05BB743D6609}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {EC9322DD-DF27-40BC-802E-05BB743D6609}.Debug|Any CPU.Build.0 = Debug|Any CPU {EC9322DD-DF27-40BC-802E-05BB743D6609}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -119,113 +126,6 @@ Global {60CF7A1B-9377-489C-85E5-90F76BE945D9}.Debug|Any CPU.Build.0 = Debug|Any CPU {60CF7A1B-9377-489C-85E5-90F76BE945D9}.Release|Any CPU.ActiveCfg = Release|Any CPU {60CF7A1B-9377-489C-85E5-90F76BE945D9}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {B3A8E400-1EB9-4CE0-81E8-B33923FCAA48}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B3A8E400-1EB9-4CE0-81E8-B33923FCAA48}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B3A8E400-1EB9-4CE0-81E8-B33923FCAA48}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B3A8E400-1EB9-4CE0-81E8-B33923FCAA48}.Release|Any CPU.Build.0 = Release|Any CPU - {8A91A480-2900-4DC4-9B41-80D0B77D0CAB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8A91A480-2900-4DC4-9B41-80D0B77D0CAB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8A91A480-2900-4DC4-9B41-80D0B77D0CAB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8A91A480-2900-4DC4-9B41-80D0B77D0CAB}.Release|Any CPU.Build.0 = Release|Any CPU - {8262BA40-903E-4956-9942-80A12A5AB259}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8262BA40-903E-4956-9942-80A12A5AB259}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8262BA40-903E-4956-9942-80A12A5AB259}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8262BA40-903E-4956-9942-80A12A5AB259}.Release|Any CPU.Build.0 = Release|Any CPU - {75F60884-305A-4FC7-9777-44D92BCCCBB0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {75F60884-305A-4FC7-9777-44D92BCCCBB0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {75F60884-305A-4FC7-9777-44D92BCCCBB0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {75F60884-305A-4FC7-9777-44D92BCCCBB0}.Release|Any CPU.Build.0 = Release|Any CPU - {A89931AC-DF4F-4426-AF81-AEA061F77129}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A89931AC-DF4F-4426-AF81-AEA061F77129}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A89931AC-DF4F-4426-AF81-AEA061F77129}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A89931AC-DF4F-4426-AF81-AEA061F77129}.Release|Any CPU.Build.0 = Release|Any CPU - {407697CF-3AAC-4F14-934A-5EB17EBF5CE2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {407697CF-3AAC-4F14-934A-5EB17EBF5CE2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {407697CF-3AAC-4F14-934A-5EB17EBF5CE2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {407697CF-3AAC-4F14-934A-5EB17EBF5CE2}.Release|Any CPU.Build.0 = Release|Any CPU - {FFB7F317-3E13-43C5-B42D-4B8384AD56D7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FFB7F317-3E13-43C5-B42D-4B8384AD56D7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FFB7F317-3E13-43C5-B42D-4B8384AD56D7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FFB7F317-3E13-43C5-B42D-4B8384AD56D7}.Release|Any CPU.Build.0 = Release|Any CPU - {C1E43125-0AC1-4B4B-B0BF-ADFE72388394}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C1E43125-0AC1-4B4B-B0BF-ADFE72388394}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C1E43125-0AC1-4B4B-B0BF-ADFE72388394}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C1E43125-0AC1-4B4B-B0BF-ADFE72388394}.Release|Any CPU.Build.0 = Release|Any CPU - {3C5AC311-5286-44F8-8615-B15667A9D9C3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3C5AC311-5286-44F8-8615-B15667A9D9C3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3C5AC311-5286-44F8-8615-B15667A9D9C3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3C5AC311-5286-44F8-8615-B15667A9D9C3}.Release|Any CPU.Build.0 = Release|Any CPU - {1EF7D380-56FA-4EB9-BE67-8703AF7C5EF1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1EF7D380-56FA-4EB9-BE67-8703AF7C5EF1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1EF7D380-56FA-4EB9-BE67-8703AF7C5EF1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1EF7D380-56FA-4EB9-BE67-8703AF7C5EF1}.Release|Any CPU.Build.0 = Release|Any CPU - {DB7A62A4-190E-43D0-80AB-DE2978D741ED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DB7A62A4-190E-43D0-80AB-DE2978D741ED}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DB7A62A4-190E-43D0-80AB-DE2978D741ED}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DB7A62A4-190E-43D0-80AB-DE2978D741ED}.Release|Any CPU.Build.0 = Release|Any CPU - {C804BD63-59B3-4CEB-B648-58AAA890EE66}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C804BD63-59B3-4CEB-B648-58AAA890EE66}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C804BD63-59B3-4CEB-B648-58AAA890EE66}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C804BD63-59B3-4CEB-B648-58AAA890EE66}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {B3A8E400-1EB9-4CE0-81E8-B33923FCAA48}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B3A8E400-1EB9-4CE0-81E8-B33923FCAA48}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B3A8E400-1EB9-4CE0-81E8-B33923FCAA48}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B3A8E400-1EB9-4CE0-81E8-B33923FCAA48}.Release|Any CPU.Build.0 = Release|Any CPU - {8A91A480-2900-4DC4-9B41-80D0B77D0CAB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8A91A480-2900-4DC4-9B41-80D0B77D0CAB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8A91A480-2900-4DC4-9B41-80D0B77D0CAB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8A91A480-2900-4DC4-9B41-80D0B77D0CAB}.Release|Any CPU.Build.0 = Release|Any CPU - {8262BA40-903E-4956-9942-80A12A5AB259}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8262BA40-903E-4956-9942-80A12A5AB259}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8262BA40-903E-4956-9942-80A12A5AB259}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8262BA40-903E-4956-9942-80A12A5AB259}.Release|Any CPU.Build.0 = Release|Any CPU - {75F60884-305A-4FC7-9777-44D92BCCCBB0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {75F60884-305A-4FC7-9777-44D92BCCCBB0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {75F60884-305A-4FC7-9777-44D92BCCCBB0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {75F60884-305A-4FC7-9777-44D92BCCCBB0}.Release|Any CPU.Build.0 = Release|Any CPU - {A89931AC-DF4F-4426-AF81-AEA061F77129}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A89931AC-DF4F-4426-AF81-AEA061F77129}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A89931AC-DF4F-4426-AF81-AEA061F77129}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A89931AC-DF4F-4426-AF81-AEA061F77129}.Release|Any CPU.Build.0 = Release|Any CPU - {407697CF-3AAC-4F14-934A-5EB17EBF5CE2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {407697CF-3AAC-4F14-934A-5EB17EBF5CE2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {407697CF-3AAC-4F14-934A-5EB17EBF5CE2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {407697CF-3AAC-4F14-934A-5EB17EBF5CE2}.Release|Any CPU.Build.0 = Release|Any CPU - {FFB7F317-3E13-43C5-B42D-4B8384AD56D7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FFB7F317-3E13-43C5-B42D-4B8384AD56D7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FFB7F317-3E13-43C5-B42D-4B8384AD56D7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FFB7F317-3E13-43C5-B42D-4B8384AD56D7}.Release|Any CPU.Build.0 = Release|Any CPU - {C1E43125-0AC1-4B4B-B0BF-ADFE72388394}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C1E43125-0AC1-4B4B-B0BF-ADFE72388394}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C1E43125-0AC1-4B4B-B0BF-ADFE72388394}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C1E43125-0AC1-4B4B-B0BF-ADFE72388394}.Release|Any CPU.Build.0 = Release|Any CPU - {3C5AC311-5286-44F8-8615-B15667A9D9C3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3C5AC311-5286-44F8-8615-B15667A9D9C3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3C5AC311-5286-44F8-8615-B15667A9D9C3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3C5AC311-5286-44F8-8615-B15667A9D9C3}.Release|Any CPU.Build.0 = Release|Any CPU - {1EF7D380-56FA-4EB9-BE67-8703AF7C5EF1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1EF7D380-56FA-4EB9-BE67-8703AF7C5EF1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1EF7D380-56FA-4EB9-BE67-8703AF7C5EF1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1EF7D380-56FA-4EB9-BE67-8703AF7C5EF1}.Release|Any CPU.Build.0 = Release|Any CPU - {DB7A62A4-190E-43D0-80AB-DE2978D741ED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DB7A62A4-190E-43D0-80AB-DE2978D741ED}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DB7A62A4-190E-43D0-80AB-DE2978D741ED}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DB7A62A4-190E-43D0-80AB-DE2978D741ED}.Release|Any CPU.Build.0 = Release|Any CPU - {C804BD63-59B3-4CEB-B648-58AAA890EE66}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C804BD63-59B3-4CEB-B648-58AAA890EE66}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C804BD63-59B3-4CEB-B648-58AAA890EE66}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C804BD63-59B3-4CEB-B648-58AAA890EE66}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -242,42 +142,14 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {EC9322DD-DF27-40BC-802E-05BB743D6609} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {682B79DC-2C98-4B82-900E-09E49DE46A32} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {B0A04DA5-D353-435A-B90B-DCEBAAAA0512} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {BFD84629-9408-495F-A71E-C738783DB7EF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {E09D7791-BB48-4E13-A510-CB517D1E6B02} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {60CF7A1B-9377-489C-85E5-90F76BE945D9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {B3A8E400-1EB9-4CE0-81E8-B33923FCAA48} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8A91A480-2900-4DC4-9B41-80D0B77D0CAB} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8262BA40-903E-4956-9942-80A12A5AB259} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {75F60884-305A-4FC7-9777-44D92BCCCBB0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A89931AC-DF4F-4426-AF81-AEA061F77129} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {407697CF-3AAC-4F14-934A-5EB17EBF5CE2} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {FFB7F317-3E13-43C5-B42D-4B8384AD56D7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C1E43125-0AC1-4B4B-B0BF-ADFE72388394} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {3C5AC311-5286-44F8-8615-B15667A9D9C3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {1EF7D380-56FA-4EB9-BE67-8703AF7C5EF1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {DB7A62A4-190E-43D0-80AB-DE2978D741ED} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C804BD63-59B3-4CEB-B648-58AAA890EE66} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B3A8E400-1EB9-4CE0-81E8-B33923FCAA48} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8A91A480-2900-4DC4-9B41-80D0B77D0CAB} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8262BA40-903E-4956-9942-80A12A5AB259} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {75F60884-305A-4FC7-9777-44D92BCCCBB0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A89931AC-DF4F-4426-AF81-AEA061F77129} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {407697CF-3AAC-4F14-934A-5EB17EBF5CE2} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {FFB7F317-3E13-43C5-B42D-4B8384AD56D7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C1E43125-0AC1-4B4B-B0BF-ADFE72388394} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {3C5AC311-5286-44F8-8615-B15667A9D9C3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {1EF7D380-56FA-4EB9-BE67-8703AF7C5EF1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {DB7A62A4-190E-43D0-80AB-DE2978D741ED} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C804BD63-59B3-4CEB-B648-58AAA890EE66} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {3F6BCA6C-5DE5-4AA0-A3A8-A2A8EA0A8A4C} diff --git a/sdk/src/Services/Route53Domains/Generated/AmazonRoute53DomainsConfig.cs b/sdk/src/Services/Route53Domains/Generated/AmazonRoute53DomainsConfig.cs index f09842f62d22..0b766ab606f0 100644 --- a/sdk/src/Services/Route53Domains/Generated/AmazonRoute53DomainsConfig.cs +++ b/sdk/src/Services/Route53Domains/Generated/AmazonRoute53DomainsConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.Route53Domains public partial class AmazonRoute53DomainsConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("Route 53 Domains", "4.0.0.0"); private static readonly AmazonRoute53DomainsEndpointResolver EndpointResolver = new AmazonRoute53DomainsEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("Route 53 Domains", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("Route 53 Domains", "3.7.400.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/Route53Domains/Properties/AssemblyInfo.cs b/sdk/src/Services/Route53Domains/Properties/AssemblyInfo.cs index 66210056f0d9..e64f43692102 100644 --- a/sdk/src/Services/Route53Domains/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/Route53Domains/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/Route53Domains/Route53Domains.sln b/sdk/src/Services/Route53Domains/Route53Domains.sln index 37e9bc3bb131..d52453f38a26 100644 --- a/sdk/src/Services/Route53Domains/Route53Domains.sln +++ b/sdk/src/Services/Route53Domains/Route53Domains.sln @@ -92,7 +92,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {40707553-9CCA-4A7E-A4EE-688E73D2E0C5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {40707553-9CCA-4A7E-A4EE-688E73D2E0C5}.Debug|Any CPU.Build.0 = Debug|Any CPU {40707553-9CCA-4A7E-A4EE-688E73D2E0C5}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -113,97 +120,6 @@ Global {C2F6749A-213C-4792-BC1C-5B8A24AFD8A7}.Debug|Any CPU.Build.0 = Debug|Any CPU {C2F6749A-213C-4792-BC1C-5B8A24AFD8A7}.Release|Any CPU.ActiveCfg = Release|Any CPU {C2F6749A-213C-4792-BC1C-5B8A24AFD8A7}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {BB0D1A58-05B0-4EB5-9EE3-7E7774369138}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BB0D1A58-05B0-4EB5-9EE3-7E7774369138}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BB0D1A58-05B0-4EB5-9EE3-7E7774369138}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BB0D1A58-05B0-4EB5-9EE3-7E7774369138}.Release|Any CPU.Build.0 = Release|Any CPU - {4FC37843-95C9-48D6-B7EE-8FE21ECFB58B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4FC37843-95C9-48D6-B7EE-8FE21ECFB58B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4FC37843-95C9-48D6-B7EE-8FE21ECFB58B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4FC37843-95C9-48D6-B7EE-8FE21ECFB58B}.Release|Any CPU.Build.0 = Release|Any CPU - {7E215557-0843-4DAF-965B-ACBC8D3CBAA7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7E215557-0843-4DAF-965B-ACBC8D3CBAA7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7E215557-0843-4DAF-965B-ACBC8D3CBAA7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7E215557-0843-4DAF-965B-ACBC8D3CBAA7}.Release|Any CPU.Build.0 = Release|Any CPU - {B5153EDC-9362-4653-9AB4-4C3E241480FA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B5153EDC-9362-4653-9AB4-4C3E241480FA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B5153EDC-9362-4653-9AB4-4C3E241480FA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B5153EDC-9362-4653-9AB4-4C3E241480FA}.Release|Any CPU.Build.0 = Release|Any CPU - {A6046C86-2DB3-4CCA-844A-EE4197C0F00F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A6046C86-2DB3-4CCA-844A-EE4197C0F00F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A6046C86-2DB3-4CCA-844A-EE4197C0F00F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A6046C86-2DB3-4CCA-844A-EE4197C0F00F}.Release|Any CPU.Build.0 = Release|Any CPU - {3B406D38-E2AF-4A02-A1E6-A7056DD052B5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3B406D38-E2AF-4A02-A1E6-A7056DD052B5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3B406D38-E2AF-4A02-A1E6-A7056DD052B5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3B406D38-E2AF-4A02-A1E6-A7056DD052B5}.Release|Any CPU.Build.0 = Release|Any CPU - {F15FA7EE-0554-40A3-B4D0-0A484C385403}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F15FA7EE-0554-40A3-B4D0-0A484C385403}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F15FA7EE-0554-40A3-B4D0-0A484C385403}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F15FA7EE-0554-40A3-B4D0-0A484C385403}.Release|Any CPU.Build.0 = Release|Any CPU - {E55FEA06-7089-4BCD-9688-BD02E49FCA2A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E55FEA06-7089-4BCD-9688-BD02E49FCA2A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E55FEA06-7089-4BCD-9688-BD02E49FCA2A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E55FEA06-7089-4BCD-9688-BD02E49FCA2A}.Release|Any CPU.Build.0 = Release|Any CPU - {52550BCE-C248-4B47-9309-B7D7E3BC88FC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {52550BCE-C248-4B47-9309-B7D7E3BC88FC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {52550BCE-C248-4B47-9309-B7D7E3BC88FC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {52550BCE-C248-4B47-9309-B7D7E3BC88FC}.Release|Any CPU.Build.0 = Release|Any CPU - {BAB6FC98-A8B6-4133-AA93-D600D0C9CFB1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BAB6FC98-A8B6-4133-AA93-D600D0C9CFB1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BAB6FC98-A8B6-4133-AA93-D600D0C9CFB1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BAB6FC98-A8B6-4133-AA93-D600D0C9CFB1}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {BB0D1A58-05B0-4EB5-9EE3-7E7774369138}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BB0D1A58-05B0-4EB5-9EE3-7E7774369138}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BB0D1A58-05B0-4EB5-9EE3-7E7774369138}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BB0D1A58-05B0-4EB5-9EE3-7E7774369138}.Release|Any CPU.Build.0 = Release|Any CPU - {4FC37843-95C9-48D6-B7EE-8FE21ECFB58B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4FC37843-95C9-48D6-B7EE-8FE21ECFB58B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4FC37843-95C9-48D6-B7EE-8FE21ECFB58B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4FC37843-95C9-48D6-B7EE-8FE21ECFB58B}.Release|Any CPU.Build.0 = Release|Any CPU - {7E215557-0843-4DAF-965B-ACBC8D3CBAA7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7E215557-0843-4DAF-965B-ACBC8D3CBAA7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7E215557-0843-4DAF-965B-ACBC8D3CBAA7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7E215557-0843-4DAF-965B-ACBC8D3CBAA7}.Release|Any CPU.Build.0 = Release|Any CPU - {B5153EDC-9362-4653-9AB4-4C3E241480FA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B5153EDC-9362-4653-9AB4-4C3E241480FA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B5153EDC-9362-4653-9AB4-4C3E241480FA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B5153EDC-9362-4653-9AB4-4C3E241480FA}.Release|Any CPU.Build.0 = Release|Any CPU - {A6046C86-2DB3-4CCA-844A-EE4197C0F00F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A6046C86-2DB3-4CCA-844A-EE4197C0F00F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A6046C86-2DB3-4CCA-844A-EE4197C0F00F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A6046C86-2DB3-4CCA-844A-EE4197C0F00F}.Release|Any CPU.Build.0 = Release|Any CPU - {3B406D38-E2AF-4A02-A1E6-A7056DD052B5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3B406D38-E2AF-4A02-A1E6-A7056DD052B5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3B406D38-E2AF-4A02-A1E6-A7056DD052B5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3B406D38-E2AF-4A02-A1E6-A7056DD052B5}.Release|Any CPU.Build.0 = Release|Any CPU - {F15FA7EE-0554-40A3-B4D0-0A484C385403}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F15FA7EE-0554-40A3-B4D0-0A484C385403}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F15FA7EE-0554-40A3-B4D0-0A484C385403}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F15FA7EE-0554-40A3-B4D0-0A484C385403}.Release|Any CPU.Build.0 = Release|Any CPU - {E55FEA06-7089-4BCD-9688-BD02E49FCA2A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E55FEA06-7089-4BCD-9688-BD02E49FCA2A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E55FEA06-7089-4BCD-9688-BD02E49FCA2A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E55FEA06-7089-4BCD-9688-BD02E49FCA2A}.Release|Any CPU.Build.0 = Release|Any CPU - {52550BCE-C248-4B47-9309-B7D7E3BC88FC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {52550BCE-C248-4B47-9309-B7D7E3BC88FC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {52550BCE-C248-4B47-9309-B7D7E3BC88FC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {52550BCE-C248-4B47-9309-B7D7E3BC88FC}.Release|Any CPU.Build.0 = Release|Any CPU - {BAB6FC98-A8B6-4133-AA93-D600D0C9CFB1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BAB6FC98-A8B6-4133-AA93-D600D0C9CFB1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BAB6FC98-A8B6-4133-AA93-D600D0C9CFB1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BAB6FC98-A8B6-4133-AA93-D600D0C9CFB1}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -220,37 +136,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {40707553-9CCA-4A7E-A4EE-688E73D2E0C5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {4C27825D-75E8-4801-AFFB-887161F22475} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {774E3728-C688-4A69-86CB-7D1BF84BC2A1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {CF63548F-8179-4777-ABBC-505494552EC7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {C2F6749A-213C-4792-BC1C-5B8A24AFD8A7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {BB0D1A58-05B0-4EB5-9EE3-7E7774369138} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4FC37843-95C9-48D6-B7EE-8FE21ECFB58B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {7E215557-0843-4DAF-965B-ACBC8D3CBAA7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B5153EDC-9362-4653-9AB4-4C3E241480FA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A6046C86-2DB3-4CCA-844A-EE4197C0F00F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {3B406D38-E2AF-4A02-A1E6-A7056DD052B5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F15FA7EE-0554-40A3-B4D0-0A484C385403} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E55FEA06-7089-4BCD-9688-BD02E49FCA2A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {52550BCE-C248-4B47-9309-B7D7E3BC88FC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {BAB6FC98-A8B6-4133-AA93-D600D0C9CFB1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {BB0D1A58-05B0-4EB5-9EE3-7E7774369138} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4FC37843-95C9-48D6-B7EE-8FE21ECFB58B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {7E215557-0843-4DAF-965B-ACBC8D3CBAA7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B5153EDC-9362-4653-9AB4-4C3E241480FA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A6046C86-2DB3-4CCA-844A-EE4197C0F00F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {3B406D38-E2AF-4A02-A1E6-A7056DD052B5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F15FA7EE-0554-40A3-B4D0-0A484C385403} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E55FEA06-7089-4BCD-9688-BD02E49FCA2A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {52550BCE-C248-4B47-9309-B7D7E3BC88FC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {BAB6FC98-A8B6-4133-AA93-D600D0C9CFB1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {01E59FBC-7D14-4B53-9A3E-8E1C44DB98D5} diff --git a/sdk/src/Services/Route53Profiles/Generated/AmazonRoute53ProfilesConfig.cs b/sdk/src/Services/Route53Profiles/Generated/AmazonRoute53ProfilesConfig.cs index 303011fcdcba..bb4cdf92aade 100644 --- a/sdk/src/Services/Route53Profiles/Generated/AmazonRoute53ProfilesConfig.cs +++ b/sdk/src/Services/Route53Profiles/Generated/AmazonRoute53ProfilesConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.Route53Profiles public partial class AmazonRoute53ProfilesConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("Route53Profiles", "4.0.0.0"); private static readonly AmazonRoute53ProfilesEndpointResolver EndpointResolver = new AmazonRoute53ProfilesEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("Route53Profiles", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("Route53Profiles", "3.7.400.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/Route53Profiles/Properties/AssemblyInfo.cs b/sdk/src/Services/Route53Profiles/Properties/AssemblyInfo.cs index 6fcf07b033df..8afff6d5f530 100644 --- a/sdk/src/Services/Route53Profiles/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/Route53Profiles/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/Route53Profiles/Route53Profiles.sln b/sdk/src/Services/Route53Profiles/Route53Profiles.sln index 9183ede59998..9e8c91a4ed22 100644 --- a/sdk/src/Services/Route53Profiles/Route53Profiles.sln +++ b/sdk/src/Services/Route53Profiles/Route53Profiles.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {3D85E373-21A8-4CBE-A928-1DF90C10C57D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {3D85E373-21A8-4CBE-A928-1DF90C10C57D}.Debug|Any CPU.Build.0 = Debug|Any CPU {3D85E373-21A8-4CBE-A928-1DF90C10C57D}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {9A3E691B-E196-4B77-AF4E-0D26314E4399}.Debug|Any CPU.Build.0 = Debug|Any CPU {9A3E691B-E196-4B77-AF4E-0D26314E4399}.Release|Any CPU.ActiveCfg = Release|Any CPU {9A3E691B-E196-4B77-AF4E-0D26314E4399}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {88EE8500-62B3-4CF6-9E9F-E71BBAA5057E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {88EE8500-62B3-4CF6-9E9F-E71BBAA5057E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {88EE8500-62B3-4CF6-9E9F-E71BBAA5057E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {88EE8500-62B3-4CF6-9E9F-E71BBAA5057E}.Release|Any CPU.Build.0 = Release|Any CPU - {8A388033-0507-4833-AA2A-F277FEA88E61}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8A388033-0507-4833-AA2A-F277FEA88E61}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8A388033-0507-4833-AA2A-F277FEA88E61}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8A388033-0507-4833-AA2A-F277FEA88E61}.Release|Any CPU.Build.0 = Release|Any CPU - {4BFCB6D9-745C-4A3A-BD62-62489AA9E04C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4BFCB6D9-745C-4A3A-BD62-62489AA9E04C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4BFCB6D9-745C-4A3A-BD62-62489AA9E04C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4BFCB6D9-745C-4A3A-BD62-62489AA9E04C}.Release|Any CPU.Build.0 = Release|Any CPU - {5F1ACD29-ABFD-4134-A540-A459B553674F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5F1ACD29-ABFD-4134-A540-A459B553674F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5F1ACD29-ABFD-4134-A540-A459B553674F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5F1ACD29-ABFD-4134-A540-A459B553674F}.Release|Any CPU.Build.0 = Release|Any CPU - {DD770A38-6892-4178-BB7E-800864C3C44F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DD770A38-6892-4178-BB7E-800864C3C44F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DD770A38-6892-4178-BB7E-800864C3C44F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DD770A38-6892-4178-BB7E-800864C3C44F}.Release|Any CPU.Build.0 = Release|Any CPU - {4845E61C-6573-4FD8-A801-F984A493477C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4845E61C-6573-4FD8-A801-F984A493477C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4845E61C-6573-4FD8-A801-F984A493477C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4845E61C-6573-4FD8-A801-F984A493477C}.Release|Any CPU.Build.0 = Release|Any CPU - {50224CC5-B1A5-4DE9-9FB6-240320EDF389}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {50224CC5-B1A5-4DE9-9FB6-240320EDF389}.Debug|Any CPU.Build.0 = Debug|Any CPU - {50224CC5-B1A5-4DE9-9FB6-240320EDF389}.Release|Any CPU.ActiveCfg = Release|Any CPU - {50224CC5-B1A5-4DE9-9FB6-240320EDF389}.Release|Any CPU.Build.0 = Release|Any CPU - {E9268123-1398-4ABC-8265-F2F3D67E648A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E9268123-1398-4ABC-8265-F2F3D67E648A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E9268123-1398-4ABC-8265-F2F3D67E648A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E9268123-1398-4ABC-8265-F2F3D67E648A}.Release|Any CPU.Build.0 = Release|Any CPU - {A3ED9EC8-79EB-4883-8160-0DF2BD72E050}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A3ED9EC8-79EB-4883-8160-0DF2BD72E050}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A3ED9EC8-79EB-4883-8160-0DF2BD72E050}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A3ED9EC8-79EB-4883-8160-0DF2BD72E050}.Release|Any CPU.Build.0 = Release|Any CPU - {28242B56-78DF-46A2-8838-520A976F3F9D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {28242B56-78DF-46A2-8838-520A976F3F9D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {28242B56-78DF-46A2-8838-520A976F3F9D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {28242B56-78DF-46A2-8838-520A976F3F9D}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {88EE8500-62B3-4CF6-9E9F-E71BBAA5057E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {88EE8500-62B3-4CF6-9E9F-E71BBAA5057E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {88EE8500-62B3-4CF6-9E9F-E71BBAA5057E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {88EE8500-62B3-4CF6-9E9F-E71BBAA5057E}.Release|Any CPU.Build.0 = Release|Any CPU - {8A388033-0507-4833-AA2A-F277FEA88E61}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8A388033-0507-4833-AA2A-F277FEA88E61}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8A388033-0507-4833-AA2A-F277FEA88E61}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8A388033-0507-4833-AA2A-F277FEA88E61}.Release|Any CPU.Build.0 = Release|Any CPU - {4BFCB6D9-745C-4A3A-BD62-62489AA9E04C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4BFCB6D9-745C-4A3A-BD62-62489AA9E04C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4BFCB6D9-745C-4A3A-BD62-62489AA9E04C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4BFCB6D9-745C-4A3A-BD62-62489AA9E04C}.Release|Any CPU.Build.0 = Release|Any CPU - {5F1ACD29-ABFD-4134-A540-A459B553674F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5F1ACD29-ABFD-4134-A540-A459B553674F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5F1ACD29-ABFD-4134-A540-A459B553674F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5F1ACD29-ABFD-4134-A540-A459B553674F}.Release|Any CPU.Build.0 = Release|Any CPU - {DD770A38-6892-4178-BB7E-800864C3C44F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DD770A38-6892-4178-BB7E-800864C3C44F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DD770A38-6892-4178-BB7E-800864C3C44F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DD770A38-6892-4178-BB7E-800864C3C44F}.Release|Any CPU.Build.0 = Release|Any CPU - {4845E61C-6573-4FD8-A801-F984A493477C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4845E61C-6573-4FD8-A801-F984A493477C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4845E61C-6573-4FD8-A801-F984A493477C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4845E61C-6573-4FD8-A801-F984A493477C}.Release|Any CPU.Build.0 = Release|Any CPU - {50224CC5-B1A5-4DE9-9FB6-240320EDF389}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {50224CC5-B1A5-4DE9-9FB6-240320EDF389}.Debug|Any CPU.Build.0 = Debug|Any CPU - {50224CC5-B1A5-4DE9-9FB6-240320EDF389}.Release|Any CPU.ActiveCfg = Release|Any CPU - {50224CC5-B1A5-4DE9-9FB6-240320EDF389}.Release|Any CPU.Build.0 = Release|Any CPU - {E9268123-1398-4ABC-8265-F2F3D67E648A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E9268123-1398-4ABC-8265-F2F3D67E648A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E9268123-1398-4ABC-8265-F2F3D67E648A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E9268123-1398-4ABC-8265-F2F3D67E648A}.Release|Any CPU.Build.0 = Release|Any CPU - {A3ED9EC8-79EB-4883-8160-0DF2BD72E050}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A3ED9EC8-79EB-4883-8160-0DF2BD72E050}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A3ED9EC8-79EB-4883-8160-0DF2BD72E050}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A3ED9EC8-79EB-4883-8160-0DF2BD72E050}.Release|Any CPU.Build.0 = Release|Any CPU - {28242B56-78DF-46A2-8838-520A976F3F9D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {28242B56-78DF-46A2-8838-520A976F3F9D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {28242B56-78DF-46A2-8838-520A976F3F9D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {28242B56-78DF-46A2-8838-520A976F3F9D}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {3D85E373-21A8-4CBE-A928-1DF90C10C57D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {523FC154-29D2-4504-9972-804AE66CAEB0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {C95DFD80-7F2B-4718-8B18-7B16D88D50D9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {F96D0068-877F-45DA-B5F3-A4D19CDB94B9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {9A3E691B-E196-4B77-AF4E-0D26314E4399} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {88EE8500-62B3-4CF6-9E9F-E71BBAA5057E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8A388033-0507-4833-AA2A-F277FEA88E61} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4BFCB6D9-745C-4A3A-BD62-62489AA9E04C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {5F1ACD29-ABFD-4134-A540-A459B553674F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {DD770A38-6892-4178-BB7E-800864C3C44F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4845E61C-6573-4FD8-A801-F984A493477C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {50224CC5-B1A5-4DE9-9FB6-240320EDF389} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E9268123-1398-4ABC-8265-F2F3D67E648A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A3ED9EC8-79EB-4883-8160-0DF2BD72E050} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {28242B56-78DF-46A2-8838-520A976F3F9D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {88EE8500-62B3-4CF6-9E9F-E71BBAA5057E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8A388033-0507-4833-AA2A-F277FEA88E61} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4BFCB6D9-745C-4A3A-BD62-62489AA9E04C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {5F1ACD29-ABFD-4134-A540-A459B553674F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {DD770A38-6892-4178-BB7E-800864C3C44F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4845E61C-6573-4FD8-A801-F984A493477C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {50224CC5-B1A5-4DE9-9FB6-240320EDF389} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E9268123-1398-4ABC-8265-F2F3D67E648A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A3ED9EC8-79EB-4883-8160-0DF2BD72E050} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {28242B56-78DF-46A2-8838-520A976F3F9D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {5FB90384-3883-4F43-84B8-6B0E55DF2F2B} diff --git a/sdk/src/Services/Route53RecoveryCluster/Generated/AmazonRoute53RecoveryClusterConfig.cs b/sdk/src/Services/Route53RecoveryCluster/Generated/AmazonRoute53RecoveryClusterConfig.cs index 6e162a32984a..8dc2bef1827c 100644 --- a/sdk/src/Services/Route53RecoveryCluster/Generated/AmazonRoute53RecoveryClusterConfig.cs +++ b/sdk/src/Services/Route53RecoveryCluster/Generated/AmazonRoute53RecoveryClusterConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.Route53RecoveryCluster public partial class AmazonRoute53RecoveryClusterConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("Route53 Recovery Cluster", "4.0.0.0"); private static readonly AmazonRoute53RecoveryClusterEndpointResolver EndpointResolver = new AmazonRoute53RecoveryClusterEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("Route53 Recovery Cluster", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("Route53 Recovery Cluster", "3.7.400.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/Route53RecoveryCluster/Properties/AssemblyInfo.cs b/sdk/src/Services/Route53RecoveryCluster/Properties/AssemblyInfo.cs index 8289efa1dc95..d2feb5ac0b63 100644 --- a/sdk/src/Services/Route53RecoveryCluster/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/Route53RecoveryCluster/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/Route53RecoveryCluster/Route53RecoveryCluster.sln b/sdk/src/Services/Route53RecoveryCluster/Route53RecoveryCluster.sln index 5d428b601e7e..f83ff27a804f 100644 --- a/sdk/src/Services/Route53RecoveryCluster/Route53RecoveryCluster.sln +++ b/sdk/src/Services/Route53RecoveryCluster/Route53RecoveryCluster.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {42087296-C764-4BB8-99A0-D7F32C08A591}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {42087296-C764-4BB8-99A0-D7F32C08A591}.Debug|Any CPU.Build.0 = Debug|Any CPU {42087296-C764-4BB8-99A0-D7F32C08A591}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {0E23F2EE-64AD-4B87-9A77-6704DCE345D8}.Debug|Any CPU.Build.0 = Debug|Any CPU {0E23F2EE-64AD-4B87-9A77-6704DCE345D8}.Release|Any CPU.ActiveCfg = Release|Any CPU {0E23F2EE-64AD-4B87-9A77-6704DCE345D8}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {E4E208A9-70E7-4D77-A75E-0DDC5821162F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E4E208A9-70E7-4D77-A75E-0DDC5821162F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E4E208A9-70E7-4D77-A75E-0DDC5821162F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E4E208A9-70E7-4D77-A75E-0DDC5821162F}.Release|Any CPU.Build.0 = Release|Any CPU - {EBB7A367-9709-4DFB-B0DD-5A40AE67EAA1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EBB7A367-9709-4DFB-B0DD-5A40AE67EAA1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EBB7A367-9709-4DFB-B0DD-5A40AE67EAA1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EBB7A367-9709-4DFB-B0DD-5A40AE67EAA1}.Release|Any CPU.Build.0 = Release|Any CPU - {032D93D4-E1B3-405E-8FCD-0BE9FEB6A514}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {032D93D4-E1B3-405E-8FCD-0BE9FEB6A514}.Debug|Any CPU.Build.0 = Debug|Any CPU - {032D93D4-E1B3-405E-8FCD-0BE9FEB6A514}.Release|Any CPU.ActiveCfg = Release|Any CPU - {032D93D4-E1B3-405E-8FCD-0BE9FEB6A514}.Release|Any CPU.Build.0 = Release|Any CPU - {8994E931-6083-49B4-9D25-1E42086A2868}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8994E931-6083-49B4-9D25-1E42086A2868}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8994E931-6083-49B4-9D25-1E42086A2868}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8994E931-6083-49B4-9D25-1E42086A2868}.Release|Any CPU.Build.0 = Release|Any CPU - {E5734A57-6575-48C8-83C8-49BE54735C89}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E5734A57-6575-48C8-83C8-49BE54735C89}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E5734A57-6575-48C8-83C8-49BE54735C89}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E5734A57-6575-48C8-83C8-49BE54735C89}.Release|Any CPU.Build.0 = Release|Any CPU - {4B4B7E34-D09C-41CE-BCBA-7F799B38E919}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4B4B7E34-D09C-41CE-BCBA-7F799B38E919}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4B4B7E34-D09C-41CE-BCBA-7F799B38E919}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4B4B7E34-D09C-41CE-BCBA-7F799B38E919}.Release|Any CPU.Build.0 = Release|Any CPU - {F838F530-A89E-4582-910E-CC138FDAC21B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F838F530-A89E-4582-910E-CC138FDAC21B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F838F530-A89E-4582-910E-CC138FDAC21B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F838F530-A89E-4582-910E-CC138FDAC21B}.Release|Any CPU.Build.0 = Release|Any CPU - {FA249AAE-0223-4BD0-9D5B-40FA678A15FD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FA249AAE-0223-4BD0-9D5B-40FA678A15FD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FA249AAE-0223-4BD0-9D5B-40FA678A15FD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FA249AAE-0223-4BD0-9D5B-40FA678A15FD}.Release|Any CPU.Build.0 = Release|Any CPU - {F01F50FF-D1BC-4B66-93A8-FF07D0189309}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F01F50FF-D1BC-4B66-93A8-FF07D0189309}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F01F50FF-D1BC-4B66-93A8-FF07D0189309}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F01F50FF-D1BC-4B66-93A8-FF07D0189309}.Release|Any CPU.Build.0 = Release|Any CPU - {6DF4605E-502A-499F-9E19-610E4E315F0B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6DF4605E-502A-499F-9E19-610E4E315F0B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6DF4605E-502A-499F-9E19-610E4E315F0B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6DF4605E-502A-499F-9E19-610E4E315F0B}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {E4E208A9-70E7-4D77-A75E-0DDC5821162F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E4E208A9-70E7-4D77-A75E-0DDC5821162F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E4E208A9-70E7-4D77-A75E-0DDC5821162F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E4E208A9-70E7-4D77-A75E-0DDC5821162F}.Release|Any CPU.Build.0 = Release|Any CPU - {EBB7A367-9709-4DFB-B0DD-5A40AE67EAA1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EBB7A367-9709-4DFB-B0DD-5A40AE67EAA1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EBB7A367-9709-4DFB-B0DD-5A40AE67EAA1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EBB7A367-9709-4DFB-B0DD-5A40AE67EAA1}.Release|Any CPU.Build.0 = Release|Any CPU - {032D93D4-E1B3-405E-8FCD-0BE9FEB6A514}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {032D93D4-E1B3-405E-8FCD-0BE9FEB6A514}.Debug|Any CPU.Build.0 = Debug|Any CPU - {032D93D4-E1B3-405E-8FCD-0BE9FEB6A514}.Release|Any CPU.ActiveCfg = Release|Any CPU - {032D93D4-E1B3-405E-8FCD-0BE9FEB6A514}.Release|Any CPU.Build.0 = Release|Any CPU - {8994E931-6083-49B4-9D25-1E42086A2868}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8994E931-6083-49B4-9D25-1E42086A2868}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8994E931-6083-49B4-9D25-1E42086A2868}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8994E931-6083-49B4-9D25-1E42086A2868}.Release|Any CPU.Build.0 = Release|Any CPU - {E5734A57-6575-48C8-83C8-49BE54735C89}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E5734A57-6575-48C8-83C8-49BE54735C89}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E5734A57-6575-48C8-83C8-49BE54735C89}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E5734A57-6575-48C8-83C8-49BE54735C89}.Release|Any CPU.Build.0 = Release|Any CPU - {4B4B7E34-D09C-41CE-BCBA-7F799B38E919}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4B4B7E34-D09C-41CE-BCBA-7F799B38E919}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4B4B7E34-D09C-41CE-BCBA-7F799B38E919}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4B4B7E34-D09C-41CE-BCBA-7F799B38E919}.Release|Any CPU.Build.0 = Release|Any CPU - {F838F530-A89E-4582-910E-CC138FDAC21B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F838F530-A89E-4582-910E-CC138FDAC21B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F838F530-A89E-4582-910E-CC138FDAC21B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F838F530-A89E-4582-910E-CC138FDAC21B}.Release|Any CPU.Build.0 = Release|Any CPU - {FA249AAE-0223-4BD0-9D5B-40FA678A15FD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FA249AAE-0223-4BD0-9D5B-40FA678A15FD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FA249AAE-0223-4BD0-9D5B-40FA678A15FD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FA249AAE-0223-4BD0-9D5B-40FA678A15FD}.Release|Any CPU.Build.0 = Release|Any CPU - {F01F50FF-D1BC-4B66-93A8-FF07D0189309}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F01F50FF-D1BC-4B66-93A8-FF07D0189309}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F01F50FF-D1BC-4B66-93A8-FF07D0189309}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F01F50FF-D1BC-4B66-93A8-FF07D0189309}.Release|Any CPU.Build.0 = Release|Any CPU - {6DF4605E-502A-499F-9E19-610E4E315F0B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6DF4605E-502A-499F-9E19-610E4E315F0B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6DF4605E-502A-499F-9E19-610E4E315F0B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6DF4605E-502A-499F-9E19-610E4E315F0B}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {42087296-C764-4BB8-99A0-D7F32C08A591} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {4F022482-06C3-4E40-8D49-3DBDA8E6469B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {58BD62F5-846C-407F-9864-B0A9740EBA4A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {217C1C2F-E386-4742-A3C9-2D12360AAE2E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {0E23F2EE-64AD-4B87-9A77-6704DCE345D8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {E4E208A9-70E7-4D77-A75E-0DDC5821162F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {EBB7A367-9709-4DFB-B0DD-5A40AE67EAA1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {032D93D4-E1B3-405E-8FCD-0BE9FEB6A514} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8994E931-6083-49B4-9D25-1E42086A2868} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E5734A57-6575-48C8-83C8-49BE54735C89} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4B4B7E34-D09C-41CE-BCBA-7F799B38E919} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F838F530-A89E-4582-910E-CC138FDAC21B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {FA249AAE-0223-4BD0-9D5B-40FA678A15FD} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F01F50FF-D1BC-4B66-93A8-FF07D0189309} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6DF4605E-502A-499F-9E19-610E4E315F0B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {E4E208A9-70E7-4D77-A75E-0DDC5821162F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {EBB7A367-9709-4DFB-B0DD-5A40AE67EAA1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {032D93D4-E1B3-405E-8FCD-0BE9FEB6A514} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8994E931-6083-49B4-9D25-1E42086A2868} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E5734A57-6575-48C8-83C8-49BE54735C89} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4B4B7E34-D09C-41CE-BCBA-7F799B38E919} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F838F530-A89E-4582-910E-CC138FDAC21B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {FA249AAE-0223-4BD0-9D5B-40FA678A15FD} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F01F50FF-D1BC-4B66-93A8-FF07D0189309} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6DF4605E-502A-499F-9E19-610E4E315F0B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {87C14172-9C19-4BD1-8F22-D3510108C84D} diff --git a/sdk/src/Services/Route53RecoveryControlConfig/Generated/AmazonRoute53RecoveryControlConfigConfig.cs b/sdk/src/Services/Route53RecoveryControlConfig/Generated/AmazonRoute53RecoveryControlConfigConfig.cs index 0bd4804381c0..88f93b4b4c9c 100644 --- a/sdk/src/Services/Route53RecoveryControlConfig/Generated/AmazonRoute53RecoveryControlConfigConfig.cs +++ b/sdk/src/Services/Route53RecoveryControlConfig/Generated/AmazonRoute53RecoveryControlConfigConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.Route53RecoveryControlConfig public partial class AmazonRoute53RecoveryControlConfigConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("Route53 Recovery Control Config", "4.0.0.0"); private static readonly AmazonRoute53RecoveryControlConfigEndpointResolver EndpointResolver = new AmazonRoute53RecoveryControlConfigEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("Route53 Recovery Control Config", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("Route53 Recovery Control Config", "3.7.400.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/Route53RecoveryControlConfig/Properties/AssemblyInfo.cs b/sdk/src/Services/Route53RecoveryControlConfig/Properties/AssemblyInfo.cs index adecae8bc639..a699aebc7557 100644 --- a/sdk/src/Services/Route53RecoveryControlConfig/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/Route53RecoveryControlConfig/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/Route53RecoveryControlConfig/Route53RecoveryControlConfig.sln b/sdk/src/Services/Route53RecoveryControlConfig/Route53RecoveryControlConfig.sln index 46d6b055a6b9..b7b54292038f 100644 --- a/sdk/src/Services/Route53RecoveryControlConfig/Route53RecoveryControlConfig.sln +++ b/sdk/src/Services/Route53RecoveryControlConfig/Route53RecoveryControlConfig.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {1A75FD32-B57E-46AC-B18C-E38F4B3B7054}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {1A75FD32-B57E-46AC-B18C-E38F4B3B7054}.Debug|Any CPU.Build.0 = Debug|Any CPU {1A75FD32-B57E-46AC-B18C-E38F4B3B7054}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {3AEF142B-2866-41FE-969D-1DD403032B9C}.Debug|Any CPU.Build.0 = Debug|Any CPU {3AEF142B-2866-41FE-969D-1DD403032B9C}.Release|Any CPU.ActiveCfg = Release|Any CPU {3AEF142B-2866-41FE-969D-1DD403032B9C}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {95D331CB-5EAB-432B-AA68-15D74A8E826B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {95D331CB-5EAB-432B-AA68-15D74A8E826B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {95D331CB-5EAB-432B-AA68-15D74A8E826B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {95D331CB-5EAB-432B-AA68-15D74A8E826B}.Release|Any CPU.Build.0 = Release|Any CPU - {FEF5280A-180E-4219-8D55-47324997418F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FEF5280A-180E-4219-8D55-47324997418F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FEF5280A-180E-4219-8D55-47324997418F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FEF5280A-180E-4219-8D55-47324997418F}.Release|Any CPU.Build.0 = Release|Any CPU - {D689D003-6D9C-463D-AC25-C6A60DB84B2A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D689D003-6D9C-463D-AC25-C6A60DB84B2A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D689D003-6D9C-463D-AC25-C6A60DB84B2A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D689D003-6D9C-463D-AC25-C6A60DB84B2A}.Release|Any CPU.Build.0 = Release|Any CPU - {24EDD103-3A7D-4518-B9CC-17C6D850BA58}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {24EDD103-3A7D-4518-B9CC-17C6D850BA58}.Debug|Any CPU.Build.0 = Debug|Any CPU - {24EDD103-3A7D-4518-B9CC-17C6D850BA58}.Release|Any CPU.ActiveCfg = Release|Any CPU - {24EDD103-3A7D-4518-B9CC-17C6D850BA58}.Release|Any CPU.Build.0 = Release|Any CPU - {A1A461BA-3512-442A-816C-340C61392AB1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A1A461BA-3512-442A-816C-340C61392AB1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A1A461BA-3512-442A-816C-340C61392AB1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A1A461BA-3512-442A-816C-340C61392AB1}.Release|Any CPU.Build.0 = Release|Any CPU - {194F2FAA-FB88-4178-98FE-988C17E4F9FD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {194F2FAA-FB88-4178-98FE-988C17E4F9FD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {194F2FAA-FB88-4178-98FE-988C17E4F9FD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {194F2FAA-FB88-4178-98FE-988C17E4F9FD}.Release|Any CPU.Build.0 = Release|Any CPU - {702F8533-581A-4FBE-8084-AA9BEA812FCA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {702F8533-581A-4FBE-8084-AA9BEA812FCA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {702F8533-581A-4FBE-8084-AA9BEA812FCA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {702F8533-581A-4FBE-8084-AA9BEA812FCA}.Release|Any CPU.Build.0 = Release|Any CPU - {14B33400-2D20-4BE2-A265-05F899ED1601}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {14B33400-2D20-4BE2-A265-05F899ED1601}.Debug|Any CPU.Build.0 = Debug|Any CPU - {14B33400-2D20-4BE2-A265-05F899ED1601}.Release|Any CPU.ActiveCfg = Release|Any CPU - {14B33400-2D20-4BE2-A265-05F899ED1601}.Release|Any CPU.Build.0 = Release|Any CPU - {F06C5E37-340B-4782-9CB8-8401BE08F350}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F06C5E37-340B-4782-9CB8-8401BE08F350}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F06C5E37-340B-4782-9CB8-8401BE08F350}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F06C5E37-340B-4782-9CB8-8401BE08F350}.Release|Any CPU.Build.0 = Release|Any CPU - {5D8A2E9D-C8E0-4D29-B7F0-0F93033FEA4B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5D8A2E9D-C8E0-4D29-B7F0-0F93033FEA4B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5D8A2E9D-C8E0-4D29-B7F0-0F93033FEA4B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5D8A2E9D-C8E0-4D29-B7F0-0F93033FEA4B}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {95D331CB-5EAB-432B-AA68-15D74A8E826B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {95D331CB-5EAB-432B-AA68-15D74A8E826B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {95D331CB-5EAB-432B-AA68-15D74A8E826B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {95D331CB-5EAB-432B-AA68-15D74A8E826B}.Release|Any CPU.Build.0 = Release|Any CPU - {FEF5280A-180E-4219-8D55-47324997418F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FEF5280A-180E-4219-8D55-47324997418F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FEF5280A-180E-4219-8D55-47324997418F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FEF5280A-180E-4219-8D55-47324997418F}.Release|Any CPU.Build.0 = Release|Any CPU - {D689D003-6D9C-463D-AC25-C6A60DB84B2A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D689D003-6D9C-463D-AC25-C6A60DB84B2A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D689D003-6D9C-463D-AC25-C6A60DB84B2A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D689D003-6D9C-463D-AC25-C6A60DB84B2A}.Release|Any CPU.Build.0 = Release|Any CPU - {24EDD103-3A7D-4518-B9CC-17C6D850BA58}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {24EDD103-3A7D-4518-B9CC-17C6D850BA58}.Debug|Any CPU.Build.0 = Debug|Any CPU - {24EDD103-3A7D-4518-B9CC-17C6D850BA58}.Release|Any CPU.ActiveCfg = Release|Any CPU - {24EDD103-3A7D-4518-B9CC-17C6D850BA58}.Release|Any CPU.Build.0 = Release|Any CPU - {A1A461BA-3512-442A-816C-340C61392AB1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A1A461BA-3512-442A-816C-340C61392AB1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A1A461BA-3512-442A-816C-340C61392AB1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A1A461BA-3512-442A-816C-340C61392AB1}.Release|Any CPU.Build.0 = Release|Any CPU - {194F2FAA-FB88-4178-98FE-988C17E4F9FD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {194F2FAA-FB88-4178-98FE-988C17E4F9FD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {194F2FAA-FB88-4178-98FE-988C17E4F9FD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {194F2FAA-FB88-4178-98FE-988C17E4F9FD}.Release|Any CPU.Build.0 = Release|Any CPU - {702F8533-581A-4FBE-8084-AA9BEA812FCA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {702F8533-581A-4FBE-8084-AA9BEA812FCA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {702F8533-581A-4FBE-8084-AA9BEA812FCA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {702F8533-581A-4FBE-8084-AA9BEA812FCA}.Release|Any CPU.Build.0 = Release|Any CPU - {14B33400-2D20-4BE2-A265-05F899ED1601}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {14B33400-2D20-4BE2-A265-05F899ED1601}.Debug|Any CPU.Build.0 = Debug|Any CPU - {14B33400-2D20-4BE2-A265-05F899ED1601}.Release|Any CPU.ActiveCfg = Release|Any CPU - {14B33400-2D20-4BE2-A265-05F899ED1601}.Release|Any CPU.Build.0 = Release|Any CPU - {F06C5E37-340B-4782-9CB8-8401BE08F350}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F06C5E37-340B-4782-9CB8-8401BE08F350}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F06C5E37-340B-4782-9CB8-8401BE08F350}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F06C5E37-340B-4782-9CB8-8401BE08F350}.Release|Any CPU.Build.0 = Release|Any CPU - {5D8A2E9D-C8E0-4D29-B7F0-0F93033FEA4B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5D8A2E9D-C8E0-4D29-B7F0-0F93033FEA4B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5D8A2E9D-C8E0-4D29-B7F0-0F93033FEA4B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5D8A2E9D-C8E0-4D29-B7F0-0F93033FEA4B}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {1A75FD32-B57E-46AC-B18C-E38F4B3B7054} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {56563EDA-8DF2-43C2-882C-D8FE7462835A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {B039D431-78BE-4D12-B511-3F0822C70214} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {453B7AA4-7FD2-4CA3-9B62-B6AA03C6C52E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {3AEF142B-2866-41FE-969D-1DD403032B9C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {95D331CB-5EAB-432B-AA68-15D74A8E826B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {FEF5280A-180E-4219-8D55-47324997418F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D689D003-6D9C-463D-AC25-C6A60DB84B2A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {24EDD103-3A7D-4518-B9CC-17C6D850BA58} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A1A461BA-3512-442A-816C-340C61392AB1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {194F2FAA-FB88-4178-98FE-988C17E4F9FD} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {702F8533-581A-4FBE-8084-AA9BEA812FCA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {14B33400-2D20-4BE2-A265-05F899ED1601} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F06C5E37-340B-4782-9CB8-8401BE08F350} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {5D8A2E9D-C8E0-4D29-B7F0-0F93033FEA4B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {95D331CB-5EAB-432B-AA68-15D74A8E826B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {FEF5280A-180E-4219-8D55-47324997418F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D689D003-6D9C-463D-AC25-C6A60DB84B2A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {24EDD103-3A7D-4518-B9CC-17C6D850BA58} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A1A461BA-3512-442A-816C-340C61392AB1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {194F2FAA-FB88-4178-98FE-988C17E4F9FD} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {702F8533-581A-4FBE-8084-AA9BEA812FCA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {14B33400-2D20-4BE2-A265-05F899ED1601} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F06C5E37-340B-4782-9CB8-8401BE08F350} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {5D8A2E9D-C8E0-4D29-B7F0-0F93033FEA4B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {612CAD06-3601-4F0F-BC15-B47ED3904C17} diff --git a/sdk/src/Services/Route53RecoveryReadiness/Generated/AmazonRoute53RecoveryReadinessConfig.cs b/sdk/src/Services/Route53RecoveryReadiness/Generated/AmazonRoute53RecoveryReadinessConfig.cs index 7b1ae26e7730..b722ccf31f8b 100644 --- a/sdk/src/Services/Route53RecoveryReadiness/Generated/AmazonRoute53RecoveryReadinessConfig.cs +++ b/sdk/src/Services/Route53RecoveryReadiness/Generated/AmazonRoute53RecoveryReadinessConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.Route53RecoveryReadiness public partial class AmazonRoute53RecoveryReadinessConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("Route53 Recovery Readiness", "4.0.0.0"); private static readonly AmazonRoute53RecoveryReadinessEndpointResolver EndpointResolver = new AmazonRoute53RecoveryReadinessEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("Route53 Recovery Readiness", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("Route53 Recovery Readiness", "3.7.400.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/Route53RecoveryReadiness/Properties/AssemblyInfo.cs b/sdk/src/Services/Route53RecoveryReadiness/Properties/AssemblyInfo.cs index 34d1145ab40d..fc497c227fa1 100644 --- a/sdk/src/Services/Route53RecoveryReadiness/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/Route53RecoveryReadiness/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/Route53RecoveryReadiness/Route53RecoveryReadiness.sln b/sdk/src/Services/Route53RecoveryReadiness/Route53RecoveryReadiness.sln index 4bfc1bdf2eb8..114dd8f11a6c 100644 --- a/sdk/src/Services/Route53RecoveryReadiness/Route53RecoveryReadiness.sln +++ b/sdk/src/Services/Route53RecoveryReadiness/Route53RecoveryReadiness.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {0D241FB7-8CD4-45ED-B125-3C6CAD1485BF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {0D241FB7-8CD4-45ED-B125-3C6CAD1485BF}.Debug|Any CPU.Build.0 = Debug|Any CPU {0D241FB7-8CD4-45ED-B125-3C6CAD1485BF}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {AC9A3E2A-F5E0-4932-AF87-F6022BF3FFCD}.Debug|Any CPU.Build.0 = Debug|Any CPU {AC9A3E2A-F5E0-4932-AF87-F6022BF3FFCD}.Release|Any CPU.ActiveCfg = Release|Any CPU {AC9A3E2A-F5E0-4932-AF87-F6022BF3FFCD}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {3E0DF0A8-6833-4EF5-96E7-EB8DFB67AD26}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3E0DF0A8-6833-4EF5-96E7-EB8DFB67AD26}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3E0DF0A8-6833-4EF5-96E7-EB8DFB67AD26}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3E0DF0A8-6833-4EF5-96E7-EB8DFB67AD26}.Release|Any CPU.Build.0 = Release|Any CPU - {6EBA401A-1A67-46D1-9960-5EE04224538F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6EBA401A-1A67-46D1-9960-5EE04224538F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6EBA401A-1A67-46D1-9960-5EE04224538F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6EBA401A-1A67-46D1-9960-5EE04224538F}.Release|Any CPU.Build.0 = Release|Any CPU - {8E5A2B12-049A-4604-ACFB-92CFA09C587F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8E5A2B12-049A-4604-ACFB-92CFA09C587F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8E5A2B12-049A-4604-ACFB-92CFA09C587F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8E5A2B12-049A-4604-ACFB-92CFA09C587F}.Release|Any CPU.Build.0 = Release|Any CPU - {CCADE78E-87F2-4745-A3F0-73962946AD02}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CCADE78E-87F2-4745-A3F0-73962946AD02}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CCADE78E-87F2-4745-A3F0-73962946AD02}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CCADE78E-87F2-4745-A3F0-73962946AD02}.Release|Any CPU.Build.0 = Release|Any CPU - {DE04AE65-F434-4828-B000-CB2E7CFE4E3D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DE04AE65-F434-4828-B000-CB2E7CFE4E3D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DE04AE65-F434-4828-B000-CB2E7CFE4E3D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DE04AE65-F434-4828-B000-CB2E7CFE4E3D}.Release|Any CPU.Build.0 = Release|Any CPU - {74451106-8236-4AE7-BEDB-D91BFAB4819C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {74451106-8236-4AE7-BEDB-D91BFAB4819C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {74451106-8236-4AE7-BEDB-D91BFAB4819C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {74451106-8236-4AE7-BEDB-D91BFAB4819C}.Release|Any CPU.Build.0 = Release|Any CPU - {0AF1E5EE-DE11-4777-A46E-A450BD94015A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0AF1E5EE-DE11-4777-A46E-A450BD94015A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0AF1E5EE-DE11-4777-A46E-A450BD94015A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0AF1E5EE-DE11-4777-A46E-A450BD94015A}.Release|Any CPU.Build.0 = Release|Any CPU - {03E6ACC4-D34A-4EB9-8107-5459C418B154}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {03E6ACC4-D34A-4EB9-8107-5459C418B154}.Debug|Any CPU.Build.0 = Debug|Any CPU - {03E6ACC4-D34A-4EB9-8107-5459C418B154}.Release|Any CPU.ActiveCfg = Release|Any CPU - {03E6ACC4-D34A-4EB9-8107-5459C418B154}.Release|Any CPU.Build.0 = Release|Any CPU - {54B1FCC5-F492-4170-8DD9-16E9D283A0C8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {54B1FCC5-F492-4170-8DD9-16E9D283A0C8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {54B1FCC5-F492-4170-8DD9-16E9D283A0C8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {54B1FCC5-F492-4170-8DD9-16E9D283A0C8}.Release|Any CPU.Build.0 = Release|Any CPU - {A3489455-2479-4E70-9E57-0BC7C2E21D45}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A3489455-2479-4E70-9E57-0BC7C2E21D45}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A3489455-2479-4E70-9E57-0BC7C2E21D45}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A3489455-2479-4E70-9E57-0BC7C2E21D45}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {3E0DF0A8-6833-4EF5-96E7-EB8DFB67AD26}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3E0DF0A8-6833-4EF5-96E7-EB8DFB67AD26}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3E0DF0A8-6833-4EF5-96E7-EB8DFB67AD26}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3E0DF0A8-6833-4EF5-96E7-EB8DFB67AD26}.Release|Any CPU.Build.0 = Release|Any CPU - {6EBA401A-1A67-46D1-9960-5EE04224538F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6EBA401A-1A67-46D1-9960-5EE04224538F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6EBA401A-1A67-46D1-9960-5EE04224538F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6EBA401A-1A67-46D1-9960-5EE04224538F}.Release|Any CPU.Build.0 = Release|Any CPU - {8E5A2B12-049A-4604-ACFB-92CFA09C587F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8E5A2B12-049A-4604-ACFB-92CFA09C587F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8E5A2B12-049A-4604-ACFB-92CFA09C587F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8E5A2B12-049A-4604-ACFB-92CFA09C587F}.Release|Any CPU.Build.0 = Release|Any CPU - {CCADE78E-87F2-4745-A3F0-73962946AD02}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CCADE78E-87F2-4745-A3F0-73962946AD02}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CCADE78E-87F2-4745-A3F0-73962946AD02}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CCADE78E-87F2-4745-A3F0-73962946AD02}.Release|Any CPU.Build.0 = Release|Any CPU - {DE04AE65-F434-4828-B000-CB2E7CFE4E3D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DE04AE65-F434-4828-B000-CB2E7CFE4E3D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DE04AE65-F434-4828-B000-CB2E7CFE4E3D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DE04AE65-F434-4828-B000-CB2E7CFE4E3D}.Release|Any CPU.Build.0 = Release|Any CPU - {74451106-8236-4AE7-BEDB-D91BFAB4819C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {74451106-8236-4AE7-BEDB-D91BFAB4819C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {74451106-8236-4AE7-BEDB-D91BFAB4819C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {74451106-8236-4AE7-BEDB-D91BFAB4819C}.Release|Any CPU.Build.0 = Release|Any CPU - {0AF1E5EE-DE11-4777-A46E-A450BD94015A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0AF1E5EE-DE11-4777-A46E-A450BD94015A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0AF1E5EE-DE11-4777-A46E-A450BD94015A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0AF1E5EE-DE11-4777-A46E-A450BD94015A}.Release|Any CPU.Build.0 = Release|Any CPU - {03E6ACC4-D34A-4EB9-8107-5459C418B154}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {03E6ACC4-D34A-4EB9-8107-5459C418B154}.Debug|Any CPU.Build.0 = Debug|Any CPU - {03E6ACC4-D34A-4EB9-8107-5459C418B154}.Release|Any CPU.ActiveCfg = Release|Any CPU - {03E6ACC4-D34A-4EB9-8107-5459C418B154}.Release|Any CPU.Build.0 = Release|Any CPU - {54B1FCC5-F492-4170-8DD9-16E9D283A0C8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {54B1FCC5-F492-4170-8DD9-16E9D283A0C8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {54B1FCC5-F492-4170-8DD9-16E9D283A0C8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {54B1FCC5-F492-4170-8DD9-16E9D283A0C8}.Release|Any CPU.Build.0 = Release|Any CPU - {A3489455-2479-4E70-9E57-0BC7C2E21D45}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A3489455-2479-4E70-9E57-0BC7C2E21D45}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A3489455-2479-4E70-9E57-0BC7C2E21D45}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A3489455-2479-4E70-9E57-0BC7C2E21D45}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {0D241FB7-8CD4-45ED-B125-3C6CAD1485BF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {FB74A5A5-44DE-456D-9575-41061FD50F5E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {176883DE-A211-41D7-92F2-DEB0B4ED4C00} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {EAD75990-E9F5-417F-9384-E2DEAD0598BD} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {AC9A3E2A-F5E0-4932-AF87-F6022BF3FFCD} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {3E0DF0A8-6833-4EF5-96E7-EB8DFB67AD26} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6EBA401A-1A67-46D1-9960-5EE04224538F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8E5A2B12-049A-4604-ACFB-92CFA09C587F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {CCADE78E-87F2-4745-A3F0-73962946AD02} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {DE04AE65-F434-4828-B000-CB2E7CFE4E3D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {74451106-8236-4AE7-BEDB-D91BFAB4819C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0AF1E5EE-DE11-4777-A46E-A450BD94015A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {03E6ACC4-D34A-4EB9-8107-5459C418B154} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {54B1FCC5-F492-4170-8DD9-16E9D283A0C8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A3489455-2479-4E70-9E57-0BC7C2E21D45} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {3E0DF0A8-6833-4EF5-96E7-EB8DFB67AD26} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6EBA401A-1A67-46D1-9960-5EE04224538F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8E5A2B12-049A-4604-ACFB-92CFA09C587F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {CCADE78E-87F2-4745-A3F0-73962946AD02} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {DE04AE65-F434-4828-B000-CB2E7CFE4E3D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {74451106-8236-4AE7-BEDB-D91BFAB4819C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0AF1E5EE-DE11-4777-A46E-A450BD94015A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {03E6ACC4-D34A-4EB9-8107-5459C418B154} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {54B1FCC5-F492-4170-8DD9-16E9D283A0C8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A3489455-2479-4E70-9E57-0BC7C2E21D45} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {3E2603CB-C20C-4C80-AC7E-81348DFA7281} diff --git a/sdk/src/Services/Route53Resolver/Generated/AmazonRoute53ResolverConfig.cs b/sdk/src/Services/Route53Resolver/Generated/AmazonRoute53ResolverConfig.cs index e7162b0fad54..5fe88d73e19f 100644 --- a/sdk/src/Services/Route53Resolver/Generated/AmazonRoute53ResolverConfig.cs +++ b/sdk/src/Services/Route53Resolver/Generated/AmazonRoute53ResolverConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.Route53Resolver public partial class AmazonRoute53ResolverConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("Route53Resolver", "4.0.0.0"); private static readonly AmazonRoute53ResolverEndpointResolver EndpointResolver = new AmazonRoute53ResolverEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("Route53Resolver", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("Route53Resolver", "3.7.402.0"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/Route53Resolver/Generated/Model/Internal/MarshallTransformations/CreateFirewallRuleRequestMarshaller.cs b/sdk/src/Services/Route53Resolver/Generated/Model/Internal/MarshallTransformations/CreateFirewallRuleRequestMarshaller.cs index 9a2f58d5e37a..f76a00f2d4df 100644 --- a/sdk/src/Services/Route53Resolver/Generated/Model/Internal/MarshallTransformations/CreateFirewallRuleRequestMarshaller.cs +++ b/sdk/src/Services/Route53Resolver/Generated/Model/Internal/MarshallTransformations/CreateFirewallRuleRequestMarshaller.cs @@ -101,6 +101,12 @@ public IRequest Marshall(CreateFirewallRuleRequest publicRequest) context.Writer.Write(publicRequest.BlockResponse); } + if(publicRequest.IsSetConfidenceThreshold()) + { + context.Writer.WritePropertyName("ConfidenceThreshold"); + context.Writer.Write(publicRequest.ConfidenceThreshold); + } + if(publicRequest.IsSetCreatorRequestId()) { context.Writer.WritePropertyName("CreatorRequestId"); @@ -112,6 +118,12 @@ public IRequest Marshall(CreateFirewallRuleRequest publicRequest) context.Writer.WritePropertyName("CreatorRequestId"); context.Writer.Write(Guid.NewGuid().ToString()); } + if(publicRequest.IsSetDnsThreatProtection()) + { + context.Writer.WritePropertyName("DnsThreatProtection"); + context.Writer.Write(publicRequest.DnsThreatProtection); + } + if(publicRequest.IsSetFirewallDomainListId()) { context.Writer.WritePropertyName("FirewallDomainListId"); @@ -151,171 +163,7 @@ public IRequest Marshall(CreateFirewallRuleRequest publicRequest) writer.WriteObjectEnd(); } -<<<<<<< HEAD request.Content = memoryStream.ToArray(); -||||||| Commit version number update changes - if(publicRequest.IsSetBlockOverrideDnsType()) - { - context.Writer.WritePropertyName("BlockOverrideDnsType"); - context.Writer.Write(publicRequest.BlockOverrideDnsType); - } - - if(publicRequest.IsSetBlockOverrideDomain()) - { - context.Writer.WritePropertyName("BlockOverrideDomain"); - context.Writer.Write(publicRequest.BlockOverrideDomain); - } - - if(publicRequest.IsSetBlockOverrideTtl()) - { - context.Writer.WritePropertyName("BlockOverrideTtl"); - context.Writer.Write(publicRequest.BlockOverrideTtl); - } - - if(publicRequest.IsSetBlockResponse()) - { - context.Writer.WritePropertyName("BlockResponse"); - context.Writer.Write(publicRequest.BlockResponse); - } - - if(publicRequest.IsSetCreatorRequestId()) - { - context.Writer.WritePropertyName("CreatorRequestId"); - context.Writer.Write(publicRequest.CreatorRequestId); - } - - else if(!(publicRequest.IsSetCreatorRequestId())) - { - context.Writer.WritePropertyName("CreatorRequestId"); - context.Writer.Write(Guid.NewGuid().ToString()); - } - if(publicRequest.IsSetFirewallDomainListId()) - { - context.Writer.WritePropertyName("FirewallDomainListId"); - context.Writer.Write(publicRequest.FirewallDomainListId); - } - - if(publicRequest.IsSetFirewallDomainRedirectionAction()) - { - context.Writer.WritePropertyName("FirewallDomainRedirectionAction"); - context.Writer.Write(publicRequest.FirewallDomainRedirectionAction); - } - - if(publicRequest.IsSetFirewallRuleGroupId()) - { - context.Writer.WritePropertyName("FirewallRuleGroupId"); - context.Writer.Write(publicRequest.FirewallRuleGroupId); - } - - if(publicRequest.IsSetName()) - { - context.Writer.WritePropertyName("Name"); - context.Writer.Write(publicRequest.Name); - } - - if(publicRequest.IsSetPriority()) - { - context.Writer.WritePropertyName("Priority"); - context.Writer.Write(publicRequest.Priority); - } - - if(publicRequest.IsSetQtype()) - { - context.Writer.WritePropertyName("Qtype"); - context.Writer.Write(publicRequest.Qtype); - } - - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); -======= - if(publicRequest.IsSetBlockOverrideDnsType()) - { - context.Writer.WritePropertyName("BlockOverrideDnsType"); - context.Writer.Write(publicRequest.BlockOverrideDnsType); - } - - if(publicRequest.IsSetBlockOverrideDomain()) - { - context.Writer.WritePropertyName("BlockOverrideDomain"); - context.Writer.Write(publicRequest.BlockOverrideDomain); - } - - if(publicRequest.IsSetBlockOverrideTtl()) - { - context.Writer.WritePropertyName("BlockOverrideTtl"); - context.Writer.Write(publicRequest.BlockOverrideTtl); - } - - if(publicRequest.IsSetBlockResponse()) - { - context.Writer.WritePropertyName("BlockResponse"); - context.Writer.Write(publicRequest.BlockResponse); - } - - if(publicRequest.IsSetConfidenceThreshold()) - { - context.Writer.WritePropertyName("ConfidenceThreshold"); - context.Writer.Write(publicRequest.ConfidenceThreshold); - } - - if(publicRequest.IsSetCreatorRequestId()) - { - context.Writer.WritePropertyName("CreatorRequestId"); - context.Writer.Write(publicRequest.CreatorRequestId); - } - - else if(!(publicRequest.IsSetCreatorRequestId())) - { - context.Writer.WritePropertyName("CreatorRequestId"); - context.Writer.Write(Guid.NewGuid().ToString()); - } - if(publicRequest.IsSetDnsThreatProtection()) - { - context.Writer.WritePropertyName("DnsThreatProtection"); - context.Writer.Write(publicRequest.DnsThreatProtection); - } - - if(publicRequest.IsSetFirewallDomainListId()) - { - context.Writer.WritePropertyName("FirewallDomainListId"); - context.Writer.Write(publicRequest.FirewallDomainListId); - } - - if(publicRequest.IsSetFirewallDomainRedirectionAction()) - { - context.Writer.WritePropertyName("FirewallDomainRedirectionAction"); - context.Writer.Write(publicRequest.FirewallDomainRedirectionAction); - } - - if(publicRequest.IsSetFirewallRuleGroupId()) - { - context.Writer.WritePropertyName("FirewallRuleGroupId"); - context.Writer.Write(publicRequest.FirewallRuleGroupId); - } - - if(publicRequest.IsSetName()) - { - context.Writer.WritePropertyName("Name"); - context.Writer.Write(publicRequest.Name); - } - - if(publicRequest.IsSetPriority()) - { - context.Writer.WritePropertyName("Priority"); - context.Writer.Write(publicRequest.Priority); - } - - if(publicRequest.IsSetQtype()) - { - context.Writer.WritePropertyName("Qtype"); - context.Writer.Write(publicRequest.Qtype); - } - - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b } diff --git a/sdk/src/Services/Route53Resolver/Generated/Model/Internal/MarshallTransformations/DeleteFirewallRuleRequestMarshaller.cs b/sdk/src/Services/Route53Resolver/Generated/Model/Internal/MarshallTransformations/DeleteFirewallRuleRequestMarshaller.cs index dcfa5af84c48..982b87e2bcdc 100644 --- a/sdk/src/Services/Route53Resolver/Generated/Model/Internal/MarshallTransformations/DeleteFirewallRuleRequestMarshaller.cs +++ b/sdk/src/Services/Route53Resolver/Generated/Model/Internal/MarshallTransformations/DeleteFirewallRuleRequestMarshaller.cs @@ -83,7 +83,12 @@ public IRequest Marshall(DeleteFirewallRuleRequest publicRequest) context.Writer.Write(publicRequest.FirewallRuleGroupId); } -<<<<<<< HEAD + if(publicRequest.IsSetFirewallThreatProtectionId()) + { + context.Writer.WritePropertyName("FirewallThreatProtectionId"); + context.Writer.Write(publicRequest.FirewallThreatProtectionId); + } + if(publicRequest.IsSetQtype()) { context.Writer.WritePropertyName("Qtype"); @@ -91,23 +96,6 @@ public IRequest Marshall(DeleteFirewallRuleRequest publicRequest) } writer.WriteObjectEnd(); -||||||| Commit version number update changes - if(publicRequest.IsSetQtype()) - { - context.Writer.WritePropertyName("Qtype"); - context.Writer.Write(publicRequest.Qtype); -======= - if(publicRequest.IsSetFirewallThreatProtectionId()) - { - context.Writer.WritePropertyName("FirewallThreatProtectionId"); - context.Writer.Write(publicRequest.FirewallThreatProtectionId); - } - - if(publicRequest.IsSetQtype()) - { - context.Writer.WritePropertyName("Qtype"); - context.Writer.Write(publicRequest.Qtype); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b } request.Content = memoryStream.ToArray(); diff --git a/sdk/src/Services/Route53Resolver/Generated/Model/Internal/MarshallTransformations/UpdateFirewallRuleRequestMarshaller.cs b/sdk/src/Services/Route53Resolver/Generated/Model/Internal/MarshallTransformations/UpdateFirewallRuleRequestMarshaller.cs index 34520a22d764..1b137aff14c2 100644 --- a/sdk/src/Services/Route53Resolver/Generated/Model/Internal/MarshallTransformations/UpdateFirewallRuleRequestMarshaller.cs +++ b/sdk/src/Services/Route53Resolver/Generated/Model/Internal/MarshallTransformations/UpdateFirewallRuleRequestMarshaller.cs @@ -101,6 +101,18 @@ public IRequest Marshall(UpdateFirewallRuleRequest publicRequest) context.Writer.Write(publicRequest.BlockResponse); } + if(publicRequest.IsSetConfidenceThreshold()) + { + context.Writer.WritePropertyName("ConfidenceThreshold"); + context.Writer.Write(publicRequest.ConfidenceThreshold); + } + + if(publicRequest.IsSetDnsThreatProtection()) + { + context.Writer.WritePropertyName("DnsThreatProtection"); + context.Writer.Write(publicRequest.DnsThreatProtection); + } + if(publicRequest.IsSetFirewallDomainListId()) { context.Writer.WritePropertyName("FirewallDomainListId"); @@ -119,6 +131,12 @@ public IRequest Marshall(UpdateFirewallRuleRequest publicRequest) context.Writer.Write(publicRequest.FirewallRuleGroupId); } + if(publicRequest.IsSetFirewallThreatProtectionId()) + { + context.Writer.WritePropertyName("FirewallThreatProtectionId"); + context.Writer.Write(publicRequest.FirewallThreatProtectionId); + } + if(publicRequest.IsSetName()) { context.Writer.WritePropertyName("Name"); @@ -140,155 +158,7 @@ public IRequest Marshall(UpdateFirewallRuleRequest publicRequest) writer.WriteObjectEnd(); } -<<<<<<< HEAD request.Content = memoryStream.ToArray(); -||||||| Commit version number update changes - if(publicRequest.IsSetBlockOverrideDnsType()) - { - context.Writer.WritePropertyName("BlockOverrideDnsType"); - context.Writer.Write(publicRequest.BlockOverrideDnsType); - } - - if(publicRequest.IsSetBlockOverrideDomain()) - { - context.Writer.WritePropertyName("BlockOverrideDomain"); - context.Writer.Write(publicRequest.BlockOverrideDomain); - } - - if(publicRequest.IsSetBlockOverrideTtl()) - { - context.Writer.WritePropertyName("BlockOverrideTtl"); - context.Writer.Write(publicRequest.BlockOverrideTtl); - } - - if(publicRequest.IsSetBlockResponse()) - { - context.Writer.WritePropertyName("BlockResponse"); - context.Writer.Write(publicRequest.BlockResponse); - } - - if(publicRequest.IsSetFirewallDomainListId()) - { - context.Writer.WritePropertyName("FirewallDomainListId"); - context.Writer.Write(publicRequest.FirewallDomainListId); - } - - if(publicRequest.IsSetFirewallDomainRedirectionAction()) - { - context.Writer.WritePropertyName("FirewallDomainRedirectionAction"); - context.Writer.Write(publicRequest.FirewallDomainRedirectionAction); - } - - if(publicRequest.IsSetFirewallRuleGroupId()) - { - context.Writer.WritePropertyName("FirewallRuleGroupId"); - context.Writer.Write(publicRequest.FirewallRuleGroupId); - } - - if(publicRequest.IsSetName()) - { - context.Writer.WritePropertyName("Name"); - context.Writer.Write(publicRequest.Name); - } - - if(publicRequest.IsSetPriority()) - { - context.Writer.WritePropertyName("Priority"); - context.Writer.Write(publicRequest.Priority); - } - - if(publicRequest.IsSetQtype()) - { - context.Writer.WritePropertyName("Qtype"); - context.Writer.Write(publicRequest.Qtype); - } - - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); -======= - if(publicRequest.IsSetBlockOverrideDnsType()) - { - context.Writer.WritePropertyName("BlockOverrideDnsType"); - context.Writer.Write(publicRequest.BlockOverrideDnsType); - } - - if(publicRequest.IsSetBlockOverrideDomain()) - { - context.Writer.WritePropertyName("BlockOverrideDomain"); - context.Writer.Write(publicRequest.BlockOverrideDomain); - } - - if(publicRequest.IsSetBlockOverrideTtl()) - { - context.Writer.WritePropertyName("BlockOverrideTtl"); - context.Writer.Write(publicRequest.BlockOverrideTtl); - } - - if(publicRequest.IsSetBlockResponse()) - { - context.Writer.WritePropertyName("BlockResponse"); - context.Writer.Write(publicRequest.BlockResponse); - } - - if(publicRequest.IsSetConfidenceThreshold()) - { - context.Writer.WritePropertyName("ConfidenceThreshold"); - context.Writer.Write(publicRequest.ConfidenceThreshold); - } - - if(publicRequest.IsSetDnsThreatProtection()) - { - context.Writer.WritePropertyName("DnsThreatProtection"); - context.Writer.Write(publicRequest.DnsThreatProtection); - } - - if(publicRequest.IsSetFirewallDomainListId()) - { - context.Writer.WritePropertyName("FirewallDomainListId"); - context.Writer.Write(publicRequest.FirewallDomainListId); - } - - if(publicRequest.IsSetFirewallDomainRedirectionAction()) - { - context.Writer.WritePropertyName("FirewallDomainRedirectionAction"); - context.Writer.Write(publicRequest.FirewallDomainRedirectionAction); - } - - if(publicRequest.IsSetFirewallRuleGroupId()) - { - context.Writer.WritePropertyName("FirewallRuleGroupId"); - context.Writer.Write(publicRequest.FirewallRuleGroupId); - } - - if(publicRequest.IsSetFirewallThreatProtectionId()) - { - context.Writer.WritePropertyName("FirewallThreatProtectionId"); - context.Writer.Write(publicRequest.FirewallThreatProtectionId); - } - - if(publicRequest.IsSetName()) - { - context.Writer.WritePropertyName("Name"); - context.Writer.Write(publicRequest.Name); - } - - if(publicRequest.IsSetPriority()) - { - context.Writer.WritePropertyName("Priority"); - context.Writer.Write(publicRequest.Priority); - } - - if(publicRequest.IsSetQtype()) - { - context.Writer.WritePropertyName("Qtype"); - context.Writer.Write(publicRequest.Qtype); - } - - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b } diff --git a/sdk/src/Services/Route53Resolver/Generated/_bcl/AmazonRoute53ResolverClient.cs b/sdk/src/Services/Route53Resolver/Generated/_bcl/AmazonRoute53ResolverClient.cs index 2f3f41ccae63..94484c67393a 100644 --- a/sdk/src/Services/Route53Resolver/Generated/_bcl/AmazonRoute53ResolverClient.cs +++ b/sdk/src/Services/Route53Resolver/Generated/_bcl/AmazonRoute53ResolverClient.cs @@ -1603,6 +1603,10 @@ public virtual DeleteFirewallDomainListResponse DeleteFirewallDomainList(DeleteF /// /// The request was throttled. Try again in a few minutes. /// + /// + /// You have provided an invalid command. If you ran the UpdateFirewallDomains + /// request. supported values are ADD, REMOVE, or REPLACE a domain. + /// /// REST API Reference for DeleteFirewallRule Operation public virtual DeleteFirewallRuleResponse DeleteFirewallRule(DeleteFirewallRuleRequest request) { @@ -1642,6 +1646,10 @@ public virtual DeleteFirewallRuleResponse DeleteFirewallRule(DeleteFirewallRuleR /// /// The request was throttled. Try again in a few minutes. /// + /// + /// You have provided an invalid command. If you ran the UpdateFirewallDomains + /// request. supported values are ADD, REMOVE, or REPLACE a domain. + /// /// REST API Reference for DeleteFirewallRule Operation public virtual Task DeleteFirewallRuleAsync(DeleteFirewallRuleRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { diff --git a/sdk/src/Services/Route53Resolver/Properties/AssemblyInfo.cs b/sdk/src/Services/Route53Resolver/Properties/AssemblyInfo.cs index 92686ae7ed13..31466ca238c7 100644 --- a/sdk/src/Services/Route53Resolver/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/Route53Resolver/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.402.0")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/Route53Resolver/Route53Resolver.sln b/sdk/src/Services/Route53Resolver/Route53Resolver.sln index 81e082c745c3..fb80de677ce9 100644 --- a/sdk/src/Services/Route53Resolver/Route53Resolver.sln +++ b/sdk/src/Services/Route53Resolver/Route53Resolver.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {1263CB5B-BD80-4712-9DBA-C58746781237}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {1263CB5B-BD80-4712-9DBA-C58746781237}.Debug|Any CPU.Build.0 = Debug|Any CPU {1263CB5B-BD80-4712-9DBA-C58746781237}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {8B8C0C98-0943-4610-BBC9-64BB7FF285FC}.Debug|Any CPU.Build.0 = Debug|Any CPU {8B8C0C98-0943-4610-BBC9-64BB7FF285FC}.Release|Any CPU.ActiveCfg = Release|Any CPU {8B8C0C98-0943-4610-BBC9-64BB7FF285FC}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {87342AD9-C96D-40E7-B4AD-D609E82F21E6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87342AD9-C96D-40E7-B4AD-D609E82F21E6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87342AD9-C96D-40E7-B4AD-D609E82F21E6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87342AD9-C96D-40E7-B4AD-D609E82F21E6}.Release|Any CPU.Build.0 = Release|Any CPU - {13CE3A91-EDED-4622-B63E-2968A5A429C1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {13CE3A91-EDED-4622-B63E-2968A5A429C1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {13CE3A91-EDED-4622-B63E-2968A5A429C1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {13CE3A91-EDED-4622-B63E-2968A5A429C1}.Release|Any CPU.Build.0 = Release|Any CPU - {D54F1121-2C51-4DA3-90A1-8DDBA35123F7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D54F1121-2C51-4DA3-90A1-8DDBA35123F7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D54F1121-2C51-4DA3-90A1-8DDBA35123F7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D54F1121-2C51-4DA3-90A1-8DDBA35123F7}.Release|Any CPU.Build.0 = Release|Any CPU - {6D50807A-339D-45C0-9108-B80C7454A9BD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6D50807A-339D-45C0-9108-B80C7454A9BD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6D50807A-339D-45C0-9108-B80C7454A9BD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6D50807A-339D-45C0-9108-B80C7454A9BD}.Release|Any CPU.Build.0 = Release|Any CPU - {C01330E3-389B-43F6-997B-C77B509D013C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C01330E3-389B-43F6-997B-C77B509D013C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C01330E3-389B-43F6-997B-C77B509D013C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C01330E3-389B-43F6-997B-C77B509D013C}.Release|Any CPU.Build.0 = Release|Any CPU - {878B4628-2D22-47CF-8718-17BE075E0BD5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {878B4628-2D22-47CF-8718-17BE075E0BD5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {878B4628-2D22-47CF-8718-17BE075E0BD5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {878B4628-2D22-47CF-8718-17BE075E0BD5}.Release|Any CPU.Build.0 = Release|Any CPU - {CFAEA972-3D62-495A-85AA-B226CD936BCE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CFAEA972-3D62-495A-85AA-B226CD936BCE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CFAEA972-3D62-495A-85AA-B226CD936BCE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CFAEA972-3D62-495A-85AA-B226CD936BCE}.Release|Any CPU.Build.0 = Release|Any CPU - {05D6FE04-DC2B-403A-8FE5-2656BA2A4CA0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {05D6FE04-DC2B-403A-8FE5-2656BA2A4CA0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {05D6FE04-DC2B-403A-8FE5-2656BA2A4CA0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {05D6FE04-DC2B-403A-8FE5-2656BA2A4CA0}.Release|Any CPU.Build.0 = Release|Any CPU - {B0A1A291-12BF-4028-810F-0DC858E7321B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B0A1A291-12BF-4028-810F-0DC858E7321B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B0A1A291-12BF-4028-810F-0DC858E7321B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B0A1A291-12BF-4028-810F-0DC858E7321B}.Release|Any CPU.Build.0 = Release|Any CPU - {E12E550C-D85D-4769-8259-BDBD62B937B2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E12E550C-D85D-4769-8259-BDBD62B937B2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E12E550C-D85D-4769-8259-BDBD62B937B2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E12E550C-D85D-4769-8259-BDBD62B937B2}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {87342AD9-C96D-40E7-B4AD-D609E82F21E6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87342AD9-C96D-40E7-B4AD-D609E82F21E6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87342AD9-C96D-40E7-B4AD-D609E82F21E6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87342AD9-C96D-40E7-B4AD-D609E82F21E6}.Release|Any CPU.Build.0 = Release|Any CPU - {13CE3A91-EDED-4622-B63E-2968A5A429C1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {13CE3A91-EDED-4622-B63E-2968A5A429C1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {13CE3A91-EDED-4622-B63E-2968A5A429C1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {13CE3A91-EDED-4622-B63E-2968A5A429C1}.Release|Any CPU.Build.0 = Release|Any CPU - {D54F1121-2C51-4DA3-90A1-8DDBA35123F7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D54F1121-2C51-4DA3-90A1-8DDBA35123F7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D54F1121-2C51-4DA3-90A1-8DDBA35123F7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D54F1121-2C51-4DA3-90A1-8DDBA35123F7}.Release|Any CPU.Build.0 = Release|Any CPU - {6D50807A-339D-45C0-9108-B80C7454A9BD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6D50807A-339D-45C0-9108-B80C7454A9BD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6D50807A-339D-45C0-9108-B80C7454A9BD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6D50807A-339D-45C0-9108-B80C7454A9BD}.Release|Any CPU.Build.0 = Release|Any CPU - {C01330E3-389B-43F6-997B-C77B509D013C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C01330E3-389B-43F6-997B-C77B509D013C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C01330E3-389B-43F6-997B-C77B509D013C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C01330E3-389B-43F6-997B-C77B509D013C}.Release|Any CPU.Build.0 = Release|Any CPU - {878B4628-2D22-47CF-8718-17BE075E0BD5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {878B4628-2D22-47CF-8718-17BE075E0BD5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {878B4628-2D22-47CF-8718-17BE075E0BD5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {878B4628-2D22-47CF-8718-17BE075E0BD5}.Release|Any CPU.Build.0 = Release|Any CPU - {CFAEA972-3D62-495A-85AA-B226CD936BCE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CFAEA972-3D62-495A-85AA-B226CD936BCE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CFAEA972-3D62-495A-85AA-B226CD936BCE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CFAEA972-3D62-495A-85AA-B226CD936BCE}.Release|Any CPU.Build.0 = Release|Any CPU - {05D6FE04-DC2B-403A-8FE5-2656BA2A4CA0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {05D6FE04-DC2B-403A-8FE5-2656BA2A4CA0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {05D6FE04-DC2B-403A-8FE5-2656BA2A4CA0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {05D6FE04-DC2B-403A-8FE5-2656BA2A4CA0}.Release|Any CPU.Build.0 = Release|Any CPU - {B0A1A291-12BF-4028-810F-0DC858E7321B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B0A1A291-12BF-4028-810F-0DC858E7321B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B0A1A291-12BF-4028-810F-0DC858E7321B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B0A1A291-12BF-4028-810F-0DC858E7321B}.Release|Any CPU.Build.0 = Release|Any CPU - {E12E550C-D85D-4769-8259-BDBD62B937B2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E12E550C-D85D-4769-8259-BDBD62B937B2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E12E550C-D85D-4769-8259-BDBD62B937B2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E12E550C-D85D-4769-8259-BDBD62B937B2}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {1263CB5B-BD80-4712-9DBA-C58746781237} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {28B8E1F2-D220-4B72-A032-9BAD6E4A6CD6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {2E642F88-ECFF-4316-953E-7A8D45E6FD40} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {41A8599F-3C54-44C4-BD7F-33CC529B1215} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {8B8C0C98-0943-4610-BBC9-64BB7FF285FC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {87342AD9-C96D-40E7-B4AD-D609E82F21E6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {13CE3A91-EDED-4622-B63E-2968A5A429C1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D54F1121-2C51-4DA3-90A1-8DDBA35123F7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6D50807A-339D-45C0-9108-B80C7454A9BD} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C01330E3-389B-43F6-997B-C77B509D013C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {878B4628-2D22-47CF-8718-17BE075E0BD5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {CFAEA972-3D62-495A-85AA-B226CD936BCE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {05D6FE04-DC2B-403A-8FE5-2656BA2A4CA0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B0A1A291-12BF-4028-810F-0DC858E7321B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E12E550C-D85D-4769-8259-BDBD62B937B2} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {87342AD9-C96D-40E7-B4AD-D609E82F21E6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {13CE3A91-EDED-4622-B63E-2968A5A429C1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D54F1121-2C51-4DA3-90A1-8DDBA35123F7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6D50807A-339D-45C0-9108-B80C7454A9BD} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C01330E3-389B-43F6-997B-C77B509D013C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {878B4628-2D22-47CF-8718-17BE075E0BD5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {CFAEA972-3D62-495A-85AA-B226CD936BCE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {05D6FE04-DC2B-403A-8FE5-2656BA2A4CA0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B0A1A291-12BF-4028-810F-0DC858E7321B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E12E550C-D85D-4769-8259-BDBD62B937B2} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {BA154E34-DDDF-4EE3-ACD4-711991136ECE} diff --git a/sdk/src/Services/S3/Generated/AmazonS3Config.cs b/sdk/src/Services/S3/Generated/AmazonS3Config.cs index b219c825fc4c..c82bd20871f7 100644 --- a/sdk/src/Services/S3/Generated/AmazonS3Config.cs +++ b/sdk/src/Services/S3/Generated/AmazonS3Config.cs @@ -34,16 +34,10 @@ namespace Amazon.S3 public partial class AmazonS3Config : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("S3", "4.0.0.0"); private static readonly AmazonS3EndpointResolver EndpointResolver = new AmazonS3EndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("S3", "3.7.403.5"); -======= - InternalSDKUtils.BuildUserAgentString("S3", "3.7.406.2"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/S3/Generated/_bcl/AmazonS3Client.cs b/sdk/src/Services/S3/Generated/_bcl/AmazonS3Client.cs index 527e5bbd62cf..94988255bcd0 100644 --- a/sdk/src/Services/S3/Generated/_bcl/AmazonS3Client.cs +++ b/sdk/src/Services/S3/Generated/_bcl/AmazonS3Client.cs @@ -307,7 +307,7 @@ protected override void Dispose(bool disposing) /// Directory buckets - If multipart uploads in a directory bucket are in progress, /// you can't delete the bucket until all the in-progress multipart uploads are aborted /// or completed. To delete these in-progress multipart uploads, use the ListMultipartUploads - /// operation to list the in-progress multipart uploads in the bucket and use the AbortMultupartUpload + /// operation to list the in-progress multipart uploads in the bucket and use the AbortMultipartUpload /// operation to abort all the in-progress multipart uploads. /// ///
  • @@ -409,7 +409,7 @@ public virtual AbortMultipartUploadResponse AbortMultipartUpload(string bucketNa /// Directory buckets - If multipart uploads in a directory bucket are in progress, /// you can't delete the bucket until all the in-progress multipart uploads are aborted /// or completed. To delete these in-progress multipart uploads, use the ListMultipartUploads - /// operation to list the in-progress multipart uploads in the bucket and use the AbortMultupartUpload + /// operation to list the in-progress multipart uploads in the bucket and use the AbortMultipartUpload /// operation to abort all the in-progress multipart uploads. /// ///
  • @@ -509,7 +509,7 @@ public virtual AbortMultipartUploadResponse AbortMultipartUpload(AbortMultipartU /// Directory buckets - If multipart uploads in a directory bucket are in progress, /// you can't delete the bucket until all the in-progress multipart uploads are aborted /// or completed. To delete these in-progress multipart uploads, use the ListMultipartUploads - /// operation to list the in-progress multipart uploads in the bucket and use the AbortMultupartUpload + /// operation to list the in-progress multipart uploads in the bucket and use the AbortMultipartUpload /// operation to abort all the in-progress multipart uploads. /// ///
  • @@ -614,7 +614,7 @@ public virtual AbortMultipartUploadResponse AbortMultipartUpload(AbortMultipartU /// Directory buckets - If multipart uploads in a directory bucket are in progress, /// you can't delete the bucket until all the in-progress multipart uploads are aborted /// or completed. To delete these in-progress multipart uploads, use the ListMultipartUploads - /// operation to list the in-progress multipart uploads in the bucket and use the AbortMultupartUpload + /// operation to list the in-progress multipart uploads in the bucket and use the AbortMultipartUpload /// operation to abort all the in-progress multipart uploads. /// ///
  • @@ -3966,7 +3966,7 @@ public virtual CopyPartResponse CopyPart(CopyPartRequest request) /// /// Only 1 customer /// managed key is supported per directory bucket for the lifetime of the bucket. - /// Amazon + /// The Amazon /// Web Services managed key (aws/s3) isn't supported. After you specify SSE-KMS /// as your bucket's default encryption configuration with a customer managed key, you /// can't change the customer managed key for the bucket's SSE-KMS configuration. @@ -4125,7 +4125,7 @@ public virtual CreateSessionResponse CreateSession(CreateSessionRequest request) /// /// Only 1 customer /// managed key is supported per directory bucket for the lifetime of the bucket. - /// Amazon + /// The Amazon /// Web Services managed key (aws/s3) isn't supported. After you specify SSE-KMS /// as your bucket's default encryption configuration with a customer managed key, you /// can't change the customer managed key for the bucket's SSE-KMS configuration. @@ -6558,79 +6558,40 @@ public virtual DeleteLifecycleConfigurationResponse DeleteLifecycleConfiguration /// - /// Removes an object from a bucket. The behavior depends on the bucket's versioning state: + /// Removes an object from a bucket. The behavior depends on the bucket's versioning state. + /// For more information, see Best + /// practices to consider before deleting an object. /// - /// - ///
    • - /// - /// If bucket versioning is not enabled, the operation permanently deletes the object. - /// - ///
    • - /// - /// If bucket versioning is enabled, the operation inserts a delete marker, which becomes - /// the current version of the object. To permanently delete an object in a versioned - /// bucket, you must include the object’s versionId in the request. For more information - /// about versioning-enabled buckets, see Deleting - /// object versions from a versioning-enabled bucket. - /// - ///
    • - /// - /// If bucket versioning is suspended, the operation removes the object that has a null - /// versionId, if there is one, and inserts a delete marker that becomes the current - /// version of the object. If there isn't an object with a null versionId, and - /// all versions of the object have a versionId, Amazon S3 does not remove the - /// object and only inserts a delete marker. To permanently delete an object that has - /// a versionId, you must include the object’s versionId in the request. - /// For more information about versioning-suspended buckets, see Deleting - /// objects from versioning-suspended buckets. - /// - ///
    • - /// - /// Directory buckets - S3 Versioning isn't enabled and supported for directory - /// buckets. For this API operation, only the null value of the version ID is supported - /// by directory buckets. You can only specify null to the versionId query - /// parameter in the request. - /// - ///
    • - /// - /// Directory buckets - For directory buckets, you must make requests for this - /// API operation to the Zonal endpoint. These endpoints support virtual-hosted-style - /// requests in the format https://bucket_name.s3express-az_id.region.amazonaws.com/key-name - /// . Path-style requests are not supported. For more information, see Regional - /// and Zonal endpoints in the Amazon S3 User Guide. - /// - ///
    + /// /// /// To remove a specific version, you must use the versionId query parameter. Using /// this query parameter permanently deletes the version. If the object deleted is a delete - /// marker, Amazon S3 sets the response header x-amz-delete-marker to true. - /// - /// - /// - /// If the object you want to delete is in a bucket where the bucket versioning configuration - /// is MFA Delete enabled, you must include the x-amz-mfa request header in the + /// marker, Amazon S3 sets the response header x-amz-delete-marker to true. If + /// the object you want to delete is in a bucket where the bucket versioning configuration + /// is MFA delete enabled, you must include the x-amz-mfa request header in the /// DELETE versionId request. Requests that include x-amz-mfa must use HTTPS. - /// For more information about MFA Delete, see Using - /// MFA Delete in the Amazon S3 User Guide. To see sample requests that use - /// versioning, see Sample - /// Request. + /// For more information about MFA delete and to see example requests, see Using + /// MFA delete and Sample + /// request in the Amazon S3 User Guide. /// - /// + ///
    • /// - /// Directory buckets - MFA delete is not supported by directory buckets. + /// S3 Versioning isn't enabled and supported for directory buckets. For this API operation, + /// only the null value of the version ID is supported by directory buckets. You + /// can only specify null to the versionId query parameter in the request. /// - /// + ///
    • /// - /// You can delete objects by explicitly calling DELETE Object or calling (PutBucketLifecycle) - /// to enable Amazon S3 to remove them for you. If you want to block users or accounts - /// from removing or deleting objects from your bucket, you must deny them the s3:DeleteObject, - /// s3:DeleteObjectVersion, and s3:PutLifeCycleConfiguration actions. + /// For directory buckets, you must make requests for this API operation to the Zonal + /// endpoint. These endpoints support virtual-hosted-style requests in the format https://bucket_name.s3express-az_id.region.amazonaws.com/key-name + /// . Path-style requests are not supported. For more information, see Regional + /// and Zonal endpoints in the Amazon S3 User Guide. /// - /// + ///
    • /// - /// Directory buckets - S3 Lifecycle is not supported by directory buckets. + /// MFA delete is not supported by directory buckets. /// - ///
      Permissions
      • + ///
      Permissions
      • /// /// General purpose bucket permissions - The following permissions are required /// in your policies when your DeleteObjects request includes specific headers. @@ -6640,26 +6601,27 @@ public virtual DeleteLifecycleConfigurationResponse DeleteLifecycleConfiguration /// s3:DeleteObject - To delete an object from a bucket, you must always /// have the s3:DeleteObject permission. /// - ///
      • + /// + /// + /// You can also use PutBucketLifecycle to delete objects in Amazon S3. + /// + ///
      • /// /// s3:DeleteObjectVersion - To delete a specific version of an object /// from a versioning-enabled bucket, you must have the s3:DeleteObjectVersion /// permission. /// + ///
      • + /// + /// If you want to block users or accounts from removing or deleting objects from your + /// bucket, you must deny them the s3:DeleteObject, s3:DeleteObjectVersion, + /// and s3:PutLifeCycleConfiguration permissions. + /// ///
    • /// - /// Directory bucket permissions - To grant access to this API operation on a - /// directory bucket, we recommend that you use the - /// CreateSession API operation for session-based authorization. Specifically, - /// you grant the s3express:CreateSession permission to the directory bucket in - /// a bucket policy or an IAM identity-based policy. Then, you make the CreateSession - /// API call on the bucket to obtain a session token. With the session token in your request - /// header, you can make API requests to this operation. After the session token expires, - /// you make another CreateSession API call to generate a new session token for - /// use. Amazon Web Services CLI or SDKs create session and refresh the session token - /// automatically to avoid service interruptions when a session expires. For more information - /// about authorization, see - /// CreateSession . + /// Directory buckets permissions - To grant access to this API operation on a + /// directory bucket, we recommend that you use the CreateSession API operation + /// for session-based authorization. /// ///
    HTTP Host header syntax
    /// @@ -6691,79 +6653,40 @@ public virtual DeleteObjectResponse DeleteObject(string bucketName, string key) /// - /// Removes an object from a bucket. The behavior depends on the bucket's versioning state: + /// Removes an object from a bucket. The behavior depends on the bucket's versioning state. + /// For more information, see Best + /// practices to consider before deleting an object. /// - /// - ///
    • - /// - /// If bucket versioning is not enabled, the operation permanently deletes the object. - /// - ///
    • - /// - /// If bucket versioning is enabled, the operation inserts a delete marker, which becomes - /// the current version of the object. To permanently delete an object in a versioned - /// bucket, you must include the object’s versionId in the request. For more information - /// about versioning-enabled buckets, see Deleting - /// object versions from a versioning-enabled bucket. - /// - ///
    • - /// - /// If bucket versioning is suspended, the operation removes the object that has a null - /// versionId, if there is one, and inserts a delete marker that becomes the current - /// version of the object. If there isn't an object with a null versionId, and - /// all versions of the object have a versionId, Amazon S3 does not remove the - /// object and only inserts a delete marker. To permanently delete an object that has - /// a versionId, you must include the object’s versionId in the request. - /// For more information about versioning-suspended buckets, see Deleting - /// objects from versioning-suspended buckets. - /// - ///
    • - /// - /// Directory buckets - S3 Versioning isn't enabled and supported for directory - /// buckets. For this API operation, only the null value of the version ID is supported - /// by directory buckets. You can only specify null to the versionId query - /// parameter in the request. - /// - ///
    • - /// - /// Directory buckets - For directory buckets, you must make requests for this - /// API operation to the Zonal endpoint. These endpoints support virtual-hosted-style - /// requests in the format https://bucket_name.s3express-az_id.region.amazonaws.com/key-name - /// . Path-style requests are not supported. For more information, see Regional - /// and Zonal endpoints in the Amazon S3 User Guide. - /// - ///
    + /// /// /// To remove a specific version, you must use the versionId query parameter. Using /// this query parameter permanently deletes the version. If the object deleted is a delete - /// marker, Amazon S3 sets the response header x-amz-delete-marker to true. - /// - /// - /// - /// If the object you want to delete is in a bucket where the bucket versioning configuration - /// is MFA Delete enabled, you must include the x-amz-mfa request header in the + /// marker, Amazon S3 sets the response header x-amz-delete-marker to true. If + /// the object you want to delete is in a bucket where the bucket versioning configuration + /// is MFA delete enabled, you must include the x-amz-mfa request header in the /// DELETE versionId request. Requests that include x-amz-mfa must use HTTPS. - /// For more information about MFA Delete, see Using - /// MFA Delete in the Amazon S3 User Guide. To see sample requests that use - /// versioning, see Sample - /// Request. + /// For more information about MFA delete and to see example requests, see Using + /// MFA delete and Sample + /// request in the Amazon S3 User Guide. /// - /// + ///
    • /// - /// Directory buckets - MFA delete is not supported by directory buckets. + /// S3 Versioning isn't enabled and supported for directory buckets. For this API operation, + /// only the null value of the version ID is supported by directory buckets. You + /// can only specify null to the versionId query parameter in the request. /// - /// + ///
    • /// - /// You can delete objects by explicitly calling DELETE Object or calling (PutBucketLifecycle) - /// to enable Amazon S3 to remove them for you. If you want to block users or accounts - /// from removing or deleting objects from your bucket, you must deny them the s3:DeleteObject, - /// s3:DeleteObjectVersion, and s3:PutLifeCycleConfiguration actions. + /// For directory buckets, you must make requests for this API operation to the Zonal + /// endpoint. These endpoints support virtual-hosted-style requests in the format https://bucket_name.s3express-az_id.region.amazonaws.com/key-name + /// . Path-style requests are not supported. For more information, see Regional + /// and Zonal endpoints in the Amazon S3 User Guide. /// - /// + ///
    • /// - /// Directory buckets - S3 Lifecycle is not supported by directory buckets. + /// MFA delete is not supported by directory buckets. /// - ///
      Permissions
      • + ///
      Permissions
      • /// /// General purpose bucket permissions - The following permissions are required /// in your policies when your DeleteObjects request includes specific headers. @@ -6773,26 +6696,27 @@ public virtual DeleteObjectResponse DeleteObject(string bucketName, string key) /// s3:DeleteObject - To delete an object from a bucket, you must always /// have the s3:DeleteObject permission. /// - ///
      • + /// + /// + /// You can also use PutBucketLifecycle to delete objects in Amazon S3. + /// + ///
      • /// /// s3:DeleteObjectVersion - To delete a specific version of an object /// from a versioning-enabled bucket, you must have the s3:DeleteObjectVersion /// permission. /// + ///
      • + /// + /// If you want to block users or accounts from removing or deleting objects from your + /// bucket, you must deny them the s3:DeleteObject, s3:DeleteObjectVersion, + /// and s3:PutLifeCycleConfiguration permissions. + /// ///
    • /// - /// Directory bucket permissions - To grant access to this API operation on a - /// directory bucket, we recommend that you use the - /// CreateSession API operation for session-based authorization. Specifically, - /// you grant the s3express:CreateSession permission to the directory bucket in - /// a bucket policy or an IAM identity-based policy. Then, you make the CreateSession - /// API call on the bucket to obtain a session token. With the session token in your request - /// header, you can make API requests to this operation. After the session token expires, - /// you make another CreateSession API call to generate a new session token for - /// use. Amazon Web Services CLI or SDKs create session and refresh the session token - /// automatically to avoid service interruptions when a session expires. For more information - /// about authorization, see - /// CreateSession . + /// Directory buckets permissions - To grant access to this API operation on a + /// directory bucket, we recommend that you use the CreateSession API operation + /// for session-based authorization. /// ///
    HTTP Host header syntax
    /// @@ -6826,79 +6750,40 @@ public virtual DeleteObjectResponse DeleteObject(string bucketName, string key, /// - /// Removes an object from a bucket. The behavior depends on the bucket's versioning state: - /// + /// Removes an object from a bucket. The behavior depends on the bucket's versioning state. + /// For more information, see Best + /// practices to consider before deleting an object. /// - ///
    • - /// - /// If bucket versioning is not enabled, the operation permanently deletes the object. - /// - ///
    • - /// - /// If bucket versioning is enabled, the operation inserts a delete marker, which becomes - /// the current version of the object. To permanently delete an object in a versioned - /// bucket, you must include the object’s versionId in the request. For more information - /// about versioning-enabled buckets, see Deleting - /// object versions from a versioning-enabled bucket. - /// - ///
    • - /// - /// If bucket versioning is suspended, the operation removes the object that has a null - /// versionId, if there is one, and inserts a delete marker that becomes the current - /// version of the object. If there isn't an object with a null versionId, and - /// all versions of the object have a versionId, Amazon S3 does not remove the - /// object and only inserts a delete marker. To permanently delete an object that has - /// a versionId, you must include the object’s versionId in the request. - /// For more information about versioning-suspended buckets, see Deleting - /// objects from versioning-suspended buckets. - /// - ///
    • - /// - /// Directory buckets - S3 Versioning isn't enabled and supported for directory - /// buckets. For this API operation, only the null value of the version ID is supported - /// by directory buckets. You can only specify null to the versionId query - /// parameter in the request. - /// - ///
    • - /// - /// Directory buckets - For directory buckets, you must make requests for this - /// API operation to the Zonal endpoint. These endpoints support virtual-hosted-style - /// requests in the format https://bucket_name.s3express-az_id.region.amazonaws.com/key-name - /// . Path-style requests are not supported. For more information, see Regional - /// and Zonal endpoints in the Amazon S3 User Guide. - /// - ///
    + /// /// /// To remove a specific version, you must use the versionId query parameter. Using /// this query parameter permanently deletes the version. If the object deleted is a delete - /// marker, Amazon S3 sets the response header x-amz-delete-marker to true. - /// - /// - /// - /// If the object you want to delete is in a bucket where the bucket versioning configuration - /// is MFA Delete enabled, you must include the x-amz-mfa request header in the + /// marker, Amazon S3 sets the response header x-amz-delete-marker to true. If + /// the object you want to delete is in a bucket where the bucket versioning configuration + /// is MFA delete enabled, you must include the x-amz-mfa request header in the /// DELETE versionId request. Requests that include x-amz-mfa must use HTTPS. - /// For more information about MFA Delete, see Using - /// MFA Delete in the Amazon S3 User Guide. To see sample requests that use - /// versioning, see Sample - /// Request. + /// For more information about MFA delete and to see example requests, see Using + /// MFA delete and Sample + /// request in the Amazon S3 User Guide. /// - /// + ///
    • /// - /// Directory buckets - MFA delete is not supported by directory buckets. + /// S3 Versioning isn't enabled and supported for directory buckets. For this API operation, + /// only the null value of the version ID is supported by directory buckets. You + /// can only specify null to the versionId query parameter in the request. /// - /// + ///
    • /// - /// You can delete objects by explicitly calling DELETE Object or calling (PutBucketLifecycle) - /// to enable Amazon S3 to remove them for you. If you want to block users or accounts - /// from removing or deleting objects from your bucket, you must deny them the s3:DeleteObject, - /// s3:DeleteObjectVersion, and s3:PutLifeCycleConfiguration actions. + /// For directory buckets, you must make requests for this API operation to the Zonal + /// endpoint. These endpoints support virtual-hosted-style requests in the format https://bucket_name.s3express-az_id.region.amazonaws.com/key-name + /// . Path-style requests are not supported. For more information, see Regional + /// and Zonal endpoints in the Amazon S3 User Guide. /// - /// + ///
    • /// - /// Directory buckets - S3 Lifecycle is not supported by directory buckets. + /// MFA delete is not supported by directory buckets. /// - ///
      Permissions
      • + ///
      Permissions
      • /// /// General purpose bucket permissions - The following permissions are required /// in your policies when your DeleteObjects request includes specific headers. @@ -6908,26 +6793,27 @@ public virtual DeleteObjectResponse DeleteObject(string bucketName, string key, /// s3:DeleteObject - To delete an object from a bucket, you must always /// have the s3:DeleteObject permission. /// - ///
      • + /// + /// + /// You can also use PutBucketLifecycle to delete objects in Amazon S3. + /// + ///
      • /// /// s3:DeleteObjectVersion - To delete a specific version of an object /// from a versioning-enabled bucket, you must have the s3:DeleteObjectVersion /// permission. /// + ///
      • + /// + /// If you want to block users or accounts from removing or deleting objects from your + /// bucket, you must deny them the s3:DeleteObject, s3:DeleteObjectVersion, + /// and s3:PutLifeCycleConfiguration permissions. + /// ///
    • /// - /// Directory bucket permissions - To grant access to this API operation on a - /// directory bucket, we recommend that you use the - /// CreateSession API operation for session-based authorization. Specifically, - /// you grant the s3express:CreateSession permission to the directory bucket in - /// a bucket policy or an IAM identity-based policy. Then, you make the CreateSession - /// API call on the bucket to obtain a session token. With the session token in your request - /// header, you can make API requests to this operation. After the session token expires, - /// you make another CreateSession API call to generate a new session token for - /// use. Amazon Web Services CLI or SDKs create session and refresh the session token - /// automatically to avoid service interruptions when a session expires. For more information - /// about authorization, see - /// CreateSession . + /// Directory buckets permissions - To grant access to this API operation on a + /// directory bucket, we recommend that you use the CreateSession API operation + /// for session-based authorization. /// ///
    HTTP Host header syntax
    /// @@ -6959,79 +6845,40 @@ public virtual DeleteObjectResponse DeleteObject(DeleteObjectRequest request) /// - /// Removes an object from a bucket. The behavior depends on the bucket's versioning state: - /// + /// Removes an object from a bucket. The behavior depends on the bucket's versioning state. + /// For more information, see Best + /// practices to consider before deleting an object. /// - ///
    • - /// - /// If bucket versioning is not enabled, the operation permanently deletes the object. - /// - ///
    • - /// - /// If bucket versioning is enabled, the operation inserts a delete marker, which becomes - /// the current version of the object. To permanently delete an object in a versioned - /// bucket, you must include the object’s versionId in the request. For more information - /// about versioning-enabled buckets, see Deleting - /// object versions from a versioning-enabled bucket. - /// - ///
    • - /// - /// If bucket versioning is suspended, the operation removes the object that has a null - /// versionId, if there is one, and inserts a delete marker that becomes the current - /// version of the object. If there isn't an object with a null versionId, and - /// all versions of the object have a versionId, Amazon S3 does not remove the - /// object and only inserts a delete marker. To permanently delete an object that has - /// a versionId, you must include the object’s versionId in the request. - /// For more information about versioning-suspended buckets, see Deleting - /// objects from versioning-suspended buckets. - /// - ///
    • - /// - /// Directory buckets - S3 Versioning isn't enabled and supported for directory - /// buckets. For this API operation, only the null value of the version ID is supported - /// by directory buckets. You can only specify null to the versionId query - /// parameter in the request. - /// - ///
    • - /// - /// Directory buckets - For directory buckets, you must make requests for this - /// API operation to the Zonal endpoint. These endpoints support virtual-hosted-style - /// requests in the format https://bucket_name.s3express-az_id.region.amazonaws.com/key-name - /// . Path-style requests are not supported. For more information, see Regional - /// and Zonal endpoints in the Amazon S3 User Guide. - /// - ///
    + /// /// /// To remove a specific version, you must use the versionId query parameter. Using /// this query parameter permanently deletes the version. If the object deleted is a delete - /// marker, Amazon S3 sets the response header x-amz-delete-marker to true. - /// - /// - /// - /// If the object you want to delete is in a bucket where the bucket versioning configuration - /// is MFA Delete enabled, you must include the x-amz-mfa request header in the + /// marker, Amazon S3 sets the response header x-amz-delete-marker to true. If + /// the object you want to delete is in a bucket where the bucket versioning configuration + /// is MFA delete enabled, you must include the x-amz-mfa request header in the /// DELETE versionId request. Requests that include x-amz-mfa must use HTTPS. - /// For more information about MFA Delete, see Using - /// MFA Delete in the Amazon S3 User Guide. To see sample requests that use - /// versioning, see Sample - /// Request. + /// For more information about MFA delete and to see example requests, see Using + /// MFA delete and Sample + /// request in the Amazon S3 User Guide. /// - /// + ///
    • /// - /// Directory buckets - MFA delete is not supported by directory buckets. + /// S3 Versioning isn't enabled and supported for directory buckets. For this API operation, + /// only the null value of the version ID is supported by directory buckets. You + /// can only specify null to the versionId query parameter in the request. /// - /// + ///
    • /// - /// You can delete objects by explicitly calling DELETE Object or calling (PutBucketLifecycle) - /// to enable Amazon S3 to remove them for you. If you want to block users or accounts - /// from removing or deleting objects from your bucket, you must deny them the s3:DeleteObject, - /// s3:DeleteObjectVersion, and s3:PutLifeCycleConfiguration actions. + /// For directory buckets, you must make requests for this API operation to the Zonal + /// endpoint. These endpoints support virtual-hosted-style requests in the format https://bucket_name.s3express-az_id.region.amazonaws.com/key-name + /// . Path-style requests are not supported. For more information, see Regional + /// and Zonal endpoints in the Amazon S3 User Guide. /// - /// + ///
    • /// - /// Directory buckets - S3 Lifecycle is not supported by directory buckets. + /// MFA delete is not supported by directory buckets. /// - ///
      Permissions
      • + ///
      Permissions
      • /// /// General purpose bucket permissions - The following permissions are required /// in your policies when your DeleteObjects request includes specific headers. @@ -7041,26 +6888,27 @@ public virtual DeleteObjectResponse DeleteObject(DeleteObjectRequest request) /// s3:DeleteObject - To delete an object from a bucket, you must always /// have the s3:DeleteObject permission. /// - ///
      • + /// + /// + /// You can also use PutBucketLifecycle to delete objects in Amazon S3. + /// + ///
      • /// /// s3:DeleteObjectVersion - To delete a specific version of an object /// from a versioning-enabled bucket, you must have the s3:DeleteObjectVersion /// permission. /// + ///
      • + /// + /// If you want to block users or accounts from removing or deleting objects from your + /// bucket, you must deny them the s3:DeleteObject, s3:DeleteObjectVersion, + /// and s3:PutLifeCycleConfiguration permissions. + /// ///
    • /// - /// Directory bucket permissions - To grant access to this API operation on a - /// directory bucket, we recommend that you use the - /// CreateSession API operation for session-based authorization. Specifically, - /// you grant the s3express:CreateSession permission to the directory bucket in - /// a bucket policy or an IAM identity-based policy. Then, you make the CreateSession - /// API call on the bucket to obtain a session token. With the session token in your request - /// header, you can make API requests to this operation. After the session token expires, - /// you make another CreateSession API call to generate a new session token for - /// use. Amazon Web Services CLI or SDKs create session and refresh the session token - /// automatically to avoid service interruptions when a session expires. For more information - /// about authorization, see - /// CreateSession . + /// Directory buckets permissions - To grant access to this API operation on a + /// directory bucket, we recommend that you use the CreateSession API operation + /// for session-based authorization. /// ///
    HTTP Host header syntax
    /// @@ -7095,79 +6943,40 @@ public virtual DeleteObjectResponse DeleteObject(DeleteObjectRequest request) /// - /// Removes an object from a bucket. The behavior depends on the bucket's versioning state: + /// Removes an object from a bucket. The behavior depends on the bucket's versioning state. + /// For more information, see Best + /// practices to consider before deleting an object. /// - /// - ///
    • - /// - /// If bucket versioning is not enabled, the operation permanently deletes the object. - /// - ///
    • - /// - /// If bucket versioning is enabled, the operation inserts a delete marker, which becomes - /// the current version of the object. To permanently delete an object in a versioned - /// bucket, you must include the object’s versionId in the request. For more information - /// about versioning-enabled buckets, see Deleting - /// object versions from a versioning-enabled bucket. - /// - ///
    • - /// - /// If bucket versioning is suspended, the operation removes the object that has a null - /// versionId, if there is one, and inserts a delete marker that becomes the current - /// version of the object. If there isn't an object with a null versionId, and - /// all versions of the object have a versionId, Amazon S3 does not remove the - /// object and only inserts a delete marker. To permanently delete an object that has - /// a versionId, you must include the object’s versionId in the request. - /// For more information about versioning-suspended buckets, see Deleting - /// objects from versioning-suspended buckets. - /// - ///
    • - /// - /// Directory buckets - S3 Versioning isn't enabled and supported for directory - /// buckets. For this API operation, only the null value of the version ID is supported - /// by directory buckets. You can only specify null to the versionId query - /// parameter in the request. - /// - ///
    • - /// - /// Directory buckets - For directory buckets, you must make requests for this - /// API operation to the Zonal endpoint. These endpoints support virtual-hosted-style - /// requests in the format https://bucket_name.s3express-az_id.region.amazonaws.com/key-name - /// . Path-style requests are not supported. For more information, see Regional - /// and Zonal endpoints in the Amazon S3 User Guide. - /// - ///
    + /// /// /// To remove a specific version, you must use the versionId query parameter. Using /// this query parameter permanently deletes the version. If the object deleted is a delete - /// marker, Amazon S3 sets the response header x-amz-delete-marker to true. - /// - /// - /// - /// If the object you want to delete is in a bucket where the bucket versioning configuration - /// is MFA Delete enabled, you must include the x-amz-mfa request header in the + /// marker, Amazon S3 sets the response header x-amz-delete-marker to true. If + /// the object you want to delete is in a bucket where the bucket versioning configuration + /// is MFA delete enabled, you must include the x-amz-mfa request header in the /// DELETE versionId request. Requests that include x-amz-mfa must use HTTPS. - /// For more information about MFA Delete, see Using - /// MFA Delete in the Amazon S3 User Guide. To see sample requests that use - /// versioning, see Sample - /// Request. + /// For more information about MFA delete and to see example requests, see Using + /// MFA delete and Sample + /// request in the Amazon S3 User Guide. /// - /// + ///
    • /// - /// Directory buckets - MFA delete is not supported by directory buckets. + /// S3 Versioning isn't enabled and supported for directory buckets. For this API operation, + /// only the null value of the version ID is supported by directory buckets. You + /// can only specify null to the versionId query parameter in the request. /// - /// + ///
    • /// - /// You can delete objects by explicitly calling DELETE Object or calling (PutBucketLifecycle) - /// to enable Amazon S3 to remove them for you. If you want to block users or accounts - /// from removing or deleting objects from your bucket, you must deny them the s3:DeleteObject, - /// s3:DeleteObjectVersion, and s3:PutLifeCycleConfiguration actions. + /// For directory buckets, you must make requests for this API operation to the Zonal + /// endpoint. These endpoints support virtual-hosted-style requests in the format https://bucket_name.s3express-az_id.region.amazonaws.com/key-name + /// . Path-style requests are not supported. For more information, see Regional + /// and Zonal endpoints in the Amazon S3 User Guide. /// - /// + ///
    • /// - /// Directory buckets - S3 Lifecycle is not supported by directory buckets. + /// MFA delete is not supported by directory buckets. /// - ///
      Permissions
      • + ///
      Permissions
      • /// /// General purpose bucket permissions - The following permissions are required /// in your policies when your DeleteObjects request includes specific headers. @@ -7177,26 +6986,27 @@ public virtual DeleteObjectResponse DeleteObject(DeleteObjectRequest request) /// s3:DeleteObject - To delete an object from a bucket, you must always /// have the s3:DeleteObject permission. /// - ///
      • + /// + /// + /// You can also use PutBucketLifecycle to delete objects in Amazon S3. + /// + ///
      • /// /// s3:DeleteObjectVersion - To delete a specific version of an object /// from a versioning-enabled bucket, you must have the s3:DeleteObjectVersion /// permission. /// + ///
      • + /// + /// If you want to block users or accounts from removing or deleting objects from your + /// bucket, you must deny them the s3:DeleteObject, s3:DeleteObjectVersion, + /// and s3:PutLifeCycleConfiguration permissions. + /// ///
    • /// - /// Directory bucket permissions - To grant access to this API operation on a - /// directory bucket, we recommend that you use the - /// CreateSession API operation for session-based authorization. Specifically, - /// you grant the s3express:CreateSession permission to the directory bucket in - /// a bucket policy or an IAM identity-based policy. Then, you make the CreateSession - /// API call on the bucket to obtain a session token. With the session token in your request - /// header, you can make API requests to this operation. After the session token expires, - /// you make another CreateSession API call to generate a new session token for - /// use. Amazon Web Services CLI or SDKs create session and refresh the session token - /// automatically to avoid service interruptions when a session expires. For more information - /// about authorization, see - /// CreateSession . + /// Directory buckets permissions - To grant access to this API operation on a + /// directory bucket, we recommend that you use the CreateSession API operation + /// for session-based authorization. /// ///
    HTTP Host header syntax
    /// @@ -7233,79 +7043,40 @@ public virtual DeleteObjectResponse DeleteObject(DeleteObjectRequest request) /// - /// Removes an object from a bucket. The behavior depends on the bucket's versioning state: + /// Removes an object from a bucket. The behavior depends on the bucket's versioning state. + /// For more information, see Best + /// practices to consider before deleting an object. /// - /// - ///
    • - /// - /// If bucket versioning is not enabled, the operation permanently deletes the object. - /// - ///
    • - /// - /// If bucket versioning is enabled, the operation inserts a delete marker, which becomes - /// the current version of the object. To permanently delete an object in a versioned - /// bucket, you must include the object’s versionId in the request. For more information - /// about versioning-enabled buckets, see Deleting - /// object versions from a versioning-enabled bucket. - /// - ///
    • - /// - /// If bucket versioning is suspended, the operation removes the object that has a null - /// versionId, if there is one, and inserts a delete marker that becomes the current - /// version of the object. If there isn't an object with a null versionId, and - /// all versions of the object have a versionId, Amazon S3 does not remove the - /// object and only inserts a delete marker. To permanently delete an object that has - /// a versionId, you must include the object’s versionId in the request. - /// For more information about versioning-suspended buckets, see Deleting - /// objects from versioning-suspended buckets. - /// - ///
    • - /// - /// Directory buckets - S3 Versioning isn't enabled and supported for directory - /// buckets. For this API operation, only the null value of the version ID is supported - /// by directory buckets. You can only specify null to the versionId query - /// parameter in the request. - /// - ///
    • - /// - /// Directory buckets - For directory buckets, you must make requests for this - /// API operation to the Zonal endpoint. These endpoints support virtual-hosted-style - /// requests in the format https://bucket_name.s3express-az_id.region.amazonaws.com/key-name - /// . Path-style requests are not supported. For more information, see Regional - /// and Zonal endpoints in the Amazon S3 User Guide. - /// - ///
    + /// /// /// To remove a specific version, you must use the versionId query parameter. Using /// this query parameter permanently deletes the version. If the object deleted is a delete - /// marker, Amazon S3 sets the response header x-amz-delete-marker to true. - /// - /// - /// - /// If the object you want to delete is in a bucket where the bucket versioning configuration - /// is MFA Delete enabled, you must include the x-amz-mfa request header in the + /// marker, Amazon S3 sets the response header x-amz-delete-marker to true. If + /// the object you want to delete is in a bucket where the bucket versioning configuration + /// is MFA delete enabled, you must include the x-amz-mfa request header in the /// DELETE versionId request. Requests that include x-amz-mfa must use HTTPS. - /// For more information about MFA Delete, see Using - /// MFA Delete in the Amazon S3 User Guide. To see sample requests that use - /// versioning, see Sample - /// Request. + /// For more information about MFA delete and to see example requests, see Using + /// MFA delete and Sample + /// request in the Amazon S3 User Guide. /// - /// + ///
    • /// - /// Directory buckets - MFA delete is not supported by directory buckets. + /// S3 Versioning isn't enabled and supported for directory buckets. For this API operation, + /// only the null value of the version ID is supported by directory buckets. You + /// can only specify null to the versionId query parameter in the request. /// - /// + ///
    • /// - /// You can delete objects by explicitly calling DELETE Object or calling (PutBucketLifecycle) - /// to enable Amazon S3 to remove them for you. If you want to block users or accounts - /// from removing or deleting objects from your bucket, you must deny them the s3:DeleteObject, - /// s3:DeleteObjectVersion, and s3:PutLifeCycleConfiguration actions. + /// For directory buckets, you must make requests for this API operation to the Zonal + /// endpoint. These endpoints support virtual-hosted-style requests in the format https://bucket_name.s3express-az_id.region.amazonaws.com/key-name + /// . Path-style requests are not supported. For more information, see Regional + /// and Zonal endpoints in the Amazon S3 User Guide. /// - /// + ///
    • /// - /// Directory buckets - S3 Lifecycle is not supported by directory buckets. + /// MFA delete is not supported by directory buckets. /// - ///
      Permissions
      • + ///
      Permissions
      • /// /// General purpose bucket permissions - The following permissions are required /// in your policies when your DeleteObjects request includes specific headers. @@ -7315,26 +7086,27 @@ public virtual DeleteObjectResponse DeleteObject(DeleteObjectRequest request) /// s3:DeleteObject - To delete an object from a bucket, you must always /// have the s3:DeleteObject permission. /// - ///
      • + /// + /// + /// You can also use PutBucketLifecycle to delete objects in Amazon S3. + /// + ///
      • /// /// s3:DeleteObjectVersion - To delete a specific version of an object /// from a versioning-enabled bucket, you must have the s3:DeleteObjectVersion /// permission. /// + ///
      • + /// + /// If you want to block users or accounts from removing or deleting objects from your + /// bucket, you must deny them the s3:DeleteObject, s3:DeleteObjectVersion, + /// and s3:PutLifeCycleConfiguration permissions. + /// ///
    • /// - /// Directory bucket permissions - To grant access to this API operation on a - /// directory bucket, we recommend that you use the - /// CreateSession API operation for session-based authorization. Specifically, - /// you grant the s3express:CreateSession permission to the directory bucket in - /// a bucket policy or an IAM identity-based policy. Then, you make the CreateSession - /// API call on the bucket to obtain a session token. With the session token in your request - /// header, you can make API requests to this operation. After the session token expires, - /// you make another CreateSession API call to generate a new session token for - /// use. Amazon Web Services CLI or SDKs create session and refresh the session token - /// automatically to avoid service interruptions when a session expires. For more information - /// about authorization, see - /// CreateSession . + /// Directory buckets permissions - To grant access to this API operation on a + /// directory bucket, we recommend that you use the CreateSession API operation + /// for session-based authorization. /// ///
    HTTP Host header syntax
    /// @@ -13626,6 +13398,9 @@ public virtual GetObjectLockConfigurationResponse GetObjectLockConfiguration(Get /// s3:GetObject permission. You need the relevant read object (or version) permission /// for this operation. For more information, see Actions, /// resources, and condition keys for Amazon S3 in the Amazon S3 User Guide. + /// For more information about the permissions to S3 API operations by S3 resource types, + /// see Required + /// permissions for Amazon S3 API operations in the Amazon S3 User Guide. /// /// /// @@ -13795,6 +13570,9 @@ public virtual GetObjectMetadataResponse GetObjectMetadata(string bucketName, st /// s3:GetObject permission. You need the relevant read object (or version) permission /// for this operation. For more information, see Actions, /// resources, and condition keys for Amazon S3 in the Amazon S3 User Guide. + /// For more information about the permissions to S3 API operations by S3 resource types, + /// see Required + /// permissions for Amazon S3 API operations in the Amazon S3 User Guide. /// /// /// @@ -13966,6 +13744,9 @@ public virtual GetObjectMetadataResponse GetObjectMetadata(string bucketName, st /// s3:GetObject permission. You need the relevant read object (or version) permission /// for this operation. For more information, see Actions, /// resources, and condition keys for Amazon S3 in the Amazon S3 User Guide. + /// For more information about the permissions to S3 API operations by S3 resource types, + /// see Required + /// permissions for Amazon S3 API operations in the Amazon S3 User Guide. /// /// /// @@ -14135,6 +13916,9 @@ public virtual GetObjectMetadataResponse GetObjectMetadata(GetObjectMetadataRequ /// s3:GetObject permission. You need the relevant read object (or version) permission /// for this operation. For more information, see Actions, /// resources, and condition keys for Amazon S3 in the Amazon S3 User Guide. + /// For more information about the permissions to S3 API operations by S3 resource types, + /// see Required + /// permissions for Amazon S3 API operations in the Amazon S3 User Guide. /// /// /// @@ -14307,6 +14091,9 @@ public virtual GetObjectMetadataResponse GetObjectMetadata(GetObjectMetadataRequ /// s3:GetObject permission. You need the relevant read object (or version) permission /// for this operation. For more information, see Actions, /// resources, and condition keys for Amazon S3 in the Amazon S3 User Guide. + /// For more information about the permissions to S3 API operations by S3 resource types, + /// see Required + /// permissions for Amazon S3 API operations in the Amazon S3 User Guide. /// /// /// @@ -14481,6 +14268,9 @@ public virtual GetObjectMetadataResponse GetObjectMetadata(GetObjectMetadataRequ /// s3:GetObject permission. You need the relevant read object (or version) permission /// for this operation. For more information, see Actions, /// resources, and condition keys for Amazon S3 in the Amazon S3 User Guide. + /// For more information about the permissions to S3 API operations by S3 resource types, + /// see Required + /// permissions for Amazon S3 API operations in the Amazon S3 User Guide. /// /// /// @@ -17048,6 +16838,16 @@ public virtual ListBucketMetricsConfigurationsResponse ListBucketMetricsConfigur /// For information about Amazon S3 buckets, see Creating, /// configuring, and working with Amazon S3 buckets. /// + /// + /// + /// We strongly recommend using only paginated requests. Unpaginated requests are only + /// supported for Amazon Web Services accounts set to the default general purpose bucket + /// quota of 10,000. If you have an approved general purpose bucket quota above 10,000, + /// you must send paginated requests to list your account’s buckets. All unpaginated ListBuckets + /// requests will be rejected for Amazon Web Services accounts with a general purpose + /// bucket quota greater than 10,000. + /// + /// ///
    /// /// The response from the ListBuckets service method, as returned by S3. @@ -17073,6 +16873,16 @@ public virtual ListBucketsResponse ListBuckets() /// For information about Amazon S3 buckets, see Creating, /// configuring, and working with Amazon S3 buckets. ///     + /// + /// + /// We strongly recommend using only paginated requests. Unpaginated requests are only + /// supported for Amazon Web Services accounts set to the default general purpose bucket + /// quota of 10,000. If you have an approved general purpose bucket quota above 10,000, + /// you must send paginated requests to list your account’s buckets. All unpaginated ListBuckets + /// requests will be rejected for Amazon Web Services accounts with a general purpose + /// bucket quota greater than 10,000. + /// + /// ///
    • /// Container for the necessary parameters to execute the ListBuckets service method. /// @@ -17103,6 +16913,16 @@ public virtual ListBucketsResponse ListBuckets(ListBucketsRequest request) /// For information about Amazon S3 buckets, see Creating, /// configuring, and working with Amazon S3 buckets. /// + /// + /// + /// We strongly recommend using only paginated requests. Unpaginated requests are only + /// supported for Amazon Web Services accounts set to the default general purpose bucket + /// quota of 10,000. If you have an approved general purpose bucket quota above 10,000, + /// you must send paginated requests to list your account’s buckets. All unpaginated ListBuckets + /// requests will be rejected for Amazon Web Services accounts with a general purpose + /// bucket quota greater than 10,000. + /// + /// ///     /// /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. @@ -17130,6 +16950,16 @@ public virtual ListBucketsResponse ListBuckets(ListBucketsRequest request) /// For information about Amazon S3 buckets, see Creating, /// configuring, and working with Amazon S3 buckets. /// + /// + /// + /// We strongly recommend using only paginated requests. Unpaginated requests are only + /// supported for Amazon Web Services accounts set to the default general purpose bucket + /// quota of 10,000. If you have an approved general purpose bucket quota above 10,000, + /// you must send paginated requests to list your account’s buckets. All unpaginated ListBuckets + /// requests will be rejected for Amazon Web Services accounts with a general purpose + /// bucket quota greater than 10,000. + /// + /// ///     /// Container for the necessary parameters to execute the ListBuckets service method. /// @@ -17180,7 +17010,12 @@ public virtual ListBucketsResponse ListBuckets(ListBucketsRequest request) /// /// Directory buckets - The HTTP Host header syntax is s3express-control.region.amazonaws.com. /// - /// + /// + /// + /// The BucketRegion response element is not part of the ListDirectoryBuckets + /// Response Syntax. + /// + /// ///     /// Container for the necessary parameters to execute the ListDirectoryBuckets service method. /// @@ -17224,7 +17059,12 @@ public virtual ListDirectoryBucketsResponse ListDirectoryBuckets(ListDirectoryBu /// /// Directory buckets - The HTTP Host header syntax is s3express-control.region.amazonaws.com. /// - /// + /// + /// + /// The BucketRegion response element is not part of the ListDirectoryBuckets + /// Response Syntax. + /// + /// ///     /// Container for the necessary parameters to execute the ListDirectoryBuckets service method. /// @@ -17257,7 +17097,7 @@ public virtual ListDirectoryBucketsResponse ListDirectoryBuckets(ListDirectoryBu /// Directory buckets - If multipart uploads in a directory bucket are in progress, /// you can't delete the bucket until all the in-progress multipart uploads are aborted /// or completed. To delete these in-progress multipart uploads, use the ListMultipartUploads - /// operation to list the in-progress multipart uploads in the bucket and use the AbortMultupartUpload + /// operation to list the in-progress multipart uploads in the bucket and use the AbortMultipartUpload /// operation to abort all the in-progress multipart uploads. /// /// @@ -17395,7 +17235,7 @@ public virtual ListMultipartUploadsResponse ListMultipartUploads(string bucketNa /// Directory buckets - If multipart uploads in a directory bucket are in progress, /// you can't delete the bucket until all the in-progress multipart uploads are aborted /// or completed. To delete these in-progress multipart uploads, use the ListMultipartUploads - /// operation to list the in-progress multipart uploads in the bucket and use the AbortMultupartUpload + /// operation to list the in-progress multipart uploads in the bucket and use the AbortMultipartUpload /// operation to abort all the in-progress multipart uploads. /// /// @@ -17535,7 +17375,7 @@ public virtual ListMultipartUploadsResponse ListMultipartUploads(string bucketNa /// Directory buckets - If multipart uploads in a directory bucket are in progress, /// you can't delete the bucket until all the in-progress multipart uploads are aborted /// or completed. To delete these in-progress multipart uploads, use the ListMultipartUploads - /// operation to list the in-progress multipart uploads in the bucket and use the AbortMultupartUpload + /// operation to list the in-progress multipart uploads in the bucket and use the AbortMultipartUpload /// operation to abort all the in-progress multipart uploads. /// /// @@ -17675,7 +17515,7 @@ public virtual ListMultipartUploadsResponse ListMultipartUploads(ListMultipartUp /// Directory buckets - If multipart uploads in a directory bucket are in progress, /// you can't delete the bucket until all the in-progress multipart uploads are aborted /// or completed. To delete these in-progress multipart uploads, use the ListMultipartUploads - /// operation to list the in-progress multipart uploads in the bucket and use the AbortMultupartUpload + /// operation to list the in-progress multipart uploads in the bucket and use the AbortMultipartUpload /// operation to abort all the in-progress multipart uploads. /// /// @@ -17816,7 +17656,7 @@ public virtual ListMultipartUploadsResponse ListMultipartUploads(ListMultipartUp /// Directory buckets - If multipart uploads in a directory bucket are in progress, /// you can't delete the bucket until all the in-progress multipart uploads are aborted /// or completed. To delete these in-progress multipart uploads, use the ListMultipartUploads - /// operation to list the in-progress multipart uploads in the bucket and use the AbortMultupartUpload + /// operation to list the in-progress multipart uploads in the bucket and use the AbortMultipartUpload /// operation to abort all the in-progress multipart uploads. /// /// @@ -17959,7 +17799,7 @@ public virtual ListMultipartUploadsResponse ListMultipartUploads(ListMultipartUp /// Directory buckets - If multipart uploads in a directory bucket are in progress, /// you can't delete the bucket until all the in-progress multipart uploads are aborted /// or completed. To delete these in-progress multipart uploads, use the ListMultipartUploads - /// operation to list the in-progress multipart uploads in the bucket and use the AbortMultupartUpload + /// operation to list the in-progress multipart uploads in the bucket and use the AbortMultipartUpload /// operation to abort all the in-progress multipart uploads. /// /// @@ -21183,7 +21023,7 @@ public virtual PutBucketAnalyticsConfigurationResponse PutBucketAnalyticsConfigu ///
  • /// /// Your SSE-KMS configuration can only support 1 customer - /// managed key per directory bucket for the lifetime of the bucket. Amazon + /// managed key per directory bucket for the lifetime of the bucket. The Amazon /// Web Services managed key (aws/s3) isn't supported. /// ///
  • @@ -21338,7 +21178,7 @@ public virtual PutBucketEncryptionResponse PutBucketEncryption(PutBucketEncrypti ///
  • /// /// Your SSE-KMS configuration can only support 1 customer - /// managed key per directory bucket for the lifetime of the bucket. Amazon + /// managed key per directory bucket for the lifetime of the bucket. The Amazon /// Web Services managed key (aws/s3) isn't supported. /// ///
  • @@ -25147,20 +24987,23 @@ public virtual PutCORSConfigurationResponse PutCORSConfiguration(PutCORSConfigur /// lifecycle configuration. For information about lifecycle configuration, see Managing /// your storage lifecycle. /// - /// + ///
    Rules
    /// - /// Bucket lifecycle configuration now supports specifying a lifecycle rule using an object + /// You specify the lifecycle configuration in your request body. The lifecycle configuration + /// is specified as XML consisting of one or more rules. An Amazon S3 Lifecycle configuration + /// can have up to 1,000 rules. This limit is not adjustable. + /// + /// + /// + /// Bucket lifecycle configuration supports specifying a lifecycle rule using an object /// key name prefix, one or more object tags, object size, or any combination of these. /// Accordingly, this section describes the latest API. The previous version of the API /// supported filtering based only on an object key name prefix, which is supported for /// backward compatibility. For the related API description, see PutBucketLifecycle. /// - ///
    Rules
    + /// /// - /// You specify the lifecycle configuration in your request body. The lifecycle configuration - /// is specified as XML consisting of one or more rules. An Amazon S3 Lifecycle configuration - /// can have up to 1,000 rules. This limit is not adjustable. Each rule consists of the - /// following: + /// A lifecycle rule consists of the following: /// ///
    • /// @@ -25265,20 +25108,23 @@ public virtual PutLifecycleConfigurationResponse PutLifecycleConfiguration(strin /// lifecycle configuration. For information about lifecycle configuration, see Managing /// your storage lifecycle. /// - /// + ///
      Rules
      /// - /// Bucket lifecycle configuration now supports specifying a lifecycle rule using an object + /// You specify the lifecycle configuration in your request body. The lifecycle configuration + /// is specified as XML consisting of one or more rules. An Amazon S3 Lifecycle configuration + /// can have up to 1,000 rules. This limit is not adjustable. + /// + /// + /// + /// Bucket lifecycle configuration supports specifying a lifecycle rule using an object /// key name prefix, one or more object tags, object size, or any combination of these. /// Accordingly, this section describes the latest API. The previous version of the API /// supported filtering based only on an object key name prefix, which is supported for /// backward compatibility. For the related API description, see PutBucketLifecycle. /// - ///
      Rules
      + /// /// - /// You specify the lifecycle configuration in your request body. The lifecycle configuration - /// is specified as XML consisting of one or more rules. An Amazon S3 Lifecycle configuration - /// can have up to 1,000 rules. This limit is not adjustable. Each rule consists of the - /// following: + /// A lifecycle rule consists of the following: /// ///
      • /// @@ -25383,20 +25229,23 @@ public virtual PutLifecycleConfigurationResponse PutLifecycleConfiguration(PutLi /// lifecycle configuration. For information about lifecycle configuration, see Managing /// your storage lifecycle. /// - /// + ///
        Rules
        /// - /// Bucket lifecycle configuration now supports specifying a lifecycle rule using an object + /// You specify the lifecycle configuration in your request body. The lifecycle configuration + /// is specified as XML consisting of one or more rules. An Amazon S3 Lifecycle configuration + /// can have up to 1,000 rules. This limit is not adjustable. + /// + /// + /// + /// Bucket lifecycle configuration supports specifying a lifecycle rule using an object /// key name prefix, one or more object tags, object size, or any combination of these. /// Accordingly, this section describes the latest API. The previous version of the API /// supported filtering based only on an object key name prefix, which is supported for /// backward compatibility. For the related API description, see PutBucketLifecycle. /// - ///
        Rules
        + /// /// - /// You specify the lifecycle configuration in your request body. The lifecycle configuration - /// is specified as XML consisting of one or more rules. An Amazon S3 Lifecycle configuration - /// can have up to 1,000 rules. This limit is not adjustable. Each rule consists of the - /// following: + /// A lifecycle rule consists of the following: /// ///
        • /// @@ -25504,20 +25353,23 @@ public virtual PutLifecycleConfigurationResponse PutLifecycleConfiguration(PutLi /// lifecycle configuration. For information about lifecycle configuration, see Managing /// your storage lifecycle. /// - /// + ///
          Rules
          /// - /// Bucket lifecycle configuration now supports specifying a lifecycle rule using an object + /// You specify the lifecycle configuration in your request body. The lifecycle configuration + /// is specified as XML consisting of one or more rules. An Amazon S3 Lifecycle configuration + /// can have up to 1,000 rules. This limit is not adjustable. + /// + /// + /// + /// Bucket lifecycle configuration supports specifying a lifecycle rule using an object /// key name prefix, one or more object tags, object size, or any combination of these. /// Accordingly, this section describes the latest API. The previous version of the API /// supported filtering based only on an object key name prefix, which is supported for /// backward compatibility. For the related API description, see PutBucketLifecycle. /// - ///
          Rules
          + /// /// - /// You specify the lifecycle configuration in your request body. The lifecycle configuration - /// is specified as XML consisting of one or more rules. An Amazon S3 Lifecycle configuration - /// can have up to 1,000 rules. This limit is not adjustable. Each rule consists of the - /// following: + /// A lifecycle rule consists of the following: /// ///
          • /// @@ -26982,14 +26834,7 @@ public virtual PutPublicAccessBlockResponse PutPublicAccessBlock(PutPublicAccess /// /// This operation is not supported by directory buckets. /// - /// - /// - /// The SELECT job type for the RestoreObject operation is no longer available - /// to new customers. Existing customers of Amazon S3 Select can continue to use the feature - /// as usual. Learn - /// more - /// - /// + /// /// /// Restores an archived copy of an object back into Amazon S3 /// @@ -27215,14 +27060,7 @@ public virtual RestoreObjectResponse RestoreObject(string bucketName, string key /// /// This operation is not supported by directory buckets. /// - /// - /// - /// The SELECT job type for the RestoreObject operation is no longer available - /// to new customers. Existing customers of Amazon S3 Select can continue to use the feature - /// as usual. Learn - /// more - /// - /// + /// /// /// Restores an archived copy of an object back into Amazon S3 /// @@ -27450,14 +27288,7 @@ public virtual RestoreObjectResponse RestoreObject(string bucketName, string key /// /// This operation is not supported by directory buckets. /// - /// - /// - /// The SELECT job type for the RestoreObject operation is no longer available - /// to new customers. Existing customers of Amazon S3 Select can continue to use the feature - /// as usual. Learn - /// more - /// - /// + /// /// /// Restores an archived copy of an object back into Amazon S3 /// @@ -27685,14 +27516,7 @@ public virtual RestoreObjectResponse RestoreObject(string bucketName, string key /// /// This operation is not supported by directory buckets. /// - /// - /// - /// The SELECT job type for the RestoreObject operation is no longer available - /// to new customers. Existing customers of Amazon S3 Select can continue to use the feature - /// as usual. Learn - /// more - /// - /// + /// /// /// Restores an archived copy of an object back into Amazon S3 /// @@ -27922,14 +27746,7 @@ public virtual RestoreObjectResponse RestoreObject(string bucketName, string key /// /// This operation is not supported by directory buckets. /// - /// - /// - /// The SELECT job type for the RestoreObject operation is no longer available - /// to new customers. Existing customers of Amazon S3 Select can continue to use the feature - /// as usual. Learn - /// more - /// - /// + /// /// /// Restores an archived copy of an object back into Amazon S3 /// @@ -28155,14 +27972,7 @@ public virtual RestoreObjectResponse RestoreObject(RestoreObjectRequest request) /// /// This operation is not supported by directory buckets. /// - /// - /// - /// The SELECT job type for the RestoreObject operation is no longer available - /// to new customers. Existing customers of Amazon S3 Select can continue to use the feature - /// as usual. Learn - /// more - /// - /// + /// /// /// Restores an archived copy of an object back into Amazon S3 /// @@ -28391,14 +28201,7 @@ public virtual RestoreObjectResponse RestoreObject(RestoreObjectRequest request) /// /// This operation is not supported by directory buckets. /// - /// - /// - /// The SELECT job type for the RestoreObject operation is no longer available - /// to new customers. Existing customers of Amazon S3 Select can continue to use the feature - /// as usual. Learn - /// more - /// - /// + /// /// /// Restores an archived copy of an object back into Amazon S3 /// @@ -28629,14 +28432,7 @@ public virtual RestoreObjectResponse RestoreObject(RestoreObjectRequest request) /// /// This operation is not supported by directory buckets. /// - /// - /// - /// The SELECT job type for the RestoreObject operation is no longer available - /// to new customers. Existing customers of Amazon S3 Select can continue to use the feature - /// as usual. Learn - /// more - /// - /// + /// /// /// Restores an archived copy of an object back into Amazon S3 /// @@ -28867,14 +28663,7 @@ public virtual RestoreObjectResponse RestoreObject(RestoreObjectRequest request) /// /// This operation is not supported by directory buckets. /// - /// - /// - /// The SELECT job type for the RestoreObject operation is no longer available - /// to new customers. Existing customers of Amazon S3 Select can continue to use the feature - /// as usual. Learn - /// more - /// - /// + /// /// /// Restores an archived copy of an object back into Amazon S3 /// @@ -29107,14 +28896,7 @@ public virtual RestoreObjectResponse RestoreObject(RestoreObjectRequest request) /// /// This operation is not supported by directory buckets. /// - /// - /// - /// The SELECT job type for the RestoreObject operation is no longer available - /// to new customers. Existing customers of Amazon S3 Select can continue to use the feature - /// as usual. Learn - /// more - /// - /// + /// /// /// Restores an archived copy of an object back into Amazon S3 /// @@ -29347,13 +29129,7 @@ public virtual RestoreObjectResponse RestoreObject(RestoreObjectRequest request) /// /// This operation is not supported by directory buckets. /// - /// - /// - /// The SelectObjectContent operation is no longer available to new customers. Existing - /// customers of Amazon S3 Select can continue to use the operation as usual. Learn - /// more - /// - /// + /// /// /// This action filters the contents of an Amazon S3 object based on a simple structured /// query language (SQL) statement. In the request, along with the SQL expression, you @@ -29494,13 +29270,7 @@ public virtual SelectObjectContentResponse SelectObjectContent(SelectObjectConte /// /// This operation is not supported by directory buckets. /// - /// - /// - /// The SelectObjectContent operation is no longer available to new customers. Existing - /// customers of Amazon S3 Select can continue to use the operation as usual. Learn - /// more - /// - /// + /// /// /// This action filters the contents of an Amazon S3 object based on a simple structured /// query language (SQL) statement. In the request, along with the SQL expression, you diff --git a/sdk/src/Services/S3/Generated/_bcl/IAmazonS3.cs b/sdk/src/Services/S3/Generated/_bcl/IAmazonS3.cs index d60868fa9e6d..013c31f2ba86 100644 --- a/sdk/src/Services/S3/Generated/_bcl/IAmazonS3.cs +++ b/sdk/src/Services/S3/Generated/_bcl/IAmazonS3.cs @@ -65,7 +65,7 @@ public partial interface IAmazonS3 : IAmazonService, IDisposable /// Directory buckets - If multipart uploads in a directory bucket are in progress, /// you can't delete the bucket until all the in-progress multipart uploads are aborted /// or completed. To delete these in-progress multipart uploads, use the ListMultipartUploads - /// operation to list the in-progress multipart uploads in the bucket and use the AbortMultupartUpload + /// operation to list the in-progress multipart uploads in the bucket and use the AbortMultipartUpload /// operation to abort all the in-progress multipart uploads. /// ///
          • @@ -159,7 +159,7 @@ public partial interface IAmazonS3 : IAmazonService, IDisposable /// Directory buckets - If multipart uploads in a directory bucket are in progress, /// you can't delete the bucket until all the in-progress multipart uploads are aborted /// or completed. To delete these in-progress multipart uploads, use the ListMultipartUploads - /// operation to list the in-progress multipart uploads in the bucket and use the AbortMultupartUpload + /// operation to list the in-progress multipart uploads in the bucket and use the AbortMultipartUpload /// operation to abort all the in-progress multipart uploads. /// ///
          • @@ -252,7 +252,7 @@ public partial interface IAmazonS3 : IAmazonService, IDisposable /// Directory buckets - If multipart uploads in a directory bucket are in progress, /// you can't delete the bucket until all the in-progress multipart uploads are aborted /// or completed. To delete these in-progress multipart uploads, use the ListMultipartUploads - /// operation to list the in-progress multipart uploads in the bucket and use the AbortMultupartUpload + /// operation to list the in-progress multipart uploads in the bucket and use the AbortMultipartUpload /// operation to abort all the in-progress multipart uploads. /// ///
          • @@ -350,7 +350,7 @@ public partial interface IAmazonS3 : IAmazonService, IDisposable /// Directory buckets - If multipart uploads in a directory bucket are in progress, /// you can't delete the bucket until all the in-progress multipart uploads are aborted /// or completed. To delete these in-progress multipart uploads, use the ListMultipartUploads - /// operation to list the in-progress multipart uploads in the bucket and use the AbortMultupartUpload + /// operation to list the in-progress multipart uploads in the bucket and use the AbortMultipartUpload /// operation to abort all the in-progress multipart uploads. /// ///
          • @@ -3572,7 +3572,7 @@ public partial interface IAmazonS3 : IAmazonService, IDisposable /// /// Only 1 customer /// managed key is supported per directory bucket for the lifetime of the bucket. - /// Amazon + /// The Amazon /// Web Services managed key (aws/s3) isn't supported. After you specify SSE-KMS /// as your bucket's default encryption configuration with a customer managed key, you /// can't change the customer managed key for the bucket's SSE-KMS configuration. @@ -3725,7 +3725,7 @@ public partial interface IAmazonS3 : IAmazonService, IDisposable /// /// Only 1 customer /// managed key is supported per directory bucket for the lifetime of the bucket. - /// Amazon + /// The Amazon /// Web Services managed key (aws/s3) isn't supported. After you specify SSE-KMS /// as your bucket's default encryption configuration with a customer managed key, you /// can't change the customer managed key for the bucket's SSE-KMS configuration. @@ -5910,79 +5910,40 @@ public partial interface IAmazonS3 : IAmazonService, IDisposable /// - /// Removes an object from a bucket. The behavior depends on the bucket's versioning state: + /// Removes an object from a bucket. The behavior depends on the bucket's versioning state. + /// For more information, see Best + /// practices to consider before deleting an object. /// - /// - ///
            • - /// - /// If bucket versioning is not enabled, the operation permanently deletes the object. - /// - ///
            • - /// - /// If bucket versioning is enabled, the operation inserts a delete marker, which becomes - /// the current version of the object. To permanently delete an object in a versioned - /// bucket, you must include the object’s versionId in the request. For more information - /// about versioning-enabled buckets, see Deleting - /// object versions from a versioning-enabled bucket. - /// - ///
            • - /// - /// If bucket versioning is suspended, the operation removes the object that has a null - /// versionId, if there is one, and inserts a delete marker that becomes the current - /// version of the object. If there isn't an object with a null versionId, and - /// all versions of the object have a versionId, Amazon S3 does not remove the - /// object and only inserts a delete marker. To permanently delete an object that has - /// a versionId, you must include the object’s versionId in the request. - /// For more information about versioning-suspended buckets, see Deleting - /// objects from versioning-suspended buckets. - /// - ///
            • - /// - /// Directory buckets - S3 Versioning isn't enabled and supported for directory - /// buckets. For this API operation, only the null value of the version ID is supported - /// by directory buckets. You can only specify null to the versionId query - /// parameter in the request. - /// - ///
            • - /// - /// Directory buckets - For directory buckets, you must make requests for this - /// API operation to the Zonal endpoint. These endpoints support virtual-hosted-style - /// requests in the format https://bucket_name.s3express-az_id.region.amazonaws.com/key-name - /// . Path-style requests are not supported. For more information, see Regional - /// and Zonal endpoints in the Amazon S3 User Guide. - /// - ///
            + /// /// /// To remove a specific version, you must use the versionId query parameter. Using /// this query parameter permanently deletes the version. If the object deleted is a delete - /// marker, Amazon S3 sets the response header x-amz-delete-marker to true. - /// - /// - /// - /// If the object you want to delete is in a bucket where the bucket versioning configuration - /// is MFA Delete enabled, you must include the x-amz-mfa request header in the + /// marker, Amazon S3 sets the response header x-amz-delete-marker to true. If + /// the object you want to delete is in a bucket where the bucket versioning configuration + /// is MFA delete enabled, you must include the x-amz-mfa request header in the /// DELETE versionId request. Requests that include x-amz-mfa must use HTTPS. - /// For more information about MFA Delete, see Using - /// MFA Delete in the Amazon S3 User Guide. To see sample requests that use - /// versioning, see Sample - /// Request. + /// For more information about MFA delete and to see example requests, see Using + /// MFA delete and Sample + /// request in the Amazon S3 User Guide. /// - /// + ///
            • /// - /// Directory buckets - MFA delete is not supported by directory buckets. + /// S3 Versioning isn't enabled and supported for directory buckets. For this API operation, + /// only the null value of the version ID is supported by directory buckets. You + /// can only specify null to the versionId query parameter in the request. /// - /// + ///
            • /// - /// You can delete objects by explicitly calling DELETE Object or calling (PutBucketLifecycle) - /// to enable Amazon S3 to remove them for you. If you want to block users or accounts - /// from removing or deleting objects from your bucket, you must deny them the s3:DeleteObject, - /// s3:DeleteObjectVersion, and s3:PutLifeCycleConfiguration actions. + /// For directory buckets, you must make requests for this API operation to the Zonal + /// endpoint. These endpoints support virtual-hosted-style requests in the format https://bucket_name.s3express-az_id.region.amazonaws.com/key-name + /// . Path-style requests are not supported. For more information, see Regional + /// and Zonal endpoints in the Amazon S3 User Guide. /// - /// + ///
            • /// - /// Directory buckets - S3 Lifecycle is not supported by directory buckets. + /// MFA delete is not supported by directory buckets. /// - ///
              Permissions
              • + ///
              Permissions
              • /// /// General purpose bucket permissions - The following permissions are required /// in your policies when your DeleteObjects request includes specific headers. @@ -5992,26 +5953,27 @@ public partial interface IAmazonS3 : IAmazonService, IDisposable /// s3:DeleteObject - To delete an object from a bucket, you must always /// have the s3:DeleteObject permission. /// - ///
              • + /// + /// + /// You can also use PutBucketLifecycle to delete objects in Amazon S3. + /// + ///
              • /// /// s3:DeleteObjectVersion - To delete a specific version of an object /// from a versioning-enabled bucket, you must have the s3:DeleteObjectVersion /// permission. /// + ///
              • + /// + /// If you want to block users or accounts from removing or deleting objects from your + /// bucket, you must deny them the s3:DeleteObject, s3:DeleteObjectVersion, + /// and s3:PutLifeCycleConfiguration permissions. + /// ///
            • /// - /// Directory bucket permissions - To grant access to this API operation on a - /// directory bucket, we recommend that you use the - /// CreateSession API operation for session-based authorization. Specifically, - /// you grant the s3express:CreateSession permission to the directory bucket in - /// a bucket policy or an IAM identity-based policy. Then, you make the CreateSession - /// API call on the bucket to obtain a session token. With the session token in your request - /// header, you can make API requests to this operation. After the session token expires, - /// you make another CreateSession API call to generate a new session token for - /// use. Amazon Web Services CLI or SDKs create session and refresh the session token - /// automatically to avoid service interruptions when a session expires. For more information - /// about authorization, see - /// CreateSession . + /// Directory buckets permissions - To grant access to this API operation on a + /// directory bucket, we recommend that you use the CreateSession API operation + /// for session-based authorization. /// ///
          HTTP Host header syntax
          /// @@ -6036,79 +5998,40 @@ public partial interface IAmazonS3 : IAmazonService, IDisposable DeleteObjectResponse DeleteObject(string bucketName, string key); /// - /// Removes an object from a bucket. The behavior depends on the bucket's versioning state: + /// Removes an object from a bucket. The behavior depends on the bucket's versioning state. + /// For more information, see Best + /// practices to consider before deleting an object. /// - /// - ///
          • - /// - /// If bucket versioning is not enabled, the operation permanently deletes the object. - /// - ///
          • - /// - /// If bucket versioning is enabled, the operation inserts a delete marker, which becomes - /// the current version of the object. To permanently delete an object in a versioned - /// bucket, you must include the object’s versionId in the request. For more information - /// about versioning-enabled buckets, see Deleting - /// object versions from a versioning-enabled bucket. - /// - ///
          • - /// - /// If bucket versioning is suspended, the operation removes the object that has a null - /// versionId, if there is one, and inserts a delete marker that becomes the current - /// version of the object. If there isn't an object with a null versionId, and - /// all versions of the object have a versionId, Amazon S3 does not remove the - /// object and only inserts a delete marker. To permanently delete an object that has - /// a versionId, you must include the object’s versionId in the request. - /// For more information about versioning-suspended buckets, see Deleting - /// objects from versioning-suspended buckets. - /// - ///
          • - /// - /// Directory buckets - S3 Versioning isn't enabled and supported for directory - /// buckets. For this API operation, only the null value of the version ID is supported - /// by directory buckets. You can only specify null to the versionId query - /// parameter in the request. - /// - ///
          • - /// - /// Directory buckets - For directory buckets, you must make requests for this - /// API operation to the Zonal endpoint. These endpoints support virtual-hosted-style - /// requests in the format https://bucket_name.s3express-az_id.region.amazonaws.com/key-name - /// . Path-style requests are not supported. For more information, see Regional - /// and Zonal endpoints in the Amazon S3 User Guide. - /// - ///
          + /// /// /// To remove a specific version, you must use the versionId query parameter. Using /// this query parameter permanently deletes the version. If the object deleted is a delete - /// marker, Amazon S3 sets the response header x-amz-delete-marker to true. - /// - /// - /// - /// If the object you want to delete is in a bucket where the bucket versioning configuration - /// is MFA Delete enabled, you must include the x-amz-mfa request header in the + /// marker, Amazon S3 sets the response header x-amz-delete-marker to true. If + /// the object you want to delete is in a bucket where the bucket versioning configuration + /// is MFA delete enabled, you must include the x-amz-mfa request header in the /// DELETE versionId request. Requests that include x-amz-mfa must use HTTPS. - /// For more information about MFA Delete, see Using - /// MFA Delete in the Amazon S3 User Guide. To see sample requests that use - /// versioning, see Sample - /// Request. + /// For more information about MFA delete and to see example requests, see Using + /// MFA delete and Sample + /// request in the Amazon S3 User Guide. /// - /// + ///
          • /// - /// Directory buckets - MFA delete is not supported by directory buckets. + /// S3 Versioning isn't enabled and supported for directory buckets. For this API operation, + /// only the null value of the version ID is supported by directory buckets. You + /// can only specify null to the versionId query parameter in the request. /// - /// + ///
          • /// - /// You can delete objects by explicitly calling DELETE Object or calling (PutBucketLifecycle) - /// to enable Amazon S3 to remove them for you. If you want to block users or accounts - /// from removing or deleting objects from your bucket, you must deny them the s3:DeleteObject, - /// s3:DeleteObjectVersion, and s3:PutLifeCycleConfiguration actions. + /// For directory buckets, you must make requests for this API operation to the Zonal + /// endpoint. These endpoints support virtual-hosted-style requests in the format https://bucket_name.s3express-az_id.region.amazonaws.com/key-name + /// . Path-style requests are not supported. For more information, see Regional + /// and Zonal endpoints in the Amazon S3 User Guide. /// - /// + ///
          • /// - /// Directory buckets - S3 Lifecycle is not supported by directory buckets. + /// MFA delete is not supported by directory buckets. /// - ///
            Permissions
            • + ///
            Permissions
            • /// /// General purpose bucket permissions - The following permissions are required /// in your policies when your DeleteObjects request includes specific headers. @@ -6118,26 +6041,27 @@ public partial interface IAmazonS3 : IAmazonService, IDisposable /// s3:DeleteObject - To delete an object from a bucket, you must always /// have the s3:DeleteObject permission. /// - ///
            • + /// + /// + /// You can also use PutBucketLifecycle to delete objects in Amazon S3. + /// + ///
            • /// /// s3:DeleteObjectVersion - To delete a specific version of an object /// from a versioning-enabled bucket, you must have the s3:DeleteObjectVersion /// permission. /// + ///
            • + /// + /// If you want to block users or accounts from removing or deleting objects from your + /// bucket, you must deny them the s3:DeleteObject, s3:DeleteObjectVersion, + /// and s3:PutLifeCycleConfiguration permissions. + /// ///
          • /// - /// Directory bucket permissions - To grant access to this API operation on a - /// directory bucket, we recommend that you use the - /// CreateSession API operation for session-based authorization. Specifically, - /// you grant the s3express:CreateSession permission to the directory bucket in - /// a bucket policy or an IAM identity-based policy. Then, you make the CreateSession - /// API call on the bucket to obtain a session token. With the session token in your request - /// header, you can make API requests to this operation. After the session token expires, - /// you make another CreateSession API call to generate a new session token for - /// use. Amazon Web Services CLI or SDKs create session and refresh the session token - /// automatically to avoid service interruptions when a session expires. For more information - /// about authorization, see - /// CreateSession . + /// Directory buckets permissions - To grant access to this API operation on a + /// directory bucket, we recommend that you use the CreateSession API operation + /// for session-based authorization. /// ///
          HTTP Host header syntax
          /// @@ -6163,79 +6087,40 @@ public partial interface IAmazonS3 : IAmazonService, IDisposable DeleteObjectResponse DeleteObject(string bucketName, string key, string versionId); /// - /// Removes an object from a bucket. The behavior depends on the bucket's versioning state: - /// + /// Removes an object from a bucket. The behavior depends on the bucket's versioning state. + /// For more information, see Best + /// practices to consider before deleting an object. /// - ///
          • - /// - /// If bucket versioning is not enabled, the operation permanently deletes the object. - /// - ///
          • - /// - /// If bucket versioning is enabled, the operation inserts a delete marker, which becomes - /// the current version of the object. To permanently delete an object in a versioned - /// bucket, you must include the object’s versionId in the request. For more information - /// about versioning-enabled buckets, see Deleting - /// object versions from a versioning-enabled bucket. - /// - ///
          • - /// - /// If bucket versioning is suspended, the operation removes the object that has a null - /// versionId, if there is one, and inserts a delete marker that becomes the current - /// version of the object. If there isn't an object with a null versionId, and - /// all versions of the object have a versionId, Amazon S3 does not remove the - /// object and only inserts a delete marker. To permanently delete an object that has - /// a versionId, you must include the object’s versionId in the request. - /// For more information about versioning-suspended buckets, see Deleting - /// objects from versioning-suspended buckets. - /// - ///
          • - /// - /// Directory buckets - S3 Versioning isn't enabled and supported for directory - /// buckets. For this API operation, only the null value of the version ID is supported - /// by directory buckets. You can only specify null to the versionId query - /// parameter in the request. - /// - ///
          • - /// - /// Directory buckets - For directory buckets, you must make requests for this - /// API operation to the Zonal endpoint. These endpoints support virtual-hosted-style - /// requests in the format https://bucket_name.s3express-az_id.region.amazonaws.com/key-name - /// . Path-style requests are not supported. For more information, see Regional - /// and Zonal endpoints in the Amazon S3 User Guide. - /// - ///
          + /// /// /// To remove a specific version, you must use the versionId query parameter. Using /// this query parameter permanently deletes the version. If the object deleted is a delete - /// marker, Amazon S3 sets the response header x-amz-delete-marker to true. - /// - /// - /// - /// If the object you want to delete is in a bucket where the bucket versioning configuration - /// is MFA Delete enabled, you must include the x-amz-mfa request header in the + /// marker, Amazon S3 sets the response header x-amz-delete-marker to true. If + /// the object you want to delete is in a bucket where the bucket versioning configuration + /// is MFA delete enabled, you must include the x-amz-mfa request header in the /// DELETE versionId request. Requests that include x-amz-mfa must use HTTPS. - /// For more information about MFA Delete, see Using - /// MFA Delete in the Amazon S3 User Guide. To see sample requests that use - /// versioning, see Sample - /// Request. + /// For more information about MFA delete and to see example requests, see Using + /// MFA delete and Sample + /// request in the Amazon S3 User Guide. /// - /// + ///
          • /// - /// Directory buckets - MFA delete is not supported by directory buckets. + /// S3 Versioning isn't enabled and supported for directory buckets. For this API operation, + /// only the null value of the version ID is supported by directory buckets. You + /// can only specify null to the versionId query parameter in the request. /// - /// + ///
          • /// - /// You can delete objects by explicitly calling DELETE Object or calling (PutBucketLifecycle) - /// to enable Amazon S3 to remove them for you. If you want to block users or accounts - /// from removing or deleting objects from your bucket, you must deny them the s3:DeleteObject, - /// s3:DeleteObjectVersion, and s3:PutLifeCycleConfiguration actions. + /// For directory buckets, you must make requests for this API operation to the Zonal + /// endpoint. These endpoints support virtual-hosted-style requests in the format https://bucket_name.s3express-az_id.region.amazonaws.com/key-name + /// . Path-style requests are not supported. For more information, see Regional + /// and Zonal endpoints in the Amazon S3 User Guide. /// - /// + ///
          • /// - /// Directory buckets - S3 Lifecycle is not supported by directory buckets. + /// MFA delete is not supported by directory buckets. /// - ///
            Permissions
            • + ///
            Permissions
            • /// /// General purpose bucket permissions - The following permissions are required /// in your policies when your DeleteObjects request includes specific headers. @@ -6245,26 +6130,27 @@ public partial interface IAmazonS3 : IAmazonService, IDisposable /// s3:DeleteObject - To delete an object from a bucket, you must always /// have the s3:DeleteObject permission. /// - ///
            • + /// + /// + /// You can also use PutBucketLifecycle to delete objects in Amazon S3. + /// + ///
            • /// /// s3:DeleteObjectVersion - To delete a specific version of an object /// from a versioning-enabled bucket, you must have the s3:DeleteObjectVersion /// permission. /// + ///
            • + /// + /// If you want to block users or accounts from removing or deleting objects from your + /// bucket, you must deny them the s3:DeleteObject, s3:DeleteObjectVersion, + /// and s3:PutLifeCycleConfiguration permissions. + /// ///
          • /// - /// Directory bucket permissions - To grant access to this API operation on a - /// directory bucket, we recommend that you use the - /// CreateSession API operation for session-based authorization. Specifically, - /// you grant the s3express:CreateSession permission to the directory bucket in - /// a bucket policy or an IAM identity-based policy. Then, you make the CreateSession - /// API call on the bucket to obtain a session token. With the session token in your request - /// header, you can make API requests to this operation. After the session token expires, - /// you make another CreateSession API call to generate a new session token for - /// use. Amazon Web Services CLI or SDKs create session and refresh the session token - /// automatically to avoid service interruptions when a session expires. For more information - /// about authorization, see - /// CreateSession . + /// Directory buckets permissions - To grant access to this API operation on a + /// directory bucket, we recommend that you use the CreateSession API operation + /// for session-based authorization. /// ///
          HTTP Host header syntax
          /// @@ -6289,79 +6175,40 @@ public partial interface IAmazonS3 : IAmazonService, IDisposable /// - /// Removes an object from a bucket. The behavior depends on the bucket's versioning state: - /// + /// Removes an object from a bucket. The behavior depends on the bucket's versioning state. + /// For more information, see Best + /// practices to consider before deleting an object. /// - ///
          • - /// - /// If bucket versioning is not enabled, the operation permanently deletes the object. - /// - ///
          • - /// - /// If bucket versioning is enabled, the operation inserts a delete marker, which becomes - /// the current version of the object. To permanently delete an object in a versioned - /// bucket, you must include the object’s versionId in the request. For more information - /// about versioning-enabled buckets, see Deleting - /// object versions from a versioning-enabled bucket. - /// - ///
          • - /// - /// If bucket versioning is suspended, the operation removes the object that has a null - /// versionId, if there is one, and inserts a delete marker that becomes the current - /// version of the object. If there isn't an object with a null versionId, and - /// all versions of the object have a versionId, Amazon S3 does not remove the - /// object and only inserts a delete marker. To permanently delete an object that has - /// a versionId, you must include the object’s versionId in the request. - /// For more information about versioning-suspended buckets, see Deleting - /// objects from versioning-suspended buckets. - /// - ///
          • - /// - /// Directory buckets - S3 Versioning isn't enabled and supported for directory - /// buckets. For this API operation, only the null value of the version ID is supported - /// by directory buckets. You can only specify null to the versionId query - /// parameter in the request. - /// - ///
          • - /// - /// Directory buckets - For directory buckets, you must make requests for this - /// API operation to the Zonal endpoint. These endpoints support virtual-hosted-style - /// requests in the format https://bucket_name.s3express-az_id.region.amazonaws.com/key-name - /// . Path-style requests are not supported. For more information, see Regional - /// and Zonal endpoints in the Amazon S3 User Guide. - /// - ///
          + /// /// /// To remove a specific version, you must use the versionId query parameter. Using /// this query parameter permanently deletes the version. If the object deleted is a delete - /// marker, Amazon S3 sets the response header x-amz-delete-marker to true. - /// - /// - /// - /// If the object you want to delete is in a bucket where the bucket versioning configuration - /// is MFA Delete enabled, you must include the x-amz-mfa request header in the + /// marker, Amazon S3 sets the response header x-amz-delete-marker to true. If + /// the object you want to delete is in a bucket where the bucket versioning configuration + /// is MFA delete enabled, you must include the x-amz-mfa request header in the /// DELETE versionId request. Requests that include x-amz-mfa must use HTTPS. - /// For more information about MFA Delete, see Using - /// MFA Delete in the Amazon S3 User Guide. To see sample requests that use - /// versioning, see Sample - /// Request. + /// For more information about MFA delete and to see example requests, see Using + /// MFA delete and Sample + /// request in the Amazon S3 User Guide. /// - /// + ///
          • /// - /// Directory buckets - MFA delete is not supported by directory buckets. + /// S3 Versioning isn't enabled and supported for directory buckets. For this API operation, + /// only the null value of the version ID is supported by directory buckets. You + /// can only specify null to the versionId query parameter in the request. /// - /// + ///
          • /// - /// You can delete objects by explicitly calling DELETE Object or calling (PutBucketLifecycle) - /// to enable Amazon S3 to remove them for you. If you want to block users or accounts - /// from removing or deleting objects from your bucket, you must deny them the s3:DeleteObject, - /// s3:DeleteObjectVersion, and s3:PutLifeCycleConfiguration actions. + /// For directory buckets, you must make requests for this API operation to the Zonal + /// endpoint. These endpoints support virtual-hosted-style requests in the format https://bucket_name.s3express-az_id.region.amazonaws.com/key-name + /// . Path-style requests are not supported. For more information, see Regional + /// and Zonal endpoints in the Amazon S3 User Guide. /// - /// + ///
          • /// - /// Directory buckets - S3 Lifecycle is not supported by directory buckets. + /// MFA delete is not supported by directory buckets. /// - ///
            Permissions
            • + ///
            Permissions
            • /// /// General purpose bucket permissions - The following permissions are required /// in your policies when your DeleteObjects request includes specific headers. @@ -6371,26 +6218,27 @@ public partial interface IAmazonS3 : IAmazonService, IDisposable /// s3:DeleteObject - To delete an object from a bucket, you must always /// have the s3:DeleteObject permission. /// - ///
            • + /// + /// + /// You can also use PutBucketLifecycle to delete objects in Amazon S3. + /// + ///
            • /// /// s3:DeleteObjectVersion - To delete a specific version of an object /// from a versioning-enabled bucket, you must have the s3:DeleteObjectVersion /// permission. /// + ///
            • + /// + /// If you want to block users or accounts from removing or deleting objects from your + /// bucket, you must deny them the s3:DeleteObject, s3:DeleteObjectVersion, + /// and s3:PutLifeCycleConfiguration permissions. + /// ///
          • /// - /// Directory bucket permissions - To grant access to this API operation on a - /// directory bucket, we recommend that you use the - /// CreateSession API operation for session-based authorization. Specifically, - /// you grant the s3express:CreateSession permission to the directory bucket in - /// a bucket policy or an IAM identity-based policy. Then, you make the CreateSession - /// API call on the bucket to obtain a session token. With the session token in your request - /// header, you can make API requests to this operation. After the session token expires, - /// you make another CreateSession API call to generate a new session token for - /// use. Amazon Web Services CLI or SDKs create session and refresh the session token - /// automatically to avoid service interruptions when a session expires. For more information - /// about authorization, see - /// CreateSession . + /// Directory buckets permissions - To grant access to this API operation on a + /// directory bucket, we recommend that you use the CreateSession API operation + /// for session-based authorization. /// ///
          HTTP Host header syntax
          /// @@ -6418,79 +6266,40 @@ public partial interface IAmazonS3 : IAmazonService, IDisposable Task DeleteObjectAsync(string bucketName, string key, System.Threading.CancellationToken cancellationToken = default(CancellationToken)); /// - /// Removes an object from a bucket. The behavior depends on the bucket's versioning state: + /// Removes an object from a bucket. The behavior depends on the bucket's versioning state. + /// For more information, see Best + /// practices to consider before deleting an object. /// - /// - ///
          • - /// - /// If bucket versioning is not enabled, the operation permanently deletes the object. - /// - ///
          • - /// - /// If bucket versioning is enabled, the operation inserts a delete marker, which becomes - /// the current version of the object. To permanently delete an object in a versioned - /// bucket, you must include the object’s versionId in the request. For more information - /// about versioning-enabled buckets, see Deleting - /// object versions from a versioning-enabled bucket. - /// - ///
          • - /// - /// If bucket versioning is suspended, the operation removes the object that has a null - /// versionId, if there is one, and inserts a delete marker that becomes the current - /// version of the object. If there isn't an object with a null versionId, and - /// all versions of the object have a versionId, Amazon S3 does not remove the - /// object and only inserts a delete marker. To permanently delete an object that has - /// a versionId, you must include the object’s versionId in the request. - /// For more information about versioning-suspended buckets, see Deleting - /// objects from versioning-suspended buckets. - /// - ///
          • - /// - /// Directory buckets - S3 Versioning isn't enabled and supported for directory - /// buckets. For this API operation, only the null value of the version ID is supported - /// by directory buckets. You can only specify null to the versionId query - /// parameter in the request. - /// - ///
          • - /// - /// Directory buckets - For directory buckets, you must make requests for this - /// API operation to the Zonal endpoint. These endpoints support virtual-hosted-style - /// requests in the format https://bucket_name.s3express-az_id.region.amazonaws.com/key-name - /// . Path-style requests are not supported. For more information, see Regional - /// and Zonal endpoints in the Amazon S3 User Guide. - /// - ///
          + /// /// /// To remove a specific version, you must use the versionId query parameter. Using /// this query parameter permanently deletes the version. If the object deleted is a delete - /// marker, Amazon S3 sets the response header x-amz-delete-marker to true. - /// - /// - /// - /// If the object you want to delete is in a bucket where the bucket versioning configuration - /// is MFA Delete enabled, you must include the x-amz-mfa request header in the + /// marker, Amazon S3 sets the response header x-amz-delete-marker to true. If + /// the object you want to delete is in a bucket where the bucket versioning configuration + /// is MFA delete enabled, you must include the x-amz-mfa request header in the /// DELETE versionId request. Requests that include x-amz-mfa must use HTTPS. - /// For more information about MFA Delete, see Using - /// MFA Delete in the Amazon S3 User Guide. To see sample requests that use - /// versioning, see Sample - /// Request. + /// For more information about MFA delete and to see example requests, see Using + /// MFA delete and Sample + /// request in the Amazon S3 User Guide. /// - /// + ///
          • /// - /// Directory buckets - MFA delete is not supported by directory buckets. + /// S3 Versioning isn't enabled and supported for directory buckets. For this API operation, + /// only the null value of the version ID is supported by directory buckets. You + /// can only specify null to the versionId query parameter in the request. /// - /// + ///
          • /// - /// You can delete objects by explicitly calling DELETE Object or calling (PutBucketLifecycle) - /// to enable Amazon S3 to remove them for you. If you want to block users or accounts - /// from removing or deleting objects from your bucket, you must deny them the s3:DeleteObject, - /// s3:DeleteObjectVersion, and s3:PutLifeCycleConfiguration actions. + /// For directory buckets, you must make requests for this API operation to the Zonal + /// endpoint. These endpoints support virtual-hosted-style requests in the format https://bucket_name.s3express-az_id.region.amazonaws.com/key-name + /// . Path-style requests are not supported. For more information, see Regional + /// and Zonal endpoints in the Amazon S3 User Guide. /// - /// + ///
          • /// - /// Directory buckets - S3 Lifecycle is not supported by directory buckets. + /// MFA delete is not supported by directory buckets. /// - ///
            Permissions
            • + ///
            Permissions
            • /// /// General purpose bucket permissions - The following permissions are required /// in your policies when your DeleteObjects request includes specific headers. @@ -6500,26 +6309,27 @@ public partial interface IAmazonS3 : IAmazonService, IDisposable /// s3:DeleteObject - To delete an object from a bucket, you must always /// have the s3:DeleteObject permission. /// - ///
            • + /// + /// + /// You can also use PutBucketLifecycle to delete objects in Amazon S3. + /// + ///
            • /// /// s3:DeleteObjectVersion - To delete a specific version of an object /// from a versioning-enabled bucket, you must have the s3:DeleteObjectVersion /// permission. /// + ///
            • + /// + /// If you want to block users or accounts from removing or deleting objects from your + /// bucket, you must deny them the s3:DeleteObject, s3:DeleteObjectVersion, + /// and s3:PutLifeCycleConfiguration permissions. + /// ///
          • /// - /// Directory bucket permissions - To grant access to this API operation on a - /// directory bucket, we recommend that you use the - /// CreateSession API operation for session-based authorization. Specifically, - /// you grant the s3express:CreateSession permission to the directory bucket in - /// a bucket policy or an IAM identity-based policy. Then, you make the CreateSession - /// API call on the bucket to obtain a session token. With the session token in your request - /// header, you can make API requests to this operation. After the session token expires, - /// you make another CreateSession API call to generate a new session token for - /// use. Amazon Web Services CLI or SDKs create session and refresh the session token - /// automatically to avoid service interruptions when a session expires. For more information - /// about authorization, see - /// CreateSession . + /// Directory buckets permissions - To grant access to this API operation on a + /// directory bucket, we recommend that you use the CreateSession API operation + /// for session-based authorization. /// ///
          HTTP Host header syntax
          /// @@ -6549,79 +6359,40 @@ public partial interface IAmazonS3 : IAmazonService, IDisposable /// - /// Removes an object from a bucket. The behavior depends on the bucket's versioning state: + /// Removes an object from a bucket. The behavior depends on the bucket's versioning state. + /// For more information, see Best + /// practices to consider before deleting an object. /// - /// - ///
          • - /// - /// If bucket versioning is not enabled, the operation permanently deletes the object. - /// - ///
          • - /// - /// If bucket versioning is enabled, the operation inserts a delete marker, which becomes - /// the current version of the object. To permanently delete an object in a versioned - /// bucket, you must include the object’s versionId in the request. For more information - /// about versioning-enabled buckets, see Deleting - /// object versions from a versioning-enabled bucket. - /// - ///
          • - /// - /// If bucket versioning is suspended, the operation removes the object that has a null - /// versionId, if there is one, and inserts a delete marker that becomes the current - /// version of the object. If there isn't an object with a null versionId, and - /// all versions of the object have a versionId, Amazon S3 does not remove the - /// object and only inserts a delete marker. To permanently delete an object that has - /// a versionId, you must include the object’s versionId in the request. - /// For more information about versioning-suspended buckets, see Deleting - /// objects from versioning-suspended buckets. - /// - ///
          • - /// - /// Directory buckets - S3 Versioning isn't enabled and supported for directory - /// buckets. For this API operation, only the null value of the version ID is supported - /// by directory buckets. You can only specify null to the versionId query - /// parameter in the request. - /// - ///
          • - /// - /// Directory buckets - For directory buckets, you must make requests for this - /// API operation to the Zonal endpoint. These endpoints support virtual-hosted-style - /// requests in the format https://bucket_name.s3express-az_id.region.amazonaws.com/key-name - /// . Path-style requests are not supported. For more information, see Regional - /// and Zonal endpoints in the Amazon S3 User Guide. - /// - ///
          + /// /// /// To remove a specific version, you must use the versionId query parameter. Using /// this query parameter permanently deletes the version. If the object deleted is a delete - /// marker, Amazon S3 sets the response header x-amz-delete-marker to true. - /// - /// - /// - /// If the object you want to delete is in a bucket where the bucket versioning configuration - /// is MFA Delete enabled, you must include the x-amz-mfa request header in the + /// marker, Amazon S3 sets the response header x-amz-delete-marker to true. If + /// the object you want to delete is in a bucket where the bucket versioning configuration + /// is MFA delete enabled, you must include the x-amz-mfa request header in the /// DELETE versionId request. Requests that include x-amz-mfa must use HTTPS. - /// For more information about MFA Delete, see Using - /// MFA Delete in the Amazon S3 User Guide. To see sample requests that use - /// versioning, see Sample - /// Request. + /// For more information about MFA delete and to see example requests, see Using + /// MFA delete and Sample + /// request in the Amazon S3 User Guide. /// - /// + ///
          • /// - /// Directory buckets - MFA delete is not supported by directory buckets. + /// S3 Versioning isn't enabled and supported for directory buckets. For this API operation, + /// only the null value of the version ID is supported by directory buckets. You + /// can only specify null to the versionId query parameter in the request. /// - /// + ///
          • /// - /// You can delete objects by explicitly calling DELETE Object or calling (PutBucketLifecycle) - /// to enable Amazon S3 to remove them for you. If you want to block users or accounts - /// from removing or deleting objects from your bucket, you must deny them the s3:DeleteObject, - /// s3:DeleteObjectVersion, and s3:PutLifeCycleConfiguration actions. + /// For directory buckets, you must make requests for this API operation to the Zonal + /// endpoint. These endpoints support virtual-hosted-style requests in the format https://bucket_name.s3express-az_id.region.amazonaws.com/key-name + /// . Path-style requests are not supported. For more information, see Regional + /// and Zonal endpoints in the Amazon S3 User Guide. /// - /// + ///
          • /// - /// Directory buckets - S3 Lifecycle is not supported by directory buckets. + /// MFA delete is not supported by directory buckets. /// - ///
            Permissions
            • + ///
            Permissions
            • /// /// General purpose bucket permissions - The following permissions are required /// in your policies when your DeleteObjects request includes specific headers. @@ -6631,26 +6402,27 @@ public partial interface IAmazonS3 : IAmazonService, IDisposable /// s3:DeleteObject - To delete an object from a bucket, you must always /// have the s3:DeleteObject permission. /// - ///
            • + /// + /// + /// You can also use PutBucketLifecycle to delete objects in Amazon S3. + /// + ///
            • /// /// s3:DeleteObjectVersion - To delete a specific version of an object /// from a versioning-enabled bucket, you must have the s3:DeleteObjectVersion /// permission. /// + ///
            • + /// + /// If you want to block users or accounts from removing or deleting objects from your + /// bucket, you must deny them the s3:DeleteObject, s3:DeleteObjectVersion, + /// and s3:PutLifeCycleConfiguration permissions. + /// ///
          • /// - /// Directory bucket permissions - To grant access to this API operation on a - /// directory bucket, we recommend that you use the - /// CreateSession API operation for session-based authorization. Specifically, - /// you grant the s3express:CreateSession permission to the directory bucket in - /// a bucket policy or an IAM identity-based policy. Then, you make the CreateSession - /// API call on the bucket to obtain a session token. With the session token in your request - /// header, you can make API requests to this operation. After the session token expires, - /// you make another CreateSession API call to generate a new session token for - /// use. Amazon Web Services CLI or SDKs create session and refresh the session token - /// automatically to avoid service interruptions when a session expires. For more information - /// about authorization, see - /// CreateSession . + /// Directory buckets permissions - To grant access to this API operation on a + /// directory bucket, we recommend that you use the CreateSession API operation + /// for session-based authorization. /// ///
          HTTP Host header syntax
          /// @@ -12421,6 +12193,9 @@ public partial interface IAmazonS3 : IAmazonService, IDisposable /// s3:GetObject permission. You need the relevant read object (or version) permission /// for this operation. For more information, see Actions, /// resources, and condition keys for Amazon S3 in the Amazon S3 User Guide. + /// For more information about the permissions to S3 API operations by S3 resource types, + /// see Required + /// permissions for Amazon S3 API operations in the Amazon S3 User Guide. /// /// /// @@ -12583,6 +12358,9 @@ public partial interface IAmazonS3 : IAmazonService, IDisposable /// s3:GetObject permission. You need the relevant read object (or version) permission /// for this operation. For more information, see Actions, /// resources, and condition keys for Amazon S3 in the Amazon S3 User Guide. + /// For more information about the permissions to S3 API operations by S3 resource types, + /// see Required + /// permissions for Amazon S3 API operations in the Amazon S3 User Guide. /// /// /// @@ -12746,6 +12524,9 @@ public partial interface IAmazonS3 : IAmazonService, IDisposable /// s3:GetObject permission. You need the relevant read object (or version) permission /// for this operation. For more information, see Actions, /// resources, and condition keys for Amazon S3 in the Amazon S3 User Guide. + /// For more information about the permissions to S3 API operations by S3 resource types, + /// see Required + /// permissions for Amazon S3 API operations in the Amazon S3 User Guide. /// /// /// @@ -12908,6 +12689,9 @@ public partial interface IAmazonS3 : IAmazonService, IDisposable /// s3:GetObject permission. You need the relevant read object (or version) permission /// for this operation. For more information, see Actions, /// resources, and condition keys for Amazon S3 in the Amazon S3 User Guide. + /// For more information about the permissions to S3 API operations by S3 resource types, + /// see Required + /// permissions for Amazon S3 API operations in the Amazon S3 User Guide. /// /// /// @@ -13073,6 +12857,9 @@ public partial interface IAmazonS3 : IAmazonService, IDisposable /// s3:GetObject permission. You need the relevant read object (or version) permission /// for this operation. For more information, see Actions, /// resources, and condition keys for Amazon S3 in the Amazon S3 User Guide. + /// For more information about the permissions to S3 API operations by S3 resource types, + /// see Required + /// permissions for Amazon S3 API operations in the Amazon S3 User Guide. /// /// /// @@ -13240,6 +13027,9 @@ public partial interface IAmazonS3 : IAmazonService, IDisposable /// s3:GetObject permission. You need the relevant read object (or version) permission /// for this operation. For more information, see Actions, /// resources, and condition keys for Amazon S3 in the Amazon S3 User Guide. + /// For more information about the permissions to S3 API operations by S3 resource types, + /// see Required + /// permissions for Amazon S3 API operations in the Amazon S3 User Guide. /// /// /// @@ -15488,6 +15278,16 @@ public partial interface IAmazonS3 : IAmazonService, IDisposable /// For information about Amazon S3 buckets, see Creating, /// configuring, and working with Amazon S3 buckets. /// + /// + /// + /// We strongly recommend using only paginated requests. Unpaginated requests are only + /// supported for Amazon Web Services accounts set to the default general purpose bucket + /// quota of 10,000. If you have an approved general purpose bucket quota above 10,000, + /// you must send paginated requests to list your account’s buckets. All unpaginated ListBuckets + /// requests will be rejected for Amazon Web Services accounts with a general purpose + /// bucket quota greater than 10,000. + /// + /// ///
    • /// /// The response from the ListBuckets service method, as returned by S3. @@ -15510,6 +15310,16 @@ public partial interface IAmazonS3 : IAmazonService, IDisposable /// For information about Amazon S3 buckets, see Creating, /// configuring, and working with Amazon S3 buckets. /// + /// + /// + /// We strongly recommend using only paginated requests. Unpaginated requests are only + /// supported for Amazon Web Services accounts set to the default general purpose bucket + /// quota of 10,000. If you have an approved general purpose bucket quota above 10,000, + /// you must send paginated requests to list your account’s buckets. All unpaginated ListBuckets + /// requests will be rejected for Amazon Web Services accounts with a general purpose + /// bucket quota greater than 10,000. + /// + /// ///     /// Container for the necessary parameters to execute the ListBuckets service method. /// @@ -15533,6 +15343,16 @@ public partial interface IAmazonS3 : IAmazonService, IDisposable /// For information about Amazon S3 buckets, see Creating, /// configuring, and working with Amazon S3 buckets. ///     + /// + /// + /// We strongly recommend using only paginated requests. Unpaginated requests are only + /// supported for Amazon Web Services accounts set to the default general purpose bucket + /// quota of 10,000. If you have an approved general purpose bucket quota above 10,000, + /// you must send paginated requests to list your account’s buckets. All unpaginated ListBuckets + /// requests will be rejected for Amazon Web Services accounts with a general purpose + /// bucket quota greater than 10,000. + /// + /// /// /// /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. @@ -15559,6 +15379,16 @@ public partial interface IAmazonS3 : IAmazonService, IDisposable /// For information about Amazon S3 buckets, see Creating, /// configuring, and working with Amazon S3 buckets. /// + /// + /// + /// We strongly recommend using only paginated requests. Unpaginated requests are only + /// supported for Amazon Web Services accounts set to the default general purpose bucket + /// quota of 10,000. If you have an approved general purpose bucket quota above 10,000, + /// you must send paginated requests to list your account’s buckets. All unpaginated ListBuckets + /// requests will be rejected for Amazon Web Services accounts with a general purpose + /// bucket quota greater than 10,000. + /// + /// /// /// Container for the necessary parameters to execute the ListBuckets service method. /// @@ -15602,7 +15432,12 @@ public partial interface IAmazonS3 : IAmazonService, IDisposable /// /// Directory buckets - The HTTP Host header syntax is s3express-control.region.amazonaws.com. /// - /// + /// + /// + /// The BucketRegion response element is not part of the ListDirectoryBuckets + /// Response Syntax. + /// + /// /// /// Container for the necessary parameters to execute the ListDirectoryBuckets service method. /// @@ -15640,7 +15475,12 @@ public partial interface IAmazonS3 : IAmazonService, IDisposable /// /// Directory buckets - The HTTP Host header syntax is s3express-control.region.amazonaws.com. /// - /// + /// + /// + /// The BucketRegion response element is not part of the ListDirectoryBuckets + /// Response Syntax. + /// + /// /// /// Container for the necessary parameters to execute the ListDirectoryBuckets service method. /// @@ -15666,7 +15506,7 @@ public partial interface IAmazonS3 : IAmazonService, IDisposable /// Directory buckets - If multipart uploads in a directory bucket are in progress, /// you can't delete the bucket until all the in-progress multipart uploads are aborted /// or completed. To delete these in-progress multipart uploads, use the ListMultipartUploads - /// operation to list the in-progress multipart uploads in the bucket and use the AbortMultupartUpload + /// operation to list the in-progress multipart uploads in the bucket and use the AbortMultipartUpload /// operation to abort all the in-progress multipart uploads. /// ///     @@ -15798,7 +15638,7 @@ public partial interface IAmazonS3 : IAmazonService, IDisposable /// Directory buckets - If multipart uploads in a directory bucket are in progress, /// you can't delete the bucket until all the in-progress multipart uploads are aborted /// or completed. To delete these in-progress multipart uploads, use the ListMultipartUploads - /// operation to list the in-progress multipart uploads in the bucket and use the AbortMultupartUpload + /// operation to list the in-progress multipart uploads in the bucket and use the AbortMultipartUpload /// operation to abort all the in-progress multipart uploads. /// ///     @@ -15931,7 +15771,7 @@ public partial interface IAmazonS3 : IAmazonService, IDisposable /// Directory buckets - If multipart uploads in a directory bucket are in progress, /// you can't delete the bucket until all the in-progress multipart uploads are aborted /// or completed. To delete these in-progress multipart uploads, use the ListMultipartUploads - /// operation to list the in-progress multipart uploads in the bucket and use the AbortMultupartUpload + /// operation to list the in-progress multipart uploads in the bucket and use the AbortMultipartUpload /// operation to abort all the in-progress multipart uploads. /// ///     @@ -16064,7 +15904,7 @@ public partial interface IAmazonS3 : IAmazonService, IDisposable /// Directory buckets - If multipart uploads in a directory bucket are in progress, /// you can't delete the bucket until all the in-progress multipart uploads are aborted /// or completed. To delete these in-progress multipart uploads, use the ListMultipartUploads - /// operation to list the in-progress multipart uploads in the bucket and use the AbortMultupartUpload + /// operation to list the in-progress multipart uploads in the bucket and use the AbortMultipartUpload /// operation to abort all the in-progress multipart uploads. /// ///     @@ -16199,7 +16039,7 @@ public partial interface IAmazonS3 : IAmazonService, IDisposable /// Directory buckets - If multipart uploads in a directory bucket are in progress, /// you can't delete the bucket until all the in-progress multipart uploads are aborted /// or completed. To delete these in-progress multipart uploads, use the ListMultipartUploads - /// operation to list the in-progress multipart uploads in the bucket and use the AbortMultupartUpload + /// operation to list the in-progress multipart uploads in the bucket and use the AbortMultipartUpload /// operation to abort all the in-progress multipart uploads. /// /// @@ -16336,7 +16176,7 @@ public partial interface IAmazonS3 : IAmazonService, IDisposable /// Directory buckets - If multipart uploads in a directory bucket are in progress, /// you can't delete the bucket until all the in-progress multipart uploads are aborted /// or completed. To delete these in-progress multipart uploads, use the ListMultipartUploads - /// operation to list the in-progress multipart uploads in the bucket and use the AbortMultupartUpload + /// operation to list the in-progress multipart uploads in the bucket and use the AbortMultipartUpload /// operation to abort all the in-progress multipart uploads. /// /// @@ -19369,7 +19209,7 @@ public partial interface IAmazonS3 : IAmazonService, IDisposable ///
  • /// /// Your SSE-KMS configuration can only support 1 customer - /// managed key per directory bucket for the lifetime of the bucket. Amazon + /// managed key per directory bucket for the lifetime of the bucket. The Amazon /// Web Services managed key (aws/s3) isn't supported. /// ///
  • @@ -19518,7 +19358,7 @@ public partial interface IAmazonS3 : IAmazonService, IDisposable ///
  • /// /// Your SSE-KMS configuration can only support 1 customer - /// managed key per directory bucket for the lifetime of the bucket. Amazon + /// managed key per directory bucket for the lifetime of the bucket. The Amazon /// Web Services managed key (aws/s3) isn't supported. /// ///
  • @@ -23065,20 +22905,23 @@ public partial interface IAmazonS3 : IAmazonService, IDisposable /// lifecycle configuration. For information about lifecycle configuration, see Managing /// your storage lifecycle. /// - /// + ///
    Rules
    /// - /// Bucket lifecycle configuration now supports specifying a lifecycle rule using an object + /// You specify the lifecycle configuration in your request body. The lifecycle configuration + /// is specified as XML consisting of one or more rules. An Amazon S3 Lifecycle configuration + /// can have up to 1,000 rules. This limit is not adjustable. + /// + /// + /// + /// Bucket lifecycle configuration supports specifying a lifecycle rule using an object /// key name prefix, one or more object tags, object size, or any combination of these. /// Accordingly, this section describes the latest API. The previous version of the API /// supported filtering based only on an object key name prefix, which is supported for /// backward compatibility. For the related API description, see PutBucketLifecycle. /// - ///
    Rules
    + /// /// - /// You specify the lifecycle configuration in your request body. The lifecycle configuration - /// is specified as XML consisting of one or more rules. An Amazon S3 Lifecycle configuration - /// can have up to 1,000 rules. This limit is not adjustable. Each rule consists of the - /// following: + /// A lifecycle rule consists of the following: /// ///
    • /// @@ -23176,20 +23019,23 @@ public partial interface IAmazonS3 : IAmazonService, IDisposable /// lifecycle configuration. For information about lifecycle configuration, see Managing /// your storage lifecycle. /// - /// + ///
      Rules
      /// - /// Bucket lifecycle configuration now supports specifying a lifecycle rule using an object + /// You specify the lifecycle configuration in your request body. The lifecycle configuration + /// is specified as XML consisting of one or more rules. An Amazon S3 Lifecycle configuration + /// can have up to 1,000 rules. This limit is not adjustable. + /// + /// + /// + /// Bucket lifecycle configuration supports specifying a lifecycle rule using an object /// key name prefix, one or more object tags, object size, or any combination of these. /// Accordingly, this section describes the latest API. The previous version of the API /// supported filtering based only on an object key name prefix, which is supported for /// backward compatibility. For the related API description, see PutBucketLifecycle. /// - ///
      Rules
      + /// /// - /// You specify the lifecycle configuration in your request body. The lifecycle configuration - /// is specified as XML consisting of one or more rules. An Amazon S3 Lifecycle configuration - /// can have up to 1,000 rules. This limit is not adjustable. Each rule consists of the - /// following: + /// A lifecycle rule consists of the following: /// ///
      • /// @@ -23287,20 +23133,23 @@ public partial interface IAmazonS3 : IAmazonService, IDisposable /// lifecycle configuration. For information about lifecycle configuration, see Managing /// your storage lifecycle. /// - /// + ///
        Rules
        /// - /// Bucket lifecycle configuration now supports specifying a lifecycle rule using an object + /// You specify the lifecycle configuration in your request body. The lifecycle configuration + /// is specified as XML consisting of one or more rules. An Amazon S3 Lifecycle configuration + /// can have up to 1,000 rules. This limit is not adjustable. + /// + /// + /// + /// Bucket lifecycle configuration supports specifying a lifecycle rule using an object /// key name prefix, one or more object tags, object size, or any combination of these. /// Accordingly, this section describes the latest API. The previous version of the API /// supported filtering based only on an object key name prefix, which is supported for /// backward compatibility. For the related API description, see PutBucketLifecycle. /// - ///
        Rules
        + /// /// - /// You specify the lifecycle configuration in your request body. The lifecycle configuration - /// is specified as XML consisting of one or more rules. An Amazon S3 Lifecycle configuration - /// can have up to 1,000 rules. This limit is not adjustable. Each rule consists of the - /// following: + /// A lifecycle rule consists of the following: /// ///
        • /// @@ -23402,20 +23251,23 @@ public partial interface IAmazonS3 : IAmazonService, IDisposable /// lifecycle configuration. For information about lifecycle configuration, see Managing /// your storage lifecycle. /// - /// + ///
          Rules
          /// - /// Bucket lifecycle configuration now supports specifying a lifecycle rule using an object + /// You specify the lifecycle configuration in your request body. The lifecycle configuration + /// is specified as XML consisting of one or more rules. An Amazon S3 Lifecycle configuration + /// can have up to 1,000 rules. This limit is not adjustable. + /// + /// + /// + /// Bucket lifecycle configuration supports specifying a lifecycle rule using an object /// key name prefix, one or more object tags, object size, or any combination of these. /// Accordingly, this section describes the latest API. The previous version of the API /// supported filtering based only on an object key name prefix, which is supported for /// backward compatibility. For the related API description, see PutBucketLifecycle. /// - ///
          Rules
          + /// /// - /// You specify the lifecycle configuration in your request body. The lifecycle configuration - /// is specified as XML consisting of one or more rules. An Amazon S3 Lifecycle configuration - /// can have up to 1,000 rules. This limit is not adjustable. Each rule consists of the - /// following: + /// A lifecycle rule consists of the following: /// ///
          • /// @@ -24782,14 +24634,7 @@ public partial interface IAmazonS3 : IAmazonService, IDisposable /// /// This operation is not supported by directory buckets. /// - /// - /// - /// The SELECT job type for the RestoreObject operation is no longer available - /// to new customers. Existing customers of Amazon S3 Select can continue to use the feature - /// as usual. Learn - /// more - /// - /// + /// /// /// Restores an archived copy of an object back into Amazon S3 /// @@ -25008,14 +24853,7 @@ public partial interface IAmazonS3 : IAmazonService, IDisposable /// /// This operation is not supported by directory buckets. /// - /// - /// - /// The SELECT job type for the RestoreObject operation is no longer available - /// to new customers. Existing customers of Amazon S3 Select can continue to use the feature - /// as usual. Learn - /// more - /// - /// + /// /// /// Restores an archived copy of an object back into Amazon S3 /// @@ -25235,14 +25073,7 @@ public partial interface IAmazonS3 : IAmazonService, IDisposable /// /// This operation is not supported by directory buckets. /// - /// - /// - /// The SELECT job type for the RestoreObject operation is no longer available - /// to new customers. Existing customers of Amazon S3 Select can continue to use the feature - /// as usual. Learn - /// more - /// - /// + /// /// /// Restores an archived copy of an object back into Amazon S3 /// @@ -25462,14 +25293,7 @@ public partial interface IAmazonS3 : IAmazonService, IDisposable /// /// This operation is not supported by directory buckets. /// - /// - /// - /// The SELECT job type for the RestoreObject operation is no longer available - /// to new customers. Existing customers of Amazon S3 Select can continue to use the feature - /// as usual. Learn - /// more - /// - /// + /// /// /// Restores an archived copy of an object back into Amazon S3 /// @@ -25690,14 +25514,7 @@ public partial interface IAmazonS3 : IAmazonService, IDisposable /// /// This operation is not supported by directory buckets. /// - /// - /// - /// The SELECT job type for the RestoreObject operation is no longer available - /// to new customers. Existing customers of Amazon S3 Select can continue to use the feature - /// as usual. Learn - /// more - /// - /// + /// /// /// Restores an archived copy of an object back into Amazon S3 /// @@ -25916,14 +25733,7 @@ public partial interface IAmazonS3 : IAmazonService, IDisposable /// /// This operation is not supported by directory buckets. /// - /// - /// - /// The SELECT job type for the RestoreObject operation is no longer available - /// to new customers. Existing customers of Amazon S3 Select can continue to use the feature - /// as usual. Learn - /// more - /// - /// + /// /// /// Restores an archived copy of an object back into Amazon S3 /// @@ -26145,14 +25955,7 @@ public partial interface IAmazonS3 : IAmazonService, IDisposable /// /// This operation is not supported by directory buckets. /// - /// - /// - /// The SELECT job type for the RestoreObject operation is no longer available - /// to new customers. Existing customers of Amazon S3 Select can continue to use the feature - /// as usual. Learn - /// more - /// - /// + /// /// /// Restores an archived copy of an object back into Amazon S3 /// @@ -26375,14 +26178,7 @@ public partial interface IAmazonS3 : IAmazonService, IDisposable /// /// This operation is not supported by directory buckets. /// - /// - /// - /// The SELECT job type for the RestoreObject operation is no longer available - /// to new customers. Existing customers of Amazon S3 Select can continue to use the feature - /// as usual. Learn - /// more - /// - /// + /// /// /// Restores an archived copy of an object back into Amazon S3 /// @@ -26605,14 +26401,7 @@ public partial interface IAmazonS3 : IAmazonService, IDisposable /// /// This operation is not supported by directory buckets. /// - /// - /// - /// The SELECT job type for the RestoreObject operation is no longer available - /// to new customers. Existing customers of Amazon S3 Select can continue to use the feature - /// as usual. Learn - /// more - /// - /// + /// /// /// Restores an archived copy of an object back into Amazon S3 /// @@ -26837,14 +26626,7 @@ public partial interface IAmazonS3 : IAmazonService, IDisposable /// /// This operation is not supported by directory buckets. /// - /// - /// - /// The SELECT job type for the RestoreObject operation is no longer available - /// to new customers. Existing customers of Amazon S3 Select can continue to use the feature - /// as usual. Learn - /// more - /// - /// + /// /// /// Restores an archived copy of an object back into Amazon S3 /// @@ -27070,13 +26852,7 @@ public partial interface IAmazonS3 : IAmazonService, IDisposable /// /// This operation is not supported by directory buckets. /// - /// - /// - /// The SelectObjectContent operation is no longer available to new customers. Existing - /// customers of Amazon S3 Select can continue to use the operation as usual. Learn - /// more - /// - /// + /// /// /// This action filters the contents of an Amazon S3 object based on a simple structured /// query language (SQL) statement. In the request, along with the SQL expression, you @@ -27211,13 +26987,7 @@ public partial interface IAmazonS3 : IAmazonService, IDisposable /// /// This operation is not supported by directory buckets. /// - /// - /// - /// The SelectObjectContent operation is no longer available to new customers. Existing - /// customers of Amazon S3 Select can continue to use the operation as usual. Learn - /// more - /// - /// + /// /// /// This action filters the contents of an Amazon S3 object based on a simple structured /// query language (SQL) statement. In the request, along with the SQL expression, you diff --git a/sdk/src/Services/S3/Properties/AssemblyInfo.cs b/sdk/src/Services/S3/Properties/AssemblyInfo.cs index 7219dd8390c5..42dcb73cb065 100644 --- a/sdk/src/Services/S3/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/S3/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.403.5")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.406.2")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/S3/S3.sln b/sdk/src/Services/S3/S3.sln index 16d2ebb8a18c..e847101569c4 100644 --- a/sdk/src/Services/S3/S3.sln +++ b/sdk/src/Services/S3/S3.sln @@ -96,7 +96,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {4C173739-FFC8-4F0E-90AC-6E7B0516DB9A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {4C173739-FFC8-4F0E-90AC-6E7B0516DB9A}.Debug|Any CPU.Build.0 = Debug|Any CPU {4C173739-FFC8-4F0E-90AC-6E7B0516DB9A}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -125,129 +132,6 @@ Global {ACA74F01-4A84-4D3F-85A3-B466DCE5A9FC}.Debug|Any CPU.Build.0 = Debug|Any CPU {ACA74F01-4A84-4D3F-85A3-B466DCE5A9FC}.Release|Any CPU.ActiveCfg = Release|Any CPU {ACA74F01-4A84-4D3F-85A3-B466DCE5A9FC}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {27025833-48A1-4F68-9841-40D5E7E5455E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {27025833-48A1-4F68-9841-40D5E7E5455E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {27025833-48A1-4F68-9841-40D5E7E5455E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {27025833-48A1-4F68-9841-40D5E7E5455E}.Release|Any CPU.Build.0 = Release|Any CPU - {472B9070-950B-4E14-B4E9-FC6333B2D290}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {472B9070-950B-4E14-B4E9-FC6333B2D290}.Debug|Any CPU.Build.0 = Debug|Any CPU - {472B9070-950B-4E14-B4E9-FC6333B2D290}.Release|Any CPU.ActiveCfg = Release|Any CPU - {472B9070-950B-4E14-B4E9-FC6333B2D290}.Release|Any CPU.Build.0 = Release|Any CPU - {78A15B4B-1533-4AA1-9E8C-571618A74FDB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {78A15B4B-1533-4AA1-9E8C-571618A74FDB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {78A15B4B-1533-4AA1-9E8C-571618A74FDB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {78A15B4B-1533-4AA1-9E8C-571618A74FDB}.Release|Any CPU.Build.0 = Release|Any CPU - {B25FCAF4-3FE1-442D-B1CB-3CC9855883DD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B25FCAF4-3FE1-442D-B1CB-3CC9855883DD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B25FCAF4-3FE1-442D-B1CB-3CC9855883DD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B25FCAF4-3FE1-442D-B1CB-3CC9855883DD}.Release|Any CPU.Build.0 = Release|Any CPU - {BB2DC9F5-46BA-4774-9BBC-18BFBE0468E3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BB2DC9F5-46BA-4774-9BBC-18BFBE0468E3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BB2DC9F5-46BA-4774-9BBC-18BFBE0468E3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BB2DC9F5-46BA-4774-9BBC-18BFBE0468E3}.Release|Any CPU.Build.0 = Release|Any CPU - {30105ABF-AB32-4CC9-B0EE-0483F59253CD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {30105ABF-AB32-4CC9-B0EE-0483F59253CD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {30105ABF-AB32-4CC9-B0EE-0483F59253CD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {30105ABF-AB32-4CC9-B0EE-0483F59253CD}.Release|Any CPU.Build.0 = Release|Any CPU - {D70B1CE6-6680-4076-B816-C67268DEFC77}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D70B1CE6-6680-4076-B816-C67268DEFC77}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D70B1CE6-6680-4076-B816-C67268DEFC77}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D70B1CE6-6680-4076-B816-C67268DEFC77}.Release|Any CPU.Build.0 = Release|Any CPU - {7578A114-885B-4379-A2EF-B1A776B4BD5E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7578A114-885B-4379-A2EF-B1A776B4BD5E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7578A114-885B-4379-A2EF-B1A776B4BD5E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7578A114-885B-4379-A2EF-B1A776B4BD5E}.Release|Any CPU.Build.0 = Release|Any CPU - {1589AB0B-57FF-4336-A596-860153AF7794}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1589AB0B-57FF-4336-A596-860153AF7794}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1589AB0B-57FF-4336-A596-860153AF7794}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1589AB0B-57FF-4336-A596-860153AF7794}.Release|Any CPU.Build.0 = Release|Any CPU - {49606146-B9C3-4B39-A349-B6B85222207E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {49606146-B9C3-4B39-A349-B6B85222207E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {49606146-B9C3-4B39-A349-B6B85222207E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {49606146-B9C3-4B39-A349-B6B85222207E}.Release|Any CPU.Build.0 = Release|Any CPU - {5124C7D5-62DA-49CE-AD13-4CCC41A8492A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5124C7D5-62DA-49CE-AD13-4CCC41A8492A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5124C7D5-62DA-49CE-AD13-4CCC41A8492A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5124C7D5-62DA-49CE-AD13-4CCC41A8492A}.Release|Any CPU.Build.0 = Release|Any CPU - {77614557-D39E-4B68-BC38-75FC7A2D9E3F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {77614557-D39E-4B68-BC38-75FC7A2D9E3F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {77614557-D39E-4B68-BC38-75FC7A2D9E3F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {77614557-D39E-4B68-BC38-75FC7A2D9E3F}.Release|Any CPU.Build.0 = Release|Any CPU - {5F8AD420-6920-4D2A-B014-D034D70BB675}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5F8AD420-6920-4D2A-B014-D034D70BB675}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5F8AD420-6920-4D2A-B014-D034D70BB675}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5F8AD420-6920-4D2A-B014-D034D70BB675}.Release|Any CPU.Build.0 = Release|Any CPU - {1F4BB3A5-4A34-4F6F-BE5D-875B77E29E3E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1F4BB3A5-4A34-4F6F-BE5D-875B77E29E3E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1F4BB3A5-4A34-4F6F-BE5D-875B77E29E3E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1F4BB3A5-4A34-4F6F-BE5D-875B77E29E3E}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {27025833-48A1-4F68-9841-40D5E7E5455E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {27025833-48A1-4F68-9841-40D5E7E5455E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {27025833-48A1-4F68-9841-40D5E7E5455E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {27025833-48A1-4F68-9841-40D5E7E5455E}.Release|Any CPU.Build.0 = Release|Any CPU - {472B9070-950B-4E14-B4E9-FC6333B2D290}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {472B9070-950B-4E14-B4E9-FC6333B2D290}.Debug|Any CPU.Build.0 = Debug|Any CPU - {472B9070-950B-4E14-B4E9-FC6333B2D290}.Release|Any CPU.ActiveCfg = Release|Any CPU - {472B9070-950B-4E14-B4E9-FC6333B2D290}.Release|Any CPU.Build.0 = Release|Any CPU - {78A15B4B-1533-4AA1-9E8C-571618A74FDB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {78A15B4B-1533-4AA1-9E8C-571618A74FDB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {78A15B4B-1533-4AA1-9E8C-571618A74FDB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {78A15B4B-1533-4AA1-9E8C-571618A74FDB}.Release|Any CPU.Build.0 = Release|Any CPU - {B25FCAF4-3FE1-442D-B1CB-3CC9855883DD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B25FCAF4-3FE1-442D-B1CB-3CC9855883DD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B25FCAF4-3FE1-442D-B1CB-3CC9855883DD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B25FCAF4-3FE1-442D-B1CB-3CC9855883DD}.Release|Any CPU.Build.0 = Release|Any CPU - {BB2DC9F5-46BA-4774-9BBC-18BFBE0468E3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BB2DC9F5-46BA-4774-9BBC-18BFBE0468E3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BB2DC9F5-46BA-4774-9BBC-18BFBE0468E3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BB2DC9F5-46BA-4774-9BBC-18BFBE0468E3}.Release|Any CPU.Build.0 = Release|Any CPU - {30105ABF-AB32-4CC9-B0EE-0483F59253CD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {30105ABF-AB32-4CC9-B0EE-0483F59253CD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {30105ABF-AB32-4CC9-B0EE-0483F59253CD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {30105ABF-AB32-4CC9-B0EE-0483F59253CD}.Release|Any CPU.Build.0 = Release|Any CPU - {D70B1CE6-6680-4076-B816-C67268DEFC77}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D70B1CE6-6680-4076-B816-C67268DEFC77}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D70B1CE6-6680-4076-B816-C67268DEFC77}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D70B1CE6-6680-4076-B816-C67268DEFC77}.Release|Any CPU.Build.0 = Release|Any CPU - {7578A114-885B-4379-A2EF-B1A776B4BD5E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7578A114-885B-4379-A2EF-B1A776B4BD5E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7578A114-885B-4379-A2EF-B1A776B4BD5E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7578A114-885B-4379-A2EF-B1A776B4BD5E}.Release|Any CPU.Build.0 = Release|Any CPU - {1589AB0B-57FF-4336-A596-860153AF7794}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1589AB0B-57FF-4336-A596-860153AF7794}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1589AB0B-57FF-4336-A596-860153AF7794}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1589AB0B-57FF-4336-A596-860153AF7794}.Release|Any CPU.Build.0 = Release|Any CPU - {49606146-B9C3-4B39-A349-B6B85222207E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {49606146-B9C3-4B39-A349-B6B85222207E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {49606146-B9C3-4B39-A349-B6B85222207E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {49606146-B9C3-4B39-A349-B6B85222207E}.Release|Any CPU.Build.0 = Release|Any CPU - {5124C7D5-62DA-49CE-AD13-4CCC41A8492A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5124C7D5-62DA-49CE-AD13-4CCC41A8492A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5124C7D5-62DA-49CE-AD13-4CCC41A8492A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5124C7D5-62DA-49CE-AD13-4CCC41A8492A}.Release|Any CPU.Build.0 = Release|Any CPU - {77614557-D39E-4B68-BC38-75FC7A2D9E3F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {77614557-D39E-4B68-BC38-75FC7A2D9E3F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {77614557-D39E-4B68-BC38-75FC7A2D9E3F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {77614557-D39E-4B68-BC38-75FC7A2D9E3F}.Release|Any CPU.Build.0 = Release|Any CPU - {5F8AD420-6920-4D2A-B014-D034D70BB675}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5F8AD420-6920-4D2A-B014-D034D70BB675}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5F8AD420-6920-4D2A-B014-D034D70BB675}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5F8AD420-6920-4D2A-B014-D034D70BB675}.Release|Any CPU.Build.0 = Release|Any CPU - {1F4BB3A5-4A34-4F6F-BE5D-875B77E29E3E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1F4BB3A5-4A34-4F6F-BE5D-875B77E29E3E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1F4BB3A5-4A34-4F6F-BE5D-875B77E29E3E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1F4BB3A5-4A34-4F6F-BE5D-875B77E29E3E}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -264,7 +148,8 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {4C173739-FFC8-4F0E-90AC-6E7B0516DB9A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {3BE821F9-5DD9-4E4F-BBFF-2A75067A9804} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {8BA0A4AE-4223-4E63-9D80-2E6846F6852B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} @@ -272,39 +157,6 @@ Global {0E4F3914-B6BB-4A74-8DA4-254BAEACC1FB} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {EB3A7682-AFBC-4808-BD07-F7804A42073B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {ACA74F01-4A84-4D3F-85A3-B466DCE5A9FC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {27025833-48A1-4F68-9841-40D5E7E5455E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {472B9070-950B-4E14-B4E9-FC6333B2D290} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {78A15B4B-1533-4AA1-9E8C-571618A74FDB} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B25FCAF4-3FE1-442D-B1CB-3CC9855883DD} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {BB2DC9F5-46BA-4774-9BBC-18BFBE0468E3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {30105ABF-AB32-4CC9-B0EE-0483F59253CD} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D70B1CE6-6680-4076-B816-C67268DEFC77} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {7578A114-885B-4379-A2EF-B1A776B4BD5E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {1589AB0B-57FF-4336-A596-860153AF7794} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {49606146-B9C3-4B39-A349-B6B85222207E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {5124C7D5-62DA-49CE-AD13-4CCC41A8492A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {77614557-D39E-4B68-BC38-75FC7A2D9E3F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {5F8AD420-6920-4D2A-B014-D034D70BB675} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {1F4BB3A5-4A34-4F6F-BE5D-875B77E29E3E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {27025833-48A1-4F68-9841-40D5E7E5455E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {472B9070-950B-4E14-B4E9-FC6333B2D290} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {78A15B4B-1533-4AA1-9E8C-571618A74FDB} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B25FCAF4-3FE1-442D-B1CB-3CC9855883DD} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {BB2DC9F5-46BA-4774-9BBC-18BFBE0468E3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {30105ABF-AB32-4CC9-B0EE-0483F59253CD} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D70B1CE6-6680-4076-B816-C67268DEFC77} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {7578A114-885B-4379-A2EF-B1A776B4BD5E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {1589AB0B-57FF-4336-A596-860153AF7794} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {49606146-B9C3-4B39-A349-B6B85222207E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {5124C7D5-62DA-49CE-AD13-4CCC41A8492A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {77614557-D39E-4B68-BC38-75FC7A2D9E3F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {5F8AD420-6920-4D2A-B014-D034D70BB675} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {1F4BB3A5-4A34-4F6F-BE5D-875B77E29E3E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {2F0164DB-5715-4765-B33F-50B1776352EC} diff --git a/sdk/src/Services/S3Control/Generated/AmazonS3ControlConfig.cs b/sdk/src/Services/S3Control/Generated/AmazonS3ControlConfig.cs index 104a1f3b8868..59d349ce2819 100644 --- a/sdk/src/Services/S3Control/Generated/AmazonS3ControlConfig.cs +++ b/sdk/src/Services/S3Control/Generated/AmazonS3ControlConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.S3Control public partial class AmazonS3ControlConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("S3 Control", "4.0.0.0"); private static readonly AmazonS3ControlEndpointResolver EndpointResolver = new AmazonS3ControlEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("S3 Control", "3.7.401.12"); -======= - InternalSDKUtils.BuildUserAgentString("S3 Control", "3.7.402.8"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/S3Control/Properties/AssemblyInfo.cs b/sdk/src/Services/S3Control/Properties/AssemblyInfo.cs index 8f79d7a367b4..c179027347a2 100644 --- a/sdk/src/Services/S3Control/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/S3Control/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.12")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.402.8")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/S3Control/S3Control.sln b/sdk/src/Services/S3Control/S3Control.sln index b9ff77bbb9bd..1173e0ab9c67 100644 --- a/sdk/src/Services/S3Control/S3Control.sln +++ b/sdk/src/Services/S3Control/S3Control.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {E44D52FA-CF77-460E-ADE6-202DBE852807}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {E44D52FA-CF77-460E-ADE6-202DBE852807}.Debug|Any CPU.Build.0 = Debug|Any CPU {E44D52FA-CF77-460E-ADE6-202DBE852807}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {4684EE59-619D-42ED-96C1-FEFBFCD35C3E}.Debug|Any CPU.Build.0 = Debug|Any CPU {4684EE59-619D-42ED-96C1-FEFBFCD35C3E}.Release|Any CPU.ActiveCfg = Release|Any CPU {4684EE59-619D-42ED-96C1-FEFBFCD35C3E}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {564933B1-07EC-40E5-903C-B656B56FA96F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {564933B1-07EC-40E5-903C-B656B56FA96F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {564933B1-07EC-40E5-903C-B656B56FA96F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {564933B1-07EC-40E5-903C-B656B56FA96F}.Release|Any CPU.Build.0 = Release|Any CPU - {1194525D-D14D-4A75-BCC4-4DCEA29B90D4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1194525D-D14D-4A75-BCC4-4DCEA29B90D4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1194525D-D14D-4A75-BCC4-4DCEA29B90D4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1194525D-D14D-4A75-BCC4-4DCEA29B90D4}.Release|Any CPU.Build.0 = Release|Any CPU - {04ACF240-8534-4F75-9918-EBB87E1A5316}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {04ACF240-8534-4F75-9918-EBB87E1A5316}.Debug|Any CPU.Build.0 = Debug|Any CPU - {04ACF240-8534-4F75-9918-EBB87E1A5316}.Release|Any CPU.ActiveCfg = Release|Any CPU - {04ACF240-8534-4F75-9918-EBB87E1A5316}.Release|Any CPU.Build.0 = Release|Any CPU - {A623B7D7-D83F-4D29-A093-9904A02C685D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A623B7D7-D83F-4D29-A093-9904A02C685D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A623B7D7-D83F-4D29-A093-9904A02C685D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A623B7D7-D83F-4D29-A093-9904A02C685D}.Release|Any CPU.Build.0 = Release|Any CPU - {821D7867-7C82-4009-86C3-F0B05501C04D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {821D7867-7C82-4009-86C3-F0B05501C04D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {821D7867-7C82-4009-86C3-F0B05501C04D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {821D7867-7C82-4009-86C3-F0B05501C04D}.Release|Any CPU.Build.0 = Release|Any CPU - {B6312C0C-6FFA-478D-98AE-F2969DF7186B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B6312C0C-6FFA-478D-98AE-F2969DF7186B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B6312C0C-6FFA-478D-98AE-F2969DF7186B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B6312C0C-6FFA-478D-98AE-F2969DF7186B}.Release|Any CPU.Build.0 = Release|Any CPU - {28429C0C-6DD6-4BE6-9763-F4E205A28300}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {28429C0C-6DD6-4BE6-9763-F4E205A28300}.Debug|Any CPU.Build.0 = Debug|Any CPU - {28429C0C-6DD6-4BE6-9763-F4E205A28300}.Release|Any CPU.ActiveCfg = Release|Any CPU - {28429C0C-6DD6-4BE6-9763-F4E205A28300}.Release|Any CPU.Build.0 = Release|Any CPU - {C32A6F94-2AE6-411C-ADE5-1B8524C8177D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C32A6F94-2AE6-411C-ADE5-1B8524C8177D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C32A6F94-2AE6-411C-ADE5-1B8524C8177D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C32A6F94-2AE6-411C-ADE5-1B8524C8177D}.Release|Any CPU.Build.0 = Release|Any CPU - {499A561E-60EE-48E6-95C6-8AA16E686202}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {499A561E-60EE-48E6-95C6-8AA16E686202}.Debug|Any CPU.Build.0 = Debug|Any CPU - {499A561E-60EE-48E6-95C6-8AA16E686202}.Release|Any CPU.ActiveCfg = Release|Any CPU - {499A561E-60EE-48E6-95C6-8AA16E686202}.Release|Any CPU.Build.0 = Release|Any CPU - {DCDFB5BD-E447-48F2-B5DD-0AEF6F3BACF2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DCDFB5BD-E447-48F2-B5DD-0AEF6F3BACF2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DCDFB5BD-E447-48F2-B5DD-0AEF6F3BACF2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DCDFB5BD-E447-48F2-B5DD-0AEF6F3BACF2}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {564933B1-07EC-40E5-903C-B656B56FA96F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {564933B1-07EC-40E5-903C-B656B56FA96F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {564933B1-07EC-40E5-903C-B656B56FA96F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {564933B1-07EC-40E5-903C-B656B56FA96F}.Release|Any CPU.Build.0 = Release|Any CPU - {1194525D-D14D-4A75-BCC4-4DCEA29B90D4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1194525D-D14D-4A75-BCC4-4DCEA29B90D4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1194525D-D14D-4A75-BCC4-4DCEA29B90D4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1194525D-D14D-4A75-BCC4-4DCEA29B90D4}.Release|Any CPU.Build.0 = Release|Any CPU - {04ACF240-8534-4F75-9918-EBB87E1A5316}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {04ACF240-8534-4F75-9918-EBB87E1A5316}.Debug|Any CPU.Build.0 = Debug|Any CPU - {04ACF240-8534-4F75-9918-EBB87E1A5316}.Release|Any CPU.ActiveCfg = Release|Any CPU - {04ACF240-8534-4F75-9918-EBB87E1A5316}.Release|Any CPU.Build.0 = Release|Any CPU - {A623B7D7-D83F-4D29-A093-9904A02C685D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A623B7D7-D83F-4D29-A093-9904A02C685D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A623B7D7-D83F-4D29-A093-9904A02C685D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A623B7D7-D83F-4D29-A093-9904A02C685D}.Release|Any CPU.Build.0 = Release|Any CPU - {821D7867-7C82-4009-86C3-F0B05501C04D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {821D7867-7C82-4009-86C3-F0B05501C04D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {821D7867-7C82-4009-86C3-F0B05501C04D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {821D7867-7C82-4009-86C3-F0B05501C04D}.Release|Any CPU.Build.0 = Release|Any CPU - {B6312C0C-6FFA-478D-98AE-F2969DF7186B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B6312C0C-6FFA-478D-98AE-F2969DF7186B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B6312C0C-6FFA-478D-98AE-F2969DF7186B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B6312C0C-6FFA-478D-98AE-F2969DF7186B}.Release|Any CPU.Build.0 = Release|Any CPU - {28429C0C-6DD6-4BE6-9763-F4E205A28300}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {28429C0C-6DD6-4BE6-9763-F4E205A28300}.Debug|Any CPU.Build.0 = Debug|Any CPU - {28429C0C-6DD6-4BE6-9763-F4E205A28300}.Release|Any CPU.ActiveCfg = Release|Any CPU - {28429C0C-6DD6-4BE6-9763-F4E205A28300}.Release|Any CPU.Build.0 = Release|Any CPU - {C32A6F94-2AE6-411C-ADE5-1B8524C8177D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C32A6F94-2AE6-411C-ADE5-1B8524C8177D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C32A6F94-2AE6-411C-ADE5-1B8524C8177D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C32A6F94-2AE6-411C-ADE5-1B8524C8177D}.Release|Any CPU.Build.0 = Release|Any CPU - {499A561E-60EE-48E6-95C6-8AA16E686202}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {499A561E-60EE-48E6-95C6-8AA16E686202}.Debug|Any CPU.Build.0 = Debug|Any CPU - {499A561E-60EE-48E6-95C6-8AA16E686202}.Release|Any CPU.ActiveCfg = Release|Any CPU - {499A561E-60EE-48E6-95C6-8AA16E686202}.Release|Any CPU.Build.0 = Release|Any CPU - {DCDFB5BD-E447-48F2-B5DD-0AEF6F3BACF2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DCDFB5BD-E447-48F2-B5DD-0AEF6F3BACF2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DCDFB5BD-E447-48F2-B5DD-0AEF6F3BACF2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DCDFB5BD-E447-48F2-B5DD-0AEF6F3BACF2}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {E44D52FA-CF77-460E-ADE6-202DBE852807} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {1DE4AE9E-E066-4CA2-82C3-7F1DD2C9EB30} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {D12A3D8D-052C-454B-B2A8-B2FB14D8D941} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {6A230F16-620A-4235-9F94-D5A14A383504} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {4684EE59-619D-42ED-96C1-FEFBFCD35C3E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {564933B1-07EC-40E5-903C-B656B56FA96F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {1194525D-D14D-4A75-BCC4-4DCEA29B90D4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {04ACF240-8534-4F75-9918-EBB87E1A5316} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A623B7D7-D83F-4D29-A093-9904A02C685D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {821D7867-7C82-4009-86C3-F0B05501C04D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B6312C0C-6FFA-478D-98AE-F2969DF7186B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {28429C0C-6DD6-4BE6-9763-F4E205A28300} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C32A6F94-2AE6-411C-ADE5-1B8524C8177D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {499A561E-60EE-48E6-95C6-8AA16E686202} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {DCDFB5BD-E447-48F2-B5DD-0AEF6F3BACF2} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {564933B1-07EC-40E5-903C-B656B56FA96F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {1194525D-D14D-4A75-BCC4-4DCEA29B90D4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {04ACF240-8534-4F75-9918-EBB87E1A5316} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A623B7D7-D83F-4D29-A093-9904A02C685D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {821D7867-7C82-4009-86C3-F0B05501C04D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B6312C0C-6FFA-478D-98AE-F2969DF7186B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {28429C0C-6DD6-4BE6-9763-F4E205A28300} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C32A6F94-2AE6-411C-ADE5-1B8524C8177D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {499A561E-60EE-48E6-95C6-8AA16E686202} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {DCDFB5BD-E447-48F2-B5DD-0AEF6F3BACF2} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {DD7F4E0F-C88C-4411-A43F-02D069F37C02} diff --git a/sdk/src/Services/S3Outposts/Generated/AmazonS3OutpostsConfig.cs b/sdk/src/Services/S3Outposts/Generated/AmazonS3OutpostsConfig.cs index e502ab06ed35..c587ad776734 100644 --- a/sdk/src/Services/S3Outposts/Generated/AmazonS3OutpostsConfig.cs +++ b/sdk/src/Services/S3Outposts/Generated/AmazonS3OutpostsConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.S3Outposts public partial class AmazonS3OutpostsConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("S3Outposts", "4.0.0.0"); private static readonly AmazonS3OutpostsEndpointResolver EndpointResolver = new AmazonS3OutpostsEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("S3Outposts", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("S3Outposts", "3.7.400.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/S3Outposts/Properties/AssemblyInfo.cs b/sdk/src/Services/S3Outposts/Properties/AssemblyInfo.cs index ca83abb3c729..56bc0f2dadbb 100644 --- a/sdk/src/Services/S3Outposts/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/S3Outposts/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/S3Outposts/S3Outposts.sln b/sdk/src/Services/S3Outposts/S3Outposts.sln index 35f7d170c14a..b4a893790420 100644 --- a/sdk/src/Services/S3Outposts/S3Outposts.sln +++ b/sdk/src/Services/S3Outposts/S3Outposts.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {FA378066-0939-4C60-B7C6-E5657A236FCE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {FA378066-0939-4C60-B7C6-E5657A236FCE}.Debug|Any CPU.Build.0 = Debug|Any CPU {FA378066-0939-4C60-B7C6-E5657A236FCE}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {23A4242D-1290-4C8F-85AB-CCDF2D81342B}.Debug|Any CPU.Build.0 = Debug|Any CPU {23A4242D-1290-4C8F-85AB-CCDF2D81342B}.Release|Any CPU.ActiveCfg = Release|Any CPU {23A4242D-1290-4C8F-85AB-CCDF2D81342B}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {6FC8905F-DF17-443B-8351-60BC611DD01D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6FC8905F-DF17-443B-8351-60BC611DD01D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6FC8905F-DF17-443B-8351-60BC611DD01D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6FC8905F-DF17-443B-8351-60BC611DD01D}.Release|Any CPU.Build.0 = Release|Any CPU - {2FF0CF86-879B-4B33-AE89-CA876E2981EC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2FF0CF86-879B-4B33-AE89-CA876E2981EC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2FF0CF86-879B-4B33-AE89-CA876E2981EC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2FF0CF86-879B-4B33-AE89-CA876E2981EC}.Release|Any CPU.Build.0 = Release|Any CPU - {52A54549-EF4F-4AE8-B893-4DBF1F31D237}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {52A54549-EF4F-4AE8-B893-4DBF1F31D237}.Debug|Any CPU.Build.0 = Debug|Any CPU - {52A54549-EF4F-4AE8-B893-4DBF1F31D237}.Release|Any CPU.ActiveCfg = Release|Any CPU - {52A54549-EF4F-4AE8-B893-4DBF1F31D237}.Release|Any CPU.Build.0 = Release|Any CPU - {5FC613E3-20A2-4E5A-A7F8-098763C314C7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5FC613E3-20A2-4E5A-A7F8-098763C314C7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5FC613E3-20A2-4E5A-A7F8-098763C314C7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5FC613E3-20A2-4E5A-A7F8-098763C314C7}.Release|Any CPU.Build.0 = Release|Any CPU - {CCEDEF13-196D-4E06-BA4E-4A19CF42DFFE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CCEDEF13-196D-4E06-BA4E-4A19CF42DFFE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CCEDEF13-196D-4E06-BA4E-4A19CF42DFFE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CCEDEF13-196D-4E06-BA4E-4A19CF42DFFE}.Release|Any CPU.Build.0 = Release|Any CPU - {0BB1B11D-CEED-4E86-A192-31BAE29C4AB9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0BB1B11D-CEED-4E86-A192-31BAE29C4AB9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0BB1B11D-CEED-4E86-A192-31BAE29C4AB9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0BB1B11D-CEED-4E86-A192-31BAE29C4AB9}.Release|Any CPU.Build.0 = Release|Any CPU - {01832BE4-8403-4FD3-A4EF-BD2A7AC16086}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {01832BE4-8403-4FD3-A4EF-BD2A7AC16086}.Debug|Any CPU.Build.0 = Debug|Any CPU - {01832BE4-8403-4FD3-A4EF-BD2A7AC16086}.Release|Any CPU.ActiveCfg = Release|Any CPU - {01832BE4-8403-4FD3-A4EF-BD2A7AC16086}.Release|Any CPU.Build.0 = Release|Any CPU - {A6DE34AF-9618-4FC4-9630-B4192971B605}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A6DE34AF-9618-4FC4-9630-B4192971B605}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A6DE34AF-9618-4FC4-9630-B4192971B605}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A6DE34AF-9618-4FC4-9630-B4192971B605}.Release|Any CPU.Build.0 = Release|Any CPU - {7CDDE8D8-27F7-4C9E-AD3A-58D5448EDBA4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7CDDE8D8-27F7-4C9E-AD3A-58D5448EDBA4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7CDDE8D8-27F7-4C9E-AD3A-58D5448EDBA4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7CDDE8D8-27F7-4C9E-AD3A-58D5448EDBA4}.Release|Any CPU.Build.0 = Release|Any CPU - {EF385E50-F7BC-4712-B5BF-6522A955B1CB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EF385E50-F7BC-4712-B5BF-6522A955B1CB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EF385E50-F7BC-4712-B5BF-6522A955B1CB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EF385E50-F7BC-4712-B5BF-6522A955B1CB}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {6FC8905F-DF17-443B-8351-60BC611DD01D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6FC8905F-DF17-443B-8351-60BC611DD01D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6FC8905F-DF17-443B-8351-60BC611DD01D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6FC8905F-DF17-443B-8351-60BC611DD01D}.Release|Any CPU.Build.0 = Release|Any CPU - {2FF0CF86-879B-4B33-AE89-CA876E2981EC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2FF0CF86-879B-4B33-AE89-CA876E2981EC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2FF0CF86-879B-4B33-AE89-CA876E2981EC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2FF0CF86-879B-4B33-AE89-CA876E2981EC}.Release|Any CPU.Build.0 = Release|Any CPU - {52A54549-EF4F-4AE8-B893-4DBF1F31D237}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {52A54549-EF4F-4AE8-B893-4DBF1F31D237}.Debug|Any CPU.Build.0 = Debug|Any CPU - {52A54549-EF4F-4AE8-B893-4DBF1F31D237}.Release|Any CPU.ActiveCfg = Release|Any CPU - {52A54549-EF4F-4AE8-B893-4DBF1F31D237}.Release|Any CPU.Build.0 = Release|Any CPU - {5FC613E3-20A2-4E5A-A7F8-098763C314C7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5FC613E3-20A2-4E5A-A7F8-098763C314C7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5FC613E3-20A2-4E5A-A7F8-098763C314C7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5FC613E3-20A2-4E5A-A7F8-098763C314C7}.Release|Any CPU.Build.0 = Release|Any CPU - {CCEDEF13-196D-4E06-BA4E-4A19CF42DFFE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CCEDEF13-196D-4E06-BA4E-4A19CF42DFFE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CCEDEF13-196D-4E06-BA4E-4A19CF42DFFE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CCEDEF13-196D-4E06-BA4E-4A19CF42DFFE}.Release|Any CPU.Build.0 = Release|Any CPU - {0BB1B11D-CEED-4E86-A192-31BAE29C4AB9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0BB1B11D-CEED-4E86-A192-31BAE29C4AB9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0BB1B11D-CEED-4E86-A192-31BAE29C4AB9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0BB1B11D-CEED-4E86-A192-31BAE29C4AB9}.Release|Any CPU.Build.0 = Release|Any CPU - {01832BE4-8403-4FD3-A4EF-BD2A7AC16086}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {01832BE4-8403-4FD3-A4EF-BD2A7AC16086}.Debug|Any CPU.Build.0 = Debug|Any CPU - {01832BE4-8403-4FD3-A4EF-BD2A7AC16086}.Release|Any CPU.ActiveCfg = Release|Any CPU - {01832BE4-8403-4FD3-A4EF-BD2A7AC16086}.Release|Any CPU.Build.0 = Release|Any CPU - {A6DE34AF-9618-4FC4-9630-B4192971B605}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A6DE34AF-9618-4FC4-9630-B4192971B605}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A6DE34AF-9618-4FC4-9630-B4192971B605}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A6DE34AF-9618-4FC4-9630-B4192971B605}.Release|Any CPU.Build.0 = Release|Any CPU - {7CDDE8D8-27F7-4C9E-AD3A-58D5448EDBA4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7CDDE8D8-27F7-4C9E-AD3A-58D5448EDBA4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7CDDE8D8-27F7-4C9E-AD3A-58D5448EDBA4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7CDDE8D8-27F7-4C9E-AD3A-58D5448EDBA4}.Release|Any CPU.Build.0 = Release|Any CPU - {EF385E50-F7BC-4712-B5BF-6522A955B1CB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EF385E50-F7BC-4712-B5BF-6522A955B1CB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EF385E50-F7BC-4712-B5BF-6522A955B1CB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EF385E50-F7BC-4712-B5BF-6522A955B1CB}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {FA378066-0939-4C60-B7C6-E5657A236FCE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {4A3D6EFA-A107-4C9F-BA15-5EEE76964380} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {2AA69D3B-1E85-462D-8CC0-657214591BB6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {A36E63DC-31AC-41DF-BF3C-55AC5A035B7C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {23A4242D-1290-4C8F-85AB-CCDF2D81342B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {6FC8905F-DF17-443B-8351-60BC611DD01D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {2FF0CF86-879B-4B33-AE89-CA876E2981EC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {52A54549-EF4F-4AE8-B893-4DBF1F31D237} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {5FC613E3-20A2-4E5A-A7F8-098763C314C7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {CCEDEF13-196D-4E06-BA4E-4A19CF42DFFE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0BB1B11D-CEED-4E86-A192-31BAE29C4AB9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {01832BE4-8403-4FD3-A4EF-BD2A7AC16086} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A6DE34AF-9618-4FC4-9630-B4192971B605} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {7CDDE8D8-27F7-4C9E-AD3A-58D5448EDBA4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {EF385E50-F7BC-4712-B5BF-6522A955B1CB} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {6FC8905F-DF17-443B-8351-60BC611DD01D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {2FF0CF86-879B-4B33-AE89-CA876E2981EC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {52A54549-EF4F-4AE8-B893-4DBF1F31D237} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {5FC613E3-20A2-4E5A-A7F8-098763C314C7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {CCEDEF13-196D-4E06-BA4E-4A19CF42DFFE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0BB1B11D-CEED-4E86-A192-31BAE29C4AB9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {01832BE4-8403-4FD3-A4EF-BD2A7AC16086} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A6DE34AF-9618-4FC4-9630-B4192971B605} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {7CDDE8D8-27F7-4C9E-AD3A-58D5448EDBA4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {EF385E50-F7BC-4712-B5BF-6522A955B1CB} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {8E4CA268-3E0F-4B47-A0BE-AC7AC25AA62A} diff --git a/sdk/src/Services/SQS/Generated/AmazonSQSConfig.cs b/sdk/src/Services/SQS/Generated/AmazonSQSConfig.cs index adecbeffd2d5..849b0ea8e7d1 100644 --- a/sdk/src/Services/SQS/Generated/AmazonSQSConfig.cs +++ b/sdk/src/Services/SQS/Generated/AmazonSQSConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.SQS public partial class AmazonSQSConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("SQS", "4.0.0.0"); private static readonly AmazonSQSEndpointResolver EndpointResolver = new AmazonSQSEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("SQS", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("SQS", "3.7.400.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/SQS/Properties/AssemblyInfo.cs b/sdk/src/Services/SQS/Properties/AssemblyInfo.cs index 4b894a7a3fc5..7c70b881923d 100644 --- a/sdk/src/Services/SQS/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/SQS/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/SQS/SQS.sln b/sdk/src/Services/SQS/SQS.sln index a70bbadb214c..c58eac82c658 100644 --- a/sdk/src/Services/SQS/SQS.sln +++ b/sdk/src/Services/SQS/SQS.sln @@ -92,7 +92,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {A21A7178-6B2A-4EE7-8D3A-B8ABF65E202A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {A21A7178-6B2A-4EE7-8D3A-B8ABF65E202A}.Debug|Any CPU.Build.0 = Debug|Any CPU {A21A7178-6B2A-4EE7-8D3A-B8ABF65E202A}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -113,97 +120,6 @@ Global {84976770-A171-4447-956B-41B085FE3C72}.Debug|Any CPU.Build.0 = Debug|Any CPU {84976770-A171-4447-956B-41B085FE3C72}.Release|Any CPU.ActiveCfg = Release|Any CPU {84976770-A171-4447-956B-41B085FE3C72}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {69E838BC-9954-474E-B2F6-81611D0CFB08}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {69E838BC-9954-474E-B2F6-81611D0CFB08}.Debug|Any CPU.Build.0 = Debug|Any CPU - {69E838BC-9954-474E-B2F6-81611D0CFB08}.Release|Any CPU.ActiveCfg = Release|Any CPU - {69E838BC-9954-474E-B2F6-81611D0CFB08}.Release|Any CPU.Build.0 = Release|Any CPU - {5FC6097C-A6C8-4B29-B851-7B2DCA70911B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5FC6097C-A6C8-4B29-B851-7B2DCA70911B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5FC6097C-A6C8-4B29-B851-7B2DCA70911B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5FC6097C-A6C8-4B29-B851-7B2DCA70911B}.Release|Any CPU.Build.0 = Release|Any CPU - {F458578B-EEFA-452B-B7C9-7251F2DEE4DA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F458578B-EEFA-452B-B7C9-7251F2DEE4DA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F458578B-EEFA-452B-B7C9-7251F2DEE4DA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F458578B-EEFA-452B-B7C9-7251F2DEE4DA}.Release|Any CPU.Build.0 = Release|Any CPU - {96C95DB3-2CEF-4412-8A6B-4B13271F5C1B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {96C95DB3-2CEF-4412-8A6B-4B13271F5C1B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {96C95DB3-2CEF-4412-8A6B-4B13271F5C1B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {96C95DB3-2CEF-4412-8A6B-4B13271F5C1B}.Release|Any CPU.Build.0 = Release|Any CPU - {D76FCB69-289F-477E-9880-9378DE193305}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D76FCB69-289F-477E-9880-9378DE193305}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D76FCB69-289F-477E-9880-9378DE193305}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D76FCB69-289F-477E-9880-9378DE193305}.Release|Any CPU.Build.0 = Release|Any CPU - {66D67FAA-3EA1-4B2A-B741-ABEF41C59D34}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {66D67FAA-3EA1-4B2A-B741-ABEF41C59D34}.Debug|Any CPU.Build.0 = Debug|Any CPU - {66D67FAA-3EA1-4B2A-B741-ABEF41C59D34}.Release|Any CPU.ActiveCfg = Release|Any CPU - {66D67FAA-3EA1-4B2A-B741-ABEF41C59D34}.Release|Any CPU.Build.0 = Release|Any CPU - {3DA82048-BF27-4787-8B38-5B923CBF6DDD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3DA82048-BF27-4787-8B38-5B923CBF6DDD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3DA82048-BF27-4787-8B38-5B923CBF6DDD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3DA82048-BF27-4787-8B38-5B923CBF6DDD}.Release|Any CPU.Build.0 = Release|Any CPU - {FF89A7B9-5D60-491F-8F43-F38888CAD19E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FF89A7B9-5D60-491F-8F43-F38888CAD19E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FF89A7B9-5D60-491F-8F43-F38888CAD19E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FF89A7B9-5D60-491F-8F43-F38888CAD19E}.Release|Any CPU.Build.0 = Release|Any CPU - {A5A44DBC-9748-4A94-8819-797E6F520ED4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A5A44DBC-9748-4A94-8819-797E6F520ED4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A5A44DBC-9748-4A94-8819-797E6F520ED4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A5A44DBC-9748-4A94-8819-797E6F520ED4}.Release|Any CPU.Build.0 = Release|Any CPU - {78B924D7-C88E-49DE-8C79-6CAC40872B19}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {78B924D7-C88E-49DE-8C79-6CAC40872B19}.Debug|Any CPU.Build.0 = Debug|Any CPU - {78B924D7-C88E-49DE-8C79-6CAC40872B19}.Release|Any CPU.ActiveCfg = Release|Any CPU - {78B924D7-C88E-49DE-8C79-6CAC40872B19}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {69E838BC-9954-474E-B2F6-81611D0CFB08}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {69E838BC-9954-474E-B2F6-81611D0CFB08}.Debug|Any CPU.Build.0 = Debug|Any CPU - {69E838BC-9954-474E-B2F6-81611D0CFB08}.Release|Any CPU.ActiveCfg = Release|Any CPU - {69E838BC-9954-474E-B2F6-81611D0CFB08}.Release|Any CPU.Build.0 = Release|Any CPU - {5FC6097C-A6C8-4B29-B851-7B2DCA70911B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5FC6097C-A6C8-4B29-B851-7B2DCA70911B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5FC6097C-A6C8-4B29-B851-7B2DCA70911B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5FC6097C-A6C8-4B29-B851-7B2DCA70911B}.Release|Any CPU.Build.0 = Release|Any CPU - {F458578B-EEFA-452B-B7C9-7251F2DEE4DA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F458578B-EEFA-452B-B7C9-7251F2DEE4DA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F458578B-EEFA-452B-B7C9-7251F2DEE4DA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F458578B-EEFA-452B-B7C9-7251F2DEE4DA}.Release|Any CPU.Build.0 = Release|Any CPU - {96C95DB3-2CEF-4412-8A6B-4B13271F5C1B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {96C95DB3-2CEF-4412-8A6B-4B13271F5C1B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {96C95DB3-2CEF-4412-8A6B-4B13271F5C1B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {96C95DB3-2CEF-4412-8A6B-4B13271F5C1B}.Release|Any CPU.Build.0 = Release|Any CPU - {D76FCB69-289F-477E-9880-9378DE193305}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D76FCB69-289F-477E-9880-9378DE193305}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D76FCB69-289F-477E-9880-9378DE193305}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D76FCB69-289F-477E-9880-9378DE193305}.Release|Any CPU.Build.0 = Release|Any CPU - {66D67FAA-3EA1-4B2A-B741-ABEF41C59D34}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {66D67FAA-3EA1-4B2A-B741-ABEF41C59D34}.Debug|Any CPU.Build.0 = Debug|Any CPU - {66D67FAA-3EA1-4B2A-B741-ABEF41C59D34}.Release|Any CPU.ActiveCfg = Release|Any CPU - {66D67FAA-3EA1-4B2A-B741-ABEF41C59D34}.Release|Any CPU.Build.0 = Release|Any CPU - {3DA82048-BF27-4787-8B38-5B923CBF6DDD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3DA82048-BF27-4787-8B38-5B923CBF6DDD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3DA82048-BF27-4787-8B38-5B923CBF6DDD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3DA82048-BF27-4787-8B38-5B923CBF6DDD}.Release|Any CPU.Build.0 = Release|Any CPU - {FF89A7B9-5D60-491F-8F43-F38888CAD19E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FF89A7B9-5D60-491F-8F43-F38888CAD19E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FF89A7B9-5D60-491F-8F43-F38888CAD19E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FF89A7B9-5D60-491F-8F43-F38888CAD19E}.Release|Any CPU.Build.0 = Release|Any CPU - {A5A44DBC-9748-4A94-8819-797E6F520ED4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A5A44DBC-9748-4A94-8819-797E6F520ED4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A5A44DBC-9748-4A94-8819-797E6F520ED4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A5A44DBC-9748-4A94-8819-797E6F520ED4}.Release|Any CPU.Build.0 = Release|Any CPU - {78B924D7-C88E-49DE-8C79-6CAC40872B19}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {78B924D7-C88E-49DE-8C79-6CAC40872B19}.Debug|Any CPU.Build.0 = Debug|Any CPU - {78B924D7-C88E-49DE-8C79-6CAC40872B19}.Release|Any CPU.ActiveCfg = Release|Any CPU - {78B924D7-C88E-49DE-8C79-6CAC40872B19}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -220,37 +136,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {A21A7178-6B2A-4EE7-8D3A-B8ABF65E202A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {AF0B04AA-50AE-479D-8D27-C310586FF46A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {BBFAE153-2C9E-4CD9-8708-4ED567FC95CB} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {3F514DD1-088E-47C2-B3EF-017DE914FA2A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {84976770-A171-4447-956B-41B085FE3C72} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {69E838BC-9954-474E-B2F6-81611D0CFB08} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {5FC6097C-A6C8-4B29-B851-7B2DCA70911B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F458578B-EEFA-452B-B7C9-7251F2DEE4DA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {96C95DB3-2CEF-4412-8A6B-4B13271F5C1B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D76FCB69-289F-477E-9880-9378DE193305} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {66D67FAA-3EA1-4B2A-B741-ABEF41C59D34} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {3DA82048-BF27-4787-8B38-5B923CBF6DDD} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {FF89A7B9-5D60-491F-8F43-F38888CAD19E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A5A44DBC-9748-4A94-8819-797E6F520ED4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {78B924D7-C88E-49DE-8C79-6CAC40872B19} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {69E838BC-9954-474E-B2F6-81611D0CFB08} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {5FC6097C-A6C8-4B29-B851-7B2DCA70911B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F458578B-EEFA-452B-B7C9-7251F2DEE4DA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {96C95DB3-2CEF-4412-8A6B-4B13271F5C1B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D76FCB69-289F-477E-9880-9378DE193305} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {66D67FAA-3EA1-4B2A-B741-ABEF41C59D34} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {3DA82048-BF27-4787-8B38-5B923CBF6DDD} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {FF89A7B9-5D60-491F-8F43-F38888CAD19E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A5A44DBC-9748-4A94-8819-797E6F520ED4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {78B924D7-C88E-49DE-8C79-6CAC40872B19} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {06B11B2C-2BB7-44AA-8029-6190A8BC1399} diff --git a/sdk/src/Services/SSMContacts/Generated/AmazonSSMContactsConfig.cs b/sdk/src/Services/SSMContacts/Generated/AmazonSSMContactsConfig.cs index d670d84f8784..002d43d0f29c 100644 --- a/sdk/src/Services/SSMContacts/Generated/AmazonSSMContactsConfig.cs +++ b/sdk/src/Services/SSMContacts/Generated/AmazonSSMContactsConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.SSMContacts public partial class AmazonSSMContactsConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("SSM Contacts", "4.0.0.0"); private static readonly AmazonSSMContactsEndpointResolver EndpointResolver = new AmazonSSMContactsEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("SSM Contacts", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("SSM Contacts", "3.7.400.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/SSMContacts/Properties/AssemblyInfo.cs b/sdk/src/Services/SSMContacts/Properties/AssemblyInfo.cs index 382ec2520f48..bd8efd42ae90 100644 --- a/sdk/src/Services/SSMContacts/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/SSMContacts/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/SSMContacts/SSMContacts.sln b/sdk/src/Services/SSMContacts/SSMContacts.sln index 9c24abaf4352..ca3511942dfb 100644 --- a/sdk/src/Services/SSMContacts/SSMContacts.sln +++ b/sdk/src/Services/SSMContacts/SSMContacts.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {209475DA-1A55-4BA0-8ACC-18336636F09B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {209475DA-1A55-4BA0-8ACC-18336636F09B}.Debug|Any CPU.Build.0 = Debug|Any CPU {209475DA-1A55-4BA0-8ACC-18336636F09B}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {C4826A49-B4A0-4AFA-82CA-DB8F3E6F4AF1}.Debug|Any CPU.Build.0 = Debug|Any CPU {C4826A49-B4A0-4AFA-82CA-DB8F3E6F4AF1}.Release|Any CPU.ActiveCfg = Release|Any CPU {C4826A49-B4A0-4AFA-82CA-DB8F3E6F4AF1}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {C46749ED-D701-45C5-A41E-7268E90865AC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C46749ED-D701-45C5-A41E-7268E90865AC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C46749ED-D701-45C5-A41E-7268E90865AC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C46749ED-D701-45C5-A41E-7268E90865AC}.Release|Any CPU.Build.0 = Release|Any CPU - {FFC5BED7-E36E-4D6A-81AB-B0A240E6BB6B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FFC5BED7-E36E-4D6A-81AB-B0A240E6BB6B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FFC5BED7-E36E-4D6A-81AB-B0A240E6BB6B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FFC5BED7-E36E-4D6A-81AB-B0A240E6BB6B}.Release|Any CPU.Build.0 = Release|Any CPU - {7D0BDBF4-27AF-4261-B3A6-07BCCA23F163}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7D0BDBF4-27AF-4261-B3A6-07BCCA23F163}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7D0BDBF4-27AF-4261-B3A6-07BCCA23F163}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7D0BDBF4-27AF-4261-B3A6-07BCCA23F163}.Release|Any CPU.Build.0 = Release|Any CPU - {8BECC4CC-9FF6-4902-B7CE-0B4F2FD0E6C2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8BECC4CC-9FF6-4902-B7CE-0B4F2FD0E6C2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8BECC4CC-9FF6-4902-B7CE-0B4F2FD0E6C2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8BECC4CC-9FF6-4902-B7CE-0B4F2FD0E6C2}.Release|Any CPU.Build.0 = Release|Any CPU - {F85E92FC-D8F2-4EE4-8379-A597ECF7F62E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F85E92FC-D8F2-4EE4-8379-A597ECF7F62E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F85E92FC-D8F2-4EE4-8379-A597ECF7F62E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F85E92FC-D8F2-4EE4-8379-A597ECF7F62E}.Release|Any CPU.Build.0 = Release|Any CPU - {B8C499B3-6AB6-48D3-B67A-63AAE367E32A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B8C499B3-6AB6-48D3-B67A-63AAE367E32A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B8C499B3-6AB6-48D3-B67A-63AAE367E32A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B8C499B3-6AB6-48D3-B67A-63AAE367E32A}.Release|Any CPU.Build.0 = Release|Any CPU - {918740A8-A34F-43AB-9B29-A35C9D4D4677}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {918740A8-A34F-43AB-9B29-A35C9D4D4677}.Debug|Any CPU.Build.0 = Debug|Any CPU - {918740A8-A34F-43AB-9B29-A35C9D4D4677}.Release|Any CPU.ActiveCfg = Release|Any CPU - {918740A8-A34F-43AB-9B29-A35C9D4D4677}.Release|Any CPU.Build.0 = Release|Any CPU - {BD799177-3AC0-45D3-AC2C-5F4D3850C67E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BD799177-3AC0-45D3-AC2C-5F4D3850C67E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BD799177-3AC0-45D3-AC2C-5F4D3850C67E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BD799177-3AC0-45D3-AC2C-5F4D3850C67E}.Release|Any CPU.Build.0 = Release|Any CPU - {4D7C0659-6335-4D3A-8A87-8201B991E796}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4D7C0659-6335-4D3A-8A87-8201B991E796}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4D7C0659-6335-4D3A-8A87-8201B991E796}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4D7C0659-6335-4D3A-8A87-8201B991E796}.Release|Any CPU.Build.0 = Release|Any CPU - {62E5785B-C664-4662-883D-F28BE199C1A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {62E5785B-C664-4662-883D-F28BE199C1A2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {62E5785B-C664-4662-883D-F28BE199C1A2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {62E5785B-C664-4662-883D-F28BE199C1A2}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {C46749ED-D701-45C5-A41E-7268E90865AC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C46749ED-D701-45C5-A41E-7268E90865AC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C46749ED-D701-45C5-A41E-7268E90865AC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C46749ED-D701-45C5-A41E-7268E90865AC}.Release|Any CPU.Build.0 = Release|Any CPU - {FFC5BED7-E36E-4D6A-81AB-B0A240E6BB6B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FFC5BED7-E36E-4D6A-81AB-B0A240E6BB6B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FFC5BED7-E36E-4D6A-81AB-B0A240E6BB6B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FFC5BED7-E36E-4D6A-81AB-B0A240E6BB6B}.Release|Any CPU.Build.0 = Release|Any CPU - {7D0BDBF4-27AF-4261-B3A6-07BCCA23F163}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7D0BDBF4-27AF-4261-B3A6-07BCCA23F163}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7D0BDBF4-27AF-4261-B3A6-07BCCA23F163}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7D0BDBF4-27AF-4261-B3A6-07BCCA23F163}.Release|Any CPU.Build.0 = Release|Any CPU - {8BECC4CC-9FF6-4902-B7CE-0B4F2FD0E6C2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8BECC4CC-9FF6-4902-B7CE-0B4F2FD0E6C2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8BECC4CC-9FF6-4902-B7CE-0B4F2FD0E6C2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8BECC4CC-9FF6-4902-B7CE-0B4F2FD0E6C2}.Release|Any CPU.Build.0 = Release|Any CPU - {F85E92FC-D8F2-4EE4-8379-A597ECF7F62E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F85E92FC-D8F2-4EE4-8379-A597ECF7F62E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F85E92FC-D8F2-4EE4-8379-A597ECF7F62E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F85E92FC-D8F2-4EE4-8379-A597ECF7F62E}.Release|Any CPU.Build.0 = Release|Any CPU - {B8C499B3-6AB6-48D3-B67A-63AAE367E32A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B8C499B3-6AB6-48D3-B67A-63AAE367E32A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B8C499B3-6AB6-48D3-B67A-63AAE367E32A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B8C499B3-6AB6-48D3-B67A-63AAE367E32A}.Release|Any CPU.Build.0 = Release|Any CPU - {918740A8-A34F-43AB-9B29-A35C9D4D4677}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {918740A8-A34F-43AB-9B29-A35C9D4D4677}.Debug|Any CPU.Build.0 = Debug|Any CPU - {918740A8-A34F-43AB-9B29-A35C9D4D4677}.Release|Any CPU.ActiveCfg = Release|Any CPU - {918740A8-A34F-43AB-9B29-A35C9D4D4677}.Release|Any CPU.Build.0 = Release|Any CPU - {BD799177-3AC0-45D3-AC2C-5F4D3850C67E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BD799177-3AC0-45D3-AC2C-5F4D3850C67E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BD799177-3AC0-45D3-AC2C-5F4D3850C67E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BD799177-3AC0-45D3-AC2C-5F4D3850C67E}.Release|Any CPU.Build.0 = Release|Any CPU - {4D7C0659-6335-4D3A-8A87-8201B991E796}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4D7C0659-6335-4D3A-8A87-8201B991E796}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4D7C0659-6335-4D3A-8A87-8201B991E796}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4D7C0659-6335-4D3A-8A87-8201B991E796}.Release|Any CPU.Build.0 = Release|Any CPU - {62E5785B-C664-4662-883D-F28BE199C1A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {62E5785B-C664-4662-883D-F28BE199C1A2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {62E5785B-C664-4662-883D-F28BE199C1A2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {62E5785B-C664-4662-883D-F28BE199C1A2}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {209475DA-1A55-4BA0-8ACC-18336636F09B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {F5A14625-C1D8-4F3D-9F0C-D9BACF4D5B9B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {D0013CC0-59E6-4A5A-B09E-287DEC093902} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {6F42339D-22B0-4EE7-875D-73CF0EFE68EC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {C4826A49-B4A0-4AFA-82CA-DB8F3E6F4AF1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {C46749ED-D701-45C5-A41E-7268E90865AC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {FFC5BED7-E36E-4D6A-81AB-B0A240E6BB6B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {7D0BDBF4-27AF-4261-B3A6-07BCCA23F163} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8BECC4CC-9FF6-4902-B7CE-0B4F2FD0E6C2} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F85E92FC-D8F2-4EE4-8379-A597ECF7F62E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B8C499B3-6AB6-48D3-B67A-63AAE367E32A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {918740A8-A34F-43AB-9B29-A35C9D4D4677} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {BD799177-3AC0-45D3-AC2C-5F4D3850C67E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4D7C0659-6335-4D3A-8A87-8201B991E796} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {62E5785B-C664-4662-883D-F28BE199C1A2} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {C46749ED-D701-45C5-A41E-7268E90865AC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {FFC5BED7-E36E-4D6A-81AB-B0A240E6BB6B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {7D0BDBF4-27AF-4261-B3A6-07BCCA23F163} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8BECC4CC-9FF6-4902-B7CE-0B4F2FD0E6C2} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F85E92FC-D8F2-4EE4-8379-A597ECF7F62E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B8C499B3-6AB6-48D3-B67A-63AAE367E32A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {918740A8-A34F-43AB-9B29-A35C9D4D4677} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {BD799177-3AC0-45D3-AC2C-5F4D3850C67E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4D7C0659-6335-4D3A-8A87-8201B991E796} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {62E5785B-C664-4662-883D-F28BE199C1A2} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {361FCF4B-B617-48A8-BD84-14030AC0F801} diff --git a/sdk/src/Services/SSMIncidents/Generated/AmazonSSMIncidentsConfig.cs b/sdk/src/Services/SSMIncidents/Generated/AmazonSSMIncidentsConfig.cs index 88b2d3e93dba..e81df57db16c 100644 --- a/sdk/src/Services/SSMIncidents/Generated/AmazonSSMIncidentsConfig.cs +++ b/sdk/src/Services/SSMIncidents/Generated/AmazonSSMIncidentsConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.SSMIncidents public partial class AmazonSSMIncidentsConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("SSM Incidents", "4.0.0.0"); private static readonly AmazonSSMIncidentsEndpointResolver EndpointResolver = new AmazonSSMIncidentsEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("SSM Incidents", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("SSM Incidents", "3.7.400.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/SSMIncidents/Properties/AssemblyInfo.cs b/sdk/src/Services/SSMIncidents/Properties/AssemblyInfo.cs index a695d1838fee..7edf1b2345d8 100644 --- a/sdk/src/Services/SSMIncidents/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/SSMIncidents/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/SSMIncidents/SSMIncidents.sln b/sdk/src/Services/SSMIncidents/SSMIncidents.sln index 5af6b644cbfb..5b73326fa9fd 100644 --- a/sdk/src/Services/SSMIncidents/SSMIncidents.sln +++ b/sdk/src/Services/SSMIncidents/SSMIncidents.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {CB9E6C77-5138-4ECC-AEBD-CE70B4A2865F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {CB9E6C77-5138-4ECC-AEBD-CE70B4A2865F}.Debug|Any CPU.Build.0 = Debug|Any CPU {CB9E6C77-5138-4ECC-AEBD-CE70B4A2865F}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {2DCCF5E3-FB3A-4D65-B0A7-88B04F85B6B1}.Debug|Any CPU.Build.0 = Debug|Any CPU {2DCCF5E3-FB3A-4D65-B0A7-88B04F85B6B1}.Release|Any CPU.ActiveCfg = Release|Any CPU {2DCCF5E3-FB3A-4D65-B0A7-88B04F85B6B1}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {B2FE77B8-38B9-4135-962B-F2A7DBFA2021}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B2FE77B8-38B9-4135-962B-F2A7DBFA2021}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B2FE77B8-38B9-4135-962B-F2A7DBFA2021}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B2FE77B8-38B9-4135-962B-F2A7DBFA2021}.Release|Any CPU.Build.0 = Release|Any CPU - {0A878630-01A4-4060-8040-E8C81EA880B2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0A878630-01A4-4060-8040-E8C81EA880B2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0A878630-01A4-4060-8040-E8C81EA880B2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0A878630-01A4-4060-8040-E8C81EA880B2}.Release|Any CPU.Build.0 = Release|Any CPU - {CCACB012-13E0-4A00-AA79-F9340F7F16E7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CCACB012-13E0-4A00-AA79-F9340F7F16E7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CCACB012-13E0-4A00-AA79-F9340F7F16E7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CCACB012-13E0-4A00-AA79-F9340F7F16E7}.Release|Any CPU.Build.0 = Release|Any CPU - {5DD0C0A5-E3C4-43A1-9BFE-39A613F9B8F0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5DD0C0A5-E3C4-43A1-9BFE-39A613F9B8F0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5DD0C0A5-E3C4-43A1-9BFE-39A613F9B8F0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5DD0C0A5-E3C4-43A1-9BFE-39A613F9B8F0}.Release|Any CPU.Build.0 = Release|Any CPU - {B9763D6F-194C-47DF-BD4A-8B3FAEAECF72}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B9763D6F-194C-47DF-BD4A-8B3FAEAECF72}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B9763D6F-194C-47DF-BD4A-8B3FAEAECF72}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B9763D6F-194C-47DF-BD4A-8B3FAEAECF72}.Release|Any CPU.Build.0 = Release|Any CPU - {4528BA50-15E1-4D0B-B921-E504E8CEF912}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4528BA50-15E1-4D0B-B921-E504E8CEF912}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4528BA50-15E1-4D0B-B921-E504E8CEF912}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4528BA50-15E1-4D0B-B921-E504E8CEF912}.Release|Any CPU.Build.0 = Release|Any CPU - {32F0B6C3-E311-48DA-95F8-843C9F9D4E64}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {32F0B6C3-E311-48DA-95F8-843C9F9D4E64}.Debug|Any CPU.Build.0 = Debug|Any CPU - {32F0B6C3-E311-48DA-95F8-843C9F9D4E64}.Release|Any CPU.ActiveCfg = Release|Any CPU - {32F0B6C3-E311-48DA-95F8-843C9F9D4E64}.Release|Any CPU.Build.0 = Release|Any CPU - {0078826F-86CE-4312-BBC1-A32BB66AA131}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0078826F-86CE-4312-BBC1-A32BB66AA131}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0078826F-86CE-4312-BBC1-A32BB66AA131}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0078826F-86CE-4312-BBC1-A32BB66AA131}.Release|Any CPU.Build.0 = Release|Any CPU - {5D372EC7-1713-473A-A817-0397D403EF5F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5D372EC7-1713-473A-A817-0397D403EF5F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5D372EC7-1713-473A-A817-0397D403EF5F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5D372EC7-1713-473A-A817-0397D403EF5F}.Release|Any CPU.Build.0 = Release|Any CPU - {41E92231-56ED-45EF-B4EE-E0B64EBB6047}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {41E92231-56ED-45EF-B4EE-E0B64EBB6047}.Debug|Any CPU.Build.0 = Debug|Any CPU - {41E92231-56ED-45EF-B4EE-E0B64EBB6047}.Release|Any CPU.ActiveCfg = Release|Any CPU - {41E92231-56ED-45EF-B4EE-E0B64EBB6047}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {B2FE77B8-38B9-4135-962B-F2A7DBFA2021}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B2FE77B8-38B9-4135-962B-F2A7DBFA2021}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B2FE77B8-38B9-4135-962B-F2A7DBFA2021}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B2FE77B8-38B9-4135-962B-F2A7DBFA2021}.Release|Any CPU.Build.0 = Release|Any CPU - {0A878630-01A4-4060-8040-E8C81EA880B2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0A878630-01A4-4060-8040-E8C81EA880B2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0A878630-01A4-4060-8040-E8C81EA880B2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0A878630-01A4-4060-8040-E8C81EA880B2}.Release|Any CPU.Build.0 = Release|Any CPU - {CCACB012-13E0-4A00-AA79-F9340F7F16E7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CCACB012-13E0-4A00-AA79-F9340F7F16E7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CCACB012-13E0-4A00-AA79-F9340F7F16E7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CCACB012-13E0-4A00-AA79-F9340F7F16E7}.Release|Any CPU.Build.0 = Release|Any CPU - {5DD0C0A5-E3C4-43A1-9BFE-39A613F9B8F0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5DD0C0A5-E3C4-43A1-9BFE-39A613F9B8F0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5DD0C0A5-E3C4-43A1-9BFE-39A613F9B8F0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5DD0C0A5-E3C4-43A1-9BFE-39A613F9B8F0}.Release|Any CPU.Build.0 = Release|Any CPU - {B9763D6F-194C-47DF-BD4A-8B3FAEAECF72}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B9763D6F-194C-47DF-BD4A-8B3FAEAECF72}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B9763D6F-194C-47DF-BD4A-8B3FAEAECF72}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B9763D6F-194C-47DF-BD4A-8B3FAEAECF72}.Release|Any CPU.Build.0 = Release|Any CPU - {4528BA50-15E1-4D0B-B921-E504E8CEF912}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4528BA50-15E1-4D0B-B921-E504E8CEF912}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4528BA50-15E1-4D0B-B921-E504E8CEF912}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4528BA50-15E1-4D0B-B921-E504E8CEF912}.Release|Any CPU.Build.0 = Release|Any CPU - {32F0B6C3-E311-48DA-95F8-843C9F9D4E64}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {32F0B6C3-E311-48DA-95F8-843C9F9D4E64}.Debug|Any CPU.Build.0 = Debug|Any CPU - {32F0B6C3-E311-48DA-95F8-843C9F9D4E64}.Release|Any CPU.ActiveCfg = Release|Any CPU - {32F0B6C3-E311-48DA-95F8-843C9F9D4E64}.Release|Any CPU.Build.0 = Release|Any CPU - {0078826F-86CE-4312-BBC1-A32BB66AA131}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0078826F-86CE-4312-BBC1-A32BB66AA131}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0078826F-86CE-4312-BBC1-A32BB66AA131}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0078826F-86CE-4312-BBC1-A32BB66AA131}.Release|Any CPU.Build.0 = Release|Any CPU - {5D372EC7-1713-473A-A817-0397D403EF5F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5D372EC7-1713-473A-A817-0397D403EF5F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5D372EC7-1713-473A-A817-0397D403EF5F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5D372EC7-1713-473A-A817-0397D403EF5F}.Release|Any CPU.Build.0 = Release|Any CPU - {41E92231-56ED-45EF-B4EE-E0B64EBB6047}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {41E92231-56ED-45EF-B4EE-E0B64EBB6047}.Debug|Any CPU.Build.0 = Debug|Any CPU - {41E92231-56ED-45EF-B4EE-E0B64EBB6047}.Release|Any CPU.ActiveCfg = Release|Any CPU - {41E92231-56ED-45EF-B4EE-E0B64EBB6047}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {CB9E6C77-5138-4ECC-AEBD-CE70B4A2865F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {FE5D84D5-306B-4589-ABCD-B2C967249411} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {80911417-7471-4771-B282-5A56812B9602} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {BF7C9D10-33CF-4864-8F10-0F9BD1B60AF5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {2DCCF5E3-FB3A-4D65-B0A7-88B04F85B6B1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {B2FE77B8-38B9-4135-962B-F2A7DBFA2021} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0A878630-01A4-4060-8040-E8C81EA880B2} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {CCACB012-13E0-4A00-AA79-F9340F7F16E7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {5DD0C0A5-E3C4-43A1-9BFE-39A613F9B8F0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B9763D6F-194C-47DF-BD4A-8B3FAEAECF72} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4528BA50-15E1-4D0B-B921-E504E8CEF912} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {32F0B6C3-E311-48DA-95F8-843C9F9D4E64} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0078826F-86CE-4312-BBC1-A32BB66AA131} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {5D372EC7-1713-473A-A817-0397D403EF5F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {41E92231-56ED-45EF-B4EE-E0B64EBB6047} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B2FE77B8-38B9-4135-962B-F2A7DBFA2021} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0A878630-01A4-4060-8040-E8C81EA880B2} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {CCACB012-13E0-4A00-AA79-F9340F7F16E7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {5DD0C0A5-E3C4-43A1-9BFE-39A613F9B8F0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B9763D6F-194C-47DF-BD4A-8B3FAEAECF72} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4528BA50-15E1-4D0B-B921-E504E8CEF912} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {32F0B6C3-E311-48DA-95F8-843C9F9D4E64} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0078826F-86CE-4312-BBC1-A32BB66AA131} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {5D372EC7-1713-473A-A817-0397D403EF5F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {41E92231-56ED-45EF-B4EE-E0B64EBB6047} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {F104E3C4-2648-4189-8416-8879CBCA04F6} diff --git a/sdk/src/Services/SSMQuickSetup/Generated/AmazonSSMQuickSetupConfig.cs b/sdk/src/Services/SSMQuickSetup/Generated/AmazonSSMQuickSetupConfig.cs index 1d4ea5df1c07..20e7067edb98 100644 --- a/sdk/src/Services/SSMQuickSetup/Generated/AmazonSSMQuickSetupConfig.cs +++ b/sdk/src/Services/SSMQuickSetup/Generated/AmazonSSMQuickSetupConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.SSMQuickSetup public partial class AmazonSSMQuickSetupConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("SSM QuickSetup", "4.0.0.0"); private static readonly AmazonSSMQuickSetupEndpointResolver EndpointResolver = new AmazonSSMQuickSetupEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("SSM QuickSetup", "3.7.400.24"); -======= - InternalSDKUtils.BuildUserAgentString("SSM QuickSetup", "3.7.400.51"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/SSMQuickSetup/Properties/AssemblyInfo.cs b/sdk/src/Services/SSMQuickSetup/Properties/AssemblyInfo.cs index 4730a5afba3f..90d45310a64b 100644 --- a/sdk/src/Services/SSMQuickSetup/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/SSMQuickSetup/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.24")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.51")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/SSMQuickSetup/SSMQuickSetup.sln b/sdk/src/Services/SSMQuickSetup/SSMQuickSetup.sln index e1e154b4cb1b..c978516711c3 100644 --- a/sdk/src/Services/SSMQuickSetup/SSMQuickSetup.sln +++ b/sdk/src/Services/SSMQuickSetup/SSMQuickSetup.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {09D2F840-40FA-4B84-8D22-361BF69010A5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {09D2F840-40FA-4B84-8D22-361BF69010A5}.Debug|Any CPU.Build.0 = Debug|Any CPU {09D2F840-40FA-4B84-8D22-361BF69010A5}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {C7E3BAE5-6DFC-4343-8B6E-84E0491EA328}.Debug|Any CPU.Build.0 = Debug|Any CPU {C7E3BAE5-6DFC-4343-8B6E-84E0491EA328}.Release|Any CPU.ActiveCfg = Release|Any CPU {C7E3BAE5-6DFC-4343-8B6E-84E0491EA328}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {FC9674D6-D23E-4B70-967D-D1DEAB9770C1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FC9674D6-D23E-4B70-967D-D1DEAB9770C1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FC9674D6-D23E-4B70-967D-D1DEAB9770C1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FC9674D6-D23E-4B70-967D-D1DEAB9770C1}.Release|Any CPU.Build.0 = Release|Any CPU - {3DB90CC9-F805-4E00-80A4-2DCB67632B5F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3DB90CC9-F805-4E00-80A4-2DCB67632B5F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3DB90CC9-F805-4E00-80A4-2DCB67632B5F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3DB90CC9-F805-4E00-80A4-2DCB67632B5F}.Release|Any CPU.Build.0 = Release|Any CPU - {F775471E-3F64-4309-84A4-DC283F098CD8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F775471E-3F64-4309-84A4-DC283F098CD8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F775471E-3F64-4309-84A4-DC283F098CD8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F775471E-3F64-4309-84A4-DC283F098CD8}.Release|Any CPU.Build.0 = Release|Any CPU - {0DF5962A-EC5E-4884-BFE8-8DCA958A75A7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0DF5962A-EC5E-4884-BFE8-8DCA958A75A7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0DF5962A-EC5E-4884-BFE8-8DCA958A75A7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0DF5962A-EC5E-4884-BFE8-8DCA958A75A7}.Release|Any CPU.Build.0 = Release|Any CPU - {6BABF657-7FE3-46CD-AF21-9D7F64CE5797}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6BABF657-7FE3-46CD-AF21-9D7F64CE5797}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6BABF657-7FE3-46CD-AF21-9D7F64CE5797}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6BABF657-7FE3-46CD-AF21-9D7F64CE5797}.Release|Any CPU.Build.0 = Release|Any CPU - {6028D096-3726-4B48-9E4F-8E1E7BA8174F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6028D096-3726-4B48-9E4F-8E1E7BA8174F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6028D096-3726-4B48-9E4F-8E1E7BA8174F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6028D096-3726-4B48-9E4F-8E1E7BA8174F}.Release|Any CPU.Build.0 = Release|Any CPU - {62EC3B8C-0477-4B1A-BD1A-605E7411A4FA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {62EC3B8C-0477-4B1A-BD1A-605E7411A4FA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {62EC3B8C-0477-4B1A-BD1A-605E7411A4FA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {62EC3B8C-0477-4B1A-BD1A-605E7411A4FA}.Release|Any CPU.Build.0 = Release|Any CPU - {282E3C92-469F-4B6E-892C-F18E6CF76EF9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {282E3C92-469F-4B6E-892C-F18E6CF76EF9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {282E3C92-469F-4B6E-892C-F18E6CF76EF9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {282E3C92-469F-4B6E-892C-F18E6CF76EF9}.Release|Any CPU.Build.0 = Release|Any CPU - {6DD5F71E-EF9C-4DAE-8719-4B61A984871E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6DD5F71E-EF9C-4DAE-8719-4B61A984871E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6DD5F71E-EF9C-4DAE-8719-4B61A984871E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6DD5F71E-EF9C-4DAE-8719-4B61A984871E}.Release|Any CPU.Build.0 = Release|Any CPU - {C83BEA87-BE7D-4D76-AB45-BA3E4447A47D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C83BEA87-BE7D-4D76-AB45-BA3E4447A47D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C83BEA87-BE7D-4D76-AB45-BA3E4447A47D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C83BEA87-BE7D-4D76-AB45-BA3E4447A47D}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {FC9674D6-D23E-4B70-967D-D1DEAB9770C1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FC9674D6-D23E-4B70-967D-D1DEAB9770C1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FC9674D6-D23E-4B70-967D-D1DEAB9770C1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FC9674D6-D23E-4B70-967D-D1DEAB9770C1}.Release|Any CPU.Build.0 = Release|Any CPU - {3DB90CC9-F805-4E00-80A4-2DCB67632B5F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3DB90CC9-F805-4E00-80A4-2DCB67632B5F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3DB90CC9-F805-4E00-80A4-2DCB67632B5F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3DB90CC9-F805-4E00-80A4-2DCB67632B5F}.Release|Any CPU.Build.0 = Release|Any CPU - {F775471E-3F64-4309-84A4-DC283F098CD8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F775471E-3F64-4309-84A4-DC283F098CD8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F775471E-3F64-4309-84A4-DC283F098CD8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F775471E-3F64-4309-84A4-DC283F098CD8}.Release|Any CPU.Build.0 = Release|Any CPU - {0DF5962A-EC5E-4884-BFE8-8DCA958A75A7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0DF5962A-EC5E-4884-BFE8-8DCA958A75A7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0DF5962A-EC5E-4884-BFE8-8DCA958A75A7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0DF5962A-EC5E-4884-BFE8-8DCA958A75A7}.Release|Any CPU.Build.0 = Release|Any CPU - {6BABF657-7FE3-46CD-AF21-9D7F64CE5797}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6BABF657-7FE3-46CD-AF21-9D7F64CE5797}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6BABF657-7FE3-46CD-AF21-9D7F64CE5797}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6BABF657-7FE3-46CD-AF21-9D7F64CE5797}.Release|Any CPU.Build.0 = Release|Any CPU - {6028D096-3726-4B48-9E4F-8E1E7BA8174F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6028D096-3726-4B48-9E4F-8E1E7BA8174F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6028D096-3726-4B48-9E4F-8E1E7BA8174F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6028D096-3726-4B48-9E4F-8E1E7BA8174F}.Release|Any CPU.Build.0 = Release|Any CPU - {62EC3B8C-0477-4B1A-BD1A-605E7411A4FA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {62EC3B8C-0477-4B1A-BD1A-605E7411A4FA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {62EC3B8C-0477-4B1A-BD1A-605E7411A4FA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {62EC3B8C-0477-4B1A-BD1A-605E7411A4FA}.Release|Any CPU.Build.0 = Release|Any CPU - {282E3C92-469F-4B6E-892C-F18E6CF76EF9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {282E3C92-469F-4B6E-892C-F18E6CF76EF9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {282E3C92-469F-4B6E-892C-F18E6CF76EF9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {282E3C92-469F-4B6E-892C-F18E6CF76EF9}.Release|Any CPU.Build.0 = Release|Any CPU - {6DD5F71E-EF9C-4DAE-8719-4B61A984871E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6DD5F71E-EF9C-4DAE-8719-4B61A984871E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6DD5F71E-EF9C-4DAE-8719-4B61A984871E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6DD5F71E-EF9C-4DAE-8719-4B61A984871E}.Release|Any CPU.Build.0 = Release|Any CPU - {C83BEA87-BE7D-4D76-AB45-BA3E4447A47D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C83BEA87-BE7D-4D76-AB45-BA3E4447A47D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C83BEA87-BE7D-4D76-AB45-BA3E4447A47D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C83BEA87-BE7D-4D76-AB45-BA3E4447A47D}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {09D2F840-40FA-4B84-8D22-361BF69010A5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {EA3EB793-F9A9-43E5-97D5-64D9905D98F4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {8DC9202C-8466-4EED-8B9E-9640D44280E0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {35DB9800-05EC-4352-A2FE-C98BD1D844AB} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {C7E3BAE5-6DFC-4343-8B6E-84E0491EA328} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {FC9674D6-D23E-4B70-967D-D1DEAB9770C1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {3DB90CC9-F805-4E00-80A4-2DCB67632B5F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F775471E-3F64-4309-84A4-DC283F098CD8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0DF5962A-EC5E-4884-BFE8-8DCA958A75A7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6BABF657-7FE3-46CD-AF21-9D7F64CE5797} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6028D096-3726-4B48-9E4F-8E1E7BA8174F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {62EC3B8C-0477-4B1A-BD1A-605E7411A4FA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {282E3C92-469F-4B6E-892C-F18E6CF76EF9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6DD5F71E-EF9C-4DAE-8719-4B61A984871E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C83BEA87-BE7D-4D76-AB45-BA3E4447A47D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {FC9674D6-D23E-4B70-967D-D1DEAB9770C1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {3DB90CC9-F805-4E00-80A4-2DCB67632B5F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F775471E-3F64-4309-84A4-DC283F098CD8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0DF5962A-EC5E-4884-BFE8-8DCA958A75A7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6BABF657-7FE3-46CD-AF21-9D7F64CE5797} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6028D096-3726-4B48-9E4F-8E1E7BA8174F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {62EC3B8C-0477-4B1A-BD1A-605E7411A4FA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {282E3C92-469F-4B6E-892C-F18E6CF76EF9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6DD5F71E-EF9C-4DAE-8719-4B61A984871E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C83BEA87-BE7D-4D76-AB45-BA3E4447A47D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {D28CEE24-2DB8-4FDC-B046-5CD465B881C5} diff --git a/sdk/src/Services/SSO/Generated/AmazonSSOConfig.cs b/sdk/src/Services/SSO/Generated/AmazonSSOConfig.cs index 2f50a2ceebb4..1ea69a084b96 100644 --- a/sdk/src/Services/SSO/Generated/AmazonSSOConfig.cs +++ b/sdk/src/Services/SSO/Generated/AmazonSSOConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.SSO public partial class AmazonSSOConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("SSO", "4.0.0.0"); private static readonly AmazonSSOEndpointResolver EndpointResolver = new AmazonSSOEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("SSO", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("SSO", "3.7.400.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/SSO/Properties/AssemblyInfo.cs b/sdk/src/Services/SSO/Properties/AssemblyInfo.cs index 2d27e5821cc8..d3962a81d7e5 100644 --- a/sdk/src/Services/SSO/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/SSO/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/SSO/SSO.sln b/sdk/src/Services/SSO/SSO.sln index 0935eeb0b998..0192fdcfbc4b 100644 --- a/sdk/src/Services/SSO/SSO.sln +++ b/sdk/src/Services/SSO/SSO.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {A9C700BA-4DCD-4000-BC14-6F69386CF46F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {A9C700BA-4DCD-4000-BC14-6F69386CF46F}.Debug|Any CPU.Build.0 = Debug|Any CPU {A9C700BA-4DCD-4000-BC14-6F69386CF46F}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {CA24D4D4-8F01-4EAC-9E95-D62F144B5184}.Debug|Any CPU.Build.0 = Debug|Any CPU {CA24D4D4-8F01-4EAC-9E95-D62F144B5184}.Release|Any CPU.ActiveCfg = Release|Any CPU {CA24D4D4-8F01-4EAC-9E95-D62F144B5184}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {8B407060-66FA-4C3E-9ADF-AAA65E368DE6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8B407060-66FA-4C3E-9ADF-AAA65E368DE6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8B407060-66FA-4C3E-9ADF-AAA65E368DE6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8B407060-66FA-4C3E-9ADF-AAA65E368DE6}.Release|Any CPU.Build.0 = Release|Any CPU - {A315F155-C98E-4F14-8061-959E6985CC23}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A315F155-C98E-4F14-8061-959E6985CC23}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A315F155-C98E-4F14-8061-959E6985CC23}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A315F155-C98E-4F14-8061-959E6985CC23}.Release|Any CPU.Build.0 = Release|Any CPU - {51B347E8-E2FB-4188-B75B-1EA96BAB5CBC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {51B347E8-E2FB-4188-B75B-1EA96BAB5CBC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {51B347E8-E2FB-4188-B75B-1EA96BAB5CBC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {51B347E8-E2FB-4188-B75B-1EA96BAB5CBC}.Release|Any CPU.Build.0 = Release|Any CPU - {7A409FAA-0EE4-483E-8F6C-35DD39F15D2E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7A409FAA-0EE4-483E-8F6C-35DD39F15D2E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7A409FAA-0EE4-483E-8F6C-35DD39F15D2E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7A409FAA-0EE4-483E-8F6C-35DD39F15D2E}.Release|Any CPU.Build.0 = Release|Any CPU - {F4CD1C83-1868-44B5-AAC3-A251056EFC31}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F4CD1C83-1868-44B5-AAC3-A251056EFC31}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F4CD1C83-1868-44B5-AAC3-A251056EFC31}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F4CD1C83-1868-44B5-AAC3-A251056EFC31}.Release|Any CPU.Build.0 = Release|Any CPU - {0E032041-CCCC-4CAB-A5E4-69E468B90D86}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0E032041-CCCC-4CAB-A5E4-69E468B90D86}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0E032041-CCCC-4CAB-A5E4-69E468B90D86}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0E032041-CCCC-4CAB-A5E4-69E468B90D86}.Release|Any CPU.Build.0 = Release|Any CPU - {9AE11559-54D3-47CF-A26E-D570A154BAD4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9AE11559-54D3-47CF-A26E-D570A154BAD4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9AE11559-54D3-47CF-A26E-D570A154BAD4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9AE11559-54D3-47CF-A26E-D570A154BAD4}.Release|Any CPU.Build.0 = Release|Any CPU - {EC6D86AF-890B-4F65-A502-CCA997505EE0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EC6D86AF-890B-4F65-A502-CCA997505EE0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EC6D86AF-890B-4F65-A502-CCA997505EE0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EC6D86AF-890B-4F65-A502-CCA997505EE0}.Release|Any CPU.Build.0 = Release|Any CPU - {A6B06D44-15FC-404B-AA43-D5D68CD96847}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A6B06D44-15FC-404B-AA43-D5D68CD96847}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A6B06D44-15FC-404B-AA43-D5D68CD96847}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A6B06D44-15FC-404B-AA43-D5D68CD96847}.Release|Any CPU.Build.0 = Release|Any CPU - {F5694DF9-1112-4289-AD6F-6ABA1292DC19}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F5694DF9-1112-4289-AD6F-6ABA1292DC19}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F5694DF9-1112-4289-AD6F-6ABA1292DC19}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F5694DF9-1112-4289-AD6F-6ABA1292DC19}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {8B407060-66FA-4C3E-9ADF-AAA65E368DE6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8B407060-66FA-4C3E-9ADF-AAA65E368DE6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8B407060-66FA-4C3E-9ADF-AAA65E368DE6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8B407060-66FA-4C3E-9ADF-AAA65E368DE6}.Release|Any CPU.Build.0 = Release|Any CPU - {A315F155-C98E-4F14-8061-959E6985CC23}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A315F155-C98E-4F14-8061-959E6985CC23}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A315F155-C98E-4F14-8061-959E6985CC23}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A315F155-C98E-4F14-8061-959E6985CC23}.Release|Any CPU.Build.0 = Release|Any CPU - {51B347E8-E2FB-4188-B75B-1EA96BAB5CBC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {51B347E8-E2FB-4188-B75B-1EA96BAB5CBC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {51B347E8-E2FB-4188-B75B-1EA96BAB5CBC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {51B347E8-E2FB-4188-B75B-1EA96BAB5CBC}.Release|Any CPU.Build.0 = Release|Any CPU - {7A409FAA-0EE4-483E-8F6C-35DD39F15D2E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7A409FAA-0EE4-483E-8F6C-35DD39F15D2E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7A409FAA-0EE4-483E-8F6C-35DD39F15D2E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7A409FAA-0EE4-483E-8F6C-35DD39F15D2E}.Release|Any CPU.Build.0 = Release|Any CPU - {F4CD1C83-1868-44B5-AAC3-A251056EFC31}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F4CD1C83-1868-44B5-AAC3-A251056EFC31}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F4CD1C83-1868-44B5-AAC3-A251056EFC31}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F4CD1C83-1868-44B5-AAC3-A251056EFC31}.Release|Any CPU.Build.0 = Release|Any CPU - {0E032041-CCCC-4CAB-A5E4-69E468B90D86}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0E032041-CCCC-4CAB-A5E4-69E468B90D86}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0E032041-CCCC-4CAB-A5E4-69E468B90D86}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0E032041-CCCC-4CAB-A5E4-69E468B90D86}.Release|Any CPU.Build.0 = Release|Any CPU - {9AE11559-54D3-47CF-A26E-D570A154BAD4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9AE11559-54D3-47CF-A26E-D570A154BAD4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9AE11559-54D3-47CF-A26E-D570A154BAD4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9AE11559-54D3-47CF-A26E-D570A154BAD4}.Release|Any CPU.Build.0 = Release|Any CPU - {EC6D86AF-890B-4F65-A502-CCA997505EE0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EC6D86AF-890B-4F65-A502-CCA997505EE0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EC6D86AF-890B-4F65-A502-CCA997505EE0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EC6D86AF-890B-4F65-A502-CCA997505EE0}.Release|Any CPU.Build.0 = Release|Any CPU - {A6B06D44-15FC-404B-AA43-D5D68CD96847}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A6B06D44-15FC-404B-AA43-D5D68CD96847}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A6B06D44-15FC-404B-AA43-D5D68CD96847}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A6B06D44-15FC-404B-AA43-D5D68CD96847}.Release|Any CPU.Build.0 = Release|Any CPU - {F5694DF9-1112-4289-AD6F-6ABA1292DC19}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F5694DF9-1112-4289-AD6F-6ABA1292DC19}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F5694DF9-1112-4289-AD6F-6ABA1292DC19}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F5694DF9-1112-4289-AD6F-6ABA1292DC19}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {A9C700BA-4DCD-4000-BC14-6F69386CF46F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {01556657-38D2-431E-9751-0781235DBFB8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {4A9E0AAE-9AED-4EAB-A0F8-22A6DE191AEE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {2D19EC07-16BD-4688-881F-0FD653808A4D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {CA24D4D4-8F01-4EAC-9E95-D62F144B5184} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {8B407060-66FA-4C3E-9ADF-AAA65E368DE6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A315F155-C98E-4F14-8061-959E6985CC23} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {51B347E8-E2FB-4188-B75B-1EA96BAB5CBC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {7A409FAA-0EE4-483E-8F6C-35DD39F15D2E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F4CD1C83-1868-44B5-AAC3-A251056EFC31} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0E032041-CCCC-4CAB-A5E4-69E468B90D86} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {9AE11559-54D3-47CF-A26E-D570A154BAD4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {EC6D86AF-890B-4F65-A502-CCA997505EE0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A6B06D44-15FC-404B-AA43-D5D68CD96847} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F5694DF9-1112-4289-AD6F-6ABA1292DC19} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {8B407060-66FA-4C3E-9ADF-AAA65E368DE6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A315F155-C98E-4F14-8061-959E6985CC23} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {51B347E8-E2FB-4188-B75B-1EA96BAB5CBC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {7A409FAA-0EE4-483E-8F6C-35DD39F15D2E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F4CD1C83-1868-44B5-AAC3-A251056EFC31} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0E032041-CCCC-4CAB-A5E4-69E468B90D86} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {9AE11559-54D3-47CF-A26E-D570A154BAD4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {EC6D86AF-890B-4F65-A502-CCA997505EE0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A6B06D44-15FC-404B-AA43-D5D68CD96847} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F5694DF9-1112-4289-AD6F-6ABA1292DC19} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {302DBC4F-D7DA-4F87-BB73-E17C83C7AAF2} diff --git a/sdk/src/Services/SSOAdmin/Generated/AmazonSSOAdminConfig.cs b/sdk/src/Services/SSOAdmin/Generated/AmazonSSOAdminConfig.cs index 3b623a22df59..5a234d8adb7f 100644 --- a/sdk/src/Services/SSOAdmin/Generated/AmazonSSOAdminConfig.cs +++ b/sdk/src/Services/SSOAdmin/Generated/AmazonSSOAdminConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.SSOAdmin public partial class AmazonSSOAdminConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("SSO Admin", "4.0.0.0"); private static readonly AmazonSSOAdminEndpointResolver EndpointResolver = new AmazonSSOAdminEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("SSO Admin", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("SSO Admin", "3.7.400.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/SSOAdmin/Properties/AssemblyInfo.cs b/sdk/src/Services/SSOAdmin/Properties/AssemblyInfo.cs index adf3f818cd2a..2dccb18da6ff 100644 --- a/sdk/src/Services/SSOAdmin/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/SSOAdmin/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/SSOAdmin/SSOAdmin.sln b/sdk/src/Services/SSOAdmin/SSOAdmin.sln index fe2e9edbb815..256b6a31180b 100644 --- a/sdk/src/Services/SSOAdmin/SSOAdmin.sln +++ b/sdk/src/Services/SSOAdmin/SSOAdmin.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {2513DDFF-EEEA-43D4-A83D-606C77F1FFAD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {2513DDFF-EEEA-43D4-A83D-606C77F1FFAD}.Debug|Any CPU.Build.0 = Debug|Any CPU {2513DDFF-EEEA-43D4-A83D-606C77F1FFAD}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {CDDCA7D2-40CD-4AD1-884E-000601113CFC}.Debug|Any CPU.Build.0 = Debug|Any CPU {CDDCA7D2-40CD-4AD1-884E-000601113CFC}.Release|Any CPU.ActiveCfg = Release|Any CPU {CDDCA7D2-40CD-4AD1-884E-000601113CFC}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {DFD18063-B15C-4EA2-BEA9-DF85BEF528B6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DFD18063-B15C-4EA2-BEA9-DF85BEF528B6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DFD18063-B15C-4EA2-BEA9-DF85BEF528B6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DFD18063-B15C-4EA2-BEA9-DF85BEF528B6}.Release|Any CPU.Build.0 = Release|Any CPU - {A07BC6BC-1ABC-419C-B77F-99635F3B574F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A07BC6BC-1ABC-419C-B77F-99635F3B574F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A07BC6BC-1ABC-419C-B77F-99635F3B574F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A07BC6BC-1ABC-419C-B77F-99635F3B574F}.Release|Any CPU.Build.0 = Release|Any CPU - {95879049-5233-4142-BF3C-2CEBCA4E88EE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {95879049-5233-4142-BF3C-2CEBCA4E88EE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {95879049-5233-4142-BF3C-2CEBCA4E88EE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {95879049-5233-4142-BF3C-2CEBCA4E88EE}.Release|Any CPU.Build.0 = Release|Any CPU - {6D6A9134-14E4-499D-9F4C-51C7E76D0765}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6D6A9134-14E4-499D-9F4C-51C7E76D0765}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6D6A9134-14E4-499D-9F4C-51C7E76D0765}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6D6A9134-14E4-499D-9F4C-51C7E76D0765}.Release|Any CPU.Build.0 = Release|Any CPU - {8FEEF4BF-6018-4CE0-B2F7-66FF85AF3F23}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8FEEF4BF-6018-4CE0-B2F7-66FF85AF3F23}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8FEEF4BF-6018-4CE0-B2F7-66FF85AF3F23}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8FEEF4BF-6018-4CE0-B2F7-66FF85AF3F23}.Release|Any CPU.Build.0 = Release|Any CPU - {A9B19F35-891F-48FC-B375-A5159349CA1F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A9B19F35-891F-48FC-B375-A5159349CA1F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A9B19F35-891F-48FC-B375-A5159349CA1F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A9B19F35-891F-48FC-B375-A5159349CA1F}.Release|Any CPU.Build.0 = Release|Any CPU - {AAFE0836-2537-4C67-8C34-A503AAF67D79}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AAFE0836-2537-4C67-8C34-A503AAF67D79}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AAFE0836-2537-4C67-8C34-A503AAF67D79}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AAFE0836-2537-4C67-8C34-A503AAF67D79}.Release|Any CPU.Build.0 = Release|Any CPU - {3B97E8A4-E513-4001-B9A5-2D303669F64A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3B97E8A4-E513-4001-B9A5-2D303669F64A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3B97E8A4-E513-4001-B9A5-2D303669F64A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3B97E8A4-E513-4001-B9A5-2D303669F64A}.Release|Any CPU.Build.0 = Release|Any CPU - {A2786122-D8A0-4570-B1D9-0A7D958FED76}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A2786122-D8A0-4570-B1D9-0A7D958FED76}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A2786122-D8A0-4570-B1D9-0A7D958FED76}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A2786122-D8A0-4570-B1D9-0A7D958FED76}.Release|Any CPU.Build.0 = Release|Any CPU - {0B1EE26A-B536-46FA-AFB1-12C2112F6157}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0B1EE26A-B536-46FA-AFB1-12C2112F6157}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0B1EE26A-B536-46FA-AFB1-12C2112F6157}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0B1EE26A-B536-46FA-AFB1-12C2112F6157}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {DFD18063-B15C-4EA2-BEA9-DF85BEF528B6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DFD18063-B15C-4EA2-BEA9-DF85BEF528B6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DFD18063-B15C-4EA2-BEA9-DF85BEF528B6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DFD18063-B15C-4EA2-BEA9-DF85BEF528B6}.Release|Any CPU.Build.0 = Release|Any CPU - {A07BC6BC-1ABC-419C-B77F-99635F3B574F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A07BC6BC-1ABC-419C-B77F-99635F3B574F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A07BC6BC-1ABC-419C-B77F-99635F3B574F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A07BC6BC-1ABC-419C-B77F-99635F3B574F}.Release|Any CPU.Build.0 = Release|Any CPU - {95879049-5233-4142-BF3C-2CEBCA4E88EE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {95879049-5233-4142-BF3C-2CEBCA4E88EE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {95879049-5233-4142-BF3C-2CEBCA4E88EE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {95879049-5233-4142-BF3C-2CEBCA4E88EE}.Release|Any CPU.Build.0 = Release|Any CPU - {6D6A9134-14E4-499D-9F4C-51C7E76D0765}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6D6A9134-14E4-499D-9F4C-51C7E76D0765}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6D6A9134-14E4-499D-9F4C-51C7E76D0765}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6D6A9134-14E4-499D-9F4C-51C7E76D0765}.Release|Any CPU.Build.0 = Release|Any CPU - {8FEEF4BF-6018-4CE0-B2F7-66FF85AF3F23}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8FEEF4BF-6018-4CE0-B2F7-66FF85AF3F23}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8FEEF4BF-6018-4CE0-B2F7-66FF85AF3F23}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8FEEF4BF-6018-4CE0-B2F7-66FF85AF3F23}.Release|Any CPU.Build.0 = Release|Any CPU - {A9B19F35-891F-48FC-B375-A5159349CA1F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A9B19F35-891F-48FC-B375-A5159349CA1F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A9B19F35-891F-48FC-B375-A5159349CA1F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A9B19F35-891F-48FC-B375-A5159349CA1F}.Release|Any CPU.Build.0 = Release|Any CPU - {AAFE0836-2537-4C67-8C34-A503AAF67D79}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AAFE0836-2537-4C67-8C34-A503AAF67D79}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AAFE0836-2537-4C67-8C34-A503AAF67D79}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AAFE0836-2537-4C67-8C34-A503AAF67D79}.Release|Any CPU.Build.0 = Release|Any CPU - {3B97E8A4-E513-4001-B9A5-2D303669F64A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3B97E8A4-E513-4001-B9A5-2D303669F64A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3B97E8A4-E513-4001-B9A5-2D303669F64A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3B97E8A4-E513-4001-B9A5-2D303669F64A}.Release|Any CPU.Build.0 = Release|Any CPU - {A2786122-D8A0-4570-B1D9-0A7D958FED76}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A2786122-D8A0-4570-B1D9-0A7D958FED76}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A2786122-D8A0-4570-B1D9-0A7D958FED76}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A2786122-D8A0-4570-B1D9-0A7D958FED76}.Release|Any CPU.Build.0 = Release|Any CPU - {0B1EE26A-B536-46FA-AFB1-12C2112F6157}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0B1EE26A-B536-46FA-AFB1-12C2112F6157}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0B1EE26A-B536-46FA-AFB1-12C2112F6157}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0B1EE26A-B536-46FA-AFB1-12C2112F6157}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {2513DDFF-EEEA-43D4-A83D-606C77F1FFAD} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {1B44AAEC-38A4-44E5-B31D-11304B3309C8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {D7511EEF-7253-4D06-A637-C333FD9319F6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {89C821A5-6FE5-4729-996D-7175CAE6EAAA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {CDDCA7D2-40CD-4AD1-884E-000601113CFC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {DFD18063-B15C-4EA2-BEA9-DF85BEF528B6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A07BC6BC-1ABC-419C-B77F-99635F3B574F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {95879049-5233-4142-BF3C-2CEBCA4E88EE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6D6A9134-14E4-499D-9F4C-51C7E76D0765} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8FEEF4BF-6018-4CE0-B2F7-66FF85AF3F23} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A9B19F35-891F-48FC-B375-A5159349CA1F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {AAFE0836-2537-4C67-8C34-A503AAF67D79} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {3B97E8A4-E513-4001-B9A5-2D303669F64A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A2786122-D8A0-4570-B1D9-0A7D958FED76} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0B1EE26A-B536-46FA-AFB1-12C2112F6157} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {DFD18063-B15C-4EA2-BEA9-DF85BEF528B6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A07BC6BC-1ABC-419C-B77F-99635F3B574F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {95879049-5233-4142-BF3C-2CEBCA4E88EE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6D6A9134-14E4-499D-9F4C-51C7E76D0765} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8FEEF4BF-6018-4CE0-B2F7-66FF85AF3F23} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A9B19F35-891F-48FC-B375-A5159349CA1F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {AAFE0836-2537-4C67-8C34-A503AAF67D79} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {3B97E8A4-E513-4001-B9A5-2D303669F64A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A2786122-D8A0-4570-B1D9-0A7D958FED76} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0B1EE26A-B536-46FA-AFB1-12C2112F6157} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {FECA9928-E6F0-486E-B699-E169F8AADAE3} diff --git a/sdk/src/Services/SSOOIDC/Generated/AmazonSSOOIDCConfig.cs b/sdk/src/Services/SSOOIDC/Generated/AmazonSSOOIDCConfig.cs index 11200670a9c7..d7c0812a5e12 100644 --- a/sdk/src/Services/SSOOIDC/Generated/AmazonSSOOIDCConfig.cs +++ b/sdk/src/Services/SSOOIDC/Generated/AmazonSSOOIDCConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.SSOOIDC public partial class AmazonSSOOIDCConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("SSO OIDC", "4.0.0.0"); private static readonly AmazonSSOOIDCEndpointResolver EndpointResolver = new AmazonSSOOIDCEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("SSO OIDC", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("SSO OIDC", "3.7.400.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/SSOOIDC/Properties/AssemblyInfo.cs b/sdk/src/Services/SSOOIDC/Properties/AssemblyInfo.cs index 6d320a343c60..422353b89cce 100644 --- a/sdk/src/Services/SSOOIDC/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/SSOOIDC/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/SSOOIDC/SSOOIDC.sln b/sdk/src/Services/SSOOIDC/SSOOIDC.sln index 8cf9aefcfef1..33742adf2de3 100644 --- a/sdk/src/Services/SSOOIDC/SSOOIDC.sln +++ b/sdk/src/Services/SSOOIDC/SSOOIDC.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {01D94344-FC22-4CE0-8BE4-9868482D0D19}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {01D94344-FC22-4CE0-8BE4-9868482D0D19}.Debug|Any CPU.Build.0 = Debug|Any CPU {01D94344-FC22-4CE0-8BE4-9868482D0D19}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {655F9033-C6E8-439D-B697-966162E2154A}.Debug|Any CPU.Build.0 = Debug|Any CPU {655F9033-C6E8-439D-B697-966162E2154A}.Release|Any CPU.ActiveCfg = Release|Any CPU {655F9033-C6E8-439D-B697-966162E2154A}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {B060A806-2832-416B-9BD4-55AC5331FEF6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B060A806-2832-416B-9BD4-55AC5331FEF6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B060A806-2832-416B-9BD4-55AC5331FEF6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B060A806-2832-416B-9BD4-55AC5331FEF6}.Release|Any CPU.Build.0 = Release|Any CPU - {258A6960-5281-4F6F-AEBA-6127BAE3A855}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {258A6960-5281-4F6F-AEBA-6127BAE3A855}.Debug|Any CPU.Build.0 = Debug|Any CPU - {258A6960-5281-4F6F-AEBA-6127BAE3A855}.Release|Any CPU.ActiveCfg = Release|Any CPU - {258A6960-5281-4F6F-AEBA-6127BAE3A855}.Release|Any CPU.Build.0 = Release|Any CPU - {C8C682BC-CB97-4EBC-BC7B-92F27128EE5C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C8C682BC-CB97-4EBC-BC7B-92F27128EE5C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C8C682BC-CB97-4EBC-BC7B-92F27128EE5C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C8C682BC-CB97-4EBC-BC7B-92F27128EE5C}.Release|Any CPU.Build.0 = Release|Any CPU - {05D9FC18-2CA7-43CF-A52F-A490C801DF52}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {05D9FC18-2CA7-43CF-A52F-A490C801DF52}.Debug|Any CPU.Build.0 = Debug|Any CPU - {05D9FC18-2CA7-43CF-A52F-A490C801DF52}.Release|Any CPU.ActiveCfg = Release|Any CPU - {05D9FC18-2CA7-43CF-A52F-A490C801DF52}.Release|Any CPU.Build.0 = Release|Any CPU - {DD44D6F0-25A0-409C-B427-BBA70F362A64}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DD44D6F0-25A0-409C-B427-BBA70F362A64}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DD44D6F0-25A0-409C-B427-BBA70F362A64}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DD44D6F0-25A0-409C-B427-BBA70F362A64}.Release|Any CPU.Build.0 = Release|Any CPU - {481460EF-6A23-4E76-BC7F-663AC0CBB33A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {481460EF-6A23-4E76-BC7F-663AC0CBB33A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {481460EF-6A23-4E76-BC7F-663AC0CBB33A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {481460EF-6A23-4E76-BC7F-663AC0CBB33A}.Release|Any CPU.Build.0 = Release|Any CPU - {E6E39C5A-5A90-4D9C-9A0E-55D31E7B9E0E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E6E39C5A-5A90-4D9C-9A0E-55D31E7B9E0E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E6E39C5A-5A90-4D9C-9A0E-55D31E7B9E0E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E6E39C5A-5A90-4D9C-9A0E-55D31E7B9E0E}.Release|Any CPU.Build.0 = Release|Any CPU - {26107836-6CD8-4142-9320-42B532DFB08F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {26107836-6CD8-4142-9320-42B532DFB08F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {26107836-6CD8-4142-9320-42B532DFB08F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {26107836-6CD8-4142-9320-42B532DFB08F}.Release|Any CPU.Build.0 = Release|Any CPU - {2B3D217B-D472-4BEE-B363-8650E1D155F1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2B3D217B-D472-4BEE-B363-8650E1D155F1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2B3D217B-D472-4BEE-B363-8650E1D155F1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2B3D217B-D472-4BEE-B363-8650E1D155F1}.Release|Any CPU.Build.0 = Release|Any CPU - {3BAD0FA5-9623-4B25-8F06-DF1737C31214}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3BAD0FA5-9623-4B25-8F06-DF1737C31214}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3BAD0FA5-9623-4B25-8F06-DF1737C31214}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3BAD0FA5-9623-4B25-8F06-DF1737C31214}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {B060A806-2832-416B-9BD4-55AC5331FEF6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B060A806-2832-416B-9BD4-55AC5331FEF6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B060A806-2832-416B-9BD4-55AC5331FEF6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B060A806-2832-416B-9BD4-55AC5331FEF6}.Release|Any CPU.Build.0 = Release|Any CPU - {258A6960-5281-4F6F-AEBA-6127BAE3A855}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {258A6960-5281-4F6F-AEBA-6127BAE3A855}.Debug|Any CPU.Build.0 = Debug|Any CPU - {258A6960-5281-4F6F-AEBA-6127BAE3A855}.Release|Any CPU.ActiveCfg = Release|Any CPU - {258A6960-5281-4F6F-AEBA-6127BAE3A855}.Release|Any CPU.Build.0 = Release|Any CPU - {C8C682BC-CB97-4EBC-BC7B-92F27128EE5C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C8C682BC-CB97-4EBC-BC7B-92F27128EE5C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C8C682BC-CB97-4EBC-BC7B-92F27128EE5C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C8C682BC-CB97-4EBC-BC7B-92F27128EE5C}.Release|Any CPU.Build.0 = Release|Any CPU - {05D9FC18-2CA7-43CF-A52F-A490C801DF52}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {05D9FC18-2CA7-43CF-A52F-A490C801DF52}.Debug|Any CPU.Build.0 = Debug|Any CPU - {05D9FC18-2CA7-43CF-A52F-A490C801DF52}.Release|Any CPU.ActiveCfg = Release|Any CPU - {05D9FC18-2CA7-43CF-A52F-A490C801DF52}.Release|Any CPU.Build.0 = Release|Any CPU - {DD44D6F0-25A0-409C-B427-BBA70F362A64}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DD44D6F0-25A0-409C-B427-BBA70F362A64}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DD44D6F0-25A0-409C-B427-BBA70F362A64}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DD44D6F0-25A0-409C-B427-BBA70F362A64}.Release|Any CPU.Build.0 = Release|Any CPU - {481460EF-6A23-4E76-BC7F-663AC0CBB33A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {481460EF-6A23-4E76-BC7F-663AC0CBB33A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {481460EF-6A23-4E76-BC7F-663AC0CBB33A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {481460EF-6A23-4E76-BC7F-663AC0CBB33A}.Release|Any CPU.Build.0 = Release|Any CPU - {E6E39C5A-5A90-4D9C-9A0E-55D31E7B9E0E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E6E39C5A-5A90-4D9C-9A0E-55D31E7B9E0E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E6E39C5A-5A90-4D9C-9A0E-55D31E7B9E0E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E6E39C5A-5A90-4D9C-9A0E-55D31E7B9E0E}.Release|Any CPU.Build.0 = Release|Any CPU - {26107836-6CD8-4142-9320-42B532DFB08F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {26107836-6CD8-4142-9320-42B532DFB08F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {26107836-6CD8-4142-9320-42B532DFB08F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {26107836-6CD8-4142-9320-42B532DFB08F}.Release|Any CPU.Build.0 = Release|Any CPU - {2B3D217B-D472-4BEE-B363-8650E1D155F1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2B3D217B-D472-4BEE-B363-8650E1D155F1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2B3D217B-D472-4BEE-B363-8650E1D155F1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2B3D217B-D472-4BEE-B363-8650E1D155F1}.Release|Any CPU.Build.0 = Release|Any CPU - {3BAD0FA5-9623-4B25-8F06-DF1737C31214}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3BAD0FA5-9623-4B25-8F06-DF1737C31214}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3BAD0FA5-9623-4B25-8F06-DF1737C31214}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3BAD0FA5-9623-4B25-8F06-DF1737C31214}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {01D94344-FC22-4CE0-8BE4-9868482D0D19} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {B5ABEBE3-DA34-407D-AA37-40C31F78D01F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {8E90D810-9C86-4904-A3BE-F9A207606525} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {F5854457-6511-4EB4-9B9F-9AF8EC668F01} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {655F9033-C6E8-439D-B697-966162E2154A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {B060A806-2832-416B-9BD4-55AC5331FEF6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {258A6960-5281-4F6F-AEBA-6127BAE3A855} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C8C682BC-CB97-4EBC-BC7B-92F27128EE5C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {05D9FC18-2CA7-43CF-A52F-A490C801DF52} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {DD44D6F0-25A0-409C-B427-BBA70F362A64} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {481460EF-6A23-4E76-BC7F-663AC0CBB33A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E6E39C5A-5A90-4D9C-9A0E-55D31E7B9E0E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {26107836-6CD8-4142-9320-42B532DFB08F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {2B3D217B-D472-4BEE-B363-8650E1D155F1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {3BAD0FA5-9623-4B25-8F06-DF1737C31214} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B060A806-2832-416B-9BD4-55AC5331FEF6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {258A6960-5281-4F6F-AEBA-6127BAE3A855} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C8C682BC-CB97-4EBC-BC7B-92F27128EE5C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {05D9FC18-2CA7-43CF-A52F-A490C801DF52} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {DD44D6F0-25A0-409C-B427-BBA70F362A64} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {481460EF-6A23-4E76-BC7F-663AC0CBB33A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E6E39C5A-5A90-4D9C-9A0E-55D31E7B9E0E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {26107836-6CD8-4142-9320-42B532DFB08F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {2B3D217B-D472-4BEE-B363-8650E1D155F1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {3BAD0FA5-9623-4B25-8F06-DF1737C31214} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {138620E6-130C-49B8-BE3C-73F644241BB7} diff --git a/sdk/src/Services/SageMaker/Generated/AmazonSageMakerConfig.cs b/sdk/src/Services/SageMaker/Generated/AmazonSageMakerConfig.cs index 78c0a1d05664..2810fca1f7e2 100644 --- a/sdk/src/Services/SageMaker/Generated/AmazonSageMakerConfig.cs +++ b/sdk/src/Services/SageMaker/Generated/AmazonSageMakerConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.SageMaker public partial class AmazonSageMakerConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("SageMaker", "4.0.0.0"); private static readonly AmazonSageMakerEndpointResolver EndpointResolver = new AmazonSageMakerEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("SageMaker", "3.7.410.1"); -======= - InternalSDKUtils.BuildUserAgentString("SageMaker", "3.7.415.2"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/SageMaker/Generated/Model/Internal/MarshallTransformations/BatchDeleteClusterNodesRequestMarshaller.cs b/sdk/src/Services/SageMaker/Generated/Model/Internal/MarshallTransformations/BatchDeleteClusterNodesRequestMarshaller.cs index dfd468013061..7d7af77be22b 100644 --- a/sdk/src/Services/SageMaker/Generated/Model/Internal/MarshallTransformations/BatchDeleteClusterNodesRequestMarshaller.cs +++ b/sdk/src/Services/SageMaker/Generated/Model/Internal/MarshallTransformations/BatchDeleteClusterNodesRequestMarshaller.cs @@ -63,32 +63,35 @@ public IRequest Marshall(BatchDeleteClusterNodesRequest publicRequest) request.HttpMethod = "POST"; request.ResourcePath = "/"; - using (StringWriter stringWriter = new StringWriter(CultureInfo.InvariantCulture)) + using (MemoryStream memoryStream = new MemoryStream()) { - JsonWriter writer = new JsonWriter(stringWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetClusterName()) + using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) { - context.Writer.WritePropertyName("ClusterName"); - context.Writer.Write(publicRequest.ClusterName); - } + JsonWriter writer = new JsonWriter(streamWriter); + writer.Validate = false; + writer.WriteObjectStart(); + var context = new JsonMarshallerContext(request, writer); + if(publicRequest.IsSetClusterName()) + { + context.Writer.WritePropertyName("ClusterName"); + context.Writer.Write(publicRequest.ClusterName); + } - if(publicRequest.IsSetNodeIds()) - { - context.Writer.WritePropertyName("NodeIds"); - context.Writer.WriteArrayStart(); - foreach(var publicRequestNodeIdsListValue in publicRequest.NodeIds) + if(publicRequest.IsSetNodeIds()) { - context.Writer.Write(publicRequestNodeIdsListValue); + context.Writer.WritePropertyName("NodeIds"); + context.Writer.WriteArrayStart(); + foreach(var publicRequestNodeIdsListValue in publicRequest.NodeIds) + { + context.Writer.Write(publicRequestNodeIdsListValue); + } + context.Writer.WriteArrayEnd(); } - context.Writer.WriteArrayEnd(); + + writer.WriteObjectEnd(); } - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); + request.Content = memoryStream.ToArray(); } diff --git a/sdk/src/Services/SageMaker/Generated/Model/Internal/MarshallTransformations/CreateModelPackageRequestMarshaller.cs b/sdk/src/Services/SageMaker/Generated/Model/Internal/MarshallTransformations/CreateModelPackageRequestMarshaller.cs index b200ce080581..555be6529c12 100644 --- a/sdk/src/Services/SageMaker/Generated/Model/Internal/MarshallTransformations/CreateModelPackageRequestMarshaller.cs +++ b/sdk/src/Services/SageMaker/Generated/Model/Internal/MarshallTransformations/CreateModelPackageRequestMarshaller.cs @@ -174,36 +174,24 @@ public IRequest Marshall(CreateModelPackageRequest publicRequest) context.Writer.WriteObjectEnd(); } + if(publicRequest.IsSetModelLifeCycle()) + { + context.Writer.WritePropertyName("ModelLifeCycle"); + context.Writer.WriteObjectStart(); + + var marshaller = ModelLifeCycleMarshaller.Instance; + marshaller.Marshall(publicRequest.ModelLifeCycle, context); + + context.Writer.WriteObjectEnd(); + } + if(publicRequest.IsSetModelMetrics()) { context.Writer.WritePropertyName("ModelMetrics"); context.Writer.WriteObjectStart(); -<<<<<<< HEAD var marshaller = ModelMetricsMarshaller.Instance; marshaller.Marshall(publicRequest.ModelMetrics, context); -||||||| Commit version number update changes - if(publicRequest.IsSetModelMetrics()) - { - context.Writer.WritePropertyName("ModelMetrics"); - context.Writer.WriteObjectStart(); -======= - if(publicRequest.IsSetModelLifeCycle()) - { - context.Writer.WritePropertyName("ModelLifeCycle"); - context.Writer.WriteObjectStart(); - - var marshaller = ModelLifeCycleMarshaller.Instance; - marshaller.Marshall(publicRequest.ModelLifeCycle, context); - - context.Writer.WriteObjectEnd(); - } - - if(publicRequest.IsSetModelMetrics()) - { - context.Writer.WritePropertyName("ModelMetrics"); - context.Writer.WriteObjectStart(); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b context.Writer.WriteObjectEnd(); } diff --git a/sdk/src/Services/SageMaker/Generated/Model/Internal/MarshallTransformations/UpdateModelPackageRequestMarshaller.cs b/sdk/src/Services/SageMaker/Generated/Model/Internal/MarshallTransformations/UpdateModelPackageRequestMarshaller.cs index 786ce2bc05d9..84320b161415 100644 --- a/sdk/src/Services/SageMaker/Generated/Model/Internal/MarshallTransformations/UpdateModelPackageRequestMarshaller.cs +++ b/sdk/src/Services/SageMaker/Generated/Model/Internal/MarshallTransformations/UpdateModelPackageRequestMarshaller.cs @@ -93,27 +93,13 @@ public IRequest Marshall(UpdateModelPackageRequest publicRequest) context.Writer.Write(publicRequest.ApprovalDescription); } -<<<<<<< HEAD - if(publicRequest.IsSetCustomerMetadataProperties()) -||||||| Commit version number update changes - if(publicRequest.IsSetCustomerMetadataProperties()) - { - context.Writer.WritePropertyName("CustomerMetadataProperties"); - context.Writer.WriteObjectStart(); - foreach (var publicRequestCustomerMetadataPropertiesKvp in publicRequest.CustomerMetadataProperties) -======= - if(publicRequest.IsSetClientToken()) - { - context.Writer.WritePropertyName("ClientToken"); - context.Writer.Write(publicRequest.ClientToken); - } + if(publicRequest.IsSetClientToken()) + { + context.Writer.WritePropertyName("ClientToken"); + context.Writer.Write(publicRequest.ClientToken); + } - if(publicRequest.IsSetCustomerMetadataProperties()) - { - context.Writer.WritePropertyName("CustomerMetadataProperties"); - context.Writer.WriteObjectStart(); - foreach (var publicRequestCustomerMetadataPropertiesKvp in publicRequest.CustomerMetadataProperties) ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b + if(publicRequest.IsSetCustomerMetadataProperties()) { context.Writer.WritePropertyName("CustomerMetadataProperties"); context.Writer.WriteObjectStart(); @@ -166,36 +152,22 @@ public IRequest Marshall(UpdateModelPackageRequest publicRequest) context.Writer.WriteObjectEnd(); } -<<<<<<< HEAD + if(publicRequest.IsSetModelLifeCycle()) + { + context.Writer.WritePropertyName("ModelLifeCycle"); + context.Writer.WriteObjectStart(); + + var marshaller = ModelLifeCycleMarshaller.Instance; + marshaller.Marshall(publicRequest.ModelLifeCycle, context); + + context.Writer.WriteObjectEnd(); + } + if(publicRequest.IsSetModelPackageArn()) { context.Writer.WritePropertyName("ModelPackageArn"); context.Writer.Write(publicRequest.ModelPackageArn); } -||||||| Commit version number update changes - if(publicRequest.IsSetModelPackageArn()) - { - context.Writer.WritePropertyName("ModelPackageArn"); - context.Writer.Write(publicRequest.ModelPackageArn); - } -======= - if(publicRequest.IsSetModelLifeCycle()) - { - context.Writer.WritePropertyName("ModelLifeCycle"); - context.Writer.WriteObjectStart(); - - var marshaller = ModelLifeCycleMarshaller.Instance; - marshaller.Marshall(publicRequest.ModelLifeCycle, context); - - context.Writer.WriteObjectEnd(); - } - - if(publicRequest.IsSetModelPackageArn()) - { - context.Writer.WritePropertyName("ModelPackageArn"); - context.Writer.Write(publicRequest.ModelPackageArn); - } ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b if(publicRequest.IsSetSourceUri()) { diff --git a/sdk/src/Services/SageMaker/Generated/_bcl/AmazonSageMakerClient.cs b/sdk/src/Services/SageMaker/Generated/_bcl/AmazonSageMakerClient.cs index 81aebb18a515..357765c4b3b3 100644 --- a/sdk/src/Services/SageMaker/Generated/_bcl/AmazonSageMakerClient.cs +++ b/sdk/src/Services/SageMaker/Generated/_bcl/AmazonSageMakerClient.cs @@ -508,6 +508,89 @@ public virtual AssociateTrialComponentResponse AssociateTrialComponent(Associate #endregion + #region BatchDeleteClusterNodes + + + /// + /// Deletes specific nodes within a SageMaker HyperPod cluster. BatchDeleteClusterNodes + /// accepts a cluster name and a list of node IDs. + /// + /// + /// + /// Container for the necessary parameters to execute the BatchDeleteClusterNodes service method. + /// + /// The response from the BatchDeleteClusterNodes service method, as returned by SageMaker. + /// + /// Resource being access is not found. + /// + /// REST API Reference for BatchDeleteClusterNodes Operation + public virtual BatchDeleteClusterNodesResponse BatchDeleteClusterNodes(BatchDeleteClusterNodesRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = BatchDeleteClusterNodesRequestMarshaller.Instance; + options.ResponseUnmarshaller = BatchDeleteClusterNodesResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// Deletes specific nodes within a SageMaker HyperPod cluster. BatchDeleteClusterNodes + /// accepts a cluster name and a list of node IDs. + /// + /// + /// + /// Container for the necessary parameters to execute the BatchDeleteClusterNodes service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the BatchDeleteClusterNodes service method, as returned by SageMaker. + /// + /// Resource being access is not found. + /// + /// REST API Reference for BatchDeleteClusterNodes Operation + public virtual Task BatchDeleteClusterNodesAsync(BatchDeleteClusterNodesRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = BatchDeleteClusterNodesRequestMarshaller.Instance; + options.ResponseUnmarshaller = BatchDeleteClusterNodesResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + #region BatchDescribeModelPackage @@ -4418,14 +4501,19 @@ public virtual CreatePipelineResponse CreatePipeline(CreatePipelineRequest reque /// see Connect /// to Amazon SageMaker Studio Through an Interface VPC Endpoint . /// - /// + ///
            • /// /// The URL that you get from a call to CreatePresignedDomainUrl has a default /// timeout of 5 minutes. You can configure this value using ExpiresInSeconds. /// If you try to use the URL after the timeout limit expires, you are directed to the /// Amazon Web Services console sign-in page. /// - /// + ///
            • + /// + /// The JupyterLab session default expiration time is 12 hours. You can configure this + /// value using SessionExpirationDurationInSeconds. + /// + ///
            ///             /// Container for the necessary parameters to execute the CreatePresignedDomainUrl service method. /// @@ -4464,14 +4552,19 @@ public virtual CreatePresignedDomainUrlResponse CreatePresignedDomainUrl(CreateP /// see Connect /// to Amazon SageMaker Studio Through an Interface VPC Endpoint . /// - /// + ///
            • /// /// The URL that you get from a call to CreatePresignedDomainUrl has a default /// timeout of 5 minutes. You can configure this value using ExpiresInSeconds. /// If you try to use the URL after the timeout limit expires, you are directed to the /// Amazon Web Services console sign-in page. /// - /// + ///
            • + /// + /// The JupyterLab session default expiration time is 12 hours. You can configure this + /// value using SessionExpirationDurationInSeconds. + /// + ///
            ///             /// Container for the necessary parameters to execute the CreatePresignedDomainUrl service method. /// @@ -17361,6 +17454,14 @@ public virtual UpdateClusterResponse UpdateCluster(UpdateClusterRequest request) /// Updates the platform software of a SageMaker HyperPod cluster for security patching. /// To learn how to use this API, see Update /// the SageMaker HyperPod platform software of a cluster. + /// + /// + /// + /// The UpgradeClusterSoftware API call may impact your SageMaker HyperPod cluster + /// uptime and availability. Plan accordingly to mitigate potential disruptions to your + /// workloads. + /// + /// ///             /// Container for the necessary parameters to execute the UpdateClusterSoftware service method. /// @@ -17387,6 +17488,14 @@ public virtual UpdateClusterSoftwareResponse UpdateClusterSoftware(UpdateCluster /// Updates the platform software of a SageMaker HyperPod cluster for security patching. /// To learn how to use this API, see Update /// the SageMaker HyperPod platform software of a cluster. + /// + /// + /// + /// The UpgradeClusterSoftware API call may impact your SageMaker HyperPod cluster + /// uptime and availability. Plan accordingly to mitigate potential disruptions to your + /// workloads. + /// + /// ///             /// Container for the necessary parameters to execute the UpdateClusterSoftware service method. /// diff --git a/sdk/src/Services/SageMaker/Properties/AssemblyInfo.cs b/sdk/src/Services/SageMaker/Properties/AssemblyInfo.cs index 473a24294f12..5ab7ee1532db 100644 --- a/sdk/src/Services/SageMaker/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/SageMaker/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.410.1")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.415.2")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/SageMaker/SageMaker.sln b/sdk/src/Services/SageMaker/SageMaker.sln index a8258d72301c..275d1f42da20 100644 --- a/sdk/src/Services/SageMaker/SageMaker.sln +++ b/sdk/src/Services/SageMaker/SageMaker.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {6DC862C4-48C2-442E-A8A2-A9CC53FC8A34}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {6DC862C4-48C2-442E-A8A2-A9CC53FC8A34}.Debug|Any CPU.Build.0 = Debug|Any CPU {6DC862C4-48C2-442E-A8A2-A9CC53FC8A34}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {F02E90CA-80EB-4320-B189-51E5A2BFDCDC}.Debug|Any CPU.Build.0 = Debug|Any CPU {F02E90CA-80EB-4320-B189-51E5A2BFDCDC}.Release|Any CPU.ActiveCfg = Release|Any CPU {F02E90CA-80EB-4320-B189-51E5A2BFDCDC}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {C3C363EF-B505-4953-A62C-DA5E58534798}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C3C363EF-B505-4953-A62C-DA5E58534798}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C3C363EF-B505-4953-A62C-DA5E58534798}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C3C363EF-B505-4953-A62C-DA5E58534798}.Release|Any CPU.Build.0 = Release|Any CPU - {228A0E1D-E210-4D44-B091-C5C1F4CADB9E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {228A0E1D-E210-4D44-B091-C5C1F4CADB9E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {228A0E1D-E210-4D44-B091-C5C1F4CADB9E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {228A0E1D-E210-4D44-B091-C5C1F4CADB9E}.Release|Any CPU.Build.0 = Release|Any CPU - {B2223089-4F2E-400E-A041-B132E0539666}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B2223089-4F2E-400E-A041-B132E0539666}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B2223089-4F2E-400E-A041-B132E0539666}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B2223089-4F2E-400E-A041-B132E0539666}.Release|Any CPU.Build.0 = Release|Any CPU - {AAE68D57-F3E5-4730-95B5-CA94AA500A99}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AAE68D57-F3E5-4730-95B5-CA94AA500A99}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AAE68D57-F3E5-4730-95B5-CA94AA500A99}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AAE68D57-F3E5-4730-95B5-CA94AA500A99}.Release|Any CPU.Build.0 = Release|Any CPU - {3B53FD1F-1AB2-4D53-92A2-89B2E0B9DC6B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3B53FD1F-1AB2-4D53-92A2-89B2E0B9DC6B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3B53FD1F-1AB2-4D53-92A2-89B2E0B9DC6B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3B53FD1F-1AB2-4D53-92A2-89B2E0B9DC6B}.Release|Any CPU.Build.0 = Release|Any CPU - {1B2B9F4C-C73A-4D45-91AC-2B5A7802D2E6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1B2B9F4C-C73A-4D45-91AC-2B5A7802D2E6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1B2B9F4C-C73A-4D45-91AC-2B5A7802D2E6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1B2B9F4C-C73A-4D45-91AC-2B5A7802D2E6}.Release|Any CPU.Build.0 = Release|Any CPU - {6FD25F24-7FF8-4A2F-BC06-0856251DB942}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6FD25F24-7FF8-4A2F-BC06-0856251DB942}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6FD25F24-7FF8-4A2F-BC06-0856251DB942}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6FD25F24-7FF8-4A2F-BC06-0856251DB942}.Release|Any CPU.Build.0 = Release|Any CPU - {A8A2B8E1-77DF-4AFE-81CD-A8386BE7C239}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A8A2B8E1-77DF-4AFE-81CD-A8386BE7C239}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A8A2B8E1-77DF-4AFE-81CD-A8386BE7C239}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A8A2B8E1-77DF-4AFE-81CD-A8386BE7C239}.Release|Any CPU.Build.0 = Release|Any CPU - {C11A6DA3-5862-4C88-8594-46D5931BF59B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C11A6DA3-5862-4C88-8594-46D5931BF59B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C11A6DA3-5862-4C88-8594-46D5931BF59B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C11A6DA3-5862-4C88-8594-46D5931BF59B}.Release|Any CPU.Build.0 = Release|Any CPU - {47D17337-0C92-472B-9647-7EF5B4A908AA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {47D17337-0C92-472B-9647-7EF5B4A908AA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {47D17337-0C92-472B-9647-7EF5B4A908AA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {47D17337-0C92-472B-9647-7EF5B4A908AA}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {C3C363EF-B505-4953-A62C-DA5E58534798}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C3C363EF-B505-4953-A62C-DA5E58534798}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C3C363EF-B505-4953-A62C-DA5E58534798}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C3C363EF-B505-4953-A62C-DA5E58534798}.Release|Any CPU.Build.0 = Release|Any CPU - {228A0E1D-E210-4D44-B091-C5C1F4CADB9E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {228A0E1D-E210-4D44-B091-C5C1F4CADB9E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {228A0E1D-E210-4D44-B091-C5C1F4CADB9E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {228A0E1D-E210-4D44-B091-C5C1F4CADB9E}.Release|Any CPU.Build.0 = Release|Any CPU - {B2223089-4F2E-400E-A041-B132E0539666}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B2223089-4F2E-400E-A041-B132E0539666}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B2223089-4F2E-400E-A041-B132E0539666}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B2223089-4F2E-400E-A041-B132E0539666}.Release|Any CPU.Build.0 = Release|Any CPU - {AAE68D57-F3E5-4730-95B5-CA94AA500A99}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AAE68D57-F3E5-4730-95B5-CA94AA500A99}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AAE68D57-F3E5-4730-95B5-CA94AA500A99}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AAE68D57-F3E5-4730-95B5-CA94AA500A99}.Release|Any CPU.Build.0 = Release|Any CPU - {3B53FD1F-1AB2-4D53-92A2-89B2E0B9DC6B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3B53FD1F-1AB2-4D53-92A2-89B2E0B9DC6B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3B53FD1F-1AB2-4D53-92A2-89B2E0B9DC6B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3B53FD1F-1AB2-4D53-92A2-89B2E0B9DC6B}.Release|Any CPU.Build.0 = Release|Any CPU - {1B2B9F4C-C73A-4D45-91AC-2B5A7802D2E6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1B2B9F4C-C73A-4D45-91AC-2B5A7802D2E6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1B2B9F4C-C73A-4D45-91AC-2B5A7802D2E6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1B2B9F4C-C73A-4D45-91AC-2B5A7802D2E6}.Release|Any CPU.Build.0 = Release|Any CPU - {6FD25F24-7FF8-4A2F-BC06-0856251DB942}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6FD25F24-7FF8-4A2F-BC06-0856251DB942}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6FD25F24-7FF8-4A2F-BC06-0856251DB942}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6FD25F24-7FF8-4A2F-BC06-0856251DB942}.Release|Any CPU.Build.0 = Release|Any CPU - {A8A2B8E1-77DF-4AFE-81CD-A8386BE7C239}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A8A2B8E1-77DF-4AFE-81CD-A8386BE7C239}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A8A2B8E1-77DF-4AFE-81CD-A8386BE7C239}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A8A2B8E1-77DF-4AFE-81CD-A8386BE7C239}.Release|Any CPU.Build.0 = Release|Any CPU - {C11A6DA3-5862-4C88-8594-46D5931BF59B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C11A6DA3-5862-4C88-8594-46D5931BF59B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C11A6DA3-5862-4C88-8594-46D5931BF59B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C11A6DA3-5862-4C88-8594-46D5931BF59B}.Release|Any CPU.Build.0 = Release|Any CPU - {47D17337-0C92-472B-9647-7EF5B4A908AA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {47D17337-0C92-472B-9647-7EF5B4A908AA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {47D17337-0C92-472B-9647-7EF5B4A908AA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {47D17337-0C92-472B-9647-7EF5B4A908AA}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {6DC862C4-48C2-442E-A8A2-A9CC53FC8A34} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {26CBB2AB-30BB-4E79-B6ED-29B3AE28C4E8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {AE84595C-C6E3-45A5-B4C5-DD5C3709CDD2} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {AB860E2C-BF42-4ED1-89DC-71A9046A21E2} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {F02E90CA-80EB-4320-B189-51E5A2BFDCDC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {C3C363EF-B505-4953-A62C-DA5E58534798} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {228A0E1D-E210-4D44-B091-C5C1F4CADB9E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B2223089-4F2E-400E-A041-B132E0539666} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {AAE68D57-F3E5-4730-95B5-CA94AA500A99} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {3B53FD1F-1AB2-4D53-92A2-89B2E0B9DC6B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {1B2B9F4C-C73A-4D45-91AC-2B5A7802D2E6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6FD25F24-7FF8-4A2F-BC06-0856251DB942} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A8A2B8E1-77DF-4AFE-81CD-A8386BE7C239} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C11A6DA3-5862-4C88-8594-46D5931BF59B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {47D17337-0C92-472B-9647-7EF5B4A908AA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {C3C363EF-B505-4953-A62C-DA5E58534798} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {228A0E1D-E210-4D44-B091-C5C1F4CADB9E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B2223089-4F2E-400E-A041-B132E0539666} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {AAE68D57-F3E5-4730-95B5-CA94AA500A99} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {3B53FD1F-1AB2-4D53-92A2-89B2E0B9DC6B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {1B2B9F4C-C73A-4D45-91AC-2B5A7802D2E6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6FD25F24-7FF8-4A2F-BC06-0856251DB942} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A8A2B8E1-77DF-4AFE-81CD-A8386BE7C239} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C11A6DA3-5862-4C88-8594-46D5931BF59B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {47D17337-0C92-472B-9647-7EF5B4A908AA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {951BCE35-7512-4B36-8AEE-E79F153C2906} diff --git a/sdk/src/Services/SageMakerFeatureStoreRuntime/Generated/AmazonSageMakerFeatureStoreRuntimeConfig.cs b/sdk/src/Services/SageMakerFeatureStoreRuntime/Generated/AmazonSageMakerFeatureStoreRuntimeConfig.cs index e2ab1612f931..3bf685d63fad 100644 --- a/sdk/src/Services/SageMakerFeatureStoreRuntime/Generated/AmazonSageMakerFeatureStoreRuntimeConfig.cs +++ b/sdk/src/Services/SageMakerFeatureStoreRuntime/Generated/AmazonSageMakerFeatureStoreRuntimeConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.SageMakerFeatureStoreRuntime public partial class AmazonSageMakerFeatureStoreRuntimeConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("SageMaker FeatureStore Runtime", "4.0.0.0"); private static readonly AmazonSageMakerFeatureStoreRuntimeEndpointResolver EndpointResolver = new AmazonSageMakerFeatureStoreRuntimeEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("SageMaker FeatureStore Runtime", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("SageMaker FeatureStore Runtime", "3.7.400.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/SageMakerFeatureStoreRuntime/Properties/AssemblyInfo.cs b/sdk/src/Services/SageMakerFeatureStoreRuntime/Properties/AssemblyInfo.cs index 187ba9dd9c0f..18ce34a18d32 100644 --- a/sdk/src/Services/SageMakerFeatureStoreRuntime/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/SageMakerFeatureStoreRuntime/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/SageMakerFeatureStoreRuntime/SageMakerFeatureStoreRuntime.sln b/sdk/src/Services/SageMakerFeatureStoreRuntime/SageMakerFeatureStoreRuntime.sln index 481c8cebd6a3..7652b643c60f 100644 --- a/sdk/src/Services/SageMakerFeatureStoreRuntime/SageMakerFeatureStoreRuntime.sln +++ b/sdk/src/Services/SageMakerFeatureStoreRuntime/SageMakerFeatureStoreRuntime.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {F25DEADE-B284-43A1-801E-8D4E0BD21DC4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {F25DEADE-B284-43A1-801E-8D4E0BD21DC4}.Debug|Any CPU.Build.0 = Debug|Any CPU {F25DEADE-B284-43A1-801E-8D4E0BD21DC4}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {447FD8C8-D244-431C-87C8-4649105F108B}.Debug|Any CPU.Build.0 = Debug|Any CPU {447FD8C8-D244-431C-87C8-4649105F108B}.Release|Any CPU.ActiveCfg = Release|Any CPU {447FD8C8-D244-431C-87C8-4649105F108B}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {084DA7D9-81EB-4425-868C-CE565C7D08E2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {084DA7D9-81EB-4425-868C-CE565C7D08E2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {084DA7D9-81EB-4425-868C-CE565C7D08E2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {084DA7D9-81EB-4425-868C-CE565C7D08E2}.Release|Any CPU.Build.0 = Release|Any CPU - {14EFBE93-B6E8-4184-9769-DC28BD202305}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {14EFBE93-B6E8-4184-9769-DC28BD202305}.Debug|Any CPU.Build.0 = Debug|Any CPU - {14EFBE93-B6E8-4184-9769-DC28BD202305}.Release|Any CPU.ActiveCfg = Release|Any CPU - {14EFBE93-B6E8-4184-9769-DC28BD202305}.Release|Any CPU.Build.0 = Release|Any CPU - {E2166537-E4D5-4738-B35B-D3D74265C6FF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E2166537-E4D5-4738-B35B-D3D74265C6FF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E2166537-E4D5-4738-B35B-D3D74265C6FF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E2166537-E4D5-4738-B35B-D3D74265C6FF}.Release|Any CPU.Build.0 = Release|Any CPU - {679D8F24-F945-4858-9C00-0EE3B0611C40}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {679D8F24-F945-4858-9C00-0EE3B0611C40}.Debug|Any CPU.Build.0 = Debug|Any CPU - {679D8F24-F945-4858-9C00-0EE3B0611C40}.Release|Any CPU.ActiveCfg = Release|Any CPU - {679D8F24-F945-4858-9C00-0EE3B0611C40}.Release|Any CPU.Build.0 = Release|Any CPU - {35B08439-8D62-497A-B55E-268F5BCC5E3F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {35B08439-8D62-497A-B55E-268F5BCC5E3F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {35B08439-8D62-497A-B55E-268F5BCC5E3F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {35B08439-8D62-497A-B55E-268F5BCC5E3F}.Release|Any CPU.Build.0 = Release|Any CPU - {3373D386-43EB-4EAB-9F0F-9E6C156EBF65}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3373D386-43EB-4EAB-9F0F-9E6C156EBF65}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3373D386-43EB-4EAB-9F0F-9E6C156EBF65}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3373D386-43EB-4EAB-9F0F-9E6C156EBF65}.Release|Any CPU.Build.0 = Release|Any CPU - {000288B2-5955-4E16-87BE-41184204D37D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {000288B2-5955-4E16-87BE-41184204D37D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {000288B2-5955-4E16-87BE-41184204D37D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {000288B2-5955-4E16-87BE-41184204D37D}.Release|Any CPU.Build.0 = Release|Any CPU - {4444BC15-AC85-4E6C-BDEF-92EDC7942A38}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4444BC15-AC85-4E6C-BDEF-92EDC7942A38}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4444BC15-AC85-4E6C-BDEF-92EDC7942A38}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4444BC15-AC85-4E6C-BDEF-92EDC7942A38}.Release|Any CPU.Build.0 = Release|Any CPU - {627DF7F0-E7F7-4FF0-B350-E2CCE8C5E6B2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {627DF7F0-E7F7-4FF0-B350-E2CCE8C5E6B2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {627DF7F0-E7F7-4FF0-B350-E2CCE8C5E6B2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {627DF7F0-E7F7-4FF0-B350-E2CCE8C5E6B2}.Release|Any CPU.Build.0 = Release|Any CPU - {C36334DE-1EEE-4C6D-8FB4-B3D9F534BBAD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C36334DE-1EEE-4C6D-8FB4-B3D9F534BBAD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C36334DE-1EEE-4C6D-8FB4-B3D9F534BBAD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C36334DE-1EEE-4C6D-8FB4-B3D9F534BBAD}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {084DA7D9-81EB-4425-868C-CE565C7D08E2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {084DA7D9-81EB-4425-868C-CE565C7D08E2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {084DA7D9-81EB-4425-868C-CE565C7D08E2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {084DA7D9-81EB-4425-868C-CE565C7D08E2}.Release|Any CPU.Build.0 = Release|Any CPU - {14EFBE93-B6E8-4184-9769-DC28BD202305}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {14EFBE93-B6E8-4184-9769-DC28BD202305}.Debug|Any CPU.Build.0 = Debug|Any CPU - {14EFBE93-B6E8-4184-9769-DC28BD202305}.Release|Any CPU.ActiveCfg = Release|Any CPU - {14EFBE93-B6E8-4184-9769-DC28BD202305}.Release|Any CPU.Build.0 = Release|Any CPU - {E2166537-E4D5-4738-B35B-D3D74265C6FF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E2166537-E4D5-4738-B35B-D3D74265C6FF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E2166537-E4D5-4738-B35B-D3D74265C6FF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E2166537-E4D5-4738-B35B-D3D74265C6FF}.Release|Any CPU.Build.0 = Release|Any CPU - {679D8F24-F945-4858-9C00-0EE3B0611C40}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {679D8F24-F945-4858-9C00-0EE3B0611C40}.Debug|Any CPU.Build.0 = Debug|Any CPU - {679D8F24-F945-4858-9C00-0EE3B0611C40}.Release|Any CPU.ActiveCfg = Release|Any CPU - {679D8F24-F945-4858-9C00-0EE3B0611C40}.Release|Any CPU.Build.0 = Release|Any CPU - {35B08439-8D62-497A-B55E-268F5BCC5E3F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {35B08439-8D62-497A-B55E-268F5BCC5E3F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {35B08439-8D62-497A-B55E-268F5BCC5E3F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {35B08439-8D62-497A-B55E-268F5BCC5E3F}.Release|Any CPU.Build.0 = Release|Any CPU - {3373D386-43EB-4EAB-9F0F-9E6C156EBF65}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3373D386-43EB-4EAB-9F0F-9E6C156EBF65}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3373D386-43EB-4EAB-9F0F-9E6C156EBF65}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3373D386-43EB-4EAB-9F0F-9E6C156EBF65}.Release|Any CPU.Build.0 = Release|Any CPU - {000288B2-5955-4E16-87BE-41184204D37D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {000288B2-5955-4E16-87BE-41184204D37D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {000288B2-5955-4E16-87BE-41184204D37D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {000288B2-5955-4E16-87BE-41184204D37D}.Release|Any CPU.Build.0 = Release|Any CPU - {4444BC15-AC85-4E6C-BDEF-92EDC7942A38}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4444BC15-AC85-4E6C-BDEF-92EDC7942A38}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4444BC15-AC85-4E6C-BDEF-92EDC7942A38}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4444BC15-AC85-4E6C-BDEF-92EDC7942A38}.Release|Any CPU.Build.0 = Release|Any CPU - {627DF7F0-E7F7-4FF0-B350-E2CCE8C5E6B2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {627DF7F0-E7F7-4FF0-B350-E2CCE8C5E6B2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {627DF7F0-E7F7-4FF0-B350-E2CCE8C5E6B2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {627DF7F0-E7F7-4FF0-B350-E2CCE8C5E6B2}.Release|Any CPU.Build.0 = Release|Any CPU - {C36334DE-1EEE-4C6D-8FB4-B3D9F534BBAD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C36334DE-1EEE-4C6D-8FB4-B3D9F534BBAD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C36334DE-1EEE-4C6D-8FB4-B3D9F534BBAD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C36334DE-1EEE-4C6D-8FB4-B3D9F534BBAD}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {F25DEADE-B284-43A1-801E-8D4E0BD21DC4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {71F149F4-9400-42D0-B11C-5F49486D029E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {7EE15C88-0FC0-49C2-BDFE-DED3FB5D1963} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {A812BF6C-3368-42C8-A7C2-3E2625BB6B6F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {447FD8C8-D244-431C-87C8-4649105F108B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {084DA7D9-81EB-4425-868C-CE565C7D08E2} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {14EFBE93-B6E8-4184-9769-DC28BD202305} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E2166537-E4D5-4738-B35B-D3D74265C6FF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {679D8F24-F945-4858-9C00-0EE3B0611C40} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {35B08439-8D62-497A-B55E-268F5BCC5E3F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {3373D386-43EB-4EAB-9F0F-9E6C156EBF65} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {000288B2-5955-4E16-87BE-41184204D37D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4444BC15-AC85-4E6C-BDEF-92EDC7942A38} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {627DF7F0-E7F7-4FF0-B350-E2CCE8C5E6B2} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C36334DE-1EEE-4C6D-8FB4-B3D9F534BBAD} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {084DA7D9-81EB-4425-868C-CE565C7D08E2} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {14EFBE93-B6E8-4184-9769-DC28BD202305} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E2166537-E4D5-4738-B35B-D3D74265C6FF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {679D8F24-F945-4858-9C00-0EE3B0611C40} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {35B08439-8D62-497A-B55E-268F5BCC5E3F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {3373D386-43EB-4EAB-9F0F-9E6C156EBF65} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {000288B2-5955-4E16-87BE-41184204D37D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4444BC15-AC85-4E6C-BDEF-92EDC7942A38} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {627DF7F0-E7F7-4FF0-B350-E2CCE8C5E6B2} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C36334DE-1EEE-4C6D-8FB4-B3D9F534BBAD} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {CECB8E0E-DBD1-41B4-99BC-D6610F1DCDE7} diff --git a/sdk/src/Services/SageMakerGeospatial/Generated/AmazonSageMakerGeospatialConfig.cs b/sdk/src/Services/SageMakerGeospatial/Generated/AmazonSageMakerGeospatialConfig.cs index 277af82f457a..bce6d537ef05 100644 --- a/sdk/src/Services/SageMakerGeospatial/Generated/AmazonSageMakerGeospatialConfig.cs +++ b/sdk/src/Services/SageMakerGeospatial/Generated/AmazonSageMakerGeospatialConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.SageMakerGeospatial public partial class AmazonSageMakerGeospatialConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("SageMaker Geospatial", "4.0.0.0"); private static readonly AmazonSageMakerGeospatialEndpointResolver EndpointResolver = new AmazonSageMakerGeospatialEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("SageMaker Geospatial", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("SageMaker Geospatial", "3.7.400.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/SageMakerGeospatial/Properties/AssemblyInfo.cs b/sdk/src/Services/SageMakerGeospatial/Properties/AssemblyInfo.cs index d3c1549864db..505d06420c4e 100644 --- a/sdk/src/Services/SageMakerGeospatial/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/SageMakerGeospatial/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/SageMakerGeospatial/SageMakerGeospatial.sln b/sdk/src/Services/SageMakerGeospatial/SageMakerGeospatial.sln index fefeb4ad4572..fb7fa3834266 100644 --- a/sdk/src/Services/SageMakerGeospatial/SageMakerGeospatial.sln +++ b/sdk/src/Services/SageMakerGeospatial/SageMakerGeospatial.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {D1A743F6-65C1-40CC-ADDD-162D5BF0D50A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {D1A743F6-65C1-40CC-ADDD-162D5BF0D50A}.Debug|Any CPU.Build.0 = Debug|Any CPU {D1A743F6-65C1-40CC-ADDD-162D5BF0D50A}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {6EAF45E1-EF05-4625-A695-EC7CD3426326}.Debug|Any CPU.Build.0 = Debug|Any CPU {6EAF45E1-EF05-4625-A695-EC7CD3426326}.Release|Any CPU.ActiveCfg = Release|Any CPU {6EAF45E1-EF05-4625-A695-EC7CD3426326}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {C3DAFD90-6771-433E-8E99-05305885FCFD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C3DAFD90-6771-433E-8E99-05305885FCFD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C3DAFD90-6771-433E-8E99-05305885FCFD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C3DAFD90-6771-433E-8E99-05305885FCFD}.Release|Any CPU.Build.0 = Release|Any CPU - {E33B780E-9609-40A6-AA8D-F1C424A4905B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E33B780E-9609-40A6-AA8D-F1C424A4905B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E33B780E-9609-40A6-AA8D-F1C424A4905B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E33B780E-9609-40A6-AA8D-F1C424A4905B}.Release|Any CPU.Build.0 = Release|Any CPU - {E95AE993-E1F8-47DE-9797-3B0619DCC53E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E95AE993-E1F8-47DE-9797-3B0619DCC53E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E95AE993-E1F8-47DE-9797-3B0619DCC53E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E95AE993-E1F8-47DE-9797-3B0619DCC53E}.Release|Any CPU.Build.0 = Release|Any CPU - {C0A77F53-76D9-48C3-AD6B-43A65047E13D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C0A77F53-76D9-48C3-AD6B-43A65047E13D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C0A77F53-76D9-48C3-AD6B-43A65047E13D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C0A77F53-76D9-48C3-AD6B-43A65047E13D}.Release|Any CPU.Build.0 = Release|Any CPU - {5A6D9411-4423-4C79-9D5A-218F2AB68E59}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5A6D9411-4423-4C79-9D5A-218F2AB68E59}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5A6D9411-4423-4C79-9D5A-218F2AB68E59}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5A6D9411-4423-4C79-9D5A-218F2AB68E59}.Release|Any CPU.Build.0 = Release|Any CPU - {7FAA6AFF-B251-43DB-8DEF-E690B37C4936}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7FAA6AFF-B251-43DB-8DEF-E690B37C4936}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7FAA6AFF-B251-43DB-8DEF-E690B37C4936}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7FAA6AFF-B251-43DB-8DEF-E690B37C4936}.Release|Any CPU.Build.0 = Release|Any CPU - {93E1B653-3D64-45F4-92F6-70814B5DA088}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {93E1B653-3D64-45F4-92F6-70814B5DA088}.Debug|Any CPU.Build.0 = Debug|Any CPU - {93E1B653-3D64-45F4-92F6-70814B5DA088}.Release|Any CPU.ActiveCfg = Release|Any CPU - {93E1B653-3D64-45F4-92F6-70814B5DA088}.Release|Any CPU.Build.0 = Release|Any CPU - {4B0861E8-B349-4FE8-A174-EDFEE41BC5FD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4B0861E8-B349-4FE8-A174-EDFEE41BC5FD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4B0861E8-B349-4FE8-A174-EDFEE41BC5FD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4B0861E8-B349-4FE8-A174-EDFEE41BC5FD}.Release|Any CPU.Build.0 = Release|Any CPU - {0D218B59-A624-4D5E-82DE-B8DFD450D5CA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0D218B59-A624-4D5E-82DE-B8DFD450D5CA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0D218B59-A624-4D5E-82DE-B8DFD450D5CA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0D218B59-A624-4D5E-82DE-B8DFD450D5CA}.Release|Any CPU.Build.0 = Release|Any CPU - {44D3C07D-2B28-4B23-A416-F3A7188F08A9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {44D3C07D-2B28-4B23-A416-F3A7188F08A9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {44D3C07D-2B28-4B23-A416-F3A7188F08A9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {44D3C07D-2B28-4B23-A416-F3A7188F08A9}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {C3DAFD90-6771-433E-8E99-05305885FCFD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C3DAFD90-6771-433E-8E99-05305885FCFD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C3DAFD90-6771-433E-8E99-05305885FCFD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C3DAFD90-6771-433E-8E99-05305885FCFD}.Release|Any CPU.Build.0 = Release|Any CPU - {E33B780E-9609-40A6-AA8D-F1C424A4905B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E33B780E-9609-40A6-AA8D-F1C424A4905B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E33B780E-9609-40A6-AA8D-F1C424A4905B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E33B780E-9609-40A6-AA8D-F1C424A4905B}.Release|Any CPU.Build.0 = Release|Any CPU - {E95AE993-E1F8-47DE-9797-3B0619DCC53E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E95AE993-E1F8-47DE-9797-3B0619DCC53E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E95AE993-E1F8-47DE-9797-3B0619DCC53E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E95AE993-E1F8-47DE-9797-3B0619DCC53E}.Release|Any CPU.Build.0 = Release|Any CPU - {C0A77F53-76D9-48C3-AD6B-43A65047E13D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C0A77F53-76D9-48C3-AD6B-43A65047E13D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C0A77F53-76D9-48C3-AD6B-43A65047E13D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C0A77F53-76D9-48C3-AD6B-43A65047E13D}.Release|Any CPU.Build.0 = Release|Any CPU - {5A6D9411-4423-4C79-9D5A-218F2AB68E59}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5A6D9411-4423-4C79-9D5A-218F2AB68E59}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5A6D9411-4423-4C79-9D5A-218F2AB68E59}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5A6D9411-4423-4C79-9D5A-218F2AB68E59}.Release|Any CPU.Build.0 = Release|Any CPU - {7FAA6AFF-B251-43DB-8DEF-E690B37C4936}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7FAA6AFF-B251-43DB-8DEF-E690B37C4936}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7FAA6AFF-B251-43DB-8DEF-E690B37C4936}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7FAA6AFF-B251-43DB-8DEF-E690B37C4936}.Release|Any CPU.Build.0 = Release|Any CPU - {93E1B653-3D64-45F4-92F6-70814B5DA088}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {93E1B653-3D64-45F4-92F6-70814B5DA088}.Debug|Any CPU.Build.0 = Debug|Any CPU - {93E1B653-3D64-45F4-92F6-70814B5DA088}.Release|Any CPU.ActiveCfg = Release|Any CPU - {93E1B653-3D64-45F4-92F6-70814B5DA088}.Release|Any CPU.Build.0 = Release|Any CPU - {4B0861E8-B349-4FE8-A174-EDFEE41BC5FD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4B0861E8-B349-4FE8-A174-EDFEE41BC5FD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4B0861E8-B349-4FE8-A174-EDFEE41BC5FD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4B0861E8-B349-4FE8-A174-EDFEE41BC5FD}.Release|Any CPU.Build.0 = Release|Any CPU - {0D218B59-A624-4D5E-82DE-B8DFD450D5CA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0D218B59-A624-4D5E-82DE-B8DFD450D5CA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0D218B59-A624-4D5E-82DE-B8DFD450D5CA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0D218B59-A624-4D5E-82DE-B8DFD450D5CA}.Release|Any CPU.Build.0 = Release|Any CPU - {44D3C07D-2B28-4B23-A416-F3A7188F08A9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {44D3C07D-2B28-4B23-A416-F3A7188F08A9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {44D3C07D-2B28-4B23-A416-F3A7188F08A9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {44D3C07D-2B28-4B23-A416-F3A7188F08A9}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {D1A743F6-65C1-40CC-ADDD-162D5BF0D50A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {9D4A0054-3D44-44D9-96AB-8E579CC70D88} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {39EEA36E-38B5-4D9F-B849-B070CD2F8E77} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {502943F7-C4C8-4527-96D8-207C72ADE29E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {6EAF45E1-EF05-4625-A695-EC7CD3426326} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {C3DAFD90-6771-433E-8E99-05305885FCFD} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E33B780E-9609-40A6-AA8D-F1C424A4905B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E95AE993-E1F8-47DE-9797-3B0619DCC53E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C0A77F53-76D9-48C3-AD6B-43A65047E13D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {5A6D9411-4423-4C79-9D5A-218F2AB68E59} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {7FAA6AFF-B251-43DB-8DEF-E690B37C4936} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {93E1B653-3D64-45F4-92F6-70814B5DA088} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4B0861E8-B349-4FE8-A174-EDFEE41BC5FD} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0D218B59-A624-4D5E-82DE-B8DFD450D5CA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {44D3C07D-2B28-4B23-A416-F3A7188F08A9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {C3DAFD90-6771-433E-8E99-05305885FCFD} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E33B780E-9609-40A6-AA8D-F1C424A4905B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E95AE993-E1F8-47DE-9797-3B0619DCC53E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C0A77F53-76D9-48C3-AD6B-43A65047E13D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {5A6D9411-4423-4C79-9D5A-218F2AB68E59} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {7FAA6AFF-B251-43DB-8DEF-E690B37C4936} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {93E1B653-3D64-45F4-92F6-70814B5DA088} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4B0861E8-B349-4FE8-A174-EDFEE41BC5FD} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0D218B59-A624-4D5E-82DE-B8DFD450D5CA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {44D3C07D-2B28-4B23-A416-F3A7188F08A9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {BFE77CBA-2D3C-41B3-9667-504732B6871C} diff --git a/sdk/src/Services/SageMakerMetrics/Generated/AmazonSageMakerMetricsConfig.cs b/sdk/src/Services/SageMakerMetrics/Generated/AmazonSageMakerMetricsConfig.cs index 7e1455525f14..9ab3d4cab110 100644 --- a/sdk/src/Services/SageMakerMetrics/Generated/AmazonSageMakerMetricsConfig.cs +++ b/sdk/src/Services/SageMakerMetrics/Generated/AmazonSageMakerMetricsConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.SageMakerMetrics public partial class AmazonSageMakerMetricsConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("SageMaker Metrics", "4.0.0.0"); private static readonly AmazonSageMakerMetricsEndpointResolver EndpointResolver = new AmazonSageMakerMetricsEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("SageMaker Metrics", "3.7.401.4"); -======= - InternalSDKUtils.BuildUserAgentString("SageMaker Metrics", "3.7.401.31"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/SageMakerMetrics/Properties/AssemblyInfo.cs b/sdk/src/Services/SageMakerMetrics/Properties/AssemblyInfo.cs index fa65bf91f790..370034583579 100644 --- a/sdk/src/Services/SageMakerMetrics/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/SageMakerMetrics/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.4")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.31")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/SageMakerMetrics/SageMakerMetrics.sln b/sdk/src/Services/SageMakerMetrics/SageMakerMetrics.sln index 1aa4c24c17ce..692ecf81812e 100644 --- a/sdk/src/Services/SageMakerMetrics/SageMakerMetrics.sln +++ b/sdk/src/Services/SageMakerMetrics/SageMakerMetrics.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {40B539C0-72E9-4F17-9B51-B9D423CFB809}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {40B539C0-72E9-4F17-9B51-B9D423CFB809}.Debug|Any CPU.Build.0 = Debug|Any CPU {40B539C0-72E9-4F17-9B51-B9D423CFB809}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {E231B553-84C1-4752-BCD2-D4C47E8AE4DF}.Debug|Any CPU.Build.0 = Debug|Any CPU {E231B553-84C1-4752-BCD2-D4C47E8AE4DF}.Release|Any CPU.ActiveCfg = Release|Any CPU {E231B553-84C1-4752-BCD2-D4C47E8AE4DF}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {506986DD-000A-4A1D-9A5E-041E879A5764}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {506986DD-000A-4A1D-9A5E-041E879A5764}.Debug|Any CPU.Build.0 = Debug|Any CPU - {506986DD-000A-4A1D-9A5E-041E879A5764}.Release|Any CPU.ActiveCfg = Release|Any CPU - {506986DD-000A-4A1D-9A5E-041E879A5764}.Release|Any CPU.Build.0 = Release|Any CPU - {B476AEC1-A661-43EE-9A76-6FC5F65A7461}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B476AEC1-A661-43EE-9A76-6FC5F65A7461}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B476AEC1-A661-43EE-9A76-6FC5F65A7461}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B476AEC1-A661-43EE-9A76-6FC5F65A7461}.Release|Any CPU.Build.0 = Release|Any CPU - {E97FBECB-B5B6-4284-AA37-3DD54BBCC7ED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E97FBECB-B5B6-4284-AA37-3DD54BBCC7ED}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E97FBECB-B5B6-4284-AA37-3DD54BBCC7ED}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E97FBECB-B5B6-4284-AA37-3DD54BBCC7ED}.Release|Any CPU.Build.0 = Release|Any CPU - {14DEFD40-3A21-4FDC-ACFB-E0797F1714A8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {14DEFD40-3A21-4FDC-ACFB-E0797F1714A8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {14DEFD40-3A21-4FDC-ACFB-E0797F1714A8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {14DEFD40-3A21-4FDC-ACFB-E0797F1714A8}.Release|Any CPU.Build.0 = Release|Any CPU - {D24E9953-4D99-46C6-8A56-680F448ECD22}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D24E9953-4D99-46C6-8A56-680F448ECD22}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D24E9953-4D99-46C6-8A56-680F448ECD22}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D24E9953-4D99-46C6-8A56-680F448ECD22}.Release|Any CPU.Build.0 = Release|Any CPU - {7BD84E6A-1A83-4E53-AF01-DF21C868B47A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7BD84E6A-1A83-4E53-AF01-DF21C868B47A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7BD84E6A-1A83-4E53-AF01-DF21C868B47A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7BD84E6A-1A83-4E53-AF01-DF21C868B47A}.Release|Any CPU.Build.0 = Release|Any CPU - {AB098BB7-8671-4ACF-AEE5-D24F7EC1DBE3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AB098BB7-8671-4ACF-AEE5-D24F7EC1DBE3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AB098BB7-8671-4ACF-AEE5-D24F7EC1DBE3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AB098BB7-8671-4ACF-AEE5-D24F7EC1DBE3}.Release|Any CPU.Build.0 = Release|Any CPU - {89429CCD-B3C6-4153-836D-595182291CB5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {89429CCD-B3C6-4153-836D-595182291CB5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {89429CCD-B3C6-4153-836D-595182291CB5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {89429CCD-B3C6-4153-836D-595182291CB5}.Release|Any CPU.Build.0 = Release|Any CPU - {E960D139-EEDD-4CAF-8A6D-57BF9231401D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E960D139-EEDD-4CAF-8A6D-57BF9231401D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E960D139-EEDD-4CAF-8A6D-57BF9231401D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E960D139-EEDD-4CAF-8A6D-57BF9231401D}.Release|Any CPU.Build.0 = Release|Any CPU - {7A335EA7-6486-4E7C-A616-66D86D3B3157}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7A335EA7-6486-4E7C-A616-66D86D3B3157}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7A335EA7-6486-4E7C-A616-66D86D3B3157}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7A335EA7-6486-4E7C-A616-66D86D3B3157}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {506986DD-000A-4A1D-9A5E-041E879A5764}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {506986DD-000A-4A1D-9A5E-041E879A5764}.Debug|Any CPU.Build.0 = Debug|Any CPU - {506986DD-000A-4A1D-9A5E-041E879A5764}.Release|Any CPU.ActiveCfg = Release|Any CPU - {506986DD-000A-4A1D-9A5E-041E879A5764}.Release|Any CPU.Build.0 = Release|Any CPU - {B476AEC1-A661-43EE-9A76-6FC5F65A7461}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B476AEC1-A661-43EE-9A76-6FC5F65A7461}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B476AEC1-A661-43EE-9A76-6FC5F65A7461}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B476AEC1-A661-43EE-9A76-6FC5F65A7461}.Release|Any CPU.Build.0 = Release|Any CPU - {E97FBECB-B5B6-4284-AA37-3DD54BBCC7ED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E97FBECB-B5B6-4284-AA37-3DD54BBCC7ED}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E97FBECB-B5B6-4284-AA37-3DD54BBCC7ED}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E97FBECB-B5B6-4284-AA37-3DD54BBCC7ED}.Release|Any CPU.Build.0 = Release|Any CPU - {14DEFD40-3A21-4FDC-ACFB-E0797F1714A8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {14DEFD40-3A21-4FDC-ACFB-E0797F1714A8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {14DEFD40-3A21-4FDC-ACFB-E0797F1714A8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {14DEFD40-3A21-4FDC-ACFB-E0797F1714A8}.Release|Any CPU.Build.0 = Release|Any CPU - {D24E9953-4D99-46C6-8A56-680F448ECD22}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D24E9953-4D99-46C6-8A56-680F448ECD22}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D24E9953-4D99-46C6-8A56-680F448ECD22}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D24E9953-4D99-46C6-8A56-680F448ECD22}.Release|Any CPU.Build.0 = Release|Any CPU - {7BD84E6A-1A83-4E53-AF01-DF21C868B47A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7BD84E6A-1A83-4E53-AF01-DF21C868B47A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7BD84E6A-1A83-4E53-AF01-DF21C868B47A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7BD84E6A-1A83-4E53-AF01-DF21C868B47A}.Release|Any CPU.Build.0 = Release|Any CPU - {AB098BB7-8671-4ACF-AEE5-D24F7EC1DBE3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AB098BB7-8671-4ACF-AEE5-D24F7EC1DBE3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AB098BB7-8671-4ACF-AEE5-D24F7EC1DBE3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AB098BB7-8671-4ACF-AEE5-D24F7EC1DBE3}.Release|Any CPU.Build.0 = Release|Any CPU - {89429CCD-B3C6-4153-836D-595182291CB5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {89429CCD-B3C6-4153-836D-595182291CB5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {89429CCD-B3C6-4153-836D-595182291CB5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {89429CCD-B3C6-4153-836D-595182291CB5}.Release|Any CPU.Build.0 = Release|Any CPU - {E960D139-EEDD-4CAF-8A6D-57BF9231401D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E960D139-EEDD-4CAF-8A6D-57BF9231401D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E960D139-EEDD-4CAF-8A6D-57BF9231401D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E960D139-EEDD-4CAF-8A6D-57BF9231401D}.Release|Any CPU.Build.0 = Release|Any CPU - {7A335EA7-6486-4E7C-A616-66D86D3B3157}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7A335EA7-6486-4E7C-A616-66D86D3B3157}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7A335EA7-6486-4E7C-A616-66D86D3B3157}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7A335EA7-6486-4E7C-A616-66D86D3B3157}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {40B539C0-72E9-4F17-9B51-B9D423CFB809} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {867575DB-9938-484A-8320-4ABDC7BA70C3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {5AFF197F-F11A-468C-9902-B07298AC379A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {A55EAF48-5D09-4D92-B5C5-619D18139A75} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {E231B553-84C1-4752-BCD2-D4C47E8AE4DF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {506986DD-000A-4A1D-9A5E-041E879A5764} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B476AEC1-A661-43EE-9A76-6FC5F65A7461} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E97FBECB-B5B6-4284-AA37-3DD54BBCC7ED} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {14DEFD40-3A21-4FDC-ACFB-E0797F1714A8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D24E9953-4D99-46C6-8A56-680F448ECD22} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {7BD84E6A-1A83-4E53-AF01-DF21C868B47A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {AB098BB7-8671-4ACF-AEE5-D24F7EC1DBE3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {89429CCD-B3C6-4153-836D-595182291CB5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E960D139-EEDD-4CAF-8A6D-57BF9231401D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {7A335EA7-6486-4E7C-A616-66D86D3B3157} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {506986DD-000A-4A1D-9A5E-041E879A5764} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B476AEC1-A661-43EE-9A76-6FC5F65A7461} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E97FBECB-B5B6-4284-AA37-3DD54BBCC7ED} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {14DEFD40-3A21-4FDC-ACFB-E0797F1714A8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D24E9953-4D99-46C6-8A56-680F448ECD22} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {7BD84E6A-1A83-4E53-AF01-DF21C868B47A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {AB098BB7-8671-4ACF-AEE5-D24F7EC1DBE3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {89429CCD-B3C6-4153-836D-595182291CB5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E960D139-EEDD-4CAF-8A6D-57BF9231401D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {7A335EA7-6486-4E7C-A616-66D86D3B3157} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {D8A28E91-C5CC-47AF-9A2D-A20219430E57} diff --git a/sdk/src/Services/SageMakerRuntime/Generated/AmazonSageMakerRuntimeConfig.cs b/sdk/src/Services/SageMakerRuntime/Generated/AmazonSageMakerRuntimeConfig.cs index 431b60f0f3ea..a497669b30ae 100644 --- a/sdk/src/Services/SageMakerRuntime/Generated/AmazonSageMakerRuntimeConfig.cs +++ b/sdk/src/Services/SageMakerRuntime/Generated/AmazonSageMakerRuntimeConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.SageMakerRuntime public partial class AmazonSageMakerRuntimeConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("SageMaker Runtime", "4.0.0.0"); private static readonly AmazonSageMakerRuntimeEndpointResolver EndpointResolver = new AmazonSageMakerRuntimeEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("SageMaker Runtime", "3.7.401.9"); -======= - InternalSDKUtils.BuildUserAgentString("SageMaker Runtime", "3.7.401.36"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/SageMakerRuntime/Properties/AssemblyInfo.cs b/sdk/src/Services/SageMakerRuntime/Properties/AssemblyInfo.cs index 79fbd118dc74..6d453e7351e9 100644 --- a/sdk/src/Services/SageMakerRuntime/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/SageMakerRuntime/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.9")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.36")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/SageMakerRuntime/SageMakerRuntime.sln b/sdk/src/Services/SageMakerRuntime/SageMakerRuntime.sln index 2367266c3acf..535db288259b 100644 --- a/sdk/src/Services/SageMakerRuntime/SageMakerRuntime.sln +++ b/sdk/src/Services/SageMakerRuntime/SageMakerRuntime.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {48DE7FBD-077B-4B7E-8004-656A5ACE2FC1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {48DE7FBD-077B-4B7E-8004-656A5ACE2FC1}.Debug|Any CPU.Build.0 = Debug|Any CPU {48DE7FBD-077B-4B7E-8004-656A5ACE2FC1}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {ABDF7F35-FFC3-4CB4-AEC5-D70297E40C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {ABDF7F35-FFC3-4CB4-AEC5-D70297E40C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {ABDF7F35-FFC3-4CB4-AEC5-D70297E40C19}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {9EF950CE-D29D-49E3-AD8B-30D7EEC950CA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9EF950CE-D29D-49E3-AD8B-30D7EEC950CA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9EF950CE-D29D-49E3-AD8B-30D7EEC950CA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9EF950CE-D29D-49E3-AD8B-30D7EEC950CA}.Release|Any CPU.Build.0 = Release|Any CPU - {82FC125B-E9CD-4483-851E-A415F9ABCA75}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {82FC125B-E9CD-4483-851E-A415F9ABCA75}.Debug|Any CPU.Build.0 = Debug|Any CPU - {82FC125B-E9CD-4483-851E-A415F9ABCA75}.Release|Any CPU.ActiveCfg = Release|Any CPU - {82FC125B-E9CD-4483-851E-A415F9ABCA75}.Release|Any CPU.Build.0 = Release|Any CPU - {99DCBE26-A6DF-4ED5-B3DC-E8BF253DE92F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {99DCBE26-A6DF-4ED5-B3DC-E8BF253DE92F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {99DCBE26-A6DF-4ED5-B3DC-E8BF253DE92F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {99DCBE26-A6DF-4ED5-B3DC-E8BF253DE92F}.Release|Any CPU.Build.0 = Release|Any CPU - {2F06CF79-D3C2-4E9D-80E6-2C9050E74E58}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2F06CF79-D3C2-4E9D-80E6-2C9050E74E58}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2F06CF79-D3C2-4E9D-80E6-2C9050E74E58}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2F06CF79-D3C2-4E9D-80E6-2C9050E74E58}.Release|Any CPU.Build.0 = Release|Any CPU - {24010043-FA6C-4E7A-82FC-9CDC4B6B9D4E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {24010043-FA6C-4E7A-82FC-9CDC4B6B9D4E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {24010043-FA6C-4E7A-82FC-9CDC4B6B9D4E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {24010043-FA6C-4E7A-82FC-9CDC4B6B9D4E}.Release|Any CPU.Build.0 = Release|Any CPU - {708482F5-EBFD-4E71-8773-576069DBAB4D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {708482F5-EBFD-4E71-8773-576069DBAB4D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {708482F5-EBFD-4E71-8773-576069DBAB4D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {708482F5-EBFD-4E71-8773-576069DBAB4D}.Release|Any CPU.Build.0 = Release|Any CPU - {20DBAF6C-F1C8-47FA-AC3F-05BB8622F133}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {20DBAF6C-F1C8-47FA-AC3F-05BB8622F133}.Debug|Any CPU.Build.0 = Debug|Any CPU - {20DBAF6C-F1C8-47FA-AC3F-05BB8622F133}.Release|Any CPU.ActiveCfg = Release|Any CPU - {20DBAF6C-F1C8-47FA-AC3F-05BB8622F133}.Release|Any CPU.Build.0 = Release|Any CPU - {EC3544E2-963B-429E-8429-B19EC5ECF3D1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EC3544E2-963B-429E-8429-B19EC5ECF3D1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EC3544E2-963B-429E-8429-B19EC5ECF3D1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EC3544E2-963B-429E-8429-B19EC5ECF3D1}.Release|Any CPU.Build.0 = Release|Any CPU - {0E72535E-090C-4DEC-81DB-43D30361652C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0E72535E-090C-4DEC-81DB-43D30361652C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0E72535E-090C-4DEC-81DB-43D30361652C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0E72535E-090C-4DEC-81DB-43D30361652C}.Release|Any CPU.Build.0 = Release|Any CPU - {256FCF27-0950-4F0F-BE3C-111DAEEA35D5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {256FCF27-0950-4F0F-BE3C-111DAEEA35D5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {256FCF27-0950-4F0F-BE3C-111DAEEA35D5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {256FCF27-0950-4F0F-BE3C-111DAEEA35D5}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {9EF950CE-D29D-49E3-AD8B-30D7EEC950CA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9EF950CE-D29D-49E3-AD8B-30D7EEC950CA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9EF950CE-D29D-49E3-AD8B-30D7EEC950CA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9EF950CE-D29D-49E3-AD8B-30D7EEC950CA}.Release|Any CPU.Build.0 = Release|Any CPU - {82FC125B-E9CD-4483-851E-A415F9ABCA75}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {82FC125B-E9CD-4483-851E-A415F9ABCA75}.Debug|Any CPU.Build.0 = Debug|Any CPU - {82FC125B-E9CD-4483-851E-A415F9ABCA75}.Release|Any CPU.ActiveCfg = Release|Any CPU - {82FC125B-E9CD-4483-851E-A415F9ABCA75}.Release|Any CPU.Build.0 = Release|Any CPU - {99DCBE26-A6DF-4ED5-B3DC-E8BF253DE92F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {99DCBE26-A6DF-4ED5-B3DC-E8BF253DE92F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {99DCBE26-A6DF-4ED5-B3DC-E8BF253DE92F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {99DCBE26-A6DF-4ED5-B3DC-E8BF253DE92F}.Release|Any CPU.Build.0 = Release|Any CPU - {2F06CF79-D3C2-4E9D-80E6-2C9050E74E58}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2F06CF79-D3C2-4E9D-80E6-2C9050E74E58}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2F06CF79-D3C2-4E9D-80E6-2C9050E74E58}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2F06CF79-D3C2-4E9D-80E6-2C9050E74E58}.Release|Any CPU.Build.0 = Release|Any CPU - {24010043-FA6C-4E7A-82FC-9CDC4B6B9D4E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {24010043-FA6C-4E7A-82FC-9CDC4B6B9D4E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {24010043-FA6C-4E7A-82FC-9CDC4B6B9D4E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {24010043-FA6C-4E7A-82FC-9CDC4B6B9D4E}.Release|Any CPU.Build.0 = Release|Any CPU - {708482F5-EBFD-4E71-8773-576069DBAB4D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {708482F5-EBFD-4E71-8773-576069DBAB4D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {708482F5-EBFD-4E71-8773-576069DBAB4D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {708482F5-EBFD-4E71-8773-576069DBAB4D}.Release|Any CPU.Build.0 = Release|Any CPU - {20DBAF6C-F1C8-47FA-AC3F-05BB8622F133}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {20DBAF6C-F1C8-47FA-AC3F-05BB8622F133}.Debug|Any CPU.Build.0 = Debug|Any CPU - {20DBAF6C-F1C8-47FA-AC3F-05BB8622F133}.Release|Any CPU.ActiveCfg = Release|Any CPU - {20DBAF6C-F1C8-47FA-AC3F-05BB8622F133}.Release|Any CPU.Build.0 = Release|Any CPU - {EC3544E2-963B-429E-8429-B19EC5ECF3D1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EC3544E2-963B-429E-8429-B19EC5ECF3D1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EC3544E2-963B-429E-8429-B19EC5ECF3D1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EC3544E2-963B-429E-8429-B19EC5ECF3D1}.Release|Any CPU.Build.0 = Release|Any CPU - {0E72535E-090C-4DEC-81DB-43D30361652C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0E72535E-090C-4DEC-81DB-43D30361652C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0E72535E-090C-4DEC-81DB-43D30361652C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0E72535E-090C-4DEC-81DB-43D30361652C}.Release|Any CPU.Build.0 = Release|Any CPU - {256FCF27-0950-4F0F-BE3C-111DAEEA35D5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {256FCF27-0950-4F0F-BE3C-111DAEEA35D5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {256FCF27-0950-4F0F-BE3C-111DAEEA35D5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {256FCF27-0950-4F0F-BE3C-111DAEEA35D5}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {48DE7FBD-077B-4B7E-8004-656A5ACE2FC1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {CC766FE2-AE0E-41D1-A538-7D8AC9C8B3FB} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {5B09C365-7653-47B8-BC54-6D6644255D05} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {6C27AAA7-A7F7-49A4-9FED-502BE15484D6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {ABDF7F35-FFC3-4CB4-AEC5-D70297E40C19} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {9EF950CE-D29D-49E3-AD8B-30D7EEC950CA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {82FC125B-E9CD-4483-851E-A415F9ABCA75} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {99DCBE26-A6DF-4ED5-B3DC-E8BF253DE92F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {2F06CF79-D3C2-4E9D-80E6-2C9050E74E58} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {24010043-FA6C-4E7A-82FC-9CDC4B6B9D4E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {708482F5-EBFD-4E71-8773-576069DBAB4D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {20DBAF6C-F1C8-47FA-AC3F-05BB8622F133} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {EC3544E2-963B-429E-8429-B19EC5ECF3D1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0E72535E-090C-4DEC-81DB-43D30361652C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {256FCF27-0950-4F0F-BE3C-111DAEEA35D5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {9EF950CE-D29D-49E3-AD8B-30D7EEC950CA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {82FC125B-E9CD-4483-851E-A415F9ABCA75} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {99DCBE26-A6DF-4ED5-B3DC-E8BF253DE92F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {2F06CF79-D3C2-4E9D-80E6-2C9050E74E58} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {24010043-FA6C-4E7A-82FC-9CDC4B6B9D4E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {708482F5-EBFD-4E71-8773-576069DBAB4D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {20DBAF6C-F1C8-47FA-AC3F-05BB8622F133} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {EC3544E2-963B-429E-8429-B19EC5ECF3D1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0E72535E-090C-4DEC-81DB-43D30361652C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {256FCF27-0950-4F0F-BE3C-111DAEEA35D5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {E2F6F2F3-F277-4825-9F11-92F31F1307C8} diff --git a/sdk/src/Services/SagemakerEdgeManager/Generated/AmazonSagemakerEdgeManagerConfig.cs b/sdk/src/Services/SagemakerEdgeManager/Generated/AmazonSagemakerEdgeManagerConfig.cs index 5ce70bf575c0..819297b87854 100644 --- a/sdk/src/Services/SagemakerEdgeManager/Generated/AmazonSagemakerEdgeManagerConfig.cs +++ b/sdk/src/Services/SagemakerEdgeManager/Generated/AmazonSagemakerEdgeManagerConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.SagemakerEdgeManager public partial class AmazonSagemakerEdgeManagerConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("Sagemaker Edge", "4.0.0.0"); private static readonly AmazonSagemakerEdgeManagerEndpointResolver EndpointResolver = new AmazonSagemakerEdgeManagerEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("Sagemaker Edge", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("Sagemaker Edge", "3.7.400.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/SagemakerEdgeManager/Properties/AssemblyInfo.cs b/sdk/src/Services/SagemakerEdgeManager/Properties/AssemblyInfo.cs index 81db9d110fd7..7599112cc886 100644 --- a/sdk/src/Services/SagemakerEdgeManager/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/SagemakerEdgeManager/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/SagemakerEdgeManager/SagemakerEdgeManager.sln b/sdk/src/Services/SagemakerEdgeManager/SagemakerEdgeManager.sln index 265d46ca6f4f..f1c2c9736d75 100644 --- a/sdk/src/Services/SagemakerEdgeManager/SagemakerEdgeManager.sln +++ b/sdk/src/Services/SagemakerEdgeManager/SagemakerEdgeManager.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {CBF96245-022D-4C7A-8B16-8B94FE70C460}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {CBF96245-022D-4C7A-8B16-8B94FE70C460}.Debug|Any CPU.Build.0 = Debug|Any CPU {CBF96245-022D-4C7A-8B16-8B94FE70C460}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {16F996D0-9046-4515-ACF7-88E43971DF22}.Debug|Any CPU.Build.0 = Debug|Any CPU {16F996D0-9046-4515-ACF7-88E43971DF22}.Release|Any CPU.ActiveCfg = Release|Any CPU {16F996D0-9046-4515-ACF7-88E43971DF22}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {C9018991-1AC6-488C-8592-072A9F3CE252}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C9018991-1AC6-488C-8592-072A9F3CE252}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C9018991-1AC6-488C-8592-072A9F3CE252}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C9018991-1AC6-488C-8592-072A9F3CE252}.Release|Any CPU.Build.0 = Release|Any CPU - {EABFA0A6-DE26-4B55-AB1C-391D77723080}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EABFA0A6-DE26-4B55-AB1C-391D77723080}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EABFA0A6-DE26-4B55-AB1C-391D77723080}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EABFA0A6-DE26-4B55-AB1C-391D77723080}.Release|Any CPU.Build.0 = Release|Any CPU - {15E8F706-FF49-4912-B022-1A5EEEBFCCB9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {15E8F706-FF49-4912-B022-1A5EEEBFCCB9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {15E8F706-FF49-4912-B022-1A5EEEBFCCB9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {15E8F706-FF49-4912-B022-1A5EEEBFCCB9}.Release|Any CPU.Build.0 = Release|Any CPU - {32A69AB0-F855-44DD-91DA-9B6B68E938AC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {32A69AB0-F855-44DD-91DA-9B6B68E938AC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {32A69AB0-F855-44DD-91DA-9B6B68E938AC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {32A69AB0-F855-44DD-91DA-9B6B68E938AC}.Release|Any CPU.Build.0 = Release|Any CPU - {81555CCD-CA6E-4814-9EF9-52E3ACA7EC48}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {81555CCD-CA6E-4814-9EF9-52E3ACA7EC48}.Debug|Any CPU.Build.0 = Debug|Any CPU - {81555CCD-CA6E-4814-9EF9-52E3ACA7EC48}.Release|Any CPU.ActiveCfg = Release|Any CPU - {81555CCD-CA6E-4814-9EF9-52E3ACA7EC48}.Release|Any CPU.Build.0 = Release|Any CPU - {14F89F6E-B374-445D-81F4-6CF811BCF59F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {14F89F6E-B374-445D-81F4-6CF811BCF59F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {14F89F6E-B374-445D-81F4-6CF811BCF59F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {14F89F6E-B374-445D-81F4-6CF811BCF59F}.Release|Any CPU.Build.0 = Release|Any CPU - {CFF721BA-0197-47A2-AFC7-5E7BE1D5777B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CFF721BA-0197-47A2-AFC7-5E7BE1D5777B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CFF721BA-0197-47A2-AFC7-5E7BE1D5777B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CFF721BA-0197-47A2-AFC7-5E7BE1D5777B}.Release|Any CPU.Build.0 = Release|Any CPU - {362D9DAB-C2BA-4FA6-B96B-3CEF9C17F52F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {362D9DAB-C2BA-4FA6-B96B-3CEF9C17F52F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {362D9DAB-C2BA-4FA6-B96B-3CEF9C17F52F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {362D9DAB-C2BA-4FA6-B96B-3CEF9C17F52F}.Release|Any CPU.Build.0 = Release|Any CPU - {007C10E9-F24F-4E9F-9F3D-9A51A70E7F1D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {007C10E9-F24F-4E9F-9F3D-9A51A70E7F1D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {007C10E9-F24F-4E9F-9F3D-9A51A70E7F1D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {007C10E9-F24F-4E9F-9F3D-9A51A70E7F1D}.Release|Any CPU.Build.0 = Release|Any CPU - {F63F971B-C820-48A9-8505-3A9899D80AA7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F63F971B-C820-48A9-8505-3A9899D80AA7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F63F971B-C820-48A9-8505-3A9899D80AA7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F63F971B-C820-48A9-8505-3A9899D80AA7}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {C9018991-1AC6-488C-8592-072A9F3CE252}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C9018991-1AC6-488C-8592-072A9F3CE252}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C9018991-1AC6-488C-8592-072A9F3CE252}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C9018991-1AC6-488C-8592-072A9F3CE252}.Release|Any CPU.Build.0 = Release|Any CPU - {EABFA0A6-DE26-4B55-AB1C-391D77723080}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EABFA0A6-DE26-4B55-AB1C-391D77723080}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EABFA0A6-DE26-4B55-AB1C-391D77723080}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EABFA0A6-DE26-4B55-AB1C-391D77723080}.Release|Any CPU.Build.0 = Release|Any CPU - {15E8F706-FF49-4912-B022-1A5EEEBFCCB9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {15E8F706-FF49-4912-B022-1A5EEEBFCCB9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {15E8F706-FF49-4912-B022-1A5EEEBFCCB9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {15E8F706-FF49-4912-B022-1A5EEEBFCCB9}.Release|Any CPU.Build.0 = Release|Any CPU - {32A69AB0-F855-44DD-91DA-9B6B68E938AC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {32A69AB0-F855-44DD-91DA-9B6B68E938AC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {32A69AB0-F855-44DD-91DA-9B6B68E938AC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {32A69AB0-F855-44DD-91DA-9B6B68E938AC}.Release|Any CPU.Build.0 = Release|Any CPU - {81555CCD-CA6E-4814-9EF9-52E3ACA7EC48}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {81555CCD-CA6E-4814-9EF9-52E3ACA7EC48}.Debug|Any CPU.Build.0 = Debug|Any CPU - {81555CCD-CA6E-4814-9EF9-52E3ACA7EC48}.Release|Any CPU.ActiveCfg = Release|Any CPU - {81555CCD-CA6E-4814-9EF9-52E3ACA7EC48}.Release|Any CPU.Build.0 = Release|Any CPU - {14F89F6E-B374-445D-81F4-6CF811BCF59F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {14F89F6E-B374-445D-81F4-6CF811BCF59F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {14F89F6E-B374-445D-81F4-6CF811BCF59F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {14F89F6E-B374-445D-81F4-6CF811BCF59F}.Release|Any CPU.Build.0 = Release|Any CPU - {CFF721BA-0197-47A2-AFC7-5E7BE1D5777B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CFF721BA-0197-47A2-AFC7-5E7BE1D5777B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CFF721BA-0197-47A2-AFC7-5E7BE1D5777B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CFF721BA-0197-47A2-AFC7-5E7BE1D5777B}.Release|Any CPU.Build.0 = Release|Any CPU - {362D9DAB-C2BA-4FA6-B96B-3CEF9C17F52F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {362D9DAB-C2BA-4FA6-B96B-3CEF9C17F52F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {362D9DAB-C2BA-4FA6-B96B-3CEF9C17F52F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {362D9DAB-C2BA-4FA6-B96B-3CEF9C17F52F}.Release|Any CPU.Build.0 = Release|Any CPU - {007C10E9-F24F-4E9F-9F3D-9A51A70E7F1D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {007C10E9-F24F-4E9F-9F3D-9A51A70E7F1D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {007C10E9-F24F-4E9F-9F3D-9A51A70E7F1D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {007C10E9-F24F-4E9F-9F3D-9A51A70E7F1D}.Release|Any CPU.Build.0 = Release|Any CPU - {F63F971B-C820-48A9-8505-3A9899D80AA7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F63F971B-C820-48A9-8505-3A9899D80AA7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F63F971B-C820-48A9-8505-3A9899D80AA7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F63F971B-C820-48A9-8505-3A9899D80AA7}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {CBF96245-022D-4C7A-8B16-8B94FE70C460} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {E91B0A7D-90B6-4D72-850C-E9323898887D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {049CF649-A101-4F39-8376-61C4C9F272D8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {D93A8AF5-B02F-435B-BAC7-3EE766C0F991} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {16F996D0-9046-4515-ACF7-88E43971DF22} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {C9018991-1AC6-488C-8592-072A9F3CE252} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {EABFA0A6-DE26-4B55-AB1C-391D77723080} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {15E8F706-FF49-4912-B022-1A5EEEBFCCB9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {32A69AB0-F855-44DD-91DA-9B6B68E938AC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {81555CCD-CA6E-4814-9EF9-52E3ACA7EC48} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {14F89F6E-B374-445D-81F4-6CF811BCF59F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {CFF721BA-0197-47A2-AFC7-5E7BE1D5777B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {362D9DAB-C2BA-4FA6-B96B-3CEF9C17F52F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {007C10E9-F24F-4E9F-9F3D-9A51A70E7F1D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F63F971B-C820-48A9-8505-3A9899D80AA7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {C9018991-1AC6-488C-8592-072A9F3CE252} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {EABFA0A6-DE26-4B55-AB1C-391D77723080} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {15E8F706-FF49-4912-B022-1A5EEEBFCCB9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {32A69AB0-F855-44DD-91DA-9B6B68E938AC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {81555CCD-CA6E-4814-9EF9-52E3ACA7EC48} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {14F89F6E-B374-445D-81F4-6CF811BCF59F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {CFF721BA-0197-47A2-AFC7-5E7BE1D5777B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {362D9DAB-C2BA-4FA6-B96B-3CEF9C17F52F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {007C10E9-F24F-4E9F-9F3D-9A51A70E7F1D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F63F971B-C820-48A9-8505-3A9899D80AA7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {EE3FE6B1-9811-4452-A9A5-B3A884C764B9} diff --git a/sdk/src/Services/SavingsPlans/Generated/AmazonSavingsPlansConfig.cs b/sdk/src/Services/SavingsPlans/Generated/AmazonSavingsPlansConfig.cs index d74bb01fd6a5..3815311facf8 100644 --- a/sdk/src/Services/SavingsPlans/Generated/AmazonSavingsPlansConfig.cs +++ b/sdk/src/Services/SavingsPlans/Generated/AmazonSavingsPlansConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.SavingsPlans public partial class AmazonSavingsPlansConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("savingsplans", "4.0.0.0"); private static readonly AmazonSavingsPlansEndpointResolver EndpointResolver = new AmazonSavingsPlansEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("savingsplans", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("savingsplans", "3.7.400.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/SavingsPlans/Properties/AssemblyInfo.cs b/sdk/src/Services/SavingsPlans/Properties/AssemblyInfo.cs index 40682db824b4..799ddae416bc 100644 --- a/sdk/src/Services/SavingsPlans/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/SavingsPlans/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/SavingsPlans/SavingsPlans.sln b/sdk/src/Services/SavingsPlans/SavingsPlans.sln index 2eb42371d24a..785b0237b80b 100644 --- a/sdk/src/Services/SavingsPlans/SavingsPlans.sln +++ b/sdk/src/Services/SavingsPlans/SavingsPlans.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {F73E38F2-E7F3-4DC1-9C28-778590280B8E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {F73E38F2-E7F3-4DC1-9C28-778590280B8E}.Debug|Any CPU.Build.0 = Debug|Any CPU {F73E38F2-E7F3-4DC1-9C28-778590280B8E}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {EB8F64F3-D7DF-4463-AB75-E1CDBB0EE184}.Debug|Any CPU.Build.0 = Debug|Any CPU {EB8F64F3-D7DF-4463-AB75-E1CDBB0EE184}.Release|Any CPU.ActiveCfg = Release|Any CPU {EB8F64F3-D7DF-4463-AB75-E1CDBB0EE184}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {BA1FDA67-9998-485F-ACFA-CB5E36B0C0F5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BA1FDA67-9998-485F-ACFA-CB5E36B0C0F5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BA1FDA67-9998-485F-ACFA-CB5E36B0C0F5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BA1FDA67-9998-485F-ACFA-CB5E36B0C0F5}.Release|Any CPU.Build.0 = Release|Any CPU - {4345E03B-CFD5-430E-9E42-AEA09F508205}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4345E03B-CFD5-430E-9E42-AEA09F508205}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4345E03B-CFD5-430E-9E42-AEA09F508205}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4345E03B-CFD5-430E-9E42-AEA09F508205}.Release|Any CPU.Build.0 = Release|Any CPU - {F3660C67-C8E1-4BE5-BAB5-440E60BDF494}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F3660C67-C8E1-4BE5-BAB5-440E60BDF494}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F3660C67-C8E1-4BE5-BAB5-440E60BDF494}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F3660C67-C8E1-4BE5-BAB5-440E60BDF494}.Release|Any CPU.Build.0 = Release|Any CPU - {5B755DC8-AC5C-4A52-8629-047D679E3146}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5B755DC8-AC5C-4A52-8629-047D679E3146}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5B755DC8-AC5C-4A52-8629-047D679E3146}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5B755DC8-AC5C-4A52-8629-047D679E3146}.Release|Any CPU.Build.0 = Release|Any CPU - {0B915B88-BA84-4FB0-8641-3AAA40779B02}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0B915B88-BA84-4FB0-8641-3AAA40779B02}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0B915B88-BA84-4FB0-8641-3AAA40779B02}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0B915B88-BA84-4FB0-8641-3AAA40779B02}.Release|Any CPU.Build.0 = Release|Any CPU - {6746606D-FD7D-4E63-A183-62D51766B171}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6746606D-FD7D-4E63-A183-62D51766B171}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6746606D-FD7D-4E63-A183-62D51766B171}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6746606D-FD7D-4E63-A183-62D51766B171}.Release|Any CPU.Build.0 = Release|Any CPU - {1051A914-2F67-417F-920B-1E93E6B8145C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1051A914-2F67-417F-920B-1E93E6B8145C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1051A914-2F67-417F-920B-1E93E6B8145C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1051A914-2F67-417F-920B-1E93E6B8145C}.Release|Any CPU.Build.0 = Release|Any CPU - {19F3090D-0C94-4CA7-AB2E-40E4B993828E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {19F3090D-0C94-4CA7-AB2E-40E4B993828E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {19F3090D-0C94-4CA7-AB2E-40E4B993828E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {19F3090D-0C94-4CA7-AB2E-40E4B993828E}.Release|Any CPU.Build.0 = Release|Any CPU - {72A2BAAC-0DF8-4680-A556-3C2B05E6F654}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {72A2BAAC-0DF8-4680-A556-3C2B05E6F654}.Debug|Any CPU.Build.0 = Debug|Any CPU - {72A2BAAC-0DF8-4680-A556-3C2B05E6F654}.Release|Any CPU.ActiveCfg = Release|Any CPU - {72A2BAAC-0DF8-4680-A556-3C2B05E6F654}.Release|Any CPU.Build.0 = Release|Any CPU - {32F71278-ED6E-4510-B5B4-713B867E2279}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {32F71278-ED6E-4510-B5B4-713B867E2279}.Debug|Any CPU.Build.0 = Debug|Any CPU - {32F71278-ED6E-4510-B5B4-713B867E2279}.Release|Any CPU.ActiveCfg = Release|Any CPU - {32F71278-ED6E-4510-B5B4-713B867E2279}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {BA1FDA67-9998-485F-ACFA-CB5E36B0C0F5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BA1FDA67-9998-485F-ACFA-CB5E36B0C0F5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BA1FDA67-9998-485F-ACFA-CB5E36B0C0F5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BA1FDA67-9998-485F-ACFA-CB5E36B0C0F5}.Release|Any CPU.Build.0 = Release|Any CPU - {4345E03B-CFD5-430E-9E42-AEA09F508205}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4345E03B-CFD5-430E-9E42-AEA09F508205}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4345E03B-CFD5-430E-9E42-AEA09F508205}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4345E03B-CFD5-430E-9E42-AEA09F508205}.Release|Any CPU.Build.0 = Release|Any CPU - {F3660C67-C8E1-4BE5-BAB5-440E60BDF494}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F3660C67-C8E1-4BE5-BAB5-440E60BDF494}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F3660C67-C8E1-4BE5-BAB5-440E60BDF494}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F3660C67-C8E1-4BE5-BAB5-440E60BDF494}.Release|Any CPU.Build.0 = Release|Any CPU - {5B755DC8-AC5C-4A52-8629-047D679E3146}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5B755DC8-AC5C-4A52-8629-047D679E3146}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5B755DC8-AC5C-4A52-8629-047D679E3146}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5B755DC8-AC5C-4A52-8629-047D679E3146}.Release|Any CPU.Build.0 = Release|Any CPU - {0B915B88-BA84-4FB0-8641-3AAA40779B02}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0B915B88-BA84-4FB0-8641-3AAA40779B02}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0B915B88-BA84-4FB0-8641-3AAA40779B02}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0B915B88-BA84-4FB0-8641-3AAA40779B02}.Release|Any CPU.Build.0 = Release|Any CPU - {6746606D-FD7D-4E63-A183-62D51766B171}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6746606D-FD7D-4E63-A183-62D51766B171}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6746606D-FD7D-4E63-A183-62D51766B171}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6746606D-FD7D-4E63-A183-62D51766B171}.Release|Any CPU.Build.0 = Release|Any CPU - {1051A914-2F67-417F-920B-1E93E6B8145C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1051A914-2F67-417F-920B-1E93E6B8145C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1051A914-2F67-417F-920B-1E93E6B8145C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1051A914-2F67-417F-920B-1E93E6B8145C}.Release|Any CPU.Build.0 = Release|Any CPU - {19F3090D-0C94-4CA7-AB2E-40E4B993828E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {19F3090D-0C94-4CA7-AB2E-40E4B993828E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {19F3090D-0C94-4CA7-AB2E-40E4B993828E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {19F3090D-0C94-4CA7-AB2E-40E4B993828E}.Release|Any CPU.Build.0 = Release|Any CPU - {72A2BAAC-0DF8-4680-A556-3C2B05E6F654}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {72A2BAAC-0DF8-4680-A556-3C2B05E6F654}.Debug|Any CPU.Build.0 = Debug|Any CPU - {72A2BAAC-0DF8-4680-A556-3C2B05E6F654}.Release|Any CPU.ActiveCfg = Release|Any CPU - {72A2BAAC-0DF8-4680-A556-3C2B05E6F654}.Release|Any CPU.Build.0 = Release|Any CPU - {32F71278-ED6E-4510-B5B4-713B867E2279}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {32F71278-ED6E-4510-B5B4-713B867E2279}.Debug|Any CPU.Build.0 = Debug|Any CPU - {32F71278-ED6E-4510-B5B4-713B867E2279}.Release|Any CPU.ActiveCfg = Release|Any CPU - {32F71278-ED6E-4510-B5B4-713B867E2279}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {F73E38F2-E7F3-4DC1-9C28-778590280B8E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {079FF8FC-0F02-48E9-B4A5-DC52CB767ED5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {80D04C11-6641-4D63-93A9-1335B8D6AD84} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {A2186BD9-D165-47EB-9E0D-33B9CDE938FC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {EB8F64F3-D7DF-4463-AB75-E1CDBB0EE184} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {BA1FDA67-9998-485F-ACFA-CB5E36B0C0F5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4345E03B-CFD5-430E-9E42-AEA09F508205} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F3660C67-C8E1-4BE5-BAB5-440E60BDF494} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {5B755DC8-AC5C-4A52-8629-047D679E3146} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0B915B88-BA84-4FB0-8641-3AAA40779B02} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6746606D-FD7D-4E63-A183-62D51766B171} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {1051A914-2F67-417F-920B-1E93E6B8145C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {19F3090D-0C94-4CA7-AB2E-40E4B993828E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {72A2BAAC-0DF8-4680-A556-3C2B05E6F654} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {32F71278-ED6E-4510-B5B4-713B867E2279} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {BA1FDA67-9998-485F-ACFA-CB5E36B0C0F5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4345E03B-CFD5-430E-9E42-AEA09F508205} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F3660C67-C8E1-4BE5-BAB5-440E60BDF494} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {5B755DC8-AC5C-4A52-8629-047D679E3146} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0B915B88-BA84-4FB0-8641-3AAA40779B02} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6746606D-FD7D-4E63-A183-62D51766B171} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {1051A914-2F67-417F-920B-1E93E6B8145C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {19F3090D-0C94-4CA7-AB2E-40E4B993828E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {72A2BAAC-0DF8-4680-A556-3C2B05E6F654} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {32F71278-ED6E-4510-B5B4-713B867E2279} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {B6F156B1-AAA3-40A1-B5B0-474C046359F9} diff --git a/sdk/src/Services/Scheduler/Generated/AmazonSchedulerConfig.cs b/sdk/src/Services/Scheduler/Generated/AmazonSchedulerConfig.cs index 387e92101602..1ffd6f528e3c 100644 --- a/sdk/src/Services/Scheduler/Generated/AmazonSchedulerConfig.cs +++ b/sdk/src/Services/Scheduler/Generated/AmazonSchedulerConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.Scheduler public partial class AmazonSchedulerConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("Scheduler", "4.0.0.0"); private static readonly AmazonSchedulerEndpointResolver EndpointResolver = new AmazonSchedulerEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("Scheduler", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("Scheduler", "3.7.400.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/Scheduler/Properties/AssemblyInfo.cs b/sdk/src/Services/Scheduler/Properties/AssemblyInfo.cs index 6626aef0de5e..4424c563c49f 100644 --- a/sdk/src/Services/Scheduler/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/Scheduler/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/Scheduler/Scheduler.sln b/sdk/src/Services/Scheduler/Scheduler.sln index fbf276b6cc94..208d03738d33 100644 --- a/sdk/src/Services/Scheduler/Scheduler.sln +++ b/sdk/src/Services/Scheduler/Scheduler.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {055926B3-95BB-4F2C-9A79-4130BB75B304}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {055926B3-95BB-4F2C-9A79-4130BB75B304}.Debug|Any CPU.Build.0 = Debug|Any CPU {055926B3-95BB-4F2C-9A79-4130BB75B304}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {45CDF1F3-2DD5-479F-B924-A7943F5C75BF}.Debug|Any CPU.Build.0 = Debug|Any CPU {45CDF1F3-2DD5-479F-B924-A7943F5C75BF}.Release|Any CPU.ActiveCfg = Release|Any CPU {45CDF1F3-2DD5-479F-B924-A7943F5C75BF}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {44181BA6-521F-473E-AF23-1EEBD9FCF3E4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {44181BA6-521F-473E-AF23-1EEBD9FCF3E4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {44181BA6-521F-473E-AF23-1EEBD9FCF3E4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {44181BA6-521F-473E-AF23-1EEBD9FCF3E4}.Release|Any CPU.Build.0 = Release|Any CPU - {53E1C081-8A7A-4F53-9947-3DBC37D2606B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {53E1C081-8A7A-4F53-9947-3DBC37D2606B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {53E1C081-8A7A-4F53-9947-3DBC37D2606B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {53E1C081-8A7A-4F53-9947-3DBC37D2606B}.Release|Any CPU.Build.0 = Release|Any CPU - {73E38A31-3733-4ED3-A1B3-7A6882B42D24}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {73E38A31-3733-4ED3-A1B3-7A6882B42D24}.Debug|Any CPU.Build.0 = Debug|Any CPU - {73E38A31-3733-4ED3-A1B3-7A6882B42D24}.Release|Any CPU.ActiveCfg = Release|Any CPU - {73E38A31-3733-4ED3-A1B3-7A6882B42D24}.Release|Any CPU.Build.0 = Release|Any CPU - {6FB8217B-3FF0-46EB-A905-B4AB709584E9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6FB8217B-3FF0-46EB-A905-B4AB709584E9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6FB8217B-3FF0-46EB-A905-B4AB709584E9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6FB8217B-3FF0-46EB-A905-B4AB709584E9}.Release|Any CPU.Build.0 = Release|Any CPU - {51233B1F-34C7-422D-B60D-04E15C390AD8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {51233B1F-34C7-422D-B60D-04E15C390AD8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {51233B1F-34C7-422D-B60D-04E15C390AD8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {51233B1F-34C7-422D-B60D-04E15C390AD8}.Release|Any CPU.Build.0 = Release|Any CPU - {536B5537-937D-4615-8856-102750EB0A89}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {536B5537-937D-4615-8856-102750EB0A89}.Debug|Any CPU.Build.0 = Debug|Any CPU - {536B5537-937D-4615-8856-102750EB0A89}.Release|Any CPU.ActiveCfg = Release|Any CPU - {536B5537-937D-4615-8856-102750EB0A89}.Release|Any CPU.Build.0 = Release|Any CPU - {F3458B84-6C09-421D-8FF3-FBC2D30AF131}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F3458B84-6C09-421D-8FF3-FBC2D30AF131}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F3458B84-6C09-421D-8FF3-FBC2D30AF131}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F3458B84-6C09-421D-8FF3-FBC2D30AF131}.Release|Any CPU.Build.0 = Release|Any CPU - {60C3FE27-D5EA-48A9-88AC-376F77E80C14}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {60C3FE27-D5EA-48A9-88AC-376F77E80C14}.Debug|Any CPU.Build.0 = Debug|Any CPU - {60C3FE27-D5EA-48A9-88AC-376F77E80C14}.Release|Any CPU.ActiveCfg = Release|Any CPU - {60C3FE27-D5EA-48A9-88AC-376F77E80C14}.Release|Any CPU.Build.0 = Release|Any CPU - {50A784FA-952C-42FD-B684-283D8E115A6D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {50A784FA-952C-42FD-B684-283D8E115A6D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {50A784FA-952C-42FD-B684-283D8E115A6D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {50A784FA-952C-42FD-B684-283D8E115A6D}.Release|Any CPU.Build.0 = Release|Any CPU - {07D48E7D-8A39-4E0F-8DD9-530551A1861E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {07D48E7D-8A39-4E0F-8DD9-530551A1861E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {07D48E7D-8A39-4E0F-8DD9-530551A1861E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {07D48E7D-8A39-4E0F-8DD9-530551A1861E}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {44181BA6-521F-473E-AF23-1EEBD9FCF3E4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {44181BA6-521F-473E-AF23-1EEBD9FCF3E4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {44181BA6-521F-473E-AF23-1EEBD9FCF3E4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {44181BA6-521F-473E-AF23-1EEBD9FCF3E4}.Release|Any CPU.Build.0 = Release|Any CPU - {53E1C081-8A7A-4F53-9947-3DBC37D2606B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {53E1C081-8A7A-4F53-9947-3DBC37D2606B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {53E1C081-8A7A-4F53-9947-3DBC37D2606B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {53E1C081-8A7A-4F53-9947-3DBC37D2606B}.Release|Any CPU.Build.0 = Release|Any CPU - {73E38A31-3733-4ED3-A1B3-7A6882B42D24}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {73E38A31-3733-4ED3-A1B3-7A6882B42D24}.Debug|Any CPU.Build.0 = Debug|Any CPU - {73E38A31-3733-4ED3-A1B3-7A6882B42D24}.Release|Any CPU.ActiveCfg = Release|Any CPU - {73E38A31-3733-4ED3-A1B3-7A6882B42D24}.Release|Any CPU.Build.0 = Release|Any CPU - {6FB8217B-3FF0-46EB-A905-B4AB709584E9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6FB8217B-3FF0-46EB-A905-B4AB709584E9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6FB8217B-3FF0-46EB-A905-B4AB709584E9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6FB8217B-3FF0-46EB-A905-B4AB709584E9}.Release|Any CPU.Build.0 = Release|Any CPU - {51233B1F-34C7-422D-B60D-04E15C390AD8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {51233B1F-34C7-422D-B60D-04E15C390AD8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {51233B1F-34C7-422D-B60D-04E15C390AD8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {51233B1F-34C7-422D-B60D-04E15C390AD8}.Release|Any CPU.Build.0 = Release|Any CPU - {536B5537-937D-4615-8856-102750EB0A89}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {536B5537-937D-4615-8856-102750EB0A89}.Debug|Any CPU.Build.0 = Debug|Any CPU - {536B5537-937D-4615-8856-102750EB0A89}.Release|Any CPU.ActiveCfg = Release|Any CPU - {536B5537-937D-4615-8856-102750EB0A89}.Release|Any CPU.Build.0 = Release|Any CPU - {F3458B84-6C09-421D-8FF3-FBC2D30AF131}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F3458B84-6C09-421D-8FF3-FBC2D30AF131}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F3458B84-6C09-421D-8FF3-FBC2D30AF131}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F3458B84-6C09-421D-8FF3-FBC2D30AF131}.Release|Any CPU.Build.0 = Release|Any CPU - {60C3FE27-D5EA-48A9-88AC-376F77E80C14}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {60C3FE27-D5EA-48A9-88AC-376F77E80C14}.Debug|Any CPU.Build.0 = Debug|Any CPU - {60C3FE27-D5EA-48A9-88AC-376F77E80C14}.Release|Any CPU.ActiveCfg = Release|Any CPU - {60C3FE27-D5EA-48A9-88AC-376F77E80C14}.Release|Any CPU.Build.0 = Release|Any CPU - {50A784FA-952C-42FD-B684-283D8E115A6D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {50A784FA-952C-42FD-B684-283D8E115A6D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {50A784FA-952C-42FD-B684-283D8E115A6D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {50A784FA-952C-42FD-B684-283D8E115A6D}.Release|Any CPU.Build.0 = Release|Any CPU - {07D48E7D-8A39-4E0F-8DD9-530551A1861E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {07D48E7D-8A39-4E0F-8DD9-530551A1861E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {07D48E7D-8A39-4E0F-8DD9-530551A1861E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {07D48E7D-8A39-4E0F-8DD9-530551A1861E}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {055926B3-95BB-4F2C-9A79-4130BB75B304} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {619CF9BA-79E6-4620-9E80-21F5AE66B2B1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {8455616F-EC38-4B8A-A01A-DDD456EF0E1A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {1E8D2AD2-FC3D-4847-BA79-547A0DC220D8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {45CDF1F3-2DD5-479F-B924-A7943F5C75BF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {44181BA6-521F-473E-AF23-1EEBD9FCF3E4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {53E1C081-8A7A-4F53-9947-3DBC37D2606B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {73E38A31-3733-4ED3-A1B3-7A6882B42D24} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6FB8217B-3FF0-46EB-A905-B4AB709584E9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {51233B1F-34C7-422D-B60D-04E15C390AD8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {536B5537-937D-4615-8856-102750EB0A89} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F3458B84-6C09-421D-8FF3-FBC2D30AF131} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {60C3FE27-D5EA-48A9-88AC-376F77E80C14} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {50A784FA-952C-42FD-B684-283D8E115A6D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {07D48E7D-8A39-4E0F-8DD9-530551A1861E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {44181BA6-521F-473E-AF23-1EEBD9FCF3E4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {53E1C081-8A7A-4F53-9947-3DBC37D2606B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {73E38A31-3733-4ED3-A1B3-7A6882B42D24} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6FB8217B-3FF0-46EB-A905-B4AB709584E9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {51233B1F-34C7-422D-B60D-04E15C390AD8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {536B5537-937D-4615-8856-102750EB0A89} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F3458B84-6C09-421D-8FF3-FBC2D30AF131} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {60C3FE27-D5EA-48A9-88AC-376F77E80C14} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {50A784FA-952C-42FD-B684-283D8E115A6D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {07D48E7D-8A39-4E0F-8DD9-530551A1861E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {EF79EC54-1C01-40F2-B7F5-01D5D9425180} diff --git a/sdk/src/Services/Schemas/Generated/AmazonSchemasConfig.cs b/sdk/src/Services/Schemas/Generated/AmazonSchemasConfig.cs index a46c332a85b3..65dc68ceb45e 100644 --- a/sdk/src/Services/Schemas/Generated/AmazonSchemasConfig.cs +++ b/sdk/src/Services/Schemas/Generated/AmazonSchemasConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.Schemas public partial class AmazonSchemasConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("schemas", "4.0.0.0"); private static readonly AmazonSchemasEndpointResolver EndpointResolver = new AmazonSchemasEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("schemas", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("schemas", "3.7.400.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/Schemas/Properties/AssemblyInfo.cs b/sdk/src/Services/Schemas/Properties/AssemblyInfo.cs index 06614c6a1e96..845431d97b65 100644 --- a/sdk/src/Services/Schemas/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/Schemas/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/Schemas/Schemas.sln b/sdk/src/Services/Schemas/Schemas.sln index 075e1d20e170..7d088f7d616a 100644 --- a/sdk/src/Services/Schemas/Schemas.sln +++ b/sdk/src/Services/Schemas/Schemas.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {ABBD9BDE-2A8E-4C1D-8EC6-31641A870982}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {ABBD9BDE-2A8E-4C1D-8EC6-31641A870982}.Debug|Any CPU.Build.0 = Debug|Any CPU {ABBD9BDE-2A8E-4C1D-8EC6-31641A870982}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {C1A3ACF4-F774-4E0F-92F1-23F191B2B578}.Debug|Any CPU.Build.0 = Debug|Any CPU {C1A3ACF4-F774-4E0F-92F1-23F191B2B578}.Release|Any CPU.ActiveCfg = Release|Any CPU {C1A3ACF4-F774-4E0F-92F1-23F191B2B578}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {0B05E207-BE2D-465E-A92E-871114609ECC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0B05E207-BE2D-465E-A92E-871114609ECC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0B05E207-BE2D-465E-A92E-871114609ECC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0B05E207-BE2D-465E-A92E-871114609ECC}.Release|Any CPU.Build.0 = Release|Any CPU - {30BE10CB-048D-40AD-90F0-AB43929A990B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {30BE10CB-048D-40AD-90F0-AB43929A990B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {30BE10CB-048D-40AD-90F0-AB43929A990B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {30BE10CB-048D-40AD-90F0-AB43929A990B}.Release|Any CPU.Build.0 = Release|Any CPU - {F56E6F48-A87B-40FA-A8D5-4117AD98778F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F56E6F48-A87B-40FA-A8D5-4117AD98778F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F56E6F48-A87B-40FA-A8D5-4117AD98778F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F56E6F48-A87B-40FA-A8D5-4117AD98778F}.Release|Any CPU.Build.0 = Release|Any CPU - {0C93BFC9-7CE3-42EB-8E7F-5C28039F0933}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0C93BFC9-7CE3-42EB-8E7F-5C28039F0933}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0C93BFC9-7CE3-42EB-8E7F-5C28039F0933}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0C93BFC9-7CE3-42EB-8E7F-5C28039F0933}.Release|Any CPU.Build.0 = Release|Any CPU - {20F5F37D-EB09-43F8-8047-6A303355FAFC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {20F5F37D-EB09-43F8-8047-6A303355FAFC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {20F5F37D-EB09-43F8-8047-6A303355FAFC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {20F5F37D-EB09-43F8-8047-6A303355FAFC}.Release|Any CPU.Build.0 = Release|Any CPU - {55972D21-B8E6-44F3-8B83-9530E400782D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {55972D21-B8E6-44F3-8B83-9530E400782D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {55972D21-B8E6-44F3-8B83-9530E400782D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {55972D21-B8E6-44F3-8B83-9530E400782D}.Release|Any CPU.Build.0 = Release|Any CPU - {DB83D3A8-5DC1-4123-855E-F4A4C776577B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DB83D3A8-5DC1-4123-855E-F4A4C776577B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DB83D3A8-5DC1-4123-855E-F4A4C776577B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DB83D3A8-5DC1-4123-855E-F4A4C776577B}.Release|Any CPU.Build.0 = Release|Any CPU - {A7D7921B-5EB4-4D8A-A2F2-A37EF1FD0597}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A7D7921B-5EB4-4D8A-A2F2-A37EF1FD0597}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A7D7921B-5EB4-4D8A-A2F2-A37EF1FD0597}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A7D7921B-5EB4-4D8A-A2F2-A37EF1FD0597}.Release|Any CPU.Build.0 = Release|Any CPU - {02D2BC57-3BAA-4F79-9467-B3F735931785}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {02D2BC57-3BAA-4F79-9467-B3F735931785}.Debug|Any CPU.Build.0 = Debug|Any CPU - {02D2BC57-3BAA-4F79-9467-B3F735931785}.Release|Any CPU.ActiveCfg = Release|Any CPU - {02D2BC57-3BAA-4F79-9467-B3F735931785}.Release|Any CPU.Build.0 = Release|Any CPU - {5770F963-D80C-42BD-BDC6-0CAC60752A00}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5770F963-D80C-42BD-BDC6-0CAC60752A00}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5770F963-D80C-42BD-BDC6-0CAC60752A00}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5770F963-D80C-42BD-BDC6-0CAC60752A00}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {0B05E207-BE2D-465E-A92E-871114609ECC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0B05E207-BE2D-465E-A92E-871114609ECC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0B05E207-BE2D-465E-A92E-871114609ECC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0B05E207-BE2D-465E-A92E-871114609ECC}.Release|Any CPU.Build.0 = Release|Any CPU - {30BE10CB-048D-40AD-90F0-AB43929A990B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {30BE10CB-048D-40AD-90F0-AB43929A990B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {30BE10CB-048D-40AD-90F0-AB43929A990B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {30BE10CB-048D-40AD-90F0-AB43929A990B}.Release|Any CPU.Build.0 = Release|Any CPU - {F56E6F48-A87B-40FA-A8D5-4117AD98778F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F56E6F48-A87B-40FA-A8D5-4117AD98778F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F56E6F48-A87B-40FA-A8D5-4117AD98778F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F56E6F48-A87B-40FA-A8D5-4117AD98778F}.Release|Any CPU.Build.0 = Release|Any CPU - {0C93BFC9-7CE3-42EB-8E7F-5C28039F0933}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0C93BFC9-7CE3-42EB-8E7F-5C28039F0933}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0C93BFC9-7CE3-42EB-8E7F-5C28039F0933}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0C93BFC9-7CE3-42EB-8E7F-5C28039F0933}.Release|Any CPU.Build.0 = Release|Any CPU - {20F5F37D-EB09-43F8-8047-6A303355FAFC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {20F5F37D-EB09-43F8-8047-6A303355FAFC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {20F5F37D-EB09-43F8-8047-6A303355FAFC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {20F5F37D-EB09-43F8-8047-6A303355FAFC}.Release|Any CPU.Build.0 = Release|Any CPU - {55972D21-B8E6-44F3-8B83-9530E400782D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {55972D21-B8E6-44F3-8B83-9530E400782D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {55972D21-B8E6-44F3-8B83-9530E400782D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {55972D21-B8E6-44F3-8B83-9530E400782D}.Release|Any CPU.Build.0 = Release|Any CPU - {DB83D3A8-5DC1-4123-855E-F4A4C776577B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DB83D3A8-5DC1-4123-855E-F4A4C776577B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DB83D3A8-5DC1-4123-855E-F4A4C776577B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DB83D3A8-5DC1-4123-855E-F4A4C776577B}.Release|Any CPU.Build.0 = Release|Any CPU - {A7D7921B-5EB4-4D8A-A2F2-A37EF1FD0597}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A7D7921B-5EB4-4D8A-A2F2-A37EF1FD0597}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A7D7921B-5EB4-4D8A-A2F2-A37EF1FD0597}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A7D7921B-5EB4-4D8A-A2F2-A37EF1FD0597}.Release|Any CPU.Build.0 = Release|Any CPU - {02D2BC57-3BAA-4F79-9467-B3F735931785}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {02D2BC57-3BAA-4F79-9467-B3F735931785}.Debug|Any CPU.Build.0 = Debug|Any CPU - {02D2BC57-3BAA-4F79-9467-B3F735931785}.Release|Any CPU.ActiveCfg = Release|Any CPU - {02D2BC57-3BAA-4F79-9467-B3F735931785}.Release|Any CPU.Build.0 = Release|Any CPU - {5770F963-D80C-42BD-BDC6-0CAC60752A00}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5770F963-D80C-42BD-BDC6-0CAC60752A00}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5770F963-D80C-42BD-BDC6-0CAC60752A00}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5770F963-D80C-42BD-BDC6-0CAC60752A00}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {ABBD9BDE-2A8E-4C1D-8EC6-31641A870982} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {786229B7-6076-43DF-97ED-C81C907F3FCB} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {51954360-1495-4B8D-AA0F-08F07F3F9559} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {95C33A40-0DEA-4040-AED2-BF329867EC9A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {C1A3ACF4-F774-4E0F-92F1-23F191B2B578} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {0B05E207-BE2D-465E-A92E-871114609ECC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {30BE10CB-048D-40AD-90F0-AB43929A990B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F56E6F48-A87B-40FA-A8D5-4117AD98778F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0C93BFC9-7CE3-42EB-8E7F-5C28039F0933} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {20F5F37D-EB09-43F8-8047-6A303355FAFC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {55972D21-B8E6-44F3-8B83-9530E400782D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {DB83D3A8-5DC1-4123-855E-F4A4C776577B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A7D7921B-5EB4-4D8A-A2F2-A37EF1FD0597} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {02D2BC57-3BAA-4F79-9467-B3F735931785} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {5770F963-D80C-42BD-BDC6-0CAC60752A00} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {0B05E207-BE2D-465E-A92E-871114609ECC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {30BE10CB-048D-40AD-90F0-AB43929A990B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F56E6F48-A87B-40FA-A8D5-4117AD98778F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0C93BFC9-7CE3-42EB-8E7F-5C28039F0933} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {20F5F37D-EB09-43F8-8047-6A303355FAFC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {55972D21-B8E6-44F3-8B83-9530E400782D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {DB83D3A8-5DC1-4123-855E-F4A4C776577B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A7D7921B-5EB4-4D8A-A2F2-A37EF1FD0597} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {02D2BC57-3BAA-4F79-9467-B3F735931785} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {5770F963-D80C-42BD-BDC6-0CAC60752A00} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {7D374FC2-06C1-4910-85F3-06FFBD09FF6A} diff --git a/sdk/src/Services/SecretsManager/Generated/AmazonSecretsManagerConfig.cs b/sdk/src/Services/SecretsManager/Generated/AmazonSecretsManagerConfig.cs index 506ec72a8d3a..a04f028f5e8f 100644 --- a/sdk/src/Services/SecretsManager/Generated/AmazonSecretsManagerConfig.cs +++ b/sdk/src/Services/SecretsManager/Generated/AmazonSecretsManagerConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.SecretsManager public partial class AmazonSecretsManagerConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("Secrets Manager", "4.0.0.0"); private static readonly AmazonSecretsManagerEndpointResolver EndpointResolver = new AmazonSecretsManagerEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("Secrets Manager", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("Secrets Manager", "3.7.400.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/SecretsManager/Properties/AssemblyInfo.cs b/sdk/src/Services/SecretsManager/Properties/AssemblyInfo.cs index 9c4d66480047..ed354673bfc5 100644 --- a/sdk/src/Services/SecretsManager/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/SecretsManager/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/SecretsManager/SecretsManager.sln b/sdk/src/Services/SecretsManager/SecretsManager.sln index af1390f15ec4..59448fb3cc1a 100644 --- a/sdk/src/Services/SecretsManager/SecretsManager.sln +++ b/sdk/src/Services/SecretsManager/SecretsManager.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {52182DD2-2AD2-42F8-AE61-DB1CBFCE1AE4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {52182DD2-2AD2-42F8-AE61-DB1CBFCE1AE4}.Debug|Any CPU.Build.0 = Debug|Any CPU {52182DD2-2AD2-42F8-AE61-DB1CBFCE1AE4}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {F321B92F-4C74-4796-BBF1-4AF71AA54F94}.Debug|Any CPU.Build.0 = Debug|Any CPU {F321B92F-4C74-4796-BBF1-4AF71AA54F94}.Release|Any CPU.ActiveCfg = Release|Any CPU {F321B92F-4C74-4796-BBF1-4AF71AA54F94}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {765B4D3A-2E98-46C7-8B52-0A49FF7DA901}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {765B4D3A-2E98-46C7-8B52-0A49FF7DA901}.Debug|Any CPU.Build.0 = Debug|Any CPU - {765B4D3A-2E98-46C7-8B52-0A49FF7DA901}.Release|Any CPU.ActiveCfg = Release|Any CPU - {765B4D3A-2E98-46C7-8B52-0A49FF7DA901}.Release|Any CPU.Build.0 = Release|Any CPU - {DC05266B-3226-4005-8D46-2B7FCD7319FA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DC05266B-3226-4005-8D46-2B7FCD7319FA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DC05266B-3226-4005-8D46-2B7FCD7319FA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DC05266B-3226-4005-8D46-2B7FCD7319FA}.Release|Any CPU.Build.0 = Release|Any CPU - {2A1743F0-9BE3-446E-A56D-C3763605D8A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2A1743F0-9BE3-446E-A56D-C3763605D8A2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2A1743F0-9BE3-446E-A56D-C3763605D8A2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2A1743F0-9BE3-446E-A56D-C3763605D8A2}.Release|Any CPU.Build.0 = Release|Any CPU - {911D1B4C-7A79-4D8A-8F29-9DE1B7E584C7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {911D1B4C-7A79-4D8A-8F29-9DE1B7E584C7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {911D1B4C-7A79-4D8A-8F29-9DE1B7E584C7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {911D1B4C-7A79-4D8A-8F29-9DE1B7E584C7}.Release|Any CPU.Build.0 = Release|Any CPU - {27174079-D6D3-48D2-8BA0-727387F1D8AA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {27174079-D6D3-48D2-8BA0-727387F1D8AA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {27174079-D6D3-48D2-8BA0-727387F1D8AA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {27174079-D6D3-48D2-8BA0-727387F1D8AA}.Release|Any CPU.Build.0 = Release|Any CPU - {9050E83B-2D31-4D4E-BE14-C0718084D540}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9050E83B-2D31-4D4E-BE14-C0718084D540}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9050E83B-2D31-4D4E-BE14-C0718084D540}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9050E83B-2D31-4D4E-BE14-C0718084D540}.Release|Any CPU.Build.0 = Release|Any CPU - {97C834F8-7281-43D5-9FC1-FECDFED172B1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {97C834F8-7281-43D5-9FC1-FECDFED172B1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {97C834F8-7281-43D5-9FC1-FECDFED172B1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {97C834F8-7281-43D5-9FC1-FECDFED172B1}.Release|Any CPU.Build.0 = Release|Any CPU - {77A22C9C-E067-4BAB-82A6-CD81347A393F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {77A22C9C-E067-4BAB-82A6-CD81347A393F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {77A22C9C-E067-4BAB-82A6-CD81347A393F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {77A22C9C-E067-4BAB-82A6-CD81347A393F}.Release|Any CPU.Build.0 = Release|Any CPU - {7188D82C-CD10-4A90-9112-8604983F7097}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7188D82C-CD10-4A90-9112-8604983F7097}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7188D82C-CD10-4A90-9112-8604983F7097}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7188D82C-CD10-4A90-9112-8604983F7097}.Release|Any CPU.Build.0 = Release|Any CPU - {CB7DC148-C0ED-4974-9E3A-3390D210E735}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CB7DC148-C0ED-4974-9E3A-3390D210E735}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CB7DC148-C0ED-4974-9E3A-3390D210E735}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CB7DC148-C0ED-4974-9E3A-3390D210E735}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {765B4D3A-2E98-46C7-8B52-0A49FF7DA901}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {765B4D3A-2E98-46C7-8B52-0A49FF7DA901}.Debug|Any CPU.Build.0 = Debug|Any CPU - {765B4D3A-2E98-46C7-8B52-0A49FF7DA901}.Release|Any CPU.ActiveCfg = Release|Any CPU - {765B4D3A-2E98-46C7-8B52-0A49FF7DA901}.Release|Any CPU.Build.0 = Release|Any CPU - {DC05266B-3226-4005-8D46-2B7FCD7319FA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DC05266B-3226-4005-8D46-2B7FCD7319FA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DC05266B-3226-4005-8D46-2B7FCD7319FA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DC05266B-3226-4005-8D46-2B7FCD7319FA}.Release|Any CPU.Build.0 = Release|Any CPU - {2A1743F0-9BE3-446E-A56D-C3763605D8A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2A1743F0-9BE3-446E-A56D-C3763605D8A2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2A1743F0-9BE3-446E-A56D-C3763605D8A2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2A1743F0-9BE3-446E-A56D-C3763605D8A2}.Release|Any CPU.Build.0 = Release|Any CPU - {911D1B4C-7A79-4D8A-8F29-9DE1B7E584C7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {911D1B4C-7A79-4D8A-8F29-9DE1B7E584C7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {911D1B4C-7A79-4D8A-8F29-9DE1B7E584C7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {911D1B4C-7A79-4D8A-8F29-9DE1B7E584C7}.Release|Any CPU.Build.0 = Release|Any CPU - {27174079-D6D3-48D2-8BA0-727387F1D8AA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {27174079-D6D3-48D2-8BA0-727387F1D8AA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {27174079-D6D3-48D2-8BA0-727387F1D8AA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {27174079-D6D3-48D2-8BA0-727387F1D8AA}.Release|Any CPU.Build.0 = Release|Any CPU - {9050E83B-2D31-4D4E-BE14-C0718084D540}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9050E83B-2D31-4D4E-BE14-C0718084D540}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9050E83B-2D31-4D4E-BE14-C0718084D540}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9050E83B-2D31-4D4E-BE14-C0718084D540}.Release|Any CPU.Build.0 = Release|Any CPU - {97C834F8-7281-43D5-9FC1-FECDFED172B1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {97C834F8-7281-43D5-9FC1-FECDFED172B1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {97C834F8-7281-43D5-9FC1-FECDFED172B1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {97C834F8-7281-43D5-9FC1-FECDFED172B1}.Release|Any CPU.Build.0 = Release|Any CPU - {77A22C9C-E067-4BAB-82A6-CD81347A393F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {77A22C9C-E067-4BAB-82A6-CD81347A393F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {77A22C9C-E067-4BAB-82A6-CD81347A393F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {77A22C9C-E067-4BAB-82A6-CD81347A393F}.Release|Any CPU.Build.0 = Release|Any CPU - {7188D82C-CD10-4A90-9112-8604983F7097}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7188D82C-CD10-4A90-9112-8604983F7097}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7188D82C-CD10-4A90-9112-8604983F7097}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7188D82C-CD10-4A90-9112-8604983F7097}.Release|Any CPU.Build.0 = Release|Any CPU - {CB7DC148-C0ED-4974-9E3A-3390D210E735}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CB7DC148-C0ED-4974-9E3A-3390D210E735}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CB7DC148-C0ED-4974-9E3A-3390D210E735}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CB7DC148-C0ED-4974-9E3A-3390D210E735}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {52182DD2-2AD2-42F8-AE61-DB1CBFCE1AE4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {CFBFF126-AF38-4D86-90A0-6CBBF9A6C9EF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {E98E0B40-2AAB-4F01-A883-1394B3B1BBB3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {E1447154-BB46-4FCD-8D19-EB19AC24A4FC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {F321B92F-4C74-4796-BBF1-4AF71AA54F94} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {765B4D3A-2E98-46C7-8B52-0A49FF7DA901} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {DC05266B-3226-4005-8D46-2B7FCD7319FA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {2A1743F0-9BE3-446E-A56D-C3763605D8A2} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {911D1B4C-7A79-4D8A-8F29-9DE1B7E584C7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {27174079-D6D3-48D2-8BA0-727387F1D8AA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {9050E83B-2D31-4D4E-BE14-C0718084D540} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {97C834F8-7281-43D5-9FC1-FECDFED172B1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {77A22C9C-E067-4BAB-82A6-CD81347A393F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {7188D82C-CD10-4A90-9112-8604983F7097} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {CB7DC148-C0ED-4974-9E3A-3390D210E735} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {765B4D3A-2E98-46C7-8B52-0A49FF7DA901} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {DC05266B-3226-4005-8D46-2B7FCD7319FA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {2A1743F0-9BE3-446E-A56D-C3763605D8A2} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {911D1B4C-7A79-4D8A-8F29-9DE1B7E584C7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {27174079-D6D3-48D2-8BA0-727387F1D8AA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {9050E83B-2D31-4D4E-BE14-C0718084D540} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {97C834F8-7281-43D5-9FC1-FECDFED172B1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {77A22C9C-E067-4BAB-82A6-CD81347A393F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {7188D82C-CD10-4A90-9112-8604983F7097} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {CB7DC148-C0ED-4974-9E3A-3390D210E735} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {CAED402D-5303-43FC-A473-6ED0ACDB43F1} diff --git a/sdk/src/Services/SecurityHub/Generated/AmazonSecurityHubConfig.cs b/sdk/src/Services/SecurityHub/Generated/AmazonSecurityHubConfig.cs index 7705d4dbb280..b1e2fed1addc 100644 --- a/sdk/src/Services/SecurityHub/Generated/AmazonSecurityHubConfig.cs +++ b/sdk/src/Services/SecurityHub/Generated/AmazonSecurityHubConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.SecurityHub public partial class AmazonSecurityHubConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("SecurityHub", "4.0.0.0"); private static readonly AmazonSecurityHubEndpointResolver EndpointResolver = new AmazonSecurityHubEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("SecurityHub", "3.7.401.16"); -======= - InternalSDKUtils.BuildUserAgentString("SecurityHub", "3.7.401.43"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/SecurityHub/Properties/AssemblyInfo.cs b/sdk/src/Services/SecurityHub/Properties/AssemblyInfo.cs index 603676312c49..2ea3449c8b24 100644 --- a/sdk/src/Services/SecurityHub/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/SecurityHub/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.16")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.43")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/SecurityHub/SecurityHub.sln b/sdk/src/Services/SecurityHub/SecurityHub.sln index af87173306a2..59e713d609b9 100644 --- a/sdk/src/Services/SecurityHub/SecurityHub.sln +++ b/sdk/src/Services/SecurityHub/SecurityHub.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {67164FCE-CB47-42C7-AAB5-26F37A7D955E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {67164FCE-CB47-42C7-AAB5-26F37A7D955E}.Debug|Any CPU.Build.0 = Debug|Any CPU {67164FCE-CB47-42C7-AAB5-26F37A7D955E}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {12047CC1-A9B4-4CDC-B29E-C8F7DDA4B3E8}.Debug|Any CPU.Build.0 = Debug|Any CPU {12047CC1-A9B4-4CDC-B29E-C8F7DDA4B3E8}.Release|Any CPU.ActiveCfg = Release|Any CPU {12047CC1-A9B4-4CDC-B29E-C8F7DDA4B3E8}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {F30BAACD-5F0A-4942-AA39-48CEE1380FE8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F30BAACD-5F0A-4942-AA39-48CEE1380FE8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F30BAACD-5F0A-4942-AA39-48CEE1380FE8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F30BAACD-5F0A-4942-AA39-48CEE1380FE8}.Release|Any CPU.Build.0 = Release|Any CPU - {1331E16F-2F96-40DA-A1AD-E943985C1B34}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1331E16F-2F96-40DA-A1AD-E943985C1B34}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1331E16F-2F96-40DA-A1AD-E943985C1B34}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1331E16F-2F96-40DA-A1AD-E943985C1B34}.Release|Any CPU.Build.0 = Release|Any CPU - {2DF69552-333E-4F28-B289-96D1AA6E6D58}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2DF69552-333E-4F28-B289-96D1AA6E6D58}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2DF69552-333E-4F28-B289-96D1AA6E6D58}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2DF69552-333E-4F28-B289-96D1AA6E6D58}.Release|Any CPU.Build.0 = Release|Any CPU - {0876E11C-E875-4310-A5AB-7B2153E421E0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0876E11C-E875-4310-A5AB-7B2153E421E0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0876E11C-E875-4310-A5AB-7B2153E421E0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0876E11C-E875-4310-A5AB-7B2153E421E0}.Release|Any CPU.Build.0 = Release|Any CPU - {15BCCA07-9466-47CD-AF8D-1ED261A87C7F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {15BCCA07-9466-47CD-AF8D-1ED261A87C7F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {15BCCA07-9466-47CD-AF8D-1ED261A87C7F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {15BCCA07-9466-47CD-AF8D-1ED261A87C7F}.Release|Any CPU.Build.0 = Release|Any CPU - {032287C9-BACB-4DB9-AC64-D10BC0AF1DD3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {032287C9-BACB-4DB9-AC64-D10BC0AF1DD3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {032287C9-BACB-4DB9-AC64-D10BC0AF1DD3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {032287C9-BACB-4DB9-AC64-D10BC0AF1DD3}.Release|Any CPU.Build.0 = Release|Any CPU - {DB7B8D55-9A11-43C5-91DD-F776AE61ABE7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DB7B8D55-9A11-43C5-91DD-F776AE61ABE7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DB7B8D55-9A11-43C5-91DD-F776AE61ABE7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DB7B8D55-9A11-43C5-91DD-F776AE61ABE7}.Release|Any CPU.Build.0 = Release|Any CPU - {94D1E0DC-8DD6-4410-9C08-FC1A131F1725}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {94D1E0DC-8DD6-4410-9C08-FC1A131F1725}.Debug|Any CPU.Build.0 = Debug|Any CPU - {94D1E0DC-8DD6-4410-9C08-FC1A131F1725}.Release|Any CPU.ActiveCfg = Release|Any CPU - {94D1E0DC-8DD6-4410-9C08-FC1A131F1725}.Release|Any CPU.Build.0 = Release|Any CPU - {88B65992-DA04-4D16-9192-08E6F5541A82}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {88B65992-DA04-4D16-9192-08E6F5541A82}.Debug|Any CPU.Build.0 = Debug|Any CPU - {88B65992-DA04-4D16-9192-08E6F5541A82}.Release|Any CPU.ActiveCfg = Release|Any CPU - {88B65992-DA04-4D16-9192-08E6F5541A82}.Release|Any CPU.Build.0 = Release|Any CPU - {AA539678-45EB-49EF-B3F2-BFC55501FBD9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AA539678-45EB-49EF-B3F2-BFC55501FBD9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AA539678-45EB-49EF-B3F2-BFC55501FBD9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AA539678-45EB-49EF-B3F2-BFC55501FBD9}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {F30BAACD-5F0A-4942-AA39-48CEE1380FE8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F30BAACD-5F0A-4942-AA39-48CEE1380FE8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F30BAACD-5F0A-4942-AA39-48CEE1380FE8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F30BAACD-5F0A-4942-AA39-48CEE1380FE8}.Release|Any CPU.Build.0 = Release|Any CPU - {1331E16F-2F96-40DA-A1AD-E943985C1B34}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1331E16F-2F96-40DA-A1AD-E943985C1B34}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1331E16F-2F96-40DA-A1AD-E943985C1B34}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1331E16F-2F96-40DA-A1AD-E943985C1B34}.Release|Any CPU.Build.0 = Release|Any CPU - {2DF69552-333E-4F28-B289-96D1AA6E6D58}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2DF69552-333E-4F28-B289-96D1AA6E6D58}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2DF69552-333E-4F28-B289-96D1AA6E6D58}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2DF69552-333E-4F28-B289-96D1AA6E6D58}.Release|Any CPU.Build.0 = Release|Any CPU - {0876E11C-E875-4310-A5AB-7B2153E421E0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0876E11C-E875-4310-A5AB-7B2153E421E0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0876E11C-E875-4310-A5AB-7B2153E421E0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0876E11C-E875-4310-A5AB-7B2153E421E0}.Release|Any CPU.Build.0 = Release|Any CPU - {15BCCA07-9466-47CD-AF8D-1ED261A87C7F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {15BCCA07-9466-47CD-AF8D-1ED261A87C7F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {15BCCA07-9466-47CD-AF8D-1ED261A87C7F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {15BCCA07-9466-47CD-AF8D-1ED261A87C7F}.Release|Any CPU.Build.0 = Release|Any CPU - {032287C9-BACB-4DB9-AC64-D10BC0AF1DD3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {032287C9-BACB-4DB9-AC64-D10BC0AF1DD3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {032287C9-BACB-4DB9-AC64-D10BC0AF1DD3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {032287C9-BACB-4DB9-AC64-D10BC0AF1DD3}.Release|Any CPU.Build.0 = Release|Any CPU - {DB7B8D55-9A11-43C5-91DD-F776AE61ABE7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DB7B8D55-9A11-43C5-91DD-F776AE61ABE7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DB7B8D55-9A11-43C5-91DD-F776AE61ABE7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DB7B8D55-9A11-43C5-91DD-F776AE61ABE7}.Release|Any CPU.Build.0 = Release|Any CPU - {94D1E0DC-8DD6-4410-9C08-FC1A131F1725}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {94D1E0DC-8DD6-4410-9C08-FC1A131F1725}.Debug|Any CPU.Build.0 = Debug|Any CPU - {94D1E0DC-8DD6-4410-9C08-FC1A131F1725}.Release|Any CPU.ActiveCfg = Release|Any CPU - {94D1E0DC-8DD6-4410-9C08-FC1A131F1725}.Release|Any CPU.Build.0 = Release|Any CPU - {88B65992-DA04-4D16-9192-08E6F5541A82}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {88B65992-DA04-4D16-9192-08E6F5541A82}.Debug|Any CPU.Build.0 = Debug|Any CPU - {88B65992-DA04-4D16-9192-08E6F5541A82}.Release|Any CPU.ActiveCfg = Release|Any CPU - {88B65992-DA04-4D16-9192-08E6F5541A82}.Release|Any CPU.Build.0 = Release|Any CPU - {AA539678-45EB-49EF-B3F2-BFC55501FBD9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AA539678-45EB-49EF-B3F2-BFC55501FBD9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AA539678-45EB-49EF-B3F2-BFC55501FBD9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AA539678-45EB-49EF-B3F2-BFC55501FBD9}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {67164FCE-CB47-42C7-AAB5-26F37A7D955E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {05721E01-9276-4047-A262-D42264193723} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {AC0BC37B-8AE9-4BE8-8788-91B907DC8B38} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {3ABFDEE6-ADAB-49D5-82C5-74396FA2D429} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {12047CC1-A9B4-4CDC-B29E-C8F7DDA4B3E8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {F30BAACD-5F0A-4942-AA39-48CEE1380FE8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {1331E16F-2F96-40DA-A1AD-E943985C1B34} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {2DF69552-333E-4F28-B289-96D1AA6E6D58} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0876E11C-E875-4310-A5AB-7B2153E421E0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {15BCCA07-9466-47CD-AF8D-1ED261A87C7F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {032287C9-BACB-4DB9-AC64-D10BC0AF1DD3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {DB7B8D55-9A11-43C5-91DD-F776AE61ABE7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {94D1E0DC-8DD6-4410-9C08-FC1A131F1725} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {88B65992-DA04-4D16-9192-08E6F5541A82} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {AA539678-45EB-49EF-B3F2-BFC55501FBD9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {F30BAACD-5F0A-4942-AA39-48CEE1380FE8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {1331E16F-2F96-40DA-A1AD-E943985C1B34} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {2DF69552-333E-4F28-B289-96D1AA6E6D58} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0876E11C-E875-4310-A5AB-7B2153E421E0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {15BCCA07-9466-47CD-AF8D-1ED261A87C7F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {032287C9-BACB-4DB9-AC64-D10BC0AF1DD3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {DB7B8D55-9A11-43C5-91DD-F776AE61ABE7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {94D1E0DC-8DD6-4410-9C08-FC1A131F1725} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {88B65992-DA04-4D16-9192-08E6F5541A82} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {AA539678-45EB-49EF-B3F2-BFC55501FBD9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {D56D8B0F-640A-4E43-B6DD-772AEF5621BB} diff --git a/sdk/src/Services/SecurityLake/Generated/AmazonSecurityLakeConfig.cs b/sdk/src/Services/SecurityLake/Generated/AmazonSecurityLakeConfig.cs index ce4a7f31ee5e..cd3e3c029165 100644 --- a/sdk/src/Services/SecurityLake/Generated/AmazonSecurityLakeConfig.cs +++ b/sdk/src/Services/SecurityLake/Generated/AmazonSecurityLakeConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.SecurityLake public partial class AmazonSecurityLakeConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("SecurityLake", "4.0.0.0"); private static readonly AmazonSecurityLakeEndpointResolver EndpointResolver = new AmazonSecurityLakeEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("SecurityLake", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("SecurityLake", "3.7.401.19"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/SecurityLake/Generated/_bcl/AmazonSecurityLakeClient.cs b/sdk/src/Services/SecurityLake/Generated/_bcl/AmazonSecurityLakeClient.cs index f82725deca36..42424edd8e22 100644 --- a/sdk/src/Services/SecurityLake/Generated/_bcl/AmazonSecurityLakeClient.cs +++ b/sdk/src/Services/SecurityLake/Generated/_bcl/AmazonSecurityLakeClient.cs @@ -73,15 +73,15 @@ namespace Amazon.SecurityLake /// /// /// Security Lake automates the collection of security-related log and event data from - /// integrated Amazon Web Services and third-party services. It also helps you manage - /// the lifecycle of data with customizable retention and replication settings. Security - /// Lake converts ingested data into Apache Parquet format and a standard open-source + /// integrated Amazon Web Services services and third-party services. It also helps you + /// manage the lifecycle of data with customizable retention and replication settings. + /// Security Lake converts ingested data into Apache Parquet format and a standard open-source /// schema called the Open Cybersecurity Schema Framework (OCSF). /// /// /// - /// Other Amazon Web Services and third-party services can subscribe to the data that's - /// stored in Security Lake for incident response and security data analytics. + /// Other Amazon Web Services services and third-party services can subscribe to the data + /// that's stored in Security Lake for incident response and security data analytics. /// /// public partial class AmazonSecurityLakeClient : AmazonServiceClient, IAmazonSecurityLake @@ -311,17 +311,18 @@ protected override void Dispose(bool disposing) /// - /// Adds a natively supported Amazon Web Service as an Amazon Security Lake source. Enables - /// source types for member accounts in required Amazon Web Services Regions, based on - /// the parameters you specify. You can choose any source type in any Region for either - /// accounts that are part of a trusted organization or standalone accounts. Once you - /// add an Amazon Web Service as a source, Security Lake starts collecting logs and events - /// from it. + /// Adds a natively supported Amazon Web Services service as an Amazon Security Lake source. + /// Enables source types for member accounts in required Amazon Web Services Regions, + /// based on the parameters you specify. You can choose any source type in any Region + /// for either accounts that are part of a trusted organization or standalone accounts. + /// Once you add an Amazon Web Services service as a source, Security Lake starts collecting + /// logs and events from it. /// /// /// - /// You can use this API only to enable natively supported Amazon Web Services as a source. - /// Use CreateCustomLogSource to enable data collection from a custom source. + /// You can use this API only to enable natively supported Amazon Web Services services + /// as a source. Use CreateCustomLogSource to enable data collection from a custom + /// source. /// /// /// Container for the necessary parameters to execute the CreateAwsLogSource service method. @@ -366,17 +367,18 @@ public virtual CreateAwsLogSourceResponse CreateAwsLogSource(CreateAwsLogSourceR /// - /// Adds a natively supported Amazon Web Service as an Amazon Security Lake source. Enables - /// source types for member accounts in required Amazon Web Services Regions, based on - /// the parameters you specify. You can choose any source type in any Region for either - /// accounts that are part of a trusted organization or standalone accounts. Once you - /// add an Amazon Web Service as a source, Security Lake starts collecting logs and events - /// from it. + /// Adds a natively supported Amazon Web Services service as an Amazon Security Lake source. + /// Enables source types for member accounts in required Amazon Web Services Regions, + /// based on the parameters you specify. You can choose any source type in any Region + /// for either accounts that are part of a trusted organization or standalone accounts. + /// Once you add an Amazon Web Services service as a source, Security Lake starts collecting + /// logs and events from it. /// /// /// - /// You can use this API only to enable natively supported Amazon Web Services as a source. - /// Use CreateCustomLogSource to enable data collection from a custom source. + /// You can use this API only to enable natively supported Amazon Web Services services + /// as a source. Use CreateCustomLogSource to enable data collection from a custom + /// source. /// /// /// Container for the necessary parameters to execute the CreateAwsLogSource service method. @@ -547,11 +549,11 @@ public virtual CreateCustomLogSourceResponse CreateCustomLogSource(CreateCustomL /// /// /// When you enable Security Lake, it starts ingesting security data after the CreateAwsLogSource - /// call. This includes ingesting security data from sources, storing data, and making - /// data accessible to subscribers. Security Lake also enables all the existing settings - /// and resources that it stores or maintains for your Amazon Web Services account in - /// the current Region, including security log and event data. For more information, see - /// the Amazon + /// call and after you create subscribers using the CreateSubscriber API. This + /// includes ingesting security data from sources, storing data, and making data accessible + /// to subscribers. Security Lake also enables all the existing settings and resources + /// that it stores or maintains for your Amazon Web Services account in the current Region, + /// including security log and event data. For more information, see the Amazon /// Security Lake User Guide. /// /// @@ -609,11 +611,11 @@ public virtual CreateDataLakeResponse CreateDataLake(CreateDataLakeRequest reque /// /// /// When you enable Security Lake, it starts ingesting security data after the CreateAwsLogSource - /// call. This includes ingesting security data from sources, storing data, and making - /// data accessible to subscribers. Security Lake also enables all the existing settings - /// and resources that it stores or maintains for your Amazon Web Services account in - /// the current Region, including security log and event data. For more information, see - /// the Amazon + /// call and after you create subscribers using the CreateSubscriber API. This + /// includes ingesting security data from sources, storing data, and making data accessible + /// to subscribers. Security Lake also enables all the existing settings and resources + /// that it stores or maintains for your Amazon Web Services account in the current Region, + /// including security log and event data. For more information, see the Amazon /// Security Lake User Guide. /// /// @@ -667,7 +669,8 @@ public virtual CreateDataLakeResponse CreateDataLake(CreateDataLakeRequest reque /// /// Creates the specified notification subscription in Amazon Security Lake for the organization - /// you specify. + /// you specify. The notification subscription is created for exceptions that cannot be + /// resolved by Security Lake automatically. /// /// Container for the necessary parameters to execute the CreateDataLakeExceptionSubscription service method. /// @@ -712,7 +715,8 @@ public virtual CreateDataLakeExceptionSubscriptionResponse CreateDataLakeExcepti /// /// Creates the specified notification subscription in Amazon Security Lake for the organization - /// you specify. + /// you specify. The notification subscription is created for exceptions that cannot be + /// resolved by Security Lake automatically. /// /// Container for the necessary parameters to execute the CreateDataLakeExceptionSubscription service method. /// @@ -862,9 +866,9 @@ public virtual CreateDataLakeOrganizationConfigurationResponse CreateDataLakeOrg /// - /// Creates a subscription permission for accounts that are already enabled in Amazon - /// Security Lake. You can create a subscriber with access to data in the current Amazon - /// Web Services Region. + /// Creates a subscriber for accounts that are already enabled in Amazon Security Lake. + /// You can create a subscriber with access to data in the current Amazon Web Services + /// Region. /// /// Container for the necessary parameters to execute the CreateSubscriber service method. /// @@ -908,9 +912,9 @@ public virtual CreateSubscriberResponse CreateSubscriber(CreateSubscriberRequest /// - /// Creates a subscription permission for accounts that are already enabled in Amazon - /// Security Lake. You can create a subscriber with access to data in the current Amazon - /// Web Services Region. + /// Creates a subscriber for accounts that are already enabled in Amazon Security Lake. + /// You can create a subscriber with access to data in the current Amazon Web Services + /// Region. /// /// Container for the necessary parameters to execute the CreateSubscriber service method. /// @@ -1060,11 +1064,12 @@ public virtual CreateSubscriberNotificationResponse CreateSubscriberNotification /// - /// Removes a natively supported Amazon Web Service as an Amazon Security Lake source. - /// You can remove a source for one or more Regions. When you remove the source, Security - /// Lake stops collecting data from that source in the specified Regions and accounts, - /// and subscribers can no longer consume new data from the source. However, subscribers - /// can still consume data that Security Lake collected from the source before removal. + /// Removes a natively supported Amazon Web Services service as an Amazon Security Lake + /// source. You can remove a source for one or more Regions. When you remove the source, + /// Security Lake stops collecting data from that source in the specified Regions and + /// accounts, and subscribers can no longer consume new data from the source. However, + /// subscribers can still consume data that Security Lake collected from the source before + /// removal. /// /// /// @@ -1114,11 +1119,12 @@ public virtual DeleteAwsLogSourceResponse DeleteAwsLogSource(DeleteAwsLogSourceR /// - /// Removes a natively supported Amazon Web Service as an Amazon Security Lake source. - /// You can remove a source for one or more Regions. When you remove the source, Security - /// Lake stops collecting data from that source in the specified Regions and accounts, - /// and subscribers can no longer consume new data from the source. However, subscribers - /// can still consume data that Security Lake collected from the source before removal. + /// Removes a natively supported Amazon Web Services service as an Amazon Security Lake + /// source. You can remove a source for one or more Regions. When you remove the source, + /// Security Lake stops collecting data from that source in the specified Regions and + /// accounts, and subscribers can no longer consume new data from the source. However, + /// subscribers can still consume data that Security Lake collected from the source before + /// removal. /// /// /// @@ -1696,7 +1702,7 @@ public virtual DeleteSubscriberResponse DeleteSubscriber(DeleteSubscriberRequest /// - /// Deletes the specified notification subscription in Amazon Security Lake for the organization + /// Deletes the specified subscription notification in Amazon Security Lake for the organization /// you specify. /// /// Container for the necessary parameters to execute the DeleteSubscriberNotification service method. @@ -1741,7 +1747,7 @@ public virtual DeleteSubscriberNotificationResponse DeleteSubscriberNotification /// - /// Deletes the specified notification subscription in Amazon Security Lake for the organization + /// Deletes the specified subscription notification in Amazon Security Lake for the organization /// you specify. /// /// Container for the necessary parameters to execute the DeleteSubscriberNotification service method. @@ -1892,8 +1898,8 @@ public virtual DeregisterDataLakeDelegatedAdministratorResponse DeregisterDataLa /// - /// Retrieves the details of exception notifications for the account in Amazon Security - /// Lake. + /// Retrieves the protocol and endpoint that were provided when subscribing to Amazon + /// SNS topics for exception notifications. /// /// Container for the necessary parameters to execute the GetDataLakeExceptionSubscription service method. /// @@ -1937,8 +1943,8 @@ public virtual GetDataLakeExceptionSubscriptionResponse GetDataLakeExceptionSubs /// - /// Retrieves the details of exception notifications for the account in Amazon Security - /// Lake. + /// Retrieves the protocol and endpoint that were provided when subscribing to Amazon + /// SNS topics for exception notifications. /// /// Container for the necessary parameters to execute the GetDataLakeExceptionSubscription service method. /// @@ -2478,7 +2484,7 @@ public virtual ListDataLakesResponse ListDataLakes(ListDataLakesRequest request) /// - /// Retrieves the log sources in the current Amazon Web Services Region. + /// Retrieves the log sources. /// /// Container for the necessary parameters to execute the ListLogSources service method. /// @@ -2522,7 +2528,7 @@ public virtual ListLogSourcesResponse ListLogSources(ListLogSourcesRequest reque /// - /// Retrieves the log sources in the current Amazon Web Services Region. + /// Retrieves the log sources. /// /// Container for the necessary parameters to execute the ListLogSources service method. /// @@ -2573,7 +2579,7 @@ public virtual ListLogSourcesResponse ListLogSources(ListLogSourcesRequest reque /// - /// List all subscribers for the specific Amazon Security Lake account ID. You can retrieve + /// Lists all subscribers for the specific Amazon Security Lake account ID. You can retrieve /// a list of subscriptions associated with a specific organization or Amazon Web Services /// account. /// @@ -2619,7 +2625,7 @@ public virtual ListSubscribersResponse ListSubscribers(ListSubscribersRequest re /// - /// List all subscribers for the specific Amazon Security Lake account ID. You can retrieve + /// Lists all subscribers for the specific Amazon Security Lake account ID. You can retrieve /// a list of subscriptions associated with a specific organization or Amazon Web Services /// account. /// @@ -3082,8 +3088,30 @@ public virtual UntagResourceResponse UntagResource(UntagResourceRequest request) /// - /// Specifies where to store your security data and for how long. You can add a rollup - /// Region to consolidate data from multiple Amazon Web Services Regions. + /// You can use UpdateDataLake to specify where to store your security data, how + /// it should be encrypted at rest and for how long. You can add a Rollup + /// Region to consolidate data from multiple Amazon Web Services Regions, replace + /// default encryption (SSE-S3) with Customer + /// Manged Key, or specify transition and expiration actions through storage Lifecycle + /// management. The UpdateDataLake API works as an "upsert" operation that + /// performs an insert if the specified item or record does not exist, or an update if + /// it already exists. Security Lake securely stores your data at rest using Amazon Web + /// Services encryption solutions. For more details, see Data + /// protection in Amazon Security Lake. + /// + /// + /// + /// For example, omitting the key encryptionConfiguration from a Region that is + /// included in an update call that currently uses KMS will leave that Region's KMS key + /// in place, but specifying encryptionConfiguration: {kmsKeyId: 'S3_MANAGED_KEY'} + /// for that same Region will reset the key to S3-managed. + /// + /// + /// + /// For more details about lifecycle management and how to update retention settings for + /// one or more Regions after enabling Security Lake, see the Amazon + /// Security Lake User Guide. + /// /// /// Container for the necessary parameters to execute the UpdateDataLake service method. /// @@ -3127,8 +3155,30 @@ public virtual UpdateDataLakeResponse UpdateDataLake(UpdateDataLakeRequest reque /// - /// Specifies where to store your security data and for how long. You can add a rollup - /// Region to consolidate data from multiple Amazon Web Services Regions. + /// You can use UpdateDataLake to specify where to store your security data, how + /// it should be encrypted at rest and for how long. You can add a Rollup + /// Region to consolidate data from multiple Amazon Web Services Regions, replace + /// default encryption (SSE-S3) with Customer + /// Manged Key, or specify transition and expiration actions through storage Lifecycle + /// management. The UpdateDataLake API works as an "upsert" operation that + /// performs an insert if the specified item or record does not exist, or an update if + /// it already exists. Security Lake securely stores your data at rest using Amazon Web + /// Services encryption solutions. For more details, see Data + /// protection in Amazon Security Lake. + /// + /// + /// + /// For example, omitting the key encryptionConfiguration from a Region that is + /// included in an update call that currently uses KMS will leave that Region's KMS key + /// in place, but specifying encryptionConfiguration: {kmsKeyId: 'S3_MANAGED_KEY'} + /// for that same Region will reset the key to S3-managed. + /// + /// + /// + /// For more details about lifecycle management and how to update retention settings for + /// one or more Regions after enabling Security Lake, see the Amazon + /// Security Lake User Guide. + /// /// /// Container for the necessary parameters to execute the UpdateDataLake service method. /// diff --git a/sdk/src/Services/SecurityLake/Properties/AssemblyInfo.cs b/sdk/src/Services/SecurityLake/Properties/AssemblyInfo.cs index 21faaedf8e6b..1cdfb2972292 100644 --- a/sdk/src/Services/SecurityLake/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/SecurityLake/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.19")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/SecurityLake/SecurityLake.sln b/sdk/src/Services/SecurityLake/SecurityLake.sln index 8e5457b82358..4d03aff177f2 100644 --- a/sdk/src/Services/SecurityLake/SecurityLake.sln +++ b/sdk/src/Services/SecurityLake/SecurityLake.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {8417A490-1D10-464C-A8D8-68CAAD354A41}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {8417A490-1D10-464C-A8D8-68CAAD354A41}.Debug|Any CPU.Build.0 = Debug|Any CPU {8417A490-1D10-464C-A8D8-68CAAD354A41}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {91029E72-FEA8-438B-91A5-475AFD74FA97}.Debug|Any CPU.Build.0 = Debug|Any CPU {91029E72-FEA8-438B-91A5-475AFD74FA97}.Release|Any CPU.ActiveCfg = Release|Any CPU {91029E72-FEA8-438B-91A5-475AFD74FA97}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {0A860A21-F868-4371-963B-DAEC4822EB06}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0A860A21-F868-4371-963B-DAEC4822EB06}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0A860A21-F868-4371-963B-DAEC4822EB06}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0A860A21-F868-4371-963B-DAEC4822EB06}.Release|Any CPU.Build.0 = Release|Any CPU - {61789B15-E217-465B-B404-18706C3FA4F8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {61789B15-E217-465B-B404-18706C3FA4F8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {61789B15-E217-465B-B404-18706C3FA4F8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {61789B15-E217-465B-B404-18706C3FA4F8}.Release|Any CPU.Build.0 = Release|Any CPU - {664DAB53-DD30-4ABB-82EA-809FBEBAEBD3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {664DAB53-DD30-4ABB-82EA-809FBEBAEBD3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {664DAB53-DD30-4ABB-82EA-809FBEBAEBD3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {664DAB53-DD30-4ABB-82EA-809FBEBAEBD3}.Release|Any CPU.Build.0 = Release|Any CPU - {0EA418D2-FD79-4179-8FCD-4D4A7F5D4C78}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0EA418D2-FD79-4179-8FCD-4D4A7F5D4C78}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0EA418D2-FD79-4179-8FCD-4D4A7F5D4C78}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0EA418D2-FD79-4179-8FCD-4D4A7F5D4C78}.Release|Any CPU.Build.0 = Release|Any CPU - {7A80E196-B352-463A-90FE-C1CD20AB21A3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7A80E196-B352-463A-90FE-C1CD20AB21A3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7A80E196-B352-463A-90FE-C1CD20AB21A3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7A80E196-B352-463A-90FE-C1CD20AB21A3}.Release|Any CPU.Build.0 = Release|Any CPU - {A7FC1B3D-28AF-4AEF-A350-E6C05D2414B9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A7FC1B3D-28AF-4AEF-A350-E6C05D2414B9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A7FC1B3D-28AF-4AEF-A350-E6C05D2414B9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A7FC1B3D-28AF-4AEF-A350-E6C05D2414B9}.Release|Any CPU.Build.0 = Release|Any CPU - {5CC83546-E27A-46D9-A0AE-3A46513F2754}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5CC83546-E27A-46D9-A0AE-3A46513F2754}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5CC83546-E27A-46D9-A0AE-3A46513F2754}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5CC83546-E27A-46D9-A0AE-3A46513F2754}.Release|Any CPU.Build.0 = Release|Any CPU - {D9978DAB-F50F-4832-9BF2-E1F729FCC18B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D9978DAB-F50F-4832-9BF2-E1F729FCC18B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D9978DAB-F50F-4832-9BF2-E1F729FCC18B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D9978DAB-F50F-4832-9BF2-E1F729FCC18B}.Release|Any CPU.Build.0 = Release|Any CPU - {A1B4D317-B350-4413-85BB-F88070D0C8F4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A1B4D317-B350-4413-85BB-F88070D0C8F4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A1B4D317-B350-4413-85BB-F88070D0C8F4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A1B4D317-B350-4413-85BB-F88070D0C8F4}.Release|Any CPU.Build.0 = Release|Any CPU - {C7056B31-2B8F-49C6-A3AC-1962633A7BED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C7056B31-2B8F-49C6-A3AC-1962633A7BED}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C7056B31-2B8F-49C6-A3AC-1962633A7BED}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C7056B31-2B8F-49C6-A3AC-1962633A7BED}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {0A860A21-F868-4371-963B-DAEC4822EB06}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0A860A21-F868-4371-963B-DAEC4822EB06}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0A860A21-F868-4371-963B-DAEC4822EB06}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0A860A21-F868-4371-963B-DAEC4822EB06}.Release|Any CPU.Build.0 = Release|Any CPU - {61789B15-E217-465B-B404-18706C3FA4F8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {61789B15-E217-465B-B404-18706C3FA4F8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {61789B15-E217-465B-B404-18706C3FA4F8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {61789B15-E217-465B-B404-18706C3FA4F8}.Release|Any CPU.Build.0 = Release|Any CPU - {664DAB53-DD30-4ABB-82EA-809FBEBAEBD3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {664DAB53-DD30-4ABB-82EA-809FBEBAEBD3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {664DAB53-DD30-4ABB-82EA-809FBEBAEBD3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {664DAB53-DD30-4ABB-82EA-809FBEBAEBD3}.Release|Any CPU.Build.0 = Release|Any CPU - {0EA418D2-FD79-4179-8FCD-4D4A7F5D4C78}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0EA418D2-FD79-4179-8FCD-4D4A7F5D4C78}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0EA418D2-FD79-4179-8FCD-4D4A7F5D4C78}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0EA418D2-FD79-4179-8FCD-4D4A7F5D4C78}.Release|Any CPU.Build.0 = Release|Any CPU - {7A80E196-B352-463A-90FE-C1CD20AB21A3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7A80E196-B352-463A-90FE-C1CD20AB21A3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7A80E196-B352-463A-90FE-C1CD20AB21A3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7A80E196-B352-463A-90FE-C1CD20AB21A3}.Release|Any CPU.Build.0 = Release|Any CPU - {A7FC1B3D-28AF-4AEF-A350-E6C05D2414B9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A7FC1B3D-28AF-4AEF-A350-E6C05D2414B9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A7FC1B3D-28AF-4AEF-A350-E6C05D2414B9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A7FC1B3D-28AF-4AEF-A350-E6C05D2414B9}.Release|Any CPU.Build.0 = Release|Any CPU - {5CC83546-E27A-46D9-A0AE-3A46513F2754}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5CC83546-E27A-46D9-A0AE-3A46513F2754}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5CC83546-E27A-46D9-A0AE-3A46513F2754}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5CC83546-E27A-46D9-A0AE-3A46513F2754}.Release|Any CPU.Build.0 = Release|Any CPU - {D9978DAB-F50F-4832-9BF2-E1F729FCC18B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D9978DAB-F50F-4832-9BF2-E1F729FCC18B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D9978DAB-F50F-4832-9BF2-E1F729FCC18B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D9978DAB-F50F-4832-9BF2-E1F729FCC18B}.Release|Any CPU.Build.0 = Release|Any CPU - {A1B4D317-B350-4413-85BB-F88070D0C8F4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A1B4D317-B350-4413-85BB-F88070D0C8F4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A1B4D317-B350-4413-85BB-F88070D0C8F4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A1B4D317-B350-4413-85BB-F88070D0C8F4}.Release|Any CPU.Build.0 = Release|Any CPU - {C7056B31-2B8F-49C6-A3AC-1962633A7BED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C7056B31-2B8F-49C6-A3AC-1962633A7BED}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C7056B31-2B8F-49C6-A3AC-1962633A7BED}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C7056B31-2B8F-49C6-A3AC-1962633A7BED}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {8417A490-1D10-464C-A8D8-68CAAD354A41} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {98A067F8-3AFD-4D41-A0E7-61F0A589C7AC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {CC551BA5-84DB-4F94-92BF-19E45E60A8CC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {71142261-2FE6-4D27-857E-00256720CEAA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {91029E72-FEA8-438B-91A5-475AFD74FA97} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {0A860A21-F868-4371-963B-DAEC4822EB06} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {61789B15-E217-465B-B404-18706C3FA4F8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {664DAB53-DD30-4ABB-82EA-809FBEBAEBD3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0EA418D2-FD79-4179-8FCD-4D4A7F5D4C78} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {7A80E196-B352-463A-90FE-C1CD20AB21A3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A7FC1B3D-28AF-4AEF-A350-E6C05D2414B9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {5CC83546-E27A-46D9-A0AE-3A46513F2754} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D9978DAB-F50F-4832-9BF2-E1F729FCC18B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A1B4D317-B350-4413-85BB-F88070D0C8F4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C7056B31-2B8F-49C6-A3AC-1962633A7BED} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {0A860A21-F868-4371-963B-DAEC4822EB06} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {61789B15-E217-465B-B404-18706C3FA4F8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {664DAB53-DD30-4ABB-82EA-809FBEBAEBD3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0EA418D2-FD79-4179-8FCD-4D4A7F5D4C78} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {7A80E196-B352-463A-90FE-C1CD20AB21A3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A7FC1B3D-28AF-4AEF-A350-E6C05D2414B9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {5CC83546-E27A-46D9-A0AE-3A46513F2754} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D9978DAB-F50F-4832-9BF2-E1F729FCC18B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A1B4D317-B350-4413-85BB-F88070D0C8F4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C7056B31-2B8F-49C6-A3AC-1962633A7BED} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {4AB44E2E-1A73-4253-BE31-C380E2B68824} diff --git a/sdk/src/Services/SecurityToken/Generated/AmazonSecurityTokenServiceConfig.cs b/sdk/src/Services/SecurityToken/Generated/AmazonSecurityTokenServiceConfig.cs index e3983c4c733c..f64f3c612889 100644 --- a/sdk/src/Services/SecurityToken/Generated/AmazonSecurityTokenServiceConfig.cs +++ b/sdk/src/Services/SecurityToken/Generated/AmazonSecurityTokenServiceConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.SecurityToken public partial class AmazonSecurityTokenServiceConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("STS", "4.0.0.0"); private static readonly AmazonSecurityTokenServiceEndpointResolver EndpointResolver = new AmazonSecurityTokenServiceEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("STS", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("STS", "3.7.401.2"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/SecurityToken/Generated/Model/AssumeRootRequest.cs b/sdk/src/Services/SecurityToken/Generated/Model/AssumeRootRequest.cs index b01aa8cacafb..02c30bfd8f09 100644 --- a/sdk/src/Services/SecurityToken/Generated/Model/AssumeRootRequest.cs +++ b/sdk/src/Services/SecurityToken/Generated/Model/AssumeRootRequest.cs @@ -71,9 +71,9 @@ public partial class AssumeRootRequest : AmazonSecurityTokenServiceRequest /// /// [AWSProperty(Min=0, Max=900)] - public int DurationSeconds + public int? DurationSeconds { - get { return this._durationSeconds.GetValueOrDefault(); } + get { return this._durationSeconds; } set { this._durationSeconds = value; } } diff --git a/sdk/src/Services/SecurityToken/Generated/_bcl/AmazonSecurityTokenServiceClient.cs b/sdk/src/Services/SecurityToken/Generated/_bcl/AmazonSecurityTokenServiceClient.cs index 58bc530191d4..364c12c68076 100644 --- a/sdk/src/Services/SecurityToken/Generated/_bcl/AmazonSecurityTokenServiceClient.cs +++ b/sdk/src/Services/SecurityToken/Generated/_bcl/AmazonSecurityTokenServiceClient.cs @@ -272,8 +272,8 @@ protected override void Dispose(bool disposing) /// secret access key, and a security token. Typically, you use AssumeRole within /// your account or for cross-account access. For a comparison of AssumeRole with /// other API operations that produce temporary credentials, see Requesting - /// Temporary Security Credentials and Comparing - /// the Amazon Web Services STS API operations in the IAM User Guide. + /// Temporary Security Credentials and Compare + /// STS credentials in the IAM User Guide. /// /// /// @@ -288,17 +288,17 @@ protected override void Dispose(bool disposing) /// /// /// - /// (Optional) You can pass inline or managed session - /// policies to this operation. You can pass a single JSON policy document to use - /// as an inline session policy. You can also specify up to 10 managed policy Amazon Resource - /// Names (ARNs) to use as managed session policies. The plaintext that you use for both - /// inline and managed session policies can't exceed 2,048 characters. Passing policies - /// to this operation returns new temporary credentials. The resulting session's permissions - /// are the intersection of the role's identity-based policy and the session policies. - /// You can use the role's temporary credentials in subsequent Amazon Web Services API - /// calls to access resources in the account that owns the role. You cannot use session - /// policies to grant more permissions than those allowed by the identity-based policy - /// of the role that is being assumed. For more information, see Session + /// (Optional) You can pass inline or managed session policies to this operation. You + /// can pass a single JSON policy document to use as an inline session policy. You can + /// also specify up to 10 managed policy Amazon Resource Names (ARNs) to use as managed + /// session policies. The plaintext that you use for both inline and managed session policies + /// can't exceed 2,048 characters. Passing policies to this operation returns new temporary + /// credentials. The resulting session's permissions are the intersection of the role's + /// identity-based policy and the session policies. You can use the role's temporary credentials + /// in subsequent Amazon Web Services API calls to access resources in the account that + /// owns the role. You cannot use session policies to grant more permissions than those + /// allowed by the identity-based policy of the role that is being assumed. For more information, + /// see Session /// Policies in the IAM User Guide. /// /// @@ -427,8 +427,7 @@ protected override void Dispose(bool disposing) /// STS is not activated in the requested region for the account that is being asked to /// generate credentials. The account administrator must use the IAM console to activate /// STS in that region. For more information, see Activating - /// and Deactivating Amazon Web Services STS in an Amazon Web Services Region in the - /// IAM User Guide. + /// and Deactivating STS in an Amazon Web Services Region in the IAM User Guide. /// /// REST API Reference for AssumeRole Operation public virtual AssumeRoleResponse AssumeRole(AssumeRoleRequest request) @@ -447,8 +446,8 @@ public virtual AssumeRoleResponse AssumeRole(AssumeRoleRequest request) /// secret access key, and a security token. Typically, you use AssumeRole within /// your account or for cross-account access. For a comparison of AssumeRole with /// other API operations that produce temporary credentials, see Requesting - /// Temporary Security Credentials and Comparing - /// the Amazon Web Services STS API operations in the IAM User Guide. + /// Temporary Security Credentials and Compare + /// STS credentials in the IAM User Guide. /// /// /// @@ -463,17 +462,17 @@ public virtual AssumeRoleResponse AssumeRole(AssumeRoleRequest request) /// /// /// - /// (Optional) You can pass inline or managed session - /// policies to this operation. You can pass a single JSON policy document to use - /// as an inline session policy. You can also specify up to 10 managed policy Amazon Resource - /// Names (ARNs) to use as managed session policies. The plaintext that you use for both - /// inline and managed session policies can't exceed 2,048 characters. Passing policies - /// to this operation returns new temporary credentials. The resulting session's permissions - /// are the intersection of the role's identity-based policy and the session policies. - /// You can use the role's temporary credentials in subsequent Amazon Web Services API - /// calls to access resources in the account that owns the role. You cannot use session - /// policies to grant more permissions than those allowed by the identity-based policy - /// of the role that is being assumed. For more information, see Session + /// (Optional) You can pass inline or managed session policies to this operation. You + /// can pass a single JSON policy document to use as an inline session policy. You can + /// also specify up to 10 managed policy Amazon Resource Names (ARNs) to use as managed + /// session policies. The plaintext that you use for both inline and managed session policies + /// can't exceed 2,048 characters. Passing policies to this operation returns new temporary + /// credentials. The resulting session's permissions are the intersection of the role's + /// identity-based policy and the session policies. You can use the role's temporary credentials + /// in subsequent Amazon Web Services API calls to access resources in the account that + /// owns the role. You cannot use session policies to grant more permissions than those + /// allowed by the identity-based policy of the role that is being assumed. For more information, + /// see Session /// Policies in the IAM User Guide. /// /// @@ -605,8 +604,7 @@ public virtual AssumeRoleResponse AssumeRole(AssumeRoleRequest request) /// STS is not activated in the requested region for the account that is being asked to /// generate credentials. The account administrator must use the IAM console to activate /// STS in that region. For more information, see Activating - /// and Deactivating Amazon Web Services STS in an Amazon Web Services Region in the - /// IAM User Guide. + /// and Deactivating STS in an Amazon Web Services Region in the IAM User Guide. /// /// REST API Reference for AssumeRole Operation public virtual Task AssumeRoleAsync(AssumeRoleRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) @@ -629,8 +627,8 @@ public virtual AssumeRoleResponse AssumeRole(AssumeRoleRequest request) /// an enterprise identity store or directory to role-based Amazon Web Services access /// without user-specific credentials or configuration. For a comparison of AssumeRoleWithSAML /// with the other API operations that produce temporary credentials, see Requesting - /// Temporary Security Credentials and Comparing - /// the Amazon Web Services STS API operations in the IAM User Guide. + /// Temporary Security Credentials and Compare + /// STS credentials in the IAM User Guide. /// /// /// @@ -837,8 +835,7 @@ public virtual AssumeRoleResponse AssumeRole(AssumeRoleRequest request) /// STS is not activated in the requested region for the account that is being asked to /// generate credentials. The account administrator must use the IAM console to activate /// STS in that region. For more information, see Activating - /// and Deactivating Amazon Web Services STS in an Amazon Web Services Region in the - /// IAM User Guide. + /// and Deactivating STS in an Amazon Web Services Region in the IAM User Guide. /// /// REST API Reference for AssumeRoleWithSAML Operation public virtual AssumeRoleWithSAMLResponse AssumeRoleWithSAML(AssumeRoleWithSAMLRequest request) @@ -857,8 +854,8 @@ public virtual AssumeRoleWithSAMLResponse AssumeRoleWithSAML(AssumeRoleWithSAMLR /// an enterprise identity store or directory to role-based Amazon Web Services access /// without user-specific credentials or configuration. For a comparison of AssumeRoleWithSAML /// with the other API operations that produce temporary credentials, see Requesting - /// Temporary Security Credentials and Comparing - /// the Amazon Web Services STS API operations in the IAM User Guide. + /// Temporary Security Credentials and Compare + /// STS credentials in the IAM User Guide. /// /// /// @@ -1068,8 +1065,7 @@ public virtual AssumeRoleWithSAMLResponse AssumeRoleWithSAML(AssumeRoleWithSAMLR /// STS is not activated in the requested region for the account that is being asked to /// generate credentials. The account administrator must use the IAM console to activate /// STS in that region. For more information, see Activating - /// and Deactivating Amazon Web Services STS in an Amazon Web Services Region in the - /// IAM User Guide. + /// and Deactivating STS in an Amazon Web Services Region in the IAM User Guide. /// /// REST API Reference for AssumeRoleWithSAML Operation public virtual Task AssumeRoleWithSAMLAsync(AssumeRoleWithSAMLRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) @@ -1117,8 +1113,8 @@ public virtual AssumeRoleWithSAMLResponse AssumeRoleWithSAML(AssumeRoleWithSAMLR /// the identity of the caller is validated by using a token from the web identity provider. /// For a comparison of AssumeRoleWithWebIdentity with the other API operations /// that produce temporary credentials, see Requesting - /// Temporary Security Credentials and Comparing - /// the Amazon Web Services STS API operations in the IAM User Guide. + /// Temporary Security Credentials and Compare + /// STS credentials in the IAM User Guide. /// /// /// @@ -1137,13 +1133,12 @@ public virtual AssumeRoleWithSAMLResponse AssumeRoleWithSAML(AssumeRoleWithSAMLR /// to specify the duration of your session. You can provide a value from 900 seconds /// (15 minutes) up to the maximum session duration setting for the role. This setting /// can have a value from 1 hour to 12 hours. To learn how to view the maximum value for - /// your role, see View - /// the Maximum Session Duration Setting for a Role in the IAM User Guide. - /// The maximum session duration limit applies when you use the AssumeRole* API - /// operations or the assume-role* CLI commands. However the limit does not apply - /// when you use those operations to create a console URL. For more information, see Using IAM - /// Roles in the IAM User Guide. + /// your role, see Update + /// the maximum session duration for a role in the IAM User Guide. The maximum + /// session duration limit applies when you use the AssumeRole* API operations + /// or the assume-role* CLI commands. However the limit does not apply when you + /// use those operations to create a console URL. For more information, see Using + /// IAM Roles in the IAM User Guide. /// /// /// @@ -1237,7 +1232,7 @@ public virtual AssumeRoleWithSAMLResponse AssumeRoleWithSAML(AssumeRoleWithSAMLR /// /// /// - /// For more information about how to use web identity federation and the AssumeRoleWithWebIdentity + /// For more information about how to use OIDC federation and the AssumeRoleWithWebIdentity /// API, see the following resources: /// /// /// /// Container for the necessary parameters to execute the AssumeRoleWithWebIdentity service method. @@ -1321,8 +1302,7 @@ public virtual AssumeRoleWithSAMLResponse AssumeRoleWithSAML(AssumeRoleWithSAMLR /// STS is not activated in the requested region for the account that is being asked to /// generate credentials. The account administrator must use the IAM console to activate /// STS in that region. For more information, see Activating - /// and Deactivating Amazon Web Services STS in an Amazon Web Services Region in the - /// IAM User Guide. + /// and Deactivating STS in an Amazon Web Services Region in the IAM User Guide. /// /// REST API Reference for AssumeRoleWithWebIdentity Operation public virtual AssumeRoleWithWebIdentityResponse AssumeRoleWithWebIdentity(AssumeRoleWithWebIdentityRequest request) @@ -1366,8 +1346,8 @@ public virtual AssumeRoleWithWebIdentityResponse AssumeRoleWithWebIdentity(Assum /// the identity of the caller is validated by using a token from the web identity provider. /// For a comparison of AssumeRoleWithWebIdentity with the other API operations /// that produce temporary credentials, see Requesting - /// Temporary Security Credentials and Comparing - /// the Amazon Web Services STS API operations in the IAM User Guide. + /// Temporary Security Credentials and Compare + /// STS credentials in the IAM User Guide. /// /// /// @@ -1386,13 +1366,12 @@ public virtual AssumeRoleWithWebIdentityResponse AssumeRoleWithWebIdentity(Assum /// to specify the duration of your session. You can provide a value from 900 seconds /// (15 minutes) up to the maximum session duration setting for the role. This setting /// can have a value from 1 hour to 12 hours. To learn how to view the maximum value for - /// your role, see View - /// the Maximum Session Duration Setting for a Role in the IAM User Guide. - /// The maximum session duration limit applies when you use the AssumeRole* API - /// operations or the assume-role* CLI commands. However the limit does not apply - /// when you use those operations to create a console URL. For more information, see Using IAM - /// Roles in the IAM User Guide. + /// your role, see Update + /// the maximum session duration for a role in the IAM User Guide. The maximum + /// session duration limit applies when you use the AssumeRole* API operations + /// or the assume-role* CLI commands. However the limit does not apply when you + /// use those operations to create a console URL. For more information, see Using + /// IAM Roles in the IAM User Guide. /// /// /// @@ -1486,7 +1465,7 @@ public virtual AssumeRoleWithWebIdentityResponse AssumeRoleWithWebIdentity(Assum /// /// /// - /// For more information about how to use web identity federation and the AssumeRoleWithWebIdentity + /// For more information about how to use OIDC federation and the AssumeRoleWithWebIdentity /// API, see the following resources: /// /// /// /// Container for the necessary parameters to execute the AssumeRoleWithWebIdentity service method. @@ -1573,8 +1538,7 @@ public virtual AssumeRoleWithWebIdentityResponse AssumeRoleWithWebIdentity(Assum /// STS is not activated in the requested region for the account that is being asked to /// generate credentials. The account administrator must use the IAM console to activate /// STS in that region. For more information, see Activating - /// and Deactivating Amazon Web Services STS in an Amazon Web Services Region in the - /// IAM User Guide. + /// and Deactivating STS in an Amazon Web Services Region in the IAM User Guide. /// /// REST API Reference for AssumeRoleWithWebIdentity Operation public virtual Task AssumeRoleWithWebIdentityAsync(AssumeRoleWithWebIdentityRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) @@ -1588,6 +1552,105 @@ public virtual AssumeRoleWithWebIdentityResponse AssumeRoleWithWebIdentity(Assum #endregion + #region AssumeRoot + + + /// + /// Returns a set of short term credentials you can use to perform privileged tasks in + /// a member account. + /// + /// + /// + /// Before you can launch a privileged session, you must have enabled centralized root + /// access in your organization. For steps to enable this feature, see Centralize + /// root access for member accounts in the IAM User Guide. + /// + /// + /// + /// The global endpoint is not supported for AssumeRoot. You must send this request to + /// a Regional STS endpoint. For more information, see Endpoints. + /// + /// + /// + /// You can track AssumeRoot in CloudTrail logs to determine what actions were performed + /// in a session. For more information, see Track + /// privileged tasks in CloudTrail in the IAM User Guide. + /// + /// + /// Container for the necessary parameters to execute the AssumeRoot service method. + /// + /// The response from the AssumeRoot service method, as returned by SecurityTokenService. + /// + /// The web identity token that was passed is expired or is not valid. Get a new identity + /// token from the identity provider and then retry the request. + /// + /// + /// STS is not activated in the requested region for the account that is being asked to + /// generate credentials. The account administrator must use the IAM console to activate + /// STS in that region. For more information, see Activating + /// and Deactivating STS in an Amazon Web Services Region in the IAM User Guide. + /// + /// REST API Reference for AssumeRoot Operation + public virtual AssumeRootResponse AssumeRoot(AssumeRootRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = AssumeRootRequestMarshaller.Instance; + options.ResponseUnmarshaller = AssumeRootResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// Returns a set of short term credentials you can use to perform privileged tasks in + /// a member account. + /// + /// + /// + /// Before you can launch a privileged session, you must have enabled centralized root + /// access in your organization. For steps to enable this feature, see Centralize + /// root access for member accounts in the IAM User Guide. + /// + /// + /// + /// The global endpoint is not supported for AssumeRoot. You must send this request to + /// a Regional STS endpoint. For more information, see Endpoints. + /// + /// + /// + /// You can track AssumeRoot in CloudTrail logs to determine what actions were performed + /// in a session. For more information, see Track + /// privileged tasks in CloudTrail in the IAM User Guide. + /// + /// + /// Container for the necessary parameters to execute the AssumeRoot service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the AssumeRoot service method, as returned by SecurityTokenService. + /// + /// The web identity token that was passed is expired or is not valid. Get a new identity + /// token from the identity provider and then retry the request. + /// + /// + /// STS is not activated in the requested region for the account that is being asked to + /// generate credentials. The account administrator must use the IAM console to activate + /// STS in that region. For more information, see Activating + /// and Deactivating STS in an Amazon Web Services Region in the IAM User Guide. + /// + /// REST API Reference for AssumeRoot Operation + public virtual Task AssumeRootAsync(AssumeRootRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = AssumeRootRequestMarshaller.Instance; + options.ResponseUnmarshaller = AssumeRootResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + #region DecodeAuthorizationMessage @@ -1650,7 +1713,8 @@ public virtual AssumeRoleWithWebIdentityResponse AssumeRoleWithWebIdentity(Assum /// The response from the DecodeAuthorizationMessage service method, as returned by SecurityTokenService. /// /// The error returned if the message passed to DecodeAuthorizationMessage was - /// invalid. This can happen if the token contains invalid characters, such as linebreaks. + /// invalid. This can happen if the token contains invalid characters, such as line breaks, + /// or if the message has expired. /// /// REST API Reference for DecodeAuthorizationMessage Operation public virtual DecodeAuthorizationMessageResponse DecodeAuthorizationMessage(DecodeAuthorizationMessageRequest request) @@ -1725,7 +1789,8 @@ public virtual DecodeAuthorizationMessageResponse DecodeAuthorizationMessage(Dec /// The response from the DecodeAuthorizationMessage service method, as returned by SecurityTokenService. /// /// The error returned if the message passed to DecodeAuthorizationMessage was - /// invalid. This can happen if the token contains invalid characters, such as linebreaks. + /// invalid. This can happen if the token contains invalid characters, such as line breaks, + /// or if the message has expired. /// /// REST API Reference for DecodeAuthorizationMessage Operation public virtual Task DecodeAuthorizationMessageAsync(DecodeAuthorizationMessageRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) @@ -1915,8 +1980,8 @@ public virtual GetCallerIdentityResponse GetCallerIdentity(GetCallerIdentityRequ /// those credentials can be safeguarded, usually in a server-based application. For a /// comparison of GetFederationToken with the other API operations that produce /// temporary credentials, see Requesting - /// Temporary Security Credentials and Comparing - /// the Amazon Web Services STS API operations in the IAM User Guide. + /// Temporary Security Credentials and Compare + /// STS credentials in the IAM User Guide. /// /// /// @@ -2057,8 +2122,7 @@ public virtual GetCallerIdentityResponse GetCallerIdentity(GetCallerIdentityRequ /// STS is not activated in the requested region for the account that is being asked to /// generate credentials. The account administrator must use the IAM console to activate /// STS in that region. For more information, see Activating - /// and Deactivating Amazon Web Services STS in an Amazon Web Services Region in the - /// IAM User Guide. + /// and Deactivating STS in an Amazon Web Services Region in the IAM User Guide. /// /// REST API Reference for GetFederationToken Operation public virtual GetFederationTokenResponse GetFederationToken(GetFederationTokenRequest request) @@ -2084,8 +2148,8 @@ public virtual GetFederationTokenResponse GetFederationToken(GetFederationTokenR /// those credentials can be safeguarded, usually in a server-based application. For a /// comparison of GetFederationToken with the other API operations that produce /// temporary credentials, see Requesting - /// Temporary Security Credentials and Comparing - /// the Amazon Web Services STS API operations in the IAM User Guide. + /// Temporary Security Credentials and Compare + /// STS credentials in the IAM User Guide. /// /// /// @@ -2229,8 +2293,7 @@ public virtual GetFederationTokenResponse GetFederationToken(GetFederationTokenR /// STS is not activated in the requested region for the account that is being asked to /// generate credentials. The account administrator must use the IAM console to activate /// STS in that region. For more information, see Activating - /// and Deactivating Amazon Web Services STS in an Amazon Web Services Region in the - /// IAM User Guide. + /// and Deactivating STS in an Amazon Web Services Region in the IAM User Guide. /// /// REST API Reference for GetFederationToken Operation public virtual Task GetFederationTokenAsync(GetFederationTokenRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) @@ -2261,8 +2324,8 @@ public virtual GetFederationTokenResponse GetFederationToken(GetFederationTokenR /// require MFA authentication. An incorrect MFA code causes the API to return an access /// denied error. For a comparison of GetSessionToken with the other API operations /// that produce temporary credentials, see Requesting - /// Temporary Security Credentials and Comparing - /// the Amazon Web Services STS API operations in the IAM User Guide. + /// Temporary Security Credentials and Compare + /// STS credentials in the IAM User Guide. /// /// /// @@ -2331,8 +2394,7 @@ public virtual GetFederationTokenResponse GetFederationToken(GetFederationTokenR /// STS is not activated in the requested region for the account that is being asked to /// generate credentials. The account administrator must use the IAM console to activate /// STS in that region. For more information, see Activating - /// and Deactivating Amazon Web Services STS in an Amazon Web Services Region in the - /// IAM User Guide. + /// and Deactivating STS in an Amazon Web Services Region in the IAM User Guide. /// /// REST API Reference for GetSessionToken Operation public virtual GetSessionTokenResponse GetSessionToken() @@ -2355,8 +2417,8 @@ public virtual GetSessionTokenResponse GetSessionToken() /// require MFA authentication. An incorrect MFA code causes the API to return an access /// denied error. For a comparison of GetSessionToken with the other API operations /// that produce temporary credentials, see Requesting - /// Temporary Security Credentials and Comparing - /// the Amazon Web Services STS API operations in the IAM User Guide. + /// Temporary Security Credentials and Compare + /// STS credentials in the IAM User Guide. /// /// /// @@ -2426,8 +2488,7 @@ public virtual GetSessionTokenResponse GetSessionToken() /// STS is not activated in the requested region for the account that is being asked to /// generate credentials. The account administrator must use the IAM console to activate /// STS in that region. For more information, see Activating - /// and Deactivating Amazon Web Services STS in an Amazon Web Services Region in the - /// IAM User Guide. + /// and Deactivating STS in an Amazon Web Services Region in the IAM User Guide. /// /// REST API Reference for GetSessionToken Operation public virtual GetSessionTokenResponse GetSessionToken(GetSessionTokenRequest request) @@ -2454,8 +2515,8 @@ public virtual GetSessionTokenResponse GetSessionToken(GetSessionTokenRequest re /// require MFA authentication. An incorrect MFA code causes the API to return an access /// denied error. For a comparison of GetSessionToken with the other API operations /// that produce temporary credentials, see Requesting - /// Temporary Security Credentials and Comparing - /// the Amazon Web Services STS API operations in the IAM User Guide. + /// Temporary Security Credentials and Compare + /// STS credentials in the IAM User Guide. /// /// /// @@ -2527,8 +2588,7 @@ public virtual GetSessionTokenResponse GetSessionToken(GetSessionTokenRequest re /// STS is not activated in the requested region for the account that is being asked to /// generate credentials. The account administrator must use the IAM console to activate /// STS in that region. For more information, see Activating - /// and Deactivating Amazon Web Services STS in an Amazon Web Services Region in the - /// IAM User Guide. + /// and Deactivating STS in an Amazon Web Services Region in the IAM User Guide. /// /// REST API Reference for GetSessionToken Operation public virtual Task GetSessionTokenAsync(System.Threading.CancellationToken cancellationToken = default(CancellationToken)) @@ -2550,8 +2610,8 @@ public virtual GetSessionTokenResponse GetSessionToken(GetSessionTokenRequest re /// require MFA authentication. An incorrect MFA code causes the API to return an access /// denied error. For a comparison of GetSessionToken with the other API operations /// that produce temporary credentials, see Requesting - /// Temporary Security Credentials and Comparing - /// the Amazon Web Services STS API operations in the IAM User Guide. + /// Temporary Security Credentials and Compare + /// STS credentials in the IAM User Guide. /// /// /// @@ -2624,8 +2684,7 @@ public virtual GetSessionTokenResponse GetSessionToken(GetSessionTokenRequest re /// STS is not activated in the requested region for the account that is being asked to /// generate credentials. The account administrator must use the IAM console to activate /// STS in that region. For more information, see Activating - /// and Deactivating Amazon Web Services STS in an Amazon Web Services Region in the - /// IAM User Guide. + /// and Deactivating STS in an Amazon Web Services Region in the IAM User Guide. /// /// REST API Reference for GetSessionToken Operation public virtual Task GetSessionTokenAsync(GetSessionTokenRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) diff --git a/sdk/src/Services/SecurityToken/Properties/AssemblyInfo.cs b/sdk/src/Services/SecurityToken/Properties/AssemblyInfo.cs index 5e6c4694a18b..48244bafb14d 100644 --- a/sdk/src/Services/SecurityToken/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/SecurityToken/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.2")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/SecurityToken/SecurityToken.sln b/sdk/src/Services/SecurityToken/SecurityToken.sln index 2084b607d9be..c847635b69a0 100644 --- a/sdk/src/Services/SecurityToken/SecurityToken.sln +++ b/sdk/src/Services/SecurityToken/SecurityToken.sln @@ -90,7 +90,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {2DE6C0F1-D52A-45EE-B952-A4F8D2A55F6E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {2DE6C0F1-D52A-45EE-B952-A4F8D2A55F6E}.Debug|Any CPU.Build.0 = Debug|Any CPU {2DE6C0F1-D52A-45EE-B952-A4F8D2A55F6E}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,81 +114,6 @@ Global {76DA11D6-DDB6-463D-AEE4-D202423C04DD}.Debug|Any CPU.Build.0 = Debug|Any CPU {76DA11D6-DDB6-463D-AEE4-D202423C04DD}.Release|Any CPU.ActiveCfg = Release|Any CPU {76DA11D6-DDB6-463D-AEE4-D202423C04DD}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {0125FC6D-0A7A-444D-A844-E64FED7467F1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0125FC6D-0A7A-444D-A844-E64FED7467F1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0125FC6D-0A7A-444D-A844-E64FED7467F1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0125FC6D-0A7A-444D-A844-E64FED7467F1}.Release|Any CPU.Build.0 = Release|Any CPU - {BBD7C388-AE45-4658-BFBD-DC64EA8CC691}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BBD7C388-AE45-4658-BFBD-DC64EA8CC691}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BBD7C388-AE45-4658-BFBD-DC64EA8CC691}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BBD7C388-AE45-4658-BFBD-DC64EA8CC691}.Release|Any CPU.Build.0 = Release|Any CPU - {8893DB0F-71C9-44C6-9C6F-EF546EDC665C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8893DB0F-71C9-44C6-9C6F-EF546EDC665C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8893DB0F-71C9-44C6-9C6F-EF546EDC665C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8893DB0F-71C9-44C6-9C6F-EF546EDC665C}.Release|Any CPU.Build.0 = Release|Any CPU - {4CD49EFF-C040-44FE-BBA4-825C3131EF12}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4CD49EFF-C040-44FE-BBA4-825C3131EF12}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4CD49EFF-C040-44FE-BBA4-825C3131EF12}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4CD49EFF-C040-44FE-BBA4-825C3131EF12}.Release|Any CPU.Build.0 = Release|Any CPU - {0A1E2EDD-579A-4DC3-890E-CF47DF5CC74E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0A1E2EDD-579A-4DC3-890E-CF47DF5CC74E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0A1E2EDD-579A-4DC3-890E-CF47DF5CC74E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0A1E2EDD-579A-4DC3-890E-CF47DF5CC74E}.Release|Any CPU.Build.0 = Release|Any CPU - {B262D475-E3CD-4CE9-96CF-465D6F687875}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B262D475-E3CD-4CE9-96CF-465D6F687875}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B262D475-E3CD-4CE9-96CF-465D6F687875}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B262D475-E3CD-4CE9-96CF-465D6F687875}.Release|Any CPU.Build.0 = Release|Any CPU - {D9911501-8DD3-4D93-AB7B-8DD6C67305A1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D9911501-8DD3-4D93-AB7B-8DD6C67305A1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D9911501-8DD3-4D93-AB7B-8DD6C67305A1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D9911501-8DD3-4D93-AB7B-8DD6C67305A1}.Release|Any CPU.Build.0 = Release|Any CPU - {EF914F20-FE86-451B-93BD-6BC64749501A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EF914F20-FE86-451B-93BD-6BC64749501A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EF914F20-FE86-451B-93BD-6BC64749501A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EF914F20-FE86-451B-93BD-6BC64749501A}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {0125FC6D-0A7A-444D-A844-E64FED7467F1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0125FC6D-0A7A-444D-A844-E64FED7467F1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0125FC6D-0A7A-444D-A844-E64FED7467F1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0125FC6D-0A7A-444D-A844-E64FED7467F1}.Release|Any CPU.Build.0 = Release|Any CPU - {BBD7C388-AE45-4658-BFBD-DC64EA8CC691}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BBD7C388-AE45-4658-BFBD-DC64EA8CC691}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BBD7C388-AE45-4658-BFBD-DC64EA8CC691}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BBD7C388-AE45-4658-BFBD-DC64EA8CC691}.Release|Any CPU.Build.0 = Release|Any CPU - {8893DB0F-71C9-44C6-9C6F-EF546EDC665C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8893DB0F-71C9-44C6-9C6F-EF546EDC665C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8893DB0F-71C9-44C6-9C6F-EF546EDC665C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8893DB0F-71C9-44C6-9C6F-EF546EDC665C}.Release|Any CPU.Build.0 = Release|Any CPU - {4CD49EFF-C040-44FE-BBA4-825C3131EF12}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4CD49EFF-C040-44FE-BBA4-825C3131EF12}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4CD49EFF-C040-44FE-BBA4-825C3131EF12}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4CD49EFF-C040-44FE-BBA4-825C3131EF12}.Release|Any CPU.Build.0 = Release|Any CPU - {0A1E2EDD-579A-4DC3-890E-CF47DF5CC74E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0A1E2EDD-579A-4DC3-890E-CF47DF5CC74E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0A1E2EDD-579A-4DC3-890E-CF47DF5CC74E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0A1E2EDD-579A-4DC3-890E-CF47DF5CC74E}.Release|Any CPU.Build.0 = Release|Any CPU - {B262D475-E3CD-4CE9-96CF-465D6F687875}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B262D475-E3CD-4CE9-96CF-465D6F687875}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B262D475-E3CD-4CE9-96CF-465D6F687875}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B262D475-E3CD-4CE9-96CF-465D6F687875}.Release|Any CPU.Build.0 = Release|Any CPU - {D9911501-8DD3-4D93-AB7B-8DD6C67305A1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D9911501-8DD3-4D93-AB7B-8DD6C67305A1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D9911501-8DD3-4D93-AB7B-8DD6C67305A1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D9911501-8DD3-4D93-AB7B-8DD6C67305A1}.Release|Any CPU.Build.0 = Release|Any CPU - {EF914F20-FE86-451B-93BD-6BC64749501A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EF914F20-FE86-451B-93BD-6BC64749501A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EF914F20-FE86-451B-93BD-6BC64749501A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EF914F20-FE86-451B-93BD-6BC64749501A}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -198,32 +130,12 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {2DE6C0F1-D52A-45EE-B952-A4F8D2A55F6E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {13A27793-EB43-4A47-9746-E6160D68C726} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {F391E822-EB5D-42B2-BE86-E31C685D877B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {76DA11D6-DDB6-463D-AEE4-D202423C04DD} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {0125FC6D-0A7A-444D-A844-E64FED7467F1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {BBD7C388-AE45-4658-BFBD-DC64EA8CC691} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8893DB0F-71C9-44C6-9C6F-EF546EDC665C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4CD49EFF-C040-44FE-BBA4-825C3131EF12} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0A1E2EDD-579A-4DC3-890E-CF47DF5CC74E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B262D475-E3CD-4CE9-96CF-465D6F687875} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D9911501-8DD3-4D93-AB7B-8DD6C67305A1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {EF914F20-FE86-451B-93BD-6BC64749501A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {0125FC6D-0A7A-444D-A844-E64FED7467F1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {BBD7C388-AE45-4658-BFBD-DC64EA8CC691} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8893DB0F-71C9-44C6-9C6F-EF546EDC665C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4CD49EFF-C040-44FE-BBA4-825C3131EF12} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0A1E2EDD-579A-4DC3-890E-CF47DF5CC74E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B262D475-E3CD-4CE9-96CF-465D6F687875} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D9911501-8DD3-4D93-AB7B-8DD6C67305A1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {EF914F20-FE86-451B-93BD-6BC64749501A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {4BFC5C66-34E5-431C-B873-35B5A987929B} diff --git a/sdk/src/Services/ServerMigrationService/Generated/AmazonServerMigrationServiceConfig.cs b/sdk/src/Services/ServerMigrationService/Generated/AmazonServerMigrationServiceConfig.cs index ffdf144dd369..2ef137e18a0c 100644 --- a/sdk/src/Services/ServerMigrationService/Generated/AmazonServerMigrationServiceConfig.cs +++ b/sdk/src/Services/ServerMigrationService/Generated/AmazonServerMigrationServiceConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.ServerMigrationService public partial class AmazonServerMigrationServiceConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("SMS", "4.0.0.0"); private static readonly AmazonServerMigrationServiceEndpointResolver EndpointResolver = new AmazonServerMigrationServiceEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("SMS", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("SMS", "3.7.400.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/ServerMigrationService/Properties/AssemblyInfo.cs b/sdk/src/Services/ServerMigrationService/Properties/AssemblyInfo.cs index d072c3c7657f..d32d30aca79d 100644 --- a/sdk/src/Services/ServerMigrationService/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/ServerMigrationService/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/ServerMigrationService/ServerMigrationService.sln b/sdk/src/Services/ServerMigrationService/ServerMigrationService.sln index b4b200a4f008..14471e11059e 100644 --- a/sdk/src/Services/ServerMigrationService/ServerMigrationService.sln +++ b/sdk/src/Services/ServerMigrationService/ServerMigrationService.sln @@ -92,7 +92,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {09B2628A-19A7-4496-BBD8-7DBE73019AD1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {09B2628A-19A7-4496-BBD8-7DBE73019AD1}.Debug|Any CPU.Build.0 = Debug|Any CPU {09B2628A-19A7-4496-BBD8-7DBE73019AD1}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -113,97 +120,6 @@ Global {30F85FDE-FD2B-400C-AD1A-3611ACC35FDA}.Debug|Any CPU.Build.0 = Debug|Any CPU {30F85FDE-FD2B-400C-AD1A-3611ACC35FDA}.Release|Any CPU.ActiveCfg = Release|Any CPU {30F85FDE-FD2B-400C-AD1A-3611ACC35FDA}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {5207D57F-3CDD-4E67-A725-5ECBFB4DF51F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5207D57F-3CDD-4E67-A725-5ECBFB4DF51F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5207D57F-3CDD-4E67-A725-5ECBFB4DF51F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5207D57F-3CDD-4E67-A725-5ECBFB4DF51F}.Release|Any CPU.Build.0 = Release|Any CPU - {D7108EFF-10A0-475E-A0C1-3CEF0D3DE069}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D7108EFF-10A0-475E-A0C1-3CEF0D3DE069}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D7108EFF-10A0-475E-A0C1-3CEF0D3DE069}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D7108EFF-10A0-475E-A0C1-3CEF0D3DE069}.Release|Any CPU.Build.0 = Release|Any CPU - {350D8A26-16E5-4879-A129-8E06A325B440}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {350D8A26-16E5-4879-A129-8E06A325B440}.Debug|Any CPU.Build.0 = Debug|Any CPU - {350D8A26-16E5-4879-A129-8E06A325B440}.Release|Any CPU.ActiveCfg = Release|Any CPU - {350D8A26-16E5-4879-A129-8E06A325B440}.Release|Any CPU.Build.0 = Release|Any CPU - {97B36181-67FF-42AF-B695-1E464A440875}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {97B36181-67FF-42AF-B695-1E464A440875}.Debug|Any CPU.Build.0 = Debug|Any CPU - {97B36181-67FF-42AF-B695-1E464A440875}.Release|Any CPU.ActiveCfg = Release|Any CPU - {97B36181-67FF-42AF-B695-1E464A440875}.Release|Any CPU.Build.0 = Release|Any CPU - {983CD8D9-A245-4DEC-81C9-D080D66F1AB6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {983CD8D9-A245-4DEC-81C9-D080D66F1AB6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {983CD8D9-A245-4DEC-81C9-D080D66F1AB6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {983CD8D9-A245-4DEC-81C9-D080D66F1AB6}.Release|Any CPU.Build.0 = Release|Any CPU - {ACF555FC-CC52-4EC8-988B-84CDA25479C4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {ACF555FC-CC52-4EC8-988B-84CDA25479C4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {ACF555FC-CC52-4EC8-988B-84CDA25479C4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {ACF555FC-CC52-4EC8-988B-84CDA25479C4}.Release|Any CPU.Build.0 = Release|Any CPU - {94F244FB-F2C2-49B6-B60D-ED680AD5614E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {94F244FB-F2C2-49B6-B60D-ED680AD5614E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {94F244FB-F2C2-49B6-B60D-ED680AD5614E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {94F244FB-F2C2-49B6-B60D-ED680AD5614E}.Release|Any CPU.Build.0 = Release|Any CPU - {35D66877-5696-4FBB-9843-FD4D2E59699A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {35D66877-5696-4FBB-9843-FD4D2E59699A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {35D66877-5696-4FBB-9843-FD4D2E59699A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {35D66877-5696-4FBB-9843-FD4D2E59699A}.Release|Any CPU.Build.0 = Release|Any CPU - {03335CDF-0458-461D-8451-7175AA9FFC12}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {03335CDF-0458-461D-8451-7175AA9FFC12}.Debug|Any CPU.Build.0 = Debug|Any CPU - {03335CDF-0458-461D-8451-7175AA9FFC12}.Release|Any CPU.ActiveCfg = Release|Any CPU - {03335CDF-0458-461D-8451-7175AA9FFC12}.Release|Any CPU.Build.0 = Release|Any CPU - {DA0F6685-2020-4B8A-9CD4-BC926DB65748}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DA0F6685-2020-4B8A-9CD4-BC926DB65748}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DA0F6685-2020-4B8A-9CD4-BC926DB65748}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DA0F6685-2020-4B8A-9CD4-BC926DB65748}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {5207D57F-3CDD-4E67-A725-5ECBFB4DF51F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5207D57F-3CDD-4E67-A725-5ECBFB4DF51F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5207D57F-3CDD-4E67-A725-5ECBFB4DF51F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5207D57F-3CDD-4E67-A725-5ECBFB4DF51F}.Release|Any CPU.Build.0 = Release|Any CPU - {D7108EFF-10A0-475E-A0C1-3CEF0D3DE069}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D7108EFF-10A0-475E-A0C1-3CEF0D3DE069}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D7108EFF-10A0-475E-A0C1-3CEF0D3DE069}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D7108EFF-10A0-475E-A0C1-3CEF0D3DE069}.Release|Any CPU.Build.0 = Release|Any CPU - {350D8A26-16E5-4879-A129-8E06A325B440}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {350D8A26-16E5-4879-A129-8E06A325B440}.Debug|Any CPU.Build.0 = Debug|Any CPU - {350D8A26-16E5-4879-A129-8E06A325B440}.Release|Any CPU.ActiveCfg = Release|Any CPU - {350D8A26-16E5-4879-A129-8E06A325B440}.Release|Any CPU.Build.0 = Release|Any CPU - {97B36181-67FF-42AF-B695-1E464A440875}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {97B36181-67FF-42AF-B695-1E464A440875}.Debug|Any CPU.Build.0 = Debug|Any CPU - {97B36181-67FF-42AF-B695-1E464A440875}.Release|Any CPU.ActiveCfg = Release|Any CPU - {97B36181-67FF-42AF-B695-1E464A440875}.Release|Any CPU.Build.0 = Release|Any CPU - {983CD8D9-A245-4DEC-81C9-D080D66F1AB6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {983CD8D9-A245-4DEC-81C9-D080D66F1AB6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {983CD8D9-A245-4DEC-81C9-D080D66F1AB6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {983CD8D9-A245-4DEC-81C9-D080D66F1AB6}.Release|Any CPU.Build.0 = Release|Any CPU - {ACF555FC-CC52-4EC8-988B-84CDA25479C4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {ACF555FC-CC52-4EC8-988B-84CDA25479C4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {ACF555FC-CC52-4EC8-988B-84CDA25479C4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {ACF555FC-CC52-4EC8-988B-84CDA25479C4}.Release|Any CPU.Build.0 = Release|Any CPU - {94F244FB-F2C2-49B6-B60D-ED680AD5614E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {94F244FB-F2C2-49B6-B60D-ED680AD5614E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {94F244FB-F2C2-49B6-B60D-ED680AD5614E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {94F244FB-F2C2-49B6-B60D-ED680AD5614E}.Release|Any CPU.Build.0 = Release|Any CPU - {35D66877-5696-4FBB-9843-FD4D2E59699A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {35D66877-5696-4FBB-9843-FD4D2E59699A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {35D66877-5696-4FBB-9843-FD4D2E59699A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {35D66877-5696-4FBB-9843-FD4D2E59699A}.Release|Any CPU.Build.0 = Release|Any CPU - {03335CDF-0458-461D-8451-7175AA9FFC12}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {03335CDF-0458-461D-8451-7175AA9FFC12}.Debug|Any CPU.Build.0 = Debug|Any CPU - {03335CDF-0458-461D-8451-7175AA9FFC12}.Release|Any CPU.ActiveCfg = Release|Any CPU - {03335CDF-0458-461D-8451-7175AA9FFC12}.Release|Any CPU.Build.0 = Release|Any CPU - {DA0F6685-2020-4B8A-9CD4-BC926DB65748}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DA0F6685-2020-4B8A-9CD4-BC926DB65748}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DA0F6685-2020-4B8A-9CD4-BC926DB65748}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DA0F6685-2020-4B8A-9CD4-BC926DB65748}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -220,37 +136,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {09B2628A-19A7-4496-BBD8-7DBE73019AD1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {D4716000-64D3-4A98-BAD4-3B6A1E03E5EB} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {3285489F-09AF-4BC1-9A0A-67685B55C367} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {293520CC-D300-4086-91E6-F0B6B359D04B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {30F85FDE-FD2B-400C-AD1A-3611ACC35FDA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {5207D57F-3CDD-4E67-A725-5ECBFB4DF51F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D7108EFF-10A0-475E-A0C1-3CEF0D3DE069} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {350D8A26-16E5-4879-A129-8E06A325B440} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {97B36181-67FF-42AF-B695-1E464A440875} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {983CD8D9-A245-4DEC-81C9-D080D66F1AB6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {ACF555FC-CC52-4EC8-988B-84CDA25479C4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {94F244FB-F2C2-49B6-B60D-ED680AD5614E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {35D66877-5696-4FBB-9843-FD4D2E59699A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {03335CDF-0458-461D-8451-7175AA9FFC12} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {DA0F6685-2020-4B8A-9CD4-BC926DB65748} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {5207D57F-3CDD-4E67-A725-5ECBFB4DF51F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D7108EFF-10A0-475E-A0C1-3CEF0D3DE069} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {350D8A26-16E5-4879-A129-8E06A325B440} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {97B36181-67FF-42AF-B695-1E464A440875} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {983CD8D9-A245-4DEC-81C9-D080D66F1AB6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {ACF555FC-CC52-4EC8-988B-84CDA25479C4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {94F244FB-F2C2-49B6-B60D-ED680AD5614E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {35D66877-5696-4FBB-9843-FD4D2E59699A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {03335CDF-0458-461D-8451-7175AA9FFC12} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {DA0F6685-2020-4B8A-9CD4-BC926DB65748} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {7747FF8F-D224-43F1-A53E-C739CE3D5C33} diff --git a/sdk/src/Services/ServerlessApplicationRepository/Generated/AmazonServerlessApplicationRepositoryConfig.cs b/sdk/src/Services/ServerlessApplicationRepository/Generated/AmazonServerlessApplicationRepositoryConfig.cs index 027d19b1603c..a7fe2c15e3fd 100644 --- a/sdk/src/Services/ServerlessApplicationRepository/Generated/AmazonServerlessApplicationRepositoryConfig.cs +++ b/sdk/src/Services/ServerlessApplicationRepository/Generated/AmazonServerlessApplicationRepositoryConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.ServerlessApplicationRepository public partial class AmazonServerlessApplicationRepositoryConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("ServerlessApplicationRepository", "4.0.0.0"); private static readonly AmazonServerlessApplicationRepositoryEndpointResolver EndpointResolver = new AmazonServerlessApplicationRepositoryEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("ServerlessApplicationRepository", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("ServerlessApplicationRepository", "3.7.400.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/ServerlessApplicationRepository/Properties/AssemblyInfo.cs b/sdk/src/Services/ServerlessApplicationRepository/Properties/AssemblyInfo.cs index 229532dc69e9..fb44dd2b4e5b 100644 --- a/sdk/src/Services/ServerlessApplicationRepository/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/ServerlessApplicationRepository/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/ServerlessApplicationRepository/ServerlessApplicationRepository.sln b/sdk/src/Services/ServerlessApplicationRepository/ServerlessApplicationRepository.sln index 4d767c13e32b..3cd3c47437cb 100644 --- a/sdk/src/Services/ServerlessApplicationRepository/ServerlessApplicationRepository.sln +++ b/sdk/src/Services/ServerlessApplicationRepository/ServerlessApplicationRepository.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {A157264E-FDEF-4BB1-83FD-6F670FA48071}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {A157264E-FDEF-4BB1-83FD-6F670FA48071}.Debug|Any CPU.Build.0 = Debug|Any CPU {A157264E-FDEF-4BB1-83FD-6F670FA48071}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {530C46C3-3F97-4F8D-89FB-54B7676A62F1}.Debug|Any CPU.Build.0 = Debug|Any CPU {530C46C3-3F97-4F8D-89FB-54B7676A62F1}.Release|Any CPU.ActiveCfg = Release|Any CPU {530C46C3-3F97-4F8D-89FB-54B7676A62F1}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {69743E7E-46DE-4864-A751-D85BC7B03F19}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {69743E7E-46DE-4864-A751-D85BC7B03F19}.Debug|Any CPU.Build.0 = Debug|Any CPU - {69743E7E-46DE-4864-A751-D85BC7B03F19}.Release|Any CPU.ActiveCfg = Release|Any CPU - {69743E7E-46DE-4864-A751-D85BC7B03F19}.Release|Any CPU.Build.0 = Release|Any CPU - {E4B845B7-FB8F-490E-BB22-8936A6E70B67}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E4B845B7-FB8F-490E-BB22-8936A6E70B67}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E4B845B7-FB8F-490E-BB22-8936A6E70B67}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E4B845B7-FB8F-490E-BB22-8936A6E70B67}.Release|Any CPU.Build.0 = Release|Any CPU - {2A4F0E79-45E5-40BC-920F-5BFE773A35D0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2A4F0E79-45E5-40BC-920F-5BFE773A35D0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2A4F0E79-45E5-40BC-920F-5BFE773A35D0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2A4F0E79-45E5-40BC-920F-5BFE773A35D0}.Release|Any CPU.Build.0 = Release|Any CPU - {09E03803-6665-4170-8822-31613220E717}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {09E03803-6665-4170-8822-31613220E717}.Debug|Any CPU.Build.0 = Debug|Any CPU - {09E03803-6665-4170-8822-31613220E717}.Release|Any CPU.ActiveCfg = Release|Any CPU - {09E03803-6665-4170-8822-31613220E717}.Release|Any CPU.Build.0 = Release|Any CPU - {C0151062-5377-4C31-8883-C75ABEFA6F9E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C0151062-5377-4C31-8883-C75ABEFA6F9E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C0151062-5377-4C31-8883-C75ABEFA6F9E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C0151062-5377-4C31-8883-C75ABEFA6F9E}.Release|Any CPU.Build.0 = Release|Any CPU - {5228BE0A-1FAE-4F3A-AE4D-8D4D90F5450A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5228BE0A-1FAE-4F3A-AE4D-8D4D90F5450A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5228BE0A-1FAE-4F3A-AE4D-8D4D90F5450A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5228BE0A-1FAE-4F3A-AE4D-8D4D90F5450A}.Release|Any CPU.Build.0 = Release|Any CPU - {EDE1D044-29A7-4B9A-A651-6ABA47454422}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EDE1D044-29A7-4B9A-A651-6ABA47454422}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EDE1D044-29A7-4B9A-A651-6ABA47454422}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EDE1D044-29A7-4B9A-A651-6ABA47454422}.Release|Any CPU.Build.0 = Release|Any CPU - {65695605-9A2F-48A9-ABB9-1CE893F8BE24}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {65695605-9A2F-48A9-ABB9-1CE893F8BE24}.Debug|Any CPU.Build.0 = Debug|Any CPU - {65695605-9A2F-48A9-ABB9-1CE893F8BE24}.Release|Any CPU.ActiveCfg = Release|Any CPU - {65695605-9A2F-48A9-ABB9-1CE893F8BE24}.Release|Any CPU.Build.0 = Release|Any CPU - {E7736E5F-5DAC-471C-89FA-CA5BA71B6AB8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E7736E5F-5DAC-471C-89FA-CA5BA71B6AB8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E7736E5F-5DAC-471C-89FA-CA5BA71B6AB8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E7736E5F-5DAC-471C-89FA-CA5BA71B6AB8}.Release|Any CPU.Build.0 = Release|Any CPU - {6FC855BB-F317-4016-8504-1715C1284802}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6FC855BB-F317-4016-8504-1715C1284802}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6FC855BB-F317-4016-8504-1715C1284802}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6FC855BB-F317-4016-8504-1715C1284802}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {69743E7E-46DE-4864-A751-D85BC7B03F19}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {69743E7E-46DE-4864-A751-D85BC7B03F19}.Debug|Any CPU.Build.0 = Debug|Any CPU - {69743E7E-46DE-4864-A751-D85BC7B03F19}.Release|Any CPU.ActiveCfg = Release|Any CPU - {69743E7E-46DE-4864-A751-D85BC7B03F19}.Release|Any CPU.Build.0 = Release|Any CPU - {E4B845B7-FB8F-490E-BB22-8936A6E70B67}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E4B845B7-FB8F-490E-BB22-8936A6E70B67}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E4B845B7-FB8F-490E-BB22-8936A6E70B67}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E4B845B7-FB8F-490E-BB22-8936A6E70B67}.Release|Any CPU.Build.0 = Release|Any CPU - {2A4F0E79-45E5-40BC-920F-5BFE773A35D0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2A4F0E79-45E5-40BC-920F-5BFE773A35D0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2A4F0E79-45E5-40BC-920F-5BFE773A35D0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2A4F0E79-45E5-40BC-920F-5BFE773A35D0}.Release|Any CPU.Build.0 = Release|Any CPU - {09E03803-6665-4170-8822-31613220E717}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {09E03803-6665-4170-8822-31613220E717}.Debug|Any CPU.Build.0 = Debug|Any CPU - {09E03803-6665-4170-8822-31613220E717}.Release|Any CPU.ActiveCfg = Release|Any CPU - {09E03803-6665-4170-8822-31613220E717}.Release|Any CPU.Build.0 = Release|Any CPU - {C0151062-5377-4C31-8883-C75ABEFA6F9E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C0151062-5377-4C31-8883-C75ABEFA6F9E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C0151062-5377-4C31-8883-C75ABEFA6F9E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C0151062-5377-4C31-8883-C75ABEFA6F9E}.Release|Any CPU.Build.0 = Release|Any CPU - {5228BE0A-1FAE-4F3A-AE4D-8D4D90F5450A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5228BE0A-1FAE-4F3A-AE4D-8D4D90F5450A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5228BE0A-1FAE-4F3A-AE4D-8D4D90F5450A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5228BE0A-1FAE-4F3A-AE4D-8D4D90F5450A}.Release|Any CPU.Build.0 = Release|Any CPU - {EDE1D044-29A7-4B9A-A651-6ABA47454422}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EDE1D044-29A7-4B9A-A651-6ABA47454422}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EDE1D044-29A7-4B9A-A651-6ABA47454422}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EDE1D044-29A7-4B9A-A651-6ABA47454422}.Release|Any CPU.Build.0 = Release|Any CPU - {65695605-9A2F-48A9-ABB9-1CE893F8BE24}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {65695605-9A2F-48A9-ABB9-1CE893F8BE24}.Debug|Any CPU.Build.0 = Debug|Any CPU - {65695605-9A2F-48A9-ABB9-1CE893F8BE24}.Release|Any CPU.ActiveCfg = Release|Any CPU - {65695605-9A2F-48A9-ABB9-1CE893F8BE24}.Release|Any CPU.Build.0 = Release|Any CPU - {E7736E5F-5DAC-471C-89FA-CA5BA71B6AB8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E7736E5F-5DAC-471C-89FA-CA5BA71B6AB8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E7736E5F-5DAC-471C-89FA-CA5BA71B6AB8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E7736E5F-5DAC-471C-89FA-CA5BA71B6AB8}.Release|Any CPU.Build.0 = Release|Any CPU - {6FC855BB-F317-4016-8504-1715C1284802}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6FC855BB-F317-4016-8504-1715C1284802}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6FC855BB-F317-4016-8504-1715C1284802}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6FC855BB-F317-4016-8504-1715C1284802}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {A157264E-FDEF-4BB1-83FD-6F670FA48071} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {C92093BE-F128-468D-9418-9F2B04808E35} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {B718BAC3-F473-4B43-8369-010C0CA96480} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {36B02408-DA35-4D67-9F46-7309AAF33568} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {530C46C3-3F97-4F8D-89FB-54B7676A62F1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {69743E7E-46DE-4864-A751-D85BC7B03F19} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E4B845B7-FB8F-490E-BB22-8936A6E70B67} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {2A4F0E79-45E5-40BC-920F-5BFE773A35D0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {09E03803-6665-4170-8822-31613220E717} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C0151062-5377-4C31-8883-C75ABEFA6F9E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {5228BE0A-1FAE-4F3A-AE4D-8D4D90F5450A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {EDE1D044-29A7-4B9A-A651-6ABA47454422} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {65695605-9A2F-48A9-ABB9-1CE893F8BE24} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E7736E5F-5DAC-471C-89FA-CA5BA71B6AB8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6FC855BB-F317-4016-8504-1715C1284802} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {69743E7E-46DE-4864-A751-D85BC7B03F19} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E4B845B7-FB8F-490E-BB22-8936A6E70B67} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {2A4F0E79-45E5-40BC-920F-5BFE773A35D0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {09E03803-6665-4170-8822-31613220E717} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C0151062-5377-4C31-8883-C75ABEFA6F9E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {5228BE0A-1FAE-4F3A-AE4D-8D4D90F5450A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {EDE1D044-29A7-4B9A-A651-6ABA47454422} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {65695605-9A2F-48A9-ABB9-1CE893F8BE24} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E7736E5F-5DAC-471C-89FA-CA5BA71B6AB8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6FC855BB-F317-4016-8504-1715C1284802} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {282DD524-EA22-44C7-93CA-650C349C2807} diff --git a/sdk/src/Services/ServiceCatalog/Generated/AmazonServiceCatalogConfig.cs b/sdk/src/Services/ServiceCatalog/Generated/AmazonServiceCatalogConfig.cs index 8fc3fa484277..98e85a372840 100644 --- a/sdk/src/Services/ServiceCatalog/Generated/AmazonServiceCatalogConfig.cs +++ b/sdk/src/Services/ServiceCatalog/Generated/AmazonServiceCatalogConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.ServiceCatalog public partial class AmazonServiceCatalogConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("Service Catalog", "4.0.0.0"); private static readonly AmazonServiceCatalogEndpointResolver EndpointResolver = new AmazonServiceCatalogEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("Service Catalog", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("Service Catalog", "3.7.400.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/ServiceCatalog/Properties/AssemblyInfo.cs b/sdk/src/Services/ServiceCatalog/Properties/AssemblyInfo.cs index 898e850f3ae7..b6ab053444c4 100644 --- a/sdk/src/Services/ServiceCatalog/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/ServiceCatalog/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/ServiceCatalog/ServiceCatalog.sln b/sdk/src/Services/ServiceCatalog/ServiceCatalog.sln index 9bddecc96840..6bed9e17802d 100644 --- a/sdk/src/Services/ServiceCatalog/ServiceCatalog.sln +++ b/sdk/src/Services/ServiceCatalog/ServiceCatalog.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {A69FBC26-5BCA-4DD2-B24D-99DEE6A8090A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {A69FBC26-5BCA-4DD2-B24D-99DEE6A8090A}.Debug|Any CPU.Build.0 = Debug|Any CPU {A69FBC26-5BCA-4DD2-B24D-99DEE6A8090A}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {3E4F63C8-D92F-43AB-951F-52FD2831A09A}.Debug|Any CPU.Build.0 = Debug|Any CPU {3E4F63C8-D92F-43AB-951F-52FD2831A09A}.Release|Any CPU.ActiveCfg = Release|Any CPU {3E4F63C8-D92F-43AB-951F-52FD2831A09A}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {655C197E-21CC-483A-BB7E-DADA5F9FF4DF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {655C197E-21CC-483A-BB7E-DADA5F9FF4DF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {655C197E-21CC-483A-BB7E-DADA5F9FF4DF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {655C197E-21CC-483A-BB7E-DADA5F9FF4DF}.Release|Any CPU.Build.0 = Release|Any CPU - {D49DB353-D25F-4287-B545-329DC823FAA5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D49DB353-D25F-4287-B545-329DC823FAA5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D49DB353-D25F-4287-B545-329DC823FAA5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D49DB353-D25F-4287-B545-329DC823FAA5}.Release|Any CPU.Build.0 = Release|Any CPU - {066485F1-52A1-4A30-B30B-5ED07D816876}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {066485F1-52A1-4A30-B30B-5ED07D816876}.Debug|Any CPU.Build.0 = Debug|Any CPU - {066485F1-52A1-4A30-B30B-5ED07D816876}.Release|Any CPU.ActiveCfg = Release|Any CPU - {066485F1-52A1-4A30-B30B-5ED07D816876}.Release|Any CPU.Build.0 = Release|Any CPU - {E1461BF7-8719-45C7-9AE9-21195F94E2C5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E1461BF7-8719-45C7-9AE9-21195F94E2C5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E1461BF7-8719-45C7-9AE9-21195F94E2C5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E1461BF7-8719-45C7-9AE9-21195F94E2C5}.Release|Any CPU.Build.0 = Release|Any CPU - {97CDB53A-691C-4807-A812-45CBEB58FD41}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {97CDB53A-691C-4807-A812-45CBEB58FD41}.Debug|Any CPU.Build.0 = Debug|Any CPU - {97CDB53A-691C-4807-A812-45CBEB58FD41}.Release|Any CPU.ActiveCfg = Release|Any CPU - {97CDB53A-691C-4807-A812-45CBEB58FD41}.Release|Any CPU.Build.0 = Release|Any CPU - {A4578C36-3E1E-4454-9F8B-FF2DCB4A5870}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A4578C36-3E1E-4454-9F8B-FF2DCB4A5870}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A4578C36-3E1E-4454-9F8B-FF2DCB4A5870}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A4578C36-3E1E-4454-9F8B-FF2DCB4A5870}.Release|Any CPU.Build.0 = Release|Any CPU - {B689F42C-3268-492A-AD7C-62C2368E739B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B689F42C-3268-492A-AD7C-62C2368E739B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B689F42C-3268-492A-AD7C-62C2368E739B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B689F42C-3268-492A-AD7C-62C2368E739B}.Release|Any CPU.Build.0 = Release|Any CPU - {F032C24B-B1A5-4A77-858E-CF8FE77C46DB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F032C24B-B1A5-4A77-858E-CF8FE77C46DB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F032C24B-B1A5-4A77-858E-CF8FE77C46DB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F032C24B-B1A5-4A77-858E-CF8FE77C46DB}.Release|Any CPU.Build.0 = Release|Any CPU - {168CD619-CBDB-47CB-81F6-D50AA5030992}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {168CD619-CBDB-47CB-81F6-D50AA5030992}.Debug|Any CPU.Build.0 = Debug|Any CPU - {168CD619-CBDB-47CB-81F6-D50AA5030992}.Release|Any CPU.ActiveCfg = Release|Any CPU - {168CD619-CBDB-47CB-81F6-D50AA5030992}.Release|Any CPU.Build.0 = Release|Any CPU - {42BFE82F-0F5C-4AA7-839B-13BF52CAFB11}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {42BFE82F-0F5C-4AA7-839B-13BF52CAFB11}.Debug|Any CPU.Build.0 = Debug|Any CPU - {42BFE82F-0F5C-4AA7-839B-13BF52CAFB11}.Release|Any CPU.ActiveCfg = Release|Any CPU - {42BFE82F-0F5C-4AA7-839B-13BF52CAFB11}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {655C197E-21CC-483A-BB7E-DADA5F9FF4DF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {655C197E-21CC-483A-BB7E-DADA5F9FF4DF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {655C197E-21CC-483A-BB7E-DADA5F9FF4DF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {655C197E-21CC-483A-BB7E-DADA5F9FF4DF}.Release|Any CPU.Build.0 = Release|Any CPU - {D49DB353-D25F-4287-B545-329DC823FAA5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D49DB353-D25F-4287-B545-329DC823FAA5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D49DB353-D25F-4287-B545-329DC823FAA5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D49DB353-D25F-4287-B545-329DC823FAA5}.Release|Any CPU.Build.0 = Release|Any CPU - {066485F1-52A1-4A30-B30B-5ED07D816876}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {066485F1-52A1-4A30-B30B-5ED07D816876}.Debug|Any CPU.Build.0 = Debug|Any CPU - {066485F1-52A1-4A30-B30B-5ED07D816876}.Release|Any CPU.ActiveCfg = Release|Any CPU - {066485F1-52A1-4A30-B30B-5ED07D816876}.Release|Any CPU.Build.0 = Release|Any CPU - {E1461BF7-8719-45C7-9AE9-21195F94E2C5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E1461BF7-8719-45C7-9AE9-21195F94E2C5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E1461BF7-8719-45C7-9AE9-21195F94E2C5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E1461BF7-8719-45C7-9AE9-21195F94E2C5}.Release|Any CPU.Build.0 = Release|Any CPU - {97CDB53A-691C-4807-A812-45CBEB58FD41}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {97CDB53A-691C-4807-A812-45CBEB58FD41}.Debug|Any CPU.Build.0 = Debug|Any CPU - {97CDB53A-691C-4807-A812-45CBEB58FD41}.Release|Any CPU.ActiveCfg = Release|Any CPU - {97CDB53A-691C-4807-A812-45CBEB58FD41}.Release|Any CPU.Build.0 = Release|Any CPU - {A4578C36-3E1E-4454-9F8B-FF2DCB4A5870}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A4578C36-3E1E-4454-9F8B-FF2DCB4A5870}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A4578C36-3E1E-4454-9F8B-FF2DCB4A5870}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A4578C36-3E1E-4454-9F8B-FF2DCB4A5870}.Release|Any CPU.Build.0 = Release|Any CPU - {B689F42C-3268-492A-AD7C-62C2368E739B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B689F42C-3268-492A-AD7C-62C2368E739B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B689F42C-3268-492A-AD7C-62C2368E739B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B689F42C-3268-492A-AD7C-62C2368E739B}.Release|Any CPU.Build.0 = Release|Any CPU - {F032C24B-B1A5-4A77-858E-CF8FE77C46DB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F032C24B-B1A5-4A77-858E-CF8FE77C46DB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F032C24B-B1A5-4A77-858E-CF8FE77C46DB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F032C24B-B1A5-4A77-858E-CF8FE77C46DB}.Release|Any CPU.Build.0 = Release|Any CPU - {168CD619-CBDB-47CB-81F6-D50AA5030992}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {168CD619-CBDB-47CB-81F6-D50AA5030992}.Debug|Any CPU.Build.0 = Debug|Any CPU - {168CD619-CBDB-47CB-81F6-D50AA5030992}.Release|Any CPU.ActiveCfg = Release|Any CPU - {168CD619-CBDB-47CB-81F6-D50AA5030992}.Release|Any CPU.Build.0 = Release|Any CPU - {42BFE82F-0F5C-4AA7-839B-13BF52CAFB11}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {42BFE82F-0F5C-4AA7-839B-13BF52CAFB11}.Debug|Any CPU.Build.0 = Debug|Any CPU - {42BFE82F-0F5C-4AA7-839B-13BF52CAFB11}.Release|Any CPU.ActiveCfg = Release|Any CPU - {42BFE82F-0F5C-4AA7-839B-13BF52CAFB11}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {A69FBC26-5BCA-4DD2-B24D-99DEE6A8090A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {81F4567A-F42B-41B6-879A-647DC1B46463} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {519560CB-9B03-43F2-A302-9567E05545DE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {057FAF02-E4E2-4D22-AA10-FA8DAD4E0AF2} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {3E4F63C8-D92F-43AB-951F-52FD2831A09A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {655C197E-21CC-483A-BB7E-DADA5F9FF4DF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D49DB353-D25F-4287-B545-329DC823FAA5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {066485F1-52A1-4A30-B30B-5ED07D816876} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E1461BF7-8719-45C7-9AE9-21195F94E2C5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {97CDB53A-691C-4807-A812-45CBEB58FD41} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A4578C36-3E1E-4454-9F8B-FF2DCB4A5870} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B689F42C-3268-492A-AD7C-62C2368E739B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F032C24B-B1A5-4A77-858E-CF8FE77C46DB} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {168CD619-CBDB-47CB-81F6-D50AA5030992} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {42BFE82F-0F5C-4AA7-839B-13BF52CAFB11} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {655C197E-21CC-483A-BB7E-DADA5F9FF4DF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D49DB353-D25F-4287-B545-329DC823FAA5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {066485F1-52A1-4A30-B30B-5ED07D816876} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E1461BF7-8719-45C7-9AE9-21195F94E2C5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {97CDB53A-691C-4807-A812-45CBEB58FD41} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A4578C36-3E1E-4454-9F8B-FF2DCB4A5870} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B689F42C-3268-492A-AD7C-62C2368E739B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F032C24B-B1A5-4A77-858E-CF8FE77C46DB} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {168CD619-CBDB-47CB-81F6-D50AA5030992} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {42BFE82F-0F5C-4AA7-839B-13BF52CAFB11} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {AB6E3EE7-D6B4-4A49-8097-E8FA720BAC31} diff --git a/sdk/src/Services/ServiceDiscovery/Generated/AmazonServiceDiscoveryConfig.cs b/sdk/src/Services/ServiceDiscovery/Generated/AmazonServiceDiscoveryConfig.cs index a5d9995b3ebd..f58903de5ccb 100644 --- a/sdk/src/Services/ServiceDiscovery/Generated/AmazonServiceDiscoveryConfig.cs +++ b/sdk/src/Services/ServiceDiscovery/Generated/AmazonServiceDiscoveryConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.ServiceDiscovery public partial class AmazonServiceDiscoveryConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("ServiceDiscovery", "4.0.0.0"); private static readonly AmazonServiceDiscoveryEndpointResolver EndpointResolver = new AmazonServiceDiscoveryEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("ServiceDiscovery", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("ServiceDiscovery", "3.7.400.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/ServiceDiscovery/Properties/AssemblyInfo.cs b/sdk/src/Services/ServiceDiscovery/Properties/AssemblyInfo.cs index 21491bef8411..2d2cbab0647b 100644 --- a/sdk/src/Services/ServiceDiscovery/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/ServiceDiscovery/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/ServiceDiscovery/ServiceDiscovery.sln b/sdk/src/Services/ServiceDiscovery/ServiceDiscovery.sln index c981a3791057..8bd02f6eb8aa 100644 --- a/sdk/src/Services/ServiceDiscovery/ServiceDiscovery.sln +++ b/sdk/src/Services/ServiceDiscovery/ServiceDiscovery.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {35A81C9D-097F-4887-A9EF-B50DA5B400BC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {35A81C9D-097F-4887-A9EF-B50DA5B400BC}.Debug|Any CPU.Build.0 = Debug|Any CPU {35A81C9D-097F-4887-A9EF-B50DA5B400BC}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {88A3F217-D980-4A32-AC87-38B7D7BABD1F}.Debug|Any CPU.Build.0 = Debug|Any CPU {88A3F217-D980-4A32-AC87-38B7D7BABD1F}.Release|Any CPU.ActiveCfg = Release|Any CPU {88A3F217-D980-4A32-AC87-38B7D7BABD1F}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {A7BAC6CA-5E6A-4BC2-99E0-EFA74F698C38}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A7BAC6CA-5E6A-4BC2-99E0-EFA74F698C38}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A7BAC6CA-5E6A-4BC2-99E0-EFA74F698C38}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A7BAC6CA-5E6A-4BC2-99E0-EFA74F698C38}.Release|Any CPU.Build.0 = Release|Any CPU - {0DE3137E-3520-4B8F-9E6D-A3E637B7A1F8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0DE3137E-3520-4B8F-9E6D-A3E637B7A1F8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0DE3137E-3520-4B8F-9E6D-A3E637B7A1F8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0DE3137E-3520-4B8F-9E6D-A3E637B7A1F8}.Release|Any CPU.Build.0 = Release|Any CPU - {5B9EAD63-5D85-4FB9-84F2-E69803CBAAC8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5B9EAD63-5D85-4FB9-84F2-E69803CBAAC8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5B9EAD63-5D85-4FB9-84F2-E69803CBAAC8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5B9EAD63-5D85-4FB9-84F2-E69803CBAAC8}.Release|Any CPU.Build.0 = Release|Any CPU - {0D3FA3AF-C83B-49F9-86C3-84E453100F12}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0D3FA3AF-C83B-49F9-86C3-84E453100F12}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0D3FA3AF-C83B-49F9-86C3-84E453100F12}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0D3FA3AF-C83B-49F9-86C3-84E453100F12}.Release|Any CPU.Build.0 = Release|Any CPU - {240D2744-9016-42D0-8082-A529682D1283}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {240D2744-9016-42D0-8082-A529682D1283}.Debug|Any CPU.Build.0 = Debug|Any CPU - {240D2744-9016-42D0-8082-A529682D1283}.Release|Any CPU.ActiveCfg = Release|Any CPU - {240D2744-9016-42D0-8082-A529682D1283}.Release|Any CPU.Build.0 = Release|Any CPU - {D1EC0C86-9936-4800-A11A-1F15255B5ED0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D1EC0C86-9936-4800-A11A-1F15255B5ED0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D1EC0C86-9936-4800-A11A-1F15255B5ED0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D1EC0C86-9936-4800-A11A-1F15255B5ED0}.Release|Any CPU.Build.0 = Release|Any CPU - {B39F86DE-CBDA-4EB6-9B57-52588B431FA5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B39F86DE-CBDA-4EB6-9B57-52588B431FA5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B39F86DE-CBDA-4EB6-9B57-52588B431FA5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B39F86DE-CBDA-4EB6-9B57-52588B431FA5}.Release|Any CPU.Build.0 = Release|Any CPU - {72F30213-8AD7-47AB-B659-9846AF292654}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {72F30213-8AD7-47AB-B659-9846AF292654}.Debug|Any CPU.Build.0 = Debug|Any CPU - {72F30213-8AD7-47AB-B659-9846AF292654}.Release|Any CPU.ActiveCfg = Release|Any CPU - {72F30213-8AD7-47AB-B659-9846AF292654}.Release|Any CPU.Build.0 = Release|Any CPU - {03EE7233-17B7-4C50-AC27-DD367D0F7494}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {03EE7233-17B7-4C50-AC27-DD367D0F7494}.Debug|Any CPU.Build.0 = Debug|Any CPU - {03EE7233-17B7-4C50-AC27-DD367D0F7494}.Release|Any CPU.ActiveCfg = Release|Any CPU - {03EE7233-17B7-4C50-AC27-DD367D0F7494}.Release|Any CPU.Build.0 = Release|Any CPU - {A3F87A24-2CDC-46D7-B0BA-BDF5C077F592}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A3F87A24-2CDC-46D7-B0BA-BDF5C077F592}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A3F87A24-2CDC-46D7-B0BA-BDF5C077F592}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A3F87A24-2CDC-46D7-B0BA-BDF5C077F592}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {A7BAC6CA-5E6A-4BC2-99E0-EFA74F698C38}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A7BAC6CA-5E6A-4BC2-99E0-EFA74F698C38}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A7BAC6CA-5E6A-4BC2-99E0-EFA74F698C38}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A7BAC6CA-5E6A-4BC2-99E0-EFA74F698C38}.Release|Any CPU.Build.0 = Release|Any CPU - {0DE3137E-3520-4B8F-9E6D-A3E637B7A1F8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0DE3137E-3520-4B8F-9E6D-A3E637B7A1F8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0DE3137E-3520-4B8F-9E6D-A3E637B7A1F8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0DE3137E-3520-4B8F-9E6D-A3E637B7A1F8}.Release|Any CPU.Build.0 = Release|Any CPU - {5B9EAD63-5D85-4FB9-84F2-E69803CBAAC8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5B9EAD63-5D85-4FB9-84F2-E69803CBAAC8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5B9EAD63-5D85-4FB9-84F2-E69803CBAAC8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5B9EAD63-5D85-4FB9-84F2-E69803CBAAC8}.Release|Any CPU.Build.0 = Release|Any CPU - {0D3FA3AF-C83B-49F9-86C3-84E453100F12}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0D3FA3AF-C83B-49F9-86C3-84E453100F12}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0D3FA3AF-C83B-49F9-86C3-84E453100F12}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0D3FA3AF-C83B-49F9-86C3-84E453100F12}.Release|Any CPU.Build.0 = Release|Any CPU - {240D2744-9016-42D0-8082-A529682D1283}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {240D2744-9016-42D0-8082-A529682D1283}.Debug|Any CPU.Build.0 = Debug|Any CPU - {240D2744-9016-42D0-8082-A529682D1283}.Release|Any CPU.ActiveCfg = Release|Any CPU - {240D2744-9016-42D0-8082-A529682D1283}.Release|Any CPU.Build.0 = Release|Any CPU - {D1EC0C86-9936-4800-A11A-1F15255B5ED0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D1EC0C86-9936-4800-A11A-1F15255B5ED0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D1EC0C86-9936-4800-A11A-1F15255B5ED0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D1EC0C86-9936-4800-A11A-1F15255B5ED0}.Release|Any CPU.Build.0 = Release|Any CPU - {B39F86DE-CBDA-4EB6-9B57-52588B431FA5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B39F86DE-CBDA-4EB6-9B57-52588B431FA5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B39F86DE-CBDA-4EB6-9B57-52588B431FA5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B39F86DE-CBDA-4EB6-9B57-52588B431FA5}.Release|Any CPU.Build.0 = Release|Any CPU - {72F30213-8AD7-47AB-B659-9846AF292654}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {72F30213-8AD7-47AB-B659-9846AF292654}.Debug|Any CPU.Build.0 = Debug|Any CPU - {72F30213-8AD7-47AB-B659-9846AF292654}.Release|Any CPU.ActiveCfg = Release|Any CPU - {72F30213-8AD7-47AB-B659-9846AF292654}.Release|Any CPU.Build.0 = Release|Any CPU - {03EE7233-17B7-4C50-AC27-DD367D0F7494}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {03EE7233-17B7-4C50-AC27-DD367D0F7494}.Debug|Any CPU.Build.0 = Debug|Any CPU - {03EE7233-17B7-4C50-AC27-DD367D0F7494}.Release|Any CPU.ActiveCfg = Release|Any CPU - {03EE7233-17B7-4C50-AC27-DD367D0F7494}.Release|Any CPU.Build.0 = Release|Any CPU - {A3F87A24-2CDC-46D7-B0BA-BDF5C077F592}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A3F87A24-2CDC-46D7-B0BA-BDF5C077F592}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A3F87A24-2CDC-46D7-B0BA-BDF5C077F592}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A3F87A24-2CDC-46D7-B0BA-BDF5C077F592}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {35A81C9D-097F-4887-A9EF-B50DA5B400BC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {995218F2-FBC9-4F5C-97C2-89801462367C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {0D8B1D4E-B77E-4BCF-9B67-7DCCA73F8C3C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {B305A567-FF83-4D73-80EB-D394EF1C4902} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {88A3F217-D980-4A32-AC87-38B7D7BABD1F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {A7BAC6CA-5E6A-4BC2-99E0-EFA74F698C38} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0DE3137E-3520-4B8F-9E6D-A3E637B7A1F8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {5B9EAD63-5D85-4FB9-84F2-E69803CBAAC8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0D3FA3AF-C83B-49F9-86C3-84E453100F12} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {240D2744-9016-42D0-8082-A529682D1283} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D1EC0C86-9936-4800-A11A-1F15255B5ED0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B39F86DE-CBDA-4EB6-9B57-52588B431FA5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {72F30213-8AD7-47AB-B659-9846AF292654} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {03EE7233-17B7-4C50-AC27-DD367D0F7494} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A3F87A24-2CDC-46D7-B0BA-BDF5C077F592} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {A7BAC6CA-5E6A-4BC2-99E0-EFA74F698C38} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0DE3137E-3520-4B8F-9E6D-A3E637B7A1F8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {5B9EAD63-5D85-4FB9-84F2-E69803CBAAC8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0D3FA3AF-C83B-49F9-86C3-84E453100F12} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {240D2744-9016-42D0-8082-A529682D1283} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D1EC0C86-9936-4800-A11A-1F15255B5ED0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B39F86DE-CBDA-4EB6-9B57-52588B431FA5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {72F30213-8AD7-47AB-B659-9846AF292654} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {03EE7233-17B7-4C50-AC27-DD367D0F7494} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A3F87A24-2CDC-46D7-B0BA-BDF5C077F592} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {4E8D0494-DF69-4807-906D-629D1BC22F93} diff --git a/sdk/src/Services/ServiceQuotas/Generated/AmazonServiceQuotasConfig.cs b/sdk/src/Services/ServiceQuotas/Generated/AmazonServiceQuotasConfig.cs index 7bc9962d57ea..5cdccd888b91 100644 --- a/sdk/src/Services/ServiceQuotas/Generated/AmazonServiceQuotasConfig.cs +++ b/sdk/src/Services/ServiceQuotas/Generated/AmazonServiceQuotasConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.ServiceQuotas public partial class AmazonServiceQuotasConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("Service Quotas", "4.0.0.0"); private static readonly AmazonServiceQuotasEndpointResolver EndpointResolver = new AmazonServiceQuotasEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("Service Quotas", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("Service Quotas", "3.7.400.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/ServiceQuotas/Properties/AssemblyInfo.cs b/sdk/src/Services/ServiceQuotas/Properties/AssemblyInfo.cs index 344fad035f5e..d02ebddfbd21 100644 --- a/sdk/src/Services/ServiceQuotas/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/ServiceQuotas/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/ServiceQuotas/ServiceQuotas.sln b/sdk/src/Services/ServiceQuotas/ServiceQuotas.sln index c96eebd66089..4a28813f29c3 100644 --- a/sdk/src/Services/ServiceQuotas/ServiceQuotas.sln +++ b/sdk/src/Services/ServiceQuotas/ServiceQuotas.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {B682BD97-9EB6-4CDC-B4FC-E5472007772A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {B682BD97-9EB6-4CDC-B4FC-E5472007772A}.Debug|Any CPU.Build.0 = Debug|Any CPU {B682BD97-9EB6-4CDC-B4FC-E5472007772A}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {255A6EFA-C8E0-4091-AAA6-731F01F2C3B9}.Debug|Any CPU.Build.0 = Debug|Any CPU {255A6EFA-C8E0-4091-AAA6-731F01F2C3B9}.Release|Any CPU.ActiveCfg = Release|Any CPU {255A6EFA-C8E0-4091-AAA6-731F01F2C3B9}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {5281088C-4414-420F-9D51-E196503298A6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5281088C-4414-420F-9D51-E196503298A6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5281088C-4414-420F-9D51-E196503298A6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5281088C-4414-420F-9D51-E196503298A6}.Release|Any CPU.Build.0 = Release|Any CPU - {F213E429-A692-44F7-A4AC-63362A319113}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F213E429-A692-44F7-A4AC-63362A319113}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F213E429-A692-44F7-A4AC-63362A319113}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F213E429-A692-44F7-A4AC-63362A319113}.Release|Any CPU.Build.0 = Release|Any CPU - {858CEB6A-90C5-4023-AB49-4AE3378D2A82}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {858CEB6A-90C5-4023-AB49-4AE3378D2A82}.Debug|Any CPU.Build.0 = Debug|Any CPU - {858CEB6A-90C5-4023-AB49-4AE3378D2A82}.Release|Any CPU.ActiveCfg = Release|Any CPU - {858CEB6A-90C5-4023-AB49-4AE3378D2A82}.Release|Any CPU.Build.0 = Release|Any CPU - {26593D10-FB57-4868-B162-282AA14037F3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {26593D10-FB57-4868-B162-282AA14037F3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {26593D10-FB57-4868-B162-282AA14037F3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {26593D10-FB57-4868-B162-282AA14037F3}.Release|Any CPU.Build.0 = Release|Any CPU - {0CE02E66-268F-483D-9B2A-32CA9C3F0EA0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0CE02E66-268F-483D-9B2A-32CA9C3F0EA0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0CE02E66-268F-483D-9B2A-32CA9C3F0EA0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0CE02E66-268F-483D-9B2A-32CA9C3F0EA0}.Release|Any CPU.Build.0 = Release|Any CPU - {97A561D3-C0D2-43F4-8AAC-0E6FC7B80039}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {97A561D3-C0D2-43F4-8AAC-0E6FC7B80039}.Debug|Any CPU.Build.0 = Debug|Any CPU - {97A561D3-C0D2-43F4-8AAC-0E6FC7B80039}.Release|Any CPU.ActiveCfg = Release|Any CPU - {97A561D3-C0D2-43F4-8AAC-0E6FC7B80039}.Release|Any CPU.Build.0 = Release|Any CPU - {B903BB73-0B21-443E-80DE-B3E30A7905DF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B903BB73-0B21-443E-80DE-B3E30A7905DF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B903BB73-0B21-443E-80DE-B3E30A7905DF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B903BB73-0B21-443E-80DE-B3E30A7905DF}.Release|Any CPU.Build.0 = Release|Any CPU - {EBE22F40-960A-4821-A506-A24EFD8150FF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EBE22F40-960A-4821-A506-A24EFD8150FF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EBE22F40-960A-4821-A506-A24EFD8150FF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EBE22F40-960A-4821-A506-A24EFD8150FF}.Release|Any CPU.Build.0 = Release|Any CPU - {2BA0E91D-406B-4B5A-942C-4EDF4BF2C928}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2BA0E91D-406B-4B5A-942C-4EDF4BF2C928}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2BA0E91D-406B-4B5A-942C-4EDF4BF2C928}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2BA0E91D-406B-4B5A-942C-4EDF4BF2C928}.Release|Any CPU.Build.0 = Release|Any CPU - {013C964B-DD5C-48C3-98BD-31F4E62EB58A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {013C964B-DD5C-48C3-98BD-31F4E62EB58A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {013C964B-DD5C-48C3-98BD-31F4E62EB58A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {013C964B-DD5C-48C3-98BD-31F4E62EB58A}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {5281088C-4414-420F-9D51-E196503298A6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5281088C-4414-420F-9D51-E196503298A6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5281088C-4414-420F-9D51-E196503298A6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5281088C-4414-420F-9D51-E196503298A6}.Release|Any CPU.Build.0 = Release|Any CPU - {F213E429-A692-44F7-A4AC-63362A319113}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F213E429-A692-44F7-A4AC-63362A319113}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F213E429-A692-44F7-A4AC-63362A319113}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F213E429-A692-44F7-A4AC-63362A319113}.Release|Any CPU.Build.0 = Release|Any CPU - {858CEB6A-90C5-4023-AB49-4AE3378D2A82}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {858CEB6A-90C5-4023-AB49-4AE3378D2A82}.Debug|Any CPU.Build.0 = Debug|Any CPU - {858CEB6A-90C5-4023-AB49-4AE3378D2A82}.Release|Any CPU.ActiveCfg = Release|Any CPU - {858CEB6A-90C5-4023-AB49-4AE3378D2A82}.Release|Any CPU.Build.0 = Release|Any CPU - {26593D10-FB57-4868-B162-282AA14037F3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {26593D10-FB57-4868-B162-282AA14037F3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {26593D10-FB57-4868-B162-282AA14037F3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {26593D10-FB57-4868-B162-282AA14037F3}.Release|Any CPU.Build.0 = Release|Any CPU - {0CE02E66-268F-483D-9B2A-32CA9C3F0EA0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0CE02E66-268F-483D-9B2A-32CA9C3F0EA0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0CE02E66-268F-483D-9B2A-32CA9C3F0EA0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0CE02E66-268F-483D-9B2A-32CA9C3F0EA0}.Release|Any CPU.Build.0 = Release|Any CPU - {97A561D3-C0D2-43F4-8AAC-0E6FC7B80039}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {97A561D3-C0D2-43F4-8AAC-0E6FC7B80039}.Debug|Any CPU.Build.0 = Debug|Any CPU - {97A561D3-C0D2-43F4-8AAC-0E6FC7B80039}.Release|Any CPU.ActiveCfg = Release|Any CPU - {97A561D3-C0D2-43F4-8AAC-0E6FC7B80039}.Release|Any CPU.Build.0 = Release|Any CPU - {B903BB73-0B21-443E-80DE-B3E30A7905DF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B903BB73-0B21-443E-80DE-B3E30A7905DF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B903BB73-0B21-443E-80DE-B3E30A7905DF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B903BB73-0B21-443E-80DE-B3E30A7905DF}.Release|Any CPU.Build.0 = Release|Any CPU - {EBE22F40-960A-4821-A506-A24EFD8150FF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EBE22F40-960A-4821-A506-A24EFD8150FF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EBE22F40-960A-4821-A506-A24EFD8150FF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EBE22F40-960A-4821-A506-A24EFD8150FF}.Release|Any CPU.Build.0 = Release|Any CPU - {2BA0E91D-406B-4B5A-942C-4EDF4BF2C928}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2BA0E91D-406B-4B5A-942C-4EDF4BF2C928}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2BA0E91D-406B-4B5A-942C-4EDF4BF2C928}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2BA0E91D-406B-4B5A-942C-4EDF4BF2C928}.Release|Any CPU.Build.0 = Release|Any CPU - {013C964B-DD5C-48C3-98BD-31F4E62EB58A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {013C964B-DD5C-48C3-98BD-31F4E62EB58A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {013C964B-DD5C-48C3-98BD-31F4E62EB58A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {013C964B-DD5C-48C3-98BD-31F4E62EB58A}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {B682BD97-9EB6-4CDC-B4FC-E5472007772A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {12DD88D9-4128-4EF0-9D35-E3CB03E2C8C0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {1C9B3E88-08CF-4D06-B3BB-3A2E455DAAF8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {6FB00DE9-F524-4DE2-AD0D-0929E9CB9B7A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {255A6EFA-C8E0-4091-AAA6-731F01F2C3B9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {5281088C-4414-420F-9D51-E196503298A6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F213E429-A692-44F7-A4AC-63362A319113} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {858CEB6A-90C5-4023-AB49-4AE3378D2A82} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {26593D10-FB57-4868-B162-282AA14037F3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0CE02E66-268F-483D-9B2A-32CA9C3F0EA0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {97A561D3-C0D2-43F4-8AAC-0E6FC7B80039} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B903BB73-0B21-443E-80DE-B3E30A7905DF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {EBE22F40-960A-4821-A506-A24EFD8150FF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {2BA0E91D-406B-4B5A-942C-4EDF4BF2C928} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {013C964B-DD5C-48C3-98BD-31F4E62EB58A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {5281088C-4414-420F-9D51-E196503298A6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F213E429-A692-44F7-A4AC-63362A319113} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {858CEB6A-90C5-4023-AB49-4AE3378D2A82} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {26593D10-FB57-4868-B162-282AA14037F3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0CE02E66-268F-483D-9B2A-32CA9C3F0EA0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {97A561D3-C0D2-43F4-8AAC-0E6FC7B80039} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B903BB73-0B21-443E-80DE-B3E30A7905DF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {EBE22F40-960A-4821-A506-A24EFD8150FF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {2BA0E91D-406B-4B5A-942C-4EDF4BF2C928} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {013C964B-DD5C-48C3-98BD-31F4E62EB58A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {BBDC4271-D6DC-43CB-9344-E9A7BD7808DA} diff --git a/sdk/src/Services/Shield/Generated/AmazonShieldConfig.cs b/sdk/src/Services/Shield/Generated/AmazonShieldConfig.cs index d272b843cc4c..34279717b928 100644 --- a/sdk/src/Services/Shield/Generated/AmazonShieldConfig.cs +++ b/sdk/src/Services/Shield/Generated/AmazonShieldConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.Shield public partial class AmazonShieldConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("Shield", "4.0.0.0"); private static readonly AmazonShieldEndpointResolver EndpointResolver = new AmazonShieldEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("Shield", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("Shield", "3.7.400.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/Shield/Properties/AssemblyInfo.cs b/sdk/src/Services/Shield/Properties/AssemblyInfo.cs index 2bab46e8efce..68fa1b45d7b5 100644 --- a/sdk/src/Services/Shield/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/Shield/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/Shield/Shield.sln b/sdk/src/Services/Shield/Shield.sln index 9c4d1668f3f1..19c2bc651cd3 100644 --- a/sdk/src/Services/Shield/Shield.sln +++ b/sdk/src/Services/Shield/Shield.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {31F5D703-3E91-42E1-B51F-856924FAA5C0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {31F5D703-3E91-42E1-B51F-856924FAA5C0}.Debug|Any CPU.Build.0 = Debug|Any CPU {31F5D703-3E91-42E1-B51F-856924FAA5C0}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {7E5BABAC-91AA-493D-A68E-E55EFA9FF4C1}.Debug|Any CPU.Build.0 = Debug|Any CPU {7E5BABAC-91AA-493D-A68E-E55EFA9FF4C1}.Release|Any CPU.ActiveCfg = Release|Any CPU {7E5BABAC-91AA-493D-A68E-E55EFA9FF4C1}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {C73C7A57-635E-4FCA-9573-19EDC30704F1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C73C7A57-635E-4FCA-9573-19EDC30704F1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C73C7A57-635E-4FCA-9573-19EDC30704F1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C73C7A57-635E-4FCA-9573-19EDC30704F1}.Release|Any CPU.Build.0 = Release|Any CPU - {BF77476B-F128-419E-85B3-2099F54C14C8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BF77476B-F128-419E-85B3-2099F54C14C8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BF77476B-F128-419E-85B3-2099F54C14C8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BF77476B-F128-419E-85B3-2099F54C14C8}.Release|Any CPU.Build.0 = Release|Any CPU - {60CB599F-B419-4F72-8DB5-12E16FC809AE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {60CB599F-B419-4F72-8DB5-12E16FC809AE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {60CB599F-B419-4F72-8DB5-12E16FC809AE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {60CB599F-B419-4F72-8DB5-12E16FC809AE}.Release|Any CPU.Build.0 = Release|Any CPU - {1A01C935-318E-401B-BCD9-0DA45087EA0D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1A01C935-318E-401B-BCD9-0DA45087EA0D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1A01C935-318E-401B-BCD9-0DA45087EA0D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1A01C935-318E-401B-BCD9-0DA45087EA0D}.Release|Any CPU.Build.0 = Release|Any CPU - {B0E7B50B-E5C4-4619-9391-D249662674AB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B0E7B50B-E5C4-4619-9391-D249662674AB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B0E7B50B-E5C4-4619-9391-D249662674AB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B0E7B50B-E5C4-4619-9391-D249662674AB}.Release|Any CPU.Build.0 = Release|Any CPU - {0C1922AF-4E96-49F0-983A-EDB91090E867}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0C1922AF-4E96-49F0-983A-EDB91090E867}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0C1922AF-4E96-49F0-983A-EDB91090E867}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0C1922AF-4E96-49F0-983A-EDB91090E867}.Release|Any CPU.Build.0 = Release|Any CPU - {C1A8F78D-D8FF-4A7C-8040-E7553BD790E8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C1A8F78D-D8FF-4A7C-8040-E7553BD790E8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C1A8F78D-D8FF-4A7C-8040-E7553BD790E8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C1A8F78D-D8FF-4A7C-8040-E7553BD790E8}.Release|Any CPU.Build.0 = Release|Any CPU - {61FF27E9-F515-40AE-8AE7-123A2D3905E8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {61FF27E9-F515-40AE-8AE7-123A2D3905E8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {61FF27E9-F515-40AE-8AE7-123A2D3905E8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {61FF27E9-F515-40AE-8AE7-123A2D3905E8}.Release|Any CPU.Build.0 = Release|Any CPU - {A9DE7014-BFB9-4D36-96E1-613E13E4A279}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A9DE7014-BFB9-4D36-96E1-613E13E4A279}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A9DE7014-BFB9-4D36-96E1-613E13E4A279}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A9DE7014-BFB9-4D36-96E1-613E13E4A279}.Release|Any CPU.Build.0 = Release|Any CPU - {50BCC9E8-9CEC-4A04-98EC-1727E973FD01}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {50BCC9E8-9CEC-4A04-98EC-1727E973FD01}.Debug|Any CPU.Build.0 = Debug|Any CPU - {50BCC9E8-9CEC-4A04-98EC-1727E973FD01}.Release|Any CPU.ActiveCfg = Release|Any CPU - {50BCC9E8-9CEC-4A04-98EC-1727E973FD01}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {C73C7A57-635E-4FCA-9573-19EDC30704F1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C73C7A57-635E-4FCA-9573-19EDC30704F1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C73C7A57-635E-4FCA-9573-19EDC30704F1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C73C7A57-635E-4FCA-9573-19EDC30704F1}.Release|Any CPU.Build.0 = Release|Any CPU - {BF77476B-F128-419E-85B3-2099F54C14C8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BF77476B-F128-419E-85B3-2099F54C14C8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BF77476B-F128-419E-85B3-2099F54C14C8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BF77476B-F128-419E-85B3-2099F54C14C8}.Release|Any CPU.Build.0 = Release|Any CPU - {60CB599F-B419-4F72-8DB5-12E16FC809AE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {60CB599F-B419-4F72-8DB5-12E16FC809AE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {60CB599F-B419-4F72-8DB5-12E16FC809AE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {60CB599F-B419-4F72-8DB5-12E16FC809AE}.Release|Any CPU.Build.0 = Release|Any CPU - {1A01C935-318E-401B-BCD9-0DA45087EA0D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1A01C935-318E-401B-BCD9-0DA45087EA0D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1A01C935-318E-401B-BCD9-0DA45087EA0D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1A01C935-318E-401B-BCD9-0DA45087EA0D}.Release|Any CPU.Build.0 = Release|Any CPU - {B0E7B50B-E5C4-4619-9391-D249662674AB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B0E7B50B-E5C4-4619-9391-D249662674AB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B0E7B50B-E5C4-4619-9391-D249662674AB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B0E7B50B-E5C4-4619-9391-D249662674AB}.Release|Any CPU.Build.0 = Release|Any CPU - {0C1922AF-4E96-49F0-983A-EDB91090E867}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0C1922AF-4E96-49F0-983A-EDB91090E867}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0C1922AF-4E96-49F0-983A-EDB91090E867}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0C1922AF-4E96-49F0-983A-EDB91090E867}.Release|Any CPU.Build.0 = Release|Any CPU - {C1A8F78D-D8FF-4A7C-8040-E7553BD790E8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C1A8F78D-D8FF-4A7C-8040-E7553BD790E8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C1A8F78D-D8FF-4A7C-8040-E7553BD790E8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C1A8F78D-D8FF-4A7C-8040-E7553BD790E8}.Release|Any CPU.Build.0 = Release|Any CPU - {61FF27E9-F515-40AE-8AE7-123A2D3905E8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {61FF27E9-F515-40AE-8AE7-123A2D3905E8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {61FF27E9-F515-40AE-8AE7-123A2D3905E8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {61FF27E9-F515-40AE-8AE7-123A2D3905E8}.Release|Any CPU.Build.0 = Release|Any CPU - {A9DE7014-BFB9-4D36-96E1-613E13E4A279}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A9DE7014-BFB9-4D36-96E1-613E13E4A279}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A9DE7014-BFB9-4D36-96E1-613E13E4A279}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A9DE7014-BFB9-4D36-96E1-613E13E4A279}.Release|Any CPU.Build.0 = Release|Any CPU - {50BCC9E8-9CEC-4A04-98EC-1727E973FD01}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {50BCC9E8-9CEC-4A04-98EC-1727E973FD01}.Debug|Any CPU.Build.0 = Debug|Any CPU - {50BCC9E8-9CEC-4A04-98EC-1727E973FD01}.Release|Any CPU.ActiveCfg = Release|Any CPU - {50BCC9E8-9CEC-4A04-98EC-1727E973FD01}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {31F5D703-3E91-42E1-B51F-856924FAA5C0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {01578356-D05C-48E7-92B1-47D0F3A1E594} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {87E56580-E1BC-41C6-B824-3199FCB93186} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {F591ECDC-F88A-4392-AF46-1F93228EBD83} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {7E5BABAC-91AA-493D-A68E-E55EFA9FF4C1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {C73C7A57-635E-4FCA-9573-19EDC30704F1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {BF77476B-F128-419E-85B3-2099F54C14C8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {60CB599F-B419-4F72-8DB5-12E16FC809AE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {1A01C935-318E-401B-BCD9-0DA45087EA0D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B0E7B50B-E5C4-4619-9391-D249662674AB} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0C1922AF-4E96-49F0-983A-EDB91090E867} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C1A8F78D-D8FF-4A7C-8040-E7553BD790E8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {61FF27E9-F515-40AE-8AE7-123A2D3905E8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A9DE7014-BFB9-4D36-96E1-613E13E4A279} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {50BCC9E8-9CEC-4A04-98EC-1727E973FD01} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {C73C7A57-635E-4FCA-9573-19EDC30704F1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {BF77476B-F128-419E-85B3-2099F54C14C8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {60CB599F-B419-4F72-8DB5-12E16FC809AE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {1A01C935-318E-401B-BCD9-0DA45087EA0D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B0E7B50B-E5C4-4619-9391-D249662674AB} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0C1922AF-4E96-49F0-983A-EDB91090E867} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C1A8F78D-D8FF-4A7C-8040-E7553BD790E8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {61FF27E9-F515-40AE-8AE7-123A2D3905E8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A9DE7014-BFB9-4D36-96E1-613E13E4A279} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {50BCC9E8-9CEC-4A04-98EC-1727E973FD01} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {5DB63F24-9E82-485D-BB76-AF22C8F7CDA7} diff --git a/sdk/src/Services/Signer/Generated/AmazonSignerConfig.cs b/sdk/src/Services/Signer/Generated/AmazonSignerConfig.cs index 65e80ba95495..9e8faee5b255 100644 --- a/sdk/src/Services/Signer/Generated/AmazonSignerConfig.cs +++ b/sdk/src/Services/Signer/Generated/AmazonSignerConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.Signer public partial class AmazonSignerConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("signer", "4.0.0.0"); private static readonly AmazonSignerEndpointResolver EndpointResolver = new AmazonSignerEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("signer", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("signer", "3.7.400.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/Signer/Properties/AssemblyInfo.cs b/sdk/src/Services/Signer/Properties/AssemblyInfo.cs index 6b25fcaf5ad7..b8a7a73075fb 100644 --- a/sdk/src/Services/Signer/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/Signer/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/Signer/Signer.sln b/sdk/src/Services/Signer/Signer.sln index 49c72d654c89..16b708b25aa2 100644 --- a/sdk/src/Services/Signer/Signer.sln +++ b/sdk/src/Services/Signer/Signer.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {76AAE043-A1CD-49CC-BBDB-02EAC6744C90}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {76AAE043-A1CD-49CC-BBDB-02EAC6744C90}.Debug|Any CPU.Build.0 = Debug|Any CPU {76AAE043-A1CD-49CC-BBDB-02EAC6744C90}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {6BA1CB30-B19C-4D5E-8E15-79925F22FC58}.Debug|Any CPU.Build.0 = Debug|Any CPU {6BA1CB30-B19C-4D5E-8E15-79925F22FC58}.Release|Any CPU.ActiveCfg = Release|Any CPU {6BA1CB30-B19C-4D5E-8E15-79925F22FC58}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {516ECADD-ACC2-4B7E-BE09-7B6AFE12FCFF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {516ECADD-ACC2-4B7E-BE09-7B6AFE12FCFF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {516ECADD-ACC2-4B7E-BE09-7B6AFE12FCFF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {516ECADD-ACC2-4B7E-BE09-7B6AFE12FCFF}.Release|Any CPU.Build.0 = Release|Any CPU - {8286C53C-1C78-4066-9480-1661DCC438C1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8286C53C-1C78-4066-9480-1661DCC438C1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8286C53C-1C78-4066-9480-1661DCC438C1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8286C53C-1C78-4066-9480-1661DCC438C1}.Release|Any CPU.Build.0 = Release|Any CPU - {3C63B826-4AEA-44FE-A620-22002DBC816F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3C63B826-4AEA-44FE-A620-22002DBC816F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3C63B826-4AEA-44FE-A620-22002DBC816F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3C63B826-4AEA-44FE-A620-22002DBC816F}.Release|Any CPU.Build.0 = Release|Any CPU - {8F650044-D1F1-451B-95EC-2E1D768FD1E6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8F650044-D1F1-451B-95EC-2E1D768FD1E6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8F650044-D1F1-451B-95EC-2E1D768FD1E6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8F650044-D1F1-451B-95EC-2E1D768FD1E6}.Release|Any CPU.Build.0 = Release|Any CPU - {4F88274B-DA96-469E-ABA3-D85071156241}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4F88274B-DA96-469E-ABA3-D85071156241}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4F88274B-DA96-469E-ABA3-D85071156241}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4F88274B-DA96-469E-ABA3-D85071156241}.Release|Any CPU.Build.0 = Release|Any CPU - {FE63913D-94B3-4252-8FB6-BCD91FA20AA5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FE63913D-94B3-4252-8FB6-BCD91FA20AA5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FE63913D-94B3-4252-8FB6-BCD91FA20AA5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FE63913D-94B3-4252-8FB6-BCD91FA20AA5}.Release|Any CPU.Build.0 = Release|Any CPU - {A0E51343-887F-4D60-821C-37B5CC960CDD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A0E51343-887F-4D60-821C-37B5CC960CDD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A0E51343-887F-4D60-821C-37B5CC960CDD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A0E51343-887F-4D60-821C-37B5CC960CDD}.Release|Any CPU.Build.0 = Release|Any CPU - {8E5A83B9-D75E-4EE7-9F9A-26E4D1D8E7BD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8E5A83B9-D75E-4EE7-9F9A-26E4D1D8E7BD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8E5A83B9-D75E-4EE7-9F9A-26E4D1D8E7BD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8E5A83B9-D75E-4EE7-9F9A-26E4D1D8E7BD}.Release|Any CPU.Build.0 = Release|Any CPU - {EED04F1D-6379-4A3C-9AE0-56E4C54A3244}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EED04F1D-6379-4A3C-9AE0-56E4C54A3244}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EED04F1D-6379-4A3C-9AE0-56E4C54A3244}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EED04F1D-6379-4A3C-9AE0-56E4C54A3244}.Release|Any CPU.Build.0 = Release|Any CPU - {E66A3B81-34BF-41E5-B253-2E30CE8B212B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E66A3B81-34BF-41E5-B253-2E30CE8B212B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E66A3B81-34BF-41E5-B253-2E30CE8B212B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E66A3B81-34BF-41E5-B253-2E30CE8B212B}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {516ECADD-ACC2-4B7E-BE09-7B6AFE12FCFF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {516ECADD-ACC2-4B7E-BE09-7B6AFE12FCFF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {516ECADD-ACC2-4B7E-BE09-7B6AFE12FCFF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {516ECADD-ACC2-4B7E-BE09-7B6AFE12FCFF}.Release|Any CPU.Build.0 = Release|Any CPU - {8286C53C-1C78-4066-9480-1661DCC438C1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8286C53C-1C78-4066-9480-1661DCC438C1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8286C53C-1C78-4066-9480-1661DCC438C1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8286C53C-1C78-4066-9480-1661DCC438C1}.Release|Any CPU.Build.0 = Release|Any CPU - {3C63B826-4AEA-44FE-A620-22002DBC816F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3C63B826-4AEA-44FE-A620-22002DBC816F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3C63B826-4AEA-44FE-A620-22002DBC816F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3C63B826-4AEA-44FE-A620-22002DBC816F}.Release|Any CPU.Build.0 = Release|Any CPU - {8F650044-D1F1-451B-95EC-2E1D768FD1E6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8F650044-D1F1-451B-95EC-2E1D768FD1E6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8F650044-D1F1-451B-95EC-2E1D768FD1E6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8F650044-D1F1-451B-95EC-2E1D768FD1E6}.Release|Any CPU.Build.0 = Release|Any CPU - {4F88274B-DA96-469E-ABA3-D85071156241}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4F88274B-DA96-469E-ABA3-D85071156241}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4F88274B-DA96-469E-ABA3-D85071156241}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4F88274B-DA96-469E-ABA3-D85071156241}.Release|Any CPU.Build.0 = Release|Any CPU - {FE63913D-94B3-4252-8FB6-BCD91FA20AA5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FE63913D-94B3-4252-8FB6-BCD91FA20AA5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FE63913D-94B3-4252-8FB6-BCD91FA20AA5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FE63913D-94B3-4252-8FB6-BCD91FA20AA5}.Release|Any CPU.Build.0 = Release|Any CPU - {A0E51343-887F-4D60-821C-37B5CC960CDD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A0E51343-887F-4D60-821C-37B5CC960CDD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A0E51343-887F-4D60-821C-37B5CC960CDD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A0E51343-887F-4D60-821C-37B5CC960CDD}.Release|Any CPU.Build.0 = Release|Any CPU - {8E5A83B9-D75E-4EE7-9F9A-26E4D1D8E7BD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8E5A83B9-D75E-4EE7-9F9A-26E4D1D8E7BD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8E5A83B9-D75E-4EE7-9F9A-26E4D1D8E7BD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8E5A83B9-D75E-4EE7-9F9A-26E4D1D8E7BD}.Release|Any CPU.Build.0 = Release|Any CPU - {EED04F1D-6379-4A3C-9AE0-56E4C54A3244}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EED04F1D-6379-4A3C-9AE0-56E4C54A3244}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EED04F1D-6379-4A3C-9AE0-56E4C54A3244}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EED04F1D-6379-4A3C-9AE0-56E4C54A3244}.Release|Any CPU.Build.0 = Release|Any CPU - {E66A3B81-34BF-41E5-B253-2E30CE8B212B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E66A3B81-34BF-41E5-B253-2E30CE8B212B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E66A3B81-34BF-41E5-B253-2E30CE8B212B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E66A3B81-34BF-41E5-B253-2E30CE8B212B}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {76AAE043-A1CD-49CC-BBDB-02EAC6744C90} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {4F8977D9-1735-47C7-B660-E7CA8AD9D13A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {BE639E40-7149-45C9-A50D-CA70E96C9D68} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {AA748622-2D6D-42C6-80B4-4E40D7A87E4F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {6BA1CB30-B19C-4D5E-8E15-79925F22FC58} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {516ECADD-ACC2-4B7E-BE09-7B6AFE12FCFF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8286C53C-1C78-4066-9480-1661DCC438C1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {3C63B826-4AEA-44FE-A620-22002DBC816F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8F650044-D1F1-451B-95EC-2E1D768FD1E6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4F88274B-DA96-469E-ABA3-D85071156241} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {FE63913D-94B3-4252-8FB6-BCD91FA20AA5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A0E51343-887F-4D60-821C-37B5CC960CDD} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8E5A83B9-D75E-4EE7-9F9A-26E4D1D8E7BD} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {EED04F1D-6379-4A3C-9AE0-56E4C54A3244} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E66A3B81-34BF-41E5-B253-2E30CE8B212B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {516ECADD-ACC2-4B7E-BE09-7B6AFE12FCFF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8286C53C-1C78-4066-9480-1661DCC438C1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {3C63B826-4AEA-44FE-A620-22002DBC816F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8F650044-D1F1-451B-95EC-2E1D768FD1E6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4F88274B-DA96-469E-ABA3-D85071156241} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {FE63913D-94B3-4252-8FB6-BCD91FA20AA5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A0E51343-887F-4D60-821C-37B5CC960CDD} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8E5A83B9-D75E-4EE7-9F9A-26E4D1D8E7BD} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {EED04F1D-6379-4A3C-9AE0-56E4C54A3244} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E66A3B81-34BF-41E5-B253-2E30CE8B212B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {8E33B7A2-144E-44FC-B846-937AD6B2A39B} diff --git a/sdk/src/Services/SimSpaceWeaver/Generated/AmazonSimSpaceWeaverConfig.cs b/sdk/src/Services/SimSpaceWeaver/Generated/AmazonSimSpaceWeaverConfig.cs index eabe38249574..4cddc5757f39 100644 --- a/sdk/src/Services/SimSpaceWeaver/Generated/AmazonSimSpaceWeaverConfig.cs +++ b/sdk/src/Services/SimSpaceWeaver/Generated/AmazonSimSpaceWeaverConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.SimSpaceWeaver public partial class AmazonSimSpaceWeaverConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("SimSpaceWeaver", "4.0.0.0"); private static readonly AmazonSimSpaceWeaverEndpointResolver EndpointResolver = new AmazonSimSpaceWeaverEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("SimSpaceWeaver", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("SimSpaceWeaver", "3.7.400.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/SimSpaceWeaver/Properties/AssemblyInfo.cs b/sdk/src/Services/SimSpaceWeaver/Properties/AssemblyInfo.cs index 63ddab94961d..0d9a45cdc609 100644 --- a/sdk/src/Services/SimSpaceWeaver/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/SimSpaceWeaver/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/SimSpaceWeaver/SimSpaceWeaver.sln b/sdk/src/Services/SimSpaceWeaver/SimSpaceWeaver.sln index f5a7878ee51d..88f272358281 100644 --- a/sdk/src/Services/SimSpaceWeaver/SimSpaceWeaver.sln +++ b/sdk/src/Services/SimSpaceWeaver/SimSpaceWeaver.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {9C354979-CB59-4915-8F53-AEF75C1200EC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {9C354979-CB59-4915-8F53-AEF75C1200EC}.Debug|Any CPU.Build.0 = Debug|Any CPU {9C354979-CB59-4915-8F53-AEF75C1200EC}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {4370C66C-6E9D-4E22-A471-40C5DEC50DF0}.Debug|Any CPU.Build.0 = Debug|Any CPU {4370C66C-6E9D-4E22-A471-40C5DEC50DF0}.Release|Any CPU.ActiveCfg = Release|Any CPU {4370C66C-6E9D-4E22-A471-40C5DEC50DF0}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {2297E713-A923-4B70-80ED-719C27A0B0EC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2297E713-A923-4B70-80ED-719C27A0B0EC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2297E713-A923-4B70-80ED-719C27A0B0EC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2297E713-A923-4B70-80ED-719C27A0B0EC}.Release|Any CPU.Build.0 = Release|Any CPU - {82E03C26-A0AC-42DC-A653-A2F9BE25535F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {82E03C26-A0AC-42DC-A653-A2F9BE25535F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {82E03C26-A0AC-42DC-A653-A2F9BE25535F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {82E03C26-A0AC-42DC-A653-A2F9BE25535F}.Release|Any CPU.Build.0 = Release|Any CPU - {9ABC4EF3-45E5-4DD4-BA84-0577E7D908D8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9ABC4EF3-45E5-4DD4-BA84-0577E7D908D8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9ABC4EF3-45E5-4DD4-BA84-0577E7D908D8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9ABC4EF3-45E5-4DD4-BA84-0577E7D908D8}.Release|Any CPU.Build.0 = Release|Any CPU - {17CBA57D-165B-44BD-AFA0-F8C97AC8201C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {17CBA57D-165B-44BD-AFA0-F8C97AC8201C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {17CBA57D-165B-44BD-AFA0-F8C97AC8201C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {17CBA57D-165B-44BD-AFA0-F8C97AC8201C}.Release|Any CPU.Build.0 = Release|Any CPU - {C0D30EED-0B88-4DE2-8049-F6DAC4D9AB16}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C0D30EED-0B88-4DE2-8049-F6DAC4D9AB16}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C0D30EED-0B88-4DE2-8049-F6DAC4D9AB16}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C0D30EED-0B88-4DE2-8049-F6DAC4D9AB16}.Release|Any CPU.Build.0 = Release|Any CPU - {944758BE-13AC-43CB-B413-D5B2EAAD468B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {944758BE-13AC-43CB-B413-D5B2EAAD468B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {944758BE-13AC-43CB-B413-D5B2EAAD468B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {944758BE-13AC-43CB-B413-D5B2EAAD468B}.Release|Any CPU.Build.0 = Release|Any CPU - {ABA5A38E-39A4-462F-A24B-6DCD189000BE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {ABA5A38E-39A4-462F-A24B-6DCD189000BE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {ABA5A38E-39A4-462F-A24B-6DCD189000BE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {ABA5A38E-39A4-462F-A24B-6DCD189000BE}.Release|Any CPU.Build.0 = Release|Any CPU - {11442CFC-6B4B-4D7D-B5E1-40CF4A501A64}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {11442CFC-6B4B-4D7D-B5E1-40CF4A501A64}.Debug|Any CPU.Build.0 = Debug|Any CPU - {11442CFC-6B4B-4D7D-B5E1-40CF4A501A64}.Release|Any CPU.ActiveCfg = Release|Any CPU - {11442CFC-6B4B-4D7D-B5E1-40CF4A501A64}.Release|Any CPU.Build.0 = Release|Any CPU - {853B73E4-8B2D-4E28-82B8-C336252291BE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {853B73E4-8B2D-4E28-82B8-C336252291BE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {853B73E4-8B2D-4E28-82B8-C336252291BE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {853B73E4-8B2D-4E28-82B8-C336252291BE}.Release|Any CPU.Build.0 = Release|Any CPU - {34AD96E3-C10E-4A2F-B6B6-4A7778DC95E7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {34AD96E3-C10E-4A2F-B6B6-4A7778DC95E7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {34AD96E3-C10E-4A2F-B6B6-4A7778DC95E7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {34AD96E3-C10E-4A2F-B6B6-4A7778DC95E7}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {2297E713-A923-4B70-80ED-719C27A0B0EC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2297E713-A923-4B70-80ED-719C27A0B0EC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2297E713-A923-4B70-80ED-719C27A0B0EC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2297E713-A923-4B70-80ED-719C27A0B0EC}.Release|Any CPU.Build.0 = Release|Any CPU - {82E03C26-A0AC-42DC-A653-A2F9BE25535F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {82E03C26-A0AC-42DC-A653-A2F9BE25535F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {82E03C26-A0AC-42DC-A653-A2F9BE25535F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {82E03C26-A0AC-42DC-A653-A2F9BE25535F}.Release|Any CPU.Build.0 = Release|Any CPU - {9ABC4EF3-45E5-4DD4-BA84-0577E7D908D8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9ABC4EF3-45E5-4DD4-BA84-0577E7D908D8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9ABC4EF3-45E5-4DD4-BA84-0577E7D908D8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9ABC4EF3-45E5-4DD4-BA84-0577E7D908D8}.Release|Any CPU.Build.0 = Release|Any CPU - {17CBA57D-165B-44BD-AFA0-F8C97AC8201C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {17CBA57D-165B-44BD-AFA0-F8C97AC8201C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {17CBA57D-165B-44BD-AFA0-F8C97AC8201C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {17CBA57D-165B-44BD-AFA0-F8C97AC8201C}.Release|Any CPU.Build.0 = Release|Any CPU - {C0D30EED-0B88-4DE2-8049-F6DAC4D9AB16}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C0D30EED-0B88-4DE2-8049-F6DAC4D9AB16}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C0D30EED-0B88-4DE2-8049-F6DAC4D9AB16}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C0D30EED-0B88-4DE2-8049-F6DAC4D9AB16}.Release|Any CPU.Build.0 = Release|Any CPU - {944758BE-13AC-43CB-B413-D5B2EAAD468B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {944758BE-13AC-43CB-B413-D5B2EAAD468B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {944758BE-13AC-43CB-B413-D5B2EAAD468B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {944758BE-13AC-43CB-B413-D5B2EAAD468B}.Release|Any CPU.Build.0 = Release|Any CPU - {ABA5A38E-39A4-462F-A24B-6DCD189000BE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {ABA5A38E-39A4-462F-A24B-6DCD189000BE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {ABA5A38E-39A4-462F-A24B-6DCD189000BE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {ABA5A38E-39A4-462F-A24B-6DCD189000BE}.Release|Any CPU.Build.0 = Release|Any CPU - {11442CFC-6B4B-4D7D-B5E1-40CF4A501A64}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {11442CFC-6B4B-4D7D-B5E1-40CF4A501A64}.Debug|Any CPU.Build.0 = Debug|Any CPU - {11442CFC-6B4B-4D7D-B5E1-40CF4A501A64}.Release|Any CPU.ActiveCfg = Release|Any CPU - {11442CFC-6B4B-4D7D-B5E1-40CF4A501A64}.Release|Any CPU.Build.0 = Release|Any CPU - {853B73E4-8B2D-4E28-82B8-C336252291BE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {853B73E4-8B2D-4E28-82B8-C336252291BE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {853B73E4-8B2D-4E28-82B8-C336252291BE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {853B73E4-8B2D-4E28-82B8-C336252291BE}.Release|Any CPU.Build.0 = Release|Any CPU - {34AD96E3-C10E-4A2F-B6B6-4A7778DC95E7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {34AD96E3-C10E-4A2F-B6B6-4A7778DC95E7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {34AD96E3-C10E-4A2F-B6B6-4A7778DC95E7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {34AD96E3-C10E-4A2F-B6B6-4A7778DC95E7}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {9C354979-CB59-4915-8F53-AEF75C1200EC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {557E9DAA-B009-4187-B004-0CBB81051371} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {4AA7286C-9FB3-492B-BC4F-DC5975953D42} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {5319B75E-39C8-45D0-B8BC-CC640AC63610} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {4370C66C-6E9D-4E22-A471-40C5DEC50DF0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {2297E713-A923-4B70-80ED-719C27A0B0EC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {82E03C26-A0AC-42DC-A653-A2F9BE25535F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {9ABC4EF3-45E5-4DD4-BA84-0577E7D908D8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {17CBA57D-165B-44BD-AFA0-F8C97AC8201C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C0D30EED-0B88-4DE2-8049-F6DAC4D9AB16} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {944758BE-13AC-43CB-B413-D5B2EAAD468B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {ABA5A38E-39A4-462F-A24B-6DCD189000BE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {11442CFC-6B4B-4D7D-B5E1-40CF4A501A64} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {853B73E4-8B2D-4E28-82B8-C336252291BE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {34AD96E3-C10E-4A2F-B6B6-4A7778DC95E7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {2297E713-A923-4B70-80ED-719C27A0B0EC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {82E03C26-A0AC-42DC-A653-A2F9BE25535F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {9ABC4EF3-45E5-4DD4-BA84-0577E7D908D8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {17CBA57D-165B-44BD-AFA0-F8C97AC8201C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C0D30EED-0B88-4DE2-8049-F6DAC4D9AB16} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {944758BE-13AC-43CB-B413-D5B2EAAD468B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {ABA5A38E-39A4-462F-A24B-6DCD189000BE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {11442CFC-6B4B-4D7D-B5E1-40CF4A501A64} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {853B73E4-8B2D-4E28-82B8-C336252291BE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {34AD96E3-C10E-4A2F-B6B6-4A7778DC95E7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {0D4BC0AD-E7F6-4F0C-BDC2-BB7D79D06558} diff --git a/sdk/src/Services/SimpleDB/Generated/AmazonSimpleDBConfig.cs b/sdk/src/Services/SimpleDB/Generated/AmazonSimpleDBConfig.cs index 924dfe5e95cd..48b81f82ad36 100644 --- a/sdk/src/Services/SimpleDB/Generated/AmazonSimpleDBConfig.cs +++ b/sdk/src/Services/SimpleDB/Generated/AmazonSimpleDBConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.SimpleDB public partial class AmazonSimpleDBConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("SimpleDB", "4.0.0.0"); private static readonly AmazonSimpleDBEndpointResolver EndpointResolver = new AmazonSimpleDBEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("SimpleDB", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("SimpleDB", "3.7.400.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/SimpleDB/Properties/AssemblyInfo.cs b/sdk/src/Services/SimpleDB/Properties/AssemblyInfo.cs index fce53f371dba..9d28d631498d 100644 --- a/sdk/src/Services/SimpleDB/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/SimpleDB/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/SimpleDB/SimpleDB.sln b/sdk/src/Services/SimpleDB/SimpleDB.sln index be0f7d04b163..84779a3365b7 100644 --- a/sdk/src/Services/SimpleDB/SimpleDB.sln +++ b/sdk/src/Services/SimpleDB/SimpleDB.sln @@ -92,7 +92,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {C0C824B8-FD80-4DCA-981F-2E88EE74CDF1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {C0C824B8-FD80-4DCA-981F-2E88EE74CDF1}.Debug|Any CPU.Build.0 = Debug|Any CPU {C0C824B8-FD80-4DCA-981F-2E88EE74CDF1}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -113,97 +120,6 @@ Global {494CB85B-6D29-4307-A841-C9C7B6059F5C}.Debug|Any CPU.Build.0 = Debug|Any CPU {494CB85B-6D29-4307-A841-C9C7B6059F5C}.Release|Any CPU.ActiveCfg = Release|Any CPU {494CB85B-6D29-4307-A841-C9C7B6059F5C}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {289AAE9F-9200-45C5-B7E5-95C02F1D713E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {289AAE9F-9200-45C5-B7E5-95C02F1D713E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {289AAE9F-9200-45C5-B7E5-95C02F1D713E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {289AAE9F-9200-45C5-B7E5-95C02F1D713E}.Release|Any CPU.Build.0 = Release|Any CPU - {DDD017D7-5B06-40AC-8FFD-306819508DE2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DDD017D7-5B06-40AC-8FFD-306819508DE2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DDD017D7-5B06-40AC-8FFD-306819508DE2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DDD017D7-5B06-40AC-8FFD-306819508DE2}.Release|Any CPU.Build.0 = Release|Any CPU - {0673499F-20F2-44EA-BCE8-55ED08404B17}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0673499F-20F2-44EA-BCE8-55ED08404B17}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0673499F-20F2-44EA-BCE8-55ED08404B17}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0673499F-20F2-44EA-BCE8-55ED08404B17}.Release|Any CPU.Build.0 = Release|Any CPU - {664E73C3-9352-439E-B832-DC77719EB05E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {664E73C3-9352-439E-B832-DC77719EB05E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {664E73C3-9352-439E-B832-DC77719EB05E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {664E73C3-9352-439E-B832-DC77719EB05E}.Release|Any CPU.Build.0 = Release|Any CPU - {C2121BF7-AC4E-4023-A302-97DC21C2B3A4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C2121BF7-AC4E-4023-A302-97DC21C2B3A4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C2121BF7-AC4E-4023-A302-97DC21C2B3A4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C2121BF7-AC4E-4023-A302-97DC21C2B3A4}.Release|Any CPU.Build.0 = Release|Any CPU - {8E5246F8-C0E5-4945-AB79-12051002A6A4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8E5246F8-C0E5-4945-AB79-12051002A6A4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8E5246F8-C0E5-4945-AB79-12051002A6A4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8E5246F8-C0E5-4945-AB79-12051002A6A4}.Release|Any CPU.Build.0 = Release|Any CPU - {F4DEEF6C-6908-4BF8-92DB-D59FDD198244}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F4DEEF6C-6908-4BF8-92DB-D59FDD198244}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F4DEEF6C-6908-4BF8-92DB-D59FDD198244}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F4DEEF6C-6908-4BF8-92DB-D59FDD198244}.Release|Any CPU.Build.0 = Release|Any CPU - {1DB7432B-DE52-4188-B3DB-746C66F6C418}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1DB7432B-DE52-4188-B3DB-746C66F6C418}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1DB7432B-DE52-4188-B3DB-746C66F6C418}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1DB7432B-DE52-4188-B3DB-746C66F6C418}.Release|Any CPU.Build.0 = Release|Any CPU - {6F6CD8AB-745F-44CB-972E-55570C48E4DE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6F6CD8AB-745F-44CB-972E-55570C48E4DE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6F6CD8AB-745F-44CB-972E-55570C48E4DE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6F6CD8AB-745F-44CB-972E-55570C48E4DE}.Release|Any CPU.Build.0 = Release|Any CPU - {9317CE1E-BCBE-44C1-A2FF-25F6A223531D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9317CE1E-BCBE-44C1-A2FF-25F6A223531D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9317CE1E-BCBE-44C1-A2FF-25F6A223531D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9317CE1E-BCBE-44C1-A2FF-25F6A223531D}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {289AAE9F-9200-45C5-B7E5-95C02F1D713E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {289AAE9F-9200-45C5-B7E5-95C02F1D713E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {289AAE9F-9200-45C5-B7E5-95C02F1D713E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {289AAE9F-9200-45C5-B7E5-95C02F1D713E}.Release|Any CPU.Build.0 = Release|Any CPU - {DDD017D7-5B06-40AC-8FFD-306819508DE2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DDD017D7-5B06-40AC-8FFD-306819508DE2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DDD017D7-5B06-40AC-8FFD-306819508DE2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DDD017D7-5B06-40AC-8FFD-306819508DE2}.Release|Any CPU.Build.0 = Release|Any CPU - {0673499F-20F2-44EA-BCE8-55ED08404B17}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0673499F-20F2-44EA-BCE8-55ED08404B17}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0673499F-20F2-44EA-BCE8-55ED08404B17}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0673499F-20F2-44EA-BCE8-55ED08404B17}.Release|Any CPU.Build.0 = Release|Any CPU - {664E73C3-9352-439E-B832-DC77719EB05E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {664E73C3-9352-439E-B832-DC77719EB05E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {664E73C3-9352-439E-B832-DC77719EB05E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {664E73C3-9352-439E-B832-DC77719EB05E}.Release|Any CPU.Build.0 = Release|Any CPU - {C2121BF7-AC4E-4023-A302-97DC21C2B3A4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C2121BF7-AC4E-4023-A302-97DC21C2B3A4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C2121BF7-AC4E-4023-A302-97DC21C2B3A4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C2121BF7-AC4E-4023-A302-97DC21C2B3A4}.Release|Any CPU.Build.0 = Release|Any CPU - {8E5246F8-C0E5-4945-AB79-12051002A6A4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8E5246F8-C0E5-4945-AB79-12051002A6A4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8E5246F8-C0E5-4945-AB79-12051002A6A4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8E5246F8-C0E5-4945-AB79-12051002A6A4}.Release|Any CPU.Build.0 = Release|Any CPU - {F4DEEF6C-6908-4BF8-92DB-D59FDD198244}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F4DEEF6C-6908-4BF8-92DB-D59FDD198244}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F4DEEF6C-6908-4BF8-92DB-D59FDD198244}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F4DEEF6C-6908-4BF8-92DB-D59FDD198244}.Release|Any CPU.Build.0 = Release|Any CPU - {1DB7432B-DE52-4188-B3DB-746C66F6C418}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1DB7432B-DE52-4188-B3DB-746C66F6C418}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1DB7432B-DE52-4188-B3DB-746C66F6C418}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1DB7432B-DE52-4188-B3DB-746C66F6C418}.Release|Any CPU.Build.0 = Release|Any CPU - {6F6CD8AB-745F-44CB-972E-55570C48E4DE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6F6CD8AB-745F-44CB-972E-55570C48E4DE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6F6CD8AB-745F-44CB-972E-55570C48E4DE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6F6CD8AB-745F-44CB-972E-55570C48E4DE}.Release|Any CPU.Build.0 = Release|Any CPU - {9317CE1E-BCBE-44C1-A2FF-25F6A223531D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9317CE1E-BCBE-44C1-A2FF-25F6A223531D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9317CE1E-BCBE-44C1-A2FF-25F6A223531D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9317CE1E-BCBE-44C1-A2FF-25F6A223531D}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -220,37 +136,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {C0C824B8-FD80-4DCA-981F-2E88EE74CDF1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {4BB864F3-911E-463E-BD17-54731449709B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {CEC6C730-B0A1-44B7-B320-3CF8802D7220} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {F5925408-5908-4364-B01E-F9FBE48CF414} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {494CB85B-6D29-4307-A841-C9C7B6059F5C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {289AAE9F-9200-45C5-B7E5-95C02F1D713E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {DDD017D7-5B06-40AC-8FFD-306819508DE2} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0673499F-20F2-44EA-BCE8-55ED08404B17} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {664E73C3-9352-439E-B832-DC77719EB05E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C2121BF7-AC4E-4023-A302-97DC21C2B3A4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8E5246F8-C0E5-4945-AB79-12051002A6A4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F4DEEF6C-6908-4BF8-92DB-D59FDD198244} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {1DB7432B-DE52-4188-B3DB-746C66F6C418} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6F6CD8AB-745F-44CB-972E-55570C48E4DE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {9317CE1E-BCBE-44C1-A2FF-25F6A223531D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {289AAE9F-9200-45C5-B7E5-95C02F1D713E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {DDD017D7-5B06-40AC-8FFD-306819508DE2} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0673499F-20F2-44EA-BCE8-55ED08404B17} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {664E73C3-9352-439E-B832-DC77719EB05E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C2121BF7-AC4E-4023-A302-97DC21C2B3A4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8E5246F8-C0E5-4945-AB79-12051002A6A4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F4DEEF6C-6908-4BF8-92DB-D59FDD198244} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {1DB7432B-DE52-4188-B3DB-746C66F6C418} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6F6CD8AB-745F-44CB-972E-55570C48E4DE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {9317CE1E-BCBE-44C1-A2FF-25F6A223531D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {DA16F480-EE7C-4769-94CC-A84BE8DABC32} diff --git a/sdk/src/Services/SimpleEmail/Generated/AmazonSimpleEmailServiceConfig.cs b/sdk/src/Services/SimpleEmail/Generated/AmazonSimpleEmailServiceConfig.cs index 4a6a494678ec..c5ee1d592cd7 100644 --- a/sdk/src/Services/SimpleEmail/Generated/AmazonSimpleEmailServiceConfig.cs +++ b/sdk/src/Services/SimpleEmail/Generated/AmazonSimpleEmailServiceConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.SimpleEmail public partial class AmazonSimpleEmailServiceConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("SES", "4.0.0.0"); private static readonly AmazonSimpleEmailServiceEndpointResolver EndpointResolver = new AmazonSimpleEmailServiceEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("SES", "3.7.401.16"); -======= - InternalSDKUtils.BuildUserAgentString("SES", "3.7.401.43"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/SimpleEmail/Properties/AssemblyInfo.cs b/sdk/src/Services/SimpleEmail/Properties/AssemblyInfo.cs index 90eb9b5da82d..b96d091c1cb9 100644 --- a/sdk/src/Services/SimpleEmail/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/SimpleEmail/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.16")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.43")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/SimpleEmail/SimpleEmail.sln b/sdk/src/Services/SimpleEmail/SimpleEmail.sln index bee0dde7ac46..03ed603f0e05 100644 --- a/sdk/src/Services/SimpleEmail/SimpleEmail.sln +++ b/sdk/src/Services/SimpleEmail/SimpleEmail.sln @@ -92,7 +92,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {1800F2BC-B10E-4E4B-A945-15037BE90F59}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {1800F2BC-B10E-4E4B-A945-15037BE90F59}.Debug|Any CPU.Build.0 = Debug|Any CPU {1800F2BC-B10E-4E4B-A945-15037BE90F59}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -113,97 +120,6 @@ Global {F61AFE22-5C4F-4C29-B790-FC388CD59E30}.Debug|Any CPU.Build.0 = Debug|Any CPU {F61AFE22-5C4F-4C29-B790-FC388CD59E30}.Release|Any CPU.ActiveCfg = Release|Any CPU {F61AFE22-5C4F-4C29-B790-FC388CD59E30}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {DBDC2315-4E9B-4338-A067-012B52215005}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DBDC2315-4E9B-4338-A067-012B52215005}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DBDC2315-4E9B-4338-A067-012B52215005}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DBDC2315-4E9B-4338-A067-012B52215005}.Release|Any CPU.Build.0 = Release|Any CPU - {7CE3B760-F273-4C9C-9CDE-6F2EC67B76CA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7CE3B760-F273-4C9C-9CDE-6F2EC67B76CA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7CE3B760-F273-4C9C-9CDE-6F2EC67B76CA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7CE3B760-F273-4C9C-9CDE-6F2EC67B76CA}.Release|Any CPU.Build.0 = Release|Any CPU - {1B87E6AA-C88D-4476-9A5E-36F991B45A88}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1B87E6AA-C88D-4476-9A5E-36F991B45A88}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1B87E6AA-C88D-4476-9A5E-36F991B45A88}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1B87E6AA-C88D-4476-9A5E-36F991B45A88}.Release|Any CPU.Build.0 = Release|Any CPU - {E8CD06D7-F91D-4319-8769-A5BB660460EF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E8CD06D7-F91D-4319-8769-A5BB660460EF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E8CD06D7-F91D-4319-8769-A5BB660460EF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E8CD06D7-F91D-4319-8769-A5BB660460EF}.Release|Any CPU.Build.0 = Release|Any CPU - {DDDA7510-9B51-4E85-A1EC-0A40E2E993FF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DDDA7510-9B51-4E85-A1EC-0A40E2E993FF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DDDA7510-9B51-4E85-A1EC-0A40E2E993FF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DDDA7510-9B51-4E85-A1EC-0A40E2E993FF}.Release|Any CPU.Build.0 = Release|Any CPU - {ED5C3CC2-9E02-4DDD-97F0-FFF7CB03622A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {ED5C3CC2-9E02-4DDD-97F0-FFF7CB03622A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {ED5C3CC2-9E02-4DDD-97F0-FFF7CB03622A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {ED5C3CC2-9E02-4DDD-97F0-FFF7CB03622A}.Release|Any CPU.Build.0 = Release|Any CPU - {D5A96E0F-7B73-4EC1-A4D3-607421DB17A3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D5A96E0F-7B73-4EC1-A4D3-607421DB17A3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D5A96E0F-7B73-4EC1-A4D3-607421DB17A3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D5A96E0F-7B73-4EC1-A4D3-607421DB17A3}.Release|Any CPU.Build.0 = Release|Any CPU - {AC69C1B9-6D84-4AAD-B78B-0EADF5BAB0A1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AC69C1B9-6D84-4AAD-B78B-0EADF5BAB0A1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AC69C1B9-6D84-4AAD-B78B-0EADF5BAB0A1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AC69C1B9-6D84-4AAD-B78B-0EADF5BAB0A1}.Release|Any CPU.Build.0 = Release|Any CPU - {8E53F936-3170-4F80-9201-26AB5D17A1C7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8E53F936-3170-4F80-9201-26AB5D17A1C7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8E53F936-3170-4F80-9201-26AB5D17A1C7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8E53F936-3170-4F80-9201-26AB5D17A1C7}.Release|Any CPU.Build.0 = Release|Any CPU - {BB3634F4-F4E3-4CC5-915D-F773B6335423}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BB3634F4-F4E3-4CC5-915D-F773B6335423}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BB3634F4-F4E3-4CC5-915D-F773B6335423}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BB3634F4-F4E3-4CC5-915D-F773B6335423}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {DBDC2315-4E9B-4338-A067-012B52215005}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DBDC2315-4E9B-4338-A067-012B52215005}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DBDC2315-4E9B-4338-A067-012B52215005}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DBDC2315-4E9B-4338-A067-012B52215005}.Release|Any CPU.Build.0 = Release|Any CPU - {7CE3B760-F273-4C9C-9CDE-6F2EC67B76CA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7CE3B760-F273-4C9C-9CDE-6F2EC67B76CA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7CE3B760-F273-4C9C-9CDE-6F2EC67B76CA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7CE3B760-F273-4C9C-9CDE-6F2EC67B76CA}.Release|Any CPU.Build.0 = Release|Any CPU - {1B87E6AA-C88D-4476-9A5E-36F991B45A88}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1B87E6AA-C88D-4476-9A5E-36F991B45A88}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1B87E6AA-C88D-4476-9A5E-36F991B45A88}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1B87E6AA-C88D-4476-9A5E-36F991B45A88}.Release|Any CPU.Build.0 = Release|Any CPU - {E8CD06D7-F91D-4319-8769-A5BB660460EF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E8CD06D7-F91D-4319-8769-A5BB660460EF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E8CD06D7-F91D-4319-8769-A5BB660460EF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E8CD06D7-F91D-4319-8769-A5BB660460EF}.Release|Any CPU.Build.0 = Release|Any CPU - {DDDA7510-9B51-4E85-A1EC-0A40E2E993FF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DDDA7510-9B51-4E85-A1EC-0A40E2E993FF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DDDA7510-9B51-4E85-A1EC-0A40E2E993FF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DDDA7510-9B51-4E85-A1EC-0A40E2E993FF}.Release|Any CPU.Build.0 = Release|Any CPU - {ED5C3CC2-9E02-4DDD-97F0-FFF7CB03622A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {ED5C3CC2-9E02-4DDD-97F0-FFF7CB03622A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {ED5C3CC2-9E02-4DDD-97F0-FFF7CB03622A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {ED5C3CC2-9E02-4DDD-97F0-FFF7CB03622A}.Release|Any CPU.Build.0 = Release|Any CPU - {D5A96E0F-7B73-4EC1-A4D3-607421DB17A3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D5A96E0F-7B73-4EC1-A4D3-607421DB17A3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D5A96E0F-7B73-4EC1-A4D3-607421DB17A3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D5A96E0F-7B73-4EC1-A4D3-607421DB17A3}.Release|Any CPU.Build.0 = Release|Any CPU - {AC69C1B9-6D84-4AAD-B78B-0EADF5BAB0A1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AC69C1B9-6D84-4AAD-B78B-0EADF5BAB0A1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AC69C1B9-6D84-4AAD-B78B-0EADF5BAB0A1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AC69C1B9-6D84-4AAD-B78B-0EADF5BAB0A1}.Release|Any CPU.Build.0 = Release|Any CPU - {8E53F936-3170-4F80-9201-26AB5D17A1C7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8E53F936-3170-4F80-9201-26AB5D17A1C7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8E53F936-3170-4F80-9201-26AB5D17A1C7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8E53F936-3170-4F80-9201-26AB5D17A1C7}.Release|Any CPU.Build.0 = Release|Any CPU - {BB3634F4-F4E3-4CC5-915D-F773B6335423}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BB3634F4-F4E3-4CC5-915D-F773B6335423}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BB3634F4-F4E3-4CC5-915D-F773B6335423}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BB3634F4-F4E3-4CC5-915D-F773B6335423}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -220,37 +136,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {1800F2BC-B10E-4E4B-A945-15037BE90F59} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {315BACDB-0135-4CE3-B49F-8C7B1BB9D80B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {8C356972-497E-43B1-8E10-99E5CD4283A1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {FE042AAA-C8B8-4C5B-A763-4A55760A11B6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {F61AFE22-5C4F-4C29-B790-FC388CD59E30} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {DBDC2315-4E9B-4338-A067-012B52215005} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {7CE3B760-F273-4C9C-9CDE-6F2EC67B76CA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {1B87E6AA-C88D-4476-9A5E-36F991B45A88} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E8CD06D7-F91D-4319-8769-A5BB660460EF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {DDDA7510-9B51-4E85-A1EC-0A40E2E993FF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {ED5C3CC2-9E02-4DDD-97F0-FFF7CB03622A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D5A96E0F-7B73-4EC1-A4D3-607421DB17A3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {AC69C1B9-6D84-4AAD-B78B-0EADF5BAB0A1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8E53F936-3170-4F80-9201-26AB5D17A1C7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {BB3634F4-F4E3-4CC5-915D-F773B6335423} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {DBDC2315-4E9B-4338-A067-012B52215005} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {7CE3B760-F273-4C9C-9CDE-6F2EC67B76CA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {1B87E6AA-C88D-4476-9A5E-36F991B45A88} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E8CD06D7-F91D-4319-8769-A5BB660460EF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {DDDA7510-9B51-4E85-A1EC-0A40E2E993FF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {ED5C3CC2-9E02-4DDD-97F0-FFF7CB03622A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D5A96E0F-7B73-4EC1-A4D3-607421DB17A3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {AC69C1B9-6D84-4AAD-B78B-0EADF5BAB0A1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8E53F936-3170-4F80-9201-26AB5D17A1C7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {BB3634F4-F4E3-4CC5-915D-F773B6335423} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {2A6ADA67-9B44-48DB-8552-8DB03B41682C} diff --git a/sdk/src/Services/SimpleEmailV2/Generated/AmazonSimpleEmailServiceV2Config.cs b/sdk/src/Services/SimpleEmailV2/Generated/AmazonSimpleEmailServiceV2Config.cs index a070f50e1a7f..ca83b68bb507 100644 --- a/sdk/src/Services/SimpleEmailV2/Generated/AmazonSimpleEmailServiceV2Config.cs +++ b/sdk/src/Services/SimpleEmailV2/Generated/AmazonSimpleEmailServiceV2Config.cs @@ -34,16 +34,10 @@ namespace Amazon.SimpleEmailV2 public partial class AmazonSimpleEmailServiceV2Config : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("SESv2", "4.0.0.0"); private static readonly AmazonSimpleEmailServiceV2EndpointResolver EndpointResolver = new AmazonSimpleEmailServiceV2EndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("SESv2", "3.7.402.0"); -======= - InternalSDKUtils.BuildUserAgentString("SESv2", "3.7.404.9"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// @@ -107,7 +101,7 @@ public override string UserAgent /// The resolved endpoint for the given request. public override Amazon.Runtime.Endpoints.Endpoint DetermineServiceOperationEndpoint(ServiceOperationEndpointParameters parameters) { - var requestContext = new RequestContext(false, new AWS4Signer()) + var requestContext = new RequestContext(false, new AWSEndpointAuthSchemeSigner()) { ClientConfig = this, OriginalRequest = parameters.Request, diff --git a/sdk/src/Services/SimpleEmailV2/Generated/Model/DeliveryOptions.cs b/sdk/src/Services/SimpleEmailV2/Generated/Model/DeliveryOptions.cs index 1218d18f581a..950601ec0f34 100644 --- a/sdk/src/Services/SimpleEmailV2/Generated/Model/DeliveryOptions.cs +++ b/sdk/src/Services/SimpleEmailV2/Generated/Model/DeliveryOptions.cs @@ -47,9 +47,9 @@ public partial class DeliveryOptions /// /// [AWSProperty(Min=300, Max=50400)] - public long MaxDeliverySeconds + public long? MaxDeliverySeconds { - get { return this._maxDeliverySeconds.GetValueOrDefault(); } + get { return this._maxDeliverySeconds; } set { this._maxDeliverySeconds = value; } } diff --git a/sdk/src/Services/SimpleEmailV2/Generated/Model/Internal/MarshallTransformations/DeliveryOptionsMarshaller.cs b/sdk/src/Services/SimpleEmailV2/Generated/Model/Internal/MarshallTransformations/DeliveryOptionsMarshaller.cs index 777b96be103d..2ef2867ce86c 100644 --- a/sdk/src/Services/SimpleEmailV2/Generated/Model/Internal/MarshallTransformations/DeliveryOptionsMarshaller.cs +++ b/sdk/src/Services/SimpleEmailV2/Generated/Model/Internal/MarshallTransformations/DeliveryOptionsMarshaller.cs @@ -51,7 +51,7 @@ public void Marshall(DeliveryOptions requestObject, JsonMarshallerContext contex if(requestObject.IsSetMaxDeliverySeconds()) { context.Writer.WritePropertyName("MaxDeliverySeconds"); - context.Writer.Write(requestObject.MaxDeliverySeconds); + context.Writer.Write(requestObject.MaxDeliverySeconds.Value); } if(requestObject.IsSetSendingPoolName()) diff --git a/sdk/src/Services/SimpleEmailV2/Generated/Model/Internal/MarshallTransformations/DeliveryOptionsUnmarshaller.cs b/sdk/src/Services/SimpleEmailV2/Generated/Model/Internal/MarshallTransformations/DeliveryOptionsUnmarshaller.cs index 8cd358af67bf..7a9be9589032 100644 --- a/sdk/src/Services/SimpleEmailV2/Generated/Model/Internal/MarshallTransformations/DeliveryOptionsUnmarshaller.cs +++ b/sdk/src/Services/SimpleEmailV2/Generated/Model/Internal/MarshallTransformations/DeliveryOptionsUnmarshaller.cs @@ -68,7 +68,7 @@ public DeliveryOptions Unmarshall(JsonUnmarshallerContext context) { if (context.TestExpression("MaxDeliverySeconds", targetDepth)) { - var unmarshaller = LongUnmarshaller.Instance; + var unmarshaller = NullableLongUnmarshaller.Instance; unmarshalledObject.MaxDeliverySeconds = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/SimpleEmailV2/Generated/Model/Internal/MarshallTransformations/PutConfigurationSetDeliveryOptionsRequestMarshaller.cs b/sdk/src/Services/SimpleEmailV2/Generated/Model/Internal/MarshallTransformations/PutConfigurationSetDeliveryOptionsRequestMarshaller.cs index f0b310b6f347..d2f1265d38b3 100644 --- a/sdk/src/Services/SimpleEmailV2/Generated/Model/Internal/MarshallTransformations/PutConfigurationSetDeliveryOptionsRequestMarshaller.cs +++ b/sdk/src/Services/SimpleEmailV2/Generated/Model/Internal/MarshallTransformations/PutConfigurationSetDeliveryOptionsRequestMarshaller.cs @@ -66,32 +66,18 @@ public IRequest Marshall(PutConfigurationSetDeliveryOptionsRequest publicRequest request.ResourcePath = "/v2/email/configuration-sets/{ConfigurationSetName}/delivery-options"; using (MemoryStream memoryStream = new MemoryStream()) { -<<<<<<< HEAD using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) -||||||| Commit version number update changes - JsonWriter writer = new JsonWriter(stringWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetSendingPoolName()) -======= - JsonWriter writer = new JsonWriter(stringWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetMaxDeliverySeconds()) - { - context.Writer.WritePropertyName("MaxDeliverySeconds"); - context.Writer.Write(publicRequest.MaxDeliverySeconds); - } - - if(publicRequest.IsSetSendingPoolName()) ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b { JsonWriter writer = new JsonWriter(streamWriter); writer.Validate = false; writer.WriteObjectStart(); var context = new JsonMarshallerContext(request, writer); + if(publicRequest.IsSetMaxDeliverySeconds()) + { + context.Writer.WritePropertyName("MaxDeliverySeconds"); + context.Writer.Write(publicRequest.MaxDeliverySeconds.Value); + } + if(publicRequest.IsSetSendingPoolName()) { context.Writer.WritePropertyName("SendingPoolName"); diff --git a/sdk/src/Services/SimpleEmailV2/Generated/Model/PutConfigurationSetDeliveryOptionsRequest.cs b/sdk/src/Services/SimpleEmailV2/Generated/Model/PutConfigurationSetDeliveryOptionsRequest.cs index 2ce827461933..f585a3b3dc32 100644 --- a/sdk/src/Services/SimpleEmailV2/Generated/Model/PutConfigurationSetDeliveryOptionsRequest.cs +++ b/sdk/src/Services/SimpleEmailV2/Generated/Model/PutConfigurationSetDeliveryOptionsRequest.cs @@ -69,9 +69,9 @@ internal bool IsSetConfigurationSetName() /// /// [AWSProperty(Min=300, Max=50400)] - public long MaxDeliverySeconds + public long? MaxDeliverySeconds { - get { return this._maxDeliverySeconds.GetValueOrDefault(); } + get { return this._maxDeliverySeconds; } set { this._maxDeliverySeconds = value; } } diff --git a/sdk/src/Services/SimpleEmailV2/Generated/_bcl/AmazonSimpleEmailServiceV2Client.cs b/sdk/src/Services/SimpleEmailV2/Generated/_bcl/AmazonSimpleEmailServiceV2Client.cs index d7987bdb6503..7a7f0e048cab 100644 --- a/sdk/src/Services/SimpleEmailV2/Generated/_bcl/AmazonSimpleEmailServiceV2Client.cs +++ b/sdk/src/Services/SimpleEmailV2/Generated/_bcl/AmazonSimpleEmailServiceV2Client.cs @@ -238,7 +238,7 @@ public AmazonSimpleEmailServiceV2Client(string awsAccessKeyId, string awsSecretA /// protected override AbstractAWSSigner CreateSigner() { - return new AWS4Signer(); + return new AWSEndpointAuthSchemeSigner(); } /// diff --git a/sdk/src/Services/SimpleEmailV2/Properties/AssemblyInfo.cs b/sdk/src/Services/SimpleEmailV2/Properties/AssemblyInfo.cs index 45ac478ca994..03e10ddd1008 100644 --- a/sdk/src/Services/SimpleEmailV2/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/SimpleEmailV2/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.402.0")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.404.9")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/SimpleEmailV2/SimpleEmailV2.sln b/sdk/src/Services/SimpleEmailV2/SimpleEmailV2.sln index 2bd7435b9738..44bb963b940c 100644 --- a/sdk/src/Services/SimpleEmailV2/SimpleEmailV2.sln +++ b/sdk/src/Services/SimpleEmailV2/SimpleEmailV2.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {6ED0C924-9255-4552-AF4C-A30DB3C62ED1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {6ED0C924-9255-4552-AF4C-A30DB3C62ED1}.Debug|Any CPU.Build.0 = Debug|Any CPU {6ED0C924-9255-4552-AF4C-A30DB3C62ED1}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {DF176B11-E85F-4C3C-A2A2-4DD24D9E880F}.Debug|Any CPU.Build.0 = Debug|Any CPU {DF176B11-E85F-4C3C-A2A2-4DD24D9E880F}.Release|Any CPU.ActiveCfg = Release|Any CPU {DF176B11-E85F-4C3C-A2A2-4DD24D9E880F}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {F76FBD5F-48EC-407D-8180-117F5AC87ADA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F76FBD5F-48EC-407D-8180-117F5AC87ADA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F76FBD5F-48EC-407D-8180-117F5AC87ADA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F76FBD5F-48EC-407D-8180-117F5AC87ADA}.Release|Any CPU.Build.0 = Release|Any CPU - {58BE0AEF-93BB-4112-B0E4-8B1E31A07A77}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {58BE0AEF-93BB-4112-B0E4-8B1E31A07A77}.Debug|Any CPU.Build.0 = Debug|Any CPU - {58BE0AEF-93BB-4112-B0E4-8B1E31A07A77}.Release|Any CPU.ActiveCfg = Release|Any CPU - {58BE0AEF-93BB-4112-B0E4-8B1E31A07A77}.Release|Any CPU.Build.0 = Release|Any CPU - {17D74022-9A28-4EFF-8A1C-5FFA3DE93754}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {17D74022-9A28-4EFF-8A1C-5FFA3DE93754}.Debug|Any CPU.Build.0 = Debug|Any CPU - {17D74022-9A28-4EFF-8A1C-5FFA3DE93754}.Release|Any CPU.ActiveCfg = Release|Any CPU - {17D74022-9A28-4EFF-8A1C-5FFA3DE93754}.Release|Any CPU.Build.0 = Release|Any CPU - {A1261828-F818-4C04-B8BB-04D93D2871D8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A1261828-F818-4C04-B8BB-04D93D2871D8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A1261828-F818-4C04-B8BB-04D93D2871D8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A1261828-F818-4C04-B8BB-04D93D2871D8}.Release|Any CPU.Build.0 = Release|Any CPU - {E6E4018A-9B6F-479E-9751-2062D2A4A7FF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E6E4018A-9B6F-479E-9751-2062D2A4A7FF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E6E4018A-9B6F-479E-9751-2062D2A4A7FF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E6E4018A-9B6F-479E-9751-2062D2A4A7FF}.Release|Any CPU.Build.0 = Release|Any CPU - {A7C3BD27-8C7D-4C37-8474-E3D6C1283D2E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A7C3BD27-8C7D-4C37-8474-E3D6C1283D2E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A7C3BD27-8C7D-4C37-8474-E3D6C1283D2E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A7C3BD27-8C7D-4C37-8474-E3D6C1283D2E}.Release|Any CPU.Build.0 = Release|Any CPU - {C68541CA-C76E-4885-AD82-9563ADC32E6D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C68541CA-C76E-4885-AD82-9563ADC32E6D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C68541CA-C76E-4885-AD82-9563ADC32E6D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C68541CA-C76E-4885-AD82-9563ADC32E6D}.Release|Any CPU.Build.0 = Release|Any CPU - {8F785F3E-4D76-4B26-92AC-80B43675C73D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8F785F3E-4D76-4B26-92AC-80B43675C73D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8F785F3E-4D76-4B26-92AC-80B43675C73D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8F785F3E-4D76-4B26-92AC-80B43675C73D}.Release|Any CPU.Build.0 = Release|Any CPU - {A762BF54-F367-4F70-A1F3-71A315FF88AF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A762BF54-F367-4F70-A1F3-71A315FF88AF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A762BF54-F367-4F70-A1F3-71A315FF88AF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A762BF54-F367-4F70-A1F3-71A315FF88AF}.Release|Any CPU.Build.0 = Release|Any CPU - {03C48F0E-0412-415F-A535-B49D0F9DB2DE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {03C48F0E-0412-415F-A535-B49D0F9DB2DE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {03C48F0E-0412-415F-A535-B49D0F9DB2DE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {03C48F0E-0412-415F-A535-B49D0F9DB2DE}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {F76FBD5F-48EC-407D-8180-117F5AC87ADA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F76FBD5F-48EC-407D-8180-117F5AC87ADA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F76FBD5F-48EC-407D-8180-117F5AC87ADA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F76FBD5F-48EC-407D-8180-117F5AC87ADA}.Release|Any CPU.Build.0 = Release|Any CPU - {58BE0AEF-93BB-4112-B0E4-8B1E31A07A77}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {58BE0AEF-93BB-4112-B0E4-8B1E31A07A77}.Debug|Any CPU.Build.0 = Debug|Any CPU - {58BE0AEF-93BB-4112-B0E4-8B1E31A07A77}.Release|Any CPU.ActiveCfg = Release|Any CPU - {58BE0AEF-93BB-4112-B0E4-8B1E31A07A77}.Release|Any CPU.Build.0 = Release|Any CPU - {17D74022-9A28-4EFF-8A1C-5FFA3DE93754}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {17D74022-9A28-4EFF-8A1C-5FFA3DE93754}.Debug|Any CPU.Build.0 = Debug|Any CPU - {17D74022-9A28-4EFF-8A1C-5FFA3DE93754}.Release|Any CPU.ActiveCfg = Release|Any CPU - {17D74022-9A28-4EFF-8A1C-5FFA3DE93754}.Release|Any CPU.Build.0 = Release|Any CPU - {A1261828-F818-4C04-B8BB-04D93D2871D8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A1261828-F818-4C04-B8BB-04D93D2871D8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A1261828-F818-4C04-B8BB-04D93D2871D8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A1261828-F818-4C04-B8BB-04D93D2871D8}.Release|Any CPU.Build.0 = Release|Any CPU - {E6E4018A-9B6F-479E-9751-2062D2A4A7FF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E6E4018A-9B6F-479E-9751-2062D2A4A7FF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E6E4018A-9B6F-479E-9751-2062D2A4A7FF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E6E4018A-9B6F-479E-9751-2062D2A4A7FF}.Release|Any CPU.Build.0 = Release|Any CPU - {A7C3BD27-8C7D-4C37-8474-E3D6C1283D2E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A7C3BD27-8C7D-4C37-8474-E3D6C1283D2E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A7C3BD27-8C7D-4C37-8474-E3D6C1283D2E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A7C3BD27-8C7D-4C37-8474-E3D6C1283D2E}.Release|Any CPU.Build.0 = Release|Any CPU - {C68541CA-C76E-4885-AD82-9563ADC32E6D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C68541CA-C76E-4885-AD82-9563ADC32E6D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C68541CA-C76E-4885-AD82-9563ADC32E6D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C68541CA-C76E-4885-AD82-9563ADC32E6D}.Release|Any CPU.Build.0 = Release|Any CPU - {8F785F3E-4D76-4B26-92AC-80B43675C73D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8F785F3E-4D76-4B26-92AC-80B43675C73D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8F785F3E-4D76-4B26-92AC-80B43675C73D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8F785F3E-4D76-4B26-92AC-80B43675C73D}.Release|Any CPU.Build.0 = Release|Any CPU - {A762BF54-F367-4F70-A1F3-71A315FF88AF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A762BF54-F367-4F70-A1F3-71A315FF88AF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A762BF54-F367-4F70-A1F3-71A315FF88AF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A762BF54-F367-4F70-A1F3-71A315FF88AF}.Release|Any CPU.Build.0 = Release|Any CPU - {03C48F0E-0412-415F-A535-B49D0F9DB2DE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {03C48F0E-0412-415F-A535-B49D0F9DB2DE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {03C48F0E-0412-415F-A535-B49D0F9DB2DE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {03C48F0E-0412-415F-A535-B49D0F9DB2DE}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {6ED0C924-9255-4552-AF4C-A30DB3C62ED1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {8673B267-04DB-4A4B-937C-78261DF89AB2} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {FC1B2E0B-0F7A-4FD3-BD6D-7E57F38D861E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {CD3DD4E1-4215-4681-AF67-6A6CE3CC1837} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {DF176B11-E85F-4C3C-A2A2-4DD24D9E880F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {F76FBD5F-48EC-407D-8180-117F5AC87ADA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {58BE0AEF-93BB-4112-B0E4-8B1E31A07A77} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {17D74022-9A28-4EFF-8A1C-5FFA3DE93754} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A1261828-F818-4C04-B8BB-04D93D2871D8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E6E4018A-9B6F-479E-9751-2062D2A4A7FF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A7C3BD27-8C7D-4C37-8474-E3D6C1283D2E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C68541CA-C76E-4885-AD82-9563ADC32E6D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8F785F3E-4D76-4B26-92AC-80B43675C73D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A762BF54-F367-4F70-A1F3-71A315FF88AF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {03C48F0E-0412-415F-A535-B49D0F9DB2DE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {F76FBD5F-48EC-407D-8180-117F5AC87ADA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {58BE0AEF-93BB-4112-B0E4-8B1E31A07A77} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {17D74022-9A28-4EFF-8A1C-5FFA3DE93754} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A1261828-F818-4C04-B8BB-04D93D2871D8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E6E4018A-9B6F-479E-9751-2062D2A4A7FF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A7C3BD27-8C7D-4C37-8474-E3D6C1283D2E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C68541CA-C76E-4885-AD82-9563ADC32E6D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8F785F3E-4D76-4B26-92AC-80B43675C73D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A762BF54-F367-4F70-A1F3-71A315FF88AF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {03C48F0E-0412-415F-A535-B49D0F9DB2DE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {C41368CE-602A-483D-955C-2A33B242062D} diff --git a/sdk/src/Services/SimpleNotificationService/Generated/AmazonSimpleNotificationServiceConfig.cs b/sdk/src/Services/SimpleNotificationService/Generated/AmazonSimpleNotificationServiceConfig.cs index 73d0c55746b1..1f5cce80b876 100644 --- a/sdk/src/Services/SimpleNotificationService/Generated/AmazonSimpleNotificationServiceConfig.cs +++ b/sdk/src/Services/SimpleNotificationService/Generated/AmazonSimpleNotificationServiceConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.SimpleNotificationService public partial class AmazonSimpleNotificationServiceConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("SNS", "4.0.0.0"); private static readonly AmazonSimpleNotificationServiceEndpointResolver EndpointResolver = new AmazonSimpleNotificationServiceEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("SNS", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("SNS", "3.7.400.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/SimpleNotificationService/Properties/AssemblyInfo.cs b/sdk/src/Services/SimpleNotificationService/Properties/AssemblyInfo.cs index 8c408bf2606e..dcea617a0164 100644 --- a/sdk/src/Services/SimpleNotificationService/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/SimpleNotificationService/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/SimpleNotificationService/SimpleNotificationService.sln b/sdk/src/Services/SimpleNotificationService/SimpleNotificationService.sln index bb84a2186037..bcc1face93d9 100644 --- a/sdk/src/Services/SimpleNotificationService/SimpleNotificationService.sln +++ b/sdk/src/Services/SimpleNotificationService/SimpleNotificationService.sln @@ -92,7 +92,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {ADE606D0-4AFD-4E58-A0AB-82D564A7DC76}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {ADE606D0-4AFD-4E58-A0AB-82D564A7DC76}.Debug|Any CPU.Build.0 = Debug|Any CPU {ADE606D0-4AFD-4E58-A0AB-82D564A7DC76}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -113,97 +120,6 @@ Global {6423A32E-54D6-43FF-BC53-82D784D417F9}.Debug|Any CPU.Build.0 = Debug|Any CPU {6423A32E-54D6-43FF-BC53-82D784D417F9}.Release|Any CPU.ActiveCfg = Release|Any CPU {6423A32E-54D6-43FF-BC53-82D784D417F9}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {EBD5E579-4528-4501-8A5E-4D557CA07C95}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EBD5E579-4528-4501-8A5E-4D557CA07C95}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EBD5E579-4528-4501-8A5E-4D557CA07C95}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EBD5E579-4528-4501-8A5E-4D557CA07C95}.Release|Any CPU.Build.0 = Release|Any CPU - {617237F4-FBB6-4B55-8DB1-5C0D01D91DFF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {617237F4-FBB6-4B55-8DB1-5C0D01D91DFF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {617237F4-FBB6-4B55-8DB1-5C0D01D91DFF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {617237F4-FBB6-4B55-8DB1-5C0D01D91DFF}.Release|Any CPU.Build.0 = Release|Any CPU - {4DFC72B1-8C17-45E2-8168-5AC91714C31F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4DFC72B1-8C17-45E2-8168-5AC91714C31F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4DFC72B1-8C17-45E2-8168-5AC91714C31F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4DFC72B1-8C17-45E2-8168-5AC91714C31F}.Release|Any CPU.Build.0 = Release|Any CPU - {9D622C5D-C335-4A71-A619-C853CC1B601C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9D622C5D-C335-4A71-A619-C853CC1B601C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9D622C5D-C335-4A71-A619-C853CC1B601C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9D622C5D-C335-4A71-A619-C853CC1B601C}.Release|Any CPU.Build.0 = Release|Any CPU - {5197D539-C60F-42D3-A2FB-3D17F69FCC1F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5197D539-C60F-42D3-A2FB-3D17F69FCC1F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5197D539-C60F-42D3-A2FB-3D17F69FCC1F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5197D539-C60F-42D3-A2FB-3D17F69FCC1F}.Release|Any CPU.Build.0 = Release|Any CPU - {06F654A6-D66E-4AF2-8EA3-37E313C36C33}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {06F654A6-D66E-4AF2-8EA3-37E313C36C33}.Debug|Any CPU.Build.0 = Debug|Any CPU - {06F654A6-D66E-4AF2-8EA3-37E313C36C33}.Release|Any CPU.ActiveCfg = Release|Any CPU - {06F654A6-D66E-4AF2-8EA3-37E313C36C33}.Release|Any CPU.Build.0 = Release|Any CPU - {754D646A-1242-4CC4-9094-58482BC10821}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {754D646A-1242-4CC4-9094-58482BC10821}.Debug|Any CPU.Build.0 = Debug|Any CPU - {754D646A-1242-4CC4-9094-58482BC10821}.Release|Any CPU.ActiveCfg = Release|Any CPU - {754D646A-1242-4CC4-9094-58482BC10821}.Release|Any CPU.Build.0 = Release|Any CPU - {CE487DD3-D78D-4F44-8085-8E059CF8CC19}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CE487DD3-D78D-4F44-8085-8E059CF8CC19}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CE487DD3-D78D-4F44-8085-8E059CF8CC19}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CE487DD3-D78D-4F44-8085-8E059CF8CC19}.Release|Any CPU.Build.0 = Release|Any CPU - {15D9F154-67EE-4E97-ACE3-BCF2F22C8F14}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {15D9F154-67EE-4E97-ACE3-BCF2F22C8F14}.Debug|Any CPU.Build.0 = Debug|Any CPU - {15D9F154-67EE-4E97-ACE3-BCF2F22C8F14}.Release|Any CPU.ActiveCfg = Release|Any CPU - {15D9F154-67EE-4E97-ACE3-BCF2F22C8F14}.Release|Any CPU.Build.0 = Release|Any CPU - {0622D33E-C6A9-4045-AB92-7B8F3F5EFD13}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0622D33E-C6A9-4045-AB92-7B8F3F5EFD13}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0622D33E-C6A9-4045-AB92-7B8F3F5EFD13}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0622D33E-C6A9-4045-AB92-7B8F3F5EFD13}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {EBD5E579-4528-4501-8A5E-4D557CA07C95}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EBD5E579-4528-4501-8A5E-4D557CA07C95}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EBD5E579-4528-4501-8A5E-4D557CA07C95}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EBD5E579-4528-4501-8A5E-4D557CA07C95}.Release|Any CPU.Build.0 = Release|Any CPU - {617237F4-FBB6-4B55-8DB1-5C0D01D91DFF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {617237F4-FBB6-4B55-8DB1-5C0D01D91DFF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {617237F4-FBB6-4B55-8DB1-5C0D01D91DFF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {617237F4-FBB6-4B55-8DB1-5C0D01D91DFF}.Release|Any CPU.Build.0 = Release|Any CPU - {4DFC72B1-8C17-45E2-8168-5AC91714C31F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4DFC72B1-8C17-45E2-8168-5AC91714C31F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4DFC72B1-8C17-45E2-8168-5AC91714C31F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4DFC72B1-8C17-45E2-8168-5AC91714C31F}.Release|Any CPU.Build.0 = Release|Any CPU - {9D622C5D-C335-4A71-A619-C853CC1B601C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9D622C5D-C335-4A71-A619-C853CC1B601C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9D622C5D-C335-4A71-A619-C853CC1B601C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9D622C5D-C335-4A71-A619-C853CC1B601C}.Release|Any CPU.Build.0 = Release|Any CPU - {5197D539-C60F-42D3-A2FB-3D17F69FCC1F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5197D539-C60F-42D3-A2FB-3D17F69FCC1F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5197D539-C60F-42D3-A2FB-3D17F69FCC1F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5197D539-C60F-42D3-A2FB-3D17F69FCC1F}.Release|Any CPU.Build.0 = Release|Any CPU - {06F654A6-D66E-4AF2-8EA3-37E313C36C33}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {06F654A6-D66E-4AF2-8EA3-37E313C36C33}.Debug|Any CPU.Build.0 = Debug|Any CPU - {06F654A6-D66E-4AF2-8EA3-37E313C36C33}.Release|Any CPU.ActiveCfg = Release|Any CPU - {06F654A6-D66E-4AF2-8EA3-37E313C36C33}.Release|Any CPU.Build.0 = Release|Any CPU - {754D646A-1242-4CC4-9094-58482BC10821}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {754D646A-1242-4CC4-9094-58482BC10821}.Debug|Any CPU.Build.0 = Debug|Any CPU - {754D646A-1242-4CC4-9094-58482BC10821}.Release|Any CPU.ActiveCfg = Release|Any CPU - {754D646A-1242-4CC4-9094-58482BC10821}.Release|Any CPU.Build.0 = Release|Any CPU - {CE487DD3-D78D-4F44-8085-8E059CF8CC19}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CE487DD3-D78D-4F44-8085-8E059CF8CC19}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CE487DD3-D78D-4F44-8085-8E059CF8CC19}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CE487DD3-D78D-4F44-8085-8E059CF8CC19}.Release|Any CPU.Build.0 = Release|Any CPU - {15D9F154-67EE-4E97-ACE3-BCF2F22C8F14}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {15D9F154-67EE-4E97-ACE3-BCF2F22C8F14}.Debug|Any CPU.Build.0 = Debug|Any CPU - {15D9F154-67EE-4E97-ACE3-BCF2F22C8F14}.Release|Any CPU.ActiveCfg = Release|Any CPU - {15D9F154-67EE-4E97-ACE3-BCF2F22C8F14}.Release|Any CPU.Build.0 = Release|Any CPU - {0622D33E-C6A9-4045-AB92-7B8F3F5EFD13}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0622D33E-C6A9-4045-AB92-7B8F3F5EFD13}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0622D33E-C6A9-4045-AB92-7B8F3F5EFD13}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0622D33E-C6A9-4045-AB92-7B8F3F5EFD13}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -220,37 +136,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {ADE606D0-4AFD-4E58-A0AB-82D564A7DC76} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {2C2BBE91-57EB-4E7F-A354-8F3529DA593E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {D9386139-D823-44E3-B86D-1968FCDEC6CC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {34E070C5-0C03-4712-9B26-22BDD99C13E2} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {6423A32E-54D6-43FF-BC53-82D784D417F9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {EBD5E579-4528-4501-8A5E-4D557CA07C95} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {617237F4-FBB6-4B55-8DB1-5C0D01D91DFF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4DFC72B1-8C17-45E2-8168-5AC91714C31F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {9D622C5D-C335-4A71-A619-C853CC1B601C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {5197D539-C60F-42D3-A2FB-3D17F69FCC1F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {06F654A6-D66E-4AF2-8EA3-37E313C36C33} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {754D646A-1242-4CC4-9094-58482BC10821} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {CE487DD3-D78D-4F44-8085-8E059CF8CC19} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {15D9F154-67EE-4E97-ACE3-BCF2F22C8F14} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0622D33E-C6A9-4045-AB92-7B8F3F5EFD13} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {EBD5E579-4528-4501-8A5E-4D557CA07C95} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {617237F4-FBB6-4B55-8DB1-5C0D01D91DFF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4DFC72B1-8C17-45E2-8168-5AC91714C31F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {9D622C5D-C335-4A71-A619-C853CC1B601C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {5197D539-C60F-42D3-A2FB-3D17F69FCC1F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {06F654A6-D66E-4AF2-8EA3-37E313C36C33} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {754D646A-1242-4CC4-9094-58482BC10821} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {CE487DD3-D78D-4F44-8085-8E059CF8CC19} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {15D9F154-67EE-4E97-ACE3-BCF2F22C8F14} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0622D33E-C6A9-4045-AB92-7B8F3F5EFD13} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {51EBC97C-8215-4992-9888-04F9C48DBBC6} diff --git a/sdk/src/Services/SimpleSystemsManagement/Generated/AmazonSimpleSystemsManagementConfig.cs b/sdk/src/Services/SimpleSystemsManagement/Generated/AmazonSimpleSystemsManagementConfig.cs index 75f0c4081fdf..ca58f9fad2ac 100644 --- a/sdk/src/Services/SimpleSystemsManagement/Generated/AmazonSimpleSystemsManagementConfig.cs +++ b/sdk/src/Services/SimpleSystemsManagement/Generated/AmazonSimpleSystemsManagementConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.SimpleSystemsManagement public partial class AmazonSimpleSystemsManagementConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("SSM", "4.0.0.0"); private static readonly AmazonSimpleSystemsManagementEndpointResolver EndpointResolver = new AmazonSimpleSystemsManagementEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("SSM", "3.7.402.5"); -======= - InternalSDKUtils.BuildUserAgentString("SSM", "3.7.402.32"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/SimpleSystemsManagement/Properties/AssemblyInfo.cs b/sdk/src/Services/SimpleSystemsManagement/Properties/AssemblyInfo.cs index 4c0da976ac25..cd2c09179e66 100644 --- a/sdk/src/Services/SimpleSystemsManagement/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/SimpleSystemsManagement/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.402.5")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.402.32")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/SimpleSystemsManagement/SimpleSystemsManagement.sln b/sdk/src/Services/SimpleSystemsManagement/SimpleSystemsManagement.sln index 39dd238cd8b1..fb1f35b01434 100644 --- a/sdk/src/Services/SimpleSystemsManagement/SimpleSystemsManagement.sln +++ b/sdk/src/Services/SimpleSystemsManagement/SimpleSystemsManagement.sln @@ -92,7 +92,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {CCB0F1DC-AE4B-44C0-B419-B523A78FE2C9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {CCB0F1DC-AE4B-44C0-B419-B523A78FE2C9}.Debug|Any CPU.Build.0 = Debug|Any CPU {CCB0F1DC-AE4B-44C0-B419-B523A78FE2C9}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -113,97 +120,6 @@ Global {5CA5988C-F172-4466-9758-9362CA9ED9FE}.Debug|Any CPU.Build.0 = Debug|Any CPU {5CA5988C-F172-4466-9758-9362CA9ED9FE}.Release|Any CPU.ActiveCfg = Release|Any CPU {5CA5988C-F172-4466-9758-9362CA9ED9FE}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {E0C01002-2BF0-4ADA-B84C-915119785178}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E0C01002-2BF0-4ADA-B84C-915119785178}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E0C01002-2BF0-4ADA-B84C-915119785178}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E0C01002-2BF0-4ADA-B84C-915119785178}.Release|Any CPU.Build.0 = Release|Any CPU - {954CCC7D-2C2C-470C-B7FA-A9768F4D27CC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {954CCC7D-2C2C-470C-B7FA-A9768F4D27CC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {954CCC7D-2C2C-470C-B7FA-A9768F4D27CC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {954CCC7D-2C2C-470C-B7FA-A9768F4D27CC}.Release|Any CPU.Build.0 = Release|Any CPU - {ABAF4FEA-27A9-48BB-8469-7D029D99B1BC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {ABAF4FEA-27A9-48BB-8469-7D029D99B1BC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {ABAF4FEA-27A9-48BB-8469-7D029D99B1BC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {ABAF4FEA-27A9-48BB-8469-7D029D99B1BC}.Release|Any CPU.Build.0 = Release|Any CPU - {4468DD84-3203-4946-8616-A07C91C50AA8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4468DD84-3203-4946-8616-A07C91C50AA8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4468DD84-3203-4946-8616-A07C91C50AA8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4468DD84-3203-4946-8616-A07C91C50AA8}.Release|Any CPU.Build.0 = Release|Any CPU - {FDA5A092-AEA0-43C7-A048-53A7FCFE7167}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FDA5A092-AEA0-43C7-A048-53A7FCFE7167}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FDA5A092-AEA0-43C7-A048-53A7FCFE7167}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FDA5A092-AEA0-43C7-A048-53A7FCFE7167}.Release|Any CPU.Build.0 = Release|Any CPU - {E5CBBEB6-4E49-4957-969C-0900EF80C365}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E5CBBEB6-4E49-4957-969C-0900EF80C365}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E5CBBEB6-4E49-4957-969C-0900EF80C365}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E5CBBEB6-4E49-4957-969C-0900EF80C365}.Release|Any CPU.Build.0 = Release|Any CPU - {47BDBEAF-4DCB-4DE3-BEF2-5B97D8CC25B8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {47BDBEAF-4DCB-4DE3-BEF2-5B97D8CC25B8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {47BDBEAF-4DCB-4DE3-BEF2-5B97D8CC25B8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {47BDBEAF-4DCB-4DE3-BEF2-5B97D8CC25B8}.Release|Any CPU.Build.0 = Release|Any CPU - {37990887-6F42-4AFA-9784-5CBAA1CE3972}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {37990887-6F42-4AFA-9784-5CBAA1CE3972}.Debug|Any CPU.Build.0 = Debug|Any CPU - {37990887-6F42-4AFA-9784-5CBAA1CE3972}.Release|Any CPU.ActiveCfg = Release|Any CPU - {37990887-6F42-4AFA-9784-5CBAA1CE3972}.Release|Any CPU.Build.0 = Release|Any CPU - {40D5A48A-B4E6-455A-B951-452A40600E45}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {40D5A48A-B4E6-455A-B951-452A40600E45}.Debug|Any CPU.Build.0 = Debug|Any CPU - {40D5A48A-B4E6-455A-B951-452A40600E45}.Release|Any CPU.ActiveCfg = Release|Any CPU - {40D5A48A-B4E6-455A-B951-452A40600E45}.Release|Any CPU.Build.0 = Release|Any CPU - {A0A03EB2-B9D0-4538-8DF8-7B6D54798F4D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A0A03EB2-B9D0-4538-8DF8-7B6D54798F4D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A0A03EB2-B9D0-4538-8DF8-7B6D54798F4D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A0A03EB2-B9D0-4538-8DF8-7B6D54798F4D}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {E0C01002-2BF0-4ADA-B84C-915119785178}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E0C01002-2BF0-4ADA-B84C-915119785178}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E0C01002-2BF0-4ADA-B84C-915119785178}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E0C01002-2BF0-4ADA-B84C-915119785178}.Release|Any CPU.Build.0 = Release|Any CPU - {954CCC7D-2C2C-470C-B7FA-A9768F4D27CC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {954CCC7D-2C2C-470C-B7FA-A9768F4D27CC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {954CCC7D-2C2C-470C-B7FA-A9768F4D27CC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {954CCC7D-2C2C-470C-B7FA-A9768F4D27CC}.Release|Any CPU.Build.0 = Release|Any CPU - {ABAF4FEA-27A9-48BB-8469-7D029D99B1BC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {ABAF4FEA-27A9-48BB-8469-7D029D99B1BC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {ABAF4FEA-27A9-48BB-8469-7D029D99B1BC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {ABAF4FEA-27A9-48BB-8469-7D029D99B1BC}.Release|Any CPU.Build.0 = Release|Any CPU - {4468DD84-3203-4946-8616-A07C91C50AA8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4468DD84-3203-4946-8616-A07C91C50AA8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4468DD84-3203-4946-8616-A07C91C50AA8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4468DD84-3203-4946-8616-A07C91C50AA8}.Release|Any CPU.Build.0 = Release|Any CPU - {FDA5A092-AEA0-43C7-A048-53A7FCFE7167}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FDA5A092-AEA0-43C7-A048-53A7FCFE7167}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FDA5A092-AEA0-43C7-A048-53A7FCFE7167}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FDA5A092-AEA0-43C7-A048-53A7FCFE7167}.Release|Any CPU.Build.0 = Release|Any CPU - {E5CBBEB6-4E49-4957-969C-0900EF80C365}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E5CBBEB6-4E49-4957-969C-0900EF80C365}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E5CBBEB6-4E49-4957-969C-0900EF80C365}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E5CBBEB6-4E49-4957-969C-0900EF80C365}.Release|Any CPU.Build.0 = Release|Any CPU - {47BDBEAF-4DCB-4DE3-BEF2-5B97D8CC25B8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {47BDBEAF-4DCB-4DE3-BEF2-5B97D8CC25B8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {47BDBEAF-4DCB-4DE3-BEF2-5B97D8CC25B8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {47BDBEAF-4DCB-4DE3-BEF2-5B97D8CC25B8}.Release|Any CPU.Build.0 = Release|Any CPU - {37990887-6F42-4AFA-9784-5CBAA1CE3972}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {37990887-6F42-4AFA-9784-5CBAA1CE3972}.Debug|Any CPU.Build.0 = Debug|Any CPU - {37990887-6F42-4AFA-9784-5CBAA1CE3972}.Release|Any CPU.ActiveCfg = Release|Any CPU - {37990887-6F42-4AFA-9784-5CBAA1CE3972}.Release|Any CPU.Build.0 = Release|Any CPU - {40D5A48A-B4E6-455A-B951-452A40600E45}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {40D5A48A-B4E6-455A-B951-452A40600E45}.Debug|Any CPU.Build.0 = Debug|Any CPU - {40D5A48A-B4E6-455A-B951-452A40600E45}.Release|Any CPU.ActiveCfg = Release|Any CPU - {40D5A48A-B4E6-455A-B951-452A40600E45}.Release|Any CPU.Build.0 = Release|Any CPU - {A0A03EB2-B9D0-4538-8DF8-7B6D54798F4D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A0A03EB2-B9D0-4538-8DF8-7B6D54798F4D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A0A03EB2-B9D0-4538-8DF8-7B6D54798F4D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A0A03EB2-B9D0-4538-8DF8-7B6D54798F4D}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -220,37 +136,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {CCB0F1DC-AE4B-44C0-B419-B523A78FE2C9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {5DC1DECD-4EAA-44FF-9729-76557607DAC6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {D4327FF2-ADCE-43B1-980C-D9D6C20B5591} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {5B318B18-5433-4B0C-8DC1-5970001C2FDD} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {5CA5988C-F172-4466-9758-9362CA9ED9FE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {E0C01002-2BF0-4ADA-B84C-915119785178} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {954CCC7D-2C2C-470C-B7FA-A9768F4D27CC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {ABAF4FEA-27A9-48BB-8469-7D029D99B1BC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4468DD84-3203-4946-8616-A07C91C50AA8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {FDA5A092-AEA0-43C7-A048-53A7FCFE7167} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E5CBBEB6-4E49-4957-969C-0900EF80C365} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {47BDBEAF-4DCB-4DE3-BEF2-5B97D8CC25B8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {37990887-6F42-4AFA-9784-5CBAA1CE3972} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {40D5A48A-B4E6-455A-B951-452A40600E45} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A0A03EB2-B9D0-4538-8DF8-7B6D54798F4D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {E0C01002-2BF0-4ADA-B84C-915119785178} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {954CCC7D-2C2C-470C-B7FA-A9768F4D27CC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {ABAF4FEA-27A9-48BB-8469-7D029D99B1BC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4468DD84-3203-4946-8616-A07C91C50AA8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {FDA5A092-AEA0-43C7-A048-53A7FCFE7167} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E5CBBEB6-4E49-4957-969C-0900EF80C365} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {47BDBEAF-4DCB-4DE3-BEF2-5B97D8CC25B8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {37990887-6F42-4AFA-9784-5CBAA1CE3972} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {40D5A48A-B4E6-455A-B951-452A40600E45} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A0A03EB2-B9D0-4538-8DF8-7B6D54798F4D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {B43DD8C7-9514-4C4E-9744-C9FB5AA0D3D3} diff --git a/sdk/src/Services/SimpleWorkflow/Generated/AmazonSimpleWorkflowConfig.cs b/sdk/src/Services/SimpleWorkflow/Generated/AmazonSimpleWorkflowConfig.cs index 1c3600042c69..e34dbc6c72de 100644 --- a/sdk/src/Services/SimpleWorkflow/Generated/AmazonSimpleWorkflowConfig.cs +++ b/sdk/src/Services/SimpleWorkflow/Generated/AmazonSimpleWorkflowConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.SimpleWorkflow public partial class AmazonSimpleWorkflowConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("SWF", "4.0.0.0"); private static readonly AmazonSimpleWorkflowEndpointResolver EndpointResolver = new AmazonSimpleWorkflowEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("SWF", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("SWF", "3.7.400.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/SimpleWorkflow/Properties/AssemblyInfo.cs b/sdk/src/Services/SimpleWorkflow/Properties/AssemblyInfo.cs index 352bd0fec7ab..29b0953d09ce 100644 --- a/sdk/src/Services/SimpleWorkflow/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/SimpleWorkflow/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/SimpleWorkflow/SimpleWorkflow.sln b/sdk/src/Services/SimpleWorkflow/SimpleWorkflow.sln index a316d90fa83e..22347618bb3e 100644 --- a/sdk/src/Services/SimpleWorkflow/SimpleWorkflow.sln +++ b/sdk/src/Services/SimpleWorkflow/SimpleWorkflow.sln @@ -92,7 +92,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {301D2BD1-884C-46A3-974B-AE15A7CF0962}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {301D2BD1-884C-46A3-974B-AE15A7CF0962}.Debug|Any CPU.Build.0 = Debug|Any CPU {301D2BD1-884C-46A3-974B-AE15A7CF0962}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -113,97 +120,6 @@ Global {26481CB1-F9A5-4603-A522-533C7FE0D84E}.Debug|Any CPU.Build.0 = Debug|Any CPU {26481CB1-F9A5-4603-A522-533C7FE0D84E}.Release|Any CPU.ActiveCfg = Release|Any CPU {26481CB1-F9A5-4603-A522-533C7FE0D84E}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {00E29E08-301D-43C0-9ED8-906DE06A72E2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {00E29E08-301D-43C0-9ED8-906DE06A72E2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {00E29E08-301D-43C0-9ED8-906DE06A72E2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {00E29E08-301D-43C0-9ED8-906DE06A72E2}.Release|Any CPU.Build.0 = Release|Any CPU - {6BA5D659-7741-4DF9-8534-45939F6058B8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6BA5D659-7741-4DF9-8534-45939F6058B8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6BA5D659-7741-4DF9-8534-45939F6058B8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6BA5D659-7741-4DF9-8534-45939F6058B8}.Release|Any CPU.Build.0 = Release|Any CPU - {143FE808-B12F-46AE-AA55-45B3F53E41FF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {143FE808-B12F-46AE-AA55-45B3F53E41FF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {143FE808-B12F-46AE-AA55-45B3F53E41FF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {143FE808-B12F-46AE-AA55-45B3F53E41FF}.Release|Any CPU.Build.0 = Release|Any CPU - {A743C729-C05D-4E3E-ADA3-D6737D61DDE8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A743C729-C05D-4E3E-ADA3-D6737D61DDE8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A743C729-C05D-4E3E-ADA3-D6737D61DDE8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A743C729-C05D-4E3E-ADA3-D6737D61DDE8}.Release|Any CPU.Build.0 = Release|Any CPU - {A3EAEBFB-07F1-434A-9565-E72191189AF6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A3EAEBFB-07F1-434A-9565-E72191189AF6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A3EAEBFB-07F1-434A-9565-E72191189AF6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A3EAEBFB-07F1-434A-9565-E72191189AF6}.Release|Any CPU.Build.0 = Release|Any CPU - {19449630-70AF-4F54-A8A1-2466B8811F54}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {19449630-70AF-4F54-A8A1-2466B8811F54}.Debug|Any CPU.Build.0 = Debug|Any CPU - {19449630-70AF-4F54-A8A1-2466B8811F54}.Release|Any CPU.ActiveCfg = Release|Any CPU - {19449630-70AF-4F54-A8A1-2466B8811F54}.Release|Any CPU.Build.0 = Release|Any CPU - {D3C3E361-4AD9-45B7-A13E-122547529548}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D3C3E361-4AD9-45B7-A13E-122547529548}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D3C3E361-4AD9-45B7-A13E-122547529548}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D3C3E361-4AD9-45B7-A13E-122547529548}.Release|Any CPU.Build.0 = Release|Any CPU - {9C35F7A4-7D52-41EB-A0A4-CBDF35D5D646}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9C35F7A4-7D52-41EB-A0A4-CBDF35D5D646}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9C35F7A4-7D52-41EB-A0A4-CBDF35D5D646}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9C35F7A4-7D52-41EB-A0A4-CBDF35D5D646}.Release|Any CPU.Build.0 = Release|Any CPU - {D36CEDC7-6E42-4A0F-87E6-B2A5286DB102}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D36CEDC7-6E42-4A0F-87E6-B2A5286DB102}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D36CEDC7-6E42-4A0F-87E6-B2A5286DB102}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D36CEDC7-6E42-4A0F-87E6-B2A5286DB102}.Release|Any CPU.Build.0 = Release|Any CPU - {5475C677-5AEA-40F2-A575-978A3C2A8BCE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5475C677-5AEA-40F2-A575-978A3C2A8BCE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5475C677-5AEA-40F2-A575-978A3C2A8BCE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5475C677-5AEA-40F2-A575-978A3C2A8BCE}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {00E29E08-301D-43C0-9ED8-906DE06A72E2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {00E29E08-301D-43C0-9ED8-906DE06A72E2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {00E29E08-301D-43C0-9ED8-906DE06A72E2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {00E29E08-301D-43C0-9ED8-906DE06A72E2}.Release|Any CPU.Build.0 = Release|Any CPU - {6BA5D659-7741-4DF9-8534-45939F6058B8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6BA5D659-7741-4DF9-8534-45939F6058B8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6BA5D659-7741-4DF9-8534-45939F6058B8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6BA5D659-7741-4DF9-8534-45939F6058B8}.Release|Any CPU.Build.0 = Release|Any CPU - {143FE808-B12F-46AE-AA55-45B3F53E41FF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {143FE808-B12F-46AE-AA55-45B3F53E41FF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {143FE808-B12F-46AE-AA55-45B3F53E41FF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {143FE808-B12F-46AE-AA55-45B3F53E41FF}.Release|Any CPU.Build.0 = Release|Any CPU - {A743C729-C05D-4E3E-ADA3-D6737D61DDE8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A743C729-C05D-4E3E-ADA3-D6737D61DDE8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A743C729-C05D-4E3E-ADA3-D6737D61DDE8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A743C729-C05D-4E3E-ADA3-D6737D61DDE8}.Release|Any CPU.Build.0 = Release|Any CPU - {A3EAEBFB-07F1-434A-9565-E72191189AF6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A3EAEBFB-07F1-434A-9565-E72191189AF6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A3EAEBFB-07F1-434A-9565-E72191189AF6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A3EAEBFB-07F1-434A-9565-E72191189AF6}.Release|Any CPU.Build.0 = Release|Any CPU - {19449630-70AF-4F54-A8A1-2466B8811F54}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {19449630-70AF-4F54-A8A1-2466B8811F54}.Debug|Any CPU.Build.0 = Debug|Any CPU - {19449630-70AF-4F54-A8A1-2466B8811F54}.Release|Any CPU.ActiveCfg = Release|Any CPU - {19449630-70AF-4F54-A8A1-2466B8811F54}.Release|Any CPU.Build.0 = Release|Any CPU - {D3C3E361-4AD9-45B7-A13E-122547529548}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D3C3E361-4AD9-45B7-A13E-122547529548}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D3C3E361-4AD9-45B7-A13E-122547529548}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D3C3E361-4AD9-45B7-A13E-122547529548}.Release|Any CPU.Build.0 = Release|Any CPU - {9C35F7A4-7D52-41EB-A0A4-CBDF35D5D646}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9C35F7A4-7D52-41EB-A0A4-CBDF35D5D646}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9C35F7A4-7D52-41EB-A0A4-CBDF35D5D646}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9C35F7A4-7D52-41EB-A0A4-CBDF35D5D646}.Release|Any CPU.Build.0 = Release|Any CPU - {D36CEDC7-6E42-4A0F-87E6-B2A5286DB102}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D36CEDC7-6E42-4A0F-87E6-B2A5286DB102}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D36CEDC7-6E42-4A0F-87E6-B2A5286DB102}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D36CEDC7-6E42-4A0F-87E6-B2A5286DB102}.Release|Any CPU.Build.0 = Release|Any CPU - {5475C677-5AEA-40F2-A575-978A3C2A8BCE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5475C677-5AEA-40F2-A575-978A3C2A8BCE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5475C677-5AEA-40F2-A575-978A3C2A8BCE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5475C677-5AEA-40F2-A575-978A3C2A8BCE}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -220,37 +136,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {301D2BD1-884C-46A3-974B-AE15A7CF0962} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {CD0F3280-CB12-4638-8A98-EDF93413CCD9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {2C120DF7-788F-464D-8C16-63586AA96BF1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {2937D273-A06A-462A-81B3-13D5740F8E36} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {26481CB1-F9A5-4603-A522-533C7FE0D84E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {00E29E08-301D-43C0-9ED8-906DE06A72E2} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6BA5D659-7741-4DF9-8534-45939F6058B8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {143FE808-B12F-46AE-AA55-45B3F53E41FF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A743C729-C05D-4E3E-ADA3-D6737D61DDE8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A3EAEBFB-07F1-434A-9565-E72191189AF6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {19449630-70AF-4F54-A8A1-2466B8811F54} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D3C3E361-4AD9-45B7-A13E-122547529548} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {9C35F7A4-7D52-41EB-A0A4-CBDF35D5D646} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D36CEDC7-6E42-4A0F-87E6-B2A5286DB102} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {5475C677-5AEA-40F2-A575-978A3C2A8BCE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {00E29E08-301D-43C0-9ED8-906DE06A72E2} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6BA5D659-7741-4DF9-8534-45939F6058B8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {143FE808-B12F-46AE-AA55-45B3F53E41FF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A743C729-C05D-4E3E-ADA3-D6737D61DDE8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A3EAEBFB-07F1-434A-9565-E72191189AF6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {19449630-70AF-4F54-A8A1-2466B8811F54} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D3C3E361-4AD9-45B7-A13E-122547529548} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {9C35F7A4-7D52-41EB-A0A4-CBDF35D5D646} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D36CEDC7-6E42-4A0F-87E6-B2A5286DB102} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {5475C677-5AEA-40F2-A575-978A3C2A8BCE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {AA29CD40-F504-4D8D-A267-162B0C18A71A} diff --git a/sdk/src/Services/SnowDeviceManagement/Generated/AmazonSnowDeviceManagementConfig.cs b/sdk/src/Services/SnowDeviceManagement/Generated/AmazonSnowDeviceManagementConfig.cs index 55f83f5d6f67..586adc231c5e 100644 --- a/sdk/src/Services/SnowDeviceManagement/Generated/AmazonSnowDeviceManagementConfig.cs +++ b/sdk/src/Services/SnowDeviceManagement/Generated/AmazonSnowDeviceManagementConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.SnowDeviceManagement public partial class AmazonSnowDeviceManagementConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("Snow Device Management", "4.0.0.0"); private static readonly AmazonSnowDeviceManagementEndpointResolver EndpointResolver = new AmazonSnowDeviceManagementEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("Snow Device Management", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("Snow Device Management", "3.7.400.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/SnowDeviceManagement/Properties/AssemblyInfo.cs b/sdk/src/Services/SnowDeviceManagement/Properties/AssemblyInfo.cs index c49fe7a0064f..142cff28fe04 100644 --- a/sdk/src/Services/SnowDeviceManagement/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/SnowDeviceManagement/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/SnowDeviceManagement/SnowDeviceManagement.sln b/sdk/src/Services/SnowDeviceManagement/SnowDeviceManagement.sln index 5f15749a36f9..c4511dfb9265 100644 --- a/sdk/src/Services/SnowDeviceManagement/SnowDeviceManagement.sln +++ b/sdk/src/Services/SnowDeviceManagement/SnowDeviceManagement.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {FAD16B8A-9819-4838-A287-BF9BD84BC790}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {FAD16B8A-9819-4838-A287-BF9BD84BC790}.Debug|Any CPU.Build.0 = Debug|Any CPU {FAD16B8A-9819-4838-A287-BF9BD84BC790}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {54FB9BA4-A237-4B43-B675-74C54F03C559}.Debug|Any CPU.Build.0 = Debug|Any CPU {54FB9BA4-A237-4B43-B675-74C54F03C559}.Release|Any CPU.ActiveCfg = Release|Any CPU {54FB9BA4-A237-4B43-B675-74C54F03C559}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {CA5AD8D0-9EE0-45F7-84A6-96E599C0D937}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CA5AD8D0-9EE0-45F7-84A6-96E599C0D937}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CA5AD8D0-9EE0-45F7-84A6-96E599C0D937}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CA5AD8D0-9EE0-45F7-84A6-96E599C0D937}.Release|Any CPU.Build.0 = Release|Any CPU - {89FC8F17-9516-4705-A1C2-542F2A77275C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {89FC8F17-9516-4705-A1C2-542F2A77275C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {89FC8F17-9516-4705-A1C2-542F2A77275C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {89FC8F17-9516-4705-A1C2-542F2A77275C}.Release|Any CPU.Build.0 = Release|Any CPU - {625BB636-5857-4984-B35E-6C55DDD717D4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {625BB636-5857-4984-B35E-6C55DDD717D4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {625BB636-5857-4984-B35E-6C55DDD717D4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {625BB636-5857-4984-B35E-6C55DDD717D4}.Release|Any CPU.Build.0 = Release|Any CPU - {F52D9D96-BC0D-407D-9AEB-521E2D1951E9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F52D9D96-BC0D-407D-9AEB-521E2D1951E9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F52D9D96-BC0D-407D-9AEB-521E2D1951E9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F52D9D96-BC0D-407D-9AEB-521E2D1951E9}.Release|Any CPU.Build.0 = Release|Any CPU - {DFF0BD71-1F84-4223-B6A4-2AE679FEF096}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DFF0BD71-1F84-4223-B6A4-2AE679FEF096}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DFF0BD71-1F84-4223-B6A4-2AE679FEF096}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DFF0BD71-1F84-4223-B6A4-2AE679FEF096}.Release|Any CPU.Build.0 = Release|Any CPU - {B40849C9-4104-470E-84E6-7C9866C683BA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B40849C9-4104-470E-84E6-7C9866C683BA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B40849C9-4104-470E-84E6-7C9866C683BA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B40849C9-4104-470E-84E6-7C9866C683BA}.Release|Any CPU.Build.0 = Release|Any CPU - {9AB80D14-8E3A-4643-9840-7678221E3C9B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9AB80D14-8E3A-4643-9840-7678221E3C9B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9AB80D14-8E3A-4643-9840-7678221E3C9B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9AB80D14-8E3A-4643-9840-7678221E3C9B}.Release|Any CPU.Build.0 = Release|Any CPU - {2C2BBBAD-C3AF-40DD-84A4-218624058E1A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2C2BBBAD-C3AF-40DD-84A4-218624058E1A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2C2BBBAD-C3AF-40DD-84A4-218624058E1A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2C2BBBAD-C3AF-40DD-84A4-218624058E1A}.Release|Any CPU.Build.0 = Release|Any CPU - {2EF241B5-EA46-4B0C-A41B-0680B4C09F38}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2EF241B5-EA46-4B0C-A41B-0680B4C09F38}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2EF241B5-EA46-4B0C-A41B-0680B4C09F38}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2EF241B5-EA46-4B0C-A41B-0680B4C09F38}.Release|Any CPU.Build.0 = Release|Any CPU - {E21ACD86-386A-4E30-A9A3-A0BAFF6DB8E6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E21ACD86-386A-4E30-A9A3-A0BAFF6DB8E6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E21ACD86-386A-4E30-A9A3-A0BAFF6DB8E6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E21ACD86-386A-4E30-A9A3-A0BAFF6DB8E6}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {CA5AD8D0-9EE0-45F7-84A6-96E599C0D937}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CA5AD8D0-9EE0-45F7-84A6-96E599C0D937}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CA5AD8D0-9EE0-45F7-84A6-96E599C0D937}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CA5AD8D0-9EE0-45F7-84A6-96E599C0D937}.Release|Any CPU.Build.0 = Release|Any CPU - {89FC8F17-9516-4705-A1C2-542F2A77275C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {89FC8F17-9516-4705-A1C2-542F2A77275C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {89FC8F17-9516-4705-A1C2-542F2A77275C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {89FC8F17-9516-4705-A1C2-542F2A77275C}.Release|Any CPU.Build.0 = Release|Any CPU - {625BB636-5857-4984-B35E-6C55DDD717D4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {625BB636-5857-4984-B35E-6C55DDD717D4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {625BB636-5857-4984-B35E-6C55DDD717D4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {625BB636-5857-4984-B35E-6C55DDD717D4}.Release|Any CPU.Build.0 = Release|Any CPU - {F52D9D96-BC0D-407D-9AEB-521E2D1951E9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F52D9D96-BC0D-407D-9AEB-521E2D1951E9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F52D9D96-BC0D-407D-9AEB-521E2D1951E9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F52D9D96-BC0D-407D-9AEB-521E2D1951E9}.Release|Any CPU.Build.0 = Release|Any CPU - {DFF0BD71-1F84-4223-B6A4-2AE679FEF096}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DFF0BD71-1F84-4223-B6A4-2AE679FEF096}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DFF0BD71-1F84-4223-B6A4-2AE679FEF096}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DFF0BD71-1F84-4223-B6A4-2AE679FEF096}.Release|Any CPU.Build.0 = Release|Any CPU - {B40849C9-4104-470E-84E6-7C9866C683BA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B40849C9-4104-470E-84E6-7C9866C683BA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B40849C9-4104-470E-84E6-7C9866C683BA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B40849C9-4104-470E-84E6-7C9866C683BA}.Release|Any CPU.Build.0 = Release|Any CPU - {9AB80D14-8E3A-4643-9840-7678221E3C9B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9AB80D14-8E3A-4643-9840-7678221E3C9B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9AB80D14-8E3A-4643-9840-7678221E3C9B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9AB80D14-8E3A-4643-9840-7678221E3C9B}.Release|Any CPU.Build.0 = Release|Any CPU - {2C2BBBAD-C3AF-40DD-84A4-218624058E1A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2C2BBBAD-C3AF-40DD-84A4-218624058E1A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2C2BBBAD-C3AF-40DD-84A4-218624058E1A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2C2BBBAD-C3AF-40DD-84A4-218624058E1A}.Release|Any CPU.Build.0 = Release|Any CPU - {2EF241B5-EA46-4B0C-A41B-0680B4C09F38}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2EF241B5-EA46-4B0C-A41B-0680B4C09F38}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2EF241B5-EA46-4B0C-A41B-0680B4C09F38}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2EF241B5-EA46-4B0C-A41B-0680B4C09F38}.Release|Any CPU.Build.0 = Release|Any CPU - {E21ACD86-386A-4E30-A9A3-A0BAFF6DB8E6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E21ACD86-386A-4E30-A9A3-A0BAFF6DB8E6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E21ACD86-386A-4E30-A9A3-A0BAFF6DB8E6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E21ACD86-386A-4E30-A9A3-A0BAFF6DB8E6}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {FAD16B8A-9819-4838-A287-BF9BD84BC790} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {F9899BA4-2050-47B2-A029-090B02DD7BDE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {25D306DE-4B4C-4AB2-A69C-607471DF29F6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {EB4DDE94-3D64-435A-A7B5-AC5996E6B7D2} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {54FB9BA4-A237-4B43-B675-74C54F03C559} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {CA5AD8D0-9EE0-45F7-84A6-96E599C0D937} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {89FC8F17-9516-4705-A1C2-542F2A77275C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {625BB636-5857-4984-B35E-6C55DDD717D4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F52D9D96-BC0D-407D-9AEB-521E2D1951E9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {DFF0BD71-1F84-4223-B6A4-2AE679FEF096} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B40849C9-4104-470E-84E6-7C9866C683BA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {9AB80D14-8E3A-4643-9840-7678221E3C9B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {2C2BBBAD-C3AF-40DD-84A4-218624058E1A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {2EF241B5-EA46-4B0C-A41B-0680B4C09F38} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E21ACD86-386A-4E30-A9A3-A0BAFF6DB8E6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {CA5AD8D0-9EE0-45F7-84A6-96E599C0D937} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {89FC8F17-9516-4705-A1C2-542F2A77275C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {625BB636-5857-4984-B35E-6C55DDD717D4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F52D9D96-BC0D-407D-9AEB-521E2D1951E9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {DFF0BD71-1F84-4223-B6A4-2AE679FEF096} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B40849C9-4104-470E-84E6-7C9866C683BA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {9AB80D14-8E3A-4643-9840-7678221E3C9B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {2C2BBBAD-C3AF-40DD-84A4-218624058E1A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {2EF241B5-EA46-4B0C-A41B-0680B4C09F38} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E21ACD86-386A-4E30-A9A3-A0BAFF6DB8E6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {A907A4AA-22A8-466C-AF80-CB7B852BD2E4} diff --git a/sdk/src/Services/Snowball/Generated/AmazonSnowballConfig.cs b/sdk/src/Services/Snowball/Generated/AmazonSnowballConfig.cs index e5b0d19b2501..f7f9c0606d2f 100644 --- a/sdk/src/Services/Snowball/Generated/AmazonSnowballConfig.cs +++ b/sdk/src/Services/Snowball/Generated/AmazonSnowballConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.Snowball public partial class AmazonSnowballConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("Snowball", "4.0.0.0"); private static readonly AmazonSnowballEndpointResolver EndpointResolver = new AmazonSnowballEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("Snowball", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("Snowball", "3.7.400.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/Snowball/Properties/AssemblyInfo.cs b/sdk/src/Services/Snowball/Properties/AssemblyInfo.cs index 14635101f54c..ef5d45f16f70 100644 --- a/sdk/src/Services/Snowball/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/Snowball/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/Snowball/Snowball.sln b/sdk/src/Services/Snowball/Snowball.sln index 786c9fcf2485..9c7626a860b1 100644 --- a/sdk/src/Services/Snowball/Snowball.sln +++ b/sdk/src/Services/Snowball/Snowball.sln @@ -92,7 +92,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {39C38F68-7547-4F01-B9F7-B63DA5483FC7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {39C38F68-7547-4F01-B9F7-B63DA5483FC7}.Debug|Any CPU.Build.0 = Debug|Any CPU {39C38F68-7547-4F01-B9F7-B63DA5483FC7}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -113,97 +120,6 @@ Global {03F3506B-9CC9-4ED8-8196-33C85E327CC3}.Debug|Any CPU.Build.0 = Debug|Any CPU {03F3506B-9CC9-4ED8-8196-33C85E327CC3}.Release|Any CPU.ActiveCfg = Release|Any CPU {03F3506B-9CC9-4ED8-8196-33C85E327CC3}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {D166D3EB-EA55-471F-BAEC-B702B44A4254}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D166D3EB-EA55-471F-BAEC-B702B44A4254}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D166D3EB-EA55-471F-BAEC-B702B44A4254}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D166D3EB-EA55-471F-BAEC-B702B44A4254}.Release|Any CPU.Build.0 = Release|Any CPU - {4FD69A2C-D06D-4A3E-B9D8-89F5CAEB8697}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4FD69A2C-D06D-4A3E-B9D8-89F5CAEB8697}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4FD69A2C-D06D-4A3E-B9D8-89F5CAEB8697}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4FD69A2C-D06D-4A3E-B9D8-89F5CAEB8697}.Release|Any CPU.Build.0 = Release|Any CPU - {6B4EFE08-0B88-4B51-949A-F1E6DEB1EF4E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6B4EFE08-0B88-4B51-949A-F1E6DEB1EF4E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6B4EFE08-0B88-4B51-949A-F1E6DEB1EF4E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6B4EFE08-0B88-4B51-949A-F1E6DEB1EF4E}.Release|Any CPU.Build.0 = Release|Any CPU - {E6DC9C08-6C4E-48FB-B2A7-B69DA6605C7F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E6DC9C08-6C4E-48FB-B2A7-B69DA6605C7F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E6DC9C08-6C4E-48FB-B2A7-B69DA6605C7F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E6DC9C08-6C4E-48FB-B2A7-B69DA6605C7F}.Release|Any CPU.Build.0 = Release|Any CPU - {E3053B3F-CBEC-47DA-B87A-BB07484E9678}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E3053B3F-CBEC-47DA-B87A-BB07484E9678}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E3053B3F-CBEC-47DA-B87A-BB07484E9678}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E3053B3F-CBEC-47DA-B87A-BB07484E9678}.Release|Any CPU.Build.0 = Release|Any CPU - {8CA13A2E-325B-43DE-B122-61D6FD6A4A83}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8CA13A2E-325B-43DE-B122-61D6FD6A4A83}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8CA13A2E-325B-43DE-B122-61D6FD6A4A83}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8CA13A2E-325B-43DE-B122-61D6FD6A4A83}.Release|Any CPU.Build.0 = Release|Any CPU - {270E954E-BD03-4D40-9A92-AAADB48E3A47}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {270E954E-BD03-4D40-9A92-AAADB48E3A47}.Debug|Any CPU.Build.0 = Debug|Any CPU - {270E954E-BD03-4D40-9A92-AAADB48E3A47}.Release|Any CPU.ActiveCfg = Release|Any CPU - {270E954E-BD03-4D40-9A92-AAADB48E3A47}.Release|Any CPU.Build.0 = Release|Any CPU - {CDE3AE98-825D-458D-B5B1-5F6D01637544}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CDE3AE98-825D-458D-B5B1-5F6D01637544}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CDE3AE98-825D-458D-B5B1-5F6D01637544}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CDE3AE98-825D-458D-B5B1-5F6D01637544}.Release|Any CPU.Build.0 = Release|Any CPU - {16A91DEA-4E4C-42A7-B531-9ABFDCEF014D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {16A91DEA-4E4C-42A7-B531-9ABFDCEF014D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {16A91DEA-4E4C-42A7-B531-9ABFDCEF014D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {16A91DEA-4E4C-42A7-B531-9ABFDCEF014D}.Release|Any CPU.Build.0 = Release|Any CPU - {15FCB075-4D94-42B2-9F8F-BD8C643E8FB9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {15FCB075-4D94-42B2-9F8F-BD8C643E8FB9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {15FCB075-4D94-42B2-9F8F-BD8C643E8FB9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {15FCB075-4D94-42B2-9F8F-BD8C643E8FB9}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {D166D3EB-EA55-471F-BAEC-B702B44A4254}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D166D3EB-EA55-471F-BAEC-B702B44A4254}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D166D3EB-EA55-471F-BAEC-B702B44A4254}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D166D3EB-EA55-471F-BAEC-B702B44A4254}.Release|Any CPU.Build.0 = Release|Any CPU - {4FD69A2C-D06D-4A3E-B9D8-89F5CAEB8697}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4FD69A2C-D06D-4A3E-B9D8-89F5CAEB8697}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4FD69A2C-D06D-4A3E-B9D8-89F5CAEB8697}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4FD69A2C-D06D-4A3E-B9D8-89F5CAEB8697}.Release|Any CPU.Build.0 = Release|Any CPU - {6B4EFE08-0B88-4B51-949A-F1E6DEB1EF4E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6B4EFE08-0B88-4B51-949A-F1E6DEB1EF4E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6B4EFE08-0B88-4B51-949A-F1E6DEB1EF4E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6B4EFE08-0B88-4B51-949A-F1E6DEB1EF4E}.Release|Any CPU.Build.0 = Release|Any CPU - {E6DC9C08-6C4E-48FB-B2A7-B69DA6605C7F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E6DC9C08-6C4E-48FB-B2A7-B69DA6605C7F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E6DC9C08-6C4E-48FB-B2A7-B69DA6605C7F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E6DC9C08-6C4E-48FB-B2A7-B69DA6605C7F}.Release|Any CPU.Build.0 = Release|Any CPU - {E3053B3F-CBEC-47DA-B87A-BB07484E9678}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E3053B3F-CBEC-47DA-B87A-BB07484E9678}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E3053B3F-CBEC-47DA-B87A-BB07484E9678}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E3053B3F-CBEC-47DA-B87A-BB07484E9678}.Release|Any CPU.Build.0 = Release|Any CPU - {8CA13A2E-325B-43DE-B122-61D6FD6A4A83}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8CA13A2E-325B-43DE-B122-61D6FD6A4A83}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8CA13A2E-325B-43DE-B122-61D6FD6A4A83}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8CA13A2E-325B-43DE-B122-61D6FD6A4A83}.Release|Any CPU.Build.0 = Release|Any CPU - {270E954E-BD03-4D40-9A92-AAADB48E3A47}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {270E954E-BD03-4D40-9A92-AAADB48E3A47}.Debug|Any CPU.Build.0 = Debug|Any CPU - {270E954E-BD03-4D40-9A92-AAADB48E3A47}.Release|Any CPU.ActiveCfg = Release|Any CPU - {270E954E-BD03-4D40-9A92-AAADB48E3A47}.Release|Any CPU.Build.0 = Release|Any CPU - {CDE3AE98-825D-458D-B5B1-5F6D01637544}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CDE3AE98-825D-458D-B5B1-5F6D01637544}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CDE3AE98-825D-458D-B5B1-5F6D01637544}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CDE3AE98-825D-458D-B5B1-5F6D01637544}.Release|Any CPU.Build.0 = Release|Any CPU - {16A91DEA-4E4C-42A7-B531-9ABFDCEF014D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {16A91DEA-4E4C-42A7-B531-9ABFDCEF014D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {16A91DEA-4E4C-42A7-B531-9ABFDCEF014D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {16A91DEA-4E4C-42A7-B531-9ABFDCEF014D}.Release|Any CPU.Build.0 = Release|Any CPU - {15FCB075-4D94-42B2-9F8F-BD8C643E8FB9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {15FCB075-4D94-42B2-9F8F-BD8C643E8FB9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {15FCB075-4D94-42B2-9F8F-BD8C643E8FB9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {15FCB075-4D94-42B2-9F8F-BD8C643E8FB9}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -220,37 +136,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {39C38F68-7547-4F01-B9F7-B63DA5483FC7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {23EDB9A9-4159-436E-9E7B-DDD709E5CB5A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {9876253E-21E4-4AED-899A-8B15AD1E54FB} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {CA2FB629-C0ED-41E7-B35F-223EDC9EBFED} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {03F3506B-9CC9-4ED8-8196-33C85E327CC3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {D166D3EB-EA55-471F-BAEC-B702B44A4254} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4FD69A2C-D06D-4A3E-B9D8-89F5CAEB8697} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6B4EFE08-0B88-4B51-949A-F1E6DEB1EF4E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E6DC9C08-6C4E-48FB-B2A7-B69DA6605C7F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E3053B3F-CBEC-47DA-B87A-BB07484E9678} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8CA13A2E-325B-43DE-B122-61D6FD6A4A83} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {270E954E-BD03-4D40-9A92-AAADB48E3A47} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {CDE3AE98-825D-458D-B5B1-5F6D01637544} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {16A91DEA-4E4C-42A7-B531-9ABFDCEF014D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {15FCB075-4D94-42B2-9F8F-BD8C643E8FB9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {D166D3EB-EA55-471F-BAEC-B702B44A4254} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4FD69A2C-D06D-4A3E-B9D8-89F5CAEB8697} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6B4EFE08-0B88-4B51-949A-F1E6DEB1EF4E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E6DC9C08-6C4E-48FB-B2A7-B69DA6605C7F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E3053B3F-CBEC-47DA-B87A-BB07484E9678} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8CA13A2E-325B-43DE-B122-61D6FD6A4A83} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {270E954E-BD03-4D40-9A92-AAADB48E3A47} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {CDE3AE98-825D-458D-B5B1-5F6D01637544} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {16A91DEA-4E4C-42A7-B531-9ABFDCEF014D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {15FCB075-4D94-42B2-9F8F-BD8C643E8FB9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {CF4FF8D7-0049-40D0-912C-94D46CBC92DE} diff --git a/sdk/src/Services/SocialMessaging/AWSSDK.SocialMessaging.Net35.csproj b/sdk/src/Services/SocialMessaging/AWSSDK.SocialMessaging.Net35.csproj deleted file mode 100644 index 7d95b856fabc..000000000000 --- a/sdk/src/Services/SocialMessaging/AWSSDK.SocialMessaging.Net35.csproj +++ /dev/null @@ -1,83 +0,0 @@ - - - true - net35 - $(DefineConstants);BCL;BCL35;AWS_APM_API;CODE_ANALYSIS - portable - true - AWSSDK.SocialMessaging - AWSSDK.SocialMessaging - - false - false - false - false - false - false - false - false - true - true - - - C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v3.5\Profile\Client - - false - CA1822 - - - ../../../AWSDotNetSDK.ruleset - - - ../../../AWSDotNetSDKForBuild.ruleset - - - - - - ../../../awssdk.dll.snk - - - - - $(AWSKeyFile) - - - - - - - - - - - - - - - - - - - - - - - all - - - all - - - - - - - - - C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\v3.5\System.Data.Entity.dll - - - - - \ No newline at end of file diff --git a/sdk/src/Services/SocialMessaging/AWSSDK.SocialMessaging.Net45.csproj b/sdk/src/Services/SocialMessaging/AWSSDK.SocialMessaging.NetFramework.csproj similarity index 80% rename from sdk/src/Services/SocialMessaging/AWSSDK.SocialMessaging.Net45.csproj rename to sdk/src/Services/SocialMessaging/AWSSDK.SocialMessaging.NetFramework.csproj index d5f4b84bf0f4..e99edb840e7f 100644 --- a/sdk/src/Services/SocialMessaging/AWSSDK.SocialMessaging.Net45.csproj +++ b/sdk/src/Services/SocialMessaging/AWSSDK.SocialMessaging.NetFramework.csproj @@ -1,8 +1,8 @@ true - net45 - $(DefineConstants);BCL;BCL45;AWS_ASYNC_API;CODE_ANALYSIS + net472 + $(DefineConstants);BCL;AWS_ASYNC_API;CODE_ANALYSIS portable true AWSSDK.SocialMessaging @@ -21,6 +21,16 @@ CA1822 + + + 11.0 + + + 9.0 + ../../../AWSDotNetSDK.ruleset @@ -45,14 +55,13 @@ - - + diff --git a/sdk/src/Services/SocialMessaging/AWSSDK.SocialMessaging.NetStandard.csproj b/sdk/src/Services/SocialMessaging/AWSSDK.SocialMessaging.NetStandard.csproj index 6afcb43b707b..72a599b1b4a2 100644 --- a/sdk/src/Services/SocialMessaging/AWSSDK.SocialMessaging.NetStandard.csproj +++ b/sdk/src/Services/SocialMessaging/AWSSDK.SocialMessaging.NetStandard.csproj @@ -31,6 +31,16 @@ true + + + 11.0 + + + 9.0 + ../../../AWSDotNetSDK.ruleset @@ -55,8 +65,6 @@ - - diff --git a/sdk/src/Services/SocialMessaging/Generated/AmazonSocialMessagingConfig.cs b/sdk/src/Services/SocialMessaging/Generated/AmazonSocialMessagingConfig.cs index 08cddf6b829b..56a7c20cca98 100644 --- a/sdk/src/Services/SocialMessaging/Generated/AmazonSocialMessagingConfig.cs +++ b/sdk/src/Services/SocialMessaging/Generated/AmazonSocialMessagingConfig.cs @@ -21,6 +21,8 @@ using Amazon.Runtime; using Amazon.Runtime.Internal; using Amazon.Util.Internal; +using Amazon.Runtime.Internal.Auth; +using Amazon.Runtime.Endpoints; using Amazon.SocialMessaging.Internal; namespace Amazon.SocialMessaging @@ -32,7 +34,10 @@ namespace Amazon.SocialMessaging public partial class AmazonSocialMessagingConfig : ClientConfig { private static readonly string UserAgentString = - InternalSDKUtils.BuildUserAgentString("SocialMessaging", "3.7.400.20"); + InternalSDKUtils.BuildUserAgentString("SocialMessaging", "4.0.0.0"); + + private static readonly AmazonSocialMessagingEndpointResolver EndpointResolver = + new AmazonSocialMessagingEndpointResolver(); private string _userAgent = UserAgentString; /// @@ -89,5 +94,24 @@ public override string UserAgent } } + /// + /// Returns the endpoint that will be used for a particular request. + /// + /// A Container class for parameters used for endpoint resolution. + /// The resolved endpoint for the given request. + public override Amazon.Runtime.Endpoints.Endpoint DetermineServiceOperationEndpoint(ServiceOperationEndpointParameters parameters) + { + var requestContext = new RequestContext(false, new AWS4Signer()) + { + ClientConfig = this, + OriginalRequest = parameters.Request, + Request = new DefaultRequest(parameters.Request, ServiceId) + }; + + var executionContext = new Amazon.Runtime.Internal.ExecutionContext(requestContext, null); + return EndpointResolver.GetEndpoint(executionContext); + } + + } } \ No newline at end of file diff --git a/sdk/src/Services/SocialMessaging/Generated/AmazonSocialMessagingDefaultConfiguration.cs b/sdk/src/Services/SocialMessaging/Generated/AmazonSocialMessagingDefaultConfiguration.cs index ea9d3099275f..9aee90d7a916 100644 --- a/sdk/src/Services/SocialMessaging/Generated/AmazonSocialMessagingDefaultConfiguration.cs +++ b/sdk/src/Services/SocialMessaging/Generated/AmazonSocialMessagingDefaultConfiguration.cs @@ -43,8 +43,7 @@ public static ReadOnlyCollection GetAllConfigurations() InRegion, CrossRegion, Mobile, - Auto, - Legacy + Auto }); } @@ -55,7 +54,6 @@ public static ReadOnlyCollection GetAllConfigurations() { Name = DefaultConfigurationMode.Standard, RetryMode = RequestRetryMode.Standard, - StsRegionalEndpoints = StsRegionalEndpointsValue.Regional, S3UsEast1RegionalEndpoint = S3UsEast1RegionalEndpointValue.Regional, // 0:00:03.1 ConnectTimeout = TimeSpan.FromMilliseconds(3100L), @@ -71,7 +69,6 @@ public static ReadOnlyCollection GetAllConfigurations() { Name = DefaultConfigurationMode.InRegion, RetryMode = RequestRetryMode.Standard, - StsRegionalEndpoints = StsRegionalEndpointsValue.Regional, S3UsEast1RegionalEndpoint = S3UsEast1RegionalEndpointValue.Regional, // 0:00:01.1 ConnectTimeout = TimeSpan.FromMilliseconds(1100L), @@ -87,7 +84,6 @@ public static ReadOnlyCollection GetAllConfigurations() { Name = DefaultConfigurationMode.CrossRegion, RetryMode = RequestRetryMode.Standard, - StsRegionalEndpoints = StsRegionalEndpointsValue.Regional, S3UsEast1RegionalEndpoint = S3UsEast1RegionalEndpointValue.Regional, // 0:00:03.1 ConnectTimeout = TimeSpan.FromMilliseconds(3100L), @@ -103,7 +99,6 @@ public static ReadOnlyCollection GetAllConfigurations() { Name = DefaultConfigurationMode.Mobile, RetryMode = RequestRetryMode.Standard, - StsRegionalEndpoints = StsRegionalEndpointsValue.Regional, S3UsEast1RegionalEndpoint = S3UsEast1RegionalEndpointValue.Regional, // 0:00:30 ConnectTimeout = TimeSpan.FromMilliseconds(30000L), @@ -119,7 +114,6 @@ public static ReadOnlyCollection GetAllConfigurations() { Name = DefaultConfigurationMode.Auto, RetryMode = RequestRetryMode.Standard, - StsRegionalEndpoints = StsRegionalEndpointsValue.Regional, S3UsEast1RegionalEndpoint = S3UsEast1RegionalEndpointValue.Regional, // 0:00:01.1 ConnectTimeout = TimeSpan.FromMilliseconds(1100L), @@ -128,19 +122,5 @@ public static ReadOnlyCollection GetAllConfigurations() TimeToFirstByteTimeout = null, HttpRequestTimeout = null }; - /// - ///

            The LEGACY mode provides default settings that vary per SDK and were used prior to establishment of defaults_mode

            - ///             - public static IDefaultConfiguration Legacy {get;} = new DefaultConfiguration - { - Name = DefaultConfigurationMode.Legacy, - RetryMode = RequestRetryMode.Legacy, - StsRegionalEndpoints = StsRegionalEndpointsValue.Legacy, - S3UsEast1RegionalEndpoint = S3UsEast1RegionalEndpointValue.Legacy, - ConnectTimeout = null, - TlsNegotiationTimeout = null, - TimeToFirstByteTimeout = null, - HttpRequestTimeout = null - }; } } \ No newline at end of file diff --git a/sdk/src/Services/SocialMessaging/Generated/Model/AccessDeniedByMetaException.cs b/sdk/src/Services/SocialMessaging/Generated/Model/AccessDeniedByMetaException.cs index a2c4fab62059..bf9497654789 100644 --- a/sdk/src/Services/SocialMessaging/Generated/Model/AccessDeniedByMetaException.cs +++ b/sdk/src/Services/SocialMessaging/Generated/Model/AccessDeniedByMetaException.cs @@ -106,11 +106,6 @@ protected AccessDeniedByMetaException(System.Runtime.Serialization.Serialization /// The that holds the serialized object data about the exception being thrown. /// The that contains contextual information about the source or destination. /// The parameter is a null reference (Nothing in Visual Basic). -#if BCL35 - [System.Security.Permissions.SecurityPermission( - System.Security.Permissions.SecurityAction.LinkDemand, - Flags = System.Security.Permissions.SecurityPermissionFlag.SerializationFormatter)] -#endif [System.Security.SecurityCritical] // These FxCop rules are giving false-positives for this method [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Security", "CA2123:OverrideLinkDemandsShouldBeIdenticalToBase")] diff --git a/sdk/src/Services/SocialMessaging/Generated/Model/AccessDeniedException.cs b/sdk/src/Services/SocialMessaging/Generated/Model/AccessDeniedException.cs index 227fa221faed..760f82b7ea70 100644 --- a/sdk/src/Services/SocialMessaging/Generated/Model/AccessDeniedException.cs +++ b/sdk/src/Services/SocialMessaging/Generated/Model/AccessDeniedException.cs @@ -106,11 +106,6 @@ protected AccessDeniedException(System.Runtime.Serialization.SerializationInfo i /// The that holds the serialized object data about the exception being thrown. /// The that contains contextual information about the source or destination. /// The parameter is a null reference (Nothing in Visual Basic). -#if BCL35 - [System.Security.Permissions.SecurityPermission( - System.Security.Permissions.SecurityAction.LinkDemand, - Flags = System.Security.Permissions.SecurityPermissionFlag.SerializationFormatter)] -#endif [System.Security.SecurityCritical] // These FxCop rules are giving false-positives for this method [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Security", "CA2123:OverrideLinkDemandsShouldBeIdenticalToBase")] diff --git a/sdk/src/Services/SocialMessaging/Generated/Model/AssociateWhatsAppBusinessAccountResponse.cs b/sdk/src/Services/SocialMessaging/Generated/Model/AssociateWhatsAppBusinessAccountResponse.cs index ea8be746b6b3..e51dbdbdacb6 100644 --- a/sdk/src/Services/SocialMessaging/Generated/Model/AssociateWhatsAppBusinessAccountResponse.cs +++ b/sdk/src/Services/SocialMessaging/Generated/Model/AssociateWhatsAppBusinessAccountResponse.cs @@ -61,9 +61,9 @@ internal bool IsSetSignupCallbackResult() /// The status code for the response. /// ///             - public int StatusCode + public int? StatusCode { - get { return this._statusCode.GetValueOrDefault(); } + get { return this._statusCode; } set { this._statusCode = value; } } diff --git a/sdk/src/Services/SocialMessaging/Generated/Model/DeleteWhatsAppMessageMediaResponse.cs b/sdk/src/Services/SocialMessaging/Generated/Model/DeleteWhatsAppMessageMediaResponse.cs index b8eaac247f4e..d55725c84588 100644 --- a/sdk/src/Services/SocialMessaging/Generated/Model/DeleteWhatsAppMessageMediaResponse.cs +++ b/sdk/src/Services/SocialMessaging/Generated/Model/DeleteWhatsAppMessageMediaResponse.cs @@ -42,9 +42,9 @@ public partial class DeleteWhatsAppMessageMediaResponse : AmazonWebServiceRespon /// Success indicator for deleting the media file. /// ///             - public bool Success + public bool? Success { - get { return this._success.GetValueOrDefault(); } + get { return this._success; } set { this._success = value; } } diff --git a/sdk/src/Services/SocialMessaging/Generated/Model/DependencyException.cs b/sdk/src/Services/SocialMessaging/Generated/Model/DependencyException.cs index afac597beb8a..d8fa5a50fd79 100644 --- a/sdk/src/Services/SocialMessaging/Generated/Model/DependencyException.cs +++ b/sdk/src/Services/SocialMessaging/Generated/Model/DependencyException.cs @@ -108,11 +108,6 @@ protected DependencyException(System.Runtime.Serialization.SerializationInfo inf /// The that holds the serialized object data about the exception being thrown. /// The that contains contextual information about the source or destination. /// The parameter is a null reference (Nothing in Visual Basic). -#if BCL35 - [System.Security.Permissions.SecurityPermission( - System.Security.Permissions.SecurityAction.LinkDemand, - Flags = System.Security.Permissions.SecurityPermissionFlag.SerializationFormatter)] -#endif [System.Security.SecurityCritical] // These FxCop rules are giving false-positives for this method [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Security", "CA2123:OverrideLinkDemandsShouldBeIdenticalToBase")] diff --git a/sdk/src/Services/SocialMessaging/Generated/Model/GetWhatsAppMessageMediaRequest.cs b/sdk/src/Services/SocialMessaging/Generated/Model/GetWhatsAppMessageMediaRequest.cs index e9ef133e07f3..8c96ac36107b 100644 --- a/sdk/src/Services/SocialMessaging/Generated/Model/GetWhatsAppMessageMediaRequest.cs +++ b/sdk/src/Services/SocialMessaging/Generated/Model/GetWhatsAppMessageMediaRequest.cs @@ -107,9 +107,9 @@ internal bool IsSetMediaId() /// Set to True to get only the metadata for the file. /// ///             - public bool MetadataOnly + public bool? MetadataOnly { - get { return this._metadataOnly.GetValueOrDefault(); } + get { return this._metadataOnly; } set { this._metadataOnly = value; } } diff --git a/sdk/src/Services/SocialMessaging/Generated/Model/GetWhatsAppMessageMediaResponse.cs b/sdk/src/Services/SocialMessaging/Generated/Model/GetWhatsAppMessageMediaResponse.cs index 0a8611a8b300..00d24be75a66 100644 --- a/sdk/src/Services/SocialMessaging/Generated/Model/GetWhatsAppMessageMediaResponse.cs +++ b/sdk/src/Services/SocialMessaging/Generated/Model/GetWhatsAppMessageMediaResponse.cs @@ -43,9 +43,9 @@ public partial class GetWhatsAppMessageMediaResponse : AmazonWebServiceResponse /// The file size of the media, in KB. /// ///             - public long FileSize + public long? FileSize { - get { return this._fileSize.GetValueOrDefault(); } + get { return this._fileSize; } set { this._fileSize = value; } } diff --git a/sdk/src/Services/SocialMessaging/Generated/Model/Internal/MarshallTransformations/AssociateWhatsAppBusinessAccountRequestMarshaller.cs b/sdk/src/Services/SocialMessaging/Generated/Model/Internal/MarshallTransformations/AssociateWhatsAppBusinessAccountRequestMarshaller.cs index 8d32854fd61c..711c2c3026c5 100644 --- a/sdk/src/Services/SocialMessaging/Generated/Model/Internal/MarshallTransformations/AssociateWhatsAppBusinessAccountRequestMarshaller.cs +++ b/sdk/src/Services/SocialMessaging/Generated/Model/Internal/MarshallTransformations/AssociateWhatsAppBusinessAccountRequestMarshaller.cs @@ -61,37 +61,40 @@ public IRequest Marshall(AssociateWhatsAppBusinessAccountRequest publicRequest) request.HttpMethod = "POST"; request.ResourcePath = "/v1/whatsapp/signup"; - using (StringWriter stringWriter = new StringWriter(CultureInfo.InvariantCulture)) + using (MemoryStream memoryStream = new MemoryStream()) { - JsonWriter writer = new JsonWriter(stringWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetSetupFinalization()) + using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) { - context.Writer.WritePropertyName("setupFinalization"); - context.Writer.WriteObjectStart(); + JsonWriter writer = new JsonWriter(streamWriter); + writer.Validate = false; + writer.WriteObjectStart(); + var context = new JsonMarshallerContext(request, writer); + if(publicRequest.IsSetSetupFinalization()) + { + context.Writer.WritePropertyName("setupFinalization"); + context.Writer.WriteObjectStart(); - var marshaller = WhatsAppSetupFinalizationMarshaller.Instance; - marshaller.Marshall(publicRequest.SetupFinalization, context); + var marshaller = WhatsAppSetupFinalizationMarshaller.Instance; + marshaller.Marshall(publicRequest.SetupFinalization, context); - context.Writer.WriteObjectEnd(); - } + context.Writer.WriteObjectEnd(); + } - if(publicRequest.IsSetSignupCallback()) - { - context.Writer.WritePropertyName("signupCallback"); - context.Writer.WriteObjectStart(); + if(publicRequest.IsSetSignupCallback()) + { + context.Writer.WritePropertyName("signupCallback"); + context.Writer.WriteObjectStart(); + + var marshaller = WhatsAppSignupCallbackMarshaller.Instance; + marshaller.Marshall(publicRequest.SignupCallback, context); - var marshaller = WhatsAppSignupCallbackMarshaller.Instance; - marshaller.Marshall(publicRequest.SignupCallback, context); + context.Writer.WriteObjectEnd(); + } - context.Writer.WriteObjectEnd(); + writer.WriteObjectEnd(); } - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); + request.Content = memoryStream.ToArray(); } diff --git a/sdk/src/Services/SocialMessaging/Generated/Model/Internal/MarshallTransformations/AssociateWhatsAppBusinessAccountResponseUnmarshaller.cs b/sdk/src/Services/SocialMessaging/Generated/Model/Internal/MarshallTransformations/AssociateWhatsAppBusinessAccountResponseUnmarshaller.cs index 3ad8920a67c6..67ca3fc761e2 100644 --- a/sdk/src/Services/SocialMessaging/Generated/Model/Internal/MarshallTransformations/AssociateWhatsAppBusinessAccountResponseUnmarshaller.cs +++ b/sdk/src/Services/SocialMessaging/Generated/Model/Internal/MarshallTransformations/AssociateWhatsAppBusinessAccountResponseUnmarshaller.cs @@ -60,7 +60,7 @@ public override AmazonWebServiceResponse Unmarshall(JsonUnmarshallerContext cont } if (context.TestExpression("statusCode", targetDepth)) { - var unmarshaller = IntUnmarshaller.Instance; + var unmarshaller = NullableIntUnmarshaller.Instance; response.StatusCode = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/SocialMessaging/Generated/Model/Internal/MarshallTransformations/DeleteWhatsAppMessageMediaResponseUnmarshaller.cs b/sdk/src/Services/SocialMessaging/Generated/Model/Internal/MarshallTransformations/DeleteWhatsAppMessageMediaResponseUnmarshaller.cs index 6bcf271f59db..39ba92b8eac9 100644 --- a/sdk/src/Services/SocialMessaging/Generated/Model/Internal/MarshallTransformations/DeleteWhatsAppMessageMediaResponseUnmarshaller.cs +++ b/sdk/src/Services/SocialMessaging/Generated/Model/Internal/MarshallTransformations/DeleteWhatsAppMessageMediaResponseUnmarshaller.cs @@ -54,7 +54,7 @@ public override AmazonWebServiceResponse Unmarshall(JsonUnmarshallerContext cont { if (context.TestExpression("success", targetDepth)) { - var unmarshaller = BoolUnmarshaller.Instance; + var unmarshaller = NullableBoolUnmarshaller.Instance; response.Success = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/SocialMessaging/Generated/Model/Internal/MarshallTransformations/GetWhatsAppMessageMediaRequestMarshaller.cs b/sdk/src/Services/SocialMessaging/Generated/Model/Internal/MarshallTransformations/GetWhatsAppMessageMediaRequestMarshaller.cs index 42b00ccc090b..3b95231a49ff 100644 --- a/sdk/src/Services/SocialMessaging/Generated/Model/Internal/MarshallTransformations/GetWhatsAppMessageMediaRequestMarshaller.cs +++ b/sdk/src/Services/SocialMessaging/Generated/Model/Internal/MarshallTransformations/GetWhatsAppMessageMediaRequestMarshaller.cs @@ -61,55 +61,58 @@ public IRequest Marshall(GetWhatsAppMessageMediaRequest publicRequest) request.HttpMethod = "POST"; request.ResourcePath = "/v1/whatsapp/media/get"; - using (StringWriter stringWriter = new StringWriter(CultureInfo.InvariantCulture)) + using (MemoryStream memoryStream = new MemoryStream()) { - JsonWriter writer = new JsonWriter(stringWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetDestinationS3File()) + using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) { - context.Writer.WritePropertyName("destinationS3File"); - context.Writer.WriteObjectStart(); - - var marshaller = S3FileMarshaller.Instance; - marshaller.Marshall(publicRequest.DestinationS3File, context); - - context.Writer.WriteObjectEnd(); - } - - if(publicRequest.IsSetDestinationS3PresignedUrl()) - { - context.Writer.WritePropertyName("destinationS3PresignedUrl"); - context.Writer.WriteObjectStart(); - - var marshaller = S3PresignedUrlMarshaller.Instance; - marshaller.Marshall(publicRequest.DestinationS3PresignedUrl, context); - - context.Writer.WriteObjectEnd(); - } - - if(publicRequest.IsSetMediaId()) - { - context.Writer.WritePropertyName("mediaId"); - context.Writer.Write(publicRequest.MediaId); - } - - if(publicRequest.IsSetMetadataOnly()) - { - context.Writer.WritePropertyName("metadataOnly"); - context.Writer.Write(publicRequest.MetadataOnly); - } - - if(publicRequest.IsSetOriginationPhoneNumberId()) - { - context.Writer.WritePropertyName("originationPhoneNumberId"); - context.Writer.Write(publicRequest.OriginationPhoneNumberId); + JsonWriter writer = new JsonWriter(streamWriter); + writer.Validate = false; + writer.WriteObjectStart(); + var context = new JsonMarshallerContext(request, writer); + if(publicRequest.IsSetDestinationS3File()) + { + context.Writer.WritePropertyName("destinationS3File"); + context.Writer.WriteObjectStart(); + + var marshaller = S3FileMarshaller.Instance; + marshaller.Marshall(publicRequest.DestinationS3File, context); + + context.Writer.WriteObjectEnd(); + } + + if(publicRequest.IsSetDestinationS3PresignedUrl()) + { + context.Writer.WritePropertyName("destinationS3PresignedUrl"); + context.Writer.WriteObjectStart(); + + var marshaller = S3PresignedUrlMarshaller.Instance; + marshaller.Marshall(publicRequest.DestinationS3PresignedUrl, context); + + context.Writer.WriteObjectEnd(); + } + + if(publicRequest.IsSetMediaId()) + { + context.Writer.WritePropertyName("mediaId"); + context.Writer.Write(publicRequest.MediaId); + } + + if(publicRequest.IsSetMetadataOnly()) + { + context.Writer.WritePropertyName("metadataOnly"); + context.Writer.Write(publicRequest.MetadataOnly.Value); + } + + if(publicRequest.IsSetOriginationPhoneNumberId()) + { + context.Writer.WritePropertyName("originationPhoneNumberId"); + context.Writer.Write(publicRequest.OriginationPhoneNumberId); + } + + writer.WriteObjectEnd(); } - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); + request.Content = memoryStream.ToArray(); } diff --git a/sdk/src/Services/SocialMessaging/Generated/Model/Internal/MarshallTransformations/GetWhatsAppMessageMediaResponseUnmarshaller.cs b/sdk/src/Services/SocialMessaging/Generated/Model/Internal/MarshallTransformations/GetWhatsAppMessageMediaResponseUnmarshaller.cs index 5b4d7a154a6d..b9db5ad15a06 100644 --- a/sdk/src/Services/SocialMessaging/Generated/Model/Internal/MarshallTransformations/GetWhatsAppMessageMediaResponseUnmarshaller.cs +++ b/sdk/src/Services/SocialMessaging/Generated/Model/Internal/MarshallTransformations/GetWhatsAppMessageMediaResponseUnmarshaller.cs @@ -54,7 +54,7 @@ public override AmazonWebServiceResponse Unmarshall(JsonUnmarshallerContext cont { if (context.TestExpression("fileSize", targetDepth)) { - var unmarshaller = LongUnmarshaller.Instance; + var unmarshaller = NullableLongUnmarshaller.Instance; response.FileSize = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/SocialMessaging/Generated/Model/Internal/MarshallTransformations/LinkedWhatsAppBusinessAccountSummaryUnmarshaller.cs b/sdk/src/Services/SocialMessaging/Generated/Model/Internal/MarshallTransformations/LinkedWhatsAppBusinessAccountSummaryUnmarshaller.cs index 86d2bc524e08..4a02ad4ba24b 100644 --- a/sdk/src/Services/SocialMessaging/Generated/Model/Internal/MarshallTransformations/LinkedWhatsAppBusinessAccountSummaryUnmarshaller.cs +++ b/sdk/src/Services/SocialMessaging/Generated/Model/Internal/MarshallTransformations/LinkedWhatsAppBusinessAccountSummaryUnmarshaller.cs @@ -86,7 +86,7 @@ public LinkedWhatsAppBusinessAccountSummary Unmarshall(JsonUnmarshallerContext c } if (context.TestExpression("linkDate", targetDepth)) { - var unmarshaller = DateTimeUnmarshaller.Instance; + var unmarshaller = NullableDateTimeUnmarshaller.Instance; unmarshalledObject.LinkDate = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/SocialMessaging/Generated/Model/Internal/MarshallTransformations/LinkedWhatsAppBusinessAccountUnmarshaller.cs b/sdk/src/Services/SocialMessaging/Generated/Model/Internal/MarshallTransformations/LinkedWhatsAppBusinessAccountUnmarshaller.cs index 245e77e2f7ee..1cfd09ec91a5 100644 --- a/sdk/src/Services/SocialMessaging/Generated/Model/Internal/MarshallTransformations/LinkedWhatsAppBusinessAccountUnmarshaller.cs +++ b/sdk/src/Services/SocialMessaging/Generated/Model/Internal/MarshallTransformations/LinkedWhatsAppBusinessAccountUnmarshaller.cs @@ -86,7 +86,7 @@ public LinkedWhatsAppBusinessAccount Unmarshall(JsonUnmarshallerContext context) } if (context.TestExpression("linkDate", targetDepth)) { - var unmarshaller = DateTimeUnmarshaller.Instance; + var unmarshaller = NullableDateTimeUnmarshaller.Instance; unmarshalledObject.LinkDate = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/SocialMessaging/Generated/Model/Internal/MarshallTransformations/ListTagsForResourceResponseUnmarshaller.cs b/sdk/src/Services/SocialMessaging/Generated/Model/Internal/MarshallTransformations/ListTagsForResourceResponseUnmarshaller.cs index 6d42763c0dd3..932fcf372238 100644 --- a/sdk/src/Services/SocialMessaging/Generated/Model/Internal/MarshallTransformations/ListTagsForResourceResponseUnmarshaller.cs +++ b/sdk/src/Services/SocialMessaging/Generated/Model/Internal/MarshallTransformations/ListTagsForResourceResponseUnmarshaller.cs @@ -54,7 +54,7 @@ public override AmazonWebServiceResponse Unmarshall(JsonUnmarshallerContext cont { if (context.TestExpression("statusCode", targetDepth)) { - var unmarshaller = IntUnmarshaller.Instance; + var unmarshaller = NullableIntUnmarshaller.Instance; response.StatusCode = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/SocialMessaging/Generated/Model/Internal/MarshallTransformations/PostWhatsAppMessageMediaRequestMarshaller.cs b/sdk/src/Services/SocialMessaging/Generated/Model/Internal/MarshallTransformations/PostWhatsAppMessageMediaRequestMarshaller.cs index 4cdf26a8783f..89866eb3546b 100644 --- a/sdk/src/Services/SocialMessaging/Generated/Model/Internal/MarshallTransformations/PostWhatsAppMessageMediaRequestMarshaller.cs +++ b/sdk/src/Services/SocialMessaging/Generated/Model/Internal/MarshallTransformations/PostWhatsAppMessageMediaRequestMarshaller.cs @@ -61,43 +61,46 @@ public IRequest Marshall(PostWhatsAppMessageMediaRequest publicRequest) request.HttpMethod = "POST"; request.ResourcePath = "/v1/whatsapp/media"; - using (StringWriter stringWriter = new StringWriter(CultureInfo.InvariantCulture)) + using (MemoryStream memoryStream = new MemoryStream()) { - JsonWriter writer = new JsonWriter(stringWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetOriginationPhoneNumberId()) + using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) { - context.Writer.WritePropertyName("originationPhoneNumberId"); - context.Writer.Write(publicRequest.OriginationPhoneNumberId); + JsonWriter writer = new JsonWriter(streamWriter); + writer.Validate = false; + writer.WriteObjectStart(); + var context = new JsonMarshallerContext(request, writer); + if(publicRequest.IsSetOriginationPhoneNumberId()) + { + context.Writer.WritePropertyName("originationPhoneNumberId"); + context.Writer.Write(publicRequest.OriginationPhoneNumberId); + } + + if(publicRequest.IsSetSourceS3File()) + { + context.Writer.WritePropertyName("sourceS3File"); + context.Writer.WriteObjectStart(); + + var marshaller = S3FileMarshaller.Instance; + marshaller.Marshall(publicRequest.SourceS3File, context); + + context.Writer.WriteObjectEnd(); + } + + if(publicRequest.IsSetSourceS3PresignedUrl()) + { + context.Writer.WritePropertyName("sourceS3PresignedUrl"); + context.Writer.WriteObjectStart(); + + var marshaller = S3PresignedUrlMarshaller.Instance; + marshaller.Marshall(publicRequest.SourceS3PresignedUrl, context); + + context.Writer.WriteObjectEnd(); + } + + writer.WriteObjectEnd(); } - if(publicRequest.IsSetSourceS3File()) - { - context.Writer.WritePropertyName("sourceS3File"); - context.Writer.WriteObjectStart(); - - var marshaller = S3FileMarshaller.Instance; - marshaller.Marshall(publicRequest.SourceS3File, context); - - context.Writer.WriteObjectEnd(); - } - - if(publicRequest.IsSetSourceS3PresignedUrl()) - { - context.Writer.WritePropertyName("sourceS3PresignedUrl"); - context.Writer.WriteObjectStart(); - - var marshaller = S3PresignedUrlMarshaller.Instance; - marshaller.Marshall(publicRequest.SourceS3PresignedUrl, context); - - context.Writer.WriteObjectEnd(); - } - - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); + request.Content = memoryStream.ToArray(); } diff --git a/sdk/src/Services/SocialMessaging/Generated/Model/Internal/MarshallTransformations/PutWhatsAppBusinessAccountEventDestinationsRequestMarshaller.cs b/sdk/src/Services/SocialMessaging/Generated/Model/Internal/MarshallTransformations/PutWhatsAppBusinessAccountEventDestinationsRequestMarshaller.cs index b772de2991d9..985376caaf77 100644 --- a/sdk/src/Services/SocialMessaging/Generated/Model/Internal/MarshallTransformations/PutWhatsAppBusinessAccountEventDestinationsRequestMarshaller.cs +++ b/sdk/src/Services/SocialMessaging/Generated/Model/Internal/MarshallTransformations/PutWhatsAppBusinessAccountEventDestinationsRequestMarshaller.cs @@ -61,37 +61,40 @@ public IRequest Marshall(PutWhatsAppBusinessAccountEventDestinationsRequest publ request.HttpMethod = "PUT"; request.ResourcePath = "/v1/whatsapp/waba/eventdestinations"; - using (StringWriter stringWriter = new StringWriter(CultureInfo.InvariantCulture)) + using (MemoryStream memoryStream = new MemoryStream()) { - JsonWriter writer = new JsonWriter(stringWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetEventDestinations()) + using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) { - context.Writer.WritePropertyName("eventDestinations"); - context.Writer.WriteArrayStart(); - foreach(var publicRequestEventDestinationsListValue in publicRequest.EventDestinations) + JsonWriter writer = new JsonWriter(streamWriter); + writer.Validate = false; + writer.WriteObjectStart(); + var context = new JsonMarshallerContext(request, writer); + if(publicRequest.IsSetEventDestinations()) { - context.Writer.WriteObjectStart(); + context.Writer.WritePropertyName("eventDestinations"); + context.Writer.WriteArrayStart(); + foreach(var publicRequestEventDestinationsListValue in publicRequest.EventDestinations) + { + context.Writer.WriteObjectStart(); - var marshaller = WhatsAppBusinessAccountEventDestinationMarshaller.Instance; - marshaller.Marshall(publicRequestEventDestinationsListValue, context); + var marshaller = WhatsAppBusinessAccountEventDestinationMarshaller.Instance; + marshaller.Marshall(publicRequestEventDestinationsListValue, context); - context.Writer.WriteObjectEnd(); + context.Writer.WriteObjectEnd(); + } + context.Writer.WriteArrayEnd(); } - context.Writer.WriteArrayEnd(); - } - if(publicRequest.IsSetId()) - { - context.Writer.WritePropertyName("id"); - context.Writer.Write(publicRequest.Id); + if(publicRequest.IsSetId()) + { + context.Writer.WritePropertyName("id"); + context.Writer.Write(publicRequest.Id); + } + + writer.WriteObjectEnd(); } - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); + request.Content = memoryStream.ToArray(); } diff --git a/sdk/src/Services/SocialMessaging/Generated/Model/Internal/MarshallTransformations/SendWhatsAppMessageRequestMarshaller.cs b/sdk/src/Services/SocialMessaging/Generated/Model/Internal/MarshallTransformations/SendWhatsAppMessageRequestMarshaller.cs index 5739781f9b9b..a4045bc71461 100644 --- a/sdk/src/Services/SocialMessaging/Generated/Model/Internal/MarshallTransformations/SendWhatsAppMessageRequestMarshaller.cs +++ b/sdk/src/Services/SocialMessaging/Generated/Model/Internal/MarshallTransformations/SendWhatsAppMessageRequestMarshaller.cs @@ -61,33 +61,36 @@ public IRequest Marshall(SendWhatsAppMessageRequest publicRequest) request.HttpMethod = "POST"; request.ResourcePath = "/v1/whatsapp/send"; - using (StringWriter stringWriter = new StringWriter(CultureInfo.InvariantCulture)) + using (MemoryStream memoryStream = new MemoryStream()) { - JsonWriter writer = new JsonWriter(stringWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetMessage()) + using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) { - context.Writer.WritePropertyName("message"); - context.Writer.Write(StringUtils.FromMemoryStream(publicRequest.Message)); - } + JsonWriter writer = new JsonWriter(streamWriter); + writer.Validate = false; + writer.WriteObjectStart(); + var context = new JsonMarshallerContext(request, writer); + if(publicRequest.IsSetMessage()) + { + context.Writer.WritePropertyName("message"); + context.Writer.Write(StringUtils.FromMemoryStream(publicRequest.Message)); + } - if(publicRequest.IsSetMetaApiVersion()) - { - context.Writer.WritePropertyName("metaApiVersion"); - context.Writer.Write(publicRequest.MetaApiVersion); - } + if(publicRequest.IsSetMetaApiVersion()) + { + context.Writer.WritePropertyName("metaApiVersion"); + context.Writer.Write(publicRequest.MetaApiVersion); + } - if(publicRequest.IsSetOriginationPhoneNumberId()) - { - context.Writer.WritePropertyName("originationPhoneNumberId"); - context.Writer.Write(publicRequest.OriginationPhoneNumberId); + if(publicRequest.IsSetOriginationPhoneNumberId()) + { + context.Writer.WritePropertyName("originationPhoneNumberId"); + context.Writer.Write(publicRequest.OriginationPhoneNumberId); + } + + writer.WriteObjectEnd(); } - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); + request.Content = memoryStream.ToArray(); } diff --git a/sdk/src/Services/SocialMessaging/Generated/Model/Internal/MarshallTransformations/TagResourceRequestMarshaller.cs b/sdk/src/Services/SocialMessaging/Generated/Model/Internal/MarshallTransformations/TagResourceRequestMarshaller.cs index 1fa202e66c41..7298a496c52d 100644 --- a/sdk/src/Services/SocialMessaging/Generated/Model/Internal/MarshallTransformations/TagResourceRequestMarshaller.cs +++ b/sdk/src/Services/SocialMessaging/Generated/Model/Internal/MarshallTransformations/TagResourceRequestMarshaller.cs @@ -61,37 +61,40 @@ public IRequest Marshall(TagResourceRequest publicRequest) request.HttpMethod = "POST"; request.ResourcePath = "/v1/tags/tag-resource"; - using (StringWriter stringWriter = new StringWriter(CultureInfo.InvariantCulture)) + using (MemoryStream memoryStream = new MemoryStream()) { - JsonWriter writer = new JsonWriter(stringWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetResourceArn()) + using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) { - context.Writer.WritePropertyName("resourceArn"); - context.Writer.Write(publicRequest.ResourceArn); - } + JsonWriter writer = new JsonWriter(streamWriter); + writer.Validate = false; + writer.WriteObjectStart(); + var context = new JsonMarshallerContext(request, writer); + if(publicRequest.IsSetResourceArn()) + { + context.Writer.WritePropertyName("resourceArn"); + context.Writer.Write(publicRequest.ResourceArn); + } - if(publicRequest.IsSetTags()) - { - context.Writer.WritePropertyName("tags"); - context.Writer.WriteArrayStart(); - foreach(var publicRequestTagsListValue in publicRequest.Tags) + if(publicRequest.IsSetTags()) { - context.Writer.WriteObjectStart(); + context.Writer.WritePropertyName("tags"); + context.Writer.WriteArrayStart(); + foreach(var publicRequestTagsListValue in publicRequest.Tags) + { + context.Writer.WriteObjectStart(); - var marshaller = TagMarshaller.Instance; - marshaller.Marshall(publicRequestTagsListValue, context); + var marshaller = TagMarshaller.Instance; + marshaller.Marshall(publicRequestTagsListValue, context); - context.Writer.WriteObjectEnd(); + context.Writer.WriteObjectEnd(); + } + context.Writer.WriteArrayEnd(); } - context.Writer.WriteArrayEnd(); + + writer.WriteObjectEnd(); } - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); + request.Content = memoryStream.ToArray(); } diff --git a/sdk/src/Services/SocialMessaging/Generated/Model/Internal/MarshallTransformations/TagResourceResponseUnmarshaller.cs b/sdk/src/Services/SocialMessaging/Generated/Model/Internal/MarshallTransformations/TagResourceResponseUnmarshaller.cs index 3bc5484b17b3..0adf478157d7 100644 --- a/sdk/src/Services/SocialMessaging/Generated/Model/Internal/MarshallTransformations/TagResourceResponseUnmarshaller.cs +++ b/sdk/src/Services/SocialMessaging/Generated/Model/Internal/MarshallTransformations/TagResourceResponseUnmarshaller.cs @@ -54,7 +54,7 @@ public override AmazonWebServiceResponse Unmarshall(JsonUnmarshallerContext cont { if (context.TestExpression("statusCode", targetDepth)) { - var unmarshaller = IntUnmarshaller.Instance; + var unmarshaller = NullableIntUnmarshaller.Instance; response.StatusCode = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/SocialMessaging/Generated/Model/Internal/MarshallTransformations/UntagResourceRequestMarshaller.cs b/sdk/src/Services/SocialMessaging/Generated/Model/Internal/MarshallTransformations/UntagResourceRequestMarshaller.cs index 04f660b2c43d..71400e40b316 100644 --- a/sdk/src/Services/SocialMessaging/Generated/Model/Internal/MarshallTransformations/UntagResourceRequestMarshaller.cs +++ b/sdk/src/Services/SocialMessaging/Generated/Model/Internal/MarshallTransformations/UntagResourceRequestMarshaller.cs @@ -61,32 +61,35 @@ public IRequest Marshall(UntagResourceRequest publicRequest) request.HttpMethod = "POST"; request.ResourcePath = "/v1/tags/untag-resource"; - using (StringWriter stringWriter = new StringWriter(CultureInfo.InvariantCulture)) + using (MemoryStream memoryStream = new MemoryStream()) { - JsonWriter writer = new JsonWriter(stringWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetResourceArn()) + using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) { - context.Writer.WritePropertyName("resourceArn"); - context.Writer.Write(publicRequest.ResourceArn); - } + JsonWriter writer = new JsonWriter(streamWriter); + writer.Validate = false; + writer.WriteObjectStart(); + var context = new JsonMarshallerContext(request, writer); + if(publicRequest.IsSetResourceArn()) + { + context.Writer.WritePropertyName("resourceArn"); + context.Writer.Write(publicRequest.ResourceArn); + } - if(publicRequest.IsSetTagKeys()) - { - context.Writer.WritePropertyName("tagKeys"); - context.Writer.WriteArrayStart(); - foreach(var publicRequestTagKeysListValue in publicRequest.TagKeys) + if(publicRequest.IsSetTagKeys()) { - context.Writer.Write(publicRequestTagKeysListValue); + context.Writer.WritePropertyName("tagKeys"); + context.Writer.WriteArrayStart(); + foreach(var publicRequestTagKeysListValue in publicRequest.TagKeys) + { + context.Writer.Write(publicRequestTagKeysListValue); + } + context.Writer.WriteArrayEnd(); } - context.Writer.WriteArrayEnd(); + + writer.WriteObjectEnd(); } - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); + request.Content = memoryStream.ToArray(); } diff --git a/sdk/src/Services/SocialMessaging/Generated/Model/Internal/MarshallTransformations/UntagResourceResponseUnmarshaller.cs b/sdk/src/Services/SocialMessaging/Generated/Model/Internal/MarshallTransformations/UntagResourceResponseUnmarshaller.cs index 820f2150b1b2..43abc4e9344b 100644 --- a/sdk/src/Services/SocialMessaging/Generated/Model/Internal/MarshallTransformations/UntagResourceResponseUnmarshaller.cs +++ b/sdk/src/Services/SocialMessaging/Generated/Model/Internal/MarshallTransformations/UntagResourceResponseUnmarshaller.cs @@ -54,7 +54,7 @@ public override AmazonWebServiceResponse Unmarshall(JsonUnmarshallerContext cont { if (context.TestExpression("statusCode", targetDepth)) { - var unmarshaller = IntUnmarshaller.Instance; + var unmarshaller = NullableIntUnmarshaller.Instance; response.StatusCode = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/SocialMessaging/Generated/Model/InternalServiceException.cs b/sdk/src/Services/SocialMessaging/Generated/Model/InternalServiceException.cs index 1f5a5bb706ab..ed0f72a7effe 100644 --- a/sdk/src/Services/SocialMessaging/Generated/Model/InternalServiceException.cs +++ b/sdk/src/Services/SocialMessaging/Generated/Model/InternalServiceException.cs @@ -108,11 +108,6 @@ protected InternalServiceException(System.Runtime.Serialization.SerializationInf /// The that holds the serialized object data about the exception being thrown. /// The that contains contextual information about the source or destination. /// The parameter is a null reference (Nothing in Visual Basic). -#if BCL35 - [System.Security.Permissions.SecurityPermission( - System.Security.Permissions.SecurityAction.LinkDemand, - Flags = System.Security.Permissions.SecurityPermissionFlag.SerializationFormatter)] -#endif [System.Security.SecurityCritical] // These FxCop rules are giving false-positives for this method [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Security", "CA2123:OverrideLinkDemandsShouldBeIdenticalToBase")] diff --git a/sdk/src/Services/SocialMessaging/Generated/Model/InvalidParametersException.cs b/sdk/src/Services/SocialMessaging/Generated/Model/InvalidParametersException.cs index 49ee69f2e1a8..1a0818e1e76d 100644 --- a/sdk/src/Services/SocialMessaging/Generated/Model/InvalidParametersException.cs +++ b/sdk/src/Services/SocialMessaging/Generated/Model/InvalidParametersException.cs @@ -106,11 +106,6 @@ protected InvalidParametersException(System.Runtime.Serialization.SerializationI /// The that holds the serialized object data about the exception being thrown. /// The that contains contextual information about the source or destination. /// The parameter is a null reference (Nothing in Visual Basic). -#if BCL35 - [System.Security.Permissions.SecurityPermission( - System.Security.Permissions.SecurityAction.LinkDemand, - Flags = System.Security.Permissions.SecurityPermissionFlag.SerializationFormatter)] -#endif [System.Security.SecurityCritical] // These FxCop rules are giving false-positives for this method [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Security", "CA2123:OverrideLinkDemandsShouldBeIdenticalToBase")] diff --git a/sdk/src/Services/SocialMessaging/Generated/Model/LinkedWhatsAppBusinessAccount.cs b/sdk/src/Services/SocialMessaging/Generated/Model/LinkedWhatsAppBusinessAccount.cs index 4721138c5eda..87e5f8e71241 100644 --- a/sdk/src/Services/SocialMessaging/Generated/Model/LinkedWhatsAppBusinessAccount.cs +++ b/sdk/src/Services/SocialMessaging/Generated/Model/LinkedWhatsAppBusinessAccount.cs @@ -107,9 +107,9 @@ internal bool IsSetId() /// ///             [AWSProperty(Required=true)] - public DateTime LinkDate + public DateTime? LinkDate { - get { return this._linkDate.GetValueOrDefault(); } + get { return this._linkDate; } set { this._linkDate = value; } } diff --git a/sdk/src/Services/SocialMessaging/Generated/Model/LinkedWhatsAppBusinessAccountSummary.cs b/sdk/src/Services/SocialMessaging/Generated/Model/LinkedWhatsAppBusinessAccountSummary.cs index 4efd8d7282d7..b7ba2303d48a 100644 --- a/sdk/src/Services/SocialMessaging/Generated/Model/LinkedWhatsAppBusinessAccountSummary.cs +++ b/sdk/src/Services/SocialMessaging/Generated/Model/LinkedWhatsAppBusinessAccountSummary.cs @@ -106,9 +106,9 @@ internal bool IsSetId() /// ///             [AWSProperty(Required=true)] - public DateTime LinkDate + public DateTime? LinkDate { - get { return this._linkDate.GetValueOrDefault(); } + get { return this._linkDate; } set { this._linkDate = value; } } diff --git a/sdk/src/Services/SocialMessaging/Generated/Model/ListLinkedWhatsAppBusinessAccountsRequest.cs b/sdk/src/Services/SocialMessaging/Generated/Model/ListLinkedWhatsAppBusinessAccountsRequest.cs index 6050231f4692..ecd6ebcdba82 100644 --- a/sdk/src/Services/SocialMessaging/Generated/Model/ListLinkedWhatsAppBusinessAccountsRequest.cs +++ b/sdk/src/Services/SocialMessaging/Generated/Model/ListLinkedWhatsAppBusinessAccountsRequest.cs @@ -45,9 +45,9 @@ public partial class ListLinkedWhatsAppBusinessAccountsRequest : AmazonSocialMes /// ///             [AWSProperty(Min=1, Max=100)] - public int MaxResults + public int? MaxResults { - get { return this._maxResults.GetValueOrDefault(); } + get { return this._maxResults; } set { this._maxResults = value; } } diff --git a/sdk/src/Services/SocialMessaging/Generated/Model/ListTagsForResourceResponse.cs b/sdk/src/Services/SocialMessaging/Generated/Model/ListTagsForResourceResponse.cs index 6d911d19bd64..8b3ce5af0b37 100644 --- a/sdk/src/Services/SocialMessaging/Generated/Model/ListTagsForResourceResponse.cs +++ b/sdk/src/Services/SocialMessaging/Generated/Model/ListTagsForResourceResponse.cs @@ -43,9 +43,9 @@ public partial class ListTagsForResourceResponse : AmazonWebServiceResponse /// The status code of the response. /// ///             - public int StatusCode + public int? StatusCode { - get { return this._statusCode.GetValueOrDefault(); } + get { return this._statusCode; } set { this._statusCode = value; } } diff --git a/sdk/src/Services/SocialMessaging/Generated/Model/ResourceNotFoundException.cs b/sdk/src/Services/SocialMessaging/Generated/Model/ResourceNotFoundException.cs index e6f004cfb890..800a8f477206 100644 --- a/sdk/src/Services/SocialMessaging/Generated/Model/ResourceNotFoundException.cs +++ b/sdk/src/Services/SocialMessaging/Generated/Model/ResourceNotFoundException.cs @@ -106,11 +106,6 @@ protected ResourceNotFoundException(System.Runtime.Serialization.SerializationIn /// The that holds the serialized object data about the exception being thrown. /// The that contains contextual information about the source or destination. /// The parameter is a null reference (Nothing in Visual Basic). -#if BCL35 - [System.Security.Permissions.SecurityPermission( - System.Security.Permissions.SecurityAction.LinkDemand, - Flags = System.Security.Permissions.SecurityPermissionFlag.SerializationFormatter)] -#endif [System.Security.SecurityCritical] // These FxCop rules are giving false-positives for this method [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Security", "CA2123:OverrideLinkDemandsShouldBeIdenticalToBase")] diff --git a/sdk/src/Services/SocialMessaging/Generated/Model/TagResourceResponse.cs b/sdk/src/Services/SocialMessaging/Generated/Model/TagResourceResponse.cs index a421a6844111..4ac8e1e6bc0d 100644 --- a/sdk/src/Services/SocialMessaging/Generated/Model/TagResourceResponse.cs +++ b/sdk/src/Services/SocialMessaging/Generated/Model/TagResourceResponse.cs @@ -42,9 +42,9 @@ public partial class TagResourceResponse : AmazonWebServiceResponse /// The status code of the tag resource operation. /// ///             - public int StatusCode + public int? StatusCode { - get { return this._statusCode.GetValueOrDefault(); } + get { return this._statusCode; } set { this._statusCode = value; } } diff --git a/sdk/src/Services/SocialMessaging/Generated/Model/ThrottledRequestException.cs b/sdk/src/Services/SocialMessaging/Generated/Model/ThrottledRequestException.cs index f2b1793f4a7b..de2fe37606e1 100644 --- a/sdk/src/Services/SocialMessaging/Generated/Model/ThrottledRequestException.cs +++ b/sdk/src/Services/SocialMessaging/Generated/Model/ThrottledRequestException.cs @@ -108,11 +108,6 @@ protected ThrottledRequestException(System.Runtime.Serialization.SerializationIn /// The that holds the serialized object data about the exception being thrown. /// The that contains contextual information about the source or destination. /// The parameter is a null reference (Nothing in Visual Basic). -#if BCL35 - [System.Security.Permissions.SecurityPermission( - System.Security.Permissions.SecurityAction.LinkDemand, - Flags = System.Security.Permissions.SecurityPermissionFlag.SerializationFormatter)] -#endif [System.Security.SecurityCritical] // These FxCop rules are giving false-positives for this method [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Security", "CA2123:OverrideLinkDemandsShouldBeIdenticalToBase")] diff --git a/sdk/src/Services/SocialMessaging/Generated/Model/UntagResourceResponse.cs b/sdk/src/Services/SocialMessaging/Generated/Model/UntagResourceResponse.cs index db58e713e36f..1abf76b14fbc 100644 --- a/sdk/src/Services/SocialMessaging/Generated/Model/UntagResourceResponse.cs +++ b/sdk/src/Services/SocialMessaging/Generated/Model/UntagResourceResponse.cs @@ -42,9 +42,9 @@ public partial class UntagResourceResponse : AmazonWebServiceResponse /// The status code of the untag resource operation. /// ///             - public int StatusCode + public int? StatusCode { - get { return this._statusCode.GetValueOrDefault(); } + get { return this._statusCode; } set { this._statusCode = value; } } diff --git a/sdk/src/Services/SocialMessaging/Generated/Model/ValidationException.cs b/sdk/src/Services/SocialMessaging/Generated/Model/ValidationException.cs index 26694ecfbf89..0381218e7aba 100644 --- a/sdk/src/Services/SocialMessaging/Generated/Model/ValidationException.cs +++ b/sdk/src/Services/SocialMessaging/Generated/Model/ValidationException.cs @@ -106,11 +106,6 @@ protected ValidationException(System.Runtime.Serialization.SerializationInfo inf /// The that holds the serialized object data about the exception being thrown. /// The that contains contextual information about the source or destination. /// The parameter is a null reference (Nothing in Visual Basic). -#if BCL35 - [System.Security.Permissions.SecurityPermission( - System.Security.Permissions.SecurityAction.LinkDemand, - Flags = System.Security.Permissions.SecurityPermissionFlag.SerializationFormatter)] -#endif [System.Security.SecurityCritical] // These FxCop rules are giving false-positives for this method [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Security", "CA2123:OverrideLinkDemandsShouldBeIdenticalToBase")] diff --git a/sdk/src/Services/SocialMessaging/Generated/Model/_bcl45+netstandard/IListLinkedWhatsAppBusinessAccountsPaginator.cs b/sdk/src/Services/SocialMessaging/Generated/Model/_bcl+netstandard/IListLinkedWhatsAppBusinessAccountsPaginator.cs similarity index 100% rename from sdk/src/Services/SocialMessaging/Generated/Model/_bcl45+netstandard/IListLinkedWhatsAppBusinessAccountsPaginator.cs rename to sdk/src/Services/SocialMessaging/Generated/Model/_bcl+netstandard/IListLinkedWhatsAppBusinessAccountsPaginator.cs diff --git a/sdk/src/Services/SocialMessaging/Generated/Model/_bcl45+netstandard/ISocialMessagingPaginatorFactory.cs b/sdk/src/Services/SocialMessaging/Generated/Model/_bcl+netstandard/ISocialMessagingPaginatorFactory.cs similarity index 100% rename from sdk/src/Services/SocialMessaging/Generated/Model/_bcl45+netstandard/ISocialMessagingPaginatorFactory.cs rename to sdk/src/Services/SocialMessaging/Generated/Model/_bcl+netstandard/ISocialMessagingPaginatorFactory.cs diff --git a/sdk/src/Services/SocialMessaging/Generated/Model/_bcl45+netstandard/ListLinkedWhatsAppBusinessAccountsPaginator.cs b/sdk/src/Services/SocialMessaging/Generated/Model/_bcl+netstandard/ListLinkedWhatsAppBusinessAccountsPaginator.cs similarity index 100% rename from sdk/src/Services/SocialMessaging/Generated/Model/_bcl45+netstandard/ListLinkedWhatsAppBusinessAccountsPaginator.cs rename to sdk/src/Services/SocialMessaging/Generated/Model/_bcl+netstandard/ListLinkedWhatsAppBusinessAccountsPaginator.cs diff --git a/sdk/src/Services/SocialMessaging/Generated/Model/_bcl45+netstandard/SocialMessagingPaginatorFactory.cs b/sdk/src/Services/SocialMessaging/Generated/Model/_bcl+netstandard/SocialMessagingPaginatorFactory.cs similarity index 100% rename from sdk/src/Services/SocialMessaging/Generated/Model/_bcl45+netstandard/SocialMessagingPaginatorFactory.cs rename to sdk/src/Services/SocialMessaging/Generated/Model/_bcl+netstandard/SocialMessagingPaginatorFactory.cs diff --git a/sdk/src/Services/SocialMessaging/Generated/_bcl45/AmazonSocialMessagingClient.cs b/sdk/src/Services/SocialMessaging/Generated/_bcl/AmazonSocialMessagingClient.cs similarity index 99% rename from sdk/src/Services/SocialMessaging/Generated/_bcl45/AmazonSocialMessagingClient.cs rename to sdk/src/Services/SocialMessaging/Generated/_bcl/AmazonSocialMessagingClient.cs index 613696069c00..8b0d0fb8d640 100644 --- a/sdk/src/Services/SocialMessaging/Generated/_bcl45/AmazonSocialMessagingClient.cs +++ b/sdk/src/Services/SocialMessaging/Generated/_bcl/AmazonSocialMessagingClient.cs @@ -32,6 +32,7 @@ using Amazon.Runtime.Internal; using Amazon.Runtime.Internal.Auth; using Amazon.Runtime.Internal.Transform; +using Amazon.Runtime.Endpoints; #pragma warning disable CS1570 namespace Amazon.SocialMessaging @@ -1373,16 +1374,8 @@ public virtual UntagResourceResponse UntagResource(UntagResourceRequest request) /// The resolved endpoint for the given request. public Amazon.Runtime.Endpoints.Endpoint DetermineServiceOperationEndpoint(AmazonWebServiceRequest request) { - var requestContext = new Amazon.Runtime.Internal.RequestContext(false, CreateSigner()) - { - ClientConfig = Config, - OriginalRequest = request, - Request = new Amazon.Runtime.Internal.DefaultRequest(request, ServiceMetadata.ServiceId) - }; - - var executionContext = new Amazon.Runtime.Internal.ExecutionContext(requestContext, null); - var resolver = new AmazonSocialMessagingEndpointResolver(); - return resolver.GetEndpoint(executionContext); + var parameters = new ServiceOperationEndpointParameters(request); + return Config.DetermineServiceOperationEndpoint(parameters); } #endregion diff --git a/sdk/src/Services/SocialMessaging/Generated/_bcl45/IAmazonSocialMessaging.cs b/sdk/src/Services/SocialMessaging/Generated/_bcl/IAmazonSocialMessaging.cs similarity index 100% rename from sdk/src/Services/SocialMessaging/Generated/_bcl45/IAmazonSocialMessaging.cs rename to sdk/src/Services/SocialMessaging/Generated/_bcl/IAmazonSocialMessaging.cs diff --git a/sdk/src/Services/SocialMessaging/Generated/_bcl35/AmazonSocialMessagingClient.cs b/sdk/src/Services/SocialMessaging/Generated/_bcl35/AmazonSocialMessagingClient.cs deleted file mode 100644 index f0d5e11fd62b..000000000000 --- a/sdk/src/Services/SocialMessaging/Generated/_bcl35/AmazonSocialMessagingClient.cs +++ /dev/null @@ -1,1300 +0,0 @@ -/* - * 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. - */ - -/* - * Do not modify this file. This file is generated from the socialmessaging-2024-01-01.normal.json service model. - */ - - -using System; -using System.Collections.Generic; -using System.Net; - -using Amazon.SocialMessaging.Model; -using Amazon.SocialMessaging.Model.Internal.MarshallTransformations; -using Amazon.SocialMessaging.Internal; -using Amazon.Runtime; -using Amazon.Runtime.Internal; -using Amazon.Runtime.Internal.Auth; -using Amazon.Runtime.Internal.Transform; - -#pragma warning disable CS1570 -namespace Amazon.SocialMessaging -{ - /// - /// Implementation for accessing SocialMessaging - /// - /// Amazon Web Services End User Messaging Social, also referred to as Social - /// messaging, is a messaging service that enables application developers to incorporate - /// WhatsApp into their existing workflows. The Amazon Web Services End User Messaging - /// Social API provides information about the Amazon Web Services End User Messaging - /// Social API resources, including supported HTTP methods, parameters, and schemas. - /// - /// - /// - /// The Amazon Web Services End User Messaging Social API provides programmatic - /// access to options that are unique to the WhatsApp Business Platform. - /// - /// - /// - /// If you're new to the Amazon Web Services End User Messaging Social API, it's - /// also helpful to review What - /// is Amazon Web Services End User Messaging Social in the Amazon Web Services - /// End User Messaging Social User Guide. The Amazon Web Services End User Messaging - /// Social User Guide provides tutorials, code samples, and procedures that demonstrate - /// how to use Amazon Web Services End User Messaging Social API features programmatically - /// and how to integrate functionality into applications. The guide also provides key - /// information, such as integration with other Amazon Web Services services, and the - /// quotas that apply to use of the service. - /// - /// - /// - /// Regional availability - /// - /// - /// - /// The Amazon Web Services End User Messaging Social API is available across several - /// Amazon Web Services Regions and it provides a dedicated endpoint for each of these - /// Regions. For a list of all the Regions and endpoints where the API is currently available, - /// see Amazon - /// Web Services Service Endpoints and Amazon - /// Web Services End User Messaging endpoints and quotas in the Amazon Web Services - /// General Reference. To learn more about Amazon Web Services Regions, see Managing - /// Amazon Web Services Regions in the Amazon Web Services General Reference. - /// - /// - /// - /// In each Region, Amazon Web Services maintains multiple Availability Zones. These Availability - /// Zones are physically isolated from each other, but are united by private, low-latency, - /// high-throughput, and highly redundant network connections. These Availability Zones - /// enable us to provide very high levels of availability and redundancy, while also minimizing - /// latency. To learn more about the number of Availability Zones that are available in - /// each Region, see Amazon - /// Web Services Global Infrastructure. - /// - /// - public partial class AmazonSocialMessagingClient : AmazonServiceClient, IAmazonSocialMessaging - { - private static IServiceMetadata serviceMetadata = new AmazonSocialMessagingMetadata(); - -#if BCL45 || AWS_ASYNC_ENUMERABLES_API - private ISocialMessagingPaginatorFactory _paginators; - - /// - /// Paginators for the service - /// - public ISocialMessagingPaginatorFactory Paginators - { - get - { - if (this._paginators == null) - { - this._paginators = new SocialMessagingPaginatorFactory(this); - } - return this._paginators; - } - } -#endif - #region Constructors - - /// - /// Constructs AmazonSocialMessagingClient with the credentials loaded from the application's - /// default configuration, and if unsuccessful from the Instance Profile service on an EC2 instance. - /// - /// Example App.config with credentials set. - /// - /// <?xml version="1.0" encoding="utf-8" ?> - /// <configuration> - /// <appSettings> - /// <add key="AWSProfileName" value="AWS Default"/> - /// </appSettings> - /// </configuration> - /// - /// - /// - public AmazonSocialMessagingClient() - : base(FallbackCredentialsFactory.GetCredentials(), new AmazonSocialMessagingConfig()) { } - - /// - /// Constructs AmazonSocialMessagingClient with the credentials loaded from the application's - /// default configuration, and if unsuccessful from the Instance Profile service on an EC2 instance. - /// - /// Example App.config with credentials set. - /// - /// <?xml version="1.0" encoding="utf-8" ?> - /// <configuration> - /// <appSettings> - /// <add key="AWSProfileName" value="AWS Default"/> - /// </appSettings> - /// </configuration> - /// - /// - /// - /// The region to connect. - public AmazonSocialMessagingClient(RegionEndpoint region) - : base(FallbackCredentialsFactory.GetCredentials(), new AmazonSocialMessagingConfig{RegionEndpoint = region}) { } - - /// - /// Constructs AmazonSocialMessagingClient with the credentials loaded from the application's - /// default configuration, and if unsuccessful from the Instance Profile service on an EC2 instance. - /// - /// Example App.config with credentials set. - /// - /// <?xml version="1.0" encoding="utf-8" ?> - /// <configuration> - /// <appSettings> - /// <add key="AWSProfileName" value="AWS Default"/> - /// </appSettings> - /// </configuration> - /// - /// - /// - /// The AmazonSocialMessagingClient Configuration Object - public AmazonSocialMessagingClient(AmazonSocialMessagingConfig config) - : base(FallbackCredentialsFactory.GetCredentials(config), config){} - /// - /// Constructs AmazonSocialMessagingClient with AWS Credentials - /// - /// AWS Credentials - public AmazonSocialMessagingClient(AWSCredentials credentials) - : this(credentials, new AmazonSocialMessagingConfig()) - { - } - - /// - /// Constructs AmazonSocialMessagingClient with AWS Credentials - /// - /// AWS Credentials - /// The region to connect. - public AmazonSocialMessagingClient(AWSCredentials credentials, RegionEndpoint region) - : this(credentials, new AmazonSocialMessagingConfig{RegionEndpoint = region}) - { - } - - /// - /// Constructs AmazonSocialMessagingClient with AWS Credentials and an - /// AmazonSocialMessagingClient Configuration object. - /// - /// AWS Credentials - /// The AmazonSocialMessagingClient Configuration Object - public AmazonSocialMessagingClient(AWSCredentials credentials, AmazonSocialMessagingConfig clientConfig) - : base(credentials, clientConfig) - { - } - - /// - /// Constructs AmazonSocialMessagingClient with AWS Access Key ID and AWS Secret Key - /// - /// AWS Access Key ID - /// AWS Secret Access Key - public AmazonSocialMessagingClient(string awsAccessKeyId, string awsSecretAccessKey) - : this(awsAccessKeyId, awsSecretAccessKey, new AmazonSocialMessagingConfig()) - { - } - - /// - /// Constructs AmazonSocialMessagingClient with AWS Access Key ID and AWS Secret Key - /// - /// AWS Access Key ID - /// AWS Secret Access Key - /// The region to connect. - public AmazonSocialMessagingClient(string awsAccessKeyId, string awsSecretAccessKey, RegionEndpoint region) - : this(awsAccessKeyId, awsSecretAccessKey, new AmazonSocialMessagingConfig() {RegionEndpoint=region}) - { - } - - /// - /// Constructs AmazonSocialMessagingClient with AWS Access Key ID, AWS Secret Key and an - /// AmazonSocialMessagingClient Configuration object. - /// - /// AWS Access Key ID - /// AWS Secret Access Key - /// The AmazonSocialMessagingClient Configuration Object - public AmazonSocialMessagingClient(string awsAccessKeyId, string awsSecretAccessKey, AmazonSocialMessagingConfig clientConfig) - : base(awsAccessKeyId, awsSecretAccessKey, clientConfig) - { - } - - /// - /// Constructs AmazonSocialMessagingClient with AWS Access Key ID and AWS Secret Key - /// - /// AWS Access Key ID - /// AWS Secret Access Key - /// AWS Session Token - public AmazonSocialMessagingClient(string awsAccessKeyId, string awsSecretAccessKey, string awsSessionToken) - : this(awsAccessKeyId, awsSecretAccessKey, awsSessionToken, new AmazonSocialMessagingConfig()) - { - } - - /// - /// Constructs AmazonSocialMessagingClient with AWS Access Key ID and AWS Secret Key - /// - /// AWS Access Key ID - /// AWS Secret Access Key - /// AWS Session Token - /// The region to connect. - public AmazonSocialMessagingClient(string awsAccessKeyId, string awsSecretAccessKey, string awsSessionToken, RegionEndpoint region) - : this(awsAccessKeyId, awsSecretAccessKey, awsSessionToken, new AmazonSocialMessagingConfig{RegionEndpoint = region}) - { - } - - /// - /// Constructs AmazonSocialMessagingClient with AWS Access Key ID, AWS Secret Key and an - /// AmazonSocialMessagingClient Configuration object. - /// - /// AWS Access Key ID - /// AWS Secret Access Key - /// AWS Session Token - /// The AmazonSocialMessagingClient Configuration Object - public AmazonSocialMessagingClient(string awsAccessKeyId, string awsSecretAccessKey, string awsSessionToken, AmazonSocialMessagingConfig clientConfig) - : base(awsAccessKeyId, awsSecretAccessKey, awsSessionToken, clientConfig) - { - } - - #endregion - - #region Overrides - - - /// - /// Creates the signer for the service. - /// - protected override AbstractAWSSigner CreateSigner() - { - return new AWS4Signer(); - } - - /// - /// Customize the pipeline - /// - /// - protected override void CustomizeRuntimePipeline(RuntimePipeline pipeline) - { - pipeline.RemoveHandler(); - pipeline.AddHandlerAfter(new AmazonSocialMessagingEndpointResolver()); - } - /// - /// Capture metadata for the service. - /// - protected override IServiceMetadata ServiceMetadata - { - get - { - return serviceMetadata; - } - } - - #endregion - - #region Dispose - - /// - /// Disposes the service client. - /// - protected override void Dispose(bool disposing) - { - base.Dispose(disposing); - } - - #endregion - - - #region AssociateWhatsAppBusinessAccount - - /// - /// This is only used through the Amazon Web Services console during sign-up to associate - /// your WhatsApp Business Account to your Amazon Web Services account. - /// - /// Container for the necessary parameters to execute the AssociateWhatsAppBusinessAccount service method. - /// - /// The response from the AssociateWhatsAppBusinessAccount service method, as returned by SocialMessaging. - /// - /// You do not have sufficient access to perform this action. - /// - /// - /// Thrown when performing an action because a dependency would be broken. - /// - /// - /// One or more parameters provided to the action are not valid. - /// - /// - /// The request was denied due to request throttling. - /// - /// - /// The request contains an invalid parameter value. - /// - /// REST API Reference for AssociateWhatsAppBusinessAccount Operation - public virtual AssociateWhatsAppBusinessAccountResponse AssociateWhatsAppBusinessAccount(AssociateWhatsAppBusinessAccountRequest request) - { - var options = new InvokeOptions(); - options.RequestMarshaller = AssociateWhatsAppBusinessAccountRequestMarshaller.Instance; - options.ResponseUnmarshaller = AssociateWhatsAppBusinessAccountResponseUnmarshaller.Instance; - - return Invoke(request, options); - } - - /// - /// Initiates the asynchronous execution of the AssociateWhatsAppBusinessAccount operation. - /// - /// - /// Container for the necessary parameters to execute the AssociateWhatsAppBusinessAccount operation on AmazonSocialMessagingClient. - /// An AsyncCallback delegate that is invoked when the operation completes. - /// A user-defined state object that is passed to the callback procedure. Retrieve this object from within the callback - /// procedure using the AsyncState property. - /// - /// An IAsyncResult that can be used to poll or wait for results, or both; this value is also needed when invoking EndAssociateWhatsAppBusinessAccount - /// operation. - /// REST API Reference for AssociateWhatsAppBusinessAccount Operation - public virtual IAsyncResult BeginAssociateWhatsAppBusinessAccount(AssociateWhatsAppBusinessAccountRequest request, AsyncCallback callback, object state) - { - var options = new InvokeOptions(); - options.RequestMarshaller = AssociateWhatsAppBusinessAccountRequestMarshaller.Instance; - options.ResponseUnmarshaller = AssociateWhatsAppBusinessAccountResponseUnmarshaller.Instance; - - return BeginInvoke(request, options, callback, state); - } - - /// - /// Finishes the asynchronous execution of the AssociateWhatsAppBusinessAccount operation. - /// - /// - /// The IAsyncResult returned by the call to BeginAssociateWhatsAppBusinessAccount. - /// - /// Returns a AssociateWhatsAppBusinessAccountResult from SocialMessaging. - /// REST API Reference for AssociateWhatsAppBusinessAccount Operation - public virtual AssociateWhatsAppBusinessAccountResponse EndAssociateWhatsAppBusinessAccount(IAsyncResult asyncResult) - { - return EndInvoke(asyncResult); - } - - #endregion - - #region DeleteWhatsAppMessageMedia - - /// - /// Delete a media object from the WhatsApp service. If the object is still in an Amazon - /// S3 bucket you should delete it from there too. - /// - /// Container for the necessary parameters to execute the DeleteWhatsAppMessageMedia service method. - /// - /// The response from the DeleteWhatsAppMessageMedia service method, as returned by SocialMessaging. - /// - /// You do not have sufficient access to perform this action. - /// - /// - /// You do not have sufficient access to perform this action. - /// - /// - /// Thrown when performing an action because a dependency would be broken. - /// - /// - /// The request processing has failed because of an unknown error, exception, or failure. - /// - /// - /// One or more parameters provided to the action are not valid. - /// - /// - /// The resource was not found. - /// - /// - /// The request was denied due to request throttling. - /// - /// - /// The request contains an invalid parameter value. - /// - /// REST API Reference for DeleteWhatsAppMessageMedia Operation - public virtual DeleteWhatsAppMessageMediaResponse DeleteWhatsAppMessageMedia(DeleteWhatsAppMessageMediaRequest request) - { - var options = new InvokeOptions(); - options.RequestMarshaller = DeleteWhatsAppMessageMediaRequestMarshaller.Instance; - options.ResponseUnmarshaller = DeleteWhatsAppMessageMediaResponseUnmarshaller.Instance; - - return Invoke(request, options); - } - - /// - /// Initiates the asynchronous execution of the DeleteWhatsAppMessageMedia operation. - /// - /// - /// Container for the necessary parameters to execute the DeleteWhatsAppMessageMedia operation on AmazonSocialMessagingClient. - /// An AsyncCallback delegate that is invoked when the operation completes. - /// A user-defined state object that is passed to the callback procedure. Retrieve this object from within the callback - /// procedure using the AsyncState property. - /// - /// An IAsyncResult that can be used to poll or wait for results, or both; this value is also needed when invoking EndDeleteWhatsAppMessageMedia - /// operation. - /// REST API Reference for DeleteWhatsAppMessageMedia Operation - public virtual IAsyncResult BeginDeleteWhatsAppMessageMedia(DeleteWhatsAppMessageMediaRequest request, AsyncCallback callback, object state) - { - var options = new InvokeOptions(); - options.RequestMarshaller = DeleteWhatsAppMessageMediaRequestMarshaller.Instance; - options.ResponseUnmarshaller = DeleteWhatsAppMessageMediaResponseUnmarshaller.Instance; - - return BeginInvoke(request, options, callback, state); - } - - /// - /// Finishes the asynchronous execution of the DeleteWhatsAppMessageMedia operation. - /// - /// - /// The IAsyncResult returned by the call to BeginDeleteWhatsAppMessageMedia. - /// - /// Returns a DeleteWhatsAppMessageMediaResult from SocialMessaging. - /// REST API Reference for DeleteWhatsAppMessageMedia Operation - public virtual DeleteWhatsAppMessageMediaResponse EndDeleteWhatsAppMessageMedia(IAsyncResult asyncResult) - { - return EndInvoke(asyncResult); - } - - #endregion - - #region DisassociateWhatsAppBusinessAccount - - /// - /// Disassociate a WhatsApp Business Account (WABA) from your Amazon Web Services account. - /// - /// Container for the necessary parameters to execute the DisassociateWhatsAppBusinessAccount service method. - /// - /// The response from the DisassociateWhatsAppBusinessAccount service method, as returned by SocialMessaging. - /// - /// You do not have sufficient access to perform this action. - /// - /// - /// Thrown when performing an action because a dependency would be broken. - /// - /// - /// One or more parameters provided to the action are not valid. - /// - /// - /// The resource was not found. - /// - /// - /// The request was denied due to request throttling. - /// - /// - /// The request contains an invalid parameter value. - /// - /// REST API Reference for DisassociateWhatsAppBusinessAccount Operation - public virtual DisassociateWhatsAppBusinessAccountResponse DisassociateWhatsAppBusinessAccount(DisassociateWhatsAppBusinessAccountRequest request) - { - var options = new InvokeOptions(); - options.RequestMarshaller = DisassociateWhatsAppBusinessAccountRequestMarshaller.Instance; - options.ResponseUnmarshaller = DisassociateWhatsAppBusinessAccountResponseUnmarshaller.Instance; - - return Invoke(request, options); - } - - /// - /// Initiates the asynchronous execution of the DisassociateWhatsAppBusinessAccount operation. - /// - /// - /// Container for the necessary parameters to execute the DisassociateWhatsAppBusinessAccount operation on AmazonSocialMessagingClient. - /// An AsyncCallback delegate that is invoked when the operation completes. - /// A user-defined state object that is passed to the callback procedure. Retrieve this object from within the callback - /// procedure using the AsyncState property. - /// - /// An IAsyncResult that can be used to poll or wait for results, or both; this value is also needed when invoking EndDisassociateWhatsAppBusinessAccount - /// operation. - /// REST API Reference for DisassociateWhatsAppBusinessAccount Operation - public virtual IAsyncResult BeginDisassociateWhatsAppBusinessAccount(DisassociateWhatsAppBusinessAccountRequest request, AsyncCallback callback, object state) - { - var options = new InvokeOptions(); - options.RequestMarshaller = DisassociateWhatsAppBusinessAccountRequestMarshaller.Instance; - options.ResponseUnmarshaller = DisassociateWhatsAppBusinessAccountResponseUnmarshaller.Instance; - - return BeginInvoke(request, options, callback, state); - } - - /// - /// Finishes the asynchronous execution of the DisassociateWhatsAppBusinessAccount operation. - /// - /// - /// The IAsyncResult returned by the call to BeginDisassociateWhatsAppBusinessAccount. - /// - /// Returns a DisassociateWhatsAppBusinessAccountResult from SocialMessaging. - /// REST API Reference for DisassociateWhatsAppBusinessAccount Operation - public virtual DisassociateWhatsAppBusinessAccountResponse EndDisassociateWhatsAppBusinessAccount(IAsyncResult asyncResult) - { - return EndInvoke(asyncResult); - } - - #endregion - - #region GetLinkedWhatsAppBusinessAccount - - /// - /// Get the details of your linked WhatsApp Business Account. - /// - /// Container for the necessary parameters to execute the GetLinkedWhatsAppBusinessAccount service method. - /// - /// The response from the GetLinkedWhatsAppBusinessAccount service method, as returned by SocialMessaging. - /// - /// You do not have sufficient access to perform this action. - /// - /// - /// Thrown when performing an action because a dependency would be broken. - /// - /// - /// The request processing has failed because of an unknown error, exception, or failure. - /// - /// - /// One or more parameters provided to the action are not valid. - /// - /// - /// The resource was not found. - /// - /// - /// The request was denied due to request throttling. - /// - /// - /// The request contains an invalid parameter value. - /// - /// REST API Reference for GetLinkedWhatsAppBusinessAccount Operation - public virtual GetLinkedWhatsAppBusinessAccountResponse GetLinkedWhatsAppBusinessAccount(GetLinkedWhatsAppBusinessAccountRequest request) - { - var options = new InvokeOptions(); - options.RequestMarshaller = GetLinkedWhatsAppBusinessAccountRequestMarshaller.Instance; - options.ResponseUnmarshaller = GetLinkedWhatsAppBusinessAccountResponseUnmarshaller.Instance; - - return Invoke(request, options); - } - - /// - /// Initiates the asynchronous execution of the GetLinkedWhatsAppBusinessAccount operation. - /// - /// - /// Container for the necessary parameters to execute the GetLinkedWhatsAppBusinessAccount operation on AmazonSocialMessagingClient. - /// An AsyncCallback delegate that is invoked when the operation completes. - /// A user-defined state object that is passed to the callback procedure. Retrieve this object from within the callback - /// procedure using the AsyncState property. - /// - /// An IAsyncResult that can be used to poll or wait for results, or both; this value is also needed when invoking EndGetLinkedWhatsAppBusinessAccount - /// operation. - /// REST API Reference for GetLinkedWhatsAppBusinessAccount Operation - public virtual IAsyncResult BeginGetLinkedWhatsAppBusinessAccount(GetLinkedWhatsAppBusinessAccountRequest request, AsyncCallback callback, object state) - { - var options = new InvokeOptions(); - options.RequestMarshaller = GetLinkedWhatsAppBusinessAccountRequestMarshaller.Instance; - options.ResponseUnmarshaller = GetLinkedWhatsAppBusinessAccountResponseUnmarshaller.Instance; - - return BeginInvoke(request, options, callback, state); - } - - /// - /// Finishes the asynchronous execution of the GetLinkedWhatsAppBusinessAccount operation. - /// - /// - /// The IAsyncResult returned by the call to BeginGetLinkedWhatsAppBusinessAccount. - /// - /// Returns a GetLinkedWhatsAppBusinessAccountResult from SocialMessaging. - /// REST API Reference for GetLinkedWhatsAppBusinessAccount Operation - public virtual GetLinkedWhatsAppBusinessAccountResponse EndGetLinkedWhatsAppBusinessAccount(IAsyncResult asyncResult) - { - return EndInvoke(asyncResult); - } - - #endregion - - #region GetLinkedWhatsAppBusinessAccountPhoneNumber - - /// - /// Use your WhatsApp phone number id to get the WABA account id and phone number details. - /// - /// Container for the necessary parameters to execute the GetLinkedWhatsAppBusinessAccountPhoneNumber service method. - /// - /// The response from the GetLinkedWhatsAppBusinessAccountPhoneNumber service method, as returned by SocialMessaging. - /// - /// You do not have sufficient access to perform this action. - /// - /// - /// Thrown when performing an action because a dependency would be broken. - /// - /// - /// The request processing has failed because of an unknown error, exception, or failure. - /// - /// - /// One or more parameters provided to the action are not valid. - /// - /// - /// The resource was not found. - /// - /// - /// The request was denied due to request throttling. - /// - /// - /// The request contains an invalid parameter value. - /// - /// REST API Reference for GetLinkedWhatsAppBusinessAccountPhoneNumber Operation - public virtual GetLinkedWhatsAppBusinessAccountPhoneNumberResponse GetLinkedWhatsAppBusinessAccountPhoneNumber(GetLinkedWhatsAppBusinessAccountPhoneNumberRequest request) - { - var options = new InvokeOptions(); - options.RequestMarshaller = GetLinkedWhatsAppBusinessAccountPhoneNumberRequestMarshaller.Instance; - options.ResponseUnmarshaller = GetLinkedWhatsAppBusinessAccountPhoneNumberResponseUnmarshaller.Instance; - - return Invoke(request, options); - } - - /// - /// Initiates the asynchronous execution of the GetLinkedWhatsAppBusinessAccountPhoneNumber operation. - /// - /// - /// Container for the necessary parameters to execute the GetLinkedWhatsAppBusinessAccountPhoneNumber operation on AmazonSocialMessagingClient. - /// An AsyncCallback delegate that is invoked when the operation completes. - /// A user-defined state object that is passed to the callback procedure. Retrieve this object from within the callback - /// procedure using the AsyncState property. - /// - /// An IAsyncResult that can be used to poll or wait for results, or both; this value is also needed when invoking EndGetLinkedWhatsAppBusinessAccountPhoneNumber - /// operation. - /// REST API Reference for GetLinkedWhatsAppBusinessAccountPhoneNumber Operation - public virtual IAsyncResult BeginGetLinkedWhatsAppBusinessAccountPhoneNumber(GetLinkedWhatsAppBusinessAccountPhoneNumberRequest request, AsyncCallback callback, object state) - { - var options = new InvokeOptions(); - options.RequestMarshaller = GetLinkedWhatsAppBusinessAccountPhoneNumberRequestMarshaller.Instance; - options.ResponseUnmarshaller = GetLinkedWhatsAppBusinessAccountPhoneNumberResponseUnmarshaller.Instance; - - return BeginInvoke(request, options, callback, state); - } - - /// - /// Finishes the asynchronous execution of the GetLinkedWhatsAppBusinessAccountPhoneNumber operation. - /// - /// - /// The IAsyncResult returned by the call to BeginGetLinkedWhatsAppBusinessAccountPhoneNumber. - /// - /// Returns a GetLinkedWhatsAppBusinessAccountPhoneNumberResult from SocialMessaging. - /// REST API Reference for GetLinkedWhatsAppBusinessAccountPhoneNumber Operation - public virtual GetLinkedWhatsAppBusinessAccountPhoneNumberResponse EndGetLinkedWhatsAppBusinessAccountPhoneNumber(IAsyncResult asyncResult) - { - return EndInvoke(asyncResult); - } - - #endregion - - #region GetWhatsAppMessageMedia - - /// - /// Get a media file from the WhatsApp service. On successful completion the media file - /// is retrieved from Meta and stored in the specified Amazon S3 bucket. Use either destinationS3File - /// or destinationS3PresignedUrl for the destination. If both are used then an - /// InvalidParameterException is returned. - /// - /// Container for the necessary parameters to execute the GetWhatsAppMessageMedia service method. - /// - /// The response from the GetWhatsAppMessageMedia service method, as returned by SocialMessaging. - /// - /// You do not have sufficient access to perform this action. - /// - /// - /// You do not have sufficient access to perform this action. - /// - /// - /// Thrown when performing an action because a dependency would be broken. - /// - /// - /// The request processing has failed because of an unknown error, exception, or failure. - /// - /// - /// One or more parameters provided to the action are not valid. - /// - /// - /// The resource was not found. - /// - /// - /// The request was denied due to request throttling. - /// - /// - /// The request contains an invalid parameter value. - /// - /// REST API Reference for GetWhatsAppMessageMedia Operation - public virtual GetWhatsAppMessageMediaResponse GetWhatsAppMessageMedia(GetWhatsAppMessageMediaRequest request) - { - var options = new InvokeOptions(); - options.RequestMarshaller = GetWhatsAppMessageMediaRequestMarshaller.Instance; - options.ResponseUnmarshaller = GetWhatsAppMessageMediaResponseUnmarshaller.Instance; - - return Invoke(request, options); - } - - /// - /// Initiates the asynchronous execution of the GetWhatsAppMessageMedia operation. - /// - /// - /// Container for the necessary parameters to execute the GetWhatsAppMessageMedia operation on AmazonSocialMessagingClient. - /// An AsyncCallback delegate that is invoked when the operation completes. - /// A user-defined state object that is passed to the callback procedure. Retrieve this object from within the callback - /// procedure using the AsyncState property. - /// - /// An IAsyncResult that can be used to poll or wait for results, or both; this value is also needed when invoking EndGetWhatsAppMessageMedia - /// operation. - /// REST API Reference for GetWhatsAppMessageMedia Operation - public virtual IAsyncResult BeginGetWhatsAppMessageMedia(GetWhatsAppMessageMediaRequest request, AsyncCallback callback, object state) - { - var options = new InvokeOptions(); - options.RequestMarshaller = GetWhatsAppMessageMediaRequestMarshaller.Instance; - options.ResponseUnmarshaller = GetWhatsAppMessageMediaResponseUnmarshaller.Instance; - - return BeginInvoke(request, options, callback, state); - } - - /// - /// Finishes the asynchronous execution of the GetWhatsAppMessageMedia operation. - /// - /// - /// The IAsyncResult returned by the call to BeginGetWhatsAppMessageMedia. - /// - /// Returns a GetWhatsAppMessageMediaResult from SocialMessaging. - /// REST API Reference for GetWhatsAppMessageMedia Operation - public virtual GetWhatsAppMessageMediaResponse EndGetWhatsAppMessageMedia(IAsyncResult asyncResult) - { - return EndInvoke(asyncResult); - } - - #endregion - - #region ListLinkedWhatsAppBusinessAccounts - - /// - /// List all WhatsApp Business Accounts linked to your Amazon Web Services account. - /// - /// Container for the necessary parameters to execute the ListLinkedWhatsAppBusinessAccounts service method. - /// - /// The response from the ListLinkedWhatsAppBusinessAccounts service method, as returned by SocialMessaging. - /// - /// You do not have sufficient access to perform this action. - /// - /// - /// The request processing has failed because of an unknown error, exception, or failure. - /// - /// - /// One or more parameters provided to the action are not valid. - /// - /// - /// The resource was not found. - /// - /// - /// The request was denied due to request throttling. - /// - /// - /// The request contains an invalid parameter value. - /// - /// REST API Reference for ListLinkedWhatsAppBusinessAccounts Operation - public virtual ListLinkedWhatsAppBusinessAccountsResponse ListLinkedWhatsAppBusinessAccounts(ListLinkedWhatsAppBusinessAccountsRequest request) - { - var options = new InvokeOptions(); - options.RequestMarshaller = ListLinkedWhatsAppBusinessAccountsRequestMarshaller.Instance; - options.ResponseUnmarshaller = ListLinkedWhatsAppBusinessAccountsResponseUnmarshaller.Instance; - - return Invoke(request, options); - } - - /// - /// Initiates the asynchronous execution of the ListLinkedWhatsAppBusinessAccounts operation. - /// - /// - /// Container for the necessary parameters to execute the ListLinkedWhatsAppBusinessAccounts operation on AmazonSocialMessagingClient. - /// An AsyncCallback delegate that is invoked when the operation completes. - /// A user-defined state object that is passed to the callback procedure. Retrieve this object from within the callback - /// procedure using the AsyncState property. - /// - /// An IAsyncResult that can be used to poll or wait for results, or both; this value is also needed when invoking EndListLinkedWhatsAppBusinessAccounts - /// operation. - /// REST API Reference for ListLinkedWhatsAppBusinessAccounts Operation - public virtual IAsyncResult BeginListLinkedWhatsAppBusinessAccounts(ListLinkedWhatsAppBusinessAccountsRequest request, AsyncCallback callback, object state) - { - var options = new InvokeOptions(); - options.RequestMarshaller = ListLinkedWhatsAppBusinessAccountsRequestMarshaller.Instance; - options.ResponseUnmarshaller = ListLinkedWhatsAppBusinessAccountsResponseUnmarshaller.Instance; - - return BeginInvoke(request, options, callback, state); - } - - /// - /// Finishes the asynchronous execution of the ListLinkedWhatsAppBusinessAccounts operation. - /// - /// - /// The IAsyncResult returned by the call to BeginListLinkedWhatsAppBusinessAccounts. - /// - /// Returns a ListLinkedWhatsAppBusinessAccountsResult from SocialMessaging. - /// REST API Reference for ListLinkedWhatsAppBusinessAccounts Operation - public virtual ListLinkedWhatsAppBusinessAccountsResponse EndListLinkedWhatsAppBusinessAccounts(IAsyncResult asyncResult) - { - return EndInvoke(asyncResult); - } - - #endregion - - #region ListTagsForResource - - /// - /// List all tags associated with a resource, such as a phone number or WABA. - /// - /// Container for the necessary parameters to execute the ListTagsForResource service method. - /// - /// The response from the ListTagsForResource service method, as returned by SocialMessaging. - /// - /// You do not have sufficient access to perform this action. - /// - /// - /// The request processing has failed because of an unknown error, exception, or failure. - /// - /// - /// One or more parameters provided to the action are not valid. - /// - /// - /// The request was denied due to request throttling. - /// - /// - /// The request contains an invalid parameter value. - /// - /// REST API Reference for ListTagsForResource Operation - public virtual ListTagsForResourceResponse ListTagsForResource(ListTagsForResourceRequest request) - { - var options = new InvokeOptions(); - options.RequestMarshaller = ListTagsForResourceRequestMarshaller.Instance; - options.ResponseUnmarshaller = ListTagsForResourceResponseUnmarshaller.Instance; - - return Invoke(request, options); - } - - /// - /// Initiates the asynchronous execution of the ListTagsForResource operation. - /// - /// - /// Container for the necessary parameters to execute the ListTagsForResource operation on AmazonSocialMessagingClient. - /// An AsyncCallback delegate that is invoked when the operation completes. - /// A user-defined state object that is passed to the callback procedure. Retrieve this object from within the callback - /// procedure using the AsyncState property. - /// - /// An IAsyncResult that can be used to poll or wait for results, or both; this value is also needed when invoking EndListTagsForResource - /// operation. - /// REST API Reference for ListTagsForResource Operation - public virtual IAsyncResult BeginListTagsForResource(ListTagsForResourceRequest request, AsyncCallback callback, object state) - { - var options = new InvokeOptions(); - options.RequestMarshaller = ListTagsForResourceRequestMarshaller.Instance; - options.ResponseUnmarshaller = ListTagsForResourceResponseUnmarshaller.Instance; - - return BeginInvoke(request, options, callback, state); - } - - /// - /// Finishes the asynchronous execution of the ListTagsForResource operation. - /// - /// - /// The IAsyncResult returned by the call to BeginListTagsForResource. - /// - /// Returns a ListTagsForResourceResult from SocialMessaging. - /// REST API Reference for ListTagsForResource Operation - public virtual ListTagsForResourceResponse EndListTagsForResource(IAsyncResult asyncResult) - { - return EndInvoke(asyncResult); - } - - #endregion - - #region PostWhatsAppMessageMedia - - /// - /// Upload a media file to the WhatsApp service. Only the specified originationPhoneNumberId - /// has the permissions to send the media file when using SendWhatsAppMessage. - /// You must use either sourceS3File or sourceS3PresignedUrl for the source. - /// If both or neither are specified then an InvalidParameterException is returned. - /// - /// Container for the necessary parameters to execute the PostWhatsAppMessageMedia service method. - /// - /// The response from the PostWhatsAppMessageMedia service method, as returned by SocialMessaging. - /// - /// You do not have sufficient access to perform this action. - /// - /// - /// You do not have sufficient access to perform this action. - /// - /// - /// Thrown when performing an action because a dependency would be broken. - /// - /// - /// The request processing has failed because of an unknown error, exception, or failure. - /// - /// - /// One or more parameters provided to the action are not valid. - /// - /// - /// The resource was not found. - /// - /// - /// The request was denied due to request throttling. - /// - /// - /// The request contains an invalid parameter value. - /// - /// REST API Reference for PostWhatsAppMessageMedia Operation - public virtual PostWhatsAppMessageMediaResponse PostWhatsAppMessageMedia(PostWhatsAppMessageMediaRequest request) - { - var options = new InvokeOptions(); - options.RequestMarshaller = PostWhatsAppMessageMediaRequestMarshaller.Instance; - options.ResponseUnmarshaller = PostWhatsAppMessageMediaResponseUnmarshaller.Instance; - - return Invoke(request, options); - } - - /// - /// Initiates the asynchronous execution of the PostWhatsAppMessageMedia operation. - /// - /// - /// Container for the necessary parameters to execute the PostWhatsAppMessageMedia operation on AmazonSocialMessagingClient. - /// An AsyncCallback delegate that is invoked when the operation completes. - /// A user-defined state object that is passed to the callback procedure. Retrieve this object from within the callback - /// procedure using the AsyncState property. - /// - /// An IAsyncResult that can be used to poll or wait for results, or both; this value is also needed when invoking EndPostWhatsAppMessageMedia - /// operation. - /// REST API Reference for PostWhatsAppMessageMedia Operation - public virtual IAsyncResult BeginPostWhatsAppMessageMedia(PostWhatsAppMessageMediaRequest request, AsyncCallback callback, object state) - { - var options = new InvokeOptions(); - options.RequestMarshaller = PostWhatsAppMessageMediaRequestMarshaller.Instance; - options.ResponseUnmarshaller = PostWhatsAppMessageMediaResponseUnmarshaller.Instance; - - return BeginInvoke(request, options, callback, state); - } - - /// - /// Finishes the asynchronous execution of the PostWhatsAppMessageMedia operation. - /// - /// - /// The IAsyncResult returned by the call to BeginPostWhatsAppMessageMedia. - /// - /// Returns a PostWhatsAppMessageMediaResult from SocialMessaging. - /// REST API Reference for PostWhatsAppMessageMedia Operation - public virtual PostWhatsAppMessageMediaResponse EndPostWhatsAppMessageMedia(IAsyncResult asyncResult) - { - return EndInvoke(asyncResult); - } - - #endregion - - #region PutWhatsAppBusinessAccountEventDestinations - - /// - /// Add an event destination to log event data from WhatsApp for a WhatsApp Business Account - /// (WABA). A WABA can only have one event destination at a time. All resources associated - /// with the WABA use the same event destination. - /// - /// Container for the necessary parameters to execute the PutWhatsAppBusinessAccountEventDestinations service method. - /// - /// The response from the PutWhatsAppBusinessAccountEventDestinations service method, as returned by SocialMessaging. - /// - /// You do not have sufficient access to perform this action. - /// - /// - /// The request processing has failed because of an unknown error, exception, or failure. - /// - /// - /// One or more parameters provided to the action are not valid. - /// - /// - /// The request was denied due to request throttling. - /// - /// - /// The request contains an invalid parameter value. - /// - /// REST API Reference for PutWhatsAppBusinessAccountEventDestinations Operation - public virtual PutWhatsAppBusinessAccountEventDestinationsResponse PutWhatsAppBusinessAccountEventDestinations(PutWhatsAppBusinessAccountEventDestinationsRequest request) - { - var options = new InvokeOptions(); - options.RequestMarshaller = PutWhatsAppBusinessAccountEventDestinationsRequestMarshaller.Instance; - options.ResponseUnmarshaller = PutWhatsAppBusinessAccountEventDestinationsResponseUnmarshaller.Instance; - - return Invoke(request, options); - } - - /// - /// Initiates the asynchronous execution of the PutWhatsAppBusinessAccountEventDestinations operation. - /// - /// - /// Container for the necessary parameters to execute the PutWhatsAppBusinessAccountEventDestinations operation on AmazonSocialMessagingClient. - /// An AsyncCallback delegate that is invoked when the operation completes. - /// A user-defined state object that is passed to the callback procedure. Retrieve this object from within the callback - /// procedure using the AsyncState property. - /// - /// An IAsyncResult that can be used to poll or wait for results, or both; this value is also needed when invoking EndPutWhatsAppBusinessAccountEventDestinations - /// operation. - /// REST API Reference for PutWhatsAppBusinessAccountEventDestinations Operation - public virtual IAsyncResult BeginPutWhatsAppBusinessAccountEventDestinations(PutWhatsAppBusinessAccountEventDestinationsRequest request, AsyncCallback callback, object state) - { - var options = new InvokeOptions(); - options.RequestMarshaller = PutWhatsAppBusinessAccountEventDestinationsRequestMarshaller.Instance; - options.ResponseUnmarshaller = PutWhatsAppBusinessAccountEventDestinationsResponseUnmarshaller.Instance; - - return BeginInvoke(request, options, callback, state); - } - - /// - /// Finishes the asynchronous execution of the PutWhatsAppBusinessAccountEventDestinations operation. - /// - /// - /// The IAsyncResult returned by the call to BeginPutWhatsAppBusinessAccountEventDestinations. - /// - /// Returns a PutWhatsAppBusinessAccountEventDestinationsResult from SocialMessaging. - /// REST API Reference for PutWhatsAppBusinessAccountEventDestinations Operation - public virtual PutWhatsAppBusinessAccountEventDestinationsResponse EndPutWhatsAppBusinessAccountEventDestinations(IAsyncResult asyncResult) - { - return EndInvoke(asyncResult); - } - - #endregion - - #region SendWhatsAppMessage - - /// - /// Send a WhatsApp message. For examples of sending a message using the Amazon Web Services - /// CLI, see Sending - /// messages in the Amazon Web Services End User Messaging Social User Guide - /// . - /// - /// Container for the necessary parameters to execute the SendWhatsAppMessage service method. - /// - /// The response from the SendWhatsAppMessage service method, as returned by SocialMessaging. - /// - /// You do not have sufficient access to perform this action. - /// - /// - /// Thrown when performing an action because a dependency would be broken. - /// - /// - /// The request processing has failed because of an unknown error, exception, or failure. - /// - /// - /// One or more parameters provided to the action are not valid. - /// - /// - /// The resource was not found. - /// - /// - /// The request was denied due to request throttling. - /// - /// - /// The request contains an invalid parameter value. - /// - /// REST API Reference for SendWhatsAppMessage Operation - public virtual SendWhatsAppMessageResponse SendWhatsAppMessage(SendWhatsAppMessageRequest request) - { - var options = new InvokeOptions(); - options.RequestMarshaller = SendWhatsAppMessageRequestMarshaller.Instance; - options.ResponseUnmarshaller = SendWhatsAppMessageResponseUnmarshaller.Instance; - - return Invoke(request, options); - } - - /// - /// Initiates the asynchronous execution of the SendWhatsAppMessage operation. - /// - /// - /// Container for the necessary parameters to execute the SendWhatsAppMessage operation on AmazonSocialMessagingClient. - /// An AsyncCallback delegate that is invoked when the operation completes. - /// A user-defined state object that is passed to the callback procedure. Retrieve this object from within the callback - /// procedure using the AsyncState property. - /// - /// An IAsyncResult that can be used to poll or wait for results, or both; this value is also needed when invoking EndSendWhatsAppMessage - /// operation. - /// REST API Reference for SendWhatsAppMessage Operation - public virtual IAsyncResult BeginSendWhatsAppMessage(SendWhatsAppMessageRequest request, AsyncCallback callback, object state) - { - var options = new InvokeOptions(); - options.RequestMarshaller = SendWhatsAppMessageRequestMarshaller.Instance; - options.ResponseUnmarshaller = SendWhatsAppMessageResponseUnmarshaller.Instance; - - return BeginInvoke(request, options, callback, state); - } - - /// - /// Finishes the asynchronous execution of the SendWhatsAppMessage operation. - /// - /// - /// The IAsyncResult returned by the call to BeginSendWhatsAppMessage. - /// - /// Returns a SendWhatsAppMessageResult from SocialMessaging. - /// REST API Reference for SendWhatsAppMessage Operation - public virtual SendWhatsAppMessageResponse EndSendWhatsAppMessage(IAsyncResult asyncResult) - { - return EndInvoke(asyncResult); - } - - #endregion - - #region TagResource - - /// - /// Adds or overwrites only the specified tags for the specified resource. When you specify - /// an existing tag key, the value is overwritten with the new value. - /// - /// Container for the necessary parameters to execute the TagResource service method. - /// - /// The response from the TagResource service method, as returned by SocialMessaging. - /// - /// You do not have sufficient access to perform this action. - /// - /// - /// The request processing has failed because of an unknown error, exception, or failure. - /// - /// - /// One or more parameters provided to the action are not valid. - /// - /// - /// The request was denied due to request throttling. - /// - /// - /// The request contains an invalid parameter value. - /// - /// REST API Reference for TagResource Operation - public virtual TagResourceResponse TagResource(TagResourceRequest request) - { - var options = new InvokeOptions(); - options.RequestMarshaller = TagResourceRequestMarshaller.Instance; - options.ResponseUnmarshaller = TagResourceResponseUnmarshaller.Instance; - - return Invoke(request, options); - } - - /// - /// Initiates the asynchronous execution of the TagResource operation. - /// - /// - /// Container for the necessary parameters to execute the TagResource operation on AmazonSocialMessagingClient. - /// An AsyncCallback delegate that is invoked when the operation completes. - /// A user-defined state object that is passed to the callback procedure. Retrieve this object from within the callback - /// procedure using the AsyncState property. - /// - /// An IAsyncResult that can be used to poll or wait for results, or both; this value is also needed when invoking EndTagResource - /// operation. - /// REST API Reference for TagResource Operation - public virtual IAsyncResult BeginTagResource(TagResourceRequest request, AsyncCallback callback, object state) - { - var options = new InvokeOptions(); - options.RequestMarshaller = TagResourceRequestMarshaller.Instance; - options.ResponseUnmarshaller = TagResourceResponseUnmarshaller.Instance; - - return BeginInvoke(request, options, callback, state); - } - - /// - /// Finishes the asynchronous execution of the TagResource operation. - /// - /// - /// The IAsyncResult returned by the call to BeginTagResource. - /// - /// Returns a TagResourceResult from SocialMessaging. - /// REST API Reference for TagResource Operation - public virtual TagResourceResponse EndTagResource(IAsyncResult asyncResult) - { - return EndInvoke(asyncResult); - } - - #endregion - - #region UntagResource - - /// - /// Removes the specified tags from a resource. - /// - /// Container for the necessary parameters to execute the UntagResource service method. - /// - /// The response from the UntagResource service method, as returned by SocialMessaging. - /// - /// You do not have sufficient access to perform this action. - /// - /// - /// The request processing has failed because of an unknown error, exception, or failure. - /// - /// - /// One or more parameters provided to the action are not valid. - /// - /// - /// The request was denied due to request throttling. - /// - /// - /// The request contains an invalid parameter value. - /// - /// REST API Reference for UntagResource Operation - public virtual UntagResourceResponse UntagResource(UntagResourceRequest request) - { - var options = new InvokeOptions(); - options.RequestMarshaller = UntagResourceRequestMarshaller.Instance; - options.ResponseUnmarshaller = UntagResourceResponseUnmarshaller.Instance; - - return Invoke(request, options); - } - - /// - /// Initiates the asynchronous execution of the UntagResource operation. - /// - /// - /// Container for the necessary parameters to execute the UntagResource operation on AmazonSocialMessagingClient. - /// An AsyncCallback delegate that is invoked when the operation completes. - /// A user-defined state object that is passed to the callback procedure. Retrieve this object from within the callback - /// procedure using the AsyncState property. - /// - /// An IAsyncResult that can be used to poll or wait for results, or both; this value is also needed when invoking EndUntagResource - /// operation. - /// REST API Reference for UntagResource Operation - public virtual IAsyncResult BeginUntagResource(UntagResourceRequest request, AsyncCallback callback, object state) - { - var options = new InvokeOptions(); - options.RequestMarshaller = UntagResourceRequestMarshaller.Instance; - options.ResponseUnmarshaller = UntagResourceResponseUnmarshaller.Instance; - - return BeginInvoke(request, options, callback, state); - } - - /// - /// Finishes the asynchronous execution of the UntagResource operation. - /// - /// - /// The IAsyncResult returned by the call to BeginUntagResource. - /// - /// Returns a UntagResourceResult from SocialMessaging. - /// REST API Reference for UntagResource Operation - public virtual UntagResourceResponse EndUntagResource(IAsyncResult asyncResult) - { - return EndInvoke(asyncResult); - } - - #endregion - - #region DetermineServiceOperationEndpoint - - /// - /// Returns the endpoint that will be used for a particular request. - /// - /// Request for the desired service operation. - /// The resolved endpoint for the given request. - public Amazon.Runtime.Endpoints.Endpoint DetermineServiceOperationEndpoint(AmazonWebServiceRequest request) - { - var requestContext = new Amazon.Runtime.Internal.RequestContext(false, CreateSigner()) - { - ClientConfig = Config, - OriginalRequest = request, - Request = new Amazon.Runtime.Internal.DefaultRequest(request, ServiceMetadata.ServiceId) - }; - - var executionContext = new Amazon.Runtime.Internal.ExecutionContext(requestContext, null); - var resolver = new AmazonSocialMessagingEndpointResolver(); - return resolver.GetEndpoint(executionContext); - } - - #endregion - - } -} \ No newline at end of file diff --git a/sdk/src/Services/SocialMessaging/Generated/_bcl35/IAmazonSocialMessaging.cs b/sdk/src/Services/SocialMessaging/Generated/_bcl35/IAmazonSocialMessaging.cs deleted file mode 100644 index 8219a10f7fcb..000000000000 --- a/sdk/src/Services/SocialMessaging/Generated/_bcl35/IAmazonSocialMessaging.cs +++ /dev/null @@ -1,887 +0,0 @@ -/* - * 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. - */ - -/* - * Do not modify this file. This file is generated from the socialmessaging-2024-01-01.normal.json service model. - */ - - -using System; -using System.Collections.Generic; - -using Amazon.Runtime; -using Amazon.SocialMessaging.Model; - -#pragma warning disable CS1570 -namespace Amazon.SocialMessaging -{ - /// - /// Interface for accessing SocialMessaging - /// - /// Amazon Web Services End User Messaging Social, also referred to as Social - /// messaging, is a messaging service that enables application developers to incorporate - /// WhatsApp into their existing workflows. The Amazon Web Services End User Messaging - /// Social API provides information about the Amazon Web Services End User Messaging - /// Social API resources, including supported HTTP methods, parameters, and schemas. - /// - /// - /// - /// The Amazon Web Services End User Messaging Social API provides programmatic - /// access to options that are unique to the WhatsApp Business Platform. - /// - /// - /// - /// If you're new to the Amazon Web Services End User Messaging Social API, it's - /// also helpful to review What - /// is Amazon Web Services End User Messaging Social in the Amazon Web Services - /// End User Messaging Social User Guide. The Amazon Web Services End User Messaging - /// Social User Guide provides tutorials, code samples, and procedures that demonstrate - /// how to use Amazon Web Services End User Messaging Social API features programmatically - /// and how to integrate functionality into applications. The guide also provides key - /// information, such as integration with other Amazon Web Services services, and the - /// quotas that apply to use of the service. - /// - /// - /// - /// Regional availability - /// - /// - /// - /// The Amazon Web Services End User Messaging Social API is available across several - /// Amazon Web Services Regions and it provides a dedicated endpoint for each of these - /// Regions. For a list of all the Regions and endpoints where the API is currently available, - /// see Amazon - /// Web Services Service Endpoints and Amazon - /// Web Services End User Messaging endpoints and quotas in the Amazon Web Services - /// General Reference. To learn more about Amazon Web Services Regions, see Managing - /// Amazon Web Services Regions in the Amazon Web Services General Reference. - /// - /// - /// - /// In each Region, Amazon Web Services maintains multiple Availability Zones. These Availability - /// Zones are physically isolated from each other, but are united by private, low-latency, - /// high-throughput, and highly redundant network connections. These Availability Zones - /// enable us to provide very high levels of availability and redundancy, while also minimizing - /// latency. To learn more about the number of Availability Zones that are available in - /// each Region, see Amazon - /// Web Services Global Infrastructure. - /// - /// - public partial interface IAmazonSocialMessaging : IAmazonService, IDisposable - { - - -#if BCL45 || AWS_ASYNC_ENUMERABLES_API - /// - /// Paginators for the service - /// - ISocialMessagingPaginatorFactory Paginators { get; } -#endif - - - - #region AssociateWhatsAppBusinessAccount - - - /// - /// This is only used through the Amazon Web Services console during sign-up to associate - /// your WhatsApp Business Account to your Amazon Web Services account. - /// - /// Container for the necessary parameters to execute the AssociateWhatsAppBusinessAccount service method. - /// - /// The response from the AssociateWhatsAppBusinessAccount service method, as returned by SocialMessaging. - /// - /// You do not have sufficient access to perform this action. - /// - /// - /// Thrown when performing an action because a dependency would be broken. - /// - /// - /// One or more parameters provided to the action are not valid. - /// - /// - /// The request was denied due to request throttling. - /// - /// - /// The request contains an invalid parameter value. - /// - /// REST API Reference for AssociateWhatsAppBusinessAccount Operation - AssociateWhatsAppBusinessAccountResponse AssociateWhatsAppBusinessAccount(AssociateWhatsAppBusinessAccountRequest request); - - /// - /// Initiates the asynchronous execution of the AssociateWhatsAppBusinessAccount operation. - /// - /// - /// Container for the necessary parameters to execute the AssociateWhatsAppBusinessAccount operation on AmazonSocialMessagingClient. - /// An AsyncCallback delegate that is invoked when the operation completes. - /// A user-defined state object that is passed to the callback procedure. Retrieve this object from within the callback - /// procedure using the AsyncState property. - /// - /// An IAsyncResult that can be used to poll or wait for results, or both; this value is also needed when invoking EndAssociateWhatsAppBusinessAccount - /// operation. - /// REST API Reference for AssociateWhatsAppBusinessAccount Operation - IAsyncResult BeginAssociateWhatsAppBusinessAccount(AssociateWhatsAppBusinessAccountRequest request, AsyncCallback callback, object state); - - - - /// - /// Finishes the asynchronous execution of the AssociateWhatsAppBusinessAccount operation. - /// - /// - /// The IAsyncResult returned by the call to BeginAssociateWhatsAppBusinessAccount. - /// - /// Returns a AssociateWhatsAppBusinessAccountResult from SocialMessaging. - /// REST API Reference for AssociateWhatsAppBusinessAccount Operation - AssociateWhatsAppBusinessAccountResponse EndAssociateWhatsAppBusinessAccount(IAsyncResult asyncResult); - - #endregion - - #region DeleteWhatsAppMessageMedia - - - /// - /// Delete a media object from the WhatsApp service. If the object is still in an Amazon - /// S3 bucket you should delete it from there too. - /// - /// Container for the necessary parameters to execute the DeleteWhatsAppMessageMedia service method. - /// - /// The response from the DeleteWhatsAppMessageMedia service method, as returned by SocialMessaging. - /// - /// You do not have sufficient access to perform this action. - /// - /// - /// You do not have sufficient access to perform this action. - /// - /// - /// Thrown when performing an action because a dependency would be broken. - /// - /// - /// The request processing has failed because of an unknown error, exception, or failure. - /// - /// - /// One or more parameters provided to the action are not valid. - /// - /// - /// The resource was not found. - /// - /// - /// The request was denied due to request throttling. - /// - /// - /// The request contains an invalid parameter value. - /// - /// REST API Reference for DeleteWhatsAppMessageMedia Operation - DeleteWhatsAppMessageMediaResponse DeleteWhatsAppMessageMedia(DeleteWhatsAppMessageMediaRequest request); - - /// - /// Initiates the asynchronous execution of the DeleteWhatsAppMessageMedia operation. - /// - /// - /// Container for the necessary parameters to execute the DeleteWhatsAppMessageMedia operation on AmazonSocialMessagingClient. - /// An AsyncCallback delegate that is invoked when the operation completes. - /// A user-defined state object that is passed to the callback procedure. Retrieve this object from within the callback - /// procedure using the AsyncState property. - /// - /// An IAsyncResult that can be used to poll or wait for results, or both; this value is also needed when invoking EndDeleteWhatsAppMessageMedia - /// operation. - /// REST API Reference for DeleteWhatsAppMessageMedia Operation - IAsyncResult BeginDeleteWhatsAppMessageMedia(DeleteWhatsAppMessageMediaRequest request, AsyncCallback callback, object state); - - - - /// - /// Finishes the asynchronous execution of the DeleteWhatsAppMessageMedia operation. - /// - /// - /// The IAsyncResult returned by the call to BeginDeleteWhatsAppMessageMedia. - /// - /// Returns a DeleteWhatsAppMessageMediaResult from SocialMessaging. - /// REST API Reference for DeleteWhatsAppMessageMedia Operation - DeleteWhatsAppMessageMediaResponse EndDeleteWhatsAppMessageMedia(IAsyncResult asyncResult); - - #endregion - - #region DisassociateWhatsAppBusinessAccount - - - /// - /// Disassociate a WhatsApp Business Account (WABA) from your Amazon Web Services account. - /// - /// Container for the necessary parameters to execute the DisassociateWhatsAppBusinessAccount service method. - /// - /// The response from the DisassociateWhatsAppBusinessAccount service method, as returned by SocialMessaging. - /// - /// You do not have sufficient access to perform this action. - /// - /// - /// Thrown when performing an action because a dependency would be broken. - /// - /// - /// One or more parameters provided to the action are not valid. - /// - /// - /// The resource was not found. - /// - /// - /// The request was denied due to request throttling. - /// - /// - /// The request contains an invalid parameter value. - /// - /// REST API Reference for DisassociateWhatsAppBusinessAccount Operation - DisassociateWhatsAppBusinessAccountResponse DisassociateWhatsAppBusinessAccount(DisassociateWhatsAppBusinessAccountRequest request); - - /// - /// Initiates the asynchronous execution of the DisassociateWhatsAppBusinessAccount operation. - /// - /// - /// Container for the necessary parameters to execute the DisassociateWhatsAppBusinessAccount operation on AmazonSocialMessagingClient. - /// An AsyncCallback delegate that is invoked when the operation completes. - /// A user-defined state object that is passed to the callback procedure. Retrieve this object from within the callback - /// procedure using the AsyncState property. - /// - /// An IAsyncResult that can be used to poll or wait for results, or both; this value is also needed when invoking EndDisassociateWhatsAppBusinessAccount - /// operation. - /// REST API Reference for DisassociateWhatsAppBusinessAccount Operation - IAsyncResult BeginDisassociateWhatsAppBusinessAccount(DisassociateWhatsAppBusinessAccountRequest request, AsyncCallback callback, object state); - - - - /// - /// Finishes the asynchronous execution of the DisassociateWhatsAppBusinessAccount operation. - /// - /// - /// The IAsyncResult returned by the call to BeginDisassociateWhatsAppBusinessAccount. - /// - /// Returns a DisassociateWhatsAppBusinessAccountResult from SocialMessaging. - /// REST API Reference for DisassociateWhatsAppBusinessAccount Operation - DisassociateWhatsAppBusinessAccountResponse EndDisassociateWhatsAppBusinessAccount(IAsyncResult asyncResult); - - #endregion - - #region GetLinkedWhatsAppBusinessAccount - - - /// - /// Get the details of your linked WhatsApp Business Account. - /// - /// Container for the necessary parameters to execute the GetLinkedWhatsAppBusinessAccount service method. - /// - /// The response from the GetLinkedWhatsAppBusinessAccount service method, as returned by SocialMessaging. - /// - /// You do not have sufficient access to perform this action. - /// - /// - /// Thrown when performing an action because a dependency would be broken. - /// - /// - /// The request processing has failed because of an unknown error, exception, or failure. - /// - /// - /// One or more parameters provided to the action are not valid. - /// - /// - /// The resource was not found. - /// - /// - /// The request was denied due to request throttling. - /// - /// - /// The request contains an invalid parameter value. - /// - /// REST API Reference for GetLinkedWhatsAppBusinessAccount Operation - GetLinkedWhatsAppBusinessAccountResponse GetLinkedWhatsAppBusinessAccount(GetLinkedWhatsAppBusinessAccountRequest request); - - /// - /// Initiates the asynchronous execution of the GetLinkedWhatsAppBusinessAccount operation. - /// - /// - /// Container for the necessary parameters to execute the GetLinkedWhatsAppBusinessAccount operation on AmazonSocialMessagingClient. - /// An AsyncCallback delegate that is invoked when the operation completes. - /// A user-defined state object that is passed to the callback procedure. Retrieve this object from within the callback - /// procedure using the AsyncState property. - /// - /// An IAsyncResult that can be used to poll or wait for results, or both; this value is also needed when invoking EndGetLinkedWhatsAppBusinessAccount - /// operation. - /// REST API Reference for GetLinkedWhatsAppBusinessAccount Operation - IAsyncResult BeginGetLinkedWhatsAppBusinessAccount(GetLinkedWhatsAppBusinessAccountRequest request, AsyncCallback callback, object state); - - - - /// - /// Finishes the asynchronous execution of the GetLinkedWhatsAppBusinessAccount operation. - /// - /// - /// The IAsyncResult returned by the call to BeginGetLinkedWhatsAppBusinessAccount. - /// - /// Returns a GetLinkedWhatsAppBusinessAccountResult from SocialMessaging. - /// REST API Reference for GetLinkedWhatsAppBusinessAccount Operation - GetLinkedWhatsAppBusinessAccountResponse EndGetLinkedWhatsAppBusinessAccount(IAsyncResult asyncResult); - - #endregion - - #region GetLinkedWhatsAppBusinessAccountPhoneNumber - - - /// - /// Use your WhatsApp phone number id to get the WABA account id and phone number details. - /// - /// Container for the necessary parameters to execute the GetLinkedWhatsAppBusinessAccountPhoneNumber service method. - /// - /// The response from the GetLinkedWhatsAppBusinessAccountPhoneNumber service method, as returned by SocialMessaging. - /// - /// You do not have sufficient access to perform this action. - /// - /// - /// Thrown when performing an action because a dependency would be broken. - /// - /// - /// The request processing has failed because of an unknown error, exception, or failure. - /// - /// - /// One or more parameters provided to the action are not valid. - /// - /// - /// The resource was not found. - /// - /// - /// The request was denied due to request throttling. - /// - /// - /// The request contains an invalid parameter value. - /// - /// REST API Reference for GetLinkedWhatsAppBusinessAccountPhoneNumber Operation - GetLinkedWhatsAppBusinessAccountPhoneNumberResponse GetLinkedWhatsAppBusinessAccountPhoneNumber(GetLinkedWhatsAppBusinessAccountPhoneNumberRequest request); - - /// - /// Initiates the asynchronous execution of the GetLinkedWhatsAppBusinessAccountPhoneNumber operation. - /// - /// - /// Container for the necessary parameters to execute the GetLinkedWhatsAppBusinessAccountPhoneNumber operation on AmazonSocialMessagingClient. - /// An AsyncCallback delegate that is invoked when the operation completes. - /// A user-defined state object that is passed to the callback procedure. Retrieve this object from within the callback - /// procedure using the AsyncState property. - /// - /// An IAsyncResult that can be used to poll or wait for results, or both; this value is also needed when invoking EndGetLinkedWhatsAppBusinessAccountPhoneNumber - /// operation. - /// REST API Reference for GetLinkedWhatsAppBusinessAccountPhoneNumber Operation - IAsyncResult BeginGetLinkedWhatsAppBusinessAccountPhoneNumber(GetLinkedWhatsAppBusinessAccountPhoneNumberRequest request, AsyncCallback callback, object state); - - - - /// - /// Finishes the asynchronous execution of the GetLinkedWhatsAppBusinessAccountPhoneNumber operation. - /// - /// - /// The IAsyncResult returned by the call to BeginGetLinkedWhatsAppBusinessAccountPhoneNumber. - /// - /// Returns a GetLinkedWhatsAppBusinessAccountPhoneNumberResult from SocialMessaging. - /// REST API Reference for GetLinkedWhatsAppBusinessAccountPhoneNumber Operation - GetLinkedWhatsAppBusinessAccountPhoneNumberResponse EndGetLinkedWhatsAppBusinessAccountPhoneNumber(IAsyncResult asyncResult); - - #endregion - - #region GetWhatsAppMessageMedia - - - /// - /// Get a media file from the WhatsApp service. On successful completion the media file - /// is retrieved from Meta and stored in the specified Amazon S3 bucket. Use either destinationS3File - /// or destinationS3PresignedUrl for the destination. If both are used then an - /// InvalidParameterException is returned. - /// - /// Container for the necessary parameters to execute the GetWhatsAppMessageMedia service method. - /// - /// The response from the GetWhatsAppMessageMedia service method, as returned by SocialMessaging. - /// - /// You do not have sufficient access to perform this action. - /// - /// - /// You do not have sufficient access to perform this action. - /// - /// - /// Thrown when performing an action because a dependency would be broken. - /// - /// - /// The request processing has failed because of an unknown error, exception, or failure. - /// - /// - /// One or more parameters provided to the action are not valid. - /// - /// - /// The resource was not found. - /// - /// - /// The request was denied due to request throttling. - /// - /// - /// The request contains an invalid parameter value. - /// - /// REST API Reference for GetWhatsAppMessageMedia Operation - GetWhatsAppMessageMediaResponse GetWhatsAppMessageMedia(GetWhatsAppMessageMediaRequest request); - - /// - /// Initiates the asynchronous execution of the GetWhatsAppMessageMedia operation. - /// - /// - /// Container for the necessary parameters to execute the GetWhatsAppMessageMedia operation on AmazonSocialMessagingClient. - /// An AsyncCallback delegate that is invoked when the operation completes. - /// A user-defined state object that is passed to the callback procedure. Retrieve this object from within the callback - /// procedure using the AsyncState property. - /// - /// An IAsyncResult that can be used to poll or wait for results, or both; this value is also needed when invoking EndGetWhatsAppMessageMedia - /// operation. - /// REST API Reference for GetWhatsAppMessageMedia Operation - IAsyncResult BeginGetWhatsAppMessageMedia(GetWhatsAppMessageMediaRequest request, AsyncCallback callback, object state); - - - - /// - /// Finishes the asynchronous execution of the GetWhatsAppMessageMedia operation. - /// - /// - /// The IAsyncResult returned by the call to BeginGetWhatsAppMessageMedia. - /// - /// Returns a GetWhatsAppMessageMediaResult from SocialMessaging. - /// REST API Reference for GetWhatsAppMessageMedia Operation - GetWhatsAppMessageMediaResponse EndGetWhatsAppMessageMedia(IAsyncResult asyncResult); - - #endregion - - #region ListLinkedWhatsAppBusinessAccounts - - - /// - /// List all WhatsApp Business Accounts linked to your Amazon Web Services account. - /// - /// Container for the necessary parameters to execute the ListLinkedWhatsAppBusinessAccounts service method. - /// - /// The response from the ListLinkedWhatsAppBusinessAccounts service method, as returned by SocialMessaging. - /// - /// You do not have sufficient access to perform this action. - /// - /// - /// The request processing has failed because of an unknown error, exception, or failure. - /// - /// - /// One or more parameters provided to the action are not valid. - /// - /// - /// The resource was not found. - /// - /// - /// The request was denied due to request throttling. - /// - /// - /// The request contains an invalid parameter value. - /// - /// REST API Reference for ListLinkedWhatsAppBusinessAccounts Operation - ListLinkedWhatsAppBusinessAccountsResponse ListLinkedWhatsAppBusinessAccounts(ListLinkedWhatsAppBusinessAccountsRequest request); - - /// - /// Initiates the asynchronous execution of the ListLinkedWhatsAppBusinessAccounts operation. - /// - /// - /// Container for the necessary parameters to execute the ListLinkedWhatsAppBusinessAccounts operation on AmazonSocialMessagingClient. - /// An AsyncCallback delegate that is invoked when the operation completes. - /// A user-defined state object that is passed to the callback procedure. Retrieve this object from within the callback - /// procedure using the AsyncState property. - /// - /// An IAsyncResult that can be used to poll or wait for results, or both; this value is also needed when invoking EndListLinkedWhatsAppBusinessAccounts - /// operation. - /// REST API Reference for ListLinkedWhatsAppBusinessAccounts Operation - IAsyncResult BeginListLinkedWhatsAppBusinessAccounts(ListLinkedWhatsAppBusinessAccountsRequest request, AsyncCallback callback, object state); - - - - /// - /// Finishes the asynchronous execution of the ListLinkedWhatsAppBusinessAccounts operation. - /// - /// - /// The IAsyncResult returned by the call to BeginListLinkedWhatsAppBusinessAccounts. - /// - /// Returns a ListLinkedWhatsAppBusinessAccountsResult from SocialMessaging. - /// REST API Reference for ListLinkedWhatsAppBusinessAccounts Operation - ListLinkedWhatsAppBusinessAccountsResponse EndListLinkedWhatsAppBusinessAccounts(IAsyncResult asyncResult); - - #endregion - - #region ListTagsForResource - - - /// - /// List all tags associated with a resource, such as a phone number or WABA. - /// - /// Container for the necessary parameters to execute the ListTagsForResource service method. - /// - /// The response from the ListTagsForResource service method, as returned by SocialMessaging. - /// - /// You do not have sufficient access to perform this action. - /// - /// - /// The request processing has failed because of an unknown error, exception, or failure. - /// - /// - /// One or more parameters provided to the action are not valid. - /// - /// - /// The request was denied due to request throttling. - /// - /// - /// The request contains an invalid parameter value. - /// - /// REST API Reference for ListTagsForResource Operation - ListTagsForResourceResponse ListTagsForResource(ListTagsForResourceRequest request); - - /// - /// Initiates the asynchronous execution of the ListTagsForResource operation. - /// - /// - /// Container for the necessary parameters to execute the ListTagsForResource operation on AmazonSocialMessagingClient. - /// An AsyncCallback delegate that is invoked when the operation completes. - /// A user-defined state object that is passed to the callback procedure. Retrieve this object from within the callback - /// procedure using the AsyncState property. - /// - /// An IAsyncResult that can be used to poll or wait for results, or both; this value is also needed when invoking EndListTagsForResource - /// operation. - /// REST API Reference for ListTagsForResource Operation - IAsyncResult BeginListTagsForResource(ListTagsForResourceRequest request, AsyncCallback callback, object state); - - - - /// - /// Finishes the asynchronous execution of the ListTagsForResource operation. - /// - /// - /// The IAsyncResult returned by the call to BeginListTagsForResource. - /// - /// Returns a ListTagsForResourceResult from SocialMessaging. - /// REST API Reference for ListTagsForResource Operation - ListTagsForResourceResponse EndListTagsForResource(IAsyncResult asyncResult); - - #endregion - - #region PostWhatsAppMessageMedia - - - /// - /// Upload a media file to the WhatsApp service. Only the specified originationPhoneNumberId - /// has the permissions to send the media file when using SendWhatsAppMessage. - /// You must use either sourceS3File or sourceS3PresignedUrl for the source. - /// If both or neither are specified then an InvalidParameterException is returned. - /// - /// Container for the necessary parameters to execute the PostWhatsAppMessageMedia service method. - /// - /// The response from the PostWhatsAppMessageMedia service method, as returned by SocialMessaging. - /// - /// You do not have sufficient access to perform this action. - /// - /// - /// You do not have sufficient access to perform this action. - /// - /// - /// Thrown when performing an action because a dependency would be broken. - /// - /// - /// The request processing has failed because of an unknown error, exception, or failure. - /// - /// - /// One or more parameters provided to the action are not valid. - /// - /// - /// The resource was not found. - /// - /// - /// The request was denied due to request throttling. - /// - /// - /// The request contains an invalid parameter value. - /// - /// REST API Reference for PostWhatsAppMessageMedia Operation - PostWhatsAppMessageMediaResponse PostWhatsAppMessageMedia(PostWhatsAppMessageMediaRequest request); - - /// - /// Initiates the asynchronous execution of the PostWhatsAppMessageMedia operation. - /// - /// - /// Container for the necessary parameters to execute the PostWhatsAppMessageMedia operation on AmazonSocialMessagingClient. - /// An AsyncCallback delegate that is invoked when the operation completes. - /// A user-defined state object that is passed to the callback procedure. Retrieve this object from within the callback - /// procedure using the AsyncState property. - /// - /// An IAsyncResult that can be used to poll or wait for results, or both; this value is also needed when invoking EndPostWhatsAppMessageMedia - /// operation. - /// REST API Reference for PostWhatsAppMessageMedia Operation - IAsyncResult BeginPostWhatsAppMessageMedia(PostWhatsAppMessageMediaRequest request, AsyncCallback callback, object state); - - - - /// - /// Finishes the asynchronous execution of the PostWhatsAppMessageMedia operation. - /// - /// - /// The IAsyncResult returned by the call to BeginPostWhatsAppMessageMedia. - /// - /// Returns a PostWhatsAppMessageMediaResult from SocialMessaging. - /// REST API Reference for PostWhatsAppMessageMedia Operation - PostWhatsAppMessageMediaResponse EndPostWhatsAppMessageMedia(IAsyncResult asyncResult); - - #endregion - - #region PutWhatsAppBusinessAccountEventDestinations - - - /// - /// Add an event destination to log event data from WhatsApp for a WhatsApp Business Account - /// (WABA). A WABA can only have one event destination at a time. All resources associated - /// with the WABA use the same event destination. - /// - /// Container for the necessary parameters to execute the PutWhatsAppBusinessAccountEventDestinations service method. - /// - /// The response from the PutWhatsAppBusinessAccountEventDestinations service method, as returned by SocialMessaging. - /// - /// You do not have sufficient access to perform this action. - /// - /// - /// The request processing has failed because of an unknown error, exception, or failure. - /// - /// - /// One or more parameters provided to the action are not valid. - /// - /// - /// The request was denied due to request throttling. - /// - /// - /// The request contains an invalid parameter value. - /// - /// REST API Reference for PutWhatsAppBusinessAccountEventDestinations Operation - PutWhatsAppBusinessAccountEventDestinationsResponse PutWhatsAppBusinessAccountEventDestinations(PutWhatsAppBusinessAccountEventDestinationsRequest request); - - /// - /// Initiates the asynchronous execution of the PutWhatsAppBusinessAccountEventDestinations operation. - /// - /// - /// Container for the necessary parameters to execute the PutWhatsAppBusinessAccountEventDestinations operation on AmazonSocialMessagingClient. - /// An AsyncCallback delegate that is invoked when the operation completes. - /// A user-defined state object that is passed to the callback procedure. Retrieve this object from within the callback - /// procedure using the AsyncState property. - /// - /// An IAsyncResult that can be used to poll or wait for results, or both; this value is also needed when invoking EndPutWhatsAppBusinessAccountEventDestinations - /// operation. - /// REST API Reference for PutWhatsAppBusinessAccountEventDestinations Operation - IAsyncResult BeginPutWhatsAppBusinessAccountEventDestinations(PutWhatsAppBusinessAccountEventDestinationsRequest request, AsyncCallback callback, object state); - - - - /// - /// Finishes the asynchronous execution of the PutWhatsAppBusinessAccountEventDestinations operation. - /// - /// - /// The IAsyncResult returned by the call to BeginPutWhatsAppBusinessAccountEventDestinations. - /// - /// Returns a PutWhatsAppBusinessAccountEventDestinationsResult from SocialMessaging. - /// REST API Reference for PutWhatsAppBusinessAccountEventDestinations Operation - PutWhatsAppBusinessAccountEventDestinationsResponse EndPutWhatsAppBusinessAccountEventDestinations(IAsyncResult asyncResult); - - #endregion - - #region SendWhatsAppMessage - - - /// - /// Send a WhatsApp message. For examples of sending a message using the Amazon Web Services - /// CLI, see Sending - /// messages in the Amazon Web Services End User Messaging Social User Guide - /// . - /// - /// Container for the necessary parameters to execute the SendWhatsAppMessage service method. - /// - /// The response from the SendWhatsAppMessage service method, as returned by SocialMessaging. - /// - /// You do not have sufficient access to perform this action. - /// - /// - /// Thrown when performing an action because a dependency would be broken. - /// - /// - /// The request processing has failed because of an unknown error, exception, or failure. - /// - /// - /// One or more parameters provided to the action are not valid. - /// - /// - /// The resource was not found. - /// - /// - /// The request was denied due to request throttling. - /// - /// - /// The request contains an invalid parameter value. - /// - /// REST API Reference for SendWhatsAppMessage Operation - SendWhatsAppMessageResponse SendWhatsAppMessage(SendWhatsAppMessageRequest request); - - /// - /// Initiates the asynchronous execution of the SendWhatsAppMessage operation. - /// - /// - /// Container for the necessary parameters to execute the SendWhatsAppMessage operation on AmazonSocialMessagingClient. - /// An AsyncCallback delegate that is invoked when the operation completes. - /// A user-defined state object that is passed to the callback procedure. Retrieve this object from within the callback - /// procedure using the AsyncState property. - /// - /// An IAsyncResult that can be used to poll or wait for results, or both; this value is also needed when invoking EndSendWhatsAppMessage - /// operation. - /// REST API Reference for SendWhatsAppMessage Operation - IAsyncResult BeginSendWhatsAppMessage(SendWhatsAppMessageRequest request, AsyncCallback callback, object state); - - - - /// - /// Finishes the asynchronous execution of the SendWhatsAppMessage operation. - /// - /// - /// The IAsyncResult returned by the call to BeginSendWhatsAppMessage. - /// - /// Returns a SendWhatsAppMessageResult from SocialMessaging. - /// REST API Reference for SendWhatsAppMessage Operation - SendWhatsAppMessageResponse EndSendWhatsAppMessage(IAsyncResult asyncResult); - - #endregion - - #region TagResource - - - /// - /// Adds or overwrites only the specified tags for the specified resource. When you specify - /// an existing tag key, the value is overwritten with the new value. - /// - /// Container for the necessary parameters to execute the TagResource service method. - /// - /// The response from the TagResource service method, as returned by SocialMessaging. - /// - /// You do not have sufficient access to perform this action. - /// - /// - /// The request processing has failed because of an unknown error, exception, or failure. - /// - /// - /// One or more parameters provided to the action are not valid. - /// - /// - /// The request was denied due to request throttling. - /// - /// - /// The request contains an invalid parameter value. - /// - /// REST API Reference for TagResource Operation - TagResourceResponse TagResource(TagResourceRequest request); - - /// - /// Initiates the asynchronous execution of the TagResource operation. - /// - /// - /// Container for the necessary parameters to execute the TagResource operation on AmazonSocialMessagingClient. - /// An AsyncCallback delegate that is invoked when the operation completes. - /// A user-defined state object that is passed to the callback procedure. Retrieve this object from within the callback - /// procedure using the AsyncState property. - /// - /// An IAsyncResult that can be used to poll or wait for results, or both; this value is also needed when invoking EndTagResource - /// operation. - /// REST API Reference for TagResource Operation - IAsyncResult BeginTagResource(TagResourceRequest request, AsyncCallback callback, object state); - - - - /// - /// Finishes the asynchronous execution of the TagResource operation. - /// - /// - /// The IAsyncResult returned by the call to BeginTagResource. - /// - /// Returns a TagResourceResult from SocialMessaging. - /// REST API Reference for TagResource Operation - TagResourceResponse EndTagResource(IAsyncResult asyncResult); - - #endregion - - #region UntagResource - - - /// - /// Removes the specified tags from a resource. - /// - /// Container for the necessary parameters to execute the UntagResource service method. - /// - /// The response from the UntagResource service method, as returned by SocialMessaging. - /// - /// You do not have sufficient access to perform this action. - /// - /// - /// The request processing has failed because of an unknown error, exception, or failure. - /// - /// - /// One or more parameters provided to the action are not valid. - /// - /// - /// The request was denied due to request throttling. - /// - /// - /// The request contains an invalid parameter value. - /// - /// REST API Reference for UntagResource Operation - UntagResourceResponse UntagResource(UntagResourceRequest request); - - /// - /// Initiates the asynchronous execution of the UntagResource operation. - /// - /// - /// Container for the necessary parameters to execute the UntagResource operation on AmazonSocialMessagingClient. - /// An AsyncCallback delegate that is invoked when the operation completes. - /// A user-defined state object that is passed to the callback procedure. Retrieve this object from within the callback - /// procedure using the AsyncState property. - /// - /// An IAsyncResult that can be used to poll or wait for results, or both; this value is also needed when invoking EndUntagResource - /// operation. - /// REST API Reference for UntagResource Operation - IAsyncResult BeginUntagResource(UntagResourceRequest request, AsyncCallback callback, object state); - - - - /// - /// Finishes the asynchronous execution of the UntagResource operation. - /// - /// - /// The IAsyncResult returned by the call to BeginUntagResource. - /// - /// Returns a UntagResourceResult from SocialMessaging. - /// REST API Reference for UntagResource Operation - UntagResourceResponse EndUntagResource(IAsyncResult asyncResult); - - #endregion - - #region DetermineServiceOperationEndpoint - - /// - /// Returns the endpoint that will be used for a particular request. - /// - /// Request for the desired service operation. - /// The resolved endpoint for the given request. - Amazon.Runtime.Endpoints.Endpoint DetermineServiceOperationEndpoint(AmazonWebServiceRequest request); - - #endregion - - } -} \ No newline at end of file diff --git a/sdk/src/Services/SocialMessaging/Generated/_netstandard/AmazonSocialMessagingClient.cs b/sdk/src/Services/SocialMessaging/Generated/_netstandard/AmazonSocialMessagingClient.cs index e330361c5d57..7fe6b5b447f8 100644 --- a/sdk/src/Services/SocialMessaging/Generated/_netstandard/AmazonSocialMessagingClient.cs +++ b/sdk/src/Services/SocialMessaging/Generated/_netstandard/AmazonSocialMessagingClient.cs @@ -32,6 +32,7 @@ using Amazon.Runtime.Internal; using Amazon.Runtime.Internal.Auth; using Amazon.Runtime.Internal.Transform; +using Amazon.Runtime.Endpoints; #pragma warning disable CS1570 namespace Amazon.SocialMessaging @@ -1026,16 +1027,8 @@ internal virtual UntagResourceResponse UntagResource(UntagResourceRequest reques /// The resolved endpoint for the given request. public Amazon.Runtime.Endpoints.Endpoint DetermineServiceOperationEndpoint(AmazonWebServiceRequest request) { - var requestContext = new Amazon.Runtime.Internal.RequestContext(false, CreateSigner()) - { - ClientConfig = Config, - OriginalRequest = request, - Request = new Amazon.Runtime.Internal.DefaultRequest(request, ServiceMetadata.ServiceId) - }; - - var executionContext = new Amazon.Runtime.Internal.ExecutionContext(requestContext, null); - var resolver = new AmazonSocialMessagingEndpointResolver(); - return resolver.GetEndpoint(executionContext); + var parameters = new ServiceOperationEndpointParameters(request); + return Config.DetermineServiceOperationEndpoint(parameters); } #endregion diff --git a/sdk/src/Services/SocialMessaging/Generated/_netstandard/IAmazonSocialMessaging.cs b/sdk/src/Services/SocialMessaging/Generated/_netstandard/IAmazonSocialMessaging.cs index 4906a7c32694..42d65d6957ab 100644 --- a/sdk/src/Services/SocialMessaging/Generated/_netstandard/IAmazonSocialMessaging.cs +++ b/sdk/src/Services/SocialMessaging/Generated/_netstandard/IAmazonSocialMessaging.cs @@ -595,5 +595,33 @@ public partial interface IAmazonSocialMessaging : IAmazonService, IDisposable #endregion + #region Static factory interface methods +#if NET8_0_OR_GREATER +// Warning CA1033 is issued when the child types can not call the method defined in parent types. +// In this use case the intended caller is only meant to be the interface as a factory +// method to create the child types. Given the SDK use case the warning can be ignored. +#pragma warning disable CA1033 + /// + [System.Diagnostics.CodeAnalysis.DynamicDependency(System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicProperties, typeof(AmazonSocialMessagingConfig))] + static ClientConfig IAmazonService.CreateDefaultClientConfig() => new AmazonSocialMessagingConfig(); + + /// + [System.Diagnostics.CodeAnalysis.UnconditionalSuppressMessage("AssemblyLoadTrimming", "IL2026:RequiresUnreferencedCode", + Justification = "This suppression is here to ignore the warnings caused by CognitoSync. See justification in IAmazonService.")] + static IAmazonService IAmazonService.CreateDefaultServiceClient(AWSCredentials awsCredentials, ClientConfig clientConfig) + { + var serviceClientConfig = clientConfig as AmazonSocialMessagingConfig; + if (serviceClientConfig == null) + { + throw new AmazonClientException("ClientConfig is not of type AmazonSocialMessagingConfig to create AmazonSocialMessagingClient"); + } + + return awsCredentials == null ? + new AmazonSocialMessagingClient(serviceClientConfig) : + new AmazonSocialMessagingClient(awsCredentials, serviceClientConfig); + } +#pragma warning restore CA1033 +#endif + #endregion } } \ No newline at end of file diff --git a/sdk/src/Services/SocialMessaging/Properties/AssemblyInfo.cs b/sdk/src/Services/SocialMessaging/Properties/AssemblyInfo.cs index 069dac659e4d..0d8e1d322771 100644 --- a/sdk/src/Services/SocialMessaging/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/SocialMessaging/Properties/AssemblyInfo.cs @@ -7,10 +7,8 @@ // set of attributes. Change these attribute values to modify the information // associated with an assembly. [assembly: AssemblyTitle("AWSSDK.SocialMessaging")] -#if BCL35 -[assembly: AssemblyDescription("The Amazon Web Services SDK for .NET (3.5) - AWS End User Messaging Social. This release for AWS End User Messaging includes a public SDK, providing a suite of APIs that enable sending WhatsApp messages to end users.")] -#elif BCL45 -[assembly: AssemblyDescription("The Amazon Web Services SDK for .NET (4.5) - AWS End User Messaging Social. This release for AWS End User Messaging includes a public SDK, providing a suite of APIs that enable sending WhatsApp messages to end users.")] +#if BCL +[assembly: AssemblyDescription("The Amazon Web Services SDK for .NET (4.7.2) - AWS End User Messaging Social. This release for AWS End User Messaging includes a public SDK, providing a suite of APIs that enable sending WhatsApp messages to end users.")] #elif NETSTANDARD20 [assembly: AssemblyDescription("The Amazon Web Services SDK for .NET (NetStandard 2.0) - AWS End User Messaging Social. This release for AWS End User Messaging includes a public SDK, providing a suite of APIs that enable sending WhatsApp messages to end users.")] #elif NETCOREAPP3_1 @@ -43,9 +41,9 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.20")] - #if BCL -[assembly: System.Security.AllowPartiallyTrustedCallers] -#endif \ No newline at end of file +[assembly: AssemblyVersion("4.0")] +#else +[assembly: AssemblyVersion("4.0.0.0")] +#endif +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/sdk/src/Services/SocialMessaging/SocialMessaging.sln b/sdk/src/Services/SocialMessaging/SocialMessaging.sln index 5a7760ca4fa3..bb1f032720f6 100644 --- a/sdk/src/Services/SocialMessaging/SocialMessaging.sln +++ b/sdk/src/Services/SocialMessaging/SocialMessaging.sln @@ -4,9 +4,7 @@ VisualStudioVersion = 15.0.26730.12 MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Core", "Core", "{9863FCB3-BFA4-4B9C-B8F6-302BA5F660B8}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.Core.Net35", "../../Core/AWSSDK.Core.Net35.csproj", "{1FACE5D0-97BF-4069-B4F7-0FE28BB160F8}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.Core.Net45", "../../Core/AWSSDK.Core.Net45.csproj", "{7DE3AFA0-1B2D-41B1-82BD-120B8B210B43}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.Core.NetFramework", "../../Core/AWSSDK.Core.NetFramework.csproj", "{7DE3AFA0-1B2D-41B1-82BD-120B8B210B43}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.Core.NetStandard", "../../Core/AWSSDK.Core.NetStandard.csproj", "{A855B58E-ED32-40AE-AE8F-054F448B9F2C}" EndProject @@ -14,27 +12,19 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Services", "Services", "{93 EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SocialMessaging", "SocialMessaging", "{00A4BB0C-EF7A-4216-9180-40BF148097DD}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.SocialMessaging.Net35", "AWSSDK.SocialMessaging.Net35.csproj", "{CEE96F2C-C11A-4BDB-B4EA-3298CDD3AC9E}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.SocialMessaging.Net45", "AWSSDK.SocialMessaging.Net45.csproj", "{95BC6157-28CE-485F-84DD-FF0F5B7C5C85}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.SocialMessaging.NetFramework", "AWSSDK.SocialMessaging.NetFramework.csproj", "{A4A8F03A-AC2E-4100-A423-F20D87F5D822}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.SocialMessaging.NetStandard", "AWSSDK.SocialMessaging.NetStandard.csproj", "{A8FC4FF2-066F-4756-8911-10928627E3FE}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Test", "Test", "{12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.UnitTests.SocialMessaging.Net35", "../../../test/Services/SocialMessaging/UnitTests/AWSSDK.UnitTests.SocialMessaging.Net35.csproj", "{1B9A0B69-DFC9-406F-B485-8B905E8014FF}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.UnitTests.SocialMessaging.Net45", "../../../test/Services/SocialMessaging/UnitTests/AWSSDK.UnitTests.SocialMessaging.Net45.csproj", "{05CC7B0A-2712-463F-8C31-1989A47CAE25}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.UnitTests.SocialMessaging.NetFramework", "../../../test/Services/SocialMessaging/UnitTests/AWSSDK.UnitTests.SocialMessaging.NetFramework.csproj", "{6859B330-556D-4215-9DD5-CDDD055B2756}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ServiceClientGeneratorLib", "../../../../generator/ServiceClientGeneratorLib/ServiceClientGeneratorLib.csproj", "{7BEE7C44-BE12-43CC-AFB9-B5852A1F43C8}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.UnitTestUtilities.Net35", "../../../test/UnitTests/Custom/AWSSDK.UnitTestUtilities.Net35.csproj", "{A23CE153-A4A3-4D3A-A6DC-0DD1B207118E}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.UnitTestUtilities.Net45", "../../../test/UnitTests/Custom/AWSSDK.UnitTestUtilities.Net45.csproj", "{002B183F-E568-49CD-9D06-CBCFF2C2921F}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.IntegrationTestUtilities.Net35", "../../../test/IntegrationTests/AWSSDK.IntegrationTestUtilities.Net35.csproj", "{924D2906-70D6-4D77-8603-816648B2CCA6}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.UnitTestUtilities.NetFramework", "../../../test/UnitTests/Custom/AWSSDK.UnitTestUtilities.NetFramework.csproj", "{002B183F-E568-49CD-9D06-CBCFF2C2921F}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.IntegrationTestUtilities.Net45", "../../../test/IntegrationTests/AWSSDK.IntegrationTestUtilities.Net45.csproj", "{7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.IntegrationTestUtilities.NetFramework", "../../../test/IntegrationTests/AWSSDK.IntegrationTestUtilities.NetFramework.csproj", "{7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.CommonTest", "../../../test/Common/AWSSDK.CommonTest.csproj", "{66F78F86-68D7-4538-8EA5-A669A08E1C19}" EndProject @@ -44,25 +34,15 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UnitTests.NetStandard.CoreO EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "IntegrationTestDependencies", "IntegrationTestDependencies", "{939EC5C2-8345-43E2-8F97-72EEEBEEA0AC}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.Extensions.CrtIntegration.Net35", "../../../../extensions/src/AWSSDK.Extensions.CrtIntegration/AWSSDK.Extensions.CrtIntegration.Net35.csproj", "{05CA57CD-49F1-48C7-B6A5-9078A5310F51}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.Extensions.CrtIntegration.Net45", "../../../../extensions/src/AWSSDK.Extensions.CrtIntegration/AWSSDK.Extensions.CrtIntegration.Net45.csproj", "{5A19DA37-C9C8-4E67-BCDA-46B51A1E7768}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.IdentityManagement.Net35", "../IdentityManagement/AWSSDK.IdentityManagement.Net35.csproj", "{271F9854-4FD0-40C0-936E-3A8AA6CCC47B}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.SecurityToken.Net35", "../SecurityToken/AWSSDK.SecurityToken.Net35.csproj", "{2EB73C22-7DA5-40AA-94CF-10A2398EEC4D}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.SimpleNotificationService.Net35", "../SimpleNotificationService/AWSSDK.SimpleNotificationService.Net35.csproj", "{BDBC05C1-134F-4F4F-85AF-DDC9844CA6C5}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.S3.Net35", "../S3/AWSSDK.S3.Net35.csproj", "{838C7700-A986-4DA5-9D5D-78C9BA95F141}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.Extensions.CrtIntegration.NetFramework", "../../../../extensions/src/AWSSDK.Extensions.CrtIntegration/AWSSDK.Extensions.CrtIntegration.NetFramework.csproj", "{932A04E8-499F-4C0B-9470-B4411F67FF21}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.IdentityManagement.Net45", "../IdentityManagement/AWSSDK.IdentityManagement.Net45.csproj", "{317BAAEA-67B6-41D7-9727-AE1588D64E1C}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.IdentityManagement.NetFramework", "../IdentityManagement/AWSSDK.IdentityManagement.NetFramework.csproj", "{72DB0EEB-2705-413F-9E4C-69C43067308A}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.S3.Net45", "../S3/AWSSDK.S3.Net45.csproj", "{026A56C5-421A-457C-909C-959CCAF7513C}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.S3.NetFramework", "../S3/AWSSDK.S3.NetFramework.csproj", "{837BFD6B-EE5D-4817-A4F7-DFA72E2E1302}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.SecurityToken.Net45", "../SecurityToken/AWSSDK.SecurityToken.Net45.csproj", "{345A91DD-739D-402F-800C-1ACA503FFE64}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.SecurityToken.NetFramework", "../SecurityToken/AWSSDK.SecurityToken.NetFramework.csproj", "{9857B0CA-63B8-4DE3-A19A-00AC6DF594A9}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.SimpleNotificationService.Net45", "../SimpleNotificationService/AWSSDK.SimpleNotificationService.Net45.csproj", "{169513FB-B3A2-479E-961D-D430A25804AD}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AWSSDK.SimpleNotificationService.NetFramework", "../SimpleNotificationService/AWSSDK.SimpleNotificationService.NetFramework.csproj", "{A9661FE4-4AFF-4C50-B309-64A1BB99EC98}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -70,10 +50,6 @@ Global Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {1FACE5D0-97BF-4069-B4F7-0FE28BB160F8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1FACE5D0-97BF-4069-B4F7-0FE28BB160F8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1FACE5D0-97BF-4069-B4F7-0FE28BB160F8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1FACE5D0-97BF-4069-B4F7-0FE28BB160F8}.Release|Any CPU.Build.0 = Release|Any CPU {7DE3AFA0-1B2D-41B1-82BD-120B8B210B43}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {7DE3AFA0-1B2D-41B1-82BD-120B8B210B43}.Debug|Any CPU.Build.0 = Debug|Any CPU {7DE3AFA0-1B2D-41B1-82BD-120B8B210B43}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -82,42 +58,26 @@ Global {A855B58E-ED32-40AE-AE8F-054F448B9F2C}.Debug|Any CPU.Build.0 = Debug|Any CPU {A855B58E-ED32-40AE-AE8F-054F448B9F2C}.Release|Any CPU.ActiveCfg = Release|Any CPU {A855B58E-ED32-40AE-AE8F-054F448B9F2C}.Release|Any CPU.Build.0 = Release|Any CPU - {CEE96F2C-C11A-4BDB-B4EA-3298CDD3AC9E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CEE96F2C-C11A-4BDB-B4EA-3298CDD3AC9E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CEE96F2C-C11A-4BDB-B4EA-3298CDD3AC9E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CEE96F2C-C11A-4BDB-B4EA-3298CDD3AC9E}.Release|Any CPU.Build.0 = Release|Any CPU - {95BC6157-28CE-485F-84DD-FF0F5B7C5C85}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {95BC6157-28CE-485F-84DD-FF0F5B7C5C85}.Debug|Any CPU.Build.0 = Debug|Any CPU - {95BC6157-28CE-485F-84DD-FF0F5B7C5C85}.Release|Any CPU.ActiveCfg = Release|Any CPU - {95BC6157-28CE-485F-84DD-FF0F5B7C5C85}.Release|Any CPU.Build.0 = Release|Any CPU + {A4A8F03A-AC2E-4100-A423-F20D87F5D822}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {A4A8F03A-AC2E-4100-A423-F20D87F5D822}.Debug|Any CPU.Build.0 = Debug|Any CPU + {A4A8F03A-AC2E-4100-A423-F20D87F5D822}.Release|Any CPU.ActiveCfg = Release|Any CPU + {A4A8F03A-AC2E-4100-A423-F20D87F5D822}.Release|Any CPU.Build.0 = Release|Any CPU {A8FC4FF2-066F-4756-8911-10928627E3FE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {A8FC4FF2-066F-4756-8911-10928627E3FE}.Debug|Any CPU.Build.0 = Debug|Any CPU {A8FC4FF2-066F-4756-8911-10928627E3FE}.Release|Any CPU.ActiveCfg = Release|Any CPU {A8FC4FF2-066F-4756-8911-10928627E3FE}.Release|Any CPU.Build.0 = Release|Any CPU - {1B9A0B69-DFC9-406F-B485-8B905E8014FF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1B9A0B69-DFC9-406F-B485-8B905E8014FF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1B9A0B69-DFC9-406F-B485-8B905E8014FF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1B9A0B69-DFC9-406F-B485-8B905E8014FF}.Release|Any CPU.Build.0 = Release|Any CPU - {05CC7B0A-2712-463F-8C31-1989A47CAE25}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {05CC7B0A-2712-463F-8C31-1989A47CAE25}.Debug|Any CPU.Build.0 = Debug|Any CPU - {05CC7B0A-2712-463F-8C31-1989A47CAE25}.Release|Any CPU.ActiveCfg = Release|Any CPU - {05CC7B0A-2712-463F-8C31-1989A47CAE25}.Release|Any CPU.Build.0 = Release|Any CPU + {6859B330-556D-4215-9DD5-CDDD055B2756}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {6859B330-556D-4215-9DD5-CDDD055B2756}.Debug|Any CPU.Build.0 = Debug|Any CPU + {6859B330-556D-4215-9DD5-CDDD055B2756}.Release|Any CPU.ActiveCfg = Release|Any CPU + {6859B330-556D-4215-9DD5-CDDD055B2756}.Release|Any CPU.Build.0 = Release|Any CPU {7BEE7C44-BE12-43CC-AFB9-B5852A1F43C8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {7BEE7C44-BE12-43CC-AFB9-B5852A1F43C8}.Debug|Any CPU.Build.0 = Debug|Any CPU {7BEE7C44-BE12-43CC-AFB9-B5852A1F43C8}.Release|Any CPU.ActiveCfg = Release|Any CPU {7BEE7C44-BE12-43CC-AFB9-B5852A1F43C8}.Release|Any CPU.Build.0 = Release|Any CPU - {A23CE153-A4A3-4D3A-A6DC-0DD1B207118E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A23CE153-A4A3-4D3A-A6DC-0DD1B207118E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A23CE153-A4A3-4D3A-A6DC-0DD1B207118E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A23CE153-A4A3-4D3A-A6DC-0DD1B207118E}.Release|Any CPU.Build.0 = Release|Any CPU {002B183F-E568-49CD-9D06-CBCFF2C2921F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {002B183F-E568-49CD-9D06-CBCFF2C2921F}.Debug|Any CPU.Build.0 = Debug|Any CPU {002B183F-E568-49CD-9D06-CBCFF2C2921F}.Release|Any CPU.ActiveCfg = Release|Any CPU {002B183F-E568-49CD-9D06-CBCFF2C2921F}.Release|Any CPU.Build.0 = Release|Any CPU - {924D2906-70D6-4D77-8603-816648B2CCA6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {924D2906-70D6-4D77-8603-816648B2CCA6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {924D2906-70D6-4D77-8603-816648B2CCA6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {924D2906-70D6-4D77-8603-816648B2CCA6}.Release|Any CPU.Build.0 = Release|Any CPU {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7}.Debug|Any CPU.Build.0 = Debug|Any CPU {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -134,78 +94,48 @@ Global {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {05CA57CD-49F1-48C7-B6A5-9078A5310F51}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {05CA57CD-49F1-48C7-B6A5-9078A5310F51}.Debug|Any CPU.Build.0 = Debug|Any CPU - {05CA57CD-49F1-48C7-B6A5-9078A5310F51}.Release|Any CPU.ActiveCfg = Release|Any CPU - {05CA57CD-49F1-48C7-B6A5-9078A5310F51}.Release|Any CPU.Build.0 = Release|Any CPU - {5A19DA37-C9C8-4E67-BCDA-46B51A1E7768}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5A19DA37-C9C8-4E67-BCDA-46B51A1E7768}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5A19DA37-C9C8-4E67-BCDA-46B51A1E7768}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5A19DA37-C9C8-4E67-BCDA-46B51A1E7768}.Release|Any CPU.Build.0 = Release|Any CPU - {271F9854-4FD0-40C0-936E-3A8AA6CCC47B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {271F9854-4FD0-40C0-936E-3A8AA6CCC47B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {271F9854-4FD0-40C0-936E-3A8AA6CCC47B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {271F9854-4FD0-40C0-936E-3A8AA6CCC47B}.Release|Any CPU.Build.0 = Release|Any CPU - {2EB73C22-7DA5-40AA-94CF-10A2398EEC4D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2EB73C22-7DA5-40AA-94CF-10A2398EEC4D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2EB73C22-7DA5-40AA-94CF-10A2398EEC4D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2EB73C22-7DA5-40AA-94CF-10A2398EEC4D}.Release|Any CPU.Build.0 = Release|Any CPU - {BDBC05C1-134F-4F4F-85AF-DDC9844CA6C5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BDBC05C1-134F-4F4F-85AF-DDC9844CA6C5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BDBC05C1-134F-4F4F-85AF-DDC9844CA6C5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BDBC05C1-134F-4F4F-85AF-DDC9844CA6C5}.Release|Any CPU.Build.0 = Release|Any CPU - {838C7700-A986-4DA5-9D5D-78C9BA95F141}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {838C7700-A986-4DA5-9D5D-78C9BA95F141}.Debug|Any CPU.Build.0 = Debug|Any CPU - {838C7700-A986-4DA5-9D5D-78C9BA95F141}.Release|Any CPU.ActiveCfg = Release|Any CPU - {838C7700-A986-4DA5-9D5D-78C9BA95F141}.Release|Any CPU.Build.0 = Release|Any CPU - {317BAAEA-67B6-41D7-9727-AE1588D64E1C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {317BAAEA-67B6-41D7-9727-AE1588D64E1C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {317BAAEA-67B6-41D7-9727-AE1588D64E1C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {317BAAEA-67B6-41D7-9727-AE1588D64E1C}.Release|Any CPU.Build.0 = Release|Any CPU - {026A56C5-421A-457C-909C-959CCAF7513C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {026A56C5-421A-457C-909C-959CCAF7513C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {026A56C5-421A-457C-909C-959CCAF7513C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {026A56C5-421A-457C-909C-959CCAF7513C}.Release|Any CPU.Build.0 = Release|Any CPU - {345A91DD-739D-402F-800C-1ACA503FFE64}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {345A91DD-739D-402F-800C-1ACA503FFE64}.Debug|Any CPU.Build.0 = Debug|Any CPU - {345A91DD-739D-402F-800C-1ACA503FFE64}.Release|Any CPU.ActiveCfg = Release|Any CPU - {345A91DD-739D-402F-800C-1ACA503FFE64}.Release|Any CPU.Build.0 = Release|Any CPU - {169513FB-B3A2-479E-961D-D430A25804AD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {169513FB-B3A2-479E-961D-D430A25804AD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {169513FB-B3A2-479E-961D-D430A25804AD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {169513FB-B3A2-479E-961D-D430A25804AD}.Release|Any CPU.Build.0 = Release|Any CPU + {932A04E8-499F-4C0B-9470-B4411F67FF21}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {932A04E8-499F-4C0B-9470-B4411F67FF21}.Debug|Any CPU.Build.0 = Debug|Any CPU + {932A04E8-499F-4C0B-9470-B4411F67FF21}.Release|Any CPU.ActiveCfg = Release|Any CPU + {932A04E8-499F-4C0B-9470-B4411F67FF21}.Release|Any CPU.Build.0 = Release|Any CPU + {72DB0EEB-2705-413F-9E4C-69C43067308A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {72DB0EEB-2705-413F-9E4C-69C43067308A}.Debug|Any CPU.Build.0 = Debug|Any CPU + {72DB0EEB-2705-413F-9E4C-69C43067308A}.Release|Any CPU.ActiveCfg = Release|Any CPU + {72DB0EEB-2705-413F-9E4C-69C43067308A}.Release|Any CPU.Build.0 = Release|Any CPU + {837BFD6B-EE5D-4817-A4F7-DFA72E2E1302}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {837BFD6B-EE5D-4817-A4F7-DFA72E2E1302}.Debug|Any CPU.Build.0 = Debug|Any CPU + {837BFD6B-EE5D-4817-A4F7-DFA72E2E1302}.Release|Any CPU.ActiveCfg = Release|Any CPU + {837BFD6B-EE5D-4817-A4F7-DFA72E2E1302}.Release|Any CPU.Build.0 = Release|Any CPU + {9857B0CA-63B8-4DE3-A19A-00AC6DF594A9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {9857B0CA-63B8-4DE3-A19A-00AC6DF594A9}.Debug|Any CPU.Build.0 = Debug|Any CPU + {9857B0CA-63B8-4DE3-A19A-00AC6DF594A9}.Release|Any CPU.ActiveCfg = Release|Any CPU + {9857B0CA-63B8-4DE3-A19A-00AC6DF594A9}.Release|Any CPU.Build.0 = Release|Any CPU + {A9661FE4-4AFF-4C50-B309-64A1BB99EC98}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {A9661FE4-4AFF-4C50-B309-64A1BB99EC98}.Debug|Any CPU.Build.0 = Debug|Any CPU + {A9661FE4-4AFF-4C50-B309-64A1BB99EC98}.Release|Any CPU.ActiveCfg = Release|Any CPU + {A9661FE4-4AFF-4C50-B309-64A1BB99EC98}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution - {1FACE5D0-97BF-4069-B4F7-0FE28BB160F8} = {9863FCB3-BFA4-4B9C-B8F6-302BA5F660B8} {7DE3AFA0-1B2D-41B1-82BD-120B8B210B43} = {9863FCB3-BFA4-4B9C-B8F6-302BA5F660B8} {A855B58E-ED32-40AE-AE8F-054F448B9F2C} = {9863FCB3-BFA4-4B9C-B8F6-302BA5F660B8} {00A4BB0C-EF7A-4216-9180-40BF148097DD} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AB} - {CEE96F2C-C11A-4BDB-B4EA-3298CDD3AC9E} = {00A4BB0C-EF7A-4216-9180-40BF148097DD} - {95BC6157-28CE-485F-84DD-FF0F5B7C5C85} = {00A4BB0C-EF7A-4216-9180-40BF148097DD} + {A4A8F03A-AC2E-4100-A423-F20D87F5D822} = {00A4BB0C-EF7A-4216-9180-40BF148097DD} {A8FC4FF2-066F-4756-8911-10928627E3FE} = {00A4BB0C-EF7A-4216-9180-40BF148097DD} - {1B9A0B69-DFC9-406F-B485-8B905E8014FF} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {05CC7B0A-2712-463F-8C31-1989A47CAE25} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {6859B330-556D-4215-9DD5-CDDD055B2756} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7BEE7C44-BE12-43CC-AFB9-B5852A1F43C8} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {A23CE153-A4A3-4D3A-A6DC-0DD1B207118E} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {924D2906-70D6-4D77-8603-816648B2CCA6} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {05CA57CD-49F1-48C7-B6A5-9078A5310F51} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {5A19DA37-C9C8-4E67-BCDA-46B51A1E7768} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {271F9854-4FD0-40C0-936E-3A8AA6CCC47B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {2EB73C22-7DA5-40AA-94CF-10A2398EEC4D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {BDBC05C1-134F-4F4F-85AF-DDC9844CA6C5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {838C7700-A986-4DA5-9D5D-78C9BA95F141} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {317BAAEA-67B6-41D7-9727-AE1588D64E1C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {026A56C5-421A-457C-909C-959CCAF7513C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {345A91DD-739D-402F-800C-1ACA503FFE64} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {169513FB-B3A2-479E-961D-D430A25804AD} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} + {932A04E8-499F-4C0B-9470-B4411F67FF21} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} + {72DB0EEB-2705-413F-9E4C-69C43067308A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} + {837BFD6B-EE5D-4817-A4F7-DFA72E2E1302} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} + {9857B0CA-63B8-4DE3-A19A-00AC6DF594A9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} + {A9661FE4-4AFF-4C50-B309-64A1BB99EC98} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {5F477D07-5882-4D83-BFB4-6A3CB10EFA31} diff --git a/sdk/src/Services/SsmSap/Generated/AmazonSsmSapConfig.cs b/sdk/src/Services/SsmSap/Generated/AmazonSsmSapConfig.cs index 51d90bd162ce..975f21cc3c2d 100644 --- a/sdk/src/Services/SsmSap/Generated/AmazonSsmSapConfig.cs +++ b/sdk/src/Services/SsmSap/Generated/AmazonSsmSapConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.SsmSap public partial class AmazonSsmSapConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("Ssm Sap", "4.0.0.0"); private static readonly AmazonSsmSapEndpointResolver EndpointResolver = new AmazonSsmSapEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("Ssm Sap", "3.7.401.18"); -======= - InternalSDKUtils.BuildUserAgentString("Ssm Sap", "3.7.401.45"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/SsmSap/Properties/AssemblyInfo.cs b/sdk/src/Services/SsmSap/Properties/AssemblyInfo.cs index 16b2e2aabd45..44af7b39ae7d 100644 --- a/sdk/src/Services/SsmSap/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/SsmSap/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.18")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.45")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/SsmSap/SsmSap.sln b/sdk/src/Services/SsmSap/SsmSap.sln index 206a9e9e597f..71b5846c3fbd 100644 --- a/sdk/src/Services/SsmSap/SsmSap.sln +++ b/sdk/src/Services/SsmSap/SsmSap.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {04D1C0E2-8171-4234-94C9-DA47AC6985D7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {04D1C0E2-8171-4234-94C9-DA47AC6985D7}.Debug|Any CPU.Build.0 = Debug|Any CPU {04D1C0E2-8171-4234-94C9-DA47AC6985D7}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {7BBADFAC-8860-4CF7-91A2-4678D8604802}.Debug|Any CPU.Build.0 = Debug|Any CPU {7BBADFAC-8860-4CF7-91A2-4678D8604802}.Release|Any CPU.ActiveCfg = Release|Any CPU {7BBADFAC-8860-4CF7-91A2-4678D8604802}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {E33BA620-E8C4-42E7-87D7-88BBDD8211B2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E33BA620-E8C4-42E7-87D7-88BBDD8211B2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E33BA620-E8C4-42E7-87D7-88BBDD8211B2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E33BA620-E8C4-42E7-87D7-88BBDD8211B2}.Release|Any CPU.Build.0 = Release|Any CPU - {E9564144-32E3-4684-B7C4-8D74BA560287}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E9564144-32E3-4684-B7C4-8D74BA560287}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E9564144-32E3-4684-B7C4-8D74BA560287}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E9564144-32E3-4684-B7C4-8D74BA560287}.Release|Any CPU.Build.0 = Release|Any CPU - {4942ACCD-E315-4662-BA5A-FF04113E5C9D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4942ACCD-E315-4662-BA5A-FF04113E5C9D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4942ACCD-E315-4662-BA5A-FF04113E5C9D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4942ACCD-E315-4662-BA5A-FF04113E5C9D}.Release|Any CPU.Build.0 = Release|Any CPU - {C2167F43-7682-4979-863A-084F10848D87}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C2167F43-7682-4979-863A-084F10848D87}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C2167F43-7682-4979-863A-084F10848D87}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C2167F43-7682-4979-863A-084F10848D87}.Release|Any CPU.Build.0 = Release|Any CPU - {573BC710-8804-41EA-A99A-43465CFB35BB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {573BC710-8804-41EA-A99A-43465CFB35BB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {573BC710-8804-41EA-A99A-43465CFB35BB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {573BC710-8804-41EA-A99A-43465CFB35BB}.Release|Any CPU.Build.0 = Release|Any CPU - {ED74D77C-5EF5-4E3C-90FA-9EE52469EA69}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {ED74D77C-5EF5-4E3C-90FA-9EE52469EA69}.Debug|Any CPU.Build.0 = Debug|Any CPU - {ED74D77C-5EF5-4E3C-90FA-9EE52469EA69}.Release|Any CPU.ActiveCfg = Release|Any CPU - {ED74D77C-5EF5-4E3C-90FA-9EE52469EA69}.Release|Any CPU.Build.0 = Release|Any CPU - {FFC88C8B-179C-4872-A7D4-23C7C81E1C0C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FFC88C8B-179C-4872-A7D4-23C7C81E1C0C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FFC88C8B-179C-4872-A7D4-23C7C81E1C0C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FFC88C8B-179C-4872-A7D4-23C7C81E1C0C}.Release|Any CPU.Build.0 = Release|Any CPU - {F9FA5028-E55A-44F3-9BEC-FE2476046C6A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F9FA5028-E55A-44F3-9BEC-FE2476046C6A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F9FA5028-E55A-44F3-9BEC-FE2476046C6A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F9FA5028-E55A-44F3-9BEC-FE2476046C6A}.Release|Any CPU.Build.0 = Release|Any CPU - {EC941458-D4C2-4CFF-A7FE-9ADDCBFDA448}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EC941458-D4C2-4CFF-A7FE-9ADDCBFDA448}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EC941458-D4C2-4CFF-A7FE-9ADDCBFDA448}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EC941458-D4C2-4CFF-A7FE-9ADDCBFDA448}.Release|Any CPU.Build.0 = Release|Any CPU - {C1AC6E7C-2608-4C68-BD0F-4DFE3A24AC62}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C1AC6E7C-2608-4C68-BD0F-4DFE3A24AC62}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C1AC6E7C-2608-4C68-BD0F-4DFE3A24AC62}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C1AC6E7C-2608-4C68-BD0F-4DFE3A24AC62}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {E33BA620-E8C4-42E7-87D7-88BBDD8211B2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E33BA620-E8C4-42E7-87D7-88BBDD8211B2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E33BA620-E8C4-42E7-87D7-88BBDD8211B2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E33BA620-E8C4-42E7-87D7-88BBDD8211B2}.Release|Any CPU.Build.0 = Release|Any CPU - {E9564144-32E3-4684-B7C4-8D74BA560287}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E9564144-32E3-4684-B7C4-8D74BA560287}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E9564144-32E3-4684-B7C4-8D74BA560287}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E9564144-32E3-4684-B7C4-8D74BA560287}.Release|Any CPU.Build.0 = Release|Any CPU - {4942ACCD-E315-4662-BA5A-FF04113E5C9D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4942ACCD-E315-4662-BA5A-FF04113E5C9D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4942ACCD-E315-4662-BA5A-FF04113E5C9D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4942ACCD-E315-4662-BA5A-FF04113E5C9D}.Release|Any CPU.Build.0 = Release|Any CPU - {C2167F43-7682-4979-863A-084F10848D87}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C2167F43-7682-4979-863A-084F10848D87}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C2167F43-7682-4979-863A-084F10848D87}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C2167F43-7682-4979-863A-084F10848D87}.Release|Any CPU.Build.0 = Release|Any CPU - {573BC710-8804-41EA-A99A-43465CFB35BB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {573BC710-8804-41EA-A99A-43465CFB35BB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {573BC710-8804-41EA-A99A-43465CFB35BB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {573BC710-8804-41EA-A99A-43465CFB35BB}.Release|Any CPU.Build.0 = Release|Any CPU - {ED74D77C-5EF5-4E3C-90FA-9EE52469EA69}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {ED74D77C-5EF5-4E3C-90FA-9EE52469EA69}.Debug|Any CPU.Build.0 = Debug|Any CPU - {ED74D77C-5EF5-4E3C-90FA-9EE52469EA69}.Release|Any CPU.ActiveCfg = Release|Any CPU - {ED74D77C-5EF5-4E3C-90FA-9EE52469EA69}.Release|Any CPU.Build.0 = Release|Any CPU - {FFC88C8B-179C-4872-A7D4-23C7C81E1C0C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FFC88C8B-179C-4872-A7D4-23C7C81E1C0C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FFC88C8B-179C-4872-A7D4-23C7C81E1C0C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FFC88C8B-179C-4872-A7D4-23C7C81E1C0C}.Release|Any CPU.Build.0 = Release|Any CPU - {F9FA5028-E55A-44F3-9BEC-FE2476046C6A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F9FA5028-E55A-44F3-9BEC-FE2476046C6A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F9FA5028-E55A-44F3-9BEC-FE2476046C6A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F9FA5028-E55A-44F3-9BEC-FE2476046C6A}.Release|Any CPU.Build.0 = Release|Any CPU - {EC941458-D4C2-4CFF-A7FE-9ADDCBFDA448}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EC941458-D4C2-4CFF-A7FE-9ADDCBFDA448}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EC941458-D4C2-4CFF-A7FE-9ADDCBFDA448}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EC941458-D4C2-4CFF-A7FE-9ADDCBFDA448}.Release|Any CPU.Build.0 = Release|Any CPU - {C1AC6E7C-2608-4C68-BD0F-4DFE3A24AC62}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C1AC6E7C-2608-4C68-BD0F-4DFE3A24AC62}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C1AC6E7C-2608-4C68-BD0F-4DFE3A24AC62}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C1AC6E7C-2608-4C68-BD0F-4DFE3A24AC62}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {04D1C0E2-8171-4234-94C9-DA47AC6985D7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {B12993CC-DDEF-4702-8E7E-C7D3A3F18EC0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {DAA405B9-B365-4399-A84F-C9228FEA4EC4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {86C7EF55-A9C1-4444-8F74-3A48D98E22C7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {7BBADFAC-8860-4CF7-91A2-4678D8604802} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {E33BA620-E8C4-42E7-87D7-88BBDD8211B2} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E9564144-32E3-4684-B7C4-8D74BA560287} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4942ACCD-E315-4662-BA5A-FF04113E5C9D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C2167F43-7682-4979-863A-084F10848D87} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {573BC710-8804-41EA-A99A-43465CFB35BB} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {ED74D77C-5EF5-4E3C-90FA-9EE52469EA69} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {FFC88C8B-179C-4872-A7D4-23C7C81E1C0C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F9FA5028-E55A-44F3-9BEC-FE2476046C6A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {EC941458-D4C2-4CFF-A7FE-9ADDCBFDA448} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C1AC6E7C-2608-4C68-BD0F-4DFE3A24AC62} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {E33BA620-E8C4-42E7-87D7-88BBDD8211B2} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E9564144-32E3-4684-B7C4-8D74BA560287} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4942ACCD-E315-4662-BA5A-FF04113E5C9D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C2167F43-7682-4979-863A-084F10848D87} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {573BC710-8804-41EA-A99A-43465CFB35BB} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {ED74D77C-5EF5-4E3C-90FA-9EE52469EA69} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {FFC88C8B-179C-4872-A7D4-23C7C81E1C0C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F9FA5028-E55A-44F3-9BEC-FE2476046C6A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {EC941458-D4C2-4CFF-A7FE-9ADDCBFDA448} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C1AC6E7C-2608-4C68-BD0F-4DFE3A24AC62} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {86DC7CB5-4AA0-48DA-A270-C28A6897B6F5} diff --git a/sdk/src/Services/StepFunctions/Generated/AmazonStepFunctionsConfig.cs b/sdk/src/Services/StepFunctions/Generated/AmazonStepFunctionsConfig.cs index 8a6785a55e0e..9acfdc91f688 100644 --- a/sdk/src/Services/StepFunctions/Generated/AmazonStepFunctionsConfig.cs +++ b/sdk/src/Services/StepFunctions/Generated/AmazonStepFunctionsConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.StepFunctions public partial class AmazonStepFunctionsConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("SFN", "4.0.0.0"); private static readonly AmazonStepFunctionsEndpointResolver EndpointResolver = new AmazonStepFunctionsEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("SFN", "3.7.402.14"); -======= - InternalSDKUtils.BuildUserAgentString("SFN", "3.7.402.41"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/StepFunctions/Properties/AssemblyInfo.cs b/sdk/src/Services/StepFunctions/Properties/AssemblyInfo.cs index c9d36caf57ca..0e0e8b6e0a1c 100644 --- a/sdk/src/Services/StepFunctions/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/StepFunctions/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.402.14")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.402.41")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/StepFunctions/StepFunctions.sln b/sdk/src/Services/StepFunctions/StepFunctions.sln index d13ab644a227..63d2e31b49eb 100644 --- a/sdk/src/Services/StepFunctions/StepFunctions.sln +++ b/sdk/src/Services/StepFunctions/StepFunctions.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {FAC75864-11BF-4F10-AD1C-7EB2DB2C1B9B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {FAC75864-11BF-4F10-AD1C-7EB2DB2C1B9B}.Debug|Any CPU.Build.0 = Debug|Any CPU {FAC75864-11BF-4F10-AD1C-7EB2DB2C1B9B}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {E568551E-3CDA-4604-BFE3-A313F641741B}.Debug|Any CPU.Build.0 = Debug|Any CPU {E568551E-3CDA-4604-BFE3-A313F641741B}.Release|Any CPU.ActiveCfg = Release|Any CPU {E568551E-3CDA-4604-BFE3-A313F641741B}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {FA6EB220-B163-4F7F-8E97-0434AF4CB852}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FA6EB220-B163-4F7F-8E97-0434AF4CB852}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FA6EB220-B163-4F7F-8E97-0434AF4CB852}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FA6EB220-B163-4F7F-8E97-0434AF4CB852}.Release|Any CPU.Build.0 = Release|Any CPU - {6543B9BC-40AB-48E5-B8FC-A312D2361FE2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6543B9BC-40AB-48E5-B8FC-A312D2361FE2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6543B9BC-40AB-48E5-B8FC-A312D2361FE2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6543B9BC-40AB-48E5-B8FC-A312D2361FE2}.Release|Any CPU.Build.0 = Release|Any CPU - {6B9AFF9E-2A65-4C83-82ED-001BEC8DEBB4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6B9AFF9E-2A65-4C83-82ED-001BEC8DEBB4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6B9AFF9E-2A65-4C83-82ED-001BEC8DEBB4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6B9AFF9E-2A65-4C83-82ED-001BEC8DEBB4}.Release|Any CPU.Build.0 = Release|Any CPU - {1E679532-F50E-4B15-9A00-E7BAC09E2C28}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1E679532-F50E-4B15-9A00-E7BAC09E2C28}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1E679532-F50E-4B15-9A00-E7BAC09E2C28}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1E679532-F50E-4B15-9A00-E7BAC09E2C28}.Release|Any CPU.Build.0 = Release|Any CPU - {3A0BD78F-9A75-4CD6-9148-059830849757}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3A0BD78F-9A75-4CD6-9148-059830849757}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3A0BD78F-9A75-4CD6-9148-059830849757}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3A0BD78F-9A75-4CD6-9148-059830849757}.Release|Any CPU.Build.0 = Release|Any CPU - {4333330F-0713-4744-92F3-ECF596C02416}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4333330F-0713-4744-92F3-ECF596C02416}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4333330F-0713-4744-92F3-ECF596C02416}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4333330F-0713-4744-92F3-ECF596C02416}.Release|Any CPU.Build.0 = Release|Any CPU - {4FB44A71-1556-4BEC-917B-BDAD67D8C610}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4FB44A71-1556-4BEC-917B-BDAD67D8C610}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4FB44A71-1556-4BEC-917B-BDAD67D8C610}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4FB44A71-1556-4BEC-917B-BDAD67D8C610}.Release|Any CPU.Build.0 = Release|Any CPU - {6A97161C-1D24-46EF-B443-98D59F59F8D7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6A97161C-1D24-46EF-B443-98D59F59F8D7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6A97161C-1D24-46EF-B443-98D59F59F8D7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6A97161C-1D24-46EF-B443-98D59F59F8D7}.Release|Any CPU.Build.0 = Release|Any CPU - {CA26F079-AED7-4DCB-977F-B3CEEB59492B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CA26F079-AED7-4DCB-977F-B3CEEB59492B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CA26F079-AED7-4DCB-977F-B3CEEB59492B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CA26F079-AED7-4DCB-977F-B3CEEB59492B}.Release|Any CPU.Build.0 = Release|Any CPU - {FD7D4C8E-3962-414C-8655-E4CC2B3988D0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FD7D4C8E-3962-414C-8655-E4CC2B3988D0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FD7D4C8E-3962-414C-8655-E4CC2B3988D0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FD7D4C8E-3962-414C-8655-E4CC2B3988D0}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {FA6EB220-B163-4F7F-8E97-0434AF4CB852}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FA6EB220-B163-4F7F-8E97-0434AF4CB852}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FA6EB220-B163-4F7F-8E97-0434AF4CB852}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FA6EB220-B163-4F7F-8E97-0434AF4CB852}.Release|Any CPU.Build.0 = Release|Any CPU - {6543B9BC-40AB-48E5-B8FC-A312D2361FE2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6543B9BC-40AB-48E5-B8FC-A312D2361FE2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6543B9BC-40AB-48E5-B8FC-A312D2361FE2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6543B9BC-40AB-48E5-B8FC-A312D2361FE2}.Release|Any CPU.Build.0 = Release|Any CPU - {6B9AFF9E-2A65-4C83-82ED-001BEC8DEBB4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6B9AFF9E-2A65-4C83-82ED-001BEC8DEBB4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6B9AFF9E-2A65-4C83-82ED-001BEC8DEBB4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6B9AFF9E-2A65-4C83-82ED-001BEC8DEBB4}.Release|Any CPU.Build.0 = Release|Any CPU - {1E679532-F50E-4B15-9A00-E7BAC09E2C28}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1E679532-F50E-4B15-9A00-E7BAC09E2C28}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1E679532-F50E-4B15-9A00-E7BAC09E2C28}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1E679532-F50E-4B15-9A00-E7BAC09E2C28}.Release|Any CPU.Build.0 = Release|Any CPU - {3A0BD78F-9A75-4CD6-9148-059830849757}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3A0BD78F-9A75-4CD6-9148-059830849757}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3A0BD78F-9A75-4CD6-9148-059830849757}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3A0BD78F-9A75-4CD6-9148-059830849757}.Release|Any CPU.Build.0 = Release|Any CPU - {4333330F-0713-4744-92F3-ECF596C02416}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4333330F-0713-4744-92F3-ECF596C02416}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4333330F-0713-4744-92F3-ECF596C02416}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4333330F-0713-4744-92F3-ECF596C02416}.Release|Any CPU.Build.0 = Release|Any CPU - {4FB44A71-1556-4BEC-917B-BDAD67D8C610}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4FB44A71-1556-4BEC-917B-BDAD67D8C610}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4FB44A71-1556-4BEC-917B-BDAD67D8C610}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4FB44A71-1556-4BEC-917B-BDAD67D8C610}.Release|Any CPU.Build.0 = Release|Any CPU - {6A97161C-1D24-46EF-B443-98D59F59F8D7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6A97161C-1D24-46EF-B443-98D59F59F8D7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6A97161C-1D24-46EF-B443-98D59F59F8D7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6A97161C-1D24-46EF-B443-98D59F59F8D7}.Release|Any CPU.Build.0 = Release|Any CPU - {CA26F079-AED7-4DCB-977F-B3CEEB59492B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CA26F079-AED7-4DCB-977F-B3CEEB59492B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CA26F079-AED7-4DCB-977F-B3CEEB59492B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CA26F079-AED7-4DCB-977F-B3CEEB59492B}.Release|Any CPU.Build.0 = Release|Any CPU - {FD7D4C8E-3962-414C-8655-E4CC2B3988D0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FD7D4C8E-3962-414C-8655-E4CC2B3988D0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FD7D4C8E-3962-414C-8655-E4CC2B3988D0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FD7D4C8E-3962-414C-8655-E4CC2B3988D0}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {FAC75864-11BF-4F10-AD1C-7EB2DB2C1B9B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {516A10D7-F536-40D1-BC23-7543F53D2212} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {8500A3C6-665D-4FED-A2EC-8152188D0862} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {07ACC5C2-9598-4A3B-8430-B217140E53E8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {E568551E-3CDA-4604-BFE3-A313F641741B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {FA6EB220-B163-4F7F-8E97-0434AF4CB852} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6543B9BC-40AB-48E5-B8FC-A312D2361FE2} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6B9AFF9E-2A65-4C83-82ED-001BEC8DEBB4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {1E679532-F50E-4B15-9A00-E7BAC09E2C28} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {3A0BD78F-9A75-4CD6-9148-059830849757} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4333330F-0713-4744-92F3-ECF596C02416} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4FB44A71-1556-4BEC-917B-BDAD67D8C610} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6A97161C-1D24-46EF-B443-98D59F59F8D7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {CA26F079-AED7-4DCB-977F-B3CEEB59492B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {FD7D4C8E-3962-414C-8655-E4CC2B3988D0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {FA6EB220-B163-4F7F-8E97-0434AF4CB852} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6543B9BC-40AB-48E5-B8FC-A312D2361FE2} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6B9AFF9E-2A65-4C83-82ED-001BEC8DEBB4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {1E679532-F50E-4B15-9A00-E7BAC09E2C28} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {3A0BD78F-9A75-4CD6-9148-059830849757} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4333330F-0713-4744-92F3-ECF596C02416} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4FB44A71-1556-4BEC-917B-BDAD67D8C610} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6A97161C-1D24-46EF-B443-98D59F59F8D7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {CA26F079-AED7-4DCB-977F-B3CEEB59492B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {FD7D4C8E-3962-414C-8655-E4CC2B3988D0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {BA8C1F8B-8901-4023-A205-4E7427D52C0E} diff --git a/sdk/src/Services/StorageGateway/Generated/AmazonStorageGatewayConfig.cs b/sdk/src/Services/StorageGateway/Generated/AmazonStorageGatewayConfig.cs index b58eb78e8591..e2d1dd362c3d 100644 --- a/sdk/src/Services/StorageGateway/Generated/AmazonStorageGatewayConfig.cs +++ b/sdk/src/Services/StorageGateway/Generated/AmazonStorageGatewayConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.StorageGateway public partial class AmazonStorageGatewayConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("Storage Gateway", "4.0.0.0"); private static readonly AmazonStorageGatewayEndpointResolver EndpointResolver = new AmazonStorageGatewayEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("Storage Gateway", "3.7.401.7"); -======= - InternalSDKUtils.BuildUserAgentString("Storage Gateway", "3.7.401.34"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/StorageGateway/Generated/_bcl/AmazonStorageGatewayClient.cs b/sdk/src/Services/StorageGateway/Generated/_bcl/AmazonStorageGatewayClient.cs index ca2645c83436..690f8017b1a9 100644 --- a/sdk/src/Services/StorageGateway/Generated/_bcl/AmazonStorageGatewayClient.cs +++ b/sdk/src/Services/StorageGateway/Generated/_bcl/AmazonStorageGatewayClient.cs @@ -40,7 +40,14 @@ namespace Amazon.StorageGateway /// /// Implementation for accessing StorageGateway /// - /// Storage Gateway Service + /// Storage Gateway Service + /// + /// Amazon FSx File Gateway is no longer available to new customers. Existing customers + /// of FSx File Gateway can continue to use the service normally. For capabilities similar + /// to FSx File Gateway, visit this + /// blog post. + /// + /// /// /// Storage Gateway is the service that connects an on-premises software appliance with /// cloud-based storage to provide seamless and secure integration between an organization's diff --git a/sdk/src/Services/StorageGateway/Properties/AssemblyInfo.cs b/sdk/src/Services/StorageGateway/Properties/AssemblyInfo.cs index b21e4b932b30..ff93df4a7b0a 100644 --- a/sdk/src/Services/StorageGateway/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/StorageGateway/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.7")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.34")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/StorageGateway/StorageGateway.sln b/sdk/src/Services/StorageGateway/StorageGateway.sln index 859994da5c04..f9bc6d052f24 100644 --- a/sdk/src/Services/StorageGateway/StorageGateway.sln +++ b/sdk/src/Services/StorageGateway/StorageGateway.sln @@ -92,7 +92,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {82535EF6-4FD0-4654-B342-7C408086BA8D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {82535EF6-4FD0-4654-B342-7C408086BA8D}.Debug|Any CPU.Build.0 = Debug|Any CPU {82535EF6-4FD0-4654-B342-7C408086BA8D}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -113,97 +120,6 @@ Global {644177F4-6BBD-49C9-898F-A0C48FD5D900}.Debug|Any CPU.Build.0 = Debug|Any CPU {644177F4-6BBD-49C9-898F-A0C48FD5D900}.Release|Any CPU.ActiveCfg = Release|Any CPU {644177F4-6BBD-49C9-898F-A0C48FD5D900}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {AB6F9EA4-37D0-40BC-876D-938B5A044113}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AB6F9EA4-37D0-40BC-876D-938B5A044113}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AB6F9EA4-37D0-40BC-876D-938B5A044113}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AB6F9EA4-37D0-40BC-876D-938B5A044113}.Release|Any CPU.Build.0 = Release|Any CPU - {086D233F-B1C8-48B3-A0B2-6F88B18E673F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {086D233F-B1C8-48B3-A0B2-6F88B18E673F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {086D233F-B1C8-48B3-A0B2-6F88B18E673F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {086D233F-B1C8-48B3-A0B2-6F88B18E673F}.Release|Any CPU.Build.0 = Release|Any CPU - {8908B289-D8BE-4341-B49B-87E402BC23E4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8908B289-D8BE-4341-B49B-87E402BC23E4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8908B289-D8BE-4341-B49B-87E402BC23E4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8908B289-D8BE-4341-B49B-87E402BC23E4}.Release|Any CPU.Build.0 = Release|Any CPU - {AC9E0422-472A-4627-94D7-3BB13FD3D303}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AC9E0422-472A-4627-94D7-3BB13FD3D303}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AC9E0422-472A-4627-94D7-3BB13FD3D303}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AC9E0422-472A-4627-94D7-3BB13FD3D303}.Release|Any CPU.Build.0 = Release|Any CPU - {8E35D0D2-37A4-4BDC-9DB3-45780726C804}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8E35D0D2-37A4-4BDC-9DB3-45780726C804}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8E35D0D2-37A4-4BDC-9DB3-45780726C804}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8E35D0D2-37A4-4BDC-9DB3-45780726C804}.Release|Any CPU.Build.0 = Release|Any CPU - {A05A572C-30D5-41E4-B82D-8E5F0855C112}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A05A572C-30D5-41E4-B82D-8E5F0855C112}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A05A572C-30D5-41E4-B82D-8E5F0855C112}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A05A572C-30D5-41E4-B82D-8E5F0855C112}.Release|Any CPU.Build.0 = Release|Any CPU - {66C53B95-70C9-4333-8791-EDF82EA9F3D6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {66C53B95-70C9-4333-8791-EDF82EA9F3D6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {66C53B95-70C9-4333-8791-EDF82EA9F3D6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {66C53B95-70C9-4333-8791-EDF82EA9F3D6}.Release|Any CPU.Build.0 = Release|Any CPU - {126EBCC0-2A2A-4E92-9F01-FD1C7329EF0E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {126EBCC0-2A2A-4E92-9F01-FD1C7329EF0E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {126EBCC0-2A2A-4E92-9F01-FD1C7329EF0E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {126EBCC0-2A2A-4E92-9F01-FD1C7329EF0E}.Release|Any CPU.Build.0 = Release|Any CPU - {8DD18CB0-A446-4454-A63F-3491056762F5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8DD18CB0-A446-4454-A63F-3491056762F5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8DD18CB0-A446-4454-A63F-3491056762F5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8DD18CB0-A446-4454-A63F-3491056762F5}.Release|Any CPU.Build.0 = Release|Any CPU - {0C240500-CCF4-4ACD-902E-9C5544AE861F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0C240500-CCF4-4ACD-902E-9C5544AE861F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0C240500-CCF4-4ACD-902E-9C5544AE861F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0C240500-CCF4-4ACD-902E-9C5544AE861F}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {AB6F9EA4-37D0-40BC-876D-938B5A044113}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AB6F9EA4-37D0-40BC-876D-938B5A044113}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AB6F9EA4-37D0-40BC-876D-938B5A044113}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AB6F9EA4-37D0-40BC-876D-938B5A044113}.Release|Any CPU.Build.0 = Release|Any CPU - {086D233F-B1C8-48B3-A0B2-6F88B18E673F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {086D233F-B1C8-48B3-A0B2-6F88B18E673F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {086D233F-B1C8-48B3-A0B2-6F88B18E673F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {086D233F-B1C8-48B3-A0B2-6F88B18E673F}.Release|Any CPU.Build.0 = Release|Any CPU - {8908B289-D8BE-4341-B49B-87E402BC23E4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8908B289-D8BE-4341-B49B-87E402BC23E4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8908B289-D8BE-4341-B49B-87E402BC23E4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8908B289-D8BE-4341-B49B-87E402BC23E4}.Release|Any CPU.Build.0 = Release|Any CPU - {AC9E0422-472A-4627-94D7-3BB13FD3D303}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AC9E0422-472A-4627-94D7-3BB13FD3D303}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AC9E0422-472A-4627-94D7-3BB13FD3D303}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AC9E0422-472A-4627-94D7-3BB13FD3D303}.Release|Any CPU.Build.0 = Release|Any CPU - {8E35D0D2-37A4-4BDC-9DB3-45780726C804}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8E35D0D2-37A4-4BDC-9DB3-45780726C804}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8E35D0D2-37A4-4BDC-9DB3-45780726C804}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8E35D0D2-37A4-4BDC-9DB3-45780726C804}.Release|Any CPU.Build.0 = Release|Any CPU - {A05A572C-30D5-41E4-B82D-8E5F0855C112}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A05A572C-30D5-41E4-B82D-8E5F0855C112}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A05A572C-30D5-41E4-B82D-8E5F0855C112}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A05A572C-30D5-41E4-B82D-8E5F0855C112}.Release|Any CPU.Build.0 = Release|Any CPU - {66C53B95-70C9-4333-8791-EDF82EA9F3D6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {66C53B95-70C9-4333-8791-EDF82EA9F3D6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {66C53B95-70C9-4333-8791-EDF82EA9F3D6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {66C53B95-70C9-4333-8791-EDF82EA9F3D6}.Release|Any CPU.Build.0 = Release|Any CPU - {126EBCC0-2A2A-4E92-9F01-FD1C7329EF0E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {126EBCC0-2A2A-4E92-9F01-FD1C7329EF0E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {126EBCC0-2A2A-4E92-9F01-FD1C7329EF0E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {126EBCC0-2A2A-4E92-9F01-FD1C7329EF0E}.Release|Any CPU.Build.0 = Release|Any CPU - {8DD18CB0-A446-4454-A63F-3491056762F5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8DD18CB0-A446-4454-A63F-3491056762F5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8DD18CB0-A446-4454-A63F-3491056762F5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8DD18CB0-A446-4454-A63F-3491056762F5}.Release|Any CPU.Build.0 = Release|Any CPU - {0C240500-CCF4-4ACD-902E-9C5544AE861F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0C240500-CCF4-4ACD-902E-9C5544AE861F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0C240500-CCF4-4ACD-902E-9C5544AE861F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0C240500-CCF4-4ACD-902E-9C5544AE861F}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -220,37 +136,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {82535EF6-4FD0-4654-B342-7C408086BA8D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {4690A32C-DFCF-4D85-AAF8-0F85D54D27EE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {096276D1-65DB-4635-BBA9-D4FBE911A041} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {32C87FFE-763F-4435-826D-CA4FE0A7781C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {644177F4-6BBD-49C9-898F-A0C48FD5D900} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {AB6F9EA4-37D0-40BC-876D-938B5A044113} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {086D233F-B1C8-48B3-A0B2-6F88B18E673F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8908B289-D8BE-4341-B49B-87E402BC23E4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {AC9E0422-472A-4627-94D7-3BB13FD3D303} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8E35D0D2-37A4-4BDC-9DB3-45780726C804} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A05A572C-30D5-41E4-B82D-8E5F0855C112} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {66C53B95-70C9-4333-8791-EDF82EA9F3D6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {126EBCC0-2A2A-4E92-9F01-FD1C7329EF0E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8DD18CB0-A446-4454-A63F-3491056762F5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0C240500-CCF4-4ACD-902E-9C5544AE861F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {AB6F9EA4-37D0-40BC-876D-938B5A044113} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {086D233F-B1C8-48B3-A0B2-6F88B18E673F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8908B289-D8BE-4341-B49B-87E402BC23E4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {AC9E0422-472A-4627-94D7-3BB13FD3D303} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8E35D0D2-37A4-4BDC-9DB3-45780726C804} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A05A572C-30D5-41E4-B82D-8E5F0855C112} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {66C53B95-70C9-4333-8791-EDF82EA9F3D6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {126EBCC0-2A2A-4E92-9F01-FD1C7329EF0E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8DD18CB0-A446-4454-A63F-3491056762F5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0C240500-CCF4-4ACD-902E-9C5544AE861F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {5AB91762-925F-43B2-9981-8BC3DEEF1FBE} diff --git a/sdk/src/Services/SupplyChain/Generated/AmazonSupplyChainConfig.cs b/sdk/src/Services/SupplyChain/Generated/AmazonSupplyChainConfig.cs index f802f050b14c..a0f0315ab374 100644 --- a/sdk/src/Services/SupplyChain/Generated/AmazonSupplyChainConfig.cs +++ b/sdk/src/Services/SupplyChain/Generated/AmazonSupplyChainConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.SupplyChain public partial class AmazonSupplyChainConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("SupplyChain", "4.0.0.0"); private static readonly AmazonSupplyChainEndpointResolver EndpointResolver = new AmazonSupplyChainEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("SupplyChain", "3.7.400.27"); -======= - InternalSDKUtils.BuildUserAgentString("SupplyChain", "3.7.403.13"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/SupplyChain/Generated/Model/DataIntegrationFlow.cs b/sdk/src/Services/SupplyChain/Generated/Model/DataIntegrationFlow.cs index ded780a70a14..45c5a2e037f7 100644 --- a/sdk/src/Services/SupplyChain/Generated/Model/DataIntegrationFlow.cs +++ b/sdk/src/Services/SupplyChain/Generated/Model/DataIntegrationFlow.cs @@ -49,9 +49,9 @@ public partial class DataIntegrationFlow /// /// [AWSProperty(Required=true)] - public DateTime CreatedTime + public DateTime? CreatedTime { - get { return this._createdTime.GetValueOrDefault(); } + get { return this._createdTime; } set { this._createdTime = value; } } @@ -87,9 +87,9 @@ internal bool IsSetInstanceId() /// /// [AWSProperty(Required=true)] - public DateTime LastModifiedTime + public DateTime? LastModifiedTime { - get { return this._lastModifiedTime.GetValueOrDefault(); } + get { return this._lastModifiedTime; } set { this._lastModifiedTime = value; } } diff --git a/sdk/src/Services/SupplyChain/Generated/Model/DataIntegrationFlowDatasetOptions.cs b/sdk/src/Services/SupplyChain/Generated/Model/DataIntegrationFlowDatasetOptions.cs index d2a443590037..8d35cf808a35 100644 --- a/sdk/src/Services/SupplyChain/Generated/Model/DataIntegrationFlowDatasetOptions.cs +++ b/sdk/src/Services/SupplyChain/Generated/Model/DataIntegrationFlowDatasetOptions.cs @@ -43,9 +43,9 @@ public partial class DataIntegrationFlowDatasetOptions /// The dataset load option to remove duplicates. /// /// - public bool DedupeRecords + public bool? DedupeRecords { - get { return this._dedupeRecords.GetValueOrDefault(); } + get { return this._dedupeRecords; } set { this._dedupeRecords = value; } } diff --git a/sdk/src/Services/SupplyChain/Generated/Model/DataLakeDataset.cs b/sdk/src/Services/SupplyChain/Generated/Model/DataLakeDataset.cs index 1652859b91fb..e43fa93c6e32 100644 --- a/sdk/src/Services/SupplyChain/Generated/Model/DataLakeDataset.cs +++ b/sdk/src/Services/SupplyChain/Generated/Model/DataLakeDataset.cs @@ -69,9 +69,9 @@ internal bool IsSetArn() /// /// [AWSProperty(Required=true)] - public DateTime CreatedTime + public DateTime? CreatedTime { - get { return this._createdTime.GetValueOrDefault(); } + get { return this._createdTime; } set { this._createdTime = value; } } @@ -126,9 +126,9 @@ internal bool IsSetInstanceId() /// /// [AWSProperty(Required=true)] - public DateTime LastModifiedTime + public DateTime? LastModifiedTime { - get { return this._lastModifiedTime.GetValueOrDefault(); } + get { return this._lastModifiedTime; } set { this._lastModifiedTime = value; } } diff --git a/sdk/src/Services/SupplyChain/Generated/Model/DataLakeDatasetSchemaField.cs b/sdk/src/Services/SupplyChain/Generated/Model/DataLakeDatasetSchemaField.cs index 964f4fdf64d8..1e279e4627c5 100644 --- a/sdk/src/Services/SupplyChain/Generated/Model/DataLakeDatasetSchemaField.cs +++ b/sdk/src/Services/SupplyChain/Generated/Model/DataLakeDatasetSchemaField.cs @@ -45,9 +45,9 @@ public partial class DataLakeDatasetSchemaField /// ///             [AWSProperty(Required=true)] - public bool IsRequired + public bool? IsRequired { - get { return this._isRequired.GetValueOrDefault(); } + get { return this._isRequired; } set { this._isRequired = value; } } diff --git a/sdk/src/Services/SupplyChain/Generated/Model/Instance.cs b/sdk/src/Services/SupplyChain/Generated/Model/Instance.cs index c6be842703fc..6d8de38f5db2 100644 --- a/sdk/src/Services/SupplyChain/Generated/Model/Instance.cs +++ b/sdk/src/Services/SupplyChain/Generated/Model/Instance.cs @@ -71,9 +71,9 @@ internal bool IsSetAwsAccountId() /// The instance creation timestamp. /// ///             - public DateTime CreatedTime + public DateTime? CreatedTime { - get { return this._createdTime.GetValueOrDefault(); } + get { return this._createdTime; } set { this._createdTime = value; } } @@ -187,9 +187,9 @@ internal bool IsSetKmsKeyArn() /// The instance last modified timestamp. /// ///             - public DateTime LastModifiedTime + public DateTime? LastModifiedTime { - get { return this._lastModifiedTime.GetValueOrDefault(); } + get { return this._lastModifiedTime; } set { this._lastModifiedTime = value; } } @@ -224,9 +224,9 @@ internal bool IsSetState() /// The version number of the instance. /// ///             - public double VersionNumber + public double? VersionNumber { - get { return this._versionNumber.GetValueOrDefault(); } + get { return this._versionNumber; } set { this._versionNumber = value; } } diff --git a/sdk/src/Services/SupplyChain/Generated/Model/Internal/MarshallTransformations/CreateDataIntegrationFlowRequestMarshaller.cs b/sdk/src/Services/SupplyChain/Generated/Model/Internal/MarshallTransformations/CreateDataIntegrationFlowRequestMarshaller.cs index 759adb4887ff..979b198a1583 100644 --- a/sdk/src/Services/SupplyChain/Generated/Model/Internal/MarshallTransformations/CreateDataIntegrationFlowRequestMarshaller.cs +++ b/sdk/src/Services/SupplyChain/Generated/Model/Internal/MarshallTransformations/CreateDataIntegrationFlowRequestMarshaller.cs @@ -67,67 +67,70 @@ public IRequest Marshall(CreateDataIntegrationFlowRequest publicRequest) throw new AmazonSupplyChainException("Request object does not have required field Name set"); request.AddPathResource("{name}", StringUtils.FromString(publicRequest.Name)); request.ResourcePath = "/api/data-integration/instance/{instanceId}/data-integration-flows/{name}"; - using (StringWriter stringWriter = new StringWriter(CultureInfo.InvariantCulture)) + using (MemoryStream memoryStream = new MemoryStream()) { - JsonWriter writer = new JsonWriter(stringWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetSources()) + using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) { - context.Writer.WritePropertyName("sources"); - context.Writer.WriteArrayStart(); - foreach(var publicRequestSourcesListValue in publicRequest.Sources) + JsonWriter writer = new JsonWriter(streamWriter); + writer.Validate = false; + writer.WriteObjectStart(); + var context = new JsonMarshallerContext(request, writer); + if(publicRequest.IsSetSources()) { - context.Writer.WriteObjectStart(); + context.Writer.WritePropertyName("sources"); + context.Writer.WriteArrayStart(); + foreach(var publicRequestSourcesListValue in publicRequest.Sources) + { + context.Writer.WriteObjectStart(); + + var marshaller = DataIntegrationFlowSourceMarshaller.Instance; + marshaller.Marshall(publicRequestSourcesListValue, context); + + context.Writer.WriteObjectEnd(); + } + context.Writer.WriteArrayEnd(); + } - var marshaller = DataIntegrationFlowSourceMarshaller.Instance; - marshaller.Marshall(publicRequestSourcesListValue, context); + if(publicRequest.IsSetTags()) + { + context.Writer.WritePropertyName("tags"); + context.Writer.WriteObjectStart(); + foreach (var publicRequestTagsKvp in publicRequest.Tags) + { + context.Writer.WritePropertyName(publicRequestTagsKvp.Key); + var publicRequestTagsValue = publicRequestTagsKvp.Value; + context.Writer.Write(publicRequestTagsValue); + } context.Writer.WriteObjectEnd(); } - context.Writer.WriteArrayEnd(); - } - if(publicRequest.IsSetTags()) - { - context.Writer.WritePropertyName("tags"); - context.Writer.WriteObjectStart(); - foreach (var publicRequestTagsKvp in publicRequest.Tags) + if(publicRequest.IsSetTarget()) { - context.Writer.WritePropertyName(publicRequestTagsKvp.Key); - var publicRequestTagsValue = publicRequestTagsKvp.Value; + context.Writer.WritePropertyName("target"); + context.Writer.WriteObjectStart(); - context.Writer.Write(publicRequestTagsValue); - } - context.Writer.WriteObjectEnd(); - } + var marshaller = DataIntegrationFlowTargetMarshaller.Instance; + marshaller.Marshall(publicRequest.Target, context); - if(publicRequest.IsSetTarget()) - { - context.Writer.WritePropertyName("target"); - context.Writer.WriteObjectStart(); - - var marshaller = DataIntegrationFlowTargetMarshaller.Instance; - marshaller.Marshall(publicRequest.Target, context); + context.Writer.WriteObjectEnd(); + } - context.Writer.WriteObjectEnd(); - } + if(publicRequest.IsSetTransformation()) + { + context.Writer.WritePropertyName("transformation"); + context.Writer.WriteObjectStart(); - if(publicRequest.IsSetTransformation()) - { - context.Writer.WritePropertyName("transformation"); - context.Writer.WriteObjectStart(); + var marshaller = DataIntegrationFlowTransformationMarshaller.Instance; + marshaller.Marshall(publicRequest.Transformation, context); - var marshaller = DataIntegrationFlowTransformationMarshaller.Instance; - marshaller.Marshall(publicRequest.Transformation, context); + context.Writer.WriteObjectEnd(); + } - context.Writer.WriteObjectEnd(); + writer.WriteObjectEnd(); } - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); + request.Content = memoryStream.ToArray(); } diff --git a/sdk/src/Services/SupplyChain/Generated/Model/Internal/MarshallTransformations/CreateDataLakeDatasetRequestMarshaller.cs b/sdk/src/Services/SupplyChain/Generated/Model/Internal/MarshallTransformations/CreateDataLakeDatasetRequestMarshaller.cs index 4ec80cb5b5f0..8d2c4860243e 100644 --- a/sdk/src/Services/SupplyChain/Generated/Model/Internal/MarshallTransformations/CreateDataLakeDatasetRequestMarshaller.cs +++ b/sdk/src/Services/SupplyChain/Generated/Model/Internal/MarshallTransformations/CreateDataLakeDatasetRequestMarshaller.cs @@ -70,46 +70,49 @@ public IRequest Marshall(CreateDataLakeDatasetRequest publicRequest) throw new AmazonSupplyChainException("Request object does not have required field Namespace set"); request.AddPathResource("{namespace}", StringUtils.FromString(publicRequest.Namespace)); request.ResourcePath = "/api/datalake/instance/{instanceId}/namespaces/{namespace}/datasets/{name}"; - using (StringWriter stringWriter = new StringWriter(CultureInfo.InvariantCulture)) + using (MemoryStream memoryStream = new MemoryStream()) { - JsonWriter writer = new JsonWriter(stringWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetDescription()) + using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) { - context.Writer.WritePropertyName("description"); - context.Writer.Write(publicRequest.Description); - } + JsonWriter writer = new JsonWriter(streamWriter); + writer.Validate = false; + writer.WriteObjectStart(); + var context = new JsonMarshallerContext(request, writer); + if(publicRequest.IsSetDescription()) + { + context.Writer.WritePropertyName("description"); + context.Writer.Write(publicRequest.Description); + } - if(publicRequest.IsSetSchema()) - { - context.Writer.WritePropertyName("schema"); - context.Writer.WriteObjectStart(); + if(publicRequest.IsSetSchema()) + { + context.Writer.WritePropertyName("schema"); + context.Writer.WriteObjectStart(); - var marshaller = DataLakeDatasetSchemaMarshaller.Instance; - marshaller.Marshall(publicRequest.Schema, context); + var marshaller = DataLakeDatasetSchemaMarshaller.Instance; + marshaller.Marshall(publicRequest.Schema, context); - context.Writer.WriteObjectEnd(); - } + context.Writer.WriteObjectEnd(); + } - if(publicRequest.IsSetTags()) - { - context.Writer.WritePropertyName("tags"); - context.Writer.WriteObjectStart(); - foreach (var publicRequestTagsKvp in publicRequest.Tags) + if(publicRequest.IsSetTags()) { - context.Writer.WritePropertyName(publicRequestTagsKvp.Key); - var publicRequestTagsValue = publicRequestTagsKvp.Value; - - context.Writer.Write(publicRequestTagsValue); + context.Writer.WritePropertyName("tags"); + context.Writer.WriteObjectStart(); + foreach (var publicRequestTagsKvp in publicRequest.Tags) + { + context.Writer.WritePropertyName(publicRequestTagsKvp.Key); + var publicRequestTagsValue = publicRequestTagsKvp.Value; + + context.Writer.Write(publicRequestTagsValue); + } + context.Writer.WriteObjectEnd(); } - context.Writer.WriteObjectEnd(); + + writer.WriteObjectEnd(); } - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); + request.Content = memoryStream.ToArray(); } diff --git a/sdk/src/Services/SupplyChain/Generated/Model/Internal/MarshallTransformations/CreateInstanceRequestMarshaller.cs b/sdk/src/Services/SupplyChain/Generated/Model/Internal/MarshallTransformations/CreateInstanceRequestMarshaller.cs index a7b0bfac708e..30791ffcf18f 100644 --- a/sdk/src/Services/SupplyChain/Generated/Model/Internal/MarshallTransformations/CreateInstanceRequestMarshaller.cs +++ b/sdk/src/Services/SupplyChain/Generated/Model/Internal/MarshallTransformations/CreateInstanceRequestMarshaller.cs @@ -61,58 +61,61 @@ public IRequest Marshall(CreateInstanceRequest publicRequest) request.HttpMethod = "POST"; request.ResourcePath = "/api/instance"; - using (StringWriter stringWriter = new StringWriter(CultureInfo.InvariantCulture)) + using (MemoryStream memoryStream = new MemoryStream()) { - JsonWriter writer = new JsonWriter(stringWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetClientToken()) + using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) { - context.Writer.WritePropertyName("clientToken"); - context.Writer.Write(publicRequest.ClientToken); - } - - else if(!(publicRequest.IsSetClientToken())) - { - context.Writer.WritePropertyName("clientToken"); - context.Writer.Write(Guid.NewGuid().ToString()); - } - if(publicRequest.IsSetInstanceDescription()) - { - context.Writer.WritePropertyName("instanceDescription"); - context.Writer.Write(publicRequest.InstanceDescription); - } + JsonWriter writer = new JsonWriter(streamWriter); + writer.Validate = false; + writer.WriteObjectStart(); + var context = new JsonMarshallerContext(request, writer); + if(publicRequest.IsSetClientToken()) + { + context.Writer.WritePropertyName("clientToken"); + context.Writer.Write(publicRequest.ClientToken); + } - if(publicRequest.IsSetInstanceName()) - { - context.Writer.WritePropertyName("instanceName"); - context.Writer.Write(publicRequest.InstanceName); - } + else if(!(publicRequest.IsSetClientToken())) + { + context.Writer.WritePropertyName("clientToken"); + context.Writer.Write(Guid.NewGuid().ToString()); + } + if(publicRequest.IsSetInstanceDescription()) + { + context.Writer.WritePropertyName("instanceDescription"); + context.Writer.Write(publicRequest.InstanceDescription); + } - if(publicRequest.IsSetKmsKeyArn()) - { - context.Writer.WritePropertyName("kmsKeyArn"); - context.Writer.Write(publicRequest.KmsKeyArn); - } + if(publicRequest.IsSetInstanceName()) + { + context.Writer.WritePropertyName("instanceName"); + context.Writer.Write(publicRequest.InstanceName); + } - if(publicRequest.IsSetTags()) - { - context.Writer.WritePropertyName("tags"); - context.Writer.WriteObjectStart(); - foreach (var publicRequestTagsKvp in publicRequest.Tags) + if(publicRequest.IsSetKmsKeyArn()) { - context.Writer.WritePropertyName(publicRequestTagsKvp.Key); - var publicRequestTagsValue = publicRequestTagsKvp.Value; + context.Writer.WritePropertyName("kmsKeyArn"); + context.Writer.Write(publicRequest.KmsKeyArn); + } - context.Writer.Write(publicRequestTagsValue); + if(publicRequest.IsSetTags()) + { + context.Writer.WritePropertyName("tags"); + context.Writer.WriteObjectStart(); + foreach (var publicRequestTagsKvp in publicRequest.Tags) + { + context.Writer.WritePropertyName(publicRequestTagsKvp.Key); + var publicRequestTagsValue = publicRequestTagsKvp.Value; + + context.Writer.Write(publicRequestTagsValue); + } + context.Writer.WriteObjectEnd(); } - context.Writer.WriteObjectEnd(); + + writer.WriteObjectEnd(); } - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); + request.Content = memoryStream.ToArray(); } diff --git a/sdk/src/Services/SupplyChain/Generated/Model/Internal/MarshallTransformations/DataIntegrationFlowDatasetOptionsMarshaller.cs b/sdk/src/Services/SupplyChain/Generated/Model/Internal/MarshallTransformations/DataIntegrationFlowDatasetOptionsMarshaller.cs index 84ff57771e45..517ea24f9438 100644 --- a/sdk/src/Services/SupplyChain/Generated/Model/Internal/MarshallTransformations/DataIntegrationFlowDatasetOptionsMarshaller.cs +++ b/sdk/src/Services/SupplyChain/Generated/Model/Internal/MarshallTransformations/DataIntegrationFlowDatasetOptionsMarshaller.cs @@ -51,7 +51,7 @@ public void Marshall(DataIntegrationFlowDatasetOptions requestObject, JsonMarsha if(requestObject.IsSetDedupeRecords()) { context.Writer.WritePropertyName("dedupeRecords"); - context.Writer.Write(requestObject.DedupeRecords); + context.Writer.Write(requestObject.DedupeRecords.Value); } if(requestObject.IsSetLoadType()) diff --git a/sdk/src/Services/SupplyChain/Generated/Model/Internal/MarshallTransformations/DataIntegrationFlowDatasetOptionsUnmarshaller.cs b/sdk/src/Services/SupplyChain/Generated/Model/Internal/MarshallTransformations/DataIntegrationFlowDatasetOptionsUnmarshaller.cs index d8048b1d802f..c311acec15bf 100644 --- a/sdk/src/Services/SupplyChain/Generated/Model/Internal/MarshallTransformations/DataIntegrationFlowDatasetOptionsUnmarshaller.cs +++ b/sdk/src/Services/SupplyChain/Generated/Model/Internal/MarshallTransformations/DataIntegrationFlowDatasetOptionsUnmarshaller.cs @@ -68,7 +68,7 @@ public DataIntegrationFlowDatasetOptions Unmarshall(JsonUnmarshallerContext cont { if (context.TestExpression("dedupeRecords", targetDepth)) { - var unmarshaller = BoolUnmarshaller.Instance; + var unmarshaller = NullableBoolUnmarshaller.Instance; unmarshalledObject.DedupeRecords = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/SupplyChain/Generated/Model/Internal/MarshallTransformations/DataIntegrationFlowUnmarshaller.cs b/sdk/src/Services/SupplyChain/Generated/Model/Internal/MarshallTransformations/DataIntegrationFlowUnmarshaller.cs index 07571705f8b1..50291a97db57 100644 --- a/sdk/src/Services/SupplyChain/Generated/Model/Internal/MarshallTransformations/DataIntegrationFlowUnmarshaller.cs +++ b/sdk/src/Services/SupplyChain/Generated/Model/Internal/MarshallTransformations/DataIntegrationFlowUnmarshaller.cs @@ -68,7 +68,7 @@ public DataIntegrationFlow Unmarshall(JsonUnmarshallerContext context) { if (context.TestExpression("createdTime", targetDepth)) { - var unmarshaller = DateTimeUnmarshaller.Instance; + var unmarshaller = NullableDateTimeUnmarshaller.Instance; unmarshalledObject.CreatedTime = unmarshaller.Unmarshall(context); continue; } @@ -80,7 +80,7 @@ public DataIntegrationFlow Unmarshall(JsonUnmarshallerContext context) } if (context.TestExpression("lastModifiedTime", targetDepth)) { - var unmarshaller = DateTimeUnmarshaller.Instance; + var unmarshaller = NullableDateTimeUnmarshaller.Instance; unmarshalledObject.LastModifiedTime = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/SupplyChain/Generated/Model/Internal/MarshallTransformations/DataLakeDatasetSchemaFieldMarshaller.cs b/sdk/src/Services/SupplyChain/Generated/Model/Internal/MarshallTransformations/DataLakeDatasetSchemaFieldMarshaller.cs index 75a48b7c221e..a91ab8e8368a 100644 --- a/sdk/src/Services/SupplyChain/Generated/Model/Internal/MarshallTransformations/DataLakeDatasetSchemaFieldMarshaller.cs +++ b/sdk/src/Services/SupplyChain/Generated/Model/Internal/MarshallTransformations/DataLakeDatasetSchemaFieldMarshaller.cs @@ -51,7 +51,7 @@ public void Marshall(DataLakeDatasetSchemaField requestObject, JsonMarshallerCon if(requestObject.IsSetIsRequired()) { context.Writer.WritePropertyName("isRequired"); - context.Writer.Write(requestObject.IsRequired); + context.Writer.Write(requestObject.IsRequired.Value); } if(requestObject.IsSetName()) diff --git a/sdk/src/Services/SupplyChain/Generated/Model/Internal/MarshallTransformations/DataLakeDatasetSchemaFieldUnmarshaller.cs b/sdk/src/Services/SupplyChain/Generated/Model/Internal/MarshallTransformations/DataLakeDatasetSchemaFieldUnmarshaller.cs index dd82dcc41a65..5565d4457595 100644 --- a/sdk/src/Services/SupplyChain/Generated/Model/Internal/MarshallTransformations/DataLakeDatasetSchemaFieldUnmarshaller.cs +++ b/sdk/src/Services/SupplyChain/Generated/Model/Internal/MarshallTransformations/DataLakeDatasetSchemaFieldUnmarshaller.cs @@ -68,7 +68,7 @@ public DataLakeDatasetSchemaField Unmarshall(JsonUnmarshallerContext context) { if (context.TestExpression("isRequired", targetDepth)) { - var unmarshaller = BoolUnmarshaller.Instance; + var unmarshaller = NullableBoolUnmarshaller.Instance; unmarshalledObject.IsRequired = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/SupplyChain/Generated/Model/Internal/MarshallTransformations/DataLakeDatasetUnmarshaller.cs b/sdk/src/Services/SupplyChain/Generated/Model/Internal/MarshallTransformations/DataLakeDatasetUnmarshaller.cs index 85ef99a10576..43b249198ed6 100644 --- a/sdk/src/Services/SupplyChain/Generated/Model/Internal/MarshallTransformations/DataLakeDatasetUnmarshaller.cs +++ b/sdk/src/Services/SupplyChain/Generated/Model/Internal/MarshallTransformations/DataLakeDatasetUnmarshaller.cs @@ -74,7 +74,7 @@ public DataLakeDataset Unmarshall(JsonUnmarshallerContext context) } if (context.TestExpression("createdTime", targetDepth)) { - var unmarshaller = DateTimeUnmarshaller.Instance; + var unmarshaller = NullableDateTimeUnmarshaller.Instance; unmarshalledObject.CreatedTime = unmarshaller.Unmarshall(context); continue; } @@ -92,7 +92,7 @@ public DataLakeDataset Unmarshall(JsonUnmarshallerContext context) } if (context.TestExpression("lastModifiedTime", targetDepth)) { - var unmarshaller = DateTimeUnmarshaller.Instance; + var unmarshaller = NullableDateTimeUnmarshaller.Instance; unmarshalledObject.LastModifiedTime = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/SupplyChain/Generated/Model/Internal/MarshallTransformations/InstanceUnmarshaller.cs b/sdk/src/Services/SupplyChain/Generated/Model/Internal/MarshallTransformations/InstanceUnmarshaller.cs index 4b4909c50561..b71af761ffb5 100644 --- a/sdk/src/Services/SupplyChain/Generated/Model/Internal/MarshallTransformations/InstanceUnmarshaller.cs +++ b/sdk/src/Services/SupplyChain/Generated/Model/Internal/MarshallTransformations/InstanceUnmarshaller.cs @@ -74,7 +74,7 @@ public Instance Unmarshall(JsonUnmarshallerContext context) } if (context.TestExpression("createdTime", targetDepth)) { - var unmarshaller = DateTimeUnmarshaller.Instance; + var unmarshaller = NullableDateTimeUnmarshaller.Instance; unmarshalledObject.CreatedTime = unmarshaller.Unmarshall(context); continue; } @@ -110,7 +110,7 @@ public Instance Unmarshall(JsonUnmarshallerContext context) } if (context.TestExpression("lastModifiedTime", targetDepth)) { - var unmarshaller = DateTimeUnmarshaller.Instance; + var unmarshaller = NullableDateTimeUnmarshaller.Instance; unmarshalledObject.LastModifiedTime = unmarshaller.Unmarshall(context); continue; } @@ -122,7 +122,7 @@ public Instance Unmarshall(JsonUnmarshallerContext context) } if (context.TestExpression("versionNumber", targetDepth)) { - var unmarshaller = DoubleUnmarshaller.Instance; + var unmarshaller = NullableDoubleUnmarshaller.Instance; unmarshalledObject.VersionNumber = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/SupplyChain/Generated/Model/Internal/MarshallTransformations/TagResourceRequestMarshaller.cs b/sdk/src/Services/SupplyChain/Generated/Model/Internal/MarshallTransformations/TagResourceRequestMarshaller.cs index e7916092d53c..acc06dfb945d 100644 --- a/sdk/src/Services/SupplyChain/Generated/Model/Internal/MarshallTransformations/TagResourceRequestMarshaller.cs +++ b/sdk/src/Services/SupplyChain/Generated/Model/Internal/MarshallTransformations/TagResourceRequestMarshaller.cs @@ -64,29 +64,32 @@ public IRequest Marshall(TagResourceRequest publicRequest) throw new AmazonSupplyChainException("Request object does not have required field ResourceArn set"); request.AddPathResource("{resourceArn}", StringUtils.FromString(publicRequest.ResourceArn)); request.ResourcePath = "/api/tags/{resourceArn}"; - using (StringWriter stringWriter = new StringWriter(CultureInfo.InvariantCulture)) + using (MemoryStream memoryStream = new MemoryStream()) { - JsonWriter writer = new JsonWriter(stringWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetTags()) + using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) { - context.Writer.WritePropertyName("tags"); - context.Writer.WriteObjectStart(); - foreach (var publicRequestTagsKvp in publicRequest.Tags) + JsonWriter writer = new JsonWriter(streamWriter); + writer.Validate = false; + writer.WriteObjectStart(); + var context = new JsonMarshallerContext(request, writer); + if(publicRequest.IsSetTags()) { - context.Writer.WritePropertyName(publicRequestTagsKvp.Key); - var publicRequestTagsValue = publicRequestTagsKvp.Value; + context.Writer.WritePropertyName("tags"); + context.Writer.WriteObjectStart(); + foreach (var publicRequestTagsKvp in publicRequest.Tags) + { + context.Writer.WritePropertyName(publicRequestTagsKvp.Key); + var publicRequestTagsValue = publicRequestTagsKvp.Value; - context.Writer.Write(publicRequestTagsValue); + context.Writer.Write(publicRequestTagsValue); + } + context.Writer.WriteObjectEnd(); } - context.Writer.WriteObjectEnd(); + + writer.WriteObjectEnd(); } - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); + request.Content = memoryStream.ToArray(); } diff --git a/sdk/src/Services/SupplyChain/Generated/Model/Internal/MarshallTransformations/UpdateDataIntegrationFlowRequestMarshaller.cs b/sdk/src/Services/SupplyChain/Generated/Model/Internal/MarshallTransformations/UpdateDataIntegrationFlowRequestMarshaller.cs index 8fb24d5e3a06..33e2771acc51 100644 --- a/sdk/src/Services/SupplyChain/Generated/Model/Internal/MarshallTransformations/UpdateDataIntegrationFlowRequestMarshaller.cs +++ b/sdk/src/Services/SupplyChain/Generated/Model/Internal/MarshallTransformations/UpdateDataIntegrationFlowRequestMarshaller.cs @@ -67,53 +67,56 @@ public IRequest Marshall(UpdateDataIntegrationFlowRequest publicRequest) throw new AmazonSupplyChainException("Request object does not have required field Name set"); request.AddPathResource("{name}", StringUtils.FromString(publicRequest.Name)); request.ResourcePath = "/api/data-integration/instance/{instanceId}/data-integration-flows/{name}"; - using (StringWriter stringWriter = new StringWriter(CultureInfo.InvariantCulture)) + using (MemoryStream memoryStream = new MemoryStream()) { - JsonWriter writer = new JsonWriter(stringWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetSources()) + using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) { - context.Writer.WritePropertyName("sources"); - context.Writer.WriteArrayStart(); - foreach(var publicRequestSourcesListValue in publicRequest.Sources) + JsonWriter writer = new JsonWriter(streamWriter); + writer.Validate = false; + writer.WriteObjectStart(); + var context = new JsonMarshallerContext(request, writer); + if(publicRequest.IsSetSources()) { + context.Writer.WritePropertyName("sources"); + context.Writer.WriteArrayStart(); + foreach(var publicRequestSourcesListValue in publicRequest.Sources) + { + context.Writer.WriteObjectStart(); + + var marshaller = DataIntegrationFlowSourceMarshaller.Instance; + marshaller.Marshall(publicRequestSourcesListValue, context); + + context.Writer.WriteObjectEnd(); + } + context.Writer.WriteArrayEnd(); + } + + if(publicRequest.IsSetTarget()) + { + context.Writer.WritePropertyName("target"); context.Writer.WriteObjectStart(); - var marshaller = DataIntegrationFlowSourceMarshaller.Instance; - marshaller.Marshall(publicRequestSourcesListValue, context); + var marshaller = DataIntegrationFlowTargetMarshaller.Instance; + marshaller.Marshall(publicRequest.Target, context); context.Writer.WriteObjectEnd(); } - context.Writer.WriteArrayEnd(); - } - - if(publicRequest.IsSetTarget()) - { - context.Writer.WritePropertyName("target"); - context.Writer.WriteObjectStart(); - - var marshaller = DataIntegrationFlowTargetMarshaller.Instance; - marshaller.Marshall(publicRequest.Target, context); - context.Writer.WriteObjectEnd(); - } + if(publicRequest.IsSetTransformation()) + { + context.Writer.WritePropertyName("transformation"); + context.Writer.WriteObjectStart(); - if(publicRequest.IsSetTransformation()) - { - context.Writer.WritePropertyName("transformation"); - context.Writer.WriteObjectStart(); + var marshaller = DataIntegrationFlowTransformationMarshaller.Instance; + marshaller.Marshall(publicRequest.Transformation, context); - var marshaller = DataIntegrationFlowTransformationMarshaller.Instance; - marshaller.Marshall(publicRequest.Transformation, context); + context.Writer.WriteObjectEnd(); + } - context.Writer.WriteObjectEnd(); + writer.WriteObjectEnd(); } - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); + request.Content = memoryStream.ToArray(); } diff --git a/sdk/src/Services/SupplyChain/Generated/Model/Internal/MarshallTransformations/UpdateDataLakeDatasetRequestMarshaller.cs b/sdk/src/Services/SupplyChain/Generated/Model/Internal/MarshallTransformations/UpdateDataLakeDatasetRequestMarshaller.cs index 3f3a9245929f..60aed8afc0d1 100644 --- a/sdk/src/Services/SupplyChain/Generated/Model/Internal/MarshallTransformations/UpdateDataLakeDatasetRequestMarshaller.cs +++ b/sdk/src/Services/SupplyChain/Generated/Model/Internal/MarshallTransformations/UpdateDataLakeDatasetRequestMarshaller.cs @@ -70,21 +70,24 @@ public IRequest Marshall(UpdateDataLakeDatasetRequest publicRequest) throw new AmazonSupplyChainException("Request object does not have required field Namespace set"); request.AddPathResource("{namespace}", StringUtils.FromString(publicRequest.Namespace)); request.ResourcePath = "/api/datalake/instance/{instanceId}/namespaces/{namespace}/datasets/{name}"; - using (StringWriter stringWriter = new StringWriter(CultureInfo.InvariantCulture)) + using (MemoryStream memoryStream = new MemoryStream()) { - JsonWriter writer = new JsonWriter(stringWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetDescription()) + using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) { - context.Writer.WritePropertyName("description"); - context.Writer.Write(publicRequest.Description); + JsonWriter writer = new JsonWriter(streamWriter); + writer.Validate = false; + writer.WriteObjectStart(); + var context = new JsonMarshallerContext(request, writer); + if(publicRequest.IsSetDescription()) + { + context.Writer.WritePropertyName("description"); + context.Writer.Write(publicRequest.Description); + } + + writer.WriteObjectEnd(); } - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); + request.Content = memoryStream.ToArray(); } diff --git a/sdk/src/Services/SupplyChain/Generated/Model/Internal/MarshallTransformations/UpdateInstanceRequestMarshaller.cs b/sdk/src/Services/SupplyChain/Generated/Model/Internal/MarshallTransformations/UpdateInstanceRequestMarshaller.cs index 7d2947c796bc..99074b338c79 100644 --- a/sdk/src/Services/SupplyChain/Generated/Model/Internal/MarshallTransformations/UpdateInstanceRequestMarshaller.cs +++ b/sdk/src/Services/SupplyChain/Generated/Model/Internal/MarshallTransformations/UpdateInstanceRequestMarshaller.cs @@ -64,27 +64,30 @@ public IRequest Marshall(UpdateInstanceRequest publicRequest) throw new AmazonSupplyChainException("Request object does not have required field InstanceId set"); request.AddPathResource("{instanceId}", StringUtils.FromString(publicRequest.InstanceId)); request.ResourcePath = "/api/instance/{instanceId}"; - using (StringWriter stringWriter = new StringWriter(CultureInfo.InvariantCulture)) + using (MemoryStream memoryStream = new MemoryStream()) { - JsonWriter writer = new JsonWriter(stringWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetInstanceDescription()) + using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) { - context.Writer.WritePropertyName("instanceDescription"); - context.Writer.Write(publicRequest.InstanceDescription); - } + JsonWriter writer = new JsonWriter(streamWriter); + writer.Validate = false; + writer.WriteObjectStart(); + var context = new JsonMarshallerContext(request, writer); + if(publicRequest.IsSetInstanceDescription()) + { + context.Writer.WritePropertyName("instanceDescription"); + context.Writer.Write(publicRequest.InstanceDescription); + } - if(publicRequest.IsSetInstanceName()) - { - context.Writer.WritePropertyName("instanceName"); - context.Writer.Write(publicRequest.InstanceName); + if(publicRequest.IsSetInstanceName()) + { + context.Writer.WritePropertyName("instanceName"); + context.Writer.Write(publicRequest.InstanceName); + } + + writer.WriteObjectEnd(); } - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); + request.Content = memoryStream.ToArray(); } diff --git a/sdk/src/Services/SupplyChain/Generated/Model/ListDataIntegrationFlowsRequest.cs b/sdk/src/Services/SupplyChain/Generated/Model/ListDataIntegrationFlowsRequest.cs index 33be844b206b..8bdd69f06d4a 100644 --- a/sdk/src/Services/SupplyChain/Generated/Model/ListDataIntegrationFlowsRequest.cs +++ b/sdk/src/Services/SupplyChain/Generated/Model/ListDataIntegrationFlowsRequest.cs @@ -66,9 +66,9 @@ internal bool IsSetInstanceId() /// ///             [AWSProperty(Min=0, Max=20)] - public int MaxResults + public int? MaxResults { - get { return this._maxResults.GetValueOrDefault(); } + get { return this._maxResults; } set { this._maxResults = value; } } diff --git a/sdk/src/Services/SupplyChain/Generated/Model/ListDataLakeDatasetsRequest.cs b/sdk/src/Services/SupplyChain/Generated/Model/ListDataLakeDatasetsRequest.cs index 5c27682c05eb..662a51cb967a 100644 --- a/sdk/src/Services/SupplyChain/Generated/Model/ListDataLakeDatasetsRequest.cs +++ b/sdk/src/Services/SupplyChain/Generated/Model/ListDataLakeDatasetsRequest.cs @@ -68,9 +68,9 @@ internal bool IsSetInstanceId() ///             ///             [AWSProperty(Min=0, Max=20)] - public int MaxResults + public int? MaxResults { - get { return this._maxResults.GetValueOrDefault(); } + get { return this._maxResults; } set { this._maxResults = value; } } diff --git a/sdk/src/Services/SupplyChain/Generated/Model/ListInstancesRequest.cs b/sdk/src/Services/SupplyChain/Generated/Model/ListInstancesRequest.cs index 039520ed0edc..8201f142610c 100644 --- a/sdk/src/Services/SupplyChain/Generated/Model/ListInstancesRequest.cs +++ b/sdk/src/Services/SupplyChain/Generated/Model/ListInstancesRequest.cs @@ -87,9 +87,9 @@ internal bool IsSetInstanceStateFilter() /// ///             [AWSProperty(Min=0, Max=20)] - public int MaxResults + public int? MaxResults { - get { return this._maxResults.GetValueOrDefault(); } + get { return this._maxResults; } set { this._maxResults = value; } } diff --git a/sdk/src/Services/SupplyChain/Generated/Model/_bcl45+netstandard/IListDataIntegrationFlowsPaginator.cs b/sdk/src/Services/SupplyChain/Generated/Model/_bcl+netstandard/IListDataIntegrationFlowsPaginator.cs similarity index 100% rename from sdk/src/Services/SupplyChain/Generated/Model/_bcl45+netstandard/IListDataIntegrationFlowsPaginator.cs rename to sdk/src/Services/SupplyChain/Generated/Model/_bcl+netstandard/IListDataIntegrationFlowsPaginator.cs diff --git a/sdk/src/Services/SupplyChain/Generated/Model/_bcl45+netstandard/IListDataLakeDatasetsPaginator.cs b/sdk/src/Services/SupplyChain/Generated/Model/_bcl+netstandard/IListDataLakeDatasetsPaginator.cs similarity index 100% rename from sdk/src/Services/SupplyChain/Generated/Model/_bcl45+netstandard/IListDataLakeDatasetsPaginator.cs rename to sdk/src/Services/SupplyChain/Generated/Model/_bcl+netstandard/IListDataLakeDatasetsPaginator.cs diff --git a/sdk/src/Services/SupplyChain/Generated/Model/_bcl45+netstandard/IListInstancesPaginator.cs b/sdk/src/Services/SupplyChain/Generated/Model/_bcl+netstandard/IListInstancesPaginator.cs similarity index 100% rename from sdk/src/Services/SupplyChain/Generated/Model/_bcl45+netstandard/IListInstancesPaginator.cs rename to sdk/src/Services/SupplyChain/Generated/Model/_bcl+netstandard/IListInstancesPaginator.cs diff --git a/sdk/src/Services/SupplyChain/Generated/Model/_bcl45+netstandard/ISupplyChainPaginatorFactory.cs b/sdk/src/Services/SupplyChain/Generated/Model/_bcl+netstandard/ISupplyChainPaginatorFactory.cs similarity index 100% rename from sdk/src/Services/SupplyChain/Generated/Model/_bcl45+netstandard/ISupplyChainPaginatorFactory.cs rename to sdk/src/Services/SupplyChain/Generated/Model/_bcl+netstandard/ISupplyChainPaginatorFactory.cs diff --git a/sdk/src/Services/SupplyChain/Generated/Model/_bcl45+netstandard/ListDataIntegrationFlowsPaginator.cs b/sdk/src/Services/SupplyChain/Generated/Model/_bcl+netstandard/ListDataIntegrationFlowsPaginator.cs similarity index 100% rename from sdk/src/Services/SupplyChain/Generated/Model/_bcl45+netstandard/ListDataIntegrationFlowsPaginator.cs rename to sdk/src/Services/SupplyChain/Generated/Model/_bcl+netstandard/ListDataIntegrationFlowsPaginator.cs diff --git a/sdk/src/Services/SupplyChain/Generated/Model/_bcl45+netstandard/ListDataLakeDatasetsPaginator.cs b/sdk/src/Services/SupplyChain/Generated/Model/_bcl+netstandard/ListDataLakeDatasetsPaginator.cs similarity index 100% rename from sdk/src/Services/SupplyChain/Generated/Model/_bcl45+netstandard/ListDataLakeDatasetsPaginator.cs rename to sdk/src/Services/SupplyChain/Generated/Model/_bcl+netstandard/ListDataLakeDatasetsPaginator.cs diff --git a/sdk/src/Services/SupplyChain/Generated/Model/_bcl45+netstandard/ListInstancesPaginator.cs b/sdk/src/Services/SupplyChain/Generated/Model/_bcl+netstandard/ListInstancesPaginator.cs similarity index 100% rename from sdk/src/Services/SupplyChain/Generated/Model/_bcl45+netstandard/ListInstancesPaginator.cs rename to sdk/src/Services/SupplyChain/Generated/Model/_bcl+netstandard/ListInstancesPaginator.cs diff --git a/sdk/src/Services/SupplyChain/Generated/Model/_bcl45+netstandard/SupplyChainPaginatorFactory.cs b/sdk/src/Services/SupplyChain/Generated/Model/_bcl+netstandard/SupplyChainPaginatorFactory.cs similarity index 100% rename from sdk/src/Services/SupplyChain/Generated/Model/_bcl45+netstandard/SupplyChainPaginatorFactory.cs rename to sdk/src/Services/SupplyChain/Generated/Model/_bcl+netstandard/SupplyChainPaginatorFactory.cs diff --git a/sdk/src/Services/SupplyChain/Generated/_bcl/AmazonSupplyChainClient.cs b/sdk/src/Services/SupplyChain/Generated/_bcl/AmazonSupplyChainClient.cs index e0d8f6821b65..3f87d6c9ade4 100644 --- a/sdk/src/Services/SupplyChain/Generated/_bcl/AmazonSupplyChainClient.cs +++ b/sdk/src/Services/SupplyChain/Generated/_bcl/AmazonSupplyChainClient.cs @@ -60,6 +60,22 @@ namespace Amazon.SupplyChain public partial class AmazonSupplyChainClient : AmazonServiceClient, IAmazonSupplyChain { private static IServiceMetadata serviceMetadata = new AmazonSupplyChainMetadata(); + private ISupplyChainPaginatorFactory _paginators; + + /// + /// Paginators for the service + /// + public ISupplyChainPaginatorFactory Paginators + { + get + { + if (this._paginators == null) + { + this._paginators = new SupplyChainPaginatorFactory(this); + } + return this._paginators; + } + } #region Constructors /// @@ -365,15 +381,18 @@ public virtual CreateBillOfMaterialsImportJobResponse CreateBillOfMaterialsImpor #endregion - #region GetBillOfMaterialsImportJob + #region CreateDataIntegrationFlow /// - /// Get status and details of a BillOfMaterialsImportJob. + /// Enables you to programmatically create a data pipeline to ingest data from source + /// systems such as Amazon S3 buckets, to a predefined Amazon Web Services Supply Chain + /// dataset (product, inbound_order) or a temporary dataset along with the data transformation + /// query provided with the API. /// - /// Container for the necessary parameters to execute the GetBillOfMaterialsImportJob service method. + /// Container for the necessary parameters to execute the CreateDataIntegrationFlow service method. /// - /// The response from the GetBillOfMaterialsImportJob service method, as returned by SupplyChain. + /// The response from the CreateDataIntegrationFlow service method, as returned by SupplyChain. /// /// You do not have the required privileges to perform this action. /// @@ -395,26 +414,29 @@ public virtual CreateBillOfMaterialsImportJobResponse CreateBillOfMaterialsImpor /// /// The input does not satisfy the constraints specified by an AWS service. /// - /// REST API Reference for GetBillOfMaterialsImportJob Operation - public virtual GetBillOfMaterialsImportJobResponse GetBillOfMaterialsImportJob(GetBillOfMaterialsImportJobRequest request) + /// REST API Reference for CreateDataIntegrationFlow Operation + public virtual CreateDataIntegrationFlowResponse CreateDataIntegrationFlow(CreateDataIntegrationFlowRequest request) { var options = new InvokeOptions(); - options.RequestMarshaller = GetBillOfMaterialsImportJobRequestMarshaller.Instance; - options.ResponseUnmarshaller = GetBillOfMaterialsImportJobResponseUnmarshaller.Instance; + options.RequestMarshaller = CreateDataIntegrationFlowRequestMarshaller.Instance; + options.ResponseUnmarshaller = CreateDataIntegrationFlowResponseUnmarshaller.Instance; - return Invoke(request, options); + return Invoke(request, options); } /// - /// Get status and details of a BillOfMaterialsImportJob. + /// Enables you to programmatically create a data pipeline to ingest data from source + /// systems such as Amazon S3 buckets, to a predefined Amazon Web Services Supply Chain + /// dataset (product, inbound_order) or a temporary dataset along with the data transformation + /// query provided with the API. /// - /// Container for the necessary parameters to execute the GetBillOfMaterialsImportJob service method. + /// Container for the necessary parameters to execute the CreateDataIntegrationFlow service method. /// /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// /// - /// The response from the GetBillOfMaterialsImportJob service method, as returned by SupplyChain. + /// The response from the CreateDataIntegrationFlow service method, as returned by SupplyChain. /// /// You do not have the required privileges to perform this action. /// @@ -436,31 +458,29 @@ public virtual GetBillOfMaterialsImportJobResponse GetBillOfMaterialsImportJob(G /// /// The input does not satisfy the constraints specified by an AWS service. /// - /// REST API Reference for GetBillOfMaterialsImportJob Operation - public virtual Task GetBillOfMaterialsImportJobAsync(GetBillOfMaterialsImportJobRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + /// REST API Reference for CreateDataIntegrationFlow Operation + public virtual Task CreateDataIntegrationFlowAsync(CreateDataIntegrationFlowRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { var options = new InvokeOptions(); - options.RequestMarshaller = GetBillOfMaterialsImportJobRequestMarshaller.Instance; - options.ResponseUnmarshaller = GetBillOfMaterialsImportJobResponseUnmarshaller.Instance; + options.RequestMarshaller = CreateDataIntegrationFlowRequestMarshaller.Instance; + options.ResponseUnmarshaller = CreateDataIntegrationFlowResponseUnmarshaller.Instance; - return InvokeAsync(request, options, cancellationToken); + return InvokeAsync(request, options, cancellationToken); } #endregion - #region SendDataIntegrationEvent + #region CreateDataLakeDataset /// - /// Send the transactional data payload for the event with real-time data for analysis - /// or monitoring. The real-time data events are stored in an Amazon Web Services service - /// before being processed and stored in data lake. New data events are synced with data - /// lake at 5 PM GMT everyday. The updated transactional data is available in data lake - /// after ingestion. + /// Enables you to programmatically create an Amazon Web Services Supply Chain data lake + /// dataset. Developers can create the datasets using their pre-defined or custom schema + /// for a given instance ID, namespace, and dataset name. /// - /// Container for the necessary parameters to execute the SendDataIntegrationEvent service method. + /// Container for the necessary parameters to execute the CreateDataLakeDataset service method. /// - /// The response from the SendDataIntegrationEvent service method, as returned by SupplyChain. + /// The response from the CreateDataLakeDataset service method, as returned by SupplyChain. /// /// You do not have the required privileges to perform this action. /// @@ -482,30 +502,28 @@ public virtual GetBillOfMaterialsImportJobResponse GetBillOfMaterialsImportJob(G /// /// The input does not satisfy the constraints specified by an AWS service. /// - /// REST API Reference for SendDataIntegrationEvent Operation - public virtual SendDataIntegrationEventResponse SendDataIntegrationEvent(SendDataIntegrationEventRequest request) + /// REST API Reference for CreateDataLakeDataset Operation + public virtual CreateDataLakeDatasetResponse CreateDataLakeDataset(CreateDataLakeDatasetRequest request) { var options = new InvokeOptions(); - options.RequestMarshaller = SendDataIntegrationEventRequestMarshaller.Instance; - options.ResponseUnmarshaller = SendDataIntegrationEventResponseUnmarshaller.Instance; + options.RequestMarshaller = CreateDataLakeDatasetRequestMarshaller.Instance; + options.ResponseUnmarshaller = CreateDataLakeDatasetResponseUnmarshaller.Instance; - return Invoke(request, options); + return Invoke(request, options); } /// - /// Send the transactional data payload for the event with real-time data for analysis - /// or monitoring. The real-time data events are stored in an Amazon Web Services service - /// before being processed and stored in data lake. New data events are synced with data - /// lake at 5 PM GMT everyday. The updated transactional data is available in data lake - /// after ingestion. + /// Enables you to programmatically create an Amazon Web Services Supply Chain data lake + /// dataset. Developers can create the datasets using their pre-defined or custom schema + /// for a given instance ID, namespace, and dataset name. /// - /// Container for the necessary parameters to execute the SendDataIntegrationEvent service method. + /// Container for the necessary parameters to execute the CreateDataLakeDataset service method. /// /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// /// - /// The response from the SendDataIntegrationEvent service method, as returned by SupplyChain. + /// The response from the CreateDataLakeDataset service method, as returned by SupplyChain. /// /// You do not have the required privileges to perform this action. /// @@ -527,14 +545,1622 @@ public virtual SendDataIntegrationEventResponse SendDataIntegrationEvent(SendDat /// /// The input does not satisfy the constraints specified by an AWS service. /// - /// REST API Reference for SendDataIntegrationEvent Operation - public virtual Task SendDataIntegrationEventAsync(SendDataIntegrationEventRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + /// REST API Reference for CreateDataLakeDataset Operation + public virtual Task CreateDataLakeDatasetAsync(CreateDataLakeDatasetRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) { var options = new InvokeOptions(); - options.RequestMarshaller = SendDataIntegrationEventRequestMarshaller.Instance; - options.ResponseUnmarshaller = SendDataIntegrationEventResponseUnmarshaller.Instance; + options.RequestMarshaller = CreateDataLakeDatasetRequestMarshaller.Instance; + options.ResponseUnmarshaller = CreateDataLakeDatasetResponseUnmarshaller.Instance; - return InvokeAsync(request, options, cancellationToken); + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + + #region CreateInstance + + + /// + /// Enables you to programmatically create an Amazon Web Services Supply Chain instance + /// by applying KMS keys and relevant information associated with the API without using + /// the Amazon Web Services console. + /// + /// + /// + /// This is an asynchronous operation. Upon receiving a CreateInstance request, Amazon + /// Web Services Supply Chain immediately returns the instance resource, instance ID, + /// and the initializing state while simultaneously creating all required Amazon Web Services + /// resources for an instance creation. You can use GetInstance to check the status of + /// the instance. If the instance results in an unhealthy state, you need to check the + /// error message, delete the current instance, and recreate a new one based on the mitigation + /// from the error message. + /// + /// + /// Container for the necessary parameters to execute the CreateInstance service method. + /// + /// The response from the CreateInstance service method, as returned by SupplyChain. + /// + /// You do not have the required privileges to perform this action. + /// + /// + /// Updating or deleting a resource can cause an inconsistent state. + /// + /// + /// Unexpected error during processing of request. + /// + /// + /// Request references a resource which does not exist. + /// + /// + /// Request would cause a service quota to be exceeded. + /// + /// + /// Request was denied due to request throttling. + /// + /// + /// The input does not satisfy the constraints specified by an AWS service. + /// + /// REST API Reference for CreateInstance Operation + public virtual CreateInstanceResponse CreateInstance(CreateInstanceRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = CreateInstanceRequestMarshaller.Instance; + options.ResponseUnmarshaller = CreateInstanceResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// Enables you to programmatically create an Amazon Web Services Supply Chain instance + /// by applying KMS keys and relevant information associated with the API without using + /// the Amazon Web Services console. + /// + /// + /// + /// This is an asynchronous operation. Upon receiving a CreateInstance request, Amazon + /// Web Services Supply Chain immediately returns the instance resource, instance ID, + /// and the initializing state while simultaneously creating all required Amazon Web Services + /// resources for an instance creation. You can use GetInstance to check the status of + /// the instance. If the instance results in an unhealthy state, you need to check the + /// error message, delete the current instance, and recreate a new one based on the mitigation + /// from the error message. + /// + /// + /// Container for the necessary parameters to execute the CreateInstance service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the CreateInstance service method, as returned by SupplyChain. + /// + /// You do not have the required privileges to perform this action. + /// + /// + /// Updating or deleting a resource can cause an inconsistent state. + /// + /// + /// Unexpected error during processing of request. + /// + /// + /// Request references a resource which does not exist. + /// + /// + /// Request would cause a service quota to be exceeded. + /// + /// + /// Request was denied due to request throttling. + /// + /// + /// The input does not satisfy the constraints specified by an AWS service. + /// + /// REST API Reference for CreateInstance Operation + public virtual Task CreateInstanceAsync(CreateInstanceRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = CreateInstanceRequestMarshaller.Instance; + options.ResponseUnmarshaller = CreateInstanceResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + + #region DeleteDataIntegrationFlow + + + /// + /// Enable you to programmatically delete an existing data pipeline for the provided Amazon + /// Web Services Supply Chain instance and DataIntegrationFlow name. + /// + /// Container for the necessary parameters to execute the DeleteDataIntegrationFlow service method. + /// + /// The response from the DeleteDataIntegrationFlow service method, as returned by SupplyChain. + /// + /// You do not have the required privileges to perform this action. + /// + /// + /// Updating or deleting a resource can cause an inconsistent state. + /// + /// + /// Unexpected error during processing of request. + /// + /// + /// Request references a resource which does not exist. + /// + /// + /// Request would cause a service quota to be exceeded. + /// + /// + /// Request was denied due to request throttling. + /// + /// + /// The input does not satisfy the constraints specified by an AWS service. + /// + /// REST API Reference for DeleteDataIntegrationFlow Operation + public virtual DeleteDataIntegrationFlowResponse DeleteDataIntegrationFlow(DeleteDataIntegrationFlowRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = DeleteDataIntegrationFlowRequestMarshaller.Instance; + options.ResponseUnmarshaller = DeleteDataIntegrationFlowResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// Enable you to programmatically delete an existing data pipeline for the provided Amazon + /// Web Services Supply Chain instance and DataIntegrationFlow name. + /// + /// Container for the necessary parameters to execute the DeleteDataIntegrationFlow service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the DeleteDataIntegrationFlow service method, as returned by SupplyChain. + /// + /// You do not have the required privileges to perform this action. + /// + /// + /// Updating or deleting a resource can cause an inconsistent state. + /// + /// + /// Unexpected error during processing of request. + /// + /// + /// Request references a resource which does not exist. + /// + /// + /// Request would cause a service quota to be exceeded. + /// + /// + /// Request was denied due to request throttling. + /// + /// + /// The input does not satisfy the constraints specified by an AWS service. + /// + /// REST API Reference for DeleteDataIntegrationFlow Operation + public virtual Task DeleteDataIntegrationFlowAsync(DeleteDataIntegrationFlowRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = DeleteDataIntegrationFlowRequestMarshaller.Instance; + options.ResponseUnmarshaller = DeleteDataIntegrationFlowResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + + #region DeleteDataLakeDataset + + + /// + /// Enables you to programmatically delete an Amazon Web Services Supply Chain data lake + /// dataset. Developers can delete the existing datasets for a given instance ID, namespace, + /// and instance name. + /// + /// Container for the necessary parameters to execute the DeleteDataLakeDataset service method. + /// + /// The response from the DeleteDataLakeDataset service method, as returned by SupplyChain. + /// + /// You do not have the required privileges to perform this action. + /// + /// + /// Updating or deleting a resource can cause an inconsistent state. + /// + /// + /// Unexpected error during processing of request. + /// + /// + /// Request references a resource which does not exist. + /// + /// + /// Request would cause a service quota to be exceeded. + /// + /// + /// Request was denied due to request throttling. + /// + /// + /// The input does not satisfy the constraints specified by an AWS service. + /// + /// REST API Reference for DeleteDataLakeDataset Operation + public virtual DeleteDataLakeDatasetResponse DeleteDataLakeDataset(DeleteDataLakeDatasetRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = DeleteDataLakeDatasetRequestMarshaller.Instance; + options.ResponseUnmarshaller = DeleteDataLakeDatasetResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// Enables you to programmatically delete an Amazon Web Services Supply Chain data lake + /// dataset. Developers can delete the existing datasets for a given instance ID, namespace, + /// and instance name. + /// + /// Container for the necessary parameters to execute the DeleteDataLakeDataset service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the DeleteDataLakeDataset service method, as returned by SupplyChain. + /// + /// You do not have the required privileges to perform this action. + /// + /// + /// Updating or deleting a resource can cause an inconsistent state. + /// + /// + /// Unexpected error during processing of request. + /// + /// + /// Request references a resource which does not exist. + /// + /// + /// Request would cause a service quota to be exceeded. + /// + /// + /// Request was denied due to request throttling. + /// + /// + /// The input does not satisfy the constraints specified by an AWS service. + /// + /// REST API Reference for DeleteDataLakeDataset Operation + public virtual Task DeleteDataLakeDatasetAsync(DeleteDataLakeDatasetRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = DeleteDataLakeDatasetRequestMarshaller.Instance; + options.ResponseUnmarshaller = DeleteDataLakeDatasetResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + + #region DeleteInstance + + + /// + /// Enables you to programmatically delete an Amazon Web Services Supply Chain instance + /// by deleting the KMS keys and relevant information associated with the API without + /// using the Amazon Web Services console. + /// + /// + /// + /// This is an asynchronous operation. Upon receiving a DeleteInstance request, Amazon + /// Web Services Supply Chain immediately returns a response with the instance resource, + /// delete state while cleaning up all Amazon Web Services resources created during the + /// instance creation process. You can use the GetInstance action to check the instance + /// status. + /// + /// + /// Container for the necessary parameters to execute the DeleteInstance service method. + /// + /// The response from the DeleteInstance service method, as returned by SupplyChain. + /// + /// You do not have the required privileges to perform this action. + /// + /// + /// Updating or deleting a resource can cause an inconsistent state. + /// + /// + /// Unexpected error during processing of request. + /// + /// + /// Request references a resource which does not exist. + /// + /// + /// Request would cause a service quota to be exceeded. + /// + /// + /// Request was denied due to request throttling. + /// + /// + /// The input does not satisfy the constraints specified by an AWS service. + /// + /// REST API Reference for DeleteInstance Operation + public virtual DeleteInstanceResponse DeleteInstance(DeleteInstanceRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = DeleteInstanceRequestMarshaller.Instance; + options.ResponseUnmarshaller = DeleteInstanceResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// Enables you to programmatically delete an Amazon Web Services Supply Chain instance + /// by deleting the KMS keys and relevant information associated with the API without + /// using the Amazon Web Services console. + /// + /// + /// + /// This is an asynchronous operation. Upon receiving a DeleteInstance request, Amazon + /// Web Services Supply Chain immediately returns a response with the instance resource, + /// delete state while cleaning up all Amazon Web Services resources created during the + /// instance creation process. You can use the GetInstance action to check the instance + /// status. + /// + /// + /// Container for the necessary parameters to execute the DeleteInstance service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the DeleteInstance service method, as returned by SupplyChain. + /// + /// You do not have the required privileges to perform this action. + /// + /// + /// Updating or deleting a resource can cause an inconsistent state. + /// + /// + /// Unexpected error during processing of request. + /// + /// + /// Request references a resource which does not exist. + /// + /// + /// Request would cause a service quota to be exceeded. + /// + /// + /// Request was denied due to request throttling. + /// + /// + /// The input does not satisfy the constraints specified by an AWS service. + /// + /// REST API Reference for DeleteInstance Operation + public virtual Task DeleteInstanceAsync(DeleteInstanceRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = DeleteInstanceRequestMarshaller.Instance; + options.ResponseUnmarshaller = DeleteInstanceResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + + #region GetBillOfMaterialsImportJob + + + /// + /// Get status and details of a BillOfMaterialsImportJob. + /// + /// Container for the necessary parameters to execute the GetBillOfMaterialsImportJob service method. + /// + /// The response from the GetBillOfMaterialsImportJob service method, as returned by SupplyChain. + /// + /// You do not have the required privileges to perform this action. + /// + /// + /// Updating or deleting a resource can cause an inconsistent state. + /// + /// + /// Unexpected error during processing of request. + /// + /// + /// Request references a resource which does not exist. + /// + /// + /// Request would cause a service quota to be exceeded. + /// + /// + /// Request was denied due to request throttling. + /// + /// + /// The input does not satisfy the constraints specified by an AWS service. + /// + /// REST API Reference for GetBillOfMaterialsImportJob Operation + public virtual GetBillOfMaterialsImportJobResponse GetBillOfMaterialsImportJob(GetBillOfMaterialsImportJobRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = GetBillOfMaterialsImportJobRequestMarshaller.Instance; + options.ResponseUnmarshaller = GetBillOfMaterialsImportJobResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// Get status and details of a BillOfMaterialsImportJob. + /// + /// Container for the necessary parameters to execute the GetBillOfMaterialsImportJob service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the GetBillOfMaterialsImportJob service method, as returned by SupplyChain. + /// + /// You do not have the required privileges to perform this action. + /// + /// + /// Updating or deleting a resource can cause an inconsistent state. + /// + /// + /// Unexpected error during processing of request. + /// + /// + /// Request references a resource which does not exist. + /// + /// + /// Request would cause a service quota to be exceeded. + /// + /// + /// Request was denied due to request throttling. + /// + /// + /// The input does not satisfy the constraints specified by an AWS service. + /// + /// REST API Reference for GetBillOfMaterialsImportJob Operation + public virtual Task GetBillOfMaterialsImportJobAsync(GetBillOfMaterialsImportJobRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = GetBillOfMaterialsImportJobRequestMarshaller.Instance; + options.ResponseUnmarshaller = GetBillOfMaterialsImportJobResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + + #region GetDataIntegrationFlow + + + /// + /// Enables you to programmatically view a specific data pipeline for the provided Amazon + /// Web Services Supply Chain instance and DataIntegrationFlow name. + /// + /// Container for the necessary parameters to execute the GetDataIntegrationFlow service method. + /// + /// The response from the GetDataIntegrationFlow service method, as returned by SupplyChain. + /// + /// You do not have the required privileges to perform this action. + /// + /// + /// Updating or deleting a resource can cause an inconsistent state. + /// + /// + /// Unexpected error during processing of request. + /// + /// + /// Request references a resource which does not exist. + /// + /// + /// Request would cause a service quota to be exceeded. + /// + /// + /// Request was denied due to request throttling. + /// + /// + /// The input does not satisfy the constraints specified by an AWS service. + /// + /// REST API Reference for GetDataIntegrationFlow Operation + public virtual GetDataIntegrationFlowResponse GetDataIntegrationFlow(GetDataIntegrationFlowRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = GetDataIntegrationFlowRequestMarshaller.Instance; + options.ResponseUnmarshaller = GetDataIntegrationFlowResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// Enables you to programmatically view a specific data pipeline for the provided Amazon + /// Web Services Supply Chain instance and DataIntegrationFlow name. + /// + /// Container for the necessary parameters to execute the GetDataIntegrationFlow service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the GetDataIntegrationFlow service method, as returned by SupplyChain. + /// + /// You do not have the required privileges to perform this action. + /// + /// + /// Updating or deleting a resource can cause an inconsistent state. + /// + /// + /// Unexpected error during processing of request. + /// + /// + /// Request references a resource which does not exist. + /// + /// + /// Request would cause a service quota to be exceeded. + /// + /// + /// Request was denied due to request throttling. + /// + /// + /// The input does not satisfy the constraints specified by an AWS service. + /// + /// REST API Reference for GetDataIntegrationFlow Operation + public virtual Task GetDataIntegrationFlowAsync(GetDataIntegrationFlowRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = GetDataIntegrationFlowRequestMarshaller.Instance; + options.ResponseUnmarshaller = GetDataIntegrationFlowResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + + #region GetDataLakeDataset + + + /// + /// Enables you to programmatically view an Amazon Web Services Supply Chain data lake + /// dataset. Developers can view the data lake dataset information such as namespace, + /// schema, and so on for a given instance ID, namespace, and dataset name. + /// + /// Container for the necessary parameters to execute the GetDataLakeDataset service method. + /// + /// The response from the GetDataLakeDataset service method, as returned by SupplyChain. + /// + /// You do not have the required privileges to perform this action. + /// + /// + /// Updating or deleting a resource can cause an inconsistent state. + /// + /// + /// Unexpected error during processing of request. + /// + /// + /// Request references a resource which does not exist. + /// + /// + /// Request would cause a service quota to be exceeded. + /// + /// + /// Request was denied due to request throttling. + /// + /// + /// The input does not satisfy the constraints specified by an AWS service. + /// + /// REST API Reference for GetDataLakeDataset Operation + public virtual GetDataLakeDatasetResponse GetDataLakeDataset(GetDataLakeDatasetRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = GetDataLakeDatasetRequestMarshaller.Instance; + options.ResponseUnmarshaller = GetDataLakeDatasetResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// Enables you to programmatically view an Amazon Web Services Supply Chain data lake + /// dataset. Developers can view the data lake dataset information such as namespace, + /// schema, and so on for a given instance ID, namespace, and dataset name. + /// + /// Container for the necessary parameters to execute the GetDataLakeDataset service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the GetDataLakeDataset service method, as returned by SupplyChain. + /// + /// You do not have the required privileges to perform this action. + /// + /// + /// Updating or deleting a resource can cause an inconsistent state. + /// + /// + /// Unexpected error during processing of request. + /// + /// + /// Request references a resource which does not exist. + /// + /// + /// Request would cause a service quota to be exceeded. + /// + /// + /// Request was denied due to request throttling. + /// + /// + /// The input does not satisfy the constraints specified by an AWS service. + /// + /// REST API Reference for GetDataLakeDataset Operation + public virtual Task GetDataLakeDatasetAsync(GetDataLakeDatasetRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = GetDataLakeDatasetRequestMarshaller.Instance; + options.ResponseUnmarshaller = GetDataLakeDatasetResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + + #region GetInstance + + + /// + /// Enables you to programmatically retrieve the information related to an Amazon Web + /// Services Supply Chain instance ID. + /// + /// Container for the necessary parameters to execute the GetInstance service method. + /// + /// The response from the GetInstance service method, as returned by SupplyChain. + /// + /// You do not have the required privileges to perform this action. + /// + /// + /// Updating or deleting a resource can cause an inconsistent state. + /// + /// + /// Unexpected error during processing of request. + /// + /// + /// Request references a resource which does not exist. + /// + /// + /// Request would cause a service quota to be exceeded. + /// + /// + /// Request was denied due to request throttling. + /// + /// + /// The input does not satisfy the constraints specified by an AWS service. + /// + /// REST API Reference for GetInstance Operation + public virtual GetInstanceResponse GetInstance(GetInstanceRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = GetInstanceRequestMarshaller.Instance; + options.ResponseUnmarshaller = GetInstanceResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// Enables you to programmatically retrieve the information related to an Amazon Web + /// Services Supply Chain instance ID. + /// + /// Container for the necessary parameters to execute the GetInstance service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the GetInstance service method, as returned by SupplyChain. + /// + /// You do not have the required privileges to perform this action. + /// + /// + /// Updating or deleting a resource can cause an inconsistent state. + /// + /// + /// Unexpected error during processing of request. + /// + /// + /// Request references a resource which does not exist. + /// + /// + /// Request would cause a service quota to be exceeded. + /// + /// + /// Request was denied due to request throttling. + /// + /// + /// The input does not satisfy the constraints specified by an AWS service. + /// + /// REST API Reference for GetInstance Operation + public virtual Task GetInstanceAsync(GetInstanceRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = GetInstanceRequestMarshaller.Instance; + options.ResponseUnmarshaller = GetInstanceResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + + #region ListDataIntegrationFlows + + + /// + /// Enables you to programmatically list all data pipelines for the provided Amazon Web + /// Services Supply Chain instance. + /// + /// Container for the necessary parameters to execute the ListDataIntegrationFlows service method. + /// + /// The response from the ListDataIntegrationFlows service method, as returned by SupplyChain. + /// + /// You do not have the required privileges to perform this action. + /// + /// + /// Updating or deleting a resource can cause an inconsistent state. + /// + /// + /// Unexpected error during processing of request. + /// + /// + /// Request references a resource which does not exist. + /// + /// + /// Request would cause a service quota to be exceeded. + /// + /// + /// Request was denied due to request throttling. + /// + /// + /// The input does not satisfy the constraints specified by an AWS service. + /// + /// REST API Reference for ListDataIntegrationFlows Operation + public virtual ListDataIntegrationFlowsResponse ListDataIntegrationFlows(ListDataIntegrationFlowsRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = ListDataIntegrationFlowsRequestMarshaller.Instance; + options.ResponseUnmarshaller = ListDataIntegrationFlowsResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// Enables you to programmatically list all data pipelines for the provided Amazon Web + /// Services Supply Chain instance. + /// + /// Container for the necessary parameters to execute the ListDataIntegrationFlows service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the ListDataIntegrationFlows service method, as returned by SupplyChain. + /// + /// You do not have the required privileges to perform this action. + /// + /// + /// Updating or deleting a resource can cause an inconsistent state. + /// + /// + /// Unexpected error during processing of request. + /// + /// + /// Request references a resource which does not exist. + /// + /// + /// Request would cause a service quota to be exceeded. + /// + /// + /// Request was denied due to request throttling. + /// + /// + /// The input does not satisfy the constraints specified by an AWS service. + /// + /// REST API Reference for ListDataIntegrationFlows Operation + public virtual Task ListDataIntegrationFlowsAsync(ListDataIntegrationFlowsRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = ListDataIntegrationFlowsRequestMarshaller.Instance; + options.ResponseUnmarshaller = ListDataIntegrationFlowsResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + + #region ListDataLakeDatasets + + + /// + /// Enables you to programmatically view the list of Amazon Web Services Supply Chain + /// data lake datasets. Developers can view the datasets and the corresponding information + /// such as namespace, schema, and so on for a given instance ID and namespace. + /// + /// Container for the necessary parameters to execute the ListDataLakeDatasets service method. + /// + /// The response from the ListDataLakeDatasets service method, as returned by SupplyChain. + /// + /// You do not have the required privileges to perform this action. + /// + /// + /// Updating or deleting a resource can cause an inconsistent state. + /// + /// + /// Unexpected error during processing of request. + /// + /// + /// Request references a resource which does not exist. + /// + /// + /// Request would cause a service quota to be exceeded. + /// + /// + /// Request was denied due to request throttling. + /// + /// + /// The input does not satisfy the constraints specified by an AWS service. + /// + /// REST API Reference for ListDataLakeDatasets Operation + public virtual ListDataLakeDatasetsResponse ListDataLakeDatasets(ListDataLakeDatasetsRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = ListDataLakeDatasetsRequestMarshaller.Instance; + options.ResponseUnmarshaller = ListDataLakeDatasetsResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// Enables you to programmatically view the list of Amazon Web Services Supply Chain + /// data lake datasets. Developers can view the datasets and the corresponding information + /// such as namespace, schema, and so on for a given instance ID and namespace. + /// + /// Container for the necessary parameters to execute the ListDataLakeDatasets service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the ListDataLakeDatasets service method, as returned by SupplyChain. + /// + /// You do not have the required privileges to perform this action. + /// + /// + /// Updating or deleting a resource can cause an inconsistent state. + /// + /// + /// Unexpected error during processing of request. + /// + /// + /// Request references a resource which does not exist. + /// + /// + /// Request would cause a service quota to be exceeded. + /// + /// + /// Request was denied due to request throttling. + /// + /// + /// The input does not satisfy the constraints specified by an AWS service. + /// + /// REST API Reference for ListDataLakeDatasets Operation + public virtual Task ListDataLakeDatasetsAsync(ListDataLakeDatasetsRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = ListDataLakeDatasetsRequestMarshaller.Instance; + options.ResponseUnmarshaller = ListDataLakeDatasetsResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + + #region ListInstances + + + /// + /// List all Amazon Web Services Supply Chain instances for a specific account. Enables + /// you to programmatically list all Amazon Web Services Supply Chain instances based + /// on their account ID, instance name, and state of the instance (active or delete). + /// + /// Container for the necessary parameters to execute the ListInstances service method. + /// + /// The response from the ListInstances service method, as returned by SupplyChain. + /// + /// You do not have the required privileges to perform this action. + /// + /// + /// Updating or deleting a resource can cause an inconsistent state. + /// + /// + /// Unexpected error during processing of request. + /// + /// + /// Request references a resource which does not exist. + /// + /// + /// Request would cause a service quota to be exceeded. + /// + /// + /// Request was denied due to request throttling. + /// + /// + /// The input does not satisfy the constraints specified by an AWS service. + /// + /// REST API Reference for ListInstances Operation + public virtual ListInstancesResponse ListInstances(ListInstancesRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = ListInstancesRequestMarshaller.Instance; + options.ResponseUnmarshaller = ListInstancesResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// List all Amazon Web Services Supply Chain instances for a specific account. Enables + /// you to programmatically list all Amazon Web Services Supply Chain instances based + /// on their account ID, instance name, and state of the instance (active or delete). + /// + /// Container for the necessary parameters to execute the ListInstances service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the ListInstances service method, as returned by SupplyChain. + /// + /// You do not have the required privileges to perform this action. + /// + /// + /// Updating or deleting a resource can cause an inconsistent state. + /// + /// + /// Unexpected error during processing of request. + /// + /// + /// Request references a resource which does not exist. + /// + /// + /// Request would cause a service quota to be exceeded. + /// + /// + /// Request was denied due to request throttling. + /// + /// + /// The input does not satisfy the constraints specified by an AWS service. + /// + /// REST API Reference for ListInstances Operation + public virtual Task ListInstancesAsync(ListInstancesRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = ListInstancesRequestMarshaller.Instance; + options.ResponseUnmarshaller = ListInstancesResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + + #region ListTagsForResource + + + /// + /// List all the tags for an Amazon Web ServicesSupply Chain resource. You can list all + /// the tags added to a resource. By listing the tags, developers can view the tag level + /// information on a resource and perform actions such as, deleting a resource associated + /// with a particular tag. + /// + /// Container for the necessary parameters to execute the ListTagsForResource service method. + /// + /// The response from the ListTagsForResource service method, as returned by SupplyChain. + /// + /// You do not have the required privileges to perform this action. + /// + /// + /// Updating or deleting a resource can cause an inconsistent state. + /// + /// + /// Unexpected error during processing of request. + /// + /// + /// Request references a resource which does not exist. + /// + /// + /// Request would cause a service quota to be exceeded. + /// + /// + /// Request was denied due to request throttling. + /// + /// + /// The input does not satisfy the constraints specified by an AWS service. + /// + /// REST API Reference for ListTagsForResource Operation + public virtual ListTagsForResourceResponse ListTagsForResource(ListTagsForResourceRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = ListTagsForResourceRequestMarshaller.Instance; + options.ResponseUnmarshaller = ListTagsForResourceResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// List all the tags for an Amazon Web ServicesSupply Chain resource. You can list all + /// the tags added to a resource. By listing the tags, developers can view the tag level + /// information on a resource and perform actions such as, deleting a resource associated + /// with a particular tag. + /// + /// Container for the necessary parameters to execute the ListTagsForResource service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the ListTagsForResource service method, as returned by SupplyChain. + /// + /// You do not have the required privileges to perform this action. + /// + /// + /// Updating or deleting a resource can cause an inconsistent state. + /// + /// + /// Unexpected error during processing of request. + /// + /// + /// Request references a resource which does not exist. + /// + /// + /// Request would cause a service quota to be exceeded. + /// + /// + /// Request was denied due to request throttling. + /// + /// + /// The input does not satisfy the constraints specified by an AWS service. + /// + /// REST API Reference for ListTagsForResource Operation + public virtual Task ListTagsForResourceAsync(ListTagsForResourceRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = ListTagsForResourceRequestMarshaller.Instance; + options.ResponseUnmarshaller = ListTagsForResourceResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + + #region SendDataIntegrationEvent + + + /// + /// Send the transactional data payload for the event with real-time data for analysis + /// or monitoring. The real-time data events are stored in an Amazon Web Services service + /// before being processed and stored in data lake. New data events are synced with data + /// lake at 5 PM GMT everyday. The updated transactional data is available in data lake + /// after ingestion. + /// + /// Container for the necessary parameters to execute the SendDataIntegrationEvent service method. + /// + /// The response from the SendDataIntegrationEvent service method, as returned by SupplyChain. + /// + /// You do not have the required privileges to perform this action. + /// + /// + /// Updating or deleting a resource can cause an inconsistent state. + /// + /// + /// Unexpected error during processing of request. + /// + /// + /// Request references a resource which does not exist. + /// + /// + /// Request would cause a service quota to be exceeded. + /// + /// + /// Request was denied due to request throttling. + /// + /// + /// The input does not satisfy the constraints specified by an AWS service. + /// + /// REST API Reference for SendDataIntegrationEvent Operation + public virtual SendDataIntegrationEventResponse SendDataIntegrationEvent(SendDataIntegrationEventRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = SendDataIntegrationEventRequestMarshaller.Instance; + options.ResponseUnmarshaller = SendDataIntegrationEventResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// Send the transactional data payload for the event with real-time data for analysis + /// or monitoring. The real-time data events are stored in an Amazon Web Services service + /// before being processed and stored in data lake. New data events are synced with data + /// lake at 5 PM GMT everyday. The updated transactional data is available in data lake + /// after ingestion. + /// + /// Container for the necessary parameters to execute the SendDataIntegrationEvent service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the SendDataIntegrationEvent service method, as returned by SupplyChain. + /// + /// You do not have the required privileges to perform this action. + /// + /// + /// Updating or deleting a resource can cause an inconsistent state. + /// + /// + /// Unexpected error during processing of request. + /// + /// + /// Request references a resource which does not exist. + /// + /// + /// Request would cause a service quota to be exceeded. + /// + /// + /// Request was denied due to request throttling. + /// + /// + /// The input does not satisfy the constraints specified by an AWS service. + /// + /// REST API Reference for SendDataIntegrationEvent Operation + public virtual Task SendDataIntegrationEventAsync(SendDataIntegrationEventRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = SendDataIntegrationEventRequestMarshaller.Instance; + options.ResponseUnmarshaller = SendDataIntegrationEventResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + + #region TagResource + + + /// + /// You can create tags during or after creating a resource such as instance, data flow, + /// or dataset in AWS Supply chain. During the data ingestion process, you can add tags + /// such as dev, test, or prod to data flows created during the data ingestion process + /// in the AWS Supply Chain datasets. You can use these tags to identify a group of resources + /// or a single resource used by the developer. + /// + /// Container for the necessary parameters to execute the TagResource service method. + /// + /// The response from the TagResource service method, as returned by SupplyChain. + /// + /// You do not have the required privileges to perform this action. + /// + /// + /// Updating or deleting a resource can cause an inconsistent state. + /// + /// + /// Unexpected error during processing of request. + /// + /// + /// Request references a resource which does not exist. + /// + /// + /// Request would cause a service quota to be exceeded. + /// + /// + /// Request was denied due to request throttling. + /// + /// + /// The input does not satisfy the constraints specified by an AWS service. + /// + /// REST API Reference for TagResource Operation + public virtual TagResourceResponse TagResource(TagResourceRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = TagResourceRequestMarshaller.Instance; + options.ResponseUnmarshaller = TagResourceResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// You can create tags during or after creating a resource such as instance, data flow, + /// or dataset in AWS Supply chain. During the data ingestion process, you can add tags + /// such as dev, test, or prod to data flows created during the data ingestion process + /// in the AWS Supply Chain datasets. You can use these tags to identify a group of resources + /// or a single resource used by the developer. + /// + /// Container for the necessary parameters to execute the TagResource service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the TagResource service method, as returned by SupplyChain. + /// + /// You do not have the required privileges to perform this action. + /// + /// + /// Updating or deleting a resource can cause an inconsistent state. + /// + /// + /// Unexpected error during processing of request. + /// + /// + /// Request references a resource which does not exist. + /// + /// + /// Request would cause a service quota to be exceeded. + /// + /// + /// Request was denied due to request throttling. + /// + /// + /// The input does not satisfy the constraints specified by an AWS service. + /// + /// REST API Reference for TagResource Operation + public virtual Task TagResourceAsync(TagResourceRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = TagResourceRequestMarshaller.Instance; + options.ResponseUnmarshaller = TagResourceResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + + #region UntagResource + + + /// + /// You can delete tags for an Amazon Web Services Supply chain resource such as instance, + /// data flow, or dataset in AWS Supply Chain. During the data ingestion process, you + /// can delete tags such as dev, test, or prod to data flows created during the data ingestion + /// process in the AWS Supply Chain datasets. + /// + /// Container for the necessary parameters to execute the UntagResource service method. + /// + /// The response from the UntagResource service method, as returned by SupplyChain. + /// + /// You do not have the required privileges to perform this action. + /// + /// + /// Updating or deleting a resource can cause an inconsistent state. + /// + /// + /// Unexpected error during processing of request. + /// + /// + /// Request references a resource which does not exist. + /// + /// + /// Request would cause a service quota to be exceeded. + /// + /// + /// Request was denied due to request throttling. + /// + /// + /// The input does not satisfy the constraints specified by an AWS service. + /// + /// REST API Reference for UntagResource Operation + public virtual UntagResourceResponse UntagResource(UntagResourceRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = UntagResourceRequestMarshaller.Instance; + options.ResponseUnmarshaller = UntagResourceResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// You can delete tags for an Amazon Web Services Supply chain resource such as instance, + /// data flow, or dataset in AWS Supply Chain. During the data ingestion process, you + /// can delete tags such as dev, test, or prod to data flows created during the data ingestion + /// process in the AWS Supply Chain datasets. + /// + /// Container for the necessary parameters to execute the UntagResource service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the UntagResource service method, as returned by SupplyChain. + /// + /// You do not have the required privileges to perform this action. + /// + /// + /// Updating or deleting a resource can cause an inconsistent state. + /// + /// + /// Unexpected error during processing of request. + /// + /// + /// Request references a resource which does not exist. + /// + /// + /// Request would cause a service quota to be exceeded. + /// + /// + /// Request was denied due to request throttling. + /// + /// + /// The input does not satisfy the constraints specified by an AWS service. + /// + /// REST API Reference for UntagResource Operation + public virtual Task UntagResourceAsync(UntagResourceRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = UntagResourceRequestMarshaller.Instance; + options.ResponseUnmarshaller = UntagResourceResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + + #region UpdateDataIntegrationFlow + + + /// + /// Enables you to programmatically update an existing data pipeline to ingest data from + /// the source systems such as, Amazon S3 buckets, to a predefined Amazon Web Services + /// Supply Chain dataset (product, inbound_order) or a temporary dataset along with the + /// data transformation query provided with the API. + /// + /// Container for the necessary parameters to execute the UpdateDataIntegrationFlow service method. + /// + /// The response from the UpdateDataIntegrationFlow service method, as returned by SupplyChain. + /// + /// You do not have the required privileges to perform this action. + /// + /// + /// Updating or deleting a resource can cause an inconsistent state. + /// + /// + /// Unexpected error during processing of request. + /// + /// + /// Request references a resource which does not exist. + /// + /// + /// Request would cause a service quota to be exceeded. + /// + /// + /// Request was denied due to request throttling. + /// + /// + /// The input does not satisfy the constraints specified by an AWS service. + /// + /// REST API Reference for UpdateDataIntegrationFlow Operation + public virtual UpdateDataIntegrationFlowResponse UpdateDataIntegrationFlow(UpdateDataIntegrationFlowRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = UpdateDataIntegrationFlowRequestMarshaller.Instance; + options.ResponseUnmarshaller = UpdateDataIntegrationFlowResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// Enables you to programmatically update an existing data pipeline to ingest data from + /// the source systems such as, Amazon S3 buckets, to a predefined Amazon Web Services + /// Supply Chain dataset (product, inbound_order) or a temporary dataset along with the + /// data transformation query provided with the API. + /// + /// Container for the necessary parameters to execute the UpdateDataIntegrationFlow service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the UpdateDataIntegrationFlow service method, as returned by SupplyChain. + /// + /// You do not have the required privileges to perform this action. + /// + /// + /// Updating or deleting a resource can cause an inconsistent state. + /// + /// + /// Unexpected error during processing of request. + /// + /// + /// Request references a resource which does not exist. + /// + /// + /// Request would cause a service quota to be exceeded. + /// + /// + /// Request was denied due to request throttling. + /// + /// + /// The input does not satisfy the constraints specified by an AWS service. + /// + /// REST API Reference for UpdateDataIntegrationFlow Operation + public virtual Task UpdateDataIntegrationFlowAsync(UpdateDataIntegrationFlowRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = UpdateDataIntegrationFlowRequestMarshaller.Instance; + options.ResponseUnmarshaller = UpdateDataIntegrationFlowResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + + #region UpdateDataLakeDataset + + + /// + /// Enables you to programmatically update an Amazon Web Services Supply Chain data lake + /// dataset. Developers can update the description of a data lake dataset for a given + /// instance ID, namespace, and dataset name. + /// + /// Container for the necessary parameters to execute the UpdateDataLakeDataset service method. + /// + /// The response from the UpdateDataLakeDataset service method, as returned by SupplyChain. + /// + /// You do not have the required privileges to perform this action. + /// + /// + /// Updating or deleting a resource can cause an inconsistent state. + /// + /// + /// Unexpected error during processing of request. + /// + /// + /// Request references a resource which does not exist. + /// + /// + /// Request would cause a service quota to be exceeded. + /// + /// + /// Request was denied due to request throttling. + /// + /// + /// The input does not satisfy the constraints specified by an AWS service. + /// + /// REST API Reference for UpdateDataLakeDataset Operation + public virtual UpdateDataLakeDatasetResponse UpdateDataLakeDataset(UpdateDataLakeDatasetRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = UpdateDataLakeDatasetRequestMarshaller.Instance; + options.ResponseUnmarshaller = UpdateDataLakeDatasetResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// Enables you to programmatically update an Amazon Web Services Supply Chain data lake + /// dataset. Developers can update the description of a data lake dataset for a given + /// instance ID, namespace, and dataset name. + /// + /// Container for the necessary parameters to execute the UpdateDataLakeDataset service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the UpdateDataLakeDataset service method, as returned by SupplyChain. + /// + /// You do not have the required privileges to perform this action. + /// + /// + /// Updating or deleting a resource can cause an inconsistent state. + /// + /// + /// Unexpected error during processing of request. + /// + /// + /// Request references a resource which does not exist. + /// + /// + /// Request would cause a service quota to be exceeded. + /// + /// + /// Request was denied due to request throttling. + /// + /// + /// The input does not satisfy the constraints specified by an AWS service. + /// + /// REST API Reference for UpdateDataLakeDataset Operation + public virtual Task UpdateDataLakeDatasetAsync(UpdateDataLakeDatasetRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = UpdateDataLakeDatasetRequestMarshaller.Instance; + options.ResponseUnmarshaller = UpdateDataLakeDatasetResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + + #region UpdateInstance + + + /// + /// Enables you to programmatically update an Amazon Web Services Supply Chain instance + /// description by providing all the relevant information such as account ID, instance + /// ID and so on without using the AWS console. + /// + /// Container for the necessary parameters to execute the UpdateInstance service method. + /// + /// The response from the UpdateInstance service method, as returned by SupplyChain. + /// + /// You do not have the required privileges to perform this action. + /// + /// + /// Updating or deleting a resource can cause an inconsistent state. + /// + /// + /// Unexpected error during processing of request. + /// + /// + /// Request references a resource which does not exist. + /// + /// + /// Request would cause a service quota to be exceeded. + /// + /// + /// Request was denied due to request throttling. + /// + /// + /// The input does not satisfy the constraints specified by an AWS service. + /// + /// REST API Reference for UpdateInstance Operation + public virtual UpdateInstanceResponse UpdateInstance(UpdateInstanceRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = UpdateInstanceRequestMarshaller.Instance; + options.ResponseUnmarshaller = UpdateInstanceResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// Enables you to programmatically update an Amazon Web Services Supply Chain instance + /// description by providing all the relevant information such as account ID, instance + /// ID and so on without using the AWS console. + /// + /// Container for the necessary parameters to execute the UpdateInstance service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the UpdateInstance service method, as returned by SupplyChain. + /// + /// You do not have the required privileges to perform this action. + /// + /// + /// Updating or deleting a resource can cause an inconsistent state. + /// + /// + /// Unexpected error during processing of request. + /// + /// + /// Request references a resource which does not exist. + /// + /// + /// Request would cause a service quota to be exceeded. + /// + /// + /// Request was denied due to request throttling. + /// + /// + /// The input does not satisfy the constraints specified by an AWS service. + /// + /// REST API Reference for UpdateInstance Operation + public virtual Task UpdateInstanceAsync(UpdateInstanceRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = UpdateInstanceRequestMarshaller.Instance; + options.ResponseUnmarshaller = UpdateInstanceResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); } #endregion diff --git a/sdk/src/Services/SupplyChain/Properties/AssemblyInfo.cs b/sdk/src/Services/SupplyChain/Properties/AssemblyInfo.cs index 40d4d220a232..b9e3468776dd 100644 --- a/sdk/src/Services/SupplyChain/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/SupplyChain/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.27")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.403.13")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/SupplyChain/SupplyChain.sln b/sdk/src/Services/SupplyChain/SupplyChain.sln index e17f6e08a85e..a2fb7da1a41f 100644 --- a/sdk/src/Services/SupplyChain/SupplyChain.sln +++ b/sdk/src/Services/SupplyChain/SupplyChain.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {77C29159-B664-4EE0-B274-5FB9CCD2B265}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {77C29159-B664-4EE0-B274-5FB9CCD2B265}.Debug|Any CPU.Build.0 = Debug|Any CPU {77C29159-B664-4EE0-B274-5FB9CCD2B265}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {89176D5E-C268-473B-9D71-EBDF4FDD83F8}.Debug|Any CPU.Build.0 = Debug|Any CPU {89176D5E-C268-473B-9D71-EBDF4FDD83F8}.Release|Any CPU.ActiveCfg = Release|Any CPU {89176D5E-C268-473B-9D71-EBDF4FDD83F8}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {D3247419-AB93-4F57-9671-F54D4D6C8D09}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D3247419-AB93-4F57-9671-F54D4D6C8D09}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D3247419-AB93-4F57-9671-F54D4D6C8D09}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D3247419-AB93-4F57-9671-F54D4D6C8D09}.Release|Any CPU.Build.0 = Release|Any CPU - {0959C0CE-27CA-4673-814E-4AEE332CA545}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0959C0CE-27CA-4673-814E-4AEE332CA545}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0959C0CE-27CA-4673-814E-4AEE332CA545}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0959C0CE-27CA-4673-814E-4AEE332CA545}.Release|Any CPU.Build.0 = Release|Any CPU - {79674E8A-8557-49E8-9903-BDFC43BDA212}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {79674E8A-8557-49E8-9903-BDFC43BDA212}.Debug|Any CPU.Build.0 = Debug|Any CPU - {79674E8A-8557-49E8-9903-BDFC43BDA212}.Release|Any CPU.ActiveCfg = Release|Any CPU - {79674E8A-8557-49E8-9903-BDFC43BDA212}.Release|Any CPU.Build.0 = Release|Any CPU - {DD3CFC16-8572-493E-AB33-E1BA83285565}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DD3CFC16-8572-493E-AB33-E1BA83285565}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DD3CFC16-8572-493E-AB33-E1BA83285565}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DD3CFC16-8572-493E-AB33-E1BA83285565}.Release|Any CPU.Build.0 = Release|Any CPU - {77425DC9-75BA-4E00-A9FD-5896FB70940A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {77425DC9-75BA-4E00-A9FD-5896FB70940A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {77425DC9-75BA-4E00-A9FD-5896FB70940A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {77425DC9-75BA-4E00-A9FD-5896FB70940A}.Release|Any CPU.Build.0 = Release|Any CPU - {30F0E4DE-34F1-4A0E-8744-9CD36C54747A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {30F0E4DE-34F1-4A0E-8744-9CD36C54747A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {30F0E4DE-34F1-4A0E-8744-9CD36C54747A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {30F0E4DE-34F1-4A0E-8744-9CD36C54747A}.Release|Any CPU.Build.0 = Release|Any CPU - {5DA4D2D5-C810-4779-95DB-8FD16A9630FC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5DA4D2D5-C810-4779-95DB-8FD16A9630FC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5DA4D2D5-C810-4779-95DB-8FD16A9630FC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5DA4D2D5-C810-4779-95DB-8FD16A9630FC}.Release|Any CPU.Build.0 = Release|Any CPU - {8FDCB6A7-6F31-4E9E-A1B0-3D734F207D49}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8FDCB6A7-6F31-4E9E-A1B0-3D734F207D49}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8FDCB6A7-6F31-4E9E-A1B0-3D734F207D49}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8FDCB6A7-6F31-4E9E-A1B0-3D734F207D49}.Release|Any CPU.Build.0 = Release|Any CPU - {6DE2676E-C992-4AF0-A793-B2961072183E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6DE2676E-C992-4AF0-A793-B2961072183E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6DE2676E-C992-4AF0-A793-B2961072183E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6DE2676E-C992-4AF0-A793-B2961072183E}.Release|Any CPU.Build.0 = Release|Any CPU - {F31D0BED-2613-41C9-9FAE-6420CAD20BB0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F31D0BED-2613-41C9-9FAE-6420CAD20BB0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F31D0BED-2613-41C9-9FAE-6420CAD20BB0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F31D0BED-2613-41C9-9FAE-6420CAD20BB0}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {D3247419-AB93-4F57-9671-F54D4D6C8D09}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D3247419-AB93-4F57-9671-F54D4D6C8D09}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D3247419-AB93-4F57-9671-F54D4D6C8D09}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D3247419-AB93-4F57-9671-F54D4D6C8D09}.Release|Any CPU.Build.0 = Release|Any CPU - {0959C0CE-27CA-4673-814E-4AEE332CA545}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0959C0CE-27CA-4673-814E-4AEE332CA545}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0959C0CE-27CA-4673-814E-4AEE332CA545}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0959C0CE-27CA-4673-814E-4AEE332CA545}.Release|Any CPU.Build.0 = Release|Any CPU - {79674E8A-8557-49E8-9903-BDFC43BDA212}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {79674E8A-8557-49E8-9903-BDFC43BDA212}.Debug|Any CPU.Build.0 = Debug|Any CPU - {79674E8A-8557-49E8-9903-BDFC43BDA212}.Release|Any CPU.ActiveCfg = Release|Any CPU - {79674E8A-8557-49E8-9903-BDFC43BDA212}.Release|Any CPU.Build.0 = Release|Any CPU - {DD3CFC16-8572-493E-AB33-E1BA83285565}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DD3CFC16-8572-493E-AB33-E1BA83285565}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DD3CFC16-8572-493E-AB33-E1BA83285565}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DD3CFC16-8572-493E-AB33-E1BA83285565}.Release|Any CPU.Build.0 = Release|Any CPU - {77425DC9-75BA-4E00-A9FD-5896FB70940A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {77425DC9-75BA-4E00-A9FD-5896FB70940A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {77425DC9-75BA-4E00-A9FD-5896FB70940A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {77425DC9-75BA-4E00-A9FD-5896FB70940A}.Release|Any CPU.Build.0 = Release|Any CPU - {30F0E4DE-34F1-4A0E-8744-9CD36C54747A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {30F0E4DE-34F1-4A0E-8744-9CD36C54747A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {30F0E4DE-34F1-4A0E-8744-9CD36C54747A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {30F0E4DE-34F1-4A0E-8744-9CD36C54747A}.Release|Any CPU.Build.0 = Release|Any CPU - {5DA4D2D5-C810-4779-95DB-8FD16A9630FC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5DA4D2D5-C810-4779-95DB-8FD16A9630FC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5DA4D2D5-C810-4779-95DB-8FD16A9630FC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5DA4D2D5-C810-4779-95DB-8FD16A9630FC}.Release|Any CPU.Build.0 = Release|Any CPU - {8FDCB6A7-6F31-4E9E-A1B0-3D734F207D49}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8FDCB6A7-6F31-4E9E-A1B0-3D734F207D49}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8FDCB6A7-6F31-4E9E-A1B0-3D734F207D49}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8FDCB6A7-6F31-4E9E-A1B0-3D734F207D49}.Release|Any CPU.Build.0 = Release|Any CPU - {6DE2676E-C992-4AF0-A793-B2961072183E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6DE2676E-C992-4AF0-A793-B2961072183E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6DE2676E-C992-4AF0-A793-B2961072183E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6DE2676E-C992-4AF0-A793-B2961072183E}.Release|Any CPU.Build.0 = Release|Any CPU - {F31D0BED-2613-41C9-9FAE-6420CAD20BB0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F31D0BED-2613-41C9-9FAE-6420CAD20BB0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F31D0BED-2613-41C9-9FAE-6420CAD20BB0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F31D0BED-2613-41C9-9FAE-6420CAD20BB0}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {77C29159-B664-4EE0-B274-5FB9CCD2B265} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {110A5784-DF71-4156-93EB-C1551B2657DB} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {4C565BF7-EB4E-4F17-9A8B-8FC9F2D0A562} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {3BDB4336-D32E-4A7B-9655-2B275FF40A7D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {89176D5E-C268-473B-9D71-EBDF4FDD83F8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {D3247419-AB93-4F57-9671-F54D4D6C8D09} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0959C0CE-27CA-4673-814E-4AEE332CA545} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {79674E8A-8557-49E8-9903-BDFC43BDA212} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {DD3CFC16-8572-493E-AB33-E1BA83285565} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {77425DC9-75BA-4E00-A9FD-5896FB70940A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {30F0E4DE-34F1-4A0E-8744-9CD36C54747A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {5DA4D2D5-C810-4779-95DB-8FD16A9630FC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8FDCB6A7-6F31-4E9E-A1B0-3D734F207D49} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6DE2676E-C992-4AF0-A793-B2961072183E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F31D0BED-2613-41C9-9FAE-6420CAD20BB0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {D3247419-AB93-4F57-9671-F54D4D6C8D09} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0959C0CE-27CA-4673-814E-4AEE332CA545} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {79674E8A-8557-49E8-9903-BDFC43BDA212} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {DD3CFC16-8572-493E-AB33-E1BA83285565} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {77425DC9-75BA-4E00-A9FD-5896FB70940A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {30F0E4DE-34F1-4A0E-8744-9CD36C54747A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {5DA4D2D5-C810-4779-95DB-8FD16A9630FC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8FDCB6A7-6F31-4E9E-A1B0-3D734F207D49} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6DE2676E-C992-4AF0-A793-B2961072183E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F31D0BED-2613-41C9-9FAE-6420CAD20BB0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {887E8009-886C-4381-B8BF-904F59006BF6} diff --git a/sdk/src/Services/SupportApp/Generated/AmazonSupportAppConfig.cs b/sdk/src/Services/SupportApp/Generated/AmazonSupportAppConfig.cs index 9ae4a4e9a3ed..60b0601aed36 100644 --- a/sdk/src/Services/SupportApp/Generated/AmazonSupportAppConfig.cs +++ b/sdk/src/Services/SupportApp/Generated/AmazonSupportAppConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.SupportApp public partial class AmazonSupportAppConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("Support App", "4.0.0.0"); private static readonly AmazonSupportAppEndpointResolver EndpointResolver = new AmazonSupportAppEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("Support App", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("Support App", "3.7.400.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/SupportApp/Properties/AssemblyInfo.cs b/sdk/src/Services/SupportApp/Properties/AssemblyInfo.cs index a7535c929570..e8945a2b5719 100644 --- a/sdk/src/Services/SupportApp/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/SupportApp/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/SupportApp/SupportApp.sln b/sdk/src/Services/SupportApp/SupportApp.sln index ea07236cc345..fe396eb16607 100644 --- a/sdk/src/Services/SupportApp/SupportApp.sln +++ b/sdk/src/Services/SupportApp/SupportApp.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {CEC21F42-F6F7-4DBE-B703-D6D404C9847B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {CEC21F42-F6F7-4DBE-B703-D6D404C9847B}.Debug|Any CPU.Build.0 = Debug|Any CPU {CEC21F42-F6F7-4DBE-B703-D6D404C9847B}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {636AD6F2-2676-4B02-BAC7-A94210188C0A}.Debug|Any CPU.Build.0 = Debug|Any CPU {636AD6F2-2676-4B02-BAC7-A94210188C0A}.Release|Any CPU.ActiveCfg = Release|Any CPU {636AD6F2-2676-4B02-BAC7-A94210188C0A}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {90A649FF-98FC-4E78-B09C-A375B32318F3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {90A649FF-98FC-4E78-B09C-A375B32318F3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {90A649FF-98FC-4E78-B09C-A375B32318F3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {90A649FF-98FC-4E78-B09C-A375B32318F3}.Release|Any CPU.Build.0 = Release|Any CPU - {225E501A-BEDC-48AA-A30F-34DD5117DAEB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {225E501A-BEDC-48AA-A30F-34DD5117DAEB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {225E501A-BEDC-48AA-A30F-34DD5117DAEB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {225E501A-BEDC-48AA-A30F-34DD5117DAEB}.Release|Any CPU.Build.0 = Release|Any CPU - {EBA3F88D-FAD4-4550-9292-E31A1CDDC997}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EBA3F88D-FAD4-4550-9292-E31A1CDDC997}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EBA3F88D-FAD4-4550-9292-E31A1CDDC997}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EBA3F88D-FAD4-4550-9292-E31A1CDDC997}.Release|Any CPU.Build.0 = Release|Any CPU - {A2F7C6BD-0314-42F9-ADF9-F87A8C75B925}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A2F7C6BD-0314-42F9-ADF9-F87A8C75B925}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A2F7C6BD-0314-42F9-ADF9-F87A8C75B925}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A2F7C6BD-0314-42F9-ADF9-F87A8C75B925}.Release|Any CPU.Build.0 = Release|Any CPU - {D6461061-523C-4418-B545-DD3F68044A57}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D6461061-523C-4418-B545-DD3F68044A57}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D6461061-523C-4418-B545-DD3F68044A57}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D6461061-523C-4418-B545-DD3F68044A57}.Release|Any CPU.Build.0 = Release|Any CPU - {0256D384-27BB-4B41-9746-92FD2B782E58}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0256D384-27BB-4B41-9746-92FD2B782E58}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0256D384-27BB-4B41-9746-92FD2B782E58}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0256D384-27BB-4B41-9746-92FD2B782E58}.Release|Any CPU.Build.0 = Release|Any CPU - {1EE2CC61-9DAA-4451-AE82-C8D617E3C976}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1EE2CC61-9DAA-4451-AE82-C8D617E3C976}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1EE2CC61-9DAA-4451-AE82-C8D617E3C976}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1EE2CC61-9DAA-4451-AE82-C8D617E3C976}.Release|Any CPU.Build.0 = Release|Any CPU - {795012EE-34CD-4AE6-AB1C-1F6E40A3625F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {795012EE-34CD-4AE6-AB1C-1F6E40A3625F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {795012EE-34CD-4AE6-AB1C-1F6E40A3625F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {795012EE-34CD-4AE6-AB1C-1F6E40A3625F}.Release|Any CPU.Build.0 = Release|Any CPU - {D72AE011-BBC3-4EFE-BAE0-45F9783B19B0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D72AE011-BBC3-4EFE-BAE0-45F9783B19B0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D72AE011-BBC3-4EFE-BAE0-45F9783B19B0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D72AE011-BBC3-4EFE-BAE0-45F9783B19B0}.Release|Any CPU.Build.0 = Release|Any CPU - {CA8DC909-6AA1-4037-86CD-25436005C613}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CA8DC909-6AA1-4037-86CD-25436005C613}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CA8DC909-6AA1-4037-86CD-25436005C613}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CA8DC909-6AA1-4037-86CD-25436005C613}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {90A649FF-98FC-4E78-B09C-A375B32318F3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {90A649FF-98FC-4E78-B09C-A375B32318F3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {90A649FF-98FC-4E78-B09C-A375B32318F3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {90A649FF-98FC-4E78-B09C-A375B32318F3}.Release|Any CPU.Build.0 = Release|Any CPU - {225E501A-BEDC-48AA-A30F-34DD5117DAEB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {225E501A-BEDC-48AA-A30F-34DD5117DAEB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {225E501A-BEDC-48AA-A30F-34DD5117DAEB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {225E501A-BEDC-48AA-A30F-34DD5117DAEB}.Release|Any CPU.Build.0 = Release|Any CPU - {EBA3F88D-FAD4-4550-9292-E31A1CDDC997}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EBA3F88D-FAD4-4550-9292-E31A1CDDC997}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EBA3F88D-FAD4-4550-9292-E31A1CDDC997}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EBA3F88D-FAD4-4550-9292-E31A1CDDC997}.Release|Any CPU.Build.0 = Release|Any CPU - {A2F7C6BD-0314-42F9-ADF9-F87A8C75B925}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A2F7C6BD-0314-42F9-ADF9-F87A8C75B925}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A2F7C6BD-0314-42F9-ADF9-F87A8C75B925}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A2F7C6BD-0314-42F9-ADF9-F87A8C75B925}.Release|Any CPU.Build.0 = Release|Any CPU - {D6461061-523C-4418-B545-DD3F68044A57}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D6461061-523C-4418-B545-DD3F68044A57}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D6461061-523C-4418-B545-DD3F68044A57}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D6461061-523C-4418-B545-DD3F68044A57}.Release|Any CPU.Build.0 = Release|Any CPU - {0256D384-27BB-4B41-9746-92FD2B782E58}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0256D384-27BB-4B41-9746-92FD2B782E58}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0256D384-27BB-4B41-9746-92FD2B782E58}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0256D384-27BB-4B41-9746-92FD2B782E58}.Release|Any CPU.Build.0 = Release|Any CPU - {1EE2CC61-9DAA-4451-AE82-C8D617E3C976}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1EE2CC61-9DAA-4451-AE82-C8D617E3C976}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1EE2CC61-9DAA-4451-AE82-C8D617E3C976}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1EE2CC61-9DAA-4451-AE82-C8D617E3C976}.Release|Any CPU.Build.0 = Release|Any CPU - {795012EE-34CD-4AE6-AB1C-1F6E40A3625F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {795012EE-34CD-4AE6-AB1C-1F6E40A3625F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {795012EE-34CD-4AE6-AB1C-1F6E40A3625F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {795012EE-34CD-4AE6-AB1C-1F6E40A3625F}.Release|Any CPU.Build.0 = Release|Any CPU - {D72AE011-BBC3-4EFE-BAE0-45F9783B19B0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D72AE011-BBC3-4EFE-BAE0-45F9783B19B0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D72AE011-BBC3-4EFE-BAE0-45F9783B19B0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D72AE011-BBC3-4EFE-BAE0-45F9783B19B0}.Release|Any CPU.Build.0 = Release|Any CPU - {CA8DC909-6AA1-4037-86CD-25436005C613}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CA8DC909-6AA1-4037-86CD-25436005C613}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CA8DC909-6AA1-4037-86CD-25436005C613}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CA8DC909-6AA1-4037-86CD-25436005C613}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {CEC21F42-F6F7-4DBE-B703-D6D404C9847B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {1C20CFD0-7E5F-4FAB-9247-D8559AD545B3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {CB330937-5A85-4540-BDF0-6CD1FEAFE268} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {36B7DB67-CA9F-46E8-BE3B-2B36992AE790} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {636AD6F2-2676-4B02-BAC7-A94210188C0A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {90A649FF-98FC-4E78-B09C-A375B32318F3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {225E501A-BEDC-48AA-A30F-34DD5117DAEB} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {EBA3F88D-FAD4-4550-9292-E31A1CDDC997} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A2F7C6BD-0314-42F9-ADF9-F87A8C75B925} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D6461061-523C-4418-B545-DD3F68044A57} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0256D384-27BB-4B41-9746-92FD2B782E58} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {1EE2CC61-9DAA-4451-AE82-C8D617E3C976} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {795012EE-34CD-4AE6-AB1C-1F6E40A3625F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D72AE011-BBC3-4EFE-BAE0-45F9783B19B0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {CA8DC909-6AA1-4037-86CD-25436005C613} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {90A649FF-98FC-4E78-B09C-A375B32318F3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {225E501A-BEDC-48AA-A30F-34DD5117DAEB} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {EBA3F88D-FAD4-4550-9292-E31A1CDDC997} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A2F7C6BD-0314-42F9-ADF9-F87A8C75B925} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D6461061-523C-4418-B545-DD3F68044A57} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0256D384-27BB-4B41-9746-92FD2B782E58} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {1EE2CC61-9DAA-4451-AE82-C8D617E3C976} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {795012EE-34CD-4AE6-AB1C-1F6E40A3625F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D72AE011-BBC3-4EFE-BAE0-45F9783B19B0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {CA8DC909-6AA1-4037-86CD-25436005C613} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {A5C72425-ECC8-4E54-8E42-E2CE7FE27AC8} diff --git a/sdk/src/Services/Synthetics/Generated/AmazonSyntheticsConfig.cs b/sdk/src/Services/Synthetics/Generated/AmazonSyntheticsConfig.cs index 4bdb862776b1..8c9d56cf73d8 100644 --- a/sdk/src/Services/Synthetics/Generated/AmazonSyntheticsConfig.cs +++ b/sdk/src/Services/Synthetics/Generated/AmazonSyntheticsConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.Synthetics public partial class AmazonSyntheticsConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("synthetics", "4.0.0.0"); private static readonly AmazonSyntheticsEndpointResolver EndpointResolver = new AmazonSyntheticsEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("synthetics", "3.7.401.7"); -======= - InternalSDKUtils.BuildUserAgentString("synthetics", "3.7.402.7"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/Synthetics/Generated/Model/Internal/MarshallTransformations/CreateCanaryRequestMarshaller.cs b/sdk/src/Services/Synthetics/Generated/Model/Internal/MarshallTransformations/CreateCanaryRequestMarshaller.cs index ca750984faa0..5ec5599fc34c 100644 --- a/sdk/src/Services/Synthetics/Generated/Model/Internal/MarshallTransformations/CreateCanaryRequestMarshaller.cs +++ b/sdk/src/Services/Synthetics/Generated/Model/Internal/MarshallTransformations/CreateCanaryRequestMarshaller.cs @@ -109,32 +109,18 @@ public IRequest Marshall(CreateCanaryRequest publicRequest) context.Writer.Write(publicRequest.FailureRetentionPeriodInDays.Value); } -<<<<<<< HEAD if(publicRequest.IsSetName()) -||||||| Commit version number update changes - if(publicRequest.IsSetResourcesToReplicateTags()) - { - context.Writer.WritePropertyName("ResourcesToReplicateTags"); - context.Writer.WriteArrayStart(); - foreach(var publicRequestResourcesToReplicateTagsListValue in publicRequest.ResourcesToReplicateTags) -======= - if(publicRequest.IsSetProvisionedResourceCleanup()) - { - context.Writer.WritePropertyName("ProvisionedResourceCleanup"); - context.Writer.Write(publicRequest.ProvisionedResourceCleanup); - } - - if(publicRequest.IsSetResourcesToReplicateTags()) - { - context.Writer.WritePropertyName("ResourcesToReplicateTags"); - context.Writer.WriteArrayStart(); - foreach(var publicRequestResourcesToReplicateTagsListValue in publicRequest.ResourcesToReplicateTags) ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b { context.Writer.WritePropertyName("Name"); context.Writer.Write(publicRequest.Name); } + if(publicRequest.IsSetProvisionedResourceCleanup()) + { + context.Writer.WritePropertyName("ProvisionedResourceCleanup"); + context.Writer.Write(publicRequest.ProvisionedResourceCleanup); + } + if(publicRequest.IsSetResourcesToReplicateTags()) { context.Writer.WritePropertyName("ResourcesToReplicateTags"); diff --git a/sdk/src/Services/Synthetics/Generated/Model/Internal/MarshallTransformations/UpdateCanaryRequestMarshaller.cs b/sdk/src/Services/Synthetics/Generated/Model/Internal/MarshallTransformations/UpdateCanaryRequestMarshaller.cs index 8a07487a5053..e693bd252a51 100644 --- a/sdk/src/Services/Synthetics/Generated/Model/Internal/MarshallTransformations/UpdateCanaryRequestMarshaller.cs +++ b/sdk/src/Services/Synthetics/Generated/Model/Internal/MarshallTransformations/UpdateCanaryRequestMarshaller.cs @@ -68,7 +68,6 @@ public IRequest Marshall(UpdateCanaryRequest publicRequest) { using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) { -<<<<<<< HEAD JsonWriter writer = new JsonWriter(streamWriter); writer.Validate = false; writer.WriteObjectStart(); @@ -113,6 +112,12 @@ public IRequest Marshall(UpdateCanaryRequest publicRequest) context.Writer.Write(publicRequest.FailureRetentionPeriodInDays.Value); } + if(publicRequest.IsSetProvisionedResourceCleanup()) + { + context.Writer.WritePropertyName("ProvisionedResourceCleanup"); + context.Writer.Write(publicRequest.ProvisionedResourceCleanup); + } + if(publicRequest.IsSetRunConfig()) { context.Writer.WritePropertyName("RunConfig"); @@ -170,199 +175,6 @@ public IRequest Marshall(UpdateCanaryRequest publicRequest) } writer.WriteObjectEnd(); -||||||| Commit version number update changes - context.Writer.WritePropertyName("ArtifactConfig"); - context.Writer.WriteObjectStart(); - - var marshaller = ArtifactConfigInputMarshaller.Instance; - marshaller.Marshall(publicRequest.ArtifactConfig, context); - - context.Writer.WriteObjectEnd(); - } - - if(publicRequest.IsSetArtifactS3Location()) - { - context.Writer.WritePropertyName("ArtifactS3Location"); - context.Writer.Write(publicRequest.ArtifactS3Location); - } - - if(publicRequest.IsSetCode()) - { - context.Writer.WritePropertyName("Code"); - context.Writer.WriteObjectStart(); - - var marshaller = CanaryCodeInputMarshaller.Instance; - marshaller.Marshall(publicRequest.Code, context); - - context.Writer.WriteObjectEnd(); - } - - if(publicRequest.IsSetExecutionRoleArn()) - { - context.Writer.WritePropertyName("ExecutionRoleArn"); - context.Writer.Write(publicRequest.ExecutionRoleArn); - } - - if(publicRequest.IsSetFailureRetentionPeriodInDays()) - { - context.Writer.WritePropertyName("FailureRetentionPeriodInDays"); - context.Writer.Write(publicRequest.FailureRetentionPeriodInDays); - } - - if(publicRequest.IsSetRunConfig()) - { - context.Writer.WritePropertyName("RunConfig"); - context.Writer.WriteObjectStart(); - - var marshaller = CanaryRunConfigInputMarshaller.Instance; - marshaller.Marshall(publicRequest.RunConfig, context); - - context.Writer.WriteObjectEnd(); - } - - if(publicRequest.IsSetRuntimeVersion()) - { - context.Writer.WritePropertyName("RuntimeVersion"); - context.Writer.Write(publicRequest.RuntimeVersion); - } - - if(publicRequest.IsSetSchedule()) - { - context.Writer.WritePropertyName("Schedule"); - context.Writer.WriteObjectStart(); - - var marshaller = CanaryScheduleInputMarshaller.Instance; - marshaller.Marshall(publicRequest.Schedule, context); - - context.Writer.WriteObjectEnd(); - } - - if(publicRequest.IsSetSuccessRetentionPeriodInDays()) - { - context.Writer.WritePropertyName("SuccessRetentionPeriodInDays"); - context.Writer.Write(publicRequest.SuccessRetentionPeriodInDays); - } - - if(publicRequest.IsSetVisualReference()) - { - context.Writer.WritePropertyName("VisualReference"); - context.Writer.WriteObjectStart(); - - var marshaller = VisualReferenceInputMarshaller.Instance; - marshaller.Marshall(publicRequest.VisualReference, context); - - context.Writer.WriteObjectEnd(); - } - - if(publicRequest.IsSetVpcConfig()) - { - context.Writer.WritePropertyName("VpcConfig"); - context.Writer.WriteObjectStart(); - - var marshaller = VpcConfigInputMarshaller.Instance; - marshaller.Marshall(publicRequest.VpcConfig, context); - - context.Writer.WriteObjectEnd(); -======= - context.Writer.WritePropertyName("ArtifactConfig"); - context.Writer.WriteObjectStart(); - - var marshaller = ArtifactConfigInputMarshaller.Instance; - marshaller.Marshall(publicRequest.ArtifactConfig, context); - - context.Writer.WriteObjectEnd(); - } - - if(publicRequest.IsSetArtifactS3Location()) - { - context.Writer.WritePropertyName("ArtifactS3Location"); - context.Writer.Write(publicRequest.ArtifactS3Location); - } - - if(publicRequest.IsSetCode()) - { - context.Writer.WritePropertyName("Code"); - context.Writer.WriteObjectStart(); - - var marshaller = CanaryCodeInputMarshaller.Instance; - marshaller.Marshall(publicRequest.Code, context); - - context.Writer.WriteObjectEnd(); - } - - if(publicRequest.IsSetExecutionRoleArn()) - { - context.Writer.WritePropertyName("ExecutionRoleArn"); - context.Writer.Write(publicRequest.ExecutionRoleArn); - } - - if(publicRequest.IsSetFailureRetentionPeriodInDays()) - { - context.Writer.WritePropertyName("FailureRetentionPeriodInDays"); - context.Writer.Write(publicRequest.FailureRetentionPeriodInDays); - } - - if(publicRequest.IsSetProvisionedResourceCleanup()) - { - context.Writer.WritePropertyName("ProvisionedResourceCleanup"); - context.Writer.Write(publicRequest.ProvisionedResourceCleanup); - } - - if(publicRequest.IsSetRunConfig()) - { - context.Writer.WritePropertyName("RunConfig"); - context.Writer.WriteObjectStart(); - - var marshaller = CanaryRunConfigInputMarshaller.Instance; - marshaller.Marshall(publicRequest.RunConfig, context); - - context.Writer.WriteObjectEnd(); - } - - if(publicRequest.IsSetRuntimeVersion()) - { - context.Writer.WritePropertyName("RuntimeVersion"); - context.Writer.Write(publicRequest.RuntimeVersion); - } - - if(publicRequest.IsSetSchedule()) - { - context.Writer.WritePropertyName("Schedule"); - context.Writer.WriteObjectStart(); - - var marshaller = CanaryScheduleInputMarshaller.Instance; - marshaller.Marshall(publicRequest.Schedule, context); - - context.Writer.WriteObjectEnd(); - } - - if(publicRequest.IsSetSuccessRetentionPeriodInDays()) - { - context.Writer.WritePropertyName("SuccessRetentionPeriodInDays"); - context.Writer.Write(publicRequest.SuccessRetentionPeriodInDays); - } - - if(publicRequest.IsSetVisualReference()) - { - context.Writer.WritePropertyName("VisualReference"); - context.Writer.WriteObjectStart(); - - var marshaller = VisualReferenceInputMarshaller.Instance; - marshaller.Marshall(publicRequest.VisualReference, context); - - context.Writer.WriteObjectEnd(); - } - - if(publicRequest.IsSetVpcConfig()) - { - context.Writer.WritePropertyName("VpcConfig"); - context.Writer.WriteObjectStart(); - - var marshaller = VpcConfigInputMarshaller.Instance; - marshaller.Marshall(publicRequest.VpcConfig, context); - - context.Writer.WriteObjectEnd(); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b } request.Content = memoryStream.ToArray(); diff --git a/sdk/src/Services/Synthetics/Generated/_bcl/AmazonSyntheticsClient.cs b/sdk/src/Services/Synthetics/Generated/_bcl/AmazonSyntheticsClient.cs index 5e44e5a2c274..18c8f013d53d 100644 --- a/sdk/src/Services/Synthetics/Generated/_bcl/AmazonSyntheticsClient.cs +++ b/sdk/src/Services/Synthetics/Generated/_bcl/AmazonSyntheticsClient.cs @@ -596,14 +596,14 @@ public virtual CreateGroupResponse CreateGroup(CreateGroupRequest request) /// /// /// - /// If you specify DeleteLambda to true, CloudWatch Synthetics also deletes - /// the Lambda functions and layers that are used by the canary. + /// If the canary's ProvisionedResourceCleanup field is set to AUTOMATIC + /// or you specify DeleteLambda in this operation as true, CloudWatch Synthetics + /// also deletes the Lambda functions and layers that are used by the canary. /// /// /// /// Other resources used and created by the canary are not automatically deleted. After - /// you delete a canary that you do not intend to use again, you should also delete the - /// following: + /// you delete a canary, you should also delete the following: /// ///
            • /// @@ -663,14 +663,14 @@ public virtual DeleteCanaryResponse DeleteCanary(DeleteCanaryRequest request) /// /// /// - /// If you specify DeleteLambda to true, CloudWatch Synthetics also deletes - /// the Lambda functions and layers that are used by the canary. + /// If the canary's ProvisionedResourceCleanup field is set to AUTOMATIC + /// or you specify DeleteLambda in this operation as true, CloudWatch Synthetics + /// also deletes the Lambda functions and layers that are used by the canary. /// /// /// /// Other resources used and created by the canary are not automatically deleted. After - /// you delete a canary that you do not intend to use again, you should also delete the - /// following: + /// you delete a canary, you should also delete the following: /// ///
              • /// diff --git a/sdk/src/Services/Synthetics/Properties/AssemblyInfo.cs b/sdk/src/Services/Synthetics/Properties/AssemblyInfo.cs index 6a486fcd8973..9aa8bd491829 100644 --- a/sdk/src/Services/Synthetics/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/Synthetics/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.7")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.402.7")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/Synthetics/Synthetics.sln b/sdk/src/Services/Synthetics/Synthetics.sln index bd5ca651da1b..3712ed3c3090 100644 --- a/sdk/src/Services/Synthetics/Synthetics.sln +++ b/sdk/src/Services/Synthetics/Synthetics.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {5118236C-54C3-4C71-8A5C-91E2C4A9444B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {5118236C-54C3-4C71-8A5C-91E2C4A9444B}.Debug|Any CPU.Build.0 = Debug|Any CPU {5118236C-54C3-4C71-8A5C-91E2C4A9444B}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {314D9F24-80C7-48F1-B6C8-B602884D4025}.Debug|Any CPU.Build.0 = Debug|Any CPU {314D9F24-80C7-48F1-B6C8-B602884D4025}.Release|Any CPU.ActiveCfg = Release|Any CPU {314D9F24-80C7-48F1-B6C8-B602884D4025}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {D2FFA9F9-6212-4704-93F5-9B3AC8A21C2F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D2FFA9F9-6212-4704-93F5-9B3AC8A21C2F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D2FFA9F9-6212-4704-93F5-9B3AC8A21C2F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D2FFA9F9-6212-4704-93F5-9B3AC8A21C2F}.Release|Any CPU.Build.0 = Release|Any CPU - {5C768AB3-B01B-40AA-9B83-D2E47E1B9B55}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5C768AB3-B01B-40AA-9B83-D2E47E1B9B55}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5C768AB3-B01B-40AA-9B83-D2E47E1B9B55}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5C768AB3-B01B-40AA-9B83-D2E47E1B9B55}.Release|Any CPU.Build.0 = Release|Any CPU - {B1210B00-4558-466D-AEAB-F3F18A4A003F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B1210B00-4558-466D-AEAB-F3F18A4A003F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B1210B00-4558-466D-AEAB-F3F18A4A003F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B1210B00-4558-466D-AEAB-F3F18A4A003F}.Release|Any CPU.Build.0 = Release|Any CPU - {2C1D1576-926C-4998-A277-49DFC9C1DE71}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2C1D1576-926C-4998-A277-49DFC9C1DE71}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2C1D1576-926C-4998-A277-49DFC9C1DE71}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2C1D1576-926C-4998-A277-49DFC9C1DE71}.Release|Any CPU.Build.0 = Release|Any CPU - {EAB3B4E1-1918-4F9F-AF6E-E91D4671EB3B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EAB3B4E1-1918-4F9F-AF6E-E91D4671EB3B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EAB3B4E1-1918-4F9F-AF6E-E91D4671EB3B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EAB3B4E1-1918-4F9F-AF6E-E91D4671EB3B}.Release|Any CPU.Build.0 = Release|Any CPU - {FF568BAE-0FEE-42F7-A87D-1677FA21F637}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FF568BAE-0FEE-42F7-A87D-1677FA21F637}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FF568BAE-0FEE-42F7-A87D-1677FA21F637}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FF568BAE-0FEE-42F7-A87D-1677FA21F637}.Release|Any CPU.Build.0 = Release|Any CPU - {6F417F2B-AEE3-4758-A207-C7EB64DB12E5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6F417F2B-AEE3-4758-A207-C7EB64DB12E5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6F417F2B-AEE3-4758-A207-C7EB64DB12E5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6F417F2B-AEE3-4758-A207-C7EB64DB12E5}.Release|Any CPU.Build.0 = Release|Any CPU - {8F6C433A-9920-48DE-838B-24F0EC8DD739}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8F6C433A-9920-48DE-838B-24F0EC8DD739}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8F6C433A-9920-48DE-838B-24F0EC8DD739}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8F6C433A-9920-48DE-838B-24F0EC8DD739}.Release|Any CPU.Build.0 = Release|Any CPU - {B48969E5-633F-4BE4-9548-0DDD7A019B27}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B48969E5-633F-4BE4-9548-0DDD7A019B27}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B48969E5-633F-4BE4-9548-0DDD7A019B27}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B48969E5-633F-4BE4-9548-0DDD7A019B27}.Release|Any CPU.Build.0 = Release|Any CPU - {B9DE3CD9-3300-49F9-A5F9-F1B9A62552C7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B9DE3CD9-3300-49F9-A5F9-F1B9A62552C7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B9DE3CD9-3300-49F9-A5F9-F1B9A62552C7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B9DE3CD9-3300-49F9-A5F9-F1B9A62552C7}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {D2FFA9F9-6212-4704-93F5-9B3AC8A21C2F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D2FFA9F9-6212-4704-93F5-9B3AC8A21C2F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D2FFA9F9-6212-4704-93F5-9B3AC8A21C2F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D2FFA9F9-6212-4704-93F5-9B3AC8A21C2F}.Release|Any CPU.Build.0 = Release|Any CPU - {5C768AB3-B01B-40AA-9B83-D2E47E1B9B55}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5C768AB3-B01B-40AA-9B83-D2E47E1B9B55}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5C768AB3-B01B-40AA-9B83-D2E47E1B9B55}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5C768AB3-B01B-40AA-9B83-D2E47E1B9B55}.Release|Any CPU.Build.0 = Release|Any CPU - {B1210B00-4558-466D-AEAB-F3F18A4A003F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B1210B00-4558-466D-AEAB-F3F18A4A003F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B1210B00-4558-466D-AEAB-F3F18A4A003F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B1210B00-4558-466D-AEAB-F3F18A4A003F}.Release|Any CPU.Build.0 = Release|Any CPU - {2C1D1576-926C-4998-A277-49DFC9C1DE71}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2C1D1576-926C-4998-A277-49DFC9C1DE71}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2C1D1576-926C-4998-A277-49DFC9C1DE71}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2C1D1576-926C-4998-A277-49DFC9C1DE71}.Release|Any CPU.Build.0 = Release|Any CPU - {EAB3B4E1-1918-4F9F-AF6E-E91D4671EB3B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EAB3B4E1-1918-4F9F-AF6E-E91D4671EB3B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EAB3B4E1-1918-4F9F-AF6E-E91D4671EB3B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EAB3B4E1-1918-4F9F-AF6E-E91D4671EB3B}.Release|Any CPU.Build.0 = Release|Any CPU - {FF568BAE-0FEE-42F7-A87D-1677FA21F637}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FF568BAE-0FEE-42F7-A87D-1677FA21F637}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FF568BAE-0FEE-42F7-A87D-1677FA21F637}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FF568BAE-0FEE-42F7-A87D-1677FA21F637}.Release|Any CPU.Build.0 = Release|Any CPU - {6F417F2B-AEE3-4758-A207-C7EB64DB12E5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6F417F2B-AEE3-4758-A207-C7EB64DB12E5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6F417F2B-AEE3-4758-A207-C7EB64DB12E5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6F417F2B-AEE3-4758-A207-C7EB64DB12E5}.Release|Any CPU.Build.0 = Release|Any CPU - {8F6C433A-9920-48DE-838B-24F0EC8DD739}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8F6C433A-9920-48DE-838B-24F0EC8DD739}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8F6C433A-9920-48DE-838B-24F0EC8DD739}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8F6C433A-9920-48DE-838B-24F0EC8DD739}.Release|Any CPU.Build.0 = Release|Any CPU - {B48969E5-633F-4BE4-9548-0DDD7A019B27}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B48969E5-633F-4BE4-9548-0DDD7A019B27}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B48969E5-633F-4BE4-9548-0DDD7A019B27}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B48969E5-633F-4BE4-9548-0DDD7A019B27}.Release|Any CPU.Build.0 = Release|Any CPU - {B9DE3CD9-3300-49F9-A5F9-F1B9A62552C7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B9DE3CD9-3300-49F9-A5F9-F1B9A62552C7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B9DE3CD9-3300-49F9-A5F9-F1B9A62552C7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B9DE3CD9-3300-49F9-A5F9-F1B9A62552C7}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {5118236C-54C3-4C71-8A5C-91E2C4A9444B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {9020D7A4-0436-4EB7-9176-49CAAC05BB73} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {ED84AEA5-96EF-4941-B7B0-AA5EB6A93253} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {9C07DC38-CB6A-4F30-9ABF-A71BD07A7CCD} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {314D9F24-80C7-48F1-B6C8-B602884D4025} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {D2FFA9F9-6212-4704-93F5-9B3AC8A21C2F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {5C768AB3-B01B-40AA-9B83-D2E47E1B9B55} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B1210B00-4558-466D-AEAB-F3F18A4A003F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {2C1D1576-926C-4998-A277-49DFC9C1DE71} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {EAB3B4E1-1918-4F9F-AF6E-E91D4671EB3B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {FF568BAE-0FEE-42F7-A87D-1677FA21F637} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6F417F2B-AEE3-4758-A207-C7EB64DB12E5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8F6C433A-9920-48DE-838B-24F0EC8DD739} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B48969E5-633F-4BE4-9548-0DDD7A019B27} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B9DE3CD9-3300-49F9-A5F9-F1B9A62552C7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {D2FFA9F9-6212-4704-93F5-9B3AC8A21C2F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {5C768AB3-B01B-40AA-9B83-D2E47E1B9B55} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B1210B00-4558-466D-AEAB-F3F18A4A003F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {2C1D1576-926C-4998-A277-49DFC9C1DE71} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {EAB3B4E1-1918-4F9F-AF6E-E91D4671EB3B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {FF568BAE-0FEE-42F7-A87D-1677FA21F637} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6F417F2B-AEE3-4758-A207-C7EB64DB12E5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8F6C433A-9920-48DE-838B-24F0EC8DD739} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B48969E5-633F-4BE4-9548-0DDD7A019B27} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B9DE3CD9-3300-49F9-A5F9-F1B9A62552C7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {F940941A-C5F3-422C-974F-C94EE7A44331} diff --git a/sdk/src/Services/TaxSettings/Generated/AmazonTaxSettingsConfig.cs b/sdk/src/Services/TaxSettings/Generated/AmazonTaxSettingsConfig.cs index b8f51b6cff2e..334803609b82 100644 --- a/sdk/src/Services/TaxSettings/Generated/AmazonTaxSettingsConfig.cs +++ b/sdk/src/Services/TaxSettings/Generated/AmazonTaxSettingsConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.TaxSettings public partial class AmazonTaxSettingsConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("TaxSettings", "4.0.0.0"); private static readonly AmazonTaxSettingsEndpointResolver EndpointResolver = new AmazonTaxSettingsEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("TaxSettings", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("TaxSettings", "3.7.401.8"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/TaxSettings/Generated/Model/Internal/MarshallTransformations/DeleteSupplementalTaxRegistrationRequestMarshaller.cs b/sdk/src/Services/TaxSettings/Generated/Model/Internal/MarshallTransformations/DeleteSupplementalTaxRegistrationRequestMarshaller.cs index bb7d19c3e7ae..967ba318cea5 100644 --- a/sdk/src/Services/TaxSettings/Generated/Model/Internal/MarshallTransformations/DeleteSupplementalTaxRegistrationRequestMarshaller.cs +++ b/sdk/src/Services/TaxSettings/Generated/Model/Internal/MarshallTransformations/DeleteSupplementalTaxRegistrationRequestMarshaller.cs @@ -61,21 +61,24 @@ public IRequest Marshall(DeleteSupplementalTaxRegistrationRequest publicRequest) request.HttpMethod = "POST"; request.ResourcePath = "/DeleteSupplementalTaxRegistration"; - using (StringWriter stringWriter = new StringWriter(CultureInfo.InvariantCulture)) + using (MemoryStream memoryStream = new MemoryStream()) { - JsonWriter writer = new JsonWriter(stringWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetAuthorityId()) + using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) { - context.Writer.WritePropertyName("authorityId"); - context.Writer.Write(publicRequest.AuthorityId); + JsonWriter writer = new JsonWriter(streamWriter); + writer.Validate = false; + writer.WriteObjectStart(); + var context = new JsonMarshallerContext(request, writer); + if(publicRequest.IsSetAuthorityId()) + { + context.Writer.WritePropertyName("authorityId"); + context.Writer.Write(publicRequest.AuthorityId); + } + + writer.WriteObjectEnd(); } - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); + request.Content = memoryStream.ToArray(); } diff --git a/sdk/src/Services/TaxSettings/Generated/Model/Internal/MarshallTransformations/ListSupplementalTaxRegistrationsRequestMarshaller.cs b/sdk/src/Services/TaxSettings/Generated/Model/Internal/MarshallTransformations/ListSupplementalTaxRegistrationsRequestMarshaller.cs index 2a0f076593e0..7f09310422b8 100644 --- a/sdk/src/Services/TaxSettings/Generated/Model/Internal/MarshallTransformations/ListSupplementalTaxRegistrationsRequestMarshaller.cs +++ b/sdk/src/Services/TaxSettings/Generated/Model/Internal/MarshallTransformations/ListSupplementalTaxRegistrationsRequestMarshaller.cs @@ -61,27 +61,30 @@ public IRequest Marshall(ListSupplementalTaxRegistrationsRequest publicRequest) request.HttpMethod = "POST"; request.ResourcePath = "/ListSupplementalTaxRegistrations"; - using (StringWriter stringWriter = new StringWriter(CultureInfo.InvariantCulture)) + using (MemoryStream memoryStream = new MemoryStream()) { - JsonWriter writer = new JsonWriter(stringWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetMaxResults()) + using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) { - context.Writer.WritePropertyName("maxResults"); - context.Writer.Write(publicRequest.MaxResults); - } + JsonWriter writer = new JsonWriter(streamWriter); + writer.Validate = false; + writer.WriteObjectStart(); + var context = new JsonMarshallerContext(request, writer); + if(publicRequest.IsSetMaxResults()) + { + context.Writer.WritePropertyName("maxResults"); + context.Writer.Write(publicRequest.MaxResults.Value); + } - if(publicRequest.IsSetNextToken()) - { - context.Writer.WritePropertyName("nextToken"); - context.Writer.Write(publicRequest.NextToken); + if(publicRequest.IsSetNextToken()) + { + context.Writer.WritePropertyName("nextToken"); + context.Writer.Write(publicRequest.NextToken); + } + + writer.WriteObjectEnd(); } - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); + request.Content = memoryStream.ToArray(); } diff --git a/sdk/src/Services/TaxSettings/Generated/Model/Internal/MarshallTransformations/PutSupplementalTaxRegistrationRequestMarshaller.cs b/sdk/src/Services/TaxSettings/Generated/Model/Internal/MarshallTransformations/PutSupplementalTaxRegistrationRequestMarshaller.cs index 73cfc220eedf..8c48ae48755e 100644 --- a/sdk/src/Services/TaxSettings/Generated/Model/Internal/MarshallTransformations/PutSupplementalTaxRegistrationRequestMarshaller.cs +++ b/sdk/src/Services/TaxSettings/Generated/Model/Internal/MarshallTransformations/PutSupplementalTaxRegistrationRequestMarshaller.cs @@ -61,26 +61,29 @@ public IRequest Marshall(PutSupplementalTaxRegistrationRequest publicRequest) request.HttpMethod = "POST"; request.ResourcePath = "/PutSupplementalTaxRegistration"; - using (StringWriter stringWriter = new StringWriter(CultureInfo.InvariantCulture)) + using (MemoryStream memoryStream = new MemoryStream()) { - JsonWriter writer = new JsonWriter(stringWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetTaxRegistrationEntry()) + using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) { - context.Writer.WritePropertyName("taxRegistrationEntry"); - context.Writer.WriteObjectStart(); + JsonWriter writer = new JsonWriter(streamWriter); + writer.Validate = false; + writer.WriteObjectStart(); + var context = new JsonMarshallerContext(request, writer); + if(publicRequest.IsSetTaxRegistrationEntry()) + { + context.Writer.WritePropertyName("taxRegistrationEntry"); + context.Writer.WriteObjectStart(); - var marshaller = SupplementalTaxRegistrationEntryMarshaller.Instance; - marshaller.Marshall(publicRequest.TaxRegistrationEntry, context); + var marshaller = SupplementalTaxRegistrationEntryMarshaller.Instance; + marshaller.Marshall(publicRequest.TaxRegistrationEntry, context); - context.Writer.WriteObjectEnd(); + context.Writer.WriteObjectEnd(); + } + + writer.WriteObjectEnd(); } - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); + request.Content = memoryStream.ToArray(); } diff --git a/sdk/src/Services/TaxSettings/Generated/Model/ListSupplementalTaxRegistrationsRequest.cs b/sdk/src/Services/TaxSettings/Generated/Model/ListSupplementalTaxRegistrationsRequest.cs index cf481cb71775..65e9572552c8 100644 --- a/sdk/src/Services/TaxSettings/Generated/Model/ListSupplementalTaxRegistrationsRequest.cs +++ b/sdk/src/Services/TaxSettings/Generated/Model/ListSupplementalTaxRegistrationsRequest.cs @@ -45,9 +45,9 @@ public partial class ListSupplementalTaxRegistrationsRequest : AmazonTaxSettings /// /// [AWSProperty(Min=1, Max=1000)] - public int MaxResults + public int? MaxResults { - get { return this._maxResults.GetValueOrDefault(); } + get { return this._maxResults; } set { this._maxResults = value; } } diff --git a/sdk/src/Services/TaxSettings/Generated/Model/_bcl45+netstandard/IListSupplementalTaxRegistrationsPaginator.cs b/sdk/src/Services/TaxSettings/Generated/Model/_bcl+netstandard/IListSupplementalTaxRegistrationsPaginator.cs similarity index 100% rename from sdk/src/Services/TaxSettings/Generated/Model/_bcl45+netstandard/IListSupplementalTaxRegistrationsPaginator.cs rename to sdk/src/Services/TaxSettings/Generated/Model/_bcl+netstandard/IListSupplementalTaxRegistrationsPaginator.cs diff --git a/sdk/src/Services/TaxSettings/Generated/Model/_bcl45+netstandard/ListSupplementalTaxRegistrationsPaginator.cs b/sdk/src/Services/TaxSettings/Generated/Model/_bcl+netstandard/ListSupplementalTaxRegistrationsPaginator.cs similarity index 100% rename from sdk/src/Services/TaxSettings/Generated/Model/_bcl45+netstandard/ListSupplementalTaxRegistrationsPaginator.cs rename to sdk/src/Services/TaxSettings/Generated/Model/_bcl+netstandard/ListSupplementalTaxRegistrationsPaginator.cs diff --git a/sdk/src/Services/TaxSettings/Generated/_bcl/AmazonTaxSettingsClient.cs b/sdk/src/Services/TaxSettings/Generated/_bcl/AmazonTaxSettingsClient.cs index 002042a32cec..75adbaba3f8b 100644 --- a/sdk/src/Services/TaxSettings/Generated/_bcl/AmazonTaxSettingsClient.cs +++ b/sdk/src/Services/TaxSettings/Generated/_bcl/AmazonTaxSettingsClient.cs @@ -428,30 +428,42 @@ public virtual BatchDeleteTaxRegistrationResponse BatchDeleteTaxRegistration(Bat /// ///
                • /// - /// If you use this operation to set a tax registration number (TRN) in Malaysia, only - /// resellers with a valid sales and service tax (SST) number are required to provide - /// tax registration information. + /// The sector valid values are Business and Individual. /// ///
                • /// - /// By using this API operation to set a TRN in Malaysia, Amazon Web Services will regard - /// you as self-declaring that you're an authorized business reseller registered with - /// the Royal Malaysia Customs Department (RMCD) and have a valid SST number. + /// RegistrationType valid values are NRIC for individual, and TIN and + /// sales and service tax (SST) for Business. /// ///
                • /// - /// Amazon Web Services reserves the right to seek additional information and/or take - /// other actions to support your self-declaration as appropriate. + /// For individual, you can specify the taxInformationNumber in MalaysiaAdditionalInfo + /// with NRIC type, and a valid MyKad or NRIC number. + /// + ///
                • + /// + /// For business, you must specify a businessRegistrationNumber in MalaysiaAdditionalInfo + /// with a TIN type and tax identification number. /// ///
                • /// - /// If you're not a reseller of Amazon Web Services, we don't recommend that you use this - /// operation to set the TRN in Malaysia. + /// For business resellers, you must specify a businessRegistrationNumber and taxInformationNumber + /// in MalaysiaAdditionalInfo with a sales and service tax (SST) type and a valid + /// SST number. /// ///
                • /// - /// Only use this API operation to upload the TRNs for accounts through which you're reselling - /// Amazon Web Services. + /// For business resellers with service codes, you must specify businessRegistrationNumber, + /// taxInformationNumber, and distinct serviceTaxCodes in MalaysiaAdditionalInfo + /// with a SST type and valid sales and service tax (SST) number. By using this API operation, + /// Amazon Web Services registers your self-declaration that you’re an authorized business + /// reseller registered with the Royal Malaysia Customs Department (RMCD), and have a + /// valid SST number. + /// + ///
                • + /// + /// Amazon Web Services reserves the right to seek additional information and/or take + /// other actions to support your self-declaration as appropriate. /// ///
                • /// @@ -668,30 +680,42 @@ public virtual BatchPutTaxRegistrationResponse BatchPutTaxRegistration(BatchPutT /// ///
                  • /// - /// If you use this operation to set a tax registration number (TRN) in Malaysia, only - /// resellers with a valid sales and service tax (SST) number are required to provide - /// tax registration information. + /// The sector valid values are Business and Individual. /// ///
                  • /// - /// By using this API operation to set a TRN in Malaysia, Amazon Web Services will regard - /// you as self-declaring that you're an authorized business reseller registered with - /// the Royal Malaysia Customs Department (RMCD) and have a valid SST number. + /// RegistrationType valid values are NRIC for individual, and TIN and + /// sales and service tax (SST) for Business. /// ///
                  • /// - /// Amazon Web Services reserves the right to seek additional information and/or take - /// other actions to support your self-declaration as appropriate. + /// For individual, you can specify the taxInformationNumber in MalaysiaAdditionalInfo + /// with NRIC type, and a valid MyKad or NRIC number. + /// + ///
                  • + /// + /// For business, you must specify a businessRegistrationNumber in MalaysiaAdditionalInfo + /// with a TIN type and tax identification number. /// ///
                  • /// - /// If you're not a reseller of Amazon Web Services, we don't recommend that you use this - /// operation to set the TRN in Malaysia. + /// For business resellers, you must specify a businessRegistrationNumber and taxInformationNumber + /// in MalaysiaAdditionalInfo with a sales and service tax (SST) type and a valid + /// SST number. /// ///
                  • /// - /// Only use this API operation to upload the TRNs for accounts through which you're reselling - /// Amazon Web Services. + /// For business resellers with service codes, you must specify businessRegistrationNumber, + /// taxInformationNumber, and distinct serviceTaxCodes in MalaysiaAdditionalInfo + /// with a SST type and valid sales and service tax (SST) number. By using this API operation, + /// Amazon Web Services registers your self-declaration that you’re an authorized business + /// reseller registered with the Royal Malaysia Customs Department (RMCD), and have a + /// valid SST number. + /// + ///
                  • + /// + /// Amazon Web Services reserves the right to seek additional information and/or take + /// other actions to support your self-declaration as appropriate. /// ///
                  • /// @@ -849,6 +873,73 @@ public virtual BatchPutTaxRegistrationResponse BatchPutTaxRegistration(BatchPutT #endregion + #region DeleteSupplementalTaxRegistration + + + /// + /// Deletes a supplemental tax registration for a single account. + /// + /// Container for the necessary parameters to execute the DeleteSupplementalTaxRegistration service method. + /// + /// The response from the DeleteSupplementalTaxRegistration service method, as returned by TaxSettings. + /// + /// The exception when the input is creating conflict with the given state. + /// + /// + /// The exception thrown when an unexpected error occurs when processing a request. + /// + /// + /// The exception thrown when the input doesn't have a resource associated to it. + /// + /// + /// The exception when the input doesn't pass validation for at least one of the input + /// parameters. + /// + /// REST API Reference for DeleteSupplementalTaxRegistration Operation + public virtual DeleteSupplementalTaxRegistrationResponse DeleteSupplementalTaxRegistration(DeleteSupplementalTaxRegistrationRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = DeleteSupplementalTaxRegistrationRequestMarshaller.Instance; + options.ResponseUnmarshaller = DeleteSupplementalTaxRegistrationResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// Deletes a supplemental tax registration for a single account. + /// + /// Container for the necessary parameters to execute the DeleteSupplementalTaxRegistration service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the DeleteSupplementalTaxRegistration service method, as returned by TaxSettings. + /// + /// The exception when the input is creating conflict with the given state. + /// + /// + /// The exception thrown when an unexpected error occurs when processing a request. + /// + /// + /// The exception thrown when the input doesn't have a resource associated to it. + /// + /// + /// The exception when the input doesn't pass validation for at least one of the input + /// parameters. + /// + /// REST API Reference for DeleteSupplementalTaxRegistration Operation + public virtual Task DeleteSupplementalTaxRegistrationAsync(DeleteSupplementalTaxRegistrationRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = DeleteSupplementalTaxRegistrationRequestMarshaller.Instance; + options.ResponseUnmarshaller = DeleteSupplementalTaxRegistrationResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + #region DeleteTaxRegistration @@ -1048,6 +1139,67 @@ public virtual GetTaxRegistrationDocumentResponse GetTaxRegistrationDocument(Get #endregion + #region ListSupplementalTaxRegistrations + + + /// + /// Retrieves supplemental tax registrations for a single account. + /// + /// Container for the necessary parameters to execute the ListSupplementalTaxRegistrations service method. + /// + /// The response from the ListSupplementalTaxRegistrations service method, as returned by TaxSettings. + /// + /// The exception thrown when an unexpected error occurs when processing a request. + /// + /// + /// The exception thrown when the input doesn't have a resource associated to it. + /// + /// + /// The exception when the input doesn't pass validation for at least one of the input + /// parameters. + /// + /// REST API Reference for ListSupplementalTaxRegistrations Operation + public virtual ListSupplementalTaxRegistrationsResponse ListSupplementalTaxRegistrations(ListSupplementalTaxRegistrationsRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = ListSupplementalTaxRegistrationsRequestMarshaller.Instance; + options.ResponseUnmarshaller = ListSupplementalTaxRegistrationsResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// Retrieves supplemental tax registrations for a single account. + /// + /// Container for the necessary parameters to execute the ListSupplementalTaxRegistrations service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the ListSupplementalTaxRegistrations service method, as returned by TaxSettings. + /// + /// The exception thrown when an unexpected error occurs when processing a request. + /// + /// + /// The exception thrown when the input doesn't have a resource associated to it. + /// + /// + /// The exception when the input doesn't pass validation for at least one of the input + /// parameters. + /// + /// REST API Reference for ListSupplementalTaxRegistrations Operation + public virtual Task ListSupplementalTaxRegistrationsAsync(ListSupplementalTaxRegistrationsRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = ListSupplementalTaxRegistrationsRequestMarshaller.Instance; + options.ResponseUnmarshaller = ListSupplementalTaxRegistrationsResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + #region ListTaxRegistrations @@ -1113,6 +1265,67 @@ public virtual ListTaxRegistrationsResponse ListTaxRegistrations(ListTaxRegistra #endregion + #region PutSupplementalTaxRegistration + + + /// + /// Stores supplemental tax registration for a single account. + /// + /// Container for the necessary parameters to execute the PutSupplementalTaxRegistration service method. + /// + /// The response from the PutSupplementalTaxRegistration service method, as returned by TaxSettings. + /// + /// The exception when the input is creating conflict with the given state. + /// + /// + /// The exception thrown when an unexpected error occurs when processing a request. + /// + /// + /// The exception when the input doesn't pass validation for at least one of the input + /// parameters. + /// + /// REST API Reference for PutSupplementalTaxRegistration Operation + public virtual PutSupplementalTaxRegistrationResponse PutSupplementalTaxRegistration(PutSupplementalTaxRegistrationRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = PutSupplementalTaxRegistrationRequestMarshaller.Instance; + options.ResponseUnmarshaller = PutSupplementalTaxRegistrationResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// Stores supplemental tax registration for a single account. + /// + /// Container for the necessary parameters to execute the PutSupplementalTaxRegistration service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the PutSupplementalTaxRegistration service method, as returned by TaxSettings. + /// + /// The exception when the input is creating conflict with the given state. + /// + /// + /// The exception thrown when an unexpected error occurs when processing a request. + /// + /// + /// The exception when the input doesn't pass validation for at least one of the input + /// parameters. + /// + /// REST API Reference for PutSupplementalTaxRegistration Operation + public virtual Task PutSupplementalTaxRegistrationAsync(PutSupplementalTaxRegistrationRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = PutSupplementalTaxRegistrationRequestMarshaller.Instance; + options.ResponseUnmarshaller = PutSupplementalTaxRegistrationResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + #region PutTaxRegistration @@ -1178,30 +1391,42 @@ public virtual ListTaxRegistrationsResponse ListTaxRegistrations(ListTaxRegistra /// ///
                    • /// - /// If you use this operation to set a tax registration number (TRN) in Malaysia, only - /// resellers with a valid sales and service tax (SST) number are required to provide - /// tax registration information. + /// The sector valid values are Business and Individual. /// ///
                    • /// - /// By using this API operation to set a TRN in Malaysia, Amazon Web Services will regard - /// you as self-declaring that you're an authorized business reseller registered with - /// the Royal Malaysia Customs Department (RMCD) and have a valid SST number. + /// RegistrationType valid values are NRIC for individual, and TIN and + /// sales and service tax (SST) for Business. /// ///
                    • /// - /// Amazon Web Services reserves the right to seek additional information and/or take - /// other actions to support your self-declaration as appropriate. + /// For individual, you can specify the taxInformationNumber in MalaysiaAdditionalInfo + /// with NRIC type, and a valid MyKad or NRIC number. + /// + ///
                    • + /// + /// For business, you must specify a businessRegistrationNumber in MalaysiaAdditionalInfo + /// with a TIN type and tax identification number. /// ///
                    • /// - /// If you're not a reseller of Amazon Web Services, we don't recommend that you use this - /// operation to set the TRN in Malaysia. + /// For business resellers, you must specify a businessRegistrationNumber and taxInformationNumber + /// in MalaysiaAdditionalInfo with a sales and service tax (SST) type and a valid + /// SST number. /// ///
                    • /// - /// Only use this API operation to upload the TRNs for accounts through which you're reselling - /// Amazon Web Services. + /// For business resellers with service codes, you must specify businessRegistrationNumber, + /// taxInformationNumber, and distinct serviceTaxCodes in MalaysiaAdditionalInfo + /// with a SST type and valid sales and service tax (SST) number. By using this API operation, + /// Amazon Web Services registers your self-declaration that you’re an authorized business + /// reseller registered with the Royal Malaysia Customs Department (RMCD), and have a + /// valid SST number. + /// + ///
                    • + /// + /// Amazon Web Services reserves the right to seek additional information and/or take + /// other actions to support your self-declaration as appropriate. /// ///
                    • /// @@ -1417,30 +1642,42 @@ public virtual PutTaxRegistrationResponse PutTaxRegistration(PutTaxRegistrationR /// ///
                      • /// - /// If you use this operation to set a tax registration number (TRN) in Malaysia, only - /// resellers with a valid sales and service tax (SST) number are required to provide - /// tax registration information. + /// The sector valid values are Business and Individual. /// ///
                      • /// - /// By using this API operation to set a TRN in Malaysia, Amazon Web Services will regard - /// you as self-declaring that you're an authorized business reseller registered with - /// the Royal Malaysia Customs Department (RMCD) and have a valid SST number. + /// RegistrationType valid values are NRIC for individual, and TIN and + /// sales and service tax (SST) for Business. /// ///
                      • /// - /// Amazon Web Services reserves the right to seek additional information and/or take - /// other actions to support your self-declaration as appropriate. + /// For individual, you can specify the taxInformationNumber in MalaysiaAdditionalInfo + /// with NRIC type, and a valid MyKad or NRIC number. + /// + ///
                      • + /// + /// For business, you must specify a businessRegistrationNumber in MalaysiaAdditionalInfo + /// with a TIN type and tax identification number. /// ///
                      • /// - /// If you're not a reseller of Amazon Web Services, we don't recommend that you use this - /// operation to set the TRN in Malaysia. + /// For business resellers, you must specify a businessRegistrationNumber and taxInformationNumber + /// in MalaysiaAdditionalInfo with a sales and service tax (SST) type and a valid + /// SST number. /// ///
                      • /// - /// Only use this API operation to upload the TRNs for accounts through which you're reselling - /// Amazon Web Services. + /// For business resellers with service codes, you must specify businessRegistrationNumber, + /// taxInformationNumber, and distinct serviceTaxCodes in MalaysiaAdditionalInfo + /// with a SST type and valid sales and service tax (SST) number. By using this API operation, + /// Amazon Web Services registers your self-declaration that you’re an authorized business + /// reseller registered with the Royal Malaysia Customs Department (RMCD), and have a + /// valid SST number. + /// + ///
                      • + /// + /// Amazon Web Services reserves the right to seek additional information and/or take + /// other actions to support your self-declaration as appropriate. /// ///
                      • /// diff --git a/sdk/src/Services/TaxSettings/Properties/AssemblyInfo.cs b/sdk/src/Services/TaxSettings/Properties/AssemblyInfo.cs index f95cc1fe1545..3981c4a53a19 100644 --- a/sdk/src/Services/TaxSettings/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/TaxSettings/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.8")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/TaxSettings/TaxSettings.sln b/sdk/src/Services/TaxSettings/TaxSettings.sln index 0ce67b615870..c8f2e02d768a 100644 --- a/sdk/src/Services/TaxSettings/TaxSettings.sln +++ b/sdk/src/Services/TaxSettings/TaxSettings.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {5DF00669-DA3C-4634-84B8-5BCC40F952D5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {5DF00669-DA3C-4634-84B8-5BCC40F952D5}.Debug|Any CPU.Build.0 = Debug|Any CPU {5DF00669-DA3C-4634-84B8-5BCC40F952D5}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {9AEE8F40-E494-4B41-B988-6434264DDDF2}.Debug|Any CPU.Build.0 = Debug|Any CPU {9AEE8F40-E494-4B41-B988-6434264DDDF2}.Release|Any CPU.ActiveCfg = Release|Any CPU {9AEE8F40-E494-4B41-B988-6434264DDDF2}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {23625F96-30F4-45EA-8310-6936899CD8B5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {23625F96-30F4-45EA-8310-6936899CD8B5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {23625F96-30F4-45EA-8310-6936899CD8B5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {23625F96-30F4-45EA-8310-6936899CD8B5}.Release|Any CPU.Build.0 = Release|Any CPU - {EFA4DE11-412A-4B67-8C4F-CFB50A05739E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EFA4DE11-412A-4B67-8C4F-CFB50A05739E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EFA4DE11-412A-4B67-8C4F-CFB50A05739E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EFA4DE11-412A-4B67-8C4F-CFB50A05739E}.Release|Any CPU.Build.0 = Release|Any CPU - {D558805D-94B1-4838-8F75-0E096603400F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D558805D-94B1-4838-8F75-0E096603400F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D558805D-94B1-4838-8F75-0E096603400F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D558805D-94B1-4838-8F75-0E096603400F}.Release|Any CPU.Build.0 = Release|Any CPU - {B8AB9B2E-EEEA-4E85-B2E7-18388B9E5573}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B8AB9B2E-EEEA-4E85-B2E7-18388B9E5573}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B8AB9B2E-EEEA-4E85-B2E7-18388B9E5573}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B8AB9B2E-EEEA-4E85-B2E7-18388B9E5573}.Release|Any CPU.Build.0 = Release|Any CPU - {8E9F26CE-CB92-4390-B2C3-E708FED5F018}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8E9F26CE-CB92-4390-B2C3-E708FED5F018}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8E9F26CE-CB92-4390-B2C3-E708FED5F018}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8E9F26CE-CB92-4390-B2C3-E708FED5F018}.Release|Any CPU.Build.0 = Release|Any CPU - {D9AFBEA8-F28E-4697-8EC3-10857D5A5966}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D9AFBEA8-F28E-4697-8EC3-10857D5A5966}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D9AFBEA8-F28E-4697-8EC3-10857D5A5966}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D9AFBEA8-F28E-4697-8EC3-10857D5A5966}.Release|Any CPU.Build.0 = Release|Any CPU - {2ECFB68D-9695-4F83-AB6B-593BB1E67A67}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2ECFB68D-9695-4F83-AB6B-593BB1E67A67}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2ECFB68D-9695-4F83-AB6B-593BB1E67A67}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2ECFB68D-9695-4F83-AB6B-593BB1E67A67}.Release|Any CPU.Build.0 = Release|Any CPU - {BB19A3F1-EDA8-4A4F-8FBF-28E5AA341014}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BB19A3F1-EDA8-4A4F-8FBF-28E5AA341014}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BB19A3F1-EDA8-4A4F-8FBF-28E5AA341014}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BB19A3F1-EDA8-4A4F-8FBF-28E5AA341014}.Release|Any CPU.Build.0 = Release|Any CPU - {C19E7C38-393D-42C2-9514-91788BAA1665}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C19E7C38-393D-42C2-9514-91788BAA1665}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C19E7C38-393D-42C2-9514-91788BAA1665}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C19E7C38-393D-42C2-9514-91788BAA1665}.Release|Any CPU.Build.0 = Release|Any CPU - {485D6C71-FA01-44A6-946C-B4D098D7C73F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {485D6C71-FA01-44A6-946C-B4D098D7C73F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {485D6C71-FA01-44A6-946C-B4D098D7C73F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {485D6C71-FA01-44A6-946C-B4D098D7C73F}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {23625F96-30F4-45EA-8310-6936899CD8B5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {23625F96-30F4-45EA-8310-6936899CD8B5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {23625F96-30F4-45EA-8310-6936899CD8B5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {23625F96-30F4-45EA-8310-6936899CD8B5}.Release|Any CPU.Build.0 = Release|Any CPU - {EFA4DE11-412A-4B67-8C4F-CFB50A05739E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EFA4DE11-412A-4B67-8C4F-CFB50A05739E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EFA4DE11-412A-4B67-8C4F-CFB50A05739E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EFA4DE11-412A-4B67-8C4F-CFB50A05739E}.Release|Any CPU.Build.0 = Release|Any CPU - {D558805D-94B1-4838-8F75-0E096603400F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D558805D-94B1-4838-8F75-0E096603400F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D558805D-94B1-4838-8F75-0E096603400F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D558805D-94B1-4838-8F75-0E096603400F}.Release|Any CPU.Build.0 = Release|Any CPU - {B8AB9B2E-EEEA-4E85-B2E7-18388B9E5573}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B8AB9B2E-EEEA-4E85-B2E7-18388B9E5573}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B8AB9B2E-EEEA-4E85-B2E7-18388B9E5573}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B8AB9B2E-EEEA-4E85-B2E7-18388B9E5573}.Release|Any CPU.Build.0 = Release|Any CPU - {8E9F26CE-CB92-4390-B2C3-E708FED5F018}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8E9F26CE-CB92-4390-B2C3-E708FED5F018}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8E9F26CE-CB92-4390-B2C3-E708FED5F018}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8E9F26CE-CB92-4390-B2C3-E708FED5F018}.Release|Any CPU.Build.0 = Release|Any CPU - {D9AFBEA8-F28E-4697-8EC3-10857D5A5966}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D9AFBEA8-F28E-4697-8EC3-10857D5A5966}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D9AFBEA8-F28E-4697-8EC3-10857D5A5966}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D9AFBEA8-F28E-4697-8EC3-10857D5A5966}.Release|Any CPU.Build.0 = Release|Any CPU - {2ECFB68D-9695-4F83-AB6B-593BB1E67A67}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2ECFB68D-9695-4F83-AB6B-593BB1E67A67}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2ECFB68D-9695-4F83-AB6B-593BB1E67A67}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2ECFB68D-9695-4F83-AB6B-593BB1E67A67}.Release|Any CPU.Build.0 = Release|Any CPU - {BB19A3F1-EDA8-4A4F-8FBF-28E5AA341014}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BB19A3F1-EDA8-4A4F-8FBF-28E5AA341014}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BB19A3F1-EDA8-4A4F-8FBF-28E5AA341014}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BB19A3F1-EDA8-4A4F-8FBF-28E5AA341014}.Release|Any CPU.Build.0 = Release|Any CPU - {C19E7C38-393D-42C2-9514-91788BAA1665}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C19E7C38-393D-42C2-9514-91788BAA1665}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C19E7C38-393D-42C2-9514-91788BAA1665}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C19E7C38-393D-42C2-9514-91788BAA1665}.Release|Any CPU.Build.0 = Release|Any CPU - {485D6C71-FA01-44A6-946C-B4D098D7C73F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {485D6C71-FA01-44A6-946C-B4D098D7C73F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {485D6C71-FA01-44A6-946C-B4D098D7C73F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {485D6C71-FA01-44A6-946C-B4D098D7C73F}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {5DF00669-DA3C-4634-84B8-5BCC40F952D5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {3C471E93-A423-416D-90C7-B652E1F41F47} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {0E246405-31BE-4A81-9C60-51371CD8B316} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {2BC84A04-BD0F-4F54-AE58-5403362E1C24} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {9AEE8F40-E494-4B41-B988-6434264DDDF2} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {23625F96-30F4-45EA-8310-6936899CD8B5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {EFA4DE11-412A-4B67-8C4F-CFB50A05739E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D558805D-94B1-4838-8F75-0E096603400F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B8AB9B2E-EEEA-4E85-B2E7-18388B9E5573} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8E9F26CE-CB92-4390-B2C3-E708FED5F018} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D9AFBEA8-F28E-4697-8EC3-10857D5A5966} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {2ECFB68D-9695-4F83-AB6B-593BB1E67A67} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {BB19A3F1-EDA8-4A4F-8FBF-28E5AA341014} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C19E7C38-393D-42C2-9514-91788BAA1665} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {485D6C71-FA01-44A6-946C-B4D098D7C73F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {23625F96-30F4-45EA-8310-6936899CD8B5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {EFA4DE11-412A-4B67-8C4F-CFB50A05739E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D558805D-94B1-4838-8F75-0E096603400F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B8AB9B2E-EEEA-4E85-B2E7-18388B9E5573} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8E9F26CE-CB92-4390-B2C3-E708FED5F018} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D9AFBEA8-F28E-4697-8EC3-10857D5A5966} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {2ECFB68D-9695-4F83-AB6B-593BB1E67A67} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {BB19A3F1-EDA8-4A4F-8FBF-28E5AA341014} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C19E7C38-393D-42C2-9514-91788BAA1665} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {485D6C71-FA01-44A6-946C-B4D098D7C73F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {F512B728-4B21-40DA-A7B1-190E0F7FB82B} diff --git a/sdk/src/Services/Textract/Generated/AmazonTextractConfig.cs b/sdk/src/Services/Textract/Generated/AmazonTextractConfig.cs index 6fa0d554e92a..690022d1fc27 100644 --- a/sdk/src/Services/Textract/Generated/AmazonTextractConfig.cs +++ b/sdk/src/Services/Textract/Generated/AmazonTextractConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.Textract public partial class AmazonTextractConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("Textract", "4.0.0.0"); private static readonly AmazonTextractEndpointResolver EndpointResolver = new AmazonTextractEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("Textract", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("Textract", "3.7.400.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/Textract/Properties/AssemblyInfo.cs b/sdk/src/Services/Textract/Properties/AssemblyInfo.cs index 032667720f54..5b861ab3395c 100644 --- a/sdk/src/Services/Textract/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/Textract/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/Textract/Textract.sln b/sdk/src/Services/Textract/Textract.sln index 348f56972ecf..314a8d19b28d 100644 --- a/sdk/src/Services/Textract/Textract.sln +++ b/sdk/src/Services/Textract/Textract.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {BAD8C53F-E6CF-4200-AD1E-56FBA184FE13}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {BAD8C53F-E6CF-4200-AD1E-56FBA184FE13}.Debug|Any CPU.Build.0 = Debug|Any CPU {BAD8C53F-E6CF-4200-AD1E-56FBA184FE13}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {80215BF2-55EE-44EF-AEC5-9B1A40A79A02}.Debug|Any CPU.Build.0 = Debug|Any CPU {80215BF2-55EE-44EF-AEC5-9B1A40A79A02}.Release|Any CPU.ActiveCfg = Release|Any CPU {80215BF2-55EE-44EF-AEC5-9B1A40A79A02}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {9F64DC37-651D-41CB-9825-DA917EFB867F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9F64DC37-651D-41CB-9825-DA917EFB867F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9F64DC37-651D-41CB-9825-DA917EFB867F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9F64DC37-651D-41CB-9825-DA917EFB867F}.Release|Any CPU.Build.0 = Release|Any CPU - {E86364C6-4AA5-4CB3-A961-DD3E6D10A227}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E86364C6-4AA5-4CB3-A961-DD3E6D10A227}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E86364C6-4AA5-4CB3-A961-DD3E6D10A227}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E86364C6-4AA5-4CB3-A961-DD3E6D10A227}.Release|Any CPU.Build.0 = Release|Any CPU - {6B8004E3-C445-48E3-822E-85AA255D80EF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6B8004E3-C445-48E3-822E-85AA255D80EF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6B8004E3-C445-48E3-822E-85AA255D80EF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6B8004E3-C445-48E3-822E-85AA255D80EF}.Release|Any CPU.Build.0 = Release|Any CPU - {C7C3EDE8-3421-40B9-B0F7-A37DC4BF932A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C7C3EDE8-3421-40B9-B0F7-A37DC4BF932A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C7C3EDE8-3421-40B9-B0F7-A37DC4BF932A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C7C3EDE8-3421-40B9-B0F7-A37DC4BF932A}.Release|Any CPU.Build.0 = Release|Any CPU - {56550DFF-4294-46A8-BF09-2F4C3D5D2EF8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {56550DFF-4294-46A8-BF09-2F4C3D5D2EF8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {56550DFF-4294-46A8-BF09-2F4C3D5D2EF8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {56550DFF-4294-46A8-BF09-2F4C3D5D2EF8}.Release|Any CPU.Build.0 = Release|Any CPU - {818EA7CE-B411-4E90-9A5A-4CDF6E3BDDED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {818EA7CE-B411-4E90-9A5A-4CDF6E3BDDED}.Debug|Any CPU.Build.0 = Debug|Any CPU - {818EA7CE-B411-4E90-9A5A-4CDF6E3BDDED}.Release|Any CPU.ActiveCfg = Release|Any CPU - {818EA7CE-B411-4E90-9A5A-4CDF6E3BDDED}.Release|Any CPU.Build.0 = Release|Any CPU - {25304266-0C3A-447F-87D3-534F9F1E5F1E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {25304266-0C3A-447F-87D3-534F9F1E5F1E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {25304266-0C3A-447F-87D3-534F9F1E5F1E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {25304266-0C3A-447F-87D3-534F9F1E5F1E}.Release|Any CPU.Build.0 = Release|Any CPU - {2B06CB2D-AB97-4B24-BA74-0A18C5F5F6B4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2B06CB2D-AB97-4B24-BA74-0A18C5F5F6B4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2B06CB2D-AB97-4B24-BA74-0A18C5F5F6B4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2B06CB2D-AB97-4B24-BA74-0A18C5F5F6B4}.Release|Any CPU.Build.0 = Release|Any CPU - {3742ECE6-5ADC-429A-BA48-5228D383434C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3742ECE6-5ADC-429A-BA48-5228D383434C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3742ECE6-5ADC-429A-BA48-5228D383434C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3742ECE6-5ADC-429A-BA48-5228D383434C}.Release|Any CPU.Build.0 = Release|Any CPU - {40B735E8-B173-4BDC-9834-35FDF8E286CD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {40B735E8-B173-4BDC-9834-35FDF8E286CD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {40B735E8-B173-4BDC-9834-35FDF8E286CD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {40B735E8-B173-4BDC-9834-35FDF8E286CD}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {9F64DC37-651D-41CB-9825-DA917EFB867F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9F64DC37-651D-41CB-9825-DA917EFB867F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9F64DC37-651D-41CB-9825-DA917EFB867F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9F64DC37-651D-41CB-9825-DA917EFB867F}.Release|Any CPU.Build.0 = Release|Any CPU - {E86364C6-4AA5-4CB3-A961-DD3E6D10A227}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E86364C6-4AA5-4CB3-A961-DD3E6D10A227}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E86364C6-4AA5-4CB3-A961-DD3E6D10A227}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E86364C6-4AA5-4CB3-A961-DD3E6D10A227}.Release|Any CPU.Build.0 = Release|Any CPU - {6B8004E3-C445-48E3-822E-85AA255D80EF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6B8004E3-C445-48E3-822E-85AA255D80EF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6B8004E3-C445-48E3-822E-85AA255D80EF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6B8004E3-C445-48E3-822E-85AA255D80EF}.Release|Any CPU.Build.0 = Release|Any CPU - {C7C3EDE8-3421-40B9-B0F7-A37DC4BF932A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C7C3EDE8-3421-40B9-B0F7-A37DC4BF932A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C7C3EDE8-3421-40B9-B0F7-A37DC4BF932A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C7C3EDE8-3421-40B9-B0F7-A37DC4BF932A}.Release|Any CPU.Build.0 = Release|Any CPU - {56550DFF-4294-46A8-BF09-2F4C3D5D2EF8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {56550DFF-4294-46A8-BF09-2F4C3D5D2EF8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {56550DFF-4294-46A8-BF09-2F4C3D5D2EF8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {56550DFF-4294-46A8-BF09-2F4C3D5D2EF8}.Release|Any CPU.Build.0 = Release|Any CPU - {818EA7CE-B411-4E90-9A5A-4CDF6E3BDDED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {818EA7CE-B411-4E90-9A5A-4CDF6E3BDDED}.Debug|Any CPU.Build.0 = Debug|Any CPU - {818EA7CE-B411-4E90-9A5A-4CDF6E3BDDED}.Release|Any CPU.ActiveCfg = Release|Any CPU - {818EA7CE-B411-4E90-9A5A-4CDF6E3BDDED}.Release|Any CPU.Build.0 = Release|Any CPU - {25304266-0C3A-447F-87D3-534F9F1E5F1E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {25304266-0C3A-447F-87D3-534F9F1E5F1E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {25304266-0C3A-447F-87D3-534F9F1E5F1E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {25304266-0C3A-447F-87D3-534F9F1E5F1E}.Release|Any CPU.Build.0 = Release|Any CPU - {2B06CB2D-AB97-4B24-BA74-0A18C5F5F6B4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2B06CB2D-AB97-4B24-BA74-0A18C5F5F6B4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2B06CB2D-AB97-4B24-BA74-0A18C5F5F6B4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2B06CB2D-AB97-4B24-BA74-0A18C5F5F6B4}.Release|Any CPU.Build.0 = Release|Any CPU - {3742ECE6-5ADC-429A-BA48-5228D383434C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3742ECE6-5ADC-429A-BA48-5228D383434C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3742ECE6-5ADC-429A-BA48-5228D383434C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3742ECE6-5ADC-429A-BA48-5228D383434C}.Release|Any CPU.Build.0 = Release|Any CPU - {40B735E8-B173-4BDC-9834-35FDF8E286CD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {40B735E8-B173-4BDC-9834-35FDF8E286CD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {40B735E8-B173-4BDC-9834-35FDF8E286CD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {40B735E8-B173-4BDC-9834-35FDF8E286CD}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {BAD8C53F-E6CF-4200-AD1E-56FBA184FE13} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {8E844896-5816-4D1A-AD34-79231318DEEC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {77AAFD6E-0F39-4EEF-87E5-01FCFA95F7A1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {431E3285-8681-4F3E-9E60-B2C995DC14CE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {80215BF2-55EE-44EF-AEC5-9B1A40A79A02} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {9F64DC37-651D-41CB-9825-DA917EFB867F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E86364C6-4AA5-4CB3-A961-DD3E6D10A227} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6B8004E3-C445-48E3-822E-85AA255D80EF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C7C3EDE8-3421-40B9-B0F7-A37DC4BF932A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {56550DFF-4294-46A8-BF09-2F4C3D5D2EF8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {818EA7CE-B411-4E90-9A5A-4CDF6E3BDDED} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {25304266-0C3A-447F-87D3-534F9F1E5F1E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {2B06CB2D-AB97-4B24-BA74-0A18C5F5F6B4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {3742ECE6-5ADC-429A-BA48-5228D383434C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {40B735E8-B173-4BDC-9834-35FDF8E286CD} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {9F64DC37-651D-41CB-9825-DA917EFB867F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E86364C6-4AA5-4CB3-A961-DD3E6D10A227} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6B8004E3-C445-48E3-822E-85AA255D80EF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C7C3EDE8-3421-40B9-B0F7-A37DC4BF932A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {56550DFF-4294-46A8-BF09-2F4C3D5D2EF8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {818EA7CE-B411-4E90-9A5A-4CDF6E3BDDED} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {25304266-0C3A-447F-87D3-534F9F1E5F1E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {2B06CB2D-AB97-4B24-BA74-0A18C5F5F6B4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {3742ECE6-5ADC-429A-BA48-5228D383434C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {40B735E8-B173-4BDC-9834-35FDF8E286CD} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {C0C546E5-335B-4A4D-9B6C-C890AEAB1B3E} diff --git a/sdk/src/Services/TimestreamInfluxDB/Generated/AmazonTimestreamInfluxDBConfig.cs b/sdk/src/Services/TimestreamInfluxDB/Generated/AmazonTimestreamInfluxDBConfig.cs index ad9052d1915a..10900aa25c9a 100644 --- a/sdk/src/Services/TimestreamInfluxDB/Generated/AmazonTimestreamInfluxDBConfig.cs +++ b/sdk/src/Services/TimestreamInfluxDB/Generated/AmazonTimestreamInfluxDBConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.TimestreamInfluxDB public partial class AmazonTimestreamInfluxDBConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("Timestream InfluxDB", "4.0.0.0"); private static readonly AmazonTimestreamInfluxDBEndpointResolver EndpointResolver = new AmazonTimestreamInfluxDBEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("Timestream InfluxDB", "3.7.401.13"); -======= - InternalSDKUtils.BuildUserAgentString("Timestream InfluxDB", "3.7.403.20"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/TimestreamInfluxDB/Generated/Model/CreateDbInstanceRequest.cs b/sdk/src/Services/TimestreamInfluxDB/Generated/Model/CreateDbInstanceRequest.cs index 6219da82aa9a..bf16657dc161 100644 --- a/sdk/src/Services/TimestreamInfluxDB/Generated/Model/CreateDbInstanceRequest.cs +++ b/sdk/src/Services/TimestreamInfluxDB/Generated/Model/CreateDbInstanceRequest.cs @@ -287,9 +287,9 @@ internal bool IsSetPassword() /// /// [AWSProperty(Min=1024, Max=65535)] - public int Port + public int? Port { - get { return this._port.GetValueOrDefault(); } + get { return this._port; } set { this._port = value; } } diff --git a/sdk/src/Services/TimestreamInfluxDB/Generated/Model/CreateDbInstanceResponse.cs b/sdk/src/Services/TimestreamInfluxDB/Generated/Model/CreateDbInstanceResponse.cs index ee9bcb1a5733..7ec0dd42f0e5 100644 --- a/sdk/src/Services/TimestreamInfluxDB/Generated/Model/CreateDbInstanceResponse.cs +++ b/sdk/src/Services/TimestreamInfluxDB/Generated/Model/CreateDbInstanceResponse.cs @@ -285,9 +285,9 @@ internal bool IsSetName() /// /// [AWSProperty(Min=1024, Max=65535)] - public int Port + public int? Port { - get { return this._port.GetValueOrDefault(); } + get { return this._port; } set { this._port = value; } } diff --git a/sdk/src/Services/TimestreamInfluxDB/Generated/Model/DbInstanceSummary.cs b/sdk/src/Services/TimestreamInfluxDB/Generated/Model/DbInstanceSummary.cs index cae00599ac50..3cbb38bc391b 100644 --- a/sdk/src/Services/TimestreamInfluxDB/Generated/Model/DbInstanceSummary.cs +++ b/sdk/src/Services/TimestreamInfluxDB/Generated/Model/DbInstanceSummary.cs @@ -201,9 +201,9 @@ internal bool IsSetName() /// ///
            [AWSProperty(Min=1024, Max=65535)] - public int Port + public int? Port { - get { return this._port.GetValueOrDefault(); } + get { return this._port; } set { this._port = value; } } diff --git a/sdk/src/Services/TimestreamInfluxDB/Generated/Model/DeleteDbInstanceResponse.cs b/sdk/src/Services/TimestreamInfluxDB/Generated/Model/DeleteDbInstanceResponse.cs index 2c3d5dc9f631..089e31fa0404 100644 --- a/sdk/src/Services/TimestreamInfluxDB/Generated/Model/DeleteDbInstanceResponse.cs +++ b/sdk/src/Services/TimestreamInfluxDB/Generated/Model/DeleteDbInstanceResponse.cs @@ -285,9 +285,9 @@ internal bool IsSetName() /// ///             [AWSProperty(Min=1024, Max=65535)] - public int Port + public int? Port { - get { return this._port.GetValueOrDefault(); } + get { return this._port; } set { this._port = value; } } diff --git a/sdk/src/Services/TimestreamInfluxDB/Generated/Model/Duration.cs b/sdk/src/Services/TimestreamInfluxDB/Generated/Model/Duration.cs index 4c02afb13b3a..4489ea2c9538 100644 --- a/sdk/src/Services/TimestreamInfluxDB/Generated/Model/Duration.cs +++ b/sdk/src/Services/TimestreamInfluxDB/Generated/Model/Duration.cs @@ -63,9 +63,9 @@ internal bool IsSetDurationType() /// ///             [AWSProperty(Required=true, Min=0)] - public long Value + public long? Value { - get { return this._value.GetValueOrDefault(); } + get { return this._value; } set { this._value = value; } } diff --git a/sdk/src/Services/TimestreamInfluxDB/Generated/Model/GetDbInstanceResponse.cs b/sdk/src/Services/TimestreamInfluxDB/Generated/Model/GetDbInstanceResponse.cs index 22d8250e03bf..da8c0b30c84f 100644 --- a/sdk/src/Services/TimestreamInfluxDB/Generated/Model/GetDbInstanceResponse.cs +++ b/sdk/src/Services/TimestreamInfluxDB/Generated/Model/GetDbInstanceResponse.cs @@ -285,9 +285,9 @@ internal bool IsSetName() /// ///             [AWSProperty(Min=1024, Max=65535)] - public int Port + public int? Port { - get { return this._port.GetValueOrDefault(); } + get { return this._port; } set { this._port = value; } } diff --git a/sdk/src/Services/TimestreamInfluxDB/Generated/Model/InfluxDBv2Parameters.cs b/sdk/src/Services/TimestreamInfluxDB/Generated/Model/InfluxDBv2Parameters.cs index 2f8a9cf9db77..b6c636ed9f85 100644 --- a/sdk/src/Services/TimestreamInfluxDB/Generated/Model/InfluxDBv2Parameters.cs +++ b/sdk/src/Services/TimestreamInfluxDB/Generated/Model/InfluxDBv2Parameters.cs @@ -195,9 +195,9 @@ internal bool IsSetHttpWriteTimeout() /// ///             [AWSProperty(Min=0, Max=1000000000000)] - public long InfluxqlMaxSelectBuckets + public long? InfluxqlMaxSelectBuckets { - get { return this._influxqlMaxSelectBuckets.GetValueOrDefault(); } + get { return this._influxqlMaxSelectBuckets; } set { this._influxqlMaxSelectBuckets = value; } } @@ -220,9 +220,9 @@ internal bool IsSetInfluxqlMaxSelectBuckets() /// ///             [AWSProperty(Min=0, Max=1000000000000)] - public long InfluxqlMaxSelectPoint + public long? InfluxqlMaxSelectPoint { - get { return this._influxqlMaxSelectPoint.GetValueOrDefault(); } + get { return this._influxqlMaxSelectPoint; } set { this._influxqlMaxSelectPoint = value; } } @@ -244,9 +244,9 @@ internal bool IsSetInfluxqlMaxSelectPoint() /// ///             [AWSProperty(Min=0, Max=1000000000000)] - public long InfluxqlMaxSelectSeries + public long? InfluxqlMaxSelectSeries { - get { return this._influxqlMaxSelectSeries.GetValueOrDefault(); } + get { return this._influxqlMaxSelectSeries; } set { this._influxqlMaxSelectSeries = value; } } @@ -336,9 +336,9 @@ internal bool IsSetNoTasks() /// Default: false /// ///             - public bool PprofDisabled + public bool? PprofDisabled { - get { return this._pprofDisabled.GetValueOrDefault(); } + get { return this._pprofDisabled; } set { this._pprofDisabled = value; } } @@ -383,9 +383,9 @@ internal bool IsSetQueryConcurrency() /// ///             [AWSProperty(Min=0, Max=1000000000000)] - public long QueryInitialMemoryBytes + public long? QueryInitialMemoryBytes { - get { return this._queryInitialMemoryBytes.GetValueOrDefault(); } + get { return this._queryInitialMemoryBytes; } set { this._queryInitialMemoryBytes = value; } } @@ -408,9 +408,9 @@ internal bool IsSetQueryInitialMemoryBytes() /// ///             [AWSProperty(Min=0, Max=1000000000000)] - public long QueryMaxMemoryBytes + public long? QueryMaxMemoryBytes { - get { return this._queryMaxMemoryBytes.GetValueOrDefault(); } + get { return this._queryMaxMemoryBytes; } set { this._queryMaxMemoryBytes = value; } } @@ -431,9 +431,9 @@ internal bool IsSetQueryMaxMemoryBytes() /// ///             [AWSProperty(Min=0, Max=1000000000000)] - public long QueryMemoryBytes + public long? QueryMemoryBytes { - get { return this._queryMemoryBytes.GetValueOrDefault(); } + get { return this._queryMemoryBytes; } set { this._queryMemoryBytes = value; } } @@ -479,9 +479,9 @@ internal bool IsSetQueryQueueSize() /// ///             [AWSProperty(Min=1, Max=2880)] - public int SessionLength + public int? SessionLength { - get { return this._sessionLength.GetValueOrDefault(); } + get { return this._sessionLength; } set { this._sessionLength = value; } } @@ -504,9 +504,9 @@ internal bool IsSetSessionLength() /// Default: false /// ///             - public bool SessionRenewDisabled + public bool? SessionRenewDisabled { - get { return this._sessionRenewDisabled.GetValueOrDefault(); } + get { return this._sessionRenewDisabled; } set { this._sessionRenewDisabled = value; } } @@ -529,9 +529,9 @@ internal bool IsSetSessionRenewDisabled() /// ///             [AWSProperty(Min=0, Max=1000000000000)] - public long StorageCacheMaxMemorySize + public long? StorageCacheMaxMemorySize { - get { return this._storageCacheMaxMemorySize.GetValueOrDefault(); } + get { return this._storageCacheMaxMemorySize; } set { this._storageCacheMaxMemorySize = value; } } @@ -553,9 +553,9 @@ internal bool IsSetStorageCacheMaxMemorySize() /// ///             [AWSProperty(Min=0, Max=1000000000000)] - public long StorageCacheSnapshotMemorySize + public long? StorageCacheSnapshotMemorySize { - get { return this._storageCacheSnapshotMemorySize.GetValueOrDefault(); } + get { return this._storageCacheSnapshotMemorySize; } set { this._storageCacheSnapshotMemorySize = value; } } @@ -622,9 +622,9 @@ internal bool IsSetStorageCompactFullWriteColdDuration() ///             /// [AWSProperty(Min=0, Max=1000000000000)] - public long StorageCompactThroughputBurst + public long? StorageCompactThroughputBurst { - get { return this._storageCompactThroughputBurst.GetValueOrDefault(); } + get { return this._storageCompactThroughputBurst; } set { this._storageCompactThroughputBurst = value; } } @@ -647,9 +647,9 @@ internal bool IsSetStorageCompactThroughputBurst() ///             /// [AWSProperty(Min=0, Max=64)] - public int StorageMaxConcurrentCompactions + public int? StorageMaxConcurrentCompactions { - get { return this._storageMaxConcurrentCompactions.GetValueOrDefault(); } + get { return this._storageMaxConcurrentCompactions; } set { this._storageMaxConcurrentCompactions = value; } } @@ -672,9 +672,9 @@ internal bool IsSetStorageMaxConcurrentCompactions() ///             /// [AWSProperty(Min=0, Max=1000000000000)] - public long StorageMaxIndexLogFileSize + public long? StorageMaxIndexLogFileSize { - get { return this._storageMaxIndexLogFileSize.GetValueOrDefault(); } + get { return this._storageMaxIndexLogFileSize; } set { this._storageMaxIndexLogFileSize = value; } } @@ -694,9 +694,9 @@ internal bool IsSetStorageMaxIndexLogFileSize() /// Default: false /// /// - public bool StorageNoValidateFieldSize + public bool? StorageNoValidateFieldSize { - get { return this._storageNoValidateFieldSize.GetValueOrDefault(); } + get { return this._storageNoValidateFieldSize; } set { this._storageNoValidateFieldSize = value; } } @@ -740,9 +740,9 @@ internal bool IsSetStorageRetentionCheckInterval() /// /// [AWSProperty(Min=0, Max=64)] - public int StorageSeriesFileMaxConcurrentSnapshotCompactions + public int? StorageSeriesFileMaxConcurrentSnapshotCompactions { - get { return this._storageSeriesFileMaxConcurrentSnapshotCompactions.GetValueOrDefault(); } + get { return this._storageSeriesFileMaxConcurrentSnapshotCompactions; } set { this._storageSeriesFileMaxConcurrentSnapshotCompactions = value; } } @@ -766,9 +766,9 @@ internal bool IsSetStorageSeriesFileMaxConcurrentSnapshotCompactions() /// /// [AWSProperty(Min=0, Max=1000000000000)] - public long StorageSeriesIdSetCacheSize + public long? StorageSeriesIdSetCacheSize { - get { return this._storageSeriesIdSetCacheSize.GetValueOrDefault(); } + get { return this._storageSeriesIdSetCacheSize; } set { this._storageSeriesIdSetCacheSize = value; } } @@ -790,9 +790,9 @@ internal bool IsSetStorageSeriesIdSetCacheSize() /// /// [AWSProperty(Min=0, Max=256)] - public int StorageWalMaxConcurrentWrites + public int? StorageWalMaxConcurrentWrites { - get { return this._storageWalMaxConcurrentWrites.GetValueOrDefault(); } + get { return this._storageWalMaxConcurrentWrites; } set { this._storageWalMaxConcurrentWrites = value; } } @@ -856,9 +856,9 @@ internal bool IsSetTracingType() /// Default: false /// /// - public bool UiDisabled + public bool? UiDisabled { - get { return this._uiDisabled.GetValueOrDefault(); } + get { return this._uiDisabled; } set { this._uiDisabled = value; } } diff --git a/sdk/src/Services/TimestreamInfluxDB/Generated/Model/Internal/MarshallTransformations/CreateDbInstanceRequestMarshaller.cs b/sdk/src/Services/TimestreamInfluxDB/Generated/Model/Internal/MarshallTransformations/CreateDbInstanceRequestMarshaller.cs index 95fe97c2a351..3732cbbf5018 100644 --- a/sdk/src/Services/TimestreamInfluxDB/Generated/Model/Internal/MarshallTransformations/CreateDbInstanceRequestMarshaller.cs +++ b/sdk/src/Services/TimestreamInfluxDB/Generated/Model/Internal/MarshallTransformations/CreateDbInstanceRequestMarshaller.cs @@ -130,31 +130,17 @@ public IRequest Marshall(CreateDbInstanceRequest publicRequest) context.Writer.Write(publicRequest.Organization); } -<<<<<<< HEAD if(publicRequest.IsSetPassword()) { context.Writer.WritePropertyName("password"); context.Writer.Write(publicRequest.Password); } -||||||| Commit version number update changes - if(publicRequest.IsSetPubliclyAccessible()) - { - context.Writer.WritePropertyName("publiclyAccessible"); - context.Writer.Write(publicRequest.PubliclyAccessible); - } -======= - if(publicRequest.IsSetPort()) - { - context.Writer.WritePropertyName("port"); - context.Writer.Write(publicRequest.Port); - } - if(publicRequest.IsSetPubliclyAccessible()) - { - context.Writer.WritePropertyName("publiclyAccessible"); - context.Writer.Write(publicRequest.PubliclyAccessible); - } ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b + if(publicRequest.IsSetPort()) + { + context.Writer.WritePropertyName("port"); + context.Writer.Write(publicRequest.Port.Value); + } if(publicRequest.IsSetPubliclyAccessible()) { diff --git a/sdk/src/Services/TimestreamInfluxDB/Generated/Model/Internal/MarshallTransformations/CreateDbInstanceResponseUnmarshaller.cs b/sdk/src/Services/TimestreamInfluxDB/Generated/Model/Internal/MarshallTransformations/CreateDbInstanceResponseUnmarshaller.cs index e86d541159a4..082c8e1265b2 100644 --- a/sdk/src/Services/TimestreamInfluxDB/Generated/Model/Internal/MarshallTransformations/CreateDbInstanceResponseUnmarshaller.cs +++ b/sdk/src/Services/TimestreamInfluxDB/Generated/Model/Internal/MarshallTransformations/CreateDbInstanceResponseUnmarshaller.cs @@ -126,7 +126,7 @@ public override AmazonWebServiceResponse Unmarshall(JsonUnmarshallerContext cont } if (context.TestExpression("port", targetDepth)) { - var unmarshaller = IntUnmarshaller.Instance; + var unmarshaller = NullableIntUnmarshaller.Instance; response.Port = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/TimestreamInfluxDB/Generated/Model/Internal/MarshallTransformations/DbInstanceSummaryUnmarshaller.cs b/sdk/src/Services/TimestreamInfluxDB/Generated/Model/Internal/MarshallTransformations/DbInstanceSummaryUnmarshaller.cs index 2f131fbbd781..31d7adda2c63 100644 --- a/sdk/src/Services/TimestreamInfluxDB/Generated/Model/Internal/MarshallTransformations/DbInstanceSummaryUnmarshaller.cs +++ b/sdk/src/Services/TimestreamInfluxDB/Generated/Model/Internal/MarshallTransformations/DbInstanceSummaryUnmarshaller.cs @@ -116,7 +116,7 @@ public DbInstanceSummary Unmarshall(JsonUnmarshallerContext context) } if (context.TestExpression("port", targetDepth)) { - var unmarshaller = IntUnmarshaller.Instance; + var unmarshaller = NullableIntUnmarshaller.Instance; unmarshalledObject.Port = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/TimestreamInfluxDB/Generated/Model/Internal/MarshallTransformations/DeleteDbInstanceResponseUnmarshaller.cs b/sdk/src/Services/TimestreamInfluxDB/Generated/Model/Internal/MarshallTransformations/DeleteDbInstanceResponseUnmarshaller.cs index db7c58a83dcc..14e48409f2e1 100644 --- a/sdk/src/Services/TimestreamInfluxDB/Generated/Model/Internal/MarshallTransformations/DeleteDbInstanceResponseUnmarshaller.cs +++ b/sdk/src/Services/TimestreamInfluxDB/Generated/Model/Internal/MarshallTransformations/DeleteDbInstanceResponseUnmarshaller.cs @@ -126,7 +126,7 @@ public override AmazonWebServiceResponse Unmarshall(JsonUnmarshallerContext cont } if (context.TestExpression("port", targetDepth)) { - var unmarshaller = IntUnmarshaller.Instance; + var unmarshaller = NullableIntUnmarshaller.Instance; response.Port = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/TimestreamInfluxDB/Generated/Model/Internal/MarshallTransformations/DurationMarshaller.cs b/sdk/src/Services/TimestreamInfluxDB/Generated/Model/Internal/MarshallTransformations/DurationMarshaller.cs index a680f7010454..9f1d0b1ad1d6 100644 --- a/sdk/src/Services/TimestreamInfluxDB/Generated/Model/Internal/MarshallTransformations/DurationMarshaller.cs +++ b/sdk/src/Services/TimestreamInfluxDB/Generated/Model/Internal/MarshallTransformations/DurationMarshaller.cs @@ -57,7 +57,7 @@ public void Marshall(Duration requestObject, JsonMarshallerContext context) if(requestObject.IsSetValue()) { context.Writer.WritePropertyName("value"); - context.Writer.Write(requestObject.Value); + context.Writer.Write(requestObject.Value.Value); } } diff --git a/sdk/src/Services/TimestreamInfluxDB/Generated/Model/Internal/MarshallTransformations/DurationUnmarshaller.cs b/sdk/src/Services/TimestreamInfluxDB/Generated/Model/Internal/MarshallTransformations/DurationUnmarshaller.cs index 56fc82cb0d09..dde3fd662fb3 100644 --- a/sdk/src/Services/TimestreamInfluxDB/Generated/Model/Internal/MarshallTransformations/DurationUnmarshaller.cs +++ b/sdk/src/Services/TimestreamInfluxDB/Generated/Model/Internal/MarshallTransformations/DurationUnmarshaller.cs @@ -74,7 +74,7 @@ public Duration Unmarshall(JsonUnmarshallerContext context) } if (context.TestExpression("value", targetDepth)) { - var unmarshaller = LongUnmarshaller.Instance; + var unmarshaller = NullableLongUnmarshaller.Instance; unmarshalledObject.Value = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/TimestreamInfluxDB/Generated/Model/Internal/MarshallTransformations/GetDbInstanceResponseUnmarshaller.cs b/sdk/src/Services/TimestreamInfluxDB/Generated/Model/Internal/MarshallTransformations/GetDbInstanceResponseUnmarshaller.cs index a806441e3605..ae838370ce07 100644 --- a/sdk/src/Services/TimestreamInfluxDB/Generated/Model/Internal/MarshallTransformations/GetDbInstanceResponseUnmarshaller.cs +++ b/sdk/src/Services/TimestreamInfluxDB/Generated/Model/Internal/MarshallTransformations/GetDbInstanceResponseUnmarshaller.cs @@ -126,7 +126,7 @@ public override AmazonWebServiceResponse Unmarshall(JsonUnmarshallerContext cont } if (context.TestExpression("port", targetDepth)) { - var unmarshaller = IntUnmarshaller.Instance; + var unmarshaller = NullableIntUnmarshaller.Instance; response.Port = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/TimestreamInfluxDB/Generated/Model/Internal/MarshallTransformations/InfluxDBv2ParametersMarshaller.cs b/sdk/src/Services/TimestreamInfluxDB/Generated/Model/Internal/MarshallTransformations/InfluxDBv2ParametersMarshaller.cs index 648fc19104b4..35f56d872eba 100644 --- a/sdk/src/Services/TimestreamInfluxDB/Generated/Model/Internal/MarshallTransformations/InfluxDBv2ParametersMarshaller.cs +++ b/sdk/src/Services/TimestreamInfluxDB/Generated/Model/Internal/MarshallTransformations/InfluxDBv2ParametersMarshaller.cs @@ -101,19 +101,19 @@ public void Marshall(InfluxDBv2Parameters requestObject, JsonMarshallerContext c if(requestObject.IsSetInfluxqlMaxSelectBuckets()) { context.Writer.WritePropertyName("influxqlMaxSelectBuckets"); - context.Writer.Write(requestObject.InfluxqlMaxSelectBuckets); + context.Writer.Write(requestObject.InfluxqlMaxSelectBuckets.Value); } if(requestObject.IsSetInfluxqlMaxSelectPoint()) { context.Writer.WritePropertyName("influxqlMaxSelectPoint"); - context.Writer.Write(requestObject.InfluxqlMaxSelectPoint); + context.Writer.Write(requestObject.InfluxqlMaxSelectPoint.Value); } if(requestObject.IsSetInfluxqlMaxSelectSeries()) { context.Writer.WritePropertyName("influxqlMaxSelectSeries"); - context.Writer.Write(requestObject.InfluxqlMaxSelectSeries); + context.Writer.Write(requestObject.InfluxqlMaxSelectSeries.Value); } if(requestObject.IsSetLogLevel()) @@ -137,7 +137,7 @@ public void Marshall(InfluxDBv2Parameters requestObject, JsonMarshallerContext c if(requestObject.IsSetPprofDisabled()) { context.Writer.WritePropertyName("pprofDisabled"); - context.Writer.Write(requestObject.PprofDisabled); + context.Writer.Write(requestObject.PprofDisabled.Value); } if(requestObject.IsSetQueryConcurrency()) @@ -149,19 +149,19 @@ public void Marshall(InfluxDBv2Parameters requestObject, JsonMarshallerContext c if(requestObject.IsSetQueryInitialMemoryBytes()) { context.Writer.WritePropertyName("queryInitialMemoryBytes"); - context.Writer.Write(requestObject.QueryInitialMemoryBytes); + context.Writer.Write(requestObject.QueryInitialMemoryBytes.Value); } if(requestObject.IsSetQueryMaxMemoryBytes()) { context.Writer.WritePropertyName("queryMaxMemoryBytes"); - context.Writer.Write(requestObject.QueryMaxMemoryBytes); + context.Writer.Write(requestObject.QueryMaxMemoryBytes.Value); } if(requestObject.IsSetQueryMemoryBytes()) { context.Writer.WritePropertyName("queryMemoryBytes"); - context.Writer.Write(requestObject.QueryMemoryBytes); + context.Writer.Write(requestObject.QueryMemoryBytes.Value); } if(requestObject.IsSetQueryQueueSize()) @@ -173,25 +173,25 @@ public void Marshall(InfluxDBv2Parameters requestObject, JsonMarshallerContext c if(requestObject.IsSetSessionLength()) { context.Writer.WritePropertyName("sessionLength"); - context.Writer.Write(requestObject.SessionLength); + context.Writer.Write(requestObject.SessionLength.Value); } if(requestObject.IsSetSessionRenewDisabled()) { context.Writer.WritePropertyName("sessionRenewDisabled"); - context.Writer.Write(requestObject.SessionRenewDisabled); + context.Writer.Write(requestObject.SessionRenewDisabled.Value); } if(requestObject.IsSetStorageCacheMaxMemorySize()) { context.Writer.WritePropertyName("storageCacheMaxMemorySize"); - context.Writer.Write(requestObject.StorageCacheMaxMemorySize); + context.Writer.Write(requestObject.StorageCacheMaxMemorySize.Value); } if(requestObject.IsSetStorageCacheSnapshotMemorySize()) { context.Writer.WritePropertyName("storageCacheSnapshotMemorySize"); - context.Writer.Write(requestObject.StorageCacheSnapshotMemorySize); + context.Writer.Write(requestObject.StorageCacheSnapshotMemorySize.Value); } if(requestObject.IsSetStorageCacheSnapshotWriteColdDuration()) @@ -219,25 +219,25 @@ public void Marshall(InfluxDBv2Parameters requestObject, JsonMarshallerContext c if(requestObject.IsSetStorageCompactThroughputBurst()) { context.Writer.WritePropertyName("storageCompactThroughputBurst"); - context.Writer.Write(requestObject.StorageCompactThroughputBurst); + context.Writer.Write(requestObject.StorageCompactThroughputBurst.Value); } if(requestObject.IsSetStorageMaxConcurrentCompactions()) { context.Writer.WritePropertyName("storageMaxConcurrentCompactions"); - context.Writer.Write(requestObject.StorageMaxConcurrentCompactions); + context.Writer.Write(requestObject.StorageMaxConcurrentCompactions.Value); } if(requestObject.IsSetStorageMaxIndexLogFileSize()) { context.Writer.WritePropertyName("storageMaxIndexLogFileSize"); - context.Writer.Write(requestObject.StorageMaxIndexLogFileSize); + context.Writer.Write(requestObject.StorageMaxIndexLogFileSize.Value); } if(requestObject.IsSetStorageNoValidateFieldSize()) { context.Writer.WritePropertyName("storageNoValidateFieldSize"); - context.Writer.Write(requestObject.StorageNoValidateFieldSize); + context.Writer.Write(requestObject.StorageNoValidateFieldSize.Value); } if(requestObject.IsSetStorageRetentionCheckInterval()) @@ -254,19 +254,19 @@ public void Marshall(InfluxDBv2Parameters requestObject, JsonMarshallerContext c if(requestObject.IsSetStorageSeriesFileMaxConcurrentSnapshotCompactions()) { context.Writer.WritePropertyName("storageSeriesFileMaxConcurrentSnapshotCompactions"); - context.Writer.Write(requestObject.StorageSeriesFileMaxConcurrentSnapshotCompactions); + context.Writer.Write(requestObject.StorageSeriesFileMaxConcurrentSnapshotCompactions.Value); } if(requestObject.IsSetStorageSeriesIdSetCacheSize()) { context.Writer.WritePropertyName("storageSeriesIdSetCacheSize"); - context.Writer.Write(requestObject.StorageSeriesIdSetCacheSize); + context.Writer.Write(requestObject.StorageSeriesIdSetCacheSize.Value); } if(requestObject.IsSetStorageWalMaxConcurrentWrites()) { context.Writer.WritePropertyName("storageWalMaxConcurrentWrites"); - context.Writer.Write(requestObject.StorageWalMaxConcurrentWrites); + context.Writer.Write(requestObject.StorageWalMaxConcurrentWrites.Value); } if(requestObject.IsSetStorageWalMaxWriteDelay()) @@ -289,7 +289,7 @@ public void Marshall(InfluxDBv2Parameters requestObject, JsonMarshallerContext c if(requestObject.IsSetUiDisabled()) { context.Writer.WritePropertyName("uiDisabled"); - context.Writer.Write(requestObject.UiDisabled); + context.Writer.Write(requestObject.UiDisabled.Value); } } diff --git a/sdk/src/Services/TimestreamInfluxDB/Generated/Model/Internal/MarshallTransformations/InfluxDBv2ParametersUnmarshaller.cs b/sdk/src/Services/TimestreamInfluxDB/Generated/Model/Internal/MarshallTransformations/InfluxDBv2ParametersUnmarshaller.cs index 27669d6bf5a7..813daa6ca44e 100644 --- a/sdk/src/Services/TimestreamInfluxDB/Generated/Model/Internal/MarshallTransformations/InfluxDBv2ParametersUnmarshaller.cs +++ b/sdk/src/Services/TimestreamInfluxDB/Generated/Model/Internal/MarshallTransformations/InfluxDBv2ParametersUnmarshaller.cs @@ -98,19 +98,19 @@ public InfluxDBv2Parameters Unmarshall(JsonUnmarshallerContext context) } if (context.TestExpression("influxqlMaxSelectBuckets", targetDepth)) { - var unmarshaller = LongUnmarshaller.Instance; + var unmarshaller = NullableLongUnmarshaller.Instance; unmarshalledObject.InfluxqlMaxSelectBuckets = unmarshaller.Unmarshall(context); continue; } if (context.TestExpression("influxqlMaxSelectPoint", targetDepth)) { - var unmarshaller = LongUnmarshaller.Instance; + var unmarshaller = NullableLongUnmarshaller.Instance; unmarshalledObject.InfluxqlMaxSelectPoint = unmarshaller.Unmarshall(context); continue; } if (context.TestExpression("influxqlMaxSelectSeries", targetDepth)) { - var unmarshaller = LongUnmarshaller.Instance; + var unmarshaller = NullableLongUnmarshaller.Instance; unmarshalledObject.InfluxqlMaxSelectSeries = unmarshaller.Unmarshall(context); continue; } @@ -134,7 +134,7 @@ public InfluxDBv2Parameters Unmarshall(JsonUnmarshallerContext context) } if (context.TestExpression("pprofDisabled", targetDepth)) { - var unmarshaller = BoolUnmarshaller.Instance; + var unmarshaller = NullableBoolUnmarshaller.Instance; unmarshalledObject.PprofDisabled = unmarshaller.Unmarshall(context); continue; } @@ -146,19 +146,19 @@ public InfluxDBv2Parameters Unmarshall(JsonUnmarshallerContext context) } if (context.TestExpression("queryInitialMemoryBytes", targetDepth)) { - var unmarshaller = LongUnmarshaller.Instance; + var unmarshaller = NullableLongUnmarshaller.Instance; unmarshalledObject.QueryInitialMemoryBytes = unmarshaller.Unmarshall(context); continue; } if (context.TestExpression("queryMaxMemoryBytes", targetDepth)) { - var unmarshaller = LongUnmarshaller.Instance; + var unmarshaller = NullableLongUnmarshaller.Instance; unmarshalledObject.QueryMaxMemoryBytes = unmarshaller.Unmarshall(context); continue; } if (context.TestExpression("queryMemoryBytes", targetDepth)) { - var unmarshaller = LongUnmarshaller.Instance; + var unmarshaller = NullableLongUnmarshaller.Instance; unmarshalledObject.QueryMemoryBytes = unmarshaller.Unmarshall(context); continue; } @@ -170,25 +170,25 @@ public InfluxDBv2Parameters Unmarshall(JsonUnmarshallerContext context) } if (context.TestExpression("sessionLength", targetDepth)) { - var unmarshaller = IntUnmarshaller.Instance; + var unmarshaller = NullableIntUnmarshaller.Instance; unmarshalledObject.SessionLength = unmarshaller.Unmarshall(context); continue; } if (context.TestExpression("sessionRenewDisabled", targetDepth)) { - var unmarshaller = BoolUnmarshaller.Instance; + var unmarshaller = NullableBoolUnmarshaller.Instance; unmarshalledObject.SessionRenewDisabled = unmarshaller.Unmarshall(context); continue; } if (context.TestExpression("storageCacheMaxMemorySize", targetDepth)) { - var unmarshaller = LongUnmarshaller.Instance; + var unmarshaller = NullableLongUnmarshaller.Instance; unmarshalledObject.StorageCacheMaxMemorySize = unmarshaller.Unmarshall(context); continue; } if (context.TestExpression("storageCacheSnapshotMemorySize", targetDepth)) { - var unmarshaller = LongUnmarshaller.Instance; + var unmarshaller = NullableLongUnmarshaller.Instance; unmarshalledObject.StorageCacheSnapshotMemorySize = unmarshaller.Unmarshall(context); continue; } @@ -206,25 +206,25 @@ public InfluxDBv2Parameters Unmarshall(JsonUnmarshallerContext context) } if (context.TestExpression("storageCompactThroughputBurst", targetDepth)) { - var unmarshaller = LongUnmarshaller.Instance; + var unmarshaller = NullableLongUnmarshaller.Instance; unmarshalledObject.StorageCompactThroughputBurst = unmarshaller.Unmarshall(context); continue; } if (context.TestExpression("storageMaxConcurrentCompactions", targetDepth)) { - var unmarshaller = IntUnmarshaller.Instance; + var unmarshaller = NullableIntUnmarshaller.Instance; unmarshalledObject.StorageMaxConcurrentCompactions = unmarshaller.Unmarshall(context); continue; } if (context.TestExpression("storageMaxIndexLogFileSize", targetDepth)) { - var unmarshaller = LongUnmarshaller.Instance; + var unmarshaller = NullableLongUnmarshaller.Instance; unmarshalledObject.StorageMaxIndexLogFileSize = unmarshaller.Unmarshall(context); continue; } if (context.TestExpression("storageNoValidateFieldSize", targetDepth)) { - var unmarshaller = BoolUnmarshaller.Instance; + var unmarshaller = NullableBoolUnmarshaller.Instance; unmarshalledObject.StorageNoValidateFieldSize = unmarshaller.Unmarshall(context); continue; } @@ -236,19 +236,19 @@ public InfluxDBv2Parameters Unmarshall(JsonUnmarshallerContext context) } if (context.TestExpression("storageSeriesFileMaxConcurrentSnapshotCompactions", targetDepth)) { - var unmarshaller = IntUnmarshaller.Instance; + var unmarshaller = NullableIntUnmarshaller.Instance; unmarshalledObject.StorageSeriesFileMaxConcurrentSnapshotCompactions = unmarshaller.Unmarshall(context); continue; } if (context.TestExpression("storageSeriesIdSetCacheSize", targetDepth)) { - var unmarshaller = LongUnmarshaller.Instance; + var unmarshaller = NullableLongUnmarshaller.Instance; unmarshalledObject.StorageSeriesIdSetCacheSize = unmarshaller.Unmarshall(context); continue; } if (context.TestExpression("storageWalMaxConcurrentWrites", targetDepth)) { - var unmarshaller = IntUnmarshaller.Instance; + var unmarshaller = NullableIntUnmarshaller.Instance; unmarshalledObject.StorageWalMaxConcurrentWrites = unmarshaller.Unmarshall(context); continue; } @@ -266,7 +266,7 @@ public InfluxDBv2Parameters Unmarshall(JsonUnmarshallerContext context) } if (context.TestExpression("uiDisabled", targetDepth)) { - var unmarshaller = BoolUnmarshaller.Instance; + var unmarshaller = NullableBoolUnmarshaller.Instance; unmarshalledObject.UiDisabled = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/TimestreamInfluxDB/Generated/Model/Internal/MarshallTransformations/UpdateDbInstanceRequestMarshaller.cs b/sdk/src/Services/TimestreamInfluxDB/Generated/Model/Internal/MarshallTransformations/UpdateDbInstanceRequestMarshaller.cs index 61f2606f4884..170ec9b0d6b1 100644 --- a/sdk/src/Services/TimestreamInfluxDB/Generated/Model/Internal/MarshallTransformations/UpdateDbInstanceRequestMarshaller.cs +++ b/sdk/src/Services/TimestreamInfluxDB/Generated/Model/Internal/MarshallTransformations/UpdateDbInstanceRequestMarshaller.cs @@ -106,84 +106,16 @@ public IRequest Marshall(UpdateDbInstanceRequest publicRequest) context.Writer.WriteObjectEnd(); } + if(publicRequest.IsSetPort()) + { + context.Writer.WritePropertyName("port"); + context.Writer.Write(publicRequest.Port.Value); + } + writer.WriteObjectEnd(); } -<<<<<<< HEAD request.Content = memoryStream.ToArray(); -||||||| Commit version number update changes - if(publicRequest.IsSetDbParameterGroupIdentifier()) - { - context.Writer.WritePropertyName("dbParameterGroupIdentifier"); - context.Writer.Write(publicRequest.DbParameterGroupIdentifier); - } - - if(publicRequest.IsSetDeploymentType()) - { - context.Writer.WritePropertyName("deploymentType"); - context.Writer.Write(publicRequest.DeploymentType); - } - - if(publicRequest.IsSetIdentifier()) - { - context.Writer.WritePropertyName("identifier"); - context.Writer.Write(publicRequest.Identifier); - } - - if(publicRequest.IsSetLogDeliveryConfiguration()) - { - context.Writer.WritePropertyName("logDeliveryConfiguration"); - context.Writer.WriteObjectStart(); - - var marshaller = LogDeliveryConfigurationMarshaller.Instance; - marshaller.Marshall(publicRequest.LogDeliveryConfiguration, context); - - context.Writer.WriteObjectEnd(); - } - - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); -======= - if(publicRequest.IsSetDbParameterGroupIdentifier()) - { - context.Writer.WritePropertyName("dbParameterGroupIdentifier"); - context.Writer.Write(publicRequest.DbParameterGroupIdentifier); - } - - if(publicRequest.IsSetDeploymentType()) - { - context.Writer.WritePropertyName("deploymentType"); - context.Writer.Write(publicRequest.DeploymentType); - } - - if(publicRequest.IsSetIdentifier()) - { - context.Writer.WritePropertyName("identifier"); - context.Writer.Write(publicRequest.Identifier); - } - - if(publicRequest.IsSetLogDeliveryConfiguration()) - { - context.Writer.WritePropertyName("logDeliveryConfiguration"); - context.Writer.WriteObjectStart(); - - var marshaller = LogDeliveryConfigurationMarshaller.Instance; - marshaller.Marshall(publicRequest.LogDeliveryConfiguration, context); - - context.Writer.WriteObjectEnd(); - } - - if(publicRequest.IsSetPort()) - { - context.Writer.WritePropertyName("port"); - context.Writer.Write(publicRequest.Port); - } - - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b } diff --git a/sdk/src/Services/TimestreamInfluxDB/Generated/Model/Internal/MarshallTransformations/UpdateDbInstanceResponseUnmarshaller.cs b/sdk/src/Services/TimestreamInfluxDB/Generated/Model/Internal/MarshallTransformations/UpdateDbInstanceResponseUnmarshaller.cs index 1e4d146e05f3..a60410434468 100644 --- a/sdk/src/Services/TimestreamInfluxDB/Generated/Model/Internal/MarshallTransformations/UpdateDbInstanceResponseUnmarshaller.cs +++ b/sdk/src/Services/TimestreamInfluxDB/Generated/Model/Internal/MarshallTransformations/UpdateDbInstanceResponseUnmarshaller.cs @@ -126,7 +126,7 @@ public override AmazonWebServiceResponse Unmarshall(JsonUnmarshallerContext cont } if (context.TestExpression("port", targetDepth)) { - var unmarshaller = IntUnmarshaller.Instance; + var unmarshaller = NullableIntUnmarshaller.Instance; response.Port = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/TimestreamInfluxDB/Generated/Model/UpdateDbInstanceRequest.cs b/sdk/src/Services/TimestreamInfluxDB/Generated/Model/UpdateDbInstanceRequest.cs index a0479a907bae..378a56961056 100644 --- a/sdk/src/Services/TimestreamInfluxDB/Generated/Model/UpdateDbInstanceRequest.cs +++ b/sdk/src/Services/TimestreamInfluxDB/Generated/Model/UpdateDbInstanceRequest.cs @@ -160,9 +160,9 @@ internal bool IsSetLogDeliveryConfiguration() /// /// [AWSProperty(Min=1024, Max=65535)] - public int Port + public int? Port { - get { return this._port.GetValueOrDefault(); } + get { return this._port; } set { this._port = value; } } diff --git a/sdk/src/Services/TimestreamInfluxDB/Generated/Model/UpdateDbInstanceResponse.cs b/sdk/src/Services/TimestreamInfluxDB/Generated/Model/UpdateDbInstanceResponse.cs index a4fecdec80e4..f7055d74b31b 100644 --- a/sdk/src/Services/TimestreamInfluxDB/Generated/Model/UpdateDbInstanceResponse.cs +++ b/sdk/src/Services/TimestreamInfluxDB/Generated/Model/UpdateDbInstanceResponse.cs @@ -285,9 +285,9 @@ internal bool IsSetName() /// /// [AWSProperty(Min=1024, Max=65535)] - public int Port + public int? Port { - get { return this._port.GetValueOrDefault(); } + get { return this._port; } set { this._port = value; } } diff --git a/sdk/src/Services/TimestreamInfluxDB/Properties/AssemblyInfo.cs b/sdk/src/Services/TimestreamInfluxDB/Properties/AssemblyInfo.cs index 7997f8626404..0a5122e3d2b1 100644 --- a/sdk/src/Services/TimestreamInfluxDB/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/TimestreamInfluxDB/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.13")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.403.20")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/TimestreamInfluxDB/TimestreamInfluxDB.sln b/sdk/src/Services/TimestreamInfluxDB/TimestreamInfluxDB.sln index dd86b31c16b7..c701677aee0b 100644 --- a/sdk/src/Services/TimestreamInfluxDB/TimestreamInfluxDB.sln +++ b/sdk/src/Services/TimestreamInfluxDB/TimestreamInfluxDB.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {F2AB7844-CF02-46E1-9818-5F1F42D2C3C0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {F2AB7844-CF02-46E1-9818-5F1F42D2C3C0}.Debug|Any CPU.Build.0 = Debug|Any CPU {F2AB7844-CF02-46E1-9818-5F1F42D2C3C0}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {61D0A8CF-C563-4470-B218-7145EAECAAE7}.Debug|Any CPU.Build.0 = Debug|Any CPU {61D0A8CF-C563-4470-B218-7145EAECAAE7}.Release|Any CPU.ActiveCfg = Release|Any CPU {61D0A8CF-C563-4470-B218-7145EAECAAE7}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {58E05F3A-AEC6-4BD4-AFA9-FBEEC229077F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {58E05F3A-AEC6-4BD4-AFA9-FBEEC229077F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {58E05F3A-AEC6-4BD4-AFA9-FBEEC229077F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {58E05F3A-AEC6-4BD4-AFA9-FBEEC229077F}.Release|Any CPU.Build.0 = Release|Any CPU - {0E130D97-C3D9-4578-842D-6EBF1ADA8401}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0E130D97-C3D9-4578-842D-6EBF1ADA8401}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0E130D97-C3D9-4578-842D-6EBF1ADA8401}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0E130D97-C3D9-4578-842D-6EBF1ADA8401}.Release|Any CPU.Build.0 = Release|Any CPU - {4A8A5566-0D7B-4400-AE35-8B7E1CC4EF7F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4A8A5566-0D7B-4400-AE35-8B7E1CC4EF7F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4A8A5566-0D7B-4400-AE35-8B7E1CC4EF7F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4A8A5566-0D7B-4400-AE35-8B7E1CC4EF7F}.Release|Any CPU.Build.0 = Release|Any CPU - {147EE4B3-50C5-47A4-8E7A-7CDB1EF6DD61}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {147EE4B3-50C5-47A4-8E7A-7CDB1EF6DD61}.Debug|Any CPU.Build.0 = Debug|Any CPU - {147EE4B3-50C5-47A4-8E7A-7CDB1EF6DD61}.Release|Any CPU.ActiveCfg = Release|Any CPU - {147EE4B3-50C5-47A4-8E7A-7CDB1EF6DD61}.Release|Any CPU.Build.0 = Release|Any CPU - {4DC97A1F-56C1-47F7-801A-DEA2FD0D164C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4DC97A1F-56C1-47F7-801A-DEA2FD0D164C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4DC97A1F-56C1-47F7-801A-DEA2FD0D164C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4DC97A1F-56C1-47F7-801A-DEA2FD0D164C}.Release|Any CPU.Build.0 = Release|Any CPU - {CE8A0EB9-FC9C-4442-842D-93DAEF491CA0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CE8A0EB9-FC9C-4442-842D-93DAEF491CA0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CE8A0EB9-FC9C-4442-842D-93DAEF491CA0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CE8A0EB9-FC9C-4442-842D-93DAEF491CA0}.Release|Any CPU.Build.0 = Release|Any CPU - {1BECAA69-5F41-4A4D-AFD5-BBB316F09D78}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1BECAA69-5F41-4A4D-AFD5-BBB316F09D78}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1BECAA69-5F41-4A4D-AFD5-BBB316F09D78}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1BECAA69-5F41-4A4D-AFD5-BBB316F09D78}.Release|Any CPU.Build.0 = Release|Any CPU - {D3263920-5AA6-485E-AC0D-B2E419FEF8EE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D3263920-5AA6-485E-AC0D-B2E419FEF8EE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D3263920-5AA6-485E-AC0D-B2E419FEF8EE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D3263920-5AA6-485E-AC0D-B2E419FEF8EE}.Release|Any CPU.Build.0 = Release|Any CPU - {8456B465-5DDC-4D3D-805F-507A666157C4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8456B465-5DDC-4D3D-805F-507A666157C4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8456B465-5DDC-4D3D-805F-507A666157C4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8456B465-5DDC-4D3D-805F-507A666157C4}.Release|Any CPU.Build.0 = Release|Any CPU - {F9DD137A-0750-4E8E-A247-31739EE171A8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F9DD137A-0750-4E8E-A247-31739EE171A8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F9DD137A-0750-4E8E-A247-31739EE171A8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F9DD137A-0750-4E8E-A247-31739EE171A8}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {58E05F3A-AEC6-4BD4-AFA9-FBEEC229077F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {58E05F3A-AEC6-4BD4-AFA9-FBEEC229077F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {58E05F3A-AEC6-4BD4-AFA9-FBEEC229077F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {58E05F3A-AEC6-4BD4-AFA9-FBEEC229077F}.Release|Any CPU.Build.0 = Release|Any CPU - {0E130D97-C3D9-4578-842D-6EBF1ADA8401}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0E130D97-C3D9-4578-842D-6EBF1ADA8401}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0E130D97-C3D9-4578-842D-6EBF1ADA8401}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0E130D97-C3D9-4578-842D-6EBF1ADA8401}.Release|Any CPU.Build.0 = Release|Any CPU - {4A8A5566-0D7B-4400-AE35-8B7E1CC4EF7F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4A8A5566-0D7B-4400-AE35-8B7E1CC4EF7F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4A8A5566-0D7B-4400-AE35-8B7E1CC4EF7F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4A8A5566-0D7B-4400-AE35-8B7E1CC4EF7F}.Release|Any CPU.Build.0 = Release|Any CPU - {147EE4B3-50C5-47A4-8E7A-7CDB1EF6DD61}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {147EE4B3-50C5-47A4-8E7A-7CDB1EF6DD61}.Debug|Any CPU.Build.0 = Debug|Any CPU - {147EE4B3-50C5-47A4-8E7A-7CDB1EF6DD61}.Release|Any CPU.ActiveCfg = Release|Any CPU - {147EE4B3-50C5-47A4-8E7A-7CDB1EF6DD61}.Release|Any CPU.Build.0 = Release|Any CPU - {4DC97A1F-56C1-47F7-801A-DEA2FD0D164C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4DC97A1F-56C1-47F7-801A-DEA2FD0D164C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4DC97A1F-56C1-47F7-801A-DEA2FD0D164C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4DC97A1F-56C1-47F7-801A-DEA2FD0D164C}.Release|Any CPU.Build.0 = Release|Any CPU - {CE8A0EB9-FC9C-4442-842D-93DAEF491CA0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CE8A0EB9-FC9C-4442-842D-93DAEF491CA0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CE8A0EB9-FC9C-4442-842D-93DAEF491CA0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CE8A0EB9-FC9C-4442-842D-93DAEF491CA0}.Release|Any CPU.Build.0 = Release|Any CPU - {1BECAA69-5F41-4A4D-AFD5-BBB316F09D78}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1BECAA69-5F41-4A4D-AFD5-BBB316F09D78}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1BECAA69-5F41-4A4D-AFD5-BBB316F09D78}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1BECAA69-5F41-4A4D-AFD5-BBB316F09D78}.Release|Any CPU.Build.0 = Release|Any CPU - {D3263920-5AA6-485E-AC0D-B2E419FEF8EE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D3263920-5AA6-485E-AC0D-B2E419FEF8EE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D3263920-5AA6-485E-AC0D-B2E419FEF8EE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D3263920-5AA6-485E-AC0D-B2E419FEF8EE}.Release|Any CPU.Build.0 = Release|Any CPU - {8456B465-5DDC-4D3D-805F-507A666157C4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8456B465-5DDC-4D3D-805F-507A666157C4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8456B465-5DDC-4D3D-805F-507A666157C4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8456B465-5DDC-4D3D-805F-507A666157C4}.Release|Any CPU.Build.0 = Release|Any CPU - {F9DD137A-0750-4E8E-A247-31739EE171A8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F9DD137A-0750-4E8E-A247-31739EE171A8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F9DD137A-0750-4E8E-A247-31739EE171A8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F9DD137A-0750-4E8E-A247-31739EE171A8}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {F2AB7844-CF02-46E1-9818-5F1F42D2C3C0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {91FA281D-E4EB-4471-A6D2-1E50EAF2CE1A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {DEB76D2D-421B-40E3-A1B5-B771C14A53B9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {78B00403-E2C0-4031-BD68-8E00001981AC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {61D0A8CF-C563-4470-B218-7145EAECAAE7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {58E05F3A-AEC6-4BD4-AFA9-FBEEC229077F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0E130D97-C3D9-4578-842D-6EBF1ADA8401} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4A8A5566-0D7B-4400-AE35-8B7E1CC4EF7F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {147EE4B3-50C5-47A4-8E7A-7CDB1EF6DD61} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4DC97A1F-56C1-47F7-801A-DEA2FD0D164C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {CE8A0EB9-FC9C-4442-842D-93DAEF491CA0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {1BECAA69-5F41-4A4D-AFD5-BBB316F09D78} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D3263920-5AA6-485E-AC0D-B2E419FEF8EE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8456B465-5DDC-4D3D-805F-507A666157C4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F9DD137A-0750-4E8E-A247-31739EE171A8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {58E05F3A-AEC6-4BD4-AFA9-FBEEC229077F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0E130D97-C3D9-4578-842D-6EBF1ADA8401} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4A8A5566-0D7B-4400-AE35-8B7E1CC4EF7F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {147EE4B3-50C5-47A4-8E7A-7CDB1EF6DD61} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4DC97A1F-56C1-47F7-801A-DEA2FD0D164C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {CE8A0EB9-FC9C-4442-842D-93DAEF491CA0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {1BECAA69-5F41-4A4D-AFD5-BBB316F09D78} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D3263920-5AA6-485E-AC0D-B2E419FEF8EE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8456B465-5DDC-4D3D-805F-507A666157C4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F9DD137A-0750-4E8E-A247-31739EE171A8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {7CB17A4A-FB4B-4678-8A8D-1254E46610EA} diff --git a/sdk/src/Services/TimestreamQuery/Generated/AmazonTimestreamQueryConfig.cs b/sdk/src/Services/TimestreamQuery/Generated/AmazonTimestreamQueryConfig.cs index 3d2063d8caad..97db87d81d94 100644 --- a/sdk/src/Services/TimestreamQuery/Generated/AmazonTimestreamQueryConfig.cs +++ b/sdk/src/Services/TimestreamQuery/Generated/AmazonTimestreamQueryConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.TimestreamQuery public partial class AmazonTimestreamQueryConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("Timestream Query", "4.0.0.0"); private static readonly AmazonTimestreamQueryEndpointResolver EndpointResolver = new AmazonTimestreamQueryEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("Timestream Query", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("Timestream Query", "3.7.401.16"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/TimestreamQuery/Generated/Model/Internal/MarshallTransformations/ExecuteScheduledQueryRequestMarshaller.cs b/sdk/src/Services/TimestreamQuery/Generated/Model/Internal/MarshallTransformations/ExecuteScheduledQueryRequestMarshaller.cs index 549278b0a65e..23c30b0f0aaa 100644 --- a/sdk/src/Services/TimestreamQuery/Generated/Model/Internal/MarshallTransformations/ExecuteScheduledQueryRequestMarshaller.cs +++ b/sdk/src/Services/TimestreamQuery/Generated/Model/Internal/MarshallTransformations/ExecuteScheduledQueryRequestMarshaller.cs @@ -88,7 +88,17 @@ public IRequest Marshall(ExecuteScheduledQueryRequest publicRequest) context.Writer.Write(publicRequest.InvocationTime.Value); } -<<<<<<< HEAD + if(publicRequest.IsSetQueryInsights()) + { + context.Writer.WritePropertyName("QueryInsights"); + context.Writer.WriteObjectStart(); + + var marshaller = ScheduledQueryInsightsMarshaller.Instance; + marshaller.Marshall(publicRequest.QueryInsights, context); + + context.Writer.WriteObjectEnd(); + } + if(publicRequest.IsSetScheduledQueryArn()) { context.Writer.WritePropertyName("ScheduledQueryArn"); @@ -96,28 +106,6 @@ public IRequest Marshall(ExecuteScheduledQueryRequest publicRequest) } writer.WriteObjectEnd(); -||||||| Commit version number update changes - if(publicRequest.IsSetScheduledQueryArn()) - { - context.Writer.WritePropertyName("ScheduledQueryArn"); - context.Writer.Write(publicRequest.ScheduledQueryArn); -======= - if(publicRequest.IsSetQueryInsights()) - { - context.Writer.WritePropertyName("QueryInsights"); - context.Writer.WriteObjectStart(); - - var marshaller = ScheduledQueryInsightsMarshaller.Instance; - marshaller.Marshall(publicRequest.QueryInsights, context); - - context.Writer.WriteObjectEnd(); - } - - if(publicRequest.IsSetScheduledQueryArn()) - { - context.Writer.WritePropertyName("ScheduledQueryArn"); - context.Writer.Write(publicRequest.ScheduledQueryArn); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b } request.Content = memoryStream.ToArray(); diff --git a/sdk/src/Services/TimestreamQuery/Generated/Model/Internal/MarshallTransformations/QueryInsightsResponseUnmarshaller.cs b/sdk/src/Services/TimestreamQuery/Generated/Model/Internal/MarshallTransformations/QueryInsightsResponseUnmarshaller.cs index eebd70e25e81..07af25e1da7d 100644 --- a/sdk/src/Services/TimestreamQuery/Generated/Model/Internal/MarshallTransformations/QueryInsightsResponseUnmarshaller.cs +++ b/sdk/src/Services/TimestreamQuery/Generated/Model/Internal/MarshallTransformations/QueryInsightsResponseUnmarshaller.cs @@ -68,13 +68,13 @@ public QueryInsightsResponse Unmarshall(JsonUnmarshallerContext context) { if (context.TestExpression("OutputBytes", targetDepth)) { - var unmarshaller = LongUnmarshaller.Instance; + var unmarshaller = NullableLongUnmarshaller.Instance; unmarshalledObject.OutputBytes = unmarshaller.Unmarshall(context); continue; } if (context.TestExpression("OutputRows", targetDepth)) { - var unmarshaller = LongUnmarshaller.Instance; + var unmarshaller = NullableLongUnmarshaller.Instance; unmarshalledObject.OutputRows = unmarshaller.Unmarshall(context); continue; } @@ -86,7 +86,7 @@ public QueryInsightsResponse Unmarshall(JsonUnmarshallerContext context) } if (context.TestExpression("QueryTableCount", targetDepth)) { - var unmarshaller = LongUnmarshaller.Instance; + var unmarshaller = NullableLongUnmarshaller.Instance; unmarshalledObject.QueryTableCount = unmarshaller.Unmarshall(context); continue; } @@ -98,19 +98,19 @@ public QueryInsightsResponse Unmarshall(JsonUnmarshallerContext context) } if (context.TestExpression("UnloadPartitionCount", targetDepth)) { - var unmarshaller = LongUnmarshaller.Instance; + var unmarshaller = NullableLongUnmarshaller.Instance; unmarshalledObject.UnloadPartitionCount = unmarshaller.Unmarshall(context); continue; } if (context.TestExpression("UnloadWrittenBytes", targetDepth)) { - var unmarshaller = LongUnmarshaller.Instance; + var unmarshaller = NullableLongUnmarshaller.Instance; unmarshalledObject.UnloadWrittenBytes = unmarshaller.Unmarshall(context); continue; } if (context.TestExpression("UnloadWrittenRows", targetDepth)) { - var unmarshaller = LongUnmarshaller.Instance; + var unmarshaller = NullableLongUnmarshaller.Instance; unmarshalledObject.UnloadWrittenRows = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/TimestreamQuery/Generated/Model/Internal/MarshallTransformations/QueryRequestMarshaller.cs b/sdk/src/Services/TimestreamQuery/Generated/Model/Internal/MarshallTransformations/QueryRequestMarshaller.cs index c5df386c22f7..9164f54f2602 100644 --- a/sdk/src/Services/TimestreamQuery/Generated/Model/Internal/MarshallTransformations/QueryRequestMarshaller.cs +++ b/sdk/src/Services/TimestreamQuery/Generated/Model/Internal/MarshallTransformations/QueryRequestMarshaller.cs @@ -94,7 +94,17 @@ public IRequest Marshall(QueryRequest publicRequest) context.Writer.Write(publicRequest.NextToken); } -<<<<<<< HEAD + if(publicRequest.IsSetQueryInsights()) + { + context.Writer.WritePropertyName("QueryInsights"); + context.Writer.WriteObjectStart(); + + var marshaller = QueryInsightsMarshaller.Instance; + marshaller.Marshall(publicRequest.QueryInsights, context); + + context.Writer.WriteObjectEnd(); + } + if(publicRequest.IsSetQueryString()) { context.Writer.WritePropertyName("QueryString"); @@ -102,28 +112,6 @@ public IRequest Marshall(QueryRequest publicRequest) } writer.WriteObjectEnd(); -||||||| Commit version number update changes - if(publicRequest.IsSetQueryString()) - { - context.Writer.WritePropertyName("QueryString"); - context.Writer.Write(publicRequest.QueryString); -======= - if(publicRequest.IsSetQueryInsights()) - { - context.Writer.WritePropertyName("QueryInsights"); - context.Writer.WriteObjectStart(); - - var marshaller = QueryInsightsMarshaller.Instance; - marshaller.Marshall(publicRequest.QueryInsights, context); - - context.Writer.WriteObjectEnd(); - } - - if(publicRequest.IsSetQueryString()) - { - context.Writer.WritePropertyName("QueryString"); - context.Writer.Write(publicRequest.QueryString); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b } request.Content = memoryStream.ToArray(); diff --git a/sdk/src/Services/TimestreamQuery/Generated/Model/Internal/MarshallTransformations/QuerySpatialCoverageMaxUnmarshaller.cs b/sdk/src/Services/TimestreamQuery/Generated/Model/Internal/MarshallTransformations/QuerySpatialCoverageMaxUnmarshaller.cs index c5b183d10401..44ddb6fd6f7e 100644 --- a/sdk/src/Services/TimestreamQuery/Generated/Model/Internal/MarshallTransformations/QuerySpatialCoverageMaxUnmarshaller.cs +++ b/sdk/src/Services/TimestreamQuery/Generated/Model/Internal/MarshallTransformations/QuerySpatialCoverageMaxUnmarshaller.cs @@ -80,7 +80,7 @@ public QuerySpatialCoverageMax Unmarshall(JsonUnmarshallerContext context) } if (context.TestExpression("Value", targetDepth)) { - var unmarshaller = DoubleUnmarshaller.Instance; + var unmarshaller = NullableDoubleUnmarshaller.Instance; unmarshalledObject.Value = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/TimestreamQuery/Generated/Model/Internal/MarshallTransformations/QueryTemporalRangeMaxUnmarshaller.cs b/sdk/src/Services/TimestreamQuery/Generated/Model/Internal/MarshallTransformations/QueryTemporalRangeMaxUnmarshaller.cs index 6423f9f6d410..8c984f873a3e 100644 --- a/sdk/src/Services/TimestreamQuery/Generated/Model/Internal/MarshallTransformations/QueryTemporalRangeMaxUnmarshaller.cs +++ b/sdk/src/Services/TimestreamQuery/Generated/Model/Internal/MarshallTransformations/QueryTemporalRangeMaxUnmarshaller.cs @@ -74,7 +74,7 @@ public QueryTemporalRangeMax Unmarshall(JsonUnmarshallerContext context) } if (context.TestExpression("Value", targetDepth)) { - var unmarshaller = LongUnmarshaller.Instance; + var unmarshaller = NullableLongUnmarshaller.Instance; unmarshalledObject.Value = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/TimestreamQuery/Generated/Model/Internal/MarshallTransformations/ScheduledQueryInsightsResponseUnmarshaller.cs b/sdk/src/Services/TimestreamQuery/Generated/Model/Internal/MarshallTransformations/ScheduledQueryInsightsResponseUnmarshaller.cs index 59675bb89a21..dbd887cfb796 100644 --- a/sdk/src/Services/TimestreamQuery/Generated/Model/Internal/MarshallTransformations/ScheduledQueryInsightsResponseUnmarshaller.cs +++ b/sdk/src/Services/TimestreamQuery/Generated/Model/Internal/MarshallTransformations/ScheduledQueryInsightsResponseUnmarshaller.cs @@ -68,13 +68,13 @@ public ScheduledQueryInsightsResponse Unmarshall(JsonUnmarshallerContext context { if (context.TestExpression("OutputBytes", targetDepth)) { - var unmarshaller = LongUnmarshaller.Instance; + var unmarshaller = NullableLongUnmarshaller.Instance; unmarshalledObject.OutputBytes = unmarshaller.Unmarshall(context); continue; } if (context.TestExpression("OutputRows", targetDepth)) { - var unmarshaller = LongUnmarshaller.Instance; + var unmarshaller = NullableLongUnmarshaller.Instance; unmarshalledObject.OutputRows = unmarshaller.Unmarshall(context); continue; } @@ -86,7 +86,7 @@ public ScheduledQueryInsightsResponse Unmarshall(JsonUnmarshallerContext context } if (context.TestExpression("QueryTableCount", targetDepth)) { - var unmarshaller = LongUnmarshaller.Instance; + var unmarshaller = NullableLongUnmarshaller.Instance; unmarshalledObject.QueryTableCount = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/TimestreamQuery/Generated/Model/QueryInsightsResponse.cs b/sdk/src/Services/TimestreamQuery/Generated/Model/QueryInsightsResponse.cs index 019d888c482b..4df78f328928 100644 --- a/sdk/src/Services/TimestreamQuery/Generated/Model/QueryInsightsResponse.cs +++ b/sdk/src/Services/TimestreamQuery/Generated/Model/QueryInsightsResponse.cs @@ -50,9 +50,9 @@ public partial class QueryInsightsResponse /// if the result set has changed as part of the query tuning exercise. /// /// - public long OutputBytes + public long? OutputBytes { - get { return this._outputBytes.GetValueOrDefault(); } + get { return this._outputBytes; } set { this._outputBytes = value; } } @@ -70,9 +70,9 @@ internal bool IsSetOutputBytes() /// part of the query tuning exercise. /// /// - public long OutputRows + public long? OutputRows { - get { return this._outputRows.GetValueOrDefault(); } + get { return this._outputRows; } set { this._outputRows = value; } } @@ -108,9 +108,9 @@ internal bool IsSetQuerySpatialCoverage() /// Indicates the number of tables in the query. /// /// - public long QueryTableCount + public long? QueryTableCount { - get { return this._queryTableCount.GetValueOrDefault(); } + get { return this._queryTableCount; } set { this._queryTableCount = value; } } @@ -159,9 +159,9 @@ internal bool IsSetQueryTemporalRange() /// Indicates the partitions created by the Unload operation. /// /// - public long UnloadPartitionCount + public long? UnloadPartitionCount { - get { return this._unloadPartitionCount.GetValueOrDefault(); } + get { return this._unloadPartitionCount; } set { this._unloadPartitionCount = value; } } @@ -177,9 +177,9 @@ internal bool IsSetUnloadPartitionCount() /// Indicates the size, in bytes, written by the Unload operation. /// /// - public long UnloadWrittenBytes + public long? UnloadWrittenBytes { - get { return this._unloadWrittenBytes.GetValueOrDefault(); } + get { return this._unloadWrittenBytes; } set { this._unloadWrittenBytes = value; } } @@ -195,9 +195,9 @@ internal bool IsSetUnloadWrittenBytes() /// Indicates the rows written by the Unload query. /// /// - public long UnloadWrittenRows + public long? UnloadWrittenRows { - get { return this._unloadWrittenRows.GetValueOrDefault(); } + get { return this._unloadWrittenRows; } set { this._unloadWrittenRows = value; } } diff --git a/sdk/src/Services/TimestreamQuery/Generated/Model/QuerySpatialCoverageMax.cs b/sdk/src/Services/TimestreamQuery/Generated/Model/QuerySpatialCoverageMax.cs index d60491ebefdf..6b147ea5b115 100644 --- a/sdk/src/Services/TimestreamQuery/Generated/Model/QuerySpatialCoverageMax.cs +++ b/sdk/src/Services/TimestreamQuery/Generated/Model/QuerySpatialCoverageMax.cs @@ -84,9 +84,9 @@ internal bool IsSetTableArn() /// The maximum ratio of spatial coverage. /// /// - public double Value + public double? Value { - get { return this._value.GetValueOrDefault(); } + get { return this._value; } set { this._value = value; } } diff --git a/sdk/src/Services/TimestreamQuery/Generated/Model/QueryTemporalRangeMax.cs b/sdk/src/Services/TimestreamQuery/Generated/Model/QueryTemporalRangeMax.cs index 43029cc31c89..ebd1ded01ac8 100644 --- a/sdk/src/Services/TimestreamQuery/Generated/Model/QueryTemporalRangeMax.cs +++ b/sdk/src/Services/TimestreamQuery/Generated/Model/QueryTemporalRangeMax.cs @@ -64,9 +64,9 @@ internal bool IsSetTableArn() /// The maximum duration in nanoseconds between the start and end of the query. /// /// - public long Value + public long? Value { - get { return this._value.GetValueOrDefault(); } + get { return this._value; } set { this._value = value; } } diff --git a/sdk/src/Services/TimestreamQuery/Generated/Model/ScheduledQueryInsightsResponse.cs b/sdk/src/Services/TimestreamQuery/Generated/Model/ScheduledQueryInsightsResponse.cs index ec53de6acef1..91684395e4bf 100644 --- a/sdk/src/Services/TimestreamQuery/Generated/Model/ScheduledQueryInsightsResponse.cs +++ b/sdk/src/Services/TimestreamQuery/Generated/Model/ScheduledQueryInsightsResponse.cs @@ -48,9 +48,9 @@ public partial class ScheduledQueryInsightsResponse /// if the result set has changed as part of the query tuning exercise. /// /// - public long OutputBytes + public long? OutputBytes { - get { return this._outputBytes.GetValueOrDefault(); } + get { return this._outputBytes; } set { this._outputBytes = value; } } @@ -68,9 +68,9 @@ internal bool IsSetOutputBytes() /// part of the query tuning exercise. /// /// - public long OutputRows + public long? OutputRows { - get { return this._outputRows.GetValueOrDefault(); } + get { return this._outputRows; } set { this._outputRows = value; } } @@ -106,9 +106,9 @@ internal bool IsSetQuerySpatialCoverage() /// Indicates the number of tables in the query. /// /// - public long QueryTableCount + public long? QueryTableCount { - get { return this._queryTableCount.GetValueOrDefault(); } + get { return this._queryTableCount; } set { this._queryTableCount = value; } } diff --git a/sdk/src/Services/TimestreamQuery/Generated/_bcl/AmazonTimestreamQueryClient.cs b/sdk/src/Services/TimestreamQuery/Generated/_bcl/AmazonTimestreamQueryClient.cs index df70d16acd5a..15c7b55020bd 100644 --- a/sdk/src/Services/TimestreamQuery/Generated/_bcl/AmazonTimestreamQueryClient.cs +++ b/sdk/src/Services/TimestreamQuery/Generated/_bcl/AmazonTimestreamQueryClient.cs @@ -845,7 +845,14 @@ public virtual DescribeScheduledQueryResponse DescribeScheduledQuery(DescribeSch /// - /// You can use this API to run a scheduled query manually. + /// You can use this API to run a scheduled query manually. + /// + /// + /// + /// If you enabled QueryInsights, this API also returns insights and metrics related + /// to the query that you executed as part of an Amazon SNS notification. QueryInsights + /// helps with performance tuning of your query. + /// /// /// Container for the necessary parameters to execute the ExecuteScheduledQuery service method. /// @@ -883,7 +890,14 @@ public virtual ExecuteScheduledQueryResponse ExecuteScheduledQuery(ExecuteSchedu /// - /// You can use this API to run a scheduled query manually. + /// You can use this API to run a scheduled query manually. + /// + /// + /// + /// If you enabled QueryInsights, this API also returns insights and metrics related + /// to the query that you executed as part of an Amazon SNS notification. QueryInsights + /// helps with performance tuning of your query. + /// /// /// Container for the necessary parameters to execute the ExecuteScheduledQuery service method. /// @@ -1158,12 +1172,28 @@ public virtual PrepareQueryResponse PrepareQuery(PrepareQueryRequest request) /// /// Query is a synchronous operation that enables you to run a query against your - /// Amazon Timestream data. Query will time out after 60 seconds. You must update - /// the default timeout in the SDK to support a timeout of 60 seconds. See the code - /// sample for details. + /// Amazon Timestream data. /// /// /// + /// If you enabled QueryInsights, this API also returns insights and metrics related + /// to the query that you executed. QueryInsights helps with performance tuning + /// of your query. + /// + /// + /// + /// The maximum number of Query API requests you're allowed to make with QueryInsights + /// enabled is 1 query per second (QPS). If you exceed this query rate, it might result + /// in throttling. + /// + /// + /// + /// Query will time out after 60 seconds. You must update the default timeout + /// in the SDK to support a timeout of 60 seconds. See the code + /// sample for details. + /// + /// + /// /// Your query request will fail in the following cases: /// ///
            • @@ -1235,12 +1265,28 @@ public virtual QueryResponse Query(QueryRequest request) /// /// Query is a synchronous operation that enables you to run a query against your - /// Amazon Timestream data. Query will time out after 60 seconds. You must update - /// the default timeout in the SDK to support a timeout of 60 seconds. See the code - /// sample for details. + /// Amazon Timestream data. /// /// /// + /// If you enabled QueryInsights, this API also returns insights and metrics related + /// to the query that you executed. QueryInsights helps with performance tuning + /// of your query. + /// + /// + /// + /// The maximum number of Query API requests you're allowed to make with QueryInsights + /// enabled is 1 query per second (QPS). If you exceed this query rate, it might result + /// in throttling. + /// + /// + /// + /// Query will time out after 60 seconds. You must update the default timeout + /// in the SDK to support a timeout of 60 seconds. See the code + /// sample for details. + /// + /// + /// /// Your query request will fail in the following cases: /// ///
              • diff --git a/sdk/src/Services/TimestreamQuery/Properties/AssemblyInfo.cs b/sdk/src/Services/TimestreamQuery/Properties/AssemblyInfo.cs index 8fd6f8334892..ee9985e92aa4 100644 --- a/sdk/src/Services/TimestreamQuery/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/TimestreamQuery/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.16")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/TimestreamQuery/TimestreamQuery.sln b/sdk/src/Services/TimestreamQuery/TimestreamQuery.sln index f3a9a68dd32c..cfa91a1c041f 100644 --- a/sdk/src/Services/TimestreamQuery/TimestreamQuery.sln +++ b/sdk/src/Services/TimestreamQuery/TimestreamQuery.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {D2D802E6-360A-45B6-A074-5549A1250D84}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {D2D802E6-360A-45B6-A074-5549A1250D84}.Debug|Any CPU.Build.0 = Debug|Any CPU {D2D802E6-360A-45B6-A074-5549A1250D84}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {0AD712C3-BE6C-43D3-B628-4E76016F1851}.Debug|Any CPU.Build.0 = Debug|Any CPU {0AD712C3-BE6C-43D3-B628-4E76016F1851}.Release|Any CPU.ActiveCfg = Release|Any CPU {0AD712C3-BE6C-43D3-B628-4E76016F1851}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {7DB126D3-4E2F-4B42-9ED4-70FE586BF043}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7DB126D3-4E2F-4B42-9ED4-70FE586BF043}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7DB126D3-4E2F-4B42-9ED4-70FE586BF043}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7DB126D3-4E2F-4B42-9ED4-70FE586BF043}.Release|Any CPU.Build.0 = Release|Any CPU - {EE800A96-C180-48F6-9065-933AD5C56B6F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EE800A96-C180-48F6-9065-933AD5C56B6F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EE800A96-C180-48F6-9065-933AD5C56B6F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EE800A96-C180-48F6-9065-933AD5C56B6F}.Release|Any CPU.Build.0 = Release|Any CPU - {E169DCB0-F3B2-4115-B89F-5BE8C616AC63}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E169DCB0-F3B2-4115-B89F-5BE8C616AC63}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E169DCB0-F3B2-4115-B89F-5BE8C616AC63}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E169DCB0-F3B2-4115-B89F-5BE8C616AC63}.Release|Any CPU.Build.0 = Release|Any CPU - {B98E6BB5-436E-474C-BE32-8B651474F8BA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B98E6BB5-436E-474C-BE32-8B651474F8BA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B98E6BB5-436E-474C-BE32-8B651474F8BA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B98E6BB5-436E-474C-BE32-8B651474F8BA}.Release|Any CPU.Build.0 = Release|Any CPU - {CA53A52F-DEE5-40AC-97AB-E8754BEA5B0F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CA53A52F-DEE5-40AC-97AB-E8754BEA5B0F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CA53A52F-DEE5-40AC-97AB-E8754BEA5B0F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CA53A52F-DEE5-40AC-97AB-E8754BEA5B0F}.Release|Any CPU.Build.0 = Release|Any CPU - {C4869D91-5B44-45A9-8B9D-8568586A02B5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C4869D91-5B44-45A9-8B9D-8568586A02B5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C4869D91-5B44-45A9-8B9D-8568586A02B5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C4869D91-5B44-45A9-8B9D-8568586A02B5}.Release|Any CPU.Build.0 = Release|Any CPU - {C3963691-8036-4F1D-85EE-1FBEAEC478D2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C3963691-8036-4F1D-85EE-1FBEAEC478D2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C3963691-8036-4F1D-85EE-1FBEAEC478D2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C3963691-8036-4F1D-85EE-1FBEAEC478D2}.Release|Any CPU.Build.0 = Release|Any CPU - {528BC08F-C06D-4AA1-A6E4-AD27F1C64E9C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {528BC08F-C06D-4AA1-A6E4-AD27F1C64E9C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {528BC08F-C06D-4AA1-A6E4-AD27F1C64E9C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {528BC08F-C06D-4AA1-A6E4-AD27F1C64E9C}.Release|Any CPU.Build.0 = Release|Any CPU - {E8BAFCBB-6D35-4491-B311-7FC5C7423AF1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E8BAFCBB-6D35-4491-B311-7FC5C7423AF1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E8BAFCBB-6D35-4491-B311-7FC5C7423AF1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E8BAFCBB-6D35-4491-B311-7FC5C7423AF1}.Release|Any CPU.Build.0 = Release|Any CPU - {36D9F6E5-EA04-435D-BA67-4F11FB24CE5F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {36D9F6E5-EA04-435D-BA67-4F11FB24CE5F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {36D9F6E5-EA04-435D-BA67-4F11FB24CE5F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {36D9F6E5-EA04-435D-BA67-4F11FB24CE5F}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {7DB126D3-4E2F-4B42-9ED4-70FE586BF043}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7DB126D3-4E2F-4B42-9ED4-70FE586BF043}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7DB126D3-4E2F-4B42-9ED4-70FE586BF043}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7DB126D3-4E2F-4B42-9ED4-70FE586BF043}.Release|Any CPU.Build.0 = Release|Any CPU - {EE800A96-C180-48F6-9065-933AD5C56B6F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EE800A96-C180-48F6-9065-933AD5C56B6F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EE800A96-C180-48F6-9065-933AD5C56B6F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EE800A96-C180-48F6-9065-933AD5C56B6F}.Release|Any CPU.Build.0 = Release|Any CPU - {E169DCB0-F3B2-4115-B89F-5BE8C616AC63}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E169DCB0-F3B2-4115-B89F-5BE8C616AC63}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E169DCB0-F3B2-4115-B89F-5BE8C616AC63}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E169DCB0-F3B2-4115-B89F-5BE8C616AC63}.Release|Any CPU.Build.0 = Release|Any CPU - {B98E6BB5-436E-474C-BE32-8B651474F8BA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B98E6BB5-436E-474C-BE32-8B651474F8BA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B98E6BB5-436E-474C-BE32-8B651474F8BA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B98E6BB5-436E-474C-BE32-8B651474F8BA}.Release|Any CPU.Build.0 = Release|Any CPU - {CA53A52F-DEE5-40AC-97AB-E8754BEA5B0F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CA53A52F-DEE5-40AC-97AB-E8754BEA5B0F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CA53A52F-DEE5-40AC-97AB-E8754BEA5B0F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CA53A52F-DEE5-40AC-97AB-E8754BEA5B0F}.Release|Any CPU.Build.0 = Release|Any CPU - {C4869D91-5B44-45A9-8B9D-8568586A02B5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C4869D91-5B44-45A9-8B9D-8568586A02B5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C4869D91-5B44-45A9-8B9D-8568586A02B5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C4869D91-5B44-45A9-8B9D-8568586A02B5}.Release|Any CPU.Build.0 = Release|Any CPU - {C3963691-8036-4F1D-85EE-1FBEAEC478D2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C3963691-8036-4F1D-85EE-1FBEAEC478D2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C3963691-8036-4F1D-85EE-1FBEAEC478D2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C3963691-8036-4F1D-85EE-1FBEAEC478D2}.Release|Any CPU.Build.0 = Release|Any CPU - {528BC08F-C06D-4AA1-A6E4-AD27F1C64E9C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {528BC08F-C06D-4AA1-A6E4-AD27F1C64E9C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {528BC08F-C06D-4AA1-A6E4-AD27F1C64E9C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {528BC08F-C06D-4AA1-A6E4-AD27F1C64E9C}.Release|Any CPU.Build.0 = Release|Any CPU - {E8BAFCBB-6D35-4491-B311-7FC5C7423AF1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E8BAFCBB-6D35-4491-B311-7FC5C7423AF1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E8BAFCBB-6D35-4491-B311-7FC5C7423AF1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E8BAFCBB-6D35-4491-B311-7FC5C7423AF1}.Release|Any CPU.Build.0 = Release|Any CPU - {36D9F6E5-EA04-435D-BA67-4F11FB24CE5F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {36D9F6E5-EA04-435D-BA67-4F11FB24CE5F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {36D9F6E5-EA04-435D-BA67-4F11FB24CE5F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {36D9F6E5-EA04-435D-BA67-4F11FB24CE5F}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {D2D802E6-360A-45B6-A074-5549A1250D84} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {D4154B85-EA63-4E9C-BCF4-5AA7682F4172} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {9FD5F3B6-8056-489B-BC6C-D15B31F31F84} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {C93D27CE-2ED8-49A4-8A9F-1F973E562BD7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {0AD712C3-BE6C-43D3-B628-4E76016F1851} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {7DB126D3-4E2F-4B42-9ED4-70FE586BF043} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {EE800A96-C180-48F6-9065-933AD5C56B6F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E169DCB0-F3B2-4115-B89F-5BE8C616AC63} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B98E6BB5-436E-474C-BE32-8B651474F8BA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {CA53A52F-DEE5-40AC-97AB-E8754BEA5B0F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C4869D91-5B44-45A9-8B9D-8568586A02B5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C3963691-8036-4F1D-85EE-1FBEAEC478D2} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {528BC08F-C06D-4AA1-A6E4-AD27F1C64E9C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E8BAFCBB-6D35-4491-B311-7FC5C7423AF1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {36D9F6E5-EA04-435D-BA67-4F11FB24CE5F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {7DB126D3-4E2F-4B42-9ED4-70FE586BF043} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {EE800A96-C180-48F6-9065-933AD5C56B6F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E169DCB0-F3B2-4115-B89F-5BE8C616AC63} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B98E6BB5-436E-474C-BE32-8B651474F8BA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {CA53A52F-DEE5-40AC-97AB-E8754BEA5B0F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C4869D91-5B44-45A9-8B9D-8568586A02B5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C3963691-8036-4F1D-85EE-1FBEAEC478D2} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {528BC08F-C06D-4AA1-A6E4-AD27F1C64E9C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E8BAFCBB-6D35-4491-B311-7FC5C7423AF1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {36D9F6E5-EA04-435D-BA67-4F11FB24CE5F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {EA332E46-8E84-4273-89A9-CD54FB3ADDFF} diff --git a/sdk/src/Services/TimestreamWrite/Generated/AmazonTimestreamWriteConfig.cs b/sdk/src/Services/TimestreamWrite/Generated/AmazonTimestreamWriteConfig.cs index a1b0c1882b02..d549b9c36e98 100644 --- a/sdk/src/Services/TimestreamWrite/Generated/AmazonTimestreamWriteConfig.cs +++ b/sdk/src/Services/TimestreamWrite/Generated/AmazonTimestreamWriteConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.TimestreamWrite public partial class AmazonTimestreamWriteConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("Timestream Write", "4.0.0.0"); private static readonly AmazonTimestreamWriteEndpointResolver EndpointResolver = new AmazonTimestreamWriteEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("Timestream Write", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("Timestream Write", "3.7.400.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/TimestreamWrite/Properties/AssemblyInfo.cs b/sdk/src/Services/TimestreamWrite/Properties/AssemblyInfo.cs index 704b09ce56fc..ac5c6ed056f4 100644 --- a/sdk/src/Services/TimestreamWrite/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/TimestreamWrite/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/TimestreamWrite/TimestreamWrite.sln b/sdk/src/Services/TimestreamWrite/TimestreamWrite.sln index 16a73f800816..cbcf04f63fe4 100644 --- a/sdk/src/Services/TimestreamWrite/TimestreamWrite.sln +++ b/sdk/src/Services/TimestreamWrite/TimestreamWrite.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {144563FD-0FCC-454C-8F7D-63AF728085B5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {144563FD-0FCC-454C-8F7D-63AF728085B5}.Debug|Any CPU.Build.0 = Debug|Any CPU {144563FD-0FCC-454C-8F7D-63AF728085B5}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {AC294A5C-7FC6-453D-80EA-05BF28B10112}.Debug|Any CPU.Build.0 = Debug|Any CPU {AC294A5C-7FC6-453D-80EA-05BF28B10112}.Release|Any CPU.ActiveCfg = Release|Any CPU {AC294A5C-7FC6-453D-80EA-05BF28B10112}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {A63A6C54-3046-4F84-8341-BFFC24BBEF41}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A63A6C54-3046-4F84-8341-BFFC24BBEF41}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A63A6C54-3046-4F84-8341-BFFC24BBEF41}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A63A6C54-3046-4F84-8341-BFFC24BBEF41}.Release|Any CPU.Build.0 = Release|Any CPU - {46F8A56F-2C92-444C-87A2-DB29E8DD7CFE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {46F8A56F-2C92-444C-87A2-DB29E8DD7CFE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {46F8A56F-2C92-444C-87A2-DB29E8DD7CFE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {46F8A56F-2C92-444C-87A2-DB29E8DD7CFE}.Release|Any CPU.Build.0 = Release|Any CPU - {07E13F06-CC23-4700-97EF-B8C4405F2D2F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {07E13F06-CC23-4700-97EF-B8C4405F2D2F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {07E13F06-CC23-4700-97EF-B8C4405F2D2F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {07E13F06-CC23-4700-97EF-B8C4405F2D2F}.Release|Any CPU.Build.0 = Release|Any CPU - {D47903EE-091F-4196-845E-41A7004F38A4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D47903EE-091F-4196-845E-41A7004F38A4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D47903EE-091F-4196-845E-41A7004F38A4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D47903EE-091F-4196-845E-41A7004F38A4}.Release|Any CPU.Build.0 = Release|Any CPU - {783E04B6-326E-4C8C-B34F-0AB485ADA875}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {783E04B6-326E-4C8C-B34F-0AB485ADA875}.Debug|Any CPU.Build.0 = Debug|Any CPU - {783E04B6-326E-4C8C-B34F-0AB485ADA875}.Release|Any CPU.ActiveCfg = Release|Any CPU - {783E04B6-326E-4C8C-B34F-0AB485ADA875}.Release|Any CPU.Build.0 = Release|Any CPU - {7CB0F1FC-6D2C-442A-87BD-D8DE083F5DFC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7CB0F1FC-6D2C-442A-87BD-D8DE083F5DFC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7CB0F1FC-6D2C-442A-87BD-D8DE083F5DFC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7CB0F1FC-6D2C-442A-87BD-D8DE083F5DFC}.Release|Any CPU.Build.0 = Release|Any CPU - {55957C3E-885F-4CF9-8CBE-E5B68E06E426}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {55957C3E-885F-4CF9-8CBE-E5B68E06E426}.Debug|Any CPU.Build.0 = Debug|Any CPU - {55957C3E-885F-4CF9-8CBE-E5B68E06E426}.Release|Any CPU.ActiveCfg = Release|Any CPU - {55957C3E-885F-4CF9-8CBE-E5B68E06E426}.Release|Any CPU.Build.0 = Release|Any CPU - {00B458B8-FCB8-4683-BEC8-BD7AC78FADFF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {00B458B8-FCB8-4683-BEC8-BD7AC78FADFF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {00B458B8-FCB8-4683-BEC8-BD7AC78FADFF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {00B458B8-FCB8-4683-BEC8-BD7AC78FADFF}.Release|Any CPU.Build.0 = Release|Any CPU - {EF554F70-2E83-4205-9B94-3CA31F6A3BF1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EF554F70-2E83-4205-9B94-3CA31F6A3BF1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EF554F70-2E83-4205-9B94-3CA31F6A3BF1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EF554F70-2E83-4205-9B94-3CA31F6A3BF1}.Release|Any CPU.Build.0 = Release|Any CPU - {2D112497-1BFE-4400-937E-27C810434A6C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2D112497-1BFE-4400-937E-27C810434A6C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2D112497-1BFE-4400-937E-27C810434A6C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2D112497-1BFE-4400-937E-27C810434A6C}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {A63A6C54-3046-4F84-8341-BFFC24BBEF41}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A63A6C54-3046-4F84-8341-BFFC24BBEF41}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A63A6C54-3046-4F84-8341-BFFC24BBEF41}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A63A6C54-3046-4F84-8341-BFFC24BBEF41}.Release|Any CPU.Build.0 = Release|Any CPU - {46F8A56F-2C92-444C-87A2-DB29E8DD7CFE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {46F8A56F-2C92-444C-87A2-DB29E8DD7CFE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {46F8A56F-2C92-444C-87A2-DB29E8DD7CFE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {46F8A56F-2C92-444C-87A2-DB29E8DD7CFE}.Release|Any CPU.Build.0 = Release|Any CPU - {07E13F06-CC23-4700-97EF-B8C4405F2D2F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {07E13F06-CC23-4700-97EF-B8C4405F2D2F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {07E13F06-CC23-4700-97EF-B8C4405F2D2F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {07E13F06-CC23-4700-97EF-B8C4405F2D2F}.Release|Any CPU.Build.0 = Release|Any CPU - {D47903EE-091F-4196-845E-41A7004F38A4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D47903EE-091F-4196-845E-41A7004F38A4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D47903EE-091F-4196-845E-41A7004F38A4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D47903EE-091F-4196-845E-41A7004F38A4}.Release|Any CPU.Build.0 = Release|Any CPU - {783E04B6-326E-4C8C-B34F-0AB485ADA875}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {783E04B6-326E-4C8C-B34F-0AB485ADA875}.Debug|Any CPU.Build.0 = Debug|Any CPU - {783E04B6-326E-4C8C-B34F-0AB485ADA875}.Release|Any CPU.ActiveCfg = Release|Any CPU - {783E04B6-326E-4C8C-B34F-0AB485ADA875}.Release|Any CPU.Build.0 = Release|Any CPU - {7CB0F1FC-6D2C-442A-87BD-D8DE083F5DFC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7CB0F1FC-6D2C-442A-87BD-D8DE083F5DFC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7CB0F1FC-6D2C-442A-87BD-D8DE083F5DFC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7CB0F1FC-6D2C-442A-87BD-D8DE083F5DFC}.Release|Any CPU.Build.0 = Release|Any CPU - {55957C3E-885F-4CF9-8CBE-E5B68E06E426}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {55957C3E-885F-4CF9-8CBE-E5B68E06E426}.Debug|Any CPU.Build.0 = Debug|Any CPU - {55957C3E-885F-4CF9-8CBE-E5B68E06E426}.Release|Any CPU.ActiveCfg = Release|Any CPU - {55957C3E-885F-4CF9-8CBE-E5B68E06E426}.Release|Any CPU.Build.0 = Release|Any CPU - {00B458B8-FCB8-4683-BEC8-BD7AC78FADFF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {00B458B8-FCB8-4683-BEC8-BD7AC78FADFF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {00B458B8-FCB8-4683-BEC8-BD7AC78FADFF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {00B458B8-FCB8-4683-BEC8-BD7AC78FADFF}.Release|Any CPU.Build.0 = Release|Any CPU - {EF554F70-2E83-4205-9B94-3CA31F6A3BF1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EF554F70-2E83-4205-9B94-3CA31F6A3BF1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EF554F70-2E83-4205-9B94-3CA31F6A3BF1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EF554F70-2E83-4205-9B94-3CA31F6A3BF1}.Release|Any CPU.Build.0 = Release|Any CPU - {2D112497-1BFE-4400-937E-27C810434A6C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2D112497-1BFE-4400-937E-27C810434A6C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2D112497-1BFE-4400-937E-27C810434A6C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2D112497-1BFE-4400-937E-27C810434A6C}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {144563FD-0FCC-454C-8F7D-63AF728085B5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {D46C821A-A9E7-49E3-947B-89C53C0F38B9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {C257F98B-A730-48E2-B61B-CF23B6B23763} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {10585DDA-F777-460D-9963-C4371DB3D55F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {AC294A5C-7FC6-453D-80EA-05BF28B10112} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {A63A6C54-3046-4F84-8341-BFFC24BBEF41} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {46F8A56F-2C92-444C-87A2-DB29E8DD7CFE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {07E13F06-CC23-4700-97EF-B8C4405F2D2F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D47903EE-091F-4196-845E-41A7004F38A4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {783E04B6-326E-4C8C-B34F-0AB485ADA875} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {7CB0F1FC-6D2C-442A-87BD-D8DE083F5DFC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {55957C3E-885F-4CF9-8CBE-E5B68E06E426} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {00B458B8-FCB8-4683-BEC8-BD7AC78FADFF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {EF554F70-2E83-4205-9B94-3CA31F6A3BF1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {2D112497-1BFE-4400-937E-27C810434A6C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {A63A6C54-3046-4F84-8341-BFFC24BBEF41} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {46F8A56F-2C92-444C-87A2-DB29E8DD7CFE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {07E13F06-CC23-4700-97EF-B8C4405F2D2F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D47903EE-091F-4196-845E-41A7004F38A4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {783E04B6-326E-4C8C-B34F-0AB485ADA875} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {7CB0F1FC-6D2C-442A-87BD-D8DE083F5DFC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {55957C3E-885F-4CF9-8CBE-E5B68E06E426} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {00B458B8-FCB8-4683-BEC8-BD7AC78FADFF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {EF554F70-2E83-4205-9B94-3CA31F6A3BF1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {2D112497-1BFE-4400-937E-27C810434A6C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {F0C6BBAE-73A2-41F1-88A9-5C7F26F7C0BD} diff --git a/sdk/src/Services/Tnb/Generated/AmazonTnbConfig.cs b/sdk/src/Services/Tnb/Generated/AmazonTnbConfig.cs index ab412ee5a260..95258fb384b2 100644 --- a/sdk/src/Services/Tnb/Generated/AmazonTnbConfig.cs +++ b/sdk/src/Services/Tnb/Generated/AmazonTnbConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.Tnb public partial class AmazonTnbConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("tnb", "4.0.0.0"); private static readonly AmazonTnbEndpointResolver EndpointResolver = new AmazonTnbEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("tnb", "3.7.401.24"); -======= - InternalSDKUtils.BuildUserAgentString("tnb", "3.7.401.51"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/Tnb/Properties/AssemblyInfo.cs b/sdk/src/Services/Tnb/Properties/AssemblyInfo.cs index 9a7889e3a32e..4753cbdc6318 100644 --- a/sdk/src/Services/Tnb/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/Tnb/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.24")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.51")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/Tnb/Tnb.sln b/sdk/src/Services/Tnb/Tnb.sln index 76f54e5bfcb0..cde37eee3017 100644 --- a/sdk/src/Services/Tnb/Tnb.sln +++ b/sdk/src/Services/Tnb/Tnb.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {1E8CACA4-3445-4950-A34A-A1438E322EAF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {1E8CACA4-3445-4950-A34A-A1438E322EAF}.Debug|Any CPU.Build.0 = Debug|Any CPU {1E8CACA4-3445-4950-A34A-A1438E322EAF}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {DEF93930-C6FB-4039-9325-74C0EB392445}.Debug|Any CPU.Build.0 = Debug|Any CPU {DEF93930-C6FB-4039-9325-74C0EB392445}.Release|Any CPU.ActiveCfg = Release|Any CPU {DEF93930-C6FB-4039-9325-74C0EB392445}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {B6F64248-6759-4863-BB23-D01B6F52430A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B6F64248-6759-4863-BB23-D01B6F52430A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B6F64248-6759-4863-BB23-D01B6F52430A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B6F64248-6759-4863-BB23-D01B6F52430A}.Release|Any CPU.Build.0 = Release|Any CPU - {EA23D085-A45F-4647-A51D-B2B88D4129B6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EA23D085-A45F-4647-A51D-B2B88D4129B6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EA23D085-A45F-4647-A51D-B2B88D4129B6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EA23D085-A45F-4647-A51D-B2B88D4129B6}.Release|Any CPU.Build.0 = Release|Any CPU - {0C9E643A-2225-4886-B0D3-B707BFF751A8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0C9E643A-2225-4886-B0D3-B707BFF751A8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0C9E643A-2225-4886-B0D3-B707BFF751A8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0C9E643A-2225-4886-B0D3-B707BFF751A8}.Release|Any CPU.Build.0 = Release|Any CPU - {86DA0F3C-C9F8-467F-A0C7-8211989BAE20}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {86DA0F3C-C9F8-467F-A0C7-8211989BAE20}.Debug|Any CPU.Build.0 = Debug|Any CPU - {86DA0F3C-C9F8-467F-A0C7-8211989BAE20}.Release|Any CPU.ActiveCfg = Release|Any CPU - {86DA0F3C-C9F8-467F-A0C7-8211989BAE20}.Release|Any CPU.Build.0 = Release|Any CPU - {4BA6F8D5-0AC7-4F5E-95D9-8834E255F20F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4BA6F8D5-0AC7-4F5E-95D9-8834E255F20F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4BA6F8D5-0AC7-4F5E-95D9-8834E255F20F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4BA6F8D5-0AC7-4F5E-95D9-8834E255F20F}.Release|Any CPU.Build.0 = Release|Any CPU - {8861F50D-0C05-47B5-A604-40BC5AC59FDF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8861F50D-0C05-47B5-A604-40BC5AC59FDF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8861F50D-0C05-47B5-A604-40BC5AC59FDF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8861F50D-0C05-47B5-A604-40BC5AC59FDF}.Release|Any CPU.Build.0 = Release|Any CPU - {AEF3424A-6FCE-410D-A693-52C5352C2CC2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AEF3424A-6FCE-410D-A693-52C5352C2CC2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AEF3424A-6FCE-410D-A693-52C5352C2CC2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AEF3424A-6FCE-410D-A693-52C5352C2CC2}.Release|Any CPU.Build.0 = Release|Any CPU - {1D13B06A-A7B6-42DA-B3A2-77864237A30E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1D13B06A-A7B6-42DA-B3A2-77864237A30E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1D13B06A-A7B6-42DA-B3A2-77864237A30E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1D13B06A-A7B6-42DA-B3A2-77864237A30E}.Release|Any CPU.Build.0 = Release|Any CPU - {428E0AC8-5B14-4D4C-AC15-5CA3309AA068}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {428E0AC8-5B14-4D4C-AC15-5CA3309AA068}.Debug|Any CPU.Build.0 = Debug|Any CPU - {428E0AC8-5B14-4D4C-AC15-5CA3309AA068}.Release|Any CPU.ActiveCfg = Release|Any CPU - {428E0AC8-5B14-4D4C-AC15-5CA3309AA068}.Release|Any CPU.Build.0 = Release|Any CPU - {FD275678-B90F-414C-BCF0-0AD0FEAE1802}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FD275678-B90F-414C-BCF0-0AD0FEAE1802}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FD275678-B90F-414C-BCF0-0AD0FEAE1802}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FD275678-B90F-414C-BCF0-0AD0FEAE1802}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {B6F64248-6759-4863-BB23-D01B6F52430A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B6F64248-6759-4863-BB23-D01B6F52430A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B6F64248-6759-4863-BB23-D01B6F52430A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B6F64248-6759-4863-BB23-D01B6F52430A}.Release|Any CPU.Build.0 = Release|Any CPU - {EA23D085-A45F-4647-A51D-B2B88D4129B6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EA23D085-A45F-4647-A51D-B2B88D4129B6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EA23D085-A45F-4647-A51D-B2B88D4129B6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EA23D085-A45F-4647-A51D-B2B88D4129B6}.Release|Any CPU.Build.0 = Release|Any CPU - {0C9E643A-2225-4886-B0D3-B707BFF751A8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0C9E643A-2225-4886-B0D3-B707BFF751A8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0C9E643A-2225-4886-B0D3-B707BFF751A8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0C9E643A-2225-4886-B0D3-B707BFF751A8}.Release|Any CPU.Build.0 = Release|Any CPU - {86DA0F3C-C9F8-467F-A0C7-8211989BAE20}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {86DA0F3C-C9F8-467F-A0C7-8211989BAE20}.Debug|Any CPU.Build.0 = Debug|Any CPU - {86DA0F3C-C9F8-467F-A0C7-8211989BAE20}.Release|Any CPU.ActiveCfg = Release|Any CPU - {86DA0F3C-C9F8-467F-A0C7-8211989BAE20}.Release|Any CPU.Build.0 = Release|Any CPU - {4BA6F8D5-0AC7-4F5E-95D9-8834E255F20F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4BA6F8D5-0AC7-4F5E-95D9-8834E255F20F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4BA6F8D5-0AC7-4F5E-95D9-8834E255F20F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4BA6F8D5-0AC7-4F5E-95D9-8834E255F20F}.Release|Any CPU.Build.0 = Release|Any CPU - {8861F50D-0C05-47B5-A604-40BC5AC59FDF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8861F50D-0C05-47B5-A604-40BC5AC59FDF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8861F50D-0C05-47B5-A604-40BC5AC59FDF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8861F50D-0C05-47B5-A604-40BC5AC59FDF}.Release|Any CPU.Build.0 = Release|Any CPU - {AEF3424A-6FCE-410D-A693-52C5352C2CC2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AEF3424A-6FCE-410D-A693-52C5352C2CC2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AEF3424A-6FCE-410D-A693-52C5352C2CC2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AEF3424A-6FCE-410D-A693-52C5352C2CC2}.Release|Any CPU.Build.0 = Release|Any CPU - {1D13B06A-A7B6-42DA-B3A2-77864237A30E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1D13B06A-A7B6-42DA-B3A2-77864237A30E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1D13B06A-A7B6-42DA-B3A2-77864237A30E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1D13B06A-A7B6-42DA-B3A2-77864237A30E}.Release|Any CPU.Build.0 = Release|Any CPU - {428E0AC8-5B14-4D4C-AC15-5CA3309AA068}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {428E0AC8-5B14-4D4C-AC15-5CA3309AA068}.Debug|Any CPU.Build.0 = Debug|Any CPU - {428E0AC8-5B14-4D4C-AC15-5CA3309AA068}.Release|Any CPU.ActiveCfg = Release|Any CPU - {428E0AC8-5B14-4D4C-AC15-5CA3309AA068}.Release|Any CPU.Build.0 = Release|Any CPU - {FD275678-B90F-414C-BCF0-0AD0FEAE1802}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FD275678-B90F-414C-BCF0-0AD0FEAE1802}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FD275678-B90F-414C-BCF0-0AD0FEAE1802}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FD275678-B90F-414C-BCF0-0AD0FEAE1802}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {1E8CACA4-3445-4950-A34A-A1438E322EAF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {35A40361-6C21-429B-8913-888497DFA9E2} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {A674E4BF-B183-4F5F-9423-96F5F1C2154B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {1908964A-9AA2-4F65-B16D-4DB7F766ABE9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {DEF93930-C6FB-4039-9325-74C0EB392445} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {B6F64248-6759-4863-BB23-D01B6F52430A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {EA23D085-A45F-4647-A51D-B2B88D4129B6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0C9E643A-2225-4886-B0D3-B707BFF751A8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {86DA0F3C-C9F8-467F-A0C7-8211989BAE20} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4BA6F8D5-0AC7-4F5E-95D9-8834E255F20F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8861F50D-0C05-47B5-A604-40BC5AC59FDF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {AEF3424A-6FCE-410D-A693-52C5352C2CC2} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {1D13B06A-A7B6-42DA-B3A2-77864237A30E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {428E0AC8-5B14-4D4C-AC15-5CA3309AA068} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {FD275678-B90F-414C-BCF0-0AD0FEAE1802} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B6F64248-6759-4863-BB23-D01B6F52430A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {EA23D085-A45F-4647-A51D-B2B88D4129B6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0C9E643A-2225-4886-B0D3-B707BFF751A8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {86DA0F3C-C9F8-467F-A0C7-8211989BAE20} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4BA6F8D5-0AC7-4F5E-95D9-8834E255F20F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8861F50D-0C05-47B5-A604-40BC5AC59FDF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {AEF3424A-6FCE-410D-A693-52C5352C2CC2} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {1D13B06A-A7B6-42DA-B3A2-77864237A30E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {428E0AC8-5B14-4D4C-AC15-5CA3309AA068} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {FD275678-B90F-414C-BCF0-0AD0FEAE1802} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {E7555268-BC72-4461-9241-79B7242B9BE4} diff --git a/sdk/src/Services/TranscribeService/Generated/AmazonTranscribeServiceConfig.cs b/sdk/src/Services/TranscribeService/Generated/AmazonTranscribeServiceConfig.cs index 608ffaaf1cfa..8414d81fc395 100644 --- a/sdk/src/Services/TranscribeService/Generated/AmazonTranscribeServiceConfig.cs +++ b/sdk/src/Services/TranscribeService/Generated/AmazonTranscribeServiceConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.TranscribeService public partial class AmazonTranscribeServiceConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("Transcribe", "4.0.0.0"); private static readonly AmazonTranscribeServiceEndpointResolver EndpointResolver = new AmazonTranscribeServiceEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("Transcribe", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("Transcribe", "3.7.400.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/TranscribeService/Properties/AssemblyInfo.cs b/sdk/src/Services/TranscribeService/Properties/AssemblyInfo.cs index 433eaa121bed..20b5efd7c61a 100644 --- a/sdk/src/Services/TranscribeService/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/TranscribeService/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/TranscribeService/TranscribeService.sln b/sdk/src/Services/TranscribeService/TranscribeService.sln index 5c228f77dd15..a6d44aa9b3b2 100644 --- a/sdk/src/Services/TranscribeService/TranscribeService.sln +++ b/sdk/src/Services/TranscribeService/TranscribeService.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {B7BF8AB9-9A36-431E-93CC-E1B4B02BCAAD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {B7BF8AB9-9A36-431E-93CC-E1B4B02BCAAD}.Debug|Any CPU.Build.0 = Debug|Any CPU {B7BF8AB9-9A36-431E-93CC-E1B4B02BCAAD}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {31B1E83D-A34A-40C0-803F-355ADF36637C}.Debug|Any CPU.Build.0 = Debug|Any CPU {31B1E83D-A34A-40C0-803F-355ADF36637C}.Release|Any CPU.ActiveCfg = Release|Any CPU {31B1E83D-A34A-40C0-803F-355ADF36637C}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {11F8A165-C895-4651-A234-03726AD31126}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {11F8A165-C895-4651-A234-03726AD31126}.Debug|Any CPU.Build.0 = Debug|Any CPU - {11F8A165-C895-4651-A234-03726AD31126}.Release|Any CPU.ActiveCfg = Release|Any CPU - {11F8A165-C895-4651-A234-03726AD31126}.Release|Any CPU.Build.0 = Release|Any CPU - {14DC66BC-8FDD-491A-AF05-2F9936178BBD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {14DC66BC-8FDD-491A-AF05-2F9936178BBD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {14DC66BC-8FDD-491A-AF05-2F9936178BBD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {14DC66BC-8FDD-491A-AF05-2F9936178BBD}.Release|Any CPU.Build.0 = Release|Any CPU - {C1FE9AC9-8171-48DD-A8BF-9658D4D7EBF5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C1FE9AC9-8171-48DD-A8BF-9658D4D7EBF5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C1FE9AC9-8171-48DD-A8BF-9658D4D7EBF5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C1FE9AC9-8171-48DD-A8BF-9658D4D7EBF5}.Release|Any CPU.Build.0 = Release|Any CPU - {C0936E03-CFCA-4EEB-BABE-5E2B71874086}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C0936E03-CFCA-4EEB-BABE-5E2B71874086}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C0936E03-CFCA-4EEB-BABE-5E2B71874086}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C0936E03-CFCA-4EEB-BABE-5E2B71874086}.Release|Any CPU.Build.0 = Release|Any CPU - {B9BDEDA5-D722-4BFD-9D14-5A8E1741660E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B9BDEDA5-D722-4BFD-9D14-5A8E1741660E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B9BDEDA5-D722-4BFD-9D14-5A8E1741660E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B9BDEDA5-D722-4BFD-9D14-5A8E1741660E}.Release|Any CPU.Build.0 = Release|Any CPU - {D214AD12-955E-4310-AA48-2DE05DC2B63A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D214AD12-955E-4310-AA48-2DE05DC2B63A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D214AD12-955E-4310-AA48-2DE05DC2B63A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D214AD12-955E-4310-AA48-2DE05DC2B63A}.Release|Any CPU.Build.0 = Release|Any CPU - {865F2109-9D4B-41EE-BF47-146815FF1B2B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {865F2109-9D4B-41EE-BF47-146815FF1B2B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {865F2109-9D4B-41EE-BF47-146815FF1B2B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {865F2109-9D4B-41EE-BF47-146815FF1B2B}.Release|Any CPU.Build.0 = Release|Any CPU - {01198003-94F1-4AA3-827C-9A00CF35F2E3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {01198003-94F1-4AA3-827C-9A00CF35F2E3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {01198003-94F1-4AA3-827C-9A00CF35F2E3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {01198003-94F1-4AA3-827C-9A00CF35F2E3}.Release|Any CPU.Build.0 = Release|Any CPU - {5944F12D-267E-4433-BB3E-CDB1055E2845}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5944F12D-267E-4433-BB3E-CDB1055E2845}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5944F12D-267E-4433-BB3E-CDB1055E2845}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5944F12D-267E-4433-BB3E-CDB1055E2845}.Release|Any CPU.Build.0 = Release|Any CPU - {8B6608D4-E353-4964-9F26-F8CC0668DCF4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8B6608D4-E353-4964-9F26-F8CC0668DCF4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8B6608D4-E353-4964-9F26-F8CC0668DCF4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8B6608D4-E353-4964-9F26-F8CC0668DCF4}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {11F8A165-C895-4651-A234-03726AD31126}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {11F8A165-C895-4651-A234-03726AD31126}.Debug|Any CPU.Build.0 = Debug|Any CPU - {11F8A165-C895-4651-A234-03726AD31126}.Release|Any CPU.ActiveCfg = Release|Any CPU - {11F8A165-C895-4651-A234-03726AD31126}.Release|Any CPU.Build.0 = Release|Any CPU - {14DC66BC-8FDD-491A-AF05-2F9936178BBD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {14DC66BC-8FDD-491A-AF05-2F9936178BBD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {14DC66BC-8FDD-491A-AF05-2F9936178BBD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {14DC66BC-8FDD-491A-AF05-2F9936178BBD}.Release|Any CPU.Build.0 = Release|Any CPU - {C1FE9AC9-8171-48DD-A8BF-9658D4D7EBF5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C1FE9AC9-8171-48DD-A8BF-9658D4D7EBF5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C1FE9AC9-8171-48DD-A8BF-9658D4D7EBF5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C1FE9AC9-8171-48DD-A8BF-9658D4D7EBF5}.Release|Any CPU.Build.0 = Release|Any CPU - {C0936E03-CFCA-4EEB-BABE-5E2B71874086}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C0936E03-CFCA-4EEB-BABE-5E2B71874086}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C0936E03-CFCA-4EEB-BABE-5E2B71874086}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C0936E03-CFCA-4EEB-BABE-5E2B71874086}.Release|Any CPU.Build.0 = Release|Any CPU - {B9BDEDA5-D722-4BFD-9D14-5A8E1741660E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B9BDEDA5-D722-4BFD-9D14-5A8E1741660E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B9BDEDA5-D722-4BFD-9D14-5A8E1741660E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B9BDEDA5-D722-4BFD-9D14-5A8E1741660E}.Release|Any CPU.Build.0 = Release|Any CPU - {D214AD12-955E-4310-AA48-2DE05DC2B63A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D214AD12-955E-4310-AA48-2DE05DC2B63A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D214AD12-955E-4310-AA48-2DE05DC2B63A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D214AD12-955E-4310-AA48-2DE05DC2B63A}.Release|Any CPU.Build.0 = Release|Any CPU - {865F2109-9D4B-41EE-BF47-146815FF1B2B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {865F2109-9D4B-41EE-BF47-146815FF1B2B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {865F2109-9D4B-41EE-BF47-146815FF1B2B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {865F2109-9D4B-41EE-BF47-146815FF1B2B}.Release|Any CPU.Build.0 = Release|Any CPU - {01198003-94F1-4AA3-827C-9A00CF35F2E3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {01198003-94F1-4AA3-827C-9A00CF35F2E3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {01198003-94F1-4AA3-827C-9A00CF35F2E3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {01198003-94F1-4AA3-827C-9A00CF35F2E3}.Release|Any CPU.Build.0 = Release|Any CPU - {5944F12D-267E-4433-BB3E-CDB1055E2845}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5944F12D-267E-4433-BB3E-CDB1055E2845}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5944F12D-267E-4433-BB3E-CDB1055E2845}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5944F12D-267E-4433-BB3E-CDB1055E2845}.Release|Any CPU.Build.0 = Release|Any CPU - {8B6608D4-E353-4964-9F26-F8CC0668DCF4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8B6608D4-E353-4964-9F26-F8CC0668DCF4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8B6608D4-E353-4964-9F26-F8CC0668DCF4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8B6608D4-E353-4964-9F26-F8CC0668DCF4}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {B7BF8AB9-9A36-431E-93CC-E1B4B02BCAAD} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {94A835DF-E38D-42BE-8C49-1C2A7BC59F41} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {57015764-3602-4858-8207-523E7655A4F3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {D445CC7A-708E-43DC-8D97-D73155D9E1F2} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {31B1E83D-A34A-40C0-803F-355ADF36637C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {11F8A165-C895-4651-A234-03726AD31126} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {14DC66BC-8FDD-491A-AF05-2F9936178BBD} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C1FE9AC9-8171-48DD-A8BF-9658D4D7EBF5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C0936E03-CFCA-4EEB-BABE-5E2B71874086} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B9BDEDA5-D722-4BFD-9D14-5A8E1741660E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D214AD12-955E-4310-AA48-2DE05DC2B63A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {865F2109-9D4B-41EE-BF47-146815FF1B2B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {01198003-94F1-4AA3-827C-9A00CF35F2E3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {5944F12D-267E-4433-BB3E-CDB1055E2845} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8B6608D4-E353-4964-9F26-F8CC0668DCF4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {11F8A165-C895-4651-A234-03726AD31126} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {14DC66BC-8FDD-491A-AF05-2F9936178BBD} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C1FE9AC9-8171-48DD-A8BF-9658D4D7EBF5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C0936E03-CFCA-4EEB-BABE-5E2B71874086} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B9BDEDA5-D722-4BFD-9D14-5A8E1741660E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D214AD12-955E-4310-AA48-2DE05DC2B63A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {865F2109-9D4B-41EE-BF47-146815FF1B2B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {01198003-94F1-4AA3-827C-9A00CF35F2E3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {5944F12D-267E-4433-BB3E-CDB1055E2845} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8B6608D4-E353-4964-9F26-F8CC0668DCF4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {E02BB86E-F694-4106-AD7F-3824154D8640} diff --git a/sdk/src/Services/Transfer/Generated/AmazonTransferConfig.cs b/sdk/src/Services/Transfer/Generated/AmazonTransferConfig.cs index a049c2c77f7e..518b3e9d43e3 100644 --- a/sdk/src/Services/Transfer/Generated/AmazonTransferConfig.cs +++ b/sdk/src/Services/Transfer/Generated/AmazonTransferConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.Transfer public partial class AmazonTransferConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("Transfer", "4.0.0.0"); private static readonly AmazonTransferEndpointResolver EndpointResolver = new AmazonTransferEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("Transfer", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("Transfer", "3.7.401.19"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/Transfer/Generated/Model/Internal/MarshallTransformations/ListFileTransferResultsRequestMarshaller.cs b/sdk/src/Services/Transfer/Generated/Model/Internal/MarshallTransformations/ListFileTransferResultsRequestMarshaller.cs index b53c71b5b56d..6542d8dc8de9 100644 --- a/sdk/src/Services/Transfer/Generated/Model/Internal/MarshallTransformations/ListFileTransferResultsRequestMarshaller.cs +++ b/sdk/src/Services/Transfer/Generated/Model/Internal/MarshallTransformations/ListFileTransferResultsRequestMarshaller.cs @@ -63,39 +63,42 @@ public IRequest Marshall(ListFileTransferResultsRequest publicRequest) request.HttpMethod = "POST"; request.ResourcePath = "/"; - using (StringWriter stringWriter = new StringWriter(CultureInfo.InvariantCulture)) + using (MemoryStream memoryStream = new MemoryStream()) { - JsonWriter writer = new JsonWriter(stringWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetConnectorId()) + using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) { - context.Writer.WritePropertyName("ConnectorId"); - context.Writer.Write(publicRequest.ConnectorId); - } + JsonWriter writer = new JsonWriter(streamWriter); + writer.Validate = false; + writer.WriteObjectStart(); + var context = new JsonMarshallerContext(request, writer); + if(publicRequest.IsSetConnectorId()) + { + context.Writer.WritePropertyName("ConnectorId"); + context.Writer.Write(publicRequest.ConnectorId); + } - if(publicRequest.IsSetMaxResults()) - { - context.Writer.WritePropertyName("MaxResults"); - context.Writer.Write(publicRequest.MaxResults); - } + if(publicRequest.IsSetMaxResults()) + { + context.Writer.WritePropertyName("MaxResults"); + context.Writer.Write(publicRequest.MaxResults.Value); + } - if(publicRequest.IsSetNextToken()) - { - context.Writer.WritePropertyName("NextToken"); - context.Writer.Write(publicRequest.NextToken); - } + if(publicRequest.IsSetNextToken()) + { + context.Writer.WritePropertyName("NextToken"); + context.Writer.Write(publicRequest.NextToken); + } - if(publicRequest.IsSetTransferId()) - { - context.Writer.WritePropertyName("TransferId"); - context.Writer.Write(publicRequest.TransferId); + if(publicRequest.IsSetTransferId()) + { + context.Writer.WritePropertyName("TransferId"); + context.Writer.Write(publicRequest.TransferId); + } + + writer.WriteObjectEnd(); } - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); + request.Content = memoryStream.ToArray(); } diff --git a/sdk/src/Services/Transfer/Generated/Model/ListFileTransferResultsRequest.cs b/sdk/src/Services/Transfer/Generated/Model/ListFileTransferResultsRequest.cs index 6f9d5ea20b0f..80a52fb184f3 100644 --- a/sdk/src/Services/Transfer/Generated/Model/ListFileTransferResultsRequest.cs +++ b/sdk/src/Services/Transfer/Generated/Model/ListFileTransferResultsRequest.cs @@ -78,9 +78,9 @@ internal bool IsSetConnectorId() /// /// [AWSProperty(Min=1, Max=1000)] - public int MaxResults + public int? MaxResults { - get { return this._maxResults.GetValueOrDefault(); } + get { return this._maxResults; } set { this._maxResults = value; } } diff --git a/sdk/src/Services/Transfer/Generated/Model/_bcl45+netstandard/IListFileTransferResultsPaginator.cs b/sdk/src/Services/Transfer/Generated/Model/_bcl+netstandard/IListFileTransferResultsPaginator.cs similarity index 100% rename from sdk/src/Services/Transfer/Generated/Model/_bcl45+netstandard/IListFileTransferResultsPaginator.cs rename to sdk/src/Services/Transfer/Generated/Model/_bcl+netstandard/IListFileTransferResultsPaginator.cs diff --git a/sdk/src/Services/Transfer/Generated/Model/_bcl45+netstandard/ListFileTransferResultsPaginator.cs b/sdk/src/Services/Transfer/Generated/Model/_bcl+netstandard/ListFileTransferResultsPaginator.cs similarity index 100% rename from sdk/src/Services/Transfer/Generated/Model/_bcl45+netstandard/ListFileTransferResultsPaginator.cs rename to sdk/src/Services/Transfer/Generated/Model/_bcl+netstandard/ListFileTransferResultsPaginator.cs diff --git a/sdk/src/Services/Transfer/Generated/_bcl/AmazonTransferClient.cs b/sdk/src/Services/Transfer/Generated/_bcl/AmazonTransferClient.cs index 1f6a01860f9e..64e4ae46f3f8 100644 --- a/sdk/src/Services/Transfer/Generated/_bcl/AmazonTransferClient.cs +++ b/sdk/src/Services/Transfer/Generated/_bcl/AmazonTransferClient.cs @@ -48,9 +48,9 @@ namespace Amazon.Transfer /// seamlessly migrate your file transfer workflows to Transfer Family by integrating /// with existing authentication systems, and providing DNS routing with Amazon Route /// 53 so nothing changes for your customers and partners, or their applications. With - /// your data in Amazon S3, you can use it with Amazon Web Services for processing, analytics, - /// machine learning, and archiving. Getting started with Transfer Family is easy since - /// there is no infrastructure to buy and set up. + /// your data in Amazon S3, you can use it with Amazon Web Services services for processing, + /// analytics, machine learning, and archiving. Getting started with Transfer Family is + /// easy since there is no infrastructure to buy and set up. /// public partial class AmazonTransferClient : AmazonServiceClient, IAmazonTransfer { @@ -3155,6 +3155,91 @@ public virtual ListExecutionsResponse ListExecutions(ListExecutionsRequest reque #endregion + #region ListFileTransferResults + + + /// + /// Returns real-time updates and detailed information on the status of each individual + /// file being transferred in a specific file transfer operation. You specify the file + /// transfer by providing its ConnectorId and its TransferId. + /// + /// + /// + /// File transfer results are available up to 7 days after an operation has been requested. + /// + /// + /// + /// Container for the necessary parameters to execute the ListFileTransferResults service method. + /// + /// The response from the ListFileTransferResults service method, as returned by Transfer. + /// + /// This exception is thrown when an error occurs in the Transfer Family service. + /// + /// + /// This exception is thrown when the client submits a malformed request. + /// + /// + /// This exception is thrown when a resource is not found by the Amazon Web ServicesTransfer + /// Family service. + /// + /// + /// The request has failed because the Amazon Web ServicesTransfer Family service is not + /// available. + /// + /// REST API Reference for ListFileTransferResults Operation + public virtual ListFileTransferResultsResponse ListFileTransferResults(ListFileTransferResultsRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = ListFileTransferResultsRequestMarshaller.Instance; + options.ResponseUnmarshaller = ListFileTransferResultsResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// Returns real-time updates and detailed information on the status of each individual + /// file being transferred in a specific file transfer operation. You specify the file + /// transfer by providing its ConnectorId and its TransferId. + /// + /// + /// + /// File transfer results are available up to 7 days after an operation has been requested. + /// + /// + /// + /// Container for the necessary parameters to execute the ListFileTransferResults service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the ListFileTransferResults service method, as returned by Transfer. + /// + /// This exception is thrown when an error occurs in the Transfer Family service. + /// + /// + /// This exception is thrown when the client submits a malformed request. + /// + /// + /// This exception is thrown when a resource is not found by the Amazon Web ServicesTransfer + /// Family service. + /// + /// + /// The request has failed because the Amazon Web ServicesTransfer Family service is not + /// available. + /// + /// REST API Reference for ListFileTransferResults Operation + public virtual Task ListFileTransferResultsAsync(ListFileTransferResultsRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = ListFileTransferResultsRequestMarshaller.Instance; + options.ResponseUnmarshaller = ListFileTransferResultsResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + #region ListHostKeys diff --git a/sdk/src/Services/Transfer/Properties/AssemblyInfo.cs b/sdk/src/Services/Transfer/Properties/AssemblyInfo.cs index c0bcaa649897..853ff12c3db2 100644 --- a/sdk/src/Services/Transfer/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/Transfer/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.19")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/Transfer/Transfer.sln b/sdk/src/Services/Transfer/Transfer.sln index b668ab774cc0..1c64999634e3 100644 --- a/sdk/src/Services/Transfer/Transfer.sln +++ b/sdk/src/Services/Transfer/Transfer.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {D5D5C2C7-F6DA-47AF-8799-F65321D2EF51}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {D5D5C2C7-F6DA-47AF-8799-F65321D2EF51}.Debug|Any CPU.Build.0 = Debug|Any CPU {D5D5C2C7-F6DA-47AF-8799-F65321D2EF51}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {492F7D3B-AFCB-4AE2-A716-F8ED17EAAEDC}.Debug|Any CPU.Build.0 = Debug|Any CPU {492F7D3B-AFCB-4AE2-A716-F8ED17EAAEDC}.Release|Any CPU.ActiveCfg = Release|Any CPU {492F7D3B-AFCB-4AE2-A716-F8ED17EAAEDC}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {DF65E5FA-96D6-498C-A4B0-12585E04D3E1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DF65E5FA-96D6-498C-A4B0-12585E04D3E1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DF65E5FA-96D6-498C-A4B0-12585E04D3E1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DF65E5FA-96D6-498C-A4B0-12585E04D3E1}.Release|Any CPU.Build.0 = Release|Any CPU - {1ECE704D-7281-4F9E-BA56-CCADEBF69E58}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1ECE704D-7281-4F9E-BA56-CCADEBF69E58}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1ECE704D-7281-4F9E-BA56-CCADEBF69E58}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1ECE704D-7281-4F9E-BA56-CCADEBF69E58}.Release|Any CPU.Build.0 = Release|Any CPU - {446DC579-4D01-45D6-9E72-0D4B3FE0956F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {446DC579-4D01-45D6-9E72-0D4B3FE0956F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {446DC579-4D01-45D6-9E72-0D4B3FE0956F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {446DC579-4D01-45D6-9E72-0D4B3FE0956F}.Release|Any CPU.Build.0 = Release|Any CPU - {3AEE9BB7-518F-4A38-994C-99C04B9565F6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3AEE9BB7-518F-4A38-994C-99C04B9565F6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3AEE9BB7-518F-4A38-994C-99C04B9565F6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3AEE9BB7-518F-4A38-994C-99C04B9565F6}.Release|Any CPU.Build.0 = Release|Any CPU - {CAE8C77D-1FEF-48E8-BA50-9F0BBA02B1A0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CAE8C77D-1FEF-48E8-BA50-9F0BBA02B1A0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CAE8C77D-1FEF-48E8-BA50-9F0BBA02B1A0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CAE8C77D-1FEF-48E8-BA50-9F0BBA02B1A0}.Release|Any CPU.Build.0 = Release|Any CPU - {5262C489-BA48-4427-BE4C-6972B44F3C27}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5262C489-BA48-4427-BE4C-6972B44F3C27}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5262C489-BA48-4427-BE4C-6972B44F3C27}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5262C489-BA48-4427-BE4C-6972B44F3C27}.Release|Any CPU.Build.0 = Release|Any CPU - {D49B8503-CB22-498D-BACB-787937C8D3FF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D49B8503-CB22-498D-BACB-787937C8D3FF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D49B8503-CB22-498D-BACB-787937C8D3FF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D49B8503-CB22-498D-BACB-787937C8D3FF}.Release|Any CPU.Build.0 = Release|Any CPU - {D9221494-25A6-41CD-B0DF-FFD9B1B83906}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D9221494-25A6-41CD-B0DF-FFD9B1B83906}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D9221494-25A6-41CD-B0DF-FFD9B1B83906}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D9221494-25A6-41CD-B0DF-FFD9B1B83906}.Release|Any CPU.Build.0 = Release|Any CPU - {ED076F76-7A54-43A3-9741-A4726520271E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {ED076F76-7A54-43A3-9741-A4726520271E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {ED076F76-7A54-43A3-9741-A4726520271E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {ED076F76-7A54-43A3-9741-A4726520271E}.Release|Any CPU.Build.0 = Release|Any CPU - {418363C3-EE7B-426C-B971-A5D7DF401AB8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {418363C3-EE7B-426C-B971-A5D7DF401AB8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {418363C3-EE7B-426C-B971-A5D7DF401AB8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {418363C3-EE7B-426C-B971-A5D7DF401AB8}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {DF65E5FA-96D6-498C-A4B0-12585E04D3E1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DF65E5FA-96D6-498C-A4B0-12585E04D3E1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DF65E5FA-96D6-498C-A4B0-12585E04D3E1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DF65E5FA-96D6-498C-A4B0-12585E04D3E1}.Release|Any CPU.Build.0 = Release|Any CPU - {1ECE704D-7281-4F9E-BA56-CCADEBF69E58}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1ECE704D-7281-4F9E-BA56-CCADEBF69E58}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1ECE704D-7281-4F9E-BA56-CCADEBF69E58}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1ECE704D-7281-4F9E-BA56-CCADEBF69E58}.Release|Any CPU.Build.0 = Release|Any CPU - {446DC579-4D01-45D6-9E72-0D4B3FE0956F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {446DC579-4D01-45D6-9E72-0D4B3FE0956F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {446DC579-4D01-45D6-9E72-0D4B3FE0956F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {446DC579-4D01-45D6-9E72-0D4B3FE0956F}.Release|Any CPU.Build.0 = Release|Any CPU - {3AEE9BB7-518F-4A38-994C-99C04B9565F6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3AEE9BB7-518F-4A38-994C-99C04B9565F6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3AEE9BB7-518F-4A38-994C-99C04B9565F6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3AEE9BB7-518F-4A38-994C-99C04B9565F6}.Release|Any CPU.Build.0 = Release|Any CPU - {CAE8C77D-1FEF-48E8-BA50-9F0BBA02B1A0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CAE8C77D-1FEF-48E8-BA50-9F0BBA02B1A0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CAE8C77D-1FEF-48E8-BA50-9F0BBA02B1A0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CAE8C77D-1FEF-48E8-BA50-9F0BBA02B1A0}.Release|Any CPU.Build.0 = Release|Any CPU - {5262C489-BA48-4427-BE4C-6972B44F3C27}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5262C489-BA48-4427-BE4C-6972B44F3C27}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5262C489-BA48-4427-BE4C-6972B44F3C27}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5262C489-BA48-4427-BE4C-6972B44F3C27}.Release|Any CPU.Build.0 = Release|Any CPU - {D49B8503-CB22-498D-BACB-787937C8D3FF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D49B8503-CB22-498D-BACB-787937C8D3FF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D49B8503-CB22-498D-BACB-787937C8D3FF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D49B8503-CB22-498D-BACB-787937C8D3FF}.Release|Any CPU.Build.0 = Release|Any CPU - {D9221494-25A6-41CD-B0DF-FFD9B1B83906}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D9221494-25A6-41CD-B0DF-FFD9B1B83906}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D9221494-25A6-41CD-B0DF-FFD9B1B83906}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D9221494-25A6-41CD-B0DF-FFD9B1B83906}.Release|Any CPU.Build.0 = Release|Any CPU - {ED076F76-7A54-43A3-9741-A4726520271E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {ED076F76-7A54-43A3-9741-A4726520271E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {ED076F76-7A54-43A3-9741-A4726520271E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {ED076F76-7A54-43A3-9741-A4726520271E}.Release|Any CPU.Build.0 = Release|Any CPU - {418363C3-EE7B-426C-B971-A5D7DF401AB8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {418363C3-EE7B-426C-B971-A5D7DF401AB8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {418363C3-EE7B-426C-B971-A5D7DF401AB8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {418363C3-EE7B-426C-B971-A5D7DF401AB8}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {D5D5C2C7-F6DA-47AF-8799-F65321D2EF51} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {2C19CA1D-5AA7-4E20-BB97-11AE789D1322} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {D9909577-0D4F-404A-9DE5-59653B3599D5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {E602A8EB-4AA8-47C3-9900-51E39EAE83B4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {492F7D3B-AFCB-4AE2-A716-F8ED17EAAEDC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {DF65E5FA-96D6-498C-A4B0-12585E04D3E1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {1ECE704D-7281-4F9E-BA56-CCADEBF69E58} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {446DC579-4D01-45D6-9E72-0D4B3FE0956F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {3AEE9BB7-518F-4A38-994C-99C04B9565F6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {CAE8C77D-1FEF-48E8-BA50-9F0BBA02B1A0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {5262C489-BA48-4427-BE4C-6972B44F3C27} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D49B8503-CB22-498D-BACB-787937C8D3FF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D9221494-25A6-41CD-B0DF-FFD9B1B83906} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {ED076F76-7A54-43A3-9741-A4726520271E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {418363C3-EE7B-426C-B971-A5D7DF401AB8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {DF65E5FA-96D6-498C-A4B0-12585E04D3E1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {1ECE704D-7281-4F9E-BA56-CCADEBF69E58} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {446DC579-4D01-45D6-9E72-0D4B3FE0956F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {3AEE9BB7-518F-4A38-994C-99C04B9565F6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {CAE8C77D-1FEF-48E8-BA50-9F0BBA02B1A0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {5262C489-BA48-4427-BE4C-6972B44F3C27} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D49B8503-CB22-498D-BACB-787937C8D3FF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D9221494-25A6-41CD-B0DF-FFD9B1B83906} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {ED076F76-7A54-43A3-9741-A4726520271E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {418363C3-EE7B-426C-B971-A5D7DF401AB8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {E2D1C459-83DF-4588-9BD7-2A7BA709B12B} diff --git a/sdk/src/Services/Translate/Generated/AmazonTranslateConfig.cs b/sdk/src/Services/Translate/Generated/AmazonTranslateConfig.cs index c2e6b512cce1..c4182e5c4acc 100644 --- a/sdk/src/Services/Translate/Generated/AmazonTranslateConfig.cs +++ b/sdk/src/Services/Translate/Generated/AmazonTranslateConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.Translate public partial class AmazonTranslateConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("Translate", "4.0.0.0"); private static readonly AmazonTranslateEndpointResolver EndpointResolver = new AmazonTranslateEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("Translate", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("Translate", "3.7.400.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/Translate/Properties/AssemblyInfo.cs b/sdk/src/Services/Translate/Properties/AssemblyInfo.cs index 2ea9a8427806..da95649aec79 100644 --- a/sdk/src/Services/Translate/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/Translate/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/Translate/Translate.sln b/sdk/src/Services/Translate/Translate.sln index 4b4470696821..3ab43e595bae 100644 --- a/sdk/src/Services/Translate/Translate.sln +++ b/sdk/src/Services/Translate/Translate.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {3C2E3DAB-6205-4600-B9E8-D378B8A3AF0F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {3C2E3DAB-6205-4600-B9E8-D378B8A3AF0F}.Debug|Any CPU.Build.0 = Debug|Any CPU {3C2E3DAB-6205-4600-B9E8-D378B8A3AF0F}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {8376056A-4B02-49F3-8376-F856C27BC655}.Debug|Any CPU.Build.0 = Debug|Any CPU {8376056A-4B02-49F3-8376-F856C27BC655}.Release|Any CPU.ActiveCfg = Release|Any CPU {8376056A-4B02-49F3-8376-F856C27BC655}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {C7DBBF77-FA79-4133-BEB6-324A56DEDEB4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C7DBBF77-FA79-4133-BEB6-324A56DEDEB4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C7DBBF77-FA79-4133-BEB6-324A56DEDEB4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C7DBBF77-FA79-4133-BEB6-324A56DEDEB4}.Release|Any CPU.Build.0 = Release|Any CPU - {A85BD470-AF60-4110-AAFC-1EABC734F7B0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A85BD470-AF60-4110-AAFC-1EABC734F7B0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A85BD470-AF60-4110-AAFC-1EABC734F7B0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A85BD470-AF60-4110-AAFC-1EABC734F7B0}.Release|Any CPU.Build.0 = Release|Any CPU - {83696C0E-F428-4FBD-9BBA-63564E328C73}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {83696C0E-F428-4FBD-9BBA-63564E328C73}.Debug|Any CPU.Build.0 = Debug|Any CPU - {83696C0E-F428-4FBD-9BBA-63564E328C73}.Release|Any CPU.ActiveCfg = Release|Any CPU - {83696C0E-F428-4FBD-9BBA-63564E328C73}.Release|Any CPU.Build.0 = Release|Any CPU - {4D4D317F-223A-473B-BEB8-2AF6CF51DFC3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4D4D317F-223A-473B-BEB8-2AF6CF51DFC3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4D4D317F-223A-473B-BEB8-2AF6CF51DFC3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4D4D317F-223A-473B-BEB8-2AF6CF51DFC3}.Release|Any CPU.Build.0 = Release|Any CPU - {8D00D91F-0E4A-404D-9CE3-666519F68753}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8D00D91F-0E4A-404D-9CE3-666519F68753}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8D00D91F-0E4A-404D-9CE3-666519F68753}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8D00D91F-0E4A-404D-9CE3-666519F68753}.Release|Any CPU.Build.0 = Release|Any CPU - {9AD69FD2-333D-4315-8D3C-9C1F3F8C075F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9AD69FD2-333D-4315-8D3C-9C1F3F8C075F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9AD69FD2-333D-4315-8D3C-9C1F3F8C075F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9AD69FD2-333D-4315-8D3C-9C1F3F8C075F}.Release|Any CPU.Build.0 = Release|Any CPU - {4CC9C1D5-98D6-441A-9AFD-DB5A1E762D14}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4CC9C1D5-98D6-441A-9AFD-DB5A1E762D14}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4CC9C1D5-98D6-441A-9AFD-DB5A1E762D14}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4CC9C1D5-98D6-441A-9AFD-DB5A1E762D14}.Release|Any CPU.Build.0 = Release|Any CPU - {239071B8-DC2E-48D9-9C19-64F2AD7EA60E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {239071B8-DC2E-48D9-9C19-64F2AD7EA60E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {239071B8-DC2E-48D9-9C19-64F2AD7EA60E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {239071B8-DC2E-48D9-9C19-64F2AD7EA60E}.Release|Any CPU.Build.0 = Release|Any CPU - {5E863770-FFAA-47C2-A9D7-214A25E4BF02}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5E863770-FFAA-47C2-A9D7-214A25E4BF02}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5E863770-FFAA-47C2-A9D7-214A25E4BF02}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5E863770-FFAA-47C2-A9D7-214A25E4BF02}.Release|Any CPU.Build.0 = Release|Any CPU - {A93FE218-99D1-42B7-8C02-907049A86F27}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A93FE218-99D1-42B7-8C02-907049A86F27}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A93FE218-99D1-42B7-8C02-907049A86F27}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A93FE218-99D1-42B7-8C02-907049A86F27}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {C7DBBF77-FA79-4133-BEB6-324A56DEDEB4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C7DBBF77-FA79-4133-BEB6-324A56DEDEB4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C7DBBF77-FA79-4133-BEB6-324A56DEDEB4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C7DBBF77-FA79-4133-BEB6-324A56DEDEB4}.Release|Any CPU.Build.0 = Release|Any CPU - {A85BD470-AF60-4110-AAFC-1EABC734F7B0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A85BD470-AF60-4110-AAFC-1EABC734F7B0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A85BD470-AF60-4110-AAFC-1EABC734F7B0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A85BD470-AF60-4110-AAFC-1EABC734F7B0}.Release|Any CPU.Build.0 = Release|Any CPU - {83696C0E-F428-4FBD-9BBA-63564E328C73}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {83696C0E-F428-4FBD-9BBA-63564E328C73}.Debug|Any CPU.Build.0 = Debug|Any CPU - {83696C0E-F428-4FBD-9BBA-63564E328C73}.Release|Any CPU.ActiveCfg = Release|Any CPU - {83696C0E-F428-4FBD-9BBA-63564E328C73}.Release|Any CPU.Build.0 = Release|Any CPU - {4D4D317F-223A-473B-BEB8-2AF6CF51DFC3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4D4D317F-223A-473B-BEB8-2AF6CF51DFC3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4D4D317F-223A-473B-BEB8-2AF6CF51DFC3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4D4D317F-223A-473B-BEB8-2AF6CF51DFC3}.Release|Any CPU.Build.0 = Release|Any CPU - {8D00D91F-0E4A-404D-9CE3-666519F68753}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8D00D91F-0E4A-404D-9CE3-666519F68753}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8D00D91F-0E4A-404D-9CE3-666519F68753}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8D00D91F-0E4A-404D-9CE3-666519F68753}.Release|Any CPU.Build.0 = Release|Any CPU - {9AD69FD2-333D-4315-8D3C-9C1F3F8C075F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9AD69FD2-333D-4315-8D3C-9C1F3F8C075F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9AD69FD2-333D-4315-8D3C-9C1F3F8C075F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9AD69FD2-333D-4315-8D3C-9C1F3F8C075F}.Release|Any CPU.Build.0 = Release|Any CPU - {4CC9C1D5-98D6-441A-9AFD-DB5A1E762D14}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4CC9C1D5-98D6-441A-9AFD-DB5A1E762D14}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4CC9C1D5-98D6-441A-9AFD-DB5A1E762D14}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4CC9C1D5-98D6-441A-9AFD-DB5A1E762D14}.Release|Any CPU.Build.0 = Release|Any CPU - {239071B8-DC2E-48D9-9C19-64F2AD7EA60E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {239071B8-DC2E-48D9-9C19-64F2AD7EA60E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {239071B8-DC2E-48D9-9C19-64F2AD7EA60E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {239071B8-DC2E-48D9-9C19-64F2AD7EA60E}.Release|Any CPU.Build.0 = Release|Any CPU - {5E863770-FFAA-47C2-A9D7-214A25E4BF02}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5E863770-FFAA-47C2-A9D7-214A25E4BF02}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5E863770-FFAA-47C2-A9D7-214A25E4BF02}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5E863770-FFAA-47C2-A9D7-214A25E4BF02}.Release|Any CPU.Build.0 = Release|Any CPU - {A93FE218-99D1-42B7-8C02-907049A86F27}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A93FE218-99D1-42B7-8C02-907049A86F27}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A93FE218-99D1-42B7-8C02-907049A86F27}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A93FE218-99D1-42B7-8C02-907049A86F27}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {3C2E3DAB-6205-4600-B9E8-D378B8A3AF0F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {1B5D1F6A-5BCC-4DB7-9E41-840E6B06C9C4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {471E9F6E-55BC-4AEC-88C5-B9C43266D7D2} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {6CCD3A7B-07CE-4B48-8A35-DE20E7E396B8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {8376056A-4B02-49F3-8376-F856C27BC655} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {C7DBBF77-FA79-4133-BEB6-324A56DEDEB4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A85BD470-AF60-4110-AAFC-1EABC734F7B0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {83696C0E-F428-4FBD-9BBA-63564E328C73} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4D4D317F-223A-473B-BEB8-2AF6CF51DFC3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8D00D91F-0E4A-404D-9CE3-666519F68753} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {9AD69FD2-333D-4315-8D3C-9C1F3F8C075F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4CC9C1D5-98D6-441A-9AFD-DB5A1E762D14} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {239071B8-DC2E-48D9-9C19-64F2AD7EA60E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {5E863770-FFAA-47C2-A9D7-214A25E4BF02} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A93FE218-99D1-42B7-8C02-907049A86F27} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {C7DBBF77-FA79-4133-BEB6-324A56DEDEB4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A85BD470-AF60-4110-AAFC-1EABC734F7B0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {83696C0E-F428-4FBD-9BBA-63564E328C73} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4D4D317F-223A-473B-BEB8-2AF6CF51DFC3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8D00D91F-0E4A-404D-9CE3-666519F68753} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {9AD69FD2-333D-4315-8D3C-9C1F3F8C075F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4CC9C1D5-98D6-441A-9AFD-DB5A1E762D14} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {239071B8-DC2E-48D9-9C19-64F2AD7EA60E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {5E863770-FFAA-47C2-A9D7-214A25E4BF02} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A93FE218-99D1-42B7-8C02-907049A86F27} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {5239636A-796B-40E8-BAE3-1BC902FD526A} diff --git a/sdk/src/Services/TrustedAdvisor/Generated/AmazonTrustedAdvisorConfig.cs b/sdk/src/Services/TrustedAdvisor/Generated/AmazonTrustedAdvisorConfig.cs index dc4d5e643b69..390a10a1450d 100644 --- a/sdk/src/Services/TrustedAdvisor/Generated/AmazonTrustedAdvisorConfig.cs +++ b/sdk/src/Services/TrustedAdvisor/Generated/AmazonTrustedAdvisorConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.TrustedAdvisor public partial class AmazonTrustedAdvisorConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("TrustedAdvisor", "4.0.0.0"); private static readonly AmazonTrustedAdvisorEndpointResolver EndpointResolver = new AmazonTrustedAdvisorEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("TrustedAdvisor", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("TrustedAdvisor", "3.7.400.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/TrustedAdvisor/Properties/AssemblyInfo.cs b/sdk/src/Services/TrustedAdvisor/Properties/AssemblyInfo.cs index 16506a997363..6e785cd2fbb0 100644 --- a/sdk/src/Services/TrustedAdvisor/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/TrustedAdvisor/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/TrustedAdvisor/TrustedAdvisor.sln b/sdk/src/Services/TrustedAdvisor/TrustedAdvisor.sln index 22ab34fd6acf..aa0b0363a0cb 100644 --- a/sdk/src/Services/TrustedAdvisor/TrustedAdvisor.sln +++ b/sdk/src/Services/TrustedAdvisor/TrustedAdvisor.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {BCFAB252-9AFA-4285-A996-FE09E967F250}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {BCFAB252-9AFA-4285-A996-FE09E967F250}.Debug|Any CPU.Build.0 = Debug|Any CPU {BCFAB252-9AFA-4285-A996-FE09E967F250}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {9FAC6553-2DB9-453B-B4B7-72AB0B499618}.Debug|Any CPU.Build.0 = Debug|Any CPU {9FAC6553-2DB9-453B-B4B7-72AB0B499618}.Release|Any CPU.ActiveCfg = Release|Any CPU {9FAC6553-2DB9-453B-B4B7-72AB0B499618}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {71C77392-47B2-41BE-B15B-39CEC4971E24}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {71C77392-47B2-41BE-B15B-39CEC4971E24}.Debug|Any CPU.Build.0 = Debug|Any CPU - {71C77392-47B2-41BE-B15B-39CEC4971E24}.Release|Any CPU.ActiveCfg = Release|Any CPU - {71C77392-47B2-41BE-B15B-39CEC4971E24}.Release|Any CPU.Build.0 = Release|Any CPU - {2A966641-51AC-4018-8241-6E09CD823B67}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2A966641-51AC-4018-8241-6E09CD823B67}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2A966641-51AC-4018-8241-6E09CD823B67}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2A966641-51AC-4018-8241-6E09CD823B67}.Release|Any CPU.Build.0 = Release|Any CPU - {5468308A-BDE7-4614-B0CC-66D856E81CF2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5468308A-BDE7-4614-B0CC-66D856E81CF2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5468308A-BDE7-4614-B0CC-66D856E81CF2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5468308A-BDE7-4614-B0CC-66D856E81CF2}.Release|Any CPU.Build.0 = Release|Any CPU - {6B725811-051A-4769-858A-3C8A9C95492F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6B725811-051A-4769-858A-3C8A9C95492F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6B725811-051A-4769-858A-3C8A9C95492F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6B725811-051A-4769-858A-3C8A9C95492F}.Release|Any CPU.Build.0 = Release|Any CPU - {424DF04F-F86C-46EF-BC4F-AA8560B111E2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {424DF04F-F86C-46EF-BC4F-AA8560B111E2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {424DF04F-F86C-46EF-BC4F-AA8560B111E2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {424DF04F-F86C-46EF-BC4F-AA8560B111E2}.Release|Any CPU.Build.0 = Release|Any CPU - {C902F433-7688-4357-AC0D-1339615FAE41}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C902F433-7688-4357-AC0D-1339615FAE41}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C902F433-7688-4357-AC0D-1339615FAE41}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C902F433-7688-4357-AC0D-1339615FAE41}.Release|Any CPU.Build.0 = Release|Any CPU - {23BC4D9B-B76D-4A7E-883E-92E77EEFF85B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {23BC4D9B-B76D-4A7E-883E-92E77EEFF85B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {23BC4D9B-B76D-4A7E-883E-92E77EEFF85B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {23BC4D9B-B76D-4A7E-883E-92E77EEFF85B}.Release|Any CPU.Build.0 = Release|Any CPU - {59925CD6-4039-4134-9B7A-A2D480047F47}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {59925CD6-4039-4134-9B7A-A2D480047F47}.Debug|Any CPU.Build.0 = Debug|Any CPU - {59925CD6-4039-4134-9B7A-A2D480047F47}.Release|Any CPU.ActiveCfg = Release|Any CPU - {59925CD6-4039-4134-9B7A-A2D480047F47}.Release|Any CPU.Build.0 = Release|Any CPU - {5D6EBBE5-1C12-4DA4-B333-58B0D3D39D48}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5D6EBBE5-1C12-4DA4-B333-58B0D3D39D48}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5D6EBBE5-1C12-4DA4-B333-58B0D3D39D48}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5D6EBBE5-1C12-4DA4-B333-58B0D3D39D48}.Release|Any CPU.Build.0 = Release|Any CPU - {21AC33D1-7E35-4933-98B3-6AF2CE838496}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {21AC33D1-7E35-4933-98B3-6AF2CE838496}.Debug|Any CPU.Build.0 = Debug|Any CPU - {21AC33D1-7E35-4933-98B3-6AF2CE838496}.Release|Any CPU.ActiveCfg = Release|Any CPU - {21AC33D1-7E35-4933-98B3-6AF2CE838496}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {71C77392-47B2-41BE-B15B-39CEC4971E24}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {71C77392-47B2-41BE-B15B-39CEC4971E24}.Debug|Any CPU.Build.0 = Debug|Any CPU - {71C77392-47B2-41BE-B15B-39CEC4971E24}.Release|Any CPU.ActiveCfg = Release|Any CPU - {71C77392-47B2-41BE-B15B-39CEC4971E24}.Release|Any CPU.Build.0 = Release|Any CPU - {2A966641-51AC-4018-8241-6E09CD823B67}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2A966641-51AC-4018-8241-6E09CD823B67}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2A966641-51AC-4018-8241-6E09CD823B67}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2A966641-51AC-4018-8241-6E09CD823B67}.Release|Any CPU.Build.0 = Release|Any CPU - {5468308A-BDE7-4614-B0CC-66D856E81CF2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5468308A-BDE7-4614-B0CC-66D856E81CF2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5468308A-BDE7-4614-B0CC-66D856E81CF2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5468308A-BDE7-4614-B0CC-66D856E81CF2}.Release|Any CPU.Build.0 = Release|Any CPU - {6B725811-051A-4769-858A-3C8A9C95492F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6B725811-051A-4769-858A-3C8A9C95492F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6B725811-051A-4769-858A-3C8A9C95492F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6B725811-051A-4769-858A-3C8A9C95492F}.Release|Any CPU.Build.0 = Release|Any CPU - {424DF04F-F86C-46EF-BC4F-AA8560B111E2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {424DF04F-F86C-46EF-BC4F-AA8560B111E2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {424DF04F-F86C-46EF-BC4F-AA8560B111E2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {424DF04F-F86C-46EF-BC4F-AA8560B111E2}.Release|Any CPU.Build.0 = Release|Any CPU - {C902F433-7688-4357-AC0D-1339615FAE41}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C902F433-7688-4357-AC0D-1339615FAE41}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C902F433-7688-4357-AC0D-1339615FAE41}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C902F433-7688-4357-AC0D-1339615FAE41}.Release|Any CPU.Build.0 = Release|Any CPU - {23BC4D9B-B76D-4A7E-883E-92E77EEFF85B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {23BC4D9B-B76D-4A7E-883E-92E77EEFF85B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {23BC4D9B-B76D-4A7E-883E-92E77EEFF85B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {23BC4D9B-B76D-4A7E-883E-92E77EEFF85B}.Release|Any CPU.Build.0 = Release|Any CPU - {59925CD6-4039-4134-9B7A-A2D480047F47}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {59925CD6-4039-4134-9B7A-A2D480047F47}.Debug|Any CPU.Build.0 = Debug|Any CPU - {59925CD6-4039-4134-9B7A-A2D480047F47}.Release|Any CPU.ActiveCfg = Release|Any CPU - {59925CD6-4039-4134-9B7A-A2D480047F47}.Release|Any CPU.Build.0 = Release|Any CPU - {5D6EBBE5-1C12-4DA4-B333-58B0D3D39D48}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5D6EBBE5-1C12-4DA4-B333-58B0D3D39D48}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5D6EBBE5-1C12-4DA4-B333-58B0D3D39D48}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5D6EBBE5-1C12-4DA4-B333-58B0D3D39D48}.Release|Any CPU.Build.0 = Release|Any CPU - {21AC33D1-7E35-4933-98B3-6AF2CE838496}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {21AC33D1-7E35-4933-98B3-6AF2CE838496}.Debug|Any CPU.Build.0 = Debug|Any CPU - {21AC33D1-7E35-4933-98B3-6AF2CE838496}.Release|Any CPU.ActiveCfg = Release|Any CPU - {21AC33D1-7E35-4933-98B3-6AF2CE838496}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {BCFAB252-9AFA-4285-A996-FE09E967F250} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {121DA9DD-B50E-4274-9629-9B7B9879D997} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {83676F0D-6F89-4A42-9CF3-DB0D26BD2AB2} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {F0C08666-AD2C-4763-BF6E-F2C69929297D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {9FAC6553-2DB9-453B-B4B7-72AB0B499618} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {71C77392-47B2-41BE-B15B-39CEC4971E24} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {2A966641-51AC-4018-8241-6E09CD823B67} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {5468308A-BDE7-4614-B0CC-66D856E81CF2} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6B725811-051A-4769-858A-3C8A9C95492F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {424DF04F-F86C-46EF-BC4F-AA8560B111E2} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C902F433-7688-4357-AC0D-1339615FAE41} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {23BC4D9B-B76D-4A7E-883E-92E77EEFF85B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {59925CD6-4039-4134-9B7A-A2D480047F47} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {5D6EBBE5-1C12-4DA4-B333-58B0D3D39D48} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {21AC33D1-7E35-4933-98B3-6AF2CE838496} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {71C77392-47B2-41BE-B15B-39CEC4971E24} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {2A966641-51AC-4018-8241-6E09CD823B67} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {5468308A-BDE7-4614-B0CC-66D856E81CF2} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6B725811-051A-4769-858A-3C8A9C95492F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {424DF04F-F86C-46EF-BC4F-AA8560B111E2} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C902F433-7688-4357-AC0D-1339615FAE41} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {23BC4D9B-B76D-4A7E-883E-92E77EEFF85B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {59925CD6-4039-4134-9B7A-A2D480047F47} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {5D6EBBE5-1C12-4DA4-B333-58B0D3D39D48} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {21AC33D1-7E35-4933-98B3-6AF2CE838496} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {2639FE23-6129-492E-B96F-7A7F7823F208} diff --git a/sdk/src/Services/VPCLattice/Generated/AmazonVPCLatticeConfig.cs b/sdk/src/Services/VPCLattice/Generated/AmazonVPCLatticeConfig.cs index a6c06be8f4fb..57783e24aab8 100644 --- a/sdk/src/Services/VPCLattice/Generated/AmazonVPCLatticeConfig.cs +++ b/sdk/src/Services/VPCLattice/Generated/AmazonVPCLatticeConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.VPCLattice public partial class AmazonVPCLatticeConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("VPC Lattice", "4.0.0.0"); private static readonly AmazonVPCLatticeEndpointResolver EndpointResolver = new AmazonVPCLatticeEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("VPC Lattice", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("VPC Lattice", "3.7.400.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/VPCLattice/Properties/AssemblyInfo.cs b/sdk/src/Services/VPCLattice/Properties/AssemblyInfo.cs index f02c0f1e2f73..d59314a161ea 100644 --- a/sdk/src/Services/VPCLattice/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/VPCLattice/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/VPCLattice/VPCLattice.sln b/sdk/src/Services/VPCLattice/VPCLattice.sln index 6e28ccfa9069..2c14dd4b9590 100644 --- a/sdk/src/Services/VPCLattice/VPCLattice.sln +++ b/sdk/src/Services/VPCLattice/VPCLattice.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {0FDDFAAC-53B4-4F36-8AB0-B422A1F0E5E0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {0FDDFAAC-53B4-4F36-8AB0-B422A1F0E5E0}.Debug|Any CPU.Build.0 = Debug|Any CPU {0FDDFAAC-53B4-4F36-8AB0-B422A1F0E5E0}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {F068548D-7AB9-43C2-B1BE-1A5E32242D79}.Debug|Any CPU.Build.0 = Debug|Any CPU {F068548D-7AB9-43C2-B1BE-1A5E32242D79}.Release|Any CPU.ActiveCfg = Release|Any CPU {F068548D-7AB9-43C2-B1BE-1A5E32242D79}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {2032C607-15C3-4364-A303-A371218C9A13}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2032C607-15C3-4364-A303-A371218C9A13}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2032C607-15C3-4364-A303-A371218C9A13}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2032C607-15C3-4364-A303-A371218C9A13}.Release|Any CPU.Build.0 = Release|Any CPU - {E5FD5861-D781-42B2-B251-F80F55F85BF4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E5FD5861-D781-42B2-B251-F80F55F85BF4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E5FD5861-D781-42B2-B251-F80F55F85BF4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E5FD5861-D781-42B2-B251-F80F55F85BF4}.Release|Any CPU.Build.0 = Release|Any CPU - {DCFD10E5-D5F7-4210-8213-CF0883007257}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DCFD10E5-D5F7-4210-8213-CF0883007257}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DCFD10E5-D5F7-4210-8213-CF0883007257}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DCFD10E5-D5F7-4210-8213-CF0883007257}.Release|Any CPU.Build.0 = Release|Any CPU - {232ADFF6-88EF-4311-88FF-896E44AB5406}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {232ADFF6-88EF-4311-88FF-896E44AB5406}.Debug|Any CPU.Build.0 = Debug|Any CPU - {232ADFF6-88EF-4311-88FF-896E44AB5406}.Release|Any CPU.ActiveCfg = Release|Any CPU - {232ADFF6-88EF-4311-88FF-896E44AB5406}.Release|Any CPU.Build.0 = Release|Any CPU - {EA081EF3-9307-4E2B-A26F-F06D6D2F72A9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EA081EF3-9307-4E2B-A26F-F06D6D2F72A9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EA081EF3-9307-4E2B-A26F-F06D6D2F72A9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EA081EF3-9307-4E2B-A26F-F06D6D2F72A9}.Release|Any CPU.Build.0 = Release|Any CPU - {E2FC6127-F597-4F08-88C7-E4EEF843597B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E2FC6127-F597-4F08-88C7-E4EEF843597B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E2FC6127-F597-4F08-88C7-E4EEF843597B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E2FC6127-F597-4F08-88C7-E4EEF843597B}.Release|Any CPU.Build.0 = Release|Any CPU - {ADE6C159-16F4-44D6-B24C-2A6764366206}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {ADE6C159-16F4-44D6-B24C-2A6764366206}.Debug|Any CPU.Build.0 = Debug|Any CPU - {ADE6C159-16F4-44D6-B24C-2A6764366206}.Release|Any CPU.ActiveCfg = Release|Any CPU - {ADE6C159-16F4-44D6-B24C-2A6764366206}.Release|Any CPU.Build.0 = Release|Any CPU - {064073FA-3742-424D-AA47-A8389592C560}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {064073FA-3742-424D-AA47-A8389592C560}.Debug|Any CPU.Build.0 = Debug|Any CPU - {064073FA-3742-424D-AA47-A8389592C560}.Release|Any CPU.ActiveCfg = Release|Any CPU - {064073FA-3742-424D-AA47-A8389592C560}.Release|Any CPU.Build.0 = Release|Any CPU - {C1807216-6E1B-4551-909E-8F5A184F6884}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C1807216-6E1B-4551-909E-8F5A184F6884}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C1807216-6E1B-4551-909E-8F5A184F6884}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C1807216-6E1B-4551-909E-8F5A184F6884}.Release|Any CPU.Build.0 = Release|Any CPU - {1270E8B6-EEB3-4345-B4D5-0BD2215C9286}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1270E8B6-EEB3-4345-B4D5-0BD2215C9286}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1270E8B6-EEB3-4345-B4D5-0BD2215C9286}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1270E8B6-EEB3-4345-B4D5-0BD2215C9286}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {2032C607-15C3-4364-A303-A371218C9A13}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2032C607-15C3-4364-A303-A371218C9A13}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2032C607-15C3-4364-A303-A371218C9A13}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2032C607-15C3-4364-A303-A371218C9A13}.Release|Any CPU.Build.0 = Release|Any CPU - {E5FD5861-D781-42B2-B251-F80F55F85BF4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E5FD5861-D781-42B2-B251-F80F55F85BF4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E5FD5861-D781-42B2-B251-F80F55F85BF4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E5FD5861-D781-42B2-B251-F80F55F85BF4}.Release|Any CPU.Build.0 = Release|Any CPU - {DCFD10E5-D5F7-4210-8213-CF0883007257}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DCFD10E5-D5F7-4210-8213-CF0883007257}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DCFD10E5-D5F7-4210-8213-CF0883007257}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DCFD10E5-D5F7-4210-8213-CF0883007257}.Release|Any CPU.Build.0 = Release|Any CPU - {232ADFF6-88EF-4311-88FF-896E44AB5406}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {232ADFF6-88EF-4311-88FF-896E44AB5406}.Debug|Any CPU.Build.0 = Debug|Any CPU - {232ADFF6-88EF-4311-88FF-896E44AB5406}.Release|Any CPU.ActiveCfg = Release|Any CPU - {232ADFF6-88EF-4311-88FF-896E44AB5406}.Release|Any CPU.Build.0 = Release|Any CPU - {EA081EF3-9307-4E2B-A26F-F06D6D2F72A9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EA081EF3-9307-4E2B-A26F-F06D6D2F72A9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EA081EF3-9307-4E2B-A26F-F06D6D2F72A9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EA081EF3-9307-4E2B-A26F-F06D6D2F72A9}.Release|Any CPU.Build.0 = Release|Any CPU - {E2FC6127-F597-4F08-88C7-E4EEF843597B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E2FC6127-F597-4F08-88C7-E4EEF843597B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E2FC6127-F597-4F08-88C7-E4EEF843597B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E2FC6127-F597-4F08-88C7-E4EEF843597B}.Release|Any CPU.Build.0 = Release|Any CPU - {ADE6C159-16F4-44D6-B24C-2A6764366206}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {ADE6C159-16F4-44D6-B24C-2A6764366206}.Debug|Any CPU.Build.0 = Debug|Any CPU - {ADE6C159-16F4-44D6-B24C-2A6764366206}.Release|Any CPU.ActiveCfg = Release|Any CPU - {ADE6C159-16F4-44D6-B24C-2A6764366206}.Release|Any CPU.Build.0 = Release|Any CPU - {064073FA-3742-424D-AA47-A8389592C560}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {064073FA-3742-424D-AA47-A8389592C560}.Debug|Any CPU.Build.0 = Debug|Any CPU - {064073FA-3742-424D-AA47-A8389592C560}.Release|Any CPU.ActiveCfg = Release|Any CPU - {064073FA-3742-424D-AA47-A8389592C560}.Release|Any CPU.Build.0 = Release|Any CPU - {C1807216-6E1B-4551-909E-8F5A184F6884}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C1807216-6E1B-4551-909E-8F5A184F6884}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C1807216-6E1B-4551-909E-8F5A184F6884}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C1807216-6E1B-4551-909E-8F5A184F6884}.Release|Any CPU.Build.0 = Release|Any CPU - {1270E8B6-EEB3-4345-B4D5-0BD2215C9286}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1270E8B6-EEB3-4345-B4D5-0BD2215C9286}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1270E8B6-EEB3-4345-B4D5-0BD2215C9286}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1270E8B6-EEB3-4345-B4D5-0BD2215C9286}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {0FDDFAAC-53B4-4F36-8AB0-B422A1F0E5E0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {B2E1A075-0757-49EC-9C21-67A0C776F81E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {8BB4C710-786B-4B28-A6B3-0277F0D267B5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {69FE53C4-D1D9-4F5B-9B52-22F4349C3388} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {F068548D-7AB9-43C2-B1BE-1A5E32242D79} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {2032C607-15C3-4364-A303-A371218C9A13} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E5FD5861-D781-42B2-B251-F80F55F85BF4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {DCFD10E5-D5F7-4210-8213-CF0883007257} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {232ADFF6-88EF-4311-88FF-896E44AB5406} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {EA081EF3-9307-4E2B-A26F-F06D6D2F72A9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E2FC6127-F597-4F08-88C7-E4EEF843597B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {ADE6C159-16F4-44D6-B24C-2A6764366206} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {064073FA-3742-424D-AA47-A8389592C560} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C1807216-6E1B-4551-909E-8F5A184F6884} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {1270E8B6-EEB3-4345-B4D5-0BD2215C9286} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {2032C607-15C3-4364-A303-A371218C9A13} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E5FD5861-D781-42B2-B251-F80F55F85BF4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {DCFD10E5-D5F7-4210-8213-CF0883007257} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {232ADFF6-88EF-4311-88FF-896E44AB5406} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {EA081EF3-9307-4E2B-A26F-F06D6D2F72A9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E2FC6127-F597-4F08-88C7-E4EEF843597B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {ADE6C159-16F4-44D6-B24C-2A6764366206} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {064073FA-3742-424D-AA47-A8389592C560} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C1807216-6E1B-4551-909E-8F5A184F6884} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {1270E8B6-EEB3-4345-B4D5-0BD2215C9286} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {2E06EC27-324D-49C9-8A50-459B69BA2A7B} diff --git a/sdk/src/Services/VerifiedPermissions/Generated/AmazonVerifiedPermissionsConfig.cs b/sdk/src/Services/VerifiedPermissions/Generated/AmazonVerifiedPermissionsConfig.cs index 035d63dfdf7c..1800d5eb1f09 100644 --- a/sdk/src/Services/VerifiedPermissions/Generated/AmazonVerifiedPermissionsConfig.cs +++ b/sdk/src/Services/VerifiedPermissions/Generated/AmazonVerifiedPermissionsConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.VerifiedPermissions public partial class AmazonVerifiedPermissionsConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("VerifiedPermissions", "4.0.0.0"); private static readonly AmazonVerifiedPermissionsEndpointResolver EndpointResolver = new AmazonVerifiedPermissionsEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("VerifiedPermissions", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("VerifiedPermissions", "3.7.401.8"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/VerifiedPermissions/Generated/Model/BatchGetPolicyOutputItem.cs b/sdk/src/Services/VerifiedPermissions/Generated/Model/BatchGetPolicyOutputItem.cs index 02ee07755144..eef57ed28c77 100644 --- a/sdk/src/Services/VerifiedPermissions/Generated/Model/BatchGetPolicyOutputItem.cs +++ b/sdk/src/Services/VerifiedPermissions/Generated/Model/BatchGetPolicyOutputItem.cs @@ -48,9 +48,9 @@ public partial class BatchGetPolicyOutputItem /// /// [AWSProperty(Required=true)] - public DateTime CreatedDate + public DateTime? CreatedDate { - get { return this._createdDate.GetValueOrDefault(); } + get { return this._createdDate; } set { this._createdDate = value; } } @@ -86,9 +86,9 @@ internal bool IsSetDefinition() /// /// [AWSProperty(Required=true)] - public DateTime LastUpdatedDate + public DateTime? LastUpdatedDate { - get { return this._lastUpdatedDate.GetValueOrDefault(); } + get { return this._lastUpdatedDate; } set { this._lastUpdatedDate = value; } } diff --git a/sdk/src/Services/VerifiedPermissions/Generated/Model/Internal/MarshallTransformations/BatchGetPolicyOutputItemUnmarshaller.cs b/sdk/src/Services/VerifiedPermissions/Generated/Model/Internal/MarshallTransformations/BatchGetPolicyOutputItemUnmarshaller.cs index 213c4f5bd822..555c70fc1abe 100644 --- a/sdk/src/Services/VerifiedPermissions/Generated/Model/Internal/MarshallTransformations/BatchGetPolicyOutputItemUnmarshaller.cs +++ b/sdk/src/Services/VerifiedPermissions/Generated/Model/Internal/MarshallTransformations/BatchGetPolicyOutputItemUnmarshaller.cs @@ -68,7 +68,7 @@ public BatchGetPolicyOutputItem Unmarshall(JsonUnmarshallerContext context) { if (context.TestExpression("createdDate", targetDepth)) { - var unmarshaller = DateTimeUnmarshaller.Instance; + var unmarshaller = NullableDateTimeUnmarshaller.Instance; unmarshalledObject.CreatedDate = unmarshaller.Unmarshall(context); continue; } @@ -80,7 +80,7 @@ public BatchGetPolicyOutputItem Unmarshall(JsonUnmarshallerContext context) } if (context.TestExpression("lastUpdatedDate", targetDepth)) { - var unmarshaller = DateTimeUnmarshaller.Instance; + var unmarshaller = NullableDateTimeUnmarshaller.Instance; unmarshalledObject.LastUpdatedDate = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/VerifiedPermissions/Generated/Model/Internal/MarshallTransformations/BatchGetPolicyRequestMarshaller.cs b/sdk/src/Services/VerifiedPermissions/Generated/Model/Internal/MarshallTransformations/BatchGetPolicyRequestMarshaller.cs index 88c8bc47ad74..cc9337c4f879 100644 --- a/sdk/src/Services/VerifiedPermissions/Generated/Model/Internal/MarshallTransformations/BatchGetPolicyRequestMarshaller.cs +++ b/sdk/src/Services/VerifiedPermissions/Generated/Model/Internal/MarshallTransformations/BatchGetPolicyRequestMarshaller.cs @@ -63,31 +63,34 @@ public IRequest Marshall(BatchGetPolicyRequest publicRequest) request.HttpMethod = "POST"; request.ResourcePath = "/"; - using (StringWriter stringWriter = new StringWriter(CultureInfo.InvariantCulture)) + using (MemoryStream memoryStream = new MemoryStream()) { - JsonWriter writer = new JsonWriter(stringWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetRequests()) + using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) { - context.Writer.WritePropertyName("requests"); - context.Writer.WriteArrayStart(); - foreach(var publicRequestRequestsListValue in publicRequest.Requests) + JsonWriter writer = new JsonWriter(streamWriter); + writer.Validate = false; + writer.WriteObjectStart(); + var context = new JsonMarshallerContext(request, writer); + if(publicRequest.IsSetRequests()) { - context.Writer.WriteObjectStart(); + context.Writer.WritePropertyName("requests"); + context.Writer.WriteArrayStart(); + foreach(var publicRequestRequestsListValue in publicRequest.Requests) + { + context.Writer.WriteObjectStart(); - var marshaller = BatchGetPolicyInputItemMarshaller.Instance; - marshaller.Marshall(publicRequestRequestsListValue, context); + var marshaller = BatchGetPolicyInputItemMarshaller.Instance; + marshaller.Marshall(publicRequestRequestsListValue, context); - context.Writer.WriteObjectEnd(); + context.Writer.WriteObjectEnd(); + } + context.Writer.WriteArrayEnd(); } - context.Writer.WriteArrayEnd(); + + writer.WriteObjectEnd(); } - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); + request.Content = memoryStream.ToArray(); } diff --git a/sdk/src/Services/VerifiedPermissions/Generated/_bcl/AmazonVerifiedPermissionsClient.cs b/sdk/src/Services/VerifiedPermissions/Generated/_bcl/AmazonVerifiedPermissionsClient.cs index ee449ebbb9e3..2cff9881dd27 100644 --- a/sdk/src/Services/VerifiedPermissions/Generated/_bcl/AmazonVerifiedPermissionsClient.cs +++ b/sdk/src/Services/VerifiedPermissions/Generated/_bcl/AmazonVerifiedPermissionsClient.cs @@ -347,6 +347,285 @@ protected override void Dispose(bool disposing) #endregion + #region BatchGetPolicy + + + /// + /// Retrieves information about a group (batch) of policies. + /// + /// + /// + /// The BatchGetPolicy operation doesn't have its own IAM permission. To authorize + /// this operation for Amazon Web Services principals, include the permission verifiedpermissions:GetPolicy + /// in their IAM policies. + /// + /// + /// + /// Container for the necessary parameters to execute the BatchGetPolicy service method. + /// + /// The response from the BatchGetPolicy service method, as returned by VerifiedPermissions. + /// + /// You don't have sufficient access to perform this action. + /// + /// + /// The request failed because of an internal error. Try your request again later + /// + /// + /// The request failed because it exceeded a throttling quota. + /// + /// + /// The request failed because one or more input parameters don't satisfy their constraint + /// requirements. The output is provided as a list of fields and a reason for each field + /// that isn't valid. + /// + /// + /// + /// The possible reasons include the following: + /// + ///
                • + /// + /// UnrecognizedEntityType + /// + /// + /// + /// The policy includes an entity type that isn't found in the schema. + /// + ///
                • + /// + /// UnrecognizedActionId + /// + /// + /// + /// The policy includes an action id that isn't found in the schema. + /// + ///
                • + /// + /// InvalidActionApplication + /// + /// + /// + /// The policy includes an action that, according to the schema, doesn't support the specified + /// principal and resource. + /// + ///
                • + /// + /// UnexpectedType + /// + /// + /// + /// The policy included an operand that isn't a valid type for the specified operation. + /// + ///
                • + /// + /// IncompatibleTypes + /// + /// + /// + /// The types of elements included in a set, or the types of expressions used in + /// an if...then...else clause aren't compatible in this context. + /// + ///
                • + /// + /// MissingAttribute + /// + /// + /// + /// The policy attempts to access a record or entity attribute that isn't specified in + /// the schema. Test for the existence of the attribute first before attempting to access + /// its value. For more information, see the has + /// (presence of attribute test) operator in the Cedar Policy Language Guide. + /// + ///
                • + /// + /// UnsafeOptionalAttributeAccess + /// + /// + /// + /// The policy attempts to access a record or entity attribute that is optional and isn't + /// guaranteed to be present. Test for the existence of the attribute first before attempting + /// to access its value. For more information, see the has + /// (presence of attribute test) operator in the Cedar Policy Language Guide. + /// + ///
                • + /// + /// ImpossiblePolicy + /// + /// + /// + /// Cedar has determined that a policy condition always evaluates to false. If the policy + /// is always false, it can never apply to any query, and so it can never affect an authorization + /// decision. + /// + ///
                • + /// + /// WrongNumberArguments + /// + /// + /// + /// The policy references an extension type with the wrong number of arguments. + /// + ///
                • + /// + /// FunctionArgumentValidationError + /// + /// + /// + /// Cedar couldn't parse the argument passed to an extension type. For example, a string + /// that is to be parsed as an IPv4 address can contain only digits and the period character. + /// + ///
                + ///                 + /// REST API Reference for BatchGetPolicy Operation + public virtual BatchGetPolicyResponse BatchGetPolicy(BatchGetPolicyRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = BatchGetPolicyRequestMarshaller.Instance; + options.ResponseUnmarshaller = BatchGetPolicyResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// Retrieves information about a group (batch) of policies. + /// + /// + /// + /// The BatchGetPolicy operation doesn't have its own IAM permission. To authorize + /// this operation for Amazon Web Services principals, include the permission verifiedpermissions:GetPolicy + /// in their IAM policies. + /// + /// + /// + /// Container for the necessary parameters to execute the BatchGetPolicy service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the BatchGetPolicy service method, as returned by VerifiedPermissions. + /// + /// You don't have sufficient access to perform this action. + /// + /// + /// The request failed because of an internal error. Try your request again later + /// + /// + /// The request failed because it exceeded a throttling quota. + /// + /// + /// The request failed because one or more input parameters don't satisfy their constraint + /// requirements. The output is provided as a list of fields and a reason for each field + /// that isn't valid. + /// + /// + /// + /// The possible reasons include the following: + /// + ///
                • + /// + /// UnrecognizedEntityType + /// + /// + /// + /// The policy includes an entity type that isn't found in the schema. + /// + ///
                • + /// + /// UnrecognizedActionId + /// + /// + /// + /// The policy includes an action id that isn't found in the schema. + /// + ///
                • + /// + /// InvalidActionApplication + /// + /// + /// + /// The policy includes an action that, according to the schema, doesn't support the specified + /// principal and resource. + /// + ///
                • + /// + /// UnexpectedType + /// + /// + /// + /// The policy included an operand that isn't a valid type for the specified operation. + /// + ///
                • + /// + /// IncompatibleTypes + /// + /// + /// + /// The types of elements included in a set, or the types of expressions used in + /// an if...then...else clause aren't compatible in this context. + /// + ///
                • + /// + /// MissingAttribute + /// + /// + /// + /// The policy attempts to access a record or entity attribute that isn't specified in + /// the schema. Test for the existence of the attribute first before attempting to access + /// its value. For more information, see the has + /// (presence of attribute test) operator in the Cedar Policy Language Guide. + /// + ///
                • + /// + /// UnsafeOptionalAttributeAccess + /// + /// + /// + /// The policy attempts to access a record or entity attribute that is optional and isn't + /// guaranteed to be present. Test for the existence of the attribute first before attempting + /// to access its value. For more information, see the has + /// (presence of attribute test) operator in the Cedar Policy Language Guide. + /// + ///
                • + /// + /// ImpossiblePolicy + /// + /// + /// + /// Cedar has determined that a policy condition always evaluates to false. If the policy + /// is always false, it can never apply to any query, and so it can never affect an authorization + /// decision. + /// + ///
                • + /// + /// WrongNumberArguments + /// + /// + /// + /// The policy references an extension type with the wrong number of arguments. + /// + ///
                • + /// + /// FunctionArgumentValidationError + /// + /// + /// + /// Cedar couldn't parse the argument passed to an extension type. For example, a string + /// that is to be parsed as an IPv4 address can contain only digits and the period character. + /// + ///
                + ///                 + /// REST API Reference for BatchGetPolicy Operation + public virtual Task BatchGetPolicyAsync(BatchGetPolicyRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = BatchGetPolicyRequestMarshaller.Instance; + options.ResponseUnmarshaller = BatchGetPolicyResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + #region BatchIsAuthorized @@ -1025,7 +1304,7 @@ public virtual BatchIsAuthorizedWithTokenResponse BatchIsAuthorizedWithToken(Bat /// ///
              • /// - /// OpenID Connect (OIDC) provider: Namespace::[Entity type]::[principalIdClaim]|[user + /// OpenID Connect (OIDC) provider: Namespace::[Entity type]::[entityIdPrefix]|[user /// principal attribute], for example MyCorp::User::MyOIDCProvider|a1b2c3d4-5678-90ab-cdef-EXAMPLE22222. /// ///
              @@ -1203,7 +1482,7 @@ public virtual CreateIdentitySourceResponse CreateIdentitySource(CreateIdentityS /// ///
            • /// - /// OpenID Connect (OIDC) provider: Namespace::[Entity type]::[principalIdClaim]|[user + /// OpenID Connect (OIDC) provider: Namespace::[Entity type]::[entityIdPrefix]|[user /// principal attribute], for example MyCorp::User::MyOIDCProvider|a1b2c3d4-5678-90ab-cdef-EXAMPLE22222. /// ///
            @@ -5068,10 +5347,6 @@ public virtual IsAuthorizedResponse IsAuthorized(IsAuthorizedRequest request) /// /// /// - /// At this time, Verified Permissions accepts tokens from only Amazon Cognito. - /// - /// - /// /// Verified Permissions validates each token that is specified in a request by checking /// its expiration date and its signature. /// @@ -5223,10 +5498,6 @@ public virtual IsAuthorizedWithTokenResponse IsAuthorizedWithToken(IsAuthorizedW /// /// /// - /// At this time, Verified Permissions accepts tokens from only Amazon Cognito. - /// - /// - /// /// Verified Permissions validates each token that is specified in a request by checking /// its expiration date and its signature. /// diff --git a/sdk/src/Services/VerifiedPermissions/Properties/AssemblyInfo.cs b/sdk/src/Services/VerifiedPermissions/Properties/AssemblyInfo.cs index f8c633afd250..ef56c7eb6445 100644 --- a/sdk/src/Services/VerifiedPermissions/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/VerifiedPermissions/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.8")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/VerifiedPermissions/VerifiedPermissions.sln b/sdk/src/Services/VerifiedPermissions/VerifiedPermissions.sln index 791feb5422d8..de1bc6446a6b 100644 --- a/sdk/src/Services/VerifiedPermissions/VerifiedPermissions.sln +++ b/sdk/src/Services/VerifiedPermissions/VerifiedPermissions.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {F07CAA3F-4ACA-42DC-B531-4EB3A21CF450}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {F07CAA3F-4ACA-42DC-B531-4EB3A21CF450}.Debug|Any CPU.Build.0 = Debug|Any CPU {F07CAA3F-4ACA-42DC-B531-4EB3A21CF450}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {89423DF7-8A44-40F5-AB2B-5DA5886745E7}.Debug|Any CPU.Build.0 = Debug|Any CPU {89423DF7-8A44-40F5-AB2B-5DA5886745E7}.Release|Any CPU.ActiveCfg = Release|Any CPU {89423DF7-8A44-40F5-AB2B-5DA5886745E7}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {9B39FA57-B83D-48E1-9115-E49BE80F42B0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9B39FA57-B83D-48E1-9115-E49BE80F42B0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9B39FA57-B83D-48E1-9115-E49BE80F42B0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9B39FA57-B83D-48E1-9115-E49BE80F42B0}.Release|Any CPU.Build.0 = Release|Any CPU - {EF60228F-7E35-4878-9296-21DC82720B44}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EF60228F-7E35-4878-9296-21DC82720B44}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EF60228F-7E35-4878-9296-21DC82720B44}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EF60228F-7E35-4878-9296-21DC82720B44}.Release|Any CPU.Build.0 = Release|Any CPU - {77265696-2299-4A91-B2A2-613EBC3B4CA3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {77265696-2299-4A91-B2A2-613EBC3B4CA3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {77265696-2299-4A91-B2A2-613EBC3B4CA3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {77265696-2299-4A91-B2A2-613EBC3B4CA3}.Release|Any CPU.Build.0 = Release|Any CPU - {BCE2A127-35B4-42A9-AECD-A9B5B68697E1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BCE2A127-35B4-42A9-AECD-A9B5B68697E1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BCE2A127-35B4-42A9-AECD-A9B5B68697E1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BCE2A127-35B4-42A9-AECD-A9B5B68697E1}.Release|Any CPU.Build.0 = Release|Any CPU - {6EABE648-8CED-4E31-89BB-36FC342C841F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6EABE648-8CED-4E31-89BB-36FC342C841F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6EABE648-8CED-4E31-89BB-36FC342C841F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6EABE648-8CED-4E31-89BB-36FC342C841F}.Release|Any CPU.Build.0 = Release|Any CPU - {9D47A91E-2BF4-4557-822F-8A3C9A0BEA59}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9D47A91E-2BF4-4557-822F-8A3C9A0BEA59}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9D47A91E-2BF4-4557-822F-8A3C9A0BEA59}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9D47A91E-2BF4-4557-822F-8A3C9A0BEA59}.Release|Any CPU.Build.0 = Release|Any CPU - {09E2D9CD-063B-4BA5-A74D-7B603C4535CE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {09E2D9CD-063B-4BA5-A74D-7B603C4535CE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {09E2D9CD-063B-4BA5-A74D-7B603C4535CE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {09E2D9CD-063B-4BA5-A74D-7B603C4535CE}.Release|Any CPU.Build.0 = Release|Any CPU - {896FEA89-E5A6-4B31-85CD-F86CDA2E5B79}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {896FEA89-E5A6-4B31-85CD-F86CDA2E5B79}.Debug|Any CPU.Build.0 = Debug|Any CPU - {896FEA89-E5A6-4B31-85CD-F86CDA2E5B79}.Release|Any CPU.ActiveCfg = Release|Any CPU - {896FEA89-E5A6-4B31-85CD-F86CDA2E5B79}.Release|Any CPU.Build.0 = Release|Any CPU - {4AAAC5EE-49BA-4290-9977-C5571C0D579E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4AAAC5EE-49BA-4290-9977-C5571C0D579E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4AAAC5EE-49BA-4290-9977-C5571C0D579E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4AAAC5EE-49BA-4290-9977-C5571C0D579E}.Release|Any CPU.Build.0 = Release|Any CPU - {2A79D42E-322C-4426-BB09-641F73EEB1C9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2A79D42E-322C-4426-BB09-641F73EEB1C9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2A79D42E-322C-4426-BB09-641F73EEB1C9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2A79D42E-322C-4426-BB09-641F73EEB1C9}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {9B39FA57-B83D-48E1-9115-E49BE80F42B0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9B39FA57-B83D-48E1-9115-E49BE80F42B0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9B39FA57-B83D-48E1-9115-E49BE80F42B0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9B39FA57-B83D-48E1-9115-E49BE80F42B0}.Release|Any CPU.Build.0 = Release|Any CPU - {EF60228F-7E35-4878-9296-21DC82720B44}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EF60228F-7E35-4878-9296-21DC82720B44}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EF60228F-7E35-4878-9296-21DC82720B44}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EF60228F-7E35-4878-9296-21DC82720B44}.Release|Any CPU.Build.0 = Release|Any CPU - {77265696-2299-4A91-B2A2-613EBC3B4CA3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {77265696-2299-4A91-B2A2-613EBC3B4CA3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {77265696-2299-4A91-B2A2-613EBC3B4CA3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {77265696-2299-4A91-B2A2-613EBC3B4CA3}.Release|Any CPU.Build.0 = Release|Any CPU - {BCE2A127-35B4-42A9-AECD-A9B5B68697E1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BCE2A127-35B4-42A9-AECD-A9B5B68697E1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BCE2A127-35B4-42A9-AECD-A9B5B68697E1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BCE2A127-35B4-42A9-AECD-A9B5B68697E1}.Release|Any CPU.Build.0 = Release|Any CPU - {6EABE648-8CED-4E31-89BB-36FC342C841F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6EABE648-8CED-4E31-89BB-36FC342C841F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6EABE648-8CED-4E31-89BB-36FC342C841F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6EABE648-8CED-4E31-89BB-36FC342C841F}.Release|Any CPU.Build.0 = Release|Any CPU - {9D47A91E-2BF4-4557-822F-8A3C9A0BEA59}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9D47A91E-2BF4-4557-822F-8A3C9A0BEA59}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9D47A91E-2BF4-4557-822F-8A3C9A0BEA59}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9D47A91E-2BF4-4557-822F-8A3C9A0BEA59}.Release|Any CPU.Build.0 = Release|Any CPU - {09E2D9CD-063B-4BA5-A74D-7B603C4535CE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {09E2D9CD-063B-4BA5-A74D-7B603C4535CE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {09E2D9CD-063B-4BA5-A74D-7B603C4535CE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {09E2D9CD-063B-4BA5-A74D-7B603C4535CE}.Release|Any CPU.Build.0 = Release|Any CPU - {896FEA89-E5A6-4B31-85CD-F86CDA2E5B79}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {896FEA89-E5A6-4B31-85CD-F86CDA2E5B79}.Debug|Any CPU.Build.0 = Debug|Any CPU - {896FEA89-E5A6-4B31-85CD-F86CDA2E5B79}.Release|Any CPU.ActiveCfg = Release|Any CPU - {896FEA89-E5A6-4B31-85CD-F86CDA2E5B79}.Release|Any CPU.Build.0 = Release|Any CPU - {4AAAC5EE-49BA-4290-9977-C5571C0D579E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4AAAC5EE-49BA-4290-9977-C5571C0D579E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4AAAC5EE-49BA-4290-9977-C5571C0D579E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4AAAC5EE-49BA-4290-9977-C5571C0D579E}.Release|Any CPU.Build.0 = Release|Any CPU - {2A79D42E-322C-4426-BB09-641F73EEB1C9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2A79D42E-322C-4426-BB09-641F73EEB1C9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2A79D42E-322C-4426-BB09-641F73EEB1C9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2A79D42E-322C-4426-BB09-641F73EEB1C9}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {F07CAA3F-4ACA-42DC-B531-4EB3A21CF450} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {BE6D042A-9FEA-4397-A647-6ABBF952D9AF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {5E362F62-43C0-4725-9A52-C2AF97D81061} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {C151E2BC-082A-489E-AC1F-28BA6EB0D65F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {89423DF7-8A44-40F5-AB2B-5DA5886745E7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {9B39FA57-B83D-48E1-9115-E49BE80F42B0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {EF60228F-7E35-4878-9296-21DC82720B44} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {77265696-2299-4A91-B2A2-613EBC3B4CA3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {BCE2A127-35B4-42A9-AECD-A9B5B68697E1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6EABE648-8CED-4E31-89BB-36FC342C841F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {9D47A91E-2BF4-4557-822F-8A3C9A0BEA59} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {09E2D9CD-063B-4BA5-A74D-7B603C4535CE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {896FEA89-E5A6-4B31-85CD-F86CDA2E5B79} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4AAAC5EE-49BA-4290-9977-C5571C0D579E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {2A79D42E-322C-4426-BB09-641F73EEB1C9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {9B39FA57-B83D-48E1-9115-E49BE80F42B0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {EF60228F-7E35-4878-9296-21DC82720B44} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {77265696-2299-4A91-B2A2-613EBC3B4CA3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {BCE2A127-35B4-42A9-AECD-A9B5B68697E1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6EABE648-8CED-4E31-89BB-36FC342C841F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {9D47A91E-2BF4-4557-822F-8A3C9A0BEA59} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {09E2D9CD-063B-4BA5-A74D-7B603C4535CE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {896FEA89-E5A6-4B31-85CD-F86CDA2E5B79} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4AAAC5EE-49BA-4290-9977-C5571C0D579E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {2A79D42E-322C-4426-BB09-641F73EEB1C9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {F48307A1-A9C9-4DD9-9A89-FB3C75776ECD} diff --git a/sdk/src/Services/VoiceID/Generated/AmazonVoiceIDConfig.cs b/sdk/src/Services/VoiceID/Generated/AmazonVoiceIDConfig.cs index dd254eeae788..442b149608c5 100644 --- a/sdk/src/Services/VoiceID/Generated/AmazonVoiceIDConfig.cs +++ b/sdk/src/Services/VoiceID/Generated/AmazonVoiceIDConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.VoiceID public partial class AmazonVoiceIDConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("Voice ID", "4.0.0.0"); private static readonly AmazonVoiceIDEndpointResolver EndpointResolver = new AmazonVoiceIDEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("Voice ID", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("Voice ID", "3.7.400.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/VoiceID/Properties/AssemblyInfo.cs b/sdk/src/Services/VoiceID/Properties/AssemblyInfo.cs index bb2e33ba9c22..3e13198d71af 100644 --- a/sdk/src/Services/VoiceID/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/VoiceID/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/VoiceID/VoiceID.sln b/sdk/src/Services/VoiceID/VoiceID.sln index 1a7ee9c655f4..134d164a9a5c 100644 --- a/sdk/src/Services/VoiceID/VoiceID.sln +++ b/sdk/src/Services/VoiceID/VoiceID.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {82C6D316-ED92-4FEE-AAC4-A8F984EEF6C3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {82C6D316-ED92-4FEE-AAC4-A8F984EEF6C3}.Debug|Any CPU.Build.0 = Debug|Any CPU {82C6D316-ED92-4FEE-AAC4-A8F984EEF6C3}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {A6436BD2-6CF2-4221-99C6-7242F90BA9C3}.Debug|Any CPU.Build.0 = Debug|Any CPU {A6436BD2-6CF2-4221-99C6-7242F90BA9C3}.Release|Any CPU.ActiveCfg = Release|Any CPU {A6436BD2-6CF2-4221-99C6-7242F90BA9C3}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {B553C3F1-24F7-4195-A2AB-6DB0567EC601}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B553C3F1-24F7-4195-A2AB-6DB0567EC601}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B553C3F1-24F7-4195-A2AB-6DB0567EC601}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B553C3F1-24F7-4195-A2AB-6DB0567EC601}.Release|Any CPU.Build.0 = Release|Any CPU - {7499645C-C5F7-4573-B297-43C30E1894C8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7499645C-C5F7-4573-B297-43C30E1894C8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7499645C-C5F7-4573-B297-43C30E1894C8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7499645C-C5F7-4573-B297-43C30E1894C8}.Release|Any CPU.Build.0 = Release|Any CPU - {4671C629-D331-4D0C-931E-E2292ECCCBD6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4671C629-D331-4D0C-931E-E2292ECCCBD6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4671C629-D331-4D0C-931E-E2292ECCCBD6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4671C629-D331-4D0C-931E-E2292ECCCBD6}.Release|Any CPU.Build.0 = Release|Any CPU - {AF99E3BD-C1E6-4C0B-BDC0-DF145570CCF0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AF99E3BD-C1E6-4C0B-BDC0-DF145570CCF0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AF99E3BD-C1E6-4C0B-BDC0-DF145570CCF0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AF99E3BD-C1E6-4C0B-BDC0-DF145570CCF0}.Release|Any CPU.Build.0 = Release|Any CPU - {25A2C880-346D-4F63-97D1-49C78AE506CC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {25A2C880-346D-4F63-97D1-49C78AE506CC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {25A2C880-346D-4F63-97D1-49C78AE506CC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {25A2C880-346D-4F63-97D1-49C78AE506CC}.Release|Any CPU.Build.0 = Release|Any CPU - {14276189-3B77-46B2-B309-F15D8B80D6EC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {14276189-3B77-46B2-B309-F15D8B80D6EC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {14276189-3B77-46B2-B309-F15D8B80D6EC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {14276189-3B77-46B2-B309-F15D8B80D6EC}.Release|Any CPU.Build.0 = Release|Any CPU - {DA8022B1-5F84-4D85-85DA-822F8E6EFB42}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DA8022B1-5F84-4D85-85DA-822F8E6EFB42}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DA8022B1-5F84-4D85-85DA-822F8E6EFB42}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DA8022B1-5F84-4D85-85DA-822F8E6EFB42}.Release|Any CPU.Build.0 = Release|Any CPU - {F0F49ED2-0BC3-46C4-A822-A2C20C2ECFD8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F0F49ED2-0BC3-46C4-A822-A2C20C2ECFD8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F0F49ED2-0BC3-46C4-A822-A2C20C2ECFD8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F0F49ED2-0BC3-46C4-A822-A2C20C2ECFD8}.Release|Any CPU.Build.0 = Release|Any CPU - {01E5296E-2276-4EFE-AD49-8ED88B00B4EA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {01E5296E-2276-4EFE-AD49-8ED88B00B4EA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {01E5296E-2276-4EFE-AD49-8ED88B00B4EA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {01E5296E-2276-4EFE-AD49-8ED88B00B4EA}.Release|Any CPU.Build.0 = Release|Any CPU - {B52F6EE3-D54A-4C69-9064-8F531608C8A6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B52F6EE3-D54A-4C69-9064-8F531608C8A6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B52F6EE3-D54A-4C69-9064-8F531608C8A6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B52F6EE3-D54A-4C69-9064-8F531608C8A6}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {B553C3F1-24F7-4195-A2AB-6DB0567EC601}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B553C3F1-24F7-4195-A2AB-6DB0567EC601}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B553C3F1-24F7-4195-A2AB-6DB0567EC601}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B553C3F1-24F7-4195-A2AB-6DB0567EC601}.Release|Any CPU.Build.0 = Release|Any CPU - {7499645C-C5F7-4573-B297-43C30E1894C8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7499645C-C5F7-4573-B297-43C30E1894C8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7499645C-C5F7-4573-B297-43C30E1894C8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7499645C-C5F7-4573-B297-43C30E1894C8}.Release|Any CPU.Build.0 = Release|Any CPU - {4671C629-D331-4D0C-931E-E2292ECCCBD6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4671C629-D331-4D0C-931E-E2292ECCCBD6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4671C629-D331-4D0C-931E-E2292ECCCBD6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4671C629-D331-4D0C-931E-E2292ECCCBD6}.Release|Any CPU.Build.0 = Release|Any CPU - {AF99E3BD-C1E6-4C0B-BDC0-DF145570CCF0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AF99E3BD-C1E6-4C0B-BDC0-DF145570CCF0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AF99E3BD-C1E6-4C0B-BDC0-DF145570CCF0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AF99E3BD-C1E6-4C0B-BDC0-DF145570CCF0}.Release|Any CPU.Build.0 = Release|Any CPU - {25A2C880-346D-4F63-97D1-49C78AE506CC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {25A2C880-346D-4F63-97D1-49C78AE506CC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {25A2C880-346D-4F63-97D1-49C78AE506CC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {25A2C880-346D-4F63-97D1-49C78AE506CC}.Release|Any CPU.Build.0 = Release|Any CPU - {14276189-3B77-46B2-B309-F15D8B80D6EC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {14276189-3B77-46B2-B309-F15D8B80D6EC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {14276189-3B77-46B2-B309-F15D8B80D6EC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {14276189-3B77-46B2-B309-F15D8B80D6EC}.Release|Any CPU.Build.0 = Release|Any CPU - {DA8022B1-5F84-4D85-85DA-822F8E6EFB42}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DA8022B1-5F84-4D85-85DA-822F8E6EFB42}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DA8022B1-5F84-4D85-85DA-822F8E6EFB42}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DA8022B1-5F84-4D85-85DA-822F8E6EFB42}.Release|Any CPU.Build.0 = Release|Any CPU - {F0F49ED2-0BC3-46C4-A822-A2C20C2ECFD8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F0F49ED2-0BC3-46C4-A822-A2C20C2ECFD8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F0F49ED2-0BC3-46C4-A822-A2C20C2ECFD8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F0F49ED2-0BC3-46C4-A822-A2C20C2ECFD8}.Release|Any CPU.Build.0 = Release|Any CPU - {01E5296E-2276-4EFE-AD49-8ED88B00B4EA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {01E5296E-2276-4EFE-AD49-8ED88B00B4EA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {01E5296E-2276-4EFE-AD49-8ED88B00B4EA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {01E5296E-2276-4EFE-AD49-8ED88B00B4EA}.Release|Any CPU.Build.0 = Release|Any CPU - {B52F6EE3-D54A-4C69-9064-8F531608C8A6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B52F6EE3-D54A-4C69-9064-8F531608C8A6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B52F6EE3-D54A-4C69-9064-8F531608C8A6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B52F6EE3-D54A-4C69-9064-8F531608C8A6}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {82C6D316-ED92-4FEE-AAC4-A8F984EEF6C3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {C4CD6DF9-BFF8-425E-8D8E-2F8CCDD60178} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {DFA0F34C-0A42-40BF-96F8-43A3F233FF7D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {DED9AF3F-5F80-4F21-85F7-3E037279DF7B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {A6436BD2-6CF2-4221-99C6-7242F90BA9C3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {B553C3F1-24F7-4195-A2AB-6DB0567EC601} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {7499645C-C5F7-4573-B297-43C30E1894C8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4671C629-D331-4D0C-931E-E2292ECCCBD6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {AF99E3BD-C1E6-4C0B-BDC0-DF145570CCF0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {25A2C880-346D-4F63-97D1-49C78AE506CC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {14276189-3B77-46B2-B309-F15D8B80D6EC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {DA8022B1-5F84-4D85-85DA-822F8E6EFB42} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F0F49ED2-0BC3-46C4-A822-A2C20C2ECFD8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {01E5296E-2276-4EFE-AD49-8ED88B00B4EA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B52F6EE3-D54A-4C69-9064-8F531608C8A6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B553C3F1-24F7-4195-A2AB-6DB0567EC601} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {7499645C-C5F7-4573-B297-43C30E1894C8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4671C629-D331-4D0C-931E-E2292ECCCBD6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {AF99E3BD-C1E6-4C0B-BDC0-DF145570CCF0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {25A2C880-346D-4F63-97D1-49C78AE506CC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {14276189-3B77-46B2-B309-F15D8B80D6EC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {DA8022B1-5F84-4D85-85DA-822F8E6EFB42} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F0F49ED2-0BC3-46C4-A822-A2C20C2ECFD8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {01E5296E-2276-4EFE-AD49-8ED88B00B4EA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B52F6EE3-D54A-4C69-9064-8F531608C8A6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {C3D7466D-AB71-4B9E-A584-0AE829A0FA34} diff --git a/sdk/src/Services/WAF/Generated/AmazonWAFConfig.cs b/sdk/src/Services/WAF/Generated/AmazonWAFConfig.cs index 5124a440a1b5..01d0816fd8fb 100644 --- a/sdk/src/Services/WAF/Generated/AmazonWAFConfig.cs +++ b/sdk/src/Services/WAF/Generated/AmazonWAFConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.WAF public partial class AmazonWAFConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("WAF", "4.0.0.0"); private static readonly AmazonWAFEndpointResolver EndpointResolver = new AmazonWAFEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("WAF", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("WAF", "3.7.400.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/WAF/Properties/AssemblyInfo.cs b/sdk/src/Services/WAF/Properties/AssemblyInfo.cs index 015e0a49af34..9fe2a7c1a79b 100644 --- a/sdk/src/Services/WAF/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/WAF/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/WAF/WAF.sln b/sdk/src/Services/WAF/WAF.sln index 61ecd680ad7f..6bf50759cdf8 100644 --- a/sdk/src/Services/WAF/WAF.sln +++ b/sdk/src/Services/WAF/WAF.sln @@ -92,7 +92,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {BBC4FF22-24B3-4A71-8929-857033D266F2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {BBC4FF22-24B3-4A71-8929-857033D266F2}.Debug|Any CPU.Build.0 = Debug|Any CPU {BBC4FF22-24B3-4A71-8929-857033D266F2}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -113,97 +120,6 @@ Global {C17412A6-ACBF-4D37-8538-E1E21C5EB543}.Debug|Any CPU.Build.0 = Debug|Any CPU {C17412A6-ACBF-4D37-8538-E1E21C5EB543}.Release|Any CPU.ActiveCfg = Release|Any CPU {C17412A6-ACBF-4D37-8538-E1E21C5EB543}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {C5F62883-7508-4F1A-84BF-63B8A08FE7E1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C5F62883-7508-4F1A-84BF-63B8A08FE7E1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C5F62883-7508-4F1A-84BF-63B8A08FE7E1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C5F62883-7508-4F1A-84BF-63B8A08FE7E1}.Release|Any CPU.Build.0 = Release|Any CPU - {65BD35ED-D1D2-43C0-A109-57F350177CC0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {65BD35ED-D1D2-43C0-A109-57F350177CC0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {65BD35ED-D1D2-43C0-A109-57F350177CC0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {65BD35ED-D1D2-43C0-A109-57F350177CC0}.Release|Any CPU.Build.0 = Release|Any CPU - {1B21A079-F11C-4C73-A73E-DDEA41BA1C53}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1B21A079-F11C-4C73-A73E-DDEA41BA1C53}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1B21A079-F11C-4C73-A73E-DDEA41BA1C53}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1B21A079-F11C-4C73-A73E-DDEA41BA1C53}.Release|Any CPU.Build.0 = Release|Any CPU - {57AAD6EA-F9D9-4EFA-8B07-983F32AB9014}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {57AAD6EA-F9D9-4EFA-8B07-983F32AB9014}.Debug|Any CPU.Build.0 = Debug|Any CPU - {57AAD6EA-F9D9-4EFA-8B07-983F32AB9014}.Release|Any CPU.ActiveCfg = Release|Any CPU - {57AAD6EA-F9D9-4EFA-8B07-983F32AB9014}.Release|Any CPU.Build.0 = Release|Any CPU - {C4E1E4B1-F824-4558-BED9-237D5DE55685}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C4E1E4B1-F824-4558-BED9-237D5DE55685}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C4E1E4B1-F824-4558-BED9-237D5DE55685}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C4E1E4B1-F824-4558-BED9-237D5DE55685}.Release|Any CPU.Build.0 = Release|Any CPU - {B37E6110-E8A3-4D9F-A2E9-A637DE1BBD67}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B37E6110-E8A3-4D9F-A2E9-A637DE1BBD67}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B37E6110-E8A3-4D9F-A2E9-A637DE1BBD67}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B37E6110-E8A3-4D9F-A2E9-A637DE1BBD67}.Release|Any CPU.Build.0 = Release|Any CPU - {28DEF7E7-BF11-4548-9C5E-4AD7CAD8389C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {28DEF7E7-BF11-4548-9C5E-4AD7CAD8389C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {28DEF7E7-BF11-4548-9C5E-4AD7CAD8389C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {28DEF7E7-BF11-4548-9C5E-4AD7CAD8389C}.Release|Any CPU.Build.0 = Release|Any CPU - {3ABE09B8-505F-4B52-A711-E6449F9D9A2E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3ABE09B8-505F-4B52-A711-E6449F9D9A2E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3ABE09B8-505F-4B52-A711-E6449F9D9A2E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3ABE09B8-505F-4B52-A711-E6449F9D9A2E}.Release|Any CPU.Build.0 = Release|Any CPU - {E02CB224-B311-424A-9622-BD22DCF05449}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E02CB224-B311-424A-9622-BD22DCF05449}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E02CB224-B311-424A-9622-BD22DCF05449}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E02CB224-B311-424A-9622-BD22DCF05449}.Release|Any CPU.Build.0 = Release|Any CPU - {A307D5B1-0D4C-4DC6-A79C-07BBFCDA6073}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A307D5B1-0D4C-4DC6-A79C-07BBFCDA6073}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A307D5B1-0D4C-4DC6-A79C-07BBFCDA6073}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A307D5B1-0D4C-4DC6-A79C-07BBFCDA6073}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {C5F62883-7508-4F1A-84BF-63B8A08FE7E1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C5F62883-7508-4F1A-84BF-63B8A08FE7E1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C5F62883-7508-4F1A-84BF-63B8A08FE7E1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C5F62883-7508-4F1A-84BF-63B8A08FE7E1}.Release|Any CPU.Build.0 = Release|Any CPU - {65BD35ED-D1D2-43C0-A109-57F350177CC0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {65BD35ED-D1D2-43C0-A109-57F350177CC0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {65BD35ED-D1D2-43C0-A109-57F350177CC0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {65BD35ED-D1D2-43C0-A109-57F350177CC0}.Release|Any CPU.Build.0 = Release|Any CPU - {1B21A079-F11C-4C73-A73E-DDEA41BA1C53}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1B21A079-F11C-4C73-A73E-DDEA41BA1C53}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1B21A079-F11C-4C73-A73E-DDEA41BA1C53}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1B21A079-F11C-4C73-A73E-DDEA41BA1C53}.Release|Any CPU.Build.0 = Release|Any CPU - {57AAD6EA-F9D9-4EFA-8B07-983F32AB9014}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {57AAD6EA-F9D9-4EFA-8B07-983F32AB9014}.Debug|Any CPU.Build.0 = Debug|Any CPU - {57AAD6EA-F9D9-4EFA-8B07-983F32AB9014}.Release|Any CPU.ActiveCfg = Release|Any CPU - {57AAD6EA-F9D9-4EFA-8B07-983F32AB9014}.Release|Any CPU.Build.0 = Release|Any CPU - {C4E1E4B1-F824-4558-BED9-237D5DE55685}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C4E1E4B1-F824-4558-BED9-237D5DE55685}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C4E1E4B1-F824-4558-BED9-237D5DE55685}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C4E1E4B1-F824-4558-BED9-237D5DE55685}.Release|Any CPU.Build.0 = Release|Any CPU - {B37E6110-E8A3-4D9F-A2E9-A637DE1BBD67}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B37E6110-E8A3-4D9F-A2E9-A637DE1BBD67}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B37E6110-E8A3-4D9F-A2E9-A637DE1BBD67}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B37E6110-E8A3-4D9F-A2E9-A637DE1BBD67}.Release|Any CPU.Build.0 = Release|Any CPU - {28DEF7E7-BF11-4548-9C5E-4AD7CAD8389C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {28DEF7E7-BF11-4548-9C5E-4AD7CAD8389C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {28DEF7E7-BF11-4548-9C5E-4AD7CAD8389C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {28DEF7E7-BF11-4548-9C5E-4AD7CAD8389C}.Release|Any CPU.Build.0 = Release|Any CPU - {3ABE09B8-505F-4B52-A711-E6449F9D9A2E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3ABE09B8-505F-4B52-A711-E6449F9D9A2E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3ABE09B8-505F-4B52-A711-E6449F9D9A2E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3ABE09B8-505F-4B52-A711-E6449F9D9A2E}.Release|Any CPU.Build.0 = Release|Any CPU - {E02CB224-B311-424A-9622-BD22DCF05449}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E02CB224-B311-424A-9622-BD22DCF05449}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E02CB224-B311-424A-9622-BD22DCF05449}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E02CB224-B311-424A-9622-BD22DCF05449}.Release|Any CPU.Build.0 = Release|Any CPU - {A307D5B1-0D4C-4DC6-A79C-07BBFCDA6073}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A307D5B1-0D4C-4DC6-A79C-07BBFCDA6073}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A307D5B1-0D4C-4DC6-A79C-07BBFCDA6073}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A307D5B1-0D4C-4DC6-A79C-07BBFCDA6073}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -220,37 +136,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {BBC4FF22-24B3-4A71-8929-857033D266F2} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {00F60B16-0303-4998-8F0E-37ED19F21A3D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {254255BA-90C3-4BD0-8E87-5E8FA385C320} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {3E534D8C-C355-4667-80CB-94E3746D49A2} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {C17412A6-ACBF-4D37-8538-E1E21C5EB543} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {C5F62883-7508-4F1A-84BF-63B8A08FE7E1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {65BD35ED-D1D2-43C0-A109-57F350177CC0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {1B21A079-F11C-4C73-A73E-DDEA41BA1C53} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {57AAD6EA-F9D9-4EFA-8B07-983F32AB9014} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C4E1E4B1-F824-4558-BED9-237D5DE55685} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B37E6110-E8A3-4D9F-A2E9-A637DE1BBD67} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {28DEF7E7-BF11-4548-9C5E-4AD7CAD8389C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {3ABE09B8-505F-4B52-A711-E6449F9D9A2E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E02CB224-B311-424A-9622-BD22DCF05449} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A307D5B1-0D4C-4DC6-A79C-07BBFCDA6073} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {C5F62883-7508-4F1A-84BF-63B8A08FE7E1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {65BD35ED-D1D2-43C0-A109-57F350177CC0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {1B21A079-F11C-4C73-A73E-DDEA41BA1C53} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {57AAD6EA-F9D9-4EFA-8B07-983F32AB9014} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C4E1E4B1-F824-4558-BED9-237D5DE55685} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B37E6110-E8A3-4D9F-A2E9-A637DE1BBD67} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {28DEF7E7-BF11-4548-9C5E-4AD7CAD8389C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {3ABE09B8-505F-4B52-A711-E6449F9D9A2E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E02CB224-B311-424A-9622-BD22DCF05449} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A307D5B1-0D4C-4DC6-A79C-07BBFCDA6073} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {8EC3CFA3-E4E3-44C6-8F15-590EAE1195C0} diff --git a/sdk/src/Services/WAFRegional/Generated/AmazonWAFRegionalConfig.cs b/sdk/src/Services/WAFRegional/Generated/AmazonWAFRegionalConfig.cs index 3752bfc5126e..beb2718d4e8e 100644 --- a/sdk/src/Services/WAFRegional/Generated/AmazonWAFRegionalConfig.cs +++ b/sdk/src/Services/WAFRegional/Generated/AmazonWAFRegionalConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.WAFRegional public partial class AmazonWAFRegionalConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("WAF Regional", "4.0.0.0"); private static readonly AmazonWAFRegionalEndpointResolver EndpointResolver = new AmazonWAFRegionalEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("WAF Regional", "3.7.401.24"); -======= - InternalSDKUtils.BuildUserAgentString("WAF Regional", "3.7.401.51"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/WAFRegional/Properties/AssemblyInfo.cs b/sdk/src/Services/WAFRegional/Properties/AssemblyInfo.cs index 5ed2b9502575..b93ff53e3582 100644 --- a/sdk/src/Services/WAFRegional/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/WAFRegional/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.24")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.51")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/WAFRegional/WAFRegional.sln b/sdk/src/Services/WAFRegional/WAFRegional.sln index e932c2a7e74e..fde246775390 100644 --- a/sdk/src/Services/WAFRegional/WAFRegional.sln +++ b/sdk/src/Services/WAFRegional/WAFRegional.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {52AE5128-018B-41AC-9F5E-D8E4ACCDDFFE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {52AE5128-018B-41AC-9F5E-D8E4ACCDDFFE}.Debug|Any CPU.Build.0 = Debug|Any CPU {52AE5128-018B-41AC-9F5E-D8E4ACCDDFFE}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {F36475E5-A39E-4CEA-9053-66DC0D1E3458}.Debug|Any CPU.Build.0 = Debug|Any CPU {F36475E5-A39E-4CEA-9053-66DC0D1E3458}.Release|Any CPU.ActiveCfg = Release|Any CPU {F36475E5-A39E-4CEA-9053-66DC0D1E3458}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {BCC620B4-E881-40D4-8DF2-94B768D78B4E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BCC620B4-E881-40D4-8DF2-94B768D78B4E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BCC620B4-E881-40D4-8DF2-94B768D78B4E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BCC620B4-E881-40D4-8DF2-94B768D78B4E}.Release|Any CPU.Build.0 = Release|Any CPU - {1E80C56A-931D-48A4-9DE4-BAE6B4A57497}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1E80C56A-931D-48A4-9DE4-BAE6B4A57497}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1E80C56A-931D-48A4-9DE4-BAE6B4A57497}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1E80C56A-931D-48A4-9DE4-BAE6B4A57497}.Release|Any CPU.Build.0 = Release|Any CPU - {52FD9734-E0A4-4857-9F55-998B32742095}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {52FD9734-E0A4-4857-9F55-998B32742095}.Debug|Any CPU.Build.0 = Debug|Any CPU - {52FD9734-E0A4-4857-9F55-998B32742095}.Release|Any CPU.ActiveCfg = Release|Any CPU - {52FD9734-E0A4-4857-9F55-998B32742095}.Release|Any CPU.Build.0 = Release|Any CPU - {6B2FA78A-440A-4223-A275-64B85E3CC7E1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6B2FA78A-440A-4223-A275-64B85E3CC7E1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6B2FA78A-440A-4223-A275-64B85E3CC7E1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6B2FA78A-440A-4223-A275-64B85E3CC7E1}.Release|Any CPU.Build.0 = Release|Any CPU - {96AF3C55-C7C2-4A40-8C90-31E2C416C36C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {96AF3C55-C7C2-4A40-8C90-31E2C416C36C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {96AF3C55-C7C2-4A40-8C90-31E2C416C36C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {96AF3C55-C7C2-4A40-8C90-31E2C416C36C}.Release|Any CPU.Build.0 = Release|Any CPU - {B26E571E-90F7-427F-843A-7C6FEC9B649A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B26E571E-90F7-427F-843A-7C6FEC9B649A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B26E571E-90F7-427F-843A-7C6FEC9B649A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B26E571E-90F7-427F-843A-7C6FEC9B649A}.Release|Any CPU.Build.0 = Release|Any CPU - {F1760B48-9901-4829-84F2-80828A401BC2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F1760B48-9901-4829-84F2-80828A401BC2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F1760B48-9901-4829-84F2-80828A401BC2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F1760B48-9901-4829-84F2-80828A401BC2}.Release|Any CPU.Build.0 = Release|Any CPU - {CCE27030-41C4-4F08-913B-F857BEEB53FA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CCE27030-41C4-4F08-913B-F857BEEB53FA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CCE27030-41C4-4F08-913B-F857BEEB53FA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CCE27030-41C4-4F08-913B-F857BEEB53FA}.Release|Any CPU.Build.0 = Release|Any CPU - {2B4B7FDF-0D23-4017-9998-8E8DB553A834}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2B4B7FDF-0D23-4017-9998-8E8DB553A834}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2B4B7FDF-0D23-4017-9998-8E8DB553A834}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2B4B7FDF-0D23-4017-9998-8E8DB553A834}.Release|Any CPU.Build.0 = Release|Any CPU - {5BF585E5-E978-4883-8F26-B36610045BFD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5BF585E5-E978-4883-8F26-B36610045BFD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5BF585E5-E978-4883-8F26-B36610045BFD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5BF585E5-E978-4883-8F26-B36610045BFD}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {BCC620B4-E881-40D4-8DF2-94B768D78B4E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BCC620B4-E881-40D4-8DF2-94B768D78B4E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BCC620B4-E881-40D4-8DF2-94B768D78B4E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BCC620B4-E881-40D4-8DF2-94B768D78B4E}.Release|Any CPU.Build.0 = Release|Any CPU - {1E80C56A-931D-48A4-9DE4-BAE6B4A57497}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1E80C56A-931D-48A4-9DE4-BAE6B4A57497}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1E80C56A-931D-48A4-9DE4-BAE6B4A57497}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1E80C56A-931D-48A4-9DE4-BAE6B4A57497}.Release|Any CPU.Build.0 = Release|Any CPU - {52FD9734-E0A4-4857-9F55-998B32742095}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {52FD9734-E0A4-4857-9F55-998B32742095}.Debug|Any CPU.Build.0 = Debug|Any CPU - {52FD9734-E0A4-4857-9F55-998B32742095}.Release|Any CPU.ActiveCfg = Release|Any CPU - {52FD9734-E0A4-4857-9F55-998B32742095}.Release|Any CPU.Build.0 = Release|Any CPU - {6B2FA78A-440A-4223-A275-64B85E3CC7E1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6B2FA78A-440A-4223-A275-64B85E3CC7E1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6B2FA78A-440A-4223-A275-64B85E3CC7E1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6B2FA78A-440A-4223-A275-64B85E3CC7E1}.Release|Any CPU.Build.0 = Release|Any CPU - {96AF3C55-C7C2-4A40-8C90-31E2C416C36C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {96AF3C55-C7C2-4A40-8C90-31E2C416C36C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {96AF3C55-C7C2-4A40-8C90-31E2C416C36C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {96AF3C55-C7C2-4A40-8C90-31E2C416C36C}.Release|Any CPU.Build.0 = Release|Any CPU - {B26E571E-90F7-427F-843A-7C6FEC9B649A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B26E571E-90F7-427F-843A-7C6FEC9B649A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B26E571E-90F7-427F-843A-7C6FEC9B649A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B26E571E-90F7-427F-843A-7C6FEC9B649A}.Release|Any CPU.Build.0 = Release|Any CPU - {F1760B48-9901-4829-84F2-80828A401BC2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F1760B48-9901-4829-84F2-80828A401BC2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F1760B48-9901-4829-84F2-80828A401BC2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F1760B48-9901-4829-84F2-80828A401BC2}.Release|Any CPU.Build.0 = Release|Any CPU - {CCE27030-41C4-4F08-913B-F857BEEB53FA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CCE27030-41C4-4F08-913B-F857BEEB53FA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CCE27030-41C4-4F08-913B-F857BEEB53FA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CCE27030-41C4-4F08-913B-F857BEEB53FA}.Release|Any CPU.Build.0 = Release|Any CPU - {2B4B7FDF-0D23-4017-9998-8E8DB553A834}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2B4B7FDF-0D23-4017-9998-8E8DB553A834}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2B4B7FDF-0D23-4017-9998-8E8DB553A834}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2B4B7FDF-0D23-4017-9998-8E8DB553A834}.Release|Any CPU.Build.0 = Release|Any CPU - {5BF585E5-E978-4883-8F26-B36610045BFD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5BF585E5-E978-4883-8F26-B36610045BFD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5BF585E5-E978-4883-8F26-B36610045BFD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5BF585E5-E978-4883-8F26-B36610045BFD}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {52AE5128-018B-41AC-9F5E-D8E4ACCDDFFE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {423510D6-8C03-4B1E-B5E9-14719E2C528D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {FBD7F248-9F24-4921-84D3-3258F7A9F6CB} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {B1846E4B-97F6-4869-80E2-A624F910EE6E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {F36475E5-A39E-4CEA-9053-66DC0D1E3458} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {BCC620B4-E881-40D4-8DF2-94B768D78B4E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {1E80C56A-931D-48A4-9DE4-BAE6B4A57497} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {52FD9734-E0A4-4857-9F55-998B32742095} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6B2FA78A-440A-4223-A275-64B85E3CC7E1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {96AF3C55-C7C2-4A40-8C90-31E2C416C36C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B26E571E-90F7-427F-843A-7C6FEC9B649A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F1760B48-9901-4829-84F2-80828A401BC2} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {CCE27030-41C4-4F08-913B-F857BEEB53FA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {2B4B7FDF-0D23-4017-9998-8E8DB553A834} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {5BF585E5-E978-4883-8F26-B36610045BFD} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {BCC620B4-E881-40D4-8DF2-94B768D78B4E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {1E80C56A-931D-48A4-9DE4-BAE6B4A57497} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {52FD9734-E0A4-4857-9F55-998B32742095} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6B2FA78A-440A-4223-A275-64B85E3CC7E1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {96AF3C55-C7C2-4A40-8C90-31E2C416C36C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B26E571E-90F7-427F-843A-7C6FEC9B649A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F1760B48-9901-4829-84F2-80828A401BC2} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {CCE27030-41C4-4F08-913B-F857BEEB53FA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {2B4B7FDF-0D23-4017-9998-8E8DB553A834} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {5BF585E5-E978-4883-8F26-B36610045BFD} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {0D5AFBAD-A896-4DAF-9B2F-E9308FA989AD} diff --git a/sdk/src/Services/WAFV2/Generated/AmazonWAFV2Config.cs b/sdk/src/Services/WAFV2/Generated/AmazonWAFV2Config.cs index c738cb7bac4e..19754068fe96 100644 --- a/sdk/src/Services/WAFV2/Generated/AmazonWAFV2Config.cs +++ b/sdk/src/Services/WAFV2/Generated/AmazonWAFV2Config.cs @@ -34,16 +34,10 @@ namespace Amazon.WAFV2 public partial class AmazonWAFV2Config : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("WAFV2", "4.0.0.0"); private static readonly AmazonWAFV2EndpointResolver EndpointResolver = new AmazonWAFV2EndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("WAFV2", "3.7.401.14"); -======= - InternalSDKUtils.BuildUserAgentString("WAFV2", "3.7.402.17"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/WAFV2/Generated/Model/Internal/MarshallTransformations/WebACLUnmarshaller.cs b/sdk/src/Services/WAFV2/Generated/Model/Internal/MarshallTransformations/WebACLUnmarshaller.cs index 2272454186e6..eb97de0dd564 100644 --- a/sdk/src/Services/WAFV2/Generated/Model/Internal/MarshallTransformations/WebACLUnmarshaller.cs +++ b/sdk/src/Services/WAFV2/Generated/Model/Internal/MarshallTransformations/WebACLUnmarshaller.cs @@ -152,7 +152,7 @@ public WebACL Unmarshall(JsonUnmarshallerContext context) } if (context.TestExpression("RetrofittedByFirewallManager", targetDepth)) { - var unmarshaller = BoolUnmarshaller.Instance; + var unmarshaller = NullableBoolUnmarshaller.Instance; unmarshalledObject.RetrofittedByFirewallManager = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/WAFV2/Generated/Model/WebACL.cs b/sdk/src/Services/WAFV2/Generated/Model/WebACL.cs index 3c1f7a8a4224..3e8570188041 100644 --- a/sdk/src/Services/WAFV2/Generated/Model/WebACL.cs +++ b/sdk/src/Services/WAFV2/Generated/Model/WebACL.cs @@ -428,9 +428,9 @@ internal bool IsSetPreProcessFirewallManagerRuleGroups() /// and PostProcessFirewallManagerRuleGroups. /// /// - public bool RetrofittedByFirewallManager + public bool? RetrofittedByFirewallManager { - get { return this._retrofittedByFirewallManager.GetValueOrDefault(); } + get { return this._retrofittedByFirewallManager; } set { this._retrofittedByFirewallManager = value; } } diff --git a/sdk/src/Services/WAFV2/Generated/_bcl/AmazonWAFV2Client.cs b/sdk/src/Services/WAFV2/Generated/_bcl/AmazonWAFV2Client.cs index 42b5ee38b36d..ac1952585860 100644 --- a/sdk/src/Services/WAFV2/Generated/_bcl/AmazonWAFV2Client.cs +++ b/sdk/src/Services/WAFV2/Generated/_bcl/AmazonWAFV2Client.cs @@ -51,14 +51,13 @@ namespace Amazon.WAFV2 /// /// /// If you used WAF prior to this release, you can't use this WAFV2 API to access any - /// WAF resources that you created before. You can access your old rules, web ACLs, and - /// other WAF resources only through the WAF Classic APIs. The WAF Classic APIs have retained - /// the prior names, endpoints, and namespaces. + /// WAF resources that you created before. WAF Classic support will end on September 30, + /// 2025. /// /// /// - /// For information, including how to migrate your WAF resources to this version, see - /// the WAF + /// For information about WAF, including how to migrate your WAF Classic resources to + /// this version, see the WAF /// Developer Guide. /// /// @@ -103,31 +102,6 @@ namespace Amazon.WAFV2 /// tailored to the programming language or platform that you're using. For more information, /// see Amazon Web Services SDKs. /// - /// - /// - /// We currently provide two versions of the WAF API: this API and the prior versions, - /// the classic WAF APIs. This new API provides the same functionality as the older versions, - /// with the following major improvements: - /// - ///
            • - /// - /// You use one API for both global and regional applications. Where you need to distinguish - /// the scope, you specify a Scope parameter and set it to CLOUDFRONT or - /// REGIONAL. - /// - ///
            • - /// - /// You can define a web ACL or rule group with a single call, and update it with a single - /// call. You define all rule specifications in JSON format, and pass them to your rule - /// group or web ACL calls. - /// - ///
            • - /// - /// The limits WAF places on the use of rules more closely reflects the cost of running - /// each type of rule. Rule groups include capacity settings, so you know the maximum - /// cost of a rule group when you use it. - /// - ///
            ///             public partial class AmazonWAFV2Client : AmazonServiceClient, IAmazonWAFV2 { @@ -1840,13 +1814,13 @@ public virtual DeleteAPIKeyResponse DeleteAPIKey(DeleteAPIKeyRequest request) /// - /// Deletes all rule groups that are managed by Firewall Manager for the specified web - /// ACL. + /// Deletes all rule groups that are managed by Firewall Manager from the specified WebACL. + /// /// /// /// - /// You can only use this if ManagedByFirewallManager is false in the specified - /// WebACL. + /// You can only use this if ManagedByFirewallManager and RetrofittedByFirewallManager + /// are both false in the web ACL. /// /// /// Container for the necessary parameters to execute the DeleteFirewallManagerRuleGroups service method. @@ -1907,13 +1881,13 @@ public virtual DeleteFirewallManagerRuleGroupsResponse DeleteFirewallManagerRule /// - /// Deletes all rule groups that are managed by Firewall Manager for the specified web - /// ACL. + /// Deletes all rule groups that are managed by Firewall Manager from the specified WebACL. + /// /// /// /// - /// You can only use this if ManagedByFirewallManager is false in the specified - /// WebACL. + /// You can only use this if ManagedByFirewallManager and RetrofittedByFirewallManager + /// are both false in the web ACL. /// /// /// Container for the necessary parameters to execute the DeleteFirewallManagerRuleGroups service method. @@ -2680,8 +2654,8 @@ public virtual DeleteRuleGroupResponse DeleteRuleGroup(DeleteRuleGroupRequest re /// /// /// - /// You can only use this if ManagedByFirewallManager is false in the specified - /// WebACL. + /// You can only use this if ManagedByFirewallManager is false in the web ACL. + /// /// /// /// @@ -2791,8 +2765,8 @@ public virtual DeleteWebACLResponse DeleteWebACL(DeleteWebACLRequest request) /// /// /// - /// You can only use this if ManagedByFirewallManager is false in the specified - /// WebACL. + /// You can only use this if ManagedByFirewallManager is false in the web ACL. + /// /// /// /// diff --git a/sdk/src/Services/WAFV2/Properties/AssemblyInfo.cs b/sdk/src/Services/WAFV2/Properties/AssemblyInfo.cs index 771265b1c57f..a4dd66cfb5e6 100644 --- a/sdk/src/Services/WAFV2/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/WAFV2/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.14")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.402.17")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/WAFV2/WAFV2.sln b/sdk/src/Services/WAFV2/WAFV2.sln index 58bfd803646d..4a55f0afaa68 100644 --- a/sdk/src/Services/WAFV2/WAFV2.sln +++ b/sdk/src/Services/WAFV2/WAFV2.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {65278648-B2AD-425F-8561-B40A71474B51}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {65278648-B2AD-425F-8561-B40A71474B51}.Debug|Any CPU.Build.0 = Debug|Any CPU {65278648-B2AD-425F-8561-B40A71474B51}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {BC9CB10E-DBF3-4965-B105-27FC8F1F65DB}.Debug|Any CPU.Build.0 = Debug|Any CPU {BC9CB10E-DBF3-4965-B105-27FC8F1F65DB}.Release|Any CPU.ActiveCfg = Release|Any CPU {BC9CB10E-DBF3-4965-B105-27FC8F1F65DB}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {A9D9FB05-0E2A-40AE-AF6A-DE1CAFD1BE35}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A9D9FB05-0E2A-40AE-AF6A-DE1CAFD1BE35}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A9D9FB05-0E2A-40AE-AF6A-DE1CAFD1BE35}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A9D9FB05-0E2A-40AE-AF6A-DE1CAFD1BE35}.Release|Any CPU.Build.0 = Release|Any CPU - {2BD7ADCF-A812-4FFC-A99D-6B59BEFB6A06}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2BD7ADCF-A812-4FFC-A99D-6B59BEFB6A06}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2BD7ADCF-A812-4FFC-A99D-6B59BEFB6A06}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2BD7ADCF-A812-4FFC-A99D-6B59BEFB6A06}.Release|Any CPU.Build.0 = Release|Any CPU - {89818329-41C6-40D4-91C3-355ECA3B501B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {89818329-41C6-40D4-91C3-355ECA3B501B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {89818329-41C6-40D4-91C3-355ECA3B501B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {89818329-41C6-40D4-91C3-355ECA3B501B}.Release|Any CPU.Build.0 = Release|Any CPU - {65AECC11-7616-4CCD-90C8-29F6EE2C2564}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {65AECC11-7616-4CCD-90C8-29F6EE2C2564}.Debug|Any CPU.Build.0 = Debug|Any CPU - {65AECC11-7616-4CCD-90C8-29F6EE2C2564}.Release|Any CPU.ActiveCfg = Release|Any CPU - {65AECC11-7616-4CCD-90C8-29F6EE2C2564}.Release|Any CPU.Build.0 = Release|Any CPU - {91EA4BDA-DCE3-4572-90F0-C0B7071041AF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {91EA4BDA-DCE3-4572-90F0-C0B7071041AF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {91EA4BDA-DCE3-4572-90F0-C0B7071041AF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {91EA4BDA-DCE3-4572-90F0-C0B7071041AF}.Release|Any CPU.Build.0 = Release|Any CPU - {430357D0-4497-416C-A2FD-516BBF398C3D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {430357D0-4497-416C-A2FD-516BBF398C3D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {430357D0-4497-416C-A2FD-516BBF398C3D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {430357D0-4497-416C-A2FD-516BBF398C3D}.Release|Any CPU.Build.0 = Release|Any CPU - {8440C5CE-26D4-4A69-B6A1-E1E1BDFF1909}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8440C5CE-26D4-4A69-B6A1-E1E1BDFF1909}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8440C5CE-26D4-4A69-B6A1-E1E1BDFF1909}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8440C5CE-26D4-4A69-B6A1-E1E1BDFF1909}.Release|Any CPU.Build.0 = Release|Any CPU - {2E4E7219-2B1C-4B2E-BFD2-0303B0A43962}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2E4E7219-2B1C-4B2E-BFD2-0303B0A43962}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2E4E7219-2B1C-4B2E-BFD2-0303B0A43962}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2E4E7219-2B1C-4B2E-BFD2-0303B0A43962}.Release|Any CPU.Build.0 = Release|Any CPU - {6A5DB90F-B1BF-4FF4-9502-573F8FDD1F0E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6A5DB90F-B1BF-4FF4-9502-573F8FDD1F0E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6A5DB90F-B1BF-4FF4-9502-573F8FDD1F0E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6A5DB90F-B1BF-4FF4-9502-573F8FDD1F0E}.Release|Any CPU.Build.0 = Release|Any CPU - {0EFC5725-D598-4FF9-8D23-F51267FA28CE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0EFC5725-D598-4FF9-8D23-F51267FA28CE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0EFC5725-D598-4FF9-8D23-F51267FA28CE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0EFC5725-D598-4FF9-8D23-F51267FA28CE}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {A9D9FB05-0E2A-40AE-AF6A-DE1CAFD1BE35}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A9D9FB05-0E2A-40AE-AF6A-DE1CAFD1BE35}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A9D9FB05-0E2A-40AE-AF6A-DE1CAFD1BE35}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A9D9FB05-0E2A-40AE-AF6A-DE1CAFD1BE35}.Release|Any CPU.Build.0 = Release|Any CPU - {2BD7ADCF-A812-4FFC-A99D-6B59BEFB6A06}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2BD7ADCF-A812-4FFC-A99D-6B59BEFB6A06}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2BD7ADCF-A812-4FFC-A99D-6B59BEFB6A06}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2BD7ADCF-A812-4FFC-A99D-6B59BEFB6A06}.Release|Any CPU.Build.0 = Release|Any CPU - {89818329-41C6-40D4-91C3-355ECA3B501B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {89818329-41C6-40D4-91C3-355ECA3B501B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {89818329-41C6-40D4-91C3-355ECA3B501B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {89818329-41C6-40D4-91C3-355ECA3B501B}.Release|Any CPU.Build.0 = Release|Any CPU - {65AECC11-7616-4CCD-90C8-29F6EE2C2564}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {65AECC11-7616-4CCD-90C8-29F6EE2C2564}.Debug|Any CPU.Build.0 = Debug|Any CPU - {65AECC11-7616-4CCD-90C8-29F6EE2C2564}.Release|Any CPU.ActiveCfg = Release|Any CPU - {65AECC11-7616-4CCD-90C8-29F6EE2C2564}.Release|Any CPU.Build.0 = Release|Any CPU - {91EA4BDA-DCE3-4572-90F0-C0B7071041AF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {91EA4BDA-DCE3-4572-90F0-C0B7071041AF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {91EA4BDA-DCE3-4572-90F0-C0B7071041AF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {91EA4BDA-DCE3-4572-90F0-C0B7071041AF}.Release|Any CPU.Build.0 = Release|Any CPU - {430357D0-4497-416C-A2FD-516BBF398C3D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {430357D0-4497-416C-A2FD-516BBF398C3D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {430357D0-4497-416C-A2FD-516BBF398C3D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {430357D0-4497-416C-A2FD-516BBF398C3D}.Release|Any CPU.Build.0 = Release|Any CPU - {8440C5CE-26D4-4A69-B6A1-E1E1BDFF1909}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8440C5CE-26D4-4A69-B6A1-E1E1BDFF1909}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8440C5CE-26D4-4A69-B6A1-E1E1BDFF1909}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8440C5CE-26D4-4A69-B6A1-E1E1BDFF1909}.Release|Any CPU.Build.0 = Release|Any CPU - {2E4E7219-2B1C-4B2E-BFD2-0303B0A43962}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2E4E7219-2B1C-4B2E-BFD2-0303B0A43962}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2E4E7219-2B1C-4B2E-BFD2-0303B0A43962}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2E4E7219-2B1C-4B2E-BFD2-0303B0A43962}.Release|Any CPU.Build.0 = Release|Any CPU - {6A5DB90F-B1BF-4FF4-9502-573F8FDD1F0E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6A5DB90F-B1BF-4FF4-9502-573F8FDD1F0E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6A5DB90F-B1BF-4FF4-9502-573F8FDD1F0E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6A5DB90F-B1BF-4FF4-9502-573F8FDD1F0E}.Release|Any CPU.Build.0 = Release|Any CPU - {0EFC5725-D598-4FF9-8D23-F51267FA28CE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0EFC5725-D598-4FF9-8D23-F51267FA28CE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0EFC5725-D598-4FF9-8D23-F51267FA28CE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0EFC5725-D598-4FF9-8D23-F51267FA28CE}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {65278648-B2AD-425F-8561-B40A71474B51} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {3805A0DE-4830-436F-BAC7-801D59268121} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {F067C285-B7D5-4443-B2E2-B1D4A8ED9A41} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {D7C85AC7-1E31-49D5-B787-5DB0C4D112CB} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {BC9CB10E-DBF3-4965-B105-27FC8F1F65DB} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {A9D9FB05-0E2A-40AE-AF6A-DE1CAFD1BE35} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {2BD7ADCF-A812-4FFC-A99D-6B59BEFB6A06} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {89818329-41C6-40D4-91C3-355ECA3B501B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {65AECC11-7616-4CCD-90C8-29F6EE2C2564} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {91EA4BDA-DCE3-4572-90F0-C0B7071041AF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {430357D0-4497-416C-A2FD-516BBF398C3D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8440C5CE-26D4-4A69-B6A1-E1E1BDFF1909} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {2E4E7219-2B1C-4B2E-BFD2-0303B0A43962} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6A5DB90F-B1BF-4FF4-9502-573F8FDD1F0E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0EFC5725-D598-4FF9-8D23-F51267FA28CE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {A9D9FB05-0E2A-40AE-AF6A-DE1CAFD1BE35} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {2BD7ADCF-A812-4FFC-A99D-6B59BEFB6A06} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {89818329-41C6-40D4-91C3-355ECA3B501B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {65AECC11-7616-4CCD-90C8-29F6EE2C2564} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {91EA4BDA-DCE3-4572-90F0-C0B7071041AF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {430357D0-4497-416C-A2FD-516BBF398C3D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8440C5CE-26D4-4A69-B6A1-E1E1BDFF1909} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {2E4E7219-2B1C-4B2E-BFD2-0303B0A43962} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6A5DB90F-B1BF-4FF4-9502-573F8FDD1F0E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {0EFC5725-D598-4FF9-8D23-F51267FA28CE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {88DA6F2C-8870-434F-8136-9EB8B980073F} diff --git a/sdk/src/Services/WellArchitected/Generated/AmazonWellArchitectedConfig.cs b/sdk/src/Services/WellArchitected/Generated/AmazonWellArchitectedConfig.cs index 6b26886952ee..10bc3f1903ee 100644 --- a/sdk/src/Services/WellArchitected/Generated/AmazonWellArchitectedConfig.cs +++ b/sdk/src/Services/WellArchitected/Generated/AmazonWellArchitectedConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.WellArchitected public partial class AmazonWellArchitectedConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("WellArchitected", "4.0.0.0"); private static readonly AmazonWellArchitectedEndpointResolver EndpointResolver = new AmazonWellArchitectedEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("WellArchitected", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("WellArchitected", "3.7.400.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/WellArchitected/Properties/AssemblyInfo.cs b/sdk/src/Services/WellArchitected/Properties/AssemblyInfo.cs index 69cec2310828..c1e8b1d885ca 100644 --- a/sdk/src/Services/WellArchitected/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/WellArchitected/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/WellArchitected/WellArchitected.sln b/sdk/src/Services/WellArchitected/WellArchitected.sln index 386f8489bbc0..78d515e09438 100644 --- a/sdk/src/Services/WellArchitected/WellArchitected.sln +++ b/sdk/src/Services/WellArchitected/WellArchitected.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {F0143043-7F3A-4602-9397-D8478413E5E9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {F0143043-7F3A-4602-9397-D8478413E5E9}.Debug|Any CPU.Build.0 = Debug|Any CPU {F0143043-7F3A-4602-9397-D8478413E5E9}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {DCBACF0E-5127-4DBA-937C-D5C50599EA8B}.Debug|Any CPU.Build.0 = Debug|Any CPU {DCBACF0E-5127-4DBA-937C-D5C50599EA8B}.Release|Any CPU.ActiveCfg = Release|Any CPU {DCBACF0E-5127-4DBA-937C-D5C50599EA8B}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {58208689-F15A-4DEA-9AEB-59493B2C05E9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {58208689-F15A-4DEA-9AEB-59493B2C05E9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {58208689-F15A-4DEA-9AEB-59493B2C05E9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {58208689-F15A-4DEA-9AEB-59493B2C05E9}.Release|Any CPU.Build.0 = Release|Any CPU - {F97EA667-2BB1-479B-92AD-76678E83A7D6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F97EA667-2BB1-479B-92AD-76678E83A7D6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F97EA667-2BB1-479B-92AD-76678E83A7D6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F97EA667-2BB1-479B-92AD-76678E83A7D6}.Release|Any CPU.Build.0 = Release|Any CPU - {00E5CB4C-208E-4F96-B944-B40053EC7BB4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {00E5CB4C-208E-4F96-B944-B40053EC7BB4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {00E5CB4C-208E-4F96-B944-B40053EC7BB4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {00E5CB4C-208E-4F96-B944-B40053EC7BB4}.Release|Any CPU.Build.0 = Release|Any CPU - {DA97CEFF-74A2-4204-9AE6-8263EC259E4A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DA97CEFF-74A2-4204-9AE6-8263EC259E4A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DA97CEFF-74A2-4204-9AE6-8263EC259E4A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DA97CEFF-74A2-4204-9AE6-8263EC259E4A}.Release|Any CPU.Build.0 = Release|Any CPU - {CE7D42C0-D810-480A-8099-407D654577BF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CE7D42C0-D810-480A-8099-407D654577BF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CE7D42C0-D810-480A-8099-407D654577BF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CE7D42C0-D810-480A-8099-407D654577BF}.Release|Any CPU.Build.0 = Release|Any CPU - {45EF9F93-7BE8-4441-B239-9DB12EA701B2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {45EF9F93-7BE8-4441-B239-9DB12EA701B2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {45EF9F93-7BE8-4441-B239-9DB12EA701B2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {45EF9F93-7BE8-4441-B239-9DB12EA701B2}.Release|Any CPU.Build.0 = Release|Any CPU - {CF7E4716-F4C3-48D9-B306-953F9019CD77}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CF7E4716-F4C3-48D9-B306-953F9019CD77}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CF7E4716-F4C3-48D9-B306-953F9019CD77}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CF7E4716-F4C3-48D9-B306-953F9019CD77}.Release|Any CPU.Build.0 = Release|Any CPU - {CB85355B-93E6-48D9-9CDC-8FB301DBB8E7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CB85355B-93E6-48D9-9CDC-8FB301DBB8E7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CB85355B-93E6-48D9-9CDC-8FB301DBB8E7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CB85355B-93E6-48D9-9CDC-8FB301DBB8E7}.Release|Any CPU.Build.0 = Release|Any CPU - {7709CE58-86C2-422C-AAAE-7150928B7B0F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7709CE58-86C2-422C-AAAE-7150928B7B0F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7709CE58-86C2-422C-AAAE-7150928B7B0F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7709CE58-86C2-422C-AAAE-7150928B7B0F}.Release|Any CPU.Build.0 = Release|Any CPU - {1D721D92-F89E-4747-A02F-41C1F84D92C3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1D721D92-F89E-4747-A02F-41C1F84D92C3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1D721D92-F89E-4747-A02F-41C1F84D92C3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1D721D92-F89E-4747-A02F-41C1F84D92C3}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {58208689-F15A-4DEA-9AEB-59493B2C05E9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {58208689-F15A-4DEA-9AEB-59493B2C05E9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {58208689-F15A-4DEA-9AEB-59493B2C05E9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {58208689-F15A-4DEA-9AEB-59493B2C05E9}.Release|Any CPU.Build.0 = Release|Any CPU - {F97EA667-2BB1-479B-92AD-76678E83A7D6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F97EA667-2BB1-479B-92AD-76678E83A7D6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F97EA667-2BB1-479B-92AD-76678E83A7D6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F97EA667-2BB1-479B-92AD-76678E83A7D6}.Release|Any CPU.Build.0 = Release|Any CPU - {00E5CB4C-208E-4F96-B944-B40053EC7BB4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {00E5CB4C-208E-4F96-B944-B40053EC7BB4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {00E5CB4C-208E-4F96-B944-B40053EC7BB4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {00E5CB4C-208E-4F96-B944-B40053EC7BB4}.Release|Any CPU.Build.0 = Release|Any CPU - {DA97CEFF-74A2-4204-9AE6-8263EC259E4A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DA97CEFF-74A2-4204-9AE6-8263EC259E4A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DA97CEFF-74A2-4204-9AE6-8263EC259E4A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DA97CEFF-74A2-4204-9AE6-8263EC259E4A}.Release|Any CPU.Build.0 = Release|Any CPU - {CE7D42C0-D810-480A-8099-407D654577BF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CE7D42C0-D810-480A-8099-407D654577BF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CE7D42C0-D810-480A-8099-407D654577BF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CE7D42C0-D810-480A-8099-407D654577BF}.Release|Any CPU.Build.0 = Release|Any CPU - {45EF9F93-7BE8-4441-B239-9DB12EA701B2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {45EF9F93-7BE8-4441-B239-9DB12EA701B2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {45EF9F93-7BE8-4441-B239-9DB12EA701B2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {45EF9F93-7BE8-4441-B239-9DB12EA701B2}.Release|Any CPU.Build.0 = Release|Any CPU - {CF7E4716-F4C3-48D9-B306-953F9019CD77}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CF7E4716-F4C3-48D9-B306-953F9019CD77}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CF7E4716-F4C3-48D9-B306-953F9019CD77}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CF7E4716-F4C3-48D9-B306-953F9019CD77}.Release|Any CPU.Build.0 = Release|Any CPU - {CB85355B-93E6-48D9-9CDC-8FB301DBB8E7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CB85355B-93E6-48D9-9CDC-8FB301DBB8E7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CB85355B-93E6-48D9-9CDC-8FB301DBB8E7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CB85355B-93E6-48D9-9CDC-8FB301DBB8E7}.Release|Any CPU.Build.0 = Release|Any CPU - {7709CE58-86C2-422C-AAAE-7150928B7B0F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7709CE58-86C2-422C-AAAE-7150928B7B0F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7709CE58-86C2-422C-AAAE-7150928B7B0F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7709CE58-86C2-422C-AAAE-7150928B7B0F}.Release|Any CPU.Build.0 = Release|Any CPU - {1D721D92-F89E-4747-A02F-41C1F84D92C3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1D721D92-F89E-4747-A02F-41C1F84D92C3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1D721D92-F89E-4747-A02F-41C1F84D92C3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1D721D92-F89E-4747-A02F-41C1F84D92C3}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {F0143043-7F3A-4602-9397-D8478413E5E9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {883616F5-9651-438E-8342-47991E10932E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {A61EA0B1-4245-4AEA-80C4-4AAA9FD90ABD} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {6EE193A1-5FC4-483A-B41F-8674D337D48B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {DCBACF0E-5127-4DBA-937C-D5C50599EA8B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {58208689-F15A-4DEA-9AEB-59493B2C05E9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F97EA667-2BB1-479B-92AD-76678E83A7D6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {00E5CB4C-208E-4F96-B944-B40053EC7BB4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {DA97CEFF-74A2-4204-9AE6-8263EC259E4A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {CE7D42C0-D810-480A-8099-407D654577BF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {45EF9F93-7BE8-4441-B239-9DB12EA701B2} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {CF7E4716-F4C3-48D9-B306-953F9019CD77} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {CB85355B-93E6-48D9-9CDC-8FB301DBB8E7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {7709CE58-86C2-422C-AAAE-7150928B7B0F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {1D721D92-F89E-4747-A02F-41C1F84D92C3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {58208689-F15A-4DEA-9AEB-59493B2C05E9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F97EA667-2BB1-479B-92AD-76678E83A7D6} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {00E5CB4C-208E-4F96-B944-B40053EC7BB4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {DA97CEFF-74A2-4204-9AE6-8263EC259E4A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {CE7D42C0-D810-480A-8099-407D654577BF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {45EF9F93-7BE8-4441-B239-9DB12EA701B2} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {CF7E4716-F4C3-48D9-B306-953F9019CD77} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {CB85355B-93E6-48D9-9CDC-8FB301DBB8E7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {7709CE58-86C2-422C-AAAE-7150928B7B0F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {1D721D92-F89E-4747-A02F-41C1F84D92C3} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {73EB0AAB-E244-4BF2-A854-3597BEA74750} diff --git a/sdk/src/Services/WorkDocs/Generated/AmazonWorkDocsConfig.cs b/sdk/src/Services/WorkDocs/Generated/AmazonWorkDocsConfig.cs index bbd63aadc8e2..f0de8f27938e 100644 --- a/sdk/src/Services/WorkDocs/Generated/AmazonWorkDocsConfig.cs +++ b/sdk/src/Services/WorkDocs/Generated/AmazonWorkDocsConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.WorkDocs public partial class AmazonWorkDocsConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("WorkDocs", "4.0.0.0"); private static readonly AmazonWorkDocsEndpointResolver EndpointResolver = new AmazonWorkDocsEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("WorkDocs", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("WorkDocs", "3.7.400.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/WorkDocs/Properties/AssemblyInfo.cs b/sdk/src/Services/WorkDocs/Properties/AssemblyInfo.cs index bba854067db1..c923c975a8d1 100644 --- a/sdk/src/Services/WorkDocs/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/WorkDocs/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/WorkDocs/WorkDocs.sln b/sdk/src/Services/WorkDocs/WorkDocs.sln index 5adef39b3066..b563079334c1 100644 --- a/sdk/src/Services/WorkDocs/WorkDocs.sln +++ b/sdk/src/Services/WorkDocs/WorkDocs.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {08D9D126-9D79-40E2-86F4-0C7D9792B451}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {08D9D126-9D79-40E2-86F4-0C7D9792B451}.Debug|Any CPU.Build.0 = Debug|Any CPU {08D9D126-9D79-40E2-86F4-0C7D9792B451}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {517CAB75-7350-495C-BAA1-00750B7C5F3F}.Debug|Any CPU.Build.0 = Debug|Any CPU {517CAB75-7350-495C-BAA1-00750B7C5F3F}.Release|Any CPU.ActiveCfg = Release|Any CPU {517CAB75-7350-495C-BAA1-00750B7C5F3F}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {828ACDAF-853E-4AD7-942F-D1DD5B9A4560}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {828ACDAF-853E-4AD7-942F-D1DD5B9A4560}.Debug|Any CPU.Build.0 = Debug|Any CPU - {828ACDAF-853E-4AD7-942F-D1DD5B9A4560}.Release|Any CPU.ActiveCfg = Release|Any CPU - {828ACDAF-853E-4AD7-942F-D1DD5B9A4560}.Release|Any CPU.Build.0 = Release|Any CPU - {BB691372-AAE6-498F-A860-954B44916A3B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BB691372-AAE6-498F-A860-954B44916A3B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BB691372-AAE6-498F-A860-954B44916A3B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BB691372-AAE6-498F-A860-954B44916A3B}.Release|Any CPU.Build.0 = Release|Any CPU - {4A475F77-0D6C-4485-9DD9-4E872DF18E4D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4A475F77-0D6C-4485-9DD9-4E872DF18E4D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4A475F77-0D6C-4485-9DD9-4E872DF18E4D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4A475F77-0D6C-4485-9DD9-4E872DF18E4D}.Release|Any CPU.Build.0 = Release|Any CPU - {552DC95E-910F-4FE3-B490-AF35C7B0AE9A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {552DC95E-910F-4FE3-B490-AF35C7B0AE9A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {552DC95E-910F-4FE3-B490-AF35C7B0AE9A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {552DC95E-910F-4FE3-B490-AF35C7B0AE9A}.Release|Any CPU.Build.0 = Release|Any CPU - {46C75689-7E18-4A5F-BAB5-87806C5C3A2B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {46C75689-7E18-4A5F-BAB5-87806C5C3A2B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {46C75689-7E18-4A5F-BAB5-87806C5C3A2B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {46C75689-7E18-4A5F-BAB5-87806C5C3A2B}.Release|Any CPU.Build.0 = Release|Any CPU - {91B01BCD-CABE-4975-BB98-A8C2CACF3E6A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {91B01BCD-CABE-4975-BB98-A8C2CACF3E6A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {91B01BCD-CABE-4975-BB98-A8C2CACF3E6A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {91B01BCD-CABE-4975-BB98-A8C2CACF3E6A}.Release|Any CPU.Build.0 = Release|Any CPU - {E0738010-774B-496B-94D8-349C04C2C73C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E0738010-774B-496B-94D8-349C04C2C73C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E0738010-774B-496B-94D8-349C04C2C73C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E0738010-774B-496B-94D8-349C04C2C73C}.Release|Any CPU.Build.0 = Release|Any CPU - {DB0619C7-5E17-4B9F-AFAF-E3D65DF5CDEB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DB0619C7-5E17-4B9F-AFAF-E3D65DF5CDEB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DB0619C7-5E17-4B9F-AFAF-E3D65DF5CDEB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DB0619C7-5E17-4B9F-AFAF-E3D65DF5CDEB}.Release|Any CPU.Build.0 = Release|Any CPU - {80F7B784-D911-4D28-9640-08D85F29CF24}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {80F7B784-D911-4D28-9640-08D85F29CF24}.Debug|Any CPU.Build.0 = Debug|Any CPU - {80F7B784-D911-4D28-9640-08D85F29CF24}.Release|Any CPU.ActiveCfg = Release|Any CPU - {80F7B784-D911-4D28-9640-08D85F29CF24}.Release|Any CPU.Build.0 = Release|Any CPU - {97BF9BE4-0DB4-46AF-8026-F5B24C382210}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {97BF9BE4-0DB4-46AF-8026-F5B24C382210}.Debug|Any CPU.Build.0 = Debug|Any CPU - {97BF9BE4-0DB4-46AF-8026-F5B24C382210}.Release|Any CPU.ActiveCfg = Release|Any CPU - {97BF9BE4-0DB4-46AF-8026-F5B24C382210}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {828ACDAF-853E-4AD7-942F-D1DD5B9A4560}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {828ACDAF-853E-4AD7-942F-D1DD5B9A4560}.Debug|Any CPU.Build.0 = Debug|Any CPU - {828ACDAF-853E-4AD7-942F-D1DD5B9A4560}.Release|Any CPU.ActiveCfg = Release|Any CPU - {828ACDAF-853E-4AD7-942F-D1DD5B9A4560}.Release|Any CPU.Build.0 = Release|Any CPU - {BB691372-AAE6-498F-A860-954B44916A3B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BB691372-AAE6-498F-A860-954B44916A3B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BB691372-AAE6-498F-A860-954B44916A3B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BB691372-AAE6-498F-A860-954B44916A3B}.Release|Any CPU.Build.0 = Release|Any CPU - {4A475F77-0D6C-4485-9DD9-4E872DF18E4D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4A475F77-0D6C-4485-9DD9-4E872DF18E4D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4A475F77-0D6C-4485-9DD9-4E872DF18E4D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4A475F77-0D6C-4485-9DD9-4E872DF18E4D}.Release|Any CPU.Build.0 = Release|Any CPU - {552DC95E-910F-4FE3-B490-AF35C7B0AE9A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {552DC95E-910F-4FE3-B490-AF35C7B0AE9A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {552DC95E-910F-4FE3-B490-AF35C7B0AE9A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {552DC95E-910F-4FE3-B490-AF35C7B0AE9A}.Release|Any CPU.Build.0 = Release|Any CPU - {46C75689-7E18-4A5F-BAB5-87806C5C3A2B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {46C75689-7E18-4A5F-BAB5-87806C5C3A2B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {46C75689-7E18-4A5F-BAB5-87806C5C3A2B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {46C75689-7E18-4A5F-BAB5-87806C5C3A2B}.Release|Any CPU.Build.0 = Release|Any CPU - {91B01BCD-CABE-4975-BB98-A8C2CACF3E6A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {91B01BCD-CABE-4975-BB98-A8C2CACF3E6A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {91B01BCD-CABE-4975-BB98-A8C2CACF3E6A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {91B01BCD-CABE-4975-BB98-A8C2CACF3E6A}.Release|Any CPU.Build.0 = Release|Any CPU - {E0738010-774B-496B-94D8-349C04C2C73C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E0738010-774B-496B-94D8-349C04C2C73C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E0738010-774B-496B-94D8-349C04C2C73C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E0738010-774B-496B-94D8-349C04C2C73C}.Release|Any CPU.Build.0 = Release|Any CPU - {DB0619C7-5E17-4B9F-AFAF-E3D65DF5CDEB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DB0619C7-5E17-4B9F-AFAF-E3D65DF5CDEB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DB0619C7-5E17-4B9F-AFAF-E3D65DF5CDEB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DB0619C7-5E17-4B9F-AFAF-E3D65DF5CDEB}.Release|Any CPU.Build.0 = Release|Any CPU - {80F7B784-D911-4D28-9640-08D85F29CF24}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {80F7B784-D911-4D28-9640-08D85F29CF24}.Debug|Any CPU.Build.0 = Debug|Any CPU - {80F7B784-D911-4D28-9640-08D85F29CF24}.Release|Any CPU.ActiveCfg = Release|Any CPU - {80F7B784-D911-4D28-9640-08D85F29CF24}.Release|Any CPU.Build.0 = Release|Any CPU - {97BF9BE4-0DB4-46AF-8026-F5B24C382210}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {97BF9BE4-0DB4-46AF-8026-F5B24C382210}.Debug|Any CPU.Build.0 = Debug|Any CPU - {97BF9BE4-0DB4-46AF-8026-F5B24C382210}.Release|Any CPU.ActiveCfg = Release|Any CPU - {97BF9BE4-0DB4-46AF-8026-F5B24C382210}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {08D9D126-9D79-40E2-86F4-0C7D9792B451} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {A31731AA-25F9-48F8-B2A5-76FA72189D1D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {EDA87BC2-8B8E-400E-A47C-5DD574C187CC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {26D7A5F9-85DE-4EFC-BD5C-FC65C7F1BDE9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {517CAB75-7350-495C-BAA1-00750B7C5F3F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {828ACDAF-853E-4AD7-942F-D1DD5B9A4560} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {BB691372-AAE6-498F-A860-954B44916A3B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4A475F77-0D6C-4485-9DD9-4E872DF18E4D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {552DC95E-910F-4FE3-B490-AF35C7B0AE9A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {46C75689-7E18-4A5F-BAB5-87806C5C3A2B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {91B01BCD-CABE-4975-BB98-A8C2CACF3E6A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E0738010-774B-496B-94D8-349C04C2C73C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {DB0619C7-5E17-4B9F-AFAF-E3D65DF5CDEB} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {80F7B784-D911-4D28-9640-08D85F29CF24} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {97BF9BE4-0DB4-46AF-8026-F5B24C382210} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {828ACDAF-853E-4AD7-942F-D1DD5B9A4560} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {BB691372-AAE6-498F-A860-954B44916A3B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {4A475F77-0D6C-4485-9DD9-4E872DF18E4D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {552DC95E-910F-4FE3-B490-AF35C7B0AE9A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {46C75689-7E18-4A5F-BAB5-87806C5C3A2B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {91B01BCD-CABE-4975-BB98-A8C2CACF3E6A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E0738010-774B-496B-94D8-349C04C2C73C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {DB0619C7-5E17-4B9F-AFAF-E3D65DF5CDEB} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {80F7B784-D911-4D28-9640-08D85F29CF24} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {97BF9BE4-0DB4-46AF-8026-F5B24C382210} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {66B32AD8-62A0-469D-9005-DA45EE47894B} diff --git a/sdk/src/Services/WorkMail/Generated/AmazonWorkMailConfig.cs b/sdk/src/Services/WorkMail/Generated/AmazonWorkMailConfig.cs index d4215e30c9d2..66303c88edb3 100644 --- a/sdk/src/Services/WorkMail/Generated/AmazonWorkMailConfig.cs +++ b/sdk/src/Services/WorkMail/Generated/AmazonWorkMailConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.WorkMail public partial class AmazonWorkMailConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("WorkMail", "4.0.0.0"); private static readonly AmazonWorkMailEndpointResolver EndpointResolver = new AmazonWorkMailEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("WorkMail", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("WorkMail", "3.7.401.10"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/WorkMail/Generated/Model/DeleteOrganizationRequest.cs b/sdk/src/Services/WorkMail/Generated/Model/DeleteOrganizationRequest.cs index 156150d10fcb..3f0d5c6b21af 100644 --- a/sdk/src/Services/WorkMail/Generated/Model/DeleteOrganizationRequest.cs +++ b/sdk/src/Services/WorkMail/Generated/Model/DeleteOrganizationRequest.cs @@ -89,9 +89,9 @@ internal bool IsSetDeleteDirectory() /// authentication settings for any organization. /// /// - public bool DeleteIdentityCenterApplication + public bool? DeleteIdentityCenterApplication { - get { return this._deleteIdentityCenterApplication.GetValueOrDefault(); } + get { return this._deleteIdentityCenterApplication; } set { this._deleteIdentityCenterApplication = value; } } diff --git a/sdk/src/Services/WorkMail/Generated/Model/GetPersonalAccessTokenMetadataResponse.cs b/sdk/src/Services/WorkMail/Generated/Model/GetPersonalAccessTokenMetadataResponse.cs index 0880b739c01f..bee3ff2e42ee 100644 --- a/sdk/src/Services/WorkMail/Generated/Model/GetPersonalAccessTokenMetadataResponse.cs +++ b/sdk/src/Services/WorkMail/Generated/Model/GetPersonalAccessTokenMetadataResponse.cs @@ -48,9 +48,9 @@ public partial class GetPersonalAccessTokenMetadataResponse : AmazonWebServiceRe /// The date when the Personal Access Token ID was created. /// /// - public DateTime DateCreated + public DateTime? DateCreated { - get { return this._dateCreated.GetValueOrDefault(); } + get { return this._dateCreated; } set { this._dateCreated = value; } } @@ -66,9 +66,9 @@ internal bool IsSetDateCreated() /// The date when the Personal Access Token ID was last used. /// /// - public DateTime DateLastUsed + public DateTime? DateLastUsed { - get { return this._dateLastUsed.GetValueOrDefault(); } + get { return this._dateLastUsed; } set { this._dateLastUsed = value; } } @@ -84,9 +84,9 @@ internal bool IsSetDateLastUsed() /// The time when the Personal Access Token ID will expire. /// ///             - public DateTime ExpiresTime + public DateTime? ExpiresTime { - get { return this._expiresTime.GetValueOrDefault(); } + get { return this._expiresTime; } set { this._expiresTime = value; } } diff --git a/sdk/src/Services/WorkMail/Generated/Model/Internal/MarshallTransformations/CreateIdentityCenterApplicationRequestMarshaller.cs b/sdk/src/Services/WorkMail/Generated/Model/Internal/MarshallTransformations/CreateIdentityCenterApplicationRequestMarshaller.cs index b7b3447010b1..6af212481eef 100644 --- a/sdk/src/Services/WorkMail/Generated/Model/Internal/MarshallTransformations/CreateIdentityCenterApplicationRequestMarshaller.cs +++ b/sdk/src/Services/WorkMail/Generated/Model/Internal/MarshallTransformations/CreateIdentityCenterApplicationRequestMarshaller.cs @@ -63,38 +63,41 @@ public IRequest Marshall(CreateIdentityCenterApplicationRequest publicRequest) request.HttpMethod = "POST"; request.ResourcePath = "/"; - using (StringWriter stringWriter = new StringWriter(CultureInfo.InvariantCulture)) + using (MemoryStream memoryStream = new MemoryStream()) { - JsonWriter writer = new JsonWriter(stringWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetClientToken()) + using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) { - context.Writer.WritePropertyName("ClientToken"); - context.Writer.Write(publicRequest.ClientToken); - } + JsonWriter writer = new JsonWriter(streamWriter); + writer.Validate = false; + writer.WriteObjectStart(); + var context = new JsonMarshallerContext(request, writer); + if(publicRequest.IsSetClientToken()) + { + context.Writer.WritePropertyName("ClientToken"); + context.Writer.Write(publicRequest.ClientToken); + } - else if(!(publicRequest.IsSetClientToken())) - { - context.Writer.WritePropertyName("ClientToken"); - context.Writer.Write(Guid.NewGuid().ToString()); - } - if(publicRequest.IsSetInstanceArn()) - { - context.Writer.WritePropertyName("InstanceArn"); - context.Writer.Write(publicRequest.InstanceArn); - } + else if(!(publicRequest.IsSetClientToken())) + { + context.Writer.WritePropertyName("ClientToken"); + context.Writer.Write(Guid.NewGuid().ToString()); + } + if(publicRequest.IsSetInstanceArn()) + { + context.Writer.WritePropertyName("InstanceArn"); + context.Writer.Write(publicRequest.InstanceArn); + } - if(publicRequest.IsSetName()) - { - context.Writer.WritePropertyName("Name"); - context.Writer.Write(publicRequest.Name); + if(publicRequest.IsSetName()) + { + context.Writer.WritePropertyName("Name"); + context.Writer.Write(publicRequest.Name); + } + + writer.WriteObjectEnd(); } - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); + request.Content = memoryStream.ToArray(); } diff --git a/sdk/src/Services/WorkMail/Generated/Model/Internal/MarshallTransformations/CreateUserRequestMarshaller.cs b/sdk/src/Services/WorkMail/Generated/Model/Internal/MarshallTransformations/CreateUserRequestMarshaller.cs index 55ef19a52da6..ba4e0f1bbb7d 100644 --- a/sdk/src/Services/WorkMail/Generated/Model/Internal/MarshallTransformations/CreateUserRequestMarshaller.cs +++ b/sdk/src/Services/WorkMail/Generated/Model/Internal/MarshallTransformations/CreateUserRequestMarshaller.cs @@ -89,6 +89,12 @@ public IRequest Marshall(CreateUserRequest publicRequest) context.Writer.Write(publicRequest.HiddenFromGlobalAddressList.Value); } + if(publicRequest.IsSetIdentityProviderUserId()) + { + context.Writer.WritePropertyName("IdentityProviderUserId"); + context.Writer.Write(publicRequest.IdentityProviderUserId); + } + if(publicRequest.IsSetLastName()) { context.Writer.WritePropertyName("LastName"); @@ -122,107 +128,7 @@ public IRequest Marshall(CreateUserRequest publicRequest) writer.WriteObjectEnd(); } -<<<<<<< HEAD request.Content = memoryStream.ToArray(); -||||||| Commit version number update changes - if(publicRequest.IsSetFirstName()) - { - context.Writer.WritePropertyName("FirstName"); - context.Writer.Write(publicRequest.FirstName); - } - - if(publicRequest.IsSetHiddenFromGlobalAddressList()) - { - context.Writer.WritePropertyName("HiddenFromGlobalAddressList"); - context.Writer.Write(publicRequest.HiddenFromGlobalAddressList); - } - - if(publicRequest.IsSetLastName()) - { - context.Writer.WritePropertyName("LastName"); - context.Writer.Write(publicRequest.LastName); - } - - if(publicRequest.IsSetName()) - { - context.Writer.WritePropertyName("Name"); - context.Writer.Write(publicRequest.Name); - } - - if(publicRequest.IsSetOrganizationId()) - { - context.Writer.WritePropertyName("OrganizationId"); - context.Writer.Write(publicRequest.OrganizationId); - } - - if(publicRequest.IsSetPassword()) - { - context.Writer.WritePropertyName("Password"); - context.Writer.Write(publicRequest.Password); - } - - if(publicRequest.IsSetRole()) - { - context.Writer.WritePropertyName("Role"); - context.Writer.Write(publicRequest.Role); - } - - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); -======= - if(publicRequest.IsSetFirstName()) - { - context.Writer.WritePropertyName("FirstName"); - context.Writer.Write(publicRequest.FirstName); - } - - if(publicRequest.IsSetHiddenFromGlobalAddressList()) - { - context.Writer.WritePropertyName("HiddenFromGlobalAddressList"); - context.Writer.Write(publicRequest.HiddenFromGlobalAddressList); - } - - if(publicRequest.IsSetIdentityProviderUserId()) - { - context.Writer.WritePropertyName("IdentityProviderUserId"); - context.Writer.Write(publicRequest.IdentityProviderUserId); - } - - if(publicRequest.IsSetLastName()) - { - context.Writer.WritePropertyName("LastName"); - context.Writer.Write(publicRequest.LastName); - } - - if(publicRequest.IsSetName()) - { - context.Writer.WritePropertyName("Name"); - context.Writer.Write(publicRequest.Name); - } - - if(publicRequest.IsSetOrganizationId()) - { - context.Writer.WritePropertyName("OrganizationId"); - context.Writer.Write(publicRequest.OrganizationId); - } - - if(publicRequest.IsSetPassword()) - { - context.Writer.WritePropertyName("Password"); - context.Writer.Write(publicRequest.Password); - } - - if(publicRequest.IsSetRole()) - { - context.Writer.WritePropertyName("Role"); - context.Writer.Write(publicRequest.Role); - } - - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b } diff --git a/sdk/src/Services/WorkMail/Generated/Model/Internal/MarshallTransformations/DeleteIdentityCenterApplicationRequestMarshaller.cs b/sdk/src/Services/WorkMail/Generated/Model/Internal/MarshallTransformations/DeleteIdentityCenterApplicationRequestMarshaller.cs index 6f052010db93..3a62c2a2d425 100644 --- a/sdk/src/Services/WorkMail/Generated/Model/Internal/MarshallTransformations/DeleteIdentityCenterApplicationRequestMarshaller.cs +++ b/sdk/src/Services/WorkMail/Generated/Model/Internal/MarshallTransformations/DeleteIdentityCenterApplicationRequestMarshaller.cs @@ -63,21 +63,24 @@ public IRequest Marshall(DeleteIdentityCenterApplicationRequest publicRequest) request.HttpMethod = "POST"; request.ResourcePath = "/"; - using (StringWriter stringWriter = new StringWriter(CultureInfo.InvariantCulture)) + using (MemoryStream memoryStream = new MemoryStream()) { - JsonWriter writer = new JsonWriter(stringWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetApplicationArn()) + using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) { - context.Writer.WritePropertyName("ApplicationArn"); - context.Writer.Write(publicRequest.ApplicationArn); + JsonWriter writer = new JsonWriter(streamWriter); + writer.Validate = false; + writer.WriteObjectStart(); + var context = new JsonMarshallerContext(request, writer); + if(publicRequest.IsSetApplicationArn()) + { + context.Writer.WritePropertyName("ApplicationArn"); + context.Writer.Write(publicRequest.ApplicationArn); + } + + writer.WriteObjectEnd(); } - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); + request.Content = memoryStream.ToArray(); } diff --git a/sdk/src/Services/WorkMail/Generated/Model/Internal/MarshallTransformations/DeleteIdentityProviderConfigurationRequestMarshaller.cs b/sdk/src/Services/WorkMail/Generated/Model/Internal/MarshallTransformations/DeleteIdentityProviderConfigurationRequestMarshaller.cs index e20ac3bf73ac..6603ba686afb 100644 --- a/sdk/src/Services/WorkMail/Generated/Model/Internal/MarshallTransformations/DeleteIdentityProviderConfigurationRequestMarshaller.cs +++ b/sdk/src/Services/WorkMail/Generated/Model/Internal/MarshallTransformations/DeleteIdentityProviderConfigurationRequestMarshaller.cs @@ -63,21 +63,24 @@ public IRequest Marshall(DeleteIdentityProviderConfigurationRequest publicReques request.HttpMethod = "POST"; request.ResourcePath = "/"; - using (StringWriter stringWriter = new StringWriter(CultureInfo.InvariantCulture)) + using (MemoryStream memoryStream = new MemoryStream()) { - JsonWriter writer = new JsonWriter(stringWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetOrganizationId()) + using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) { - context.Writer.WritePropertyName("OrganizationId"); - context.Writer.Write(publicRequest.OrganizationId); + JsonWriter writer = new JsonWriter(streamWriter); + writer.Validate = false; + writer.WriteObjectStart(); + var context = new JsonMarshallerContext(request, writer); + if(publicRequest.IsSetOrganizationId()) + { + context.Writer.WritePropertyName("OrganizationId"); + context.Writer.Write(publicRequest.OrganizationId); + } + + writer.WriteObjectEnd(); } - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); + request.Content = memoryStream.ToArray(); } diff --git a/sdk/src/Services/WorkMail/Generated/Model/Internal/MarshallTransformations/DeleteOrganizationRequestMarshaller.cs b/sdk/src/Services/WorkMail/Generated/Model/Internal/MarshallTransformations/DeleteOrganizationRequestMarshaller.cs index bd84760e0228..7e8a3fa96eb3 100644 --- a/sdk/src/Services/WorkMail/Generated/Model/Internal/MarshallTransformations/DeleteOrganizationRequestMarshaller.cs +++ b/sdk/src/Services/WorkMail/Generated/Model/Internal/MarshallTransformations/DeleteOrganizationRequestMarshaller.cs @@ -88,31 +88,17 @@ public IRequest Marshall(DeleteOrganizationRequest publicRequest) context.Writer.Write(publicRequest.DeleteDirectory.Value); } -<<<<<<< HEAD + if(publicRequest.IsSetDeleteIdentityCenterApplication()) + { + context.Writer.WritePropertyName("DeleteIdentityCenterApplication"); + context.Writer.Write(publicRequest.DeleteIdentityCenterApplication.Value); + } + if(publicRequest.IsSetForceDelete()) { context.Writer.WritePropertyName("ForceDelete"); context.Writer.Write(publicRequest.ForceDelete.Value); } -||||||| Commit version number update changes - if(publicRequest.IsSetForceDelete()) - { - context.Writer.WritePropertyName("ForceDelete"); - context.Writer.Write(publicRequest.ForceDelete); - } -======= - if(publicRequest.IsSetDeleteIdentityCenterApplication()) - { - context.Writer.WritePropertyName("DeleteIdentityCenterApplication"); - context.Writer.Write(publicRequest.DeleteIdentityCenterApplication); - } - - if(publicRequest.IsSetForceDelete()) - { - context.Writer.WritePropertyName("ForceDelete"); - context.Writer.Write(publicRequest.ForceDelete); - } ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b if(publicRequest.IsSetOrganizationId()) { diff --git a/sdk/src/Services/WorkMail/Generated/Model/Internal/MarshallTransformations/DeletePersonalAccessTokenRequestMarshaller.cs b/sdk/src/Services/WorkMail/Generated/Model/Internal/MarshallTransformations/DeletePersonalAccessTokenRequestMarshaller.cs index 049984df83f9..0c49cd3f6bf3 100644 --- a/sdk/src/Services/WorkMail/Generated/Model/Internal/MarshallTransformations/DeletePersonalAccessTokenRequestMarshaller.cs +++ b/sdk/src/Services/WorkMail/Generated/Model/Internal/MarshallTransformations/DeletePersonalAccessTokenRequestMarshaller.cs @@ -63,27 +63,30 @@ public IRequest Marshall(DeletePersonalAccessTokenRequest publicRequest) request.HttpMethod = "POST"; request.ResourcePath = "/"; - using (StringWriter stringWriter = new StringWriter(CultureInfo.InvariantCulture)) + using (MemoryStream memoryStream = new MemoryStream()) { - JsonWriter writer = new JsonWriter(stringWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetOrganizationId()) + using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) { - context.Writer.WritePropertyName("OrganizationId"); - context.Writer.Write(publicRequest.OrganizationId); - } + JsonWriter writer = new JsonWriter(streamWriter); + writer.Validate = false; + writer.WriteObjectStart(); + var context = new JsonMarshallerContext(request, writer); + if(publicRequest.IsSetOrganizationId()) + { + context.Writer.WritePropertyName("OrganizationId"); + context.Writer.Write(publicRequest.OrganizationId); + } - if(publicRequest.IsSetPersonalAccessTokenId()) - { - context.Writer.WritePropertyName("PersonalAccessTokenId"); - context.Writer.Write(publicRequest.PersonalAccessTokenId); + if(publicRequest.IsSetPersonalAccessTokenId()) + { + context.Writer.WritePropertyName("PersonalAccessTokenId"); + context.Writer.Write(publicRequest.PersonalAccessTokenId); + } + + writer.WriteObjectEnd(); } - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); + request.Content = memoryStream.ToArray(); } diff --git a/sdk/src/Services/WorkMail/Generated/Model/Internal/MarshallTransformations/DescribeIdentityProviderConfigurationRequestMarshaller.cs b/sdk/src/Services/WorkMail/Generated/Model/Internal/MarshallTransformations/DescribeIdentityProviderConfigurationRequestMarshaller.cs index 92186deb9793..123e7609213d 100644 --- a/sdk/src/Services/WorkMail/Generated/Model/Internal/MarshallTransformations/DescribeIdentityProviderConfigurationRequestMarshaller.cs +++ b/sdk/src/Services/WorkMail/Generated/Model/Internal/MarshallTransformations/DescribeIdentityProviderConfigurationRequestMarshaller.cs @@ -63,21 +63,24 @@ public IRequest Marshall(DescribeIdentityProviderConfigurationRequest publicRequ request.HttpMethod = "POST"; request.ResourcePath = "/"; - using (StringWriter stringWriter = new StringWriter(CultureInfo.InvariantCulture)) + using (MemoryStream memoryStream = new MemoryStream()) { - JsonWriter writer = new JsonWriter(stringWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetOrganizationId()) + using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) { - context.Writer.WritePropertyName("OrganizationId"); - context.Writer.Write(publicRequest.OrganizationId); + JsonWriter writer = new JsonWriter(streamWriter); + writer.Validate = false; + writer.WriteObjectStart(); + var context = new JsonMarshallerContext(request, writer); + if(publicRequest.IsSetOrganizationId()) + { + context.Writer.WritePropertyName("OrganizationId"); + context.Writer.Write(publicRequest.OrganizationId); + } + + writer.WriteObjectEnd(); } - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); + request.Content = memoryStream.ToArray(); } diff --git a/sdk/src/Services/WorkMail/Generated/Model/Internal/MarshallTransformations/GetPersonalAccessTokenMetadataRequestMarshaller.cs b/sdk/src/Services/WorkMail/Generated/Model/Internal/MarshallTransformations/GetPersonalAccessTokenMetadataRequestMarshaller.cs index c949cb1e21b4..e0619fad5972 100644 --- a/sdk/src/Services/WorkMail/Generated/Model/Internal/MarshallTransformations/GetPersonalAccessTokenMetadataRequestMarshaller.cs +++ b/sdk/src/Services/WorkMail/Generated/Model/Internal/MarshallTransformations/GetPersonalAccessTokenMetadataRequestMarshaller.cs @@ -63,27 +63,30 @@ public IRequest Marshall(GetPersonalAccessTokenMetadataRequest publicRequest) request.HttpMethod = "POST"; request.ResourcePath = "/"; - using (StringWriter stringWriter = new StringWriter(CultureInfo.InvariantCulture)) + using (MemoryStream memoryStream = new MemoryStream()) { - JsonWriter writer = new JsonWriter(stringWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetOrganizationId()) + using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) { - context.Writer.WritePropertyName("OrganizationId"); - context.Writer.Write(publicRequest.OrganizationId); - } + JsonWriter writer = new JsonWriter(streamWriter); + writer.Validate = false; + writer.WriteObjectStart(); + var context = new JsonMarshallerContext(request, writer); + if(publicRequest.IsSetOrganizationId()) + { + context.Writer.WritePropertyName("OrganizationId"); + context.Writer.Write(publicRequest.OrganizationId); + } - if(publicRequest.IsSetPersonalAccessTokenId()) - { - context.Writer.WritePropertyName("PersonalAccessTokenId"); - context.Writer.Write(publicRequest.PersonalAccessTokenId); + if(publicRequest.IsSetPersonalAccessTokenId()) + { + context.Writer.WritePropertyName("PersonalAccessTokenId"); + context.Writer.Write(publicRequest.PersonalAccessTokenId); + } + + writer.WriteObjectEnd(); } - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); + request.Content = memoryStream.ToArray(); } diff --git a/sdk/src/Services/WorkMail/Generated/Model/Internal/MarshallTransformations/GetPersonalAccessTokenMetadataResponseUnmarshaller.cs b/sdk/src/Services/WorkMail/Generated/Model/Internal/MarshallTransformations/GetPersonalAccessTokenMetadataResponseUnmarshaller.cs index 7ff3cbc99218..9a304e831a67 100644 --- a/sdk/src/Services/WorkMail/Generated/Model/Internal/MarshallTransformations/GetPersonalAccessTokenMetadataResponseUnmarshaller.cs +++ b/sdk/src/Services/WorkMail/Generated/Model/Internal/MarshallTransformations/GetPersonalAccessTokenMetadataResponseUnmarshaller.cs @@ -54,19 +54,19 @@ public override AmazonWebServiceResponse Unmarshall(JsonUnmarshallerContext cont { if (context.TestExpression("DateCreated", targetDepth)) { - var unmarshaller = DateTimeUnmarshaller.Instance; + var unmarshaller = NullableDateTimeUnmarshaller.Instance; response.DateCreated = unmarshaller.Unmarshall(context); continue; } if (context.TestExpression("DateLastUsed", targetDepth)) { - var unmarshaller = DateTimeUnmarshaller.Instance; + var unmarshaller = NullableDateTimeUnmarshaller.Instance; response.DateLastUsed = unmarshaller.Unmarshall(context); continue; } if (context.TestExpression("ExpiresTime", targetDepth)) { - var unmarshaller = DateTimeUnmarshaller.Instance; + var unmarshaller = NullableDateTimeUnmarshaller.Instance; response.ExpiresTime = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/WorkMail/Generated/Model/Internal/MarshallTransformations/ListPersonalAccessTokensRequestMarshaller.cs b/sdk/src/Services/WorkMail/Generated/Model/Internal/MarshallTransformations/ListPersonalAccessTokensRequestMarshaller.cs index e758fc4d1ea1..20e47874868a 100644 --- a/sdk/src/Services/WorkMail/Generated/Model/Internal/MarshallTransformations/ListPersonalAccessTokensRequestMarshaller.cs +++ b/sdk/src/Services/WorkMail/Generated/Model/Internal/MarshallTransformations/ListPersonalAccessTokensRequestMarshaller.cs @@ -63,39 +63,42 @@ public IRequest Marshall(ListPersonalAccessTokensRequest publicRequest) request.HttpMethod = "POST"; request.ResourcePath = "/"; - using (StringWriter stringWriter = new StringWriter(CultureInfo.InvariantCulture)) + using (MemoryStream memoryStream = new MemoryStream()) { - JsonWriter writer = new JsonWriter(stringWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetMaxResults()) + using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) { - context.Writer.WritePropertyName("MaxResults"); - context.Writer.Write(publicRequest.MaxResults); - } + JsonWriter writer = new JsonWriter(streamWriter); + writer.Validate = false; + writer.WriteObjectStart(); + var context = new JsonMarshallerContext(request, writer); + if(publicRequest.IsSetMaxResults()) + { + context.Writer.WritePropertyName("MaxResults"); + context.Writer.Write(publicRequest.MaxResults.Value); + } - if(publicRequest.IsSetNextToken()) - { - context.Writer.WritePropertyName("NextToken"); - context.Writer.Write(publicRequest.NextToken); - } + if(publicRequest.IsSetNextToken()) + { + context.Writer.WritePropertyName("NextToken"); + context.Writer.Write(publicRequest.NextToken); + } - if(publicRequest.IsSetOrganizationId()) - { - context.Writer.WritePropertyName("OrganizationId"); - context.Writer.Write(publicRequest.OrganizationId); - } + if(publicRequest.IsSetOrganizationId()) + { + context.Writer.WritePropertyName("OrganizationId"); + context.Writer.Write(publicRequest.OrganizationId); + } - if(publicRequest.IsSetUserId()) - { - context.Writer.WritePropertyName("UserId"); - context.Writer.Write(publicRequest.UserId); + if(publicRequest.IsSetUserId()) + { + context.Writer.WritePropertyName("UserId"); + context.Writer.Write(publicRequest.UserId); + } + + writer.WriteObjectEnd(); } - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); + request.Content = memoryStream.ToArray(); } diff --git a/sdk/src/Services/WorkMail/Generated/Model/Internal/MarshallTransformations/PersonalAccessTokenConfigurationMarshaller.cs b/sdk/src/Services/WorkMail/Generated/Model/Internal/MarshallTransformations/PersonalAccessTokenConfigurationMarshaller.cs index bdcab71570d3..aa2bc1cd5a21 100644 --- a/sdk/src/Services/WorkMail/Generated/Model/Internal/MarshallTransformations/PersonalAccessTokenConfigurationMarshaller.cs +++ b/sdk/src/Services/WorkMail/Generated/Model/Internal/MarshallTransformations/PersonalAccessTokenConfigurationMarshaller.cs @@ -51,7 +51,7 @@ public void Marshall(PersonalAccessTokenConfiguration requestObject, JsonMarshal if(requestObject.IsSetLifetimeInDays()) { context.Writer.WritePropertyName("LifetimeInDays"); - context.Writer.Write(requestObject.LifetimeInDays); + context.Writer.Write(requestObject.LifetimeInDays.Value); } if(requestObject.IsSetStatus()) diff --git a/sdk/src/Services/WorkMail/Generated/Model/Internal/MarshallTransformations/PersonalAccessTokenConfigurationUnmarshaller.cs b/sdk/src/Services/WorkMail/Generated/Model/Internal/MarshallTransformations/PersonalAccessTokenConfigurationUnmarshaller.cs index f3723347a229..11b4ab832480 100644 --- a/sdk/src/Services/WorkMail/Generated/Model/Internal/MarshallTransformations/PersonalAccessTokenConfigurationUnmarshaller.cs +++ b/sdk/src/Services/WorkMail/Generated/Model/Internal/MarshallTransformations/PersonalAccessTokenConfigurationUnmarshaller.cs @@ -68,7 +68,7 @@ public PersonalAccessTokenConfiguration Unmarshall(JsonUnmarshallerContext conte { if (context.TestExpression("LifetimeInDays", targetDepth)) { - var unmarshaller = IntUnmarshaller.Instance; + var unmarshaller = NullableIntUnmarshaller.Instance; unmarshalledObject.LifetimeInDays = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/WorkMail/Generated/Model/Internal/MarshallTransformations/PersonalAccessTokenSummaryUnmarshaller.cs b/sdk/src/Services/WorkMail/Generated/Model/Internal/MarshallTransformations/PersonalAccessTokenSummaryUnmarshaller.cs index 06854ba334b2..ab59132f5c5c 100644 --- a/sdk/src/Services/WorkMail/Generated/Model/Internal/MarshallTransformations/PersonalAccessTokenSummaryUnmarshaller.cs +++ b/sdk/src/Services/WorkMail/Generated/Model/Internal/MarshallTransformations/PersonalAccessTokenSummaryUnmarshaller.cs @@ -68,19 +68,19 @@ public PersonalAccessTokenSummary Unmarshall(JsonUnmarshallerContext context) { if (context.TestExpression("DateCreated", targetDepth)) { - var unmarshaller = DateTimeUnmarshaller.Instance; + var unmarshaller = NullableDateTimeUnmarshaller.Instance; unmarshalledObject.DateCreated = unmarshaller.Unmarshall(context); continue; } if (context.TestExpression("DateLastUsed", targetDepth)) { - var unmarshaller = DateTimeUnmarshaller.Instance; + var unmarshaller = NullableDateTimeUnmarshaller.Instance; unmarshalledObject.DateLastUsed = unmarshaller.Unmarshall(context); continue; } if (context.TestExpression("ExpiresTime", targetDepth)) { - var unmarshaller = DateTimeUnmarshaller.Instance; + var unmarshaller = NullableDateTimeUnmarshaller.Instance; unmarshalledObject.ExpiresTime = unmarshaller.Unmarshall(context); continue; } diff --git a/sdk/src/Services/WorkMail/Generated/Model/Internal/MarshallTransformations/PutIdentityProviderConfigurationRequestMarshaller.cs b/sdk/src/Services/WorkMail/Generated/Model/Internal/MarshallTransformations/PutIdentityProviderConfigurationRequestMarshaller.cs index 66d1694a7b18..983d7add6b70 100644 --- a/sdk/src/Services/WorkMail/Generated/Model/Internal/MarshallTransformations/PutIdentityProviderConfigurationRequestMarshaller.cs +++ b/sdk/src/Services/WorkMail/Generated/Model/Internal/MarshallTransformations/PutIdentityProviderConfigurationRequestMarshaller.cs @@ -63,49 +63,52 @@ public IRequest Marshall(PutIdentityProviderConfigurationRequest publicRequest) request.HttpMethod = "POST"; request.ResourcePath = "/"; - using (StringWriter stringWriter = new StringWriter(CultureInfo.InvariantCulture)) + using (MemoryStream memoryStream = new MemoryStream()) { - JsonWriter writer = new JsonWriter(stringWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetAuthenticationMode()) + using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) { - context.Writer.WritePropertyName("AuthenticationMode"); - context.Writer.Write(publicRequest.AuthenticationMode); + JsonWriter writer = new JsonWriter(streamWriter); + writer.Validate = false; + writer.WriteObjectStart(); + var context = new JsonMarshallerContext(request, writer); + if(publicRequest.IsSetAuthenticationMode()) + { + context.Writer.WritePropertyName("AuthenticationMode"); + context.Writer.Write(publicRequest.AuthenticationMode); + } + + if(publicRequest.IsSetIdentityCenterConfiguration()) + { + context.Writer.WritePropertyName("IdentityCenterConfiguration"); + context.Writer.WriteObjectStart(); + + var marshaller = IdentityCenterConfigurationMarshaller.Instance; + marshaller.Marshall(publicRequest.IdentityCenterConfiguration, context); + + context.Writer.WriteObjectEnd(); + } + + if(publicRequest.IsSetOrganizationId()) + { + context.Writer.WritePropertyName("OrganizationId"); + context.Writer.Write(publicRequest.OrganizationId); + } + + if(publicRequest.IsSetPersonalAccessTokenConfiguration()) + { + context.Writer.WritePropertyName("PersonalAccessTokenConfiguration"); + context.Writer.WriteObjectStart(); + + var marshaller = PersonalAccessTokenConfigurationMarshaller.Instance; + marshaller.Marshall(publicRequest.PersonalAccessTokenConfiguration, context); + + context.Writer.WriteObjectEnd(); + } + + writer.WriteObjectEnd(); } - if(publicRequest.IsSetIdentityCenterConfiguration()) - { - context.Writer.WritePropertyName("IdentityCenterConfiguration"); - context.Writer.WriteObjectStart(); - - var marshaller = IdentityCenterConfigurationMarshaller.Instance; - marshaller.Marshall(publicRequest.IdentityCenterConfiguration, context); - - context.Writer.WriteObjectEnd(); - } - - if(publicRequest.IsSetOrganizationId()) - { - context.Writer.WritePropertyName("OrganizationId"); - context.Writer.Write(publicRequest.OrganizationId); - } - - if(publicRequest.IsSetPersonalAccessTokenConfiguration()) - { - context.Writer.WritePropertyName("PersonalAccessTokenConfiguration"); - context.Writer.WriteObjectStart(); - - var marshaller = PersonalAccessTokenConfigurationMarshaller.Instance; - marshaller.Marshall(publicRequest.PersonalAccessTokenConfiguration, context); - - context.Writer.WriteObjectEnd(); - } - - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); + request.Content = memoryStream.ToArray(); } diff --git a/sdk/src/Services/WorkMail/Generated/Model/Internal/MarshallTransformations/UpdateUserRequestMarshaller.cs b/sdk/src/Services/WorkMail/Generated/Model/Internal/MarshallTransformations/UpdateUserRequestMarshaller.cs index 7f62abb8aa54..3d58df38204f 100644 --- a/sdk/src/Services/WorkMail/Generated/Model/Internal/MarshallTransformations/UpdateUserRequestMarshaller.cs +++ b/sdk/src/Services/WorkMail/Generated/Model/Internal/MarshallTransformations/UpdateUserRequestMarshaller.cs @@ -65,7 +65,6 @@ public IRequest Marshall(UpdateUserRequest publicRequest) request.ResourcePath = "/"; using (MemoryStream memoryStream = new MemoryStream()) { -<<<<<<< HEAD using (StreamWriter streamWriter = new InvariantCultureStreamWriter(memoryStream)) { JsonWriter writer = new JsonWriter(streamWriter); @@ -114,6 +113,12 @@ public IRequest Marshall(UpdateUserRequest publicRequest) context.Writer.Write(publicRequest.HiddenFromGlobalAddressList.Value); } + if(publicRequest.IsSetIdentityProviderUserId()) + { + context.Writer.WritePropertyName("IdentityProviderUserId"); + context.Writer.Write(publicRequest.IdentityProviderUserId); + } + if(publicRequest.IsSetInitials()) { context.Writer.WritePropertyName("Initials"); @@ -178,233 +183,6 @@ public IRequest Marshall(UpdateUserRequest publicRequest) } request.Content = memoryStream.ToArray(); -||||||| Commit version number update changes - JsonWriter writer = new JsonWriter(stringWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetCity()) - { - context.Writer.WritePropertyName("City"); - context.Writer.Write(publicRequest.City); - } - - if(publicRequest.IsSetCompany()) - { - context.Writer.WritePropertyName("Company"); - context.Writer.Write(publicRequest.Company); - } - - if(publicRequest.IsSetCountry()) - { - context.Writer.WritePropertyName("Country"); - context.Writer.Write(publicRequest.Country); - } - - if(publicRequest.IsSetDepartment()) - { - context.Writer.WritePropertyName("Department"); - context.Writer.Write(publicRequest.Department); - } - - if(publicRequest.IsSetDisplayName()) - { - context.Writer.WritePropertyName("DisplayName"); - context.Writer.Write(publicRequest.DisplayName); - } - - if(publicRequest.IsSetFirstName()) - { - context.Writer.WritePropertyName("FirstName"); - context.Writer.Write(publicRequest.FirstName); - } - - if(publicRequest.IsSetHiddenFromGlobalAddressList()) - { - context.Writer.WritePropertyName("HiddenFromGlobalAddressList"); - context.Writer.Write(publicRequest.HiddenFromGlobalAddressList); - } - - if(publicRequest.IsSetInitials()) - { - context.Writer.WritePropertyName("Initials"); - context.Writer.Write(publicRequest.Initials); - } - - if(publicRequest.IsSetJobTitle()) - { - context.Writer.WritePropertyName("JobTitle"); - context.Writer.Write(publicRequest.JobTitle); - } - - if(publicRequest.IsSetLastName()) - { - context.Writer.WritePropertyName("LastName"); - context.Writer.Write(publicRequest.LastName); - } - - if(publicRequest.IsSetOffice()) - { - context.Writer.WritePropertyName("Office"); - context.Writer.Write(publicRequest.Office); - } - - if(publicRequest.IsSetOrganizationId()) - { - context.Writer.WritePropertyName("OrganizationId"); - context.Writer.Write(publicRequest.OrganizationId); - } - - if(publicRequest.IsSetRole()) - { - context.Writer.WritePropertyName("Role"); - context.Writer.Write(publicRequest.Role); - } - - if(publicRequest.IsSetStreet()) - { - context.Writer.WritePropertyName("Street"); - context.Writer.Write(publicRequest.Street); - } - - if(publicRequest.IsSetTelephone()) - { - context.Writer.WritePropertyName("Telephone"); - context.Writer.Write(publicRequest.Telephone); - } - - if(publicRequest.IsSetUserId()) - { - context.Writer.WritePropertyName("UserId"); - context.Writer.Write(publicRequest.UserId); - } - - if(publicRequest.IsSetZipCode()) - { - context.Writer.WritePropertyName("ZipCode"); - context.Writer.Write(publicRequest.ZipCode); - } - - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); -======= - JsonWriter writer = new JsonWriter(stringWriter); - writer.Validate = false; - writer.WriteObjectStart(); - var context = new JsonMarshallerContext(request, writer); - if(publicRequest.IsSetCity()) - { - context.Writer.WritePropertyName("City"); - context.Writer.Write(publicRequest.City); - } - - if(publicRequest.IsSetCompany()) - { - context.Writer.WritePropertyName("Company"); - context.Writer.Write(publicRequest.Company); - } - - if(publicRequest.IsSetCountry()) - { - context.Writer.WritePropertyName("Country"); - context.Writer.Write(publicRequest.Country); - } - - if(publicRequest.IsSetDepartment()) - { - context.Writer.WritePropertyName("Department"); - context.Writer.Write(publicRequest.Department); - } - - if(publicRequest.IsSetDisplayName()) - { - context.Writer.WritePropertyName("DisplayName"); - context.Writer.Write(publicRequest.DisplayName); - } - - if(publicRequest.IsSetFirstName()) - { - context.Writer.WritePropertyName("FirstName"); - context.Writer.Write(publicRequest.FirstName); - } - - if(publicRequest.IsSetHiddenFromGlobalAddressList()) - { - context.Writer.WritePropertyName("HiddenFromGlobalAddressList"); - context.Writer.Write(publicRequest.HiddenFromGlobalAddressList); - } - - if(publicRequest.IsSetIdentityProviderUserId()) - { - context.Writer.WritePropertyName("IdentityProviderUserId"); - context.Writer.Write(publicRequest.IdentityProviderUserId); - } - - if(publicRequest.IsSetInitials()) - { - context.Writer.WritePropertyName("Initials"); - context.Writer.Write(publicRequest.Initials); - } - - if(publicRequest.IsSetJobTitle()) - { - context.Writer.WritePropertyName("JobTitle"); - context.Writer.Write(publicRequest.JobTitle); - } - - if(publicRequest.IsSetLastName()) - { - context.Writer.WritePropertyName("LastName"); - context.Writer.Write(publicRequest.LastName); - } - - if(publicRequest.IsSetOffice()) - { - context.Writer.WritePropertyName("Office"); - context.Writer.Write(publicRequest.Office); - } - - if(publicRequest.IsSetOrganizationId()) - { - context.Writer.WritePropertyName("OrganizationId"); - context.Writer.Write(publicRequest.OrganizationId); - } - - if(publicRequest.IsSetRole()) - { - context.Writer.WritePropertyName("Role"); - context.Writer.Write(publicRequest.Role); - } - - if(publicRequest.IsSetStreet()) - { - context.Writer.WritePropertyName("Street"); - context.Writer.Write(publicRequest.Street); - } - - if(publicRequest.IsSetTelephone()) - { - context.Writer.WritePropertyName("Telephone"); - context.Writer.Write(publicRequest.Telephone); - } - - if(publicRequest.IsSetUserId()) - { - context.Writer.WritePropertyName("UserId"); - context.Writer.Write(publicRequest.UserId); - } - - if(publicRequest.IsSetZipCode()) - { - context.Writer.WritePropertyName("ZipCode"); - context.Writer.Write(publicRequest.ZipCode); - } - - writer.WriteObjectEnd(); - string snippet = stringWriter.ToString(); - request.Content = System.Text.Encoding.UTF8.GetBytes(snippet); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b } diff --git a/sdk/src/Services/WorkMail/Generated/Model/ListPersonalAccessTokensRequest.cs b/sdk/src/Services/WorkMail/Generated/Model/ListPersonalAccessTokensRequest.cs index 54a79895834a..d75ba845fabe 100644 --- a/sdk/src/Services/WorkMail/Generated/Model/ListPersonalAccessTokensRequest.cs +++ b/sdk/src/Services/WorkMail/Generated/Model/ListPersonalAccessTokensRequest.cs @@ -47,9 +47,9 @@ public partial class ListPersonalAccessTokensRequest : AmazonWorkMailRequest /// ///             [AWSProperty(Min=1, Max=100)] - public int MaxResults + public int? MaxResults { - get { return this._maxResults.GetValueOrDefault(); } + get { return this._maxResults; } set { this._maxResults = value; } } diff --git a/sdk/src/Services/WorkMail/Generated/Model/PersonalAccessTokenConfiguration.cs b/sdk/src/Services/WorkMail/Generated/Model/PersonalAccessTokenConfiguration.cs index 3c2dda757204..ff683b9c433e 100644 --- a/sdk/src/Services/WorkMail/Generated/Model/PersonalAccessTokenConfiguration.cs +++ b/sdk/src/Services/WorkMail/Generated/Model/PersonalAccessTokenConfiguration.cs @@ -44,9 +44,9 @@ public partial class PersonalAccessTokenConfiguration /// ///             [AWSProperty(Min=1, Max=3653)] - public int LifetimeInDays + public int? LifetimeInDays { - get { return this._lifetimeInDays.GetValueOrDefault(); } + get { return this._lifetimeInDays; } set { this._lifetimeInDays = value; } } diff --git a/sdk/src/Services/WorkMail/Generated/Model/PersonalAccessTokenSummary.cs b/sdk/src/Services/WorkMail/Generated/Model/PersonalAccessTokenSummary.cs index e00ac56f715f..2e14eb4bb399 100644 --- a/sdk/src/Services/WorkMail/Generated/Model/PersonalAccessTokenSummary.cs +++ b/sdk/src/Services/WorkMail/Generated/Model/PersonalAccessTokenSummary.cs @@ -48,9 +48,9 @@ public partial class PersonalAccessTokenSummary /// The date when the Personal Access Token was created. /// /// - public DateTime DateCreated + public DateTime? DateCreated { - get { return this._dateCreated.GetValueOrDefault(); } + get { return this._dateCreated; } set { this._dateCreated = value; } } @@ -66,9 +66,9 @@ internal bool IsSetDateCreated() /// The date when the Personal Access Token was last used. /// /// - public DateTime DateLastUsed + public DateTime? DateLastUsed { - get { return this._dateLastUsed.GetValueOrDefault(); } + get { return this._dateLastUsed; } set { this._dateLastUsed = value; } } @@ -84,9 +84,9 @@ internal bool IsSetDateLastUsed() /// The date when the Personal Access Token will expire. /// /// - public DateTime ExpiresTime + public DateTime? ExpiresTime { - get { return this._expiresTime.GetValueOrDefault(); } + get { return this._expiresTime; } set { this._expiresTime = value; } } diff --git a/sdk/src/Services/WorkMail/Generated/Model/_bcl45+netstandard/IListPersonalAccessTokensPaginator.cs b/sdk/src/Services/WorkMail/Generated/Model/_bcl+netstandard/IListPersonalAccessTokensPaginator.cs similarity index 100% rename from sdk/src/Services/WorkMail/Generated/Model/_bcl45+netstandard/IListPersonalAccessTokensPaginator.cs rename to sdk/src/Services/WorkMail/Generated/Model/_bcl+netstandard/IListPersonalAccessTokensPaginator.cs diff --git a/sdk/src/Services/WorkMail/Generated/Model/_bcl45+netstandard/ListPersonalAccessTokensPaginator.cs b/sdk/src/Services/WorkMail/Generated/Model/_bcl+netstandard/ListPersonalAccessTokensPaginator.cs similarity index 100% rename from sdk/src/Services/WorkMail/Generated/Model/_bcl45+netstandard/ListPersonalAccessTokensPaginator.cs rename to sdk/src/Services/WorkMail/Generated/Model/_bcl+netstandard/ListPersonalAccessTokensPaginator.cs diff --git a/sdk/src/Services/WorkMail/Generated/_bcl/AmazonWorkMailClient.cs b/sdk/src/Services/WorkMail/Generated/_bcl/AmazonWorkMailClient.cs index a2b809f2cc47..49642403415f 100644 --- a/sdk/src/Services/WorkMail/Generated/_bcl/AmazonWorkMailClient.cs +++ b/sdk/src/Services/WorkMail/Generated/_bcl/AmazonWorkMailClient.cs @@ -910,6 +910,57 @@ public virtual CreateGroupResponse CreateGroup(CreateGroupRequest request) #endregion + #region CreateIdentityCenterApplication + + + /// + /// Creates the WorkMail application in IAM Identity Center that can be used later in + /// the WorkMail - IdC integration. For more information, see PutIdentityProviderConfiguration. + /// This action does not affect the authentication settings for any WorkMail organizations. + /// + /// Container for the necessary parameters to execute the CreateIdentityCenterApplication service method. + /// + /// The response from the CreateIdentityCenterApplication service method, as returned by WorkMail. + /// + /// One or more of the input parameters don't match the service's restrictions. + /// + /// REST API Reference for CreateIdentityCenterApplication Operation + public virtual CreateIdentityCenterApplicationResponse CreateIdentityCenterApplication(CreateIdentityCenterApplicationRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = CreateIdentityCenterApplicationRequestMarshaller.Instance; + options.ResponseUnmarshaller = CreateIdentityCenterApplicationResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// Creates the WorkMail application in IAM Identity Center that can be used later in + /// the WorkMail - IdC integration. For more information, see PutIdentityProviderConfiguration. + /// This action does not affect the authentication settings for any WorkMail organizations. + /// + /// Container for the necessary parameters to execute the CreateIdentityCenterApplication service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the CreateIdentityCenterApplication service method, as returned by WorkMail. + /// + /// One or more of the input parameters don't match the service's restrictions. + /// + /// REST API Reference for CreateIdentityCenterApplication Operation + public virtual Task CreateIdentityCenterApplicationAsync(CreateIdentityCenterApplicationRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = CreateIdentityCenterApplicationRequestMarshaller.Instance; + options.ResponseUnmarshaller = CreateIdentityCenterApplicationResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + #region CreateImpersonationRole @@ -1744,6 +1795,130 @@ public virtual DeleteGroupResponse DeleteGroup(DeleteGroupRequest request) #endregion + #region DeleteIdentityCenterApplication + + + /// + /// Deletes the IAM Identity Center application from WorkMail. This action does not affect + /// the authentication settings for any WorkMail organizations. + /// + /// Container for the necessary parameters to execute the DeleteIdentityCenterApplication service method. + /// + /// The response from the DeleteIdentityCenterApplication service method, as returned by WorkMail. + /// + /// One or more of the input parameters don't match the service's restrictions. + /// + /// + /// The organization must have a valid state to perform certain operations on the organization + /// or its members. + /// + /// REST API Reference for DeleteIdentityCenterApplication Operation + public virtual DeleteIdentityCenterApplicationResponse DeleteIdentityCenterApplication(DeleteIdentityCenterApplicationRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = DeleteIdentityCenterApplicationRequestMarshaller.Instance; + options.ResponseUnmarshaller = DeleteIdentityCenterApplicationResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// Deletes the IAM Identity Center application from WorkMail. This action does not affect + /// the authentication settings for any WorkMail organizations. + /// + /// Container for the necessary parameters to execute the DeleteIdentityCenterApplication service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the DeleteIdentityCenterApplication service method, as returned by WorkMail. + /// + /// One or more of the input parameters don't match the service's restrictions. + /// + /// + /// The organization must have a valid state to perform certain operations on the organization + /// or its members. + /// + /// REST API Reference for DeleteIdentityCenterApplication Operation + public virtual Task DeleteIdentityCenterApplicationAsync(DeleteIdentityCenterApplicationRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = DeleteIdentityCenterApplicationRequestMarshaller.Instance; + options.ResponseUnmarshaller = DeleteIdentityCenterApplicationResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + + #region DeleteIdentityProviderConfiguration + + + /// + /// Disables the integration between IdC and WorkMail. Authentication will continue with + /// the directory as it was before the IdC integration. You might have to reset your directory + /// passwords and reconfigure your desktop and mobile email clients. + /// + /// Container for the necessary parameters to execute the DeleteIdentityProviderConfiguration service method. + /// + /// The response from the DeleteIdentityProviderConfiguration service method, as returned by WorkMail. + /// + /// One or more of the input parameters don't match the service's restrictions. + /// + /// + /// An operation received a valid organization identifier that either doesn't belong or + /// exist in the system. + /// + /// + /// The organization must have a valid state to perform certain operations on the organization + /// or its members. + /// + /// REST API Reference for DeleteIdentityProviderConfiguration Operation + public virtual DeleteIdentityProviderConfigurationResponse DeleteIdentityProviderConfiguration(DeleteIdentityProviderConfigurationRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = DeleteIdentityProviderConfigurationRequestMarshaller.Instance; + options.ResponseUnmarshaller = DeleteIdentityProviderConfigurationResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// Disables the integration between IdC and WorkMail. Authentication will continue with + /// the directory as it was before the IdC integration. You might have to reset your directory + /// passwords and reconfigure your desktop and mobile email clients. + /// + /// Container for the necessary parameters to execute the DeleteIdentityProviderConfiguration service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the DeleteIdentityProviderConfiguration service method, as returned by WorkMail. + /// + /// One or more of the input parameters don't match the service's restrictions. + /// + /// + /// An operation received a valid organization identifier that either doesn't belong or + /// exist in the system. + /// + /// + /// The organization must have a valid state to perform certain operations on the organization + /// or its members. + /// + /// REST API Reference for DeleteIdentityProviderConfiguration Operation + public virtual Task DeleteIdentityProviderConfigurationAsync(DeleteIdentityProviderConfigurationRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = DeleteIdentityProviderConfigurationRequestMarshaller.Instance; + options.ResponseUnmarshaller = DeleteIdentityProviderConfigurationResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + #region DeleteImpersonationRole @@ -2115,6 +2290,69 @@ public virtual DeleteOrganizationResponse DeleteOrganization(DeleteOrganizationR #endregion + #region DeletePersonalAccessToken + + + /// + /// Deletes the Personal Access Token from the provided WorkMail Organization. + /// + /// Container for the necessary parameters to execute the DeletePersonalAccessToken service method. + /// + /// The response from the DeletePersonalAccessToken service method, as returned by WorkMail. + /// + /// One or more of the input parameters don't match the service's restrictions. + /// + /// + /// An operation received a valid organization identifier that either doesn't belong or + /// exist in the system. + /// + /// + /// The organization must have a valid state to perform certain operations on the organization + /// or its members. + /// + /// REST API Reference for DeletePersonalAccessToken Operation + public virtual DeletePersonalAccessTokenResponse DeletePersonalAccessToken(DeletePersonalAccessTokenRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = DeletePersonalAccessTokenRequestMarshaller.Instance; + options.ResponseUnmarshaller = DeletePersonalAccessTokenResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// Deletes the Personal Access Token from the provided WorkMail Organization. + /// + /// Container for the necessary parameters to execute the DeletePersonalAccessToken service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the DeletePersonalAccessToken service method, as returned by WorkMail. + /// + /// One or more of the input parameters don't match the service's restrictions. + /// + /// + /// An operation received a valid organization identifier that either doesn't belong or + /// exist in the system. + /// + /// + /// The organization must have a valid state to perform certain operations on the organization + /// or its members. + /// + /// REST API Reference for DeletePersonalAccessToken Operation + public virtual Task DeletePersonalAccessTokenAsync(DeletePersonalAccessTokenRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = DeletePersonalAccessTokenRequestMarshaller.Instance; + options.ResponseUnmarshaller = DeletePersonalAccessTokenResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + #region DeleteResource @@ -2733,6 +2971,75 @@ public virtual DescribeGroupResponse DescribeGroup(DescribeGroupRequest request) #endregion + #region DescribeIdentityProviderConfiguration + + + /// + /// Returns detailed information on the current IdC setup for the WorkMail organization. + /// + /// Container for the necessary parameters to execute the DescribeIdentityProviderConfiguration service method. + /// + /// The response from the DescribeIdentityProviderConfiguration service method, as returned by WorkMail. + /// + /// One or more of the input parameters don't match the service's restrictions. + /// + /// + /// An operation received a valid organization identifier that either doesn't belong or + /// exist in the system. + /// + /// + /// The organization must have a valid state to perform certain operations on the organization + /// or its members. + /// + /// + /// The resource cannot be found. + /// + /// REST API Reference for DescribeIdentityProviderConfiguration Operation + public virtual DescribeIdentityProviderConfigurationResponse DescribeIdentityProviderConfiguration(DescribeIdentityProviderConfigurationRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = DescribeIdentityProviderConfigurationRequestMarshaller.Instance; + options.ResponseUnmarshaller = DescribeIdentityProviderConfigurationResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// Returns detailed information on the current IdC setup for the WorkMail organization. + /// + /// Container for the necessary parameters to execute the DescribeIdentityProviderConfiguration service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the DescribeIdentityProviderConfiguration service method, as returned by WorkMail. + /// + /// One or more of the input parameters don't match the service's restrictions. + /// + /// + /// An operation received a valid organization identifier that either doesn't belong or + /// exist in the system. + /// + /// + /// The organization must have a valid state to perform certain operations on the organization + /// or its members. + /// + /// + /// The resource cannot be found. + /// + /// REST API Reference for DescribeIdentityProviderConfiguration Operation + public virtual Task DescribeIdentityProviderConfigurationAsync(DescribeIdentityProviderConfigurationRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = DescribeIdentityProviderConfigurationRequestMarshaller.Instance; + options.ResponseUnmarshaller = DescribeIdentityProviderConfigurationResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + #region DescribeInboundDmarcSettings @@ -2998,6 +3305,12 @@ public virtual DescribeResourceResponse DescribeResource(DescribeResourceRequest /// Container for the necessary parameters to execute the DescribeUser service method. /// /// The response from the DescribeUser service method, as returned by WorkMail. + /// + /// The directory service doesn't recognize the credentials supplied by WorkMail. + /// + /// + /// The directory is unavailable. It might be located in another Region or deleted. + /// /// /// The identifier supplied for the user, group, or resource does not exist in your organization. /// @@ -3032,6 +3345,12 @@ public virtual DescribeUserResponse DescribeUser(DescribeUserRequest request) /// /// /// The response from the DescribeUser service method, as returned by WorkMail. + /// + /// The directory service doesn't recognize the credentials supplied by WorkMail. + /// + /// + /// The directory is unavailable. It might be located in another Region or deleted. + /// /// /// The identifier supplied for the user, group, or resource does not exist in your organization. /// @@ -3822,6 +4141,75 @@ public virtual GetMobileDeviceAccessOverrideResponse GetMobileDeviceAccessOverri #endregion + #region GetPersonalAccessTokenMetadata + + + /// + /// Requests details of a specific Personal Access Token within the WorkMail organization. + /// + /// Container for the necessary parameters to execute the GetPersonalAccessTokenMetadata service method. + /// + /// The response from the GetPersonalAccessTokenMetadata service method, as returned by WorkMail. + /// + /// One or more of the input parameters don't match the service's restrictions. + /// + /// + /// An operation received a valid organization identifier that either doesn't belong or + /// exist in the system. + /// + /// + /// The organization must have a valid state to perform certain operations on the organization + /// or its members. + /// + /// + /// The resource cannot be found. + /// + /// REST API Reference for GetPersonalAccessTokenMetadata Operation + public virtual GetPersonalAccessTokenMetadataResponse GetPersonalAccessTokenMetadata(GetPersonalAccessTokenMetadataRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = GetPersonalAccessTokenMetadataRequestMarshaller.Instance; + options.ResponseUnmarshaller = GetPersonalAccessTokenMetadataResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// Requests details of a specific Personal Access Token within the WorkMail organization. + /// + /// Container for the necessary parameters to execute the GetPersonalAccessTokenMetadata service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the GetPersonalAccessTokenMetadata service method, as returned by WorkMail. + /// + /// One or more of the input parameters don't match the service's restrictions. + /// + /// + /// An operation received a valid organization identifier that either doesn't belong or + /// exist in the system. + /// + /// + /// The organization must have a valid state to perform certain operations on the organization + /// or its members. + /// + /// + /// The resource cannot be found. + /// + /// REST API Reference for GetPersonalAccessTokenMetadata Operation + public virtual Task GetPersonalAccessTokenMetadataAsync(GetPersonalAccessTokenMetadataRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = GetPersonalAccessTokenMetadataRequestMarshaller.Instance; + options.ResponseUnmarshaller = GetPersonalAccessTokenMetadataResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + #region ListAccessControlRules @@ -3965,6 +4353,9 @@ public virtual ListAliasesResponse ListAliases(ListAliasesRequest request) /// Container for the necessary parameters to execute the ListAvailabilityConfigurations service method. /// /// The response from the ListAvailabilityConfigurations service method, as returned by WorkMail. + /// + /// One or more of the input parameters don't match the service's restrictions. + /// /// /// An operation received a valid organization identifier that either doesn't belong or /// exist in the system. @@ -3993,6 +4384,9 @@ public virtual ListAvailabilityConfigurationsResponse ListAvailabilityConfigurat /// /// /// The response from the ListAvailabilityConfigurations service method, as returned by WorkMail. + /// + /// One or more of the input parameters don't match the service's restrictions. + /// /// /// An operation received a valid organization identifier that either doesn't belong or /// exist in the system. @@ -4679,6 +5073,83 @@ public virtual ListOrganizationsResponse ListOrganizations(ListOrganizationsRequ #endregion + #region ListPersonalAccessTokens + + + /// + /// Returns a summary of your Personal Access Tokens. + /// + /// Container for the necessary parameters to execute the ListPersonalAccessTokens service method. + /// + /// The response from the ListPersonalAccessTokens service method, as returned by WorkMail. + /// + /// The identifier supplied for the user, group, or resource does not exist in your organization. + /// + /// + /// You are performing an operation on a user, group, or resource that isn't in the expected + /// state, such as trying to delete an active user. + /// + /// + /// One or more of the input parameters don't match the service's restrictions. + /// + /// + /// An operation received a valid organization identifier that either doesn't belong or + /// exist in the system. + /// + /// + /// The organization must have a valid state to perform certain operations on the organization + /// or its members. + /// + /// REST API Reference for ListPersonalAccessTokens Operation + public virtual ListPersonalAccessTokensResponse ListPersonalAccessTokens(ListPersonalAccessTokensRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = ListPersonalAccessTokensRequestMarshaller.Instance; + options.ResponseUnmarshaller = ListPersonalAccessTokensResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// Returns a summary of your Personal Access Tokens. + /// + /// Container for the necessary parameters to execute the ListPersonalAccessTokens service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the ListPersonalAccessTokens service method, as returned by WorkMail. + /// + /// The identifier supplied for the user, group, or resource does not exist in your organization. + /// + /// + /// You are performing an operation on a user, group, or resource that isn't in the expected + /// state, such as trying to delete an active user. + /// + /// + /// One or more of the input parameters don't match the service's restrictions. + /// + /// + /// An operation received a valid organization identifier that either doesn't belong or + /// exist in the system. + /// + /// + /// The organization must have a valid state to perform certain operations on the organization + /// or its members. + /// + /// REST API Reference for ListPersonalAccessTokens Operation + public virtual Task ListPersonalAccessTokensAsync(ListPersonalAccessTokensRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = ListPersonalAccessTokensRequestMarshaller.Instance; + options.ResponseUnmarshaller = ListPersonalAccessTokensResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + #region ListResourceDelegates @@ -5099,6 +5570,83 @@ public virtual PutEmailMonitoringConfigurationResponse PutEmailMonitoringConfigu #endregion + #region PutIdentityProviderConfiguration + + + /// + /// Enables integration between IAM Identity Center (IdC) and WorkMail to proxy authentication + /// requests for mailbox users. You can connect your IdC directory or your external directory + /// to WorkMail through IdC and manage access to WorkMail mailboxes in a single place. + /// For enhanced protection, you could enable Multifactor Authentication (MFA) and Personal + /// Access Tokens. + /// + /// Container for the necessary parameters to execute the PutIdentityProviderConfiguration service method. + /// + /// The response from the PutIdentityProviderConfiguration service method, as returned by WorkMail. + /// + /// One or more of the input parameters don't match the service's restrictions. + /// + /// + /// An operation received a valid organization identifier that either doesn't belong or + /// exist in the system. + /// + /// + /// The organization must have a valid state to perform certain operations on the organization + /// or its members. + /// + /// + /// The resource cannot be found. + /// + /// REST API Reference for PutIdentityProviderConfiguration Operation + public virtual PutIdentityProviderConfigurationResponse PutIdentityProviderConfiguration(PutIdentityProviderConfigurationRequest request) + { + var options = new InvokeOptions(); + options.RequestMarshaller = PutIdentityProviderConfigurationRequestMarshaller.Instance; + options.ResponseUnmarshaller = PutIdentityProviderConfigurationResponseUnmarshaller.Instance; + + return Invoke(request, options); + } + + + /// + /// Enables integration between IAM Identity Center (IdC) and WorkMail to proxy authentication + /// requests for mailbox users. You can connect your IdC directory or your external directory + /// to WorkMail through IdC and manage access to WorkMail mailboxes in a single place. + /// For enhanced protection, you could enable Multifactor Authentication (MFA) and Personal + /// Access Tokens. + /// + /// Container for the necessary parameters to execute the PutIdentityProviderConfiguration service method. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// + /// The response from the PutIdentityProviderConfiguration service method, as returned by WorkMail. + /// + /// One or more of the input parameters don't match the service's restrictions. + /// + /// + /// An operation received a valid organization identifier that either doesn't belong or + /// exist in the system. + /// + /// + /// The organization must have a valid state to perform certain operations on the organization + /// or its members. + /// + /// + /// The resource cannot be found. + /// + /// REST API Reference for PutIdentityProviderConfiguration Operation + public virtual Task PutIdentityProviderConfigurationAsync(PutIdentityProviderConfigurationRequest request, System.Threading.CancellationToken cancellationToken = default(CancellationToken)) + { + var options = new InvokeOptions(); + options.RequestMarshaller = PutIdentityProviderConfigurationRequestMarshaller.Instance; + options.ResponseUnmarshaller = PutIdentityProviderConfigurationResponseUnmarshaller.Instance; + + return InvokeAsync(request, options, cancellationToken); + } + + #endregion + #region PutInboundDmarcSettings @@ -6148,7 +6696,7 @@ public virtual UpdateDefaultMailDomainResponse UpdateDefaultMailDomain(UpdateDef /// - /// Updates attibutes in a group. + /// Updates attributes in a group. /// /// Container for the necessary parameters to execute the UpdateGroup service method. /// @@ -6186,7 +6734,7 @@ public virtual UpdateGroupResponse UpdateGroup(UpdateGroupRequest request) /// - /// Updates attibutes in a group. + /// Updates attributes in a group. /// /// Container for the necessary parameters to execute the UpdateGroup service method. /// diff --git a/sdk/src/Services/WorkMail/Properties/AssemblyInfo.cs b/sdk/src/Services/WorkMail/Properties/AssemblyInfo.cs index 87f035da582d..e099f506eb05 100644 --- a/sdk/src/Services/WorkMail/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/WorkMail/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.10")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/WorkMail/WorkMail.sln b/sdk/src/Services/WorkMail/WorkMail.sln index 17199fb15234..91390ae97819 100644 --- a/sdk/src/Services/WorkMail/WorkMail.sln +++ b/sdk/src/Services/WorkMail/WorkMail.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {A4CEED83-37DA-4DA2-B4F5-61D175D98276}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {A4CEED83-37DA-4DA2-B4F5-61D175D98276}.Debug|Any CPU.Build.0 = Debug|Any CPU {A4CEED83-37DA-4DA2-B4F5-61D175D98276}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {3087CEA2-75F0-4DB9-82AC-ACB3D9AA91F5}.Debug|Any CPU.Build.0 = Debug|Any CPU {3087CEA2-75F0-4DB9-82AC-ACB3D9AA91F5}.Release|Any CPU.ActiveCfg = Release|Any CPU {3087CEA2-75F0-4DB9-82AC-ACB3D9AA91F5}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {569C6152-F67D-4505-A6E6-78D4C13D2CA7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {569C6152-F67D-4505-A6E6-78D4C13D2CA7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {569C6152-F67D-4505-A6E6-78D4C13D2CA7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {569C6152-F67D-4505-A6E6-78D4C13D2CA7}.Release|Any CPU.Build.0 = Release|Any CPU - {B1907062-EC23-4ADD-9DB6-F08599B788BC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B1907062-EC23-4ADD-9DB6-F08599B788BC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B1907062-EC23-4ADD-9DB6-F08599B788BC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B1907062-EC23-4ADD-9DB6-F08599B788BC}.Release|Any CPU.Build.0 = Release|Any CPU - {12407C02-E3E8-4838-BFD7-DED3C4518B8C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {12407C02-E3E8-4838-BFD7-DED3C4518B8C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {12407C02-E3E8-4838-BFD7-DED3C4518B8C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {12407C02-E3E8-4838-BFD7-DED3C4518B8C}.Release|Any CPU.Build.0 = Release|Any CPU - {5C9FFF4F-CD0B-475F-9909-6289E3898A5C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5C9FFF4F-CD0B-475F-9909-6289E3898A5C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5C9FFF4F-CD0B-475F-9909-6289E3898A5C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5C9FFF4F-CD0B-475F-9909-6289E3898A5C}.Release|Any CPU.Build.0 = Release|Any CPU - {C7F9CAF2-540B-4A5E-AA46-D7FCDF20CE8F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C7F9CAF2-540B-4A5E-AA46-D7FCDF20CE8F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C7F9CAF2-540B-4A5E-AA46-D7FCDF20CE8F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C7F9CAF2-540B-4A5E-AA46-D7FCDF20CE8F}.Release|Any CPU.Build.0 = Release|Any CPU - {A74A40D7-A1E0-4F3B-92A5-B6608049CE7E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A74A40D7-A1E0-4F3B-92A5-B6608049CE7E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A74A40D7-A1E0-4F3B-92A5-B6608049CE7E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A74A40D7-A1E0-4F3B-92A5-B6608049CE7E}.Release|Any CPU.Build.0 = Release|Any CPU - {6C4DEAC6-1304-41AB-A9A6-648272BB7240}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6C4DEAC6-1304-41AB-A9A6-648272BB7240}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6C4DEAC6-1304-41AB-A9A6-648272BB7240}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6C4DEAC6-1304-41AB-A9A6-648272BB7240}.Release|Any CPU.Build.0 = Release|Any CPU - {C8853676-278E-4FD4-B22C-84B019CBEECB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C8853676-278E-4FD4-B22C-84B019CBEECB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C8853676-278E-4FD4-B22C-84B019CBEECB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C8853676-278E-4FD4-B22C-84B019CBEECB}.Release|Any CPU.Build.0 = Release|Any CPU - {1FD93E89-DAD9-4A17-AA45-F3BD4FC42051}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1FD93E89-DAD9-4A17-AA45-F3BD4FC42051}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1FD93E89-DAD9-4A17-AA45-F3BD4FC42051}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1FD93E89-DAD9-4A17-AA45-F3BD4FC42051}.Release|Any CPU.Build.0 = Release|Any CPU - {B7BA4D86-2593-48EE-ACD7-CD613F00000E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B7BA4D86-2593-48EE-ACD7-CD613F00000E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B7BA4D86-2593-48EE-ACD7-CD613F00000E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B7BA4D86-2593-48EE-ACD7-CD613F00000E}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {569C6152-F67D-4505-A6E6-78D4C13D2CA7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {569C6152-F67D-4505-A6E6-78D4C13D2CA7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {569C6152-F67D-4505-A6E6-78D4C13D2CA7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {569C6152-F67D-4505-A6E6-78D4C13D2CA7}.Release|Any CPU.Build.0 = Release|Any CPU - {B1907062-EC23-4ADD-9DB6-F08599B788BC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B1907062-EC23-4ADD-9DB6-F08599B788BC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B1907062-EC23-4ADD-9DB6-F08599B788BC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B1907062-EC23-4ADD-9DB6-F08599B788BC}.Release|Any CPU.Build.0 = Release|Any CPU - {12407C02-E3E8-4838-BFD7-DED3C4518B8C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {12407C02-E3E8-4838-BFD7-DED3C4518B8C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {12407C02-E3E8-4838-BFD7-DED3C4518B8C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {12407C02-E3E8-4838-BFD7-DED3C4518B8C}.Release|Any CPU.Build.0 = Release|Any CPU - {5C9FFF4F-CD0B-475F-9909-6289E3898A5C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5C9FFF4F-CD0B-475F-9909-6289E3898A5C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5C9FFF4F-CD0B-475F-9909-6289E3898A5C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5C9FFF4F-CD0B-475F-9909-6289E3898A5C}.Release|Any CPU.Build.0 = Release|Any CPU - {C7F9CAF2-540B-4A5E-AA46-D7FCDF20CE8F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C7F9CAF2-540B-4A5E-AA46-D7FCDF20CE8F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C7F9CAF2-540B-4A5E-AA46-D7FCDF20CE8F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C7F9CAF2-540B-4A5E-AA46-D7FCDF20CE8F}.Release|Any CPU.Build.0 = Release|Any CPU - {A74A40D7-A1E0-4F3B-92A5-B6608049CE7E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A74A40D7-A1E0-4F3B-92A5-B6608049CE7E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A74A40D7-A1E0-4F3B-92A5-B6608049CE7E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A74A40D7-A1E0-4F3B-92A5-B6608049CE7E}.Release|Any CPU.Build.0 = Release|Any CPU - {6C4DEAC6-1304-41AB-A9A6-648272BB7240}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6C4DEAC6-1304-41AB-A9A6-648272BB7240}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6C4DEAC6-1304-41AB-A9A6-648272BB7240}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6C4DEAC6-1304-41AB-A9A6-648272BB7240}.Release|Any CPU.Build.0 = Release|Any CPU - {C8853676-278E-4FD4-B22C-84B019CBEECB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C8853676-278E-4FD4-B22C-84B019CBEECB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C8853676-278E-4FD4-B22C-84B019CBEECB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C8853676-278E-4FD4-B22C-84B019CBEECB}.Release|Any CPU.Build.0 = Release|Any CPU - {1FD93E89-DAD9-4A17-AA45-F3BD4FC42051}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1FD93E89-DAD9-4A17-AA45-F3BD4FC42051}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1FD93E89-DAD9-4A17-AA45-F3BD4FC42051}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1FD93E89-DAD9-4A17-AA45-F3BD4FC42051}.Release|Any CPU.Build.0 = Release|Any CPU - {B7BA4D86-2593-48EE-ACD7-CD613F00000E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B7BA4D86-2593-48EE-ACD7-CD613F00000E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B7BA4D86-2593-48EE-ACD7-CD613F00000E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B7BA4D86-2593-48EE-ACD7-CD613F00000E}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {A4CEED83-37DA-4DA2-B4F5-61D175D98276} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {F28418D8-1DB7-4CFD-8693-AE86F2F914FF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {B8C341B8-9421-41F7-9480-473B8A9F229D} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {B829DA56-FC70-495B-A4B1-644F6D033490} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {3087CEA2-75F0-4DB9-82AC-ACB3D9AA91F5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {569C6152-F67D-4505-A6E6-78D4C13D2CA7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B1907062-EC23-4ADD-9DB6-F08599B788BC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {12407C02-E3E8-4838-BFD7-DED3C4518B8C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {5C9FFF4F-CD0B-475F-9909-6289E3898A5C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C7F9CAF2-540B-4A5E-AA46-D7FCDF20CE8F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A74A40D7-A1E0-4F3B-92A5-B6608049CE7E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6C4DEAC6-1304-41AB-A9A6-648272BB7240} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C8853676-278E-4FD4-B22C-84B019CBEECB} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {1FD93E89-DAD9-4A17-AA45-F3BD4FC42051} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B7BA4D86-2593-48EE-ACD7-CD613F00000E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {569C6152-F67D-4505-A6E6-78D4C13D2CA7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B1907062-EC23-4ADD-9DB6-F08599B788BC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {12407C02-E3E8-4838-BFD7-DED3C4518B8C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {5C9FFF4F-CD0B-475F-9909-6289E3898A5C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C7F9CAF2-540B-4A5E-AA46-D7FCDF20CE8F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A74A40D7-A1E0-4F3B-92A5-B6608049CE7E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6C4DEAC6-1304-41AB-A9A6-648272BB7240} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C8853676-278E-4FD4-B22C-84B019CBEECB} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {1FD93E89-DAD9-4A17-AA45-F3BD4FC42051} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B7BA4D86-2593-48EE-ACD7-CD613F00000E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {CA7392D3-6320-40D5-9918-2EC83CF474F5} diff --git a/sdk/src/Services/WorkMailMessageFlow/Generated/AmazonWorkMailMessageFlowConfig.cs b/sdk/src/Services/WorkMailMessageFlow/Generated/AmazonWorkMailMessageFlowConfig.cs index f590d0697192..84c925aabf61 100644 --- a/sdk/src/Services/WorkMailMessageFlow/Generated/AmazonWorkMailMessageFlowConfig.cs +++ b/sdk/src/Services/WorkMailMessageFlow/Generated/AmazonWorkMailMessageFlowConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.WorkMailMessageFlow public partial class AmazonWorkMailMessageFlowConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("WorkMailMessageFlow", "4.0.0.0"); private static readonly AmazonWorkMailMessageFlowEndpointResolver EndpointResolver = new AmazonWorkMailMessageFlowEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("WorkMailMessageFlow", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("WorkMailMessageFlow", "3.7.400.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/WorkMailMessageFlow/Properties/AssemblyInfo.cs b/sdk/src/Services/WorkMailMessageFlow/Properties/AssemblyInfo.cs index 594ebe0eb2a9..39ac6c5e10c5 100644 --- a/sdk/src/Services/WorkMailMessageFlow/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/WorkMailMessageFlow/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/WorkMailMessageFlow/WorkMailMessageFlow.sln b/sdk/src/Services/WorkMailMessageFlow/WorkMailMessageFlow.sln index e33e5088a633..314b249a4d3f 100644 --- a/sdk/src/Services/WorkMailMessageFlow/WorkMailMessageFlow.sln +++ b/sdk/src/Services/WorkMailMessageFlow/WorkMailMessageFlow.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {824F6DB5-6F29-4BDC-8061-A59E43CD15C8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {824F6DB5-6F29-4BDC-8061-A59E43CD15C8}.Debug|Any CPU.Build.0 = Debug|Any CPU {824F6DB5-6F29-4BDC-8061-A59E43CD15C8}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {69A22F2B-56A4-4C8A-8959-42ED541AF8FA}.Debug|Any CPU.Build.0 = Debug|Any CPU {69A22F2B-56A4-4C8A-8959-42ED541AF8FA}.Release|Any CPU.ActiveCfg = Release|Any CPU {69A22F2B-56A4-4C8A-8959-42ED541AF8FA}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {6E91B540-840A-4C20-8BC0-2E0CCD2A8391}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6E91B540-840A-4C20-8BC0-2E0CCD2A8391}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6E91B540-840A-4C20-8BC0-2E0CCD2A8391}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6E91B540-840A-4C20-8BC0-2E0CCD2A8391}.Release|Any CPU.Build.0 = Release|Any CPU - {6E8FF655-914F-4897-A915-9A7DAD8B4CCB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6E8FF655-914F-4897-A915-9A7DAD8B4CCB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6E8FF655-914F-4897-A915-9A7DAD8B4CCB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6E8FF655-914F-4897-A915-9A7DAD8B4CCB}.Release|Any CPU.Build.0 = Release|Any CPU - {E95BD199-A918-4676-BB34-E3CB5F9CDE6E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E95BD199-A918-4676-BB34-E3CB5F9CDE6E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E95BD199-A918-4676-BB34-E3CB5F9CDE6E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E95BD199-A918-4676-BB34-E3CB5F9CDE6E}.Release|Any CPU.Build.0 = Release|Any CPU - {1AE69D66-1F2E-438F-AE8D-FE07D3AADD63}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1AE69D66-1F2E-438F-AE8D-FE07D3AADD63}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1AE69D66-1F2E-438F-AE8D-FE07D3AADD63}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1AE69D66-1F2E-438F-AE8D-FE07D3AADD63}.Release|Any CPU.Build.0 = Release|Any CPU - {9B55F68C-AFEA-47B6-AC96-DB9BE9F9270F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9B55F68C-AFEA-47B6-AC96-DB9BE9F9270F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9B55F68C-AFEA-47B6-AC96-DB9BE9F9270F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9B55F68C-AFEA-47B6-AC96-DB9BE9F9270F}.Release|Any CPU.Build.0 = Release|Any CPU - {DF10DA7E-8560-4BBA-B625-738FA44C62E7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DF10DA7E-8560-4BBA-B625-738FA44C62E7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DF10DA7E-8560-4BBA-B625-738FA44C62E7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DF10DA7E-8560-4BBA-B625-738FA44C62E7}.Release|Any CPU.Build.0 = Release|Any CPU - {17DF038D-BFA2-42B5-A534-F9FB3A30A88C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {17DF038D-BFA2-42B5-A534-F9FB3A30A88C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {17DF038D-BFA2-42B5-A534-F9FB3A30A88C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {17DF038D-BFA2-42B5-A534-F9FB3A30A88C}.Release|Any CPU.Build.0 = Release|Any CPU - {6B664C88-A8A1-4CA1-9289-F56BD1AA85B8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6B664C88-A8A1-4CA1-9289-F56BD1AA85B8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6B664C88-A8A1-4CA1-9289-F56BD1AA85B8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6B664C88-A8A1-4CA1-9289-F56BD1AA85B8}.Release|Any CPU.Build.0 = Release|Any CPU - {FBDE199A-5572-4942-9B92-C9832C4C45E2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FBDE199A-5572-4942-9B92-C9832C4C45E2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FBDE199A-5572-4942-9B92-C9832C4C45E2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FBDE199A-5572-4942-9B92-C9832C4C45E2}.Release|Any CPU.Build.0 = Release|Any CPU - {EE7E27DF-7CBA-4BCE-8A85-0C90B1CC163B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EE7E27DF-7CBA-4BCE-8A85-0C90B1CC163B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EE7E27DF-7CBA-4BCE-8A85-0C90B1CC163B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EE7E27DF-7CBA-4BCE-8A85-0C90B1CC163B}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {6E91B540-840A-4C20-8BC0-2E0CCD2A8391}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6E91B540-840A-4C20-8BC0-2E0CCD2A8391}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6E91B540-840A-4C20-8BC0-2E0CCD2A8391}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6E91B540-840A-4C20-8BC0-2E0CCD2A8391}.Release|Any CPU.Build.0 = Release|Any CPU - {6E8FF655-914F-4897-A915-9A7DAD8B4CCB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6E8FF655-914F-4897-A915-9A7DAD8B4CCB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6E8FF655-914F-4897-A915-9A7DAD8B4CCB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6E8FF655-914F-4897-A915-9A7DAD8B4CCB}.Release|Any CPU.Build.0 = Release|Any CPU - {E95BD199-A918-4676-BB34-E3CB5F9CDE6E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E95BD199-A918-4676-BB34-E3CB5F9CDE6E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E95BD199-A918-4676-BB34-E3CB5F9CDE6E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E95BD199-A918-4676-BB34-E3CB5F9CDE6E}.Release|Any CPU.Build.0 = Release|Any CPU - {1AE69D66-1F2E-438F-AE8D-FE07D3AADD63}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1AE69D66-1F2E-438F-AE8D-FE07D3AADD63}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1AE69D66-1F2E-438F-AE8D-FE07D3AADD63}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1AE69D66-1F2E-438F-AE8D-FE07D3AADD63}.Release|Any CPU.Build.0 = Release|Any CPU - {9B55F68C-AFEA-47B6-AC96-DB9BE9F9270F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9B55F68C-AFEA-47B6-AC96-DB9BE9F9270F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9B55F68C-AFEA-47B6-AC96-DB9BE9F9270F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9B55F68C-AFEA-47B6-AC96-DB9BE9F9270F}.Release|Any CPU.Build.0 = Release|Any CPU - {DF10DA7E-8560-4BBA-B625-738FA44C62E7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DF10DA7E-8560-4BBA-B625-738FA44C62E7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DF10DA7E-8560-4BBA-B625-738FA44C62E7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DF10DA7E-8560-4BBA-B625-738FA44C62E7}.Release|Any CPU.Build.0 = Release|Any CPU - {17DF038D-BFA2-42B5-A534-F9FB3A30A88C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {17DF038D-BFA2-42B5-A534-F9FB3A30A88C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {17DF038D-BFA2-42B5-A534-F9FB3A30A88C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {17DF038D-BFA2-42B5-A534-F9FB3A30A88C}.Release|Any CPU.Build.0 = Release|Any CPU - {6B664C88-A8A1-4CA1-9289-F56BD1AA85B8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6B664C88-A8A1-4CA1-9289-F56BD1AA85B8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6B664C88-A8A1-4CA1-9289-F56BD1AA85B8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6B664C88-A8A1-4CA1-9289-F56BD1AA85B8}.Release|Any CPU.Build.0 = Release|Any CPU - {FBDE199A-5572-4942-9B92-C9832C4C45E2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FBDE199A-5572-4942-9B92-C9832C4C45E2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FBDE199A-5572-4942-9B92-C9832C4C45E2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FBDE199A-5572-4942-9B92-C9832C4C45E2}.Release|Any CPU.Build.0 = Release|Any CPU - {EE7E27DF-7CBA-4BCE-8A85-0C90B1CC163B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EE7E27DF-7CBA-4BCE-8A85-0C90B1CC163B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EE7E27DF-7CBA-4BCE-8A85-0C90B1CC163B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EE7E27DF-7CBA-4BCE-8A85-0C90B1CC163B}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {824F6DB5-6F29-4BDC-8061-A59E43CD15C8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {09306279-C843-4AF9-A20A-15E0F1C05F2B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {561F58F2-26C9-46C1-9C0D-DC3C8A2682AB} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {88C6B964-F5AE-4C39-991A-9519F8EDC4D8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {69A22F2B-56A4-4C8A-8959-42ED541AF8FA} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {6E91B540-840A-4C20-8BC0-2E0CCD2A8391} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6E8FF655-914F-4897-A915-9A7DAD8B4CCB} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E95BD199-A918-4676-BB34-E3CB5F9CDE6E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {1AE69D66-1F2E-438F-AE8D-FE07D3AADD63} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {9B55F68C-AFEA-47B6-AC96-DB9BE9F9270F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {DF10DA7E-8560-4BBA-B625-738FA44C62E7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {17DF038D-BFA2-42B5-A534-F9FB3A30A88C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6B664C88-A8A1-4CA1-9289-F56BD1AA85B8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {FBDE199A-5572-4942-9B92-C9832C4C45E2} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {EE7E27DF-7CBA-4BCE-8A85-0C90B1CC163B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {6E91B540-840A-4C20-8BC0-2E0CCD2A8391} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6E8FF655-914F-4897-A915-9A7DAD8B4CCB} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E95BD199-A918-4676-BB34-E3CB5F9CDE6E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {1AE69D66-1F2E-438F-AE8D-FE07D3AADD63} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {9B55F68C-AFEA-47B6-AC96-DB9BE9F9270F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {DF10DA7E-8560-4BBA-B625-738FA44C62E7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {17DF038D-BFA2-42B5-A534-F9FB3A30A88C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6B664C88-A8A1-4CA1-9289-F56BD1AA85B8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {FBDE199A-5572-4942-9B92-C9832C4C45E2} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {EE7E27DF-7CBA-4BCE-8A85-0C90B1CC163B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {3C0982B0-CA50-43A9-98D8-2B4D17FA0486} diff --git a/sdk/src/Services/WorkSpaces/Generated/AmazonWorkSpacesConfig.cs b/sdk/src/Services/WorkSpaces/Generated/AmazonWorkSpacesConfig.cs index ee0ab302c019..8ebd90871369 100644 --- a/sdk/src/Services/WorkSpaces/Generated/AmazonWorkSpacesConfig.cs +++ b/sdk/src/Services/WorkSpaces/Generated/AmazonWorkSpacesConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.WorkSpaces public partial class AmazonWorkSpacesConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("WorkSpaces", "4.0.0.0"); private static readonly AmazonWorkSpacesEndpointResolver EndpointResolver = new AmazonWorkSpacesEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("WorkSpaces", "3.7.403.4"); -======= - InternalSDKUtils.BuildUserAgentString("WorkSpaces", "3.7.404.17"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/WorkSpaces/Generated/_bcl/AmazonWorkSpacesClient.cs b/sdk/src/Services/WorkSpaces/Generated/_bcl/AmazonWorkSpacesClient.cs index 324a25ceea3e..b89fda40d621 100644 --- a/sdk/src/Services/WorkSpaces/Generated/_bcl/AmazonWorkSpacesClient.cs +++ b/sdk/src/Services/WorkSpaces/Generated/_bcl/AmazonWorkSpacesClient.cs @@ -1638,8 +1638,8 @@ public virtual CreateWorkspaceImageResponse CreateWorkspaceImage(CreateWorkspace /// ///
          • /// - /// You don't need to specify the PCOIP protocol for Linux bundles because WSP - /// is the default protocol for those bundles. + /// You don't need to specify the PCOIP protocol for Linux bundles because DCV + /// (formerly WSP) is the default protocol for those bundles. /// ///
          • /// @@ -1688,8 +1688,8 @@ public virtual CreateWorkspacesResponse CreateWorkspaces(CreateWorkspacesRequest /// ///
          • /// - /// You don't need to specify the PCOIP protocol for Linux bundles because WSP - /// is the default protocol for those bundles. + /// You don't need to specify the PCOIP protocol for Linux bundles because DCV + /// (formerly WSP) is the default protocol for those bundles. /// ///
          • /// diff --git a/sdk/src/Services/WorkSpaces/Properties/AssemblyInfo.cs b/sdk/src/Services/WorkSpaces/Properties/AssemblyInfo.cs index 97d1e87291ca..cacbbed5bed3 100644 --- a/sdk/src/Services/WorkSpaces/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/WorkSpaces/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.403.4")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.404.17")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/WorkSpaces/WorkSpaces.sln b/sdk/src/Services/WorkSpaces/WorkSpaces.sln index 6899e39959cb..f8f098ea6c8c 100644 --- a/sdk/src/Services/WorkSpaces/WorkSpaces.sln +++ b/sdk/src/Services/WorkSpaces/WorkSpaces.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {8ED5D825-4944-498E-A545-E95356775670}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {8ED5D825-4944-498E-A545-E95356775670}.Debug|Any CPU.Build.0 = Debug|Any CPU {8ED5D825-4944-498E-A545-E95356775670}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {E381D639-3A31-4EEC-B33F-7F06FE413B41}.Debug|Any CPU.Build.0 = Debug|Any CPU {E381D639-3A31-4EEC-B33F-7F06FE413B41}.Release|Any CPU.ActiveCfg = Release|Any CPU {E381D639-3A31-4EEC-B33F-7F06FE413B41}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {DF8C59FE-C170-40FD-A9D1-6510E1F4E68B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DF8C59FE-C170-40FD-A9D1-6510E1F4E68B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DF8C59FE-C170-40FD-A9D1-6510E1F4E68B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DF8C59FE-C170-40FD-A9D1-6510E1F4E68B}.Release|Any CPU.Build.0 = Release|Any CPU - {856E1EED-671B-476D-AA50-8A2788948FD1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {856E1EED-671B-476D-AA50-8A2788948FD1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {856E1EED-671B-476D-AA50-8A2788948FD1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {856E1EED-671B-476D-AA50-8A2788948FD1}.Release|Any CPU.Build.0 = Release|Any CPU - {635C801F-DEE1-45B4-A1BE-BB31201F832F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {635C801F-DEE1-45B4-A1BE-BB31201F832F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {635C801F-DEE1-45B4-A1BE-BB31201F832F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {635C801F-DEE1-45B4-A1BE-BB31201F832F}.Release|Any CPU.Build.0 = Release|Any CPU - {508EF8D9-0777-47E5-BC3E-02D891494FF4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {508EF8D9-0777-47E5-BC3E-02D891494FF4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {508EF8D9-0777-47E5-BC3E-02D891494FF4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {508EF8D9-0777-47E5-BC3E-02D891494FF4}.Release|Any CPU.Build.0 = Release|Any CPU - {1F559B39-A249-486E-A2C0-44B05119B0E2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1F559B39-A249-486E-A2C0-44B05119B0E2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1F559B39-A249-486E-A2C0-44B05119B0E2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1F559B39-A249-486E-A2C0-44B05119B0E2}.Release|Any CPU.Build.0 = Release|Any CPU - {2B34B4D0-1396-4C2E-83D8-8A1A34E7D2A8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2B34B4D0-1396-4C2E-83D8-8A1A34E7D2A8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2B34B4D0-1396-4C2E-83D8-8A1A34E7D2A8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2B34B4D0-1396-4C2E-83D8-8A1A34E7D2A8}.Release|Any CPU.Build.0 = Release|Any CPU - {671A872A-E3CD-4E38-B438-5BA462069DC0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {671A872A-E3CD-4E38-B438-5BA462069DC0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {671A872A-E3CD-4E38-B438-5BA462069DC0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {671A872A-E3CD-4E38-B438-5BA462069DC0}.Release|Any CPU.Build.0 = Release|Any CPU - {7E18D1C0-A8C6-49C5-9ADD-DF3C505DA1A4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7E18D1C0-A8C6-49C5-9ADD-DF3C505DA1A4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7E18D1C0-A8C6-49C5-9ADD-DF3C505DA1A4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7E18D1C0-A8C6-49C5-9ADD-DF3C505DA1A4}.Release|Any CPU.Build.0 = Release|Any CPU - {A5768E06-4F1C-4C05-A23E-C1DD69EACE75}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A5768E06-4F1C-4C05-A23E-C1DD69EACE75}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A5768E06-4F1C-4C05-A23E-C1DD69EACE75}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A5768E06-4F1C-4C05-A23E-C1DD69EACE75}.Release|Any CPU.Build.0 = Release|Any CPU - {1C098061-FBA0-49C2-A94B-6D9BBEF8D6B7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1C098061-FBA0-49C2-A94B-6D9BBEF8D6B7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1C098061-FBA0-49C2-A94B-6D9BBEF8D6B7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1C098061-FBA0-49C2-A94B-6D9BBEF8D6B7}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {DF8C59FE-C170-40FD-A9D1-6510E1F4E68B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DF8C59FE-C170-40FD-A9D1-6510E1F4E68B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DF8C59FE-C170-40FD-A9D1-6510E1F4E68B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DF8C59FE-C170-40FD-A9D1-6510E1F4E68B}.Release|Any CPU.Build.0 = Release|Any CPU - {856E1EED-671B-476D-AA50-8A2788948FD1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {856E1EED-671B-476D-AA50-8A2788948FD1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {856E1EED-671B-476D-AA50-8A2788948FD1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {856E1EED-671B-476D-AA50-8A2788948FD1}.Release|Any CPU.Build.0 = Release|Any CPU - {635C801F-DEE1-45B4-A1BE-BB31201F832F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {635C801F-DEE1-45B4-A1BE-BB31201F832F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {635C801F-DEE1-45B4-A1BE-BB31201F832F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {635C801F-DEE1-45B4-A1BE-BB31201F832F}.Release|Any CPU.Build.0 = Release|Any CPU - {508EF8D9-0777-47E5-BC3E-02D891494FF4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {508EF8D9-0777-47E5-BC3E-02D891494FF4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {508EF8D9-0777-47E5-BC3E-02D891494FF4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {508EF8D9-0777-47E5-BC3E-02D891494FF4}.Release|Any CPU.Build.0 = Release|Any CPU - {1F559B39-A249-486E-A2C0-44B05119B0E2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1F559B39-A249-486E-A2C0-44B05119B0E2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1F559B39-A249-486E-A2C0-44B05119B0E2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1F559B39-A249-486E-A2C0-44B05119B0E2}.Release|Any CPU.Build.0 = Release|Any CPU - {2B34B4D0-1396-4C2E-83D8-8A1A34E7D2A8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2B34B4D0-1396-4C2E-83D8-8A1A34E7D2A8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2B34B4D0-1396-4C2E-83D8-8A1A34E7D2A8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2B34B4D0-1396-4C2E-83D8-8A1A34E7D2A8}.Release|Any CPU.Build.0 = Release|Any CPU - {671A872A-E3CD-4E38-B438-5BA462069DC0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {671A872A-E3CD-4E38-B438-5BA462069DC0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {671A872A-E3CD-4E38-B438-5BA462069DC0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {671A872A-E3CD-4E38-B438-5BA462069DC0}.Release|Any CPU.Build.0 = Release|Any CPU - {7E18D1C0-A8C6-49C5-9ADD-DF3C505DA1A4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7E18D1C0-A8C6-49C5-9ADD-DF3C505DA1A4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7E18D1C0-A8C6-49C5-9ADD-DF3C505DA1A4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7E18D1C0-A8C6-49C5-9ADD-DF3C505DA1A4}.Release|Any CPU.Build.0 = Release|Any CPU - {A5768E06-4F1C-4C05-A23E-C1DD69EACE75}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A5768E06-4F1C-4C05-A23E-C1DD69EACE75}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A5768E06-4F1C-4C05-A23E-C1DD69EACE75}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A5768E06-4F1C-4C05-A23E-C1DD69EACE75}.Release|Any CPU.Build.0 = Release|Any CPU - {1C098061-FBA0-49C2-A94B-6D9BBEF8D6B7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1C098061-FBA0-49C2-A94B-6D9BBEF8D6B7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1C098061-FBA0-49C2-A94B-6D9BBEF8D6B7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1C098061-FBA0-49C2-A94B-6D9BBEF8D6B7}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {8ED5D825-4944-498E-A545-E95356775670} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {CEBB8373-7119-4ABF-A8D3-9A5495891C01} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {19019605-51F8-46CC-B894-767FED073054} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {F5767EB3-787D-460B-A829-94F73EF804BD} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {E381D639-3A31-4EEC-B33F-7F06FE413B41} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {DF8C59FE-C170-40FD-A9D1-6510E1F4E68B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {856E1EED-671B-476D-AA50-8A2788948FD1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {635C801F-DEE1-45B4-A1BE-BB31201F832F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {508EF8D9-0777-47E5-BC3E-02D891494FF4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {1F559B39-A249-486E-A2C0-44B05119B0E2} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {2B34B4D0-1396-4C2E-83D8-8A1A34E7D2A8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {671A872A-E3CD-4E38-B438-5BA462069DC0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {7E18D1C0-A8C6-49C5-9ADD-DF3C505DA1A4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A5768E06-4F1C-4C05-A23E-C1DD69EACE75} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {1C098061-FBA0-49C2-A94B-6D9BBEF8D6B7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {DF8C59FE-C170-40FD-A9D1-6510E1F4E68B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {856E1EED-671B-476D-AA50-8A2788948FD1} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {635C801F-DEE1-45B4-A1BE-BB31201F832F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {508EF8D9-0777-47E5-BC3E-02D891494FF4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {1F559B39-A249-486E-A2C0-44B05119B0E2} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {2B34B4D0-1396-4C2E-83D8-8A1A34E7D2A8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {671A872A-E3CD-4E38-B438-5BA462069DC0} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {7E18D1C0-A8C6-49C5-9ADD-DF3C505DA1A4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {A5768E06-4F1C-4C05-A23E-C1DD69EACE75} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {1C098061-FBA0-49C2-A94B-6D9BBEF8D6B7} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {14BEDA74-56AC-468E-B02D-86FB05D5F8C2} diff --git a/sdk/src/Services/WorkSpacesThinClient/Generated/AmazonWorkSpacesThinClientConfig.cs b/sdk/src/Services/WorkSpacesThinClient/Generated/AmazonWorkSpacesThinClientConfig.cs index 94ec105fd407..28940efef829 100644 --- a/sdk/src/Services/WorkSpacesThinClient/Generated/AmazonWorkSpacesThinClientConfig.cs +++ b/sdk/src/Services/WorkSpacesThinClient/Generated/AmazonWorkSpacesThinClientConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.WorkSpacesThinClient public partial class AmazonWorkSpacesThinClientConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("WorkSpaces Thin Client", "4.0.0.0"); private static readonly AmazonWorkSpacesThinClientEndpointResolver EndpointResolver = new AmazonWorkSpacesThinClientEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("WorkSpaces Thin Client", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("WorkSpaces Thin Client", "3.7.400.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/WorkSpacesThinClient/Properties/AssemblyInfo.cs b/sdk/src/Services/WorkSpacesThinClient/Properties/AssemblyInfo.cs index fc15df03f41d..36912999c553 100644 --- a/sdk/src/Services/WorkSpacesThinClient/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/WorkSpacesThinClient/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/WorkSpacesThinClient/WorkSpacesThinClient.sln b/sdk/src/Services/WorkSpacesThinClient/WorkSpacesThinClient.sln index 6aac45fd1921..8ba86ec0095a 100644 --- a/sdk/src/Services/WorkSpacesThinClient/WorkSpacesThinClient.sln +++ b/sdk/src/Services/WorkSpacesThinClient/WorkSpacesThinClient.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {D4E0C00F-FC39-4007-B1B8-11E43A59E812}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {D4E0C00F-FC39-4007-B1B8-11E43A59E812}.Debug|Any CPU.Build.0 = Debug|Any CPU {D4E0C00F-FC39-4007-B1B8-11E43A59E812}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {D0685E94-DEA3-45D9-918A-900CA06C8652}.Debug|Any CPU.Build.0 = Debug|Any CPU {D0685E94-DEA3-45D9-918A-900CA06C8652}.Release|Any CPU.ActiveCfg = Release|Any CPU {D0685E94-DEA3-45D9-918A-900CA06C8652}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {CB71DC0D-1A4E-4B19-AA5E-D91136915D96}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CB71DC0D-1A4E-4B19-AA5E-D91136915D96}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CB71DC0D-1A4E-4B19-AA5E-D91136915D96}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CB71DC0D-1A4E-4B19-AA5E-D91136915D96}.Release|Any CPU.Build.0 = Release|Any CPU - {C9992A93-F0C1-4034-B5E1-961121E2965C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C9992A93-F0C1-4034-B5E1-961121E2965C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C9992A93-F0C1-4034-B5E1-961121E2965C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C9992A93-F0C1-4034-B5E1-961121E2965C}.Release|Any CPU.Build.0 = Release|Any CPU - {58D64EF8-724F-4A34-A725-57227B7D14AE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {58D64EF8-724F-4A34-A725-57227B7D14AE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {58D64EF8-724F-4A34-A725-57227B7D14AE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {58D64EF8-724F-4A34-A725-57227B7D14AE}.Release|Any CPU.Build.0 = Release|Any CPU - {91547346-24C5-4988-989E-D4C48D382633}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {91547346-24C5-4988-989E-D4C48D382633}.Debug|Any CPU.Build.0 = Debug|Any CPU - {91547346-24C5-4988-989E-D4C48D382633}.Release|Any CPU.ActiveCfg = Release|Any CPU - {91547346-24C5-4988-989E-D4C48D382633}.Release|Any CPU.Build.0 = Release|Any CPU - {95A4F59E-EA49-4724-B189-054A63E89BAF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {95A4F59E-EA49-4724-B189-054A63E89BAF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {95A4F59E-EA49-4724-B189-054A63E89BAF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {95A4F59E-EA49-4724-B189-054A63E89BAF}.Release|Any CPU.Build.0 = Release|Any CPU - {D99899E5-9AF8-4042-B44B-A0DC3E3C0743}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D99899E5-9AF8-4042-B44B-A0DC3E3C0743}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D99899E5-9AF8-4042-B44B-A0DC3E3C0743}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D99899E5-9AF8-4042-B44B-A0DC3E3C0743}.Release|Any CPU.Build.0 = Release|Any CPU - {065951D0-5543-4FCB-8963-4BDB2CEB4ECC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {065951D0-5543-4FCB-8963-4BDB2CEB4ECC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {065951D0-5543-4FCB-8963-4BDB2CEB4ECC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {065951D0-5543-4FCB-8963-4BDB2CEB4ECC}.Release|Any CPU.Build.0 = Release|Any CPU - {3B8D2BD4-9A4A-4762-A06F-B881581F767F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3B8D2BD4-9A4A-4762-A06F-B881581F767F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3B8D2BD4-9A4A-4762-A06F-B881581F767F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3B8D2BD4-9A4A-4762-A06F-B881581F767F}.Release|Any CPU.Build.0 = Release|Any CPU - {E0FE75B0-D8C7-43C2-BE64-5E5B1EF31F48}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E0FE75B0-D8C7-43C2-BE64-5E5B1EF31F48}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E0FE75B0-D8C7-43C2-BE64-5E5B1EF31F48}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E0FE75B0-D8C7-43C2-BE64-5E5B1EF31F48}.Release|Any CPU.Build.0 = Release|Any CPU - {6C957F48-43AC-47E0-B389-5DBE9064B258}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6C957F48-43AC-47E0-B389-5DBE9064B258}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6C957F48-43AC-47E0-B389-5DBE9064B258}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6C957F48-43AC-47E0-B389-5DBE9064B258}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {CB71DC0D-1A4E-4B19-AA5E-D91136915D96}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CB71DC0D-1A4E-4B19-AA5E-D91136915D96}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CB71DC0D-1A4E-4B19-AA5E-D91136915D96}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CB71DC0D-1A4E-4B19-AA5E-D91136915D96}.Release|Any CPU.Build.0 = Release|Any CPU - {C9992A93-F0C1-4034-B5E1-961121E2965C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C9992A93-F0C1-4034-B5E1-961121E2965C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C9992A93-F0C1-4034-B5E1-961121E2965C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C9992A93-F0C1-4034-B5E1-961121E2965C}.Release|Any CPU.Build.0 = Release|Any CPU - {58D64EF8-724F-4A34-A725-57227B7D14AE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {58D64EF8-724F-4A34-A725-57227B7D14AE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {58D64EF8-724F-4A34-A725-57227B7D14AE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {58D64EF8-724F-4A34-A725-57227B7D14AE}.Release|Any CPU.Build.0 = Release|Any CPU - {91547346-24C5-4988-989E-D4C48D382633}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {91547346-24C5-4988-989E-D4C48D382633}.Debug|Any CPU.Build.0 = Debug|Any CPU - {91547346-24C5-4988-989E-D4C48D382633}.Release|Any CPU.ActiveCfg = Release|Any CPU - {91547346-24C5-4988-989E-D4C48D382633}.Release|Any CPU.Build.0 = Release|Any CPU - {95A4F59E-EA49-4724-B189-054A63E89BAF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {95A4F59E-EA49-4724-B189-054A63E89BAF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {95A4F59E-EA49-4724-B189-054A63E89BAF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {95A4F59E-EA49-4724-B189-054A63E89BAF}.Release|Any CPU.Build.0 = Release|Any CPU - {D99899E5-9AF8-4042-B44B-A0DC3E3C0743}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D99899E5-9AF8-4042-B44B-A0DC3E3C0743}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D99899E5-9AF8-4042-B44B-A0DC3E3C0743}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D99899E5-9AF8-4042-B44B-A0DC3E3C0743}.Release|Any CPU.Build.0 = Release|Any CPU - {065951D0-5543-4FCB-8963-4BDB2CEB4ECC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {065951D0-5543-4FCB-8963-4BDB2CEB4ECC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {065951D0-5543-4FCB-8963-4BDB2CEB4ECC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {065951D0-5543-4FCB-8963-4BDB2CEB4ECC}.Release|Any CPU.Build.0 = Release|Any CPU - {3B8D2BD4-9A4A-4762-A06F-B881581F767F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3B8D2BD4-9A4A-4762-A06F-B881581F767F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3B8D2BD4-9A4A-4762-A06F-B881581F767F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3B8D2BD4-9A4A-4762-A06F-B881581F767F}.Release|Any CPU.Build.0 = Release|Any CPU - {E0FE75B0-D8C7-43C2-BE64-5E5B1EF31F48}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E0FE75B0-D8C7-43C2-BE64-5E5B1EF31F48}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E0FE75B0-D8C7-43C2-BE64-5E5B1EF31F48}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E0FE75B0-D8C7-43C2-BE64-5E5B1EF31F48}.Release|Any CPU.Build.0 = Release|Any CPU - {6C957F48-43AC-47E0-B389-5DBE9064B258}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6C957F48-43AC-47E0-B389-5DBE9064B258}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6C957F48-43AC-47E0-B389-5DBE9064B258}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6C957F48-43AC-47E0-B389-5DBE9064B258}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {D4E0C00F-FC39-4007-B1B8-11E43A59E812} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {0C080E19-954A-45FB-B68C-7EC824941B03} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {5165DED7-2B19-4056-9E92-A95724BBA5C5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {375DA399-C2C1-4001-9FE1-0B397EDD3989} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {D0685E94-DEA3-45D9-918A-900CA06C8652} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {CB71DC0D-1A4E-4B19-AA5E-D91136915D96} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C9992A93-F0C1-4034-B5E1-961121E2965C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {58D64EF8-724F-4A34-A725-57227B7D14AE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {91547346-24C5-4988-989E-D4C48D382633} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {95A4F59E-EA49-4724-B189-054A63E89BAF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D99899E5-9AF8-4042-B44B-A0DC3E3C0743} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {065951D0-5543-4FCB-8963-4BDB2CEB4ECC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {3B8D2BD4-9A4A-4762-A06F-B881581F767F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E0FE75B0-D8C7-43C2-BE64-5E5B1EF31F48} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6C957F48-43AC-47E0-B389-5DBE9064B258} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {CB71DC0D-1A4E-4B19-AA5E-D91136915D96} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {C9992A93-F0C1-4034-B5E1-961121E2965C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {58D64EF8-724F-4A34-A725-57227B7D14AE} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {91547346-24C5-4988-989E-D4C48D382633} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {95A4F59E-EA49-4724-B189-054A63E89BAF} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D99899E5-9AF8-4042-B44B-A0DC3E3C0743} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {065951D0-5543-4FCB-8963-4BDB2CEB4ECC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {3B8D2BD4-9A4A-4762-A06F-B881581F767F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E0FE75B0-D8C7-43C2-BE64-5E5B1EF31F48} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {6C957F48-43AC-47E0-B389-5DBE9064B258} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {D69AFDCF-5FBC-4EFF-B704-6D17DE01D334} diff --git a/sdk/src/Services/WorkSpacesWeb/Generated/AmazonWorkSpacesWebConfig.cs b/sdk/src/Services/WorkSpacesWeb/Generated/AmazonWorkSpacesWebConfig.cs index 241316602b5b..97e0006cb77d 100644 --- a/sdk/src/Services/WorkSpacesWeb/Generated/AmazonWorkSpacesWebConfig.cs +++ b/sdk/src/Services/WorkSpacesWeb/Generated/AmazonWorkSpacesWebConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.WorkSpacesWeb public partial class AmazonWorkSpacesWebConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("WorkSpaces Web", "4.0.0.0"); private static readonly AmazonWorkSpacesWebEndpointResolver EndpointResolver = new AmazonWorkSpacesWebEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("WorkSpaces Web", "3.7.401.5"); -======= - InternalSDKUtils.BuildUserAgentString("WorkSpaces Web", "3.7.401.32"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/WorkSpacesWeb/Properties/AssemblyInfo.cs b/sdk/src/Services/WorkSpacesWeb/Properties/AssemblyInfo.cs index 0381175245b1..8feb1401b962 100644 --- a/sdk/src/Services/WorkSpacesWeb/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/WorkSpacesWeb/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.5")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.401.32")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/WorkSpacesWeb/WorkSpacesWeb.sln b/sdk/src/Services/WorkSpacesWeb/WorkSpacesWeb.sln index 8f3000df8ff4..73f0ab8224b2 100644 --- a/sdk/src/Services/WorkSpacesWeb/WorkSpacesWeb.sln +++ b/sdk/src/Services/WorkSpacesWeb/WorkSpacesWeb.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {E8B32154-EFF8-4D8C-92C3-F166E59C7568}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {E8B32154-EFF8-4D8C-92C3-F166E59C7568}.Debug|Any CPU.Build.0 = Debug|Any CPU {E8B32154-EFF8-4D8C-92C3-F166E59C7568}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {287D337A-0FCA-416B-B220-07E8C25EF686}.Debug|Any CPU.Build.0 = Debug|Any CPU {287D337A-0FCA-416B-B220-07E8C25EF686}.Release|Any CPU.ActiveCfg = Release|Any CPU {287D337A-0FCA-416B-B220-07E8C25EF686}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {CEB59570-0F01-4EBC-8029-243878BB4B67}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CEB59570-0F01-4EBC-8029-243878BB4B67}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CEB59570-0F01-4EBC-8029-243878BB4B67}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CEB59570-0F01-4EBC-8029-243878BB4B67}.Release|Any CPU.Build.0 = Release|Any CPU - {D68EB485-3441-463B-BD54-054E8DB01603}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D68EB485-3441-463B-BD54-054E8DB01603}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D68EB485-3441-463B-BD54-054E8DB01603}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D68EB485-3441-463B-BD54-054E8DB01603}.Release|Any CPU.Build.0 = Release|Any CPU - {F0E22947-A246-439D-B465-C7A217A9A704}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F0E22947-A246-439D-B465-C7A217A9A704}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F0E22947-A246-439D-B465-C7A217A9A704}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F0E22947-A246-439D-B465-C7A217A9A704}.Release|Any CPU.Build.0 = Release|Any CPU - {E80D8ADC-F879-43B7-9EA2-06823FEBA96B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E80D8ADC-F879-43B7-9EA2-06823FEBA96B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E80D8ADC-F879-43B7-9EA2-06823FEBA96B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E80D8ADC-F879-43B7-9EA2-06823FEBA96B}.Release|Any CPU.Build.0 = Release|Any CPU - {7D8DB080-16CE-4DBD-B3FF-33E511065137}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7D8DB080-16CE-4DBD-B3FF-33E511065137}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7D8DB080-16CE-4DBD-B3FF-33E511065137}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7D8DB080-16CE-4DBD-B3FF-33E511065137}.Release|Any CPU.Build.0 = Release|Any CPU - {B349F86E-E254-4E95-A8E6-2E64C17AC769}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B349F86E-E254-4E95-A8E6-2E64C17AC769}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B349F86E-E254-4E95-A8E6-2E64C17AC769}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B349F86E-E254-4E95-A8E6-2E64C17AC769}.Release|Any CPU.Build.0 = Release|Any CPU - {5C5661C0-8799-4EEA-975B-2316BEE873C8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5C5661C0-8799-4EEA-975B-2316BEE873C8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5C5661C0-8799-4EEA-975B-2316BEE873C8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5C5661C0-8799-4EEA-975B-2316BEE873C8}.Release|Any CPU.Build.0 = Release|Any CPU - {8A2159E8-743B-45A7-901F-8700544AE1BB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8A2159E8-743B-45A7-901F-8700544AE1BB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8A2159E8-743B-45A7-901F-8700544AE1BB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8A2159E8-743B-45A7-901F-8700544AE1BB}.Release|Any CPU.Build.0 = Release|Any CPU - {5A0B9481-CB68-4781-8EEF-9EFC9E2B00E8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5A0B9481-CB68-4781-8EEF-9EFC9E2B00E8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5A0B9481-CB68-4781-8EEF-9EFC9E2B00E8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5A0B9481-CB68-4781-8EEF-9EFC9E2B00E8}.Release|Any CPU.Build.0 = Release|Any CPU - {83417CB1-949B-47A9-97CA-893700574AA5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {83417CB1-949B-47A9-97CA-893700574AA5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {83417CB1-949B-47A9-97CA-893700574AA5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {83417CB1-949B-47A9-97CA-893700574AA5}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {CEB59570-0F01-4EBC-8029-243878BB4B67}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CEB59570-0F01-4EBC-8029-243878BB4B67}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CEB59570-0F01-4EBC-8029-243878BB4B67}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CEB59570-0F01-4EBC-8029-243878BB4B67}.Release|Any CPU.Build.0 = Release|Any CPU - {D68EB485-3441-463B-BD54-054E8DB01603}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D68EB485-3441-463B-BD54-054E8DB01603}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D68EB485-3441-463B-BD54-054E8DB01603}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D68EB485-3441-463B-BD54-054E8DB01603}.Release|Any CPU.Build.0 = Release|Any CPU - {F0E22947-A246-439D-B465-C7A217A9A704}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F0E22947-A246-439D-B465-C7A217A9A704}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F0E22947-A246-439D-B465-C7A217A9A704}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F0E22947-A246-439D-B465-C7A217A9A704}.Release|Any CPU.Build.0 = Release|Any CPU - {E80D8ADC-F879-43B7-9EA2-06823FEBA96B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E80D8ADC-F879-43B7-9EA2-06823FEBA96B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E80D8ADC-F879-43B7-9EA2-06823FEBA96B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E80D8ADC-F879-43B7-9EA2-06823FEBA96B}.Release|Any CPU.Build.0 = Release|Any CPU - {7D8DB080-16CE-4DBD-B3FF-33E511065137}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7D8DB080-16CE-4DBD-B3FF-33E511065137}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7D8DB080-16CE-4DBD-B3FF-33E511065137}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7D8DB080-16CE-4DBD-B3FF-33E511065137}.Release|Any CPU.Build.0 = Release|Any CPU - {B349F86E-E254-4E95-A8E6-2E64C17AC769}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B349F86E-E254-4E95-A8E6-2E64C17AC769}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B349F86E-E254-4E95-A8E6-2E64C17AC769}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B349F86E-E254-4E95-A8E6-2E64C17AC769}.Release|Any CPU.Build.0 = Release|Any CPU - {5C5661C0-8799-4EEA-975B-2316BEE873C8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5C5661C0-8799-4EEA-975B-2316BEE873C8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5C5661C0-8799-4EEA-975B-2316BEE873C8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5C5661C0-8799-4EEA-975B-2316BEE873C8}.Release|Any CPU.Build.0 = Release|Any CPU - {8A2159E8-743B-45A7-901F-8700544AE1BB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8A2159E8-743B-45A7-901F-8700544AE1BB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8A2159E8-743B-45A7-901F-8700544AE1BB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8A2159E8-743B-45A7-901F-8700544AE1BB}.Release|Any CPU.Build.0 = Release|Any CPU - {5A0B9481-CB68-4781-8EEF-9EFC9E2B00E8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5A0B9481-CB68-4781-8EEF-9EFC9E2B00E8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5A0B9481-CB68-4781-8EEF-9EFC9E2B00E8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5A0B9481-CB68-4781-8EEF-9EFC9E2B00E8}.Release|Any CPU.Build.0 = Release|Any CPU - {83417CB1-949B-47A9-97CA-893700574AA5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {83417CB1-949B-47A9-97CA-893700574AA5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {83417CB1-949B-47A9-97CA-893700574AA5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {83417CB1-949B-47A9-97CA-893700574AA5}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {E8B32154-EFF8-4D8C-92C3-F166E59C7568} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {AD998018-27AA-49EF-98C7-1845891EC2F4} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {3C36DE60-ED85-4185-BA86-B1BFA6C6AE96} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {93FA5F88-882D-4B97-8109-ECC4EC82B0BC} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {287D337A-0FCA-416B-B220-07E8C25EF686} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {CEB59570-0F01-4EBC-8029-243878BB4B67} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D68EB485-3441-463B-BD54-054E8DB01603} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F0E22947-A246-439D-B465-C7A217A9A704} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E80D8ADC-F879-43B7-9EA2-06823FEBA96B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {7D8DB080-16CE-4DBD-B3FF-33E511065137} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B349F86E-E254-4E95-A8E6-2E64C17AC769} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {5C5661C0-8799-4EEA-975B-2316BEE873C8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8A2159E8-743B-45A7-901F-8700544AE1BB} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {5A0B9481-CB68-4781-8EEF-9EFC9E2B00E8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {83417CB1-949B-47A9-97CA-893700574AA5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {CEB59570-0F01-4EBC-8029-243878BB4B67} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {D68EB485-3441-463B-BD54-054E8DB01603} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {F0E22947-A246-439D-B465-C7A217A9A704} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {E80D8ADC-F879-43B7-9EA2-06823FEBA96B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {7D8DB080-16CE-4DBD-B3FF-33E511065137} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {B349F86E-E254-4E95-A8E6-2E64C17AC769} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {5C5661C0-8799-4EEA-975B-2316BEE873C8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {8A2159E8-743B-45A7-901F-8700544AE1BB} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {5A0B9481-CB68-4781-8EEF-9EFC9E2B00E8} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {83417CB1-949B-47A9-97CA-893700574AA5} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {B25547C6-4D4A-4628-8E3F-2A0A7041518B} diff --git a/sdk/src/Services/XRay/Generated/AmazonXRayConfig.cs b/sdk/src/Services/XRay/Generated/AmazonXRayConfig.cs index cb7a38ac621b..fc3f9272aae5 100644 --- a/sdk/src/Services/XRay/Generated/AmazonXRayConfig.cs +++ b/sdk/src/Services/XRay/Generated/AmazonXRayConfig.cs @@ -34,16 +34,10 @@ namespace Amazon.XRay public partial class AmazonXRayConfig : ClientConfig { private static readonly string UserAgentString = -<<<<<<< HEAD InternalSDKUtils.BuildUserAgentString("XRay", "4.0.0.0"); private static readonly AmazonXRayEndpointResolver EndpointResolver = new AmazonXRayEndpointResolver(); -||||||| Commit version number update changes - InternalSDKUtils.BuildUserAgentString("XRay", "3.7.400.26"); -======= - InternalSDKUtils.BuildUserAgentString("XRay", "3.7.400.53"); ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b private string _userAgent = UserAgentString; /// diff --git a/sdk/src/Services/XRay/Properties/AssemblyInfo.cs b/sdk/src/Services/XRay/Properties/AssemblyInfo.cs index a1b577c5b119..b6493e8010e9 100644 --- a/sdk/src/Services/XRay/Properties/AssemblyInfo.cs +++ b/sdk/src/Services/XRay/Properties/AssemblyInfo.cs @@ -41,16 +41,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -<<<<<<< HEAD -||||||| Commit version number update changes -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.26")] - -======= -[assembly: AssemblyVersion("3.3")] -[assembly: AssemblyFileVersion("3.7.400.53")] - ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b #if BCL [assembly: AssemblyVersion("4.0")] #else diff --git a/sdk/src/Services/XRay/XRay.sln b/sdk/src/Services/XRay/XRay.sln index d528aadb3eff..8bdaa63d62f0 100644 --- a/sdk/src/Services/XRay/XRay.sln +++ b/sdk/src/Services/XRay/XRay.sln @@ -86,7 +86,14 @@ Global {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.ActiveCfg = Release|Any CPU {66F78F86-68D7-4538-8EA5-A669A08E1C19}.Release|Any CPU.Build.0 = Release|Any CPU -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU {887D50E0-BB37-4E09-BC22-A4EF09C2CB28}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {887D50E0-BB37-4E09-BC22-A4EF09C2CB28}.Debug|Any CPU.Build.0 = Debug|Any CPU {887D50E0-BB37-4E09-BC22-A4EF09C2CB28}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -107,97 +114,6 @@ Global {0DD06BDD-B521-49DD-88BE-B7D64A06C83F}.Debug|Any CPU.Build.0 = Debug|Any CPU {0DD06BDD-B521-49DD-88BE-B7D64A06C83F}.Release|Any CPU.ActiveCfg = Release|Any CPU {0DD06BDD-B521-49DD-88BE-B7D64A06C83F}.Release|Any CPU.Build.0 = Release|Any CPU -||||||| Commit version number update changes - {1F299C81-A95D-4E60-8070-61EE3BFC038C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1F299C81-A95D-4E60-8070-61EE3BFC038C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1F299C81-A95D-4E60-8070-61EE3BFC038C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1F299C81-A95D-4E60-8070-61EE3BFC038C}.Release|Any CPU.Build.0 = Release|Any CPU - {66E20A92-5675-465E-B3AE-CB4666EA068C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {66E20A92-5675-465E-B3AE-CB4666EA068C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {66E20A92-5675-465E-B3AE-CB4666EA068C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {66E20A92-5675-465E-B3AE-CB4666EA068C}.Release|Any CPU.Build.0 = Release|Any CPU - {9950B3C4-1FC3-4B92-B49F-1BD96D183770}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9950B3C4-1FC3-4B92-B49F-1BD96D183770}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9950B3C4-1FC3-4B92-B49F-1BD96D183770}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9950B3C4-1FC3-4B92-B49F-1BD96D183770}.Release|Any CPU.Build.0 = Release|Any CPU - {32DD47ED-404A-4D9C-A5FF-0CECCAA1A85B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {32DD47ED-404A-4D9C-A5FF-0CECCAA1A85B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {32DD47ED-404A-4D9C-A5FF-0CECCAA1A85B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {32DD47ED-404A-4D9C-A5FF-0CECCAA1A85B}.Release|Any CPU.Build.0 = Release|Any CPU - {2077985D-505D-4089-8A7A-7CDA33EF35B9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2077985D-505D-4089-8A7A-7CDA33EF35B9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2077985D-505D-4089-8A7A-7CDA33EF35B9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2077985D-505D-4089-8A7A-7CDA33EF35B9}.Release|Any CPU.Build.0 = Release|Any CPU - {AE725B12-FF6E-4A39-BE5E-D00091616D6E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AE725B12-FF6E-4A39-BE5E-D00091616D6E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AE725B12-FF6E-4A39-BE5E-D00091616D6E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AE725B12-FF6E-4A39-BE5E-D00091616D6E}.Release|Any CPU.Build.0 = Release|Any CPU - {76AFBB03-84EE-41D5-A385-D862FF9A0B3A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {76AFBB03-84EE-41D5-A385-D862FF9A0B3A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {76AFBB03-84EE-41D5-A385-D862FF9A0B3A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {76AFBB03-84EE-41D5-A385-D862FF9A0B3A}.Release|Any CPU.Build.0 = Release|Any CPU - {3114BBE6-19D1-4496-8097-82420BA65495}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3114BBE6-19D1-4496-8097-82420BA65495}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3114BBE6-19D1-4496-8097-82420BA65495}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3114BBE6-19D1-4496-8097-82420BA65495}.Release|Any CPU.Build.0 = Release|Any CPU - {31D7AED7-261B-4F4D-910F-F384FAE2DE74}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {31D7AED7-261B-4F4D-910F-F384FAE2DE74}.Debug|Any CPU.Build.0 = Debug|Any CPU - {31D7AED7-261B-4F4D-910F-F384FAE2DE74}.Release|Any CPU.ActiveCfg = Release|Any CPU - {31D7AED7-261B-4F4D-910F-F384FAE2DE74}.Release|Any CPU.Build.0 = Release|Any CPU - {29BDF918-CE6F-4623-B1BD-98AB6C8E7088}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {29BDF918-CE6F-4623-B1BD-98AB6C8E7088}.Debug|Any CPU.Build.0 = Debug|Any CPU - {29BDF918-CE6F-4623-B1BD-98AB6C8E7088}.Release|Any CPU.ActiveCfg = Release|Any CPU - {29BDF918-CE6F-4623-B1BD-98AB6C8E7088}.Release|Any CPU.Build.0 = Release|Any CPU -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F}.Release|Any CPU.Build.0 = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B969DE99-0634-4989-A318-086AE1699974}.Release|Any CPU.Build.0 = Release|Any CPU - {1F299C81-A95D-4E60-8070-61EE3BFC038C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1F299C81-A95D-4E60-8070-61EE3BFC038C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1F299C81-A95D-4E60-8070-61EE3BFC038C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1F299C81-A95D-4E60-8070-61EE3BFC038C}.Release|Any CPU.Build.0 = Release|Any CPU - {66E20A92-5675-465E-B3AE-CB4666EA068C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {66E20A92-5675-465E-B3AE-CB4666EA068C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {66E20A92-5675-465E-B3AE-CB4666EA068C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {66E20A92-5675-465E-B3AE-CB4666EA068C}.Release|Any CPU.Build.0 = Release|Any CPU - {9950B3C4-1FC3-4B92-B49F-1BD96D183770}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9950B3C4-1FC3-4B92-B49F-1BD96D183770}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9950B3C4-1FC3-4B92-B49F-1BD96D183770}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9950B3C4-1FC3-4B92-B49F-1BD96D183770}.Release|Any CPU.Build.0 = Release|Any CPU - {32DD47ED-404A-4D9C-A5FF-0CECCAA1A85B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {32DD47ED-404A-4D9C-A5FF-0CECCAA1A85B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {32DD47ED-404A-4D9C-A5FF-0CECCAA1A85B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {32DD47ED-404A-4D9C-A5FF-0CECCAA1A85B}.Release|Any CPU.Build.0 = Release|Any CPU - {2077985D-505D-4089-8A7A-7CDA33EF35B9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2077985D-505D-4089-8A7A-7CDA33EF35B9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2077985D-505D-4089-8A7A-7CDA33EF35B9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2077985D-505D-4089-8A7A-7CDA33EF35B9}.Release|Any CPU.Build.0 = Release|Any CPU - {AE725B12-FF6E-4A39-BE5E-D00091616D6E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AE725B12-FF6E-4A39-BE5E-D00091616D6E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AE725B12-FF6E-4A39-BE5E-D00091616D6E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AE725B12-FF6E-4A39-BE5E-D00091616D6E}.Release|Any CPU.Build.0 = Release|Any CPU - {76AFBB03-84EE-41D5-A385-D862FF9A0B3A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {76AFBB03-84EE-41D5-A385-D862FF9A0B3A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {76AFBB03-84EE-41D5-A385-D862FF9A0B3A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {76AFBB03-84EE-41D5-A385-D862FF9A0B3A}.Release|Any CPU.Build.0 = Release|Any CPU - {3114BBE6-19D1-4496-8097-82420BA65495}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3114BBE6-19D1-4496-8097-82420BA65495}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3114BBE6-19D1-4496-8097-82420BA65495}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3114BBE6-19D1-4496-8097-82420BA65495}.Release|Any CPU.Build.0 = Release|Any CPU - {31D7AED7-261B-4F4D-910F-F384FAE2DE74}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {31D7AED7-261B-4F4D-910F-F384FAE2DE74}.Debug|Any CPU.Build.0 = Debug|Any CPU - {31D7AED7-261B-4F4D-910F-F384FAE2DE74}.Release|Any CPU.ActiveCfg = Release|Any CPU - {31D7AED7-261B-4F4D-910F-F384FAE2DE74}.Release|Any CPU.Build.0 = Release|Any CPU - {29BDF918-CE6F-4623-B1BD-98AB6C8E7088}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {29BDF918-CE6F-4623-B1BD-98AB6C8E7088}.Debug|Any CPU.Build.0 = Debug|Any CPU - {29BDF918-CE6F-4623-B1BD-98AB6C8E7088}.Release|Any CPU.ActiveCfg = Release|Any CPU - {29BDF918-CE6F-4623-B1BD-98AB6C8E7088}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -213,37 +129,13 @@ Global {002B183F-E568-49CD-9D06-CBCFF2C2921F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {7AB0DA1C-CA0E-4579-BA82-2B41A9DA15C7} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {66F78F86-68D7-4538-8EA5-A669A08E1C19} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} -<<<<<<< HEAD + {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} + {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} {887D50E0-BB37-4E09-BC22-A4EF09C2CB28} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {A3D6210E-6105-4AC6-A9AF-B552DB362783} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {52B4D383-DE5F-4C36-814D-D274C2D3C0DB} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {D640DAAD-1E1F-458F-9E1B-7527D803BD09} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} {0DD06BDD-B521-49DD-88BE-B7D64A06C83F} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -||||||| Commit version number update changes - {1F299C81-A95D-4E60-8070-61EE3BFC038C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {66E20A92-5675-465E-B3AE-CB4666EA068C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {9950B3C4-1FC3-4B92-B49F-1BD96D183770} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {32DD47ED-404A-4D9C-A5FF-0CECCAA1A85B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {2077985D-505D-4089-8A7A-7CDA33EF35B9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {AE725B12-FF6E-4A39-BE5E-D00091616D6E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {76AFBB03-84EE-41D5-A385-D862FF9A0B3A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {3114BBE6-19D1-4496-8097-82420BA65495} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {31D7AED7-261B-4F4D-910F-F384FAE2DE74} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {29BDF918-CE6F-4623-B1BD-98AB6C8E7088} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} -======= - {87FCE8BC-9E24-4D84-B5CF-C1BA7A51423F} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {B969DE99-0634-4989-A318-086AE1699974} = {12EC4E4B-7E2C-4B63-8EF9-7B959F82A89B} - {1F299C81-A95D-4E60-8070-61EE3BFC038C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {66E20A92-5675-465E-B3AE-CB4666EA068C} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {9950B3C4-1FC3-4B92-B49F-1BD96D183770} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {32DD47ED-404A-4D9C-A5FF-0CECCAA1A85B} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {2077985D-505D-4089-8A7A-7CDA33EF35B9} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {AE725B12-FF6E-4A39-BE5E-D00091616D6E} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {76AFBB03-84EE-41D5-A385-D862FF9A0B3A} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {3114BBE6-19D1-4496-8097-82420BA65495} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {31D7AED7-261B-4F4D-910F-F384FAE2DE74} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} - {29BDF918-CE6F-4623-B1BD-98AB6C8E7088} = {939EC5C2-8345-43E2-8F97-72EEEBEEA0AC} ->>>>>>> acae479fe47dc2583f625fe9f3d68413573ee15b EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {BB6D86B0-EE34-48DD-A8AE-12EB4B6206DE} diff --git a/sdk/test/Services/Billing/UnitTests/AWSSDK.UnitTests.Billing.Net35.csproj b/sdk/test/Services/Billing/UnitTests/AWSSDK.UnitTests.Billing.Net35.csproj deleted file mode 100644 index a2ad2ad966ab..000000000000 --- a/sdk/test/Services/Billing/UnitTests/AWSSDK.UnitTests.Billing.Net35.csproj +++ /dev/null @@ -1,57 +0,0 @@ - - - true - net45 - $(DefineConstants);TRACE;BCL;BCL35;AWS_APM_API;DEBUG - portable - true - AWSSDK.UnitTests.Billing.Net35 - AWSSDK.UnitTests.Billing.Net35 - - false - false - false - false - false - false - false - false - true - true - - CS1591,CS0612,CS0618 - false - bin\$(Configuration)\net35 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/sdk/test/Services/Billing/UnitTests/AWSSDK.UnitTests.Billing.Net45.csproj b/sdk/test/Services/Billing/UnitTests/AWSSDK.UnitTests.Billing.Net45.csproj deleted file mode 100644 index 98b44b6405a6..000000000000 --- a/sdk/test/Services/Billing/UnitTests/AWSSDK.UnitTests.Billing.Net45.csproj +++ /dev/null @@ -1,53 +0,0 @@ - - - true - net45 - $(DefineConstants);TRACE;BCL;BCL45;ASYNC_AWAIT;DEBUG - portable - true - AWSSDK.UnitTests.Billing.Net45 - AWSSDK.UnitTests.Billing.Net45 - - false - false - false - false - false - false - false - false - true - true - - CS1591,CS0612,CS0618 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/sdk/test/Services/NimbleStudio/UnitTests/AWSSDK.UnitTests.NimbleStudio.NetFramework.csproj b/sdk/test/Services/Billing/UnitTests/AWSSDK.UnitTests.Billing.NetFramework.csproj similarity index 91% rename from sdk/test/Services/NimbleStudio/UnitTests/AWSSDK.UnitTests.NimbleStudio.NetFramework.csproj rename to sdk/test/Services/Billing/UnitTests/AWSSDK.UnitTests.Billing.NetFramework.csproj index 498fc72d8045..e1074c6a41a1 100644 --- a/sdk/test/Services/NimbleStudio/UnitTests/AWSSDK.UnitTests.NimbleStudio.NetFramework.csproj +++ b/sdk/test/Services/Billing/UnitTests/AWSSDK.UnitTests.Billing.NetFramework.csproj @@ -5,8 +5,8 @@ $(DefineConstants);TRACE;BCL;ASYNC_AWAIT;DEBUG portable true - AWSSDK.UnitTests.NimbleStudio.NetFramework - AWSSDK.UnitTests.NimbleStudio.NetFramework + AWSSDK.UnitTests.Billing.NetFramework + AWSSDK.UnitTests.Billing.NetFramework false false @@ -44,7 +44,7 @@ - + diff --git a/sdk/test/Services/Billing/UnitTests/Generated/Endpoints/BillingEndpointProviderTests.cs b/sdk/test/Services/Billing/UnitTests/Generated/Endpoints/BillingEndpointProviderTests.cs index 42d35602f597..2b969dcc39ed 100644 --- a/sdk/test/Services/Billing/UnitTests/Generated/Endpoints/BillingEndpointProviderTests.cs +++ b/sdk/test/Services/Billing/UnitTests/Generated/Endpoints/BillingEndpointProviderTests.cs @@ -23,7 +23,7 @@ using Amazon.Billing.Endpoints; using Amazon.Billing.Internal; -namespace AWSSDK_DotNet35.UnitTests.Endpoints +namespace AWSSDK_DotNet.UnitTests.Endpoints { [TestClass] public partial class BillingEndpointsTests diff --git a/sdk/test/Services/ConnectCampaignsV2/UnitTests/AWSSDK.UnitTests.ConnectCampaignsV2.Net35.csproj b/sdk/test/Services/ConnectCampaignsV2/UnitTests/AWSSDK.UnitTests.ConnectCampaignsV2.Net35.csproj deleted file mode 100644 index c790d1b5ef44..000000000000 --- a/sdk/test/Services/ConnectCampaignsV2/UnitTests/AWSSDK.UnitTests.ConnectCampaignsV2.Net35.csproj +++ /dev/null @@ -1,57 +0,0 @@ - - - true - net45 - $(DefineConstants);TRACE;BCL;BCL35;AWS_APM_API;DEBUG - portable - true - AWSSDK.UnitTests.ConnectCampaignsV2.Net35 - AWSSDK.UnitTests.ConnectCampaignsV2.Net35 - - false - false - false - false - false - false - false - false - true - true - - CS1591,CS0612,CS0618 - false - bin\$(Configuration)\net35 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/sdk/test/Services/ConnectCampaignsV2/UnitTests/AWSSDK.UnitTests.ConnectCampaignsV2.Net45.csproj b/sdk/test/Services/ConnectCampaignsV2/UnitTests/AWSSDK.UnitTests.ConnectCampaignsV2.NetFramework.csproj similarity index 69% rename from sdk/test/Services/ConnectCampaignsV2/UnitTests/AWSSDK.UnitTests.ConnectCampaignsV2.Net45.csproj rename to sdk/test/Services/ConnectCampaignsV2/UnitTests/AWSSDK.UnitTests.ConnectCampaignsV2.NetFramework.csproj index 29449e2435bd..ba69649d5c35 100644 --- a/sdk/test/Services/ConnectCampaignsV2/UnitTests/AWSSDK.UnitTests.ConnectCampaignsV2.Net45.csproj +++ b/sdk/test/Services/ConnectCampaignsV2/UnitTests/AWSSDK.UnitTests.ConnectCampaignsV2.NetFramework.csproj @@ -1,12 +1,12 @@ true - net45 - $(DefineConstants);TRACE;BCL;BCL45;ASYNC_AWAIT;DEBUG + net472 + $(DefineConstants);TRACE;BCL;ASYNC_AWAIT;DEBUG portable true - AWSSDK.UnitTests.ConnectCampaignsV2.Net45 - AWSSDK.UnitTests.ConnectCampaignsV2.Net45 + AWSSDK.UnitTests.ConnectCampaignsV2.NetFramework + AWSSDK.UnitTests.ConnectCampaignsV2.NetFramework false false @@ -21,17 +21,30 @@ CS1591,CS0612,CS0618 + + true + + + + 11.0 + + + 9.0 + - + - - - + + + diff --git a/sdk/test/Services/ConnectCampaignsV2/UnitTests/Generated/Endpoints/ConnectCampaignsV2EndpointProviderTests.cs b/sdk/test/Services/ConnectCampaignsV2/UnitTests/Generated/Endpoints/ConnectCampaignsV2EndpointProviderTests.cs index 3d546c24004a..6907e361d141 100644 --- a/sdk/test/Services/ConnectCampaignsV2/UnitTests/Generated/Endpoints/ConnectCampaignsV2EndpointProviderTests.cs +++ b/sdk/test/Services/ConnectCampaignsV2/UnitTests/Generated/Endpoints/ConnectCampaignsV2EndpointProviderTests.cs @@ -23,7 +23,7 @@ using Amazon.ConnectCampaignsV2.Endpoints; using Amazon.ConnectCampaignsV2.Internal; -namespace AWSSDK_DotNet35.UnitTests.Endpoints +namespace AWSSDK_DotNet.UnitTests.Endpoints { [TestClass] public partial class ConnectCampaignsV2EndpointsTests diff --git a/sdk/test/Services/ElasticTranscoder/IntegrationTests/AWSSDK.IntegrationTests.ElasticTranscoder.NetFramework.csproj b/sdk/test/Services/ElasticTranscoder/IntegrationTests/AWSSDK.IntegrationTests.ElasticTranscoder.NetFramework.csproj deleted file mode 100644 index 4e679cc42184..000000000000 --- a/sdk/test/Services/ElasticTranscoder/IntegrationTests/AWSSDK.IntegrationTests.ElasticTranscoder.NetFramework.csproj +++ /dev/null @@ -1,53 +0,0 @@ - - - net472 - $(DefineConstants);DEBUG;TRACE;BCL;ASYNC_AWAIT;LOCAL_FILE - portable - false - AWSSDK.IntegrationTests.ElasticTranscoder.NetFramework - AWSSDK.IntegrationTests.ElasticTranscoder.NetFramework - - false - false - false - false - false - false - false - false - true - CS1591 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/sdk/test/Services/ElasticTranscoder/IntegrationTests/Config/462/App.config b/sdk/test/Services/ElasticTranscoder/IntegrationTests/Config/462/App.config deleted file mode 100644 index e42d0bcd4c11..000000000000 --- a/sdk/test/Services/ElasticTranscoder/IntegrationTests/Config/462/App.config +++ /dev/null @@ -1,28 +0,0 @@ - - - -
            - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/sdk/test/Services/GeoMaps/UnitTests/AWSSDK.UnitTests.GeoMaps.Net45.csproj b/sdk/test/Services/GeoMaps/UnitTests/AWSSDK.UnitTests.GeoMaps.Net45.csproj deleted file mode 100644 index c2dd959ac744..000000000000 --- a/sdk/test/Services/GeoMaps/UnitTests/AWSSDK.UnitTests.GeoMaps.Net45.csproj +++ /dev/null @@ -1,53 +0,0 @@ - - - true - net45 - $(DefineConstants);TRACE;BCL;BCL45;ASYNC_AWAIT;DEBUG - portable - true - AWSSDK.UnitTests.GeoMaps.Net45 - AWSSDK.UnitTests.GeoMaps.Net45 - - false - false - false - false - false - false - false - false - true - true - - CS1591,CS0612,CS0618 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/sdk/test/Services/GeoMaps/UnitTests/AWSSDK.UnitTests.GeoMaps.Net35.csproj b/sdk/test/Services/GeoMaps/UnitTests/AWSSDK.UnitTests.GeoMaps.NetFramework.csproj similarity index 70% rename from sdk/test/Services/GeoMaps/UnitTests/AWSSDK.UnitTests.GeoMaps.Net35.csproj rename to sdk/test/Services/GeoMaps/UnitTests/AWSSDK.UnitTests.GeoMaps.NetFramework.csproj index d3e8e5335d93..34a480d70d8f 100644 --- a/sdk/test/Services/GeoMaps/UnitTests/AWSSDK.UnitTests.GeoMaps.Net35.csproj +++ b/sdk/test/Services/GeoMaps/UnitTests/AWSSDK.UnitTests.GeoMaps.NetFramework.csproj @@ -1,12 +1,12 @@ true - net45 - $(DefineConstants);TRACE;BCL;BCL35;AWS_APM_API;DEBUG + net472 + $(DefineConstants);TRACE;BCL;ASYNC_AWAIT;DEBUG portable true - AWSSDK.UnitTests.GeoMaps.Net35 - AWSSDK.UnitTests.GeoMaps.Net35 + AWSSDK.UnitTests.GeoMaps.NetFramework + AWSSDK.UnitTests.GeoMaps.NetFramework false false @@ -20,22 +20,31 @@ true CS1591,CS0612,CS0618 - false - bin\$(Configuration)\net35 + + + true + + + + 11.0 + + + 9.0 - - - + - - - + + + diff --git a/sdk/test/Services/GeoMaps/UnitTests/Generated/Endpoints/GeoMapsEndpointProviderTests.cs b/sdk/test/Services/GeoMaps/UnitTests/Generated/Endpoints/GeoMapsEndpointProviderTests.cs index 1e027a89db4e..60a4b1cee4c8 100644 --- a/sdk/test/Services/GeoMaps/UnitTests/Generated/Endpoints/GeoMapsEndpointProviderTests.cs +++ b/sdk/test/Services/GeoMaps/UnitTests/Generated/Endpoints/GeoMapsEndpointProviderTests.cs @@ -23,7 +23,7 @@ using Amazon.GeoMaps.Endpoints; using Amazon.GeoMaps.Internal; -namespace AWSSDK_DotNet35.UnitTests.Endpoints +namespace AWSSDK_DotNet.UnitTests.Endpoints { [TestClass] public partial class GeoMapsEndpointsTests diff --git a/sdk/test/Services/GeoPlaces/UnitTests/AWSSDK.UnitTests.GeoPlaces.Net45.csproj b/sdk/test/Services/GeoPlaces/UnitTests/AWSSDK.UnitTests.GeoPlaces.Net45.csproj deleted file mode 100644 index bc4ddb2b69b8..000000000000 --- a/sdk/test/Services/GeoPlaces/UnitTests/AWSSDK.UnitTests.GeoPlaces.Net45.csproj +++ /dev/null @@ -1,53 +0,0 @@ - - - true - net45 - $(DefineConstants);TRACE;BCL;BCL45;ASYNC_AWAIT;DEBUG - portable - true - AWSSDK.UnitTests.GeoPlaces.Net45 - AWSSDK.UnitTests.GeoPlaces.Net45 - - false - false - false - false - false - false - false - false - true - true - - CS1591,CS0612,CS0618 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/sdk/test/Services/GeoPlaces/UnitTests/AWSSDK.UnitTests.GeoPlaces.Net35.csproj b/sdk/test/Services/GeoPlaces/UnitTests/AWSSDK.UnitTests.GeoPlaces.NetFramework.csproj similarity index 69% rename from sdk/test/Services/GeoPlaces/UnitTests/AWSSDK.UnitTests.GeoPlaces.Net35.csproj rename to sdk/test/Services/GeoPlaces/UnitTests/AWSSDK.UnitTests.GeoPlaces.NetFramework.csproj index 65bcd8644bb9..51f270955318 100644 --- a/sdk/test/Services/GeoPlaces/UnitTests/AWSSDK.UnitTests.GeoPlaces.Net35.csproj +++ b/sdk/test/Services/GeoPlaces/UnitTests/AWSSDK.UnitTests.GeoPlaces.NetFramework.csproj @@ -1,12 +1,12 @@ true - net45 - $(DefineConstants);TRACE;BCL;BCL35;AWS_APM_API;DEBUG + net472 + $(DefineConstants);TRACE;BCL;ASYNC_AWAIT;DEBUG portable true - AWSSDK.UnitTests.GeoPlaces.Net35 - AWSSDK.UnitTests.GeoPlaces.Net35 + AWSSDK.UnitTests.GeoPlaces.NetFramework + AWSSDK.UnitTests.GeoPlaces.NetFramework false false @@ -20,22 +20,31 @@ true CS1591,CS0612,CS0618 - false - bin\$(Configuration)\net35 + + + true + + + + 11.0 + + + 9.0 - - - + - - - + + + diff --git a/sdk/test/Services/GeoPlaces/UnitTests/Generated/Endpoints/GeoPlacesEndpointProviderTests.cs b/sdk/test/Services/GeoPlaces/UnitTests/Generated/Endpoints/GeoPlacesEndpointProviderTests.cs index 3a0ccd9528eb..321339b49cca 100644 --- a/sdk/test/Services/GeoPlaces/UnitTests/Generated/Endpoints/GeoPlacesEndpointProviderTests.cs +++ b/sdk/test/Services/GeoPlaces/UnitTests/Generated/Endpoints/GeoPlacesEndpointProviderTests.cs @@ -23,7 +23,7 @@ using Amazon.GeoPlaces.Endpoints; using Amazon.GeoPlaces.Internal; -namespace AWSSDK_DotNet35.UnitTests.Endpoints +namespace AWSSDK_DotNet.UnitTests.Endpoints { [TestClass] public partial class GeoPlacesEndpointsTests diff --git a/sdk/test/Services/GeoRoutes/UnitTests/AWSSDK.UnitTests.GeoRoutes.Net45.csproj b/sdk/test/Services/GeoRoutes/UnitTests/AWSSDK.UnitTests.GeoRoutes.Net45.csproj deleted file mode 100644 index 56c60f45d534..000000000000 --- a/sdk/test/Services/GeoRoutes/UnitTests/AWSSDK.UnitTests.GeoRoutes.Net45.csproj +++ /dev/null @@ -1,53 +0,0 @@ - - - true - net45 - $(DefineConstants);TRACE;BCL;BCL45;ASYNC_AWAIT;DEBUG - portable - true - AWSSDK.UnitTests.GeoRoutes.Net45 - AWSSDK.UnitTests.GeoRoutes.Net45 - - false - false - false - false - false - false - false - false - true - true - - CS1591,CS0612,CS0618 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/sdk/test/Services/GeoRoutes/UnitTests/AWSSDK.UnitTests.GeoRoutes.Net35.csproj b/sdk/test/Services/GeoRoutes/UnitTests/AWSSDK.UnitTests.GeoRoutes.NetFramework.csproj similarity index 69% rename from sdk/test/Services/GeoRoutes/UnitTests/AWSSDK.UnitTests.GeoRoutes.Net35.csproj rename to sdk/test/Services/GeoRoutes/UnitTests/AWSSDK.UnitTests.GeoRoutes.NetFramework.csproj index a87b7c0c2cbe..8619c2ac29d8 100644 --- a/sdk/test/Services/GeoRoutes/UnitTests/AWSSDK.UnitTests.GeoRoutes.Net35.csproj +++ b/sdk/test/Services/GeoRoutes/UnitTests/AWSSDK.UnitTests.GeoRoutes.NetFramework.csproj @@ -1,12 +1,12 @@ true - net45 - $(DefineConstants);TRACE;BCL;BCL35;AWS_APM_API;DEBUG + net472 + $(DefineConstants);TRACE;BCL;ASYNC_AWAIT;DEBUG portable true - AWSSDK.UnitTests.GeoRoutes.Net35 - AWSSDK.UnitTests.GeoRoutes.Net35 + AWSSDK.UnitTests.GeoRoutes.NetFramework + AWSSDK.UnitTests.GeoRoutes.NetFramework false false @@ -20,22 +20,31 @@ true CS1591,CS0612,CS0618 - false - bin\$(Configuration)\net35 + + + true + + + + 11.0 + + + 9.0 - - - + - - - + + + diff --git a/sdk/test/Services/GeoRoutes/UnitTests/Generated/Endpoints/GeoRoutesEndpointProviderTests.cs b/sdk/test/Services/GeoRoutes/UnitTests/Generated/Endpoints/GeoRoutesEndpointProviderTests.cs index b1e3d70c3214..669d3e08cce8 100644 --- a/sdk/test/Services/GeoRoutes/UnitTests/Generated/Endpoints/GeoRoutesEndpointProviderTests.cs +++ b/sdk/test/Services/GeoRoutes/UnitTests/Generated/Endpoints/GeoRoutesEndpointProviderTests.cs @@ -23,7 +23,7 @@ using Amazon.GeoRoutes.Endpoints; using Amazon.GeoRoutes.Internal; -namespace AWSSDK_DotNet35.UnitTests.Endpoints +namespace AWSSDK_DotNet.UnitTests.Endpoints { [TestClass] public partial class GeoRoutesEndpointsTests diff --git a/sdk/test/Services/MarketplaceReporting/UnitTests/AWSSDK.UnitTests.MarketplaceReporting.Net45.csproj b/sdk/test/Services/MarketplaceReporting/UnitTests/AWSSDK.UnitTests.MarketplaceReporting.Net45.csproj deleted file mode 100644 index 020e5afc155e..000000000000 --- a/sdk/test/Services/MarketplaceReporting/UnitTests/AWSSDK.UnitTests.MarketplaceReporting.Net45.csproj +++ /dev/null @@ -1,53 +0,0 @@ - - - true - net45 - $(DefineConstants);TRACE;BCL;BCL45;ASYNC_AWAIT;DEBUG - portable - true - AWSSDK.UnitTests.MarketplaceReporting.Net45 - AWSSDK.UnitTests.MarketplaceReporting.Net45 - - false - false - false - false - false - false - false - false - true - true - - CS1591,CS0612,CS0618 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/sdk/test/Services/MarketplaceReporting/UnitTests/AWSSDK.UnitTests.MarketplaceReporting.Net35.csproj b/sdk/test/Services/MarketplaceReporting/UnitTests/AWSSDK.UnitTests.MarketplaceReporting.NetFramework.csproj similarity index 68% rename from sdk/test/Services/MarketplaceReporting/UnitTests/AWSSDK.UnitTests.MarketplaceReporting.Net35.csproj rename to sdk/test/Services/MarketplaceReporting/UnitTests/AWSSDK.UnitTests.MarketplaceReporting.NetFramework.csproj index 6bdcb1e6f833..3b421cf54200 100644 --- a/sdk/test/Services/MarketplaceReporting/UnitTests/AWSSDK.UnitTests.MarketplaceReporting.Net35.csproj +++ b/sdk/test/Services/MarketplaceReporting/UnitTests/AWSSDK.UnitTests.MarketplaceReporting.NetFramework.csproj @@ -1,12 +1,12 @@ true - net45 - $(DefineConstants);TRACE;BCL;BCL35;AWS_APM_API;DEBUG + net472 + $(DefineConstants);TRACE;BCL;ASYNC_AWAIT;DEBUG portable true - AWSSDK.UnitTests.MarketplaceReporting.Net35 - AWSSDK.UnitTests.MarketplaceReporting.Net35 + AWSSDK.UnitTests.MarketplaceReporting.NetFramework + AWSSDK.UnitTests.MarketplaceReporting.NetFramework false false @@ -20,22 +20,31 @@ true CS1591,CS0612,CS0618 - false - bin\$(Configuration)\net35 + + + true + + + + 11.0 + + + 9.0 - - - + - - - + + + diff --git a/sdk/test/Services/MarketplaceReporting/UnitTests/Generated/Endpoints/MarketplaceReportingEndpointProviderTests.cs b/sdk/test/Services/MarketplaceReporting/UnitTests/Generated/Endpoints/MarketplaceReportingEndpointProviderTests.cs index 1f035c574e5a..276ef49a011b 100644 --- a/sdk/test/Services/MarketplaceReporting/UnitTests/Generated/Endpoints/MarketplaceReportingEndpointProviderTests.cs +++ b/sdk/test/Services/MarketplaceReporting/UnitTests/Generated/Endpoints/MarketplaceReportingEndpointProviderTests.cs @@ -23,7 +23,7 @@ using Amazon.MarketplaceReporting.Endpoints; using Amazon.MarketplaceReporting.Internal; -namespace AWSSDK_DotNet35.UnitTests.Endpoints +namespace AWSSDK_DotNet.UnitTests.Endpoints { [TestClass] public partial class MarketplaceReportingEndpointsTests diff --git a/sdk/test/Services/NimbleStudio/UnitTests/Generated/Endpoints/NimbleStudioEndpointProviderTests.cs b/sdk/test/Services/NimbleStudio/UnitTests/Generated/Endpoints/NimbleStudioEndpointProviderTests.cs deleted file mode 100644 index 869142790b28..000000000000 --- a/sdk/test/Services/NimbleStudio/UnitTests/Generated/Endpoints/NimbleStudioEndpointProviderTests.cs +++ /dev/null @@ -1,482 +0,0 @@ -/* - * 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. - */ - -/* - * Do not modify this file. This file is generated from the nimble-2020-08-01.normal.json service model. - */ - -using Microsoft.VisualStudio.TestTools.UnitTesting; -using System.Collections.Generic; -using Amazon.Runtime; -using Amazon.NimbleStudio.Endpoints; -using Amazon.NimbleStudio.Internal; - -namespace AWSSDK_DotNet.UnitTests.Endpoints -{ - [TestClass] - public partial class NimbleStudioEndpointsTests - { - [TestMethod] - [TestCategory("UnitTest")] - [TestCategory("Endpoints")] - [TestCategory("NimbleStudio")] - [Description("For region ap-northeast-1 with FIPS disabled and DualStack disabled")] - public void For_region_apnortheast1_with_FIPS_disabled_and_DualStack_disabled_Test() - { - var parameters = new NimbleStudioEndpointParameters(); - parameters["Region"] = "ap-northeast-1"; - parameters["UseFIPS"] = false; - parameters["UseDualStack"] = false; - var endpoint = new AmazonNimbleStudioEndpointProvider().ResolveEndpoint(parameters); - Assert.AreEqual("https://nimble.ap-northeast-1.amazonaws.com", endpoint.URL); - } - - [TestMethod] - [TestCategory("UnitTest")] - [TestCategory("Endpoints")] - [TestCategory("NimbleStudio")] - [Description("For region ap-southeast-2 with FIPS disabled and DualStack disabled")] - public void For_region_apsoutheast2_with_FIPS_disabled_and_DualStack_disabled_Test() - { - var parameters = new NimbleStudioEndpointParameters(); - parameters["Region"] = "ap-southeast-2"; - parameters["UseFIPS"] = false; - parameters["UseDualStack"] = false; - var endpoint = new AmazonNimbleStudioEndpointProvider().ResolveEndpoint(parameters); - Assert.AreEqual("https://nimble.ap-southeast-2.amazonaws.com", endpoint.URL); - } - - [TestMethod] - [TestCategory("UnitTest")] - [TestCategory("Endpoints")] - [TestCategory("NimbleStudio")] - [Description("For region ca-central-1 with FIPS disabled and DualStack disabled")] - public void For_region_cacentral1_with_FIPS_disabled_and_DualStack_disabled_Test() - { - var parameters = new NimbleStudioEndpointParameters(); - parameters["Region"] = "ca-central-1"; - parameters["UseFIPS"] = false; - parameters["UseDualStack"] = false; - var endpoint = new AmazonNimbleStudioEndpointProvider().ResolveEndpoint(parameters); - Assert.AreEqual("https://nimble.ca-central-1.amazonaws.com", endpoint.URL); - } - - [TestMethod] - [TestCategory("UnitTest")] - [TestCategory("Endpoints")] - [TestCategory("NimbleStudio")] - [Description("For region eu-west-2 with FIPS disabled and DualStack disabled")] - public void For_region_euwest2_with_FIPS_disabled_and_DualStack_disabled_Test() - { - var parameters = new NimbleStudioEndpointParameters(); - parameters["Region"] = "eu-west-2"; - parameters["UseFIPS"] = false; - parameters["UseDualStack"] = false; - var endpoint = new AmazonNimbleStudioEndpointProvider().ResolveEndpoint(parameters); - Assert.AreEqual("https://nimble.eu-west-2.amazonaws.com", endpoint.URL); - } - - [TestMethod] - [TestCategory("UnitTest")] - [TestCategory("Endpoints")] - [TestCategory("NimbleStudio")] - [Description("For region us-east-1 with FIPS disabled and DualStack disabled")] - public void For_region_useast1_with_FIPS_disabled_and_DualStack_disabled_Test() - { - var parameters = new NimbleStudioEndpointParameters(); - parameters["Region"] = "us-east-1"; - parameters["UseFIPS"] = false; - parameters["UseDualStack"] = false; - var endpoint = new AmazonNimbleStudioEndpointProvider().ResolveEndpoint(parameters); - Assert.AreEqual("https://nimble.us-east-1.amazonaws.com", endpoint.URL); - } - - [TestMethod] - [TestCategory("UnitTest")] - [TestCategory("Endpoints")] - [TestCategory("NimbleStudio")] - [Description("For region us-west-2 with FIPS disabled and DualStack disabled")] - public void For_region_uswest2_with_FIPS_disabled_and_DualStack_disabled_Test() - { - var parameters = new NimbleStudioEndpointParameters(); - parameters["Region"] = "us-west-2"; - parameters["UseFIPS"] = false; - parameters["UseDualStack"] = false; - var endpoint = new AmazonNimbleStudioEndpointProvider().ResolveEndpoint(parameters); - Assert.AreEqual("https://nimble.us-west-2.amazonaws.com", endpoint.URL); - } - - [TestMethod] - [TestCategory("UnitTest")] - [TestCategory("Endpoints")] - [TestCategory("NimbleStudio")] - [Description("For region us-east-1 with FIPS enabled and DualStack enabled")] - public void For_region_useast1_with_FIPS_enabled_and_DualStack_enabled_Test() - { - var parameters = new NimbleStudioEndpointParameters(); - parameters["Region"] = "us-east-1"; - parameters["UseFIPS"] = true; - parameters["UseDualStack"] = true; - var endpoint = new AmazonNimbleStudioEndpointProvider().ResolveEndpoint(parameters); - Assert.AreEqual("https://nimble-fips.us-east-1.api.aws", endpoint.URL); - } - - [TestMethod] - [TestCategory("UnitTest")] - [TestCategory("Endpoints")] - [TestCategory("NimbleStudio")] - [Description("For region us-east-1 with FIPS enabled and DualStack disabled")] - public void For_region_useast1_with_FIPS_enabled_and_DualStack_disabled_Test() - { - var parameters = new NimbleStudioEndpointParameters(); - parameters["Region"] = "us-east-1"; - parameters["UseFIPS"] = true; - parameters["UseDualStack"] = false; - var endpoint = new AmazonNimbleStudioEndpointProvider().ResolveEndpoint(parameters); - Assert.AreEqual("https://nimble-fips.us-east-1.amazonaws.com", endpoint.URL); - } - - [TestMethod] - [TestCategory("UnitTest")] - [TestCategory("Endpoints")] - [TestCategory("NimbleStudio")] - [Description("For region us-east-1 with FIPS disabled and DualStack enabled")] - public void For_region_useast1_with_FIPS_disabled_and_DualStack_enabled_Test() - { - var parameters = new NimbleStudioEndpointParameters(); - parameters["Region"] = "us-east-1"; - parameters["UseFIPS"] = false; - parameters["UseDualStack"] = true; - var endpoint = new AmazonNimbleStudioEndpointProvider().ResolveEndpoint(parameters); - Assert.AreEqual("https://nimble.us-east-1.api.aws", endpoint.URL); - } - - [TestMethod] - [TestCategory("UnitTest")] - [TestCategory("Endpoints")] - [TestCategory("NimbleStudio")] - [Description("For region cn-north-1 with FIPS enabled and DualStack enabled")] - public void For_region_cnnorth1_with_FIPS_enabled_and_DualStack_enabled_Test() - { - var parameters = new NimbleStudioEndpointParameters(); - parameters["Region"] = "cn-north-1"; - parameters["UseFIPS"] = true; - parameters["UseDualStack"] = true; - var endpoint = new AmazonNimbleStudioEndpointProvider().ResolveEndpoint(parameters); - Assert.AreEqual("https://nimble-fips.cn-north-1.api.amazonwebservices.com.cn", endpoint.URL); - } - - [TestMethod] - [TestCategory("UnitTest")] - [TestCategory("Endpoints")] - [TestCategory("NimbleStudio")] - [Description("For region cn-north-1 with FIPS enabled and DualStack disabled")] - public void For_region_cnnorth1_with_FIPS_enabled_and_DualStack_disabled_Test() - { - var parameters = new NimbleStudioEndpointParameters(); - parameters["Region"] = "cn-north-1"; - parameters["UseFIPS"] = true; - parameters["UseDualStack"] = false; - var endpoint = new AmazonNimbleStudioEndpointProvider().ResolveEndpoint(parameters); - Assert.AreEqual("https://nimble-fips.cn-north-1.amazonaws.com.cn", endpoint.URL); - } - - [TestMethod] - [TestCategory("UnitTest")] - [TestCategory("Endpoints")] - [TestCategory("NimbleStudio")] - [Description("For region cn-north-1 with FIPS disabled and DualStack enabled")] - public void For_region_cnnorth1_with_FIPS_disabled_and_DualStack_enabled_Test() - { - var parameters = new NimbleStudioEndpointParameters(); - parameters["Region"] = "cn-north-1"; - parameters["UseFIPS"] = false; - parameters["UseDualStack"] = true; - var endpoint = new AmazonNimbleStudioEndpointProvider().ResolveEndpoint(parameters); - Assert.AreEqual("https://nimble.cn-north-1.api.amazonwebservices.com.cn", endpoint.URL); - } - - [TestMethod] - [TestCategory("UnitTest")] - [TestCategory("Endpoints")] - [TestCategory("NimbleStudio")] - [Description("For region cn-north-1 with FIPS disabled and DualStack disabled")] - public void For_region_cnnorth1_with_FIPS_disabled_and_DualStack_disabled_Test() - { - var parameters = new NimbleStudioEndpointParameters(); - parameters["Region"] = "cn-north-1"; - parameters["UseFIPS"] = false; - parameters["UseDualStack"] = false; - var endpoint = new AmazonNimbleStudioEndpointProvider().ResolveEndpoint(parameters); - Assert.AreEqual("https://nimble.cn-north-1.amazonaws.com.cn", endpoint.URL); - } - - [TestMethod] - [TestCategory("UnitTest")] - [TestCategory("Endpoints")] - [TestCategory("NimbleStudio")] - [Description("For region us-gov-east-1 with FIPS enabled and DualStack enabled")] - public void For_region_usgoveast1_with_FIPS_enabled_and_DualStack_enabled_Test() - { - var parameters = new NimbleStudioEndpointParameters(); - parameters["Region"] = "us-gov-east-1"; - parameters["UseFIPS"] = true; - parameters["UseDualStack"] = true; - var endpoint = new AmazonNimbleStudioEndpointProvider().ResolveEndpoint(parameters); - Assert.AreEqual("https://nimble-fips.us-gov-east-1.api.aws", endpoint.URL); - } - - [TestMethod] - [TestCategory("UnitTest")] - [TestCategory("Endpoints")] - [TestCategory("NimbleStudio")] - [Description("For region us-gov-east-1 with FIPS enabled and DualStack disabled")] - public void For_region_usgoveast1_with_FIPS_enabled_and_DualStack_disabled_Test() - { - var parameters = new NimbleStudioEndpointParameters(); - parameters["Region"] = "us-gov-east-1"; - parameters["UseFIPS"] = true; - parameters["UseDualStack"] = false; - var endpoint = new AmazonNimbleStudioEndpointProvider().ResolveEndpoint(parameters); - Assert.AreEqual("https://nimble-fips.us-gov-east-1.amazonaws.com", endpoint.URL); - } - - [TestMethod] - [TestCategory("UnitTest")] - [TestCategory("Endpoints")] - [TestCategory("NimbleStudio")] - [Description("For region us-gov-east-1 with FIPS disabled and DualStack enabled")] - public void For_region_usgoveast1_with_FIPS_disabled_and_DualStack_enabled_Test() - { - var parameters = new NimbleStudioEndpointParameters(); - parameters["Region"] = "us-gov-east-1"; - parameters["UseFIPS"] = false; - parameters["UseDualStack"] = true; - var endpoint = new AmazonNimbleStudioEndpointProvider().ResolveEndpoint(parameters); - Assert.AreEqual("https://nimble.us-gov-east-1.api.aws", endpoint.URL); - } - - [TestMethod] - [TestCategory("UnitTest")] - [TestCategory("Endpoints")] - [TestCategory("NimbleStudio")] - [Description("For region us-gov-east-1 with FIPS disabled and DualStack disabled")] - public void For_region_usgoveast1_with_FIPS_disabled_and_DualStack_disabled_Test() - { - var parameters = new NimbleStudioEndpointParameters(); - parameters["Region"] = "us-gov-east-1"; - parameters["UseFIPS"] = false; - parameters["UseDualStack"] = false; - var endpoint = new AmazonNimbleStudioEndpointProvider().ResolveEndpoint(parameters); - Assert.AreEqual("https://nimble.us-gov-east-1.amazonaws.com", endpoint.URL); - } - - [TestMethod] - [TestCategory("UnitTest")] - [TestCategory("Endpoints")] - [TestCategory("NimbleStudio")] - [Description("For region us-iso-east-1 with FIPS enabled and DualStack enabled")] - [ExpectedException(typeof(AmazonClientException), @"FIPS and DualStack are enabled, but this partition does not support one or both")] - public void For_region_usisoeast1_with_FIPS_enabled_and_DualStack_enabled_Test() - { - var parameters = new NimbleStudioEndpointParameters(); - parameters["Region"] = "us-iso-east-1"; - parameters["UseFIPS"] = true; - parameters["UseDualStack"] = true; - var endpoint = new AmazonNimbleStudioEndpointProvider().ResolveEndpoint(parameters); - } - - [TestMethod] - [TestCategory("UnitTest")] - [TestCategory("Endpoints")] - [TestCategory("NimbleStudio")] - [Description("For region us-iso-east-1 with FIPS enabled and DualStack disabled")] - public void For_region_usisoeast1_with_FIPS_enabled_and_DualStack_disabled_Test() - { - var parameters = new NimbleStudioEndpointParameters(); - parameters["Region"] = "us-iso-east-1"; - parameters["UseFIPS"] = true; - parameters["UseDualStack"] = false; - var endpoint = new AmazonNimbleStudioEndpointProvider().ResolveEndpoint(parameters); - Assert.AreEqual("https://nimble-fips.us-iso-east-1.c2s.ic.gov", endpoint.URL); - } - - [TestMethod] - [TestCategory("UnitTest")] - [TestCategory("Endpoints")] - [TestCategory("NimbleStudio")] - [Description("For region us-iso-east-1 with FIPS disabled and DualStack enabled")] - [ExpectedException(typeof(AmazonClientException), @"DualStack is enabled but this partition does not support DualStack")] - public void For_region_usisoeast1_with_FIPS_disabled_and_DualStack_enabled_Test() - { - var parameters = new NimbleStudioEndpointParameters(); - parameters["Region"] = "us-iso-east-1"; - parameters["UseFIPS"] = false; - parameters["UseDualStack"] = true; - var endpoint = new AmazonNimbleStudioEndpointProvider().ResolveEndpoint(parameters); - } - - [TestMethod] - [TestCategory("UnitTest")] - [TestCategory("Endpoints")] - [TestCategory("NimbleStudio")] - [Description("For region us-iso-east-1 with FIPS disabled and DualStack disabled")] - public void For_region_usisoeast1_with_FIPS_disabled_and_DualStack_disabled_Test() - { - var parameters = new NimbleStudioEndpointParameters(); - parameters["Region"] = "us-iso-east-1"; - parameters["UseFIPS"] = false; - parameters["UseDualStack"] = false; - var endpoint = new AmazonNimbleStudioEndpointProvider().ResolveEndpoint(parameters); - Assert.AreEqual("https://nimble.us-iso-east-1.c2s.ic.gov", endpoint.URL); - } - - [TestMethod] - [TestCategory("UnitTest")] - [TestCategory("Endpoints")] - [TestCategory("NimbleStudio")] - [Description("For region us-isob-east-1 with FIPS enabled and DualStack enabled")] - [ExpectedException(typeof(AmazonClientException), @"FIPS and DualStack are enabled, but this partition does not support one or both")] - public void For_region_usisobeast1_with_FIPS_enabled_and_DualStack_enabled_Test() - { - var parameters = new NimbleStudioEndpointParameters(); - parameters["Region"] = "us-isob-east-1"; - parameters["UseFIPS"] = true; - parameters["UseDualStack"] = true; - var endpoint = new AmazonNimbleStudioEndpointProvider().ResolveEndpoint(parameters); - } - - [TestMethod] - [TestCategory("UnitTest")] - [TestCategory("Endpoints")] - [TestCategory("NimbleStudio")] - [Description("For region us-isob-east-1 with FIPS enabled and DualStack disabled")] - public void For_region_usisobeast1_with_FIPS_enabled_and_DualStack_disabled_Test() - { - var parameters = new NimbleStudioEndpointParameters(); - parameters["Region"] = "us-isob-east-1"; - parameters["UseFIPS"] = true; - parameters["UseDualStack"] = false; - var endpoint = new AmazonNimbleStudioEndpointProvider().ResolveEndpoint(parameters); - Assert.AreEqual("https://nimble-fips.us-isob-east-1.sc2s.sgov.gov", endpoint.URL); - } - - [TestMethod] - [TestCategory("UnitTest")] - [TestCategory("Endpoints")] - [TestCategory("NimbleStudio")] - [Description("For region us-isob-east-1 with FIPS disabled and DualStack enabled")] - [ExpectedException(typeof(AmazonClientException), @"DualStack is enabled but this partition does not support DualStack")] - public void For_region_usisobeast1_with_FIPS_disabled_and_DualStack_enabled_Test() - { - var parameters = new NimbleStudioEndpointParameters(); - parameters["Region"] = "us-isob-east-1"; - parameters["UseFIPS"] = false; - parameters["UseDualStack"] = true; - var endpoint = new AmazonNimbleStudioEndpointProvider().ResolveEndpoint(parameters); - } - - [TestMethod] - [TestCategory("UnitTest")] - [TestCategory("Endpoints")] - [TestCategory("NimbleStudio")] - [Description("For region us-isob-east-1 with FIPS disabled and DualStack disabled")] - public void For_region_usisobeast1_with_FIPS_disabled_and_DualStack_disabled_Test() - { - var parameters = new NimbleStudioEndpointParameters(); - parameters["Region"] = "us-isob-east-1"; - parameters["UseFIPS"] = false; - parameters["UseDualStack"] = false; - var endpoint = new AmazonNimbleStudioEndpointProvider().ResolveEndpoint(parameters); - Assert.AreEqual("https://nimble.us-isob-east-1.sc2s.sgov.gov", endpoint.URL); - } - - [TestMethod] - [TestCategory("UnitTest")] - [TestCategory("Endpoints")] - [TestCategory("NimbleStudio")] - [Description("For custom endpoint with region set and fips disabled and dualstack disabled")] - public void For_custom_endpoint_with_region_set_and_fips_disabled_and_dualstack_disabled_Test() - { - var parameters = new NimbleStudioEndpointParameters(); - parameters["Region"] = "us-east-1"; - parameters["UseFIPS"] = false; - parameters["UseDualStack"] = false; - parameters["Endpoint"] = "https://example.com"; - var endpoint = new AmazonNimbleStudioEndpointProvider().ResolveEndpoint(parameters); - Assert.AreEqual("https://example.com", endpoint.URL); - } - - [TestMethod] - [TestCategory("UnitTest")] - [TestCategory("Endpoints")] - [TestCategory("NimbleStudio")] - [Description("For custom endpoint with region not set and fips disabled and dualstack disabled")] - public void For_custom_endpoint_with_region_not_set_and_fips_disabled_and_dualstack_disabled_Test() - { - var parameters = new NimbleStudioEndpointParameters(); - parameters["UseFIPS"] = false; - parameters["UseDualStack"] = false; - parameters["Endpoint"] = "https://example.com"; - var endpoint = new AmazonNimbleStudioEndpointProvider().ResolveEndpoint(parameters); - Assert.AreEqual("https://example.com", endpoint.URL); - } - - [TestMethod] - [TestCategory("UnitTest")] - [TestCategory("Endpoints")] - [TestCategory("NimbleStudio")] - [Description("For custom endpoint with fips enabled and dualstack disabled")] - [ExpectedException(typeof(AmazonClientException), @"Invalid Configuration: FIPS and custom endpoint are not supported")] - public void For_custom_endpoint_with_fips_enabled_and_dualstack_disabled_Test() - { - var parameters = new NimbleStudioEndpointParameters(); - parameters["Region"] = "us-east-1"; - parameters["UseFIPS"] = true; - parameters["UseDualStack"] = false; - parameters["Endpoint"] = "https://example.com"; - var endpoint = new AmazonNimbleStudioEndpointProvider().ResolveEndpoint(parameters); - } - - [TestMethod] - [TestCategory("UnitTest")] - [TestCategory("Endpoints")] - [TestCategory("NimbleStudio")] - [Description("For custom endpoint with fips disabled and dualstack enabled")] - [ExpectedException(typeof(AmazonClientException), @"Invalid Configuration: Dualstack and custom endpoint are not supported")] - public void For_custom_endpoint_with_fips_disabled_and_dualstack_enabled_Test() - { - var parameters = new NimbleStudioEndpointParameters(); - parameters["Region"] = "us-east-1"; - parameters["UseFIPS"] = false; - parameters["UseDualStack"] = true; - parameters["Endpoint"] = "https://example.com"; - var endpoint = new AmazonNimbleStudioEndpointProvider().ResolveEndpoint(parameters); - } - - [TestMethod] - [TestCategory("UnitTest")] - [TestCategory("Endpoints")] - [TestCategory("NimbleStudio")] - [Description("Missing region")] - [ExpectedException(typeof(AmazonClientException), @"Invalid Configuration: Missing Region")] - public void Missing_region_Test() - { - var parameters = new NimbleStudioEndpointParameters(); - var endpoint = new AmazonNimbleStudioEndpointProvider().ResolveEndpoint(parameters); - } - - } -} \ No newline at end of file diff --git a/sdk/test/Services/PartnerCentralSelling/UnitTests/AWSSDK.UnitTests.PartnerCentralSelling.Net45.csproj b/sdk/test/Services/PartnerCentralSelling/UnitTests/AWSSDK.UnitTests.PartnerCentralSelling.Net45.csproj deleted file mode 100644 index cb8fdb403a60..000000000000 --- a/sdk/test/Services/PartnerCentralSelling/UnitTests/AWSSDK.UnitTests.PartnerCentralSelling.Net45.csproj +++ /dev/null @@ -1,53 +0,0 @@ - - - true - net45 - $(DefineConstants);TRACE;BCL;BCL45;ASYNC_AWAIT;DEBUG - portable - true - AWSSDK.UnitTests.PartnerCentralSelling.Net45 - AWSSDK.UnitTests.PartnerCentralSelling.Net45 - - false - false - false - false - false - false - false - false - true - true - - CS1591,CS0612,CS0618 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/sdk/test/Services/PartnerCentralSelling/UnitTests/AWSSDK.UnitTests.PartnerCentralSelling.Net35.csproj b/sdk/test/Services/PartnerCentralSelling/UnitTests/AWSSDK.UnitTests.PartnerCentralSelling.NetFramework.csproj similarity index 68% rename from sdk/test/Services/PartnerCentralSelling/UnitTests/AWSSDK.UnitTests.PartnerCentralSelling.Net35.csproj rename to sdk/test/Services/PartnerCentralSelling/UnitTests/AWSSDK.UnitTests.PartnerCentralSelling.NetFramework.csproj index a24616203899..62806028632e 100644 --- a/sdk/test/Services/PartnerCentralSelling/UnitTests/AWSSDK.UnitTests.PartnerCentralSelling.Net35.csproj +++ b/sdk/test/Services/PartnerCentralSelling/UnitTests/AWSSDK.UnitTests.PartnerCentralSelling.NetFramework.csproj @@ -1,12 +1,12 @@ true - net45 - $(DefineConstants);TRACE;BCL;BCL35;AWS_APM_API;DEBUG + net472 + $(DefineConstants);TRACE;BCL;ASYNC_AWAIT;DEBUG portable true - AWSSDK.UnitTests.PartnerCentralSelling.Net35 - AWSSDK.UnitTests.PartnerCentralSelling.Net35 + AWSSDK.UnitTests.PartnerCentralSelling.NetFramework + AWSSDK.UnitTests.PartnerCentralSelling.NetFramework false false @@ -20,22 +20,31 @@ true CS1591,CS0612,CS0618 - false - bin\$(Configuration)\net35 + + + true + + + + 11.0 + + + 9.0 - - - + - - - + + + diff --git a/sdk/test/Services/PartnerCentralSelling/UnitTests/Generated/Endpoints/PartnerCentralSellingEndpointProviderTests.cs b/sdk/test/Services/PartnerCentralSelling/UnitTests/Generated/Endpoints/PartnerCentralSellingEndpointProviderTests.cs index 911bb0fb008d..2be80c5bdef4 100644 --- a/sdk/test/Services/PartnerCentralSelling/UnitTests/Generated/Endpoints/PartnerCentralSellingEndpointProviderTests.cs +++ b/sdk/test/Services/PartnerCentralSelling/UnitTests/Generated/Endpoints/PartnerCentralSellingEndpointProviderTests.cs @@ -23,7 +23,7 @@ using Amazon.PartnerCentralSelling.Endpoints; using Amazon.PartnerCentralSelling.Internal; -namespace AWSSDK_DotNet35.UnitTests.Endpoints +namespace AWSSDK_DotNet.UnitTests.Endpoints { [TestClass] public partial class PartnerCentralSellingEndpointsTests diff --git a/sdk/test/Services/SocialMessaging/UnitTests/AWSSDK.UnitTests.SocialMessaging.Net45.csproj b/sdk/test/Services/SocialMessaging/UnitTests/AWSSDK.UnitTests.SocialMessaging.Net45.csproj deleted file mode 100644 index 175ce8f33cc6..000000000000 --- a/sdk/test/Services/SocialMessaging/UnitTests/AWSSDK.UnitTests.SocialMessaging.Net45.csproj +++ /dev/null @@ -1,53 +0,0 @@ - - - true - net45 - $(DefineConstants);TRACE;BCL;BCL45;ASYNC_AWAIT;DEBUG - portable - true - AWSSDK.UnitTests.SocialMessaging.Net45 - AWSSDK.UnitTests.SocialMessaging.Net45 - - false - false - false - false - false - false - false - false - true - true - - CS1591,CS0612,CS0618 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/sdk/test/Services/SocialMessaging/UnitTests/AWSSDK.UnitTests.SocialMessaging.Net35.csproj b/sdk/test/Services/SocialMessaging/UnitTests/AWSSDK.UnitTests.SocialMessaging.NetFramework.csproj similarity index 69% rename from sdk/test/Services/SocialMessaging/UnitTests/AWSSDK.UnitTests.SocialMessaging.Net35.csproj rename to sdk/test/Services/SocialMessaging/UnitTests/AWSSDK.UnitTests.SocialMessaging.NetFramework.csproj index fb04a35f7b83..c04ab4d9adda 100644 --- a/sdk/test/Services/SocialMessaging/UnitTests/AWSSDK.UnitTests.SocialMessaging.Net35.csproj +++ b/sdk/test/Services/SocialMessaging/UnitTests/AWSSDK.UnitTests.SocialMessaging.NetFramework.csproj @@ -1,12 +1,12 @@ true - net45 - $(DefineConstants);TRACE;BCL;BCL35;AWS_APM_API;DEBUG + net472 + $(DefineConstants);TRACE;BCL;ASYNC_AWAIT;DEBUG portable true - AWSSDK.UnitTests.SocialMessaging.Net35 - AWSSDK.UnitTests.SocialMessaging.Net35 + AWSSDK.UnitTests.SocialMessaging.NetFramework + AWSSDK.UnitTests.SocialMessaging.NetFramework false false @@ -20,22 +20,31 @@ true CS1591,CS0612,CS0618 - false - bin\$(Configuration)\net35 + + + true + + + + 11.0 + + + 9.0 - - - + - - - + + + diff --git a/sdk/test/Services/SocialMessaging/UnitTests/Generated/Endpoints/SocialMessagingEndpointProviderTests.cs b/sdk/test/Services/SocialMessaging/UnitTests/Generated/Endpoints/SocialMessagingEndpointProviderTests.cs index eb9f306d0116..048ccac5cbae 100644 --- a/sdk/test/Services/SocialMessaging/UnitTests/Generated/Endpoints/SocialMessagingEndpointProviderTests.cs +++ b/sdk/test/Services/SocialMessaging/UnitTests/Generated/Endpoints/SocialMessagingEndpointProviderTests.cs @@ -23,7 +23,7 @@ using Amazon.SocialMessaging.Endpoints; using Amazon.SocialMessaging.Internal; -namespace AWSSDK_DotNet35.UnitTests.Endpoints +namespace AWSSDK_DotNet.UnitTests.Endpoints { [TestClass] public partial class SocialMessagingEndpointsTests